diff --git a/CMakeLists.txt b/CMakeLists.txt index ad705cb9e..6993b6967 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,6 +35,16 @@ option(YUZU_USE_BUNDLED_OPUS "Compile bundled opus" ON) option(YUZU_TESTS "Compile tests" ON) +option(YUZU_USE_BUNDLED_VCPKG "Use vcpkg for yuzu dependencies" OFF) + +if (YUZU_USE_BUNDLED_VCPKG) + include(${CMAKE_SOURCE_DIR}/externals/vcpkg/scripts/buildsystems/vcpkg.cmake) +elseif(NOT "$ENV{VCPKG_TOOLCHAIN_FILE}" STREQUAL "") + # Disable manifest mode (use vcpkg classic mode) when using a custom vcpkg installation + option(VCPKG_MANIFEST_MODE "") + include("$ENV{VCPKG_TOOLCHAIN_FILE}") +endif() + # Default to a Release build get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) if (NOT IS_MULTI_CONFIG AND NOT CMAKE_BUILD_TYPE) @@ -144,82 +154,34 @@ endif() set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) # System imported libraries -# If not found, download any missing through Conan # ======================================================================= -set(CONAN_CMAKE_SILENT_OUTPUT TRUE) -set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE) -if (YUZU_CONAN_INSTALLED) - if (IS_MULTI_CONFIG) - include(${CMAKE_BINARY_DIR}/conanbuildinfo_multi.cmake) - else() - include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) - endif() - list(APPEND CMAKE_MODULE_PATH "${CMAKE_BINARY_DIR}") - list(APPEND CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}") - conan_basic_setup() - message(STATUS "Adding conan installed libraries to the search path") + +find_package(fmt 8.0.1 REQUIRED CONFIG) +find_package(lz4 1.8 REQUIRED) +find_package(nlohmann_json 3.8 REQUIRED CONFIG) +find_package(ZLIB 1.2 REQUIRED) + +# Search for config-only package first (for vcpkg), then try non-config +find_package(zstd 1.5 CONFIG) +if (NOT zstd_FOUND) + find_package(zstd 1.5 REQUIRED) endif() -macro(yuzu_find_packages) - set(options FORCE_REQUIRED) - cmake_parse_arguments(FN "${options}" "" "" ${ARGN}) +if (YUZU_TESTS) + find_package(Catch2 2.13.7 REQUIRED CONFIG) +endif() - # Cmake has a *serious* lack of 2D array or associative array... - # Capitalization matters here. We need the naming to match the generated paths from Conan - set(REQUIRED_LIBS - # Cmake Pkg Prefix Version Conan Pkg - "fmt 8.0.1 fmt/8.1.1" - "lz4 1.8 lz4/1.9.2" - "nlohmann_json 3.8 nlohmann_json/3.8.0" - "ZLIB 1.2 zlib/1.2.11" - "zstd 1.5 zstd/1.5.0" - # can't use opus until AVX check is fixed: https://github.com/yuzu-emu/yuzu/pull/4068 - #"opus 1.3 opus/1.3.1" - ) - if (YUZU_TESTS) - list(APPEND REQUIRED_LIBS - "Catch2 2.13.7 catch2/2.13.7" - ) - endif() - - foreach(PACKAGE ${REQUIRED_LIBS}) - string(REGEX REPLACE "[ \t\r\n]+" ";" PACKAGE_SPLIT ${PACKAGE}) - list(GET PACKAGE_SPLIT 0 PACKAGE_PREFIX) - list(GET PACKAGE_SPLIT 1 PACKAGE_VERSION) - list(GET PACKAGE_SPLIT 2 PACKAGE_CONAN) - # This function is called twice, once to check if the packages exist on the system already - # and a second time to check if conan installed them properly. The second check passes in FORCE_REQUIRED - if (NOT ${PACKAGE_PREFIX}_FOUND) - if (FN_FORCE_REQUIRED) - find_package(${PACKAGE_PREFIX} ${PACKAGE_VERSION} REQUIRED) - else() - find_package(${PACKAGE_PREFIX} ${PACKAGE_VERSION}) - endif() - endif() - if (NOT ${PACKAGE_PREFIX}_FOUND) - list(APPEND CONAN_REQUIRED_LIBS ${PACKAGE_CONAN}) - else() - # Set a legacy findPackage.cmake style PACKAGE_LIBRARIES variable for subprojects that rely on this - set(${PACKAGE_PREFIX}_LIBRARIES "${PACKAGE_PREFIX}::${PACKAGE_PREFIX}") - endif() - endforeach() - unset(FN_FORCE_REQUIRED) -endmacro() - -find_package(Boost 1.73.0 COMPONENTS context headers) +find_package(Boost 1.73.0 COMPONENTS context) if (Boost_FOUND) set(Boost_LIBRARIES Boost::boost) - # Conditionally add Boost::context only if the active version of the Conan or system Boost package provides it + # Conditionally add Boost::context only if the found Boost package provides it # The old version is missing Boost::context, so we want to avoid adding in that case # The new version requires adding Boost::context to prevent linking issues - # - # This one is used by Conan on subsequent CMake configures, not the first configure. if (TARGET Boost::context) list(APPEND Boost_LIBRARIES Boost::context) endif() else() - message(STATUS "Boost 1.79.0 or newer not found, falling back to Conan") - list(APPEND CONAN_REQUIRED_LIBS "boost/1.79.0") + message(FATAL_ERROR "Boost 1.73.0 or newer not found") endif() # boost:asio has functions that require AcceptEx et al @@ -227,24 +189,14 @@ if (MINGW) find_library(MSWSOCK_LIBRARY mswsock REQUIRED) endif() -# Attempt to locate any packages that are required and report the missing ones in CONAN_REQUIRED_LIBS -yuzu_find_packages() - # Qt5 requires that we find components, so it doesn't fit our pretty little find package function if(ENABLE_QT) set(QT_VERSION 5.15) - # We want to load the generated conan qt config so that we get the QT_ROOT var so that we can use the official - # Qt5Config inside the root folder instead of the conan generated one. - if(EXISTS ${CMAKE_BINARY_DIR}/qtConfig.cmake) - include(${CMAKE_BINARY_DIR}/qtConfig.cmake) - list(APPEND CMAKE_MODULE_PATH "${CONAN_QT_ROOT_RELEASE}") - list(APPEND CMAKE_PREFIX_PATH "${CONAN_QT_ROOT_RELEASE}") - endif() # Check for system Qt on Linux, fallback to bundled Qt if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") if (NOT YUZU_USE_BUNDLED_QT) - find_package(Qt5 ${QT_VERSION} COMPONENTS Widgets DBus Multimedia) + find_package(Qt5 ${QT_VERSION} COMPONENTS Widgets DBus) endif() if (NOT Qt5_FOUND OR YUZU_USE_BUNDLED_QT) # Check for dependencies, then enable bundled Qt download @@ -330,9 +282,6 @@ if(ENABLE_QT) set(YUZU_QT_NO_CMAKE_SYSTEM_PATH) - # Workaround for an issue where conan tries to build Qt from scratch instead of download prebuilt binaries - set(QT_PREFIX_HINT) - if(YUZU_USE_BUNDLED_QT) if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64) set(QT_BUILD qt-5.15.2-msvc2019_64) @@ -351,9 +300,9 @@ if(ENABLE_QT) set(YUZU_QT_NO_CMAKE_SYSTEM_PATH "NO_CMAKE_SYSTEM_PATH") endif() if ((${CMAKE_SYSTEM_NAME} STREQUAL "Linux") AND YUZU_USE_BUNDLED_QT) - find_package(Qt5 ${QT_VERSION} REQUIRED COMPONENTS Widgets DBus Multimedia ${QT_PREFIX_HINT} ${YUZU_QT_NO_CMAKE_SYSTEM_PATH}) + find_package(Qt5 ${QT_VERSION} REQUIRED COMPONENTS Widgets DBus ${QT_PREFIX_HINT} ${YUZU_QT_NO_CMAKE_SYSTEM_PATH}) else() - find_package(Qt5 ${QT_VERSION} REQUIRED COMPONENTS Widgets Multimedia ${QT_PREFIX_HINT} ${YUZU_QT_NO_CMAKE_SYSTEM_PATH}) + find_package(Qt5 ${QT_VERSION} REQUIRED COMPONENTS Widgets ${QT_PREFIX_HINT} ${YUZU_QT_NO_CMAKE_SYSTEM_PATH}) endif() if (YUZU_USE_QT_WEB_ENGINE) find_package(Qt5 COMPONENTS WebEngineCore WebEngineWidgets) @@ -403,71 +352,8 @@ if (ENABLE_SDL2) endif() endif() -# Install any missing dependencies with conan install -if (CONAN_REQUIRED_LIBS) - message(STATUS "Packages ${CONAN_REQUIRED_LIBS} not found!") - # Use Conan to fetch the libraries that aren't found - # Download conan.cmake automatically, you can also just copy the conan.cmake file - if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake") - message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan") - file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/release/0.18/conan.cmake" "${CMAKE_BINARY_DIR}/conan.cmake") - endif() - include(${CMAKE_BINARY_DIR}/conan.cmake) - - conan_check(VERSION 1.45.0 REQUIRED) - - # Manually add iconv to fix a dep conflict between qt and sdl2 - # We don't need to add it through find_package or anything since the other two can find it just fine - if ("${CONAN_REQUIRED_LIBS}" MATCHES "qt" AND "${CONAN_REQUIRED_LIBS}" MATCHES "sdl") - list(APPEND CONAN_REQUIRED_LIBS "libiconv/1.16") - endif() - if (IS_MULTI_CONFIG) - conan_cmake_run(REQUIRES ${CONAN_REQUIRED_LIBS} - OPTIONS ${CONAN_LIB_OPTIONS} - BUILD missing - CONFIGURATION_TYPES "Release;Debug" - GENERATORS cmake_multi cmake_find_package_multi) - include(${CMAKE_BINARY_DIR}/conanbuildinfo_multi.cmake) - else() - conan_cmake_run(REQUIRES ${CONAN_REQUIRED_LIBS} - OPTIONS ${CONAN_LIB_OPTIONS} - BUILD missing - GENERATORS cmake cmake_find_package_multi) - include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) - endif() - list(APPEND CMAKE_MODULE_PATH "${CMAKE_BINARY_DIR}") - list(APPEND CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}") - conan_basic_setup() - - set(YUZU_CONAN_INSTALLED TRUE CACHE BOOL "If true, the following builds will add conan to the lib search path" FORCE) - - # Now that we've installed what we are missing, try to locate them again, - # this time with required, so we bail if its not found. - yuzu_find_packages(FORCE_REQUIRED) - - if (NOT Boost_FOUND) - find_package(Boost 1.73.0 REQUIRED COMPONENTS context headers) - set(Boost_LIBRARIES Boost::boost) - # Conditionally add Boost::context only if the active version of the Conan Boost package provides it - # The old version is missing Boost::context, so we want to avoid adding in that case - # The new version requires adding Boost::context to prevent linking issues - if (TARGET Boost::context) - list(APPEND Boost_LIBRARIES Boost::context) - endif() - endif() - - # Due to issues with variable scopes in functions, we need to also find_package(qt5) outside of the function - if(ENABLE_QT) - list(APPEND CMAKE_MODULE_PATH "${CONAN_QT_ROOT_RELEASE}") - list(APPEND CMAKE_PREFIX_PATH "${CONAN_QT_ROOT_RELEASE}") - find_package(Qt5 5.15 REQUIRED COMPONENTS Widgets Multimedia) - if (YUZU_USE_QT_WEB_ENGINE) - find_package(Qt5 REQUIRED COMPONENTS WebEngineCore WebEngineWidgets) - endif() - endif() - -endif() - +# TODO(lat9nq): Determine what if any of this we still need +# # Reexport some targets that are named differently when using the upstream CmakeConfig vs the generated Conan config # In order to ALIAS targets to a new name, they first need to be IMPORTED_GLOBAL # Dynarmic checks for target `boost` and so we want to make sure it can find it through our system instead of using their external diff --git a/CMakeModules/CopyYuzuQt5Deps.cmake b/CMakeModules/CopyYuzuQt5Deps.cmake index 54f121512..dd97f5b2b 100755 --- a/CMakeModules/CopyYuzuQt5Deps.cmake +++ b/CMakeModules/CopyYuzuQt5Deps.cmake @@ -10,13 +10,11 @@ function(copy_yuzu_Qt5_deps target_dir) set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/") set(Qt5_PLATFORMTHEMES_DIR "${Qt5_DIR}/../../../plugins/platformthemes/") set(Qt5_PLATFORMINPUTCONTEXTS_DIR "${Qt5_DIR}/../../../plugins/platforminputcontexts/") - set(Qt5_MEDIASERVICE_DIR "${Qt5_DIR}/../../../plugins/mediaservice/") set(Qt5_XCBGLINTEGRATIONS_DIR "${Qt5_DIR}/../../../plugins/xcbglintegrations/") set(Qt5_STYLES_DIR "${Qt5_DIR}/../../../plugins/styles/") set(Qt5_IMAGEFORMATS_DIR "${Qt5_DIR}/../../../plugins/imageformats/") set(Qt5_RESOURCES_DIR "${Qt5_DIR}/../../../resources/") set(PLATFORMS ${DLL_DEST}plugins/platforms/) - set(MEDIASERVICE ${DLL_DEST}mediaservice/) set(STYLES ${DLL_DEST}plugins/styles/) set(IMAGEFORMATS ${DLL_DEST}plugins/imageformats/) if (MSVC) @@ -27,8 +25,6 @@ function(copy_yuzu_Qt5_deps target_dir) Qt5Core$<$:d>.* Qt5Gui$<$:d>.* Qt5Widgets$<$:d>.* - Qt5Multimedia$<$:d>.* - Qt5Network$<$:d>.* ) if (YUZU_USE_QT_WEB_ENGINE) @@ -60,11 +56,7 @@ function(copy_yuzu_Qt5_deps target_dir) windows_copy_files(yuzu ${Qt5_IMAGEFORMATS_DIR} ${IMAGEFORMATS} qjpeg$<$:d>.* qgif$<$:d>.* - ) - windows_copy_files(yuzu ${Qt5_MEDIASERVICE_DIR} ${MEDIASERVICE} - dsengine$<$:d>.* - wmfengine$<$:d>.* - ) + ) else() set(Qt5_DLLS "${Qt5_DLL_DIR}libQt5Core.so.5" diff --git a/README.md b/README.md index adf1cf65d..440d9e194 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 2849. +This is the source code for early-access 2853. ## Legal Notice diff --git a/externals/vcpkg/.gitattributes b/externals/vcpkg/.gitattributes new file mode 100755 index 000000000..d0c3b3e9c --- /dev/null +++ b/externals/vcpkg/.gitattributes @@ -0,0 +1,5 @@ +* -text +ports/** -linguist-detectable + +# Declare files that will always have LF line endings on checkout. +scripts/ci.baseline.txt text eol=lf \ No newline at end of file diff --git a/externals/vcpkg/.github/ISSUE_TEMPLATE/i-have-a-question.md b/externals/vcpkg/.github/ISSUE_TEMPLATE/i-have-a-question.md new file mode 100755 index 000000000..643d43dce --- /dev/null +++ b/externals/vcpkg/.github/ISSUE_TEMPLATE/i-have-a-question.md @@ -0,0 +1,10 @@ +--- +name: I have a question +about: I have a question and don't see a clear answer in documentation +title: How do I ... +labels: Question +assignees: '' + +--- + +Please create a discussion in https://github.com/microsoft/vcpkg/discussions/new instead. diff --git a/externals/vcpkg/.github/ISSUE_TEMPLATE/other-type-of-bug-report.md b/externals/vcpkg/.github/ISSUE_TEMPLATE/other-type-of-bug-report.md new file mode 100755 index 000000000..8a12e861d --- /dev/null +++ b/externals/vcpkg/.github/ISSUE_TEMPLATE/other-type-of-bug-report.md @@ -0,0 +1,31 @@ +--- +name: Other type of bug report +about: Let us know about an issues that does not fit into any of the other issues + types +title: '' +labels: '' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**Environment** +- OS: [e.g. Windows/Linux etc...] +- Compiler: revision + +**To Reproduce** +Steps to reproduce the behavior: +1. ./vcpkg install xxxx +2. See error +Repro code when + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Failure logs** +-(please attached failure logs) + +**Additional context** +Add any other context about the problem here. diff --git a/externals/vcpkg/.github/ISSUE_TEMPLATE/report-package-build-failure.md b/externals/vcpkg/.github/ISSUE_TEMPLATE/report-package-build-failure.md new file mode 100755 index 000000000..765f870c1 --- /dev/null +++ b/externals/vcpkg/.github/ISSUE_TEMPLATE/report-package-build-failure.md @@ -0,0 +1,23 @@ +--- +name: Report package build failure +about: Let us know about build failures in ports. +title: "[] build failure" +labels: port bug +assignees: '' + +--- + +**Host Environment** +- OS: [e.g. Windows/Linux etc...] +- Compiler: revision + +**To Reproduce** +Steps to reproduce the behavior: +`./vcpkg install xxxx` + +**Failure logs** +-Cut and paste the appropriate build messages from the console output. +-Please attach any additional failure logs mentioned in the console output. + +**Additional context** +Add any other context about the problem here, such as what you have already tried to resolve the issue. diff --git a/externals/vcpkg/.github/ISSUE_TEMPLATE/request-a-feature-or-improvement-to-a-port.md b/externals/vcpkg/.github/ISSUE_TEMPLATE/request-a-feature-or-improvement-to-a-port.md new file mode 100755 index 000000000..a40036f95 --- /dev/null +++ b/externals/vcpkg/.github/ISSUE_TEMPLATE/request-a-feature-or-improvement-to-a-port.md @@ -0,0 +1,22 @@ +--- +name: Request a feature or improvement to a port +about: Suggest an improvement to one the the ports/libraries in vcpkg +title: "[] " +labels: port feature +assignees: '' + +--- + +**** + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Proposed solution** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered if applicable. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/externals/vcpkg/.github/ISSUE_TEMPLATE/request-a-feature-or-improvement.md b/externals/vcpkg/.github/ISSUE_TEMPLATE/request-a-feature-or-improvement.md new file mode 100755 index 000000000..55d06b16a --- /dev/null +++ b/externals/vcpkg/.github/ISSUE_TEMPLATE/request-a-feature-or-improvement.md @@ -0,0 +1,22 @@ +--- +name: Request a feature or improvement +about: Suggest an improvement to vcpkg +title: '' +labels: vcpkg feature +assignees: '' + +--- + +**** + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Proposed solution** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/externals/vcpkg/.github/ISSUE_TEMPLATE/request-a-new-port.md b/externals/vcpkg/.github/ISSUE_TEMPLATE/request-a-new-port.md new file mode 100755 index 000000000..65c9bf01c --- /dev/null +++ b/externals/vcpkg/.github/ISSUE_TEMPLATE/request-a-new-port.md @@ -0,0 +1,18 @@ +--- +name: Request a new port +about: Request a new port/library that vcpkg should support +title: "[New Port Request] " +labels: new port request - consider making a PR! +assignees: '' + +--- + +Library name: + +Library description: + +Source repository URL: + +Project homepage (if different from the source repository): + +Anything else that is useful to know when adding (such as optional features the library may have that should be included): diff --git a/externals/vcpkg/.github/ISSUE_TEMPLATE/request-an-update-to-an-existing-port.md b/externals/vcpkg/.github/ISSUE_TEMPLATE/request-an-update-to-an-existing-port.md new file mode 100755 index 000000000..f1689b097 --- /dev/null +++ b/externals/vcpkg/.github/ISSUE_TEMPLATE/request-an-update-to-an-existing-port.md @@ -0,0 +1,14 @@ +--- +name: Request an update to an existing port +about: Let us know about a new version of a library we should pick up. +title: "[] update to " +labels: port feature +assignees: '' + +--- + +Library name: + +New version number: + +Other information that may be useful (release notes, etc...) diff --git a/externals/vcpkg/.github/pull_request_template.md b/externals/vcpkg/.github/pull_request_template.md new file mode 100755 index 000000000..9253eadcb --- /dev/null +++ b/externals/vcpkg/.github/pull_request_template.md @@ -0,0 +1,15 @@ +**Describe the pull request** + +- #### What does your PR fix? + Fixes #... + +- #### Which triplets are supported/not supported? Have you updated the [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)? + , + +- #### Does your PR follow the [maintainer guide](https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/maintainer-guide.md)? + `Your answer` + +- #### If you have added/updated a port: Have you run `./vcpkg x-add-version --all` and committed the result? + + +**If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/** diff --git a/externals/vcpkg/.github/workflows/trustedPR.yml b/externals/vcpkg/.github/workflows/trustedPR.yml new file mode 100755 index 000000000..c2d860493 --- /dev/null +++ b/externals/vcpkg/.github/workflows/trustedPR.yml @@ -0,0 +1,58 @@ +# Modelled after https://securitylab.github.com/research/github-actions-preventing-pwn-requests/ + +name: Post PR Suggestions + +on: + workflow_run: + workflows: ["PR Suggestions"] + types: + - completed + +jobs: + comment: + runs-on: ubuntu-latest + if: > + ${{ github.event.workflow_run.event == 'pull_request' && + github.event.workflow_run.conclusion == 'success' }} + + steps: + - name: 'Download artifact' + uses: actions/github-script@v6 + with: + script: | + var artifacts = await github.rest.actions.listWorkflowRunArtifacts({ + owner: context.repo.owner, + repo: context.repo.repo, + run_id: ${{github.event.workflow_run.id }}, + }); + var matchArtifact = artifacts.data.artifacts.filter((artifact) => { + return artifact.name == "pr" + })[0]; + var download = await github.rest.actions.downloadArtifact({ + owner: context.repo.owner, + repo: context.repo.repo, + artifact_id: matchArtifact.id, + archive_format: 'zip', + }); + var fs = require('fs'); + fs.writeFileSync('${{github.workspace}}/pr.zip', Buffer.from(download.data)); + - run: unzip pr.zip + + - uses: actions/github-script@v6 + with: + script: | + const { promises: fs } = require('fs') + const event = (await fs.readFile('event', 'utf8')).trim() + const body = (await fs.readFile('body', 'utf8')).trim() + const issue_number = Number(await fs.readFile('./NR')); + + var req = { + owner: context.repo.owner, + pull_number: issue_number, + repo: context.repo.repo, + event: event + }; + if (body !== "") { + req.body = body; + } + await github.rest.pulls.createReview(req); diff --git a/externals/vcpkg/.github/workflows/untrustedPR.yml b/externals/vcpkg/.github/workflows/untrustedPR.yml new file mode 100755 index 000000000..141c7efd4 --- /dev/null +++ b/externals/vcpkg/.github/workflows/untrustedPR.yml @@ -0,0 +1,147 @@ +# Modelled after https://securitylab.github.com/research/github-actions-preventing-pwn-requests/ + +# These "checks" are also performed as part of our critical-path azure-pipelines review, +# however here they are better able to post back to the original PR +name: PR Suggestions + +on: + pull_request: + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + with: + # fetch-depth 50 tries to ensure we capture the whole history of the branch + fetch-depth: 50 + + - uses: actions/cache@v2 + id: cache + with: + path: | + ./vcpkg + key: ${{ runner.os }}-${{ hashFiles('scripts/bootstrap*') }} + + - name: bootstrap + if: steps.cache.outputs.cache-hit != 'true' + run: ./bootstrap-vcpkg.sh + + - name: Save PR number + run: | + mkdir -p ./pr + echo ${{ github.event.number }} > ./pr/NR + + - name: Formatting + run: | + git config user.email github-actions + git config user.name github-actions@github.com + + git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*portfile.cmake' | sed 's/[MAR]\t*//' | while read filename; do grep -q -E '(vcpkg_install_cmake|vcpkg_build_cmake|vcpkg_configure_cmake|vcpkg_fixup_cmake_targets)' "$filename" && echo " - \`$filename\`" || true; done > .github-pr.deprecated-cmake + git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*vcpkg.json' | sed 's/[MAR]\t*//' > .github-pr.changed-manifest-files + cat .github-pr.changed-manifest-files | while read filename; do grep -q -E '"license": ' "$filename" || echo " - \`$filename\`" || true; done > .github-pr.missing-license + cat .github-pr.changed-manifest-files | while read filename; do match=$(grep -oiP '"license": ".*\K(AGPL-1\.0|AGPL-3\.0|BSD-2-Clause-FreeBSD|BSD-2-Clause-NetBSD|bzip2-1\.0\.5|eCos-2\.0|GFDL-1\.1|GFDL-1\.2|GFDL-1\.3|GPL-1\.0|GPL-1\.0\+|GPL-2\.0|GPL-2\.0\+|GPL-2\.0-with-autoconf-exception|GPL-2\.0-with-bison-exception|GPL-2\.0-with-classpath-exception|GPL-2\.0-with-font-exception|GPL-2\.0-with-GCC-exception|GPL-3\.0|GPL-3\.0\+|GPL-3\.0-with-autoconf-exception|GPL-3\.0-with-GCC-exception|LGPL-2\.0|LGPL-2\.0\+|LGPL-2\.1|LGPL-2\.1\+|LGPL-3\.0|LGPL-3\.0\+|Nunit|StandardML-NJ|wxWindows)(?=[ "])' "$filename" || true); if [ ! -z "$match" ]; then echo " - \`$filename\` (has deprecated license \`$match\`)" ; fi ; done > .github-pr.deprecated-license + ./vcpkg format-manifest --all --convert-control + git diff > .github-pr.format-manifest + git add -u + git commit -m "tmp" --allow-empty + # HEAD^^ refers to the "main" commit that was merged into + git checkout HEAD^^ -- versions + git restore --staged versions + ./vcpkg x-add-version --all --skip-formatting-check | grep 'instead of "version-string"' | tee .github-pr.version-string.out || true + git checkout -- versions + ./vcpkg x-add-version --all --skip-formatting-check --skip-version-format-check | tee .github-pr.x-add-version.out || true + git diff > .github-pr.x-add-version.diff + git reset HEAD~ --mixed + + - uses: actions/github-script@v6 + with: + script: | + const { promises: fs } = require('fs') + const add_version = (await fs.readFile('.github-pr.x-add-version.diff', 'utf8')).trim() + const add_version_out = (await fs.readFile('.github-pr.x-add-version.out', 'utf8')).trim() + const version_string_out = (await fs.readFile('.github-pr.version-string.out', 'utf8')).trim() + const format = (await fs.readFile('.github-pr.format-manifest', 'utf8')).trim() + const cmake = (await fs.readFile('.github-pr.deprecated-cmake', 'utf8')).trim() + const missing_license = (await fs.readFile('.github-pr.missing-license', 'utf8')).trim() + const deprecated_license = (await fs.readFile('.github-pr.deprecated-license', 'utf8')).trim() + + let approve = true; + var output = '' + if (format !== "") { + output += "
All manifest files must be formatted\n\n" + output += "`./vcpkg format-manifest ports/*/vcpkg.json`\n" + output += "
Diff\n\n" + output += "```diff\n" + format + "\n```\n" + output += "
\n\n" + approve = false; + } + if (add_version_out !== "") { + output += "
PRs must add only one version and must not modify any published versions\n\n" + output += "When making any changes to a library, the version or port-version in `vcpkg.json` or `CONTROL` must be modified.\n" + output += "```\n" + add_version_out + "\n```\n
\n\n" + approve = false; + } + if (version_string_out !== "") { + output += version_string_out + "\n\n" + } + if (add_version !== "") { + output += "
After committing all other changes, the version database must be updated\n\n" + output += "```sh\n" + output += "git add -u && git commit\n" + output += "git checkout ${{ github.event.pull_request.base.sha }} -- versions\n" + output += "./vcpkg x-add-version --all\n" + output += "```\n" + output += "
Diff\n\n" + output += "```diff\n" + add_version + "\n```\n" + output += "
\n\n" + approve = false; + } + if (cmake !== "") { + output += "You have modified or added at least one portfile where deprecated functions are used.\n" + output += "
\n\n" + output += "If you feel able to do so, please consider migrating them to the new functions:\n" + output += " `vcpkg_install_cmake` -> `vcpkg_cmake_install` (from port `vcpkg-cmake`)\n" + output += " `vcpkg_build_cmake` -> `vcpkg_cmake_build` (from port `vcpkg-cmake`)\n" + output += " `vcpkg_configure_cmake` -> `vcpkg_cmake_configure` (Please remove the option `PREFER_NINJA`) (from port `vcpkg-cmake`)\n" + output += " `vcpkg_fixup_cmake_targets` -> `vcpkg_cmake_config_fixup` (from port `vcpkg-cmake-config`)\n" + output += "\n" + output += "In the ports that use the new function, you have to add the corresponding dependencies:\n" + output += "```json\n" + output += '{\n "name": "vcpkg-cmake",\n "host": true\n},\n' + output += '{\n "name": "vcpkg-cmake-config",\n "host": true\n}\n' + output += "```\n" + output += `The following files are affected:\n${cmake}\n` + output += "
\n\n" + } + if (missing_license !== "" || deprecated_license !== "") { + output += 'You have modified or added at least one vcpkg.json where you should check the `license` field.\n' + output += "
\n\n" + if (missing_license !== "") { + output += 'If you feel able to do so, please consider adding a "license" field to the following files:\n' + output += missing_license + output += "\n\nValid values for the license field can be found in the [documentation](https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/manifest-files.md#license)\n\n" + } + if (deprecated_license !== "") { + output += 'If you feel able to do so, please consider replacing the deprecated license identifiers in the following files:\n' + output += deprecated_license + output += "\n\nDeprecated and non deprecated license identifiers can be found [here](https://spdx.github.io/spdx-spec/SPDX-license-list/#a3-deprecated-licenses)\n" + } + output += "
\n\n" + } + + if (approve) { + await fs.writeFile("pr/event", "APPROVE") + } else { + output = "_This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!_\n\n" + output + await fs.writeFile("pr/event", "REQUEST_CHANGES") + } + await fs.writeFile("pr/body", output) + + console.log(output); + + - uses: actions/upload-artifact@v3 + with: + name: pr + path: pr/ diff --git a/externals/vcpkg/.github/workflows/validateDocs.yml b/externals/vcpkg/.github/workflows/validateDocs.yml new file mode 100755 index 000000000..aabdb97b0 --- /dev/null +++ b/externals/vcpkg/.github/workflows/validateDocs.yml @@ -0,0 +1,54 @@ +name: Doc Validation + +on: + pull_request: + paths: + - 'docs/**' + +jobs: + validate: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + path: vcpkg + + - name: Checkout Website + uses: actions/checkout@v3 + with: + repository: vcpkg/vcpkg.github.io + ref: '8ee5cacc91b6e017b5e4236940d9f385c1563598' + path: vcpkg.github.io + + - uses: actions/cache@v3 + with: + path: ~/.npm + key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-node- + + - run: npm ci + working-directory: vcpkg.github.io + + - name: Purge existing html files + run: rm -rf en + working-directory: vcpkg.github.io + + # The current navbar embeds a link to integration.md which no longer exists + - name: Ignore navbar + run: echo "" > templates/navbar.html + working-directory: vcpkg.github.io + + - name: Generate Core Pages + run: node scripts/generatePages.js + working-directory: vcpkg.github.io + + - name: Generate Docs Pages + run: node scripts/generateDocs.js ../vcpkg/docs + working-directory: vcpkg.github.io + + - name: Check Links + run: VCPKG_VALIDATE_LINKS_ONLY_DOCS=1 node scripts/validateLinks.js + working-directory: vcpkg.github.io diff --git a/externals/vcpkg/.gitignore b/externals/vcpkg/.gitignore new file mode 100755 index 000000000..6aff3dc65 --- /dev/null +++ b/externals/vcpkg/.gitignore @@ -0,0 +1,322 @@ +############################################################ +# Visual Studio - Start +############################################################ + +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.userosscache +*.sln.docstates +/vcpkg-configuration.json + +# fuzzing +sync_dir* + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +# Ignore the executable +/vcpkg +/vcpkg.exe + +# Visual Studio 2015 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# DNX +project.lock.json +project.fragment.lock.json +artifacts/ + +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# TODO: Comment the next line if you want to checkin your web deploy settings +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/packages/* +# except build/, which is used as an MSBuild target. +!**/packages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/packages/repositories.config +# NuGet v3's project.json files produces more ignoreable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.pfx +*.publishsettings +node_modules/ +orleans.codegen.cs + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +*.mdf +*.ldf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush +.cr/ + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +############################################################ +# Visual Studio - End +############################################################ + + +############################################################ +# vcpkg - Start +############################################################ + +.vscode/ +*.code-workspace +/buildtrees/ +/build*/ +/downloads/ +/installed*/ +/packages/ +/scripts/buildsystems/tmp/ +#ignore custom triplets +/triplets/* +#add vcpkg-designed triplets back in +!/triplets/arm-uwp.cmake +!/triplets/arm64-windows.cmake +!/triplets/x64-linux.cmake +!/triplets/x64-osx.cmake +!/triplets/x64-uwp.cmake +!/triplets/x64-windows-static.cmake +!/triplets/x64-windows.cmake +!/triplets/x86-windows.cmake + +!/triplets/community +!/triplets/community/** + +*.exe +*.zip + +############################################################ +# vcpkg - End +############################################################ +vcpkg.disable-metrics +archives +.DS_Store +prefab/ +*.swp + +################### +# Codespaces +################### +pythonenv3.8/ +.venv/ + diff --git a/externals/vcpkg/.vcpkg-root b/externals/vcpkg/.vcpkg-root new file mode 100755 index 000000000..e69de29bb diff --git a/externals/vcpkg/CHANGELOG.md b/externals/vcpkg/CHANGELOG.md new file mode 100755 index 000000000..e0f9eba5f --- /dev/null +++ b/externals/vcpkg/CHANGELOG.md @@ -0,0 +1,17525 @@ +vcpkg (2021.05.01 - 2021.05.12) + +--- +#### Total port count: 1669 +#### Total port count per triplet (tested): +|triplet|ports available| +|---|---| +|**x64-windows**|1531| +|**x64-linux**|1441| +|**x64-osx**|1348| +|x86-windows|1521| +|x64-windows-static-md|1468| +|x64-windows-static|1455| +|arm64-windows|1139| +|x64-uwp|856| +|arm-uwp|811| + +
+The following documentation has been updated: + +- [registries.md](docs/maintainers/registries.md) ***[NEW]*** + - [(#17672)](https://github.com/microsoft/vcpkg/pull/17672) [docs registries] Add reference documentation (by @strega-nil) +- [registries.md](docs/users/registries.md) ***[NEW]*** + - [(#17672)](https://github.com/microsoft/vcpkg/pull/17672) [docs registries] Add reference documentation (by @strega-nil) +- [privacy.md](docs/about/privacy.md) + - [(#17560)](https://github.com/microsoft/vcpkg/pull/17560) [doc] Fix spelling errors (by @dg0yt) +- [modify-baseline-to-pin-old-boost.md](docs/examples/modify-baseline-to-pin-old-boost.md) + - [(#17560)](https://github.com/microsoft/vcpkg/pull/17560) [doc] Fix spelling errors (by @dg0yt) +- [vcpkg_android.cmake](docs/examples/vcpkg_android_example_cmake_script/cmake/vcpkg_android.cmake) + - [(#17560)](https://github.com/microsoft/vcpkg/pull/17560) [doc] Fix spelling errors (by @dg0yt) +- [versioning.getting-started.md](docs/examples/versioning.getting-started.md) + - [(#17560)](https://github.com/microsoft/vcpkg/pull/17560) [doc] Fix spelling errors (by @dg0yt) + - [(#17580)](https://github.com/microsoft/vcpkg/pull/17580) [docs] Consolidate versioning documentation (by @ras0219-msft) +- [control-files.md](docs/maintainers/control-files.md) + - [(#17560)](https://github.com/microsoft/vcpkg/pull/17560) [doc] Fix spelling errors (by @dg0yt) +- [maintainer-guide.md](docs/maintainers/maintainer-guide.md) + - [(#17580)](https://github.com/microsoft/vcpkg/pull/17580) [docs] Consolidate versioning documentation (by @ras0219-msft) +- [manifest-files.md](docs/maintainers/manifest-files.md) + - [(#17560)](https://github.com/microsoft/vcpkg/pull/17560) [doc] Fix spelling errors (by @dg0yt) +- [portfile-functions.md](docs/maintainers/portfile-functions.md) + - [(#17179)](https://github.com/microsoft/vcpkg/pull/17179) [docs] link to new functions in deprecated warnings (by @autoantwort) +- [vcpkg_cmake_configure.md](docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md) + - [(#17560)](https://github.com/microsoft/vcpkg/pull/17560) [doc] Fix spelling errors (by @dg0yt) +- [vcpkg_apply_patches.md](docs/maintainers/vcpkg_apply_patches.md) + - [(#17179)](https://github.com/microsoft/vcpkg/pull/17179) [docs] link to new functions in deprecated warnings (by @autoantwort) +- [vcpkg_build_cmake.md](docs/maintainers/vcpkg_build_cmake.md) + - [(#17179)](https://github.com/microsoft/vcpkg/pull/17179) [docs] link to new functions in deprecated warnings (by @autoantwort) + - [(#17560)](https://github.com/microsoft/vcpkg/pull/17560) [doc] Fix spelling errors (by @dg0yt) +- [vcpkg_build_make.md](docs/maintainers/vcpkg_build_make.md) + - [(#17560)](https://github.com/microsoft/vcpkg/pull/17560) [doc] Fix spelling errors (by @dg0yt) +- [vcpkg_build_nmake.md](docs/maintainers/vcpkg_build_nmake.md) + - [(#17560)](https://github.com/microsoft/vcpkg/pull/17560) [doc] Fix spelling errors (by @dg0yt) +- [vcpkg_configure_cmake.md](docs/maintainers/vcpkg_configure_cmake.md) + - [(#17179)](https://github.com/microsoft/vcpkg/pull/17179) [docs] link to new functions in deprecated warnings (by @autoantwort) +- [vcpkg_copy_tools.md](docs/maintainers/vcpkg_copy_tools.md) + - [(#17560)](https://github.com/microsoft/vcpkg/pull/17560) [doc] Fix spelling errors (by @dg0yt) +- [vcpkg_fixup_cmake_targets.md](docs/maintainers/vcpkg_fixup_cmake_targets.md) + - [(#17179)](https://github.com/microsoft/vcpkg/pull/17179) [docs] link to new functions in deprecated warnings (by @autoantwort) +- [vcpkg_install_cmake.md](docs/maintainers/vcpkg_install_cmake.md) + - [(#17179)](https://github.com/microsoft/vcpkg/pull/17179) [docs] link to new functions in deprecated warnings (by @autoantwort) +- [README.md](docs/README.md) + - [(#17672)](https://github.com/microsoft/vcpkg/pull/17672) [docs registries] Add reference documentation (by @strega-nil) +- [regenerate.ps1](docs/regenerate.ps1) + - [(#17179)](https://github.com/microsoft/vcpkg/pull/17179) [docs] link to new functions in deprecated warnings (by @autoantwort) +- [prefab.md](docs/specifications/prefab.md) + - [(#17560)](https://github.com/microsoft/vcpkg/pull/17560) [doc] Fix spelling errors (by @dg0yt) +- [registries.md](docs/specifications/registries.md) + - [(#17560)](https://github.com/microsoft/vcpkg/pull/17560) [doc] Fix spelling errors (by @dg0yt) +- [registries-2.md](docs/specifications/registries-2.md) + - [(#17560)](https://github.com/microsoft/vcpkg/pull/17560) [doc] Fix spelling errors (by @dg0yt) +- [versioning.md](docs/specifications/versioning.md) + - [(#17560)](https://github.com/microsoft/vcpkg/pull/17560) [doc] Fix spelling errors (by @dg0yt) +- [android.md](docs/users/android.md) + - [(#17560)](https://github.com/microsoft/vcpkg/pull/17560) [doc] Fix spelling errors (by @dg0yt) +- [config-environment.md](docs/users/config-environment.md) + - [(#17560)](https://github.com/microsoft/vcpkg/pull/17560) [doc] Fix spelling errors (by @dg0yt) + - [(#17580)](https://github.com/microsoft/vcpkg/pull/17580) [docs] Consolidate versioning documentation (by @ras0219-msft) +- [manifests.md](docs/users/manifests.md) + - [(#17580)](https://github.com/microsoft/vcpkg/pull/17580) [docs] Consolidate versioning documentation (by @ras0219-msft) +- [versioning.implementation-details.md](docs/users/versioning.implementation-details.md) + - [(#17560)](https://github.com/microsoft/vcpkg/pull/17560) [doc] Fix spelling errors (by @dg0yt) +- [versioning.md](docs/users/versioning.md) + - [(#17580)](https://github.com/microsoft/vcpkg/pull/17580) [docs] Consolidate versioning documentation (by @ras0219-msft) +- [versioning.reference.md](docs/users/versioning.reference.md) + - [(#17580)](https://github.com/microsoft/vcpkg/pull/17580) [docs] Consolidate versioning documentation (by @ras0219-msft) + +
+The following changes have been made to vcpkg: + +- [(#16577)](https://github.com/microsoft/vcpkg/pull/16577) [icu] add host depedency (by @autoantwort) +- [(#16847)](https://github.com/microsoft/vcpkg/pull/16847) Compile for android including armv6. (by @talregev) +- [(#16965)](https://github.com/microsoft/vcpkg/pull/16965) [libfido2] New port (by @xgcssch) +- [(#17019)](https://github.com/microsoft/vcpkg/pull/17019) [fontconfig] Add cflags in tools build command (by @xandox) +- [(#17032)](https://github.com/microsoft/vcpkg/pull/17032) [libtcod] Update to 1.16.7 (by @HexDecimal) +- [(#17063)](https://github.com/microsoft/vcpkg/pull/17063) [cpuinfo,fbgemm,nnpack] update to latest source version and rename targets (by @luncliff) +- [(#17065)](https://github.com/microsoft/vcpkg/pull/17065) [qnnpack] create a new port (by @luncliff) +- [(#17099)](https://github.com/microsoft/vcpkg/pull/17099) [Forge] update version to 1.0.7 (by @9prady9) +- [(#17179)](https://github.com/microsoft/vcpkg/pull/17179) [docs] link to new functions in deprecated warnings (by @autoantwort) +- [(#17204)](https://github.com/microsoft/vcpkg/pull/17204) [ffmpeg] avdevice CoreAudio dependency fix for osx (by @mcmtroffaes) +- [(#17266)](https://github.com/microsoft/vcpkg/pull/17266) [libarchive] disable libb2 until properly handled (by @cenit) +- [(#17299)](https://github.com/microsoft/vcpkg/pull/17299) [ffmpeg] soxr dependency fix (by @mcmtroffaes) +- [(#17424)](https://github.com/microsoft/vcpkg/pull/17424) [grpc] Create codegen feature (by @ras0219) +- [(#17431)](https://github.com/microsoft/vcpkg/pull/17431) [nccl] Remove NCCL auto-download due to licensing issues (by @jacobkahn) +- [(#17456)](https://github.com/microsoft/vcpkg/pull/17456) [Openssl] Fix mingw build (by @dg0yt) +- [(#17533)](https://github.com/microsoft/vcpkg/pull/17533) [cryptopp] Update to 8.5.0 (by @orudge) +- [(#17560)](https://github.com/microsoft/vcpkg/pull/17560) [doc] Fix spelling errors (by @dg0yt) +- [(#17580)](https://github.com/microsoft/vcpkg/pull/17580) [docs] Consolidate versioning documentation (by @ras0219-msft) +- [(#17589)](https://github.com/microsoft/vcpkg/pull/17589) [ghc-filesystem] Fix port/package name discrepancy (by @AndyBrown91) +- [(#17593)](https://github.com/microsoft/vcpkg/pull/17593) [vcpkg baseline][libheif] fix CI errors if gdk-pixbuf can be found (by @Neumann-A) +- [(#17596)](https://github.com/microsoft/vcpkg/pull/17596) [cairo] Windows: Fix cairo dll definition (by @Neumann-A) +- [(#17597)](https://github.com/microsoft/vcpkg/pull/17597) [infoware] Bump version to 0.6.0 (by @nabijaczleweli) +- [(#17598)](https://github.com/microsoft/vcpkg/pull/17598) [hdf5] fix pc files (by @Neumann-A) +- [(#17610)](https://github.com/microsoft/vcpkg/pull/17610) [hidapi] fix mac build (by @autoantwort) +- [(#17611)](https://github.com/microsoft/vcpkg/pull/17611) [asio] Add inline dummy return patch (by @pratikpc) +- [(#17620)](https://github.com/microsoft/vcpkg/pull/17620) [cairo] update to 1.17.4 (by @Neumann-A) +- [(#17624)](https://github.com/microsoft/vcpkg/pull/17624) [libass] Update to 0.15.1 (by @Masaiki) +- [(#17625)](https://github.com/microsoft/vcpkg/pull/17625) [ffmpeg] fix optional X11 platform dependencies (by @mcmtroffaes) +- [(#17629)](https://github.com/microsoft/vcpkg/pull/17629) [msmpi] Update the download hash (by @JackBoosY) +- [(#17631)](https://github.com/microsoft/vcpkg/pull/17631) [tool-meson] update to 0.58 (by @Neumann-A) +- [(#17633)](https://github.com/microsoft/vcpkg/pull/17633) Add g++-11 support (by @xieyubo) +- [(#17634)](https://github.com/microsoft/vcpkg/pull/17634) [pthreadpool] remove unused dependency (by @luncliff) +- [(#17637)](https://github.com/microsoft/vcpkg/pull/17637) [libffi] Update patch to fix apply patch failure (by @JackBoosY) +- [(#17641)](https://github.com/microsoft/vcpkg/pull/17641) [DCMTK] Update to 3.6.6 (by @BigSeb) +- [(#17648)](https://github.com/microsoft/vcpkg/pull/17648) [seal]Updated to version 3.6.4 (by @WeiDaiWD) +- [(#17659)](https://github.com/microsoft/vcpkg/pull/17659) [ffmpeg] fix dnn dependency (by @mcmtroffaes) +- [(#17661)](https://github.com/microsoft/vcpkg/pull/17661) [google-cloud-cpp] update to latest (v1.27.0) version (by @coryan) +- [(#17666)](https://github.com/microsoft/vcpkg/pull/17666) [qt5-base] fix install / packages dir being on different drives (by @Neumann-A) +- [(#17669)](https://github.com/microsoft/vcpkg/pull/17669) [gtkmm] Update to 4.0.1 (by @Neumann-A) +- [(#17670)](https://github.com/microsoft/vcpkg/pull/17670) [gtk] update to 4.3.0 (by @Neumann-A) +- [(#17672)](https://github.com/microsoft/vcpkg/pull/17672) [docs registries] Add reference documentation (by @strega-nil) +- [(#17675)](https://github.com/microsoft/vcpkg/pull/17675) [Hedley] Update to v15 (by @pratikpc) +- [(#17682)](https://github.com/microsoft/vcpkg/pull/17682) [fann] Support UNIX, re-fix installation (by @JackBoosY) +- [(#17683)](https://github.com/microsoft/vcpkg/pull/17683) [igraph] update to 0.9.3 (by @szhorvat) +- [(#17689)](https://github.com/microsoft/vcpkg/pull/17689) [vcpkg] Update vcpkg tool version 2021-05-05 (by @ras0219-msft) +- [(#17706)](https://github.com/microsoft/vcpkg/pull/17706) [vcpkg] Update cmake to 3.20.2 (by @Neumann-A) +- [(#17709)](https://github.com/microsoft/vcpkg/pull/17709) [gtest] Update to the latest commit (by @JonLiu1993) +- [(#17710)](https://github.com/microsoft/vcpkg/pull/17710) [libheif] Install pdbs (by @JackBoosY) +- [(#17711)](https://github.com/microsoft/vcpkg/pull/17711) [protopuf] Update to 2.0.0 (by @PragmaTwice) +- [(#17714)](https://github.com/microsoft/vcpkg/pull/17714) [vcpkg baseline][asiosdk] Update hash (by @NancyLi1013) +- [(#17733)](https://github.com/microsoft/vcpkg/pull/17733) [brynet] upgrade version 1.11.0 (by @IronsDu) +- [(#17736)](https://github.com/microsoft/vcpkg/pull/17736) [draco] Fix build error in gcc 11 (by @NancyLi1013) +- [(#17749)](https://github.com/microsoft/vcpkg/pull/17749) [d3dx12] update port (by @walbourn) +- [(#17771)](https://github.com/microsoft/vcpkg/pull/17771) [fastlz] update to the latest commit (by @JonLiu1993) +- [(#17774)](https://github.com/microsoft/vcpkg/pull/17774) [abseil] vcpkg_fixup_pkgconfig (by @Neumann-A) +- [(#17775)](https://github.com/microsoft/vcpkg/pull/17775) [allgero5] vcpkg_fixup_pkgconfig (by @Neumann-A) +- [(#17797)](https://github.com/microsoft/vcpkg/pull/17797) [vcpkg baseline][chartdir] Update version to 7.0.0 (by @Cheney-W) +- [(#17862)](https://github.com/microsoft/vcpkg/pull/17862) [sobjectizer] Update to 5.7.2.4 (by @eao197) + +
+ +
+The following 50 ports have been updated: + +- google-cloud-cpp `#0` -> `#0` + - [(#17661)](https://github.com/microsoft/vcpkg/pull/17661) [google-cloud-cpp] update to latest (v1.27.0) version (by @coryan) +- fbgemm `#0` -> `#0` + - [(#17063)](https://github.com/microsoft/vcpkg/pull/17063) [cpuinfo,fbgemm,nnpack] update to latest source version and rename targets (by @luncliff) +- icu `69.1#8` -> `69.1#0` + - [(#16577)](https://github.com/microsoft/vcpkg/pull/16577) [icu] add host depedency (by @autoantwort) +- ghc-filesystem `#0` -> `#0` + - [(#17589)](https://github.com/microsoft/vcpkg/pull/17589) [ghc-filesystem] Fix port/package name discrepancy (by @AndyBrown91) +- vcpkg-cmake `#0` -> `#0` + - [(#17560)](https://github.com/microsoft/vcpkg/pull/17560) [doc] Fix spelling errors (by @dg0yt) +- grpc `#0` -> `#0` + - [(#17424)](https://github.com/microsoft/vcpkg/pull/17424) [grpc] Create codegen feature (by @ras0219) +- sobjectizer `#0` -> `#0` + - [(#17862)](https://github.com/microsoft/vcpkg/pull/17862) [sobjectizer] Update to 5.7.2.4 (by @eao197) +- openssl `1.1.1k#0` -> `1.1.1k#0` + - [(#17456)](https://github.com/microsoft/vcpkg/pull/17456) [Openssl] Fix mingw build (by @dg0yt) +- cryptopp `8.2.0-2#0` -> `8.5.0#0` + - [(#17533)](https://github.com/microsoft/vcpkg/pull/17533) [cryptopp] Update to 8.5.0 (by @orudge) +- pthreadpool `#0` -> `#0` + - [(#17634)](https://github.com/microsoft/vcpkg/pull/17634) [pthreadpool] remove unused dependency (by @luncliff) +- dcmtk `3.6.5+_20191213#0` -> `3.6.6#0` + - [(#17641)](https://github.com/microsoft/vcpkg/pull/17641) [DCMTK] Update to 3.6.6 (by @BigSeb) +- cairo `#0` -> `#0` + - [(#17596)](https://github.com/microsoft/vcpkg/pull/17596) [cairo] Windows: Fix cairo dll definition (by @Neumann-A) + - [(#17620)](https://github.com/microsoft/vcpkg/pull/17620) [cairo] update to 1.17.4 (by @Neumann-A) +- libfido2 `#0` -> `#0` + - [(#16965)](https://github.com/microsoft/vcpkg/pull/16965) [libfido2] New port (by @xgcssch) +- allegro5 `5.2.6.0#0` -> `5.2.6.0#0` + - [(#17775)](https://github.com/microsoft/vcpkg/pull/17775) [allgero5] vcpkg_fixup_pkgconfig (by @Neumann-A) +- draco `1.3.6#0` -> `1.3.6#0` + - [(#17736)](https://github.com/microsoft/vcpkg/pull/17736) [draco] Fix build error in gcc 11 (by @NancyLi1013) +- protopuf `1.0.1#0` -> `1.0.1#0` + - [(#17711)](https://github.com/microsoft/vcpkg/pull/17711) [protopuf] Update to 2.0.0 (by @PragmaTwice) +- cpuinfo `2019-07-28-1#0` -> `2019-07-28-1#0` + - [(#17063)](https://github.com/microsoft/vcpkg/pull/17063) [cpuinfo,fbgemm,nnpack] update to latest source version and rename targets (by @luncliff) +- igraph `#0` -> `#0` + - [(#17683)](https://github.com/microsoft/vcpkg/pull/17683) [igraph] update to 0.9.3 (by @szhorvat) +- tool-meson `0.56.02#0` -> `0.56.02#0` + - [(#17631)](https://github.com/microsoft/vcpkg/pull/17631) [tool-meson] update to 0.58 (by @Neumann-A) +- libtcod `1.16.6#0` -> `1.16.6#0` + - [(#17032)](https://github.com/microsoft/vcpkg/pull/17032) [libtcod] Update to 1.16.7 (by @HexDecimal) +- chartdir `6.3.1#2` -> `6.3.1#0` + - [(#17797)](https://github.com/microsoft/vcpkg/pull/17797) [vcpkg baseline][chartdir] Update version to 7.0.0 (by @Cheney-W) +- fontconfig `2.13.1#6` -> `2.13.1#7` + - [(#17019)](https://github.com/microsoft/vcpkg/pull/17019) [fontconfig] Add cflags in tools build command (by @xandox) +- hidapi `#0` -> `#0` + - [(#17610)](https://github.com/microsoft/vcpkg/pull/17610) [hidapi] fix mac build (by @autoantwort) +- asio `#0` -> `#0` + - [(#17611)](https://github.com/microsoft/vcpkg/pull/17611) [asio] Add inline dummy return patch (by @pratikpc) +- seal `3.6.2#0` -> `3.6.4#0` + - [(#17648)](https://github.com/microsoft/vcpkg/pull/17648) [seal]Updated to version 3.6.4 (by @WeiDaiWD) +- libass `0.15.0#0` -> `0.15.0#0` + - [(#17624)](https://github.com/microsoft/vcpkg/pull/17624) [libass] Update to 0.15.1 (by @Masaiki) +- forge `#0` -> `#0` + - [(#17099)](https://github.com/microsoft/vcpkg/pull/17099) [Forge] update version to 1.0.7 (by @9prady9) +- qt5-base `#0` -> `#0` + - [(#17666)](https://github.com/microsoft/vcpkg/pull/17666) [qt5-base] fix install / packages dir being on different drives (by @Neumann-A) +- d3dx12 `may2020#0` -> `may2021#0` + - [(#17749)](https://github.com/microsoft/vcpkg/pull/17749) [d3dx12] update port (by @walbourn) +- qnnpack `#0` -> `#0` + - [(#17065)](https://github.com/microsoft/vcpkg/pull/17065) [qnnpack] create a new port (by @luncliff) +- asiosdk `2.3.3-1#0` -> `2.3.3-1#0` + - [(#17714)](https://github.com/microsoft/vcpkg/pull/17714) [vcpkg baseline][asiosdk] Update hash (by @NancyLi1013) +- liblsl `1.14.0#0` -> `1.14.0#1` + - [(#17689)](https://github.com/microsoft/vcpkg/pull/17689) [vcpkg] Update vcpkg tool version 2021-05-05 (by @ras0219-msft) +- libheif `1.10.0#0` -> `1.10.0#0` + - [(#17593)](https://github.com/microsoft/vcpkg/pull/17593) [vcpkg baseline][libheif] fix CI errors if gdk-pixbuf can be found (by @Neumann-A) + - [(#17710)](https://github.com/microsoft/vcpkg/pull/17710) [libheif] Install pdbs (by @JackBoosY) +- hedley `14#0` -> `14#0` + - [(#17675)](https://github.com/microsoft/vcpkg/pull/17675) [Hedley] Update to v15 (by @pratikpc) +- infoware `0.5.5#0` -> `0.6.0#0` + - [(#17597)](https://github.com/microsoft/vcpkg/pull/17597) [infoware] Bump version to 0.6.0 (by @nabijaczleweli) +- fann `2.2.0-1#0` -> `2.2.0-1#0` + - [(#17682)](https://github.com/microsoft/vcpkg/pull/17682) [fann] Support UNIX, re-fix installation (by @JackBoosY) +- libffi `#0` -> `#0` + - [(#17637)](https://github.com/microsoft/vcpkg/pull/17637) [libffi] Update patch to fix apply patch failure (by @JackBoosY) +- abseil `#0` -> `#0` + - [(#17774)](https://github.com/microsoft/vcpkg/pull/17774) [abseil] vcpkg_fixup_pkgconfig (by @Neumann-A) +- brynet `1.10.0#0` -> `1.11.0#0` + - [(#17733)](https://github.com/microsoft/vcpkg/pull/17733) [brynet] upgrade version 1.11.0 (by @IronsDu) +- libarchive `#0` -> `#0` + - [(#17266)](https://github.com/microsoft/vcpkg/pull/17266) [libarchive] disable libb2 until properly handled (by @cenit) +- gtk `#0` -> `#0` + - [(#17670)](https://github.com/microsoft/vcpkg/pull/17670) [gtk] update to 4.3.0 (by @Neumann-A) +- protobuf `#0` -> `#0` + - [(#17689)](https://github.com/microsoft/vcpkg/pull/17689) [vcpkg] Update vcpkg tool version 2021-05-05 (by @ras0219-msft) +- nnpack `#0` -> `#0` + - [(#17063)](https://github.com/microsoft/vcpkg/pull/17063) [cpuinfo,fbgemm,nnpack] update to latest source version and rename targets (by @luncliff) +- gtkmm `#0` -> `#0` + - [(#17669)](https://github.com/microsoft/vcpkg/pull/17669) [gtkmm] Update to 4.0.1 (by @Neumann-A) +- msmpi `10.1#0` -> `10.1#0` + - [(#17629)](https://github.com/microsoft/vcpkg/pull/17629) [msmpi] Update the download hash (by @JackBoosY) +- fastlz `1.0-3#0` -> `1.0-3#0` + - [(#17771)](https://github.com/microsoft/vcpkg/pull/17771) [fastlz] update to the latest commit (by @JonLiu1993) +- nccl `2.4.6#0` -> `2.4.6#0` + - [(#17431)](https://github.com/microsoft/vcpkg/pull/17431) [nccl] Remove NCCL auto-download due to licensing issues (by @jacobkahn) +- gtest `1.10.0#4` -> `1.10.0#0` + - [(#17709)](https://github.com/microsoft/vcpkg/pull/17709) [gtest] Update to the latest commit (by @JonLiu1993) +- hdf5 `1.12.0#1` -> `1.12.0#0` + - [(#17598)](https://github.com/microsoft/vcpkg/pull/17598) [hdf5] fix pc files (by @Neumann-A) +- ffmpeg `4.3.2#7` -> `4.3.2#11` + - [(#17204)](https://github.com/microsoft/vcpkg/pull/17204) [ffmpeg] avdevice CoreAudio dependency fix for osx (by @mcmtroffaes) + - [(#17299)](https://github.com/microsoft/vcpkg/pull/17299) [ffmpeg] soxr dependency fix (by @mcmtroffaes) + - [(#17625)](https://github.com/microsoft/vcpkg/pull/17625) [ffmpeg] fix optional X11 platform dependencies (by @mcmtroffaes) + - [(#17659)](https://github.com/microsoft/vcpkg/pull/17659) [ffmpeg] fix dnn dependency (by @mcmtroffaes) + +
+ +-- vcpkg team vcpkg@microsoft.com Thu, 13 May 00:00:00 -0700 + + +vcpkg (2020.11.03 - 2021.04.30) +--- +#### Total port count: 1667 +#### Total port count per triplet (tested): +|triplet|ports available| +|---|---| +|**x64-windows**|**1523**| +|**x64-linux**|**1433**| +|**x64-osx**|**1333**| +|x86-windows|1483| +|x64-windows-static-md|1441| +|x64-windows-static|1421| +|arm64-windows|1096| +|x64-uwp|829| +|arm-uwp|783| + +
+ +The following documentation has been updated: + +- [modify-baseline-to-pin-old-boost.md](docs/examples/modify-baseline-to-pin-old-boost.md) ***[NEW]*** + - [(#16381)](https://github.com/microsoft/vcpkg/pull/16381) [vcpkg] [docs] Add Boost versioning example (by @vicroms) +- [z_vcpkg_apply_patches.md](docs/maintainers/internal/z_vcpkg_apply_patches.md) ***[NEW]*** + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [z_vcpkg_function_arguments.md](docs/maintainers/internal/z_vcpkg_function_arguments.md) ***[NEW]*** + - [(#16130)](https://github.com/microsoft/vcpkg/pull/16130) [(z_)vcpkg_prettify_command(_line)] Scripts Tree Audit (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [z_vcpkg_prettify_command_line.md](docs/maintainers/internal/z_vcpkg_prettify_command_line.md) ***[NEW]*** + - [(#16130)](https://github.com/microsoft/vcpkg/pull/16130) [(z_)vcpkg_prettify_command(_line)] Scripts Tree Audit (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg-cmake.md](docs/maintainers/ports/vcpkg-cmake.md) ***[NEW]*** + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) +- [vcpkg_cmake_build.md](docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_build.md) ***[NEW]*** + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_cmake_configure.md](docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md) ***[NEW]*** + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_cmake_install.md](docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md) ***[NEW]*** + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg-cmake-config.md](docs/maintainers/ports/vcpkg-cmake-config.md) ***[NEW]*** + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) +- [vcpkg_cmake_config_fixup.md](docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md) ***[NEW]*** + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg-pkgconfig-get-modules.md](docs/maintainers/ports/vcpkg-pkgconfig-get-modules.md) ***[NEW]*** + - [(#16954)](https://github.com/microsoft/vcpkg/pull/16954) [vcpkg baseline][qt5-base] Fix glib link issues on linux (by @Neumann-A) +- [x_vcpkg_pkgconfig_get_modules.md](docs/maintainers/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.md) ***[NEW]*** + - [(#16954)](https://github.com/microsoft/vcpkg/pull/16954) [vcpkg baseline][qt5-base] Fix glib link issues on linux (by @Neumann-A) +- [vcpkg_build_qmake.md](docs/maintainers/vcpkg_build_qmake.md) ***[NEW]*** + - [(#14614)](https://github.com/microsoft/vcpkg/pull/14614) [vcpkg docs] Check for documentation generation in CI (by @strega-nil) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_buildpath_length_warning.md](docs/maintainers/vcpkg_buildpath_length_warning.md) ***[NEW]*** + - [(#14614)](https://github.com/microsoft/vcpkg/pull/14614) [vcpkg docs] Check for documentation generation in CI (by @strega-nil) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16191)](https://github.com/microsoft/vcpkg/pull/16191) [scripts-audit] vcpkg_buildpath_length_warning (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_configure_qmake.md](docs/maintainers/vcpkg_configure_qmake.md) ***[NEW]*** + - [(#14614)](https://github.com/microsoft/vcpkg/pull/14614) [vcpkg docs] Check for documentation generation in CI (by @strega-nil) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_execute_in_download_mode.md](docs/maintainers/vcpkg_execute_in_download_mode.md) ***[NEW]*** + - [(#13449)](https://github.com/microsoft/vcpkg/pull/13449) [gdal] Update to 3.1.3 (by @JackBoosY) + - [(#14614)](https://github.com/microsoft/vcpkg/pull/14614) [vcpkg docs] Check for documentation generation in CI (by @strega-nil) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_execute_required_process_repeat.md](docs/maintainers/vcpkg_execute_required_process_repeat.md) ***[NEW]*** + - [(#14614)](https://github.com/microsoft/vcpkg/pull/14614) [vcpkg docs] Check for documentation generation in CI (by @strega-nil) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_find_fortran.md](docs/maintainers/vcpkg_find_fortran.md) ***[NEW]*** + - [(#13449)](https://github.com/microsoft/vcpkg/pull/13449) [gdal] Update to 3.1.3 (by @JackBoosY) + - [(#14614)](https://github.com/microsoft/vcpkg/pull/14614) [vcpkg docs] Check for documentation generation in CI (by @strega-nil) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_get_program_files_platform_bitness.md](docs/maintainers/vcpkg_get_program_files_platform_bitness.md) ***[NEW]*** + - [(#14614)](https://github.com/microsoft/vcpkg/pull/14614) [vcpkg docs] Check for documentation generation in CI (by @strega-nil) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_get_windows_sdk.md](docs/maintainers/vcpkg_get_windows_sdk.md) ***[NEW]*** + - [(#14614)](https://github.com/microsoft/vcpkg/pull/14614) [vcpkg docs] Check for documentation generation in CI (by @strega-nil) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_internal_get_cmake_vars.md](docs/maintainers/vcpkg_internal_get_cmake_vars.md) ***[NEW]*** + - [(#13449)](https://github.com/microsoft/vcpkg/pull/13449) [gdal] Update to 3.1.3 (by @JackBoosY) +- [vcpkg_minimum_required.md](docs/maintainers/vcpkg_minimum_required.md) ***[NEW]*** + - [(#15638)](https://github.com/microsoft/vcpkg/pull/15638) [vcpkg] Add vcpkg_minimum_required as a replacement for VERSION.txt. (by @BillyONeal) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_replace_string.md](docs/maintainers/vcpkg_replace_string.md) ***[NEW]*** + - [(#14614)](https://github.com/microsoft/vcpkg/pull/14614) [vcpkg docs] Check for documentation generation in CI (by @strega-nil) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [registries-2.md](docs/specifications/registries-2.md) ***[NEW]*** + - [(#13590)](https://github.com/microsoft/vcpkg/pull/13590) [vcpkg registries] Registries: Take 2 (by @strega-nil) + - [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) +- [scripts-extraction.md](docs/specifications/scripts-extraction.md) ***[NEW]*** + - [(#16055)](https://github.com/microsoft/vcpkg/pull/16055) [vcpkg] Add scripts tree extraction notes. (by @BillyONeal) + - [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) +- [versioning.md](docs/specifications/versioning.md) ***[NEW]*** + - [(#11758)](https://github.com/microsoft/vcpkg/pull/11758) [vcpkg] RFC: Versioning (by @vicroms) + - [(#15784)](https://github.com/microsoft/vcpkg/pull/15784) [vcpkg] Rename `port_versions` to `versions` (by @strega-nil) + - [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) +- [host-dependencies.md](docs/users/host-dependencies.md) ***[NEW]*** + - [(#16627)](https://github.com/microsoft/vcpkg/pull/16627) [host dependencies] add support in the scripts (by @strega-nil) +- [mingw.md](docs/users/mingw.md) ***[NEW]*** + - [(#17219)](https://github.com/microsoft/vcpkg/pull/17219) Add mingw documentation (by @dg0yt) +- [versioning.getting-started.md](docs/users/versioning.getting-started.md) ***[NEW]*** + - [(#15693)](https://github.com/microsoft/vcpkg/pull/15693) [vcpkg] More versioning docs (by @vicroms) + - [(#16324)](https://github.com/microsoft/vcpkg/pull/16324) [vcpkg docs] Update the versioning.getting-started.md (by @PhoebeHui) +- [versioning.implementation-details.md](docs/users/versioning.implementation-details.md) ***[NEW]*** + - [(#15693)](https://github.com/microsoft/vcpkg/pull/15693) [vcpkg] More versioning docs (by @vicroms) + - [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) + - [(#17566)](https://github.com/microsoft/vcpkg/pull/17566) [docs] Fix broken links (by @PhoebeHui) +- [versioning.md](docs/users/versioning.md) ***[NEW]*** + - [(#15565)](https://github.com/microsoft/vcpkg/pull/15565) [vcpkg] Add initial versioning documentation (by @ras0219) + - [(#15693)](https://github.com/microsoft/vcpkg/pull/15693) [vcpkg] More versioning docs (by @vicroms) + - [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) + - [(#17566)](https://github.com/microsoft/vcpkg/pull/17566) [docs] Fix broken links (by @PhoebeHui) +- [versioning.reference.md](docs/users/versioning.reference.md) ***[NEW]*** + - [(#15693)](https://github.com/microsoft/vcpkg/pull/15693) [vcpkg] More versioning docs (by @vicroms) + - [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) + - [(#17566)](https://github.com/microsoft/vcpkg/pull/17566) [docs] Fix broken links (by @PhoebeHui) +- [faq.md](docs/about/faq.md) + - [(#15845)](https://github.com/microsoft/vcpkg/pull/15845) [docs] Correct the "new port requests" link in FAQ (by @claremacrae) + - [(#17257)](https://github.com/microsoft/vcpkg/pull/17257) [vcpkg docs] Add the procedure for updating vcpkg to faq (by @PhoebeHui) + - [(#17566)](https://github.com/microsoft/vcpkg/pull/17566) [docs] Fix broken links (by @PhoebeHui) +- [privacy.md](docs/about/privacy.md) + - [(#15474)](https://github.com/microsoft/vcpkg/pull/15474) [vcpkg] Download vcpkg.exe rather than building it in bootstrap on Windows. (by @BillyONeal) +- [manifest-mode-cmake.md](docs/examples/manifest-mode-cmake.md) + - [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) + - [(#17502)](https://github.com/microsoft/vcpkg/pull/17502) [doc] Fix example code. (by @w-gomes) +- [packaging-github-repos.md](docs/examples/packaging-github-repos.md) + - [(#15018)](https://github.com/microsoft/vcpkg/pull/15018) [cppunit] add linux support and bump version to 1.15.1 (by @dweckmann) +- [packaging-zipfiles.md](docs/examples/packaging-zipfiles.md) + - [(#15018)](https://github.com/microsoft/vcpkg/pull/15018) [cppunit] add linux support and bump version to 1.15.1 (by @dweckmann) +- [patching.md](docs/examples/patching.md) + - [(#17566)](https://github.com/microsoft/vcpkg/pull/17566) [docs] Fix broken links (by @PhoebeHui) +- [versioning.getting-started.md](docs/examples/versioning.getting-started.md) + - [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) +- [index.md](docs/index.md) + - [(#14833)](https://github.com/microsoft/vcpkg/pull/14833) Fix broken doc link (by @TeeVenDick) + - [(#16421)](https://github.com/microsoft/vcpkg/pull/16421) [docs] Add references to awesome community websites. Fixes #16278 (by @ras0219) + - [(#16489)](https://github.com/microsoft/vcpkg/pull/16489) [docs] Update to Community Resources in doc (by @Balnian) + - [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) + - [(#16522)](https://github.com/microsoft/vcpkg/pull/16522) [vcpkg docs] Fix typo in docs/index.md (by @sbc100) + - [(#16627)](https://github.com/microsoft/vcpkg/pull/16627) [host dependencies] add support in the scripts (by @strega-nil) +- [control-files.md](docs/maintainers/control-files.md) + - [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) + - [(#17214)](https://github.com/microsoft/vcpkg/pull/17214) [doc] Improve manifest documentation links (by @dg0yt) + - [(#17439)](https://github.com/microsoft/vcpkg/pull/17439) control-files.md: fix dead link and add command how to convert files (by @autoantwort) + - [(#17566)](https://github.com/microsoft/vcpkg/pull/17566) [docs] Fix broken links (by @PhoebeHui) +- [execute_process.md](docs/maintainers/execute_process.md) + - [(#14614)](https://github.com/microsoft/vcpkg/pull/14614) [vcpkg docs] Check for documentation generation in CI (by @strega-nil) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_internal_get_cmake_vars.md](docs/maintainers/internal/vcpkg_internal_get_cmake_vars.md) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [maintainer-guide.md](docs/maintainers/maintainer-guide.md) + - [(#15171)](https://github.com/microsoft/vcpkg/pull/15171) [docs] Document acceptable uses for features. (by @BillyONeal) + - [(#15655)](https://github.com/microsoft/vcpkg/pull/15655) [vcpkg] Add CI check for version files and update maintainer's guideline (by @vicroms) + - [(#15784)](https://github.com/microsoft/vcpkg/pull/15784) [vcpkg] Rename `port_versions` to `versions` (by @strega-nil) + - [(#16480)](https://github.com/microsoft/vcpkg/pull/16480) [vcpkg_*_cmake] remove deprecation message (by @strega-nil) + - [(#16795)](https://github.com/microsoft/vcpkg/pull/16795) [docs] link to up to date versioning specification (by @autoantwort) + - [(#16852)](https://github.com/microsoft/vcpkg/pull/16852) [maintainer-guide] Clarify best practices for default features (by @ras0219-msft) +- [manifest-files.md](docs/maintainers/manifest-files.md) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#17549)](https://github.com/microsoft/vcpkg/pull/17549) [doc] Update manifest to reference versioning spec (by @mathisloge) +- [portfile-functions.md](docs/maintainers/portfile-functions.md) + - [(#13449)](https://github.com/microsoft/vcpkg/pull/13449) [gdal] Update to 3.1.3 (by @JackBoosY) + - [(#14614)](https://github.com/microsoft/vcpkg/pull/14614) [vcpkg docs] Check for documentation generation in CI (by @strega-nil) + - [(#14914)](https://github.com/microsoft/vcpkg/pull/14914) [docs] fix pwsh sorting (by @strega-nil) + - [(#15638)](https://github.com/microsoft/vcpkg/pull/15638) [vcpkg] Add vcpkg_minimum_required as a replacement for VERSION.txt. (by @BillyONeal) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16130)](https://github.com/microsoft/vcpkg/pull/16130) [(z_)vcpkg_prettify_command(_line)] Scripts Tree Audit (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16954)](https://github.com/microsoft/vcpkg/pull/16954) [vcpkg baseline][qt5-base] Fix glib link issues on linux (by @Neumann-A) +- [vcpkg_acquire_msys.md](docs/maintainers/vcpkg_acquire_msys.md) + - [(#13449)](https://github.com/microsoft/vcpkg/pull/13449) [gdal] Update to 3.1.3 (by @JackBoosY) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_add_to_path.md](docs/maintainers/vcpkg_add_to_path.md) + - [(#14614)](https://github.com/microsoft/vcpkg/pull/14614) [vcpkg docs] Check for documentation generation in CI (by @strega-nil) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16189)](https://github.com/microsoft/vcpkg/pull/16189) [scripts-audit] vcpkg_add_to_path (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_apply_patches.md](docs/maintainers/vcpkg_apply_patches.md) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_build_cmake.md](docs/maintainers/vcpkg_build_cmake.md) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_build_gn.md](docs/maintainers/vcpkg_build_gn.md) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_build_make.md](docs/maintainers/vcpkg_build_make.md) + - [(#13449)](https://github.com/microsoft/vcpkg/pull/13449) [gdal] Update to 3.1.3 (by @JackBoosY) + - [(#14614)](https://github.com/microsoft/vcpkg/pull/14614) [vcpkg docs] Check for documentation generation in CI (by @strega-nil) + - [(#14891)](https://github.com/microsoft/vcpkg/pull/14891) [python3] Build interpreter (by @Hoikas) + - [(#15419)](https://github.com/microsoft/vcpkg/pull/15419) [docs] fix "CMake script" -> "makefile" for vcpkg_(n)build_make (by @tueda) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_build_msbuild.md](docs/maintainers/vcpkg_build_msbuild.md) + - [(#15018)](https://github.com/microsoft/vcpkg/pull/15018) [cppunit] add linux support and bump version to 1.15.1 (by @dweckmann) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_build_ninja.md](docs/maintainers/vcpkg_build_ninja.md) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_build_nmake.md](docs/maintainers/vcpkg_build_nmake.md) + - [(#13449)](https://github.com/microsoft/vcpkg/pull/13449) [gdal] Update to 3.1.3 (by @JackBoosY) + - [(#14614)](https://github.com/microsoft/vcpkg/pull/14614) [vcpkg docs] Check for documentation generation in CI (by @strega-nil) + - [(#15419)](https://github.com/microsoft/vcpkg/pull/15419) [docs] fix "CMake script" -> "makefile" for vcpkg_(n)build_make (by @tueda) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_check_features.md](docs/maintainers/vcpkg_check_features.md) + - [(#14614)](https://github.com/microsoft/vcpkg/pull/14614) [vcpkg docs] Check for documentation generation in CI (by @strega-nil) + - [(#15089)](https://github.com/microsoft/vcpkg/pull/15089) [libarchive+tesseract+opencv] add missing libarchiveConfig.cmake, fix tesseract downstream and unblock opencv CI (by @cenit) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_check_linkage.md](docs/maintainers/vcpkg_check_linkage.md) + - [(#13449)](https://github.com/microsoft/vcpkg/pull/13449) [gdal] Update to 3.1.3 (by @JackBoosY) + - [(#14614)](https://github.com/microsoft/vcpkg/pull/14614) [vcpkg docs] Check for documentation generation in CI (by @strega-nil) + - [(#15832)](https://github.com/microsoft/vcpkg/pull/15832) [vcpkg] clarify the actions of vcpkg_check_linkage (by @barcharcraz) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_clean_executables_in_bin.md](docs/maintainers/vcpkg_clean_executables_in_bin.md) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_clean_msbuild.md](docs/maintainers/vcpkg_clean_msbuild.md) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_common_definitions.md](docs/maintainers/vcpkg_common_definitions.md) + - [(#13449)](https://github.com/microsoft/vcpkg/pull/13449) [gdal] Update to 3.1.3 (by @JackBoosY) + - [(#14549)](https://github.com/microsoft/vcpkg/pull/14549) [vcpkg] initial openbsd (community) support (by @jgilje) + - [(#14614)](https://github.com/microsoft/vcpkg/pull/14614) [vcpkg docs] Check for documentation generation in CI (by @strega-nil) + - [(#15725)](https://github.com/microsoft/vcpkg/pull/15725) [aws-cpp-sdk] [zlib] [openssl] [curl] Fix zlib, OpenSSL, curl and AWS SDK for Android (by @ahmedyarub) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) + - [(#16627)](https://github.com/microsoft/vcpkg/pull/16627) [host dependencies] add support in the scripts (by @strega-nil) + - [(#16900)](https://github.com/microsoft/vcpkg/pull/16900) [vcpkg/scripts] add variable VCPKG_CROSSCOMPILING (by @Neumann-A) +- [vcpkg_configure_cmake.md](docs/maintainers/vcpkg_configure_cmake.md) + - [(#13449)](https://github.com/microsoft/vcpkg/pull/13449) [gdal] Update to 3.1.3 (by @JackBoosY) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_configure_gn.md](docs/maintainers/vcpkg_configure_gn.md) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_configure_make.md](docs/maintainers/vcpkg_configure_make.md) + - [(#13449)](https://github.com/microsoft/vcpkg/pull/13449) [gdal] Update to 3.1.3 (by @JackBoosY) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_configure_meson.md](docs/maintainers/vcpkg_configure_meson.md) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_copy_pdbs.md](docs/maintainers/vcpkg_copy_pdbs.md) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_copy_tool_dependencies.md](docs/maintainers/vcpkg_copy_tool_dependencies.md) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_copy_tools.md](docs/maintainers/vcpkg_copy_tools.md) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) + - [(#16935)](https://github.com/microsoft/vcpkg/pull/16935) [vcpkg/scripts] add a way to define another tool destination (by @Neumann-A) +- [vcpkg_download_distfile.md](docs/maintainers/vcpkg_download_distfile.md) + - [(#13449)](https://github.com/microsoft/vcpkg/pull/13449) [gdal] Update to 3.1.3 (by @JackBoosY) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_execute_build_process.md](docs/maintainers/vcpkg_execute_build_process.md) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16515)](https://github.com/microsoft/vcpkg/pull/16515) Remove a ')' character in the documentation (by @duanqn) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_execute_required_process.md](docs/maintainers/vcpkg_execute_required_process.md) + - [(#13449)](https://github.com/microsoft/vcpkg/pull/13449) [gdal] Update to 3.1.3 (by @JackBoosY) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16130)](https://github.com/microsoft/vcpkg/pull/16130) [(z_)vcpkg_prettify_command(_line)] Scripts Tree Audit (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_extract_source_archive.md](docs/maintainers/vcpkg_extract_source_archive.md) + - [(#14614)](https://github.com/microsoft/vcpkg/pull/14614) [vcpkg docs] Check for documentation generation in CI (by @strega-nil) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_extract_source_archive_ex.md](docs/maintainers/vcpkg_extract_source_archive_ex.md) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_fail_port_install.md](docs/maintainers/vcpkg_fail_port_install.md) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_find_acquire_program.md](docs/maintainers/vcpkg_find_acquire_program.md) + - [(#13449)](https://github.com/microsoft/vcpkg/pull/13449) [gdal] Update to 3.1.3 (by @JackBoosY) + - [(#14614)](https://github.com/microsoft/vcpkg/pull/14614) [vcpkg docs] Check for documentation generation in CI (by @strega-nil) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_fixup_cmake_targets.md](docs/maintainers/vcpkg_fixup_cmake_targets.md) + - [(#14614)](https://github.com/microsoft/vcpkg/pull/14614) [vcpkg docs] Check for documentation generation in CI (by @strega-nil) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) + - [(#16935)](https://github.com/microsoft/vcpkg/pull/16935) [vcpkg/scripts] add a way to define another tool destination (by @Neumann-A) +- [vcpkg_fixup_pkgconfig.md](docs/maintainers/vcpkg_fixup_pkgconfig.md) + - [(#13126)](https://github.com/microsoft/vcpkg/pull/13126) [vcpkg_fixup_pkgconfig] Handle spaces in path, do not validate individual libraries (by @ras0219) + - [(#13449)](https://github.com/microsoft/vcpkg/pull/13449) [gdal] Update to 3.1.3 (by @JackBoosY) + - [(#14614)](https://github.com/microsoft/vcpkg/pull/14614) [vcpkg docs] Check for documentation generation in CI (by @strega-nil) + - [(#15725)](https://github.com/microsoft/vcpkg/pull/15725) [aws-cpp-sdk] [zlib] [openssl] [curl] Fix zlib, OpenSSL, curl and AWS SDK for Android (by @ahmedyarub) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_from_bitbucket.md](docs/maintainers/vcpkg_from_bitbucket.md) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_from_git.md](docs/maintainers/vcpkg_from_git.md) + - [(#15049)](https://github.com/microsoft/vcpkg/pull/15049) [vcpkg_from_git] new options TAG and X_OUT_REF (by @Neumann-A) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_from_github.md](docs/maintainers/vcpkg_from_github.md) + - [(#13449)](https://github.com/microsoft/vcpkg/pull/13449) [gdal] Update to 3.1.3 (by @JackBoosY) + - [(#14884)](https://github.com/microsoft/vcpkg/pull/14884) [vcpkg baseline][vtk-m] fix the sha512 (by @strega-nil) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_from_gitlab.md](docs/maintainers/vcpkg_from_gitlab.md) + - [(#14614)](https://github.com/microsoft/vcpkg/pull/14614) [vcpkg docs] Check for documentation generation in CI (by @strega-nil) + - [(#14884)](https://github.com/microsoft/vcpkg/pull/14884) [vcpkg baseline][vtk-m] fix the sha512 (by @strega-nil) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_from_sourceforge.md](docs/maintainers/vcpkg_from_sourceforge.md) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_install_cmake.md](docs/maintainers/vcpkg_install_cmake.md) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_install_gn.md](docs/maintainers/vcpkg_install_gn.md) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_install_make.md](docs/maintainers/vcpkg_install_make.md) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_install_meson.md](docs/maintainers/vcpkg_install_meson.md) + - [(#15756)](https://github.com/microsoft/vcpkg/pull/15756) [vcpkg/meson] fix some details (by @Neumann-A) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_install_msbuild.md](docs/maintainers/vcpkg_install_msbuild.md) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_install_nmake.md](docs/maintainers/vcpkg_install_nmake.md) + - [(#13449)](https://github.com/microsoft/vcpkg/pull/13449) [gdal] Update to 3.1.3 (by @JackBoosY) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_install_qmake.md](docs/maintainers/vcpkg_install_qmake.md) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [vcpkg_prettify_command.md](docs/maintainers/vcpkg_prettify_command.md) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16130)](https://github.com/microsoft/vcpkg/pull/16130) [(z_)vcpkg_prettify_command(_line)] Scripts Tree Audit (by @strega-nil) +- [README.md](docs/README.md) + - [(#16758)](https://github.com/microsoft/vcpkg/pull/16758) [docs] Rename docs/index.md to docs/README.md (by @autoantwort) + - [(#16796)](https://github.com/microsoft/vcpkg/pull/16796) [docs] fix links for vcpkg-tool maintainer help (by @autoantwort) + - [(#17066)](https://github.com/microsoft/vcpkg/pull/17066) add link to common vcpkg definitions (by @autoantwort) + - [(#17214)](https://github.com/microsoft/vcpkg/pull/17214) [doc] Improve manifest documentation links (by @dg0yt) + - [(#17219)](https://github.com/microsoft/vcpkg/pull/17219) Add mingw documentation (by @dg0yt) + - [(#17220)](https://github.com/microsoft/vcpkg/pull/17220) [docs] add more blog posts (by @autoantwort) + - [(#17550)](https://github.com/microsoft/vcpkg/pull/17550) [doc] Add 2019.06 blog post (by @dg0yt) + - [(#17566)](https://github.com/microsoft/vcpkg/pull/17566) [docs] Fix broken links (by @PhoebeHui) +- [regenerate.ps1](docs/regenerate.ps1) + - [(#14614)](https://github.com/microsoft/vcpkg/pull/14614) [vcpkg docs] Check for documentation generation in CI (by @strega-nil) + - [(#14914)](https://github.com/microsoft/vcpkg/pull/14914) [docs] fix pwsh sorting (by @strega-nil) + - [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) + - [(#16954)](https://github.com/microsoft/vcpkg/pull/16954) [vcpkg baseline][qt5-base] Fix glib link issues on linux (by @Neumann-A) +- [binarycaching.md](docs/specifications/binarycaching.md) + - [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) +- [export-command.md](docs/specifications/export-command.md) + - [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) +- [feature-packages.md](docs/specifications/feature-packages.md) + - [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) +- [manifests.md](docs/specifications/manifests.md) + - [(#15688)](https://github.com/microsoft/vcpkg/pull/15688) fix wrong path in docs/specifications/manifests.md (by @aarcangeli) + - [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) + - [(#16760)](https://github.com/microsoft/vcpkg/pull/16760) [vcpkg docs] Modify manifest-root-dir as manifest-root (by @NancyLi1013) +- [ports-overlay.md](docs/specifications/ports-overlay.md) + - [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) +- [prefab.md](docs/specifications/prefab.md) + - [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) +- [registries.md](docs/specifications/registries.md) + - [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) +- [benchmarking.md](docs/tool-maintainers/benchmarking.md) + - [(#15474)](https://github.com/microsoft/vcpkg/pull/15474) [vcpkg] Download vcpkg.exe rather than building it in bootstrap on Windows. (by @BillyONeal) +- [layout.md](docs/tool-maintainers/layout.md) + - [(#15474)](https://github.com/microsoft/vcpkg/pull/15474) [vcpkg] Download vcpkg.exe rather than building it in bootstrap on Windows. (by @BillyONeal) +- [testing.md](docs/tool-maintainers/testing.md) + - [(#15474)](https://github.com/microsoft/vcpkg/pull/15474) [vcpkg] Download vcpkg.exe rather than building it in bootstrap on Windows. (by @BillyONeal) +- [android.md](docs/users/android.md) + - [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) + - [(#16881)](https://github.com/microsoft/vcpkg/pull/16881) [docs] Vulkan SDK usage for Android triplets (by @luncliff) +- [binarycaching.md](docs/users/binarycaching.md) + - [(#13626)](https://github.com/microsoft/vcpkg/pull/13626) [vcpkg] Add experimental x-azblob binary provider (by @ras0219) + - [(#14952)](https://github.com/microsoft/vcpkg/pull/14952) [vcpkg] Fix uploading to Azure DevOps Artifacts (by @ras0219) + - [(#15396)](https://github.com/microsoft/vcpkg/pull/15396) [vcpkg] Improve docs for binarycaching (by @ras0219) + - [(#15512)](https://github.com/microsoft/vcpkg/pull/15512) [vcpkg] Allow to use Nuget's cache for Nuget binary caching sources (fix #15169) (by @klalumiere) + - [(#16337)](https://github.com/microsoft/vcpkg/pull/16337) [docs/users/binarycaching.md] a little blurb about using GCS (by @coryan) + - [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) + - [(#17060)](https://github.com/microsoft/vcpkg/pull/17060) binarycaching.md: Move Configuration section to the top. Add table of??? (by @autoantwort) +- [config-environment.md](docs/users/config-environment.md) + - [(#15396)](https://github.com/microsoft/vcpkg/pull/15396) [vcpkg] Improve docs for binarycaching (by @ras0219) + - [(#15512)](https://github.com/microsoft/vcpkg/pull/15512) [vcpkg] Allow to use Nuget's cache for Nuget binary caching sources (fix #15169) (by @klalumiere) + - [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) + - [(#16627)](https://github.com/microsoft/vcpkg/pull/16627) [host dependencies] add support in the scripts (by @strega-nil) + - [(#17566)](https://github.com/microsoft/vcpkg/pull/17566) [docs] Fix broken links (by @PhoebeHui) +- [integration.md](docs/users/integration.md) + - [(#16323)](https://github.com/microsoft/vcpkg/pull/16323) [docs] Add CMake Integration to manifests.md (by @ras0219) + - [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) + - [(#17566)](https://github.com/microsoft/vcpkg/pull/17566) [docs] Fix broken links (by @PhoebeHui) +- [manifests.md](docs/users/manifests.md) + - [(#15565)](https://github.com/microsoft/vcpkg/pull/15565) [vcpkg] Add initial versioning documentation (by @ras0219) + - [(#16069)](https://github.com/microsoft/vcpkg/pull/16069) [docs/users/manifests.md] Prioritize examples. Fix example. Add MSBuild integration documentation. (by @ras0219-msft) + - [(#16155)](https://github.com/microsoft/vcpkg/pull/16155) [vcpkg.targets] Add an additional options parameter for MSBuild integration (by @ras0219) + - [(#16173)](https://github.com/microsoft/vcpkg/pull/16173) [vcpkg integrate install] Allow setting the vcpkg installed dir (by @strega-nil) + - [(#16323)](https://github.com/microsoft/vcpkg/pull/16323) [docs] Add CMake Integration to manifests.md (by @ras0219) + - [(#16336)](https://github.com/microsoft/vcpkg/pull/16336) [docs/users/manifests.md] add a link to the specification (by @coryan) + - [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) + - [(#16627)](https://github.com/microsoft/vcpkg/pull/16627) [host dependencies] add support in the scripts (by @strega-nil) +- [selecting-library-features.md](docs/users/selecting-library-features.md) + - [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) + - [(#17484)](https://github.com/microsoft/vcpkg/pull/17484) [doc] Fix broken link (by @dg0yt) +- [triplets.md](docs/users/triplets.md) + - [(#15115)](https://github.com/microsoft/vcpkg/pull/15115) [vcpkg] `VCPKG_ENV_PASSTHROUGH_UNTRACKED` (by @ras0219) + - [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) + - [(#16867)](https://github.com/microsoft/vcpkg/pull/16867) [docs-triplets] Suggest overlay triplets (by @ras0219-msft) + - [(#17219)](https://github.com/microsoft/vcpkg/pull/17219) Add mingw documentation (by @dg0yt) +
+ +
+The following changes to vcpkg have been made: + +- [(#7824)](https://github.com/microsoft/vcpkg/pull/7824) [fastcgi]Add new port (by @longhuan2018) +- [(#8524)](https://github.com/microsoft/vcpkg/pull/8524) Add option VCPKG_QMAKE_USE_NMAKE in vcpkg_build_qmake and install_qt (by @JackBoosY) +- [(#9231)](https://github.com/microsoft/vcpkg/pull/9231) [pcl] Add gcc version check (by @NancyLi1013) +- [(#10979)](https://github.com/microsoft/vcpkg/pull/10979) [popsift] add new port v0.9 (by @simogasp) +- [(#11225)](https://github.com/microsoft/vcpkg/pull/11225) [magnum] fixes adding any feature that depends on any other feature it will enable all the defaults (by @fran6co) +- [(#11273)](https://github.com/microsoft/vcpkg/pull/11273) [ignition-common3] Add new port ???? (by @traversaro) +- [(#11758)](https://github.com/microsoft/vcpkg/pull/11758) [vcpkg] RFC: Versioning (by @vicroms) +- [(#11776)](https://github.com/microsoft/vcpkg/pull/11776) [intl/gettext/fontconfig] update to native build system (by @Neumann-A) +- [(#11898)](https://github.com/microsoft/vcpkg/pull/11898) Add support for llvm-objdump to applocal.ps1 (by @Chronial) +- [(#12215)](https://github.com/microsoft/vcpkg/pull/12215) [vcpkg_fixup_cmake_targets] Add NO_PREFIX_CORRECTION (by @Neumann-A) +- [(#12785)](https://github.com/microsoft/vcpkg/pull/12785) [OpenCV] fix compatibility with VTK9 (by @cenit) +- [(#12860)](https://github.com/microsoft/vcpkg/pull/12860) [harfbuzz] Use meson and update to 2.7.0 (by @vejmartin) +- [(#12877)](https://github.com/microsoft/vcpkg/pull/12877) [vcpkg] Add option cmake-args (by @Neumann-A) +- [(#12936)](https://github.com/microsoft/vcpkg/pull/12936) [vcpkg/scripts] Add a way to get cmake compiler settings/flags (by @Neumann-A) +- [(#12945)](https://github.com/microsoft/vcpkg/pull/12945) [meson|scripts] update scripts (by @Neumann-A) +- [(#13028)](https://github.com/microsoft/vcpkg/pull/13028) More or less completely rewritten tensorflow-cc port (by @jgehw) +- [(#13081)](https://github.com/microsoft/vcpkg/pull/13081) [mpc/mpfr] Add new port / update mpfr (by @Neumann-A) +- [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) +- [(#13126)](https://github.com/microsoft/vcpkg/pull/13126) [vcpkg_fixup_pkgconfig] Handle spaces in path, do not validate individual libraries (by @ras0219) +- [(#13300)](https://github.com/microsoft/vcpkg/pull/13300) [sdl2pp] Update to 0.16.1 and fix find_package error (by @LilyWangL) +- [(#13355)](https://github.com/microsoft/vcpkg/pull/13355) [v8] Update v8 to current stable version: 8.6.395.17 (by @Kwizatz) +- [(#13361)](https://github.com/microsoft/vcpkg/pull/13361) [wxwidgets] Fix #4756 (by @ras0219) +- [(#13448)](https://github.com/microsoft/vcpkg/pull/13448) [BLAS] add metaport (by @cenit) +- [(#13449)](https://github.com/microsoft/vcpkg/pull/13449) [gdal] Update to 3.1.3 (by @JackBoosY) +- [(#13467)](https://github.com/microsoft/vcpkg/pull/13467) [many ports] Update existing KF5 frameworks to 5.75 (by @wrobelda) +- [(#13590)](https://github.com/microsoft/vcpkg/pull/13590) [vcpkg registries] Registries: Take 2 (by @strega-nil) +- [(#13626)](https://github.com/microsoft/vcpkg/pull/13626) [vcpkg] Add experimental x-azblob binary provider (by @ras0219) +- [(#13658)](https://github.com/microsoft/vcpkg/pull/13658) [rhash] Update to the latest version (by @LilyWangL) +- [(#13680)](https://github.com/microsoft/vcpkg/pull/13680) [paho-mqtt] Update to version 1.3.5 (by @LilyWangL) +- [(#13687)](https://github.com/microsoft/vcpkg/pull/13687) [usd] fix dll path and update to 20.08 (by @ousttrue) +- [(#13691)](https://github.com/microsoft/vcpkg/pull/13691) [libprotobuf-mutator] Add new port (by @lebdron) +- [(#13704)](https://github.com/microsoft/vcpkg/pull/13704) [libdatachannel] Add new port (by @Nemirtingas) +- [(#13725)](https://github.com/microsoft/vcpkg/pull/13725) [matplotplusplus] Add new port (by @myd7349) +- [(#13739)](https://github.com/microsoft/vcpkg/pull/13739) [eigen3] Fix include path (by @LilyWangL) +- [(#13755)](https://github.com/microsoft/vcpkg/pull/13755) [vcpkg] Two bug fixes and some improvements in buildsystems/msbuild (by @FrankHeimes) +- [(#13759)](https://github.com/microsoft/vcpkg/pull/13759) [camport3] add new port (by @syp1975) +- [(#13849)](https://github.com/microsoft/vcpkg/pull/13849) [physx] Add support for Linux, macOS, and UWP (by @Hoikas) +- [(#13899)](https://github.com/microsoft/vcpkg/pull/13899) [imgui] Add experimental docking feature (by @brukted) +- [(#13931)](https://github.com/microsoft/vcpkg/pull/13931) [vcpkg] Increment number of retries and timeout of fs.rename() (by @mapozyan) +- [(#13950)](https://github.com/microsoft/vcpkg/pull/13950) [many ports] add GnuPG libraries (by @wrobelda) +- [(#13998)](https://github.com/microsoft/vcpkg/pull/13998) [llvm] update to 11.0.0 (by @yurybura) +- [(#14018)](https://github.com/microsoft/vcpkg/pull/14018) [vcpkg] preprocess _ignore_flags with vcpkg_escape_regex_control_characters (by @jgilje) +- [(#14083)](https://github.com/microsoft/vcpkg/pull/14083) [qt5-tools] Patch windeployqt to locate icudtd correctly. (by @seanlis) +- [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) +- [(#14109)](https://github.com/microsoft/vcpkg/pull/14109) [abseil] Revert changes about arm build (by @JackBoosY) +- [(#14123)](https://github.com/microsoft/vcpkg/pull/14123) [vcpkg] Implement VersionedPortfileProvider and BaselineProvider (by @vicroms) +- [(#14153)](https://github.com/microsoft/vcpkg/pull/14153) [vcpkg] Initial Registries: Part 2 MVP (by @strega-nil) +- [(#14183)](https://github.com/microsoft/vcpkg/pull/14183) [vcpkg] Implement constraints and overrides in manifests (by @ras0219) +- [(#14186)](https://github.com/microsoft/vcpkg/pull/14186) [icu] Add MSVC ARM64 support (by @janisozaur) +- [(#14195)](https://github.com/microsoft/vcpkg/pull/14195) [comms] Add new ports (by @mathisloge) +- [(#14213)](https://github.com/microsoft/vcpkg/pull/14213) [libjuice] Update libjuice for libdatachannel port. (by @Nemirtingas) +- [(#14223)](https://github.com/microsoft/vcpkg/pull/14223) [indicators] Update to Master (by @Link1J) +- [(#14240)](https://github.com/microsoft/vcpkg/pull/14240) [arrayfire] New Port (by @jacobkahn) +- [(#14242)](https://github.com/microsoft/vcpkg/pull/14242) [many ports] Add GnuTLS and its dependencies (by @wrobelda) +- [(#14243)](https://github.com/microsoft/vcpkg/pull/14243) [vcpkg] X_VCPKG_APPINSTALL_DEPS_INSTALL optionally install dependencies on install (by @sandercox) +- [(#14245)](https://github.com/microsoft/vcpkg/pull/14245) [vcpkg baseline] Clean up baseline, use Keyword Supports Part 1 (by @JackBoosY) +- [(#14246)](https://github.com/microsoft/vcpkg/pull/14246) [vcpkg baseline] Clean up baseline, use Keyword Supports Part 2 (by @JackBoosY) +- [(#14248)](https://github.com/microsoft/vcpkg/pull/14248) [libnice] Fix build error on Linux (by @LilyWangL) +- [(#14290)](https://github.com/microsoft/vcpkg/pull/14290) [libmysql/libmariadb] Export unofficial cmake targets (by @JackBoosY) +- [(#14292)](https://github.com/microsoft/vcpkg/pull/14292) [caf] Add usage and vcpkg-cmake-wrapper (by @NancyLi1013) +- [(#14299)](https://github.com/microsoft/vcpkg/pull/14299) [rtabmap] New port (by @seanyen) +- [(#14305)](https://github.com/microsoft/vcpkg/pull/14305) [poco] Fix dependency, add features (by @JackBoosY) +- [(#14308)](https://github.com/microsoft/vcpkg/pull/14308) [OpenSSL] refactor openssl ports. (by @Neumann-A) +- [(#14310)](https://github.com/microsoft/vcpkg/pull/14310) [vcpkg] Add korean version Readme (by @AkiaCode) +- [(#14324)](https://github.com/microsoft/vcpkg/pull/14324) [ignition] Updates on various pkgs ???? (by @ahoarau) +- [(#14325)](https://github.com/microsoft/vcpkg/pull/14325) [tbb] Support tbb build for arm-linux & arm64-linux (by @xieyubo) +- [(#14341)](https://github.com/microsoft/vcpkg/pull/14341) [oatpp] Add new port and vcpkg.json (by @mheyman) +- [(#14343)](https://github.com/microsoft/vcpkg/pull/14343) [vcpkg, azure-macro-utils-c] Fix SHA and add FILE_DISAMBIGUATOR for vcpkg_from_github (by @BillyONeal) +- [(#14344)](https://github.com/microsoft/vcpkg/pull/14344) [tool-meson] Update to 0.56.0 (by @c72578) +- [(#14348)](https://github.com/microsoft/vcpkg/pull/14348) [libsamplerate, sdl2-gfx] Fix build error with Visual Studio 2019 version 16.8 (by @LilyWangL) +- [(#14349)](https://github.com/microsoft/vcpkg/pull/14349) [sentry-native] Disable warning C5105 (by @LilyWangL) +- [(#14350)](https://github.com/microsoft/vcpkg/pull/14350) [curl] Fixes pkgconfig configuration file (by @Matioupi) +- [(#14351)](https://github.com/microsoft/vcpkg/pull/14351) add dataframe of github hosseinmoein/DataFrame (by @shimondoodkin) +- [(#14360)](https://github.com/microsoft/vcpkg/pull/14360) [ffmpeg] add if guard, fix library ordering on linux, minor clean up (by @mcmtroffaes) +- [(#14366)](https://github.com/microsoft/vcpkg/pull/14366) [vcpkg] Disable vcpkg_copy_tool_dependencies on non-Windows (by @BillyONeal) +- [(#14372)](https://github.com/microsoft/vcpkg/pull/14372) [fmt] update to 7.1.1 (by @bl-ue) +- [(#14375)](https://github.com/microsoft/vcpkg/pull/14375) [google-cloud-cpp] Update to the v1.20.0 release (by @coryan) +- [(#14376)](https://github.com/microsoft/vcpkg/pull/14376) [libigl] Fix dynamic build and enable header-only mode (by @FabienPean) +- [(#14377)](https://github.com/microsoft/vcpkg/pull/14377) Update CHANGELOG 2020.11.03 (by @vicroms) +- [(#14379)](https://github.com/microsoft/vcpkg/pull/14379) [imgui] Update to 1.79 (by @RT222) +- [(#14380)](https://github.com/microsoft/vcpkg/pull/14380) [implot] Update to 0.8 (by @RT222) +- [(#14382)](https://github.com/microsoft/vcpkg/pull/14382) [kenlm, pdal] Fix const overload on Visual Studio 2019 version 16.8 (by @LilyWangL) +- [(#14383)](https://github.com/microsoft/vcpkg/pull/14383) [magnum] Removing quotes around tools list where vcpkg_copy_tools is involked (by @PhoebeHui) +- [(#14385)](https://github.com/microsoft/vcpkg/pull/14385) [oatpp-curl] Fix curl dependency cannot be found (by @NancyLi1013) +- [(#14387)](https://github.com/microsoft/vcpkg/pull/14387) [xeus] remove openssl static build patch as it is no longer needed (by @mcmtroffaes) +- [(#14388)](https://github.com/microsoft/vcpkg/pull/14388) [ffmpeg] simplify openssl library search, and fix linux openssl feature linking (by @mcmtroffaes) +- [(#14392)](https://github.com/microsoft/vcpkg/pull/14392) [tensorflow] Add C port (by @jgehw) +- [(#14395)](https://github.com/microsoft/vcpkg/pull/14395) [ZSTD] Update to 1.4.5 (by @Neumann-A) +- [(#14396)](https://github.com/microsoft/vcpkg/pull/14396) [vcpkg] copy tools pdb if they exist. (by @Neumann-A) +- [(#14397)](https://github.com/microsoft/vcpkg/pull/14397) [vcpkg] Add x-ignore-lock-failures (by @strega-nil) +- [(#14399)](https://github.com/microsoft/vcpkg/pull/14399) [llvm] install tools in tools/llvm (by @strega-nil) +- [(#14400)](https://github.com/microsoft/vcpkg/pull/14400) [vcpkg baseline] [rtabmap] Set option dependencies OFF (by @PhoebeHui) +- [(#14405)](https://github.com/microsoft/vcpkg/pull/14405) [netcdf-cxx4] Export cmake targets (by @NancyLi1013) +- [(#14407)](https://github.com/microsoft/vcpkg/pull/14407) [libffi] mingw support (by @longnguyen2004) +- [(#14412)](https://github.com/microsoft/vcpkg/pull/14412) [geotrans] update to version 3.8 (on-hold waiting for CI/VM port 21 for ftp to be opened or alternate host site) (by @StarGate-One) +- [(#14413)](https://github.com/microsoft/vcpkg/pull/14413) [fmt] update to 7.1.2 (by @bl-ue) +- [(#14414)](https://github.com/microsoft/vcpkg/pull/14414) [span-lite] update to 0.8.1 (by @Ryan-rsm-McKenzie) +- [(#14416)](https://github.com/microsoft/vcpkg/pull/14416) [cppgraphqlgen] Update to v3.2.4 (by @wravery) +- [(#14417)](https://github.com/microsoft/vcpkg/pull/14417) [sdl2] apply upstream patch to fix macos vulkan fixes #13773 (by @jhs67) +- [(#14421)](https://github.com/microsoft/vcpkg/pull/14421) [netcdf-c] Fix linkage error (by @NancyLi1013) +- [(#14422)](https://github.com/microsoft/vcpkg/pull/14422) [osg-qt] Fix installation when building static on Windows (by @JackBoosY) +- [(#14426)](https://github.com/microsoft/vcpkg/pull/14426) [vcpkg baseline][rtabmap] Fix dependency issue when build tools (by @PhoebeHui) +- [(#14435)](https://github.com/microsoft/vcpkg/pull/14435) [opencascade] update debug paths in *Targets-debug.cmake (by @socuwn) +- [(#14436)](https://github.com/microsoft/vcpkg/pull/14436) [vcpkg] Add a definition for OVERLAY_TRIPLET_ENV (by @strega-nil) +- [(#14439)](https://github.com/microsoft/vcpkg/pull/14439) [string-theory] Update to 3.4 (by @zrax) +- [(#14443)](https://github.com/microsoft/vcpkg/pull/14443) [krabsetw] Update to 4.1.14 (by @jrave) +- [(#14444)](https://github.com/microsoft/vcpkg/pull/14444) [mpg123] Upgrade to 1.26.3 (by @evpobr) +- [(#14446)](https://github.com/microsoft/vcpkg/pull/14446) [protopuf] Add a new port protopuf (by @PragmaTwice) +- [(#14447)](https://github.com/microsoft/vcpkg/pull/14447) [alembic] update to 1.7.16 (by @SeekingMeaning) +- [(#14448)](https://github.com/microsoft/vcpkg/pull/14448) [quill] Update to 1.5.2 (by @odygrd) +- [(#14450)](https://github.com/microsoft/vcpkg/pull/14450) [bond] update to 9.0.3 (by @SeekingMeaning) +- [(#14452)](https://github.com/microsoft/vcpkg/pull/14452) [zstr] update to 1.0.4 (by @SeekingMeaning) +- [(#14453)](https://github.com/microsoft/vcpkg/pull/14453) [yas] update to 7.0.5 (by @SeekingMeaning) +- [(#14454)](https://github.com/microsoft/vcpkg/pull/14454) [xsimd][xtensor][xtl] Update to latest (by @SeekingMeaning) +- [(#14455)](https://github.com/microsoft/vcpkg/pull/14455) [xeus] update to 0.24.3 (by @SeekingMeaning) +- [(#14456)](https://github.com/microsoft/vcpkg/pull/14456) [wepoll] update to 1.5.8 (by @SeekingMeaning) +- [(#14457)](https://github.com/microsoft/vcpkg/pull/14457) [openssl] Add build depends to deprecated openssl ports (by @Neumann-A) +- [(#14460)](https://github.com/microsoft/vcpkg/pull/14460) [szip, openssl] Fix problems with mingw (by @longnguyen2004) +- [(#14462)](https://github.com/microsoft/vcpkg/pull/14462) [libcuckoo] Update version to v0.3 (by @westfly) +- [(#14465)](https://github.com/microsoft/vcpkg/pull/14465) [libflac] require NASM for libflac[asm] (by @cbergemann) +- [(#14473)](https://github.com/microsoft/vcpkg/pull/14473) [curl] Enable feature tool and install curl-config on non-Windows (by @JackBoosY) +- [(#14476)](https://github.com/microsoft/vcpkg/pull/14476) [libxslt] Fix install tools and pkgconfig (by @JackBoosY) +- [(#14477)](https://github.com/microsoft/vcpkg/pull/14477) [openssl] Remove unused patches (by @NancyLi1013) +- [(#14479)](https://github.com/microsoft/vcpkg/pull/14479) [aws-sdk-cpp] Update to 1.8.83 (by @PhoebeHui) +- [(#14481)](https://github.com/microsoft/vcpkg/pull/14481) [onnxruntime-gpu] Add port for onnxruntime (GPU) (by @ianormy) +- [(#14482)](https://github.com/microsoft/vcpkg/pull/14482) [gamedev-framework] update to 0.18.1 (by @jube) +- [(#14483)](https://github.com/microsoft/vcpkg/pull/14483) [libjpeg-turbo] Enabled jpeg7 and jpeg8 APIs (by @Ziriax) +- [(#14485)](https://github.com/microsoft/vcpkg/pull/14485) [libosmscout] Add new port (by @OgreTransporter) +- [(#14493)](https://github.com/microsoft/vcpkg/pull/14493) Fix some "passing, remove from fail lists" from the 2020-11-08 build (by @BillyONeal) +- [(#14496)](https://github.com/microsoft/vcpkg/pull/14496) [restinio] update to v.0.6.12 (by @eao197) +- [(#14497)](https://github.com/microsoft/vcpkg/pull/14497) [libde265] Updated to v1.0.8 (by @JonLiu1993) +- [(#14499)](https://github.com/microsoft/vcpkg/pull/14499) [freetype] Fix INTERFACE_LINK_LIBRARIES in exported cmake file (by @JackBoosY) +- [(#14502)](https://github.com/microsoft/vcpkg/pull/14502) [boost-locale] Replace VCPKG_TARGET_IS_WINDOWS in b2-options (by @longnguyen2004) +- [(#14505)](https://github.com/microsoft/vcpkg/pull/14505) [nuspell] Update version to 4.0.1 (by @dimztimz) +- [(#14510)](https://github.com/microsoft/vcpkg/pull/14510) [python3] Upgrade to 3.9.0 (by @Hoikas) +- [(#14517)](https://github.com/microsoft/vcpkg/pull/14517) [boost] Install usage file (by @PhoebeHui) +- [(#14518)](https://github.com/microsoft/vcpkg/pull/14518) [ampl-mp] Update version, separate port ampl-asl and fix arm build (by @JackBoosY) +- [(#14521)](https://github.com/microsoft/vcpkg/pull/14521) [comms ] update to the next version (by @mathisloge) +- [(#14522)](https://github.com/microsoft/vcpkg/pull/14522) [realsense2] Update to version 2.39.0 (by @padarom) +- [(#14523)](https://github.com/microsoft/vcpkg/pull/14523) [comms-ublox] added new port (by @mathisloge) +- [(#14528)](https://github.com/microsoft/vcpkg/pull/14528) [3fd] Update to 2.6.3, fix port (by @strega-nil) +- [(#14529)](https://github.com/microsoft/vcpkg/pull/14529) [freetds] Remove patches and update to a version that no longer needs them (by @BillyONeal) +- [(#14530)](https://github.com/microsoft/vcpkg/pull/14530) [harfbuzz] fix icu linkage (by @Neumann-A) +- [(#14533)](https://github.com/microsoft/vcpkg/pull/14533) [libmariadb] Export target mariadbclient (by @JackBoosY) +- [(#14535)](https://github.com/microsoft/vcpkg/pull/14535) [libarchive] Fix dependencies, combine patches (by @JackBoosY) +- [(#14536)](https://github.com/microsoft/vcpkg/pull/14536) [opencl] Remove feature wdk (by @PhoebeHui) +- [(#14538)](https://github.com/microsoft/vcpkg/pull/14538) [urho3d] Add new port (by @koprok) +- [(#14539)](https://github.com/microsoft/vcpkg/pull/14539) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version (by @RT222) +- [(#14540)](https://github.com/microsoft/vcpkg/pull/14540) [libidn2] Update to version 2.3.0 (by @lazyhamster) +- [(#14541)](https://github.com/microsoft/vcpkg/pull/14541) [sentry-native] Update to version 0.4.4 (by @AenBleidd) +- [(#14545)](https://github.com/microsoft/vcpkg/pull/14545) [libvpx] switch from yasm to nasm (by @mcmtroffaes) +- [(#14546)](https://github.com/microsoft/vcpkg/pull/14546) [aws-sdk-cpp] Make aws-sdk-cpp rpath relocatable (by @klalumiere) +- [(#14547)](https://github.com/microsoft/vcpkg/pull/14547) [ffmpeg] use nasm instead of yasm (by @mcmtroffaes) +- [(#14549)](https://github.com/microsoft/vcpkg/pull/14549) [vcpkg] initial openbsd (community) support (by @jgilje) +- [(#14554)](https://github.com/microsoft/vcpkg/pull/14554) [assimp] Fix cmake config name and add cmake version (by @PhoebeHui) +- [(#14555)](https://github.com/microsoft/vcpkg/pull/14555) [tbb] fix shared tbb library configuration build under *nix (by @xandox) +- [(#14556)](https://github.com/microsoft/vcpkg/pull/14556) [many ports] mingw support (by @longnguyen2004) +- [(#14562)](https://github.com/microsoft/vcpkg/pull/14562) [ignition-transport8] Fix ignition-transport8 version (by @ahoarau) +- [(#14563)](https://github.com/microsoft/vcpkg/pull/14563) [robin-hood-hashing] Update to 3.9.1 (by @RT222) +- [(#14566)](https://github.com/microsoft/vcpkg/pull/14566) [liblsl] Update to 1.13.1 (by @chausner) +- [(#14576)](https://github.com/microsoft/vcpkg/pull/14576) [seal] Update to version 3.6.0. Changed default features. (by @WeiDaiWD) +- [(#14579)](https://github.com/microsoft/vcpkg/pull/14579) [baseline][libarchive] : regression fix (by @Matioupi) +- [(#14580)](https://github.com/microsoft/vcpkg/pull/14580) fix single configuration make builds. (by @Neumann-A) +- [(#14583)](https://github.com/microsoft/vcpkg/pull/14583) [ijg-libjpeg] add new port (by @luncliff) +- [(#14586)](https://github.com/microsoft/vcpkg/pull/14586) [vcpkg baseline][monkeys-audio] Update to 5.59 (by @NancyLi1013) +- [(#14587)](https://github.com/microsoft/vcpkg/pull/14587) [xmlsec] Update to 1.2.31 (by @SvenPStarFinanz) +- [(#14589)](https://github.com/microsoft/vcpkg/pull/14589) [poco] Fix dependency and cmake config issue (by @PhoebeHui) +- [(#14594)](https://github.com/microsoft/vcpkg/pull/14594) [qt5-base] fix brotli linkage and qml dlls deployment (by @Neumann-A) +- [(#14605)](https://github.com/microsoft/vcpkg/pull/14605) CGAL: Update to 5.1.1 (by @maxGimeno) +- [(#14614)](https://github.com/microsoft/vcpkg/pull/14614) [vcpkg docs] Check for documentation generation in CI (by @strega-nil) +- [(#14615)](https://github.com/microsoft/vcpkg/pull/14615) [liblzma] use upstream CMakeLists.txt + Add pkgconfig. (by @Neumann-A) +- [(#14616)](https://github.com/microsoft/vcpkg/pull/14616) [vcpkg] Fix GCC-6 build. (by @ras0219-msft) +- [(#14618)](https://github.com/microsoft/vcpkg/pull/14618) [SUNDIALS] Update to 5.5.0 (by @JonLiu1993) +- [(#14623)](https://github.com/microsoft/vcpkg/pull/14623) [hunspell] Avoid automatically added lib prefix (by @PhoebeHui) +- [(#14624)](https://github.com/microsoft/vcpkg/pull/14624) [cppzmq] Add draft feature (by @NancyLi1013) +- [(#14625)](https://github.com/microsoft/vcpkg/pull/14625) Fix for issue #11927 (by @christophe-calmejane) +- [(#14626)](https://github.com/microsoft/vcpkg/pull/14626) [libpq/ffmpeg] Fix iconv/intl linkage not covered by CI (by @Neumann-A) +- [(#14629)](https://github.com/microsoft/vcpkg/pull/14629) [proj] Added support for optionally building the tools (by @SNiLD) +- [(#14633)](https://github.com/microsoft/vcpkg/pull/14633) [vcpkg] Introduce `create_versioned_install_plan()` (by @ras0219) +- [(#14640)](https://github.com/microsoft/vcpkg/pull/14640) [mesa] new port (by @Neumann-A) +- [(#14642)](https://github.com/microsoft/vcpkg/pull/14642) [zeromq] Add feature draft (by @JonLiu1993) +- [(#14644)](https://github.com/microsoft/vcpkg/pull/14644) [vcpkg baseline][qt5-location] Update patch (by @NancyLi1013) +- [(#14646)](https://github.com/microsoft/vcpkg/pull/14646) [soci] Update to 4.0.1 (by @JonLiu1993) +- [(#14647)](https://github.com/microsoft/vcpkg/pull/14647) [abseil] Re-fix cxx 17 standard, add macro ABSL_USE_CXX17 (by @JackBoosY) +- [(#14648)](https://github.com/microsoft/vcpkg/pull/14648) [libheif] update to 1.9.1 (by @JonLiu1993) +- [(#14650)](https://github.com/microsoft/vcpkg/pull/14650) [tesseract] Enable dynamic build, format portfile.cmake (by @JackBoosY) +- [(#14651)](https://github.com/microsoft/vcpkg/pull/14651) [openvdb] Fix dependency issue and usage issue (by @PhoebeHui) +- [(#14655)](https://github.com/microsoft/vcpkg/pull/14655) [leptonica] add missing dependency (by @cenit) +- [(#14658)](https://github.com/microsoft/vcpkg/pull/14658) [clamav] Add new port (by @zaddach) +- [(#14659)](https://github.com/microsoft/vcpkg/pull/14659) [vcpkg] fix vs2015 build (by @strega-nil) +- [(#14661)](https://github.com/microsoft/vcpkg/pull/14661) [vcpkg] fix cmake paths in tags (alternative 2) (by @strega-nil) +- [(#14662)](https://github.com/microsoft/vcpkg/pull/14662) Use OS-included Python 2.7 on macOS (by @LRFLEW) +- [(#14666)](https://github.com/microsoft/vcpkg/pull/14666) [duktape] Add VERSION and SOVERSION properties CMake build (by @LRFLEW) +- [(#14670)](https://github.com/microsoft/vcpkg/pull/14670) [protobuf] Update to 3.14.0 (by @JonLiu1993) +- [(#14674)](https://github.com/microsoft/vcpkg/pull/14674) [vcpkg] Output the filepath on hash error. (by @Neumann-A) +- [(#14676)](https://github.com/microsoft/vcpkg/pull/14676) [flashlight-cuda] New Port (by @jacobkahn) +- [(#14677)](https://github.com/microsoft/vcpkg/pull/14677) [sqlcipher] Update to 4.4.1 (by @SvenPStarFinanz) +- [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- [(#14683)](https://github.com/microsoft/vcpkg/pull/14683) [nccl] New Port (by @jacobkahn) +- [(#14686)](https://github.com/microsoft/vcpkg/pull/14686) [cudnn] Try to find CUDNN locally before downloading (by @jacobkahn) +- [(#14688)](https://github.com/microsoft/vcpkg/pull/14688) [networkdirect-sdk] Rework portfile.cmake to allow windows x64 and x86, add fail for other triplet combinations, remove all triplets for CI fail list (by @StarGate-One) +- [(#14691)](https://github.com/microsoft/vcpkg/pull/14691) [commsdsl] update to version 3.5.4 (by @mathisloge) +- [(#14711)](https://github.com/microsoft/vcpkg/pull/14711) [geographiclib] Update to version 1.51 (by @cffk) +- [(#14714)](https://github.com/microsoft/vcpkg/pull/14714) [vcpkg baseline][qt-advanced-docking-system] Update hash (by @NancyLi1013) +- [(#14715)](https://github.com/microsoft/vcpkg/pull/14715) [curl] Fixes pkgconfig file (by @Matioupi) +- [(#14716)](https://github.com/microsoft/vcpkg/pull/14716) [cmake] update to 3.19.2 (by @JackBoosY) +- [(#14719)](https://github.com/microsoft/vcpkg/pull/14719) [ceres] upgrade to 2.0.0 (by @fran6co) +- [(#14722)](https://github.com/microsoft/vcpkg/pull/14722) [bitsery] Update to 5.2.1 (by @RT222) +- [(#14723)](https://github.com/microsoft/vcpkg/pull/14723) [toml11] fixes installation (by @fran6co) +- [(#14724)](https://github.com/microsoft/vcpkg/pull/14724) [opengl] port path fix when crosscompiling (by @Nemirtingas) +- [(#14730)](https://github.com/microsoft/vcpkg/pull/14730) [ignition-msgs*] Fix flaky CI tests for ignition-msgs* ports (take 2) (by @traversaro) +- [(#14732)](https://github.com/microsoft/vcpkg/pull/14732) [tiny-process-library] Bump tiny-process-library to 2.0.4 (by @traversaro) +- [(#14734)](https://github.com/microsoft/vcpkg/pull/14734) [hiredis] update to 1.0.0 (Fix #13256) (by @klalumiere) +- [(#14736)](https://github.com/microsoft/vcpkg/pull/14736) [cudnn] Don't copy debug versions of the lib since they aren't provided (by @jacobkahn) +- [(#14744)](https://github.com/microsoft/vcpkg/pull/14744) [vcpkg] Fix redefinition for OVERLAY_TRIPLETS_ENV (by @davidxiaozhi) +- [(#14749)](https://github.com/microsoft/vcpkg/pull/14749) [libuvc] added (by @fran6co) +- [(#14750)](https://github.com/microsoft/vcpkg/pull/14750) [azure-kinect-sensor-sdk] not working on Linux (by @fran6co) +- [(#14752)](https://github.com/microsoft/vcpkg/pull/14752) [jsoncons] Update to version 0.159.0 (by @danielaparker) +- [(#14755)](https://github.com/microsoft/vcpkg/pull/14755) [libtorrent] Update to 1.2.11 (by @FranciscoPombal) +- [(#14758)](https://github.com/microsoft/vcpkg/pull/14758) [speexdsp] Update CMake script for macOS/Linux (by @LRFLEW) +- [(#14761)](https://github.com/microsoft/vcpkg/pull/14761) update osg-qt from Qt4 tag to master branch(Qt5) (by @ZgblKylin) +- [(#14762)](https://github.com/microsoft/vcpkg/pull/14762) [redis-plus-plus] Add c++17 feature (by @JonLiu1993) +- [(#14763)](https://github.com/microsoft/vcpkg/pull/14763) [poco] Fix dependency libmariadb (by @JackBoosY) +- [(#14768)](https://github.com/microsoft/vcpkg/pull/14768) [ace] copy generated headers files for tao (by @victorburckel) +- [(#14770)](https://github.com/microsoft/vcpkg/pull/14770) [fixed-string] Add library (by @unterumarmung) +- [(#14771)](https://github.com/microsoft/vcpkg/pull/14771) [elfutils] add new port (by @Neumann-A) +- [(#14772)](https://github.com/microsoft/vcpkg/pull/14772) [vcpkg msbuild] Fix the issues introduced in 13755 (by @strega-nil) +- [(#14774)](https://github.com/microsoft/vcpkg/pull/14774) [rtaudio] Add new port (by @chausner) +- [(#14776)](https://github.com/microsoft/vcpkg/pull/14776) [Chipmunk] build via cmake (by @comedinha) +- [(#14781)](https://github.com/microsoft/vcpkg/pull/14781) [span-lite] update to 0.9.0 (by @Ryan-rsm-McKenzie) +- [(#14782)](https://github.com/microsoft/vcpkg/pull/14782) [xbyak] update to 5.991 (by @Ryan-rsm-McKenzie) +- [(#14785)](https://github.com/microsoft/vcpkg/pull/14785) [openssl] Handle INSTALL_NAME_DIR and OSX_DEPLOYMENT_TARGET for macOS shared builds (by @LRFLEW) +- [(#14786)](https://github.com/microsoft/vcpkg/pull/14786) [fmt] Update to 7.1.3 (by @kevinlul) +- [(#14790)](https://github.com/microsoft/vcpkg/pull/14790) [osg] Update dependency (by @NancyLi1013) +- [(#14791)](https://github.com/microsoft/vcpkg/pull/14791) [vcpkg] Remove non-existing 'import' command in vcpkg help information (by @PhoebeHui) +- [(#14792)](https://github.com/microsoft/vcpkg/pull/14792) [prometheus-cpp] Update to version 0.11.0 (by @gjasny) +- [(#14793)](https://github.com/microsoft/vcpkg/pull/14793) [devil] Fix pkgconfig on Windows (by @JackBoosY) +- [(#14794)](https://github.com/microsoft/vcpkg/pull/14794) [ebml/gppanel/matroska/polyhook2/unrar] Fix typos in CONTROL files (by @NancyLi1013) +- [(#14795)](https://github.com/microsoft/vcpkg/pull/14795) [cpp-httplib] Update to 0.7.15 (by @JonLiu1993) +- [(#14796)](https://github.com/microsoft/vcpkg/pull/14796) [sdl2-image] Fix usage (by @JackBoosY) +- [(#14797)](https://github.com/microsoft/vcpkg/pull/14797) [vcpkg] Fix issue in vcpkg.targets that introduced in 13755 (by @PhoebeHui) +- [(#14800)](https://github.com/microsoft/vcpkg/pull/14800) [Proj4] Update to 7.2.0 (by @longhuan2018) +- [(#14801)](https://github.com/microsoft/vcpkg/pull/14801) [cwalk] Add new port (by @likle) +- [(#14803)](https://github.com/microsoft/vcpkg/pull/14803) Include "zip" as required apt dependency in bootstrap error message (by @chausner) +- [(#14805)](https://github.com/microsoft/vcpkg/pull/14805) [libevent] Fix library cannot be found (by @NancyLi1013) +- [(#14807)](https://github.com/microsoft/vcpkg/pull/14807) [curl] Add feature idn2 (by @JackBoosY) +- [(#14813)](https://github.com/microsoft/vcpkg/pull/14813) [pugixml] Update to 1.11.1 (by @RT222) +- [(#14816)](https://github.com/microsoft/vcpkg/pull/14816) [lapack-reference] add to CMAKE_FIND_LIBRARY_SUFFIXES additional suffixes (by @xandox) +- [(#14825)](https://github.com/microsoft/vcpkg/pull/14825) [vcpkg_apply_patches] Fix Git too long path error (by @Pospelove) +- [(#14833)](https://github.com/microsoft/vcpkg/pull/14833) Fix broken doc link (by @TeeVenDick) +- [(#14841)](https://github.com/microsoft/vcpkg/pull/14841) [pegtl] Update to 3.0.0 release (by @wravery) +- [(#14842)](https://github.com/microsoft/vcpkg/pull/14842) [cppgraphqlgen] Update to v3.3.0 (by @wravery) +- [(#14843)](https://github.com/microsoft/vcpkg/pull/14843) [vcpkg baseline] [libass] Fix dependency issue in Linux (by @PhoebeHui) +- [(#14844)](https://github.com/microsoft/vcpkg/pull/14844) [sobjectizer] update to v.5.7.2 (by @eao197) +- [(#14848)](https://github.com/microsoft/vcpkg/pull/14848) [vcpkg_apply_patches] Work around /etc/gitconfig: Permission denied (by @ras0219) +- [(#14852)](https://github.com/microsoft/vcpkg/pull/14852) [vcpkg] Expose alpha end-to-end versioning (by @ras0219) +- [(#14856)](https://github.com/microsoft/vcpkg/pull/14856) [vcpkg] fix feature flags telemetry (by @strega-nil) +- [(#14857)](https://github.com/microsoft/vcpkg/pull/14857) Change Nuget binary cache pre-release info to always start with letters (by @frivard-coveo) +- [(#14862)](https://github.com/microsoft/vcpkg/pull/14862) [nghttp2] Update to 1.42.0. (by @geraldcombs) +- [(#14863)](https://github.com/microsoft/vcpkg/pull/14863) [c-ares] Update to 1.17.1. (by @geraldcombs) +- [(#14866)](https://github.com/microsoft/vcpkg/pull/14866) [vcpkg baseline] [gdal] Fix build errors on linux and osx (by @PhoebeHui) +- [(#14868)](https://github.com/microsoft/vcpkg/pull/14868) [aws-sdk-cpp] Restore AWSSDKConfig.cmake and add usage (by @JackBoosY) +- [(#14872)](https://github.com/microsoft/vcpkg/pull/14872) [microsoft-signalr] Fix build error on Linux (by @NancyLi1013) +- [(#14876)](https://github.com/microsoft/vcpkg/pull/14876) [clrng] Add new port: clRNG (by @MathiasMagnus) +- [(#14880)](https://github.com/microsoft/vcpkg/pull/14880) [cuda] Add ENV CUDA_HOME to path hints (by @jacobkahn) +- [(#14882)](https://github.com/microsoft/vcpkg/pull/14882) [vcpkg] Output versions during install plans (by @ras0219) +- [(#14884)](https://github.com/microsoft/vcpkg/pull/14884) [vcpkg baseline][vtk-m] fix the sha512 (by @strega-nil) +- [(#14886)](https://github.com/microsoft/vcpkg/pull/14886) [google-cloud-cpp] update to latest release (v1.21.0) (by @coryan) +- [(#14888)](https://github.com/microsoft/vcpkg/pull/14888) [libigl] Always install as header-only library (by @FabienPean) +- [(#14889)](https://github.com/microsoft/vcpkg/pull/14889) [vcpkg] Add SemVer and Date versioning schemes (by @vicroms) +- [(#14891)](https://github.com/microsoft/vcpkg/pull/14891) [python3] Build interpreter (by @Hoikas) +- [(#14897)](https://github.com/microsoft/vcpkg/pull/14897) [termcolor]; Add termcolor (by @theidexisted) +- [(#14898)](https://github.com/microsoft/vcpkg/pull/14898) [kuku] Add new port (by @kiromaru) +- [(#14901)](https://github.com/microsoft/vcpkg/pull/14901) [opencascade] Fix static build (by @JackBoosY) +- [(#14904)](https://github.com/microsoft/vcpkg/pull/14904) [magic-enum] Update to v0.7.1 (by @Neargye) +- [(#14911)](https://github.com/microsoft/vcpkg/pull/14911) [arrayfire] Update port to fix cuSparse issue with CUDA 10.1 (by @jacobkahn) +- [(#14912)](https://github.com/microsoft/vcpkg/pull/14912) [flashlight-cuda] Add stb as dependency, bump port commit (by @jacobkahn) +- [(#14913)](https://github.com/microsoft/vcpkg/pull/14913) [vcpkg baseline][monkeys-audio] Update to 565d. (by @Hoikas) +- [(#14914)](https://github.com/microsoft/vcpkg/pull/14914) [docs] fix pwsh sorting (by @strega-nil) +- [(#14915)](https://github.com/microsoft/vcpkg/pull/14915) [vcpkg] fix compile on vs2015 (by @strega-nil) +- [(#14916)](https://github.com/microsoft/vcpkg/pull/14916) [quill] Update 1.6.0 (by @odygrd) +- [(#14917)](https://github.com/microsoft/vcpkg/pull/14917) [freetype] Make zlib and brotli features (by @LRFLEW) +- [(#14918)](https://github.com/microsoft/vcpkg/pull/14918) [zxing-cpp] Update zxing-cpp and fix iconv dependency (by @JonLiu1993) +- [(#14921)](https://github.com/microsoft/vcpkg/pull/14921) [libpqxx] update to 7.2.1 (by @JonLiu1993) +- [(#14923)](https://github.com/microsoft/vcpkg/pull/14923) [cimg] update to 2.9.4 (by @JonLiu1993) +- [(#14925)](https://github.com/microsoft/vcpkg/pull/14925) [sail] Add new port (by @happy-sea-fox) +- [(#14927)](https://github.com/microsoft/vcpkg/pull/14927) [vcpkg] Error on '#' in version strings to avoid confusion (by @ras0219) +- [(#14935)](https://github.com/microsoft/vcpkg/pull/14935) [usockets] Fix build issue with feature ssl (by @PhoebeHui) +- [(#14936)](https://github.com/microsoft/vcpkg/pull/14936) [aws-sdk-cpp] Add find_dependency to AWSSDKConfig.cmake and fix usage (by @JackBoosY) +- [(#14937)](https://github.com/microsoft/vcpkg/pull/14937) [gamenetworkingsockets] Add new port (by @Balnian) +- [(#14945)](https://github.com/microsoft/vcpkg/pull/14945) Fix failures when parsing the default options for binary caching not being emitted. (by @BillyONeal) +- [(#14946)](https://github.com/microsoft/vcpkg/pull/14946) [fontconfig] fix dll name in def file (by @Neumann-A) +- [(#14947)](https://github.com/microsoft/vcpkg/pull/14947) [vcpkg] Add versioning fields to schema (by @ras0219) +- [(#14948)](https://github.com/microsoft/vcpkg/pull/14948) [vcpkg] Improve error messages for incomplete Mono (by @ras0219) +- [(#14952)](https://github.com/microsoft/vcpkg/pull/14952) [vcpkg] Fix uploading to Azure DevOps Artifacts (by @ras0219) +- [(#14953)](https://github.com/microsoft/vcpkg/pull/14953) [vcpkg] Add --nuget-description option for `vcpkg export` (by @ras0219) +- [(#14954)](https://github.com/microsoft/vcpkg/pull/14954) [vcpkg] Disable survey message (by @ras0219) +- [(#14960)](https://github.com/microsoft/vcpkg/pull/14960) [pcl] Fix build when librealsense2 is present (by @dweckmann) +- [(#14962)](https://github.com/microsoft/vcpkg/pull/14962) [geogram] Fix windows dynamic build usage (by @FabienPean) +- [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) +- [(#14970)](https://github.com/microsoft/vcpkg/pull/14970) [ NASM ] Update version from 2.14.02 to 2.15.05 (by @Nioub) +- [(#14971)](https://github.com/microsoft/vcpkg/pull/14971) [ms-gltf] Add new port (by @luncliff) +- [(#14972)](https://github.com/microsoft/vcpkg/pull/14972) [ATK] Installing .pc files (by @faserg1) +- [(#14975)](https://github.com/microsoft/vcpkg/pull/14975) [nanobench] update to 4.3.0 (by @JonLiu1993) +- [(#14976)](https://github.com/microsoft/vcpkg/pull/14976) [osgearth/rocksdb] Update to latest release (by @NancyLi1013) +- [(#14977)](https://github.com/microsoft/vcpkg/pull/14977) [vcpkg] x_vcpkg_install_local_dependencies fixes (by @sandercox) +- [(#14980)](https://github.com/microsoft/vcpkg/pull/14980) [EASTL] update to 3.17.03 (by @JonLiu1993) +- [(#14981)](https://github.com/microsoft/vcpkg/pull/14981) [libcopp] update to 1.3.3 (by @owent) +- [(#14986)](https://github.com/microsoft/vcpkg/pull/14986) 2020-12-07 Build Fixes (by @BillyONeal) +- [(#14988)](https://github.com/microsoft/vcpkg/pull/14988) [GLIBMM] Installing .pc file (by @faserg1) +- [(#14991)](https://github.com/microsoft/vcpkg/pull/14991) [libxml2] build failure with x64-linux-dynamic (Fix #14990) (by @klalumiere) +- [(#14992)](https://github.com/microsoft/vcpkg/pull/14992) [sdl2] Don't propagate shared link options (by @JesseFarebro) +- [(#14997)](https://github.com/microsoft/vcpkg/pull/14997) [libcopp] Update to 1.3.4 (#14996) (by @owent) +- [(#14999)](https://github.com/microsoft/vcpkg/pull/14999) [vcpkg] Add commands to maintain and verify versions db integrity (by @vicroms) +- [(#15001)](https://github.com/microsoft/vcpkg/pull/15001) Fix crosscompiling for x86_64 on ARM64 macOS (by @orudge) +- [(#15002)](https://github.com/microsoft/vcpkg/pull/15002) [libpng] Fix cross-compilation on macOS (by @orudge) +- [(#15005)](https://github.com/microsoft/vcpkg/pull/15005) [qt5] Fix linux dynamic build (by @dweckmann) +- [(#15009)](https://github.com/microsoft/vcpkg/pull/15009) [dav1d] Add dav1d AV1 decoder port (by @RichLogan) +- [(#15010)](https://github.com/microsoft/vcpkg/pull/15010) [vcpkg] Remove extra indirection in IVersionedPortfileProvider/IBaselineProvider (by @ras0219) +- [(#15013)](https://github.com/microsoft/vcpkg/pull/15013) [vcpkg] Add support for --overlay-ports to versioning (by @ras0219) +- [(#15015)](https://github.com/microsoft/vcpkg/pull/15015) [seal] Update to SEAL 3.6.1 (by @kiromaru) +- [(#15018)](https://github.com/microsoft/vcpkg/pull/15018) [cppunit] add linux support and bump version to 1.15.1 (by @dweckmann) +- [(#15022)](https://github.com/microsoft/vcpkg/pull/15022) [eigen3] update to 3.3.9 (by @FlyingdutchmanC) +- [(#15027)](https://github.com/microsoft/vcpkg/pull/15027) [arrayfire] Remove forge and graphics deps from port (by @jacobkahn) +- [(#15030)](https://github.com/microsoft/vcpkg/pull/15030) [tcl, anyrpc, ois, osgearth] Build Fixes 2020-12-09 (by @BillyONeal) +- [(#15036)](https://github.com/microsoft/vcpkg/pull/15036) [speexdsp] Fix include directories for Linux builds (by @LRFLEW) +- [(#15037)](https://github.com/microsoft/vcpkg/pull/15037) [librttopo]new port (by @longhuan2018) +- [(#15038)](https://github.com/microsoft/vcpkg/pull/15038) [readosm] Update to 1.1.0a (by @longhuan2018) +- [(#15039)](https://github.com/microsoft/vcpkg/pull/15039) [spatialite-tools]update to 5.0.0 (by @longhuan2018) +- [(#15040)](https://github.com/microsoft/vcpkg/pull/15040) [libspatialite] Update 5.0.0 (by @longhuan2018) +- [(#15041)](https://github.com/microsoft/vcpkg/pull/15041) [curl] Update to 7.74.0 (by @nokutu) +- [(#15042)](https://github.com/microsoft/vcpkg/pull/15042) [sentry-native] Fix sentry-config-cmake.in (by @JackBoosY) +- [(#15044)](https://github.com/microsoft/vcpkg/pull/15044) [osg] build failure (by @JonLiu1993) +- [(#15045)](https://github.com/microsoft/vcpkg/pull/15045) [vcpkg] Don't require native tools on arm64 macOS (by @orudge) +- [(#15047)](https://github.com/microsoft/vcpkg/pull/15047) [CGAL] Upgrade to 5.2 (by @maxGimeno) +- [(#15049)](https://github.com/microsoft/vcpkg/pull/15049) [vcpkg_from_git] new options TAG and X_OUT_REF (by @Neumann-A) +- [(#15054)](https://github.com/microsoft/vcpkg/pull/15054) [vcpkg registries] Add git registries (by @strega-nil) +- [(#15056)](https://github.com/microsoft/vcpkg/pull/15056) [opencascade] Fix OpenCASCADE_INSTALL_PREFIX path in config (by @NancyLi1013) +- [(#15057)](https://github.com/microsoft/vcpkg/pull/15057) [taskflow] update port to v2.7.0 (by @remz1337) +- [(#15058)](https://github.com/microsoft/vcpkg/pull/15058) [mp3lame] Fix lib suffix on Unix (by @NancyLi1013) +- [(#15060)](https://github.com/microsoft/vcpkg/pull/15060) [fontconfig] Disable install data files (by @JackBoosY) +- [(#15062)](https://github.com/microsoft/vcpkg/pull/15062) [openssl] Remove extra slashes when installing usage (by @JackBoosY) +- [(#15063)](https://github.com/microsoft/vcpkg/pull/15063) [imgui] Fix find dependencies (by @JackBoosY) +- [(#15068)](https://github.com/microsoft/vcpkg/pull/15068) [oneDNN] New port (by @jacobkahn) +- [(#15076)](https://github.com/microsoft/vcpkg/pull/15076) Properly index package actions in log (by @gritukan) +- [(#15080)](https://github.com/microsoft/vcpkg/pull/15080) [hyperscan] Remove erroneous python3 dependency. (by @Hoikas) +- [(#15081)](https://github.com/microsoft/vcpkg/pull/15081) [vcpkg] Refactor end-to-end tests (by @ras0219) +- [(#15082)](https://github.com/microsoft/vcpkg/pull/15082) [glbinding] Improve usage information (by @ras0219) +- [(#15084)](https://github.com/microsoft/vcpkg/pull/15084) [vcpkg] Adhere to older draft schema to improve compatibility with editors (such as VS) (by @ras0219) +- [(#15089)](https://github.com/microsoft/vcpkg/pull/15089) [libarchive+tesseract+opencv] add missing libarchiveConfig.cmake, fix tesseract downstream and unblock opencv CI (by @cenit) +- [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) +- [(#15092)](https://github.com/microsoft/vcpkg/pull/15092) [breakpad] Support breakpad_client on Linux & macOS (by @Perlmint) +- [(#15095)](https://github.com/microsoft/vcpkg/pull/15095) Avoid C4819 warning during bootstrap-vcpkg.bat (by @tetsuh) +- [(#15104)](https://github.com/microsoft/vcpkg/pull/15104) [ csv2 ]update to latest commit (by @gennesseaux) +- [(#15105)](https://github.com/microsoft/vcpkg/pull/15105) [NLopt] Update to 2.7.0 (by @rickertm) +- [(#15109)](https://github.com/microsoft/vcpkg/pull/15109) Azure-IoT-Sdk for C release 2020-12-09 (by @ewertons) +- [(#15110)](https://github.com/microsoft/vcpkg/pull/15110) [vcpkg] Fix CMAKE_CURRENT_LIST_DIR in load_dep_info_vars() (by @ras0219) +- [(#15112)](https://github.com/microsoft/vcpkg/pull/15112) [freetype] avoid target_link_libraries call since qt6 does not like it. (by @Neumann-A) +- [(#15114)](https://github.com/microsoft/vcpkg/pull/15114) [vcpkg registries] support versions (by @strega-nil) +- [(#15115)](https://github.com/microsoft/vcpkg/pull/15115) [vcpkg] `VCPKG_ENV_PASSTHROUGH_UNTRACKED` (by @ras0219) +- [(#15116)](https://github.com/microsoft/vcpkg/pull/15116) [vcpkg] fix v140. again (by @strega-nil) +- [(#15125)](https://github.com/microsoft/vcpkg/pull/15125) [coin] x64-windows-statid-md fixes (by @ankurverma85) +- [(#15126)](https://github.com/microsoft/vcpkg/pull/15126) [sdl1] x64-windows-static-md fixes (by @ankurverma85) +- [(#15127)](https://github.com/microsoft/vcpkg/pull/15127) [ffmpeg] fix up the pkgconfig files (by @JackBoosY) +- [(#15136)](https://github.com/microsoft/vcpkg/pull/15136) [wt] Update to 4.5.0 (by @RockinRoel) +- [(#15137)](https://github.com/microsoft/vcpkg/pull/15137) [boost-modular-build-helper] Specify msvc version in user-config.jam (by @ras0219-msft) +- [(#15138)](https://github.com/microsoft/vcpkg/pull/15138) [comms] update comms libs to latest version (by @mathisloge) +- [(#15139)](https://github.com/microsoft/vcpkg/pull/15139) [vcpkg] Teach `vcpkg install` `--no-build-missing` (by @ras0219-msft) +- [(#15140)](https://github.com/microsoft/vcpkg/pull/15140) [sail] Enable static builds and more platforms (by @happy-sea-fox) +- [(#15141)](https://github.com/microsoft/vcpkg/pull/15141) [vcpkg ci] upload diff from clang-format to artifacts (by @strega-nil) +- [(#15142)](https://github.com/microsoft/vcpkg/pull/15142) [mdns] added new port (by @mathisloge) +- [(#15144)](https://github.com/microsoft/vcpkg/pull/15144) [fontconfig] add vcpkg cmake wrapper. (by @Neumann-A) +- [(#15147)](https://github.com/microsoft/vcpkg/pull/15147) [openexr] Remove python dependency of openexr. (by @BillyONeal) +- [(#15149)](https://github.com/microsoft/vcpkg/pull/15149) [vcpkg] Fix warning (as error) when building vcpgk/toolsrc with clang++ 10 or g++ 9.3 (see #15148) (by @klalumiere) +- [(#15151)](https://github.com/microsoft/vcpkg/pull/15151) [opentracing] Update VMs 2020-12 (by @BillyONeal) +- [(#15156)](https://github.com/microsoft/vcpkg/pull/15156) [Realsense2] Update to 2.40.0 (by @JonLiu1993) +- [(#15158)](https://github.com/microsoft/vcpkg/pull/15158) [poppler] Add new port (by @playgithub) +- [(#15159)](https://github.com/microsoft/vcpkg/pull/15159) [comms] fixes debug build configuration (by @mathisloge) +- [(#15162)](https://github.com/microsoft/vcpkg/pull/15162) [OpenCV] update to v4.5 and to v3.4.12 (by @cenit) +- [(#15163)](https://github.com/microsoft/vcpkg/pull/15163) [magnum,magnum-plugins] Add vulkan and shaderconverter features (by @Squareys) +- [(#15168)](https://github.com/microsoft/vcpkg/pull/15168) [civetweb] Disable extensive log output for debug builds (by @gjasny) +- [(#15170)](https://github.com/microsoft/vcpkg/pull/15170) [qt5-base] mysql plugin added (by @jepessen) +- [(#15171)](https://github.com/microsoft/vcpkg/pull/15171) [docs] Document acceptable uses for features. (by @BillyONeal) +- [(#15172)](https://github.com/microsoft/vcpkg/pull/15172) [vcpkg] Improve versioning files generators (by @vicroms) +- [(#15177)](https://github.com/microsoft/vcpkg/pull/15177) [cppmicroservices] Fix warning C4834 (by @Cheney-W) +- [(#15179)](https://github.com/microsoft/vcpkg/pull/15179) [mingw] Use find_file to find compiler, fall back to unprefixed windres if the prefixed version doesn't exist (by @longnguyen2004) +- [(#15182)](https://github.com/microsoft/vcpkg/pull/15182) [sobjectizer] update to v.5.7.2.1 (by @eao197) +- [(#15183)](https://github.com/microsoft/vcpkg/pull/15183) [ctp] bugfix for linux-x64 and file name case sensitivity (by @xgao1023) +- [(#15186)](https://github.com/microsoft/vcpkg/pull/15186) [pegtl] Update to release version 3.1.0 (by @wravery) +- [(#15187)](https://github.com/microsoft/vcpkg/pull/15187) Write manifest "vcpkg install" output to stdout (by @PazerOP) +- [(#15188)](https://github.com/microsoft/vcpkg/pull/15188) Fixed internal compiler error when using newer GCC@master. (by @nanoric) +- [(#15191)](https://github.com/microsoft/vcpkg/pull/15191) [openssl] install pkgconfig file (by @Perlmint) +- [(#15194)](https://github.com/microsoft/vcpkg/pull/15194) [ogre] make zziplib, freeimage, assimp, freetype and less strict resource manager as feature (by @dweckmann) +- [(#15196)](https://github.com/microsoft/vcpkg/pull/15196) [libjpeg-turbo/mozjpeg] Add conflict messages (by @NancyLi1013) +- [(#15200)](https://github.com/microsoft/vcpkg/pull/15200) [tool-meson] Rev vcpkg's meson build (by @RichLogan) +- [(#15206)](https://github.com/microsoft/vcpkg/pull/15206) Print failing upload attempts in !debug. (by @BillyONeal) +- [(#15207)](https://github.com/microsoft/vcpkg/pull/15207) [pugixml] Update to 1.11.4 (by @c72578) +- [(#15210)](https://github.com/microsoft/vcpkg/pull/15210) Updated directxtk et al for cmake package support (by @walbourn) +- [(#15213)](https://github.com/microsoft/vcpkg/pull/15213) [libass] Update to 0.15.0 (by @wangqr) +- [(#15214)](https://github.com/microsoft/vcpkg/pull/15214) [avisynthplus] Update to 3.6.1 (by @wangqr) +- [(#15215)](https://github.com/microsoft/vcpkg/pull/15215) [zziplib] Uses upstream CMakeLists.txt (by @longnguyen2004) +- [(#15219)](https://github.com/microsoft/vcpkg/pull/15219) [gloo] New Port (by @jacobkahn) +- [(#15221)](https://github.com/microsoft/vcpkg/pull/15221) [python3] Add vcpkg-cmake-wrapper. (by @Hoikas) +- [(#15222)](https://github.com/microsoft/vcpkg/pull/15222) Port for Microsoft GitHub DirectX-Headers (by @walbourn) +- [(#15234)](https://github.com/microsoft/vcpkg/pull/15234) [libjpeg-turbo] fix incompatibility for c11 and c17 (by @playgithub) +- [(#15236)](https://github.com/microsoft/vcpkg/pull/15236) [gmp/nettle] Update to latest release revision (by @PhoebeHui) +- [(#15240)](https://github.com/microsoft/vcpkg/pull/15240) [Hedley] Update to v14 (by @pratikpc) +- [(#15244)](https://github.com/microsoft/vcpkg/pull/15244) [x-plane] Update to 3.0.3 (by @siavee) +- [(#15245)](https://github.com/microsoft/vcpkg/pull/15245) [graphicsmagick] Add delegates.mgk (by @NancyLi1013) +- [(#15246)](https://github.com/microsoft/vcpkg/pull/15246) [protobuf] Fix the default proto file path (by @JackBoosY) +- [(#15252)](https://github.com/microsoft/vcpkg/pull/15252) Fixed port of quirc - patch did no longer apply / modified to fix build (by @Markus87) +- [(#15254)](https://github.com/microsoft/vcpkg/pull/15254) [boost-modular-builder] let fallback to default tool path (by @xandox) +- [(#15257)](https://github.com/microsoft/vcpkg/pull/15257) Add testing with VS2015 and VS2017 compilers. (by @BillyONeal) +- [(#15258)](https://github.com/microsoft/vcpkg/pull/15258) Update MacOS Software (by @BillyONeal) +- [(#15259)](https://github.com/microsoft/vcpkg/pull/15259) [libpqxx] update to 7.3.0 (by @JonLiu1993) +- [(#15263)](https://github.com/microsoft/vcpkg/pull/15263) [libass] update to 0.15.0 (by @JonLiu1993) +- [(#15265)](https://github.com/microsoft/vcpkg/pull/15265) [boost-modular-build-helper] Fix repeat building issue on linux and osx (by @PhoebeHui) +- [(#15266)](https://github.com/microsoft/vcpkg/pull/15266) [wtl] Update wtl to 10.0.10320 (by @chrullrich) +- [(#15269)](https://github.com/microsoft/vcpkg/pull/15269) [libsodium] use x64 specific gcc options only on x64 platform (by @isanych) +- [(#15274)](https://github.com/microsoft/vcpkg/pull/15274) [boost-modular-build-helper] Allow setting B2_OPTIONS_[DBG|REL] in BOOST_CMAKE_FRAGMENT (fixes #15273) (by @klalumiere) +- [(#15276)](https://github.com/microsoft/vcpkg/pull/15276) [ompl] upgrade to v1.5.1 (by @seanyen) +- [(#15277)](https://github.com/microsoft/vcpkg/pull/15277) [dlib] adding missing cudnn depedency for cuda feature (by @Kicer86) +- [(#15281)](https://github.com/microsoft/vcpkg/pull/15281) [librsync] fix librsync linkage (by @Amf1k) +- [(#15282)](https://github.com/microsoft/vcpkg/pull/15282) [mingw] Remove executable extension on non-Windows hosts (by @longnguyen2004) +- [(#15286)](https://github.com/microsoft/vcpkg/pull/15286) [boost-di] Update to 1.2.0 (by @PhoebeHui) +- [(#15292)](https://github.com/microsoft/vcpkg/pull/15292) [gdal] Update to 3.2.2 (by @longhuan2018) +- [(#15295)](https://github.com/microsoft/vcpkg/pull/15295) [minimp3] update to 2020-11-27 (by @JonLiu1993) +- [(#15296)](https://github.com/microsoft/vcpkg/pull/15296) [darknet] yolo v4 weights's hash need to update (by @JonLiu1993) +- [(#15298)](https://github.com/microsoft/vcpkg/pull/15298) [openssl] Update to 1.1.1i (by @lebdron) +- [(#15299)](https://github.com/microsoft/vcpkg/pull/15299) [vcpkg] use VCPKG_ROOT_DIR instead of DOWNLOADS for WORKING_DIRECTORY in do_version_check (by @lebdron) +- [(#15305)](https://github.com/microsoft/vcpkg/pull/15305) [arcus] New port (by @stephenjust) +- [(#15306)](https://github.com/microsoft/vcpkg/pull/15306) [tbb] arm64-osx support (by @lebdron) +- [(#15307)](https://github.com/microsoft/vcpkg/pull/15307) [grpc] Build codegen on arm64-osx (by @lebdron) +- [(#15314)](https://github.com/microsoft/vcpkg/pull/15314) fix licensingfile of kf5archive (by @Hendiadyoin1) +- [(#15322)](https://github.com/microsoft/vcpkg/pull/15322) [bcg729] New port (by @geraldcombs) +- [(#15331)](https://github.com/microsoft/vcpkg/pull/15331) [libilbc] New port (by @geraldcombs) +- [(#15334)](https://github.com/microsoft/vcpkg/pull/15334) [freetype] Update to 2.10.4 (by @kevinlul) +- [(#15336)](https://github.com/microsoft/vcpkg/pull/15336) [KTX] Add port (by @stephenjust) +- [(#15338)](https://github.com/microsoft/vcpkg/pull/15338) [restinio] update to v.0.6.13 (by @eao197) +- [(#15340)](https://github.com/microsoft/vcpkg/pull/15340) [mdnsresponder] Change compile flag /Zi to /Z7 (by @JackBoosY) +- [(#15342)](https://github.com/microsoft/vcpkg/pull/15342) Raylib update to 3.5.0 (by @JonLiu1993) +- [(#15344)](https://github.com/microsoft/vcpkg/pull/15344) [cpp-httplib] Update to version 0.7.18 (by @iko1) +- [(#15352)](https://github.com/microsoft/vcpkg/pull/15352) [boost-python] Adds `python-debugging=on` to `B2_OPTIONS_DBG` (fixes #15350) (by @klalumiere) +- [(#15353)](https://github.com/microsoft/vcpkg/pull/15353) Build results from 2020-12-27 (by @BillyONeal) +- [(#15354)](https://github.com/microsoft/vcpkg/pull/15354) [vcpkg] Fix unrecognized identifier errors in prbuild and cibuild. (by @BillyONeal) +- [(#15355)](https://github.com/microsoft/vcpkg/pull/15355) [vcpkg] Fix pwsh version detection for old versions to download a fresh copy. (by @BillyONeal) +- [(#15359)](https://github.com/microsoft/vcpkg/pull/15359) [monkeys-audio] Update to 5.70 (by @c72578) +- [(#15360)](https://github.com/microsoft/vcpkg/pull/15360) [glib] Fix pkgconfig files (by @PhoebeHui) +- [(#15361)](https://github.com/microsoft/vcpkg/pull/15361) [libpq] Change compile flag /Zi to /Z7 when building Windows (by @JackBoosY) +- [(#15362)](https://github.com/microsoft/vcpkg/pull/15362) [ceres] Fix static library path on Linux (by @JackBoosY) +- [(#15365)](https://github.com/microsoft/vcpkg/pull/15365) update toml++ to v2.3.0 (by @marzer) +- [(#15366)](https://github.com/microsoft/vcpkg/pull/15366) [LLGL] installs header files in the wrong directory (by @JonLiu1993) +- [(#15372)](https://github.com/microsoft/vcpkg/pull/15372) [onednn] Fix share path infix to match find_package() name (by @jacobkahn) +- [(#15374)](https://github.com/microsoft/vcpkg/pull/15374) [osg] fix x64-windows-static-md builds (by @ankurverma85) +- [(#15375)](https://github.com/microsoft/vcpkg/pull/15375) [osgearth] Fix x64-windows-static-md (by @ankurverma85) +- [(#15378)](https://github.com/microsoft/vcpkg/pull/15378) [antlr4,python3] Resolve cross port conflicts (by @BillyONeal) +- [(#15379)](https://github.com/microsoft/vcpkg/pull/15379) [flashlight-cuda] Update port (by @jacobkahn) +- [(#15383)](https://github.com/microsoft/vcpkg/pull/15383) [directxmath] port updated for cmake improvements (by @walbourn) +- [(#15384)](https://github.com/microsoft/vcpkg/pull/15384) [soqt] Use vcpkg_from_github. (by @BillyONeal) +- [(#15385)](https://github.com/microsoft/vcpkg/pull/15385) [boost-build] Fix cflags and c++flags for msvc (by @PhoebeHui) +- [(#15387)](https://github.com/microsoft/vcpkg/pull/15387) [simde] update to 0.7.0 (by @JonLiu1993) +- [(#15389)](https://github.com/microsoft/vcpkg/pull/15389) [exiv2] Add pkgconfig to fix the path (by @NancyLi1013) +- [(#15393)](https://github.com/microsoft/vcpkg/pull/15393) [freeimage] Fix for FreeImage incorrect image format enum after disabling vendor plugins (by @giladbau) +- [(#15394)](https://github.com/microsoft/vcpkg/pull/15394) [IXWebsocket ] Upgraded to 11.0.4 version (by @ludekvodicka) +- [(#15396)](https://github.com/microsoft/vcpkg/pull/15396) [vcpkg] Improve docs for binarycaching (by @ras0219) +- [(#15398)](https://github.com/microsoft/vcpkg/pull/15398) [sdl2] Update to 2.0.14 (by @RT222) +- [(#15400)](https://github.com/microsoft/vcpkg/pull/15400) [wangle] Fix dependency issue (by @PhoebeHui) +- [(#15401)](https://github.com/microsoft/vcpkg/pull/15401) Update cpprestsdk to 2.10.17. (by @BillyONeal) +- [(#15410)](https://github.com/microsoft/vcpkg/pull/15410) [msbuild]Fix incorrect triplet configuration for Project Reunion apps (by @soumyamahunt) +- [(#15411)](https://github.com/microsoft/vcpkg/pull/15411) [vcpkg] Add x64-windows-static-md to pipeline (by @ankurverma85) +- [(#15416)](https://github.com/microsoft/vcpkg/pull/15416) [libheif] update to 1.10.0 (by @0xC0000054) +- [(#15419)](https://github.com/microsoft/vcpkg/pull/15419) [docs] fix "CMake script" -> "makefile" for vcpkg_(n)build_make (by @tueda) +- [(#15421)](https://github.com/microsoft/vcpkg/pull/15421) [tmx] Update tmx port to 1.1.0 (by @jarruda) +- [(#15425)](https://github.com/microsoft/vcpkg/pull/15425) [nuspell] update to version 4.2.0 (by @dimztimz) +- [(#15427)](https://github.com/microsoft/vcpkg/pull/15427) [msdfgen] New port (by @Haeri) +- [(#15435)](https://github.com/microsoft/vcpkg/pull/15435) [vcpkg] Provide proxy setting instruction for more compatibility. (by @cnSchwarzer) +- [(#15436)](https://github.com/microsoft/vcpkg/pull/15436) simdjson update to v0.7.1 (by @JonLiu1993) +- [(#15437)](https://github.com/microsoft/vcpkg/pull/15437) [hidapi] Support static build (by @PhoebeHui) +- [(#15438)](https://github.com/microsoft/vcpkg/pull/15438) [wil] Use internal CMakeLists (by @JackBoosY) +- [(#15445)](https://github.com/microsoft/vcpkg/pull/15445) [opencl] Fix dynamic build on linux (by @dweckmann) +- [(#15449)](https://github.com/microsoft/vcpkg/pull/15449) [vcpkg] Update paragraph tests (by @Mr-Leshiy) +- [(#15460)](https://github.com/microsoft/vcpkg/pull/15460) update trantor to 1.1.1 (by @kkzi) +- [(#15467)](https://github.com/microsoft/vcpkg/pull/15467) [quill] Update to v1.6.1 (by @RT222) +- [(#15468)](https://github.com/microsoft/vcpkg/pull/15468) [type-safe] New port. (by @blaz-kranjc) +- [(#15470)](https://github.com/microsoft/vcpkg/pull/15470) [vcpkg] Use a tag file rather than conditional compilation to permanently disable metrics. (by @BillyONeal) +- [(#15472)](https://github.com/microsoft/vcpkg/pull/15472) [vcpkg] Restore embedded git hash behind an option. (by @BillyONeal) +- [(#15473)](https://github.com/microsoft/vcpkg/pull/15473) [vcpkg baseline][cppcms] Fix issue with detecting Python 2. (by @Hoikas) +- [(#15474)](https://github.com/microsoft/vcpkg/pull/15474) [vcpkg] Download vcpkg.exe rather than building it in bootstrap on Windows. (by @BillyONeal) +- [(#15482)](https://github.com/microsoft/vcpkg/pull/15482) [libepoxy] Update to 1.5.5 (by @ras0219) +- [(#15485)](https://github.com/microsoft/vcpkg/pull/15485) Update to hidapi-0.10.1 (by @JoergAtGithub) +- [(#15486)](https://github.com/microsoft/vcpkg/pull/15486) [libzippp] fix find lzma (by @StarGate-One) +- [(#15491)](https://github.com/microsoft/vcpkg/pull/15491) [vcpkg baseline][poppler] Fix issue with using libcurl. (by @Hoikas) +- [(#15500)](https://github.com/microsoft/vcpkg/pull/15500) [openigtlink] Fix cmake config location (by @dweckmann) +- [(#15504)](https://github.com/microsoft/vcpkg/pull/15504) [vcpkg] Fix build for mingw (by @strega-nil) +- [(#15507)](https://github.com/microsoft/vcpkg/pull/15507) [pybind11] Use vcpkg Python3. (by @Hoikas) +- [(#15509)](https://github.com/microsoft/vcpkg/pull/15509) [openimageio] Bump to 2.2.10.0. (by @Hoikas) +- [(#15510)](https://github.com/microsoft/vcpkg/pull/15510) [google-cloud-cpp] update to latest release (v1.22.0) (by @coryan) +- [(#15512)](https://github.com/microsoft/vcpkg/pull/15512) [vcpkg] Allow to use Nuget's cache for Nuget binary caching sources (fix #15169) (by @klalumiere) +- [(#15513)](https://github.com/microsoft/vcpkg/pull/15513) [boost-asio] Fix duplicate symbols of asio::dummy_return (by @cedral) +- [(#15514)](https://github.com/microsoft/vcpkg/pull/15514) [flashlight-cpu] New port (by @jacobkahn) +- [(#15516)](https://github.com/microsoft/vcpkg/pull/15516) [vcpkg] Add sources for TLS 1.2 downloader tool. (by @BillyONeal) +- [(#15517)](https://github.com/microsoft/vcpkg/pull/15517) [sqlite-orm] Update to 1.6 (by @NancyLi1013) +- [(#15537)](https://github.com/microsoft/vcpkg/pull/15537) [polyhook2]Update to the latest version (by @stevemk14ebr) +- [(#15538)](https://github.com/microsoft/vcpkg/pull/15538) [vcpkg] Show the cache file name at download time to provide more ancillary information in non-ARIA2 mode. (by @RonxBulld) +- [(#15540)](https://github.com/microsoft/vcpkg/pull/15540) [sdl2] Fix improper replacement of -lSDL2main + remove IGNORE_FLAGS and SYSTEM_LIBRARIES (by @longnguyen2004) +- [(#15541)](https://github.com/microsoft/vcpkg/pull/15541) gdal:x64-windows-static-md fixes (by @ankurverma85) +- [(#15543)](https://github.com/microsoft/vcpkg/pull/15543) [vcpkg/docs] Add Missing Links in Spanish Readme (by @ninjaoflight) +- [(#15549)](https://github.com/microsoft/vcpkg/pull/15549) [cppgraphqlgen] Fix --head for new branch/option (by @wravery) +- [(#15554)](https://github.com/microsoft/vcpkg/pull/15554) directxmesh, directxtex, and uvatlas now support linux (by @walbourn) +- [(#15558)](https://github.com/microsoft/vcpkg/pull/15558) [palsigslot] New port (by @luca-schlecker) +- [(#15565)](https://github.com/microsoft/vcpkg/pull/15565) [vcpkg] Add initial versioning documentation (by @ras0219) +- [(#15567)](https://github.com/microsoft/vcpkg/pull/15567) [entt] update to <3.6> (by @JonLiu1993) +- [(#15569)](https://github.com/microsoft/vcpkg/pull/15569) [paho-mqtt] update to 1.3.8 (by @JonLiu1993) +- [(#15572)](https://github.com/microsoft/vcpkg/pull/15572) [vcpkg,boost-modular-build-helper] initial ppc64le community support (by @lebdron) +- [(#15573)](https://github.com/microsoft/vcpkg/pull/15573) [paho-mqttpp3] update to 1.2.0 (by @JonLiu1993) +- [(#15574)](https://github.com/microsoft/vcpkg/pull/15574) [poppler] Fix error gperf is not recognized as an internal or externa command (by @Cheney-W) +- [(#15577)](https://github.com/microsoft/vcpkg/pull/15577) [SOCI] Add support for soci-mysql connector (by @emexal-company) +- [(#15578)](https://github.com/microsoft/vcpkg/pull/15578) [vcpkg_apply_patches] don't change line endings on patching. (by @Neumann-A) +- [(#15579)](https://github.com/microsoft/vcpkg/pull/15579) [libpq] fix python patches (by @Neumann-A) +- [(#15580)](https://github.com/microsoft/vcpkg/pull/15580) [vcpkg] Add parse checking for version fields and enable non-string versions outside 'versions' flag (by @ras0219) +- [(#15581)](https://github.com/microsoft/vcpkg/pull/15581) [ignition-fuel-tools4] Add new port ???? (by @traversaro) +- [(#15583)](https://github.com/microsoft/vcpkg/pull/15583) [vcpkg] Add a different way to use CommandBuilder, support InWorkingDirectory (by @strega-nil) +- [(#15584)](https://github.com/microsoft/vcpkg/pull/15584) [vcpkg] Resolve macos host machines running out of disk space by reducing size and using fixed disks. (by @BillyONeal) +- [(#15585)](https://github.com/microsoft/vcpkg/pull/15585) [speexdsp] Configure and install speexdsp.pc (by @adam-bloom) +- [(#15589)](https://github.com/microsoft/vcpkg/pull/15589) [libzip] Relative pkgconfig paths (by @adam-bloom) +- [(#15593)](https://github.com/microsoft/vcpkg/pull/15593) [pangolin] Fix static build error (by @NancyLi1013) +- [(#15595)](https://github.com/microsoft/vcpkg/pull/15595) [nana] Fix fontconfig dependency (by @NancyLi1013) +- [(#15596)](https://github.com/microsoft/vcpkg/pull/15596) [qt5-base] Improve the warning message on Linux (by @JackBoosY) +- [(#15597)](https://github.com/microsoft/vcpkg/pull/15597) [qt5] Remove dependency qt5 feature mysqlplugin when building x86 (by @JackBoosY) +- [(#15600)](https://github.com/microsoft/vcpkg/pull/15600) [graphicsmagick] update to version 1.3.36 (by @josuegomes) +- [(#15603)](https://github.com/microsoft/vcpkg/pull/15603) [outcome] Replace Outcome single header based port with full fat cmake install port (by @ned14) +- [(#15606)](https://github.com/microsoft/vcpkg/pull/15606) [boost-locale] android build (by @xandox) +- [(#15608)](https://github.com/microsoft/vcpkg/pull/15608) Librealsense2 android build (by @xandox) +- [(#15609)](https://github.com/microsoft/vcpkg/pull/15609) delete linux from fail port from tomlplusplus (by @marshevms) +- [(#15611)](https://github.com/microsoft/vcpkg/pull/15611) [vcpkg_acquire_msys] add findutils as a dependency to libtool (by @Neumann-A) +- [(#15613)](https://github.com/microsoft/vcpkg/pull/15613) [libconfig] shlwapi is not available on linux (by @vmiheer) +- [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- [(#15620)](https://github.com/microsoft/vcpkg/pull/15620) [libtorrent] update to 1.2.12 (by @JonLiu1993) +- [(#15622)](https://github.com/microsoft/vcpkg/pull/15622) [vcpkg_build_make] remove libtool artifacts (by @Neumann-A) +- [(#15624)](https://github.com/microsoft/vcpkg/pull/15624) [glslang] Provide glslang-default-resource-limits library. (by @wolfpld) +- [(#15627)](https://github.com/microsoft/vcpkg/pull/15627) [vcpkg] Rewriting CmdLineBuilder (2/n) (by @strega-nil) +- [(#15633)](https://github.com/microsoft/vcpkg/pull/15633) [vcpkg] Change version field in `baseline.json` (by @vicroms) +- [(#15634)](https://github.com/microsoft/vcpkg/pull/15634) [openal-soft] Fix issue with cmake config. (by @Hoikas) +- [(#15636)](https://github.com/microsoft/vcpkg/pull/15636) [vcpkg] Fix incorrect handling of messages for permenantly disabled metrics. (by @BillyONeal) +- [(#15637)](https://github.com/microsoft/vcpkg/pull/15637) [physfs] Enable arm64 for non-Windows targets (by @past-due) +- [(#15638)](https://github.com/microsoft/vcpkg/pull/15638) [vcpkg] Add vcpkg_minimum_required as a replacement for VERSION.txt. (by @BillyONeal) +- [(#15639)](https://github.com/microsoft/vcpkg/pull/15639) directxtex, directxmesh, directxtk, uvatlas ports updated to fix cach??? (by @walbourn) +- [(#15645)](https://github.com/microsoft/vcpkg/pull/15645) [xlnt] Prevent macro redefinition (by @malirod) +- [(#15650)](https://github.com/microsoft/vcpkg/pull/15650) [log4cpp] find_package support (by @mannkafai) +- [(#15651)](https://github.com/microsoft/vcpkg/pull/15651) Improve `x-ci-verify-versions` error messages (by @vicroms) +- [(#15652)](https://github.com/microsoft/vcpkg/pull/15652) [vcpkg] Add version files (by @vicroms) +- [(#15655)](https://github.com/microsoft/vcpkg/pull/15655) [vcpkg] Add CI check for version files and update maintainer's guideline (by @vicroms) +- [(#15659)](https://github.com/microsoft/vcpkg/pull/15659) [vcpkg] vcpkg_configure_make: Support macOS cross-compile (by @past-due) +- [(#15661)](https://github.com/microsoft/vcpkg/pull/15661) [gtest] Add a patch to fix build error in GCC 11 (by @PragmaTwice) +- [(#15662)](https://github.com/microsoft/vcpkg/pull/15662) Reorder CI checks (by @vicroms) +- [(#15664)](https://github.com/microsoft/vcpkg/pull/15664) [vcpkg] Format JSON output of `x-add-version` to minimize diffs (by @vicroms) +- [(#15666)](https://github.com/microsoft/vcpkg/pull/15666) [podofo] Fix feature crypto (by @JackBoosY) +- [(#15667)](https://github.com/microsoft/vcpkg/pull/15667) [vtk] use patch for QT_NO_KEYWORDS support from upstream (by @dweckmann) +- [(#15669)](https://github.com/microsoft/vcpkg/pull/15669) [google-cloud-cpp] update to v1.23.0 (by @coryan) +- [(#15671)](https://github.com/microsoft/vcpkg/pull/15671) [libopusenc] fix macOS and Linux build (by @Be-ing) +- [(#15672)](https://github.com/microsoft/vcpkg/pull/15672) [blend2d] Update to beta_2021-01-02 (by @ZeeWanderer) +- [(#15673)](https://github.com/microsoft/vcpkg/pull/15673) [vcpkg] Rewriting CmdLineBuilder/Command (3/n) (by @strega-nil) +- [(#15676)](https://github.com/microsoft/vcpkg/pull/15676) [vcpkg] Remove versions feature flag check in all places except inputs (by @ras0219) +- [(#15677)](https://github.com/microsoft/vcpkg/pull/15677) [vcpkg] Miscellaneous internal improvements extracted from #15424 (by @ras0219) +- [(#15680)](https://github.com/microsoft/vcpkg/pull/15680) Fix Mbed TLS build for Android (by @ahmedyarub) +- [(#15682)](https://github.com/microsoft/vcpkg/pull/15682) [pagmo2] Add new port (by @dmillard) +- [(#15683)](https://github.com/microsoft/vcpkg/pull/15683) [simage] Fix optional dependencies (by @ras0219-msft) +- [(#15684)](https://github.com/microsoft/vcpkg/pull/15684) [physfs] Fix arm64-windows (by @past-due) +- [(#15686)](https://github.com/microsoft/vcpkg/pull/15686) [vcpkg-ci] Move version validation after CI build passes (by @ras0219) +- [(#15687)](https://github.com/microsoft/vcpkg/pull/15687) [libssh] Add support for Android (by @ahmedyarub) +- [(#15688)](https://github.com/microsoft/vcpkg/pull/15688) fix wrong path in docs/specifications/manifests.md (by @aarcangeli) +- [(#15692)](https://github.com/microsoft/vcpkg/pull/15692) update libusb to 1.0.24 (by @matwey) +- [(#15693)](https://github.com/microsoft/vcpkg/pull/15693) [vcpkg] More versioning docs (by @vicroms) +- [(#15699)](https://github.com/microsoft/vcpkg/pull/15699) [libmariadb] Fix compiling on ARM64 (by @kotori2) +- [(#15700)](https://github.com/microsoft/vcpkg/pull/15700) [pegtl] Update to 3.2.0 release (by @wravery) +- [(#15701)](https://github.com/microsoft/vcpkg/pull/15701) [cppgraphqlgen] Update to 3.5.0 release (by @wravery) +- [(#15706)](https://github.com/microsoft/vcpkg/pull/15706) [icu] Add support for macos rpath prefix macro (by @adam-bloom) +- [(#15709)](https://github.com/microsoft/vcpkg/pull/15709) [vcpkg] Fix regression in error messages with registries/versioning (by @ras0219) +- [(#15714)](https://github.com/microsoft/vcpkg/pull/15714) [nsync] create a new port (by @luncliff) +- [(#15715)](https://github.com/microsoft/vcpkg/pull/15715) [metrohash] support Android triplet build (by @luncliff) +- [(#15717)](https://github.com/microsoft/vcpkg/pull/15717) [mnn,flatbuffers] add a new port and patch (by @luncliff) +- [(#15718)](https://github.com/microsoft/vcpkg/pull/15718) [sfml] Install usage and change version scheme to relaxed (by @ras0219) +- [(#15720)](https://github.com/microsoft/vcpkg/pull/15720) [sdformat9] Update to 9.4.0 (by @traversaro) +- [(#15721)](https://github.com/microsoft/vcpkg/pull/15721) [xorstr] Update to 2020-11-29 (by @ghost) +- [(#15722)](https://github.com/microsoft/vcpkg/pull/15722) [phnt] Update to 2020-12-21 (by @ghost) +- [(#15724)](https://github.com/microsoft/vcpkg/pull/15724) [freerdp] Fix include path (by @KangLin) +- [(#15725)](https://github.com/microsoft/vcpkg/pull/15725) [aws-cpp-sdk] [zlib] [openssl] [curl] Fix zlib, OpenSSL, curl and AWS SDK for Android (by @ahmedyarub) +- [(#15727)](https://github.com/microsoft/vcpkg/pull/15727) [poppler] Disable clang-format check (by @NancyLi1013) +- [(#15729)](https://github.com/microsoft/vcpkg/pull/15729) [vcpkg baseline] [mesa] Fix conflicts with angle (by @NancyLi1013) +- [(#15732)](https://github.com/microsoft/vcpkg/pull/15732) [msys2] Update msys components pkgconfig url (by @JackBoosY) +- [(#15734)](https://github.com/microsoft/vcpkg/pull/15734) [tiff] add vcpkg_fixup_pkgconfig for tiff (by @Neumann-A) +- [(#15735)](https://github.com/microsoft/vcpkg/pull/15735) [libjepg-turbo] Fix *.pc files (by @Neumann-A) +- [(#15739)](https://github.com/microsoft/vcpkg/pull/15739) [restc-cpp] new port (by @lejcik) +- [(#15740)](https://github.com/microsoft/vcpkg/pull/15740) [vcpkg baseline][vcpkg_configure_make] Fix arm64-windows, arm-uwp (by @past-due) +- [(#15743)](https://github.com/microsoft/vcpkg/pull/15743) [usockets] Update uSockets to the latest version (by @JonLiu1993) +- [(#15746)](https://github.com/microsoft/vcpkg/pull/15746) [vcpkg baseline] Disable spatialite-tools on linux and osx (by @NancyLi1013) +- [(#15748)](https://github.com/microsoft/vcpkg/pull/15748) [libpq] Fix install tool pg_config on Linux (by @JackBoosY) +- [(#15750)](https://github.com/microsoft/vcpkg/pull/15750) [libgeotiff] Fix packagename via find_package (by @NancyLi1013) +- [(#15751)](https://github.com/microsoft/vcpkg/pull/15751) [reproc] update to 14.2.1 (by @JonLiu1993) +- [(#15752)](https://github.com/microsoft/vcpkg/pull/15752) [libsass/sassc] add new port/tool (by @Neumann-A) +- [(#15754)](https://github.com/microsoft/vcpkg/pull/15754) [graphene] Add new port (by @Neumann-A) +- [(#15756)](https://github.com/microsoft/vcpkg/pull/15756) [vcpkg/meson] fix some details (by @Neumann-A) +- [(#15757)](https://github.com/microsoft/vcpkg/pull/15757) [Arrow] Update to 3.0.0 (by @GPSnoopy) +- [(#15760)](https://github.com/microsoft/vcpkg/pull/15760) Update aws cpp sdk (by @ahmedyarub) +- [(#15764)](https://github.com/microsoft/vcpkg/pull/15764) [opencolorio] Install OpenColorIOConfig.cmake (by @ras0219) +- [(#15767)](https://github.com/microsoft/vcpkg/pull/15767) [vcpkg] fix edit command on windows (by @strega-nil) +- [(#15768)](https://github.com/microsoft/vcpkg/pull/15768) [vcpkg baseline][spatialite-tools] fix linux osx build falied (by @longhuan2018) +- [(#15769)](https://github.com/microsoft/vcpkg/pull/15769) [x264] Fix build failed on uwp (by @NancyLi1013) +- [(#15770)](https://github.com/microsoft/vcpkg/pull/15770) [darknet] update to latest version (by @cenit) +- [(#15771)](https://github.com/microsoft/vcpkg/pull/15771) [libiconv] Updated typo in iconv share files location (by @ludekvodicka) +- [(#15777)](https://github.com/microsoft/vcpkg/pull/15777) [osgearth] Make all find_packages required in effort to make this port less "flaky", and turn on in CI. (by @BillyONeal) +- [(#15782)](https://github.com/microsoft/vcpkg/pull/15782) [lzo] Install pc file on windows (by @Neumann-A) +- [(#15784)](https://github.com/microsoft/vcpkg/pull/15784) [vcpkg] Rename `port_versions` to `versions` (by @strega-nil) +- [(#15785)](https://github.com/microsoft/vcpkg/pull/15785) [crfsuite] change /include/x.h => /include/crfsuite/x.h (by @BillyONeal) +- [(#15787)](https://github.com/microsoft/vcpkg/pull/15787) [ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (by @Sibras) +- [(#15788)](https://github.com/microsoft/vcpkg/pull/15788) [quirc, opencv4] Build fixes from 2021-01-18 build (by @BillyONeal) +- [(#15789)](https://github.com/microsoft/vcpkg/pull/15789) [ogre] Do not use strict mode by default in ogre for backward compatibility (by @traversaro) +- [(#15790)](https://github.com/microsoft/vcpkg/pull/15790) [sentry-native] Update to 0.4.5 (by @AenBleidd) +- [(#15797)](https://github.com/microsoft/vcpkg/pull/15797) [libsamplerate] Upgrade to 0.2.0 (by @evpobr) +- [(#15802)](https://github.com/microsoft/vcpkg/pull/15802) [ceres] Mark all dependencies REQUIRED (by @ras0219) +- [(#15803)](https://github.com/microsoft/vcpkg/pull/15803) [vcpkg testing] fix e2e tests (by @strega-nil) +- [(#15804)](https://github.com/microsoft/vcpkg/pull/15804) [aws-sdk-cpp] Fix PRIVATE => PRVATE typo (by @BillyONeal) +- [(#15806)](https://github.com/microsoft/vcpkg/pull/15806) [libxslt] Fixed macos build (by @ludekvodicka) +- [(#15810)](https://github.com/microsoft/vcpkg/pull/15810) [vcpkg] Restore x-upload-metrics command accidentally disabled by removing VCPKG_DISABLE_METRICS (by @BillyONeal) +- [(#15812)](https://github.com/microsoft/vcpkg/pull/15812) [freeimage] Fix plugin disable patch (by @JackBoosY) +- [(#15821)](https://github.com/microsoft/vcpkg/pull/15821) [libffi] Added armv7-a to allowed architectures for Android 32 bit arm builds (by @venabled) +- [(#15825)](https://github.com/microsoft/vcpkg/pull/15825) [vcpkg] Improve diagnostics around compiler tracking and toolset errors. 'Fixes' #15823. (by @ras0219) +- [(#15828)](https://github.com/microsoft/vcpkg/pull/15828) [vcpkg] Add dummy version.txt for vcpkg older than vcpkg_minimum_required. (by @BillyONeal) +- [(#15831)](https://github.com/microsoft/vcpkg/pull/15831) [spirv-cross,spirv-headers,spirv-tools] 2021-01-15 update (by @barcharcraz) +- [(#15832)](https://github.com/microsoft/vcpkg/pull/15832) [vcpkg] clarify the actions of vcpkg_check_linkage (by @barcharcraz) +- [(#15837)](https://github.com/microsoft/vcpkg/pull/15837) [ngspice] Update to rev 33 (by @marekr) +- [(#15841)](https://github.com/microsoft/vcpkg/pull/15841) [trantor] Update to 1.2.0 (by @an-tao) +- [(#15845)](https://github.com/microsoft/vcpkg/pull/15845) [docs] Correct the "new port requests" link in FAQ (by @claremacrae) +- [(#15850)](https://github.com/microsoft/vcpkg/pull/15850) [drogon] Upgrade to v1.3.0 (by @kotori2) +- [(#15851)](https://github.com/microsoft/vcpkg/pull/15851) [libpqxx] Upgrade to v7.3.1 (by @tomlankhorst) +- [(#15852)](https://github.com/microsoft/vcpkg/pull/15852) [angelscript] Update to 2.35.0 (by @crackedmind) +- [(#15855)](https://github.com/microsoft/vcpkg/pull/15855) [speex] Add linux and macOS support. (by @Hoikas) +- [(#15856)](https://github.com/microsoft/vcpkg/pull/15856) [kinectsdk1] Update hash (by @Cheney-W) +- [(#15857)](https://github.com/microsoft/vcpkg/pull/15857) [charls] update to 2.2.0 (by @JonLiu1993) +- [(#15859)](https://github.com/microsoft/vcpkg/pull/15859) [OpenCV] bump to 4.5.1 and to 3.4.13 (by @cenit) +- [(#15860)](https://github.com/microsoft/vcpkg/pull/15860) [CGAL] switch dep to gmp instead of mpir (by @Neumann-A) +- [(#15862)](https://github.com/microsoft/vcpkg/pull/15862) [ace] Update to 7.0.0 (by @jwillemsen) +- [(#15867)](https://github.com/microsoft/vcpkg/pull/15867) [vcpkg] vcpkg_configure_meson: Support macOS cross-compile (by @past-due) +- [(#15868)](https://github.com/microsoft/vcpkg/pull/15868) [libidn2] Fix cross-compile (non-Windows) (by @past-due) +- [(#15871)](https://github.com/microsoft/vcpkg/pull/15871) [vcpkg] Improve error reporting for vcpkg_abi_info.txt copy failure. (by @BillyONeal) +- [(#15874)](https://github.com/microsoft/vcpkg/pull/15874) [vcpkg] set CMake policy CMP0087 for X_VCPKG_APPLOCAL_DEPS_INSTALL (by @Be-ing) +- [(#15875)](https://github.com/microsoft/vcpkg/pull/15875) [sentry-native] Update to 0.4.6 (by @AenBleidd) +- [(#15878)](https://github.com/microsoft/vcpkg/pull/15878) [libkeyfinder] add new port with libkeyfinder 2.2.4 (by @Be-ing) +- [(#15882)](https://github.com/microsoft/vcpkg/pull/15882) [ngspice] build codemodel extension libraries (by @marekr) +- [(#15885)](https://github.com/microsoft/vcpkg/pull/15885) [libconfig] Fix libconfig when installing master branch (by @vmiheer) +- [(#15886)](https://github.com/microsoft/vcpkg/pull/15886) [baseline][colmap] Fix find dependency freeimage (by @JackBoosY) +- [(#15887)](https://github.com/microsoft/vcpkg/pull/15887) [boost-concept-check] Fix warning C4834 when install pagmo2 (by @Cheney-W) +- [(#15892)](https://github.com/microsoft/vcpkg/pull/15892) [libvpx] Fix arm-uwp builds for v142 toolset (by @jwtowner) +- [(#15894)](https://github.com/microsoft/vcpkg/pull/15894) [taskflow] update to 3.0.0 (by @mfornace) +- [(#15898)](https://github.com/microsoft/vcpkg/pull/15898) [vcpkg] Teach vcpkg.targets to emit a .tlog, enabling up-to-date checks (by @ras0219) +- [(#15900)](https://github.com/microsoft/vcpkg/pull/15900) [vcpkg baseline][osgearth] Fix and add dependency tinyxml (by @JackBoosY) +- [(#15902)](https://github.com/microsoft/vcpkg/pull/15902) [openvdb] Fix vcpkg-cmake-wrapper (by @JackBoosY) +- [(#15906)](https://github.com/microsoft/vcpkg/pull/15906) Add shell.nix for building on NixOS (by @poelzi) +- [(#15913)](https://github.com/microsoft/vcpkg/pull/15913) [sciplot] Add new port (by @CaeruleusAqua) +- [(#15918)](https://github.com/microsoft/vcpkg/pull/15918) [libftdi1] update to 1.5 (#15917) (by @eloc3147) +- [(#15926)](https://github.com/microsoft/vcpkg/pull/15926) [vcpkg] Emit parse errors to match '::: error: ' for better IDE compatibility (by @ras0219) +- [(#15933)](https://github.com/microsoft/vcpkg/pull/15933) [vcpkg baseline] Fix baseline regression (by @JackBoosY) +- [(#15934)](https://github.com/microsoft/vcpkg/pull/15934) [physx] Use /Z7 instead of /Zi to integrate the debug info when building static (by @JackBoosY) +- [(#15935)](https://github.com/microsoft/vcpkg/pull/15935) [raylib] Fix usage (by @NancyLi1013) +- [(#15936)](https://github.com/microsoft/vcpkg/pull/15936) [libjpeg-turbo] update to 2.0.6 (by @JonLiu1993) +- [(#15937)](https://github.com/microsoft/vcpkg/pull/15937) [meson] fix single-config builds (by @cenit) +- [(#15941)](https://github.com/microsoft/vcpkg/pull/15941) [curl] Fix/android curl debug bin (by @venabled) +- [(#15942)](https://github.com/microsoft/vcpkg/pull/15942) [darknet] fix opencv features, add compatibility with VS16.9 (by @cenit) +- [(#15943)](https://github.com/microsoft/vcpkg/pull/15943) [fast-cpp-csv-parser ] Update to the latest commit: Fixes compiler warnings (by @remz1337) +- [(#15945)](https://github.com/microsoft/vcpkg/pull/15945) [openal-soft] Update to 1.21.1 (by @past-due) +- [(#15948)](https://github.com/microsoft/vcpkg/pull/15948) [ shaderwriter ]Update to version 1.0.0 (by @DragonJoker) +- [(#15950)](https://github.com/microsoft/vcpkg/pull/15950) [libgcrypt] Update libgcrypt (by @nightlark) +- [(#15953)](https://github.com/microsoft/vcpkg/pull/15953) [libsndfile] Update to 1.0.31 (by @evpobr) +- [(#15954)](https://github.com/microsoft/vcpkg/pull/15954) [libsamplerate] Update to 0.2.1 (by @evpobr) +- [(#15957)](https://github.com/microsoft/vcpkg/pull/15957) [gmp] correct supports field to run CI for other platforms (by @Neumann-A) +- [(#15960)](https://github.com/microsoft/vcpkg/pull/15960) [vcpkg] fix X_VCPKG_APPLOCAL_DEPS_INSTALL (by @dhrdlicka) +- [(#15965)](https://github.com/microsoft/vcpkg/pull/15965) [cairo] Make freetype and fontconfig optional. (by @Hoikas) +- [(#15967)](https://github.com/microsoft/vcpkg/pull/15967) [discreture] Add new port (by @remz1337) +- [(#15971)](https://github.com/microsoft/vcpkg/pull/15971) [matio] Update to v1.5.19 (by @traversaro) +- [(#15973)](https://github.com/microsoft/vcpkg/pull/15973) [vcpkg baseline][armadillo] Update to 10.2.0 and also update the repository (by @NancyLi1013) +- [(#15974)](https://github.com/microsoft/vcpkg/pull/15974) [magic-enum] Update to v0.7.2 (by @Neargye) +- [(#15975)](https://github.com/microsoft/vcpkg/pull/15975) [nameof] Update to 0.10.0 (by @Neargye) +- [(#15978)](https://github.com/microsoft/vcpkg/pull/15978) [proj4] Bump to proj 7.2.1 (by @rhuijben) +- [(#15985)](https://github.com/microsoft/vcpkg/pull/15985) [proj4] Copy over proj.pdb file on install (by @stefanuhrig) +- [(#15986)](https://github.com/microsoft/vcpkg/pull/15986) [chromaprint] add new port with version 1.5.0 (by @Be-ing) +- [(#15988)](https://github.com/microsoft/vcpkg/pull/15988) [libebur128] add new port with version 1.2.5 (by @Be-ing) +- [(#15989)](https://github.com/microsoft/vcpkg/pull/15989) [functions-framework-cpp] add new port with version 0.3.0 (by @coryan) +- [(#15990)](https://github.com/microsoft/vcpkg/pull/15990) [libdjinterop] add new port with version 0.14.6 (by @Be-ing) +- [(#15994)](https://github.com/microsoft/vcpkg/pull/15994) [date] Fix vcpkg_fixup_cmake_targets for mingw (by @longnguyen2004) +- [(#15995)](https://github.com/microsoft/vcpkg/pull/15995) [libpqxx] Fix build with Visual Studio 2017 (by @JackBoosY) +- [(#15997)](https://github.com/microsoft/vcpkg/pull/15997) [opencascade] Update to 7.5.0 (by @JonLiu1993) +- [(#16000)](https://github.com/microsoft/vcpkg/pull/16000) [ffmpeg] avfilter: fix dependencies and linux library ordering (by @mcmtroffaes) +- [(#16001)](https://github.com/microsoft/vcpkg/pull/16001) [google-cloud-cpp] update to the latest release (v1.24.0) (by @coryan) +- [(#16008)](https://github.com/microsoft/vcpkg/pull/16008) [ngspice] Update to rev 34 (by @marekr) +- [(#16009)](https://github.com/microsoft/vcpkg/pull/16009) [vcpkg] fix checking out git registry ports (by @strega-nil) +- [(#16010)](https://github.com/microsoft/vcpkg/pull/16010) [directxsdk] Update DirectX SDK port (by @walbourn) +- [(#16012)](https://github.com/microsoft/vcpkg/pull/16012) [vcpkg] Tool fixes needed for vcpkg-tool extraction (by @BillyONeal) +- [(#16013)](https://github.com/microsoft/vcpkg/pull/16013) [azure-core-cpp] Add new port (by @azure-sdk) +- [(#16014)](https://github.com/microsoft/vcpkg/pull/16014) [azure-identity-cpp] Publish version 1.0.0-beta.3 (by @azure-sdk) +- [(#16018)](https://github.com/microsoft/vcpkg/pull/16018) [log4cxx] Fix dependency and pkgconfig (by @NancyLi1013) +- [(#16020)](https://github.com/microsoft/vcpkg/pull/16020) [azure-storage-common-cpp] Publish version 12.0.0-beta.7 (by @azure-sdk) +- [(#16021)](https://github.com/microsoft/vcpkg/pull/16021) [sentry-native] Update to 0.4.7 (by @AenBleidd) +- [(#16033)](https://github.com/microsoft/vcpkg/pull/16033) [sdl2] Fix vulkan feature dependencies (by @past-due) +- [(#16035)](https://github.com/microsoft/vcpkg/pull/16035) [metrohash] support iOS triplets (by @luncliff) +- [(#16037)](https://github.com/microsoft/vcpkg/pull/16037) [glslang] support iOS triplets (by @luncliff) +- [(#16038)](https://github.com/microsoft/vcpkg/pull/16038) [spirv-cross,spirv-tools] support iOS triplets (by @luncliff) +- [(#16045)](https://github.com/microsoft/vcpkg/pull/16045) Nanodbc/fix/config cmake files path linux (by @samyy321) +- [(#16051)](https://github.com/microsoft/vcpkg/pull/16051) [aubio] allow to build without dependencies (by @autoantwort) +- [(#16053)](https://github.com/microsoft/vcpkg/pull/16053) [azure-storage-files-shares-cpp] Add new port (by @azure-sdk) +- [(#16055)](https://github.com/microsoft/vcpkg/pull/16055) [vcpkg] Add scripts tree extraction notes. (by @BillyONeal) +- [(#16057)](https://github.com/microsoft/vcpkg/pull/16057) [prometheus-cpp] Update to version 0.12.1 (by @gjasny) +- [(#16061)](https://github.com/microsoft/vcpkg/pull/16061) [scripts-audit] vcpkg.cmake (by @strega-nil) +- [(#16065)](https://github.com/microsoft/vcpkg/pull/16065) [cpprestsdk] Bump version to 2.10.18 (by @barcharcraz) +- [(#16068)](https://github.com/microsoft/vcpkg/pull/16068) Add disable-exceptions feature to portfile for tbb (by @aggieNick02) +- [(#16069)](https://github.com/microsoft/vcpkg/pull/16069) [docs/users/manifests.md] Prioritize examples. Fix example. Add MSBuild integration documentation. (by @ras0219-msft) +- [(#16071)](https://github.com/microsoft/vcpkg/pull/16071) [gtest] fix builds when using --head (by @sylveon) +- [(#16077)](https://github.com/microsoft/vcpkg/pull/16077) [V8, icu] Update v8 to version 9.0.257.17, icu to 69.1 (by @Kwizatz) +- [(#16082)](https://github.com/microsoft/vcpkg/pull/16082) [libarchive] Fix static linking dependencies (by @DDoSolitary) +- [(#16085)](https://github.com/microsoft/vcpkg/pull/16085) [netcdf-c] Fix usage (by @JackBoosY) +- [(#16087)](https://github.com/microsoft/vcpkg/pull/16087) [boost-python] Fix build issue with feature python2 (by @PhoebeHui) +- [(#16089)](https://github.com/microsoft/vcpkg/pull/16089) [spdlog] Support build shared library (by @JonLiu1993) +- [(#16095)](https://github.com/microsoft/vcpkg/pull/16095) [vcpkg] Fix unsupported modifiers for X_VCPKG_APPLOCAL_DEPS_INSTALL. (by @crud89) +- [(#16101)](https://github.com/microsoft/vcpkg/pull/16101) Update DXUT port and add Effects11 (FX) port (by @walbourn) +- [(#16106)](https://github.com/microsoft/vcpkg/pull/16106) [abseil] Remove link flag '-ignore:4221' (by @JackBoosY) +- [(#16107)](https://github.com/microsoft/vcpkg/pull/16107) [lua] support iOS triplets (by @luncliff) +- [(#16108)](https://github.com/microsoft/vcpkg/pull/16108) [minizip] support iOS/Android triplets (by @luncliff) +- [(#16109)](https://github.com/microsoft/vcpkg/pull/16109) [geos] Update to 3.9.0 (by @JackBoosY) +- [(#16120)](https://github.com/microsoft/vcpkg/pull/16120) [nng] Update to v1.4.0 (by @jharmer95) +- [(#16121)](https://github.com/microsoft/vcpkg/pull/16121) [doctest] Update to v2.4.5 (by @jharmer95) +- [(#16125)](https://github.com/microsoft/vcpkg/pull/16125) [sqlite3] Update to 3.34.1 (by @past-due) +- [(#16127)](https://github.com/microsoft/vcpkg/pull/16127) [vcpkg docs] consistency-ify docs/regenerate on non-windows (by @strega-nil) +- [(#16130)](https://github.com/microsoft/vcpkg/pull/16130) [(z_)vcpkg_prettify_command(_line)] Scripts Tree Audit (by @strega-nil) +- [(#16131)](https://github.com/microsoft/vcpkg/pull/16131) [ngspice] fix win32 codemodel glob (by @marekr) +- [(#16134)](https://github.com/microsoft/vcpkg/pull/16134) [gl2ps] update to 1.4.2 (by @JonLiu1993) +- [(#16137)](https://github.com/microsoft/vcpkg/pull/16137) [shaderc] Use build type to build targets (by @JackBoosY) +- [(#16138)](https://github.com/microsoft/vcpkg/pull/16138) [vcpkg baseline][log4cpp] Update version record (by @JackBoosY) +- [(#16140)](https://github.com/microsoft/vcpkg/pull/16140) [workflow] add port of sogou/workflow (by @dengjunplusplus) +- [(#16144)](https://github.com/microsoft/vcpkg/pull/16144) [fast-float] Add new port (by @georg-emg) +- [(#16148)](https://github.com/microsoft/vcpkg/pull/16148) [ashes] Update to 2021-09-02 (by @DragonJoker) +- [(#16149)](https://github.com/microsoft/vcpkg/pull/16149) [aws-sdk-cpp] Regenerate feature list (by @ras0219) +- [(#16151)](https://github.com/microsoft/vcpkg/pull/16151) [inja] Update to v3.2.0 (by @matusnovak) +- [(#16154)](https://github.com/microsoft/vcpkg/pull/16154) [wxWidgets] Fix issue with port usage (by @AenBleidd) +- [(#16155)](https://github.com/microsoft/vcpkg/pull/16155) [vcpkg.targets] Add an additional options parameter for MSBuild integration (by @ras0219) +- [(#16160)](https://github.com/microsoft/vcpkg/pull/16160) [azure-core-cpp] Azure Core Release Beta6 (by @azure-sdk) +- [(#16162)](https://github.com/microsoft/vcpkg/pull/16162) [google-cloud-cpp] populate license field (by @coryan) +- [(#16163)](https://github.com/microsoft/vcpkg/pull/16163) [functions-framework-cpp] populate license field (by @coryan) +- [(#16166)](https://github.com/microsoft/vcpkg/pull/16166) [glfw3/glew] Fix pkgconfig (by @JackBoosY) +- [(#16172)](https://github.com/microsoft/vcpkg/pull/16172) [bfgroup-lyra] Install CMake Targets (by @Hoikas) +- [(#16173)](https://github.com/microsoft/vcpkg/pull/16173) [vcpkg integrate install] Allow setting the vcpkg installed dir (by @strega-nil) +- [(#16177)](https://github.com/microsoft/vcpkg/pull/16177) [google-cloud-cpp] use 'version' for version numbers (by @coryan) +- [(#16178)](https://github.com/microsoft/vcpkg/pull/16178) [functions-framework-cpp] use 'version' for version numbers (by @coryan) +- [(#16180)](https://github.com/microsoft/vcpkg/pull/16180) [vcpkg_build_msbuild] Hotfix regression in #16173 (by @ras0219) +- [(#16183)](https://github.com/microsoft/vcpkg/pull/16183) update azure-storage-{common/blob/file/datalake}-cpp (by @azure-sdk) +- [(#16189)](https://github.com/microsoft/vcpkg/pull/16189) [scripts-audit] vcpkg_add_to_path (by @strega-nil) +- [(#16190)](https://github.com/microsoft/vcpkg/pull/16190) [scripts-audit] execute_process (by @strega-nil) +- [(#16191)](https://github.com/microsoft/vcpkg/pull/16191) [scripts-audit] vcpkg_buildpath_length_warning (by @strega-nil) +- [(#16193)](https://github.com/microsoft/vcpkg/pull/16193) [scripts-audit] z_vcpkg_function_arguments (by @strega-nil) +- [(#16194)](https://github.com/microsoft/vcpkg/pull/16194) [kuku] Update Kuku to version 2.1 (by @kiromaru) +- [(#16195)](https://github.com/microsoft/vcpkg/pull/16195) [z_vcpkg_prettify_command_line] write to output variable (by @strega-nil) +- [(#16197)](https://github.com/microsoft/vcpkg/pull/16197) Update portaudio port to latest on github (by @fluffy) +- [(#16198)](https://github.com/microsoft/vcpkg/pull/16198) [workflow] Disable parallel configure due to writes to source dir (by @ras0219) +- [(#16199)](https://github.com/microsoft/vcpkg/pull/16199) [vcpkg_install_msbuild] Hotfix regression in #16173 (by @ras0219) +- [(#16202)](https://github.com/microsoft/vcpkg/pull/16202) [quill] Uncomment QUILL_FMT_EXTERNAL macro (by @RT222) +- [(#16208)](https://github.com/microsoft/vcpkg/pull/16208) [rtaudio] Fix mingw, switch to rolling release (by @autoantwort) +- [(#16212)](https://github.com/microsoft/vcpkg/pull/16212) [vcpkg] Change scripts/tls12-download.exe mode from 100644 to 100755 (by @yuri-sevatz) +- [(#16223)](https://github.com/microsoft/vcpkg/pull/16223) [libebur128] update to 1.2.6; fixes dynamic linking on Windows (by @Be-ing) +- [(#16226)](https://github.com/microsoft/vcpkg/pull/16226) [leptonica] now all dependencies have their own find_dependency... (by @cenit) +- [(#16227)](https://github.com/microsoft/vcpkg/pull/16227) [jsoncons] Update to version 0.162.0 (by @danielaparker) +- [(#16230)](https://github.com/microsoft/vcpkg/pull/16230) [sobjectizer] update to v.5.7.2.2 (by @eao197) +- [(#16232)](https://github.com/microsoft/vcpkg/pull/16232) [llvm] update to 11.1.0, add features and fix issues (by @yurybura) +- [(#16235)](https://github.com/microsoft/vcpkg/pull/16235) [hazelcast-cpp-client] Add new port (by @ihsandemir) +- [(#16238)](https://github.com/microsoft/vcpkg/pull/16238) [ryu] added ryu_printf (by @georg-emg) +- [(#16239)](https://github.com/microsoft/vcpkg/pull/16239) upgrade imgui to v1.81 (by @BrianPeek) +- [(#16245)](https://github.com/microsoft/vcpkg/pull/16245) [magnum,-plugins] Fix deployment of plugin types and incorrect removal of plugin lib dir on unix (by @Squareys) +- [(#16246)](https://github.com/microsoft/vcpkg/pull/16246) [halide] Update Halide to 11.0.1 (by @alexreinking) +- [(#16255)](https://github.com/microsoft/vcpkg/pull/16255) [imgui] change to correct dx binding implementation path (by @aizuon) +- [(#16257)](https://github.com/microsoft/vcpkg/pull/16257) [scripts audit] ports.cmake (by @strega-nil) +- [(#16260)](https://github.com/microsoft/vcpkg/pull/16260) [vcpkg] vcpkg_configure_meson: cross-compile fixes for Android (by @jwtowner) +- [(#16261)](https://github.com/microsoft/vcpkg/pull/16261) [continuable] add a new port (by @luncliff) +- [(#16264)](https://github.com/microsoft/vcpkg/pull/16264) [hpx] Update hpx to V1.6.0 (by @hkaiser) +- [(#16268)](https://github.com/microsoft/vcpkg/pull/16268) [Imgui] Update docking-experimental and freetype features to 1.81 (by @RT222) +- [(#16270)](https://github.com/microsoft/vcpkg/pull/16270) [vcpkg baseline][gsoap] Update to 2.8.111 (by @NancyLi1013) +- [(#16277)](https://github.com/microsoft/vcpkg/pull/16277) Updated 'simdjson' to v0.8.2 (by @jharmer95) +- [(#16280)](https://github.com/microsoft/vcpkg/pull/16280) qt5-base: misleading list of system packages required (by @wrobelda) +- [(#16285)](https://github.com/microsoft/vcpkg/pull/16285) [libffi] Fix processors (by @autoantwort) +- [(#16289)](https://github.com/microsoft/vcpkg/pull/16289) [vcpkg baseline][ktx/otl] Update download hash (by @JackBoosY) +- [(#16293)](https://github.com/microsoft/vcpkg/pull/16293) [URGENT] [vcpkg] fix script broken audit (by @cenit) +- [(#16294)](https://github.com/microsoft/vcpkg/pull/16294) [llvm] Fix resource path when building tools (by @JackBoosY) +- [(#16296)](https://github.com/microsoft/vcpkg/pull/16296) [soci] Fix feature mysql (by @JackBoosY) +- [(#16302)](https://github.com/microsoft/vcpkg/pull/16302) [bext-di] Rename `boost-di` to `bext-di` (by @krzysztof-jusiak) +- [(#16307)](https://github.com/microsoft/vcpkg/pull/16307) [functions-framework-cpp] update to latest release (v0.4.0) (by @coryan) +- [(#16312)](https://github.com/microsoft/vcpkg/pull/16312) [vcpkg] Add tar support for gettext (by @Wedge009) +- [(#16315)](https://github.com/microsoft/vcpkg/pull/16315) [python3] upgrade to 3.9.2 (by @Hoikas) +- [(#16317)](https://github.com/microsoft/vcpkg/pull/16317) direcxtsdk port updated to use MS Downloads (by @walbourn) +- [(#16320)](https://github.com/microsoft/vcpkg/pull/16320) [librtmp] Switch to GitHub mirror (by @ras0219) +- [(#16322)](https://github.com/microsoft/vcpkg/pull/16322) [box2d] update to 2.4.1 (by @JonLiu1993) +- [(#16323)](https://github.com/microsoft/vcpkg/pull/16323) [docs] Add CMake Integration to manifests.md (by @ras0219) +- [(#16324)](https://github.com/microsoft/vcpkg/pull/16324) [vcpkg docs] Update the versioning.getting-started.md (by @PhoebeHui) +- [(#16325)](https://github.com/microsoft/vcpkg/pull/16325) [libpmemobj-cpp] update to ver. 1.12 (by @JonLiu1993) +- [(#16334)](https://github.com/microsoft/vcpkg/pull/16334) [jsoncons] Update to 0.162.1 (by @danielaparker) +- [(#16335)](https://github.com/microsoft/vcpkg/pull/16335) [jsonnet] Incorporate md5.cpp into jsonnet library (by @tetsuh) +- [(#16336)](https://github.com/microsoft/vcpkg/pull/16336) [docs/users/manifests.md] add a link to the specification (by @coryan) +- [(#16337)](https://github.com/microsoft/vcpkg/pull/16337) [docs/users/binarycaching.md] a little blurb about using GCS (by @coryan) +- [(#16339)](https://github.com/microsoft/vcpkg/pull/16339) [psimd] add a new port (by @luncliff) +- [(#16340)](https://github.com/microsoft/vcpkg/pull/16340) [fp16] create a new port (by @luncliff) +- [(#16341)](https://github.com/microsoft/vcpkg/pull/16341) [fxdiv] create a new port (by @luncliff) +- [(#16342)](https://github.com/microsoft/vcpkg/pull/16342) [pthreadpool] create a new port (by @luncliff) +- [(#16344)](https://github.com/microsoft/vcpkg/pull/16344) [nnpack] create a new port (by @luncliff) +- [(#16345)](https://github.com/microsoft/vcpkg/pull/16345) [mfl] Add new port (by @cpp-niel) +- [(#16346)](https://github.com/microsoft/vcpkg/pull/16346) [fbgemm] create a new port (by @luncliff) +- [(#16347)](https://github.com/microsoft/vcpkg/pull/16347) vcpkg_copy_tool_dependencies: show description how to install powershell (by @autoantwort) +- [(#16348)](https://github.com/microsoft/vcpkg/pull/16348) [pthreads] support ARM arch and UWP platform (by @luncliff) +- [(#16354)](https://github.com/microsoft/vcpkg/pull/16354) [amqpcpp] update to 4.3.11 (by @JonLiu1993) +- [(#16356)](https://github.com/microsoft/vcpkg/pull/16356) [vcpkg baseline][poppler] Add feature splash and add its dependency boost-container and boost-move (by @JackBoosY) +- [(#16359)](https://github.com/microsoft/vcpkg/pull/16359) [vcpkg baseline][stxxl] Skip baseline check for windows build (by @JackBoosY) +- [(#16364)](https://github.com/microsoft/vcpkg/pull/16364) [tensorflow] upgrade to 2.4.1 (by @jgehw) +- [(#16366)](https://github.com/microsoft/vcpkg/pull/16366) [brynet] upgrade to 1.10.0 (by @IronsDu) +- [(#16369)](https://github.com/microsoft/vcpkg/pull/16369) [soci] Re-fix feature mysql (by @JackBoosY) +- [(#16370)](https://github.com/microsoft/vcpkg/pull/16370) [sdl2] Update patch (by @NancyLi1013) +- [(#16371)](https://github.com/microsoft/vcpkg/pull/16371) [wxwidgets] Fix include path in UNIX (by @JackBoosY) +- [(#16373)](https://github.com/microsoft/vcpkg/pull/16373) [podofo] update to 0.9.7 (by @JonLiu1993) +- [(#16375)](https://github.com/microsoft/vcpkg/pull/16375) [boost] /safeseh (by @autoantwort) +- [(#16378)](https://github.com/microsoft/vcpkg/pull/16378) [boost-context] fix linux -> windows cross compile (by @autoantwort) +- [(#16379)](https://github.com/microsoft/vcpkg/pull/16379) [seal] Updated SEAL version to 3.6.2. (by @WeiDaiWD) +- [(#16380)](https://github.com/microsoft/vcpkg/pull/16380) [rsasynccpp] Add new port (Rstein.AsyncCpp) (by @renestein) +- [(#16381)](https://github.com/microsoft/vcpkg/pull/16381) [vcpkg] [docs] Add Boost versioning example (by @vicroms) +- [(#16383)](https://github.com/microsoft/vcpkg/pull/16383) [antlr4] update to 4.9.1 (by @NickStrupat) +- [(#16385)](https://github.com/microsoft/vcpkg/pull/16385) [vcpkg baseline] [itpp] Fix include directory (by @PhoebeHui) +- [(#16386)](https://github.com/microsoft/vcpkg/pull/16386) [qt5-base] Add feature vulkan (by @JackBoosY) +- [(#16390)](https://github.com/microsoft/vcpkg/pull/16390) Update taglib to 1.12.0 (by @pdehne) +- [(#16392)](https://github.com/microsoft/vcpkg/pull/16392) [woff2] fix for static linking and alternative compiler toolchains (by @jwtowner) +- [(#16397)](https://github.com/microsoft/vcpkg/pull/16397) [brotli] add iOS support (by @jwtowner) +- [(#16398)](https://github.com/microsoft/vcpkg/pull/16398) [libwebm] apply upstream changes to support Android NDK r15b and later (by @jwtowner) +- [(#16400)](https://github.com/microsoft/vcpkg/pull/16400) [vcpkg-tool] Publish release 2021-02-24-d67989bce1043b98092ac45996a8230a059a2d7e (by @ras0219-msft) +- [(#16401)](https://github.com/microsoft/vcpkg/pull/16401) [breakpad] add support for Android triplets (by @jwtowner) +- [(#16404)](https://github.com/microsoft/vcpkg/pull/16404) [concurrentqueue] Update to 1.0.3 (by @JonLiu1993) +- [(#16408)](https://github.com/microsoft/vcpkg/pull/16408) [libtcod] Add new port. (by @HexDecimal) +- [(#16411)](https://github.com/microsoft/vcpkg/pull/16411) [realsense2] Update version to v 2.42.0 (by @Cheney-W) +- [(#16413)](https://github.com/microsoft/vcpkg/pull/16413) [cudnn] auto-download only if cuda version matches (by @cenit) +- [(#16415)](https://github.com/microsoft/vcpkg/pull/16415) [comms, commsdsl] update ports (by @mathisloge) +- [(#16420)](https://github.com/microsoft/vcpkg/pull/16420) [python3] Add feature deprecated-win7-support. (by @Hoikas) +- [(#16421)](https://github.com/microsoft/vcpkg/pull/16421) [docs] Add references to awesome community websites. Fixes #16278 (by @ras0219) +- [(#16426)](https://github.com/microsoft/vcpkg/pull/16426) [libmysql] Re-fix dependency openssl (by @JackBoosY) +- [(#16428)](https://github.com/microsoft/vcpkg/pull/16428) Upgrade to Python 3.9.2 to avoid CVE-2021-3177 and CVE-2021-23336 (by @cclauss) +- [(#16429)](https://github.com/microsoft/vcpkg/pull/16429) [glm] Add namespace to export target (by @JackBoosY) +- [(#16434)](https://github.com/microsoft/vcpkg/pull/16434) [libpq] fix filenames (linux -> windows cross compile) (by @autoantwort) +- [(#16436)](https://github.com/microsoft/vcpkg/pull/16436) [iir1] Add new port (by @andywang0607) +- [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) +- [(#16446)](https://github.com/microsoft/vcpkg/pull/16446) [celero] Updated to v2.7.2 (by @DigitalInBlue) +- [(#16447)](https://github.com/microsoft/vcpkg/pull/16447) [functions-framework-cpp] update to latest release (v0.5.0) (by @coryan) +- [(#16449)](https://github.com/microsoft/vcpkg/pull/16449) [protobuf] Update to 3.15.8 (by @yonik) +- [(#16455)](https://github.com/microsoft/vcpkg/pull/16455) [qscintilla] Update to 2.12 (by @m-kuhn) +- [(#16458)](https://github.com/microsoft/vcpkg/pull/16458) [exprtk] Update ExprTk (by @ArashPartow) +- [(#16459)](https://github.com/microsoft/vcpkg/pull/16459) [protopuf] Update to 1.0.1 (by @PragmaTwice) +- [(#16460)](https://github.com/microsoft/vcpkg/pull/16460) [libhv] Add new port (by @ithewei) +- [(#16461)](https://github.com/microsoft/vcpkg/pull/16461) [liblsl] Update to 1.14.0 (by @chausner) +- [(#16468)](https://github.com/microsoft/vcpkg/pull/16468) [vcpkg-cmake] Fix typo in vcpkg_cmake_configure that prevented custom triplets from working (by @sylveon) +- [(#16470)](https://github.com/microsoft/vcpkg/pull/16470) [sobjectizer] update to v5.7.2.3 (by @eao197) +- [(#16471)](https://github.com/microsoft/vcpkg/pull/16471) [libnop] create a new port (by @luncliff) +- [(#16473)](https://github.com/microsoft/vcpkg/pull/16473) [vcpkg baseline][libnice] Temporarily Skip all triplets check (by @NancyLi1013) +- [(#16477)](https://github.com/microsoft/vcpkg/pull/16477) [google-cloud-cpp] update to latest release (v1.25.0) (by @coryan) +- [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- [(#16480)](https://github.com/microsoft/vcpkg/pull/16480) [vcpkg_*_cmake] remove deprecation message (by @strega-nil) +- [(#16482)](https://github.com/microsoft/vcpkg/pull/16482) [boost-context] fix build result on apple arm (by @autoantwort) +- [(#16488)](https://github.com/microsoft/vcpkg/pull/16488) [msix] Add DISABLE_PARALLEL_CONFIGURE (by @NancyLi1013) +- [(#16489)](https://github.com/microsoft/vcpkg/pull/16489) [docs] Update to Community Resources in doc (by @Balnian) +- [(#16491)](https://github.com/microsoft/vcpkg/pull/16491) [g3log] update to 1.3.4 (by @JonLiu1993) +- [(#16492)](https://github.com/microsoft/vcpkg/pull/16492) [Azure pipeline] Upload file list logs for unstable testing (by @PhoebeHui) +- [(#16493)](https://github.com/microsoft/vcpkg/pull/16493) [mongoose] update to 7.1 (by @JonLiu1993) +- [(#16496)](https://github.com/microsoft/vcpkg/pull/16496) [uWebSockets] update to 19.0.0 (by @JonLiu1993) +- [(#16501)](https://github.com/microsoft/vcpkg/pull/16501) Don't copy svm-toy if not on Windows (by @SoftwareApe) +- [(#16502)](https://github.com/microsoft/vcpkg/pull/16502) [docs] Improve inter-document linking; add 'latest' links (by @ras0219) +- [(#16508)](https://github.com/microsoft/vcpkg/pull/16508) [scintilla] update to 4.4.6 (by @JonLiu1993) +- [(#16510)](https://github.com/microsoft/vcpkg/pull/16510) [fplus] update to v0.2.13-p0 (by @JonLiu1993) +- [(#16511)](https://github.com/microsoft/vcpkg/pull/16511) [crow] update to 0.2 (by @JonLiu1993) +- [(#16512)](https://github.com/microsoft/vcpkg/pull/16512) [hiredis] Fix include path (by @NancyLi1013) +- [(#16513)](https://github.com/microsoft/vcpkg/pull/16513) [opencascade] fix #16252 (by @Dejauxvue) +- [(#16515)](https://github.com/microsoft/vcpkg/pull/16515) Remove a ')' character in the documentation (by @duanqn) +- [(#16522)](https://github.com/microsoft/vcpkg/pull/16522) [vcpkg docs] Fix typo in docs/index.md (by @sbc100) +- [(#16525)](https://github.com/microsoft/vcpkg/pull/16525) [openssl] update to 1.1.1j (by @metsma) +- [(#16526)](https://github.com/microsoft/vcpkg/pull/16526) [poco] Remove dependency port openssl for feature netssl on windows (by @JackBoosY) +- [(#16527)](https://github.com/microsoft/vcpkg/pull/16527) [argparse] Update to the latest commit (by @JonLiu1993) +- [(#16536)](https://github.com/microsoft/vcpkg/pull/16536) [ginkgo] Create new port (by @upsj) +- [(#16546)](https://github.com/microsoft/vcpkg/pull/16546) [wxwidgets] Fix cmake wrapper (by @JackBoosY) +- [(#16548)](https://github.com/microsoft/vcpkg/pull/16548) [Azure-Kinect-Sensor-SDK] update to 1.41 (by @JonLiu1993) +- [(#16549)](https://github.com/microsoft/vcpkg/pull/16549) [poco] Fix feature sqlite3 (by @NancyLi1013) +- [(#16550)](https://github.com/microsoft/vcpkg/pull/16550) [sentry-native] Update to 0.4.8 (by @AenBleidd) +- [(#16552)](https://github.com/microsoft/vcpkg/pull/16552) [vc] Update HEAD_REF and fix CMake configure options (by @bernhardmgruber) +- [(#16553)](https://github.com/microsoft/vcpkg/pull/16553) [metrohash] support more triplets by excluding 128 CRC source (by @luncliff) +- [(#16568)](https://github.com/microsoft/vcpkg/pull/16568) [trantor] Update to 1.3.0 (by @an-tao) +- [(#16572)](https://github.com/microsoft/vcpkg/pull/16572) [geos] upgrade to 3.9.1 (by @m-kuhn) +- [(#16575)](https://github.com/microsoft/vcpkg/pull/16575) [wil] Updating WIL version to match its nuget package version (by @anaaru) +- [(#16576)](https://github.com/microsoft/vcpkg/pull/16576) [krabsetw] Update krabsetw to 4.1.18 (by @jrave) +- [(#16590)](https://github.com/microsoft/vcpkg/pull/16590) [vcpkg] Initial support of FreeBSD x86 platform (by @arves100) +- [(#16591)](https://github.com/microsoft/vcpkg/pull/16591) [cpp-httplib] Upgrade to v0.8.4 (by @tosone) +- [(#16592)](https://github.com/microsoft/vcpkg/pull/16592) [CGAL] Restore boost dependencies (by @maxGimeno) +- [(#16593)](https://github.com/microsoft/vcpkg/pull/16593) [hazelcast-cpp-client] New version update to 4.0.1 (by @ihsandemir) +- [(#16596)](https://github.com/microsoft/vcpkg/pull/16596) [scripts] vcpkg_configure_make: do not set --build on macOS (by @autoantwort) +- [(#16603)](https://github.com/microsoft/vcpkg/pull/16603) Update Lua port to version 5.4.2 (by @frankhale) +- [(#16605)](https://github.com/microsoft/vcpkg/pull/16605) [vcpkg-cmake] Search for binaries after manifest-based installs (by @townsend2010) +- [(#16610)](https://github.com/microsoft/vcpkg/pull/16610) [tiff] support zstd compression in TIFF image files (take 2) (by @ghesketh) +- [(#16611)](https://github.com/microsoft/vcpkg/pull/16611) [docs] Fix the automatically generated document URL (by @JackBoosY) +- [(#16617)](https://github.com/microsoft/vcpkg/pull/16617) [libxslt] Update to 1.1.34 (by @pastle-ptc) +- [(#16621)](https://github.com/microsoft/vcpkg/pull/16621) [harfbuzz] work around upstream SameFileError (by @Krzmbrzl) +- [(#16625)](https://github.com/microsoft/vcpkg/pull/16625) [ocilib] fix wrong solution filename (by @meastp) +- [(#16627)](https://github.com/microsoft/vcpkg/pull/16627) [host dependencies] add support in the scripts (by @strega-nil) +- [(#16628)](https://github.com/microsoft/vcpkg/pull/16628) Port for PresentMon, windows-only ETW swap-chain presentation capture and analysis tool (by @aggieNick02) +- [(#16633)](https://github.com/microsoft/vcpkg/pull/16633) [vcpkg_execute_build_process] Add warning message when memory or hard disk space is insufficient (by @JackBoosY) +- [(#16643)](https://github.com/microsoft/vcpkg/pull/16643) [prometheus-cpp] Update to version 0.12.2 (by @gjasny) +- [(#16649)](https://github.com/microsoft/vcpkg/pull/16649) [taglib] Upgrade from 1.12-beta-2 to 1.12 (by @uklotzde) +- [(#16651)](https://github.com/microsoft/vcpkg/pull/16651) [drogon] Update to 1.4.1 (by @an-tao) +- [(#16657)](https://github.com/microsoft/vcpkg/pull/16657) [magnum/magnum-plugins] fix magnum-plugins building all magnum dependencies (by @fran6co) +- [(#16659)](https://github.com/microsoft/vcpkg/pull/16659) [qt5-base] make libpq an optional dependency (by @autoantwort) +- [(#16661)](https://github.com/microsoft/vcpkg/pull/16661) [openjpeg] 16645 Fix compile w/features jp3d,jpip,jpwl,mj2 triplet x64-windows VS 2019 ver 16.9.1 (by @StarGate-One) +- [(#16664)](https://github.com/microsoft/vcpkg/pull/16664) [abseil] Upgrade abseil to 20200923 patch 3, fix gcc11 build error (by @xieyubo) +- [(#16667)](https://github.com/microsoft/vcpkg/pull/16667) [indicators] update to 2.0 (by @JonLiu1993) +- [(#16668)](https://github.com/microsoft/vcpkg/pull/16668) Azure Core Release Beta 7 (by @azure-sdk) +- [(#16672)](https://github.com/microsoft/vcpkg/pull/16672) [uWebSockets] updated to 19.0.0 alpha 5 (by @Phantomouse) +- [(#16675)](https://github.com/microsoft/vcpkg/pull/16675) [websocketpp] Add features to build without Boost (by @joefocusrite) +- [(#16679)](https://github.com/microsoft/vcpkg/pull/16679) [sqlite3] Update to 3.35.0 (by @kevinlul) +- [(#16683)](https://github.com/microsoft/vcpkg/pull/16683) [tweeny] Update to v3.2.0 (by @bradJM) +- [(#16684)](https://github.com/microsoft/vcpkg/pull/16684) [openvr ] Update openvr to 1.16.8 (by @EniacMlezi) +- [(#16693)](https://github.com/microsoft/vcpkg/pull/16693) [libbacktrace] new port (by @autoantwort) +- [(#16696)](https://github.com/microsoft/vcpkg/pull/16696) New port for mailio. (by @karastojko) +- [(#16697)](https://github.com/microsoft/vcpkg/pull/16697) [uSockets] update to version 0.7.1 (by @Phantomouse) +- [(#16701)](https://github.com/microsoft/vcpkg/pull/16701) [robin-hood-hashing] update to 3.10.0 (by @Ryan-rsm-McKenzie) +- [(#16703)](https://github.com/microsoft/vcpkg/pull/16703) [args] update to latest version (by @Ryan-rsm-McKenzie) +- [(#16705)](https://github.com/microsoft/vcpkg/pull/16705) [sundials] Update to 5.7.0 and also update repository (by @NancyLi1013) +- [(#16708)](https://github.com/microsoft/vcpkg/pull/16708) [ace] Upgrade to 7.0.1 (by @jwillemsen) +- [(#16710)](https://github.com/microsoft/vcpkg/pull/16710) [ixwebsocket] Fix cmake-configure files install path (by @NancyLi1013) +- [(#16711)](https://github.com/microsoft/vcpkg/pull/16711) [asio] update to 1.18.1 (by @JonLiu1993) +- [(#16714)](https://github.com/microsoft/vcpkg/pull/16714) [openh264] Add openh264 port (by @RichLogan) +- [(#16716)](https://github.com/microsoft/vcpkg/pull/16716) Don't try to install dependencies not managed by vcpkg (by @omartijn) +- [(#16725)](https://github.com/microsoft/vcpkg/pull/16725) [openmama] Modify the output path of the common header file (by @Cheney-W) +- [(#16726)](https://github.com/microsoft/vcpkg/pull/16726) [libxml2] Disable http and ftp on UWP (by @JackBoosY) +- [(#16727)](https://github.com/microsoft/vcpkg/pull/16727) [imgui] Update to 1.82 (by @RT222) +- [(#16730)](https://github.com/microsoft/vcpkg/pull/16730) [libsodium] Rework CMake build to match autoconf (by @thomasgt) +- [(#16733)](https://github.com/microsoft/vcpkg/pull/16733) [angle] Include EGL/eglext_angle.h in ANGLE (by @hanseuljun) +- [(#16737)](https://github.com/microsoft/vcpkg/pull/16737) [sdl2-mixer] Fix features link error (by @NancyLi1013) +- [(#16740)](https://github.com/microsoft/vcpkg/pull/16740) [libpq] mingw support (by @longnguyen2004) +- [(#16742)](https://github.com/microsoft/vcpkg/pull/16742) [glad] Add features to support different configurations. (by @crud89) +- [(#16749)](https://github.com/microsoft/vcpkg/pull/16749) [ttauri] Add new port (by @takev) +- [(#16755)](https://github.com/microsoft/vcpkg/pull/16755) [detours] support debug builds (by @sylveon) +- [(#16758)](https://github.com/microsoft/vcpkg/pull/16758) [docs] Rename docs/index.md to docs/README.md (by @autoantwort) +- [(#16760)](https://github.com/microsoft/vcpkg/pull/16760) [vcpkg docs] Modify manifest-root-dir as manifest-root (by @NancyLi1013) +- [(#16761)](https://github.com/microsoft/vcpkg/pull/16761) [vcpkg] Add "arm64-windows-static-md" triplet (by @davidebeatrici) +- [(#16763)](https://github.com/microsoft/vcpkg/pull/16763) [collada-dom] Add REMOVE_RECURSE to solve DLLs error path (by @JonLiu1993) +- [(#16765)](https://github.com/microsoft/vcpkg/pull/16765) [WinReg] update to v4.0.0 (by @JonLiu1993) +- [(#16766)](https://github.com/microsoft/vcpkg/pull/16766) [fmt] Fix build error when building arm64-uwp (by @JackBoosY) +- [(#16767)](https://github.com/microsoft/vcpkg/pull/16767) [libwebsockets] Update to v4.1.6 (by @657870) +- [(#16768)](https://github.com/microsoft/vcpkg/pull/16768) Upgrade ffmpeg to 4.3.2 (by @omartijn) +- [(#16770)](https://github.com/microsoft/vcpkg/pull/16770) [qt5-webengine] Fix issues (by @Neumann-A) +- [(#16774)](https://github.com/microsoft/vcpkg/pull/16774) [ci,vcpkg-cmake-*] remove host-only nature of vcpkg-cmake-* ports (by @strega-nil) +- [(#16775)](https://github.com/microsoft/vcpkg/pull/16775) [vcpkg_build_make] Fix interaction with Windows Detours (by @ras0219-msft) +- [(#16776)](https://github.com/microsoft/vcpkg/pull/16776) [vcpkg baseline] Skip libgnutls:x64-osx in Ci testing (by @PhoebeHui) +- [(#16779)](https://github.com/microsoft/vcpkg/pull/16779) [vtk] Add support for unicode path for VTK reader/writer (by @robbie-li) +- [(#16787)](https://github.com/microsoft/vcpkg/pull/16787) [msbuild] fix integration caching (by @strega-nil) +- [(#16788)](https://github.com/microsoft/vcpkg/pull/16788) [happly] add new port (by @autoantwort) +- [(#16789)](https://github.com/microsoft/vcpkg/pull/16789) [mailio] does not support uwp (by @autoantwort) +- [(#16794)](https://github.com/microsoft/vcpkg/pull/16794) [Influxdb-cxx] add new port (by @autoantwort) +- [(#16795)](https://github.com/microsoft/vcpkg/pull/16795) [docs] link to up to date versioning specification (by @autoantwort) +- [(#16796)](https://github.com/microsoft/vcpkg/pull/16796) [docs] fix links for vcpkg-tool maintainer help (by @autoantwort) +- [(#16799)](https://github.com/microsoft/vcpkg/pull/16799) [jwt-cpp] update to v0.5.0 (by @prince-chrismc) +- [(#16802)](https://github.com/microsoft/vcpkg/pull/16802) [celero] Updated to Celero v2.8.0 (by @DigitalInBlue) +- [(#16804)](https://github.com/microsoft/vcpkg/pull/16804) [blend2d] Update to beta_2021-03-17 (by @ZeeWanderer) +- [(#16805)](https://github.com/microsoft/vcpkg/pull/16805) Updates links to documentation in repo's root README.md (by @voldyman) +- [(#16806)](https://github.com/microsoft/vcpkg/pull/16806) [sail] Update 0.9.0-pre11 -> 0.9.0-pre12 (by @happy-sea-fox) +- [(#16810)](https://github.com/microsoft/vcpkg/pull/16810) [libgwenhywfar] new port (by @wrobelda) +- [(#16816)](https://github.com/microsoft/vcpkg/pull/16816) [libmt32emu] new port (by @autoantwort) +- [(#16818)](https://github.com/microsoft/vcpkg/pull/16818) [implot] Update to 0.9 (by @RT222) +- [(#16819)](https://github.com/microsoft/vcpkg/pull/16819) [spdlog] Fix build for Android (by @ahmedyarub) +- [(#16820)](https://github.com/microsoft/vcpkg/pull/16820) [jsoncons] Update to v0.163.0 (by @danielaparker) +- [(#16822)](https://github.com/microsoft/vcpkg/pull/16822) [bext-ut] create a new port (by @luncliff) +- [(#16824)](https://github.com/microsoft/vcpkg/pull/16824) [termcolor] update to 2.0.0 (by @JonLiu1993) +- [(#16825)](https://github.com/microsoft/vcpkg/pull/16825) [cairo,cairomm] add fontconfig and quartz feature and update cairo version (by @abique) +- [(#16834)](https://github.com/microsoft/vcpkg/pull/16834) [sqlite3] Update to 3.35.2 (by @past-due) +- [(#16835)](https://github.com/microsoft/vcpkg/pull/16835) [libhv] Add DISABLE_PARALLEL (by @NancyLi1013) +- [(#16837)](https://github.com/microsoft/vcpkg/pull/16837) [vcpkg baseline][gsoap] Update to 2.8.112 (by @NancyLi1013) +- [(#16838)](https://github.com/microsoft/vcpkg/pull/16838) [mapbox-geometry,mapbox-polylabel,geojson-vt-cpp,geojson-cpp] new ports (by @mathisloge) +- [(#16839)](https://github.com/microsoft/vcpkg/pull/16839) [libusb] Fix the support for Visual Studio 2019 (by @NancyLi1013) +- [(#16842)](https://github.com/microsoft/vcpkg/pull/16842) [workflow] update version of workflow port (by @dengjunplusplus) +- [(#16843)](https://github.com/microsoft/vcpkg/pull/16843) [flatbuffers] support iOS triplets (by @luncliff) +- [(#16852)](https://github.com/microsoft/vcpkg/pull/16852) [maintainer-guide] Clarify best practices for default features (by @ras0219-msft) +- [(#16856)](https://github.com/microsoft/vcpkg/pull/16856) [ixwebsocket] update to 11.2.3 (by @bsergean) +- [(#16858)](https://github.com/microsoft/vcpkg/pull/16858) [ryu] ryuConfig.cmake now selects the correct libraries when cross compiling (by @georg-emg) +- [(#16859)](https://github.com/microsoft/vcpkg/pull/16859) boost-modular-build-helper] Add system library dl for boost-regex[icu] and boost-locale[icu] on linux (by @PhoebeHui) +- [(#16860)](https://github.com/microsoft/vcpkg/pull/16860) [lz4] update to 1.9.3 (by @Thieum) +- [(#16863)](https://github.com/microsoft/vcpkg/pull/16863) [mqtt-cpp] update to 9.0.0 (by @sandro97git) +- [(#16865)](https://github.com/microsoft/vcpkg/pull/16865) [zstd] update to 1.4.9 (by @Thieum) +- [(#16867)](https://github.com/microsoft/vcpkg/pull/16867) [docs-triplets] Suggest overlay triplets (by @ras0219-msft) +- [(#16870)](https://github.com/microsoft/vcpkg/pull/16870) [spdlog] Update to 1.8.5 (by @Ryan-rsm-McKenzie) +- [(#16871)](https://github.com/microsoft/vcpkg/pull/16871) [WinReg] Update to v4.1.0 (by @JonLiu1993) +- [(#16872)](https://github.com/microsoft/vcpkg/pull/16872) [g3log] Add supports (by @NancyLi1013) +- [(#16875)](https://github.com/microsoft/vcpkg/pull/16875) [fakeit] add new port (by @autoantwort) +- [(#16877)](https://github.com/microsoft/vcpkg/pull/16877) [llvm] add features enable-{eh,ffi,bindings,terminfo,threads} (by @abique) +- [(#16879)](https://github.com/microsoft/vcpkg/pull/16879) [rapidcsv] new port (by @autoantwort) +- [(#16881)](https://github.com/microsoft/vcpkg/pull/16881) [docs] Vulkan SDK usage for Android triplets (by @luncliff) +- [(#16882)](https://github.com/microsoft/vcpkg/pull/16882) [ffmpeg] Fix FindFFMPEG lib versions for building opencv[ffmpeg] (by @genevanmeter) +- [(#16883)](https://github.com/microsoft/vcpkg/pull/16883) [vamp-sdk] new package (by @abique) +- [(#16884)](https://github.com/microsoft/vcpkg/pull/16884) [libcbor] New port (by @xgcssch) +- [(#16885)](https://github.com/microsoft/vcpkg/pull/16885) [microsoft-signalr] Update port with new version and find_package support (by @BrennanConroy) +- [(#16890)](https://github.com/microsoft/vcpkg/pull/16890) [freealut] Add a port of freealut (by @QAston) +- [(#16891)](https://github.com/microsoft/vcpkg/pull/16891) [libsoundio] Add support for linux backends (by @joefocusrite) +- [(#16892)](https://github.com/microsoft/vcpkg/pull/16892) [glfw3] Update to version 3.3.3 (by @barcharcraz) +- [(#16897)](https://github.com/microsoft/vcpkg/pull/16897) [libxml2] add missing GNUInstallDirs to fix pc files (by @Neumann-A) +- [(#16900)](https://github.com/microsoft/vcpkg/pull/16900) [vcpkg/scripts] add variable VCPKG_CROSSCOMPILING (by @Neumann-A) +- [(#16901)](https://github.com/microsoft/vcpkg/pull/16901) [robin-hood-hashing] Update to 3.11.1 (by @RT222) +- [(#16904)](https://github.com/microsoft/vcpkg/pull/16904) [vcpkg baseline][osgearth/gdal] Re-fix dependency gdal (by @JackBoosY) +- [(#16905)](https://github.com/microsoft/vcpkg/pull/16905) [fontconfig] fixes for arm64-macos (by @abique) +- [(#16910)](https://github.com/microsoft/vcpkg/pull/16910) [mpg123] Upgrade to 1.26.3-1 (by @evpobr) +- [(#16911)](https://github.com/microsoft/vcpkg/pull/16911) [freeglut] Don't enforce x64 when the compiler is 64 bit (by @davidebeatrici) +- [(#16913)](https://github.com/microsoft/vcpkg/pull/16913) [nowide] Upgrade to 11.1.1 (by @tats-u) +- [(#16916)](https://github.com/microsoft/vcpkg/pull/16916) [dav1d] Update to 0.8.2 (by @EwoutH) +- [(#16927)](https://github.com/microsoft/vcpkg/pull/16927) [vcpkg] Convert env vars slash if host is Win32 (by @huangqinjin) +- [(#16928)](https://github.com/microsoft/vcpkg/pull/16928) [abseil] Upgrade to 20210324 (by @Chronial) +- [(#16930)](https://github.com/microsoft/vcpkg/pull/16930) [boost-context] support android (by @huangqinjin) +- [(#16931)](https://github.com/microsoft/vcpkg/pull/16931) [quill] Upgrade to 1.6.2 (by @odygrd) +- [(#16935)](https://github.com/microsoft/vcpkg/pull/16935) [vcpkg/scripts] add a way to define another tool destination (by @Neumann-A) +- [(#16936)](https://github.com/microsoft/vcpkg/pull/16936) [ghc-filesystem] create a new port (by @luncliff) +- [(#16937)](https://github.com/microsoft/vcpkg/pull/16937) [OpenSSL] Update to 1.1.1k (by @metsma) +- [(#16943)](https://github.com/microsoft/vcpkg/pull/16943) [lua]Update port to version 5.4.3 (by @frankhale) +- [(#16948)](https://github.com/microsoft/vcpkg/pull/16948) [cmake] update cmake test port (by @Neumann-A) +- [(#16952)](https://github.com/microsoft/vcpkg/pull/16952) [vcpkg_acquire_msys] Update package versions (by @ras0219-msft) +- [(#16954)](https://github.com/microsoft/vcpkg/pull/16954) [vcpkg baseline][qt5-base] Fix glib link issues on linux (by @Neumann-A) +- [(#16957)](https://github.com/microsoft/vcpkg/pull/16957) [libarchive] Remove lzo from the default feature list (by @PhoebeHui) +- [(#16959)](https://github.com/microsoft/vcpkg/pull/16959) [vcpkg/make/scripts]only append the lib directories if they exist. (by @Neumann-A) +- [(#16962)](https://github.com/microsoft/vcpkg/pull/16962) [opensubdiv] Remove debug/share folder (by @PhoebeHui) +- [(#16969)](https://github.com/microsoft/vcpkg/pull/16969) [open62541] add amalgamation feature (by @Neumann-A) +- [(#16975)](https://github.com/microsoft/vcpkg/pull/16975) [libodb-mysql] Fix usage (by @JackBoosY) +- [(#16984)](https://github.com/microsoft/vcpkg/pull/16984) [gsl-lite] Update to 0.38.0 (by @mbeutel) +- [(#16994)](https://github.com/microsoft/vcpkg/pull/16994) [boost-regex] fix build with icu on osx (by @autoantwort) +- [(#16997)](https://github.com/microsoft/vcpkg/pull/16997) [protobuf] Fix deprecation warning in vcpkg_check_feature() (by @NancyLi1013) +- [(#17003)](https://github.com/microsoft/vcpkg/pull/17003) [libwebsockets] Fix usage, export include path (by @JackBoosY) +- [(#17004)](https://github.com/microsoft/vcpkg/pull/17004) [libmariadb] update to the 3.1.12 (by @JonLiu1993) +- [(#17010)](https://github.com/microsoft/vcpkg/pull/17010) [gettext] Add feature tools (by @Neumann-A) +- [(#17011)](https://github.com/microsoft/vcpkg/pull/17011) [pthreads] Fix crt linkage (by @JackBoosY) +- [(#17012)](https://github.com/microsoft/vcpkg/pull/17012) [soil] Update repository (by @NancyLi1013) +- [(#17014)](https://github.com/microsoft/vcpkg/pull/17014) [vcpkg baseline][pangolin] Add options to dependencies to avoid finding them automatically (by @JackBoosY) +- [(#17015)](https://github.com/microsoft/vcpkg/pull/17015) [vtk] enables openvr module when openvr is listed (by @veggiesaurus) +- [(#17016)](https://github.com/microsoft/vcpkg/pull/17016) [magnum,-plugins] Fix deprecated use of vcpkg_check_features (by @Squareys) +- [(#17018)](https://github.com/microsoft/vcpkg/pull/17018) [vcpkg] Pass no parallel build command to execute_process when parallel build is disabled (by @xandox) +- [(#17020)](https://github.com/microsoft/vcpkg/pull/17020) [Libassuan] Add cflags to tool build command (by @xandox) +- [(#17021)](https://github.com/microsoft/vcpkg/pull/17021) Libgcrypt add cflags to tool build command (by @xandox) +- [(#17023)](https://github.com/microsoft/vcpkg/pull/17023) Libgpg-error add cflags to tools build commands (by @xandox) +- [(#17024)](https://github.com/microsoft/vcpkg/pull/17024) Libspatialite remove cflags from vcpkg_configure_make options (by @xandox) +- [(#17025)](https://github.com/microsoft/vcpkg/pull/17025) Spatialite-tools remove cflags from vcpkg_configure_make options (by @xandox) +- [(#17026)](https://github.com/microsoft/vcpkg/pull/17026) Openmpi keep -isystem flags in configure scripts (by @xandox) +- [(#17027)](https://github.com/microsoft/vcpkg/pull/17027) [google-cloud-cpp] update to the latest release (v1.26.0) (by @coryan) +- [(#17047)](https://github.com/microsoft/vcpkg/pull/17047) [entt] Update to 3.7.0 (by @skaarj1989) +- [(#17049)](https://github.com/microsoft/vcpkg/pull/17049) [vcpkg] improve pull request template (by @autoantwort) +- [(#17051)](https://github.com/microsoft/vcpkg/pull/17051) [x265] Allow release-only build. (by @matttyson) +- [(#17060)](https://github.com/microsoft/vcpkg/pull/17060) binarycaching.md: Move Configuration section to the top. Add table of??? (by @autoantwort) +- [(#17066)](https://github.com/microsoft/vcpkg/pull/17066) add link to common vcpkg definitions (by @autoantwort) +- [(#17067)](https://github.com/microsoft/vcpkg/pull/17067) [sqlite3] Update to 3.35.4 (by @past-due) +- [(#17068)](https://github.com/microsoft/vcpkg/pull/17068) fix VCPKG_CROSSCOMPILING (by @autoantwort) +- [(#17070)](https://github.com/microsoft/vcpkg/pull/17070) [libmt32emu] update to 2.5.0 (by @autoantwort) +- [(#17073)](https://github.com/microsoft/vcpkg/pull/17073) vcpkg_configure_make: Add support for linux -> windows cross compilation (by @autoantwort) +- [(#17074)](https://github.com/microsoft/vcpkg/pull/17074) [mpg123] Upgrade to 1.26.4 (by @evpobr) +- [(#17076)](https://github.com/microsoft/vcpkg/pull/17076) Update libjuice to 0.7.1 to update libdatachannel (by @Nemirtingas) +- [(#17077)](https://github.com/microsoft/vcpkg/pull/17077) [libdatachannel ] Update to 0.12.0 (by @Nemirtingas) +- [(#17082)](https://github.com/microsoft/vcpkg/pull/17082) [nuklear] Upgrade from 2020-09-14 to 2021-03-18 version and switch repo (by @SamuelMarks) +- [(#17083)](https://github.com/microsoft/vcpkg/pull/17083) [vcpkg baseline][gdal] Fix configure error on OSX (by @JackBoosY) +- [(#17085)](https://github.com/microsoft/vcpkg/pull/17085) [vcpkg/scripts/make] add compiler tools to PATH (by @huangqinjin) +- [(#17094)](https://github.com/microsoft/vcpkg/pull/17094) [fltk] Fix link to system libs (by @JackBoosY) +- [(#17095)](https://github.com/microsoft/vcpkg/pull/17095) [libui] Export system libs on OSX (by @JackBoosY) +- [(#17101)](https://github.com/microsoft/vcpkg/pull/17101) [minizip-ng] add new port (by @prateek9623) +- [(#17102)](https://github.com/microsoft/vcpkg/pull/17102) [scripts] Fix Perl download link (by @yurybura) +- [(#17106)](https://github.com/microsoft/vcpkg/pull/17106) [sdl2] Fix pthread detection on macOS (by @past-due) +- [(#17112)](https://github.com/microsoft/vcpkg/pull/17112) [fastcdr] Fix support Linux (by @NancyLi1013) +- [(#17113)](https://github.com/microsoft/vcpkg/pull/17113) [libmariadb] Fix build error with cmake 3.20.0 (by @NancyLi1013) +- [(#17117)](https://github.com/microsoft/vcpkg/pull/17117) [glib] fix build error for x64-linux-dynamic (by @kwiechen) +- [(#17120)](https://github.com/microsoft/vcpkg/pull/17120) format vcpkg.json testing files (by @autoantwort) +- [(#17123)](https://github.com/microsoft/vcpkg/pull/17123) [directxtex,directxmesh, directxtk, directxtk12, uvatlas] updated for April 2021 releases (by @walbourn) +- [(#17126)](https://github.com/microsoft/vcpkg/pull/17126) [jsoncons] Update to 0.163.1 (by @danielaparker) +- [(#17138)](https://github.com/microsoft/vcpkg/pull/17138) Add /etc/fstab in order to remove /cygdrive/ prefix (by @dg0yt) +- [(#17142)](https://github.com/microsoft/vcpkg/pull/17142) [azure-core-cpp, azure-identity-cpp] Update to latest version (by @azure-sdk) +- [(#17143)](https://github.com/microsoft/vcpkg/pull/17143) [azure-security-keyvault-*] Add new ports (by @azure-sdk) +- [(#17148)](https://github.com/microsoft/vcpkg/pull/17148) [hunspell] switch to make to enable build of hunspell tools (by @Neumann-A) +- [(#17152)](https://github.com/microsoft/vcpkg/pull/17152) [spdlog] Use external fmt header (by @NancyLi1013) +- [(#17158)](https://github.com/microsoft/vcpkg/pull/17158) [qt5] Move qt5 headers into qt5 subdir (by @Neumann-A) +- [(#17160)](https://github.com/microsoft/vcpkg/pull/17160) [vcpkg] add versions for testing files (by @autoantwort) +- [(#17166)](https://github.com/microsoft/vcpkg/pull/17166) [libtorrent] Update to latest 1.2.x commit (by @FranciscoPombal) +- [(#17168)](https://github.com/microsoft/vcpkg/pull/17168) [clamav] Fix the conflicts with libmspack (by @NancyLi1013) +- [(#17169)](https://github.com/microsoft/vcpkg/pull/17169) [behaviortree-cpp] update to 3.5.6 (by @JonLiu1993) +- [(#17170)](https://github.com/microsoft/vcpkg/pull/17170) [knet]Update to v1.0.2 (by @KibaAmor) +- [(#17172)](https://github.com/microsoft/vcpkg/pull/17172) [libwebp] Fix release-only builds (by @dg0yt) +- [(#17173)](https://github.com/microsoft/vcpkg/pull/17173) [trantor] Update to 1.4.0 (by @an-tao) +- [(#17174)](https://github.com/microsoft/vcpkg/pull/17174) [xaudio2redist] Add new port (by @walbourn) +- [(#17175)](https://github.com/microsoft/vcpkg/pull/17175) [dxsdk-d3dx] Add new port (by @walbourn) +- [(#17182)](https://github.com/microsoft/vcpkg/pull/17182) [cpp-httplib] Upgrade to v0.8.6 (by @PhilLab) +- [(#17190)](https://github.com/microsoft/vcpkg/pull/17190) [drogon] Update to 1.5.1 (by @an-tao) +- [(#17191)](https://github.com/microsoft/vcpkg/pull/17191) [mpg123] Upgrade to 1.26.5 (by @evpobr) +- [(#17196)](https://github.com/microsoft/vcpkg/pull/17196) [pthreadpool] update sources and support find_package (by @luncliff) +- [(#17197)](https://github.com/microsoft/vcpkg/pull/17197) sync GLIB_DLL_SUFFIX with pkgconfig (by @kwiechen) +- [(#17198)](https://github.com/microsoft/vcpkg/pull/17198) [docs] Typo fix for Korean doc. (by @vyujing) +- [(#17200)](https://github.com/microsoft/vcpkg/pull/17200) [simdjson] Update to 0.9.2 (by @myd7349) +- [(#17201)](https://github.com/microsoft/vcpkg/pull/17201) [yyjson] Add new port (by @myd7349) +- [(#17206)](https://github.com/microsoft/vcpkg/pull/17206) [libgeotiff] Fix mingw build (by @dg0yt) +- [(#17208)](https://github.com/microsoft/vcpkg/pull/17208) [hypodermic] Add new port (v2.5.2) (by @revilo) +- [(#17209)](https://github.com/microsoft/vcpkg/pull/17209) [vcpkg baseline] [nowide] update to 11.1.2 (by @autoantwort) +- [(#17214)](https://github.com/microsoft/vcpkg/pull/17214) [doc] Improve manifest documentation links (by @dg0yt) +- [(#17218)](https://github.com/microsoft/vcpkg/pull/17218) [vcpkg Readme] Added x64 triplet note for Windows Quick Start (by @MarkIngramUK) +- [(#17219)](https://github.com/microsoft/vcpkg/pull/17219) Add mingw documentation (by @dg0yt) +- [(#17220)](https://github.com/microsoft/vcpkg/pull/17220) [docs] add more blog posts (by @autoantwort) +- [(#17221)](https://github.com/microsoft/vcpkg/pull/17221) [avisynthplus] Update to 3.7.0 (by @wangqr) +- [(#17223)](https://github.com/microsoft/vcpkg/pull/17223) Update bitmagic version to 7.2.0 (by @klalumiere) +- [(#17226)](https://github.com/microsoft/vcpkg/pull/17226) [ncurses] Add new port (by @Hoikas) +- [(#17230)](https://github.com/microsoft/vcpkg/pull/17230) [c-ares] Fix definition on static build, add options to disable tools and tests (by @JackBoosY) +- [(#17231)](https://github.com/microsoft/vcpkg/pull/17231) [hidapi] Add support linux and osx (by @NancyLi1013) +- [(#17232)](https://github.com/microsoft/vcpkg/pull/17232) [libpq] Fix cmake wrapper on Windows, add usage (by @JackBoosY) +- [(#17235)](https://github.com/microsoft/vcpkg/pull/17235) [fluidsynth] update portfile features. (by @Neumann-A) +- [(#17236)](https://github.com/microsoft/vcpkg/pull/17236) [ffmpeg] no longer hardcode version strings in FindFFMPEG script (by @mcmtroffaes) +- [(#17238)](https://github.com/microsoft/vcpkg/pull/17238) [minizip-ng] Modify the output include path of the header file (by @Cheney-W) +- [(#17239)](https://github.com/microsoft/vcpkg/pull/17239) [stlab] update to 1.6.2 (by @dittons) +- [(#17242)](https://github.com/microsoft/vcpkg/pull/17242) [scnlib] Update the port of scnlib to 0.4 (by @QAston) +- [(#17249)](https://github.com/microsoft/vcpkg/pull/17249) [elfio] Update elfio from 3.8 to 3.9 (by @schultetwin1) +- [(#17250)](https://github.com/microsoft/vcpkg/pull/17250) [vcpkg baseline][pangolin] Set CMAKE_DISABLE_FIND_PACKAGE_XX to ON (by @PhoebeHui) +- [(#17253)](https://github.com/microsoft/vcpkg/pull/17253) [libwebsockets] Update dependency (by @NancyLi1013) +- [(#17256)](https://github.com/microsoft/vcpkg/pull/17256) [Xalan-C] update to 1.12 (by @JonLiu1993) +- [(#17257)](https://github.com/microsoft/vcpkg/pull/17257) [vcpkg docs] Add the procedure for updating vcpkg to faq (by @PhoebeHui) +- [(#17258)](https://github.com/microsoft/vcpkg/pull/17258) [vcpkg] Fix the wrong slash (by @PhoebeHui) +- [(#17264)](https://github.com/microsoft/vcpkg/pull/17264) [Gmp] add cflags to build commands for compiletime tools (by @xandox) +- [(#17271)](https://github.com/microsoft/vcpkg/pull/17271) [catch2] Fix share/catch2 directory name conflict (by @wildmichael) +- [(#17277)](https://github.com/microsoft/vcpkg/pull/17277) [vcpkg baseline][popsift] Fix vcpkg_find_cuda.cmake path (by @JackBoosY) +- [(#17279)](https://github.com/microsoft/vcpkg/pull/17279) [fmt] Update usage (by @NancyLi1013) +- [(#17280)](https://github.com/microsoft/vcpkg/pull/17280) [fontconfig] Don't require uuid port for mingw (by @dg0yt) +- [(#17282)](https://github.com/microsoft/vcpkg/pull/17282) [libzip] fix dependency in libzip-config.cmake.in (by @NancyLi1013) +- [(#17287)](https://github.com/microsoft/vcpkg/pull/17287) [libvpx] Fix libvpx compilation (install process) (by @talregev) +- [(#17290)](https://github.com/microsoft/vcpkg/pull/17290) [lodepng-c] Disable parallel configure (by @JackBoosY) +- [(#17294)](https://github.com/microsoft/vcpkg/pull/17294) [libyuv] update to latest commit (by @JonLiu1993) +- [(#17297)](https://github.com/microsoft/vcpkg/pull/17297) [armadillo] update to <10.4.0> (by @JonLiu1993) +- [(#17298)](https://github.com/microsoft/vcpkg/pull/17298) [ffmpeg] add -fPIC (by @cenit) +- [(#17300)](https://github.com/microsoft/vcpkg/pull/17300) [CGAL] Fix the configuration file (by @maxGimeno) +- [(#17306)](https://github.com/microsoft/vcpkg/pull/17306) [ryu] fixed syntax error in ryuConfig.cmake (by @georg-emg) +- [(#17311)](https://github.com/microsoft/vcpkg/pull/17311) [igraph] create new port (by @szhorvat) +- [(#17318)](https://github.com/microsoft/vcpkg/pull/17318) [pthreads] Make port empty on mingw (by @dg0yt) +- [(#17321)](https://github.com/microsoft/vcpkg/pull/17321) [libosip2] Update to 5.2.0 and add windows support (by @NancyLi1013) +- [(#17331)](https://github.com/microsoft/vcpkg/pull/17331) Update VMs, CMake to 3.20.1, CUDA to 11.3, and pwsh to 7.1.3 (by @BillyONeal) +- [(#17341)](https://github.com/microsoft/vcpkg/pull/17341) [vcpkg baseline][marble] Disable find I18n (by @JackBoosY) +- [(#17346)](https://github.com/microsoft/vcpkg/pull/17346) [cudnn] add other locations to find lib already installed (by @cenit) +- [(#17347)](https://github.com/microsoft/vcpkg/pull/17347) [shaderwriter] Update to version 1.1.0 (by @DragonJoker) +- [(#17354)](https://github.com/microsoft/vcpkg/pull/17354) [opencv4] Fix OPTIONS BUILD_opencv_gapi (by @NancyLi1013) +- [(#17355)](https://github.com/microsoft/vcpkg/pull/17355) [cub] update to 1.12.0 (by @JonLiu1993) +- [(#17356)](https://github.com/microsoft/vcpkg/pull/17356) [corrade] Fix VS2019 build error (by @NancyLi1013) +- [(#17360)](https://github.com/microsoft/vcpkg/pull/17360) [tinyexr] update version and add targets (by @fran6co) +- [(#17362)](https://github.com/microsoft/vcpkg/pull/17362) [Outcome] update to v2.2.0 release. (by @ned14) +- [(#17363)](https://github.com/microsoft/vcpkg/pull/17363) Add arm64-osx-dynamic triplet (by @nickgravelyn) +- [(#17364)](https://github.com/microsoft/vcpkg/pull/17364) Add VCPKG_OSX_ARCHITECTURES for x64-osx-dynamic triplet (by @nickgravelyn) +- [(#17367)](https://github.com/microsoft/vcpkg/pull/17367) [spirv-cross] small cleanup (by @fran6co) +- [(#17370)](https://github.com/microsoft/vcpkg/pull/17370) [PoissonRecon] new port (by @fran6co) +- [(#17371)](https://github.com/microsoft/vcpkg/pull/17371) [hdf5] threadsafe support (by @Thieum) +- [(#17373)](https://github.com/microsoft/vcpkg/pull/17373) [openssl/unix] Run `make` with 'VCPKG_CONCURRENCY' parallelism (by @mschofie) +- [(#17376)](https://github.com/microsoft/vcpkg/pull/17376) [ci] Update macOS to 11 (by @strega-nil) +- [(#17378)](https://github.com/microsoft/vcpkg/pull/17378) [flashlight-cuda] update port to v0.3 (by @jacobkahn) +- [(#17389)](https://github.com/microsoft/vcpkg/pull/17389) [libxml2] Pass version to rc via configured file (by @dg0yt) +- [(#17399)](https://github.com/microsoft/vcpkg/pull/17399) [directx-headers] port updated (by @walbourn) +- [(#17401)](https://github.com/microsoft/vcpkg/pull/17401) [portaudio] update to 19.7 (by @Be-ing) +- [(#17404)](https://github.com/microsoft/vcpkg/pull/17404) [forge] Fix usage (by @JackBoosY) +- [(#17407)](https://github.com/microsoft/vcpkg/pull/17407) [taskflow] update to 3.1.0 (by @JonLiu1993) +- [(#17410)](https://github.com/microsoft/vcpkg/pull/17410) [parmetis] Fix build on x64-linux. (by @grospelliergilles) +- [(#17413)](https://github.com/microsoft/vcpkg/pull/17413) [sentry-native] Update to 0.4.9 (by @AenBleidd) +- [(#17415)](https://github.com/microsoft/vcpkg/pull/17415) [tinygltf] fix json path (by @fran6co) +- [(#17419)](https://github.com/microsoft/vcpkg/pull/17419) [Libidn2] disable documentation (by @xandox) +- [(#17420)](https://github.com/microsoft/vcpkg/pull/17420) [Libtasn1] disable documentation (by @xandox) +- [(#17421)](https://github.com/microsoft/vcpkg/pull/17421) [Nettle] add cflags to build tools (by @xandox) +- [(#17422)](https://github.com/microsoft/vcpkg/pull/17422) [grpc][upb] Update to newer versions (by @ras0219) +- [(#17432)](https://github.com/microsoft/vcpkg/pull/17432) [flashlight-cpu] Update port to v0.3 (by @jacobkahn) +- [(#17437)](https://github.com/microsoft/vcpkg/pull/17437) [pcl] Fix qhul cannot be found (by @NancyLi1013) +- [(#17439)](https://github.com/microsoft/vcpkg/pull/17439) control-files.md: fix dead link and add command how to convert files (by @autoantwort) +- [(#17444)](https://github.com/microsoft/vcpkg/pull/17444) [gsl-lite] Update to 0.38.1 (by @mbeutel) +- [(#17445)](https://github.com/microsoft/vcpkg/pull/17445) [gamedev-framework] Update to 0.20.0 (by @ahugeat) +- [(#17447)](https://github.com/microsoft/vcpkg/pull/17447) [azure-sdk-for-cpp] Upgrade vcpkg manifest files (by @antkmsft) +- [(#17451)](https://github.com/microsoft/vcpkg/pull/17451) [frozen] Update to latest commit (by @Ryan-rsm-McKenzie) +- [(#17453)](https://github.com/microsoft/vcpkg/pull/17453) [physx] Update to 4.1.2 (by @Hoikas) +- [(#17459)](https://github.com/microsoft/vcpkg/pull/17459) [marl] update to latest version (by @JonLiu1993) +- [(#17461)](https://github.com/microsoft/vcpkg/pull/17461) [matplotplusplus] Install extra 3rd libraries (by @JackBoosY) +- [(#17466)](https://github.com/microsoft/vcpkg/pull/17466) [jsoncons] Update to version 0.163.3 (by @danielaparker) +- [(#17467)](https://github.com/microsoft/vcpkg/pull/17467) [ffmpeg] avdevice xcb linking fix on linux (by @mcmtroffaes) +- [(#17471)](https://github.com/microsoft/vcpkg/pull/17471) [ecos] Update ecos library version to 2.0.8 (by @csorvagep) +- [(#17484)](https://github.com/microsoft/vcpkg/pull/17484) [doc] Fix broken link (by @dg0yt) +- [(#17488)](https://github.com/microsoft/vcpkg/pull/17488) [pkgconf] Add new port (by @Neumann-A) +- [(#17491)](https://github.com/microsoft/vcpkg/pull/17491) [vcpkg baseline] Disable forest in ci baseline (by @PhoebeHui) +- [(#17492)](https://github.com/microsoft/vcpkg/pull/17492) [vcpkg baseline][marble] Disable dependency KF5 (by @JackBoosY) +- [(#17495)](https://github.com/microsoft/vcpkg/pull/17495) [boolinq] update to 3.0.1 (2020-07-29) (by @JonLiu1993) +- [(#17496)](https://github.com/microsoft/vcpkg/pull/17496) [grpc] update to 1.37.0 (by @JonLiu1993) +- [(#17501)](https://github.com/microsoft/vcpkg/pull/17501) [sqlcipher] update to 4.4.3 (#17500) (by @shiena) +- [(#17502)](https://github.com/microsoft/vcpkg/pull/17502) [doc] Fix example code. (by @w-gomes) +- [(#17507)](https://github.com/microsoft/vcpkg/pull/17507) [gamenetworkingsockets] Update to the latest commit to include headers (by @JonLiu1993) +- [(#17509)](https://github.com/microsoft/vcpkg/pull/17509) [botan] add arm (by @jgilje) +- [(#17511)](https://github.com/microsoft/vcpkg/pull/17511) [spdlog] Fix mingW build (by @JackBoosY) +- [(#17523)](https://github.com/microsoft/vcpkg/pull/17523) [gettext] disable dirent detection on windows (by @Neumann-A) +- [(#17525)](https://github.com/microsoft/vcpkg/pull/17525) [libqcow] Fix build issues by updating to 20210419 (by @AlexAltea) +- [(#17528)](https://github.com/microsoft/vcpkg/pull/17528) [vcpkg baseline][gdk-pixbuf] Fix build error on windows (by @PhoebeHui) +- [(#17531)](https://github.com/microsoft/vcpkg/pull/17531) [ffmpeg] add openh264 support (by @mcmtroffaes) +- [(#17549)](https://github.com/microsoft/vcpkg/pull/17549) [doc] Update manifest to reference versioning spec (by @mathisloge) +- [(#17550)](https://github.com/microsoft/vcpkg/pull/17550) [doc] Add 2019.06 blog post (by @dg0yt) +- [(#17552)](https://github.com/microsoft/vcpkg/pull/17552) [matplotplusplus] Fix find and use dependencies (by @JackBoosY) +- [(#17554)](https://github.com/microsoft/vcpkg/pull/17554) [zeromq] Update to 4.3.4 (by @Carbenium) +- [(#17559)](https://github.com/microsoft/vcpkg/pull/17559) [new/updated port] frugally-deep and updated fplus (by @mathisloge) +- [(#17566)](https://github.com/microsoft/vcpkg/pull/17566) [docs] Fix broken links (by @PhoebeHui) +- [(#17579)](https://github.com/microsoft/vcpkg/pull/17579) [python3] Disable registry access to determine WinSDK (by @ras0219-msft) +- [(#17581)](https://github.com/microsoft/vcpkg/pull/17581) [comms,commsdsl] update ports (by @mathisloge) + +
+ +
+The following 47 ports have been added: + +|port|version| +|---|---| +|[kuku](https://github.com/microsoft/vcpkg/pull/14898)[#16194](https://github.com/microsoft/vcpkg/pull/16194)|2 +|[gpgme](https://github.com/microsoft/vcpkg/pull/13950)|1.14.0 +|[boost-leaf](https://github.com/microsoft/vcpkg/pull/15090)[#15616](https://github.com/microsoft/vcpkg/pull/15616)|1.75.0 +|[libgcrypt](https://github.com/microsoft/vcpkg/pull/13950)[#15950](https://github.com/microsoft/vcpkg/pull/15950)[#17021](https://github.com/microsoft/vcpkg/pull/17021)|1.8.7 +|[status-code](https://github.com/microsoft/vcpkg/pull/15603)|1.0.0-ab3cd821 +|[librttopo](https://github.com/microsoft/vcpkg/pull/15037)|1.1.0-2 +|[azure-identity-cpp](https://github.com/microsoft/vcpkg/pull/16014)[#16668](https://github.com/microsoft/vcpkg/pull/16668)[#17142](https://github.com/microsoft/vcpkg/pull/17142)[#17447](https://github.com/microsoft/vcpkg/pull/17447)|1.0.0-beta.3 +|[libassuan](https://github.com/microsoft/vcpkg/pull/13950)[#17020](https://github.com/microsoft/vcpkg/pull/17020)|2.5.3 +|[llfio](https://github.com/microsoft/vcpkg/pull/15603)[#17362](https://github.com/microsoft/vcpkg/pull/17362)|2.0-20210420 +|[graphene](https://github.com/microsoft/vcpkg/pull/13100)[#15754](https://github.com/microsoft/vcpkg/pull/15754)|1.10.2 +|[ampl-asl](https://github.com/microsoft/vcpkg/pull/14518)|2020-11-11 +|[sdformat10](https://github.com/microsoft/vcpkg/pull/14324)|10.0.0 +|[popsift](https://github.com/microsoft/vcpkg/pull/10979)[#17277](https://github.com/microsoft/vcpkg/pull/17277)|0.9 +|[fastcgi](https://github.com/microsoft/vcpkg/pull/7824)|2020-09-11 +|[boost-stl-interfaces](https://github.com/microsoft/vcpkg/pull/14089)[#14969](https://github.com/microsoft/vcpkg/pull/14969)[#15090](https://github.com/microsoft/vcpkg/pull/15090)[#15616](https://github.com/microsoft/vcpkg/pull/15616)|1.74.0 +|[dataframe](https://github.com/microsoft/vcpkg/pull/14351)|1.12.0 +|[discreture](https://github.com/microsoft/vcpkg/pull/15967)|2020-01-29 +|[clrng](https://github.com/microsoft/vcpkg/pull/14876)|2020-12-01 +|[libuvc](https://github.com/microsoft/vcpkg/pull/14749)|2020-11-24 +|[ignition-fuel-tools4](https://github.com/microsoft/vcpkg/pull/15581)|4.3.0 +|[boost-pfr](https://github.com/microsoft/vcpkg/pull/15090)[#15616](https://github.com/microsoft/vcpkg/pull/15616)|1.75.0 +|[clamav](https://github.com/microsoft/vcpkg/pull/14658)[#17168](https://github.com/microsoft/vcpkg/pull/17168)|0.103.0 +|[azure-storage-files-datalake-cpp](https://github.com/microsoft/vcpkg/pull/16020)[#16183](https://github.com/microsoft/vcpkg/pull/16183)[#16668](https://github.com/microsoft/vcpkg/pull/16668)[#17142](https://github.com/microsoft/vcpkg/pull/17142)[#17447](https://github.com/microsoft/vcpkg/pull/17447)|12.0.0-beta.10 +|[azure-storage-blobs-cpp](https://github.com/microsoft/vcpkg/pull/16020)[#16183](https://github.com/microsoft/vcpkg/pull/16183)[#16668](https://github.com/microsoft/vcpkg/pull/16668)[#17142](https://github.com/microsoft/vcpkg/pull/17142)[#17447](https://github.com/microsoft/vcpkg/pull/17447)|12.0.0-beta.10 +|[tensorflow-common](https://github.com/microsoft/vcpkg/pull/14392)[#15354](https://github.com/microsoft/vcpkg/pull/15354)[#16364](https://github.com/microsoft/vcpkg/pull/16364)[#17331](https://github.com/microsoft/vcpkg/pull/17331)|2.3.1 +|[libsass](https://github.com/microsoft/vcpkg/pull/15752)|3.6.4 +|[ignition-common3](https://github.com/microsoft/vcpkg/pull/11273)|3.9.0 +|[ned14-internal-quickcpplib](https://github.com/microsoft/vcpkg/pull/15603)[#17362](https://github.com/microsoft/vcpkg/pull/17362)|0.0.0-24d92c71 +|[directxmath](https://github.com/microsoft/vcpkg/pull/15210)[#15383](https://github.com/microsoft/vcpkg/pull/15383)[#15554](https://github.com/microsoft/vcpkg/pull/15554)|3.1.6 +|[ignition-transport9](https://github.com/microsoft/vcpkg/pull/14324)|9.0.0 +|[mpc](https://github.com/microsoft/vcpkg/pull/13081)|1.2.0 +|[azure-storage-common-cpp](https://github.com/microsoft/vcpkg/pull/16020)[#16183](https://github.com/microsoft/vcpkg/pull/16183)[#16668](https://github.com/microsoft/vcpkg/pull/16668)[#17142](https://github.com/microsoft/vcpkg/pull/17142)[#17447](https://github.com/microsoft/vcpkg/pull/17447)|12.0.0-beta.10 +|[ignition-msgs6](https://github.com/microsoft/vcpkg/pull/14324)[#14730](https://github.com/microsoft/vcpkg/pull/14730)|6.0.0 +|[tensorflow](https://github.com/microsoft/vcpkg/pull/14392)[#15354](https://github.com/microsoft/vcpkg/pull/15354)[#16364](https://github.com/microsoft/vcpkg/pull/16364)|2.3.1 +|[mesa](https://github.com/microsoft/vcpkg/pull/14640)[#15729](https://github.com/microsoft/vcpkg/pull/15729)|20.2.2 +|[azure-core-cpp](https://github.com/microsoft/vcpkg/pull/16013)[#16160](https://github.com/microsoft/vcpkg/pull/16160)[#16668](https://github.com/microsoft/vcpkg/pull/16668)[#17142](https://github.com/microsoft/vcpkg/pull/17142)[#17447](https://github.com/microsoft/vcpkg/pull/17447)|1.0.0-beta.5 +|[sassc](https://github.com/microsoft/vcpkg/pull/15752)|3.6.1 +|[fixed-string](https://github.com/microsoft/vcpkg/pull/14770)|0.1.0 +|[libgpg-error](https://github.com/microsoft/vcpkg/pull/13950)[#17023](https://github.com/microsoft/vcpkg/pull/17023)|1.39 +|[elfutils](https://github.com/microsoft/vcpkg/pull/14771)|0.182 +|[azure-storage-files-shares-cpp](https://github.com/microsoft/vcpkg/pull/16053)[#16183](https://github.com/microsoft/vcpkg/pull/16183)[#16668](https://github.com/microsoft/vcpkg/pull/16668)[#17142](https://github.com/microsoft/vcpkg/pull/17142)[#17447](https://github.com/microsoft/vcpkg/pull/17447)|12.0.0-beta.10 +|[libilbc](https://github.com/microsoft/vcpkg/pull/15331)|3.0.3 +|[blas](https://github.com/microsoft/vcpkg/pull/13448)|1 +|[boost-json](https://github.com/microsoft/vcpkg/pull/15090)[#15616](https://github.com/microsoft/vcpkg/pull/15616)|1.75.0 +|[camport3](https://github.com/microsoft/vcpkg/pull/13759)|1.5.3 +|[arcus](https://github.com/microsoft/vcpkg/pull/15305)|4.8.0 +|[directx-headers](https://github.com/microsoft/vcpkg/pull/15222)[#15554](https://github.com/microsoft/vcpkg/pull/15554)[#17399](https://github.com/microsoft/vcpkg/pull/17399)|1 + +
+ +
+The following 804 ports have been updated: + +- boost-config `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- libopusenc `0.2.1#0` -> `0.2.1#0` + - [(#15671)](https://github.com/microsoft/vcpkg/pull/15671) [libopusenc] fix macOS and Linux build (by @Be-ing) +- aws-sdk-cpp `1.8.126#0` -> `1.8.126#5` + - [(#13998)](https://github.com/microsoft/vcpkg/pull/13998) [llvm] update to 11.0.0 (by @yurybura) + - [(#14479)](https://github.com/microsoft/vcpkg/pull/14479) [aws-sdk-cpp] Update to 1.8.83 (by @PhoebeHui) + - [(#14546)](https://github.com/microsoft/vcpkg/pull/14546) [aws-sdk-cpp] Make aws-sdk-cpp rpath relocatable (by @klalumiere) + - [(#14868)](https://github.com/microsoft/vcpkg/pull/14868) [aws-sdk-cpp] Restore AWSSDKConfig.cmake and add usage (by @JackBoosY) + - [(#14936)](https://github.com/microsoft/vcpkg/pull/14936) [aws-sdk-cpp] Add find_dependency to AWSSDKConfig.cmake and fix usage (by @JackBoosY) + - [(#15725)](https://github.com/microsoft/vcpkg/pull/15725) [aws-cpp-sdk] [zlib] [openssl] [curl] Fix zlib, OpenSSL, curl and AWS SDK for Android (by @ahmedyarub) + - [(#15760)](https://github.com/microsoft/vcpkg/pull/15760) Update aws cpp sdk (by @ahmedyarub) + - [(#15804)](https://github.com/microsoft/vcpkg/pull/15804) [aws-sdk-cpp] Fix PRIVATE => PRVATE typo (by @BillyONeal) + - [(#16149)](https://github.com/microsoft/vcpkg/pull/16149) [aws-sdk-cpp] Regenerate feature list (by @ras0219) +- eigen3 `3.3.7#7` -> `3.3.7#8` + - [(#13739)](https://github.com/microsoft/vcpkg/pull/13739) [eigen3] Fix include path (by @LilyWangL) + - [(#15022)](https://github.com/microsoft/vcpkg/pull/15022) [eigen3] update to 3.3.9 (by @FlyingdutchmanC) +- openvdb `7.1.0#1` -> `7.1.0#2` + - [(#14651)](https://github.com/microsoft/vcpkg/pull/14651) [openvdb] Fix dependency issue and usage issue (by @PhoebeHui) + - [(#15902)](https://github.com/microsoft/vcpkg/pull/15902) [openvdb] Fix vcpkg-cmake-wrapper (by @JackBoosY) +- minizip-ng `#0` -> `#0` + - [(#17101)](https://github.com/microsoft/vcpkg/pull/17101) [minizip-ng] add new port (by @prateek9623) + - [(#17238)](https://github.com/microsoft/vcpkg/pull/17238) [minizip-ng] Modify the output include path of the header file (by @Cheney-W) +- boost-predef `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- kenlm `20200924#0` -> `20200924#0` + - [(#14382)](https://github.com/microsoft/vcpkg/pull/14382) [kenlm, pdal] Fix const overload on Visual Studio 2019 version 16.8 (by @LilyWangL) +- harfbuzz `2.7.4#1` -> `2.7.4#1` + - [(#12860)](https://github.com/microsoft/vcpkg/pull/12860) [harfbuzz] Use meson and update to 2.7.0 (by @vejmartin) + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) + - [(#14530)](https://github.com/microsoft/vcpkg/pull/14530) [harfbuzz] fix icu linkage (by @Neumann-A) + - [(#16621)](https://github.com/microsoft/vcpkg/pull/16621) [harfbuzz] work around upstream SameFileError (by @Krzmbrzl) +- boost-uninstall `1.73.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- drogon `1.1.0#0` -> `1.3.0#0` + - [(#15850)](https://github.com/microsoft/vcpkg/pull/15850) [drogon] Upgrade to v1.3.0 (by @kotori2) + - [(#16651)](https://github.com/microsoft/vcpkg/pull/16651) [drogon] Update to 1.4.1 (by @an-tao) + - [(#17190)](https://github.com/microsoft/vcpkg/pull/17190) [drogon] Update to 1.5.1 (by @an-tao) +- directxmesh `aug2020#1` -> `apr2021#0` + - [(#14539)](https://github.com/microsoft/vcpkg/pull/14539) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version (by @RT222) + - [(#15210)](https://github.com/microsoft/vcpkg/pull/15210) Updated directxtk et al for cmake package support (by @walbourn) + - [(#15554)](https://github.com/microsoft/vcpkg/pull/15554) directxmesh, directxtex, and uvatlas now support linux (by @walbourn) + - [(#15639)](https://github.com/microsoft/vcpkg/pull/15639) directxtex, directxmesh, directxtk, uvatlas ports updated to fix cach??? (by @walbourn) + - [(#17123)](https://github.com/microsoft/vcpkg/pull/17123) [directxtex,directxmesh, directxtk, directxtk12, uvatlas] updated for April 2021 releases (by @walbourn) +- boost-functional `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- gppanel `2020-05-20#0` -> `2020-05-20#0` + - [(#13361)](https://github.com/microsoft/vcpkg/pull/13361) [wxwidgets] Fix #4756 (by @ras0219) + - [(#14794)](https://github.com/microsoft/vcpkg/pull/14794) [ebml/gppanel/matroska/polyhook2/unrar] Fix typos in CONTROL files (by @NancyLi1013) +- openimageio `2.1.16.0#4` -> `2.2.10.0#0` + - [(#15509)](https://github.com/microsoft/vcpkg/pull/15509) [openimageio] Bump to 2.2.10.0. (by @Hoikas) +- quill `1.6.1#1` -> `1.6.1#1` + - [(#14448)](https://github.com/microsoft/vcpkg/pull/14448) [quill] Update to 1.5.2 (by @odygrd) + - [(#14916)](https://github.com/microsoft/vcpkg/pull/14916) [quill] Update 1.6.0 (by @odygrd) + - [(#15467)](https://github.com/microsoft/vcpkg/pull/15467) [quill] Update to v1.6.1 (by @RT222) + - [(#16202)](https://github.com/microsoft/vcpkg/pull/16202) [quill] Uncomment QUILL_FMT_EXTERNAL macro (by @RT222) + - [(#16931)](https://github.com/microsoft/vcpkg/pull/16931) [quill] Upgrade to 1.6.2 (by @odygrd) +- cppcms `1.2.1-1#0` -> `1.2.1#2` + - [(#15473)](https://github.com/microsoft/vcpkg/pull/15473) [vcpkg baseline][cppcms] Fix issue with detecting Python 2. (by @Hoikas) +- flann `2019-04-07-1#0` -> `2019-04-07#1` + - [(#14716)](https://github.com/microsoft/vcpkg/pull/14716) [cmake] update to 3.19.2 (by @JackBoosY) +- libxmlpp `2.40.1#6` -> `2.40.1#8` + - [(#11776)](https://github.com/microsoft/vcpkg/pull/11776) [intl/gettext/fontconfig] update to native build system (by @Neumann-A) + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) + - [(#14988)](https://github.com/microsoft/vcpkg/pull/14988) [GLIBMM] Installing .pc file (by @faserg1) + - [(#15353)](https://github.com/microsoft/vcpkg/pull/15353) Build results from 2020-12-27 (by @BillyONeal) +- mfl `#0` -> `#0` + - [(#16345)](https://github.com/microsoft/vcpkg/pull/16345) [mfl] Add new port (by @cpp-niel) +- highfive `2.2.2#0` -> `2.2.2#1` + - [(#14716)](https://github.com/microsoft/vcpkg/pull/14716) [cmake] update to 3.19.2 (by @JackBoosY) +- lodepng `2020-03-15#0` -> `2020-03-15#0` + - [(#16408)](https://github.com/microsoft/vcpkg/pull/16408) [libtcod] Add new port. (by @HexDecimal) +- boost-modular-build-helper `1.75.0#1` -> `1.75.0#2` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14517)](https://github.com/microsoft/vcpkg/pull/14517) [boost] Install usage file (by @PhoebeHui) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15137)](https://github.com/microsoft/vcpkg/pull/15137) [boost-modular-build-helper] Specify msvc version in user-config.jam (by @ras0219-msft) + - [(#15254)](https://github.com/microsoft/vcpkg/pull/15254) [boost-modular-builder] let fallback to default tool path (by @xandox) + - [(#15274)](https://github.com/microsoft/vcpkg/pull/15274) [boost-modular-build-helper] Allow setting B2_OPTIONS_[DBG|REL] in BOOST_CMAKE_FRAGMENT (fixes #15273) (by @klalumiere) + - [(#15572)](https://github.com/microsoft/vcpkg/pull/15572) [vcpkg,boost-modular-build-helper] initial ppc64le community support (by @lebdron) + - [(#15606)](https://github.com/microsoft/vcpkg/pull/15606) [boost-locale] android build (by @xandox) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16087)](https://github.com/microsoft/vcpkg/pull/16087) [boost-python] Fix build issue with feature python2 (by @PhoebeHui) + - [(#16375)](https://github.com/microsoft/vcpkg/pull/16375) [boost] /safeseh (by @autoantwort) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) + - [(#16859)](https://github.com/microsoft/vcpkg/pull/16859) boost-modular-build-helper] Add system library dl for boost-regex[icu] and boost-locale[icu] on linux (by @PhoebeHui) + - [(#16930)](https://github.com/microsoft/vcpkg/pull/16930) [boost-context] support android (by @huangqinjin) +- boost-local-function `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- boost-type-erasure `1.75.0#0` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- bext-ut `#0` -> `#0` + - [(#16822)](https://github.com/microsoft/vcpkg/pull/16822) [bext-ut] create a new port (by @luncliff) +- gamenetworkingsockets `2020-09-02#0` -> `2020-09-02#0` + - [(#14937)](https://github.com/microsoft/vcpkg/pull/14937) [gamenetworkingsockets] Add new port (by @Balnian) + - [(#17507)](https://github.com/microsoft/vcpkg/pull/17507) [gamenetworkingsockets] Update to the latest commit to include headers (by @JonLiu1993) +- sqlite-orm `1.5#2` -> `1.6#0` + - [(#15517)](https://github.com/microsoft/vcpkg/pull/15517) [sqlite-orm] Update to 1.6 (by @NancyLi1013) +- indicators `1.7#0` -> `2020-10-30#0` + - [(#14223)](https://github.com/microsoft/vcpkg/pull/14223) [indicators] Update to Master (by @Link1J) + - [(#16667)](https://github.com/microsoft/vcpkg/pull/16667) [indicators] update to 2.0 (by @JonLiu1993) +- boost-coroutine `1.75.0#2` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- bitserializer `0.10#0` -> `0.10#0` + - [(#14246)](https://github.com/microsoft/vcpkg/pull/14246) [vcpkg baseline] Clean up baseline, use Keyword Supports Part 2 (by @JackBoosY) +- superlu `2#0` -> `2#0` + - [(#13448)](https://github.com/microsoft/vcpkg/pull/13448) [BLAS] add metaport (by @cenit) +- ceres `1.14.0#10` -> `2.0.0#0` + - [(#12785)](https://github.com/microsoft/vcpkg/pull/12785) [OpenCV] fix compatibility with VTK9 (by @cenit) + - [(#14719)](https://github.com/microsoft/vcpkg/pull/14719) [ceres] upgrade to 2.0.0 (by @fran6co) + - [(#14986)](https://github.com/microsoft/vcpkg/pull/14986) 2020-12-07 Build Fixes (by @BillyONeal) + - [(#15362)](https://github.com/microsoft/vcpkg/pull/15362) [ceres] Fix static library path on Linux (by @JackBoosY) + - [(#15802)](https://github.com/microsoft/vcpkg/pull/15802) [ceres] Mark all dependencies REQUIRED (by @ras0219) +- zeromq `2019-09-20#1` -> `2019-09-20#2` + - [(#14642)](https://github.com/microsoft/vcpkg/pull/14642) [zeromq] Add feature draft (by @JonLiu1993) + - [(#17554)](https://github.com/microsoft/vcpkg/pull/17554) [zeromq] Update to 4.3.4 (by @Carbenium) +- msdfgen `1.8#0` -> `1.8#0` + - [(#15427)](https://github.com/microsoft/vcpkg/pull/15427) [msdfgen] New port (by @Haeri) +- libgwenhywfar `#0` -> `#0` + - [(#16810)](https://github.com/microsoft/vcpkg/pull/16810) [libgwenhywfar] new port (by @wrobelda) +- boost-property-tree `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- sdl2pp `0.16.0-2#0` -> `0.16.1#0` + - [(#13300)](https://github.com/microsoft/vcpkg/pull/13300) [sdl2pp] Update to 0.16.1 and fix find_package error (by @LilyWangL) +- console-bridge `1.0.1#0` -> `1.0.1#1` + - [(#14324)](https://github.com/microsoft/vcpkg/pull/14324) [ignition] Updates on various pkgs ???? (by @ahoarau) +- boost-variant2 `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- libnop `#0` -> `#0` + - [(#16471)](https://github.com/microsoft/vcpkg/pull/16471) [libnop] create a new port (by @luncliff) +- aws-lambda-cpp `0.2.6#0` -> `0.2.6#0` + - [(#14246)](https://github.com/microsoft/vcpkg/pull/14246) [vcpkg baseline] Clean up baseline, use Keyword Supports Part 2 (by @JackBoosY) +- boost-concept-check `1.75.0#0` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#15887)](https://github.com/microsoft/vcpkg/pull/15887) [boost-concept-check] Fix warning C4834 when install pagmo2 (by @Cheney-W) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- crow `0.1-1#0` -> `0.1-1#0` + - [(#16511)](https://github.com/microsoft/vcpkg/pull/16511) [crow] update to 0.2 (by @JonLiu1993) +- arrayfire `3.7.3#0` -> `3.7.3#0` + - [(#14240)](https://github.com/microsoft/vcpkg/pull/14240) [arrayfire] New Port (by @jacobkahn) + - [(#14911)](https://github.com/microsoft/vcpkg/pull/14911) [arrayfire] Update port to fix cuSparse issue with CUDA 10.1 (by @jacobkahn) + - [(#15027)](https://github.com/microsoft/vcpkg/pull/15027) [arrayfire] Remove forge and graphics deps from port (by @jacobkahn) +- libsamplerate `0.1.9.0#0` -> `0.1.9.0#0` + - [(#14348)](https://github.com/microsoft/vcpkg/pull/14348) [libsamplerate, sdl2-gfx] Fix build error with Visual Studio 2019 version 16.8 (by @LilyWangL) + - [(#15797)](https://github.com/microsoft/vcpkg/pull/15797) [libsamplerate] Upgrade to 0.2.0 (by @evpobr) + - [(#15954)](https://github.com/microsoft/vcpkg/pull/15954) [libsamplerate] Update to 0.2.1 (by @evpobr) +- rocksdb `6.13.3#0` -> `6.14.6#0` + - [(#14976)](https://github.com/microsoft/vcpkg/pull/14976) [osgearth/rocksdb] Update to latest release (by @NancyLi1013) +- psimd `2021-02-21#0` -> `2021-02-21#0` + - [(#16339)](https://github.com/microsoft/vcpkg/pull/16339) [psimd] add a new port (by @luncliff) +- brotli `1.0.9#0` -> `1.0.9#1` + - [(#16397)](https://github.com/microsoft/vcpkg/pull/16397) [brotli] add iOS support (by @jwtowner) +- abseil `2020-09-23#0` -> `2020-09-23#0` + - [(#14109)](https://github.com/microsoft/vcpkg/pull/14109) [abseil] Revert changes about arm build (by @JackBoosY) + - [(#14647)](https://github.com/microsoft/vcpkg/pull/14647) [abseil] Re-fix cxx 17 standard, add macro ABSL_USE_CXX17 (by @JackBoosY) + - [(#16106)](https://github.com/microsoft/vcpkg/pull/16106) [abseil] Remove link flag '-ignore:4221' (by @JackBoosY) + - [(#16664)](https://github.com/microsoft/vcpkg/pull/16664) [abseil] Upgrade abseil to 20200923 patch 3, fix gcc11 build error (by @xieyubo) + - [(#16928)](https://github.com/microsoft/vcpkg/pull/16928) [abseil] Upgrade to 20210324 (by @Chronial) +- angelscript `2.34.0#0` -> `2.34.0#0` + - [(#14245)](https://github.com/microsoft/vcpkg/pull/14245) [vcpkg baseline] Clean up baseline, use Keyword Supports Part 1 (by @JackBoosY) + - [(#15852)](https://github.com/microsoft/vcpkg/pull/15852) [angelscript] Update to 2.35.0 (by @crackedmind) +- magic-get `2019-09-02-1#0` -> `2019-09-02#0` + - [(#15353)](https://github.com/microsoft/vcpkg/pull/15353) Build results from 2020-12-27 (by @BillyONeal) +- mqtt-cpp `7.0.1-2#0` -> `9.0.0#0` + - [(#16863)](https://github.com/microsoft/vcpkg/pull/16863) [mqtt-cpp] update to 9.0.0 (by @sandro97git) +- lz4 `1.9.2-2#0` -> `1.9.3#0` + - [(#16860)](https://github.com/microsoft/vcpkg/pull/16860) [lz4] update to 1.9.3 (by @Thieum) +- lua `5.4.1#0` -> `5.4.2#0` + - [(#16107)](https://github.com/microsoft/vcpkg/pull/16107) [lua] support iOS triplets (by @luncliff) + - [(#16603)](https://github.com/microsoft/vcpkg/pull/16603) Update Lua port to version 5.4.2 (by @frankhale) + - [(#16943)](https://github.com/microsoft/vcpkg/pull/16943) [lua]Update port to version 5.4.3 (by @frankhale) +- fluidsynth `2.1.4#0` -> `2.1.4#0` + - [(#17235)](https://github.com/microsoft/vcpkg/pull/17235) [fluidsynth] update portfile features. (by @Neumann-A) +- boost-dll `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- assimp `5.0.1#3` -> `5.0.1#4` + - [(#14554)](https://github.com/microsoft/vcpkg/pull/14554) [assimp] Fix cmake config name and add cmake version (by @PhoebeHui) +- libpqxx `7.3.1#0` -> `7.3.1#1` + - [(#14921)](https://github.com/microsoft/vcpkg/pull/14921) [libpqxx] update to 7.2.1 (by @JonLiu1993) + - [(#15259)](https://github.com/microsoft/vcpkg/pull/15259) [libpqxx] update to 7.3.0 (by @JonLiu1993) + - [(#15851)](https://github.com/microsoft/vcpkg/pull/15851) [libpqxx] Upgrade to v7.3.1 (by @tomlankhorst) + - [(#15995)](https://github.com/microsoft/vcpkg/pull/15995) [libpqxx] Fix build with Visual Studio 2017 (by @JackBoosY) +- boost-static-string `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- itk `5.1.0#0` -> `5.1.0#0` + - [(#14510)](https://github.com/microsoft/vcpkg/pull/14510) [python3] Upgrade to 3.9.0 (by @Hoikas) + - [(#15221)](https://github.com/microsoft/vcpkg/pull/15221) [python3] Add vcpkg-cmake-wrapper. (by @Hoikas) +- kf5i18n `5.64.0#1` -> `5.64.0#0` + - [(#13467)](https://github.com/microsoft/vcpkg/pull/13467) [many ports] Update existing KF5 frameworks to 5.75 (by @wrobelda) +- qt5-xmlpatterns `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- cairo `1.16.0#7` -> `1.16.0#8` + - [(#11776)](https://github.com/microsoft/vcpkg/pull/11776) [intl/gettext/fontconfig] update to native build system (by @Neumann-A) + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) + - [(#15965)](https://github.com/microsoft/vcpkg/pull/15965) [cairo] Make freetype and fontconfig optional. (by @Hoikas) + - [(#16825)](https://github.com/microsoft/vcpkg/pull/16825) [cairo,cairomm] add fontconfig and quartz feature and update cairo version (by @abique) +- boost-type-index `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- qt5-purchasing `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- asio `1.18.0#0` -> `1.18.0#0` + - [(#16711)](https://github.com/microsoft/vcpkg/pull/16711) [asio] update to 1.18.1 (by @JonLiu1993) +- gl2ps `1.4.0-3#0` -> `1.4.2#0` + - [(#16134)](https://github.com/microsoft/vcpkg/pull/16134) [gl2ps] update to 1.4.2 (by @JonLiu1993) +- matio `1.5.17#0` -> `1.5.19#0` + - [(#15971)](https://github.com/microsoft/vcpkg/pull/15971) [matio] Update to v1.5.19 (by @traversaro) +- wxwidgets `3.1.4#3` -> `3.1.4#0` + - [(#13361)](https://github.com/microsoft/vcpkg/pull/13361) [wxwidgets] Fix #4756 (by @ras0219) + - [(#16154)](https://github.com/microsoft/vcpkg/pull/16154) [wxWidgets] Fix issue with port usage (by @AenBleidd) + - [(#16371)](https://github.com/microsoft/vcpkg/pull/16371) [wxwidgets] Fix include path in UNIX (by @JackBoosY) + - [(#16546)](https://github.com/microsoft/vcpkg/pull/16546) [wxwidgets] Fix cmake wrapper (by @JackBoosY) +- qt5-scxml `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- itpp `4.3.1-5#0` -> `4.3.1-5#0` + - [(#16385)](https://github.com/microsoft/vcpkg/pull/16385) [vcpkg baseline] [itpp] Fix include directory (by @PhoebeHui) +- clapack `3.2.1#15` -> `3.2.1#16` + - [(#13448)](https://github.com/microsoft/vcpkg/pull/13448) [BLAS] add metaport (by @cenit) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- opengl `0.0-7#0` -> `0#8` + - [(#14724)](https://github.com/microsoft/vcpkg/pull/14724) [opengl] port path fix when crosscompiling (by @Nemirtingas) +- cimg `2.6.2#0` -> `2.9.4#0` + - [(#14923)](https://github.com/microsoft/vcpkg/pull/14923) [cimg] update to 2.9.4 (by @JonLiu1993) +- qt5-graphicaleffects `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- effects11 `11.26#0` -> `11.26#0` + - [(#16101)](https://github.com/microsoft/vcpkg/pull/16101) Update DXUT port and add Effects11 (FX) port (by @walbourn) +- wavpack `5.3.0#0` -> `5.3.0#1` + - [(#15787)](https://github.com/microsoft/vcpkg/pull/15787) [ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (by @Sibras) +- trantor `1.1.0#0` -> `1.1.1#0` + - [(#15460)](https://github.com/microsoft/vcpkg/pull/15460) update trantor to 1.1.1 (by @kkzi) + - [(#15841)](https://github.com/microsoft/vcpkg/pull/15841) [trantor] Update to 1.2.0 (by @an-tao) + - [(#16568)](https://github.com/microsoft/vcpkg/pull/16568) [trantor] Update to 1.3.0 (by @an-tao) + - [(#17173)](https://github.com/microsoft/vcpkg/pull/17173) [trantor] Update to 1.4.0 (by @an-tao) +- nowide `11.0.0#0` -> `11.1.1#0` + - [(#16913)](https://github.com/microsoft/vcpkg/pull/16913) [nowide] Upgrade to 11.1.1 (by @tats-u) + - [(#17209)](https://github.com/microsoft/vcpkg/pull/17209) [vcpkg baseline] [nowide] update to 11.1.2 (by @autoantwort) +- freealut `1.1.0#0` -> `1.1.0#0` + - [(#16890)](https://github.com/microsoft/vcpkg/pull/16890) [freealut] Add a port of freealut (by @QAston) +- libsvm `323-1#0` -> `323#0` + - [(#16501)](https://github.com/microsoft/vcpkg/pull/16501) Don't copy svm-toy if not on Windows (by @SoftwareApe) +- glibmm `2.52.1#12` -> `2.52.1#14` + - [(#11776)](https://github.com/microsoft/vcpkg/pull/11776) [intl/gettext/fontconfig] update to native build system (by @Neumann-A) + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) + - [(#14988)](https://github.com/microsoft/vcpkg/pull/14988) [GLIBMM] Installing .pc file (by @faserg1) + - [(#15353)](https://github.com/microsoft/vcpkg/pull/15353) Build results from 2020-12-27 (by @BillyONeal) +- openmvg `1.6#0` -> `1.6#1` + - [(#15859)](https://github.com/microsoft/vcpkg/pull/15859) [OpenCV] bump to 4.5.1 and to 3.4.13 (by @cenit) +- boost-preprocessor `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- boost-odeint `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- gsoap `2.8.105#0` -> `2.8.111#0` + - [(#16270)](https://github.com/microsoft/vcpkg/pull/16270) [vcpkg baseline][gsoap] Update to 2.8.111 (by @NancyLi1013) + - [(#16837)](https://github.com/microsoft/vcpkg/pull/16837) [vcpkg baseline][gsoap] Update to 2.8.112 (by @NancyLi1013) +- openssl-windows `1.1.1h#0` -> `1.1.1h#1` + - [(#14308)](https://github.com/microsoft/vcpkg/pull/14308) [OpenSSL] refactor openssl ports. (by @Neumann-A) + - [(#14457)](https://github.com/microsoft/vcpkg/pull/14457) [openssl] Add build depends to deprecated openssl ports (by @Neumann-A) +- networkdirect-sdk `2.0.1#0` -> `2.0.1#1` + - [(#14688)](https://github.com/microsoft/vcpkg/pull/14688) [networkdirect-sdk] Rework portfile.cmake to allow windows x64 and x86, add fail for other triplet combinations, remove all triplets for CI fail list (by @StarGate-One) +- boost-regex `1.75.0#0` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) + - [(#16994)](https://github.com/microsoft/vcpkg/pull/16994) [boost-regex] fix build with icu on osx (by @autoantwort) +- libmicrohttpd `0.9.63#4` -> `0.9.63#5` + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) +- nanobench `4.0.0#0` -> `4.3.0#0` + - [(#14975)](https://github.com/microsoft/vcpkg/pull/14975) [nanobench] update to 4.3.0 (by @JonLiu1993) +- nuspell `3.1.1#0` -> `4.0.1#0` + - [(#14505)](https://github.com/microsoft/vcpkg/pull/14505) [nuspell] Update version to 4.0.1 (by @dimztimz) + - [(#15425)](https://github.com/microsoft/vcpkg/pull/15425) [nuspell] update to version 4.2.0 (by @dimztimz) +- boost-python `1.75.0#1` -> `1.75.0#1` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15352)](https://github.com/microsoft/vcpkg/pull/15352) [boost-python] Adds `python-debugging=on` to `B2_OPTIONS_DBG` (fixes #15350) (by @klalumiere) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- openvr `1.12.5#0` -> `1.16.8#0` + - [(#16684)](https://github.com/microsoft/vcpkg/pull/16684) [openvr ] Update openvr to 1.16.8 (by @EniacMlezi) +- boost-container `1.75.0#0` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- botan `2.16.0#0` -> `2.16.0#0` + - [(#17509)](https://github.com/microsoft/vcpkg/pull/17509) [botan] add arm (by @jgilje) +- azure-security-keyvault-keys-cpp `4.0.0-beta.1#0` -> `4.0.0-beta.1#0` + - [(#17143)](https://github.com/microsoft/vcpkg/pull/17143) [azure-security-keyvault-*] Add new ports (by @azure-sdk) + - [(#17447)](https://github.com/microsoft/vcpkg/pull/17447) [azure-sdk-for-cpp] Upgrade vcpkg manifest files (by @antkmsft) +- libtcod `1.16.6#0` -> `1.16.6#0` + - [(#16408)](https://github.com/microsoft/vcpkg/pull/16408) [libtcod] Add new port. (by @HexDecimal) +- realsense2 `2.40.0#1` -> `2.40.0#1` + - [(#14522)](https://github.com/microsoft/vcpkg/pull/14522) [realsense2] Update to version 2.39.0 (by @padarom) + - [(#15156)](https://github.com/microsoft/vcpkg/pull/15156) [Realsense2] Update to 2.40.0 (by @JonLiu1993) + - [(#15608)](https://github.com/microsoft/vcpkg/pull/15608) Librealsense2 android build (by @xandox) + - [(#16411)](https://github.com/microsoft/vcpkg/pull/16411) [realsense2] Update version to v 2.42.0 (by @Cheney-W) +- upb `2020-08-19#0` -> `2020-08-19#0` + - [(#17331)](https://github.com/microsoft/vcpkg/pull/17331) Update VMs, CMake to 3.20.1, CUDA to 11.3, and pwsh to 7.1.3 (by @BillyONeal) + - [(#17422)](https://github.com/microsoft/vcpkg/pull/17422) [grpc][upb] Update to newer versions (by @ras0219) +- brynet `1.0.7#0` -> `1.10.0#0` + - [(#16366)](https://github.com/microsoft/vcpkg/pull/16366) [brynet] upgrade to 1.10.0 (by @IronsDu) +- libssh `0.9.5#1` -> `0.9.5#3` + - [(#15687)](https://github.com/microsoft/vcpkg/pull/15687) [libssh] Add support for Android (by @ahmedyarub) + - [(#15725)](https://github.com/microsoft/vcpkg/pull/15725) [aws-cpp-sdk] [zlib] [openssl] [curl] Fix zlib, OpenSSL, curl and AWS SDK for Android (by @ahmedyarub) + - [(#15787)](https://github.com/microsoft/vcpkg/pull/15787) [ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (by @Sibras) +- boost-hof `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- gdk-pixbuf `2.36.9-5#6` -> `2.36.9-5#7` + - [(#11776)](https://github.com/microsoft/vcpkg/pull/11776) [intl/gettext/fontconfig] update to native build system (by @Neumann-A) + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) + - [(#15353)](https://github.com/microsoft/vcpkg/pull/15353) Build results from 2020-12-27 (by @BillyONeal) + - [(#17528)](https://github.com/microsoft/vcpkg/pull/17528) [vcpkg baseline][gdk-pixbuf] Fix build error on windows (by @PhoebeHui) +- ace `0#1` -> `0#1` + - [(#14768)](https://github.com/microsoft/vcpkg/pull/14768) [ace] copy generated headers files for tao (by @victorburckel) + - [(#15862)](https://github.com/microsoft/vcpkg/pull/15862) [ace] Update to 7.0.0 (by @jwillemsen) + - [(#16708)](https://github.com/microsoft/vcpkg/pull/16708) [ace] Upgrade to 7.0.1 (by @jwillemsen) +- scintilla `4.4.5#0` -> `4.4.5#0` + - [(#16508)](https://github.com/microsoft/vcpkg/pull/16508) [scintilla] update to 4.4.6 (by @JonLiu1993) +- boost-pool `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- cairomm `1.15.3#5` -> `1.15.3#0` + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) + - [(#16825)](https://github.com/microsoft/vcpkg/pull/16825) [cairo,cairomm] add fontconfig and quartz feature and update cairo version (by @abique) +- freerdp `2.2.0#0` -> `2.2.0#0` + - [(#15724)](https://github.com/microsoft/vcpkg/pull/15724) [freerdp] Fix include path (by @KangLin) +- hypodermic `2.5.2#0` -> `2.5.2#0` + - [(#17208)](https://github.com/microsoft/vcpkg/pull/17208) [hypodermic] Add new port (v2.5.2) (by @revilo) +- libtorrent `1.2.10#1` -> `1.2.10#2` + - [(#11776)](https://github.com/microsoft/vcpkg/pull/11776) [intl/gettext/fontconfig] update to native build system (by @Neumann-A) + - [(#14755)](https://github.com/microsoft/vcpkg/pull/14755) [libtorrent] Update to 1.2.11 (by @FranciscoPombal) + - [(#15620)](https://github.com/microsoft/vcpkg/pull/15620) [libtorrent] update to 1.2.12 (by @JonLiu1993) + - [(#17166)](https://github.com/microsoft/vcpkg/pull/17166) [libtorrent] Update to latest 1.2.x commit (by @FranciscoPombal) +- zstd `1.4.4#1` -> `1.4.5#1` + - [(#14395)](https://github.com/microsoft/vcpkg/pull/14395) [ZSTD] Update to 1.4.5 (by @Neumann-A) + - [(#16865)](https://github.com/microsoft/vcpkg/pull/16865) [zstd] update to 1.4.9 (by @Thieum) +- qt5-script `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- dlib `4#0` -> `4#0` + - [(#13448)](https://github.com/microsoft/vcpkg/pull/13448) [BLAS] add metaport (by @cenit) + - [(#15277)](https://github.com/microsoft/vcpkg/pull/15277) [dlib] adding missing cudnn depedency for cuda feature (by @Kicer86) +- boost-function-types `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- libudis86 `2018-01-28-56ff6c87#0` -> `2018-01-28-56ff6c87#0` + - [(#17331)](https://github.com/microsoft/vcpkg/pull/17331) Update VMs, CMake to 3.20.1, CUDA to 11.3, and pwsh to 7.1.3 (by @BillyONeal) +- libkeyfinder `2.2.4#0` -> `2.2.4#0` + - [(#15878)](https://github.com/microsoft/vcpkg/pull/15878) [libkeyfinder] add new port with libkeyfinder 2.2.4 (by @Be-ing) +- paho-mqttpp3 `1.1#1` -> `1.1#1` + - [(#13680)](https://github.com/microsoft/vcpkg/pull/13680) [paho-mqtt] Update to version 1.3.5 (by @LilyWangL) + - [(#15573)](https://github.com/microsoft/vcpkg/pull/15573) [paho-mqttpp3] update to 1.2.0 (by @JonLiu1993) +- qt5-declarative `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- icu `8#5` -> `8#8` + - [(#14186)](https://github.com/microsoft/vcpkg/pull/14186) [icu] Add MSVC ARM64 support (by @janisozaur) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15706)](https://github.com/microsoft/vcpkg/pull/15706) [icu] Add support for macos rpath prefix macro (by @adam-bloom) + - [(#16077)](https://github.com/microsoft/vcpkg/pull/16077) [V8, icu] Update v8 to version 9.0.257.17, icu to 69.1 (by @Kwizatz) +- freexl `1.0.4#10` -> `1.0.4#11` + - [(#11776)](https://github.com/microsoft/vcpkg/pull/11776) [intl/gettext/fontconfig] update to native build system (by @Neumann-A) +- mongo-c-driver `1.16.1-1#1` -> `1.16.1#3` + - [(#13126)](https://github.com/microsoft/vcpkg/pull/13126) [vcpkg_fixup_pkgconfig] Handle spaces in path, do not validate individual libraries (by @ras0219) +- boost-timer `1.75.0#0` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- libodb `2.4.0-6#0` -> `2.4.0-6#0` + - [(#16975)](https://github.com/microsoft/vcpkg/pull/16975) [libodb-mysql] Fix usage (by @JackBoosY) +- qt5-3d `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- palsigslot `1.2.0#0` -> `1.2.0#0` + - [(#15558)](https://github.com/microsoft/vcpkg/pull/15558) [palsigslot] New port (by @luca-schlecker) +- ghc-filesystem `#0` -> `#0` + - [(#16936)](https://github.com/microsoft/vcpkg/pull/16936) [ghc-filesystem] create a new port (by @luncliff) +- qt5-webchannel `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- gettext `0.19-15#0` -> `0.21#0` + - [(#11776)](https://github.com/microsoft/vcpkg/pull/11776) [intl/gettext/fontconfig] update to native build system (by @Neumann-A) + - [(#17010)](https://github.com/microsoft/vcpkg/pull/17010) [gettext] Add feature tools (by @Neumann-A) + - [(#17523)](https://github.com/microsoft/vcpkg/pull/17523) [gettext] disable dirent detection on windows (by @Neumann-A) +- fdk-aac `2018-07-08-2#0` -> `2018-07-08#3` + - [(#15787)](https://github.com/microsoft/vcpkg/pull/15787) [ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (by @Sibras) +- yyjson `#0` -> `#0` + - [(#17201)](https://github.com/microsoft/vcpkg/pull/17201) [yyjson] Add new port (by @myd7349) +- tweeny `3#0` -> `3#0` + - [(#16683)](https://github.com/microsoft/vcpkg/pull/16683) [tweeny] Update to v3.2.0 (by @bradJM) +- span-lite `0.7.0#0` -> `0.8.1#0` + - [(#14414)](https://github.com/microsoft/vcpkg/pull/14414) [span-lite] update to 0.8.1 (by @Ryan-rsm-McKenzie) + - [(#14781)](https://github.com/microsoft/vcpkg/pull/14781) [span-lite] update to 0.9.0 (by @Ryan-rsm-McKenzie) +- boost-array `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- debug-assert `1.3.3#0` -> `1.3.3#0` + - [(#15468)](https://github.com/microsoft/vcpkg/pull/15468) [type-safe] New port. (by @blaz-kranjc) +- hyperscan `5.3.0#0` -> `5.3.0#1` + - [(#15080)](https://github.com/microsoft/vcpkg/pull/15080) [hyperscan] Remove erroneous python3 dependency. (by @Hoikas) +- boost-wave `1.75.0#1` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- ensmallen `2.14.2#0` -> `2.14.2#0` + - [(#13448)](https://github.com/microsoft/vcpkg/pull/13448) [BLAS] add metaport (by @cenit) +- cartographer `1.0.0-3#0` -> `1.0.0-3#0` + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) +- boost-statechart `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- librtmp `2019-11-11_1#0` -> `2019-11-11_1#0` + - [(#16320)](https://github.com/microsoft/vcpkg/pull/16320) [librtmp] Switch to GitHub mirror (by @ras0219) +- openigtlink `3.0#0` -> `3.0#1` + - [(#15500)](https://github.com/microsoft/vcpkg/pull/15500) [openigtlink] Fix cmake config location (by @dweckmann) +- libdatachannel `v0.10.1#0` -> `v0.10.1#0` + - [(#13704)](https://github.com/microsoft/vcpkg/pull/13704) [libdatachannel] Add new port (by @Nemirtingas) + - [(#17077)](https://github.com/microsoft/vcpkg/pull/17077) [libdatachannel ] Update to 0.12.0 (by @Nemirtingas) + - [(#17331)](https://github.com/microsoft/vcpkg/pull/17331) Update VMs, CMake to 3.20.1, CUDA to 11.3, and pwsh to 7.1.3 (by @BillyONeal) +- pixman `0.38.4#2` -> `0.38.4#0` + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) +- libnice `0.1.15#5` -> `0.1.15#6` + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) + - [(#14248)](https://github.com/microsoft/vcpkg/pull/14248) [libnice] Fix build error on Linux (by @LilyWangL) +- ebml `1.4.0#0` -> `1.4.0#0` + - [(#14794)](https://github.com/microsoft/vcpkg/pull/14794) [ebml/gppanel/matroska/polyhook2/unrar] Fix typos in CONTROL files (by @NancyLi1013) +- fplus `0.2.3-p0#0` -> `0.2.3-p0#0` + - [(#16510)](https://github.com/microsoft/vcpkg/pull/16510) [fplus] update to v0.2.13-p0 (by @JonLiu1993) + - [(#17559)](https://github.com/microsoft/vcpkg/pull/17559) [new/updated port] frugally-deep and updated fplus (by @mathisloge) +- mapbox-geojson-vt-cpp `#0` -> `#0` + - [(#16838)](https://github.com/microsoft/vcpkg/pull/16838) [mapbox-geometry,mapbox-polylabel,geojson-vt-cpp,geojson-cpp] new ports (by @mathisloge) +- mdnsresponder `765.30.11-2#0` -> `765.30.11#3` + - [(#15340)](https://github.com/microsoft/vcpkg/pull/15340) [mdnsresponder] Change compile flag /Zi to /Z7 (by @JackBoosY) +- boost-graph-parallel `1.74.0#1` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- poppler `20.12.1#0` -> `20.12.1#0` + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) + - [(#15158)](https://github.com/microsoft/vcpkg/pull/15158) [poppler] Add new port (by @playgithub) + - [(#15491)](https://github.com/microsoft/vcpkg/pull/15491) [vcpkg baseline][poppler] Fix issue with using libcurl. (by @Hoikas) + - [(#15574)](https://github.com/microsoft/vcpkg/pull/15574) [poppler] Fix error gperf is not recognized as an internal or externa command (by @Cheney-W) + - [(#15727)](https://github.com/microsoft/vcpkg/pull/15727) [poppler] Disable clang-format check (by @NancyLi1013) + - [(#16356)](https://github.com/microsoft/vcpkg/pull/16356) [vcpkg baseline][poppler] Add feature splash and add its dependency boost-container and boost-move (by @JackBoosY) +- portaudio `2020-02-02#0` -> `2020-02-02#0` + - [(#16197)](https://github.com/microsoft/vcpkg/pull/16197) Update portaudio port to latest on github (by @fluffy) + - [(#17401)](https://github.com/microsoft/vcpkg/pull/17401) [portaudio] update to 19.7 (by @Be-ing) +- libsodium `1.0.18#3` -> `1.0.18#3` + - [(#15269)](https://github.com/microsoft/vcpkg/pull/15269) [libsodium] use x64 specific gcc options only on x64 platform (by @isanych) + - [(#16730)](https://github.com/microsoft/vcpkg/pull/16730) [libsodium] Rework CMake build to match autoconf (by @thomasgt) +- poco `1.10.1#1` -> `1.10.1#3` + - [(#14305)](https://github.com/microsoft/vcpkg/pull/14305) [poco] Fix dependency, add features (by @JackBoosY) + - [(#14589)](https://github.com/microsoft/vcpkg/pull/14589) [poco] Fix dependency and cmake config issue (by @PhoebeHui) + - [(#14763)](https://github.com/microsoft/vcpkg/pull/14763) [poco] Fix dependency libmariadb (by @JackBoosY) + - [(#16526)](https://github.com/microsoft/vcpkg/pull/16526) [poco] Remove dependency port openssl for feature netssl on windows (by @JackBoosY) + - [(#16549)](https://github.com/microsoft/vcpkg/pull/16549) [poco] Fix feature sqlite3 (by @NancyLi1013) +- aws-checksums `0.1.9#0` -> `0.1.9#0` + - [(#14246)](https://github.com/microsoft/vcpkg/pull/14246) [vcpkg baseline] Clean up baseline, use Keyword Supports Part 2 (by @JackBoosY) +- azure-iot-sdk-c `2020-07-19#1` -> `2020-12-09#0` + - [(#15109)](https://github.com/microsoft/vcpkg/pull/15109) Azure-IoT-Sdk for C release 2020-12-09 (by @ewertons) +- opencascade `7.5.0#1` -> `7.5.0#3` + - [(#14435)](https://github.com/microsoft/vcpkg/pull/14435) [opencascade] update debug paths in *Targets-debug.cmake (by @socuwn) + - [(#14901)](https://github.com/microsoft/vcpkg/pull/14901) [opencascade] Fix static build (by @JackBoosY) + - [(#15056)](https://github.com/microsoft/vcpkg/pull/15056) [opencascade] Fix OpenCASCADE_INSTALL_PREFIX path in config (by @NancyLi1013) + - [(#15997)](https://github.com/microsoft/vcpkg/pull/15997) [opencascade] Update to 7.5.0 (by @JonLiu1993) + - [(#16513)](https://github.com/microsoft/vcpkg/pull/16513) [opencascade] fix #16252 (by @Dejauxvue) +- boost-asio `1.75.0#1` -> `1.75.0#1` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15513)](https://github.com/microsoft/vcpkg/pull/15513) [boost-asio] Fix duplicate symbols of asio::dummy_return (by @cedral) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- sdformat6 `6.2.0-1#0` -> `6.2.0-1#0` + - [(#17376)](https://github.com/microsoft/vcpkg/pull/17376) [ci] Update macOS to 11 (by @strega-nil) +- openssl-unix `1.1.1h#0` -> `1.1.1h#1` + - [(#14308)](https://github.com/microsoft/vcpkg/pull/14308) [OpenSSL] refactor openssl ports. (by @Neumann-A) + - [(#14457)](https://github.com/microsoft/vcpkg/pull/14457) [openssl] Add build depends to deprecated openssl ports (by @Neumann-A) +- pagmo2 `#0` -> `#0` + - [(#15682)](https://github.com/microsoft/vcpkg/pull/15682) [pagmo2] Add new port (by @dmillard) +- lzo `2.10-5#0` -> `2.1#6` + - [(#15782)](https://github.com/microsoft/vcpkg/pull/15782) [lzo] Install pc file on windows (by @Neumann-A) +- workflow `0.9.3#0` -> `0.9.3#0` + - [(#16140)](https://github.com/microsoft/vcpkg/pull/16140) [workflow] add port of sogou/workflow (by @dengjunplusplus) + - [(#16198)](https://github.com/microsoft/vcpkg/pull/16198) [workflow] Disable parallel configure due to writes to source dir (by @ras0219) + - [(#16842)](https://github.com/microsoft/vcpkg/pull/16842) [workflow] update version of workflow port (by @dengjunplusplus) +- boost-icl `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- globjects `1.1.0-3#0` -> `1.1.0#0` + - [(#16429)](https://github.com/microsoft/vcpkg/pull/16429) [glm] Add namespace to export target (by @JackBoosY) +- spirv-cross `2020-02-26#0` -> `2020-02-26#0` + - [(#15831)](https://github.com/microsoft/vcpkg/pull/15831) [spirv-cross,spirv-headers,spirv-tools] 2021-01-15 update (by @barcharcraz) + - [(#16038)](https://github.com/microsoft/vcpkg/pull/16038) [spirv-cross,spirv-tools] support iOS triplets (by @luncliff) + - [(#17367)](https://github.com/microsoft/vcpkg/pull/17367) [spirv-cross] small cleanup (by @fran6co) +- boost-parameter `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- libui `2018-11-03-1#0` -> `2018-11-03-1#0` + - [(#17095)](https://github.com/microsoft/vcpkg/pull/17095) [libui] Export system libs on OSX (by @JackBoosY) +- ignition-transport8 `8.0.0#0` -> `8.1.0#0` + - [(#14562)](https://github.com/microsoft/vcpkg/pull/14562) [ignition-transport8] Fix ignition-transport8 version (by @ahoarau) +- onnxruntime-gpu `1.5.1#0` -> `1.5.1#0` + - [(#14481)](https://github.com/microsoft/vcpkg/pull/14481) [onnxruntime-gpu] Add port for onnxruntime (GPU) (by @ianormy) +- rsasynccpp `#0` -> `#0` + - [(#16380)](https://github.com/microsoft/vcpkg/pull/16380) [rsasynccpp] Add new port (Rstein.AsyncCpp) (by @renestein) +- boost-locale `1.75.0#1` -> `1.75.0#3` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14502)](https://github.com/microsoft/vcpkg/pull/14502) [boost-locale] Replace VCPKG_TARGET_IS_WINDOWS in b2-options (by @longnguyen2004) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- libsigcpp `2.10-3#1` -> `2.10-3#2` + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) + - [(#14988)](https://github.com/microsoft/vcpkg/pull/14988) [GLIBMM] Installing .pc file (by @faserg1) + - [(#15353)](https://github.com/microsoft/vcpkg/pull/15353) Build results from 2020-12-27 (by @BillyONeal) +- v8 `8.3.110.13#0` -> `8.6.395.17#0` + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) + - [(#13355)](https://github.com/microsoft/vcpkg/pull/13355) [v8] Update v8 to current stable version: 8.6.395.17 (by @Kwizatz) + - [(#16077)](https://github.com/microsoft/vcpkg/pull/16077) [V8, icu] Update v8 to version 9.0.257.17, icu to 69.1 (by @Kwizatz) +- netcdf-c `4.7.4#1` -> `4.7.4#2` + - [(#14421)](https://github.com/microsoft/vcpkg/pull/14421) [netcdf-c] Fix linkage error (by @NancyLi1013) + - [(#16085)](https://github.com/microsoft/vcpkg/pull/16085) [netcdf-c] Fix usage (by @JackBoosY) +- qt5-remoteobjects `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- tbb `2020_U3#1` -> `2020_U3#4` + - [(#14325)](https://github.com/microsoft/vcpkg/pull/14325) [tbb] Support tbb build for arm-linux & arm64-linux (by @xieyubo) + - [(#14555)](https://github.com/microsoft/vcpkg/pull/14555) [tbb] fix shared tbb library configuration build under *nix (by @xandox) + - [(#15306)](https://github.com/microsoft/vcpkg/pull/15306) [tbb] arm64-osx support (by @lebdron) + - [(#16068)](https://github.com/microsoft/vcpkg/pull/16068) Add disable-exceptions feature to portfile for tbb (by @aggieNick02) +- qt5-translations `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- freetds `1.2.11#0` -> `1.2.11#0` + - [(#14529)](https://github.com/microsoft/vcpkg/pull/14529) [freetds] Remove patches and update to a version that no longer needs them (by @BillyONeal) + - [(#14970)](https://github.com/microsoft/vcpkg/pull/14970) [ NASM ] Update version from 2.14.02 to 2.15.05 (by @Nioub) +- kf5windowsystem `5.64.0#0` -> `5.64.0#0` + - [(#13467)](https://github.com/microsoft/vcpkg/pull/13467) [many ports] Update existing KF5 frameworks to 5.75 (by @wrobelda) +- uvatlas `aug2020#0` -> `apr2021#0` + - [(#15210)](https://github.com/microsoft/vcpkg/pull/15210) Updated directxtk et al for cmake package support (by @walbourn) + - [(#15554)](https://github.com/microsoft/vcpkg/pull/15554) directxmesh, directxtex, and uvatlas now support linux (by @walbourn) + - [(#15639)](https://github.com/microsoft/vcpkg/pull/15639) directxtex, directxmesh, directxtk, uvatlas ports updated to fix cach??? (by @walbourn) + - [(#17123)](https://github.com/microsoft/vcpkg/pull/17123) [directxtex,directxmesh, directxtk, directxtk12, uvatlas] updated for April 2021 releases (by @walbourn) +- qt5-speech `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- boost-xpressive `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- libmt32emu `#0` -> `#0` + - [(#16816)](https://github.com/microsoft/vcpkg/pull/16816) [libmt32emu] new port (by @autoantwort) + - [(#17070)](https://github.com/microsoft/vcpkg/pull/17070) [libmt32emu] update to 2.5.0 (by @autoantwort) +- boost-range `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- yas `7.0.4#0` -> `7.0.5#0` + - [(#14453)](https://github.com/microsoft/vcpkg/pull/14453) [yas] update to 7.0.5 (by @SeekingMeaning) +- geographiclib `1.50.1#0` -> `1.51#0` + - [(#14711)](https://github.com/microsoft/vcpkg/pull/14711) [geographiclib] Update to version 1.51 (by @cffk) +- directxsdk `jun10#0` -> `jun10#0` + - [(#16010)](https://github.com/microsoft/vcpkg/pull/16010) [directxsdk] Update DirectX SDK port (by @walbourn) + - [(#16317)](https://github.com/microsoft/vcpkg/pull/16317) direcxtsdk port updated to use MS Downloads (by @walbourn) +- pango `1.40.11#8` -> `1.40.11#9` + - [(#12860)](https://github.com/microsoft/vcpkg/pull/12860) [harfbuzz] Use meson and update to 2.7.0 (by @vejmartin) + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) +- entt `3.5.1#0` -> `3.6.0#0` + - [(#15567)](https://github.com/microsoft/vcpkg/pull/15567) [entt] update to <3.6> (by @JonLiu1993) + - [(#17047)](https://github.com/microsoft/vcpkg/pull/17047) [entt] Update to 3.7.0 (by @skaarj1989) +- boost-intrusive `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- xaudio2redist `1.2.6#0` -> `1.2.6#0` + - [(#17174)](https://github.com/microsoft/vcpkg/pull/17174) [xaudio2redist] Add new port (by @walbourn) +- qt5-webengine `5.15.2#1` -> `5.15.2#2` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) + - [(#16770)](https://github.com/microsoft/vcpkg/pull/16770) [qt5-webengine] Fix issues (by @Neumann-A) +- kf5completion `5.64.0#0` -> `5.64.0#0` + - [(#13467)](https://github.com/microsoft/vcpkg/pull/13467) [many ports] Update existing KF5 frameworks to 5.75 (by @wrobelda) +- boost-rational `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- ois `1.5-1#0` -> `1.5#0` + - [(#15030)](https://github.com/microsoft/vcpkg/pull/15030) [tcl, anyrpc, ois, osgearth] Build Fixes 2020-12-09 (by @BillyONeal) +- openssl-uwp `1.1.1h#1` -> `1.1.1h#1` + - [(#14308)](https://github.com/microsoft/vcpkg/pull/14308) [OpenSSL] refactor openssl ports. (by @Neumann-A) + - [(#14457)](https://github.com/microsoft/vcpkg/pull/14457) [openssl] Add build depends to deprecated openssl ports (by @Neumann-A) +- qt5-wayland `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- boost-flyweight `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- boost-heap `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- exiv2 `0.27.3#2` -> `0.27.3#4` + - [(#11776)](https://github.com/microsoft/vcpkg/pull/11776) [intl/gettext/fontconfig] update to native build system (by @Neumann-A) + - [(#15389)](https://github.com/microsoft/vcpkg/pull/15389) [exiv2] Add pkgconfig to fix the path (by @NancyLi1013) +- qt5-gamepad `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- boost-property-map `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- taglib `1.11.1-20190531#0` -> `1.12.0-20210123#0` + - [(#16390)](https://github.com/microsoft/vcpkg/pull/16390) Update taglib to 1.12.0 (by @pdehne) + - [(#16649)](https://github.com/microsoft/vcpkg/pull/16649) [taglib] Upgrade from 1.12-beta-2 to 1.12 (by @uklotzde) +- boost-numeric-conversion `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- libepoxy `1.5.4#1` -> `1.5.4#2` + - [(#14344)](https://github.com/microsoft/vcpkg/pull/14344) [tool-meson] Update to 0.56.0 (by @c72578) + - [(#15482)](https://github.com/microsoft/vcpkg/pull/15482) [libepoxy] Update to 1.5.5 (by @ras0219) +- mapbox-geojson-cpp `#0` -> `#0` + - [(#16838)](https://github.com/microsoft/vcpkg/pull/16838) [mapbox-geometry,mapbox-polylabel,geojson-vt-cpp,geojson-cpp] new ports (by @mathisloge) +- zziplib `0.13.71#0` -> `0.13.71#1` + - [(#15215)](https://github.com/microsoft/vcpkg/pull/15215) [zziplib] Uses upstream CMakeLists.txt (by @longnguyen2004) +- gsl-lite `0.37.0#0` -> `0.37.0#0` + - [(#16984)](https://github.com/microsoft/vcpkg/pull/16984) [gsl-lite] Update to 0.38.0 (by @mbeutel) + - [(#17444)](https://github.com/microsoft/vcpkg/pull/17444) [gsl-lite] Update to 0.38.1 (by @mbeutel) +- boost-context `1.75.0#2` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16378)](https://github.com/microsoft/vcpkg/pull/16378) [boost-context] fix linux -> windows cross compile (by @autoantwort) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) + - [(#16482)](https://github.com/microsoft/vcpkg/pull/16482) [boost-context] fix build result on apple arm (by @autoantwort) + - [(#16930)](https://github.com/microsoft/vcpkg/pull/16930) [boost-context] support android (by @huangqinjin) +- darknet `2020-08-30#1` -> `2020-08-30#2` + - [(#15296)](https://github.com/microsoft/vcpkg/pull/15296) [darknet] yolo v4 weights's hash need to update (by @JonLiu1993) + - [(#15770)](https://github.com/microsoft/vcpkg/pull/15770) [darknet] update to latest version (by @cenit) + - [(#15942)](https://github.com/microsoft/vcpkg/pull/15942) [darknet] fix opencv features, add compatibility with VS16.9 (by @cenit) +- xsimd `7.4.8#0` -> `7.4.9#0` + - [(#14454)](https://github.com/microsoft/vcpkg/pull/14454) [xsimd][xtensor][xtl] Update to latest (by @SeekingMeaning) +- magic-enum `0.7.0#0` -> `0.7.1#0` + - [(#14904)](https://github.com/microsoft/vcpkg/pull/14904) [magic-enum] Update to v0.7.1 (by @Neargye) + - [(#15974)](https://github.com/microsoft/vcpkg/pull/15974) [magic-enum] Update to v0.7.2 (by @Neargye) +- qt5-imageformats `5.15.1#1` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- sdl1 `1.2.15#12` -> `1.2.15#13` + - [(#15126)](https://github.com/microsoft/vcpkg/pull/15126) [sdl1] x64-windows-static-md fixes (by @ankurverma85) +- libffi `3.3#5` -> `3.3#7` + - [(#14407)](https://github.com/microsoft/vcpkg/pull/14407) [libffi] mingw support (by @longnguyen2004) + - [(#15821)](https://github.com/microsoft/vcpkg/pull/15821) [libffi] Added armv7-a to allowed architectures for Android 32 bit arm builds (by @venabled) + - [(#16285)](https://github.com/microsoft/vcpkg/pull/16285) [libffi] Fix processors (by @autoantwort) +- iir1 `#0` -> `#0` + - [(#16436)](https://github.com/microsoft/vcpkg/pull/16436) [iir1] Add new port (by @andywang0607) +- continuable `4.1.0#0` -> `4.1.0#0` + - [(#16261)](https://github.com/microsoft/vcpkg/pull/16261) [continuable] add a new port (by @luncliff) +- boost-yap `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- libxslt `1.1.33#1` -> `1.1.33#9` + - [(#11776)](https://github.com/microsoft/vcpkg/pull/11776) [intl/gettext/fontconfig] update to native build system (by @Neumann-A) + - [(#14476)](https://github.com/microsoft/vcpkg/pull/14476) [libxslt] Fix install tools and pkgconfig (by @JackBoosY) + - [(#15806)](https://github.com/microsoft/vcpkg/pull/15806) [libxslt] Fixed macos build (by @ludekvodicka) + - [(#16617)](https://github.com/microsoft/vcpkg/pull/16617) [libxslt] Update to 1.1.34 (by @pastle-ptc) +- python3 `3.9.2#2` -> `3.9.2#0` + - [(#14510)](https://github.com/microsoft/vcpkg/pull/14510) [python3] Upgrade to 3.9.0 (by @Hoikas) + - [(#14891)](https://github.com/microsoft/vcpkg/pull/14891) [python3] Build interpreter (by @Hoikas) + - [(#15221)](https://github.com/microsoft/vcpkg/pull/15221) [python3] Add vcpkg-cmake-wrapper. (by @Hoikas) + - [(#15378)](https://github.com/microsoft/vcpkg/pull/15378) [antlr4,python3] Resolve cross port conflicts (by @BillyONeal) + - [(#16315)](https://github.com/microsoft/vcpkg/pull/16315) [python3] upgrade to 3.9.2 (by @Hoikas) + - [(#16420)](https://github.com/microsoft/vcpkg/pull/16420) [python3] Add feature deprecated-win7-support. (by @Hoikas) + - [(#17579)](https://github.com/microsoft/vcpkg/pull/17579) [python3] Disable registry access to determine WinSDK (by @ras0219-msft) +- matplotplusplus `#0` -> `#0` + - [(#13725)](https://github.com/microsoft/vcpkg/pull/13725) [matplotplusplus] Add new port (by @myd7349) + - [(#17461)](https://github.com/microsoft/vcpkg/pull/17461) [matplotplusplus] Install extra 3rd libraries (by @JackBoosY) + - [(#17552)](https://github.com/microsoft/vcpkg/pull/17552) [matplotplusplus] Fix find and use dependencies (by @JackBoosY) +- oatpp-zlib `1.2.0#0` -> `1.2.0#0` + - [(#14341)](https://github.com/microsoft/vcpkg/pull/14341) [oatpp] Add new port and vcpkg.json (by @mheyman) +- capnproto `0.8.0#0` -> `0.8.0#1` + - [(#15353)](https://github.com/microsoft/vcpkg/pull/15353) Build results from 2020-12-27 (by @BillyONeal) +- vc `1.4.1#0` -> `1.4.1#1` + - [(#16552)](https://github.com/microsoft/vcpkg/pull/16552) [vc] Update HEAD_REF and fix CMake configure options (by @bernhardmgruber) +- libflac `1.3.3#4` -> `1.3.3#5` + - [(#14465)](https://github.com/microsoft/vcpkg/pull/14465) [libflac] require NASM for libflac[asm] (by @cbergemann) +- colmap `3.6#0` -> `3.6#0` + - [(#15886)](https://github.com/microsoft/vcpkg/pull/15886) [baseline][colmap] Fix find dependency freeimage (by @JackBoosY) +- glew `2.1.0#9` -> `2.1.0#10` + - [(#16166)](https://github.com/microsoft/vcpkg/pull/16166) [glfw3/glew] Fix pkgconfig (by @JackBoosY) +- libwebp `1.1.0#1` -> `1.1.0#3` + - [(#15787)](https://github.com/microsoft/vcpkg/pull/15787) [ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (by @Sibras) + - [(#17172)](https://github.com/microsoft/vcpkg/pull/17172) [libwebp] Fix release-only builds (by @dg0yt) +- behaviortree-cpp `3.5.1#0` -> `3.5.1#0` + - [(#17169)](https://github.com/microsoft/vcpkg/pull/17169) [behaviortree-cpp] update to 3.5.6 (by @JonLiu1993) +- g3log `2019-07-29#0` -> `2019-07-29#0` + - [(#16491)](https://github.com/microsoft/vcpkg/pull/16491) [g3log] update to 1.3.4 (by @JonLiu1993) + - [(#16872)](https://github.com/microsoft/vcpkg/pull/16872) [g3log] Add supports (by @NancyLi1013) +- libprotobuf-mutator `1#0` -> `1#0` + - [(#13691)](https://github.com/microsoft/vcpkg/pull/13691) [libprotobuf-mutator] Add new port (by @lebdron) +- opencolorio `1.1.1#4` -> `1.1.1#0` + - [(#15764)](https://github.com/microsoft/vcpkg/pull/15764) [opencolorio] Install OpenColorIOConfig.cmake (by @ras0219) +- qt5-sensors `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- libcbor `0.8.0#0` -> `0.8.0#0` + - [(#16884)](https://github.com/microsoft/vcpkg/pull/16884) [libcbor] New port (by @xgcssch) +- alembic `1.7.15#0` -> `1.7.16#0` + - [(#14447)](https://github.com/microsoft/vcpkg/pull/14447) [alembic] update to 1.7.16 (by @SeekingMeaning) +- boost-proto `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- tinyexr `2020-03-15#0` -> `1.0.0#0` + - [(#17360)](https://github.com/microsoft/vcpkg/pull/17360) [tinyexr] update version and add targets (by @fran6co) +- libspatialite `5.0.0#5` -> `5.0.0#7` + - [(#11776)](https://github.com/microsoft/vcpkg/pull/11776) [intl/gettext/fontconfig] update to native build system (by @Neumann-A) + - [(#14800)](https://github.com/microsoft/vcpkg/pull/14800) [Proj4] Update to 7.2.0 (by @longhuan2018) + - [(#15040)](https://github.com/microsoft/vcpkg/pull/15040) [libspatialite] Update 5.0.0 (by @longhuan2018) + - [(#17024)](https://github.com/microsoft/vcpkg/pull/17024) Libspatialite remove cflags from vcpkg_configure_make options (by @xandox) +- detours `4.0.1-1#0` -> `4.0.1#2` + - [(#16755)](https://github.com/microsoft/vcpkg/pull/16755) [detours] support debug builds (by @sylveon) +- boost-unordered `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- chartdir `6.3.1-1#0` -> `6.3.1#2` + - [(#15353)](https://github.com/microsoft/vcpkg/pull/15353) Build results from 2020-12-27 (by @BillyONeal) +- oatpp-swagger `1.2.0#1` -> `1.2.0#0` + - [(#14341)](https://github.com/microsoft/vcpkg/pull/14341) [oatpp] Add new port and vcpkg.json (by @mheyman) +- orc `1.6.4#0` -> `1.6.4#1` + - [(#14395)](https://github.com/microsoft/vcpkg/pull/14395) [ZSTD] Update to 1.4.5 (by @Neumann-A) +- minizip `1.2.11#7` -> `1.2.11#8` + - [(#16108)](https://github.com/microsoft/vcpkg/pull/16108) [minizip] support iOS/Android triplets (by @luncliff) +- qt5-datavis3d `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- fontconfig `2.13.1#1` -> `2.13.1#6` + - [(#11776)](https://github.com/microsoft/vcpkg/pull/11776) [intl/gettext/fontconfig] update to native build system (by @Neumann-A) + - [(#14946)](https://github.com/microsoft/vcpkg/pull/14946) [fontconfig] fix dll name in def file (by @Neumann-A) + - [(#15060)](https://github.com/microsoft/vcpkg/pull/15060) [fontconfig] Disable install data files (by @JackBoosY) + - [(#15144)](https://github.com/microsoft/vcpkg/pull/15144) [fontconfig] add vcpkg cmake wrapper. (by @Neumann-A) + - [(#15787)](https://github.com/microsoft/vcpkg/pull/15787) [ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (by @Sibras) + - [(#16905)](https://github.com/microsoft/vcpkg/pull/16905) [fontconfig] fixes for arm64-macos (by @abique) + - [(#17280)](https://github.com/microsoft/vcpkg/pull/17280) [fontconfig] Don't require uuid port for mingw (by @dg0yt) +- ignition-math6 `6.4.0#0` -> `6.6.0#0` + - [(#14324)](https://github.com/microsoft/vcpkg/pull/14324) [ignition] Updates on various pkgs ???? (by @ahoarau) +- args `2020-09-14#0` -> `2020-09-14#0` + - [(#16703)](https://github.com/microsoft/vcpkg/pull/16703) [args] update to latest version (by @Ryan-rsm-McKenzie) +- boost-hana `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- ecm `5.74.0#0` -> `5.74.0#0` + - [(#13467)](https://github.com/microsoft/vcpkg/pull/13467) [many ports] Update existing KF5 frameworks to 5.75 (by @wrobelda) +- tiny-process-library `2018-12-06#0` -> `2.0.4#0` + - [(#14732)](https://github.com/microsoft/vcpkg/pull/14732) [tiny-process-library] Bump tiny-process-library to 2.0.4 (by @traversaro) +- libconfig `1.7.2#3` -> `1.7.2#4` + - [(#15613)](https://github.com/microsoft/vcpkg/pull/15613) [libconfig] shlwapi is not available on linux (by @vmiheer) + - [(#15885)](https://github.com/microsoft/vcpkg/pull/15885) [libconfig] Fix libconfig when installing master branch (by @vmiheer) +- boost-chrono `1.75.0#0` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- celero `2.6.0-1#0` -> `2.7.2#0` + - [(#16446)](https://github.com/microsoft/vcpkg/pull/16446) [celero] Updated to v2.7.2 (by @DigitalInBlue) + - [(#16802)](https://github.com/microsoft/vcpkg/pull/16802) [celero] Updated to Celero v2.8.0 (by @DigitalInBlue) +- stlab `1.5.2-1#0` -> `1.6.2#0` + - [(#17239)](https://github.com/microsoft/vcpkg/pull/17239) [stlab] update to 1.6.2 (by @dittons) +- directxtk `jan2021#1` -> `apr2021#0` + - [(#14539)](https://github.com/microsoft/vcpkg/pull/14539) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version (by @RT222) + - [(#15210)](https://github.com/microsoft/vcpkg/pull/15210) Updated directxtk et al for cmake package support (by @walbourn) + - [(#15554)](https://github.com/microsoft/vcpkg/pull/15554) directxmesh, directxtex, and uvatlas now support linux (by @walbourn) + - [(#15639)](https://github.com/microsoft/vcpkg/pull/15639) directxtex, directxmesh, directxtk, uvatlas ports updated to fix cach??? (by @walbourn) + - [(#17123)](https://github.com/microsoft/vcpkg/pull/17123) [directxtex,directxmesh, directxtk, directxtk12, uvatlas] updated for April 2021 releases (by @walbourn) +- boost-outcome `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- qt5-webglplugin `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- cppzmq `4.7.1#0` -> `4.7.1#1` + - [(#14624)](https://github.com/microsoft/vcpkg/pull/14624) [cppzmq] Add draft feature (by @NancyLi1013) +- anyrpc `2020-01-13-1#0` -> `2020-01-13#0` + - [(#15030)](https://github.com/microsoft/vcpkg/pull/15030) [tcl, anyrpc, ois, osgearth] Build Fixes 2020-12-09 (by @BillyONeal) +- azure-macro-utils-c `2020-06-17-1#0` -> `2020-06-17#2` + - [(#14343)](https://github.com/microsoft/vcpkg/pull/14343) [vcpkg, azure-macro-utils-c] Fix SHA and add FILE_DISAMBIGUATOR for vcpkg_from_github (by @BillyONeal) +- boost-foreach `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- libgpod `2019-08-29#2` -> `2019-08-29#0` + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) +- antlr4 `4.8#1` -> `4.8#1` + - [(#15378)](https://github.com/microsoft/vcpkg/pull/15378) [antlr4,python3] Resolve cross port conflicts (by @BillyONeal) + - [(#16383)](https://github.com/microsoft/vcpkg/pull/16383) [antlr4] update to 4.9.1 (by @NickStrupat) +- boost-tti `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- qt5-mqtt `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- libebur128 `1.2.5#0` -> `1.2.5#0` + - [(#15988)](https://github.com/microsoft/vcpkg/pull/15988) [libebur128] add new port with version 1.2.5 (by @Be-ing) + - [(#16223)](https://github.com/microsoft/vcpkg/pull/16223) [libebur128] update to 1.2.6; fixes dynamic linking on Windows (by @Be-ing) +- boost-variant `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- boost-phoenix `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- gtest `1.10.0#2` -> `1.10.0#4` + - [(#15661)](https://github.com/microsoft/vcpkg/pull/15661) [gtest] Add a patch to fix build error in GCC 11 (by @PragmaTwice) + - [(#16071)](https://github.com/microsoft/vcpkg/pull/16071) [gtest] fix builds when using --head (by @sylveon) +- spatialite-tools `5.0.0#1` -> `5.0.0#7` + - [(#11776)](https://github.com/microsoft/vcpkg/pull/11776) [intl/gettext/fontconfig] update to native build system (by @Neumann-A) + - [(#14800)](https://github.com/microsoft/vcpkg/pull/14800) [Proj4] Update to 7.2.0 (by @longhuan2018) + - [(#15039)](https://github.com/microsoft/vcpkg/pull/15039) [spatialite-tools]update to 5.0.0 (by @longhuan2018) + - [(#15040)](https://github.com/microsoft/vcpkg/pull/15040) [libspatialite] Update 5.0.0 (by @longhuan2018) + - [(#15768)](https://github.com/microsoft/vcpkg/pull/15768) [vcpkg baseline][spatialite-tools] fix linux osx build falied (by @longhuan2018) + - [(#17025)](https://github.com/microsoft/vcpkg/pull/17025) Spatialite-tools remove cflags from vcpkg_configure_make options (by @xandox) +- libosip2 `5.1.0-4#0` -> `5.1.0-4#0` + - [(#17321)](https://github.com/microsoft/vcpkg/pull/17321) [libosip2] Update to 5.2.0 and add windows support (by @NancyLi1013) +- boost-scope-exit `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- kf5holidays `5.74.0#0` -> `5.74.0#0` + - [(#13467)](https://github.com/microsoft/vcpkg/pull/13467) [many ports] Update existing KF5 frameworks to 5.75 (by @wrobelda) +- qscintilla `2.11.4-2#0` -> `2.12.0#0` + - [(#16455)](https://github.com/microsoft/vcpkg/pull/16455) [qscintilla] Update to 2.12 (by @m-kuhn) +- netcdf-cxx4 `4.3.1#1` -> `4.3.1#2` + - [(#14405)](https://github.com/microsoft/vcpkg/pull/14405) [netcdf-cxx4] Export cmake targets (by @NancyLi1013) +- ashes `2020-10-21#0` -> `2021-02-09#0` + - [(#16148)](https://github.com/microsoft/vcpkg/pull/16148) [ashes] Update to 2021-09-02 (by @DragonJoker) +- boost-assert `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- ryu `2.0#0` -> `2.0#0` + - [(#16238)](https://github.com/microsoft/vcpkg/pull/16238) [ryu] added ryu_printf (by @georg-emg) + - [(#16858)](https://github.com/microsoft/vcpkg/pull/16858) [ryu] ryuConfig.cmake now selects the correct libraries when cross compiling (by @georg-emg) + - [(#17306)](https://github.com/microsoft/vcpkg/pull/17306) [ryu] fixed syntax error in ryuConfig.cmake (by @georg-emg) +- ms-gltf `r1.9.5.0#0` -> `r1.9.5.0#0` + - [(#14971)](https://github.com/microsoft/vcpkg/pull/14971) [ms-gltf] Add new port (by @luncliff) +- cuda `10.1#4` -> `10.1#7` + - [(#14880)](https://github.com/microsoft/vcpkg/pull/14880) [cuda] Add ENV CUDA_HOME to path hints (by @jacobkahn) + - [(#16413)](https://github.com/microsoft/vcpkg/pull/16413) [cudnn] auto-download only if cuda version matches (by @cenit) +- libosmscout `1.1.1#0` -> `1.1.1#0` + - [(#14485)](https://github.com/microsoft/vcpkg/pull/14485) [libosmscout] Add new port (by @OgreTransporter) +- nameof `0.9.4#0` -> `0.10.0#0` + - [(#15975)](https://github.com/microsoft/vcpkg/pull/15975) [nameof] Update to 0.10.0 (by @Neargye) +- cppunit `1.14.0-1#0` -> `1.15.1#0` + - [(#15018)](https://github.com/microsoft/vcpkg/pull/15018) [cppunit] add linux support and bump version to 1.15.1 (by @dweckmann) +- libgeotiff `1.6.0#1` -> `1.6.0#2` + - [(#15750)](https://github.com/microsoft/vcpkg/pull/15750) [libgeotiff] Fix packagename via find_package (by @NancyLi1013) + - [(#17206)](https://github.com/microsoft/vcpkg/pull/17206) [libgeotiff] Fix mingw build (by @dg0yt) +- freeimage `3.18.0#17` -> `3.18.0#19` + - [(#15393)](https://github.com/microsoft/vcpkg/pull/15393) [freeimage] Fix for FreeImage incorrect image format enum after disabling vendor plugins (by @giladbau) + - [(#15812)](https://github.com/microsoft/vcpkg/pull/15812) [freeimage] Fix plugin disable patch (by @JackBoosY) +- ctp `6.3.15_20190220_se#0` -> `6.3.15_20190220_se#1` + - [(#15183)](https://github.com/microsoft/vcpkg/pull/15183) [ctp] bugfix for linux-x64 and file name case sensitivity (by @xgao1023) +- sqlcipher `4.4.0#0` -> `4.4.1#0` + - [(#14677)](https://github.com/microsoft/vcpkg/pull/14677) [sqlcipher] Update to 4.4.1 (by @SvenPStarFinanz) + - [(#17501)](https://github.com/microsoft/vcpkg/pull/17501) [sqlcipher] update to 4.4.3 (#17500) (by @shiena) +- openh264 `#0` -> `#0` + - [(#16714)](https://github.com/microsoft/vcpkg/pull/16714) [openh264] Add openh264 port (by @RichLogan) +- tmx `1.0.0#2` -> `1.1.0#0` + - [(#15421)](https://github.com/microsoft/vcpkg/pull/15421) [tmx] Update tmx port to 1.1.0 (by @jarruda) +- boost-safe-numerics `1.74.0#1` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- boost-typeof `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- libevent `2.1.12#0` -> `2.1.12#1` + - [(#14805)](https://github.com/microsoft/vcpkg/pull/14805) [libevent] Fix library cannot be found (by @NancyLi1013) +- gloo `20201203#0` -> `20201203#0` + - [(#15219)](https://github.com/microsoft/vcpkg/pull/15219) [gloo] New Port (by @jacobkahn) +- knet `1.0.1#0` -> `1.0.1#0` + - [(#17170)](https://github.com/microsoft/vcpkg/pull/17170) [knet]Update to v1.0.2 (by @KibaAmor) +- comms-ublox `0.20.0#0` -> `0.20.0#0` + - [(#14523)](https://github.com/microsoft/vcpkg/pull/14523) [comms-ublox] added new port (by @mathisloge) + - [(#15138)](https://github.com/microsoft/vcpkg/pull/15138) [comms] update comms libs to latest version (by @mathisloge) + - [(#15159)](https://github.com/microsoft/vcpkg/pull/15159) [comms] fixes debug build configuration (by @mathisloge) +- soci `4.0.1#1` -> `4.0.1#1` + - [(#14646)](https://github.com/microsoft/vcpkg/pull/14646) [soci] Update to 4.0.1 (by @JonLiu1993) + - [(#15577)](https://github.com/microsoft/vcpkg/pull/15577) [SOCI] Add support for soci-mysql connector (by @emexal-company) + - [(#16296)](https://github.com/microsoft/vcpkg/pull/16296) [soci] Fix feature mysql (by @JackBoosY) + - [(#16369)](https://github.com/microsoft/vcpkg/pull/16369) [soci] Re-fix feature mysql (by @JackBoosY) +- azure-umqtt-c `2020-07-19#0` -> `2020-12-09#0` + - [(#15109)](https://github.com/microsoft/vcpkg/pull/15109) Azure-IoT-Sdk for C release 2020-12-09 (by @ewertons) +- xbyak `5.97#0` -> `5.991#0` + - [(#14782)](https://github.com/microsoft/vcpkg/pull/14782) [xbyak] update to 5.991 (by @Ryan-rsm-McKenzie) +- qt5-quickcontrols `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- qt5-connectivity `1#0` -> `1#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- boost-throw-exception `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- geos `3.8.1#1` -> `3.9.0#0` + - [(#16109)](https://github.com/microsoft/vcpkg/pull/16109) [geos] Update to 3.9.0 (by @JackBoosY) + - [(#16572)](https://github.com/microsoft/vcpkg/pull/16572) [geos] upgrade to 3.9.1 (by @m-kuhn) +- log4cpp `2.9.1#3` -> `2.9.1#4` + - [(#15650)](https://github.com/microsoft/vcpkg/pull/15650) [log4cpp] find_package support (by @mannkafai) +- dxsdk-d3dx `#0` -> `#0` + - [(#17175)](https://github.com/microsoft/vcpkg/pull/17175) [dxsdk-d3dx] Add new port (by @walbourn) +- pthreads `3.0.0-6#0` -> `3.0.0-6#0` + - [(#16348)](https://github.com/microsoft/vcpkg/pull/16348) [pthreads] support ARM arch and UWP platform (by @luncliff) + - [(#17011)](https://github.com/microsoft/vcpkg/pull/17011) [pthreads] Fix crt linkage (by @JackBoosY) + - [(#17318)](https://github.com/microsoft/vcpkg/pull/17318) [pthreads] Make port empty on mingw (by @dg0yt) +- angle `2020-05-15-1#0` -> `2020-05-15#2` + - [(#16733)](https://github.com/microsoft/vcpkg/pull/16733) [angle] Include EGL/eglext_angle.h in ANGLE (by @hanseuljun) +- x-plane `3.0.1-1#0` -> `3.0.3#0` + - [(#15244)](https://github.com/microsoft/vcpkg/pull/15244) [x-plane] Update to 3.0.3 (by @siavee) +- kinectsdk1 `1.8-2#0` -> `1.8#0` + - [(#15856)](https://github.com/microsoft/vcpkg/pull/15856) [kinectsdk1] Update hash (by @Cheney-W) +- lodepng-c `2021-03-01#0` -> `2021-03-01#0` + - [(#16408)](https://github.com/microsoft/vcpkg/pull/16408) [libtcod] Add new port. (by @HexDecimal) + - [(#17290)](https://github.com/microsoft/vcpkg/pull/17290) [lodepng-c] Disable parallel configure (by @JackBoosY) +- urdfdom `1.0.4#2` -> `1.0.4#3` + - [(#14324)](https://github.com/microsoft/vcpkg/pull/14324) [ignition] Updates on various pkgs ???? (by @ahoarau) +- shaderwriter `1.0.0#0` -> `1.0.0#0` + - [(#15948)](https://github.com/microsoft/vcpkg/pull/15948) [ shaderwriter ]Update to version 1.0.0 (by @DragonJoker) + - [(#17347)](https://github.com/microsoft/vcpkg/pull/17347) [shaderwriter] Update to version 1.1.0 (by @DragonJoker) +- libbson `1.16.1#1` -> `1.16.1#2` + - [(#13126)](https://github.com/microsoft/vcpkg/pull/13126) [vcpkg_fixup_pkgconfig] Handle spaces in path, do not validate individual libraries (by @ras0219) +- pcl `1.11.1#1` -> `1.11.1#2` + - [(#9231)](https://github.com/microsoft/vcpkg/pull/9231) [pcl] Add gcc version check (by @NancyLi1013) + - [(#14960)](https://github.com/microsoft/vcpkg/pull/14960) [pcl] Fix build when librealsense2 is present (by @dweckmann) + - [(#17437)](https://github.com/microsoft/vcpkg/pull/17437) [pcl] Fix qhul cannot be found (by @NancyLi1013) +- boost-core `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- wtl `10.0.10077#0` -> `10.0.10320#0` + - [(#15266)](https://github.com/microsoft/vcpkg/pull/15266) [wtl] Update wtl to 10.0.10320 (by @chrullrich) +- fribidi `1.0.10#1` -> `1.0.10#2` + - [(#12945)](https://github.com/microsoft/vcpkg/pull/12945) [meson|scripts] update scripts (by @Neumann-A) + - [(#15787)](https://github.com/microsoft/vcpkg/pull/15787) [ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (by @Sibras) +- xtl `0.6.18#0` -> `0.6.21#0` + - [(#14454)](https://github.com/microsoft/vcpkg/pull/14454) [xsimd][xtensor][xtl] Update to latest (by @SeekingMeaning) +- usockets `0.6.0#1` -> `0.6.0#1` + - [(#14935)](https://github.com/microsoft/vcpkg/pull/14935) [usockets] Fix build issue with feature ssl (by @PhoebeHui) + - [(#15743)](https://github.com/microsoft/vcpkg/pull/15743) [usockets] Update uSockets to the latest version (by @JonLiu1993) + - [(#16697)](https://github.com/microsoft/vcpkg/pull/16697) [uSockets] update to version 0.7.1 (by @Phantomouse) +- gdal `3.1.3#1` -> `3.1.3#14` + - [(#11776)](https://github.com/microsoft/vcpkg/pull/11776) [intl/gettext/fontconfig] update to native build system (by @Neumann-A) + - [(#13449)](https://github.com/microsoft/vcpkg/pull/13449) [gdal] Update to 3.1.3 (by @JackBoosY) + - [(#14866)](https://github.com/microsoft/vcpkg/pull/14866) [vcpkg baseline] [gdal] Fix build errors on linux and osx (by @PhoebeHui) + - [(#15292)](https://github.com/microsoft/vcpkg/pull/15292) [gdal] Update to 3.2.2 (by @longhuan2018) + - [(#15541)](https://github.com/microsoft/vcpkg/pull/15541) gdal:x64-windows-static-md fixes (by @ankurverma85) + - [(#16904)](https://github.com/microsoft/vcpkg/pull/16904) [vcpkg baseline][osgearth/gdal] Re-fix dependency gdal (by @JackBoosY) + - [(#17083)](https://github.com/microsoft/vcpkg/pull/17083) [vcpkg baseline][gdal] Fix configure error on OSX (by @JackBoosY) +- corrade `2020.06#0` -> `2020.06#0` + - [(#17356)](https://github.com/microsoft/vcpkg/pull/17356) [corrade] Fix VS2019 build error (by @NancyLi1013) +- mapbox-polylabel `#0` -> `#0` + - [(#16838)](https://github.com/microsoft/vcpkg/pull/16838) [mapbox-geometry,mapbox-polylabel,geojson-vt-cpp,geojson-cpp] new ports (by @mathisloge) +- boost-multi-index `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- azure-c-shared-utility `2020-07-19#0` -> `2020-12-09#1` + - [(#14750)](https://github.com/microsoft/vcpkg/pull/14750) [azure-kinect-sensor-sdk] not working on Linux (by @fran6co) + - [(#15109)](https://github.com/microsoft/vcpkg/pull/15109) Azure-IoT-Sdk for C release 2020-12-09 (by @ewertons) +- hypre `2.19.0#0` -> `2.19.0#0` + - [(#13448)](https://github.com/microsoft/vcpkg/pull/13448) [BLAS] add metaport (by @cenit) +- exprtk `2020-09-14#0` -> `2021-01-01#0` + - [(#16458)](https://github.com/microsoft/vcpkg/pull/16458) [exprtk] Update ExprTk (by @ArashPartow) +- bfgroup-lyra `1.5#0` -> `1.5#0` + - [(#16172)](https://github.com/microsoft/vcpkg/pull/16172) [bfgroup-lyra] Install CMake Targets (by @Hoikas) +- boost-vcpkg-helpers `7#1` -> `7#2` + - [(#14517)](https://github.com/microsoft/vcpkg/pull/14517) [boost] Install usage file (by @PhoebeHui) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- qt5-webview `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- qt5-charts `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- boost-winapi `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- poissonrecon `2019-09-15#0` -> `2019-09-15#0` + - [(#17370)](https://github.com/microsoft/vcpkg/pull/17370) [PoissonRecon] new port (by @fran6co) +- boost-log `1.75.0#2` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- boost-utility `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- oatpp-sqlite `1.2.0#0` -> `1.2.0#0` + - [(#14341)](https://github.com/microsoft/vcpkg/pull/14341) [oatpp] Add new port and vcpkg.json (by @mheyman) +- nng `1.3.2#0` -> `1.4.0#0` + - [(#16120)](https://github.com/microsoft/vcpkg/pull/16120) [nng] Update to v1.4.0 (by @jharmer95) +- tinygltf `2020-07-28#0` -> `2020-07-28#1` + - [(#17415)](https://github.com/microsoft/vcpkg/pull/17415) [tinygltf] fix json path (by @fran6co) +- azure-kinect-sensor-sdk `1.4.0-alpha.0#6` -> `1.4.1#0` + - [(#14246)](https://github.com/microsoft/vcpkg/pull/14246) [vcpkg baseline] Clean up baseline, use Keyword Supports Part 2 (by @JackBoosY) + - [(#14750)](https://github.com/microsoft/vcpkg/pull/14750) [azure-kinect-sensor-sdk] not working on Linux (by @fran6co) + - [(#16548)](https://github.com/microsoft/vcpkg/pull/16548) [Azure-Kinect-Sensor-SDK] update to 1.41 (by @JonLiu1993) +- kf5syntaxhighlighting `5.64.0-1#0` -> `5.64.0-1#0` + - [(#13467)](https://github.com/microsoft/vcpkg/pull/13467) [many ports] Update existing KF5 frameworks to 5.75 (by @wrobelda) +- readosm `1.1.0#3` -> `1.1.0a#0` + - [(#15038)](https://github.com/microsoft/vcpkg/pull/15038) [readosm] Update to 1.1.0a (by @longhuan2018) +- x265 `3.4#1` -> `3.4#4` + - [(#13126)](https://github.com/microsoft/vcpkg/pull/13126) [vcpkg_fixup_pkgconfig] Handle spaces in path, do not validate individual libraries (by @ras0219) + - [(#14556)](https://github.com/microsoft/vcpkg/pull/14556) [many ports] mingw support (by @longnguyen2004) + - [(#15787)](https://github.com/microsoft/vcpkg/pull/15787) [ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (by @Sibras) + - [(#17051)](https://github.com/microsoft/vcpkg/pull/17051) [x265] Allow release-only build. (by @matttyson) +- tensorflow-cc `2.3.1#1` -> `2.3.1#1` + - [(#13028)](https://github.com/microsoft/vcpkg/pull/13028) More or less completely rewritten tensorflow-cc port (by @jgehw) + - [(#14392)](https://github.com/microsoft/vcpkg/pull/14392) [tensorflow] Add C port (by @jgehw) + - [(#15354)](https://github.com/microsoft/vcpkg/pull/15354) [vcpkg] Fix unrecognized identifier errors in prbuild and cibuild. (by @BillyONeal) + - [(#16364)](https://github.com/microsoft/vcpkg/pull/16364) [tensorflow] upgrade to 2.4.1 (by @jgehw) +- qt5-doc `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- hunspell `1.7.0#2` -> `1.7.0#2` + - [(#14623)](https://github.com/microsoft/vcpkg/pull/14623) [hunspell] Avoid automatically added lib prefix (by @PhoebeHui) + - [(#17148)](https://github.com/microsoft/vcpkg/pull/17148) [hunspell] switch to make to enable build of hunspell tools (by @Neumann-A) +- geogram `1.7.5#2` -> `1.7.5#3` + - [(#13448)](https://github.com/microsoft/vcpkg/pull/13448) [BLAS] add metaport (by @cenit) + - [(#14962)](https://github.com/microsoft/vcpkg/pull/14962) [geogram] Fix windows dynamic build usage (by @FabienPean) +- gmime `3.2.6#1` -> `3.2.6#1` + - [(#11776)](https://github.com/microsoft/vcpkg/pull/11776) [intl/gettext/fontconfig] update to native build system (by @Neumann-A) + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) +- qt5 `5.15.1#1` -> `5.15.1#2` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) + - [(#15170)](https://github.com/microsoft/vcpkg/pull/15170) [qt5-base] mysql plugin added (by @jepessen) + - [(#15597)](https://github.com/microsoft/vcpkg/pull/15597) [qt5] Remove dependency qt5 feature mysqlplugin when building x86 (by @JackBoosY) +- oatpp-websocket `1.2.0#1` -> `1.2.0#0` + - [(#14341)](https://github.com/microsoft/vcpkg/pull/14341) [oatpp] Add new port and vcpkg.json (by @mheyman) +- chipmunk `7.0.3#0` -> `7.0.3#1` + - [(#14776)](https://github.com/microsoft/vcpkg/pull/14776) [Chipmunk] build via cmake (by @comedinha) +- libwebm `1.0.0.27-5#0` -> `1.0.0.27#6` + - [(#16398)](https://github.com/microsoft/vcpkg/pull/16398) [libwebm] apply upstream changes to support Android NDK r15b and later (by @jwtowner) +- scnlib `#0` -> `#0` + - [(#17242)](https://github.com/microsoft/vcpkg/pull/17242) [scnlib] Update the port of scnlib to 0.4 (by @QAston) +- sqlite3 `3.33.0#0` -> `3.33.0#0` + - [(#16125)](https://github.com/microsoft/vcpkg/pull/16125) [sqlite3] Update to 3.34.1 (by @past-due) + - [(#16679)](https://github.com/microsoft/vcpkg/pull/16679) [sqlite3] Update to 3.35.0 (by @kevinlul) + - [(#16834)](https://github.com/microsoft/vcpkg/pull/16834) [sqlite3] Update to 3.35.2 (by @past-due) + - [(#17067)](https://github.com/microsoft/vcpkg/pull/17067) [sqlite3] Update to 3.35.4 (by @past-due) +- grpc `1.33.1#1` -> `1.33.1#2` + - [(#14647)](https://github.com/microsoft/vcpkg/pull/14647) [abseil] Re-fix cxx 17 standard, add macro ABSL_USE_CXX17 (by @JackBoosY) + - [(#15307)](https://github.com/microsoft/vcpkg/pull/15307) [grpc] Build codegen on arm64-osx (by @lebdron) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) + - [(#17422)](https://github.com/microsoft/vcpkg/pull/17422) [grpc][upb] Update to newer versions (by @ras0219) + - [(#17496)](https://github.com/microsoft/vcpkg/pull/17496) [grpc] update to 1.37.0 (by @JonLiu1993) +- fltk `1.3.5#3` -> `1.3.5#0` + - [(#17094)](https://github.com/microsoft/vcpkg/pull/17094) [fltk] Fix link to system libs (by @JackBoosY) +- lapack-reference `3.8.0#3` -> `3.8.0#4` + - [(#13448)](https://github.com/microsoft/vcpkg/pull/13448) [BLAS] add metaport (by @cenit) + - [(#14816)](https://github.com/microsoft/vcpkg/pull/14816) [lapack-reference] add to CMAKE_FIND_LIBRARY_SUFFIXES additional suffixes (by @xandox) +- cudnn `7.6.5#1` -> `7.6.5#4` + - [(#14686)](https://github.com/microsoft/vcpkg/pull/14686) [cudnn] Try to find CUDNN locally before downloading (by @jacobkahn) + - [(#14736)](https://github.com/microsoft/vcpkg/pull/14736) [cudnn] Don't copy debug versions of the lib since they aren't provided (by @jacobkahn) + - [(#16413)](https://github.com/microsoft/vcpkg/pull/16413) [cudnn] auto-download only if cuda version matches (by @cenit) + - [(#17331)](https://github.com/microsoft/vcpkg/pull/17331) Update VMs, CMake to 3.20.1, CUDA to 11.3, and pwsh to 7.1.3 (by @BillyONeal) + - [(#17346)](https://github.com/microsoft/vcpkg/pull/17346) [cudnn] add other locations to find lib already installed (by @cenit) +- boost-filesystem `1.75.0#1` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- boost-coroutine2 `1.74.0#2` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- qt-advanced-docking-system `3.6.3#0` -> `3.6.3#1` + - [(#14714)](https://github.com/microsoft/vcpkg/pull/14714) [vcpkg baseline][qt-advanced-docking-system] Update hash (by @NancyLi1013) +- graphicsmagick `1.3.35#3` -> `1.3.35#3` + - [(#15245)](https://github.com/microsoft/vcpkg/pull/15245) [graphicsmagick] Add delegates.mgk (by @NancyLi1013) + - [(#15600)](https://github.com/microsoft/vcpkg/pull/15600) [graphicsmagick] update to version 1.3.36 (by @josuegomes) +- redis-plus-plus `1.2.1#0` -> `1.2.1#1` + - [(#14762)](https://github.com/microsoft/vcpkg/pull/14762) [redis-plus-plus] Add c++17 feature (by @JonLiu1993) +- ogre `1.12.9#0` -> `1.12.9#0` + - [(#14554)](https://github.com/microsoft/vcpkg/pull/14554) [assimp] Fix cmake config name and add cmake version (by @PhoebeHui) + - [(#15194)](https://github.com/microsoft/vcpkg/pull/15194) [ogre] make zziplib, freeimage, assimp, freetype and less strict resource manager as feature (by @dweckmann) + - [(#15789)](https://github.com/microsoft/vcpkg/pull/15789) [ogre] Do not use strict mode by default in ogre for backward compatibility (by @traversaro) +- boost-any `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- libpmemobj-cpp `1.11#0` -> `1.12#0` + - [(#16325)](https://github.com/microsoft/vcpkg/pull/16325) [libpmemobj-cpp] update to ver. 1.12 (by @JonLiu1993) +- aliyun-oss-c-sdk `3.10.0#0` -> `3.10.0#0` + - [(#14245)](https://github.com/microsoft/vcpkg/pull/14245) [vcpkg baseline] Clean up baseline, use Keyword Supports Part 1 (by @JackBoosY) +- boost-graph `1.75.0#0` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- vtk `9.0.1#2` -> `9.0.1#6` + - [(#15334)](https://github.com/microsoft/vcpkg/pull/15334) [freetype] Update to 2.10.4 (by @kevinlul) + - [(#15667)](https://github.com/microsoft/vcpkg/pull/15667) [vtk] use patch for QT_NO_KEYWORDS support from upstream (by @dweckmann) + - [(#16779)](https://github.com/microsoft/vcpkg/pull/16779) [vtk] Add support for unicode path for VTK reader/writer (by @robbie-li) + - [(#17015)](https://github.com/microsoft/vcpkg/pull/17015) [vtk] enables openvr module when openvr is listed (by @veggiesaurus) +- opencv4 `4.3.0#4` -> `4.3.0#5` + - [(#12785)](https://github.com/microsoft/vcpkg/pull/12785) [OpenCV] fix compatibility with VTK9 (by @cenit) + - [(#15089)](https://github.com/microsoft/vcpkg/pull/15089) [libarchive+tesseract+opencv] add missing libarchiveConfig.cmake, fix tesseract downstream and unblock opencv CI (by @cenit) + - [(#15162)](https://github.com/microsoft/vcpkg/pull/15162) [OpenCV] update to v4.5 and to v3.4.12 (by @cenit) + - [(#15788)](https://github.com/microsoft/vcpkg/pull/15788) [quirc, opencv4] Build fixes from 2021-01-18 build (by @BillyONeal) + - [(#15859)](https://github.com/microsoft/vcpkg/pull/15859) [OpenCV] bump to 4.5.1 and to 3.4.13 (by @cenit) + - [(#17354)](https://github.com/microsoft/vcpkg/pull/17354) [opencv4] Fix OPTIONS BUILD_opencv_gapi (by @NancyLi1013) +- implot `0.7#0` -> `0.8#0` + - [(#14380)](https://github.com/microsoft/vcpkg/pull/14380) [implot] Update to 0.8 (by @RT222) + - [(#16818)](https://github.com/microsoft/vcpkg/pull/16818) [implot] Update to 0.9 (by @RT222) +- boost-random `1.75.0#0` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- boost-build `1.75.0.beta1#1` -> `1.75.0#1` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15385)](https://github.com/microsoft/vcpkg/pull/15385) [boost-build] Fix cflags and c++flags for msvc (by @PhoebeHui) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16930)](https://github.com/microsoft/vcpkg/pull/16930) [boost-context] support android (by @huangqinjin) +- msix `1.7-2#0` -> `1.7-2#0` + - [(#16488)](https://github.com/microsoft/vcpkg/pull/16488) [msix] Add DISABLE_PARALLEL_CONFIGURE (by @NancyLi1013) +- boost-crc `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- mailio `#0` -> `#0` + - [(#16696)](https://github.com/microsoft/vcpkg/pull/16696) New port for mailio. (by @karastojko) + - [(#16789)](https://github.com/microsoft/vcpkg/pull/16789) [mailio] does not support uwp (by @autoantwort) +- mbedtls `2.24.0#1` -> `2.24.0#2` + - [(#15680)](https://github.com/microsoft/vcpkg/pull/15680) Fix Mbed TLS build for Android (by @ahmedyarub) + - [(#15687)](https://github.com/microsoft/vcpkg/pull/15687) [libssh] Add support for Android (by @ahmedyarub) +- openmama `6.3.1#0` -> `6.3.1#0` + - [(#16725)](https://github.com/microsoft/vcpkg/pull/16725) [openmama] Modify the output path of the common header file (by @Cheney-W) +- curl `7.74.0#1` -> `7.74.0#4` + - [(#14350)](https://github.com/microsoft/vcpkg/pull/14350) [curl] Fixes pkgconfig configuration file (by @Matioupi) + - [(#14473)](https://github.com/microsoft/vcpkg/pull/14473) [curl] Enable feature tool and install curl-config on non-Windows (by @JackBoosY) + - [(#14715)](https://github.com/microsoft/vcpkg/pull/14715) [curl] Fixes pkgconfig file (by @Matioupi) + - [(#14807)](https://github.com/microsoft/vcpkg/pull/14807) [curl] Add feature idn2 (by @JackBoosY) + - [(#15041)](https://github.com/microsoft/vcpkg/pull/15041) [curl] Update to 7.74.0 (by @nokutu) + - [(#15491)](https://github.com/microsoft/vcpkg/pull/15491) [vcpkg baseline][poppler] Fix issue with using libcurl. (by @Hoikas) + - [(#15725)](https://github.com/microsoft/vcpkg/pull/15725) [aws-cpp-sdk] [zlib] [openssl] [curl] Fix zlib, OpenSSL, curl and AWS SDK for Android (by @ahmedyarub) + - [(#15941)](https://github.com/microsoft/vcpkg/pull/15941) [curl] Fix/android curl debug bin (by @venabled) +- boost-algorithm `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- oatpp-libressl `1.2.0#1` -> `1.2.0#0` + - [(#14341)](https://github.com/microsoft/vcpkg/pull/14341) [oatpp] Add new port and vcpkg.json (by @mheyman) +- hidapi `0.10.1#0` -> `0.10.1#0` + - [(#15437)](https://github.com/microsoft/vcpkg/pull/15437) [hidapi] Support static build (by @PhoebeHui) + - [(#15485)](https://github.com/microsoft/vcpkg/pull/15485) Update to hidapi-0.10.1 (by @JoergAtGithub) + - [(#17231)](https://github.com/microsoft/vcpkg/pull/17231) [hidapi] Add support linux and osx (by @NancyLi1013) +- gtkmm `3.22.2#4` -> `3.22.2#5` + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) + - [(#15353)](https://github.com/microsoft/vcpkg/pull/15353) Build results from 2020-12-27 (by @BillyONeal) +- shaderc `2019-06-26-1#0` -> `2019-06-26#2` + - [(#16137)](https://github.com/microsoft/vcpkg/pull/16137) [shaderc] Use build type to build targets (by @JackBoosY) +- nsync `#0` -> `#0` + - [(#15714)](https://github.com/microsoft/vcpkg/pull/15714) [nsync] create a new port (by @luncliff) +- fast-cpp-csv-parser `2019-08-14#0` -> `2021-01-03#0` + - [(#15943)](https://github.com/microsoft/vcpkg/pull/15943) [fast-cpp-csv-parser ] Update to the latest commit: Fixes compiler warnings (by @remz1337) +- oatpp-curl `1.2.0#1` -> `1.2.0#2` + - [(#14341)](https://github.com/microsoft/vcpkg/pull/14341) [oatpp] Add new port and vcpkg.json (by @mheyman) + - [(#14385)](https://github.com/microsoft/vcpkg/pull/14385) [oatpp-curl] Fix curl dependency cannot be found (by @NancyLi1013) +- functions-framework-cpp `0.3.0#0` -> `0.3.0#0` + - [(#15989)](https://github.com/microsoft/vcpkg/pull/15989) [functions-framework-cpp] add new port with version 0.3.0 (by @coryan) + - [(#16163)](https://github.com/microsoft/vcpkg/pull/16163) [functions-framework-cpp] populate license field (by @coryan) + - [(#16178)](https://github.com/microsoft/vcpkg/pull/16178) [functions-framework-cpp] use 'version' for version numbers (by @coryan) + - [(#16307)](https://github.com/microsoft/vcpkg/pull/16307) [functions-framework-cpp] update to latest release (v0.4.0) (by @coryan) + - [(#16447)](https://github.com/microsoft/vcpkg/pull/16447) [functions-framework-cpp] update to latest release (v0.5.0) (by @coryan) +- suitesparse `5.8.0#0` -> `5.8.0#0` + - [(#15802)](https://github.com/microsoft/vcpkg/pull/15802) [ceres] Mark all dependencies REQUIRED (by @ras0219) +- ttauri `#0` -> `#0` + - [(#16749)](https://github.com/microsoft/vcpkg/pull/16749) [ttauri] Add new port (by @takev) +- cppgraphqlgen `2020-12-07#1` -> `2020-12-07#1` + - [(#14416)](https://github.com/microsoft/vcpkg/pull/14416) [cppgraphqlgen] Update to v3.2.4 (by @wravery) + - [(#14842)](https://github.com/microsoft/vcpkg/pull/14842) [cppgraphqlgen] Update to v3.3.0 (by @wravery) + - [(#15549)](https://github.com/microsoft/vcpkg/pull/15549) [cppgraphqlgen] Fix --head for new branch/option (by @wravery) + - [(#15701)](https://github.com/microsoft/vcpkg/pull/15701) [cppgraphqlgen] Update to 3.5.0 release (by @wravery) +- flatbuffers `1.12.0#1` -> `1.12.0#2` + - [(#15717)](https://github.com/microsoft/vcpkg/pull/15717) [mnn,flatbuffers] add a new port and patch (by @luncliff) + - [(#16843)](https://github.com/microsoft/vcpkg/pull/16843) [flatbuffers] support iOS triplets (by @luncliff) +- libass `0.14.0#0` -> `0.15.0#0` + - [(#14843)](https://github.com/microsoft/vcpkg/pull/14843) [vcpkg baseline] [libass] Fix dependency issue in Linux (by @PhoebeHui) + - [(#15213)](https://github.com/microsoft/vcpkg/pull/15213) [libass] Update to 0.15.0 (by @wangqr) + - [(#15263)](https://github.com/microsoft/vcpkg/pull/15263) [libass] update to 0.15.0 (by @JonLiu1993) +- ignition-msgs1 `1.0.0#2` -> `1.0.0#3` + - [(#14730)](https://github.com/microsoft/vcpkg/pull/14730) [ignition-msgs*] Fix flaky CI tests for ignition-msgs* ports (take 2) (by @traversaro) +- boost-stacktrace `1.75.0#1` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- jsoncons `0.158.0#0` -> `0.159.0#0` + - [(#14752)](https://github.com/microsoft/vcpkg/pull/14752) [jsoncons] Update to version 0.159.0 (by @danielaparker) + - [(#16227)](https://github.com/microsoft/vcpkg/pull/16227) [jsoncons] Update to version 0.162.0 (by @danielaparker) + - [(#16334)](https://github.com/microsoft/vcpkg/pull/16334) [jsoncons] Update to 0.162.1 (by @danielaparker) + - [(#16820)](https://github.com/microsoft/vcpkg/pull/16820) [jsoncons] Update to v0.163.0 (by @danielaparker) + - [(#17126)](https://github.com/microsoft/vcpkg/pull/17126) [jsoncons] Update to 0.163.1 (by @danielaparker) + - [(#17466)](https://github.com/microsoft/vcpkg/pull/17466) [jsoncons] Update to version 0.163.3 (by @danielaparker) +- boost-io `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- mnn `1.1.0#0` -> `1.1.0#0` + - [(#15717)](https://github.com/microsoft/vcpkg/pull/15717) [mnn,flatbuffers] add a new port and patch (by @luncliff) +- spdlog `1.8.0#1` -> `1.8.0#3` + - [(#16089)](https://github.com/microsoft/vcpkg/pull/16089) [spdlog] Support build shared library (by @JonLiu1993) + - [(#16819)](https://github.com/microsoft/vcpkg/pull/16819) [spdlog] Fix build for Android (by @ahmedyarub) + - [(#16870)](https://github.com/microsoft/vcpkg/pull/16870) [spdlog] Update to 1.8.5 (by @Ryan-rsm-McKenzie) + - [(#17152)](https://github.com/microsoft/vcpkg/pull/17152) [spdlog] Use external fmt header (by @NancyLi1013) + - [(#17511)](https://github.com/microsoft/vcpkg/pull/17511) [spdlog] Fix mingW build (by @JackBoosY) +- openssl `1.1.1j#1` -> `1.1.1j#5` + - [(#14308)](https://github.com/microsoft/vcpkg/pull/14308) [OpenSSL] refactor openssl ports. (by @Neumann-A) + - [(#14460)](https://github.com/microsoft/vcpkg/pull/14460) [szip, openssl] Fix problems with mingw (by @longnguyen2004) + - [(#14785)](https://github.com/microsoft/vcpkg/pull/14785) [openssl] Handle INSTALL_NAME_DIR and OSX_DEPLOYMENT_TARGET for macOS shared builds (by @LRFLEW) + - [(#15062)](https://github.com/microsoft/vcpkg/pull/15062) [openssl] Remove extra slashes when installing usage (by @JackBoosY) + - [(#15191)](https://github.com/microsoft/vcpkg/pull/15191) [openssl] install pkgconfig file (by @Perlmint) + - [(#15298)](https://github.com/microsoft/vcpkg/pull/15298) [openssl] Update to 1.1.1i (by @lebdron) + - [(#15725)](https://github.com/microsoft/vcpkg/pull/15725) [aws-cpp-sdk] [zlib] [openssl] [curl] Fix zlib, OpenSSL, curl and AWS SDK for Android (by @ahmedyarub) + - [(#16525)](https://github.com/microsoft/vcpkg/pull/16525) [openssl] update to 1.1.1j (by @metsma) + - [(#16937)](https://github.com/microsoft/vcpkg/pull/16937) [OpenSSL] Update to 1.1.1k (by @metsma) + - [(#17373)](https://github.com/microsoft/vcpkg/pull/17373) [openssl/unix] Run `make` with 'VCPKG_CONCURRENCY' parallelism (by @mschofie) +- sdl2-mixer `2.0.4#10` -> `2.0.4#0` + - [(#16737)](https://github.com/microsoft/vcpkg/pull/16737) [sdl2-mixer] Fix features link error (by @NancyLi1013) +- fp16 `#0` -> `#0` + - [(#16340)](https://github.com/microsoft/vcpkg/pull/16340) [fp16] create a new port (by @luncliff) +- mozjpeg `2020-06-02-1#0` -> `2020-06-02#2` + - [(#15196)](https://github.com/microsoft/vcpkg/pull/15196) [libjpeg-turbo/mozjpeg] Add conflict messages (by @NancyLi1013) +- argtable2 `8#0` -> `8#0` + - [(#14245)](https://github.com/microsoft/vcpkg/pull/14245) [vcpkg baseline] Clean up baseline, use Keyword Supports Part 1 (by @JackBoosY) +- breakpad `2020-09-14#1` -> `2020-09-14#2` + - [(#15092)](https://github.com/microsoft/vcpkg/pull/15092) [breakpad] Support breakpad_client on Linux & macOS (by @Perlmint) + - [(#16401)](https://github.com/microsoft/vcpkg/pull/16401) [breakpad] add support for Android triplets (by @jwtowner) +- zstr `1.0.1#0` -> `1.0.4#0` + - [(#14452)](https://github.com/microsoft/vcpkg/pull/14452) [zstr] update to 1.0.4 (by @SeekingMeaning) +- qt5-location `5.15.1#1` -> `5.15.1#2` + - [(#14644)](https://github.com/microsoft/vcpkg/pull/14644) [vcpkg baseline][qt5-location] Update patch (by @NancyLi1013) + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- physx `4.1.1#5` -> `4.1.1#7` + - [(#13849)](https://github.com/microsoft/vcpkg/pull/13849) [physx] Add support for Linux, macOS, and UWP (by @Hoikas) + - [(#15934)](https://github.com/microsoft/vcpkg/pull/15934) [physx] Use /Z7 instead of /Zi to integrate the debug info when building static (by @JackBoosY) + - [(#17453)](https://github.com/microsoft/vcpkg/pull/17453) [physx] Update to 4.1.2 (by @Hoikas) +- magnum `2020.06#1` -> `2020.06#5` + - [(#11225)](https://github.com/microsoft/vcpkg/pull/11225) [magnum] fixes adding any feature that depends on any other feature it will enable all the defaults (by @fran6co) + - [(#14383)](https://github.com/microsoft/vcpkg/pull/14383) [magnum] Removing quotes around tools list where vcpkg_copy_tools is involked (by @PhoebeHui) + - [(#15163)](https://github.com/microsoft/vcpkg/pull/15163) [magnum,magnum-plugins] Add vulkan and shaderconverter features (by @Squareys) + - [(#16245)](https://github.com/microsoft/vcpkg/pull/16245) [magnum,-plugins] Fix deployment of plugin types and incorrect removal of plugin lib dir on unix (by @Squareys) + - [(#17016)](https://github.com/microsoft/vcpkg/pull/17016) [magnum,-plugins] Fix deprecated use of vcpkg_check_features (by @Squareys) +- glslang `2019-03-05#2` -> `2019-03-05#2` + - [(#15624)](https://github.com/microsoft/vcpkg/pull/15624) [glslang] Provide glslang-default-resource-limits library. (by @wolfpld) + - [(#16037)](https://github.com/microsoft/vcpkg/pull/16037) [glslang] support iOS triplets (by @luncliff) +- kf5guiaddons `5.64.0#0` -> `5.64.0#0` + - [(#13467)](https://github.com/microsoft/vcpkg/pull/13467) [many ports] Update existing KF5 frameworks to 5.75 (by @wrobelda) +- directxtk12 `jan2021#1` -> `apr2021#0` + - [(#14539)](https://github.com/microsoft/vcpkg/pull/14539) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version (by @RT222) + - [(#15210)](https://github.com/microsoft/vcpkg/pull/15210) Updated directxtk et al for cmake package support (by @walbourn) + - [(#15554)](https://github.com/microsoft/vcpkg/pull/15554) directxmesh, directxtex, and uvatlas now support linux (by @walbourn) + - [(#15639)](https://github.com/microsoft/vcpkg/pull/15639) directxtex, directxmesh, directxtk, uvatlas ports updated to fix cach??? (by @walbourn) + - [(#17123)](https://github.com/microsoft/vcpkg/pull/17123) [directxtex,directxmesh, directxtk, directxtk12, uvatlas] updated for April 2021 releases (by @walbourn) +- rhash `1.3.9#0` -> `1.4.0#0` + - [(#13658)](https://github.com/microsoft/vcpkg/pull/13658) [rhash] Update to the latest version (by @LilyWangL) +- forge `1.0.5#0` -> `1.0.5#0` + - [(#17404)](https://github.com/microsoft/vcpkg/pull/17404) [forge] Fix usage (by @JackBoosY) +- kf5crash `5.64.0#0` -> `5.64.0#0` + - [(#13467)](https://github.com/microsoft/vcpkg/pull/13467) [many ports] Update existing KF5 frameworks to 5.75 (by @wrobelda) +- taskflow `2.6.0#0` -> `2.7.0#0` + - [(#15057)](https://github.com/microsoft/vcpkg/pull/15057) [taskflow] update port to v2.7.0 (by @remz1337) + - [(#15894)](https://github.com/microsoft/vcpkg/pull/15894) [taskflow] update to 3.0.0 (by @mfornace) + - [(#17407)](https://github.com/microsoft/vcpkg/pull/17407) [taskflow] update to 3.1.0 (by @JonLiu1993) +- pegtl `2020-12-07#0` -> `2020-12-07#0` + - [(#14841)](https://github.com/microsoft/vcpkg/pull/14841) [pegtl] Update to 3.0.0 release (by @wravery) + - [(#15186)](https://github.com/microsoft/vcpkg/pull/15186) [pegtl] Update to release version 3.1.0 (by @wravery) + - [(#15700)](https://github.com/microsoft/vcpkg/pull/15700) [pegtl] Update to 3.2.0 release (by @wravery) +- aubio `0.4.9#3` -> `0.4.9#0` + - [(#14246)](https://github.com/microsoft/vcpkg/pull/14246) [vcpkg baseline] Clean up baseline, use Keyword Supports Part 2 (by @JackBoosY) + - [(#16051)](https://github.com/microsoft/vcpkg/pull/16051) [aubio] allow to build without dependencies (by @autoantwort) +- munit `2019-04-06#0` -> `2019-04-06#1` + - [(#12945)](https://github.com/microsoft/vcpkg/pull/12945) [meson|scripts] update scripts (by @Neumann-A) +- rtaudio `5.1.0#0` -> `5.1.0#0` + - [(#14774)](https://github.com/microsoft/vcpkg/pull/14774) [rtaudio] Add new port (by @chausner) + - [(#16208)](https://github.com/microsoft/vcpkg/pull/16208) [rtaudio] Fix mingw, switch to rolling release (by @autoantwort) +- kf5coreaddons `5.64.0#0` -> `5.64.0#0` + - [(#13467)](https://github.com/microsoft/vcpkg/pull/13467) [many ports] Update existing KF5 frameworks to 5.75 (by @wrobelda) +- libmodplug `0.8.9.0#6` -> `0.8.9.0#7` + - [(#15787)](https://github.com/microsoft/vcpkg/pull/15787) [ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (by @Sibras) +- libogg `1.3.4#2` -> `1.3.4#3` + - [(#14556)](https://github.com/microsoft/vcpkg/pull/14556) [many ports] mingw support (by @longnguyen2004) +- urho3d `#0` -> `#0` + - [(#14538)](https://github.com/microsoft/vcpkg/pull/14538) [urho3d] Add new port (by @koprok) +- wxchartdir `1.0.0#0` -> `1.0.0#0` + - [(#13361)](https://github.com/microsoft/vcpkg/pull/13361) [wxwidgets] Fix #4756 (by @ras0219) +- c-ares `1.17.1#0` -> `1.17.1#0` + - [(#14863)](https://github.com/microsoft/vcpkg/pull/14863) [c-ares] Update to 1.17.1. (by @geraldcombs) + - [(#17230)](https://github.com/microsoft/vcpkg/pull/17230) [c-ares] Fix definition on static build, add options to disable tools and tests (by @JackBoosY) +- libidn2 `2.2.0#0` -> `2.3.0#1` + - [(#11776)](https://github.com/microsoft/vcpkg/pull/11776) [intl/gettext/fontconfig] update to native build system (by @Neumann-A) + - [(#14540)](https://github.com/microsoft/vcpkg/pull/14540) [libidn2] Update to version 2.3.0 (by @lazyhamster) + - [(#15868)](https://github.com/microsoft/vcpkg/pull/15868) [libidn2] Fix cross-compile (non-Windows) (by @past-due) + - [(#17419)](https://github.com/microsoft/vcpkg/pull/17419) [Libidn2] disable documentation (by @xandox) +- qt5-x11extras `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- reproc `14.1.0#0` -> `14.2.1#0` + - [(#15751)](https://github.com/microsoft/vcpkg/pull/15751) [reproc] update to 14.2.1 (by @JonLiu1993) +- boost-interval `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- qt5-quickcontrols2 `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- otl `4.0.455#0` -> `4.0.455#1` + - [(#16289)](https://github.com/microsoft/vcpkg/pull/16289) [vcpkg baseline][ktx/otl] Update download hash (by @JackBoosY) +- ixwebsocket `11.0.4#0` -> `11.0.4#0` + - [(#15394)](https://github.com/microsoft/vcpkg/pull/15394) [IXWebsocket ] Upgraded to 11.0.4 version (by @ludekvodicka) + - [(#16710)](https://github.com/microsoft/vcpkg/pull/16710) [ixwebsocket] Fix cmake-configure files install path (by @NancyLi1013) + - [(#16856)](https://github.com/microsoft/vcpkg/pull/16856) [ixwebsocket] update to 11.2.3 (by @bsergean) +- boost-compute `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- comms `3.1.3#0` -> `3.1.3#0` + - [(#14195)](https://github.com/microsoft/vcpkg/pull/14195) [comms] Add new ports (by @mathisloge) + - [(#14521)](https://github.com/microsoft/vcpkg/pull/14521) [comms ] update to the next version (by @mathisloge) + - [(#15138)](https://github.com/microsoft/vcpkg/pull/15138) [comms] update comms libs to latest version (by @mathisloge) + - [(#15159)](https://github.com/microsoft/vcpkg/pull/15159) [comms] fixes debug build configuration (by @mathisloge) + - [(#16415)](https://github.com/microsoft/vcpkg/pull/16415) [comms, commsdsl] update ports (by @mathisloge) + - [(#17581)](https://github.com/microsoft/vcpkg/pull/17581) [comms,commsdsl] update ports (by @mathisloge) +- glib `2.52.3#23` -> `2.52.3#27` + - [(#11776)](https://github.com/microsoft/vcpkg/pull/11776) [intl/gettext/fontconfig] update to native build system (by @Neumann-A) + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) + - [(#14988)](https://github.com/microsoft/vcpkg/pull/14988) [GLIBMM] Installing .pc file (by @faserg1) + - [(#15360)](https://github.com/microsoft/vcpkg/pull/15360) [glib] Fix pkgconfig files (by @PhoebeHui) + - [(#17117)](https://github.com/microsoft/vcpkg/pull/17117) [glib] fix build error for x64-linux-dynamic (by @kwiechen) + - [(#17197)](https://github.com/microsoft/vcpkg/pull/17197) sync GLIB_DLL_SUFFIX with pkgconfig (by @kwiechen) +- dxut `11.14#0` -> `11.14#0` + - [(#15788)](https://github.com/microsoft/vcpkg/pull/15788) [quirc, opencv4] Build fixes from 2021-01-18 build (by @BillyONeal) + - [(#16101)](https://github.com/microsoft/vcpkg/pull/16101) Update DXUT port and add Effects11 (FX) port (by @walbourn) +- boost-iostreams `1.75.0#1` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- directxtex `jan2021#2` -> `apr2021#0` + - [(#14539)](https://github.com/microsoft/vcpkg/pull/14539) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version (by @RT222) + - [(#15210)](https://github.com/microsoft/vcpkg/pull/15210) Updated directxtk et al for cmake package support (by @walbourn) + - [(#15554)](https://github.com/microsoft/vcpkg/pull/15554) directxmesh, directxtex, and uvatlas now support linux (by @walbourn) + - [(#15639)](https://github.com/microsoft/vcpkg/pull/15639) directxtex, directxmesh, directxtk, uvatlas ports updated to fix cach??? (by @walbourn) + - [(#17123)](https://github.com/microsoft/vcpkg/pull/17123) [directxtex,directxmesh, directxtk, directxtk12, uvatlas] updated for April 2021 releases (by @walbourn) +- opencv3 `3.4.10#2` -> `3.4.10#5` + - [(#12785)](https://github.com/microsoft/vcpkg/pull/12785) [OpenCV] fix compatibility with VTK9 (by @cenit) + - [(#15089)](https://github.com/microsoft/vcpkg/pull/15089) [libarchive+tesseract+opencv] add missing libarchiveConfig.cmake, fix tesseract downstream and unblock opencv CI (by @cenit) + - [(#15162)](https://github.com/microsoft/vcpkg/pull/15162) [OpenCV] update to v4.5 and to v3.4.12 (by @cenit) + - [(#15788)](https://github.com/microsoft/vcpkg/pull/15788) [quirc, opencv4] Build fixes from 2021-01-18 build (by @BillyONeal) + - [(#15859)](https://github.com/microsoft/vcpkg/pull/15859) [OpenCV] bump to 4.5.1 and to 3.4.13 (by @cenit) +- libusb `1.0.24#3` -> `3#0` + - [(#15692)](https://github.com/microsoft/vcpkg/pull/15692) update libusb to 1.0.24 (by @matwey) + - [(#16839)](https://github.com/microsoft/vcpkg/pull/16839) [libusb] Fix the support for Visual Studio 2019 (by @NancyLi1013) +- sundials `3.1.1-2#0` -> `5.5.0#0` + - [(#14618)](https://github.com/microsoft/vcpkg/pull/14618) [SUNDIALS] Update to 5.5.0 (by @JonLiu1993) + - [(#16705)](https://github.com/microsoft/vcpkg/pull/16705) [sundials] Update to 5.7.0 and also update repository (by @NancyLi1013) +- fmt `0#0` -> `0#0` + - [(#14372)](https://github.com/microsoft/vcpkg/pull/14372) [fmt] update to 7.1.1 (by @bl-ue) + - [(#14413)](https://github.com/microsoft/vcpkg/pull/14413) [fmt] update to 7.1.2 (by @bl-ue) + - [(#14786)](https://github.com/microsoft/vcpkg/pull/14786) [fmt] Update to 7.1.3 (by @kevinlul) + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16766)](https://github.com/microsoft/vcpkg/pull/16766) [fmt] Fix build error when building arm64-uwp (by @JackBoosY) + - [(#16774)](https://github.com/microsoft/vcpkg/pull/16774) [ci,vcpkg-cmake-*] remove host-only nature of vcpkg-cmake-* ports (by @strega-nil) + - [(#17279)](https://github.com/microsoft/vcpkg/pull/17279) [fmt] Update usage (by @NancyLi1013) +- simage `1.8.0#0` -> `1.8.0#1` + - [(#15683)](https://github.com/microsoft/vcpkg/pull/15683) [simage] Fix optional dependencies (by @ras0219-msft) +- libqcow `20200928#0` -> `20210419#0` + - [(#17525)](https://github.com/microsoft/vcpkg/pull/17525) [libqcow] Fix build issues by updating to 20210419 (by @AlexAltea) +- boost-thread `1.75.0#0` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- atk `2.24.0-5#1` -> `2.24.0-5#2` + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) + - [(#14246)](https://github.com/microsoft/vcpkg/pull/14246) [vcpkg baseline] Clean up baseline, use Keyword Supports Part 2 (by @JackBoosY) + - [(#14972)](https://github.com/microsoft/vcpkg/pull/14972) [ATK] Installing .pc files (by @faserg1) + - [(#15353)](https://github.com/microsoft/vcpkg/pull/15353) Build results from 2020-12-27 (by @BillyONeal) +- avisynthplus `3.6.0#0` -> `3.6.1#0` + - [(#15214)](https://github.com/microsoft/vcpkg/pull/15214) [avisynthplus] Update to 3.6.1 (by @wangqr) + - [(#17221)](https://github.com/microsoft/vcpkg/pull/17221) [avisynthplus] Update to 3.7.0 (by @wangqr) +- krabsetw `4.1.13#0` -> `4.1.14#0` + - [(#14443)](https://github.com/microsoft/vcpkg/pull/14443) [krabsetw] Update to 4.1.14 (by @jrave) + - [(#16576)](https://github.com/microsoft/vcpkg/pull/16576) [krabsetw] Update krabsetw to 4.1.18 (by @jrave) +- xalan-c `1.11-12#0` -> `1.11-12#0` + - [(#17256)](https://github.com/microsoft/vcpkg/pull/17256) [Xalan-C] update to 1.12 (by @JonLiu1993) +- boost-spirit `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- boost-circular-buffer `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- igraph `#0` -> `#0` + - [(#17311)](https://github.com/microsoft/vcpkg/pull/17311) [igraph] create new port (by @szhorvat) +- flashlight-cuda `20201201#0` -> `20201201#0` + - [(#14676)](https://github.com/microsoft/vcpkg/pull/14676) [flashlight-cuda] New Port (by @jacobkahn) + - [(#14912)](https://github.com/microsoft/vcpkg/pull/14912) [flashlight-cuda] Add stb as dependency, bump port commit (by @jacobkahn) + - [(#15379)](https://github.com/microsoft/vcpkg/pull/15379) [flashlight-cuda] Update port (by @jacobkahn) + - [(#15514)](https://github.com/microsoft/vcpkg/pull/15514) [flashlight-cpu] New port (by @jacobkahn) + - [(#17378)](https://github.com/microsoft/vcpkg/pull/17378) [flashlight-cuda] update port to v0.3 (by @jacobkahn) +- boost-fusion `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- boost-nowide `1.75.0#0` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- vcpkg-cmake-config `#0` -> `#0` + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16774)](https://github.com/microsoft/vcpkg/pull/16774) [ci,vcpkg-cmake-*] remove host-only nature of vcpkg-cmake-* ports (by @strega-nil) +- boost-conversion `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- paho-mqtt `1.3.1#0` -> `1.3.5#0` + - [(#13680)](https://github.com/microsoft/vcpkg/pull/13680) [paho-mqtt] Update to version 1.3.5 (by @LilyWangL) + - [(#15569)](https://github.com/microsoft/vcpkg/pull/15569) [paho-mqtt] update to 1.3.8 (by @JonLiu1993) +- boost-detail `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- xorstr `2020-02-11#0` -> `2020-02-11#0` + - [(#15721)](https://github.com/microsoft/vcpkg/pull/15721) [xorstr] Update to 2020-11-29 (by @ghost) +- benchmark `1.5.2#0` -> `1.5.2#0` + - [(#14246)](https://github.com/microsoft/vcpkg/pull/14246) [vcpkg baseline] Clean up baseline, use Keyword Supports Part 2 (by @JackBoosY) +- cwalk `1.2.5#0` -> `1.2.5#0` + - [(#14801)](https://github.com/microsoft/vcpkg/pull/14801) [cwalk] Add new port (by @likle) +- mpfr `4.0.2-2#0` -> `4.1.0#0` + - [(#13081)](https://github.com/microsoft/vcpkg/pull/13081) [mpc/mpfr] Add new port / update mpfr (by @Neumann-A) +- xlnt `1.5.0#0` -> `1.5.0#1` + - [(#15645)](https://github.com/microsoft/vcpkg/pull/15645) [xlnt] Prevent macro redefinition (by @malirod) +- glfw3 `3.3.2#1` -> `3.3.2#1` + - [(#16166)](https://github.com/microsoft/vcpkg/pull/16166) [glfw3/glew] Fix pkgconfig (by @JackBoosY) + - [(#16892)](https://github.com/microsoft/vcpkg/pull/16892) [glfw3] Update to version 3.3.3 (by @barcharcraz) +- urdfdom-headers `1.0.5#0` -> `1.0.5#1` + - [(#14324)](https://github.com/microsoft/vcpkg/pull/14324) [ignition] Updates on various pkgs ???? (by @ahoarau) +- libftdi1 `1.4-1#0` -> `1.4-1#0` + - [(#15918)](https://github.com/microsoft/vcpkg/pull/15918) [libftdi1] update to 1.5 (#15917) (by @eloc3147) +- woff2 `1.0.2#0` -> `1.0.2#1` + - [(#16392)](https://github.com/microsoft/vcpkg/pull/16392) [woff2] fix for static linking and alternative compiler toolchains (by @jwtowner) +- openjpeg `2.3.1#2` -> `2.3.1#0` + - [(#15787)](https://github.com/microsoft/vcpkg/pull/15787) [ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (by @Sibras) + - [(#16661)](https://github.com/microsoft/vcpkg/pull/16661) [openjpeg] 16645 Fix compile w/features jp3d,jpip,jpwl,mj2 triplet x64-windows VS 2019 ver 16.9.1 (by @StarGate-One) +- pangolin `0.5#11` -> `0.5#12` + - [(#15593)](https://github.com/microsoft/vcpkg/pull/15593) [pangolin] Fix static build error (by @NancyLi1013) + - [(#15787)](https://github.com/microsoft/vcpkg/pull/15787) [ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (by @Sibras) + - [(#17014)](https://github.com/microsoft/vcpkg/pull/17014) [vcpkg baseline][pangolin] Add options to dependencies to avoid finding them automatically (by @JackBoosY) + - [(#17250)](https://github.com/microsoft/vcpkg/pull/17250) [vcpkg baseline][pangolin] Set CMAKE_DISABLE_FIND_PACKAGE_XX to ON (by @PhoebeHui) +- soil `2008.07.07-2#0` -> `2008.07.07-2#0` + - [(#17012)](https://github.com/microsoft/vcpkg/pull/17012) [soil] Update repository (by @NancyLi1013) +- boost-dynamic-bitset `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- libplist `1.3.6#0` -> `1.3.6#0` + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) +- boost-qvm `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- bcg729 `1.1.1#0` -> `1.1.1#0` + - [(#15322)](https://github.com/microsoft/vcpkg/pull/15322) [bcg729] New port (by @geraldcombs) +- monkeys-audio `5.48#0` -> `5.59#0` + - [(#14586)](https://github.com/microsoft/vcpkg/pull/14586) [vcpkg baseline][monkeys-audio] Update to 5.59 (by @NancyLi1013) + - [(#14913)](https://github.com/microsoft/vcpkg/pull/14913) [vcpkg baseline][monkeys-audio] Update to 565d. (by @Hoikas) + - [(#15359)](https://github.com/microsoft/vcpkg/pull/15359) [monkeys-audio] Update to 5.70 (by @c72578) +- sobjectizer `5.7.1#0` -> `5.7.2#0` + - [(#14844)](https://github.com/microsoft/vcpkg/pull/14844) [sobjectizer] update to v.5.7.2 (by @eao197) + - [(#15182)](https://github.com/microsoft/vcpkg/pull/15182) [sobjectizer] update to v.5.7.2.1 (by @eao197) + - [(#16230)](https://github.com/microsoft/vcpkg/pull/16230) [sobjectizer] update to v.5.7.2.2 (by @eao197) + - [(#16470)](https://github.com/microsoft/vcpkg/pull/16470) [sobjectizer] update to v5.7.2.3 (by @eao197) +- boost-multi-array `1.74.0#1` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- onednn `2.0#0` -> `2.0#0` + - [(#15068)](https://github.com/microsoft/vcpkg/pull/15068) [oneDNN] New port (by @jacobkahn) + - [(#15372)](https://github.com/microsoft/vcpkg/pull/15372) [onednn] Fix share path infix to match find_package() name (by @jacobkahn) +- ktx `4.0.0-beta5#0` -> `4.0.0-beta5#0` + - [(#15336)](https://github.com/microsoft/vcpkg/pull/15336) [KTX] Add port (by @stephenjust) + - [(#16289)](https://github.com/microsoft/vcpkg/pull/16289) [vcpkg baseline][ktx/otl] Update download hash (by @JackBoosY) +- magnum-plugins `2020.06#1` -> `2020.06#5` + - [(#15163)](https://github.com/microsoft/vcpkg/pull/15163) [magnum,magnum-plugins] Add vulkan and shaderconverter features (by @Squareys) + - [(#16245)](https://github.com/microsoft/vcpkg/pull/16245) [magnum,-plugins] Fix deployment of plugin types and incorrect removal of plugin lib dir on unix (by @Squareys) + - [(#16657)](https://github.com/microsoft/vcpkg/pull/16657) [magnum/magnum-plugins] fix magnum-plugins building all magnum dependencies (by @fran6co) + - [(#17016)](https://github.com/microsoft/vcpkg/pull/17016) [magnum,-plugins] Fix deprecated use of vcpkg_check_features (by @Squareys) +- kf5itemmodels `5.64.0#0` -> `5.64.0#0` + - [(#13467)](https://github.com/microsoft/vcpkg/pull/13467) [many ports] Update existing KF5 frameworks to 5.75 (by @wrobelda) +- parmetis `4.0.3-3#0` -> `4.0.3#4` + - [(#17410)](https://github.com/microsoft/vcpkg/pull/17410) [parmetis] Fix build on x64-linux. (by @grospelliergilles) +- string-theory `3.3#0` -> `3.4#0` + - [(#14439)](https://github.com/microsoft/vcpkg/pull/14439) [string-theory] Update to 3.4 (by @zrax) +- wt `4.4.0#0` -> `4.5.0#0` + - [(#15136)](https://github.com/microsoft/vcpkg/pull/15136) [wt] Update to 4.5.0 (by @RockinRoel) +- kf5widgetsaddons `5.64.0#0` -> `5.64.0#0` + - [(#13467)](https://github.com/microsoft/vcpkg/pull/13467) [many ports] Update existing KF5 frameworks to 5.75 (by @wrobelda) +- matroska `1.6.2#0` -> `1.6.2#0` + - [(#14794)](https://github.com/microsoft/vcpkg/pull/14794) [ebml/gppanel/matroska/polyhook2/unrar] Fix typos in CONTROL files (by @NancyLi1013) +- libbacktrace `#0` -> `#0` + - [(#16693)](https://github.com/microsoft/vcpkg/pull/16693) [libbacktrace] new port (by @autoantwort) +- boost-ublas `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- seal `3.5.9#0` -> `3.6.0#0` + - [(#14576)](https://github.com/microsoft/vcpkg/pull/14576) [seal] Update to version 3.6.0. Changed default features. (by @WeiDaiWD) + - [(#15015)](https://github.com/microsoft/vcpkg/pull/15015) [seal] Update to SEAL 3.6.1 (by @kiromaru) + - [(#16379)](https://github.com/microsoft/vcpkg/pull/16379) [seal] Updated SEAL version to 3.6.2. (by @WeiDaiWD) +- gts `0.7.6-3#0` -> `0.7.6-3#0` + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) +- boost-math `1.75.0#0` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- pybind11 `2.6.0#1` -> `2.6.0#3` + - [(#14510)](https://github.com/microsoft/vcpkg/pull/14510) [python3] Upgrade to 3.9.0 (by @Hoikas) + - [(#15221)](https://github.com/microsoft/vcpkg/pull/15221) [python3] Add vcpkg-cmake-wrapper. (by @Hoikas) + - [(#15507)](https://github.com/microsoft/vcpkg/pull/15507) [pybind11] Use vcpkg Python3. (by @Hoikas) +- ignition-cmake2 `2.2.0-1#0` -> `2.5.0#0` + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) + - [(#14324)](https://github.com/microsoft/vcpkg/pull/14324) [ignition] Updates on various pkgs ???? (by @ahoarau) +- marble `19.08.2#0` -> `19.08.2#0` + - [(#17341)](https://github.com/microsoft/vcpkg/pull/17341) [vcpkg baseline][marble] Disable find I18n (by @JackBoosY) + - [(#17492)](https://github.com/microsoft/vcpkg/pull/17492) [vcpkg baseline][marble] Disable dependency KF5 (by @JackBoosY) +- libtasn1 `#0` -> `#0` + - [(#14242)](https://github.com/microsoft/vcpkg/pull/14242) [many ports] Add GnuTLS and its dependencies (by @wrobelda) + - [(#17420)](https://github.com/microsoft/vcpkg/pull/17420) [Libtasn1] disable documentation (by @xandox) +- hdf5 `1.12.0#0` -> `1.12.0#1` + - [(#17371)](https://github.com/microsoft/vcpkg/pull/17371) [hdf5] threadsafe support (by @Thieum) +- prometheus-cpp `0.10.0#0` -> `0.11.0#0` + - [(#14792)](https://github.com/microsoft/vcpkg/pull/14792) [prometheus-cpp] Update to version 0.11.0 (by @gjasny) + - [(#16057)](https://github.com/microsoft/vcpkg/pull/16057) [prometheus-cpp] Update to version 0.12.1 (by @gjasny) + - [(#16643)](https://github.com/microsoft/vcpkg/pull/16643) [prometheus-cpp] Update to version 0.12.2 (by @gjasny) +- lcm `1.4.0#1` -> `1.4.0#0` + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) +- oatpp-mbedtls `1.2.0#1` -> `1.2.0#0` + - [(#14341)](https://github.com/microsoft/vcpkg/pull/14341) [oatpp] Add new port and vcpkg.json (by @mheyman) +- wangle `2020.10.19.00#0` -> `2020.10.19.00#1` + - [(#15400)](https://github.com/microsoft/vcpkg/pull/15400) [wangle] Fix dependency issue (by @PhoebeHui) +- spirv-headers `1.5.1#0` -> `1.5.1#0` + - [(#15831)](https://github.com/microsoft/vcpkg/pull/15831) [spirv-cross,spirv-headers,spirv-tools] 2021-01-15 update (by @barcharcraz) +- date `3.0.0#1` -> `3.0.0#2` + - [(#15994)](https://github.com/microsoft/vcpkg/pull/15994) [date] Fix vcpkg_fixup_cmake_targets for mingw (by @longnguyen2004) +- mapbox-geometry `#0` -> `#0` + - [(#16838)](https://github.com/microsoft/vcpkg/pull/16838) [mapbox-geometry,mapbox-polylabel,geojson-vt-cpp,geojson-cpp] new ports (by @mathisloge) +- boost-container-hash `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- boost-logic `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- concurrentqueue `1.0.2#0` -> `1.0.2#0` + - [(#16404)](https://github.com/microsoft/vcpkg/pull/16404) [concurrentqueue] Update to 1.0.3 (by @JonLiu1993) +- dmlc `2019-08-12-4#0` -> `2019-08-12#5` + - [(#15089)](https://github.com/microsoft/vcpkg/pull/15089) [libarchive+tesseract+opencv] add missing libarchiveConfig.cmake, fix tesseract downstream and unblock opencv CI (by @cenit) +- libjpeg-turbo `2.0.5#1` -> `2.0.5#4` + - [(#14483)](https://github.com/microsoft/vcpkg/pull/14483) [libjpeg-turbo] Enabled jpeg7 and jpeg8 APIs (by @Ziriax) + - [(#15196)](https://github.com/microsoft/vcpkg/pull/15196) [libjpeg-turbo/mozjpeg] Add conflict messages (by @NancyLi1013) + - [(#15234)](https://github.com/microsoft/vcpkg/pull/15234) [libjpeg-turbo] fix incompatibility for c11 and c17 (by @playgithub) + - [(#15735)](https://github.com/microsoft/vcpkg/pull/15735) [libjepg-turbo] Fix *.pc files (by @Neumann-A) + - [(#15936)](https://github.com/microsoft/vcpkg/pull/15936) [libjpeg-turbo] update to 2.0.6 (by @JonLiu1993) +- sdl2 `2.0.14#0` -> `2.0.14#0` + - [(#14417)](https://github.com/microsoft/vcpkg/pull/14417) [sdl2] apply upstream patch to fix macos vulkan fixes #13773 (by @jhs67) + - [(#14992)](https://github.com/microsoft/vcpkg/pull/14992) [sdl2] Don't propagate shared link options (by @JesseFarebro) + - [(#15398)](https://github.com/microsoft/vcpkg/pull/15398) [sdl2] Update to 2.0.14 (by @RT222) + - [(#15540)](https://github.com/microsoft/vcpkg/pull/15540) [sdl2] Fix improper replacement of -lSDL2main + remove IGNORE_FLAGS and SYSTEM_LIBRARIES (by @longnguyen2004) + - [(#16033)](https://github.com/microsoft/vcpkg/pull/16033) [sdl2] Fix vulkan feature dependencies (by @past-due) + - [(#16370)](https://github.com/microsoft/vcpkg/pull/16370) [sdl2] Update patch (by @NancyLi1013) + - [(#17106)](https://github.com/microsoft/vcpkg/pull/17106) [sdl2] Fix pthread detection on macOS (by @past-due) +- boost-mp11 `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- nnpack `#0` -> `#0` + - [(#16344)](https://github.com/microsoft/vcpkg/pull/16344) [nnpack] create a new port (by @luncliff) +- qt5-winextras `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- nana `1.7.4#0` -> `1.7.4#1` + - [(#15595)](https://github.com/microsoft/vcpkg/pull/15595) [nana] Fix fontconfig dependency (by @NancyLi1013) +- boost-tokenizer `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- boost-mpi `1.75.0#1` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- xmlsec `1.2.30#1` -> `1.2.30#1` + - [(#11776)](https://github.com/microsoft/vcpkg/pull/11776) [intl/gettext/fontconfig] update to native build system (by @Neumann-A) + - [(#14587)](https://github.com/microsoft/vcpkg/pull/14587) [xmlsec] Update to 1.2.31 (by @SvenPStarFinanz) +- boost-parameter-python `1.74.0#2` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- winreg `3.1.0#0` -> `4.0.0#0` + - [(#16765)](https://github.com/microsoft/vcpkg/pull/16765) [WinReg] update to v4.0.0 (by @JonLiu1993) + - [(#16871)](https://github.com/microsoft/vcpkg/pull/16871) [WinReg] Update to v4.1.0 (by @JonLiu1993) +- pkgconf `#0` -> `#0` + - [(#17488)](https://github.com/microsoft/vcpkg/pull/17488) [pkgconf] Add new port (by @Neumann-A) +- liblsl `1.13.0-b11-1#0` -> `1.13.1#0` + - [(#14566)](https://github.com/microsoft/vcpkg/pull/14566) [liblsl] Update to 1.13.1 (by @chausner) + - [(#16461)](https://github.com/microsoft/vcpkg/pull/16461) [liblsl] Update to 1.14.0 (by @chausner) +- sdformat9 `9.2.0-1#0` -> `9.4.0#0` + - [(#15720)](https://github.com/microsoft/vcpkg/pull/15720) [sdformat9] Update to 9.4.0 (by @traversaro) +- boost-fiber `1.75.0#2` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- boost-mpl `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- rapidcsv `#0` -> `#0` + - [(#16879)](https://github.com/microsoft/vcpkg/pull/16879) [rapidcsv] new port (by @autoantwort) +- opencv `4.3.0#1` -> `4.3.0#1` + - [(#15089)](https://github.com/microsoft/vcpkg/pull/15089) [libarchive+tesseract+opencv] add missing libarchiveConfig.cmake, fix tesseract downstream and unblock opencv CI (by @cenit) + - [(#15788)](https://github.com/microsoft/vcpkg/pull/15788) [quirc, opencv4] Build fixes from 2021-01-18 build (by @BillyONeal) + - [(#15859)](https://github.com/microsoft/vcpkg/pull/15859) [OpenCV] bump to 4.5.1 and to 3.4.13 (by @cenit) +- spirv-tools `2020.1#0` -> `2020.1#0` + - [(#15831)](https://github.com/microsoft/vcpkg/pull/15831) [spirv-cross,spirv-headers,spirv-tools] 2021-01-15 update (by @barcharcraz) + - [(#16038)](https://github.com/microsoft/vcpkg/pull/16038) [spirv-cross,spirv-tools] support iOS triplets (by @luncliff) +- zxing-cpp `3.3.3#8` -> `2020-12-2#0` + - [(#14918)](https://github.com/microsoft/vcpkg/pull/14918) [zxing-cpp] Update zxing-cpp and fix iconv dependency (by @JonLiu1993) +- doctest `2.4.0#0` -> `2.4.5#0` + - [(#16121)](https://github.com/microsoft/vcpkg/pull/16121) [doctest] Update to v2.4.5 (by @jharmer95) +- influxdb-cxx `#0` -> `#0` + - [(#16794)](https://github.com/microsoft/vcpkg/pull/16794) [Influxdb-cxx] add new port (by @autoantwort) +- marl `2020-10-10#0` -> `2020-10-10#0` + - [(#17459)](https://github.com/microsoft/vcpkg/pull/17459) [marl] update to latest version (by @JonLiu1993) +- boost-beast `1.74.0#2` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- robin-hood-hashing `3.9.0#0` -> `3.9.1#0` + - [(#14563)](https://github.com/microsoft/vcpkg/pull/14563) [robin-hood-hashing] Update to 3.9.1 (by @RT222) + - [(#16701)](https://github.com/microsoft/vcpkg/pull/16701) [robin-hood-hashing] update to 3.10.0 (by @Ryan-rsm-McKenzie) + - [(#16901)](https://github.com/microsoft/vcpkg/pull/16901) [robin-hood-hashing] Update to 3.11.1 (by @RT222) +- hiredis `1.0.0#0` -> `1.0.0#0` + - [(#14734)](https://github.com/microsoft/vcpkg/pull/14734) [hiredis] update to 1.0.0 (Fix #13256) (by @klalumiere) + - [(#16512)](https://github.com/microsoft/vcpkg/pull/16512) [hiredis] Fix include path (by @NancyLi1013) +- libmysql `8.0.20#1` -> `8.0.20#1` + - [(#14290)](https://github.com/microsoft/vcpkg/pull/14290) [libmysql/libmariadb] Export unofficial cmake targets (by @JackBoosY) + - [(#16426)](https://github.com/microsoft/vcpkg/pull/16426) [libmysql] Re-fix dependency openssl (by @JackBoosY) +- nlopt `2.6.2-1#0` -> `2.7.0#0` + - [(#15105)](https://github.com/microsoft/vcpkg/pull/15105) [NLopt] Update to 2.7.0 (by @rickertm) +- libzippp `4.0-1.7.3#2` -> `4.0-1.7.3#3` + - [(#15486)](https://github.com/microsoft/vcpkg/pull/15486) [libzippp] fix find lzma (by @StarGate-One) +- p-ranav-csv2 `2020-06-02#0` -> `2020-12-14#0` + - [(#15104)](https://github.com/microsoft/vcpkg/pull/15104) [ csv2 ]update to latest commit (by @gennesseaux) +- mpg123 `1.26.3#14` -> `1.26.3#0` + - [(#14444)](https://github.com/microsoft/vcpkg/pull/14444) [mpg123] Upgrade to 1.26.3 (by @evpobr) + - [(#16910)](https://github.com/microsoft/vcpkg/pull/16910) [mpg123] Upgrade to 1.26.3-1 (by @evpobr) + - [(#17074)](https://github.com/microsoft/vcpkg/pull/17074) [mpg123] Upgrade to 1.26.4 (by @evpobr) + - [(#17191)](https://github.com/microsoft/vcpkg/pull/17191) [mpg123] Upgrade to 1.26.5 (by @evpobr) +- uwebsockets `18.13.0#0` -> `18.13.0#0` + - [(#16496)](https://github.com/microsoft/vcpkg/pull/16496) [uWebSockets] update to 19.0.0 (by @JonLiu1993) + - [(#16672)](https://github.com/microsoft/vcpkg/pull/16672) [uWebSockets] updated to 19.0.0 alpha 5 (by @Phantomouse) +- aws-c-common `0.4.56#0` -> `0.4.56#0` + - [(#14246)](https://github.com/microsoft/vcpkg/pull/14246) [vcpkg baseline] Clean up baseline, use Keyword Supports Part 2 (by @JackBoosY) +- x264 `157-303c484ec828ed0#12` -> `157-303c484ec828ed0#14` + - [(#12936)](https://github.com/microsoft/vcpkg/pull/12936) [vcpkg/scripts] Add a way to get cmake compiler settings/flags (by @Neumann-A) + - [(#14556)](https://github.com/microsoft/vcpkg/pull/14556) [many ports] mingw support (by @longnguyen2004) + - [(#15769)](https://github.com/microsoft/vcpkg/pull/15769) [x264] Fix build failed on uwp (by @NancyLi1013) +- dav1d `0.8.1#0` -> `0.8.1#0` + - [(#15009)](https://github.com/microsoft/vcpkg/pull/15009) [dav1d] Add dav1d AV1 decoder port (by @RichLogan) + - [(#16916)](https://github.com/microsoft/vcpkg/pull/16916) [dav1d] Update to 0.8.2 (by @EwoutH) +- opensubdiv `3.4.3#0` -> `3.4.3#0` + - [(#16962)](https://github.com/microsoft/vcpkg/pull/16962) [opensubdiv] Remove debug/share folder (by @PhoebeHui) +- inja `3.0.0#0` -> `3.2.0#0` + - [(#16151)](https://github.com/microsoft/vcpkg/pull/16151) [inja] Update to v3.2.0 (by @matusnovak) +- boost-align `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- boost-poly-collection `1.74.0#1` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- glad `0.1.33-1#0` -> `0.1.33-1#0` + - [(#16742)](https://github.com/microsoft/vcpkg/pull/16742) [glad] Add features to support different configurations. (by @crud89) +- ncurses `6.2#0` -> `6.2#0` + - [(#17226)](https://github.com/microsoft/vcpkg/pull/17226) [ncurses] Add new port (by @Hoikas) +- websocketpp `0.8.2#0` -> `0.8.2#0` + - [(#16675)](https://github.com/microsoft/vcpkg/pull/16675) [websocketpp] Add features to build without Boost (by @joefocusrite) +- boost-signals2 `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- wil `2020-05-19#1` -> `2020-05-19#1` + - [(#15438)](https://github.com/microsoft/vcpkg/pull/15438) [wil] Use internal CMakeLists (by @JackBoosY) + - [(#16575)](https://github.com/microsoft/vcpkg/pull/16575) [wil] Updating WIL version to match its nuget package version (by @anaaru) +- mmloader `2020-05-15#0` -> `2020-05-15#0` + - [(#15151)](https://github.com/microsoft/vcpkg/pull/15151) [opentracing] Update VMs 2020-12 (by @BillyONeal) +- asiosdk `2.3.3-1#0` -> `2.3.3-1#0` + - [(#14245)](https://github.com/microsoft/vcpkg/pull/14245) [vcpkg baseline] Clean up baseline, use Keyword Supports Part 1 (by @JackBoosY) +- sciplot `#0` -> `#0` + - [(#15913)](https://github.com/microsoft/vcpkg/pull/15913) [sciplot] Add new port (by @CaeruleusAqua) +- commsdsl `3.6.0#0` -> `3.6.0#0` + - [(#14195)](https://github.com/microsoft/vcpkg/pull/14195) [comms] Add new ports (by @mathisloge) + - [(#14521)](https://github.com/microsoft/vcpkg/pull/14521) [comms ] update to the next version (by @mathisloge) + - [(#14691)](https://github.com/microsoft/vcpkg/pull/14691) [commsdsl] update to version 3.5.4 (by @mathisloge) + - [(#15138)](https://github.com/microsoft/vcpkg/pull/15138) [comms] update comms libs to latest version (by @mathisloge) + - [(#15159)](https://github.com/microsoft/vcpkg/pull/15159) [comms] fixes debug build configuration (by @mathisloge) + - [(#16415)](https://github.com/microsoft/vcpkg/pull/16415) [comms, commsdsl] update ports (by @mathisloge) + - [(#17581)](https://github.com/microsoft/vcpkg/pull/17581) [comms,commsdsl] update ports (by @mathisloge) +- 3fd `2.6.2#0` -> `2.6.3#0` + - [(#14528)](https://github.com/microsoft/vcpkg/pull/14528) [3fd] Update to 2.6.3, fix port (by @strega-nil) +- libsigcpp-3 `3.0.3#0` -> `3.0.3#0` + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) +- boost-type-traits `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- vamp-sdk `#0` -> `#0` + - [(#16883)](https://github.com/microsoft/vcpkg/pull/16883) [vamp-sdk] new package (by @abique) +- hpx `1.5.1#1` -> `1.6.0#0` + - [(#16264)](https://github.com/microsoft/vcpkg/pull/16264) [hpx] Update hpx to V1.6.0 (by @hkaiser) +- crfsuite `2019-07-21#0` -> `2019-07-21#0` + - [(#15785)](https://github.com/microsoft/vcpkg/pull/15785) [crfsuite] change /include/x.h => /include/crfsuite/x.h (by @BillyONeal) +- qt5-base `5.15.2#1` -> `5.15.2#4` + - [(#8524)](https://github.com/microsoft/vcpkg/pull/8524) Add option VCPKG_QMAKE_USE_NMAKE in vcpkg_build_qmake and install_qt (by @JackBoosY) + - [(#11776)](https://github.com/microsoft/vcpkg/pull/11776) [intl/gettext/fontconfig] update to native build system (by @Neumann-A) + - [(#14594)](https://github.com/microsoft/vcpkg/pull/14594) [qt5-base] fix brotli linkage and qml dlls deployment (by @Neumann-A) + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) + - [(#15005)](https://github.com/microsoft/vcpkg/pull/15005) [qt5] Fix linux dynamic build (by @dweckmann) + - [(#15170)](https://github.com/microsoft/vcpkg/pull/15170) [qt5-base] mysql plugin added (by @jepessen) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16280)](https://github.com/microsoft/vcpkg/pull/16280) qt5-base: misleading list of system packages required (by @wrobelda) + - [(#16386)](https://github.com/microsoft/vcpkg/pull/16386) [qt5-base] Add feature vulkan (by @JackBoosY) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) + - [(#16659)](https://github.com/microsoft/vcpkg/pull/16659) [qt5-base] make libpq an optional dependency (by @autoantwort) + - [(#16954)](https://github.com/microsoft/vcpkg/pull/16954) [vcpkg baseline][qt5-base] Fix glib link issues on linux (by @Neumann-A) + - [(#17158)](https://github.com/microsoft/vcpkg/pull/17158) [qt5] Move qt5 headers into qt5 subdir (by @Neumann-A) +- nccl `2.4.6#0` -> `2.4.6#0` + - [(#14683)](https://github.com/microsoft/vcpkg/pull/14683) [nccl] New Port (by @jacobkahn) +- qt5-activeqt `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- catch2 `2.13.1#0` -> `2.13.1#1` + - [(#17271)](https://github.com/microsoft/vcpkg/pull/17271) [catch2] Fix share/catch2 directory name conflict (by @wildmichael) +- kf5itemviews `5.64.0#0` -> `5.64.0#0` + - [(#13467)](https://github.com/microsoft/vcpkg/pull/13467) [many ports] Update existing KF5 frameworks to 5.75 (by @wrobelda) +- speex `1.2.0#7` -> `1.2.0#8` + - [(#15855)](https://github.com/microsoft/vcpkg/pull/15855) [speex] Add linux and macOS support. (by @Hoikas) +- duktape `2.5.0#0` -> `2.5.0#1` + - [(#14666)](https://github.com/microsoft/vcpkg/pull/14666) [duktape] Add VERSION and SOVERSION properties CMake build (by @LRFLEW) +- bitsery `5.1.0#0` -> `5.2.1#0` + - [(#14722)](https://github.com/microsoft/vcpkg/pull/14722) [bitsery] Update to 5.2.1 (by @RT222) +- qt5-virtualkeyboard `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- qt5-serialport `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- xeus `0.24.1#1` -> `0.24.1#1` + - [(#14387)](https://github.com/microsoft/vcpkg/pull/14387) [xeus] remove openssl static build patch as it is no longer needed (by @mcmtroffaes) + - [(#14455)](https://github.com/microsoft/vcpkg/pull/14455) [xeus] update to 0.24.3 (by @SeekingMeaning) +- kf5plotting `5.74.0#0` -> `5.74.0#0` + - [(#13467)](https://github.com/microsoft/vcpkg/pull/13467) [many ports] Update existing KF5 frameworks to 5.75 (by @wrobelda) +- libyuv `fec9121#3` -> `fec9121#0` + - [(#17294)](https://github.com/microsoft/vcpkg/pull/17294) [libyuv] update to latest commit (by @JonLiu1993) +- arrow `1.0.1#1` -> `1.0.1#2` + - [(#14245)](https://github.com/microsoft/vcpkg/pull/14245) [vcpkg baseline] Clean up baseline, use Keyword Supports Part 1 (by @JackBoosY) + - [(#14395)](https://github.com/microsoft/vcpkg/pull/14395) [ZSTD] Update to 1.4.5 (by @Neumann-A) + - [(#15757)](https://github.com/microsoft/vcpkg/pull/15757) [Arrow] Update to 3.0.0 (by @GPSnoopy) +- glm `0.9.9.8#0` -> `0.9.9.8#0` + - [(#16429)](https://github.com/microsoft/vcpkg/pull/16429) [glm] Add namespace to export target (by @JackBoosY) +- charls `2.1.0-1#0` -> `2.2.0#0` + - [(#15857)](https://github.com/microsoft/vcpkg/pull/15857) [charls] update to 2.2.0 (by @JonLiu1993) +- boost-endian `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- raylib `3.5.0#3` -> `3.5.0#1` + - [(#15342)](https://github.com/microsoft/vcpkg/pull/15342) Raylib update to 3.5.0 (by @JonLiu1993) + - [(#15935)](https://github.com/microsoft/vcpkg/pull/15935) [raylib] Fix usage (by @NancyLi1013) +- bond `9.0.2#0` -> `9.0.2#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14450)](https://github.com/microsoft/vcpkg/pull/14450) [bond] update to 9.0.3 (by @SeekingMeaning) +- gamedev-framework `0.18.0#0` -> `0.18.1#0` + - [(#14482)](https://github.com/microsoft/vcpkg/pull/14482) [gamedev-framework] update to 0.18.1 (by @jube) + - [(#17445)](https://github.com/microsoft/vcpkg/pull/17445) [gamedev-framework] Update to 0.20.0 (by @ahugeat) +- openexr `2.5.0#1` -> `2.5.0#0` + - [(#15147)](https://github.com/microsoft/vcpkg/pull/15147) [openexr] Remove python dependency of openexr. (by @BillyONeal) +- qt5-androidextras `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- sdl2-image `2.0.5#0` -> `2.0.5#1` + - [(#14796)](https://github.com/microsoft/vcpkg/pull/14796) [sdl2-image] Fix usage (by @JackBoosY) +- gtk `3.22.19-4#0` -> `3.22.19-4#0` + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) +- boost-msm `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- restinio `0.6.11#0` -> `0.6.12#0` + - [(#14496)](https://github.com/microsoft/vcpkg/pull/14496) [restinio] update to v.0.6.12 (by @eao197) + - [(#15338)](https://github.com/microsoft/vcpkg/pull/15338) [restinio] update to v.0.6.13 (by @eao197) +- imgui `1.81#1` -> `1.81#4` + - [(#13899)](https://github.com/microsoft/vcpkg/pull/13899) [imgui] Add experimental docking feature (by @brukted) + - [(#14379)](https://github.com/microsoft/vcpkg/pull/14379) [imgui] Update to 1.79 (by @RT222) + - [(#15063)](https://github.com/microsoft/vcpkg/pull/15063) [imgui] Fix find dependencies (by @JackBoosY) + - [(#16239)](https://github.com/microsoft/vcpkg/pull/16239) upgrade imgui to v1.81 (by @BrianPeek) + - [(#16255)](https://github.com/microsoft/vcpkg/pull/16255) [imgui] change to correct dx binding implementation path (by @aizuon) + - [(#16268)](https://github.com/microsoft/vcpkg/pull/16268) [Imgui] Update docking-experimental and freetype features to 1.81 (by @RT222) + - [(#16727)](https://github.com/microsoft/vcpkg/pull/16727) [imgui] Update to 1.82 (by @RT222) +- boost-lockfree `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- libzip `1.7.3#1` -> `1.7.3#1` + - [(#15589)](https://github.com/microsoft/vcpkg/pull/15589) [libzip] Relative pkgconfig paths (by @adam-bloom) + - [(#17282)](https://github.com/microsoft/vcpkg/pull/17282) [libzip] fix dependency in libzip-config.cmake.in (by @NancyLi1013) +- elfio `3.8#0` -> `3.8#0` + - [(#17249)](https://github.com/microsoft/vcpkg/pull/17249) [elfio] Update elfio from 3.8 to 3.9 (by @schultetwin1) +- openal-soft `1.20.1#5` -> `1.20.1#6` + - [(#15634)](https://github.com/microsoft/vcpkg/pull/15634) [openal-soft] Fix issue with cmake config. (by @Hoikas) + - [(#15945)](https://github.com/microsoft/vcpkg/pull/15945) [openal-soft] Update to 1.21.1 (by @past-due) +- ocilib `4.7.1#0` -> `4.7.1#0` + - [(#16625)](https://github.com/microsoft/vcpkg/pull/16625) [ocilib] fix wrong solution filename (by @meastp) +- glbinding `3.1.0-2#0` -> `3.1.0#0` + - [(#15082)](https://github.com/microsoft/vcpkg/pull/15082) [glbinding] Improve usage information (by @ras0219) +- boost-bimap `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- libpng `1.6.37#12` -> `1.6.37#14` + - [(#14499)](https://github.com/microsoft/vcpkg/pull/14499) [freetype] Fix INTERFACE_LINK_LIBRARIES in exported cmake file (by @JackBoosY) + - [(#15002)](https://github.com/microsoft/vcpkg/pull/15002) [libpng] Fix cross-compilation on macOS (by @orudge) +- boost-callable-traits `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- happly `#0` -> `#0` + - [(#16788)](https://github.com/microsoft/vcpkg/pull/16788) [happly] add new port (by @autoantwort) +- libheif `1.7.0#1` -> `1.10.0#0` + - [(#14648)](https://github.com/microsoft/vcpkg/pull/14648) [libheif] update to 1.9.1 (by @JonLiu1993) + - [(#15416)](https://github.com/microsoft/vcpkg/pull/15416) [libheif] update to 1.10.0 (by @0xC0000054) +- pdal `1.7.1#9` -> `1.7.1#11` + - [(#14382)](https://github.com/microsoft/vcpkg/pull/14382) [kenlm, pdal] Fix const overload on Visual Studio 2019 version 16.8 (by @LilyWangL) + - [(#15750)](https://github.com/microsoft/vcpkg/pull/15750) [libgeotiff] Fix packagename via find_package (by @NancyLi1013) +- oatpp-mongo `1.2.0#0` -> `1.2.0#0` + - [(#14341)](https://github.com/microsoft/vcpkg/pull/14341) [oatpp] Add new port and vcpkg.json (by @mheyman) +- proj4 `7.2.1#2` -> `7.2.1#3` + - [(#14629)](https://github.com/microsoft/vcpkg/pull/14629) [proj] Added support for optionally building the tools (by @SNiLD) + - [(#14800)](https://github.com/microsoft/vcpkg/pull/14800) [Proj4] Update to 7.2.0 (by @longhuan2018) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#15978)](https://github.com/microsoft/vcpkg/pull/15978) [proj4] Bump to proj 7.2.1 (by @rhuijben) + - [(#15985)](https://github.com/microsoft/vcpkg/pull/15985) [proj4] Copy over proj.pdb file on install (by @stefanuhrig) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- boost-bind `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- toml11 `3.5.0#0` -> `3.5.0#1` + - [(#14723)](https://github.com/microsoft/vcpkg/pull/14723) [toml11] fixes installation (by @fran6co) +- boost-move `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- tomlplusplus `2.3.0#0` -> `2.3.0#1` + - [(#15365)](https://github.com/microsoft/vcpkg/pull/15365) update toml++ to v2.3.0 (by @marzer) + - [(#15609)](https://github.com/microsoft/vcpkg/pull/15609) delete linux from fail port from tomlplusplus (by @marshevms) +- libvpx `1.9.0#3` -> `1.9.0#7` + - [(#14545)](https://github.com/microsoft/vcpkg/pull/14545) [libvpx] switch from yasm to nasm (by @mcmtroffaes) + - [(#14556)](https://github.com/microsoft/vcpkg/pull/14556) [many ports] mingw support (by @longnguyen2004) + - [(#15787)](https://github.com/microsoft/vcpkg/pull/15787) [ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (by @Sibras) + - [(#15892)](https://github.com/microsoft/vcpkg/pull/15892) [libvpx] Fix arm-uwp builds for v142 toolset (by @jwtowner) + - [(#17287)](https://github.com/microsoft/vcpkg/pull/17287) [libvpx] Fix libvpx compilation (install process) (by @talregev) + - [(#17331)](https://github.com/microsoft/vcpkg/pull/17331) Update VMs, CMake to 3.20.1, CUDA to 11.3, and pwsh to 7.1.3 (by @BillyONeal) +- boost-tuple `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- minc `2.4.03#0` -> `2.4.03#1` + - [(#14716)](https://github.com/microsoft/vcpkg/pull/14716) [cmake] update to 3.19.2 (by @JackBoosY) +- vcpkg-pkgconfig-get-modules `#0` -> `#0` + - [(#16954)](https://github.com/microsoft/vcpkg/pull/16954) [vcpkg baseline][qt5-base] Fix glib link issues on linux (by @Neumann-A) +- boost-program-options `1.75.0#0` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- qt5-tools `5.15.1#1` -> `5.15.1#1` + - [(#14083)](https://github.com/microsoft/vcpkg/pull/14083) [qt5-tools] Patch windeployqt to locate icudtd correctly. (by @seanlis) + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- qt5-svg `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- pangomm `2.40.1#4` -> `2.40.1#4` + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) + - [(#15353)](https://github.com/microsoft/vcpkg/pull/15353) Build results from 2020-12-27 (by @BillyONeal) +- protobuf `3.14.0#1` -> `3.14.0#1` + - [(#14670)](https://github.com/microsoft/vcpkg/pull/14670) [protobuf] Update to 3.14.0 (by @JonLiu1993) + - [(#15246)](https://github.com/microsoft/vcpkg/pull/15246) [protobuf] Fix the default proto file path (by @JackBoosY) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16449)](https://github.com/microsoft/vcpkg/pull/16449) [protobuf] Update to 3.15.8 (by @yonik) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) + - [(#16904)](https://github.com/microsoft/vcpkg/pull/16904) [vcpkg baseline][osgearth/gdal] Re-fix dependency gdal (by @JackBoosY) + - [(#16997)](https://github.com/microsoft/vcpkg/pull/16997) [protobuf] Fix deprecation warning in vcpkg_check_feature() (by @NancyLi1013) +- vtk-m `1.5.0#0` -> `1.5.0#1` + - [(#14884)](https://github.com/microsoft/vcpkg/pull/14884) [vcpkg baseline][vtk-m] fix the sha512 (by @strega-nil) +- simde `2019-06-05#0` -> `0.7.0#0` + - [(#15387)](https://github.com/microsoft/vcpkg/pull/15387) [simde] update to 0.7.0 (by @JonLiu1993) +- fbgemm `#0` -> `#0` + - [(#16346)](https://github.com/microsoft/vcpkg/pull/16346) [fbgemm] create a new port (by @luncliff) +- boost-static-assert `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- mp3lame `3.100#4` -> `3.100#6` + - [(#14556)](https://github.com/microsoft/vcpkg/pull/14556) [many ports] mingw support (by @longnguyen2004) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15058)](https://github.com/microsoft/vcpkg/pull/15058) [mp3lame] Fix lib suffix on Unix (by @NancyLi1013) +- wepoll `1.5.5#0` -> `1.5.8#0` + - [(#14456)](https://github.com/microsoft/vcpkg/pull/14456) [wepoll] update to 1.5.8 (by @SeekingMeaning) + - [(#14986)](https://github.com/microsoft/vcpkg/pull/14986) 2020-12-07 Build Fixes (by @BillyONeal) +- simdjson `0.5.0#0` -> `0.7.1#0` + - [(#15436)](https://github.com/microsoft/vcpkg/pull/15436) simdjson update to v0.7.1 (by @JonLiu1993) + - [(#16277)](https://github.com/microsoft/vcpkg/pull/16277) Updated 'simdjson' to v0.8.2 (by @jharmer95) + - [(#17200)](https://github.com/microsoft/vcpkg/pull/17200) [simdjson] Update to 0.9.2 (by @myd7349) +- ijg-libjpeg `9d#0` -> `9d#0` + - [(#14583)](https://github.com/microsoft/vcpkg/pull/14583) [ijg-libjpeg] add new port (by @luncliff) +- ffnvcodec `10.0.26.0#0` -> `10.0.26.0#1` + - [(#15787)](https://github.com/microsoft/vcpkg/pull/15787) [ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (by @Sibras) +- mdns `1.1#0` -> `1.1#0` + - [(#15142)](https://github.com/microsoft/vcpkg/pull/15142) [mdns] added new port (by @mathisloge) +- ginkgo `#0` -> `#0` + - [(#16536)](https://github.com/microsoft/vcpkg/pull/16536) [ginkgo] Create new port (by @upsj) +- usd `20.02-1#0` -> `20.08#0` + - [(#13687)](https://github.com/microsoft/vcpkg/pull/13687) [usd] fix dll path and update to 20.08 (by @ousttrue) +- nettle `3.6#4` -> `3.6#5` + - [(#13126)](https://github.com/microsoft/vcpkg/pull/13126) [vcpkg_fixup_pkgconfig] Handle spaces in path, do not validate individual libraries (by @ras0219) + - [(#15236)](https://github.com/microsoft/vcpkg/pull/15236) [gmp/nettle] Update to latest release revision (by @PhoebeHui) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#17421)](https://github.com/microsoft/vcpkg/pull/17421) [Nettle] add cflags to build tools (by @xandox) +- frozen `1.0.0#0` -> `1.0.0#0` + - [(#17451)](https://github.com/microsoft/vcpkg/pull/17451) [frozen] Update to latest commit (by @Ryan-rsm-McKenzie) +- caf `0.17.6#1` -> `0.17.6#1` + - [(#14292)](https://github.com/microsoft/vcpkg/pull/14292) [caf] Add usage and vcpkg-cmake-wrapper (by @NancyLi1013) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- azure-uamqp-c `2020-07-19#0` -> `2020-12-09#0` + - [(#15109)](https://github.com/microsoft/vcpkg/pull/15109) Azure-IoT-Sdk for C release 2020-12-09 (by @ewertons) +- avro-cpp `1.9.2#0` -> `1.9.2#0` + - [(#14246)](https://github.com/microsoft/vcpkg/pull/14246) [vcpkg baseline] Clean up baseline, use Keyword Supports Part 2 (by @JackBoosY) +- boost-function `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- nghttp2 `1.39.2-2#0` -> `1.42.0#0` + - [(#14862)](https://github.com/microsoft/vcpkg/pull/14862) [nghttp2] Update to 1.42.0. (by @geraldcombs) +- polyhook2 `2020-09-22#0` -> `2020-09-22#0` + - [(#14794)](https://github.com/microsoft/vcpkg/pull/14794) [ebml/gppanel/matroska/polyhook2/unrar] Fix typos in CONTROL files (by @NancyLi1013) + - [(#15537)](https://github.com/microsoft/vcpkg/pull/15537) [polyhook2]Update to the latest version (by @stevemk14ebr) +- cpprestsdk `2.10.16-3#0` -> `2.10.17#0` + - [(#15401)](https://github.com/microsoft/vcpkg/pull/15401) Update cpprestsdk to 2.10.17. (by @BillyONeal) + - [(#16065)](https://github.com/microsoft/vcpkg/pull/16065) [cpprestsdk] Bump version to 2.10.18 (by @barcharcraz) +- boost-integer `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- boost-iterator `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- devil `1.8.0#6` -> `1.8.0#7` + - [(#14793)](https://github.com/microsoft/vcpkg/pull/14793) [devil] Fix pkgconfig on Windows (by @JackBoosY) +- chromaprint `1.5.0#0` -> `1.5.0#0` + - [(#15986)](https://github.com/microsoft/vcpkg/pull/15986) [chromaprint] add new port with version 1.5.0 (by @Be-ing) + - [(#17331)](https://github.com/microsoft/vcpkg/pull/17331) Update VMs, CMake to 3.20.1, CUDA to 11.3, and pwsh to 7.1.3 (by @BillyONeal) +- boost-test `1.75.0#1` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- liblas `1.8.1#5` -> `1.8.1#6` + - [(#15750)](https://github.com/microsoft/vcpkg/pull/15750) [libgeotiff] Fix packagename via find_package (by @NancyLi1013) +- ffmpeg `4.3.2#0` -> `4.3.2#12` + - [(#14360)](https://github.com/microsoft/vcpkg/pull/14360) [ffmpeg] add if guard, fix library ordering on linux, minor clean up (by @mcmtroffaes) + - [(#14388)](https://github.com/microsoft/vcpkg/pull/14388) [ffmpeg] simplify openssl library search, and fix linux openssl feature linking (by @mcmtroffaes) + - [(#14547)](https://github.com/microsoft/vcpkg/pull/14547) [ffmpeg] use nasm instead of yasm (by @mcmtroffaes) + - [(#14556)](https://github.com/microsoft/vcpkg/pull/14556) [many ports] mingw support (by @longnguyen2004) + - [(#14626)](https://github.com/microsoft/vcpkg/pull/14626) [libpq/ffmpeg] Fix iconv/intl linkage not covered by CI (by @Neumann-A) + - [(#15127)](https://github.com/microsoft/vcpkg/pull/15127) [ffmpeg] fix up the pkgconfig files (by @JackBoosY) + - [(#15593)](https://github.com/microsoft/vcpkg/pull/15593) [pangolin] Fix static build error (by @NancyLi1013) + - [(#15787)](https://github.com/microsoft/vcpkg/pull/15787) [ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (by @Sibras) + - [(#16000)](https://github.com/microsoft/vcpkg/pull/16000) [ffmpeg] avfilter: fix dependencies and linux library ordering (by @mcmtroffaes) + - [(#16768)](https://github.com/microsoft/vcpkg/pull/16768) Upgrade ffmpeg to 4.3.2 (by @omartijn) + - [(#16882)](https://github.com/microsoft/vcpkg/pull/16882) [ffmpeg] Fix FindFFMPEG lib versions for building opencv[ffmpeg] (by @genevanmeter) + - [(#17236)](https://github.com/microsoft/vcpkg/pull/17236) [ffmpeg] no longer hardcode version strings in FindFFMPEG script (by @mcmtroffaes) + - [(#17287)](https://github.com/microsoft/vcpkg/pull/17287) [libvpx] Fix libvpx compilation (install process) (by @talregev) + - [(#17298)](https://github.com/microsoft/vcpkg/pull/17298) [ffmpeg] add -fPIC (by @cenit) + - [(#17467)](https://github.com/microsoft/vcpkg/pull/17467) [ffmpeg] avdevice xcb linking fix on linux (by @mcmtroffaes) + - [(#17531)](https://github.com/microsoft/vcpkg/pull/17531) [ffmpeg] add openh264 support (by @mcmtroffaes) +- atlmfc `0#0` -> `0#0` + - [(#14246)](https://github.com/microsoft/vcpkg/pull/14246) [vcpkg baseline] Clean up baseline, use Keyword Supports Part 2 (by @JackBoosY) +- boost-format `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- boost-gil `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- telnetpp `2.0-4#0` -> `2.1.2#0` + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) +- boolinq `2019-07-22#0` -> `2019-07-22#0` + - [(#17495)](https://github.com/microsoft/vcpkg/pull/17495) [boolinq] update to 3.0.1 (2020-07-29) (by @JonLiu1993) +- qt5-serialbus `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- boost-system `1.75.0#0` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- cgal `5.2#1` -> `5.2#3` + - [(#14605)](https://github.com/microsoft/vcpkg/pull/14605) CGAL: Update to 5.1.1 (by @maxGimeno) + - [(#15047)](https://github.com/microsoft/vcpkg/pull/15047) [CGAL] Upgrade to 5.2 (by @maxGimeno) + - [(#15860)](https://github.com/microsoft/vcpkg/pull/15860) [CGAL] switch dep to gmp instead of mpir (by @Neumann-A) + - [(#16592)](https://github.com/microsoft/vcpkg/pull/16592) [CGAL] Restore boost dependencies (by @maxGimeno) + - [(#17300)](https://github.com/microsoft/vcpkg/pull/17300) [CGAL] Fix the configuration file (by @maxGimeno) +- libde265 `1.0.5#0` -> `1.0.8#0` + - [(#14497)](https://github.com/microsoft/vcpkg/pull/14497) [libde265] Updated to v1.0.8 (by @JonLiu1993) +- libxml2 `2.9.10#1` -> `2.9.10#2` + - [(#14476)](https://github.com/microsoft/vcpkg/pull/14476) [libxslt] Fix install tools and pkgconfig (by @JackBoosY) + - [(#14991)](https://github.com/microsoft/vcpkg/pull/14991) [libxml2] build failure with x64-linux-dynamic (Fix #14990) (by @klalumiere) + - [(#15787)](https://github.com/microsoft/vcpkg/pull/15787) [ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (by @Sibras) + - [(#16726)](https://github.com/microsoft/vcpkg/pull/16726) [libxml2] Disable http and ftp on UWP (by @JackBoosY) + - [(#16897)](https://github.com/microsoft/vcpkg/pull/16897) [libxml2] add missing GNUInstallDirs to fix pc files (by @Neumann-A) + - [(#17389)](https://github.com/microsoft/vcpkg/pull/17389) [libxml2] Pass version to rc via configured file (by @dg0yt) +- vcpkg-cmake `#0` -> `#0` + - [(#16440)](https://github.com/microsoft/vcpkg/pull/16440) [scripts-audit] Rollup PR 2021-02-26 (by @strega-nil) + - [(#16468)](https://github.com/microsoft/vcpkg/pull/16468) [vcpkg-cmake] Fix typo in vcpkg_cmake_configure that prevented custom triplets from working (by @sylveon) + - [(#16774)](https://github.com/microsoft/vcpkg/pull/16774) [ci,vcpkg-cmake-*] remove host-only nature of vcpkg-cmake-* ports (by @strega-nil) +- pugixml `1.1#2` -> `1.11.1#0` + - [(#14813)](https://github.com/microsoft/vcpkg/pull/14813) [pugixml] Update to 1.11.1 (by @RT222) + - [(#15207)](https://github.com/microsoft/vcpkg/pull/15207) [pugixml] Update to 1.11.4 (by @c72578) +- nuklear `2020-09-14#0` -> `2021-03-18#0` + - [(#17082)](https://github.com/microsoft/vcpkg/pull/17082) [nuklear] Upgrade from 2020-09-14 to 2021-03-18 version and switch repo (by @SamuelMarks) +- cppmicroservices `3.4.0-1#0` -> `3.4.0#2` + - [(#15177)](https://github.com/microsoft/vcpkg/pull/15177) [cppmicroservices] Fix warning C4834 (by @Cheney-W) +- unrar `5.8.1#0` -> `5.8.1#0` + - [(#14794)](https://github.com/microsoft/vcpkg/pull/14794) [ebml/gppanel/matroska/polyhook2/unrar] Fix typos in CONTROL files (by @NancyLi1013) +- qt5-websockets `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- boost-process `1.74.0#2` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- libsoundio `2.0.0-3#0` -> `2.0.0-3#0` + - [(#16891)](https://github.com/microsoft/vcpkg/pull/16891) [libsoundio] Add support for linux backends (by @joefocusrite) +- oatpp `1.2.0#1` -> `1.2.0#0` + - [(#14341)](https://github.com/microsoft/vcpkg/pull/14341) [oatpp] Add new port and vcpkg.json (by @mheyman) +- boost-lexical-cast `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- quirc `1.1#1` -> `1.1#1` + - [(#15252)](https://github.com/microsoft/vcpkg/pull/15252) Fixed port of quirc - patch did no longer apply / modified to fix build (by @Markus87) + - [(#15788)](https://github.com/microsoft/vcpkg/pull/15788) [quirc, opencv4] Build fixes from 2021-01-18 build (by @BillyONeal) +- qt5-macextras `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- sail `0.9.0-pre10#0` -> `0.9.0-pre10#0` + - [(#14925)](https://github.com/microsoft/vcpkg/pull/14925) [sail] Add new port (by @happy-sea-fox) + - [(#15140)](https://github.com/microsoft/vcpkg/pull/15140) [sail] Enable static builds and more platforms (by @happy-sea-fox) + - [(#16806)](https://github.com/microsoft/vcpkg/pull/16806) [sail] Update 0.9.0-pre11 -> 0.9.0-pre12 (by @happy-sea-fox) +- osgearth `3#2` -> `3.1#0` + - [(#14976)](https://github.com/microsoft/vcpkg/pull/14976) [osgearth/rocksdb] Update to latest release (by @NancyLi1013) + - [(#15375)](https://github.com/microsoft/vcpkg/pull/15375) [osgearth] Fix x64-windows-static-md (by @ankurverma85) + - [(#15777)](https://github.com/microsoft/vcpkg/pull/15777) [osgearth] Make all find_packages required in effort to make this port less "flaky", and turn on in CI. (by @BillyONeal) + - [(#15900)](https://github.com/microsoft/vcpkg/pull/15900) [vcpkg baseline][osgearth] Fix and add dependency tinyxml (by @JackBoosY) +- boost-ptr-container `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- freetype `2.10.2#4` -> `2.10.2#7` + - [(#14499)](https://github.com/microsoft/vcpkg/pull/14499) [freetype] Fix INTERFACE_LINK_LIBRARIES in exported cmake file (by @JackBoosY) + - [(#14917)](https://github.com/microsoft/vcpkg/pull/14917) [freetype] Make zlib and brotli features (by @LRFLEW) + - [(#15112)](https://github.com/microsoft/vcpkg/pull/15112) [freetype] avoid target_link_libraries call since qt6 does not like it. (by @Neumann-A) + - [(#15334)](https://github.com/microsoft/vcpkg/pull/15334) [freetype] Update to 2.10.4 (by @kevinlul) +- podofo `0.9.6#12` -> `0.9.6#13` + - [(#15666)](https://github.com/microsoft/vcpkg/pull/15666) [podofo] Fix feature crypto (by @JackBoosY) + - [(#16373)](https://github.com/microsoft/vcpkg/pull/16373) [podofo] update to 0.9.7 (by @JonLiu1993) +- ignition-msgs5 `5.3.0#1` -> `5.3.0#2` + - [(#14324)](https://github.com/microsoft/vcpkg/pull/14324) [ignition] Updates on various pkgs ???? (by @ahoarau) + - [(#14730)](https://github.com/microsoft/vcpkg/pull/14730) [ignition-msgs*] Fix flaky CI tests for ignition-msgs* ports (take 2) (by @traversaro) +- boost-vmd `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- librsvg `2.40.20-2#0` -> `2.40.20-2#0` + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) +- cpp-httplib `0.7.0#0` -> `0.7.15#0` + - [(#14795)](https://github.com/microsoft/vcpkg/pull/14795) [cpp-httplib] Update to 0.7.15 (by @JonLiu1993) + - [(#15344)](https://github.com/microsoft/vcpkg/pull/15344) [cpp-httplib] Update to version 0.7.18 (by @iko1) + - [(#16591)](https://github.com/microsoft/vcpkg/pull/16591) [cpp-httplib] Upgrade to v0.8.4 (by @tosone) + - [(#17182)](https://github.com/microsoft/vcpkg/pull/17182) [cpp-httplib] Upgrade to v0.8.6 (by @PhilLab) +- azure-security-keyvault-common-cpp `4.0.0-beta.1#0` -> `4.0.0-beta.1#0` + - [(#17143)](https://github.com/microsoft/vcpkg/pull/17143) [azure-security-keyvault-*] Add new ports (by @azure-sdk) + - [(#17447)](https://github.com/microsoft/vcpkg/pull/17447) [azure-sdk-for-cpp] Upgrade vcpkg manifest files (by @antkmsft) +- sfml `2.5.1#9` -> `2.5.1#0` + - [(#15718)](https://github.com/microsoft/vcpkg/pull/15718) [sfml] Install usage and change version scheme to relaxed (by @ras0219) +- presentmon `1.6.0#0` -> `1.6.0#0` + - [(#16628)](https://github.com/microsoft/vcpkg/pull/16628) Port for PresentMon, windows-only ETW swap-chain presentation capture and analysis tool (by @aggieNick02) +- boost-exception `1.75.0#0` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- type-safe `0.2.1#0` -> `0.2.1#0` + - [(#15468)](https://github.com/microsoft/vcpkg/pull/15468) [type-safe] New port. (by @blaz-kranjc) +- collada-dom `2.5.0-3#0` -> `2.5.0#4` + - [(#16763)](https://github.com/microsoft/vcpkg/pull/16763) [collada-dom] Add REMOVE_RECURSE to solve DLLs error path (by @JonLiu1993) +- bde `2#0` -> `2#0` + - [(#14246)](https://github.com/microsoft/vcpkg/pull/14246) [vcpkg baseline] Clean up baseline, use Keyword Supports Part 2 (by @JackBoosY) +- librsync `2020-09-16#0` -> `2020-09-16#1` + - [(#15281)](https://github.com/microsoft/vcpkg/pull/15281) [librsync] fix librsync linkage (by @Amf1k) +- shogun `6.1.4#3` -> `6.1.4#4` + - [(#13448)](https://github.com/microsoft/vcpkg/pull/13448) [BLAS] add metaport (by @cenit) +- asyncplusplus `1.1#0` -> `1.1#0` + - [(#14245)](https://github.com/microsoft/vcpkg/pull/14245) [vcpkg baseline] Clean up baseline, use Keyword Supports Part 1 (by @JackBoosY) +- frugally-deep `#0` -> `#0` + - [(#17559)](https://github.com/microsoft/vcpkg/pull/17559) [new/updated port] frugally-deep and updated fplus (by @mathisloge) +- xtensor `0.21.6#0` -> `0.21.9#0` + - [(#14454)](https://github.com/microsoft/vcpkg/pull/14454) [xsimd][xtensor][xtl] Update to latest (by @SeekingMeaning) +- jwt-cpp `0.4.0#0` -> `0.4.0#0` + - [(#16799)](https://github.com/microsoft/vcpkg/pull/16799) [jwt-cpp] update to v0.5.0 (by @prince-chrismc) +- libigl `2.2.0#2` -> `2.2.0#4` + - [(#14376)](https://github.com/microsoft/vcpkg/pull/14376) [libigl] Fix dynamic build and enable header-only mode (by @FabienPean) + - [(#14888)](https://github.com/microsoft/vcpkg/pull/14888) [libigl] Always install as header-only library (by @FabienPean) +- boost-polygon `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- libiconv `1.16#5` -> `1.16#8` + - [(#11776)](https://github.com/microsoft/vcpkg/pull/11776) [intl/gettext/fontconfig] update to native build system (by @Neumann-A) + - [(#15606)](https://github.com/microsoft/vcpkg/pull/15606) [boost-locale] android build (by @xandox) + - [(#15771)](https://github.com/microsoft/vcpkg/pull/15771) [libiconv] Updated typo in iconv share files location (by @ludekvodicka) +- boost-convert `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- sentry-native `0.4.4#1` -> `0.4.4#1` + - [(#14349)](https://github.com/microsoft/vcpkg/pull/14349) [sentry-native] Disable warning C5105 (by @LilyWangL) + - [(#14541)](https://github.com/microsoft/vcpkg/pull/14541) [sentry-native] Update to version 0.4.4 (by @AenBleidd) + - [(#15042)](https://github.com/microsoft/vcpkg/pull/15042) [sentry-native] Fix sentry-config-cmake.in (by @JackBoosY) + - [(#15790)](https://github.com/microsoft/vcpkg/pull/15790) [sentry-native] Update to 0.4.5 (by @AenBleidd) + - [(#15875)](https://github.com/microsoft/vcpkg/pull/15875) [sentry-native] Update to 0.4.6 (by @AenBleidd) + - [(#16021)](https://github.com/microsoft/vcpkg/pull/16021) [sentry-native] Update to 0.4.7 (by @AenBleidd) + - [(#16550)](https://github.com/microsoft/vcpkg/pull/16550) [sentry-native] Update to 0.4.8 (by @AenBleidd) + - [(#17413)](https://github.com/microsoft/vcpkg/pull/17413) [sentry-native] Update to 0.4.9 (by @AenBleidd) +- llvm `11.0.0#1` -> `11.0.0#7` + - [(#13998)](https://github.com/microsoft/vcpkg/pull/13998) [llvm] update to 11.0.0 (by @yurybura) + - [(#14399)](https://github.com/microsoft/vcpkg/pull/14399) [llvm] install tools in tools/llvm (by @strega-nil) + - [(#16232)](https://github.com/microsoft/vcpkg/pull/16232) [llvm] update to 11.1.0, add features and fix issues (by @yurybura) + - [(#16294)](https://github.com/microsoft/vcpkg/pull/16294) [llvm] Fix resource path when building tools (by @JackBoosY) + - [(#16877)](https://github.com/microsoft/vcpkg/pull/16877) [llvm] add features enable-{eh,ffi,bindings,terminfo,threads} (by @abique) +- bitmagic `6.4.0#0` -> `7.2.0#0` + - [(#17223)](https://github.com/microsoft/vcpkg/pull/17223) Update bitmagic version to 7.2.0 (by @klalumiere) +- gdcm `3.0.7#0` -> `3.0.7#1` + - [(#15089)](https://github.com/microsoft/vcpkg/pull/15089) [libarchive+tesseract+opencv] add missing libarchiveConfig.cmake, fix tesseract downstream and unblock opencv CI (by @cenit) +- qt5-networkauth `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- jsonnet `0.16.0#1` -> `0.16.0#2` + - [(#16335)](https://github.com/microsoft/vcpkg/pull/16335) [jsonnet] Incorporate md5.cpp into jsonnet library (by @tetsuh) +- google-cloud-cpp `1.24.0#0` -> `1.24.0#0` + - [(#14375)](https://github.com/microsoft/vcpkg/pull/14375) [google-cloud-cpp] Update to the v1.20.0 release (by @coryan) + - [(#14886)](https://github.com/microsoft/vcpkg/pull/14886) [google-cloud-cpp] update to latest release (v1.21.0) (by @coryan) + - [(#15510)](https://github.com/microsoft/vcpkg/pull/15510) [google-cloud-cpp] update to latest release (v1.22.0) (by @coryan) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#15669)](https://github.com/microsoft/vcpkg/pull/15669) [google-cloud-cpp] update to v1.23.0 (by @coryan) + - [(#16001)](https://github.com/microsoft/vcpkg/pull/16001) [google-cloud-cpp] update to the latest release (v1.24.0) (by @coryan) + - [(#16162)](https://github.com/microsoft/vcpkg/pull/16162) [google-cloud-cpp] populate license field (by @coryan) + - [(#16177)](https://github.com/microsoft/vcpkg/pull/16177) [google-cloud-cpp] use 'version' for version numbers (by @coryan) + - [(#16477)](https://github.com/microsoft/vcpkg/pull/16477) [google-cloud-cpp] update to latest release (v1.25.0) (by @coryan) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) + - [(#17027)](https://github.com/microsoft/vcpkg/pull/17027) [google-cloud-cpp] update to the latest release (v1.26.0) (by @coryan) +- oatpp-postgresql `1.2.0#0` -> `1.2.0#0` + - [(#14341)](https://github.com/microsoft/vcpkg/pull/14341) [oatpp] Add new port and vcpkg.json (by @mheyman) +- boost-geometry `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- libcroco `0.6.13#2` -> `0.6.13#2` + - [(#11776)](https://github.com/microsoft/vcpkg/pull/11776) [intl/gettext/fontconfig] update to native build system (by @Neumann-A) + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) +- phnt `2019-05-01#0` -> `2019-05-01#0` + - [(#15722)](https://github.com/microsoft/vcpkg/pull/15722) [phnt] Update to 2020-12-21 (by @ghost) +- kf5archive `5.74.0#1` -> `5.74.0#1` + - [(#13467)](https://github.com/microsoft/vcpkg/pull/13467) [many ports] Update existing KF5 frameworks to 5.75 (by @wrobelda) + - [(#15314)](https://github.com/microsoft/vcpkg/pull/15314) fix licensingfile of kf5archive (by @Hendiadyoin1) +- fxdiv `2021-02-21#0` -> `2021-02-21#0` + - [(#16341)](https://github.com/microsoft/vcpkg/pull/16341) [fxdiv] create a new port (by @luncliff) +- minimp3 `2019-07-24-1#0` -> `2020-12-25#0` + - [(#15295)](https://github.com/microsoft/vcpkg/pull/15295) [minimp3] update to 2020-11-27 (by @JonLiu1993) +- boost-optional `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- boost-metaparse `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- boost-uuid `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- libwebsockets `4.1.3#0` -> `4.1.6#0` + - [(#16767)](https://github.com/microsoft/vcpkg/pull/16767) [libwebsockets] Update to v4.1.6 (by @657870) + - [(#17003)](https://github.com/microsoft/vcpkg/pull/17003) [libwebsockets] Fix usage, export include path (by @JackBoosY) + - [(#17253)](https://github.com/microsoft/vcpkg/pull/17253) [libwebsockets] Update dependency (by @NancyLi1013) +- azure-uhttp-c `2020-07-19#0` -> `2020-12-09#0` + - [(#15109)](https://github.com/microsoft/vcpkg/pull/15109) Azure-IoT-Sdk for C release 2020-12-09 (by @ewertons) +- zlib `1.2.11#9` -> `1.2.11#10` + - [(#15725)](https://github.com/microsoft/vcpkg/pull/15725) [aws-cpp-sdk] [zlib] [openssl] [curl] Fix zlib, OpenSSL, curl and AWS SDK for Android (by @ahmedyarub) +- libcuckoo `2018-12-24-1#0` -> `0.3#0` + - [(#14462)](https://github.com/microsoft/vcpkg/pull/14462) [libcuckoo] Update version to v0.3 (by @westfly) +- opencv2 `2.4.13.7#3` -> `2.4.13.7#5` + - [(#12785)](https://github.com/microsoft/vcpkg/pull/12785) [OpenCV] fix compatibility with VTK9 (by @cenit) + - [(#15089)](https://github.com/microsoft/vcpkg/pull/15089) [libarchive+tesseract+opencv] add missing libarchiveConfig.cmake, fix tesseract downstream and unblock opencv CI (by @cenit) +- libgnutls `#0` -> `#0` + - [(#14242)](https://github.com/microsoft/vcpkg/pull/14242) [many ports] Add GnuTLS and its dependencies (by @wrobelda) + - [(#16810)](https://github.com/microsoft/vcpkg/pull/16810) [libgwenhywfar] new port (by @wrobelda) +- boost-units `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- cub `1.8.0-1#0` -> `1.8.0-1#0` + - [(#17355)](https://github.com/microsoft/vcpkg/pull/17355) [cub] update to 1.12.0 (by @JonLiu1993) +- llgl `2019-08-15#0` -> `2019-08-15#1` + - [(#15366)](https://github.com/microsoft/vcpkg/pull/15366) [LLGL] installs header files in the wrong directory (by @JonLiu1993) +- halide `10.0.0#0` -> `11.0.1#0` + - [(#13448)](https://github.com/microsoft/vcpkg/pull/13448) [BLAS] add metaport (by @cenit) + - [(#16246)](https://github.com/microsoft/vcpkg/pull/16246) [halide] Update Halide to 11.0.1 (by @alexreinking) +- boost-sort `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- boost-lambda `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- soqt `1.6.0-1#0` -> `1.6.0#2` + - [(#15384)](https://github.com/microsoft/vcpkg/pull/15384) [soqt] Use vcpkg_from_github. (by @BillyONeal) +- fastcdr `1.0.15#0` -> `1.0.15#0` + - [(#17112)](https://github.com/microsoft/vcpkg/pull/17112) [fastcdr] Fix support Linux (by @NancyLi1013) +- amqpcpp `4.1.7#0` -> `4.3.11#0` + - [(#16354)](https://github.com/microsoft/vcpkg/pull/16354) [amqpcpp] update to 4.3.11 (by @JonLiu1993) +- io2d `2020-09-14#1` -> `2020-09-14#1` + - [(#11776)](https://github.com/microsoft/vcpkg/pull/11776) [intl/gettext/fontconfig] update to native build system (by @Neumann-A) + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) +- boost-assign `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- ampl-mp `2020-11-11#0` -> `2020-11-11#0` + - [(#14245)](https://github.com/microsoft/vcpkg/pull/14245) [vcpkg baseline] Clean up baseline, use Keyword Supports Part 1 (by @JackBoosY) + - [(#14518)](https://github.com/microsoft/vcpkg/pull/14518) [ampl-mp] Update version, separate port ampl-asl and fix arm build (by @JackBoosY) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- armadillo `10.1.0#1` -> `10.1.0#1` + - [(#13448)](https://github.com/microsoft/vcpkg/pull/13448) [BLAS] add metaport (by @cenit) + - [(#15677)](https://github.com/microsoft/vcpkg/pull/15677) [vcpkg] Miscellaneous internal improvements extracted from #15424 (by @ras0219) + - [(#15973)](https://github.com/microsoft/vcpkg/pull/15973) [vcpkg baseline][armadillo] Update to 10.2.0 and also update the repository (by @NancyLi1013) + - [(#17297)](https://github.com/microsoft/vcpkg/pull/17297) [armadillo] update to <10.4.0> (by @JonLiu1993) +- opentracing `1.6.0#0` -> `1.6.0#0` + - [(#15151)](https://github.com/microsoft/vcpkg/pull/15151) [opentracing] Update VMs 2020-12 (by @BillyONeal) +- libjuice `0.5.2#0` -> `0.6.0#0` + - [(#14213)](https://github.com/microsoft/vcpkg/pull/14213) [libjuice] Update libjuice for libdatachannel port. (by @Nemirtingas) + - [(#17076)](https://github.com/microsoft/vcpkg/pull/17076) Update libjuice to 0.7.1 to update libdatachannel (by @Nemirtingas) +- argparse `2.1#0` -> `2.1#0` + - [(#16527)](https://github.com/microsoft/vcpkg/pull/16527) [argparse] Update to the latest commit (by @JonLiu1993) +- microsoft-signalr `0.1.0-alpha1#2` -> `0.1.0-alpha1#2` + - [(#14872)](https://github.com/microsoft/vcpkg/pull/14872) [microsoft-signalr] Fix build error on Linux (by @NancyLi1013) + - [(#16885)](https://github.com/microsoft/vcpkg/pull/16885) [microsoft-signalr] Update port with new version and find_package support (by @BrennanConroy) +- osg `3.6.5#2` -> `3.6.5#7` + - [(#11776)](https://github.com/microsoft/vcpkg/pull/11776) [intl/gettext/fontconfig] update to native build system (by @Neumann-A) + - [(#14790)](https://github.com/microsoft/vcpkg/pull/14790) [osg] Update dependency (by @NancyLi1013) + - [(#15044)](https://github.com/microsoft/vcpkg/pull/15044) [osg] build failure (by @JonLiu1993) + - [(#15374)](https://github.com/microsoft/vcpkg/pull/15374) [osg] fix x64-windows-static-md builds (by @ankurverma85) + - [(#15375)](https://github.com/microsoft/vcpkg/pull/15375) [osgearth] Fix x64-windows-static-md (by @ankurverma85) +- bext-di `1.2.0#0` -> `1.2.0#0` + - [(#16302)](https://github.com/microsoft/vcpkg/pull/16302) [bext-di] Rename `boost-di` to `bext-di` (by @krzysztof-jusiak) +- libsndfile `1.0.30#0` -> `1.0.31#0` + - [(#15953)](https://github.com/microsoft/vcpkg/pull/15953) [libsndfile] Update to 1.0.31 (by @evpobr) +- outcome `2.1.3#0` -> `2.2.0-b9e664fb#0` + - [(#15603)](https://github.com/microsoft/vcpkg/pull/15603) [outcome] Replace Outcome single header based port with full fat cmake install port (by @ned14) + - [(#17362)](https://github.com/microsoft/vcpkg/pull/17362) [Outcome] update to v2.2.0 release. (by @ned14) +- libcopp `1.3.2#0` -> `1.3.3#0` + - [(#14981)](https://github.com/microsoft/vcpkg/pull/14981) [libcopp] update to 1.3.3 (by @owent) + - [(#14997)](https://github.com/microsoft/vcpkg/pull/14997) [libcopp] Update to 1.3.4 (#14996) (by @owent) +- tiff `4.1.0#1` -> `4.1.0#2` + - [(#15734)](https://github.com/microsoft/vcpkg/pull/15734) [tiff] add vcpkg_fixup_pkgconfig for tiff (by @Neumann-A) + - [(#16610)](https://github.com/microsoft/vcpkg/pull/16610) [tiff] support zstd compression in TIFF image files (take 2) (by @ghesketh) +- tool-meson `0.55.3#0` -> `0.56.0#0` + - [(#12945)](https://github.com/microsoft/vcpkg/pull/12945) [meson|scripts] update scripts (by @Neumann-A) + - [(#14344)](https://github.com/microsoft/vcpkg/pull/14344) [tool-meson] Update to 0.56.0 (by @c72578) + - [(#15200)](https://github.com/microsoft/vcpkg/pull/15200) [tool-meson] Rev vcpkg's meson build (by @RichLogan) +- fast-float `0.8.0#0` -> `0.8.0#0` + - [(#16144)](https://github.com/microsoft/vcpkg/pull/16144) [fast-float] Add new port (by @georg-emg) +- physfs `3.0.2#0` -> `3.0.2#0` + - [(#15637)](https://github.com/microsoft/vcpkg/pull/15637) [physfs] Enable arm64 for non-Windows targets (by @past-due) + - [(#15684)](https://github.com/microsoft/vcpkg/pull/15684) [physfs] Fix arm64-windows (by @past-due) +- boost-contract `1.75.0#0` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- open62541 `1.1.2#0` -> `1.1.2#0` + - [(#16969)](https://github.com/microsoft/vcpkg/pull/16969) [open62541] add amalgamation feature (by @Neumann-A) +- hedley `2019-05-08-1#0` -> `14#0` + - [(#15240)](https://github.com/microsoft/vcpkg/pull/15240) [Hedley] Update to v14 (by @pratikpc) +- rtabmap `0.20.3#0` -> `0.20.3#0` + - [(#14299)](https://github.com/microsoft/vcpkg/pull/14299) [rtabmap] New port (by @seanyen) + - [(#14400)](https://github.com/microsoft/vcpkg/pull/14400) [vcpkg baseline] [rtabmap] Set option dependencies OFF (by @PhoebeHui) + - [(#14426)](https://github.com/microsoft/vcpkg/pull/14426) [vcpkg baseline][rtabmap] Fix dependency issue when build tools (by @PhoebeHui) +- leptonica `1.80.0#1` -> `1.80.0#2` + - [(#14655)](https://github.com/microsoft/vcpkg/pull/14655) [leptonica] add missing dependency (by @cenit) + - [(#16226)](https://github.com/microsoft/vcpkg/pull/16226) [leptonica] now all dependencies have their own find_dependency... (by @cenit) +- oatpp-consul `1.2.0#1` -> `1.2.0#0` + - [(#14341)](https://github.com/microsoft/vcpkg/pull/14341) [oatpp] Add new port and vcpkg.json (by @mheyman) +- box2d `2.4.0#0` -> `2.4.0#0` + - [(#16322)](https://github.com/microsoft/vcpkg/pull/16322) [box2d] update to 2.4.1 (by @JonLiu1993) +- boost `1.74.0#4` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- boost-serialization `1.75.0#0` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- ompl `1.5.0#1` -> `1.5.1#0` + - [(#15276)](https://github.com/microsoft/vcpkg/pull/15276) [ompl] upgrade to v1.5.1 (by @seanyen) +- liblzma `5.2.5#1` -> `5.2.5#2` + - [(#14615)](https://github.com/microsoft/vcpkg/pull/14615) [liblzma] use upstream CMakeLists.txt + Add pkgconfig. (by @Neumann-A) +- coin `4.0.0#1` -> `4.0.0#2` + - [(#15125)](https://github.com/microsoft/vcpkg/pull/15125) [coin] x64-windows-statid-md fixes (by @ankurverma85) +- gmp `6.2.1#0` -> `6.2.1#0` + - [(#13081)](https://github.com/microsoft/vcpkg/pull/13081) [mpc/mpfr] Add new port / update mpfr (by @Neumann-A) + - [(#15236)](https://github.com/microsoft/vcpkg/pull/15236) [gmp/nettle] Update to latest release revision (by @PhoebeHui) + - [(#15957)](https://github.com/microsoft/vcpkg/pull/15957) [gmp] correct supports field to run CI for other platforms (by @Neumann-A) + - [(#17264)](https://github.com/microsoft/vcpkg/pull/17264) [Gmp] add cflags to build commands for compiletime tools (by @xandox) +- boost-accumulators `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- openmpi `4.0.3#3` -> `4.1.0#0` + - [(#17026)](https://github.com/microsoft/vcpkg/pull/17026) Openmpi keep -isystem flags in configure scripts (by @xandox) +- civetweb `1.13#0` -> `1.13#1` + - [(#15168)](https://github.com/microsoft/vcpkg/pull/15168) [civetweb] Disable extensive log output for debug builds (by @gjasny) +- hazelcast-cpp-client `#0` -> `#0` + - [(#16235)](https://github.com/microsoft/vcpkg/pull/16235) [hazelcast-cpp-client] Add new port (by @ihsandemir) + - [(#16593)](https://github.com/microsoft/vcpkg/pull/16593) [hazelcast-cpp-client] New version update to 4.0.1 (by @ihsandemir) +- boost-signals `1.68.0-1#0` -> `1.68.0-1#0` + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) +- libmariadb `3.1.10#1` -> `3.1.10#5` + - [(#14290)](https://github.com/microsoft/vcpkg/pull/14290) [libmysql/libmariadb] Export unofficial cmake targets (by @JackBoosY) + - [(#14533)](https://github.com/microsoft/vcpkg/pull/14533) [libmariadb] Export target mariadbclient (by @JackBoosY) + - [(#14763)](https://github.com/microsoft/vcpkg/pull/14763) [poco] Fix dependency libmariadb (by @JackBoosY) + - [(#15699)](https://github.com/microsoft/vcpkg/pull/15699) [libmariadb] Fix compiling on ARM64 (by @kotori2) + - [(#17004)](https://github.com/microsoft/vcpkg/pull/17004) [libmariadb] update to the 3.1.12 (by @JonLiu1993) + - [(#17113)](https://github.com/microsoft/vcpkg/pull/17113) [libmariadb] Fix build error with cmake 3.20.0 (by @NancyLi1013) +- freeglut `3.2.1-4#0` -> `3.2.1#5` + - [(#16911)](https://github.com/microsoft/vcpkg/pull/16911) [freeglut] Don't enforce x64 when the compiler is 64 bit (by @davidebeatrici) +- boost-di `1.1.0-1#0` -> `1.2.0#0` + - [(#15286)](https://github.com/microsoft/vcpkg/pull/15286) [boost-di] Update to 1.2.0 (by @PhoebeHui) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- speexdsp `1.2.0#3` -> `1.2.0#5` + - [(#14758)](https://github.com/microsoft/vcpkg/pull/14758) [speexdsp] Update CMake script for macOS/Linux (by @LRFLEW) + - [(#15036)](https://github.com/microsoft/vcpkg/pull/15036) [speexdsp] Fix include directories for Linux builds (by @LRFLEW) + - [(#15585)](https://github.com/microsoft/vcpkg/pull/15585) [speexdsp] Configure and install speexdsp.pc (by @adam-bloom) +- ignition-modularscripts `2020-05-16#2` -> `2020-11-23#0` + - [(#14730)](https://github.com/microsoft/vcpkg/pull/14730) [ignition-msgs*] Fix flaky CI tests for ignition-msgs* ports (take 2) (by @traversaro) +- leaf `0.2.2#0` -> `0.2.2#0` + - [(#15353)](https://github.com/microsoft/vcpkg/pull/15353) Build results from 2020-12-27 (by @BillyONeal) +- nanodbc `2.13.0#0` -> `2.13.0#2` + - [(#16045)](https://github.com/microsoft/vcpkg/pull/16045) Nanodbc/fix/config cmake files path linux (by @samyy321) +- mongoose `6.15-2#0` -> `6.15-2#0` + - [(#16493)](https://github.com/microsoft/vcpkg/pull/16493) [mongoose] update to 7.1 (by @JonLiu1993) +- boost-histogram `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- kf5config `5.64.0#0` -> `5.64.0#0` + - [(#13467)](https://github.com/microsoft/vcpkg/pull/13467) [many ports] Update existing KF5 frameworks to 5.75 (by @wrobelda) +- boost-smart-ptr `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- boost-atomic `1.75.0#0` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- moos-core `10.4.0-4#0` -> `10.4.0#5` + - [(#14884)](https://github.com/microsoft/vcpkg/pull/14884) [vcpkg baseline][vtk-m] fix the sha512 (by @strega-nil) +- libpq `12.2#8` -> `12.2#12` + - [(#14626)](https://github.com/microsoft/vcpkg/pull/14626) [libpq/ffmpeg] Fix iconv/intl linkage not covered by CI (by @Neumann-A) + - [(#15361)](https://github.com/microsoft/vcpkg/pull/15361) [libpq] Change compile flag /Zi to /Z7 when building Windows (by @JackBoosY) + - [(#15579)](https://github.com/microsoft/vcpkg/pull/15579) [libpq] fix python patches (by @Neumann-A) + - [(#15748)](https://github.com/microsoft/vcpkg/pull/15748) [libpq] Fix install tool pg_config on Linux (by @JackBoosY) + - [(#16434)](https://github.com/microsoft/vcpkg/pull/16434) [libpq] fix filenames (linux -> windows cross compile) (by @autoantwort) + - [(#16651)](https://github.com/microsoft/vcpkg/pull/16651) [drogon] Update to 1.4.1 (by @an-tao) + - [(#16740)](https://github.com/microsoft/vcpkg/pull/16740) [libpq] mingw support (by @longnguyen2004) + - [(#17232)](https://github.com/microsoft/vcpkg/pull/17232) [libpq] Fix cmake wrapper on Windows, add usage (by @JackBoosY) +- protopuf `1.0.0#0` -> `1.0.0#0` + - [(#14446)](https://github.com/microsoft/vcpkg/pull/14446) [protopuf] Add a new port protopuf (by @PragmaTwice) + - [(#16459)](https://github.com/microsoft/vcpkg/pull/16459) [protopuf] Update to 1.0.1 (by @PragmaTwice) +- blend2d `beta_2020-08-24#0` -> `beta_2021-01-02#0` + - [(#15672)](https://github.com/microsoft/vcpkg/pull/15672) [blend2d] Update to beta_2021-01-02 (by @ZeeWanderer) + - [(#16804)](https://github.com/microsoft/vcpkg/pull/16804) [blend2d] Update to beta_2021-03-17 (by @ZeeWanderer) +- ecos `2.0.7#0` -> `2.0.8#0` + - [(#17471)](https://github.com/microsoft/vcpkg/pull/17471) [ecos] Update ecos library version to 2.0.8 (by @csorvagep) +- boost-date-time `1.75.0#0` -> `1.75.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) + - [(#16479)](https://github.com/microsoft/vcpkg/pull/16479) [many ports] Apply host dependencies (by @ras0219) +- geotrans `3.7#0` -> `3.8#0` + - [(#14412)](https://github.com/microsoft/vcpkg/pull/14412) [geotrans] update to version 3.8 (on-hold waiting for CI/VM port 21 for ftp to be opened or alternate host site) (by @StarGate-One) +- lapack `3#0` -> `3#1` + - [(#13448)](https://github.com/microsoft/vcpkg/pull/13448) [BLAS] add metaport (by @cenit) +- boost-multiprecision `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- qt5-multimedia `5.15.1#0` -> `5.15.2#0` + - [(#14678)](https://github.com/microsoft/vcpkg/pull/14678) [qt5] Update to 5.15.2 (by @Neumann-A) +- flashlight-cpu `20210111#0` -> `20210111#0` + - [(#15514)](https://github.com/microsoft/vcpkg/pull/15514) [flashlight-cpu] New port (by @jacobkahn) + - [(#17432)](https://github.com/microsoft/vcpkg/pull/17432) [flashlight-cpu] Update port to v0.3 (by @jacobkahn) +- boost-interprocess `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- pthreadpool `#0` -> `#0` + - [(#16342)](https://github.com/microsoft/vcpkg/pull/16342) [pthreadpool] create a new port (by @luncliff) + - [(#17196)](https://github.com/microsoft/vcpkg/pull/17196) [pthreadpool] update sources and support find_package (by @luncliff) +- boost-ratio `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- libarchive `3.4.3#1` -> `3.4.3#3` + - [(#14535)](https://github.com/microsoft/vcpkg/pull/14535) [libarchive] Fix dependencies, combine patches (by @JackBoosY) + - [(#14579)](https://github.com/microsoft/vcpkg/pull/14579) [baseline][libarchive] : regression fix (by @Matioupi) + - [(#15089)](https://github.com/microsoft/vcpkg/pull/15089) [libarchive+tesseract+opencv] add missing libarchiveConfig.cmake, fix tesseract downstream and unblock opencv CI (by @cenit) + - [(#16082)](https://github.com/microsoft/vcpkg/pull/16082) [libarchive] Fix static linking dependencies (by @DDoSolitary) + - [(#16957)](https://github.com/microsoft/vcpkg/pull/16957) [libarchive] Remove lzo from the default feature list (by @PhoebeHui) +- fakeit `#0` -> `#0` + - [(#16875)](https://github.com/microsoft/vcpkg/pull/16875) [fakeit] add new port (by @autoantwort) +- dartsim `6.9.4#0` -> `6.9.4#0` + - [(#17331)](https://github.com/microsoft/vcpkg/pull/17331) Update VMs, CMake to 3.20.1, CUDA to 11.3, and pwsh to 7.1.3 (by @BillyONeal) +- tesseract `4.1.1#1` -> `4.1.1#7` + - [(#11776)](https://github.com/microsoft/vcpkg/pull/11776) [intl/gettext/fontconfig] update to native build system (by @Neumann-A) + - [(#12785)](https://github.com/microsoft/vcpkg/pull/12785) [OpenCV] fix compatibility with VTK9 (by @cenit) + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) + - [(#14650)](https://github.com/microsoft/vcpkg/pull/14650) [tesseract] Enable dynamic build, format portfile.cmake (by @JackBoosY) + - [(#15089)](https://github.com/microsoft/vcpkg/pull/15089) [libarchive+tesseract+opencv] add missing libarchiveConfig.cmake, fix tesseract downstream and unblock opencv CI (by @cenit) + - [(#15787)](https://github.com/microsoft/vcpkg/pull/15787) [ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (by @Sibras) +- atkmm `2.24.2#3` -> `2.24.2#5` + - [(#13100)](https://github.com/microsoft/vcpkg/pull/13100) [glib up to gtk] update and make it work with meson (by @Neumann-A) + - [(#14988)](https://github.com/microsoft/vcpkg/pull/14988) [GLIBMM] Installing .pc file (by @faserg1) + - [(#15353)](https://github.com/microsoft/vcpkg/pull/15353) Build results from 2020-12-27 (by @BillyONeal) +- restc-cpp `#0` -> `#0` + - [(#15739)](https://github.com/microsoft/vcpkg/pull/15739) [restc-cpp] new port (by @lejcik) +- log4cxx `0.11.0#1` -> `0.11.0#2` + - [(#16018)](https://github.com/microsoft/vcpkg/pull/16018) [log4cxx] Fix dependency and pkgconfig (by @NancyLi1013) +- libdjinterop `0.14.6#0` -> `0.14.6#0` + - [(#15990)](https://github.com/microsoft/vcpkg/pull/15990) [libdjinterop] add new port with version 0.14.6 (by @Be-ing) +- opencl `2.2#4` -> `2.2#7` + - [(#14536)](https://github.com/microsoft/vcpkg/pull/14536) [opencl] Remove feature wdk (by @PhoebeHui) + - [(#15445)](https://github.com/microsoft/vcpkg/pull/15445) [opencl] Fix dynamic build on linux (by @dweckmann) + - [(#15787)](https://github.com/microsoft/vcpkg/pull/15787) [ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (by @Sibras) +- ngspice `34#1` -> `34#1` + - [(#15837)](https://github.com/microsoft/vcpkg/pull/15837) [ngspice] Update to rev 33 (by @marekr) + - [(#15882)](https://github.com/microsoft/vcpkg/pull/15882) [ngspice] build codemodel extension libraries (by @marekr) + - [(#16008)](https://github.com/microsoft/vcpkg/pull/16008) [ngspice] Update to rev 34 (by @marekr) + - [(#16131)](https://github.com/microsoft/vcpkg/pull/16131) [ngspice] fix win32 codemodel glob (by @marekr) +- boost-compatibility `1.74.0#0` -> `1.74.0#0` + - [(#14089)](https://github.com/microsoft/vcpkg/pull/14089) [boost] Update to 1.74.0 (by @niclar) + - [(#14969)](https://github.com/microsoft/vcpkg/pull/14969) [icu] mingw support + [mp3lame] Fix VCPKG_TARGET_STATIC_LIBRARY_SUFFIX (by @longnguyen2004) + - [(#15090)](https://github.com/microsoft/vcpkg/pull/15090) [boost] update to 1.75.0 (by @yurybura) + - [(#15616)](https://github.com/microsoft/vcpkg/pull/15616) [boost][many ports] Reformat manifest files in preparation for #15424 (by @ras0219) +- osg-qt `Qt4#3` -> `Qt4#3` + - [(#14422)](https://github.com/microsoft/vcpkg/pull/14422) [osg-qt] Fix installation when building static on Windows (by @JackBoosY) + - [(#14761)](https://github.com/microsoft/vcpkg/pull/14761) update osg-qt from Qt4 tag to master branch(Qt5) (by @ZgblKylin) +- sdl2-gfx `1.0.4-6#0` -> `1.0.4#7` + - [(#14348)](https://github.com/microsoft/vcpkg/pull/14348) [libsamplerate, sdl2-gfx] Fix build error with Visual Studio 2019 version 16.8 (by @LilyWangL) +- metrohash `1.1.3#0` -> `1.1.3#0` + - [(#15715)](https://github.com/microsoft/vcpkg/pull/15715) [metrohash] support Android triplet build (by @luncliff) + - [(#16035)](https://github.com/microsoft/vcpkg/pull/16035) [metrohash] support iOS triplets (by @luncliff) + - [(#16553)](https://github.com/microsoft/vcpkg/pull/16553) [metrohash] support more triplets by excluding 128 CRC source (by @luncliff) +- libhv `#0` -> `#0` + - [(#16460)](https://github.com/microsoft/vcpkg/pull/16460) [libhv] Add new port (by @ithewei) + - [(#16835)](https://github.com/microsoft/vcpkg/pull/16835) [libhv] Add DISABLE_PARALLEL (by @NancyLi1013) + - [(#17331)](https://github.com/microsoft/vcpkg/pull/17331) Update VMs, CMake to 3.20.1, CUDA to 11.3, and pwsh to 7.1.3 (by @BillyONeal) +- libodb-mysql `2.4.0-7#0` -> `2.4.0-7#0` + - [(#16975)](https://github.com/microsoft/vcpkg/pull/16975) [libodb-mysql] Fix usage (by @JackBoosY) +- termcolor `1.0.1#0` -> `1.0.1#0` + - [(#14897)](https://github.com/microsoft/vcpkg/pull/14897) [termcolor]; Add termcolor (by @theidexisted) + - [(#16824)](https://github.com/microsoft/vcpkg/pull/16824) [termcolor] update to 2.0.0 (by @JonLiu1993) +- eastl `3.16.07#0` -> `3.17.03#0` + - [(#14980)](https://github.com/microsoft/vcpkg/pull/14980) [EASTL] update to 3.17.03 (by @JonLiu1993) + +
+ +-- vcpkg team vcpkg@microsoft.com Sat, 01 May 00:00:00 -0700 + +vcpkg (2020.11.03) +--- +#### Total port count: 1519 +#### Total port count per triplet (tested): +|triplet|ports available| +|---|---| +|**x64-windows**|1374| +|x86-windows|1346| +|**x64-linux**|1269| +|x64-windows-static|1266| +|**x64-osx**|1202| +|arm64-windows|985| +|x64-uwp|753| +|arm-uwp|711| + +##### The following documentation has been updated: +- [Selecting Library Features](docs/users/selecting-library-features.md) ***[NEW]*** + - [(#14189)](https://github.com/microsoft/vcpkg/pull/14189) [vcpkg] User help: selecting-library-features.md (by @vmiheer) + +#### The following *additional* changes have been made to vcpkg's infrastructure: +- [(#14317)](https://github.com/microsoft/vcpkg/pull/14317) [vcpkg] Fix incorrect determination of PowerShell not found (by @BillyONeal) +- [(#14206)](https://github.com/microsoft/vcpkg/pull/14206) [vcpkg] Add tab completion for Fish (by @Link1J) +- [(#14367)](https://github.com/microsoft/vcpkg/pull/14367) Add CHANGELOG up to 2020.11.01 (by @vicroms) +- [(#14366)](https://github.com/microsoft/vcpkg/pull/14366) [vcpkg] Disable vcpkg_copy_tool_dependencies on non-Windows (by @BillyONeal) + +
+The following 1 ports have been added: + +|port|version| +|---|---| +|[elfio](https://github.com/microsoft/vcpkg/pull/14314)| 3.8#0 +
+ +
+The following 0 ports have been updated: + +
+ +-- vcpkg team vcpkg@microsoft.com TUE, 03 Nov 14:35:00 -0800 + +vcpkg (2020.11.01) +--- +#### Total port count: 1519 +#### Total port count per triplet (tested): +|triplet|ports available| +|---|---| +|**x64-windows**|1374| +|x86-windows|1346| +|**x64-linux**|1269| +|x64-windows-static|1266| +|**x64-osx**|1202| +|arm64-windows|985| +|x64-uwp|753| +|arm-uwp|711| + +#### The following commands and options have been updated: +- [Environment and Configuration](docs/users/config-environment.md) + - [(#12640)](https://github.com/microsoft/vcpkg/pull/12640) [vcpkg] add environment variable VCPKG_OVERLAY_PORTS (by @Neumann-A) + - [(#12790)](https://github.com/microsoft/vcpkg/pull/12790) [vcpkg] add env var VCPKG_OVERLAY_TRIPLETS (by @Neumann-A) +- [Package Federation: Custom Registries](docs/specifications/registries.md)***[NEW]*** + - [(#12881)](https://github.com/microsoft/vcpkg/pull/12881) [vcpkg RFC] initial registries RFC (by @strega-nil) +- [Manifest Mode](docs/users/manifests.md)***[NEW]*** + - [(#13488)](https://github.com/microsoft/vcpkg/pull/13488) [vcpkg manifest] Add documentation! (by @strega-nil) + - [(#13578)](https://github.com/microsoft/vcpkg/pull/13578) Fix feature flags option typo (by @strega-nil) + - [(#13399)](https://github.com/microsoft/vcpkg/pull/13399) [vcpkg] Further JSON error improvements (by @strega-nil) +- [Binary Caching](docs/users/binarycaching.md)***[NEW]*** + - [(#13517)](https://github.com/microsoft/vcpkg/pull/13517) [vcpkg-docs] Add docs/users/binarycaching.md (by @ras0219) + - [(#13641)](https://github.com/microsoft/vcpkg/pull/13641) [vcpkg-docs] Add note about GitHub hosted agents (by @ras0219) + +#### The following documentation has been updated: +- [Buildsystem Integration](docs/users/integration.md) + - [(#12145)](https://github.com/microsoft/vcpkg/pull/12145) [vcpkg] Update message in bootstrap.ps1 (by @PhoebeHui) + - [(#12873)](https://github.com/microsoft/vcpkg/pull/12873) [vcpkg] Fix bullet lists for integration.md on readthedocs.io (by @PhoebeHui) +- [vcpkg_from_sourceforge](docs/maintainers/vcpkg_from_sourceforge.md) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) (by @JackBoosY) + - [(#12254)](https://github.com/microsoft/vcpkg/pull/12254) [vcpkg] Track hashes of cmake script helpers in consuming portfiles (by @JackBoosY) +- [Installing and Using Packages Example: SQLite](docs/examples/installing-and-using-packages.md) + - [(#12200)](https://github.com/microsoft/vcpkg/pull/12200) [vcpkg] Implement --editable (by @ras0219) + - [(#12516)](https://github.com/microsoft/vcpkg/pull/12516) [sqlite3] Namespaced targets with unofficial:: (by @ras0219) +- [Packaging Zipfiles Example: zlib](docs/examples/packaging-zipfiles.md) + - [(#12200)](https://github.com/microsoft/vcpkg/pull/12200) [vcpkg] Implement --editable (by @ras0219) + - [(#13488)](https://github.com/microsoft/vcpkg/pull/13488) [vcpkg manifest] Add documentation! (by @ras0219) +- [Patching Example: Patching libpng to work for x64-uwp](docs/examples/patching.md) + - [(#12200)](https://github.com/microsoft/vcpkg/pull/12200) [vcpkg] Implement --editable (by @ras0219) + - [(#13488)](https://github.com/microsoft/vcpkg/pull/13488) [vcpkg manifest] Add documentation! (by @ras0219) +- [CONTROL files](docs/maintainers/control-files.md) + - [(#12227)](https://github.com/microsoft/vcpkg/pull/12227) [vcpkg manifests] fix some issues (by @strega-nil) + - [(#13488)](https://github.com/microsoft/vcpkg/pull/13488) [vcpkg manifest] Add documentation! (by @strega-nil) +- [Portfile helper functions](docs/maintainers/portfile-functions.md) + - [(#12254)](https://github.com/microsoft/vcpkg/pull/12254) [vcpkg] Track hashes of cmake script helpers in consuming portfiles (by @ras0219) + - [(#13065)](https://github.com/microsoft/vcpkg/pull/13065) Delete use of vcpkg_test_cmake and vcpkg_common_functions. (by @ras0219) +- [vcpkg_build_make](docs/maintainers/vcpkg_build_make.md) + - [(#12254)](https://github.com/microsoft/vcpkg/pull/12254) [vcpkg] Track hashes of cmake script helpers in consuming portfiles (by @ras0219) +- [vcpkg_common_definitions](docs/maintainers/vcpkg_common_definitions.md) + - [(#12254)](https://github.com/microsoft/vcpkg/pull/12254) [vcpkg] Track hashes of cmake script helpers in consuming portfiles (by @ras0219) +- [vcpkg_configure_make](docs/maintainers/vcpkg_configure_make.md) + - [(#12254)](https://github.com/microsoft/vcpkg/pull/12254) [vcpkg] Track hashes of cmake script helpers in consuming portfiles (by @ras0219) +- [vcpkg_find_acquire_program](docs/maintainers/vcpkg_find_acquire_program.md) + - [(#12254)](https://github.com/microsoft/vcpkg/pull/12254) [vcpkg] Track hashes of cmake script helpers in consuming portfiles (by @ras0219) + - [(#12396)](https://github.com/microsoft/vcpkg/pull/12396) [chromium-base] Add new port (by @ras0219) +- [vcpkg_fixup_pkgconfig](docs/maintainers/vcpkg_fixup_pkgconfig.md)***[NEW]*** + - [(#12254)](https://github.com/microsoft/vcpkg/pull/12254) [vcpkg] Track hashes of cmake script helpers in consuming portfiles (by @ras0219) +- [Binary Caching v1.1](docs/specifications/binarycaching.md)***[NEW]*** + - [(#11204)](https://github.com/microsoft/vcpkg/pull/11204) [vcpkg] RFC: Binarycaching (by @ras0219-msft) + - [(#13517)](https://github.com/microsoft/vcpkg/pull/13517) [vcpkg-docs] Add docs/users/binarycaching.md (by @ras0219-msft) +- [Triplet files](docs/users/triplets.md) + - [(#12211)](https://github.com/microsoft/vcpkg/pull/12211) [corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06 (by @Squareys) + - [(#11290)](https://github.com/microsoft/vcpkg/pull/11290) [vcpkg] #11129: Add VCPKG_LINKER_FLAGS_. (by @Squareys) + - [(#13488)](https://github.com/microsoft/vcpkg/pull/13488) [vcpkg manifest] Add documentation! (by @Squareys) +- [Maintainer Guidelines and Policies](docs/maintainers/maintainer-guide.md) + - [(#12460)](https://github.com/microsoft/vcpkg/pull/12460) [vcpkg] Improve format check failure message (by @JackBoosY) + - [(#13488)](https://github.com/microsoft/vcpkg/pull/13488) [vcpkg manifest] Add documentation! (by @JackBoosY) +- [vcpkg_check_linkage](docs/maintainers/vcpkg_check_linkage.md) + - [(#12624)](https://github.com/microsoft/vcpkg/pull/12624) Fix .gitignore excluding triplets/community, sort, and driveby vcpkg_check_linkage.md doc bug. (by @BillyONeal) +- [Overlay triplets example](docs/examples/overlay-triplets-linux-dynamic.md) + - [(#12516)](https://github.com/microsoft/vcpkg/pull/12516) [sqlite3] Namespaced targets with unofficial:: (by @PhoebeHui) +- [vcpkg_configure_cmake](docs/maintainers/vcpkg_configure_cmake.md) + - [(#12846)](https://github.com/microsoft/vcpkg/pull/12846) [vcpkg_configure_cmake] Pass CMAKE_DISABLE_SOURCE_CHANGES to all ports by default (by @ras0219) +- [execute_process](docs/maintainers/execute_process.md) + - [(#12926)](https://github.com/microsoft/vcpkg/pull/12926) [execute_process] Don't strip embedded semicolons (by @jgehw) +- [Layout of the vcpkg source tree](docs/tool-maintainers/layout.md) + - [(#13421)](https://github.com/microsoft/vcpkg/pull/13421) [vcpkg] Merge the vcpkg metadata uploader into the vcpkg binary (by @BillyONeal) +- [Manifest Mode: CMake Example](docs/examples/manifest-mode-cmake.md)***[NEW]*** + - [(#13488)](https://github.com/microsoft/vcpkg/pull/13488) [vcpkg manifest] Add documentation! (by @strega-nil) +- [Packaging Github Repos Example: libogg](docs/examples/packaging-github-repos.md) + - [(#13488)](https://github.com/microsoft/vcpkg/pull/13488) [vcpkg manifest] Add documentation! (by @strega-nil) +- [Quick Start](docs/README.md) + - [(#13488)](https://github.com/microsoft/vcpkg/pull/13488) [vcpkg manifest] Add documentation! (by @strega-nil) +- [Manifest files - `vcpkg.json`](docs/maintainers/manifest-files.md)***[NEW]*** + - [(#13488)](https://github.com/microsoft/vcpkg/pull/13488) [vcpkg manifest] Add documentation! (by @strega-nil) +- [Vcpkg PR Checklist](docs/maintainers/pr-review-checklist.md) + - [(#13488)](https://github.com/microsoft/vcpkg/pull/13488) [vcpkg manifest] Add documentation! (by @strega-nil) + +#### The following *additional* changes have been made to vcpkg's infrastructure: +- [(#12172)](https://github.com/microsoft/vcpkg/pull/12172) [vcpkg ci] add macos scripts to vcpkg repo (by @strega-nil) +- [(#12176)](https://github.com/microsoft/vcpkg/pull/12176) [vcpkg] VM Update (by @BillyONeal) +- [(#12138)](https://github.com/microsoft/vcpkg/pull/12138) [vcpkg] Implement --x-write-nuget-packages-config= setting for `install` and `x-set-installed` (by @ras0219) +- [(#12192)](https://github.com/microsoft/vcpkg/pull/12192) Fix sourceparagraph:BooleanField (by @strega-nil) +- [(#12191)](https://github.com/microsoft/vcpkg/pull/12191) Don't change manifest root when manifest isn't enabled. (by @dada2048) +- [(#12170)](https://github.com/microsoft/vcpkg/pull/12170) [vcpkg] Enable NuGet-based binary caching via mono (by @ras0219) +- [(#12145)](https://github.com/microsoft/vcpkg/pull/12145) [vcpkg] Update message in bootstrap.ps1 (by @PhoebeHui) +- [(#12201)](https://github.com/microsoft/vcpkg/pull/12201) [vcpkg] Remove all uses of Foo::Foo() noexcept = default; to fix #9955 (by @ras0219) +- [(#12203)](https://github.com/microsoft/vcpkg/pull/12203) [vcpkg] Improve performance of compiler tracking (by @ras0219) +- [(#12212)](https://github.com/microsoft/vcpkg/pull/12212) [msbuild] Revert the importance to Normal (by @PhoebeHui) +- [(#12197)](https://github.com/microsoft/vcpkg/pull/12197) [vcpkg] Remove the tombstones and 'ignore' baseline concepts. (by @BillyONeal) +- [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) (by @JackBoosY) +- [(#4608)](https://github.com/microsoft/vcpkg/pull/4608) [vcpkg] Use IncludePath and LibraryPath properties (by @FrankHeimes) +- [(#12242)](https://github.com/microsoft/vcpkg/pull/12242) [vcpkg] Remove use of std::variant and std::visit to fix VS2015. (by @ras0219) +- [(#12272)](https://github.com/microsoft/vcpkg/pull/12272) [vcpkg] Revert change which causes sources to be purged by default in `vcpkg build` (by @ras0219) +- [(#12263)](https://github.com/microsoft/vcpkg/pull/12263) [vcpkg] Update toolsrc VERSION to 2020.06.15 (by @c72578) +- [(#12232)](https://github.com/microsoft/vcpkg/pull/12232) [opengl wincrypt winsock2] Use $ENV{WindowsSdkDir} instead of hard coding Windows SDK paths. (by @BillyONeal) +- [(#12219)](https://github.com/microsoft/vcpkg/pull/12219) [openvr] Update to 1.12.5 (by @RT222) +- [(#12177)](https://github.com/microsoft/vcpkg/pull/12177) [vcpkg] Added python script to generate all packages file list, added to azur… (by @yaoleo34) +- [(#12101)](https://github.com/microsoft/vcpkg/pull/12101) [vcpkg] Add mingw dynamic libs triplet (by @longnguyen2004) +- [(#11655)](https://github.com/microsoft/vcpkg/pull/11655) [vcpkg] Format the C++ in CI (by @strega-nil) +- [(#12093)](https://github.com/microsoft/vcpkg/pull/12093) [vcpkg docs] new README/Quick Start guide (by @strega-nil) +- [(#12300)](https://github.com/microsoft/vcpkg/pull/12300) [libbson, vcpkg baseline] Remove passing and fix spurious failure. (by @BillyONeal) +- [(#12200)](https://github.com/microsoft/vcpkg/pull/12200) [vcpkg] Implement --editable (by @ras0219) +- [(#12140)](https://github.com/microsoft/vcpkg/pull/12140) [simdjson] Update to 0.4.6 (by @myd7349) +- [(#11967)](https://github.com/microsoft/vcpkg/pull/11967) [evpp] Fix build error on OSX (by @JackBoosY) +- [(#12314)](https://github.com/microsoft/vcpkg/pull/12314) [vcpkg ci] Update formatting CI (by @strega-nil) +- [(#12259)](https://github.com/microsoft/vcpkg/pull/12259) [triplets][osx] add support for arm64 'apple silicon' (by @eklipse2k8) +- [(#11754)](https://github.com/microsoft/vcpkg/pull/11754) [pcre2] Update to 10.35 (by @c72578) +- [(#11753)](https://github.com/microsoft/vcpkg/pull/11753) Fix support for toolchains that set CMAKE_FIND_ROOT_PATH_MODE_* variables to ONLY (by @traversaro) +- [(#12317)](https://github.com/microsoft/vcpkg/pull/12317) [vcpkg README] Fix links (by @strega-nil) +- [(#12319)](https://github.com/microsoft/vcpkg/pull/12319) [vcpkg.targets] Fix #12292 regression with MSBuild targets (by @ras0219-msft) +- [(#12323)](https://github.com/microsoft/vcpkg/pull/12323) [vcpkg] Ignore dependencies not found errors when downloading mode (by @JackBoosY) +- [(#12257)](https://github.com/microsoft/vcpkg/pull/12257) [vcpkg] Fix MSBuild regressions #12062 and #12086. (by @ras0219) +- [(#12037)](https://github.com/microsoft/vcpkg/pull/12037) [freerdp] Fix x64-osx triplet (by @AlexAltea) +- [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. (by @Neumann-A) +- [(#12227)](https://github.com/microsoft/vcpkg/pull/12227) [vcpkg manifests] fix some issues (by @strega-nil) +- [(#8322)](https://github.com/microsoft/vcpkg/pull/8322) [kfr] Add new port (by @myd7349) +- [(#12244)](https://github.com/microsoft/vcpkg/pull/12244) [cuda] correct env variables for newer cuda versions (by @Neumann-A) +- [(#12256)](https://github.com/microsoft/vcpkg/pull/12256) [vcpkg] Move default binary cache from `$root/archives` to user-wide directory (by @ras0219) +- [(#12350)](https://github.com/microsoft/vcpkg/pull/12350) [vcpkg] Remove unnecessary work queue (by @strega-nil) +- [(#12367)](https://github.com/microsoft/vcpkg/pull/12367) [vcpkg build] fix #12355 (by @strega-nil) +- [(#12369)](https://github.com/microsoft/vcpkg/pull/12369) [vcpkg formatting] Fix format regex (by @strega-nil) +- [(#12178)](https://github.com/microsoft/vcpkg/pull/12178) [vcpkg] Add a schema file for vcpkg.json (by @Edhebi) +- [(#12370)](https://github.com/microsoft/vcpkg/pull/12370) [vcpkg] Enable binary caching by default (by @ras0219) +- [(#12386)](https://github.com/microsoft/vcpkg/pull/12386) [vcpkg] Add CMake heuristics for header-only libraries (by @ras0219) +- [(#12366)](https://github.com/microsoft/vcpkg/pull/12366) [vcpkg] Improve informational message for `--editable` while cleaning sources (by @ras0219) +- [(#12378)](https://github.com/microsoft/vcpkg/pull/12378) [vcpkg] proper errorcheck during files installation (by @Maximus5) +- [(#12384)](https://github.com/microsoft/vcpkg/pull/12384) [vcpkg-ci] Always publish file lists (by @ras0219) +- [(#12254)](https://github.com/microsoft/vcpkg/pull/12254) [vcpkg] Track hashes of cmake script helpers in consuming portfiles (by @ras0219) +- [(#12361)](https://github.com/microsoft/vcpkg/pull/12361) [vcpkg] Fix iOS toolchain detection when using the iOS community triplets (by @alcroito) +- [(#12398)](https://github.com/microsoft/vcpkg/pull/12398) [libb2] Add supports and install pkg-conifg on macOS VM (by @PhoebeHui) +- [(#12368)](https://github.com/microsoft/vcpkg/pull/12368) [vcpkg formatting] Turn off DeriveLineEnding (by @strega-nil) +- [(#12429)](https://github.com/microsoft/vcpkg/pull/12429) [vcpkg] Fix ParagraphParser::required_field() (by @maksqwe) +- [(#12400)](https://github.com/microsoft/vcpkg/pull/12400) [vcpkg] implement copy_symlink working for non-elevated processes (by @Maximus5) +- [(#12432)](https://github.com/microsoft/vcpkg/pull/12432) vcpkg_configure_make: typo fix '_vcpkg_append_to_configure_environment' (by @kevinlul) +- [(#12351)](https://github.com/microsoft/vcpkg/pull/12351) [vcpkg] Clean up command switch code (by @strega-nil) +- [(#12179)](https://github.com/microsoft/vcpkg/pull/12179) [vcpkg] print list in json (by @dan-shaw) +- [(#12084)](https://github.com/microsoft/vcpkg/pull/12084) Build fix with MinGW GCC 9.2.0 (by @cristianadam) +- [(#12455)](https://github.com/microsoft/vcpkg/pull/12455) [libmicrohttpd] Add `platform.h` to restricted header list. (by @ras0219) +- [(#12468)](https://github.com/microsoft/vcpkg/pull/12468) [vcpkg] Add NVTOOLSEXT_PATH to the env passthrough list (by @Neumann-A) +- [(#12534)](https://github.com/microsoft/vcpkg/pull/12534) Add initial s390x support (by @lebdron) +- [(#11550)](https://github.com/microsoft/vcpkg/pull/11550) [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries (by @Neumann-A) +- [(#11130)](https://github.com/microsoft/vcpkg/pull/11130) [opencv4] update to v4.3 (by @cenit) +- [(#12467)](https://github.com/microsoft/vcpkg/pull/12467) [vcpkg-acquire-msys] Install new keyring (by @emptyVoid) +- [(#9561)](https://github.com/microsoft/vcpkg/pull/9561) [libusb] Fix issue to support linux (by @PhoebeHui) +- [(#12460)](https://github.com/microsoft/vcpkg/pull/12460) [vcpkg] Improve format check failure message (by @JackBoosY) +- [(#9248)](https://github.com/microsoft/vcpkg/pull/9248) fix issue #9228 : Add support to subgroups in gitlab (by @RamadanAhmed) +- [(#12513)](https://github.com/microsoft/vcpkg/pull/12513) [vcpkg] EOL LF for ci.baseline.txt (by @Neumann-A) +- [(#8628)](https://github.com/microsoft/vcpkg/pull/8628) [marble] Add new port (by @ig-or) +- [(#12118)](https://github.com/microsoft/vcpkg/pull/12118) [mozjpeg] fix build (by @saucecontrol) +- [(#12530)](https://github.com/microsoft/vcpkg/pull/12530) [libmodbus] Fix static linkage error (by @NancyLi1013) +- [(#12514)](https://github.com/microsoft/vcpkg/pull/12514) [mpir] Fix build error if VCPKG_BUILD_TYPE is set as release or debug (by @NancyLi1013) +- [(#12529)](https://github.com/microsoft/vcpkg/pull/12529) [qt5 components] Disable parallel build (by @JackBoosY) +- [(#12569)](https://github.com/microsoft/vcpkg/pull/12569) [vcpkg_fixup_pkgconfig] Remove required in first find_program call for pkg-config (by @Neumann-A) +- [(#12097)](https://github.com/microsoft/vcpkg/pull/12097) Fix vcpkg android toolchain so it adds flags that aren't just ignored (by @jamiebk) +- [(#11021)](https://github.com/microsoft/vcpkg/pull/11021) [rsocket] Add new port (by @curoky) +- [(#12104)](https://github.com/microsoft/vcpkg/pull/12104) Fix vcpkg_fixup_cmake_targets to work correctly on MinGW (by @koprok) +- [(#12661)](https://github.com/microsoft/vcpkg/pull/12661) [vcpkg] Fix typo in link for installing and using packages (by @varunagrawal) +- [(#12639)](https://github.com/microsoft/vcpkg/pull/12639) [vcpkg-ci] fix macos setup scripts (by @strega-nil) +- [(#12586)](https://github.com/microsoft/vcpkg/pull/12586) [vcpkg] Fix build on Windows 8.1 SDK (by @strega-nil) +- [(#12585)](https://github.com/microsoft/vcpkg/pull/12585) [vcpkg] Refactor Commands: Part 1 (by @strega-nil) +- [(#10770)](https://github.com/microsoft/vcpkg/pull/10770) [cmake] Add cmake port to test qt (by @Neumann-A) +- [(#10786)](https://github.com/microsoft/vcpkg/pull/10786) [tomlplusplus] Add new port (by @traversaro) +- [(#12641)](https://github.com/microsoft/vcpkg/pull/12641) Refactor commands 2: Electric Boogaloo (by @strega-nil) +- [(#12548)](https://github.com/microsoft/vcpkg/pull/12548) [vcpkg manifest] look at `platform` directives (by @strega-nil) +- [(#12494)](https://github.com/microsoft/vcpkg/pull/12494) [qt-webengine] Fix building with vs2017 (by @Neumann-A) +- [(#11376)](https://github.com/microsoft/vcpkg/pull/11376) [avro-cpp] new port (by @alexander-smyslov) +- [(#11535)](https://github.com/microsoft/vcpkg/pull/11535) [mpg123] Allow cross-compiling, fix previous builds tainting rebuilds (by @kevinlul) +- [(#12624)](https://github.com/microsoft/vcpkg/pull/12624) Fix .gitignore excluding triplets/community, sort, and driveby vcpkg_check_linkage.md doc bug. (by @BillyONeal) +- [(#12423)](https://github.com/microsoft/vcpkg/pull/12423) [vcpkg] Add environment variable VCPKG_DEFAULT_BINARY_CACHE (by @Neumann-A) +- [(#10670)](https://github.com/microsoft/vcpkg/pull/10670) [vcpkg] Fix [boost] find_package for MSVC2013 / v120 (by @ManuelKugelmann) +- [(#12549)](https://github.com/microsoft/vcpkg/pull/12549) [vcpkg manifest] add feature support (by @strega-nil) +- [(#12471)](https://github.com/microsoft/vcpkg/pull/12471) [vcpkg format-manifest] Add convert-control flag (by @strega-nil) +- [(#11208)](https://github.com/microsoft/vcpkg/pull/11208) [ITK] Update to 5.1 (by @Neumann-A) +- [(#12640)](https://github.com/microsoft/vcpkg/pull/12640) [vcpkg] add environment variable VCPKG_OVERLAY_PORTS (by @Neumann-A) +- [(#12742)](https://github.com/microsoft/vcpkg/pull/12742) [wavpack] Fix failure on linux and osx (by @PhoebeHui) +- [(#12727)](https://github.com/microsoft/vcpkg/pull/12727) [msbuild] Revert the importance to Normal (by @PhoebeHui) +- [(#12717)](https://github.com/microsoft/vcpkg/pull/12717) [vcpkg] Fix prettify output not working in some cases (by @Deadpikle) +- [(#12715)](https://github.com/microsoft/vcpkg/pull/12715) [vcpkg] Add VCPKG_TARGET_IS_IOS (by @Deadpikle) +- [(#12716)](https://github.com/microsoft/vcpkg/pull/12716) [vcpkg] Fix arm64-osx triplet not building for arm64 (by @Deadpikle) +- [(#12701)](https://github.com/microsoft/vcpkg/pull/12701) [vcpkg-ci-paraview] move into scripts/test_ports (by @Neumann-A) +- [(#12699)](https://github.com/microsoft/vcpkg/pull/12699) [vcpkg baseline] remove qt translations from skip list (by @Neumann-A) +- [(#12695)](https://github.com/microsoft/vcpkg/pull/12695) [ngspice] Initial port (by @marekr) +- [(#12678)](https://github.com/microsoft/vcpkg/pull/12678) [vcpkg] Add missing check for x86 (by @arves100) +- [(#12752)](https://github.com/microsoft/vcpkg/pull/12752) [vcpkg_build_qmake] Disable multi-threaded build when file fails to open (by @JackBoosY) +- [(#12789)](https://github.com/microsoft/vcpkg/pull/12789) [vcpkg] Fix vs2015 build (by @strega-nil) +- [(#12312)](https://github.com/microsoft/vcpkg/pull/12312) [fmt] Update to 7.0.2 + [spdlog] Update to 1.7.0 (by @kevinlul) +- [(#12515)](https://github.com/microsoft/vcpkg/pull/12515) [pangolin] Fix build failure on UNIX (by @JackBoosY) +- [(#12792)](https://github.com/microsoft/vcpkg/pull/12792) [log4cpp] Fix header file install path (by @LilyWangL) +- [(#12784)](https://github.com/microsoft/vcpkg/pull/12784) [gSoap] Update to 2.8.105 and add a required shared directory (by @xgcssch) +- [(#12768)](https://github.com/microsoft/vcpkg/pull/12768) [libtorrent] Update to 1.2.8 (by @FranciscoPombal) +- [(#12762)](https://github.com/microsoft/vcpkg/pull/12762) [boost] Add Supports fields and more accurately handle arm64-windows/x64-uwp (by @ras0219) +- [(#12630)](https://github.com/microsoft/vcpkg/pull/12630) [secp256k1] Fix build failures and export cmake targets (by @PhoebeHui) +- [(#12524)](https://github.com/microsoft/vcpkg/pull/12524) [asmjit] Update to the latest commit (by @ZehMatt) +- [(#12528)](https://github.com/microsoft/vcpkg/pull/12528) [libass] Fix build error on x64-windows-static (by @LilyWangL) +- [(#12634)](https://github.com/microsoft/vcpkg/pull/12634) [vcpkg] Improving android support (by @christophe-calmejane) +- [(#9162)](https://github.com/microsoft/vcpkg/pull/9162) [crashrpt] Add new port (by @tbdrake) +- [(#12810)](https://github.com/microsoft/vcpkg/pull/12810) [vcpkg] Make C++ the primary github language (by @strega-nil) +- [(#12198)](https://github.com/microsoft/vcpkg/pull/12198) [vcpkg] Add `vcpkg export` to E2E tests. Enable E2E tests on all platforms. (by @ras0219) +- [(#12698)](https://github.com/microsoft/vcpkg/pull/12698) [vcpkg] Rewrite CMake build system to be more target-based (by @strega-nil) +- [(#12776)](https://github.com/microsoft/vcpkg/pull/12776) [vcpkg_copy_tool_dependencies] Use vcpkg internal powershell (by @JackBoosY) +- [(#12805)](https://github.com/microsoft/vcpkg/pull/12805) [lapack-reference|fortran] Add new port (by @Neumann-A) +- [(#12829)](https://github.com/microsoft/vcpkg/pull/12829) [vcpkg] Fix resolution of default features when using Manifest mode (by @ras0219) +- [(#11836)](https://github.com/microsoft/vcpkg/pull/11836) [vcpkg/scripts/make] trying to iron out some issues (by @Neumann-A) +- [(#12818)](https://github.com/microsoft/vcpkg/pull/12818) [constexpr-contracts] Adds new port (by @cjdb) +- [(#12845)](https://github.com/microsoft/vcpkg/pull/12845) [vcpkg] Lift `--x-json` to a global option, implement experimental `x-package-info` command (by @ras0219) +- [(#12876)](https://github.com/microsoft/vcpkg/pull/12876) [vcpkg] Reduce dependencies and contents of vcpkgpaths.h (by @ras0219) +- [(#12866)](https://github.com/microsoft/vcpkg/pull/12866) [msys] Improve vcpkg_acquire_msys (by @PhoebeHui) +- [(#12897)](https://github.com/microsoft/vcpkg/pull/12897) [vcpkg] Restore layering and purge unused ParagraphParseResult (by @ras0219) +- [(#12895)](https://github.com/microsoft/vcpkg/pull/12895) [vcpkg_find_acquire_program] add version check for ninja (by @Neumann-A) +- [(#12927)](https://github.com/microsoft/vcpkg/pull/12927) [meson] Update meson to 0.55.1 (by @Neumann-A) +- [(#12837)](https://github.com/microsoft/vcpkg/pull/12837) Fix/clang10 linux (by @ignacionr) +- [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp) (by @NancyLi1013) +- [(#12774)](https://github.com/microsoft/vcpkg/pull/12774) [vcpkg] Use std::filesystem when Visual Studio is greater than 2015 (by @JackBoosY) +- [(#12626)](https://github.com/microsoft/vcpkg/pull/12626) [vcpkg_find_acquire_program] Enable find_acquire(PKGCONFIG) (by @ras0219) +- [(#11277)](https://github.com/microsoft/vcpkg/pull/11277) [ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. (by @Sibras) +- [(#12864)](https://github.com/microsoft/vcpkg/pull/12864) [vcpkg_execute_build_process] Re-fix qt5 components build (by @JackBoosY) +- [(#13000)](https://github.com/microsoft/vcpkg/pull/13000) [vcpkg] Fix baseline (by @NancyLi1013) +- [(#12985)](https://github.com/microsoft/vcpkg/pull/12985) [vcpkg] Add Forward Declarations (originally by @cngzhnp) (by @strega-nil) +- [(#12976)](https://github.com/microsoft/vcpkg/pull/12976) [vcpkg] Update hint message (by @PhoebeHui) +- [(#12974)](https://github.com/microsoft/vcpkg/pull/12974) [fluidsynth/redis-plus-plus] Update to the latest released version (by @NancyLi1013) +- [(#13017)](https://github.com/microsoft/vcpkg/pull/13017) remove registries.h and fwd/registries.h... (by @strega-nil) +- [(#12975)](https://github.com/microsoft/vcpkg/pull/12975) [openmpi/vcpkg_build_make] Disable parallel build (by @JackBoosY) +- [(#13043)](https://github.com/microsoft/vcpkg/pull/13043) [vcpkg] Fix hint message (by @PhoebeHui) +- [(#12046)](https://github.com/microsoft/vcpkg/pull/12046) [portmidi] Updated portmidi package to use alternative code source (by @stekyne) +- [(#13066)](https://github.com/microsoft/vcpkg/pull/13066) [typo] Fix incorrect Path in readme (by @ninjaoflight) +- [(#13034)](https://github.com/microsoft/vcpkg/pull/13034) [openmama] Feature use cmake for openmama (by @fquinner) +- [(#12910)](https://github.com/microsoft/vcpkg/pull/12910) [vcpkg] Fix editable bug (by @ras0219) +- [(#12523)](https://github.com/microsoft/vcpkg/pull/12523) [vcpkg.cmake] check for vcpkg.json only in `${CMAKE_SOURCE_DIR}` (by @strega-nil) +- [(#12964)](https://github.com/microsoft/vcpkg/pull/12964) [vcpkg] Do not use raw paths inside regexes (by @hanst99) +- [(#13092)](https://github.com/microsoft/vcpkg/pull/13092) [vcpkg] Hotfix regression in #12523 (by @ras0219) +- [(#13067)](https://github.com/microsoft/vcpkg/pull/13067) Sort file lists and failure logs together. (by @BillyONeal) +- [(#12738)](https://github.com/microsoft/vcpkg/pull/12738) [vcpkg] Use https sources for common tools (by @janisozaur) +- [(#13058)](https://github.com/microsoft/vcpkg/pull/13058) [Box2d] Update to 2.4.0 (by @JonLiu1993) +- [(#12977)](https://github.com/microsoft/vcpkg/pull/12977) fix vcpkg_configure_cmake for case when having semicolons in OPTIONS (by @jgehw) +- [(#12950)](https://github.com/microsoft/vcpkg/pull/12950) [vcpkg] Fix build on older compilers. (by @huahang) +- [(#13104)](https://github.com/microsoft/vcpkg/pull/13104) [vcpkg] Fix vcpkg_acquire_msys failing on path with spaces (by @SupSuper) +- [(#13125)](https://github.com/microsoft/vcpkg/pull/13125) Disable fluidlite in CI. (by @BillyONeal) +- [(#13117)](https://github.com/microsoft/vcpkg/pull/13117) [vcpkg] Fix #13094 by avoiding the comma operator. (by @BillyONeal) +- [(#13107)](https://github.com/microsoft/vcpkg/pull/13107) [VMSS] Fix the printed error message (by @JackBoosY) +- [(#13069)](https://github.com/microsoft/vcpkg/pull/13069) [vcpkg] Fix upgrade for port-version (by @strega-nil) +- [(#12982)](https://github.com/microsoft/vcpkg/pull/12982) [vcpkg_find_acquire_program] Cleanup and add CI testing (by @ras0219) +- [(#13142)](https://github.com/microsoft/vcpkg/pull/13142) Allow use of VS LLVM clang-format. (by @BillyONeal) +- [(#13148)](https://github.com/microsoft/vcpkg/pull/13148) [baseline] Skip check of clapack:x64-osx in the baseline (by @JackBoosY) +- [(#12884)](https://github.com/microsoft/vcpkg/pull/12884) [skia, ompl, capnproto] Update VMs for 2020-08-12 (including VS 16.7) (by @BillyONeal) +- [(#13086)](https://github.com/microsoft/vcpkg/pull/13086) [vcpkg] Disable timeout (default 10s) in vcpkg_acquire_msys (by @jgehw) +- [(#13176)](https://github.com/microsoft/vcpkg/pull/13176) [vcpkg_from_sourceforge] Determine sourceforge status (by @JackBoosY) +- [(#12229)](https://github.com/microsoft/vcpkg/pull/12229) [OpenMVG/OpenMVS] fix tools (by @cenit) +- [(#12903)](https://github.com/microsoft/vcpkg/pull/12903) [cspice] Add 64bit packages (by @NancyLi1013) +- [(#12687)](https://github.com/microsoft/vcpkg/pull/12687) [v8] Add v8 Javascript engine port (#372). (by @Kwizatz) +- [(#13237)](https://github.com/microsoft/vcpkg/pull/13237) [Readme] fix typo & sync content (by @KevinZonda) +- [(#13209)](https://github.com/microsoft/vcpkg/pull/13209) Fix link (by @SpriteOvO) +- [(#13200)](https://github.com/microsoft/vcpkg/pull/13200) [clapack, lapack-reference] Add conflict messages (by @NancyLi1013) +- [(#13174)](https://github.com/microsoft/vcpkg/pull/13174) [libhsplasma] Add new port (by @Hoikas) +- [(#12846)](https://github.com/microsoft/vcpkg/pull/12846) [vcpkg_configure_cmake] Pass CMAKE_DISABLE_SOURCE_CHANGES to all ports by default (by @ras0219) +- [(#13019)](https://github.com/microsoft/vcpkg/pull/13019) [vcpkg] Replace uses of msys pacman.exe with direct package downloads (by @ras0219) +- [(#13228)](https://github.com/microsoft/vcpkg/pull/13228) [vcpkg] Implement 'repository' tag for NuGet binary caching (by @ras0219) +- [(#13302)](https://github.com/microsoft/vcpkg/pull/13302) [vcpkg] Add July 2020 changelog (by @grdowns) +- [(#13295)](https://github.com/microsoft/vcpkg/pull/13295) [vcpkg baseline][rest-rpc] Skip check in baseline (by @JackBoosY) +- [(#13038)](https://github.com/microsoft/vcpkg/pull/13038) [vcpkg] Registries MVP (by @strega-nil) +- [(#13252)](https://github.com/microsoft/vcpkg/pull/13252) [hypre] Update to 2.19.0 (by @albertziegenhagel) +- [(#13313)](https://github.com/microsoft/vcpkg/pull/13313) [vcpkg.cmake] error out if the mode has changed (by @strega-nil) +- [(#12857)](https://github.com/microsoft/vcpkg/pull/12857) [many ports] Add supports (by @PhoebeHui) +- [(#11290)](https://github.com/microsoft/vcpkg/pull/11290) [vcpkg] #11129: Add VCPKG_LINKER_FLAGS_. (by @psfrolov) +- [(#13231)](https://github.com/microsoft/vcpkg/pull/13231) [vcpkg] Delay failures in `vcpkg install` until missing manifest requested (by @ras0219) +- [(#13297)](https://github.com/microsoft/vcpkg/pull/13297) [vcpkg_acquire_msys.cmake] Add gettext tool (by @StarGate-One) +- [(#13290)](https://github.com/microsoft/vcpkg/pull/13290) [vcpkg] Fix compile on gcc 6 (by @strega-nil) +- [(#13229)](https://github.com/microsoft/vcpkg/pull/13229) [blaze][ceres][clapack][geogram][lapack][lapack-reference][opencv4][selene] Fix deps issues (by @ras0219) +- [(#10645)](https://github.com/microsoft/vcpkg/pull/10645) Fix [boost] MSVC 2013 v120 Build (by @ManuelKugelmann) +- [(#13267)](https://github.com/microsoft/vcpkg/pull/13267) [powershell] Update to 7.0.3 (by @JackBoosY) +- [(#12509)](https://github.com/microsoft/vcpkg/pull/12509) [vcpkg] json format for search (by @dan-shaw) +- [(#11880)](https://github.com/microsoft/vcpkg/pull/11880) [vcpkg] Add community triple arm64-linux and arm-linux. (by @xieyubo) +- [(#12396)](https://github.com/microsoft/vcpkg/pull/12396) [chromium-base] Add new port (by @vejmartin) +- [(#13378)](https://github.com/microsoft/vcpkg/pull/13378) [vcpkg] Fixed 'update' command output (by @lazyhamster) +- [(#13382)](https://github.com/microsoft/vcpkg/pull/13382) [xtensor-io] [taskflow] [tcl] [sophus] Fix CI 2020-09-06 (by @BillyONeal) +- [(#12981)](https://github.com/microsoft/vcpkg/pull/12981) [vcpkg] Improve Json error messages (by @ras0219) +- [(#13398)](https://github.com/microsoft/vcpkg/pull/13398) [vcpkg] Fix compilation on VS2015 (by @ras0219) +- [(#13387)](https://github.com/microsoft/vcpkg/pull/13387) [boost] Remove invalid identifier !v120 (by @PhoebeHui) +- [(#12926)](https://github.com/microsoft/vcpkg/pull/12926) [execute_process] Don't strip embedded semicolons (by @jgehw) +- [(#13386)](https://github.com/microsoft/vcpkg/pull/13386) [vcpkg] improve s390x support (by @lebdron) +- [(#13401)](https://github.com/microsoft/vcpkg/pull/13401) [tmx] Fix build failure (by @JackBoosY) +- [(#13240)](https://github.com/microsoft/vcpkg/pull/13240) [vcpkg|toolchain] add VCPKG_OVERLAY_(PORTS|TRIPLETS) to the toolchain (by @Neumann-A) +- [(#13140)](https://github.com/microsoft/vcpkg/pull/13140) [taskflow] Update cpp-taskflow 2.2.0 to taskflow 2.6.0 (by @mfornace) +- [(#12746)](https://github.com/microsoft/vcpkg/pull/12746) Fix issue "print out missing path in read_lines" #12745. (by @martin-s) +- [(#13421)](https://github.com/microsoft/vcpkg/pull/13421) [vcpkg] Merge the vcpkg metadata uploader into the vcpkg binary (by @BillyONeal) +- [(#13489)](https://github.com/microsoft/vcpkg/pull/13489) Fix bootstrap on VS2019. (by @BillyONeal) +- [(#13488)](https://github.com/microsoft/vcpkg/pull/13488) [vcpkg manifest] Add documentation! (by @strega-nil) +- [(#13497)](https://github.com/microsoft/vcpkg/pull/13497) [tool-meson] Update to 0.55.3 (by @c72578) +- [(#13486)](https://github.com/microsoft/vcpkg/pull/13486) [vcpkg] Add metrics for binarycaching feature (by @ras0219) +- [(#13517)](https://github.com/microsoft/vcpkg/pull/13517) [vcpkg-docs] Add docs/users/binarycaching.md (by @ras0219) +- [(#13589)](https://github.com/microsoft/vcpkg/pull/13589) [vcpkg manifest-mode] Fix parallel msbuild failures (by @strega-nil) +- [(#13609)](https://github.com/microsoft/vcpkg/pull/13609) [vcpkg] Keep sym links in Linux zip cache files (by @here-mikelley) +- [(#13508)](https://github.com/microsoft/vcpkg/pull/13508) [vcpkg] Add build scripts to produce signed vcpkg binaries. (by @BillyONeal) +- [(#13560)](https://github.com/microsoft/vcpkg/pull/13560) [Many ports] Update to the latest version or commit (by @NancyLi1013) +- [(#13529)](https://github.com/microsoft/vcpkg/pull/13529) [scintilla] Add static linking to Scintilla (by @alek-d) +- [(#13629)](https://github.com/microsoft/vcpkg/pull/13629) [mimalloc] Update to 1.6.4 (by @JonLiu1993) +- [(#13537)](https://github.com/microsoft/vcpkg/pull/13537) [vcpkg] Fix the case of current_path() before use on Windows. (by @BillyONeal) +- [(#13685)](https://github.com/microsoft/vcpkg/pull/13685) [documentation] Fix manifest link (by @JackBoosY) +- [(#13667)](https://github.com/microsoft/vcpkg/pull/13667) [vcpkg] Show Empty Object on vcpkg --list when used with --x-json (by @pratikpc) +- [(#13562)](https://github.com/microsoft/vcpkg/pull/13562) [Ninja] update to 1.10.1 (by @Farwaykorse) +- [(#13665)](https://github.com/microsoft/vcpkg/pull/13665) [scintilla] Update to 4.4.5 (by @alek-d) +- [(#13491)](https://github.com/microsoft/vcpkg/pull/13491) [vcpkg, libpq] separate static and shared library installations (by @lebdron) +- [(#13450)](https://github.com/microsoft/vcpkg/pull/13450) try fixing x264 (by @Neumann-A) +- [(#13619)](https://github.com/microsoft/vcpkg/pull/13619) [vcpkg macos ci] Switch to using our own base boxes, to fix bringing up mac machines (by @strega-nil) +- [(#13722)](https://github.com/microsoft/vcpkg/pull/13722) [vcpkg] Fix Windows pipeline's outdated Ninja reference (by @ras0219-msft) +- [(#13451)](https://github.com/microsoft/vcpkg/pull/13451) [qt5-location] Rename vendored libs to avoid conflicts (by @ras0219) +- [(#13732)](https://github.com/microsoft/vcpkg/pull/13732) [vcpkg_build_cmake] Set PARALLEL_ARG when using Ninja (by @JackBoosY) +- [(#13669)](https://github.com/microsoft/vcpkg/pull/13669) [vcpkg] Skip all files named .DS_Store, no need to check if the file is regular (by @ras0219) +- [(#13708)](https://github.com/microsoft/vcpkg/pull/13708) [libidn2] Support UNIX (by @JackBoosY) +- [(#13644)](https://github.com/microsoft/vcpkg/pull/13644) Update the latest g++-10 version if exists (by @cngzhnp) +- [(#13571)](https://github.com/microsoft/vcpkg/pull/13571) Add compiler info to nuspec description (by @RoguePointer80) +- [(#12790)](https://github.com/microsoft/vcpkg/pull/12790) [vcpkg] add env var VCPKG_OVERLAY_TRIPLETS (by @Neumann-A) +- [(#13775)](https://github.com/microsoft/vcpkg/pull/13775) [vcpkg baseline] Skip libvmdk (by @NancyLi1013) +- [(#13748)](https://github.com/microsoft/vcpkg/pull/13748) Add MSVC-internal testing scripts to public GitHub. (by @BillyONeal) +- [(#13794)](https://github.com/microsoft/vcpkg/pull/13794) [vcpkg] fix ci #13790 (by @Neumann-A) +- [(#13799)](https://github.com/microsoft/vcpkg/pull/13799) [vcpkg osx ci] update 2020-09-28 (by @strega-nil) +- [(#13735)](https://github.com/microsoft/vcpkg/pull/13735) Added spanish readme (by @ninjaoflight) +- [(#13385)](https://github.com/microsoft/vcpkg/pull/13385) [osgearth] update to latest to fix build issue with latest geos (by @ankurverma85) +- [(#13830)](https://github.com/microsoft/vcpkg/pull/13830) [libqcow] Skip in all triplets because the upstream GitHub purges old archives (by @ras0219) +- [(#13711)](https://github.com/microsoft/vcpkg/pull/13711) [vcpkg/manifest] write manifest install logs into the build dir. (by @Neumann-A) +- [(#13889)](https://github.com/microsoft/vcpkg/pull/13889) [vcpkg_acquire_msys] Use Mirrors (by @ras0219-msft) +- [(#13810)](https://github.com/microsoft/vcpkg/pull/13810) [mbedtls] Add supports (by @PhoebeHui) +- [(#13858)](https://github.com/microsoft/vcpkg/pull/13858) [tinyutf8, moos-core] Re-enable in CI. (by @BillyONeal) +- [(#13829)](https://github.com/microsoft/vcpkg/pull/13829) [vcpkg macos ci] modify README slightly (by @strega-nil) +- [(#13903)](https://github.com/microsoft/vcpkg/pull/13903) [vcpkg] run both cxx and c compiler id. (by @Neumann-A) +- [(#13751)](https://github.com/microsoft/vcpkg/pull/13751) [vcpkg] Enable reentrant vcpkg calls (by @ras0219) +- [(#13446)](https://github.com/microsoft/vcpkg/pull/13446) [vcpkg] Avoid computing triplet ABIs for editable packages (by @ras0219) +- [(#13734)](https://github.com/microsoft/vcpkg/pull/13734) [gitignore] add default build dir of vs code to ignore list (by @Neumann-A) +- [(#13767)](https://github.com/microsoft/vcpkg/pull/13767) Upgrade log4cxx (by @stephen-webb) +- [(#13803)](https://github.com/microsoft/vcpkg/pull/13803) [libwebsockets] Update to the latest version (by @NancyLi1013) +- [(#13857)](https://github.com/microsoft/vcpkg/pull/13857) Always accept = or space as delimiters when parsing common command line parameters. (by @BillyONeal) +- [(#13821)](https://github.com/microsoft/vcpkg/pull/13821) [7zip] Add supports field (by @NancyLi1013) +- [(#13623)](https://github.com/microsoft/vcpkg/pull/13623) [vcpkg] Use more forward declarations rather than definitions (by @cngzhnp) +- [(#13585)](https://github.com/microsoft/vcpkg/pull/13585) [log4cplus/muparser/nmslib] Update to the latest version (by @NancyLi1013) +- [(#13559)](https://github.com/microsoft/vcpkg/pull/13559) [fastcdr/jack2/fcl/ensmallen/hwloc] Update to latest release (by @PhoebeHui) +- [(#13399)](https://github.com/microsoft/vcpkg/pull/13399) [vcpkg] Further JSON error improvements (by @ras0219) +- [(#13964)](https://github.com/microsoft/vcpkg/pull/13964) [qca]support linux-osx-static build (by @longhuan2018) +- [(#13713)](https://github.com/microsoft/vcpkg/pull/13713) [vcpkg/manifest/toolchain] Add install/bootstrap options & fix CACHE variables usage (by @Neumann-A) +- [(#14000)](https://github.com/microsoft/vcpkg/pull/14000) [vcpkg/configure_make] add USE_WRAPPERS option (by @Neumann-A) +- [(#14005)](https://github.com/microsoft/vcpkg/pull/14005) [akali] Update to v1.42 (by @winsoft666) +- [(#13011)](https://github.com/microsoft/vcpkg/pull/13011) [vcpkg] VCPKG_APPINSTALL_DEPS install dependencies on install #1653 (by @sandercox) +- [(#13860)](https://github.com/microsoft/vcpkg/pull/13860) [halide] Update to version 10.0.0 (by @alexreinking) +- [(#14001)](https://github.com/microsoft/vcpkg/pull/14001) [vcpkg/configure_make] add option DETERMINE_BUILD_TRIPLET (by @Neumann-A) +- [(#14054)](https://github.com/microsoft/vcpkg/pull/14054) [chakracore,gamma,libopenmpt,portaudio,usrsctp] Fix baseline for 2020-10-14 (by @BillyONeal) +- [(#14002)](https://github.com/microsoft/vcpkg/pull/14002) [vcpkg/configure_cmake] add LOGNAME option (by @Neumann-A) +- [(#14036)](https://github.com/microsoft/vcpkg/pull/14036) [antlr4] update to 4.8 (by @capra314cabra) +- [(#13477)](https://github.com/microsoft/vcpkg/pull/13477) [qt5] Update to 5.15.1 (by @Neumann-A) +- [(#13730)](https://github.com/microsoft/vcpkg/pull/13730) [vcpkg_common_definitions] Add macro VCPKG_HOST_IS_ (by @JackBoosY) +- [(#13465)](https://github.com/microsoft/vcpkg/pull/13465) [vcpkg] Set CMAKE_SYSTEM_PROCESSOR if target architecture is arm-linux or arm64-linux. (by @xieyubo) +- [(#12612)](https://github.com/microsoft/vcpkg/pull/12612) [cmake] upgrade to 3.18 (by @cenit) +- [(#13025)](https://github.com/microsoft/vcpkg/pull/13025) [CMake] VCPKG_APPLOCAL_DEPS sometimes causes conflicts when processing multiple files in the same directory (by @sandercox) +- [(#14050)](https://github.com/microsoft/vcpkg/pull/14050) [libvorbis] MinGW build fix (by @Trider12) +- [(#14120)](https://github.com/microsoft/vcpkg/pull/14120) [freetds] Update to v1.2.5 and update source to github. (by @BillyONeal) +- [(#14142)](https://github.com/microsoft/vcpkg/pull/14142) [ptex] Fix build on *inx (by @JackBoosY) +- [(#14079)](https://github.com/microsoft/vcpkg/pull/14079) [vcpkg] Add `versions` feature flag and version field manifest parsing (by @ras0219) +- [(#13540)](https://github.com/microsoft/vcpkg/pull/13540) [libp7-baical] Fix build error (by @NancyLi1013) +- [(#14129)](https://github.com/microsoft/vcpkg/pull/14129) [vcpkg] Vcpkg appinstall deps fixes (by @sandercox) +- [(#13953)](https://github.com/microsoft/vcpkg/pull/13953) [vcpkg_find_acquire_program] Fix SWIG on non-Windows platforms. (by @Hoikas) +- [(#14188)](https://github.com/microsoft/vcpkg/pull/14188) [vcpkg] Print more verbose compiler detection info (by @ekilmer) +- [(#13972)](https://github.com/microsoft/vcpkg/pull/13972) Fix forward declarations & replace fwd header files (by @cngzhnp) +- [(#14208)](https://github.com/microsoft/vcpkg/pull/14208) [Many Ports] Baseline Fixes for 2020-10-24 CI Build (by @BillyONeal) +- [(#14220)](https://github.com/microsoft/vcpkg/pull/14220) [vcpkg] update msys-libiconv version (by @ludchieng) +- [(#13777)](https://github.com/microsoft/vcpkg/pull/13777) [vcpkg] Implement versions db generator (by @vicroms) +- [(#13968)](https://github.com/microsoft/vcpkg/pull/13968) [vcpkg] Fix more cases of semicolon mishandling in "scripts" - follow-up to PR #12926 (by @jgehw) +- [(#14147)](https://github.com/microsoft/vcpkg/pull/14147) [lcm] Fix build error on Linux (by @LilyWangL) +- [(#14262)](https://github.com/microsoft/vcpkg/pull/14262) [vcpkg] Always use version-string in generator (by @vicroms) +- [(#14260)](https://github.com/microsoft/vcpkg/pull/14260) [vcpkg] Always publish failure logs, even on success. (by @BillyONeal) +- [(#11363)](https://github.com/microsoft/vcpkg/pull/11363) [vcpkg] Use named mutex to serialize dll copies (by @thomasgt) +- [(#13701)](https://github.com/microsoft/vcpkg/pull/13701) [folly/fizz/wangle/proxygen/fbthrift] Update to latest revision (by @PhoebeHui) +- [(#13805)](https://github.com/microsoft/vcpkg/pull/13805) [vcpkg, jsonnet, openssl-uwp] Enable use of the system powershell-core if it is present. (by @BillyONeal) +- [(#14271)](https://github.com/microsoft/vcpkg/pull/14271) [vcpkg] Fix search for pwsh in vcpkgtools.xml. (by @BillyONeal) +- [(#14102)](https://github.com/microsoft/vcpkg/pull/14102) [boost] Enable Boost building with wasm32-emscripten (by @stoperro) +- [(#14003)](https://github.com/microsoft/vcpkg/pull/14003) [vcpkg baseline] [vs-yasm] Build yasm instead of downloading it to work around memory corruption bugs in yasm itself. (by @BillyONeal) +- [(#14202)](https://github.com/microsoft/vcpkg/pull/14202) [vcpkg] Remove hard-coded ApiKey from nuget push (by @ekilmer) +- [(#13158)](https://github.com/microsoft/vcpkg/pull/13158) [ocilib] Update to 4.7.0 (by @JonLiu1993) +- [(#13374)](https://github.com/microsoft/vcpkg/pull/13374) [vcpkg] Support cross compile arm64-linux, arm-linux triplets on a linux x86_64 host. (by @xieyubo) +- [(#14269)](https://github.com/microsoft/vcpkg/pull/14269) [vcpkg] mingw: Add compiler executable name into toolchain file (by @longnguyen2004) +- [(#13971)](https://github.com/microsoft/vcpkg/pull/13971) [vcpkg] translate the README to french (by @x0rld) + +
+The following 109 ports have been added: + +|port|version| +|---|---| +|[detect_compiler](https://github.com/microsoft/vcpkg/pull/12203)| 0#0 +|[ppmagic](https://github.com/microsoft/vcpkg/pull/12253)| 2020-07-03#0 +|[getdns](https://github.com/microsoft/vcpkg/pull/12090)| 1.6.0#0 +|[font-chef](https://github.com/microsoft/vcpkg/pull/12293)| 1.0.1#0 +|[implot](https://github.com/microsoft/vcpkg/pull/11920)| 0.3-1#0 +|[libfort](https://github.com/microsoft/vcpkg/pull/12305)| 0.4.1#0 +|[threadpool](https://github.com/microsoft/vcpkg/pull/11650)| 0.2.5#1 +|[mygui](https://github.com/microsoft/vcpkg/pull/11991)| 2020-06-17#0 +|[kfr](https://github.com/microsoft/vcpkg/pull/8322)| 2020-06-15#0 +|[meshoptimizer](https://github.com/microsoft/vcpkg/pull/12211)| 0.14#1 +|[edlib](https://github.com/microsoft/vcpkg/pull/12490)| 1.2.6#0 +|[neargye-semver](https://github.com/microsoft/vcpkg/pull/12406)| 0.2.2#0 +|[marble](https://github.com/microsoft/vcpkg/pull/8628)| 19.08.2#0 +|[simple-fft](https://github.com/microsoft/vcpkg/pull/11929)| 2020-06-14#0 +|[stx](https://github.com/microsoft/vcpkg/pull/12011)| 1.0.1#0 +|[rsocket](https://github.com/microsoft/vcpkg/pull/11021)| 2020.05.04.00-1#0 +|[brpc](https://github.com/microsoft/vcpkg/pull/11524)| 0.9.7#0 +|[gamedev-framework](https://github.com/microsoft/vcpkg/pull/12426)[#14066](https://github.com/microsoft/vcpkg/pull/14066) | 0.18.0#0 +|[audiofile](https://github.com/microsoft/vcpkg/pull/12482)| 1.0.7#0 +|[tomlplusplus](https://github.com/microsoft/vcpkg/pull/10786)| 1.3.0-3#0 +|[vcpkg-ci-paraview](https://github.com/microsoft/vcpkg/pull/12342)| 1#1 +|[avro-cpp](https://github.com/microsoft/vcpkg/pull/11376)| 1.9.2#0 +|[xframe](https://github.com/microsoft/vcpkg/pull/12427)| 0.3.0#0 +|[minc](https://github.com/microsoft/vcpkg/pull/11208)| 2.4.03#0 +|[nifticlib](https://github.com/microsoft/vcpkg/pull/11208)| 2020-04-30#0 +|[pngpp](https://github.com/microsoft/vcpkg/pull/12705)| 0.2.10#0 +|[ngspice](https://github.com/microsoft/vcpkg/pull/12695)| 32#0 +|[lzokay](https://github.com/microsoft/vcpkg/pull/12655)| 2020-07-30#0 +|[josuttis-jthread](https://github.com/microsoft/vcpkg/pull/12497)| 2020-07-21#0 +|[lapack](https://github.com/microsoft/vcpkg/pull/12464)| 0#0 +|[colmap](https://github.com/microsoft/vcpkg/pull/12410)| 3.6#0 +|[qwtw](https://github.com/microsoft/vcpkg/pull/12748)| 3.0#0 +|[cppad](https://github.com/microsoft/vcpkg/pull/12560)| 20200000.3#0 +|[kf5completion](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0#0 +|[kf5config](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0#0 +|[kf5coreaddons](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0#0 +|[kf5crash](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0#0 +|[kf5guiaddons](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0#0 +|[kf5i18n](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0#0 +|[kf5itemmodels](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0#0 +|[kf5itemviews](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0#0 +|[kf5widgetsaddons](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0#0 +|[kf5windowsystem](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0#0 +|[libde265](https://github.com/microsoft/vcpkg/pull/11861)| 1.0.5#0 +|[libheif](https://github.com/microsoft/vcpkg/pull/11861)| 1.7.0#0 +|[quazip](https://github.com/microsoft/vcpkg/pull/11861)| 0.9.1#0 +|[vc](https://github.com/microsoft/vcpkg/pull/11861)| 1.4.1#0 +|[tlx](https://github.com/microsoft/vcpkg/pull/11943)| 0.5.20191212#0 +|[crashrpt](https://github.com/microsoft/vcpkg/pull/9162)| 1.4.3#0 +|[dbghelp](https://github.com/microsoft/vcpkg/pull/9162)| 0.0#0 +|[directxsdk](https://github.com/microsoft/vcpkg/pull/12778)| jun10#0 +|[opencolorio-tools](https://github.com/microsoft/vcpkg/pull/12420)| 1.1.1#0 +|[lapack-reference](https://github.com/microsoft/vcpkg/pull/12805)| 3.8.0#0 +|[vcpkg-gfortran](https://github.com/microsoft/vcpkg/pull/12805)| 1#0 +|[constexpr-contracts](https://github.com/microsoft/vcpkg/pull/12818)| 2020-08-09#0 +|[numcpp](https://github.com/microsoft/vcpkg/pull/12682)| 2.1.0#0 +|[behaviortree-cpp](https://github.com/microsoft/vcpkg/pull/12769)| 3.5.1#0 +|[fluidlite](https://github.com/microsoft/vcpkg/pull/13006)| 2020-08-20#0 +|[boost-uninstall](https://github.com/microsoft/vcpkg/pull/12851)| 1.73.0#0 +|[vlfeat](https://github.com/microsoft/vcpkg/pull/12229)| 2020-07-10#0 +|[v8](https://github.com/microsoft/vcpkg/pull/12687)| 8.3.110.13#0 +|[rest-rpc](https://github.com/microsoft/vcpkg/pull/13232)| 0.07#0 +|[cpu-features](https://github.com/microsoft/vcpkg/pull/12681)| 0.4.1#0 +|[libhsplasma](https://github.com/microsoft/vcpkg/pull/13174)| 2020.08.30#0 +|[sentry-native](https://github.com/microsoft/vcpkg/pull/13118)| 0.4.0#0 +|[libxmlmm](https://github.com/microsoft/vcpkg/pull/13139)| 0.6.0#0 +|[levmar](https://github.com/microsoft/vcpkg/pull/13164)| 2.6#0 +|[knet](https://github.com/microsoft/vcpkg/pull/13207)| 1.0.1#0 +|[rappture](https://github.com/microsoft/vcpkg/pull/13321)| 1.9#0 +|[serd](https://github.com/microsoft/vcpkg/pull/13260)| 0.30.4#0 +|[chromium-base](https://github.com/microsoft/vcpkg/pull/12396)| 86.0.4199.1#0 +|[sord](https://github.com/microsoft/vcpkg/pull/13411)| 0.16.4#0 +|[mp-units](https://github.com/microsoft/vcpkg/pull/13416)| 0.6.0#0 +|[lerc](https://github.com/microsoft/vcpkg/pull/13358)| 2.2#0 +|[irrxml](https://github.com/microsoft/vcpkg/pull/13264)| 1.2#0 +|[kubazip](https://github.com/microsoft/vcpkg/pull/13264)| 0.1.19#0 +|[poly2tri](https://github.com/microsoft/vcpkg/pull/13264)| 2020-07-21#0 +|[taskflow](https://github.com/microsoft/vcpkg/pull/13140)| 2.6.0#0 +|[hffix](https://github.com/microsoft/vcpkg/pull/13433)| 1.0.0#0 +|[d3dx12](https://github.com/microsoft/vcpkg/pull/13360)| may2020#0 +|[croncpp](https://github.com/microsoft/vcpkg/pull/13359)| 2020-09-04#1 +|[triangle](https://github.com/microsoft/vcpkg/pull/13322)| 1.6#0 +|[dartsim](https://github.com/microsoft/vcpkg/pull/13320)| 9.4.0#0 +|[unqlite](https://github.com/microsoft/vcpkg/pull/13544)| 1.1.9#0 +|[lv2](https://github.com/microsoft/vcpkg/pull/13462)| 1.18.0#0 +|[fbthrift](https://github.com/microsoft/vcpkg/pull/13072)| 2019.11.11.00#0 +|[libsigcpp-3](https://github.com/microsoft/vcpkg/pull/13412)| 3.0.3#0 +|[libsbml](https://github.com/microsoft/vcpkg/pull/13524)| 5.18.0#0 +|[opencascade](https://github.com/microsoft/vcpkg/pull/13493)| 7.4.0#0 +|[opensubdiv](https://github.com/microsoft/vcpkg/pull/13695)| 3.4.3#0 +|[tinyexpr](https://github.com/microsoft/vcpkg/pull/13729)| 2020-09-25#0 +|[mikktspace](https://github.com/microsoft/vcpkg/pull/13900)| 2020-10-06#0 +|[sltbench](https://github.com/microsoft/vcpkg/pull/13886)| 2.4.0#0 +|[rbdl](https://github.com/microsoft/vcpkg/pull/13884)| 2.6.0#0 +|[sqlcipher](https://github.com/microsoft/vcpkg/pull/13786)| 4.4.0#0 +|[sratom](https://github.com/microsoft/vcpkg/pull/13771)| 0.6.4#0 +|[libspnav](https://github.com/microsoft/vcpkg/pull/14052)| 0.2.3#0 +|[kenlm](https://github.com/microsoft/vcpkg/pull/13692)| 20200924#0 +|[ezc3d](https://github.com/microsoft/vcpkg/pull/14016)| 1.3.7#0 +|[vulkan-headers](https://github.com/microsoft/vcpkg/pull/14116)| 1.2.157#0 +|[shaderwriter](https://github.com/microsoft/vcpkg/pull/14088)| 2020-10-15#0 +|[libjuice](https://github.com/microsoft/vcpkg/pull/13703)| 0.5.2#0 +|[lilv](https://github.com/microsoft/vcpkg/pull/14080)| 0.24.10#0 +|[ashes](https://github.com/microsoft/vcpkg/pull/14087)| 2020-10-21#0 +|[yasm-tool-helper](https://github.com/microsoft/vcpkg/pull/14003)| 2020-10-12#0 +|[yasm-tool](https://github.com/microsoft/vcpkg/pull/14003)| 2020-10-12#0 +|[krabsetw](https://github.com/microsoft/vcpkg/pull/14192)| 4.1.13#0 +|[faiss](https://github.com/microsoft/vcpkg/pull/13825)| 1.6.4#0 +|[oatpp-sqlite](https://github.com/microsoft/vcpkg/pull/14107)| 1.2.0#0 +
+ +
+The following 35 ports have been updated: + +- marl `2020-05-21#0` -> `2020-06-30#0` + - [(#12162)](https://github.com/microsoft/vcpkg/pull/12162) [marl] Update to 2020-06-30 + +- simdjson `2020-05-26#0` -> `0.4.6#0` + - [(#12140)](https://github.com/microsoft/vcpkg/pull/12140) [simdjson] Update to 0.4.6 + +- blend2d `beta_2020-06-01#0` -> `beta_2020-07-09#0,` + - [(#12360)](https://github.com/microsoft/vcpkg/pull/12360) [blend2d] Update to beta_2020-07-09 + +- libb2 `0.98.1-2#0` -> `0.98.1#3,` + - [(#12398)](https://github.com/microsoft/vcpkg/pull/12398) [libb2] Add supports and install pkg-conifg on macOS VM + +- geographiclib `1.47-patch1-16#0` -> `1.50.1#0` + - [(#12379)](https://github.com/microsoft/vcpkg/pull/12379) [geographiclib] Update to 1.50.1 + +- ogre `1.12.1-1#0` -> `1.12.7#0` + - [(#12210)](https://github.com/microsoft/vcpkg/pull/12210) [ogre] Update to version 1.12.7 and fix link error + +- libmodbus `3.1.6#0` -> `3.1.6#1,` + - [(#12530)](https://github.com/microsoft/vcpkg/pull/12530) [libmodbus] Fix static linkage error + +- mpir `3.0.0-8#0` -> `3.0.0#9,` + - [(#12514)](https://github.com/microsoft/vcpkg/pull/12514) [mpir] Fix build error if VCPKG_BUILD_TYPE is set as release or debug + +- mosquitto `1.6.8-1#0` -> `1.6.8#"2",` + - [(#12536)](https://github.com/microsoft/vcpkg/pull/12536) [mosquitto] Add vcpkg-cmake-wrapper.cmake and vcpkg.json + +- coroutine `1.5.0#0` -> `1.5.0#"1",` + - [(#12456)](https://github.com/microsoft/vcpkg/pull/12456) [coroutine] Fix error C7651 + +- argtable3 `2019-08-21#0` -> `3.1.5#0` + - [(#12421)](https://github.com/microsoft/vcpkg/pull/12421) [argtable3] Update to 3.1.5 + +- gmp `6.2.0-2#0` -> `6.2.0#3,` + - [(#12664)](https://github.com/microsoft/vcpkg/pull/12664) [mpir, gmp] Add message to handle the conflicts between these two ports + +- libass `0.14.0#0` -> `0.14.0#3,` + - [(#12528)](https://github.com/microsoft/vcpkg/pull/12528) [libass] Fix build error on x64-windows-static + +- cmocka `1.1.5#0` -> `2020-08-01#0` + - [(#12828)](https://github.com/microsoft/vcpkg/pull/12828) [cmocka] Update to 2020-08-01 + +- libvorbis `1.3.6-4d963fe#0` -> `1.3.7#0` + - [(#12909)](https://github.com/microsoft/vcpkg/pull/12909) [libvorbis] Update to 1.3.7 + +- libsndfile `1.0.29#0` -> `1.0.29#11,` + - [(#12921)](https://github.com/microsoft/vcpkg/pull/12921) [libsndfile] Update to 1.0.29 + +- bzip2 `1.0.8#0` -> `1.0.8#1,` + - [(#13242)](https://github.com/microsoft/vcpkg/pull/13242) [bzip2] Add SHA512 hash check + +- xbyak `5.93#0` -> `5.97#0` + - [(#13553)](https://github.com/microsoft/vcpkg/pull/13553) [xbyak] Update port to 5.97 + +- nng `1.3.0#0` -> `1.3.2#0` + - [(#13545)](https://github.com/microsoft/vcpkg/pull/13545) [nng] Update to 1.3.2 + +- infoware `0.5.5#0` -> `0.5.5#1,` + - [(#13822)](https://github.com/microsoft/vcpkg/pull/13822) [infoware] fix linking issues with non-release builds + +- sdl2 `2.0.12#0` -> `2.0.12#5,` + - [(#13801)](https://github.com/microsoft/vcpkg/pull/13801) [sdl2] Fix build when VCPKG_BUILD_TYPE is set to "release" + +- chakracore `1.11.22#0` -> `1.11.22#1,` + - [(#14054)](https://github.com/microsoft/vcpkg/pull/14054) [chakracore,gamma,libopenmpt,portaudio,usrsctp] Fix baseline for 2020-10-14 + +- libopenmpt `2017-01-28-cf2390140#0` -> `2017-01-28-cf2390140#1,` + - [(#14054)](https://github.com/microsoft/vcpkg/pull/14054) [chakracore,gamma,libopenmpt,portaudio,usrsctp] Fix baseline for 2020-10-14 + +- portaudio `2020-02-02#0` -> `2020-02-02#2,` + - [(#14054)](https://github.com/microsoft/vcpkg/pull/14054) [chakracore,gamma,libopenmpt,portaudio,usrsctp] Fix baseline for 2020-10-14 + +- itk `5.1.0#0` -> `5.1.0#3,` + - [(#14056)](https://github.com/microsoft/vcpkg/pull/14056) [itk,libsamplerate,libsndfile] Apply some Visual Studio 2019 version 16.9 preview 1 workarounds + +- libsamplerate `0.1.9.0-1#0` -> `0.1.9.0#2,` + - [(#14056)](https://github.com/microsoft/vcpkg/pull/14056) [itk,libsamplerate,libsndfile] Apply some Visual Studio 2019 version 16.9 preview 1 workarounds + +- json-dto `0.2.10#0` -> `0.2.11#0` + - [(#14084)](https://github.com/microsoft/vcpkg/pull/14084) [json-dto] update to v.0.2.11 + +- freetds `1.1.17#0` -> `1.2.5#0` + - [(#14120)](https://github.com/microsoft/vcpkg/pull/14120) [freetds] Update to v1.2.5 and update source to github. + +- restinio `0.6.10#0` -> `0.6.11#0` + - [(#14162)](https://github.com/microsoft/vcpkg/pull/14162) [restinio] update to v.0.6.11 + +- cppwinrt `fall_2017_creators_update_for_vs_15.3-2#0` -> `windows-sdk#0` + - [(#14092)](https://github.com/microsoft/vcpkg/pull/14092) [cppwinrt] Update to version 2.0.201008.2 + +- vs-yasm `0.5.0#0` -> `0.5.0#1,` + - [(#14003)](https://github.com/microsoft/vcpkg/pull/14003) [vcpkg baseline] [vs-yasm] Build yasm instead of downloading it to work around memory corruption bugs in yasm itself. + +- asio `1.12.2-2#0` -> `1.18.0#0` + - [(#14167)](https://github.com/microsoft/vcpkg/pull/14167) [asio] update to version 1.18.0 (#14095) + +- opendnp3 `2.3.2#0` -> `3.1.0#0` + - [(#14167)](https://github.com/microsoft/vcpkg/pull/14167) [asio] update to version 1.18.0 (#14095) + +- restbed `4.16-07-28-2018-2#0` -> `4.7#0` + - [(#14167)](https://github.com/microsoft/vcpkg/pull/14167) [asio] update to version 1.18.0 (#14095) + +- sqlitecpp `3.1.1#0` -> `3.1.1#1,` + - [(#14029)](https://github.com/microsoft/vcpkg/pull/14029) [sqlitecpp] Additions for sqlcipher port + +
+ +-- vcpkg team vcpkg@microsoft.com MON, 2 Nov 00:00:00 -0800 + +vcpkg (2020.06.16 - 2020.7.31) +--- +#### Total port count: 1429 +#### Total port count per triplet (tested): +|triplet|ports available| +|---|---| +|**x64-windows**|1304| +|x86-windows|1284| +|x64-windows-static|1213| +|**x64-osx**|1139| +|**x64-linux**|1210| +|arm64-windows|928| +|x64-uwp|700| +|arm-uwp|669| + +#### The following commands and options have been updated: +- `x-package-info` ***[NEW COMMAND]***: Allows viewing of port information in a requested format (currently json) + - [(#12845)](https://github.com/microsoft/vcpkg/pull/12845) [vcpkg] Lift `--x-json` to a global option, implement experimental `x-package-info` command (by @ras0219) +- `--editable` ***[NEW OPTION]***: Suppress binary caching and source re-extraction for packages listed on the command line + - [(#12200)](https://github.com/microsoft/vcpkg/pull/12200) [vcpkg] Implement --editable (by @ras0219) + - [(#12366)](https://github.com/microsoft/vcpkg/pull/12366) [vcpkg] Improve informational message for `--editable` while cleaning sources (by @ras0219) +- `--x-binarysource=` ***[NEW OPTION]***: Experimental: Support NuGet servers for retrieving and uploading of binary packages during builds + - [(#12058)](https://github.com/microsoft/vcpkg/pull/12058) [vcpkg] Implementation of --x-binarysource=nuget (and friends) (by @ras0219) +- `install` + - `--x-write-nuget-packages-config` ***[NEW OPTION]***: Experimental: Write out a NuGet packages config-formatted file for use with external binary caching + - [(#12138)](https://github.com/microsoft/vcpkg/pull/12138) [vcpkg] Implement --x-write-nuget-packages-config= setting for `install` and `x-set-installed` (by @ras0219) +- `x-set-installed` + - `--dry-run` ***[NEW OPTION]***: Perform a dry run by not actually building or installing + - [(#12132)](https://github.com/microsoft/vcpkg/pull/12132) [vcpkg-x-set-installed] Implement --dry-run (by @ras0219) +- `--x-json`: Lift this option to the global scope to request json output from compatible commands (see `x-package-info`) + - [(#12845)](https://github.com/microsoft/vcpkg/pull/12845) [vcpkg] Lift `--x-json` to a global option, implement experimental `x-package-info` command (by @ras0219) + +#### The following documentation has been updated: +- [vcpkg_from_sourceforge](docs/maintainers/vcpkg_from_sourceforge.md) ***[NEW]*** + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) (by @JackBoosY) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) (by @JackBoosY) + - [(#12254)](https://github.com/microsoft/vcpkg/pull/12254) [vcpkg] Track hashes of cmake script helpers in consuming portfiles (by @ras0219) +- [vcpkg_fixup_pkgconfig](docs/maintainers/vcpkg_fixup_pkgconfig.md) ***[NEW]*** + - [(#12254)](https://github.com/microsoft/vcpkg/pull/12254) [vcpkg] Track hashes of cmake script helpers in consuming portfiles (by @ras0219) +- [Binary Caching Specification](docs/specifications/binarycaching.md) ***[NEW]*** + - [(#11204)](https://github.com/microsoft/vcpkg/pull/11204) [vcpkg] RFC: Binarycaching (by @ras0219-msft) +- [README](README.md) + - [(#12093)](https://github.com/microsoft/vcpkg/pull/12093) [vcpkg docs] new README/Quick Start guide (by @strega-nil) +- [Patching Example](docs/examples/patching.md) + - [(#11952)](https://github.com/microsoft/vcpkg/pull/11952) [Document]Mention --ignore-space-at-eol in patching.md (by @Pospelove) + - [(#12200)](https://github.com/microsoft/vcpkg/pull/12200) [vcpkg] Implement --editable (by @ras0219) +- [vcpkg_fixup_cmake_targets](docs/maintainers/vcpkg_fixup_cmake_targets.md) + - [(#11275)](https://github.com/microsoft/vcpkg/pull/11275) [ignition-plugin1] Add new port 🤖 (by @traversaro) +- [Privacy](docs/about/privacy.md) + - [(#11757)](https://github.com/microsoft/vcpkg/pull/11757) [vcpkg manifest] Manifest Implementation (by @strega-nil) +- [Manifests](docs/specifications/manifests.md) + - [(#11757)](https://github.com/microsoft/vcpkg/pull/11757) [vcpkg manifest] Manifest Implementation (by @strega-nil) +- [Environment and Configuration](docs/users/config-environment.md) + - [(#11757)](https://github.com/microsoft/vcpkg/pull/11757) [vcpkg manifest] Manifest Implementation (by @strega-nil) + - [(#12640)](https://github.com/microsoft/vcpkg/pull/12640) [vcpkg] add environment variable VCPKG_OVERLAY_PORTS (by @Neumann-A) +- [Buildsystem Integration](docs/users/integration.md) + - [(#12145)](https://github.com/microsoft/vcpkg/pull/12145) [vcpkg] Update message in bootstrap.ps1 (by @PhoebeHui) + - [(#12873)](https://github.com/microsoft/vcpkg/pull/12873) [vcpkg] Fix bullet lists for integration.md on readthedocs.io (by @ftheile) +- [Installing and Using Packages](docs/examples/installing-and-using-packages.md) + - [(#12200)](https://github.com/microsoft/vcpkg/pull/12200) [vcpkg] Implement --editable (by @ras0219) + - [(#12516)](https://github.com/microsoft/vcpkg/pull/12516) [sqlite3] Namespaced targets with unofficial:: (by @PhoebeHui) +- [Packaging Zipfiles](docs/examples/packaging-zipfiles.md) + - [(#12200)](https://github.com/microsoft/vcpkg/pull/12200) [vcpkg] Implement --editable (by @ras0219) +- [CONTROL Files](docs/maintainers/control-files.md) + - [(#12227)](https://github.com/microsoft/vcpkg/pull/12227) [vcpkg manifests] fix some issues (by @strega-nil) +- [Portfile Functions](docs/maintainers/portfile-functions.md) + - [(#12254)](https://github.com/microsoft/vcpkg/pull/12254) [vcpkg] Track hashes of cmake script helpers in consuming portfiles (by @ras0219) +- [vcpkg_build_make](docs/maintainers/vcpkg_build_make.md) + - [(#12254)](https://github.com/microsoft/vcpkg/pull/12254) [vcpkg] Track hashes of cmake script helpers in consuming portfiles (by @ras0219) +- [vcpkg_common_definitions](docs/maintainers/vcpkg_common_definitions.md) + - [(#12254)](https://github.com/microsoft/vcpkg/pull/12254) [vcpkg] Track hashes of cmake script helpers in consuming portfiles (by @ras0219) +- [vcpkg_configure_make](docs/maintainers/vcpkg_configure_make.md) + - [(#12254)](https://github.com/microsoft/vcpkg/pull/12254) [vcpkg] Track hashes of cmake script helpers in consuming portfiles (by @ras0219) +- [vcpkg_find_acquire_program](docs/maintainers/vcpkg_find_acquire_program.md) + - [(#12254)](https://github.com/microsoft/vcpkg/pull/12254) [vcpkg] Track hashes of cmake script helpers in consuming portfiles (by @ras0219) +- [Triplets](docs/users/triplets.md) + - [(#12211)](https://github.com/microsoft/vcpkg/pull/12211) [corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06 (by @Squareys) +- [Maintainer Guidelines and Policies](docs/maintainers/maintainer-guide.md) + - [(#12460)](https://github.com/microsoft/vcpkg/pull/12460) [vcpkg] Improve format check failure message (by @JackBoosY) +- [vcpkg_check_linkage.md](docs/maintainers/vcpkg_check_linkage.md) + - [(#12624)](https://github.com/microsoft/vcpkg/pull/12624) Fix .gitignore excluding triplets/community, sort, and driveby vcpkg_check_linkage.md doc bug. (by @BillyONeal) +- [Overlay Triplets Example: Dynamic Linux Library](docs/examples/overlay-triplets-linux-dynamic.md) + - [(#12516)](https://github.com/microsoft/vcpkg/pull/12516) [sqlite3] Namespaced targets with unofficial:: (by @PhoebeHui) + +#### The following *remarkable* changes have been made to vcpkg's infrastructure: +- Port Manifest: New feature to allow projects to state their dependencies in a declarative format + - [(#11757)](https://github.com/microsoft/vcpkg/pull/11757) [vcpkg manifest] Manifest Implementation (by @strega-nil) + - [(#12227)](https://github.com/microsoft/vcpkg/pull/12227) [vcpkg manifests] fix some issues (by @strega-nil) + - [(#12549)](https://github.com/microsoft/vcpkg/pull/12549) [vcpkg manifest] add feature support (by @strega-nil) +- `vcpkg_from_sourceforge`: New maintainer helper function to retrieve sources from SourceForge + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) (by @JackBoosY) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) (by @JackBoosY) +- `VCPKG_OVERLAY_PORTS`: New environment variable to allow users to override ports with alternate versions + - [(#12640)](https://github.com/microsoft/vcpkg/pull/12640) [vcpkg] add environment variable VCPKG_OVERLAY_PORTS (by @Neumann-A) + +#### The following *additional* changes have been made to vcpkg's infrastructure: +- [(#12174)](https://github.com/microsoft/vcpkg/pull/12174) [vcpkg] Fix `vcpkg export --nuget` regressions (by @ras0219) +- [(#11842)](https://github.com/microsoft/vcpkg/pull/11842) [vcpkg] Extract common paths settings to make_cmake_cmd... (by @BillyONeal) +- [(#11977)](https://github.com/microsoft/vcpkg/pull/11977) [CHANGELOG] Update to 2020.06.15 (by @vicroms) +- [(#11978)](https://github.com/microsoft/vcpkg/pull/11978) Attempt to mitigate Windows Defender detections by making provision-image.ps1 not a powershell script (by @BillyONeal) +- [(#11015)](https://github.com/microsoft/vcpkg/pull/11015) [vcpkg] Fix issue #9781 by exporting from the installed directory (by @ras0219) +- [(#11984)](https://github.com/microsoft/vcpkg/pull/11984) [breakpad] Fix build failure on OSX (by @JackBoosY) +- [(#11981)](https://github.com/microsoft/vcpkg/pull/11981) [thrift] Update to 0.13.0 and fix OSX build (by @JackBoosY) +- [(#11963)](https://github.com/microsoft/vcpkg/pull/11963) [libvpx] Support arm64-windows (by @JackBoosY) +- [(#12000)](https://github.com/microsoft/vcpkg/pull/12000) [vcpkg] Clean tombstones in every build except PR validations (by @BillyONeal) +- [(#11965)](https://github.com/microsoft/vcpkg/pull/11965) [vcpkg baseline] Retrigger failed ports in baseline (by @PhoebeHui) +- [(#11938)](https://github.com/microsoft/vcpkg/pull/11938) [vcpkg] Add mirror to download Strawberry Perl (by @AenBleidd) +- [(#11931)](https://github.com/microsoft/vcpkg/pull/11931) [vcpkg] Put user-defined configuration triplets path on top of the search queue (by @AenBleidd) +- [(#11999)](https://github.com/microsoft/vcpkg/pull/11999) [vcpkg] Use SSH keys instead of password authentication when minting Linux scale sets (by @BillyONeal) +- [(#12049)](https://github.com/microsoft/vcpkg/pull/12049) [vcpkg] Delete unused --purge-tombstones and introduce BufferedPrint class (by @BillyONeal) +- [(#11654)](https://github.com/microsoft/vcpkg/pull/11654) [vcpkg] Track compiler information in ABI (by @ras0219) +- [(#11983)](https://github.com/microsoft/vcpkg/pull/11983) [libmicrohttpd] Support build on UNIX and use msbuild on Windows (by @JackBoosY) +- [(#12080)](https://github.com/microsoft/vcpkg/pull/12080) Fix bootstrapping MSYS2 pacman (#11499) (by @endrift) +- [(#12074)](https://github.com/microsoft/vcpkg/pull/12074) [vcpkg] Do not fail just because cleaning tombstones failed in CI. (by @BillyONeal) +- [(#11275)](https://github.com/microsoft/vcpkg/pull/11275) [ignition-plugin1] Add new port 🤖 (by @traversaro) +- [(#12067)](https://github.com/microsoft/vcpkg/pull/12067) [vcpkg baseline] Fix baseline errors (by @JackBoosY) +- [(#12082)](https://github.com/microsoft/vcpkg/pull/12082) [vcpkg] Commonize pipelines build powershell and don't use binary caching in CI (rather than PR) builds (by @BillyONeal) +- [(#12113)](https://github.com/microsoft/vcpkg/pull/12113) [vcpkg] Add disk space report to Windows PR/CI (by @BillyONeal) +- [(#12072)](https://github.com/microsoft/vcpkg/pull/12072) [vcpkg build] fix build command (by @strega-nil) +- [(#12120)](https://github.com/microsoft/vcpkg/pull/12120) [vcpkg] Delete unnecessary tombstone deletion step now that CI rebuilds everything (by @BillyONeal) +- [(#12091)](https://github.com/microsoft/vcpkg/pull/12091) [vcpkg] Use XDG/LOCALAPPDATA for default binary caching path (by @ras0219) +- [(#12128)](https://github.com/microsoft/vcpkg/pull/12128) [vcpkg] Fix "[commands-build] build smoke test" (by @ras0219) +- [(#12130)](https://github.com/microsoft/vcpkg/pull/12130) [vcpkg] Add write-only binary caching for CI. (by @BillyONeal) +- [(#12101)](https://github.com/microsoft/vcpkg/pull/12101) [vcpkg] Add mingw dynamic libs triplet (by @longnguyen2004) +- [(#12069)](https://github.com/microsoft/vcpkg/pull/12069) Fix typo in comment (by @freddy77) +- [(#12144)](https://github.com/microsoft/vcpkg/pull/12144) [vcpkg baseline][paraview] Fix linux build (by @JackBoosY) +- [(#12172)](https://github.com/microsoft/vcpkg/pull/12172) [vcpkg ci] add macos scripts to vcpkg repo (by @strega-nil) +- [(#12176)](https://github.com/microsoft/vcpkg/pull/12176) [vcpkg] VM Update (by @BillyONeal) +- [(#12192)](https://github.com/microsoft/vcpkg/pull/12192) Fix sourceparagraph:BooleanField (by @strega-nil) +- [(#12191)](https://github.com/microsoft/vcpkg/pull/12191) Don't change manifest root when manifest isn't enabled. (by @dada2048) +- [(#12170)](https://github.com/microsoft/vcpkg/pull/12170) [vcpkg] Enable NuGet-based binary caching via mono (by @ras0219) +- [(#12145)](https://github.com/microsoft/vcpkg/pull/12145) [vcpkg] Update message in bootstrap.ps1 (by @PhoebeHui) +- [(#12201)](https://github.com/microsoft/vcpkg/pull/12201) [vcpkg] Remove all uses of Foo::Foo() noexcept = default; to fix #9955 (by @ras0219) +- [(#12203)](https://github.com/microsoft/vcpkg/pull/12203) [vcpkg] Improve performance of compiler tracking (by @ras0219) +- [(#12212)](https://github.com/microsoft/vcpkg/pull/12212) [msbuild] Revert the importance to Normal (by @PhoebeHui) +- [(#12197)](https://github.com/microsoft/vcpkg/pull/12197) [vcpkg] Remove the tombstones and 'ignore' baseline concepts. (by @BillyONeal) +- [(#4608)](https://github.com/microsoft/vcpkg/pull/4608) [vcpkg] Use IncludePath and LibraryPath properties (by @FrankHeimes) +- [(#12242)](https://github.com/microsoft/vcpkg/pull/12242) [vcpkg] Remove use of std::variant and std::visit to fix VS2015. (by @ras0219) +- [(#12272)](https://github.com/microsoft/vcpkg/pull/12272) [vcpkg] Revert change which causes sources to be purged by default in `vcpkg build` (by @ras0219) +- [(#12263)](https://github.com/microsoft/vcpkg/pull/12263) [vcpkg] Update toolsrc VERSION to 2020.06.15 (by @c72578) +- [(#12232)](https://github.com/microsoft/vcpkg/pull/12232) [opengl wincrypt winsock2] Use $ENV{WindowsSdkDir} instead of hard coding Windows SDK paths. (by @BillyONeal) +- [(#12177)](https://github.com/microsoft/vcpkg/pull/12177) [vcpkg] Added python script to generate all packages file list, added to azur… (by @yaoleo34) +- [(#11655)](https://github.com/microsoft/vcpkg/pull/11655) [vcpkg] Format the C++ in CI (by @strega-nil) +- [(#12300)](https://github.com/microsoft/vcpkg/pull/12300) [libbson, vcpkg baseline] Remove passing and fix spurious failure. (by @BillyONeal) +- [(#12140)](https://github.com/microsoft/vcpkg/pull/12140) [simdjson] Update to 0.4.6 (by @myd7349) +- [(#11967)](https://github.com/microsoft/vcpkg/pull/11967) [evpp] Fix build error on OSX (by @JackBoosY) +- [(#12314)](https://github.com/microsoft/vcpkg/pull/12314) [vcpkg ci] Update formatting CI (by @strega-nil) +- [(#12259)](https://github.com/microsoft/vcpkg/pull/12259) [triplets][osx] add support for arm64 'apple silicon' (by @eklipse2k8) +- [(#11754)](https://github.com/microsoft/vcpkg/pull/11754) [pcre2] Update to 10.35 (by @c72578) +- [(#11753)](https://github.com/microsoft/vcpkg/pull/11753) Fix support for toolchains that set CMAKE_FIND_ROOT_PATH_MODE_* variables to ONLY (by @traversaro) +- [(#12317)](https://github.com/microsoft/vcpkg/pull/12317) [vcpkg README] Fix links (by @strega-nil) +- [(#12319)](https://github.com/microsoft/vcpkg/pull/12319) [vcpkg.targets] Fix #12292 regression with MSBuild targets (by @ras0219-msft) +- [(#12323)](https://github.com/microsoft/vcpkg/pull/12323) [vcpkg] Ignore dependencies not found errors when downloading mode (by @JackBoosY) +- [(#12257)](https://github.com/microsoft/vcpkg/pull/12257) [vcpkg] Fix MSBuild regressions #12062 and #12086. (by @ras0219) +- [(#12037)](https://github.com/microsoft/vcpkg/pull/12037) [freerdp] Fix x64-osx triplet (by @AlexAltea) +- [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. (by @Neumann-A) +- [(#8322)](https://github.com/microsoft/vcpkg/pull/8322) [kfr] Add new port (by @myd7349) +- [(#12244)](https://github.com/microsoft/vcpkg/pull/12244) [cuda] correct env variables for newer cuda versions (by @Neumann-A) +- [(#12256)](https://github.com/microsoft/vcpkg/pull/12256) [vcpkg] Move default binary cache from `$root/archives` to user-wide directory (by @ras0219) +- [(#12350)](https://github.com/microsoft/vcpkg/pull/12350) [vcpkg] Remove unnecessary work queue (by @strega-nil) +- [(#12367)](https://github.com/microsoft/vcpkg/pull/12367) [vcpkg build] fix #12355 (by @strega-nil) +- [(#12369)](https://github.com/microsoft/vcpkg/pull/12369) [vcpkg formatting] Fix format regex (by @strega-nil) +- [(#12178)](https://github.com/microsoft/vcpkg/pull/12178) [vcpkg] Add a schema file for vcpkg.json (by @Edhebi) +- [(#12370)](https://github.com/microsoft/vcpkg/pull/12370) [vcpkg] Enable binary caching by default (by @ras0219) +- [(#12386)](https://github.com/microsoft/vcpkg/pull/12386) [vcpkg] Add CMake heuristics for header-only libraries (by @ras0219) +- [(#12378)](https://github.com/microsoft/vcpkg/pull/12378) [vcpkg] proper errorcheck during files installation (by @Maximus5) +- [(#12384)](https://github.com/microsoft/vcpkg/pull/12384) [vcpkg-ci] Always publish file lists (by @ras0219) +- [(#12254)](https://github.com/microsoft/vcpkg/pull/12254) [vcpkg] Track hashes of cmake script helpers in consuming portfiles (by @ras0219) +- [(#12361)](https://github.com/microsoft/vcpkg/pull/12361) [vcpkg] Fix iOS toolchain detection when using the iOS community triplets (by @alcroito) +- [(#12398)](https://github.com/microsoft/vcpkg/pull/12398) [libb2] Add supports and install pkg-conifg on macOS VM (by @PhoebeHui) +- [(#12368)](https://github.com/microsoft/vcpkg/pull/12368) [vcpkg formatting] Turn off DeriveLineEnding (by @strega-nil) +- [(#12429)](https://github.com/microsoft/vcpkg/pull/12429) [vcpkg] Fix ParagraphParser::required_field() (by @maksqwe) +- [(#12400)](https://github.com/microsoft/vcpkg/pull/12400) [vcpkg] implement copy_symlink working for non-elevated processes (by @Maximus5) +- [(#12432)](https://github.com/microsoft/vcpkg/pull/12432) vcpkg_configure_make: typo fix '_vcpkg_append_to_configure_environment' (by @kevinlul) +- [(#12351)](https://github.com/microsoft/vcpkg/pull/12351) [vcpkg] Clean up command switch code (by @strega-nil) +- [(#12179)](https://github.com/microsoft/vcpkg/pull/12179) [vcpkg] print list in json (by @dan-shaw) +- [(#12084)](https://github.com/microsoft/vcpkg/pull/12084) Build fix with MinGW GCC 9.2.0 (by @cristianadam) +- [(#12455)](https://github.com/microsoft/vcpkg/pull/12455) [libmicrohttpd] Add `platform.h` to restricted header list. (by @ras0219) +- [(#12468)](https://github.com/microsoft/vcpkg/pull/12468) [vcpkg] Add NVTOOLSEXT_PATH to the env passthrough list (by @Neumann-A) +- [(#12534)](https://github.com/microsoft/vcpkg/pull/12534) Add initial s390x support (by @lebdron) +- [(#11550)](https://github.com/microsoft/vcpkg/pull/11550) [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries (by @Neumann-A) +- [(#11130)](https://github.com/microsoft/vcpkg/pull/11130) [opencv4] update to v4.3 (by @cenit) +- [(#12467)](https://github.com/microsoft/vcpkg/pull/12467) [vcpkg-acquire-msys] Install new keyring (by @emptyVoid) +- [(#12460)](https://github.com/microsoft/vcpkg/pull/12460) [vcpkg] Improve format check failure message (by @JackBoosY) +- [(#9248)](https://github.com/microsoft/vcpkg/pull/9248) fix issue #9228 : Add support to subgroups in gitlab (by @RamadanAhmed) +- [(#12513)](https://github.com/microsoft/vcpkg/pull/12513) [vcpkg] EOL LF for ci.baseline.txt (by @Neumann-A) +- [(#8628)](https://github.com/microsoft/vcpkg/pull/8628) [marble] Add new port (by @ig-or) +- [(#12118)](https://github.com/microsoft/vcpkg/pull/12118) [mozjpeg] fix build (by @saucecontrol) +- [(#12530)](https://github.com/microsoft/vcpkg/pull/12530) [libmodbus] Fix static linkage error (by @NancyLi1013) +- [(#12514)](https://github.com/microsoft/vcpkg/pull/12514) [mpir] Fix build error if VCPKG_BUILD_TYPE is set as release or debug (by @NancyLi1013) +- [(#12529)](https://github.com/microsoft/vcpkg/pull/12529) [qt5 components] Disable parallel build (by @JackBoosY) +- [(#12569)](https://github.com/microsoft/vcpkg/pull/12569) [vcpkg_fixup_pkgconfig] Remove required in first find_program call for pkg-config (by @Neumann-A) +- [(#12097)](https://github.com/microsoft/vcpkg/pull/12097) Fix vcpkg android toolchain so it adds flags that aren't just ignored (by @jamiebk) +- [(#11021)](https://github.com/microsoft/vcpkg/pull/11021) [rsocket] Add new port (by @curoky) +- [(#12104)](https://github.com/microsoft/vcpkg/pull/12104) Fix vcpkg_fixup_cmake_targets to work correctly on MinGW (by @koprok) +- [(#12661)](https://github.com/microsoft/vcpkg/pull/12661) [vcpkg] Fix typo in link for installing and using packages (by @varunagrawal) +- [(#12639)](https://github.com/microsoft/vcpkg/pull/12639) [vcpkg-ci] fix macos setup scripts (by @strega-nil) +- [(#12586)](https://github.com/microsoft/vcpkg/pull/12586) [vcpkg] Fix build on Windows 8.1 SDK (by @strega-nil) +- [(#12585)](https://github.com/microsoft/vcpkg/pull/12585) [vcpkg] Refactor Commands: Part 1 (by @strega-nil) +- [(#10770)](https://github.com/microsoft/vcpkg/pull/10770) [cmake] Add cmake port to test qt (by @Neumann-A) +- [(#10786)](https://github.com/microsoft/vcpkg/pull/10786) [tomlplusplus] Add new port (by @traversaro) +- [(#12641)](https://github.com/microsoft/vcpkg/pull/12641) Refactor commands 2: Electric Boogaloo (by @strega-nil) +- [(#12548)](https://github.com/microsoft/vcpkg/pull/12548) [vcpkg manifest] look at `platform` directives (by @strega-nil) +- [(#12494)](https://github.com/microsoft/vcpkg/pull/12494) [qt-webengine] Fix building with vs2017 (by @Neumann-A) +- [(#11376)](https://github.com/microsoft/vcpkg/pull/11376) [avro-cpp] new port (by @alexander-smyslov) +- [(#11535)](https://github.com/microsoft/vcpkg/pull/11535) [mpg123] Allow cross-compiling, fix previous builds tainting rebuilds (by @kevinlul) +- [(#12624)](https://github.com/microsoft/vcpkg/pull/12624) Fix .gitignore excluding triplets/community, sort, and driveby vcpkg_check_linkage.md doc bug. (by @BillyONeal) +- [(#12423)](https://github.com/microsoft/vcpkg/pull/12423) [vcpkg] Add environment variable VCPKG_DEFAULT_BINARY_CACHE (by @Neumann-A) +- [(#10670)](https://github.com/microsoft/vcpkg/pull/10670) [vcpkg] Fix [boost] find_package for MSVC2013 / v120 (by @ManuelKugelmann) +- [(#12471)](https://github.com/microsoft/vcpkg/pull/12471) [vcpkg format-manifest] Add convert-control flag (by @strega-nil) +- [(#11208)](https://github.com/microsoft/vcpkg/pull/11208) [ITK] Update to 5.1 (by @Neumann-A) +- [(#12742)](https://github.com/microsoft/vcpkg/pull/12742) [wavpack] Fix failure on linux and osx (by @PhoebeHui) +- [(#12727)](https://github.com/microsoft/vcpkg/pull/12727) [msbuild] Revert the importance to Normal (by @PhoebeHui) +- [(#12717)](https://github.com/microsoft/vcpkg/pull/12717) [vcpkg] Fix prettify output not working in some cases (by @Deadpikle) +- [(#12715)](https://github.com/microsoft/vcpkg/pull/12715) [vcpkg] Add VCPKG_TARGET_IS_IOS (by @Deadpikle) +- [(#12716)](https://github.com/microsoft/vcpkg/pull/12716) [vcpkg] Fix arm64-osx triplet not building for arm64 (by @Deadpikle) +- [(#12701)](https://github.com/microsoft/vcpkg/pull/12701) [vcpkg-ci-paraview] move into scripts/test_ports (by @Neumann-A) +- [(#12699)](https://github.com/microsoft/vcpkg/pull/12699) [vcpkg baseline] remove qt translations from skip list (by @Neumann-A) +- [(#12695)](https://github.com/microsoft/vcpkg/pull/12695) [ngspice] Initial port (by @marekr) +- [(#12678)](https://github.com/microsoft/vcpkg/pull/12678) [vcpkg] Add missing check for x86 (by @arves100) +- [(#12752)](https://github.com/microsoft/vcpkg/pull/12752) [vcpkg_build_qmake] Disable multi-threaded build when file fails to open (by @JackBoosY) +- [(#12789)](https://github.com/microsoft/vcpkg/pull/12789) [vcpkg] Fix vs2015 build (by @strega-nil) +- [(#12312)](https://github.com/microsoft/vcpkg/pull/12312) [fmt] Update to 7.0.2 + [spdlog] Update to 1.7.0 (by @kevinlul) +- [(#12515)](https://github.com/microsoft/vcpkg/pull/12515) [pangolin] Fix build failure on UNIX (by @JackBoosY) +- [(#12792)](https://github.com/microsoft/vcpkg/pull/12792) [log4cpp] Fix header file install path (by @LilyWangL) +- [(#12784)](https://github.com/microsoft/vcpkg/pull/12784) [gSoap] Update to 2.8.105 and add a required shared directory (by @xgcssch) +- [(#12768)](https://github.com/microsoft/vcpkg/pull/12768) [libtorrent] Update to 1.2.8 (by @FranciscoPombal) +- [(#12762)](https://github.com/microsoft/vcpkg/pull/12762) [boost] Add Supports fields and more accurately handle arm64-windows/x64-uwp (by @ras0219) +- [(#12630)](https://github.com/microsoft/vcpkg/pull/12630) [secp256k1] Fix build failures and export cmake targets (by @PhoebeHui) +- [(#12524)](https://github.com/microsoft/vcpkg/pull/12524) [asmjit] Update to the latest commit (by @ZehMatt) +- [(#12528)](https://github.com/microsoft/vcpkg/pull/12528) [libass] Fix build error on x64-windows-static (by @LilyWangL) +- [(#12634)](https://github.com/microsoft/vcpkg/pull/12634) [vcpkg] Improving android support (by @christophe-calmejane) +- [(#9162)](https://github.com/microsoft/vcpkg/pull/9162) [crashrpt] Add new port (by @tbdrake) +- [(#12810)](https://github.com/microsoft/vcpkg/pull/12810) [vcpkg] Make C++ the primary github language (by @strega-nil) +- [(#12198)](https://github.com/microsoft/vcpkg/pull/12198) [vcpkg] Add `vcpkg export` to E2E tests. Enable E2E tests on all platforms. (by @ras0219) +- [(#12698)](https://github.com/microsoft/vcpkg/pull/12698) [vcpkg] Rewrite CMake build system to be more target-based (by @strega-nil) +- [(#12776)](https://github.com/microsoft/vcpkg/pull/12776) [vcpkg_copy_tool_dependencies] Use vcpkg internal powershell (by @JackBoosY) +- [(#12805)](https://github.com/microsoft/vcpkg/pull/12805) [lapack-reference|fortran] Add new port (by @Neumann-A) +- [(#12829)](https://github.com/microsoft/vcpkg/pull/12829) [vcpkg] Fix resolution of default features when using Manifest mode (by @ras0219) +- [(#11836)](https://github.com/microsoft/vcpkg/pull/11836) [vcpkg/scripts/make] trying to iron out some issues (by @Neumann-A) +- [(#12818)](https://github.com/microsoft/vcpkg/pull/12818) [constexpr-contracts] Adds new port (by @cjdb) +- [(#12876)](https://github.com/microsoft/vcpkg/pull/12876) [vcpkg] Reduce dependencies and contents of vcpkgpaths.h (by @ras0219) +- [(#12866)](https://github.com/microsoft/vcpkg/pull/12866) [msys] Improve vcpkg_acquire_msys (by @PhoebeHui) +- [(#12897)](https://github.com/microsoft/vcpkg/pull/12897) [vcpkg] Restore layering and purge unused ParagraphParseResult (by @ras0219) +- [(#12895)](https://github.com/microsoft/vcpkg/pull/12895) [vcpkg_find_acquire_program] add version check for ninja (by @Neumann-A) +- [(#12927)](https://github.com/microsoft/vcpkg/pull/12927) [meson] Update meson to 0.55.1 (by @Neumann-A) +- [(#12837)](https://github.com/microsoft/vcpkg/pull/12837) Fix/clang10 linux (by @ignacionr) +- [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp) (by @NancyLi1013) +- [(#12774)](https://github.com/microsoft/vcpkg/pull/12774) [vcpkg] Use std::filesystem when Visual Studio is greater than 2015 (by @JackBoosY) +- [(#12626)](https://github.com/microsoft/vcpkg/pull/12626) [vcpkg_find_acquire_program] Enable find_acquire(PKGCONFIG) (by @ras0219) +- [(#11277)](https://github.com/microsoft/vcpkg/pull/11277) [ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. (by @Sibras) +- [(#12864)](https://github.com/microsoft/vcpkg/pull/12864) [vcpkg_execute_build_process] Re-fix qt5 components build (by @JackBoosY) +- [(#13000)](https://github.com/microsoft/vcpkg/pull/13000) [vcpkg] Fix baseline (by @NancyLi1013) +- [(#12985)](https://github.com/microsoft/vcpkg/pull/12985) [vcpkg] Add Forward Declarations (originally by @cngzhnp) (by @strega-nil) +- [(#12976)](https://github.com/microsoft/vcpkg/pull/12976) [vcpkg] Update hint message (by @PhoebeHui) +- [(#12974)](https://github.com/microsoft/vcpkg/pull/12974) [fluidsynth/redis-plus-plus] Update to the latest released version (by @NancyLi1013) +- [(#13017)](https://github.com/microsoft/vcpkg/pull/13017) remove registries.h and fwd/registries.h... (by @strega-nil) +- [(#12975)](https://github.com/microsoft/vcpkg/pull/12975) [openmpi/vcpkg_build_make] Disable parallel build (by @JackBoosY) +- [(#13043)](https://github.com/microsoft/vcpkg/pull/13043) [vcpkg] Fix hint message (by @PhoebeHui) +- [(#12046)](https://github.com/microsoft/vcpkg/pull/12046) [portmidi] Updated portmidi package to use alternative code source (by @stekyne) +- [(#13066)](https://github.com/microsoft/vcpkg/pull/13066) [typo] Fix incorrect Path in readme (by @ninjaoflight) +- [(#12910)](https://github.com/microsoft/vcpkg/pull/12910) [vcpkg] Fix editable bug (by @ras0219) +- [(#12523)](https://github.com/microsoft/vcpkg/pull/12523) [vcpkg.cmake] check for vcpkg.json only in `${CMAKE_SOURCE_DIR}` (by @strega-nil) +- [(#12964)](https://github.com/microsoft/vcpkg/pull/12964) [vcpkg] Do not use raw paths inside regexes (by @hanst99) +- [(#13092)](https://github.com/microsoft/vcpkg/pull/13092) [vcpkg] Hotfix regression in #12523 (by @ras0219) +- [(#13067)](https://github.com/microsoft/vcpkg/pull/13067) Sort file lists and failure logs together. (by @BillyONeal) +- [(#12738)](https://github.com/microsoft/vcpkg/pull/12738) [vcpkg] Use https sources for common tools (by @janisozaur) +- [(#13058)](https://github.com/microsoft/vcpkg/pull/13058) [Box2d] Update to 2.4.0 (by @JonLiu1993) +- [(#12977)](https://github.com/microsoft/vcpkg/pull/12977) fix vcpkg_configure_cmake for case when having semicolons in OPTIONS (by @jgehw) +- [(#12950)](https://github.com/microsoft/vcpkg/pull/12950) [vcpkg] Fix build on older compilers. (by @huahang) +- [(#13104)](https://github.com/microsoft/vcpkg/pull/13104) [vcpkg] Fix vcpkg_acquire_msys failing on path with spaces (by @SupSuper) +- [(#13125)](https://github.com/microsoft/vcpkg/pull/13125) Disable fluidlite in CI. (by @BillyONeal) +- [(#13117)](https://github.com/microsoft/vcpkg/pull/13117) [vcpkg] Fix #13094 by avoiding the comma operator. (by @BillyONeal) +- [(#13107)](https://github.com/microsoft/vcpkg/pull/13107) [VMSS] Fix the printed error message (by @JackBoosY) +- [(#13069)](https://github.com/microsoft/vcpkg/pull/13069) [vcpkg] Fix upgrade for port-version (by @strega-nil) +- [(#12982)](https://github.com/microsoft/vcpkg/pull/12982) [vcpkg_find_acquire_program] Cleanup and add CI testing (by @ras0219) +- [(#13142)](https://github.com/microsoft/vcpkg/pull/13142) Allow use of VS LLVM clang-format. (by @BillyONeal) +- [(#13148)](https://github.com/microsoft/vcpkg/pull/13148) [baseline] Skip check of clapack:x64-osx in the baseline (by @JackBoosY) + +
+The following 59 ports have been added: + +|port|version| +|---|---| +|[nanobench](https://github.com/microsoft/vcpkg/pull/11955)| 4.0.0 +|[cgns](https://github.com/microsoft/vcpkg/pull/9960)| 3.4.0-1 +|[paraview](https://github.com/microsoft/vcpkg/pull/9960)[#12067](https://github.com/microsoft/vcpkg/pull/12067) [#12144](https://github.com/microsoft/vcpkg/pull/12144) [#12149](https://github.com/microsoft/vcpkg/pull/12149) [#11596](https://github.com/microsoft/vcpkg/pull/11596) [#12342](https://github.com/microsoft/vcpkg/pull/12342) | 5.8.0-2 +|[drogon](https://github.com/microsoft/vcpkg/pull/12024)[#12931](https://github.com/microsoft/vcpkg/pull/12931) [#13007](https://github.com/microsoft/vcpkg/pull/13007) | v1.0.0-beta21 +|[libxdiff](https://github.com/microsoft/vcpkg/pull/12017)| 0.23 +|[efsw](https://github.com/microsoft/vcpkg/pull/11901)| 2020-06-08 +|[bitmagic](https://github.com/microsoft/vcpkg/pull/11890)| 6.4.0 +|[tgbot-cpp](https://github.com/microsoft/vcpkg/pull/11876)| 1.2.1 +|[ignition-plugin1](https://github.com/microsoft/vcpkg/pull/11275)| 1.1.0 +|[ppmagic](https://github.com/microsoft/vcpkg/pull/12253)| 2020-07-03 +|[getdns](https://github.com/microsoft/vcpkg/pull/12090)| 1.6.0 +|[font-chef](https://github.com/microsoft/vcpkg/pull/12293)| 1.0.1 +|[implot](https://github.com/microsoft/vcpkg/pull/11920)[#12835](https://github.com/microsoft/vcpkg/pull/12835) | 0.4 +|[threadpool](https://github.com/microsoft/vcpkg/pull/11650)| 0.2.5 +|[mygui](https://github.com/microsoft/vcpkg/pull/11991)| 2020-06-17 +|[kfr](https://github.com/microsoft/vcpkg/pull/8322)| 2020-06-15 +|[meshoptimizer](https://github.com/microsoft/vcpkg/pull/12211)| 0.14 +|[edlib](https://github.com/microsoft/vcpkg/pull/12490)| 1.2.6 +|[neargye-semver](https://github.com/microsoft/vcpkg/pull/12406)| 0.2.2 +|[marble](https://github.com/microsoft/vcpkg/pull/8628)| 19.08.2 +|[simple-fft](https://github.com/microsoft/vcpkg/pull/11929)| 2020-06-14 +|[stx](https://github.com/microsoft/vcpkg/pull/12011)| 1.0.1 +|[rsocket](https://github.com/microsoft/vcpkg/pull/11021)| 2020.05.04.00-1 +|[brpc](https://github.com/microsoft/vcpkg/pull/11524)| 0.9.7 +|[gamedev-framework](https://github.com/microsoft/vcpkg/pull/12426)[#12680](https://github.com/microsoft/vcpkg/pull/12680) | 0.17 +|[tomlplusplus](https://github.com/microsoft/vcpkg/pull/10786)[#12859](https://github.com/microsoft/vcpkg/pull/12859) | 2.1.0 +|[vcpkg-ci-paraview](https://github.com/microsoft/vcpkg/pull/12342)| 1 +|[avro-cpp](https://github.com/microsoft/vcpkg/pull/11376)| 1.9.2 +|[xframe](https://github.com/microsoft/vcpkg/pull/12427)| 0.3.0 +|[minc](https://github.com/microsoft/vcpkg/pull/11208)| 2.4.03 +|[nifticlib](https://github.com/microsoft/vcpkg/pull/11208)| 2020-04-30 +|[ngspice](https://github.com/microsoft/vcpkg/pull/12695)| 32 +|[josuttis-jthread](https://github.com/microsoft/vcpkg/pull/12497)[#13040](https://github.com/microsoft/vcpkg/pull/13040) | 2020-07-21 +|[lapack](https://github.com/microsoft/vcpkg/pull/12464)[#12805](https://github.com/microsoft/vcpkg/pull/12805) | 1 +|[qwtw](https://github.com/microsoft/vcpkg/pull/12748)[#12961](https://github.com/microsoft/vcpkg/pull/12961) | 3.1.0 +|[cppad](https://github.com/microsoft/vcpkg/pull/12560)| 20200000.3 +|[kf5completion](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0 +|[kf5config](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0 +|[kf5coreaddons](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0 +|[kf5crash](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0 +|[kf5guiaddons](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0 +|[kf5i18n](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0 +|[kf5itemmodels](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0 +|[kf5itemviews](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0 +|[kf5widgetsaddons](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0 +|[kf5windowsystem](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0 +|[libde265](https://github.com/microsoft/vcpkg/pull/11861)| 1.0.5 +|[libheif](https://github.com/microsoft/vcpkg/pull/11861)[#12856](https://github.com/microsoft/vcpkg/pull/12856) | 1.7.0 +|[quazip](https://github.com/microsoft/vcpkg/pull/11861)| 0.9.1 +|[vc](https://github.com/microsoft/vcpkg/pull/11861)| 1.4.1 +|[tlx](https://github.com/microsoft/vcpkg/pull/11943)| 0.5.20191212 +|[crashrpt](https://github.com/microsoft/vcpkg/pull/9162)| 1.4.3 +|[dbghelp](https://github.com/microsoft/vcpkg/pull/9162)| 0.0 +|[opencolorio-tools](https://github.com/microsoft/vcpkg/pull/12420)| 1.1.1 +|[lapack-reference](https://github.com/microsoft/vcpkg/pull/12805)[#12977](https://github.com/microsoft/vcpkg/pull/12977) [#12929](https://github.com/microsoft/vcpkg/pull/12929) | 3.8.0 +|[vcpkg-gfortran](https://github.com/microsoft/vcpkg/pull/12805)| 1 +|[constexpr-contracts](https://github.com/microsoft/vcpkg/pull/12818)| 2020-08-09 +|[fluidlite](https://github.com/microsoft/vcpkg/pull/13006)[#13125](https://github.com/microsoft/vcpkg/pull/13125) | 2020-08-20 +|[boost-uninstall](https://github.com/microsoft/vcpkg/pull/12851)| 1.73.0 +
+ +
+The following 345 ports have been updated: + +- slikenet `2019-10-22_1` -> `2019-10-22-2` + - [(#11987)](https://github.com/microsoft/vcpkg/pull/11987) [slikenet] Add cmake config and targets file + +- breakpad `2019-07-11-1` -> `2019-07-11-2` + - [(#11984)](https://github.com/microsoft/vcpkg/pull/11984) [breakpad] Fix build failure on OSX + +- plf-colony `2019-08-10` -> `5.33` + - [(#11993)](https://github.com/microsoft/vcpkg/pull/11993) [plf-colony] Update to 5.33 + +- thrift `2020-02-08` -> `0.13.0` + - [(#11981)](https://github.com/microsoft/vcpkg/pull/11981) [thrift] Update to 0.13.0 and fix OSX build + +- libvpx `1.8.1-5` -> `1.8.1-7` + - [(#11963)](https://github.com/microsoft/vcpkg/pull/11963) [libvpx] Support arm64-windows + - [(#12080)](https://github.com/microsoft/vcpkg/pull/12080) Fix bootstrapping MSYS2 pacman (#11499) + - [(#12401)](https://github.com/microsoft/vcpkg/pull/12401) [liblzma, libvpx] Add mingw support + - [(#12706)](https://github.com/microsoft/vcpkg/pull/12706) [libvpx] fix pdb paths + +- libzip `rel-1-6-1` -> `1.7.1` + - [(#11982)](https://github.com/microsoft/vcpkg/pull/11982) [libzip] Update to 1.7.1 + - [(#12610)](https://github.com/microsoft/vcpkg/pull/12610) [libzip] Fix find_package error + +- directxtex `jun2020` -> `jun2020b` + - [(#11971)](https://github.com/microsoft/vcpkg/pull/11971) [directxtk12][directxtex] Update to latest version + - [(#12332)](https://github.com/microsoft/vcpkg/pull/12332) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version + - [(#13060)](https://github.com/microsoft/vcpkg/pull/13060) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version + +- directxtk12 `jun2020` -> `jun2020b` + - [(#11971)](https://github.com/microsoft/vcpkg/pull/11971) [directxtk12][directxtex] Update to latest version + - [(#12332)](https://github.com/microsoft/vcpkg/pull/12332) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version + - [(#13060)](https://github.com/microsoft/vcpkg/pull/13060) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version + +- geographiclib `1.47-patch1-12` -> `1.47-patch1-16` + - [(#11965)](https://github.com/microsoft/vcpkg/pull/11965) [vcpkg baseline] Retrigger failed ports in baseline + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + - [(#12379)](https://github.com/microsoft/vcpkg/pull/12379) [geographiclib] Update to 1.50.1 + - [(#12471)](https://github.com/microsoft/vcpkg/pull/12471) [vcpkg format-manifest] Add convert-control flag + +- polyclipping `6.4.2` -> `6.4.2-4` + - [(#11965)](https://github.com/microsoft/vcpkg/pull/11965) [vcpkg baseline] Retrigger failed ports in baseline + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + +- qhull `7.3.2-2` -> `8.0.0` + - [(#12015)](https://github.com/microsoft/vcpkg/pull/12015) [qhull] update version 8.0.0 + +- jsoncons `0.153.0` -> `0.155.1` + - [(#12014)](https://github.com/microsoft/vcpkg/pull/12014) [jsoncons] Update to v0.153.3 + - [(#12372)](https://github.com/microsoft/vcpkg/pull/12372) [jsoncons] Update to v0.154.1 + - [(#12827)](https://github.com/microsoft/vcpkg/pull/12827) [jsoncons] Update to version 0.155.1 + +- azure-c-shared-utility `2020-02-04.1` -> `2020-07-19` + - [(#12013)](https://github.com/microsoft/vcpkg/pull/12013) [Azure-IoT-Sdk] Update to release 2020-06-17 + - [(#12493)](https://github.com/microsoft/vcpkg/pull/12493) [Azure-IoT-Sdk*] Update to 2020-07-19 + +- azure-iot-sdk-c `2020-02-04.1-1` -> `2020-07-19` + - [(#12013)](https://github.com/microsoft/vcpkg/pull/12013) [Azure-IoT-Sdk] Update to release 2020-06-17 + - [(#12209)](https://github.com/microsoft/vcpkg/pull/12209) [azure-iot-sdk-c] Fix feature name and enable to build + - [(#12493)](https://github.com/microsoft/vcpkg/pull/12493) [Azure-IoT-Sdk*] Update to 2020-07-19 + - [(#12605)](https://github.com/microsoft/vcpkg/pull/12605) [azure-iot-sdk-c] Fix passing hsm_type_symm_key + +- azure-macro-utils-c `2020-02-04.1` -> `2020-06-17-1` + - [(#12013)](https://github.com/microsoft/vcpkg/pull/12013) [Azure-IoT-Sdk] Update to release 2020-06-17 + +- azure-uamqp-c `2020-02-04.1` -> `2020-07-19` + - [(#12013)](https://github.com/microsoft/vcpkg/pull/12013) [Azure-IoT-Sdk] Update to release 2020-06-17 + - [(#12493)](https://github.com/microsoft/vcpkg/pull/12493) [Azure-IoT-Sdk*] Update to 2020-07-19 + +- azure-uhttp-c `2020-02-04.1` -> `2020-07-19` + - [(#12013)](https://github.com/microsoft/vcpkg/pull/12013) [Azure-IoT-Sdk] Update to release 2020-06-17 + - [(#12493)](https://github.com/microsoft/vcpkg/pull/12493) [Azure-IoT-Sdk*] Update to 2020-07-19 + +- azure-umqtt-c `2020-02-04.1` -> `2020-07-19` + - [(#12013)](https://github.com/microsoft/vcpkg/pull/12013) [Azure-IoT-Sdk] Update to release 2020-06-17 + - [(#12493)](https://github.com/microsoft/vcpkg/pull/12493) [Azure-IoT-Sdk*] Update to 2020-07-19 + +- umock-c `2020-02-04.1` -> `2020-06-17-1` + - [(#12013)](https://github.com/microsoft/vcpkg/pull/12013) [Azure-IoT-Sdk] Update to release 2020-06-17 + +- tinyxml2 `8.0.0` -> `8.0.0-1` + - [(#11966)](https://github.com/microsoft/vcpkg/pull/11966) [tinyxml2] Fix generation of pkg-config file + +- nlohmann-json `3.7.3` -> `3.9.1` + - [(#11941)](https://github.com/microsoft/vcpkg/pull/11941) [nlohmann-json] Upgrade to 3.8.0 + - [(#12117)](https://github.com/microsoft/vcpkg/pull/12117) [nlohmann-json] Always install multiple headers to allow forward declarations + - [(#12601)](https://github.com/microsoft/vcpkg/pull/12601) [nlohmann-json] Update to 3.9.0 + - [(#12787)](https://github.com/microsoft/vcpkg/pull/12787) [nlohmann-json] Update to 3.9.1 + +- trantor `v1.0.0-rc13` -> `v1.0.0-rc16` + - [(#11937)](https://github.com/microsoft/vcpkg/pull/11937) [trantor] Bump version to v1.0.0-rc14 + - [(#12930)](https://github.com/microsoft/vcpkg/pull/12930) [trantor] Update to 1.0.0-rc16 + +- graphicsmagick `1.3.35` -> `1.3.35-2` + - [(#11926)](https://github.com/microsoft/vcpkg/pull/11926) [graphicsmagick] fix Magick++.h header location. + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + +- bitsery `5.0.3` -> `5.1.0` + - [(#11912)](https://github.com/microsoft/vcpkg/pull/11912) [bitsery] Update to 5.1.0 version + +- skyr-url `1.10.0` -> `1.12.0` + - [(#11911)](https://github.com/microsoft/vcpkg/pull/11911) [skyr-url] Updated version number of skyr-url + - [(#12214)](https://github.com/microsoft/vcpkg/pull/12214) [skyr-url] Changed version number to 1.12.0 + +- vtk `9.0-2` -> `9.0.1` + - [(#9960)](https://github.com/microsoft/vcpkg/pull/9960) [CGNS/ParaView] Add new ports + - [(#12067)](https://github.com/microsoft/vcpkg/pull/12067) [vcpkg baseline] Fix baseline errors + - [(#11399)](https://github.com/microsoft/vcpkg/pull/11399) [vtk] Added opengl feature. + - [(#12149)](https://github.com/microsoft/vcpkg/pull/12149) [vtk] update to 9.0.1 + - [(#12472)](https://github.com/microsoft/vcpkg/pull/12472) [vtk|cuda] add nvcc to the path + - [(#12342)](https://github.com/microsoft/vcpkg/pull/12342) [qt5-base] Add zstd as a dependency + - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp) + +- so5extra `1.4.0` -> `1.4.1` + - [(#12052)](https://github.com/microsoft/vcpkg/pull/12052) [so5extra] update to v.1.4.1. + +- sobjectizer `5.7.0.1` -> `5.7.1` + - [(#12051)](https://github.com/microsoft/vcpkg/pull/12051) [SObjectizer] update to v.5.7.1. + +- field3d `1.7.2` -> `1.7.3` + - [(#11747)](https://github.com/microsoft/vcpkg/pull/11747) [hdf5] Update HDF5 to 1.12 + - [(#11130)](https://github.com/microsoft/vcpkg/pull/11130) [opencv4] update to v4.3 + - [(#12342)](https://github.com/microsoft/vcpkg/pull/12342) [qt5-base] Add zstd as a dependency + +- hdf5 `1.10.5-12` -> `1.12.0` + - [(#11747)](https://github.com/microsoft/vcpkg/pull/11747) [hdf5] Update HDF5 to 1.12 + +- freerdp `2.0.0-1` -> `2.1.1-1` + - [(#12050)](https://github.com/microsoft/vcpkg/pull/12050) [freerdp] Update to version 2.1.1 + - [(#12037)](https://github.com/microsoft/vcpkg/pull/12037) [freerdp] Fix x64-osx triplet + +- openal-soft `1.20.1-1` -> `1.20.1-2` + - [(#12047)](https://github.com/microsoft/vcpkg/pull/12047) [openal-soft] Fix build failure by updating the library + - [(#12318)](https://github.com/microsoft/vcpkg/pull/12318) [openal-soft] Revert #12047 + - [(#12103)](https://github.com/microsoft/vcpkg/pull/12103) Mingw port fixes + +- absent `0.3.0` -> `0.3.1` + - [(#12036)](https://github.com/microsoft/vcpkg/pull/12036) [absent] Bump version 0.3.1 + +- cjson `2019-11-30` -> `2019-11-30-1` + - [(#12026)](https://github.com/microsoft/vcpkg/pull/12026) [cjson] fix windows-static for don't export symbols + +- open62541 `1.0.1` -> `1.1` + - [(#12023)](https://github.com/microsoft/vcpkg/pull/12023) [open62541] update to v1.1, add encryption support + +- abseil `2020-03-03-6` -> `2020-03-03-7` + - [(#12022)](https://github.com/microsoft/vcpkg/pull/12022) [abseil] Fix usage issue + - [(#11757)](https://github.com/microsoft/vcpkg/pull/11757) [vcpkg manifest] Manifest Implementation + - [(#12471)](https://github.com/microsoft/vcpkg/pull/12471) [vcpkg format-manifest] Add convert-control flag + - [(#12781)](https://github.com/microsoft/vcpkg/pull/12781) [abseil] Fix CMake warning + +- nowide `10.0.1` -> `11.0.0` + - [(#12020)](https://github.com/microsoft/vcpkg/pull/12020) [nowide] Update to 11.0.0 + +- cpp-httplib `0.5.1` -> `0.7.0` + - [(#12010)](https://github.com/microsoft/vcpkg/pull/12010) [cpp-httplib] Update library to 0.7.0 + +- openmesh `8.0` -> `8.1` + - [(#12007)](https://github.com/microsoft/vcpkg/pull/12007) [openmesh] Fix install *.dll and add vcpkg-cmake-wrapper.cmake + - [(#11739)](https://github.com/microsoft/vcpkg/pull/11739) [openmesh] Upgrade to 8.1 + +- cpprestsdk `2.10.16-2` -> `2.10.16-3` + - [(#12006)](https://github.com/microsoft/vcpkg/pull/12006) [cpprestsdk] Fix usage issue when building static + +- activemq-cpp `3.9.5-2` -> `3.9.5-3` + - [(#12005)](https://github.com/microsoft/vcpkg/pull/12005) [activemq-cpp] Fix static build + +- date `2019-11-08` -> `3.0.0` + - [(#11968)](https://github.com/microsoft/vcpkg/pull/11968) [date] Update to 3.0.0 + - [(#12739)](https://github.com/microsoft/vcpkg/pull/12739) [date] Fix config.cmake and usage + +- libmicrohttpd `0.9.63-2` -> `0.9.63-3` + - [(#11983)](https://github.com/microsoft/vcpkg/pull/11983) [libmicrohttpd] Support build on UNIX and use msbuild on Windows + - [(#12455)](https://github.com/microsoft/vcpkg/pull/12455) [libmicrohttpd] Add `platform.h` to restricted header list. + +- llvm `10.0.0-3` -> `10.0.0-4` + - [(#11956)](https://github.com/microsoft/vcpkg/pull/11956) [llvm] fix issue #11916 + +- ffmpeg `4.2-10` -> `4.2-13` + - [(#11946)](https://github.com/microsoft/vcpkg/pull/11946) [ffmpeg] Add avisynthplus support + - [(#12080)](https://github.com/microsoft/vcpkg/pull/12080) Fix bootstrapping MSYS2 pacman (#11499) + - [(#12083)](https://github.com/microsoft/vcpkg/pull/12083) [ffmpeg] Allow gpl builds without avisynthplus + - [(#12063)](https://github.com/microsoft/vcpkg/pull/12063) [ffmpeg] Fix tools dependency dll file + - [(#11130)](https://github.com/microsoft/vcpkg/pull/11130) [opencv4] update to v4.3 + - [(#12157)](https://github.com/microsoft/vcpkg/pull/12157) [many ports] Remove _find_package guards that break *_FOUND + - [(#12635)](https://github.com/microsoft/vcpkg/pull/12635) [ffmpeg] fix FindFFMPEG.cmake to work properly even without avresample + - [(#12843)](https://github.com/microsoft/vcpkg/pull/12843) [ffmpeg] Some libraries in ffmpeg can be optional + - [(#11277)](https://github.com/microsoft/vcpkg/pull/11277) [ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. + - [(#13004)](https://github.com/microsoft/vcpkg/pull/13004) [ffmpeg] fix cmake module + +- imgui `1.76-1` -> `1.78` + - [(#11919)](https://github.com/microsoft/vcpkg/pull/11919) [imgui] Add Freetype feature + - [(#12155)](https://github.com/microsoft/vcpkg/pull/12155) [imgui] Update to 1.77 + - [(#12329)](https://github.com/microsoft/vcpkg/pull/12329) [imgui] Split bindings to multiple features + - [(#12210)](https://github.com/microsoft/vcpkg/pull/12210) [ogre] Update to version 1.12.7 and fix link error + - [(#12890)](https://github.com/microsoft/vcpkg/pull/12890) [imgui] Add messages for unsupported features + - [(#13064)](https://github.com/microsoft/vcpkg/pull/13064) [imgui] Update to 1.78 + - [(#12691)](https://github.com/microsoft/vcpkg/pull/12691) [libigl] fix imgui feature + +- x265 `3.2-3` -> `3.4` + - [(#11903)](https://github.com/microsoft/vcpkg/pull/11903) [x265] Delete the bin directory if the platform is Linux + - [(#11277)](https://github.com/microsoft/vcpkg/pull/11277) [ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. + - [(#13048)](https://github.com/microsoft/vcpkg/pull/13048) [x265] Update source and version + +- wtl `10.0-5` -> `10.0.10077` + - [(#11893)](https://github.com/microsoft/vcpkg/pull/11893) [wtl] Update to 10.0.10077 + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + - [(#12688)](https://github.com/microsoft/vcpkg/pull/12688) [wtl ] Upgrade wtl to 10.0.10077. + +- icu `67.1` -> `67.1-2` + - [(#11897)](https://github.com/microsoft/vcpkg/pull/11897) [icu] Add tools + - [(#12080)](https://github.com/microsoft/vcpkg/pull/12080) Fix bootstrapping MSYS2 pacman (#11499) + +- cairo `1.16.0-4` -> `1.16.0-6` + - [(#11829)](https://github.com/microsoft/vcpkg/pull/11829) [cairo] Fix error in static build + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + - [(#12405)](https://github.com/microsoft/vcpkg/pull/12405) [brotli] add pkgconfig / [freetype] depend on brotli + +- pango `1.40.11-6` -> `1.40.11-7` + - [(#11829)](https://github.com/microsoft/vcpkg/pull/11829) [cairo] Fix error in static build + - [(#12405)](https://github.com/microsoft/vcpkg/pull/12405) [brotli] add pkgconfig / [freetype] depend on brotli + +- grpc `1.28.1-1` -> `1.31.1` + - [(#11791)](https://github.com/microsoft/vcpkg/pull/11791) [grpc] Update to 1.29.1 + - [(#12611)](https://github.com/microsoft/vcpkg/pull/12611) [grpc] Fix generate plugin grpc_csharp_ext + - [(#12920)](https://github.com/microsoft/vcpkg/pull/12920) [grpc] grpc v1.30.2 + - [(#13084)](https://github.com/microsoft/vcpkg/pull/13084) [grpc][upb][re2] grpc v1.31.1 + +- offscale-libetcd-cpp `2019-07-10` -> `2019-07-10-1` + - [(#11791)](https://github.com/microsoft/vcpkg/pull/11791) [grpc] Update to 1.29.1 + +- stlab `1.5.2` -> `1.5.2-1` + - [(#11787)](https://github.com/microsoft/vcpkg/pull/11787) [stlab] Fix cmake config file + +- ffnvcodec `9.1.23.1` -> `9.1.23.1-1` + - [(#12080)](https://github.com/microsoft/vcpkg/pull/12080) Fix bootstrapping MSYS2 pacman (#11499) + - [(#11277)](https://github.com/microsoft/vcpkg/pull/11277) [ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. + +- libpq `12.2-2` -> `12.2-3` + - [(#12080)](https://github.com/microsoft/vcpkg/pull/12080) Fix bootstrapping MSYS2 pacman (#11499) + - [(#11757)](https://github.com/microsoft/vcpkg/pull/11757) [vcpkg manifest] Manifest Implementation + - [(#12196)](https://github.com/microsoft/vcpkg/pull/12196) [cmocka libarchive libiconv libpq libxml2 plibsys] fix drive-by error in vcpkg-cmake-wrappers + - [(#12415)](https://github.com/microsoft/vcpkg/pull/12415) [libpq] Remove broken features + - [(#12674)](https://github.com/microsoft/vcpkg/pull/12674) [libpq] only require bison and flex on Windows + +- tensorflow-cc `1.14-2` -> `1.14-3` + - [(#12080)](https://github.com/microsoft/vcpkg/pull/12080) Fix bootstrapping MSYS2 pacman (#11499) + - [(#12546)](https://github.com/microsoft/vcpkg/pull/12546) [tensorflow-cc] fix build issues on Windows + +- ignition-modularscripts `2020-05-09` -> `2020-05-16` + - [(#11275)](https://github.com/microsoft/vcpkg/pull/11275) [ignition-plugin1] Add new port 🤖 + - [(#11550)](https://github.com/microsoft/vcpkg/pull/11550) [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries + +- apr `1.7.0` -> `1.7.0-1` + - [(#12067)](https://github.com/microsoft/vcpkg/pull/12067) [vcpkg baseline] Fix baseline errors + - [(#11550)](https://github.com/microsoft/vcpkg/pull/11550) [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries + +- argtable2 `2.13-4` -> `2.13-7` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + +- cunit `2.1.3-3` -> `2.1.3-6` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + +- epsilon `0.9.2-1` -> `0.9.2-4` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + +- freeglut `3.2.1-1` -> `3.2.1-4` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + +- freeimage `3.18.0-9` -> `3.18.0-12` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + - [(#11130)](https://github.com/microsoft/vcpkg/pull/11130) [opencv4] update to v4.3 + +- giflib `5.1.4-3` -> `5.1.4-6` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + +- gsoap `2.8.102` -> `2.8.105` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + - [(#12784)](https://github.com/microsoft/vcpkg/pull/12784) [gSoap] Update to 2.8.105 and add a required shared directory + +- healpix `1.12.10-1` -> `1.12.10-5` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + - [(#11836)](https://github.com/microsoft/vcpkg/pull/11836) [vcpkg/scripts/make] trying to iron out some issues + +- irrlicht `1.8.4-5` -> `1.8.4-8` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + - [(#13137)](https://github.com/microsoft/vcpkg/pull/13137) [irrlicht] Patch moved sysctl.h header file + +- itpp `4.3.1-2` -> `4.3.1-5` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + +- libaiff `5.0-3` -> `5.0-6` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + +- libdisasm `0.23-3` -> `0.23-7` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + +- libmad `0.15.1-5` -> `0.15.1-8` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + +- libmikmod `3.3.11.1-5` -> `3.3.11.1-8` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + +- libsquish `1.15-3` -> `1.15-7` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + +- libssh `0.9.3-1` -> `0.9.3-2` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + +- libusb-win32 `1.2.6.0-3` -> `1.2.6.0-6` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + +- libuuid `1.0.3-4` -> `1.0.3-7` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + +- libxmp-lite `4.4.1-3` -> `4.4.1-6` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + +- mathgl `2.4.3-3` -> `2.4.3-6` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + +- mp3lame `3.100` -> `3.100-3` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + +- mpg123 `1.25.8-10` -> `1.25.8-12` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12287)](https://github.com/microsoft/vcpkg/pull/12287) [mpg123] Update portfile.cmake to accomodate OpenSUSE 15.x /lib /lib64 + - [(#11535)](https://github.com/microsoft/vcpkg/pull/11535) [mpg123] Allow cross-compiling, fix previous builds tainting rebuilds + +- pcre `8.44-1` -> `8.44-4` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + - [(#12252)](https://github.com/microsoft/vcpkg/pull/12252) [pcre] Use vcpkg_from_sourceforge as a fallback + - [(#11550)](https://github.com/microsoft/vcpkg/pull/11550) [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries + - [(#12629)](https://github.com/microsoft/vcpkg/pull/12629) [pcre] Fix installation when only building release + +- pcre2 `10.30-7` -> `10.35` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12233)](https://github.com/microsoft/vcpkg/pull/12233) [pcre2] Restore the https://ftp.pcre.org/ mirror in addition to the SourceForge mirrors. + - [(#11754)](https://github.com/microsoft/vcpkg/pull/11754) [pcre2] Update to 10.35 + - [(#12347)](https://github.com/microsoft/vcpkg/pull/12347) [pcre2] Fix -mshstk needed with -fcf-protection + +- plplot `5.13.0-5` -> `5.13.0-8` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + +- podofo `0.9.6-8` -> `0.9.6-9` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + - [(#12405)](https://github.com/microsoft/vcpkg/pull/12405) [brotli] add pkgconfig / [freetype] depend on brotli + +- portmidi `0.217.1-1` -> `0.234` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + - [(#12046)](https://github.com/microsoft/vcpkg/pull/12046) [portmidi] Updated portmidi package to use alternative code source + +- pthreads `3.0.0-5` -> `3.0.0-6` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + +- qt5-base `5.12.8-4` -> `5.15.0` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12153)](https://github.com/microsoft/vcpkg/pull/12153) [qt5-base] fix static init fiasco and fix debug dll's not being copied + - [(#11757)](https://github.com/microsoft/vcpkg/pull/11757) [vcpkg manifest] Manifest Implementation + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + - [(#12529)](https://github.com/microsoft/vcpkg/pull/12529) [qt5 components] Disable parallel build + - [(#12342)](https://github.com/microsoft/vcpkg/pull/12342) [qt5-base] Add zstd as a dependency + - [(#12752)](https://github.com/microsoft/vcpkg/pull/12752) [vcpkg_build_qmake] Disable multi-threaded build when file fails to open + - [(#12405)](https://github.com/microsoft/vcpkg/pull/12405) [brotli] add pkgconfig / [freetype] depend on brotli + +- qwt `6.1.3-11` -> `6.1.4` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + - [(#12529)](https://github.com/microsoft/vcpkg/pull/12529) [qt5 components] Disable parallel build + +- rapidxml `1.13-1` -> `1.13-4` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + +- sigslot `1.0.0` -> `1.0.0-3` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + +- soxr `0.1.3.` -> `0.1.3-2` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + +- tclap `1.2.2-2` -> `1.2.2-3` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + +- tinyfiledialogs `3.4.3-2` -> `3.6.3` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12137)](https://github.com/microsoft/vcpkg/pull/12137) [tinyfiledialogs] Update version and download path to v3.6.3 + +- tinyxml `2.6.2-4` -> `2.6.2-7` + - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + +- openssl-unix `1.1.1d-4` -> `1.1.1g` + - [(#11882)](https://github.com/microsoft/vcpkg/pull/11882) [openssl] Update openssl 1.1.1g - continued from PR #11003 + - [(#12544)](https://github.com/microsoft/vcpkg/pull/12544) [openssl-unix] Add mingw with dynamic libs support - take 2 + - [(#12867)](https://github.com/microsoft/vcpkg/pull/12867) [openssl] Interrupt the build process when files conflict + - [(#12986)](https://github.com/microsoft/vcpkg/pull/12986) [openssl-unix] Fix #12919 + - [(#12527)](https://github.com/microsoft/vcpkg/pull/12527) [openssl-unix] use xcrun for iOS triplet build + +- openssl-uwp `1.1.1d-1` -> `1.1.1g` + - [(#11882)](https://github.com/microsoft/vcpkg/pull/11882) [openssl] Update openssl 1.1.1g - continued from PR #11003 + - [(#12867)](https://github.com/microsoft/vcpkg/pull/12867) [openssl] Interrupt the build process when files conflict + +- openssl-windows `1.1.1d-2` -> `1.1.1g` + - [(#11882)](https://github.com/microsoft/vcpkg/pull/11882) [openssl] Update openssl 1.1.1g - continued from PR #11003 + - [(#12056)](https://github.com/microsoft/vcpkg/pull/12056) [openssl-windows] Added feature option to build openssl with no-pinshared flag + - [(#12867)](https://github.com/microsoft/vcpkg/pull/12867) [openssl] Interrupt the build process when files conflict + +- openssl `1.1.1d` -> `1.1.1g` + - [(#11882)](https://github.com/microsoft/vcpkg/pull/11882) [openssl] Update openssl 1.1.1g - continued from PR #11003 + - [(#12867)](https://github.com/microsoft/vcpkg/pull/12867) [openssl] Interrupt the build process when files conflict + +- cmocka `1.1.5-1` -> `1.1.5` + - [(#11757)](https://github.com/microsoft/vcpkg/pull/11757) [vcpkg manifest] Manifest Implementation + - [(#12196)](https://github.com/microsoft/vcpkg/pull/12196) [cmocka libarchive libiconv libpq libxml2 plibsys] fix drive-by error in vcpkg-cmake-wrappers + - [(#12828)](https://github.com/microsoft/vcpkg/pull/12828) [cmocka] Update to 2020-08-01 + +- libarchive `3.4.1-3` -> `3.4.1` + - [(#11757)](https://github.com/microsoft/vcpkg/pull/11757) [vcpkg manifest] Manifest Implementation + - [(#12196)](https://github.com/microsoft/vcpkg/pull/12196) [cmocka libarchive libiconv libpq libxml2 plibsys] fix drive-by error in vcpkg-cmake-wrappers + +- libiconv `1.16-3` -> `1.16` + - [(#11757)](https://github.com/microsoft/vcpkg/pull/11757) [vcpkg manifest] Manifest Implementation + - [(#12196)](https://github.com/microsoft/vcpkg/pull/12196) [cmocka libarchive libiconv libpq libxml2 plibsys] fix drive-by error in vcpkg-cmake-wrappers + +- libxml2 `2.9.9-6` -> `2.9.9` + - [(#11757)](https://github.com/microsoft/vcpkg/pull/11757) [vcpkg manifest] Manifest Implementation + - [(#12196)](https://github.com/microsoft/vcpkg/pull/12196) [cmocka libarchive libiconv libpq libxml2 plibsys] fix drive-by error in vcpkg-cmake-wrappers + +- suitesparse `5.4.0-5` -> `5.4.0-6` + - [(#11945)](https://github.com/microsoft/vcpkg/pull/11945) [suitesparse] Fixing `SuiteSparse_INCLUDE_DIRS` is not usable from the port. + - [(#12464)](https://github.com/microsoft/vcpkg/pull/12464) [lapack] add metaport lapack to switch lapack impl with an overlay + +- boost-locale `1.73.0` -> `1.73.0-1` + - [(#10943)](https://github.com/microsoft/vcpkg/pull/10943) [boost-locale] Fix boost-locale failing to build with ICU + - [(#12762)](https://github.com/microsoft/vcpkg/pull/12762) [boost] Add Supports fields and more accurately handle arm64-windows/x64-uwp + +- monkeys-audio `5.38` -> `5.48` + - [(#12158)](https://github.com/microsoft/vcpkg/pull/12158) [monkeys-audio] Update to 5.46 + - [(#12690)](https://github.com/microsoft/vcpkg/pull/12690) [monkeys-audio] Update to 5.48 + +- google-cloud-cpp `1.14.0` -> `1.16.0` + - [(#12195)](https://github.com/microsoft/vcpkg/pull/12195) [google-cloud-cpp] Update to v1.15.0 + - [(#12747)](https://github.com/microsoft/vcpkg/pull/12747) [google-cloud-cpp] Update to v1.16.0 + +- infoware `0.5.3` -> `0.5.5` + - [(#12167)](https://github.com/microsoft/vcpkg/pull/12167) [infoware] Bump version to 0.5.4 + - [(#13010)](https://github.com/microsoft/vcpkg/pull/13010) [infoware] Bump version to 0.5.5 + +- sqlite3 `3.32.1` -> `3.32.3` + - [(#12185)](https://github.com/microsoft/vcpkg/pull/12185) update to sqlite3 3.32.3 + - [(#12516)](https://github.com/microsoft/vcpkg/pull/12516) [sqlite3] Namespaced targets with unofficial:: + - [(#11532)](https://github.com/microsoft/vcpkg/pull/11532) [sqlite3] Sqlite3 geopoly and json1 features + +- plibsys `0.0.4-3` -> `0.0.4` + - [(#12196)](https://github.com/microsoft/vcpkg/pull/12196) [cmocka libarchive libiconv libpq libxml2 plibsys] fix drive-by error in vcpkg-cmake-wrappers + +- span-lite `0.5.0` -> `0.7.0` + - [(#12206)](https://github.com/microsoft/vcpkg/pull/12206) [span-lite] Update to 0.7.0 + +- safeint `3.23` -> `3.24` + - [(#12217)](https://github.com/microsoft/vcpkg/pull/12217) [safeint] Update to 3.24 + +- xerces-c `3.2.3` -> `3.2.3-1` + - [(#12205)](https://github.com/microsoft/vcpkg/pull/12205) [xerces-c] rename feature from xmlch_wchar to xmlch-wchar + +- libnice `0.1.15-3` -> `0.1.15-4` + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + +- opencc `2020-04-26-4` -> `2020-04-26-6` + - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) + - [(#12246)](https://github.com/microsoft/vcpkg/pull/12246) [opencc] Fix regression on pipeline + +- exiv2 `0.27.2-1` -> `0.27.3` + - [(#12278)](https://github.com/microsoft/vcpkg/pull/12278) [Exiv2] update to 0.27.3 + - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp) + +- nanodbc `2.12.4-8` -> `2.12.4` + - [(#12274)](https://github.com/microsoft/vcpkg/pull/12274) [nanodbc] Set unixodbc as a dependency under non-Windows + +- doctest `2.3.7` -> `2.4.0` + - [(#12239)](https://github.com/microsoft/vcpkg/pull/12239) [doctest] update to 2.4.0 + +- opengl `0.0-6` -> `0.0-7` + - [(#12232)](https://github.com/microsoft/vcpkg/pull/12232) [opengl wincrypt winsock2] Use $ENV{WindowsSdkDir} instead of hard coding Windows SDK paths. + +- wincrypt `0.0-1` -> `0.0-2` + - [(#12232)](https://github.com/microsoft/vcpkg/pull/12232) [opengl wincrypt winsock2] Use $ENV{WindowsSdkDir} instead of hard coding Windows SDK paths. + +- winsock2 `0.0-1` -> `0.0-2` + - [(#12232)](https://github.com/microsoft/vcpkg/pull/12232) [opengl wincrypt winsock2] Use $ENV{WindowsSdkDir} instead of hard coding Windows SDK paths. + +- openvr `1.10.30` -> `1.12.5` + - [(#12219)](https://github.com/microsoft/vcpkg/pull/12219) [openvr] Update to 1.12.5 + +- utf8h `841cb2deb8eb806e73fff0e1f43a11fca4f5da45` -> `2020-06-14` + - [(#12218)](https://github.com/microsoft/vcpkg/pull/12218) [utf8h] Update to latest version + +- libyuv `fec9121-1` -> `fec9121-2` + - [(#12213)](https://github.com/microsoft/vcpkg/pull/12213) [libyuv] Find dependency port libjpeg-turbo + - [(#12338)](https://github.com/microsoft/vcpkg/pull/12338) [libyuv] Fix static build issue + +- polyhook2 `2020-06-02` -> `2020-08-04` + - [(#12189)](https://github.com/microsoft/vcpkg/pull/12189) [polyhook2] Update to latest + - [(#12524)](https://github.com/microsoft/vcpkg/pull/12524) [asmjit] Update to the latest commit + +- ace `6.5.9-5` -> `6.5.11` + - [(#12183)](https://github.com/microsoft/vcpkg/pull/12183) [ace] 6.5.10 + - [(#12954)](https://github.com/microsoft/vcpkg/pull/12954) [ace] Update to 6.5.11 + +- curl `7.68.0-3` -> `7.71.1` + - [(#12141)](https://github.com/microsoft/vcpkg/pull/12141) [curl] Update to 7.71.0 + - [(#12758)](https://github.com/microsoft/vcpkg/pull/12758) [curl] Fix tools + - [(#12800)](https://github.com/microsoft/vcpkg/pull/12800) [curl] Fix static build + +- robin-hood-hashing `3.4.0` -> `3.8.0` + - [(#12147)](https://github.com/microsoft/vcpkg/pull/12147) [robin-hood-hashing] Update to 3.7.0 + - [(#12480)](https://github.com/microsoft/vcpkg/pull/12480) [robin-hood-hashing] Update to latest version + +- libexif `0.6.21-2` -> `0.6.22` + - [(#12161)](https://github.com/microsoft/vcpkg/pull/12161) [libexif] Update to 0.6.22 + +- cli `1.1.1` -> `1.2.0` + - [(#12139)](https://github.com/microsoft/vcpkg/pull/12139) [cli] update the version to 1.2.0 + +- libffi `3.3-2` -> `3.3-3` + - [(#12126)](https://github.com/microsoft/vcpkg/pull/12126) [libffi] Add pkgconfig file + - [(#12498)](https://github.com/microsoft/vcpkg/pull/12498) [libffi] fix crash in debug + +- angle `2020-05-15` -> `2020-05-15-1` + - [(#12111)](https://github.com/microsoft/vcpkg/pull/12111) [angle] Add egl renderer to list of files compiled for linux + +- caf `0.17.2` -> `0.17.3` + - [(#12068)](https://github.com/microsoft/vcpkg/pull/12068) [caf] Update to 0.17.3 + +- aws-sdk-cpp `1.7.333` -> `1.8.4` + - [(#12316)](https://github.com/microsoft/vcpkg/pull/12316) aws-sdk-cpp version update + +- libcopp `1.2.1` -> `1.3.1` + - [(#12264)](https://github.com/microsoft/vcpkg/pull/12264) [libcoppp] Update version to 1.3.0 + +- openimageio `2.1.9.0` -> `2.1.16.0-1` + - [(#11767)](https://github.com/microsoft/vcpkg/pull/11767) [openimageio] Update to version 2.1.16.0 + - [(#12157)](https://github.com/microsoft/vcpkg/pull/12157) [many ports] Remove _find_package guards that break *_FOUND + - [(#12592)](https://github.com/microsoft/vcpkg/pull/12592) [openimageio] Fix installed cmake file path + - [(#12856)](https://github.com/microsoft/vcpkg/pull/12856) [vcpkg baseline] Fix openimageio and pangolin build failures on Linux + +- evpp `0.7.0-2` -> `0.7.0-3` + - [(#11967)](https://github.com/microsoft/vcpkg/pull/11967) [evpp] Fix build error on OSX + - [(#12277)](https://github.com/microsoft/vcpkg/pull/12277) [libevent] update to 2.1.12 + +- protobuf `3.12.0-2` -> `3.13.0` + - [(#11851)](https://github.com/microsoft/vcpkg/pull/11851) [protobuf] Update to 3.12.3 + - [(#11550)](https://github.com/microsoft/vcpkg/pull/11550) [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries + - [(#12103)](https://github.com/microsoft/vcpkg/pull/12103) Mingw port fixes + - [(#12776)](https://github.com/microsoft/vcpkg/pull/12776) [vcpkg_copy_tool_dependencies] Use vcpkg internal powershell + - [(#12918)](https://github.com/microsoft/vcpkg/pull/12918) [protobuf] protobuf v3.13.0 + +- fontconfig `2.12.4-10` -> `2.12.4` + - [(#12322)](https://github.com/microsoft/vcpkg/pull/12322) [fontconfig] Fix fonts.conf install path + - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp) + +- faad2 `2.9.1-1` -> `2.9.1` + - [(#12306)](https://github.com/microsoft/vcpkg/pull/12306) [Many ports] Fix invalid character in feature name + +- freetype `2.10.1-6` -> `2.10.2` + - [(#11846)](https://github.com/microsoft/vcpkg/pull/11846) [freetype] Update to 2.10.2 + - [(#12405)](https://github.com/microsoft/vcpkg/pull/12405) [brotli] add pkgconfig / [freetype] depend on brotli + - [(#12886)](https://github.com/microsoft/vcpkg/pull/12886) [many ports] Fix various problems with mingw + +- cgal `5.0.2-1` -> `5.0.3` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + - [(#12711)](https://github.com/microsoft/vcpkg/pull/12711) [cgal] Update cgal to 5.0.3 + +- cutelyst2 `2.9.0` -> `2.9.0-1` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- kd-soap `1.8.0-1` -> `1.8.0-2` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- kf5archive `5.64.0` -> `5.64.0-1` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + - [(#11861)](https://github.com/microsoft/vcpkg/pull/11861) Adding libraries needed to build Krita + +- kf5holidays `5.64.0` -> `5.64.0-1` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- kf5plotting `5.64.0` -> `5.64.0-1` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- kf5syntaxhighlighting `5.64.0` -> `5.64.0-1` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- libqglviewer `2.7.2-2` -> `2.7.2-3` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- opencv2 `2.4.13.7-1` -> `2.4.13.7-2` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + - [(#11130)](https://github.com/microsoft/vcpkg/pull/11130) [opencv4] update to v4.3 + +- opencv3 `3.4.7-3` -> `3.4.7-4` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + - [(#11130)](https://github.com/microsoft/vcpkg/pull/11130) [opencv4] update to v4.3 + +- opencv4 `4.1.1-6` -> `4.3.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + - [(#11130)](https://github.com/microsoft/vcpkg/pull/11130) [opencv4] update to v4.3 + +- osg-qt `Qt4-1` -> `Qt4-2` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qca `2.2.1` -> `2.2.1-1` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qcustomplot `2.0.1-3` -> `2.0.1-4` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qscintilla `2.11.4-1` -> `2.11.4-2` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt-advanced-docking-system `3.2.5-1` -> `3.2.5-2` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-3d `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-activeqt `5.12.8-1` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-androidextras `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-canvas3d `5.12.8` -> `0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-charts `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-connectivity `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + - [(#12529)](https://github.com/microsoft/vcpkg/pull/12529) [qt5 components] Disable parallel build + +- qt5-datavis3d `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-declarative `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-doc `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-gamepad `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-graphicaleffects `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-imageformats `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + - [(#12529)](https://github.com/microsoft/vcpkg/pull/12529) [qt5 components] Disable parallel build + +- qt5-location `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + - [(#12529)](https://github.com/microsoft/vcpkg/pull/12529) [qt5 components] Disable parallel build + +- qt5-macextras `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-mqtt `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-multimedia `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-networkauth `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-purchasing `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-quickcontrols `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-quickcontrols2 `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-remoteobjects `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-script `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-scxml `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-sensors `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-serialbus `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-serialport `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-speech `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-svg `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-tools `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-translations `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-virtualkeyboard `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-wayland `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-webchannel `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-webengine `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + - [(#12494)](https://github.com/microsoft/vcpkg/pull/12494) [qt-webengine] Fix building with vs2017 + +- qt5-webglplugin `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-websockets `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-webview `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-winextras `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-x11extras `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5-xmlpatterns `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- qt5 `5.12.8` -> `5.15.0` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + - [(#12471)](https://github.com/microsoft/vcpkg/pull/12471) [vcpkg format-manifest] Add convert-control flag + - [(#12864)](https://github.com/microsoft/vcpkg/pull/12864) [vcpkg_execute_build_process] Re-fix qt5 components build + +- qtkeychain `v0.9.1` -> `v0.9.1-1` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- soqt `1.6.0` -> `1.6.0-1` + - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. + +- range-v3 `0.10.0-20200425` -> `0.10.0-20200708` + - [(#12346)](https://github.com/microsoft/vcpkg/pull/12346) [range-v3] updates range-v3 + +- azure-storage-cpp `7.4.0` -> `7.5.0` + - [(#12333)](https://github.com/microsoft/vcpkg/pull/12333) [azure-storage-cpp] Upgrade to 7.5.0 + +- directxmesh `jun2020` -> `jul2020` + - [(#12332)](https://github.com/microsoft/vcpkg/pull/12332) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version + - [(#13060)](https://github.com/microsoft/vcpkg/pull/13060) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version + +- directxtk `jun2020` -> `jul2020` + - [(#12332)](https://github.com/microsoft/vcpkg/pull/12332) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version + - [(#13060)](https://github.com/microsoft/vcpkg/pull/13060) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version + +- cuda `10.1-1` -> `10.1` + - [(#12244)](https://github.com/microsoft/vcpkg/pull/12244) [cuda] correct env variables for newer cuda versions + +- pybind11 `2.4.3` -> `2.5.0` + - [(#12394)](https://github.com/microsoft/vcpkg/pull/12394) [pybind11] Update to v2.5.0 + +- corrade `2019.10-1` -> `2020.06` + - [(#12211)](https://github.com/microsoft/vcpkg/pull/12211) [corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06 + +- magnum-extras `2019.10` -> `2020.06` + - [(#12211)](https://github.com/microsoft/vcpkg/pull/12211) [corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06 + +- magnum-integration `2019.10` -> `2020.06` + - [(#12211)](https://github.com/microsoft/vcpkg/pull/12211) [corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06 + +- magnum-plugins `2019.10-2` -> `2020.06` + - [(#12211)](https://github.com/microsoft/vcpkg/pull/12211) [corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06 + - [(#12458)](https://github.com/microsoft/vcpkg/pull/12458) [magnum-plugins] Fix file conflict with stb + +- magnum `2019.10-2` -> `2020.06` + - [(#12211)](https://github.com/microsoft/vcpkg/pull/12211) [corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06 + +- zstd `1.4.4-1` -> `1.4.4` + - [(#12407)](https://github.com/microsoft/vcpkg/pull/12407) [zstd] fix pkg-config files + +- string-theory `3.2` -> `3.3` + - [(#12440)](https://github.com/microsoft/vcpkg/pull/12440) [string-theory] Update to 3.3 + +- nrf-ble-driver `4.1.1-2` -> `4.1.2` + - [(#12436)](https://github.com/microsoft/vcpkg/pull/12436) [nrf-ble-driver] Update to v4.1.2 + +- folly `2019.10.21.00-2` -> `2019.10.21.00` + - [(#12419)](https://github.com/microsoft/vcpkg/pull/12419) [folly] Fix build error C3861 + +- boost-modular-build-helper `1.73.0-1` -> `1.73.0` + - [(#12417)](https://github.com/microsoft/vcpkg/pull/12417) [boost-modular-build-helper] Remove has_icu.lib + - [(#12535)](https://github.com/microsoft/vcpkg/pull/12535) [boost] s390x support + - [(#12634)](https://github.com/microsoft/vcpkg/pull/12634) [vcpkg] Improving android support + - [(#9224)](https://github.com/microsoft/vcpkg/pull/9224) [boost-modular-build-helper] Fix issue that link incorrect dependent libraries + - [(#12851)](https://github.com/microsoft/vcpkg/pull/12851) [boost-uninstall] Add port to easily uninstall all boost components + +- liblzma `5.2.4-5` -> `5.2.5` + - [(#12401)](https://github.com/microsoft/vcpkg/pull/12401) [liblzma, libvpx] Add mingw support + - [(#7226)](https://github.com/microsoft/vcpkg/pull/7226) [liblzma] Patch headers to fix https://github.com/OpenTTD/OpenTTD/pull/7614 + +- pugixml `1.10-1` -> `1.10` + - [(#12441)](https://github.com/microsoft/vcpkg/pull/12441) [pugixml] Fix pkgconfig file + +- hiredis `2019-11-2-1` -> `2019-11-2` + - [(#12354)](https://github.com/microsoft/vcpkg/pull/12354) [hiredis] Fix feature ssl build error on windows + +- eigen3 `3.3.7-5` -> `3.3.7` + - [(#12279)](https://github.com/microsoft/vcpkg/pull/12279) [eigen3] Fix eigen3 and cuda compatibility issue + +- zlib `1.2.11-6` -> `1.2.11` + - [(#12133)](https://github.com/microsoft/vcpkg/pull/12133) [zlib] Add pkgconfig file + - [(#12753)](https://github.com/microsoft/vcpkg/pull/12753) [zlib, libpng] Fix pkg-config for mingw + - [(#11277)](https://github.com/microsoft/vcpkg/pull/11277) [ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. + +- libmupdf `1.16.1-1` -> `1.17.0` + - [(#12483)](https://github.com/microsoft/vcpkg/pull/12483) [libmupdf] Update libmupdf to 1.17.0 + +- bzip2 `1.0.6-5` -> `1.0.6-6` + - [(#11550)](https://github.com/microsoft/vcpkg/pull/11550) [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries + - [(#12880)](https://github.com/microsoft/vcpkg/pull/12880) [bzip2] fixes for building release-only + +- gmp `6.2.0-1` -> `6.2.0-2` + - [(#11550)](https://github.com/microsoft/vcpkg/pull/11550) [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries + - [(#12664)](https://github.com/microsoft/vcpkg/pull/12664) [mpir, gmp] Add message to handle the conflicts between these two ports + +- libpng `1.6.37-9` -> `1.6.37-10` + - [(#11550)](https://github.com/microsoft/vcpkg/pull/11550) [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries + - [(#12753)](https://github.com/microsoft/vcpkg/pull/12753) [zlib, libpng] Fix pkg-config for mingw + +- nettle `3.5.1-1` -> `3.5.1-2` + - [(#11550)](https://github.com/microsoft/vcpkg/pull/11550) [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries + +- ompl `1.4.2-4` -> `1.5.0` + - [(#11550)](https://github.com/microsoft/vcpkg/pull/11550) [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries + - [(#12529)](https://github.com/microsoft/vcpkg/pull/12529) [qt5 components] Disable parallel build + - [(#11737)](https://github.com/microsoft/vcpkg/pull/11737) [ompl]: upgrade to 1.5.0 + +- sdl1 `1.2.15-11` -> `1.2.15` + - [(#11550)](https://github.com/microsoft/vcpkg/pull/11550) [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries + +- alembic `1.7.12-1` -> `1.7.13` + - [(#11130)](https://github.com/microsoft/vcpkg/pull/11130) [opencv4] update to v4.3 + - [(#12735)](https://github.com/microsoft/vcpkg/pull/12735) [alembic] Update to 1.7.13 + +- opencv `4.1.1-1` -> `4.3.0` + - [(#11130)](https://github.com/microsoft/vcpkg/pull/11130) [opencv4] update to v4.3 + +- openexr `2.3.0-5` -> `2.5.0` + - [(#11130)](https://github.com/microsoft/vcpkg/pull/11130) [opencv4] update to v4.3 + - [(#12157)](https://github.com/microsoft/vcpkg/pull/12157) [many ports] Remove _find_package guards that break *_FOUND + +- libftdi1 `1.4` -> `1.4-1` + - [(#9561)](https://github.com/microsoft/vcpkg/pull/9561) [libusb] Fix issue to support linux + +- libusb `1.0.23` -> `1.0.23-1` + - [(#9561)](https://github.com/microsoft/vcpkg/pull/9561) [libusb] Fix issue to support linux + - [(#12656)](https://github.com/microsoft/vcpkg/pull/12656) [libusb] build fails on windows due to symlink in extracted archive + - [(#13057)](https://github.com/microsoft/vcpkg/pull/13057) [libusb] Add vcpkg-cmake-wrapper + +- treehopper `1.11.3-3` -> `1.11.3-4` + - [(#9561)](https://github.com/microsoft/vcpkg/pull/9561) [libusb] Fix issue to support linux + +- outcome `2.1` -> `2.1.3` + - [(#12078)](https://github.com/microsoft/vcpkg/pull/12078) [outcome] Update library and fix portfile + +- librdkafka `1.2.0-2` -> `1.5.0` + - [(#12095)](https://github.com/microsoft/vcpkg/pull/12095) [librdkafka] Upgrade to 1.4.4 + - [(#12731)](https://github.com/microsoft/vcpkg/pull/12731) [librdkafka] Update to 1.5.0 + +- glew `2.1.0-7` -> `2.1.0-8` + - [(#12103)](https://github.com/microsoft/vcpkg/pull/12103) Mingw port fixes + +- mozjpeg `2020-06-02` -> `2020-06-02-1` + - [(#12118)](https://github.com/microsoft/vcpkg/pull/12118) [mozjpeg] fix build + +- fltk `1.3.5-2` -> `1.3.5` + - [(#12273)](https://github.com/microsoft/vcpkg/pull/12273) [fltk] Force static library due to global variables. Fix CMake Targets. + +- nana `1.7.2-3` -> `1.7.2` + - [(#12543)](https://github.com/microsoft/vcpkg/pull/12543) [nana] Fix the version and language standard + +- winpcap `4.1.3-3` -> `4.1.3` + - [(#12542)](https://github.com/microsoft/vcpkg/pull/12542) [winpcap] Remove the keyword 'inline' macro + +- boost-build `1.73.0-1` -> `1.73.0` + - [(#12535)](https://github.com/microsoft/vcpkg/pull/12535) [boost] s390x support + - [(#12851)](https://github.com/microsoft/vcpkg/pull/12851) [boost-uninstall] Add port to easily uninstall all boost components + +- restinio `0.6.8` -> `0.6.9` + - [(#12087)](https://github.com/microsoft/vcpkg/pull/12087) [RESTinio] Update to v.0.6.8.1 + - [(#12889)](https://github.com/microsoft/vcpkg/pull/12889) [restinio] update to 0.6.9 + - [(#13018)](https://github.com/microsoft/vcpkg/pull/13018) [restinio] update to v.0.6.10 + +- fizz `2020.02.03.00` -> `2020.02.03.00` + - [(#12277)](https://github.com/microsoft/vcpkg/pull/12277) [libevent] update to 2.1.12 + +- libevent `2.1.11-5` -> `2.1.12` + - [(#12277)](https://github.com/microsoft/vcpkg/pull/12277) [libevent] update to 2.1.12 + +- libflac `1.3.3-1` -> `1.3.3` + - [(#12374)](https://github.com/microsoft/vcpkg/pull/12374) [sdl2-mixer] Fix FLAC symbol export when static linking, add nativemidi default feature + - [(#12761)](https://github.com/microsoft/vcpkg/pull/12761) [flac] Disable stack smash protection and FORTIFY_SOURCE for mingw + +- libsndfile `1.0.29-9` -> `1.0.29` + - [(#12374)](https://github.com/microsoft/vcpkg/pull/12374) [sdl2-mixer] Fix FLAC symbol export when static linking, add nativemidi default feature + - [(#12921)](https://github.com/microsoft/vcpkg/pull/12921) [libsndfile] Update to 1.0.29 + +- sdl2-mixer `2.0.4-9` -> `2.0.4` + - [(#12374)](https://github.com/microsoft/vcpkg/pull/12374) [sdl2-mixer] Fix FLAC symbol export when static linking, add nativemidi default feature + +- physx `4.1.1-3` -> `4.1.1` + - [(#12413)](https://github.com/microsoft/vcpkg/pull/12413) [physx] Add patch for NVIDIAGameWorks/PhysX#322. + - [(#12710)](https://github.com/microsoft/vcpkg/pull/12710) [physx] Add support for checked and profile builds. + +- wxwidgets `3.1.3-1` -> `3.1.4` + - [(#12485)](https://github.com/microsoft/vcpkg/pull/12485) [wxwidgets] Adding wxWidgets resource compiler (wxrc) to /tools/wxwidgets directory + - [(#12733)](https://github.com/microsoft/vcpkg/pull/12733) [wxwidgets] Update to 3.1.4 + - [(#12885)](https://github.com/microsoft/vcpkg/pull/12885) [wxwidgets] copy pdbs + - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp) + +- osgearth `2.10.2-1` -> `3.0` + - [(#12531)](https://github.com/microsoft/vcpkg/pull/12531) [osgearth] update to 3.0 + +- netcdf-c `4.7.3-1` -> `4.7.3` + - [(#12342)](https://github.com/microsoft/vcpkg/pull/12342) [qt5-base] Add zstd as a dependency + - [(#12755)](https://github.com/microsoft/vcpkg/pull/12755) [netcdf-c] also depend on embree on osx + - [(#12434)](https://github.com/microsoft/vcpkg/pull/12434) [netcdf-c] Fix dependency libmath + +- arrow `0.17.1` -> `1.0.0` + - [(#12537)](https://github.com/microsoft/vcpkg/pull/12537) [Arrow] Update to 1.0.0 + +- libigl `2.1.0-2` -> `2.2.0` + - [(#10252)](https://github.com/microsoft/vcpkg/pull/10252) [libigl] Fix configure error and dependencies + - [(#12691)](https://github.com/microsoft/vcpkg/pull/12691) [libigl] fix imgui feature + +- asiosdk `2.3.3` -> `2.3.3-1` + - [(#12157)](https://github.com/microsoft/vcpkg/pull/12157) [many ports] Remove _find_package guards that break *_FOUND + +- jxrlib `2019.10.9` -> `2019.10.9-1` + - [(#12157)](https://github.com/microsoft/vcpkg/pull/12157) [many ports] Remove _find_package guards that break *_FOUND + +- libmodman `2.0.1-1` -> `2.0.1-2` + - [(#12157)](https://github.com/microsoft/vcpkg/pull/12157) [many ports] Remove _find_package guards that break *_FOUND + +- libproxy `0.4.15-1` -> `0.4.15-2` + - [(#12157)](https://github.com/microsoft/vcpkg/pull/12157) [many ports] Remove _find_package guards that break *_FOUND + +- stb `2020-02-08` -> `2020-02-08-1` + - [(#12157)](https://github.com/microsoft/vcpkg/pull/12157) [many ports] Remove _find_package guards that break *_FOUND + +- itk `5.0.1-2` -> `5.1.0` + - [(#11208)](https://github.com/microsoft/vcpkg/pull/11208) [ITK] Update to 5.1 + - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp) + +- opencl `2.2-2-1` -> `2.2` + - [(#11208)](https://github.com/microsoft/vcpkg/pull/11208) [ITK] Update to 5.1 + +- openjpeg `2.3.1-1` -> `2.3.1` + - [(#11208)](https://github.com/microsoft/vcpkg/pull/11208) [ITK] Update to 5.1 + +- pbc `0.5.14-2` -> `0.5.14` + - [(#12732)](https://github.com/microsoft/vcpkg/pull/12732) [vcpkg baseline] Fix pbc build failure with x64-osx + - [(#11836)](https://github.com/microsoft/vcpkg/pull/11836) [vcpkg/scripts/make] trying to iron out some issues + +- libodb-sqlite `2.4.0-6` -> `2.4.0` + - [(#12516)](https://github.com/microsoft/vcpkg/pull/12516) [sqlite3] Namespaced targets with unofficial:: + +- gtkmm `3.22.2-2` -> `3.22.2` + - [(#12637)](https://github.com/microsoft/vcpkg/pull/12637) [gtkmm] fix missing symbol exports with gtkmm release build + +- wavpack `5.2.0` -> `5.2.0` + - [(#12742)](https://github.com/microsoft/vcpkg/pull/12742) [wavpack] Fix failure on linux and osx + - [(#11277)](https://github.com/microsoft/vcpkg/pull/11277) [ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. + +- shapelib `1.4.1-2` -> `1.5.0` + - [(#12737)](https://github.com/microsoft/vcpkg/pull/12737) [shapelib] Update to 1.5.0 + +- teemo `1.3` -> `2.1` + - [(#12728)](https://github.com/microsoft/vcpkg/pull/12728) [teemo] Update to v2.1 + +- quill `1.3.1` -> `1.4.0` + - [(#12683)](https://github.com/microsoft/vcpkg/pull/12683) [quill] Update to version 1.3.3 + - [(#12924)](https://github.com/microsoft/vcpkg/pull/12924) [quill] Update to 1.4.0 + +- libmariadb `3.1.7-1` -> `3.1.7` + - [(#12669)](https://github.com/microsoft/vcpkg/pull/12669) [libmariadb] Include bundled zlib and openssl + +- brotli `1.0.7-1` -> `1.0.7` + - [(#12405)](https://github.com/microsoft/vcpkg/pull/12405) [brotli] add pkgconfig / [freetype] depend on brotli + +- cairomm `1.15.3-4` -> `1.15.3` + - [(#12405)](https://github.com/microsoft/vcpkg/pull/12405) [brotli] add pkgconfig / [freetype] depend on brotli + +- freetype-gl `2019-03-29-3` -> `2019-03-29` + - [(#12405)](https://github.com/microsoft/vcpkg/pull/12405) [brotli] add pkgconfig / [freetype] depend on brotli + +- libraqm `0.7.0-1` -> `0.7.0` + - [(#12405)](https://github.com/microsoft/vcpkg/pull/12405) [brotli] add pkgconfig / [freetype] depend on brotli + +- sfml `2.5.1-7` -> `2.5.1` + - [(#12405)](https://github.com/microsoft/vcpkg/pull/12405) [brotli] add pkgconfig / [freetype] depend on brotli + - [(#11800)](https://github.com/microsoft/vcpkg/pull/11800) [sfml][imgui-sfml] Push SFML_STATIC_LIBRARIES setting into `sfml` + +- fmt `6.2.1` -> `7.0.3` + - [(#12312)](https://github.com/microsoft/vcpkg/pull/12312) [fmt] Update to 7.0.2 + [spdlog] Update to 1.7.0 + - [(#12806)](https://github.com/microsoft/vcpkg/pull/12806) [fmt] Update to 7.0.3 + +- spdlog `1.6.1` -> `1.7.0` + - [(#12312)](https://github.com/microsoft/vcpkg/pull/12312) [fmt] Update to 7.0.2 + [spdlog] Update to 1.7.0 + +- armadillo `2019-04-16-8` -> `2019-04-16` + - [(#12464)](https://github.com/microsoft/vcpkg/pull/12464) [lapack] add metaport lapack to switch lapack impl with an overlay + +- blaze `3.7` -> `3.8` + - [(#12464)](https://github.com/microsoft/vcpkg/pull/12464) [lapack] add metaport lapack to switch lapack impl with an overlay + - [(#12916)](https://github.com/microsoft/vcpkg/pull/12916) [blaze] Update to Blaze 3.8 + +- ceres `1.14.0-7` -> `1.14.0` + - [(#12464)](https://github.com/microsoft/vcpkg/pull/12464) [lapack] add metaport lapack to switch lapack impl with an overlay + +- clapack `3.2.1-13` -> `3.2.1` + - [(#12464)](https://github.com/microsoft/vcpkg/pull/12464) [lapack] add metaport lapack to switch lapack impl with an overlay + - [(#12805)](https://github.com/microsoft/vcpkg/pull/12805) [lapack-reference|fortran] Add new port + +- dlib `19.19-1` -> `19.21` + - [(#12464)](https://github.com/microsoft/vcpkg/pull/12464) [lapack] add metaport lapack to switch lapack impl with an overlay + - [(#13061)](https://github.com/microsoft/vcpkg/pull/13061) [dlib] Update to v19.21 + +- geogram `1.6.9-7` -> `1.7.5` + - [(#12464)](https://github.com/microsoft/vcpkg/pull/12464) [lapack] add metaport lapack to switch lapack impl with an overlay + - [(#12562)](https://github.com/microsoft/vcpkg/pull/12562) [geogram] update to 1.7.5 + - [(#12626)](https://github.com/microsoft/vcpkg/pull/12626) [vcpkg_find_acquire_program] Enable find_acquire(PKGCONFIG) + +- mlpack `3.2.2-3` -> `3.2.2` + - [(#12464)](https://github.com/microsoft/vcpkg/pull/12464) [lapack] add metaport lapack to switch lapack impl with an overlay + - [(#12805)](https://github.com/microsoft/vcpkg/pull/12805) [lapack-reference|fortran] Add new port + +- pangolin `0.5-7` -> `0.5` + - [(#12515)](https://github.com/microsoft/vcpkg/pull/12515) [pangolin] Fix build failure on UNIX + - [(#12856)](https://github.com/microsoft/vcpkg/pull/12856) [vcpkg baseline] Fix openimageio and pangolin build failures on Linux + +- orocos-kdl `1.4-2` -> `1.4` + - [(#12794)](https://github.com/microsoft/vcpkg/pull/12794) [ocoros-kdl] Fix the CMake config file + +- log4cpp `2.9.1-2` -> `2.9.1` + - [(#12792)](https://github.com/microsoft/vcpkg/pull/12792) [log4cpp] Fix header file install path + +- bond `9.0.0` -> `9.0.2` + - [(#12782)](https://github.com/microsoft/vcpkg/pull/12782) [bond] Update to v9.0.2 + +- libtorrent `1.2.7` -> `1.2.9` + - [(#12768)](https://github.com/microsoft/vcpkg/pull/12768) [libtorrent] Update to 1.2.8 + - [(#12762)](https://github.com/microsoft/vcpkg/pull/12762) [boost] Add Supports fields and more accurately handle arm64-windows/x64-uwp + - [(#12946)](https://github.com/microsoft/vcpkg/pull/12946) [libtorrent] minor version bump and python patch adjustment + +- boost-context `1.73.0-1` -> `1.73.0` + - [(#12762)](https://github.com/microsoft/vcpkg/pull/12762) [boost] Add Supports fields and more accurately handle arm64-windows/x64-uwp + +- secp256k1 `2017-19-10-0b7024185045a49a1a6a4c5615bf31c94f63d9c4-2` -> `2017-19-10` + - [(#12630)](https://github.com/microsoft/vcpkg/pull/12630) [secp256k1] Fix build failures and export cmake targets + +- xbyak `5.911` -> `5.93` + - [(#12577)](https://github.com/microsoft/vcpkg/pull/12577) [Xbyak] Update to 5.93 + +- tiff `4.0.10-9` -> `4.1.0` + - [(#12559)](https://github.com/microsoft/vcpkg/pull/12559) [tiff] Update 4.0.10 to 4.1.0 + +- asmjit `2020-05-08` -> `2020-07-22` + - [(#12524)](https://github.com/microsoft/vcpkg/pull/12524) [asmjit] Update to the latest commit + +- libressl `2.9.1-2` -> `2.9.1` + - [(#11949)](https://github.com/microsoft/vcpkg/pull/11949) [libressl] add download mirror + +- darknet `2020-03-02` -> `2020-06-29` + - [(#11037)](https://github.com/microsoft/vcpkg/pull/11037) [darknet] ready for yolo_v4 + +- embree3 `3.8.0` -> `3.11.0` + - [(#12555)](https://github.com/microsoft/vcpkg/pull/12555) [embree3] Update to 3.11.0 + +- fribidi `1.0.9-1` -> `1.0.10` + - [(#12517)](https://github.com/microsoft/vcpkg/pull/12517) [fribidi] Update to 1.0.10 + +- opencolorio `1.1.1-2` -> `1.1.1` + - [(#12420)](https://github.com/microsoft/vcpkg/pull/12420) [opencolorio-tools] Separate feature application to avoid circular dependency + - [(#12869)](https://github.com/microsoft/vcpkg/pull/12869) [opencolorio] Update repository + +- osg `3.6.4-3` -> `3.6.5` + - [(#12672)](https://github.com/microsoft/vcpkg/pull/12672) [osg] Update to 3.6.5 + +- openblas `0.3.9-1` -> `0.3.9` + - [(#12805)](https://github.com/microsoft/vcpkg/pull/12805) [lapack-reference|fortran] Add new port + - [(#12956)](https://github.com/microsoft/vcpkg/pull/12956) [openblas] Fix generating pkg-config file + +- farmhash `1.1-1` -> `1.1` + - [(#11836)](https://github.com/microsoft/vcpkg/pull/11836) [vcpkg/scripts/make] trying to iron out some issues + +- freexl `1.0.4-9` -> `1.0.4` + - [(#11836)](https://github.com/microsoft/vcpkg/pull/11836) [vcpkg/scripts/make] trying to iron out some issues + +- libcrafter `0.3-1` -> `0.3` + - [(#11836)](https://github.com/microsoft/vcpkg/pull/11836) [vcpkg/scripts/make] trying to iron out some issues + +- libmagic `5.37-1` -> `5.37` + - [(#11836)](https://github.com/microsoft/vcpkg/pull/11836) [vcpkg/scripts/make] trying to iron out some issues + +- libwandio `4.2.1-2` -> `4.2.1` + - [(#11836)](https://github.com/microsoft/vcpkg/pull/11836) [vcpkg/scripts/make] trying to iron out some issues + +- ocilib `4.6.4-1` -> `4.6.4` + - [(#11836)](https://github.com/microsoft/vcpkg/pull/11836) [vcpkg/scripts/make] trying to iron out some issues + +- x264 `157-303c484ec828ed0-8` -> `157-303c484ec828ed0` + - [(#11836)](https://github.com/microsoft/vcpkg/pull/11836) [vcpkg/scripts/make] trying to iron out some issues + +- wpilib `2020.1.1` -> `2020.3.2` + - [(#12373)](https://github.com/microsoft/vcpkg/pull/12373) [wpilib] Update to 2020.3.2 + +- proj4 `6.3.1-1` -> `6.3.1` + - [(#12875)](https://github.com/microsoft/vcpkg/pull/12875) [proj4] use sqlite3 config cmake, make sqlite3 private + +- tool-meson `0.54.2` -> `0.55.1` + - [(#12927)](https://github.com/microsoft/vcpkg/pull/12927) [meson] Update meson to 0.55.1 + +- apr-util `1.6.1-1` -> `1.6.1` + - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp) + +- expat `2.2.7` -> `2.2.9` + - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp) + +- gdal `2.4.1-9` -> `2.4.1` + - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp) + - [(#12541)](https://github.com/microsoft/vcpkg/pull/12541) [gdal] Fix static build issue + +- io2d `2019-07-11-2` -> `2019-07-11` + - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp) + +- libkml `1.3.0-4` -> `1.3.0` + - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp) + +- poco `1.9.2-2` -> `1.9.2` + - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp) + +- readosm `1.1.0-2` -> `1.1.0` + - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp) + +- skia `2020-05-18-1` -> `2020-05-18` + - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp) + +- spatialite-tools `4.3.0-2` -> `4.3.0` + - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp) + +- xlnt `1.4.0-1` -> `1.5.0` + - [(#12972)](https://github.com/microsoft/vcpkg/pull/12972) [xlnt] Upgrade xlnt to 1.5.0 + +- fdk-aac `2018-07-08-1` -> `2018-07-08-2` + - [(#11277)](https://github.com/microsoft/vcpkg/pull/11277) [ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. + +- opus `1.3.1-3` -> `1.3.1` + - [(#11277)](https://github.com/microsoft/vcpkg/pull/11277) [ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. + - [(#12886)](https://github.com/microsoft/vcpkg/pull/12886) [many ports] Fix various problems with mingw + +- sdl2 `2.0.12-1` -> `2.0.12` + - [(#11277)](https://github.com/microsoft/vcpkg/pull/11277) [ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. + +- speex `1.2.0-4` -> `1.2.0` + - [(#11277)](https://github.com/microsoft/vcpkg/pull/11277) [ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. + +- pcl `1.9.1-13` -> `1.11.0` + - [(#10042)](https://github.com/microsoft/vcpkg/pull/10042) [pcl] Update to 1.10.0 + - [(#13020)](https://github.com/microsoft/vcpkg/pull/13020) [pcl] check SSE flags + +- tinygltf `2.2.0` -> `2020-07-28` + - [(#12608)](https://github.com/microsoft/vcpkg/pull/12608) [tinygltf] update to v2.4.0 + +- pmdk `1.8` -> `1.9` + - [(#12863)](https://github.com/microsoft/vcpkg/pull/12863) [pmdk] Update to 1.9 + +- kangaru `4.2.2` -> `4.2.4` + - [(#12932)](https://github.com/microsoft/vcpkg/pull/12932) [kangaru] Update to v4.2.4 + +- intel-mkl `2018.0.1` -> `2020.0.0` + - [(#12978)](https://github.com/microsoft/vcpkg/pull/12978) [intel-mkl] Update to 2020.0.0 + +- fluidsynth `2.1.0` -> `2.1.4` + - [(#12974)](https://github.com/microsoft/vcpkg/pull/12974) [fluidsynth/redis-plus-plus] Update to the latest released version + +- redis-plus-plus `1.1.1` -> `1.1.2` + - [(#12974)](https://github.com/microsoft/vcpkg/pull/12974) [fluidsynth/redis-plus-plus] Update to the latest released version + +- openxr-loader `1.0.3.0` -> `1.0.11` + - [(#12060)](https://github.com/microsoft/vcpkg/pull/12060) [openxr-loader] Update to latest version, official repo + +- libmediainfo `20.03` -> `20.08` + - [(#12944)](https://github.com/microsoft/vcpkg/pull/12944) [libmediainfo] Update to 20.08 + +- wt `4.2.2` -> `4.4.0` + - [(#13005)](https://github.com/microsoft/vcpkg/pull/13005) [wt] Update to 4.4.0 + +- libjpeg-turbo `2.0.4` -> `2.0.5` + - [(#12973)](https://github.com/microsoft/vcpkg/pull/12973) [libjpeg-turbo] Update to 2.0.5 + +- berkeleydb `4.8.30-4` -> `4.8.30` + - [(#12870)](https://github.com/microsoft/vcpkg/pull/12870) [berkeleydb] Fix build error with Visual Studio 16.7.0 + +- libmodplug `0.8.9.0-5` -> `0.8.9.0` + - [(#12886)](https://github.com/microsoft/vcpkg/pull/12886) [many ports] Fix various problems with mingw + +- imgui-sfml `2.1-1` -> `2.1-2` + - [(#11800)](https://github.com/microsoft/vcpkg/pull/11800) [sfml][imgui-sfml] Push SFML_STATIC_LIBRARIES setting into `sfml` + +- re2 `2020-01-01` -> `2020-06-01` + - [(#13084)](https://github.com/microsoft/vcpkg/pull/13084) [grpc][upb][re2] grpc v1.31.1 + +- upb `2019-10-21-2` -> `2020-08-19` + - [(#13084)](https://github.com/microsoft/vcpkg/pull/13084) [grpc][upb][re2] grpc v1.31.1 + +- box2d `2019-12-31` -> `2.4.0` + - [(#13058)](https://github.com/microsoft/vcpkg/pull/13058) [Box2d] Update to 2.4.0 + +- cpp-taskflow `2.2.0-1` -> `2.5.0` + - [(#12923)](https://github.com/microsoft/vcpkg/pull/12923) [cpp-taskflow] Update to 2.5.0 + +- aubio `0.4.9-1` -> `0.4.9` + - [(#12921)](https://github.com/microsoft/vcpkg/pull/12921) [libsndfile] Update to 1.0.29 + +- libfreenect2 `0.2.0-4` -> `0.2.0` + - [(#13057)](https://github.com/microsoft/vcpkg/pull/13057) [libusb] Add vcpkg-cmake-wrapper + +
+ +-- vcpkg team vcpkg@microsoft.com THU, 27 Aug 02:20:00 -0800 + +vcpkg (2020.04.20 - 2020.06.15) +--- +#### Total port count: 1402 +#### Total port count per triplet (tested): +|triplet|ports available| +|---|---| +|**x64-windows**|1282| +|**x64-osx**|1109| +|**x64-linux**|1181| +|x64-windows-static|1187| +|x86-windows|1261| +|x64-uwp|693| +|arm64-windows|903| +|arm-uwp|656| + +#### The following documentation has been updated: +- [Testing](docs/tool-maintainers/testing.md) + - [(#11007)](https://github.com/microsoft/vcpkg/pull/11007) [vcpkg] Fix Catch2 include path in documentation (by @horenmar) +- [Maintainer Guidelines and Policies](docs/maintainers/maintainer-guide.md) + - [(#8749)](https://github.com/microsoft/vcpkg/pull/8749) [vcpkg] Add new function vcpkg_copy_tools (by @myd7349) +- [Portfile helper functions](docs/maintainers/portfile-functions.md) + - [(#8749)](https://github.com/microsoft/vcpkg/pull/8749) [vcpkg] Add new function vcpkg_copy_tools (by @myd7349) + - [(#10505)](https://github.com/microsoft/vcpkg/pull/10505) [gn, crashpad] Add GN build support and crashpad port (by @myd7349) +- [vcpkg_clean_executables_in_bin](docs/maintainers/vcpkg_clean_executables_in_bin.md)***[NEW]*** + - [(#8749)](https://github.com/microsoft/vcpkg/pull/8749) [vcpkg] Add new function vcpkg_copy_tools (by @myd7349) +- [vcpkg_copy_tools](docs/maintainers/vcpkg_copy_tools.md)***[NEW]*** + - [(#8749)](https://github.com/microsoft/vcpkg/pull/8749) [vcpkg] Add new function vcpkg_copy_tools (by @myd7349) +- [vcpkg_build_gn](docs/maintainers/vcpkg_build_gn.md)***[NEW]*** + - [(#10505)](https://github.com/microsoft/vcpkg/pull/10505) [gn, crashpad] Add GN build support and crashpad port (by @vejmartin) +- [vcpkg_build_ninja](docs/maintainers/vcpkg_build_ninja.md)***[NEW]*** + - [(#10505)](https://github.com/microsoft/vcpkg/pull/10505) [gn, crashpad] Add GN build support and crashpad port (by @vejmartin) +- [vcpkg_configure_gn](docs/maintainers/vcpkg_configure_gn.md)***[NEW]*** + - [(#10505)](https://github.com/microsoft/vcpkg/pull/10505) [gn, crashpad] Add GN build support and crashpad port (by @vejmartin) +- [vcpkg_find_acquire_program](docs/maintainers/vcpkg_find_acquire_program.md) + - [(#10505)](https://github.com/microsoft/vcpkg/pull/10505) [gn, crashpad] Add GN build support and crashpad port (by @vejmartin) +- [vcpkg_install_gn](docs/maintainers/vcpkg_install_gn.md)***[NEW]*** + - [(#10505)](https://github.com/microsoft/vcpkg/pull/10505) [gn, crashpad] Add GN build support and crashpad port (by @vejmartin) +- [vcpkg and Android](docs/examples/vcpkg_android_example_cmake_script/cmake/vcpkg_android.cmake)***[NEW]*** + - [(#11264)](https://github.com/microsoft/vcpkg/pull/11264) Improve Android doc (triplets, usage with cmake and prefab) (by @pthom) +- [vcpkg telemetry and privacy](docs/about/privacy.md) + - [(#11542)](https://github.com/microsoft/vcpkg/pull/11542) [vcpkg metrics] Allow someone to opt out after build (by @strega-nil) +- [Manifests](docs/specifications/manifests.md)***[NEW]*** + - [(#11203)](https://github.com/microsoft/vcpkg/pull/11203) [vcpkg] RFC: Manifests (by @strega-nil) +- [CONTROL files](docs/maintainers/control-files.md) + - [(#11323)](https://github.com/microsoft/vcpkg/pull/11323) [vcpkg] add x86-wasm.cmake to community triplets (by @MoAlyousef) + - [(#11365)](https://github.com/microsoft/vcpkg/pull/11365) [vcpkg] [cudnn] [msmpi] [openmpi] Update VMSS (by @MoAlyousef) +- [Installing and Using Packagese Example: SQLite](docs/examples/installing-and-using-packages.md) + - [(#11763)](https://github.com/microsoft/vcpkg/pull/11763) docs: fix CMakeLists example for SQLite3 (by @disposedtrolley) + +#### The following changes have been made to the vcpkg tool and infrastructure: +- [(#10828)](https://github.com/microsoft/vcpkg/pull/10828) Onboard Windows PR tests to Azure Pipelines YAML and Scale Sets (by @BillyONeal) +- [(#10932)](https://github.com/microsoft/vcpkg/pull/10932) [vcpkg] Update git to 2.26.2 (by @Cheney-W) +- [(#10973)](https://github.com/microsoft/vcpkg/pull/10973) [vcpkg] Fix toolsrc CMake build error (by @NancyLi1013) +- [(#11009)](https://github.com/microsoft/vcpkg/pull/11009) Fix slack link to current, correct, location. (by @grafikrobot) +- [(#9861)](https://github.com/microsoft/vcpkg/pull/9861) [scripts] add new function vcpkg_fixup_pkgconfig (by @Neumann-A) +- [(#11064)](https://github.com/microsoft/vcpkg/pull/11064) [vcpkg] Copy macos pipelines into azure-pipelines.yml (by @BillyONeal) +- [(#10476)](https://github.com/microsoft/vcpkg/pull/10476) [vcpkg] Add support for VCPKG_BINARY_SOURCES and --x-binarysource=<> (by @ras0219-msft) +- [(#11068)](https://github.com/microsoft/vcpkg/pull/11068) [vcpkg] Small touchups for vcpkg unit tests (by @horenmar) +- [(#11085)](https://github.com/microsoft/vcpkg/pull/11085) [vcpkg] Correctly record default feature list in BinaryParagraphs. Fixes #10678. (by @ras0219-msft) +- [(#11090)](https://github.com/microsoft/vcpkg/pull/11090) [vcpkg] Bump macos build timeouts to 1 day (by @BillyONeal) +- [(#11091)](https://github.com/microsoft/vcpkg/pull/11091) [vcpkg baseline] Ignore mlpack on macOS (by @strega-nil) +- [(#11083)](https://github.com/microsoft/vcpkg/pull/11083) [vcpkg] Warn on unmatched removal with reasonable alternative (by @ras0219-msft) +- [(#11102)](https://github.com/microsoft/vcpkg/pull/11102) [vcpkg] fix undefined working dir in vcpkg_acquire_msys (by @Neumann-A) +- [(#11058)](https://github.com/microsoft/vcpkg/pull/11058) [msbuild]fix use UseEnv-True (by @Voskrese) +- [(#10980)](https://github.com/microsoft/vcpkg/pull/10980) [vcpkg] Onboard Linux to VMSS, open 'git' port, and switch back to Azure Spot (by @BillyONeal) +- [(#8749)](https://github.com/microsoft/vcpkg/pull/8749) [vcpkg] Add new function vcpkg_copy_tools (by @myd7349) +- [(#11166)](https://github.com/microsoft/vcpkg/pull/11166) [vcpkg] Add disk space report on Linux. (by @BillyONeal) +- [(#11170)](https://github.com/microsoft/vcpkg/pull/11170) [vcpkg] fix bug in Filesystem::absolute (by @strega-nil) +- [(#11175)](https://github.com/microsoft/vcpkg/pull/11175) [vcpkg] Point README.md to the correct status badge. (by @BillyONeal) +- [(#11171)](https://github.com/microsoft/vcpkg/pull/11171) [vcpkg] Add telemetry notice to `README.md`. (by @BillyONeal) +- [(#11189)](https://github.com/microsoft/vcpkg/pull/11189) [vcpkg] Add tombstone deletion scripts. (by @BillyONeal) +- [(#11105)](https://github.com/microsoft/vcpkg/pull/11105) [vcpkg/scripts] Fix ninja search path on windows and find binaries within vcpkg first (by @Neumann-A) +- [(#11202)](https://github.com/microsoft/vcpkg/pull/11202) [vcpkg] always pass VSCMD_SKIP_SENDTELEMETRY=1 (by @strega-nil) +- [(#8588)](https://github.com/microsoft/vcpkg/pull/8588) [vcpkg] Add x86 support for Linux toolchain (by @zhbanito) +- [(#11213)](https://github.com/microsoft/vcpkg/pull/11213) [vcpkg] Restrict telemetry uploads to TLS 1.2 (by @BillyONeal) +- [(#11234)](https://github.com/microsoft/vcpkg/pull/11234) [vcpkg] Don't build the metrics uploader when metrics are disabled. (by @BillyONeal) +- [(#11233)](https://github.com/microsoft/vcpkg/pull/11233) [vcpkg] Resolve relative overlay ports to the current working directory. (by @ras0219-msft) +- [(#10760)](https://github.com/microsoft/vcpkg/pull/10760) [vcpkg] Adding support for finding VS2019 by environment variable (by @Honeybunch) +- [(#11174)](https://github.com/microsoft/vcpkg/pull/11174) [vcpkg] [llvm] Bump Linux VM memory size and do all operations on the temporary disk. (by @BillyONeal) +- [(#11266)](https://github.com/microsoft/vcpkg/pull/11266) [vcpkg][android] Link C++ runtime according to VCPKG_CRT_LINKAGE (by @huangqinjin) +- [(#11260)](https://github.com/microsoft/vcpkg/pull/11260) [vcpkg] Update pull request template (by @PhoebeHui) +- [(#11302)](https://github.com/microsoft/vcpkg/pull/11302) [vcpkg] Resolve --overlay-ports is only working for relative parths since fix… (by @TobiasFunk) +- [(#11205)](https://github.com/microsoft/vcpkg/pull/11205) [vcpkg] Hopefully fix build on macOS 10.13/10.14 (by @strega-nil) +- [(#11093)](https://github.com/microsoft/vcpkg/pull/11093) [vcpkg] Fix nuget package import failed. (by @shihaonan369) +- [(#11239)](https://github.com/microsoft/vcpkg/pull/11239) [vcpkg] Turn on tests in CI. (by @BillyONeal) +- [(#11339)](https://github.com/microsoft/vcpkg/pull/11339) [vcpkg] Avoid naming Policheck sensitive term (by @BillyONeal) +- [(#11368)](https://github.com/microsoft/vcpkg/pull/11368) [vcpkg] Do not build the metrics uploader with MSBuild when metrics are disabled (by @rickertm) +- [(#11315)](https://github.com/microsoft/vcpkg/pull/11315) [vcpkg] Harden expand environment strings path with explicit integer overflow checks and resistance to CP_ACP. (by @BillyONeal) +- [(#11450)](https://github.com/microsoft/vcpkg/pull/11450) [vcpkg CI] Clean git directory before clone (by @strega-nil) +- [(#11432)](https://github.com/microsoft/vcpkg/pull/11432) [vcpkg] Harden file removals and clean directory contents in "CI" inside vcpkg itself. (by @BillyONeal) +- [(#10767)](https://github.com/microsoft/vcpkg/pull/10767) [cmake] Update to 3.17.2 (by @JackBoosY) +- [(#11433)](https://github.com/microsoft/vcpkg/pull/11433) [vcpkg] Optimize string split slightly. (by @BillyONeal) +- [(#11299)](https://github.com/microsoft/vcpkg/pull/11299) [vcpkg] pass -disableMetrics to bootstrap on git bash (by @strega-nil) +- [(#11453)](https://github.com/microsoft/vcpkg/pull/11453) Fix CMake PATH that fails Windows tests. (by @BillyONeal) +- [(#11343)](https://github.com/microsoft/vcpkg/pull/11343) [vcpkg] fix extern C around ctermid (by @strega-nil) +- [(#11380)](https://github.com/microsoft/vcpkg/pull/11380) [tool-meson] Update to 0.54.2 (by @c72578) +- [(#11057)](https://github.com/microsoft/vcpkg/pull/11057) [Vcpkg] Fix macOS applocal.py dependency bundling error (by @kevinhartman) +- [(#10402)](https://github.com/microsoft/vcpkg/pull/10402) [vcpkg] Improve make builds (by @Neumann-A) +- [(#11431)](https://github.com/microsoft/vcpkg/pull/11431) [vcpkg] Add static triplet for arm64-windows (by @orudge) +- [(#11466)](https://github.com/microsoft/vcpkg/pull/11466) [vcpkg] Fix cmake architecture detection on windows with ninja generator (by @Chronial) +- [(#11512)](https://github.com/microsoft/vcpkg/pull/11512) [vcpkg] Remove powershell from the 'run vcpkg ci' path to reduce hangs from msys components. (by @BillyONeal) +- [(#11443)](https://github.com/microsoft/vcpkg/pull/11443) [vcpkg-acquire-msys] Update pacman before any other package. (by @emptyVoid) +- [(#11496)](https://github.com/microsoft/vcpkg/pull/11496) [Baseline] Fix boost-*:arm-uwp failure and resolve conflicts in CI (by @PhoebeHui) +- [(#11559)](https://github.com/microsoft/vcpkg/pull/11559) [VCPKG baseline] Fix many ports (by @JackBoosY) +- [(#11545)](https://github.com/microsoft/vcpkg/pull/11545) [vcpkg] Move CI cleaning back out of the 'ci' command into a separate command to restore cross-compilation preinstalls. (by @BillyONeal) +- [(#11612)](https://github.com/microsoft/vcpkg/pull/11612) [vcpkg baseline] Fix baseline failures (by @PhoebeHui) +- [(#11542)](https://github.com/microsoft/vcpkg/pull/11542) [vcpkg metrics] Allow someone to opt out after build (by @strega-nil) +- [(#11653)](https://github.com/microsoft/vcpkg/pull/11653) [vcpkg] Rename the msbuild property VcpkgRoot (by @BillyONeal) +- [(#11629)](https://github.com/microsoft/vcpkg/pull/11629) [vcpkg] Use a crypto RNG to generate admin passwords (by @BillyONeal) +- [(#11697)](https://github.com/microsoft/vcpkg/pull/11697) [vcpkg baseline] fix libb2:x64-osx (by @strega-nil) +- [(#11668)](https://github.com/microsoft/vcpkg/pull/11668) [CI|python3] add setuptools (by @Neumann-A) +- [(#11613)](https://github.com/microsoft/vcpkg/pull/11613) [vcpkg-baseline][unixodbc/nanodbc] Fix unixodbc build failure and set it as a dependency on nanodbc (by @JackBoosY) +- [(#11692)](https://github.com/microsoft/vcpkg/pull/11692) [vcpkg baseline] Remove passing port from Ci baseline (by @PhoebeHui) +- [(#11323)](https://github.com/microsoft/vcpkg/pull/11323) [vcpkg] add x86-wasm.cmake to community triplets (by @MoAlyousef) +- [(#11647)](https://github.com/microsoft/vcpkg/pull/11647) [vcpkg baseline][libfabric] Only support dynamic build (by @JackBoosY) +- [(#11483)](https://github.com/microsoft/vcpkg/pull/11483) [vcpkg] Allow CI to pass in all relevant directories and remove use of symbolic links (by @BillyONeal) +- [(#11764)](https://github.com/microsoft/vcpkg/pull/11764) [vcpkg] Add directories to x-ci-clean lost in merge conflict resolution. (by @BillyONeal) +- [(#11742)](https://github.com/microsoft/vcpkg/pull/11742) [vcpkg-baseline][manyport] Fix baseline error (by @JackBoosY) +- [(#11779)](https://github.com/microsoft/vcpkg/pull/11779) [vcpkg] Provide $(VcpkgRoot) and $(VcpkgCurrentInstalledDir) for customers. (by @BillyONeal) +- [(#11750)](https://github.com/microsoft/vcpkg/pull/11750) [vcpkg README] Add #include channel (by @strega-nil) +- [(#11693)](https://github.com/microsoft/vcpkg/pull/11693) [CI|gfortran] Install gfortran for OSX and Linux CI (by @Neumann-A) +- [(#11839)](https://github.com/microsoft/vcpkg/pull/11839) [vcpkg] Fix OSX CI by ensuring the downloads directory exists (by @BillyONeal +- [(#11810)](https://github.com/microsoft/vcpkg/pull/11810) [vcpkg-acquire-msys] Improvement (by @emptyVoid) +- [(#11365)](https://github.com/microsoft/vcpkg/pull/11365) [vcpkg] [cudnn] [msmpi] [openmpi] Update VMSS (by @BillyONeal) +- [(#11146)](https://github.com/microsoft/vcpkg/pull/11146) [vcpkg] Add nologo to windows toolchain (by @Neumann-A) +- [(#11891)](https://github.com/microsoft/vcpkg/pull/11891) [vcpkg] Fix bootstrap on VS2015 (by @BillyONeal) +- [(#11858)](https://github.com/microsoft/vcpkg/pull/11858) [vcpkg] Merge unit test pass into x86-windows. (by @BillyONeal) +- [(#11896)](https://github.com/microsoft/vcpkg/pull/11896) [vcpkg baseline] Fix baseline error (by @JackBoosY) +- [(#4361)](https://github.com/microsoft/vcpkg/pull/4361) Adds vcpkg item to project settings in Visual Studio (by @Neumann-A) +- [(#11958)](https://github.com/microsoft/vcpkg/pull/11958) Delete g_binary_caching global that should be passed as a parameter. (by @BillyONeal) + +
+The following 79 ports have been added: + +|port|version| +|---|---| +|[ryml](https://github.com/microsoft/vcpkg/pull/10793)| 2020-04-12 +|[qt5-androidextras](https://github.com/microsoft/vcpkg/pull/10644)[#11026](https://github.com/microsoft/vcpkg/pull/11026) | 5.12.8 +|[qt5-canvas3d](https://github.com/microsoft/vcpkg/pull/10644)[#11026](https://github.com/microsoft/vcpkg/pull/11026) | 5.12.8 +|[qt5-doc](https://github.com/microsoft/vcpkg/pull/10644)[#11026](https://github.com/microsoft/vcpkg/pull/11026) | 5.12.8 +|[qt5-serialbus](https://github.com/microsoft/vcpkg/pull/10644)[#11026](https://github.com/microsoft/vcpkg/pull/11026) | 5.12.8 +|[qt5-translations](https://github.com/microsoft/vcpkg/pull/10644)[#11026](https://github.com/microsoft/vcpkg/pull/11026) | 5.12.8 +|[qt5-wayland](https://github.com/microsoft/vcpkg/pull/10644)[#11026](https://github.com/microsoft/vcpkg/pull/11026) | 5.12.8 +|[qt5-webengine](https://github.com/microsoft/vcpkg/pull/10644)[#11026](https://github.com/microsoft/vcpkg/pull/11026) [#11120](https://github.com/microsoft/vcpkg/pull/11120) [#11653](https://github.com/microsoft/vcpkg/pull/11653) | 5.12.8 +|[qt5-webglplugin](https://github.com/microsoft/vcpkg/pull/10644)[#11026](https://github.com/microsoft/vcpkg/pull/11026) | 5.12.8 +|[qt5-x11extras](https://github.com/microsoft/vcpkg/pull/10644)[#11026](https://github.com/microsoft/vcpkg/pull/11026) | 5.12.8 +|[iniparser](https://github.com/microsoft/vcpkg/pull/10710)| 2020-04-06 +|[quill](https://github.com/microsoft/vcpkg/pull/10902)[#11326](https://github.com/microsoft/vcpkg/pull/11326) | 1.3.1 +|[frozen](https://github.com/microsoft/vcpkg/pull/10766)| 1.0.0 +|[cppcoro](https://github.com/microsoft/vcpkg/pull/10693)| 2020-2-28-1 +|[libtomcrypt](https://github.com/microsoft/vcpkg/pull/10960)| 1.18.2-1 +|[libtommath](https://github.com/microsoft/vcpkg/pull/10960)| 1.2.0-1 +|[pe-parse](https://github.com/microsoft/vcpkg/pull/11012)| 1.2.0 +|[opencc](https://github.com/microsoft/vcpkg/pull/8474)[#10767](https://github.com/microsoft/vcpkg/pull/10767) [#11559](https://github.com/microsoft/vcpkg/pull/11559) [#11612](https://github.com/microsoft/vcpkg/pull/11612) | 2020-04-26-4 +|[uchardet](https://github.com/microsoft/vcpkg/pull/8477)| 2020-04-26 +|[libqcow](https://github.com/microsoft/vcpkg/pull/11036)[#11238](https://github.com/microsoft/vcpkg/pull/11238) | 20191221-1 +|[mstch](https://github.com/microsoft/vcpkg/pull/11020)| 1.0.2-2 +|[nowide](https://github.com/microsoft/vcpkg/pull/11066)[#11732](https://github.com/microsoft/vcpkg/pull/11732) [#11859](https://github.com/microsoft/vcpkg/pull/11859) | alias +|[discord-game-sdk](https://github.com/microsoft/vcpkg/pull/10763)[#11728](https://github.com/microsoft/vcpkg/pull/11728) | 2.5.6-1 +|[libmpeg2](https://github.com/microsoft/vcpkg/pull/8871)| 0.5.1 +|[opencv2](https://github.com/microsoft/vcpkg/pull/7849)[#11201](https://github.com/microsoft/vcpkg/pull/11201) | 2.4.13.7-1 +|[rtlsdr](https://github.com/microsoft/vcpkg/pull/10901)[#11575](https://github.com/microsoft/vcpkg/pull/11575) | 2020-04-16-1 +|[gasol](https://github.com/microsoft/vcpkg/pull/9550)| 2018-01-04 +|[coin](https://github.com/microsoft/vcpkg/pull/9880)| 4.0.0 +|[simage](https://github.com/microsoft/vcpkg/pull/9880)| 1.8.0 +|[soqt](https://github.com/microsoft/vcpkg/pull/9880)| 1.6.0 +|[gmp](https://github.com/microsoft/vcpkg/pull/10613)[#11565](https://github.com/microsoft/vcpkg/pull/11565) | 6.2.0-1 +|[nettle](https://github.com/microsoft/vcpkg/pull/10613)[#11565](https://github.com/microsoft/vcpkg/pull/11565) | 3.5.1-1 +|[vs-yasm](https://github.com/microsoft/vcpkg/pull/10613)| 0.5.0 +|[uthenticode](https://github.com/microsoft/vcpkg/pull/11199)[#11256](https://github.com/microsoft/vcpkg/pull/11256) [#11362](https://github.com/microsoft/vcpkg/pull/11362) | 1.0.4 +|[bitserializer-pugixml](https://github.com/microsoft/vcpkg/pull/11241)[#11683](https://github.com/microsoft/vcpkg/pull/11683) | alias +|[ignition-math6](https://github.com/microsoft/vcpkg/pull/11232)| 6.4.0 +|[vtk-m](https://github.com/microsoft/vcpkg/pull/11148)| 1.5.0 +|[crashpad](https://github.com/microsoft/vcpkg/pull/10505)| 2020-03-18 +|[bitserializer-rapidyaml](https://github.com/microsoft/vcpkg/pull/11242)[#11683](https://github.com/microsoft/vcpkg/pull/11683) | alias +|[ignition-msgs5](https://github.com/microsoft/vcpkg/pull/11272)[#11397](https://github.com/microsoft/vcpkg/pull/11397) | 5.1.0 +|[ignition-transport8](https://github.com/microsoft/vcpkg/pull/11272)| 8.0.0 +|[sdformat9](https://github.com/microsoft/vcpkg/pull/11265)[#11742](https://github.com/microsoft/vcpkg/pull/11742) | 9.2.0-1 +|[kissfft](https://github.com/microsoft/vcpkg/pull/9237)| 2020-03-30 +|[jaeger-client-cpp](https://github.com/microsoft/vcpkg/pull/9126)[#11583](https://github.com/microsoft/vcpkg/pull/11583) | 0.5.1-1 +|[libmediainfo](https://github.com/microsoft/vcpkg/pull/7005)| 20.03 +|[h5py-lzf](https://github.com/microsoft/vcpkg/pull/10871)| 2019-12-04 +|[microsoft-signalr](https://github.com/microsoft/vcpkg/pull/10833)[#11496](https://github.com/microsoft/vcpkg/pull/11496) | 0.1.0-alpha1-1 +|[oatpp-consul](https://github.com/microsoft/vcpkg/pull/9402)| 1.0.0 +|[oatpp-curl](https://github.com/microsoft/vcpkg/pull/9402)| 1.0.0 +|[oatpp-libressl](https://github.com/microsoft/vcpkg/pull/9402)| 1.0.0 +|[oatpp-mbedtls](https://github.com/microsoft/vcpkg/pull/9402)| 1.0.0 +|[oatpp-swagger](https://github.com/microsoft/vcpkg/pull/9402)| 1.0.0 +|[oatpp-websocket](https://github.com/microsoft/vcpkg/pull/9402)| 1.0.0 +|[oatpp](https://github.com/microsoft/vcpkg/pull/9402)| 1.0.0 +|[gperftools](https://github.com/microsoft/vcpkg/pull/8750)| 2019-09-02 +|[libvmdk](https://github.com/microsoft/vcpkg/pull/11010)| 2019-12-21 +|[ctp](https://github.com/microsoft/vcpkg/pull/10717)| 6.3.15_20190220_se +|[munit](https://github.com/microsoft/vcpkg/pull/6780)| 2019-04-06 +|[mmloader](https://github.com/microsoft/vcpkg/pull/11381)| 2020-05-15 +|[absent](https://github.com/microsoft/vcpkg/pull/11447)| 0.3.0 +|[ocilib](https://github.com/microsoft/vcpkg/pull/11549)[#11646](https://github.com/microsoft/vcpkg/pull/11646) | 4.6.4-1 +|[tinyply](https://github.com/microsoft/vcpkg/pull/11534)| 2020-05-22 +|[symengine](https://github.com/microsoft/vcpkg/pull/8752)| 2020-05-25 +|[nanoprintf](https://github.com/microsoft/vcpkg/pull/11605)| 2020-05-27 +|[wavelib](https://github.com/microsoft/vcpkg/pull/11611)| 2020-05-29 +|[refl-cpp](https://github.com/microsoft/vcpkg/pull/11622)| 0.9.1 +|[trantor](https://github.com/microsoft/vcpkg/pull/11533)| v1.0.0-rc13 +|[sockpp](https://github.com/microsoft/vcpkg/pull/11562)| 0.7 +|[protozero](https://github.com/microsoft/vcpkg/pull/11652)| 1.6.8 +|[p-ranav-csv2](https://github.com/microsoft/vcpkg/pull/11725)| 2020-06-02 +|[cr](https://github.com/microsoft/vcpkg/pull/11841)| 2020-04-26 +|[json-schema-validator](https://github.com/microsoft/vcpkg/pull/11599)| 2.1.0 +|[log4cxx](https://github.com/microsoft/vcpkg/pull/11659)| 0.10.0-2 +|[xbyak](https://github.com/microsoft/vcpkg/pull/11689)| 5.911 +|[licensepp](https://github.com/microsoft/vcpkg/pull/11711)| 2020-05-19 +|[v-hacd](https://github.com/microsoft/vcpkg/pull/11606)| 3.2.0 +|[libosmium](https://github.com/microsoft/vcpkg/pull/11863)| 2.15.5 +|[gzip-hpp](https://github.com/microsoft/vcpkg/pull/11735)| 0.1.0 +|[infoware](https://github.com/microsoft/vcpkg/pull/11410)| 0.5.3 +
+ +
+The following 375 ports have been updated: + +- otl `4.0.451` -> `4.0.455` + - [(#10922)](https://github.com/microsoft/vcpkg/pull/10922) [vcpkg baseline] Update hash for otl + - [(#11300)](https://github.com/microsoft/vcpkg/pull/11300) [otl] Update to 4.0.455 + +- vtk `8.2.0-12` -> `9.0-2` + - [(#10925)](https://github.com/microsoft/vcpkg/pull/10925) [VTK] Check if VTKTarget files exist + - [(#11148)](https://github.com/microsoft/vcpkg/pull/11148) [VTK/vtk-m] Update VTK to 9.0 and add vtk-m + - [(#11643)](https://github.com/microsoft/vcpkg/pull/11643) [vtk] Fix single configuration builds + - [(#11708)](https://github.com/microsoft/vcpkg/pull/11708) [python3] Update to Python 3.8 + +- winreg `1.2.1-1` -> `3.1.0` + - [(#10926)](https://github.com/microsoft/vcpkg/pull/10926) [winreg] Update to 2.2.0 + - [(#10976)](https://github.com/microsoft/vcpkg/pull/10976) [WinReg] update to v2.2.2 + - [(#11034)](https://github.com/microsoft/vcpkg/pull/11034) [winreg] Update to 2.2.3 + - [(#11766)](https://github.com/microsoft/vcpkg/pull/11766) [winreg] Update to 2.4.0 + - [(#11883)](https://github.com/microsoft/vcpkg/pull/11883) [WinReg] Update to 3.0.1 + - [(#11888)](https://github.com/microsoft/vcpkg/pull/11888) [WinReg] Update to 3.1.0 + +- libyaml `0.2.2-2` -> `0.2.2-3` + - [(#10908)](https://github.com/microsoft/vcpkg/pull/10908) [libyaml] Fix linkage in non-Windows systems + +- libzippp `2019-07-22` -> `3.1-1.6.1` + - [(#10893)](https://github.com/microsoft/vcpkg/pull/10893) [libzippp] Update to libzippp-v3.1-1.6.1 + +- blend2d `beta_2020-04-15` -> `beta_2020-06-01` + - [(#10891)](https://github.com/microsoft/vcpkg/pull/10891) [blend2d] Update to beta_2020-04-19 + - [(#11155)](https://github.com/microsoft/vcpkg/pull/11155) [blend2d] Update to beta_2020-05-04 + - [(#11778)](https://github.com/microsoft/vcpkg/pull/11778) [blend2d] Update to beta_2020-06-01 + +- pegtl `3.0.0-pre-9d58962` -> `3.0.0-pre-83b6cdc` + - [(#10870)](https://github.com/microsoft/vcpkg/pull/10870) [pegtl] Update to latest commit from 4/5/2020 + - [(#11148)](https://github.com/microsoft/vcpkg/pull/11148) [VTK/vtk-m] Update VTK to 9.0 and add vtk-m + - [(#11531)](https://github.com/microsoft/vcpkg/pull/11531) [pegtl/cppgraphqlgen] matching updates for dependency + +- skyr-url `1.5.1` -> `1.9.0` + - [(#10868)](https://github.com/microsoft/vcpkg/pull/10868) [skyr-url] Bump version to 1.7.0 + - [(#10954)](https://github.com/microsoft/vcpkg/pull/10954) [skyr-url] Updated port to use version 1.7.3 + - [(#11153)](https://github.com/microsoft/vcpkg/pull/11153) [skyr-url] Changed skyr-url version number to 1.7.5 + - [(#11568)](https://github.com/microsoft/vcpkg/pull/11568) [skyr-url] Changed version number to 1.9.0 + - [(#11774)](https://github.com/microsoft/vcpkg/pull/11774) [skyr-url] Changed version number for skyr-url + +- protobuf `3.11.3` -> `3.12.0-2` + - [(#10863)](https://github.com/microsoft/vcpkg/pull/10863) [protobuf] Update to 3.11.4 + - [(#11228)](https://github.com/microsoft/vcpkg/pull/11228) [protobuf] Correct protobuf under android (Fix issue #8218) + - [(#11397)](https://github.com/microsoft/vcpkg/pull/11397) [protobuf] protobuf v3.12.0 + - [(#11504)](https://github.com/microsoft/vcpkg/pull/11504) [protobuf] Fix RPATH error for static build + - [(#11516)](https://github.com/microsoft/vcpkg/pull/11516) [protobuf] Don't redefine PROTOBUF_USE_DLLS + +- sdformat6 `6.2.0` -> `6.2.0-1` + - [(#10859)](https://github.com/microsoft/vcpkg/pull/10859) [sdformat6] Migrate from Bitbucket to GitHub 🤖 + +- ompl `1.4.2-2` -> `1.4.2-4` + - [(#10854)](https://github.com/microsoft/vcpkg/pull/10854) [ompl] Fix ompl[app] build error + - [(#10972)](https://github.com/microsoft/vcpkg/pull/10972) [ompl] Fix patch apply error + +- dlib `19.17-1` -> `19.19-1` + - [(#10826)](https://github.com/microsoft/vcpkg/pull/10826) [dlib] Updated dlib to v19.19 + - [(#11195)](https://github.com/microsoft/vcpkg/pull/11195) [dlib] add more granularity in features + +- arrow `0.17.0` -> `0.17.1` + - [(#10800)](https://github.com/microsoft/vcpkg/pull/10800) [Arrow] Explicitly enable CSV and JSON + - [(#11016)](https://github.com/microsoft/vcpkg/pull/11016) [Arrow] Add filesystem feature + - [(#11472)](https://github.com/microsoft/vcpkg/pull/11472) [Arrow] Update to 0.17.1 + +- ace `6.5.8` -> `6.5.9-5` + - [(#10984)](https://github.com/microsoft/vcpkg/pull/10984) [ace] Add support for MacOSX + - [(#11112)](https://github.com/microsoft/vcpkg/pull/11112) [ace] Update to 6.5.9 + - [(#11369)](https://github.com/microsoft/vcpkg/pull/11369) [ace] Add patch to fix Visual Studio 2019 16.5 internal compiler error + - [(#11441)](https://github.com/microsoft/vcpkg/pull/11441) [ace] Add support for uwp + - [(#11464)](https://github.com/microsoft/vcpkg/pull/11464) [ace] Simplified port file + - [(#11713)](https://github.com/microsoft/vcpkg/pull/11713) [ace] Fix missing cpp files + - [(#11473)](https://github.com/microsoft/vcpkg/pull/11473) [ace] tao as feature + +- libaaplus `2.12` -> `2.12-1` + - [(#10981)](https://github.com/microsoft/vcpkg/pull/10981) [libaaplus] Use versioned download link + +- spscqueue `2019-07-26` -> `1.0` + - [(#10874)](https://github.com/microsoft/vcpkg/pull/10874) [spscqueue] Update to version 1.0 + +- googleapis `0.8.0` -> `alias` + - [(#10994)](https://github.com/microsoft/vcpkg/pull/10994) [googleapis] update to v0.9.0 + - [(#11698)](https://github.com/microsoft/vcpkg/pull/11698) [google-cloud-cpp] Consolidate all google-cloud* packages + +- ms-gsl `3.0.0` -> `3.0.1` + - [(#10993)](https://github.com/microsoft/vcpkg/pull/10993) [ms-gsl] Update to 3.0.1 + +- ryu `2.0-1` -> `2.0-2` + - [(#10989)](https://github.com/microsoft/vcpkg/pull/10989) [ryu]Ryu include fix + +- glm `0.9.9.7` -> `0.9.9.8` + - [(#10977)](https://github.com/microsoft/vcpkg/pull/10977) [glm, sqlitecpp] update to new version + +- sqlitecpp `2.3.0-1` -> `3.0.0` + - [(#10977)](https://github.com/microsoft/vcpkg/pull/10977) [glm, sqlitecpp] update to new version + +- nngpp `1.2.4` -> `1.3.0` + - [(#10975)](https://github.com/microsoft/vcpkg/pull/10975) [nngpp] Update to 1.3.0 + +- libvpx `1.8.1-1` -> `1.8.1-5` + - [(#10952)](https://github.com/microsoft/vcpkg/pull/10952) [libvpx][mpg123] Fix use of YASM in MSBuild (via path) + - [(#11058)](https://github.com/microsoft/vcpkg/pull/11058) [msbuild]fix use UseEnv-True + - [(#11022)](https://github.com/microsoft/vcpkg/pull/11022) [libvpx] Added support for build on MacOS and Linux + - [(#11500)](https://github.com/microsoft/vcpkg/pull/11500) [libvpx] Change default target on Unix + - [(#11795)](https://github.com/microsoft/vcpkg/pull/11795) [libvpx] Add cmake config file + +- mpg123 `1.25.8-6` -> `1.25.8-9` + - [(#10952)](https://github.com/microsoft/vcpkg/pull/10952) [libvpx][mpg123] Fix use of YASM in MSBuild (via path) + - [(#11058)](https://github.com/microsoft/vcpkg/pull/11058) [msbuild]fix use UseEnv-True + - [(#11287)](https://github.com/microsoft/vcpkg/pull/11287) [mpg123] Enable UWP support + - [(#11896)](https://github.com/microsoft/vcpkg/pull/11896) [vcpkg baseline] Fix baseline error + +- qt5-3d `5.12.5-1` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-activeqt `5.12.5-1` -> `5.12.8-1` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + - [(#11045)](https://github.com/microsoft/vcpkg/pull/11045) [qt5] reactivate qt5-activeqt for CI coverage + +- qt5-base `5.12.5-13` -> `5.12.8-4` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + - [(#11111)](https://github.com/microsoft/vcpkg/pull/11111) [qt5] Add -j to make to parallelize on Linux and MacOS + - [(#11371)](https://github.com/microsoft/vcpkg/pull/11371) [qt5-base] Add Xorg dependency libx11-xcb-dev + - [(#11416)](https://github.com/microsoft/vcpkg/pull/11416) [harfbuzz,skia] Update and replace Skia dependencies with vcpkg + - [(#11483)](https://github.com/microsoft/vcpkg/pull/11483) [vcpkg] Allow CI to pass in all relevant directories and remove use of symbolic links + +- qt5-charts `5.12.5-1` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-connectivity `5.12.5-1` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-datavis3d `5.12.5-1` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-declarative `5.12.5-1` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-gamepad `5.12.5-2` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-graphicaleffects `5.12.5-2` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-imageformats `5.12.5-3` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-location `5.12.5-2` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-macextras `5.12.5` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-mqtt `5.12.5` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-multimedia `5.12.5-1` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-networkauth `5.12.5-1` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-purchasing `5.12.5-2` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-quickcontrols `5.12.5-1` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-quickcontrols2 `5.12.5-1` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-remoteobjects `5.12.5-2` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-script `5.12.5-1` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-scxml `5.12.5` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-sensors `5.12.5-2` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-serialport `5.12.5-1` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-speech `5.12.5-1` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-svg `5.12.5` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-tools `5.12.5-5` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-virtualkeyboard `5.12.5-1` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-webchannel `5.12.5-2` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-websockets `5.12.5` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-webview `5.12.5-1` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-winextras `5.12.5-1` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5-xmlpatterns `5.12.5-1` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- qt5 `5.12.5` -> `5.12.8` + - [(#10644)](https://github.com/microsoft/vcpkg/pull/10644) [Qt[latest]] Update to 5.14.2 + - [(#10749)](https://github.com/microsoft/vcpkg/pull/10749) [Qt5] Update qt to 5.12.8 + +- libzip `rel-1-5-2--1` -> `rel-1-6-1` + - [(#10784)](https://github.com/microsoft/vcpkg/pull/10784) [libzip] update to rel-1-6-1 + +- nng `1.2.5` -> `1.3.0` + - [(#10974)](https://github.com/microsoft/vcpkg/pull/10974) [nng] Update to 1.3.0 + +- libmupdf `1.16.1` -> `1.16.1-1` + - [(#10708)](https://github.com/microsoft/vcpkg/pull/10708) [libmupdf] fix build error on Linux + +- catch2 `2.11.3` -> `2.12.1` + - [(#10996)](https://github.com/microsoft/vcpkg/pull/10996) [catch2] Update to 2.12.1 + +- websocketpp `0.8.1-1` -> `0.8.2` + - [(#10969)](https://github.com/microsoft/vcpkg/pull/10969) [websocketpp] Update to 0.8.2 + +- coroutine `2020-01-13` -> `1.5.0` + - [(#10692)](https://github.com/microsoft/vcpkg/pull/10692) [coroutine] update to 1.5.0 + +- boost-modular-build-helper `1.72.0-1` -> `1.73.0-1` + - [(#10285)](https://github.com/microsoft/vcpkg/pull/10285) [boost-modular-build-helper] Support Clang '--target=' syntax to enable Android builds + - [(#10814)](https://github.com/microsoft/vcpkg/pull/10814) [boost-modular-build] Fix lack of arm64-linux support + - [(#11427)](https://github.com/microsoft/vcpkg/pull/11427) [boost] MinGW build fixes + +- openssl-unix `1.1.1d-2` -> `1.1.1d-4` + - [(#10450)](https://github.com/microsoft/vcpkg/pull/10450) [openssl-unix] Update header path for shared library compilation + - [(#11344)](https://github.com/microsoft/vcpkg/pull/11344) [openssl-unix] Fix openssl-unix android build + +- sdl2-gfx `1.0.4-5` -> `1.0.4-6` + - [(#10575)](https://github.com/microsoft/vcpkg/pull/10575) [sdl2-gfx] Fix build error on non windows + +- hwloc `1.11.7-3` -> `1.11.7-4` + - [(#10615)](https://github.com/microsoft/vcpkg/pull/10615) [hwloc] Support UNIX + +- pixel `0.3` -> `0.3-1` + - [(#10638)](https://github.com/microsoft/vcpkg/pull/10638) [pixel] Add warning message on Linux + +- qt-advanced-docking-system `2019-08-14-1` -> `3.2.5-1` + - [(#10170)](https://github.com/microsoft/vcpkg/pull/10170) [qt-advanced-docking-system] updated qt-advanced-docking-system to 3.2.1 + - [(#10980)](https://github.com/microsoft/vcpkg/pull/10980) [vcpkg] Onboard Linux to VMSS, open 'git' port, and switch back to Azure Spot + +- libarchive `3.4.1-1` -> `3.4.1-3` + - [(#11044)](https://github.com/microsoft/vcpkg/pull/11044) [libarchive] expose zstd as a build feature + - [(#11570)](https://github.com/microsoft/vcpkg/pull/11570) [libarchive] Disable C4061 which causes build to fail in Visual Studio 2019 16.6 + +- azure-kinect-sensor-sdk `1.4.0-alpha.0-2` -> `1.4.0-alpha.0-5` + - [(#11033)](https://github.com/microsoft/vcpkg/pull/11033) [azure-kinect-sensor-sdk] Fix pipeline error + - [(#10253)](https://github.com/microsoft/vcpkg/pull/10253) [imgui] Add feature bindings and remove feature example + - [(#11116)](https://github.com/microsoft/vcpkg/pull/11116) [azure-kinect-sensor-sdk] Disable parallel configure due to source directory writes + - [(#11139)](https://github.com/microsoft/vcpkg/pull/11139) [azure-kinect-sensor-sdk] Fix Deploy Azure Kinect Sensor SDK on Windows + +- range-v3 `0.10.0` -> `0.10.0-20200425` + - [(#11031)](https://github.com/microsoft/vcpkg/pull/11031) [range-v3] Update to new version. + +- ode `0.16` -> `0.16.1` + - [(#11029)](https://github.com/microsoft/vcpkg/pull/11029) [ode] Bump version to 0.16.1 + +- boost-coroutine `1.72.0` -> `1.73.0` + - [(#10988)](https://github.com/microsoft/vcpkg/pull/10988) [boost-coroutine] Add patch from boost.org + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- libtorrent `1.2.2-1` -> `1.2.7` + - [(#10686)](https://github.com/microsoft/vcpkg/pull/10686) [libtorrent] Update to 1.2.6 and add features + - [(#11257)](https://github.com/microsoft/vcpkg/pull/11257) [libtorrent] add iconv feature on windows and clean up portfile + - [(#11389)](https://github.com/microsoft/vcpkg/pull/11389) [libtorrent] minor portfile simplification and version bump + - [(#11709)](https://github.com/microsoft/vcpkg/pull/11709) [libtorrent] Update to 1.2.7 + +- geos `3.6.3-3` -> `3.6.4` + - [(#10377)](https://github.com/microsoft/vcpkg/pull/10377) [geos] Upgrade to GEOS 3.6.4 + +- egl-registry `2020-02-03` -> `2020-02-20` + - [(#10676)](https://github.com/microsoft/vcpkg/pull/10676) [egl-registry, opengl-registry] Update egl-registry to 2020-02-20 and opengl-registry to 2020-03-25 + +- opengl-registry `2020-02-03` -> `2020-03-25` + - [(#10676)](https://github.com/microsoft/vcpkg/pull/10676) [egl-registry, opengl-registry] Update egl-registry to 2020-02-20 and opengl-registry to 2020-03-25 + +- murmurhash `2016-01-09` -> `2016-01-09-3` + - [(#11011)](https://github.com/microsoft/vcpkg/pull/11011) [murmurhash] installation fix + - [(#10767)](https://github.com/microsoft/vcpkg/pull/10767) [cmake] Update to 3.17.2 + +- gts `0.7.6-1` -> `0.7.6-3` + - [(#10055)](https://github.com/microsoft/vcpkg/pull/10055) [gts] Support for build with cmake in unix + - [(#10767)](https://github.com/microsoft/vcpkg/pull/10767) [cmake] Update to 3.17.2 + - [(#11884)](https://github.com/microsoft/vcpkg/pull/11884) [glib/gts] Add pkgconfig files + +- icu `65.1-3` -> `67.1` + - [(#10656)](https://github.com/microsoft/vcpkg/pull/10656) [icu] Fix configure failure due to not finding python + - [(#11714)](https://github.com/microsoft/vcpkg/pull/11714) [icu] Update to 67.1 + +- ffmpeg `4.2-7` -> `4.2-9` + - [(#8797)](https://github.com/microsoft/vcpkg/pull/8797) [ffmpeg] Fix ffmpeg[opencl, openssl, lzma] static build failed + - [(#11443)](https://github.com/microsoft/vcpkg/pull/11443) [vcpkg-acquire-msys] Update pacman before any other package. + - [(#11810)](https://github.com/microsoft/vcpkg/pull/11810) [vcpkg-acquire-msys] Improvement + +- liblzma `5.2.4-4` -> `5.2.4-5` + - [(#8797)](https://github.com/microsoft/vcpkg/pull/8797) [ffmpeg] Fix ffmpeg[opencl, openssl, lzma] static build failed + +- cpprestsdk `2.10.15-1` -> `2.10.16-2` + - [(#11018)](https://github.com/microsoft/vcpkg/pull/11018) [cpprestsdk] Update to v2.10.16 + - [(#11694)](https://github.com/microsoft/vcpkg/pull/11694) [cpprestsdk] Avoid using pkg-config to find OpenSSL libraries on Linux + - [(#11867)](https://github.com/microsoft/vcpkg/pull/11867) [cpprestsdk] Fix find dependency openssl + +- harfbuzz `2.5.3` -> `2.6.6` + - [(#11082)](https://github.com/microsoft/vcpkg/pull/11082) [harfbuzz] Change build depends from freetype to freetype[core] + - [(#11416)](https://github.com/microsoft/vcpkg/pull/11416) [harfbuzz,skia] Update and replace Skia dependencies with vcpkg + +- pcl `1.9.1-11` -> `1.9.1-13` + - [(#11047)](https://github.com/microsoft/vcpkg/pull/11047) [pcl] Fix link to libpng + - [(#11148)](https://github.com/microsoft/vcpkg/pull/11148) [VTK/vtk-m] Update VTK to 9.0 and add vtk-m + +- armadillo `2019-04-16-6` -> `2019-04-16-8` + - [(#11063)](https://github.com/microsoft/vcpkg/pull/11063) [armadillo] Add dependent port superlu on osx + +- abseil `2020-03-03-3` -> `2020-03-03-6` + - [(#11039)](https://github.com/microsoft/vcpkg/pull/11039) [abseil] Configure abseil to use std:: types when feature cxx17 is enabled + - [(#11630)](https://github.com/microsoft/vcpkg/pull/11630) [abseil] Fix arm build + - [(#11827)](https://github.com/microsoft/vcpkg/pull/11827) [abseil] Enable dynamic build on Windows + +- metrohash `1.1.3` -> `1.1.3-1` + - [(#10992)](https://github.com/microsoft/vcpkg/pull/10992) [metrohash] installation fix + - [(#10767)](https://github.com/microsoft/vcpkg/pull/10767) [cmake] Update to 3.17.2 + +- nana `1.7.2-1` -> `1.7.2-3` + - [(#10936)](https://github.com/microsoft/vcpkg/pull/10936) [nana] Revert 1 darkcacok patch nana + - [(#11494)](https://github.com/microsoft/vcpkg/pull/11494) [basisu, gppanel, msgpack11, nana, rapidcheck, folly] Add missing header file of STL + +- alembic `1.7.12` -> `1.7.12-1` + - [(#10912)](https://github.com/microsoft/vcpkg/pull/10912) [alembic] linux fixes + +- civetweb `2019-07-05-1` -> `1.12` + - [(#10591)](https://github.com/microsoft/vcpkg/pull/10591) [civetweb] Update to version 1.12 + +- argh `2018-12-18-1` -> `2018-12-18-2` + - [(#10980)](https://github.com/microsoft/vcpkg/pull/10980) [vcpkg] Onboard Linux to VMSS, open 'git' port, and switch back to Azure Spot + +- ceres `1.14.0-6` -> `1.14.0-7` + - [(#10980)](https://github.com/microsoft/vcpkg/pull/10980) [vcpkg] Onboard Linux to VMSS, open 'git' port, and switch back to Azure Spot + - [(#11200)](https://github.com/microsoft/vcpkg/pull/11200) [ceres] Added patch to add find_dependency() for suitesparse targets downstream + +- idevicerestore `1.0.12-3` -> `1.0.12-4` + - [(#10980)](https://github.com/microsoft/vcpkg/pull/10980) [vcpkg] Onboard Linux to VMSS, open 'git' port, and switch back to Azure Spot + - [(#11074)](https://github.com/microsoft/vcpkg/pull/11074) [idevicerestore] Fix libgen.h cannot be found + +- openblas `0.3.7` -> `0.3.9-1` + - [(#10980)](https://github.com/microsoft/vcpkg/pull/10980) [vcpkg] Onboard Linux to VMSS, open 'git' port, and switch back to Azure Spot + +- imgui `1.74` -> `1.76-1` + - [(#10253)](https://github.com/microsoft/vcpkg/pull/10253) [imgui] Add feature bindings and remove feature example + - [(#11388)](https://github.com/microsoft/vcpkg/pull/11388) [imgui] Update to 1.76 + +- libigl `2.1.0-1` -> `2.1.0-2` + - [(#10253)](https://github.com/microsoft/vcpkg/pull/10253) [imgui] Add feature bindings and remove feature example + +- opencv4 `4.1.1-3` -> `4.1.1-6` + - [(#10886)](https://github.com/microsoft/vcpkg/pull/10886) [opencv4] Add GTK support for opencv4 portfile + - [(#7849)](https://github.com/microsoft/vcpkg/pull/7849) [OpenCV2] add new "old" port + - [(#11201)](https://github.com/microsoft/vcpkg/pull/11201) [opencv4] Changed dependency on qt5 to qt5-base, closes microsoft/vcpkg#11138 + - [(#11429)](https://github.com/microsoft/vcpkg/pull/11429) [opencv4] Fix linking halide + +- libbson `1.15.1-1` -> `1.16.1` + - [(#10010)](https://github.com/microsoft/vcpkg/pull/10010) [libbson/mongo-c-driver] Update to 1.16.1 + +- mongo-c-driver `1.15.1-1` -> `1.16.1-1` + - [(#10010)](https://github.com/microsoft/vcpkg/pull/10010) [libbson/mongo-c-driver] Update to 1.16.1 + - [(#11217)](https://github.com/microsoft/vcpkg/pull/11217) [mongo-c-driver] Fix find_package error + +- mongo-cxx-driver `3.4.0-4` -> `3.4.0-5` + - [(#10010)](https://github.com/microsoft/vcpkg/pull/10010) [libbson/mongo-c-driver] Update to 1.16.1 + - [(#11584)](https://github.com/microsoft/vcpkg/pull/11584) [mongo-cxx-driver] Patch std::atomic P0883 changes + +- cpuinfo `2019-07-28` -> `2019-07-28-1` + - [(#8749)](https://github.com/microsoft/vcpkg/pull/8749) [vcpkg] Add new function vcpkg_copy_tools + +- czmq `2019-06-10-3` -> `2019-06-10-4` + - [(#8749)](https://github.com/microsoft/vcpkg/pull/8749) [vcpkg] Add new function vcpkg_copy_tools + +- libsvm `323` -> `323-1` + - [(#8749)](https://github.com/microsoft/vcpkg/pull/8749) [vcpkg] Add new function vcpkg_copy_tools + +- nanomsg `1.1.5-1` -> `1.1.5-2` + - [(#8749)](https://github.com/microsoft/vcpkg/pull/8749) [vcpkg] Add new function vcpkg_copy_tools + +- uriparser `0.9.3-4` -> `0.9.3-5` + - [(#8749)](https://github.com/microsoft/vcpkg/pull/8749) [vcpkg] Add new function vcpkg_copy_tools + +- zyre `2019-07-07` -> `2019-07-07-1` + - [(#8749)](https://github.com/microsoft/vcpkg/pull/8749) [vcpkg] Add new function vcpkg_copy_tools + +- halide `release_2019_08_27-2` -> `master_2020_03_07` + - [(#10295)](https://github.com/microsoft/vcpkg/pull/10295) [llvm] Update to version 10.0.0 and add new features + +- llvm `8.0.0-5` -> `10.0.0-3` + - [(#10295)](https://github.com/microsoft/vcpkg/pull/10295) [llvm] Update to version 10.0.0 and add new features + - [(#11174)](https://github.com/microsoft/vcpkg/pull/11174) [vcpkg] [llvm] Bump Linux VM memory size and do all operations on the temporary disk. + - [(#11268)](https://github.com/microsoft/vcpkg/pull/11268) [llvm] add more backend options, fix issues + - [(#11703)](https://github.com/microsoft/vcpkg/pull/11703) [llvm] fix llvm-tblgen build with MSVC v19.26 + +- sciter `4.4.1.5` -> `4.4.3.20` + - [(#11161)](https://github.com/microsoft/vcpkg/pull/11161) [sciter] Update to 4.4.3.15.7771 + - [(#11393)](https://github.com/microsoft/vcpkg/pull/11393) [sciter] Update to 4.4.3.18.7817 + - [(#11723)](https://github.com/microsoft/vcpkg/pull/11723) [sciter] Update to 4.4.3.20.7852 + +- apr-util `1.6.0-5` -> `1.6.1-1` + - [(#8579)](https://github.com/microsoft/vcpkg/pull/8579) [apr apr-util] Apr and apr-util for non windows systems + - [(#11559)](https://github.com/microsoft/vcpkg/pull/11559) [VCPKG baseline] Fix many ports + +- apr `1.6.5-3` -> `1.7.0` + - [(#8579)](https://github.com/microsoft/vcpkg/pull/8579) [apr apr-util] Apr and apr-util for non windows systems + +- opencv3 `3.4.7-2` -> `3.4.7-3` + - [(#7849)](https://github.com/microsoft/vcpkg/pull/7849) [OpenCV2] add new "old" port + - [(#11201)](https://github.com/microsoft/vcpkg/pull/11201) [opencv4] Changed dependency on qt5 to qt5-base, closes microsoft/vcpkg#11138 + +- gtest `2019-10-09-1` -> `1.10.0` + - [(#10963)](https://github.com/microsoft/vcpkg/pull/10963) [gtest] Rollback to a release version. + +- ignition-cmake0 `0.6.2-1` -> `0.6.2-2` + - [(#10858)](https://github.com/microsoft/vcpkg/pull/10858) [ignition-modular-scripts] Migrate from Bitbucket to GitHub 🤖 + +- ignition-cmake2 `2.1.1` -> `2.2.0-1` + - [(#10858)](https://github.com/microsoft/vcpkg/pull/10858) [ignition-modular-scripts] Migrate from Bitbucket to GitHub 🤖 + - [(#11232)](https://github.com/microsoft/vcpkg/pull/11232) [ignition-math6] Add new port 🤖 + - [(#11270)](https://github.com/microsoft/vcpkg/pull/11270) [eigen3] [ignition-modularscripts] Fix installed pkgconfig files + +- ignition-common1 `1.1.1` -> `1.1.1-1` + - [(#10858)](https://github.com/microsoft/vcpkg/pull/10858) [ignition-modular-scripts] Migrate from Bitbucket to GitHub 🤖 + +- ignition-fuel-tools1 `1.2.0` -> `1.2.0-2` + - [(#10858)](https://github.com/microsoft/vcpkg/pull/10858) [ignition-modular-scripts] Migrate from Bitbucket to GitHub 🤖 + - [(#11270)](https://github.com/microsoft/vcpkg/pull/11270) [eigen3] [ignition-modularscripts] Fix installed pkgconfig files + +- ignition-math4 `4.0.0` -> `4.0.0-1` + - [(#10858)](https://github.com/microsoft/vcpkg/pull/10858) [ignition-modular-scripts] Migrate from Bitbucket to GitHub 🤖 + +- ignition-modularscripts `2020-02-10` -> `2020-05-09` + - [(#10858)](https://github.com/microsoft/vcpkg/pull/10858) [ignition-modular-scripts] Migrate from Bitbucket to GitHub 🤖 + - [(#11270)](https://github.com/microsoft/vcpkg/pull/11270) [eigen3] [ignition-modularscripts] Fix installed pkgconfig files + +- ignition-msgs1 `1.0.0` -> `1.0.0-1` + - [(#10858)](https://github.com/microsoft/vcpkg/pull/10858) [ignition-modular-scripts] Migrate from Bitbucket to GitHub 🤖 + +- ignition-transport4 `4.0.0` -> `4.0.0-2` + - [(#10858)](https://github.com/microsoft/vcpkg/pull/10858) [ignition-modular-scripts] Migrate from Bitbucket to GitHub 🤖 + - [(#11270)](https://github.com/microsoft/vcpkg/pull/11270) [eigen3] [ignition-modularscripts] Fix installed pkgconfig files + +- cuda `10.1` -> `10.1-1` + - [(#10838)](https://github.com/microsoft/vcpkg/pull/10838) [cuda] Fix find cuda in UNIX + +- libiconv `1.16-1` -> `1.16-3` + - [(#9832)](https://github.com/microsoft/vcpkg/pull/9832) libiconv - Fix ICONV_CONST + - [(#11586)](https://github.com/microsoft/vcpkg/pull/11586) [vcpkg-baseline][zxing-cpp] Fix build failure + +- glib `2.52.3-14-5` -> `2.52.3-14-7` + - [(#10856)](https://github.com/microsoft/vcpkg/pull/10856) [glib] Update the usage of string(TOUPPER ...) + - [(#11884)](https://github.com/microsoft/vcpkg/pull/11884) [glib/gts] Add pkgconfig files + +- freerdp `2.0.0-rc4-7` -> `2.0.0-1` + - [(#11051)](https://github.com/microsoft/vcpkg/pull/11051) [freerdp] Update to 2.0.0 + - [(#11639)](https://github.com/microsoft/vcpkg/pull/11639) [freerdp] Optional 'urbdrc' feature + +- wxwidgets `3.1.3` -> `3.1.3-1` + - [(#11178)](https://github.com/microsoft/vcpkg/pull/11178) [wxwidgets] Apply fix to wxWidgets for copy and paste macOS + +- libsquish `1.15-2` -> `1.15-3` + - [(#11124)](https://github.com/microsoft/vcpkg/pull/11124) [libsquish] add missing SQUISH_EXPORT + +- bitserializer-cpprestjson `0.8` -> `alias` + - [(#11157)](https://github.com/microsoft/vcpkg/pull/11157) [BitSerializer] Update to version 0.9 + - [(#11683)](https://github.com/microsoft/vcpkg/pull/11683) [bitserializer] Update to new version 0.10 + +- bitserializer-rapidjson `0.8` -> `alias` + - [(#11157)](https://github.com/microsoft/vcpkg/pull/11157) [BitSerializer] Update to version 0.9 + - [(#11683)](https://github.com/microsoft/vcpkg/pull/11683) [bitserializer] Update to new version 0.10 + +- bitserializer `0.8` -> `0.9` + - [(#11157)](https://github.com/microsoft/vcpkg/pull/11157) [BitSerializer] Update to version 0.9 + - [(#11683)](https://github.com/microsoft/vcpkg/pull/11683) [bitserializer] Update to new version 0.10 + +- gsoap `2.8.93-2` -> `2.8.93-3` + - [(#11048)](https://github.com/microsoft/vcpkg/pull/11048) [gsoap] Add supports for gsoap + - [(#11355)](https://github.com/microsoft/vcpkg/pull/11355) [gSoap] Update to 2.8.102 and re-enable x64 Builds + +- lua `5.3.5-3` -> `5.3.5-5` + - [(#11163)](https://github.com/microsoft/vcpkg/pull/11163) [lua] Compile as position-independent code + - [(#11870)](https://github.com/microsoft/vcpkg/pull/11870) [lua] Add vcpkg-cmake-wrapper + +- gainput `1.0.0-2` -> `1.0.0-3` + - [(#11000)](https://github.com/microsoft/vcpkg/pull/11000) [gainput] imporve cmake search gainput library + +- opencl `2.2-2` -> `2.2-2-1` + - [(#10567)](https://github.com/microsoft/vcpkg/pull/10567) [opencl] Add build type when installing targets + +- azure-iot-sdk-c `2020-02-04.1` -> `2020-02-04.1-1` + - [(#11017)](https://github.com/microsoft/vcpkg/pull/11017) [azure-iot-sdk-c] Fixed the CMake config export. + +- sfml `2.5.1-6` -> `2.5.1-7` + - [(#11246)](https://github.com/microsoft/vcpkg/pull/11246) [sfml] Remove unnecessary patch + +- asmjit `2020-02-08` -> `2020-05-08` + - [(#11245)](https://github.com/microsoft/vcpkg/pull/11245) [asmjit] Update to the latest commit + +- libpq `12.0-1` -> `12.2-2` + - [(#11223)](https://github.com/microsoft/vcpkg/pull/11223) [libpq] link libdl on linux + - [(#10915)](https://github.com/microsoft/vcpkg/pull/10915) [libpq] Update to 12.2 and some feature fixes + - [(#10402)](https://github.com/microsoft/vcpkg/pull/10402) [vcpkg] Improve make builds + - [(#11612)](https://github.com/microsoft/vcpkg/pull/11612) [vcpkg baseline] Fix baseline failures + - [(#11483)](https://github.com/microsoft/vcpkg/pull/11483) [vcpkg] Allow CI to pass in all relevant directories and remove use of symbolic links + +- allegro5 `5.2.5.0` -> `5.2.6.0` + - [(#11187)](https://github.com/microsoft/vcpkg/pull/11187) [Allegro] Update to 5.2.6.0 + +- lz4 `1.9.2-1` -> `1.9.2-2` + - [(#11148)](https://github.com/microsoft/vcpkg/pull/11148) [VTK/vtk-m] Update VTK to 9.0 and add vtk-m + +- pegtl-2 `2.8.1` -> `2.8.1-1` + - [(#11148)](https://github.com/microsoft/vcpkg/pull/11148) [VTK/vtk-m] Update VTK to 9.0 and add vtk-m + +- vtk-dicom `0.8.12` -> `0.8.12-1` + - [(#11148)](https://github.com/microsoft/vcpkg/pull/11148) [VTK/vtk-m] Update VTK to 9.0 and add vtk-m + +- libzen `0.4.37` -> `0.4.38` + - [(#11237)](https://github.com/microsoft/vcpkg/pull/11237) [libzen] Update to 0.4.38 + +- speexdsp `1.2.0-1` -> `1.2.0-2` + - [(#11218)](https://github.com/microsoft/vcpkg/pull/11218) [speexdsp] Change repo to github + +- restclient-cpp `0.5.1-3` -> `0.5.2` + - [(#9717)](https://github.com/microsoft/vcpkg/pull/9717) [restclient-cpp] Fix portfile and update version. + +- libpng `1.6.37-7` -> `1.6.37-9` + - [(#11162)](https://github.com/microsoft/vcpkg/pull/11162) [libpng] Fix missing symbols when compiling for ARM + - [(#11280)](https://github.com/microsoft/vcpkg/pull/11280) [libpng] Fix android build + +- capstone `4.0.1-120373dc` -> `4.0.2` + - [(#11250)](https://github.com/microsoft/vcpkg/pull/11250) [capstone] Update to 4.0.2 + +- nuspell `3.1.0` -> `3.1.1` + - [(#11291)](https://github.com/microsoft/vcpkg/pull/11291) [nuspell] update port to v3.1.1 + +- zydis `3.1.0` -> `3.1.0-1` + - [(#11173)](https://github.com/microsoft/vcpkg/pull/11173) Update zydis portfile.cmake + +- glog `0.4.0-2` -> `0.4.0-3` + - [(#11288)](https://github.com/microsoft/vcpkg/pull/11288) [glog] Disable tests + +- opus `1.3.1-2` -> `1.3.1-3` + - [(#11279)](https://github.com/microsoft/vcpkg/pull/11279) [opus] Update port to 1.3.1-2 + +- eigen3 `3.3.7-4` -> `3.3.7-5` + - [(#11270)](https://github.com/microsoft/vcpkg/pull/11270) [eigen3] [ignition-modularscripts] Fix installed pkgconfig files + +- nlopt `2.6.1-1` -> `2.6.2-1` + - [(#11254)](https://github.com/microsoft/vcpkg/pull/11254) [nlopt] Update to 2.6.2 + - [(#11398)](https://github.com/microsoft/vcpkg/pull/11398) [nlopt] Enable UWP support + +- string-theory `3.1` -> `3.2` + - [(#11310)](https://github.com/microsoft/vcpkg/pull/11310) [string-theory] Update to 3.2 + +- miniz `2.1.0` -> `2.1.0-1` + - [(#11316)](https://github.com/microsoft/vcpkg/pull/11316) [miniz] Fix broken cmake config file + +- z3 `4.8.6` -> `4.8.8` + - [(#11314)](https://github.com/microsoft/vcpkg/pull/11314) [z3] update port to 4.8.8 + +- jsoncons `0.150.0` -> `0.153.0` + - [(#11311)](https://github.com/microsoft/vcpkg/pull/11311) [jsoncons] Update to v0.151.0 + - [(#11505)](https://github.com/microsoft/vcpkg/pull/11505) [jsoncons] Update to v0.152.0 + - [(#11699)](https://github.com/microsoft/vcpkg/pull/11699) [jsoncons] Update to v0.153.0 + +- units `2.3.0` -> `2.3.1` + - [(#11308)](https://github.com/microsoft/vcpkg/pull/11308) [units] Update to 2.3.1 + +- boost-accumulators `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-algorithm `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-align `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-any `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-array `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-asio `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-assert `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-assign `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-atomic `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-beast `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-bimap `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-bind `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-build `1.72.0` -> `1.73.0-1` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + - [(#11427)](https://github.com/microsoft/vcpkg/pull/11427) [boost] MinGW build fixes + +- boost-callable-traits `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-chrono `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-circular-buffer `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-compatibility `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-compute `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-concept-check `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-config `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-container-hash `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-container `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-context `1.72.0` -> `1.73.0-1` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + - [(#11692)](https://github.com/microsoft/vcpkg/pull/11692) [vcpkg baseline] Remove passing port from Ci baseline + +- boost-contract `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-conversion `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-convert `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-core `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-coroutine2 `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-crc `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-date-time `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-detail `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-dll `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-dynamic-bitset `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-endian `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-exception `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-fiber `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-filesystem `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-flyweight `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-foreach `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-format `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-function-types `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-function `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-functional `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-fusion `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-geometry `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-gil `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-graph-parallel `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- boost-graph `1.72.0` -> `1.73.0` + - [(#11221)](https://github.com/microsoft/vcpkg/pull/11221) [boost] update to 1.73.0 + +- sobjectizer `5.7.0` -> `5.7.0.1` + - [(#11276)](https://github.com/microsoft/vcpkg/pull/11276) [sobjectizer] update to v.5.7.0.1. + +- imgui-sfml `2.1` -> `2.1-1` + - [(#10840)](https://github.com/microsoft/vcpkg/pull/10840) [imgui-sfml] Force imgui-sfml to be a static library + +- gdcm `3.0.4` -> `3.0.5` + - [(#11258)](https://github.com/microsoft/vcpkg/pull/11258) [gdcm] Update to version 3.0.5 + +- opengl `0.0-5` -> `0.0-6` + - [(#11294)](https://github.com/microsoft/vcpkg/pull/11294) [OpenGL] Fix lib files copy when VCPKG_BUILD_TYPE is set + +- libmysql `8.0.4-7` -> `8.0.20` + - [(#11303)](https://github.com/microsoft/vcpkg/pull/11303) [libmysql] Update to 8.0.20 + +- libodb-mysql `2.4.0-6` -> `2.4.0-7` + - [(#11303)](https://github.com/microsoft/vcpkg/pull/11303) [libmysql] Update to 8.0.20 + +- ogre-next `2019-10-20` -> `2019-10-20-1` + - [(#11325)](https://github.com/microsoft/vcpkg/pull/11325) [ogre/ogre-next] Add conflict error message + +- ogre `1.12.1` -> `1.12.1-1` + - [(#11325)](https://github.com/microsoft/vcpkg/pull/11325) [ogre/ogre-next] Add conflict error message + +- paho-mqttpp3 `1.0.1-3` -> `1.1` + - [(#11327)](https://github.com/microsoft/vcpkg/pull/11327) [paho-mqttpp3] update to 1.1 + +- gsl-lite `0.36.0` -> `0.37.0` + - [(#11351)](https://github.com/microsoft/vcpkg/pull/11351) [gsl-lite] update to 0.37.0 + +- restinio `0.6.6` -> `0.6.8` + - [(#11367)](https://github.com/microsoft/vcpkg/pull/11367) [restinio] update to v.0.6.8 + +- tiff `4.0.10-8` -> `4.0.10-9` + - [(#11364)](https://github.com/microsoft/vcpkg/pull/11364) [tiff] Install runtime deps for tiff[tool] + +- sqlite3 `3.31.1` -> `3.32.1` + - [(#11267)](https://github.com/microsoft/vcpkg/pull/11267) [sqlite3] Enable build for android + - [(#11635)](https://github.com/microsoft/vcpkg/pull/11635) [sqlite3] update to 3.32 + - [(#11716)](https://github.com/microsoft/vcpkg/pull/11716) [sqlite] Updated to 3.32.1 to fix a security vulnerability + +- aws-sdk-cpp `1.7.270` -> `1.7.333` + - [(#11332)](https://github.com/microsoft/vcpkg/pull/11332) [aws-sdk-cpp] Update to 1.7.333 + +- libxml2 `2.9.9-5` -> `2.9.9-6` + - [(#11072)](https://github.com/microsoft/vcpkg/pull/11072) [libxml2] Add iconv and charset linkage in vcpkg-cmake-wrapper on osx + +- libgo `2.8-2` -> `3.1-1` + - [(#11263)](https://github.com/microsoft/vcpkg/pull/11263) [libgo] Update to 3.1 + - [(#11435)](https://github.com/microsoft/vcpkg/pull/11435) [libgo] Update CONTROL file for typo + +- ixwebsocket `9.1.9` -> `9.6.2` + - [(#11030)](https://github.com/microsoft/vcpkg/pull/11030) [ixwebsocket] update to 9.6.2 + +- cpuid `0.4.1` -> `0.4.1-1` + - [(#10767)](https://github.com/microsoft/vcpkg/pull/10767) [cmake] Update to 3.17.2 + +- dmlc `2019-08-12-1` -> `2019-08-12-4` + - [(#10767)](https://github.com/microsoft/vcpkg/pull/10767) [cmake] Update to 3.17.2 + - [(#11612)](https://github.com/microsoft/vcpkg/pull/11612) [vcpkg baseline] Fix baseline failures + - [(#11896)](https://github.com/microsoft/vcpkg/pull/11896) [vcpkg baseline] Fix baseline error + +- libnice `0.1.15-2` -> `0.1.15-3` + - [(#10767)](https://github.com/microsoft/vcpkg/pull/10767) [cmake] Update to 3.17.2 + +- magnum `2019.10-1` -> `2019.10-2` + - [(#10767)](https://github.com/microsoft/vcpkg/pull/10767) [cmake] Update to 3.17.2 + +- mlpack `3.2.2-1` -> `3.2.2-3` + - [(#10767)](https://github.com/microsoft/vcpkg/pull/10767) [cmake] Update to 3.17.2 + - [(#11785)](https://github.com/microsoft/vcpkg/pull/11785) [mlpack] Explicitly depend on stb + +- nanodbc `2.12.4-5` -> `2.12.4-8` + - [(#10767)](https://github.com/microsoft/vcpkg/pull/10767) [cmake] Update to 3.17.2 + - [(#11613)](https://github.com/microsoft/vcpkg/pull/11613) [vcpkg-baseline][unixodbc/nanodbc] Fix unixodbc build failure and set it as a dependency on nanodbc + +- osg `3.6.4-2` -> `3.6.4-3` + - [(#10767)](https://github.com/microsoft/vcpkg/pull/10767) [cmake] Update to 3.17.2 + - [(#11715)](https://github.com/microsoft/vcpkg/pull/11715) [osg] Fix conflict when asio and boost-asio are installed. + +- podofo `0.9.6-7` -> `0.9.6-8` + - [(#10767)](https://github.com/microsoft/vcpkg/pull/10767) [cmake] Update to 3.17.2 + +- replxx `0.0.2` -> `0.0.2-2` + - [(#10767)](https://github.com/microsoft/vcpkg/pull/10767) [cmake] Update to 3.17.2 + - [(#11571)](https://github.com/microsoft/vcpkg/pull/11571) [replxx] Add missing header needed to name std::runtime_error for replxx. + +- stormlib `2019-05-10` -> `2019-05-10-1` + - [(#10767)](https://github.com/microsoft/vcpkg/pull/10767) [cmake] Update to 3.17.2 + +- parallelstl `20191218` -> `20200330` + - [(#11379)](https://github.com/microsoft/vcpkg/pull/11379) [parallelstl] update to 20200330 + +- angle `2019-12-31-2` -> `2020-05-15` + - [(#11394)](https://github.com/microsoft/vcpkg/pull/11394) [angle] update for gcc 10 compatibility + +- parallel-hashmap `1.30` -> `1.32` + - [(#11420)](https://github.com/microsoft/vcpkg/pull/11420) [parallel-hashmap] Update parallel-hashmap version + +- utfcpp `3.1` -> `3.1.1` + - [(#11426)](https://github.com/microsoft/vcpkg/pull/11426) [utfcpp] Update to 3.1.1 + +- realsense2 `2.33.1-1` -> `2.34.0` + - [(#11437)](https://github.com/microsoft/vcpkg/pull/11437) [realsense2] Update to 2.34.0 + +- grpc `1.27.3` -> `1.28.1-1` + - [(#11449)](https://github.com/microsoft/vcpkg/pull/11449) [grpc] upgrade to 1.28.1 + - [(#10307)](https://github.com/microsoft/vcpkg/pull/10307) [grpc] Add feature absl-sync + +- skia `2020-02-15-1` -> `2020-05-18-1` + - [(#11416)](https://github.com/microsoft/vcpkg/pull/11416) [harfbuzz,skia] Update and replace Skia dependencies with vcpkg + +- fribidi `1.0.9` -> `1.0.9-1` + - [(#11380)](https://github.com/microsoft/vcpkg/pull/11380) [tool-meson] Update to 0.54.2 + +- libepoxy `1.5.3-3` -> `1.5.4` + - [(#11380)](https://github.com/microsoft/vcpkg/pull/11380) [tool-meson] Update to 0.54.2 + - [(#11448)](https://github.com/microsoft/vcpkg/pull/11448) [libepoxy] Update to 1.5.4 + +- tool-meson `0.53.2` -> `0.54.2` + - [(#11380)](https://github.com/microsoft/vcpkg/pull/11380) [tool-meson] Update to 0.54.2 + +- monkeys-audio `5.24` -> `5.38` + - [(#11444)](https://github.com/microsoft/vcpkg/pull/11444) [monkeys-audio] Update to 5.38 + +- clapack `3.2.1-12` -> `3.2.1-13` + - [(#9957)](https://github.com/microsoft/vcpkg/pull/9957) [clapack] Add uwp support + +- fcl `0.6.0` -> `0.6.0-1` + - [(#11406)](https://github.com/microsoft/vcpkg/pull/11406) [fcl] Explicity handle FCL_USE_X64_SSE CMake option + +- farmhash `1.1` -> `1.1-1` + - [(#10402)](https://github.com/microsoft/vcpkg/pull/10402) [vcpkg] Improve make builds + +- freexl `1.0.4-8` -> `1.0.4-9` + - [(#10402)](https://github.com/microsoft/vcpkg/pull/10402) [vcpkg] Improve make builds + +- healpix `1.12.10` -> `1.12.10-1` + - [(#10402)](https://github.com/microsoft/vcpkg/pull/10402) [vcpkg] Improve make builds + +- libb2 `0.98.1` -> `0.98.1-2` + - [(#10402)](https://github.com/microsoft/vcpkg/pull/10402) [vcpkg] Improve make builds + - [(#11692)](https://github.com/microsoft/vcpkg/pull/11692) [vcpkg baseline] Remove passing port from Ci baseline + +- libcrafter `0.3` -> `0.3-1` + - [(#10402)](https://github.com/microsoft/vcpkg/pull/10402) [vcpkg] Improve make builds + +- libmagic `5.37` -> `5.37-1` + - [(#10402)](https://github.com/microsoft/vcpkg/pull/10402) [vcpkg] Improve make builds + +- libmesh `1.5.0` -> `1.5.0-1` + - [(#10402)](https://github.com/microsoft/vcpkg/pull/10402) [vcpkg] Improve make builds + +- libosip2 `5.1.0-3` -> `5.1.0-4` + - [(#10402)](https://github.com/microsoft/vcpkg/pull/10402) [vcpkg] Improve make builds + +- libudns `0.4-1` -> `0.4-2` + - [(#10402)](https://github.com/microsoft/vcpkg/pull/10402) [vcpkg] Improve make builds + +- libwandio `4.2.1` -> `4.2.1-2` + - [(#10402)](https://github.com/microsoft/vcpkg/pull/10402) [vcpkg] Improve make builds + +- libxslt `1.1.33-6` -> `1.1.33-7` + - [(#10402)](https://github.com/microsoft/vcpkg/pull/10402) [vcpkg] Improve make builds + +- pfring `2019-10-17-1` -> `2019-10-17-2` + - [(#10402)](https://github.com/microsoft/vcpkg/pull/10402) [vcpkg] Improve make builds + +- sdl1 `1.2.15-10` -> `1.2.15-11` + - [(#10402)](https://github.com/microsoft/vcpkg/pull/10402) [vcpkg] Improve make builds + +- tcl `8.6.10-3` -> `core-9-0-a1` + - [(#10402)](https://github.com/microsoft/vcpkg/pull/10402) [vcpkg] Improve make builds + +- x264 `157-303c484ec828ed0-7` -> `157-303c484ec828ed0-8` + - [(#10402)](https://github.com/microsoft/vcpkg/pull/10402) [vcpkg] Improve make builds + +- libflac `1.3.3` -> `1.3.3-1` + - [(#11152)](https://github.com/microsoft/vcpkg/pull/11152) [libflac] Update to 1.3.3-1 + +- libsndfile `1.0.29-8` -> `1.0.29-9` + - [(#11152)](https://github.com/microsoft/vcpkg/pull/11152) [libflac] Update to 1.3.3-1 + +- octomap `2017-03-11-7` -> `2017-03-11-8` + - [(#11408)](https://github.com/microsoft/vcpkg/pull/11408) [octomap] Cleanup + +- freeglut `3.0.0-9` -> `3.2.1-1` + - [(#11423)](https://github.com/microsoft/vcpkg/pull/11423) [freeglut] updated to 3.2.1 + - [(#11527)](https://github.com/microsoft/vcpkg/pull/11527) [freeglut] fix debug macro patch + +- libpqxx `6.4.5-2` -> `6.4.5-3` + - [(#11442)](https://github.com/microsoft/vcpkg/pull/11442) [libpqxx] linux support + +- marl `2019-09-13` -> `2020-05-21` + - [(#11465)](https://github.com/microsoft/vcpkg/pull/11465) [marl] Update to 2020-05-20 + +- python3 `3.7.3-2` -> `3.8.3` + - [(#11489)](https://github.com/microsoft/vcpkg/pull/11489) [python3] Fix dynamic build error on Linux + - [(#11708)](https://github.com/microsoft/vcpkg/pull/11708) [python3] Update to Python 3.8 + +- azure-storage-cpp `7.3.0` -> `7.4.0` + - [(#11510)](https://github.com/microsoft/vcpkg/pull/11510) [azure-storage-cpp] Upgrade to 7.4.0 + +- entt `3.3.2` -> `3.4.0` + - [(#11509)](https://github.com/microsoft/vcpkg/pull/11509) [entt] Update to 3.4.0 (#11507) + +- wil `2019-11-07` -> `2020-05-19` + - [(#11506)](https://github.com/microsoft/vcpkg/pull/11506) [wil] Update to 2020-05-19 + +- signalrclient `1.0.0-beta1-8` -> `1.0.0-beta1-9` + - [(#11496)](https://github.com/microsoft/vcpkg/pull/11496) [Baseline] Fix boost-*:arm-uwp failure and resolve conflicts in CI + +- bond `8.1.0-3` -> `9.0.0` + - [(#11559)](https://github.com/microsoft/vcpkg/pull/11559) [VCPKG baseline] Fix many ports + - [(#11628)](https://github.com/microsoft/vcpkg/pull/11628) [bond] Update to 9.0.0 + - [(#10319)](https://github.com/microsoft/vcpkg/pull/10319) [bond] updated version + added bond-over-grpc integration as feature + +- ccfits `2.5-4` -> `2.5-5` + - [(#11559)](https://github.com/microsoft/vcpkg/pull/11559) [VCPKG baseline] Fix many ports + +- geographiclib `1.47-patch1-10` -> `1.47-patch1-12` + - [(#11559)](https://github.com/microsoft/vcpkg/pull/11559) [VCPKG baseline] Fix many ports + - [(#11896)](https://github.com/microsoft/vcpkg/pull/11896) [vcpkg baseline] Fix baseline error + +- libaiff `5.0-2` -> `5.0-3` + - [(#11559)](https://github.com/microsoft/vcpkg/pull/11559) [VCPKG baseline] Fix many ports + +- ois `1.5` -> `1.5-1` + - [(#11559)](https://github.com/microsoft/vcpkg/pull/11559) [VCPKG baseline] Fix many ports + +- wtl `10.0-4` -> `10.0-5` + - [(#11559)](https://github.com/microsoft/vcpkg/pull/11559) [VCPKG baseline] Fix many ports + +- xmsh `0.5.2` -> `0.5.2-1` + - [(#11559)](https://github.com/microsoft/vcpkg/pull/11559) [VCPKG baseline] Fix many ports + +- xmlsec `1.2.29-2` -> `1.2.30` + - [(#11595)](https://github.com/microsoft/vcpkg/pull/11595) [Xmlsec] Update to 1.2.30 + +- activemq-cpp `3.9.5-1` -> `3.9.5-2` + - [(#11589)](https://github.com/microsoft/vcpkg/pull/11589) [libusbmuxd berkeleydb cppcms activemq-cpp] Add Supports and failure message + +- berkeleydb `4.8.30-3` -> `4.8.30-4` + - [(#11589)](https://github.com/microsoft/vcpkg/pull/11589) [libusbmuxd berkeleydb cppcms activemq-cpp] Add Supports and failure message + +- cppcms `1.2.1` -> `1.2.1-1` + - [(#11589)](https://github.com/microsoft/vcpkg/pull/11589) [libusbmuxd berkeleydb cppcms activemq-cpp] Add Supports and failure message + +- libusbmuxd `1.2.185` -> `1.2.185-1` + - [(#11589)](https://github.com/microsoft/vcpkg/pull/11589) [libusbmuxd berkeleydb cppcms activemq-cpp] Add Supports and failure message + +- seal `3.4.5` -> `3.4.5-1` + - [(#11588)](https://github.com/microsoft/vcpkg/pull/11588) [seal] Disable SEAL_USE_MSGSL and add default feature zlib + +- magic-get `2019-09-02` -> `2019-09-02-1` + - [(#11581)](https://github.com/microsoft/vcpkg/pull/11581) [magic-get] Fix improper direct reference to the "downloads" directory + +- lpeg `1.0.1-4` -> `1.0.2-1` + - [(#11554)](https://github.com/microsoft/vcpkg/pull/11554) [luafilesystem][lpeg] Bump versions + +- luafilesystem `1.7.0.2-1` -> `1.8.0-1` + - [(#11554)](https://github.com/microsoft/vcpkg/pull/11554) [luafilesystem][lpeg] Bump versions + +- scnlib `0.1.2` -> `0.3` + - [(#11540)](https://github.com/microsoft/vcpkg/pull/11540) [scnlib] Update to version 0.3 + +- cppgraphqlgen `3.2.1` -> `3.2.2` + - [(#11531)](https://github.com/microsoft/vcpkg/pull/11531) [pegtl/cppgraphqlgen] matching updates for dependency + +- protobuf-c `1.3.2` -> `1.3.2-2` + - [(#11517)](https://github.com/microsoft/vcpkg/pull/11517) [protobuf-c] Fix tool protoc-gen-c crash + - [(#11609)](https://github.com/microsoft/vcpkg/pull/11609) [protobuf-c] Fix wrong dependency for feature test + +- basisu `1.11-3` -> `1.11-4` + - [(#11494)](https://github.com/microsoft/vcpkg/pull/11494) [basisu, gppanel, msgpack11, nana, rapidcheck, folly] Add missing header file of STL + +- folly `2019.10.21.00-1` -> `2019.10.21.00-2` + - [(#11494)](https://github.com/microsoft/vcpkg/pull/11494) [basisu, gppanel, msgpack11, nana, rapidcheck, folly] Add missing header file of STL + +- gppanel `2018-04-06` -> `2020-05-20` + - [(#11494)](https://github.com/microsoft/vcpkg/pull/11494) [basisu, gppanel, msgpack11, nana, rapidcheck, folly] Add missing header file of STL + +- msgpack11 `0.0.10` -> `0.0.10-1` + - [(#11494)](https://github.com/microsoft/vcpkg/pull/11494) [basisu, gppanel, msgpack11, nana, rapidcheck, folly] Add missing header file of STL + +- rapidcheck `2018-11-05-1` -> `2018-11-05-2` + - [(#11494)](https://github.com/microsoft/vcpkg/pull/11494) [basisu, gppanel, msgpack11, nana, rapidcheck, folly] Add missing header file of STL + +- simdjson `2019-12-27` -> `2020-05-26` + - [(#11495)](https://github.com/microsoft/vcpkg/pull/11495) [simdjson] Fix error LNK2001 when compile with /fsanitize=address in MSVC + - [(#10709)](https://github.com/microsoft/vcpkg/pull/10709) [simdjson] Update to 0.3.1 + +- ponder `3.0.0` -> `3.0.0-1` + - [(#11582)](https://github.com/microsoft/vcpkg/pull/11582) [ponder] patch missing headers for Visual Studio 2019 16.6 + +- telnetpp `2.0-3` -> `2.0-4` + - [(#11573)](https://github.com/microsoft/vcpkg/pull/11573) [telnetpp] Add missing for Visual Studio 2019 16.6 + +- libpopt `1.16-12` -> `1.16-13` + - [(#11607)](https://github.com/microsoft/vcpkg/pull/11607) [libpopt] Remove invalid URL + +- cpputest `2019-9-16` -> `2019-9-16-1` + - [(#11585)](https://github.com/microsoft/vcpkg/pull/11585) [cpputest] Move library to manual-link + +- unixodbc `2.3.7` -> `2.3.7-1` + - [(#11613)](https://github.com/microsoft/vcpkg/pull/11613) [vcpkg-baseline][unixodbc/nanodbc] Fix unixodbc build failure and set it as a dependency on nanodbc + +- nghttp2 `1.39.2-1` -> `1.39.2-2` + - [(#11638)](https://github.com/microsoft/vcpkg/pull/11638) [nghttp2] Fix to build nghttp2 statically + +- gli `dd17acf` -> `dd17acf-1` + - [(#11634)](https://github.com/microsoft/vcpkg/pull/11634) [gli] Add CMake config support + +- mimalloc `1.6.1` -> `1.6.1-1` + - [(#11632)](https://github.com/microsoft/vcpkg/pull/11632) [mimalloc] Install mimalloc-redirect.dll to CMAKE_INSTALL_BINDIR + +- quickfix `1.15.1-3` -> `1.15.1-4` + - [(#11604)](https://github.com/microsoft/vcpkg/pull/11604) [vcpkg-baseline][quickfix] Fix build failure on arm64-windows + +- zxing-cpp `3.3.3-6` -> `3.3.3-7` + - [(#11586)](https://github.com/microsoft/vcpkg/pull/11586) [vcpkg-baseline][zxing-cpp] Fix build failure + +- ppconsul `0.5` -> `0.5-1` + - [(#11692)](https://github.com/microsoft/vcpkg/pull/11692) [vcpkg baseline] Remove passing port from Ci baseline + +- proj4 `6.3.1` -> `6.3.1-1` + - [(#11692)](https://github.com/microsoft/vcpkg/pull/11692) [vcpkg baseline] Remove passing port from Ci baseline + - [(#11086)](https://github.com/microsoft/vcpkg/pull/11086) [PROJ4] Add search path for sqlite.exe + +- jwt-cpp `2019-05-07-1` -> `0.4.0` + - [(#11625)](https://github.com/microsoft/vcpkg/pull/11625) [jwt-cpp] Update to v0.4.0 + +- polyhook2 `2020-02-17` -> `2020-06-02` + - [(#11561)](https://github.com/microsoft/vcpkg/pull/11561) [polyhook2] Update to 2020-05-25 + - [(#11729)](https://github.com/microsoft/vcpkg/pull/11729) [polyhook2] Update polyhook to latest + +- gdk-pixbuf `2.36.9-4` -> `2.36.9-5` + - [(#11721)](https://github.com/microsoft/vcpkg/pull/11721) [gdk-pixbuf] GdkPixbuf fix for building on macOS + +- yaml-cpp `0.6.2-3` -> `0.6.3` + - [(#11718)](https://github.com/microsoft/vcpkg/pull/11718) [yaml-cpp] Update to 0.6.3 and also fix headers cannot be found + +- fmt `6.2.0` -> `6.2.1` + - [(#11706)](https://github.com/microsoft/vcpkg/pull/11706) [fmt] add vcpkg_fixup_pkgconfig + - [(#11789)](https://github.com/microsoft/vcpkg/pull/11789) [fmt] Update to 6.2.1 + +- magic-enum `0.6.4` -> `0.6.6` + - [(#11704)](https://github.com/microsoft/vcpkg/pull/11704) [magic-enum] Update to v0.6.5 + - [(#11814)](https://github.com/microsoft/vcpkg/pull/11814) [magic-enum] Update to v0.6.6 + +- enet `1.3.13-1` -> `1.3.15` + - [(#11702)](https://github.com/microsoft/vcpkg/pull/11702) [enet] Update to 1.3.15 + +- libfabric `1.8.1` -> `1.8.1-1` + - [(#11647)](https://github.com/microsoft/vcpkg/pull/11647) [vcpkg baseline][libfabric] Only support dynamic build + +- google-cloud-cpp-common `0.25.0` -> `alias` + - [(#11698)](https://github.com/microsoft/vcpkg/pull/11698) [google-cloud-cpp] Consolidate all google-cloud* packages + +- google-cloud-cpp-spanner `1.1.0` -> `alias` + - [(#11698)](https://github.com/microsoft/vcpkg/pull/11698) [google-cloud-cpp] Consolidate all google-cloud* packages + +- google-cloud-cpp `0.21.0` -> `1.14.0` + - [(#11698)](https://github.com/microsoft/vcpkg/pull/11698) [google-cloud-cpp] Consolidate all google-cloud* packages + +- amqpcpp `4.1.5` -> `4.1.7` + - [(#11608)](https://github.com/microsoft/vcpkg/pull/11608) [amqpcpp] Update to 4.1.7 + +- shiva-sfml `1.0` -> `1.0-1` + - [(#11483)](https://github.com/microsoft/vcpkg/pull/11483) [vcpkg] Allow CI to pass in all relevant directories and remove use of symbolic links + +- spirv-tools `2020.1` -> `2020.1-1` + - [(#11483)](https://github.com/microsoft/vcpkg/pull/11483) [vcpkg] Allow CI to pass in all relevant directories and remove use of symbolic links + +- cpp-taskflow `2.2.0` -> `2.2.0-1` + - [(#11742)](https://github.com/microsoft/vcpkg/pull/11742) [vcpkg-baseline][manyport] Fix baseline error + +- eabase `2.09.12` -> `2.09.12-1` + - [(#11742)](https://github.com/microsoft/vcpkg/pull/11742) [vcpkg-baseline][manyport] Fix baseline error + +- fastrtps `1.5.0-2` -> `1.5.0-3` + - [(#11742)](https://github.com/microsoft/vcpkg/pull/11742) [vcpkg-baseline][manyport] Fix baseline error + +- librsvg `2.40.20` -> `2.40.20-2` + - [(#11722)](https://github.com/microsoft/vcpkg/pull/11722) [librsvg] Fix for macOS + - [(#11865)](https://github.com/microsoft/vcpkg/pull/11865) [vcpkg baseline] Fix baseline + +- mozjpeg `3.2-3` -> `2020-06-02` + - [(#11719)](https://github.com/microsoft/vcpkg/pull/11719) [mozjpeg] Update to latest commit + +- pcre `8.44` -> `8.44-1` + - [(#11564)](https://github.com/microsoft/vcpkg/pull/11564) [pcre] Add pkgconfig files + +- tensorflow-cc `1.14-1` -> `1.14-2` + - [(#11839)](https://github.com/microsoft/vcpkg/pull/11839) [vcpkg] Fix OSX CI by ensuring the downloads directory exists + +- sqlpp11-connector-mysql `0.29` -> `0.29-1` + - [(#11771)](https://github.com/microsoft/vcpkg/pull/11771) [sqlpp11] update to v0.59 + +- sqlpp11 `0.58-3` -> `0.59` + - [(#11771)](https://github.com/microsoft/vcpkg/pull/11771) [sqlpp11] update to v0.59 + +- unicorn-lib `2019-07-11` -> `2020-03-02` + - [(#11830)](https://github.com/microsoft/vcpkg/pull/11830) [unicorn-lib] Update to 01cc7fc (2020-03-02) + +- sol2 `3.2.0` -> `3.2.1` + - [(#11826)](https://github.com/microsoft/vcpkg/pull/11826) [sol] Update to version 3.2.1 + +- avisynthplus `3.5.0` -> `3.6.0` + - [(#11736)](https://github.com/microsoft/vcpkg/pull/11736) [avisynthplus] Upgrade to 3.6.0 + +- plibsys `0.0.4-2` -> `0.0.4-3` + - [(#11633)](https://github.com/microsoft/vcpkg/pull/11633) [plibsys] Fix failures on linux and osx + +- libxmp-lite `4.4.1-2` -> `4.4.1-3` + - [(#11865)](https://github.com/microsoft/vcpkg/pull/11865) [vcpkg baseline] Fix baseline + +- msix `1.7` -> `1.7-2` + - [(#11865)](https://github.com/microsoft/vcpkg/pull/11865) [vcpkg baseline] Fix baseline + - [(#11896)](https://github.com/microsoft/vcpkg/pull/11896) [vcpkg baseline] Fix baseline error + +- usd `20.02` -> `20.02-1` + - [(#11440)](https://github.com/microsoft/vcpkg/pull/11440) [usd] Fix build error on Linux + +- cryptopp `8.2.0-1` -> `8.2.0-2` + - [(#11711)](https://github.com/microsoft/vcpkg/pull/11711) [licensepp] Add new port + +- libpcap `1.9.1` -> `1.9.1-2` + - [(#9426)](https://github.com/microsoft/vcpkg/pull/9426) [libpcap] Fix pkgconfig libs and include path + - [(#10731)](https://github.com/microsoft/vcpkg/pull/10731) [libpcap] Enable compilation of libpcap port on x86-windows and x64-windows + +- ms-angle `2018-04-18-2` -> `alias` + - [(#11458)](https://github.com/microsoft/vcpkg/pull/11458) [ms-angle] Set ms-angle to empty package + +- libgit2 `1.0.0` -> `1.0.1` + - [(#11844)](https://github.com/microsoft/vcpkg/pull/11844) [libgit2] Update to 1.0.1 + +- uwebsockets `0.17.2` -> `18.1.0` + - [(#11866)](https://github.com/microsoft/vcpkg/pull/11866) [uWbSockets] Update to 18.1.0 + +- nameof `0.9.3` -> `0.9.4` + - [(#11815)](https://github.com/microsoft/vcpkg/pull/11815) [nameof] Update to 0.9.4 + +- cairo `1.16.0-3` -> `1.16.0-4` + - [(#11868)](https://github.com/microsoft/vcpkg/pull/11868) [cairo] Install the xlib header file when selecting feature x11 + +- directxmesh `dec2019-1` -> `jun2020` + - [(#11794)](https://github.com/microsoft/vcpkg/pull/11794) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version + +- directxtex `dec2019` -> `jun2020` + - [(#11794)](https://github.com/microsoft/vcpkg/pull/11794) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version + +- directxtk `2019-12-31` -> `jun2020` + - [(#11794)](https://github.com/microsoft/vcpkg/pull/11794) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version + +- directxtk12 `dec2019` -> `jun2020` + - [(#11794)](https://github.com/microsoft/vcpkg/pull/11794) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version + +- spdlog `1.4.2-1` -> `1.6.1` + - [(#11793)](https://github.com/microsoft/vcpkg/pull/11793) [spdlog] Update to 1.61 + +- msmpi `10.0-2` -> `10.1` + - [(#11365)](https://github.com/microsoft/vcpkg/pull/11365) [vcpkg] [cudnn] [msmpi] [openmpi] Update VMSS + +- openmpi `4.0.1` -> `4.0.3` + - [(#11365)](https://github.com/microsoft/vcpkg/pull/11365) [vcpkg] [cudnn] [msmpi] [openmpi] Update VMSS + +- sdl2 `2.0.12` -> `2.0.12-1` + - [(#11365)](https://github.com/microsoft/vcpkg/pull/11365) [vcpkg] [cudnn] [msmpi] [openmpi] Update VMSS + +- gtk `3.22.19-3` -> `3.22.19-4` + - [(#11892)](https://github.com/microsoft/vcpkg/pull/11892) [gtk] DISABLE_PARALLEL_CONFIGURE + +- xalan-c `1.11-11` -> `1.11-12` + - [(#11869)](https://github.com/microsoft/vcpkg/pull/11869) [xalan-c] Fix import Xalan.exe + +- libuuid `1.0.3-3` -> `1.0.3-4` + - [(#11849)](https://github.com/microsoft/vcpkg/pull/11849) [libuuid] Install uuid.pc file + +- lastools `2019-07-10` -> `2020-05-09` + - [(#11796)](https://github.com/microsoft/vcpkg/pull/11796) [LAStools] Update to 200509 + +- libpmemobj-cpp `1.8` -> `1.10` + - [(#11738)](https://github.com/microsoft/vcpkg/pull/11738) [libpmemobj-cpp] Update to 1.10 + +- librabbitmq `0.10.0` -> `2020-06-03` + - [(#11733)](https://github.com/microsoft/vcpkg/pull/11733) [librabbitmq] Update to use rabbitmq-config.cmake + +- hyperscan `5.2.1` -> `5.2.1-1` + - [(#11708)](https://github.com/microsoft/vcpkg/pull/11708) [python3] Update to Python 3.8 + +- tinyxml2 `7.1.0` -> `8.0.0` + - [(#11616)](https://github.com/microsoft/vcpkg/pull/11616) [tinyxml2] Update to 8.0.0; avoid exporting symbols when building static libraries + +- winpcap `4.1.3-2` -> `4.1.3-3` + - [(#10731)](https://github.com/microsoft/vcpkg/pull/10731) [libpcap] Enable compilation of libpcap port on x86-windows and x64-windows + +- ccd `2.1-3` -> `2.1-4` + - [(#11407)](https://github.com/microsoft/vcpkg/pull/11407) [ccd] Add emscripten support + +- itpp `4.3.1-1` -> `4.3.1-2` + - [(#11896)](https://github.com/microsoft/vcpkg/pull/11896) [vcpkg baseline] Fix baseline error + +- plplot `5.13.0-4` -> `5.13.0-5` + - [(#11896)](https://github.com/microsoft/vcpkg/pull/11896) [vcpkg baseline] Fix baseline error + +- pthreads `3.0.0-4` -> `3.0.0-5` + - [(#11896)](https://github.com/microsoft/vcpkg/pull/11896) [vcpkg baseline] Fix baseline error + +- qwt `6.1.3-10` -> `6.1.3-11` + - [(#11896)](https://github.com/microsoft/vcpkg/pull/11896) [vcpkg baseline] Fix baseline error + +- soundtouch `2.0.0-4` -> `2.0.0-6` + - [(#11896)](https://github.com/microsoft/vcpkg/pull/11896) [vcpkg baseline] Fix baseline error + +- tclap `1.2.2-1` -> `1.2.2-2` + - [(#11896)](https://github.com/microsoft/vcpkg/pull/11896) [vcpkg baseline] Fix baseline error + +- tinyfiledialogs `3.4.3-1` -> `3.4.3-2` + - [(#11896)](https://github.com/microsoft/vcpkg/pull/11896) [vcpkg baseline] Fix baseline error + +- mpir `3.0.0-7` -> `3.0.0-8` + - [(#9205)](https://github.com/microsoft/vcpkg/pull/9205) [mpir] Add mpirxx.lib + +- fftw3 `3.3.8-6` -> `3.3.8-7` + - [(#4361)](https://github.com/microsoft/vcpkg/pull/4361) Adds vcpkg item to project settings in Visual Studio + +
+ +-- vcpkg team vcpkg@microsoft.com MON, 16 June 1400:00 -0700 + +vcpkg (2020.04.01 - 2020.04.20) +--- +#### Total port count: 1322 + +#### Total port count per triplet (tested): +|triplet|ports available| +|---|---| +|**x64-windows**|1218| +|x86-windows|1202| +|x64-windows-static|1130| +|**x64-linux**|1104| +|**x64-osx**|1041| +|arm64-windows|842| +|x64-uwp|654| +|arm-uwp|625| + +#### The following documentation has been updated: +- [vcpkg_from_git](docs/maintainers/vcpkg_from_git.md) + - [(#9446)](https://github.com/microsoft/vcpkg/pull/9446) vcpkg_from_git: Add support for git over ssh (by @marcrambo) +- [Exporting to Android Archives (AAR files)](docs/specifications/prefab.md) ***[NEW]*** + - [(#10271)](https://github.com/microsoft/vcpkg/pull/10271) Android Support: Exporting to Android Archive (AAR) (by @atkawa7) +- [Triplets](docs/users/triplets.md) + - [(#6275)](https://github.com/microsoft/vcpkg/pull/6275) Add initial iOS support (by @alcroito) + +#### The following *remarkable* changes have been made to vcpkg: +- [(#9446)](https://github.com/microsoft/vcpkg/pull/9446) vcpkg_from_git: Add support for git over ssh (by @marcrambo) +- [(#10271)](https://github.com/microsoft/vcpkg/pull/10271) Android Support: Exporting to Android Archive (AAR) (by @atkawa7) +- [(#10395)](https://github.com/microsoft/vcpkg/pull/10395) [vcpkg] Make configure meson sane and work for all targets. (by @Neumann-A) +- [(#10398)](https://github.com/microsoft/vcpkg/pull/10398) [vcpkg] New policy: SKIP_ARCHITECTURE_CHECK. (by @Neumann-A) +- [(#6275)](https://github.com/microsoft/vcpkg/pull/6275) Add initial iOS support (by @alcroito) +- [(#10817)](https://github.com/microsoft/vcpkg/pull/10817) [vcpkg] Add x-set-installed command (by @strega-nil) +- [(#10521)](https://github.com/microsoft/vcpkg/pull/10521) [vcpkg] Add initial JSON support (by @strega-nil) + +#### The following *additional* changes have been made to vcpkg: +- [(#10637)](https://github.com/microsoft/vcpkg/pull/10637) [vcpkg baseline] Ignore osg-qt (by @PhoebeHui) +- [(#10660)](https://github.com/microsoft/vcpkg/pull/10660) [vcpkg] Fix spec instance name (by @PhoebeHui) +- [(#10703)](https://github.com/microsoft/vcpkg/pull/10703) [vcpkg baseline] Remove replxx:x86-windows=fail (by @strega-nil) +- [(#10655)](https://github.com/microsoft/vcpkg/pull/10655) [vcpkg] Fix nuget/aria2/ninja version/filename inconsistent (by @LilyWangL) +- [(#10583)](https://github.com/microsoft/vcpkg/pull/10583) [vcpkg] Correct UInt128 code 😇 (by @strega-nil) +- [(#10543)](https://github.com/microsoft/vcpkg/pull/10543) [vcpkg-test] Fix the check for ability to make symlinks (by @strega-nil) +- [(#10621)](https://github.com/microsoft/vcpkg/pull/10621) [vcpkg] fix vcpkg_find_acquire_program for scripts (by @Neumann-A) +- [(#10834)](https://github.com/microsoft/vcpkg/pull/10834) [vcpkg] Clean up CMake build system (by @strega-nil) +- [(#10846)](https://github.com/microsoft/vcpkg/pull/10846) [vcpkg] Fix bootstrap from out of directory (by @strega-nil) +- [(#10796)](https://github.com/microsoft/vcpkg/pull/10796) [Ninja] Update to 1.10 (by @Voskrese) +- [(#10867)](https://github.com/microsoft/vcpkg/pull/10867) [vcpkg] Fix build scripts on openSUSE and g++9 (by @strega-nil) + +
+The following 5 ports have been added: + +|port|version| +|---|---| +|[skyr-url](https://github.com/microsoft/vcpkg/pull/10463)[#10694](https://github.com/microsoft/vcpkg/pull/10694) | 1.5.1 +|[boringssl](https://github.com/microsoft/vcpkg/pull/8455)| 2020-04-07 +|[quadtree](https://github.com/microsoft/vcpkg/pull/10787)| 2020-04-13 +|[avisynthplus](https://github.com/microsoft/vcpkg/pull/10496)| 3.5.0 +|[c4core](https://github.com/microsoft/vcpkg/pull/10791)| 2020-04-12 +
+ +
+The following 69 ports have been updated: + +- cub `1.8.0` -> `1.8.0-1` + - [(#10660)](https://github.com/microsoft/vcpkg/pull/10660) [vcpkg] Fix spec instance name + +- vulkan-hpp `2019-05-11` -> `2019-05-11-1` + - [(#10660)](https://github.com/microsoft/vcpkg/pull/10660) [vcpkg] Fix spec instance name + +- function2 `4.0.0` -> `4.1.0` + - [(#10666)](https://github.com/microsoft/vcpkg/pull/10666) [function2] Update to version 4.1.0 + +- libwebsockets `3.2.2-1` -> `4.0.1-1` + - [(#10658)](https://github.com/microsoft/vcpkg/pull/10658) [libwebsockets] Update to 4.0.1 + - [(#10636)](https://github.com/microsoft/vcpkg/pull/10636) [mosquitto] Add support for static build + +- googleapis `0.6.0` -> `0.8.0` + - [(#10651)](https://github.com/microsoft/vcpkg/pull/10651) [googleapis] upgrade to v0.7.0 release + - [(#10885)](https://github.com/microsoft/vcpkg/pull/10885) [googleapis] Update to v0.8.0 + +- ixwebsocket `8.0.5` -> `9.1.9` + - [(#10633)](https://github.com/microsoft/vcpkg/pull/10633) [ixwebsocket] Update to 9.1.9 + +- opus `1.3.1` -> `1.3.1-2` + - [(#10634)](https://github.com/microsoft/vcpkg/pull/10634) [opus] Make AVX an optional feature + +- freerdp `2.0.0-rc4-6` -> `2.0.0-rc4-7` + - [(#10630)](https://github.com/microsoft/vcpkg/pull/10630) [freerdp] Fix include paths and output + +- openvr `1.9.16` -> `1.10.30` + - [(#10629)](https://github.com/microsoft/vcpkg/pull/10629) [openvr] Added Linux support and updated to v1.10.30 + +- abseil `2020-03-03-1` -> `2020-03-03-3` + - [(#10620)](https://github.com/microsoft/vcpkg/pull/10620) [abseil] Fix feature name error + - [(#10721)](https://github.com/microsoft/vcpkg/pull/10721) [abseil] Fix CompressedTuple move constructor on MSVC + +- reproc `11.0.1` -> `12.0.0` + - [(#10594)](https://github.com/microsoft/vcpkg/pull/10594) [reproc] Update to version 12.0.0 + +- hunspell `1.7.0` -> `1.7.0-1` + - [(#10574)](https://github.com/microsoft/vcpkg/pull/10574) [hunspell] Disable build tools in non-Windows + +- sciter `4.4.0.7` -> `4.4.1.5` + - [(#10071)](https://github.com/microsoft/vcpkg/pull/10071) [sciter] Update to 4.4.1.5 + +- qt5-base `5.12.5-11` -> `5.12.5-13` + - [(#10641)](https://github.com/microsoft/vcpkg/pull/10641) [qt5-base] Fix EGL absolute path on Linux + - [(#10746)](https://github.com/microsoft/vcpkg/pull/10746) [qt5] fix some remaining absolute paths. + - [(#9705)](https://github.com/microsoft/vcpkg/pull/9705) [qt5-base, qt5-imageformat] fix issues on osx + +- nana `1.7.2` -> `1.7.2-1` + - [(#10605)](https://github.com/microsoft/vcpkg/pull/10605) [nana] Add Xorg dependency libxcursor-dev and modify deprecated functions + +- blend2d `beta_2019-12-27` -> `beta_2020-04-15` + - [(#10600)](https://github.com/microsoft/vcpkg/pull/10600) [blend2d] Update to beta_2020-03-29 + - [(#10844)](https://github.com/microsoft/vcpkg/pull/10844) [blend2d] Update to beta_2020-04-15 + +- libffi `3.3` -> `3.3-2` + - [(#10485)](https://github.com/microsoft/vcpkg/pull/10485) [libffi] Support arm/arm64 + - [(#10469)](https://github.com/microsoft/vcpkg/pull/10469) [libffi] Check return value of execute_process() + +- fribidi `2019-02-04-2` -> `2019-02-04-3` + - [(#10395)](https://github.com/microsoft/vcpkg/pull/10395) [vcpkg] Make configure meson sane and work for all targets. + - [(#10713)](https://github.com/microsoft/vcpkg/pull/10713) [fribidi] Updated to v1.0.9 + +- libepoxy `1.5.3-2` -> `1.5.3-3` + - [(#10395)](https://github.com/microsoft/vcpkg/pull/10395) [vcpkg] Make configure meson sane and work for all targets. + +- egl-registry `2019-08-08` -> `2020-02-03` + - [(#9965)](https://github.com/microsoft/vcpkg/pull/9965) [angle] Improve port + +- glad `0.1.33` -> `0.1.33-1` + - [(#9965)](https://github.com/microsoft/vcpkg/pull/9965) [angle] Improve port + +- opengl-registry `2019-08-22` -> `2020-02-03` + - [(#9965)](https://github.com/microsoft/vcpkg/pull/9965) [angle] Improve port + +- mpfr `4.0.2-1` -> `4.0.2-2` + - [(#10035)](https://github.com/microsoft/vcpkg/pull/10035) [mpfr] Add mirror for mpfr at gnu.org + +- google-cloud-cpp-common `0.21.0` -> `0.25.0` + - [(#10680)](https://github.com/microsoft/vcpkg/pull/10680) [google-cloud-cpp*] update to the latest release + +- google-cloud-cpp-spanner `0.9.0` -> `1.1.0` + - [(#10680)](https://github.com/microsoft/vcpkg/pull/10680) [google-cloud-cpp*] update to the latest release + +- google-cloud-cpp `0.20.0` -> `0.21.0` + - [(#10680)](https://github.com/microsoft/vcpkg/pull/10680) [google-cloud-cpp*] update to the latest release + +- jsoncons `0.149.0` -> `0.150.0` + - [(#10688)](https://github.com/microsoft/vcpkg/pull/10688) [jsoncons] update to v0.150.0 + +- osg-qt `Qt4` -> `Qt4-1` + - [(#9705)](https://github.com/microsoft/vcpkg/pull/9705) [qt5-base, qt5-imageformat] fix issues on osx + +- qt5-imageformats `5.12.5-2` -> `5.12.5-3` + - [(#9705)](https://github.com/microsoft/vcpkg/pull/9705) [qt5-base, qt5-imageformat] fix issues on osx + +- libpng `1.6.37-6` -> `1.6.37-7` + - [(#6275)](https://github.com/microsoft/vcpkg/pull/6275) Add initial iOS support + +- pcre2 `10.30-6` -> `10.30-7` + - [(#6275)](https://github.com/microsoft/vcpkg/pull/6275) Add initial iOS support + +- curlpp `2018-06-15-2` -> `2018-06-15-3` + - [(#10535)](https://github.com/microsoft/vcpkg/pull/10535) [curlpp] Fix target "curlpp" link "ZLIB::ZLIB" error + +- avro-c `1.9.2` -> `1.9.2-1` + - [(#10514)](https://github.com/microsoft/vcpkg/pull/10514) [avro-c] Fix building avro-c in Linux + +- nlohmann-fifo-map `2018.05.07` -> `2018.05.07-1` + - [(#10850)](https://github.com/microsoft/vcpkg/pull/10850) [nlohmann-fifo-map] Fix could not find a package "nlohmann-fifo-map" + +- cppitertools `2019-04-14-3` -> `2.0` + - [(#10848)](https://github.com/microsoft/vcpkg/pull/10848) [cppitertools] Update to version 2.0 + +- python3 `3.7.3-1` -> `3.7.3-2` + - [(#10841)](https://github.com/microsoft/vcpkg/pull/10841) [python3] fix build on macOS and linux + +- restinio `0.6.5` -> `0.6.6` + - [(#10813)](https://github.com/microsoft/vcpkg/pull/10813) [restinio] Updated to v.0.6.6 + +- libgit2 `0.99.0-1` -> `1.0.0` + - [(#10807)](https://github.com/microsoft/vcpkg/pull/10807) [libgit2] Upgrade to 1.0.0 + +- zstd `1.4.4` -> `1.4.4-1` + - [(#10815)](https://github.com/microsoft/vcpkg/pull/10815) [zstd] export zstd-config.cmake + +- blosc `1.17.1` -> `1.18.1-1` + - [(#10816)](https://github.com/microsoft/vcpkg/pull/10816) [blosc] Update to 1.18.1 + +- freetype `2.10.1-5` -> `2.10.1-6` + - [(#10835)](https://github.com/microsoft/vcpkg/pull/10835) [Freetype] Actually prevent linking HarfBuzz on POSIX + +- gsl `2.4-5` -> `2.6` + - [(#10758)](https://github.com/microsoft/vcpkg/pull/10758) [gsl] update to 2.6 + +- physfs `3.0.2-1` -> `3.0.2-2` + - [(#10781)](https://github.com/microsoft/vcpkg/pull/10781) [physfs] mirror url + +- openssl-windows `1.1.1d-1` -> `1.1.1d-2` + - [(#10743)](https://github.com/microsoft/vcpkg/pull/10743) [openssl-windows] Avoid to install docs for openssl-windows + +- coolprop `6.1.0-4` -> `6.1.0-5` + - [(#10755)](https://github.com/microsoft/vcpkg/pull/10755) [fmt] update to 6.2.0 + +- fmt `6.1.2` -> `6.2.0` + - [(#10755)](https://github.com/microsoft/vcpkg/pull/10755) [fmt] update to 6.2.0 + +- directxmesh `dec2019` -> `dec2019-1` + - [(#10739)](https://github.com/microsoft/vcpkg/pull/10739) [DirectXMesh] Add support build for DirectX12 + +- libvorbis `1.3.6-9eadecc-3` -> `1.3.6-4d963fe` + - [(#10756)](https://github.com/microsoft/vcpkg/pull/10756) [libvorbis] Update to latest commit + +- nuspell `3.0.0` -> `3.1.0` + - [(#10737)](https://github.com/microsoft/vcpkg/pull/10737) [nuspell] update port to v3.1.0 + +- raylib `2.6.0` -> `3.0.0` + - [(#10722)](https://github.com/microsoft/vcpkg/pull/10722) [raylib] Update to 3.0.0 + +- entt `3.3.0` -> `3.3.2` + - [(#10672)](https://github.com/microsoft/vcpkg/pull/10672) [entt] Update to version 3.3.2 + +- indicators `1.5` -> `1.7` + - [(#10685)](https://github.com/microsoft/vcpkg/pull/10685) [indicators] Updated indicators to 1.7 + +- realsense2 `2.33.1` -> `2.33.1-1` + - [(#10673)](https://github.com/microsoft/vcpkg/pull/10673) [realsense2] Add tm2 feature for support T265 devices + +- flatbuffers `1.11.0-1` -> `1.12.0` + - [(#10664)](https://github.com/microsoft/vcpkg/pull/10664) [flatbuffers] Update to 1.12.0 + +- curl `7.68.0-2` -> `7.68.0-3` + - [(#10659)](https://github.com/microsoft/vcpkg/pull/10659) [curl] Fix cmake configure error + +- ismrmrd `1.4.1` -> `1.4.2` + - [(#10618)](https://github.com/microsoft/vcpkg/pull/10618) [ismrmrd] updated to version 1.4.2 + +- mosquitto `1.6.8` -> `1.6.8-1` + - [(#10636)](https://github.com/microsoft/vcpkg/pull/10636) [mosquitto] Add support for static build + +- lz4 `1.9.2` -> `1.9.2-1` + - [(#10452)](https://github.com/microsoft/vcpkg/pull/10452) [lz4] Fix for building Linux shared libraries + +- sdl2 `2.0.10-3` -> `2.0.12` + - [(#10500)](https://github.com/microsoft/vcpkg/pull/10500) [sdl2] Update to 2.0.12 version + +- osg `3.6.4-1` -> `3.6.4-2` + - [(#10082)](https://github.com/microsoft/vcpkg/pull/10082) [osg] Add feature examples and plugins, fix configure options + +- osgearth `2.10.2` -> `2.10.2-1` + - [(#10082)](https://github.com/microsoft/vcpkg/pull/10082) [osg] Add feature examples and plugins, fix configure options + +- ms-gsl `2.1.0` -> `3.0.0` + - [(#10872)](https://github.com/microsoft/vcpkg/pull/10872) [ms-gsl] Update version to v3.0.0 + - [(#10831)](https://github.com/microsoft/vcpkg/pull/10831) [ms-gsl] Update to v3.0.0 + +- cppgraphqlgen `3.2.0` -> `3.2.1` + - [(#10869)](https://github.com/microsoft/vcpkg/pull/10869) [cppgraphqlgen] Update to v3.2.1 + +- cgal `5.0.2` -> `5.0.2-1` + - [(#10879)](https://github.com/microsoft/vcpkg/pull/10879) [cgal] Add dependency boost-interval + +- arrow `0.16.0` -> `0.17.0` + - [(#10883)](https://github.com/microsoft/vcpkg/pull/10883) [Arrow] Update to 0.17 + +- xerces-c `3.2.2-13` -> `3.2.3` + - [(#10779)](https://github.com/microsoft/vcpkg/pull/10779) [xerces-c] Update to version 3.2.3 + +- libarchive `3.4.1` -> `3.4.1-1` + - [(#10769)](https://github.com/microsoft/vcpkg/pull/10769) [libarchive, libuv]Fix static linkage + +- libuv `1.34.2` -> `1.34.2-1` + - [(#10769)](https://github.com/microsoft/vcpkg/pull/10769) [libarchive, libuv]Fix static linkage + +- qscintilla `2.10-11` -> `2.11.4-1` + - [(#10511)](https://github.com/microsoft/vcpkg/pull/10511) [qscintilla] Update to 2.11.4 + +
+ +-- vcpkg team vcpkg@microsoft.com MON, 20 April 15:00:00 -0700 + + +vcpkg (2020.01.31) +--- +#### Total port count: 1295 +#### Total port count per triplet (tested): +|triplet|ports available| +|---|---| +|**x64-windows**|1195| +|x86-windows|1183| +|x64-windows-static|1104| +|**x64-linux**|1054| +|**x64-osx**|970| +|arm64-windows|814| +|x64-uwp|644| +|arm-uwp|615| + +#### The following documentation has been updated: +- [Triplets](docs/users/triplets.md) + - [(#7976)](https://github.com/microsoft/vcpkg/pull/7976) Community Triplets 🤠(by @vicroms) + +#### The following *remarkable* changes have been made to vcpkg's infrastructure: +- Allow untested triplet configurations as "Community Triplets" + - [(#7976)](https://github.com/microsoft/vcpkg/pull/7976) Community Triplets 🤠(by @vicroms) +- Add community support for MinGW + - [(#9137)](https://github.com/microsoft/vcpkg/pull/9137) Add community support for building with MinGW (by @cristianadam) + - [(#9807)](https://github.com/microsoft/vcpkg/pull/9807) MinGW: Fix vcpkg common definitions (by @cristianadam) +- Allow ARM/ARM64 toolchains to be selected when building x86 targets, also allow ARM64 to target ARM + - [(#9578)](https://github.com/microsoft/vcpkg/pull/9578) [vcpkg] Mark ARM and x86 on ARM64 and x86 on ARM as supported architectures when searching for toolchains on Windows (by @cbezault) + +#### The following *additional* changes have been made to vcpkg's infrastructure: +- [(#9435)](https://github.com/microsoft/vcpkg/pull/9435) Update CI baseline (by @NancyLi1013) +- [(#9494)](https://github.com/microsoft/vcpkg/pull/9494) [charls] Upgrade to 2.1.0 (by @vbaderks) +- [(#9379)](https://github.com/microsoft/vcpkg/pull/9379) [uvatlas] Upgrade to dec2019 (by @AlvinZhangH) +- [(#9529)](https://github.com/microsoft/vcpkg/pull/9529) [box2d] Update to 2019-12-31 (by @PhoebeHui) +- [(#9513)](https://github.com/microsoft/vcpkg/pull/9513) [wpilib] Update to 2020.1.1 (by @ThadHouse) +- [(#9499)](https://github.com/microsoft/vcpkg/pull/9499) [akali] Add new port (by @winsoft666) +- [(#9301)](https://github.com/microsoft/vcpkg/pull/9301) [sdl1] Add build support for ARM64 Windows 10 (by @shibayan) +- [(#9260)](https://github.com/microsoft/vcpkg/pull/9260) [qt5-base] Fix Qt5 linux build and be a bit less flaky in CI (by @Neumann-A) +- [(#9308)](https://github.com/microsoft/vcpkg/pull/9308) [pdal] Fix static build (by @JackBoosY) +- [(#8701)](https://github.com/microsoft/vcpkg/pull/8701) [nethost] Adding a port for nethost (by @tannergooding) +- [(#8650)](https://github.com/microsoft/vcpkg/pull/8650) [libmagic] Add new port (by @NancyLi1013) +- [(#8386)](https://github.com/microsoft/vcpkg/pull/8386) [tfhe] Add new port (by @NancyLi1013) +- [(#8518)](https://github.com/microsoft/vcpkg/pull/8518) [libb2] Add new port (by @NancyLi1013) +- [(#9605)](https://github.com/microsoft/vcpkg/pull/9605) Add December changelog (by @grdowns) +- [(#9566)](https://github.com/microsoft/vcpkg/pull/9566) [vcpkg] Fix a typo (by @MaherJendoubi) +- [(#9207)](https://github.com/microsoft/vcpkg/pull/9207) [sdl1]Change build method to vcpkg_*_make (by @JackBoosY) +- [(#6393)](https://github.com/microsoft/vcpkg/pull/6393) Map MinSizeRel and RelWithDebInfo correctly (by @Neumann-A) +- [(#9458)](https://github.com/microsoft/vcpkg/pull/9458) [azure-kinect-sensor-sdk] Remove feature test and fix static build in Windows (by @JackBoosY) +- [(#8936)](https://github.com/microsoft/vcpkg/pull/8936) [libplist] Update to 1.2.137 (by @PhoebeHui) +- [(#8888)](https://github.com/microsoft/vcpkg/pull/8888) [caf] Update to 0.17.2 (by @JackBoosY) +- [(#8683)](https://github.com/microsoft/vcpkg/pull/8683) [libwandio] Add new port (by @NancyLi1013) +- [(#8678)](https://github.com/microsoft/vcpkg/pull/8678) [libevhtp] Add new port (by @NancyLi1013) +- [(#9600)](https://github.com/microsoft/vcpkg/pull/9600) Update baseline to fix osx failure (by @JackBoosY) +- [(#9669)](https://github.com/microsoft/vcpkg/pull/9669) [vcpkg] Update baseline for OSX (by @ras0219-msft) +- [(#9649)](https://github.com/microsoft/vcpkg/pull/9649) [tfhe] Fix Mac support (by @SeekingMeaning) +- [(#8566)](https://github.com/microsoft/vcpkg/pull/8566) [libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d (by @Neumann-A) +- [(#9642)](https://github.com/microsoft/vcpkg/pull/9642) Introduce new policy to skip post verification of dll exports (by @martin-s) +- [(#9602)](https://github.com/microsoft/vcpkg/pull/9602) [vcpkg] Fix build type in vcpkg_build_make.cmake [x264] Modernize (by @NancyLi1013) +- [(#9536)](https://github.com/microsoft/vcpkg/pull/9536) Minor edit to help message for cli depend-info option. Fix for #9534. (by @dbird137) +- [(#9617)](https://github.com/microsoft/vcpkg/pull/9617) [akali] Update to v1.41 (by @winsoft666) +- [(#9572)](https://github.com/microsoft/vcpkg/pull/9572) [soem] Add new port (by @seanyen) +- [(#9574)](https://github.com/microsoft/vcpkg/pull/9574) [doxygen] Updated to 1.8.17 (by @tagsemb) +- [(#9372)](https://github.com/microsoft/vcpkg/pull/9372) [VCPKG] WinHTTPOption for company Proxy not correctly taken into account (by @xabbudm) +- [(#9720)](https://github.com/microsoft/vcpkg/pull/9720) [toolsrc] Added missing @ to FATAL_ERROR message (by @theriverman) +- [(#9555)](https://github.com/microsoft/vcpkg/pull/9555) [embree3] added cleanup command to embree3 port for static build (by @xelatihy) +- [(#9684)](https://github.com/microsoft/vcpkg/pull/9684) [teemo] new port. (by @winsoft666) +- [(#9591)](https://github.com/microsoft/vcpkg/pull/9591) [scintilla] Update to 4.2.3 (by @SeekingMeaning) +- [(#9767)](https://github.com/microsoft/vcpkg/pull/9767) [open62541] Update to v1.0 (by @yurybura) +- [(#9760)](https://github.com/microsoft/vcpkg/pull/9760) [monkeys-audio] Update to 5.14, add feature tools (by @JackBoosY) +- [(#9770)](https://github.com/microsoft/vcpkg/pull/9770) [asmjit] update to current version (by @jsmolka) +- [(#9708)](https://github.com/microsoft/vcpkg/pull/9708) [doxygen] Add alternative download URL (by @c72578) +- [(#9690)](https://github.com/microsoft/vcpkg/pull/9690) [string_theory] Update to 3.0 (by @zrax) +- [(#9680)](https://github.com/microsoft/vcpkg/pull/9680) [jasper] freeglut is not a dependency in macOS (by @david-antiteum) +- [(#9633)](https://github.com/microsoft/vcpkg/pull/9633) [cryptopp] Fixed build error on ARM32/ARM64 Windows (by @shibayan) +- [(#9281)](https://github.com/microsoft/vcpkg/pull/9281) [pbc] Correct non Windows build (by @decent-dcore) +- [(#9816)](https://github.com/microsoft/vcpkg/pull/9816) Make VS 2019 default to x64 triplet if CMAKE_GENERATOR_PLATFORM is not defined (by @Neumann-A) +- [(#9541)](https://github.com/microsoft/vcpkg/pull/9541) [memorymodule] Add new port (by @myd7349) +- [(#9521)](https://github.com/microsoft/vcpkg/pull/9521) [ftgl] Fix build failure #9520 (by @sma-github) +- [(#9456)](https://github.com/microsoft/vcpkg/pull/9456) [asiosdk] Add new port (by @batlogic) +- [(#9314)](https://github.com/microsoft/vcpkg/pull/9314) [sdl2-gfx] Fixed build error ARM64 Windows 10 (by @shibayan) +- [(#9265)](https://github.com/microsoft/vcpkg/pull/9265) Update the repo for jom 1.1.3 (by @zigguratvertigo) +- [(#8774)](https://github.com/microsoft/vcpkg/pull/8774) [vcpkg_find_acquire_program] Include version in downloaded python MSI… (by @ras0219-msft) +- [(#9698)](https://github.com/microsoft/vcpkg/pull/9698) [seal] Add new port (by @musaprg) +- [(#8832)](https://github.com/microsoft/vcpkg/pull/8832) [aws-*]Update version (by @JackBoosY) + +
+The following 22 ports have been added: + +|port|version| +|---|---| +|[argumentum](https://github.com/microsoft/vcpkg/pull/9478)| 0.2.2 +|[tabulate](https://github.com/microsoft/vcpkg/pull/9543)| 2019-01-06 +|[akali](https://github.com/microsoft/vcpkg/pull/9499)[#9617](https://github.com/microsoft/vcpkg/pull/9617) | 1.41 +|[nethost](https://github.com/microsoft/vcpkg/pull/8701)| 2019-12-21 +|[libmagic](https://github.com/microsoft/vcpkg/pull/8650)| 5.37 +|[yas](https://github.com/microsoft/vcpkg/pull/8891)| 7.0.4 +|[tfhe](https://github.com/microsoft/vcpkg/pull/8386)[#9649](https://github.com/microsoft/vcpkg/pull/9649) | 1.0.1-1 +|[libb2](https://github.com/microsoft/vcpkg/pull/8518)| 0.98.1 +|[libaaplus](https://github.com/microsoft/vcpkg/pull/9194)[#9579](https://github.com/microsoft/vcpkg/pull/9579) [#9664](https://github.com/microsoft/vcpkg/pull/9664) | 2.12 +|[libwandio](https://github.com/microsoft/vcpkg/pull/8683)| 4.2.1 +|[libevhtp](https://github.com/microsoft/vcpkg/pull/8678)| 1.2.18 +|[soem](https://github.com/microsoft/vcpkg/pull/9572)| 1.4.0 +|[glui](https://github.com/microsoft/vcpkg/pull/9155)| 2019-11-30 +|[teemo](https://github.com/microsoft/vcpkg/pull/9684)| 1.2 +|[mqtt-cpp](https://github.com/microsoft/vcpkg/pull/9787)| 7.0.1 +|[msgpack11](https://github.com/microsoft/vcpkg/pull/9524)| 0.0.10 +|[mcpp](https://github.com/microsoft/vcpkg/pull/9598)| 2.7.2.14 +|[memorymodule](https://github.com/microsoft/vcpkg/pull/9541)| 2019-12-31 +|[asiosdk](https://github.com/microsoft/vcpkg/pull/9456)| 2.3.3 +|[sfsexp](https://github.com/microsoft/vcpkg/pull/9420)| 1.3 +|[quaternions](https://github.com/microsoft/vcpkg/pull/9837)| 1.0.0 +|[seal](https://github.com/microsoft/vcpkg/pull/9698)| 3.4.5 +
+ +
+The following 226 ports have been updated: + +- simpleini `2018-08-31-3` -> `2018-08-31-4` + - [(#9429)](https://github.com/microsoft/vcpkg/pull/9429) [simpleini] Install missing code + +- directxtk `dec2019` -> `2019-12-31` + - [(#9508)](https://github.com/microsoft/vcpkg/pull/9508) [directxtk] Fix invalid solution configuration + +- nameof `0.9.2` -> `0.9.3` + - [(#9503)](https://github.com/microsoft/vcpkg/pull/9503) [nameof] Update to 0.9.3 + +- charls `2.0.0-3` -> `2.1.0-1` + - [(#9494)](https://github.com/microsoft/vcpkg/pull/9494) [charls] upgrade to 2.1.0 + +- ptex `2.3.2` -> `2.3.2-1` + - [(#9455)](https://github.com/microsoft/vcpkg/pull/9455) [ptext] Fix library cannot be found by find_package() + +- fruit `3.4.0-1` -> `3.4.0-2` + - [(#9445)](https://github.com/microsoft/vcpkg/pull/9445) [fruit] fix wchar.h import issue under Catalina + +- libxlsxwriter `0.8.7-1` -> `0.9.4` + - [(#9410)](https://github.com/microsoft/vcpkg/pull/9410) [libxlsxwriter] upgrade to 0.8.9 + - [(#9775)](https://github.com/microsoft/vcpkg/pull/9775) [libxlsxwriter] upgrade to 0.9.4 + +- uvatlas `apr2019` -> `dec2019` + - [(#9379)](https://github.com/microsoft/vcpkg/pull/9379) [uvatlas] Upgrade to dec2019 + +- grpc `1.23.1-1` -> `1.26.0` + - [(#9135)](https://github.com/microsoft/vcpkg/pull/9135) [grpc] Update grpc to 1.24.3 + - [(#9363)](https://github.com/microsoft/vcpkg/pull/9363) [grpc] Upgrade to gRPC-1.26.0 + +- freetype `2.10.1-1` -> `2.10.1-3` + - [(#9311)](https://github.com/microsoft/vcpkg/pull/9311) [freetype] use config and the correct alias + - [(#9706)](https://github.com/microsoft/vcpkg/pull/9706) [freetype] Add feature support + +- glibmm `2.52.1-10` -> `2.52.1-11` + - [(#9562)](https://github.com/microsoft/vcpkg/pull/9562) [glibmm] Fix build error on Linux + +- libfreenect2 `0.2.0-3` -> `0.2.0-4` + - [(#9551)](https://github.com/microsoft/vcpkg/pull/9551) [libfreenect2] add opengl and opencl features + +- jsoncons `0.140.0` -> `0.143.1` + - [(#9547)](https://github.com/microsoft/vcpkg/pull/9547) [jsoncons] Update to 0.143.1 + +- uwebsockets `0.16.5` -> `0.17.0a4` + - [(#9535)](https://github.com/microsoft/vcpkg/pull/9535) [uwebsockets] Update to 0.17.0 alpha 4 + +- box2d `2.3.1-374664b-2` -> `2019-12-31` + - [(#9529)](https://github.com/microsoft/vcpkg/pull/9529) [box2d] Update to 2019-12-31 + +- parallel-hashmap `1.27` -> `1.30` + - [(#9519)](https://github.com/microsoft/vcpkg/pull/9519) [parallel-hashmap] Update to 1.30 + +- wpilib `2019.6.1` -> `2020.1.1` + - [(#9513)](https://github.com/microsoft/vcpkg/pull/9513) [wpilib] update to 2020.1.1 + +- check `0.13.0-1` -> `0.13.0-2` + - [(#9510)](https://github.com/microsoft/vcpkg/pull/9510) [check/gettimeofday] Move static libraries to manual-link + +- gettimeofday `2017-10-14-2` -> `2017-10-14-3` + - [(#9510)](https://github.com/microsoft/vcpkg/pull/9510) [check/gettimeofday] Move static libraries to manual-link + +- magic-enum `0.6.3-1` -> `0.6.4` + - [(#9502)](https://github.com/microsoft/vcpkg/pull/9502) [magic-enum] Update to v0.6.4 + +- simdjson `2019-08-05` -> `2019-12-27` + - [(#9484)](https://github.com/microsoft/vcpkg/pull/9484) [simdjson] Update library + +- cpp-httplib `0.4.2` -> `0.5.1` + - [(#9480)](https://github.com/microsoft/vcpkg/pull/9480) [cpp-httplib] Update library to 0.5.1 + +- blend2d `beta_2019-10-09` -> `beta_2019-12-27` + - [(#9448)](https://github.com/microsoft/vcpkg/pull/9448) [blend2d] Update to beta_2019-12-27 + +- parallelstl `20190522-1` -> `20191218` + - [(#9443)](https://github.com/microsoft/vcpkg/pull/9443) [parallelstl] Update to latest version and fix find_package unable to find ParallelSTLConfig.cmake + +- sdl2pp `0.16.0-1` -> `0.16.0-2` + - [(#9428)](https://github.com/microsoft/vcpkg/pull/9428) [sdl2pp] Fix find dependencies + +- basisu `1.11-2` -> `1.11-3` + - [(#9425)](https://github.com/microsoft/vcpkg/pull/9425) [basisu] update from upstream repository, add support for pvrtc2 + +- devil `1.8.0-4` -> `1.8.0-5` + - [(#9341)](https://github.com/microsoft/vcpkg/pull/9341) [devil] fix OpenEXR not found + +- sdl1 `1.2.15-8` -> `1.2.15-9` + - [(#9301)](https://github.com/microsoft/vcpkg/pull/9301) [sdl1] Add build support for ARM64 Windows 10 + - [(#9207)](https://github.com/microsoft/vcpkg/pull/9207) [sdl1]Change build method to vcpkg_*_make + +- qt5-base `5.12.5-7` -> `5.12.5-8` + - [(#9260)](https://github.com/microsoft/vcpkg/pull/9260) [qt5-base] Fix Qt5 linux build and be a bit less flaky in CI + - [(#8566)](https://github.com/microsoft/vcpkg/pull/8566) [libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d + +- qt5-imageformats `5.12.5-1` -> `5.12.5-2` + - [(#9260)](https://github.com/microsoft/vcpkg/pull/9260) [qt5-base] Fix Qt5 linux build and be a bit less flaky in CI + - [(#8566)](https://github.com/microsoft/vcpkg/pull/8566) [libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d + +- qt5-tools `5.12.5-2` -> `5.12.5-3` + - [(#9260)](https://github.com/microsoft/vcpkg/pull/9260) [qt5-base] Fix Qt5 linux build and be a bit less flaky in CI + +- qt5-xmlpatterns `5.12.5` -> `5.12.5-1` + - [(#9260)](https://github.com/microsoft/vcpkg/pull/9260) [qt5-base] Fix Qt5 linux build and be a bit less flaky in CI + +- vtk `8.2.0-9` -> `8.2.0-10` + - [(#9260)](https://github.com/microsoft/vcpkg/pull/9260) [qt5-base] Fix Qt5 linux build and be a bit less flaky in CI + - [(#9219)](https://github.com/microsoft/vcpkg/pull/9219) [vtk] fix VTKConfig.cmake path + +- libevent `2.1.11-2` -> `2.1.11-4` + - [(#9292)](https://github.com/microsoft/vcpkg/pull/9292) [libevent] Fix include headers fails on x64-windows, using CMAKE + - [(#9232)](https://github.com/microsoft/vcpkg/pull/9232) [libevent] remove dependency of default feature + - [(#8566)](https://github.com/microsoft/vcpkg/pull/8566) [libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d + +- pdal `1.7.1-6` -> `1.7.1-8` + - [(#9308)](https://github.com/microsoft/vcpkg/pull/9308) [pdal] fix static build + - [(#8566)](https://github.com/microsoft/vcpkg/pull/8566) [libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d + +- xsimd `7.2.5` -> `7.4.5` + - [(#9158)](https://github.com/microsoft/vcpkg/pull/9158) [xsimd][xtensor][xtl] Update to lastest + +- xtensor-blas `0.16.1` -> `0.17.1` + - [(#9158)](https://github.com/microsoft/vcpkg/pull/9158) [xsimd][xtensor][xtl] Update to lastest + +- xtensor-io `0.7.0` -> `0.9.0` + - [(#9158)](https://github.com/microsoft/vcpkg/pull/9158) [xsimd][xtensor][xtl] Update to lastest + +- xtensor `0.20.8` -> `0.21.2` + - [(#9158)](https://github.com/microsoft/vcpkg/pull/9158) [xsimd][xtensor][xtl] Update to lastest + +- xtl `0.6.5` -> `0.6.10` + - [(#9158)](https://github.com/microsoft/vcpkg/pull/9158) [xsimd][xtensor][xtl] Update to lastest + +- freeimage `3.18.0-7` -> `3.18.0-8` + - [(#8707)](https://github.com/microsoft/vcpkg/pull/8707) [freeimage libraw] Fix case issue on Linux + +- libraw `201903-2` -> `201903-3` + - [(#8707)](https://github.com/microsoft/vcpkg/pull/8707) [freeimage libraw] Fix case issue on Linux + +- cgl `0.60.2-1` -> `0.60.2-2` + - [(#8807)](https://github.com/microsoft/vcpkg/pull/8807) [cgl] Fix cgl cannot be found + +- nanovg `2019-8-30-1` -> `2019-8-30-3` + - [(#8813)](https://github.com/microsoft/vcpkg/pull/8813) [nanovg] Add dependency port stb + +- hdf5 `1.10.5-8` -> `1.10.5-9` + - [(#9043)](https://github.com/microsoft/vcpkg/pull/9043) [hdf5] Fix static builds when building dynamic builds + - [(#9413)](https://github.com/microsoft/vcpkg/pull/9413) [HDF5] Correct SZIP linkage, modernize portfile + +- cgicc `3.2.19-3` -> `3.2.19-4` + - [(#9123)](https://github.com/microsoft/vcpkg/pull/9123) [many ports] Add mirror + - [(#8558)](https://github.com/microsoft/vcpkg/pull/8558) [cgicc]Fix usage error:lnk2019. + +- gsl `2.4-4` -> `2.4-5` + - [(#9123)](https://github.com/microsoft/vcpkg/pull/9123) [many ports] Add mirror + +- libidn2 `2.2.0` -> `2.2.0-1` + - [(#9123)](https://github.com/microsoft/vcpkg/pull/9123) [many ports] Add mirror + +- libmicrohttpd `0.9.63-1` -> `0.9.63-2` + - [(#9123)](https://github.com/microsoft/vcpkg/pull/9123) [many ports] Add mirror + +- libosip2 `5.1.0-1` -> `5.1.0-3` + - [(#9123)](https://github.com/microsoft/vcpkg/pull/9123) [many ports] Add mirror + - [(#9602)](https://github.com/microsoft/vcpkg/pull/9602) [vcpkg] Fix build type in vcpkg_build_make.cmake [x264] Modernize + +- libiconv `1.15-6` -> `1.16-1` + - [(#9229)](https://github.com/microsoft/vcpkg/pull/9229) [libiconv] Make built libraries relocatable + +- bullet3 `2.88-1` -> `2.89` + - [(#9098)](https://github.com/microsoft/vcpkg/pull/9098) [bullet3] Install CMake toolchain files and targets + - [(#9663)](https://github.com/microsoft/vcpkg/pull/9663) [bullet3] Update to 2.89 + +- fmt `6.0.0` -> `6.0.0-1` + - [(#9121)](https://github.com/microsoft/vcpkg/pull/9121) [fmt] Disable warning C4189 on Visual Studio 2015 + +- otl `4.0.448` -> `4.0.451` + - [(#9107)](https://github.com/microsoft/vcpkg/pull/9107) [otl] Fix header file name and version number + - [(#9579)](https://github.com/microsoft/vcpkg/pull/9579) [otl libaaplus forge] Fix build issues + - [(#9552)](https://github.com/microsoft/vcpkg/pull/9552) [otl] Update to version 4.0.451 + +- liblzma `5.2.4-2` -> `5.2.4-3` + - [(#9192)](https://github.com/microsoft/vcpkg/pull/9192) [liblzma] Stop exporting HAVE_CONFIG_H + +- glib `2.52.3-14-4` -> `2.52.3-14-5` + - [(#9054)](https://github.com/microsoft/vcpkg/pull/9054) [glib] Install msvc_recommended_pragmas.h to /installed/include + +- curl `7.66.0-1` -> `7.68.0` + - [(#8973)](https://github.com/microsoft/vcpkg/pull/8973) [curl] Disable export of Curl::curl targets when building 'tool' feature + - [(#9589)](https://github.com/microsoft/vcpkg/pull/9589) [curl] Update to 7.68.0 + +- forge `1.0.4-1` -> `1.0.4-2` + - [(#9579)](https://github.com/microsoft/vcpkg/pull/9579) [otl libaaplus forge] Fix build issues + +- reproc `9.0.0` -> `10.0.3` + - [(#9544)](https://github.com/microsoft/vcpkg/pull/9544) [reproc] Update to v10.0.3. + +- cpp-netlib `0.13.0-2` -> `0.13.0-3` + - [(#9537)](https://github.com/microsoft/vcpkg/pull/9537) [cpp-netlib] Fix cmake path, add homepage + +- proj4 `6.2.1-1` -> `6.3.0-1` + - [(#9437)](https://github.com/microsoft/vcpkg/pull/9437) [sqlite3] Rename sqlite3 tool as sqlite3.exe + - [(#9573)](https://github.com/microsoft/vcpkg/pull/9573) [proj4] Update to version 6.3.0 + +- sqlite3 `3.30.1-1` -> `3.30.1-2` + - [(#9437)](https://github.com/microsoft/vcpkg/pull/9437) [sqlite3] Rename sqlite3 tool as sqlite3.exe + +- msix `MsixCoreInstaller-preview-1` -> `1.7` + - [(#8934)](https://github.com/microsoft/vcpkg/pull/8934) [msix] Update to 1.7 + +- xmsh `0.4.1` -> `0.5.2` + - [(#7155)](https://github.com/microsoft/vcpkg/pull/7155) [xmsh]Upgrade version to 0.5.2 and fix build failure. + +- opencolorio `1.1.1` -> `1.1.1-2` + - [(#8920)](https://github.com/microsoft/vcpkg/pull/8920) [opencolorio] Modify find python2 to find python3 + - [(#9755)](https://github.com/microsoft/vcpkg/pull/9755) [opencolorio] fix lcms dependency + +- graphicsmagick `1.3.33-1` -> `1.3.34` + - [(#9596)](https://github.com/microsoft/vcpkg/pull/9596) [graphicsmagick] Updated to GraphicsMagick-1.3.34 + +- openal-soft `1.19.1-2` -> `1.20.0` + - [(#9583)](https://github.com/microsoft/vcpkg/pull/9583) [openal-soft] Update OpenAL Soft to 1.20.0 + +- google-cloud-cpp `0.15.0` -> `0.17.0` + - [(#9576)](https://github.com/microsoft/vcpkg/pull/9576) [google-cloud-cpp] Upgrade to v0.17.0 + +- openmvs `1.0-3` -> `1.0.1` + - [(#9563)](https://github.com/microsoft/vcpkg/pull/9563) [openmvs] Update to 1.0.1 + +- ixwebsocket `7.4.0` -> `7.9.2` + - [(#9397)](https://github.com/microsoft/vcpkg/pull/9397) [ixwebsocket] update to 7.6.3 + +- azure-kinect-sensor-sdk `1.4.0-alpha.0` -> `1.4.0-alpha.0-2` + - [(#9458)](https://github.com/microsoft/vcpkg/pull/9458) [azure-kinect-sensor-sdk] Remove feature test and fix static build in Windows + - [(#9763)](https://github.com/microsoft/vcpkg/pull/9763) [azure-kinect-sensor-sdk] Fix *.dll install path + +- netcdf-c `4.7.0-5` -> `4.7.3-1` + - [(#9361)](https://github.com/microsoft/vcpkg/pull/9361) [netcdf-c] Update to 4.7.3 and switched to use targets to generate valid targets + - [(#9721)](https://github.com/microsoft/vcpkg/pull/9721) [netcdf-c] Fix builds with hdf5[parallel] + +- realsense2 `2.22.0-2` -> `2.30.0` + - [(#9220)](https://github.com/microsoft/vcpkg/pull/9220) [realsense2] update to 2.30 + +- libplist `1.2.77` -> `1.2.137` + - [(#8936)](https://github.com/microsoft/vcpkg/pull/8936) [libplist] Update to 1.2.137 + +- ismrmrd `1.4.0-1` -> `1.4.1` + - [(#8880)](https://github.com/microsoft/vcpkg/pull/8880) [ismrmrd] Update to 1.4.1 + +- caf `0.16.3` -> `0.17.2` + - [(#8888)](https://github.com/microsoft/vcpkg/pull/8888) [caf] Update to 0.17.2 + +- openmvg `1.4-6` -> `1.4-7` + - [(#8824)](https://github.com/microsoft/vcpkg/pull/8824) [openmvg]Fix path in openmvg-config.cmake. + +- qhull `7.3.2-1` -> `7.3.2-2` + - [(#9651)](https://github.com/microsoft/vcpkg/pull/9651) [qhull] Fix Mac support + +- cppmicroservices `4.0.0-pre1` -> `v3.4.0` + - [(#9600)](https://github.com/microsoft/vcpkg/pull/9600) Update baseline to fix osx failure + +- libguarded `2019-08-27` -> `2019-08-27-1` + - [(#9600)](https://github.com/microsoft/vcpkg/pull/9600) Update baseline to fix osx failure + +- sfgui `0.4.0-2` -> `0.4.0-3` + - [(#9625)](https://github.com/microsoft/vcpkg/pull/9625) [sfgui] fix sfgui on macOS + +- azure-storage-cpp `7.0.0` -> `7.1.0-1` + - [(#9646)](https://github.com/microsoft/vcpkg/pull/9646) [azure-storage-cpp]Upgrade to 7.1.0 + - [(#9852)](https://github.com/microsoft/vcpkg/pull/9852) [azure-storage-cpp] Azure storage only requires gettext on OSX + +- ace `6.5.7` -> `6.5.7-1` + - [(#8566)](https://github.com/microsoft/vcpkg/pull/8566) [libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d + - [(#9016)](https://github.com/microsoft/vcpkg/pull/9016) [ace] Let `ssl` feature able to work on Linux when selected + +- freerdp `2.0.0-rc4-3` -> `2.0.0-rc4-4` + - [(#8566)](https://github.com/microsoft/vcpkg/pull/8566) [libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d + +- freetds `1.1.6-1` -> `1.1.17` + - [(#8566)](https://github.com/microsoft/vcpkg/pull/8566) [libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d + +- libmysql `8.0.4-4` -> `8.0.4-5` + - [(#8566)](https://github.com/microsoft/vcpkg/pull/8566) [libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d + +- libpq `9.6.3` -> `12.0` + - [(#8566)](https://github.com/microsoft/vcpkg/pull/8566) [libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d + +- librtmp `2019-11-11` -> `2019-11-11_1` + - [(#8566)](https://github.com/microsoft/vcpkg/pull/8566) [libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d + +- libssh `0.7.6-1` -> `0.9.0` + - [(#8566)](https://github.com/microsoft/vcpkg/pull/8566) [libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d + +- libwebsockets `3.2.0` -> `3.2.2` + - [(#8566)](https://github.com/microsoft/vcpkg/pull/8566) [libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d + - [(#9734)](https://github.com/microsoft/vcpkg/pull/9734) [libwebsockets] Update to v3.2.2 + +- mosquitto `1.6.7` -> `1.6.7-2` + - [(#8566)](https://github.com/microsoft/vcpkg/pull/8566) [libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d + - [(#9754)](https://github.com/microsoft/vcpkg/pull/9754) [mosquitto] Install mosquittopp.lib to dest + +- nmap `7.70-1` -> `7.70-4` + - [(#8566)](https://github.com/microsoft/vcpkg/pull/8566) [libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d + - [(#9703)](https://github.com/microsoft/vcpkg/pull/9703) Update portfiles to use VCPKG_BUILD_TYPE + +- openssl-unix `1.0.2s-1` -> `1.1.1d-1` + - [(#8566)](https://github.com/microsoft/vcpkg/pull/8566) [libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d + +- openssl-uwp `1.0.2r-1` -> `1.1.1d-1` + - [(#8566)](https://github.com/microsoft/vcpkg/pull/8566) [libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d + - [(#9703)](https://github.com/microsoft/vcpkg/pull/9703) Update portfiles to use VCPKG_BUILD_TYPE + +- openssl-windows `1.0.2s-2` -> `1.1.1d-1` + - [(#8566)](https://github.com/microsoft/vcpkg/pull/8566) [libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d + - [(#9703)](https://github.com/microsoft/vcpkg/pull/9703) Update portfiles to use VCPKG_BUILD_TYPE + +- qt5-graphicaleffects `5.12.5` -> `5.12.5-1` + - [(#8566)](https://github.com/microsoft/vcpkg/pull/8566) [libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d + +- quickfix `1.15.1-1` -> `1.15.1-3` + - [(#8566)](https://github.com/microsoft/vcpkg/pull/8566) [libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d + +- slikenet `2019-10-22` -> `2019-10-22_1` + - [(#8566)](https://github.com/microsoft/vcpkg/pull/8566) [libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d + +- xmlsec `1.2.29` -> `1.2.29-1` + - [(#8566)](https://github.com/microsoft/vcpkg/pull/8566) [libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d + +- yara `3.10.0` -> `3.10.0-1` + - [(#8566)](https://github.com/microsoft/vcpkg/pull/8566) [libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d + +- x264 `157-303c484ec828ed0-6` -> `157-303c484ec828ed0-7` + - [(#9602)](https://github.com/microsoft/vcpkg/pull/9602) [vcpkg] Fix build type in vcpkg_build_make.cmake [x264] Modernize + +- glfw3 `3.3-3` -> `3.3.1` + - [(#9626)](https://github.com/microsoft/vcpkg/pull/9626) [glfw3] Update to 3.3.1 + +- glad `0.1.31` -> `0.1.33` + - [(#9627)](https://github.com/microsoft/vcpkg/pull/9627) [glad] Update to 0.1.33 + +- libxml2 `2.9.9-4` -> `2.9.9-5` + - [(#9636)](https://github.com/microsoft/vcpkg/pull/9636) [libxml2] Apply fixes also to the target of libxml2. + - [(#9492)](https://github.com/microsoft/vcpkg/pull/9492) [libxml2] Embed resources in Windows-based shared library (#9474) + +- gettext `0.19-11` -> `0.19-13` + - [(#9610)](https://github.com/microsoft/vcpkg/pull/9610) [gettext] Add dependency on iconv + - [(#9797)](https://github.com/microsoft/vcpkg/pull/9797) [gettext] fix library placement on macOS + +- xlnt `1.3.0-2` -> `1.4.0` + - [(#9609)](https://github.com/microsoft/vcpkg/pull/9609) [xlnt] Upgrade to v1.4.0 + +- cpr `1.3.0-7` -> `1.3.0-8` + - [(#9567)](https://github.com/microsoft/vcpkg/pull/9567) [cpr] Add find_dependency to cprConfig.cmake + +- sfml `2.5.1-4` -> `2.5.1-6` + - [(#9190)](https://github.com/microsoft/vcpkg/pull/9190) [sfml] Declare Windows library export + - [(#9726)](https://github.com/microsoft/vcpkg/pull/9726) Fix osx baseline build failures + +- libtorrent `1.2.2` -> `1.2.2-1` + - [(#7345)](https://github.com/microsoft/vcpkg/pull/7345) [libtorrent] Fix linkage issues for dynamic builds + +- libffi `3.1-6` -> `3.1-7` + - [(#8895)](https://github.com/microsoft/vcpkg/pull/8895) [libffi] Add libffiConfigVersion.cmake file + +- plplot `5.13.0-3` -> `5.13.0-4` + - [(#8817)](https://github.com/microsoft/vcpkg/pull/8817) [plplot] Fix static build issue + +- libpqxx `6.4.5` -> `6.4.5-1` + - [(#9051)](https://github.com/microsoft/vcpkg/pull/9051) [libpqxx] Fix lib name on Linux + +- freeglut `3.0.0-7` -> `3.0.0-9` + - [(#9155)](https://github.com/microsoft/vcpkg/pull/9155) [glui] Add new port + - [(#9725)](https://github.com/microsoft/vcpkg/pull/9725) [freeglut] Patch header correctly + - [(#9745)](https://github.com/microsoft/vcpkg/pull/9745) [freeglut] check whether debug/release is enabled before moving files + +- ffmpeg `4.2-2` -> `4.2-4` + - [(#9695)](https://github.com/microsoft/vcpkg/pull/9695) [ffmpeg] fix openssl detection + - [(#9718)](https://github.com/microsoft/vcpkg/pull/9718) [ffmpeg] fix link order + +- catch2 `2.11.0` -> `2.11.1` + - [(#9685)](https://github.com/microsoft/vcpkg/pull/9685) [catch2] Update to 2.11.1 + +- boost-accumulators `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-algorithm `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-align `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-any `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-array `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-asio `1.71.0-1` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-assert `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-assign `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-atomic `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-beast `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-bimap `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-bind `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-build `1.70.0-1` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-callable-traits `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-chrono `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-circular-buffer `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-compatibility `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-compute `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-concept-check `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-config `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-container-hash `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-container `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-context `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-contract `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-conversion `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-convert `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-core `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-coroutine `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-coroutine2 `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-crc `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-date-time `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-detail `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-disjoint-sets `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-dll `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-dynamic-bitset `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-endian `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-exception `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-fiber `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-filesystem `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-flyweight `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-foreach `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-format `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-function-types `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-function `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-functional `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-fusion `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-geometry `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-gil `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-graph-parallel `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- boost-graph `1.71.0` -> `1.72.0` + - [(#9317)](https://github.com/microsoft/vcpkg/pull/9317) [boost] Update to 1.72.0 + +- embree3 `3.6.1` -> `3.6.1-1` + - [(#9555)](https://github.com/microsoft/vcpkg/pull/9555) [embree3] added cleanup command to embree3 port for static build + +- libarchive `3.4.0-2` -> `3.4.1` + - [(#9676)](https://github.com/microsoft/vcpkg/pull/9676) [libarchive] Update to 3.4.1 + +- tinyfiledialogs `3.3.8-1` -> `3.4.3` + - [(#9630)](https://github.com/microsoft/vcpkg/pull/9630) [tinyfiledialogs] Fix tinyfiledialogs not being fetchable from sourceforge + +- tesseract `4.1.0-4` -> `4.1.1` + - [(#9629)](https://github.com/microsoft/vcpkg/pull/9629) [tesseract] port update to 4.1.1 release + +- glm `0.9.9.5-3` -> `0.9.9.7` + - [(#9621)](https://github.com/microsoft/vcpkg/pull/9621) [glm] Updated to 0.9.9.7 + +- google-cloud-cpp-spanner `0.3.0` -> `0.5.0` + - [(#9611)](https://github.com/microsoft/vcpkg/pull/9611) [google-cloud-cpp-spanner] Upgrade to the v0.5.0 release. + +- scintilla `4.1.2` -> `4.2.3` + - [(#9591)](https://github.com/microsoft/vcpkg/pull/9591) [scintilla] Update to 4.2.3 + +- ppconsul `0.4` -> `0.5` + - [(#9752)](https://github.com/microsoft/vcpkg/pull/9752) [ppconsul] Add missing boost dependencies + - [(#9713)](https://github.com/microsoft/vcpkg/pull/9713) [ppconsul] Upgrade to latest version + +- boost-signals `1.68.0` -> `1.68.0-1` + - [(#9726)](https://github.com/microsoft/vcpkg/pull/9726) Fix osx baseline build failures + +- gtest `2019-10-09` -> `2019-10-09-1` + - [(#9726)](https://github.com/microsoft/vcpkg/pull/9726) Fix osx baseline build failures + +- pcl `1.9.1-9` -> `1.9.1-10` + - [(#9726)](https://github.com/microsoft/vcpkg/pull/9726) Fix osx baseline build failures + +- soil2 `release-1.11` -> `release-1.11-1` + - [(#9726)](https://github.com/microsoft/vcpkg/pull/9726) Fix osx baseline build failures + +- tmxparser `2.1.0-2` -> `2.1.0-3` + - [(#9726)](https://github.com/microsoft/vcpkg/pull/9726) Fix osx baseline build failures + +- xerces-c `3.2.2-11` -> `3.2.2-13` + - [(#9726)](https://github.com/microsoft/vcpkg/pull/9726) Fix osx baseline build failures + - [(#9702)](https://github.com/microsoft/vcpkg/pull/9702) [xerces-c] fixed issue #9654 + +- openssl `1` -> `1.1.1d` + - [(#9777)](https://github.com/microsoft/vcpkg/pull/9777) [openssl] Update the version + +- open62541 `0.3.0-4` -> `1.0` + - [(#9767)](https://github.com/microsoft/vcpkg/pull/9767) [open62541] Update to v1.0 + +- monkeys-audio `4.8.3-1` -> `5.14` + - [(#9760)](https://github.com/microsoft/vcpkg/pull/9760) [monkeys-audio] Update to 5.14, add feature tools + +- hpx `1.3.0-2` -> `1.4.0-1` + - [(#9773)](https://github.com/microsoft/vcpkg/pull/9773) Updating HPX to V1.4 + +- paho-mqtt `1.3.0-1` -> `1.3.0-2` + - [(#9753)](https://github.com/microsoft/vcpkg/pull/9753) [paho-mqtt] Fix Windows platform predefined macros + +- alembic `1.7.11-6` -> `1.7.12` + - [(#9737)](https://github.com/microsoft/vcpkg/pull/9737) Update Alembic version to 1.7.12 + +- libudns `0.4` -> `0.4-1` + - [(#9703)](https://github.com/microsoft/vcpkg/pull/9703) Update portfiles to use VCPKG_BUILD_TYPE + +- luajit `2.0.5-2` -> `2.0.5-3` + - [(#9703)](https://github.com/microsoft/vcpkg/pull/9703) Update portfiles to use VCPKG_BUILD_TYPE + - [(#9782)](https://github.com/microsoft/vcpkg/pull/9782) [luajit] Copy tool dependencies + +- pfring `2019-10-17` -> `2019-10-17-1` + - [(#9703)](https://github.com/microsoft/vcpkg/pull/9703) Update portfiles to use VCPKG_BUILD_TYPE + +- tcl `8.6.10-2` -> `8.6.10-3` + - [(#9703)](https://github.com/microsoft/vcpkg/pull/9703) Update portfiles to use VCPKG_BUILD_TYPE + +- asmjit `2019-07-11` -> `2020-01-20` + - [(#9770)](https://github.com/microsoft/vcpkg/pull/9770) [asmjit] update to current version + +- so5extra `1.3.1.1` -> `1.4.0` + - [(#9732)](https://github.com/microsoft/vcpkg/pull/9732) [sobjectizer][so5extra] updates to 5.7.0 and 1.4.0 + +- sobjectizer `5.6.1-1` -> `5.7.0` + - [(#9732)](https://github.com/microsoft/vcpkg/pull/9732) [sobjectizer][so5extra] updates to 5.7.0 and 1.4.0 + +- string-theory `2.3` -> `3.1` + - [(#9690)](https://github.com/microsoft/vcpkg/pull/9690) [string_theory] Update to 3.0 + - [(#9833)](https://github.com/microsoft/vcpkg/pull/9833) [string_theory] Update to 3.1 + +- anyrpc `2017-12-01-1` -> `2020-01-13-1` + - [(#9682)](https://github.com/microsoft/vcpkg/pull/9682) [anyrpc] Updated to latest commit + +- jasper `2.0.16-2` -> `2.0.16-3` + - [(#9680)](https://github.com/microsoft/vcpkg/pull/9680) [jasper] freeglut is not a dependency in macOS + +- cryptopp `8.2.0` -> `8.2.0-1` + - [(#9633)](https://github.com/microsoft/vcpkg/pull/9633) [cryptopp] Fixed build error on ARM32/ARM64 Windows + +- angle `2019-07-19-4` -> `2019-12-31` + - [(#9557)](https://github.com/microsoft/vcpkg/pull/9557) [angle] Update to 2019-12-31 + +- pbc `0.5.14-1` -> `0.5.14-2` + - [(#9281)](https://github.com/microsoft/vcpkg/pull/9281) [pbc] Correct non Windows build + +- fizz `2019.10.28.00` -> `2020.01.20.00` + - [(#9779)](https://github.com/microsoft/vcpkg/pull/9779) [fizz] Update to latest version + +- hyperscan `5.0.1-2` -> `5.1.0-3` + - [(#9618)](https://github.com/microsoft/vcpkg/pull/9618) [hyperscan] Update the portfile to remove debug/share file + +- coroutine `1.4.3` -> `2020-01-13` + - [(#9624)](https://github.com/microsoft/vcpkg/pull/9624) [ms-gsl] Update to v2.1.0, the "end of 2019 snapshot" + +- ms-gsl `2019-07-11` -> `2.1.0` + - [(#9624)](https://github.com/microsoft/vcpkg/pull/9624) [ms-gsl] Update to v2.1.0, the "end of 2019 snapshot" + +- ftgl `2.4.0-1` -> `2.4.0-2` + - [(#9521)](https://github.com/microsoft/vcpkg/pull/9521) [ftgl] Fix build failure #9520 + +- sdl2-mixer `2.0.4-7` -> `2.0.4-8` + - [(#9332)](https://github.com/microsoft/vcpkg/pull/9332) [sdl2-mixer] Fix dynamic loading when building static library + +- sdl2-gfx `1.0.4-4` -> `1.0.4-5` + - [(#9314)](https://github.com/microsoft/vcpkg/pull/9314) [sdl2-gfx] Fixed build error ARM64 Windows 10 + +- restclient-cpp `0.5.1-2` -> `0.5.1-3` + - [(#9487)](https://github.com/microsoft/vcpkg/pull/9487) [restclient-cpp]: correct the way to remove debug/include + +- jsoncpp `1.9.1` -> `1.9.2` + - [(#9759)](https://github.com/microsoft/vcpkg/pull/9759) [Jsoncpp] Update to 1.9.2 + +- loguru `v2.0.0` -> `v2.1.0` + - [(#8682)](https://github.com/microsoft/vcpkg/pull/8682) [loguru] Update to 2.1.0 and extend to generate proper binary on non-windows + +- gsl-lite `0.34.0` -> `0.36.0` + - [(#9827)](https://github.com/microsoft/vcpkg/pull/9827) [gsl-lite] Update to version 0.36.0 + +- telnetpp `2.0-2` -> `2.0-3` + - [(#9827)](https://github.com/microsoft/vcpkg/pull/9827) [gsl-lite] Update to version 0.36.0 + +- cgal `5.0` -> `5.0.1` + - [(#9831)](https://github.com/microsoft/vcpkg/pull/9831) [cgal] Upgrade to 5.0.1 + +- avro-c `1.8.2-3` -> `1.8.2-4` + - [(#9808)](https://github.com/microsoft/vcpkg/pull/9808) [avro-c] enable Snappy codec + +- pango `1.40.11-5` -> `1.40.11-6` + - [(#9801)](https://github.com/microsoft/vcpkg/pull/9801) [pango] fix macOS dynamic library + +- eigen3 `3.3.7-3` -> `3.3.7-4` + - [(#9821)](https://github.com/microsoft/vcpkg/pull/9821) Update eigen3's portfile to use new gitlab repo + +- aws-c-common `0.4.1` -> `0.4.15` + - [(#8832)](https://github.com/microsoft/vcpkg/pull/8832) [aws-*]Update version + +- aws-c-event-stream `0.1.1` -> `0.1.4` + - [(#8832)](https://github.com/microsoft/vcpkg/pull/8832) [aws-*]Update version + +- aws-checksums `0.1.3` -> `0.1.5` + - [(#8832)](https://github.com/microsoft/vcpkg/pull/8832) [aws-*]Update version + +- aws-lambda-cpp `0.1.0-2` -> `0.2.4` + - [(#8832)](https://github.com/microsoft/vcpkg/pull/8832) [aws-*]Update version + +- aws-sdk-cpp `1.7.142-1` -> `1.7.214` + - [(#8832)](https://github.com/microsoft/vcpkg/pull/8832) [aws-*]Update version + +- azure-c-shared-utility `2019-10-07.2-1` -> `2020-01-22` + - [(#9805)](https://github.com/microsoft/vcpkg/pull/9805) Azure-IoT-Sdk for C release 2020-01-22 + +- azure-iot-sdk-c `2019-11-27.1` -> `2020-01-22` + - [(#9805)](https://github.com/microsoft/vcpkg/pull/9805) Azure-IoT-Sdk for C release 2020-01-22 + +- azure-macro-utils-c `2019-11-27.1` -> `2020-01-22` + - [(#9805)](https://github.com/microsoft/vcpkg/pull/9805) Azure-IoT-Sdk for C release 2020-01-22 + +- azure-uamqp-c `2019-11-27.1` -> `2020-01-22` + - [(#9805)](https://github.com/microsoft/vcpkg/pull/9805) Azure-IoT-Sdk for C release 2020-01-22 + +- azure-uhttp-c `2019-11-27.1` -> `2020-01-22` + - [(#9805)](https://github.com/microsoft/vcpkg/pull/9805) Azure-IoT-Sdk for C release 2020-01-22 + +- azure-umqtt-c `2019-11-27.1` -> `2020-01-22` + - [(#9805)](https://github.com/microsoft/vcpkg/pull/9805) Azure-IoT-Sdk for C release 2020-01-22 + +- umock-c `2019-11-27.1` -> `2020-01-22` + - [(#9805)](https://github.com/microsoft/vcpkg/pull/9805) Azure-IoT-Sdk for C release 2020-01-22 + +
+ +-- vcpkg team vcpkg@microsoft.com THU, 05 Jan 15:00:00 -0800 + +vcpkg (2019.12.31) +--- +#### Total port count: 1268 +#### Total port count per triplet (tested): +|triplet|ports available| +|---|---| +|**x64-windows**|1181| +|x86-windows|1166| +|x64-windows-static|1087| +|**x64-linux**|1000| +|**x64-osx**|920| +|arm64-windows|795| +|x64-uwp|642| +|arm-uwp|615| + +#### The following documentation has been updated: +- [PR Review Checklist](docs/maintainers/pr-review-checklist.md) ***[NEW]*** + - [(#9264)](https://github.com/microsoft/vcpkg/pull/9264) [vcpkg] Initialize PR review checklist +- [vcpkg_install_qmake](docs/maintainers/vcpkg_install_qmake.md) ***[NEW]*** + - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake +- [CONTROL Files](docs/maintainers/control-files.md) + - [(#9140)](https://github.com/microsoft/vcpkg/pull/9140) [docs] Fix CONTROL file default-features section header +- [Portfile Functions](docs/maintainers/portfile-functions.md) + - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake +- [vcpkg_build_nmake](docs/maintainers/vcpkg_build_nmake.md) + - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake +- [vcpkg_common_definitions](docs/maintainers/vcpkg_common_definitions.md) + - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake +- [vcpkg_configure_make](docs/maintainers/vcpkg_configure_make.md) + - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake +- [vcpkg_download_distfile](docs/maintainers/vcpkg_download_distfile.md) + - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake +- [vcpkg_extract_source_archive_ex](docs/maintainers/vcpkg_extract_source_archive_ex.md) + - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake +- [vcpkg_find_acquire_program](docs/maintainers/vcpkg_find_acquire_program.md) + - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake +- [vcpkg_install_nmake](docs/maintainers/vcpkg_install_nmake.md) + - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake + +#### The following changes have been made to vcpkg's infrastructure: +- [(#9160)](https://github.com/microsoft/vcpkg/pull/9160) [ffmpeg] Fixed build error ARM64 Windows 10 +- [(#9199)](https://github.com/microsoft/vcpkg/pull/9199) [vcpkg] Add November changelog +- [(#9203)](https://github.com/microsoft/vcpkg/pull/9203) [vcpkg] Check in baseline results for CI builds +- [(#9191)](https://github.com/microsoft/vcpkg/pull/9191) [vcpkg] Give hints for yasm with brew and apt +- [(#9242)](https://github.com/microsoft/vcpkg/pull/9242) [libxslt] Fix writing to locations outside vcpkg in Windows builds +- [(#9279)](https://github.com/microsoft/vcpkg/pull/9279) Removed umock-c:64-windows-static result in baseline +- [(#9280)](https://github.com/microsoft/vcpkg/pull/9280) [vcpkg] Add pull request template +- [(#9331)](https://github.com/microsoft/vcpkg/pull/9331) Update baseline to skip ogre conflicts +- [(#9349)](https://github.com/microsoft/vcpkg/pull/9349) Update baseline with 'leptonica:arm-uwp=fail' +- [(#9277)](https://github.com/microsoft/vcpkg/pull/9277) [brynet] Update to 1.0.5 +- [(#9330)](https://github.com/microsoft/vcpkg/pull/9330) [simpleini] Fix build failure on travis CI +- [(#9313)](https://github.com/microsoft/vcpkg/pull/9313) [opendnp3] Add new port +- [(#9255)](https://github.com/microsoft/vcpkg/pull/9255) [OpenEXR] add missing underscore for OpenEXR_IEXMATH_LIBRARY_DEBUG NAMES +- [(#9252)](https://github.com/microsoft/vcpkg/pull/9252) [rttr] Add dependency rapidjson +- [(#8533)](https://github.com/microsoft/vcpkg/pull/8533) Fix CMAKE_TRY_COMPILE_PLATFORM_VARIABLES +- [(#9382)](https://github.com/microsoft/vcpkg/pull/9382) [directxtk12] Update to dec2019 release +- [(#9383)](https://github.com/microsoft/vcpkg/pull/9383) [directxtex] Update to dec2019 release +- [(#9384)](https://github.com/microsoft/vcpkg/pull/9384) [directxmesh] Update to dec2019 release +- [(#9381)](https://github.com/microsoft/vcpkg/pull/9381) [directxtk] Update to dec2019 release +- [(#9287)](https://github.com/microsoft/vcpkg/pull/9287) Removed unused template function. +- [(#9411)](https://github.com/microsoft/vcpkg/pull/9411) [vcpkg-baseline] Fixes for vtk, libarchive, xalan-c, and openvpn3 on Linux +- [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake +- [(#9388)](https://github.com/microsoft/vcpkg/pull/9388) [hiredis] Support building static +- [(#8624)](https://github.com/microsoft/vcpkg/pull/8624) [protobuf-c]Add new port. +- [(#9389)](https://github.com/microsoft/vcpkg/pull/9389) Remove vtk:x64-linux result in baseline + +
+The following 8 ports have been added: + +|port|version| +|---|---| +|[proxywrapper](https://github.com/microsoft/vcpkg/pull/8916)| 1.0.0 +|[opendnp3](https://github.com/microsoft/vcpkg/pull/9313)| 2.3.2 +|[function2](https://github.com/microsoft/vcpkg/pull/9246)| 4.0.0 +|[protobuf-c](https://github.com/microsoft/vcpkg/pull/8624)| 1.3.2 +|[indicators](https://github.com/microsoft/vcpkg/pull/9315)| 1.5 +|[proxygen](https://github.com/microsoft/vcpkg/pull/8766)| 2019.10.21.00 +|[azure-kinect-sensor-sdk](https://github.com/microsoft/vcpkg/pull/8786)| 1.4.0-alpha.0 +|[xtensor-fftw](https://github.com/microsoft/vcpkg/pull/9159)| 2019-11-30 +
+ +
+The following 72 ports have been updated: + +- restinio `0.6.1` -> `0.6.2` + - [(#9174)](https://github.com/microsoft/vcpkg/pull/9174) [restinio] Update to v.0.6.1.1. + - [(#9293)](https://github.com/microsoft/vcpkg/pull/9293) [restinio] update to 0.6.2 + +- pixman `0.38.0-4` -> `0.38.4-1` + - [(#9170)](https://github.com/microsoft/vcpkg/pull/9170) [pixman] Update to version 0.38.4 + +- cjson `1.7.12` -> `2019-11-30` + - [(#9157)](https://github.com/microsoft/vcpkg/pull/9157) [cjson] Update to 2019-11-30 + +- parallel-hashmap `1.24` -> `1.27` + - [(#9152)](https://github.com/microsoft/vcpkg/pull/9152) [parallel-hashmap] Update to 1.27 + +- jsoncons `0.139.0` -> `0.140.0` + - [(#9124)](https://github.com/microsoft/vcpkg/pull/9124) [jsoncons] Update to v0.140.0 + +- boost-modular-build-helper `1.71.0` -> `1.71.0-1` + - [(#9108)](https://github.com/microsoft/vcpkg/pull/9108) [boost-modular-build-helper] put quotes around the directory + +- protobuf `3.10.0` -> `3.11.2` + - [(#9131)](https://github.com/microsoft/vcpkg/pull/9131) [protobuf] Update protobuf to 3.11.0 + - [(#9271)](https://github.com/microsoft/vcpkg/pull/9271) [protobuf] Update to 3.11.2 + +- ecsutil `1.0.7.3` -> `1.0.7.8` + - [(#8885)](https://github.com/microsoft/vcpkg/pull/8885) [ecsuti] Update to v1.0.7.8 + +- libmodman `2.0.1` -> `2.0.1-1` + - [(#8916)](https://github.com/microsoft/vcpkg/pull/8916) [proxywrapper] Add new port + +- libproxy `0.4.15` -> `0.4.15-1` + - [(#8916)](https://github.com/microsoft/vcpkg/pull/8916) [proxywrapper] Add new port + +- xalan-c `1.11-9` -> `1.11-11` + - [(#9203)](https://github.com/microsoft/vcpkg/pull/9203) [vcpkg] Check in baseline results for CI builds + - [(#9411)](https://github.com/microsoft/vcpkg/pull/9411) [vcpkg-baseline] Fixes for vtk, libarchive, xalan-c, and openvpn3 on Linux + +- libxslt `1.1.33-5` -> `1.1.33-6` + - [(#9242)](https://github.com/microsoft/vcpkg/pull/9242) [libxslt] Fix writing to locations outside vcpkg in Windows builds + +- azure-c-shared-utility `2019-10-07.2` -> `2019-10-07.2-1` + - [(#9117)](https://github.com/microsoft/vcpkg/pull/9117) [azure-iot-sdk-c] Update macro-utils and umock-c to differentiate master and public-preview installations + +- azure-iot-sdk-c `2019-11-21.1` -> `2019-11-27.1` + - [(#9117)](https://github.com/microsoft/vcpkg/pull/9117) [azure-iot-sdk-c] Update macro-utils and umock-c to differentiate master and public-preview installations + +- azure-macro-utils-c `2019-10-07.2` -> `2019-11-27.1` + - [(#9117)](https://github.com/microsoft/vcpkg/pull/9117) [azure-iot-sdk-c] Update macro-utils and umock-c to differentiate master and public-preview installations + +- azure-uamqp-c `2019-10-07.2` -> `2019-11-27.1` + - [(#9117)](https://github.com/microsoft/vcpkg/pull/9117) [azure-iot-sdk-c] Update macro-utils and umock-c to differentiate master and public-preview installations + +- azure-uhttp-c `2019-10-07.2` -> `2019-11-27.1` + - [(#9117)](https://github.com/microsoft/vcpkg/pull/9117) [azure-iot-sdk-c] Update macro-utils and umock-c to differentiate master and public-preview installations + +- azure-umqtt-c `2019-10-07.2` -> `2019-11-27.1` + - [(#9117)](https://github.com/microsoft/vcpkg/pull/9117) [azure-iot-sdk-c] Update macro-utils and umock-c to differentiate master and public-preview installations + +- umock-c `2019-10-07.2` -> `2019-11-27.1` + - [(#9117)](https://github.com/microsoft/vcpkg/pull/9117) [azure-iot-sdk-c] Update macro-utils and umock-c to differentiate master and public-preview installations + +- python3 `3.7.4` -> `3.7.3` + - [(#9173)](https://github.com/microsoft/vcpkg/pull/9173) [python3] Fix CONTROL Version + +- brynet `1.0.3` -> `1.0.5` + - [(#9277)](https://github.com/microsoft/vcpkg/pull/9277) [brynet] Update to 1.0.5 + +- cpp-httplib `0.2.5` -> `0.4.2` + - [(#9360)](https://github.com/microsoft/vcpkg/pull/9360) [cpp-httplib] Update library to 0.4.2 + +- botan `2.12.1` -> `2.12.1-1` + - [(#9335)](https://github.com/microsoft/vcpkg/pull/9335) [botan] Fix unrecognized compile flag MT/MD + +- simpleini `2018-08-31-2` -> `2018-08-31-3` + - [(#9330)](https://github.com/microsoft/vcpkg/pull/9330) [simpleini] Fix build failure on travis CI + +- libpcap `1.9.0` -> `1.9.1` + - [(#9329)](https://github.com/microsoft/vcpkg/pull/9329) [libpcap] update portfile for cmake build and bump version to 1.9.1 + +- live555 `latest` -> `latest-1` + - [(#9303)](https://github.com/microsoft/vcpkg/pull/9303) [live555] Fix live555:x86-windows-static build failure + +- usockets `0.3.1` -> `0.3.4` + - [(#9278)](https://github.com/microsoft/vcpkg/pull/9278) [usockets] update to 0.3.4 + +- uwebsockets `0.15.7` -> `0.16.5` + - [(#9276)](https://github.com/microsoft/vcpkg/pull/9276) [uwebsockets] update to 0.16.5 + +- check `0.13.0` -> `0.13.0-1` + - [(#9267)](https://github.com/microsoft/vcpkg/pull/9267) [check] Fix library cannot be found + +- tesseract `4.1.0-3` -> `4.1.0-4` + - [(#9266)](https://github.com/microsoft/vcpkg/pull/9266) [tesseract] Fix feature name and build error + +- libharu `2017-08-15-8` -> `2017-08-15-9` + - [(#9261)](https://github.com/microsoft/vcpkg/pull/9261) [libharu] Remove symbols also exported from tiff (as a default feature) + +- alembic `1.7.11-5` -> `1.7.11-6` + - [(#9255)](https://github.com/microsoft/vcpkg/pull/9255) [OpenEXR] add missing underscore for OpenEXR_IEXMATH_LIBRARY_DEBUG NAMES + +- openexr `2.3.0-4` -> `2.3.0-5` + - [(#9255)](https://github.com/microsoft/vcpkg/pull/9255) [OpenEXR] add missing underscore for OpenEXR_IEXMATH_LIBRARY_DEBUG NAMES + +- xeus `0.20.0` -> `0.20.0-1` + - [(#9254)](https://github.com/microsoft/vcpkg/pull/9254) [xeus] Fix build error with Visual Studio 2019 + +- libpq `9.6.1-8` -> `9.6.3` + - [(#9253)](https://github.com/microsoft/vcpkg/pull/9253) [libpq] Fix version mismatch between CONTROL and portfile + +- rttr `0.9.6-1` -> `0.9.6-2` + - [(#9252)](https://github.com/microsoft/vcpkg/pull/9252) [rttr] Add dependency rapidjson + +- proj4 `6.2.0-1` -> `6.2.1-1` + - [(#9227)](https://github.com/microsoft/vcpkg/pull/9227) [proj4] Update to version 6.2.1; disable exporting symbols for static libraries + +- geotrans `3.7` -> `3.7-1` + - [(#9217)](https://github.com/microsoft/vcpkg/pull/9217) [geotrans] Add macro LITTLE_ENDIAN + +- mongoose `6.15-1` -> `6.15-2` + - [(#9209)](https://github.com/microsoft/vcpkg/pull/9209) [mongoose] Add feature ssl + +- ecm `5.60.0-1` -> `5.60.0-2` + - [(#9210)](https://github.com/microsoft/vcpkg/pull/9210) [ecm] Add usage to fix printing error messages + +- tbb `2019_U8-2` -> `2019_U8-3` + - [(#9188)](https://github.com/microsoft/vcpkg/pull/9188) [tbb] Set fatal build tool requirements for UNIX + +- libqglviewer `2.7.0-2` -> `2.7.2-2` + - [(#9186)](https://github.com/microsoft/vcpkg/pull/9186) [libqglviewer] update to 2.7.2 + - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake + +- nanodbc `2.12.4-4` -> `2.12.4-5` + - [(#9185)](https://github.com/microsoft/vcpkg/pull/9185) [nanodbc] Set NANODBC_ENABLE_UNICODE to OFF + +- libevent `2.1.11-1` -> `2.1.11-2` + - [(#9101)](https://github.com/microsoft/vcpkg/pull/9101) [libevent] Add thread as default feature + +- directxtk12 `oct2019` -> `dec2019` + - [(#9382)](https://github.com/microsoft/vcpkg/pull/9382) [directxtk12] Update to dec2019 release + +- directxtex `oct2019` -> `dec2019` + - [(#9383)](https://github.com/microsoft/vcpkg/pull/9383) [directxtex] Update to dec2019 release + +- directxmesh `aug2019` -> `dec2019` + - [(#9384)](https://github.com/microsoft/vcpkg/pull/9384) [directxmesh] Update to dec2019 release + +- directxtk `oct2019` -> `dec2019` + - [(#9381)](https://github.com/microsoft/vcpkg/pull/9381) [directxtk] Update to dec2019 release + +- nano-signal-slot `2018-08-25-1` -> `2.0.1` + - [(#9376)](https://github.com/microsoft/vcpkg/pull/9376) [nano-signal-slot] Update to latest version + +- libarchive `3.4.0-1` -> `3.4.0-2` + - [(#9411)](https://github.com/microsoft/vcpkg/pull/9411) [vcpkg-baseline] Fixes for vtk, libarchive, xalan-c, and openvpn3 on Linux + +- openvpn3 `3.4.1` -> `3.4.1-1` + - [(#9411)](https://github.com/microsoft/vcpkg/pull/9411) [vcpkg-baseline] Fixes for vtk, libarchive, xalan-c, and openvpn3 on Linux + +- ffmpeg `4.2-1` -> `4.2-2` + - [(#9405)](https://github.com/microsoft/vcpkg/pull/9405) [ffmpeg] portfile: fix typo Relase->Release + - [(#9090)](https://github.com/microsoft/vcpkg/pull/9090) [ffmpeg] install correct copyright file and enable (L)GPLv3 builds + +- entt `3.1.1` -> `3.2.2` + - [(#9409)](https://github.com/microsoft/vcpkg/pull/9409) [entt] Upgrade library to 3.2.2 + +- doctest `2.3.5` -> `2.3.6` + - [(#9403)](https://github.com/microsoft/vcpkg/pull/9403) [doctest] Update library to 2.3.6 + +- qcustomplot `2.0.1-1` -> `2.0.1-3` + - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake + +- qscintilla `2.10-9` -> `2.10-11` + - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake + +- qt5-base `5.12.5-3` -> `5.12.5-7` + - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake + +- qwt `6.1.3-8` -> `6.1.3-10` + - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake + +- hiredis `2019-11-1` -> `2019-11-2` + - [(#9388)](https://github.com/microsoft/vcpkg/pull/9388) [hiredis] Support building static + +- argparse `2.0.1` -> `2.1` + - [(#9291)](https://github.com/microsoft/vcpkg/pull/9291) [argparse] Upgrade to v2.1 + +- angle `2019-07-19-3` -> `2019-07-19-4` + - [(#7923)](https://github.com/microsoft/vcpkg/pull/7923) [angle]Fix windows build error: cannot find definition far. + +- libwebp `1.0.2-7` -> `1.0.2-8` + - [(#9300)](https://github.com/microsoft/vcpkg/pull/9300) [libwebp] Fixed build error ARM64 Windows 10 + +- libpng `1.6.37-5` -> `1.6.37-6` + - [(#9198)](https://github.com/microsoft/vcpkg/pull/9198) [libpng] Strong cleanup of the port + +- libgit2 `0.28.3` -> `0.28.4` + - [(#9270)](https://github.com/microsoft/vcpkg/pull/9270) [libgit2] Update to 0.28.4 + +- embree3 `3.5.2-3` -> `3.6.1` + - [(#9073)](https://github.com/microsoft/vcpkg/pull/9073) [embree3] Update to version 3.6.1 + +- pmdk `1.7` -> `1.7-1` + - [(#9094)](https://github.com/microsoft/vcpkg/pull/9094) [pmdk] Remove non-ascii charactor + +- fftwpp `2.05` -> `2019-12-19` + - [(#9169)](https://github.com/microsoft/vcpkg/pull/9169) [fftwpp] Update to latest commit + +- freerdp `2.0.0-rc4-2` -> `2.0.0-rc4-3` + - [(#9176)](https://github.com/microsoft/vcpkg/pull/9176) [freerdp] Fix linux build, add dependency port glib + +- abseil `2019-05-08-1` -> `2019-12-19` + - [(#9367)](https://github.com/microsoft/vcpkg/pull/9367) [abseil] Update to the latest and fix link failure error using StrCat + +- sdl2-gfx `1.0.4-2` -> `1.0.4-4` + - [(#9319)](https://github.com/microsoft/vcpkg/pull/9319) [sdl2-gfx] Update CMake build and find_package support + +- io2d `2019-07-11-1` -> `2019-07-11-2` + - [(#8935)](https://github.com/microsoft/vcpkg/pull/8935) [io2d] Fix link to target "Cairo::Cairo" error + +- vtk `8.2.0-9` -> `8.2.0-10` + - [(#9389)](https://github.com/microsoft/vcpkg/pull/9389) Remove vtk:x64-linux result in baseline + +
+ +-- vcpkg team vcpkg@microsoft.com TUE, 09 Jan 05:45:00 -0800 + +vcpkg (2019.11.30) +--- +#### Total port count: 1262 +#### Total port count per triplet (tested): +|triplet|ports available| +|---|---| +|**x64-windows**|1182| +|x86-windows|1163| +|x64-windows-static|1094| +|**x64-linux**|1021| +|**x64-osx**|984| +|arm64-windows|782| +|x64-uwp|646| +|arm-uwp|614| + +#### The following commands and options have been updated: +- `export` + - `--x-chocolatey` ***[NEW OPTION]*** : Experimental option to export a port as a `chocolatey` package + - [(#6891)](https://github.com/microsoft/vcpkg/pull/6891) [feature] add `vcpkg export --x-chocolatey` support + +#### The following documentation has been updated: +- [vcpkg_from_github](docs/maintainers/vcpkg_from_github.md) + - [(#5719)](https://github.com/microsoft/vcpkg/pull/5719) [vcpkg_from_github] Allow targeting Github Enterprise instances +- [Privacy and Vcpkg](docs/about/privacy.md) + - [(#9080)](https://github.com/microsoft/vcpkg/pull/9080) [vcpkg] update telemetry + +#### The following additional changes have been made to vcpkg's infrastructure: +- [(#8853)](https://github.com/microsoft/vcpkg/pull/8853) Add October changelog +- [(#8894)](https://github.com/microsoft/vcpkg/pull/8894) Update README.md +- [(#8976)](https://github.com/microsoft/vcpkg/pull/8976) [libusb] upgrade and support arm64-windows +- [(#8924)](https://github.com/microsoft/vcpkg/pull/8924) [vcpkg] Remove libc++fs link dependency for clang/libc++ 9.* +- [(#7598)](https://github.com/microsoft/vcpkg/pull/7598) [vcpkg] QoL: add host specific path separator to common definitions +- [(#8941)](https://github.com/microsoft/vcpkg/pull/8941) [docs] Add the gcc+=7 prerequisite to the README +- [(#5719)](https://github.com/microsoft/vcpkg/pull/5719) [vcpkg_from_github] Allow targeting Github Enterprise instances +- [(#9080)](https://github.com/microsoft/vcpkg/pull/9080) [vcpkg] update telemetry + +
+The following 12 ports have been added: + +|port|version| +|---|---| +|[ogre-next](https://github.com/microsoft/vcpkg/pull/8677)| 2019-10-20 +|[hiredis](https://github.com/microsoft/vcpkg/pull/8843)[#8862](https://github.com/microsoft/vcpkg/pull/8862) | 2019-11-1 +|[cspice](https://github.com/microsoft/vcpkg/pull/8859)| 66-1 +|[ecos](https://github.com/microsoft/vcpkg/pull/9019)| 2.0.7 +|[redis-plus-plus](https://github.com/microsoft/vcpkg/pull/8846)| 1.1.1 +|[nanoflann](https://github.com/microsoft/vcpkg/pull/8962)| 1.3.1 +|[wxchartdir](https://github.com/microsoft/vcpkg/pull/7914)| 1.0.0 +|[faad2](https://github.com/microsoft/vcpkg/pull/9003)| 2.9.1-1 +|[pfring](https://github.com/microsoft/vcpkg/pull/8648)| 2019-10-17 +|[libmodman](https://github.com/microsoft/vcpkg/pull/8931)| 2.0.1 +|[libproxy](https://github.com/microsoft/vcpkg/pull/8931)| 0.4.15 +|[google-cloud-cpp-spanner](https://github.com/microsoft/vcpkg/pull/9096)| 0.3.0 +
+ +
+The following 67 ports have been updated: + +- tbb `2019_U8-1` -> `2019_U8-2` + - [(#8744)](https://github.com/microsoft/vcpkg/pull/8744) tbb: Fix compilation on OSX + +- openvpn3 `2018-03-21-1` -> `3.4.1` + - [(#8851)](https://github.com/microsoft/vcpkg/pull/8851) openvpn3: bump version + +- sqlpp11 `0.58-2` -> `0.58-3` + - [(#8837)](https://github.com/microsoft/vcpkg/pull/8837) [sqlpp11] fixed ddl2cpp path + +- jsonnet `0.13.0` -> `0.14.0` + - [(#8848)](https://github.com/microsoft/vcpkg/pull/8848) [jsonnet]Upgrade to 0.14.0. + +- pango `1.40.11-4` -> `1.40.11-5` + - [(#8745)](https://github.com/microsoft/vcpkg/pull/8745) [pango] Add missing link library + +- opencv3 `3.4.7-2` -> `3.4.8` + - [(#8623)](https://github.com/microsoft/vcpkg/pull/8623) [opencv3] Upgrade to version 3.4.8 + - [(#8911)](https://github.com/microsoft/vcpkg/pull/8911) Revert "[opencv3] Upgrade to version 3.4.8" + +- boost-modular-build-helper `1.70.0-2` -> `1.71.0` + - [(#8606)](https://github.com/microsoft/vcpkg/pull/8606) [boost-modular-build-helper] Update to 1.71. + +- libxslt `1.1.33-4` -> `1.1.33-5` + - [(#9014)](https://github.com/microsoft/vcpkg/pull/9014) Prevent python3 build failure + +- python3 `3.7.3` -> `3.7.4` + - [(#9014)](https://github.com/microsoft/vcpkg/pull/9014) Prevent python3 build failure + +- orc `1.5.6-1` -> `1.5.7` + - [(#8980)](https://github.com/microsoft/vcpkg/pull/8980) [orc]Upgrade to 1.5.7, disable tzdata test. + +- openvdb `6.1.0` -> `6.2.1` + - [(#8979)](https://github.com/microsoft/vcpkg/pull/8979) [openvdb]Upgrade to 6.2.1 + +- libusb `1.0.22-4` -> `1.0.23` + - [(#8976)](https://github.com/microsoft/vcpkg/pull/8976) [libusb] upgrade and support arm64-windows + +- libmad `0.15.1-4` -> `0.15.1-5` + - [(#8959)](https://github.com/microsoft/vcpkg/pull/8959) [libmad] Fix libmad header for non-x86 MSVC targets + +- wil `2019-07-16` -> `2019-11-07` + - [(#8948)](https://github.com/microsoft/vcpkg/pull/8948) Update WIL port + +- botan `2.11.0` -> `2.12.1` + - [(#8844)](https://github.com/microsoft/vcpkg/pull/8844) [botan]Upgrade to 2.12.1 + +- libbson `1.14.0-3` -> `1.15.1-1` + - [(#8790)](https://github.com/microsoft/vcpkg/pull/8790) [libbson][mongo-c-driver] Update to 1.15.1. Parse CONTROL file for version number + +- mongo-c-driver `1.14.0-5` -> `1.15.1-1` + - [(#8790)](https://github.com/microsoft/vcpkg/pull/8790) [libbson][mongo-c-driver] Update to 1.15.1. Parse CONTROL file for version number + +- libpopt `1.16-11` -> `1.16-12` + - [(#8652)](https://github.com/microsoft/vcpkg/pull/8652) [libpopt]Fix linux build. + +- libpng `1.6.37-4` -> `1.6.37-5` + - [(#8622)](https://github.com/microsoft/vcpkg/pull/8622) [lipng/libpng-apng]Remove port libpng-apng and add apng as a feature with libpng. + - [(#8716)](https://github.com/microsoft/vcpkg/pull/8716) [libpng] Fix CMake targets + +- evpp `0.7.0-1` -> `0.7.0-2` + - [(#8349)](https://github.com/microsoft/vcpkg/pull/8349) [libevent] add features + +- libevent `2.1.11` -> `2.1.11-1` + - [(#8349)](https://github.com/microsoft/vcpkg/pull/8349) [libevent] add features + +- restinio `0.6.0.1` -> `0.6.1` + - [(#8993)](https://github.com/microsoft/vcpkg/pull/8993) [restinio] Update to v.0.6.1 + +- google-cloud-cpp-common `0.15.0` -> `0.16.0-1` + - [(#8986)](https://github.com/microsoft/vcpkg/pull/8986) [google-cloud-cpp*] Update to 0.16.0 + - [(#9097)](https://github.com/microsoft/vcpkg/pull/9097) [google-cloud-cpp-common] Add test feature + +- google-cloud-cpp `0.14.0-1` -> `0.15.0` + - [(#8986)](https://github.com/microsoft/vcpkg/pull/8986) [google-cloud-cpp*] Update to 0.16.0 + +- freetype-gl `2019-03-29-2` -> `2019-03-29-3` + - [(#8992)](https://github.com/microsoft/vcpkg/pull/8992) [freetype-gl] Fix POST_BUILD_CHECKS_FAILED failure on Unix + +- tinyobjloader `1.0.7-1` -> `2.0.0-rc2` + - [(#8955)](https://github.com/microsoft/vcpkg/pull/8955) [tinyobjloader] Update to 2.0.0-rc2; Add feature to enable double precision + +- libzip `rel-1-5-2` -> `rel-1-5-2--1` + - [(#8918)](https://github.com/microsoft/vcpkg/pull/8918) [libzip] Fix patch not applying + +- tgui `0.8.5` -> `0.8.6` + - [(#8877)](https://github.com/microsoft/vcpkg/pull/8877) [tgui]Update to 0.8.6 + +- jsoncons `0.136.1` -> `0.139.0` + - [(#9058)](https://github.com/microsoft/vcpkg/pull/9058) [jsoncons] Update to v0.139.0 + +- azure-iot-sdk-c `2019-10-11.2` -> `2019-11-21.1` + - [(#9059)](https://github.com/microsoft/vcpkg/pull/9059) [azure-iot-sdk-c] Update public-preview feature to branch with fixed telemetry + +- tiff `4.0.10-7` -> `4.0.10-8` + - [(#9010)](https://github.com/microsoft/vcpkg/pull/9010) [tiff] Make BUILD_TOOLS option a feature + +- magic-enum `0.6.3` -> `0.6.3-1` + - [(#9007)](https://github.com/microsoft/vcpkg/pull/9007) [magic-enum] Fix export config.cmake issue + +- libflac `1.3.2-6` -> `1.3.3` + - [(#8988)](https://github.com/microsoft/vcpkg/pull/8988) [libflac] Update libflac to 1.3.3 + +- otl `4.0.447` -> `4.0.448` + - [(#8937)](https://github.com/microsoft/vcpkg/pull/8937) [otl] Upgrade to version 4.0.448 + +- librtmp `2.4-2` -> `2019-11-11` + - [(#8958)](https://github.com/microsoft/vcpkg/pull/8958) use latest librtmp + +- stlab `1.4.1-1` -> `1.5.1` + - [(#8901)](https://github.com/microsoft/vcpkg/pull/8901) [stlab] Update to 1.5.1 + +- bitsery `5.0.0` -> `5.0.1-1` + - [(#8892)](https://github.com/microsoft/vcpkg/pull/8892) [bitsery] Update to 5.0.1 + +- cereal `1.2.2-2` -> `1.3.0` + - [(#8913)](https://github.com/microsoft/vcpkg/pull/8913) [cereal] Update to 1.3.0 + +- fizz `2019.07.08.00` -> `2019.10.28.00` + - [(#8765)](https://github.com/microsoft/vcpkg/pull/8765) [folly/fizz]Upgrade version. + +- folly `2019.06.17.00` -> `2019.10.21.00` + - [(#8765)](https://github.com/microsoft/vcpkg/pull/8765) [folly/fizz]Upgrade version. + +- qt5-base `5.12.5-1` -> `5.12.5-3` + - [(#8793)](https://github.com/microsoft/vcpkg/pull/8793) [qt5] Modify qtdeploy to include qtquickshapes + - [(#8932)](https://github.com/microsoft/vcpkg/pull/8932) [qt5-base] Add option to link to OpenSSL at compile-time + +- nlohmann-json `3.7.0` -> `3.7.3` + - [(#9069)](https://github.com/microsoft/vcpkg/pull/9069) [nlohmann-json] Upgrade to 3.7.3 + +- json-dto `0.2.8-2` -> `0.2.9.2` + - [(#9057)](https://github.com/microsoft/vcpkg/pull/9057) [json-dto] Update to v0.2.9; Switch repo; Fix license installation + - [(#9083)](https://github.com/microsoft/vcpkg/pull/9083) [json_dto] Update to v.0.2.9.2 + +- prometheus-cpp `0.7.0` -> `0.8.0` + - [(#9047)](https://github.com/microsoft/vcpkg/pull/9047) [prometheus-cpp] Update to version 0.8.0 + +- date `2019-09-09` -> `2019-11-08` + - [(#9006)](https://github.com/microsoft/vcpkg/pull/9006) [date] Update to 2019-11-08 + +- netcdf-cxx4 `4.3.0-5` -> `4.3.1` + - [(#8978)](https://github.com/microsoft/vcpkg/pull/8978) [netcdf-cxx4] Update to 4.3.1 + +- libsodium `1.0.18-1` -> `1.0.18-2` + - [(#8974)](https://github.com/microsoft/vcpkg/pull/8974) [libsodium] Fix CPU feature not properly detected on Linux + +- cgal `4.14-3` -> `5.0` + - [(#8659)](https://github.com/microsoft/vcpkg/pull/8659) [cgal][openmvs] CGAL: Upgrade to 5.0 + +- openmvs `1.0-2` -> `1.0-3` + - [(#8659)](https://github.com/microsoft/vcpkg/pull/8659) [cgal][openmvs] CGAL: Upgrade to 5.0 + +- ace `6.5.6` -> `6.5.7` + - [(#9074)](https://github.com/microsoft/vcpkg/pull/9074) [ace] Upgrade to 6.5.7 + +- libmspack `0.10.1-2` -> `0.10.1-3` + - [(#8966)](https://github.com/microsoft/vcpkg/pull/8966) [libmspack] Fix several missing imports + +- mdnsresponder `765.30.11-1` -> `765.30.11-2` + - [(#8953)](https://github.com/microsoft/vcpkg/pull/8953) [mdnsresponder] Fix build with dynamic CRT + +- detours `4.0.1` -> `4.0.1-1` + - [(#8854)](https://github.com/microsoft/vcpkg/pull/8854) [detours] Update for vcpkg_build_nmake + +- curlpp `2018-06-15-1` -> `2018-06-15-2` + - [(#9065)](https://github.com/microsoft/vcpkg/pull/9065) [curlpp] Restore installing vcpkg-cmake-wrapper script + +- portaudio `2019-09-30` -> `2019-11-5` + - [(#8944)](https://github.com/microsoft/vcpkg/pull/8944) [portaudio] Fix library cannot be found + +- wt `4.0.5-1` -> `4.1.1` + - [(#8903)](https://github.com/microsoft/vcpkg/pull/8903) [wt] Update to 4.1.1 + +- z3 `4.8.5-1` -> `4.8.6` + - [(#8899)](https://github.com/microsoft/vcpkg/pull/8899) [z3] Update to 4.8.6 + +- pdcurses `3.8-1` -> `3.8-2` + - [(#9042)](https://github.com/microsoft/vcpkg/pull/9042) [pdcurses] Fix linkage error + +- angle `2019-07-19-2` -> `2019-07-19-3` + - [(#8785)](https://github.com/microsoft/vcpkg/pull/8785) [angle] Add option /bigobj to compiler + +- argparse `1.9` -> `2.0.1` + - [(#9088)](https://github.com/microsoft/vcpkg/pull/9088) [argparse] Update library to 2.0.1 + +- catch2 `2.10.1-1` -> `2.11.0` + - [(#9089)](https://github.com/microsoft/vcpkg/pull/9089) [catch2] Update library to 2.11.0 + +- magnum-plugins `2019.10` -> `2019.10-1` + - [(#8939)](https://github.com/microsoft/vcpkg/pull/8939) [magnum-plugins] Fix basisimporter/basisimageconverter features + +- spdlog `1.3.1-2` -> `1.4.2` + - [(#8779)](https://github.com/microsoft/vcpkg/pull/8779) [spdlog]Update to 1.4.2 + +- assimp `5.0.0-1` -> `5.0.0-2` + - [(#9075)](https://github.com/microsoft/vcpkg/pull/9075) [minizip, assimp] Export minizip CMake targets; Add minizip as assimp dependency + +- minizip `1.2.11-5` -> `1.2.11-6` + - [(#9075)](https://github.com/microsoft/vcpkg/pull/9075) [minizip, assimp] Export minizip CMake targets; Add minizip as assimp dependency + +- ixwebsocket `6.1.0` -> `7.4.0` + - [(#9099)](https://github.com/microsoft/vcpkg/pull/9099) [ixwebsocket] Update to 7.4.0 + +- ppconsul `0.3-1` -> `0.4` + - [(#9104)](https://github.com/microsoft/vcpkg/pull/9104) [ppconsul] Update to 0.4 + +
+ +-- vcpkg team vcpkg@microsoft.com TUE, 03 Dec 14:30:00 -0800 + +vcpkg (2019.10.31) +--- +#### Total port count: 1250 +#### Total port count per triplet (tested): +|triplet|ports available| +|---|---| +|**x64-windows**|1169| +|x86-windows|1154| +|x64-windows-static|1080| +|**x64-linux**|1014| +|**x64-osx**|976| +|arm64-windows|774| +|x64-uwp|638| +|arm-uwp|608| + +#### The following commands and options have been updated: +- `create` + - Port template updated with best practices, new CMake variables, `CONTROL` homepage field and example feature entries, links to relevant documentation, and maintainer function usage examples + - [(#8427)](https://github.com/microsoft/vcpkg/pull/8427) Update vcpkg create template + - [(#8488)](https://github.com/microsoft/vcpkg/pull/8488) update templates. + +#### The following documentation has been updated: +- [vcpkg_fixup_cmake_targets](docs/maintainers/cmake_fixup_cmake_targets.md) ***[NEW]*** + - [(#8365)](https://github.com/microsoft/vcpkg/pull/8365) [Documentation] Added documentation page for vcpkg_fixup_cmake_targets.cmake + - [(#8424)](https://github.com/microsoft/vcpkg/pull/8424) [Documentation] Update and rename cmake_fixup_cmake_targets.md to vcpkg_fixup_cmake_t… +- [vcpkg_build_make](docs/maintainers/vcpkg_build_make.md) ***[NEW]*** + - [(#8267)](https://github.com/microsoft/vcpkg/pull/8267) Add function vcpkg_configure_make/vcpkg_build_make/vcpkg_install_make/vcpkg_build_nmake/vcpkg_install_nmake +- [vcpkg_build_nmake](docs/maintainers/vcpkg_build_nmake.md) ***[NEW]*** + - [(#8267)](https://github.com/microsoft/vcpkg/pull/8267) Add function vcpkg_configure_make/vcpkg_build_make/vcpkg_install_make/vcpkg_build_nmake/vcpkg_install_nmake + - [(#8589)](https://github.com/microsoft/vcpkg/pull/8589) [libxslt]Using vcpkg_install_nmake in Windows, support unix. +- [vcpkg_configure_make](docs/maintainers/vcpkg_configure_make.md) ***[NEW]*** + - [(#8267)](https://github.com/microsoft/vcpkg/pull/8267) Add function vcpkg_configure_make/vcpkg_build_make/vcpkg_install_make/vcpkg_build_nmake/vcpkg_install_nmake + - [(#8647)](https://github.com/microsoft/vcpkg/pull/8647) support SKIP_CONFIGURE in vcpkg_configure_make. +- [vcpkg_install_make](docs/maintainers/vcpkg_install_make.md) ***[NEW]*** + - [(#8267)](https://github.com/microsoft/vcpkg/pull/8267) Add function vcpkg_configure_make/vcpkg_build_make/vcpkg_install_make/vcpkg_build_nmake/vcpkg_install_nmake +- [vcpkg_install_nmake](docs/maintainers/vcpkg_install_nmake.md) ***[NEW]*** + - [(#8267)](https://github.com/microsoft/vcpkg/pull/8267) Add function vcpkg_configure_make/vcpkg_build_make/vcpkg_install_make/vcpkg_build_nmake/vcpkg_install_nmake + - [(#8589)](https://github.com/microsoft/vcpkg/pull/8589) [libxslt]Using vcpkg_install_nmake in Windows, support unix. +- [Chinese README](README_zh_CN.md) ***[NEW]*** + - [(#8476)](https://github.com/microsoft/vcpkg/pull/8476) Add Chinese readme. +- [Portfile Helper Functions](docs/maintainers/portfile-functions.md) + - [(#8267)](https://github.com/microsoft/vcpkg/pull/8267) Add function vcpkg_configure_make/vcpkg_build_make/vcpkg_install_make/vcpkg_build_nmake/vcpkg_install_nmake +- [Maintainer Guidelines and Policies](docs/maintainers/maintainer-guide.md) + - [(#8720)](https://github.com/microsoft/vcpkg/pull/8720) maintainer-guide.md - Fix link + +#### The following *remarkable* changes have been made to vcpkg's infrastructure: +- New maintainer `portfile.cmake` helper functions for finer control over configuring/building/installing with `make` and `nmake` + - [(#8267)](https://github.com/microsoft/vcpkg/pull/8267) Add function vcpkg_configure_make/vcpkg_build_make/vcpkg_install_make/vcpkg_build_nmake/vcpkg_install_nmake + - [(#8540)](https://github.com/microsoft/vcpkg/pull/8540) Fix separate make and install execution error issue. + - [(#8589)](https://github.com/microsoft/vcpkg/pull/8589) [libxslt]Using vcpkg_install_nmake in Windows, support unix. + - [(#8610)](https://github.com/microsoft/vcpkg/pull/8610) Add AUTOCONF support with vcpkg_configure_make in Windows. + - [(#8647)](https://github.com/microsoft/vcpkg/pull/8647) support SKIP_CONFIGURE in vcpkg_configure_make. +- Support for the `go` compiler in `vcpkg_find_acquire_program` + - [(#8440)](https://github.com/microsoft/vcpkg/pull/8440) Add go to vcpkg_find_acquire_program + +#### The following *additional* changes have been made to vcpkg's infrastructure: +- [(#8365)](https://github.com/microsoft/vcpkg/pull/8365) [Documentation] Added documentation page for vcpkg_fixup_cmake_targets.cmake +- [(#8418)](https://github.com/microsoft/vcpkg/pull/8418) Add September changelog +- [(#8435)](https://github.com/microsoft/vcpkg/pull/8435) Find default for text/plain on Linux and Windows (#567) +- [(#8489)](https://github.com/microsoft/vcpkg/pull/8489) Fix option -j +- [(#8580)](https://github.com/microsoft/vcpkg/pull/8580) Fix CMake checks for Apple Clang 11.0 on macOS 10.15 +- [(#8638)](https://github.com/microsoft/vcpkg/pull/8638) Fix compile error in Visual Studio 2017 15.1 +- [(#8669)](https://github.com/microsoft/vcpkg/pull/8669) [vcpkg_download_distfile.cmake] Fix Examples +- [(#8667)](https://github.com/microsoft/vcpkg/pull/8667) vcpkg_configure_meson - Remove compiler flag /Oi +- [(#8639)](https://github.com/microsoft/vcpkg/pull/8639) mesonbuild - Update to 0.52.0 + +
+The following 24 ports have been added: + +|port|version| +|---|---| +|[cpp-base64](https://github.com/microsoft/vcpkg/pull/8368)| 2019-06-19 +|[mgnlibs](https://github.com/microsoft/vcpkg/pull/8390)| 2019-09-29 +|[mmx](https://github.com/microsoft/vcpkg/pull/8384)| 2019-09-29 +|[kcp](https://github.com/microsoft/vcpkg/pull/8278)| 2019-09-20 +|[dbow3](https://github.com/microsoft/vcpkg/pull/8547)| 1.0.0 +|[nlohmann-fifo-map](https://github.com/microsoft/vcpkg/pull/8458)| 2018.05.07 +|[libcrafter](https://github.com/microsoft/vcpkg/pull/8568)| 0.3 +|[libudns](https://github.com/microsoft/vcpkg/pull/8572)| 0.4 +|[ffnvcodec](https://github.com/microsoft/vcpkg/pull/8559)| 9.1.23.0 +|[bfgroup-lyra](https://github.com/microsoft/vcpkg/pull/8612)| 1.1 +|[google-cloud-cpp-common](https://github.com/microsoft/vcpkg/pull/8735)| 0.15.0 +|[libsrt](https://github.com/microsoft/vcpkg/pull/8712)| 1.3.4 +|[polyhook2](https://github.com/microsoft/vcpkg/pull/8719)| 2019-10-24 +|[tool-meson](https://github.com/microsoft/vcpkg/pull/8639)| 0.52.0 +|[slikenet](https://github.com/microsoft/vcpkg/pull/8693)| 2019-10-22 +|[libigl](https://github.com/microsoft/vcpkg/pull/8607)| 2.1.0-1 +|[libmesh](https://github.com/microsoft/vcpkg/pull/8592)| 1.5.0 +|[upb](https://github.com/microsoft/vcpkg/pull/8681)| 2019-10-21 +|[opencensus-cpp](https://github.com/microsoft/vcpkg/pull/8740)| 0.4.0 +|[openscap](https://github.com/microsoft/vcpkg/pull/8654)| 1.3.1 +|[fftwpp](https://github.com/microsoft/vcpkg/pull/8625)| 2.05 +|[ois](https://github.com/microsoft/vcpkg/pull/8507)| 1.5 +|[libdivide](https://github.com/microsoft/vcpkg/pull/8320)| 3.0 +|[wordnet](https://github.com/microsoft/vcpkg/pull/8816)| 3.0 +
+ +
+The following 151 ports have been updated: + +- kangaru `4.2.0` -> `4.2.1` + - [(#8414)](https://github.com/microsoft/vcpkg/pull/8414) [kangaru] Update library to 4.2.1 + +- magic-enum `0.6.0` -> `0.6.3` + - [(#8431)](https://github.com/microsoft/vcpkg/pull/8431) [magic_enum] Update to 0.6.1. Add HEAD_REF + - [(#8500)](https://github.com/microsoft/vcpkg/pull/8500) [magic-enum] Update to 0.6.2 + - [(#8656)](https://github.com/microsoft/vcpkg/pull/8656) [magic-enum] Update to 0.6.3 + +- json5-parser `1.0.0` -> `1.0.0-1` + - [(#8401)](https://github.com/microsoft/vcpkg/pull/8401) [json5-parser] fix find_package issue + +- reproc `8.0.1` -> `9.0.0` + - [(#8411)](https://github.com/microsoft/vcpkg/pull/8411) Update reproc to 9.0.0. + +- libfabric `1.8.0` -> `1.8.1` + - [(#8415)](https://github.com/microsoft/vcpkg/pull/8415) [libfabric] Update library to 1.8.1 + +- thrift `2019-05-07-3` -> `2019-05-07-4` + - [(#8410)](https://github.com/microsoft/vcpkg/pull/8410) [thrift]fix-paths + +- grpc `1.23.0` -> `1.23.1-1` + - [(#8438)](https://github.com/microsoft/vcpkg/pull/8438) [grpc] Update grpc to 1.23.1 + - [(#8737)](https://github.com/microsoft/vcpkg/pull/8737) [grpc]Fix build failure in Linux: duplicate function gettid. + +- protobuf `3.9.1` -> `3.10.0` + - [(#8439)](https://github.com/microsoft/vcpkg/pull/8439) [protobuf] Update protobuf to 3.10.0 + +- google-cloud-cpp `0.13.0` -> `0.14.0` + - [(#8441)](https://github.com/microsoft/vcpkg/pull/8441) [google-cloud-cpp] Update to v0.14.0 + +- nrf-ble-driver `4.1.1` -> `4.1.1-1` + - [(#8437)](https://github.com/microsoft/vcpkg/pull/8437) [nrf-ble-driver] Fix version number + +- plplot `5.13.0-2` -> `5.13.0-3` + - [(#8405)](https://github.com/microsoft/vcpkg/pull/8405) fix find_package(wxWidgets) issue in release build + +- freexl `1.0.4-2` -> `1.0.4-8` + - [(#8267)](https://github.com/microsoft/vcpkg/pull/8267) Add function vcpkg_configure_make/vcpkg_build_make/vcpkg_install_make/vcpkg_build_nmake/vcpkg_install_nmake + - [(#8489)](https://github.com/microsoft/vcpkg/pull/8489) Fix option -j + - [(#8540)](https://github.com/microsoft/vcpkg/pull/8540) Fix separate make and install execution error issue. + +- libosip2 `5.1.0` -> `5.1.0-1` + - [(#8267)](https://github.com/microsoft/vcpkg/pull/8267) Add function vcpkg_configure_make/vcpkg_build_make/vcpkg_install_make/vcpkg_build_nmake/vcpkg_install_nmake + +- x264 `157-303c484ec828ed0-2` -> `157-303c484ec828ed0-6` + - [(#8267)](https://github.com/microsoft/vcpkg/pull/8267) Add function vcpkg_configure_make/vcpkg_build_make/vcpkg_install_make/vcpkg_build_nmake/vcpkg_install_nmake + - [(#8489)](https://github.com/microsoft/vcpkg/pull/8489) Fix option -j + - [(#8540)](https://github.com/microsoft/vcpkg/pull/8540) Fix separate make and install execution error issue. + +- qt5-tools `5.12.5-1` -> `5.12.5-2` + - [(#8373)](https://github.com/microsoft/vcpkg/pull/8373) [qt5-tools] change control file so activeqt isn't a dependency on non windows + +- metis `5.1.0-5` -> `5.1.0-6` + - [(#8376)](https://github.com/microsoft/vcpkg/pull/8376) [metis][suitesparse] add metisConfig.cmake + +- suitesparse `5.4.0-3` -> `5.4.0-4` + - [(#8376)](https://github.com/microsoft/vcpkg/pull/8376) [metis][suitesparse] add metisConfig.cmake + +- activemq-cpp `3.9.5` -> `3.9.5-1` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- alac-decoder `0.2-1` -> `0.2-3` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- angelscript `2.33.1-1` -> `2.34.0` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + - [(#8520)](https://github.com/microsoft/vcpkg/pull/8520) [angelscript] Upgrade to version 2.34.0 + +- anyrpc `2017-12-01` -> `2017-12-01-1` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- apr-util `1.6.0-3` -> `1.6.0-5` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- apr `1.6.5-2` -> `1.6.5-3` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- argtable2 `2.13-2` -> `2.13-4` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- atk `2.24.0-4` -> `2.24.0-5` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- atkmm `2.24.2-1` -> `2.24.2-2` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- aubio `0.4.9` -> `0.4.9-1` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- azure-c-shared-utility `2019-08-20.1` -> `2019-10-07.2` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + - [(#8513)](https://github.com/microsoft/vcpkg/pull/8513) [azure] Update azure-iot-sdk-c for release of 2019-10-07 + - [(#8686)](https://github.com/microsoft/vcpkg/pull/8686) [azure] Update azure-iot-sdk-c for 07/2019 LTS refresh + - [(#8731)](https://github.com/microsoft/vcpkg/pull/8731) Revert "[azure] Update azure-iot-sdk-c for 07/2019 LTS refresh (#8686)" + +- berkeleydb `4.8.30-2` -> `4.8.30-3` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- bigint `2010.04.30-3` -> `2010.04.30-4` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- blaze `3.6` -> `3.6-1` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- bond `8.1.0-2` -> `8.1.0-3` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- boost-di `1.1.0` -> `1.1.0-1` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- butteraugli `2019-05-08` -> `2019-05-08-1` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- cairomm `1.15.3-3` -> `1.15.3-4` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- cartographer `1.0.0-1` -> `1.0.0-2` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- ccd `2.1-1` -> `2.1-3` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- ccfits `2.5-3` -> `2.5-4` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- cfitsio `3.410-2` -> `3.410-3` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- charls `2.0.0-2` -> `2.0.0-3` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- chmlib `0.40-3` -> `0.40-4` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- clblas `2.12-2` -> `2.12-3` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- clblast `1.5.0` -> `1.5.0-1` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- clfft `2.12.2-1` -> `2.12.2-2` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- collada-dom `2.5.0-2` -> `2.5.0-3` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- console-bridge `0.4.3-1` -> `0.4.3-2` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- cppkafka `0.3.1-1` -> `0.3.1-2` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- cppunit `1.14.0` -> `1.14.0-1` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- cunit `2.1.3-2` -> `2.1.3-3` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- dlfcn-win32 `1.1.1-3` -> `1.1.1-4` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- dmlc `2019-08-12` -> `2019-08-12-1` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- duktape `2.4.0-4` -> `2.4.0-6` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + - [(#8767)](https://github.com/microsoft/vcpkg/pull/8767) [duktape] fix pip and pyyaml install issue + +- entityx `1.3.0-1` -> `1.3.0-2` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- epsilon `0.9.2` -> `0.9.2-1` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- fcl `0.5.0-6` -> `0.5.0-7` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- flint `2.5.2-3` -> `2.5.2-4` + - [(#8087)](https://github.com/microsoft/vcpkg/pull/8087) [vcpkg] fatal_error when patch fails to apply + +- nameof `2019-07-13` -> `0.9.2` + - [(#8464)](https://github.com/microsoft/vcpkg/pull/8464) [nameof] Update to 0.9.1 + - [(#8671)](https://github.com/microsoft/vcpkg/pull/8671) [nameof] Update to 0.9.2 + +- gsl-lite `0.28.0` -> `0.34.0` + - [(#8465)](https://github.com/microsoft/vcpkg/pull/8465) [gsl-lite] Update to v0.34.0 + +- libffi `3.1-5` -> `3.1-6` + - [(#8162)](https://github.com/microsoft/vcpkg/pull/8162) [libffi] Add support for CMake config + +- mathgl `2.4.3-2` -> `2.4.3-3` + - [(#8369)](https://github.com/microsoft/vcpkg/pull/8369) [mathgl]Fix feature glut/hdf5/qt5. + +- yoga `1.14.0` -> `1.16.0-1` + - [(#8495)](https://github.com/microsoft/vcpkg/pull/8495) [yoga] Add project declaration and fix linux installation. + - [(#8630)](https://github.com/microsoft/vcpkg/pull/8630) [yoga] Update to 1.16.0 and enabled UWP builds + +- openssl-windows `1.0.2s-1` -> `1.0.2s-2` + - [(#8224)](https://github.com/microsoft/vcpkg/pull/8224) Including config file openssl.cnf in installation. + +- liblas `1.8.1-2` -> `1.8.1-3` + - [(#7920)](https://github.com/microsoft/vcpkg/pull/7920) [liblas]Fix ${_IMPORT_PREFIX} in liblas-depends-*.cmake. + - [(#7917)](https://github.com/microsoft/vcpkg/pull/7917) [proj4]Upgrade version to 6.1.1 and remove useless patches. + +- azure-storage-cpp `6.1.0-2` -> `7.0.0` + - [(#8499)](https://github.com/microsoft/vcpkg/pull/8499) [azure-storage-cpp]Upgrade to 7.0.0 + +- sdl2-mixer `2.0.4-6` -> `2.0.4-7` + - [(#8496)](https://github.com/microsoft/vcpkg/pull/8496) [sdl2-mixer]Fix usage issue. + +- armadillo `2019-04-16-5` -> `2019-04-16-6` + - [(#8494)](https://github.com/microsoft/vcpkg/pull/8494) [armadillo]Fix cmake path. + +- restinio `0.6.0` -> `0.6.0.1` + - [(#8493)](https://github.com/microsoft/vcpkg/pull/8493) [restinio] updated to v.0.6.0.1 + +- ode `0.15.1-3` -> `0.16` + - [(#8485)](https://github.com/microsoft/vcpkg/pull/8485) [ode] Upgrade to 0.16 + +- itk `5.0.1-1` -> `5.0.1-2` + - [(#8501)](https://github.com/microsoft/vcpkg/pull/8501) [itk]Fix use 64 bit ids. + +- irrlicht `1.8.4-2` -> `1.8.4-4` + - [(#8505)](https://github.com/microsoft/vcpkg/pull/8505) [irrlicht] Reorder link libraries + - [(#8535)](https://github.com/microsoft/vcpkg/pull/8535) [irrlicht] do not build exisiting dependencies + +- azure-iot-sdk-c `2019-08-20.1` -> `2019-10-11.2` + - [(#8513)](https://github.com/microsoft/vcpkg/pull/8513) [azure] Update azure-iot-sdk-c for release of 2019-10-07 + - [(#8565)](https://github.com/microsoft/vcpkg/pull/8565) azure-iot-sdk-c for release of 2019-10-10 + - [(#8686)](https://github.com/microsoft/vcpkg/pull/8686) [azure] Update azure-iot-sdk-c for 07/2019 LTS refresh + - [(#8731)](https://github.com/microsoft/vcpkg/pull/8731) Revert "[azure] Update azure-iot-sdk-c for 07/2019 LTS refresh (#8686)" + +- azure-macro-utils-c `2019-08-20.1` -> `2019-10-07.2` + - [(#8513)](https://github.com/microsoft/vcpkg/pull/8513) [azure] Update azure-iot-sdk-c for release of 2019-10-07 + - [(#8686)](https://github.com/microsoft/vcpkg/pull/8686) [azure] Update azure-iot-sdk-c for 07/2019 LTS refresh + - [(#8731)](https://github.com/microsoft/vcpkg/pull/8731) Revert "[azure] Update azure-iot-sdk-c for 07/2019 LTS refresh (#8686)" + +- azure-uamqp-c `2019-08-20.1` -> `2019-10-07.2` + - [(#8513)](https://github.com/microsoft/vcpkg/pull/8513) [azure] Update azure-iot-sdk-c for release of 2019-10-07 + - [(#8686)](https://github.com/microsoft/vcpkg/pull/8686) [azure] Update azure-iot-sdk-c for 07/2019 LTS refresh + - [(#8731)](https://github.com/microsoft/vcpkg/pull/8731) Revert "[azure] Update azure-iot-sdk-c for 07/2019 LTS refresh (#8686)" + +- azure-uhttp-c `2019-08-20.1` -> `2019-10-07.2` + - [(#8513)](https://github.com/microsoft/vcpkg/pull/8513) [azure] Update azure-iot-sdk-c for release of 2019-10-07 + - [(#8686)](https://github.com/microsoft/vcpkg/pull/8686) [azure] Update azure-iot-sdk-c for 07/2019 LTS refresh + - [(#8731)](https://github.com/microsoft/vcpkg/pull/8731) Revert "[azure] Update azure-iot-sdk-c for 07/2019 LTS refresh (#8686)" + +- azure-umqtt-c `2019-08-20.1` -> `2019-10-07.2` + - [(#8513)](https://github.com/microsoft/vcpkg/pull/8513) [azure] Update azure-iot-sdk-c for release of 2019-10-07 + - [(#8686)](https://github.com/microsoft/vcpkg/pull/8686) [azure] Update azure-iot-sdk-c for 07/2019 LTS refresh + - [(#8731)](https://github.com/microsoft/vcpkg/pull/8731) Revert "[azure] Update azure-iot-sdk-c for 07/2019 LTS refresh (#8686)" + +- umock-c `2019-08-20.1` -> `2019-10-07.2` + - [(#8513)](https://github.com/microsoft/vcpkg/pull/8513) [azure] Update azure-iot-sdk-c for release of 2019-10-07 + - [(#8686)](https://github.com/microsoft/vcpkg/pull/8686) [azure] Update azure-iot-sdk-c for 07/2019 LTS refresh + - [(#8731)](https://github.com/microsoft/vcpkg/pull/8731) Revert "[azure] Update azure-iot-sdk-c for 07/2019 LTS refresh (#8686)" + +- openxr-loader `2019-09-25` -> `1.0.3.0` + - [(#8515)](https://github.com/microsoft/vcpkg/pull/8515) [openxr-loader] Update to 1.0.3 release + latest C++ bindings header + +- gdcm `3.0.0-5` -> `3.0.3` + - [(#8522)](https://github.com/microsoft/vcpkg/pull/8522) [gdcm/libtorrent] Upgrade to new version + +- libtorrent `1.2.1-bcb26fd6` -> `1.2.2` + - [(#8522)](https://github.com/microsoft/vcpkg/pull/8522) [gdcm/libtorrent] Upgrade to new version + +- sfml `2.5.1-3` -> `2.5.1-4` + - [(#8523)](https://github.com/microsoft/vcpkg/pull/8523) [sfml]Add usage. + +- darknet `0.2.5.1` -> `0.2.5.1-1` + - [(#8527)](https://github.com/microsoft/vcpkg/pull/8527) [stb] update and add cmake module + +- stb `2019-07-11` -> `2019-08-17` + - [(#8527)](https://github.com/microsoft/vcpkg/pull/8527) [stb] update and add cmake module + +- curlpp `2018-06-15` -> `2018-06-15-1` + - [(#8532)](https://github.com/microsoft/vcpkg/pull/8532) [curlpp] fix regression introduced in #7331 + +- libjpeg-turbo `2.0.2` -> `2.0.3` + - [(#8412)](https://github.com/microsoft/vcpkg/pull/8412) [libjpeg-turbo] Update to 2.0.3. + +- opencv3 `3.4.7-1` -> `3.4.7-2` + - [(#8542)](https://github.com/microsoft/vcpkg/pull/8542) [opencv] add tesseract to fix downstream linking + +- opencv4 `4.1.1-2` -> `4.1.1-3` + - [(#8542)](https://github.com/microsoft/vcpkg/pull/8542) [opencv] add tesseract to fix downstream linking + +- gtest `2019-08-14-2` -> `2019-10-09` + - [(#8544)](https://github.com/microsoft/vcpkg/pull/8544) [gtest/pmdk] Upgrade to new version + +- pmdk `1.6-3` -> `2019-10-10` + - [(#8544)](https://github.com/microsoft/vcpkg/pull/8544) [gtest/pmdk] Upgrade to new version + - [(#8586)](https://github.com/microsoft/vcpkg/pull/8586) [pmdk] Upgrade to version 1.7 + +- imgui `1.72b` -> `1.73-1` + - [(#8504)](https://github.com/microsoft/vcpkg/pull/8504) [imgui] Update to 1.73 + - [(#8605)](https://github.com/microsoft/vcpkg/pull/8605) [imgui]Add feature example in windows. + +- sqlite3 `3.29.0-1` -> `3.30.1-1` + - [(#8567)](https://github.com/microsoft/vcpkg/pull/8567) [sqlite3] Update to 3.30.1 + - [(#7917)](https://github.com/microsoft/vcpkg/pull/7917) [proj4]Upgrade version to 6.1.1 and remove useless patches. + +- ffmpeg `4.2` -> `4.2-1` + - [(#8596)](https://github.com/microsoft/vcpkg/pull/8596) [ffmpeg] Pass Vcpkg compiler and linker flags to build script + +- libyuv `fec9121` -> `fec9121-1` + - [(#8576)](https://github.com/microsoft/vcpkg/pull/8576) [libyuv] fix include header installation + - [(#8709)](https://github.com/microsoft/vcpkg/pull/8709) [libyuv] Add Mac/Linux build support + - [(#8769)](https://github.com/microsoft/vcpkg/pull/8769) [libyuv]Build corresponding type library according to BUILD_SHARED_LIBS. + +- libarchive `3.4.0` -> `3.4.0-1` + - [(#8564)](https://github.com/microsoft/vcpkg/pull/8564) Mixed release and debug build in libarchive + +- aixlog `1.2.1-1` -> `1.2.2` + - [(#8587)](https://github.com/microsoft/vcpkg/pull/8587) [aixlog] Update library to 1.2.2 + +- portaudio `19.0.6.00-5` -> `2019-09-30` + - [(#8399)](https://github.com/microsoft/vcpkg/pull/8399) [portaudio] Update to the latest version + +- chakracore `1.11.13` -> `1.11.14` + - [(#8593)](https://github.com/microsoft/vcpkg/pull/8593) [chakracore] Update library to 1.11.14 + +- embree3 `3.5.2-2` -> `3.5.2-3` + - [(#8608)](https://github.com/microsoft/vcpkg/pull/8608) [embree3]Fix generated cmake files path. + - [(#8591)](https://github.com/microsoft/vcpkg/pull/8591) [embree3]Fix EMBREE_ROOT_DIR path setting,EMBREE_LIBRARY Debug/Release path setting. + +- cpp-httplib `0.2.4` -> `0.2.5` + - [(#8590)](https://github.com/microsoft/vcpkg/pull/8590) [cpp-httplib] Update library to 0.2.5 + +- range-v3 `0.9.0-20190822` -> `0.9.1` + - [(#8583)](https://github.com/microsoft/vcpkg/pull/8583) [range-v3] Update to 0.9.1 + +- otl `4.0.443-2` -> `4.0.447` + - [(#8581)](https://github.com/microsoft/vcpkg/pull/8581) otl version 447 + +- directxtex `aug2019` -> `oct2019` + - [(#8563)](https://github.com/microsoft/vcpkg/pull/8563) [directxtk][directxtk12][directxtex][directxmesh] Fixed missing pdbs + - [(#8723)](https://github.com/microsoft/vcpkg/pull/8723) [directxtex] Update library to oct2019 + +- directxtk `aug2019` -> `oct2019` + - [(#8563)](https://github.com/microsoft/vcpkg/pull/8563) [directxtk][directxtk12][directxtex][directxmesh] Fixed missing pdbs + - [(#8724)](https://github.com/microsoft/vcpkg/pull/8724) [directxtk] Update library to oct2019 + +- directxtk12 `aug2019` -> `oct2019` + - [(#8563)](https://github.com/microsoft/vcpkg/pull/8563) [directxtk][directxtk12][directxtex][directxmesh] Fixed missing pdbs + - [(#8725)](https://github.com/microsoft/vcpkg/pull/8725) [directxtk12] Update library to oct2019 + +- vtk `8.2.0-8` -> `8.2.0-9` + - [(#8554)](https://github.com/microsoft/vcpkg/pull/8554) [vtk] Change atlmfc as feature + - [(#7917)](https://github.com/microsoft/vcpkg/pull/7917) [proj4]Upgrade version to 6.1.1 and remove useless patches. + +- sdl2 `2.0.9-4` -> `2.0.10-2` + - [(#8643)](https://github.com/microsoft/vcpkg/pull/8643) [sdl2] Update to 2.0.10 + - [(#8760)](https://github.com/microsoft/vcpkg/pull/8760) Fix sdl2 build if there is space in the path + +- gdal `2.4.1-8` -> `2.4.1-9` + - [(#7917)](https://github.com/microsoft/vcpkg/pull/7917) [proj4]Upgrade version to 6.1.1 and remove useless patches. + - [(#8621)](https://github.com/microsoft/vcpkg/pull/8621) [proj4] Update to version 6.2.0 + +- libgeotiff `1.4.2-9` -> `1.4.2-10` + - [(#7917)](https://github.com/microsoft/vcpkg/pull/7917) [proj4]Upgrade version to 6.1.1 and remove useless patches. + +- proj4 `4.9.3-5` -> `6.2.0-1` + - [(#7917)](https://github.com/microsoft/vcpkg/pull/7917) [proj4]Upgrade version to 6.1.1 and remove useless patches. + - [(#8621)](https://github.com/microsoft/vcpkg/pull/8621) [proj4] Update to version 6.2.0 + +- tcl `8.6.5` -> `8.6.10-2` + - [(#8402)](https://github.com/microsoft/vcpkg/pull/8402) [tcl]Upgrade to 8.6.9 and use vcpkg_install_make/vcpkg_install_nmake. + +- physx `4.1.1-1` -> `4.1.1-3` + - [(#8561)](https://github.com/microsoft/vcpkg/pull/8561) [physx] Added a patch to fix missing typeinfo.h header with VS16.3 and missing pdb files + - [(#8658)](https://github.com/microsoft/vcpkg/pull/8658) [physx] Added UWP support + +- celero `2.5.0-1` -> `2.6.0` + - [(#8646)](https://github.com/microsoft/vcpkg/pull/8646) [celero] Updated to v2.6.0 + +- assimp `5.0.0` -> `5.0.0-1` + - [(#8665)](https://github.com/microsoft/vcpkg/pull/8665) [assimp] Fix cmake package config + +- mosquitto `1.6.3` -> `1.6.7` + - [(#8661)](https://github.com/microsoft/vcpkg/pull/8661) [mosquitto] Update to 1.6.7 + +- plog `1.1.4` -> `1.1.5` + - [(#8685)](https://github.com/microsoft/vcpkg/pull/8685) [plog] Update to 1.1.5 + +- catch2 `2.9.2` -> `2.10.1-1` + - [(#8684)](https://github.com/microsoft/vcpkg/pull/8684) [catch2] Update to 2.10.1 + +- nano-signal-slot `commit-25aa2aa90d450d3c7550c535c7993a9e2ed0764a` -> `2018-08-25-1` + - [(#8675)](https://github.com/microsoft/vcpkg/pull/8675) [nano-signal-slot] Enable UWP and dynamic builds + +- duckx `2019-08-06` -> `1.0.0` + - [(#8673)](https://github.com/microsoft/vcpkg/pull/8673) [duckx] update library to 1.0.0 + +- jsoncons `0.136.0` -> `0.136.1` + - [(#8689)](https://github.com/microsoft/vcpkg/pull/8689) [jsoncons] Update to v.0.136.1 + +- libpmemobj-cpp `1.7` -> `1.8` + - [(#8729)](https://github.com/microsoft/vcpkg/pull/8729) [libpmemobj-cpp] Update library to 1.8 + +- forest `12.0.3` -> `12.0.4` + - [(#8727)](https://github.com/microsoft/vcpkg/pull/8727) [forest] Update library to 12.0.4 + +- check `0.12.0-2` -> `0.13.0` + - [(#8722)](https://github.com/microsoft/vcpkg/pull/8722) [check] Update library to 0.13.0 + +- libcopp `1.2.0` -> `1.2.1` + - [(#8728)](https://github.com/microsoft/vcpkg/pull/8728) [libcopp] Update library to 1.2.1 + +- corrade `2019.01-1` -> `2019.10` + - [(#8742)](https://github.com/microsoft/vcpkg/pull/8742) Update magnum ports to new version + +- magnum-extras `2019.01-2` -> `2019.10` + - [(#8742)](https://github.com/microsoft/vcpkg/pull/8742) Update magnum ports to new version + +- magnum-integration `2019.01-2` -> `2019.10` + - [(#8742)](https://github.com/microsoft/vcpkg/pull/8742) Update magnum ports to new version + +- magnum-plugins `2019.01-2` -> `2019.10` + - [(#8742)](https://github.com/microsoft/vcpkg/pull/8742) Update magnum ports to new version + +- magnum `2019.01-2` -> `2019.10` + - [(#8742)](https://github.com/microsoft/vcpkg/pull/8742) Update magnum ports to new version + +- curl `7.66.0` -> `7.66.0-1` + - [(#8739)](https://github.com/microsoft/vcpkg/pull/8739) [curl]Fix tools depends zlib. + +- x265 `3.0-2` -> `3.2-1` + - [(#8738)](https://github.com/microsoft/vcpkg/pull/8738) update x265 to 3.2 + +- pixman `0.38.0-3` -> `0.38.0-4` + - [(#8736)](https://github.com/microsoft/vcpkg/pull/8736) [pixman] Improve Arm detection + +- xmlsec `1.2.28` -> `1.2.29` + - [(#8721)](https://github.com/microsoft/vcpkg/pull/8721) [xmlsec] Update to 1.2.29 + +- string-theory `2.2` -> `2.3` + - [(#8734)](https://github.com/microsoft/vcpkg/pull/8734) [string-theory] Update library to 2.3 + +- log4cpp `2.9.1-1` -> `2.9.1-2` + - [(#8741)](https://github.com/microsoft/vcpkg/pull/8741) [log4cpp] Fix link static library + +- so5extra `1.3.1-2` -> `1.3.1.1` + - [(#8770)](https://github.com/microsoft/vcpkg/pull/8770) [so5extra] updated to 1.3.1.1 + +- wangle `2019.07.08.00` -> `2019.07.08.00-1` + - [(#8764)](https://github.com/microsoft/vcpkg/pull/8764) [wangle]Fix config.cmake + +- fribidi `2019-02-04-1` -> `2019-02-04-2` + - [(#8639)](https://github.com/microsoft/vcpkg/pull/8639) mesonbuild - Update to 0.52.0 + +- libepoxy `1.5.3-1` -> `1.5.3-2` + - [(#8639)](https://github.com/microsoft/vcpkg/pull/8639) mesonbuild - Update to 0.52.0 + +- jxrlib `1.1-9` -> `2019.10.9` + - [(#8525)](https://github.com/microsoft/vcpkg/pull/8525) [jxrlib] Update port + +- fltk `1.3.4-8` -> `1.3.5-1` + - [(#8457)](https://github.com/microsoft/vcpkg/pull/8457) FLTK v1.3.5 + +- qt5-location `5.12.5-1` -> `5.12.5-2` + - [(#8777)](https://github.com/microsoft/vcpkg/pull/8777) [qt5-location] Modify clipper library name to avoid conflicts with vxl + +- pthreads `3.0.0-3` -> `3.0.0-4` + - [(#8651)](https://github.com/microsoft/vcpkg/pull/8651) [pthreads]Add usage. + +- glib `2.52.3-14-3` -> `2.52.3-14-4` + - [(#8653)](https://github.com/microsoft/vcpkg/pull/8653) [glib]Fix linux build. + +- libxslt `1.1.33-2` -> `1.1.33-4` + - [(#8589)](https://github.com/microsoft/vcpkg/pull/8589) [libxslt]Using vcpkg_install_nmake in Windows, support unix. + +- paho-mqtt `1.3.0` -> `1.3.0-1` + - [(#8492)](https://github.com/microsoft/vcpkg/pull/8492) Export paho-mqtt cmake targets, fix paho-mqttpp3 dependency. + +- paho-mqttpp3 `1.0.1-2` -> `1.0.1-3` + - [(#8492)](https://github.com/microsoft/vcpkg/pull/8492) Export paho-mqtt cmake targets, fix paho-mqttpp3 dependency. + +- pcre2 `10.30-5` -> `10.30-6` + - [(#8620)](https://github.com/microsoft/vcpkg/pull/8620) [pcre2]Fix uwp build failure. + +- arrow `0.14.1-1` -> `0.15.1` + - [(#8815)](https://github.com/microsoft/vcpkg/pull/8815) [Arrow] Update to Arrow 0.15.1 + +- netcdf-c `4.7.0-4` -> `4.7.0-5` + - [(#8398)](https://github.com/microsoft/vcpkg/pull/8398) [netcdf-c] Add usage + +- sol2 `3.0.3-1` -> `3.0.3-2` + - [(#8776)](https://github.com/microsoft/vcpkg/pull/8776) [sol2] Use the single header release + +- arb `2.16.0` -> `2.17.0` + - [(#8831)](https://github.com/microsoft/vcpkg/pull/8831) [arb]Upgrade to 2.17.0 + +- wxwidgets `3.1.2-2` -> `3.1.3` + - [(#8808)](https://github.com/microsoft/vcpkg/pull/8808) [wxwidgets] Upgrade to 3.1.3 + +
+ +-- vcpkg team vcpkg@microsoft.com FRI, 01 Nov 08:30:00 -0800 + +vcpkg (2019.09.30) +--- +#### Total port count: 1225 +#### Total port count per triplet (tested): +|triplet|ports available| +|---|---| +|**x64-windows**|1151| +|x86-windows|1136| +|x64-windows-static|1061| +|**x64-linux**|980| +|**x64-osx**|939| +|arm64-windows|766| +|x64-uwp|624| +|arm-uwp|594| + +#### The following commands and options have been updated: +- `x-history` ***[NEW COMMAND]*** + - Shows the full history of CONTROL version of a port, including the vcpkg commit hash, CONTROL version, and date of vcpkg commit + - [(#7377)](https://github.com/microsoft/vcpkg/pull/7377) [x-history] Prints CONTROL version history of a port 👻 + - [(#8101)](https://github.com/microsoft/vcpkg/pull/8101) fix x-history help desc. +- `depend-info` + - Constrain argument count to single port name as usage intends + - [(#8135)](https://github.com/microsoft/vcpkg/pull/8135) [vcpkg] Fix `depend-info` command arguments arity + +#### The following documentation has been updated: +- [Frequently Asked Questions](docs/about/faq.md) + - [(#8258)](https://github.com/microsoft/vcpkg/pull/8258) Add detailed instructions for custom configurations +- [Maintainer Guidelines and Policies](docs/maintainers/maintainer-guide.md) + - [(#8383)](https://github.com/microsoft/vcpkg/pull/8383) Fix a typo in maintainer-guide.md + +#### The following *remarkable* changes have been made to vcpkg's infrastructure: +- Add port features to CI test result XML as the first step in testing them in CI system + - [(#8342)](https://github.com/microsoft/vcpkg/pull/8342) [CI system] Add features to test result xml + +#### The following *additional* changes have been made to vcpkg's infrastructure: +- [(#8048)](https://github.com/microsoft/vcpkg/pull/8048) Add August changelog +- [(#8082)](https://github.com/microsoft/vcpkg/pull/8082) [vcpkg] remove text from license +- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 +- [(#7954)](https://github.com/microsoft/vcpkg/pull/7954) Fix bug in `.vcpkg-root` detection that breaks `--overlay-triplets` +- [(#8131)](https://github.com/microsoft/vcpkg/pull/8131) [vcpkg] add missing implib definitions, fix shared lib extension on mac +- [(#8129)](https://github.com/microsoft/vcpkg/pull/8129) [vcpkg] Continue on malformed paths in PATH +- [(#8200)](https://github.com/microsoft/vcpkg/pull/8200) [vcpkg] Fix missing VCPKG_ROOT_PATH in create command +- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats +- [(#5180)](https://github.com/microsoft/vcpkg/pull/5180) Use CMAKE_TRY_COMPILE_PLATFORM_VARIABLES to propagate values +- [(#8032)](https://github.com/microsoft/vcpkg/pull/8032) [vcpkg] Avoid RENAME usage to prevent cross-device link problems (#4245) +- [(#8304)](https://github.com/microsoft/vcpkg/pull/8304) [ports.cmake] Fixup capitalization inconsistencies of Windows drive letter + +
+The following 55 ports have been added: + +|port|version| +|---|---| +|[dmlc](https://github.com/microsoft/vcpkg/pull/7549)| 2019-08-12 +|[anyrpc](https://github.com/microsoft/vcpkg/pull/7438)| 2017-12-01 +|[imgui-sfml](https://github.com/microsoft/vcpkg/pull/7429)[#8004](https://github.com/microsoft/vcpkg/pull/8004) | 2.1 +|[ignition-cmake0](https://github.com/microsoft/vcpkg/pull/7781)[#8044](https://github.com/microsoft/vcpkg/pull/8044) [#8136](https://github.com/microsoft/vcpkg/pull/8136) | 0.6.2-1 +|[ignition-math4](https://github.com/microsoft/vcpkg/pull/7781)| 4.0.0 +|[ignition-modularscripts](https://github.com/microsoft/vcpkg/pull/7781)[#8136](https://github.com/microsoft/vcpkg/pull/8136) | 2019-09-11 +|[volk](https://github.com/microsoft/vcpkg/pull/8035)[#8364](https://github.com/microsoft/vcpkg/pull/8364) | 2019-09-26 +|[cppkafka](https://github.com/microsoft/vcpkg/pull/7987)[#8073](https://github.com/microsoft/vcpkg/pull/8073) | 0.3.1-1 +|[nativefiledialog](https://github.com/microsoft/vcpkg/pull/7944)| 2019-08-28 +|[cello](https://github.com/microsoft/vcpkg/pull/7386)| 2019-07-23 +|[libhydrogen](https://github.com/microsoft/vcpkg/pull/7436)| 2019-08-11 +|[quantlib](https://github.com/microsoft/vcpkg/pull/7283)| 2019-09-02 +|[magic-get](https://github.com/microsoft/vcpkg/pull/8072)| 2019-09-02 +|[cityhash](https://github.com/microsoft/vcpkg/pull/7879)| 2013-01-08 +|[ignition-common1](https://github.com/microsoft/vcpkg/pull/8111)| 1.1.1 +|[wampcc](https://github.com/microsoft/vcpkg/pull/7929)| 2019-09-04 +|[hidapi](https://github.com/microsoft/vcpkg/pull/8113)| 2019-08-30 +|[sokol](https://github.com/microsoft/vcpkg/pull/8107)| 2019-09-09 +|[parallelstl](https://github.com/microsoft/vcpkg/pull/8039)| 20190522-1 +|[marl](https://github.com/microsoft/vcpkg/pull/8132)[#8161](https://github.com/microsoft/vcpkg/pull/8161) | 2019-09-13 +|[vectorclass](https://github.com/microsoft/vcpkg/pull/7573)| 2.00.01 +|[wren](https://github.com/microsoft/vcpkg/pull/7242)| 2019-07-01 +|[libsrtp](https://github.com/microsoft/vcpkg/pull/8046)| 2.2.0 +|[ignition-msgs1](https://github.com/microsoft/vcpkg/pull/8044)| 1.0.0 +|[ignition-transport4](https://github.com/microsoft/vcpkg/pull/8044)| 4.0.0 +|[argtable3](https://github.com/microsoft/vcpkg/pull/7815)| 2019-08-21 +|[llgl](https://github.com/microsoft/vcpkg/pull/7701)| 2019-08-15 +|[sdformat6](https://github.com/microsoft/vcpkg/pull/8137)| 6.2.0 +|[grppi](https://github.com/microsoft/vcpkg/pull/8125)| 0.4.0 +|[opencolorio](https://github.com/microsoft/vcpkg/pull/8006)| 1.1.1 +|[cpputest](https://github.com/microsoft/vcpkg/pull/8188)| 2019-9-16 +|[winreg](https://github.com/microsoft/vcpkg/pull/8190)[#8371](https://github.com/microsoft/vcpkg/pull/8371) | 1.2.1-1 +|[zfp](https://github.com/microsoft/vcpkg/pull/7955)| 0.5.5-1 +|[libyuv](https://github.com/microsoft/vcpkg/pull/7486)| fec9121 +|[foonathan-memory](https://github.com/microsoft/vcpkg/pull/7350)[#8266](https://github.com/microsoft/vcpkg/pull/8266) | 2019-07-21-1 +|[jinja2cpplight](https://github.com/microsoft/vcpkg/pull/8207)| 2018-05-08 +|[liblbfgs](https://github.com/microsoft/vcpkg/pull/8186)| 1.10 +|[sigslot](https://github.com/microsoft/vcpkg/pull/8262)| 1.0.0 +|[cute-headers](https://github.com/microsoft/vcpkg/pull/8277)| 2019-09-20 +|[libsoundio](https://github.com/microsoft/vcpkg/pull/8273)| 2.0.0 +|[matplotlib-cpp](https://github.com/microsoft/vcpkg/pull/8313)| 2019-09-24 +|[asynch](https://github.com/microsoft/vcpkg/pull/8317)[#8371](https://github.com/microsoft/vcpkg/pull/8371) | 2019-09-21-1 +|[minimp3](https://github.com/microsoft/vcpkg/pull/8319)[#8371](https://github.com/microsoft/vcpkg/pull/8371) | 2019-07-24-1 +|[crfsuite](https://github.com/microsoft/vcpkg/pull/8233)| 2019-07-21 +|[cudnn](https://github.com/microsoft/vcpkg/pull/7536)| 7.6 +|[libosip2](https://github.com/microsoft/vcpkg/pull/8261)| 5.1.0 +|[portable-snippets](https://github.com/microsoft/vcpkg/pull/7783)| 2019-09-20 +|[ignition-fuel-tools1](https://github.com/microsoft/vcpkg/pull/8136)| 1.2.0 +|[clickhouse-cpp](https://github.com/microsoft/vcpkg/pull/7880)| 2019-05-22 +|[tweeny](https://github.com/microsoft/vcpkg/pull/8341)| 3.0 +|[nanogui](https://github.com/microsoft/vcpkg/pull/8302)| 2019-09-23 +|[wepoll](https://github.com/microsoft/vcpkg/pull/8280)| 1.5.5 +|[tcl](https://github.com/microsoft/vcpkg/pull/8026)| 8.6.5 +|[cpuinfo](https://github.com/microsoft/vcpkg/pull/7449)| 2019-07-28 +|[mathc](https://github.com/microsoft/vcpkg/pull/8394)| 2019-09-29 +
+ +
+The following 220 ports have been updated: + +- breakpad `2019-07-11` -> `2019-07-11-1` + - [(#7938)](https://github.com/microsoft/vcpkg/pull/7938) [breakpad] Fix build failed with Visual Studio 2019 + +- gtest `2019-08-14-1` -> `2019-08-14-2` + - [(#7887)](https://github.com/microsoft/vcpkg/pull/7887) [gtest]Re-fix gmock target. + +- libxslt `1.1.33` -> `1.1.33-2` + - [(#7451)](https://github.com/microsoft/vcpkg/pull/7451) [libxslt]Fix dependent ports in static builds. + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + +- pcre2 `10.30-4` -> `10.30-5` + - [(#7948)](https://github.com/microsoft/vcpkg/pull/7948) Fix build with Emscripten/WASM + +- entt `3.0.0-1` -> `3.1.1` + - [(#7984)](https://github.com/microsoft/vcpkg/pull/7984) [entt] Update to 3.1.0 + - [(#8098)](https://github.com/microsoft/vcpkg/pull/8098) [entt] Update to 3.1.1 + +- raylib `2019-04-27-2` -> `2.5.0` + - [(#7848)](https://github.com/microsoft/vcpkg/pull/7848) [raylib] update to 2.5.0 + +- jsoncons `0.132.1` -> `0.136.0` + - [(#8034)](https://github.com/microsoft/vcpkg/pull/8034) [jsoncons] Update to version 0.133.0 + - [(#8221)](https://github.com/microsoft/vcpkg/pull/8221) [jsoncons] Update to v0.134.0 + - [(#8348)](https://github.com/microsoft/vcpkg/pull/8348) [jsoncons] Update jsoncons to v0.135.0 + - [(#8382)](https://github.com/microsoft/vcpkg/pull/8382) [jsoncons] Update jsoncons to v0.136.0 + +- exiv2 `0.27.1-1` -> `0.27.2-1` + - [(#7992)](https://github.com/microsoft/vcpkg/pull/7992) [exiv2] Update library to 0.27.2 + +- gettext `0.19-10` -> `0.19-11` + - [(#7990)](https://github.com/microsoft/vcpkg/pull/7990) [gettext]Improve gettext on Linux. + +- wtl `10.0-2` -> `10.0-3` + - [(#8005)](https://github.com/microsoft/vcpkg/pull/8005) Update WTL to 10.0.9163. + +- aixlog `1.2.1` -> `1.2.1-1` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + +- chaiscript `6.1.0` -> `6.1.0-1` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + +- dlfcn-win32 `1.1.1-2` -> `1.1.1-3` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + +- enet `1.3.13` -> `1.3.13-1` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + +- fltk `1.3.4-6` -> `1.3.4-7` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + +- fmi4cpp `0.7.0-1` -> `0.7.0-2` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + +- fmilib `2.0.3-1` -> `2.0.3-2` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + +- freetds `1.1.6` -> `1.1.6-1` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + +- gainput `1.0.0-1` -> `1.0.0-2` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + +- geographiclib `1.47-patch1-7` -> `1.47-patch1-9` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + - [(#8115)](https://github.com/microsoft/vcpkg/pull/8115) [geographiclib]Fix usage error and cmake path in Linux. + +- glog `0.4.0-1` -> `0.4.0-2` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + +- irrlicht `1.8.4-1` -> `1.8.4-2` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + +- libmikmod `3.3.11.1-4` -> `3.3.11.1-5` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + +- libodb-mysql `2.4.0-3` -> `2.4.0-4` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + +- libodb-sqlite `2.4.0-4` -> `2.4.0-5` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + +- libodb `2.4.0-5` -> `2.4.0-6` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + +- libsquish `1.15-1` -> `1.15-2` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + +- lzo `2.10-2` -> `2.10-3` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + +- nanovg `master` -> `2019-8-30-1` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + - [(#8302)](https://github.com/microsoft/vcpkg/pull/8302) [nanogui] Add new port + +- ode `0.15.1-1` -> `0.15.1-2` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + +- opencsg `1.4.2` -> `1.4.2-1` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + +- orocos-kdl `1.4-1` -> `1.4-2` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + +- pangomm `2.40.1` -> `2.40.1-1` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + +- pcre `8.41-2` -> `8.41-3` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + +- qt5-gamepad `5.12.3-1` -> `5.12.5-1` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats + +- wavpack `5.1.0-00d9a4a-1` -> `5.1.0-2` + - [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports + +- tensorflow-cc `1.14` -> `1.14-1` + - [(#8023)](https://github.com/microsoft/vcpkg/pull/8023) [tensorflow-cc]Fix build error and add warning message. + +- glew `2.1.0-5` -> `2.1.0-6` + - [(#7967)](https://github.com/microsoft/vcpkg/pull/7967) [VTK/GLEW] Fix Regression of VTK with newer CMake Versions + +- libpq `9.6.1-7` -> `9.6.1-8` + - [(#8076)](https://github.com/microsoft/vcpkg/pull/8076) libpq requires HAVE_CRYPTO_LOCK for thread safety with openssl <1.1.0 + - [(#8080)](https://github.com/microsoft/vcpkg/pull/8080) [libpq] #undef int128 type if compiling for 32 bit architecture + - [(#8090)](https://github.com/microsoft/vcpkg/pull/8090) [libpq] Bump version number + +- sobjectizer `5.6.0.2` -> `5.6.1` + - [(#8052)](https://github.com/microsoft/vcpkg/pull/8052) [sobjectizer] updated to 5.6.1 + +- unrar `5.5.8-2` -> `5.8.1` + - [(#8053)](https://github.com/microsoft/vcpkg/pull/8053) [unrar] Don't use a custom struct member alignment + - [(#8108)](https://github.com/microsoft/vcpkg/pull/8108) [unrar] Update to 5.8.1 + +- xalan-c `1.11-7` -> `1.11-8` + - [(#7795)](https://github.com/microsoft/vcpkg/pull/7795) [xalan-c] fixed cmake files location + +- re2 `2019-08-01` -> `2019-09-01` + - [(#8089)](https://github.com/microsoft/vcpkg/pull/8089) [re2] Update library to 2019-09-01 + +- libvpx `1.7.0-3` -> `1.8.1` + - [(#8086)](https://github.com/microsoft/vcpkg/pull/8086) [libvpx] Update to 1.8.1. + - [(#8100)](https://github.com/microsoft/vcpkg/pull/8100) [libvpx] Fix build when VCPKG_BUILD_TYPE is set. + +- grpc `1.22.0` -> `1.23.0` + - [(#8109)](https://github.com/microsoft/vcpkg/pull/8109) [grpc] Update grpc to 1.23.0 + +- egl-registry `2018-06-30-1` -> `2019-08-08` + - [(#8095)](https://github.com/microsoft/vcpkg/pull/8095) Update egl-registry to 2019-08-08 and opengl-registry to 2019-08-22. + +- opengl-registry `2018-06-30-1` -> `2019-08-22` + - [(#8095)](https://github.com/microsoft/vcpkg/pull/8095) Update egl-registry to 2019-08-08 and opengl-registry to 2019-08-22. + +- dimcli `5.0.0` -> `5.0.1` + - [(#8024)](https://github.com/microsoft/vcpkg/pull/8024) [dimcli] Upgrade to version 5.0.1 + +- libwebsockets `3.1.0-3` -> `3.2.0` + - [(#8017)](https://github.com/microsoft/vcpkg/pull/8017) Update libwebsockets to v3.2.0 + +- mongo-c-driver `1.14.0-3-1` -> `1.14.0-4` + - [(#7974)](https://github.com/microsoft/vcpkg/pull/7974) [mongo-c-driver] fix debug linkage under linux + +- qwt `6.1.3-7` -> `6.1.3-8` + - [(#8030)](https://github.com/microsoft/vcpkg/pull/8030) [qwt]make qwt support unix + +- ixwebsocket `5.0.4` -> `6.1.0` + - [(#7839)](https://github.com/microsoft/vcpkg/pull/7839) [ixwebsocket] update to 6.1.0 to fix Windows problem + +- cpp-httplib `0.2.1` -> `0.2.4` + - [(#8054)](https://github.com/microsoft/vcpkg/pull/8054) [cpp-httplib] Update library to 0.2.2 + - [(#8172)](https://github.com/microsoft/vcpkg/pull/8172) [cpp-httplib] Update library to 0.2.4 + +- blend2d `beta_2019-07-16` -> `beta_2019-10-09` + - [(#8120)](https://github.com/microsoft/vcpkg/pull/8120) [blend2d] Port update beta_2019-10-09 + +- json-c `2019-05-31` -> `2019-09-10` + - [(#8121)](https://github.com/microsoft/vcpkg/pull/8121) [json-c] Add dynamic library support + +- glfw3 `3.3-1` -> `3.3-2` + - [(#7592)](https://github.com/microsoft/vcpkg/pull/7592) [glfw3] fix cmake config + +- google-cloud-cpp `0.12.0` -> `0.13.0` + - [(#8077)](https://github.com/microsoft/vcpkg/pull/8077) Update google-cloud-cpp and googleapis. + +- googleapis `0.1.3` -> `0.1.5` + - [(#8077)](https://github.com/microsoft/vcpkg/pull/8077) Update google-cloud-cpp and googleapis. + +- tbb `2019_U8` -> `2019_U8-1` + - [(#8018)](https://github.com/microsoft/vcpkg/pull/8018) [tbb]Fix static build. + +- openxr-loader `1.0.0-2` -> `2019-09-25` + - [(#8123)](https://github.com/microsoft/vcpkg/pull/8123) [openxr-loader] Update to 1.0.2 + - [(#8255)](https://github.com/microsoft/vcpkg/pull/8255) [openxr-loader] Add openxr C++ bindings + +- sdl1 `1.2.15-6` -> `1.2.15-8` + - [(#8070)](https://github.com/microsoft/vcpkg/pull/8070) [sdl1]Support linux build. + - [(#8327)](https://github.com/microsoft/vcpkg/pull/8327) [sdl1] fix windows sdk 18362 build failure + +- glslang `2019-03-05` -> `2019-03-05-1` + - [(#8051)](https://github.com/microsoft/vcpkg/pull/8051) [glslang]Fix generated cmake files. + +- opencl `2.2 (2017.07.18)-1` -> `2.2 (2018.08.31)` + - [(#4204)](https://github.com/microsoft/vcpkg/pull/4204) Linux support for the OpenCL SDK package + +- libspatialite `4.3.0a-3` -> `4.3.0a-4` + - [(#8025)](https://github.com/microsoft/vcpkg/pull/8025) [libspatialite]make libspatialite support linux and osx + +- libqrencode `4.0.2` -> `4.0.2-1` + - [(#8099)](https://github.com/microsoft/vcpkg/pull/8099) [libqrencode] Add tool feature; Remove unnecessary patch + +- sdl2-mixer `2.0.4-3` -> `2.0.4-6` + - [(#7720)](https://github.com/microsoft/vcpkg/pull/7720) [sdl2-mixer]Remove useless dependency link libraries. + - [(#8208)](https://github.com/microsoft/vcpkg/pull/8208) [sdl2-mixer] Fix features dependency link. + - [(#8335)](https://github.com/microsoft/vcpkg/pull/8335) [sdl2-mixer]Re-fix dynamic call. + +- evpp `0.7.0` -> `0.7.0-1` + - [(#8050)](https://github.com/microsoft/vcpkg/pull/8050) [evpp]Fix linux build. + +- libogg `1.3.3-4` -> `1.3.4` + - [(#8094)](https://github.com/microsoft/vcpkg/pull/8094) [libogg] Update to 1.3.4-1 + +- otl `4.0.442` -> `4.0.443` + - [(#8139)](https://github.com/microsoft/vcpkg/pull/8139) [otl] fix hash and update version + +- speexdsp `1.2rc3-3` -> `1.2.0` + - [(#8140)](https://github.com/microsoft/vcpkg/pull/8140) [speexdsp] update to 1.2.0 + +- pcl `1.9.1-8` -> `1.9.1-9` + - [(#8154)](https://github.com/microsoft/vcpkg/pull/8154) [pcl] Fix problem with link-type keywords in linked libraries + +- libqglviewer `2.7.0` -> `2.7.0-2` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + +- qt5-3d `5.12.3-1` -> `5.12.5-1` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats + +- qt5-activeqt `5.12.3-1` -> `5.12.5` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + +- qt5-base `5.12.3-4` -> `5.12.5-1` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats + - [(#8212)](https://github.com/microsoft/vcpkg/pull/8212) [Qt] feature latest to build 5.13.1 + +- qt5-charts `5.12.3-1` -> `5.12.5-1` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats + +- qt5-connectivity `5.12.3-1` -> `5.12.5-1` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats + +- qt5-datavis3d `5.12.3-1` -> `5.12.5-1` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats + +- qt5-declarative `5.12.3-2` -> `5.12.5-1` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats + +- qt5-graphicaleffects `5.12.3-1` -> `5.12.5` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + +- qt5-imageformats `5.12.3-1` -> `5.12.5-1` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats + +- qt5-location `5.12.3-1` -> `5.12.5-1` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats + +- qt5-macextras `5.12.3-1` -> `5.12.5` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + +- qt5-modularscripts `2019-04-30-1` -> `deprecated` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + +- qt5-mqtt `5.12.3-1` -> `5.12.5` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + +- qt5-multimedia `5.12.3-1` -> `5.12.5-1` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats + +- qt5-networkauth `5.12.3-1` -> `5.12.5` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + +- qt5-purchasing `5.12.3-1` -> `5.12.5-1` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats + +- qt5-quickcontrols `5.12.3-1` -> `5.12.5-1` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats + +- qt5-quickcontrols2 `5.12.3-1` -> `5.12.5-1` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats + +- qt5-remoteobjects `5.12.3-1` -> `5.12.5-1` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats + +- qt5-script `5.12.3-1` -> `5.12.5-1` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats + +- qt5-scxml `5.12.3-1` -> `5.12.5` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + +- qt5-sensors `5.12.3-1` -> `5.12.5-1` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats + +- qt5-serialport `5.12.3-1` -> `5.12.5` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + +- qt5-speech `5.12.3-1` -> `5.12.5-1` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats + +- qt5-svg `5.12.3-1` -> `5.12.5` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + +- qt5-tools `5.12.3-1` -> `5.12.5-1` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats + +- qt5-virtualkeyboard `5.12.3-1` -> `5.12.5-1` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats + +- qt5-webchannel `5.12.3-1` -> `5.12.5-1` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats + +- qt5-websockets `5.12.3-1` -> `5.12.5` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats + +- qt5-webview `5.12.3-1` -> `5.12.5-1` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats + +- qt5-winextras `5.12.3-1` -> `5.12.5-1` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats + +- qt5-xmlpatterns `5.12.3-1` -> `5.12.5` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats + +- qt5 `5.12.3-1` -> `5.12.5` + - [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4 + - [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5 + - [(#8212)](https://github.com/microsoft/vcpkg/pull/8212) [Qt] feature latest to build 5.13.1 + +- mathgl `2.4.3-1` -> `2.4.3-2` + - [(#8145)](https://github.com/microsoft/vcpkg/pull/8145) [mathgl]Fix build failure on x86-windows. + +- libpng `1.6.37-3` -> `1.6.37-4` + - [(#8079)](https://github.com/microsoft/vcpkg/pull/8079) [libpng] Replace find_library() with a simple set() for linking libm on UNIX + +- chakracore `1.11.12` -> `1.11.13` + - [(#8171)](https://github.com/microsoft/vcpkg/pull/8171) [chakracore] Update library to 1.11.13 + +- fastcdr `1.0.10` -> `1.0.11` + - [(#8173)](https://github.com/microsoft/vcpkg/pull/8173) [fastcdr] Update library to 1.0.11 + +- yara `e3439e4ead4ed5d3b75a0b46eaf15ddda2110bb9-2` -> `3.10.0` + - [(#8194)](https://github.com/microsoft/vcpkg/pull/8194) [yara] Update to 3.10.0 + +- rabit `0.1` -> `0.1-2` + - [(#8042)](https://github.com/microsoft/vcpkg/pull/8042) [rabit] Fix file conflict with dmlc + - [(#8206)](https://github.com/microsoft/vcpkg/pull/8206) [rabit] Fix cmake files path + +- gdcm `3.0.0-4` -> `3.0.0-5` + - [(#7852)](https://github.com/microsoft/vcpkg/pull/7852) [gdcm] Fix file UseGDCM.cmake path name + +- libyaml `0.2.2-1` -> `0.2.2-2` + - [(#8177)](https://github.com/microsoft/vcpkg/pull/8177) Fix libyaml CMake package and CMake targets + +- clapack `3.2.1-10` -> `3.2.1-12` + - [(#8191)](https://github.com/microsoft/vcpkg/pull/8191) [clapack] Fix clapack-targets.cmake path in clpack-config.cmake + - [(#8388)](https://github.com/microsoft/vcpkg/pull/8388) [clapack] fix clapack install + +- embree3 `3.5.2-1` -> `3.5.2-2` + - [(#8192)](https://github.com/microsoft/vcpkg/pull/8192) [embree3]Fix static build and cmake path. + +- llvm `8.0.0` -> `8.0.0-2` + - [(#7919)](https://github.com/microsoft/vcpkg/pull/7919) [llvm]Fix build error on Linux: cannot find -lxml2. + - [(#8102)](https://github.com/microsoft/vcpkg/pull/8102) [halide]Upgrade to release_2019_08_27. + +- vtk `8.2.0-5` -> `8.2.0-8` + - [(#7933)](https://github.com/microsoft/vcpkg/pull/7933) [VTK] VTK links with release version of LMZA in debug build instead of debu… + - [(#8345)](https://github.com/microsoft/vcpkg/pull/8345) [vtk] Fix vtk[python] build failure + - [(#8403)](https://github.com/microsoft/vcpkg/pull/8403) [vtk] fix typo in lzma and lz4 patch + +- dcmtk `3.6.4-1` -> `3.6.4-2` + - [(#8202)](https://github.com/microsoft/vcpkg/pull/8202) [dcmtk] Fix build error on Linux + +- openimageio `2019-08-08-2` -> `2019-08-08-4` + - [(#8210)](https://github.com/microsoft/vcpkg/pull/8210) [openimageio] Add opencolorio as feature + - [(#8230)](https://github.com/microsoft/vcpkg/pull/8230) [openimageio]Re-fix find openexr issue. + - [(#8379)](https://github.com/microsoft/vcpkg/pull/8379) [alembic,geogram,openimageio]: openexr and libraw debug linkage, minor fix for geogram + +- cli `1.1-1` -> `1.1.1` + - [(#8209)](https://github.com/microsoft/vcpkg/pull/8209) [cli] Update the version to 1.1.1 + +- libepoxy `1.5.3` -> `1.5.3-1` + - [(#7985)](https://github.com/microsoft/vcpkg/pull/7985) [libepoxy]Add support with unix. + +- atk `2.24.0-3` -> `2.24.0-4` + - [(#7991)](https://github.com/microsoft/vcpkg/pull/7991) [atk]Support UNIX. + +- date `2019-05-18-1` -> `2019-09-09` + - [(#8151)](https://github.com/microsoft/vcpkg/pull/8151) [date] Add official CMake targets support + +- riffcpp `2.2.2` -> `2.2.4` + - [(#8153)](https://github.com/microsoft/vcpkg/pull/8153) [riffcpp] Update to 2.2.4 + +- duktape `2.4.0-3` -> `2.4.0-4` + - [(#8144)](https://github.com/microsoft/vcpkg/pull/8144) [duktape] Change download path of pip. + +- cgicc `3.2.19-2` -> `3.2.19-3` + - [(#8232)](https://github.com/microsoft/vcpkg/pull/8232) [cgicc]Fix linux build. + +- graphicsmagick `1.3.32-1` -> `1.3.33` + - [(#8256)](https://github.com/microsoft/vcpkg/pull/8256) [graphicsmagick] updated to 1.3.33 + +- ecsutil `1.0.7.2` -> `1.0.7.3` + - [(#8253)](https://github.com/microsoft/vcpkg/pull/8253) update for ECSUtil 1.0.7.3 + +- cpp-redis `4.3.1-1` -> `4.3.1-2` + - [(#8245)](https://github.com/microsoft/vcpkg/pull/8245) [simpleini cpp-redis tacopie] ports update + +- simpleini `2018-08-31-1` -> `2018-08-31-2` + - [(#8245)](https://github.com/microsoft/vcpkg/pull/8245) [simpleini cpp-redis tacopie] ports update + +- tacopie `3.2.0-1` -> `3.2.0-2` + - [(#8245)](https://github.com/microsoft/vcpkg/pull/8245) [simpleini cpp-redis tacopie] ports update + +- cairo `1.16.0-1` -> `1.16.0-2` + - [(#8249)](https://github.com/microsoft/vcpkg/pull/8249) [cairo]Add feature X11. + +- tinynpy `1.0.0-2` -> `1.0.0-3` + - [(#8274)](https://github.com/microsoft/vcpkg/pull/8274) [tinynpy] update + +- io2d `2019-07-11` -> `2019-07-11-1` + - [(#8251)](https://github.com/microsoft/vcpkg/pull/8251) [io2d]Fix linux build: add dependency cairo[x11]. + +- linenoise-ng `4754bee2d8eb3` -> `4754bee2d8eb3-1` + - [(#8276)](https://github.com/microsoft/vcpkg/pull/8276) [linenoise-ng] Fix flaky config + +- zeromq `2019-07-09-1` -> `2019-09-20` + - [(#8119)](https://github.com/microsoft/vcpkg/pull/8119) [zeromq] Update to 2019-09-13 + +- basisu `1.11-1` -> `1.11-2` + - [(#8289)](https://github.com/microsoft/vcpkg/pull/8289) [basisu] Updating with latest upstream changes + +- doctest `2.3.4` -> `2.3.5` + - [(#8295)](https://github.com/microsoft/vcpkg/pull/8295) [doctest] Update library to 2.3.5 + +- mbedtls `2.16.2` -> `2.16.3` + - [(#8296)](https://github.com/microsoft/vcpkg/pull/8296) [mbedtls] Update library to 2.16.3 + +- pugixml `1.9-3` -> `1.10` + - [(#8297)](https://github.com/microsoft/vcpkg/pull/8297) [pugixml] Update library to 1.10 + +- armadillo `2019-04-16-4` -> `2019-04-16-5` + - [(#8299)](https://github.com/microsoft/vcpkg/pull/8299) [armadillo] Fix configure_file failed + +- parallel-hashmap `1.23` -> `1.24` + - [(#8301)](https://github.com/microsoft/vcpkg/pull/8301) [parallel-hashmap] Update library to 1.24 + +- realsense2 `2.22.0-1` -> `2.22.0-2` + - [(#8303)](https://github.com/microsoft/vcpkg/pull/8303) [realsense2] fix dependency glfw3 and mismatching number of debug and release binaries + +- ffmpeg `4.1-11` -> `4.2` + - [(#8021)](https://github.com/microsoft/vcpkg/pull/8021) [ffmpeg] update to 4.2 + +- open62541 `0.3.0-3` -> `0.3.0-4` + - [(#8252)](https://github.com/microsoft/vcpkg/pull/8252) [open62541] fix dynamic build + +- librdkafka `1.1.0-1` -> `1.2.0-2` + - [(#8307)](https://github.com/microsoft/vcpkg/pull/8307) [librdkafka] Update library to 1.2.0 + - [(#8355)](https://github.com/microsoft/vcpkg/pull/8355) [librdkafka] Add vcpkg-cmake-wrapper.cmake + +- chartdir `6.3.1` -> `6.3.1-1` + - [(#8308)](https://github.com/microsoft/vcpkg/pull/8308) [chartdir] fix hash for osx + +- mpfr `4.0.1` -> `4.0.2-1` + - [(#8324)](https://github.com/microsoft/vcpkg/pull/8324) update mpfr to 4.0.2 and fix build on osx + +- cuda `9.0` -> `10.1` + - [(#7536)](https://github.com/microsoft/vcpkg/pull/7536) [cudnn] add port and enable it in darknet + +- darknet `0.2.5-6` -> `0.2.5.1` + - [(#7536)](https://github.com/microsoft/vcpkg/pull/7536) [cudnn] add port and enable it in darknet + +- opencv4 `4.1.1-1` -> `4.1.1-2` + - [(#7536)](https://github.com/microsoft/vcpkg/pull/7536) [cudnn] add port and enable it in darknet + +- libiconv `1.15-5` -> `1.15-6` + - [(#8312)](https://github.com/microsoft/vcpkg/pull/8312) [libiconv] Guard imported targets in non-Windows + +- gsoap `2.8.87-1` -> `2.8.93-1` + - [(#8338)](https://github.com/microsoft/vcpkg/pull/8338) [gSoap] Update to 2.8.93 + +- arrow `0.14.1` -> `0.14.1-1` + - [(#8263)](https://github.com/microsoft/vcpkg/pull/8263) [arrow]Fix build error on Visual Studio 2019. + +- sol2 `3.0.3` -> `3.0.3-1` + - [(#8243)](https://github.com/microsoft/vcpkg/pull/8243) [sol2]Fix using namespace. + +- alembic `1.7.11-4` -> `1.7.11-5` + - [(#8331)](https://github.com/microsoft/vcpkg/pull/8331) [many ports] Warning to VCPKG long build path + - [(#8379)](https://github.com/microsoft/vcpkg/pull/8379) [alembic,geogram,openimageio]: openexr and libraw debug linkage, minor fix for geogram + +- avro-c `1.8.2-2` -> `1.8.2-3` + - [(#8331)](https://github.com/microsoft/vcpkg/pull/8331) [many ports] Warning to VCPKG long build path + +- aws-sdk-cpp `1.7.142` -> `1.7.142-1` + - [(#8331)](https://github.com/microsoft/vcpkg/pull/8331) [many ports] Warning to VCPKG long build path + +- boost-system `1.70.0` -> `1.70.0-1` + - [(#8331)](https://github.com/microsoft/vcpkg/pull/8331) [many ports] Warning to VCPKG long build path + +- cgal `4.14-2` -> `4.14-3` + - [(#8331)](https://github.com/microsoft/vcpkg/pull/8331) [many ports] Warning to VCPKG long build path + +- eigen3 `3.3.7-2` -> `3.3.7-3` + - [(#8331)](https://github.com/microsoft/vcpkg/pull/8331) [many ports] Warning to VCPKG long build path + +- itk `5.0.1` -> `5.0.1-1` + - [(#8331)](https://github.com/microsoft/vcpkg/pull/8331) [many ports] Warning to VCPKG long build path + +- kinectsdk2 `2.0-1` -> `2.0-2` + - [(#8331)](https://github.com/microsoft/vcpkg/pull/8331) [many ports] Warning to VCPKG long build path + +- ompl `1.4.2-1` -> `1.4.2-2` + - [(#8331)](https://github.com/microsoft/vcpkg/pull/8331) [many ports] Warning to VCPKG long build path + +- openmvg `1.4-5` -> `1.4-6` + - [(#8331)](https://github.com/microsoft/vcpkg/pull/8331) [many ports] Warning to VCPKG long build path + +- curl `7.65.2-1` -> `7.66.0` + - [(#7331)](https://github.com/microsoft/vcpkg/pull/7331) [curl] Update to 7.66.0 + +- halide `release_2018_02_15-1` -> `release_2019_08_27` + - [(#8102)](https://github.com/microsoft/vcpkg/pull/8102) [halide]Upgrade to release_2019_08_27. + +- boost-accumulators `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-algorithm `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-align `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-any `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-array `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-asio `1.70.0-2` -> `1.71.0-1` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-assert `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-assign `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-atomic `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-beast `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-bimap `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-bind `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-callable-traits `2.3.2` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-chrono `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-circular-buffer `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-compatibility `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-compute `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-concept-check `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-config `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-container-hash `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-container `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-context `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-contract `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-conversion `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-convert `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-core `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-coroutine `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-coroutine2 `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-crc `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-date-time `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-detail `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-disjoint-sets `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-dll `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-dynamic-bitset `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-endian `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-exception `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-fiber `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-filesystem `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-flyweight `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-foreach `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-format `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-function-types `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-function `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-functional `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-fusion `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-geometry `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-gil `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-graph-parallel `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-graph `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- boost-hana `1.70.0` -> `1.71.0` + - [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0 + +- hpx `1.3.0-1` -> `1.3.0-2` + - [(#8259)](https://github.com/microsoft/vcpkg/pull/8259) [hpx] Redirect --head to `stable` + +- assimp `4.1.0-8` -> `5.0.0` + - [(#8370)](https://github.com/microsoft/vcpkg/pull/8370) [assimp] Update the version to 5.0.0 + - [(#8381)](https://github.com/microsoft/vcpkg/pull/8381) [assimp] Update the version + +- angle `2019-06-13` -> `2019-07-19-2` + - [(#7329)](https://github.com/microsoft/vcpkg/pull/7329) [angle] Update to the latest commit. + - [(#8395)](https://github.com/microsoft/vcpkg/pull/8395) drop useless patch + +
+ +-- vcpkg team vcpkg@microsoft.com TUE, 01 Oct 22:00:00 -0800 + +vcpkg (2019.08.31) +--- +#### Total port count: 1169 +#### Total port count per triplet (tested): +|triplet|ports available| +|---|---| +|**x64-windows**|1099| +|x86-windows|1085| +|x64-windows-static|987| +|**x64-linux**|930| +|**x64-osx**|876| +|arm64-windows|726| +|x64-uwp|595| +|arm-uwp|571| + +#### The following commands and options have been updated: +- `depend-info` + - `--max-recurse` ***[NEW OPTION]***: Set the max depth of recursion for listing dependencies + - `--sort` ***[NEW OPTION]***: Sort the list of dependencies by `lexicographical`, `topological`, and `reverse` (topological) order + - `--show-depth` ***[NEW OPTION]***: Display the depth of each dependency in the list + - [(#7643)](https://github.com/microsoft/vcpkg/pull/7643) [depend-info] Fix bugs, add `--sort`, `--show-depth` and `--max-recurse` options +- `install --only-downloads` ***[NEW OPTION]*** + - Download sources for a package and its dependencies and don't build them + - [(#7950)](https://github.com/microsoft/vcpkg/pull/7950) [vcpkg install] Enable Download Mode ⬠+ +#### The following documentation has been updated: +- [Index](docs/README.md) + - [(#7506)](https://github.com/microsoft/vcpkg/pull/7506) Update tests, and add documentation! + - [(#7821)](https://github.com/microsoft/vcpkg/pull/7821) [vcpkg docs] More tool maintainer docs! ðŸ±â€ðŸ‘¤ +- [Tool maintainers: Testing](docs/tool-maintainers/testing.md) ***[NEW]*** + - [(#7506)](https://github.com/microsoft/vcpkg/pull/7506) Update tests, and add documentation! + - [(#7821)](https://github.com/microsoft/vcpkg/pull/7821) [vcpkg docs] More tool maintainer docs! ðŸ±â€ðŸ‘¤ +- [Examples: Overlay triplets example +](docs/examples/overlay-triplets-linux-dynamic.md) + - [(#7502)](https://github.com/microsoft/vcpkg/pull/7502) [vcpkg-docs] Reword and reorganize overlay-triplets-linux-dynamic.md +- [Portfile helper functions](docs/maintainers/portfile-functions.md) + - [(#7558)](https://github.com/microsoft/vcpkg/pull/7558) [vcpkg_check_features] Set output variable explicitly and allow reverse-logic check + - [(#7950)](https://github.com/microsoft/vcpkg/pull/7950) [vcpkg install] Enable Download Mode ⬠+- [`vcpkg_check_features`](docs/maintainers/vcpkg_check_features.md) + - [(#7558)](https://github.com/microsoft/vcpkg/pull/7558) [vcpkg_check_features] Set output variable explicitly and allow reverse-logic check +- [`vcpkg_configure_cmake`](docs/maintainers/vcpkg_configure_cmake.md) + - [(#7558)](https://github.com/microsoft/vcpkg/pull/7558) [vcpkg_check_features] Set output variable explicitly and allow reverse-logic check +- [`vcpkg_pretiffy_command`](docs/maintainers/vcpkg_prettify_command.md) ***[NEW]*** + - [(#7558)](https://github.com/microsoft/vcpkg/pull/7558) [vcpkg_check_features] Set output variable explicitly and allow reverse-logic check +- [Maintainer Guidelines and Policies](docs/maintainers/maintainer-guide.md) + - [(#7751)](https://github.com/microsoft/vcpkg/pull/7751) Add guideline for overriding `VCPKG_` +- [Tool maintainers: Benchmarking](docs/tool-maintainers/benchmarking.md) ***[NEW]*** + - [(#7821)](https://github.com/microsoft/vcpkg/pull/7821) [vcpkg docs] More tool maintainer docs! ðŸ±â€ðŸ‘¤ +- [Tool maintainers: Layout of the vcpkg source tree](docs/tool-maintainers/layout.md) ***[NEW]*** + - [(#7821)](https://github.com/microsoft/vcpkg/pull/7821) [vcpkg docs] More tool maintainer docs! ðŸ±â€ðŸ‘¤ +- [`vcpkg_common_definitions`](docs/maintainers/vcpkg_common_definitions.md) ***[NEW]*** + - [(#7950)](https://github.com/microsoft/vcpkg/pull/7950) [vcpkg install] Enable Download Mode ⬠+- [`vcpkg_execute_required_process`](docs/maintainers/vcpkg_execute_required_process.md) + - [(#7950)](https://github.com/microsoft/vcpkg/pull/7950) [vcpkg install] Enable Download Mode ⬠+- [`vcpkg_fail_port_install`](docs/maintainers/vcpkg_fail_port_install.md) ***[NEW]*** + - [(#7950)](https://github.com/microsoft/vcpkg/pull/7950) [vcpkg install] Enable Download Mode ⬠+ +#### The following *remarkable* changes have been made to vcpkg's infrastructure: +- CONTROL files extended syntax + - The `Build-Depends` field now supports logical expressions as well as line breaks + - [(#7508)](https://github.com/microsoft/vcpkg/pull/7508) Improve logical evaluation of dependency qualifiers + - [(#7863)](https://github.com/microsoft/vcpkg/pull/7863) Fix list parsing logic and add error messages +- Quality-of-Life improvements for portfile maintainers + - [(#7601)](https://github.com/microsoft/vcpkg/pull/7601) [vcpkg/cmake] Added a function to fail from portfiles in a default way + - [(#7600)](https://github.com/microsoft/vcpkg/pull/7600) [vcpkg] QoL: add target dependent library prefix/suffix variables and enable find_library for portfiles + - [(#7773)](https://github.com/microsoft/vcpkg/pull/7773) [vcpkg] QoL: Make find_library useable without errors to console. + - [(#7599)](https://github.com/microsoft/vcpkg/pull/7599) [vcpkg] QoL: add host/target dependent variables for executable suffixes + +#### The following *additional* changes have been made to vcpkg's infrastructure: +- [(#4572)](https://github.com/microsoft/vcpkg/pull/4572) Change CMakeLists.txt in toolsrc to allow compiling with llvm toolset +- [(#7305)](https://github.com/microsoft/vcpkg/pull/7305) [vcpkg] Public ABI override option +- [(#7307)](https://github.com/microsoft/vcpkg/pull/7307) [vcpkg] Always calculate ABI tags +- [(#7491)](https://github.com/microsoft/vcpkg/pull/7491) Handle response files with Windows line-endings properly +- [(#7501)](https://github.com/microsoft/vcpkg/pull/7501) Add July changelog +- [(#7506)](https://github.com/microsoft/vcpkg/pull/7506) Update tests, and add documentation! +- [(#7558)](https://github.com/microsoft/vcpkg/pull/7558) [vcpkg_check_features] Set output variable explicitly and allow reverse-logic check +- [(#7568)](https://github.com/microsoft/vcpkg/pull/7568) [tensorflow] Add new port for linux +- [(#7570)](https://github.com/microsoft/vcpkg/pull/7570) [vcpkg] Make `RealFilesystem::remove_all` much, much faster, and start benchmarking +- [(#7587)](https://github.com/microsoft/vcpkg/pull/7587) [vcpkg] Revert accidental removal of powershell-core usage in bb3a9ddb6ec917f54 +- [(#7619)](https://github.com/microsoft/vcpkg/pull/7619) [vcpkg] Fix `.vcpkg-root` detection issue +- [(#7620)](https://github.com/microsoft/vcpkg/pull/7620) [vcpkg] Fix warnings in `files.{h,cpp}` build under /W4 +- [(#7623)](https://github.com/microsoft/vcpkg/pull/7623) Fix VS 2019 detection bug +- [(#7637)](https://github.com/microsoft/vcpkg/pull/7637) [vcpkg] Fix the build on VS2015 debug +- [(#7638)](https://github.com/microsoft/vcpkg/pull/7638) [vcpkg] Make CMakelists nicer 😠+- [(#7687)](https://github.com/microsoft/vcpkg/pull/7687) [vcpkg] Port toolchains +- [(#7754)](https://github.com/microsoft/vcpkg/pull/7754) [vcpkg] Allow multiple spaces in a comma list +- [(#7757)](https://github.com/microsoft/vcpkg/pull/7757) [vcpkg] Switch to internal hash algorithms ðŸ±â€ðŸ’» +- [(#7793)](https://github.com/microsoft/vcpkg/pull/7793) Allow redirection of the scripts folder +- [(#7798)](https://github.com/microsoft/vcpkg/pull/7798) [vcpkg] Fix build on FreeBSD 😈 +- [(#7816)](https://github.com/microsoft/vcpkg/pull/7816) [vcpkg] Fix gcc-9 warning +- [(#7864)](https://github.com/microsoft/vcpkg/pull/7864) [vcpkg] Move `do_build_package_and_clean_buildtrees()` above generating vcpkg_abi_info.txt so it will be included in the package. +- [(#7930)](https://github.com/microsoft/vcpkg/pull/7930) [vcpkg] fix bug in StringView::operator== 😱 +
+The following 63 ports have been added: + +|port|version| +|---|---| +|[riffcpp](https://github.com/microsoft/vcpkg/pull/7509) [#7541](https://github.com/microsoft/vcpkg/pull/7541) [#7859](https://github.com/microsoft/vcpkg/pull/7859) | 2.2.2 +|[easyhook](https://github.com/microsoft/vcpkg/pull/7487)| 2.7.6789.0 +|[brigand](https://github.com/microsoft/vcpkg/pull/7518)| 1.3.0 +|[ctbignum](https://github.com/microsoft/vcpkg/pull/7512)| 2019-08-02 +|[gaussianlib](https://github.com/microsoft/vcpkg/pull/7542)| 2019-08-04 +|[tinycthread](https://github.com/microsoft/vcpkg/pull/7565)| 2019-08-06 +|[libcerf](https://github.com/microsoft/vcpkg/pull/7320)| 1.13 +|[tinynpy](https://github.com/microsoft/vcpkg/pull/7393)| 1.0.0-2 +|[googleapis](https://github.com/microsoft/vcpkg/pull/7557) [#7703](https://github.com/microsoft/vcpkg/pull/7703) | 0.1.3 +|[pdqsort](https://github.com/microsoft/vcpkg/pull/7464)| 2019-07-30 +|[discount](https://github.com/microsoft/vcpkg/pull/7400)| 2.2.6 +|[duckx](https://github.com/microsoft/vcpkg/pull/7561)| 2019-08-06 +|[opencv3](https://github.com/microsoft/vcpkg/pull/5169) [#7581](https://github.com/microsoft/vcpkg/pull/7581) [#7658](https://github.com/microsoft/vcpkg/pull/7658) [#7925](https://github.com/microsoft/vcpkg/pull/7925) | 3.4.7-1 +|[opencv4](https://github.com/microsoft/vcpkg/pull/5169) [#7558](https://github.com/microsoft/vcpkg/pull/7558) [#7581](https://github.com/microsoft/vcpkg/pull/7581) [#7658](https://github.com/microsoft/vcpkg/pull/7658) | 4.1.1-1 +|[tiny-bignum-c](https://github.com/microsoft/vcpkg/pull/7531)| 2019-07-31 +|[tgc](https://github.com/microsoft/vcpkg/pull/7644)| 2019-08-11 +|[bento4](https://github.com/microsoft/vcpkg/pull/7595)| 1.5.1-628 +|[dbow2](https://github.com/microsoft/vcpkg/pull/7552)| 2019-08-05 +|[tiny-aes-c](https://github.com/microsoft/vcpkg/pull/7530)| 2019-07-31 +|[drlibs](https://github.com/microsoft/vcpkg/pull/7656)| 2019-08-12 +|[nt-wrapper](https://github.com/microsoft/vcpkg/pull/7633)| 2019-08-10 +|[xorstr](https://github.com/microsoft/vcpkg/pull/7631)| 2019-08-10 +|[lazy-importer](https://github.com/microsoft/vcpkg/pull/7630)| 2019-08-10 +|[plf-colony](https://github.com/microsoft/vcpkg/pull/7627)| 2019-08-10 +|[plf-list](https://github.com/microsoft/vcpkg/pull/7627)| 2019-08-10 +|[plf-nanotimer](https://github.com/microsoft/vcpkg/pull/7627)| 2019-08-10 +|[plf-stack](https://github.com/microsoft/vcpkg/pull/7627)| 2019-08-10 +|[tiny-regex-c](https://github.com/microsoft/vcpkg/pull/7626)| 2019-07-31 +|[hayai](https://github.com/microsoft/vcpkg/pull/7624)| 2019-08-10 +|[yasm](https://github.com/microsoft/vcpkg/pull/7478)| 1.3.0 +|[fast-cpp-csv-parser](https://github.com/microsoft/vcpkg/pull/7681)| 2019-08-14 +|[wg21-sg14](https://github.com/microsoft/vcpkg/pull/7663)| 2019-08-13 +|[pistache](https://github.com/microsoft/vcpkg/pull/7547)| 2019-08-05 +|[hfsm2](https://github.com/microsoft/vcpkg/pull/7516)| beta7 +|[mpmcqueue](https://github.com/microsoft/vcpkg/pull/7437)| 2019-07-26 +|[spscqueue](https://github.com/microsoft/vcpkg/pull/7437)| 2019-07-26 +|[tinkerforge](https://github.com/microsoft/vcpkg/pull/7523)| 2.1.25 +|[field3d](https://github.com/microsoft/vcpkg/pull/7594)| 1.7.2 +|[libsvm](https://github.com/microsoft/vcpkg/pull/7664)| 323 +|[nanort](https://github.com/microsoft/vcpkg/pull/7778)| 2019-08-20 +|[libspatialindex](https://github.com/microsoft/vcpkg/pull/7762)| 1.9.0 +|[qtkeychain](https://github.com/microsoft/vcpkg/pull/7760)| v0.9.1 +|[sparsehash](https://github.com/microsoft/vcpkg/pull/7772)| 2.0.3 +|[tensorflow-cc](https://github.com/microsoft/vcpkg/pull/7568)| 1.14 +|[qt-advanced-docking-system](https://github.com/microsoft/vcpkg/pull/7621)| 2019-08-14 +|[quickfast](https://github.com/microsoft/vcpkg/pull/7814)| 1.5 +|[mp3lame](https://github.com/microsoft/vcpkg/pull/7830)| 3.100 +|[quickfix](https://github.com/microsoft/vcpkg/pull/7796)| 1.15.1 +|[fplus](https://github.com/microsoft/vcpkg/pull/7883)| 0.2.3-p0 +|[json5-parser](https://github.com/microsoft/vcpkg/pull/7915)| 1.0.0 +|[gppanel](https://github.com/microsoft/vcpkg/pull/7868)| 2018-04-06 +|[libguarded](https://github.com/microsoft/vcpkg/pull/7924)| 2019-08-27 +|[cgl](https://github.com/microsoft/vcpkg/pull/7810)| 0.60.2-1 +|[minifb](https://github.com/microsoft/vcpkg/pull/7766)| 2019-08-20-1 +|[log4cpp](https://github.com/microsoft/vcpkg/pull/7433)| 2.9.1-1 +|[chartdir](https://github.com/microsoft/vcpkg/pull/7912)| 6.3.1 +|[outcome](https://github.com/microsoft/vcpkg/pull/7940)| 2.1 +|[libP7Client](https://github.com/microsoft/vcpkg/pull/7605)| 5.2 +|[clue](https://github.com/microsoft/vcpkg/pull/7564)| 1.0.0-alpha.7 +|[status-value-lite](https://github.com/microsoft/vcpkg/pull/7563)| 1.1.0 +|[type-lite](https://github.com/microsoft/vcpkg/pull/7563)| 0.1.0 +|[value-ptr-lite](https://github.com/microsoft/vcpkg/pull/7563)| 0.2.1 +|[kvasir-mpl](https://github.com/microsoft/vcpkg/pull/7562)| 2019-08-06 +
+ +
+The following 199 ports have been updated: + +- pcl `1.9.1-5` -> `1.9.1-8` + - [(#7413)](https://github.com/microsoft/vcpkg/pull/7413) [pcl] Fix Build failure in linux + - [(#7558)](https://github.com/microsoft/vcpkg/pull/7558) [vcpkg_check_features] Set output variable explicitly and allow reverse-logic check + - [(#7700)](https://github.com/microsoft/vcpkg/pull/7700) [czmq/pcl] Fix judgment feature condition. + +- xalan-c `1.11-5` -> `1.11-7` + - [(#7496)](https://github.com/microsoft/vcpkg/pull/7496) [xalan-c] Bump version number + - [(#7505)](https://github.com/microsoft/vcpkg/pull/7505) [xalan-c] switch to https://github.com/apache/xalan-c (#7489) + +- catch2 `2.7.2-2` -> `2.9.2` + - [(#7497)](https://github.com/microsoft/vcpkg/pull/7497) [Catch2] Update to v2.9.1 + - [(#7702)](https://github.com/microsoft/vcpkg/pull/7702) [brynet, catch2, chakracore] Update some ports version + +- ade `0.1.1d` -> `0.1.1f` + - [(#7494)](https://github.com/microsoft/vcpkg/pull/7494) Update some ports version + - [(#7628)](https://github.com/microsoft/vcpkg/pull/7628) [ade] Update library to 0.1.1f + +- harfbuzz `2.5.1-1` -> `2.5.3` + - [(#7494)](https://github.com/microsoft/vcpkg/pull/7494) Update some ports version + +- libpmemobj-cpp `1.6-1` -> `1.7` + - [(#7494)](https://github.com/microsoft/vcpkg/pull/7494) Update some ports version + +- msgpack `3.1.1` -> `3.2.0` + - [(#7494)](https://github.com/microsoft/vcpkg/pull/7494) Update some ports version + +- protobuf `3.8.0-1` -> `3.9.1` + - [(#7494)](https://github.com/microsoft/vcpkg/pull/7494) Update some ports version + - [(#7671)](https://github.com/microsoft/vcpkg/pull/7671) [protobuf] Update from 3.9.0 to 3.9.1 + +- string-theory `2.1-1` -> `2.2` + - [(#7494)](https://github.com/microsoft/vcpkg/pull/7494) Update some ports version + +- ccfits `2.5-2` -> `2.5-3` + - [(#7484)](https://github.com/microsoft/vcpkg/pull/7484) [manyports] Regenerate patches and modify how the patches are used. + +- itpp `4.3.1` -> `4.3.1-1` + - [(#7484)](https://github.com/microsoft/vcpkg/pull/7484) [manyports] Regenerate patches and modify how the patches are used. + +- mpg123 `1.25.8-5` -> `1.25.8-6` + - [(#7484)](https://github.com/microsoft/vcpkg/pull/7484) [manyports] Regenerate patches and modify how the patches are used. + +- qwt `6.1.3-6` -> `6.1.3-7` + - [(#7484)](https://github.com/microsoft/vcpkg/pull/7484) [manyports] Regenerate patches and modify how the patches are used. + +- sdl1 `1.2.15-5` -> `1.2.15-6` + - [(#7484)](https://github.com/microsoft/vcpkg/pull/7484) [manyports] Regenerate patches and modify how the patches are used. + +- gdal `2.4.1-5` -> `2.4.1-8` + - [(#7520)](https://github.com/microsoft/vcpkg/pull/7520) [gdal] Fix duplicate pdb file + - [(#7434)](https://github.com/microsoft/vcpkg/pull/7434) [gdal] Fix dependent ports in static builds. + +- blosc `1.16.3-2` -> `1.17.0-1` + - [(#7525)](https://github.com/microsoft/vcpkg/pull/7525) Update some ports version + - [(#7649)](https://github.com/microsoft/vcpkg/pull/7649) [blosc] enable dependent ports to use debug builds + +- boost-callable-traits `1.70.0` -> `2.3.2` + - [(#7525)](https://github.com/microsoft/vcpkg/pull/7525) Update some ports version + +- cjson `1.7.10-1` -> `1.7.12` + - [(#7525)](https://github.com/microsoft/vcpkg/pull/7525) Update some ports version + +- cppzmq `4.3.0-1` -> `4.4.1` + - [(#7525)](https://github.com/microsoft/vcpkg/pull/7525) Update some ports version + +- restinio `0.5.1-1` -> `0.6.0` + - [(#7514)](https://github.com/microsoft/vcpkg/pull/7514) [RESTinio] updated to v.0.5.1.1 + - [(#7962)](https://github.com/microsoft/vcpkg/pull/7962) RESTinio updated to v.0.6.0 + +- argh `2018-12-18` -> `2018-12-18-1` + - [(#7527)](https://github.com/microsoft/vcpkg/pull/7527) [argh] fix flaky cmake config + +- libusb `1.0.22-3` -> `1.0.22-4` + - [(#7465)](https://github.com/microsoft/vcpkg/pull/7465) [libusb] Fix using mismatched CRT_linkage/library_linkage issue. + +- casclib `1.50` -> `1.50b-1` + - [(#7522)](https://github.com/microsoft/vcpkg/pull/7522) [casclib] Added CMake targets + - [(#7907)](https://github.com/microsoft/vcpkg/pull/7907) [casclib] Update library to 1.50b + +- opencv `3.4.3-9` -> `4.1.1-1` + - [(#7499)](https://github.com/microsoft/vcpkg/pull/7499) Add feature halide to OpenCV. + - [(#5169)](https://github.com/microsoft/vcpkg/pull/5169) [OpenCV] Update to v4.1.1 + - [(#7659)](https://github.com/microsoft/vcpkg/pull/7659) [opencv] Expose all features from `opencv4` in meta-package + - [(#7558)](https://github.com/microsoft/vcpkg/pull/7558) [vcpkg_check_features] Set output variable explicitly and allow reverse-logic check + +- openxr-loader `1.0.0-1` -> `1.0.0-2` + - [(#7560)](https://github.com/microsoft/vcpkg/pull/7560) [Openxr-loader] Remove the invalid patch + +- simdjson `2019-03-09` -> `2019-08-05` + - [(#7546)](https://github.com/microsoft/vcpkg/pull/7546) [simdjson] Update to 0.2.1 + +- alembic `1.7.11-3` -> `1.7.11-4` + - [(#7551)](https://github.com/microsoft/vcpkg/pull/7551) [alembic] fix hdf5 linkage + +- xerces-c `3.2.2-10` -> `3.2.2-11` + - [(#7500)](https://github.com/microsoft/vcpkg/pull/7500) [xercec-c] no symlinks in static build (#7490) + - [(#7622)](https://github.com/microsoft/vcpkg/pull/7622) [tiff][tesseract][xerces-c] Disable unmanaged optional dependencies + +- sol2 `3.0.2` -> `3.0.3` + - [(#7545)](https://github.com/microsoft/vcpkg/pull/7545) Update sol2 portfile to 579908 + - [(#7804)](https://github.com/microsoft/vcpkg/pull/7804) [sol2] Update library to 3.0.3 + +- cpprestsdk `2.10.14` -> `2.10.14-1` + - [(#7472)](https://github.com/microsoft/vcpkg/pull/7472) Repair compression dependency bugs in cpprestsdk + - [(#7863)](https://github.com/microsoft/vcpkg/pull/7863) fix list parsing logic and add error messages + +- libevent `2.1.10` -> `2.1.11` + - [(#7515)](https://github.com/microsoft/vcpkg/pull/7515) [libevent] update to 2.1.11 + +- imgui `1.70-1` -> `1.72b` + - [(#7534)](https://github.com/microsoft/vcpkg/pull/7534) Update some ports version + +- mbedtls `2.15.1` -> `2.16.2` + - [(#7534)](https://github.com/microsoft/vcpkg/pull/7534) Update some ports version + +- ffmpeg `4.1-8` -> `4.1-9` + - [(#7476)](https://github.com/microsoft/vcpkg/pull/7476) [ffmpeg] Fix debug build in Windows. + - [(#5169)](https://github.com/microsoft/vcpkg/pull/5169) [OpenCV] Update to v4.1.1 + - [(#7608)](https://github.com/microsoft/vcpkg/pull/7608) [ffmpeg] Add feature avresample. + - [(#7739)](https://github.com/microsoft/vcpkg/pull/7739) [ffmpeg] Fix static linking on Windows, FindFFMPEG + +- kangaru `4.1.3-2` -> `4.2.0` + - [(#7567)](https://github.com/microsoft/vcpkg/pull/7567) Updated kangaru version + +- cpp-taskflow `2018-11-30` -> `2.2.0` + - [(#7554)](https://github.com/microsoft/vcpkg/pull/7554) [cpp-taskflow] update to 2.2.0 + +- jsoncons `0.125.0` -> `0.132.1` + - [(#7529)](https://github.com/microsoft/vcpkg/pull/7529) Update jsoncons to v0.131.2 + - [(#7718)](https://github.com/microsoft/vcpkg/pull/7718) [jsoncons] Update library to 0.132.1 + +- tinyexif `1.0.2-5` -> `1.0.2-6` + - [(#7575)](https://github.com/microsoft/vcpkg/pull/7575) [TinyEXIF] fix linux/mac + +- itk `5.0.0-2` -> `5.0.1` + - [(#7241)](https://github.com/microsoft/vcpkg/pull/7241) ITK portfile support legacy user code by default + - [(#7586)](https://github.com/microsoft/vcpkg/pull/7586) [itk] Update library from 5.0.0 to 5.0.1 + +- stxxl `2018-11-15-1` -> `2018-11-15-2` + - [(#7330)](https://github.com/microsoft/vcpkg/pull/7330) [stxxl] compilation fix + +- chakracore `1.11.9` -> `1.11.12` + - [(#7576)](https://github.com/microsoft/vcpkg/pull/7576) [chakracore] Update library to 1.11.11 + - [(#7702)](https://github.com/microsoft/vcpkg/pull/7702) [brynet, catch2, chakracore] Update some ports version + +- qhull `7.3.2` -> `7.3.2-1` + - [(#7370)](https://github.com/microsoft/vcpkg/pull/7370) [Qhulluwp] fix uwp building + +- netcdf-c `4.7.0-3` -> `4.7.0-4` + - [(#7578)](https://github.com/microsoft/vcpkg/pull/7578) [netcdf-c] correctly fix hdf5 linkage + +- google-cloud-cpp `0.11.0` -> `0.12.0` + - [(#7557)](https://github.com/microsoft/vcpkg/pull/7557) Update google-cloud-cpp to 0.12.0. + +- stormlib `9.22` -> `2019-05-10` + - [(#7409)](https://github.com/microsoft/vcpkg/pull/7409) [stormlib] Add targets and streamline build + +- openimageio `2.0.8` -> `2019-08-08-2` + - [(#7419)](https://github.com/microsoft/vcpkg/pull/7419) [openimageio] Fix feature libraw build errors + - [(#7588)](https://github.com/microsoft/vcpkg/pull/7588) [openimageio] find_package support + - [(#7747)](https://github.com/microsoft/vcpkg/pull/7747) [openimageio] Fix find correct debug/release openexr libraries. + +- librdkafka `1.1.0` -> `1.1.0-1` + - [(#7469)](https://github.com/microsoft/vcpkg/pull/7469) Librdkafka snappy + - [(#7558)](https://github.com/microsoft/vcpkg/pull/7558) [vcpkg_check_features] Set output variable explicitly and allow reverse-logic check + +- open62541 `0.3.0-2` -> `0.3.0-3` + - [(#7607)](https://github.com/microsoft/vcpkg/pull/7607) [open62541] Fix flakiness/bugginess + +- jsonnet `2019-05-08` -> `2019-05-08-1` + - [(#7587)](https://github.com/microsoft/vcpkg/pull/7587) [vcpkg] Revert accidental removal of powershell-core usage in bb3a9ddb6ec917f54 + - [(#7374)](https://github.com/microsoft/vcpkg/pull/7374) [jsonnet] Upgrade version to 0.13.0 + +- expat `2.2.6` -> `2.2.7` + - [(#7596)](https://github.com/microsoft/vcpkg/pull/7596) [expat] Update library to 2.2.7 + +- aws-lambda-cpp `0.1.0-1` -> `0.1.0-2` + - [(#7601)](https://github.com/microsoft/vcpkg/pull/7601) [vcpkg/cmake] Added a function to fail from portfiles in a default way + +- rocksdb `6.1.2` -> `6.1.2-1` + - [(#7452)](https://github.com/microsoft/vcpkg/pull/7452) [rocksdb] Change linkage type to static. + - [(#7558)](https://github.com/microsoft/vcpkg/pull/7558) [vcpkg_check_features] Set output variable explicitly and allow reverse-logic check + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- freeimage `3.18.0-6` -> `3.18.0-7` + - [(#5169)](https://github.com/microsoft/vcpkg/pull/5169) [OpenCV] Update to v4.1.1 + +- gdcm `3.0.0-3` -> `3.0.0-4` + - [(#5169)](https://github.com/microsoft/vcpkg/pull/5169) [OpenCV] Update to v4.1.1 + +- ogre `1.12.0-1` -> `1.12.1` + - [(#5169)](https://github.com/microsoft/vcpkg/pull/5169) [OpenCV] Update to v4.1.1 + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- pthreads `3.0.0-2` -> `3.0.0-3` + - [(#5169)](https://github.com/microsoft/vcpkg/pull/5169) [OpenCV] Update to v4.1.1 + +- qt5 `5.12.3` -> `5.12.3-1` + - [(#5169)](https://github.com/microsoft/vcpkg/pull/5169) [OpenCV] Update to v4.1.1 + - [(#7642)](https://github.com/microsoft/vcpkg/pull/7642) [qt5] Only build qt5-activeqt on windows + +- zxing-cpp `3.3.3-5` -> `3.3.3-6` + - [(#5169)](https://github.com/microsoft/vcpkg/pull/5169) [OpenCV] Update to v4.1.1 + +- tesseract `4.1.0-1` -> `4.1.0-2` + - [(#7622)](https://github.com/microsoft/vcpkg/pull/7622) [tiff][tesseract][xerces-c] Disable unmanaged optional dependencies + +- tiff `4.0.10-6` -> `4.0.10-7` + - [(#7622)](https://github.com/microsoft/vcpkg/pull/7622) [tiff][tesseract][xerces-c] Disable unmanaged optional dependencies + +- osg `3.6.3-1` -> `3.6.4` + - [(#7653)](https://github.com/microsoft/vcpkg/pull/7653) [osg] Update osg version to 3.6.4 + - [(#7677)](https://github.com/microsoft/vcpkg/pull/7677) [osg] Fix Applying patch failed + +- cppgraphqlgen `3.0.0` -> `3.0.2` + - [(#7639)](https://github.com/microsoft/vcpkg/pull/7639) [cppgraphqlgen] Update with matching PEGTL + +- pegtl `3.0.0-pre` -> `3.0.0-pre-697aaa0` + - [(#7639)](https://github.com/microsoft/vcpkg/pull/7639) [cppgraphqlgen] Update with matching PEGTL + +- monkeys-audio `4.3.3-1` -> `4.8.3` + - [(#7634)](https://github.com/microsoft/vcpkg/pull/7634) [monkeys-audio] Update library to 4.8.3 + +- directxmesh `apr2019` -> `jun2019-1` + - [(#7665)](https://github.com/microsoft/vcpkg/pull/7665) [directxtk][directxtk12][directxmesh][directxtex] Updated to June version and improved platform toolset support + - [(#7869)](https://github.com/microsoft/vcpkg/pull/7869) [directxmesh] Update library to aug2019 + +- directxtex `apr2019` -> `jun2019-1` + - [(#7665)](https://github.com/microsoft/vcpkg/pull/7665) [directxtk][directxtk12][directxmesh][directxtex] Updated to June version and improved platform toolset support + - [(#7870)](https://github.com/microsoft/vcpkg/pull/7870) [directxtex] Update library to aug2019 + +- directxtk `apr2019-1` -> `jun2019-1` + - [(#7665)](https://github.com/microsoft/vcpkg/pull/7665) [directxtk][directxtk12][directxmesh][directxtex] Updated to June version and improved platform toolset support + - [(#7871)](https://github.com/microsoft/vcpkg/pull/7871) [directxtk] Update library to aug2019 + +- directxtk12 `dec2016-1` -> `jun2019-1` + - [(#7665)](https://github.com/microsoft/vcpkg/pull/7665) [directxtk][directxtk12][directxmesh][directxtex] Updated to June version and improved platform toolset support + - [(#7872)](https://github.com/microsoft/vcpkg/pull/7872) [directxtk12] Update library to aug2019 + +- usockets `0.1.2` -> `0.3.1` + - [(#7662)](https://github.com/microsoft/vcpkg/pull/7662) [usockets] upgrade to v0.3.1 + +- dimcli `4.1.0` -> `5.0.0` + - [(#7651)](https://github.com/microsoft/vcpkg/pull/7651) [dimcli] Fix build error C2220 + - [(#7785)](https://github.com/microsoft/vcpkg/pull/7785) [dimcli] Update library to 5.0.0 + +- czmq `2019-06-10-1` -> `2019-06-10-3` + - [(#7558)](https://github.com/microsoft/vcpkg/pull/7558) [vcpkg_check_features] Set output variable explicitly and allow reverse-logic check + - [(#7700)](https://github.com/microsoft/vcpkg/pull/7700) [czmq/pcl] Fix judgment feature condition. + +- darknet `0.2.5-5` -> `0.2.5-6` + - [(#7558)](https://github.com/microsoft/vcpkg/pull/7558) [vcpkg_check_features] Set output variable explicitly and allow reverse-logic check + +- mimalloc `2019-06-25` -> `2019-06-25-1` + - [(#7558)](https://github.com/microsoft/vcpkg/pull/7558) [vcpkg_check_features] Set output variable explicitly and allow reverse-logic check + +- mongo-c-driver `1.14.0-3` -> `1.14.0-3-1` + - [(#7558)](https://github.com/microsoft/vcpkg/pull/7558) [vcpkg_check_features] Set output variable explicitly and allow reverse-logic check + +- oniguruma `6.9.2-2` -> `6.9.3` + - [(#7558)](https://github.com/microsoft/vcpkg/pull/7558) [vcpkg_check_features] Set output variable explicitly and allow reverse-logic check + - [(#7721)](https://github.com/microsoft/vcpkg/pull/7721) [oniguruma] Update library 6.9.3 + +- paho-mqttpp3 `1.0.1` -> `1.0.1-2` + - [(#7558)](https://github.com/microsoft/vcpkg/pull/7558) [vcpkg_check_features] Set output variable explicitly and allow reverse-logic check + - [(#7769)](https://github.com/microsoft/vcpkg/pull/7769) [paho-mqttpp3] Fix missing reference to C library headers + +- xsimd `7.2.3-1` -> `7.2.3-2` + - [(#7558)](https://github.com/microsoft/vcpkg/pull/7558) [vcpkg_check_features] Set output variable explicitly and allow reverse-logic check + +- xtensor `0.20.7-1` -> `0.20.7-2` + - [(#7558)](https://github.com/microsoft/vcpkg/pull/7558) [vcpkg_check_features] Set output variable explicitly and allow reverse-logic check + +- zeromq `2019-07-09` -> `2019-07-09-1` + - [(#7558)](https://github.com/microsoft/vcpkg/pull/7558) [vcpkg_check_features] Set output variable explicitly and allow reverse-logic check + +- gtest `2019-01-04-2` -> `2019-08-14-1` + - [(#7692)](https://github.com/microsoft/vcpkg/pull/7692) [gtest] update to 90a443f9c2437ca8a682a1ac625eba64e1d74a8a + - [(#7316)](https://github.com/microsoft/vcpkg/pull/7316) [gtest] Re-fix port_main/port_maind libraries path and add gmock cmake files. + +- physx `commit-624f2cb6c0392013d54b235d9072a49d01c3cb6c` -> `4.1.1-1` + - [(#7679)](https://github.com/microsoft/vcpkg/pull/7679) [physx] Update to 4.1.1 (with Visual Studio 2019 support) + +- libidn2 `2.1.1-1` -> `2.2.0` + - [(#7685)](https://github.com/microsoft/vcpkg/pull/7685) [libidn2] Update to version 2.2.0. + +- poco `2.0.0-pre-3` -> `1.9.2-1` + - [(#7698)](https://github.com/microsoft/vcpkg/pull/7698) [poco] Upgrade version to 1.9.2 release. + - [(#7892)](https://github.com/microsoft/vcpkg/pull/7892) [poco] Fix conflicts with libharu. + +- osgearth `2.10.1` -> `2.10.2` + - [(#7695)](https://github.com/microsoft/vcpkg/pull/7695) [osgearth] Fix osgearth rocksdb plugin build falied + +- spdlog `1.3.1-1` -> `1.3.1-2` + - [(#7670)](https://github.com/microsoft/vcpkg/pull/7670) [spdlog] fix cmake targets path + +- libgit2 `0.28.2` -> `0.28.3` + - [(#7669)](https://github.com/microsoft/vcpkg/pull/7669) [libgit2] Upgrade to version 0.28.3 + +- brynet `1.0.2` -> `1.0.3` + - [(#7702)](https://github.com/microsoft/vcpkg/pull/7702) [brynet, catch2, chakracore] Update some ports version + +- nghttp2 `1.35.0` -> `1.39.2` + - [(#7699)](https://github.com/microsoft/vcpkg/pull/7699) [nghttp2] Upgrade to version 1.39.2 + +- leptonica `1.76.0-1` -> `1.78.0-1` + - [(#7358)](https://github.com/microsoft/vcpkg/pull/7358) [leptonica] Upgrade to 1.78.0 + - [(#7712)](https://github.com/microsoft/vcpkg/pull/7712) [leptonica] Add dependency port libwebp and fix find libwebp in debug/release + +- libtorrent `2019-04-19` -> `1.2.1-bcb26fd6` + - [(#7708)](https://github.com/microsoft/vcpkg/pull/7708) [libtorrent] Update to 1.2.1-bcb26fd6 + +- angelscript `2.33.0-1` -> `2.33.1-1` + - [(#7650)](https://github.com/microsoft/vcpkg/pull/7650) [angelscript] Added feature to optionally install all Angelscript standard addons + +- jsoncpp `1.8.4-1` -> `1.9.1` + - [(#7719)](https://github.com/microsoft/vcpkg/pull/7719) [jsoncpp] Update library to 1.9.1 + +- robin-hood-hashing `3.2.13` -> `3.4.0` + - [(#7722)](https://github.com/microsoft/vcpkg/pull/7722) [robin-hood-hashing] Update library to 3.4.0 + +- sqlite-orm `1.3-1` -> `1.4` + - [(#7723)](https://github.com/microsoft/vcpkg/pull/7723) [sqlite-orm] Update library to 1.4 + +- doctest `2.3.3` -> `2.3.4` + - [(#7716)](https://github.com/microsoft/vcpkg/pull/7716) [doctest] Update library to 2.3.4 + +- pegtl-2 `2.8.0` -> `2.8.1` + - [(#7715)](https://github.com/microsoft/vcpkg/pull/7715) [pegtl-2] Update library to 2.8.1 + +- cpp-httplib `0.2.0` -> `0.2.1` + - [(#7714)](https://github.com/microsoft/vcpkg/pull/7714) [cpp-httplib] Update library to 0.2.1 + +- geographiclib `1.47-patch1-6` -> `1.47-patch1-7` + - [(#7697)](https://github.com/microsoft/vcpkg/pull/7697) [geographiclib] Fix build error on Linux + +- libmariadb `3.0.10-3` -> `3.0.10-4` + - [(#7710)](https://github.com/microsoft/vcpkg/pull/7710) [libmariadb] Fix usage error LNK2001. + +- irrlicht `1.8.4-2` -> `1.8.4-1` + - [(#7726)](https://github.com/microsoft/vcpkg/pull/7726) Revert "[irrlicht] use unicode path on windows (#7354)" + +- cgltf `2019-04-30` -> `1.3` + - [(#7731)](https://github.com/microsoft/vcpkg/pull/7731) [cgltf] Update library to 1.2 + - [(#7774)](https://github.com/microsoft/vcpkg/pull/7774) [cgltf] Update library to 1.3 + +- duktape `2.3.0-2` -> `2.4.0-3` + - [(#7548)](https://github.com/microsoft/vcpkg/pull/7548) [ duktape] Update hash for pip. + - [(#7873)](https://github.com/microsoft/vcpkg/pull/7873) [duktape] Update library to 2.4.0 + +- double-conversion `3.1.4` -> `3.1.5` + - [(#7717)](https://github.com/microsoft/vcpkg/pull/7717) [double-conversion] Update library to 3.1.5 + +- libmorton `2018-19-07` -> `0.2` + - [(#7738)](https://github.com/microsoft/vcpkg/pull/7738) [libmorton] Update library to 0.2 + +- clp `1.17.2-2` -> `1.17.3` + - [(#7756)](https://github.com/microsoft/vcpkg/pull/7756) [clp] Update library to 1.17.3 + +- libfabric `1.7.1-1` -> `1.8.0` + - [(#7755)](https://github.com/microsoft/vcpkg/pull/7755) [libfabric] Update library to 1.8.0 + +- leaf `0.2.1-2` -> `0.2.2` + - [(#7782)](https://github.com/microsoft/vcpkg/pull/7782) [leaf] Update library to 0.2.2 + +- inih `44` -> `45` + - [(#7780)](https://github.com/microsoft/vcpkg/pull/7780) [inih] Update library to 45 + +- clara `2019-03-29` -> `1.1.5` + - [(#7775)](https://github.com/microsoft/vcpkg/pull/7775) [clara] Update library to 1.1.5 + +- distorm `2018-08-26-16e6f435-1` -> `3.4.1` + - [(#7777)](https://github.com/microsoft/vcpkg/pull/7777) [distorm] Update library to 3.4.1 + +- libcopp `1.1.0-2` -> `1.2.0` + - [(#7770)](https://github.com/microsoft/vcpkg/pull/7770) [libcopp] Update library to 1.2.0 + +- argparse `2019-06-10` -> `1.9` + - [(#7753)](https://github.com/microsoft/vcpkg/pull/7753) [argparse] Update library to 1.9 + +- argagg `2019-01-25` -> `0.4.6` + - [(#7752)](https://github.com/microsoft/vcpkg/pull/7752) [argagg] Update library to 0.4.6 + +- eastl `3.14.00` -> `3.14.01` + - [(#7786)](https://github.com/microsoft/vcpkg/pull/7786) [eastl] Update library to 3.14.01 + +- fribidi `58c6cb3` -> `2019-02-04-1` + - [(#7768)](https://github.com/microsoft/vcpkg/pull/7768) [fribidi] Fix static library suffix in windows-static + +- luajit `2.0.5-1` -> `2.0.5-2` + - [(#7764)](https://github.com/microsoft/vcpkg/pull/7764) [luajit] Separate debug/release build path and fix generate pdbs. + +- ixwebsocket `4.0.3` -> `5.0.4` + - [(#7789)](https://github.com/microsoft/vcpkg/pull/7789) [ixwebsocket] update to 5.0.4 + +- azure-c-shared-utility `2019-05-16.1` -> `2019-08-20.1` + - [(#7791)](https://github.com/microsoft/vcpkg/pull/7791) [azure-iot] vcpkg update for master/public-preview release + +- azure-iot-sdk-c `2019-07-01.1` -> `2019-08-20.1` + - [(#7791)](https://github.com/microsoft/vcpkg/pull/7791) [azure-iot] vcpkg update for master/public-preview release + +- azure-macro-utils-c `2019-05-16.1` -> `2019-08-20.1` + - [(#7791)](https://github.com/microsoft/vcpkg/pull/7791) [azure-iot] vcpkg update for master/public-preview release + +- azure-uamqp-c `2019-05-16.1` -> `2019-08-20.1` + - [(#7791)](https://github.com/microsoft/vcpkg/pull/7791) [azure-iot] vcpkg update for master/public-preview release + +- azure-uhttp-c `2019-05-16.1` -> `2019-08-20.1` + - [(#7791)](https://github.com/microsoft/vcpkg/pull/7791) [azure-iot] vcpkg update for master/public-preview release + +- azure-umqtt-c `2019-05-16.1` -> `2019-08-20.1` + - [(#7791)](https://github.com/microsoft/vcpkg/pull/7791) [azure-iot] vcpkg update for master/public-preview release + +- umock-c `2019-05-16.1` -> `2019-08-20.1` + - [(#7791)](https://github.com/microsoft/vcpkg/pull/7791) [azure-iot] vcpkg update for master/public-preview release + +- embree3 `3.5.2` -> `3.5.2-1` + - [(#7767)](https://github.com/microsoft/vcpkg/pull/7767) [embree3] Fix install path + +- re2 `2019-05-07-2` -> `2019-08-01` + - [(#7808)](https://github.com/microsoft/vcpkg/pull/7808) [re2] Update library to 2019-08-01 + +- reproc `6.0.0-2` -> `8.0.1` + - [(#7807)](https://github.com/microsoft/vcpkg/pull/7807) [reproc] Update library to 8.0.1 + +- safeint `3.20.0` -> `3.21` + - [(#7806)](https://github.com/microsoft/vcpkg/pull/7806) [safeint] Update library to 3.21 + +- snowhouse `3.1.0` -> `3.1.1` + - [(#7805)](https://github.com/microsoft/vcpkg/pull/7805) [snowhouse] Update library to 3.1.1 + +- spectra `0.8.0` -> `0.8.1` + - [(#7803)](https://github.com/microsoft/vcpkg/pull/7803) [spectra] Update library to 0.8.1 + +- spirv-cross `2019-05-09` -> `2019-07-26` + - [(#7802)](https://github.com/microsoft/vcpkg/pull/7802) [spirv-cross] Update library to 2019-07-26 + +- libmodbus `3.1.4-3` -> `3.1.6` + - [(#7834)](https://github.com/microsoft/vcpkg/pull/7834) [libmodbus] Update library to 3.1.6 + +- basisu `0.0.1-1` -> `1.11-1` + - [(#7836)](https://github.com/microsoft/vcpkg/pull/7836) [basisu] fix vcpkg version, merge upstream fixes + +- range-v3 `0.5.0` -> `0.9.0-20190822` + - [(#7845)](https://github.com/microsoft/vcpkg/pull/7845) Update range-v3 reference + +- cryptopp `8.1.0-2` -> `8.2.0` + - [(#7854)](https://github.com/microsoft/vcpkg/pull/7854) [cryptopp] Update library to 8.2.0 + +- lz4 `1.9.1-2` -> `1.9.2` + - [(#7860)](https://github.com/microsoft/vcpkg/pull/7860) [lz4] Update library to 1.9.2 + +- wxwidgets `3.1.2-1` -> `3.1.2-2` + - [(#7833)](https://github.com/microsoft/vcpkg/pull/7833) [wxwidgets] Windows ARM support + +- args `2019-05-01` -> `2019-07-11` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- asmjit `2019-03-29` -> `2019-07-11` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- aws-c-common `0.3.11-1` -> `0.4.1` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- aws-sdk-cpp `1.7.116` -> `1.7.142` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- bitsery `4.6.0` -> `5.0.0` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- botan `2.9.0-2` -> `2.11.0` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- breakpad `2019-05-08` -> `2019-07-11` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- chipmunk `7.0.2` -> `7.0.3` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- console-bridge `0.3.2-4` -> `0.4.3-1` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- coroutine `1.4.1-1` -> `1.4.3` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- crc32c `1.0.7-1` -> `1.1.0` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- exprtk `2019-03-29` -> `2019-07-11` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- fastcdr `1.0.9-1` -> `1.0.10` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + - [(#7862)](https://github.com/microsoft/vcpkg/pull/7862) [fastcdr] Update library 1.0.10 + +- fizz `2019.05.20.00-1` -> `2019.07.08.00` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- folly `2019.05.20.00-1` -> `2019.06.17.00` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- glad `0.1.30` -> `0.1.31` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- gmmlib `19.1.2` -> `19.2.3` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- graphite2 `1.3.12-1` -> `1.3.13` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- grpc `1.21.1-1` -> `1.22.0` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- io2d `0.1-2` -> `2019-07-11` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- libarchive `3.3.3-3` -> `3.4.0` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- libpqxx `6.4.4` -> `6.4.5` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- libssh2 `1.8.2` -> `1.9.0` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- libuv `1.29.1` -> `1.30.1` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- luabridge `2.3.1` -> `2.3.2` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- matio `1.5.15` -> `1.5.16` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- mosquitto `1.6.2-2` -> `1.6.3` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- ms-gsl `2019-04-19` -> `2019-07-11` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- nmslib `1.7.3.6-1` -> `1.8.1` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- nuklear `2019-03-29` -> `2019-07-11` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- openvr `1.4.18` -> `1.5.17` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- orc `1.5.5-1` -> `1.5.6` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + - [(#7908)](https://github.com/microsoft/vcpkg/pull/7908) Add homepage for orc + +- parson `2019-04-19` -> `2019-07-11` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- piex `2018-03-13-1` -> `2019-07-11` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- ptex `2.1.28-1` -> `2.3.2` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- pybind11 `2.2.4` -> `2.3.0` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- rs-core-lib `2019-05-07` -> `2019-07-11` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- shogun `6.1.3-3` -> `6.1.4` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- stb `2019-05-07` -> `2019-07-11` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- taocpp-json `2019-05-08` -> `2019-07-11` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- tbb `2019_U7-1` -> `2019_U8` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- telnetpp `1.2.4-1` -> `2.0` + - [(#7217)](https://github.com/microsoft/vcpkg/pull/7217) [many ports] Updates 2019.07.09 + +- blaze `3.5` -> `3.6` + - [(#7878)](https://github.com/microsoft/vcpkg/pull/7878) [blaze] Update to Blaze 3.6 + +- glfw3 `3.3-1` -> `3.3-2` + - [(#7885)](https://github.com/microsoft/vcpkg/pull/7885) [glfw3] Add more information about installing dependencies. + +- fmt `5.3.0-2` -> `6.0.0` + - [(#7910)](https://github.com/microsoft/vcpkg/pull/7910) [fmt] Update to 6.0.0 + - [(#7884)](https://github.com/microsoft/vcpkg/pull/7884) [fmt] missing VCPKG_BUILD_TYPE support added + +- magic-enum `2019-06-07` -> `0.6.0` + - [(#7916)](https://github.com/microsoft/vcpkg/pull/7916) [magic-enum] Update to v0.6.0 + +- liblsl `1.13.0-b6` -> `1.13.0-b11-1` + - [(#7906)](https://github.com/microsoft/vcpkg/pull/7906) [liblsl] Update library to 1.13.0-b11 + - [(#7945)](https://github.com/microsoft/vcpkg/pull/7945) [liblsl] Fix installation + +- yaml-cpp `0.6.2-2` -> `0.6.2-3` + - [(#7847)](https://github.com/microsoft/vcpkg/pull/7847) [yaml-cpp] Fix include path in yaml-cpp-config.cmake + +- fluidsynth `2.0.5` -> `2.0.5-1` + - [(#7837)](https://github.com/microsoft/vcpkg/pull/7837) [fluidsynth] add Windows ARM support + +- nmap `7.70` -> `7.70-1` + - [(#7811)](https://github.com/microsoft/vcpkg/pull/7811) [nmap] Fix build error. + +- moos-ui `10.0.1-1` -> `10.0.1-2` + - [(#7812)](https://github.com/microsoft/vcpkg/pull/7812) [moos-ui] Fix install path + +- openni2 `2.2.0.33-9` -> `2.2.0.33-10` + - [(#7809)](https://github.com/microsoft/vcpkg/pull/7809) [openni2] Add warning message when cannot find NETFXSDK. + +- abseil `2019-05-08` -> `2019-05-08-1` + - [(#7745)](https://github.com/microsoft/vcpkg/pull/7745) [abseil] fix cmake config issue + +- libwebp `1.0.2-6` -> `1.0.2-7` + - [(#7886)](https://github.com/microsoft/vcpkg/pull/7886) [libwebp] Fix two dependent windows library link conditions. + +- wpilib `2019.5.1` -> `2019.6.1` + - [(#7927)](https://github.com/microsoft/vcpkg/pull/7927) [wpilib] Update wpilib port to allow opencv4 + +- ogdf `2018-03-28-2` -> `2019-08-23` + - [(#7846)](https://github.com/microsoft/vcpkg/pull/7846) [ogdf] Update source link + +- libp7client `5.2` -> `5.2-1` + - [(#7977)](https://github.com/microsoft/vcpkg/pull/7977) [libp7client] Rename port folder to lowercase + +- libpng `1.6.37-2` -> `1.6.37-3` + - [(#7972)](https://github.com/microsoft/vcpkg/pull/7972) [libpng] Fix find_package() in CONFIG mode (#7968) + +- openblas `0.3.6-5` -> `0.3.6-6` + - [(#7888)](https://github.com/microsoft/vcpkg/pull/7888) [openblas] Enable x86 build and fix usage errors. + +- qt5-base `5.12.3-3` -> `5.12.3-4` + - [(#7973)](https://github.com/microsoft/vcpkg/pull/7973) [Qt5] Fix libpq linkage in wrapper + +- liblas `1.8.1` -> `1.8.1-2` + - [(#7975)](https://github.com/microsoft/vcpkg/pull/7975) [liblas] Fix Geotiff linkage + +- glib `2.52.3-14-2` -> `2.52.3-14-3` + - [(#7963)](https://github.com/microsoft/vcpkg/pull/7963) [glib] Fix install config.h + +
+ +-- vcpkg team vcpkg@microsoft.com THU, 04 Sept 14:00:00 -0800 + +vcpkg (2019.7.31) +--- +#### Total port count: 1105 +#### Total port count per triplet (tested): +|triplet|ports available| +|---|---| +|**x64-windows**|1039| +|x86-windows|1009| +|x64-windows-static|928| +|**x64-linux**|866| +|**x64-osx**|788| +|arm64-windows|678| +|x64-uwp|546| +|arm-uwp|522| + +#### The following commands and options have been updated: +- --scripts-root ***[NEW OPTION]*** + - Specify a directory to use in place of `/scripts`. Enables a shared script directory for those using a single vcpkg instance to manage distributed port directories + - [(#6552)](https://github.com/microsoft/vcpkg/pull/6552) Allow redirection of the scripts folder. +- depend-info + - Allow `vcpkg depend-info port[feature]` to display port-dependency information for a given port and the specified feature. + - [(#6797)](https://github.com/microsoft/vcpkg/pull/6797) Make `depend-info` subcommand able to handle features + +#### The following documentation has been updated: +- [Overlay triplets example: build dynamic libraries on Linux](docs/examples/overlay-triplets-linux-dynamic.md) ***[NEW]*** + - [(#7291)](https://github.com/microsoft/vcpkg/pull/7291) Example: Building dynamic libraries on Linux using overlay triplets +- [vcpkg_from_git](docs/maintainers/vcpkg_from_git.md) + - [(#7082)](https://github.com/microsoft/vcpkg/pull/7082) Fix vcpkg_from_git +- [Maintainer Guidelines and Policies](docs/maintainers/maintainer-guide.md) + - [(#7390)](https://github.com/microsoft/vcpkg/pull/7390) [docs] add notes about manual-link + +#### The following *remarkable* changes have been made to vcpkg's infrastructure: +- `VCPKG_ENV_PASSTHROUGH` triplet variable and `environment-overrides.cmake` + - Port authors can add an `environment-overrides.cmake` file to a port to override triplet settings globally or to define behavior of the vpckg binary on a per port basis + - [(#7290)](https://github.com/microsoft/vcpkg/pull/7290) [vcpkg] Environment Variable Passthrough + - [(#7292)](https://github.com/microsoft/vcpkg/pull/7292) [vcpkg] Portfile Settings +- Testing overhaul + - Tests have been migrated from the Visual Studio unit testing framework to the cross-platform [Catch2](https://github.com/catchorg/Catch2) + - [(#7315)](https://github.com/microsoft/vcpkg/pull/7315) Rewrite the tests! now they're cross-platform! + +#### The following *additional* changes have been made to vcpkg's infrastructure: +- [(#7080)](https://github.com/microsoft/vcpkg/pull/7080) [vcpkg] Use spaces instead of semicolons in the output +- [(#6791)](https://github.com/microsoft/vcpkg/pull/6791) Update python2, python3, perl, aria2, ninja, ruby, 7z +- [(#7082)](https://github.com/microsoft/vcpkg/pull/7082) Fix vcpkg_from_git +- [(#7117)](https://github.com/microsoft/vcpkg/pull/7117) Revert Visual Studio projects versions +- [(#7051)](https://github.com/microsoft/vcpkg/pull/7051) Fix Python3 tool on Windows +- [(#7135)](https://github.com/microsoft/vcpkg/pull/7135) revert ninja update +- [(#7136)](https://github.com/microsoft/vcpkg/pull/7136) Bump version to warn of outdated vcpkg sources +- [(#7094)](https://github.com/microsoft/vcpkg/pull/7094) [vcpkg] Fix powershell font corruption bug +- [(#7158)](https://github.com/microsoft/vcpkg/pull/7158) [vcpkg] Fix incorrect setting of FEATURE_OPTIONS +- [(#6792)](https://github.com/microsoft/vcpkg/pull/6792) Cleanup vcpkg_configure_cmake.cmake +- [(#7175)](https://github.com/microsoft/vcpkg/pull/7175) Added nasm mirror as nasm.us is down again +- [(#7216)](https://github.com/microsoft/vcpkg/pull/7216) [vcpkg] allow spaces in pathname on linux +- [(#7243)](https://github.com/microsoft/vcpkg/pull/7243) Testing for --overlay-ports and --overlay-triplets args +- [(#7294)](https://github.com/microsoft/vcpkg/pull/7294) Add June changelog +- [(#7229)](https://github.com/microsoft/vcpkg/pull/7229) Better error message when VCPKG_ROOT is independently defined +- [(#7336)](https://github.com/microsoft/vcpkg/pull/7336) Create issue templates +- [(#7322)](https://github.com/microsoft/vcpkg/pull/7322) Resolves "project is never up-to-date" problem (issue 6179) +- [(#7228)](https://github.com/microsoft/vcpkg/pull/7228) Parallel file operations +- [(#7403)](https://github.com/microsoft/vcpkg/pull/7403) Add third party notices -- copied from chakracore +- [(#7407)](https://github.com/microsoft/vcpkg/pull/7407) Modify CMakeLists to split up vcpkglib +- [(#7430)](https://github.com/microsoft/vcpkg/pull/7430) [vcpkg] Fix RealFilesystem::remove_all + +
+The following 37 ports have been added: + +|port|version| +|---|---| +|[septag-sx](https://github.com/microsoft/vcpkg/pull/6327)| 2019-05-07-1 +|[librdkafka](https://github.com/microsoft/vcpkg/pull/5921)| 1.1.0 +|[soxr](https://github.com/microsoft/vcpkg/pull/6478)| 0.1.3. +|[czmq](https://github.com/microsoft/vcpkg/pull/4979)[#7186](https://github.com/microsoft/vcpkg/pull/7186) | 2019-06-10-1 +|[cppmicroservices](https://github.com/microsoft/vcpkg/pull/6388)| 4.0.0-pre1 +|[zookeeper](https://github.com/microsoft/vcpkg/pull/7000)| 3.5.5 +|[xmlsec](https://github.com/microsoft/vcpkg/pull/7196)| 1.2.28 +|[librsvg](https://github.com/microsoft/vcpkg/pull/6807)| 2.40.20 +|[7zip](https://github.com/microsoft/vcpkg/pull/6920)| 19.00 +|[genann](https://github.com/microsoft/vcpkg/pull/7195)| 2019-07-10 +|[offscale-libetcd-cpp](https://github.com/microsoft/vcpkg/pull/6999)| 2019-07-10 +|[rabit](https://github.com/microsoft/vcpkg/pull/7234)| 0.1 +|[zyre](https://github.com/microsoft/vcpkg/pull/7189)| 2019-07-07 +|[cpp-peglib](https://github.com/microsoft/vcpkg/pull/7254)| 0.1.0 +|[paho-mqttpp3](https://github.com/microsoft/vcpkg/pull/7033)| 1.0.1 +|[openxr-loader](https://github.com/microsoft/vcpkg/pull/6339)[#7376](https://github.com/microsoft/vcpkg/pull/7376) [#7488](https://github.com/microsoft/vcpkg/pull/7488) | 1.0.0-1 +|[wintoast](https://github.com/microsoft/vcpkg/pull/7006)| 1.2.0 +|[scnlib](https://github.com/microsoft/vcpkg/pull/7014)| 0.1.2 +|[mongoose](https://github.com/microsoft/vcpkg/pull/7089)| 6.15-1 +|[nameof](https://github.com/microsoft/vcpkg/pull/7250)| 2019-07-13 +|[leaf](https://github.com/microsoft/vcpkg/pull/7319)[#7468](https://github.com/microsoft/vcpkg/pull/7468) | 0.2.1-2 +|[otl](https://github.com/microsoft/vcpkg/pull/7272)| 4.0.442 +|[dbg-macro](https://github.com/microsoft/vcpkg/pull/7237)| 2019-07-11 +|[p-ranav-csv](https://github.com/microsoft/vcpkg/pull/7236)| 2019-07-11 +|[lastools](https://github.com/microsoft/vcpkg/pull/7220)| 2019-07-10 +|[basisu](https://github.com/microsoft/vcpkg/pull/6995)[#7468](https://github.com/microsoft/vcpkg/pull/7468) | 0.0.1-1 +|[cmcstl2](https://github.com/microsoft/vcpkg/pull/7348)| 2019-07-20 +|[libconfuse](https://github.com/microsoft/vcpkg/pull/7252)| 2019-07-14 +|[boolinq](https://github.com/microsoft/vcpkg/pull/7362)| 2019-07-22 +|[libzippp](https://github.com/microsoft/vcpkg/pull/6801)| 2019-07-22 +|[mimalloc](https://github.com/microsoft/vcpkg/pull/7011)| 2019-06-25 +|[liblas](https://github.com/microsoft/vcpkg/pull/6746)| 1.8.1 +|[xtensor-io](https://github.com/microsoft/vcpkg/pull/7398)| 0.7.0 +|[easycl](https://github.com/microsoft/vcpkg/pull/7387)| 0.3 +|[nngpp](https://github.com/microsoft/vcpkg/pull/7417)| 2019-07-25 +|[mpi](https://github.com/microsoft/vcpkg/pull/7142)| 1 +|[openmpi](https://github.com/microsoft/vcpkg/pull/7142)| 4.0.1 +
+ +
+The following 160 ports have been updated: + +- openssl-unix `1.0.2q` -> `1.0.2s-1` + - [(#6854)](https://github.com/microsoft/vcpkg/pull/6854) Openssl version bump 1.0.2s + - [(#6512)](https://github.com/microsoft/vcpkg/pull/6512) [openssl-unix] Shared library support + +- openssl-windows `1.0.2q-2` -> `1.0.2s-1` + - [(#6854)](https://github.com/microsoft/vcpkg/pull/6854) Openssl version bump 1.0.2s + +- mongo-cxx-driver `3.4.0-2` -> `3.4.0-3` + - [(#7050)](https://github.com/microsoft/vcpkg/pull/7050) [mongo-cxx-driver] Do not delete the third_party include folder when building with mnmlstc + +- fdlibm `5.3-3` -> `5.3-4` + - [(#7082)](https://github.com/microsoft/vcpkg/pull/7082) Fix vcpkg_from_git + +- azure-iot-sdk-c `2019-05-16.1` -> `2019-07-01.1` + - [(#7123)](https://github.com/microsoft/vcpkg/pull/7123) [azure] Update azure-iot-sdk-c for public-preview release of 2019-07-01 + +- open62541 `0.3.0-1` -> `0.3.0-2` + - [(#7051)](https://github.com/microsoft/vcpkg/pull/7051) Fix Python3 tool on Windows + +- lua `5.3.5-1` -> `5.3.5-2` + - [(#7101)](https://github.com/microsoft/vcpkg/pull/7101) [lua] Add [cpp] feature to additionally build lua-c++ + +- flann `1.9.1-1` -> `2019-04-07-1` + - [(#7125)](https://github.com/microsoft/vcpkg/pull/7125) [flann]Change the version tag to the corresponding time of commit id. + +- tbb `2019_U7` -> `2019_U7-1` + - [(#6510)](https://github.com/microsoft/vcpkg/pull/6510) [tbb] Add shared library support for Linux and OSX + +- dcmtk `3.6.4` -> `3.6.4-1` + - [(#7059)](https://github.com/microsoft/vcpkg/pull/7059) [dcmtk] support wchar_t* filename + +- libmupdf `1.15.0` -> `1.15.0-1` + - [(#7107)](https://github.com/microsoft/vcpkg/pull/7107) [libmupdf] Enable the old patch for fixing C2169 + +- mongo-c-driver `1.14.0-2` -> `1.14.0-3` + - [(#7048)](https://github.com/microsoft/vcpkg/pull/7048) [mongo-c-driver] Add usage + - [(#7338)](https://github.com/microsoft/vcpkg/pull/7338) [mongo-c-driver] Disable snappy auto-detection + +- openimageio `1.8.16` -> `2.0.8` + - [(#7173)](https://github.com/microsoft/vcpkg/pull/7173) [openimageio] Upgrade to version 2.0.8 + +- duktape `2.3.0` -> `2.3.0-2` + - [(#7170)](https://github.com/microsoft/vcpkg/pull/7170) [duktape] Fix package not found by find_package. + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- poco `2.0.0-pre-2` -> `2.0.0-pre-3` + - [(#7169)](https://github.com/microsoft/vcpkg/pull/7169) [Poco] Add missing ipjlpapi.lib to foundation library + +- gsoap `2.8.84-1` -> `2.8.87-1` + - [(#7145)](https://github.com/microsoft/vcpkg/pull/7145) [gsoap] Update to 2.8.87 + +- qt5-mqtt `5.12.3` -> `5.12.3-1` + - [(#7130)](https://github.com/microsoft/vcpkg/pull/7130) [qt5-mqtt] crossplatform add to path + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- botan `2.9.0-1` -> `2.9.0-2` + - [(#7140)](https://github.com/microsoft/vcpkg/pull/7140) [botan] Fix build error C2039 with Visual Studio 2019 and C++17 + - [(#7303)](https://github.com/microsoft/vcpkg/pull/7303) [botan] Fix parallel build + +- kinectsdk2 `2.0` -> `2.0-1` + - [(#7143)](https://github.com/microsoft/vcpkg/pull/7143) kinectsdk2: fix missing header files + +- civetweb `1.11-1` -> `2019-07-05` + - [(#7166)](https://github.com/microsoft/vcpkg/pull/7166) [civetweb] Upgrade and enable feature websocket + +- curl `7.65.0-2` -> `7.65.2-1` + - [(#7156)](https://github.com/microsoft/vcpkg/pull/7156) [curl] Add features. + - [(#7093)](https://github.com/microsoft/vcpkg/pull/7093) [curl] Update to 7.65.2 + +- aws-checksums `0.1.2` -> `0.1.3` + - [(#7154)](https://github.com/microsoft/vcpkg/pull/7154) [aws-checksums]Upgrade version to 0.1.3 + +- rapidjson `1.1.0-3` -> `d87b698-1` + - [(#7152)](https://github.com/microsoft/vcpkg/pull/7152) [rapidjson] Update to the latest commit and also fix #3401. + - [(#7273)](https://github.com/microsoft/vcpkg/pull/7273) [rapidjson] Fix path RapidJSON_INCLUDE_DIRS + +- freetype `2.10.0` -> `2.10.1-1` + - [(#7141)](https://github.com/microsoft/vcpkg/pull/7141) [freetype]Re-fixed the issue of exporting symbols when building dynamic library. + - [(#7341)](https://github.com/microsoft/vcpkg/pull/7341) [freetype] Update to 2.10.1 + +- llvm `7.0.0-3` -> `8.0.0` + - [(#7209)](https://github.com/microsoft/vcpkg/pull/7209) [llvm] Update to 8.0.0 + +- reproc `6.0.0-1` -> `6.0.0-2` + - [(#7208)](https://github.com/microsoft/vcpkg/pull/7208) [reproc] Fix reproc++ installation path + +- wil `2019-06-10` -> `2019-07-16` + - [(#7215)](https://github.com/microsoft/vcpkg/pull/7215) [wil] Update + - [(#7285)](https://github.com/microsoft/vcpkg/pull/7285) Update wil port to match the commit used for NuGet package 1.0.190716.2 + +- tesseract `4.0.0-3` -> `4.1.0-1` + - [(#7144)](https://github.com/microsoft/vcpkg/pull/7144) [tesseract] Fix Port. Making it crossplatform + - [(#7227)](https://github.com/microsoft/vcpkg/pull/7227) [tesseract] port update to 4.1.0 release + - [(#7360)](https://github.com/microsoft/vcpkg/pull/7360) [tesseract[training_tools]] Fix build error + +- zeromq `2019-05-07` -> `2019-07-09` + - [(#7203)](https://github.com/microsoft/vcpkg/pull/7203) [zeromq] Update to 4.3.2 + +- spirv-tools `2019.3-dev` -> `2019.3-dev-1` + - [(#7204)](https://github.com/microsoft/vcpkg/pull/7204) [spirv-tools] Fix removed patch + +- libraqm `0.6.0` -> `0.7.0` + - [(#7149)](https://github.com/microsoft/vcpkg/pull/7149) [libraqm] Update libraqm to 0.7.0 + - [(#7263)](https://github.com/microsoft/vcpkg/pull/7263) [libraqm] Fix copying raqm-version.h to include directory + +- pthreads `3.0.0-1` -> `3.0.0-2` + - [(#7178)](https://github.com/microsoft/vcpkg/pull/7178) [pthreads4W] vcpkg wrapper fixes + +- libkml `1.3.0-2` -> `1.3.0-3` + - [(#7194)](https://github.com/microsoft/vcpkg/pull/7194) [libkml] Fix install path + - [(#7282)](https://github.com/microsoft/vcpkg/pull/7282) [minizip] Make BZip2 an optional feature + +- gherkin-c `4.1.2` -> `2019-10-07-1` + - [(#7231)](https://github.com/microsoft/vcpkg/pull/7231) [gherkin-b] update to latest + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- google-cloud-cpp `0.10.0` -> `0.11.0` + - [(#7134)](https://github.com/microsoft/vcpkg/pull/7134) Upgrade google-cloud-cpp to v0.11.0. + +- sqlite3 `3.28.0-1` -> `3.29.0-1` + - [(#7202)](https://github.com/microsoft/vcpkg/pull/7202) [sqlite3-tool]Fix build error on arm/uwp platform. + - [(#7342)](https://github.com/microsoft/vcpkg/pull/7342) [sqlite3] Update to 3.29.0 + +- nonius `2019-04-20` -> `2019-04-20-1` + - [(#7258)](https://github.com/microsoft/vcpkg/pull/7258) [nonius] properly install noniusConfig.cmake + +- leveldb `1.22` -> `1.22-1` + - [(#7245)](https://github.com/microsoft/vcpkg/pull/7245) [leveldb] Fix cmake config + +- bond `8.1.0` -> `8.1.0-2` + - [(#7273)](https://github.com/microsoft/vcpkg/pull/7273) [rapidjson] Fix path RapidJSON_INCLUDE_DIRS + - [(#7306)](https://github.com/microsoft/vcpkg/pull/7306) [bond] make haskell an external dependency + - [(#7142)](https://github.com/microsoft/vcpkg/pull/7142) [OpenMPI] add a new port + +- cpprestsdk `2.10.13-1` -> `2.10.14` + - [(#7286)](https://github.com/microsoft/vcpkg/pull/7286) Update cpprestsdk to v2.10.14. + +- qt5-base `5.12.3-1` -> `5.12.3-3` + - [(#6983)](https://github.com/microsoft/vcpkg/pull/6983) [qt5-base]Add a print message to inform the user to install the dependency package. + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-3d `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-activeqt `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-charts `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-connectivity `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-datavis3d `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-declarative `5.12.3-1` -> `5.12.3-2` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-gamepad `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-graphicaleffects `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-imageformats `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-location `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-macextras `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-modularscripts `2019-04-30` -> `2019-04-30-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-multimedia `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-networkauth `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-purchasing `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-quickcontrols `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-quickcontrols2 `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-remoteobjects `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-script `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-scxml `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-sensors `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-serialport `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-speech `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-svg `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-tools `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-virtualkeyboard `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-webchannel `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-websockets `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-webview `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- qt5-winextras `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + - [(#7298)](https://github.com/microsoft/vcpkg/pull/7298) [qt5-winextras, ecsutil, soundtouch] Fix build-depends + +- qt5-xmlpatterns `5.12.3` -> `5.12.3-1` + - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux + +- rocksdb `6.0.2` -> `6.1.2` + - [(#7304)](https://github.com/microsoft/vcpkg/pull/7304) [rocksdb] Update rocksdb to 6.1.2, adds optional zstd feature + +- metis `5.1.0-3` -> `5.1.0-5` + - [(#7299)](https://github.com/microsoft/vcpkg/pull/7299) [metis] Fix linux build error. + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- ecsutil `1.0.6.1` -> `1.0.7.2` + - [(#7298)](https://github.com/microsoft/vcpkg/pull/7298) [qt5-winextras, ecsutil, soundtouch] Fix build-depends + - [(#7427)](https://github.com/microsoft/vcpkg/pull/7427) [ECSUtil] update library to v1.0.7.2 + +- soundtouch `2.0.0-2` -> `2.0.0-3` + - [(#7298)](https://github.com/microsoft/vcpkg/pull/7298) [qt5-winextras, ecsutil, soundtouch] Fix build-depends + +- libsodium `1.0.18` -> `1.0.18-1` + - [(#7297)](https://github.com/microsoft/vcpkg/pull/7297) [libsodium] Fix Linux build error. + +- irrlicht `1.8.4` -> `1.8.4-2` + - [(#7296)](https://github.com/microsoft/vcpkg/pull/7296) [irrlicht] add vcpkg-cmake-wrapper + - [(#7354)](https://github.com/microsoft/vcpkg/pull/7354) [irrlicht] use unicode path on windows + +- libyaml `0.2.2` -> `0.2.2-1` + - [(#7277)](https://github.com/microsoft/vcpkg/pull/7277) [libyaml] Fix build error + +- eastl `3.13.05-1` -> `3.14.00` + - [(#7276)](https://github.com/microsoft/vcpkg/pull/7276) [eastl] Upgrade to 3.14 + +- boost-asio `1.70.0-1` -> `1.70.0-2` + - [(#7267)](https://github.com/microsoft/vcpkg/pull/7267) Fixed boost-asio on Windows + +- minizip `1.2.11-4` -> `1.2.11-5` + - [(#7282)](https://github.com/microsoft/vcpkg/pull/7282) [minizip] Make BZip2 an optional feature + +- blend2d `beta_2019-04-30` -> `beta_2019-07-16` + - [(#7239)](https://github.com/microsoft/vcpkg/pull/7239) [blend2d] Port update + +- so5extra `1.2.3-1` -> `1.3.1` + - [(#7238)](https://github.com/microsoft/vcpkg/pull/7238) [sobjectizer, so5extra] updates + +- sobjectizer `5.5.24.4-1` -> `5.6.0.2` + - [(#7238)](https://github.com/microsoft/vcpkg/pull/7238) [sobjectizer, so5extra] updates + +- directxtk `apr2019` -> `apr2019-1` + - [(#7233)](https://github.com/microsoft/vcpkg/pull/7233) [DirectXTK] Fix UWP build error + +- restbed `4.16-07-28-2018` -> `4.16-07-28-2018-1` + - [(#7232)](https://github.com/microsoft/vcpkg/pull/7232) [restbed] Add openssl feature + +- clapack `3.2.1-9` -> `3.2.1-10` + - [(#6786)](https://github.com/microsoft/vcpkg/pull/6786) [openblas/clapack] FindLapack/FindBLAS was not working. + +- geogram `1.6.9-6` -> `1.6.9-7` + - [(#6786)](https://github.com/microsoft/vcpkg/pull/6786) [openblas/clapack] FindLapack/FindBLAS was not working. + +- mlpack `3.1.1` -> `3.1.1-1` + - [(#6786)](https://github.com/microsoft/vcpkg/pull/6786) [openblas/clapack] FindLapack/FindBLAS was not working. + +- openblas `0.3.6-4` -> `0.3.6-5` + - [(#6786)](https://github.com/microsoft/vcpkg/pull/6786) [openblas/clapack] FindLapack/FindBLAS was not working. + +- pprint `2019-06-01` -> `2019-07-19` + - [(#7317)](https://github.com/microsoft/vcpkg/pull/7317) [pprint] Fix #7301 + +- boost-type-erasure `1.70.0` -> `1.70.0-1` + - [(#7325)](https://github.com/microsoft/vcpkg/pull/7325) [boost-type-erasure] fix depends on arm + +- armadillo `2019-04-16-3` -> `2019-04-16-4` + - [(#7041)](https://github.com/microsoft/vcpkg/pull/7041) [armadillo] Fix installation path + +- cutelyst2 `2.7.0` -> `2.8.0` + - [(#7327)](https://github.com/microsoft/vcpkg/pull/7327) [cutelyst2]Upgrade version to 2.8.0 + +- sdl2-image `2.0.4-3` -> `2.0.5` + - [(#7355)](https://github.com/microsoft/vcpkg/pull/7355) [sdl2-image] Updated to 2.0.5 + +- qhull `7.2.1-3` -> `7.3.2` + - [(#7340)](https://github.com/microsoft/vcpkg/pull/7340) [qhull] Update to 7.3.2 and fix postbuild validation + +- libexif `0.6.21-1` -> `0.6.21-2` + - [(#7344)](https://github.com/microsoft/vcpkg/pull/7344) [Libexif] update download location + +- arrow `0.13.0-4` -> `0.14.1` + - [(#7211)](https://github.com/microsoft/vcpkg/pull/7211) [Arrow] Update to Arrow v0.14.1 + +- date `ed0368f` -> `2019-05-18-1` + - [(#7399)](https://github.com/microsoft/vcpkg/pull/7399) [date] Fix issue with feature remote-api + +- libmariadb `3.0.10-1` -> `3.0.10-3` + - [(#7396)](https://github.com/microsoft/vcpkg/pull/7396) [libmariadb] Fix build library type and install path + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- inja `2.1.0` -> `2.1.0-1` + - [(#7402)](https://github.com/microsoft/vcpkg/pull/7402) [inja] Use inja CMakeLists.txt + +- pcl `1.9.1-4` -> `1.9.1-5` + - [(#7388)](https://github.com/microsoft/vcpkg/pull/7388) [pcl] Fix cuda building compatability issues with cuda 10.1 + +- thrift `2019-05-07-2` -> `2019-05-07-3` + - [(#7302)](https://github.com/microsoft/vcpkg/pull/7302) [Thrift] Make Thrift static again + +- forest `12.0.0` -> `12.0.3` + - [(#7410)](https://github.com/microsoft/vcpkg/pull/7410) [forest] Update to Version 12.0.3 + +- nlohmann-json `3.6.1` -> `3.7.0` + - [(#7459)](https://github.com/microsoft/vcpkg/pull/7459) [nlohmann-json] Update to 3.7.0 + +- ecm `5.58.0` -> `5.60.0-1` + - [(#7457)](https://github.com/microsoft/vcpkg/pull/7457) [ecm] Update library to v5.60.0 + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- gl2ps `1.4.0-1` -> `1.4.0-3` + - [(#7453)](https://github.com/microsoft/vcpkg/pull/7453) [gl2ps]Update to use vcpkg new functions(vcpkg_from_gitlab). + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- darknet `0.2.5-4` -> `0.2.5-5` + - [(#7450)](https://github.com/microsoft/vcpkg/pull/7450) [darknet] add training feature + +- g3log `2019-05-14-1` -> `2019-07-29` + - [(#7448)](https://github.com/microsoft/vcpkg/pull/7448) [g3log] Fix https://github.com/KjellKod/g3log/issues/319 + +- azure-storage-cpp `6.1.0` -> `6.1.0-2` + - [(#7404)](https://github.com/microsoft/vcpkg/pull/7404) [azure-storage-cpp] Removed gcov dependency in debug Linux build (#7311) + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- ace `6.5.5-1` -> `6.5.6` + - [(#7466)](https://github.com/microsoft/vcpkg/pull/7466) [ace] ace 6.5.6 + +- bullet3 `2.88` -> `2.88-1` + - [(#7474)](https://github.com/microsoft/vcpkg/pull/7474) [Bullet3] feature for multithreading + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- alembic `1.7.11-2` -> `1.7.11-3` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- ampl-mp `2019-03-21` -> `2019-03-21-1` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- anax `2.1.0-5` -> `2.1.0-6` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- apr `1.6.5-1` -> `1.6.5-2` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- blosc `1.16.3-1` -> `1.16.3-2` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- capnproto `0.7.0-2` -> `0.7.0-3` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- cgicc `3.2.19-1` -> `3.2.19-2` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- charls `2.0.0-1` -> `2.0.0-2` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- collada-dom `2.5.0-1` -> `2.5.0-2` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- ctemplate `2017-06-23-44b7c5-3` -> `2017-06-23-44b7c5-4` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- dlfcn-win32 `1.1.1-1` -> `1.1.1-2` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- easyloggingpp `9.96.7` -> `9.96.7-1` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- fastfeat `391d5e9` -> `391d5e9-1` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- fastlz `1.0-2` -> `1.0-3` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- freeglut `3.0.0-6` -> `3.0.0-7` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- glbinding `3.1.0-1` -> `3.1.0-2` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- glew `2.1.0-4` -> `2.1.0-5` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- glfw3 `3.3` -> `3.3-1` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- graphicsmagick `1.3.32` -> `1.3.32-1` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- hypre `2.11.2-1` -> `2.11.2-2` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + - [(#7142)](https://github.com/microsoft/vcpkg/pull/7142) [OpenMPI] add a new port + +- jack2 `1.9.12-1` -> `1.9.12-2` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- jxrlib `1.1-7` -> `1.1-8` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- kangaru `4.1.3-1` -> `4.1.3-2` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- libconfig `1.7.2` -> `1.7.2-1` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- libfreenect2 `0.2.0-2` -> `0.2.0-3` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- libmad `0.15.1-2` -> `0.15.1-3` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- libmspack `0.10.1` -> `0.10.1-1` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- libnice `0.1.15` -> `0.1.15-1` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- libodb-boost `2.4.0-2` -> `2.4.0-3` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- libodb-mysql `2.4.0-2` -> `2.4.0-3` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- libodb-pgsql `2.4.0-2` -> `2.4.0-3` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- libodb-sqlite `2.4.0-3` -> `2.4.0-4` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- libodb `2.4.0-4` -> `2.4.0-5` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- librabbitmq `0.9.0` -> `0.9.0-1` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- libsamplerate `0.1.9.0` -> `0.1.9.0-1` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- libwebsockets `3.1.0-2` -> `3.1.0-3` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- lmdb `0.9.23-1` -> `0.9.23-2` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- mozjpeg `3.2-2` -> `3.2-3` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- nanodbc `2.12.4-3` -> `2.12.4-4` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- nmslib `1.7.3.6` -> `1.7.3.6-1` + - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports + +- amqpcpp `4.1.4` -> `4.1.5` + - [(#7475)](https://github.com/microsoft/vcpkg/pull/7475) [amqpcpp] Update library to v4.1.5 + +- cxxopts `2.1.2-1` -> `2.2.0` + - [(#7473)](https://github.com/microsoft/vcpkg/pull/7473) [cxxopts] Bumped to v2.2.0 + +- boost-mpi `1.70.0-1` -> `1.70.0-2` + - [(#7142)](https://github.com/microsoft/vcpkg/pull/7142) [OpenMPI] add a new port + +- hdf5 `1.10.5-7` -> `1.10.5-8` + - [(#7142)](https://github.com/microsoft/vcpkg/pull/7142) [OpenMPI] add a new port + +- kealib `1.4.11` -> `1.4.11-1` + - [(#7142)](https://github.com/microsoft/vcpkg/pull/7142) [OpenMPI] add a new port + +- parmetis `4.0.3-2` -> `4.0.3-3` + - [(#7142)](https://github.com/microsoft/vcpkg/pull/7142) [OpenMPI] add a new port + +- vtk `8.2.0-4` -> `8.2.0-5` + - [(#7142)](https://github.com/microsoft/vcpkg/pull/7142) [OpenMPI] add a new port + +
+ +-- vcpkg team vcpkg@microsoft.com THU, 01 Aug 07:00:00 -0800 + +vcpkg (2019.6.30) +--- +#### Total port count: 1068 +#### Total port count per triplet (tested): +|triplet|ports available| +|---|---| +|**x64-windows**|1006| +|x86-windows|977| +|x64-windows-static|895| +|**x64-osx**|755| +|**x64-linux**|823| +|arm64-windows|654| +|x64-uwp|532| +|arm-uwp|504| + +#### The following commands and options have been updated: +- [--overlay-ports](docs/specifications/ports-overlay.md) ***[NEW OPTION]*** + - Specify directories to be used when searching for ports + - [(#6981)](https://github.com/Microsoft/vcpkg/pull/6981) Ports Overlay partial implementation + - [(#7002)](https://github.com/Microsoft/vcpkg/pull/7002) [--overlay-ports] Show location of overriden ports during install plan +- --overlay-triplets ***[NEW OPTION]*** + - Specify directories containing triplets files + - [(#7053)](https://github.com/Microsoft/vcpkg/pull/7053) Triplets Overlay Implementation +- integrate + - [(#7095)](https://github.com/Microsoft/vcpkg/pull/7095) [vcpkg-integrate] Improve spelling, help, and autocomplete. + +#### The following documentation has been updated: +- [Maintainer Guidelines and Policies](docs/maintainers/maintainer-guide.md) ***[NEW]*** + - [(#6871)](https://github.com/Microsoft/vcpkg/pull/6871) [docs] Add maintainer guidelines +- [Ports Overlay](docs/specifications/ports-overlay.md) ***[NEW]*** + - [(#6981)](https://github.com/Microsoft/vcpkg/pull/6981) Ports Overlay partial implementation +- [vcpkg_check_features](docs/maintainers/vcpkg_check_features.md) ***[NEW]*** + - [(#6958)](https://github.com/Microsoft/vcpkg/pull/6958) [vcpkg] Add vcpkg_check_features + - [(#7091)](https://github.com/Microsoft/vcpkg/pull/7091) [vcpkg] Update vcpkg_check_features document +- [vcpkg_execute_build_process](docs/maintainers/vcpkg_execute_build_process.md) ***[NEW]*** + - [(#7039)](https://github.com/Microsoft/vcpkg/pull/7039) [docs]Update cmake docs +- [CONTROL files](docs/maintainers/control-files.md#Homepage) + - [(#6844)](https://github.com/Microsoft/vcpkg/pull/6844) [vcpkg] Add optional 'Homepage' field to CONTROL + - [(#6871)](https://github.com/Microsoft/vcpkg/pull/6871) [docs] Add maintainer guidelines +- [index](docs/README.md) + - [(#6871)](https://github.com/Microsoft/vcpkg/pull/6871) [docs] Add maintainer guidelines +- [Portfile helper functions](docs/maintainers/portfile-functions.md) + - [(#7039)](https://github.com/Microsoft/vcpkg/pull/7039) [docs]Update cmake docs +- [vcpkg_configure_cmake](docs/maintainers/vcpkg_configure_cmake.md) + - [(#7074)](https://github.com/Microsoft/vcpkg/pull/7074) [vcpkg_configure_cmake] Add NO_CHARSET_FLAG option + +#### The following *remarkable* changes have been made to vcpkg's infrastructure: +- [vcpkg_check_features.cmake](docs/maintainers/vcpkg_check_features.md) + - New portfile.cmake function for vcpkg contributors; Check if one or more features are a part of the package installation + - [(#6958)](https://github.com/Microsoft/vcpkg/pull/6958) [vcpkg] Add vcpkg_check_features + - [(#7091)](https://github.com/Microsoft/vcpkg/pull/7091) [vcpkg] Update vcpkg_check_features document +- [CONTROL file Homepage field](docs/maintainers/control-files.md#Homepage) + - CONTROL files may now contain a 'Homepage' field which links to the port's official website + - [(#6844)](https://github.com/Microsoft/vcpkg/pull/6844) [vcpkg] Add optional 'Homepage' field to CONTROL + +#### The following *additional* changes have been made to vcpkg's infrastructure: +- [(#4942)](https://github.com/Microsoft/vcpkg/pull/4942) Update applocal.ps1 +- [(#5630)](https://github.com/Microsoft/vcpkg/pull/5630) [scripts] Fix vcpkg_fixup_cmake on non Windows platforms +- [(#6383)](https://github.com/Microsoft/vcpkg/pull/6383) [vcpkg] update python3 to 3.7.3 on windows +- [(#6590)](https://github.com/Microsoft/vcpkg/pull/6590) ffmpeg: enable arm/arm64 windows support +- [(#6653)](https://github.com/Microsoft/vcpkg/pull/6653) [vcpkg] Fix install from head when no-downloads +- [(#6667)](https://github.com/Microsoft/vcpkg/pull/6667) make meson not download things +- [(#6695)](https://github.com/Microsoft/vcpkg/pull/6695) [icu] Enable parallel builds +- [(#6704)](https://github.com/Microsoft/vcpkg/pull/6704) [DOXYGEN]Upgrade doxygen to 1.8.15. +- [(#6788)](https://github.com/Microsoft/vcpkg/pull/6788) [vcpkg] Bootstrap should use Get-CimInstance instead of Get-WmiObject. +- [(#6826)](https://github.com/Microsoft/vcpkg/pull/6826) [vcpkg] Apply clang format +- [(#6846)](https://github.com/Microsoft/vcpkg/pull/6846) Introduce an easier way to identify target systems... +- [(#6867)](https://github.com/Microsoft/vcpkg/pull/6867) Protect #pragma comment(lib, "foo") with _WIN32 checks +- [(#6872)](https://github.com/Microsoft/vcpkg/pull/6872) set CMAKE_SYSTEM_PROCESSOR in Linux +- [(#6880)](https://github.com/Microsoft/vcpkg/pull/6880) retry on flaky linker +- [(#6919)](https://github.com/Microsoft/vcpkg/pull/6919) [vcpkg] Improve vcpkg::Files::Filesystem error handling +- [(#6943)](https://github.com/Microsoft/vcpkg/pull/6943) address qhull flaky build with msvc linker +- [(#6952)](https://github.com/Microsoft/vcpkg/pull/6952) bootstrap.sh: Retry up to 3 times for transient download errors +- [(#6960)](https://github.com/Microsoft/vcpkg/pull/6960) Use correct path separators for each platform +- [(#6968)](https://github.com/Microsoft/vcpkg/pull/6968) VS 2019 16.3 deprecates . +- [(#6987)](https://github.com/Microsoft/vcpkg/pull/6987) Bump version to 2019.06.21 +- [(#7038)](https://github.com/Microsoft/vcpkg/pull/7038) #5248 make vcpkg buildable as 'system' user +- [(#7039)](https://github.com/Microsoft/vcpkg/pull/7039) [docs]Update cmake docs +- [(#7074)](https://github.com/Microsoft/vcpkg/pull/7074) [vcpkg_configure_cmake] Add NO_CHARSET_FLAG option +- [(#7086)](https://github.com/Microsoft/vcpkg/pull/7086) [vcpkg] fail archived port install when decompression fails + +
+The following 44 ports have been added: + +| port | version | +|---|---| +|[any-lite](https://github.com/Microsoft/vcpkg/pull/6629) | 0.2.0 +|[argparse](https://github.com/Microsoft/vcpkg/pull/6866) | 2019-06-10 +|[bdwgc](https://github.com/Microsoft/vcpkg/pull/6405) | 8.0.4-1 +|[byte-lite](https://github.com/Microsoft/vcpkg/pull/6630) | 0.2.0 +|[casclib](https://github.com/Microsoft/vcpkg/pull/6744) | 1.50 +|[cjson](https://github.com/Microsoft/vcpkg/pull/6081) | 1.7.10-1 +|[cpp-httplib](https://github.com/Microsoft/vcpkg/pull/7037) | 0.2.0 +|[cppcodec](https://github.com/Microsoft/vcpkg/pull/6651) | 0.2 +|[expected-lite](https://github.com/Microsoft/vcpkg/pull/6642) | 0.3.0 +|[greatest](https://github.com/Microsoft/vcpkg/pull/6934) | 1.4.2 +|[hedley](https://github.com/Microsoft/vcpkg/pull/6776) | 2019-05-08-1 +|[immer](https://github.com/Microsoft/vcpkg/pull/6814) | 2019-06-07 +|[itpp](https://github.com/Microsoft/vcpkg/pull/6672) | 4.3.1 +|[ixwebsocket](https://github.com/Microsoft/vcpkg/pull/6835) | 4.0.3 +|[json-c](https://github.com/Microsoft/vcpkg/pull/6446) | 2019-05-31 +|[libfabric](https://github.com/Microsoft/vcpkg/pull/4740)[(#7036)](https://github.com/Microsoft/vcpkg/pull/7036) | 1.7.1-1 +|[libftdi](https://github.com/Microsoft/vcpkg/pull/6843)[(#7015)](https://github.com/Microsoft/vcpkg/pull/7015) [(#7055)](https://github.com/Microsoft/vcpkg/pull/7055) | 0.20-1 +|[libftdi1](https://github.com/Microsoft/vcpkg/pull/6843) | 1.4 +|[libpmemobj-cpp](https://github.com/Microsoft/vcpkg/pull/7020)[(#7097)](https://github.com/Microsoft/vcpkg/pull/7095) | 1.6-1 +|[libraqm](https://github.com/Microsoft/vcpkg/pull/6659) | 0.6.0 +|[libu2f-server](https://github.com/Microsoft/vcpkg/pull/6781) | 1.1.0 +|[libzen](https://github.com/Microsoft/vcpkg/pull/7004) | 0.4.37 +|[magic-enum](https://github.com/Microsoft/vcpkg/pull/6817) | 2019-06-07 +|[networkdirect-sdk](https://github.com/Microsoft/vcpkg/pull/4740) | 2.0.1 +|[observer-ptr-lite](https://github.com/Microsoft/vcpkg/pull/6652) | 0.4.0 +|[openigtlink](https://github.com/Microsoft/vcpkg/pull/6769) | 3.0 +|[optional-bare](https://github.com/Microsoft/vcpkg/pull/6654) | 1.1.0 +|[optional-lite](https://github.com/Microsoft/vcpkg/pull/6655) | 3.2.0 +|[polyclipping](https://github.com/Microsoft/vcpkg/pull/6769) | 6.4.2 +|[ppconsul](https://github.com/Microsoft/vcpkg/pull/6911)[(#6967)](https://github.com/Microsoft/vcpkg/pull/6967) | 0.3-1 +|[pprint](https://github.com/Microsoft/vcpkg/pull/6678) | 2019-06-01 +|[restclient-cpp](https://github.com/Microsoft/vcpkg/pull/6936)[(#7054)](https://github.com/Microsoft/vcpkg/pull/7054) | 0.5.1-2 +|[ring-span-lite](https://github.com/Microsoft/vcpkg/pull/6696) | 0.3.0 +|[robin-hood-hashing](https://github.com/Microsoft/vcpkg/pull/6709) | 3.2.13 +|[simde](https://github.com/Microsoft/vcpkg/pull/6777) | 2019-06-05 +|[span-lite](https://github.com/Microsoft/vcpkg/pull/6703) | 0.5.0 +|[sprout](https://github.com/Microsoft/vcpkg/pull/6997) | 2019-06-20 +|[stormlib](https://github.com/Microsoft/vcpkg/pull/6428) | 9.22 +|[string-view-lite](https://github.com/Microsoft/vcpkg/pull/6758) | 1.3.0 +|[tl-function-ref](https://github.com/Microsoft/vcpkg/pull/7028) | 1.0.0-1 +|[variant-lite](https://github.com/Microsoft/vcpkg/pull/6720) | 1.2.2 +|[wpilib](https://github.com/Microsoft/vcpkg/pull/6716)[(#7087)](https://github.com/Microsoft/vcpkg/pull/7087) | 2019.5.1 +|[zstr](https://github.com/Microsoft/vcpkg/pull/6773) | 1.0.1 +|[zydis](https://github.com/Microsoft/vcpkg/pull/6861) | 2.0.3 +
+ +
+The following 291 ports have been updated: + +- alembic `1.7.11` -> `1.7.11-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6844)](https://github.com/Microsoft/vcpkg/pull/6844) [vcpkg] Add optional 'Homepage' field to CONTROL + +- angelscript `2.33.0` -> `2.33.0-1` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- angle `2019-03-13-c2ee2cc-3` -> `2019-06-13` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6892)](https://github.com/Microsoft/vcpkg/pull/6892) [angle] Update to latest master + +- arb `2.11.1-2` -> `2.16.0` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6763)](https://github.com/Microsoft/vcpkg/pull/6763) [arb]Upgrade version to 2.16.0 and fix build error. + +- armadillo `2019-04-16-f00d3225` -> `2019-04-16-3` + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#7022)](https://github.com/Microsoft/vcpkg/pull/7022) [armadillo] Fix build error in Linux + +- arrow `0.13.0-3` -> `0.13.0-4` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6757)](https://github.com/Microsoft/vcpkg/pull/6757) [arrow] fix findzstd patch + +- asio `1.12.2` -> `1.12.2-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6751)](https://github.com/Microsoft/vcpkg/pull/6751) [asio] Add cmake target + - [(#7083)](https://github.com/Microsoft/vcpkg/pull/7083) [asio] fix flaky build + +- assimp `4.1.0-4` -> `4.1.0-8` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6593)](https://github.com/Microsoft/vcpkg/pull/6593) [assimp]Fix lrrXML library dependencies. + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6887)](https://github.com/Microsoft/vcpkg/pull/6887) [assimp] Fix install assimp when passing --head + +- avro-c `1.8.2-1` -> `1.8.2-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- aws-c-common `0.3.0` -> `0.3.11-1` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6747)](https://github.com/Microsoft/vcpkg/pull/6747) [aws-c-common]Upgrade version to 0.3.11 + +- aws-sdk-cpp `1.7.106` -> `1.7.116` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6932)](https://github.com/Microsoft/vcpkg/pull/6932) [aws-sdk-cpp]Upgrade to 1.7.116 + +- azure-c-shared-utility `2019-05-16` -> `2019-05-16.1` + - [(#6804)](https://github.com/Microsoft/vcpkg/pull/6804) [azure] Update azure-iot-sdk-c for public-preview release of 2019-05-16 + +- azure-iot-sdk-c `2019-05-16` -> `2019-05-16.1` + - [(#6804)](https://github.com/Microsoft/vcpkg/pull/6804) [azure] Update azure-iot-sdk-c for public-preview release of 2019-05-16 + +- azure-macro-utils-c `2019-05-16` -> `2019-05-16.1` + - [(#6804)](https://github.com/Microsoft/vcpkg/pull/6804) [azure] Update azure-iot-sdk-c for public-preview release of 2019-05-16 + +- azure-uamqp-c `2019-05-16` -> `2019-05-16.1` + - [(#6804)](https://github.com/Microsoft/vcpkg/pull/6804) [azure] Update azure-iot-sdk-c for public-preview release of 2019-05-16 + +- azure-uhttp-c `2019-05-16` -> `2019-05-16.1` + - [(#6804)](https://github.com/Microsoft/vcpkg/pull/6804) [azure] Update azure-iot-sdk-c for public-preview release of 2019-05-16 + +- azure-umqtt-c `2019-05-16` -> `2019-05-16.1` + - [(#6804)](https://github.com/Microsoft/vcpkg/pull/6804) [azure] Update azure-iot-sdk-c for public-preview release of 2019-05-16 + +- blosc `1.16.3` -> `1.16.3-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6928)](https://github.com/Microsoft/vcpkg/pull/6928) [blosc] Fix the bug when building release-only. + +- bond `7.0.2-2` -> `8.1.0` + - [(#6844)](https://github.com/Microsoft/vcpkg/pull/6844) [vcpkg] Add optional 'Homepage' field to CONTROL + - [(#6954)](https://github.com/Microsoft/vcpkg/pull/6954) [bond]Upgrade version to 8.1.0 and add Linux/OSX support. + +- boost-thread `1.70.0` -> `1.70.0-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6840)](https://github.com/Microsoft/vcpkg/pull/6840) [boost-thread] Fix old patches + +- boost-variant `1.69.0` -> `1.70.0` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#7047)](https://github.com/Microsoft/vcpkg/pull/7047) [Boost-variant] Upgrade to 1.70.0 + +- botan `2.9.0` -> `2.9.0-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- c-ares `2019-5-2` -> `2019-5-2-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- cairo `1.16.0` -> `1.16.0-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6806)](https://github.com/Microsoft/vcpkg/pull/6806) [cairo] Fix linker errors on Linux and MacOS + +- capnproto `0.7.0-1` -> `0.7.0-2` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6844)](https://github.com/Microsoft/vcpkg/pull/6844) [vcpkg] Add optional 'Homepage' field to CONTROL + - [(#7024)](https://github.com/Microsoft/vcpkg/pull/7024) [capnproto] Enable Linux and OSX support + +- cartographer `1.0.0` -> `1.0.0-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- catch2 `2.7.2` -> `2.7.2-2` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6844)](https://github.com/Microsoft/vcpkg/pull/6844) [vcpkg] Add optional 'Homepage' field to CONTROL + +- ccd `2.1` -> `2.1-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- celero `2.4.0-1` -> `2.5.0-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6845)](https://github.com/Microsoft/vcpkg/pull/6845) Celero: Update to v2.5.0 release + +- cereal `1.2.2-1` -> `1.2.2-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- ceres `1.14.0-3` -> `1.14.0-6` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- clapack `3.2.1-4` -> `3.2.1-9` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- clblas `2.12-1` -> `2.12-2` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- clfft `2.12.2` -> `2.12.2-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- cli `1.1` -> `1.1-1` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- clp `1.17.2` -> `1.17.2-2` + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- cnl `2019-01-09` -> `2019-06-23` + - [(#7031)](https://github.com/Microsoft/vcpkg/pull/7031) [cnl] Update cnl to latest + +- coinutils `2.11.2` -> `2.11.2-2` + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- collada-dom `2.5.0` -> `2.5.0-1` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- console-bridge `0.3.2-3` -> `0.3.2-4` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- cpp-netlib `0.13.0-final` -> `0.13.0-2` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- cppcms `1.1.0-2` -> `1.2.1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- cpr `1.3.0-6` -> `1.3.0-7` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6429)](https://github.com/Microsoft/vcpkg/pull/6429) [Curl] Upgrades 2019.05.08 + +- crc32c `1.0.7` -> `1.0.7-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- cryptopp `8.1.0` -> `8.1.0-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6821)](https://github.com/Microsoft/vcpkg/pull/6821) [cryptopp] fix build by disabling assembly on osx + +- curl `7.61.1-7` -> `7.65.0-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6429)](https://github.com/Microsoft/vcpkg/pull/6429) [Curl] Upgrades 2019.05.08 + - [(#6649)](https://github.com/Microsoft/vcpkg/pull/6649) [Curl] Fix cmake target name + - [(#6698)](https://github.com/Microsoft/vcpkg/pull/6698) [curl] Revert revert of `-imp` suffix removal. + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- cxxopts `2.1.2` -> `2.1.2-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- darknet `0.2.5-1` -> `0.2.5-4` + - [(#6787)](https://github.com/Microsoft/vcpkg/pull/6787) [darknet] update to latest release + - [(#7064)](https://github.com/Microsoft/vcpkg/pull/7064) [darknet] enable ninja + +- darts-clone `1767ab87cffe` -> `1767ab87cffe-1` + - [(#6875)](https://github.com/Microsoft/vcpkg/pull/6875) [libsodium/darts-clone] remove conflicting makefile + +- dcmtk `3.6.3-1` -> `3.6.4` + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- dlib `19.17` -> `19.17-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + +- doctest `2.3.2` -> `2.3.3` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6998)](https://github.com/Microsoft/vcpkg/pull/6998) [doctest] Update to 2.3.3 + +- draco `1.3.3-2` -> `1.3.5` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6796)](https://github.com/Microsoft/vcpkg/pull/6796) [draco, flatbuffers, forge] Update to new version + +- duilib `2019-4-28-1` -> `2019-4-28-2` + - [(#7074)](https://github.com/Microsoft/vcpkg/pull/7074) [vcpkg_configure_cmake] Add NO_CHARSET_FLAG option + +- ebml `1.3.8` -> `1.3.9` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6662)](https://github.com/Microsoft/vcpkg/pull/6662) [ebml, matroska] Upgrade ebml to v1.3.9 and matroska to v1.5.2 + +- eigen3 `3.3.7-1` -> `3.3.7-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- ensmallen `1.15.0` -> `1.15.1` + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- entityx `1.3.0` -> `1.3.0-1` + - [(#6736)](https://github.com/Microsoft/vcpkg/pull/6736) [entityx][entt] Disable parallel configure + - [(#6844)](https://github.com/Microsoft/vcpkg/pull/6844) [vcpkg] Add optional 'Homepage' field to CONTROL + +- entt `3.0.0` -> `3.0.0-1` + - [(#6736)](https://github.com/Microsoft/vcpkg/pull/6736) [entityx][entt] Disable parallel configure + - [(#6844)](https://github.com/Microsoft/vcpkg/pull/6844) [vcpkg] Add optional 'Homepage' field to CONTROL + +- exiv2 `0.27` -> `0.27.1-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6844)](https://github.com/Microsoft/vcpkg/pull/6844) [vcpkg] Add optional 'Homepage' field to CONTROL + - [(#6905)](https://github.com/Microsoft/vcpkg/pull/6905) [Exiv2] update to 0.27.1 + +- fastcdr `1.0.6-2` -> `1.0.9-1` + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- fcl `0.5.0-5` -> `0.5.0-6` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- ffmpeg `4.1-5` -> `4.1-8` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6590)](https://github.com/Microsoft/vcpkg/pull/6590) ffmpeg: enable arm/arm64 windows support + - [(#6694)](https://github.com/Microsoft/vcpkg/pull/6694) [ffmpeg] Correctly set environment variables for gcc/clang/icc + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6743)](https://github.com/Microsoft/vcpkg/pull/6743) [ffmpeg] Fix regression on windows + - [(#6784)](https://github.com/Microsoft/vcpkg/pull/6784) [FFmpeg] Add 'vpx' feature. + +- fizz `2019.05.13.00` -> `2019.05.20.00-1` + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6969)](https://github.com/Microsoft/vcpkg/pull/6969) [libevent] Upgrade to version 2.1.10 + +- flann `jan2019` -> `1.9.1-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6931)](https://github.com/Microsoft/vcpkg/pull/6931) [flann]Upgrade version to 1.9.1 and fix build error. + - [(#7073)](https://github.com/Microsoft/vcpkg/pull/7073) [flann] fix flaky config + +- flatbuffers `1.10.0-1` -> `1.11.0-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6796)](https://github.com/Microsoft/vcpkg/pull/6796) [draco, flatbuffers, forge] Update to new version + - [(#6844)](https://github.com/Microsoft/vcpkg/pull/6844) [vcpkg] Add optional 'Homepage' field to CONTROL + +- fmi4cpp `0.7.0` -> `0.7.0-1` + - [(#7021)](https://github.com/Microsoft/vcpkg/pull/7021) [nana, fmi4cpp] Fix Visual Studio 2019 deprecates . + +- folly `2019.05.13.00` -> `2019.05.20.00-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6974)](https://github.com/Microsoft/vcpkg/pull/6974) [Folly] define _CRT_INTERNAL_NONSTDC_NAMES to 0 to disable non-underscore posix names on windows + +- fontconfig `2.12.4-8` -> `2.12.4-9` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + +- forest `11.0.1` -> `12.0.0` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6938)](https://github.com/Microsoft/vcpkg/pull/6938) [forest] move to 12.0.0 + +- forge `1.0.3-1` -> `1.0.4-1` + - [(#6796)](https://github.com/Microsoft/vcpkg/pull/6796) [draco, flatbuffers, forge] Update to new version + +- freeimage `3.18.0-5` -> `3.18.0-6` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- freerdp `2.0.0-rc4-1` -> `2.0.0-rc4-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- freetype `2.9.1-1` -> `2.10.0` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6754)](https://github.com/Microsoft/vcpkg/pull/6754) Fix freetype cmake config files + - [(#7057)](https://github.com/Microsoft/vcpkg/pull/7057) [freetype] Upgrade to version 2.10.0 + +- freexl `1.0.4-1` -> `1.0.4-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6813)](https://github.com/Microsoft/vcpkg/pull/6813) [freexl]: Linux build support + +- ftgl `2.3.1` -> `2.4.0-1` + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- g2o `20170730_git-4` -> `20170730_git-5` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6844)](https://github.com/Microsoft/vcpkg/pull/6844) [vcpkg] Add optional 'Homepage' field to CONTROL + +- gdcm `3.0.0` -> `3.0.0-3` + - [(#6710)](https://github.com/Microsoft/vcpkg/pull/6710) [gdcm,jbig2dec] move patches from #5169 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- gdk-pixbuf `2.36.9-2` -> `2.36.9-3` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6663)](https://github.com/Microsoft/vcpkg/pull/6663) [gdk-pixbuf] Fix Linux compilation. + +- geogram `1.6.9-3` -> `1.6.9-6` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- geographiclib `1.47-patch1-5` -> `1.47-patch1-6` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- gherkin-c `c-libs-e63e83104b` -> `4.1.2` + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- gl3w `99ed3211` -> `2018-05-31-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- glad `0.1.29` -> `0.1.30` + - [(#6819)](https://github.com/Microsoft/vcpkg/pull/6819) [glad] update to 0.1.30 + +- glbinding `3.1.0` -> `3.1.0-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6872)](https://github.com/Microsoft/vcpkg/pull/6872) set CMAKE_SYSTEM_PROCESSOR in Linux + - [(#6876)](https://github.com/Microsoft/vcpkg/pull/6876) [glbinding] remove conflict with other opengl ports + +- glew `2.1.0-3` -> `2.1.0-4` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6853)](https://github.com/Microsoft/vcpkg/pull/6853) [glew] Disable the link option /nodefaultlib and /noentry + +- glib `2.52.3-14-1` -> `2.52.3-14-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6663)](https://github.com/Microsoft/vcpkg/pull/6663) [gdk-pixbuf] Fix Linux compilation. + +- glibmm `2.52.1-8` -> `2.52.1-9` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6550)](https://github.com/Microsoft/vcpkg/pull/6550) [glibmm] Reintroduce CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS + - [(#6844)](https://github.com/Microsoft/vcpkg/pull/6844) [vcpkg] Add optional 'Homepage' field to CONTROL + +- globjects `1.1.0-2018-09-19-1` -> `1.1.0-2` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6844)](https://github.com/Microsoft/vcpkg/pull/6844) [vcpkg] Add optional 'Homepage' field to CONTROL + +- glog `0.4.0` -> `0.4.0-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- glslang `2018-03-02-2` -> `2019-03-05` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6689)](https://github.com/Microsoft/vcpkg/pull/6689) [shaderc] update + +- google-cloud-cpp `0.9.0` -> `0.10.0` + - [(#6785)](https://github.com/Microsoft/vcpkg/pull/6785) Upgrade google-cloud-cpp to 0.10.0. + +- graphicsmagick `1.3.31-1` -> `1.3.32` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6947)](https://github.com/Microsoft/vcpkg/pull/6947) Graphicsmagick 1.3.32 + +- graphite2 `1.3.12` -> `1.3.12-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- grpc `1.20.1-1` -> `1.21.1-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#5630)](https://github.com/Microsoft/vcpkg/pull/5630) [scripts] Fix vcpkg_fixup_cmake on non Windows platforms + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- gsoap `2.8.82-2` -> `2.8.84-1` + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6756)](https://github.com/Microsoft/vcpkg/pull/6756) update to 2.8.84 + +- gtk `3.22.19-2` -> `3.22.19-3` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6671)](https://github.com/Microsoft/vcpkg/pull/6671) [pango/gtk]Fix build error C2001. + +- harfbuzz `2.4.0` -> `2.5.1-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6659)](https://github.com/Microsoft/vcpkg/pull/6659) [libraqm] Add new port (0.6.0) + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6761)](https://github.com/Microsoft/vcpkg/pull/6761) [harfbuzz]Upgrade version to 2.5.1 and fix patches. + - [(#6879)](https://github.com/Microsoft/vcpkg/pull/6879) [harfbuzz] Propagate dependency on glib downstream + +- hdf5 `1.10.5-5` -> `1.10.5-7` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6771)](https://github.com/Microsoft/vcpkg/pull/6771) [netcdf-c/hdf5] improve/correct linkage + +- hpx `1.2.1-1` -> `1.3.0-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6755)](https://github.com/Microsoft/vcpkg/pull/6755) Updating HPX to V1.3.0 + +- http-parser `2.9.2` -> `2.9.2-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- icu `61.1-6` -> `61.1-7` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6695)](https://github.com/Microsoft/vcpkg/pull/6695) [icu] Enable parallel builds + +- idevicerestore `1.0.12-2` -> `1.0.12-3` + - [(#6698)](https://github.com/Microsoft/vcpkg/pull/6698) [curl] Revert revert of `-imp` suffix removal. + +- imgui `1.70` -> `1.70-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- inih `43` -> `44` + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- ismrmrd `1.4` -> `1.4.0-1` + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- itk `4.13.0-906736bd-3` -> `5.0.0-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6767)](https://github.com/Microsoft/vcpkg/pull/6767) [itk] Upgrade to 5.0.0 + +- jansson `2.11-2` -> `2.12-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- jasper `2.0.16-1` -> `2.0.16-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- jbig2dec `0.16` -> `0.16-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6710)](https://github.com/Microsoft/vcpkg/pull/6710) [gdcm,jbig2dec] move patches from #5169 + +- json-dto `0.2.8` -> `0.2.8-2` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- json11 `2017-06-20-1` -> `2017-06-20-2` + - [(#6967)](https://github.com/Microsoft/vcpkg/pull/6967) [ppconsul] remove conflict with json11 + +- jxrlib `1.1-6` -> `1.1-7` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- kangaru `4.1.3` -> `4.1.3-1` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- kd-soap `1.7.0` -> `1.8.0` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6838)](https://github.com/Microsoft/vcpkg/pull/6838) [kd-soap]Upgrade version to 1.8.0 + - [(#6844)](https://github.com/Microsoft/vcpkg/pull/6844) [vcpkg] Add optional 'Homepage' field to CONTROL + +- lcm `1.3.95-1` -> `1.4.0` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6836)](https://github.com/Microsoft/vcpkg/pull/6836) [lcm]Upgrade version to 1.4.0 and fix build error. + +- leptonica `1.76.0` -> `1.76.0-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- leveldb `2017-10-25-8b1cd3753b184341e837b30383832645135d3d73-3` -> `1.22` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6900)](https://github.com/Microsoft/vcpkg/pull/6900) [leveldb] Port update + +- libbson `1.13.0` -> `1.14.0-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6862)](https://github.com/Microsoft/vcpkg/pull/6862) [libbson mongo-c-driver mongo-cxx-driver] upgrades to new revision + +- libcroco `0.6.13` -> `0.6.13-1` + - [(#6663)](https://github.com/Microsoft/vcpkg/pull/6663) [gdk-pixbuf] Fix Linux compilation. + +- libevent `2.1.8-5` -> `2.1.10` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6969)](https://github.com/Microsoft/vcpkg/pull/6969) [libevent] Upgrade to version 2.1.10 + +- libfreenect2 `0.2.0-1` -> `0.2.0-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- libgeotiff `1.4.2-8` -> `1.4.2-9` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6000)](https://github.com/Microsoft/vcpkg/pull/6000) [LibLZMA] automatic configuration + +- libgit2 `0.28.1` -> `0.28.2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- libharu `2017-08-15-d84867ebf9f-6` -> `2017-08-15-8` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- libics `1.6.2` -> `1.6.3` + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- libideviceactivation `1.2.68` -> `1.2.68-1` + - [(#6698)](https://github.com/Microsoft/vcpkg/pull/6698) [curl] Revert revert of `-imp` suffix removal. + +- libimobiledevice `1.2.1.215-1` -> `1.2.76` + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- libjpeg-turbo `2.0.1-1` -> `2.0.2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6482)](https://github.com/Microsoft/vcpkg/pull/6482) [libjpeg-turbo] Upgrades 2019.05.08 + +- liblemon `1.3.1-4` -> `2019-06-13` + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6679)](https://github.com/Microsoft/vcpkg/pull/6679) [liblemon] made into a rolling-release port + +- liblsl `1.13.0-b4` -> `1.13.0-b6` + - [(#6745)](https://github.com/Microsoft/vcpkg/pull/6745) [liblsl] Update liblsl port to 1.13.0-b6 + +- liblzma `5.2.4-1` -> `5.2.4-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6000)](https://github.com/Microsoft/vcpkg/pull/6000) [LibLZMA] automatic configuration + +- libmikmod `3.3.11.1-2` -> `3.3.11.1-4` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#7035)](https://github.com/Microsoft/vcpkg/pull/7035) [libmikmod] patch cmake warning + - [(#7052)](https://github.com/Microsoft/vcpkg/pull/7052) [libmikmod] resolve ninja error (-w dupbuild=err) + +- libmodbus `3.1.4-2` -> `3.1.4-3` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- libmupdf `1.12.0-2` -> `1.15.0` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6710)](https://github.com/Microsoft/vcpkg/pull/6710) [gdcm,jbig2dec] move patches from #5169 + - [(#7046)](https://github.com/Microsoft/vcpkg/pull/7046) [libmupdf] Update the port to version 1.15.0 + +- libmysql `8.0.4-3` -> `8.0.4-4` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6442)](https://github.com/Microsoft/vcpkg/pull/6442) [libmysql]Fix build error in linux. + +- libogg `1.3.3-2` -> `1.3.3-4` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6588)](https://github.com/Microsoft/vcpkg/pull/6588) [libogg] Update to 1.3.3-3 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- libopusenc `0.1-1` -> `0.2.1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6748)](https://github.com/Microsoft/vcpkg/pull/6748) [libopusenc]Upgrade version to 0.2.1 + +- libpff `2018-07-14` -> `2018-07-14-1` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- libplist `2.0.1.197-2` -> `1.2.77` + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- libpng `1.6.37-1` -> `1.6.37-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- libqglviewer `2.7.1-1` -> `2.7.0` + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- libraw `0.19.2` -> `201903-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6742)](https://github.com/Microsoft/vcpkg/pull/6742) [libraw] Add include for select_library_configurations [(#6715)](https://github.com/Microsoft/vcpkg/pull/6715) + +- libressl `2.9.1` -> `2.9.1-2` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- libsndfile `1.0.29-6830c42-6` -> `1.0.29-8` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6896)](https://github.com/Microsoft/vcpkg/pull/6896) [sndfile/libsndfile] remove duplicate port, forward to libsndfile + +- libsodium `1.0.17-2` -> `1.0.18` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6778)](https://github.com/Microsoft/vcpkg/pull/6778) [libsodium] Update to 1.0.18 + - [(#6875)](https://github.com/Microsoft/vcpkg/pull/6875) [libsodium/darts-clone] remove conflicting makefile + +- libspatialite `4.3.0a-2` -> `4.3.0a-3` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6000)](https://github.com/Microsoft/vcpkg/pull/6000) [LibLZMA] automatic configuration + +- libsquish `1.15` -> `1.15-1` + - [(#6893)](https://github.com/Microsoft/vcpkg/pull/6893) [libsquish] fix flaky build + +- libtins `4.0-2` -> `4.2` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#7008)](https://github.com/Microsoft/vcpkg/pull/7008) [libtins]Upgrade version to 4.2 and adds dependent ports to new version. + +- libunibreak `4.1` -> `4.2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- libusb `1.0.22-2` -> `1.0.22-3` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- libusbmuxd `1.0.107-2` -> `1.2.77` + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- libuv `1.29.0` -> `1.29.1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- libwebp `1.0.2-3` -> `1.0.2-6` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6648)](https://github.com/Microsoft/vcpkg/pull/6648) [libwebp]Fix static build: add dependency libraries "dxguid winmm". + +- libwebsockets `3.1.0` -> `3.1.0-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6855)](https://github.com/Microsoft/vcpkg/pull/6855) [libwebsockets] Fix build error on Linux + +- libxlsxwriter `0.8.6-1` -> `0.8.7-1` + - [(#7034)](https://github.com/Microsoft/vcpkg/pull/7034) [libxlsxwriter] upgrade to 0.8.7 + +- libxslt `1.1.29` -> `1.1.33` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#7058)](https://github.com/Microsoft/vcpkg/pull/7058) [libxslt] Update the version to 1.1.33 and change the URL. + +- libyaml `0.2.1-1` -> `0.2.2` + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- llvm `7.0.0-2` -> `7.0.0-3` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6631)](https://github.com/Microsoft/vcpkg/pull/6631) [llvm]Fix build error on x64-windows. + +- lmdb `0.9.23` -> `0.9.23-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- log4cplus `2.0.4` -> `2.0.4-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6930)](https://github.com/Microsoft/vcpkg/pull/6930) [log4cplus]Fix lnk2019 errors when using log4cplus. + +- lz4 `1.9.1-1` -> `1.9.1-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6735)](https://github.com/Microsoft/vcpkg/pull/6735) [lz4]Fix conflict file xxhash.h + +- magnum-extras `2019.01-1` -> `2019.01-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6844)](https://github.com/Microsoft/vcpkg/pull/6844) [vcpkg] Add optional 'Homepage' field to CONTROL + +- magnum-integration `2019.01-1` -> `2019.01-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6844)](https://github.com/Microsoft/vcpkg/pull/6844) [vcpkg] Add optional 'Homepage' field to CONTROL + +- mathgl `2.4.3` -> `2.4.3-1` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- matroska `1.5.1` -> `1.5.2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6662)](https://github.com/Microsoft/vcpkg/pull/6662) [ebml, matroska] Upgrade ebml to v1.3.9 and matroska to v1.5.2 + +- miniz `2.0.8` -> `2.1.0` + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- mlpack `3.1.0-1` -> `3.1.1` + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6907)](https://github.com/Microsoft/vcpkg/pull/6907) [mlpack] Updated to version 3.1.1 + +- mongo-c-driver `1.13.0` -> `1.14.0-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6862)](https://github.com/Microsoft/vcpkg/pull/6862) [libbson mongo-c-driver mongo-cxx-driver] upgrades to new revision + +- mongo-cxx-driver `3.2.0-2` -> `3.4.0-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6862)](https://github.com/Microsoft/vcpkg/pull/6862) [libbson mongo-c-driver mongo-cxx-driver] upgrades to new revision + +- moos-core `10.4.0-2` -> `10.4.0-3` + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6844)](https://github.com/Microsoft/vcpkg/pull/6844) [vcpkg] Add optional 'Homepage' field to CONTROL + +- mosquitto `1.5.0-3` -> `1.6.2-2` + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6844)](https://github.com/Microsoft/vcpkg/pull/6844) [vcpkg] Add optional 'Homepage' field to CONTROL + +- ms-angle `2018-04-18-1` -> `2018-04-18-2` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- msix `MsixCoreInstaller-preview` -> `MsixCoreInstaller-preview-1` + - [(#7074)](https://github.com/Microsoft/vcpkg/pull/7074) [vcpkg_configure_cmake] Add NO_CHARSET_FLAG option + +- msmpi `10.0` -> `10.0-2` + - [(#6945)](https://github.com/Microsoft/vcpkg/pull/6945) [msmpi] Fix /MD for static libs. + +- nana `1.7.1` -> `1.7.1-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#7021)](https://github.com/Microsoft/vcpkg/pull/7021) [nana, fmi4cpp] Fix Visual Studio 2019 deprecates . + +- nanomsg `1.1.5` -> `1.1.5-1` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- netcdf-c `4.7.0` -> `4.7.0-3` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6771)](https://github.com/Microsoft/vcpkg/pull/6771) [netcdf-c/hdf5] improve/correct linkage + - [(#6865)](https://github.com/Microsoft/vcpkg/pull/6865) [netcdf-c]Fix build error on linux. + - [(#6971)](https://github.com/Microsoft/vcpkg/pull/6971) [netcdf-c] Fix link error. + +- nlopt `2.6.1` -> `2.6.1-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6739)](https://github.com/Microsoft/vcpkg/pull/6739) [protobuf] Update to 3.8.0 + +- nmslib `1.7.2-1` -> `1.7.3.6` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- nrf-ble-driver `4.1.0` -> `4.1.1` + +- nvtt `2.1.0-3` -> `2.1.1` + - [(#6765)](https://github.com/Microsoft/vcpkg/pull/6765) [nvtt]Upgrade version to 2.1.1 and fix build error on windows. + +- octomap `cefed0c1d79afafa5aeb05273cf1246b093b771c-6` -> `2017-03-11-7` + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- ogre `1.11.3-4` -> `1.12.0-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- oniguruma `6.9.2` -> `6.9.2-2` + - [(#6958)](https://github.com/Microsoft/vcpkg/pull/6958) [vcpkg] Add vcpkg_check_features + - [(#7091)](https://github.com/Microsoft/vcpkg/pull/7091) [vcpkg] Update vcpkg_check_features document + +- openblas `0.3.6-2` -> `0.3.6-4` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- opencv `3.4.3-7` -> `3.4.3-9` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6000)](https://github.com/Microsoft/vcpkg/pull/6000) [LibLZMA] automatic configuration + - [(#6812)](https://github.com/Microsoft/vcpkg/pull/6812) [opencv] Fixed OpenCV versioning using wrong commit + - [(#6901)](https://github.com/Microsoft/vcpkg/pull/6901) [opencv]Fix build error with feature gdcm: cannot find openjp2. + +- openexr `2.3.0-3` -> `2.3.0-4` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- openmama `6.2.3` -> `6.2.3-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- openmvg `1.4-2` -> `1.4-5` + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- openmvs `0.9` -> `1.0-1` + - [(#6692)](https://github.com/Microsoft/vcpkg/pull/6692) update to v1.0 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- openni2 `2.2.0.33-8` -> `2.2.0.33-9` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- openssl `0` -> `1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- opentracing `1.5.1` -> `1.5.1-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6844)](https://github.com/Microsoft/vcpkg/pull/6844) [vcpkg] Add optional 'Homepage' field to CONTROL + +- openvdb `6.0.0-2` -> `6.1.0` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6864)](https://github.com/Microsoft/vcpkg/pull/6864) [openvdb]Upgrade version to 6.1.0, regenerate patches and fix build errors. + +- openvpn3 `2018-03-21` -> `2018-03-21-1` + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- openvr `1.1.3b` -> `1.4.18` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- opusfile `0.11-2` -> `0.11-3` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- orc `1.5.5` -> `1.5.5-1` + - [(#6739)](https://github.com/Microsoft/vcpkg/pull/6739) [protobuf] Update to 3.8.0 + +- orocos-kdl `1.4` -> `1.4-1` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- osi `0.108.4` -> `0.108.4-2` + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- paho-mqtt `1.2.1-1` -> `1.3.0` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6762)](https://github.com/Microsoft/vcpkg/pull/6762) [paho-mqtt] Upgrade to 1.3.0 + +- pango `1.40.11-3` -> `1.40.11-4` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6671)](https://github.com/Microsoft/vcpkg/pull/6671) [pango/gtk]Fix build error C2001. + +- pangolin `0.5-6` -> `0.5-7` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- parallel-hashmap `1.22` -> `1.23` + - [(#6917)](https://github.com/Microsoft/vcpkg/pull/6917) [parallel-hashmap] Update to current 1.23 version and include natvis file. + +- pcl `1.9.1-3` -> `1.9.1-4` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- pdal `1.7.1-4` -> `1.7.1-5` + - [(#6000)](https://github.com/Microsoft/vcpkg/pull/6000) [LibLZMA] automatic configuration + - [(#6603)](https://github.com/Microsoft/vcpkg/pull/6603) [pdal] delete and replace different find modules + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- pdcurses `3.6` -> `3.8` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- poco `2.0.0-pre-1` -> `2.0.0-pre-2` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6844)](https://github.com/Microsoft/vcpkg/pull/6844) [vcpkg] Add optional 'Homepage' field to CONTROL + +- podofo `0.9.6-6` -> `0.9.6-7` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6000)](https://github.com/Microsoft/vcpkg/pull/6000) [LibLZMA] automatic configuration + +- proj4 `4.9.3-1` -> `4.9.3-3` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6000)](https://github.com/Microsoft/vcpkg/pull/6000) [LibLZMA] automatic configuration + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- prometheus-cpp `0.6.0` -> `0.7.0` + - [(#6822)](https://github.com/Microsoft/vcpkg/pull/6822) [prometheus-cpp] Update to version 0.7.0 + +- protobuf `3.7.1` -> `3.8.0-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6739)](https://github.com/Microsoft/vcpkg/pull/6739) [protobuf] Update to 3.8.0 + +- pugixml `1.9-1` -> `1.9-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- qca `2.2.0-4` -> `2.2.1` + - [(#6839)](https://github.com/Microsoft/vcpkg/pull/6839) [qca]Upgrade version to 2.2.1 and fix build error. + - [(#6844)](https://github.com/Microsoft/vcpkg/pull/6844) [vcpkg] Add optional 'Homepage' field to CONTROL + +- qt5-base `5.12.3-1` -> `5.12.3-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#7019)](https://github.com/Microsoft/vcpkg/pull/7019) [qt5-base]Add execute permission when installing executables in Linux. + +- qt5-declarative `5.12.3` -> `5.12.3-1` + - [(#6927)](https://github.com/Microsoft/vcpkg/pull/6927) [qt5-declarative]Fix error when building release-only. + +- re2 `2019-05-07` -> `2019-05-07-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- realsense2 `2.16.1-2` -> `2.22.0-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#5275)](https://github.com/Microsoft/vcpkg/pull/5275) [realsense2] Enable OpenNI2 driver option + - [(#5777)](https://github.com/Microsoft/vcpkg/pull/5777) [realsense2] Update to v2.19.0 + +- reproc `6.0.0` -> `6.0.0-1` + - [(#6711)](https://github.com/Microsoft/vcpkg/pull/6711) [reproc] Enabled C++ target for version 6.0.0. + +- restinio `0.4.9` -> `0.5.1-1` + - [(#6669)](https://github.com/Microsoft/vcpkg/pull/6669) RESTinio updated to v.0.4.9.1 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6749)](https://github.com/Microsoft/vcpkg/pull/6749) RESTinio updated to v.0.5.0 + - [(#6933)](https://github.com/Microsoft/vcpkg/pull/6933) RESTinio updated to v.0.5.1 + +- robin-map `0.2.0` -> `0.6.1` + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- rtmidi `2.1.1-2` -> `4.0.0` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6635)](https://github.com/Microsoft/vcpkg/pull/6635) [rtmidi] Update to version 4.0.0 + +- sdl2 `2.0.9-3` -> `2.0.9-4` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- sdl2-image `2.0.4-2` -> `2.0.4-3` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- sdl2-mixer `2.0.4-2` -> `2.0.4-3` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6929)](https://github.com/Microsoft/vcpkg/pull/6929) [sdl2-mixer]Fix build error with feature opusfile. + +- sdl2-net `2.0.1-6` -> `2.0.1-7` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- sdl2-ttf `2.0.15-2` -> `2.0.15-3` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- selene `0.3.1` -> `0.3.1-1` + - [(#6000)](https://github.com/Microsoft/vcpkg/pull/6000) [LibLZMA] automatic configuration + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- sf2cute `0.2.0` -> `0.2.0-1` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- shaderc `12fb656ab20ea9aa06e7084a74e5ff832b7ce2da-2` -> `2019-06-26` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6689)](https://github.com/Microsoft/vcpkg/pull/6689) [shaderc] update + +- shiva `1.0` -> `1.0-2` + - [(#6000)](https://github.com/Microsoft/vcpkg/pull/6000) [LibLZMA] automatic configuration + - [(#6637)](https://github.com/Microsoft/vcpkg/pull/6637) [shiva] Fix build error "Could NOT find PythonInterp" + +- shogun `6.1.3-1` -> `6.1.3-3` + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6739)](https://github.com/Microsoft/vcpkg/pull/6739) [protobuf] Update to 3.8.0 + - [(#6872)](https://github.com/Microsoft/vcpkg/pull/6872) set CMAKE_SYSTEM_PROCESSOR in Linux + +- sndfile `1.0.29-cebfdf2-1` -> `0` + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6896)](https://github.com/Microsoft/vcpkg/pull/6896) [sndfile/libsndfile] remove duplicate port, forward to libsndfile + +- snowhouse `3.0.1` -> `3.1.0` + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- so5extra `1.2.3` -> `1.2.3-1` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- sobjectizer `5.5.24.4` -> `5.5.24.4-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- sol2 `2.20.6` -> `3.0.2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- sophus `1.0.0-1` -> `1.0.0-6` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + +- spdlog `1.3.1` -> `1.3.1-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6924)](https://github.com/Microsoft/vcpkg/pull/6924) [spdlog]Add feature[benchmark] + +- spirv-cross `2018-08-07-1` -> `2019-05-09` + - [(#6690)](https://github.com/Microsoft/vcpkg/pull/6690) update spirv cross + +- spirv-headers `2019-03-05` -> `2019-05-05` + - [(#6689)](https://github.com/Microsoft/vcpkg/pull/6689) [shaderc] update + +- spirv-tools `2018.1-2` -> `2019.3-dev` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6689)](https://github.com/Microsoft/vcpkg/pull/6689) [shaderc] update + +- sqlite-modern-cpp `3.2-e2248fa` -> `3.2-936cd0c8` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- sqlite-orm `1.3` -> `1.3-1` + - [(#6894)](https://github.com/Microsoft/vcpkg/pull/6894) [sqlite-orm] fix tag, update hash + +- sqlite3 `3.27.2` -> `3.28.0-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6856)](https://github.com/Microsoft/vcpkg/pull/6856) [sqlite3]: Switch back to CMAKE_SYSTEM_NAME checks per original PR + - [(#6856)](https://github.com/Microsoft/vcpkg/pull/6856) [sqlite3]: Shared library support for Linux + - [(#6921)](https://github.com/Microsoft/vcpkg/pull/6921) [sqlite3] Update to 3.28.0 + +- sqlitecpp `2.2-2` -> `2.3.0` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- strict-variant `v0.5` -> `0.5` + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- string-theory `2.1` -> `2.1-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- suitesparse `5.1.2-2` -> `5.4.0-3` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- systemc `2.3.3-2` -> `2.3.3-3` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- szip `2.1.1-3` -> `2.1.1-4` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- taglib `1.11.1-4` -> `1.11.1-20190531` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6851)](https://github.com/Microsoft/vcpkg/pull/6851) [taglib]Upgrade version to 1.11.1-20190531. + +- tbb `2019_U6` -> `2019_U7` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- tesseract `4.0.0-1` -> `4.0.0-3` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6000)](https://github.com/Microsoft/vcpkg/pull/6000) [LibLZMA] automatic configuration + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- theia `0.8` -> `0.8-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + +- thor `2.0-2` -> `2.0-3` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6953)](https://github.com/Microsoft/vcpkg/pull/6953) [thor] Fix error on Linux. + +- thrift `2019-05-07` -> `2019-05-07-2` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6872)](https://github.com/Microsoft/vcpkg/pull/6872) set CMAKE_SYSTEM_PROCESSOR in Linux + - [(#7074)](https://github.com/Microsoft/vcpkg/pull/7074) [vcpkg_configure_cmake] Add NO_CHARSET_FLAG option + +- tidy-html5 `5.6.0` -> `5.6.0-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#7074)](https://github.com/Microsoft/vcpkg/pull/7074) [vcpkg_configure_cmake] Add NO_CHARSET_FLAG option + +- tiff `4.0.10-4` -> `4.0.10-6` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6000)](https://github.com/Microsoft/vcpkg/pull/6000) [LibLZMA] automatic configuration + +- tinyexif `1.0.2-4` -> `1.0.2-5` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- tinyobjloader `1.4.1-1` -> `1.0.7-1` + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- tinyxml2 `7.0.1` -> `7.0.1-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- tl-expected `0.3-1` -> `1.0.0-1` + - [(#7028)](https://github.com/Microsoft/vcpkg/pull/7028) [tl] Update tl::expected and tl::optional, add tl::function_ref + +- tl-optional `0.5-1` -> `1.0.0-1` + - [(#7028)](https://github.com/Microsoft/vcpkg/pull/7028) [tl] Update tl::expected and tl::optional, add tl::function_ref + +- tmx `1.0.0` -> `1.0.0-1` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- treehopper `1.11.3-2` -> `1.11.3-3` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6844)](https://github.com/Microsoft/vcpkg/pull/6844) [vcpkg] Add optional 'Homepage' field to CONTROL + +- trompeloeil `34` -> `34-1` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6844)](https://github.com/Microsoft/vcpkg/pull/6844) [vcpkg] Add optional 'Homepage' field to CONTROL + +- umock-c `2019-05-16` -> `2019-05-16.1` + - [(#6804)](https://github.com/Microsoft/vcpkg/pull/6804) [azure] Update azure-iot-sdk-c for public-preview release of 2019-05-16 + +- urdfdom `1.0.3` -> `1.0.3-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- urdfdom-headers `1.0.3` -> `1.0.4-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- usd `0.8.4` -> `0.8.4-1` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- uvatlas `sept2016-1` -> `apr2019` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- uvw `1.17.0_libuv-v1.29` -> `1.17.0_libuv-v1.29-1` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6844)](https://github.com/Microsoft/vcpkg/pull/6844) [vcpkg] Add optional 'Homepage' field to CONTROL + +- visit-struct `1.0` -> `1.0-1` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- vlpp `0.9.3.1-2` -> `0.10.0.0` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6793)](https://github.com/Microsoft/vcpkg/pull/6793) [vlpp] Upgrade to 0.10.0.0 + +- vtk `8.2.0-2` -> `8.2.0-4` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6782)](https://github.com/Microsoft/vcpkg/pull/6782) [vtk] fix static hdf5 linkage. + +- vxl `v1.18.0-3` -> `v1.18.0-4` + - [(#6657)](https://github.com/Microsoft/vcpkg/pull/6657) [vxl] move problematic feature to optional one + +- wangle `2019.05.13.00` -> `2019.05.20.00-1` + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- wil `2019-05-08` -> `2019-06-10` + - [(#6847)](https://github.com/Microsoft/vcpkg/pull/6847) Update commit for WIL + +- wt `4.0.5` -> `4.0.5-1` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6925)](https://github.com/Microsoft/vcpkg/pull/6925) [wt] Fix XML file installation path + +- xerces-c `3.2.2-9` -> `3.2.2-10` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6970)](https://github.com/Microsoft/vcpkg/pull/6970) [xerces-c]Replace the macro DLL_EXPORT with the macro XERCES_DLL_EXPORT + +- xeus `0.19.1-1` -> `0.19.2` + - [(#6618)](https://github.com/Microsoft/vcpkg/pull/6618) [many ports] Updates 2019.05.24 + +- xsimd `7.2.3` -> `7.2.3-1` + - [(#7091)](https://github.com/Microsoft/vcpkg/pull/7091) [vcpkg] Update vcpkg_check_features document + +- xtensor `0.20.7` -> `0.20.7-1` + - [(#6958)](https://github.com/Microsoft/vcpkg/pull/6958) [vcpkg] Add vcpkg_check_features + +- xxhash `0.6.4-1` -> `0.7.0` + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports + - [(#6750)](https://github.com/Microsoft/vcpkg/pull/6750) [xxhash]Upgrade version to 0.7.0 and fix arm/uwp build errors. + +- z3 `4.8.4-1` -> `4.8.5-1` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6803)](https://github.com/Microsoft/vcpkg/pull/6803) [z3] bump version to 4.8.5 + +- zopfli `2019-01-19` -> `2019-01-19-1` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- zserge-webview `2019-04-27-1` -> `2019-04-27-2` + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + +- zxing-cpp `3.3.3-3` -> `3.3.3-5` + - [(#6371)](https://github.com/Microsoft/vcpkg/pull/6371) [openexr,openimageio,suitesparse,theia] updates for non-win32 + - [(#6730)](https://github.com/Microsoft/vcpkg/pull/6730) [many ports] improvements for linux/wsl + - [(#6779)](https://github.com/Microsoft/vcpkg/pull/6779) [zxing-cpp] Fixed renaming zxing` -> `zxing-cpp` + +- zziplib `0.13.69-3` -> `0.13.69-4` + - [(#7090)](https://github.com/Microsoft/vcpkg/pull/7090) [zziplib] fix flaky build + - [(#2933)](https://github.com/Microsoft/vcpkg/pull/2933) [WIP] Add a Homepage URL entry for vcpkg ports +
+ +-- vcpkg team vcpkg@microsoft.com WED, 16 Jul 2019 05:17:00 -0800 + +vcpkg (2018.11.23) +-------------- + * Add ports: + - aixlog 1.2.1 + - civetweb 1.11-1 + - cli11 1.6.1 + - cub 1.8.0 + - cutelyst2 2.5.2-1 + - easyloggingpp 9.96.5-1 + - ecsutil 1.0.1.2-1 + - fdlibm 5.3-2 + - fizz 2018.10.15.00 + - fmi4cpp 0.4.0 + - fribidi 1.0.5 + - glad 0.1.28-3 + - igloo 1.1.1 + - libtins 4.0-2 + - linalg 2.1 + - miniupnpc 2.1 + - nanovg master + - orc 1.5.2-f47e02c-2 + - pixel 0.3 + - plustache 0.4.0-1 + - prometheus-cpp 0.6.0 + - rapidcheck 2018-11-05-1 + - reproc v1.0.0 + - sdl1 1.2.15-3 + - sdl1-net 1.2.8-2 + - snowhouse 3.0.1 + - so5extra 1.2.1 + - socket-io-client 1.6.1 + - stlab 1.3.3 + - tl-optional 0.5-1 + - trompeloeil 32-1 + - vulkan 1.1.82.1 + * Update ports: + - abseil 2018-09-18-3 -> 2018-11-08 + - args 2018-06-28 -> 2018-10-25 + - asio 1.12.1 -> 1.12.1-1 + - asmjit 673dcefaa048c5f5a2bf8b85daf8f7b9978d018a -> 2018-11-08 + - assimp 4.1.0-2 -> 4.1.0-3 + - aws-sdk-cpp 1.6.12-1 -> 1.6.47 + - azure-c-shared-utility 1.1.5 -> 1.1.10-1 + - azure-iot-sdk-c 1.2.3 -> 1.2.10-1 + - azure-storage-cpp 5.1.1 -> 5.2.0 + - azure-uamqp-c 1.2.3 -> 1.2.10-1 + - azure-uhttp-c LTS_01_2018_Ref01 -> 1.1.10-1 + - azure-umqtt-c 1.1.5 -> 1.1.10-1 + - berkeleydb 4.8.30 -> 4.8.30-2 + - boost-modular-build-helper 2018-08-21 -> 2018-10-19 + - brynet 0.9.0 -> 1.0.0 + - bzip2 1.0.6-2 -> 1.0.6-3 + - c-ares cares-1_14_0 -> cares-1_15_0 + - catch2 2.4.0 -> 2.4.2 + - celero 2.3.0-1 -> 2.4.0 + - cgal 4.13-1 -> 4.13-2 + - chakracore 1.11.1-1 -> 1.11.2 + - cimg 2.3.6 -> 2.4.1 + - clara 2018-04-02 -> 2018-11-01 + - corrade 2018.04-1 -> 2018.10-1 + - cpprestsdk 2.10.6-1 -> 2.10.6-3 + - cxxopts 2.1.0-1 -> 2.1.1 + - dimcli 3.1.1-2 -> 4.0.1-1 + - directxmesh aug2018 -> oct2018 + - directxtex aug2018b -> oct2018 + - directxtk aug2018 -> oct2018b + - doctest 2.0.0 -> 2.0.1 + - double-conversion 3.1.0 -> 3.1.0-1 + - eastl 3.12.01 -> 3.12.04 + - egl-registry 2018-06-30 -> 2018-06-30-1 + - entityx 1.2.0-1 -> 1.2.0-2 + - entt 2.7.3 -> 2.7.3-1 + - exiv2 2018-09-18 -> 2018-11-08 + - exprtk 2018.09.30-9836f21 -> 2018-10-11 + - fastcdr 1.0.6-1 -> 1.0.6-2 + - fftw3 3.3.7-2 -> 3.3.8 + - flann 1.9.1-7 -> 1.9.1-8 + - fmt 5.2.0 -> 5.2.1 + - folly 2018.09.17.00 -> 2018.11.05.00 + - forest 9.0.5 -> 9.0.6 + - freeimage 3.17.0-4 -> 3.18.0-2 + - gdcm2 2.8.7 -> 2.8.8 + - glm 0.9.9.2 -> 0.9.9.3 + - google-cloud-cpp 0.1.0-1 -> 0.3.0-1 + - gtest 1.8.0-9 -> 1.8.1-1 + - gtk 3.22.19-1 -> 3.22.19-2 + - hunspell 1.6.1-2 -> 1.6.1-3 + - jsonnet 2018-09-18 -> 2018-11-01 + - libfreenect2 0.2.0 -> 0.2.0-1 + - libgd 2.2.4-3 -> 2.2.4-4 + - libgeotiff 1.4.2-4 -> 1.4.2-6 + - liblinear 2.20 -> 221 + - libpng 1.6.35 -> 1.6.35-1 + - libpq 9.6.1-4 -> 9.6.1-5 + - libusb 1.0.21-fc99620 -> 1.0.22-1 + - libuv 1.23.0 -> 1.24.0 + - libwebm 1.0.0.27-2 -> 1.0.0.27-3 + - magnum 2018.04-1 -> 2018.10-1 + - magnum-extras 2018.04-1 -> 2018.10-1 + - magnum-integration 2018.04-1 -> 2018.10-1 + - magnum-plugins 2018.04-1 -> 2018.10-1 + - matio 1.5.12 -> 1.5.13 + - metis 5.1.0-1 -> 5.1.0-2 + - minizip 1.2.11-2 -> 1.2.11-3 + - mpir 3.0.0-4 -> 3.0.0-5 + - ms-gsl 2018-09-18 -> 2018-11-08 + - nghttp2 1.33.0 -> 1.34.0 + - nlohmann-json 3.3.0 -> 3.4.0 + - nng 1.0.1 -> 1.1.0 + - nuklear 2018-09-18 -> 2018-11-01 + - openal-soft 1.19.0 -> 1.19.1 + - opencv 3.4.1 -> 3.4.3-3 + - opengl-registry 2018-06-30 -> 2018-06-30-1 + - openimageio Release-1.8.13 -> 1.8.16 + - openssl-unix 1.0.2p -> 1.0.2p-1 + - opus 1.2.1-1 -> 1.3 + - osgearth 2.9-1 -> 2.9-2 + - pcl 1.8.1-12 -> 1.9.0-1 + - pixman 0.34.0-4 -> 0.34.0-5 + - portaudio 19.0.6.00-2 -> 19.0.6.00-4 + - qhull 2015.2-2 -> 2015.2-3 + - qscintilla 2.10-4 -> 2.10-7 + - qt5 5.9.2-1 -> 5.11.2 + - qt5-3d 5.9.2-0 -> 5.11.2 + - qt5-activeqt 5.9.2-0 -> 5.11.2 + - qt5-base 5.9.2-7 -> 5.11.2-1 + - qt5-charts 5.9.2-0 -> 5.11.2 + - qt5-datavis3d 5.9.2-0 -> 5.11.2 + - qt5-declarative 5.9.2-0 -> 5.11.2 + - qt5-gamepad 5.9.2-0 -> 5.11.2 + - qt5-graphicaleffects 5.9.2-0 -> 5.11.2 + - qt5-imageformats 5.9.2-0 -> 5.11.2 + - qt5-modularscripts 4 -> 2018-11-01-1 + - qt5-multimedia 5.9.2-0 -> 5.11.2 + - qt5-networkauth 5.9.2-0 -> 5.11.2 + - qt5-quickcontrols 5.9.2-1 -> 5.11.2 + - qt5-quickcontrols2 5.9.2-1 -> 5.11.2 + - qt5-script 5.9.2 -> 5.11.2 + - qt5-scxml 5.9.2-0 -> 5.11.2 + - qt5-serialport 5.9.2-0 -> 5.11.2 + - qt5-speech 5.9.2-0 -> 5.11.2 + - qt5-svg 5.9.2-0 -> 5.11.2 + - qt5-tools 5.9.2-0 -> 5.11.2 + - qt5-virtualkeyboard 5.9.2-0 -> 5.11.2 + - qt5-websockets 5.9.2-0 -> 5.11.2 + - qt5-winextras 5.9.2-0 -> 5.11.2 + - qt5-xmlpatterns 5.9.2-0 -> 5.11.2 + - qwt 6.1.3-5 -> 6.1.3-6 + - range-v3 0.3.5 -> 0.4.0-20181122 + - rapidjson 1.1.0-1 -> 1.1.0-2 + - re2 2018-09-18 -> 2018-11-01 + - rocksdb 5.14.2 -> 5.15.10 + - rs-core-lib 2018-09-18 -> 2018-10-25 + - rttr 0.9.5-2 -> 0.9.5-3 + - scintilla 4.0.3 -> 4.1.2 + - sdl2 2.0.8-1 -> 2.0.9-1 + - sfml 2.5.0-2 -> 2.5.1 + - sobjectizer 5.5.22.1 -> 5.5.23 + - spdlog 1.0.0 -> 1.2.1 + - sqlite3 3.24.0-1 -> 3.25.2 + - suitesparse 4.5.5-4 -> 5.1.2 + - tbb 2018_U5-4 -> 2018_U6 + - thrift 2018-09-18 -> 2018-11-01 + - tiff 4.0.9-4 -> 4.0.10 + - tiny-dnn 2018-09-18 -> 2018-10-25 + - unicorn 2018-09-18 -> 2018-10-25 + - unicorn-lib 2018-09-18 -> 2018-10-25 + - uriparser 0.8.6 -> 0.9.0 + - vtk 8.1.0-1 -> 8.1.0-3 + - vxl 20180414-7a130cf-1 -> v1.18.0-2 + - wangle v2018.07.30.00-1 -> 2018.11.05.00 + - websocketpp 0.7.0-1 -> 0.8.1 + - winpcap 4.1.3-1 -> 4.1.3-2 + - xalan-c 1.11-1 -> 1.11-4 + - xerces-c 3.1.4-3 -> 3.2.2-5 + - yoga 1.9.0 -> 1.10.0 + - zeromq 2018-09-18 -> 2018-11-01 + * `vcpkg install`: Improve error messages + * `vcpkg hash`: Now also tries `shaABCsum tools`, instead of only `shasum`. Allows building in OSes like Alpine. + * `vcpkg edit`: No longer launches the editor in a clean (purged) environment. + * `vcpkg upgrade`: now tab-completed in powershell (it was missing before). + * Add new function: `vcpkg_from_git()` + * Enable Visual Studio versions greater than 15. + * Add Visual Studio Code autotection on OSX (#4589) + * Work-around hash issue caused by NuGet adding signatures to all their files. + * Improve building `vcpkg.exe` (Windows-only): + - Builds out of source + - Temporary files are removed after bootstrap + - User Property Pages are ignored (#4620) + * `vcpkg` now prints URL and filepath, when downloading a tool (#4640) + * Bump version of `cmake` to 3.12.4 + * Bump version of `git` to 2.9.1 + +-- vcpkg team FRI, 23 Nov 2018 14:30:00 -0800 + + +vcpkg (2018.10.20) +-------------- + * Add ports: + - 3fd 2.6.2 + - argtable2 2.13-1 + - asyncplusplus 1.0-1 + - bde 3.2.0.0 + - boost-hana-msvc 1.67.0-1 + - boost-yap 1.68.0 + - check 0.12.0-1 + - concurrentqueue 1.0.0-beta + - crossguid 0.2.2-2018-06-16 + - darts-clone 1767ab87cffe + - dcmtk 3.6.3 + - docopt 2018-04-16-2 + - egl-registry 2018-06-30 + - embree2 2.16.4-3 + - embree3 3.2.0-2 + - esaxx ca7cb332011ec37 + - fastfeat 391d5e9 + - fmilib 2.0.3 + - fruit 3.4.0-1 + - getopt 0 + - getopt-win32 0.1 + - gmmlib 18.3.pre2-1 + - graphqlparser v0.7.0 + - ideviceinstaller 1.1.2.23-1 + - idevicerestore 1.0.12-1 + - inih 42 + - intelrdfpmathlib 20U2 + - io2d 0.1-1 + - json11 2017-06-20 + - kangaru 4.1.2 + - kf5archive 5.50.0 + - kf5holidays 5.50.0 + - laszip 3.2.2-1 + - libdshowcapture 0.6.0 + - libideviceactivation 1.0.38-1 + - libimobiledevice 1.2.1.215-1 + - libirecovery 1.0.25-2 + - liblemon 1.3.1-2 + - libmaxminddb 1.3.2-1 + - libmodbus 3.1.4-1 + - libmorton 2018-19-07 + - libplist 2.0.1.197-2 + - libusbmuxd 1.0.107-2 + - libyaml 0.2.1-1 + - linenoise-ng 4754bee2d8eb3 + - luabridge 2.1-1 + - milerius-sfml-imgui 1.1 + - minisat-master-keying 2.2-mod-1 + - mio 2018-10-18-1 + - modp-base64 + - morton-nd 2.0.0 + - nanorange 0.0.0 + - nng 1.0.1 + - ogdf 2018-03-28-2 + - opengl-registry 2018-06-30 + - openssl-unix 1.0.2p + - openssl-uwp 1.0.2l-winrt + - openssl-windows 1.0.2p-1 + - osg-qt 3.5.7 + - parquet 1.4.0 + - pcg 0.98.1 + - pegtl 2.7.1 + - plib 1.8.5-2 + - pngwriter 0.7.0-1 + - python2 2.7.15-1 + - qt5-activeqt 5.9.2-0 + - qt5-script 5.9.2 + - readerwriterqueue 1.0.0 + - readline 0 + - readline-win32 5.0-2 + - restbed 4.16-07-28-2018 + - safeint 3.19.2 + - sais 2.4.1 + - selene 0.1.1 + - shiva 1.0 + - shiva-sfml 1.0 + - simpleini 2018-08-31-1 + - soil 2008.07.07-1 + - sol2 2.20.4 + - spaceland 7.8.2-0 + - spirv-cross 2018-08-07-1 + - tinyfiledialogs 3.3.7-1 + - tinyobjloader 1.2.0-1 + - tinyspline 0.2.0-1 + - tinyutf8 2.1.1-1 + - tl-expected 0.3-1 + - tmx 1.0.0 + - tmxparser 2.1.0-1 + - usbmuxd 1.1.1.133-1 + - usrsctp 35c1d97020a + - uvw 1.11.2 + - vtk-dicom 0.8.8-alpha-1 + - vulkan-memory-allocator 2.1.0-1 + - wangle v2018.07.30.00-1 + - woff2 1.0.2 + * Update ports: + - abseil 2018-05-01-1 -> 2018-09-18-3 + - ace 6.4.8 -> 6.5.2 + - alembic 1.7.8 -> 1.7.9 + - allegro5 5.2.3.0 -> 5.2.4.0 + - angle 2017-06-14-8d471f-4 -> 2017-06-14-8d471f-5 + - apr 1.6.3 -> 1.6.5 + - args 2018-05-17 -> 2018-06-28 + - arrow 0.6.0-1 -> 0.9.0-1 + - asio 1.12.0-2 -> 1.12.1 + - assimp 4.1.0-1 -> 4.1.0-2 + - aws-sdk-cpp 1.4.52 -> 1.6.12-1 + - azure-c-shared-utility 1.1.3 -> 1.1.5 + - azure-storage-cpp 4.0.0 -> 5.1.1 + - azure-uhttp-c 2018-02-09 -> LTS_01_2018_Ref01 + - azure-umqtt-c 1.1.3 -> 1.1.5 + - benchmark 1.4.0 -> 1.4.1 + - blaze 3.3 -> 3.4-1 + - boost 1.67.0 -> 1.68.0 + - boost-accumulators 1.67.0 -> 1.68.0 + - boost-algorithm 1.67.0 -> 1.68.0 + - boost-align 1.67.0 -> 1.68.0 + - boost-any 1.67.0 -> 1.68.0 + - boost-array 1.67.0 -> 1.68.0 + - boost-asio 1.67.0-1 -> 1.68.0-1 + - boost-assert 1.67.0 -> 1.68.0 + - boost-assign 1.67.0 -> 1.68.0 + - boost-atomic 1.67.0 -> 1.68.0 + - boost-beast 1.67.0 -> 1.68.0 + - boost-bimap 1.67.0 -> 1.68.0 + - boost-bind 1.67.0 -> 1.68.0 + - boost-build 1.67.0 -> 1.68.0 + - boost-callable-traits 1.67.0 -> 1.68.0 + - boost-chrono 1.67.0 -> 1.68.0 + - boost-circular-buffer 1.67.0 -> 1.68.0 + - boost-compatibility 1.67.0 -> 1.68.0 + - boost-compute 1.67.0 -> 1.68.0 + - boost-concept-check 1.67.0 -> 1.68.0 + - boost-config 1.67.0 -> 1.68.0 + - boost-container 1.67.0 -> 1.68.0 + - boost-container-hash 1.67.0 -> 1.68.0 + - boost-context 1.67.0 -> 1.68.0-1 + - boost-contract 1.67.0 -> 1.68.0 + - boost-conversion 1.67.0 -> 1.68.0 + - boost-convert 1.67.0 -> 1.68.0 + - boost-core 1.67.0 -> 1.68.0 + - boost-coroutine 1.67.0 -> 1.68.0 + - boost-coroutine2 1.67.0 -> 1.68.0 + - boost-crc 1.67.0 -> 1.68.0 + - boost-date-time 1.67.0 -> 1.68.0 + - boost-detail 1.67.0 -> 1.68.0 + - boost-di 1.0.1 -> 1.0.2 + - boost-disjoint-sets 1.67.0 -> 1.68.0 + - boost-dll 1.67.0 -> 1.68.0 + - boost-dynamic-bitset 1.67.0 -> 1.68.0 + - boost-endian 1.67.0 -> 1.68.0 + - boost-exception 1.67.0 -> 1.68.0 + - boost-fiber 1.67.0 -> 1.68.0 + - boost-filesystem 1.67.0 -> 1.68.0 + - boost-flyweight 1.67.0 -> 1.68.0 + - boost-foreach 1.67.0 -> 1.68.0 + - boost-format 1.67.0 -> 1.68.0 + - boost-function 1.67.0 -> 1.68.0 + - boost-function-types 1.67.0 -> 1.68.0 + - boost-functional 1.67.0 -> 1.68.0 + - boost-fusion 1.67.0 -> 1.68.0 + - boost-geometry 1.67.0 -> 1.68.0 + - boost-gil 1.67.0 -> 1.68.0 + - boost-graph 1.67.0 -> 1.68.0 + - boost-graph-parallel 1.67.0 -> 1.68.0 + - boost-hana 1.67.0 -> 1.68.0-1 + - boost-heap 1.67.0 -> 1.68.0 + - boost-hof 1.67.0 -> 1.68.0 + - boost-icl 1.67.0 -> 1.68.0 + - boost-integer 1.67.0 -> 1.68.0 + - boost-interprocess 1.67.0 -> 1.68.0 + - boost-interval 1.67.0 -> 1.68.0 + - boost-intrusive 1.67.0 -> 1.68.0 + - boost-io 1.67.0 -> 1.68.0 + - boost-iostreams 1.67.0 -> 1.68.0 + - boost-iterator 1.67.0 -> 1.68.0 + - boost-lambda 1.67.0 -> 1.68.0 + - boost-lexical-cast 1.67.0 -> 1.68.0 + - boost-local-function 1.67.0 -> 1.68.0 + - boost-locale 1.67.0 -> 1.68.0 + - boost-lockfree 1.67.0 -> 1.68.0-1 + - boost-log 1.67.0 -> 1.68.0 + - boost-logic 1.67.0 -> 1.68.0 + - boost-math 1.67.0 -> 1.68.0 + - boost-metaparse 1.67.0 -> 1.68.0 + - boost-modular-build-helper 2018-05-14 -> 2018-08-21 + - boost-move 1.67.0 -> 1.68.0 + - boost-mp11 1.67.0 -> 1.68.0 + - boost-mpi 1.67.0-1 -> 1.68.0-1 + - boost-mpl 1.67.0 -> 1.68.0 + - boost-msm 1.67.0 -> 1.68.0 + - boost-multi-array 1.67.0 -> 1.68.0 + - boost-multi-index 1.67.0 -> 1.68.0 + - boost-multiprecision 1.67.0 -> 1.68.0 + - boost-numeric-conversion 1.67.0 -> 1.68.0 + - boost-odeint 1.67.0 -> 1.68.0 + - boost-optional 1.67.0 -> 1.68.0 + - boost-parameter 1.67.0 -> 1.68.0 + - boost-phoenix 1.67.0 -> 1.68.0 + - boost-poly-collection 1.67.0 -> 1.68.0 + - boost-polygon 1.67.0 -> 1.68.0 + - boost-pool 1.67.0 -> 1.68.0 + - boost-predef 1.67.0 -> 1.68.0 + - boost-preprocessor 1.67.0 -> 1.68.0 + - boost-process 1.67.0 -> 1.68.0 + - boost-program-options 1.67.0 -> 1.68.0 + - boost-property-map 1.67.0 -> 1.68.0 + - boost-property-tree 1.67.0 -> 1.68.0 + - boost-proto 1.67.0 -> 1.68.0 + - boost-ptr-container 1.67.0 -> 1.68.0 + - boost-python 1.67.0-1 -> 1.68.0-2 + - boost-qvm 1.67.0 -> 1.68.0 + - boost-random 1.67.0 -> 1.68.0 + - boost-range 1.67.0 -> 1.68.0 + - boost-ratio 1.67.0 -> 1.68.0 + - boost-rational 1.67.0 -> 1.68.0 + - boost-regex 1.67.0 -> 1.68.0 + - boost-scope-exit 1.67.0 -> 1.68.0 + - boost-serialization 1.67.0 -> 1.68.0 + - boost-signals 1.67.0 -> 1.68.0 + - boost-signals2 1.67.0 -> 1.68.0 + - boost-smart-ptr 1.67.0 -> 1.68.0 + - boost-sort 1.67.0 -> 1.68.0 + - boost-spirit 1.67.0 -> 1.68.0 + - boost-stacktrace 1.67.0 -> 1.68.0 + - boost-statechart 1.67.0 -> 1.68.0 + - boost-static-assert 1.67.0 -> 1.68.0 + - boost-system 1.67.0 -> 1.68.0 + - boost-test 1.67.0-2 -> 1.68.0-2 + - boost-thread 1.67.0 -> 1.68.0 + - boost-throw-exception 1.67.0 -> 1.68.0 + - boost-timer 1.67.0 -> 1.68.0 + - boost-tokenizer 1.67.0 -> 1.68.0 + - boost-tti 1.67.0 -> 1.68.0 + - boost-tuple 1.67.0 -> 1.68.0 + - boost-type-erasure 1.67.0 -> 1.68.0 + - boost-type-index 1.67.0 -> 1.68.0 + - boost-type-traits 1.67.0 -> 1.68.0 + - boost-typeof 1.67.0 -> 1.68.0 + - boost-ublas 1.67.0 -> 1.68.0 + - boost-units 1.67.0 -> 1.68.0 + - boost-unordered 1.67.0 -> 1.68.0 + - boost-utility 1.67.0 -> 1.68.0 + - boost-uuid 1.67.0 -> 1.68.0 + - boost-variant 1.67.0 -> 1.68.0 + - boost-vmd 1.67.0 -> 1.68.0 + - boost-wave 1.67.0 -> 1.68.0 + - boost-winapi 1.67.0 -> 1.68.0 + - boost-xpressive 1.67.0 -> 1.68.0 + - botan 2.0.1 -> 2.8.0 + - breakpad 2018-04-17 -> 2018-09-18 + - brotli 1.0.2-3 -> 1.0.2-4 + - cairo 1.15.8-1 -> 1.15.8-3 + - cartographer 0.3.0-4 -> 0.3.0-5 + - catch2 2.2.2 -> 2.4.0 + - celero 2.1.0-2 -> 2.3.0-1 + - cgal 4.12 -> 4.13-1 + - chaiscript 6.0.0 -> 6.1.0 + - chakracore 1.8.4 -> 1.11.1-1 + - cimg 2.2.3 -> 2.3.6 + - clockutils 1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-1 -> 1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-2 + - cmark 0.28.3-1 -> 0.28.3-2 + - coolprop 6.1.0-3 -> 6.1.0-4 + - cpprestsdk 2.10.2-1 -> 2.10.6-1 + - crc32c 1.0.5 -> 1.0.5-1 + - cryptopp 6.1.0-2 -> 7.0.0 + - curl 7.60.0 -> 7.61.1-1 + - cxxopts 1.3.0 -> 2.1.0-1 + - dimcli 3.1.1-1 -> 3.1.1-2 + - directxmesh may2018 -> aug2018 + - directxtex may2018 -> aug2018b + - directxtk may2018 -> aug2018 + - discord-rpc 3.3.0 -> 3.3.0-1 + - dlib 19.10-1 -> 19.16 + - doctest 1.2.9 -> 2.0.0 + - double-conversion 3.0.0-2 -> 3.1.0 + - draco 1.2.5 -> 1.3.3 + - eastl 3.09.00 -> 3.12.01 + - ecm 5.40.0 -> 5.50.0 + - eigen3 3.3.4-2 -> 3.3.5 + - entt 2.5.0 -> 2.7.3 + - exiv2 2018-05-17 -> 2018-09-18 + - expat 2.2.5 -> 2.2.6 + - exprtk 2018.04.30-46877b6 -> 2018.09.30-9836f21 + - fastrtps 1.5.0 -> 1.5.0-1 + - fdk-aac 2018-05-17 -> 2018-07-08 + - flatbuffers 1.8.0-2 -> 1.9.0-2 + - fmt 4.1.0 -> 5.2.0 + - folly 2018.05.14.00 -> 2018.09.17.00 + - fontconfig 2.12.4-1 -> 2.12.4-7 + - forest 7.0.7 -> 9.0.5 + - freeglut 3.0.0-4 -> 3.0.0-5 + - freetype-gl 2018-02-25 -> 2018-09-18 + - gdal 2.3.0-1 -> 2.3.2 + - gdcm2 2.8.6 -> 2.8.7 + - geogram 1.6.0-1 -> 1.6.4 + - geos 3.6.2-3 -> 3.6.3-2 + - glbinding 2.1.1-3 -> 3.0.2-3 + - glfw3 3.2.1-2 -> 3.2.1-3 + - glib 2.52.3-9 -> 2.52.3-11 + - glm 0.9.8.5-1 -> 0.9.9.2 + - globjects 1.0.0-1 -> 1.1.0-2018-09-19 + - glslang 2018-03-02 -> 2018-03-02-1 + - google-cloud-cpp 0.1.0 -> 0.1.0-1 + - graphicsmagick 1.3.28 -> 1.3.30-1 + - graphite2 1.3.10 -> 1.3.12 + - grpc 1.10.1-2 -> 1.14.1 + - gtest 1.8.0-8 -> 1.8.0-9 + - guetzli 2017-09-02-cb5e4a86f69628-1 -> 2018-07-30 + - gumbo 0.10.1-1 -> 0.10.1-2 + - harfbuzz 1.7.6-1 -> 1.8.4-2 + - http-parser 2.7.1-3 -> 2.8.1 + - hwloc 1.11.7-2 -> 1.11.7-3 + - icu 61.1-1 -> 61.1-4 + - imgui 1.60 -> 1.65 + - json-dto 0.2.5 -> 0.2.6 + - jsonnet 2018-05-17 -> 2018-09-18 + - kf5plotting 5.37.0 -> 5.50.0 + - lcms 2.8-4 -> 2.8-5 + - leptonica 1.74.4-3 -> 1.76.0 + - libarchive 3.3.2-1 -> 3.3.3-2 + - libflac 1.3.2-5 -> 1.3.2-6 + - libgeotiff 1.4.2-3 -> 1.4.2-4 + - libgit2 0.26.0 -> 0.27.4-2 + - libgo 2.7 -> 2.8-2 + - liblzma 5.2.3-2 -> 5.2.4 + - libmariadb 3.0.2 -> 3.0.2-1 + - libmysql 8.0.4-2 -> 8.0.4-3 + - libodb 2.4.0-2 -> 2.4.0-3 + - libodb-mysql 2.4.0-1 -> 2.4.0-2 + - libp7-baical 4.4-2 -> 4.4-3 + - libpng 1.6.34-3 -> 1.6.35 + - libpqxx 6.0.0 -> 6.0.0-1 + - libraw 0.18.2-5 -> 0.19.0-1 + - libsndfile 1.0.29-6830c42-3 -> 1.0.29-6830c42-5 + - libssh 0.7.5-4 -> 0.7.6 + - libssh2 1.8.0-3 -> 1.8.0-4 + - libuv 1.20.3-2 -> 1.23.0 + - libvorbis 1.3.5-143caf4-3 -> 1.3.6-112d3bd-1 + - libwebsockets 3.0.0 -> 3.0.1 + - libzip rel-1-5-1 -> rel-1-5-1-vcpkg1 + - live555 2018.02.28 -> latest + - llvm 6.0.0-1 -> 7.0.0 + - log4cplus REL_2_0_0-RC2 -> REL_2_0_1 + - luasocket 2018-02-25 -> 2018-09-18 + - lz4 1.8.2 -> 1.8.3 + - mbedtls 2.6.1 -> 2.13.1 + - mongo-cxx-driver 3.1.1-2 -> 3.1.1-3 + - monkeys-audio 4.3.3 -> 4.3.3-1 + - mosquitto 1.4.15 -> 1.5.0 + - ms-gsl 2018-05-17 -> 2018-09-18 + - mujs 2018-05-17 -> 2018-07-30 + - nana 1.5.5 -> 1.6.2 + - nanodbc 2.12.4-1 -> 2.12.4-2 + - nanomsg 1.1.2 -> 1.1.4 + - nghttp2 1.30.0-1 -> 1.33.0 + - nlohmann-json 3.1.2 -> 3.3.0 + - nlopt 2.4.2-c43afa08d~vcpkg1-1 -> 2.4.2-1226c127 + - nuklear 2018-05-17 -> 2018-09-18 + - octomap cefed0c1d79afafa5aeb05273cf1246b093b771c-2 -> cefed0c1d79afafa5aeb05273cf1246b093b771c-3 + - openal-soft 1.18.2-2 -> 1.19.0 + - openimageio Release-1.9.2dev -> Release-1.8.13 + - openmama 6.2.1-a5a93a24d2f89a0def0145552c8cd4a53c69e2de -> 6.2.2 + - openmesh 6.3 -> 7.0 + - openssl 1.0.2o-2 -> 0 + - openvr 1.0.15 -> 1.0.16 + - opusfile 0.9-1 -> 0.11-1 + - osg 3.5.6-2 -> 3.6.2 + - osgearth 2.9 -> 2.9-1 + - paho-mqtt 1.2.0-3 -> 1.2.1 + - parson 2018-05-17 -> 2018-09-18 + - pcl 1.8.1-10 -> 1.8.1-12 + - pdal 1.7.1-2 -> 1.7.1-3 + - pdcurses 3.4-1 -> 3.6 + - picosha2 2018-02-25 -> 2018-07-30 + - pixman 0.34.0-2 -> 0.34.0-4 + - plibsys 0.0.3-1 -> 0.0.4-1 + - pmdk 1.4-2 -> 1.4.2 + - poco 1.9.0 -> 1.9.0-1 + - podofo 0.9.5-2 -> 0.9.6 + - protobuf 3.5.1-4 -> 3.6.1-4 + - pybind11 2.2.1 -> 2.2.3-1 + - python3 3.6.4-1 -> 3.6.4-2 + - qpid-proton 0.18.1 -> 0.24.0 + - qt5-base 5.9.2-6 -> 5.9.2-7 + - qt5-modularscripts 3 -> 4 + - re2 2018-05-17 -> 2018-09-18 + - realsense2 2.10.4 -> 2.16.1 + - restinio 0.4.5.1 -> 0.4.8 + - rocksdb 5.13.1 -> 5.14.2 + - rs-core-lib 2018-05-17 -> 2018-09-18 + - sciter 4.1.7 -> 4.2.2 + - sdl2-image 2.0.2-1 -> 2.0.2-3 + - sfgui 0.3.2-1 -> 0.3.2-2 + - sfml 2.4.2-3 -> 2.5.0-2 + - shaderc 12fb656ab20ea9aa06e7084a74e5ff832b7ce2da-1 -> 12fb656ab20ea9aa06e7084a74e5ff832b7ce2da-2 + - signalrclient 1.0.0-beta1-3 -> 1.0.0-beta1-4 + - sobjectizer 5.5.22 -> 5.5.22.1 + - soci 2016.10.22-1 -> 3.2.3-1 + - spdlog 0.16.3 -> 1.0.0 + - sqlite-modern-cpp 3.2 -> 3.2-e2248fa + - sqlite-orm 1.1 -> 1.2 + - sqlite3 3.23.1-1 -> 3.24.0-1 + - string-theory 1.7 -> 2.1 + - strtk 2018.05.07-48c9554 -> 2018.09.30-b887974 + - sundials 2.7.0-1 -> 3.1.1 + - tbb 2018_U3 -> 2018_U5-4 + - tesseract 3.05.01-3 -> 3.05.02 + - thor 2.0-1 -> 2.0-2 + - thrift 2018-05-17 -> 2018-09-18 + - tiff 4.0.9 -> 4.0.9-4 + - tiny-dnn 2018-03-13 -> 2018-09-18 + - torch-th 20180131-89ede3ba90c906a8ec6b9a0f4bef188ba5bb2fd8-2 -> 2018-07-03 + - unicorn 2018-05-17 -> 2018-09-18 + - unicorn-lib 2018-05-17 -> 2018-09-18 + - uriparser 0.8.5 -> 0.8.6 + - wt 4.0.3 -> 4.0.4 + - x264 152-e9a5903edf8ca59-1 -> 157-303c484ec828ed0 + - xlnt 1.2.0-1 -> 1.3.0-1 + - yaml-cpp 0.6.2 -> 0.6.2-2 + - yara e3439e4ead4ed5d3b75a0b46eaf15ddda2110bb9 -> e3439e4ead4ed5d3b75a0b46eaf15ddda2110bb9-1 + - yoga 1.8.0-1 -> 1.9.0 + - zeromq 2018-05-17 -> 2018-09-18 + * Change version format of the `vcpkg` tool to a date + * Improve handling of ctrl-c inside `install` or `build` + * Improvements in `vcpkg edit`: + - Fix console blocking when using VSCode and no other instance of VSCode is running + - `--all` option now opens package folders + - Now checks the default user-wide installation dir of VSCode (in addition to system-wide) + * `vcpkg env`: add argument to execute a command in the environment of the selected triplet + - e.g. `vcpkg env --triplet x64-windows "cl.exe"` + * Survey message changes: + - Survey message may pop-up only in `install`, `remove`, `export`, `update`. This prevents issues with parsing the output of other more script-oriented commands + - Adjust the survey frequency to 6 months, with an additional once after 10 days of use + - Improve metrics performance on Windows + * Fix OSX build for old gcc versions + * Fix handling of symlink when installing or removing a library + * Use -fPIC in all builds to enable mixing static libs with shared objects. + * Move graph options to `vcpkg depend-info` (from `vcpkg search`) + * Add `vcpkg_from_gitlab` function + * Documentation improvements in various `vcpkg_*` cmake functions + +-- vcpkg team SAT, 20 Oct 2018 17:00:00 -0800 + + +vcpkg (0.0.113) +-------------- + * Add ports: + - json-dto 0.2.5 + - keystone 0.9.1 + - osgearth 2.9 + - pdal 1.7.1-2 + - sdl2pp 0.16.0-1 + * Update ports: + - args 2018-02-23 -> 2018-05-17 + - aws-sdk-cpp 1.4.40 -> 1.4.52 + - chakracore 1.8.3 -> 1.8.4 + - cimg 2.2.2 -> 2.2.3 + - curl 7_59_0-2 -> 7.60.0 + - directxmesh apr2018 -> may2018 + - directxtex apr2018 -> may2018 + - directxtk apr2018 -> may2018 + - doctest 1.2.8 -> 1.2.9 + - entt 2.4.2-1 -> 2.5.0 + - exiv2 2018-04-25 -> 2018-05-17 + - fdk-aac 2018-03-07 -> 2018-05-17 + - forest 7.0.6 -> 7.0.7 + - gdal 2.2.2-1 -> 2.3.0-1 + - grpc 1.10.1-1 -> 1.10.1-2 + - jsonnet 2018-05-01 -> 2018-05-17 + - libuv 1.20.2 -> 1.20.3-2 + - libwebsockets 2.4.2 -> 3.0.0 + - lodepng 2018-02-25 -> 2018-05-17 + - mpg123 1.25.8-4 -> 1.25.8-5 + - ms-gsl 2018-05-01 -> 2018-05-17 + - mujs 2018-05-01 -> 2018-05-17 + - nuklear 2018-04-25 -> 2018-05-17 + - opus 1.2.1 -> 1.2.1-1 + - parson 2018-04-17 -> 2018-05-17 + - pmdk 1.4-1 -> 1.4-2 + - podofo 0.9.5-1 -> 0.9.5-2 + - re2 2018-05-01 -> 2018-05-17 + - rocksdb 5.12.4 -> 5.13.1 + - rs-core-lib 2018-05-01 -> 2018-05-17 + - sdl2-mixer 2.0.2-2 -> 2.0.2-4 + - thrift 2018-05-01 -> 2018-05-17 + - unicorn 2018-04-25 -> 2018-05-17 + - unicorn-lib 2018-05-01 -> 2018-05-17 + - uwebsockets 0.14.8-1 -> 0.14.8-2 + - wtl 10.0 -> 10.0-1 + - zeromq 2018-05-01 -> 2018-05-17 + * `vcpkg` no longer calls `powershell` from `cmake`. + - This completes the fix for the issue where `vcpkg.exe` would change the console's font when invoking `powershell`. + - `Powershell` is no longer called other than for bootstrap and powershell integration for tab-completion. + +-- vcpkg team SAT, 16 May 2018 19:30:00 -0800 + + +vcpkg (0.0.112) +-------------- + * Add ports: + - robin-map 0.2.0 + * Update ports: + - abseil 2018-04-25-1 -> 2018-05-01-1 + - ace 6.4.7 -> 6.4.8 + - aws-sdk-cpp 1.4.38 -> 1.4.40 + - azure-storage-cpp 3.2.1 -> 4.0.0 + - blosc 1.13.5 -> 1.13.5-1 + - boost-modular-build-helper 2018-04-16-4 -> 2018-05-14 + - brotli 1.0.2-2 -> 1.0.2-3 + - catch-classic 1.12.1 -> 1.12.2 + - folly 2018.04.23.00 -> 2018.05.14.00 + - jsonnet 2018-04-25 -> 2018-05-01 + - ms-gsl 2018-04-25 -> 2018-05-01 + - mujs 25821e6d74fab5fcc200fe5e818362e03e114428 -> 2018-05-01 + - openimageio 1.8.10 -> Release-1.9.2dev + - openvr 1.0.14 -> 1.0.15 + - protobuf 3.5.1-3 -> 3.5.1-4 + - re2 2018-03-17 -> 2018-05-01 + - rs-core-lib 2018-04-25 -> 2018-05-01 + - sol 2.20.0 -> 2.20.0-1 + - thrift 2018-04-25 -> 2018-05-01 + - unicorn-lib 2018-04-09 -> 2018-05-01 + - zeromq 2018-04-25 -> 2018-05-01 + * `vcpkg` no longer calls powershell for downloading/extracting and detecting Visual Studio. + - This also fixes an issue where `vcpkg.exe` would change the console's font when invoking `powershell`. + +-- vcpkg team WED, 16 May 2018 19:00:00 -0800 + + +vcpkg (0.0.111) +-------------- + * Add ports: + - cmark 0.28.3-1 + - inja 1.0.0 + - libgo 2.7 + - range-v3-vs2015 20151130-vcpkg5 + - restinio 0.4.5.1 + - treehopper 1.11.3-1 + - yajl 2.1.0-1 + - yato 1.0-1 + * Update ports: + - abseil 2018-04-12 -> 2018-04-25-1 + - alembic 1.7.7 -> 1.7.8 + - aws-sdk-cpp 1.4.33 -> 1.4.38 + - bigint 2010.04.30-1 -> 2010.04.30-2 + - box2d 2.3.1-374664b -> 2.3.1-374664b-1 + - brotli 1.0.2-1 -> 1.0.2-2 + - cgal 4.11.1 -> 4.12 + - corrade 2018.02-1 -> 2018.04-1 + - directxmesh feb2018-eb751e0b631b05aa25c36c08e7d6bbf09f5e94a9 -> apr2018 + - directxtex feb2018b -> apr2018 + - directxtk feb2018 -> apr2018 + - discord-rpc 3.2.0 -> 3.3.0 + - exiv2 2018-04-12 -> 2018-04-25 + - exprtk 2018.01.01-f32d2b4 -> 2018.04.30-46877b6 + - folly 2018.04.16.00 -> 2018.04.23.00 + - freeglut 3.0.0-3 -> 3.0.0-4 + - gainput 1.0.0 -> 1.0.0-1 + - geos 3.6.2-2 -> 3.6.2-3 + - http-parser 2.7.1-2 -> 2.7.1-3 + - imgui 1.53 -> 1.60 + - ismrmrd 1.3.2-1 -> 1.3.2-2 + - jsonnet 2018-04-17 -> 2018-04-25 + - leveldb 2017-10-25-8b1cd3753b184341e837b30383832645135d3d73-1 -> 2017-10-25-8b1cd3753b184341e837b30383832645135d3d73-2 + - libflac 1.3.2-4 -> 1.3.2-5 + - libqrencode 4.0.0-1 -> 4.0.0-2 + - libuv 1.20.0 -> 1.20.2 + - libxmlpp 2.40.1-1 -> 2.40.1-2 + - llvm 6.0.0 -> 6.0.0-1 + - magnum 2018.02-2 -> 2018.04-1 + - magnum-extras 2018.02-2 -> 2018.04-1 + - magnum-integration 2018.02-1 -> 2018.04-1 + - magnum-plugins 2018.02-2 -> 2018.04-1 + - ms-gsl 2018-03-17 -> 2018-04-25 + - nuklear 2018-04-17 -> 2018-04-25 + - openal-soft 1.18.2-1 -> 1.18.2-2 + - physfs 2.0.3-2 -> 3.0.1 + - poco 1.8.1-1 -> 1.9.0 + - python3 3.6.4 -> 3.6.4-1 + - quirc 1.0-1 -> 1.0-2 + - range-v3 20151130-vcpkg5 -> 0.3.5 + - rapidjson 1.1.0 -> 1.1.0-1 + - realsense2 2.10.1-1 -> 2.10.4 + - rhash 1.3.5-1 -> 1.3.6 + - rocksdb 5.12.2 -> 5.12.4 + - rs-core-lib 2018-04-12 -> 2018-04-25 + - sciter 4.1.5 -> 4.1.7 + - sfml 2.4.2-2 -> 2.4.2-3 + - sobjectizer 5.5.21 -> 5.5.22 + - sol 2.19.5 -> 2.20.0 + - sqlite3 3.23.0 -> 3.23.1-1 + - strtk 2018.01.01-5579ed1 -> 2018.05.07-48c9554 + - thrift 2018-04-17 -> 2018-04-25 + - unicorn 2018-03-20 -> 2018-04-25 + - uwebsockets 0.14.7-1 -> 0.14.8-1 + - vlpp 0.9.3.1 -> 0.9.3.1-1 + - zeromq 2018-04-17 -> 2018-04-25 + - zstd 1.3.3 -> 1.3.4 + * Add clean patching for vcpkg_from_github() + - `vcpkg_from_github()` now takes a PATCHES argument (see the azure-storage-cpp [portfile](ports\azure-storage-cpp\portfile.cmake) as an example) + - A unique directory name is derived from the source hash and the patch hashes + - Modifying the patches would previously cause the new patches to fail to apply if sources with a previous version of the patches were present in the buildtrees. This is no longer the case. + * Fix various cross-platform issues + +-- vcpkg team FRI, 11 May 2018 21:45:00 -0800 + + +vcpkg (0.0.110) +-------------- + * `vcpkg` is now available for Linux and MacOS. More information [here](https://blogs.msdn.microsoft.com/vcblog/2018/04/24/announcing-a-single-c-library-manager-for-linux-macos-and-windows-vcpkg/). + +-- vcpkg team TUE, 24 Apr 2018 10:30:00 -0800 + + +vcpkg (0.0.109) +-------------- + * Add ports: + - boost-container-hash 1.67.0 + - boost-contract 1.67.0 + - boost-hof 1.67.0 + - fastrtps 1.5.0 + - fluidsynth 1.1.10 + - liblinear 2.20 + - libxmlpp 2.40.1-1 + - utf8h 841cb2deb8eb806e73fff0e1f43a11fca4f5da45 + - vxl 20180414-7a130cf-1 + * Update ports: + - abseil 2018-04-05 -> 2018-04-12 + - aws-sdk-cpp 1.4.30-1 -> 1.4.33 + - azure-c-shared-utility 1.1.2 -> 1.1.3 + - azure-iot-sdk-c 1.2.2 -> 1.2.3 + - azure-uamqp-c 1.2.2 -> 1.2.3 + - azure-umqtt-c 1.1.2 -> 1.1.3 + - benchmark 1.3.0-1 -> 1.4.0 + - boost 1.66.0 -> 1.67.0 + - boost-* 1.66.0 -> 1.67.0 + - breakpad 2018-04-05 -> 2018-04-17 + - cartographer 0.3.0-3 -> 0.3.0-4 + - catch2 2.2.1-1 -> 2.2.2 + - celero 2.1.0-1 -> 2.1.0-2 + - chakracore 1.8.2 -> 1.8.3 + - cimg 221 -> 2.2.2 + - cppzmq 4.2.2 -> 4.2.2-1 + - date 2.4 -> 2.4.1 + - directxmesh feb2018 -> feb2018-eb751e0b631b05aa25c36c08e7d6bbf09f5e94a9 + - exiv2 2018-04-05 -> 2018-04-12 + - folly 2018.03.19.00-2 -> 2018.04.16.00 + - forest 7.0.1 -> 7.0.6 + - gettext 0.19-2 -> 0.19-4 + - glib 2.52.3-2 -> 2.52.3-9 + - glibmm 2.52.1 -> 2.52.1-7 + - graphicsmagick 1.3.26-2 -> 1.3.28 + - grpc 1.10.1 -> 1.10.1-1 + - icu 59.1-1 -> 61.1-1 + - jsonnet 2018-03-17 -> 2018-04-17 + - libiconv 1.15-3 -> 1.15-4 + - libsigcpp 2.10 -> 2.10-1 + - libtorrent 1.1.6 -> 1.1.6-1 + - libuuid 1.0.3 -> 1.0.3-1 + - libzip rel-1-5-0 -> rel-1-5-1 + - llvm 5.0.1 -> 6.0.0 + - magnum 2018.02-1 -> 2018.02-2 + - magnum-plugins 2018.02-1 -> 2018.02-2 + - nuklear 2018-04-05 -> 2018-04-17 + - openssl 1.0.2o-1 -> 1.0.2o-2 + - openvr 1.0.13 -> 1.0.14 + - parson 2018-03-23 -> 2018-04-17 + - protobuf 3.5.1-1 -> 3.5.1-3 + - pugixml 1.8.1-3 -> 1.9-1 + - realsense2 2.10.1 -> 2.10.1-1 + - rs-core-lib 2018-04-05 -> 2018-04-12 + - sol 2.18.7 -> 2.19.5 + - sqlite3 3.21.0-1 -> 3.23.0 + - thrift 2018-04-05 -> 2018-04-17 + - tinyxml2 6.0.0-2 -> 6.2.0 + - unicorn-lib 2018-03-13 -> 2018-04-09 + - uwebsockets 0.14.6-1 -> 0.14.7-1 + - wt 4.0.2 -> 4.0.3 + - x264 152-e9a5903edf8ca59 -> 152-e9a5903edf8ca59-1 + - yoga 1.7.0-1 -> 1.8.0-1 + - zeromq 2018-04-05 -> 2018-04-17 + * Bump required version & auto-downloaded version of `nuget` to 4.6.2 + * Bump required version & auto-downloaded version of `vswhere` to 2.4.1 + * `vcpkg edit` improvements + - '--all' now will open both the buildtrees dir and the package dir + - Allow multiple ports to be specified as arguments + +-- vcpkg team MON, 23 Apr 2018 19:00:00 -0800 + + +vcpkg (0.0.108) +-------------- + * Add ports: + - google-cloud-cpp 0.1.0 + - mhook 2.5.1-1 + - mosquitto 1.4.15 + - pmdk 1.4-1 (renamed from nvml) + * Remove Ports: + - nvml 1.3-0 (renamed to pmdk) + * Update ports: + - abseil 2018-03-23 -> 2018-04-05 + - asio 1.12.0-1 -> 1.12.0-2 + - aws-sdk-cpp 1.4.21 -> 1.4.30-1 + - azure-c-shared-utility 1.0.0-pre-release-1.0.9 -> 1.1.2 + - azure-iot-sdk-c 1.0.0-pre-release-1.0.9 -> 1.2.2 + - azure-uamqp-c 1.0.0-pre-release-1.0.9 -> 1.2.2 + - azure-umqtt-c 1.0.0-pre-release-1.0.9 -> 1.1.2 + - breakpad 2018-03-13 -> 2018-04-05 + - clara 2018-03-23 -> 2018-04-02 + - cryptopp 5.6.5-1 -> 6.1.0-2 + - discord-rpc 3.1.0 -> 3.2.0 + - dlib 19.10 -> 19.10-1 + - eastl 3.08.00 -> 3.09.00 + - exiv2 2018-03-23 -> 2018-04-05 + - folly 2017.11.27.00-3 -> 2018.03.19.00-2 + - forest 4.5.0 -> 7.0.1 + - gdcm2 2.8.5 -> 2.8.6 + - grpc 1.10.0 -> 1.10.1 + - gtest 1.8.0-7 -> 1.8.0-8 + - libiconv 1.15-2 -> 1.15-3 + - libuv 1.19.2 -> 1.20.0 + - libvpx 1.6.1-2 -> 1.7.0 + - libxml2 2.9.4-4 -> 2.9.4-5 + - nuklear 2018-03-23 -> 2018-04-05 + - openimageio 1.8.9 -> 1.8.10 + - openssl 1.0.2n-3 -> 1.0.2o-1 + - qt5-base 5.9.2-5 -> 5.9.2-6 + - qt5-modularscripts 2 -> 3 + - qwt 6.1.3-4 -> 6.1.3-5 + - recast 1.5.1 -> 1.5.1-1 + - rocksdb 5.11.3 -> 5.12.2 + - rs-core-lib 2018-03-17 -> 2018-04-05 + - sciter 4.1.4 -> 4.1.5 + - tbb 2018_U2 -> 2018_U3 + - tesseract 3.05.01-2 -> 3.05.01-3 + - theia 0.7-d15154a-1 -> 0.7-d15154a-3 + - thrift 2018-03-23 -> 2018-04-05 + - unrar 5.5.8 -> 5.5.8-1 + - yoga 1.7.0 -> 1.7.0-1 + - zeromq 2018-03-23 -> 2018-04-05 + * `vcpkg.cmake`: Remove detection for Windows SDK. Let `cmake` detect it instead. + * Rework `vcpkgTools.xml`. + - `` renamed to `` + - `` renamed `` + - `` changed to `` + - `` tags now specify an `os="x"` property + - The version of the tools list (i.e. ``) is now verified by `vcpkg.exe`. + * Use [7zip](https://www.7-zip.org/) to extract vcpkg tools defined in `vcpkgTools.xml`. + * Use [aria2](https://aria2.github.io/) to download vcpkg tools defined in `vcpkgTools.xml`. + - The experimental flag `vcpkg install --x-use-aria2` allows you to use `aria2` for other downloads as well. + * `vckg hash` improvements + +-- vcpkg team FRI, 06 Apr 2018 19:30:00 -0800 + + +vcpkg (0.0.107) +-------------- + * Add ports: + - azmq 1.0.2 + - azure-c-shared-utility 1.0.0-pre-release-1.0.9 + - azure-iot-sdk-c 1.0.0-pre-release-1.0.9 + - azure-uamqp-c 1.0.0-pre-release-1.0.9 + - azure-uhttp-c 2018-02-09 + - azure-umqtt-c 1.0.0-pre-release-1.0.9 + - bitserializer 0.7 + - caf 0.15.7 + - fmem c-libs-2ccee3d2fb + - gherkin-c c-libs-e63e83104b + - librsync 2.0.2 + - libuuid 1.0.3 + - mpark-variant 1.3.0 + - nanomsg 1.1.2 + - nvml 1.3-0 + - nvtt 2.1.0 + - openvpn3 2018-03-21 + - parson 2018-03-23 + - plplot 5.13.0-1 + - sqlite-orm 1.1 + - tap-windows6 9.21.2-0e30f5c + * Update ports: + - abseil 2018-03-17 -> 2018-03-23 + - alembic 1.7.6 -> 1.7.7 + - asio 1.12.0 -> 1.12.0-1 + - aubio 0.4.6-1 -> 0.4.6-2 + - aws-sdk-cpp 1.3.58 -> 1.4.21 + - catch2 2.2.1 -> 2.2.1-1 + - ccfits 2.5-1 -> 2.5-2 + - ceres 1.13.0-4 -> 1.14.0-1 + - cfitsio 3.410-1 -> 3.410-2 + - clara 2018-03-11 -> 2018-03-23 + - cpprestsdk 2.10.2 -> 2.10.2-1 + - discord-rpc 3.0.0 -> 3.1.0 + - dlib 19.9-1 -> 19.10 + - eastl 3.07.02 -> 3.08.00 + - exiv2 2018-03-17 -> 2018-03-23 + - ffmpeg 3.3.3-4 -> 3.3.3-5 + - gdcm2 2.8.4 -> 2.8.5 + - harfbuzz 1.7.6 -> 1.7.6-1 + - hpx 1.0.0-8 -> 1.1.0-1 + - lcm 1.3.95 -> 1.3.95-1 + - libpq 9.6.1-1 -> 9.6.1-4 + - libvpx 1.6.1-1 -> 1.6.1-2 + - mpg123 1.25.8-2 -> 1.25.8-4 + - nuklear 2018-03-17 -> 2018-03-23 + - openssl 1.0.2n-2 -> 1.0.2n-3 + - paho-mqtt 1.2.0-2 -> 1.2.0-3 + - plog 1.1.3 -> 1.1.4 + - qt5-quickcontrols 5.9.2-0 -> 5.9.2-1 + - qt5-quickcontrols2 5.9.2-0 -> 5.9.2-1 + - sciter 4.1.3 -> 4.1.4 + - shapelib 1.4.1 -> 1.4.1-1 + - signalrclient 1.0.0-beta1-2 -> 1.0.0-beta1-3 + - soundtouch 2.0.0 -> 2.0.0-1 + - thrift 2018-03-17 -> 2018-03-23 + - unicorn 2018-03-13 -> 2018-03-20 + - zeromq 2018-03-17 -> 2018-03-23 + +-- vcpkg team TUE, 27 Mar 2018 22:00:00 -0800 + + +vcpkg (0.0.106) +-------------- + * Add ports: + - armadillo 8.400.0-1 + - boost-modular-build-helper 2 + - clblas 2.12-1 + - clfft 2.12.2 + - entt 2.4.2-1 + - fastcdr 1.0.6-1 + - gamma gamma-2018-01-27 + - gl3w 8f7f459d + - graphite2 1.3.10 + - ismrmrd 1.3.2-1 + - kealib 1.4.7-1 + - lcm 1.3.95 + - libcds 2.3.2 + - monkeys-audio 4.3.3 + - msix 1.0 + - nmslib 1.7.2 + - opencl 2.2 (2017.07.18) + - openmesh 6.3 + - quirc 1.0-1 + - shogun 6.1.3 + - x264 152-e9a5903edf8ca59 + - x265 2.7-1 + * Update ports: + - abseil 2018-2-5 -> 2018-03-17 + - ace 6.4.6 -> 6.4.7 + - alembic 1.7.5 -> 1.7.6 + - args d8905de -> 2018-02-23 + - asio 1.10.8-1 -> 1.12.0 + - atk 2.24.0-1 -> 2.24.0-2 + - avro-c 1.8.2 -> 1.8.2-1 + - azure-storage-cpp 3.0.0-4 -> 3.2.1 + - benchmark 1.3.0 -> 1.3.0-1 + - boost-build 1.66.0-5 -> 1.66.0-8 + - breakpad 2018-2-19 -> 2018-03-13 + - butteraugli 2017-09-02-8c60a2aefa19adb-1 -> 2018-02-25 + - c-ares 1.13.0-1 -> cares-1_14_0 + - catch-classic 1.12.0 -> 1.12.1 + - catch2 2.1.2 -> 2.2.1 + - cctz 2.1 -> 2.2 + - cgal 4.11-3 -> 4.11.1 + - chakracore 1.7.4 -> 1.8.2 + - chmlib 0.40-1 -> 0.40-2 + - cimg 2.1.8 -> 221 + - clara 2017-07-20-9661f2b4a50895d52ebb4c59382785a2b416c310 -> 2018-03-11 + - console-bridge 0.3.2-2 -> 0.3.2-3 + - coolprop 6.1.0-2 -> 6.1.0-3 + - cpp-redis 4.3.0 -> 4.3.1 + - cpr 1.3.0-1 -> 1.3.0-3 + - curl 7.58.0-1 -> 7_59_0-2 + - devil 1.8.0-1 -> 1.8.0-2 + - directxmesh dec2017 -> feb2018 + - directxtex dec2017 -> feb2018b + - directxtk dec2017 -> feb2018 + - dirent 2017-06-23-5c7194c2fe2c68c1a8212712c0b4b6195382d27d -> 1.23.1 + - discord-rpc 2.1.0 -> 3.0.0 + - doctest 1.2.6 -> 1.2.8 + - eastl 3.05.08 -> 3.07.02 + - evpp 0.6.1-1 -> 0.7.0 + - exiv2 8f5b795eaa4bc414d2d6041c1dbd1a7f7bf1fc99 -> 2018-03-17 + - fdk-aac 2017-11-02-1e351 -> 2018-03-07 + - ffmpeg 3.3.3-2 -> 3.3.3-4 + - freetype 2.8.1-1 -> 2.8.1-3 + - freetype-gl 2017-10-9-82fb152a74f01b1483ac80d15935fbdfaf3ed836 -> 2018-02-25 + - freexl 1.0.4 -> 1.0.4-1 + - g2o 20170730_git-2 -> 20170730_git-3 + - gdal 2.2.2 -> 2.2.2-1 + - gdcm2 2.8.3 -> 2.8.4 + - geogram 1.4.9-1 -> 1.6.0-1 + - gflags 2.2.1-1 -> 2.2.1-3 + - glib 2.52.3-1 -> 2.52.3-2 + - glslang 3a21c880500eac21cdf79bef5b80f970a55ac6af-1 -> 2018-03-02 + - grpc 1.8.3 -> 1.10.0 + - gsl 2.4-2 -> 2.4-3 + - gsl-lite 0.26.0 -> 0.28.0 + - gtest 1.8.0-6 -> 1.8.0-7 + - halide release_2017_10_30 -> release_2018_02_15 + - harfbuzz 1.7.4 -> 1.7.6 + - ilmbase 2.2.0-1 -> 2.2.1-1 + - jansson 2.11 -> 2.11-2 + - jsoncpp 1.8.1-1 -> 1.8.4 + - jsonnet 2017-09-02-11cf9fa9f2fe8acbb14b096316006082564ca580 -> 2018-03-17 + - leptonica 1.74.4-2 -> 1.74.4-3 + - libgeotiff 1.4.2-2 -> 1.4.2-3 + - libiconv 1.15-1 -> 1.15-2 + - libjpeg-turbo 1.5.3 -> 1.5.3-1 + - libmysql 5.7.17-3 -> 8.0.4-2 + - libpng 1.6.34-2 -> 1.6.34-3 + - librtmp 2.4 -> 2.4-1 + - libsndfile 1.0.29-6830c42-2 -> 1.0.29-6830c42-3 + - libsodium 1.0.15-1 -> 1.0.16-1 + - libspatialite 4.3.0a-1 -> 4.3.0a-2 + - libssh 0.7.5-1 -> 0.7.5-4 + - libuv 1.18.0 -> 1.19.2 + - libwebp 0.6.1-1 -> 0.6.1-2 + - libwebsockets 2.4.1 -> 2.4.2 + - libxml2 2.9.4-2 -> 2.9.4-4 + - libzip 1.4.0 -> rel-1-5-0 + - live555 2018.01.29 -> 2018.02.28 + - lodepng 2017-09-01-8a0f16afe74a6a-1 -> 2018-02-25 + - luasocket 2017.05.25.5a17f79b0301f0a1b4c7f1c73388757a7e2ed309 -> 2018-02-25 + - lz4 1.8.1.2 -> 1.8.1.2-1 + - magnum-extras 2018.02-1 -> 2018.02-2 + - matio 1.5.10-2 -> 1.5.12 + - mman git-f5ff813 -> git-f5ff813-2 + - ms-gsl 20171204-9d65e74400976b3509833f49b16d401600c7317d -> 2018-03-17 + - msinttypes 2017-06-26-f9e7c5758ed9e3b9f4b2394de1881c704dd79de0 -> 2018-02-25 + - msmpi 8.1 -> 9.0 + - nlohmann-json 3.1.0 -> 3.1.2 + - nuklear 2017-06-15-5c7194c2fe2c68c1a8212712c0b4b6195382d27d -> 2018-03-17 + - ogre 1.10.9-2 -> 1.10.11 + - opencv 3.4.0-3 -> 3.4.1 + - openexr 2.2.0-1 -> 2.2.1-1 + - openimageio 1.7.15-2 -> 1.8.9 + - openjpeg 2.2.0-1 -> 2.3.0 + - pcl 1.8.1-9 -> 1.8.1-10 + - picosha2 2017-09-01-c5ff159b6 -> 2018-02-25 + - piex 2017-09-01-473434f2dd974978b-1 -> 2018-03-13 + - protobuf 3.5.1 -> 3.5.1-1 + - qt5-modularscripts 1 -> 2 + - re2 2017-12-01-1 -> 2018-03-17 + - readosm 1.1.0 -> 1.1.0-1 + - realsense2 2.10.0 -> 2.10.1 + - rocksdb 2017-06-28-18c63af6ef2b9f014c404b88488ae52e6fead03c-1 -> 5.11.3 + - rs-core-lib commit-1ed2dadbda3977b13e5e83cc1f3eeca76b36ebe5 -> 2018-03-17 + - rttr 0.9.5-1 -> 0.9.5-2 + - scintilla 3.7.6 -> 4.0.3 + - sdl2 2.0.7-4 -> 2.0.8-1 + - snappy 1.1.7-1 -> 1.1.7-2 + - spatialite-tools 4.3.0 -> 4.3.0-1 + - spdlog 0.14.0-1 -> 0.16.3 + - spirv-tools 2017.1-dev-7e2d26c77b606b21af839b37fd21381c4a669f23-1 -> 2018.1-1 + - sqlite3 3.21.0 -> 3.21.0-1 + - stb 20170724-9d9f75e -> 2018-03-02 + - thrift 20172805-72ca60debae1d9fb35d9f0085118873669006d7f-2 -> 2018-03-17 + - tiny-dnn 2017-10-09-dd906fed8c8aff8dc837657c42f9d55f8b793b0e -> 2018-03-13 + - tinyxml2 6.0.0 -> 6.0.0-2 + - torch-th 20180131-89ede3ba90c906a8ec6b9a0f4bef188ba5bb2fd8-1 -> 20180131-89ede3ba90c906a8ec6b9a0f4bef188ba5bb2fd8-2 + - unicorn 2017-12-06-bc34c36eaeca0f4fc672015d24ce3efbcc81d6e4-1 -> 2018-03-13 + - unicorn-lib commit-3ffa7fe69a1d0c37fb52a4af61380c5fd84fa5aa -> 2018-03-13 + - uwebsockets 0.14.4-1 -> 0.14.6-1 + - wt 3.3.7-4 -> 4.0.2 + - wtl 9.1 -> 10.0 + - wxwidgets 3.1.0-1 -> 3.1.1 + - yaml-cpp 0.5.4-rc-2 -> 0.6.2 + - zeromq 20170908-18498f620f0f6d4076981ea16eb5760fe4d28dc2-2 -> 2018-03-17 + - zziplib 0.13.62-1 -> 0.13.69 + * Use TLS 1.2 for downloads. + * Tools used by `vcpkg` (`git`, `cmake` etc) are now specified in `scripts\vcpkgTools.xml`. + - Add `7zip` + * Fix various bugs regarding feature packages. Affects `install`, `upgrade` and `export`. + * `vcpkg hash`: Fix bug with whitespace in path. + * Visual Studio detection now properly identifies legacy versions (VS2015). + * Windows SDK detection no longer fails if certain registry keys are not in their expected places. + * Dependency qualifiers now support `!` for inversion. + * Add `VCPKG_DEFAULT_VS_PATH` environment variable. + - `vcpkg` automatically chooses the latest stable version of Visual Studio to use. + - You can now select the desired VS with the `VCPKG_DEFAULT_VS_PATH` environment variable + - You can also select the behavior by specifiying `VCPKG_VISUAL_STUDIO_PATH` in the triplet file (and this takes precedence over the new environment variable) + +-- vcpkg team MON, 19 Mar 2018 19:00:00 -0800 + + +vcpkg (0.0.105) +-------------- + * Add ports: + - breakpad 2018-2-19 + - cartographer 0.3.0-3 + - chipmunk 7.0.2 + - ebml 1.3.5-1 + - intel-mkl 2018.0.1 + - jbig2dec 0.13 + - libgeotiff 1.4.2-2 + - liblo 0.29-1 + - libpng-apng 1.6.34-2 + - magnum-extras 2018.02-1 + - magnum-integration 2018.02-1 + - matroska 1.4.8 + - mman git-f5ff813 + - qt5-graphicaleffects 5.9.2-0 + - qt5-quickcontrols 5.9.2-0 + - qt5-quickcontrols2 5.9.2-0 + - recast 1.5.1 + - tinydir 1.2.3 + - tinytoml 20180219-1 + * Update ports: + - aubio 0.4.6 -> 0.4.6-1 + - aws-sdk-cpp 1.3.15 -> 1.3.58 + - blaze 3.2-3 -> 3.3 + - boost-build 1.66.0-4 -> 1.66.0-5 + - boost-mpi 1.66.0 -> 1.66.0-1 + - catch2 2.1.1 -> 2.1.2 + - ceres 1.13.0-2 -> 1.13.0-4 + - corrade jan2018-1 -> 2018.02-1 + - cuda 8.0-1 -> 9.0 + - draco 0.10.0-1 -> 1.2.5 + - ffmpeg 3.3.3-1 -> 3.3.3-2 + - folly 2017.11.27.00-2 -> 2017.11.27.00-3 + - hpx 1.0.0-7 -> 1.0.0-8 + - jansson 2.10-1 -> 2.11 + - libdisasm 0.23 -> 0.23-1 + - libmupdf 1.11-1 -> 1.12.0 + - magnum jan2018-1 -> 2018.02-1 + - magnum-plugins jan2018-1 -> 2018.02-1 + - opencv 3.4.0-2 -> 3.4.0-3 + - openvr 1.0.12 -> 1.0.13 + - pcre2 10.30-1 -> 10.30-2 + - qt5-base 5.9.2-4 -> 5.9.2-5 + - realsense2 2.9.1 -> 2.10.0 + - sciter 4.1.2 -> 4.1.3 + - suitesparse 4.5.5-3 -> 4.5.5-4 + - szip 2.1.1 -> 2.1.1-1 + - uriparser 0.8.4-1 -> 0.8.5 + * Better handling of `feature packages`. + * Bump required version & auto-downloaded version of `git` to 2.6.2 + +-- vcpkg team TUE, 20 Feb 2018 18:30:00 -0800 + + +vcpkg (0.0.104) +-------------- + * Add ports: + - asmjit 673dcefaa048c5f5a2bf8b85daf8f7b9978d018a + - cccapstone 9b4128ee1153e78288a1b5433e2c06a0d47a4c4e + - crc32c 1.0.5 + - epsilon 0.9.2 + - exprtk 2018.01.01-f32d2b4 + - forest 4.5.0 + - libgta 1.0.8 + - libodb-mysql 2.4.0-1 + - libopenmpt 2017-01-28-cf2390140 + - libudis86 2018-01-28-56ff6c87 + - mujs 25821e6d74fab5fcc200fe5e818362e03e114428 + - muparser 6cf2746 + - openmama 6.2.1-a5a93a24d2f89a0def0145552c8cd4a53c69e2de + - torch-th 20180131-89ede3ba90c906a8ec6b9a0f4bef188ba5bb2fd8-1 + - yara e3439e4ead4ed5d3b75a0b46eaf15ddda2110bb9 + * Update ports: + - abseil 2017-11-10 -> 2018-2-5 + - blosc 1.12.1 -> 1.13.5 + - boost-build 1.66.0-3 -> 1.66.0-4 + - boost-test 1.66.0-1 -> 1.66.0-2 + - catch 2.0.1-1 -> alias + - catch2 2.1.0 -> 2.1.1 + - cgal 4.11-2 -> 4.11-3 + - cpprestsdk 2.10.1-1 -> 2.10.2 + - curl 7.58.0 -> 7.58.0-1 + - dlib 19.9 -> 19.9-1 + - flatbuffers 1.8.0 -> 1.8.0-2 + - freeimage 3.17.0-3 -> 3.17.0-4 + - gflags 2.2.1 -> 2.2.1-1 + - gtest 1.8.0-5 -> 1.8.0-6 + - highfive 1.3 -> 1.5 + - jack2 1.9.12.2 -> 1.9.12 + - libspatialite 4.3.0a -> 4.3.0a-1 + - libwebp 0.6.1 -> 0.6.1-1 + - libzip 1.3.2 -> 1.4.0 + - live555 2017.10.28 -> 2018.01.29 + - mpg123 1.25.8-1 -> 1.25.8-2 + - nghttp2 1.28.0 -> 1.30.0-1 + - nlohmann-json 3.0.1 -> 3.1.0 + - opencv 3.4.0 -> 3.4.0-2 + - opengl 0.0-4 -> 0.0-5 + - openssl 1.0.2n-1 -> 1.0.2n-2 + - openvr 1.0.9 -> 1.0.12 + - poco 1.8.1 -> 1.8.1-1 + - protobuf 3.5.0-1 -> 3.5.1 + - qt5-base 5.9.2-1 -> 5.9.2-4 + - realsense2 2.9.0 -> 2.9.1 + - sciter 4.1.1 -> 4.1.2 + - sobjectizer 5.5.20 -> 5.5.21 + - soundtouch 2.0.0.2 -> 2.0.0 + - strtk 2017.01.02-1e2960f -> 2018.01.01-5579ed1 + * The `configure` step for `release` and `debug` now happen in parallel. + - This can significantly reduce build times for libraries where the `configure` step was a good chunk of the total build time. For example, the total build time for `zlib` drops from ~30sec to ~20sec. + * Fix a few bootstraping issues introduced in previous release (with the clean environment) + +-- vcpkg team WED, 07 Feb 2018 20:30:00 -0800 + + +vcpkg (0.0.103) +-------------- + * `vcpkg upgrade`: Fix issue with any command executing more than 10 transactions with mixed transaction types (install + remove) + +-- vcpkg team WED, 24 Jan 2018 14:30:00 -0800 + + +vcpkg (0.0.102) +-------------- + * Add ports: + - catch-classic 1.12.0 + - catch2 2.1.0 + - cgicc 3.2.19 + - libdisasm 0.23 + - qt5-3d 5.9.2-0 + - qt5-base 5.9.2-1 + - qt5-charts 5.9.2-0 + - qt5-datavis3d 5.9.2-0 + - qt5-declarative 5.9.2-0 + - qt5-gamepad 5.9.2-0 + - qt5-imageformats 5.9.2-0 + - qt5-modularscripts 1 + - qt5-multimedia 5.9.2-0 + - qt5-networkauth 5.9.2-0 + - qt5-scxml 5.9.2-0 + - qt5-serialport 5.9.2-0 + - qt5-speech 5.9.2-0 + - qt5-svg 5.9.2-0 + - qt5-tools 5.9.2-0 + - qt5-virtualkeyboard 5.9.2-0 + - qt5-websockets 5.9.2-0 + - qt5-winextras 5.9.2-0 + - qt5-xmlpatterns 5.9.2-0 + - tre 0.8.0-1 + * Update ports: + - boost-asio 1.66.0 -> 1.66.0-1 + - boost-build 1.66.0 -> 1.66.0-3 + - boost-vcpkg-helpers 3 -> 4 + - corrade jun2017-3 -> jan2018-1 + - curl 7.57.0-1 -> 7.57.0-2 + - date 2.3-c286981b3bf83c79554769df68b27415cee68d77 -> 2.4 + - discord-rpc 2.0.1 -> 2.1.0 + - dlib 19.8 -> 19.9 + - libbson 1.9.0 -> 1.9.2 + - libconfig 1.7.1 -> 1.7.2 + - libjpeg-turbo 1.5.2-2 -> 1.5.3 + - libodb 2.4.0-1 -> 2.4.0-2 + - libogg 1.3.2-cab46b1-3 -> 1.3.3 + - libwebp 0.6.0-2 -> 0.6.1 + - libwebsockets 2.0.0-4 -> 2.4.1 + - lz4 1.8.0-1 -> 1.8.1.2 + - magnum jun2017-6 -> jan2018-1 + - magnum-plugins jun2017-5 -> jan2018-1 + - mongo-c-driver 1.9.0 -> 1.9.2 + - mpg123 1.25.8 -> 1.25.8-1 + - openni2 2.2.0.33-4 -> 2.2.0.33-7 + - osg 3.5.6-1 -> 3.5.6-2 + - poco 1.8.0.1 -> 1.8.1 + - qca 2.2.0-1 -> 2.2.0-2 + - qscintilla 2.10-1 -> 2.10-4 + - qt5 5.8-6 -> 5.9.2-1 + - qwt 6.1.3-2 -> 6.1.3-4 + - sciter 4.1.0 -> 4.1.1 + - sdl2 2.0.7-3 -> 2.0.7-4 + - tiff 4.0.8-1 -> 4.0.9 + - xxhash 0.6.3-1 -> 0.6.4 + * Remove usage of `BITS-transfer`. Use .NET functions (which used to be the fallback if `BITS-transfer` failed) by default. + * Enable the usage of `feature-packages` by default. More info [here](docs/specifications/feature-packages.md). + * Bootstrapping `vcpkg` now happens in a clean environment to avoid issues when building in a VS Developer Prompt among others. + * Update required version & auto-downloaded version of `cmake` to 3.10.2 + * Update required version & auto-downloaded version of `vswhere` to 2.3.2 + +-- vcpkg team TUE, 23 Jan 2018 17:00:00 -0800 + + +vcpkg (0.0.101) +-------------- + * Add ports: + - alac-decoder 0.2 + - args d8905de + - boost-accumulators 1.66.0 + - boost-algorithm 1.66.0 + - boost-align 1.66.0 + - boost-any 1.66.0 + - boost-array 1.66.0 + - boost-asio 1.66.0 + - boost-assert 1.66.0 + - boost-assign 1.66.0 + - boost-atomic 1.66.0 + - boost-beast 1.66.0 + - boost-bimap 1.66.0 + - boost-bind 1.66.0 + - boost-build 1.66.0 + - boost-callable-traits 1.66.0 + - boost-chrono 1.66.0 + - boost-circular-buffer 1.66.0 + - boost-compatibility 1.66.0 + - boost-compute 1.66.0 + - boost-concept-check 1.66.0 + - boost-config 1.66.0 + - boost-container 1.66.0 + - boost-context 1.66.0 + - boost-conversion 1.66.0 + - boost-convert 1.66.0 + - boost-core 1.66.0 + - boost-coroutine 1.66.0 + - boost-coroutine2 1.66.0 + - boost-crc 1.66.0 + - boost-date-time 1.66.0 + - boost-detail 1.66.0 + - boost-disjoint-sets 1.66.0 + - boost-dll 1.66.0 + - boost-dynamic-bitset 1.66.0 + - boost-endian 1.66.0 + - boost-exception 1.66.0 + - boost-fiber 1.66.0 + - boost-filesystem 1.66.0 + - boost-flyweight 1.66.0 + - boost-foreach 1.66.0 + - boost-format 1.66.0 + - boost-function 1.66.0 + - boost-function-types 1.66.0 + - boost-functional 1.66.0 + - boost-fusion 1.66.0 + - boost-geometry 1.66.0 + - boost-gil 1.66.0 + - boost-graph 1.66.0 + - boost-graph-parallel 1.66.0 + - boost-hana 1.66.0 + - boost-heap 1.66.0 + - boost-icl 1.66.0 + - boost-integer 1.66.0 + - boost-interprocess 1.66.0 + - boost-interval 1.66.0 + - boost-intrusive 1.66.0 + - boost-io 1.66.0 + - boost-iostreams 1.66.0 + - boost-iterator 1.66.0 + - boost-lambda 1.66.0 + - boost-lexical-cast 1.66.0 + - boost-local-function 1.66.0 + - boost-locale 1.66.0 + - boost-lockfree 1.66.0 + - boost-log 1.66.0 + - boost-logic 1.66.0 + - boost-math 1.66.0 + - boost-metaparse 1.66.0 + - boost-move 1.66.0 + - boost-mp11 1.66.0 + - boost-mpi 1.66.0 + - boost-mpl 1.66.0 + - boost-msm 1.66.0 + - boost-multi-array 1.66.0 + - boost-multi-index 1.66.0 + - boost-multiprecision 1.66.0 + - boost-numeric-conversion 1.66.0 + - boost-odeint 1.66.0 + - boost-optional 1.66.0 + - boost-parameter 1.66.0 + - boost-phoenix 1.66.0 + - boost-poly-collection 1.66.0 + - boost-polygon 1.66.0 + - boost-pool 1.66.0 + - boost-predef 1.66.0 + - boost-preprocessor 1.66.0 + - boost-process 1.66.0 + - boost-program-options 1.66.0 + - boost-property-map 1.66.0 + - boost-property-tree 1.66.0 + - boost-proto 1.66.0 + - boost-ptr-container 1.66.0 + - boost-python 1.66.0-1 + - boost-qvm 1.66.0 + - boost-random 1.66.0 + - boost-range 1.66.0 + - boost-ratio 1.66.0 + - boost-rational 1.66.0 + - boost-regex 1.66.0 + - boost-scope-exit 1.66.0 + - boost-serialization 1.66.0 + - boost-signals 1.66.0 + - boost-signals2 1.66.0 + - boost-smart-ptr 1.66.0 + - boost-sort 1.66.0 + - boost-spirit 1.66.0 + - boost-stacktrace 1.66.0 + - boost-statechart 1.66.0 + - boost-static-assert 1.66.0 + - boost-system 1.66.0 + - boost-test 1.66.0-1 + - boost-thread 1.66.0 + - boost-throw-exception 1.66.0 + - boost-timer 1.66.0 + - boost-tokenizer 1.66.0 + - boost-tti 1.66.0 + - boost-tuple 1.66.0 + - boost-type-erasure 1.66.0 + - boost-type-index 1.66.0 + - boost-type-traits 1.66.0 + - boost-typeof 1.66.0 + - boost-ublas 1.66.0 + - boost-units 1.66.0 + - boost-unordered 1.66.0 + - boost-utility 1.66.0 + - boost-uuid 1.66.0 + - boost-variant 1.66.0 + - boost-vcpkg-helpers 3 + - boost-vmd 1.66.0 + - boost-wave 1.66.0 + - boost-winapi 1.66.0 + - boost-xpressive 1.66.0 + - brynet 0.9.0 + - chaiscript 6.0.0 + - cimg 2.1.8 + - crow 0.1 + - gainput 1.0.0 + - jack2 1.9.12.2 + - libdatrie 0.2.10-2 + - libgit2 0.26.0 + - libmupdf 1.11-1 + - libpqxx 6.0.0 + - libqrencode 4.0.0-1 + - libsamplerate 0.1.9.0 + - mbedtls 2.6.1 + - nghttp2 1.28.0 + - portmidi 0.217.1 + - re2 2017-12-01-1 + - rs-core-lib commit-1ed2dadbda3977b13e5e83cc1f3eeca76b36ebe5 + - sol 2.18.7 + - soundtouch 2.0.0.2 + - sqlitecpp 2.2 + - tinyexif 1.0.1-1 + - unicorn 2017-12-06-bc34c36eaeca0f4fc672015d24ce3efbcc81d6e4-1 + - unicorn-lib commit-3ffa7fe69a1d0c37fb52a4af61380c5fd84fa5aa + - yoga 1.7.0 + * Update ports: + - ace 6.4.5 -> 6.4.6 + - alembic 1.7.4-1 -> 1.7.5 + - arrow 0.6.0 -> 0.6.0-1 + - asio 1.10.8 -> 1.10.8-1 + - assimp 4.0.1-3 -> 4.1.0-1 + - aubio 0.46 -> 0.4.6 + - aws-sdk-cpp 1.2.4 -> 1.3.15 + - beast v84-1 -> 0 + - blaze 3.2-2 -> 3.2-3 + - bond 7.0.2 -> 7.0.2-1 + - boost 1.65.1-3 -> 1.66.0 + - brotli 1.0.2 -> 1.0.2-1 + - bullet3 2.86.1-1 -> 2.87 + - cgal 4.11 -> 4.11-2 + - cpp-redis 3.5.2-2 -> 4.3.0 + - cpprestsdk 2.10.0 -> 2.10.1-1 + - curl 7.55.1-1 -> 7.57.0-1 + - directxmesh oct2016 -> dec2017 + - directxtex dec2016 -> dec2017 + - directxtk dec2016-1 -> dec2017 + - dlib 19.7 -> 19.8 + - exiv2 4f4add2cdcbe73af7098122a509dff0739d15908 -> 8f5b795eaa4bc414d2d6041c1dbd1a7f7bf1fc99 + - fcl 0.5.0-2 -> 0.5.0-3 + - fftw3 3.3.7-1 -> 3.3.7-2 + - flatbuffers 1.7.1-1 -> 1.8.0 + - fmt 4.0.0-1 -> 4.1.0 + - folly 2017.11.27.00 -> 2017.11.27.00-2 + - gflags 2.2.0-5 -> 2.2.1 + - glm 0.9.8.5 -> 0.9.8.5-1 + - gmime 3.0.2 -> 3.0.5 + - grpc 1.7.2 -> 1.8.3 + - gsl-lite 0.24.0 -> 0.26.0 + - gtest 1.8-1 -> 1.8.0-5 + - harfbuzz 1.6.3-1 -> 1.7.4 + - hdf5 1.10.0-patch1-2 -> 1.10.1-1 + - hpx 1.0.0-5 -> 1.0.0-7 + - imgui 1.52 -> 1.53 + - itk 4.11.0 -> 4.13.0 + - libbson 1.6.2-2 -> 1.9.0 + - libconfig 1.6.0-1 -> 1.7.1 + - libiconv 1.15 -> 1.15-1 + - libkml 1.3.0-1 -> 1.3.0-2 + - librtmp 2.3 -> 2.4 + - libsodium 1.0.15 -> 1.0.15-1 + - libtorrent 1.1.5 -> 1.1.6 + - live555 2017.09.12 -> 2017.10.28 + - llvm 5.0.0-2 -> 5.0.1 + - mongo-c-driver 1.6.2-1 -> 1.9.0 + - mongo-cxx-driver 3.1.1-1 -> 3.1.1-2 + - mpg123 1.24.0-1 -> 1.25.8 + - mpir 3.0.0-3 -> 3.0.0-4 + - ms-gsl 20171104-d10ebc6555b627c9d1196076a78467e7be505987 -> 20171204-9d65e74400976b3509833f49b16d401600c7317d + - nlohmann-json 2.1.1-1 -> 3.0.1 + - opencv 3.3.1-9 -> 3.4.0 + - openimageio 1.7.15-1 -> 1.7.15-2 + - openssl 1.0.2m -> 1.0.2n-1 + - openvdb 5.0.0 -> 5.0.0-1 + - pcl 1.8.1-7 -> 1.8.1-9 + - pybind11 2.2.0 -> 2.2.1 + - python3 3.6.1 -> 3.6.4 + - range-v3 20151130-vcpkg4 -> 20151130-vcpkg5 + - realsense2 2.8.2 -> 2.9.0 + - sciter 4.0.6 -> 4.1.0 + - sdl2-image 2.0.1-3 -> 2.0.2-1 + - sdl2-mixer 2.0.2-1 -> 2.0.2-2 + - sdl2-net 2.0.1-3 -> 2.0.1-4 + - sdl2-ttf 2.0.14-3 -> 2.0.14-4 + - sobjectizer 5.5.19.2-1 -> 5.5.20 + - speex 1.2.0-2 -> 1.2.0-4 + - string-theory 1.6-1 -> 1.7 + - szip 2.1-2 -> 2.1.1 + - tacopie 2.4.1-2 -> 3.2.0 + - tbb 2017_U7 -> 2018_U2 + - tclap 1.2.1 -> 1.2.2 + - thrift 20172805-72ca60debae1d9fb35d9f0085118873669006d7f-1 -> 20172805-72ca60debae1d9fb35d9f0085118873669006d7f-2 + - tinyxml2 5.0.1-1 -> 6.0.0 + - vtk 8.0.1-5 -> 8.1.0-1 + - wt 3.3.7-2 -> 3.3.7-4 + - zeromq 20170908-18498f620f0f6d4076981ea16eb5760fe4d28dc2-1 -> 20170908-18498f620f0f6d4076981ea16eb5760fe4d28dc2-2 + - zstd 1.3.1-1 -> 1.3.3 + * Introduce `vcpkg upgrade` command. This command automatically rebuilds outdated libraries to the latest version. + * `vcpkg list`: Improve output for long triplets + * Update required version & auto-downloaded version of `cmake` to 3.10.1 + +-- vcpkg team WED, 10 Jan 2018 17:00:00 -0800 + + +vcpkg (0.0.100) +-------------- + * Add ports: + - libmspack 0.6 + - scintilla 3.7.6 + - vlpp 0.9.3.1 + * Update ports: + - allegro5 5.2.2.0-1 -> 5.2.3.0 + - benchmark 1.2.0 -> 1.3.0 + - brotli 0.6.0-1 -> 1.0.2 + - chakracore 1.4.3 -> 1.7.4 + - cppunit 1.13.2 -> 1.14.0 + - doctest 1.2.0 -> 1.2.6 + - ecm 5.37.0-1 -> 5.40.0 + - expat 2.2.4-2 -> 2.2.5 + - flint 2.5.2 -> 2.5.2-1 + - folly 2017.10.02.00 -> 2017.11.27.00 + - freerdp 2.0.0-rc0~vcpkg1-1 -> 2.0.0-rc1~vcpkg1 + - libtorrent 1.1.4-1 -> 1.1.5 + - libuv 1.16.1 -> 1.18.0 + - libzip 1.2.0-2 -> 1.3.2 + - log4cplus REL_1_2_1-RC2-1 -> REL_2_0_0-RC2 + - mpfr 3.1.6-1 -> 3.1.6-2 + - nana 1.5.4-1 -> 1.5.5 + - poco 1.7.8-2 -> 1.8.0.1 + - pugixml 1.8.1-2 -> 1.8.1-3 + - sciter 4.0.4 -> 4.0.6 + - speex 1.2.0-1 -> 1.2.0-2 + * `vcpkg` has exceeded 400 libraries! + * `vcpkg` now supports Tab-Completion/Auto-Completion in Powershell. To enable it, simply run `.\vcpkg integrate powershell` and restart Powershell. + * `vcpkg` now requires the English language pack of Visual Studio to be installed. This is needed because several libraries fail to build in non-English languages, so `vcpkg` sets the build environment to English to bypass these issues. + +-- vcpkg team MON, 04 Dec 2017 17:00:00 -0800 + + +vcpkg (0.0.99) +-------------- + * Add ports: + - avro-c 1.8.2 + - devil 1.8.0-1 + - halide release_2017_10_30 + - librabbitmq 0.8.0 + - openvdb 5.0.0 + - qpid-proton 0.18.1 + - unittest-cpp 2.0.0 + * Update ports: + - alembic 1.7.4 -> 1.7.4-1 + - angle 2017-06-14-8d471f-2 -> 2017-06-14-8d471f-4 + - aubio 0.46~alpha-3 -> 0.46 + - date 2.2 -> 2.3-c286981b3bf83c79554769df68b27415cee68d77 + - fftw3 3.3.7 -> 3.3.7-1 + - grpc 1.7.0 -> 1.7.2 + - imgui 1.51-1 -> 1.52 + - lcms 2.8-3 -> 2.8-4 + - leptonica 1.74.4-1 -> 1.74.4-2 + - leveldb 2017-10-25-8b1cd3753b184341e837b30383832645135d3d73 -> 2017-10-25-8b1cd3753b184341e837b30383832645135d3d73-1 + - libflac 1.3.2-3 -> 1.3.2-4 + - libiconv 1.14-1 -> 1.15 + - libsndfile 1.0.29-6830c42-1 -> 1.0.29-6830c42-2 + - libssh2 1.8.0-2 -> 1.8.0-3 + - llvm 5.0.0-1 -> 5.0.0-2 + - mpfr 3.1.6 -> 3.1.6-1 + - ogre 1.9.0-1 -> 1.10.9-2 + - opencv 3.3.1-7 -> 3.3.1-9 + - opengl 0.0-3 -> 0.0-4 + - pcl 1.8.1-4 -> 1.8.1-7 + - protobuf 3.4.1-2 -> 3.5.0-1 + - qhull 2015.2-1 -> 2015.2-2 + - realsense2 2.8.1 -> 2.8.2 + - redshell 1.0.0 -> 1.1.2 + - sdl2 2.0.7-1 -> 2.0.7-3 + - string-theory 1.6 -> 1.6-1 + - tesseract 3.05.01-1 -> 3.05.01-2 + * `vcpkg` now autodetects CMake usage information in libraries and displays it after install + * `vcpkg integrate install`: Fix issue that would cause failure with unicode usernames + * Introduce experimental support for `VCPKG_BUILD_TYPE`. Adding `set(VCPKG_BUILD_TYPE release)` in a triplet: will cause *most* ports to only build release + * `vcpkg` now compiles inside WSL + * Update required version & auto-downloaded version of `cmake` to 3.10.0 + +-- vcpkg team SAT, 26 Nov 2017 03:30:00 -0800 + + +vcpkg (0.0.97) +-------------- + * Add ports: + - alac 2017-11-03-c38887c5 + - atkmm 2.24.2 + - blosc 1.12.1 + - coolprop 6.1.0-2 + - discord-rpc 2.0.1 + - freetype-gl 2017-10-9-82fb152a74f01b1483ac80d15935fbdfaf3ed836 + - glibmm 2.52.1 + - gtkmm 3.22.2 + - if97 2.1.0 + - luasocket 2017.05.25.5a17f79b0301f0a1b4c7f1c73388757a7e2ed309 + - pangomm 2.40.1 + - realsense2 2.8.1 + - refprop-headers 2017-11-7-882aec454b2bc3d5323b8691736ff09c288f4ed6 + - sfgui 0.3.2-1 + - tidy-html5 5.4.0-1 + * Update ports: + - abseil 2017-10-14 -> 2017-11-10 + - assimp 4.0.1-2 -> 4.0.1-3 + - bond 6.0.0-1 -> 7.0.2 + - catch 1.11.0 -> 2.0.1-1 + - dimcli 2.0.0-1 -> 3.1.1-1 + - dlib 19.4-5 -> 19.7 + - ffmpeg 3.3.3 -> 3.3.3-1 + - fftw3 3.3.6-p12-1 -> 3.3.7 + - freeglut 3.0.0-2 -> 3.0.0-3 + - freetype 2.8-1 -> 2.8.1-1 + - glbinding 2.1.1-2 -> 2.1.1-3 + - glm 0.9.8.4-1 -> 0.9.8.5 + - grpc 1.6.0-2 -> 1.7.0 + - jasper 2.0.13-1 -> 2.0.14-1 + - libpng 1.6.32-1 -> 1.6.34-2 + - libraw 0.18.2-4 -> 0.18.2-5 + - libsigcpp 2.99-1 -> 2.10 + - libuv 1.14.1-1 -> 1.16.1 + - libwebsockets 2.0.0-2 -> 2.0.0-4 + - ms-gsl 20170425-8b320e3f5d016f953e55dfc7ec8694c1349d3fe4 -> 20171104-d10ebc6555b627c9d1196076a78467e7be505987 + - openal-soft 1.18.1-1 -> 1.18.2-1 + - opencv 3.3.1-6 -> 3.3.1-7 + - openssl 1.0.2l-3 -> 1.0.2m + - pcl 1.8.1-3 -> 1.8.1-4 + - sdl2 2.0.6-1 -> 2.0.7-1 + - sdl2-mixer 2.0.1-3 -> 2.0.2-1 + - sqlite-modern-cpp 2.4 -> 3.2 + - vtk 8.0.1-1 -> 8.0.1-5 + - wincrypt 0.0 -> 0.0-1 + - winsock2 0.0 -> 0.0-1 + * MSBuild integration now outputs a warning when configuration is not determinable. + * Fix Powershell execution failures for users of PSCX. PSCX has an `Expand-Archive` cmdlet that has different parameter names than the same-named cmdlet in Powershell 5. + * `vcpkg_from_github()`: Handle '/' in REFs + +-- vcpkg team TUE, 14 Nov 2017 16:00:00 -0800 + + +vcpkg (0.0.96) +-------------- + * Add ports: + - arb 2.11.1 + - fdk-aac 2017-11-02-1e351 + - flint 2.5.2 + - itk 4.11.0 + - libaiff 5.0 + * Update ports: + - antlr4 4.6-1 -> 4.7 + - apr 1.6.2-1 -> 1.6.3 + - double-conversion 3.0.0-1 -> 3.0.0-2 + - flann 1.9.1-6 -> 1.9.1-7 + - opencv 3.3.1-4 -> 3.3.1-6 + - protobuf 3.4.1-1 -> 3.4.1-2 + * `vcpkg help`: Add help topics for commands. For example `vcpkg help install` + * `vcpkg` now downloads in a temp directory; after the download is complete, the file is moved to the destination. This avoids issues with hash mismatch on partially downloaded files. + * Update required version & auto-downloaded version of `cmake` to 3.9.5 + * Update required version & auto-downloaded version of `vswhere` to 2.2.11 + +-- vcpkg team WED, 03 Nov 2017 18:45:00 -0800 + + +vcpkg (0.0.95) +-------------- + * Update ports: + - assimp 4.0.1 -> 4.0.1-2 + - blaze 3.2-1 -> 3.2-2 + - boost 1.65.1-2 -> 1.65.1-3 + - catch 1.10.0 -> 1.11.0 + - libharu 2017-08-15-d84867ebf9f-2 -> 2017-08-15-d84867ebf9f-4 + - libsndfile libsndfile-1.0.29-6830c42-1 -> 1.0.29-6830c42-1 + - opencv 3.3.1 -> 3.3.1-4 + - pcl 1.8.1-2 -> 1.8.1-3 + - poco 1.7.8-1 -> 1.7.8-2 + - signalrclient 1.0.0-beta1-1 -> 1.0.0-beta1-2 + - vtk 8.0.0-3 -> 8.0.1-1 + - xlnt 1.1.0-1 -> 1.2.0-1 + * Various improvements in `vcpkg` when obtaining data from `PowerShell` scripts. It should now be more robust + * Fix Windows 7 (i.e. `PowerShell 2.0`) issues in `PowerShell` scripts + * Fix an issue with `feature packages` where an installed package would appear to be uninstalled if a feature of the package was installed and then uninstalled + * Bump required version & auto-downloaded version of `git` to 2.5.0 + +-- vcpkg team WED, 01 Nov 2017 15:30:00 -0800 + + +vcpkg (0.0.94) +-------------- + * Add ports: + - capstone 3.0.5-rc3 + - cgal 4.11 + - gettimeofday 2017-10-14-2 + - gmime 3.0.2 + - leveldb 2017-10-25-8b1cd3753b184341e837b30383832645135d3d73 + - rpclib 2.2.0 + * Update ports: + - alembic 1.7.1-4 -> 1.7.4 + - blaze 3.2 -> 3.2-1 + - boost 1.65.1-1 -> 1.65.1-2 + - ceres 1.13.0-1 -> 1.13.0-2 + - cpprestsdk 2.9.0-4 -> 2.10.0 + - cppwinrt spring_2017_creators_update_for_vs_15.3 -> fall_2017_creators_update_for_vs_15.3-2 + - cppzmq 4.2.1 -> 4.2.2 + - eigen3 3.3.4-1 -> 3.3.4-2 + - gdcm2 2.6.8-1 -> 2.8.3 + - harfbuzz 1.4.6-2 -> 1.6.3-1 + - libjpeg-turbo 1.5.2-1 -> 1.5.2-2 + - libmariadb 2.3.2-1 -> 3.0.2 + - libmysql 5.7.17-2 -> 5.7.17-3 + - live555 2017.06.04-1 -> 2017.09.12 + - mpir 3.0.0-2 -> 3.0.0-3 + - opencv 3.3.0-4 -> 3.3.1 + - pangolin 0.5-2 -> 0.5-3 + - pugixml 1.8.1-1 -> 1.8.1-2 + - secp256k1 2017-19-10-0b7024185045a49a1a6a4c5615bf31c94f63d9c4 -> 2017-19-10-0b7024185045a49a1a6a4c5615bf31c94f63d9c4-1 + - smpeg2 2.0.0-2 -> 2.0.0-3 + - sqlite3 3.20.1 -> 3.21.0 + * Bump required version & auto-downloaded version of `git` to 2.4.3 + +-- vcpkg team FRI, 27 Oct 2017 19:30:00 -0800 + + +vcpkg (0.0.93) +-------------- + * Add ports: + - berkeleydb 4.8.30 + - libsodium 1.0.15 + - secp256k1 2017-19-10-0b7024185045a49a1a6a4c5615bf31c94f63d9c4 + * Update ports: + - assimp 4.0.0-2 -> 4.0.1 + - azure-storage-cpp 3.0.0-3 -> 3.0.0-4 + - cctz v2.1 -> 2.1 + - folly v2017.07.17.01-1 -> 2017.10.02.00 + - grpc 1.6.0-1 -> 1.6.0-2 + - openblas v0.2.20-2 -> 0.2.20-2 + - pthreads 2.9.1-1 -> 2.9.1-2 + - sdl2-gfx 1.0.3-2 -> 1.0.3-3 + - sdl2-image 2.0.1-2 -> 2.0.1-3 + - sdl2-mixer 2.0.1-2 -> 2.0.1-3 + - sdl2-net 2.0.1-2 -> 2.0.1-3 + - sdl2-ttf 2.0.14-2 -> 2.0.14-3 + - spirv-tools v2017.1-dev-7e2d26c77b606b21af839b37fd21381c4a669f23-1 -> 2017.1-dev-7e2d26c77b606b21af839b37fd21381c4a669f23-1 + - thor v2.0-1 -> 2.0-1 + - tinyexr v0.9.5-d16ea6 -> 0.9.5-d16ea6 + * Fix issue where `vcpkg` was getting output from powershell scripts. Powershell adds newlines when the console width is reached; the extra newlines was causing `vcpkg`'s parsing to fail. + * Improve autocomplete/tab-completion for powershell (still experimental) + +-- vcpkg team THU, 19 Oct 2017 21:30:00 -0800 + + +vcpkg (0.0.92) +-------------- + * Add ports: + - cctz v2.1 + - celero 2.1.0-1 + - eastl 3.05.08 + - imgui 1.51-1 + - libidn2 2.0.4 + - mozjpeg 3.2-1 + - spatialite-tools 4.3.0 + - string-theory 1.6 + - tiny-dnn 2017-10-09-dd906fed8c8aff8dc837657c42f9d55f8b793b0e + - wincrypt 0.0 + - winsock2 0.0 + * Update ports: + - abseil 2017-09-28 -> 2017-10-14 + - boost 1.65.1 -> 1.65.1-1 + - cpprestsdk 2.9.0-3 -> 2.9.0-4 + - gdal 1.11.3-5 -> 2.2.2 + - jansson v2.10-1 -> 2.10-1 + - lua 5.3.4-2 -> 5.3.4-4 + - mpfr 3.1.5-1 -> 3.1.6 + - ogre 1.9.0 -1 -> 1.9.0-1 + - openni2 2.2.0.33-2 -> 2.2.0.33-4 + - pcl 1.8.1-1 -> 1.8.1-2 + - sciter 4.0.3 -> 4.0.4 + - vtk 8.0.0-2 -> 8.0.0-3 + - websocketpp 0.7.0 -> 0.7.0-1 + * Initial support for autocomplete/tab-completion for powershell (still experimental) + * Add `VCPKG_CHAINLOAD_TOOLCHAIN_FILE variable`. As the name suggests, you can chainload your own toolchain file along with the `vcpkg` toolchain file. + * Fix issues with the new Visual Studio detection ([`vswhere.exe`](https://github.com/Microsoft/vswhere)). Notably: + - Detect VS2015 BuildTools, VS2017 BuildTools and VS Express Edition + * Fix issues with Windows SDK detection + * Rework acquisition of `vcpkg` dependencies (e.g. `cmake`, `git`). It is now more robust and should be faster on modern Operating Systems while still having fallback functions for older ones. + * Bump required version & auto-downloaded version of `cmake` to 3.9.4 + * Bump required version & auto-downloaded version of `nuget` to 4.4.0 + * Bump required version & auto-downloaded version of `vswhere` to 2.2.7 + * Bump required version & auto-downloaded version of `git` to 2.4.2(.3) + * Bump ninja to version 1.8.0 + +-- vcpkg team TUE, 17 Oct 2017 16:00:00 -0800 + + +vcpkg (0.0.91) +-------------- + * Add ports: + - abseil 2017-09-28 + - enet 1.3.13 + - exiv2 4f4add2cdcbe73af7098122a509dff0739d15908 + - freexl 1.0.4 + - gts 0.7.6 + - kinectsdk2 2.0 + - libexif 0.6.21-1 + - libfreenect2 0.2.0 + - librtmp 2.3 + - libspatialite 4.3.0a + - libxmp-lite 4.4.1 + - proj4 4.9.3-1 + - readosm 1.1.0 + - spirit-po 1.1.2 + - telnetpp 1.2.4 + - wildmidi 0.4.1 + * Update ports: + - anax 2.1.0-2 -> 2.1.0-3 + - aws-sdk-cpp 1.0.61-1 -> 1.2.4 + - geos 3.5.0-1 -> 3.6.2-2 + - kinectsdk1 1.8-1 -> 1.8-2 + - lua 5.3.4-1 -> 5.3.4-2 + - openni2 2.2.0.33 -> 2.2.0.33-2 + - openssl 1.0.2l-2 -> 1.0.2l-3 + - pangolin 0.5-1 -> 0.5-2 + - proj 4.9.3-1 -> 0 + - sdl2 2.0.5-4 -> 2.0.6-1 + - zlib 1.2.11-2 -> 1.2.11-3 + * `vcpkg export`: Add new option `--ifw` which creates a standalone GUI installer for the exported packages. More information and screenshots [here](https://github.com/Microsoft/vcpkg/pull/1734) + * Complete rework of Visual Studio detection & selection: + - Use [`vswhere.exe`](https://github.com/Microsoft/vswhere) to detect Visual Studio installation instances + - Add the ability to specify the Visual Studio instance to use in the triplet file with the `VCPKG_VISUAL_STUDIO_PATH` variable + - Automatic selection now picks instances in order: stable, prerelease, legacy. Within each group, newer versions are preferred over old versions + - Fix issue where v140 toolset would not work if VS2017 (with v140) was installed but VS2015 was not installed + * Add message when downloading a `vcpkg` dependency (e.g. `cmake`) + +-- vcpkg team THU, 05 Oct 2017 19:00:00 -0800 + + +vcpkg (0.0.90) +-------------- + * Add ports: + - caffe2 0.8.1 + - date 2.2 + - jsonnet 2017-09-02-11cf9fa9f2fe8acbb14b096316006082564ca580 + - kf5plotting 5.37.0 + - units 2.3.0 + - winpcap 4.1.3-1 + * Update ports: + - arrow apache-arrow-0.4.0-2 -> 0.6.0 + - benchmark 1.1.0-1 -> 1.2.0 + - cppwinrt feb2017_refresh-14393 -> spring_2017_creators_update_for_vs_15.3 + - llvm 4.0.0-1 -> 5.0.0-1 + - luafilesystem 1.6.3-1 -> 1.7.0.2 + - opencv 3.2.0-4 -> 3.3.0-4 + - paho-mqtt 1.2.0-1 -> 1.2.0-2 + - protobuf 3.4.0-2 -> 3.4.1-1 + - qt5 5.8-5 -> 5.8-6 + - sfml 2.4.2-1 -> 2.4.2-2 + - xlnt 0.9.4-1 -> 1.1.0-1 + - zlib 1.2.11-1 -> 1.2.11-2 + * Bump required version & auto-downloaded version of `cmake` to 3.9.3 (was 3.9.1). Noteable changes: + - Fix codepage issues + - FindBoost: Add support for Boost 1.65.0 and 1.65.1 + * `vcpkg edit`: Fix inspected locations for VSCode + +-- vcpkg team SUN, 24 Sep 2017 03:30:00 -0800 + + +vcpkg (0.0.89) +-------------- + * Update ports: + - boost 1.65-1 -> 1.65.1 + - chmlib 0.40 -> 0.40-1 + - pybind11 2.1.0-2 -> 2.2.0 + - sciter 4.0.2-1 -> 4.0.3 + - sqlite3 3.19.1-2 -> 3.20.1 + * `vcpkg` now warns if the built version of the `vcpkg.exe` itself is outdated + * Update to latest python 3.5 + * `vcpkg install` improvements: + - Add `--keep-going` option to keep going if a package fails to install + - Add elapsed time to each invidial package as well as total time + - Add a counter to the install (e.g. Starting package 3/12: ) + * `vcpkg edit` now checks more location for VSCode Insiders + +-- vcpkg team WED, 14 Sep 2017 16:00:00 -0800 + + +vcpkg (0.0.88) +-------------- + * `vcpkg_configure_cmake` has been modified to embed debug symbols within static libraries (using the /Z7 option). Most of the libraries in `vcpkg` had their versions bumped due to this. + * `vcpkg_configure_meson` has been modified in the same manner. + +-- vcpkg team SAT, 09 Sep 2017 00:30:00 -0800 + + +vcpkg (0.0.87) +-------------- + * Add ports: + - console-bridge 0.3.2-1 + - leptonica 1.74.4 + - tesseract 3.05.01 + - urdfdom 1.0.0-1 + - urdfdom-headers 1.0.0-1 + * Update ports: + - ace 6.4.4 -> 6.4.5 + - c-ares 1.12.1-dev-40eb41f-1 -> 1.13.0 + - glslang 1c573fbcfba6b3d631008b1babc838501ca925d3-2 -> 3a21c880500eac21cdf79bef5b80f970a55ac6af + - grpc 1.4.1 -> 1.6.0 + - libuv 1.14.0 -> 1.14.1 + - meschach -> 1.2b + - openblas v0.2.20 -> v0.2.20-1 + - openssl 1.0.2l-1 -> 1.0.2l-2 + - protobuf 3.3.0-3 -> 3.4.0-1 + - qt5 5.8-4 -> 5.8-5 + - shaderc 2df47b51d83ad83cbc2e7f8ff2b56776293e8958-1 -> 12fb656ab20ea9aa06e7084a74e5ff832b7ce2da + - spirv-tools 1.1-f72189c249ba143c6a89a4cf1e7d53337b2ddd40 -> v2017.1-dev-7e2d26c77b606b21af839b37fd21381c4a669f23 + - xxhash 0.6.2 -> 0.6.3 + - zeromq 4.2.2 -> 20170908-18498f620f0f6d4076981ea16eb5760fe4d28dc2 + * Add new function `vcpkg_from_bitbucket` which the Bitbucket equivalent of `vcpkg_from_github` + +-- vcpkg team FRI, 08 Sep 2017 22:00:00 -0800 + + +vcpkg (0.0.86) +-------------- + * Add ports: + - bigint 2010.04.30 + - butteraugli 2017-09-02-8c60a2aefa19adb + - ccd 2.0.0-1 (Renamed from libccd) + - fadbad 2.1.0 + - fcl 0.5.0-1 + - guetzli 2017-09-02-cb5e4a86f69628 + - gumbo 0.10.1 + - libmicrohttpd 0.9.55 + - libstemmer 2017-9-02 + - libunibreak 4.0 + - lodepng 2017-09-01-8a0f16afe74a6a + - meschach + - nlopt 2.4.2-c43afa08d~vcpkg1 + - picosha2 2017-09-01-c5ff159b6 + - piex 2017-09-01-473434f2dd974978b + - pthreads 2.9.1 + - tinythread 1.1 + - tinyxml 2.6.2-1 + * Removed ports: + - libccd 2.0.0 (Renamed to ccd) + * Update ports: + - ace 6.4.3 -> 6.4.4 + - boost 1.65 -> 1.65-1 + - cairo 1.15.6 -> 1.15.8 + - gdk-pixbuf 2.36.6 -> 2.36.9 + - glib 2.52.2 -> 2.52.3 + - gtk 3.22.15 -> 3.22.19 + - jxrlib 1.1-2 -> 1.1-3 + - paho-mqtt Version 1.1.0 (Paho 1.2) -> 1.2.0 + - pango 1.40.6 -> 1.40.11 + - shaderc 2df47b51d83ad83cbc2e7f8ff2b56776293e8958 -> 2df47b51d83ad83cbc2e7f8ff2b56776293e8958-1 + * Fix warnings in bootstrap-vcpkg.ps1 + * Fix codepage related issues with ninja/cmake + * Improve handling for non-ascii environments + * Configurations names are now more tolerant: + - If a configuration name is prefixed with "Release", then it is compatible with "Release" + - If a configuration name is prefixed with "Debug", then it is compatible with "Debug" + * `vcpkg edit`: Improve detection of VSCode and add better messages when no path is found + * Fixes and improvements in the `vcpkg` tool itself + +-- vcpkg team MON, 04 Sep 2017 02:00:00 -0800 + + +vcpkg (0.0.85) +-------------- + * Add ports: + - ccfits 2.5 + - highfive 1.3 + - lzfse 1.0 + - pangolin 0.5 + - rhash 1.3.5 + - speexdsp 1.2rc3-1 + - unrar 5.5.8 + * Update ports: + - assimp 4.0.0 -> 4.0.0-1 + - catch 1.9.7 -> 1.10.0 + - ctemplate 2017-06-23-44b7c5b918a08ad561c63e9d28beecb40c10ebca -> 2017-06-23-44b7c5-2 + - curl 7.55.0 -> 7.55.1 + - ecm 5.32.0 -> 5.37.0 + - expat 2.1.1-1 -> 2.2.4-1 + - ffmpeg 3.2.4-3 -> 3.3.3 + - gl2ps OpenGL to PostScript Printing Library -> 1.4.0 + - jsoncpp 1.7.7 -> 1.8.1 + - libp7-baical 4.1 -> 4.4-1 + - libpng 1.6.31 -> 1.6.32 + - libraw 0.18.2-2 -> 0.18.2-3 + - libsigcpp 2.10 -> 2.99 + - snappy 1.1.6-be6dc3d -> 1.1.7 + * `vcpkg edit`: Add new option `--builtrees`; opens editor in buildtrees directory for examining build issues + * Improve Windows SDK support (contract version detection) + * Improve handling for non-ascii environments + * Fixes and improvements in the `vcpkg` tool itself + +-- vcpkg team SUN, 27 Aug 2017 22:00:00 -0800 + + +vcpkg (0.0.84) +-------------- + * Add ports: + - cfitsio 3.410 + - chmlib 0.40 + - gl2ps OpenGL to PostScript Printing Library + - libharu 2017-08-15-d84867ebf9f-1 + - mpfr 3.1.5 + - sophus 1.0.0 + * Update ports: + - allegro5 5.2.1.0 -> 5.2.2.0 + - blaze 3.1 -> 3.2 + - boost 1.64-5 -> 1.65 + - curl 7.51.0-3 -> 7.55.0 + - flann 1.9.1-4 -> 1.9.1-5 + - gdal 1.11.3-4 -> 1.11.3-5 + - glew 2.0.0-2 -> 2.1.0 + - lcms 2.8-1 -> 2.8-2 + - libogg 2017-07-27-cab46b19847 -> 1.3.2-cab46b1-2 + - libuv 1.13.1 -> 1.14.0 + - lz4 1.7.5 -> 1.8.0 + - pcre2 10.23 -> 10.30 + - spdlog 0.13.0 -> 0.14.0 + - zstd 1.3.0 -> 1.3.1 + * Bump required version & auto-downloaded version of `git` to 2.14.1 (due to a security vulnerability) + * Show more information when there are issues acquiring `vcpkg` tool dependencies (`git`, `cmake`, `nuget`) + * Remove download prompts for cmake/git. The prompts were causing a lot of issues for users and especially CI builds + * `vcpkg edit`: Fix detection of 64-bit VSCode + * Fixes and improvements in the `vcpkg` tool itself + +-- vcpkg team TUE, 22 Aug 2017 13:00:00 -0800 + + +vcpkg (0.0.83) +-------------- + * Add ports: + - fuzzylite 6.0 + - jemalloc 4.3.1-1 + - libkml 1.3.0 + - pcl 1.8.1 + - plog 1.1.3 + * Update ports: + - catch 1.9.6 -> 1.9.7 + - ceres 1.12.0-4 -> 1.13.0 + - cpp-redis 3.5.2 -> 3.5.2-1 + - gdal 1.11.3-3 -> 1.11.3-4 + - graphicsmagick 1.3.26 -> 1.3.26-1 + - hypre 2.11.1 -> 2.11.2 + - libtheora 1.1.1 -> 1.2.0alpha1-20170719~vcpkg1 + - minizip 1.2.11 -> 1.2.11-1 + - openblas v0.2.19-2 -> v0.2.20 + - openjpeg 2.1.2-2 -> 2.2.0 + - physfs 2.0.3 -> 2.0.3-1 + - stb 1.0 -> 20170724-9d9f75e + - uwebsockets 0.14.3 -> 0.14.4 + - vtk 7.1.1-1 -> 8.0.0-1 + - yaml-cpp 0.5.4 candidate -> 0.5.4-rc-1 + * Bump required version & auto-downloaded version of `cmake` to 3.9.1 (was 3.9.0) + * Fixes and improvements in the `vcpkg` tool itself + +-- vcpkg team FRI, 11 Aug 2017 12:00:00 -0800 + + +vcpkg (0.0.82) +-------------- + * Add ports: + - alembic 1.7.1-3 + - allegro5 5.2.1.0 + - angle 2017-06-14-8d471f-1 + - apr-util 1.6.0 + - arrow apache-arrow-0.4.0-1 + - aubio 0.46~alpha-2 + - aurora 2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933 + - benchmark 1.1.0 + - blaze 3.1 + - brotli 0.6.0 + - c-ares 1.12.1-dev-40eb41f-1 + - ceres 1.12.0-4 + - clara 2017-07-20-9661f2b4a50895d52ebb4c59382785a2b416c310 + - corrade jun2017-2 + - cpp-redis 3.5.2 + - cppcms 1.1.0 + - cppunit 1.13.2 + - cpr 1.3.0 + - ctemplate 2017-06-23-44b7c5b918a08ad561c63e9d28beecb40c10ebca + - cunit 2.1.3-1 + - cxxopts 1.3.0 + - dirent 2017-06-23-5c7194c2fe2c68c1a8212712c0b4b6195382d27d + - draco 0.10.0 + - duktape 2.0.3-3 + - embree 2.16.4-1 + - evpp 0.6.1 + - flann 1.9.1-4 + - folly v2017.07.17.01 + - g2o 20170730_git-1 + - geogram 1.4.9 + - gsl-lite 0.24.0 + - hpx 1.0.0-4 + - hunspell 1.6.1-1 + - hwloc 1.11.7-1 + - hypre 2.11.1 + - ilmbase 2.2.0 + - jansson v2.10 + - jasper 2.0.13 + - kinectsdk1 1.8-1 + - libconfig 1.6.0 + - libmikmod 3.3.11.1 + - libopusenc 0.1 + - libssh 0.7.5 + - libtorrent 1.1.4 + - libusb 1.0.21-fc99620 + - libusb-win32 1.2.6.0 + - libzip 1.2.0-1 + - live555 2017.06.04 + - llvm 4.0.0 + - lpeg 1.0.1-2 + - luafilesystem 1.6.3 + - luajit 2.0.5 + - magnum jun2017-5 + - magnum-plugins jun2017-4 + - matio 1.5.10-1 + - minizip 1.2.11 + - msinttypes 2017-06-26-f9e7c5758ed9e3b9f4b2394de1881c704dd79de0 + - nuklear 2017-06-15-5c7194c2fe2c68c1a8212712c0b4b6195382d27d + - ode 0.15.1 + - openexr 2.2.0 + - openimageio 1.7.15 + - openni2 2.2.0.33 + - opusfile 0.9 + - osg 3.5.6 + - paho-mqtt Version 1.1.0 (Paho 1.2) + - plibsys 0.0.3 + - podofo 0.9.5 + - ptex 2.1.28 + - pystring 1.1.3 + - python3 3.6.1 + - qhull 2015.2 + - qscintilla 2.10-1 + - redshell 1.0.0 + - rocksdb 2017-06-28-18c63af6ef2b9f014c404b88488ae52e6fead03c + - rtmidi 2.1.1-1 + - rttr 0.9.5 + - sciter 4.0.2-1 + - sdl2-gfx 1.0.3-1 + - snappy 1.1.6-be6dc3d + - sobjectizer 5.5.19.2 + - speex 1.2.0 + - strtk 2017.01.02-1e2960f + - suitesparse 4.5.5-2 + - sundials 2.7.0 + - tacopie 2.4.1-1 + - theia 0.7-d15154a + - thor v2.0 + - thrift 20172805-72ca60debae1d9fb35d9f0085118873669006d7f + - uriparser 0.8.4 + - utf8proc 2.1.0 + - utfz 1.2 + - wxwidgets 3.1.0-1 + * Update ports: + - apr 1.5.2 -> 1.6.2 + - assimp 3.3.1 -> 4.0.0 + - beast 1.0.0-b30 -> v84-1 + - bond 5.3.1 -> 6.0.0 + - boost 1.64-2 -> 1.64-5 + - bzip2 1.0.6 -> 1.0.6-1 + - cairo 1.15.4 -> 1.15.6 + - catch 1.9.1 -> 1.9.6 + - cereal 1.2.1 -> 1.2.2 + - chakracore 1.4.0 -> 1.4.3 + - dimcli 1.0.3 -> 2.0.0 + - dlfcn-win32 1.1.0 -> 1.1.1 + - dlib 19.4-1 -> 19.4-4 + - doctest 1.1.0 -> 1.2.0 + - double-conversion 2.0.1 -> 3.0.0 + - eigen3 3.3.3 -> 3.3.4 + - expat 2.1.1 -> 2.1.1-1 + - ffmpeg 3.2.4-2 -> 3.2.4-3 + - fftw3 3.3.6-p11 -> 3.3.6-p12 + - flatbuffers 1.6.0 -> 1.7.1 + - fltk 1.3.4-2 -> 1.3.4-4 + - fmt 3.0.1-4 -> 4.0.0 + - fontconfig 2.12.1 -> 2.12.4 + - freeglut 3.0.0 -> 3.0.0-1 + - freeimage 3.17.0-1 -> 3.17.0-2 + - freerdp 2.0.0-beta1+android11 -> 2.0.0-rc0~vcpkg1 + - freetype 2.6.3-5 -> 2.8 + - gdcm2 2.6.7 -> 2.6.8 + - gettext 0.19 -> 0.19-1 + - gflags 2.2.0-2 -> 2.2.0-4 + - glew 2.0.0-1 -> 2.0.0-2 + - gli 0.8.2 -> 0.8.2-1 + - glib 2.52.1 -> 2.52.2 + - glm 0.9.8.1 -> 0.9.8.4 + - glog 0.3.4-0472b91-1 -> 0.3.5 + - glslang 1c573fbcfba6b3d631008b1babc838501ca925d3-1 -> 1c573fbcfba6b3d631008b1babc838501ca925d3-2 + - graphicsmagick 1.3.25 -> 1.3.26 + - grpc 1.2.3 -> 1.4.1 + - gsl 2.3 -> 2.4-1 + - gtk 3.22.11 -> 3.22.15 + - harfbuzz 1.4.6 -> 1.4.6-1 + - lcms 2.8 -> 2.8-1 + - libarchive 3.3.1 -> 3.3.2 + - libbson 1.6.2 -> 1.6.2-1 + - libepoxy 1.4.1-7d58fd3 -> 1.4.3 + - libevent 2.1.8-1 -> 2.1.8-2 + - libgd 2.2.4-1 -> 2.2.4-2 + - libjpeg-turbo 1.5.1-1 -> 1.5.2 + - libogg 1.3.2 -> 2017-07-27-cab46b19847 + - libpng 1.6.28-1 -> 1.6.31 + - libraw 0.18.0-1 -> 0.18.2-2 + - libuv 1.10.1-2 -> 1.13.1 + - log4cplus 1.1.3-RC7 -> REL_1_2_1-RC2 + - lzo 2.09 -> 2.10-1 + - msgpack 2.1.1 -> 2.1.5 + - msmpi 8.0-1 -> 8.1 + - nana 1.4.1-66be23c9204c5567d1c51e6f57ba23bffa517a7c -> 1.5.4 + - openal-soft 1.17.2 -> 1.18.1 + - openblas v0.2.19-1 -> v0.2.19-2 + - opencv 3.2.0-1 -> 3.2.0-3 + - openjpeg 2.1.2-1 -> 2.1.2-2 + - openssl 1.0.2k-2 -> 1.0.2l-1 + - openvr 1.0.5 -> 1.0.9 + - opus 1.1.4 -> 1.2.1 + - pango 1.40.5-1 -> 1.40.6 + - pcre 8.40 -> 8.41 + - pdcurses 3.4 -> 3.4-1 + - portaudio 19.0.6.00 -> 19.0.6.00-1 + - protobuf 3.2.0 -> 3.3.0-3 + - pybind11 2.1.0 -> 2.1.0-1 + - qt5 5.8-1 -> 5.8-4 + - qwt 6.1.3-1 -> 6.1.3-2 + - ragel 6.9 -> 6.10 + - range-v3 20150729-vcpkg3 -> 20151130-vcpkg4 + - rxcpp 3.0.0 -> 4.0.0-1 + - sdl2 2.0.5-2 -> 2.0.5-3 + - sdl2-image 2.0.1 -> 2.0.1-1 + - sdl2-mixer 2.0.1 -> 2.0.1-1 + - sdl2-net 2.0.1 -> 2.0.1-1 + - sdl2-ttf 2.0.14 -> 2.0.14-1 + - smpeg2 2.0.0 -> 2.0.0-1 + - spdlog 0.12.0 -> 0.13.0 + - sqlite3 3.18.0-1 -> 3.19.1-1 + - taglib 1.11.1-1 -> 1.11.1-3 + - tbb 20160916 -> 2017_U7 + - think-cell-range e2d3018 -> 498839d + - tiff 4.0.7-1 -> 4.0.8 + - tinyxml2 3.0.0 -> 5.0.1 + - utfcpp 2.3.4 -> 2.3.5 + - uwebsockets 0.14.2 -> 0.14.3 + - vtk 7.1.0 -> 7.1.1-1 + - wt 3.3.7 -> 3.3.7-1 + - zstd 1.1.1 -> 1.3.0 + * `vcpkg` has exceeded 300 libraries! + * Add the following options to `vcpkg export` command: `--nuget-id`, `--nuget-version` + * Improve `vcpkg help`: + - Improve clarity + - Add `vcpkg help ` option (example: `vcpkg help export`) + - Add `vcpkg help topics` option + * `vcpkg search` now also searches in the description of ports + * Documentation has been reworked and is now also available in ReadTheDocs: https://vcpkg.readthedocs.io/ + * Bump required version & auto-downloaded version of `cmake` to 3.9.0 (was 3.8.0) + * Bump required version & auto-downloaded version of `nuget` to 4.1.0 (was 3.5.0) + * Huge number of fixes and improvements in the `vcpkg` tool + +-- vcpkg team MON, 07 Aug 2017 16:00:00 -0800 + + +vcpkg (0.0.81) +-------------- + * Add ports: + - atlmfc 0 + - giflib 5.1.4 + - graphicsmagick 1.3.25 + - libmad 0.15.1 + - libsndfile libsndfile-1.0.29-6830c42 + - ms-gsl 20170425-8b320e3f5d016f953e55dfc7ec8694c1349d3fe4 (**see below) + - taglib 1.11.1-1 + - xalan-c 1.11-1 + * Update ports: + - ace 6.4.2 -> 6.4.3 + - bond 5.2.0 -> 5.3.1 + - boost 1.63-4 -> 1.64-2 + - cppzmq 0.0.0-1 -> 4.2.1 + - gdal 1.11.3-1 -> 1.11.3-3 + - gdk-pixbuf 2.36.5 -> 2.36.6 + - grpc 1.1.2-1 -> 1.2.3 + - gsl 0-fd5ad87bf -> 2.3 (**see below) + - harfbuzz 1.3.4-2 -> 1.4.6 + - icu 58.2-1 -> 59.1-1 + - libflac 1.3.2-1 -> 1.3.2-2 + - libmodplug 0.8.8.5-bb25b05 -> 0.8.9.0 + - pango 1.40.4 -> 1.40.5-1 + - pcre 8.38-1 -> 8.40 + - poco 1.7.6-4 -> 1.7.8 + - qt5 5.7.1-7 -> 5.8-1 + - wt 3.3.6-3 -> 3.3.7 + * The Guidelines Support Library has been renamed from`gsl` to `ms-gsl`. The GNU Scientific Library has been added as `gsl`. + * Introducing `vcpkg export` command: + - Exports one or more installed packages along with their dependencies + - Options for target format: --nuget --7zip --zip --raw (can specify more than one) + - Option `--dry-run`: This will print out the export plan, but will not actually perform the export + - More information and examples [here](https://blogs.msdn.microsoft.com/vcblog/2017/05/03/vcpkg-introducing-export-command/). + * Add `--head` option for `vcpkg install`. It only applies to github-based project and allows you to use the latest master commit + - For example: `./vcpkg install cpprestsdk:x64-windows --head` will build cpprestsdk from the latest master commit instead of version 2.9.0 specified in the `CONTROL` file + * Bump auto-downloaded version of `cmake` to 3.8.0 (was 3.8.0rc1) + * `--options` are now case-insensitive + * `vcpkg` now uses `clang-format` + * Fixes and improvements in the `vcpkg` tool + +-- vcpkg team WED, 03 May 2017 18:00:00 -0800 + + +vcpkg (0.0.80) +-------------- + * Add ports: + - clapack 3.2.1 + - geographiclib 1.47-patch1-3 + - libevent 2.1.8-1 + - mdnsresponder 765.30.11 + - openblas v0.2.19-1 + - picojson 1.3.0 + - sdl2-mixer 2.0.1 + - sdl2-net 2.0.1 + - sdl2-ttf 2.0.14 + * Update ports: + - azure-storage-cpp 3.0.0 -> 3.0.0-2 + - catch 1.8.2 -> 1.9.1 + - eigen3 3.3.0 -> 3.3.3 + - glib 2.50.3 -> 2.52.1 + - libbson 1.5.1 -> 1.6.2 + - libpng 1.6.28 -> 1.6.28-1 + - libvorbis 1.3.5-1-143caf4023a90c09a5eb685fdd46fb9b9c36b1ee -> 1.3.5-143caf4-2 + - libxml2 2.9.4 -> 2.9.4-1 + - mongo-c-driver 1.5.1 -> 1.6.2 + - mongo-cxx-driver 3.0.3-1 -> 3.1.1 + - opencv 3.2.0 -> 3.2.0-1 + - qwt 6.1.3 -> 6.1.3-1 + - uwebsockets 0.14.1 -> 0.14.2 + - xerces-c 3.1.4 -> 3.1.4-3 + * Added `System32\Wbem` to the sanizited environment + * `--debug` flag will now show environment information when launching external commands + * `vcpkg install` command has been enhanced: + - When a package build starts or ends, a message with the package name is diplayed + - Before the start of the build, a summary of the install plan is displayed + - Added new option `--dry-run`: This will print out the install plan, but will not actually perform the install + * Add CI badge in the front page + * Fix WindowsSDK detection to correctly handle the new optional c++ desktop deployment of the Windows SDK. + * Reduce verbosity of `vcpkg remove` when purging the package + * Fixes and improvements in the `vcpkg` tool itself + +-- vcpkg team WED, 18 Apr 2017 18:00:00 -0800 + + +vcpkg (0.0.79) +-------------- + * Add ports: + - ecm 5.32.0 + - libgd 2.2.4-1 + - octomap cefed0c1d79afafa5aeb05273cf1246b093b771c-1 + * Update ports: + - boost 1.63-3 -> 1.63-4 + - cuda 8.0 -> 8.0-1 + - freeimage 3.17.0 -> 3.17.0-1 + - freetype 2.6.3-4 -> 2.6.3-5 + - glfw3 3.2.1 -> 3.2.1-1 + - libarchive 3.2.2-2 -> 3.3.1 + - pqp 1.3 -> 1.3-1 + - qt5 5.7.1-6 -> 5.7.1-7 + - sqlite3 3.17.0 -> 3.18.0-1 + * `vcpkg` has exceeded 200 libraries! + * `vcpkg remove` command has been reworked: + - `vcpkg remove ` now uninstalls and deletes the package by default. Previously, this was the behavior of `vpckg remove --purge ` + - `vcpkg remove --no-purge` now uninstalls the package without deleting it. Previously, this was the behavior or `vcpkg remove ` + - Added new option `--dry-run`: This will print out the remove plan, but will not actually perform the removal + - Added new option `--outdated`: Using `vcpkg remove --outdated` will remove all packages for which updates are available + * Add `bootstrap-vcpkg.bat` in the root directory for easier building of `vcpkg` + - Also fix a regression with `vcpkg` bootstrapping + * Add information about how to use header-only libraries from cmake in [EXAMPLES.md](docs\EXAMPLES.md) + * `vcpkg build_external` changed to `vcpkg build-external` (underscore to dash) + * Fixes and improvements in existing portfiles and the `vcpkg` tool itself + +-- vcpkg team WED, 05 Apr 2017 15:00:00 -0800 + + +vcpkg (0.0.78) +-------------- + * Add ports: + - libp7-baical 4.1 + - pybind11 2.1.0 + - xxhash 0.6.2 + * Update ports: + - catch 1.8.1 -> 1.8.2 + - glog 0.3.4-0472b91 -> 0.3.4-0472b91-1 + - libuv 1.10.1 -> 1.10.1-2 + - libwebp 0.5.1-1 -> 0.6.0-1 + - range-v3 20150729-vcpkg2 -> 20150729-vcpkg3 + - tiff 4.0.6-2 -> 4.0.7 + - uwebsockets 0.13.0-1 -> 0.14.1 + * `--debug` flag enhanced to give line information on any exit. Applies to any `vcpkg` command + * Improve error messages when requesting a portfile that does not exist (for example via command line or via dependencies) + * Add `EMPTY_INCLUDE_FOLDER` policy + * Fixes and improvements in existing portfiles and the `vcpkg` tool itself + +-- vcpkg team TUE, 28 Mar 2017 21:15:00 -0800 + + +vcpkg (0.0.77) +-------------- + * Add ports: + - beast 1.0.0-b30 + - botan 2.0.1 + - cairomm 1.15.3-1 + - dlfcn-win32 1.1.0 + - freerdp 2.0.0-beta1+android11 + - gdcm2 2.6.7 + - jbigkit 2.1 + - libpopt 1.16-10~vcpkg1 + - libvpx 1.6.1-1 + - libwebm 1.0.0.27-1 + - msgpack 2.1.1 + - nlohmann-json 2.1.1 + - pcre2 10.23 + - tinyexr v0.9.5-d16ea6 + - xlnt 0.9.4 + * Update ports: + - antlr4 4.6 -> 4.6-1 + - atk 2.22.0 -> 2.24.0 + - boost 1.63-2 -> 1.63-3 + - dlib 19.2 -> 19.4-1 + - glib 2.50.2 -> 2.50.3 + - gtk 3.22.8 -> 3.22.11 + - libepoxy 1.4.0-2432daf-1 -> 1.4.1-7d58fd3 + - libjpeg-turbo 1.4.90-1 -> 1.5.1-1 + - liblzma 5.2.3 -> 5.2.3-1 + - mpg123 1.23.3 -> 1.24.0-1 + - mpir 2.7.2-1 -> 3.0.0-2 + - pango 1.40.3 -> 1.40.4 + - qt5 5.7.1-5 -> 5.7.1-6 + - uwebsockets 0.12.0 -> 0.13.0-1 + * Improvements and fixes in the sanizited environment introduced in the previous version + * `--debug` flag now gives line information when an error occurs. Applies to any `vcpkg` command + * Fixes and improvements around launching powershell scripts + - Correct handling of spaces in the path + - Ignore user profile (-NoProfile) + * `openssl`: Enable building in paths with space and ignore installed versions in `C:/OpenSSL/` + * Fixes and improvements in existing portfiles and the `vcpkg` tool itself + +-- vcpkg team WED, 22 Mar 2017 15:30:00 -0800 + + +vcpkg (0.0.76) +-------------- + * Add ports: + - ffmpeg 3.2.4-2 + - fftw3 3.3.6-p11 + - flatbuffers 1.6.0 + - netcdf-c 4.4.1.1-1 + - netcdf-cxx4 4.3.0 + - portaudio 19.0.6.00 + - vtk 7.1.0 + * Update ports: + - azure-storage-cpp 2.6.0 -> 3.0.0 + - boost 1.63 -> 1.63-2 + - bullet3 2.83.7.98d4780 -> 2.86.1 + - catch 1.5.7 -> 1.8.1 + - cppwinrt 1.010.0.14393.0 -> feb2017_refresh-14393 + - hdf5 1.8.18 -> 1.10.0-patch1-1 + - libflac 1.3.2 -> 1.3.2-1 + - libpng 1.6.24-1 -> 1.6.28 + - lua 5.3.3-2 -> 5.3.4 + - msmpi 8.0 -> 8.0-1 + - openjpeg 2.1.2 -> 2.1.2-1 + - poco 1.7.6-3 -> 1.7.6-4 + - szip 2.1 -> 2.1-1 + - zeromq 4.2.0 -> 4.2.2 + * `vcpkg` now launches external commands (most notably builds) in a sanitized environment + * Better proxy handling when fetching dependencies (cmake/git/nuget) + * Fix more VS2017 issues + * Fixes and improvements in existing portfiles and the `vcpkg` tool itself + +-- vcpkg team MON, 10 Mar 2017 17:45:00 -0800 + + +vcpkg (0.0.75) +-------------- + * Add ports: + - dlib 19.2 + - gtk 3.22.8 + - pqp 1.3 + - pugixml 1.8.1 + * Update ports: + - clockutils 1.1.1 -> 1.1.1-3651f232c27074c4ceead169e223edf5f00247c5 + - grpc 1.1.0-dev-1674f65-2 -> 1.1.2-1 + - libflac 1.3.1-1 -> 1.3.2 + - liblzma 5.2.2 -> 5.2.3 + - libmysql 5.7.17 -> 5.7.17-1 + - lz4 1.7.4.2 -> 1.7.5 + - mongo-cxx-driver 3.0.3 -> 3.0.3-1 + - nana 1.4.1 -> 1.4.1-66be23c9204c5567d1c51e6f57ba23bffa517a7c + - opengl 10.0.10240.0 -> 0.0-3 + - protobuf 3.0.2 -> 3.2.0 + - qt5 5.7.1-2 -> 5.7.1-5 + - spdlog 0.11.0 -> 0.12.0 + * Numerous improvements in Visual Studio, MSBuild and Windows SDK auto-detection + * `vcpkg integrate install` now outputs the specific toolchain file to use for CMake integration + * All commands now checks for `--options` and will issue an error on unknown options. + - Previously only commands with options would do this (for example `vcpkg remove --purge `) and commands with no options would ignore them, for example `vcpkg install --purge ` + * Update version of the automatically acquired JOM, python + - Also, for python: automatically acquire the 32-bit versions instead of the 64-bit ones + * Fixes and improvements in existing portfiles and the `vcpkg` tool itself + +-- vcpkg team MON, 27 Feb 2017 14:00:00 -0800 + + +vcpkg (0.0.74) +-------------- + * Bump required version & auto-downloaded version of `cmake` to 3.8.0 (was 3.7.x). This fixes UWP builds with Visual Studio 2017 + * Fix `vcpkg build` not printing out the missing dependencies on fail + * Fixes and improvements in the `vcpkg` tool itself + +-- vcpkg team THU, 16 Feb 2017 18:15:00 -0800 + + +vcpkg (0.0.73) +-------------- + * Add ports: + - gdk-pixbuf 2.36.5 + - openvr 1.0.5 + * Update ports: + - lmdb 0.9.18-1 -> 0.9.18-2 + - opencv 3.1.0-1 -> 3.2.0 + - sqlite3 3.15.0 -> 3.17.0 + * Add functions to correctly find the "Program Files" folders in all parts of `vcpkg` (C++, CMake, powershell) + * Flush std::cout before launching an external process. Fixes issues when redirecting std::cout to a file + * Update version of the automatically acquired nasm. Resolves build failure with libjpeg-turbo + * Change the format of the listfile. The file is now sorted and directories now have a trailing slash so they can easily be identified. + - Old listfiles will be automatically updated on first access. This will happen to all old listfiles when a new package is installed (`vcpkg install`) or after a call to `vcpkg owns`. + * Fixes and improvements in existing portfiles and the `vcpkg` tool itself + +-- vcpkg team WED, 15 Feb 2017 19:30:00 -0800 + + +vcpkg (0.0.72) +-------------- + * Add ports: + - cuda 8.0 + - hdf5 1.8.18 + - lcms 2.8 + - libepoxy 1.4.0-2432daf-1 + - libnice 0.1.13 + - msmpi 8.0 + - parmetis 4.0.3 + - sqlite-modern-cpp 2.4 + - websocketpp 0.7.0 + * Update ports: + - asio 1.10.6 -> 1.10.8 + - aws-sdk-cpp 1.0.47 -> 1.0.61 + - bond 5.0.0-4-g53ea136 -> 5.2.0 + - cpprestsdk 2.9.0-1 -> 2.9.0-2 + - fmt 3.0.1-1 -> 3.0.1-4 + - grpc 1.1.0-dev-1674f65-1 -> 1.1.0-dev-1674f65-2 + - libraw 0.17.2-2 -> 0.18.0-1 + - libvorbis 1.3.5-143caf4023a90c09a5eb685fdd46fb9b9c36b1ee -> 1.3.5-1-143caf4023a90c09a5eb685fdd46fb9b9c36b1ee + - poco 1.7.6-2 -> 1.7.6-3 + - rapidjson 1.0.2-1 -> 1.1.0 + - sfml 2.4.1 -> 2.4.2 + - wt 3.3.6-2 -> 3.3.6-3 + * Introduce Build Policies: + - Packages with special characteristics (e.g. CUDA) can now use Build Policies to control which post-build checks apply to them. + * Improve support for Visual Studio 2017 + - Add auto-detection for Windows SDK + - Fixed various issues with `bootstrap.ps1` and VS2017 support + * Automatic acquisition of perl now uses the 32-bit version isntead of the 64-bit version + * Fix `vcpkg remove --purge` not applying to non-installed packages + * Fixes and improvements in existing portfiles and the `vcpkg` tool itself + +-- vcpkg team TUE, 14 Feb 2017 11:30:00 -0800 + + +vcpkg (0.0.71) +-------------- + * Add ports: + - atk 2.22.0 + - fontconfig 2.12.1 + - opus 1.1.4 + - pango 1.40.3 + - xerces-c 3.1.4 + * Update ports: + - boost 1.62-11 -> 1.63 + - cairo 1.14.6 -> 1.15.4 + - directxtk dec2016 -> dec2016-1 + - fltk 1.3.4-1 -> 1.3.4-2 + - gdal 1.11.3 -> 1.11.3-1 + - harfbuzz 1.3.4 -> 1.3.4-2 + - libarchive 3.2.2 -> 3.2.2-2 + - libmariadb 2.3.1 -> 2.3.2 + - mpir 2.7.2 -> 2.7.2-1 + - openssl 1.0.2j-2 -> 1.0.2k-2 + - wt 3.3.6 -> 3.3.6-2 + * Improve `vcpkg remove`: + - Now shows all dependencies that need to be removed instead of just the immediate dependencies + - Add `--recurse` option that removes all dependencies + - Improve messages + * Improve support for Visual Studio 2017 + - Better VS2017 detection + - Fixed various issues with `bootstrap.ps1` and VS2017 support + * Fix `vcpkg_copy_pdbs()` under non-English locale + * Notable changes for buiding the `vcpkg` tool: + - Restructure `vcpkg` project hierarchy. Now only has 4 projects (down from 6). Most of the code now lives under vcpkglib.vcxproj + - Enable multiprocessor compilation + - Disable MinimalRebuild + - Use precompiled headers + * Fixes and improvements in existing portfiles and the `vcpkg` tool itself + +-- vcpkg team MON, 30 Jan 2017 23:00:00 -0800 + + +vcpkg (0.0.70) +-------------- + * Add ports: + - fltk 1.3.4-1 + - glib 2.50.2 + - lzo 2.09 + - uvatlas sept2016 + * Update ports: + - dx 1.0.0 -> 1.0.1 + - libmysql 5.7.16 -> 5.7.17 + * Add support for Visual Studio 2017 + - Previously, you could use Visual Studio 2017 for your own application and `vcpkg` integration would work, but you needed to have Visual Studio 2015 to build `vcpkg` itself as well as the libraries. This requirement has now been removed + - If both Visual Studio 2015 and Visual Studio 2017 are installed, Visual Studio 2017 tools will be preferred over those of Visual Studio 2015 + * Bump required version & auto-downloaded version of `cmake` to 3.7.2 (was 3.5.x), which includes generators for Visual Studio 2017 + * Bump auto-downloaded version of `nuget` to 3.5.0 (was 3.4.3) + * Bump auto-downloaded version of `git` to 2.11.0 (was 2.8.3) + * Fixes and improvements in existing portfiles and the `vcpkg` tool itself + +-- vcpkg team MON, 23 Jan 2017 19:50:00 -0800 + + +vcpkg (0.0.67) +-------------- + * Add ports: + - cereal 1.2.1 + - directxmesh oct2016 + - directxtex dec2016 + - metis 5.1.0 + - sdl2-image 2.0.1 + - szip 2.1 + * Update ports: + - ace 6.4.0 -> 6.4.2 + - boost 1.62-9 -> 1.62-11 + - curl 7.51.0-2 -> 7.51.0-3 + - directxtk oct2016-1 -> dec2016 + - directxtk12 oct2016 -> dec2016 + - freetype 2.6.3-3 -> 2.6.3-4 + - glew 2.0.0 -> 2.0.0-1 + - grpc 1.1.0-dev-1674f65 -> 1.1.0-dev-1674f65-1 + - http-parser 2.7.1 -> 2.7.1-1 + - libssh2 1.8.0 -> 1.8.0-1 + - libwebsockets 2.0.0 -> 2.0.0-1 + - openssl 1.0.2j-1 -> 1.0.2j-2 + - tiff 4.0.6-1 -> 4.0.6-2 + - zlib 1.2.10 -> 1.2.11 + * Add 7z to `vcpkg_find_acquire_program.cmake` + * Enhance `vcpkg_build_cmake.cmake` and `vcpkg_install_cmake.cmake`: + - Add option to disable parallel building (it is enabled by default) + - Add option to use the 64-bit toolset (for the 32-bit builds; output binaries are still 32-bit) + * Fix bug in `applocal.ps1` that would infinitely recurse when there were no depenndencies + * Fixes and improvements in existing portfiles and the `vcpkg` tool itself + +-- vcpkg team WED, 18 Jan 2017 13:45:00 -0800 + + +vcpkg (0.0.66) +-------------- + * Add ports: + - antlr4 4.6 + - bzip2 1.0.6 + - dx 1.0.0 + - gli 0.8.2 + - libarchive 3.2.2 + - libffi 3.1 + - liblzma 5.2.2 + - libmodplug 0.8.8.5-bb25b05 + - libsigcpp 2.10 + - lmdb 0.9.18-1 + - lz4 1.7.4.2 + - ogre 1.9.0 + - qwt 6.1.3 + - smpeg2 2.0.0 + - spirv-tools 1.1-f72189c249ba143c6a89a4cf1e7d53337b2ddd40 + * Update ports: + - aws-sdk-cpp 1.0.34-1 -> 1.0.47 + - azure-storage-cpp 2.5.0 -> 2.6.0 + - boost 1.62-8 -> 1.62-9 + - chakracore 1.3.1 -> 1.4.0 + - freetype 2.6.3-2 -> 2.6.3-3 + - icu 58.1 -> 58.2-1 + - libbson 1.5.0-rc6 -> 1.5.1 + - libvorbis -> 1.3.5-143caf4023a90c09a5eb685fdd46fb9b9c36b1ee + - lua 5.3.3-1 -> 5.3.3-2 + - mongo-c-driver 1.5.0-rc6 -> 1.5.1 + - pixman 0.34.0 -> 0.34.0-1 + - qt5 5.7-1 -> 5.7.1-2 + - sdl2 2.0.5 -> 2.0.5-2 + - zlib 1.2.8 -> 1.2.10 + * Improvements in pre-install checks: + - Refactor file-exists-check. Improved clarity and performance. + * Fixes and improvements in existing portfiles and the `vcpkg` tool itself + +-- vcpkg team TUE, 10 Jan 2017 17:15:00 -0800 + + +vcpkg (0.0.65) +-------------- + * Add ports: + - anax 2.1.0-1 + - aws-sdk-cpp 1.0.34-1 + - azure-storage-cpp 2.5.0 + - charls 2.0.0 + - dimcli 1.0.3 + - entityx 1.2.0 + - freeimage 3.17.0 + - gdal 1.11.3 + - globjects 1.0.0 + - http-parser 2.7.1 + - icu 58.1 + - libflac 1.3.1-1 + - libssh2 1.8.0 + - nana 1.4.1 + - qca 2.2.0 + - sfml 2.4.1 + - shaderc 2df47b51d83ad83cbc2e7f8ff2b56776293e8958 + - uwebsockets 0.12.0 + - yaml-cpp 0.5.4 candidate + * Update ports: + - boost 1.62-6 -> 1.62-8 + - curl 7.51.0-1 -> 7.51.0-2 + - gflags 2.1.2 -> 2.2.0-2 + - glbinding 2.1.1 -> 2.1.1-1 + - glslang 1c573fbcfba6b3d631008b1babc838501ca925d3 -> 1c573fbcfba6b3d631008b1babc838501ca925d3-1 + - harfbuzz 1.3.2 -> 1.3.4 + - jxrlib 1.1-1 -> 1.1-2 + - libraw 0.17.2 -> 0.17.2-2 + - lua 5.3.3 -> 5.3.3-1 + - openssl 1.0.2j -> 1.0.2j-1 + * Improvements in the post-build checks: + - Add check for files in the `\` dir and `\debug\` dir + * Introduce pre-install checks: + - The `install` command now checks that files will not be overwrriten when installing a package. A particular file can only be owned by a single package + * Introduce 'lib\manul-link\' directory. Libraries placing the lib files in that directory are not automatically added to the link line + * Disable all interactions with CMake registry + * `vcpkg /?` is now a valid equivalent of `vcpkg help` + * Fixes and improvements in existing portfiles and the `vcpkg` tool itself + +-- vcpkg team MON, 12 Dec 2016 18:15:00 -0800 + + +vcpkg (0.0.61) +-------------- + * Add ports: + - cairo 1.14.6 + - clockutils 1.1.1 + - directxtk oct2016-1 + - directxtk12 oct2016 + - glslang 1c573fbcfba6b3d631008b1babc838501ca925d3 + - libodb-pgsql 2.4.0 + - pixman 0.34.0 + - proj 4.9.3 + - zstd 1.1.1 + * Update ports: + - chakracore 1.3.0 -> 1.3.1 + - curl 7.51.0 -> 7.51.0-1 + - dxut 11.14 -> 11.14-2 + - fmt 3.0.1 -> 3.0.1-1 + - freetype 2.6.3-1 -> 2.6.3-2 + - rxcpp 2.3.0 -> 3.0.0 + - think-cell-range 1d785d9 -> e2d3018 + - tiff 4.0.6 -> 4.0.6-1 + * Fixes and improvements in existing portfiles and the `vcpkg` tool itself + +-- vcpkg team MON, 28 Nov 2016 18:30:00 -0800 + + +vcpkg (0.0.60) +-------------- + * Add ports: + - box2d 2.3.1-374664b + - decimal-for-cpp 1.12 + - jsoncpp 1.7.7 + - libpq 9.6.1 + - libxslt 1.1.29 + - poco 1.7.6-2 + - qt5 5.7-1 + - signalrclient 1.0.0-beta1 + - soci 2016.10.22 + - tclap 1.2.1 + * Update ports: + - boost 1.62-1 -> 1.62-6 + - chakracore 1.2.0.0 -> 1.3.0 + - eigen3 3.2.10-2 -> 3.3.0 + - fmt 3.0.0-1 -> 3.0.1 + - jxrlib 1.1 -> 1.1-1 + - libbson 1.4.2 -> 1.5.0-rc6 + - libuv 1.9.1 -> 1.10.1 + - libwebp 0.5.1 -> 0.5.1-1 + - mongo-c-driver 1.4.2 -> 1.5.0-rc6 + - mongo-cxx-driver 3.0.2 -> 3.0.3 + - pcre 8.38 -> 8.38-1 + - sdl2 2.0.4 -> 2.0.5 + * `vcpkg` has exceeded 100 libraries! + * Rework dependency handling + * Many more portfiles now support static builds. The remaining ones warn that static is not yet supported and will perform a dynamic build instead + * The triplet file is now automatically included and is available in every portfile + * Improvements in the post-build checks: + - Introduce `BUILD_INFO` file. This contains information about the settings used in the build. The post-build checks use this file to choose what checks to perform + - Add CRT checks + - Improve coff file reader. It is now more robust and it correctly handles a couple of corner cases + - A few miscellaneous checks to further prevent potential issues with the produced packages + * Improve integration and fix related issues + * Add support for VS 2017 + * Introduce function that tries to repeatedly build up to a number of failures. This reduces/resolves issues from libraries with flaky builds + * Many fixes and improvements in existing portfiles and the `vcpkg` tool itself + +-- vcpkg team WED, 23 Nov 2016 15:30:00 -0800 + + +vcpkg (0.0.51) +-------------- + * Add simple substring search to `vcpkg cache` + * Add simple substring search to `vcpkg list` + +-- vcpkg team MON, 07 Nov 2016 14:45:00 -0800 + + +vcpkg (0.0.50) +-------------- + * Add ports: + - apr 1.5.2 + - assimp 3.3.1 + - boost-di 1.0.1 + - bullet3 2.83.7.98d4780 + - catch 1.5.7 + - chakracore 1.2.0.0 + - cppwinrt 1.010.0.14393.0 + - cppzmq 0.0.0-1 + - cryptopp 5.6.5 + - double-conversion 2.0.1 + - dxut 11.14 + - fastlz 1.0 + - freeglut 3.0.0 + - geos 3.5.0 + - gettext 0.19 + - glbinding 2.1.1 + - glog 0.3.4-0472b91 + - harfbuzz 1.3.2 + - jxrlib 1.1 + - libbson 1.4.2 + - libccd 2.0.0 + - libmariadb 2.3.1 + - libmysql 5.7.16 + - libodb 2.4.0 + - libodb-sqlite 2.4.0 + - libogg 1.3.2 + - libraw 0.17.2 + - libtheora 1.1.1 + - libvorbis + - libwebp 0.5.1 + - libxml2 2.9.4 + - log4cplus 1.1.3-RC7 + - lua 5.3.3 + - mongo-c-driver 1.4.2 + - mongo-cxx-driver 3.0.2 + - nanodbc 2.12.4 + - openjpeg 2.1.2 + - pcre 8.38 + - pdcurses 3.4 + - physfs 2.0.3 + - rxcpp 2.3.0 + - spdlog 0.11.0 + - tbb 20160916 + - think-cell-range 1d785d9 + - utfcpp 2.3.4 + - wt 3.3.6 + - wtl 9.1 + - zeromq 4.2.0 + - zziplib 0.13.62 + * Update ports: + - boost 1.62 -> 1.62-1 + - cpprestsdk 2.8 -> 2.9.0-1 + - curl 7.48.0 -> 7.51.0 + - eigen3 3.2.9 -> 3.2.10-2 + - freetype 2.6.3 -> 2.6.3-1 + - glew 1.13.0 -> 2.0.0 + - openssl 1.0.2h -> 1.0.2j + - range-v3 0.0.0-1 -> 20150729-vcpkg2 + - sqlite3 3120200 -> 3.15.0 + * Add support for static libraries + * Add more post build checks + * Improve post build checks related to verifying information in the dll/pdb files (e.g. architecture) + * Many fixes in existing portfiles + * Various updates in FAQ + * Release builds now create pdbs (debug builds already did) + +-- vcpkg team MON, 07 Nov 2016 00:01:00 -0800 + + +vcpkg (0.0.40) +-------------- + * Add ports: + - ace 6.4.0 + - asio 1.10.6 + - bond 5.0.0 + - constexpr 1.0 + - doctest 1.1.0 + - eigen3 3.2.9 + - fmt 3.0.0 + - gflags 2.1.2 + - glm 0.9.8.1 + - grpc 1.1.0 + - gsl 0-fd5ad87bf + - gtest 1.8 + - libiconv 1.14 + - mpir 2.7.2 + - protobuf 3.0.2 + - ragel 6.9 + - rapidxml 1.13 + - sery 1.0.0 + - stb 1.0 + * Update ports: + - boost 1.62 + - glfw3 3.2.1 + - opencv 3.1.0-1 + * Various fixes in existing portfiles + * Introduce environment variable `VCPKG_DEFAULT_TRIPLET` + * Replace everything concerning MD5 with SHA512 + * Add mirror support + * `vcpkg` now checks for valid package names: only ASCII lowercase chars, digits, or dashes are allowed + * `vcpkg create` now also creates a templated CONTROL file + * `vcpkg create` now checks for invalid chars in the zip path + * `vcpkg edit` now throws an error if it cannot launch an editor + * Fix `vcpkg integrate` to only apply to C++ projects instead of all projects + * Fix `vcpkg integrate` locale-specific failures + * `vcpkg search` now does simple substring searching + * Fix path that assumed Visual Studio is installed in default location + * Enable multicore builds by default + * Add `.vcpkg-root` file to detect the root directory + * Fix `bootstrap.ps1` to work with older versions of powershell + * Add `SOURCE_PATH` variable to all portfiles. + * Many improvements in error messages shown by `vcpkg` + * Various updates in FAQ + * Move `CONTRIBUTING.md` to root + +-- vcpkg team WED, 05 Oct 2016 17:00:00 -0700 + + +vcpkg (0.0.30) +-------------- + * DLLs are now accompanied with their corresponding PDBs. + * Rework removal commands. `vcpkg remove ` now uninstalls the package. `vcpkg remove --purge ` now uninstalls and also deletes the package. + * Rename option --arch to --triplet. + * Extensively rework directory tree layout to make it more intuitive. + * Improve post-build verification checks. + * Improve post-build verification messages; they are now more compact, more consistent and contain more suggestions on how to resolve the issues found. + * Fix `vcpkg integrate project` in cases where the path contained non-alphanumeric chars. + * Improve handling of paths. In general, commands with whitespace and non-ascii characters should be handled better now. + * Add colorized output for `vcpkg clean` and `vcpkg purge`. + * Add colorized output for many more errors. + * Improved `vcpkg update` to identify installed libraries that are out of sync with their portfiles. + * Added list of example port files to EXAMPLES.md + * Rename common CMake utilities to use prefix `vcpkg_`. + * [libpng] Fixed x86-uwp and x64-uwp builds. + * [libjpeg-turbo] Fixed x86-uwp and x64-uwp builds via suppressing static CRT linkage. + * [rapidjson] New library. + +-- vcpkg team WED, 18 Sep 2016 20:50:00 -0700 diff --git a/externals/vcpkg/CONTRIBUTING.md b/externals/vcpkg/CONTRIBUTING.md new file mode 100755 index 000000000..6e019d977 --- /dev/null +++ b/externals/vcpkg/CONTRIBUTING.md @@ -0,0 +1,33 @@ +# Contribution Guidelines + +Vcpkg is a community driven effort to build a productive and robust ecosystem of native libraries - your contributions are invaluable! + +## Issues + +The easiest way to contribute is by reporting issues with either `vcpkg.exe` or an existing package on [GitHub](https://github.com/Microsoft/vcpkg). When reporting an issue with `vcpkg.exe`, make sure to clearly state: +- The machine setup: "I'm using Windows 10 Anniversary Update. My machine is using the fr-fr locale. I successfully ran 'install boost'." +- The steps to reproduce: "I run 'vcpkg list'" +- The outcome you expected: "I expected to see 'boost:x86-windows'" +- The actual outcome: "I get no output at all" or "I get a crash dialog" + +When reporting an issue with a package, make sure to clearly state: +- The machine setup (as above) +- What package and version you're building: "opencv 3.1.0" +- Any relevant error logs from the build process. + +## Pull Requests + +We are happy to accept pull requests for fixes, features, new packages, and updates to existing packages. In order to avoid wasting your time, we highly encourage opening an issue to discuss whether the PR you're thinking about making will be acceptable. This is doubly true for features and new packages. + +### New package Guidelines + +We're glad you're interested in submitting a new package! Here are some guidelines to help you author an excellent portfile: +- Avoid functional patches. Patches should be considered a last resort to implement compatibility when there's no other way. +- When patches can't be avoided, do not modify the default behavior. The ideal lifecycle of a patch is to get merged upstream and no longer be needed. Try to keep this goal in mind when deciding how to patch something. +- Prefer to use the `vcpkg_xyz` functions over raw `execute_command` calls. This makes long term maintenance easier when new features (such as custom compiler flags or generators) are added. + +## Legal + +You will need to complete a Contributor License Agreement (CLA) before your pull request can be accepted. This agreement testifies that you are granting us permission to use the source code you are submitting, and that this work is being submitted under appropriate license that we can use it. + +You can complete the CLA by going through the steps at https://cla.microsoft.com. Once we have received the signed CLA, we'll review the request. You will only need to do this once. diff --git a/externals/vcpkg/CONTRIBUTING_zh.md b/externals/vcpkg/CONTRIBUTING_zh.md new file mode 100755 index 000000000..7aef2f5dc --- /dev/null +++ b/externals/vcpkg/CONTRIBUTING_zh.md @@ -0,0 +1,33 @@ +# 贡献准则 + +Vcpkg 是一个å°è¯•ç”±ç¤¾åŒºé©±åŠ¨ï¼Œæ—¨åœ¨æž„建一个多产的ã€å¥å£®çš„本地库生æ€ç³»ç»Ÿ - 您的贡献价值ä¸å¯ä¼°é‡ï¼ + +## 报告问题 + +最简å•çš„方法是通过 `vcpkg.exe` 或 [GitHub](https://github.com/Microsoft/vcpkg) 报告已有的包的问题。 当报告 `vcpkg.exe` 的问题时，确ä¿æ¸…楚地说明: +- 机器设置: “我用的是Windows 10周年更新。 我的机器正ä½äºŽfr-fr区域。 我æˆåŠŸåœ°è¿è¡Œäº†'install boost'。†+- å¤çŽ°æ­¥éª¤: “è¿è¡Œ 'vcpkg list'†+- 预期结果: “我预期看到 'boost:x86-windows'†+- 实际结果: “没有输出†或 “我得到一个崩溃对è¯æ¡†â€ + +当报告包的问题时，一定è¦æ¸…楚地说明: +- 机器设置 (上述) +- 您正在构建什么包以åŠå®ƒçš„版本，例如: “opencv 3.1.0†+- 构建过程中的任何相关错误日志 + +## 贡献 (PR) + +我们很ä¹æ„接å—关于修å¤ã€ç‰¹æ€§ã€æ–°åŒ…和更新现有包的拉å–请求。 为了é¿å…浪费您的时间，我们强烈建议您æ交一个问题æ¥è®¨è®ºæ‚¨æƒ³è¦åˆ¶ä½œçš„PR是å¦èƒ½è¢«æŽ¥å—。 对于特性和新包æ¥è¯´ä¹Ÿæ˜¯å¦‚此。 + +### 新包贡献准则 + +我们很高兴您有兴趣æ¥æ交一个新的包! 这里有一些指导方针æ¥å¸®åŠ©æ‚¨ç¼–写一个优秀的端å£æ–‡ä»¶: +- é¿å…功能补ä¸ã€‚ 当没有其他方法时，补ä¸åº”该被视为实现兼容性的最åŽæ‰‹æ®µã€‚ +- 当无法é¿å…è¡¥ä¸æ—¶ï¼Œè¯·ä¸è¦ä¿®æ”¹é»˜è®¤è¡Œä¸ºã€‚ 一个补ä¸çš„ç†æƒ³ç”Ÿå‘½å‘¨æœŸæ˜¯ä¸Žä¸Šæ¸¸åˆå¹¶ï¼Œä¸å†è¢«éœ€è¦ã€‚ 在决定如何修补æŸäº›å†…容时，请记ä½è¿™ä¸€ç›®æ ‡ã€‚ +- 相比原始的 `execute_command` 调用，尽é‡æ”¹ä¸ºé€šè¿‡ `vcpkg_xyz` 函数实现。这使得在添加新特性(如自定义编译器标志或生æˆå™¨)时更容易进行长期维护。 + +## 法律声明 + +在您的拉å–请求被接å—之å‰ï¼Œæ‚¨éœ€è¦å®Œæˆä¸€ä¸ªè´¡çŒ®è€…许å¯åè®® (CLA)。 本åè®®è¯æ˜Žæ‚¨å…许我们使用您æ交的æºä»£ç ï¼Œå¹¶ä¸”本作å“是在åˆé€‚的许å¯ä¸‹æ交的，我们å¯ä»¥ä½¿ç”¨å®ƒã€‚ + +您å¯ä»¥é€šè¿‡ https://cla.microsoft.com 上的步骤æ¥å®ŒæˆCLA。 一旦我们收到已签署的CLA，我们将审查请求。 您åªéœ€è¦è¿™æ ·åšä¸€æ¬¡ã€‚ diff --git a/externals/vcpkg/LICENSE.txt b/externals/vcpkg/LICENSE.txt new file mode 100755 index 000000000..2e4eac826 --- /dev/null +++ b/externals/vcpkg/LICENSE.txt @@ -0,0 +1,23 @@ +Copyright (c) Microsoft Corporation + +All rights reserved. + +MIT License + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/externals/vcpkg/NOTICE.txt b/externals/vcpkg/NOTICE.txt new file mode 100755 index 000000000..0e2e96048 --- /dev/null +++ b/externals/vcpkg/NOTICE.txt @@ -0,0 +1,46 @@ +vcpkg uses third party material from the projects listed below. +The original copyright notice and the license under which Microsoft +received such third party material are set forth below. Microsoft +reserves all other rights not expressly granted, whether by +implication, estoppel or otherwise. + +In the event that we accidentally failed to list a required notice, please +bring it to our attention by posting an issue. + +THIRD-PARTY SOFTWARE NOTICES AND INFORMATION +Do Not Translate or Localize + +vcpkg incorporates third party material from the projects listed below. +The original copyright notice and the license under which Microsoft received +such third party materials are set forth below. Microsoft reserved all other +rights not expressly granted, whether by implication, estoppel or otherwise. + +1. Catch2 + +%% Catch2 NOTICES, INFORMATION, AND LICENSE BEGIN HERE +========================================= +Boost Software License - Version 1.0 - August 17th, 2003 + +Permission is hereby granted, free of charge, to any person or organization +obtaining a copy of the software and accompanying documentation covered by +this license (the "Software") to use, reproduce, display, distribute, +execute, and transmit the Software, and to prepare derivative works of the +Software, and to permit third-parties to whom the Software is furnished to +do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including +the above license grant, this restriction and the following disclaimer, +must be included in all copies of the Software, in whole or in part, and +all derivative works of the Software, unless such copies or derivative +works are solely in the form of machine-executable object code generated by +a source language processor. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. +========================================= +END OF Catch2 NOTICES, INFORMATION, AND LICENSE diff --git a/externals/vcpkg/README.md b/externals/vcpkg/README.md new file mode 100755 index 000000000..5032e9fb2 --- /dev/null +++ b/externals/vcpkg/README.md @@ -0,0 +1,349 @@ +# Vcpkg: Overview + +[中文总览](README_zh_CN.md) +[Español](README_es.md) +[한국어](README_ko_KR.md) +[Français](README_fr.md) + +Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. +This tool and ecosystem are constantly evolving, and we always appreciate contributions! + +If you've never used vcpkg before, or if you're trying to figure out how to use vcpkg, +check out our [Getting Started](#getting-started) section for how to start using vcpkg. + +For short description of available commands, once you've installed vcpkg, +you can run `vcpkg help`, or `vcpkg help [command]` for command-specific help. + +* Github: ports at [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg), program at [https://github.com/microsoft/vcpkg-tool](https://github.com/microsoft/vcpkg-tool) +* Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/), the #vcpkg channel +* Discord: [\#include \](https://www.includecpp.org), the #ðŸŒvcpkg channel +* Docs: [Documentation](docs/README.md) + +# Table of Contents + +- [Vcpkg: Overview](#vcpkg-overview) +- [Table of Contents](#table-of-contents) +- [Getting Started](#getting-started) + - [Quick Start: Windows](#quick-start-windows) + - [Quick Start: Unix](#quick-start-unix) + - [Installing Linux Developer Tools](#installing-linux-developer-tools) + - [Installing macOS Developer Tools](#installing-macos-developer-tools) + - [Using vcpkg with CMake](#using-vcpkg-with-cmake) + - [Visual Studio Code with CMake Tools](#visual-studio-code-with-cmake-tools) + - [Vcpkg with Visual Studio CMake Projects](#vcpkg-with-visual-studio-cmake-projects) + - [Vcpkg with CLion](#vcpkg-with-clion) + - [Vcpkg as a Submodule](#vcpkg-as-a-submodule) +- [Tab-Completion/Auto-Completion](#tab-completionauto-completion) +- [Examples](#examples) +- [Contributing](#contributing) +- [License](#license) +- [Security](#security) +- [Telemetry](#telemetry) + +# Getting Started + +First, follow the quick start guide for either +[Windows](#quick-start-windows), or [macOS and Linux](#quick-start-unix), +depending on what you're using. + +For more information, see [Installing and Using Packages][getting-started:using-a-package]. +If a library you need is not present in the vcpkg catalog, +you can [open an issue on the GitHub repo][contributing:submit-issue] +where the vcpkg team and community can see it, +and potentially add the port to vcpkg. + +After you've gotten vcpkg installed and working, +you may wish to add [tab completion](#tab-completionauto-completion) to your shell. + +Finally, if you're interested in the future of vcpkg, +check out the [manifest][getting-started:manifest-spec] guide! +This is an experimental feature and will likely have bugs, +so try it out and [open all the issues][contributing:submit-issue]! + +## Quick Start: Windows + +Prerequisites: +- Windows 7 or newer +- [Git][getting-started:git] +- [Visual Studio][getting-started:visual-studio] 2015 Update 3 or greater with the English language pack + +First, download and bootstrap vcpkg itself; it can be installed anywhere, +but generally we recommend using vcpkg as a submodule for CMake projects, +and installing it globally for Visual Studio projects. +We recommend somewhere like `C:\src\vcpkg` or `C:\dev\vcpkg`, +since otherwise you may run into path issues for some port build systems. + +```cmd +> git clone https://github.com/microsoft/vcpkg +> .\vcpkg\bootstrap-vcpkg.bat +``` + +To install the libraries for your project, run: + +```cmd +> .\vcpkg\vcpkg install [packages to install] +``` + +Note: This will install x86 libraries by default. To install x64, run: + +```cmd +> .\vcpkg\vcpkg install [package name]:x64-windows +``` + +Or + +```cmd +> .\vcpkg\vcpkg install [packages to install] --triplet=x64-windows +``` + +You can also search for the libraries you need with the `search` subcommand: + +```cmd +> .\vcpkg\vcpkg search [search term] +``` + +In order to use vcpkg with Visual Studio, +run the following command (may require administrator elevation): + +```cmd +> .\vcpkg\vcpkg integrate install +``` + +After this, you can now create a New non-CMake Project (or open an existing one). +All installed libraries are immediately ready to be `#include`'d and used +in your project without additional configuration. + +If you're using CMake with Visual Studio, +continue [here](#vcpkg-with-visual-studio-cmake-projects). + +In order to use vcpkg with CMake outside of an IDE, +you can use the toolchain file: + +```cmd +> cmake -B [build directory] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" +> cmake --build [build directory] +``` + +With CMake, you will still need to `find_package` and the like to use the libraries. +Check out the [CMake section](#using-vcpkg-with-cmake) for more information, +including on using CMake with an IDE. + +For any other tools, including Visual Studio Code, +check out the [integration guide][getting-started:integration]. + +## Quick Start: Unix + +Prerequisites for Linux: +- [Git][getting-started:git] +- [g++][getting-started:linux-gcc] >= 6 + +Prerequisites for macOS: +- [Apple Developer Tools][getting-started:macos-dev-tools] + +First, download and bootstrap vcpkg itself; it can be installed anywhere, +but generally we recommend using vcpkg as a submodule for CMake projects. + +```sh +$ git clone https://github.com/microsoft/vcpkg +$ ./vcpkg/bootstrap-vcpkg.sh +``` + +To install the libraries for your project, run: + +```sh +$ ./vcpkg/vcpkg install [packages to install] +``` + +You can also search for the libraries you need with the `search` subcommand: + +```sh +$ ./vcpkg/vcpkg search [search term] +``` + +In order to use vcpkg with CMake, you can use the toolchain file: + +```sh +$ cmake -B [build directory] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" +$ cmake --build [build directory] +``` + +With CMake, you will still need to `find_package` and the like to use the libraries. +Check out the [CMake section](#using-vcpkg-with-cmake) +for more information on how best to use vcpkg with CMake, +and CMake Tools for VSCode. + +For any other tools, check out the [integration guide][getting-started:integration]. + +## Installing Linux Developer Tools + +Across the different distros of Linux, there are different packages you'll +need to install: + +- Debian, Ubuntu, popOS, and other Debian-based distributions: + +```sh +$ sudo apt-get update +$ sudo apt-get install build-essential tar curl zip unzip +``` + +- CentOS + +```sh +$ sudo yum install centos-release-scl +$ sudo yum install devtoolset-7 +$ scl enable devtoolset-7 bash +``` + +For any other distributions, make sure you're installing g++ 6 or above. +If you want to add instructions for your specific distro, +[please open a PR][contributing:submit-pr]! + +## Installing macOS Developer Tools + +On macOS, the only thing you should need to do is run the following in your terminal: + +```sh +$ xcode-select --install +``` + +Then follow along with the prompts in the windows that comes up. + +You'll then be able to bootstrap vcpkg along with the [quick start guide](#quick-start-unix) + +## Using vcpkg with CMake + +### Visual Studio Code with CMake Tools + +Adding the following to your workspace `settings.json` will make +CMake Tools automatically use vcpkg for libraries: + +```json +{ + "cmake.configureSettings": { + "CMAKE_TOOLCHAIN_FILE": "[vcpkg root]/scripts/buildsystems/vcpkg.cmake" + } +} +``` + +### Vcpkg with Visual Studio CMake Projects + +Open the CMake Settings Editor, and under `CMake toolchain file`, +add the path to the vcpkg toolchain file: + +``` +[vcpkg root]/scripts/buildsystems/vcpkg.cmake +``` + +### Vcpkg with CLion + +Open the Toolchains settings +(File > Settings on Windows and Linux, CLion > Preferences on macOS), +and go to the CMake settings (Build, Execution, Deployment > CMake). +Finally, in `CMake options`, add the following line: + +``` +-DCMAKE_TOOLCHAIN_FILE=[vcpkg root]/scripts/buildsystems/vcpkg.cmake +``` + +You must add this line to each profile. + +### Vcpkg as a Submodule + +When using vcpkg as a submodule of your project, +you can add the following to your CMakeLists.txt before the first `project()` call, +instead of passing `CMAKE_TOOLCHAIN_FILE` to the cmake invocation. + +```cmake +set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" + CACHE STRING "Vcpkg toolchain file") +``` + +This will still allow people to not use vcpkg, +by passing the `CMAKE_TOOLCHAIN_FILE` directly, +but it will make the configure-build step slightly easier. + +[getting-started:using-a-package]: docs/examples/installing-and-using-packages.md +[getting-started:integration]: docs/users/buildsystems/integration.md +[getting-started:git]: https://git-scm.com/downloads +[getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools +[getting-started:linux-gcc]: #installing-linux-developer-tools +[getting-started:macos-dev-tools]: #installing-macos-developer-tools +[getting-started:macos-brew]: #installing-gcc-on-macos +[getting-started:macos-gcc]: #installing-gcc-on-macos +[getting-started:visual-studio]: https://visualstudio.microsoft.com/ +[getting-started:manifest-spec]: docs/specifications/manifests.md + +# Tab-Completion/Auto-Completion + +`vcpkg` supports auto-completion of commands, package names, +and options in both powershell and bash. +To enable tab-completion in the shell of your choice, run: + +```pwsh +> .\vcpkg integrate powershell +``` + +or + +```sh +$ ./vcpkg integrate bash # or zsh +``` + +depending on the shell you use, then restart your console. + +# Examples + +See the [documentation](docs/README.md) for specific walkthroughs, +including [installing and using a package](docs/examples/installing-and-using-packages.md), +[adding a new package from a zipfile](docs/examples/packaging-zipfiles.md), +and [adding a new package from a GitHub repo](docs/examples/packaging-github-repos.md). + +Our docs are now also available online at our website https://vcpkg.io/. We really appreciate any and all feedback! You can submit an issue in https://github.com/vcpkg/vcpkg.github.io/issues. + +See a 4 minute [video demo](https://www.youtube.com/watch?v=y41WFKbQFTw). + +# Contributing + +Vcpkg is an open source project, and is thus built with your contributions. +Here are some ways you can contribute: + +* [Submit Issues][contributing:submit-issue] in vcpkg or existing packages +* [Submit Fixes and New Packages][contributing:submit-pr] + +Please refer to our [Contributing Guide](CONTRIBUTING.md) for more details. + +This project has adopted the [Microsoft Open Source Code of Conduct][contributing:coc]. +For more information see the [Code of Conduct FAQ][contributing:coc-faq] +or email [opencode@microsoft.com](mailto:opencode@microsoft.com) +with any additional questions or comments. + +[contributing:submit-issue]: https://github.com/microsoft/vcpkg/issues/new/choose +[contributing:submit-pr]: https://github.com/microsoft/vcpkg/pulls +[contributing:coc]: https://opensource.microsoft.com/codeofconduct/ +[contributing:coc-faq]: https://opensource.microsoft.com/codeofconduct/ + +# License + +The code in this repository is licensed under the [MIT License](LICENSE.txt). The libraries +provided by ports are licensed under the terms of their original authors. Where available, vcpkg +places the associated license(s) in the location `installed//share//copyright`. + +# Security + +Most ports in vcpkg build the libraries in question using the original build system preferred +by the original developers of those libraries, and download source code and build tools from their +official distribution locations. For use behind a firewall, the specific access needed will depend +on which ports are being installed. If you must install in in an "air gapped" environment, consider +installing once in a non-"air gapped" environment, populating an +[asset cache](docs/users/assetcaching.md) shared with the otherwise "air gapped" environment. + +# Telemetry + +vcpkg collects usage data in order to help us improve your experience. +The data collected by Microsoft is anonymous. +You can opt-out of telemetry by +- running the bootstrap-vcpkg script with -disableMetrics +- passing --disable-metrics to vcpkg on the command line +- setting the VCPKG_DISABLE_METRICS environment variable + +Read more about vcpkg telemetry at docs/about/privacy.md diff --git a/externals/vcpkg/README_es.md b/externals/vcpkg/README_es.md new file mode 100755 index 000000000..dad810127 --- /dev/null +++ b/externals/vcpkg/README_es.md @@ -0,0 +1,405 @@ +# Vcpkg + +[中文总览](README_zh_CN.md) +[English](README.md) +[한국어](README_ko_KR.md) +[Français](README_fr.md) + +Vcpkg ayuda a manejar bibliotecas de C y C++ en Windows, Linux y MacOS. +Esta herramienta y ecosistema se encuentran en constante evolución ¡Siempre apreciamos contribuciones nuevas! + +Si nunca ha usado Vcpkg antes, +o si está intentando aprender a usar vcpkg, consulte nuestra sección +[Primeros pasos](#primeros-pasos) para iniciar a usar Vcpkg. + +Para una descripción corta de los comandos disponibles, +una vez instalado Vcpkg puede ejecutar `vcpkg help`, o +`vcpkg help [comando]` para obtener ayuda específica de un comando. + +* ports en: [vcpkg GitHub](https://github.com/microsoft/vcpkg) +* este programa en: [vcpkg-tool GitHub](https://github.com/microsoft/vcpkg-tool) +* [Slack](https://cppalliance.org/slack/), en el canal #vcpkg +* Discord: [\#include \](https://www.includecpp.org), en el canal #ðŸŒvcpkg +* Docs: [Documentación](docs/README.md) + +## Tabla de contenido + +- [Vcpkg](#vcpkg) + - [Tabla de contenido](#tabla-de-contenido) + - [Primeros pasos](#primeros-pasos) + - [Inicio Rápido: Windows](#inicio-rápido-windows) + - [Inicio rápido: Unix](#inicio-rápido-unix) + - [Instalando Herramientas de desarrollo en Linux](#instalando-herramientas-de-desarrollo-en-linux) + - [Instalando Herramientas de desarrollo en macOS](#instalando-herramientas-de-desarrollo-en-macos) + - [Usando Vcpkg con CMake](#usando-vcpkg-con-cmake) + - [Visual Studio Code con CMake Tools](#visual-studio-code-con-cmake-tools) + - [Vcpkg con proyectos de Visual Studio(CMake)](#vcpkg-con-proyectos-de-visual-studiocmake) + - [Vcpkg con CLion](#vcpkg-con-clion) + - [Vcpkg como Submódulo](#vcpkg-como-submódulo) + - [Inicio rápido: Manifiestos](#inicio-rápido-manifiestos) + - [Completado-Tab/Autocompletado](#completado-tabautocompletado) + - [Ejemplos](#ejemplos) + - [Contribuyendo](#contribuyendo) + - [Licencia](#licencia) +- [Seguridad](#seguridad) + - [Telemetría](#telemetría) + +## Primeros pasos + +Antes de iniciar, siga la guía ya sea para [Windows](#inicio-rápido-windows), +o [macOS y Linux](#inicio-rápido-unix) dependiendo del SO que use. + +Para más información, ver [Instalando y Usando Paquetes][getting-started:using-a-package]. +Si una biblioteca que necesita no está presente en el catálogo de vcpkg, +puede [abrir una incidencia en el repositorio de GitHub][contributing:submit-issue] +donde el equipo de vcpkg y la comunidad pueden verlo, y potencialmente hacer un port a vcpkg. + +Después de tener Vcpkg instalado y funcionando, +puede que desee añadir [completado con tab](#Completado-TabAuto-Completado) en su terminal. + +Finalmente, si está interesado en el futuro de Vcpkg, +puede ver la guía de [archivos de manifiesto][getting-started:manifest-spec]! +esta es una característica experimental y es probable que tenga errores, +así que se recomienda revisar y [crear incidencias][contributing:submit-issue]! + +### Inicio Rápido: Windows + +Prerrequisitos: + +- Windows 7 o superior +- [Git][getting-started:git] +- [Visual Studio][getting-started:visual-studio] 2015 Update 3 o superior con el paquete Inglés de Visual Studio. + +Primero, descargue y compile vcpkg; puede ser instalado en cualquier lugar, +pero generalmente recomendamos usar vcpkg como submódulo para proyectos de CMake, +e instalándolo globalmente para Proyectos de Visual Studio. +recomendamos un lugar como `C:\src\vcpkg` o `C:\dev\vcpkg`, +ya que de otra forma puede encontrarse problemas de ruta para algunos sistemas de port. + +```cmd +> git clone https://github.com/microsoft/vcpkg +> .\vcpkg\bootstrap-vcpkg.bat +``` + +Para instalar las bibliotecas para su proyecto, ejecute: + +```cmd +> .\vcpkg\vcpkg install [paquetes a instalar] +``` + +también puede buscar bibliotecas que necesite usar el comando `search`: + +```cmd +> .\vcpkg\vcpkg search [término de búsqueda] +``` + +Para poder utilizar vcpkg con Visual Studio, +ejecute el siguiente comando (puede requerir privilegios de administrador): + +```cmd +> .\vcpkg\vcpkg integrate install +``` + +Después de esto, puede crear un nuevo proyecto que no sea de CMake(MSBuild) o abrir uno existente. +Todas las bibliotecas estarán listas para ser incluidas y +usadas en su proyecto sin configuración adicional. + +Si está usando CMake con Visual Studio, +continúe [aquí](#vcpkg-con-proyectos-de-visual-studio\(CMake\)). + +Para utilizar Vcpkg con CMake sin un IDE, +puede utilizar el archivo de herramientas incluido: + +```cmd +> cmake -B [directorio de compilación] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" +> cmake --build [directorio de compilación] +``` + +Con CMake, todavía necesitara `find_package` y las configuraciones adicionales de la biblioteca. +Revise la [Sección de Cmake](#usando-vcpkg-con-cmake) para más información, +incluyendo el uso de CMake con un IDE. + +Para cualquier otra herramienta, incluyendo Visual Studio Code, +reviste la [guía de integración][getting-started:integration]. + +### Inicio rápido: Unix + +Prerrequisitos para Linux: + +- [Git][getting-started:git] +- [G++/GCC][getting-started:linux-gcc] >= 6 + +Prerrequisitos para macOS: + +- [Herramientas de desarrollo de Apple][getting-started:macos-dev-tools] + +Primero, descargue y compile vcpkg, puede ser instalado donde sea, +pero recomendamos usar vcpkg como submodulo para proyectos de CMake. + +```sh +$ git clone https://github.com/microsoft/vcpkg +$ ./vcpkg/bootstrap-vcpkg.sh +``` + +Para instalar las bibliotecas para su proyecto, ejecute: + +```sh +$ ./vcpkg/vcpkg install [paquetes a instalar] +``` + +Nota: por defecto se instalarán las bibliotecas x86, para instalar x64, ejecute: + +```cmd +> .\vcpkg\vcpkg install [paquete a instalar]:x64-windows +``` + +O si desea instalar varios paquetes: + +```cmd +> .\vcpkg\vcpkg install [paquetes a instalar] --triplet=x64-windows +``` + +También puede buscar las bibliotecas que necesita con el subcomando `search`: + +```sh +$ ./vcpkg/vcpkg search [término de búsqueda] +``` + +Para usar vcpkg con CMake, tiene que usar el siguiente archivo toolchain: + +```sh +$ cmake -B [directorio de compilación] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" +$ cmake --build [directorio de compilación] +``` + +Con CMake, todavía necesitara `find_package` y las configuraciones adicionales de la biblioteca. +Revise la [Sección de CMake](#usando-vcpkg-con-cmake) +para más información en cómo aprovechar mejor Vcpkg con CMake, +y CMake tools para VSCode. + +Para cualquier otra herramienta, visite la [guía de integración][getting-started:integration]. + +### Instalando Herramientas de desarrollo en Linux + +Según las distribuciones de Linux, hay diferentes paquetes +que necesitará instalar: + +- Debian, Ubuntu, popOS, y otra distribución basada en Debian: + +```sh +$ sudo apt-get update +$ sudo apt-get install build-essential tar curl zip unzip +``` + +- CentOS + +```sh +$ sudo yum install centos-release-scl +$ sudo yum install devtoolset-7 +$ scl enable devtoolset-7 bash +``` + +Para cualquier otra distribución, asegúrese que dispone de g++ 6 o superior. +Si desea añadir instrucción para una distribución específica, +[cree un pull request][contributing:submit-pr] + +### Instalando Herramientas de desarrollo en macOS + +En macOS 10.15, solo tiene que ejecutar el siguiente comando en la terminal: + +```sh +$ xcode-select --install +``` + +Luego seguir los pasos que aparecerán en las ventanas que se muestran. + +Posteriormente podrá compilar vcpkg junto con la [guía de inicio rápido](#inicio-rápido-unix) + +### Usando Vcpkg con CMake + +¡Si está usando Vcpkg con CMake, lo siguiente puede ayudar! + +#### Visual Studio Code con CMake Tools + +Agregando lo siguiente al espacio de trabajo `settings.json` permitirá que +CMake Tools use automáticamente Vcpkg para las bibliotecas: + +```json +{ + "cmake.configureSettings": { + "CMAKE_TOOLCHAIN_FILE": "[raíz de vcpkg]/scripts/buildsystems/vcpkg.cmake" + } +} +``` + +#### Vcpkg con proyectos de Visual Studio(CMake) + +Abra el editor de Ajustes de CMake, bajo la sección `CMake toolchain file`, +posteriormente agregue al path el archivo de cadena de herramientas de Vcpkg: + +```sh +[raíz de vcpkg]/scripts/buildsystems/vcpkg.cmake +``` + +#### Vcpkg con CLion + +Abra los ajustes de Cadena de Herramientas (Toolchains) +(File > Settings en Windows y Linux, Clion > Preferences en macOS), +y entre en la sección de ajustes de CMake (Build, Execution, Deployment > CMake). +Finalmente, en `CMake options`, agregue la línea siguiente: + +```sh +-DCMAKE_TOOLCHAIN_FILE=[vcpkg root]/scripts/buildsystems/vcpkg.cmake +``` + +Desafortunadamente, tendrá que hacerlo para cada perfil. + +#### Vcpkg como Submódulo + +Cuando este usando Vcpkg como un submódulo para su proyecto, +puede agregar lo siguiente as su CMakeLists,txt antes de la primera llamada a `project()`, +en vez de pasar `CMAKE_TOOLCHAIN_FILE` a la invocación de CMake. + +```cmake +set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" + CACHE STRING "Vcpkg toolchain file") +``` + +Esto permitirá a las personas no usar Vcpkg, +indicando el `CMAKE_TOOLCHAIN_FILE` directamente, +sin embargo, hará el proceso de configuración y compilación más sencillo. + +### Inicio rápido: Manifiestos + +Así que desea ver cómo será el futuro de Vcpkg! +realmente lo apreciamos. Sin embargo, primero una advertencia: +el soporte de archivos de manifiesto aún está en beta, +aun así la mayoría debería funcionar, +pero no hay garantía de esto y es muy probable que encuentre uno o más bugs +mientras use Vcpkg en este modo. +Adicionalmente, es probablemente que se rompan comportamientos antes de que se pueda considerar estable, +así que está advertido. +Por favor [Abra un Problema][contributing:submit-issue] si encuentra algún error + +Primero, instale vcpkg normalmente para [Windows](#inicio-rápido-windows) o +[Unix](#inicio-rápido-unix). +Puede que desee instalar Vcpkg en un lugar centralizado, +ya que el directorio existe localmente, +y está bien ejecutar múltiples comandos desde el mismo directorio de vcpkg al mismo tiempo. + +Luego, se requiere activar la bandera de característica `manifests` en vcpkg agregando +`manifests` a los valores separados por coma en la opción `--feature-flags`, +o agregándole en los valores separados por coma en la variable de entorno `VCPKG_FEATURE_FLAGS` + +también puede que desee agregar Vcpkg al `PATH`. + +Luego, todo lo que hay que hacer es crear un manifiesto; +cree un archivo llamado `vcpkg.json`, y escriba lo siguiente: + +```json +{ + "name": "", + "version-string": "", + "dependencies": [ + "abseil", + "boost" + ] +} +``` + +Las bibliotecas serán instaladas en el directorio `vcpkg_installed`, +en el mismo directorio que su `vcpkg.json`. +Si puede usar el regular conjunto de herramientas de CMake, +o mediante la integración de Visual Studio/MSBuild, +este instalará las dependencias automáticamente, +pero necesitará ajustar `VcpkgManifestEnabled` en `On` para MSBuild. +Si desea instalar sus dependencias sin usar CMake o MSBuild, +puede usar un simple `vcpkg install --feature-flags=manifests` + +Para más información, revise la especificación de [manifiesto][getting-started:manifest-spec] + +[getting-started:using-a-package]: docs/examples/installing-and-using-packages.md +[getting-started:integration]: docs/users/buildsystems/integration.md +[getting-started:git]: https://git-scm.com/downloads +[getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools +[getting-started:linux-gcc]: #Instalando-Herramientas-de-desarrollo-en-Linux +[getting-started:macos-dev-tools]: #Instalando-Herramientas-de-desarrollo-en-macOS +[getting-started:visual-studio]: https://visualstudio.microsoft.com/ +[getting-started:manifest-spec]: docs/specifications/manifests.md + +## Completado-Tab/Autocompletado + +`vcpkg` soporta autocompletado para los comandos, nombres de paquetes, +y opciones, tanto en PowerShell como en bash. +para activar el autocompletado en la terminal de elección ejecute: + +```pwsh +> .\vcpkg integrate powershell +``` + +o + +```sh +$ ./vcpkg integrate bash # o zsh +``` + +según la terminal que use, luego reinicie la consola. + +## Ejemplos + +ver la [documentación](docs/README.md) para tutoriales específicos, incluyendo +[instalando y usando un paquete](docs/examples/installing-and-using-packages.md), +[agregando un nuevo paquete desde un archivo comprimido](docs/examples/packaging-zipfiles.md), +[agregando un nuevo paquete desde un repositorio en GitHub](docs/examples/packaging-github-repos.md). + +Nuestra documentación también esta disponible en nuestro sitio web [vcpkg.io](https://vcpkg.io/). +Si necesita ayuda puede [crear un incidente](https://github.com/vcpkg/vcpkg.github.io/issues). +¡Apreciamos cualquier retroalimentación! + +Ver un [video de demostración](https://www.youtube.com/watch?v=y41WFKbQFTw) de 4 minutos. + +## Contribuyendo + +Vcpkg es un proyecto de código abierto, y está construido con sus contribuciones. +Aquí hay unas de las maneras en las que puede contribuir: + +* [Creando Incidencias][contributing:submit-issue] en vcpkg o paquetes existentes +* [Creando Correcciones y Nuevos Paquetes][contributing:submit-pr] + +Por favor visite nuestra [Guía de Contribución](CONTRIBUTING.md) para más detalles. + +Este proyecto ha adoptado el [Código de Conducta de Microsoft de Código Abierto][contributing:coc]. +Para más información ver [Preguntas frecuentes del Código de Conducta][contributing:coc-faq] +o envíe un correo a [opencode@microsoft.com](mailto:opencode@microsoft.com) +con cualquier pregunta adicional o comentarios. + +[contributing:submit-issue]: https://github.com/microsoft/vcpkg/issues/new/choose +[contributing:submit-pr]: https://github.com/microsoft/vcpkg/pulls +[contributing:coc]: https://opensource.microsoft.com/codeofconduct/ +[contributing:coc-faq]: https://opensource.microsoft.com/codeofconduct/ + +## Licencia + +El código en este repositorio se encuentra licenciado mediante la [Licencia MIT](LICENSE.txt). +Las bibliotecas proveídas por los `ports` están licenciadas mediante los terminos de los autores originales. +Donde estén disponibles, vcpkg almacena las licencias asociadas en la siguiente ubicación `installed//share//copyright`. + +# Seguridad + +La mayoría de los `ports` en vcpkg construyen las bibliotecas usando su sistema de compilación preferido +por los autores originales de las bibliotecas, y descargan el código fuente asi como las herramientas de compilación +de sus ubicaciones de distribucion oficiales. Para aquellos que usan un firewall, el acceso dependerá de cuales `ports` +están siendo instalados. Si tiene que instalarlos en un entorno aislado, puede instalarlos previamente en un entorno +no aislado, generando un [caché del paquete](docs/users/assetcaching.md) compartido con el entorno aislado. + +## Telemetría + +vcpkg recolecta datos de uso para mejorar su experiencia. +La información obtenida por Microsoft es anónima. +puede ser dado de baja de la telemetría realizando lo siguiente: + +- ejecutar el script `bootstrap-vcpkg` con el parametro `-disableMetrics` +- agregar el parametro `--disable-metrics` a vcpkg en la línea de comandos +- agregar la variable de entorno `VCPKG_DISABLE_METRICS` + +Se puede leer más sobre la telemetría de vcpkg en docs/about/privacy.md diff --git a/externals/vcpkg/README_fr.md b/externals/vcpkg/README_fr.md new file mode 100755 index 000000000..140e8435b --- /dev/null +++ b/externals/vcpkg/README_fr.md @@ -0,0 +1,311 @@ +# Vcpkg: Vue d'ensemble + +[中文总览](README_zh_CN.md) +[Español](README_es.md) + +Vcpkg vous aide à gérer vos bibliothèques C et C++ sur Windows, Linux et MacOS. +L'outil et l'écosystème sont en évolution constante, et nous apprécions vos contributions! + +Si vous n'avez jamais utilisé vcpkg, ou si vous essayez d'utiliser vcpkg, lisez notre [introduction](#introduction) pour comprendre comment l'utiliser. + +Pour une description des commandes disponibles, quand vous avez installé vcpkg, vous pouvez lancer `vcpkg help` ou `vcpkg help [commande]` pour de l'aide spécifique à une commande. + + +* Github: [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg) +* Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/), the #vcpkg channel +* Discord: [\#include \](https://www.includecpp.org), le canal #ðŸŒvcpkg +* Docs: [Documentation](docs/README.md) + +[![Build Status](https://dev.azure.com/vcpkg/public/_apis/build/status/microsoft.vcpkg.ci?branchName=master)](https://dev.azure.com/vcpkg/public/_build/latest?definitionId=29&branchName=master) + +# Sommaire + +- [Vcpkg: Vue d'ensemble](#vcpkg-vue-d'ensemble) +- [Sommaire](#Sommaire) +- [Introduction](#introduction) + - [Introduction Windows](#Introduction:-Windows) + - [Introduction Unix](#Introduction-aux-Systèmes-Unix) + - [Installer les prérequis pour linux](#installation-des-prérequis-linux) + - [Installer les prérequis pour macOS](#installation-des-prérequis-macos) + - [Installer GCC pour macOS avant 10.15](#installer-gcc-pour-macos-avant-10.15) + - [Utiliser vcpkg avec CMake](#utiliser-vcpkg-avec-cmake) + - [Visual Studio Code avec CMake Tools](#visual-studio-code-avec-cmake-tools) + - [Vcpkg avec Visual Studio pour un projet CMake](#vcpkg-avec-visual-studio-un-projet-cmake) + - [Vcpkg avec CLion](#vcpkg-avec-clion) + - [Vcpkg en tant que sous module](#vcpkg-en-tant-que-sous-module) + - [Tab-Completion/Auto-Completion](#tab-complétionauto-complétion) + - [Exemples](#exemples) + - [Contribuer](#contribuer) + - [Licence](#licence) + - [Télémétrie](#Télémétrie) + +# Introduction + +Premièrement, suivez le guide d'introduction [Windows](#Introduction:-Windows), ou [macOS et Linux](#Unix), en fonction de vos besoins. + +Pour plus d'information, regardez [utiliser des paquets][getting-started:utiliser-un-paquet]. +Si la bibliothèque dont vous avez besoin n'est pas présente dans la liste, vous pouvez [ouvrir une issue sur le repo github](contribuer:faire-une-issue) où l'équipe de vcpkg et la communauté peuvent le voir, et possiblement ajouter le port de vcpkg. + +Après avoir installé et lancé vcpkg vous pourriez vouloir ajouter [l'auto-complétion](auto-completion) à votre shell. + +Si vous êtes intéressé par le futur de vcpkg, regardez le guide du [manifeste][getting-started:manifest-spec] ! +C'est une fonctionnalité expérimentale et possiblement boguée, donc essayez d'[ouvrir des issues](contribuer:envoyer-une-issue) ! + +# Introduction: Windows +Prérequis : + - Windows 7 ou plus + - [Git][getting-started:git] + + [Visual Studio][getting-started:visualstudio] 2015 mise à jour 3 où plus récente avec le pack de langue Anglais + +Premièrement, téléchargez et lancer le fichier bootstrap-vcpkg; il peut être installé n'importe où mais il est recommandé d'utiliser vcpkg pour des projets CMake. Nous recommandons ces chemins `C:\src\vcpkg` ou `C:\dev\vcpkg`, sinon vous pourriez avoir des problèmes de chemin pour certaines compilations. + + +```cmd +> git clone https://github.com/microsoft/vcpkg +> .\vcpkg\bootstrap-vcpkg.bat +``` + +Pour installer des bibliothèques pour votre projet, lancez: + +```cmd +> .\vcpkg\vcpkg install [paquets à installer] +``` + +Vous pouvez aussi chercher la bibliothèque dont vous avez besoin avec l'argument `search`: + +```cmd +> .\vcpkg\vcpkg search [terme de recherche] +``` + + +Pour utiliser vcpkg avec Visual Studio, lancez cette commande (pourrait nécessiter d'être lancée avec les droits administrateur) + +```cmd +> .\vcpkg\vcpkg integrate install +``` + +Ensuite, vous pouvez créer un nouveau projet n'utilisant pas CMake (ou en ouvrir un préexistant). +Toutes les bibliothèques installées sont directement prêtes à être `#include` et utilisées sans davantage de configuration. + +Si vous utilisez CMake avec Visual Studio continuez [ici](#vcpkg-avec-cmake-et-visual-studio). + +Afin d'utiliser vcpkg en dehors d'un IDE, vous pouvez utiliser le fichier de toolchain : + +```cmd +> cmake -B [dossier de build] -S . "-DCMAKE_TOOLCHAIN_FILE=[chemin vers vcpkg]/scripts/buildsystems/vcpkg.cmake" +> cmake --build [dossier de build] +``` + +Avec CMake, vous devrez utiliser `find_package` notamment, et autres, pour compiler. + +Regardez la [section CMake](#utiliser-vcpkg-avec-cmake) pour plus d'information, notamment utiliser CMake avec un IDE. + +Pour les autres éditeurs, y compris Visual Studio Code regardez le [guide d'intégration](getting-started:integration). + + +## Introduction aux Systèmes Unix + +Prérequis pour Linux : +- [Git][getting-started:git] +- [g++][getting-started:linux-gcc] >= 6 + +Prérequis pour macOS: +- [Outils de développement Apple][getting-started:macos-dev-tools] +- Pour macOS 10.14 et en dessous, vous aurez besoin de: + - [Homebrew][getting-started:macos-brew] + - [g++][getting-started:macos-gcc] >= 6 + +Premièrement, clonez et lancez le bootstrap vcpkg; il peut être installé n'importe où mais il est recommandé de l'utiliser comme un sous-module pour projets CMake. + +```sh +$ git clone https://github.com/microsoft/vcpkg +$ ./vcpkg/bootstrap-vcpkg.sh +``` + +Pour installer des bibliothèques pour votre projet, lancez : + +```sh +$ ./vcpkg/vcpkg install [paquets à installer] +``` + +Vous pouvez aussi chercher la bibliothèque dont vous avez besoin avec l'argument `search` : + + +```sh +$ ./vcpkg/vcpkg search [terme de recherche] +``` + +Pour utiliser vcpkg en dehors d'un IDE, vous pouvez utiliser le fichier de toolchain : + +```cmd +> cmake -B [dossier de build] -S . "-DCMAKE_TOOLCHAIN_FILE=[chemin vers vcpkg]/scripts/buildsystems/vcpkg.cmake" +> cmake --build [dossier de build] +``` + +Avec CMake, vous devrez utiliser `find_package` notamment, et autres, pour compiler. + +Lisez la [section CMake](#utiliser-vcpkg-avec-cmake) pour plus d'information, notamment utiliser CMake avec un IDE. + +Pour les autres éditeurs, y compris Visual Studio Code lisez le [guide d'intégration][getting-started:integration]. + +## Installation des prérequis linux + +Pour les différentes distros Linux, il y a différents paquets que vous aurez besoin d'installer : + +- Debian, Ubuntu, popOS, et les autres distros basées sur Debian : + +```sh +$ sudo apt-get update +$ sudo apt-get install build-essential tar curl zip unzip +``` + +- CentOS + +```sh +$ sudo yum install centos-release-scl +$ sudo yum install devtoolset-7 +$ scl enable devtoolset-7 bash +``` + +Pour les autres distributions, installez au minimum g++ 6. +Si vous voulez ajouter des instructions spécifiques pour votre distro, [ouvrez une PR svp][contribuer:faire-une-pr] ! + +## Installation des prérequis macOS + +Pour macOS 10.15, la seule chose dont vous avez besoin est de lancer cette commande : + +```sh +$ xcode-select --install +``` + +Ensuite suivez les instructions qui s'afficheront dans la fenêtre. + +Pour macOS 10.14 et les versions précédentes, vous aurez besoin d'installer g++ avec homebrew; suivez les instructions dans la section suivante. + +### Installer GCC pour macOS antérieur à 10.15 + +Cette partie est seulement nécessaire si vous avez une version de macOS antérieure à 10.15. + +Installer homebrew devrait être très simple; pour plus d'informations allez sur , mais le plus simple est de lancer la commande suivante : + +```sh +$ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" +``` + +Ensuite, afin d'obtenir une version à jour de gcc, lancez la commande suivante : + +```sh +$ brew install gcc +``` + +Ensuite suivez l'[introduction Unix](#Introduction-aux-Systèmes-Unix) + +## Utiliser vcpkg avec CMake + +Si vous utilisez vcpkg avec CMake, la suite pourrait vous aider ! + +## Visual Studio Code avec CMake tools + +```json +{ + "cmake.configureSettings": { + "CMAKE_TOOLCHAIN_FILE": "[vcpkg root]/scripts/buildsystems/vcpkg.cmake" + } +} +``` +### Vcpkg avec des projets CMake Visual Studio + +Ouvrez les paramètres CMake, et ajoutez le chemin ci-dessous à `CMake toolchain file` : + +``` +[vcpkg root]/scripts/buildsystems/vcpkg.cmake +``` + +### Vcpkg avec CLion + +Ouvrez les paramètres de Toolchains (File > Settings sur Windows et Linux, CLion > Preference pour macOS) et allez dans les paramètres CMake (Build, Execution, Deployment > CMake). +Finalement, dans `CMake options`, ajoutez la ligne suivante : + +``` +-DCMAKE_TOOLCHAIN_FILE=[vcpkg root]/scripts/buildsystems/vcpkg.cmake +``` + +Malheureusement, vous devrez le refaire pour chaque projet. + + +### Vcpkg en tant que sous-module + +Quand vous utilisez vcpkg comme un sous-module de votre projet, vous pouvez l'ajouter à votre CMakeLists.txt avant le premier appel de `project()`, au lieu d'utiliser `CMAKE_TOOLCHAIN_FILE` dans les paramètres d'appel de cmake. + +```cmake +set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" + CACHE STRING "Vcpkg toolchain file") +``` + +Cela permettra toujours aux gens de ne pas utiliser vcpkg, en passant directement le CMAKE_TOOLCHAIN_FILE, mais cela rendra l'étape de configuration-construction légèrement plus facile. + +[getting-started:utiliser-un-paquet]: docs/examples/installing-and-using-packages.md +[getting-started:integration]: docs/users/buildsystems/integration.md +[getting-started:git]: https://git-scm.com/downloads +[getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools +[getting-started:linux-gcc]: #installing-linux-developer-tools +[getting-started:macos-dev-tools]: #installing-macos-developer-tools +[getting-started:macos-brew]: #installing-gcc-on-macos +[getting-started:macos-gcc]: #installing-gcc-on-macos +[getting-started:visual-studio]: https://visualstudio.microsoft.com/ +[getting-started:manifest-spec]: docs/specifications/manifests.md + +# Tab-complétion/Auto-complétion + +`vcpkg` supporte l'auto-complétion des commandes, nom de paquets, et options dans powershell et bash. +Pour activer la tab-complétion dans le shell de votre choix : + +```pwsh +> .\vcpkg integrate powershell +``` + +ou + +```sh +$ ./vcpkg integrate bash +``` + +selon le shell que vous utilisez, puis redémarrez la console. + +# Exemples + +Lisez la [documentation](doc/README.md) pour des instructions plus spécifiques ainsi que [l'installation et l'utilisation des paquets](docs/examples/installing-and-using-packages.md), +[ajouter un nouveau paquet depuis un fichier zip](docs/examples/packaging-zipfiles.md), +et [ajouter un nouveau paquet depuis un dépôt GitHub](docs/examples/packaging-github-repos.md). + +La documentation est aussi disponible en ligne sur ReadTheDocs : ! + +Regardez une [démo vidéo]((https://www.youtube.com/watch?v=y41WFKbQFTw) de 4 minutes en anglais. + +# Contribuer + +Vcpkg est un projet open source, et évolue ainsi avec vos contributions. +Voici quelques moyens pour vous d'y contribuer : +* [Soumettre des Issues][contributing:submit-issue] sur vcpkg ou des paquets existants +* [Proposer des corrections et de nouveaux paquets][contributing:submit-pr] + + +Veuillez vous référer au [guide de contribution](CONTRIBUTING.md) pour plus de détails. + + +Ce projet a adopté le [Code de Conduite Open Source de Microsoft][contribuer:coc]. +[contributing:submit-issue]: https://github.com/microsoft/vcpkg/issues/new/choose +[contributing:submit-pr]: https://github.com/microsoft/vcpkg/pulls +[contributing:coc]: https://opensource.microsoft.com/codeofconduct/ +[contributing:coc-faq]: https://opensource.microsoft.com/codeofconduct/ + +# Licence +Le code sur ce dépôt est distribué sous [licence MIT](LICENSE.txt). + +# Télémétrie + +vcpkg collecte des données pour nous aider à améliorer votre expérience. +Les données collectées par Microsoft sont anonymes. +Vous pouvez désactiver la télémétrie en relançant le bootstrap-vcpkg avec l'argument `-disableMetrics`, passer l'argument `--disable-metrics` à chaque exécution de vcpkg, ou en créant une variable d'environnement nommée `VCPKG_DISABLE_METRICS`. + +Vous trouverez plus d'informations à propos de la télémétrie dans vcpkg sur cette [page](docs/about/privacy.md). diff --git a/externals/vcpkg/README_ko_KR.md b/externals/vcpkg/README_ko_KR.md new file mode 100755 index 000000000..2b0a93997 --- /dev/null +++ b/externals/vcpkg/README_ko_KR.md @@ -0,0 +1,346 @@ +# Vcpkg: 개요 + +[中文总览](README_zh_CN.md) +[Español](README_es.md) +[English](README.md) +[Français](README_fr.md) + +Vcpkg는 Windows, Linux ë° MacOSì—ì„œ C ë° C++ ë¼ì´ë¸ŒëŸ¬ë¦¬ë¥¼ 관리하는 ë° ë„ì›€ì„ ì£¼ëŠ” ë¼ì´ë¸ŒëŸ¬ë¦¬ìž…니다. +ì´ ë„구와 ìƒíƒœê³„는 지ì†ì ìœ¼ë¡œ 진화하고 있으며, ì €í¬ëŠ” 기여를 언제나 환ì˜í•©ë‹ˆë‹¤! + +ì´ì „ì— vcpkg를 사용한 ì ì´ 없거나 vcpkg를 사용하는 ë°©ë²•ì„ ì•Œê³  ì‹¶ì„ ê²½ìš°, +ì•„ëž˜ì˜ [시작하기](#시작하기) 단ë½ì„ 확ì¸í•˜ë©´ vcpkg ì‚¬ìš©ì„ ì‹œìž‘í•˜ëŠ” ë°©ë²•ì´ ì„¤ëª…ë˜ì–´ 있습니다. + +Vcpkg를 설치하였다면, `vcpkg help` 명령어로 사용 가능한 ëª…ë ¹ì–´ì— ëŒ€í•œ 간단한 ì„¤ëª…ì„ ë³¼ 수 있습니다. +`vcpkg help [command]` 명령어로는 ê° ëª…ë ¹ì–´ë³„ ë„움ë§ì„ ë³¼ 수 있습니다. + +* Github: port는 [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg)ì—, 관련 í”„ë¡œê·¸ëž¨ì€ [https://github.com/microsoft/vcpkg-tool](https://github.com/microsoft/vcpkg-tool)ì— ìžˆìŠµë‹ˆë‹¤. +* Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/), #vcpkg ì±„ë„ +* Discord: [\#include \](https://www.includecpp.org), #ðŸŒvcpkg ì±„ë„ +* ë„움ë§: [Documentation](docs/README.md) + +# 목차 + +- [Vcpkg: 개요](#vcpkg-개요) +- [목차](#목차) +- [시작하기](#시작하기) + - [빠르게 시작하기: Windows](#빠르게-시작하기-windows) + - [빠르게 시작하기: Unix](#빠르게-시작하기-unix) + - [Linux ê°œë°œìž ë„구 설치하기](#linux-개발ìž-ë„구-설치하기) + - [macOS ê°œë°œìž ë„구 설치하기](#macos-개발ìž-ë„구-설치하기) + - [CMake와 함께 vcpkg 사용](#cmake와-함께-vcpkg-사용) + - [Visual Studio Code와 CMake Tools](#visual-studio-code와-cmake-tools) + - [Vcpkg와 Visual Studio CMake 프로ì íŠ¸](#vcpkg와-visual-studio-cmake-프로ì íŠ¸) + - [Vcpkg와 CLion](#vcpkg와-clion) + - [서브모듈로 vcpkg 사용하기](#서브모듈로-vcpkg-사용하기) +- [탭 완성/ìžë™ 완성](#탭-완성ìžë™-완성) +- [예시](#예시) +- [기여하기](#기여하기) +- [ë¼ì´ì„ ìŠ¤](#ë¼ì´ì„ ìŠ¤) +- [보안](#보안) +- [ë°ì´í„° 수집](#ë°ì´í„°-수집) + +# 시작하기 + +먼저, 사용하는 ìš´ì˜ì²´ì œì— ë”°ë¼ +[윈ë„ìš°](#빠르게-시작하기-windows) ë˜ëŠ” [macOS와 Linux](#빠르게-시작하기-unix) +빠르게 시작하기 ê°€ì´ë“œë¥¼ ë”°ë¼ê°€ì„¸ìš”. + +ë” ìžì„¸í•œ 정보는 [패키지 설치 ë° ì‚¬ìš©][getting-started:using-a-package]ì— ìžˆìŠµë‹ˆë‹¤. +만약 필요한 ë¼ì´ë¸ŒëŸ¬ë¦¬ê°€ vcpkg ì¹´íƒˆë¡œê·¸ì— ì—†ëŠ” 경우, +[GitHub 저장소ì—ì„œ ì´ìŠˆë¥¼ ì—´ ​​수 있습니다][contributing:submit-issue]. +Vcpkg 팀과 커뮤니티가 ì´ìŠˆë¥¼ 확ì¸í•˜ë©´, 해당하는 port를 추가할 수 있습니다. + +Vcpkgì˜ ì„¤ì¹˜ê°€ 완료ë˜ì—ˆë‹¤ë©´, +ì…¸ì— [탭 완성](#탭-완성ìžë™-완성)ì„ ì¶”ê°€í•  수 있습니다. + +마지막으로, vcpkgì˜ ë¯¸ëž˜ì— ê´€ì‹¬ì´ ìžˆë‹¤ë©´, +[manifest][getting-started:manifest-spec] ê°€ì´ë“œë¥¼ 확ì¸í•˜ì„¸ìš”! +ì´ê²ƒì€ 실험ì ì¸ 기능ì´ë©° 버그가 ìžˆì„ ê°€ëŠ¥ì„±ì´ ë†’ìŠµë‹ˆë‹¤. +ì‹œë„í•´ë³´ê³  문제가 있다면 [ì´ìŠˆë¥¼ 열어주세요][contributing:submit-issue]! + +## 빠르게 시작하기: Windows + +필요조건: +- Windows 7 ì´ìƒ +- [Git][getting-started:git] +- [Visual Studio][getting-started:visual-studio] ì˜ì–´ ì–¸ì–´íŒ©ì´ ì„¤ì¹˜ëœ 2015 Update 3 버전 ì´ìƒ + +첫번째로, vcpkg ìžì²´ë¥¼ 다운로드하고 부트스트랩합니다. Vcpkg는 ì–´ë””ì—나 설치할 수 있지만, +ì¼ë°˜ì ìœ¼ë¡œ CMake 프로ì íŠ¸ëŠ” vcpkg를 submoduleë¡œ 사용하는 것ì„, +Visual Studio 프로ì íŠ¸ëŠ” ì‹œìŠ¤í…œì— ì„¤ì¹˜í•˜ëŠ” ê²ƒì„ ì¶”ì²œí•©ë‹ˆë‹¤. +시스템 설치는 `C:\src\vcpkg` 나 `C:\dev\vcpkg` ë“±ì˜ ìœ„ì¹˜ì— í•˜ëŠ” ê²ƒì„ ê¶Œìž¥í•˜ëŠ”ë°, +그렇지 않으면 ì¼ë¶€ í¬íŠ¸ 빌드 시스템ì—ì„œ 경로 문제가 ë°œìƒí•  ìˆ˜ë„ ìžˆê¸° 때문입니다. + +```cmd +> git clone https://github.com/microsoft/vcpkg +> .\vcpkg\bootstrap-vcpkg.bat +``` + +ë‹¹ì‹ ì˜ í”„ë¡œì íŠ¸ì— ë¼ì´ë¸ŒëŸ¬ë¦¬ë¥¼ 설치하려면 ë‹¤ìŒ ëª…ë ¹ì„ ì‹¤í–‰í•˜ì„¸ìš”. + +```cmd +> .\vcpkg\vcpkg install [packages to install] +``` + +참고로, 위 ëª…ë ¹ì€ x86 ë¼ì´ë¸ŒëŸ¬ë¦¬ë¥¼ 설치하는 ê²ƒì´ ê¸°ë³¸ 설정입니다. 만약 x64 ë²„ì „ì„ +설치하고 싶다면, ë‹¤ìŒ ëª…ë ¹ì„ ì‹¤í–‰í•˜ì„¸ìš”. + +```cmd +> .\vcpkg\vcpkg install [package name]:x64-windows +``` + +ë˜ëŠ” ì´ë ‡ê²Œë„ 가능합니다. + +```cmd +> .\vcpkg\vcpkg install [packages to install] --triplet=x64-windows +``` + +다ìŒê³¼ ê°™ì´ `search` 하위 명령어를 사용하여 필요한 ë¼ì´ë¸ŒëŸ¬ë¦¬ë¥¼ 검색할 ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤. + +```cmd +> .\vcpkg\vcpkg search [search term] +``` + +Visual Studioì—ì„œ vcpkg를 사용하려면 +ë‹¤ìŒ ëª…ë ¹ì„ ì‹¤í–‰í•´ì•¼ 합니다(ê´€ë¦¬ìž ê¶Œí•œì´ í•„ìš”í•  ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤). + +```cmd +> .\vcpkg\vcpkg integrate install +``` + +ì´ì œ CMake를 사용하지 않는 프로ì íŠ¸ë„ 만들 수 (ë˜ëŠ” 기존 프로ì íŠ¸ë¥¼ ì—´ 수) 있습니다. +설치한 모든 ë¼ì´ë¸ŒëŸ¬ë¦¬ëŠ” 추가 설정 ì—†ì´ë„ 프로ì íŠ¸ì—ì„œ 즉시 `# include` ë° ì‚¬ìš©í•  수 있습니다. + +Visual Studioì—ì„œ CMake를 사용하는 경우, +[여기를 보세요](#vcpkg와-visual-studio-cmake-프로ì íŠ¸). + +IDE 외부ì—ì„œ CMake와 함께 vcpkg를 사용하려면, +다ìŒê³¼ ê°™ì´ íˆ´ì²´ì¸ íŒŒì¼ì„ 사용할 수 있습니다. + +```cmd +> cmake -B [build directory] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" +> cmake --build [build directory] +``` + +CMakeì—ì„œ ë¼ì´ë¸ŒëŸ¬ë¦¬ë¥¼ 사용하려면 여전히 `find_package` ë“±ì´ í•„ìš”í•©ë‹ˆë‹¤. +CMake를 IDE와 사용하는 ë°©ë²•ì„ í¬í•¨í•œ +ìžì„¸í•œ 정보는 [CMake 섹션](#cmake와-함께-vcpkg-사용)ì„ í™•ì¸í•˜ì„¸ìš”. + +Visual Studio Code를 í¬í•¨í•œ 다른 íˆ´ì˜ ê²½ìš° +[통합 ê°€ì´ë“œ][getting-started:integration]를 확ì¸í•˜ì„¸ìš”. + +## 빠르게 시작하기: Unix + +Linuxì—ì„œì˜ í•„ìš”ì¡°ê±´: +- [Git][getting-started:git] +- [g++][getting-started:linux-gcc] >= 6 + +macOSì—ì„œì˜ í•„ìš”ì¡°ê±´: +- [Apple Developer Tools][getting-started:macos-dev-tools] + +ìš°ì„ , vcpkg ìžì²´ë¥¼ 다운로드하고 설치해야 합니다. ì–´ë””ì—나 설치할 수 있지만, +ì¼ë°˜ì ìœ¼ë¡œ CMake 프로ì íŠ¸ì˜ 하위 모듈로 vcpkg를 사용하는 ê²ƒì´ ì¢‹ìŠµë‹ˆë‹¤. + +```sh +$ git clone https://github.com/microsoft/vcpkg +$ ./vcpkg/bootstrap-vcpkg.sh +``` + +프로ì íŠ¸ì— ë¼ì´ë¸ŒëŸ¬ë¦¬ë¥¼ 설치하려면 ë‹¤ìŒ ëª…ë ¹ì„ ì‹¤í–‰í•˜ì„¸ìš”. + +```sh +$ ./vcpkg/vcpkg install [packages to install] +``` + +다ìŒê³¼ ê°™ì´ `search` 하위 명령어를 사용하여 필요한 ë¼ì´ë¸ŒëŸ¬ë¦¬ë¥¼ 검색할 ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤. + +```sh +$ ./vcpkg/vcpkg search [search term] +``` + +CMake와 함께 vcpkg를 사용하려면 íˆ´ì²´ì¸ íŒŒì¼ì„ ì´ìš©í•´ 보세요. + +```sh +$ cmake -B [build directory] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" +$ cmake --build [build directory] +``` + +CMakeì—ì„œ ë¼ì´ë¸ŒëŸ¬ë¦¬ë¥¼ 사용하려면 여전히 `find_package` ë“±ì´ í•„ìš”í•©ë‹ˆë‹¤. +CMake와 VSCode를 위한 CMake Tools를 vcpkg와 함께 사용하는 ìµœì„ ì˜ ë°©ë²•ì„ í¬í•¨í•œ +ìžì„¸í•œ 정보는 [CMake 섹션](#cmake와-함께-vcpkg-사용)ì„ í™•ì¸í•˜ì„¸ìš”. + +다른 íˆ´ì— ëŒ€í•´ì„œëŠ” [통합 ê°€ì´ë“œ][getting-started:integration]를 확ì¸í•˜ì„¸ìš”. + +## Linux ê°œë°œìž ë„구 설치하기 + +Linuxì˜ ë°°í¬íŒë³„ë¡œ 설치해야 하는 ê°œë°œìž ì†Œí”„íŠ¸ì›¨ì–´ê°€ 다릅니다. + +- Debian, Ubuntu, popOS ë° ê¸°íƒ€ Debian 기반 ë°°í¬íŒ + +```sh +$ sudo apt-get update +$ sudo apt-get install build-essential tar curl zip unzip +``` + +- CentOS + +```sh +$ sudo yum install centos-release-scl +$ sudo yum install devtoolset-7 +$ scl enable devtoolset-7 bash +``` + +다른 ë°°í¬íŒì˜ 경우, g++ 6 ì´ìƒì˜ ë²„ì „ì„ ì„¤ì¹˜í•˜ì—¬ì•¼ 합니다. +특정 ë°°í¬íŒì— 대한 안내를 추가하고 ì‹¶ì€ ê²½ìš°, +[PRì„ ì—´ì–´ì£¼ì„¸ìš”][contributing:submit-pr]! + +## macOS ê°œë°œìž ë„구 설치하기 + +macOSì—서는 터미ë„ì—ì„œ ë‹¤ìŒ ëª…ë ¹ì–´ë¥¼ 실행하기만 하면 ë©ë‹ˆë‹¤. + +```sh +$ xcode-select --install +``` + +그런 ë‹¤ìŒ ë‚˜íƒ€ë‚˜ëŠ” ì°½ì˜ ì•ˆë‚´ì— ë”°ë¥´ì„¸ìš”. + +설치가 ë나면 [빠른 시작 ê°€ì´ë“œ](#빠르게-시작하기-unix)를 참고하여 vcpkg를 설치하세요. + +## CMake와 함께 vcpkg 사용 + +CMake와 함께 vcpkg를 사용하는 경우, ë‹¤ìŒ ë‚´ìš©ì´ ë„ì›€ì´ ë  ê²ƒìž…ë‹ˆë‹¤! + +### Visual Studio Code와 CMake Tools + +Workspace `settings.json` 파ì¼ì— 다ìŒì„ 추가하면 +CMake Tools는 ìžë™ìœ¼ë¡œ vcpkgì˜ ë¼ì´ë¸ŒëŸ¬ë¦¬ë¥¼ 사용할 것입니다. + +```json +{ + "cmake.configureSettings": { + "CMAKE_TOOLCHAIN_FILE": "[vcpkg root]/scripts/buildsystems/vcpkg.cmake" + } +} +``` + +### Vcpkg와 Visual Studio CMake 프로ì íŠ¸ + +CMake 설정 편집기를 ì—´ê³  `CMake toolchain file`ì—ì„œ +vcpkg íˆ´ì²´ì¸ íŒŒì¼ì— 경로를 추가합니다. + +``` +[vcpkg root]/scripts/buildsystems/vcpkg.cmake +``` + +### Vcpkg와 CLion + +Toolchains settingsì„ ì—½ë‹ˆë‹¤. +(File > Settings on Windows and Linux, CLion > Preferences on macOS), +그리고 CMake ì„¸íŒ…ì„ ì—½ë‹ˆë‹¤ (Build, Execution, Deployment > CMake). +마지막으로 `CMake options`ì—ì„œ ë‹¤ìŒ ì¤„ì„ ì¶”ê°€í•©ë‹ˆë‹¤. + +``` +-DCMAKE_TOOLCHAIN_FILE=[vcpkg root]/scripts/buildsystems/vcpkg.cmake +``` + +ê° í”„ë¡œí•„ì— ì´ê²ƒì„ 추가해야합니다. + +### 서브모듈로 vcpkg 사용하기 + +프로ì íŠ¸ì˜ 서브모듈로 vcpkg를 사용하는 경우, +cmake 실행 ì‹œ `CMAKE_TOOLCHAIN_FILE`ì„ ì „ë‹¬í•˜ëŠ” 대신, +첫 번째 `project()` 호출 ì „ì— CMakeLists.txtì— ë‹¤ìŒì„ 추가하는 ë°©ë²•ë„ ìžˆìŠµë‹ˆë‹¤. + +```cmake +set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" + CACHE STRING "Vcpkg toolchain file") +``` + +ì´ë ‡ê²Œ 하면 설정-빌드 단계가 약간 ë” ì‰¬ì›Œì§‘ë‹ˆë‹¤. +ë˜í•œ, 여전히 `CMAKE_TOOLCHAIN_FILE`ì„ ì§ì ‘ 전달하면 +vcpkg를 사용하지 ì•Šì„ ìˆ˜ 있습니다. + +[getting-started:using-a-package]: docs/examples/installing-and-using-packages.md +[getting-started:integration]: docs/users/buildsystems/integration.md +[getting-started:git]: https://git-scm.com/downloads +[getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools +[getting-started:linux-gcc]: #installing-linux-developer-tools +[getting-started:macos-dev-tools]: #installing-macos-developer-tools +[getting-started:macos-brew]: #installing-gcc-on-macos +[getting-started:macos-gcc]: #installing-gcc-on-macos +[getting-started:visual-studio]: https://visualstudio.microsoft.com/ +[getting-started:manifest-spec]: docs/specifications/manifests.md + +# 탭 완성/ìžë™ 완성 + +`vcpkg`는 powershellê³¼ bash 모ë‘ì—ì„œ 명령, 패키지 ì´ë¦„ ë° ì˜µì…˜ì˜ ìžë™ ì™„ì„±ì„ ì§€ì›í•©ë‹ˆë‹¤. +ì„ íƒí•œ ì…¸ì—ì„œ 탭 ì™„ì„±ì„ í™œì„±í™”í•˜ë ¤ë©´ ë‹¤ìŒ ë‘ ëª…ë ¹ì–´ 중 하나를 실행합니다. + +```pwsh +> .\vcpkg integrate powershell +``` + +```sh +$ ./vcpkg integrate bash # or zsh +``` + +ê·¸ ë‹¤ìŒ ì½˜ì†”ì„ ìž¬ì‹œìž‘í•˜ì„¸ìš”. + +# 예시 + +[패키지 설치 ë° ì‚¬ìš©](docs/examples/installing-and-using-packages.md), +[zip 파ì¼ì—ì„œ 새 패키지 추가](docs/examples/packaging-zipfiles.md), +[GitHub 저장소ì—ì„œ 새 패키지 추가](docs/examples/packaging-github-repos.md)ì— +대한 구체ì ì¸ 예시는 [문서](docs/README.md)를 참고하세요. + +문서는 ì´ì œ 웹사ì´íŠ¸ https://vcpkg.io/ ì—ì„œë„ ì˜¨ë¼ì¸ìœ¼ë¡œ í™•ì¸ ê°€ëŠ¥í•©ë‹ˆë‹¤. 모든 í”¼ë“œë°±ì— ì§„ì‹¬ìœ¼ë¡œ ê°ì‚¬ë“œë¦½ë‹ˆë‹¤! +https://github.com/vcpkg/vcpkg.github.io/issues ì—ì„œ ì´ìŠˆë¥¼ 제출할 수 있습니다. + +[4분짜리 ë°ëª¨ ì˜ìƒë„ 준비ë˜ì–´ 있습니다](https://www.youtube.com/watch?v=y41WFKbQFTw). + +# 기여하기 + +Vcpkg는 오픈소스 프로ì íŠ¸ìž…니다, ë”°ë¼ì„œ ì—¬ëŸ¬ë¶„ì˜ ê¸°ì—¬ë¥¼ 통해 만들어집니다. +기여할 수 있는 몇 가지 ë°©ë²•ì€ ë‹¤ìŒê³¼ 같습니다. + +* Vcpkg ë˜ëŠ” vcpkgì— í¬í•¨ëœ íŒ¨í‚¤ì§€ì˜ [ì´ìŠˆ 제출][contributing:submit-issue] +* [수정 사항 ë° ìƒˆ 패키지 제출][contributing:submit-pr] + +ìžì„¸í•œ ë‚´ìš©ì€ [기여 ê°€ì´ë“œ](CONTRIBUTING.md)를 참고하세요. + +ì´ í”„ë¡œì íŠ¸ëŠ” [Microsoft Open Source Code of Conduct][contributing:coc]ì„ ì±„íƒí–ˆìŠµë‹ˆë‹¤. +ë” ë§Žì€ ì •ë³´ë¥¼ 얻고 싶다면 [Code of Conduct FAQ][contributing:coc-faq] 문서를 참고하세요. +추가 질문ì´ë‚˜ ì˜ê²¬ì€ ì´ë©”ì¼ [opencode@microsoft.com](mailto:opencode@microsoft.com)ë¡œ 보내주세요. + +[contributing:submit-issue]: https://github.com/microsoft/vcpkg/issues/new/choose +[contributing:submit-pr]: https://github.com/microsoft/vcpkg/pulls +[contributing:coc]: https://opensource.microsoft.com/codeofconduct/ +[contributing:coc-faq]: https://opensource.microsoft.com/codeofconduct/ + +# ë¼ì´ì„ ìŠ¤ + +ì´ ì €ìž¥ì†Œì˜ ì½”ë“œëŠ” [MIT ë¼ì´ì„ ìŠ¤](LICENSE.txt)ì— ë”°ë¼ ì‚¬ìš©ì´ í—ˆê°€ë©ë‹ˆë‹¤. Portë¡œ 제공ë˜ëŠ” +ë¼ì´ë¸ŒëŸ¬ë¦¬ëŠ” ê° ë¼ì´ë¸ŒëŸ¬ë¦¬ì˜ ì›ì €ìžê°€ 설정한 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ì œê³µë©ë‹ˆë‹¤. 가능한 경우, vcpkg는 +`installed//share//copyright`ì— ê´€ë ¨ëœ ë¼ì´ì„ ìŠ¤ë¥¼ 저장합니다. + +# 보안 + +Vcpkê°€ 제공하는 ëŒ€ë¶€ë¶„ì˜ port는 ê°ê°ì˜ ë¼ì´ë¸ŒëŸ¬ë¦¬ë¥¼ 빌드할 ë•Œ +ì› ê°œë°œìžë“¤ì´ 권장하는 빌드 ì‹œìŠ¤í…œì„ ì´ìš©í•˜ê³ , +소스 코드와 빌드 ë„구를 ê°ê°ì˜ ê³µì‹ ë°°í¬ì²˜ë¡œë¶€í„° 다운로드합니다. +방화벽 ë’¤ì—ì„œ 사용하는 경우, ì–´ë–¤ port를 설치하ëŠëƒì— ë”°ë¼ í•„ìš”í•œ ì ‘ê·¼ ê¶Œí•œì´ ë‹¬ë¼ì§ˆ 수 있습니다. +만약 "air gapped" 환경ì—ì„œ 설치해야만 한다면, "air gapped"ê°€ ì•„ë‹Œ 환경ì—ì„œ +[asset ìºì‹œ](docs/users/assetcaching.md)를 다운로드하고, +ì´í›„ì— "air gapped" 환경ì—ì„œ 공유하는 ê²ƒì„ ê³ ë ¤í•´ 보십시오. + +# ë°ì´í„° 수집 + +vcpkg는 ì‚¬ìš©ìž ê²½í—˜ì„ ê°œì„ í•˜ëŠ” ë° ë„ì›€ì´ ë˜ë„ë¡ ì‚¬ìš© ë°ì´í„°ë¥¼ 수집합니다. +Microsoft는 ì´ ì •ë³´ë¥¼ ìµëª…으로 수집합니다. +다ìŒì„ 통해 ì›ê²© ì •ë³´ ì œê³µì„ ë¹„í™œì„±í™”í•  수 있습니다. +- -disableMetrics ì˜µì…˜ì„ í¬í•¨í•˜ì—¬ bootstrap-vcpkg 스í¬ë¦½íŠ¸ 실행 +- 명령줄ì—ì„œ vcpkgì— --disable-metrics 전달 +- VCPKG_DISABLE_METRICS 환경 변수 설정 + +docs/about/privacy.mdì—ì„œ vcpkg ë°ì´í„° ìˆ˜ì§‘ì— ëŒ€í•´ ìžì„¸ížˆ 알아보세요. diff --git a/externals/vcpkg/README_zh_CN.md b/externals/vcpkg/README_zh_CN.md new file mode 100755 index 000000000..87890daf5 --- /dev/null +++ b/externals/vcpkg/README_zh_CN.md @@ -0,0 +1,318 @@ +# Vcpkg: 总览 + +[English Overview](README.md) + +Vcpkg å¯å¸®åŠ©æ‚¨åœ¨ Windows〠Linux å’Œ MacOS ä¸Šç®¡ç† C å’Œ C++ 库。 +这个工具和生æ€é“¾æ­£åœ¨ä¸æ–­å‘å±•ï¼Œæˆ‘ä»¬ä¸€ç›´æœŸå¾…æ‚¨çš„è´¡çŒ®ï¼ + +若您从未使用过vcpkg，或者您正在å°è¯•äº†è§£å¦‚何使用vcpkg，请查阅 [入门](#入门) 章节。 + +如需获å–有关å¯ç”¨å‘½ä»¤çš„简短æ述，请在编译vcpkgåŽæ‰§è¡Œ `vcpkg help` 或执行 `vcpkg help [command]` æ¥èŽ·å–具体的帮助信æ¯ã€‚ + +* Github: [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg) +* Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/)， #vcpkg é¢‘é“ +* Discord: [\#include \](https://www.includecpp.org)， #ðŸŒvcpkg é¢‘é“ +* 文档: [Documentation](docs/README.md) + +[![当å‰ç”ŸæˆçŠ¶æ€](https://dev.azure.com/vcpkg/public/_apis/build/status/microsoft.vcpkg.ci?branchName=master)](https://dev.azure.com/vcpkg/public/_build/latest?definitionId=29&branchName=master) + +# 目录 + +- [Vcpkg: 总览](#vcpkg-总览) +- [目录](#目录) +- [入门](#入门) + - [快速开始: Windows](#快速开始-windows) + - [快速开始: Unix](#快速开始-unix) + - [安装 Linux Developer Tools](#安装-linux-developer-tools) + - [安装 macOS Developer Tools](#安装-macos-developer-tools) + - [在 CMake 中使用 vcpkg](#在-cmake-中使用-vcpkg) + - [Visual Studio Code 中的 CMake Tools](#visual-studio-code-中的-cmake-tools) + - [Visual Studio CMake 工程中使用 vcpkg](#visual-studio-cmake-工程中使用-vcpkg) + - [CLion 中使用 vcpkg](#clion-中使用-vcpkg) + - [å°† vcpkg 作为一个å­æ¨¡å—](#å°†-vcpkg-作为一个å­æ¨¡å—) +- [Tab补全/自动补全](#tab补全自动补全) + - [示例](#示例) + - [贡献](#贡献) +- [å¼€æºåè®®](#å¼€æºåè®®) +- [æ•°æ®æ”¶é›†](#æ•°æ®æ”¶é›†) + +# 入门 + +首先，请阅读以下任一快速入门指å—： +[Windows](#快速开始-windows) 或 [macOSå’ŒLinux](#快速开始-unix)， +è¿™å–决于您使用的是什么平å°ã€‚ + +有关更多信æ¯ï¼Œè¯·å‚è§ [安装和使用软件包][getting-started:using-a-package]。 +如果vcpkg目录中没有您需è¦çš„库， +您å¯ä»¥ [在GitHub上打开问题][contributing:submit-issue]。 +vcpkg团队和贡献者å¯ä»¥çœ‹åˆ°å®ƒçš„地方， +并å¯èƒ½å°†è¿™ä¸ªåº“添加到vcpkg。 + +安装并è¿è¡ŒvcpkgåŽï¼Œ +您å¯èƒ½å¸Œæœ›å°† [TAB补全](#tab补全自动补全) 添加到您的Shell中。 + +最åŽï¼Œå¦‚果您对vcpkg的未æ¥æ„Ÿå…´è¶£ï¼Œè¯·æŸ¥çœ‹ [清å•][getting-started:manifest-spec]ï¼ +这是一项实验性功能，å¯èƒ½ä¼šå‡ºçŽ°é”™è¯¯ã€‚ +因此，请å°è¯•ä¸€ä¸‹å¹¶[打开所有问题][contributing:submit-issue]! + +## 快速开始: Windows + +å‰ç½®æ¡ä»¶: +- Windows 7 或更新的版本 +- [Git][getting-started:git] +- [Visual Studio 2015 Update 3][getting-started:visual-studio] 或更新的版本（**包å«è‹±æ–‡è¯­è¨€åŒ…**） + +首先，**请使用git clone vcpkg** 并执行 bootstrap.bat 脚本。 +您å¯ä»¥å°†vcpkg安装在任何地方，但是通常我们建议您使用 vcpkg 作为 CMake 项目的å­æ¨¡å—，并将其全局安装到 Visual Studio 项目中。 +我们建议您使用例如 `C:\src\vcpkg` 或 `C:\dev\vcpkg` 的安装目录，å¦åˆ™æ‚¨å¯èƒ½é‡åˆ°æŸäº›åº“构建系统的路径问题。 + +```cmd +> git clone https://github.com/microsoft/vcpkg +> .\vcpkg\bootstrap-vcpkg.bat +``` + +使用以下命令安装您的项目所需è¦çš„库： + +```cmd +> .\vcpkg\vcpkg install [packages to install] +``` + +请注æ„: vcpkg在Windows中默认编译并安装x86版本的库。 è‹¥è¦ç¼–译并安装x64版本，请执行: + +```cmd +> .\vcpkg\vcpkg install [package name]:x64-windows +``` + +或 + +```cmd +> .\vcpkg\vcpkg install [packages to install] --triplet=x64-windows +``` + +您也å¯ä»¥ä½¿ç”¨ `search` å­å‘½ä»¤æ¥æŸ¥æ‰¾vcpkg中集æˆçš„库: + +```cmd +> .\vcpkg\vcpkg search [search term] +``` + +若您希望在 Visual Studio 中使用vcpkg，请è¿è¡Œä»¥ä¸‹å‘½ä»¤ (å¯èƒ½éœ€è¦ç®¡ç†å‘˜æƒé™) + +```cmd +> .\vcpkg\vcpkg integrate install +``` + +在此之åŽï¼Œæ‚¨å¯ä»¥åˆ›å»ºä¸€ä¸ªéžcmake项目 (或打开已有的项目)。 +在您的项目中，所有已安装的库å‡å¯ç«‹å³ä½¿ç”¨ `#include` 包å«æ‚¨éœ€ä½¿ç”¨çš„库的头文件且无需é¢å¤–é…置。 + +若您在 Visual Studio 中使用cmake工程，请查阅[这里](#visual-studio-cmake-工程中使用-vcpkg)。 + +为了在IDE以外在cmake中使用vcpkg，您需è¦ä½¿ç”¨ä»¥ä¸‹å·¥å…·é“¾æ–‡ä»¶: + +```cmd +> cmake -B [build directory] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" +> cmake --build [build directory] +``` + +在cmake中，您ä»éœ€é€šè¿‡ `find_package` æ¥ä½¿ç”¨vcpkg中已安装的库。 +请查阅 [CMake 章节](#在-cmake-中使用-vcpkg) 获å–更多信æ¯ï¼Œå…¶ä¸­åŒ…å«äº†åœ¨IDE中使用cmake的内容。 + +对于其他工具 (包括Visual Studio Code)，请查阅 [集æˆæŒ‡å—][getting-started:integration]。 + +## 快速开始: Unix + +Linuxå¹³å°å‰ç½®æ¡ä»¶: +- [Git][getting-started:git] +- [g++][getting-started:linux-gcc] >= 6 + +macOSå¹³å°å‰ç½®æ¡ä»¶: +- [Apple Developer Tools][getting-started:macos-dev-tools] + +首先，**请使用git clone vcpkg** 并执行 bootstrap.sh 脚本。 +我们建议您将vcpkg作为cmake项目的å­æ¨¡å—使用。 + +```sh +$ git clone https://github.com/microsoft/vcpkg +$ ./vcpkg/bootstrap-vcpkg.sh +``` + +使用以下命令安装任æ„包： + +```sh +$ ./vcpkg/vcpkg install [packages to install] +``` + +您也å¯ä»¥ä½¿ç”¨ `search` å­å‘½ä»¤æ¥æŸ¥æ‰¾vcpkg中已集æˆçš„库: + +```sh +$ ./vcpkg/vcpkg search [search term] +``` + +为了在cmake中使用vcpkg，您需è¦ä½¿ç”¨ä»¥ä¸‹å·¥å…·é“¾æ–‡ä»¶: + +```sh +$ cmake -B [build directory] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" +$ cmake --build [build directory] +``` + +在cmake中，您ä»éœ€é€šè¿‡ `find_package` æ¥ä½¿ç”¨vcpkg中已安装的库。 +为了您更好的在cmake或 VSCode CMake Tools 中使用vcpkg， +请查阅 [CMake 章节](#在-cmake-中使用-vcpkg) 获å–更多信æ¯ï¼Œ +其中包å«äº†åœ¨IDE中使用cmake的内容。 + +对于其他工具，请查阅 [集æˆæŒ‡å—][getting-started:integration]。 + +## 安装 Linux Developer Tools + +在Linuxçš„ä¸åŒå‘行版中，您需è¦å®‰è£…ä¸åŒçš„工具包: + +- Debian，Ubuntu，popOS或其他基于 Debian çš„å‘行版: + +```sh +$ sudo apt-get update +$ sudo apt-get install build-essential tar curl zip unzip +``` + +- CentOS + +```sh +$ sudo yum install centos-release-scl +$ sudo yum install devtoolset-7 +$ scl enable devtoolset-7 bash +``` + +对于其他的å‘行版，请确ä¿å·²å®‰è£… g++ 6 或更新的版本。 +若您希望添加特定å‘行版的说明，[请æ交一个 PR][contributing:submit-pr]! + +## 安装 macOS Developer Tools + +在 macOS 中，您唯一需è¦åšçš„是在终端中è¿è¡Œä»¥ä¸‹å‘½ä»¤: + +```sh +$ xcode-select --install +``` + +然åŽæŒ‰ç…§å‡ºçŽ°çš„窗å£ä¸­çš„æ示进行æ“作。 +此时，您就å¯ä»¥ä½¿ç”¨ bootstrap.sh 编译vcpkg了。 请å‚阅 [快速开始](#快速开始-unix) + +## 在 CMake 中使用 vcpkg + +若您希望在CMake中使用vcpkg，以下内容å¯èƒ½å¸®åŠ©æ‚¨ï¼š + +### Visual Studio Code 中的 CMake Tools + +将以下内容添加到您的工作区的 `settings.json` 中将使CMake Tools自动使用vcpkg中的第三方库: + +```json +{ + "cmake.configureSettings": { + "CMAKE_TOOLCHAIN_FILE": "[vcpkg root]/scripts/buildsystems/vcpkg.cmake" + } +} +``` + +### Visual Studio CMake 工程中使用 vcpkg + +打开CMake设置选项，将 vcpkg toolchain 文件路径在 `CMake toolchain file` 中： + +``` +[vcpkg root]/scripts/buildsystems/vcpkg.cmake +``` + +### CLion 中使用 vcpkg + +打开 Toolchains 设置 +(File > Settings on Windows and Linux, CLion > Preferences on macOS)， +并打开 CMake 设置 (Build, Execution, Deployment > CMake)。 +最åŽåœ¨ `CMake options` 中添加以下行: + +``` +-DCMAKE_TOOLCHAIN_FILE=[vcpkg root]/scripts/buildsystems/vcpkg.cmake +``` + +é—憾的是，您必须手动将此选项加入æ¯ä¸ªé¡¹ç›®é…置文件中。 + +### å°† vcpkg 作为一个å­æ¨¡å— + +当您希望将vcpkg作为一个å­æ¨¡å—加入到您的工程中时， +您å¯ä»¥åœ¨ç¬¬ä¸€ä¸ª `project()` 调用之å‰å°†ä»¥ä¸‹å†…容添加到 CMakeLists.txt 中， +而无需将 `CMAKE_TOOLCHAIN_FILE` 传递给cmake调用。 + +```cmake +set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" + CACHE STRING "Vcpkg toolchain file") +``` + +使用此ç§æ–¹å¼å¯æ— éœ€è®¾ç½® `CMAKE_TOOLCHAIN_FILE` å³å¯ä½¿ç”¨vcpkg，且更容易完æˆé…置工作。 + +[getting-started:using-a-package]: docs/examples/installing-and-using-packages.md +[getting-started:integration]: docs/users/buildsystems/integration.md +[getting-started:git]: https://git-scm.com/downloads +[getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools +[getting-started:linux-gcc]: #installing-linux-developer-tools +[getting-started:macos-dev-tools]: #installing-macos-developer-tools +[getting-started:macos-brew]: #installing-gcc-on-macos +[getting-started:macos-gcc]: #installing-gcc-on-macos +[getting-started:visual-studio]: https://visualstudio.microsoft.com/ +[getting-started:manifest-spec]: docs/specifications/manifests.md + +# Tab补全/自动补全 + +`vcpkg` 支æŒå‘½ä»¤ï¼ŒåŒ…åç§°ï¼Œä»¥åŠ Powershell å’Œ Bash 中的选项。 +若您需è¦åœ¨æŒ‡å®šçš„ shell 中å¯ç”¨Tab补全功能，请ä¾æ®æ‚¨ä½¿ç”¨çš„shellè¿è¡Œï¼š + +```pwsh +> .\vcpkg integrate powershell +``` + +或 + +```sh +$ ./vcpkg integrate bash # 或 zsh +``` + +然åŽé‡æ–°å¯åŠ¨æŽ§åˆ¶å°ã€‚ + +## 示例 + +请查看 [文档](docs/README.md) 获å–具体示例， +å…¶åŒ…å« [安装并使用包](docs/examples/installing-and-using-packages.md)， +[使用压缩文件添加包](docs/examples/packaging-zipfiles.md) +å’Œ [从GitHubæºä¸­æ·»åŠ ä¸€ä¸ªåŒ…](docs/examples/packaging-github-repos.md)。 + +我们的文档现在也å¯ä»¥ä»Ž [vcpkg.io](https://vcpkg.io/) 在线获å–。 +我们真诚的希望您å‘我们æ出关于此网站的任何建议! 请在[这里](https://github.com/vcpkg/vcpkg.github.io/issues) 打开issue. + +观看4分钟 [demo视频](https://www.youtube.com/watch?v=y41WFKbQFTw)。 + +## 贡献 + +Vcpkg是一个开æºé¡¹ç›®ï¼Œå¹¶é€šè¿‡æ‚¨çš„贡献ä¸æ–­å‘展。 +下é¢æ˜¯ä¸€äº›æ‚¨å¯ä»¥è´¡çŒ®çš„æ–¹å¼: + +* [æ交一个关于vcpkg或已支æŒåŒ…çš„æ–°issue][contributing:submit-issue] +* [æ交修å¤PR和创建新包][contributing:submit-pr] + +请å‚阅我们的 [贡献准则](CONTRIBUTING_zh.md) 了解更多详细信æ¯ã€‚ + +该项目采用了 [Microsoftå¼€æºè¡Œä¸ºå‡†åˆ™][contributing:coc]。 +获å–更多信æ¯è¯·æŸ¥çœ‹ [行为准则FAQ][contributing:coc-faq] 或è”ç³» [opencode@microsoft.com](mailto:opencode@microsoft.com) æ出其他问题或æ„è§ã€‚ + +[contributing:submit-issue]: https://github.com/microsoft/vcpkg/issues/new/choose +[contributing:submit-pr]: https://github.com/microsoft/vcpkg/pulls +[contributing:coc]: https://opensource.microsoft.com/codeofconduct/ +[contributing:coc-faq]: https://opensource.microsoft.com/codeofconduct/ + +# å¼€æºåè®® + +在此存储库中使用的代ç å‡éµå¾ª [MIT License](LICENSE.txt)。 + +# æ•°æ®æ”¶é›† + +vcpkg会收集使用情况数æ®ï¼Œä»¥å¸®åŠ©æˆ‘们改善您的体验。 +Microsoft收集的数æ®æ˜¯åŒ¿å的。 +您也å¯ä»¥é€šè¿‡ä»¥ä¸‹æ­¥éª¤ç¦ç”¨æ•°æ®æ”¶é›†ï¼š +- 将选项 `-disableMetrics` 传递给 bootstrap-vcpkg 脚本并é‡æ–°è¿è¡Œæ­¤è„šæœ¬ +- å‘ vcpkg 命令传递选项 `--disable-metrics` +- 设置环境å˜é‡ `VCPKG_DISABLE_METRICS` + +请在 [privacy.md](docs/about/privacy.md) 中了解有关 vcpkg æ•°æ®æ”¶é›†çš„更多信æ¯ã€‚ diff --git a/externals/vcpkg/SECURITY.md b/externals/vcpkg/SECURITY.md new file mode 100755 index 000000000..869fdfe2b --- /dev/null +++ b/externals/vcpkg/SECURITY.md @@ -0,0 +1,41 @@ + + +## Security + +Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/). + +If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below. + +## Reporting Security Issues + +**Please do not report security vulnerabilities through public GitHub issues.** + +Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report). + +If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com). If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey). + +You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc). + +Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue: + + * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.) + * Full paths of source file(s) related to the manifestation of the issue + * The location of the affected source code (tag/branch/commit or direct URL) + * Any special configuration required to reproduce the issue + * Step-by-step instructions to reproduce the issue + * Proof-of-concept or exploit code (if possible) + * Impact of the issue, including how an attacker might exploit the issue + +This information will help us triage your report more quickly. + +If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs. + +## Preferred Languages + +We prefer all communications to be in English. + +## Policy + +Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd). + + diff --git a/externals/vcpkg/bootstrap-vcpkg.bat b/externals/vcpkg/bootstrap-vcpkg.bat new file mode 100755 index 000000000..1f9baa3d0 --- /dev/null +++ b/externals/vcpkg/bootstrap-vcpkg.bat @@ -0,0 +1,2 @@ +@echo off +powershell.exe -NoProfile -ExecutionPolicy Bypass "& {& '%~dp0scripts\bootstrap.ps1' %*}" diff --git a/externals/vcpkg/bootstrap-vcpkg.sh b/externals/vcpkg/bootstrap-vcpkg.sh new file mode 100755 index 000000000..7165a725f --- /dev/null +++ b/externals/vcpkg/bootstrap-vcpkg.sh @@ -0,0 +1,4 @@ +#!/bin/sh -e + +vcpkgRootDir=$(X= cd -- "$(dirname -- "$0")" && pwd -P) +. "$vcpkgRootDir/scripts/bootstrap.sh" diff --git a/externals/vcpkg/docs/README.md b/externals/vcpkg/docs/README.md new file mode 100755 index 000000000..6914dcd54 --- /dev/null +++ b/externals/vcpkg/docs/README.md @@ -0,0 +1,75 @@ +### Quick Start + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/README.md).** + +Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This tool and ecosystem are constantly evolving; your involvement is vital to its success! + +### Examples + +- [Installing and Using Packages Example: sqlite](examples/installing-and-using-packages.md) +- [Packaging Zipfiles Example: zlib](examples/packaging-zipfiles.md) +- [Packaging GitHub Repositories Example: libogg](examples/packaging-github-repos.md) +- [Patching Example: Patching libpng to work for x64-uwp](examples/patching.md) +- [Getting Started with Versioning](examples/versioning.getting-started.md) + +### Command Line Reference + +- [Command Line Reference](commands/index.md) + +### User Help + +- [Buildsystem Integration](users/buildsystems/integration.md) +- [Triplet files](users/triplets.md) +- [Configuration and Environment](users/config-environment.md) +- [Authentication](users/authentication.md) +- [Manifest Mode](users/manifests.md) +- [Binary Caching](users/binarycaching.md) +- [Asset Caching](users/assetcaching.md) +- [Versioning](users/versioning.md) +- [Usage with Android](users/android.md) +- [Usage with Mingw-w64](users/mingw.md) +- [Host Dependencies](users/host-dependencies.md) +- [Using Registries](users/registries.md) + +### Maintainer Help + +- [Manifest Files - vcpkg.json](maintainers/manifest-files.md) +- [Control Files](maintainers/control-files.md) +- [Portfile Functions](maintainers/portfile-functions.md) +- [Authoring Script Ports](maintainers/authoring-script-ports.md) +- [Common CMake Definitions](maintainers/vcpkg_common_definitions.md) +- [Maintainer Guidelines](maintainers/maintainer-guide.md) +- [Creating Registries](maintainers/registries.md) +- [CMake Guidelines](maintainers/cmake-guidelines.md) + +### [Vcpkg-Tool](https://github.com/microsoft/vcpkg-tool) Maintainer Help + +- [Testing](https://github.com/microsoft/vcpkg-tool/tree/main/docs/testing.md) +- [Benchmarking](https://github.com/microsoft/vcpkg-tool/tree/main/docs/benchmarking.md) +- [Layout of the vcpkg source tree](https://github.com/microsoft/vcpkg-tool/tree/main/docs/layout.md) + +### Community Resources (not directly affiliated with vcpkg) + +- [vcpkg.info](https://vcpkg.info/) - Package index + search +- [vcpkgx](https://vcpkgx.com/) - Package index + search +- [vcpkg index](https://vcpkg.dev/) - Package index + search + +### Blog posts + +- [Vcpkg Host Dependencies for Cross-Compilation](https://devblogs.microsoft.com/cppblog/vcpkg-host-dependencies/) +- [Registries: Bring your own libraries to vcpkg](https://devblogs.microsoft.com/cppblog/registries-bring-your-own-libraries-to-vcpkg/) +- [Vcpkg: Accelerate your team development environment with binary caching and manifests](https://devblogs.microsoft.com/cppblog/vcpkg-accelerate-your-team-development-environment-with-binary-caching-and-manifests/) +- [Vcpkg: 2019.06 Update (overlay ports, overlay triplets, `vcpkg_check_features`)](https://devblogs.microsoft.com/cppblog/vcpkg-2019-06-update/) +- [Announcing a single C++ library manager for Linux, macOS and Windows: Vcpkg](https://blogs.msdn.microsoft.com/vcblog/2018/04/24/announcing-a-single-c-library-manager-for-linux-macos-and-windows-vcpkg/) +- [Vcpkg: Using multiple enlistments to handle multiple versions of a library](https://blogs.msdn.microsoft.com/vcblog/2017/10/23/vcpkg-using-multiple-enlistments/) +- [Vcpkg: introducing the export command](https://blogs.msdn.microsoft.com/vcblog/2017/05/03/vcpkg-introducing-export-command/) +- [Binary Compatibility and Pain-free Upgrade Why Moving to Visual Studio 2017 is almost "too easy"](https://blogs.msdn.microsoft.com/vcblog/2017/03/07/binary-compatibility-and-pain-free-upgrade-why-moving-to-visual-studio-2017-is-almost-too-easy/) +- [Vcpkg recent enhancements](https://blogs.msdn.microsoft.com/vcblog/2017/02/14/vcpkg-recent-enhancements/) +- [Vcpkg 3 Months Anniversary, Survey](https://blogs.msdn.microsoft.com/vcblog/2017/01/11/vcpkg-3-months-anniversary-survey/) +- [Vcpkg updates: Static linking is now available](https://blogs.msdn.microsoft.com/vcblog/2016/11/01/vcpkg-updates-static-linking-is-now-available/) +- [Vcpkg: a tool to acquire and build C++ open source libraries on Windows](https://blogs.msdn.microsoft.com/vcblog/2016/09/19/vcpkg-a-tool-to-acquire-and-build-c-open-source-libraries-on-windows/) + +### Other + +- [FAQ](about/faq.md) +- [Privacy](about/privacy.md) diff --git a/externals/vcpkg/docs/_config.yml b/externals/vcpkg/docs/_config.yml new file mode 100755 index 000000000..c4192631f --- /dev/null +++ b/externals/vcpkg/docs/_config.yml @@ -0,0 +1 @@ +theme: jekyll-theme-cayman \ No newline at end of file diff --git a/externals/vcpkg/docs/about/faq.md b/externals/vcpkg/docs/about/faq.md new file mode 100755 index 000000000..d2ff600b2 --- /dev/null +++ b/externals/vcpkg/docs/about/faq.md @@ -0,0 +1,120 @@ +# Frequently Asked Questions + +## Can I contribute a new library? +Yes! Start out by reading our [contribution guidelines](https://github.com/Microsoft/vcpkg/blob/master/CONTRIBUTING.md). +If you want to contribute but don't have a particular library in mind then take a look at the list +of [new port requests](https://github.com/Microsoft/vcpkg/issues?q=is%3Aissue+is%3Aopen+label%3Acategory%3Anew-port). + +## Can Vcpkg create pre-built binary packages? What is the binary format used by Vcpkg? +Yes! See the [`export` command](../users/buildsystems/export-command.md). + +## How do I update libraries? +The `vcpkg update` command lists all packages which are out-of-sync with your current portfiles. To update a package, follow the instructions in the command. + +## How do I get more libraries? +The list of libraries is enumerated from the [`ports\`](https://github.com/Microsoft/vcpkg/blob/master/ports) directory. By design, you can add and remove libraries from this directory as you see fit for yourself or your company -- see our examples on packaging [zipfiles](../examples/packaging-zipfiles.md) and [GitHub repos](../examples/packaging-github-repos.md). + +We recommend cloning directly from [GitHub](https://github.com/microsoft/vcpkg) and using `git pull` to update the list of portfiles. Once you've updated your portfiles, `vcpkg update` will indicate any installed libraries that are now out of date. + +## Can I build a private library with this tool? +Yes. Follow [our packaging zlib Example](../examples/packaging-zipfiles.md) for creating a portfile using a fake URL. Then, either pre-seed the `downloads\` folder with a zip containing your private sources or replace the normal calls to `vcpkg_download_distfile` and `vcpkg_extract_source_archive` with functions that unpack your source code. + +## Can I use a prebuilt private library with this tool? +Yes. The `portfile.cmake` for a library is fundamentally a script that places the headers and binaries into the correct arrangement in the `${CURRENT_PACKAGES_DIR}`, so to pull in prebuilt binaries you can write a portfile which directly downloads and arranges the files. + +To see an example of this, look at [`ports\opengl\portfile.cmake`](https://github.com/microsoft/vcpkg/blob/master/ports/opengl/portfile.cmake) which simply copies files out of the Windows SDK. + +## Which platforms I can target with Vcpkg? +We currently target Windows Desktop (x86 and x64) as well as the Universal Windows Platform (x86, x64, and ARM). See `vcpkg help triplet` for the current list. + +## Does Vcpkg run on Linux/OSX? +Yes! We continuously test on OSX and Ubuntu 16.04, however we know users have been successful with Arch, Fedora, and FreeBSD. If you have trouble with your favorite Linux distribution, let us know in an issue and we'd be happy to help! + +## How do I update vcpkg? +Execute `git pull` to get the latest sources, then run `bootstrap-vcpkg.bat` (Windows) or `./bootstrap-vcpkg.sh` (Unix) to update vcpkg. + +## How do I use different versions of a library on one machine? +Within a single instance of Vcpkg (e.g. one set of `installed\`, `packages\`, `ports\` and so forth), you can only have one version of a library installed (otherwise, the headers would conflict with each other!). For those with experience with system-wide package managers, packages in Vcpkg correspond to the `X-dev` or `X-devel` packages. + +To use different versions of a library for different projects, we recommend making separate instances of Vcpkg and using the [per-project integration mechanisms](../users/buildsystems/integration.md). The versions of each library are specified by the files in `ports\`, so they are easily manipulated using standard `git` commands. This makes it very easy to roll back the entire set of libraries to a consistent set of older versions which all work with each other. If you need to then pin a specific library forward, that is as easy as checking out the appropriate version of `ports\\`. + +If your application is very sensitive to the versions of libraries, we recommend checking in the specific set of portfiles you need into your source control along with your project sources and using the `--vcpkg-root` option to redirect the working directory of `vcpkg.exe`. + +## How does Vcpkg protect my privacy? +See the [Privacy document](privacy.md) for all information regarding privacy. + +## Can I use my own CMake toolchain file with Vcpkg's toolchain file? +Yes. If you already have a CMake toolchain file, you will need to include our toolchain file at the end of yours. This should be as simple as an `include(\scripts\buildsystems\vcpkg.cmake)` directive. Alternatively, you could copy the contents of our `scripts\buildsystems\vcpkg.cmake` into the end of your existing toolchain file. + +## Can I use my own/specific flags for rebuilding libs? +Yes. In the current version, there is not yet a standardized global way to change them, however you can edit individual portfiles and tweak the exact build process however you'd like. + +By saving the changes to the portfile (and checking them in), you'll get the same results even if you're rebuilding from scratch in the future and forgot what exact settings you used. + +## Can I get Vcpkg integration for custom configurations? + +Yes. While Vcpkg will only produce the standard "Release" and "Debug" configurations when building a library, you can get integration support for your projects' custom configurations, in addition to your project's standard configurations. + +First of all, Vcpkg will automatically assume any custom configuration starting with "Release" (resp. "Debug") as a configuration that is compatible with the standard "Release" (resp. "Debug") configuration and will act accordingly. + +For other configurations, you only need to override the MSBuild `$(VcpkgConfiguration)` macro in your project file (.vcxproj) to declare the compatibility between your configuration, and the target standard configuration. Unfortunately, due to the sequential nature of MSBuild, you'll need to add those settings much higher in your vcxproj so that it is declared before the Vcpk integration is loaded. It is recommend that the `$(VcpkgConfiguration)` macro is added to the "Globals" PropertyGroup. + +For example, you can add support for your "MyRelease" configuration by adding in your project file: +``` + + ... + Release + +``` +Of course, this will only produce viable binaries if your custom configuration is compatible with the target configuration (e.g. they should both link with the same runtime library). + +## I can't use user-wide integration. Can I use a per-project integration? + +Yes. A NuGet package suitable for per-project use can be generated via either the `vcpkg integrate project` command (lightweight linking) or the `vcpkg export --nuget` command (shrinkwrapped). + +A lower level mechanism to achieve the same as the `vcpkg integrate project` NuGet package is via the `\scripts\buildsystems\msbuild\vcpkg.targets` file. All you need is to import it in your .vcxproj file, replacing `` with the path where you installed vcpkg: + +``` + +``` + +## How can I remove temporary files? + +You can save some disk space by completely removing the `packages\`, `buildtrees\`, and `downloads\` folders. + +## How is CMake used internally by Vcpkg? +Vcpkg uses CMake internally as a build scripting language. This is because CMake is already an extremely common build system for cross-platform open source libraries and is becoming very popular for C++ projects in general. It is easy to acquire on Windows, does not require system-wide installation, and legible for unfamiliar users. + +## Will Vcpkg support downloading compiled binaries from a public or private server? +We would like to eventually support downloading precompiled binaries, similar to other system package managers. + +In a corporate scenario, we currently recommend building the libraries once and distributing the entire vcpkg root directory to everyone else on the project through some raw file transport such as a network share or HTTP host. See the [`export` command](../users/buildsystems/export-command.md). + +## What Visual C++ toolsets are supported? +We support Visual Studio 2015 Update 3 and above. + +## Why does Visual Studio not use my libraries with user-wide integration enabled? +Enabling user-wide integration (`vcpkg integrate install`) changes the default for some project properties. In particular, "C/C++/General/Additional Include Directories" and "Linker/General/Additional Library Directories" are normally blank *without* user-wide integration. *With* integration, a blank value means that the augmented default supplied by vcpkg is overridden, and headers/libraries will not be found. To reinstate the default, set the properties to inherit from parent. + +## Why not NuGet? +NuGet is a package manager for .NET libraries with a strong dependency on MSBuild. It does not meet the specific needs of Native C++ customers in at least three ways. + +- **Compilation Flavors**. With so many possible combinations of compilation options, the task of providing a truly complete set of options is intrinsically impossible. Furthermore, the download size for reasonably complete binary packages becomes enormous. This makes it a requirement to split the results into multiple packages, but then searching becomes very difficult. + +- **Binary vs Source**. Very closely tied to the first point, NuGet is designed from the ground up to provide relatively small, prebuilt binaries. Due to the nature of native code, developers need to have access to the source code to ensure ABI compatibility, performance, integrity, and debuggability. + +- **Per-dll vs Per-application**. NuGet is highly project centric. This works well in managed languages with naturally stable ABIs, because base libraries can continue to evolve without breaking those higher up. However, in native languages where the ABI is much more fragile, the only robust strategy is to explicitly build each library against the exact dependencies that will be included in the final application. This is difficult to ensure in NuGet and leads to a highly disconnected and independently versioned ecosystem. + +## Why not Conan? +Conan.io is a publicly-federated, project-centric, cross-platform, C++ package manager written in python. Our primary differences are: + +- **Public federation vs private federation**. Conan relies on individuals publishing independent copies of each package. We believe this approach encourages a large number of packages that are all broken in different ways. We believe it is a waste of user's time to pick through the list of 20+ public packages for Boost 1.56 to determine the handful that will work for their particular situation. In contrast, we believe there should be a single, collaboratively maintained version which works for the vast majority of cases and allow users to hack freely on their private versions. We believe this will result in a set of high quality packages that are heavily tested with each other and form a fantastic base for any private modifications you need. + +- **Per-dll vs Per-application**. When dependencies are independently versioned on a library level, it encourages every build environment to be a completely unique, unable to take advantage of or contribute to a solid, well tested ecosystem. In contrast, by versioning all libraries together as a platform (similar to a system package manager), we hope to congregate testing and effort on very common sets of library versions to maximize the quality and stability of the ecosystem. This also completely designs out the ability for a library to ask for versions that conflict with the application's choices (I want openssl Z and boost X but X only claims to work with openssl Y). + +- **Cross-platform vs single-platform**. While being hosted on many platforms is an excellent north star, we believe the level of system integration and stability provided by apt-get, yum, and homebrew is well worth needing to exchange `apt-get install libboost-all-dev` with `brew install boost` in automated scripts. We chose to make our system as easy as possible to integrate into a world with these very successful system managers -- one more line for `vcpkg install boost` -- instead of attempting to replace them where they are already so successful and well-loved. + +- **C++/CMake vs python**. While Python is an excellent language loved by many, we believe that transparency and familiarity are the most important factors when choosing a tool as important to your workflow as a package manager. Consequently, we chose to make the implementation languages be as universally accepted as possible: C++ should be used in a C++ package manager for C++ programmers. You should not be required to learn another programming language just to understand your package manager. + +## Why not Chocolatey? +Chocolatey is an excellent system for managing applications. However, it is not currently designed to acquire redistributable developer assets and help you with debugging. Vcpkg, in comparison, is designed to get you the libraries you need to build your application and help you deliver through any platform you'd like (including Chocolatey!). diff --git a/externals/vcpkg/docs/about/privacy.md b/externals/vcpkg/docs/about/privacy.md new file mode 100755 index 000000000..d2ba7552e --- /dev/null +++ b/externals/vcpkg/docs/about/privacy.md @@ -0,0 +1,50 @@ +# Vcpkg Telemetry and Privacy + +vcpkg collects telemetry data to understand usage issues, such as failing packages, and to guide tool improvements. The collected data is anonymous. +For more information about how Microsoft protects your privacy, see https://privacy.microsoft.com/en-US/privacystatement#mainenterprisedeveloperproductsmodule + +## Scope + +We explicitly ONLY collect information from invocations of the tool itself; we do NOT add any tracking information into the produced libraries. Telemetry is collected when using any of the `vcpkg` commands. + +## How to opt out + +The vcpkg telemetry feature is enabled by default. In order to opt-out of data collection, you can re-run the bootstrap script with the following flag, for Windows and Linux/OSX, respectively: + +```PS> .\bootstrap-vcpkg.bat -disableMetrics``` + +```~/$ ./bootstrap-vcpkg.sh -disableMetrics``` + +## Disclosure + +vcpkg displays text similar to the following when you build vcpkg. This is how Microsoft notifies you about data collection. + +``` +Telemetry +--------- +vcpkg collects usage data in order to help us improve your experience. +The data collected by Microsoft is anonymous. +You can opt-out of telemetry by re-running the bootstrap-vcpkg script with -disableMetrics, +passing --disable-metrics to vcpkg on the command line, +or by setting the VCPKG_DISABLE_METRICS environment variable. + +Read more about vcpkg telemetry at docs/about/privacy.md +``` + +## Data Collected + +The telemetry feature doesn't collect personal data, such as usernames or email addresses. It doesn't scan your code and doesn't extract project-level data, such as name, repository, or author. The data is sent securely to Microsoft servers and held under restricted access. + +Protecting your privacy is important to us. If you suspect the telemetry is collecting sensitive data or the data is being insecurely or inappropriately handled, file an issue in the Microsoft/vcpkg repository or send an email to vcpkg@microsoft.com for investigation. + +We collect various telemetry events such as the command line used, the time of invocation, and how long execution took. Some commands also add additional calculated information (such as the full set of libraries to install). We generate a completely random UUID on first use and attach it to each event. + +You can see the telemetry events any command by appending `--printmetrics` after the vcpkg command line. + +In the source code (included at https://github.com/microsoft/vcpkg-tool/ ), you can search for calls to the functions `track_property()`, `track_feature()`, `track_metric()`, and `track_buildtime()` +to see every specific data point we collect. + +## Avoid inadvertent disclosure information + +vcpkg contributors and anyone else running a version of vcpkg that they built themselves should consider the path to their source code. If a crash occurs when using vcpkg, the file path from the build machine is collected as part of the stack trace and isn't hashed. +Because of this, builds of vcpkg shouldn't be located in directories whose path names expose personal or sensitive information. diff --git a/externals/vcpkg/docs/commands/common-options.md b/externals/vcpkg/docs/commands/common-options.md new file mode 100755 index 000000000..86fb64595 --- /dev/null +++ b/externals/vcpkg/docs/commands/common-options.md @@ -0,0 +1,121 @@ +# Common Command Options + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/commands/common-options.md).** + +Most vcpkg commands accept a group of common options that control cross-cutting aspects of the tool. Not all options affect every command. For example, a command that does not download any files will be unaffected by changing the downloads directory. + + + +## `--x-asset-sources=` + +**Experimental: will change or be removed at any time** + +Specify the cache configuration for [Asset Caching](../users/assetcaching.md). + + + +## `--binarysource=` + +Add a source for [Binary Caching](../users/binarycaching.md). + +This option can be specified multiple times; see the Binary Caching documentation for how multiple binary sources interact. + + + +## `--x-buildtrees-root=` + +**Experimental: will change or be removed at any time** + +Specifies the temporary path to store intermediate build files, such as objects or unpacked source code. + +Defaults to `buildtrees/` under the vcpkg root folder. + + + +## `--downloads-root=` + +Specify where downloaded tools and source code archives should be kept. + +Defaults to the `VCPKG_DOWNLOADS` environment variable. If that is unset, defaults to `downloads/` under the vcpkg root folder. + + + +## `--host-triplet=` + +Specify the host [architecture triplet][triplets]. + +Defaults to the `VCPKG_DEFAULT_HOST_TRIPLET` environment variable. If that is unset, deduced based on the host architecture and operating system. + + + +## `--x-install-root=` + +**Experimental: will change or be removed at any time** + +Specifies the path to lay out installed packages. + +In Classic Mode, defaults to `installed/` under the vcpkg root folder. + +In [Manifest Mode][../users/manifests.md], defaults to `vcpkg_installed/` under the manifest folder. + + + +### `--x-manifest-root=` + +**Experimental: will change or be removed at any time** + +Specifies the directory containing [`vcpkg.json`](../users/manifests.md). + +Defaults to searching upwards from the current working directory for the nearest `vcpkg.json`. + + + +## `--overlay-ports=` + +Specifies a directory containing [overlay ports](../specifications/ports-overlay.md). + +This option can be specified multiple times; ports will resolve to the first match. + + + +## `--overlay-triplets=` + +Specifies a directory containing [overlay triplets](../examples/overlay-triplets-linux-dynamic.md). + +This option can be specified multiple times; [triplets][] will resolve to the first match. + + + +## `--x-packages-root=` + +**Experimental: will change or be removed at any time** + +Specifies the temporary path to stage intermediate package files before final install. + +Defaults to `packages/` under the vcpkg root folder. + + + +## `--triplet=` + +Specify the target [architecture triplet][triplets]. + +Defaults to the `VCPKG_DEFAULT_TRIPLET` environment variable. If that is unset, deduced based on the host architecture and operating system. + +Note that on Windows operating systems, the architecture is always deduced as x86 for legacy reasons. + + + +## `--vcpkg-root=` + +Specifies the vcpkg root folder. + +Defaults to the directory containing the vcpkg program. The directory must be a valid vcpkg instance, such as a `git clone` of `https://github.com/microsoft/vcpkg`. This option can be used to run a custom-built copy of the tool directly from the build folder. + +## Response Files (`@`) + +The vcpkg command line accepts text files containing newline-separated command line parameters. + +The tool will act as though the items in the file were spliced into the command line in place of the `@` reference. Response files cannot contain additional response files. + +[triplets]: ../users/triplets.md diff --git a/externals/vcpkg/docs/commands/index.md b/externals/vcpkg/docs/commands/index.md new file mode 100755 index 000000000..e498b0724 --- /dev/null +++ b/externals/vcpkg/docs/commands/index.md @@ -0,0 +1,13 @@ +# vcpkg Command Line Reference + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/commands/index.md).** + +## Contents + +- [Common Options](common-options.md) +- Commands + - [vcpkg install](install.md) + +## Source + +The vcpkg command line is developed in a separate repository on GitHub: [microsoft/vcpkg-tool](https://github.com/microsoft/vcpkg-tool). Issues should be posted to [microsoft/vcpkg](https://github.com/microsoft/vcpkg/issues). diff --git a/externals/vcpkg/docs/commands/install.md b/externals/vcpkg/docs/commands/install.md new file mode 100755 index 000000000..651ac3a63 --- /dev/null +++ b/externals/vcpkg/docs/commands/install.md @@ -0,0 +1,183 @@ +# vcpkg install + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/commands/install.md).** + +## Synopsis + +**Classic Mode** +```no-highlight +vcpkg install [options] ... +``` + +**Manifest Mode** +```no-highlight +vcpkg install [options] +``` + +## Description + +Build and install port packages. + +### Classic Mode + +In Classic Mode, this verb adds port packages to the existing set in the [installed directory][] (defaults to `installed/` under the vcpkg root). This can require removing and rebuilding existing packages, which can fail. + +**Package Syntax** +``` +portname[feature1,feature2]:triplet +``` + +Package references without a triplet are automatically qualified by the [default target triplet](common-options.md#triplet). Package references that do not explicitly list `core` are considered to imply all default features. + +### Manifest Mode + +In [Manifest Mode][], this verb sets the [installed directory][] to the state specified by the `vcpkg.json` manifest file, adding, removing, or rebuilding packages as needed. + +[installed directory]: common-options.md#install-root + +## Options + +All vcpkg commands support a set of [common options](common-options.md). + +### `--allow-unsupported` + +Instead of stopping on an unsupported port, continue with a warning. + +By default, vcpkg refuses to execute an install plan containing a port installation for a triplet outside its [`"supports"`][] clause. The [`"supports"`][] clause of a package describes the full set of platforms a package is expected to be buildable on. This flag instructs vcpkg to warn that the build is expected to fail instead of stopping. + +### `--clean-after-build` + +Clean buildtrees, packages, and downloads after building each package. + +This option has the same effect as passing [`--clean-buildtrees-after-build`](#clean-buildtrees-after-build), [`--clean-downloads-after-build`](#clean-downloads-after-build), and [`--clean-packages-after-build`](#clean-packages-after-build). + + + +### `--clean-buildtrees-after-build` + +Clean all subdirectories from the buildtrees temporary subfolder after building each package. + +All top-level files in the buildtrees subfolder (e.g. `buildtrees/zlib/config-x64-windows-out.log`) will be kept. All subdirectories will be deleted. + + + +### `--clean-downloads-after-build` + +Clean all unextracted assets from the `downloads/` folder after building each package. + +All top level files in the `downloads/` folder will be deleted. Extracted tools will be kept. + + + +### `--clean-packages-after-build` + +Clean the packages temporary subfolder after building each package. + +The packages subfolder for the built package (for example, `packages/zlib_x64-windows`) will be deleted after installation. + +### `--dry-run` + +Print the install plan, but do not remove or install any packages. + +The install plan lists all packages and features that will be installed, as well as any other packages that need to be removed and rebuilt. + +### `--editable` + +**Classic Mode Only** + +Perform editable builds for all directly referenced packages on the command line. + +When vcpkg builds ports, it purges and re-extracts the source code each time to ensure inputs are accurately. This is necessary for [Manifest Mode][] to accurately update what is installed and [Binary Caching][] to ensure cached content is correct. + +Passing the `--editable` flag disables this behavior, preserving edits to the extracted sources in the `buildtrees/` folder. This helps develop patches quickly by avoiding the need to write a file on each change. + +Sources extracted during an editable build do not have a `.clean/` suffix on the directory name and will not be cleared by subsequent non-editable builds. + +### `--enforce-port-checks` + +Fail install if a port has detected problems or attempts to use a deprecated feature. + +By default, vcpkg will run several checks on built packages and emit warnings if any issues are detected. This flag upgrades those warnings to an error. + +### `--x-feature=` + +**Experimental and may change or be removed at any time** + +**[Manifest Mode][] Only** + +Specify an additional [feature](../users/manifests.md#features) from the `vcpkg.json` to install dependencies for. + +By default, only [`"dependencies"`](../users/manifests.md#dependencies) and the dependencies of the [`"default-features"`](../users/manifests.md#default-features) will be installed. + +### `--head` + +**Classic Mode Only** + +Request all packages explicitly referenced on the command line to fetch the latest sources available when building. + +This flag is only intended for temporary testing and is not intended for production or long-term use. This disables [Binary Caching][] for all explicitly referenced packages and their dependents because vcpkg cannot accurately track all inputs. + +### `--keep-going` + +Continue the install plan after the first failure. + +By default, vcpkg will stop at the first package build failure. This flag instructs vcpkg to continue building and installing other parts of the install plan that don't depend upon the failed package. + +### `--x-no-default-features` + +**Experimental and may change or be removed at any time** + +**[Manifest Mode][] Only** + +Don't install the default features from the top-level manifest. + +When using `install` in Manifest Mode, by default all dependencies of the features listed in [`"default-features"`][] will be installed. This flag disables that behavior so (without any `TODO` flags) only the dependencies listed in [`"dependencies"`][] will be installed. + +### `--no-downloads` + +When building a package, prevent ports from downloading new assets during the build. + +By default, ports will acquire source code and tools on demand from the internet (subject to [Asset Caching][]). This parameter blocks downloads and restricts ports to only the assets that were previously downloaded and cached on the machine. + +### `--only-downloads` + +Attempt to download all assets required for an install plan without performing any builds. + +When passed this option, vcpkg will run each build in the plan until it makes its first non-downloading external process call. Most ports perform all downloads before the first external process call (usually to their buildsystem), so this procedure will download all required assets. Ports that do not follow this procedure will not have their assets predownloaded. + +### `--only-binarycaching` + +Refuse to perform any builds. Only restore packages from [Binary Caches][Binary Caching]. + +This flag blocks vcpkg from performing builds on demand and will fail if a package cannot be found in any binary caches. + +### `--recurse` + +**Classic Mode Only** + +Approve an install plan that requires rebuilding packages. + +In order to modify the set of features of an installed package, vcpkg must remove and rebuild that package. Because this has the potential of failing and leaving the install tree with fewer packages than the user started with, the user must approve plans that rebuild packages by passing this flag. + +### `--x-use-aria2` + +**Experimental and may change or be removed at any time** + +Use aria2 to perform download tasks. + + + +### `--x-write-nuget-packages-config` + +**Experimental and may change or be removed at any time** + +Writes out a NuGet `packages.config`-formatted file for use with [Binary Caching][]. + +This option can be used in conjunction with `--dry-run` to obtain the list of NuGet packages required from [Binary Caching][] without building or installing any packages. This enables the NuGet command line to be invoked separately for advanced scenarios, such as using alternate protocols to acquire the `.nupkg` files. + +[Asset Caching]: ../users/assetcaching.md +[Binary Caching]: ../users/binarycaching.md +[Manifest Mode]: ../users/manifests.md +[`"supports"`]: ../users/manifests.md#supports +[`"default-features"`]: ../users/manifests.md#default-features +[`"dependencies"`]: ../users/manifests.md#dependencies diff --git a/externals/vcpkg/docs/commands/integrate.md b/externals/vcpkg/docs/commands/integrate.md new file mode 100755 index 000000000..8ea29899b --- /dev/null +++ b/externals/vcpkg/docs/commands/integrate.md @@ -0,0 +1,84 @@ +# vcpkg integrate + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/commands/integrate.md).** + +## Synopsis + +**Buildsystem Integration** +```no-highlight +vcpkg integrate [options] install +vcpkg integrate [options] remove +vcpkg integrate [options] project +``` +**Shell Integration** +```no-highlight +vcpkg integrate [options] powershell +vcpkg integrate [options] bash +vcpkg integrate [options] zsh +vcpkg integrate [options] x-fish +``` + +## Description + +Integrate vcpkg with shells and buildsystems. + +### `vcpkg integrate install` + +Integrates with [Visual Studio](../users/buildsystems/msbuild-integration.md#user-wide-integration) (Windows-only), sets the user-wide vcpkg instance, and displays CMake integration help. + +On Windows with Visual Studio 2015, this subcommand will add redirecting logic into the MSBuild installation which will automatically pick up each user's user-wide vcpkg instance. Visual Studio 2017 and newer have this logic in the box. + +To set the user-wide vcpkg instance, vcpkg creates a few short files containing the absolute path to the vcpkg instance inside the user's user-wide configuration location: + +- `%LOCALAPPDATA%\vcpkg` or `%APPDATA%\Local\vcpkg` on Windows +- `$HOME/.vcpkg` or `/var/.vcpkg` on non-Windows + +Displays the full path to the [CMake toolchain file](../users/buildsystems/cmake-integration.md). Running this command is not required to use the toolchain file. + +### `vcpkg integrate remove` + +Removes the user-wide vcpkg instance setting. + +This command deletes the linking files from the user-wide configuration location created by `vcpkg integrate install`. + +### `vcpkg integrate project` + +Creates a linked NuGet package for MSBuild integration. + +See [MSBuild Per-Project Integration](../users/buildsystems/msbuild-integration.md#linked-nuget-package) for more information. + +### `vcpkg integrate powershell` + +**Windows Only** + +Adds vcpkg tab-completion support to the current user's Powershell profile. + +### `vcpkg integrate bash` + +**Non-Windows Only** + +Adds vcpkg tab-completion support to the current user's `.bashrc` (`.bash_profile` on MacOS). + +### `vcpkg integrate zsh` + +**Non-Windows Only** + +Adds vcpkg tab-completion support to the current user's `.zshrc`. + +### `vcpkg integrate x-fish` + +**Non-Windows Only** + +Adds vcpkg tab-completion support to the current user's fish shell completions directory. + +## Example +```no-highlight +$ vcpkg integrate install +Applied user-wide integration for this vcpkg root. + +CMake projects should use: "-DCMAKE_TOOLCHAIN_FILE=/workspaces/vcpkg/scripts/buildsystems/vcpkg.cmake" +``` + +## Options + +All vcpkg commands support a set of [common options](common-options.md). diff --git a/externals/vcpkg/docs/commands/search.md b/externals/vcpkg/docs/commands/search.md new file mode 100755 index 000000000..093685fa3 --- /dev/null +++ b/externals/vcpkg/docs/commands/search.md @@ -0,0 +1,37 @@ +# vcpkg search + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/commands/search.md).** + +## Synopsis + +```no-highlight +vcpkg search [options] [query] +``` + +## Description + +Searches for available packages by name and description. + +Search performs a case-insensitive search through all available package names and descriptions. The results are displayed in a tabular format. + +## Example +```no-highlight +$ vcpkg search zlib +miniz 2.2.0#1 Single C source file zlib-replacement library +zlib 1.2.12#1 A compression library +zlib-ng 2.0.6 zlib replacement with optimizations for 'next generation' systems +``` + +## Options + +All vcpkg commands support a set of [common options](common-options.md). + +### `--x-full-desc` + +**Experimental and may change or be removed at any time** + +Do not truncate long descriptions. + +By default, long descriptions will be truncated to keep the tabular output browsable. + +[Registries]: ../users/registries.md diff --git a/externals/vcpkg/docs/examples/installing-and-using-packages.md b/externals/vcpkg/docs/examples/installing-and-using-packages.md new file mode 100755 index 000000000..612d5bdbe --- /dev/null +++ b/externals/vcpkg/docs/examples/installing-and-using-packages.md @@ -0,0 +1,182 @@ +## Installing and Using Packages Example: SQLite + +_Note: this old example uses Classic Mode, but most developers will be happier with Manifest Mode. See [Manifest Mode: CMake Example](manifest-mode-cmake.md) for an example of converting to Manifest Mode._ + + - [Step 1: Install](#install) + - [Step 2: Use](#use) + - [VS/MSBuild Project (User-wide integration)](#msbuild) + - [CMake (Toolchain file)](#cmake) + - [Other integration options](../users/buildsystems/integration.md) + +--- + +## Step 1: Install + +First, we need to know what name [SQLite](https://sqlite.org) goes by in the ports tree. To do that, we'll run the `search` command and inspect the output: +```no-highlight +PS D:\src\vcpkg> .\vcpkg search sqlite +libodb-sqlite 2.4.0 Sqlite support for the ODB ORM library +sqlite3 3.32.1 SQLite is a software library that implements a se... + +If your library is not listed, please open an issue at: + https://github.com/Microsoft/vcpkg/issues +``` +Looking at the list, we can see that the port is named "sqlite3". You can also run the `search` command without arguments to see the full list of packages. + +Installing is then as simple as using the `install` command. +```no-highlight +PS D:\src\vcpkg> .\vcpkg install sqlite3 +Computing installation plan... +The following packages will be built and installed: + sqlite3[core]:x86-windows +Starting package 1/1: sqlite3:x86-windows +Building package sqlite3[core]:x86-windows... +-- Downloading https://sqlite.org/2020/sqlite-amalgamation-3320100.zip... +-- Extracting source C:/src/vcpkg/downloads/sqlite-amalgamation-3320100.zip +-- Applying patch fix-arm-uwp.patch +-- Using source at C:/src/vcpkg/buildtrees/sqlite3/src/3320100-15aeda126a.clean +-- Configuring x86-windows +-- Building x86-windows-dbg +-- Building x86-windows-rel +-- Performing post-build validation +-- Performing post-build validation done +Building package sqlite3[core]:x86-windows... done +Installing package sqlite3[core]:x86-windows... +Installing package sqlite3[core]:x86-windows... done +Elapsed time for package sqlite3:x86-windows: 12 s + +Total elapsed time: 12.04 s + +The package sqlite3:x86-windows provides CMake targets: + + find_package(unofficial-sqlite3 CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::sqlite3::sqlite3)) + +``` + +We can check that sqlite3 was successfully installed for x86 Windows desktop by running the `list` command. +```no-highlight +PS D:\src\vcpkg> .\vcpkg list +sqlite3:x86-windows 3.32.1 SQLite is a software library that implements a se... +``` + +To install for other architectures and platforms such as Universal Windows Platform or x64 Desktop, you can suffix the package name with `:`. +```no-highlight +PS D:\src\vcpkg> .\vcpkg install sqlite3:x86-uwp zlib:x64-windows +``` + +See `.\vcpkg help triplet` for all supported targets. + +--- + +## Step 2: Use + +#### VS/MSBuild Project (User-wide integration) + +The recommended and most productive way to use vcpkg is via user-wide integration, making the system available for all projects you build. The user-wide integration will prompt for administrator access the first time it is used on a given machine, but afterwards is no longer required and the integration is configured on a per-user basis. +```no-highlight +PS D:\src\vcpkg> .\vcpkg integrate install +Applied user-wide integration for this vcpkg root. + +All C++ projects can now #include any installed libraries. +Linking will be handled automatically. +Installing new libraries will make them instantly available. +``` +*Note: You will need to restart Visual Studio or perform a Build to update intellisense with the changes.* + +You can now simply use File -> New Project in Visual Studio and the library will be automatically available. For SQLite, you can try out their [C/C++ sample](https://sqlite.org/quickstart.html). + +To remove the integration for your user, you can use `.\vcpkg integrate remove`. + + +#### CMake (Toolchain File) + +The best way to use installed libraries with cmake is via the toolchain file `scripts\buildsystems\vcpkg.cmake`. To use this file, you simply need to add it onto your CMake command line as: +`-DCMAKE_TOOLCHAIN_FILE=D:\src\vcpkg\scripts\buildsystems\vcpkg.cmake`. + +If you are using CMake through Open Folder with Visual Studio you can define `CMAKE_TOOLCHAIN_FILE` by adding a "variables" section to each of your `CMakeSettings.json` configurations: + +```json +{ + "configurations": [{ + "name": "x86-Debug", + "generator": "Visual Studio 15 2017", + "configurationType" : "Debug", + "buildRoot": "${env.LOCALAPPDATA}\\CMakeBuild\\${workspaceHash}\\build\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "-m -v:minimal", + "variables": [{ + "name": "CMAKE_TOOLCHAIN_FILE", + "value": "D:\\src\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake" + }] + }] +} +``` +*Note: It might be necessary to delete the CMake cache folder of each modified configuration, to force a full regeneration. In the `CMake` menu, under `Cache ()` you'll find `Delete Cache Folders`.* + +Now let's make a simple CMake project with a main file. +```cmake +# CMakeLists.txt +cmake_minimum_required(VERSION 3.0) +project(test) + +find_package(unofficial-sqlite3 CONFIG REQUIRED) + +add_executable(main main.cpp) + +target_link_libraries(main PRIVATE unofficial::sqlite3::sqlite3) +``` +```cpp +// main.cpp +#include +#include + +int main() +{ + printf("%s\n", sqlite3_libversion()); + return 0; +} +``` + +Then, we build our project in the normal CMake way: +```no-highlight +PS D:\src\cmake-test> mkdir build +PS D:\src\cmake-test> cd build +PS D:\src\cmake-test\build> cmake .. "-DCMAKE_TOOLCHAIN_FILE=D:\src\vcpkg\scripts\buildsystems\vcpkg.cmake" + // omitted CMake output here // +-- Build files have been written to: D:/src/cmake-test/build +PS D:\src\cmake-test\build> cmake --build . + // omitted MSBuild output here // +Build succeeded. + 0 Warning(s) + 0 Error(s) + +Time Elapsed 00:00:02.38 +PS D:\src\cmake-test\build> .\Debug\main.exe +3.15.0 +``` + +*Note: The correct sqlite3.dll is automatically copied to the output folder when building for x86-windows. You will need to distribute this along with your application.* + +##### Handling libraries without native cmake support + +Unlike other platforms, we do not automatically add the `include\` directory to your compilation line by default. If you're using a library that does not provide CMake integration, you will need to explicitly search for the files and add them yourself using [`find_path()`][1] and [`find_library()`][2]. + +```cmake +# To find and use catch +find_path(CATCH_INCLUDE_DIR catch.hpp) +include_directories(${CATCH_INCLUDE_DIR}) + +# To find and use azure-storage-cpp +find_path(WASTORAGE_INCLUDE_DIR was/blob.h) +find_library(WASTORAGE_LIBRARY wastorage) +include_directories(${WASTORAGE_INCLUDE_DIR}) +link_libraries(${WASTORAGE_LIBRARY}) + +# Note that we recommend using the target-specific directives for a cleaner cmake: +# target_include_directories(main ${LIBRARY}) +# target_link_libraries(main PRIVATE ${LIBRARY}) +``` + +[1]: https://cmake.org/cmake/help/latest/command/find_path.html +[2]: https://cmake.org/cmake/help/latest/command/find_library.html diff --git a/externals/vcpkg/docs/examples/manifest-mode-cmake.md b/externals/vcpkg/docs/examples/manifest-mode-cmake.md new file mode 100755 index 000000000..77891b60e --- /dev/null +++ b/externals/vcpkg/docs/examples/manifest-mode-cmake.md @@ -0,0 +1,200 @@ +# Manifest Mode: CMake Example + +We would like to add [vcpkg manifest support](../users/manifests.md) to an existing cmake project! +Let's create a simple project that prints the fibonacci sequence up to a certain number, +using some common dependencies. + +## Initial Layout + +Let's create the following file layout: + +```no-highlight +fibo/ + src/ + main.cxx + CMakeLists.txt +``` + +And we wish to use [fmt](https://github.com/fmtlib/fmt), [range-v3](https://github.com/ericniebler/range-v3), +and [cxxopts](https://github.com/jarro2783/cxxopts). + +Let's write our `CMakeLists.txt` first: + +```cmake +cmake_minimum_required(VERSION 3.15) + +project(fibo CXX) + +find_package(fmt REQUIRED) +find_package(range-v3 REQUIRED) +find_package(cxxopts REQUIRED) + +add_executable(fibo src/main.cxx) +target_compile_features(fibo PRIVATE cxx_std_17) + +target_link_libraries(fibo + PRIVATE + fmt::fmt + range-v3::range-v3 + cxxopts::cxxopts) +``` + +And then we should add `main.cxx`: + +```cxx +#include +#include +#include + +namespace view = ranges::views; + +int fib(int x) { + int a = 0, b = 1; + + for (int it : view::repeat(0) | view::take(x)) { + (void)it; + int tmp = a; + a += b; + b = tmp; + } + + return a; +} + +int main(int argc, char** argv) { + cxxopts::Options options("fibo", "Print the fibonacci sequence up to a value 'n'"); + options.add_options() + ("n,value", "The value to print to", cxxopts::value()->default_value("10")); + + auto result = options.parse(argc, argv); + auto n = result["value"].as(); + + for (int x : view::iota(1) | view::take(n)) { + fmt::print("fib({}) = {}\n", x, fib(x)); + } +} +``` + +This is a simple project of course, but it should give us a clean project to start with. +Let's try it out! + +Let's assume you have `fmt`, `range-v3`, and `cxxopts` installed with vcpkg classic mode; +then, you can just do a simple: + +```cmd +D:\src\fibo> cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=D:\src\vcpkg\scripts\buildsystems\vcpkg.cmake +-- Building for: Visual Studio 16 2019 +-- Selecting Windows SDK version 10.0.18362.0 to target Windows 10.0.19041. +-- The CXX compiler identification is MSVC 19.27.29111.0 +-- Detecting CXX compiler ABI info +-- Detecting CXX compiler ABI info - done +-- Check for working CXX compiler: C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.27.29110/bin/Hostx64/x64/cl.exe - skipped +-- Detecting CXX compile features +-- Detecting CXX compile features - done +-- Configuring done +-- Generating done +-- Build files have been written to: D:/src/fibo/build +D:\src\fibo> cmake --build build +Microsoft (R) Build Engine version 16.7.0+b89cb5fde for .NET Framework +Copyright (C) Microsoft Corporation. All rights reserved. + + Checking Build System + Building Custom Rule D:/src/fibo/CMakeLists.txt + main.cxx + The contents of are available only with C++20 or later. + fibo.vcxproj -> D:\src\fibo\build\Debug\fibo.exe + Building Custom Rule D:/src/fibo/CMakeLists.txt +``` + +And now we can try out the `fibo` binary! + +```cmd +D:\src\fibo> .\build\Debug\fibo.exe -n 7 +fib(1) = 1 +fib(2) = 1 +fib(3) = 2 +fib(4) = 3 +fib(5) = 5 +fib(6) = 8 +fib(7) = 13 +``` + +it works! + +## Converting to Manifest Mode + +We now wish to use manifest mode, so all of our dependencies are managed for us! Let's write a `vcpkg.json`: + +```json +{ + "name": "fibo", + "version-string": "0.1.0", + "dependencies": [ + "cxxopts", + "fmt", + "range-v3" + ] +} +``` + +Let's delete the build directory and rerun the build: + +```cmd +D:\src\fibo> rmdir /S /Q build +D:\src\fibo> cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=D:\src\vcpkg\scripts\buildsystems\vcpkg.cmake +-- Running vcpkg install +Detecting compiler hash for triplet x64-windows... +The following packages will be built and installed: + cxxopts[core]:x64-windows + fmt[core]:x64-windows + range-v3[core]:x64-windows +Starting package 1/3: cxxopts:x64-windows +Building package cxxopts[core]:x64-windows... +Using cached binary package: C:\Users\me\AppData\Local\vcpkg/archives\d2\d2d1e5302cdfefef2fd090d8eda84cc0c1fbe6f1.zip +Building package cxxopts[core]:x64-windows... done +Installing package cxxopts[core]:x64-windows... +Installing package cxxopts[core]:x64-windows... done +Elapsed time for package cxxopts:x64-windows: 50.64 ms +Starting package 2/3: fmt:x64-windows +Building package fmt[core]:x64-windows... +Using cached binary package: C:\Users\me\AppData\Local\vcpkg/archives\bf\bf00d5214e912d71414b545b241f54ef87fdf6e5.zip +Building package fmt[core]:x64-windows... done +Installing package fmt[core]:x64-windows... +Installing package fmt[core]:x64-windows... done +Elapsed time for package fmt:x64-windows: 225 ms +Starting package 3/3: range-v3:x64-windows +Building package range-v3[core]:x64-windows... +Using cached binary package: C:\Users\me\AppData\Local\vcpkg/archives\fe\fe2cdedef6953bf954e8ddca471bf3cc8d9b06d7.zip +Building package range-v3[core]:x64-windows... done +Installing package range-v3[core]:x64-windows... +Installing package range-v3[core]:x64-windows... done +Elapsed time for package range-v3:x64-windows: 1.466 s + +Total elapsed time: 1.742 s + +-- Running vcpkg install - done +-- Selecting Windows SDK version 10.0.18362.0 to target Windows 10.0.19041. +-- The CXX compiler identification is MSVC 19.27.29111.0 +-- Detecting CXX compiler ABI info +-- Detecting CXX compiler ABI info - done +-- Check for working CXX compiler: C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.27.29110/bin/Hostx64/x64/cl.exe - skipped +-- Detecting CXX compile features +-- Detecting CXX compile features - done +-- Configuring done +-- Generating done +-- Build files have been written to: D:/src/fibo/build +D:\src\fibo> cmake --build build +Microsoft (R) Build Engine version 16.7.0+b89cb5fde for .NET Framework +Copyright (C) Microsoft Corporation. All rights reserved. + + Checking Build System + Building Custom Rule D:/src/fibo/CMakeLists.txt + main.cxx + The contents of are available only with C++20 or later. + fibo.vcxproj -> D:\src\fibo\build\Debug\fibo.exe + Building Custom Rule D:/src/fibo/CMakeLists.txt +``` + +You can see that with just a _single file_, we've changed over to manifests without _any_ trouble. +The build system doesn't change _at all_! We just add a `vcpkg.json` file, delete the build directory, +and reconfigure. And we're done! diff --git a/externals/vcpkg/docs/examples/modify-baseline-to-pin-old-boost.md b/externals/vcpkg/docs/examples/modify-baseline-to-pin-old-boost.md new file mode 100755 index 000000000..21d6f1a3e --- /dev/null +++ b/externals/vcpkg/docs/examples/modify-baseline-to-pin-old-boost.md @@ -0,0 +1,191 @@ +# Pin old Boost versions +This document will teach you how to set versions of meta-packages like `boost` or `qt5`. + +**What is a meta-package?** +In vcpkg we call meta-packages to ports that by themselves don't install anything but that instead forward installation to another port or ports. The reasons for these meta-packages to exist are plenty: to install different versions of a library depending on platform or to conveniently install/uninstall a catalog of related packages (Boost and Qt). + +In the case of Boost, it is unlikely that a user requires all of the 140+ Boost libraries in their project. For the sake of convenience, vcpkg splits Boost into multiple sub-packages broken down to individual libraries. By doing so, users can limit the subset of Boost libraries that they depend on. + +If a user wants to install all of the Boost libraries available in vcpkg, they can do so by installing the `boost` meta-package. + +Due to the nature of meta-packages, some unexpected issues arise when trying to use them with versioning. If a user writes the following manifest file: + +`vcpkg.json` +```json +{ + "name": "demo", + "version": "1.0.0", + "builtin-baseline": "787fe1418ea968913cc6daf11855ffd8b0b5e9d4", + "dependencies": [ "boost-tuple" ], + "overrides": [ + { "name": "boost", "version": "1.72.0" } + ] +} +``` + +The resulting installation plan is: +``` +The following packages will be built and installed: + boost-assert[core]:x64-windows -> 1.75.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-assert\3393715b4ebe30fe1c3b68acf7f84363e611f156 + boost-compatibility[core]:x64-windows -> 1.75.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-compatibility\cda5675366367789659c59aca65fc57d03c51deb + boost-config[core]:x64-windows -> 1.75.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-config\ca82ca1b9c1739c91f3cf42c68cee56c896ae6bd + boost-container-hash[core]:x64-windows -> 1.75.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-container-hash\bf472c23d29c3d80b562c43471eb92cea998f372 + boost-core[core]:x64-windows -> 1.75.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-core\20a19f6ece37686a02eed33e1f58add8b7a2582a + boost-detail[core]:x64-windows -> 1.75.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-detail\96744251f025f9b3c856a275dfc338031876777b + boost-integer[core]:x64-windows -> 1.75.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-integer\de70ce0d1500df1eda3496c4f98f42f5db256b4a + boost-io[core]:x64-windows -> 1.75.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-io\7bf3407372f8fc2a99321d24a0e952d44fe25bf3 + boost-preprocessor[core]:x64-windows -> 1.75.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-preprocessor\8d78b8ba2e9f54cb00137115ddd2ffec1c63c149 + boost-static-assert[core]:x64-windows -> 1.75.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-static-assert\2a41c4703c7122de25b1c60510c43edc9371f63d + boost-throw-exception[core]:x64-windows -> 1.75.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-throw-exception\b13bdf32a20786a0165cc20205ef63765cac0627 + boost-tuple[core]:x64-windows -> 1.75.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-tuple\22e3d000a178a88992c430d8ae8a0244c7dea674 + boost-type-traits[core]:x64-windows -> 1.75.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-type-traits\8829793f6c6c913257314caa317599f8d253a5ca + boost-uninstall[core]:x64-windows -> 1.75.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-uninstall\08933bad27b6d41caef0940c31e2069ecb6a079c + boost-utility[core]:x64-windows -> 1.75.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-utility\47572946bf6a63c731b9c4142eecb8bef3d3b270 + boost-vcpkg-helpers[core]:x64-windows -> 7#2 -- D:\vcpkg\buildtrees\versioning\versions\boost-vcpkg-helpers\2a21e5ab45d1ce41c185faf85dff0670ea6def1d +``` + +It is reasonable to expect that overriding `boost` to version 1.72.0 results in all Boost packages being pinned to version 1.72.0. **However, vcpkg does not treat the `boost` meta-package any differently that any other port.** In other words, vcpkg has no notion that `boost` is related to all the other `boost-*` libraries, other than it depends on all of them. For this reason, all the other boost packages are installed at version 1.75.0, which is the baseline version. + +Below, we describe two methods to pin down Boost versions effectively. + +## Method 1: Pin specific packages +Use `"overrides"` to force specific versions in a package-by-package basis. + +`vcpkg.json` +```json +{ + "name": "demo", + "version": "1.0.0", + "builtin-baseline": "787fe1418ea968913cc6daf11855ffd8b0b5e9d4", + "dependencies": [ "boost-tuple" ], + "overrides": [ + { "name": "boost-core", "version": "1.72" }, + { "name": "boost-integer", "version": "1.72" }, + { "name": "boost-io", "version": "1.72" }, + { "name": "boost-tuple", "version": "1.72" } + ] +} +``` + +This method allows you to quickly set the specific versions you want, but you will need to write an override for each package. Boost libraries are also heavily interdependent, which means that you may end up writing a lot of override lines. + +The second method makes it easy to pin the entire Boost collection and end up with a very simple manifest file. + +## Method 2: Modify baseline +An easy way to set the version for the entirety of boost is to use the `"builtin-baseline"` property. + +As of right now, it is only possible to go back to Boost version `1.75.0` using a baseline, since that was the contemporary Boost version when the versioning feature was merged. **But, it is possible to modify the baseline to whatever you like and use that instead.** + +### Step 1: Create a new branch +As described in the versioning documentation. The value that goes in `"builtin-baseline"` is a git commit in the microsoft/vcpkg repository's history. If you want to customize the baseline and have control over the vcpkg instance, you can create a new commit with said custom baseline. + +Let's start by creating a new branch to hold our modified baseline. + +In the directory containing your clone of the vcpkg Git repository run: + +``` +git checkout -b custom-boost-baseline +``` + +This will create a new branch named `custom-boost-baseline` and check it out immediately. + +### Step 2: Modify the baseline +The next step is to modify the baseline file, open the file in your editor of choice and modify the entries for the Boost libraries. + +Change the `"baseline"` version to your desired version. +_NOTE: Remember to also set the port versions to 0 (or your desired version)._ + +`${vcpkg-root}/versions/baseline.json` +```diff +... + "boost": { +- "baseline": "1.75.0", ++ "baseline": "1.72.0", + "port-version": 0 + }, + "boost-accumulators": { +- "baseline": "1.75.0", +- "port-version": 1 ++ "baseline": "1.72.0", ++ "port-version": 0 + }, + "boost-algorithm": { +- "baseline": "1.75.0", ++ "baseline": "1.72.0", + "port-version": 0 + }, + "boost-align": { +- "baseline": "1.75.0", ++ "baseline": "1.72.0", + "port-version": 0 + }, +... + "boost-uninstall: { + "baseline": "1.75.0", + "port-version": 0 + }, +... +``` + +Some `boost-` packages are helpers used by vcpkg and are not part of Boost. For example, `"boost-uninstall"` is a vcpkg helper to conveniently uninstall all Boost libraries, but it didn't exist for Boost version `1.72.0`, in this case it is fine to leave it at `1.75.0` to avoid baseline errors (since all versions in `baseline.json` must have existed). + +### Step 3: Commit your changes +After saving your modified file, run these commands to commit your changes: + +``` +git add versions/baseline.json +git commit -m "Baseline Boost 1.72.0" +``` + +You can set the commit message to whatever you want, just make it useful for you. + +### Step 4: Get your baseline commit SHA +Once all your changes are ready, you can get the commit SHA by running: +``` +git rev-parse HEAD +``` + +The output of that command will be the commit SHA you need to put as the `"builtin-baseline"` in your project's manifest file. Copy the 40-hex digits and save them to use later in your manifest file. + +### Step 5: (Optional) Go back to the main repository branch +Once your changes have been committed locally, you can refer to the commit SHA regardless of the repository branch you're working on. So, let's go back to the main vcpkg repository branch. + +``` +git checkout master +``` + +### Step 6: Create your manifest file with your custom baseline + +```json +{ + "name": "demo", + "version": "1.0.0", + "builtin-baseline": "9b5cf7c3d9376ddf43429671282972ec4f99aa85", + "dependencies": [ "boost-tuple" ] +} +``` + +In this example, commit SHA `9b5cf7c3d9376ddf43429671282972ec4f99aa85` is the commit ID with the modified baseline. Even when a different branch (`master` in this case) is checked out, Git is able to find the commit as long as the branch with the modified baseline exists (the `custom-boost-baseline` branch we created in step 1). + +We run `vcpkg install` in the directory containing our manifest file and the output looks like this: + +``` +The following packages will be built and installed: + boost-assert[core]:x64-windows -> 1.72.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-assert\6754398591f48435b28014ca0d60e5375a4c04d1 + boost-compatibility[core]:x64-windows -> 1.72.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-compatibility\9893ff3c554575bc712df4108a949e07b269f401 + boost-config[core]:x64-windows -> 1.72.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-config\de2784767046b06ec31eb718f10df512e51f2aad + boost-container-hash[core]:x64-windows -> 1.72.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-container-hash\cc19fb0154bbef188f309f49b2664ec7623b96b6 + boost-core[core]:x64-windows -> 1.72.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-core\0eb5e20df9e267e9eca325be946f52ceb8a60229 + boost-detail[core]:x64-windows -> 1.72.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-detail\759d7c6a3f9dbaed0b0c69fa0bb764f7606bb02d + boost-integer[core]:x64-windows -> 1.72.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-integer\173956c61a26e83b0f8b58b0baf60f06aeee637c + boost-preprocessor[core]:x64-windows -> 1.72.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-preprocessor\86eb3938b7875f124feb845331dbe84cbab5d1c6 + boost-static-assert[core]:x64-windows -> 1.72.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-static-assert\e82d8f7f3ee07e927dc374f5a08ed6d6f4ef81f4 + boost-throw-exception[core]:x64-windows -> 1.72.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-throw-exception\64df295f7df41de4fcb219834889b126b5020def + boost-tuple[core]:x64-windows -> 1.72.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-tuple\b3e1b01ffce6e367e4fed0a5538a8546abacb6b2 + boost-type-traits[core]:x64-windows -> 1.72.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-type-traits\5e44ec657660eccf4d3b2710b092dd238e1e7a2d + boost-uninstall[core]:x64-windows -> 1.75.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-uninstall\08933bad27b6d41caef0940c31e2069ecb6a079c + boost-utility[core]:x64-windows -> 1.72.0 -- D:\vcpkg\buildtrees\versioning\versions\boost-utility\7d721b2458d5d595ac341eb54883274f38a4b8c2 + boost-vcpkg-helpers[core]:x64-windows -> 7#2 -- D:\vcpkg\buildtrees\versioning\versions\boost-vcpkg-helpers\2a21e5ab45d1ce41c185faf85dff0670ea6def1d +``` + +Notice how simple our manifest file has become, instead of having a multitude of `"overrides"` you can pin down all Boost packages just by setting the `"builtin-baseline"` to be your modified baseline commit SHA. diff --git a/externals/vcpkg/docs/examples/overlay-triplets-linux-dynamic.md b/externals/vcpkg/docs/examples/overlay-triplets-linux-dynamic.md new file mode 100755 index 000000000..5d7901337 --- /dev/null +++ b/externals/vcpkg/docs/examples/overlay-triplets-linux-dynamic.md @@ -0,0 +1,126 @@ +# Overlay triplets example + +## Building dynamic libraries on Linux + +Using **vcpkg** you can build libraries for many configurations out of the box. However, this doesn't currently include shared libraries on Linux and Mac OS. + +This doesn't mean that you cannot use **vcpkg** to build your dynamic libraries on these platforms! This document will guide you through creating your own custom triplets with `--overlay-triplets` to easily build dynamic libraries on Linux. + +### Step 1: Create the custom triplet files + +To save time, copy the existing `x64-linux.cmake` triplet file. + +```sh +~/git$ mkdir custom-triplets +~/git$ cp vcpkg/triplets/x64-linux.cmake custom-triplets/x64-linux-dynamic.cmake +``` + +And modify `custom-triplets/x64-linux-dynamic.cmake` to match the contents below: +```cmake +# ~/git/custom-triplets/x64-linux-dynamic.cmake +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) # This changed from static to dynamic + +set(VCPKG_CMAKE_SYSTEM_NAME Linux) +``` + +### Step 2: Use `--overlay-triplets` to build dynamic libraries + +Use the `--overlay-triplets` option to include the triplets in the `custom-triplets` directory. + +``` +~/git$ vcpkg/vcpkg install sqlite3:x64-linux-dynamic --overlay-triplets=custom-triplets +The following packages will be built and installed: + sqlite3[core]:x64-linux-dynamic +Starting package 1/1: sqlite3:x64-linux-dynamic +Building package sqlite3[core]:x64-linux-dynamic... +-- Loading triplet configuration from: /home/victor/git/custom-triplets/x64-linux-dynamic.cmake +-- Downloading https://sqlite.org/2019/sqlite-amalgamation-3280000.zip... +-- Extracting source /home/victor/git/vcpkg/downloads/sqlite-amalgamation-3280000.zip +-- Applying patch fix-arm-uwp.patch +-- Using source at /home/victor/git/vcpkg/buildtrees/sqlite3/src/3280000-6a3ff7ce92 +-- Configuring x64-linux-dynamic-dbg +-- Configuring x64-linux-dynamic-rel +-- Building x64-linux-dynamic-dbg +-- Building x64-linux-dynamic-rel +-- Performing post-build validation +-- Performing post-build validation done +Building package sqlite3[core]:x64-linux-dynamic... done +Installing package sqlite3[core]:x64-linux-dynamic... +Installing package sqlite3[core]:x64-linux-dynamic... done +Elapsed time for package sqlite3:x64-linux-dynamic: 44.82 s + +Total elapsed time: 44.82 s + +The package sqlite3:x64-linux-dynamic provides CMake targets: + + find_package(unofficial-sqlite3 CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::sqlite3::sqlite3) +``` + +Overlay triplets enables your custom triplet files when using `vcpkg install`, `vcpkg update`, `vcpkg upgrade`, and `vcpkg remove`. + +When using the `--overlay-triplets` option, a message like the following lets you know that a custom triplet is being used: + +``` +-- Loading triplet configuration from: /home/custom-triplets/x64-linux-dynamic.cmake +``` + +## Overriding default triplets + +As you may have noticed, the default triplets for Windows (`x86-windows` and `x64-windows`) install dynamic libraries, while a suffix (`-static`) is needed for static libraries. This is different with Linux and Mac OS where static libraries are built by `x64-linux` and `x64-osx`. + +Using `--overlay-triplets` it is possible to override the default triplets to accomplish the same behavior on Linux: + +* `x64-linux`: Builds dynamic libraries, +* `x64-linux-static`: Builds static libraries. + +### Step 1: Create the overlay triplets + +Using the custom triplet created in the previous example, rename `custom-triplets/x64-linux-dynamic.cmake` to `custom-triplets/x64-linux.cmake`. Then, copy the default `x64-linux` triplet (which builds static libraries) in your `custom-triplets` folder and rename it to `x64-linux-static.cmake`. + +```sh +~/git$ mv custom-triplets/x64-linux-dynamic.cmake custom-triplets/x64-linux.cmake +~/git$ cp vcpkg/triplets/x64-linux.cmake custom-triplets/x64-linux-static.cmake +``` + +### Step 2: Use `--overlay-triplets` to override default triplets + +Use the `--overlay-triplets` option to include the triplets in the `custom-triplets` directory. + +``` +~/git$ vcpkg/vcpkg install sqlite3:x64-linux --overlay-triplets=custom-triplets +The following packages will be built and installed: + sqlite3[core]:x64-linux +Starting package 1/1: sqlite3:x64-linux +Building package sqlite3[core]:x64-linux... +-- Loading triplet configuration from: /home/victor/git/custom-triplets/x64-linux.cmake +-- Downloading https://sqlite.org/2019/sqlite-amalgamation-3280000.zip... +-- Extracting source /home/victor/git/vcpkg/downloads/sqlite-amalgamation-3280000.zip +-- Applying patch fix-arm-uwp.patch +-- Using source at /home/victor/git/vcpkg/buildtrees/sqlite3/src/3280000-6a3ff7ce92 +-- Configuring x64-linux-dbg +-- Configuring x64-linux-rel +-- Building x64-linux-dbg +-- Building x64-linux-rel +-- Performing post-build validation +-- Performing post-build validation done +Building package sqlite3[core]:x64-linux... done +Installing package sqlite3[core]:x64-linux... +Installing package sqlite3[core]:x64-linux... done +Elapsed time for package sqlite3:x64-linux: 44.82 s + +Total elapsed time: 44.82 s + +The package sqlite3:x64-linux provides CMake targets: + + find_package(unofficial-sqlite3 CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::sqlite3::sqlite3) +``` + +Note that the default triplet is masked by your custom triplet: + +``` +-- Loading triplet configuration from: /home/victor/git/custom-triplets/x64-linux.cmake +``` diff --git a/externals/vcpkg/docs/examples/packaging-github-repos.md b/externals/vcpkg/docs/examples/packaging-github-repos.md new file mode 100755 index 000000000..7091c7e01 --- /dev/null +++ b/externals/vcpkg/docs/examples/packaging-github-repos.md @@ -0,0 +1,54 @@ +## Packaging Github Repos Example: libogg +### Create the manifest file +The manifest file (called `vcpkg.json`) is a json file describing the package's metadata. + +For libogg, we'll create the file `ports/libogg/vcpkg.json` with the following content: + +```json +{ + "name": "libogg", + "version-string": "1.3.3", + "description": "Ogg is a multimedia container format, and the native file and stream format for the Xiph.org multimedia codecs." +} +``` + +You can format the manifest file to our specifications with `vcpkg format-manifest ports/libogg/vcpkg.json`. + +### Create the portfile +`portfile.cmake` describes how to build and install the package. First we download the project from Github with [`vcpkg_from_github`](../maintainers/vcpkg_from_github.md): + +```cmake +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xiph/ogg + REF v1.3.3 + SHA512 0bd6095d647530d4cb1f509eb5e99965a25cc3dd9b8125b93abd6b248255c890cf20710154bdec40568478eb5c4cde724abfb2eff1f3a04e63acef0fbbc9799b + HEAD_REF master +) +``` + +The important parts to update are `REPO` for the GitHub repository path, `REF` for a stable tag/commit to use, and `SHA512` with the checksum of the downloaded zipfile (you can get this easily by setting it to `0`, trying to install the package, and copying the checksum). + +Finally, we configure the project with CMake, install the package, and copy over the license file: + +```cmake +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}) +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libogg" RENAME copyright) +``` + +Check the documentation for [`vcpkg_cmake_configure`](../maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md) and [`vcpkg_cmake_install`](../maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md) if your package needs additional options. + +Now you can run `vcpkg install libogg` to build and install the package. + +### Suggested example portfiles +In the `ports/` directory are many libraries that can be used as examples, including many that are not based on CMake. + +- Header only libraries + - rapidjson + - range-v3 +- MSBuild-based + - mpg123 +- Non-CMake, custom buildsystem + - openssl + - ffmpeg diff --git a/externals/vcpkg/docs/examples/packaging-zipfiles.md b/externals/vcpkg/docs/examples/packaging-zipfiles.md new file mode 100755 index 000000000..979cc29b4 --- /dev/null +++ b/externals/vcpkg/docs/examples/packaging-zipfiles.md @@ -0,0 +1,76 @@ +## Packaging `.zip` Files Example: zlib + +### Bootstrap with `create` +First, locate a globally accessible archive of the library's sources. Zip, gzip, and bzip are all supported. Strongly prefer official sources or mirrors over unofficial mirrors. + +*Looking at zlib's website, the URL http://zlib.net/zlib-1.2.11.tar.gz looks appropriate.* + +Second, determine a suitable package name. This should be ASCII, lowercase, and recognizable to someone who knows the library's "human name". If the library is already packaged in another package manager, prefer that name. + +*Since zlib is already packaged as zlib, we will use the name zlib2 for this example.* + +Finally, if the server's name for the archive is not very descriptive (such as downloading a zipped commit or branch from GitHub), choose a nice archive name of the form `-.zip`. + +*`zlib1211.zip` is a fine name, so no change needed.* + +All this information can then be passed into the `create` command, which will download the sources and bootstrap the packaging process inside `ports/`. + +```no-highlight +PS D:\src\vcpkg> .\vcpkg create zlib2 http://zlib.net/zlib-1.2.11.tar.gz zlib1211.tar.gz +-- Generated portfile: D:/src/vcpkg/ports/zlib2/portfile.cmake +``` + +### Create the manifest file +In addition to the generated `ports//portfile.cmake`, we also need a `ports//vcpkg.json` file. This file is a simple set of fields describing the package's metadata. + +*For zlib2, we'll create the file `ports/zlib2/vcpkg.json` with the following contents:* +```json +{ + "name": "zlib2", + "version-string": "1.2.11", + "description": "A Massively Spiffy Yet Delicately Unobtrusive Compression Library" +} +``` + +### Tweak the generated portfile +The generated `portfile.cmake` will need some editing to correctly package most libraries in the wild, however we can start by trying out the build. + +```no-highlight +PS D:\src\vcpkg> .\vcpkg install zlib2 +Computing installation plan... +The following packages will be built and installed: + zlib2[core]:x64-uwp +Starting package 1/1: zlib2:x64-uwp +Building package zlib2[core]:x64-uwp... +-- Using cached C:/src/vcpkg/downloads/zlib1211.tar.gz +-- Cleaning sources at C:/src/vcpkg/buildtrees/zlib2/src/1.2.11-deec42f53b.clean. Pass --editable to vcpkg to reuse sources. +-- Extracting source C:/src/vcpkg/downloads/zlib1211.tar.gz +-- Applying patch cmake_dont_build_more_than_needed.patch +-- Using source at C:/src/vcpkg/buildtrees/zlib2/src/1.2.11-deec42f53b.clean +-- Configuring x64-uwp +-- Building x64-uwp-dbg +-- Building x64-uwp-rel +-- Installing: C:/src/vcpkg/packages/zlib2_x64-uwp/share/zlib2/copyright +-- Performing post-build validation +Include files should not be duplicated into the /debug/include directory. If this cannot be disabled in the project cmake, use + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +/debug/share should not exist. Please reorganize any important files, then use + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +The software license must be available at ${CURRENT_PACKAGES_DIR}/share/zlib2/copyright +Found 3 error(s). Please correct the portfile: + D:\src\vcpkg\ports\zlib2\portfile.cmake +``` + +At this point, it is a matter of reading the error messages and log files while steadily improving the quality of the portfile. Zlib required providing a discrete copy of the LICENSE to copy into the package, suppressing the build and installation of executables and headers, and removing the static libraries after they were installed. + +### Suggested example portfiles +In the `ports/` directory are many libraries that can be used as examples, including many that are not based on CMake. + +- Header only libraries + - rapidjson + - range-v3 +- MSBuild-based + - mpg123 +- Non-CMake, custom buildsystem + - openssl + - ffmpeg diff --git a/externals/vcpkg/docs/examples/patching.md b/externals/vcpkg/docs/examples/patching.md new file mode 100755 index 000000000..dc9de1682 --- /dev/null +++ b/externals/vcpkg/docs/examples/patching.md @@ -0,0 +1,220 @@ +## Patching Example: Patching libpng to work for x64-uwp + +### Initial error logs +First, try building: + +```no-highlight +PS D:\src\vcpkg> vcpkg install libpng:x64-uwp --editable +Computing installation plan... +The following packages will be built and installed: + libpng[core]:x64-uwp +Starting package 1/1: libpng:x64-uwp +Building package libpng[core]:x64-uwp... +-- Using cached D:/src/vcpkg/downloads/glennrp-libpng-v1.6.37.tar.gz +-- Extracting source D:/src/vcpkg/downloads/glennrp-libpng-v1.6.37.tar.gz +-- Using source at D:/src/vcpkg/buildtrees/libpng/src/v1.6.37-c993153cdf +-- Configuring x64-uwp +-- Building x64-uwp-rel +CMake Error at scripts/cmake/execute_required_process.cmake:14 (message): + Command failed: C:/Program Files/CMake/bin/cmake.exe;--build;.;--config;Release + + Working Directory: D:/src/vcpkg/buildtrees/libpng/x64-uwp-rel + + See logs for more information: + + D:\src\vcpkg\buildtrees\libpng\build-x64-uwp-rel-out.log + D:\src\vcpkg\buildtrees\libpng\build-x64-uwp-rel-err.log + +Call Stack (most recent call first): + scripts/cmake/vcpkg_build_cmake.cmake:3 (execute_required_process) + ports/libpng/portfile.cmake:22 (vcpkg_build_cmake) + scripts/ports.cmake:84 (include) + + +Error: build command failed +``` + +Next, looking at the above logs (build-xxx-out.log and build-xxx-err.log). + +```no-highlight +// build-x64-uwp-rel-out.log +... +"D:\src\vcpkg\buildtrees\libpng\x64-uwp-rel\ALL_BUILD.vcxproj" (default target) (1) -> +"D:\src\vcpkg\buildtrees\libpng\x64-uwp-rel\png.vcxproj" (default target) (3) -> +(ClCompile target) -> + D:\src\vcpkg\buildtrees\libpng\src\v1.6.37-c993153cdf\pngerror.c(775): warning C4013: 'ExitProcess' undefined; assuming extern returning int [D:\src\vcpkg\buildtrees\libpng\x64-uwp-rel\png.vcxproj] + + +"D:\src\vcpkg\buildtrees\libpng\x64-uwp-rel\ALL_BUILD.vcxproj" (default target) (1) -> +"D:\src\vcpkg\buildtrees\libpng\x64-uwp-rel\png.vcxproj" (default target) (3) -> +(Link target) -> + pngerror.obj : error LNK2019: unresolved external symbol _ExitProcess referenced in function _png_longjmp [D:\src\vcpkg\buildtrees\libpng\x64-uwp-rel\png.vcxproj] + D:\src\vcpkg\buildtrees\libpng\x64-uwp-rel\Release\libpng16.dll : fatal error LNK1120: 1 unresolved externals [D:\src\vcpkg\buildtrees\libpng\x64-uwp-rel\png.vcxproj] + + 1 Warning(s) + 2 Error(s) + +Time Elapsed 00:00:04.19 +``` + +### Identify the problematic code + +Taking a look at [MSDN](https://msdn.microsoft.com/en-us/library/windows/desktop/ms682658(v=vs.85).aspx) shows that `ExitProcess` is only available for desktop apps. Additionally, it's useful to see the surrounding context: + +```c +/* buildtrees\libpng\src\v1.6.37-c993153cdf\pngerror.c:769 */ + /* If control reaches this point, png_longjmp() must not return. The only + * choice is to terminate the whole process (or maybe the thread); to do + * this the ANSI-C abort() function is used unless a different method is + * implemented by overriding the default configuration setting for + * PNG_ABORT(). + */ + PNG_ABORT(); +``` + +A recursive search for `PNG_ABORT` reveals the definition: +```no-highlight +PS D:\src\vcpkg\buildtrees\libpng\src\v1.6.37-c993153cdf> findstr /snipl "PNG_ABORT" * +CHANGES:701: Added PNG_SETJMP_SUPPORTED, PNG_SETJMP_NOT_SUPPORTED, and PNG_ABORT() macros +libpng-manual.txt:432:errors will result in a call to PNG_ABORT() which defaults to abort(). +libpng-manual.txt:434:You can #define PNG_ABORT() to a function that does something +libpng-manual.txt:2753:errors will result in a call to PNG_ABORT() which defaults to abort(). +libpng-manual.txt:2755:You can #define PNG_ABORT() to a function that does something +libpng-manual.txt:4226:PNG_NO_SETJMP, in which case it is handled via PNG_ABORT()), +libpng.3:942:errors will result in a call to PNG_ABORT() which defaults to abort(). +libpng.3:944:You can #define PNG_ABORT() to a function that does something +libpng.3:3263:errors will result in a call to PNG_ABORT() which defaults to abort(). +libpng.3:3265:You can #define PNG_ABORT() to a function that does something +libpng.3:4736:PNG_NO_SETJMP, in which case it is handled via PNG_ABORT()), +png.h:994: * will use it; otherwise it will call PNG_ABORT(). This function was +pngerror.c:773: * PNG_ABORT(). +pngerror.c:775: PNG_ABORT(); +pngpriv.h:459:#ifndef PNG_ABORT +pngpriv.h:461:# define PNG_ABORT() ExitProcess(0) +pngpriv.h:463:# define PNG_ABORT() abort() +``` + +This already gives us some great clues, but the full definition tells the complete story. + +```c +/* buildtrees\libpng\src\v1.6.37-c993153cdf\pngpriv.h:459 */ +#ifndef PNG_ABORT +# ifdef _WINDOWS_ +# define PNG_ABORT() ExitProcess(0) +# else +# define PNG_ABORT() abort() +# endif +#endif +``` + +`abort()` is a standard CRT call and certainly available in UWP, so we just need to convince libpng to be more platform agnostic. The easiest and most reliable way to achieve this is to patch the code; while in this particular case we could pass in a compiler flag to override `PNG_ABORT` because this is a private header, in general it is more reliable to avoid adding more required compiler switches when possible (especially when it isn't already exposed as a CMake option). + +### Patching the code to improve compatibility + +We recommend using git to create the patch file, since you'll already have it installed. +```no-highlight +PS D:\src\vcpkg\buildtrees\libpng\src\v1.6.37-c993153cdf> git init . +Initialized empty Git repository in D:/src/vcpkg/buildtrees/libpng/src/v1.6.37-c993153cdf/.git/ + +PS D:\src\vcpkg\buildtrees\libpng\src\v1.6.37-c993153cdf> git add . +warning: LF will be replaced by CRLF in ANNOUNCE. +The file will have its original line endings in your working directory. +... + +PS D:\src\vcpkg\buildtrees\libpng\src\v1.6.37-c993153cdf> git commit -m "temp" +[master (root-commit) 68f253f] temp + 422 files changed, 167717 insertions(+) +... +``` + +Now we can modify `pngpriv.h` to use `abort()` everywhere. +```c +/* buildtrees\libpng\src\v1.6.37-c993153cdf\pngpriv.h:459 */ +#ifndef PNG_ABORT +# define PNG_ABORT() abort() +#endif +``` + +The output of `git diff` is already in patch format, so we just need to save the patch into the `ports/libpng` directory. +```no-highlight +PS buildtrees\libpng\src\v1.6.37-c993153cdf> git diff --ignore-space-at-eol | out-file -enc ascii ..\..\..\..\ports\libpng\use-abort-on-all-platforms.patch +``` + +Finally, we need to apply the patch after extracting the source. +```cmake +# ports\libpng\portfile.cmake +... +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + "use-abort-on-all-platforms.patch" +) + +vcpkg_cmake_configure( +... +``` + +### Verification + +To be completely sure this works from scratch, we need to remove the package and rebuild it: + +```no-highlight +PS D:\src\vcpkg> vcpkg remove libpng:x64-uwp +Package libpng:x64-uwp was successfully removed +``` + +Now we try a fresh, from scratch install. + +```no-highlight +PS D:\src\vcpkg> vcpkg install libpng:x64-uwp +Computing installation plan... +The following packages will be built and installed: + libpng[core]:x64-uwp +Starting package 1/1: libpng:x64-uwp +Building package libpng[core]:x64-uwp... +Could not locate cached archive: C:\Users\me\AppData\Local\vcpkg/archives\f4\f44b54f818f78b9a4ccd34b3666f566f94286850.zip +-- Using cached D:/src/vcpkg/downloads/glennrp-libpng-v1.6.37.tar.gz +-- Extracting source D:/src/vcpkg/downloads/glennrp-libpng-v1.6.37.tar.gz +-- Applying patch use_abort.patch +-- Applying patch cmake.patch +-- Applying patch pkgconfig.patch +-- Applying patch pkgconfig.2.patch +-- Using source at D:/src/vcpkg/buildtrees/libpng/src/v1.6.37-10db9f58e4.clean +-- Configuring x64-uwp +-- Building x64-uwp-dbg +-- Building x64-uwp-rel +-- Fixing pkgconfig file: D:/src/vcpkg/packages/libpng_x64-uwp/lib/pkgconfig/libpng.pc +-- Fixing pkgconfig file: D:/src/vcpkg/packages/libpng_x64-uwp/lib/pkgconfig/libpng16.pc +-- Fixing pkgconfig file: D:/src/vcpkg/packages/libpng_x64-uwp/debug/lib/pkgconfig/libpng.pc +-- Fixing pkgconfig file: D:/src/vcpkg/packages/libpng_x64-uwp/debug/lib/pkgconfig/libpng16.pc +-- Installing: D:/src/vcpkg/packages/libpng_x64-uwp/share/libpng/copyright +-- Performing post-build validation +-- Performing post-build validation done +Stored binary cache: C:\Users\me\AppData\Local\vcpkg/archives\f4\f44b54f818f78b9a4ccd34b3666f566f94286850.zip +Building package libpng[core]:x64-uwp... done +Installing package libpng[core]:x64-uwp... +Installing package libpng[core]:x64-uwp... done +Elapsed time for package libpng:x64-uwp: 11.94 s + +Total elapsed time: 11.95 s + +The package libpng:x64-uwp provides CMake targets: + + find_package(libpng CONFIG REQUIRED) + target_link_libraries(main PRIVATE png) +``` + +Finally, to fully commit and publish the changes, we need to bump the port version in `vcpkg.json`, +and add the patch file to source control, then make a Pull Request! + +```json +{ + "name": "libpng", + "version": "1.6.37", + "port-version": 1, + "dependencies": [ + "zlib" + ] +} +``` diff --git a/externals/vcpkg/docs/examples/vcpkg_android_example_cmake/.gitignore b/externals/vcpkg/docs/examples/vcpkg_android_example_cmake/.gitignore new file mode 100755 index 000000000..378eac25d --- /dev/null +++ b/externals/vcpkg/docs/examples/vcpkg_android_example_cmake/.gitignore @@ -0,0 +1 @@ +build diff --git a/externals/vcpkg/docs/examples/vcpkg_android_example_cmake/CMakeLists.txt b/externals/vcpkg/docs/examples/vcpkg_android_example_cmake/CMakeLists.txt new file mode 100755 index 000000000..7572bbbc8 --- /dev/null +++ b/externals/vcpkg/docs/examples/vcpkg_android_example_cmake/CMakeLists.txt @@ -0,0 +1,5 @@ +cmake_minimum_required(VERSION 3.0) +project(test) +find_package(jsoncpp CONFIG REQUIRED) +add_library(my_lib my_lib.cpp) +target_link_libraries(my_lib jsoncpp_lib) diff --git a/externals/vcpkg/docs/examples/vcpkg_android_example_cmake/compile.sh b/externals/vcpkg/docs/examples/vcpkg_android_example_cmake/compile.sh new file mode 100755 index 000000000..1d1aa60a9 --- /dev/null +++ b/externals/vcpkg/docs/examples/vcpkg_android_example_cmake/compile.sh @@ -0,0 +1,54 @@ +# +# 1. Check the presence of required environment variables +# +if [ -z ${ANDROID_NDK_HOME+x} ]; then + echo "Please set ANDROID_NDK_HOME" + exit 1 +fi +if [ -z ${VCPKG_ROOT+x} ]; then + echo "Please set VCPKG_ROOT" + exit 1 +fi + +# +# 2. Set the path to the toolchains +# +vcpkg_toolchain_file=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake +android_toolchain_file=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake + + +# +# 3. Select a pair "Android abi" / "vcpkg triplet" +# Uncomment one of the four possibilities below +# + +android_abi=armeabi-v7a +vcpkg_target_triplet=arm-android + +# android_abi=x86 +# vcpkg_target_triplet=x86-android + +# android_abi=arm64-v8a +# vcpkg_target_triplet=arm64-android + +# android_abi=x86_64 +# vcpkg_target_triplet=x64-android + + +# +# 4. Install the library via vcpkg +# +$VCPKG_ROOT/vcpkg install jsoncpp:$vcpkg_target_triplet + +# +# 5. Test the build +# +rm -rf build +mkdir build +cd build +cmake .. \ + -DCMAKE_TOOLCHAIN_FILE=$vcpkg_toolchain_file \ + -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$android_toolchain_file \ + -DVCPKG_TARGET_TRIPLET=$vcpkg_target_triplet \ + -DANDROID_ABI=$android_abi +make diff --git a/externals/vcpkg/docs/examples/vcpkg_android_example_cmake/my_lib.cpp b/externals/vcpkg/docs/examples/vcpkg_android_example_cmake/my_lib.cpp new file mode 100755 index 000000000..f0165d72d --- /dev/null +++ b/externals/vcpkg/docs/examples/vcpkg_android_example_cmake/my_lib.cpp @@ -0,0 +1,8 @@ +#include + +int answer() +{ + Json::Value meaning_of; + meaning_of["everything"] = 42; + return meaning_of["everything"].asInt(); +} diff --git a/externals/vcpkg/docs/examples/vcpkg_android_example_cmake_script/.gitignore b/externals/vcpkg/docs/examples/vcpkg_android_example_cmake_script/.gitignore new file mode 100755 index 000000000..378eac25d --- /dev/null +++ b/externals/vcpkg/docs/examples/vcpkg_android_example_cmake_script/.gitignore @@ -0,0 +1 @@ +build diff --git a/externals/vcpkg/docs/examples/vcpkg_android_example_cmake_script/CMakeLists.txt b/externals/vcpkg/docs/examples/vcpkg_android_example_cmake_script/CMakeLists.txt new file mode 100755 index 000000000..eded6e547 --- /dev/null +++ b/externals/vcpkg/docs/examples/vcpkg_android_example_cmake_script/CMakeLists.txt @@ -0,0 +1,13 @@ +cmake_minimum_required(VERSION 3.0) + +# if -DVCPKG_TARGET_ANDROID=ON is specified when invoking cmake, load cmake/vcpkg_android.cmake +# !!! Important: place this line before calling project() !!! +if (VCPKG_TARGET_ANDROID) + include("cmake/vcpkg_android.cmake") +endif() + +project(test) + +find_package(jsoncpp CONFIG REQUIRED) +add_library(my_lib my_lib.cpp) +target_link_libraries(my_lib JsonCpp::JsonCpp) diff --git a/externals/vcpkg/docs/examples/vcpkg_android_example_cmake_script/cmake/vcpkg_android.cmake b/externals/vcpkg/docs/examples/vcpkg_android_example_cmake_script/cmake/vcpkg_android.cmake new file mode 100755 index 000000000..3f09b1114 --- /dev/null +++ b/externals/vcpkg/docs/examples/vcpkg_android_example_cmake_script/cmake/vcpkg_android.cmake @@ -0,0 +1,99 @@ +# +# vcpkg_android.cmake +# +# Helper script when using vcpkg with cmake. It should be triggered via the variable VCPKG_TARGET_ANDROID +# +# For example: +# if (VCPKG_TARGET_ANDROID) +# include("cmake/vcpkg_android.cmake") +# endif() +# +# This script will: +# 1 & 2. check the presence of needed env variables: ANDROID_NDK_HOME and VCPKG_ROOT +# 3. set VCPKG_TARGET_TRIPLET according to ANDROID_ABI +# 4. Combine vcpkg and Android toolchains by setting CMAKE_TOOLCHAIN_FILE +# and VCPKG_CHAINLOAD_TOOLCHAIN_FILE + +# Note: VCPKG_TARGET_ANDROID is not an official Vcpkg variable. +# it is introduced for the need of this script + +if (VCPKG_TARGET_ANDROID) + + # + # 1. Check the presence of environment variable ANDROID_NDK_HOME + # + if (NOT DEFINED ENV{ANDROID_NDK_HOME}) + message(FATAL_ERROR " + Please set an environment variable ANDROID_NDK_HOME + For example: + export ANDROID_NDK_HOME=/home/your-account/Android/Sdk/ndk-bundle + Or: + export ANDROID_NDK_HOME=/home/your-account/Android/android-ndk-r21b + ") + endif() + + # + # 2. Check the presence of environment variable VCPKG_ROOT + # + if (NOT DEFINED ENV{VCPKG_ROOT}) + message(FATAL_ERROR " + Please set an environment variable VCPKG_ROOT + For example: + export VCPKG_ROOT=/path/to/vcpkg + ") + endif() + + + # + # 3. Set VCPKG_TARGET_TRIPLET according to ANDROID_ABI + # + # There are four different Android ABI, each of which maps to + # a vcpkg triplet. The following table outlines the mapping from vcpkg architectures to android architectures + # + # |VCPKG_TARGET_TRIPLET | ANDROID_ABI | + # |---------------------------|----------------------| + # |arm64-android | arm64-v8a | + # |arm-android | armeabi-v7a | + # |x64-android | x86_64 | + # |x86-android | x86 | + # + # The variable must be stored in the cache in order to successfully the two toolchains. + # + if (ANDROID_ABI MATCHES "arm64-v8a") + set(VCPKG_TARGET_TRIPLET "arm64-android" CACHE STRING "" FORCE) + elseif(ANDROID_ABI MATCHES "armeabi-v7a") + set(VCPKG_TARGET_TRIPLET "arm-android" CACHE STRING "" FORCE) + elseif(ANDROID_ABI MATCHES "x86_64") + set(VCPKG_TARGET_TRIPLET "x64-android" CACHE STRING "" FORCE) + elseif(ANDROID_ABI MATCHES "x86") + set(VCPKG_TARGET_TRIPLET "x86-android" CACHE STRING "" FORCE) + else() + message(FATAL_ERROR " + Please specify ANDROID_ABI + For example + cmake ... -DANDROID_ABI=armeabi-v7a + + Possible ABIs are: arm64-v8a, armeabi-v7a, x64-android, x86-android + ") + endif() + message("vcpkg_android.cmake: VCPKG_TARGET_TRIPLET was set to ${VCPKG_TARGET_TRIPLET}") + + + # + # 4. Combine vcpkg and Android toolchains + # + + # vcpkg and android both provide dedicated toolchains: + # + # vcpkg_toolchain_file=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake + # android_toolchain_file=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake + # + # When using vcpkg, the vcpkg toolchain shall be specified first. + # However, vcpkg provides a way to preload and additional toolchain, + # with the VCPKG_CHAINLOAD_TOOLCHAIN_FILE option. + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE $ENV{ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake) + set(CMAKE_TOOLCHAIN_FILE $ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake) + message("vcpkg_android.cmake: CMAKE_TOOLCHAIN_FILE was set to ${CMAKE_TOOLCHAIN_FILE}") + message("vcpkg_android.cmake: VCPKG_CHAINLOAD_TOOLCHAIN_FILE was set to ${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") + +endif(VCPKG_TARGET_ANDROID) diff --git a/externals/vcpkg/docs/examples/vcpkg_android_example_cmake_script/compile.sh b/externals/vcpkg/docs/examples/vcpkg_android_example_cmake_script/compile.sh new file mode 100755 index 000000000..abd981a6a --- /dev/null +++ b/externals/vcpkg/docs/examples/vcpkg_android_example_cmake_script/compile.sh @@ -0,0 +1,37 @@ +# 1. Install the library via vcpkg +# This install jsoncpp for the 4 android target ABIs and for the host computer. +# see the correspondence between ABIs and vcpkg triplets in the table below: +# +# |VCPKG_TARGET_TRIPLET | ANDROID_ABI | +# |---------------------------|----------------------| +# |arm64-android | arm64-v8a | +# |arm-android | armeabi-v7a | +# |x64-android | x86_64 | +# |x86-android | x86 | +$VCPKG_ROOT/vcpkg install \ + jsoncpp \ + jsoncpp:arm-android \ + jsoncpp:arm64-android \ + jsoncpp:x86-android \ + jsoncpp:x64-android + + +# 2. Test the build +# +# First, select an android ABI +# Uncomment one of the four possibilities below +# +android_abi=armeabi-v7a +# android_abi=x86 +# android_abi=arm64-v8a +# android_abi=x86_64 + +rm -rf build +mkdir build && cd build + +# DVCPKG_TARGET_ANDROID will load vcpkg_android.cmake, +# which will then load the android + vcpkg toolchains. +cmake .. \ + -DVCPKG_TARGET_ANDROID=ON \ + -DANDROID_ABI=$android_abi +make diff --git a/externals/vcpkg/docs/examples/vcpkg_android_example_cmake_script/my_lib.cpp b/externals/vcpkg/docs/examples/vcpkg_android_example_cmake_script/my_lib.cpp new file mode 100755 index 000000000..f0165d72d --- /dev/null +++ b/externals/vcpkg/docs/examples/vcpkg_android_example_cmake_script/my_lib.cpp @@ -0,0 +1,8 @@ +#include + +int answer() +{ + Json::Value meaning_of; + meaning_of["everything"] = 42; + return meaning_of["everything"].asInt(); +} diff --git a/externals/vcpkg/docs/examples/versioning.getting-started.md b/externals/vcpkg/docs/examples/versioning.getting-started.md new file mode 100755 index 000000000..3ff87f5b3 --- /dev/null +++ b/externals/vcpkg/docs/examples/versioning.getting-started.md @@ -0,0 +1,249 @@ +# Getting started with versioning + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/examples/versioning.getting-started.md).** + +Vcpkg lets you take control of which version of packages to install in your projects using manifests. + +## Using versions with manifests + +Let's start with creating a simple CMake project that depends on `fmt` and `zlib`. + +Create a folder with the following files: + +**vcpkg.json** +```json +{ + "name": "versions-test", + "version": "1.0.0", + "dependencies": [ + { + "name": "fmt", + "version>=": "7.1.3#1" + }, + "zlib" + ], + "builtin-baseline": "3426db05b996481ca31e95fff3734cf23e0f51bc" +} +``` + +**main.cpp** +```c++ +#include +#include + +int main() +{ + fmt::print("fmt version is {}\n" + "zlib version is {}\n", + FMT_VERSION, ZLIB_VERSION); + return 0; +} +``` + +**CMakeLists.txt** +```CMake +cmake_minimum_required(VERSION 3.18) + +project(versionstest CXX) + +add_executable(main main.cpp) + +find_package(ZLIB REQUIRED) +find_package(fmt CONFIG REQUIRED) +target_link_libraries(main PRIVATE ZLIB::ZLIB fmt::fmt) +``` + +And now we build and run our project with CMake: + +1. Create the build directory for the project. +``` +PS D:\versions-test> mkdir build +PS D:\versions-test> cd build +``` + +2. Configure CMake. +``` +PS D:\versions-test\build> cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE=D:/vcpkg/scripts/buildsystems/vcpkg.cmake .. +-- Running vcpkg install +Detecting compiler hash for triplet x86-windows... +The following packages will be built and installed: + fmt[core]:x64-windows -> 7.1.3#1 -- D:\Work\viromer\vcpkg\buildtrees\versioning\versions\fmt\4f8427eb0bd40da1856d4e67bde39a4fda689d72 + vcpkg-cmake[core]:x64-windows -> 2021-02-26 -- D:\Work\viromer\vcpkg\buildtrees\versioning\versions\vcpkg-cmake\51896aa8073adb5c8450daa423d03eedf0dfc61f + vcpkg-cmake-config[core]:x64-windows -> 2021-02-26 -- D:\Work\viromer\vcpkg\buildtrees\versioning\versions\vcpkg-cmake-config\d255b3d566a8861dcc99a958240463e678528066 + zlib[core]:x64-windows -> 1.2.11#9 -- D:\Work\viromer\vcpkg\buildtrees\versioning\versions\zlib\827111046e37c98153d9d82bb6fa4183b6d728e4 +... +``` + +3. Build the project. +``` +PS D:\versions-test\build> cmake --build . +[2/2] Linking CXX executable main.exe +``` + +4. Run it! +``` +PS D:\versions-test\build> ./main.exe +fmt version is 70103 +zlib version is 1.2.11 +``` + +Take a look at the output: + +``` +fmt[core]:x86-windows -> 7.1.3#1 -- D:\vcpkg\buildtrees\versioning\versions\fmt\4f8427eb0bd40da1856d4e67bde39a4fda689d72 +... +zlib[core]:x86-windows -> 1.2.11#9 -- D:\vcpkg\buildtrees\versioning\versions\zlib\827111046e37c98153d9d82bb6fa4183b6d728e4 +``` + +Instead of using the portfiles in `ports/`, vcpkg is checking out the files for each version in `buildtrees/versioning/versions/`. The files in `ports/` are still used when running vcpkg in classic mode. + +_NOTE: Output from vcpkg while configuring CMake is only available when using CMake version `3.18` or newer. If you're using an older CMake you can check the `vcpkg-manifest-install.log` file in your build directory instead._ + +Read our [manifests announcement blog post](https://devblogs.microsoft.com/cppblog/vcpkg-accelerate-your-team-development-environment-with-binary-caching-and-manifests/#using-manifests-with-msbuild-projects) to learn how to use manifests with MSBuild. + +### Manifest changes +If you have used manifests before you will notice that there are some new JSON properties. Let's review these changes: + +#### **`version`** +```json +{ + "name": "versions-test", + "version": "1.0.0" +} +``` + +This is your project's version declaration. Previously, you could only declare versions for your projects using the `version-string` property. Now that versioning has come around, vcpkg is aware of some new versioning schemes. + +Version scheme | Description +---------------- | --------------- +`version` | Dot-separated numerics: `1.0.0.5`. +`version-semver` | Compliant [semantic versions](https://semver.org): `1.2.0` and `1.2.0-rc`. +`version-date` | Dates in `YYYY-MM-DD` format: `2021-01-01` +`version-string` | Arbitrary strings: `vista`, `candy`. + +#### **`version>=`** +```json +{ + "dependencies": [ + { "name": "fmt", "version>=": "7.1.3" }, + "zlib" + ] +} +``` + +This property is used to express minimum version constraints, it is allowed only as part of the `"dependencies"` declarations. In our example we set an explicit constraint on version `7.1.3#1` of `fmt`. + +Vcpkg is allowed to upgrade this constraint if a transitive dependency requires a newer version. For example, if `zlib` were to declare a dependency on `fmt` version `7.1.4` then vcpkg would install `7.1.4` instead. + +Vcpkg uses a minimum version approach, in our example, even if `fmt` version `8.0.0` were to be released, vcpkg would still install version `7.1.3#1` as that is the minimum version that satisfies the constraint. The advantages of this approach are that you don't get unexpected dependency upgrades when you update vcpkg and you get reproducible builds (in terms of version used) as long as you use the same manifest. + +If you want to upgrade your dependencies, you can bump the minimum version constraint or use a newer baseline. + +#### **`builtin-baseline`** + +```json +{ "builtin-baseline": "3426db05b996481ca31e95fff3734cf23e0f51bc" } +``` + +This field declares the versioning baseline for all ports. Setting a baseline is required to enable versioning, otherwise you will get the current versions on the ports directory. You can run 'git rev-parse HEAD' to get the current commit of vcpkg and set it as the builtin-baseline. See the [`builtin-baseline` documentation](../users/versioning.md#builtin-baseline) for more information. + +In our example, you can notice that we do not declare a version constraint for `zlib`; instead, the version is taken from the baseline. Internally, vcpkg will look in commit `3426db05b996481ca31e95fff3734cf23e0f51bc` to find out what version of `zlib` was the latest at that point in time (in our case it was `1.2.11#9`). + +During version resolution, baseline versions are treated as minimum version constraints. If you declare an explicit constraint that is lower than a baseline version, the explicit constraint will be upgraded to the baseline version. + +For example, if we modified our dependencies like this: +```json +{ "dependencies": [ + { + "name": "fmt", + "version>=": "7.1.3#1" + }, + { + "name": "zlib", + "version>=": "1.2.11#7" + } +] } +``` + +_NOTE: The value `1.2.11#7` represents version `1.2.11`, port version `7`._ + +Since the baseline introduces a minimum version constraint for `zlib` at `1.2.11#9` and a higher version does satisfy the minimum version constraint for `1.2.11#7`, vcpkg is allowed to upgrade it. + +Baselines are also a convenient mechanism to upgrade multiple versions at a time, for example, if you wanted to depend on multiple `boost` libraries, it is more convenient to set the `baseline` once than declaring a version constraint on each package. + +But what if you want to pin a version older than the baseline? + +#### **`overrides`** + +Since baselines establish a version floor for all packages and explicit constraints get upgraded when they are lower than the baseline, we need another mechanism to downgrade versions past the baseline. + +The mechanism vcpkg provides for that scenario is `overrides`. When an override is declared on a package, vcpkg will ignore all other version constraints either directly declared in the manifest or from transitive dependencies. In short, `overrides` will force vcpkg to use the exact version declared, period. + +Let's modify our example once more, this time to force vcpkg to use version `6.0.0` of `fmt`. + +```json +{ + "name": "versions-test", + "version": "1.0.0", + "dependencies": [ + { + "name": "fmt", + "version>=": "7.1.3#1" + }, + { + "name": "zlib", + "version>=": "1.2.11#7" + } + ], + "builtin-baseline": "3426db05b996481ca31e95fff3734cf23e0f51bc", + "overrides": [ + { + "name": "fmt", + "version": "6.0.0" + } + ] +} +``` + +Rebuild our project: + +``` +PS D:\versions-test\build> rm ./CMakeCache.txt +PS D:\versions-test\build> rm -r ./vcpkg_installed +PS D:\versions-test\build> cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE=D:/vcpkg/scripts/buildsystems/vcpkg.cmake .. +-- Running vcpkg install +Detecting compiler hash for triplet x86-windows... +The following packages will be built and installed: + fmt[core]:x86-windows -> 6.0.0 -- D:\vcpkg\buildtrees\versioning\versions\fmt\d99b6a35e1406ba6b6e09d719bebd086f83ed5f3 + zlib[core]:x86-windows -> 1.2.11#9 -- D:\vcpkg\buildtrees\versioning\versions\zlib\827111046e37c98153d9d82bb6fa4183b6d728e4 +... +PS D:\versions-test\build> cmake --build . +[2/2] Linking CXX executable main.exe +``` + +And run it! +``` +PS D:\versions-test\build> .\main.exe +fmt version is 60000 +zlib version is 1.2.11 +``` + +Notice how the `fmt` is now at version `6.0.0` just like we wanted. + +## Versions and custom ports + +The last thing to discuss is how overlay ports interact with versioning resolution. The answer is: they don't. + +Going into more detail, when you provide an overlay for a port, vcpkg will always use the overlay port without caring what version is contained in it. The reasons are two-fold: (1) it is consistent with the existing behavior of overlay ports of completely masking the existing port, and (2) overlay ports do not (and are not expected to) provide enough information to power vcpkg's versioning feature. + +If you want to have flexible port customization along with versioning, you should consider making your own custom registry. See our [registries specification for more details](../specifications/registries.md). + +## Further reading + +If you're interested in delving deeper into the details of how versioning works we recommended that you read the [original versioning specification](../specifications/versioning.md) and the [implementation details](../users/versioning.implementation-details.md). + +See also: + +* [Versioning docs](../users/versioning.md) +* [Original specification](../specifications/versioning.md) +* [Versioning implementation details](../users/versioning.implementation-details.md) diff --git a/externals/vcpkg/docs/maintainers/authoring-script-ports.md b/externals/vcpkg/docs/maintainers/authoring-script-ports.md new file mode 100755 index 000000000..f14eaa440 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/authoring-script-ports.md @@ -0,0 +1,45 @@ +# Authoring Script Ports + +Ports can expose functions for other ports to consume during their build. For +example, the `vcpkg-cmake` helper port exposes the `vcpkg_cmake_configure()` +helper function. Packaging common scripts into a shared helper port makes +maintenance easier because all consumers can be updated from a single place. +Because the scripts come from a port, they can be versioned and depended upon +via all the same mechanisms as any other port. + +Script ports are implemented via the `vcpkg-port-config.cmake` extension +mechanism. Before invoking the `portfile.cmake` of a port, vcpkg will first +import `share//vcpkg-port-config.cmake` from each direct dependency. If +the direct dependency is a host dependency, the import will be performed in the +host installed tree (e.g. +`${HOST_INSTALLED_DIR}/share//vcpkg-port-config.cmake`). + +Only direct dependencies are considered for `vcpkg-port-config.cmake` inclusion. +This means that if a script port relies on another script port, it must +explicitly import the `vcpkg-port-config.cmake` of its dependency. + +Script-to-script dependencies should not be marked as host. The dependency from +a target port to a script should be marked host, which means that scripts should +always already be natively compiling. By making script-to-script dependencies +`"host": false`, it ensures that one script can depend upon the other being in +its same install directory. + +Ports should never provide a `vcpkg-port-config.cmake` file under a different +`share/` subdirectory than the current port (`${PORT}`). + +## Example + +```cmake +# ${CURRENT_PACKAGES_DIR}/share/my-helper/vcpkg-port-config.cmake + +# This include guard ensures the file will be loaded only once +include_guard(GLOBAL) + +# This is how you could pull in a transitive dependency +include("${CMAKE_CURRENT_LIST_DIR}/../my-other-helper/vcpkg-port-config.cmake") + +# Finally, it is convention to put each public function into a separate file with a matching name +include("${CMAKE_CURRENT_LIST_DIR}/my_helper_function_01.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/my_helper_function_02.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/my_helper_function_03.cmake") +``` diff --git a/externals/vcpkg/docs/maintainers/cmake-guidelines.md b/externals/vcpkg/docs/maintainers/cmake-guidelines.md new file mode 100755 index 000000000..fb682f276 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/cmake-guidelines.md @@ -0,0 +1,166 @@ +# CMake Guidelines + +We expect that all CMake scripts that are either: + +- In the `scripts/` directory, or +- In a `vcpkg-*` port + +should follow the guidelines laid out in this document. +Existing scripts may not follow these guidelines yet; +it is expected that we will continue to update old scripts +to fall in line with these guidelines. + +These guidelines are intended to create stability in our scripts. +We hope that they will make both forwards and backwards compatibility easier. + +## The Guidelines + +- Except for out-parameters, we always use `cmake_parse_arguments()` + rather than function parameters or referring to `${ARG}`. + - This doesn't necessarily need to be followed for "script-local helper functions" + - In this case, positional parameters should be put in the function + declaration (rather than using `${ARG}`), + and should be named according to local rules (i.e. `snake_case`). + - Exception: positional parameters that are optional should be + given a name via `set(argument_name "${ARG}")`, after checking `ARGC`. + - Out-parameters should be the first parameter to a function. Example: + ```cmake + function(format out_var) + cmake_parse_arguments(PARSE_ARGV 1 "arg" ...) + # ... set(buffer "output") + set("${out_var}" "${buffer}" PARENT_SCOPE) + endfunction() + ``` +- There are no unparsed or unused arguments. + Always check for `ARGN` or `arg_UNPARSED_ARGUMENTS`. + `FATAL_ERROR` when possible, `WARNING` if necessary for backwards compatibility. +- All `cmake_parse_arguments` must use `PARSE_ARGV`. +- All `foreach` loops must use `IN LISTS`, `IN ITEMS`, or `RANGE`. +- The variables `${ARGV}` and `${ARGN}` are unreferenced, + except in helpful messages to the user. + - (i.e., `message(FATAL_ERROR "blah was passed extra arguments: ${ARGN}")`) +- We always use functions, not macros or top level code. + - Exception: "script-local helper macros". It is sometimes helpful to define a small macro. + This should be done sparingly, and functions should be preferred. + - Exception: `vcpkg.cmake`'s `find_package`. +- Scripts in the scripts tree should not be expected to need observable changes + as part of normal operation. + - Example violation: `vcpkg_acquire_msys()` has hard-coded packages and versions + that need updating over time due to the MSYS project dropping old packages. + - Example exception: `vcpkg_from_sourceforge()` has a list of mirrors which + needs maintenance, but does not have an observable behavior impact on the callers. +- Rules for quoting: there are three kinds of arguments in CMake - + unquoted (`foo(BAR)`), quoted (`foo("BAR")`), and bracketed (`foo([[BAR]])`). + Follow these rules to quote correctly: + - If an argument contains a variable expansion `${...}`, + it must be quoted. + - Exception: a "splat" variable expansion, when one variable will be + passed to a function as multiple arguments. In this case, the argument + should simply be `${foo}`: + ```cmake + vcpkg_list(SET working_directory) + if(DEFINED "arg_WORKING_DIRECTORY") + vcpkg_list(SET working_directory WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}") + endif() + # calls do_the_thing() if NOT DEFINED arg_WORKING_DIRECTORY, + # else calls do_the_thing(WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}") + do_the_thing(${working_directory}) + ``` + - Otherwise, if the argument contains any escape sequences that are not + `\\`, `\"`, or `\$`, that argument must be a quoted argument. + - For example: `"foo\nbar"` must be quoted. + - Otherwise, if the argument contains a `\`, a `"`, or a `$`, + that argument should be bracketed. + - Example: + ```cmake + set(x [[foo\bar]]) + set(y [=[foo([[bar\baz]])]=]) + ``` + - Otherwise, if the argument contains characters that are + not alphanumeric or `_`, that argument should be quoted. + - Otherwise, the argument should be unquoted. + - Exception: arguments to `if()` of type `` should always be quoted: + - Both arguments to the comparison operators - + `EQUAL`, `STREQUAL`, `VERSION_LESS`, etc. + - The first argument to `MATCHES` and `IN_LIST` + - Example: + ```cmake + if("${FOO}" STREQUAL "BAR") # ... + if("${BAZ}" EQUAL "0") # ... + if("FOO" IN_LIST list_variable) # ... + if("${bar}" MATCHES [[a[bcd]+\.[bcd]+]]) # ... + ``` + - For single expressions and for other types of predicates that do not + take ``, use the normal rules. +- There are no "pointer" or "in-out" parameters + (where a user passes a variable name rather than the contents), + except for simple out-parameters. +- Variables are not assumed to be empty. + If the variable is intended to be used locally, + it must be explicitly initialized to empty with `set(foo "")` if it is a string variable, + and `vcpkg_list(SET foo)` if it is a list variable. +- `set(var)` should not be used. Use `unset(var)` to unset a variable, + `set(var "")` to set it to the empty string, + and `vcpkg_list(SET var)` to set it to the empty list. + _Note: the empty string and the empty list are the same value;_ + _this is a notational difference rather than a difference in result_ +- All variables expected to be inherited from the parent scope across an API boundary + (i.e. not a file-local function) should be documented. + Note that all variables mentioned in triplets.md are considered documented. +- Out parameters are only set in `PARENT_SCOPE` and are never read. + See also the helper `z_vcpkg_forward_output_variable()` to forward out parameters through a function scope. +- `CACHE` variables are used only for global variables which are shared internally among strongly coupled + functions and for internal state within a single function to avoid duplicating work. + These should be used extremely sparingly and should use the `Z_VCPKG_` prefix to avoid + colliding with any local variables that would be defined by any other code. + - Examples: + - `vcpkg_cmake_configure`'s `Z_VCPKG_CMAKE_GENERATOR` + - `z_vcpkg_get_cmake_vars`'s `Z_VCPKG_GET_CMAKE_VARS_FILE` +- `include()`s are only allowed in `ports.cmake` or `vcpkg-port-config.cmake`. +- `foreach(RANGE)`'s arguments _must always be_ natural numbers, + and `` _must always be_ less than or equal to ``. + - This must be checked by something like: + ```cmake + if("${start}" LESS_EQUAL "${end}") + foreach(RANGE "${start}" "${end}") + ... + endforeach() + endif() + ``` +- All port-based scripts must use `include_guard(GLOBAL)` + to avoid being included multiple times. + +### CMake Versions to Require + +- All CMake scripts, except for `vcpkg.cmake`, + may assume the version of CMake that is present in the + `cmake_minimum_required` of `ports.cmake`. + - This `cmake_minimum_required` should be bumped every time a new version + of CMake is added to `vcpkgTools.xml`, as should the + `cmake_minimum_required` in all of the helper `CMakeLists.txt` files. +- `vcpkg.cmake` must assume a version of CMake back to 3.7.2 in general + - Specific functions and options may assume a greater CMake version; + if they do, make sure to comment that function or option + with the required CMake version. + + +### Changing Existing Functions + +- Never remove arguments in non-internal functions; + if they should no longer do anything, just take them as normal and warn on use. +- Never add a new mandatory argument. + +### Naming Variables + +- `cmake_parse_arguments`: set prefix to `"arg"` +- Local variables are named with `snake_case` +- Internal global variable names are prefixed with `Z_VCPKG_`. +- External experimental global variable names are prefixed with `X_VCPKG_`. + +- Internal functions are prefixed with `z_vcpkg_` + - Functions which are internal to a single function (i.e., helper functions) + are named `[z_]_`, where `` is the name of the function they are + a helper to, and `` is what the helper function does. + - `z_` should be added to the front if `` doesn't have a `z_`, + but don't name a helper function `z_z_foo_bar`. +- Public global variables are named `VCPKG_`. diff --git a/externals/vcpkg/docs/maintainers/control-files.md b/externals/vcpkg/docs/maintainers/control-files.md new file mode 100755 index 000000000..7064ad40e --- /dev/null +++ b/externals/vcpkg/docs/maintainers/control-files.md @@ -0,0 +1,205 @@ +# CONTROL files + +**CONTROL files are retained for backwards compatibility with earlier versions of vcpkg; +all new features are added only to [vcpkg.json manifest files](manifest-files.md), and we recommend using vcpkg.json for any newly authored port. +Use `./vcpkg format-manifest ports//CONTROL` to convert an existing CONTROL file to a vcpkg.json file.** + +The `CONTROL` file contains metadata about the port. The syntax is based on [the Debian `control` format][debian] although we only support the subset of fields documented here. + +Field names are case-sensitive and start the line without leading whitespace. Paragraphs are separated by one or more empty lines. + +[debian]: https://www.debian.org/doc/debian-policy/ch-controlfields.html + +## Source Paragraph + +The first paragraph in a `CONTROL` file is the Source paragraph. It must have a `Source`, `Version`, and `Description` field. The full set of fields is documented below. + +### Examples: +```no-highlight +Source: ace +Version: 6.5.5 +Description: The ADAPTIVE Communication Environment +``` + +```no-highlight +Source: vtk +Version: 8.2.0 +Port-Version: 2 +Description: Software system for 3D computer graphics, image processing, and visualization +Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, atlmfc (windows), eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c +``` + + +### Recognized fields + +#### Source +The name of the port. + +When adding new ports be aware that the name may conflict with other projects that are not a part of vcpkg. For example `json` conflicts with too many other projects so you should add a scope to the name such as `taocpp-json` to make it unique. Verify there are no conflicts on a search engine as well as on other package collections. + +Package collections to check for conflicts: + ++ [Repology](https://repology.org/projects/) ++ [Debian packages](https://www.debian.org/distrib/packages) ++ [Packages search](https://pkgs.org/) + +#### Version +The library version. + +This field is an alphanumeric string that may also contain `.`, `_`, or `-`. No attempt at ordering versions is made; all versions are treated as bit strings and are only evaluated for equality. + +For tagged-release ports, we follow the following convention: + +1. If the port follows a scheme like `va.b.c`, we remove the leading `v`. In this case, it becomes `a.b.c`. +2. If the port includes its own name in the version like `curl-7_65_1`, we remove the leading name: `7_65_1` + +For rolling-release ports, we use the date that the _commit was accessed by you_, formatted as `YYYY-MM-DD`. Stated another way: if someone had a time machine and went to that date, they would see this commit as the latest master. + +For example, given: +1. The latest commit was made on 2019-04-19 +2. The current version string is `2019-02-14-1` +3. Today's date is 2019-06-01. + +Then if you update the source version today, you should give it version `2019-06-01`. + +#### Port-Version +The version of the port. + +This field is a non-negative integer. It allows one to version the port file separately from the version of the underlying library; if you make a change to a port, without changing the underlying version of the library, you should increment this field by one (starting at `0`, which is equivalent to no `Port-Version` field). When the version of the underlying library is upgraded, this field should be set back to `0` (i.e., delete the `Port-Version` field). + +##### Examples: +```no-highlight +Version: 1.0.5 +Port-Version: 2 +``` +```no-highlight +Version: 2019-03-21 +``` + +#### Description +A description of the library. + +By convention the first line of the description is a summary of the library. An optional detailed description follows. The detailed description can be multiple lines, all starting with whitespace. + +##### Examples: +```no-highlight +Description: C++ header-only JSON library +``` +```no-highlight +Description: Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1. + MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. This makes it suitable for "machine + to machine" messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino. +``` + +#### Homepage +The URL of the homepage for the library where a user is able to find additional documentation or the original source code. + +Example: +```no-highlight +Homepage: https://github.com/Microsoft/vcpkg +``` + +#### Build-Depends +Comma separated list of vcpkg ports the library has a dependency on. + +Vcpkg does not distinguish between build-only dependencies and runtime dependencies. The complete list of dependencies needed to successfully use the library should be specified. + +*For example: websocketpp is a header only library, and thus does not require any dependencies at install time. However, downstream users need boost and openssl to make use of the library. Therefore, websocketpp lists boost and openssl as dependencies* + +If the port is dependent on optional features of another library those can be specified using the `portname[featurelist]` syntax. If the port does not require any features from the dependency, this should be specified as `portname[core]`. + +Dependencies can be filtered based on the target triplet to support differing requirements. These filters use the same syntax as the Supports field below and are surrounded in parentheses following the portname and feature list. + +##### Example: +```no-highlight +Build-Depends: rapidjson, curl[core,openssl] (!windows), curl[core,winssl] (windows) +``` + +#### Default-Features +Comma separated list of optional port features to install by default. + +This field is optional. + +##### Example: +```no-highlight +Default-Features: dynamodb, s3, kinesis +``` + + +#### Supports +Expression that evaluates to true when the port is expected to build successfully for a triplet. + +Currently, this field is only used in the CI testing to skip ports. In the future, this mechanism is intended to warn users in advance that a given install tree is not expected to succeed. Therefore, this field should be used optimistically; in cases where a port is expected to succeed 10% of the time, it should still be marked "supported". + +The grammar for the supports expression uses standard operators: +- `!expr` - negation +- `expr|expr` - or (`||` is also supported) +- `expr&expr` - and (`&&` is also supported) +- `(expr)` - grouping/precedence + +The predefined expressions are computed from standard triplet settings: +- `native` - `TARGET_TRIPLET` == `HOST_TRIPLET` +- `x64` - `VCPKG_TARGET_ARCHITECTURE` == `"x64"` +- `x86` - `VCPKG_TARGET_ARCHITECTURE` == `"x86"` +- `arm` - `VCPKG_TARGET_ARCHITECTURE` == `"arm"` or `VCPKG_TARGET_ARCHITECTURE` == `"arm64"` +- `arm64` - `VCPKG_TARGET_ARCHITECTURE` == `"arm64"` +- `windows` - `VCPKG_CMAKE_SYSTEM_NAME` == `""` or `VCPKG_CMAKE_SYSTEM_NAME` == `"WindowsStore"` +- `uwp` - `VCPKG_CMAKE_SYSTEM_NAME` == `"WindowsStore"` +- `linux` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Linux"` +- `osx` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Darwin"` +- `android` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Android"` +- `static` - `VCPKG_LIBRARY_LINKAGE` == `"static"` +- `wasm32` - `VCPKG_TARGET_ARCHITECTURE` == `"wasm32"` +- `emscripten` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Emscripten"` + +These predefined expressions can be overridden in the triplet file via the [`VCPKG_DEP_INFO_OVERRIDE_VARS`](../users/triplets.md) option. + +This field is optional and defaults to true. + +> Implementers' Note: these terms are computed from the triplet via the `vcpkg_get_dep_info` mechanism. + +##### Example: +```no-highlight +Supports: !(uwp|arm) +``` + +## Feature Paragraphs + +Multiple optional features can be specified in the `CONTROL` files. It must have a `Feature` and `Description` field. It can optionally have a `Build-Depends` field. It must be separated from other paragraphs by one or more empty lines. + +### Example: +```no-highlight +Source: vtk +Version: 8.2.0-2 +Description: Software system for 3D computer graphics, image processing, and visualization +Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, atlmfc (windows), eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c + +Feature: openvr +Description: OpenVR functionality for VTK +Build-Depends: sdl2, openvr + +Feature: qt +Description: Qt functionality for VTK +Build-Depends: qt5 + +Feature: mpi +Description: MPI functionality for VTK +Build-Depends: mpi, hdf5[parallel] + +Feature: python +Description: Python functionality for VTK +Build-Depends: python3 +``` + +### Recognized fields + +#### Feature +The name of the feature. + +#### Description +A description of the feature using the same syntax as the port `Description` field. + +#### Build-Depends +The list of dependencies required to build and use this feature. + +On installation the dependencies from all selected features are combined to produce the full dependency list for the build. This field follows the same syntax as `Build-Depends` in the Source Paragraph. diff --git a/externals/vcpkg/docs/maintainers/execute_process.md b/externals/vcpkg/docs/maintainers/execute_process.md new file mode 100755 index 000000000..688ec8464 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/execute_process.md @@ -0,0 +1,11 @@ +# execute_process + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/execute_process.md). + +Intercepts all calls to execute_process() inside portfiles and fails when Download Mode +is enabled. + +In order to execute a process in Download Mode call `vcpkg_execute_in_download_mode()` instead. + +## Source +[scripts/cmake/execute\_process.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/execute_process.cmake) diff --git a/externals/vcpkg/docs/maintainers/internal/vcpkg_catalog_release_process.md b/externals/vcpkg/docs/maintainers/internal/vcpkg_catalog_release_process.md new file mode 100755 index 000000000..5acd12b37 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/internal/vcpkg_catalog_release_process.md @@ -0,0 +1,14 @@ +# vcpkg_catalog_release_process + +This document describes the acceptance criteria / process we use when doing a vcpkg release. + +1. Generate a new GitHub Personal Access Token with repo permissions. +2. Using the PAT, invoke $/scripts/Get-Changelog.ps1 `-StartDate (previous release date) -EndDate (Get-Date) -OutFile path/to/results.md` +3. Create a new GitHub release in this repo. +4. Submit a vcpkg.ci (full tree rebuild) run with the same SHA as that release. +5. Use the "auto-generate release notes". Copy the "new contributors" and "full changelog" parts to the end of `path/to/results.md`. +6. Change `## New Contributors` to `#### New Contributors` +7. In `path/to/results.md`, update `LINK TO BUILD` with the most recent link to vcpkg.ci run. +8. In `path/to/results.md`, fill out the tables for number of existing ports and successful ports. +9. Replace the contents of the release notes with the contents of `path/to/results.md` +10. After the full rebuild submission completes, update the link to the one for the exact SHA, the counts, and remove "(tentative)". diff --git a/externals/vcpkg/docs/maintainers/internal/vcpkg_tool_release_process.md b/externals/vcpkg/docs/maintainers/internal/vcpkg_tool_release_process.md new file mode 100755 index 000000000..fed09f577 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/internal/vcpkg_tool_release_process.md @@ -0,0 +1,42 @@ +# vcpkg_tool_release_process + +This document describes the acceptance criteria / process we use when doing a vcpkg-tool update, +such as https://github.com/microsoft/vcpkg/pull/23757 + +1. Verify that all tests etc. are passing in the vcpkg-tool repo's `main` branch, and that the + contents therein are acceptable for release. (Steps after this will sign code there, so this + review is responsible gating what has access to code signing.) +2. Check that the changes there are in fact the changes that we want in that release. (Be aware, + you are responsible for what is about to be signed with a Microsoft code signing certificate by + proceeding) +3. Submit a new full tree rebuild by https://dev.azure.com/vcpkg/public/_build?definitionId=29 + (microsoft.vcpkg.ci as of this writing) and queue a new build with the vcpkg-tool SHA overridden + to the one you wish to use. Example: + https://dev.azure.com/vcpkg/public/_build/results?buildId=73664&view=results +4. (Probably the next day) Check over the failures and ensure any differences with the most recent + full rebuild using the previous tool version are understood. +5. On your machine, in a prompt changed to the vcpkg-tool repo, + `git fetch https://github.com/microsoft/vcpkg-tool main && git switch -d FETCH_HEAD` +6. `git push https://devdiv.visualstudio.com/DevDiv/_git/vcpkg FETCH_HEAD:main` +7. Monitor the resulting signed build at: + https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_build?definitionId=13610 + and/or manually submit one. (The push is supposed to automatically submit a build but that + has been somewhat unstable at the time of this writing.) +8. The signed build will automatically create a draft GitHub release at + https://github.com/microsoft/vcpkg-tool/releases . Erase the contents filled in there and press + the "auto generate release notes" button. Manually remove any entries created by the automated + localization tools which will start with `* LEGO: Pull request from juno/`. +9. Publish that draft release as "pre-release". +10. Smoke test the 'one liner' installer: (Where 2022-06-15 is replaced with the right release name) + * Powershell: + `iex (iwr https://github.com/microsoft/vcpkg-tool/releases/download/2022-06-15/vcpkg-init.ps1)` + * Batch: + `curl -L -o vcpkg-init.cmd https://github.com/microsoft/vcpkg-tool/releases/download/2022-06-15/vcpkg-init.ps1 && .\vcpkg-init.cmd` + * Bash: + `. <(curl https://github.com/microsoft/vcpkg-tool/releases/download/2022-06-15/vcpkg-init -L)` +11. In the vcpkg repo, draft a PR which updates `bootstrap-vcpkg.sh` and `boostrap-vcpkg.ps1` + with the new release date, and update SHAs as appropriate in the .sh script. (For example, see + https://github.com/microsoft/vcpkg/pull/23757) +12. Merge the tool update PR. +13. Change the github release in vcpkg-tool from "prerelease" to "release". (This automatically + updates the aka.ms links) diff --git a/externals/vcpkg/docs/maintainers/internal/z_vcpkg_apply_patches.md b/externals/vcpkg/docs/maintainers/internal/z_vcpkg_apply_patches.md new file mode 100755 index 000000000..64351ed52 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/internal/z_vcpkg_apply_patches.md @@ -0,0 +1,32 @@ +# z_vcpkg_apply_patches + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/). + +**Only for internal use in vcpkg helpers. Behavior and arguments will change without notice.** + +Apply a set of patches to a source tree. + +```cmake +z_vcpkg_apply_patches( + SOURCE_PATH + [QUIET] + PATCHES ... +) +``` + +The `` should be set to `${SOURCE_PATH}` by convention, +and is the path to apply the patches in. + +`z_vcpkg_apply_patches` will take the list of ``es, +which are by default relative to the port directory, +and apply them in order using `git apply`. +Generally, these ``es take the form of `some.patch` +to select patches in the port directory. +One may also download patches and use `${VCPKG_DOWNLOADS}/path/to/some.patch`. + +If `QUIET` is not passed, it is a fatal error for a patch to fail to apply; +otherwise, if `QUIET` is passed, no message is printed. +This should only be used for edge cases, such as patches that are known to fail even on a clean source tree. + +## Source +[scripts/cmake/z\_vcpkg\_apply\_patches.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/z_vcpkg_apply_patches.cmake) diff --git a/externals/vcpkg/docs/maintainers/internal/z_vcpkg_forward_output_variable.md b/externals/vcpkg/docs/maintainers/internal/z_vcpkg_forward_output_variable.md new file mode 100755 index 000000000..10c5855df --- /dev/null +++ b/externals/vcpkg/docs/maintainers/internal/z_vcpkg_forward_output_variable.md @@ -0,0 +1,38 @@ +# z_vcpkg_forward_output_variable + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/). + +This macro helps with forwarding values from inner function calls, +through a local function scope, into pointer out parameters. + +```cmake +z_vcpkg_forward_output_variable(ptr_to_parent_var var_to_forward) +``` + +is equivalent to + +```cmake +if(DEFINED ptr_to_parent_var) + if(DEFINED value_var) + set("${ptr_to_parent_var}" "${value_var}" PARENT_SCOPE) + else() + unset("${ptr_to_parent_var}" PARENT_SCOPE) + endif() +endif() +``` + +Take note that the first argument should be a local variable that has a value of the parent variable name. +Most commonly, this local is the result of a pointer-out parameter to a function. +If the variable in the first parameter is not defined, this function does nothing, +simplifying functions with optional out parameters. +Most commonly, this should be used in cases like: + +```cmake +function(my_function out_var) + file(SHA512 "somefile.txt" local_var) + z_vcpkg_forward_output_variable(out_var local_var) +endfunction() +``` + +## Source +[scripts/cmake/z\_vcpkg\_forward\_output\_variable.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/z_vcpkg_forward_output_variable.cmake) diff --git a/externals/vcpkg/docs/maintainers/internal/z_vcpkg_function_arguments.md b/externals/vcpkg/docs/maintainers/internal/z_vcpkg_function_arguments.md new file mode 100755 index 000000000..ac6fb1b60 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/internal/z_vcpkg_function_arguments.md @@ -0,0 +1,29 @@ +# z_vcpkg_function_arguments + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/). + +**Only for internal use in vcpkg helpers. Behavior and arguments will change without notice.** +Get a list of the arguments which were passed in. +Unlike `ARGV`, which is simply the arguments joined with `;`, +so that `(A B)` is not distinguishable from `("A;B")`, +this macro gives `"A;B"` for the first argument list, +and `"A\;B"` for the second. + +```cmake +z_vcpkg_function_arguments( []) +``` + +`z_vcpkg_function_arguments` gets the arguments between `ARGV` and the last argument. +`` defaults to `0`, so that all arguments are taken. + +## Example: +```cmake +function(foo_replacement) + z_vcpkg_function_arguments(ARGS) + foo(${ARGS}) + ... +endfunction() +``` + +## Source +[scripts/cmake/z\_vcpkg\_function\_arguments.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/z_vcpkg_function_arguments.cmake) diff --git a/externals/vcpkg/docs/maintainers/internal/z_vcpkg_get_cmake_vars.md b/externals/vcpkg/docs/maintainers/internal/z_vcpkg_get_cmake_vars.md new file mode 100755 index 000000000..2dcf2a8e7 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/internal/z_vcpkg_get_cmake_vars.md @@ -0,0 +1,36 @@ +# z_vcpkg_get_cmake_vars + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/). + +**Only for internal use in vcpkg helpers. Behavior and arguments will change without notice.** +Runs a cmake configure with a dummy project to extract certain cmake variables + +## Usage +```cmake +z_vcpkg_get_cmake_vars() +``` + +`z_vcpkg_get_cmake_vars(cmake_vars_file)` sets `` to +a path to a generated CMake file, with the detected `CMAKE_*` variables +re-exported as `VCPKG_DETECTED_*`. + +## Notes +Avoid usage in portfiles. + +All calls to `z_vcpkg_get_cmake_vars` will result in the same output file; +the output file is not generated multiple times. + +## Examples + +* [vcpkg_configure_make](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_configure_make.cmake) + +### Basic Usage + +```cmake +z_vcpkg_get_cmake_vars(cmake_vars_file) +include("${cmake_vars_file}") +message(STATUS "detected CXX flags: ${VCPKG_DETECTED_CXX_FLAGS}") +``` + +## Source +[scripts/cmake/z\_vcpkg\_get\_cmake\_vars.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/z_vcpkg_get_cmake_vars.cmake) diff --git a/externals/vcpkg/docs/maintainers/internal/z_vcpkg_prettify_command_line.md b/externals/vcpkg/docs/maintainers/internal/z_vcpkg_prettify_command_line.md new file mode 100755 index 000000000..f17114bce --- /dev/null +++ b/externals/vcpkg/docs/maintainers/internal/z_vcpkg_prettify_command_line.md @@ -0,0 +1,21 @@ +# z_vcpkg_prettify_command_line + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/). + +**Only for internal use in vcpkg helpers. Behavior and arguments will change without notice.** +Turn a command line into a formatted string. + +```cmake +z_vcpkg_prettify_command_line( ...) +``` + +This command is for internal use, when printing out to a message. + +## Examples + +* `scripts/cmake/vcpkg_execute_build_process.cmake` +* `scripts/cmake/vcpkg_execute_required_process.cmake` +* `scripts/cmake/vcpkg_execute_required_process_repeat.cmake` + +## Source +[scripts/cmake/z\_vcpkg\_prettify\_command\_line.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/z_vcpkg_prettify_command_line.cmake) diff --git a/externals/vcpkg/docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.cmake.md b/externals/vcpkg/docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.cmake.md new file mode 100755 index 000000000..f1a9290a6 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.cmake.md @@ -0,0 +1,11 @@ +# z_vcpkg_setup_pkgconfig_path + +Setup the generated pkgconfig file path to PKG_CONFIG_PATH environment variable or restore PKG_CONFIG_PATH environment variable. + +```cmake +z_vcpkg_setup_pkgconfig_path(BASE_DIRS <"${CURRENT_INSTALLED_DIR}" ...>) +z_vcpkg_restore_pkgconfig_path() +``` + +`z_vcpkg_setup_pkgconfig_path` prepends `lib/pkgconfig` and `share/pkgconfig` directories for the given `BASE_DIRS` to the `PKG_CONFIG_PATH` environment variable. It creates or updates a backup of the previous value. +`z_vcpkg_restore_pkgconfig_path` shall be called when leaving the scope which called `z_vcpkg_setup_pkgconfig_path` in order to restore the original value from the backup. diff --git a/externals/vcpkg/docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.md b/externals/vcpkg/docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.md new file mode 100755 index 000000000..80c6654b7 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.md @@ -0,0 +1,16 @@ +# z_vcpkg_setup_pkgconfig_path + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/). + +`z_vcpkg_setup_pkgconfig_path` sets up environment variables to use `pkgconfig`, such as `PKG_CONFIG` and `PKG_CONFIG_PATH`. +The original values are restored with `z_vcpkg_restore_pkgconfig_path`. `BASE_DIRS` indicates the base directories to find `.pc` files; typically `${CURRENT_INSTALLED_DIR}`, or `${CURRENT_INSTALLED_DIR}/debug`. + +```cmake +z_vcpkg_setup_pkgconfig_path(BASE_DIRS <"${CURRENT_INSTALLED_DIR}" ...>) +# Build process that may transitively invoke pkgconfig +z_vcpkg_restore_pkgconfig_path() +``` + + +## Source +[scripts/cmake/z\_vcpkg\_setup\_pkgconfig\_path.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/z_vcpkg_setup_pkgconfig_path.cmake) diff --git a/externals/vcpkg/docs/maintainers/maintainer-guide.md b/externals/vcpkg/docs/maintainers/maintainer-guide.md new file mode 100755 index 000000000..1bf8e9483 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/maintainer-guide.md @@ -0,0 +1,418 @@ +# Maintainer Guidelines and Policies + +This document lists a set of policies that you should apply when adding or updating a port recipe. +It is intended to serve the role of +[Debian's Policy Manual](https://www.debian.org/doc/debian-policy/), +[Homebrew's Maintainer Guidelines](https://docs.brew.sh/Maintainer-Guidelines), and +[Homebrew's Formula Cookbook](https://docs.brew.sh/Formula-Cookbook). + +## PR Structure + +### Make separate Pull Requests per port + +Whenever possible, separate changes into multiple PRs. +This makes them significantly easier to review and prevents issues with one set of changes from holding up every other change. + +### Avoid trivial changes in untouched files + +For example, avoid reformatting or renaming variables in portfiles that otherwise have no reason to be modified for the issue at hand. +However, if you need to modify the file for the primary purpose of the PR (updating the library), +then obviously beneficial changes like fixing typos are appreciated! + +### Check names against other repositories + +A good service to check many at once is [Repology](https://repology.org/). +If the library you are adding could be confused with another one, +consider renaming to make it clear. We prefer when names are longer and/or +unlikely to conflict with any future use of the same name. If the port refers +to a library on GitHub, a good practice is to prefix the name with the organization +if there is any chance of confusion. + +### Use GitHub Draft PRs + +GitHub Draft PRs are a great way to get CI or human feedback on work that isn't yet ready to merge. +Most new PRs should be opened as drafts and converted to normal PRs once the CI passes. + +More information about GitHub Draft PRs: +https://github.blog/2019-02-14-introducing-draft-pull-requests/ + +## Portfiles + +### Avoid deprecated helper functions + +At this time, the following helpers are deprecated: + +1. `vcpkg_extract_source_archive()` should be replaced by [`vcpkg_extract_source_archive_ex()`](vcpkg_extract_source_archive_ex.md) +2. `vcpkg_apply_patches()` should be replaced by the `PATCHES` arguments to the "extract" helpers (e.g. [`vcpkg_from_github()`](vcpkg_from_github.md)) +3. `vcpkg_build_msbuild()` should be replaced by [`vcpkg_install_msbuild()`](vcpkg_install_msbuild.md) +4. `vcpkg_copy_tool_dependencies()` should be replaced by [`vcpkg_copy_tools()`](vcpkg_copy_tools.md) +5. `vcpkg_configure_cmake` should be replaced by [`vcpkg_cmake_configure()`](ports/vcpkg-cmake/vcpkg_cmake_configure.md#vcpkg_cmake_configure) after removing `PREFER_NINJA` (from port [`vcpkg-cmake`](ports/vcpkg-cmake.md#vcpkg-cmake)) +6. `vcpkg_build_cmake` should be replaced by [`vcpkg_cmake_build()`](ports/vcpkg-cmake/vcpkg_cmake_build.md#vcpkg_cmake_build) (from port [`vcpkg-cmake`](ports/vcpkg-cmake.md#vcpkg-cmake)) +7. `vcpkg_install_cmake` should be replaced by [`vcpkg_cmake_install()`](ports/vcpkg-cmake/vcpkg_cmake_install.md#vcpkg_cmake_install) (from port [`vcpkg-cmake`](ports/vcpkg-cmake.md#vcpkg-cmake)) +8. `vcpkg_fixup_cmake_targets` should be replaced by [`vcpkg_cmake_config_fixup`](ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md#vcpkg_cmake_config_fixup) (from port [`vcpkg-cmake-config`](ports/vcpkg-cmake-config.md#vcpkg-cmake-config)) + +Some of the replacement helper functions are in "tools ports" to allow consumers to pin their +behavior at specific versions, to allow locking the behavior of the helpers at a particular +version. Tools ports need to be added to your port's `"dependencies"`, like so: + +```json +{ + "name": "vcpkg-cmake", + "host": true +}, +{ + "name": "vcpkg-cmake-config", + "host": true +} +``` + +### Avoid excessive comments in portfiles + +Ideally, portfiles should be short, simple, and as declarative as possible. +Remove any boiler plate comments introduced by the `create` command before submitting a PR. + +### Ports must not be path dependent + +Ports must not change their behavior based on which ports are already installed in a form that would change which contents that port installs. For example, given: + +``` +> vcpkg install a +> vcpkg install b +> vcpkg remove a +``` + +and + +``` +> vcpkg install b +``` + +the files installed by `b` must be the same, regardless of influence by the previous installation of `a`. This means that ports must not try to detect whether something is provided in the installed tree by another port before taking some action. A specific and common cause of such "path dependent" behavior is described below in "When defining features, explicitly control dependencies." + +### Unique port attribution rule + +In the entire vcpkg system, no two ports a user is expected to use concurrently may provide the same file. If a port tries to install a file already provided by another file, installation will fail. If a port wants to use an extremely common name for a header, for example, it should place those headers in a subdirectory rather than in `include`. + +### Add CMake exports in an unofficial- namespace + +A core design ideal of vcpkg is to not create "lock-in" for customers. In the build system, there should be no difference between depending on a library from the system, and depending on a library from vcpkg. To that end, we avoid adding CMake exports or targets to existing libraries with "the obvious name", to allow upstreams to add their own official CMake exports without conflicting with vcpkg. + +To that end, any CMake configs that the port exports, which are not in the upstream library, should have `unofficial-` as a prefix. Any additional targets should be in the `unofficial::::` namespace. + +This means that the user should see: + * `find_package(unofficial- CONFIG)` as the way to get at the unique-to-vcpkg package + * `unofficial::::` as an exported target from that port. + +Examples: + * [`brotli`](https://github.com/microsoft/vcpkg/blob/4f0a640e4c5b74166b759a862d7527c930eff32e/ports/brotli/install.patch) creates the `unofficial-brotli` package, producing target `unofficial::brotli::brotli`. + +## Features + +### Do not use features to implement alternatives + +Features must be treated as additive functionality. If port[featureA] installs and port[featureB] installs, then port[featureA,featureB] must install. Moreover, if a second port depends on [featureA] and a third port depends on [featureB], installing both the second and third ports should have their dependencies satisfied. + +Libraries in this situation must choose one of the available options as expressed in vcpkg, and users who want a different setting must use overlay ports at this time. + +Existing examples we would not accept today retained for backwards compatibility: + * `libgit2`, `libzip`, `open62541` all have features for selecting a TLS or crypto backend. Note that `curl` has different crypto backend options but allows selecting between them at runtime, meaning the above tenet is maintained. + * `darknet` has `opencv2`, `opencv3`, features to control which version of opencv to use for its dependencies. + +### A feature may engage preview or beta functionality + +Notwithstanding the above, if there is a preview branch or similar where the preview functionality has a high probability of not disrupting the non-preview functionality (for example, no API removals), a feature is acceptable to model this setting. + +Examples: + * The Azure SDKs (of the form `azure-Xxx`) have a `public-preview` feature. + * `imgui` has an `experimental-docking` feature which engages their preview docking branch which uses a merge commit attached to each of their public numbered releases. + +### Default features should enable behaviors, not APIs + +If a consumer is depending directly upon a library, they can list out any desired features easily (`library[feature1,feature2]`). However, if a consumer _does not know_ they are using a library, they cannot list out those features. If that hidden library is like `libarchive` where features are adding additional compression algorithms (and thus behaviors) to an existing generic interface, default features offer a way to ensure a reasonably functional transitive library is built even if the final consumer doesn't name it directly. + +If the feature adds additional APIs (or executables, or library binaries) and doesn't modify the behavior of existing APIs, it should be left off by default. This is because any consumer which might want to use those APIs can easily require it via their direct reference. + +If in doubt, do not mark a feature as default. + +### Do not use features to control alternatives in published interfaces + +If a consumer of a port depends on only the core functionality of that port, with high probability they must not be broken by turning on the feature. This is even more important when the alternative is not directly controlled by the consumer, but by compiler settings like `/std:c++17` / `-std=c++17`. + +Existing examples we would not accept today retained for backwards compatibility: + * `redis-plus-plus[cxx17]` controls a polyfill but does not bake the setting into the installed tree. + * `ace[wchar]` changes all APIs to accept `const wchar_t*` rather than `const char*`. + +### A feature may replace polyfills with aliases provided that replacement is baked into the installed tree + +Notwithstanding the above, ports may remove polyfills with a feature, as long as: + 1. Turning on the feature changes the polyfills to aliases of the polyfilled entity + 2. The state of the polyfill is baked into the installed headers, such that ABI mismatch "impossible" runtime errors are unlikely + 3. It is possible for a consumer of the port to write code which works in both modes, for example by using a typedef which is either polyfilled or not + +Example: + * `abseil[cxx17]` changes `absl::string_view` to a replacement or `std::string_view`; the patch +https://github.com/microsoft/vcpkg/blob/981e65ce0ac1f6c86e5a5ded7824db8780173c76/ports/abseil/fix-cxx-standard.patch implements the baking requirement + +### Recommended solutions + +If it's critical to expose the underlying alternatives, we recommend providing messages at build time to instruct the user on how to copy the port into a private overlay: +```cmake +set(USING_DOG 0) +message(STATUS "This version of LibContosoFrobnicate uses the Kittens backend. To use the Dog backend instead, create an overlay port of this with USING_DOG set to 1 and the `kittens` dependency replaced with `dog`.") +message(STATUS "This recipe is at ${CMAKE_CURRENT_LIST_DIR}") +message(STATUS "See the overlay ports documentation at https://github.com/microsoft/vcpkg/blob/master/docs/specifications/ports-overlay.md") +``` + +## Build Techniques + +### Do not use vendored dependencies + +Do not use embedded copies of libraries. +All dependencies should be split out and packaged separately so they can be updated and maintained. + +### Prefer using CMake + +When multiple buildsystems are available, prefer using CMake. +Additionally, when appropriate, it can be easier and more maintainable to rewrite alternative buildsystems into CMake using `file(GLOB)` directives. + +Examples: [abseil](../../ports/abseil/portfile.cmake) + +### Choose either static or shared binaries + +By default, `vcpkg_cmake_configure()` will pass in the appropriate setting for `BUILD_SHARED_LIBS`, +however for libraries that don't respect that variable, you can switch on `VCPKG_LIBRARY_LINKAGE`: + +```cmake +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KEYSTONE_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" KEYSTONE_BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DKEYSTONE_BUILD_STATIC=${KEYSTONE_BUILD_STATIC} + -DKEYSTONE_BUILD_SHARED=${KEYSTONE_BUILD_SHARED} +) +``` + +### When defining features, explicitly control dependencies + +When defining a feature that captures an optional dependency, +ensure that the dependency will not be used accidentally when the feature is not explicitly enabled. + +```cmake +set(CMAKE_DISABLE_FIND_PACKAGE_ZLIB ON) +set(CMAKE_REQUIRE_FIND_PACKAGE_ZLIB OFF) +if ("zlib" IN_LIST FEATURES) + set(CMAKE_DISABLE_FIND_PACKAGE_ZLIB OFF) + set(CMAKE_REQUIRE_FIND_PACKAGE_ZLIB ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=${CMAKE_DISABLE_FIND_PACKAGE_ZLIB} + -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=${CMAKE_REQUIRE_FIND_PACKAGE_ZLIB} +) +``` + +The snippet below using `vcpkg_check_features()` is equivalent, [see the documentation](vcpkg_check_features.md). + +```cmake +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "zlib" CMAKE_REQUIRE_FIND_PACKAGE_ZLIB + INVERTED_FEATURES + "zlib" CMAKE_DISABLE_FIND_PACKAGE_ZLIB +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} +) +``` + +Note that `ZLIB` in the above is case-sensitive. See the [CMAKE_DISABLE_FIND_PACKAGE_PackageName](https://cmake.org/cmake/help/v3.22/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html) and [CMAKE_REQUIRE_FIND_PACKAGE_PackageName](https://cmake.org/cmake/help/v3.22/variable/CMAKE_REQUIRE_FIND_PACKAGE_PackageName.html) documnetation for more details. + +### Place conflicting libs in a `manual-link` directory + +A lib is considered conflicting if it does any of the following: ++ Define `main` ++ Define malloc ++ Define symbols that are also declared in other libraries + +Conflicting libs are typically by design and not considered a defect. Because some build systems link against everything in the lib directory, these should be moved into a subdirectory named `manual-link`. + +## Manifests and CONTROL files + +When adding a new port, use the new manifest syntax for defining a port; +you may also change over to manifests when modifying an existing port. +You may do so easily by running the `vcpkg format-manifest` command, which will convert existing CONTROL +files into manifest files. Do not convert CONTROL files that have not been modified. + +## Versioning + +### Follow common conventions for the `"version"` field + +See our [versioning documentation](../users/versioning.md#version-schemes) for a full explanation of our conventions. + +### Update the `"port-version"` field in the manifest file of any modified ports + +Vcpkg uses this field to determine whether a given port is out-of-date and should be changed whenever the port's behavior changes. + +Our convention is to use the `"port-version"` field for changes to the port that don't change the upstream version, and to reset the `"port-version"` back to zero when an update to the upstream version is made. + +For Example: + +- Zlib's package version is currently `1.2.1`, with no explicit `"port-version"` (equivalent to a `"port-version"` of `0`). +- You've discovered that the wrong copyright file has been deployed, and fixed that in the portfile. +- You should update the `"port-version"` field in the manifest file to `1`. + +See our [manifest files document](manifest-files.md#port-version) for a full explanation of our conventions. + +### Update the version files in `versions/` of any modified ports + +Vcpkg uses a set of metadata files to power its versioning feature. +These files are located in the following locations: +* `${VCPKG_ROOT}/versions/baseline.json`, (this file is common to all ports) and +* `${VCPKG_ROOT}/versions/${first-letter-of-portname}-/${portname}.json` (one per port). + +For example, for `zlib` the relevant files are: +* `${VCPKG_ROOT}/versions/baseline.json` +* `${VCPKG_ROOT}/versions/z-/zlib.json` + +We expect that each time you update a port, you also update its version files. + +**The recommended method to update these files is to run the `x-add-version` command, e.g.:** + +``` +vcpkg x-add-version zlib +``` + +If you're updating multiple ports at the same time, instead you can run: + +``` +vcpkg x-add-version --all +``` + +To update the files for all modified ports at once. + +_NOTE: These commands require you to have committed your changes to the ports before running them. The reason is that the Git SHA of the port directory is required in these version files. But don't worry, the `x-add-version` command will warn you if you have local changes that haven't been committed._ + +See our [versioning specification](../specifications/versioning.md) and [registries specification](../specifications/registries-2.md) to learn how vcpkg interacts with these files. + +## Patching + +### Prefer options over patching + +It is preferable to set options in a call to `vcpkg_configure_xyz()` over patching the settings directly. + +Common options that allow avoiding patching: +1. [MSBUILD] `` settings inside the project file can be overridden via `/p:` parameters +2. [CMAKE] Calls to `find_package(XYz)` in CMake scripts can be disabled via [`-DCMAKE_DISABLE_FIND_PACKAGE_XYz=ON`](https://cmake.org/cmake/help/v3.15/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html) +3. [CMAKE] Cache variables (declared as `set(VAR "value" CACHE STRING "Documentation")` or `option(VAR "Documentation" "Default Value")`) can be overridden by just passing them in on the command line as `-DVAR:STRING=Foo`. One notable exception is if the `FORCE` parameter is passed to `set()`. See also the [CMake `set` documentation](https://cmake.org/cmake/help/v3.15/command/set.html) + +### Prefer patching over overriding `VCPKG_` values + +Some variables prefixed with `VCPKG_` have an equivalent `CMAKE_`. +However, not all of them are passed to the internal package build [(see implementation: Windows toolchain)](../../scripts/toolchains/windows.cmake). + +Consider the following example: + +```cmake +set(VCPKG_C_FLAGS "-O2 ${VCPKG_C_FLAGS}") +set(VCPKG_CXX_FLAGS "-O2 ${VCPKG_CXX_FLAGS}") +``` + +Using `vcpkg`'s built-in toolchains this works, because the value of `VCPKG__FLAGS` is forwarded to the appropriate `CMAKE_LANG_FLAGS` variable. But, a custom toolchain that is not aware of `vcpkg`'s variables will not forward them. + +Because of this, it is preferable to patch the buildsystem directly when setting `CMAKE__FLAGS`. + +### Minimize patches + +When making changes to a library, strive to minimize the final diff. This means you should _not_ reformat the upstream source code when making changes that affect a region. Also, when disabling a conditional, it is better to add a `AND FALSE` or `&& 0` to the condition than to delete every line of the conditional. + +Don't add patches if the port is outdated and updating the port to a newer released version would solve the same issue. vcpkg prefers updating ports over patching outdated versions unless the version bump breaks a considerable amount of dependent ports. + +This helps to keep the size of the vcpkg repository down as well as improves the likelihood that the patch will apply to future code versions. + +### Do not implement features in patches + +The purpose of patching in vcpkg is to enable compatibility with compilers, libraries, and platforms. It is not to implement new features in lieu of following proper Open Source procedure (submitting an Issue/PR/etc). + +## Do not build tests/docs/examples by default + +When submitting a new port, check for any options like `BUILD_TESTS` or `WITH_TESTS` or `POCO_ENABLE_SAMPLES` and ensure the additional binaries are disabled. This minimizes build times and dependencies for the average user. + +Optionally, you can add a `test` feature which enables building the tests, however this should not be in the `Default-Features` list. + +## Enable existing users of the library to switch to vcpkg + +### Do not add `CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS` + +Unless the author of the library is already using it, we should not use this CMake functionality because it interacts poorly with C++ templates and breaks certain compiler features. Libraries that don't provide a .def file and do not use __declspec() declarations simply do not support shared builds for Windows and should be marked as such with `vcpkg_check_linkage(ONLY_STATIC_LIBRARY)`. + +### Do not rename binaries outside the names given by upstream + +This means that if the upstream library has different names in release and debug (libx versus libxd), then the debug library should not be renamed to `libx`. Vice versa, if the upstream library has the same name in release and debug, we should not introduce a new name. + +Important caveat: +- Static and shared variants often should be renamed to a common scheme. This enables consumers to use a common name and be ignorant of the downstream linkage. This is safe because we only make one at a time available. + +Note that if a library generates CMake integration files (`foo-config.cmake`), renaming must be done through patching the CMake build itself instead of simply calling `file(RENAME)` on the output archives/LIBs. + +Finally, DLL files on Windows should never be renamed post-build because it breaks the generated LIBs. + +## Code format + +### Vcpkg internal code + +We require the C++ code inside vcpkg to follow the clang-format, if you change them. Please perform the following steps after modification: + +- Use Visual Studio: +1. Configure your [clang-format tools](https://devblogs.microsoft.com/cppblog/clangformat-support-in-visual-studio-2017-15-7-preview-1/). +2. Open the modified file. +3. Use shortcut keys Ctrl+K, Ctrl+D to format the current file. + +- Use tools: +1. Install [llvm clang-format](https://releases.llvm.org/download.html#10.0.0) +2. Run command: +```cmd +> LLVM_PATH/bin/clang-format.exe -style=file -i changed_file.cpp +``` + +### Manifests + +We require that the manifest file be formatted. Use the following command to format all manifest files: + +```cmd +> vcpkg format-manifest --all +``` + +## Useful implementation notes + +### Portfiles are run in Script Mode + +While `portfile.cmake`'s and `CMakeLists.txt`'s share a common syntax and core CMake language constructs, portfiles run in "Script Mode", whereas `CMakeLists.txt` files run in "Build Mode" (unofficial term). The most important difference between these two modes is that "Script Mode" does not have a concept of "Target" -- any behaviors that depend on the "target" machine (`CMAKE_CXX_COMPILER`, `CMAKE_EXECUTABLE_SUFFIX`, `CMAKE_SYSTEM_NAME`, etc) will not be correct. + +Portfiles have direct access to variables set in the triplet file, but `CMakeLists.txt`s do not (though there is often a translation that happens -- `VCPKG_LIBRARY_LINKAGE` versus `BUILD_SHARED_LIBS`). + +Portfiles and CMake builds invoked by portfiles are run in different processes. Conceptually: + +```no-highlight ++----------------------------+ +------------------------------------+ +| CMake.exe | | CMake.exe | ++----------------------------+ +------------------------------------+ +| Triplet file | ====> | Toolchain file | +| (x64-windows.cmake) | | (scripts/buildsystems/vcpkg.cmake) | ++----------------------------+ +------------------------------------+ +| Portfile | ====> | CMakeLists.txt | +| (ports/foo/portfile.cmake) | | (buildtrees/../CMakeLists.txt) | ++----------------------------+ +------------------------------------+ +``` + +To determine the host in a portfile, the standard CMake variables are fine (`CMAKE_HOST_WIN32`). + +To determine the target in a portfile, the vcpkg triplet variables should be used (`VCPKG_CMAKE_SYSTEM_NAME`). + +See also our [triplet documentation](../users/triplets.md) for a full enumeration of possible settings. diff --git a/externals/vcpkg/docs/maintainers/manifest-files.md b/externals/vcpkg/docs/maintainers/manifest-files.md new file mode 100755 index 000000000..46bd73a97 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/manifest-files.md @@ -0,0 +1,551 @@ +# Manifest files - `vcpkg.json` + +The `vcpkg.json` file contains metadata about the port. +It's a JSON file, and replaces the existing CONTROL file metadata structure. +It must have a top level object, and all fields are case sensitive. + +## Examples: + +The most important fields in a manifest, the ones which are required for all ports, +are the `"name"` field, and a version field (for now, just `"version-string"`). +There's more information about these fields below. + +```json +{ + "name": "ace", + "version-string": "6.5.5" +} +``` + +```json +{ + "name": "vtk", + "version-string": "8.2.0", + "port-version": 2, + "description": "Software system for 3D computer graphics, image processing, and visualization", + "dependencies": [ + { + "name": "atlmfc", + "platform": "windows" + }, + "double-conversion", + "eigen3", + "expat", + "freetype", + "glew", + "hdf5", + "jsoncpp", + "libharu", + "libjpeg-turbo", + "libpng", + "libtheora", + "libxml2", + "lz4", + "netcdf-c", + "proj4", + "pugixml", + "sqlite3", + "tiff", + "zlib" + ] +} +``` + +## Fields + +### `"name"` +The name of the port. + +When adding new ports be aware that the name may conflict with other projects that are not a part of vcpkg. For example `json` conflicts with too many other projects so you should add a scope to the name such as `taocpp-json` to make it unique. Verify there are no conflicts on a search engine as well as on other package collections. + +Package collections to check for conflicts: + ++ [Repology](https://repology.org/projects/) ++ [Debian packages](https://www.debian.org/distrib/packages) ++ [Packages search](https://pkgs.org/) + +A name must be an identifier: i.e., it must only consist of lowercase ascii alphabetic characters, +numbers, and hyphens, and it must not begin nor end with a hyphen. + +### Version fields + +Currently there are different fields for special versioning. Namely: + +Manifest property | Versioning scheme +------------------|------------------------------------ +`version` | For dot-separated numeric versions +`version-semver` | For SemVer compliant versions +`version-date` | For dates in the format YYYY-MM-DD +`version-string` | For arbitrary strings + +See https://github.com/microsoft/vcpkg/blob/master/docs/specifications/versioning.md#22-package-versions for more details. + +Additionally, `"port-version"` is used to differentiate between port changes that don't change the underlying library version. + +#### `"version-string"` + +This field is an ascii string, and may contain alphanumeric characters, `.`, `_`, or `-`. No attempt at ordering versions is made; all versions are treated as byte strings and are only evaluated for equality. + +For tagged-release ports, we follow the following convention: + +1. If the library follows a scheme like `va.b.c`, we remove the leading `v`. In this case, it becomes `a.b.c`. +2. If the library includes its own name in the version like `curl-7_65_1`, we remove the leading name: `7_65_1` +3. If the library is versioned by dates, format the resulting version string just like the upstream library; + for example, Abseil formats their dates `lts_2020_02_25`, so the `"version-string"` should be `"lts_2020_02_25"`. + +For rolling-release ports, we use the date that the _commit was accessed by you_, formatted as `YYYY-MM-DD`. Stated another way: if someone had a time machine and went to that date, they would see this commit as the latest master. + +For example, given: +1. The latest commit was made on 2019-04-19 +2. The current version string is `2019-02-14` +3. Today's date is 2019-06-01. + +Then if you update the source version today, you should give it version `2019-06-01`. + +#### `"port-version"` + +The version of the port, aside from the library version. + +This field is a non-negative integer. +It allows one to version the port file separately from the version of the underlying library; +if you make a change to a port, without changing the underlying version of the library, +you should increment this field by one (starting at `0`, which is equivalent to no `"port-version"` field). +When the version of the underlying library is upgraded, +this field should be set back to `0` (i.e., delete the `"port-version"` field). + +#### Examples: +```json +{ + "version": "1.0.5", + "port-version": 2 +} +``` + +```json +{ + "version": "2019-03-21" +} +``` + +### `"description"` + +A description of the library. + +This field can either be a single string, which should be a summary of the library, +or can be an array, with the first line being a summary and the remaining lines being the detailed description - +one string per line. + +#### Examples: +```json +{ + "description": "C++ header-only JSON library" +} +``` +```json +{ + "description": [ + "Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1.", + "MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model." + "This makes it suitable for 'machine to machine' messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino." + ] +} +``` + +### `"homepage"` + +The URL of the homepage for the library where a user is able to find additional documentation or the original source code. + +### `"documentation"` + +The URL where a user would be able to find official documentation for the library. Optional. + +### `"maintainers"` + +A list of strings that define the set of maintainers of a package. +It's recommended that these take the form of `Givenname Surname `, +but this field is not checked for consistency. + +Optional. + +#### Example: +```json +{ + "homepage": "https://github.com/microsoft/vcpkg" +} +``` + +### `"dependencies"` + +An array of ports the library has a dependency on. + +vcpkg does not distinguish between build-only dependencies and runtime dependencies. +The complete list of dependencies needed to successfully use the library should be specified. + +For example: websocketpp is a header only library, and thus does not require any dependencies at install time. +However, downstream users need boost and openssl to make use of the library. +Therefore, websocketpp lists boost and openssl as dependencies. + +Each dependency may be either an identifier, or an object. +For many dependencies, just listing the name of the library should be fine; +however, if one needs to add extra information to that dependency, one may use the dependency object. +For a dependency object, the `"name"` field is used to designate the library; +for example the dependency object `{ "name": "zlib" }` is equivalent to just writing `"zlib"`. + +If the port is dependent on optional features of another library, +those can be specified using the `"features"` field of the dependency object. +If the port does not require any features from the dependency, +this should be specified with the `"default-features"` fields set to `false`. + +Dependencies can also be filtered based on the target triplet to support differing requirements. +These filters use the same syntax as the `"supports"` field below, +and are specified in the `"platform"` field. + +#### Example: +```json +{ + "dependencies": [ + { + "name": "curl", + "default-features": false, + "features": [ + "winssl" + ], + "platform": "windows" + }, + { + "name": "curl", + "default-features": false, + "features": [ + "openssl" + ], + "platform": "!windows" + }, + "rapidjson" + ] +} +``` + +### `"features"` + +Multiple optional features can be specified in manifest files, in the `"features"` object field. +This field is a map from the feature name, to the feature's information. +Each one must have a `"description"` field, and may also optionally have a `"dependencies"` field. + +A feature's name must be an identifier - +in other words, lowercase alphabetic characters, digits, and hyphens, +neither starting nor ending with a hyphen. + +A feature's `"description"` is a description of the feature, +and is the same kind of thing as the port `"description"` field. + +A feature's `"dependencies"` field contains the list of extra dependencies required to build and use this feature; +this field isn't required if the feature doesn't require any extra dependencies. +On installation the dependencies from all selected features are combined to produce the full dependency list for the build. + +#### Example: + +```json +{ + "name": "vtk", + "version-string": "8.2.0", + "port-version": 2, + "description": "Software system for 3D computer graphics, image processing, and visualization", + "dependencies": [ + { + "name": "atlmfc", + "platform": "windows" + }, + "double-conversion", + "eigen3", + "expat", + "freetype", + "glew", + "hdf5", + "jsoncpp", + "libharu", + "libjpeg-turbo", + "libpng", + "libtheora", + "libxml2", + "lz4", + "netcdf-c", + "proj4", + "pugixml", + "sqlite3", + "tiff", + "zlib" + ], + "features": { + "mpi": { + "description": "MPI functionality for VTK", + "dependencies": [ + { + "name": "hdf5", + "features": [ + "parallel" + ] + }, + "mpi" + ] + }, + "openvr": { + "description": "OpenVR functionality for VTK", + "dependencies": [ + "openvr", + "sdl2" + ] + }, + "python": { + "description": "Python functionality for VTK", + "dependencies": [ + "python3" + ] + }, + "qt": { + "description": "Qt functionality for VTK", + "dependencies": [ + "qt5" + ] + } + } +} +``` + +### `"default-features"` + +An array of feature names that the library uses by default, if nothing else is specified. + +#### Example: +```json +{ + "default-features": [ + "kinesis" + ], + "features": { + "dynamodb": { + "description": "Build dynamodb support", + "dependencies": [ + "dynamodb" + ] + }, + "kinesis": { + "description": "build kinesis support" + } + } +} +``` + +### `"supports"` + +A string, formatted as a platform expression, +that evaluates to true when the port should build successfully for a triplet. + +This field is used in the CI testing to skip ports, +and warns users in advance that a given install tree is not expected to succeed. +Therefore, this field should be used optimistically; +in cases where a port is expected to succeed 10% of the time, it should still be marked "supported". + +The grammar for this top-level platform expression, in [EBNF], is as follows: + +```ebnf +whitespace-character = +| ? U+0009 "CHARACTER TABULATION" ? +| ? U+000A "LINE FEED" ? +| ? U+000D "CARRIAGE RETURN" ? +| ? U+0020 "SPACE" ? ; +optional-whitespace = { whitespace-character } ; +required-whitespace = whitespace-character, { optional-whitespace } ; + +lowercase-alpha = +| "a" | "b" | "c" | "d" | "e" | "f" | "g" | "h" | "i" | "j" | "k" | "l" | "m" +| "n" | "o" | "p" | "q" | "r" | "s" | "t" | "u" | "v" | "w" | "x" | "y" | "z" ; +digit = +| "0" | "1" | "2" | "3" | "4" +| "5" | "6" | "7" | "8" | "9" ; +identifier-character = +| lowercase-alpha +| digit ; + +platform-expression-list = +| platform-expression { ",", optional-whitespace, platform-expression } ; + +platform-expression = +| platform-expression-not +| platform-expression-and +| platform-expression-or ; + +platform-expression-identifier = +| identifier-character, { identifier-character }, optional-whitespace ; + +platform-expression-grouped = +| "(", optional-whitespace, platform-expression, ")", optional-whitespace ; + +platform-expression-simple = +| platform-expression-identifier +| platform-expression-grouped ; + +platform-expression-unary-keyword-operand = +| required-whitespace, platform-expression-simple +| optional-whitespace, platform-expression-grouped ; + +platform-expression-not = +| platform-expression-simple +| "!", optional-whitespace, platform-expression-simple +| "not", platform-expression-unary-keyword-operand ; + +platform-expression-binary-keyword-first-operand = +| platform-expression-not, required-whitespace +| platform-expression-grouped ; + +platform-expression-binary-keyword-second-operand = +| required-whitespace, platform-expression-not +| platform-expression-grouped ; + +platform-expression-and = +| platform-expression-not, { "&", optional-whitespace, platform-expression-not } +| platform-expression-binary-keyword-first-operand, { "and", platform-expression-binary-keyword-second-operand } ; + +platform-expression-or = +| platform-expression-not, { "|", optional-whitespace, platform-expression-not } +| platform-expression-binary-keyword-first-operand, { "or", platform-expression-binary-keyword-second-operand } (* to allow for future extension *) ; + +top-level-platform-expression = optional-whitespace, platform-expression-list ; +``` + +Basically, there are four kinds of expressions -- identifiers, negations, ands, and ors. +Negations may only negate an identifier or a grouped expression. +Ands and ors are a list of `&` or `|` separated identifiers, negated expressions, and grouped expressions. +One may not mix `&` and `|` without parentheses for grouping. + +These predefined identifier expressions are computed from standard triplet settings: +- `native` - `TARGET_TRIPLET` == `HOST_TRIPLET`; + useful for ports which depend on their own built binaries in their build. +- `x64` - `VCPKG_TARGET_ARCHITECTURE` == `"x64"` +- `x86` - `VCPKG_TARGET_ARCHITECTURE` == `"x86"` +- `arm` - `VCPKG_TARGET_ARCHITECTURE` == `"arm"` or `VCPKG_TARGET_ARCHITECTURE` == `"arm64"` +- `arm64` - `VCPKG_TARGET_ARCHITECTURE` == `"arm64"` +- `windows` - `VCPKG_CMAKE_SYSTEM_NAME` == `""` or `VCPKG_CMAKE_SYSTEM_NAME` == `"WindowsStore"` +- `mingw` - `VCPKG_CMAKE_SYSTEM_NAME` == `"MinGW"` +- `uwp` - `VCPKG_CMAKE_SYSTEM_NAME` == `"WindowsStore"` +- `linux` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Linux"` +- `osx` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Darwin"` +- `android` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Android"` +- `static` - `VCPKG_LIBRARY_LINKAGE` == `"static"` +- `wasm32` - `VCPKG_TARGET_ARCHITECTURE` == `"wasm32"` +- `emscripten` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Emscripten"` +- `staticcrt` - `VCPKG_CRT_LINKAGE` == `"static"` + +These predefined identifier expressions can be overridden in the triplet file, +via the [`VCPKG_DEP_INFO_OVERRIDE_VARS`](../users/triplets.md) option, +and new identifier expressions can be added via the same mechanism. + +This field is optional and defaults to true. + +> Implementers' Note: these terms are computed from the triplet via the `vcpkg_get_dep_info` mechanism. + +[EBNF]: https://en.wikipedia.org/wiki/Extended_Backus%E2%80%93Naur_form + +#### Example: +```json +{ + "supports": "!uwp & !(arm & !arm64)" +} +``` + +This means "doesn't support uwp, nor arm32 (but does support arm64)". + +### `"license"` + +The license of the port. This is an [SPDX license expression], +or `null` for proprietary licenses and other licenses for which +one should "just read the `copyright` file" (e.g., Qt). + +[SPDX license expression]: https://spdx.dev/ids/#how + +Additionally, you can find the list of [recognized license IDs] +and [recognized license exception IDs] in Annex A of the SPDX specification. + +[recognized license IDs]: https://spdx.github.io/spdx-spec/SPDX-license-list/#a1-licenses-with-short-identifiers +[recognized license exception IDs]: https://spdx.github.io/spdx-spec/SPDX-license-list/#a2-exceptions-list + +The following is an EBNF conversion of the ABNF located at +, +and this is what we actually parse in vcpkg. +Note that vcpkg does not support DocumentRefs. + +```ebnf +idchar = ? regex /[-.a-zA-Z0-9]/ ? +idstring = ( idchar ), { idchar } ; + +(* note that unrecognized license and license exception IDs will be warned against *) +license-id = idstring ; +license-exception-id = idstring ; +(* note that DocumentRefs are unsupported by this implementation *) +license-ref = "LicenseRef-", idstring ; + +with = [ whitespace ], "WITH", [ whitespace ] ; +and = [ whitespace ], "AND", [ whitespace ] ; +or = [ whitespace ], "OR", [ whitespace ] ; + +simple-expression = [ whitespace ], ( + | license-id + | license-id, "+" + | license-ref + ), [ whitespace ] ; + +(* the following are split up from compound-expression to make precedence obvious *) +parenthesized-expression = + | simple-expression + | [ whitespace ], "(", or-expression, ")", [ whitespace ] ; + +with-expression = + | parenthesized-expression + | simple-expression, with, license-exception-id, [ whitespace ] ; + +(* note: "a AND b OR c" gets parsed as "(a AND b) OR c" *) +and-expression = with-expression, { and, with-expression } ; +or-expression = and-expression, { or, and-exression } ; + +license-expression = or-expression ; +``` + +#### Examples + +For libraries with simple licensing, +only one license identifier may be needed; + +vcpkg, for example, would use this since it uses the MIT license: + +```json +{ + "license": "MIT" +} +``` + +Many GPL'd projects allow either the GPL 2 or any later versions: + +```json +{ + "license": "GPL-2.0-or-later" +} +``` + +Many Rust projects, in order to make certain they're useable with GPL, +but also desiring the MIT license, will allow licensing under either +the MIT license or Apache 2.0: + +```json +{ + "license": "Apache-2.0 OR MIT" +} +``` + +Some major projects include exceptions; +the Microsoft C++ standard library, and the LLVM project, +are licensed under Apache 2.0 with the LLVM exception: + +```json +{ + "license": "Apache-2.0 WITH LLVM-exception" +} +``` diff --git a/externals/vcpkg/docs/maintainers/portfile-functions.md b/externals/vcpkg/docs/maintainers/portfile-functions.md new file mode 100755 index 000000000..3ad30f46e --- /dev/null +++ b/externals/vcpkg/docs/maintainers/portfile-functions.md @@ -0,0 +1,100 @@ + + +# Portfile helper functions +- [execute\_process](execute_process.md) +- [vcpkg\_acquire\_msys](vcpkg_acquire_msys.md) +- [vcpkg\_add\_to\_path](vcpkg_add_to_path.md) +- [vcpkg\_apply\_patches](vcpkg_apply_patches.md) (deprecated) +- [vcpkg\_backup\_restore\_env\_vars](vcpkg_backup_restore_env_vars.md) +- [vcpkg\_build\_cmake](vcpkg_build_cmake.md) (deprecated, use [vcpkg\_cmake\_build](ports/vcpkg-cmake/vcpkg_cmake_build.md)) +- [vcpkg\_build\_make](vcpkg_build_make.md) +- [vcpkg\_build\_msbuild](vcpkg_build_msbuild.md) +- [vcpkg\_build\_ninja](vcpkg_build_ninja.md) +- [vcpkg\_build\_nmake](vcpkg_build_nmake.md) +- [vcpkg\_build\_qmake](vcpkg_build_qmake.md) +- [vcpkg\_buildpath\_length\_warning](vcpkg_buildpath_length_warning.md) +- [vcpkg\_check\_features](vcpkg_check_features.md) +- [vcpkg\_check\_linkage](vcpkg_check_linkage.md) +- [vcpkg\_clean\_executables\_in\_bin](vcpkg_clean_executables_in_bin.md) +- [vcpkg\_clean\_msbuild](vcpkg_clean_msbuild.md) +- [vcpkg\_common\_definitions](vcpkg_common_definitions.md) +- [vcpkg\_configure\_cmake](vcpkg_configure_cmake.md) (deprecated, use [vcpkg\_cmake\_configure](ports/vcpkg-cmake/vcpkg_cmake_configure.md)) +- [vcpkg\_configure\_gn](vcpkg_configure_gn.md) (deprecated, use [vcpkg\_gn\_configure](ports/vcpkg-gn/vcpkg_gn_configure.md)) +- [vcpkg\_configure\_make](vcpkg_configure_make.md) +- [vcpkg\_configure\_meson](vcpkg_configure_meson.md) +- [vcpkg\_configure\_qmake](vcpkg_configure_qmake.md) +- [vcpkg\_copy\_pdbs](vcpkg_copy_pdbs.md) +- [vcpkg\_copy\_tool\_dependencies](vcpkg_copy_tool_dependencies.md) +- [vcpkg\_copy\_tools](vcpkg_copy_tools.md) +- [vcpkg\_download\_distfile](vcpkg_download_distfile.md) +- [vcpkg\_execute\_build\_process](vcpkg_execute_build_process.md) +- [vcpkg\_execute\_in\_download\_mode](vcpkg_execute_in_download_mode.md) +- [vcpkg\_execute\_required\_process](vcpkg_execute_required_process.md) +- [vcpkg\_execute\_required\_process\_repeat](vcpkg_execute_required_process_repeat.md) +- [vcpkg\_extract\_source\_archive](vcpkg_extract_source_archive.md) +- [vcpkg\_extract\_source\_archive\_ex](vcpkg_extract_source_archive_ex.md) +- [vcpkg\_fail\_port\_install](vcpkg_fail_port_install.md) (deprecated) +- [vcpkg\_find\_acquire\_program](vcpkg_find_acquire_program.md) +- [vcpkg\_find\_fortran](vcpkg_find_fortran.md) +- [vcpkg\_fixup\_cmake\_targets](vcpkg_fixup_cmake_targets.md) (deprecated, use [vcpkg\_cmake\_config\_fixup](ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md)) +- [vcpkg\_fixup\_pkgconfig](vcpkg_fixup_pkgconfig.md) +- [vcpkg\_from\_bitbucket](vcpkg_from_bitbucket.md) +- [vcpkg\_from\_git](vcpkg_from_git.md) +- [vcpkg\_from\_github](vcpkg_from_github.md) +- [vcpkg\_from\_gitlab](vcpkg_from_gitlab.md) +- [vcpkg\_from\_sourceforge](vcpkg_from_sourceforge.md) +- [vcpkg\_get\_program\_files\_platform\_bitness](vcpkg_get_program_files_platform_bitness.md) +- [vcpkg\_get\_windows\_sdk](vcpkg_get_windows_sdk.md) +- [vcpkg\_host\_path\_list](vcpkg_host_path_list.md) +- [vcpkg\_install\_cmake](vcpkg_install_cmake.md) (deprecated, use [vcpkg\_cmake\_install](ports/vcpkg-cmake/vcpkg_cmake_install.md)) +- [vcpkg\_install\_gn](vcpkg_install_gn.md) (deprecated, use [vcpkg\_gn\_install](ports/vcpkg-gn/vcpkg_gn_install.md)) +- [vcpkg\_install\_make](vcpkg_install_make.md) +- [vcpkg\_install\_meson](vcpkg_install_meson.md) +- [vcpkg\_install\_msbuild](vcpkg_install_msbuild.md) +- [vcpkg\_install\_nmake](vcpkg_install_nmake.md) +- [vcpkg\_install\_qmake](vcpkg_install_qmake.md) +- [vcpkg\_list](vcpkg_list.md) +- [vcpkg\_minimum\_required](vcpkg_minimum_required.md) +- [vcpkg\_replace\_string](vcpkg_replace_string.md) + +## Internal Functions + +- [z\_vcpkg\_apply\_patches](internal/z_vcpkg_apply_patches.md) +- [z\_vcpkg\_forward\_output\_variable](internal/z_vcpkg_forward_output_variable.md) +- [z\_vcpkg\_function\_arguments](internal/z_vcpkg_function_arguments.md) +- [z\_vcpkg\_get\_cmake\_vars](internal/z_vcpkg_get_cmake_vars.md) +- [z\_vcpkg\_prettify\_command\_line](internal/z_vcpkg_prettify_command_line.md) +- [z\_vcpkg\_setup\_pkgconfig\_path](internal/z_vcpkg_setup_pkgconfig_path.md) + +## Scripts from Ports + +### [vcpkg-cmake](ports/vcpkg-cmake.md) + +- [vcpkg\_cmake\_build](ports/vcpkg-cmake/vcpkg_cmake_build.md) +- [vcpkg\_cmake\_configure](ports/vcpkg-cmake/vcpkg_cmake_configure.md) +- [vcpkg\_cmake\_install](ports/vcpkg-cmake/vcpkg_cmake_install.md) + +### [vcpkg-gn](ports/vcpkg-gn.md) + +- [vcpkg\_gn\_configure](ports/vcpkg-gn/vcpkg_gn_configure.md) +- [vcpkg\_gn\_install](ports/vcpkg-gn/vcpkg_gn_install.md) + +### [vcpkg-cmake-config](ports/vcpkg-cmake-config.md) + +- [vcpkg\_cmake\_config\_fixup](ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md) + +### [vcpkg-cmake-get-vars](ports/vcpkg-cmake-get-vars.md) + +- [vcpkg\_cmake\_get\_vars](ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.md) + +### [vcpkg-pkgconfig-get-modules](ports/vcpkg-pkgconfig-get-modules.md) + +- [x\_vcpkg\_pkgconfig\_get\_modules](ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.md) + +### [vcpkg-get-python-packages](ports/vcpkg-get-python-packages.md) + +- [x\_vcpkg\_get\_python\_packages](ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.md) + +### [vcpkg-qmake](ports/vcpkg-qmake.md) + +- [vcpkg\_qmake\_configure](ports/vcpkg-qmake/vcpkg_qmake_configure.md) diff --git a/externals/vcpkg/docs/maintainers/ports/vcpkg-cmake-config.md b/externals/vcpkg/docs/maintainers/ports/vcpkg-cmake-config.md new file mode 100755 index 000000000..18e7bb9ac --- /dev/null +++ b/externals/vcpkg/docs/maintainers/ports/vcpkg-cmake-config.md @@ -0,0 +1,10 @@ +# vcpkg-cmake-config + +`vcpkg-cmake-config` provides `vcpkg_cmake_config_fixup()`, +a function which both: + +- Fixes common mistakes in port build systems, like using absolute paths +- Merges the debug and release config files. + +This function should almost always be used when a port has `*config.cmake` files, +even when the buildsystem of the project is not CMake. diff --git a/externals/vcpkg/docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md b/externals/vcpkg/docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md new file mode 100755 index 000000000..469e0b197 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md @@ -0,0 +1,54 @@ +# vcpkg_cmake_config_fixup + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md). + +Merge release and debug CMake targets and configs to support multiconfig generators. + +Additionally corrects common issues with targets, such as absolute paths and incorrectly placed binaries. + +```cmake +vcpkg_cmake_config_fixup( + [PACKAGE_NAME ] + [CONFIG_PATH ] + [TOOLS_PATH ] + [DO_NOT_DELETE_PARENT_CONFIG_PATH] + [NO_PREFIX_CORRECTION] +) +``` + +For many ports, `vcpkg_cmake_config_fixup()` on its own should work, +as `PACKAGE_NAME` defaults to `${PORT}` and `CONFIG_PATH` defaults to `share/${PACKAGE_NAME}`. +For ports where the package name passed to `find_package` is distinct from the port name, +`PACKAGE_NAME` should be changed to be that name instead. +For ports where the directory of the `*config.cmake` files cannot be set, +use the `CONFIG_PATH` to change the directory where the files come from. + +By default the parent directory of CONFIG_PATH is removed if it is named "cmake". +Passing the `DO_NOT_DELETE_PARENT_CONFIG_PATH` option disable such behavior, +as it is convenient for ports that install +more than one CMake package configuration file. + +The `NO_PREFIX_CORRECTION` option disables the correction of `_IMPORT_PREFIX` +done by vcpkg due to moving the config files. +Currently the correction does not take into account how the files are moved, +and applies a rather simply correction which in some cases will yield the wrong results. + +## How it Works + +1. Moves `/debug//*targets-debug.cmake` to `/share/${PACKAGE_NAME}`. +2. Transforms all references matching `/bin/*.exe` to `/${TOOLS_PATH}/*.exe` on Windows. +3. Transforms all references matching `/bin/*` to `/${TOOLS_PATH}/*` on other platforms. +4. Fixes `${_IMPORT_PREFIX}` in auto generated targets. +5. Replaces `${CURRENT_INSTALLED_DIR}` with `${_IMPORT_PREFIX}` in configs. +6. Merges INTERFACE_LINK_LIBRARIES of release and debug configurations. +7. Replaces `${CURRENT_INSTALLED_DIR}` with `${VCPKG_IMPORT_PREFIX}` in targets. +8. Removes `/debug//*config.cmake`. + +## Examples + +* [concurrentqueue](https://github.com/Microsoft/vcpkg/blob/master/ports/concurrentqueue/portfile.cmake) +* [curl](https://github.com/Microsoft/vcpkg/blob/master/ports/curl/portfile.cmake) +* [nlohmann-json](https://github.com/Microsoft/vcpkg/blob/master/ports/nlohmann-json/portfile.cmake) + +## Source +[ports/vcpkg-cmake-config/vcpkg\_cmake\_config\_fixup.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake) diff --git a/externals/vcpkg/docs/maintainers/ports/vcpkg-cmake-get-vars.md b/externals/vcpkg/docs/maintainers/ports/vcpkg-cmake-get-vars.md new file mode 100755 index 000000000..4881c8218 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/ports/vcpkg-cmake-get-vars.md @@ -0,0 +1,3 @@ +# vcpkg-cmake-get-vars + +This port contains a helper function to extract CMake variables into the scope of the portfile or other scripts diff --git a/externals/vcpkg/docs/maintainers/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.md b/externals/vcpkg/docs/maintainers/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.md new file mode 100755 index 000000000..a9d4a82b5 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.md @@ -0,0 +1,41 @@ +# vcpkg_cmake_get_vars + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.md). + +Runs a cmake configure with a dummy project to extract certain cmake variables + +## Usage +```cmake +vcpkg_cmake_get_vars() +``` + +`vcpkg_cmake_get_vars()` sets `` to +a path to a generated CMake file, with the detected `CMAKE_*` variables +re-exported as `VCPKG_DETECTED_CMAKE_*`. + +Additionally sets, for `RELEASE` and `DEBUG`: +- VCPKG_COMBINED_CXX_FLAGS_ +- VCPKG_COMBINED_C_FLAGS_ +- VCPKG_COMBINED_SHARED_LINKER_FLAGS_ +- VCPKG_COMBINED_STATIC_LINKER_FLAGS_ +- VCPKG_COMBINED_EXE_LINKER_FLAGS_ + +Most users should use these pre-combined flags instead of attempting +to read the `VCPKG_DETECTED_*` flags directly. + +## Notes +Avoid usage in portfiles. + +All calls to `vcpkg_cmake_get_vars` will result in the same output file; +the output file is not generated multiple times. + +### Basic Usage + +```cmake +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") +message(STATUS "detected CXX flags: ${VCPKG_DETECTED_CMAKE_CXX_FLAGS}") +``` + +## Source +[ports/vcpkg-cmake-get-vars/vcpkg\_cmake\_get\_vars.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.cmake) diff --git a/externals/vcpkg/docs/maintainers/ports/vcpkg-cmake.md b/externals/vcpkg/docs/maintainers/ports/vcpkg-cmake.md new file mode 100755 index 000000000..b84c58869 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/ports/vcpkg-cmake.md @@ -0,0 +1,7 @@ +# vcpkg-cmake + +This port contains cmake functions for dealing with a CMake buildsystem. + +In the common case, `vcpkg_cmake_configure()` (with appropriate arguments) +followed by `vcpkg_cmake_install()` will be enough to build and install a port. +`vcpkg_cmake_build()` is provided for more complex cases. diff --git a/externals/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_build.md b/externals/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_build.md new file mode 100755 index 000000000..b8f9c3b8a --- /dev/null +++ b/externals/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_build.md @@ -0,0 +1,38 @@ +# vcpkg_cmake_build + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_build.md). + +Build a cmake project. + +```cmake +vcpkg_cmake_build( + [TARGET ] + [LOGFILE_BASE ] + [DISABLE_PARALLEL] + [ADD_BIN_TO_PATH] +) +``` + +`vcpkg_cmake_build` builds an already-configured cmake project. +You can use the alias [`vcpkg_cmake_install()`] function +if your CMake build system supports the `install` TARGET, +and this is something we recommend doing whenever possible. +Otherwise, you can use `TARGET` to set the target to build. +This function defaults to not passing a target to cmake. + +[`vcpkg_cmake_install()`]: vcpkg_cmake_install.md + +`LOGFILE_BASE` is used to set the base of the logfile names; +by default, this is `build`, and thus the logfiles end up being something like +`build-x86-windows-dbg.log`; if you use `vcpkg_cmake_install`, +this is set to `install`, so you'll get log names like `install-x86-windows-dbg.log`. + +For build systems that are buggy when run in parallel, +using `DISABLE_PARALLEL` will run the build with only one job. + +Finally, `ADD_BIN_TO_PATH` adds the appropriate (either release or debug) +`bin/` directories to the path during the build, +such that executables run during the build will be able to access those DLLs. + +## Source +[ports/vcpkg-cmake/vcpkg\_cmake\_build.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake/vcpkg_cmake_build.cmake) diff --git a/externals/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md b/externals/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md new file mode 100755 index 000000000..fd84c2529 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md @@ -0,0 +1,93 @@ +# vcpkg_cmake_configure + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md). + +Configure a CMake buildsystem. + +```cmake +vcpkg_cmake_configure( + SOURCE_PATH + [LOGFILE_BASE ] + [DISABLE_PARALLEL_CONFIGURE] + [NO_CHARSET_FLAG] + [WINDOWS_USE_MSBUILD] + [GENERATOR ] + [OPTIONS + ...] + [OPTIONS_RELEASE + ...] + [OPTIONS_DEBUG + ...] + [MAYBE_UNUSED_VARIABLES + ...] +) +``` + +`vcpkg_cmake_configure` configures a CMake build system for use with +`vcpkg_cmake_buildsystem_build` and `vcpkg_cmake_buildsystem_install`. +`source-path` is where the source is located; by convention, +this is usually `${SOURCE_PATH}`, which is set by one of the `vcpkg_from_*` functions. +This function configures the build system for both Debug and Release builds by default, +assuming that `VCPKG_BUILD_TYPE` is not set; if it is, then it will only configure for +that build type. + +Use the `OPTIONS` argument to set the configure settings for both release and debug, +and use `OPTIONS_RELEASE` and `OPTIONS_DEBUG` to set the configure settings for +release only and debug only respectively. + +By default, when possible, `vcpkg_cmake_configure` uses [ninja-build] +as its build system. If the `WINDOWS_USE_MSBUILD` argument is passed, then +`vcpkg_cmake_configure` will use a Visual Studio generator on Windows; +on every other platform, `vcpkg_cmake_configure` just uses Ninja. + +[ninja-build]: https://ninja-build.org/ + +Additionally, one may pass the specific generator a port should use with `GENERATOR`. +This is useful if some project-specific buildsystem +has been wrapped in a CMake build system that doesn't perform an actual build. +If used for this purpose, it should be set to `"NMake Makefiles"`. +`vcpkg_cmake_buildsystem_build` and `install` do not support this being set to anything +except for NMake. + +For libraries which cannot be configured in parallel, +pass the `DISABLE_PARALLEL_CONFIGURE` flag. This is needed, for example, +if the library's build system writes back into the source directory during configure. +This also disables the `CMAKE_DISABLE_SOURCE_CHANGES` option. + +By default, this function adds flags to `CMAKE_C_FLAGS` and `CMAKE_CXX_FLAGS` +which set the default character set to utf-8 for MSVC. +If the library sets its own code page, pass the `NO_CHARSET_FLAG` option. + +This function makes certain that all options passed in are used by the +underlying CMake build system. If there are options that might be unused, +perhaps on certain platforms, pass those variable names to +`MAYBE_UNUSED_VARIABLES`. For example: +```cmake +vcpkg_cmake_configure( + ... + OPTIONS + -DBUILD_EXAMPLE=OFF + ... + MAYBE_UNUSED_VARIABLES + BUILD_EXAMPLE +) +``` + +`LOGFILE_BASE` is used to set the base of the logfile names; +by default, this is `config`, and thus the logfiles end up being something like +`config-x86-windows-dbg.log`. You can set it to anything you like; +if you set it to `config-the-first`, +you'll get something like `config-the-first-x86-windows.dbg.log`. + +## Notes +This command supplies many common arguments to CMake. To see the full list, examine the source. + +## Examples + +* [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) +* [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) +* [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake) +* [opencv4](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv4/portfile.cmake) + +## Source +[ports/vcpkg-cmake/vcpkg\_cmake\_configure.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake) diff --git a/externals/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md b/externals/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md new file mode 100755 index 000000000..1d708d3a1 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md @@ -0,0 +1,25 @@ +# vcpkg_cmake_install + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md). + +Build and install a cmake project. + +```cmake +vcpkg_cmake_install( + [DISABLE_PARALLEL] + [ADD_BIN_TO_PATH] +) +``` + +`vcpkg_cmake_install` transparently forwards to [`vcpkg_cmake_build()`], +with additional parameters to set the `TARGET` to `install`, +and to set the `LOGFILE_ROOT` to `install` as well. + +[`vcpkg_cmake_build()`]: vcpkg_cmake_build.md + +## Examples: + +* [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) + +## Source +[ports/vcpkg-cmake/vcpkg\_cmake\_install.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake/vcpkg_cmake_install.cmake) diff --git a/externals/vcpkg/docs/maintainers/ports/vcpkg-get-python-packages.md b/externals/vcpkg/docs/maintainers/ports/vcpkg-get-python-packages.md new file mode 100755 index 000000000..8061d05d9 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/ports/vcpkg-get-python-packages.md @@ -0,0 +1,6 @@ +# vcpkg-get-python-packages + +**Experimental: will change or be removed at any time** + +`vcpkg-get-python-packages` provides `x_vcpkg_get_python_packages()`, a function which simplifies getting +python packages. diff --git a/externals/vcpkg/docs/maintainers/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.md b/externals/vcpkg/docs/maintainers/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.md new file mode 100755 index 000000000..26d57e4fa --- /dev/null +++ b/externals/vcpkg/docs/maintainers/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.md @@ -0,0 +1,38 @@ +# x_vcpkg_get_python_packages + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.md). + +Experimental +Retrieve needed python packages + +## Usage +```cmake +x_vcpkg_get_python_packages( + [PYTHON_VERSION (2|3)] + PYTHON_EXECUTABLE + REQUIREMENTS_FILE + PACKAGES ... + [OUT_PYTHON_VAR somevar] +) +``` +## Parameters + +### PYTHON_VERSION +Python version to be used. Either 2 or 3 + +### PYTHON_EXECUTABLE +Full path to the python executable + +### REQUIREMENTS_FILE +Requirement file with the list of python packages + +### PACKAGES +List of python packages to acquire + +### OUT_PYTHON_VAR +Variable to store the path to the python binary inside the virtual environment + + + +## Source +[ports/vcpkg-get-python-packages/x\_vcpkg\_get\_python\_packages.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake) diff --git a/externals/vcpkg/docs/maintainers/ports/vcpkg-gn.md b/externals/vcpkg/docs/maintainers/ports/vcpkg-gn.md new file mode 100755 index 000000000..21c440dd8 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/ports/vcpkg-gn.md @@ -0,0 +1,12 @@ +# vcpkg-gn + +This port contains cmake functions for dealing with a GN buildsystem. + +## Example + +```cmake +vcpkg_gn_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_gn_install() +``` diff --git a/externals/vcpkg/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_configure.md b/externals/vcpkg/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_configure.md new file mode 100755 index 000000000..da9326a81 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_configure.md @@ -0,0 +1,32 @@ +# vcpkg_gn_configure + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_configure.md). + +Generate Ninja (GN) targets + +## Usage: +```cmake +vcpkg_gn_configure( + SOURCE_PATH + [OPTIONS ] + [OPTIONS_DEBUG ] + [OPTIONS_RELEASE ] +) +``` + +## Parameters: +### SOURCE_PATH (required) +The path to the GN project. + +### OPTIONS +Options to be passed to both the debug and release targets. +Note: Must be provided as a space-separated string. + +### OPTIONS_DEBUG (space-separated string) +Options to be passed to the debug target. + +### OPTIONS_RELEASE (space-separated string) +Options to be passed to the release target. + +## Source +[ports/vcpkg-gn/vcpkg\_gn\_configure.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-gn/vcpkg_gn_configure.cmake) diff --git a/externals/vcpkg/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_install.md b/externals/vcpkg/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_install.md new file mode 100755 index 000000000..e520fcc96 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_install.md @@ -0,0 +1,29 @@ +# vcpkg_gn_install + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_install.md). + +Installs a GN project. + +In order to build a GN project without installing, use [`vcpkg_build_ninja()`]. + +## Usage: +```cmake +vcpkg_gn_install( + SOURCE_PATH + [TARGETS ...] +) +``` + +## Parameters: +### SOURCE_PATH +The path to the source directory + +### TARGETS +Only install the specified targets. + +Note: includes must be handled separately + +[`vcpkg_build_ninja()`]: vcpkg_build_ninja.md + +## Source +[ports/vcpkg-gn/vcpkg\_gn\_install.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-gn/vcpkg_gn_install.cmake) diff --git a/externals/vcpkg/docs/maintainers/ports/vcpkg-pkgconfig-get-modules.md b/externals/vcpkg/docs/maintainers/ports/vcpkg-pkgconfig-get-modules.md new file mode 100755 index 000000000..ac99412c2 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/ports/vcpkg-pkgconfig-get-modules.md @@ -0,0 +1,6 @@ +# vcpkg-pkgconfig-get-modules + +**Experimental: will change or be removed at any time** + +`vcpkg-pkgconfig-get-modules` provides `x_vcpkg_pkgconfig_get_modules()`, a function which simplifies calling +`pkg-config` in portfiles in order to gather dependencies for exotic buildsystems. diff --git a/externals/vcpkg/docs/maintainers/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.md b/externals/vcpkg/docs/maintainers/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.md new file mode 100755 index 000000000..1dbcf37e0 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.md @@ -0,0 +1,45 @@ +# x_vcpkg_pkgconfig_get_modules + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.md). + +Experimental +Retrieve required module information from pkgconfig modules + +## Usage +```cmake +x_vcpkg_pkgconfig_get_modules( + PREFIX + MODULES ... + [CFLAGS] + [LIBS] + [LIBRARIES] + [LIBRARIES_DIRS] + [INCLUDE_DIRS] +) +``` +## Parameters + +### PREFIX +Used variable prefix to use + +### MODULES +List of pkgconfig modules to retrieve information for. + +### LIBS +Returns `"${PKGCONFIG}" --libs` in _LIBS_(DEBUG|RELEASE) + +### LIBRARIES +Returns `"${PKGCONFIG}" --libs-only-l` in _LIBRARIES_(DEBUG|RELEASE) + +### LIBRARIES_DIRS +Returns `"${PKGCONFIG}" --libs-only-L` in _LIBRARIES_DIRS_(DEBUG|RELEASE) + +### INCLUDE_DIRS +Returns `"${PKGCONFIG}" --cflags-only-I` in _INCLUDE_DIRS_(DEBUG|RELEASE) + +## Examples + +* [qt5-base](https://github.com/microsoft/vcpkg/blob/master/ports/qt5-base/portfile.cmake) + +## Source +[ports/vcpkg-pkgconfig-get-modules/x\_vcpkg\_pkgconfig\_get\_modules.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake) diff --git a/externals/vcpkg/docs/maintainers/ports/vcpkg-qmake.md b/externals/vcpkg/docs/maintainers/ports/vcpkg-qmake.md new file mode 100755 index 000000000..fe5050ec3 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/ports/vcpkg-qmake.md @@ -0,0 +1,7 @@ +# vcpkg-qmake + +This port contains qmake functions for dealing with a QMake buildsystem. + +In the common case, `vcpkg_qmake_configure()` (with appropriate arguments) +followed by `vcpkg_install_qmake()` will be enough to build and install a port. + diff --git a/externals/vcpkg/docs/maintainers/ports/vcpkg-qmake/vcpkg_qmake_configure.md b/externals/vcpkg/docs/maintainers/ports/vcpkg-qmake/vcpkg_qmake_configure.md new file mode 100755 index 000000000..413042657 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/ports/vcpkg-qmake/vcpkg_qmake_configure.md @@ -0,0 +1,36 @@ +# vcpkg_qmake_configure + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-qmake/vcpkg_qmake_configure.md). + +Configure a qmake-based project. + +###User setable triplet variables: +VCPKG_OSX_DEPLOYMENT_TARGET: Determines QMAKE_MACOSX_DEPLOYMENT_TARGET +VCPKG_QMAKE_COMMAND: Path to qmake. (default: "${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/qmake${VCPKG_HOST_EXECUTABLE_SUFFIX}") +VCPKG_QT_CONF_(RELEASE|DEBUG): Path to qt.config being used for RELEASE/DEBUG. (default: "${CURRENT_INSTALLED_DIR}/tools/Qt6/qt_(release|debug).conf") +VCPKG_QMAKE_OPTIONS(_RELEASE|_DEBUG)?: Extra options to pass to QMake + +```cmake +vcpkg_qmake_configure( + SOURCE_PATH + [QMAKE_OPTIONS arg1 [arg2 ...]] + [QMAKE_OPTIONS_RELEASE arg1 [arg2 ...]] + [QMAKE_OPTIONS_DEBUG arg1 [arg2 ...]] + [OPTIONS arg1 [arg2 ...]] + [OPTIONS_RELEASE arg1 [arg2 ...]] + [OPTIONS_DEBUG arg1 [arg2 ...]] +) +``` + +### SOURCE_PATH +The path to the *.pro qmake project file. + +### QMAKE_OPTIONS, QMAKE_OPTIONS\_RELEASE, QMAKE_OPTIONS\_DEBUG +options directly passed to qmake with the form QMAKE_X=something or CONFIG=something + +### OPTIONS, OPTIONS\_RELEASE, OPTIONS\_DEBUG +The options passed after -- to qmake. + + +## Source +[ports/vcpkg-qmake/vcpkg\_qmake\_configure.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-qmake/vcpkg_qmake_configure.cmake) diff --git a/externals/vcpkg/docs/maintainers/pr-review-checklist.md b/externals/vcpkg/docs/maintainers/pr-review-checklist.md new file mode 100755 index 000000000..05baaa58e --- /dev/null +++ b/externals/vcpkg/docs/maintainers/pr-review-checklist.md @@ -0,0 +1,115 @@ +Vcpkg PR Checklist +===================== +Revision: 1 + +## Overview +This document provides an annotated checklist which vcpkg team members use to apply the "reviewed" label on incoming pull requests. If a pull request violates any of these points, we may ask contributors to make necessary changes before we can merge the changeset. + +Feel free to create an issue or pull request if you feel that this checklist can be improved. Please increment the revision number when modifying the checklist content. + +## Checklist +You can link any of these checklist items in a GitHub comment by copying the link address attached to each item code. + +
+c000001: No deprecated helper functions are used + +See our [Maintainer Guidelines and Policies](maintainer-guide.md#avoid-deprecated-helper-functions) for more information. + +
+ +
+c000002: `"port-version"` field is updated + +See our [Maintainer Guidelines and Policies](maintainer-guide.md#versioning) for more information. + +
+ +
+c000003: New ports contain a `"description"` field written in English + +A description only one or a few sentences long is helpful. Consider using the library's official description from their `README.md` or similar if possible. Automatic translations are acceptable and we are happy to clean up translations to English for our contributors. + +See our [manifest file documentation](manifest-files.md#description) for more information. + +
+ +
+c000004: No unnecessary comments are present in the changeset + +See our [Maintainer Guidelines and Policies](maintainer-guide.md#avoid-excessive-comments-in-portfiles) for more information. + +
+ +
+c000005: Downloaded archives are versioned if available + +
+c000006: New ports pass CI checks for triplets that the library officially supports + +To ensure vcpkg ports are of a high quality, we ask that incoming ports support the official platforms for the library in question. + +
+ +
+c000007: Patches fix issues that are vcpkg-specific only + +If possible, patches to the library source code should be upstreamed to the library's official repository. Opening up a pull request on the library's repository will help to improve the library for everyone, not just vcpkg users. + +
+ +
+c000008: New ports download source code from the official source if available + +To respect library authors and keep code secure, please have ports download source code from the official source. We may make exceptions if the original source code is not available and there is substantial community interest in maintaining the library in question. + +
+ +
+c000009: Ports and port features are named correctly + +For user accessibility, we prefer names of ports and port features to be intuitive and close to their counterparts in official sources and other package managers. If you are unsure about the naming of a port or port feature, we recommend checking repology.org, packages.ubuntu.com, or searching for additional information using a search engine. We can also help our contributors with this, so feel free to ask for naming suggestions if you are unsure. + +
+ +
+c000010: Library targets are exported when appropriate + +To provide users with a seamless build system integration, please be sure to export and provide a means of finding the library targets intended to be used downstream. Targets not meant to be exported should be be marked private and not exported. + +
+ +
+c000011: Ports do not use applications which modify the user's system + +Ports should uphold vcpkg's contract of not modifying the user's system by avoiding applications which do so. Examples of these applications are `sudo`, `apt`, `brew`, or `pip`. Please use an alternative to these types of programs wherever possible. + +
+ +
+c000012: Ports with system dependencies include an information message during installation + +Some ports have library and tool dependencies that do not exist within vcpkg. For these missing dependencies, we ask that contributors add a message to the top of the port's `portfile.cmake` stating the missing dependencies and how to acquire them. We ask that the message is displayed before any major work is done to ensure that users can "early out" of the installation process as soon as possible in case they are missing the dependency. + +Example: +```cmake +message( +"${PORT} currently requires the following libraries from the system package manager: + autoconf libtool +These can be installed on Ubuntu systems via sudo apt install autoconf libtool" +) +``` + +
+ +
+c000013: Manifest files are used instead of CONTROL files for new ports + +Many existing ports use the CONTROL file syntax; while this syntax will be supported for some time to come, +new ports should not use these. Any newly added port _must_ use the manifest files. + +We also recommend, when significant modifications are made to ports, that one switches to manifest files; +however, this is not required. You may find `vcpkg format-manifest` useful. diff --git a/externals/vcpkg/docs/maintainers/registries.md b/externals/vcpkg/docs/maintainers/registries.md new file mode 100755 index 000000000..18c54a447 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/registries.md @@ -0,0 +1,365 @@ +# Creating Registries + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/maintainers/registries.md).** + +There are two parts to using registries; this documents the creation side of +the relationship. In order to learn more about using registries that others +have created, please read [this documentation](../users/registries.md). +## Table of Contents + +- [Creating Registries](#creating-registries) + - [Table of Contents](#table-of-contents) + - [Overview](#overview) + - [Git Registries](#git-registries) + - [Adding a New Version](#adding-a-new-version) + - [Filesystem Registries](#filesystem-registries) + - [Adding a New Version](#adding-a-new-version-1) + - [Builtin Registries](#builtin-registries) + +## Overview + +Registries are collections of ports and their versions. There are two major +choices of implementation for registries, if you want to create your own - +git registries, and filesystem registries. + +Git registries are simple git repositories, and can be shared publicly or +privately via normal mechanisms for git repositories. The vcpkg repository at +, for example, is a git registry. + +Filesystem registries are designed as more of a testing ground. Given that they +literally live on your filesystem, the only way to share them is via shared +directories. However, filesystem registries can be useful as a way to represent +registries held in non-git version control systems, assuming one has some way +to get the registry onto the disk. + +Note that we expect the set of registry types to grow over time; if you would +like support for registries built in your favorite public version control +system, don't hesitate to open a PR. + +The basic structure of a registry is: + +- The set of versions that are considered "latest" at certain times in history, + known as the "baseline". +- The set of all the versions of all the ports, and where to find each of + these in the registry. + +### Git Registries + +As you're following along with this documentation, it may be helpful to have +a working example to refer to. We've written one and put it here: +. + +All git registries must have a `versions/baseline.json` file. This file +contains the set of "latest versions" at a certain commit. It is laid out as +a top-level object containing only the `"default"` field. This field should +contain an object mapping port names to the version which is currently the +latest. + +Here's an example of a valid baseline.json: + +```json +{ + "default": { + "kitten": { + "baseline": "2.6.2", + "port-version": 0 + }, + "port-b": { + "baseline": "19.00", + "port-version": 2 + } + } +} +``` + +The `versions` directory contains all the information about which versions of +which packages are contained in the registry, along with where those versions +are stored. The rest of the registry just acts as a backing store, as far as +vcpkg is concerned: only things inside the `versions` directory will be used +to direct how your registry is seen by vcpkg. + +Each port in a registry should exist in the versions directory as +`-/.json`; in other words, the +information about the `kitten` port would be located in +`versions/k-/kitten.json`. This should be a top-level object with only a +single field: `"versions"`. This field should contain an array of version +objects: + +- The version of the port in question; should be exactly the same as the + `vcpkg.json` file, including the version fields and `"port-version"`. +- The `"git-tree"` field, which is a git tree; in other words, what you get + when you write `git rev-parse COMMIT-ID:path/to/port`. + +Note that the version fields for ports with `CONTROL` files, is +`"version-string"`; we do not recommend using `CONTROL` files in new +registries, however. + +_WARNING_: One very important part of registries is that versions should +_never_ be changed. Updating to a later ref should never remove or change an +existing version. It must always be safe to update a registry. + +Here's an example of a valid version database for a `kitten` port with one +version: + +```json +{ + "versions": [ + { + "version": "2.6.2", + "port-version": 0, + "git-tree": "67d60699c271b7716279fdea5a5c6543929eb90e" + } + ] +} +``` + +In general, it's not important where you place port directories. However, the +idiom in vcpkg is to follow what the built in vcpkg registry does: your +`kitten` port should be placed in `ports/kitten`. + +_WARNING_: One other thing to keep in mind is that when you update a registry, +all previous versions should also be accessible. Since your user will set their +baseline to a commit ID, that commit ID must always exist, and be accessible +from your HEAD commit, which is what is actually fetched. This means that your +HEAD commit should be a child of all previous HEAD commits. + +### Builtin Registries + +Builtin registries are treated as special Git registries. Instead of fetching +from a remote url, builtin registries consult the `$VCPKG_ROOT/.git` directory +of the vcpkg clone. They use the currently checked out `$VCPKG_ROOT/versions` +directory as the source for versioning information. + +#### Adding a New Version + +There is some git trickery involved in creating a new version of a port. The +first thing to do is make some changes, update the `"port-version"` and regular +version field as you need to, and then test with `overlay-ports`: +`vcpkg install kitten --overlay-ports=ports/kitten`. + +Once you've finished your testing, you'll need to make sure that the directory +as it is is under git's purview. You'll do this by creating a temporary commit: + +```pwsh +> git add ports/kitten +> git commit -m 'temporary commit' +``` + +Then, get the git tree ID of the directory: + +```pwsh +> git rev-parse HEAD:ports/kitten +73ad3c823ef701c37421b450a34271d6beaf7b07 +``` + +Then, you can add this version to the versions database. At the top of your +`versions/k-/kitten.json`, you can add (assuming you're adding version +`2.6.3#0`): + +```json +{ + "versions": [ + { + "version": "2.6.3", + "port-version": 0, + "git-tree": "73ad3c823ef701c37421b450a34271d6beaf7b07" + }, + { + "version": "2.6.2", + "port-version": 0, + "git-tree": "67d60699c271b7716279fdea5a5c6543929eb90e" + } + ] +} +``` + +then, you'll want to modify your `versions/baseline.json` with your new version +as well: + +```json +{ + "default": { + "kitten": { + "baseline": "2.6.3", + "port-version": 0 + }, + "port-b": { + "baseline": "19.00", + "port-version": 2 + } + } +} +``` + +and amend your current commit: + +```pwsh +> git commit --amend +``` + +then share away! + +### Filesystem Registries + +As you're following along with this documentation, it may be helpful to have +a working example to refer to. We've written one and put it here: +. + +All filesystem registries must have a `versions/baseline.json` file. This file +contains the set of "latest versions" for a certain version of the registry. +It is laid out as a top-level object containing a map from version name to +"baseline objects", which map port names to the version which is considered +"latest" for that version of the registry. + +Filesystem registries need to decide on a versioning scheme. Unlike git +registries, which have the implicit versioning scheme of refs, filesystem +registries can't rely on the version control system here. One possible option +is to do a daily release, and have your "versions" be dates. + +_WARNING_: A baseline must always refer to the same set of versions. If you +want to add new versions, you need to create a new version of the registry in +the `baseline.json` file. + +Here's an example of a valid `baseline.json`, for a registry that has decided +upon dates for their versions: + +```json +{ + "2021-04-16": { + "kitten": { + "baseline": "2.6.2", + "port-version": 0 + }, + "port-b": { + "baseline": "19.00", + "port-version": 2 + } + }, + "2021-04-15": { + "kitten": { + "baseline": "2.6.2", + "port-version": 0 + }, + "port-b": { + "baseline": "19.00", + "port-version": 1 + } + } +} +``` + +The `versions` directory contains all the information about which versions of +which packages are contained in the registry, along with where those versions +are stored. The rest of the registry just acts as a backing store, as far as +vcpkg is concerned: only things inside the `versions` directory will be used +to direct how your registry is seen by vcpkg. + +Each port in a registry should exist in the versions directory as +`-/.json`; in other words, the +information about the `kitten` port would be located in +`versions/k-/kitten.json`. This should be a top-level object with only a +single field: `"versions"`. This field should contain an array of version +objects: + +- The version of the port in question; should be exactly the same as the + `vcpkg.json` file, including the version fields and `"port-version"`. +- The `"path"` field: a relative directory, rooted at the base of the registry + (in other words, the directory where `versions` is located), to the port + directory. It should look something like `"$/path/to/port/dir`" + +Note that the version fields for ports with `CONTROL` files, is +`"version-string"`; we do not recommend using `CONTROL` files in new +registries, however. + +In general, it's not important where you place port directories. However, the +idiom in vcpkg is to follow somewhat closely to what the built in vcpkg +registry does: your `kitten` port at version `x.y.z` should be placed in +`ports/kitten/x.y.z`, with port versions appended as you see fit (although +since `#` is not a good character to use for file names, perhaps use `_`). + +_WARNING_: One very important part of registries is that versions should +_never_ be changed. One should never remove or change an existing version. +Your changes to your registry shouldn't change behavior to downstream users. + +Here's an example of a valid version database for a `kitten` port with one +version: + +```json +{ + "versions": [ + { + "version": "2.6.2", + "port-version": 0, + "path": "$/ports/kitten/2.6.2_0" + } + ] +} +``` + +#### Adding a New Version + +Unlike git registries, adding a new version to a filesystem registry mostly +involves a lot of copying. The first thing to do is to copy the latest +version of your port into a new version directory, update the version and +`"port-version"` fields as you need to, and then test with `overlay-ports`: +`vcpkg install kitten --overlay-ports=ports/kitten/new-version`. + +Once you've finished your testing, you can add this new version to the top of +your `versions/k-/kitten.json`: + +```json +{ + "versions": [ + { + "version": "2.6.3", + "port-version": 0, + "path": "$/ports/kitten/2.6.3_0" + }, + { + "version": "2.6.2", + "port-version": 0, + "path": "$/ports/kitten/2.6.2_0" + } + ] +} +``` + +then, you'll want to modify your `versions/baseline.json` with your new version +as well (remember not to modify existing baselines): + +```json +{ + "2021-04-17": { + "kitten": { + "baseline": "2.6.3", + "port-version": 0 + }, + "port-b": { + "baseline": "19.00", + "port-version": 2 + } + }, + "2021-04-16": { + "kitten": { + "baseline": "2.6.2", + "port-version": 0 + }, + "port-b": { + "baseline": "19.00", + "port-version": 2 + } + }, + "2021-04-15": { + "kitten": { + "baseline": "2.6.2", + "port-version": 0 + }, + "port-b": { + "baseline": "19.00", + "port-version": 1 + } + } +} +``` + +and you're done! diff --git a/externals/vcpkg/docs/maintainers/vcpkg_acquire_msys.md b/externals/vcpkg/docs/maintainers/vcpkg_acquire_msys.md new file mode 100755 index 000000000..5093f90fa --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_acquire_msys.md @@ -0,0 +1,60 @@ +# vcpkg_acquire_msys + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_acquire_msys.md). + +Download and prepare an MSYS2 instance. + +## Usage +```cmake +vcpkg_acquire_msys( + PACKAGES ... + [NO_DEFAULT_PACKAGES] + [DIRECT_PACKAGES ...] +) +``` + +## Parameters +### MSYS_ROOT_VAR +An out-variable that will be set to the path to MSYS2. + +### PACKAGES +A list of packages to acquire in msys. + +To ensure a package is available: `vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.16)` + +### NO_DEFAULT_PACKAGES +Exclude the normal base packages. + +The list of base packages includes: bash, coreutils, sed, grep, gawk, gzip, diffutils, make, and pkg-config + +### DIRECT_PACKAGES +A list of URL/SHA512 pairs to acquire in msys. + +This parameter can be used by a port to privately extend the list of msys packages to be acquired. +The URLs can be found on the msys2 website[1] and should be a direct archive link: + + https://repo.msys2.org/mingw/i686/mingw-w64-i686-gettext-0.19.8.1-9-any.pkg.tar.zst + +[1] https://packages.msys2.org/search + +## Notes +A call to `vcpkg_acquire_msys` will usually be followed by a call to `bash.exe`: +```cmake +vcpkg_acquire_msys(MSYS_ROOT) +set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) + +vcpkg_execute_required_process( + COMMAND ${BASH} --noprofile --norc "${CMAKE_CURRENT_LIST_DIR}\\build.sh" + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel + LOGNAME build-${TARGET_TRIPLET}-rel +) +``` + +## Examples + +* [ffmpeg](https://github.com/Microsoft/vcpkg/blob/master/ports/ffmpeg/portfile.cmake) +* [icu](https://github.com/Microsoft/vcpkg/blob/master/ports/icu/portfile.cmake) +* [libvpx](https://github.com/Microsoft/vcpkg/blob/master/ports/libvpx/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_acquire\_msys.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_acquire_msys.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_add_to_path.md b/externals/vcpkg/docs/maintainers/vcpkg_add_to_path.md new file mode 100755 index 000000000..76fb251b9 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_add_to_path.md @@ -0,0 +1,27 @@ +# vcpkg_add_to_path + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_add_to_path.md). + +Add a directory or directories to the PATH environment variable + +```cmake +vcpkg_add_to_path([PREPEND] [...]) +``` + +`vcpkg_add_to_path` adds all of the paths passed to it to the PATH environment variable. +If PREPEND is passed, then those paths are prepended to the PATH environment variable, +so that they are searched first; otherwise, those paths are appended, so they are +searched after the paths which are already in the environment variable. + +The paths are added in the order received, so that the first path is always searched +before a later path. + +If no paths are passed, then nothing will be done. + +## Examples: +* [curl](https://github.com/Microsoft/vcpkg/blob/master/ports/curl/portfile.cmake#L75) +* [folly](https://github.com/Microsoft/vcpkg/blob/master/ports/folly/portfile.cmake#L15) +* [z3](https://github.com/Microsoft/vcpkg/blob/master/ports/z3/portfile.cmake#L13) + +## Source +[scripts/cmake/vcpkg\_add\_to\_path.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_add_to_path.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_apply_patches.md b/externals/vcpkg/docs/maintainers/vcpkg_apply_patches.md new file mode 100755 index 000000000..a3aad0714 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_apply_patches.md @@ -0,0 +1,18 @@ +# vcpkg_apply_patches + +**This function has been deprecated in favor of the `PATCHES` argument to [`vcpkg_from_github()`](vcpkg_from_github.md) et al.** + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_apply_patches.md). + +Apply a set of patches to a source tree. + +```cmake +vcpkg_apply_patches( + SOURCE_PATH <${SOURCE_PATH}> + [QUIET] + PATCHES ... +) +``` + +## Source +[scripts/cmake/vcpkg\_apply\_patches.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_apply_patches.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_backup_restore_env_vars.md b/externals/vcpkg/docs/maintainers/vcpkg_backup_restore_env_vars.md new file mode 100755 index 000000000..d1591d06e --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_backup_restore_env_vars.md @@ -0,0 +1,26 @@ +# vcpkg_backup_restore_env_vars + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_backup_restore_env_vars.md). + +Backup or restore the environment variables + +## Usage: +```cmake +vcpkg_backup_env_variables(VARS [...]) +vcpkg_restore_env_variables(VARS [...]) +``` + +### VARS +The variables to back up or restore. +These are placed in the parent scope, so you must backup and restore +from the same scope. + +## Notes +One must always call `vcpkg_backup_env_variables` before +`vcpkg_restore_env_variables`; however, `vcpkg_restore_env_variables` +does not change the back up variables, and so you may call `restore` +multiple times for one `backup`. + + +## Source +[scripts/cmake/vcpkg\_backup\_restore\_env\_vars.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_backup_restore_env_vars.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_build_cmake.md b/externals/vcpkg/docs/maintainers/vcpkg_build_cmake.md new file mode 100755 index 000000000..485a8c918 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_build_cmake.md @@ -0,0 +1,38 @@ +# vcpkg_build_cmake + +**This function has been deprecated in favor of [`vcpkg_cmake_build`](ports/vcpkg-cmake/vcpkg_cmake_build.md) from the vcpkg-cmake port.** + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_build_cmake.md). + +Build a cmake project. + +## Usage: +```cmake +vcpkg_build_cmake([DISABLE_PARALLEL] [TARGET ]) +``` + +## Parameters: +### DISABLE_PARALLEL +The underlying buildsystem will be instructed to not parallelize + +### TARGET +The target passed to the cmake build command (`cmake --build . --target `). If not specified, no target will +be passed. + +### ADD_BIN_TO_PATH +Adds the appropriate Release and Debug `bin` directories to the path during the build such that executables can run against the in-tree DLLs. + +## Notes: +This command should be preceded by a call to [`vcpkg_configure_cmake()`](vcpkg_configure_cmake.md). +You can use the alias [`vcpkg_install_cmake()`](vcpkg_configure_cmake.md) function if your CMake script supports the +"install" target + +## Examples: + +* [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) +* [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) +* [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake) +* [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_build\_cmake.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_build_cmake.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_build_make.md b/externals/vcpkg/docs/maintainers/vcpkg_build_make.md new file mode 100755 index 000000000..591062d65 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_build_make.md @@ -0,0 +1,57 @@ +# vcpkg_build_make + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_build_make.md). + +Build a linux makefile project. + +## Usage: +```cmake +vcpkg_build_make([BUILD_TARGET ] + [INSTALL_TARGET ] + [ADD_BIN_TO_PATH] + [ENABLE_INSTALL] + [MAKEFILE ] + [LOGFILE_ROOT ] + [DISABLE_PARALLEL] + [SUBPATH ]) +``` + +### BUILD_TARGET +The target passed to the make build command (`./make `). If not specified, the 'all' target will +be passed. + +### INSTALL_TARGET +The target passed to the make build command (`./make `) if `ENABLE_INSTALL` is used. Defaults to 'install'. + +### ADD_BIN_TO_PATH +Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs. + +### ENABLE_INSTALL +IF the port supports the install target use vcpkg_install_make() instead of vcpkg_build_make() + +### MAKEFILE +Specifies the Makefile as a relative path from the root of the sources passed to `vcpkg_configure_make()` + +### LOGFILE_ROOT +Specifies a log file prefix. + +### DISABLE_PARALLEL +The underlying buildsystem will be instructed to not parallelize + +### SUBPATH +Additional subdir to invoke make in. Useful if only parts of a port should be built. + +## Notes: +This command should be preceded by a call to [`vcpkg_configure_make()`](vcpkg_configure_make.md). +You can use the alias [`vcpkg_install_make()`](vcpkg_install_make.md) function if your makefile supports the +"install" target + +## Examples + +* [x264](https://github.com/Microsoft/vcpkg/blob/master/ports/x264/portfile.cmake) +* [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake) +* [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake) +* [libosip2](https://github.com/Microsoft/vcpkg/blob/master/ports/libosip2/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_build\_make.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_build_make.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_build_msbuild.md b/externals/vcpkg/docs/maintainers/vcpkg_build_msbuild.md new file mode 100755 index 000000000..4e86fd3b6 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_build_msbuild.md @@ -0,0 +1,66 @@ +# vcpkg_build_msbuild + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_build_msbuild.md). + +Build a msbuild-based project. Deprecated in favor of `vcpkg_install_msbuild()`. + +## Usage +```cmake +vcpkg_build_msbuild( + PROJECT_PATH <${SOURCE_PATH}/port.sln> + [RELEASE_CONFIGURATION ] + [DEBUG_CONFIGURATION ] + [TARGET ] + [TARGET_PLATFORM_VERSION <10.0.15063.0>] + [PLATFORM <${TRIPLET_SYSTEM_ARCH}>] + [PLATFORM_TOOLSET <${VCPKG_PLATFORM_TOOLSET}>] + [OPTIONS ...] + [OPTIONS_RELEASE ...] + [OPTIONS_DEBUG ...] + [USE_VCPKG_INTEGRATION] +) +``` + +## Parameters +### USE_VCPKG_INTEGRATION +Apply the normal `integrate install` integration for building the project. + +By default, projects built with this command will not automatically link libraries or have header paths set. + +### PROJECT_PATH +The path to the solution (`.sln`) or project (`.vcxproj`) file. + +### RELEASE_CONFIGURATION +The configuration (``/p:Configuration`` msbuild parameter) used for Release builds. + +### DEBUG_CONFIGURATION +The configuration (``/p:Configuration`` msbuild parameter) +used for Debug builds. + +### TARGET_PLATFORM_VERSION +The WindowsTargetPlatformVersion (``/p:WindowsTargetPlatformVersion`` msbuild parameter) + +### TARGET +The MSBuild target to build. (``/t:``) + +### PLATFORM +The platform (``/p:Platform`` msbuild parameter) used for the build. + +### PLATFORM_TOOLSET +The platform toolset (``/p:PlatformToolset`` msbuild parameter) used for the build. + +### OPTIONS +Additional options passed to msbuild for all builds. + +### OPTIONS_RELEASE +Additional options passed to msbuild for Release builds. These are in addition to `OPTIONS`. + +### OPTIONS_DEBUG +Additional options passed to msbuild for Debug builds. These are in addition to `OPTIONS`. + +## Examples + +* [chakracore](https://github.com/Microsoft/vcpkg/blob/master/ports/chakracore/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_build\_msbuild.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_build_msbuild.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_build_ninja.md b/externals/vcpkg/docs/maintainers/vcpkg_build_ninja.md new file mode 100755 index 000000000..de099a16d --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_build_ninja.md @@ -0,0 +1,19 @@ +# vcpkg_build_ninja + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_build_ninja.md). + +Build a ninja project + +## Usage: +```cmake +vcpkg_build_ninja( + [TARGETS ...] +) +``` + +## Parameters: +### TARGETS +Only build the specified targets. + +## Source +[scripts/cmake/vcpkg\_build\_ninja.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_build_ninja.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_build_nmake.md b/externals/vcpkg/docs/maintainers/vcpkg_build_nmake.md new file mode 100755 index 000000000..408f8fb39 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_build_nmake.md @@ -0,0 +1,72 @@ +# vcpkg_build_nmake + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_build_nmake.md). + +Build a msvc makefile project. + +## Usage: +```cmake +vcpkg_build_nmake( + SOURCE_PATH <${SOURCE_PATH}> + [NO_DEBUG] + [ENABLE_INSTALL] + [TARGET ] + [PROJECT_SUBPATH <${SUBPATH}>] + [PROJECT_NAME <${MAKEFILE_NAME}>] + [PRERUN_SHELL <${SHELL_PATH}>] + [PRERUN_SHELL_DEBUG <${SHELL_PATH}>] + [PRERUN_SHELL_RELEASE <${SHELL_PATH}>] + [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] + [OPTIONS_RELEASE <-DOPTIMIZE=1>...] + [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] + [TARGET ]) +``` + +## Parameters +### SOURCE_PATH +Specifies the directory containing the source files. +By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. + +### PROJECT_SUBPATH +Specifies the sub directory containing the `makefile.vc`/`makefile.mak`/`makefile.msvc` or other msvc makefile. + +### PROJECT_NAME +Specifies the name of msvc makefile name. +Default is `makefile.vc` + +### ENABLE_INSTALL +Install binaries after build. + +### PRERUN_SHELL +Script that needs to be called before build + +### PRERUN_SHELL_DEBUG +Script that needs to be called before debug build + +### PRERUN_SHELL_RELEASE +Script that needs to be called before release build + +### OPTIONS +Additional options passed to generate during the generation. + +### OPTIONS_RELEASE +Additional options passed to generate during the Release generation. These are in addition to `OPTIONS`. + +### OPTIONS_DEBUG +Additional options passed to generate during the Debug generation. These are in addition to `OPTIONS`. + +### TARGET +The target passed to the nmake build command (`nmake/nmake install`). If not specified, no target will +be passed. + +## Notes: +You can use the alias [`vcpkg_install_nmake()`](vcpkg_install_nmake.md) function if your makefile supports the +"install" target + +## Examples + +* [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake) +* [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_build\_nmake.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_build_nmake.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_build_qmake.md b/externals/vcpkg/docs/maintainers/vcpkg_build_qmake.md new file mode 100755 index 000000000..e45238854 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_build_qmake.md @@ -0,0 +1,12 @@ +# vcpkg_build_qmake + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_build_qmake.md). + +Build a qmake-based project, previously configured using vcpkg_configure_qmake. + +```cmake +vcpkg_build_qmake() +``` + +## Source +[scripts/cmake/vcpkg\_build\_qmake.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_build_qmake.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_buildpath_length_warning.md b/externals/vcpkg/docs/maintainers/vcpkg_buildpath_length_warning.md new file mode 100755 index 000000000..c67dc6465 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_buildpath_length_warning.md @@ -0,0 +1,16 @@ +# vcpkg_buildpath_length_warning + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_buildpath_length_warning.md). + +Warns the user if their vcpkg installation path might be too long for the package they're installing. + +```cmake +vcpkg_buildpath_length_warning() +``` + +`vcpkg_buildpath_length_warning` warns the user if the number of bytes in the +path to `buildtrees` is bigger than `N`. Note that this is simply a warning, +and isn't relied on for correctness. + +## Source +[scripts/cmake/vcpkg\_buildpath\_length\_warning.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_buildpath_length_warning.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_check_features.md b/externals/vcpkg/docs/maintainers/vcpkg_check_features.md new file mode 100755 index 000000000..c22908589 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_check_features.md @@ -0,0 +1,136 @@ +# vcpkg_check_features + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_check_features.md). +Check if one or more features are a part of a package installation. + +```cmake +vcpkg_check_features( + OUT_FEATURE_OPTIONS + [PREFIX ] + [FEATURES + [ ]... + ] + [INVERTED_FEATURES + [ ]... + ] +) +``` + +The `` should be set to `FEATURE_OPTIONS` by convention. + +`vcpkg_check_features()` will: + +- for each `` passed in `FEATURES`: + - if the feature is set, add `-D=ON` to ``, + and set `_` to ON. + - if the feature is not set, add `-D=OFF` to ``, + and set `_` to OFF. +- for each `` passed in `INVERTED_FEATURES`: + - if the feature is set, add `-D=OFF` to ``, + and set `_` to OFF. + - if the feature is not set, add `-D=ON` to ``, + and set `_` to ON. + +If `` is not passed, then the feature vars set are simply ``, +not `_`. + +If `INVERTED_FEATURES` is not passed, then the `FEATURES` keyword is optional. +This behavior is deprecated. + +If the same `` is passed multiple times, +then `vcpkg_check_features` will cause a fatal error, +since that is a bug. + +## Examples + +### Example 1: Regular features + +```cmake +$ ./vcpkg install mimalloc[asm,secure] + +# ports/mimalloc/portfile.cmake +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + asm MI_SEE_ASM + override MI_OVERRIDE + secure MI_SECURE +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + # Expands to "-DMI_SEE_ASM=ON;-DMI_OVERRIDE=OFF;-DMI_SECURE=ON" + ${FEATURE_OPTIONS} +) +``` + +### Example 2: Inverted features + +```cmake +$ ./vcpkg install cpprestsdk[websockets] + +# ports/cpprestsdk/portfile.cmake +vcpkg_check_features( + INVERTED_FEATURES + brotli CPPREST_EXCLUDE_BROTLI + websockets CPPREST_EXCLUDE_WEBSOCKETS +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + # Expands to "-DCPPREST_EXCLUDE_BROTLI=ON;-DCPPREST_EXCLUDE_WEBSOCKETS=OFF" + ${FEATURE_OPTIONS} +) +``` + +### Example 3: Set multiple options for same feature + +```cmake +$ ./vcpkg install pcl[cuda] + +# ports/pcl/portfile.cmake +vcpkg_check_features( + FEATURES + cuda WITH_CUDA + cuda BUILD_CUDA + cuda BUILD_GPU +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + # Expands to "-DWITH_CUDA=ON;-DBUILD_CUDA=ON;-DBUILD_GPU=ON" + ${FEATURE_OPTIONS} +) +``` + +### Example 4: Use regular and inverted features + +```cmake +$ ./vcpkg install rocksdb[tbb] + +# ports/rocksdb/portfile.cmake +vcpkg_check_features( + FEATURES + tbb WITH_TBB + INVERTED_FEATURES + tbb ROCKSDB_IGNORE_PACKAGE_TBB +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + # Expands to "-DWITH_TBB=ON;-DROCKSDB_IGNORE_PACKAGE_TBB=OFF" + ${FEATURE_OPTIONS} +) +``` + +## Examples in portfiles + +* [cpprestsdk](https://github.com/microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) +* [pcl](https://github.com/microsoft/vcpkg/blob/master/ports/pcl/portfile.cmake) +* [rocksdb](https://github.com/microsoft/vcpkg/blob/master/ports/rocksdb/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_check\_features.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_check_features.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_check_linkage.md b/externals/vcpkg/docs/maintainers/vcpkg_check_linkage.md new file mode 100755 index 000000000..8b73520e0 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_check_linkage.md @@ -0,0 +1,38 @@ +# vcpkg_check_linkage + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_check_linkage.md). + +Asserts the available library and CRT linkage options for the port. + +## Usage +```cmake +vcpkg_check_linkage( + [ONLY_STATIC_LIBRARY | ONLY_DYNAMIC_LIBRARY] + [ONLY_STATIC_CRT | ONLY_DYNAMIC_CRT] +) +``` + +## Parameters +### ONLY_STATIC_LIBRARY +Indicates that this port can only be built with static library linkage. + +Note: If the user requested a dynamic build ONLY_STATIC_LIBRARY will result in a note being printed, not a fatal error. + +### ONLY_DYNAMIC_LIBRARY +Indicates that this port can only be built with dynamic/shared library linkage. + +### ONLY_STATIC_CRT +Indicates that this port can only be built with static CRT linkage. + +### ONLY_DYNAMIC_CRT +Indicates that this port can only be built with dynamic/shared CRT linkage. + +## Notes +This command will either alter the settings for `VCPKG_LIBRARY_LINKAGE` or fail, depending on what was requested by the user versus what the library supports. + +## Examples + +* [abseil](https://github.com/Microsoft/vcpkg/blob/master/ports/abseil/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_check\_linkage.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_check_linkage.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_clean_executables_in_bin.md b/externals/vcpkg/docs/maintainers/vcpkg_clean_executables_in_bin.md new file mode 100755 index 000000000..b6df723ad --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_clean_executables_in_bin.md @@ -0,0 +1,25 @@ +# vcpkg_clean_executables_in_bin + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_clean_executables_in_bin.md). + +Remove specified executables found in `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_DIR}/debug/bin`. If, after all specified executables have been removed, and the `bin` and `debug/bin` directories are empty, then also delete `bin` and `debug/bin` directories. + +## Usage +```cmake +vcpkg_clean_executables_in_bin( + FILE_NAMES ... +) +``` + +## Parameters +### FILE_NAMES +A list of executable filenames without extension. + +## Notes +Generally, there is no need to call this function manually. Instead, pass an extra `AUTO_CLEAN` argument when calling `vcpkg_copy_tools`. + +## Examples +* [czmq](https://github.com/microsoft/vcpkg/blob/master/ports/czmq/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_clean\_executables\_in\_bin.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_clean_executables_in_bin.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_clean_msbuild.md b/externals/vcpkg/docs/maintainers/vcpkg_clean_msbuild.md new file mode 100755 index 000000000..3474076b5 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_clean_msbuild.md @@ -0,0 +1,17 @@ +# vcpkg_clean_msbuild + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_clean_msbuild.md). + +Clean intermediate files generated by `vcpkg_install_msbuild()`. + +## Usage +```cmake +vcpkg_clean_msbuild() +``` + +## Examples + +* [python3](https://github.com/Microsoft/vcpkg/blob/master/ports/python3/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_clean\_msbuild.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_clean_msbuild.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_common_definitions.md b/externals/vcpkg/docs/maintainers/vcpkg_common_definitions.md new file mode 100755 index 000000000..b96dd3cbc --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_common_definitions.md @@ -0,0 +1,36 @@ +# vcpkg_common_definitions + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_common_definitions.md). + +This file defines the following variables which are commonly needed or used in portfiles: + +```cmake +VCPKG_TARGET_IS_ with being one of the following: WINDOWS, UWP, MINGW, LINUX, OSX, ANDROID, FREEBSD, OPENBSD. only defined if +VCPKG_HOST_IS_ with being one of the following: WINDOWS, LINUX, OSX, FREEBSD, OPENBSD. only defined if +VCPKG_HOST_PATH_SEPARATOR Host specific path separator (USAGE: "${VCPKG_HOST_PATH_SEPARATOR}"; only use and pass variables with VCPKG_HOST_PATH_SEPARATOR within "") +VCPKG_HOST_EXECUTABLE_SUFFIX executable suffix of the host +VCPKG_TARGET_EXECUTABLE_SUFFIX executable suffix of the target +VCPKG_HOST_BUNDLE_SUFFIX bundle suffix of the host +VCPKG_TARGET_BUNDLE_SUFFIX bundle suffix of the target +VCPKG_TARGET_STATIC_LIBRARY_PREFIX static library prefix for target (same as CMAKE_STATIC_LIBRARY_PREFIX) +VCPKG_TARGET_STATIC_LIBRARY_SUFFIX static library suffix for target (same as CMAKE_STATIC_LIBRARY_SUFFIX) +VCPKG_TARGET_SHARED_LIBRARY_PREFIX shared library prefix for target (same as CMAKE_SHARED_LIBRARY_PREFIX) +VCPKG_TARGET_SHARED_LIBRARY_SUFFIX shared library suffix for target (same as CMAKE_SHARED_LIBRARY_SUFFIX) +VCPKG_TARGET_IMPORT_LIBRARY_PREFIX import library prefix for target (same as CMAKE_IMPORT_LIBRARY_PREFIX) +VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX import library suffix for target (same as CMAKE_IMPORT_LIBRARY_SUFFIX) +VCPKG_FIND_LIBRARY_PREFIXES target dependent prefixes used for find_library calls in portfiles +VCPKG_FIND_LIBRARY_SUFFIXES target dependent suffixes used for find_library calls in portfiles +VCPKG_SYSTEM_LIBRARIES list of libraries are provide by the toolchain and are not managed by vcpkg +TARGET_TRIPLET the name of the current triplet to build for +CURRENT_INSTALLED_DIR the absolute path to the installed files for the current triplet +HOST_TRIPLET the name of the triplet corresponding to the host +CURRENT_HOST_INSTALLED_DIR the absolute path to the installed files for the host triplet +VCPKG_CROSSCOMPILING Whether vcpkg is cross-compiling: in other words, whether TARGET_TRIPLET and HOST_TRIPLET are different +``` + +CMAKE_STATIC_LIBRARY_(PREFIX|SUFFIX), CMAKE_SHARED_LIBRARY_(PREFIX|SUFFIX) and CMAKE_IMPORT_LIBRARY_(PREFIX|SUFFIX) are defined for the target +Furthermore the variables CMAKE_FIND_LIBRARY_(PREFIXES|SUFFIXES) are also defined for the target so that +portfiles are able to use find_library calls to discover dependent libraries within the current triplet for ports. + +## Source +[scripts/cmake/vcpkg\_common\_definitions.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_common_definitions.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_configure_cmake.md b/externals/vcpkg/docs/maintainers/vcpkg_configure_cmake.md new file mode 100755 index 000000000..8a1eb3284 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_configure_cmake.md @@ -0,0 +1,87 @@ +# vcpkg_configure_cmake + +**This function has been deprecated in favor of [`vcpkg_cmake_configure`](ports/vcpkg-cmake/vcpkg_cmake_configure.md) from the vcpkg-cmake port.** + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_configure_cmake.md). + +Configure CMake for Debug and Release builds of a project. + +## Usage +```cmake +vcpkg_configure_cmake( + SOURCE_PATH <${SOURCE_PATH}> + [PREFER_NINJA] + [DISABLE_PARALLEL_CONFIGURE] + [NO_CHARSET_FLAG] + [GENERATOR <"NMake Makefiles">] + [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] + [OPTIONS_RELEASE <-DOPTIMIZE=1>...] + [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] + [MAYBE_UNUSED_VARIABLES ...] +) +``` + +## Parameters +### SOURCE_PATH +Specifies the directory containing the `CMakeLists.txt`. +By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. + +### PREFER_NINJA +Indicates that, when available, Vcpkg should use Ninja to perform the build. +This should be specified unless the port is known to not work under Ninja. + +### DISABLE_PARALLEL_CONFIGURE +Disables running the CMake configure step in parallel. +This is needed for libraries which write back into their source directory during configure. + +This also disables CMAKE_DISABLE_SOURCE_CHANGES. + +### NO_CHARSET_FLAG +Disables passing `utf-8` as the default character set to `CMAKE_C_FLAGS` and `CMAKE_CXX_FLAGS`. + +This is needed for libraries that set their own source code's character set. + +### GENERATOR +Specifies the precise generator to use. + +This is useful if some project-specific buildsystem has been wrapped in a cmake script that won't perform an actual build. +If used for this purpose, it should be set to `"NMake Makefiles"`. + +### OPTIONS +Additional options passed to CMake during the configuration. + +### OPTIONS_RELEASE +Additional options passed to CMake during the Release configuration. These are in addition to `OPTIONS`. + +### OPTIONS_DEBUG +Additional options passed to CMake during the Debug configuration. These are in addition to `OPTIONS`. + +### MAYBE_UNUSED_VARIABLES +Any CMake variables which are explicitly passed in, but which may not be used on all platforms. +For example: +```cmake +vcpkg_cmake_configure( + ... + OPTIONS + -DBUILD_EXAMPLE=OFF + ... + MAYBE_UNUSED_VARIABLES + BUILD_EXAMPLE +) +``` + +### LOGNAME +Name of the log to write the output of the configure call to. + +## Notes +This command supplies many common arguments to CMake. To see the full list, examine the source. + +## Examples + +* [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) +* [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) +* [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake) +* [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_configure\_cmake.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_configure_cmake.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_configure_gn.md b/externals/vcpkg/docs/maintainers/vcpkg_configure_gn.md new file mode 100755 index 000000000..cb300327c --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_configure_gn.md @@ -0,0 +1,34 @@ +# vcpkg_configure_gn + +**This function has been deprecated in favor of [`vcpkg_gn_configure`](ports/vcpkg-gn/vcpkg_gn_configure.md) from the vcpkg-gn port.** + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_configure_gn.md). + +Generate Ninja (GN) targets + +## Usage: +```cmake +vcpkg_configure_gn( + SOURCE_PATH + [OPTIONS ] + [OPTIONS_DEBUG ] + [OPTIONS_RELEASE ] +) +``` + +## Parameters: +### SOURCE_PATH (required) +The path to the GN project. + +### OPTIONS +Options to be passed to both the debug and release targets. +Note: Must be provided as a space-separated string. + +### OPTIONS_DEBUG (space-separated string) +Options to be passed to the debug target. + +### OPTIONS_RELEASE (space-separated string) +Options to be passed to the release target. + +## Source +[scripts/cmake/vcpkg\_configure\_gn.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_configure_gn.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_configure_make.md b/externals/vcpkg/docs/maintainers/vcpkg_configure_make.md new file mode 100755 index 000000000..af0213bd5 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_configure_make.md @@ -0,0 +1,94 @@ +# vcpkg_configure_make + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_configure_make.md). + +Configure configure for Debug and Release builds of a project. + +## Usage +```cmake +vcpkg_configure_make( + SOURCE_PATH <${SOURCE_PATH}> + [AUTOCONFIG] + [USE_WRAPPERS] + [DETERMINE_BUILD_TRIPLET] + [BUILD_TRIPLET "--host=x64 --build=i686-unknown-pc"] + [NO_ADDITIONAL_PATHS] + [CONFIG_DEPENDENT_ENVIRONMENT ...] + [CONFIGURE_ENVIRONMENT_VARIABLES ...] + [ADD_BIN_TO_PATH] + [DISABLE_VERBOSE_FLAGS] + [NO_DEBUG] + [SKIP_CONFIGURE] + [PROJECT_SUBPATH <${PROJ_SUBPATH}>] + [PRERUN_SHELL <${SHELL_PATH}>] + [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] + [OPTIONS_RELEASE <-DOPTIMIZE=1>...] + [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] +) +``` + +## Parameters +### SOURCE_PATH +Specifies the directory containing the `configure`/`configure.ac`. +By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. + +### PROJECT_SUBPATH +Specifies the directory containing the ``configure`/`configure.ac`. +By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. + +### SKIP_CONFIGURE +Skip configure process + +### USE_WRAPPERS +Use autotools ar-lib and compile wrappers (only applies to windows cl and lib) + +### BUILD_TRIPLET +Used to pass custom --build/--target/--host to configure. Can be globally overwritten by VCPKG_MAKE_BUILD_TRIPLET + +### DETERMINE_BUILD_TRIPLET +For ports having a configure script following the autotools rules for selecting the triplet + +### NO_ADDITIONAL_PATHS +Don't pass any additional paths except for --prefix to the configure call + +### AUTOCONFIG +Need to use autoconfig to generate configure file. + +### PRERUN_SHELL +Script that needs to be called before configuration (do not use for batch files which simply call autoconf or configure) + +### ADD_BIN_TO_PATH +Adds the appropriate Release and Debug `bin\` directories to the path during configure such that executables can run against the in-tree DLLs. + +### DISABLE_VERBOSE_FLAGS +Do not pass '--disable-silent-rules --verbose' to configure. + +### OPTIONS +Additional options passed to configure during the configuration. + +### OPTIONS_RELEASE +Additional options passed to configure during the Release configuration. These are in addition to `OPTIONS`. + +### OPTIONS_DEBUG +Additional options passed to configure during the Debug configuration. These are in addition to `OPTIONS`. + +### CONFIG_DEPENDENT_ENVIRONMENT +List of additional configuration dependent environment variables to set. +Pass SOMEVAR to set the environment and have SOMEVAR_(DEBUG|RELEASE) set in the portfile to the appropriate values +General environment variables can be set from within the portfile itself. + +### CONFIGURE_ENVIRONMENT_VARIABLES +List of additional environment variables to pass via the configure call. + +## Notes +This command supplies many common arguments to configure. To see the full list, examine the source. + +## Examples + +* [x264](https://github.com/Microsoft/vcpkg/blob/master/ports/x264/portfile.cmake) +* [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake) +* [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake) +* [libosip2](https://github.com/Microsoft/vcpkg/blob/master/ports/libosip2/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_configure\_make.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_configure_make.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_configure_meson.md b/externals/vcpkg/docs/maintainers/vcpkg_configure_meson.md new file mode 100755 index 000000000..ae8a07d87 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_configure_meson.md @@ -0,0 +1,44 @@ +# vcpkg_configure_meson + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_configure_meson.md). + +Configure Meson for Debug and Release builds of a project. + +## Usage +```cmake +vcpkg_configure_meson( + SOURCE_PATH <${SOURCE_PATH}> + [NO_PKG_CONFIG] + [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] + [OPTIONS_RELEASE <-DOPTIMIZE=1>...] + [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] +) +``` + +## Parameters +### SOURCE_PATH +Specifies the directory containing the `meson.build`. +By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. + +### OPTIONS +Additional options passed to Meson during the configuration. + +### OPTIONS_RELEASE +Additional options passed to Meson during the Release configuration. These are in addition to `OPTIONS`. + +### OPTIONS_DEBUG +Additional options passed to Meson during the Debug configuration. These are in addition to `OPTIONS`. + +### NO_PKG_CONFIG +Disable pkg-config setup + +## Notes +This command supplies many common arguments to Meson. To see the full list, examine the source. + +## Examples + +* [fribidi](https://github.com/Microsoft/vcpkg/blob/master/ports/fribidi/portfile.cmake) +* [libepoxy](https://github.com/Microsoft/vcpkg/blob/master/ports/libepoxy/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_configure\_meson.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_configure_meson.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_configure_qmake.md b/externals/vcpkg/docs/maintainers/vcpkg_configure_qmake.md new file mode 100755 index 000000000..6b980b3c0 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_configure_qmake.md @@ -0,0 +1,29 @@ +# vcpkg_configure_qmake + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_configure_qmake.md). + +Configure a qmake-based project. + +```cmake +vcpkg_configure_qmake( + SOURCE_PATH + [OPTIONS arg1 [arg2 ...]] + [OPTIONS_RELEASE arg1 [arg2 ...]] + [OPTIONS_DEBUG arg1 [arg2 ...]] + [BUILD_OPTIONS arg1 [arg2 ...]] + [BUILD_OPTIONS_RELEASE arg1 [arg2 ...]] + [BUILD_OPTIONS_DEBUG arg1 [arg2 ...]] +) +``` + +### SOURCE_PATH +The path to the *.pro qmake project file. + +### OPTIONS, OPTIONS\_RELEASE, OPTIONS\_DEBUG +The options passed to qmake to the configure step. + +### BUILD\_OPTIONS, BUILD\_OPTIONS\_RELEASE, BUILD\_OPTIONS\_DEBUG +The options passed to qmake to the build step. + +## Source +[scripts/cmake/vcpkg\_configure\_qmake.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_configure_qmake.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_copy_pdbs.md b/externals/vcpkg/docs/maintainers/vcpkg_copy_pdbs.md new file mode 100755 index 000000000..9c379d225 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_copy_pdbs.md @@ -0,0 +1,29 @@ +# vcpkg_copy_pdbs + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_copy_pdbs.md). + +Automatically locate pdbs in the build tree and copy them adjacent to all DLLs. + +```cmake +vcpkg_copy_pdbs( + [BUILD_PATHS ...]) +``` + +The ``s are patterns which will be passed to `file(GLOB_RECURSE)`, +for locating DLLs. It defaults to using: + +- `${CURRENT_PACKAGES_DIR}/bin/*.dll` +- `${CURRENT_PACKAGES_DIR}/debug/bin/*.dll` + +since that is generally where DLLs are located. + +## Notes +This command should always be called by portfiles after they have finished rearranging the binary output. + +## Examples + +* [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) +* [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_copy\_pdbs.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_copy_pdbs.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_copy_tool_dependencies.md b/externals/vcpkg/docs/maintainers/vcpkg_copy_tool_dependencies.md new file mode 100755 index 000000000..d34fa5d60 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_copy_tool_dependencies.md @@ -0,0 +1,23 @@ +# vcpkg_copy_tool_dependencies + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_copy_tool_dependencies.md). + +Copy all DLL dependencies of built tools into the tool folder. + +## Usage +```cmake +vcpkg_copy_tool_dependencies(<${CURRENT_PACKAGES_DIR}/tools/${PORT}>) +``` +## Parameters +The path to the directory containing the tools. + +## Notes +This command should always be called by portfiles after they have finished rearranging the binary output, if they have any tools. + +## Examples + +* [glib](https://github.com/Microsoft/vcpkg/blob/master/ports/glib/portfile.cmake) +* [fltk](https://github.com/Microsoft/vcpkg/blob/master/ports/fltk/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_copy\_tool\_dependencies.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_copy_tool_dependencies.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_copy_tools.md b/externals/vcpkg/docs/maintainers/vcpkg_copy_tools.md new file mode 100755 index 000000000..e5a950bde --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_copy_tools.md @@ -0,0 +1,36 @@ +# vcpkg_copy_tools + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_copy_tools.md). + +Copy tools and all their DLL dependencies into the `tools` folder. + +## Usage +```cmake +vcpkg_copy_tools( + TOOL_NAMES ... + [SEARCH_DIR <${CURRENT_PACKAGES_DIR}/bin>] + [DESTINATION <${CURRENT_PACKAGES_DIR}/tools/${PORT}>] + [AUTO_CLEAN] +) +``` +## Parameters +### TOOL_NAMES +A list of tool filenames without extension. + +### SEARCH_DIR +The path to the directory containing the tools. This will be set to `${CURRENT_PACKAGES_DIR}/bin` if omitted. + +### DESTINATION +Destination to copy the tools to. This will be set to `${CURRENT_PACKAGES_DIR}/tools/${PORT}` if omitted. + +### AUTO_CLEAN +Auto clean the copied executables from `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_DIR}/debug/bin`. + +## Examples + +* [cpuinfo](https://github.com/microsoft/vcpkg/blob/master/ports/cpuinfo/portfile.cmake) +* [nanomsg](https://github.com/microsoft/vcpkg/blob/master/ports/nanomsg/portfile.cmake) +* [uriparser](https://github.com/microsoft/vcpkg/blob/master/ports/uriparser/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_copy\_tools.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_copy_tools.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_download_distfile.md b/externals/vcpkg/docs/maintainers/vcpkg_download_distfile.md new file mode 100755 index 000000000..62fde1455 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_download_distfile.md @@ -0,0 +1,62 @@ +# vcpkg_download_distfile + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_download_distfile.md). + +Download and cache a file needed for this port. + +This helper should always be used instead of CMake's built-in `file(DOWNLOAD)` command. + +## Usage +```cmake +vcpkg_download_distfile( + + URLS ... + FILENAME + SHA512 <5981de...> + [ALWAYS_REDOWNLOAD] +) +``` +## Parameters +### OUT_VARIABLE +This variable will be set to the full path to the downloaded file. This can then immediately be passed in to [`vcpkg_extract_source_archive`](vcpkg_extract_source_archive.md) for sources. + +### URLS +A list of URLs to be consulted. They will be tried in order until one of the downloaded files successfully matches the SHA512 given. + +### FILENAME +The local name for the file. Files are shared between ports, so the file may need to be renamed to make it clearly attributed to this port and avoid conflicts. + +### SHA512 +The expected hash for the file. + +If this doesn't match the downloaded version, the build will be terminated with a message describing the mismatch. + +### QUIET +Suppress output on cache hit + +### SKIP_SHA512 +Skip SHA512 hash check for file. + +This switch is only valid when building with the `--head` command line flag. + +### ALWAYS_REDOWNLOAD +Avoid caching; this is a REST call or otherwise unstable. + +Requires `SKIP_SHA512`. + +### HEADERS +A list of headers to append to the download request. This can be used for authentication during a download. + +Headers should be specified as ": ". + +## Notes +The helper [`vcpkg_from_github`](vcpkg_from_github.md) should be used for downloading from GitHub projects. + +## Examples + +* [apr](https://github.com/Microsoft/vcpkg/blob/master/ports/apr/portfile.cmake) +* [fontconfig](https://github.com/Microsoft/vcpkg/blob/master/ports/fontconfig/portfile.cmake) +* [freetype](https://github.com/Microsoft/vcpkg/blob/master/ports/freetype/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_download\_distfile.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_download_distfile.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_execute_build_process.md b/externals/vcpkg/docs/maintainers/vcpkg_execute_build_process.md new file mode 100755 index 000000000..7eb6f8d46 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_execute_build_process.md @@ -0,0 +1,38 @@ +# vcpkg_execute_build_process + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_execute_build_process.md). + +Execute a required build process + +## Usage +```cmake +vcpkg_execute_build_process( + COMMAND [...] + [NO_PARALLEL_COMMAND [...]] + WORKING_DIRECTORY + LOGNAME +) +``` +## Parameters +### COMMAND +The command to be executed, along with its arguments. + +### NO_PARALLEL_COMMAND +Optional parameter which specifies a non-parallel command to attempt if a +failure potentially due to parallelism is detected. + +### WORKING_DIRECTORY +The directory to execute the command in. + +### LOGNAME +The prefix to use for the log files. + +This should be a unique name for different triplets so that the logs don't +conflict when building multiple at once. + +## Examples + +* [icu](https://github.com/Microsoft/vcpkg/blob/master/ports/icu/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_execute\_build\_process.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_execute_build_process.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_execute_in_download_mode.md b/externals/vcpkg/docs/maintainers/vcpkg_execute_in_download_mode.md new file mode 100755 index 000000000..a9fb5bffb --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_execute_in_download_mode.md @@ -0,0 +1,21 @@ +# vcpkg_execute_in_download_mode + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_execute_in_download_mode.md). + +Execute a process even in download mode. + +## Usage +```cmake +vcpkg_execute_in_download_mode( + ... +) +``` + +The signature of this function is identical to `execute_process()`. + +See [`execute_process()`] for more details. + +[`execute_process()`]: https://cmake.org/cmake/help/latest/command/execute_process.html + +## Source +[scripts/cmake/vcpkg\_execute\_in\_download\_mode.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_execute_in_download_mode.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_execute_required_process.md b/externals/vcpkg/docs/maintainers/vcpkg_execute_required_process.md new file mode 100755 index 000000000..b00c97260 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_execute_required_process.md @@ -0,0 +1,51 @@ +# vcpkg_execute_required_process + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_execute_required_process.md). + +Execute a process with logging and fail the build if the command fails. + +## Usage +```cmake +vcpkg_execute_required_process( + COMMAND <${PERL}> [...] + WORKING_DIRECTORY <${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg> + LOGNAME + [TIMEOUT ] + [OUTPUT_VARIABLE ] + [ERROR_VARIABLE ] +) +``` +## Parameters +### ALLOW_IN_DOWNLOAD_MODE +Allows the command to execute in Download Mode. +[See execute_process() override](../../scripts/cmake/execute_process.cmake). + +### COMMAND +The command to be executed, along with its arguments. + +### WORKING_DIRECTORY +The directory to execute the command in. + +### LOGNAME +The prefix to use for the log files. + +### TIMEOUT +Optional timeout after which to terminate the command. + +### OUTPUT_VARIABLE +Optional variable to receive stdout of the command. + +### ERROR_VARIABLE +Optional variable to receive stderr of the command. + +This should be a unique name for different triplets so that the logs don't conflict when building multiple at once. + +## Examples + +* [ffmpeg](https://github.com/Microsoft/vcpkg/blob/master/ports/ffmpeg/portfile.cmake) +* [openssl](https://github.com/Microsoft/vcpkg/blob/master/ports/openssl/portfile.cmake) +* [boost](https://github.com/Microsoft/vcpkg/blob/master/ports/boost/portfile.cmake) +* [qt5](https://github.com/Microsoft/vcpkg/blob/master/ports/qt5/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_execute\_required\_process.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_execute_required_process.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_execute_required_process_repeat.md b/externals/vcpkg/docs/maintainers/vcpkg_execute_required_process_repeat.md new file mode 100755 index 000000000..22dcfc4af --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_execute_required_process_repeat.md @@ -0,0 +1,19 @@ +# vcpkg_execute_required_process_repeat + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_execute_required_process_repeat.md). + +Execute a process until the command succeeds, or until the COUNT is reached. + +## Usage +```cmake +vcpkg_execute_required_process_repeat( + COMMAND [] + COUNT + WORKING_DIRECTORY + LOGNAME + [ALLOW_IN_DOWNLOAD_MODE] +) +``` + +## Source +[scripts/cmake/vcpkg\_execute\_required\_process\_repeat.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_execute_required_process_repeat.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_extract_source_archive.md b/externals/vcpkg/docs/maintainers/vcpkg_extract_source_archive.md new file mode 100755 index 000000000..69a95a510 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_extract_source_archive.md @@ -0,0 +1,86 @@ +# vcpkg_extract_source_archive + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_extract_source_archive.md). + +Extract an archive into the source directory. + +## Usage +There are two "overloads" of this function. The first is deprecated: + +```cmake +vcpkg_extract_source_archive(<${ARCHIVE}> [<${TARGET_DIRECTORY}>]) +``` + +This overload should not be used. + +The latter is suggested to use for all future `vcpkg_extract_source_archive`s. + +```cmake +vcpkg_extract_source_archive( + ARCHIVE + [NO_REMOVE_ONE_LEVEL] + [SKIP_PATCH_CHECK] + [PATCHES ...] + [SOURCE_BASE ] + [BASE_DIRECTORY | WORKING_DIRECTORY ] +) +``` + +`vcpkg_extract_source_archive` takes an archive and extracts it. +It replaces existing uses of `vcpkg_extract_source_archive_ex`. +The simplest use of it is: + +```cmake +vcpkg_download_distfile(archive ...) +vcpkg_extract_source_archive(source_path ARCHIVE "${archive}") +``` + +The general expectation is that an archives are laid out with a base directory, +and all the actual files underneath that directory; in other words, if you +extract the archive, you'll get something that looks like: + +``` +zlib-1.2.11/ + doc/ + ... + examples/ + ... + ChangeLog + CMakeLists.txt + README + zlib.h + ... +``` + +`vcpkg_extract_source_archive` automatically removes this directory, +and gives you the items under it directly. However, this only works +when there is exactly one item in the top level of an archive. +Otherwise, you'll have to pass the `NO_REMOVE_ONE_LEVEL` argument to +prevent `vcpkg_extract_source_archive` from performing this transformation. + +If the source needs to be patched in some way, the `PATCHES` argument +allows one to do this, just like other `vcpkg_from_*` functions. +Additionally, the `SKIP_PATCH_CHECK` is provided for `--head` mode - +this allows patches to fail to apply silently. +This argument should _only_ be used when installing a `--head` library, +since otherwise we want a patch failing to appply to be a hard error. + +`vcpkg_extract_source_archive` extracts the files to +`${CURRENT_BUILDTREES_DIR}//-.clean`. +When in editable mode, no `.clean` is appended, +to allow for a user to modify the sources. +`base-directory` defaults to `src`, +and `source-base` defaults to the stem of ``. +You can change these via the `BASE_DIRECTORY` and `SOURCE_BASE` arguments +respectively. +If you need to extract to a location that is not based in `CURRENT_BUILDTREES_DIR`, +you can use the `WORKING_DIRECTORY` argument to do the same. + +## Examples + +* [libraw](https://github.com/Microsoft/vcpkg/blob/master/ports/libraw/portfile.cmake) +* [protobuf](https://github.com/Microsoft/vcpkg/blob/master/ports/protobuf/portfile.cmake) +* [msgpack](https://github.com/Microsoft/vcpkg/blob/master/ports/msgpack/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_extract\_source\_archive.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_extract_source_archive.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_extract_source_archive_ex.md b/externals/vcpkg/docs/maintainers/vcpkg_extract_source_archive_ex.md new file mode 100755 index 000000000..72b45d87c --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_extract_source_archive_ex.md @@ -0,0 +1,26 @@ +# vcpkg_extract_source_archive_ex + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_extract_source_archive_ex.md). + +Extract an archive into the source directory. +Originally replaced [`vcpkg_extract_source_archive()`], +but new ports should instead use the second overload of +[`vcpkg_extract_source_archive()`]. + +## Usage +```cmake +vcpkg_extract_source_archive_ex( + [OUT_SOURCE_PATH ] + ... +) +``` + +See the documentation for [`vcpkg_extract_source_archive()`] for other parameters. +Additionally, `vcpkg_extract_source_archive_ex()` adds the `REF` and `WORKING_DIRECTORY` +parameters, which are wrappers around `SOURCE_BASE` and `BASE_DIRECTORY` +respectively. + +[`vcpkg_extract_source_archive()`]: vcpkg_extract_source_archive.md + +## Source +[scripts/cmake/vcpkg\_extract\_source\_archive\_ex.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_extract_source_archive_ex.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_fail_port_install.md b/externals/vcpkg/docs/maintainers/vcpkg_fail_port_install.md new file mode 100755 index 000000000..1d59fd8c1 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_fail_port_install.md @@ -0,0 +1,45 @@ +# vcpkg_fail_port_install + +**This function has been deprecated in favor of the `supports` field in [`manifest file`](manifest-files.md#supports) et al.** + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_fail_port_install.md). + +Checks common requirements and fails the current portfile with a (default) error message + +## Usage +```cmake +vcpkg_fail_port_install( + [ALWAYS] + [MESSAGE <"Reason for failure">] + [ON_TARGET [ ...]] + [ON_ARCH [ ...]] + [ON_CRT_LINKAGE [ ...]]) + [ON_LIBRARY_LINKAGE [ ...]] +) +``` + +## Parameters +### MESSAGE +Additional failure message. If none is given, a default message will be displayed depending on the failure condition. + +### ALWAYS +Will always fail early + +### ON_TARGET +Targets for which the build should fail early. Valid targets are `` from `VCPKG_IS_TARGET_` (see `vcpkg_common_definitions.cmake`). + +### ON_ARCH +Architecture for which the build should fail early. + +### ON_CRT_LINKAGE +CRT linkage for which the build should fail early. + +### ON_LIBRARY_LINKAGE +Library linkage for which the build should fail early. + +## Examples + +* [aws-lambda-cpp](https://github.com/Microsoft/vcpkg/blob/master/ports/aws-lambda-cpp/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_fail\_port\_install.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_fail_port_install.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_find_acquire_program.md b/externals/vcpkg/docs/maintainers/vcpkg_find_acquire_program.md new file mode 100755 index 000000000..1e8a9b8bb --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_find_acquire_program.md @@ -0,0 +1,51 @@ +# vcpkg_find_acquire_program + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_find_acquire_program.md). + +Download or find a well-known tool. + +## Usage +```cmake +vcpkg_find_acquire_program() +``` +## Parameters +### program +This variable specifies both the program to be acquired as well as the out parameter that will be set to the path of the program executable. + +## Notes +The current list of programs includes: + +* 7Z +* ARIA2 (Downloader) +* BISON +* CLANG +* DARK +* DOXYGEN +* FLEX +* GASPREPROCESSOR +* GPERF +* PERL +* PYTHON2 +* PYTHON3 +* GIT +* GN +* GO +* JOM +* MESON +* NASM +* NINJA +* NUGET +* SCONS +* SWIG +* YASM + +Note that msys2 has a dedicated helper function: [`vcpkg_acquire_msys`](vcpkg_acquire_msys.md). + +## Examples + +* [ffmpeg](https://github.com/Microsoft/vcpkg/blob/master/ports/ffmpeg/portfile.cmake) +* [openssl](https://github.com/Microsoft/vcpkg/blob/master/ports/openssl/portfile.cmake) +* [qt5](https://github.com/Microsoft/vcpkg/blob/master/ports/qt5/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_find\_acquire\_program.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_find_acquire_program.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_find_fortran.md b/externals/vcpkg/docs/maintainers/vcpkg_find_fortran.md new file mode 100755 index 000000000..b02c0c51b --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_find_fortran.md @@ -0,0 +1,25 @@ +# vcpkg_find_fortran + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_find_fortran.md). + +Checks if a Fortran compiler can be found. +Windows(x86/x64) Only: If not it will switch/enable MinGW gfortran + and return required cmake args for building. + +## Usage +```cmake +vcpkg_find_fortran() +``` + +## Example +```cmake +vcpkg_find_fortran(fortran_args) +# ... +vcpkg_cmake_configure(... + OPTIONS + ${fortran_args} +) +``` + +## Source +[scripts/cmake/vcpkg\_find\_fortran.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_find_fortran.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_fixup_cmake_targets.md b/externals/vcpkg/docs/maintainers/vcpkg_fixup_cmake_targets.md new file mode 100755 index 000000000..b9ca9c4d7 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_fixup_cmake_targets.md @@ -0,0 +1,62 @@ +# vcpkg_fixup_cmake_targets + +**This function has been deprecated in favor of [`vcpkg_cmake_config_fixup`](ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md) from the vcpkg-cmake-config port.** + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_fixup_cmake_targets.md). + +Merge release and debug CMake targets and configs to support multiconfig generators. + +Additionally corrects common issues with targets, such as absolute paths and incorrectly placed binaries. + +## Usage +```cmake +vcpkg_fixup_cmake_targets([CONFIG_PATH ] + [TARGET_PATH ] + [TOOLS_PATH ] + [DO_NOT_DELETE_PARENT_CONFIG_PATH]) +``` + +## Parameters + +### CONFIG_PATH +Subpath currently containing `*.cmake` files subdirectory (like `lib/cmake/${PORT}`). Should be relative to `${CURRENT_PACKAGES_DIR}`. + +Defaults to `share/${PORT}`. + +### TARGET_PATH +Subpath to which the above `*.cmake` files should be moved. Should be relative to `${CURRENT_PACKAGES_DIR}`. +This needs to be specified if the port name differs from the `find_package()` name. + +Defaults to `share/${PORT}`. + +### DO_NOT_DELETE_PARENT_CONFIG_PATH +By default the parent directory of CONFIG_PATH is removed if it is named "cmake". +Passing this option disable such behavior, as it is convenient for ports that install +more than one CMake package configuration file. + +### NO_PREFIX_CORRECTION +Disables the correction of_IMPORT_PREFIX done by vcpkg due to moving the targets. +Currently the correction does not take into account how the files are moved and applies +I rather simply correction which in some cases will yield the wrong results. + +### TOOLS_PATH +Define the base path to tools. Default: `tools/` + +## Notes +Transform all `/debug//*targets-debug.cmake` files and move them to `/`. +Removes all `/debug//*targets.cmake` and `/debug//*config.cmake`. + +Transform all references matching `/bin/*.exe` to `/${TOOLS_PATH}/*.exe` on Windows. +Transform all references matching `/bin/*` to `/${TOOLS_PATH}/*` on other platforms. + +Fix `${_IMPORT_PREFIX}` in auto generated targets to be one folder deeper. +Replace `${CURRENT_INSTALLED_DIR}` with `${_IMPORT_PREFIX}` in configs and targets. + +## Examples + +* [concurrentqueue](https://github.com/Microsoft/vcpkg/blob/master/ports/concurrentqueue/portfile.cmake) +* [curl](https://github.com/Microsoft/vcpkg/blob/master/ports/curl/portfile.cmake) +* [nlohmann-json](https://github.com/Microsoft/vcpkg/blob/master/ports/nlohmann-json/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_fixup\_cmake\_targets.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_fixup_cmake_targets.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_fixup_pkgconfig.md b/externals/vcpkg/docs/maintainers/vcpkg_fixup_pkgconfig.md new file mode 100755 index 000000000..e94453d72 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_fixup_pkgconfig.md @@ -0,0 +1,49 @@ +# vcpkg_fixup_pkgconfig + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_fixup_pkgconfig.md). + +Fix common paths in *.pc files and make everything relative to $(prefix). +Additionally, on static triplets, private entries are merged with their non-private counterparts, +allowing pkg-config to be called without the ``--static`` flag. +Note that vcpkg is designed to never have to call pkg-config with the ``--static`` flag, +since a consumer cannot know if a dependent library has been built statically or not. + +## Usage +```cmake +vcpkg_fixup_pkgconfig( + [RELEASE_FILES ...] + [DEBUG_FILES ...] + [SKIP_CHECK] +) +``` + +## Parameters +### RELEASE_FILES +Specifies a list of files to apply the fixes for release paths. +Defaults to every *.pc file in the folder ${CURRENT_PACKAGES_DIR} without ${CURRENT_PACKAGES_DIR}/debug/ + +### DEBUG_FILES +Specifies a list of files to apply the fixes for debug paths. +Defaults to every *.pc file in the folder ${CURRENT_PACKAGES_DIR}/debug/ + +### SKIP_CHECK +Skips the library checks in vcpkg_fixup_pkgconfig. Only use if the script itself has unhandled cases. + +### SYSTEM_PACKAGES (deprecated) +This argument has been deprecated and has no effect. + +### SYSTEM_LIBRARIES (deprecated) +This argument has been deprecated and has no effect. + +### IGNORE_FLAGS (deprecated) +This argument has been deprecated and has no effect. + +## Notes +Still work in progress. If there are more cases which can be handled here feel free to add them + +## Examples + +* [brotli](https://github.com/Microsoft/vcpkg/blob/master/ports/brotli/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_fixup\_pkgconfig.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_fixup_pkgconfig.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_from_bitbucket.md b/externals/vcpkg/docs/maintainers/vcpkg_from_bitbucket.md new file mode 100755 index 000000000..944d7769c --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_from_bitbucket.md @@ -0,0 +1,60 @@ +# vcpkg_from_bitbucket + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_from_bitbucket.md). + +Download and extract a project from Bitbucket. + +## Usage: +```cmake +vcpkg_from_bitbucket( + OUT_SOURCE_PATH + REPO + [REF ] + [SHA512 <45d0d7f8cc350...>] + [HEAD_REF ] + [PATCHES ...] +) +``` + +## Parameters: +### OUT_SOURCE_PATH +Specifies the out-variable that will contain the extracted location. + +This should be set to `SOURCE_PATH` by convention. + +### REPO +The organization or user and repository on GitHub. + +### REF +A stable git commit-ish (ideally a tag) that will not change contents. **This should not be a branch.** + +For repositories without official releases, this can be set to the full commit id of the current latest master. + +If `REF` is specified, `SHA512` must also be specified. + +### SHA512 +The SHA512 hash that should match the archive (https://bitbucket.com/${REPO}/get/${REF}.tar.gz). + +This is most easily determined by first setting it to `0`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. + +### HEAD_REF +The unstable git commit-ish (ideally a branch) to pull for `--head` builds. + +For most projects, this should be `master`. The chosen branch should be one that is expected to be always buildable on all supported platforms. + +### PATCHES +A list of patches to be applied to the extracted sources. + +Relative paths are based on the port directory. + +## Notes: +At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present. + +This exports the `VCPKG_HEAD_VERSION` variable during head builds. + +## Examples: + +* [blaze](https://github.com/Microsoft/vcpkg/blob/master/ports/blaze/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_from\_bitbucket.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_from_bitbucket.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_from_git.md b/externals/vcpkg/docs/maintainers/vcpkg_from_git.md new file mode 100755 index 000000000..de56c6054 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_from_git.md @@ -0,0 +1,53 @@ +# vcpkg_from_git + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_from_git.md). + +Download and extract a project from git + +## Usage: +```cmake +vcpkg_from_git( + OUT_SOURCE_PATH + URL + REF <59f7335e4d...> + [HEAD_REF ] + [PATCHES ...] +) +``` + +## Parameters: +### OUT_SOURCE_PATH +Specifies the out-variable that will contain the extracted location. + +This should be set to `SOURCE_PATH` by convention. + +### URL +The url of the git repository. + +### REF +The git sha of the commit to download. + +### FETCH_REF +The git branch to fetch in non-HEAD mode. After this is fetched, +then `REF` is checked out. This is useful in cases where the git server +does not allow checking out non-advertised objects. + +### HEAD_REF +The git branch to use when the package is requested to be built from the latest sources. + +Example: `main`, `develop`, `HEAD` + +### PATCHES +A list of patches to be applied to the extracted sources. + +Relative paths are based on the port directory. + +## Notes: +`OUT_SOURCE_PATH`, `REF`, and `URL` must be specified. + +## Examples: + +* [fdlibm](https://github.com/Microsoft/vcpkg/blob/master/ports/fdlibm/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_from\_git.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_from_git.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_from_github.md b/externals/vcpkg/docs/maintainers/vcpkg_from_github.md new file mode 100755 index 000000000..16a1d29f8 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_from_github.md @@ -0,0 +1,78 @@ +# vcpkg_from_github + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_from_github.md). + +Download and extract a project from GitHub. Enables support for `install --head`. + +This also works with Gitea by specifying the Gitea server with the `GITHUB_HOST` option. + +## Usage: +```cmake +vcpkg_from_github( + OUT_SOURCE_PATH + REPO + [REF ] + [SHA512 <45d0d7f8cc350...>] + [HEAD_REF ] + [PATCHES ...] + [GITHUB_HOST ] + [AUTHORIZATION_TOKEN <${SECRET_FROM_FILE}>] + [FILE_DISAMBIGUATOR ] +) +``` + +## Parameters: +### OUT_SOURCE_PATH +Specifies the out-variable that will contain the extracted location. + +This should be set to `SOURCE_PATH` by convention. + +### REPO +The organization or user and repository on GitHub. + +### REF +A stable git commit-ish (ideally a tag or commit) that will not change contents. **This should not be a branch.** + +For repositories without official releases, this can be set to the full commit id of the current latest master. + +If `REF` is specified, `SHA512` must also be specified. + +### SHA512 +The SHA512 hash that should match the archive (https://github.com/${REPO}/archive/${REF}.tar.gz). + +This is most easily determined by first setting it to `0`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. + +### HEAD_REF +The unstable git commit-ish (ideally a branch) to pull for `--head` builds. + +For most projects, this should be `master`. The chosen branch should be one that is expected to be always buildable on all supported platforms. + +### PATCHES +A list of patches to be applied to the extracted sources. + +Relative paths are based on the port directory. + +### GITHUB_HOST +A replacement host for enterprise GitHub instances. + +This field should contain the scheme, host, and port of the desired URL without a trailing slash. + +### AUTHORIZATION_TOKEN +A token to be passed via the Authorization HTTP header as "token ${AUTHORIZATION_TOKEN}". + +### FILE_DISAMBIGUATOR +A token to uniquely identify the resulting filename if the SHA512 changes even though a git ref does not, to avoid stepping on the same file name. + +## Notes: +At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present. + +This exports the `VCPKG_HEAD_VERSION` variable during head builds. + +## Examples: + +* [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) +* [ms-gsl](https://github.com/Microsoft/vcpkg/blob/master/ports/ms-gsl/portfile.cmake) +* [boost-beast](https://github.com/Microsoft/vcpkg/blob/master/ports/boost-beast/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_from\_github.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_from_github.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_from_gitlab.md b/externals/vcpkg/docs/maintainers/vcpkg_from_gitlab.md new file mode 100755 index 000000000..b49453da4 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_from_gitlab.md @@ -0,0 +1,71 @@ +# vcpkg_from_gitlab + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_from_gitlab.md). + +Download and extract a project from Gitlab instances. Enables support for `install --head`. + +## Usage: +```cmake +vcpkg_from_gitlab( + GITLAB_URL + OUT_SOURCE_PATH + REPO + [REF ] + [SHA512 <45d0d7f8cc350...>] + [HEAD_REF ] + [PATCHES ...] + [FILE_DISAMBIGUATOR ] +) +``` + +## Parameters: + +### GITLAB_URL +The URL of the Gitlab instance to use. + +### OUT_SOURCE_PATH +Specifies the out-variable that will contain the extracted location. + +This should be set to `SOURCE_PATH` by convention. + +### REPO +The organization or user plus the repository name on the Gitlab instance. + +### REF +A stable git commit-ish (ideally a tag) that will not change contents. **This should not be a branch.** + +For repositories without official releases, this can be set to the full commit id of the current latest master. + +If `REF` is specified, `SHA512` must also be specified. + +### SHA512 +The SHA512 hash that should match the archive (${GITLAB_URL}/${REPO}/-/archive/${REF}/${REPO_NAME}-${REF}.tar.gz). +The REPO_NAME variable is parsed from the value of REPO. + +This is most easily determined by first setting it to `0`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. + +### HEAD_REF +The unstable git commit-ish (ideally a branch) to pull for `--head` builds. + +For most projects, this should be `master`. The chosen branch should be one that is expected to be always buildable on all supported platforms. + +### PATCHES +A list of patches to be applied to the extracted sources. + +Relative paths are based on the port directory. + +### FILE_DISAMBIGUATOR +A token to uniquely identify the resulting filename if the SHA512 changes even though a git ref does not, to avoid stepping on the same file name. + +## Notes: +At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present. + +This exports the `VCPKG_HEAD_VERSION` variable during head builds. + +## Examples: +* [curl][https://github.com/Microsoft/vcpkg/blob/master/ports/curl/portfile.cmake#L75] +* [folly](https://github.com/Microsoft/vcpkg/blob/master/ports/folly/portfile.cmake#L15) +* [z3](https://github.com/Microsoft/vcpkg/blob/master/ports/z3/portfile.cmake#L13) + +## Source +[scripts/cmake/vcpkg\_from\_gitlab.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_from_gitlab.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_from_sourceforge.md b/externals/vcpkg/docs/maintainers/vcpkg_from_sourceforge.md new file mode 100755 index 000000000..88379a8e2 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_from_sourceforge.md @@ -0,0 +1,73 @@ +# vcpkg_from_sourceforge + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_from_sourceforge.md). + +Download and extract a project from sourceforge. + +This function automatically checks a set of sourceforge mirrors. +Additional mirrors can be injected through the `VCPKG_SOURCEFORGE_EXTRA_MIRRORS` +list variable in the triplet. + +## Usage: +```cmake +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO + [REF <2.1-3>] + SHA512 <547b417109332...> + FILENAME + [DISABLE_SSL] + [NO_REMOVE_ONE_LEVEL] + [PATCHES ...] +) +``` + +## Parameters: +### OUT_SOURCE_PATH +Specifies the out-variable that will contain the extracted location. + +This should be set to `SOURCE_PATH` by convention. + +### REPO +The organization or user and repository (optional) on sourceforge. + +### REF +A stable version number that will not change contents. + +### FILENAME +The local name for the file. Files are shared between ports, so the file may need to be renamed to make it clearly attributed to this port and avoid conflicts. + +For example, we can get the download link: +https://sourceforge.net/settings/mirror_choices?projectname=mad&filename=libmad/0.15.1b/libmad-0.15.1b.tar.gz&selected=nchc +So the REPO is `mad/libmad`, the REF is `0.15.1b`, and the FILENAME is `libmad-0.15.1b.tar.gz` + +For some special links: +https://sourceforge.net/settings/mirror_choices?projectname=soxr&filename=soxr-0.1.3-Source.tar.xz&selected=nchc +The REPO is `soxr`, REF is not exist, and the FILENAME is `soxr-0.1.3-Source.tar.xz` + +### SHA512 +The SHA512 hash that should match the archive. + +This is most easily determined by first setting it to `0`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. + +### WORKING_DIRECTORY +If specified, the archive will be extracted into the working directory instead of `${CURRENT_BUILDTREES_DIR}/src/`. + +Note that the archive will still be extracted into a subfolder underneath that directory (`${WORKING_DIRECTORY}/${REF}-${HASH}/`). + +### PATCHES +A list of patches to be applied to the extracted sources. + +Relative paths are based on the port directory. + +### NO_REMOVE_ONE_LEVEL +Specifies that the default removal of the top level folder should not occur. + +## Examples: + +* [cunit](https://github.com/Microsoft/vcpkg/blob/master/ports/cunit/portfile.cmake) +* [polyclipping](https://github.com/Microsoft/vcpkg/blob/master/ports/polyclipping/portfile.cmake) +* [tinyfiledialogs](https://github.com/Microsoft/vcpkg/blob/master/ports/tinyfiledialogs/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_from\_sourceforge.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_from_sourceforge.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_get_program_files_platform_bitness.md b/externals/vcpkg/docs/maintainers/vcpkg_get_program_files_platform_bitness.md new file mode 100755 index 000000000..ed74869b8 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_get_program_files_platform_bitness.md @@ -0,0 +1,15 @@ +# vcpkg_get_program_files_platform_bitness + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_get_program_files_platform_bitness.md). + +Get the Program Files directory of the current platform's bitness: +either `$ENV{ProgramW6432}` on 64-bit windows, +or `$ENV{PROGRAMFILES}` on 32-bit windows. + +## Usage: +```cmake +vcpkg_get_program_files_platform_bitness() +``` + +## Source +[scripts/cmake/vcpkg\_get\_program\_files\_platform\_bitness.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_get_program_files_platform_bitness.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_get_windows_sdk.md b/externals/vcpkg/docs/maintainers/vcpkg_get_windows_sdk.md new file mode 100755 index 000000000..d3a3ee817 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_get_windows_sdk.md @@ -0,0 +1,13 @@ +# vcpkg_get_windows_sdk + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_get_windows_sdk.md). + +Get the Windows SDK number. + +## Usage: +```cmake +vcpkg_get_windows_sdk() +``` + +## Source +[scripts/cmake/vcpkg\_get\_windows\_sdk.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_get_windows_sdk.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_host_path_list.md b/externals/vcpkg/docs/maintainers/vcpkg_host_path_list.md new file mode 100755 index 000000000..d3f199889 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_host_path_list.md @@ -0,0 +1,29 @@ +# vcpkg_host_path_list + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_host_path_list.md). + +Modify a host path list variable (PATH, INCLUDE, LIBPATH, etc.) + +```cmake +vcpkg_host_path_list(PREPEND [...]) +vcpkg_host_path_list(APPEND [...]) +vcpkg_host_path_list(SET [...]) +``` + +`` may be either a regular variable name, or `ENV{variable-name}`, +in which case `vcpkg_host_path_list` will modify the environment. + +`vcpkg_host_path_list` adds all of the paths passed to it to ``; +`PREPEND` puts them before the existing list, so that they are searched first; +`APPEND` places them after the existing list, +so they would be searched after the paths which are already in the variable, +and `SET` replaces the value of the existing list. + +For all of `APPEND`, `PREPEND`, and `SET`, +the paths are added (and thus searched) in the order received. + +If no paths are passed to `APPEND` or `PREPEND`, nothing will be done; +for `SET`, the variable will be set to the empty string. + +## Source +[scripts/cmake/vcpkg\_host\_path\_list.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_host_path_list.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_install_cmake.md b/externals/vcpkg/docs/maintainers/vcpkg_install_cmake.md new file mode 100755 index 000000000..f8d3b6107 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_install_cmake.md @@ -0,0 +1,29 @@ +# vcpkg_install_cmake + +**This function has been deprecated in favor of [`vcpkg_cmake_install`](ports/vcpkg-cmake/vcpkg_cmake_install.md) from the vcpkg-cmake port.** + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_install_cmake.md). + +Build and install a cmake project. + +## Usage: +```cmake +vcpkg_install_cmake(...) +``` + +## Parameters: +See [`vcpkg_build_cmake()`](vcpkg_build_cmake.md). + +## Notes: +This command transparently forwards to [`vcpkg_build_cmake()`](vcpkg_build_cmake.md), adding a `TARGET install` +parameter. + +## Examples: + +* [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) +* [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) +* [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake) +* [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_install\_cmake.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_install_cmake.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_install_gn.md b/externals/vcpkg/docs/maintainers/vcpkg_install_gn.md new file mode 100755 index 000000000..ebc166ad2 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_install_gn.md @@ -0,0 +1,31 @@ +# vcpkg_install_gn + +**This function has been deprecated in favor of [`vcpkg_gn_install`](ports/vcpkg-gn/vcpkg_gn_install.md) from the vcpkg-gn port.** + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_install_gn.md). + +Installs a GN project. + +In order to build a GN project without installing, use [`vcpkg_build_ninja()`]. + +## Usage: +```cmake +vcpkg_install_gn( + SOURCE_PATH + [TARGETS ...] +) +``` + +## Parameters: +### SOURCE_PATH +The path to the source directory + +### TARGETS +Only install the specified targets. + +Note: includes must be handled separately + +[`vcpkg_build_ninja()`]: vcpkg_build_ninja.md + +## Source +[scripts/cmake/vcpkg\_install\_gn.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_install_gn.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_install_make.md b/externals/vcpkg/docs/maintainers/vcpkg_install_make.md new file mode 100755 index 000000000..19f4b5ca8 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_install_make.md @@ -0,0 +1,26 @@ +# vcpkg_install_make + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_install_make.md). + +Build and install a make project. + +## Usage: +```cmake +vcpkg_install_make(...) +``` + +## Parameters: +See [`vcpkg_build_make()`](vcpkg_build_make.md). + +## Notes: +This command transparently forwards to [`vcpkg_build_make()`](vcpkg_build_make.md), adding `ENABLE_INSTALL` + +## Examples + +* [x264](https://github.com/Microsoft/vcpkg/blob/master/ports/x264/portfile.cmake) +* [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake) +* [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake) +* [libosip2](https://github.com/Microsoft/vcpkg/blob/master/ports/libosip2/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_install\_make.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_install_make.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_install_meson.md b/externals/vcpkg/docs/maintainers/vcpkg_install_meson.md new file mode 100755 index 000000000..dcda9fb32 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_install_meson.md @@ -0,0 +1,22 @@ +# vcpkg_install_meson + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_install_meson.md). + +Builds a meson project previously configured with `vcpkg_configure_meson()`. + +## Usage +```cmake +vcpkg_install_meson([ADD_BIN_TO_PATH]) +``` + +## Parameters: +### ADD_BIN_TO_PATH +Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs. + +## Examples + +* [fribidi](https://github.com/Microsoft/vcpkg/blob/master/ports/fribidi/portfile.cmake) +* [libepoxy](https://github.com/Microsoft/vcpkg/blob/master/ports/libepoxy/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_install\_meson.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_install_meson.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_install_msbuild.md b/externals/vcpkg/docs/maintainers/vcpkg_install_msbuild.md new file mode 100755 index 000000000..8d0a31051 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_install_msbuild.md @@ -0,0 +1,95 @@ +# vcpkg_install_msbuild + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_install_msbuild.md). + +Build and install a msbuild-based project. This replaces `vcpkg_build_msbuild()`. + +## Usage +```cmake +vcpkg_install_msbuild( + SOURCE_PATH <${SOURCE_PATH}> + PROJECT_SUBPATH + [INCLUDES_SUBPATH ] + [LICENSE_SUBPATH ] + [RELEASE_CONFIGURATION ] + [DEBUG_CONFIGURATION ] + [TARGET ] + [TARGET_PLATFORM_VERSION <10.0.15063.0>] + [PLATFORM <${TRIPLET_SYSTEM_ARCH}>] + [PLATFORM_TOOLSET <${VCPKG_PLATFORM_TOOLSET}>] + [OPTIONS ...] + [OPTIONS_RELEASE ...] + [OPTIONS_DEBUG ...] + [USE_VCPKG_INTEGRATION] + [ALLOW_ROOT_INCLUDES | REMOVE_ROOT_INCLUDES] +) +``` + +## Parameters +### SOURCE_PATH +The path to the root of the source tree. + +Because MSBuild uses in-source builds, the source tree will be copied into a temporary location for the build. This +parameter is the base for that copy and forms the base for all XYZ_SUBPATH options. + +### USE_VCPKG_INTEGRATION +Apply the normal `integrate install` integration for building the project. + +By default, projects built with this command will not automatically link libraries or have header paths set. + +### PROJECT_SUBPATH +The subpath to the solution (`.sln`) or project (`.vcxproj`) file relative to `SOURCE_PATH`. + +### LICENSE_SUBPATH +The subpath to the license file relative to `SOURCE_PATH`. + +### INCLUDES_SUBPATH +The subpath to the includes directory relative to `SOURCE_PATH`. + +This parameter should be a directory and should not end in a trailing slash. + +### ALLOW_ROOT_INCLUDES +Indicates that top-level include files (e.g. `include/zlib.h`) should be allowed. + +### REMOVE_ROOT_INCLUDES +Indicates that top-level include files (e.g. `include/Makefile.am`) should be removed. + +### SKIP_CLEAN +Indicates that the intermediate files should not be removed. + +Ports using this option should later call [`vcpkg_clean_msbuild()`](vcpkg_clean_msbuild.md) to manually clean up. + +### RELEASE_CONFIGURATION +The configuration (``/p:Configuration`` msbuild parameter) used for Release builds. + +### DEBUG_CONFIGURATION +The configuration (``/p:Configuration`` msbuild parameter) used for Debug builds. + +### TARGET_PLATFORM_VERSION +The WindowsTargetPlatformVersion (``/p:WindowsTargetPlatformVersion`` msbuild parameter) + +### TARGET +The MSBuild target to build. (``/t:``) + +### PLATFORM +The platform (``/p:Platform`` msbuild parameter) used for the build. + +### PLATFORM_TOOLSET +The platform toolset (``/p:PlatformToolset`` msbuild parameter) used for the build. + +### OPTIONS +Additional options passed to msbuild for all builds. + +### OPTIONS_RELEASE +Additional options passed to msbuild for Release builds. These are in addition to `OPTIONS`. + +### OPTIONS_DEBUG +Additional options passed to msbuild for Debug builds. These are in addition to `OPTIONS`. + +## Examples + +* [libirecovery](https://github.com/Microsoft/vcpkg/blob/master/ports/libirecovery/portfile.cmake) +* [libfabric](https://github.com/Microsoft/vcpkg/blob/master/ports/libfabric/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_install\_msbuild.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_install_msbuild.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_install_nmake.md b/externals/vcpkg/docs/maintainers/vcpkg_install_nmake.md new file mode 100755 index 000000000..9ac942ef2 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_install_nmake.md @@ -0,0 +1,68 @@ +# vcpkg_install_nmake + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_install_nmake.md). + +Build and install a msvc makefile project. + +## Usage: +```cmake +vcpkg_install_nmake( + SOURCE_PATH <${SOURCE_PATH}> + [NO_DEBUG] + [TARGET ] + PROJECT_SUBPATH <${SUBPATH}> + PROJECT_NAME <${MAKEFILE_NAME}> + [PRERUN_SHELL <${SHELL_PATH}>] + [PRERUN_SHELL_DEBUG <${SHELL_PATH}>] + [PRERUN_SHELL_RELEASE <${SHELL_PATH}>] + [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] + [OPTIONS_RELEASE <-DOPTIMIZE=1>...] + [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] +``` + +## Parameters +### SOURCE_PATH +Specifies the directory containing the source files. +By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. + +### PROJECT_SUBPATH +Specifies the sub directory containing the `makefile.vc`/`makefile.mak`/`makefile.msvc` or other msvc makefile. + +### PROJECT_NAME +Specifies the name of msvc makefile name. +Default is makefile.vc + +### NO_DEBUG +This port doesn't support debug mode. + +### PRERUN_SHELL +Script that needs to be called before build + +### PRERUN_SHELL_DEBUG +Script that needs to be called before debug build + +### PRERUN_SHELL_RELEASE +Script that needs to be called before release build + +### OPTIONS +Additional options passed to generate during the generation. + +### OPTIONS_RELEASE +Additional options passed to generate during the Release generation. These are in addition to `OPTIONS`. + +### OPTIONS_DEBUG +Additional options passed to generate during the Debug generation. These are in addition to `OPTIONS`. + +## Parameters: +See [`vcpkg_build_nmake()`](vcpkg_build_nmake.md). + +## Notes: +This command transparently forwards to [`vcpkg_build_nmake()`](vcpkg_build_nmake.md), adding `ENABLE_INSTALL` + +## Examples + +* [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake) +* [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_install\_nmake.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_install_nmake.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_install_qmake.md b/externals/vcpkg/docs/maintainers/vcpkg_install_qmake.md new file mode 100755 index 000000000..4efc15794 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_install_qmake.md @@ -0,0 +1,26 @@ +# vcpkg_install_qmake + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_install_qmake.md). + +Build and install a qmake project. + +## Usage: +```cmake +vcpkg_install_qmake(...) +``` + +## Parameters: +See [`vcpkg_build_qmake()`](vcpkg_build_qmake.md). + +## Notes: +This command transparently forwards to [`vcpkg_build_qmake()`](vcpkg_build_qmake.md). + +Additionally, this command will copy produced .libs/.dlls/.as/.dylibs/.sos to the appropriate +staging directories. + +## Examples + +* [libqglviewer](https://github.com/Microsoft/vcpkg/blob/master/ports/libqglviewer/portfile.cmake) + +## Source +[scripts/cmake/vcpkg\_install\_qmake.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_install_qmake.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_list.md b/externals/vcpkg/docs/maintainers/vcpkg_list.md new file mode 100755 index 000000000..46aa7dabd --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_list.md @@ -0,0 +1,94 @@ +# vcpkg_list + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_list.md). + +A replacement for CMake's `list()` function, which correctly handles elements +with internal semicolons (in other words, escaped semicolons). +Use `vcpkg_list()` instead of `list()` whenever possible. + +```cmake +vcpkg_list(SET [...]) +vcpkg_list( [...]) +``` + +In addition to all of the commands from `list()`, `vcpkg_list` adds +a `vcpkg_list(SET)` command. +This command takes its arguments, escapes them, and then concatenates +them into a list; this should be used instead of `set()` for setting any +list variable. + +Otherwise, the `vcpkg_list()` function is the same as the built-in +`list()` function, with the following restrictions: + +- `GET`, `REMOVE_ITEM`, and `REMOVE_AT` support only one index/value +- `POP_BACK` and `POP_FRONT` do not support getting the value into + another out variable. Use C++ style `GET` then `POP_(BACK|FRONT)`. +- `FILTER` and `TRANSFORM` are unsupported. + +See the [CMake documentation for `list()`](https://cmake.org/cmake/help/latest/command/list.html) +for more information. + +## Notes: Some Weirdnesses + +The most major weirdness is due to `""` pulling double-duty as "list of zero elements", +and "list of one element, which is empty". `vcpkg_list` always uses the former understanding. +This can cause weird behavior, for example: + +```cmake +set(lst "") +vcpkg_list(APPEND lst "" "") +# lst = ";" +``` + +This is because you're appending two elements to the empty list. +One very weird behavior that comes out of this would be: + +```cmake +set(lst "") +vcpkg_list(APPEND lst "") +# lst = "" +``` + +since `""` is the empty list, we append the empty element and end up with a list +of one element, which is empty. This does not happen for non-empty lists; +for example: + +```cmake +set(lst "a") +vcpkg_list(APPEND lst "") +# lst = "a;" +``` + +only the empty list has this odd behavior. + +## Examples + +### Creating a list + +```cmake +vcpkg_list(SET foo_param) +if(DEFINED arg_FOO) + vcpkg_list(SET foo_param FOO "${arg_FOO}") +endif() +``` + +### Appending to a list + +```cmake +set(OPTIONS -DFOO=BAR) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_list(APPEND OPTIONS "-DOS=WINDOWS;FOO") +endif() +``` + +### Popping the end off a list + +```cmake +if(NOT list STREQUAL "") + vcpkg_list(GET list end -1) + vcpkg_list(POP_BACK list) +endif() +``` + +## Source +[scripts/cmake/vcpkg\_list.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_list.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_minimum_required.md b/externals/vcpkg/docs/maintainers/vcpkg_minimum_required.md new file mode 100755 index 000000000..caf975f61 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_minimum_required.md @@ -0,0 +1,17 @@ +# vcpkg_minimum_required + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_minimum_required.md). + +Asserts that the version of the vcpkg program being used to build a port is later than the supplied date, inclusive. + +## Usage +```cmake +vcpkg_minimum_required(VERSION 2021-01-13) +``` + +## Parameters +### VERSION +The date-version to check against. + +## Source +[scripts/cmake/vcpkg\_minimum\_required.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_minimum_required.cmake) diff --git a/externals/vcpkg/docs/maintainers/vcpkg_replace_string.md b/externals/vcpkg/docs/maintainers/vcpkg_replace_string.md new file mode 100755 index 000000000..967dd3c01 --- /dev/null +++ b/externals/vcpkg/docs/maintainers/vcpkg_replace_string.md @@ -0,0 +1,12 @@ +# vcpkg_replace_string + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_replace_string.md). + +Replace a string in a file. + +```cmake +vcpkg_replace_string( ) +``` + +## Source +[scripts/cmake/vcpkg\_replace\_string.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_replace_string.cmake) diff --git a/externals/vcpkg/docs/specifications/binarycaching.md b/externals/vcpkg/docs/specifications/binarycaching.md new file mode 100755 index 000000000..d9c55d5d1 --- /dev/null +++ b/externals/vcpkg/docs/specifications/binarycaching.md @@ -0,0 +1,159 @@ +# Binary Caching v1.1 (Jul 14, 2020) + +**Note: this is the feature as it was initially specified and does not necessarily reflect the current behavior.** + +**Up-to-date documentation is available at [Binarycaching](../users/binarycaching.md).** + +## Motivation + +The primary motivation of binary caching is to accelerate two broad scenarios in an easily accessible way + +- Continuous Integration + +- Developer Environment Changes (first-time or branch change) + +We generally believe both of these scenarios are addressed with the same feature set, however when differences arise they will be discussed in the individual scenarios. + +It should also be explicitly noted that this specification does not intend to propose a "Microsoft Sanctioned Public Binaries Service" such as nuget.org – we only intend to enable users to leverage services they already have access to, such as GitHub, local file shares, Azure Artifacts, etc. + +## Key User Stories + +### CI -> CI + +In this story, a CI build using either persistent or non-persistent machines wants to potentially reuse binaries built in a previous run of the pipeline. This is partially covered by the Cache tasks in GitHub Actions or Azure DevOps Pipelines, however the Cache task is all-or-nothing: a single package change will prevent restoration and require rebuilding the entire graph which is unacceptable in many scenarios (such as if actively developing one of the packages). + +### CI -> Developer + +In this story, the developer wants to reuse binaries built during a CI run. Given appropriate CI coverage, most developers will always have any needed dependencies pre-built by the CI system. + +Notably, this scenario indicates a need for Read/Write access granularity on the remote storage solution. Developers should not need write access to the output from the CI system for security reasons. + +### Single Developer (same machine reuse) + +With the introduction of manifest files, each project will have separate instances of Vcpkg. The performance costs of rebuilding binaries across each cloned project can be debilitating for those working in micro-repos or open source; for the monolithic enterprise developer it is simply frustrating. + +User-wide binary caching alleviates the pain of this scenario by ensuring the same binaries aren’t built multiple times (as long as the projects truly overlap with respect to versions/packages/etc). + +### Developer <-> Developer (multi-machine / team scenario) + +In a small team scenario, it's reasonable that multiple developer machines can trust each other enough to share binaries. This also applies to developers that have multiple machines and wish to share binaries between them (given a similar enough environment). + +## Solution Aspects + +### Tracking Compilers + +In order to provide reliable binary caching, vcpkg must determine if the produced binaries are appropriate for the current context. Currently, we consider many factors, including: + +- All files in the port directory + +- The toolchain file contents + +- The triplet contents + +- All dependency binaries + +- The version of the CMake tool used to build + +and a few others. + +However, we notably do not currently track the compiler used. This is critical for all cross-machine scenarios, as the environment is likely to change incompatibly from machine to machine. We propose hashing the compiler that will used by CMake. This can be accomplished either by reimplementing the logic of CMake or running some partial project and extracting the results. For performance reasons, we will prefer first using heuristics to approximate the CMake logic with accompanying documentation for users that fall outside those bounds. + +Another aspect of the environment we don't currently track is the CRT version on Linux systems. Currently, we believe this will not cause as many problems in most practices (thus not suitable for an MVP), since the compiler will (generally) link against the system CRT and should sufficiently reflect any differences. This can also be easily worked around by the user with documentation – the toolchain file can simply have a comment such as "# this uses muslc", which will cause it to hash differently. + +### Better control over source modifications + +Currently, vcpkg caches sources inside `buildtrees/$PORT/src/`. The built-in helpers, such as `vcpkg_extract_archive_ex()` assume that if the appropriately named source folder exists, it is true, accurate, and without modification. + +However, the basic workflow for working on ports (specifically, developing patches) breaks this assumption by directly editing whatever extracted source directory the tool is currently using until a successful build is achieved. The user then usually builds a patch file from their changes, then checks it in to the port directory (adding the changes to one of the tracked locations above) and everything is restored to normal. + +However, this causes serious issues with the current tracking system, because modifications to this cached source are not detected and tracked into the binary package. + +Our proposed solution is to force source re-extraction each time during builds that have uploading to any protocol enabled. Uploading/downloading can then be disabled on the command line via the --editable switch to reuse extracted sources and enable the current workflow. + +### Protocols + +To service different scenarios and user requirements, we need to support multiple backends. Currently, our CI system uses our only implemented backend: file-based archives. + +#### Backend #1: File-Based Archives + +This backend simply stores .zip files in a hierarchy similar to git objects: `$VCPKG_ROOT/archives/$XX/$YYYY.zip` with `$XX` being the first two characters of the computed package hash, and `$YYYY` being the full expanded hash. It also supports storing failure logs as `$VCPKG_ROOT/archives/fail/$XX/$YYYY.zip`, however we consider this an internal feature that is not relevant to the key User Stories. + +Our CI system uses this backend by symlinking this directory to an Azure Files share, enabling built binaries and failure logs to be shared by all machines in the pool. Credentials are handled at the time of mounting the Azure Files share, so this does not require interactive authentication. + +This protocol is ideal due to simplicity for same-machine reuse and simple serverless scenarios such as using networked SMB folders across multiple machines for very small teams. However, it has three significant limitations in the current incarnation: + +- It uses the hardcoded directory `$VCPKG_ROOT/archives` (redirectable using symlinks, but unwieldy) + +- It cannot use multiple directories + +- There is no ability to treat directories as "read-only"/immutable + +These second two points are required to implement the very useful concept of "fallback" folders (see https://github.com/NuGet/Home/wiki/%5BSpec%5D-Fallback-package-folders for NuGet’s spec on this topic). + +#### Backend #2: NuGet (Azure DevOps Artifacts, GitHub Packages, etc) + +This backend packages binaries into a "raw" NuGet package (not suitable for direct import by MSBuild projects) and uploads them to supported NuGet servers such as Azure DevOps Artifacts and GitHub Packages. We believe this will best satisfy the CI scenarios – both CI -> CI as well as CI -> Developer by relying on powerful, centralized, managed hosting. + +There is a difference in this case between the developer and CI scenarios. The developer generally wants to configure their remotes for the project and then be able to run vcpkg commands as normal, with packages automatically being downloaded and uploaded to optimize the experience. This is similar to File-Based Archives. + +While a CI system could use the same workflow as a developer, there are a few key differences. First, a CI system must use a stored secret for authentication, because it cannot interactively authenticate. Second, to enable more complex interactions with systems such as package signing and task-based restores, we must also support a 4-step workflow: + +1. Vcpkg computes hashes of any potentially required packages and writes them to a file + +2. An unspecified service/task/etc can parse this file and download any appropriate packages + +3. vcpkg is then invoked a second time, with any downloaded packages. This consumes the packages, performs any installations and builds, and potentially produces new packages to an output folder. + +4. Finally, another unspecified service/task/etc can take these output packages, sign them, and upload them. + +This flow enables arbitrarily complex, user-defined authentication and signing schemes, such as the tasks provided by GitHub Actions and Azure DevOps Pipelines or manual signing as documented in the NuGet documentation: https://docs.microsoft.com/en-us/nuget/create-packages/sign-a-package. + +#### Configuration + +Currently, our file-based backend is enabled by passing the undocumented `--binarycaching` flag to any Vcpkg command or setting the undocumented environment variable `VCPKG_FEATURE_FLAGS` to `binarycaching`. We will replace this feature flag with an on-by-default user-wide behavior, plus command line and environment-based configurability. + +The on-by-default configuration will specify the file-based archive protocol on either `%LOCALAPPDATA%/vcpkg/archives` (Windows) or `$XDG_CACHE_HOME/vcpkg/archives` (Unix). If `XDG_CACHE_HOME` is not defined on Unix, we will fall back to `$HOME/.cache/vcpkg/archives` based on the [XDG Base Directory Specification][1]. This can be redirected with a symlink, or completely overridden with the command line or environment. In the future we can also consider having a user-wide configuration file, however we do not believe this is important for any of our key scenarios. + +On the command line, a backend can be specified via `--binarysource=`. Multiple backends can be specified by passing the option multiple times and the order of evaluation is determined by the order on the command line. Writes will be performed on all upload backends, but only for packages that were built as part of this build (the tool will not repackage/reupload binaries downloaded from other sources). + +The environment variable `VCPKG_BINARY_SOURCES` can be set to a semicolon-delimited list of ``. Empty `` strings are valid and ignored, to support appending like `set VCPKG_BINARY_SOURCES=%VCPKG_BINARY_SOURCES%;foo` or `export VCPKG_BINARY_SOURCES="$VCPKG_BINARY_SOURCES;foo"` + +`` can be any of: + +- `clear` - ignore all lower priority sources (lowest priority is default, then env, then command line) + +- `default[,]` - Reintroduce the default ~/.vcpkg/packages (as read-only or with uploading) + +- `files,[,]` - Add a file-based archive at `` + +- `nuget,[,]` - Add a nuget-based source at ``. This url has a similar semantic as `nuget.exe restore -source ` for reads and `nuget.exe push -source ` for writes; notably it can also be a local path. + +- `nugetconfig,[,]` - Add a nuget-based source using the NuGet.config file at ``. This enables users to fully control NuGet's execution in combination with the documented NuGet environment variables. This has similar semantics to `nuget.exe push -ConfigFile ` and `nuget.exe restore -ConfigFile `. + +- `interactive` - Enables interactive mode (such as manual credential entry) for all other configured backends. + +`` can be any of `read`, `write`, or `readwrite` to control whether packages will be consumed or published. + +Backtick (`) can be used as an escape character within config strings, with double backtick (``) inserting a single backtick. All paths must be absolute. + +For all backends, noninteractive operation will be the default and the vcpkg tool will take a `--interactive` parameter to enable prompting for user credentials (if needed by the backend). + +To enable the 4-step flow, `vcpkg install` will take a command `--write-nuget-packages-config=` which can be used in combination with `--dry-run`. This path can be relative and will resolve with respect to the current working directory. + +[1]: https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html + +#### Example 4-step flow + +``` +PS> vcpkg install --dry-run pkg1 pkg2 pkg3 --write-nuget-packages-config=packages.config +``` + +An unspecified process, such as `nuget.exe restore packages.config -packagedirectory $packages` or the [ADO task][2], restores the packages to `$packages`. + +``` +PS> vcpkg install pkg1 pkg2 pkg3 --binarysource=clear --binarysource=nuget,$outpkgs,upload --binarysource=nuget,$packages +``` + +Another unspecified process such as `nuget.exe sign $outpkgs/*.nupkg` and `nuget.exe push $outpkgs/*.nupkg` or the ADO task uploads the packages for use in future CI runs. + +[2]: https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/package/nuget?view=azure-devops diff --git a/externals/vcpkg/docs/specifications/export-command.md b/externals/vcpkg/docs/specifications/export-command.md new file mode 100755 index 000000000..5464e9408 --- /dev/null +++ b/externals/vcpkg/docs/specifications/export-command.md @@ -0,0 +1,174 @@ +# Binary Export (Apr 28, 2017) + +**Note: this is the feature as it was initially specified and does not necessarily reflect the current behavior.** + +## 1. Motivation + +### A. Build once and share + +Customers want to be able to build their set of required libraries once, and then distribute the resulting binaries to all members of the "group". This has been brought up in +- Enterprise environments, in which there are dedicated teams to acquire libraries and then share them with other teams to consume them +- Academic environments, in which the professor/teacher wants to build the required libraries and then provide them to all the students +- CI Systems, in which developers want to quickly distribute their exact set of dependencies to a cloud-based farm of build machines + +Building once and sharing ensures that everyone gets exactly the same binaries, isolates the building effort to a small number of people and minimizes friction to obtain them. Therefore, there is value in enabling users to easily export ready-to-share binaries from `vcpkg`. + +### B. Very large libraries + +Libraries like [Qt][] can take a very long time to build (5+ hours). Therefore, having the ability to build them and then distribute the binaries can save a lot of time. + +### C. Flexibility and uses without `vcpkg` + +`vcpkg` currently handles cases where you have a `vcpkg` enlistment on your machine and use it for acquiring libraries and integrating into Visual Studio, CMake etc. However, users need the ability to build the libraries and then use them outside of and independently of `vcpkg`. For example: +- Use `vcpkg` for the build, then host the binaries in a website (similarly to nuget) +- Use `vcpkg` for the build, then put the binaries in an installer and distribute the installer + +Consuming the libraries outside of `vcpkg` forfeits the ability to install new libraries or update existing ones, but this can be: +- not a concern, like in a short term project or assignment +- explicitly desired, like in the development of a game where libraries and their versions are sealed for a particular release, never to be modified + +### D. Easy consumption in Visual Studio for NuGet users + +Customers have requested C++ NuGet packages to integrate into their project. This has come from: +- Customers than have used NuGet (e.g. in C#) and find it very convenient +- Customers who are working on a C# project that has a few dependencies on C++ and just want those dependencies to be satisfied in the most automatic way possible + +Providing a way to create NuGet packages provides great value to those customers. In an enterprise environment which focuses on C#, the dedicated acquisition team can create the NuGet packages with `vcpkg` and provide them to the other developers. For the "end-developer", this makes the consumption of C++ libraries the same as C# ones. + +[Qt]: https://www.qt.io/ + +## 2. Other design concerns + +- The `vcpkg` root may have a variety of packages built and many of them might be unrelated to the current task. Providing an easy way to export a subset of them will enhance user experience. +- Since binary compatibility is not guaranteed, it is not safe to individually export packages. Therefore, when exporting a particular package, all of the dependencies that it was built against must also be present in the export format (e.g. zip file). When a `vcpkg export` command succeeds, there is a guarantee that all required headers/binaries are available in the target bundle. + +## 3. Proposed solution + +This document proposes the `vcpkg export` command to pack the desired binaries in a convenient format. It is not the goal of this document to discuss binary distribution for C++ in a similar way that NuGet does for C#. It proposes exporting "library sets" instead of individual libraries as a solution to the C++ binary incompatibility problem. + +From a user experience perspective, the user expresses interest in exporting a particular library (e.g. `vcpkg export cpprestsdk`). `vcpkg export` should then make sure that the output contains `cpprestsdk` along with all dependencies it was actually built against. + +## 4. Proposed User experience + +### i. User knows what libraries he needs and wants to export them to an archive format (zip) +Developer Bob needs gtest and cpprestsdk and has been manually building them and their dependencies, then using the binaries in his project via applocal deployment. Bob has been experimenting with `vcpkg` and wants to use `vcpkg` for the building part only. + +Bob tries to export the libraries: +```no-highlight +> vcpkg export gtest cpprestsdk --zip +The following packages are already built and will be exported: + * boost:x86-windows + * bzip2:x86-windows + cpprestsdk:x86-windows + * openssl:x86-windows + * websocketpp:x86-windows + * zlib:x86-windows +The following packages need to be built: + gtest:x86-windows +Additional packages (*) need to be exported to complete this operation. +There are packages that have not been built. +To build them, run: + vcpkg install gtest:x86-windows +``` + +Bob proceeds to install the missing libraries: +```no-highlight +> vcpkg install gtest:x86-windows +// -- omitted build information -- // +Package gtest:x86-windows is installed. +``` + +Bob then returns to export the libraries: +```no-highlight +> vcpkg export gtest cpprestsdk --zip +The following packages are already built and will be exported: + * boost:x86-windows + * bzip2:x86-windows + cpprestsdk:x86-windows + gtest:x86-windows + * openssl:x86-windows + * websocketpp:x86-windows + * zlib:x86-windows +Additional packages (*) need to be exported to complete this operation. +Exporting package zlib:x86-windows... +Exporting package zlib:x86-windows... done +Exporting package openssl:x86-windows... +Exporting package openssl:x86-windows... done +Exporting package bzip2:x86-windows... +Exporting package bzip2:x86-windows... done +Exporting package boost:x86-windows... +Exporting package boost:x86-windows... done +Exporting package websocketpp:x86-windows... +Exporting package websocketpp:x86-windows... done +Exporting package cpprestsdk:x86-windows... +Exporting package cpprestsdk:x86-windows... done +Exporting package gtest:x86-windows... +Exporting package gtest:x86-windows... done +Creating zip archive... +Creating zip archive... done +zip archive exported at: C:/vcpkg/vcpkg-export-20170428-155351.zip +``` + +Bob takes the zip file and extracts the contents next to his other dependencies. Bob can now proceed with building his own project as before. + +### ii. User has a vcpkg root that works and wants to share it +Developer Alice has been using `vcpkg` and has a Visual Studio project that consumes libraries from it (via `vcpkg integrate`). The project is built for both 32-bit and 64-bit architectures. Alice wants to quickly share the dependencies with Bob so he can test the project. +```no-highlight +> vcpkg export gtest zlib gtest:x64-windows zlib:x64-windows --nuget +The following packages are already built and will be exported: + gtest:x86-windows + gtest:x64-windows + zlib:x86-windows + zlib:x64-windows +Exporting package zlib:x86-windows... +Exporting package zlib:x86-windows... done +Exporting package zlib:x64-windows... +Exporting package zlib:x64-windows... done +Exporting package gtest:x86-windows... +Exporting package gtest:x86-windows... done +Exporting package gtest:x64-windows... +Exporting package gtest:x64-windows... done +Creating nuget package... +Creating nuget package... done +Nuget package exported at: C:/vcpkg/scripts/buildsystems/tmp/vcpkg-export-20170428-164312.nupkg +``` + +Alice gives to Bob: a) The link to her project and b) The NuGet package "vcpkg-export-20170428-164312.nupkg". Bob clones the project and then installs the NuGet package. Bob is now ready to build Alice's project. + +### iii. User has a vcpkg root that works and wants to share it #2 +Developer Alice has been using `vcpkg` and has a CMake project that consumes libraries from it (via CMake toolchain file). Alice wants to quickly share the dependencies with Bob so he can test the project. +```no-highlight +> vcpkg export cpprestsdk zlib --zip +The following packages are already built and will be exported: + * boost:x86-windows + * bzip2:x86-windows + cpprestsdk:x86-windows + * openssl:x86-windows + * websocketpp:x86-windows + zlib:x86-windows +Additional packages (*) need to be exported to complete this operation. +Exporting package zlib:x86-windows... +Exporting package zlib:x86-windows... done +Exporting package openssl:x86-windows... +Exporting package openssl:x86-windows... done +Exporting package bzip2:x86-windows... +Exporting package bzip2:x86-windows... done +Exporting package boost:x86-windows... +Exporting package boost:x86-windows... done +Exporting package websocketpp:x86-windows... +Exporting package websocketpp:x86-windows... done +Exporting package cpprestsdk:x86-windows... +Exporting package cpprestsdk:x86-windows... done +Creating zip archive... +Creating zip archive... done +zip archive exported at: C:/vcpkg/vcpkg-export-20170428-155351.zip +``` + +Alice gives to Bob: a) The links to her project and b) The zip file "vcpkg-export-20170428-155351.zip". Bob clones the project, extracts the zip file and uses the provided (in the zip) CMake toolchain file to make the dependencies available to CMake. Bob is now ready to build Alice's project. + +## 5. Technical model + +- Each exported library, must be accompanied with all of its dependencies, even if they are not explicitly specified in the `vcpkg export` command. +- When exporting a library, a dependency graph will be built, similarly to install, to figure out which packages need to be exported. +- It is allowed to have packages from different triplets, so users can include 32/64-bit and dynamic/static binaries in the same export. +- The exported archives also include the files needed to integrate with MSBuild and/or CMake. \ No newline at end of file diff --git a/externals/vcpkg/docs/specifications/feature-packages.md b/externals/vcpkg/docs/specifications/feature-packages.md new file mode 100755 index 000000000..5737c650a --- /dev/null +++ b/externals/vcpkg/docs/specifications/feature-packages.md @@ -0,0 +1,291 @@ +# Proposal: Features / Feature packages (Feb 23 2017) + +**Note: this is the feature as it was initially specified and does not necessarily reflect the current behavior.** + +**Up-to-date documentation is available at [Selecting Library Features](../users/selecting-library-features.md).** + +## 1. Motivation + +### A. OpenCV + CUDA + +[OpenCV][] is a computer vision library that can optionally be built with CUDA support to massively accelerate certain tasks when using computers with NVidia GPUs. For users without NVidia GPUs, building with CUDA support provides no benefit. [CUDA][] is provided only via a 1.3 GB installer (at the time of this authoring), which requires administrator access to install and modifies the global system state. + +Therefore, there is significant value in enabling users to choose whether they find CUDA support valuable for their particular scenario. + +### B. OpenCV + OpenCV\_contrib + +The community around [OpenCV][] has built up a library of extensions called [OpenCV_contrib][]. However, these extensions are a source-level patch onto the main OpenCV codebase and therefore must be applied _during_ the core OpenCV build. Further confounding the problem, it is the author's understanding that these community extensions have only been developed with [CUDA][] enabled and cannot be built without that dependency. + +Therefore, if CUDA is disabled, OpenCV\_contrib must also be disabled. Likewise, when a user requests OpenCV\_contrib, CUDA must be enabled. It would be convenient, but not a requirement, to enable CUDA without enabling the community extensions. + +Finally, these extensions add additional exports and headers which could be depended upon by other libraries. For maintainers, there must be a way to specify this requirement such that `vcpkg install mylib-depends-ocv-contrib` will verify/build/rebuild OpenCV with the community extensions enabled. + +### C. C++ REST SDK + SignalR + +The [C++ REST SDK][cpprestsdk] is a networking library that provides (among other features) HTTP and Websockets clients. To implement the HTTP client functionality on Windows Desktop, only the core Win32 platform APIs are needed (`zlib` is optional). + +However, the websockets client is based on [Websockets++][], which adds mandatory dependencies on `boost`, `openssl`, and `zlib`. Many users of the C++ REST SDK do not use the websockets component, so to minimize their overall dependency footprint it can be disabled at build time. Ideally, these kinds of options would be easily accessible to users in Vcpkg who are concerned about the final size or licensing of their deployment. + +[SignalR-Client-Cpp][SignalR] depends on the websockets functionality provided by the C++ REST SDK. Therefore, the maintainers of the `signalrclient` port would ideally like to express this dependency such that `cpprestsdk` will be automatically correctly built for their needs. Note that `signalrclient` does not _inherently_ care about `boost`, `websocketspp` or `openssl` -- it depends only on the public websocket client APIs provided by `cpprestsdk`. It would be much more maintainable to declare dependencies based on the public APIs rather than the dependencies themselves. + +[OpenCV]: http://opencv.org/ +[CUDA]: http://www.nvidia.com/object/cuda_home_new.html +[OpenCV_contrib]: https://github.com/opencv/opencv_contrib +[cpprestsdk]: https://github.com/Microsoft/cpprestsdk +[Websockets++]: https://www.zaphoyd.com/websocketpp/ +[SignalR]: https://github.com/aspnet/SignalR-Client-Cpp + +## 2. Other design concerns + +- General-purpose Open Source projects must be able to easily and succinctly describe their build dependencies inside Vcpkg. This should be no more verbose than a single `vcpkg install` line and, when that command succeeds, there is a strong expectation that all required functionality/headers/imports are available. + +- The internal state of the Vcpkg enlistment must be either extremely transparent OR managed by version control (git). This enables larger projects to efficiently transfer the entire state of their customized Vcpkg system between machines (and onto build servers) by having the destination clone and then run a single `vcpkg install` line for the subset of dependencies required. The results of this operation should be as repeatable as reasonably achievable given the current limits of the underlying toolchain. + +## 3. Proposed solution + +A key summary of the above motivations is that they are all scenarios surrounding APIs that are not independently buildable from each other. We have an existing solution for APIs that are independently buildable: separate packages. Therefore, we seek to extend the user-facing notion of "packages" to include capabilities and contracts that cannot be made into independent builds. + +This document proposes "features" (also called feature packages). These features are intended to model semi-independently toggleable API sets/contracts such that they can be sanely depended upon by other packages. It is not a goal to model exclusive alternatives (such as implementation choices that are not directly user-observable) through this mechanism. + +- Individual libraries within `boost` may be reasonably represented as features. +- Whether a graphics library is built on DirectX xor OpenGL (where one but not both must be chosen) is not representable as a feature. + +From a user experience perspective (i.e. from `vcpkg install`) feature packages act as much as possible like completely independent packages. However, internally, any change to a package's features will result in a rebuild of the associated "parent" package. This will invoke a package rebuild experience similar to upgrading. + +When using `vcpkg install `, some features will be enabled by default. These default features can be avoided by referring to the packages as `[core]` and features can be added by supplying them on the same installation line. + +### A. Proposed User experience + +#### i. User with no preference about options +Install of a library with default features: +```no-highlight +> vcpkg install cpprestsdk +// -- omitted build information -- // +Package cpprestsdk[core]:x86-windows is installed. +Package cpprestsdk[compression]:x86-windows is installed. +Package cpprestsdk[ws-client]:x86-windows is installed. +``` + +Removal of that library: +```no-highlight +> vcpkg remove cpprestsdk +The following packages will be removed: + cpprestsdk:x86-windows +Removing package cpprestsdk:x86-windows... +Removing package cpprestsdk:x86-windows... done +Purging package cpprestsdk:x86-windows... +Cleaned up D:\src\vcpkg\packages\cpprestsdk_x64-windows +Purging package cpprestsdk:x86-windows... done +``` + +Installation of a library with optional features: +```no-highlight +> vcpkg install opencv +// -- omitted build information -- // +Package opencv[core]:x86-windows is installed. +``` + +#### ii. User desires CUDA support for OpenCV directly, and is unfamiliar with feature packages +Developer Bob knows he wants OpenCV, so he guesses what the package is called +```no-highlight +> vcpkg install opencv +// -- omitted build information -- // +Package opencv[core]:x86-windows is installed. +``` + +Bob attempts to build his application against OpenCV (assuming CUDA), which fails at runtime or compile time indicating that OpenCV wasn't built with CUDA. +Bob comes back to vcpkg, not knowing about the "feature packages" feature. The primary inquiry tools for Vcpkg are `search` and `list`, so he runs `vcpkg search`: +```no-highlight +> vcpkg search opencv +opencv 3.2.0 computer vision library +opencv[cuda] support for NVidia CUDA +opencv[contrib] community supported extensions for OpenCV + +If your library is not listed, please open an issue at: + https://github.com/Microsoft/vcpkg/issues +``` +He isn't immediately sure what the lack of a version number means, but anything in `vcpkg search` can be applied to `vcpkg install`, so he runs: +```no-highlight +> vcpkg install opencv[cuda] +The following packages will be rebuilt: + opencv:x86-windows + +To rebuild with this feature, use: + vcpkg remove opencv:x86-windows + vcpkg install opencv[core,cuda]:x86-windows +``` +Bob follows the instructions... +```no-highlight +> vcpkg remove opencv:x86-windows +// -- omitted results as above -- // +> vcpkg install opencv[core,cuda]:x86-windows +// -- omitted build information -- // +Package opencv[core]:x86-windows is installed. +Package opencv[cuda]:x86-windows is installed. +``` +and he can now use OpenCV's CUDA support in his application. + +#### iii. User is familiar with feature packages, and wants to opt-out of a feature +Developer Alice has used `cpprestsdk`, built it from source, and she knows about the option to disable websockets. She uses `search` to find the complete list of features: +``` +> vcpkg search cpprestsdk +cpprestsdk 2.9.0-2 C++11 JSON, REST, and OAuth library The C++ RES... +cpprestsdk[compression] Gzip compression support in the HTTP client. +cpprestsdk[ws-client] Websocket client support based on websocketspp. + +If your library is not listed, please open an issue at: + https://github.com/Microsoft/vcpkg/issues +``` + +She decided she only wants `cpprestsdk[compression]`, so she installs only that feature: +```no-highlight +> vcpkg install cpprestsdk[compression] +// -- omitted build information -- // +Package cpprestsdk[core]:x86-windows is installed. +Package cpprestsdk[compression]:x86-windows is installed. +``` +She receives a quick recursive build that only depends on `zlib`. + +She's now interested in some additional libraries built on top of cpprestsdk: `azure-storage-cpp` and `signalrclient`. +```no-highlight +> vcpkg install azure-storage-cpp +// -- omitted build information -- // +Package azure-storage-cpp[core]:x86-windows is installed. + +> vcpkg install signalrclient +Package signalrclient:x86-windows depends on cpprestsdk[ws-client]:x86-windows. + +The following packages will be rebuilt: + * azure-storage-cpp:x86-windows + * cpprestsdk:x86-windows + +To rebuild the current package graph with this feature, use: + vcpkg remove cpprestsdk:x86-windows azure-storage-cpp:x86-windows + vcpkg install cpprestsdk[core,compression,ws-client]:x86-windows + vcpkg install azure-storage-cpp[core]:x86-windows + vcpkg install signalrclient[core]:x86-windows +``` +She follows the above script and can use both `azure-storage-cpp` and `signalrclient` in her code. + +Some time has passed, she decided not to use `signalrclient`, and she's interested in shipping her application. She wants to minimize her final install size, so she'd like to remove all unneeded packages like `boost` and `openssl`. +```no-highlight +> vcpkg remove boost openssl +The following packages and features will be removed: + * signalrclient[core]:x86-windows + * cpprestsdk[ws-client]:x86-windows + boost[core]:x86-windows + openssl[core]:x86-windows + +The following packages will be rebuilt: + * azure-storage-cpp:x86-windows + * cpprestsdk:x86-windows + +Removing features requires rebuilding packages. +To rebuild the current package graph without these features, use: + vcpkg remove cpprestsdk:x86-windows azure-storage-cpp:x86-windows signalrclient:x86-windows openssl:x86-windows boost:x86-windows + vcpkg install cpprestsdk[core,compression]:x86-windows + vcpkg install azure-storage-cpp[core]:x86-windows +``` +In the end, her final `vcpkg list` outputs: +```no-highlight +> vcpkg list +zlib[core]:x86-windows 1.2.11 A compression library +azure-storage-cpp[core]:x86-windows 2.6.0 Microsoft Azure Storage Client SDK for ... +cpprestsdk[core]:x86-windows 2.9.0-2 C++11 JSON, REST, and OAuth library +cpprestsdk[compression]:x86-windows Gzip compression support in the HTTP client. +``` + +### B. Technical model + +- Each package can have any number "features". +- Features follow the same naming conventions as packages, but when referenced are always "namespaced" by the parent package. + - `cpprestsdk[ws-client]` is a completely orthogonal feature from `poco[ws-client]`. +- Features are valid dependencies. + - `signalrclient` depends on `cpprestsdk[ws-client]` +- Features can have dependencies (including other features). + - `cpprestsdk[ws-client]` depends on `boost`, `openssl`, and `websocketspp` + - `opencv[cuda]` depends on `cuda` + - `opencv[contrib]` depends on `opencv[cuda]` + - `boost[python]` depends on `libpython` +- Every package has an implicit feature called `core`, which covers the core library with a minimum set of features. All features implicitly depend on the `core` feature of their parent package + - `azure-storage-cpp` depends on `cpprestsdk[core]` + - `cpprestsdk[ws-client]` implicitly depends on `cpprestsdk[core]` +- Each package declares a list of default features that are enabled when the package is referred to by its raw name, and `core` is always a default feature. + - `cpprestsdk` declares `ws-client` and `compression` to be default features. Any unqualified reference `cpprestsdk` implicitly means `cpprestsdk[core]` _and_ `cpprestsdk[ws-client]` _and_ `cpprestsdk[compression]`. + - `opencv` does not declare `cuda` nor `contrib` to be default features. + +As a conclusion of the above, it is expected that all packages will be buildable with all features disabled (just the `core` feature) and with all features enabled. + +### C. Proposed Control File Syntax + +#### OpenCV and CUDA +To add the feature CUDA to OpenCV, we will adopt the following syntax in the CONTROL file: +```no-highlight +# opencv/CONTROL +Source: opencv +Version: 3.2.0-1 +Build-Depends: zlib, libpng, libjpeg-turbo, tiff +Description: computer vision library +Default-Features: + +Feature: cuda +Build-Depends: cuda +Description: parallel computing platform + +Feature: contrib +Build-Depends: opencv[cuda] +Description: library of OpenCV Extensions +``` + +#### Signalrclient +```no-highlight +# signalrclient/CONTROL +Source: signalrclient +Version: 1.0.0-beta1 +Build-Depends: cpprestsdk[ws-client] +Description: C++ client for SignalR. +``` +```no-highlight +# cpprestsdk/CONTROL +Source: cpprestsdk +Version: 2.9.0-2 +Build-Depends: +Description: C++11 JSON, REST, and OAuth library ... +Default-Features: compression, ws-client + +Feature: compression +Build-Depends: zlib (windows) +Description: Gzip compression support in the HTTP client. + +Feature: ws-client +Build-Depends: boost (windows), openssl (windows), websocketpp (windows) +Description: Websocket client support based on websocketspp +``` + +### D. Additional Control File Technical Details + +- If any feature paragraphs exist, the field `Default-Features` must be present. + +## 4. Related Work + +### Cargo's Features (from Rust): +The proposed feature packages are exceedingly similar to Cargo's Features, with the following changes: + +- We avoid any collision problems because features are always namespaced by the owning package +- We do not have a concept of "feature groups", instead we allow dependencies from one feature to another within the same package (Note: This may be how "feature groups" are implemented internally to Cargo -- it was not clear from the documentation). +- Because of the nature of C and C++, it is extremely commonplace that large software packages can have features disabled to remove their dependencies upon other libraries. Changing this configuration requires a rebuild of the package and potentially rippling ABI changes to any downstream dependencies. Therefore, we expect significantly more use of this feature to manage optional API contracts instead of the intended use in Cargo (curation). +- We do not intend feature packages to be used to express the curation relationship, beyond the notion of a "default" set within a package. + +### Gentoo's USE flags: +Gentoo's USE flags can be shortly summarized as a global set of keywords that is used to make cross-cutting changes to the entire package graph's build configuration. This system standardizes many common settings such that they can be simultaneously toggled for the entire graph. + +The most common example of this would be using KDE vs Gnome. A user who knows that, given the choice, they would prefer the KDE/Qt interface can manage the massive space of package configuration efficiently without learning the particular term that each package has decided to call "build using Qt instead of GTK". + +USE flags can be customized hierarchically when needed, including at the per-package level. They can be depended upon by other packages, both positively and negatively. USE flags themselves can be used in any boolean expression to determine the complete set of package dependencies, including removing dependencies when flags are enabled. + +Problems with USE flags: + +- They require coordination from package maintainers to achieve the goal of "portable" flags. This increases the burden of adding a package -- to author a good package, I need to be aware of every uncommon USE flag and evaluate how those could map onto my local configuration space. +- Based on research online, it seems extremely common that users need to tweak flags at a per-package level. This calls into question how valuable the cross-cutting power above is. +- The vast majority of common USE flags are essentially a list of all the common packages and focus on giving the user a view of dependencies (which a package manager is designed to abstract when possible) instead of APIs (which is what users code against). +- Dependency analysis with USE flags becomes a SAT problem with an enormous state space -- P*F bits -- which compounds with any versioning relations. This may work acceptably in practice via heuristics, but it implies that a) there is a looming performance wall which could suddenly create a poor user experience and b) the heuristics may incorrectly model the user's needs, causing a disconnect in desire vs practice, which again leads to a poor user experience. diff --git a/externals/vcpkg/docs/specifications/manifests.md b/externals/vcpkg/docs/specifications/manifests.md new file mode 100755 index 000000000..a71db2d8b --- /dev/null +++ b/externals/vcpkg/docs/specifications/manifests.md @@ -0,0 +1,302 @@ +# Manifests -- `vcpkg.json` + +**Note: this is the feature as it was initially specified and does not necessarily reflect the current behavior.** + +**Up-to-date documentation is available at [Manifests](../users/manifests.md).** + +For many other language package managers, there exists a way of writing one's dependencies in a declarative +manifest format; we want something similar for vcpkg. What follows is the specification of that feature; +this should mean that vcpkg becomes far more user and enterprise-friendly, and is additionally an important +first step for versioning and package federation. Our primary concern, beyond implementability, is ease-of-use; +it is important that using this feature is all of: + +* Easy for existing users +* Easy for new users to set up +* Easy to extend later for new features like versioning and federation +* _Declarative_, not _Imperative_. + +## Reasoning + +### Why JSON? + +We choose JSON for five main reasons: + +* Everybody knows JSON, and if one doesn't, it's really easy to learn +* Every tool supports JSON in the standard library, or in a commonly used support library + * This means writing tooling should be trivial in any language one is comfortable with + * Most configuration formats don't have a COBOL implementation 😉 +* Specified in an international standard + * There is _one_ right way to parse JSON + * There are no ambiguities of what the parse tree _should_ be +* Simple and secure + * Unlike YAML, for example, there's no weird ACE issues + * Easy to write a parser -- important since we can't depend on external libraries +* Schemas are almost a necessity + +Some have suggested allowing comments or commas in our parser; we chose to use JSON proper +rather than JSON5 or JSON with comments because JSON is the everywhere-supported international +standard. That is not necessarily true of JSON with comments. Additionally, if one needs +to write a comment, they can do so via `"$reason"` or `"$comment"` fields. + +## Specification + +A manifest file shall have the name `vcpkg.json`, and shall be in the root directory of a package. +It also replaces CONTROL files, though existing CONTROL files will still be +supported; there will be no difference between ports and packages, except +that packages do not need to supply portfile.cmake (eventually we would like +to remove the requirement of portfile.cmake for ports that already use +CMake). + +The specification uses definitions from the [Definitions](#definitions) section in order +to specify the shape of a value. Note that any object may contain any directives, written as +a field key that starts with a `$`; these directives shall be ignored by `vcpkg`. Common +directives may include `"$schema"`, `"$comment"`, `"$reason"`. + +A manifest must be a top-level object, and must have at least: + +* `"name"`: a `` +* One (and only one) of the following version fields: + * `"version-string"`: A `string`. Has no semantic meaning. + Equivalent to `CONTROL`'s `Version:` field. + * Other version fields will be defined by the Versions RFC + +The simplest vcpkg.json looks like this: + +```json +{ + "name": "mypackage", + "version-string": "0.1.0-dev" +} +``` + +Additionally, it may contain the following properties: +* `"port-version"`: A non-negative integer. If this field doesn't exist, it's assumed to be `0`. + * Note that this is a change from existing CONTROL files, where versions were a part of the version string +* `"maintainers"`: An array of `string`s which contain the authors of a package + * `"maintainers": [ "Nicole Mazzuca ", "×©×œ×•× ×¢×œ×™×›× " ]` +* `"description"`: A string or array of strings containing the description of a package + * `"description": "mypackage is a package of mine"` +* `"homepage"`: A url which points to the homepage of a package + * `"homepage": "https://github.com/strega-nil/mypackage"` +* `"documentation"`: A url which points to the documentation of a package + * `"documentation": "https://readthedocs.io/strega-nil/mypackage"` +* `"license"`: A `` + * `"license": "MIT"` +* `"dependencies"`: An array of ``s +* `"dev-dependencies"`: An array of ``s which are required only for developers (testing and the like) +* `"features"`: An array of ``s that the package supports +* `"default-features"`: An array of ``s that correspond to features, which will be used by default. +* `"supports"`: A `` + * `"supports": "windows & !arm"` + +Any properties which are not listed, and which do not start with a `$`, +will be warned against and are reserved for future use. + +The following is an example of an existing port CONTROL file rewritten as a vcpkg.json file: + +``` +Source: pango +Version: 1.40.11-6 +Homepage: https://ftp.gnome.org/pub/GNOME/sources/pango/ +Description: Text and font handling library. +Build-Depends: glib, gettext, cairo, fontconfig, freetype, harfbuzz[glib] (!(windows&static)&!osx) +``` + +```json +{ + "name": "pango", + "version-string": "1.40.11", + "port-version": 6, + "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pango/", + "description": "Text and font handling library.", + "dependencies": [ + "glib", + "gettext", + "cairo", + "fontconfig", + "freetype", + { + "name": "harfbuzz", + "features": [ "glib" ], + "platform": "!(windows & static) & !osx" + } + ] +} +``` + +## Behavior of the Tool + +There will be two "modes" for vcpkg from this point forward: "classic", and "manifest". +The former will act exactly like the existing vcpkg workflow, so as to avoid breaking +anyone. The latter will be the mode only when the user either: + +* Passes `--manifest-root=` (initially, `x-manifest-root`) +* Runs `vcpkg` in a directory that contains a file named `vcpkg.json`, or in a + child directory of a directory containing `vcpkg.json`. + * For this, initially vcpkg will warn that the behavior will change in the + future, and simply run in classic mode, unless the feature flag `manifests` is + passed via: + * The environment variable `VCPKG_FEATURE_FLAGS` + * The option `--feature-flags` + * (e.g., `--feature-flags=binarycaching,manifests`) + * If someone wants to use classic mode and silence the warning, they can add the + `-manifests` feature flag to disable the mode. + +When in "manifest" mode, the `installed` directory will be changed to +`/vcpkg_installed` (name up for bikeshedding). +The following commands will change behavior: + +* `vcpkg install` without any port arguments will install the dependencies listed in + the manifest file, and will remove any dependencies + which are no longer in the dependency tree implied by the manifest file. +* `vcpkg install` with port arguments will give an error. + +The following commands will not work in manifest mode, at least initially: + +* `vcpkg x-set-installed`: `vcpkg install` serves the same function +* `vcpkg remove` +* `vcpkg export` + +We may add these features back for manifest mode once we understand how best to +implement them. + +### Behavior of the Toolchain + +Mostly, the toolchain file stays the same; however, we shall add +two public options: + +```cmake +VCPKG_MANIFEST_MODE:BOOL= +VCPKG_MANIFEST_INSTALL:BOOL=ON +``` + +The first option either explicitly turns on, or off, manifest mode; +otherwise, we default to looking for a manifest file in the directory +tree upwards from the source directory. + +The `VCPKG_MANIFEST_INSTALL` option tells the toolchain whether to +install the packages or not -- if you wish to install the manifest +dependencies manually, you can set this to off, and we also turn it +off for packages installed by vcpkg. + +Additionally, if `-manifests` is set in the feature flags environment +variable, we turn off manifest mode in the toolchain, and we act like +the classic toolchain. + +### Example - CMake Integration + +An example of using the new vcpkg manifests feature for a new +project follows: + +The filesystem structure should look something like: + +``` +example/ + src/ + main.cxx + CMakeLists.txt + vcpkg.json +``` + +Then, `main.cxx` might look like: + +```cpp +#include + +int main() { + fmt::print("Hello, {}!", "world"); +} +``` + +Therefore, in `vcpkg.json`, we'll need to depend on `fmt`: + +```json +{ + "name": "example", + "version-string": "0.0.1", + "dependencies": [ + "fmt" + ] +} +``` + +Then, let's write our `CMakeLists.txt`: + +```cmake +cmake_minimum_required(VERSION 3.14) + +project(example CXX) + +add_executable(example src/main.cxx) + +find_package(fmt REQUIRED) + +target_link_libraries(example + PRIVATE + fmt::fmt) +``` + +And finally, to configure and build: + +```sh +$ cd example +$ cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake +... configuring and installing... +$ cmake --build build +``` + +and we're done! `fmt` will get installed into +`example/build/vcpkg_installed`, and we can run our executable with: + +```sh +$ build/example +Hello, world! +``` + +## Definitions + +* ``: A `string` which: + * Is entirely ASCII + * Contains only lowercase alphabetic characters, digits, and hyphen-minus + * Does not have multiple consecutive hyphens + * Does not begin nor end with a hyphen + * Is not a Windows filesystem reserved name + * Is not a vcpkg reserved name: "default" or "core". + * In other words, it must follow the regex `[a-z0-9]+(-[a-z0-9]+)*`, and must not be any of: + * `{ prn, aux, nul, con, lpt[1-9], com[1-9], core, default }` +* ``: A `string` consisting of a non-zero number of ``s, separated by `.`. + * `a.b.c` is valid + * `a` is valid + * `a/b` is not valid + * `Boost.Beast` is not valid, but `boost.beast` is +* ``: Either a ``, or an object: + * A dependency always contains the following: + * `"name"`: A `` + * Optionally, `"features"`: an array of ``s corresponding to features in the package. + * Optionally, `"default-features"`: a `boolean`. If this is false, then don't use the default features of the package; equivalent to core in existing CONTROL files. If this is true, do the default thing of including the default features. + * Optionally, `"platform"`: a `` + * ``: No extra fields are required. +* ``: An SPDX license expression at version 3.9. +* ``: A specification of a set of platforms; used in platform-specific dependencies and supports fields. A string that is parsed as follows: + * ``: + * `` + * `` + * `` + * ``: + * `( )` + * `` + * ``: + * regex: `/^[a-z0-9]+$/` + * ``: + * `` + * `! ` + * `` + * `` + * ` & ` + * `` + * `` + * ` | ` +* ``: An object containing the following: + * `"name"`: An ``, the name of the feature + * `"description"`: A `string` or array of `string`s, the description of the feature + * Optionally, `"dependencies"`: An array of ``s, the dependencies used by this feature diff --git a/externals/vcpkg/docs/specifications/ports-overlay.md b/externals/vcpkg/docs/specifications/ports-overlay.md new file mode 100755 index 000000000..632954fc3 --- /dev/null +++ b/externals/vcpkg/docs/specifications/ports-overlay.md @@ -0,0 +1,183 @@ +# Ports Overlay (Jun 19, 2019) + +**Note: this is the feature as it was initially specified and does not necessarily reflect the current behavior.** + +## 1. Motivation + +### A. Allow users to override ports with alternate versions + +It's a common scenario for `vcpkg` users to keep specific versions of libraries to use in their own projects. The current recommendation for users is to fork `vcpkg`'s repository and create tags for commits containing the specific versions of the ports they want to use. + +This proposal adds an alternative to solve this problem. By allowing `vcpkg` users to specify additional locations in their file system containing ports for: + + * older or newer versions of libraries, + * modified libraries, or + * libraries not available in `vcpkg`. + +These locations will be searched when resolving port names during package installation, and override ports in `/ports`. + +### B. Allow users to keep unmodified upstream ports + +Users will be able to keep unmodified versions of the ports shipped with `vcpkg` and update them via `vcpkg update` and `vcpkg upgrade` without having to solve merge conflicts. + + +## 2. Other design concerns + +* Allow a set of `vcpkg` commands to optionally accept additional paths to be used when searching for ports. +* Additional paths must take precedence when resolving names of ports to install. +* Allow users to specify multiple additional paths. +* Provide a simple disambiguation mechanism to resolve ambiguous port names. +* After resolving a port name, the installation process has to work the same as for ports shipped by `vcpkg`. +* This **DOES NOT ENABLE MULTIPLE VERSIONS** of a same library to be **INSTALLED SIDE-BY-SIDE**. + + +## 3. Proposed solution + +This document proposes allowing additional locations to search for ports during package installation that will override and complement the set of ports provided by `vcpkg` (ports under the `/ports` directory).` + +A new option `--overlay-ports` will be added to the `vcpkg install`, `vcpkg update`, `vcpkg upgrade`, `vcpkg export`, and `vcpkg depend-info` commands to specify additional paths containing ports. + +From a user experience perspective, a user expresses interest in adding additional lookup locations by passing the `--overlay-ports` option followed by a path to: + +* an individual port (directory containing a `CONTROL` file), + * `vcpkg install sqlite3 --overlay-ports="C:\custom-ports\sqlite3"` + +* a directory containing ports, + * `vcpkg install sqlite3 --overlay-ports=\\share\org\custom-ports` + +* a file listing paths to the former two. + > NOTE: Reading paths from a text file is not available in the current implementation, some revisions to this part of the specification are being made and will be implemented in a future date. + + * `vcpkg install sqlite3 --overlay-ports=..\port-repos.txt` + + _port-repos.txt_ + + ``` + .\experimental-ports\sqlite3 + C:\custom-ports + \\share\team\custom-ports + \\share\org\custom-ports + ``` + *Relative paths inside this file are resolved relatively to the file's location. In this case a `experimental-ports` directory should exist at the same level as the `port-repos.txt` file.* + +_NOTE: It is not the goal of this document to discuss library versioning or project dependency management solutions, which require the ability to install multiple versions of a same library side-by-side._ + +### Multiple additional paths + +Users can provide multiple additional paths by repeating the `--overlay-ports` option. + +``` +vcpkg install sqlite3 + --overlay-ports="..\experimental-ports\sqlite3" + --overlay-ports="C:\custom-ports" + --overlay-ports="\\share\team\custom-ports +``` + +### Overlaying ports + +Port name resolution follows the order in which additional paths are specified, with the first match being selected for installation, and falling back to `/ports` if the port is not found in any of the additional paths. + +No effort is made to compare version numbers inside the `CONTROL` files, or to determine which port contains newer or older files. + +### Examples + +Given the following directory structure: + + ``` + team-ports/ + |-- sqlite3/ + |---- CONTROL + |-- rapidjson/ + |---- CONTROL + |-- curl/ + |---- CONTROL + + my-ports/ + |-- sqlite3/ + |---- CONTROL + |-- rapidjson/ + |---- CONTROL + + vcpkg + |-- ports/ + |---- + |-- vcpkg.exe + |-- preferred-ports.txt + ``` +* #### Example #1: + + Running: + + ``` + vcpkg/vcpkg.exe install sqlite3 --overlay-ports=my-ports --overlay-ports=team-ports + ``` + + Results in `my-ports/sqlite3` getting installed as that location appears first in the command line arguments. + +* #### Example #2: + + A specific version of a port can be given priority by adding its path first in the list of arguments: + + ``` + vcpkg/vcpkg.exe install sqlite3 rapidjson curl + --overlay-ports=my-ports/rapidjson + --overlay-ports=vcpkg/ports/curl + --overlay-ports=team-ports + ``` + + Installs: + * `sqlite3` from `team-ports/sqlite3` + * `rapidjson` from `my-ports/rapidjson` + * `curl` from `vcpkg/ports/curl` + +* #### Example #3: + + > NOTE: Reading paths from a text file is not available in the current implementation, some revisions to this part of the specification are being made and will be implemented in a future date. + + Given the content of `preferred-ports.txt` as: + + ``` + ./ports/curl + /my-ports/rapidjson + /team-ports + ``` + + A location can be appended or prepended to those included in `preferred-ports.txt` via the command line, like this: + + ``` + vcpkg/vcpkg.exe install sqlite3 curl --overlay-ports=my-ports --overlay-ports=vcpkg/preferred-ports.txt + ``` + + Which results in `my-ports/sqlite3` and `vcpkg/ports/curl` getting installed. + + +## 4. Proposed User experience + +### i. User wants to preserve an older version of a port + +Developer Alice and her team use `vcpkg` to acquire **OpenCV** and some other packages. She has even contributed many patches to add features to the **OpenCV 3** port in `vcpkg`. But, one day, she notices that a PR to update **OpenCV** to the next major version has been merged. + +Alice wants to update some packages available in `vcpkg`. Unfortunately, updating her project to use the latest **OpenCV** is not immediately possible. + +Alice creates a private GitHub repository and checks in the set of ports that she wants to preserve. Then provides her teammates with the link to clone her private ports repository. + +``` +mkdir vcpkg-custom-ports +cd vcpkg-custom-ports +git init +cp -r %VCPKG_ROOT%/ports/opencv . +git add . +git commit -m "[opencv] Add OpenCV 3 port" +git remote add origin https://github.com//vcpkg-custom-ports.git +git push -u origin master +``` + +Now her team is able to use: + +``` +git clone https://github.com//vcpkg-custom-ports.git +vcpkg update --overlay-ports=./vcpkg-custom-ports +vcpkg upgrade --no-dry-run --overlay-ports=./vcpkg-custom-ports +``` + +to upgrade their packages and preserve the old version of **OpenCV** they require. diff --git a/externals/vcpkg/docs/specifications/prefab.md b/externals/vcpkg/docs/specifications/prefab.md new file mode 100755 index 000000000..8b8487442 --- /dev/null +++ b/externals/vcpkg/docs/specifications/prefab.md @@ -0,0 +1,160 @@ +# Vcpkg: export Android prefab Archives (AAR files) + +**Note: this is the feature as it was initially specified and does not necessarily reflect the current behavior.** + +Vcpkg can export android archives ([AAR files](https://developer.android.com/studio/projects/android-library)). Once an archive is created, it can imported in Android Studio as a native dependent. The archive is automatically consumed using [android studio's prefab tool](https://github.com/google/prefab). + +For more information on Prefab, refer to: +* The [official prefab documentation](https://google.github.io/prefab). +* a blog post from Android developers blog: [Native Dependencies in Android Studio 4.0](https://android-developers.googleblog.com/2020/02/native-dependencies-in-android-studio-40.html) + +_Note for Android Studio users: prefab packages are supported on Android Studio 4+_ + +## Requirements + +1. `ndk ` + +Set environment variable `ANDROID_NDK_HOME` to your android ndk installation. For example: + +```` +export ANDROID_NDK_HOME=/home/your-account/Android/Sdk/ndk-bundle +```` + +2. `7zip ` or `zip ` + +3. `maven ` + +4. Android triplets + +See [android.md](../users/android.md) for instructions on how to install the triplets. + +*Please note that in order to use "prefab" (see below), the four architectures are required. If any is missing the export will fail* + + +## Example exporting [jsoncpp] + +First "vcpkg install" the 4 android architectures (it is mandatory to export all 4 of them) + +```` +./vcpkg install jsoncpp:arm-android jsoncpp:arm64-android jsoncpp:x64-android jsoncpp:x86-android +```` + + +Then, export the prefab: + +Note: +* The `--prefab-maven` flag is optional. Call it if you maven is installed. +* The `--prefab-debug` flag will output instructions on how to use the prefab archive via gradle. + +``` +./vcpkg export --triplet x64-android jsoncpp --prefab --prefab-maven --prefab-debug +``` + +You will see an output like this: +``` +The following packages are already built and will be exported: + jsoncpp:arm64-android + +Exporting package jsoncpp... +[DEBUG] Found 4 triplets + arm64-android + x64-android + x86-android + arm-android + +... +... Lots of output... +... + +[INFO] Scanning for projects... +Downloading from central: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom + +... +... Lots of output... +... + +[INFO] BUILD SUCCESS +[INFO] Total time: 2.207 s +[INFO] Finished at: 2020-05-10T14:42:28+02:00 + + +... +... Lots of output... +... + +[DEBUG] Configuration properties in Android Studio +In app/build.gradle + + com.vcpkg.ndk.support:jsoncpp:1.9.2 + +And cmake flags + + externalNativeBuild { + cmake { + arguments '-DANDROID_STL=c++_shared' + cppFlags "-std=c++17" + } + } + +In gradle.properties + + android.enablePrefab=true + android.enableParallelJsonGen=false + android.prefabVersion=${prefab.version} + +Successfully exported jsoncpp. Checkout .../vcpkg/prefab + +``` + +#### The output directory after export + +```` +prefab +└── jsoncpp/ + ├── aar/ + │   ├── AndroidManifest.xml + │   ├── META-INF/ + │   │   └── LICENSE + │   └── prefab/ + │   ├── modules/ + │   │   └── jsoncpp/ + │   │   ├── libs/ + │   │   │   ├── android.arm64-v8a/ + │   │   │   │   ├── abi.json + │   │   │   │   ├── include/ + │   │   │   │   │   └── json/ + │   │   │   │   │   ├── json.h + │   │   │   │   │   └── .... + │   │   │   │   └── libjsoncpp.so + │   │   │   ├── android.armeabi-v7a/ + │   │   │   │   ├── abi.json + │   │   │   │   ├── include/ + │   │   │   │   │   └── json/ + │   │   │   │   │   ├── json.h + │   │   │   │   │   └── .... + │   │   │   │   └── libjsoncpp.so + │   │   │   ├── android.x86/ + │   │   │   │   ├── abi.json + │   │   │   │   ├── include/ + │   │   │   │   │   └── json/ + │   │   │   │   │   ├── json.h + │   │   │   │   │   └── .... + │   │   │   │   └── libjsoncpp.so + │   │   │   └── android.x86_64/ + │   │   │   ├── abi.json + │   │   │   ├── include/ + │   │   │   │   └── json/ + │   │   │   │   │   ├── json.h + │   │   │   │   │   └── .... + │   │   │   └── libjsoncpp.so + │   │   └── module.json + │   └── prefab.json + ├── jsoncpp-1.9.2.aar + └── pom.xml +```` + +## Example consuming [jsoncpp] via vcpkg and prefab + +See the example repo here: + +https://github.com/atkawa7/prefab-vpkg-integration-sample diff --git a/externals/vcpkg/docs/specifications/registries-2.md b/externals/vcpkg/docs/specifications/registries-2.md new file mode 100755 index 000000000..e2663ca3c --- /dev/null +++ b/externals/vcpkg/docs/specifications/registries-2.md @@ -0,0 +1,561 @@ +# Registries: Take 2 (including Git Registries) + +**Note: this is the feature as it was initially specified and does not necessarily reflect the current behavior.** + +**Up-to-date documentation is available at [Registries](../users/registries.md).** + +Originally, the design of registries was decided upon and written up in the [Registries RFC](registries.md). +However, as we've gotten further into the design process of git registries and versioning, +and discussed the interaction of versioning with registries, +it's become clear that the existing design was lacking. +We need to have an on-disk port database that is not tied to the ports tree. + +This RFC is a new design for registries, that includes this registry database. +It also includes the design for git registries, +which are likely to be the predominant form of registries in the wild. +They are also what we will start to treat the default registry as, +to allow for updating ports without updating the vcpkg executable +(likely necessary for binary releases). + +## Design Considerations + +After internal discussions of the relationship between versioning and registries, +it was clear that the existing design of registries does not play well with versioning. +It was also clear that it was necessary to have metadata about ports in a separate place from the ports tree; +in fact, after discussion, it was clear that the ports tree should be considered an implementation detail; +a backing store for build process information (e.g., `portfile.cmake` and the patches) and the manifest. + +From this, it's clear that vcpkg needs to add a new set of metadata. +The versioning implementation has decided on `port_versions`, and thus that's what this RFC uses. + +Since we're replacing the existing ports directory with a new method of describing ports, +this means that the ports directory is no longer anything but a data store. +This also means that the existing rules around locations of ports is no longer required; +however, it will still keep getting followed for the main repository, +and it's recommended that other registries follow the same pattern to make contributing easier. + +## What does the registry database look like? + +We don't wish to have the same problem as we do right now, +where there are nearly 1500 entries in a single directory. +We solve this by placing each database entry into `port_versions/-/.json`. +For example, the database entry for 7zip is in `port_versions/7-/7zip.json`. + +Each of these database entries contains all of the versions of the port throughout history, +along with versioning and feature metadata, so that we do not have to check out old manifests or CONTROL files +to get at that information. + +Each database entry file must be a top-level array of port version objects, which contain the following entries: +* A version field: `"version-string"`, `"version"`, etc. Same as in the manifest. +* Optionally, `"port-version"`: Same as in the manifest. + +And also contain a description of where to find the build files for this port; the possibilities include: + +* `"git-tree"`: The [git object ID] of a tree object; this is only allowed for git registries. + Note that this ID must be an ID from the repository where the registry is located. +* `"path"`: A path describing where to find the build files. + The first entry in this path should be `$`, which means "this path starts at the root of the registry". + No other kinds of paths are allowed. + * For example: `$/foo/bar` gives you `foo/bar` underneath the folder containing the `port_versions` directory. + * `/foo/bar` and `foo/bar` are both disallowed. + +Using a `"git-tree"` as a backend in a non-git registry, and using a `"path"` in a git registry, +is not permitted. Future extensions may include things like remote archives or git repositories, +or may allow `"path"` in git registries. + +Note that a registry entry should _always_ be additive; +deleting existing entries is unsupported and may result in bad behavior. +The only modification to existing entries that is allowable is moving the backing store +for the build files, assuming that the new build files are equivalent to the old build files. +(For example, a filesystem registry might have a new way of laying out where ports are). + +Additionally, we'd like a new way of describing the set of ports that make up a "baseline". +This is currently done with the reference of the vcpkg git repository - +each reference has a set of versions that are tested against each other, +and this is a major feature of vcpkg. +We wish to have the same feature in the new versioning world, +and so we'll have a set of baseline versions in the registry database. + +Baselines act differently between git registries or the builtin registry, +and in filesystem registries. +In git registries and the builtin registry, +since there's a history that one can access, +a baseline is the `"default"` entry in the baseline at the reference specified. +In filesystem registries, since there is no accessible history, +the baseline identifiers are mapped directly to entries in the baseline file, +without translation; by default, the `"default"` entry is used. + +These baselines are placed in `port_versions/baseline.json`. +This is an object mapping baseline names to baseline objects, +where baseline objects map port names to version objects. +A version object contains `"baseline"`, which is un-schemed version, +and optionally `"port-version"`. + +[git object ID]: https://git-scm.com/book/en/v2/Git-Internals-Git-Objects + +### Example of a baseline file + +The following is a reasonable baseline.json for a filesystem registry that only has two ports: + +```json +{ + "default": { + "abseil": { "baseline": "2020-03-03" }, + "zlib": { "baseline": "1.2.11", "port-version": 9 } + }, + "old": { + "abseil": { "baseline": "2019-02-11" }, + "zlib": { "baseline": "1.2.11", "port-version": 3 } + }, + "really-old": { + "zlib": { "baseline": "1.2.9" } + } +} +``` + +### Example of a registry database entry file + +Note: This file assumes that the versions RFC has been implemented, +and thus that minimum versions are required; +the syntax may change in the time between now and finishing the implementation. + +This example is of `ogre`, since this port has both features and dependencies; +remember that this file would be `port_versions/o-/ogre.json`. + +```json +[ + { + "version-string": "1.12.7", + "git-tree": "466e96fd2e17dd2453aa31dc0bc61bdcf53e7f61", + }, + { + "version-string": "1.12.1", + "port-version": 1, + "git-tree": "0de81b4f7e0ec24966e929c2ea64e16c15e71d5e", + }, + ... +] +``` + +#### Filesystem Registry Databases + +Filesystem registries are the simplest possible registry; +they have a `port_versions` directory at the top-level, which contains the registry database. +It's expected that the filesystem registry would have a filesystem backing store: +something like the existing `ports` directory, except with separate versions. +There won't be a specific way to lay the ports tree out as mandated by the tool, +as we are treating the ports tree as an implementation detail of the registry; +it's simply a way to get the files for a port. +As an example, let's assume that the registry is laid out something like this: + +``` +/ + port_versions/ + baseline.json + a-/ + abseil.json + asmjit.json + o-/ + ogre.json + ports/ + a-/ + abseil/ + 2020-03-03_7/ + vcpkg.json + portfile.cmake + ... + 2020-03-03_8/ + vcpkg.json + portfile.cmake + ... + ... + asmjit/ + 2020-05-08/ + CONTROL + portfile.cmake + ... + 2020-07-22/ + vcpkg.json + portfile.cmake + ... + o-/ + ogre/ + 1.12.7/ + ... + 1.12.1/ + ... + ... + ... +``` + +Then, let's look at updating `asmjit` to latest. + +The current manifest file, in `asmjit/2020-07-22/vcpkg.json` looks like: + +```json +{ + "name": "asmjit", + "version-string": "2020-07-22", + "description": "Complete x86/x64 JIT and Remote Assembler for C++", + "homepage": "https://github.com/asmjit/asmjit", + "supports": "!arm" +} +``` + +while the current `port_versions/a-/asmjit.json` looks like: + +```json +[ + { + "version-string": "2020-07-22", + "path": "$/ports/a-/asmjit/2020-07-22" + }, + { + "version-string": "2020-05-08", + "path": "$/ports/a-/asmjit/2020-05-08" + } +] +``` + +with `port_versions/baseline.json` looking like: + +```json +{ + "default": { + ..., + "asmjit": { "baseline": "2020-07-22" }, + ... + } +} +``` + +and we'd like to update to `2020-10-08`. +We should first copy the existing implementation to a new folder: + +```sh +$ cp -r ports/a-/asmjit/2020-07-22 ports/a-/asmjit/2020-10-08 +``` + +then, we'll make the edits required to `ports/a-/asmjit/2020-10-08` to update to latest. +We should then update `port_versions/a-/asmjit.json`: + +```json +[ + { + "version-string": "2020-10-08", + "path": "$/ports/a-/asmjit/2020-10-08" + }, + { + "version-string": "2020-07-22", + "path": "$/ports/a-/asmjit/2020-07-22" + }, + { + "version-string": "2020-05-08", + "path": "$/ports/a-/asmjit/2020-05-08" + } +] +``` + +and update `port_versions/baseline.json`: + +```json +{ + "default": { + ..., + "asmjit": { "baseline": "2020-10-08" }, + ... + } +} +``` + +and we're done 😊. + +#### Git Registry Databases + +Git registries are not quite as simple as filesystem registries, +but they're still pretty simple, and are likely to be the most common: +the default registry is a git registry, for example. +There is not a specific way the tool requires one to lay out the backing store, +as long as it's possible to get an object hash that corresponds to a checked-in git tree +of the build information. +This allows, for example, the current vcpkg default registry way of laying out ports, +where the latest version of a port `

` is at `ports/

`, +and it also allows for any number of other designs. +One interesting design, for example, +is having an `old-ports` branch which is updated whenever someone want to backfill versions; +then, one could push the old version to the `old-ports` branch, +and then update the HEAD branch with the git tree of the old version in `port_versions/p-/

`. + +As above, we want to update `asmjit` to latest; let's assume we're working in the default vcpkg registry +(the repository): + +The current manifest file for `asmjit` looks like: + +```json +{ + "name": "asmjit", + "version-string": "2020-07-22", + "description": "Complete x86/x64 JIT and Remote Assembler for C++", + "homepage": "https://github.com/asmjit/asmjit", + "supports": "!arm" +} +``` + +and the current `port_versions/a-/asmjit.json` looks like: + +```json +[ + { + "version-string": "2020-07-22", + "git-tree": "fa0c36ba15b48959ab5a2df3463299e1d2473b6f" + } +] +``` + +Now, let's update it to the latest version: + +```json +{ + "name": "asmjit", + "version-string": "2020-10-08", + "description": "Complete x86/x64 JIT and Remote Assembler for C++", + "homepage": "https://github.com/asmjit/asmjit", + "supports": "!arm" +} +``` + +and make the proper edits to the portfile.cmake. Then, let's commit the changes: + +```cmd +> git add ./ports/asmjit +> git commit -m "[asmjit] update asmjit to 2020-10-08" +``` + +In `git-tree` mode, one needs to commit the new version of the port to get the git tree hash; +we use `git rev-parse` to do so: + +```cmd +> git rev-parse HEAD:ports/asmjit +2bb51d8ec8b43bb9b21032185ca8123da10ecc6c +``` + +and then modify `port_versions/a-/asmjit.json` as follows: + +```json +[ + { + "version-string": "2020-10-08", + "git-tree": "2bb51d8ec8b43bb9b21032185ca8123da10ecc6c" + }, + { + "version-string": "2020-07-22", + "git-tree": "fa0c36ba15b48959ab5a2df3463299e1d2473b6f" + } +] +``` + +Then we can commit and push this new database with: + +```sh +$ git add port_versions +$ git commit --amend --no-edit +$ git push +``` + +## Consuming Registries + +The `vcpkg-configuration.json` file from the [first registries RFC](registries.md) +is still the same, except that the registries have a slightly different layout. +A `` is still an object with the following fields: +* Optionally, `"default-registry"`: A `` or `null` +* Optionally, `"registries"`: An array of ``s + +Additionally, `` is still the same; +a `` object, plus the following properties: +* Optionally, `"baseline"`: A named baseline. Defaults to `"default"`. +* Optionally, `"packages"`: An array of ``s + +however, ``s are now slightly different: +* ``: + * `"kind"`: The string `"builtin"` +* ``: + * `"kind"`: The string `"filesystem"` + * `"path"`: A path +* ``: + * `"kind"`: The string `"git"` + * `"repository"`: A URI + +The `"packages"` field of distinct registries must be disjoint, +and each `` must have at the `"packages"` property, +since otherwise there's no point. + +As an example, a package which uses a different default registry, and a different registry for boost, +might look like the following: + +```json +{ + "default-registry": { + "kind": "filesystem", + "path": "vcpkg-ports" + }, + "registries": [ + { + "kind": "builtin", + "packages": [ "cppitertools" ] + } + ] +} +``` + +This will install `fmt` from `/vcpkg-ports`, +and `cppitertools` and the `boost` ports from the registry that ships with vcpkg. +Notably, this does not replace behavior up the tree -- only the `vcpkg-configuration.json`s +for the current invocation do anything. + +### Filesystem Registries + +A filesystem registry takes on the form: + +* `"kind"`: The string `"filesystem"` +* `"path"`: The path to the filesystem registry's root, i.e. the directory containing the `port_versions` directory. + +```json +{ + "kind": "filesystem", + "path": "vcpkg-registry" +} +``` + +Unlike git registries, where there's quite a bit of interesting stuff going on, +there isn't much stuff to do with filesystem registries. +We simply use the registry database at `/port_versions` to get information about ports. + +### Git Registries + +A git registry takes on the form: + +* `"kind"`: The string `"git"` +* `"repository"`: The URL at which the git repository lives. May be any kind of URL that git understands + +```json +{ + "kind": "git", + "repository": "https://github.com/microsoft/vcpkg" +} +``` + +Whenever the first vcpkg command is run with a git registry, +vcpkg notes down the exact commit that HEAD points to at the time of the run in the `vcpkg-lock.json` file. +This will be used as the commit which vcpkg takes the `"default"` baseline from, +and vcpkg will only update that commit when `vcpkg update` is run. + +Since the `"versions"` field is strictly additive, we don't consider older refs than `HEAD`. +We update the repository on some reasonable clip. +Likely, whenever a command is run that will change the set of installed ports. + +#### `vcpkg-lock.json` + +This file will contain metadata that we need to save across runs, +to allow us to keep a "state-of-the-world" that doesn't change unless one explicitly asks for it to change. +This means that, even across different machines, the same registries will be used. +We will also be able to write down version resolution in this file as soon as that feature is added. + +It is recommended that one adds this `vcpkg-lock.json` to one's version control. +This file is machine generated, and it is not specified how it's laid out; +however, for purposes of this RFC, we will define how it relates to git registries. + +In `vcpkg-lock.json`, in the top level object, +there will be a `"registries"` property that is an object. +This object will contain a `"git"` field, which is an array of git-registry objects, +that contain: + +* `"repository"`: The `"repository"` field from the git registry object +* `"baseline"`: The name of the baseline that we've used +* `"baseline-ref"`: The ref which we've gotten the specific baseline from. + +For example, a `vcpkg-lock.json` might look like: + +```json +{ + "registries": { + "git": [ + { + "repository": "https://github.com/microsoft/vcpkg", + "baseline": "default", + "baseline-ref": "6185aa76504a5025f36754324abf307cc776f3da" + } + ] + } +} +``` + +#### `vcpkg update` + +You'll notice that once the repository is added the first time, +there is only one way to update the repository to the tag at a later date - deleting the lock file. +We additionally want to add support for the user updating the registry by themselves - +they will be able to do this via the `vcpkg update` command. +The `vcpkg update` command will, for each git registry, +update the registry and repoint the `"commit"` field in `vcpkg-lock.json` to the latest `HEAD`. + +There is no way to update only one git registry to a later date, since versions are strictly additive. + +## Git Registries: Implementation on Disk + +There are two implementations on disk to consider here: the implementation of the registry database, +and once we have the database entries for the ports, accessing the port data from the git tree object. + +Both of these implementations are placed in the vcpkg cache home (shared by binary caching archives). +On unix, this is located at `$XDG_CACHE_HOME/vcpkg` if the environment variable exists, +otherwise `$HOME/.cache/vcpkg`; on Windows, it's located at `%LOCALAPPDATA%\vcpkg`. +In this document, we use the variable `$CACHE_ROOT` to refer to this folder. +We will add a new folder, `$CACHE_ROOT/registries`, which will contain all the data we need. + +First, we'll discuss the registry database. + +### Registry Database + +At `$CACHE_ROOT/registries/git`, +we'll create a new git repository root which contains all information from all git registries, +since the hashes should be unique, and this allows for deduplication +across repositories which have the same commits (e.g., for mirrors). +In order to get the data from git registries, we simply `fetch` the URL of the git registry. + +In order to grab a specific database entry from a git registry, `git show` is used to grab the +file from the right commit: `git show -- port_versions/-/.json`. + +One unfortunate thing about having one directory being used for all vcpkg instances on a machine is +that it's possible to have an issue with concurrency - for example, after `fetch`ing the latest HEAD +of `https://github.com/microsoft/vcpkg`, another vcpkg process might fetch the latest HEAD of +`https://github.com/meow/vcpkg` before the first vcpkg process has the chance to `git rev-parse FETCH_HEAD`. +Since the first vcpkg process will run `git rev-parse` after the second fetch is done, +instead of getting the `HEAD` of `microsoft/vcpkg`, they instead get the `HEAD` of `meow/vcpkg`. +We will solve this by having a mutex file in `$CACHE_ROOT/registries/git` +that vcpkg locks before any fetches (and unlocks after `rev-parse`ing). + +### Accessing Port Data from `git-tree`s + +Once we've done version resolution and everything with the database, +we then need to access the port data from the git history. +We will add a new folder, `$CACHE_ROOT/registries/git-trees`, into which we'll check out the port data. + +In this `git-trees` directory, we will have all of the trees we check out, at their hashes. +For example, the asmjit port data from above will be located at +`git-trees/2bb51d8ec8b43bb9b21032185ca8123da10ecc6c`. +We will add a mutex file in this `git-trees` directory as well which is taken whenever +we are checking out a new git tree. +We wish to allow multiple vcpkg instances to read port data at a time, +and thus we do the check outs semi-atomically - if `git-trees/` exists, +then the `` must be completely checked out. +vcpkg does this by first checking out to a temporary directory, +and then renaming to the actual hash. + +## Future Extensions + +The way forward for this is to allow the `"builtin"` registry to be a git registry, +in order to support packaging and shipping vcpkg as a binary. +This is currently our plan, although it definitely is still a ways out. +Git registries _are_ an important step on that road, +but are also a good way to support both enterprise, +and experimentation by our users. +They allow us a lot more flexibility than we've had in the past. \ No newline at end of file diff --git a/externals/vcpkg/docs/specifications/registries.md b/externals/vcpkg/docs/specifications/registries.md new file mode 100755 index 000000000..68be1409d --- /dev/null +++ b/externals/vcpkg/docs/specifications/registries.md @@ -0,0 +1,289 @@ +# Package Federation: Custom Registries + +**Note: this is the feature as it was initially specified and does not necessarily reflect the current behavior.** + +**Up-to-date documentation is available at [Registries](../users/registries.md).** + +As it is now, vcpkg has over 1400 ports in the default registry (the `/ports` directory). +For the majority of users, this repository of packages is enough. However, many enterprises +need to more closely control their dependencies for one reason or another, and this document +lays out a method which we will build into vcpkg for exactly that reason. + +## Background + +A registry is simply a set of packages. In fact, there is already a registry in vcpkg: the default one. +Package federation, implemented via custom registries, allows one to add new packages, +edit existing packages, and have as much or as little control as one likes over the dependencies that one uses. +It gives the control over dependencies that an enterprise requires. + +### How Does the Current Default Registry Work? + +Of course, the existing vcpkg tool does have packages in the official, +default registry. The way we describe these packages is in the ports tree – +at the base of the vcpkg install directory, there is a directory named ports, +which contains on the order of 1300 directories, one for each package. Then, +in each package directory, there are at least two files: a CONTROL or +vcpkg.json file, which contains the name, version, description, and features +of the package; and a portfile.cmake file which contains the information on +how to download and build the package. There may be other files in this +registry, like patches or usage instructions, but only those two files are +needed. + +### Existing vcpkg Registry-like Features + +There are some existing features in vcpkg that act somewhat like a custom +registry. The most obvious feature that we have is overlay ports – this +feature allows you to specify any number of directories as "overlays", which +either contain a package definition directly, or which contain some number of +package directories; these overlays will be used instead of the ports tree +for packages that exist in both places, and are specified exclusively on the +command line. Additionally, unfortunately, if one installs a package from +overlay ports that does not exist in the ports tree, one must pass these +overlays to every vcpkg installation command. + +There is also the less obvious "feature" which works by virtue of the ports +tree being user-editable: one can always edit the ports tree on their own +machine, and can even fork vcpkg and publish their own ports tree. +Unfortunately, this then means that any updates to the source tree require +merges, as opposed to being able to fast-forward to the newest sources. + +### Why Registries? + +There are many reasons to want custom registries; however, the most important reasons are: + +* Legal requirements – a company like Microsoft or Google + needs the ability to strictly control the code that goes into their products, + making certain that they are following the licenses strictly. + * There have been examples in the past where a library which is licensed under certain terms contains code + which is not legally allowed to be licensed under those terms (see [this example][legal-example], + where a person tried to merge Microsoft-owned, Apache-licensed code into the GPL-licensed libstdc++). +* Technical requirements – a company may wish to run their own tests on the packages they ship, + such as [fuzzing]. +* Other requirements – an organization may wish to strictly control its dependencies for a myriad of other reasons. +* Newer versions – vcpkg may not necessarily always be up to date for all libraries in our registry, + and an organization may require a newer version than we ship; + they can very easily update this package and have the version that they want. +* Port modifications – vcpkg has somewhat strict policies on port modifications, + and an organization may wish to make different modifications than we do. + It may allow that organization to make certain that the package works on triplets + that our team does not test as extensively. +* Testing – just like port modifications, if a team wants to do specific testing on triplets they care about, + they can do so via their custom registry. + +Then, there is the question of why vcpkg needs a new solution for custom registries, +beyond the existing overlay ports feature. There are two big reasons – +the first is to allow a project to define the registries that they use for their dependencies, +and the second is the clear advantage in the user experience of the vcpkg tool. +If a project requires specific packages to come from specific registries, +they can do so without worrying that a user accidentally misses the overlay ports part of a command. +Additionally, beyond a feature which makes overlay ports easier to use, +custom registries allow for more complex and useful infrastructure around registries. +In the initial custom registry implementation, we will allow overlay ports style paths, +as well as git repositories, which means that people can run and use custom registries +without writing their own infrastructure around getting people that registry. + +It is the intention of vcpkg to be the most user-friendly package manager for C++, +and this allows us to fulfill on that intention even further. +As opposed to having to write `--overlay-ports=path/to/overlay` for every command one runs, +or adding an environment variable `VCPKG_OVERLAY_PORTS`, +one can simply write vcpkg install and the registries will be taken care of for you. +As opposed to having to use git submodules, or custom registry code for every project, +one can write and run the infrastructure in one place, +and every project that uses that registry requires only a few lines of JSON. + +[legal-example]: https://gcc.gnu.org/legacy-ml/libstdc++/2019-09/msg00054.html +[fuzzing]: https://en.wikipedia.org/wiki/Fuzzing + +## Specification + +We will be adding a new file that vcpkg understands - `vcpkg-configuration.json`. +The way that vcpkg will find this file is different depending on what mode vcpkg is in: +in classic mode, vcpkg finds this file alongside the vcpkg binary, in the root directory. +In manifest mode, vcpkg finds this file alongside the manifest. For the initial implementation, +this is all vcpkg will look for; however, in the future, vcpkg will walk the tree and include +configuration all along the way: this allows for overriding defaults. +The specific algorithm for applying this is not yet defined, since currently only one +`vcpkg-configuration.json` is allowed. + +The only thing allowed in a `vcpkg-configuration.json` is a `` object. + +A `` is an object: +* Optionally, `"default-registry"`: A `` or `null` +* Optionally, `"registries"`: An array of ``s + +Since this is the first RFC that adds anything to this field, +as of now the only properties that can live in that object will be +these. + +A `` is an object matching one of the following: +* ``: + * `"kind"`: The string `"builtin"` +* ``: + * `"kind"`: The string `"directory"` + * `"path"`: A path +* ``: + * `"kind"`: The string `"git"` + * `"repository"`: A URI + * Optionally, `"path"`: An absolute path into the git repository + * Optionally, `"ref"`: A git reference + +A `` is a `` object, plus the following properties: +* Optionally, `"scopes"`: An array of ``s +* Optionally, `"packages"`: An array of ``s + +The `"packages"` and `"scopes"` fields of distinct registries must be disjoint, +and each `` must have at least one of the `"scopes"` and `"packages"` property, +since otherwise there's no point. + +As an example, a package which uses a different default registry, and a different registry for boost, +might look like the following: + +```json +{ + "default-registry": { + "kind": "directory", + "path": "vcpkg-ports" + }, + "registries": [ + { + "kind": "git", + "repository": "https://github.com/boostorg/vcpkg-ports", + "ref": "v1.73.0", + "scopes": [ "boost" ] + }, + { + "kind": "builtin", + "packages": [ "cppitertools" ] + } + ] +} +``` + +This will install `fmt` from `/vcpkg-ports`, +`cppitertools` from the registry that ships with vcpkg, +and any `boost` dependencies from `https://github.com/boostorg/vcpkg-ports`. +Notably, this does not replace behavior up the tree -- only the `vcpkg-configuration.json`s +for the current invocation do anything. + +### Behavior + +When a vcpkg command requires the installation of dependencies, +it will generate the initial list of dependencies from the package, +and then run the following algorithm on each dependency: + +1. Figure out which registry the package should come from by doing the following: + 1. If there is a registry in the registry set which contains the dependency name in the `"packages"` array, + then use that registry. + 2. For every scope, in order from most specific to least, + if there is a registry in the registry set which contains that scope in the `"scopes"` array, + then use that registry. + (For example, for `"cat.meow.cute"`, check first for `"cat.meow.cute"`, then `"cat.meow"`, then `"cat"`). + 3. If the default registry is not `null`, use that registry. + 4. Else, error. +2. Then, add that package's dependencies to the list of packages to find, and repeat for the next dependency. + +vcpkg will also rerun this algorithm whenever an install is run with different configuration. + +### How Registries are Laid Out + +There are three kinds of registries, but they only differ in how the registry gets onto one's filesystem. +Once the registry is there, package lookup runs the same, with each kind having it's own way of defining its +own root. + +In order to find a port `meow` in a registry with root `R`, vcpkg first sees if `R/meow` exists; +if it does, then the port root is `R/meow`. Otherwise, see if `R/m-` exists; if it does, +then the port root is `R/m-/meow`. (note: this algorithm may be extended further in the future). + +For example, given the following port root: + +``` +R/ + abseil/... + b-/ + boost/... + boost-build/... + banana/... + banana/... +``` + +The port root for `abseil` is `R/abseil`; the port root for `boost` is `R/b-/boost`; +the port root for `banana` is `R/banana` (although this duplication is not recommended). + +The reason we are making this change to allow more levels in the ports tree is that ~1300 +ports are hard to look through in a tree view, and this allows us to see only the ports we're +interested in. Additionally, no port name may end in a `-`, so this means that these port subdirectories +will never intersect with actual ports. Additionally, since we use only ASCII for port names, +we don't have to worry about graphemes vs. code units vs. code points -- in ASCII, they are equivalent. + +Let's now look at how different registry kinds work: + +#### `` + +For a ``, there is no configuration required. +The registry root is simply `/ports`. + +#### `` + +For a ``, it is again fairly simple. +Given `$path` the value of the `"path"` property, the registry root is either: + +* If `$path` is absolute, then the registry root is `$path`. +* If `$path` is drive-relative (only important on Windows), the registry root is + `(drive of vcpkg.json)/$path` +* If `$path` is relative, the registry root is `(directory of vcpkg.json)/$path` + +Note that the path to vcpkg.json is _not_ canonicalized; it is used exactly as it is seen by vcpkg. + +#### `` + +This registry is the most complex. We would like to cache existing registries, +but we don't want to ignore new updates to the registry. +It is the opinion of the author that we want to find more updates than not, +so we will update the registry whenever the `vcpkg.json` or `vcpkg-configuration.json` +is modified. We will do so by keeping a sha512 of the `vcpkg.json` and `vcpkg-configuration.json` +inside the `vcpkg-installed` directory. + +We will download the specific ref of the repository to a central location (and update as needed), +and the root will be either: ``, if the `"path"` property is not defined, +or else `/` if it is defined. +The `"path"` property must be absolute, without a drive, and will be treated as relative to +the path to the repository. For example: + +```json +{ + "kind": "git", + "repository": "https://github.com/microsoft/vcpkg", + "path": "/ports" +} +``` + +is the correct way to refer to the registry built in to vcpkg, at the latest version. + +The following are all incorrect: + +```json +{ + "$reason": "path can't be drive-absolute", + "kind": "git", + "repository": "https://github.com/microsoft/vcpkg", + "path": "F:/ports" +} +``` + +```json +{ + "$reason": "path can't be relative", + "kind": "git", + "repository": "https://github.com/microsoft/vcpkg", + "path": "ports" +} +``` + +```json +{ + "$reason": "path _really_ can't be relative like that", + "kind": "git", + "repository": "https://github.com/microsoft/vcpkg", + "path": "../../meow/ports" +} +``` diff --git a/externals/vcpkg/docs/specifications/scripts-extraction.md b/externals/vcpkg/docs/specifications/scripts-extraction.md new file mode 100755 index 000000000..396e2d4e0 --- /dev/null +++ b/externals/vcpkg/docs/specifications/scripts-extraction.md @@ -0,0 +1,66 @@ +# Scripts Tree Extraction + +**Note: this is the feature as it was initially specified and does not necessarily reflect the current behavior.** + +## Background + +We extracted vcpkg-tool as part of a future wherein Registries are the primary mechanism for interacting with the ports tree, which would allow the vcpkg tool and associated artifacts to be deployed and figure the rest out on their own. Unfortunately, we have concurrently edited things in the so called "scripts" tree which lives in support of ports but really probably belongs in the vcpkg-tool repo. + +Moreover, as part of stabilizing registries, the interface exposed by the scripts tree becomes contractual rather than something we can change in concert with ports, since we can no longer see the universe of ports to validate that changes are correct. + +To that end we are auditing the contents of the scripts tree to make sure it is a solid foundation for future work. + +The work list is contained in [Issue #16188]. + +[Issue #16188]: https://github.com/microsoft/vcpkg/issues/16188 + +## Audit Points + +The following are assertions we want to be able to make about the contents of the scripts tree. Note that this does *not* refer to `vcpkg.cmake` since that needs to work with older versions of cmake. + +These are design ideals that we may break in some limited cases where that makes sense. + +- We always use `cmake_parse_arguments` rather than function parameters, or referring to `${ARG}`. + - Exception: there are exclusively positional parameters. This should be _very rare_. + - In this case, positional parameters should be put in the function declaration + (rather than using `${ARG}`), and should be named according to local rules + (i.e. `snake_case`). + - Exception: positional parameters that are optional should be given a name via + `set(argument_name "${ARG}") after checking `${ARGC}`. + - Note: in cases where there are positional parameters along with non-positional parameters, positional parameters should be referred to by `arg_UNPARSED_ARGUMENTS`. +- All `cmake_parse_arguments` use `PARSE_ARGV` for resistance to embedded semicolons. +- All `foreach` loops use `IN LISTS` for resistance to embedded semicolons. +- The variable `${ARGV}` is unreferenced. +- We use functions, not macros or top level code. +- Scripts in the scripts tree should not be expected to need changes as part of normal operation. (For example, `vcpkg_acquire_msys` has hard coded specific packages and versions thereof used which we believe is unacceptable) +- All non-splat variable expansions are in quotes "". +- There are no "pointer" parameters (where a user passes a variable name rather than the contents) except for out parameters. +- Undefined names are not referenced. +- Out parameters only set `PARENT_SCOPE`. +- `CACHE` variables are not used. +- `include()`s are removed and fixes to `port.cmake` et al. are made as necessary to avoid this. +- `foreach(RANGE)`'s arguments _must always be_ natural numbers, and `` _must always be_ less than or equal to ``. + - This should be checked. + +### Naming Variables + +- `cmake_parse_arguments`: set prefix to `"arg"` +- local variables are named `snake_case` +- Internal global variable names are named `Z_VCPKG_`. +- External experimental global variable names are named `X_VCPKG_`. +- Internal functions are named `z_vcpkg_*` + - Functions which are internal to a single function (i.e., helper functions) + are named `[z_]_`, where `` is the name of the function they are + a helper to, and `` is what the helper function does. + - `z_` should be added to the front if `` doesn't have a `z_`, + but don't name a helper function `z_z_foo_bar`. +- Public global variables are named `VCPKG_`. + +## Prognosis + +Not everything should remain in the scripts tree. As part of this audit, each helper will be dealt with in one of several ways: + +- Stay in scripts tree +- Deleted outright +- Moved to a tool port +- Deprecated diff --git a/externals/vcpkg/docs/specifications/versioning.md b/externals/vcpkg/docs/specifications/versioning.md new file mode 100755 index 000000000..1ad9ef8dc --- /dev/null +++ b/externals/vcpkg/docs/specifications/versioning.md @@ -0,0 +1,357 @@ +# Versioning Specification + +**Note: this is the feature as it was initially specified and does not necessarily reflect the current behavior.** + +**Up-to-date documentation is available at [Versioning](../users/versioning.md).** + +## Glossary +Some of the terms used in this document have similar meaning when discussed by the community, and because of that, they can cause confusion and ambiguity. To solve this issue, we will assign specific meaning to these terms and try to keep a consistent usage through the document. + +**Library**: A piece of software (source code, binary files, documentation, license, etc.) that is intended to be reused by other software. + +**Package**: A package can contain a library, collection of libraries, build scripts, software tools, or other components necessary for their use. The goal of vcpkg is to facilitate the installation of these packages in the user's environment. + +**Port**: A vcpkg specific term, a port contains: + +* Metadata about a package: package version, supported features, dependencies, etc. +* Instructions to acquire, build if necessary, and install the package. + +## 1 Enabling package versioning +On launch, the versioning feature will be disabled by default. Users can enable this feature by setting the `versions` feature flag. + +Example: +``` +vcpkg --feature-flags=versions install +``` + +### 1.1 Proposed experience +This feature requires the use of manifests to declare project dependencies. To allow versioning, the following features are added to manifests: + +* Ability to declare a package's versioning scheme. +* Ability to declare version constraints on dependencies. +* Ability for a top-level manifest to override all other version constraints. +* Ability to declare a baseline for all versions. + +Example: A manifest (`vcpkg.json`) using versioning features. +```json +{ + "name": "versions-test", + "version": "1.0.0", + "dependencies": ["fmt", {"name": "zlib", "version>=": "1.2.11"}], + "$x-default-baseline": "9fd3bd594f41afb8747e20f6ac9619f26f333cbe" +} +``` + +The example above shows some new manifest properties: +* `"version"`: Declares a version using a dot-separated versioning scheme (`1.0.0`). +* `"version>="`: Declares a minimum version constraint on package `zlib`. +* `"$x-default-baseline"`: Declares a baseline version for all packages. + +All these new features are described in more detail in this document. + +## 2 Specifying package versions +Through the years, C++ software authors have adopted multiple versioning schemes and practices that sometimes conflict between each other. On vcpkg, the most recurrent versioning schemes found are: +* Semantic versions +* Dates +* Repository commits +* Arbitrary strings + +For vcpkg to achieve wide adoption and compatibility with existing projects, it is important that we respect the versioning schemes used by each of the packages contained in our ports catalog. + +### 2.1 Port versions +Package versioning information is divided in two parts: a version string and a port version. +Port versions are a concept exclusive to vcpkg, they do not form part of a package’s upstream. But allow for versioning of the vcpkg ports themselves. + +Packages can also include the port version as part of a version constraint by using the “port-version†property on their dependencies. + +#### `port-version` + +An integer value that increases each time a vcpkg-specific change is made to the port. + +The rules for port versions are: +* Start at 0 for the original version of the port, +* increase by 1 each time a vcpkg-specific change is made to the port that does not increase the version of the package, +* and reset to 0 each time the version of the package is updated. + +Defaults to 0 if omitted. + +### 2.2 Package versions +Versions are an important part of a package’s upstream metadata. Ports in vcpkg should attempt to follow the versioning conventions used by the package’s authors. For that reason, when declaring a package’s version the appropriate scheme should be used. + +Each versioning scheme defines their own rules on what is a valid version string and more importantly the rules for how to sort versions using the same scheme. + +The versioning schemes understood by vcpkg are: + +Manifest property | Versioning scheme +------------------|------------------------------------ +`version` | For dot-separated numeric versions +`version-semver` | For SemVer compliant versions +`version-date` | For dates in the format YYYY-MM-DD +`version-string` | For arbitrary strings + +A manifest must contain only one version declaration. + +#### `version` +Accepts version strings that follow a relaxed, dot-separated-, semver-like scheme. + +The version is logically composed of dot-separated (`.`) numeric sections. Each section must contain an integer positive number with no leading zeroes. + +The regex pattern for this versioning scheme is: `(0|[1-9]\d*)(\.(0|[1-9]\d*))*` + +_Sorting behavior_: When comparing two versions, each section is compared from left to right by their numeric value, until the first difference is found. A version with the smallest set of sections takes precedence over another with a larger set of sections, given that all their preceding sections compare equally. + +Example: +`0` < `0.1` < `0.1.0` < `1` < `1.0.0` < `1.0.1` < `1.1`< `2.0.0` + +#### `version-semver` +Accepts version strings that follow semantic versioning conventions as described in the [semantic versioning specification](https://semver.org/#semantic-versioning-specification-semver). + +_Sorting behavior_: Strings are sorted following the rules described in the semantic versioning specification. + +Example: +`1.0.0-1` < `1.0.0-alpha` < `1.0.0-beta` < `1.0.0` < `1.0.1` < `1.1.0` + +#### `version-date` + +Accepts version strings that can be parsed to a date following the ISO-8601 format `YYYY-MM-DD`. Disambiguation identifiers are allowed in the form of dot-separated-, positive-, integer-numbers with no leading zeroes. + +The regex pattern for this versioning scheme is: `\d{4}-\d{2}-\d{2}(\.(0|[1-9]\d*))*`. + +_Sorting behavior_: Strings are sorted first by their date part, then by numeric comparison of their disambiguation identifiers. Disambiguation identifiers follow the rules of the relaxed (version) scheme. + +Examples: +`2020-01-01` < `2020-01-01.1` < `2020-02-01.1.2` < `2020-02-01.1.3` < `2020-02-01` + +#### `version-string` +For packages using version strings that do not fit any of the other schemes, it accepts most arbitrary strings, but some special characters like `#` are disallowed. + +_Sorting behavior_: No sorting is attempted on the version string itself. However, if the strings match exactly, the port versions can be compared and sorted. + +Examples: +`apple` <> `orange` <> `orange.2` <> `orange2` +`watermelon` (`port-version`: 0) < `watermelon` (`port-version`: 1) + +##### Example: Manifests using different versioning schemes +```json +{ + "name": "openssl", + "version": "1.1.1", + "port-version": 0 +} +``` +```json +{ + "name": "bzip2", + "version-semver": "1.0.8", +} +``` +```json +{ + "name": "abseil", + "version-date": "2020-03-03", + "port-version": 8 +} +``` +```json +{ + "name": "d3dx12", + "version-string": "may2020", + "port-version": 0 +} +``` + +## 3 Specifying dependency versions + +### 3.1 On manifest files +Manifest files help users specify complex versioned dependency graphs in a declarative manner. In this document we define a top-level manifest as the manifest file written by a user to declare their project’s dependencies. This is opposed to a port’s manifest file, which is used by port’s to declare the dependencies of the package it contains. + +There are three mechanisms you can use in your manifest files to control which versions of your packages are installed: **version constraints, registry baselines and overrides**. + +#### Version constraints +Specifying a version constraint is the most direct way to control which version of a package is installed, in vcpkg you can declare minimum version constraints using the syntax `"version>=": "1.0.0"`. + +#### Registry baseline +Baselines are used to set lower boundaries on package versions. A baseline effectively adds a minimum version constraint on all the packages declared in it. + +But what is a baseline? + +In the main registry, the baseline is a file located in `${VCPKG_ROOT}/versions/baseline.json`. This file contains a version declaration for each package in vcpkg. The format of this file is the following: + +```json +{ + "default": [ + { + ... + "fmt": { "version-semver": "7.1.2", "port-version": 0}, + ... + } + ] +} +``` + +The baseline file is tracked under source control. For any given revision of the registry, the versions declared in the baseline file must match the current versions of the ports in the registry at that revision. + +Old revisions of vcpkg that do not contain a baseline file can still work with versioning. As a fallback, if no baseline is available at a given revision, vcpkg will use its local baseline file. If a local baseline file does not exist, the local version of the port will be used as the baseline version. + +Baselines define a minimum version constraint an all packages contained in it. + +For example, if the baseline contains the entry: +``` +“fmtâ€: { “version-semverâ€: “7.1.2â€, “port-versionâ€: 0 } +``` + +A minimum version constraint will be added to `fmt` so that vcpkg won’t install a version lower than `7.1.2` with port version `0`. + +#### Overrides +Declaring an override forces vcpkg to ignore all other constraints, both top-level and transitive constraints, and use the version specified in the override. This is useful for pinning exact versions and for resolving version conflicts. + +## 4 Version constraints + +### 4.1 Declaring a baseline +For the initial implementation, the method to declare a baseline is to set the `“$x-default-baselineâ€` property. + +The use of `“$x-default-baselineâ€` is temporary and will very likely change in the future, as we work on implementing custom registries. + +#### `$x-default-baseline` +Accepts a Git commit ID. Vcpkg will try to find a baseline file in the given commit ID and use that to set the baseline versions (lower bound versions) of all declared dependencies. + +When resolving version constraints for a package, vcpkg will look for a baseline version: +* First by looking at the baseline file in the given commit ID. +* If the given commit ID does not contain a baseline file, vcpkg will fallback to use the local baseline file instead. +* If there’s no local baseline file, vcpkg will use the version currently available in the ports directory. + +_NOTE: If a baseline file is found, but it does not contain an entry for the package, the vcpkg invocation will fail._ + +Example: +```json +{ + "name": "project", + "version": "1.0.0", + "dependencies": ["zlib", "fmt"], + "$x-default-baseline":"9fd3bd594f41afb8747e20f6ac9619f26f333cbe" +} +``` + +Baselines can be used without any other version constraints to obtain behavior close to using “classic†mode. + +### 4.2 Declaring minimum version constraints +A minimum version requirement puts a lower boundary on the versions that can be used to satisfy a dependency. This means that any version that is newer than the requirement is valid (including major version changes). + +Vcpkg will use the oldest identified version that can satisfy all the version requirements in a build graph. Using a minimum version approach has the following advantages: +* Is predictable and easy to understand. +* User controls when upgrades happen, as in, no upgrades are performed automatically when a new version is released. +* Avoids using a SAT solver. + +Minimum version requirements are expressed by using the `"version>="` property in the dependencies list. + +Example: +```json +{ + "name": "project", + "version-semver": "1.0.0", + "dependencies": [ + { "name": "zlib", "version>=": "1.2" }, + { "name": "rapidjson", "version>=": "2020-02-01" } + ] +} +``` + +### 4.3 Declaring port version constraints +To be consistent with the minimum version approach, vcpkg uses the lowest available port version that matches the package version. There are many scenarios where a higher port version is desirable, e.g.: support for new platforms, fixing installation issues, among others. + +As part of the dependency object a port version can be specified. An error will be emitted if a non-existent port-version for the given package version is requested. + +Example: +```json +{ + "name": "project", + "version-semver": "1.0.0", + "dependencies": [ + { "name": "zlib", "version>=": "1.2" }, + { "name": "rapidjson", "version=": "2020-02-01", "port-version": 2 } + ] +} +``` + +### 4.4 Declaring overrides +Overrides are declared as an array of package version declarations. + +For an override to take effect, the overridden package must form part of the dependency graph. That means that a dependency must be declared either by the top-level manifest or be part of a transitive dependency. + +Example: +```json +{ + "name": "project", + "version": "1.0.0", + "dependencies": ["cpprestsdk"], + "overrides": [{"name":"zlib", "version-semver":"1.2.10"}], + "$x-default-baseline":"9fd3bd594f41afb8747e20f6ac9619f26f333cbe" +} +``` + +In the previous example, `zlib` is not a direct dependency of the project but it is a dependency for `cpprestsdk`, so the override takes effect forcing `zlib` to version `1.2.10`. + +## 5 Design considerations + +### 5.1 Constraint resolution +Given a manifest with a set of versioned dependencies, vcpkg will attempt to calculate a package installation plan that satisfies all the constraints. Constraints can be declared in the top-level manifest but can also be added transitively by indirect dependencies. + +Vcpkg roughly follows the steps below to compute an installation plan, the installation plan will either contain a valid set of package versions, or a list of version conflicts. + +* Add all top-level constraints to the plan. +* Recursively add transitive constraints to the plan. +* Each time a constraint is added for a package, also add it’s baseline version as a minimum constraint. +* Each time a constraint is added: + * If an override exists for the package, select the version in the override. + * Otherwise: + * If there is no previous version selected. + * Select the minimal version that satisfies the constraint. + * If there is a previous version selected: + * If the versioning scheme of the new constraint does not match that of the previously selected version: + * Add a version conflict. + * If the constraint’s version is not comparable to the previously selected version. For example, comparing “version-string: apple†to “version-string: orangeâ€: + * Add a version conflict. + * If the constraints version is higher than the previously selected version: + * Select the highest version. + * Otherwise, keep the previous selection. +* Review the plan: + * If there are no conflicts, install the selected packages. + * Otherwise, report the conflicts to the user. + +### 5.2 Acquiring port versions +Although the concept of package versions has always been present in vcpkg, the concept of version constraints has been not. + +With the introduction of versioning constraints, it is now possible that a package depends on a port version that does not match the one available locally. This raises a problem as vcpkg needs to know how to acquire the port files for the requested version. + +To solve this problem, a new set of metadata needs to be introduced. This specification proposes a that a new "versions" folder is added as part of a registry. In the main vcpkg registry, this means a new root level versions directory. + +The versions directory, from here on referred as the versions database, will contain JSON files for each one of the ports available in the registry. Each file will list all the versions available for a package and contain a Git tree-ish object that vcpkg can check out to obtain that version’s portfiles. + +As part of the versioning implementation, a generator for these database files will be implemented. The generator will extract from our repository’s Git history, all the versions of each port that had been available at any moment in time and compile them into these database files. + +Example: generated `zlib.json` +```json +{ + "versions": [ + { + "git-tree": "2dfc991c739ab9f2605c2ad91a58a7982eb15687", + "version-string": "1.2.11", + "port-version": 9 + }, + { “$truncated for brevity†}, + { + "git-tree": "a516e5ee220c8250f21821077d0e3dd517f02631", + "version-string": "1.2.10", + "port-version": 0 + }, + { + "git-tree": "3309ec82cd96d752ff890c441cb20ef49b52bf94", + "version-string": "1.2.8", + "port-version": 0 + } + ] +} +``` + +For each port, its corresponding versions file should be located in `versions/{first letter of port name}-/{port name}.json`. For example, zlib’s version file will be located in `versions/z-/zlib.json`. +Aside from port version files, the current baseline file is located in `versions/baseline.json`. diff --git a/externals/vcpkg/docs/users/android.md b/externals/vcpkg/docs/users/android.md new file mode 100755 index 000000000..b25099c16 --- /dev/null +++ b/externals/vcpkg/docs/users/android.md @@ -0,0 +1,221 @@ +# Vcpkg and Android + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/android.md).** + +*Android is not tested as part of vcpkg repository's CI process, so regressions can occur as part of library updates. PRs improving support are welcome!* + +## Android build requirements + +1. Download the [android ndk](https://developer.android.com/ndk/downloads/) + +2. Set environment variable `ANDROID_NDK_HOME` to your android ndk installation. + For example: + +````bash +export ANDROID_NDK_HOME=/home/your-account/Android/Sdk/ndk-bundle +```` + +Or: +````bash +export ANDROID_NDK_HOME=/home/your-account/Android/android-ndk-r21b +```` + +3. Install [vcpkg](https://github.com/microsoft/vcpkg) + +4. Set environment variable `VCPKG_ROOT` to your vcpkg installation. +````bash +export VCPKG_ROOT=/path/to/vcpkg +```` + +## vcpkg triplets and their corresponding android ABI + +There are four different Android ABI, each of which maps to +a vcpkg triplet. The following table outlines the mapping from vcpkg architectures to android architectures + +|VCPKG_TARGET_TRIPLET | ANDROID_ABI | +|---------------------------|----------------------| +|arm64-android | arm64-v8a | +|arm-android | armeabi-v7a | +|x64-android | x86_64 | +|x86-android | x86 | + +## Install libraries for Android using vcpkg + +Example for jsoncpp: + +````bash +cd $VCPKG_ROOT + +# specify the triplet like this +./vcpkg install jsoncpp --triplet arm-android +# or like this +./vcpkg install jsoncpp:arm64-android +./vcpkg install jsoncpp:x86-android +./vcpkg install jsoncpp:x64-android +```` + +### Using Vulkan SDK + +Vcpkg has a [`vulkan` package](https://github.com/microsoft/vcpkg/blob/master/ports/vulkan/portfile.cmake) which allows you to `find_package(Vulkan)`. To use it you have to provide `VULKAN_SDK` environment variable. + +```bash +export VULKAN_SDK=/usr/local +./vcpkg install vulkan +``` + +NDK already contains [Vulkan](https://developer.android.com/ndk/guides/graphics/getting-started) headers and `libvulkan.so` binaries for each of its architecture. +To expose them to VcPkg, you can consider `export VULKAN_SDK=...` for each installation. +But by placing `set(ENV{VULKAN_SDK} ...)` in the triplet files, you can skip the tedious work. + +If you are using NDK 21.3.6528147 or earlier version, it will be like the following. + +```cmake +# In android triplets... (e.g. arm64-android.cmake) +set(VCPKG_CMAKE_SYSTEM_NAME Android) +# ... +# If your API level is 30, libvulkan.so is at $ENV{ANDROID_NDK_HOME}/platforms/android-30/arch-arm64/usr/lib +set(ENV{VULKAN_SDK} $ENV{ANDROID_NDK_HOME}/sysroot/usr) +``` + +Notice that **the location of the sysroot has changed since NDK 22**. (see https://github.com/android/ndk/issues/1407) +If you prefer using [the latest version](https://developer.android.com/studio/projects/install-ndk#default-ndk-per-agp), check the [BuildSystemMaintainers.md of the NDK document](https://android.googlesource.com/platform/ndk/+/master/docs/BuildSystemMaintainers.md#sysroot) and then put appropriate path for your system. + +For example, Mac OS users will use the path like this. + +```cmake +# In android triplets... (e.g. arm64-android.cmake) +set(VCPKG_CMAKE_SYSTEM_NAME Android) +# ... +# If your API level is 30, libvulkan.so is at $ENV{ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/30 +set(ENV{VULKAN_SDK} $ENV{ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr) +``` + +By doing this for all android triplets, you can install `vulkan` and the packages that require it. (e.g. `vulkan-hpp`) + +

+ `vcpkg install vulkan-hpp:arm64-android` + +```console +user@host$ ./vcpkg install vulkan-hpp:arm64-android +Computing installation plan... +The following packages will be built and installed: + * vulkan[core]:arm64-android -> 1.1.82.1-1 + vulkan-hpp[core]:arm64-android -> 2019-05-11-1 +Additional packages (*) will be modified to complete this operation. +Detecting compiler hash for triplet arm64-android... +... +Starting package 1/2: vulkan:arm64-android +Building package vulkan[core]:arm64-android... +-- Using community triplet arm64-android. This triplet configuration is not guaranteed to succeed. +-- [COMMUNITY] Loading triplet configuration from: /.../vcpkg/triplets/community/arm64-android.cmake +-- Querying VULKAN_SDK Environment variable +-- Searching /.../Library/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/vulkan/ for vulkan.h +-- Found vulkan.h +-- Performing post-build validation +-- Performing post-build validation done +... +Building package vulkan[core]:arm64-android... done +Installing package vulkan[core]:arm64-android... +Installing package vulkan[core]:arm64-android... done +Elapsed time for package vulkan:arm64-android: 35.9 ms +Starting package 2/2: vulkan-hpp:arm64-android +Building package vulkan-hpp[core]:arm64-android... +-- Using community triplet arm64-android. This triplet configuration is not guaranteed to succeed. +-- [COMMUNITY] Loading triplet configuration from: /.../vcpkg/triplets/community/arm64-android.cmake +-- Using cached /.../vcpkg/downloads/KhronosGroup-Vulkan-Hpp-5ce8ae7fd0d9c0543d02f33cfa8a66e6a43e2150.tar.gz +-- Cleaning sources at /.../vcpkg/buildtrees/vulkan-hpp/src/e6a43e2150-4f344cd911.clean. Use --editable to skip cleaning for the packages you specify. +-- Extracting source /.../vcpkg/downloads/KhronosGroup-Vulkan-Hpp-5ce8ae7fd0d9c0543d02f33cfa8a66e6a43e2150.tar.gz +-- Using source at /.../vcpkg/buildtrees/vulkan-hpp/src/e6a43e2150-4f344cd911.clean +-- Performing post-build validation +-- Performing post-build validation done +... +Building package vulkan-hpp[core]:arm64-android... done +Installing package vulkan-hpp[core]:arm64-android... +Installing package vulkan-hpp[core]:arm64-android... done +Elapsed time for package vulkan-hpp:arm64-android: 144.5 ms + +Total elapsed time: 1.013 s + +The package vulkan-hpp:arm64-android is header only and can be used from CMake via: + + find_path(VULKAN_HPP_INCLUDE_DIRS "vulkan/vulkan.hpp") + target_include_directories(main PRIVATE ${VULKAN_HPP_INCLUDE_DIRS}) + +``` + +
+ + +## Consume libraries using vpckg, cmake and the android toolchain + +1. Combine vcpkg and Android toolchains + +vcpkg and android both provide dedicated toolchains: +````bash +vcpkg_toolchain_file=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake +android_toolchain_file=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake +```` + +When using vcpkg, the vcpkg toolchain shall be specified first. + +However, vcpkg provides a way to preload and additional toolchain, with the VCPKG_CHAINLOAD_TOOLCHAIN_FILE option. + +````bash +cmake \ + -DCMAKE_TOOLCHAIN_FILE=$vcpkg_toolchain_file \ + -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$android_toolchain_file \ + ... +```` + +2. Specify the android abi and vcpkg triplet + +When compiling for android, you need to select a matching "android abi" / "vcpkg triplet" pair. + +For example: + +````bash +android_abi=armeabi-v7a +vcpkg_target_triplet=arm-android + +cmake + ... + -DVCPKG_TARGET_TRIPLET=$vcpkg_target_triplet \ + -DANDROID_ABI=$android_abi +```` + +### Test on an example + +The folder [docs/examples/vcpkg_android_example_cmake](../examples/vcpkg_android_example_cmake) provides a working example, with an android library that consumes the jsoncpp library: + +*Details* + +* The [CMakeLists](../examples/vcpkg_android_example_cmake/CMakeLists.txt) simply uses `find_package` and `target_link_library` + +* The [compile.sh](../examples/vcpkg_android_example_cmake/compile.sh) script enables you to select any matching pair of "android abi" / "vcpkg triplet" and to test the compilation + +* The dummy [my_lib.cpp](../examples/vcpkg_android_example_cmake/my_lib.cpp) file uses the jsoncpp library + +*Note*: this example only compiles an Android library, as the compilation of a full fledged Android App is beyond the scope of this document. + +### Test on an example, using [vcpkg_android.cmake](../examples/vcpkg_android_example_cmake_script/cmake/vcpkg_android.cmake) + +The folder [docs/examples/vcpkg_android_example_cmake_script](../examples/vcpkg_android_example_cmake_script) provides the same example, and uses a cmake script in order to simplify the usage. + +*Details* + +* The main [CMakeLists](../examples/vcpkg_android_example_cmake_script/CMakeLists.txt) loads [vcpkg_android.cmake](../examples/vcpkg_android_example_cmake_script/cmake/vcpkg_android.cmake) if the flag `VCPKG_TARGET_ANDROID` is set: +````cmake +if (VCPKG_TARGET_ANDROID) + include("cmake/vcpkg_android.cmake") +endif() +```` +*Important: place these lines before calling project() !* + +* The [compile.sh](../examples/vcpkg_android_example_cmake_script/compile.sh) script shows that it is then possible to compile for android using a simple cmake invocation, for example: +````bash +cmake .. -DVCPKG_TARGET_ANDROID=ON -DANDROID_ABI=armeabi-v7a +```` + +## Consume libraries using vpckg, and Android prefab Archives (AAR files) + +See [prefab.md](../specifications/prefab.md) diff --git a/externals/vcpkg/docs/users/assetcaching.md b/externals/vcpkg/docs/users/assetcaching.md new file mode 100755 index 000000000..1328bb2fe --- /dev/null +++ b/externals/vcpkg/docs/users/assetcaching.md @@ -0,0 +1,58 @@ +# Asset Caching + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/assetcaching.md).** + +**Experimental feature: this may change or be removed at any time** + +Vcpkg can utilize mirrors to cache downloaded assets, ensuring continued operation even if the original source changes +or disappears. + +In-tool help is available via `vcpkg help assetcaching`. + +## Configuration + +Asset caching can be configured by setting the environment variable `X_VCPKG_ASSET_SOURCES` to a semicolon-delimited +list of source strings. Characters can be escaped using backtick (\`). + +### Valid source strings + +The `` optional parameter for certain strings controls how they will be accessed. It can be specified as `read`, +`write`, or `readwrite` and defaults to `read`. + +#### `clear` + +Syntax: `clear` + +Removes all previous sources + +#### `x-azurl` + +Syntax: `x-azurl,[,[,]]` + +Adds an Azure Blob Storage source, optionally using Shared Access Signature validation. URL should include the container +path and be terminated with a trailing `/`. SAS, if defined, should be prefixed with a `?`. Non-Azure servers will also +work if they respond to GET and PUT requests of the form: ``. As an example, if you set +`X_VCPKG_ASSET_SOURCES` to `x-azurl,https://mydomain.com/vcpkg/,token=abc123,readwrite` your server should respond to +`GET` and `PUT` requests of the form `https://mydomain.com/vcpkg/?token=abc123`. + +You can also use the filesystem (e.g. a network drive) via `file://` as asset cache. For example you then set +`X_VCPKG_ASSET_SOURCES` to `x-azurl,file:///Z:/vcpkg/assetcache/,,readwrite` when you have a network folder mounted at +`Z:/`. + +The workflow of this asset source is: + +1. Attemp to read from the mirror +2. (If step 1 failed) Read from the original url +3. (If step 2 succeeded) Write back to the mirror + +You can enable/disable steps 1 and 3 via the [``](#valid-source-strings) specifier and you can disable step 2 via +`x-block-origin` below. + +See also the [binary caching documentation for Azure Blob Storage](binarycaching.md#azure-blob-storage-experimental) for +more information on how to set up an `x-azurl` source. + +#### `x-block-origin` + +Syntax: `x-block-origin` + +Disables use of the original URLs in case the mirror does not have the file available. diff --git a/externals/vcpkg/docs/users/authentication.md b/externals/vcpkg/docs/users/authentication.md new file mode 100755 index 000000000..4c1d1b9f0 --- /dev/null +++ b/externals/vcpkg/docs/users/authentication.md @@ -0,0 +1,91 @@ +# Authentication for Source Code + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/authentication.md).** + +Registries and `vcpkg_from_git()` directly use the git command line tools to fetch remote resources. Some of these resources may be protected from anonymous access and need authentication or credentials. + +The strategies below all seek to achieve the same fundamental goal: `git clone https://....` should succeed without interaction. This enables vcpkg to be separated from the specifics of your authentication scheme, ensuring forwards compatibility with any additional security improvements in the future. + +## Pre-seed git credentials + +You can pre-seed git credentials via `git credential approve`: + +Powershell: +```powershell +"url=https://github.com`npath=Microsoft/vcpkg`nusername=unused`npassword=$MY_PAT`n" | git credential approve +``` +Bash: +```sh +echo "url=https://github.com"$'\n'"path=Microsoft/vcpkg"$'\n'"username=unused"$'\n'"password=$MY_PAT"$'\n' | git credential approve +``` + +## Bearer auth + +For systems which need bearer auth, you can use `git config`: + +**Note: you must make these config changes with `--global`** +``` +git config --global --unset-all http..extraheader +git config --global http..extraheader "AUTHORIZATION: bearer " +``` +The `` can be filled in with a variety of options, documented in https://git-scm.com/docs/git-config#Documentation/git-config.txt-httplturlgt. For example, `https://dev.azure.com/MYORG/`. + +(Original Source: https://github.com/Microsoft/azure-pipelines-agent/issues/1601#issuecomment-394511048). + +**Note for Azure DevOps users:** You may need to enable access via Job authorization scope https://docs.microsoft.com/en-us/azure/devops/pipelines/process/access-tokens?view=azure-devops&tabs=yaml#job-authorization-scope. You may also need to "reference" the repo in your yaml via: + +```yaml +resources: + repositories: + - repository: + type: git + name: / + tag: tags/ + +... + +jobs: + - job: Build + uses: + repositories: [] +``` + +## Pass credentials in an environment variable (not recommended) + +Using `VCPKG_KEEP_ENV_VARS` or `VCPKG_ENV_PASSTHROUGH_UNTRACKED`, we can smuggle credential info via another var like `MY_TOKEN_VAR`. +```sh +export VCPKG_KEEP_ENV_VARS=MY_TOKEN_VAR +export MY_TOKEN_VAR=abc123 +``` +This can then be used in your private ports: +```cmake +# some/private/portfile.cmake +set(MY_TOKEN_VAR "") +if(DEFINED ENV{MY_TOKEN_VAR}) + set(MY_TOKEN_VAR "$ENV{MY_TOKEN_VAR}@") +endif() +vcpkg_from_git( + URLS "https://${MY_TOKEN_VAR}host.com/normal/url/path" + ... +) +``` +```cmake +# some/other/private/portfile.cmake +vcpkg_from_github( + AUTHORIZATION_TOKEN "$ENV{MY_TOKEN_VAR}" +) +``` + +For private ports, we recommend using `vcpkg_from_git()` instead of `vcpkg_from_github()` and the pre-seeding method above. + +## Pass Jenkins gitUsernamePassword credentials + +The simplest and most secure option to Git authentication to GitHub from Jenkins is using [GitHub App](https://github.com/jenkinsci/github-branch-source-plugin/blob/master/docs/github-app.adoc) and the following: +```groovy +withCredentials([gitUsernamePassword(credentialsId: 'jenkins-github-app')]) { + withEnv(['VCPKG_KEEP_ENV_VARS=GIT_ASKPASS']) { + bat 'cmake' + } +} +``` +This sets the GIT_ASKPASS with a path to helper script which responds with git credentials query and instructs `vcpkg` to keep this environment variable. The password is a [GitHub App token](https://github.blog/2021-04-05-behind-githubs-new-authentication-token-formats/) with 1 hour lifetime. diff --git a/externals/vcpkg/docs/users/binarycaching.md b/externals/vcpkg/docs/users/binarycaching.md new file mode 100755 index 000000000..c37fd96fd --- /dev/null +++ b/externals/vcpkg/docs/users/binarycaching.md @@ -0,0 +1,285 @@ +# Binary Caching + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/binarycaching.md).** + +Libraries installed with vcpkg can always be built from source. However, that can duplicate work and waste time when working across multiple projects. + +Binary caching is a vcpkg feature that saves copies of library binaries in a shared location that can be accessed by vcpkg for future installs. This means that, as a user, you should only need to build dependencies from source once. If vcpkg is asked to install the same library with the same build configuration in the future, it will just copy the built binaries from the cache and finish the operation in seconds. + +Binary caching is especially effective when using Continuous Integration, since local developers can reuse the binaries produced during a CI run. It also greatly enhances the performance of "ephemeral" or "hosted" build agents, since all local changes are otherwise lost between runs. By using binary caching backed by a cloud service, such as GitHub, Azure, or many others, you can ensure your CI runs at maximum speed and only rebuilds your dependencies when they've changed. + +Caches can be hosted in a variety of environments. The most basic examples are a folder on the local machine or a network file share. Caches can also be stored in any NuGet feed (such as GitHub or Azure DevOps Artifacts), Azure Blob Storage*, or Google Cloud Storage*. + +\* (experimental) + +If your CI provider offers a native "caching" function, we recommend using both vcpkg binary caching and the native method for the most performant results. + +In-tool help is available via `vcpkg help binarycaching`. + +Table of Contents + - [Configuration](#configuration) + - [CI Examples](#ci-examples) + - [GitHub Packages](#github-packages) + - [Azure DevOps Artifacts](#azure-devops-artifacts) + - [Azure Blob Storage](#azure-blob-storage-experimental) + - [Google Cloud Storage](#google-cloud-storage-experimental) + - [NuGet Provider Configuration](#nuget-provider-configuration) + - [Implementation Notes](#implementation-notes-internal-details-subject-to-change-without-notice) + + +## Configuration + +Binary caching is configured via a combination of defaults, the environment variable `VCPKG_BINARY_SOURCES` (set to `;;...`), and the command line option `--binarysource=`. Source options are evaluated in order of defaults, then environment, then command line. Binary caching can be completely disabled by passing `--binarysource=clear` as the last command line option. + +By default, zip-based archives will be cached at the first valid location of: + +**Windows** +1. `%VCPKG_DEFAULT_BINARY_CACHE%` +2. `%LOCALAPPDATA%\vcpkg\archives` +3. `%APPDATA%\vcpkg\archives` + +**Non-Windows** +1. `$VCPKG_DEFAULT_BINARY_CACHE` +2. `$XDG_CACHE_HOME/vcpkg/archives` +3. `$HOME/.cache/vcpkg/archives` + +### Valid source strings (``) + +| form | description +|-----------------------------|--------------- +| `clear` | Removes all previous sources (including the default) +| `default[,]` | Adds the default file-based location +| `files,[,]` | Adds a custom file-based location +| `nuget,[,]` | Adds a NuGet-based source; equivalent to the `-Source` parameter of the NuGet CLI +| `nugetconfig,[,]` | Adds a NuGet-config-file-based source; equivalent to the `-Config` parameter of the NuGet CLI. This config should specify `defaultPushSource` for uploads. +| `nugettimeout,` | Specifies a timeout for NuGet network operations; equivalent to the `-Timeout` parameter of the NuGet CLI. +| `x-azblob,,[,]` | **Experimental: will change or be removed without warning**
Adds an Azure Blob Storage source. Uses Shared Access Signature validation. URL should include the container path. +| `interactive` | Enables interactive credential management for NuGet (for debugging; requires `--debug` on the command line) + +The `` optional parameter for certain sources controls whether they will be consulted for +downloading binaries (`read`)(default), whether on-demand builds will be uploaded to that remote (`write`), or both (`readwrite`). + +Additional configuration details for NuGet-based providers can be found below in [NuGet Provider Configuration](#nuget-provider-configuration). + +## CI Examples + +If your CI system of choice is not listed, we welcome PRs to add them! + +### GitHub Packages + +To use vcpkg with GitHub Packages, we recommend using the `NuGet` backend. + +>**NOTE 2020-09-21**: GitHub's hosted agents come with an older, pre-installed copy of vcpkg on the path that does not support the latest binary caching. This means that direct calls to `bootstrap-vcpkg` or `vcpkg` without a path prefix may call an unintended vcpkg instance. We recommend taking the following two steps to avoid issues if you want to use your own copy of vcpkg: +> 1. Run the equivalent of `rm -rf "$VCPKG_INSTALLATION_ROOT"` using `shell: 'bash'` +> 2. Always call `vcpkg` and `bootstrap-vcpkg` with a path prefix, such as `./vcpkg`, `vcpkg/vcpkg`, `.\bootstrap-vcpkg.bat`, etc + +```yaml +# actions.yaml +# +# In this example, vcpkg has been added as a submodule (`git submodule add https://github.com/Microsoft/vcpkg`). +env: + VCPKG_BINARY_SOURCES: 'clear;nuget,GitHub,readwrite' + +matrix: + os: ['windows-2019', 'ubuntu-20.04'] + include: + - os: 'windows-2019' + triplet: 'x86-windows' + mono: '' + - os: 'ubuntu-20.04' + triplet: 'x64-linux' + # To run `nuget.exe` on non-Windows platforms, we must use `mono`. + mono: 'mono' + +steps: + # This step assumes `vcpkg` has been bootstrapped (run `./vcpkg/bootstrap-vcpkg`) + - name: 'Setup NuGet Credentials' + shell: 'bash' + # Replace with your organization name + run: > + ${{ matrix.mono }} `./vcpkg/vcpkg fetch nuget | tail -n 1` + sources add + -source "https://nuget.pkg.github.com//index.json" + -storepasswordincleartext + -name "GitHub" + -username "" + -password "${{ secrets.GITHUB_TOKEN }}" + + # Omit this step if you're using manifests + - name: 'vcpkg package restore' + shell: 'bash' + run: > + ./vcpkg/vcpkg install sqlite3 cpprestsdk --triplet ${{ matrix.triplet }} +``` + +If you're using [manifests](../specifications/manifests.md), you can omit the `vcpkg package restore` step: it will be run automatically as part of your build. + +More information about GitHub Packages' NuGet support is available on [GitHub Docs][github-nuget]. + +[github-nuget]: https://docs.github.com/en/packages/using-github-packages-with-your-projects-ecosystem/configuring-dotnet-cli-for-use-with-github-packages + +### Azure DevOps Artifacts + +To use vcpkg with Azure DevOps Artifacts, we recommend using the `NuGet` backend. + +First, you need to ensure Artifacts has been enabled on your DevOps instance; this can be done by an Administrator through `Project Settings > General > Overview > Azure DevOps Services > Artifacts`. + +Next, you will need to create a feed for your project; see the [Azure DevOps Artifacts Documentation][devops-nuget] for more information. Your feed URL will be an `https://` link ending with `/nuget/v3/index.json`. + +```yaml +# azure-pipelines.yaml +variables: +- name: VCPKG_BINARY_SOURCES + value: 'clear;nuget,,readwrite' + +steps: +# Remember to add this task to allow vcpkg to upload archives via NuGet +- task: NuGetAuthenticate@0 +``` + +If you are using custom agents with a non-Windows OS, you will need to install Mono to run `nuget.exe` (`apt install mono-complete`, `brew install mono`, etc). + +More information about Azure DevOps Artifacts' NuGet support is available in the [Azure DevOps Artifacts Documentation][devops-nuget]. + +[devops-nuget]: https://docs.microsoft.com/en-us/azure/devops/artifacts/get-started-nuget?view=azure-devops + +### Azure Blob Storage (experimental) + +> Note: This is an experimental feature and may change or be removed at any time + +Vcpkg supports interfacing with Azure Blob Storage via the `x-azblob` source type. + +``` +x-azblob,,[,] +``` + +First, you need to create an Azure Storage Account as well as a container ([Quick Start Documentation](https://docs.microsoft.com/en-us/azure/storage/blobs/storage-quickstart-blobs-portal)]. + +Next, you will need to create a Shared Access Signature, which can be done from the storage account under Settings -> Shared access signature. This SAS will need: +- Allowed services: Blob +- Allowed resource types: Object +- Allowed permissions: Read, Create (if using `write` or `readwrite`) + +The blob endpoint plus the container must be passed as the `` and the generated SAS without the `?` prefix must be passed as the ``. + +Example: +``` +x-azblob,https://.blob.core.windows.net/,sv=2019-12-12&ss=b&srt=o&sp=rcx&se=2020-12-31T06:20:36Z&st=2020-12-30T22:20:36Z&spr=https&sig=abcd,readwrite +``` + +Vcpkg will attempt to avoid revealing the SAS during normal operations, however: +1. It will be printed in full if `--debug` is passed +2. It will be passed as a command line parameter to subprocesses, such as `curl.exe` + +Azure Blob Storage includes a feature to remove cache entries that haven't been accessed in a given number of days which can be used to reduce the size of your cache. See [Data Lifecycle Management on Microsoft Docs](https://docs.microsoft.com/en-us/azure/storage/blobs/lifecycle-management-overview) for more information, or look for "Data management > Lifecycle management" in the Azure Portal for your storage account. If you wish to be able to be resilient to upstream libraries' servers but still want to remove entries from the binary cache, consider using [asset caching](assetcaching.md#x-azurl) in a different storage account without a lifecycle management policy. + +### Google Cloud Storage (experimental) + +> Note: This is an experimental feature and may change or be removed at any time + +Vcpkg supports interfacing with Google Cloud Storage (GCS) via the `x-gcs` source type. + +``` +x-gcs,[,] +``` + +First, you need to create an Google Cloud Platform Account as well as a storage bucket ([GCS Quick Start](https://cloud.google.com/storage/docs/quickstart-gsutil)]. + +As part of this quickstart you would have configured the `gsutil` command-line tool to authenticate with Google Cloud. +Vcpkg will use this command-line tool, make sure it is in your search path for executables. + +Example 1 (using a bucket without a common prefix for the objects): + +``` +x-gcs,gs:///,readwrite +``` + +Example 2 (using a bucket and a prefix for the objects): + +``` +x-gcs,gs:///my-vcpkg-cache/maybe/with/many/slashes/,readwrite +x-gcs,gs:///my-vcpkg-cache/maybe/with`,commas/too!/,readwrite +``` + +Commas (`,`) are valid as part of a object prefix in GCS, just remember to escape them in the vcpkg configuration, as +shown in the previous example. Note that GCS does not have folders (some of the GCS tools simulate folders), it is not +necessary to create or otherwise manipulate the prefix used by your vcpkg cache. + +## NuGet Provider Configuration + +### Credentials + +Many NuGet servers require additional credentials to access. The most flexible way to supply credentials is via the `nugetconfig` provider with a custom `nuget.config` file. See https://docs.microsoft.com/en-us/nuget/consume-packages/consuming-packages-authenticated-feeds for more information on authenticating via `nuget.config`. + +However, it is still possible to authenticate against many servers using NuGet's built-in credential providers or via customizing your environment's default `nuget.config`. The default config can be extended via nuget client calls such as +``` +nuget sources add -Name MyRemote -Source https://... -Username $user -Password $pass +``` +and then passed to vcpkg via `--binarysource=nuget,MyRemote,readwrite`. You can get a path to the precise copy of NuGet used by vcpkg by running `vcpkg fetch nuget`, which will report something like: +``` +$ vcpkg fetch nuget +/vcpkg/downloads/tools/nuget-5.5.1-linux/nuget.exe +``` +Non-Windows users will need to call this through mono via `mono /path/to/nuget.exe sources add ...`. + +##### Credential Example for Azure Dev Ops +```bash +# On Linux or OSX +$ mono `vcpkg fetch nuget | tail -n1` sources add \ + -name ADO \ + -Source https://pkgs.dev.azure.com/$ORG/_packaging/$FEEDNAME/nuget/v3/index.json \ + -Username $USERNAME \ + -Password $PAT +$ export VCPKG_BINARY_SOURCES="nuget,ADO,readwrite" +``` +```powershell +# On Windows Powershell +PS> & $(vcpkg fetch nuget | select -last 1) sources add ` + -name ADO ` + -Source https://pkgs.dev.azure.com/$ORG/_packaging/$FEEDNAME/nuget/v3/index.json ` + -Username $USERNAME ` + -Password $PAT +PS> $env:VCPKG_BINARY_SOURCES="nuget,ADO,readwrite" +``` + +We recommend using a Personal Access Token (PAT) as the password for maximum security. You can generate a PAT in User Settings -> Personal Access Tokens or `https://dev.azure.com/$ORG/_usersSettings/tokens`. + +#### `metadata.repository` + +The `nuget` and `nugetconfig` source providers additionally respect certain environment variables while generating nuget packages. The `metadata.repository` field of any packages will be generated as: +``` + +``` +or +``` + +``` +if the appropriate environment variables are defined and non-empty. This is specifically used to associate packages in GitHub Packages with the _building_ project and not intended to associate with the original package sources. + +#### NuGet's cache + +NuGet's cache is not used by default. To use it for every nuget-based source, set the [environment variable](config-environment.md) `VCPKG_USE_NUGET_CACHE` to `true` (case-insensitive) or `1`. + +## Implementation Notes (internal details subject to change without notice) + +Binary caching relies on hashing everything that contributes to a particular package build. This includes: + +- Every file in the port directory +- The triplet file and name +- The C++ compiler executable +- The C compiler executable +- The set of features selected +- Every dependency's package hash (note: this is that package's input hash, not contents) +- All helper scripts referenced by `portfile.cmake` (heuristic) +- The version of CMake used +- The contents of any environment variables listed in `VCPKG_ENV_PASSTHROUGH` +- The hash of the toolchain file (builtin or `VCPKG_CHAINLOAD_TOOLCHAIN_FILE`) + +Despite this extensive list, it is possible to defeat the cache and introduce nondeterminism. If you have additional details that you'd like to be tracked, the easiest resolution is to generate a triplet file with your additional information in a comment. That additional information will be included in the package's input set and ensure a unique universe of binaries. + +The hashes used are stored in the package and in the current installed directory at `/share//vcpkg_abi_info.txt`. + +The original specification for binary caching is available [here](../specifications/binarycaching.md). diff --git a/externals/vcpkg/docs/users/buildsystems/cmake-integration.md b/externals/vcpkg/docs/users/buildsystems/cmake-integration.md new file mode 100755 index 000000000..ad3c7d565 --- /dev/null +++ b/externals/vcpkg/docs/users/buildsystems/cmake-integration.md @@ -0,0 +1,224 @@ +# CMake Integration + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/buildsystems/cmake-integration.md).** + +See [Installing and Using Packages Example: sqlite](../../examples/installing-and-using-packages.md) for a fully worked example using CMake. + +## Table of Contents + +- [`CMAKE_TOOLCHAIN_FILE`](#cmake_toolchain_file) +- [IDE Integration](#ide-integration) + - [Visual Studio Code (CMake Tools extension)](#visual-studio-code-cmake-tools-extension) + - [Visual Studio](#visual-studio) + - [CLion](#clion) +- [Using Multiple Toolchain Files](#using-multiple-toolchain-files) +- [Settings Reference](#settings-reference) + +## `CMAKE_TOOLCHAIN_FILE` + +Projects configured to use the vcpkg toolchain file (via the CMake setting `CMAKE_TOOLCHAIN_FILE`) can find libraries from vcpkg using the standard CMake functions: `find_package()`, `find_path()`, and `find_library()`. + +```no-highlight +cmake ../my/project -DCMAKE_TOOLCHAIN_FILE=[vcpkg-root]/scripts/buildsystems/vcpkg.cmake +``` + +Since version 3.21, CMake will use the environment variable `CMAKE_TOOLCHAIN_FILE`[1] as the default value for `CMAKE_TOOLCHAIN_FILE`. + +**cmd** +```cmd +set CMAKE_TOOLCHAIN_FILE=[vcpkg root]/scripts/buildsystems/vcpkg.cmake +``` +**Powershell** +```powershell +$env:CMAKE_TOOLCHAIN_FILE="[vcpkg root]/scripts/buildsystems/vcpkg.cmake" +``` +**bash** +```sh +export CMAKE_TOOLCHAIN_FILE=[vcpkg root]/scripts/buildsystems/vcpkg.cmake +``` + +vcpkg does not automatically add any include or links paths into your project. To use a header-only library you can use `find_path()` which will correctly work on all platforms: + +```cmake +# To find and use catch2 +find_path(CATCH_INCLUDE_DIR NAMES catch.hpp PATH_SUFFIXES catch2) +include_directories(${CATCH_INCLUDE_DIR}) +``` + +[1]: https://cmake.org/cmake/help/latest/envvar/CMAKE_TOOLCHAIN_FILE.html + +## IDE Integration + +### Visual Studio Code (CMake Tools Extension) + +Adding the following to your workspace `settings.json` will make CMake Tools automatically use vcpkg for libraries: + +```json +{ + "cmake.configureSettings": { + "CMAKE_TOOLCHAIN_FILE": "[vcpkg root]/scripts/buildsystems/vcpkg.cmake" + } +} +``` + +### Visual Studio + +In the CMake Settings Editor, add the path to the vcpkg toolchain file under `CMake toolchain file`: + +``` +[vcpkg root]/scripts/buildsystems/vcpkg.cmake +``` + +### CLion + +Open the Toolchains settings (`File > Settings` on Windows and Linux, `CLion > Preferences` on macOS), and go to the CMake settings (`Build, Execution, Deployment > CMake`). In `CMake options`, add the following line: + +``` +-DCMAKE_TOOLCHAIN_FILE=[vcpkg root]/scripts/buildsystems/vcpkg.cmake +``` + +You must add this line to each profile separately. + +## Using Multiple Toolchain Files + +To combine vcpkg's toolchain file with another toolchain file, you can set the cmake variable `VCPKG_CHAINLOAD_TOOLCHAIN_FILE`: + +```no-highlight +cmake ../my/project \ + -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake \ + -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=../my/project/toolchain.cmake +``` + +Alternatively, you can include the vcpkg toolchain at the end of the primary toolchain file: + +```cmake +# MyToolchain.cmake +set(CMAKE_CXX_COMPILER ...) +set(VCPKG_TARGET_TRIPLET x64-my-custom-windows-triplet) +include(/path/to/vcpkg/scripts/buildsystems/vcpkg.cmake) +``` + +**Note: vcpkg does not automatically apply your toolchain's settings, such as your compiler or compilation flags, while building libraries. To change vcpkg's library settings, you must make a [custom triplet file](../triplets.md) (which can [share your toolchain](../triplets.md#VCPKG_CHAINLOAD_TOOLCHAIN_FILE))** + +## Settings Reference + +All vcpkg-affecting variables must be defined before the first `project()` directive, such as via the command line or `set()` statements. + +### `VCPKG_TARGET_TRIPLET` + +This setting controls the [triplet](../triplets.md) vcpkg will install and consume libraries from. + +If unset, vcpkg will automatically detect an appropriate default triplet given the current compiler settings. If you change this CMake variable, you must delete your cache and reconfigure. + +### `VCPKG_HOST_TRIPLET` + +This variable controls which [triplet](../triplets.md) host dependencies will be installed for. + +If unset, vcpkg will automatically detect an appropriate native triplet (x64-windows, x64-osx, x64-linux). + +See also [Host Dependencies](../host-dependencies.md). + +### `VCPKG_INSTALLED_DIR` + +This variable sets the location where libraries will be installed and consumed from. + +In manifest mode, the default is `${CMAKE_BINARY_DIR}/vcpkg_installed`. + +In classic mode, the default is `${VCPKG_ROOT}/installed`. + +### `VCPKG_MANIFEST_MODE` + +This variable forces vcpkg to operate in either manifest mode or classic mode. + +Defaults to `ON` when `VCPKG_MANIFEST_DIR` is non-empty or `${CMAKE_SOURCE_DIR}/vcpkg.json` exists. + +To disable manifest mode while a `vcpkg.json` is detected, set this to `OFF`. + +### `VCPKG_MANIFEST_DIR` + +This variable specifies an alternate folder containing a `vcpkg.json` manifest. + +Defaults to `${CMAKE_SOURCE_DIR}` if `${CMAKE_SOURCE_DIR}/vcpkg.json` exists. + +### `VCPKG_MANIFEST_INSTALL` + +This variable controls whether vcpkg will be automatically run to install your dependencies during your configure step. + +Defaults to `ON` if `VCPKG_MANIFEST_MODE` is `ON`. + +### `VCPKG_BOOTSTRAP_OPTIONS` + +This variable can be set to additional command parameters to pass to `./bootstrap-vcpkg`. + +In manifest mode, vcpkg will be automatically bootstrapped if the executable does not exist. + +### `VCPKG_OVERLAY_TRIPLETS` + +This variable can be set to a list of paths to be passed on the command line as `--overlay-triplets=...` + +### `VCPKG_OVERLAY_PORTS` + +This variable can be set to a list of paths to be passed on the command line as `--overlay-ports=...` + +### `VCPKG_MANIFEST_FEATURES` + +This variable can be set to a list of features to activate when installing from your manifest. + +For example, features can be used by projects to control building with additional dependencies to enable tests or samples: + +```json +{ + "name": "mylibrary", + "version": "1.0", + "dependencies": [ "curl" ], + "features": { + "samples": { + "description": "Build Samples", + "dependencies": [ "fltk" ] + }, + "tests": { + "description": "Build Tests", + "dependencies": [ "gtest" ] + } + } +} +``` +```cmake +# CMakeLists.txt + +option(BUILD_TESTING "Build tests" OFF) +if(BUILD_TESTING) + list(APPEND VCPKG_MANIFEST_FEATURES "tests") +endif() + +option(BUILD_SAMPLES "Build samples" OFF) +if(BUILD_SAMPLES) + list(APPEND VCPKG_MANIFEST_FEATURES "samples") +endif() + +project(myapp) + +# ... +``` + +### `VCPKG_MANIFEST_NO_DEFAULT_FEATURES` + +This variable controls activation of default features in addition to those listed in `VCPKG_MANIFEST_FEATURES`. If set to `ON`, default features will not be automatically activated. + +Defaults to `OFF`. + +### `VCPKG_INSTALL_OPTIONS` + +This variable can be set to a list of additional command line parameters to pass to the vcpkg tool during automatic installation. + +### `VCPKG_PREFER_SYSTEM_LIBS` + +This variable controls whether vcpkg will append instead of prepend its paths to `CMAKE_PREFIX_PATH`, `CMAKE_LIBRARY_PATH` and `CMAKE_FIND_ROOT_PATH` so that vcpkg libraries/packages are found after toolchain/system libraries/packages. + +Defaults to `OFF`. + +### `VCPKG_FEATURE_FLAGS` + +This variable can be set to a list of feature flags to pass to the vcpkg tool during automatic installation to opt-in to experimental behavior. + +See the `--feature-flags=` command line option for more information. diff --git a/externals/vcpkg/docs/users/buildsystems/export-command.md b/externals/vcpkg/docs/users/buildsystems/export-command.md new file mode 100755 index 000000000..c591d1889 --- /dev/null +++ b/externals/vcpkg/docs/users/buildsystems/export-command.md @@ -0,0 +1,20 @@ +# `export` Command + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/buildsystems/export-command.md).** + +The `export` command creates a shrinkwrapped archive containing a specific set of libraries (and their dependencies) that can be quickly and reliably shared with build servers or other users in your organization. `export` only supports classic mode at this time. + +- `--nuget`: NuGet package +- `--zip`: Zip archive +- `--7zip`: 7Zip archive +- `--raw`: Raw, uncompressed folder + +Each of these have the same internal layout which mimics the layout of a full vcpkg instance: + +- `installed/` contains the library files +- `scripts/buildsystems/vcpkg.cmake` is the [CMake toolchain file](cmake-integration.md) +- `scripts/buildsystems/msbuild/vcpkg.props` and `scripts/buildsystems/msbuild/vcpkg.targets` are the [MSBuild integration files](msbuild-integration.md) + +NuGet package exports will also contain a `build\native\vcpkg.targets` that integrates with MSBuild projects using the NuGet package manager. + +Please also see our [blog post](https://blogs.msdn.microsoft.com/vcblog/2017/05/03/vcpkg-introducing-export-command/) for additional examples. diff --git a/externals/vcpkg/docs/users/buildsystems/integration.md b/externals/vcpkg/docs/users/buildsystems/integration.md new file mode 100755 index 000000000..67706600f --- /dev/null +++ b/externals/vcpkg/docs/users/buildsystems/integration.md @@ -0,0 +1,10 @@ +# Buildsystem Integration + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/buildsystems/integration.md).** + +vcpkg supports use from any buildsystem and has specific native integration into MSBuild and CMake. + +- [MSBuild Integration (Visual Studio)](msbuild-integration.md) +- [CMake Integration](cmake-integration.md) +- [Manual Integration](manual-integration.md) +- [`export` Command](export-command.md) diff --git a/externals/vcpkg/docs/users/buildsystems/manual-integration.md b/externals/vcpkg/docs/users/buildsystems/manual-integration.md new file mode 100755 index 000000000..5062123f1 --- /dev/null +++ b/externals/vcpkg/docs/users/buildsystems/manual-integration.md @@ -0,0 +1,31 @@ +# Manual Integration + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/buildsystems/manual-integration.md).** + +When installing libraries, vcpkg creates a single common layout partitioned by triplet. + +The root of the tree in classic mode is `[vcpkg root]/installed`. The root of the tree in manifest mode is `[vcpkg.json directory]/vcpkg_installed`. + +Underneath this root, in a subfolder named after the triplet: + +* Header files: `include/` +* Release `.lib`, `.a`, and `.so` files: `lib/` or `lib/manual-link/` +* Release `.dll` files: `bin/` +* Release `.pc` files: `lib/pkgconfig/` +* Debug `.lib`, `.a`, and `.so` files: `debug/lib/` or `debug/lib/manual-link/` +* Debug `.dll` files: `debug/bin/` +* Debug `.pc` files: `debug/lib/pkgconfig/` +* Tools: `tools/[portname]/` + +For example, `zlib.h` for `zlib:x64-windows` in classic mode is located at `[vcpkg root]/installed/x64-windows/include/zlib.h`. + +See your build system specific documentation for how to use prebuilt binaries. For example, `Makefile` projects often accept environment variables: + +```sh +export CXXFLAGS=-I$(pwd)/installed/x64-linux/include +export CFLAGS=-I$(pwd)/installed/x64-linux/include +export LDFLAGS=-L$(pwd)/installed/x64-linux/lib +export PKG_CONFIG_PATH=$(pwd)/installed/x64-linux/lib/pkgconfig:$PKG_CONFIG_PATH +``` + +_On Windows dynamic triplets, such as x64-windows:_ To run any produced executables you will also need to either copy the needed DLL files to the same folder as your executable or *prepend* the correct `bin\` directory to your path. diff --git a/externals/vcpkg/docs/users/buildsystems/msbuild-integration.md b/externals/vcpkg/docs/users/buildsystems/msbuild-integration.md new file mode 100755 index 000000000..3cd698c76 --- /dev/null +++ b/externals/vcpkg/docs/users/buildsystems/msbuild-integration.md @@ -0,0 +1,138 @@ +# MSBuild Integration (Visual Studio) + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/buildsystems/msbuild-integration.md).** + +## Table of Contents + +- [Integration Methods](#integration-methods) + - [User-wide integration](#user-wide-integration) + - [Import `.props` and `.targets`](#import-props-and-targets) + - [Linked NuGet Package](#linked-nuget-package) +- [Common Configuration](#common-configuration) +- [Manifest Mode Configuration](#manifest-mode-configuration) + +## Integration Methods + +### User-wide integration + +```no-highlight +vcpkg integrate install +``` +This will implicitly add Include Directories, Link Directories, and Link Libraries for all packages installed with Vcpkg to all VS2015, VS2017 and VS2019 MSBuild projects. We also add a post-build action for executable projects that will analyze and copy any DLLs you need to the output folder, enabling a seamless F5 experience. + +For the vast majority of libraries, this is all you need to do -- just File -> New Project and write code! However, some libraries perform conflicting behaviors such as redefining `main()`. Since you need to choose per-project which of these conflicting options you want, you will need to add those libraries to your linker inputs manually. + +Here are some examples, though this is not an exhaustive list: + +- Gtest provides `gtest`, `gmock`, `gtest_main`, and `gmock_main` +- SDL2 provides `SDL2main` +- SFML provides `sfml-main` +- Boost.Test provides `boost_test_exec_monitor` + +To get a full list for all your installed packages, run `vcpkg owns manual-link`. + +### Import `.props` and `.targets` + +vcpkg can also be integrated into MSBuild projects by explicitly importing the `scripts/buildsystems/vcpkg.props` and `scripts/buildsystems/vcpkg.targets` files into each `.vcxproj`. By using relative paths, this enables vcpkg to be consumed by a submodule and automatically acquired by users when they run `git clone`. + +The easiest way to add these to every project in your solution is to create `Directory.Build.props` and `Directory.Build.targets` files at the root of your repository. + +The following examples assume they are at the root of your repository with a submodule of `microsoft/vcpkg` at `vcpkg`. + +**Example `Directory.Build.props`**: +```xml + + + +``` + +**Example `Directory.Build.targets`**: +```xml + + + +``` + +More information about `Directory.Build.targets` and `Directory.Build.props` can be found in the [Customize your build][1] section of the official MSBuild documentation. + +[1]: https://docs.microsoft.com/visualstudio/msbuild/customize-your-build#directorybuildprops-and-directorybuildtargets + +### Linked NuGet Package + +**Note: This approach is not recommended for new projects, since it makes them difficult to share with others. For a portable, self-contained NuGet package, see the [`export command`](export-command.md)** + +VS projects can also be integrated through a NuGet package. This will modify the project file, so we do not recommend this approach for open source projects. + +```no-highlight +PS D:\src\vcpkg> .\vcpkg integrate project +Created nupkg: D:\src\vcpkg\scripts\buildsystems\vcpkg.D.src.vcpkg.1.0.0.nupkg + +With a project open, go to Tools->NuGet Package Manager->Package Manager Console and paste: + Install-Package vcpkg.D.src.vcpkg -Source "D:/src/vcpkg/scripts/buildsystems" +``` + +*Note: The generated NuGet package does not contain the actual libraries. It instead acts like a shortcut (or symlink) to the vcpkg install and will "automatically" update with any changes (install/remove) to the libraries. You do not need to regenerate or update the NuGet package.* + +## Common Configuration + +### `VcpkgEnabled` (Use Vcpkg) + +This can be set to "false" to explicitly disable vcpkg integration for the project + +### `VcpkgConfiguration` (Vcpkg Configuration) + +If your configuration names are too complex for vcpkg to guess correctly, you can assign this property to `Release` or `Debug` to explicitly tell vcpkg what variant of libraries you want to consume. + +### `VcpkgEnableManifest` (Use Vcpkg Manifest) + +This property must be set to `true` in order to consume from a local `vcpkg.json` file. If set to `false`, any local `vcpkg.json` files will be ignored. + +This currently defaults to `false`, but will default to `true` in the future. + +### `VcpkgTriplet` (Triplet) + +This property controls the triplet to consume libraries from, such as `x64-windows-static` or `arm64-windows`. + +If this is not explicitly set, vcpkg will deduce the correct triplet based on your Visual Studio settings. vcpkg will only deduce triplets that use dynamic library linkage and dynamic CRT linkage; if you want static dependencies or to use the static CRT (`/MT`), you will need to set the triplet manually. + +You can see the automatically deduced triplet by setting your MSBuild verbosity to Normal or higher: + +> *Shortcut: Ctrl+Q "build and run"* +> +> Tools -> Options -> Projects and Solutions -> Build and Run -> MSBuild project build output verbosity + +See also [Triplets](../triplets.md) + +### `VcpkgHostTriplet` (Host Triplet) + +This can be set to a custom triplet to use for resolving host dependencies. + +If unset, this will default to the "native" triplet (x64-windows). + +See also [Host Dependencies](../host-dependencies.md). + +### `VcpkgInstalledDir` (Installed Directory) + +This property defines the location vcpkg will install and consume libraries from. + +In manifest mode, this defaults to `$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\`. In classic mode, this defaults to `$(VcpkgRoot)\installed\`. + +## Manifest Mode Configuration + +To use manifests (`vcpkg.json`) with MSBuild, first you need to use one of the integration methods above. Then, add a vcpkg.json above your project file (such as in the root of your source repository) and set the property `VcpkgEnableManifest` to `true`. You can set this property via the IDE in `Project Properties -> Vcpkg -> Use Vcpkg Manifest` (note: you may need to reload the IDE to see the vcpkg Property Page). + +vcpkg will automatically run during your project's build and install any listed dependencies to `vcpkg_installed/$(VcpkgTriplet)/` adjacent to the `vcpkg.json` file; these libraries will then automatically be included in and linked to your MSBuild projects. + +**Known issues** + +* Visual Studio 2015 does not correctly track edits to the `vcpkg.json` and `vcpkg-configuration.json` files, and will not respond to changes unless a `.cpp` is edited. + + + +### `VcpkgAdditionalInstallOptions` (Additional Options) + +When using a manifest, this option specifies additional command line flags to pass to the underlying vcpkg tool invocation. This can be used to access features that have not yet been exposed through another option. + +### `VcpkgManifestInstall` (Install Vcpkg Dependencies) + +This property can be set to `false` to disable automatic dependency restoration during project build. Dependencies must be manually restored via the vcpkg command line separately. diff --git a/externals/vcpkg/docs/users/config-environment.md b/externals/vcpkg/docs/users/config-environment.md new file mode 100755 index 000000000..6cf44aa09 --- /dev/null +++ b/externals/vcpkg/docs/users/config-environment.md @@ -0,0 +1,100 @@ +## Environment and Configuration + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/config-environment.md).** + +### Environment Variables + +#### VCPKG_DOWNLOADS + +This environment variable can be set to an existing directory to use for storing downloads instead of the internal +`downloads/` directory. It should always be set to an absolute path. + +#### VCPKG_FEATURE_FLAGS + +This environment variable can be set to a comma-separated list of off-by-default features in vcpkg. These features are +subject to change without notice and should be considered highly unstable. + +There are no off-by-default feature flags at this time. + +#### EDITOR + +This environment variable can be set to the full path of an executable to be used for `vcpkg edit`. Please see +`vcpkg help edit` for command-specific help. + +#### VCPKG_ROOT + +This environment variable can be set to a directory to use as the root of the vcpkg instance. Note that mixing vcpkg +repo versions and executable versions can cause issues. + +#### VCPKG_VISUAL_STUDIO_PATH + +This environment variable can be set to the full path to a Visual Studio instance on the machine. This Visual Studio instance +will be used if the triplet does not override it via the [`VCPKG_VISUAL_STUDIO_PATH`](triplets.md#VCPKG_VISUAL_STUDIO_PATH) triplet setting. + +Example: `D:\2017` + +#### VCPKG_DEFAULT_TRIPLET + +This environment variable can be set to a triplet name which will be used for unqualified triplet references in command lines. + +#### VCPKG_DEFAULT_HOST_TRIPLET + +This environment variable can be set to a triplet name which will be used for unqualified host port references in command lines and all host port references in dependency lists. See [the host-dependencies documentation](host-dependencies.md) for more information. + +#### VCPKG_OVERLAY_PORTS + +This environment variable allows users to override ports with alternate versions according to the +[ports overlay](../specifications/ports-overlay.md) specification. List paths to overlays using +the platform dependent PATH separator (Windows `;` | others `:`) + +Example (Windows): `C:\custom-ports\boost;C:\custom-ports\sqlite3` + +#### VCPKG_OVERLAY_TRIPLETS + +This environment variable allows users to add directories to search for triplets. +[Example: overlay triplets](../examples/overlay-triplets-linux-dynamic.md). +List paths to overlays using the platform dependent PATH separator (Windows `;`, others `:`) + +#### VCPKG_FORCE_SYSTEM_BINARIES + +This environment variable, if set, suppresses the downloading of CMake and Ninja and forces the use of the system binaries. + +#### VCPKG_FORCE_DOWNLOADED_BINARIES + +This environment variable, if set, ignores the use of the system binaries and will always download and use the version defined by vcpkg. + +#### VCPKG_KEEP_ENV_VARS + +This environment variable can be set to a list of environment variables, separated by `;`, which will be propagated to +the build environment. + +The values of the kept variables will not be tracked in package ABIs and will not cause rebuilds when they change. To +pass in environment variables that should cause rebuilds on change, see [`VCPKG_ENV_PASSTHROUGH`](triplets.md#VCPKG_ENV_PASSTHROUGH). + +Example: `FOO_SDK_DIR;BAR_SDK_DIR` + +#### VCPKG_MAX_CONCURRENCY + +This environment variables limits the amount of concurrency requested by underlying buildsystems. If unspecified, this defaults to logical cores + 1. + +#### VCPKG_DEFAULT_BINARY_CACHE + +This environment variable redirects the default location to store binary packages. See [Binary Caching](binarycaching.md#configuration) for more details. + +#### VCPKG_BINARY_SOURCES + +This environment variable adds or removes binary sources. See [Binary Caching](binarycaching.md#configuration) for more details. + +#### VCPKG_NUGET_REPOSITORY + +This environment variable changes the metadata of produced NuGet packages. See [Binary Caching](binarycaching.md#configuration) for more details. + +#### VCPKG_USE_NUGET_CACHE + +This environment variable allows using NuGet's cache for every nuget-based binary source. See [Binary Caching](binarycaching.md#nuget-provider-configuration) for more details. + +#### X_VCPKG_ASSET_SOURCES + +> Note: This is an experimental feature and may change or be removed at any time + +This environment variable allows using a private mirror for all SHA512-tagged assets. See [Asset Caching](assetcaching.md) for more details. diff --git a/externals/vcpkg/docs/users/host-dependencies.md b/externals/vcpkg/docs/users/host-dependencies.md new file mode 100755 index 000000000..4e7cf39a3 --- /dev/null +++ b/externals/vcpkg/docs/users/host-dependencies.md @@ -0,0 +1,65 @@ +# Host Dependencies + +Tools used at build time by other ports to generate code or implement a custom build system can be packaged inside vcpkg. + +## Consuming + +When consuming a port as a tool, you must set the dependency's `"host"` field to true. For example: +```json +{ + "name": "contoso-http-library", + "version-string": "1.0.0", + "description": "Contoso's http runtime library", + "dependencies": [ + "contoso-core-library", + { + "name": "contoso-code-generator", + "host": true + }, + { + "name": "contoso-build-system", + "host": true + } + ] +} +``` +In this case, the `contoso-code-generator` and `contoso-build-system` (including any transitive dependencies) will be built and installed for the host triplet before `contoso-http-library` is built. + +>Note: Consumers must use `vcpkg.json` instead of `CONTROL` as their metadata format. You can easily convert an existing `CONTROL` file using `vcpkg format-manifest /path/to/CONTROL`. + +Then, within the portfile of the consumer (`contoso-http-library` in the example), the CMake variable `CURRENT_HOST_INSTALLED_DIR` will be defined to `installed/` and should be used to locate any required assets. In the example, `contoso-code-generator` might have installed `tools/contoso-code-generator/ccg.exe` which the consumer would add to its local path via +```cmake +# ports/contoso-http-library/portfile.cmake +vcpkg_add_to_path(${CURRENT_HOST_INSTALLED_DIR}/tools/contoso-code-generator) +``` + +## Specifying the Host Triplet + +The default host triplets are chosen based on the host architecture and operating system, for example `x64-windows`, `x64-linux`, or `x64-osx`. They can be overridden via: + +1. In CMake-based manifest mode, calling `set(VCPKG_HOST_TRIPLET "" CACHE STRING "")` before the first `project()` directive +2. In MSBuild-based manifest mode, setting the `VcpkgHostTriplet` property +3. On the command line, via the flag `--host-triplet=...` +4. The `VCPKG_DEFAULT_HOST_TRIPLET` environment variable + +## Producing + +Producing a tool has no special requirements; tools should be authored as a standard port, following all the normal policies and practices. Notably, they should build against `TARGET_TRIPLET`, not `HOST_TRIPLET` within the context of their portfile. + +If the current context is cross-compiling (`TARGET_TRIPLET` is not `HOST_TRIPLET`), then `VCPKG_CROSSCOMPILING` will be set to a truthy value. + +```cmake +if(VCPKG_CROSSCOMPILING) + # This is a native build +else() + # This is a cross build +endif() +``` + +## Host-only ports + +Some ports should only be depended upon via a host dependency; script ports and +tool ports are common examples. In this case, you can use the `"native"` +supports expression to describe this. This supports expression is true when +`VCPKG_CROSSCOMPILING` is false (implying that `TARGET_TRIPLET == +HOST_TRIPLET`). diff --git a/externals/vcpkg/docs/users/manifests.md b/externals/vcpkg/docs/users/manifests.md new file mode 100755 index 000000000..74f03718f --- /dev/null +++ b/externals/vcpkg/docs/users/manifests.md @@ -0,0 +1,312 @@ +# Manifest Mode + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/manifests.md).** + +vcpkg has two modes of consuming dependencies - classic mode and manifest mode. + +In classic mode, vcpkg produces an "installed" tree, whose contents are changed by explicit calls to `vcpkg install` or +`vcpkg remove`. The installed tree is intended for consumption by any number of projects: for example, installing a +bunch of libraries and then using those libraries from Visual Studio, without additional configuration. Because the +installed tree is not associated with an individual project, it's similar to tools like `brew` or `apt`, except that the +installed tree is vcpkg-installation-local, rather than global to a system or user. + +In manifest mode, an installed tree is associated with a particular project rather than the vcpkg installation. The set +of installed ports is controlled by editing the project's "manifest file", and the installed tree is placed in the +project directory or build directory. This mode acts more similarly to language package managers like Cargo, or npm. We +recommend using this manifest mode whenever possible, because it allows one to encode a project's dependencies +explicitly in a project file, rather than in the documentation, making your project much easier to consume. + +Check out the [manifest cmake example](../examples/manifest-mode-cmake.md) for an example project using CMake and +manifest mode. + +## Table of Contents + +- [Simple Example Manifest](#simple-example-manifest) +- [Manifest Syntax Reference](#manifest-syntax-reference) + - [`"name"`](#name) + - [Version Fields](#version-fields) + - [`"description"`](#description) + - [`"builtin-baseline"`](#builtin-baseline) + - [`"dependencies"`](#dependencies) + - [`"name"`](#dependencies-name) + - [`"default-features"`](#dependencies-default-features) + - [`"features"`](#dependencies-features) + - [`"platform"`](#platform) + - [`"version>="`](#version-gt) + - [`"overrides"`](#overrides) + - [`"supports"`](#supports) + - [`"features"`](#features) + - [`"default-features"`](#default-features) + +See also [the original specification](../specifications/manifests.md) for more low-level details. + +## Simple Example Manifest + +```json +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", + "name": "my-application", + "version": "0.15.2", + "dependencies": [ + "boost-system", + { + "name": "cpprestsdk", + "default-features": false + }, + "libxml2", + "yajl" + ] +} +``` + +## Manifest Syntax Reference + +A manifest is a JSON-formatted file named `vcpkg.json` which lies at the root of your project. +It contains all the information a person needs to know to get dependencies for your project, +as well as all the metadata about your project that a person who depends on you might be interested in. + +Manifests follow strict JSON: they can't contain C++-style comments (`//`) nor trailing commas. However +you can use field names that start with `$` to write your comments in any object that has a well-defined set of keys. +These comment fields are not allowed in any objects which permit user-defined keys (such as `"features"`). + +Each manifest contains a top level object with the fields documented below; the most important ones are +[`"name"`](#name), the [version fields](#version-fields), and [`"dependencies"`](#dependencies): + + + +### `"name"` + +This is the name of your project! It must be formatted in a way that vcpkg understands - in other words, +it must be lowercase alphabetic characters, digits, and hyphens, and it must not start nor end with a hyphen. +For example, `Boost.Asio` might be given the name `boost-asio`. + +This is a required field. + +### Version Fields + +There are four version field options, depending on how the port orders its +releases. + +* [`"version"`](versioning.md#version) - Generic, dot-separated numeric + sequence. +* [`"version-semver"`](versioning.md#version-semver) - [Semantic Version + 2.0.0](https://semver.org/#semantic-versioning-specification-semver) +* [`"version-date"`](versioning.md#version-date) - Used for packages which do + not have numeric releases (for example, Live-at-HEAD). Matches `YYYY-MM-DD` + with optional trailing dot-separated numeric sequence. +* [`"version-string"`](versioning.md#version-string) - Used for packages that + don't have orderable versions. This should be rarely used, however all ports + created before the other version fields were introduced use this scheme. + +Additionally, the optional `"port-version"` field is used to indicate revisions +to the port with the same upstream source version. For pure consumers, this +field should not be used. + +See [versioning](versioning.md#version-schemes) for more details. + + + +### `"description"` + +This is where you describe your project. Give it a good description to help in searching for it! +This can be a single string, or it can be an array of strings; +in the latter case, the first string is treated as a summary, +while the remaining strings are treated as the full description. + + + +### `"builtin-baseline"` + +This field indicates the commit of vcpkg which provides global minimum version +information for your manifest. It is required for top-level manifest files using +versioning. + +This is a convenience field that has the same semantic as replacing your default +registry in +[`vcpkg-configuration.json`](registries.md#configuration-default-registry). + +See [versioning](versioning.md#builtin-baseline) for more semantic details. + + + +### `"dependencies"` + +This field lists all the dependencies you'll need to build your library (as well as any your dependents might need, +if they were to use you). It's an array of strings and objects: + +* A string dependency (e.g., `"dependencies": [ "zlib" ]`) is the simplest way one can depend on a library; + it means you don't depend on a single version, and don't need to write down any more information. +* On the other hand, an object dependency (e.g., `"dependencies": [ { "name": "zlib" } ]`) + allows you to add that extra information. + +#### Example: + +```json +"dependencies": [ + { + "name": "arrow", + "default-features": false, + "features": [ "json" ] + }, + "boost-asio", + "openssl", + { + "name": "picosha2", + "platform": "!windows" + } +] +``` + + + +#### `"name"` Field + +The name of the dependency. This follows the same restrictions as the [`"name"`](#name) property for a project. + + + + +#### `"features"` and `"default-features"` Fields + +`"features"` is an array of feature names which tell you the set of features that the +dependencies need to have at a minimum, +while `"default-features"` is a boolean that tells vcpkg whether or not to +install the features the package author thinks should be "most common for most people to use". + +For example, `ffmpeg` is a library which supports many, many audio and video codecs; +however, for your specific project, you may only need mp3 encoding. +Then, you might just ask for: + +```json +{ + "name": "ffmpeg", + "default-features": false, + "features": [ "mp3lame" ] +} +``` + + + +#### `"platform"` Field + +The `"platform"` field defines the platforms where the dependency should be installed - for example, +you might need to use sha256, and so you use platform primitives on Windows, but `picosha2` on non-Windows platforms. + +```json +{ + "name": "picosha2", + "platform": "!windows" +} +``` + +This is a string field which takes boolean expressions of the form ``, +`!expression`, `expression { & expression & expression...}`, and `expression { | expression | expression...}`, +along with parentheses to denote precedence. +For example, a dependency that's only installed on the Windows OS, for the ARM64 architecture, +and on Linux on x64, would be written `(windows & arm64) | (linux & x64)`. + +The common identifiers are: + +- The operating system: `windows`, `uwp`, `linux`, `osx` (includes macOS), `android`, `emscripten` +- The architecture: `x86`, `x64`, `wasm32`, `arm64`, `arm` (includes both arm32 and arm64 due to backwards compatibility) + +although one can define their own. + + + +#### `"version>="` Field + +A minimum version constraint on the dependency. + +This field specifies the minimum version of the dependency, optionally using a +`#N` suffix to denote port-version if non-zero. + +See also [versioning](versioning.md#version-1) for more semantic details. + + + +### `"overrides"` + +This field pins exact versions for individual dependencies. + +`"overrides"` from transitive manifests (i.e. from dependencies) are ignored. + +See also [versioning](versioning.md#overrides) for more semantic details. + +#### Example: + +```json + "overrides": [ + { + "name": "arrow", "version": "1.2.3", "port-version": 7 + } + ] +``` + + + +### `"supports"` + +If your project doesn't support common platforms, you can tell your users this with the `"supports"` field. +It uses the same platform expressions as [`"platform"`](#platform), from dependencies, as well as the +`"supports"` field of features. +For example, if your library doesn't support linux, you might write `{ "supports": "!linux" }`. + + + + +### `"features"` and `"default-features"` + +The `"features"` field defines _your_ project's optional features, that others may either depend on or not. +It's an object, where the keys are the names of the features, and the values are objects describing the feature. +`"description"` is required, +and acts exactly like the [`"description"`](#description) field on the global package, +and `"dependencies"` are optional, +and again act exactly like the [`"dependencies"`](#dependencies) field on the global package. +There's also the `"supports"` field, +which again acts exactly like the [`"supports"`](#supports) field on the global package. + +You also have control over which features are default, if a person doesn't ask for anything specific, +and that's the `"default-features"` field, which is an array of feature names. + +#### Example: + +```json +{ + "name": "libdb", + "version": "1.0.0", + "description": [ + "An example database library.", + "Optionally can build with CBOR, JSON, or CSV as backends." + ], + "$default-features-explanation": "Users using this library transitively will get all backends automatically", + "default-features": [ "cbor", "csv", "json" ], + "features": { + "cbor": { + "description": "The CBOR backend", + "dependencies": [ + { + "$explanation": [ + "This is how you tell vcpkg that the cbor feature depends on the json feature of this package" + ], + "name": "libdb", + "default-features": false, + "features": [ "json" ] + } + ] + }, + "csv": { + "description": "The CSV backend", + "dependencies": [ + "fast-cpp-csv-parser" + ] + }, + "json": { + "description": "The JSON backend", + "dependencies": [ + "jsoncons" + ] + } + } +} +``` diff --git a/externals/vcpkg/docs/users/mingw.md b/externals/vcpkg/docs/users/mingw.md new file mode 100755 index 000000000..2a0408f76 --- /dev/null +++ b/externals/vcpkg/docs/users/mingw.md @@ -0,0 +1,155 @@ +# Vcpkg and Mingw-w64 + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/mingw.md).** + +*MinGW is not tested as part of vcpkg repository's CI process, so regressions can occur as part of library updates. PRs improving support are welcome!* + +## Table of Contents + + - [Mingw-w64 community triplets](#mingw-w64-community-triplets) + - [Using Mingw-w64 natively on Windows](#mingw-native) + - [How to avoid mixing different installations](#how-to-avoid-mixing-different-installations) + - [Using Mingw-w64 to build Windows programs on other systems](#mingw-cross) + +## Mingw-w64 community triplets + +Vcpkg includes +[x64, x86, arm64 and arm community triplets](https://github.com/microsoft/vcpkg/tree/master/triplets/community) +for [Mingw-w64](http://mingw-w64.org/). They don't depend on Visual Studio and +can be used natively on Windows as well as for cross-compiling on +other operating systems. There are two variants of each triplet, +selecting between static and dynamic linking. The actual tools +(g++ etc.) are expected to be named with particular prefixes. + +| architecture | vcpkg community triplets | tool name prefix | +|--------------|-----------------------------------------|----------------------| +| x64 | x64-mingw-dynamic, x64-mingw-static | x86_64-w64-mingw32- | +| x86 | x86-mingw-dynamic, x86-mingw-static | i686-w64-mingw32- | +| arm64 | arm64-mingw-dynamic, arm64-mingw-static | aarch64-w64-mingw32- | +| arm | arm-mingw-dynamic, arm-mingw-static | armv7-w64-mingw32- | + +These triplets are not tested by continuous integration, so many ports +do not build, and even existing ports may break on port updates. +Because of this, community involvement is paramount! + +- [Discussions](https://github.com/microsoft/vcpkg/discussions?discussions_q=mingw) +- [Open issues](https://github.com/microsoft/vcpkg/issues?q=is%3Aissue+is%3Aopen+mingw) +- [Open pull requests](https://github.com/microsoft/vcpkg/pulls?q=is%3Apr+is%3Aopen+mingw) + + +## Using Mingw-w64 natively on Windows + +With [MSYS2](https://www.msys2.org/), it is possible to easily create +a full environment for building ports with Mingw-w64 on a Windows PC. + +Note that for building software for native windows environments, you +must use a mingw subsystem of MSYS2, and install some packages +(with a specific prefix) for this subsystem. + +| architecture | vcpkg triplets | subsystem | package prefix | +|--------------|-------------------------------------|-----------|-------------------| +| x64 | x64-mingw-dynamic, x64-mingw-static | mingw64 | mingw-w64-x86_64- | +| x86 | x86-mingw-dynamic, x86-mingw-static | mingw32 | mingw-w64-i686- | + +After the basic installation of MSYS2, you will need to install a few +additional packages for software development, e.g. for x64: + +```bash +pacman -S --needed git base-devel mingw-w64-x86_64-toolchain +``` + +The active subsystem is selected by running the MSYS2 MinGW app, or +changed in a running terminal by + +```bash +source shell mingw64 # for x64, or "mingw32" for x86 +``` + +The bootstrapping of vcpkg shall be done by running bootstrap-vcpkg.bat. +This will download the official vcpkg.exe. + +```bash +git clone https://github.com/microsoft/vcpkg.git +cd vcpkg +./bootstrap-vcpkg.bat +``` + +For building packages, you need to tell vcpkg that you want to use the +mingw triplet. This can be done in different ways. When Visual Studio +is not installed, you must also set the host triplet to mingw. This is +needed to resolve host dependencies. For convenience, you can use +environment variables to set both triplets: + +```bash +export VCPKG_DEFAULT_TRIPLET=x64-mingw-dynamic +export VCPKG_DEFAULT_HOST_TRIPLET=x64-mingw-dynamic +``` + +Now you can test your setup: + +```bash +./vcpkg install zlib +``` + +### How to avoid mixing different installations + +[The MSYS2 project explicitly warns](https://www.msys2.org/wiki/MSYS2-introduction/#path) +that "mixing in programs from other MSYS2 installations, Cygwin installations, +compiler toolchains or even various other programs is not supported and will +probably break things in unexpected ways." For example, the proper passing of +command line arguments with quoting and escaping may fail. + +But Vcpkg ports implicitly create MSYS2 installations, e.g. for `pkg-config` +and for various other build tools needed to deal with packages based on +autoconf. In particular, when ports prepend the directory of tools to the +`PATH` environment variable, this may change which tool with a particular +name is actually invoked, and how arguments are passed between tools. + +To mitigate such issues when working with a full MSYS2 installation, +try to keep the directories of the msys subsystem (`/usr/bin`, `bin`) +out of the `PATH` environment variable as found by vcpkg. In bash, you +may modify the `PATH` just for a single call of vcpkg: + +```bash +PATH="${PATH/:\/usr\/bin:\/bin:/:}" ./vcpkg install libpq +``` + +Alternatively, you may run vcpkg from a regular Command Prompt, after +adding *only* the desired mingw directory (e.g. `C:\msys64\mingw64\bin`) +to the `PATH`. + +When using vcpkg for CI with standard images on Azure Pipelines, Github Actions +or similar, note that the default `PATH` might contain more directories +which create a mix of MSYS2 programs from different installations. You may +want to set the desired `PATH` manually, or remove directories which contain +`sh.exe`, `bash.exe`, `msys-2.0.dll` or `cygwin1.dll`. + + +## Using Mingw-w64 to build Windows programs on other systems + +You can use the vcpkg mingw community triplets with toolchains on +non-Windows computers to cross-compile software to be run on Windows. +Many Linux distributions offer such toolchains in optional packages +with a mingw-w64 [suffix](https://repology.org/projects/?search=-mingw-w64) +or [prefix](https://repology.org/projects/?search=mingw-w64-). +As an example, for Debian-based distributions, you would start with +this installation command for the x64 toolchain: + +``` +sudo apt-get install gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 +``` + +Note that the packaged versions of Mingw-w64 toolchains on Linux distributions +might be older releases which lack some useful features or bug fixes. +An alternative independent toolchain is offered by [MXE](https://mxe.cc/). + +For vcpkg bootstrapping, clone the github repository and run the +`bootstrap-vcpkg.sh` script: + +```bash +git clone https://github.com/microsoft/vcpkg.git +cd vcpkg +./bootstrap-vcpkg.sh +./vcpkg install zlib:x64-mingw-dynamic +``` + diff --git a/externals/vcpkg/docs/users/registries.md b/externals/vcpkg/docs/users/registries.md new file mode 100755 index 000000000..06a0bf35b --- /dev/null +++ b/externals/vcpkg/docs/users/registries.md @@ -0,0 +1,135 @@ +# Using Registries + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/registries.md).** + +There are two parts to using registries; this documents the use side of the +relationship. In order to learn more about creating registries for others to +use, please read [this documentation](../maintainers/registries.md). + +## Table of Contents + +- [Using Registries](#using-registries) + - [Table of Contents](#table-of-contents) + - [`vcpkg-configuration.json`](#vcpkg-configurationjson) + - [Registry Objects](#registry-objects) + - [Registry Objects: `"kind"`](#registry-objects-kind) + - [Registry Objects: `"baseline"`](#registry-objects-baseline) + - [Registry Objects: `"repository"`](#registry-objects-repository) + - [Registry Objects: `"path"`](#registry-objects-path) + - [Configuration: `"default-registry"`](#configuration-default-registry) + - [Configuration: `"registries"`](#configuration-registries) + - [Example Configuration File](#example-configuration-file) + - [Package Name Resolution](#package-name-resolution) + - [Versioning Support](#versioning-support) + +## `vcpkg-configuration.json` + +From a high level perspective, everything that a project needs to define +about registries is contained in the vcpkg configuration file. In classic +mode, the configuration file lies in the vcpkg root; for manifest mode, +the file must exist next to the project's `vcpkg.json` file. +This file is named `vcpkg-configuration.json`, and it's a simple top-level +object file. + +### Registry Objects + +Registries are defined in JSON as objects. They must contain at least the +`"kind"` and `"baseline"` fields, and additionally the different kinds of +registry will have their own way of defining where the registry can be found: + +- git registries require the `"repository"` field +- filesystem registries require the `"path"` field +- built-in registries do not require a field, since there is only one + built-in registry. + +#### Registry Objects: `"kind"` + +The `"kind"` field must be a string: + +- For git registries: `"git"` +- For filesystem registries: `"filesystem"` +- For the builtin registry: `"builtin"` + +#### Registry Objects: `"baseline"` + +The `"baseline"` field must be a string. For git registries and for the +built-in registry, it should be a 40-character commit ID. +For filesystem registries, it can be any string that the registry defines. + +#### Registry Objects: `"repository"` + +This should be a string, of any repository format that git understands: + +- `"https://github.com/microsoft/vcpkg"` +- `"git@github.com:microsoft/vcpkg"` +- `"/dev/vcpkg-registry"` + +#### Registry Objects: `"path"` + +This should be a path; it can be either absolute or relative; relative paths +will be based at the directory the `vcpkg-configuration.json` lives in. + +### Configuration: `"default-registry"` + +The `"default-registry"` field should be a registry object. It defines +the registry that is used for all packages that are not claimed by any +package registries. It may also be `null`, in which case no packages that +are not claimed by package registries may be installed. + +### Configuration: `"registries"` + +The `"registries"` field should be an array of registry objects, each of +which additionally contain a `"packages"` field, which should be an array of +package names. These define the package registries, which are used for +the specific packages named by the `"packages"` field. + +The `"packages"` fields of all the package registries must be disjoint. + +### Example Configuration File + +Let's assume that you have mirrored at +: this will be your default registry. +Additionally, you want to use North Wind Trader's registry for their +beison and beicode libraries. The following `vcpkg-configuration.json` +will work: + +```json +{ + "default-registry": { + "kind": "git", + "repository": "https://internal/mirror/of/github.com/Microsoft/vcpkg", + "baseline": "eefee7408133f3a0fef711ef9c6a3677b7e06fd7" + }, + "registries": [ + { + "kind": "git", + "repository": "https://github.com/northwindtraders/vcpkg-registry", + "baseline": "dacf4de488094a384ca2c202b923ccc097956e0c", + "packages": [ "beicode", "beison" ] + } + ] +} +``` + +## Package Name Resolution + +The way package name resolution works in vcpkg is fairly distinct from many +package managers. It is very carefully designed to _never_ implicitly choose +the registry that a package is fetched from. Just from +`vcpkg-configuration.json`, one can tell exactly from which registry a +package definition will be fetched from. + +The name resolution algorithm is as follows: + +- If there is a package registry that claims the package name, + use that registry; otherwise +- If there is a default registry defined, use that registry; otherwise +- If the default registry is set to `null`, error out; otherwise +- use the built-in registry. + +### Versioning Support + +Versioning with custom registries works exactly as it does in the built-in +registry. You can read more about that in the [versioning documentation]. + +[versioning documentation]: versioning.md \ No newline at end of file diff --git a/externals/vcpkg/docs/users/selecting-library-features.md b/externals/vcpkg/docs/users/selecting-library-features.md new file mode 100755 index 000000000..a780d6403 --- /dev/null +++ b/externals/vcpkg/docs/users/selecting-library-features.md @@ -0,0 +1,92 @@ +# Selecting Library Features + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/selecting-library-features.md).** + +## Installing a library + +We will look at [llvm](https://llvm.org/) as an example. You could install it using: + +```powershell +> vcpkg install llvm +``` +or via a manifest with +```json +{ + "dependencies": ["llvm"] +} +``` + +With llvm now installed, we can execute: + +```powershell +> installed\x86-windows\bin\llc.exe --version +``` + +we see: + +```powershell + Registered Targets: + x86 - 32-bit X86: Pentium-Pro and above + x86-64 - 64-bit X86: EM64T and AMD64 +``` + +## Installing additional features + +But [llvm supports many more targets](https://llvm.org/docs/GettingStarted.html#local-llvm-configuration), from ARM to SPARC to SystemZ. +However, clearly our current installation doesn't include ARM as a target; +thus, we need to learn how vcpkg allows us to install other LLVM targets. +The llvm port allows this via the "target-*" features. + +If we do: + +```powershell +> vcpkg search llvm +``` + +We can see: + +``` +llvm 10.0.0#6 The LLVM Compiler Infrastructure +llvm[clang] Build C Language Family Front-end. +llvm[clang-tools-extra] Build Clang tools. +... +llvm[target-all] Build with all backends. +llvm[target-amdgpu] Build with AMDGPU backend. +llvm[target-arm] Build with ARM backend. +... +``` + +We can install any of these targets by using the install-feature syntax: + +```powershell +> vcpkg install llvm[target-arm] # Installs LLVM with the ARM target +``` +```json +{ + "dependencies": [{ "name": "llvm", "features": ["target-arm"] }] +} +``` + +## Opting out of default features + +The llvm port includes a few default features that you as a user may not want: for example, +the `clang` feature is default, which means that `vcpkg install llvm` will also build and install clang. +If you are writing a compiler that uses LLVM as a backend, +you're likely not interested in installing clang as well, +and we can do that by disabling default features with the special `core` "feature": +```powershell +> vcpkg install llvm[core,target-arm] # removing the default-feature with "core" also removes all of the default targets you get +``` +or in manifest files: +```json +{ + "dependencies": [{ + "name": "llvm", + "default-features": false, + "features": ["target-arm"] + }] +} +``` + +# Further reading +- The [Feature Packages](../specifications/feature-packages.md) specification was the initial design for features. diff --git a/externals/vcpkg/docs/users/triplets.md b/externals/vcpkg/docs/users/triplets.md new file mode 100755 index 000000000..9f9cca4d1 --- /dev/null +++ b/externals/vcpkg/docs/users/triplets.md @@ -0,0 +1,229 @@ +# Triplet Files + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/triplets.md).** + +Triplet is a standard term used in cross compiling as a way to completely capture the target environment (cpu, os, compiler, runtime, etc) in a single convenient name. + +In Vcpkg, we use triplets to describe an imaginary "target configuration set" for every library. Within a triplet, libraries are generally built with the same configuration, but it is not a requirement. For example, you could have one triplet that builds `openssl` statically and `zlib` dynamically, one that builds them both statically, and one that builds them both dynamically (all for the same target OS and architecture). A single build will consume files from a single triplet. + +We currently provide many triplets by default (run `vcpkg help triplet`). However, you can easily customize or add your own by copying a built-in triplet from the `triplets\` directory into a project local location. Then, use `--overlay-triplets=` (or equivalent such as [`$VCPKG_OVERLAY_TRIPLETS`](config-environment.md#vcpkg_overlay_triplets), [CMake `VCPKG_OVERLAY_TRIPLETS`](buildsystems/cmake-integration.md#vcpkg_overlay_triplets), or [MSBuild Additional Options](buildsystems/msbuild-integration.md#vcpkg-additional-install-options)) to add that directory to vcpkg. See our [overlay triplets example](../examples/overlay-triplets-linux-dynamic.md) for a more detailed walkthrough. + +To change the triplet used by your project, you can pass `--triplet=` on the command line or see our [Buildsystem-Specific Documentation](buildsystems/integration.md). + +## Community triplets + +Triplets contained in the `triplets\community` folder are not tested by continuous integration, but are commonly requested by the community. + +Because we do not have continuous coverage, port updates may break compatibility with community triplets. Because of this, community involvement is paramount! + +We will gladly accept and review contributions that aim to solve issues with these triplets. + +### Usage + +Community Triplets are enabled by default, when using a community triplet a message like the following one will be printed during a package install: + +```no-highlight +-- Using community triplet x86-uwp. This triplet configuration is not guaranteed to succeed. +-- [COMMUNITY] Loading triplet configuration from: D:\src\viromer\vcpkg\triplets\community\x86-uwp.cmake +``` + +## Variables +### VCPKG_TARGET_ARCHITECTURE +Specifies the target machine architecture. + +Valid options are `x86`, `x64`, `arm`, `arm64` and `wasm32`. + +### VCPKG_CRT_LINKAGE +Specifies the desired CRT linkage (for MSVC). + +Valid options are `dynamic` and `static`. + +### VCPKG_LIBRARY_LINKAGE +Specifies the preferred library linkage. + +Valid options are `dynamic` and `static`. Note that libraries can ignore this setting if they do not support the preferred linkage type. + +### VCPKG_BUILD_TYPE +You can set this value to `release` to only build release versions of the ports. By default this value is empty and release and debug versions of a port are built. + +### VCPKG_CMAKE_SYSTEM_NAME +Specifies the target platform. + +Valid options include any CMake system name, such as: +- Empty (Windows Desktop for legacy reasons) +- `WindowsStore` (Universal Windows Platform) +- `MinGW` (Minimalist GNU for Windows) +- `Darwin` (Mac OSX) +- `iOS` (iOS) +- `Linux` (Linux) +- `Emscripten` (WebAssembly) + +### VCPKG_CMAKE_SYSTEM_VERSION +Specifies the target platform system version. + +This field is optional and, if present, will be passed into the build as `CMAKE_SYSTEM_VERSION`. + +See also the CMake documentation for `CMAKE_SYSTEM_VERSION`: https://cmake.org/cmake/help/latest/variable/CMAKE_SYSTEM_VERSION.html. + + +### VCPKG_CHAINLOAD_TOOLCHAIN_FILE +Specifies an alternate CMake Toolchain file to use. + +This (if set) will override all other compiler detection logic. By default, a toolchain file is selected from `scripts/toolchains/` appropriate to the platform. + +See also the CMake documentation for toolchain files: https://cmake.org/cmake/help/v3.11/manual/cmake-toolchains.7.html. + +### VCPKG_CXX_FLAGS +Sets additional compiler flags to be used when not using `VCPKG_CHAINLOAD_TOOLCHAIN_FILE`. + +This option also has forms for configuration-specific and C flags: +- `VCPKG_CXX_FLAGS` +- `VCPKG_CXX_FLAGS_DEBUG` +- `VCPKG_CXX_FLAGS_RELEASE` +- `VCPKG_C_FLAGS` +- `VCPKG_C_FLAGS_DEBUG` +- `VCPKG_C_FLAGS_RELEASE` + +### VCPKG_LINKER_FLAGS +Sets additional linker flags to be used while building dynamic libraries and +executables in the absence of `VCPKG_CHAINLOAD_TOOLCHAIN_FILE`. + +This option also has forms for configuration-specific flags: +- `VCPKG_LINKER_FLAGS` +- `VCPKG_LINKER_FLAGS_DEBUG` +- `VCPKG_LINKER_FLAGS_RELEASE` + +### VCPKG_CMAKE_CONFIGURE_OPTIONS +Set additional CMake configure options that are appended to the configure command (in [`vcpkg_cmake_configure`](../maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md)). + +This field is optional. + +Also available as build-type specific `VCPKG_CMAKE_CONFIGURE_OPTIONS_DEBUG` and `VCPKG_CMAKE_CONFIGURE_OPTIONS_RELEASE` variables. + +### VCPKG_MAKE_CONFIGURE_OPTIONS +Set additional automake / autoconf configure options that are appended to the configure command (in [`vcpkg_configure_make`](../maintainers/vcpkg_configure_make.md)). + +This field is optional. + +For example, to skip certain libtool checks that may errantly fail: +```cmake +set(VCPKG_MAKE_CONFIGURE_OPTIONS "lt_cv_deplibs_check_method=pass_all") +``` + +Also available as build-type specific `VCPKG_MAKE_CONFIGURE_OPTIONS_DEBUG` and `VCPKG_MAKE_CONFIGURE_OPTIONS_RELEASE` variables. + + +### VCPKG_DEP_INFO_OVERRIDE_VARS +Replaces the default computed list of triplet "Supports" terms. + +This option (if set) will override the default set of terms used for qualified dependency resolution and "Supports" field evaluation. + +See the [`"supports"`](../maintainers/manifest-files.md#supports) manifest file field documentation for more details. + +> Implementers' Note: this list is extracted via the `vcpkg_get_dep_info` mechanism. + +### VCPKG_DISABLE_COMPILER_TRACKING + +When this option is set to (true|1|on), the compiler is ignored in the abi tracking. + +## Windows Variables + + +### VCPKG_ENV_PASSTHROUGH +Instructs vcpkg to allow additional environment variables into the build process. + +On Windows, vcpkg builds packages in a special clean environment that is isolated from the current command prompt to +ensure build reliability and consistency. This triplet option can be set to a list of additional environment variables +that will be added to the clean environment. The values of these environment variables will be hashed into the package +abi -- to pass through environment variables without abi tracking, see `VCPKG_ENV_PASSTHROUGH_UNTRACKED`. + +See also the `vcpkg env` command for how you can inspect the precise environment that will be used. + +> Implementers' Note: this list is extracted via the `vcpkg_get_tags` mechanism. + +### VCPKG_ENV_PASSTHROUGH_UNTRACKED +Instructs vcpkg to allow additional environment variables into the build process without abi tracking. + +See `VCPKG_ENV_PASSTHROUGH`. + + +### VCPKG_VISUAL_STUDIO_PATH +Specifies the Visual Studio installation to use. + +To select the precise combination of Visual Studio instance and toolset version, we walk through the following algorithm: +1. Determine the setting for `VCPKG_VISUAL_STUDIO_PATH` from the triplet, or the environment variable `VCPKG_VISUAL_STUDIO_PATH`, or consider it unset +2. Determine the setting for `VCPKG_PLATFORM_TOOLSET` from the triplet or consider it unset +3. Gather a list of all pairs of Visual Studio Instances with all toolsets available in those instances + 1. This is ordered first by instance type (Stable, Prerelease, Legacy) and then by toolset version (v142, v141, v140) +4. Filter the list based on the settings for `VCPKG_VISUAL_STUDIO_PATH` and `VCPKG_PLATFORM_TOOLSET`. +5. Select the best remaining option + +The path should be absolute, formatted with backslashes, and have no trailing slash: +```cmake +set(VCPKG_VISUAL_STUDIO_PATH "C:\\Program Files (x86)\\Microsoft Visual Studio\\Preview\\Community") +``` + +### VCPKG_PLATFORM_TOOLSET +Specifies the VS-based C/C++ compiler toolchain to use. + +See [`VCPKG_VISUAL_STUDIO_PATH`](#VCPKG_VISUAL_STUDIO_PATH) for the full selection algorithm. + +Valid settings: +* The Visual Studio 2019 platform toolset is `v142`. +* The Visual Studio 2017 platform toolset is `v141`. +* The Visual Studio 2015 platform toolset is `v140`. + +### VCPKG_PLATFORM_TOOLSET_VERSION +Specifies the detailed MSVC C/C++ compiler toolchain to use. + +By default, [`VCPKG_PLATFORM_TOOLSET`] always chooses the latest installed minor version of the selected toolset. +If you need more granularity, you can use this variable. +Valid values are, for example, `14.25` or `14.27.29110`. + +### VCPKG_LOAD_VCVARS_ENV +If `VCPKG_CHAINLOAD_TOOLCHAIN_FILE` is used, VCPKG will not setup the Visual Studio environment. +Setting `VCPKG_LOAD_VCVARS_ENV` to (true|1|on) changes this behavior so that the Visual Studio environment is setup following the same rules as if `VCPKG_CHAINLOAD_TOOLCHAIN_FILE` was not set. + +## MacOS Variables + +### VCPKG_INSTALL_NAME_DIR +Sets the install name used when building macOS dynamic libraries. Default value is `@rpath`. See the CMake documentation for [CMAKE_INSTALL_NAME_DIR](https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_NAME_DIR.html) for more information. + +### VCPKG_OSX_DEPLOYMENT_TARGET +Sets the minimum macOS version for compiled binaries. This also changes what versions of the macOS platform SDK that CMake will search for. See the CMake documentation for [CMAKE_OSX_DEPLOYMENT_TARGET](https://cmake.org/cmake/help/latest/variable/CMAKE_OSX_DEPLOYMENT_TARGET.html) for more information. + +### VCPKG_OSX_SYSROOT +Set the name or path of the macOS platform SDK that will be used by CMake. See the CMake documentation for [CMAKE_OSX_SYSROOT](https://cmake.org/cmake/help/latest/variable/CMAKE_OSX_SYSROOT.html) for more information. + + +### VCPKG_OSX_ARCHITECTURES +Set the macOS / iOS target architecture which will be used by CMake. See the CMake documentation for [CMAKE_OSX_ARCHITECTURES](https://cmake.org/cmake/help/latest/variable/CMAKE_OSX_ARCHITECTURES.html) for more information. + +## Per-port customization +The CMake Macro `PORT` will be set when interpreting the triplet file and can be used to change settings (such as `VCPKG_LIBRARY_LINKAGE`) on a per-port basis. + +Example: +```cmake +set(VCPKG_LIBRARY_LINKAGE static) +if(PORT MATCHES "qt5-") + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif() +``` +This will build all the `qt5-*` libraries as DLLs, but every other library as a static library. + +For an example in a real project, see https://github.com/Intelight/vcpkg/blob/master/triplets/x86-windows-mixed.cmake. + +## Additional Remarks +The default triplet when running any vcpkg command is `%VCPKG_DEFAULT_TRIPLET%` or a platform-specific choice if that environment variable is undefined. + +- Windows: `x86-windows` +- Linux: `x64-linux` +- OSX: `x64-osx` + +We recommend using a systematic naming scheme when creating new triplets. The Android toolchain naming scheme is a good source of inspiration: https://developer.android.com/ndk/guides/standalone_toolchain.html. + +## Android triplets +See [android.md](android.md) + +## Mingw-w64 triplets +See [mingw.md](mingw.md) diff --git a/externals/vcpkg/docs/users/versioning.implementation-details.md b/externals/vcpkg/docs/users/versioning.implementation-details.md new file mode 100755 index 000000000..e264e9ebf --- /dev/null +++ b/externals/vcpkg/docs/users/versioning.implementation-details.md @@ -0,0 +1,134 @@ +# Versioning: Implementation details + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/versioning.implementation-details.md).** + +## Contents + +* [Minimum versioning](#minimum-versioning) +* [Constraint resolution](#constraint-resolution) +* [Acquiring port versions](#acquiring-port-versions) + + +### Minimum versioning +Vcpkg uses a minimal selection approach to versioning, inspired by the one [used by Go](https://research.swtch.com/vgo-mvs). But modified in some ways: + +* Always starts from a fresh install, eliminates the need for upgrade/downgrade operations. +* Allow unconstrained dependencies by introducing baselines. + +The minimal selection principle, however, stays the same. Given a set of constraints, vcpkg will use the "oldest" possible versions of packages that can satisfy all the constraints. + +Using a minimum version approach has the following advantages: +* Is predictable and easy to understand. +* User controls when upgrades happen, as in, no upgrades are performed automatically when a new version is released. +* Avoids using a SAT solver. + +To give an example, consider the following package graph: +``` + (A 1.0) -> (B 1.0) + + (A 1.1) -> (B 1.0) + -> (C 3.0) + + (A 1.2) -> (B 2.0) + -> (C 3.0) + + (C 2.0) +``` + +And the following manifest: +``` +{ + "name": "example", + "version": "1.0.0", + "dependencies": [ + { "name": "A", "version>=": "1.1" }, + { "name": "C", "version>=": "2.0" } + ], + "builtin-baseline": "" +} +``` + +After accounting for transitive dependencies we have the following set of constraints: +* A >= 1.1 + * B >= 1.0 + * C >= 3.0 +* C >= 2.0 + +Since vcpkg has to satisfy all the constraints, the set of installed packages becomes: + +* `A 1.1`, even when `A 1.2` exists, there are no constraints higher than `1.1` so vcpkg selects the minimum version possible. +* `B 1.0`, transitively required by `A 1.1`. +* `C 3.0`, upgraded by the transitive constraint added by `B 1.0` in order to satisfy version constraints. + +## Constraint resolution +Given a manifest with a set of versioned dependencies, vcpkg will attempt to calculate a package installation plan that satisfies all the constraints. + +Version constraints come in the following flavors: +* **Declared constraints**: Constraints declared explicitly in the top-level manifest using `version>=`. +* **Baseline constraints**: Constraints added implicitly by the `builtin-baseline`. +* **Transitive constraints**: Constraints added indirectly by dependencies of your dependencies. +* **Overridden constraints**: Constraints overridden in the top-level manifest using `overrides` declarations. + +To compute an installation plan, vcpkg follows roughly these steps: + +* Add all top-level constraints to the plan. +* Recursively add transitive constraints to the plan. + * Each time a new package is added to the plan, also add its baseline constraint to the plan. + * Each time a constraint is added: + * If an override exists for the package + * Select the version in the override. + * Otherwise: + * If there is no previous version selected. + * Select the minimal version that satisfies the constraint. + * If there is a previous version selected: + * If the versioning scheme of the new constraint does not match that of the previously selected version: + * Add a version conflict. + * If the constraint's version is not comparable to the previously selected version. For example, comparing "version-string: apple" to "version-string: orange": + * Add a version conflict. + * If the constraints version is higher than the previously selected version: + * Select the highest version. + * Otherwise: + * Keep the previous selection. +* Review the plan: + * If there are no conflicts + * Install the selected packages + * Otherwise: + * Report the conflicts to the user + +## Acquiring port versions +Although the concept of package versions has always been present in vcpkg, the concept of version constraints has been not. + +With the introduction of versioning constraints, it is now possible that a package depends on a port version that does not match the one available locally. This raises a problem as vcpkg needs to know how to acquire the port files for the requested version. + +To solve this problem, a new set of metadata files was introduced. These files are located in the `versions/` directory at the root level of the vcpkg repository. + +The `versions/` directory, will contain JSON files for each one of the ports available in the registry. Each file will list all the versions available for a package and contain a Git tree-ish object that vcpkg can check out to obtain that version's portfiles. + +Example: `zlib.json` + +``` +{ + "versions": [ + { + "git-tree": "2dfc991c739ab9f2605c2ad91a58a7982eb15687", + "version-string": "1.2.11", + "port-version": 9 + }, + ... + { + "git-tree": "a516e5ee220c8250f21821077d0e3dd517f02631", + "version-string": "1.2.10", + "port-version": 0 + }, + { + "git-tree": "3309ec82cd96d752ff890c441cb20ef49b52bf94", + "version-string": "1.2.8", + "port-version": 0 + } + ] +} +``` + +For each port, its corresponding versions file should be located in `versions/{first letter of port name}-/{port name}.json`. For example, zlib's version file will be located in `versions/z-/zlib.json`. Aside from port version files, the current baseline file is located in `versions/baseline.json`. + + diff --git a/externals/vcpkg/docs/users/versioning.md b/externals/vcpkg/docs/users/versioning.md new file mode 100755 index 000000000..e4befb2eb --- /dev/null +++ b/externals/vcpkg/docs/users/versioning.md @@ -0,0 +1,188 @@ +# Versioning + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/versioning.md).** + +Versioning allows you to deterministically control the precise revisions of dependencies used by +your project from within your manifest file. + +See our guide to [getting started with versioning](../examples/versioning.getting-started.md). + +## Contents + +* [Version schemes](#version-schemes) + * [`version`](#version) + * [`version-semver`](#version-semver) + * [`version-date`](#version-date) + * [`version-string`](#version-string) +* [Version constraints](#version-constraints) + +## Version schemes +Ports in vcpkg should attempt to follow the versioning conventions used by the package's authors. For that reason, when declaring a package's version the appropriate scheme should be used. + +Each versioning scheme defines its own rules on what is a valid version string and more importantly the rules for how to sort versions using the same scheme. + +The versioning schemes understood by vcpkg are: + +Manifest property | Versioning scheme +------------------|------------------------------------ +`version` | For dot-separated numeric versions +`version-semver` | For SemVer compliant versions +`version-date` | For dates in the format YYYY-MM-DD +`version-string` | For arbitrary strings + +A manifest must contain only one version declaration. + +_NOTE: By design, vcpkg does not compare versions that use different schemes. For example, a package +that has a `version-string: 7.1.3` cannot be compared with the same package using `version: 7.1.4`, even if the +conversion seems obvious._ + +#### `version` +Accepts version strings that follow a relaxed, dot-separated-, semver-like scheme. + +The version is logically composed of dot-separated (`.`) numeric sections. Each section must contain an integer positive number with no leading zeroes. + +The regex pattern for this versioning scheme is: `(0|[1-9]\d*)(\.(0|[1-9]\d*))*` + +_Sorting behavior_: When comparing two versions, each section is compared from left to right by their numeric value, until the first difference is found. A version with the smallest set of sections takes precedence over another with a larger set of sections, given that all their preceding sections compare equally. + +Example: +`0` < `0.1` < `0.1.0` < `1` < `1.0.0` < `1.0.1` < `1.1`< `2.0.0` + +#### `version-semver` +Accepts version strings that follow semantic versioning conventions as described in the [semantic versioning specification](https://semver.org/#semantic-versioning-specification-semver). + +_Sorting behavior_: Strings are sorted following the rules described in the semantic versioning specification. + +Example: +`1.0.0-1` < `1.0.0-alpha` < `1.0.0-beta` < `1.0.0` < `1.0.1` < `1.1.0` + +#### `version-date` + +Accepts version strings that can be parsed to a date following the ISO-8601 format `YYYY-MM-DD`. Disambiguation identifiers are allowed in the form of dot-separated-, positive-, integer-numbers with no leading zeroes. + +This is the recommended versioning scheme for "Live at HEAD" libraries that don't have established release versions. + +The regex pattern for this versioning scheme is: `\d{4}-\d{2}-\d{2}(\.(0|[1-9]\d*))*` + +_Sorting behavior_: Strings are sorted first by their date part, then by numeric comparison of their disambiguation identifiers. Disambiguation identifiers follow the rules of the relaxed (`version`) scheme. + +Examples: +`2021-01-01` < `2021-01-01.1` < `2021-02-01.1.2` < `2021-02-01.1.3` < `2021-02-01` + +#### `version-string` +For packages using version strings that do not fit any of the other schemes, it accepts most arbitrary strings. The `#` which is used to denote port versions is disallowed. + +_Sorting behavior_: No sorting is attempted on the version string itself. However, if the strings match exactly, their port versions can be compared and sorted. + +Examples: +* `apple` <> `orange` <> `orange.2` <> `orange2` +* `watermelon#0`< `watermelon#1` + +#### `port-version` +A positive integer value that increases each time a vcpkg-specific change is made to the port. + +The rules for port versions are: +* Start at 0 for the original version of the port, +* increase by 1 each time a vcpkg-specific change is made to the port that does not increase the version of the package, +* and reset to 0 each time the version of the package is updated. + +_NOTE: Whenever vcpkg output a version it follows the format `#`. For example `1.2.0#2` means version `1.2.0` port version `2`. When the port version is `0` the `#0` suffix is omitted (`1.2.0` implies version `1.2.0` port version `0`)._ + +_Sorting behavior_: If two versions compare equally, their port versions are compared by their numeric value, lower port versions take precedence. + +Examples: +* `1.2.0` < `1.2.0#1` < `1.2.0#2` < `1.2.0#10` +* `2021-01-01#20` < `2021-01-01.1` +* `windows#7` < `windows#8` + +## Version constraints + +### `builtin-baseline` +Accepts a Git commit ID. vcpkg will try to find a baseline file in the given +commit ID and use that to set the baseline versions (lower bounds) of all +dependencies. + +Baselines provide stability and ease of development for top-level manifest +files. They are not considered from ports consumed as a dependency. If a minimum +version constraint is required during transitive version resolution, the port +should use `version>=`. + +Example: +```json +{ + "name": "project", + "version": "1.0.0", + "dependencies": ["zlib", "fmt"], + "builtin-baseline":"9fd3bd594f41afb8747e20f6ac9619f26f333cbe" +} +``` + +You can get the current commit of your vcpkg instance either by adding an empty +`"builtin-baseline"` field, installing, and examining the error message or by +running `git rev-parse HEAD` in the root of the vcpkg instance. + +When resolving version constraints for a package, vcpkg will look for a baseline +version by looking at the baseline file in the given commit ID. If the given +commit ID doesn't have a `versions/baseline.json` file or if the baseline file +exists but it does not declare a baseline version for the package the invocation +will fail. + +This field is a convenience field that has the same semantic as replacing your +default registry in +[`vcpkg-configuration.json`](registries.md#configuration-default-registry). +```json +{ + "default-registry": { + "kind": "builtin", + "baseline": "" + } +} +``` + +### `version>=` +Expresses a minimum version requirement, `version>=` declarations put a lower boundary on the versions that can be used to satisfy a dependency. + +**Note: Vcpkg selects the lowest version that matches all constraints, so a less-than constraint is not required.** + +Example: +```json +{ + "name": "project", + "version-semver": "1.0.0", + "dependencies": [ + { "name": "zlib", "version>=": "1.2.11#9" }, + { "name": "fmt", "version>=": "7.1.3#1" } + ], + "builtin-baseline":"3426db05b996481ca31e95fff3734cf23e0f51bc" +} +``` + +As part of a version constraint declaration, a port version can be specified by adding the suffix `#`, in the previous example `1.2.11#9` refers to version `1.2.11` port version `9`. + +### `overrides` +Declaring an override forces vcpkg to ignore all other version constraints and use the version specified in the override. This is useful for pinning exact versions and for resolving version conflicts. + +Overrides are declared as an array of package version declarations. + +For an override to take effect, the overridden package must form part of the dependency graph. That means that a dependency must be declared either by the top-level manifest or be part of a transitive dependency. + +```json +{ + "name": "project", + "version-semver": "1.0.0", + "dependencies": [ + { "name": "zlib", "version>=": "1.2.11#9" }, + "fmt" + ], + "builtin-baseline":"3426db05b996481ca31e95fff3734cf23e0f51bc", + "overrides": [ + { "name": "fmt", "version": "6.0.0" } + ] +} +``` + +## See Also + +* The [implementation details](versioning.implementation-details.md) +* The [original specification](../specifications/versioning.md) + diff --git a/externals/vcpkg/ports/3fd/RapidXML.patch b/externals/vcpkg/ports/3fd/RapidXML.patch new file mode 100755 index 000000000..6373fc287 --- /dev/null +++ b/externals/vcpkg/ports/3fd/RapidXML.patch @@ -0,0 +1,10 @@ +--- a/3FD/xml.h ++++ b/3FD/xml.h +@@ -4,6 +4,6 @@ + #include "exceptions.h" + #include "utils.h" +-#include ++#include + + #include + #include diff --git a/externals/vcpkg/ports/3fd/portfile.cmake b/externals/vcpkg/ports/3fd/portfile.cmake new file mode 100755 index 000000000..ae6850929 --- /dev/null +++ b/externals/vcpkg/ports/3fd/portfile.cmake @@ -0,0 +1,70 @@ +# Check architecture: +if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(BUILD_ARCH "Win32") +elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(BUILD_ARCH "x64") +elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(BUILD_ARCH "ARM") +else() + message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") +endif() + +# Check library linkage: +vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) + +# Get source code: +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO faburaya/3fd + REF 3a0fe606268721d1560b88dcca8647c67c0b275c # v2.6.3 (Stable) + SHA512 70630291b4055de2044ad76ef21e99d6ab6fd3468debb2a864a461cf8513642fe87f116e9dfff96ecff96f4577108493dc25aa40eeefcd93ee75990b13bb7b20 + HEAD_REF master + PATCHES + RapidXML.patch +) + +# Build: +if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # UWP: + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "3FD/3FD.WinRT.UWP.vcxproj" + PLATFORM ${BUILD_ARCH} + USE_VCPKG_INTEGRATION + ) +elseif (NOT VCPKG_CMAKE_SYSTEM_NAME) # Win32: + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "3FD/3FD.vcxproj" + PLATFORM ${BUILD_ARCH} + TARGET Build + USE_VCPKG_INTEGRATION + ) +else() + message(FATAL_ERROR "Unsupported system: 3FD is not currently ported to VCPKG in ${VCPKG_CMAKE_SYSTEM_NAME}!") +endif() + +# Install: +file(GLOB HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/3FD/*.h") +file(INSTALL + ${HEADER_FILES} + DESTINATION ${CURRENT_PACKAGES_DIR}/include/3FD + PATTERN "*_impl*.h" EXCLUDE + PATTERN "*example*.h" EXCLUDE + PATTERN "stdafx.h" EXCLUDE + PATTERN "targetver.h" EXCLUDE +) + +file(INSTALL ${SOURCE_PATH}/btree DESTINATION ${CURRENT_PACKAGES_DIR}/include/3FD) +file(INSTALL ${SOURCE_PATH}/OpenCL/CL DESTINATION ${CURRENT_PACKAGES_DIR}/include/3FD) + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/3FD) +file(INSTALL + ${SOURCE_PATH}/3FD/3fd-config-template.xml + DESTINATION ${CURRENT_PACKAGES_DIR}/share/3FD +) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/3fd RENAME copyright) +file(INSTALL ${SOURCE_PATH}/Acknowledgements.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/3fd) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/3fd/vcpkg.json b/externals/vcpkg/ports/3fd/vcpkg.json new file mode 100755 index 000000000..5ee8f2d4e --- /dev/null +++ b/externals/vcpkg/ports/3fd/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "3fd", + "version": "2.6.3", + "port-version": 2, + "description": "C++ Framework For Fast Development", + "supports": "windows & !static & !arm64", + "dependencies": [ + { + "name": "boost-lockfree", + "platform": "windows" + }, + { + "name": "boost-regex", + "platform": "windows" + }, + { + "name": "poco", + "platform": "windows" + }, + "rapidxml", + "sqlite3" + ] +} diff --git a/externals/vcpkg/ports/7zip/7zip-config.cmake.in b/externals/vcpkg/ports/7zip/7zip-config.cmake.in new file mode 100755 index 000000000..442821af9 --- /dev/null +++ b/externals/vcpkg/ports/7zip/7zip-config.cmake.in @@ -0,0 +1,5 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/7zip-targets.cmake") + +check_required_components(7zip) diff --git a/externals/vcpkg/ports/7zip/CMakeLists.txt b/externals/vcpkg/ports/7zip/CMakeLists.txt new file mode 100755 index 000000000..a7fb577bc --- /dev/null +++ b/externals/vcpkg/ports/7zip/CMakeLists.txt @@ -0,0 +1,457 @@ +cmake_minimum_required(VERSION 3.19) + +project(7zip LANGUAGES C CXX) + +if(VCPKG_TARGET_IS_WINDOWS) + enable_language(ASM_MASM) +elseif(VCPKG_TARGET_IS_LINUX) + enable_language(ASM) +endif() + +add_library(7zip) + +target_sources(7zip PRIVATE + CPP/7zip/Compress/Bcj2Coder.cpp + CPP/7zip/Compress/Bcj2Register.cpp + CPP/7zip/Compress/BcjCoder.cpp + CPP/7zip/Compress/BcjRegister.cpp + CPP/7zip/Compress/BitlDecoder.cpp + CPP/7zip/Compress/BranchMisc.cpp + CPP/7zip/Compress/BranchRegister.cpp + CPP/7zip/Compress/ByteSwap.cpp + CPP/7zip/Compress/BZip2Crc.cpp + CPP/7zip/Compress/BZip2Decoder.cpp + CPP/7zip/Compress/BZip2Encoder.cpp + CPP/7zip/Compress/BZip2Register.cpp + CPP/7zip/Compress/CopyCoder.cpp + CPP/7zip/Compress/CopyRegister.cpp + CPP/7zip/Compress/Deflate64Register.cpp + CPP/7zip/Compress/DeflateDecoder.cpp + CPP/7zip/Compress/DeflateEncoder.cpp + CPP/7zip/Compress/DeflateRegister.cpp + CPP/7zip/Compress/DeltaFilter.cpp + CPP/7zip/Compress/ImplodeDecoder.cpp + CPP/7zip/Compress/LzfseDecoder.cpp + CPP/7zip/Compress/LzhDecoder.cpp + CPP/7zip/Compress/Lzma2Decoder.cpp + CPP/7zip/Compress/Lzma2Encoder.cpp + CPP/7zip/Compress/Lzma2Register.cpp + CPP/7zip/Compress/LzmaDecoder.cpp + CPP/7zip/Compress/LzmaEncoder.cpp + CPP/7zip/Compress/LzmaRegister.cpp + CPP/7zip/Compress/LzmsDecoder.cpp + CPP/7zip/Compress/LzOutWindow.cpp + CPP/7zip/Compress/LzxDecoder.cpp + CPP/7zip/Compress/PpmdDecoder.cpp + CPP/7zip/Compress/PpmdEncoder.cpp + CPP/7zip/Compress/PpmdRegister.cpp + CPP/7zip/Compress/PpmdZip.cpp + CPP/7zip/Compress/QuantumDecoder.cpp + CPP/7zip/Compress/Rar1Decoder.cpp + CPP/7zip/Compress/Rar2Decoder.cpp + CPP/7zip/Compress/Rar3Decoder.cpp + CPP/7zip/Compress/Rar3Vm.cpp + CPP/7zip/Compress/Rar5Decoder.cpp + CPP/7zip/Compress/RarCodecsRegister.cpp + CPP/7zip/Compress/ShrinkDecoder.cpp + CPP/7zip/Compress/XpressDecoder.cpp + CPP/7zip/Compress/XzDecoder.cpp + CPP/7zip/Compress/XzEncoder.cpp + CPP/7zip/Compress/ZlibDecoder.cpp + CPP/7zip/Compress/ZlibEncoder.cpp + CPP/7zip/Compress/ZDecoder.cpp + CPP/7zip/Compress/CodecExports.cpp + + CPP/7zip/Crypto/7zAes.cpp + CPP/7zip/Crypto/7zAesRegister.cpp + CPP/7zip/Crypto/HmacSha1.cpp + CPP/7zip/Crypto/HmacSha256.cpp + CPP/7zip/Crypto/MyAes.cpp + CPP/7zip/Crypto/MyAesReg.cpp + CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp + CPP/7zip/Crypto/RandGen.cpp + CPP/7zip/Crypto/Rar20Crypto.cpp + CPP/7zip/Crypto/Rar5Aes.cpp + CPP/7zip/Crypto/RarAes.cpp + CPP/7zip/Crypto/WzAes.cpp + CPP/7zip/Crypto/ZipCrypto.cpp + CPP/7zip/Crypto/ZipStrong.cpp + + C/7zBuf2.c + C/7zStream.c + C/Alloc.c + C/Bcj2.c + C/Bcj2Enc.c + C/Blake2s.c + C/Bra.c + C/Bra86.c + C/BraIA64.c + C/BwtSort.c + C/CpuArch.c + C/Delta.c + C/HuffEnc.c + C/LzFind.c + C/LzFindMt.c + C/Lzma2Dec.c + C/Lzma2DecMt.c + C/Lzma2Enc.c + C/LzmaEnc.c + C/LzmaLib.c + C/MtCoder.c + C/MtDec.c + C/Ppmd7.c + C/Ppmd7aDec.c + C/Ppmd7Dec.c + C/Ppmd7Enc.c + C/Ppmd8.c + C/Ppmd8Dec.c + C/Ppmd8Enc.c + C/Sha1.c + C/Sha256.c + C/Sort.c + C/Threads.c + C/Xz.c + C/XzDec.c + C/XzEnc.c + C/XzIn.c + C/Aes.c + C/7zCrc.c + C/XzCrc64.c + + CPP/Common/CRC.cpp + CPP/Common/CrcReg.cpp + CPP/Common/DynLimBuf.cpp + CPP/Common/IntToString.cpp + CPP/Common/LzFindPrepare.cpp + CPP/Common/MyMap.cpp + CPP/Common/MyString.cpp + CPP/Common/MyVector.cpp + CPP/Common/MyWindows.cpp + CPP/Common/MyXml.cpp + CPP/Common/NewHandler.cpp + CPP/Common/Sha1Prepare.cpp + CPP/Common/Sha1Reg.cpp + CPP/Common/Sha256Prepare.cpp + CPP/Common/Sha256Reg.cpp + CPP/Common/StringConvert.cpp + CPP/Common/StringToInt.cpp + CPP/Common/UTFConvert.cpp + CPP/Common/Wildcard.cpp + CPP/Common/XzCrc64Init.cpp + CPP/Common/XzCrc64Reg.cpp + + CPP/Windows/FileDir.cpp + CPP/Windows/FileFind.cpp + CPP/Windows/FileIO.cpp + CPP/Windows/FileName.cpp + CPP/Windows/PropVariant.cpp + CPP/Windows/PropVariantUtils.cpp + CPP/Windows/Synchronization.cpp + CPP/Windows/System.cpp + CPP/Windows/TimeUtils.cpp + + CPP/7zip/Common/CreateCoder.cpp + CPP/7zip/Common/CWrappers.cpp + CPP/7zip/Common/InBuffer.cpp + CPP/7zip/Common/InOutTempBuffer.cpp + CPP/7zip/Common/FilterCoder.cpp + CPP/7zip/Common/LimitedStreams.cpp + CPP/7zip/Common/LockedStream.cpp + CPP/7zip/Common/MemBlocks.cpp + CPP/7zip/Common/MethodId.cpp + CPP/7zip/Common/MethodProps.cpp + CPP/7zip/Common/OffsetStream.cpp + CPP/7zip/Common/OutBuffer.cpp + CPP/7zip/Common/OutMemStream.cpp + CPP/7zip/Common/ProgressMt.cpp + CPP/7zip/Common/ProgressUtils.cpp + CPP/7zip/Common/PropId.cpp + CPP/7zip/Common/StreamBinder.cpp + CPP/7zip/Common/StreamObjects.cpp + CPP/7zip/Common/StreamUtils.cpp + CPP/7zip/Common/UniqBlocks.cpp + CPP/7zip/Common/VirtThread.cpp + + CPP/7zip/Archive/ApmHandler.cpp + CPP/7zip/Archive/ArHandler.cpp + CPP/7zip/Archive/ArjHandler.cpp + CPP/7zip/Archive/Base64Handler.cpp + CPP/7zip/Archive/Bz2Handler.cpp + CPP/7zip/Archive/ComHandler.cpp + CPP/7zip/Archive/CpioHandler.cpp + CPP/7zip/Archive/CramfsHandler.cpp + CPP/7zip/Archive/DeflateProps.cpp + CPP/7zip/Archive/DmgHandler.cpp + CPP/7zip/Archive/ElfHandler.cpp + CPP/7zip/Archive/ExtHandler.cpp + CPP/7zip/Archive/FatHandler.cpp + CPP/7zip/Archive/FlvHandler.cpp + CPP/7zip/Archive/GzHandler.cpp + CPP/7zip/Archive/GptHandler.cpp + CPP/7zip/Archive/HandlerCont.cpp + CPP/7zip/Archive/HfsHandler.cpp + CPP/7zip/Archive/IhexHandler.cpp + CPP/7zip/Archive/LzhHandler.cpp + CPP/7zip/Archive/LzmaHandler.cpp + CPP/7zip/Archive/MachoHandler.cpp + CPP/7zip/Archive/MbrHandler.cpp + CPP/7zip/Archive/MslzHandler.cpp + CPP/7zip/Archive/MubHandler.cpp + CPP/7zip/Archive/NtfsHandler.cpp + CPP/7zip/Archive/PeHandler.cpp + CPP/7zip/Archive/PpmdHandler.cpp + CPP/7zip/Archive/QcowHandler.cpp + CPP/7zip/Archive/RpmHandler.cpp + CPP/7zip/Archive/SplitHandler.cpp + CPP/7zip/Archive/SquashfsHandler.cpp + CPP/7zip/Archive/SwfHandler.cpp + CPP/7zip/Archive/UefiHandler.cpp + CPP/7zip/Archive/VdiHandler.cpp + CPP/7zip/Archive/VhdHandler.cpp + CPP/7zip/Archive/VmdkHandler.cpp + CPP/7zip/Archive/XarHandler.cpp + CPP/7zip/Archive/XzHandler.cpp + CPP/7zip/Archive/ZHandler.cpp + CPP/7zip/Archive/ArchiveExports.cpp + CPP/7zip/Archive/DllExports2.cpp + + CPP/7zip/Archive/Common/CoderMixer2.cpp + CPP/7zip/Archive/Common/DummyOutStream.cpp + CPP/7zip/Archive/Common/FindSignature.cpp + CPP/7zip/Archive/Common/InStreamWithCRC.cpp + CPP/7zip/Archive/Common/ItemNameUtils.cpp + CPP/7zip/Archive/Common/MultiStream.cpp + CPP/7zip/Archive/Common/OutStreamWithCRC.cpp + CPP/7zip/Archive/Common/OutStreamWithSha1.cpp + CPP/7zip/Archive/Common/HandlerOut.cpp + CPP/7zip/Archive/Common/ParseProperties.cpp + + CPP/7zip/Archive/7z/7zCompressionMode.cpp + CPP/7zip/Archive/7z/7zDecode.cpp + CPP/7zip/Archive/7z/7zEncode.cpp + CPP/7zip/Archive/7z/7zExtract.cpp + CPP/7zip/Archive/7z/7zFolderInStream.cpp + CPP/7zip/Archive/7z/7zHandler.cpp + CPP/7zip/Archive/7z/7zHandlerOut.cpp + CPP/7zip/Archive/7z/7zHeader.cpp + CPP/7zip/Archive/7z/7zIn.cpp + CPP/7zip/Archive/7z/7zOut.cpp + CPP/7zip/Archive/7z/7zProperties.cpp + CPP/7zip/Archive/7z/7zSpecStream.cpp + CPP/7zip/Archive/7z/7zUpdate.cpp + CPP/7zip/Archive/7z/7zRegister.cpp + + CPP/7zip/Archive/Cab/CabBlockInStream.cpp + CPP/7zip/Archive/Cab/CabHandler.cpp + CPP/7zip/Archive/Cab/CabHeader.cpp + CPP/7zip/Archive/Cab/CabIn.cpp + CPP/7zip/Archive/Cab/CabRegister.cpp + + CPP/7zip/Archive/Chm/ChmHandler.cpp + CPP/7zip/Archive/Chm/ChmIn.cpp + + CPP/7zip/Archive/Iso/IsoHandler.cpp + CPP/7zip/Archive/Iso/IsoHeader.cpp + CPP/7zip/Archive/Iso/IsoIn.cpp + CPP/7zip/Archive/Iso/IsoRegister.cpp + + CPP/7zip/Archive/Nsis/NsisDecode.cpp + CPP/7zip/Archive/Nsis/NsisHandler.cpp + CPP/7zip/Archive/Nsis/NsisIn.cpp + CPP/7zip/Archive/Nsis/NsisRegister.cpp + + CPP/7zip/Archive/Rar/RarHandler.cpp + CPP/7zip/Archive/Rar/Rar5Handler.cpp + + CPP/7zip/Archive/Tar/TarHandler.cpp + CPP/7zip/Archive/Tar/TarHandlerOut.cpp + CPP/7zip/Archive/Tar/TarHeader.cpp + CPP/7zip/Archive/Tar/TarIn.cpp + CPP/7zip/Archive/Tar/TarOut.cpp + CPP/7zip/Archive/Tar/TarUpdate.cpp + CPP/7zip/Archive/Tar/TarRegister.cpp + + CPP/7zip/Archive/Udf/UdfHandler.cpp + CPP/7zip/Archive/Udf/UdfIn.cpp + + CPP/7zip/Archive/Wim/WimHandler.cpp + CPP/7zip/Archive/Wim/WimHandlerOut.cpp + CPP/7zip/Archive/Wim/WimIn.cpp + CPP/7zip/Archive/Wim/WimRegister.cpp + + CPP/7zip/Archive/Zip/ZipAddCommon.cpp + CPP/7zip/Archive/Zip/ZipHandler.cpp + CPP/7zip/Archive/Zip/ZipHandlerOut.cpp + CPP/7zip/Archive/Zip/ZipIn.cpp + CPP/7zip/Archive/Zip/ZipItem.cpp + CPP/7zip/Archive/Zip/ZipOut.cpp + CPP/7zip/Archive/Zip/ZipUpdate.cpp + CPP/7zip/Archive/Zip/ZipRegister.cpp + + CPP/7zip/Archive/Archive2.def + C/Util/LzmaLib/LzmaLib.def +) + +# 7zCrcOpt +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + target_sources(7zip PRIVATE Asm/x86/7zCrcOpt.asm) + set_source_files_properties(Asm/x86/7zCrcOpt.asm PROPERTIES LANGUAGE ASM_MASM) + else() + target_sources(7zip PRIVATE C/7zCrcOpt.c) + endif() +else() + target_sources(7zip PRIVATE C/7zCrcOpt.c) +endif() + +# AesOpt +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + target_sources(7zip PRIVATE Asm/x86/AesOpt.asm) + set_source_files_properties(Asm/x86/AesOpt.asm PROPERTIES LANGUAGE ASM_MASM) + else() + target_sources(7zip PRIVATE C/AesOpt.c) + endif() +else() + target_sources(7zip PRIVATE C/AesOpt.c) +endif() + +# LzFindOpt +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + target_sources(7zip PRIVATE Asm/x86/LzFindOpt.asm) + set_source_files_properties(Asm/x86/LzFindOpt.asm PROPERTIES LANGUAGE ASM_MASM) + else() + target_sources(7zip PRIVATE C/LzFindOpt.c) + endif() +else() + target_sources(7zip PRIVATE C/LzFindOpt.c) +endif() + +# LzmaDecOpt +target_sources(7zip PRIVATE C/LzmaDec.c) +if((VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") OR + (VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + ) + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + target_sources(7zip PRIVATE Asm/x86/LzmaDecOpt.asm) + set_source_files_properties(Asm/x86/LzmaDecOpt.asm PROPERTIES LANGUAGE ASM_MASM) + elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + target_sources(7zip PRIVATE Asm/arm64/LzmaDecOpt.S) + set_source_files_properties(Asm/x86/LzmaDecOpt.asm PROPERTIES LANGUAGE ASM) + endif() + + get_source_file_property(defs C/LzmaDec.c COMPILE_DEFINITIONS) + list(APPEND defs "_LZMA_DEC_OPT") + set_source_files_properties(C/LzmaDec.c PROPERTIES COMPILE_DEFINITIONS "${defs}") +endif() + +# Sha1Opt +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + target_sources(7zip PRIVATE Asm/x86/Sha1Opt.asm) + set_source_files_properties(Asm/x86/Sha1Opt.asm PROPERTIES LANGUAGE ASM_MASM) + else() + target_sources(7zip PRIVATE C/Sha1Opt.c) + endif() +else() + target_sources(7zip PRIVATE C/Sha1Opt.c) +endif() + +# Sha256Opt +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + target_sources(7zip PRIVATE Asm/x86/Sha256Opt.asm) + set_source_files_properties(Asm/x86/Sha256Opt.asm PROPERTIES LANGUAGE ASM_MASM) + else() + target_sources(7zip PRIVATE C/Sha256Opt.c) + endif() +else() + target_sources(7zip PRIVATE C/Sha256Opt.c) +endif() + +# XzCrc64Opt +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + target_sources(7zip PRIVATE Asm/x86/XzCrc64Opt.asm) + set_source_files_properties(Asm/x86/XzCrc64Opt.asm PROPERTIES LANGUAGE ASM_MASM) + else() + target_sources(7zip PRIVATE C/XzCrc64Opt.c) + endif() +else() + target_sources(7zip PRIVATE C/XzCrc64Opt.c) +endif() + +target_compile_definitions(7zip + PUBLIC + -D_REENTRANT + -D_FILE_OFFSET_BITS=64 + -D_LARGEFILE_SOURCE + -DEXTERNAL_CODECS + -D_7ZIP_LARGE_PAGES + -DUNICODE + -D_UNICODE +) + +target_include_directories(7zip + INTERFACE + $/7zip/CPP +) + +set(PUBLIC_HEADERS + C/7zTypes.h + C/Alloc.h + C/LzFind.h + C/LzFindMt.h + C/LzHash.h + C/LzmaDec.h + C/LzmaEnc.h + C/LzmaLib.h + C/Threads.h + CPP/7zip/Archive/IArchive.h + CPP/7zip/ICoder.h + CPP/7zip/IDecl.h + CPP/7zip/IPassword.h + CPP/7zip/IProgress.h + CPP/7zip/IStream.h + CPP/7zip/PropID.h + CPP/Common/Defs.h + CPP/Common/MyTypes.h + CPP/Common/MyUnknown.h + CPP/Common/MyWindows.h +) + +install( + TARGETS 7zip + EXPORT 7zip-targets + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin +) + +# Headers makes relative includes so directory structure must be kept +foreach(HEADER ${PUBLIC_HEADERS}) + get_filename_component(HEADER_DIR ${HEADER} DIRECTORY) + install( + FILES ${HEADER} + CONFIGURATIONS Release + DESTINATION include/7zip/${HEADER_DIR} + ) +endforeach() + +include(CMakePackageConfigHelpers) +configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/7zip-config.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/7zip-config.cmake" + INSTALL_DESTINATION "share/7zip" +) +install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/7zip-config.cmake" + DESTINATION "share/7zip" +) + +install( + EXPORT 7zip-targets + DESTINATION share/7zip + NAMESPACE 7zip:: +) diff --git a/externals/vcpkg/ports/7zip/portfile.cmake b/externals/vcpkg/ports/7zip/portfile.cmake new file mode 100755 index 000000000..5dd58bfdb --- /dev/null +++ b/externals/vcpkg/ports/7zip/portfile.cmake @@ -0,0 +1,30 @@ +set(7ZIP_VERSION "2107") +vcpkg_download_distfile(ARCHIVE + URLS "https://www.7-zip.org/a/7z${7ZIP_VERSION}-src.7z" + FILENAME "7z${7ZIP_VERSION}-src.7z" + SHA512 c13521a9829ac239a89015e1f5da27eeaa2469754e3f8ca32311d964ea9d0b40a17e4f8ccbd425d3e865aa768be345368f1c36f354d5710ac7cb2749dd6a3ab5 +) + +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" + NO_REMOVE_ONE_LEVEL +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/7zip-config.cmake.in" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup() + +file( + INSTALL "${SOURCE_PATH}/DOC/License.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/externals/vcpkg/ports/7zip/vcpkg.json b/externals/vcpkg/ports/7zip/vcpkg.json new file mode 100755 index 000000000..542e88c00 --- /dev/null +++ b/externals/vcpkg/ports/7zip/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "7zip", + "version-string": "21.07", + "port-version": 1, + "description": "Library for archiving file with a high compression ratio.", + "homepage": "https://www.7-zip.org", + "license": "LGPL-2.1-or-later", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/abseil/fix-32-bit-arm.patch b/externals/vcpkg/ports/abseil/fix-32-bit-arm.patch new file mode 100755 index 000000000..bc9ba4f14 --- /dev/null +++ b/externals/vcpkg/ports/abseil/fix-32-bit-arm.patch @@ -0,0 +1,23 @@ +diff --git a/absl/time/internal/cctz/src/zone_info_source.cc b/absl/time/internal/cctz/src/zone_info_source.cc +index 7209533..5ab5a59 100644 +--- a/absl/time/internal/cctz/src/zone_info_source.cc ++++ b/absl/time/internal/cctz/src/zone_info_source.cc +@@ -65,7 +65,7 @@ ZoneInfoSourceFactory zone_info_source_factory __attribute__((weak)) = + extern ZoneInfoSourceFactory zone_info_source_factory; + extern ZoneInfoSourceFactory default_factory; + ZoneInfoSourceFactory default_factory = DefaultFactory; +-#if defined(_M_IX86) ++#if defined(_M_IX86) || defined(_M_ARM) + #pragma comment( \ + linker, \ + "/alternatename:?zone_info_source_factory@cctz_extension@time_internal@" ABSL_INTERNAL_MANGLED_NS \ +@@ -83,8 +83,7 @@ ZoneInfoSourceFactory default_factory = DefaultFactory; + "@@U?$default_delete@VZoneInfoSource@cctz@time_internal@" ABSL_INTERNAL_MANGLED_NS \ + "@@@std@@@std@@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z@" ABSL_INTERNAL_MANGLED_BACKREFERENCE \ + "@@ZA") +-#elif defined(_M_IA_64) || defined(_M_AMD64) || defined(_M_ARM) || \ +- defined(_M_ARM64) ++#elif defined(_M_IA_64) || defined(_M_AMD64) || defined(_M_ARM64) + #pragma comment( \ + linker, \ + "/alternatename:?zone_info_source_factory@cctz_extension@time_internal@" ABSL_INTERNAL_MANGLED_NS \ diff --git a/externals/vcpkg/ports/abseil/fix-cxx-standard.patch b/externals/vcpkg/ports/abseil/fix-cxx-standard.patch new file mode 100755 index 000000000..83cdcbcc5 --- /dev/null +++ b/externals/vcpkg/ports/abseil/fix-cxx-standard.patch @@ -0,0 +1,94 @@ +diff --git a/CMake/abslConfig.cmake.in b/CMake/abslConfig.cmake.in +index 62d246d..afcec1f 100644 +--- a/CMake/abslConfig.cmake.in ++++ b/CMake/abslConfig.cmake.in +@@ -6,3 +6,5 @@ find_dependency(Threads) + @PACKAGE_INIT@ + + include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") ++ ++set(ABSL_USE_CXX17 @ABSL_USE_CXX17@) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 750a475..239977f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -67,6 +67,23 @@ else() + option(ABSL_ENABLE_INSTALL "Enable install rule" ON) + endif() + ++# CXX standard ++option(ABSL_USE_CXX17 "Enable CXX 17 standard" OFF) ++ ++if (ABSL_USE_CXX17) ++ set(CMAKE_CXX_STANDARD 17) ++ set(STD_ANY 1) ++ set(STD_OPTIONAL 1) ++ set(STD_STRING_VIEW 1) ++ set(STD_VARIANT 1) ++else() ++ set(CMAKE_CXX_STANDARD 11) ++ set(STD_ANY 0) ++ set(STD_OPTIONAL 0) ++ set(STD_STRING_VIEW 0) ++ set(STD_VARIANT 0) ++endif() ++ + option(ABSL_PROPAGATE_CXX_STD + "Use CMake C++ standard meta features (e.g. cxx_std_11) that propagate to targets that link to Abseil" + OFF) # TODO: Default to ON for CMake 3.8 and greater. +diff --git a/absl/base/CMakeLists.txt b/absl/base/CMakeLists.txt +index c7233cb..65a9076 100644 +--- a/absl/base/CMakeLists.txt ++++ b/absl/base/CMakeLists.txt +@@ -38,6 +38,11 @@ absl_cc_library( + COPTS + ${ABSL_DEFAULT_COPTS} + ) ++if (NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/options.h.in) ++ file(RENAME ${CMAKE_CURRENT_LIST_DIR}/options.h ${CMAKE_CURRENT_LIST_DIR}/options.h.in) ++endif() ++file(REMOVE ${CMAKE_CURRENT_LIST_DIR}/options.h) ++configure_file(${CMAKE_CURRENT_LIST_DIR}/options.h.in ${CMAKE_CURRENT_LIST_DIR}/options.h @ONLY) + + absl_cc_library( + NAME +diff --git a/absl/base/options.h b/absl/base/options.h +index 56b4e36..0b098ed 100644 +--- a/absl/base/options.h ++++ b/absl/base/options.h +@@ -100,7 +100,7 @@ + // User code should not inspect this macro. To check in the preprocessor if + // absl::any is a typedef of std::any, use the feature macro ABSL_USES_STD_ANY. + +-#define ABSL_OPTION_USE_STD_ANY 2 ++#define ABSL_OPTION_USE_STD_ANY @STD_ANY@ + + + // ABSL_OPTION_USE_STD_OPTIONAL +@@ -127,7 +127,7 @@ + // absl::optional is a typedef of std::optional, use the feature macro + // ABSL_USES_STD_OPTIONAL. + +-#define ABSL_OPTION_USE_STD_OPTIONAL 2 ++#define ABSL_OPTION_USE_STD_OPTIONAL @STD_OPTIONAL@ + + + // ABSL_OPTION_USE_STD_STRING_VIEW +@@ -154,7 +154,7 @@ + // absl::string_view is a typedef of std::string_view, use the feature macro + // ABSL_USES_STD_STRING_VIEW. + +-#define ABSL_OPTION_USE_STD_STRING_VIEW 2 ++#define ABSL_OPTION_USE_STD_STRING_VIEW @STD_STRING_VIEW@ + + // ABSL_OPTION_USE_STD_VARIANT + // +@@ -180,7 +180,7 @@ + // absl::variant is a typedef of std::variant, use the feature macro + // ABSL_USES_STD_VARIANT. + +-#define ABSL_OPTION_USE_STD_VARIANT 2 ++#define ABSL_OPTION_USE_STD_VARIANT @STD_VARIANT@ + + + // ABSL_OPTION_USE_INLINE_NAMESPACE diff --git a/externals/vcpkg/ports/abseil/portfile.cmake b/externals/vcpkg/ports/abseil/portfile.cmake new file mode 100755 index 000000000..1289eed36 --- /dev/null +++ b/externals/vcpkg/ports/abseil/portfile.cmake @@ -0,0 +1,55 @@ +if (NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO abseil/abseil-cpp + REF 215105818dfde3174fe799600bb0f3cae233d0bf #LTS 20211102, Patch 1 + SHA512 75d234eac76be8790cf09e3e1144e4b4cf5cacb61e46961a9e4a35b37d0fa85243afdd5de5f47a006ef96af6fc91ecc0c233297c4c32258c08d46304b3361330 + HEAD_REF master + PATCHES + # in C++17 mode, use std::any, std::optional, std::string_view, std::variant + # instead of the library replacement types + # in C++11 mode, force use of library replacement types, otherwise the automatic + # detection can cause ABI issues depending on which compiler options + # are enabled for consuming user code + fix-cxx-standard.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cxx17 ABSL_USE_CXX17 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME absl CONFIG_PATH lib/cmake/absl) +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/include/absl/copts" + "${CURRENT_PACKAGES_DIR}/include/absl/strings/testdata" + "${CURRENT_PACKAGES_DIR}/include/absl/time/internal/cctz/testdata" +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/base/config.h" + "#elif defined(ABSL_CONSUME_DLL)" "#elif 1" + ) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/base/internal/thread_identity.h" + "&& !defined(ABSL_CONSUME_DLL)" "&& 0" + ) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/container/internal/hashtablez_sampler.h" + "!defined(ABSL_CONSUME_DLL)" "0" + ) +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/abseil/vcpkg.json b/externals/vcpkg/ports/abseil/vcpkg.json new file mode 100755 index 000000000..3c9dc5eef --- /dev/null +++ b/externals/vcpkg/ports/abseil/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "abseil", + "version-string": "20211102.1", + "description": [ + "an open-source collection designed to augment the C++ standard library.", + "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.", + "In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.", + "Abseil is not meant to be a competitor to the standard library; we've just found that many of these utilities serve a purpose within our code base, and we now want to provide those resources to the C++ community as a whole." + ], + "homepage": "https://github.com/abseil/abseil-cpp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cxx17": { + "description": "Enable compiler C++17." + } + } +} diff --git a/externals/vcpkg/ports/absent/portfile.cmake b/externals/vcpkg/ports/absent/portfile.cmake new file mode 100755 index 000000000..1c8436aa8 --- /dev/null +++ b/externals/vcpkg/ports/absent/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rvarago/absent + REF 0.3.1 + SHA512 c7b7d29422ef8afc48e3093496e1dd055cfe9969ae037c2b06ea70fe4283e7a7e9129171efaa257e909c535e24df5861b992b24b00ec03f965730e6a22e13015 +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTS=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets( + CONFIG_PATH lib/cmake/${PORT} +) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug + ${CURRENT_PACKAGES_DIR}/lib +) + +file(INSTALL + ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} +) + +file(INSTALL + ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright +) + diff --git a/externals/vcpkg/ports/absent/vcpkg.json b/externals/vcpkg/ports/absent/vcpkg.json new file mode 100755 index 000000000..3f6ae21dc --- /dev/null +++ b/externals/vcpkg/ports/absent/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "absent", + "version-string": "0.3.1", + "port-version": 1, + "description": "A small C++17 library meant to simplify the composition of nullable types in a generic, type-safe, and declarative way", + "homepage": "https://github.com/rvarago/absent" +} diff --git a/externals/vcpkg/ports/ace/portfile.cmake b/externals/vcpkg/ports/ace/portfile.cmake new file mode 100755 index 000000000..a9312dcaa --- /dev/null +++ b/externals/vcpkg/ports/ace/portfile.cmake @@ -0,0 +1,437 @@ +# Using zip archive under Linux would cause sh/perl to report "No such file or directory" or "bad interpreter" +# when invoking `prj_install.pl`. +# So far this issue haven't yet be triggered under WSL 1 distributions. Not sure the root cause of it. +set(ACE_VERSION 7.0.6) +string(REPLACE "." "_" ACE_VERSION_DIRECTORY ${ACE_VERSION}) + +if("tao" IN_LIST FEATURES) + if(VCPKG_TARGET_IS_WINDOWS) + # Don't change to vcpkg_from_github! This points to a release and not an archive + vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE%2BTAO-src-${ACE_VERSION}.zip" + FILENAME ACE-TAO-${ACE_VERSION}.zip + SHA512 faef212f066263f9a87a688d105f15097f6b78fd77baf9e2b7da008027cd9ad0478b1f016892ee2d36fcb5aa6b14cc6fbb8fb906f018db6a1089820d522c65f9 + ) + else() + vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE%2BTAO-src-${ACE_VERSION}.tar.gz" + FILENAME ACE-TAO-${ACE_VERSION}.tar.gz + SHA512 5d0bbeb1f729c3304637a15979303ba6efdbe52bb5d4ac73930fe9b86dbb73a5d74325476809863b26e1a3fc39a205d9d3a9909bce7bbdc5869de3e30f1bc317 + ) + endif() +else() + if(VCPKG_TARGET_IS_WINDOWS) + # Don't change to vcpkg_from_github! This points to a release and not an archive + vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE-src-${ACE_VERSION}.zip" + FILENAME ACE-src-${ACE_VERSION}.zip + SHA512 91f35727afc652f537ce242eb0a9e10878b51b63f9c10f72bddd6491481f10eec5d9d8469f79da3b95adeab7d6848eb1e8bad4e43f61db63daf796a2cd205d61 + ) + else() + vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE-src-${ACE_VERSION}.tar.gz" + FILENAME ACE-src-${ACE_VERSION}.tar.gz + SHA512 9770fab3552835803a93c9a234218c9dd961ecde67227ee92e0972cd2e2ff267147b255ab437453a887bc47b20f70c7a64efeada5dde5d3ea2cade54200e8354 + ) + endif() +endif() + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" +) + +set(ACE_ROOT "${SOURCE_PATH}") +set(ENV{ACE_ROOT} "${ACE_ROOT}") +set(ACE_SOURCE_PATH "${ACE_ROOT}/ace") +if("tao" IN_LIST FEATURES) + set(TAO_ROOT "${SOURCE_PATH}/TAO") + set(ENV{TAO_ROOT} "${TAO_ROOT}") + set(WORKSPACE "${TAO_ROOT}/TAO_ACE") +else() + set(WORKSPACE "${ACE_ROOT}/ace/ace") +endif() +if("wchar" IN_LIST FEATURES) + list(APPEND ACE_FEATURE_LIST "uses_wchar=1") +endif() +if("zlib" IN_LIST FEATURES) + list(APPEND ACE_FEATURE_LIST "zlib=1") + set(ENV{ZLIB_ROOT} "${CURRENT_INSTALLED_DIR}") +else() + list(APPEND ACE_FEATURE_LIST "zlib=0") +endif() +if("ssl" IN_LIST FEATURES) + list(APPEND ACE_FEATURE_LIST "ssl=1") + list(APPEND ACE_FEATURE_LIST "openssl11=1") + set(ENV{SSL_ROOT} "${CURRENT_INSTALLED_DIR}") +else() + list(APPEND ACE_FEATURE_LIST "ssl=0") +endif() +if("xml-utils" IN_LIST FEATURES) + list(APPEND ACE_FEATURE_LIST "xerces3=1") + set(ENV{XERCESCROOT} "${CURRENT_INSTALLED_DIR}") +else() + list(APPEND ACE_FEATURE_LIST "xerces3=0") +endif() +list(JOIN ACE_FEATURE_LIST "," ACE_FEATURES) + +# Acquire Perl and add it to PATH (for execution of MPC) +vcpkg_find_acquire_program(PERL) +get_filename_component(PERL_PATH ${PERL} DIRECTORY) +vcpkg_add_to_path("${PERL_PATH}") + +if (TRIPLET_SYSTEM_ARCH MATCHES "x86") + set(MSBUILD_PLATFORM "Win32") +else () + set(MSBUILD_PLATFORM ${TRIPLET_SYSTEM_ARCH}) +endif() + +# Add ace/config.h file +# see https://htmlpreview.github.io/?https://github.com/DOCGroup/ACE_TAO/blob/master/ACE/ACE-INSTALL.html +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_PLATFORM_TOOLSET MATCHES "v140") + set(SOLUTION_TYPE vc14) + elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141") + set(SOLUTION_TYPE vs2017) + elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v142") + set(SOLUTION_TYPE vs2019) + else() + set(SOLUTION_TYPE vs2022) + endif() + if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(MPC_STATIC_FLAG -static) + endif() + set(config_h_contents "#include \"ace/config-windows.h\"\n") +elseif(VCPKG_TARGET_IS_LINUX) + set(SOLUTION_TYPE gnuace) + set(config_h_contents "#include \"ace/config-linux.h\"\n") + file(WRITE "${ACE_ROOT}/include/makeinclude/platform_macros.GNU" "CCFLAGS += -fPIC\ninclude $(ACE_ROOT)/include/makeinclude/platform_linux.GNU") +elseif(VCPKG_TARGET_IS_OSX) + set(SOLUTION_TYPE gnuace) + set(config_h_contents "#include \"ace/config-macosx.h\"\n") + file(WRITE "${ACE_ROOT}/include/makeinclude/platform_macros.GNU" "include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU") +endif() + +if("wchar" IN_LIST FEATURES) + string(APPEND config_h_contents "#define ACE_USES_WCHAR 1\n") +endif() +file(WRITE "${ACE_SOURCE_PATH}/config.h" "${config_h_contents}") + +if(VCPKG_TARGET_IS_UWP) + set(MPC_VALUE_TEMPLATE -value_template link_options+=/APPCONTAINER) +endif() + +# Invoke mwc.pl to generate the necessary solution and project files +vcpkg_execute_build_process( + COMMAND ${PERL} "${ACE_ROOT}/bin/mwc.pl" -type ${SOLUTION_TYPE} -features "${ACE_FEATURES}" "${WORKSPACE}.mwc" ${MPC_STATIC_FLAG} ${MPC_VALUE_TEMPLATE} + WORKING_DIRECTORY "${ACE_ROOT}" + LOGNAME mwc-${TARGET_TRIPLET} +) + +if("xml" IN_LIST FEATURES) + vcpkg_execute_build_process( + COMMAND ${PERL} "${ACE_ROOT}/bin/mwc.pl" -type ${SOLUTION_TYPE} -features "${ACE_FEATURES}" "${ACE_ROOT}/ACEXML/ACEXML.mwc" ${MPC_STATIC_FLAG} ${MPC_VALUE_TEMPLATE} + WORKING_DIRECTORY "${ACE_ROOT}/ACEXML" + LOGNAME mwc-xml-${TARGET_TRIPLET} + ) +endif() + +if(VCPKG_TARGET_IS_WINDOWS) + if("tao" IN_LIST FEATURES OR "xml" IN_LIST FEATURES) + file(WRITE "${SOURCE_PATH}/Directory.Build.props" " + + + + /MP + ${ACE_ROOT} + + + ${CURRENT_PACKAGES_DIR}/lib;${CURRENT_PACKAGES_DIR}/debug/lib;${CURRENT_INSTALLED_DIR}/lib;${CURRENT_INSTALLED_DIR}/debug/lib + + + ") + endif() + + file(RELATIVE_PATH PROJECT_SUBPATH "${SOURCE_PATH}" "${WORKSPACE}.sln") + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH ${PROJECT_SUBPATH} + LICENSE_SUBPATH COPYING + PLATFORM ${MSBUILD_PLATFORM} + SKIP_CLEAN + ) + + # ACE itself does not define an install target, so it is not clear which + # headers are public and which not. For the moment we install everything + # that is in the source path and ends in .h, .inl + function(install_includes ORIGINAL_PATH RELATIVE_PATHS) + foreach(RELATIVE_PATH ${RELATIVE_PATHS}) + file( + GLOB + HEADER_FILES + "${ORIGINAL_PATH}/${RELATIVE_PATH}/*.h" + "${ORIGINAL_PATH}/${RELATIVE_PATH}/*.hpp" + "${ORIGINAL_PATH}/${RELATIVE_PATH}/*.inl" + "${ORIGINAL_PATH}/${RELATIVE_PATH}/*.cpp" + "${ORIGINAL_PATH}/${RELATIVE_PATH}/*.idl" + "${ORIGINAL_PATH}/${RELATIVE_PATH}/*.pidl") + file(INSTALL ${HEADER_FILES} + DESTINATION "${CURRENT_PACKAGES_DIR}/include/${RELATIVE_PATH}") + endforeach() + endfunction() + + get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME) + set(SOURCE_COPY_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}") + + # Install headers in subdirectory + set(ACE_INCLUDE_FOLDERS + "ace" + "ace/Compression" + "ace/Compression/rle" + "ace/ETCL" + "ace/QoS" + "ace/Monitor_Control" + "ace/os_include" + "ace/os_include/arpa" + "ace/os_include/net" + "ace/os_include/netinet" + "ace/os_include/sys") + install_includes("${SOURCE_COPY_PATH}" "${ACE_INCLUDE_FOLDERS}") + + if("ssl" IN_LIST FEATURES) + install_includes("${SOURCE_COPY_PATH}" "ace/SSL") + endif() + + if("tao" IN_LIST FEATURES) + set(ACEXML_INCLUDE_FOLDERS "ACEXML/apps/svcconf" "ACEXML/common" + "ACEXML/parser/parser") + install_includes("${SOURCE_COPY_PATH}" "${ACEXML_INCLUDE_FOLDERS}") + + set(ACE_PROTOCOLS_INCLUDE_FOLDERS "ace/HTBP" "ace/INet" "ace/RMCast" + "ace/TMCast") + install_includes("${SOURCE_COPY_PATH}/protocols" "${ACE_PROTOCOLS_INCLUDE_FOLDERS}") + + install_includes("${SOURCE_COPY_PATH}" "Kokyu") + + set(TAO_ORBSVCS_INCLUDE_FOLDERS + "orbsvcs" + "orbsvcs/AV" + "orbsvcs/Concurrency" + "orbsvcs/CosEvent" + "orbsvcs/Event" + "orbsvcs/FaultTolerance" + "orbsvcs/FtRtEvent/ClientORB" + "orbsvcs/FtRtEvent/EventChannel" + "orbsvcs/FtRtEvent/Utils" + "orbsvcs/HTIOP" + "orbsvcs/IFRService" + "orbsvcs/LifeCycle" + "orbsvcs/LoadBalancing" + "orbsvcs/Log" + "orbsvcs/Naming" + "orbsvcs/Naming/FaultTolerant" + "orbsvcs/Notify" + "orbsvcs/Notify/Any" + "orbsvcs/Notify/MonitorControl" + "orbsvcs/Notify/MonitorControlExt" + "orbsvcs/Notify/Sequence" + "orbsvcs/Notify/Structured" + "orbsvcs/PortableGroup" + "orbsvcs/Property" + "orbsvcs/Sched" + "orbsvcs/Security" + "orbsvcs/Time" + "orbsvcs/Trader") + if("ssl" IN_LIST FEATURES) + list(APPEND TAO_ORBSVCS_INCLUDE_FOLDERS "orbsvcs/SSLIOP") + endif() + install_includes("${SOURCE_COPY_PATH}/TAO/orbsvcs" "${TAO_ORBSVCS_INCLUDE_FOLDERS}") + + set(TAO_ROOT_ORBSVCS_INCLUDE_FOLDERS "orbsvcs/FT_ReplicationManager" + "orbsvcs/Notify_Service") + install_includes("${SOURCE_COPY_PATH}/TAO" "${TAO_ROOT_ORBSVCS_INCLUDE_FOLDERS}") + + set(TAO_INCLUDE_FOLDERS + "tao" + "tao/AnyTypeCode" + "tao/BiDir_GIOP" + "tao/CSD_Framework" + "tao/CSD_ThreadPool" + "tao/CodecFactory" + "tao/Codeset" + "tao/Compression" + "tao/Compression/rle" + "tao/DiffServPolicy" + "tao/DynamicAny" + "tao/DynamicInterface" + "tao/Dynamic_TP" + "tao/ETCL" + "tao/EndpointPolicy" + "tao/IFR_Client" + "tao/IORInterceptor" + "tao/IORManipulation" + "tao/IORTable" + "tao/ImR_Client" + "tao/Messaging" + "tao/Monitor" + "tao/ObjRefTemplate" + "tao/PI" + "tao/PI_Server" + "tao/PortableServer" + "tao/RTCORBA" + "tao/RTPortableServer" + "tao/RTScheduling" + "tao/SmartProxies" + "tao/Strategies" + "tao/TransportCurrent" + "tao/TypeCodeFactory" + "tao/Utils" + "tao/Valuetype" + "tao/ZIOP") + if("zlib" IN_LIST FEATURES) + list(APPEND TAO_INCLUDE_FOLDERS "tao/Compression/zlib") + endif() + install_includes("${SOURCE_COPY_PATH}/TAO" "${TAO_INCLUDE_FOLDERS}") + endif() + + if("xml" IN_LIST FEATURES) + file(RELATIVE_PATH PROJECT_SUBPATH_XML "${SOURCE_PATH}" "${ACE_ROOT}/ACEXML/ACEXML.sln") + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH ${PROJECT_SUBPATH_XML} + LICENSE_SUBPATH COPYING + PLATFORM ${MSBUILD_PLATFORM} + SKIP_CLEAN + ) + + set(ACEXML_INCLUDE_FOLDERS "ACEXML/common" + "ACEXML/parser/parser") + install_includes("${SOURCE_COPY_PATH}" "${ACEXML_INCLUDE_FOLDERS}") + endif() + + # Remove dlls without any export + if("tao" IN_LIST FEATURES OR "xml" IN_LIST FEATURES) + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(REMOVE + "${CURRENT_PACKAGES_DIR}/bin/ACEXML_XML_Svc_Conf_Parser.dll" + "${CURRENT_PACKAGES_DIR}/bin/ACEXML_XML_Svc_Conf_Parser.pdb" + "${CURRENT_PACKAGES_DIR}/debug/bin/ACEXML_XML_Svc_Conf_Parserd.dll" + "${CURRENT_PACKAGES_DIR}/debug/bin/ACEXML_XML_Svc_Conf_Parserd_dll.pdb") + endif() + endif() + + vcpkg_clean_msbuild() +elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) + FIND_PROGRAM(MAKE make) + IF (NOT MAKE) + MESSAGE(FATAL_ERROR "MAKE not found") + ENDIF () + + if("ssl" IN_LIST FEATURES) + list(APPEND _ace_makefile_macros "ssl=1") + endif() + + if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND _ace_makefile_macros "static_libs_only=1") + endif() + + set(ENV{INSTALL_PREFIX} "${CURRENT_PACKAGES_DIR}") + # Set `PWD` environment variable since ACE's `install` make target calculates install dir using this env. + set(_prev_env $ENV{PWD}) + get_filename_component(WORKING_DIR "${WORKSPACE}" DIRECTORY) + set(ENV{PWD} "${WORKING_DIR}") + + message(STATUS "Building ${TARGET_TRIPLET}-dbg") + vcpkg_execute_build_process( + COMMAND make ${_ace_makefile_macros} "debug=1" "optimize=0" "-j${VCPKG_CONCURRENCY}" + WORKING_DIRECTORY "${WORKING_DIR}" + LOGNAME make-${TARGET_TRIPLET}-dbg + ) + if("xml" IN_LIST FEATURES) + vcpkg_execute_build_process( + COMMAND make ${_ace_makefile_macros} "debug=1" "optimize=0" "-j${VCPKG_CONCURRENCY}" + WORKING_DIRECTORY "${WORKING_DIR}/ACEXML" + LOGNAME make-xml-${TARGET_TRIPLET}-dbg + ) + endif() + message(STATUS "Building ${TARGET_TRIPLET}-dbg done") + message(STATUS "Packaging ${TARGET_TRIPLET}-dbg") + vcpkg_execute_build_process( + COMMAND make ${_ace_makefile_macros} install + WORKING_DIRECTORY "${WORKING_DIR}" + LOGNAME install-${TARGET_TRIPLET}-dbg + ) + if("xml" IN_LIST FEATURES) + vcpkg_execute_build_process( + COMMAND make ${_ace_makefile_macros} install + WORKING_DIRECTORY "${WORKING_DIR}/ACEXML" + LOGNAME install-xml-${TARGET_TRIPLET}-dbg + ) + endif() + + file(COPY "${CURRENT_PACKAGES_DIR}/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") + + file(GLOB _pkg_components "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc") + foreach(_pkg_comp ${_pkg_components}) + file(READ ${_pkg_comp} _content) + string(REPLACE "libdir=${CURRENT_PACKAGES_DIR}/lib" "libdir=${CURRENT_PACKAGES_DIR}/debug/lib" _content ${_content}) + file(WRITE ${_pkg_comp} ${_content}) + endforeach() + message(STATUS "Packaging ${TARGET_TRIPLET}-dbg done") + + vcpkg_execute_build_process( + COMMAND make ${_ace_makefile_macros} realclean + WORKING_DIRECTORY "${WORKING_DIR}" + LOGNAME realclean-${TARGET_TRIPLET}-dbg + ) + if("xml" IN_LIST FEATURES) + vcpkg_execute_build_process( + COMMAND make ${_ace_makefile_macros} realclean + WORKING_DIRECTORY "${WORKING_DIR}/ACEXML" + LOGNAME realclean-xml-${TARGET_TRIPLET}-dbg + ) + endif() + + message(STATUS "Building ${TARGET_TRIPLET}-rel") + vcpkg_execute_build_process( + COMMAND make ${_ace_makefile_macros} "-j${VCPKG_CONCURRENCY}" + WORKING_DIRECTORY "${WORKING_DIR}" + LOGNAME make-${TARGET_TRIPLET}-rel + ) + if("xml" IN_LIST FEATURES) + vcpkg_execute_build_process( + COMMAND make ${_ace_makefile_macros} "-j${VCPKG_CONCURRENCY}" + WORKING_DIRECTORY "${WORKING_DIR}/ACEXML" + LOGNAME make-xml-${TARGET_TRIPLET}-rel + ) + endif() + message(STATUS "Building ${TARGET_TRIPLET}-rel done") + message(STATUS "Packaging ${TARGET_TRIPLET}-rel") + vcpkg_execute_build_process( + COMMAND make ${_ace_makefile_macros} install + WORKING_DIRECTORY "${WORKING_DIR}" + LOGNAME install-${TARGET_TRIPLET}-rel + ) + if("xml" IN_LIST FEATURES) + vcpkg_execute_build_process( + COMMAND make ${_ace_makefile_macros} install + WORKING_DIRECTORY "${WORKING_DIR}/ACEXML" + LOGNAME install-xml-${TARGET_TRIPLET}-rel + ) + endif() + if("tao" IN_LIST FEATURES) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + endif() + message(STATUS "Packaging ${TARGET_TRIPLET}-rel done") + # Restore `PWD` environment variable + set($ENV{PWD} _prev_env) + + # Handle copyright + file(INSTALL "${ACE_ROOT}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/ace/bin/MakeProjectCreator") + file(REMOVE "${CURRENT_PACKAGES_DIR}/share/ace/ace-devel.sh") +endif() + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/ace/vcpkg.json b/externals/vcpkg/ports/ace/vcpkg.json new file mode 100755 index 000000000..3d2ff0a71 --- /dev/null +++ b/externals/vcpkg/ports/ace/vcpkg.json @@ -0,0 +1,43 @@ +{ + "name": "ace", + "version": "7.0.6", + "port-version": 3, + "maintainers": "Johnny Willemsen ", + "description": "The ADAPTIVE Communication Environment", + "homepage": "https://www.dre.vanderbilt.edu/~schmidt/ACE.html", + "license": "DOC", + "features": { + "ssl": { + "description": "Enable SSL/TLS features in ACE", + "dependencies": [ + "openssl" + ] + }, + "tao": { + "description": "The ACE ORB" + }, + "wchar": { + "description": "Enable extra wide char functions in ACE" + }, + "xml": { + "description": "Enable XML features in ACE" + }, + "xml-utils": { + "description": "Include the ACE_XML_Utils library", + "dependencies": [ + { + "name": "xerces-c", + "features": [ + "xmlch-wchar" + ] + } + ] + }, + "zlib": { + "description": "Enable zlib support", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/activemq-cpp/FunctionLevelLinkingOn.diff b/externals/vcpkg/ports/activemq-cpp/FunctionLevelLinkingOn.diff new file mode 100755 index 000000000..8d00b1da6 --- /dev/null +++ b/externals/vcpkg/ports/activemq-cpp/FunctionLevelLinkingOn.diff @@ -0,0 +1,76 @@ +diff --git a/vs2010-build/activemq-cpp.vcxproj b/vs2010-build/activemq-cpp.vcxproj +index a43f072..54b4822 100644 +--- a/vs2010-build/activemq-cpp.vcxproj ++++ b/vs2010-build/activemq-cpp.vcxproj +@@ -2576,7 +2576,7 @@ + ../src/main;$(APR_DIST)\$(PlatformName)\include;$(OPENSSL_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include;%(AdditionalIncludeDirectories) + false + Default +- false ++ true + false + true + +@@ -2602,7 +2602,7 @@ + ../src/main;$(APR_DIST)\$(PlatformName)\include;$(OPENSSL_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include;%(AdditionalIncludeDirectories) + false + Default +- false ++ true + false + true + +@@ -2628,7 +2628,7 @@ + ../src/main;$(APR_DIST)\$(PlatformName)\include;$(OPENSSL_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include;%(AdditionalIncludeDirectories) + false + Default +- false ++ true + false + true + +@@ -2656,7 +2656,7 @@ + ../src/main;$(APR_DIST)\$(PlatformName)\include;$(OPENSSL_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include;%(AdditionalIncludeDirectories) + false + Default +- false ++ true + false + true + +@@ -2684,7 +2684,7 @@ + ../src/main;$(APR_DIST)\$(PlatformName)\include;$(OPENSSL_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include;%(AdditionalIncludeDirectories) + false + Default +- false ++ true + false + true + +@@ -2710,7 +2710,7 @@ + ../src/main;$(APR_DIST)\$(PlatformName)\include;$(OPENSSL_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include;%(AdditionalIncludeDirectories) + false + Default +- false ++ true + false + true + +@@ -2736,7 +2736,7 @@ + ../src/main;$(APR_DIST)\$(PlatformName)\include;$(OPENSSL_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include;%(AdditionalIncludeDirectories) + false + Default +- false ++ true + false + true + +@@ -2764,7 +2764,7 @@ + ../src/main;$(APR_DIST)\$(PlatformName)\include;$(OPENSSL_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include;%(AdditionalIncludeDirectories) + false + Default +- false ++ true + false + true + diff --git a/externals/vcpkg/ports/activemq-cpp/activemq-cppConfig.cmake b/externals/vcpkg/ports/activemq-cpp/activemq-cppConfig.cmake new file mode 100755 index 000000000..5719f9b6b --- /dev/null +++ b/externals/vcpkg/ports/activemq-cpp/activemq-cppConfig.cmake @@ -0,0 +1,319 @@ +set(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_DIR}") +foreach(i RANGE 1 2) + get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + if (_IMPORT_PREFIX STREQUAL "/") + set(_IMPORT_PREFIX "") + break() + endif() +endforeach() + +# Macro to find OS dependencies for windows builds. +# Sets up for failure find_package() failure if dependencies not found. +# On success, creates targets unofficial::activemq-cpp::ws2, unofficial::activemq-cpp::rpcrt4, and unofficial::activemq-cpp::mswsock. +# Sets boolean ${CMAKE_FIND_PACKAGE_NAME}_WINDOWS_DEPENDENCIES_FOUND to TRUE or FALSE to indicate success or failure. +macro(_activemq_cpp_windows_dependencies) + find_library(ACTIVEMQ_CPP_LIBWS2 WS2_32) + find_file(ACTIVEMQ_CPP_DLLWS2 WS2_32.dll) + find_library(ACTIVEMQ_CPP_LIBRPCRT4 RpcRT4) + find_file(ACTIVEMQ_CPP_DLLRPCRT4 RpcRT4.dll) + find_library(ACTIVEMQ_CPP_LIBMSWSOCK MsWsock) + find_file(ACTIVEMQ_CPP_DLLMSWSOCK MsWsock.dll) + if(ACTIVEMQ_CPP_LIBWS2 AND ACTIVEMQ_CPP_DLLWS2 AND ACTIVEMQ_CPP_LIBRPCRT4 AND ACTIVEMQ_CPP_DLLRPCRT4 AND ACTIVEMQ_CPP_LIBMSWSOCK AND ACTIVEMQ_CPP_DLLMSWSOCK) + add_library(unofficial::activemq-cpp::ws2 SHARED IMPORTED) + set_target_properties(unofficial::activemq-cpp::ws2 + PROPERTIES + IMPORTED_LOCATION "${ACTIVEMQ_CPP_DLLWS2}" + IMPORTED_IMPLIB "${ACTIVEMQ_CPP_LIBWS2}" + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + ) + add_library(unofficial::activemq-cpp::rpcrt4 SHARED IMPORTED) + set_target_properties(unofficial::activemq-cpp::rpcrt4 + PROPERTIES + IMPORTED_LOCATION "${ACTIVEMQ_CPP_DLLRPCRT4}" + IMPORTED_IMPLIB "${ACTIVEMQ_CPP_LIBRPCRT4}" + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + ) + add_library(unofficial::activemq-cpp::mswsock SHARED IMPORTED) + set_target_properties(unofficial::activemq-cpp::mswsock + PROPERTIES + IMPORTED_LOCATION "${ACTIVEMQ_CPP_DLLMSWSOCK}" + IMPORTED_IMPLIB "${ACTIVEMQ_CPP_LIBMSWSOCK}" + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + ) + set(${CMAKE_FIND_PACKAGE_NAME}_WINDOWS_DEPENDENCIES_FOUND TRUE) + else() + if (NOT ACTIVEMQ_CPP_LIBWS2) + list(APPEND _ACTIVEMQ_CPP_MISSINGS "WS2_32.lib") + endif() + if (NOT ACTIVEMQ_CPP_DLLWS2) + list(APPEND _ACTIVEMQ_CPP_MISSINGS "WS2_32.dll") + endif() + if (NOT ACTIVEMQ_CPP_LIBRPCRT4) + list(APPEND _ACTIVEMQ_CPP_MISSINGS "RpcRT4.lib") + endif() + if (NOT ACTIVEMQ_CPP_DLLRPCRT4) + list(APPEND _ACTIVEMQ_CPP_MISSINGS "RpcRT4.dll") + endif() + if (NOT ACTIVEMQ_CPP_LIBMSWSOCK) + list(APPEND _ACTIVEMQ_CPP_MISSINGS "MsWsock.lib") + endif() + if (NOT ACTIVEMQ_CPP_DLLMSWSOCK) + list(APPEND _ACTIVEMQ_CPP_MISSINGS "MsWsock.dll") + endif() + list(JOIN _ACTIVEMQ_CPP_MISSINGS ", " _ACTIVEMQ_CPP_MISSINGS_STR) + list(LENGTH _ACTIVEMQ_CPP_MISSINGS _ACTIVEMQ_CPP_MISSINGS_COUNT) + if(_ACTIVEMQ_CPP_MISSINGS_COUNT EQUALS 1) + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install dependency failure: Did not find windows dependency: ${_ACTIVEMQ_CPP_MISSINGS_STR}") + else() + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install dependency failure: Did not find windows dependencies: ${_ACTIVEMQ_CPP_MISSINGS_STR}") + endif() + set(_ACTIVEMQ_CPP_MISSINGS_COUNT) + set(_ACTIVEMQ_CPP_MISSINGS_STR) + set(_ACTIVEMQ_CPP_MISSINGS) + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + set(${CMAKE_FIND_PACKAGE_NAME}_WINDOWS_DEPENDENCIES_FOUND FALSE) + endif() +endmacro() + +# Set the variable named VARNAME to "${FILE}" if the file FILE exists; clears it +# otherwise. Opposite for VARNAME_MISSING. +function(_set_exists VARNAME VARNAME_MISSING FILE) + if (EXISTS "${FILE}") + set(${VARNAME} "${FILE}" PARENT_SCOPE) + unset(${VARNAME_MISSING} PARENT_SCOPE) + else() + set(${VARNAME_MISSING} "${FILE}" PARENT_SCOPE) + unset(${VARNAME} PARENT_SCOPE) + endif() +endfunction() + +# Add the unofficial::activemq-cpp::apr and unofficial::activemq-cpp::activemq-cpp targets +# Doesn't work for Windows DLL installs because that takes more args... +function(_add_apr_and_amq_targets INC_PARENT LIB_TYPE APR_REL APR_DEB AMQ_REL AMQ_DEB DEPS) + # the APR port doesn't have a CMake config target so create one + add_library(unofficial::activemq-cpp::apr ${LIB_TYPE} IMPORTED) + set_target_properties(unofficial::activemq-cpp::apr + PROPERTIES + MAP_IMPORTED_CONFIG_MINSIZEREL Release + MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release + IMPORTED_LOCATION_RELEASE "${APR_REL}" + IMPORTED_LOCATION_DEBUG "${APR_DEB}" + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + INTERFACE_INCLUDE_DIRECTORIES "${INC_PARENT}/include" + ) + + # the create the activemq-cpp CMake config target with a dependency on apr + add_library(unofficial::activemq-cpp::activemq-cpp ${LIB_TYPE} IMPORTED) + set_target_properties(unofficial::activemq-cpp::activemq-cpp + PROPERTIES + MAP_IMPORTED_CONFIG_MINSIZEREL Release + MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release + IMPORTED_LOCATION_DEBUG "${AMQ_DEB}" + IMPORTED_LOCATION_RELEASE "${AMQ_REL}" + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + INTERFACE_INCLUDE_DIRECTORIES "${INC_PARENT}/include" + INTERFACE_LINK_LIBRARIES "${DEPS}" + ) +endfunction() + +# +# Since this is a CMake config file for a non-CMake project, and one that is +# for vcpkg to as well, the config file has to cover the various products of +# the builds on the various platforms. +# +# Below, Windows and Linux are covered for static and shared libraries. +# +_set_exists(ACTIVEMQ_CPP_DLL_RELEASE _ACTIVEMQ_CPP_DLL_RELEASE_MISSING "${_IMPORT_PREFIX}/bin/activemq-cpp.dll") +_set_exists(ACTIVEMQ_CPP_LIB_RELEASE _ACTIVEMQ_CPP_LIB_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/activemq-cpp.lib") +_set_exists(ACTIVEMQ_CPP_DLL_DEBUG _ACTIVEMQ_CPP_DLL_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/bin/activemq-cppd.dll") +_set_exists(ACTIVEMQ_CPP_LIB_DEBUG _ACTIVEMQ_CPP_LIB_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/activemq-cppd.lib") +if (ACTIVEMQ_CPP_DLL_RELEASE) + # + # Windows shared install + # + if (ACTIVEMQ_CPP_LIB_RELEASE AND ACTIVEMQ_CPP_DLL_DEBUG AND ACTIVEMQ_CPP_LIB_DEBUG) + _set_exists(ACTIVEMQ_CPP_APR_LIB_RELEASE _ACTIVEMQ_CPP_APR_LIB_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/libapr-1.lib") + _set_exists(ACTIVEMQ_CPP_APR_DLL_RELEASE _ACTIVEMQ_CPP_APR_DLL_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/libapr-1.dll") + _set_exists(ACTIVEMQ_CPP_APR_LIB_DEBUG _ACTIVEMQ_CPP_APR_LIB_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/libapr-1.lib") + _set_exists(ACTIVEMQ_CPP_APR_DLL_DEBUG _ACTIVEMQ_CPP_APR_DLL_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/libapr-1.dll") + if (ACTIVEMQ_CPP_APR_LIB_RELEASE AND ACTIVEMQ_CPP_APR_DLL_RELEASE AND ACTIVEMQ_CPP_APR_LIB_DEBUG AND ACTIVEMQ_CPP_APR_DLL_DEBUG) + _activemq_cpp_windows_dependencies() + if (${CMAKE_FIND_PACKAGE_NAME}_WINDOWS_DEPENDENCIES_FOUND) + # the APR port doesn't have a CMake config target so create one + add_library(unofficial::activemq-cpp::apr SHARED IMPORTED) + set_target_properties(unofficial::activemq-cpp::apr + PROPERTIES + MAP_IMPORTED_CONFIG_MINSIZEREL Release + MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release + IMPORTED_LOCATION_RELEASE "${ACTIVEMQ_CPP_APR_DLL_RELEASE}" + IMPORTED_IMPLIB_RELEASE "${ACTIVEMQ_CPP_APR_LIB_RELEASE}" + IMPORTED_LOCATION_DEBUG "${ACTIVEMQ_CPP_APR_DLL_DEBUG}" + IMPORTED_IMPLIB_DEBUG "${ACTIVEMQ_CPP_APR_LIB_DEBUG}" + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" + ) + + # the create the activemq-cpp CMake config target with a dependency on apr + add_library(unofficial::activemq-cpp::activemq-cpp SHARED IMPORTED) + set_target_properties(unofficial::activemq-cpp::activemq-cpp + PROPERTIES + MAP_IMPORTED_CONFIG_MINSIZEREL Release + MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release + IMPORTED_LOCATION_RELEASE "${ACTIVEMQ_CPP_DLL_RELEASE}" + IMPORTED_IMPLIB_RELEASE "${ACTIVEMQ_CPP_LIB_RELEASE}" + IMPORTED_LOCATION_DEBUG "${ACTIVEMQ_CPP_DLL_DEBUG}" + IMPORTED_IMPLIB_DEBUG "${ACTIVEMQ_CPP_LIB_DEBUG}" + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" + INTERFACE_LINK_LIBRARIES "unofficial::activemq-cpp::apr;unofficial::activemq-cpp::ws2;unofficial::activemq-cpp::rpcrt4;unofficial::activemq-cpp::mswsock" + ) + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND TRUE) + endif() + else() + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install dependency failure: apr vcpkg port not found in ${_IMPORT_PREFIX}.") + foreach(_MISSING + ${_ACTIVEMQ_CPP_APR_LIB_RELEASE_MISSING} + ${_ACTIVEMQ_CPP_APR_DLL_RELEASE_MISSING} + ${_ACTIVEMQ_CPP_APR_LIB_DEBUG_MISSING} + ${_ACTIVEMQ_CPP_APR_DLL_DEBUG_MISSING} + ) + string(APPEND ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE " \"${_MISSING}\" not found.") + endforeach() + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + set(activemq-cppConfig_FOUND TRUE) + endif() + else() + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install error: Found ${_IMPORT_PREFIX}debug/bin/activemq-cppd.dll.") + foreach(_MISSING + ${_ACTIVEMQ_CPP_LIB_RELEASE_MISSING} + ${_ACTIVEMQ_CPP_DLL_DEBUG_MISSING} + ${_ACTIVEMQ_CPP_LIB_DEBUG_MISSING}) + string(APPEND ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE " \"${_MISSING}\" not found.") + endforeach() + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + endif() +else() + # + # not Windows shared install + # + _set_exists(ACTIVEMQ_CPP_LIB_RELEASE _ACTIVEMQ_CPP_LIB_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/libactivemq-cpp.lib") + _set_exists(ACTIVEMQ_CPP_LIB_DEBUG _ACTIVEMQ_CPP_LIB_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/libactivemq-cpp.lib") + if (ACTIVEMQ_CPP_LIB_RELEASE) + # + # Windows static install + # + if (ACTIVEMQ_CPP_LIB_DEBUG) + _set_exists(ACTIVEMQ_CPP_APR_LIB_RELEASE _ACTIVEMQ_CPP_APR_LIB_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/apr-1.lib") + _set_exists(ACTIVEMQ_CPP_APR_LIB_DEBUG _ACTIVEMQ_CPP_APR_LIB_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/apr-1.lib") + if (ACTIVEMQ_CPP_APR_LIB_RELEASE AND ACTIVEMQ_CPP_APR_LIB_DEBUG) + _activemq_cpp_windows_dependencies() + if (${CMAKE_FIND_PACKAGE_NAME}_WINDOWS_DEPENDENCIES_FOUND) + _add_apr_and_amq_targets("${_IMPORT_PREFIX}" + STATIC + "${ACTIVEMQ_CPP_APR_LIB_RELEASE}" + "${ACTIVEMQ_CPP_APR_LIB_DEBUG}" + "${ACTIVEMQ_CPP_LIB_RELEASE}" + "${ACTIVEMQ_CPP_LIB_DEBUG}" + "unofficial::activemq-cpp::apr;unofficial::activemq-cpp::ws2;unofficial::activemq-cpp::rpcrt4;unofficial::activemq-cpp::mswsock") + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND TRUE) + endif() + else() + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install dependency failure: apr vcpkg port not found in ${_IMPORT_PREFIX}.") + foreach(_MISSING ${_ACTIVEMQ_CPP_APR_LIB_RELEASE_MISSING} ${_ACTIVEMQ_CPP_APR_LIB_DEBUG_MISSING}) + string(APPEND ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE " \"${_MISSING}\" not found.") + endforeach() + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + endif() + else() + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install error: Found ${ACTIVEMQ_CPP_LIB_RELEASE} but not ${_ACTIVEMQ_CPP_LIB_DEBUG_MISSING}.") + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + endif() + else() + # + # not Windows shared or static install + # + _set_exists(ACTIVEMQ_CPP_LIB_RELEASE _ACTIVEMQ_CPP_LIB_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/libactivemq-cpp.so.19.0.5") + _set_exists(ACTIVEMQ_CPP_LIB_DEBUG _ACTIVEMQ_CPP_LIB_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/libactivemq-cpp.so.19.0.5") + if(ACTIVEMQ_CPP_LIB_RELEASE) + # + # Linux shared install (this may pick up some other Unix-like installs) + # + if (ACTIVEMQ_CPP_LIB_DEBUG) + _set_exists(ACTIVEMQ_CPP_APR_LIB_RELEASE _ACTIVEMQ_CPP_APR_LIB_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/libapr-1.so") + _set_exists(ACTIVEMQ_CPP_APR_LIB_DEBUG _ACTIVEMQ_CPP_APR_LIB_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/libapr-1.so") + if (ACTIVEMQ_CPP_APR_LIB_RELEASE AND ACTIVEMQ_CPP_APR_LIB_DEBUG) + find_package(Threads) + if (Threads_FOUND) + _add_apr_and_amq_targets("${_IMPORT_PREFIX}" + SHARED + "${ACTIVEMQ_CPP_APR_LIB_RELEASE}" + "${ACTIVEMQ_CPP_APR_LIB_DEBUG}" + "${ACTIVEMQ_CPP_LIB_RELEASE}" + "${ACTIVEMQ_CPP_LIB_DEBUG}" + "unofficial::activemq-cpp::apr;Threads::Threads") + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND TRUE) + else() + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install dependency failure: threads library not found.") + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + endif() + else() + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install dependency failure: apr vcpkg port not found in ${_IMPORT_PREFIX}.") + foreach(_MISSING ${_ACTIVEMQ_CPP_APR_LIB_RELEASE_MISSING} ${_ACTIVEMQ_CPP_APR_LIB_DEBUG_MISSING}) + string(APPEND ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE " \"${_MISSING}\" not found.") + endforeach() + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + endif() + else() + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install error: Found ${ACTIVEMQ_CPP_LIB_RELEASE} but not ${_ACTIVEMQ_CPP_LIB_DEBUG_MISSING}") + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + endif() + else() + # + # not Windows shared or static or Linux shared install + # + _set_exists(ACTIVEMQ_CPP_LIB_RELEASE _ACTIVEMQ_CPP_LIB_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/libactivemq-cpp.a") + _set_exists(ACTIVEMQ_CPP_LIB_DEBUG _ACTIVEMQ_CPP_LIB_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/libactivemq-cpp.a") + if (ACTIVEMQ_CPP_LIB_RELEASE) + # + # Linux static install (this may pick up some other Unix-like installs) + # + if (ACTIVEMQ_CPP_LIB_DEBUG) + _set_exists(ACTIVEMQ_CPP_APR_LIB_RELEASE _ACTIVEMQ_CPP_APR_LIB_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/libapr-1.a") + _set_exists(ACTIVEMQ_CPP_APR_LIB_DEBUG _ACTIVEMQ_CPP_APR_LIB_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/libapr-1.a") + if (ACTIVEMQ_CPP_APR_LIB_RELEASE AND ACTIVEMQ_CPP_APR_LIB_DEBUG) + find_package(Threads) + if (Threads_FOUND) + _add_apr_and_amq_targets("${_IMPORT_PREFIX}" + STATIC + "${ACTIVEMQ_CPP_APR_LIB_RELEASE}" + "${ACTIVEMQ_CPP_APR_LIB_DEBUG}" + "${ACTIVEMQ_CPP_LIB_RELEASE}" + "${ACTIVEMQ_CPP_LIB_DEBUG}" + "unofficial::activemq-cpp::apr;Threads::Threads") + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND TRUE) + else() + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install dependency failure: threads library not found.") + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + endif() + else() + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install dependency failure: apr vcpkg port not found in ${_IMPORT_PREFIX}.") + foreach(_MISSING ${_ACTIVEMQ_CPP_APR_LIB_RELEASE_MISSING} ${_ACTIVEMQ_CPP_APR_LIB_DEBUG_MISSING}) + string(APPEND ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE " \"${_MISSING}\" not found.") + endforeach() + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + endif() + else() + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install error: Found ${ACTIVEMQ_CPP_LIB_RELEASE} but not ${_ACTIVEMQ_CPP_LIB_DEBUG_MISSING}") + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + endif() + else() + # + # Some other configuration... + # (not Windows shared or static or Linux shared or static install) + # + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg unexpected install: could not find any expected activemq-cpp libraries under ${_IMPORT_PREFIX}. The CMake configuration file only understands Windows and Linux static and shared installs from vcpkg.") + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + endif() + endif() + endif() +endif() diff --git a/externals/vcpkg/ports/activemq-cpp/fix-crt-linkage-dyn.patch b/externals/vcpkg/ports/activemq-cpp/fix-crt-linkage-dyn.patch new file mode 100755 index 000000000..c2a3a399e --- /dev/null +++ b/externals/vcpkg/ports/activemq-cpp/fix-crt-linkage-dyn.patch @@ -0,0 +1,36 @@ +diff --git a/vs2010-build/activemq-cpp.vcxproj b/vs2010-build/activemq-cpp.vcxproj +index 54b4822..6b35511 100644 +--- a/vs2010-build/activemq-cpp.vcxproj ++++ b/vs2010-build/activemq-cpp.vcxproj +@@ -2578,6 +2578,7 @@ + Default + true + false ++ MultiThreadedDebugDLL + true + + +@@ -2687,6 +2688,7 @@ + true + false + true ++ MultiThreadedDebugDLL + + + +@@ -2794,6 +2796,7 @@ + ../src/main;$(APR_DIST)\$(PlatformName)\include;$(OPENSSL_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include;%(AdditionalIncludeDirectories) + false + true ++ MultiThreadedDLL + + + +@@ -2906,6 +2909,7 @@ + ../src/main;$(APR_DIST)\$(PlatformName)\include;$(OPENSSL_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include;%(AdditionalIncludeDirectories) + false + true ++ MultiThreadedDLL + + + diff --git a/externals/vcpkg/ports/activemq-cpp/fix-crt-linkage.patch b/externals/vcpkg/ports/activemq-cpp/fix-crt-linkage.patch new file mode 100755 index 000000000..fcb74fda7 --- /dev/null +++ b/externals/vcpkg/ports/activemq-cpp/fix-crt-linkage.patch @@ -0,0 +1,36 @@ +diff --git a/vs2010-build/activemq-cpp.vcxproj b/vs2010-build/activemq-cpp.vcxproj +index 54b4822..6b35511 100644 +--- a/vs2010-build/activemq-cpp.vcxproj ++++ b/vs2010-build/activemq-cpp.vcxproj +@@ -2578,6 +2578,7 @@ + Default + true + false ++ MultiThreadedDebug + true + + +@@ -2687,6 +2688,7 @@ + true + false + true ++ MultiThreadedDebug + + + +@@ -2794,6 +2796,7 @@ + ../src/main;$(APR_DIST)\$(PlatformName)\include;$(OPENSSL_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include;%(AdditionalIncludeDirectories) + false + true ++ MultiThreaded + + + +@@ -2906,6 +2909,7 @@ + ../src/main;$(APR_DIST)\$(PlatformName)\include;$(OPENSSL_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include;%(AdditionalIncludeDirectories) + false + true ++ MultiThreaded + + + diff --git a/externals/vcpkg/ports/activemq-cpp/portfile.cmake b/externals/vcpkg/ports/activemq-cpp/portfile.cmake new file mode 100755 index 000000000..595326c51 --- /dev/null +++ b/externals/vcpkg/ports/activemq-cpp/portfile.cmake @@ -0,0 +1,138 @@ +set(VERSION 3.9.5) + +set(PATCHES ) +if (NOT VCPKG_TARGET_IS_LINUX) + set(PATCHES FunctionLevelLinkingOn.diff) + if(VCPKG_CRT_LINKAGE STREQUAL "static") + list(APPEND PATCHES fix-crt-linkage.patch) + else() + list(APPEND PATCHES fix-crt-linkage-dyn.patch) + endif() +endif() + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.apache.org/dist/activemq/activemq-cpp/${VERSION}/activemq-cpp-library-${VERSION}-src.tar.bz2" + FILENAME "activemq-cpp-library-${VERSION}-src.tar.bz2" + SHA512 83692d3dfd5ecf557fc88d204a03bf169ce6180bcff27be41b09409b8f7793368ffbeed42d98ef6374c6b6b477d9beb8a4a9ac584df9e56725ec59ceceaa6ae2 +) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES ${PATCHES} +) + +if (VCPKG_TARGET_IS_LINUX) + vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + "--with-openssl=${CURRENT_INSTALLED_DIR}" + "--with-apr=${CURRENT_INSTALLED_DIR}/tools/apr" + ) + + vcpkg_install_make() + + file(RENAME "${CURRENT_PACKAGES_DIR}/include/activemq-cpp-${VERSION}/activemq" "${CURRENT_PACKAGES_DIR}/include/activemq") + file(RENAME "${CURRENT_PACKAGES_DIR}/include/activemq-cpp-${VERSION}/cms" "${CURRENT_PACKAGES_DIR}/include/cms") + file(RENAME "${CURRENT_PACKAGES_DIR}/include/activemq-cpp-${VERSION}/decaf" "${CURRENT_PACKAGES_DIR}/include/decaf") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/activemq-cpp-${VERSION}") + + vcpkg_copy_pdbs() + + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/activemqcpp-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/activemqcpp-config" "${CURRENT_INSTALLED_DIR}/debug" "`dirname $0`/../../../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/activemqcpp-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") + endif() +else() + set(ACTIVEMQCPP_MSVC_PROJ "${SOURCE_PATH}/vs2010-build/activemq-cpp.vcxproj") + + string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ACTIVEMQCPP_SHARED_LIB) + + if (ACTIVEMQCPP_SHARED_LIB) + set(RELEASE_CONF "ReleaseDLL") + set(DEBUG_CONF "DebugDLL") + + set(ACTIVEMQCPP_LIB_PREFFIX ) + set(ACTIVEMQCPP_LIB_SUFFIX d) + vcpkg_replace_string("${ACTIVEMQCPP_MSVC_PROJ}" ";apr-1.lib" ";libapr-1.lib") + else() + set(RELEASE_CONF "Release") + set(DEBUG_CONF "Debug") + + set(ACTIVEMQCPP_LIB_PREFFIX lib) + set(ACTIVEMQCPP_LIB_SUFFIX ) + vcpkg_replace_string("${ACTIVEMQCPP_MSVC_PROJ}" ";libapr-1.lib" ";apr-1.lib") + endif() + + if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") + set(BUILD_ARCH "Win32") + elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "x64") + set(BUILD_ARCH "x64") + else() + message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") + endif() + + string(REPLACE "/" "\\" WIN_SOURCE_PATH "${SOURCE_PATH}") + vcpkg_replace_string("${ACTIVEMQCPP_MSVC_PROJ}" "ClCompile Include=\"..\\src" "ClCompile Include=\"${WIN_SOURCE_PATH}\\src") + vcpkg_replace_string("${ACTIVEMQCPP_MSVC_PROJ}" "ClInclude Include=\"..\\src" "ClInclude Include=\"${WIN_SOURCE_PATH}\\src") + vcpkg_replace_string("${ACTIVEMQCPP_MSVC_PROJ}" "../src/main" "${WIN_SOURCE_PATH}\\src\\main") + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}/vs2010-build" + PROJECT_SUBPATH "activemq-cpp.vcxproj" + RELEASE_CONFIGURATION ${RELEASE_CONF} + DEBUG_CONFIGURATION ${DEBUG_CONF} + PLATFORM ${BUILD_ARCH} + USE_VCPKG_INTEGRATION + ALLOW_ROOT_INCLUDES + SKIP_CLEAN + ) + + vcpkg_copy_pdbs() + + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(COPY + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vs2010-build/${BUILD_ARCH}/${RELEASE_CONF}/${ACTIVEMQCPP_LIB_PREFFIX}activemq-cpp.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib" + ) + + if (ACTIVEMQCPP_SHARED_LIB) + file(COPY + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vs2010-build/${BUILD_ARCH}/${RELEASE_CONF}/activemq-cpp.dll" + DESTINATION "${CURRENT_PACKAGES_DIR}/bin" + ) + file(COPY + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vs2010-build/${BUILD_ARCH}/${RELEASE_CONF}/activemq-cpp.pdb" + DESTINATION "${CURRENT_PACKAGES_DIR}/bin" + ) + endif() + endif() + + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(COPY + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/${ACTIVEMQCPP_LIB_PREFFIX}activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" + ) + + if (ACTIVEMQCPP_SHARED_LIB) + file(COPY + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.dll" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" + ) + file(COPY + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.pdb" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" + ) + endif() + endif() + + file(COPY "${SOURCE_PATH}/src/main/activemq" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN *.h) + file(COPY "${SOURCE_PATH}/src/main/cms" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN *.h) + file(COPY "${SOURCE_PATH}/src/main/decaf" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN *.h) + vcpkg_clean_msbuild() +endif() + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${CURRENT_PORT_DIR}/activemq-cppConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/activemq-cpp") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/activemq-cpp/vcpkg.json b/externals/vcpkg/ports/activemq-cpp/vcpkg.json new file mode 100755 index 000000000..112861100 --- /dev/null +++ b/externals/vcpkg/ports/activemq-cpp/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "activemq-cpp", + "version-semver": "3.9.5", + "port-version": 9, + "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.", + "supports": "!(uwp | osx)", + "dependencies": [ + "apr", + { + "name": "libuuid", + "platform": "!windows & !osx" + } + ] +} diff --git a/externals/vcpkg/ports/ade/portfile.cmake b/externals/vcpkg/ports/ade/portfile.cmake new file mode 100755 index 000000000..7af58d539 --- /dev/null +++ b/externals/vcpkg/ports/ade/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO opencv/ade + REF v0.1.1f + SHA512 fbdec8f3d5811a573abb81f1ceb6fb8d40274439013f749645db5430c6d9cdc52227c25203f1a68177b263d648bb65197ea7c2bea7871264a06585e59892631c + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DCMAKE_DEBUG_POSTFIX=d +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ade RENAME copyright) diff --git a/externals/vcpkg/ports/ade/vcpkg.json b/externals/vcpkg/ports/ade/vcpkg.json new file mode 100755 index 000000000..53fb3606d --- /dev/null +++ b/externals/vcpkg/ports/ade/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "ade", + "version-string": "0.1.1f", + "port-version": 2, + "description": "ADE Framework is a graph construction, manipulation, and processing framework. ADE Framework is suitable for organizing data flow processing and execution." +} diff --git a/externals/vcpkg/ports/advobfuscator/portfile.cmake b/externals/vcpkg/ports/advobfuscator/portfile.cmake new file mode 100755 index 000000000..883ac4865 --- /dev/null +++ b/externals/vcpkg/ports/advobfuscator/portfile.cmake @@ -0,0 +1,14 @@ +# Download the code from GitHub +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO andrivet/ADVobfuscator + REF 1852a0eb75b03ab3139af7f938dfb617c292c600 + SHA512 1bca72b21a3cbf9d8db21fb21d112dd4ca83cac695abfb8fc3d8065245a0cc84cb9e41eb9ff81481e8e0a9d214ff6f5c9aec5d1ba8a9d4387b08dd895ecf1cd5 + HEAD_REF master +) + +# Install the header only source files to the right location +file(INSTALL ${SOURCE_PATH}/Lib DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# The README.md conains the LICENSE details +file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/advobfuscator/vcpkg.json b/externals/vcpkg/ports/advobfuscator/vcpkg.json new file mode 100755 index 000000000..370f98a85 --- /dev/null +++ b/externals/vcpkg/ports/advobfuscator/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "advobfuscator", + "version-date": "2020-06-26", + "description": "Obfuscation library based on C++11/14 and metaprogramming", + "dependencies": [ + "boost-msm" + ] +} diff --git a/externals/vcpkg/ports/air-ctl/portfile.cmake b/externals/vcpkg/ports/air-ctl/portfile.cmake new file mode 100755 index 000000000..bad81491b --- /dev/null +++ b/externals/vcpkg/ports/air-ctl/portfile.cmake @@ -0,0 +1,17 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO inie0722/CTL + REF 58ca0f229aff093ada66955993cada93e01da18c #1.0.0 + SHA512 6e1fcd70be0750b3e45de80d6fb30471fdbd8bbd23afd7ff9fb8c3b9fe61669cd02773cf2b6573348dd2905a303845627d3f5f3e647f4e1261db4cc570cf5099 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/air-ctl/vcpkg.json b/externals/vcpkg/ports/air-ctl/vcpkg.json new file mode 100755 index 000000000..ea99269c2 --- /dev/null +++ b/externals/vcpkg/ports/air-ctl/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "air-ctl", + "version": "1.0.0", + "port-version": 1, + "description": "C template container library", + "homepage": "https://github.com/inie0722/CTL", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/aixlog/portfile.cmake b/externals/vcpkg/ports/aixlog/portfile.cmake new file mode 100755 index 000000000..2092d84ca --- /dev/null +++ b/externals/vcpkg/ports/aixlog/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO badaix/aixlog + REF fd4a341740ee840092963de852584ec8ff811c4f # v1.5.0 + SHA512 10ab07dcb1e67064c0d69ddcf9289d79d914c70fe6922f32179f9ac38d5c682a4ebe08b686d8160c699a6b966bc7aa2fd7d0268664570a10ce146850e78b292d +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLE=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/aixlog/vcpkg.json b/externals/vcpkg/ports/aixlog/vcpkg.json new file mode 100755 index 000000000..6670f4d9b --- /dev/null +++ b/externals/vcpkg/ports/aixlog/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "aixlog", + "version": "1.5.0", + "port-version": 1, + "description": "Header-only C++ logging library", + "homepage": "https://github.com/badaix/aixlog", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/akali/portfile.cmake b/externals/vcpkg/ports/akali/portfile.cmake new file mode 100755 index 000000000..3ed9ff364 --- /dev/null +++ b/externals/vcpkg/ports/akali/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO winsoft666/akali + REF 2e35164a9a2a48a50af06c8ae59fcad0f4d6584e + SHA512 103c4da3d318d7ae7da4821e58eced918c9d64dbc6d97e9e6c15fa69731331cf6160f593437366cb3a844fa292a8d875e3e63a679e7fbdeae22bb4d73e3d3144 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AKALI_STATIC) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DAKALI_STATIC:BOOL=${AKALI_STATIC} + -DBUILD_TESTS:BOOL=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/akali") + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/akali) +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/share/akali") + vcpkg_cmake_config_fixup(CONFIG_PATH share/akali) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h" "#ifdef AKALI_STATIC" "#if 1") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h" "#ifdef AKALI_STATIC" "#if 0") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + + diff --git a/externals/vcpkg/ports/akali/vcpkg.json b/externals/vcpkg/ports/akali/vcpkg.json new file mode 100755 index 000000000..c06a223e7 --- /dev/null +++ b/externals/vcpkg/ports/akali/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "akali", + "version": "1.43", + "port-version": 1, + "description": "C++ Common Library.", + "homepage": "https://github.com/winsoft666/akali", + "license": "MIT", + "supports": "!(arm | arm64 | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/alac-decoder/CMakeLists.txt b/externals/vcpkg/ports/alac-decoder/CMakeLists.txt new file mode 100755 index 000000000..a7c62f648 --- /dev/null +++ b/externals/vcpkg/ports/alac-decoder/CMakeLists.txt @@ -0,0 +1,48 @@ +cmake_minimum_required (VERSION 3.9) +project (alac_decoder) + +set(HEADERS + decomp.h + demux.h + stream.h + wavwriter.h +) + +set (SRCS + decomp.c + alac.c + demux.c + stream.c + wavwriter.c +) + +if(MSVC) + add_compile_options(/W4 -D_CRT_SECURE_NO_WARNINGS -DTARGET_OS_WIN32) +else() + add_compile_options(-Wno-error=implicit-function-declaration) +endif() + +include_directories(.) + +add_library(libalac_decoder ${SRCS}) + +add_executable(alac_decoder main.c) +target_link_libraries(alac_decoder libalac_decoder) + +install( + TARGETS libalac_decoder + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_TOOLS) + install ( + TARGETS alac_decoder + RUNTIME DESTINATION tools/alac-decoder + ) +endif() + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES ${HEADERS} DESTINATION include/alac_decoder) +endif() diff --git a/externals/vcpkg/ports/alac-decoder/decomp.c b/externals/vcpkg/ports/alac-decoder/decomp.c new file mode 100755 index 000000000..a76953325 --- /dev/null +++ b/externals/vcpkg/ports/alac-decoder/decomp.c @@ -0,0 +1,11 @@ +#include "decomp.h" +#include + +int set_endian() +{ + uint32_t integer = 0x000000aa; + unsigned char *p = (unsigned char*)&integer; + + if (p[0] == 0xaa) return 0; + else return 1; +} diff --git a/externals/vcpkg/ports/alac-decoder/no-pragma-warning.patch b/externals/vcpkg/ports/alac-decoder/no-pragma-warning.patch new file mode 100755 index 000000000..1dc7c0687 --- /dev/null +++ b/externals/vcpkg/ports/alac-decoder/no-pragma-warning.patch @@ -0,0 +1,14 @@ +diff --git a/alac.c b/alac.c +index b829e29..8e8805f 100644 +--- a/alac.c ++++ b/alac.c +@@ -284,7 +284,9 @@ static int count_leading_zeros(int input) + return output; + } + #else ++#if !defined(_MSC_VER) + #warning using generic count leading zeroes. You may wish to write one for your CPU / compiler ++#endif + static int count_leading_zeros(int input) + { + int output = 0; diff --git a/externals/vcpkg/ports/alac-decoder/portfile.cmake b/externals/vcpkg/ports/alac-decoder/portfile.cmake new file mode 100755 index 000000000..15c8152b3 --- /dev/null +++ b/externals/vcpkg/ports/alac-decoder/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_download_distfile(ARCHIVE + URLS "https://distfiles.macports.org/alac_decoder/alac_decoder-0.2.0.tgz" + FILENAME "alac_decoder-0.2.0.tgz" + SHA512 4b37d4fe37681bfccaa4a27fbaf11eb2a1fba5f14e77d219a6d9814ff44d1168534d05eb19443dd2fd11e6fcdf4da3a22e3f3c79314cb7a6767c152351b13e29 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + remove_stdint_headers.patch + no-pragma-warning.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/decomp.c DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON + -DDISABLE_INSTALL_TOOLS=ON +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + +file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/alac-decoder/remove_stdint_headers.patch b/externals/vcpkg/ports/alac-decoder/remove_stdint_headers.patch new file mode 100755 index 000000000..834b808cc --- /dev/null +++ b/externals/vcpkg/ports/alac-decoder/remove_stdint_headers.patch @@ -0,0 +1,193 @@ +diff --git a/alac.c b/alac.c +index 469000d..c6fe479 100644 +--- a/alac.c ++++ b/alac.c +@@ -33,11 +33,7 @@ + #include + #include + #include +-#ifdef _WIN32 +- #include "stdint_win.h" +-#else +- #include +-#endif ++#include + + #include "decomp.h" + +@@ -54,7 +50,7 @@ + struct {signed int x:24;} se_struct_24; + #define SignExtend24(val) (se_struct_24.x = val) + +-extern int host_bigendian; ++#define host_bigendian set_endian() + + struct alac_file + { +diff --git a/decomp.h b/decomp.h +index 23dbc52..679a320 100644 +--- a/decomp.h ++++ b/decomp.h +@@ -8,6 +8,7 @@ void decode_frame(alac_file *alac, + unsigned char *inbuffer, + void *outbuffer, int *outputsize); + void alac_set_info(alac_file *alac, char *inputbuffer); ++int set_endian(); + + #endif /* __ALAC__DECOMP_H */ + +diff --git a/demux.c b/demux.c +index ae77a9d..9e858a9 100644 +--- a/demux.c ++++ b/demux.c +@@ -33,11 +33,7 @@ + #include + #include + #include +-#ifdef _WIN32 +- #include "stdint_win.h" +-#else +- #include +-#endif ++#include + + #include "stream.h" + #include "demux.h" +diff --git a/demux.h b/demux.h +index 8447bf8..8874ba4 100644 +--- a/demux.h ++++ b/demux.h +@@ -1,11 +1,8 @@ + #ifndef DEMUX_H + #define DEMUX_H + +-#ifdef _WIN32 +- #include "stdint_win.h" +-#else +- #include +-#endif ++ ++#include + + #include "stream.h" + +diff --git a/main.c b/main.c +index 7449ca1..dd58699 100644 +--- a/main.c ++++ b/main.c +@@ -37,11 +37,7 @@ + #include + #include + #include +-#ifdef _WIN32 +- #include "stdint_win.h" +-#else +- #include +-#endif ++#include + + #include "demux.h" + #include "decomp.h" +@@ -267,19 +263,7 @@ static void setup_environment(int argc, char **argv) + } + } + +-/* this could quite easily be done at compile time, +- * however I don't want to have to bother with all the +- * various possible #define's for endianness, worrying about +- * different compilers etc. and I'm too lazy to use autoconf. +- */ +-void set_endian() +-{ +- uint32_t integer = 0x000000aa; +- unsigned char *p = (unsigned char*)&integer; + +- if (p[0] == 0xaa) host_bigendian = 0; +- else host_bigendian = 1; +-} + + int main(int argc, char **argv) + { +@@ -288,7 +272,7 @@ int main(int argc, char **argv) + + memset(&demux_res, 0, sizeof(demux_res)); + +- set_endian(); ++ host_bigendian = set_endian(); + + setup_environment(argc, argv); + +diff --git a/stream.c b/stream.c +index 565db54..56727a0 100644 +--- a/stream.c ++++ b/stream.c +@@ -33,13 +33,10 @@ + #include + #include + #include +-#ifdef _WIN32 +- #include "stdint_win.h" +-#else +- #include +-#endif ++#include + + #include "stream.h" ++#include "decomp.h" + + #define _Swap32(v) do { \ + v = (((v) & 0x000000FF) << 0x18) | \ +@@ -51,7 +48,7 @@ + v = (((v) & 0x00FF) << 0x08) | \ + (((v) & 0xFF00) >> 0x08); } while (0) + +-extern int host_bigendian; ++#define host_bigendian set_endian() + + struct stream_tTAG { + FILE *f; +diff --git a/stream.h b/stream.h +index 18d6aa0..ff6325e 100644 +--- a/stream.h ++++ b/stream.h +@@ -3,11 +3,8 @@ + + /* stream.h */ + +-#ifdef _WIN32 +- #include "stdint_win.h" +-#else +- #include +-#endif ++#include ++ + + typedef struct stream_tTAG stream_t; + +diff --git a/wavwriter.c b/wavwriter.c +index fd19502..ce941c7 100644 +--- a/wavwriter.c ++++ b/wavwriter.c +@@ -32,11 +32,8 @@ + + #include + #include +-#ifdef _WIN32 +- #include "stdint_win.h" +-#else +- #include +-#endif ++#include ++ + + #ifndef MAKEFOURCC + #define MAKEFOURCC(ch0, ch1, ch2, ch3) ( \ +@@ -56,7 +53,7 @@ + v = (((v) & 0x00FF) << 0x08) | \ + (((v) & 0xFF00) >> 0x08); } while (0) + +-extern int host_bigendian; ++#define host_bigendian set_endian() + + static void write_uint32(FILE *f, uint32_t v, int bigendian) + { diff --git a/externals/vcpkg/ports/alac-decoder/vcpkg.json b/externals/vcpkg/ports/alac-decoder/vcpkg.json new file mode 100755 index 000000000..b84454100 --- /dev/null +++ b/externals/vcpkg/ports/alac-decoder/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "alac-decoder", + "version-string": "0.2", + "port-version": 5, + "description": "ALAC C implementation of a decoder, written from reverse engineering the file format", + "homepage": "https://distfiles.macports.org/alac_decoder" +} diff --git a/externals/vcpkg/ports/alac/CMakeLists.txt b/externals/vcpkg/ports/alac/CMakeLists.txt new file mode 100755 index 000000000..fbe190b56 --- /dev/null +++ b/externals/vcpkg/ports/alac/CMakeLists.txt @@ -0,0 +1,61 @@ +cmake_minimum_required (VERSION 3.9) +project (alac) + +set(HEADERS + codec/EndianPortable.h + codec/aglib.h + codec/ALACAudioTypes.h + codec/ALACBitUtilities.h + codec/ALACDecoder.h + codec/ALACEncoder.h + codec/dplib.h + codec/matrixlib.h +) + + +set (SRCS + codec/EndianPortable.c + codec/ALACBitUtilities.c + codec/ALACDecoder.cpp + codec/ALACEncoder.cpp + codec/ag_dec.c + codec/ag_enc.c + codec/dp_dec.c + codec/dp_enc.c + codec/matrix_dec.c + codec/matrix_enc.c +) + +set(EXE_SRCS + convert-utility/main.cpp + convert-utility/CAFFileALAC.cpp +) + +if(MSVC) + add_compile_options(/W4 -D_CRT_SECURE_NO_WARNINGS -DTARGET_OS_WIN32) +endif() + +include_directories(. codec convert-utility) + +add_library(libalac ${SRCS}) + +add_executable(alacconvert ${EXE_SRCS}) +target_link_libraries(alacconvert libalac) + +install( + TARGETS libalac + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_TOOLS) + install ( + TARGETS alacconvert + RUNTIME DESTINATION tools/alac + ) +endif() + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES ${HEADERS} DESTINATION include/alac) +endif() diff --git a/externals/vcpkg/ports/alac/portfile.cmake b/externals/vcpkg/ports/alac/portfile.cmake new file mode 100755 index 000000000..d9dd83141 --- /dev/null +++ b/externals/vcpkg/ports/alac/portfile.cmake @@ -0,0 +1,26 @@ +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "${PORT} does not currently support UWP") +endif() + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO macosforge/alac + REF c38887c5c5e64a4b31108733bd79ca9b2496d987 + SHA512 8da18df25807e76f9187f7bf30585aace303d55444f0a614ab00d98d11caca3fdc5c6f5b9fd11e5f4c92a2ab1e86fef73deeeada57e9d49951fea8b80ba383cc + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/alac) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/alac RENAME copyright) diff --git a/externals/vcpkg/ports/alac/vcpkg.json b/externals/vcpkg/ports/alac/vcpkg.json new file mode 100755 index 000000000..74adbe459 --- /dev/null +++ b/externals/vcpkg/ports/alac/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "alac", + "version-string": "2017-11-03-c38887c5", + "port-version": 2, + "description": "The Apple Lossless Audio Codec (ALAC) is a lossless audio codec developed by Apple and deployed on all of its platforms and devices.", + "homepage": "https://github.com/macosforge/alac", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/alembic/disable-warnings-as-error.patch b/externals/vcpkg/ports/alembic/disable-warnings-as-error.patch new file mode 100755 index 000000000..48ad94b30 --- /dev/null +++ b/externals/vcpkg/ports/alembic/disable-warnings-as-error.patch @@ -0,0 +1,19 @@ +Workaround for https://github.com/alembic/alembic/issues/309 +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -125,14 +125,6 @@ IF (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") + ENDIF() + +-# Set some debug vs opt flags +-if ("${CMAKE_BUILD_TYPE}" MATCHES "Debug" AND NOT MSVC) +- add_definitions(-Wall -Werror -Wextra -Wno-unused-parameter -Wno-deprecated) +- if((CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 7.0) OR +- CMAKE_CXX_COMPILER_ID MATCHES "CLANG") +- add_definitions( -Wno-error=implicit-fallthrough) +- endif() +-endif() + + IF (NOT ${WINDOWS}) + SET(EXTERNAL_MATH_LIBS "-lm") diff --git a/externals/vcpkg/ports/alembic/fix-runtime-destination.patch b/externals/vcpkg/ports/alembic/fix-runtime-destination.patch new file mode 100755 index 000000000..28a817be2 --- /dev/null +++ b/externals/vcpkg/ports/alembic/fix-runtime-destination.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -73,7 +73,7 @@ option(DOCS_PATH + + # Set static/dynamic build options + SET(LIB_TYPE STATIC) +-SET(RUNTIME_INSTALL_DIR lib) ++SET(RUNTIME_INSTALL_DIR bin) + SET(LIBRARY_INSTALL_DIR lib) + SET(ARCHIVE_INSTALL_DIR lib) + IF (ALEMBIC_SHARED_LIBS) +diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt +--- a/lib/Alembic/CMakeLists.txt ++++ b/lib/Alembic/CMakeLists.txt +@@ -78,12 +78,11 @@ option(DOCS_PATH + ${ZLIB_LIBRARY} + ) + +-SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE PATH "Where to install the Alembic libs") + INSTALL(TARGETS Alembic + EXPORT AlembicTargets +- LIBRARY DESTINATION ${ALEMBIC_LIB_INSTALL_DIR} +- ARCHIVE DESTINATION ${ALEMBIC_LIB_INSTALL_DIR} +- RUNTIME DESTINATION ${ALEMBIC_LIB_INSTALL_DIR}) ++ LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR} ++ ARCHIVE DESTINATION ${ARCHIVE_INSTALL_DIR} ++ RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR}) + + #-****************************************************************************** + # PACKAGE EXPORTS diff --git a/externals/vcpkg/ports/alembic/portfile.cmake b/externals/vcpkg/ports/alembic/portfile.cmake new file mode 100755 index 000000000..2415acdce --- /dev/null +++ b/externals/vcpkg/ports/alembic/portfile.cmake @@ -0,0 +1,49 @@ +vcpkg_buildpath_length_warning(37) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO alembic/alembic + REF 1.8.3 + SHA512 0049c72d93e66e12d704d27e7ba36cd9c718667f2ce4f7baa1bee1613ed88ba53abea98f457e14f7f2144cb353810a4108d26c7dd1a1543ec2af576272f19036 + HEAD_REF master + PATCHES + fix-runtime-destination.patch + disable-warnings-as-error.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ALEMBIC_SHARED_LIBS) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + hdf5 USE_HDF5 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DALEMBIC_SHARED_LIBS=${ALEMBIC_SHARED_LIBS} + -DUSE_TESTS=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Alembic) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +set(TOOLS abcdiff abcecho abcechobounds abcls abcstitcher abctree) +if(USE_HDF5) + list(APPEND TOOLS abcconvert) +endif() + +vcpkg_copy_tools( + TOOL_NAMES ${TOOLS} + AUTO_CLEAN +) +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/alembic/vcpkg.json b/externals/vcpkg/ports/alembic/vcpkg.json new file mode 100755 index 000000000..cbc9fc27f --- /dev/null +++ b/externals/vcpkg/ports/alembic/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "alembic", + "version": "1.8.3", + "port-version": 1, + "description": "Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.", + "homepage": "https://alembic.io/", + "supports": "!(windows & x86) & !uwp", + "dependencies": [ + "imath", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "hdf5": { + "description": "Build with HDF5 support", + "dependencies": [ + "hdf5" + ] + } + } +} diff --git a/externals/vcpkg/ports/aliyun-oss-c-sdk/patch.patch b/externals/vcpkg/ports/aliyun-oss-c-sdk/patch.patch new file mode 100755 index 000000000..31c18d897 --- /dev/null +++ b/externals/vcpkg/ports/aliyun-oss-c-sdk/patch.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0abcb93..75195a9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -150,5 +150,5 @@ INSTALL(FILES + oss_c_sdk/oss_xml.h + DESTINATION include/oss_c_sdk) + +-add_subdirectory(oss_c_sdk_sample) +-add_subdirectory(oss_c_sdk_test) ++#add_subdirectory(oss_c_sdk_sample) ++#add_subdirectory(oss_c_sdk_test) diff --git a/externals/vcpkg/ports/aliyun-oss-c-sdk/portfile.cmake b/externals/vcpkg/ports/aliyun-oss-c-sdk/portfile.cmake new file mode 100755 index 000000000..6b3af2ab1 --- /dev/null +++ b/externals/vcpkg/ports/aliyun-oss-c-sdk/portfile.cmake @@ -0,0 +1,24 @@ +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "${PORT} does not currently support UWP") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO aliyun/aliyun-oss-c-sdk + REF f9e441137620d712c7d89587c951bed459ebc843 # 3.10.0 + SHA512 6621d105706fb69b3f1998d7c83c94ff93747946040f0c45ec52986c0e8d8db3d48237d1e3f0959e09536ca43bcbe3bcdb32f90622ce51de6ea7132be6dd7cf7 + HEAD_REF master + PATCHES + patch.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) diff --git a/externals/vcpkg/ports/aliyun-oss-c-sdk/vcpkg.json b/externals/vcpkg/ports/aliyun-oss-c-sdk/vcpkg.json new file mode 100755 index 000000000..3494e5999 --- /dev/null +++ b/externals/vcpkg/ports/aliyun-oss-c-sdk/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "aliyun-oss-c-sdk", + "version-string": "3.10.0", + "port-version": 1, + "description": "Alibaba Cloud Object Storage Service (OSS) is a cloud storage service provided by Alibaba Cloud, featuring massive capacity, security, a low cost, and high reliability.", + "supports": "!(uwp | linux | osx)", + "dependencies": [ + "apr-util", + "curl" + ] +} diff --git a/externals/vcpkg/ports/allegro5/do-not-copy-pdbs-to-lib.patch b/externals/vcpkg/ports/allegro5/do-not-copy-pdbs-to-lib.patch new file mode 100755 index 000000000..43b51f7fd --- /dev/null +++ b/externals/vcpkg/ports/allegro5/do-not-copy-pdbs-to-lib.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/Common.cmake b/cmake/Common.cmake +index 86c194f..74edef8 100644 +--- a/cmake/Common.cmake ++++ b/cmake/Common.cmake +@@ -227,7 +227,7 @@ function(install_our_library target filename) + # Doesn't work, see below. + # PUBLIC_HEADER DESTINATION "include" + ) +- if(MSVC AND BUILD_SHARED_LIBS) ++ if(0) + install(FILES ${CMAKE_BINARY_DIR}/lib/${filename}.pdb + DESTINATION lib + CONFIGURATIONS Debug RelWithDebInfo diff --git a/externals/vcpkg/ports/allegro5/export-targets.patch b/externals/vcpkg/ports/allegro5/export-targets.patch new file mode 100755 index 000000000..fc7999895 --- /dev/null +++ b/externals/vcpkg/ports/allegro5/export-targets.patch @@ -0,0 +1,52 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7c5720b..72880c4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1156,6 +1156,24 @@ if(INSTALL_PKG_CONFIG_FILES) + endforeach(versuffix) + endif(INSTALL_PKG_CONFIG_FILES) + ++file(WRITE "${CMAKE_INSTALL_PREFIX}/share/unofficial-allegro5/unofficial-allegro5-config.cmake" ++[[ ++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegroTargets.cmake") ++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_audioTargets.cmake") ++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_videoTargets.cmake") ++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_primitivesTargets.cmake") ++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_fontTargets.cmake") ++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_ttfTargets.cmake") ++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_memfileTargets.cmake") ++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_physfsTargets.cmake") ++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_imageTargets.cmake") ++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_mainTargets.cmake") ++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_dialogTargets.cmake") ++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_colorTargets.cmake") ++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_acodecTargets.cmake") ++ ++]]) ++ + #-----------------------------------------------------------------------------# + # + # Documentation +diff --git a/cmake/Common.cmake b/cmake/Common.cmake +index 74edef8..0cf1edb 100644 +--- a/cmake/Common.cmake ++++ b/cmake/Common.cmake +@@ -220,6 +220,7 @@ endfunction(set_our_framework_properties) + + function(install_our_library target filename) + install(TARGETS ${target} ++ EXPORT unofficial-${target}Targets + LIBRARY DESTINATION "lib${LIB_SUFFIX}" + ARCHIVE DESTINATION "lib${LIB_SUFFIX}" + FRAMEWORK DESTINATION "${FRAMEWORK_INSTALL_PREFIX}" +@@ -227,6 +228,10 @@ function(install_our_library target filename) + # Doesn't work, see below. + # PUBLIC_HEADER DESTINATION "include" + ) ++ install(EXPORT unofficial-${target}Targets ++ NAMESPACE unofficial-allegro5:: ++ DESTINATION share/unofficial-allegro5 ++ ) + if(0) + install(FILES ${CMAKE_BINARY_DIR}/lib/${filename}.pdb + DESTINATION lib diff --git a/externals/vcpkg/ports/allegro5/fix-pdb-install.patch b/externals/vcpkg/ports/allegro5/fix-pdb-install.patch new file mode 100755 index 000000000..714c69cf5 --- /dev/null +++ b/externals/vcpkg/ports/allegro5/fix-pdb-install.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 72348fe..c6fbecb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1010,14 +1010,9 @@ else() + set(PKG_CONFIG_FILES allegro ${ADDON_PKG_CONFIG_FILES}) + endif(WANT_MONOLITH) + +-# Install pkg-config files on Unix, and when cross-compiling on Unix. ++# Install pkg-config files + +-if(UNIX AND NOT WANT_FRAMEWORKS AND NOT IPHONE) +- set(INSTALL_PKG_CONFIG_FILES true) +-endif() +-if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_UNIX) +- set(INSTALL_PKG_CONFIG_FILES true) +-endif() ++set(INSTALL_PKG_CONFIG_FILES true) + + if(INSTALL_PKG_CONFIG_FILES) + append_lib_type_suffix(lib_type) +diff --git a/cmake/Common.cmake b/cmake/Common.cmake +index 782196f..de29535 100644 +--- a/cmake/Common.cmake ++++ b/cmake/Common.cmake +@@ -223,7 +223,7 @@ function(install_our_library target filename) + # PUBLIC_HEADER DESTINATION "include" + ) + if(MSVC AND BUILD_SHARED_LIBS) +- install(FILES ${CMAKE_BINARY_DIR}/lib/\${CMAKE_INSTALL_CONFIG_NAME}/${filename}.pdb ++ install(FILES ${CMAKE_BINARY_DIR}/lib/${filename}.pdb + DESTINATION lib + CONFIGURATIONS Debug RelWithDebInfo + ) diff --git a/externals/vcpkg/ports/allegro5/portfile.cmake b/externals/vcpkg/ports/allegro5/portfile.cmake new file mode 100755 index 000000000..a19cbe855 --- /dev/null +++ b/externals/vcpkg/ports/allegro5/portfile.cmake @@ -0,0 +1,72 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO liballeg/allegro5 + REF 5.2.6.0 + SHA512 d590c1a00d1b314c6946e0f6ad3e3a8b6e6309bada2ec38857186f817147ac99dae8a1c4412abe701af88da5dca3dd8f989a1da66630192643d3c08c0146b603 + HEAD_REF master + PATCHES + fix-pdb-install.patch + do-not-copy-pdbs-to-lib.patch + export-targets.patch +) + + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" VCPKG_BUILD_SHARED_LIBS) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DWANT_DOCS=OFF + -DALLEGRO_SDL=OFF + -DWANT_DEMO=OFF + -DSHARED=${VCPKG_BUILD_SHARED_LIBS} + -DWANT_EXAMPLES=OFF + -DWANT_CURL_EXAMPLE=OFF + -DWANT_TESTS=OFF + -DWANT_AUDIO=ON + -DWANT_COLOR=ON + -DWANT_D3D=ON + -DWANT_D3D9EX=OFF # Not available on vcpkg + -DWANT_DSOUND=ON + -DWANT_FLAC=ON + -DWANT_FONT=ON + -DWANT_GLES2=ON + -DWANT_GLES3=ON + -DWANT_IMAGE=ON + -DWANT_IMAGE_JPG=ON + -DWANT_IMAGE_PNG=ON + -DWANT_MEMFILE=ON + -DWANT_MODAUDIO=OFF # Not available on vcpkg right now + -DWANT_NATIVE_DIALOG=ON + -DWANT_NATIVE_IMAGE_LOADER=ON + -DWANT_OGG_VIDEO=ON + -DWANT_OPENAL=ON + -DWANT_OPENGL=ON + -DWANT_OPENSL=OFF # Not yet available on vcpkg + -DWANT_OPUS=ON + -DWANT_PHYSFS=ON + -DWANT_POPUP_EXAMPLES=OFF + -DWANT_PRIMITIVES=ON + -DWANT_RELEASE_LOGGING=OFF + -DWANT_SHADERS_D3D=ON + -DWANT_SHADERS_GL=ON + -DWANT_TREMOR=OFF # Not yet available on vcpkg + -DWANT_TTF=ON + -DWANT_VIDEO=ON + -DWANT_VORBIS=ON + -DOPENAL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/AL + -DZLIB_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include + OPTIONS_RELEASE -DWANT_ALLOW_SSE=ON + OPTIONS_DEBUG -DWANT_ALLOW_SSE=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-allegro5 CONFIG_PATH share/unofficial-allegro5) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/allegro5/vcpkg.json b/externals/vcpkg/ports/allegro5/vcpkg.json new file mode 100755 index 000000000..dbc97efb3 --- /dev/null +++ b/externals/vcpkg/ports/allegro5/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "allegro5", + "version": "5.2.6.0", + "port-version": 2, + "description": "Allegro is a cross-platform library mainly aimed at video game and multimedia programming. It handles common, low-level tasks such as creating windows, accepting user input, loading data, drawing images, playing sounds, etc. and generally abstracting away the underlying platform. However, Allegro is not a game engine: you are free to design and structure your program as you like.", + "homepage": "https://github.com/liballeg/allegro5", + "dependencies": [ + "bzip2", + "freetype", + "libflac", + "libogg", + "libpng", + "libtheora", + "libvorbis", + "openal-soft", + "opengl", + "opus", + "opusfile", + "physfs", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/alsa/portfile.cmake b/externals/vcpkg/ports/alsa/portfile.cmake new file mode 100755 index 000000000..4b998055a --- /dev/null +++ b/externals/vcpkg/ports/alsa/portfile.cmake @@ -0,0 +1,40 @@ +if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + message(FATAL_ERROR "Package only supports Linux platform.") +endif() + +message( +"alsa currently requires the following libraries from the system package manager: + autoconf libtool +These can be installed on Ubuntu systems via sudo apt install autoconf libtool" +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO alsa-project/alsa-lib + REF v1.2.6.1 + SHA512 d1de9112ec0d600db6e5a20b558811a7a9f34d00a9b1dfb5332669b73732c1c1b8ddda57368edc199e255eba8bcb8a6767b4d9325c9860ade02d84dcaac6eb47 + HEAD_REF master +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(BUILD_OPTS --enable-shared=yes --enable-static=no) +else() + set(BUILD_OPTS --enable-shared=no --enable-static=yes) +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + ${BUILD_OPTS} + --disable-python +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools/alsa/debug") + +configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/alsa/vcpkg.json b/externals/vcpkg/ports/alsa/vcpkg.json new file mode 100755 index 000000000..58535469c --- /dev/null +++ b/externals/vcpkg/ports/alsa/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "alsa", + "version": "1.2.6.1", + "description": "The Advanced Linux Sound Architecture (ALSA) - library", + "homepage": "https://www.alsa-project.org/", + "license": "LGPL-2.1-or-later", + "supports": "linux" +} diff --git a/externals/vcpkg/ports/ampl-asl/copyright b/externals/vcpkg/ports/ampl-asl/copyright new file mode 100755 index 000000000..7fe289a23 --- /dev/null +++ b/externals/vcpkg/ports/ampl-asl/copyright @@ -0,0 +1,59 @@ +Licenses +======== + +Copyright (C) 1990 - 2001 Lucent Technologies + +Permission to use, copy, modify, and distribute this software and +its documentation for any purpose and without fee is hereby +granted, provided that the above copyright notice appear in all +copies and that both that the copyright notice and this +permission notice and warranty disclaimer appear in supporting +documentation, and that the name of Lucent or any of its entities +not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior +permission. + +LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. +IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY +SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER +IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +THIS SOFTWARE. + +---------------------------------------------------------------------- + +Copyright (C) 2007 David M. Gay + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that the copyright notice and this permission notice and warranty +disclaimer appear in supporting documentation. + +The author disclaims all warranties with regard to this software, +including all implied warranties of merchantability and fitness. +In no event shall the author be liable for any special, indirect or +consequential damages or any damages whatsoever resulting from loss of +use, data or profits, whether in an action of contract, negligence or +other tortious action, arising out of or in connection with the use or +performance of this software. + +---------------------------------------------------------------------- + +Copyright (C) 2002 - 2014 AMPL Optimization LLC + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that the copyright notice and this permission notice and warranty +disclaimer appear in supporting documentation. + +The author and AMPL Optimization LLC disclaim all warranties with +regard to this software, including all implied warranties of +merchantability and fitness. In no event shall the author be liable +for any special, indirect or consequential damages or any damages +whatsoever resulting from loss of use, data or profits, whether in an +action of contract, negligence or other tortious action, arising out +of or in connection with the use or performance of this software. diff --git a/externals/vcpkg/ports/ampl-asl/fix-crt-linkage.patch b/externals/vcpkg/ports/ampl-asl/fix-crt-linkage.patch new file mode 100755 index 000000000..0e29b6ef4 --- /dev/null +++ b/externals/vcpkg/ports/ampl-asl/fix-crt-linkage.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 976af78..35d248d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -256,7 +256,7 @@ macro(createSingleASL name sourcedir sources) + endif() + if(MSVC) + target_compile_options(${name} PRIVATE +- /wd4013 /wd4018 /wd4101 /wd4244 /wd4273 /wd4267 /wd4996 /MT$<$:d>) ++ /wd4013 /wd4018 /wd4101 /wd4244 /wd4273 /wd4267 /wd4996) + else() + target_compile_options(${name} PRIVATE -Wno-unused-result -Wno-parentheses) + endif() diff --git a/externals/vcpkg/ports/ampl-asl/install-extra-headers.patch b/externals/vcpkg/ports/ampl-asl/install-extra-headers.patch new file mode 100755 index 000000000..bf40b3b9f --- /dev/null +++ b/externals/vcpkg/ports/ampl-asl/install-extra-headers.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 35d248d..8a85aa7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -317,6 +317,7 @@ if(BUILD_CPP) + endif() + + install(FILES ${ASL_HEADERS} ${ASL_SOURCE_DIR}/opcode.hd ${ASL_SOURCE_DIR}/r_opn.hd ++ ${GENERATED_INCLUDE_DIR}/stdio1.h ${GENERATED_INCLUDE_DIR}/arith.h + DESTINATION include/asl COMPONENT asl) + install(FILES ${ASL2_HEADERS} ${ASL2_SOURCE_DIR}/opcode.hd ${ASL2_SOURCE_DIR}/r_opn.hd + DESTINATION include/asl2 COMPONENT asl) diff --git a/externals/vcpkg/ports/ampl-asl/install-targets.patch b/externals/vcpkg/ports/ampl-asl/install-targets.patch new file mode 100755 index 000000000..c68a7e813 --- /dev/null +++ b/externals/vcpkg/ports/ampl-asl/install-targets.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8a85aa7..c0619bc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -247,8 +247,8 @@ endif() + + macro(createSingleASL name sourcedir sources) + add_library(${name} STATIC ${${sources}} ${GENERATED_INCLUDE_DIR}/arith.h) +- target_include_directories(${name} PUBLIC ${GENERATED_INCLUDE_DIR} +- ${sourcedir}) ++ target_include_directories(${name} PUBLIC $ ++ $ $) + target_compile_definitions(${name} PRIVATE ${ASL_COMPILE_DEFINITIONS}) + target_link_libraries(${name} PUBLIC ${CMAKE_DL_LIBS}) + if(NOT WIN32) +@@ -322,14 +322,16 @@ install(FILES ${ASL_HEADERS} ${ASL_SOURCE_DIR}/opcode.hd ${ASL_SOURCE_DIR}/r_opn + install(FILES ${ASL2_HEADERS} ${ASL2_SOURCE_DIR}/opcode.hd ${ASL2_SOURCE_DIR}/r_opn.hd + DESTINATION include/asl2 COMPONENT asl) + +-install(TARGETS asl asl2 DESTINATION lib COMPONENT asl) ++install(TARGETS asl asl2 EXPORT unofficial-asl-config DESTINATION lib COMPONENT asl) + if(BUILD_MT_LIBS) +- install(TARGETS asl-mt asl2-mt DESTINATION lib COMPONENT asl) ++ install(TARGETS asl-mt asl2-mt EXPORT unofficial-asl-config DESTINATION lib COMPONENT asl) + endif() + if(MSVC AND BUILD_DYNRT_LIBS) +- install(TARGETS asl-dynrt asl2-dynrt DESTINATION lib COMPONENT asl) ++ install(TARGETS asl-dynrt asl2-dynrt EXPORT unofficial-asl-config DESTINATION lib COMPONENT asl) + endif() + if(TARGET aslcpp) + install(FILES ${ASL_CPP_HEADERS} DESTINATION include/aslcpp COMPONENT asl) +- install(TARGETS aslcpp DESTINATION lib COMPONENT asl) +-endif() +\ No newline at end of file ++ install(TARGETS aslcpp EXPORT unofficial-asl-config DESTINATION lib COMPONENT asl) ++endif() ++ ++install(EXPORT unofficial-asl-config DESTINATION share/unofficial-asl) +\ No newline at end of file diff --git a/externals/vcpkg/ports/ampl-asl/portfile.cmake b/externals/vcpkg/ports/ampl-asl/portfile.cmake new file mode 100755 index 000000000..fb6c664ca --- /dev/null +++ b/externals/vcpkg/ports/ampl-asl/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ampl/asl + REF 934d34719c8a620fcf16ae5a3c00c326eb22e748 + SHA512 b6fcb3dcb53a53d975666db1643d7ea518246e8fb6745621ce4b63de4393f7767844e9241baa6fdf1a45c241a9aa0866844c47deec0020313278128cccff6869 + HEAD_REF master + PATCHES + workaround-msvc-optimizer-ice.patch + fix-crt-linkage.patch # CRT linkage uses C/CXX FLAGS in vcpkg + install-extra-headers.patch + install-targets.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_MCMODELLARGE=OFF + -DBUILD_DYNRT_LIBS=OFF # CRT linkage uses C/CXX FLAGS in vcpkg + -DBUILD_MT_LIBS=OFF # CRT linkage uses C/CXX FLAGS in vcpkg + -DBUILD_CPP=ON +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-asl) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# from ampl-mp license +file(INSTALL "${CURRENT_PORT_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/ampl-asl/vcpkg.json b/externals/vcpkg/ports/ampl-asl/vcpkg.json new file mode 100755 index 000000000..4b5c163b2 --- /dev/null +++ b/externals/vcpkg/ports/ampl-asl/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "ampl-asl", + "version-date": "2020-11-11", + "port-version": 3, + "description": "AMPL Solver Library", + "homepage": "https://github.com/ampl/asl", + "license": null, + "supports": "!uwp & !(osx & arm64)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ampl-asl/workaround-msvc-optimizer-ice.patch b/externals/vcpkg/ports/ampl-asl/workaround-msvc-optimizer-ice.patch new file mode 100755 index 000000000..7ae62595d --- /dev/null +++ b/externals/vcpkg/ports/ampl-asl/workaround-msvc-optimizer-ice.patch @@ -0,0 +1,60 @@ +diff --git a/src/solvers/avltree.c b/src/solvers/avltree.c +index 7a9adab..a75da90 100644 +--- a/src/solvers/avltree.c ++++ b/src/solvers/avltree.c +@@ -54,6 +54,10 @@ AVL_Tree { + void (*Free)(void*); + }; + ++#if defined(_MSC_VER) && _MSC_VER < 1917 ++#pragma optimize("", off) ++#endif ++ + AVL_Tree* + AVL_Tree_alloc2(void *v, AVL_Elcomp cmp, void *(*Malloc)(size_t), void (*Free)(void*)) + { +diff --git a/src/solvers/sphes.c b/src/solvers/sphes.c +index a50065f..6e6eedc 100644 +--- a/src/solvers/sphes.c ++++ b/src/solvers/sphes.c +@@ -461,6 +461,10 @@ compar(const void *a, const void *b) + #undef del_mblk + #define del_mblk(b,c) Del_mblk_ASL(a,b,(Char*)(c)) + ++#if defined(_MSC_VER) && _MSC_VER < 1917 ++#pragma optimize("", off) ++#endif ++ + static void + new_Hesoprod(ASL_pfgh *asl, ograd *L, ograd *R, real coef) + { +diff --git a/src/solvers2/avltree.c b/src/solvers2/avltree.c +index 7a9adab..a75da90 100644 +--- a/src/solvers2/avltree.c ++++ b/src/solvers2/avltree.c +@@ -54,6 +54,10 @@ AVL_Tree { + void (*Free)(void*); + }; + ++#if defined(_MSC_VER) && _MSC_VER < 1917 ++#pragma optimize("", off) ++#endif ++ + AVL_Tree* + AVL_Tree_alloc2(void *v, AVL_Elcomp cmp, void *(*Malloc)(size_t), void (*Free)(void*)) + { +diff --git a/src/solvers2/sphes.c b/src/solvers2/sphes.c +index dd2edff..ebdd3af 100644 +--- a/src/solvers2/sphes.c ++++ b/src/solvers2/sphes.c +@@ -855,6 +855,10 @@ compar(const void *a, const void *b) + #undef del_mblk + #define del_mblk(c) Del_mblk_ASL(a,(Char*)(c)) + ++#if defined(_MSC_VER) && _MSC_VER < 1917 ++#pragma optimize("", off) ++#endif ++ + static void + new_Hesoprod(EvalWorkspace *ew, int nov, int *ov, real *oc, int nR, int *Rov, real *Roc, real coef) + { diff --git a/externals/vcpkg/ports/ampl-mp/disable-matlab-mex.patch b/externals/vcpkg/ports/ampl-mp/disable-matlab-mex.patch new file mode 100755 index 000000000..6cfb9cb71 --- /dev/null +++ b/externals/vcpkg/ports/ampl-mp/disable-matlab-mex.patch @@ -0,0 +1,13 @@ +diff --git a/src/asl/CMakeLists.txt b/src/asl/CMakeLists.txt +index b7d7ecf..c31a032 100644 +--- a/src/asl/CMakeLists.txt ++++ b/src/asl/CMakeLists.txt +@@ -59,7 +59,7 @@ endif () + + target_link_libraries(aslmp ${CMAKE_DL_LIBS}) + +-find_package(MATLAB) ++set(MATLAB_FOUND) + if (MATLAB_FOUND AND MATLAB_BUILD) + set(matlab_asl asl) + if (MSVC) diff --git a/externals/vcpkg/ports/ampl-mp/fix-arm-build.patch b/externals/vcpkg/ports/ampl-mp/fix-arm-build.patch new file mode 100755 index 000000000..99b236ce7 --- /dev/null +++ b/externals/vcpkg/ports/ampl-mp/fix-arm-build.patch @@ -0,0 +1,45 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 92089a3..d4c6762 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -240,4 +240,4 @@ + set(MP_EXPR_INFO_FILE ${MP_SOURCE_DIR}/src/expr-info.cc) +-add_executable(gen-expr-info EXCLUDE_FROM_ALL ++add_executable(gen-expr-info + src/gen-expr-info.cc $) + if (MINGW) +@@ -257,9 +257,15 @@ if (CMAKE_CROSSCOMPILING) + COMMAND ${CMAKE_COMMAND} -E echo + "warning: cannot re-generate ${MP_EXPR_INFO_FILE}") + else () ++ if (ARITHCHK_EXEC) ++ add_custom_command(OUTPUT ${MP_EXPR_INFO_FILE} ++ COMMAND ${WINE} ${ARITHCHK_EXEC} ${MP_EXPR_INFO_FILE} ++ DEPENDS gen-expr-info) ++ else() + add_custom_command(OUTPUT ${MP_EXPR_INFO_FILE} + COMMAND ${WINE} $ ${MP_EXPR_INFO_FILE} + DEPENDS gen-expr-info) ++ endif() + endif () + + add_prefix(MP_HEADERS include/mp/ +@@ -359,3 +365,4 @@ endif() + install(DIRECTORY include/mp DESTINATION include) + install(TARGETS mp DESTINATION lib RUNTIME DESTINATION bin) + install(FILES LICENSE.rst DESTINATION share/mp) ++install(TARGETS gen-expr-info RUNTIME DESTINATION bin) +\ No newline at end of file +diff --git a/src/amplsig/CMakeLists.txt b/src/amplsig/CMakeLists.txt +index 81312e9..f44c847 100644 +--- a/src/amplsig/CMakeLists.txt ++++ b/src/amplsig/CMakeLists.txt +@@ -14,6 +14,6 @@ find_library(WS2_32_LIBRARY Ws2_32 + PATHS ${WIN_LIBRARY_DIR} NO_DEFAULT_PATH) + if (WS2_32_LIBRARY) + add_ampl_library(amplsig amplsig.cc) +- message(WS2_32_LIBRARY ${WS2_32_LIBRARY}) +- target_link_libraries(amplsig mp ${WS2_32_LIBRARY}) ++ message(WS2_32_LIBRARY ws2_32) ++ target_link_libraries(amplsig mp ws2_32) + endif () diff --git a/externals/vcpkg/ports/ampl-mp/fix-build.patch b/externals/vcpkg/ports/ampl-mp/fix-build.patch new file mode 100755 index 000000000..ad371ff24 --- /dev/null +++ b/externals/vcpkg/ports/ampl-mp/fix-build.patch @@ -0,0 +1,42 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 904cfb1..13f11cb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -61,6 +61,8 @@ set_cache(BUILD "" STRING + if (BUILD) + if (BUILD STREQUAL all) + set(MP_MODULES all) ++ elseif (BUILD STREQUAL no) ++ set(MP_MODULES) + else () + string(REGEX MATCHALL "[^,]+" MP_MODULES "${BUILD}") + endif () +@@ -200,7 +202,7 @@ function (add_mp_library name) + add_dependencies(${name} ${add_mp_library_DEPENDS}) + endif () + # Add library linked with dynamic runtime. +- if (MSVC) ++ if (0) + add_library(${name}-dynrt ${libtype} EXCLUDE_FROM_ALL + ${add_mp_library_UNPARSED_ARGUMENTS} ${dynrt-objects}) + target_compile_options(${name}-dynrt PUBLIC /MD$<$:d>) +@@ -308,16 +310,17 @@ if (RT_LIBRARY) + target_link_libraries(mp ${RT_LIBRARY}) + endif () + ++if (MP_VARIADIC_TEMPLATES) + # Check if variadic templates are working and not affected by GCC bug 39653: + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=39653 + check_cxx_source_compiles(" + template + struct S { typedef typename S::type type; }; + int main() {}" MP_VARIADIC_TEMPLATES) +- +-if (MP_VARIADIC_TEMPLATES) ++ if (MP_VARIADIC_TEMPLATES) + add_executable(nl-example src/nl-example.cc) + target_link_libraries(nl-example mp) ++ endif() + endif () + + add_subdirectory(doc) diff --git a/externals/vcpkg/ports/ampl-mp/fix-dependency-asl.patch b/externals/vcpkg/ports/ampl-mp/fix-dependency-asl.patch new file mode 100755 index 000000000..f0c1755ae --- /dev/null +++ b/externals/vcpkg/ports/ampl-mp/fix-dependency-asl.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 13f11cb..92089a3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -323,9 +323,9 @@ check_cxx_source_compiles(" + endif() + endif () + ++find_package(unofficial-asl CONFIG REQUIRED) + add_subdirectory(doc) + add_subdirectory(src/amplsig) +-add_subdirectory(src/asl) + add_subdirectory(src/cp) + add_subdirectory(solvers) + +diff --git a/src/cp/cp.cc b/src/cp/cp.cc +index d4adc35..ca8f35b 100644 +--- a/src/cp/cp.cc ++++ b/src/cp/cp.cc +@@ -24,7 +24,7 @@ + #include + #include + #include "mp/format.h" +-#include "funcadd.h" ++#include + + namespace { + void error(arglist *al, const char *message) { diff --git a/externals/vcpkg/ports/ampl-mp/install-targets.patch b/externals/vcpkg/ports/ampl-mp/install-targets.patch new file mode 100755 index 000000000..a84420fed --- /dev/null +++ b/externals/vcpkg/ports/ampl-mp/install-targets.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d4c6762..c7b15b6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -197,7 +197,7 @@ function (add_mp_library name) + target_compile_definitions(${name} + PUBLIC ${add_mp_library_COMPILE_DEFINITIONS}) + target_include_directories(${name} +- PUBLIC ${add_mp_library_INCLUDE_DIRECTORIES}) ++ PUBLIC $ $) + if (add_mp_library_DEPENDS) + add_dependencies(${name} ${add_mp_library_DEPENDS}) + endif () +@@ -363,6 +363,7 @@ if(BUILD_TESTING) + endif() + + install(DIRECTORY include/mp DESTINATION include) +-install(TARGETS mp DESTINATION lib RUNTIME DESTINATION bin) ++install(TARGETS mp EXPORT unofficial-mp-config DESTINATION lib RUNTIME DESTINATION bin) + install(FILES LICENSE.rst DESTINATION share/mp) ++install(EXPORT unofficial-mp-config DESTINATION share/unofficial-mp) + install(TARGETS gen-expr-info RUNTIME DESTINATION bin) +\ No newline at end of file diff --git a/externals/vcpkg/ports/ampl-mp/portfile.cmake b/externals/vcpkg/ports/ampl-mp/portfile.cmake new file mode 100755 index 000000000..701298a2f --- /dev/null +++ b/externals/vcpkg/ports/ampl-mp/portfile.cmake @@ -0,0 +1,50 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ampl/mp + REF bb7d616605dd23e4a453a834b0fc8c0a2a71b5aa + SHA512 558321f700a2ffe9d13f29f7c034825f5644a49c55da8490160d7ee8303484de5f9a636783387cc108bd238cdc3d2afa6b28cafecce73ee7893d792f5293712a + HEAD_REF master + PATCHES + disable-matlab-mex.patch + fix-build.patch + fix-dependency-asl.patch + fix-arm-build.patch # https://github.com/ampl/mp/issues/115 + install-targets.patch +) + +if (NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET) + set(ARITHCHK_EXEC ${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}/gen-expr-info${VCPKG_HOST_EXECUTABLE_SUFFIX}) + if (NOT EXISTS "${ARITHCHK_EXEC}") + message(FATAL_ERROR "Expected ${ARITHCHK_EXEC} to exist.") + endif() +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD=no + -DBUILD_TESTING=OFF + -DMP_VARIADIC_TEMPLATES=OFF + -DARITHCHK_EXEC=${ARITHCHK_EXEC} +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +vcpkg_copy_tools(TOOL_NAMES gen-expr-info AUTO_CLEAN) + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-mp TARGET_PATH share/unofficial-mp) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share + # remove amplsig.dll and cp.dll, see https://github.com/ampl/mp/issues/130 + ${CURRENT_PACKAGES_DIR}/debug/bin + ${CURRENT_PACKAGES_DIR}/bin +) + +configure_file(${SOURCE_PATH}/LICENSE.rst ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/ampl-mp/vcpkg.json b/externals/vcpkg/ports/ampl-mp/vcpkg.json new file mode 100755 index 000000000..287cd3cb3 --- /dev/null +++ b/externals/vcpkg/ports/ampl-mp/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "ampl-mp", + "version-date": "2020-11-11", + "port-version": 3, + "description": "An open-source library for mathematical programming", + "homepage": "https://github.com/ampl/mp", + "supports": "!uwp", + "dependencies": [ + "ampl-asl", + { + "name": "ampl-mp", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/amqpcpp/find-openssl.patch b/externals/vcpkg/ports/amqpcpp/find-openssl.patch new file mode 100755 index 000000000..ad841edd3 --- /dev/null +++ b/externals/vcpkg/ports/amqpcpp/find-openssl.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 645bb32..3ef5c4b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -89,6 +89,11 @@ else() + add_library(${PROJECT_NAME} STATIC ${src_MAIN} ${src_LINUX_TCP}) + endif() + ++if(AMQP-CPP_LINUX_TCP) ++ find_path(OPENSSL_INCLUDE_DIR openssl/ssl.h) ++ include_directories(${OPENSSL_INCLUDE_DIR}) ++endif() ++ + # install rules + # ------------------------------------------------------------------------------------------------------ + diff --git a/externals/vcpkg/ports/amqpcpp/portfile.cmake b/externals/vcpkg/ports/amqpcpp/portfile.cmake new file mode 100755 index 000000000..4b616f9b8 --- /dev/null +++ b/externals/vcpkg/ports/amqpcpp/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO CopernicaMarketingSoftware/AMQP-CPP + REF b891cc37a6ff63fcff59a112de281f5964344c91 #v4.3.15 + SHA512 5c55285e2445752669bfe51a276c3c9cb294eeae74e05124fa7427737e43419493b8a8e199bedba9ab7fba5822a8da530ca442afdbe45d12c2c0c54f9fd59a0c + HEAD_REF master + PATCHES + find-openssl.patch +) + +if(VCPKG_TARGET_IS_LINUX) + set(LINUX_TCP ON) +else() + set(LINUX_TCP OFF) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DAMQP-CPP_BUILD_SHARED=OFF + -DAMQP-CPP_LINUX_TCP=${LINUX_TCP} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH cmake) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/amqpcpp/vcpkg.json b/externals/vcpkg/ports/amqpcpp/vcpkg.json new file mode 100755 index 000000000..2fe066c64 --- /dev/null +++ b/externals/vcpkg/ports/amqpcpp/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "amqpcpp", + "version": "4.3.15", + "port-version": 1, + "description": "AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker", + "homepage": "https://github.com/CopernicaMarketingSoftware/AMQP-CPP", + "supports": "!uwp", + "dependencies": [ + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/anax/Add-bin-output.patch b/externals/vcpkg/ports/anax/Add-bin-output.patch new file mode 100755 index 000000000..333a92fdc --- /dev/null +++ b/externals/vcpkg/ports/anax/Add-bin-output.patch @@ -0,0 +1,10 @@ +--- a/CMakeLists.txt Tue Oct 13 13:47:40 2015 ++++ b/CMakeLists.txt Tue Dec 06 11:13:23 2016 +@@ -161,6 +161,7 @@ + # Library files + install( + TARGETS ${ANAX_LIBRARY_NAME} ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + ) diff --git a/externals/vcpkg/ports/anax/osx-arm.patch b/externals/vcpkg/ports/anax/osx-arm.patch new file mode 100755 index 000000000..450cd82e2 --- /dev/null +++ b/externals/vcpkg/ports/anax/osx-arm.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d427767..80965bc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -154,10 +154,6 @@ set_target_properties(${ANAX_LIBRARY_NAME} PROPERTIES + SOVERSION ${ANAX_VERSION_MAJOR} + ) + +-if(APPLE) +- set_target_properties(${ANAX_LIBRARY_NAME} PROPERTIES OSX_ARCHITECTURES "i386;x86_64;") +-endif() +- + # Library files + install( + TARGETS ${ANAX_LIBRARY_NAME} diff --git a/externals/vcpkg/ports/anax/portfile.cmake b/externals/vcpkg/ports/anax/portfile.cmake new file mode 100755 index 000000000..56c9156b8 --- /dev/null +++ b/externals/vcpkg/ports/anax/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO miguelmartin75/anax + REF v2.1.0 + SHA512 b573733b5f9634bf8cfc5b0715074f9a8ee29ecb48dc981d9371254a1f6ff8afbbb9ba6aa0877d53e518e5486ecc398a6d331fb9b5dbfd17d8707679216e11a3 + HEAD_REF master + PATCHES + Add-bin-output.patch + osx-arm.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/anax/vcpkg.json b/externals/vcpkg/ports/anax/vcpkg.json new file mode 100755 index 000000000..fbaeb17bb --- /dev/null +++ b/externals/vcpkg/ports/anax/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "anax", + "version": "2.1.0", + "port-version": 8, + "description": "An open source C++ entity system.", + "homepage": "https://github.com/miguelmartin75/anax", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/angelscript/mark-threads-private.patch b/externals/vcpkg/ports/angelscript/mark-threads-private.patch new file mode 100755 index 000000000..aaf28b437 --- /dev/null +++ b/externals/vcpkg/ports/angelscript/mark-threads-private.patch @@ -0,0 +1,13 @@ +diff --git a/angelscript/projects/cmake/CMakeLists.txt b/angelscript/projects/cmake/CMakeLists.txt +index 7c800c5..982ad8b 100644 +--- a/angelscript/projects/cmake/CMakeLists.txt ++++ b/angelscript/projects/cmake/CMakeLists.txt +@@ -145,7 +145,7 @@ endif() + + # Don't override the default library output path to avoid conflicts when building for multiple target platforms + #set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../lib) +-target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} Threads::Threads) ++target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} PRIVATE Threads::Threads) + + set_target_properties(${ANGELSCRIPT_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION}) + diff --git a/externals/vcpkg/ports/angelscript/portfile.cmake b/externals/vcpkg/ports/angelscript/portfile.cmake new file mode 100755 index 000000000..b63ce6d8b --- /dev/null +++ b/externals/vcpkg/ports/angelscript/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://angelcode.com/angelscript/sdk/files/angelscript_2.35.1.zip" + FILENAME "angelscript_2.35.1.zip" + SHA512 b15083c7a77434c291e72ea82cfbab7734fa79df654d911a822f306d526669ebe9e55a981e8a1914deda0d2a52ebdc0ffb51a4179f307632c8c7d74b1abc69fa +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES + mark-threads-private.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/angelscript/projects/cmake" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Angelscript) + +# Copy the addon files +if("addons" IN_LIST FEATURES) + file(INSTALL "${SOURCE_PATH}/add_on/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/angelscript" FILES_MATCHING PATTERN "*.h" PATTERN "*.cpp") +endif() + +file(INSTALL "${SOURCE_PATH}/docs/manual/doc_license.html" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/angelscript/vcpkg.json b/externals/vcpkg/ports/angelscript/vcpkg.json new file mode 100755 index 000000000..a7b48cb40 --- /dev/null +++ b/externals/vcpkg/ports/angelscript/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "angelscript", + "version": "2.35.1", + "port-version": 1, + "description": "The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer.", + "homepage": "https://angelcode.com/angelscript", + "license": "Zlib", + "supports": "!arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "addons": { + "description": "Installs all addons for use in compiling scripts addons" + } + } +} diff --git a/externals/vcpkg/ports/angle/001-fix-uwp.patch b/externals/vcpkg/ports/angle/001-fix-uwp.patch new file mode 100755 index 000000000..cba68d69b --- /dev/null +++ b/externals/vcpkg/ports/angle/001-fix-uwp.patch @@ -0,0 +1,30 @@ +diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp +index 7d3f078d6..fac057dd6 100644 +--- a/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp ++++ b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp +@@ -213,16 +213,20 @@ HRESULT GetCoreWindowSizeInPixels(const ComPtr displayProperties; ++ ComPtr displayInformationStatics; ++ ComPtr displayInformation; + + if (SUCCEEDED(GetActivationFactory( +- HStringReference(RuntimeClass_Windows_Graphics_Display_DisplayProperties).Get(), +- displayProperties.GetAddressOf()))) ++ HStringReference(RuntimeClass_Windows_Graphics_Display_DisplayInformation).Get(), ++ displayInformationStatics.GetAddressOf()))) + { + float dpi = 96.0f; +- if (SUCCEEDED(displayProperties->get_LogicalDpi(&dpi))) ++ if (SUCCEEDED(displayInformationStatics->GetForCurrentView(&displayInformation))) + { +- return dpi; ++ if (SUCCEEDED(displayInformation->get_LogicalDpi(&dpi))) ++ { ++ return dpi; ++ } + } + } + diff --git a/externals/vcpkg/ports/angle/002-fix-builder-error.patch b/externals/vcpkg/ports/angle/002-fix-builder-error.patch new file mode 100755 index 000000000..8c632d1b0 --- /dev/null +++ b/externals/vcpkg/ports/angle/002-fix-builder-error.patch @@ -0,0 +1,28 @@ +diff --git a/src/gpu_info_util/SystemInfo_win.cpp b/src/gpu_info_util/SystemInfo_win.cpp +index f4bb137f2..86495013b 100644 +--- a/src/gpu_info_util/SystemInfo_win.cpp ++++ b/src/gpu_info_util/SystemInfo_win.cpp +@@ -6,11 +6,6 @@ + + // SystemInfo_win.cpp: implementation of the Windows-specific parts of SystemInfo.h + +-#include "gpu_info_util/SystemInfo_internal.h" +- +-#include "common/debug.h" +-#include "common/string_utils.h" +- + // Windows.h needs to be included first + #include + +@@ -19,6 +14,11 @@ + #include + #include + ++#include "gpu_info_util/SystemInfo_internal.h" ++ ++#include "common/debug.h" ++#include "common/string_utils.h" ++ + namespace angle + { + diff --git a/externals/vcpkg/ports/angle/003-fix-mingw.patch b/externals/vcpkg/ports/angle/003-fix-mingw.patch new file mode 100755 index 000000000..304d822ec --- /dev/null +++ b/externals/vcpkg/ports/angle/003-fix-mingw.patch @@ -0,0 +1,22 @@ +diff --git a/src/common/mathutil.h b/src/common/mathutil.h +index 1d73bbf..c5b9cc8 100644 +--- a/src/common/mathutil.h ++++ b/src/common/mathutil.h +@@ -1073,7 +1073,7 @@ inline int BitCount(uint64_t bits) + # endif // defined(_M_IX86) || defined(_M_X64) + #endif // defined(_MSC_VER) && !defined(__clang__) + +-#if defined(ANGLE_PLATFORM_POSIX) || defined(__clang__) ++#if defined(ANGLE_PLATFORM_POSIX) || defined(__clang__) || defined(__MINGW32__) + inline int BitCount(uint32_t bits) + { + return __builtin_popcount(bits); +@@ -1083,7 +1083,7 @@ inline int BitCount(uint64_t bits) + { + return __builtin_popcountll(bits); + } +-#endif // defined(ANGLE_PLATFORM_POSIX) || defined(__clang__) ++#endif // defined(ANGLE_PLATFORM_POSIX) || defined(__clang__) || defined(__MINGW32__) + + inline int BitCount(uint8_t bits) + { diff --git a/externals/vcpkg/ports/angle/CMakeLists.txt b/externals/vcpkg/ports/angle/CMakeLists.txt new file mode 100755 index 000000000..184f5c951 --- /dev/null +++ b/externals/vcpkg/ports/angle/CMakeLists.txt @@ -0,0 +1,754 @@ +cmake_minimum_required(VERSION 3.8) +project(angle CXX C) + +if(WIN32 AND NOT WINDOWS_STORE) + set(WINDOWS_DESKTOP 1) +else() + set(WINDOWS_DESKTOP 0) +endif() + +if(UNIX AND NOT APPLE) + set(LINUX 1) +else() + set(LINUX 0) +endif() + +if(MSVC) + add_compile_options(/d2guard4 /Wv:18 /guard:cf /permissive /bigobj) +else() + set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_POSITION_INDEPENDENT_CODE ON) +endif() + +if (APPLE) + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -framework Cocoa -framework OpenGL -framework IOKit -framework CoreFoundation -framework IOSurface -framework QuartzCore -framework CoreGraphics") +endif() +set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}") +set(CMAKE_STATIC_LIBRARY_PREFIX "") + +if (WINDOWS_STORE) + set(WINRT_DEFINES -DANGLE_ENABLE_WINDOWS_UWP -DWINAPI_FAMILY=WINAPI_FAMILY_PC_APP) +else() + set(WINRT_DEFINES) +endif() +add_definitions( + -D_CRT_SECURE_NO_DEPRECATE + -D_SCL_SECURE_NO_WARNINGS + -DGL_SILENCE_DEPRECATION + -D_HAS_EXCEPTIONS=0 + -DNOMINMAX + -DANGLE_STANDALONE_BUILD + ${WINRT_DEFINES} +) +add_compile_options("$<$:-DANGLE_ENABLE_DEBUG_ANNOTATIONS>") +if(WIN32) + add_definitions(-DANGLE_IS_WIN) +endif() +if(LINUX) + add_definitions(-DANGLE_IS_LINUX) +endif() +if(ANGLE_IS_64_BIT_CPU) + add_definitions(-DANGLE_IS_64_BIT_CPU) +elseif(ANGLE_IS_32_BIT_CPU) + add_definitions(-DANGLE_IS_32_BIT_CPU) +endif() + +configure_file(angle_commit.h include/id/commit.h COPYONLY) +#include_directories(include src ${CMAKE_CURRENT_BINARY_DIR}/include) +include_directories("$" "$" "$" "$") +########## +# angle::common +if(WINDOWS_DESKTOP) + set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_apple|_mac|_ios|_posix|_winuwp") +elseif(WINDOWS_STORE) + set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_apple|_mac|_ios|_posix|_win32") +elseif(LINUX) + set(ANGLE_COMMON_PLATFORM_FILTER "_win|_apple|_mac|_ios") +elseif(APPLE) + if(CMAKE_SYSTEM_NAME MATCHES "Darwin") # macOS + set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_win|_ios") + else() # other Apple platforms (iOS, etc) + set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_win|_mac") + endif() +endif() + +if(APPLE) + set(ANGLE_COMMON_PLATFORM_SOURCES + "src/common/apple/*.h" + "src/common/apple/*.cpp" + "src/common/apple/*.mm" + "src/common/gl/cgl/*.h" + "src/common/gl/cgl/*.cpp" + "src/common/gl/cgl/*.mm") +else() + set(ANGLE_COMMON_PLATFORM_SOURCES ) +endif() + +file(GLOB ANGLE_COMMON_SOURCES + ${ANGLE_COMMON_PLATFORM_SOURCES} + "src/common/*.h" + "src/common/*.inc" + "src/common/*.cpp" + "src/common/third_party/base/anglebase/*.h" + "src/common/third_party/base/anglebase/*.cc" + "src/common/third_party/base/anglebase/containers/*.h" + "src/common/third_party/base/anglebase/numerics/*.h" + "src/common/third_party/base/anglebase/numerics/*.cc" + "src/common/third_party/xxhash/*.h" + "src/common/third_party/xxhash/*.c" + "src/common/third_party/smhasher/src/*.h" + "src/common/third_party/smhasher/src/*.cpp") +list(FILTER ANGLE_COMMON_SOURCES EXCLUDE REGEX "_unittest|event_tracer|${ANGLE_COMMON_PLATFORM_FILTER}") +add_library(angle_common OBJECT ${ANGLE_COMMON_SOURCES}) +target_include_directories(angle_common PUBLIC "$") +add_library(angle::common ALIAS angle_common) + +########## +# angle::compression +file(GLOB ANGLE_COMPRESSION_UTILS_SOURCES "third_party/zlib/google/compression_utils_portable.*") +find_package(ZLIB REQUIRED) +add_library(angle_compression_utils OBJECT ${ANGLE_COMPRESSION_UTILS_SOURCES}) +target_link_libraries(angle_compression_utils PUBLIC ZLIB::ZLIB) +target_compile_definitions(angle_compression_utils PRIVATE + -DUSE_SYSTEM_ZLIB +) +target_include_directories(angle_compression_utils INTERFACE "$") +add_library(angle::compression ALIAS angle_compression_utils) + +########## +# angle::image_util +file(GLOB ANGLE_IMAGE_UTIL_SOURCES "src/image_util/*.h" "src/image_util/*.inc" "src/image_util/*.cpp") +add_library(angle_image_util OBJECT ${ANGLE_IMAGE_UTIL_SOURCES}) +target_link_libraries(angle_image_util PRIVATE angle::common) +add_library(angle::image_util ALIAS angle_image_util) + +########## +# angle::translator +file(GLOB TRANSLATOR_SOURCES + "src/compiler/translator/BaseTypes.h" + "src/compiler/translator/BuiltInFunctionEmulator.cpp" + "src/compiler/translator/BuiltInFunctionEmulator.h" + "src/compiler/translator/CallDAG.cpp" + "src/compiler/translator/CallDAG.h" + "src/compiler/translator/CodeGen.cpp" + "src/compiler/translator/CollectVariables.cpp" + "src/compiler/translator/CollectVariables.h" + "src/compiler/translator/Common.h" + "src/compiler/translator/Compiler.cpp" + "src/compiler/translator/Compiler.h" + "src/compiler/translator/ConstantUnion.cpp" + "src/compiler/translator/ConstantUnion.h" + "src/compiler/translator/Declarator.cpp" + "src/compiler/translator/Declarator.h" + "src/compiler/translator/Diagnostics.cpp" + "src/compiler/translator/Diagnostics.h" + "src/compiler/translator/DirectiveHandler.cpp" + "src/compiler/translator/DirectiveHandler.h" + "src/compiler/translator/ExtensionBehavior.cpp" + "src/compiler/translator/ExtensionBehavior.h" + "src/compiler/translator/FlagStd140Structs.cpp" + "src/compiler/translator/FlagStd140Structs.h" + "src/compiler/translator/FunctionLookup.cpp" + "src/compiler/translator/FunctionLookup.h" + "src/compiler/translator/HashNames.cpp" + "src/compiler/translator/HashNames.h" + "src/compiler/translator/ImmutableString.h" + "src/compiler/translator/ImmutableStringBuilder.cpp" + "src/compiler/translator/ImmutableStringBuilder.h" + "src/compiler/translator/InfoSink.cpp" + "src/compiler/translator/InfoSink.h" + "src/compiler/translator/Initialize.cpp" + "src/compiler/translator/Initialize.h" + "src/compiler/translator/InitializeDll.cpp" + "src/compiler/translator/InitializeDll.h" + "src/compiler/translator/InitializeGlobals.h" + "src/compiler/translator/IntermNode.cpp" + "src/compiler/translator/IntermNode.h" + "src/compiler/translator/IsASTDepthBelowLimit.cpp" + "src/compiler/translator/IsASTDepthBelowLimit.h" + "src/compiler/translator/Operator.cpp" + "src/compiler/translator/Operator.h" + "src/compiler/translator/OutputTree.cpp" + "src/compiler/translator/OutputTree.h" + "src/compiler/translator/ParseContext.cpp" + "src/compiler/translator/ParseContext.h" + "src/compiler/translator/ParseContext_ESSL_autogen.h" + "src/compiler/translator/ParseContext_complete_autogen.h" + "src/compiler/translator/ParseContext_interm.h" + "src/compiler/translator/PoolAlloc.cpp" + "src/compiler/translator/PoolAlloc.h" + "src/compiler/translator/Pragma.h" + "src/compiler/translator/QualifierTypes.cpp" + "src/compiler/translator/QualifierTypes.h" + "src/compiler/translator/Severity.h" + "src/compiler/translator/ShaderLang.cpp" + "src/compiler/translator/ShaderVars.cpp" + "src/compiler/translator/StaticType.h" + "src/compiler/translator/Symbol.cpp" + "src/compiler/translator/Symbol.h" + "src/compiler/translator/SymbolTable.cpp" + "src/compiler/translator/SymbolTable.h" + "src/compiler/translator/SymbolTable_autogen.h" + "src/compiler/translator/SymbolUniqueId.cpp" + "src/compiler/translator/SymbolUniqueId.h" + "src/compiler/translator/TranslatorESSL.h" + "src/compiler/translator/TranslatorGLSL.h" + "src/compiler/translator/TranslatorHLSL.h" + "src/compiler/translator/TranslatorMetal.h" + "src/compiler/translator/TranslatorVulkan.h" + "src/compiler/translator/Types.cpp" + "src/compiler/translator/Types.h" + "src/compiler/translator/ValidateAST.cpp" + "src/compiler/translator/ValidateAST.h" + "src/compiler/translator/ValidateBarrierFunctionCall.cpp" + "src/compiler/translator/ValidateBarrierFunctionCall.h" + "src/compiler/translator/ValidateClipCullDistance.cpp" + "src/compiler/translator/ValidateClipCullDistance.h" + "src/compiler/translator/ValidateGlobalInitializer.cpp" + "src/compiler/translator/ValidateGlobalInitializer.h" + "src/compiler/translator/ValidateLimitations.cpp" + "src/compiler/translator/ValidateLimitations.h" + "src/compiler/translator/ValidateMaxParameters.cpp" + "src/compiler/translator/ValidateMaxParameters.h" + "src/compiler/translator/ValidateOutputs.cpp" + "src/compiler/translator/ValidateOutputs.h" + "src/compiler/translator/ValidateSwitch.cpp" + "src/compiler/translator/ValidateSwitch.h" + "src/compiler/translator/ValidateVaryingLocations.cpp" + "src/compiler/translator/ValidateVaryingLocations.h" + "src/compiler/translator/VariablePacker.cpp" + "src/compiler/translator/VariablePacker.h" + "src/compiler/translator/blocklayout.cpp" + "src/compiler/translator/glslang.h" + "src/compiler/translator/glslang_lex_autogen.cpp" + "src/compiler/translator/glslang_tab_autogen.cpp" + "src/compiler/translator/glslang_tab_autogen.h" + "src/compiler/translator/glslang_wrapper.h" + "src/compiler/translator/length_limits.h" + "src/compiler/translator/tree_ops/*.cpp" + "src/compiler/translator/tree_ops/*.h" + "src/compiler/translator/tree_ops/gl/ClampFragDepth.h" + "src/compiler/translator/tree_ops/gl/RegenerateStructNames.h" + "src/compiler/translator/tree_ops/gl/RewriteRepeatedAssignToSwizzled.h" + "src/compiler/translator/tree_ops/gl/UseInterfaceBlockFields.h" + "src/compiler/translator/tree_ops/gl/VectorizeVectorScalarArithmetic.h" + "src/compiler/translator/tree_ops/gl/mac/AddAndTrueToLoopCondition.h" + "src/compiler/translator/tree_ops/gl/mac/RewriteDoWhile.h" + "src/compiler/translator/tree_ops/gl/mac/UnfoldShortCircuitAST.h" + "src/compiler/translator/tree_ops/vulkan/EarlyFragmentTestsOptimization.h" + "src/compiler/translator/tree_util/*.h" + "src/compiler/translator/tree_util/*.cpp" + "src/compiler/translator/util.cpp" + "src/compiler/translator/util.h" + "src/third_party/compiler/ArrayBoundsClamper.cpp" + "src/third_party/compiler/ArrayBoundsClamper.h" +) +list(FILTER TRANSLATOR_SOURCES EXCLUDE REGEX "_unittest") +file(GLOB TRANSLATOR_GLSL_BASE_SOURCES + "src/compiler/translator/OutputGLSLBase.cpp" + "src/compiler/translator/OutputGLSLBase.h" +) +file(GLOB TRANSLATOR_GLSL_AND_VULKAN_BASE_SOURCES + "src/compiler/translator/BuiltinsWorkaroundGLSL.cpp" + "src/compiler/translator/BuiltinsWorkaroundGLSL.h" + "src/compiler/translator/OutputGLSL.cpp" + "src/compiler/translator/OutputGLSL.h" +) +file(GLOB TRANSLATOR_ESSL_SOURCES + "src/compiler/translator/OutputESSL.cpp" + "src/compiler/translator/OutputESSL.h" + "src/compiler/translator/TranslatorESSL.cpp" + "src/compiler/translator/tree_ops/gl/RecordConstantPrecision.cpp" + "src/compiler/translator/tree_ops/gl/RecordConstantPrecision.h" +) +file(GLOB TRANSLATOR_GLSL_SOURCES + "src/compiler/translator/BuiltInFunctionEmulatorGLSL.cpp" + "src/compiler/translator/BuiltInFunctionEmulatorGLSL.h" + "src/compiler/translator/ExtensionGLSL.cpp" + "src/compiler/translator/ExtensionGLSL.h" + "src/compiler/translator/TranslatorGLSL.cpp" + "src/compiler/translator/VersionGLSL.cpp" + "src/compiler/translator/VersionGLSL.h" + "src/compiler/translator/tree_ops/gl/ClampFragDepth.cpp" + "src/compiler/translator/tree_ops/gl/RegenerateStructNames.cpp" + "src/compiler/translator/tree_ops/gl/RewriteRepeatedAssignToSwizzled.cpp" + "src/compiler/translator/tree_ops/gl/UseInterfaceBlockFields.cpp" + "src/compiler/translator/tree_ops/gl/VectorizeVectorScalarArithmetic.cpp" + "src/compiler/translator/tree_ops/gl/mac/RewriteRowMajorMatrices.h" + "src/compiler/translator/tree_ops/gl/mac/RewriteUnaryMinusOperatorFloat.h" +) +file(GLOB TRANSLATOR_GLSL_MAC_SOURCES + "src/compiler/translator/tree_ops/gl/mac/AddAndTrueToLoopCondition.cpp" + "src/compiler/translator/tree_ops/gl/mac/RewriteDoWhile.cpp" + "src/compiler/translator/tree_ops/gl/mac/RewriteRowMajorMatrices.cpp" + "src/compiler/translator/tree_ops/gl/mac/RewriteUnaryMinusOperatorFloat.cpp" + "src/compiler/translator/tree_ops/gl/mac/UnfoldShortCircuitAST.cpp" +) +file(GLOB TRANSLATOR_HLSL_SOURCES + "src/compiler/translator/*HLSL.h" + "src/compiler/translator/*HLSL.cpp" + "src/compiler/translator/emulated_builtin_functions_hlsl_autogen.cpp" + "src/compiler/translator/tree_ops/d3d/*.cpp" + "src/compiler/translator/tree_ops/d3d/*.h" +) +if(ANDROID) + list(APPEND TRANSLATOR_SOURCES "src/compiler/translator/ImmutableString_ESSL_autogen.cpp" "src/compiler/translator/SymbolTable_ESSL_autogen.cpp") +else() + list(APPEND TRANSLATOR_SOURCES "src/compiler/translator/ImmutableString_autogen.cpp" "src/compiler/translator/SymbolTable_autogen.cpp") +endif() +set(ANGLE_ENABLE_ESSL TRUE) +set(ANGLE_ENABLE_GLSL TRUE) +set(ANGLE_ENABLE_HLSL TRUE) +set(_needs_glsl_base FALSE) +set(_needs_glsl_and_vulkan_base FALSE) +add_library(angle_translator OBJECT ${TRANSLATOR_SOURCES}) +if(ANGLE_ENABLE_ESSL) + set(_needs_glsl_base TRUE) + target_sources(angle_translator PRIVATE ${TRANSLATOR_ESSL_SOURCES}) + target_compile_definitions(angle_translator PUBLIC -DANGLE_ENABLE_ESSL) +endif() +if(ANGLE_ENABLE_GLSL) + set(_needs_glsl_base TRUE) + set(_needs_glsl_and_vulkan_base TRUE) + target_sources(angle_translator PRIVATE ${TRANSLATOR_GLSL_SOURCES}) + if(APPLE) + target_sources(angle_translator PRIVATE ${TRANSLATOR_GLSL_MAC_SOURCES}) + endif() + target_compile_definitions(angle_translator PUBLIC -DANGLE_ENABLE_GLSL) +endif() +if(ANGLE_ENABLE_HLSL) + target_sources(angle_translator PRIVATE ${TRANSLATOR_HLSL_SOURCES}) + target_compile_definitions(angle_translator PUBLIC -DANGLE_ENABLE_HLSL) +endif() +if(_needs_glsl_base) + target_sources(angle_translator PRIVATE ${TRANSLATOR_GLSL_BASE_SOURCES}) +endif() +if(_needs_glsl_and_vulkan_base) + target_sources(angle_translator PRIVATE ${TRANSLATOR_GLSL_AND_VULKAN_BASE_SOURCES}) +endif() +target_link_libraries(angle_translator PRIVATE angle::common) +add_library(angle::translator ALIAS angle_translator) + +########## +# angle::preprocessor +file(GLOB PREPROCESSOR_SOURCES + "src/compiler/preprocessor/*.h" + "src/compiler/preprocessor/*.cpp" +) +add_library(angle_preprocessor OBJECT ${PREPROCESSOR_SOURCES}) +target_link_libraries(angle_preprocessor PRIVATE angle::common) +add_library(angle::preprocessor ALIAS angle_preprocessor) + +########## +# libANGLE + +## OpenGL Renderer +if(WINDOWS_DESKTOP OR LINUX OR APPLE) + if(WINDOWS_DESKTOP) + set(ANGLE_RENDERER_OPENGL_PLATFORM + "src/libANGLE/renderer/gl/wgl/*.cpp" + "src/libANGLE/renderer/gl/wgl/*.h" + ) + elseif(APPLE) + set(ANGLE_RENDERER_OPENGL_PLATFORM + "src/libANGLE/renderer/gl/cgl/*.mm" + "src/libANGLE/renderer/gl/cgl/*.cpp" + "src/libANGLE/renderer/gl/cgl/*.h" + "src/libANGLE/renderer/gl/apple/*.mm" + "src/libANGLE/renderer/gl/apple/*.cpp" + "src/libANGLE/renderer/gl/apple/*.h" + "gpu_info_util/SystemInfo_macos.mm" + ) + elseif(LINUX) + set(ANGLE_RENDERER_OPENGL_PLATFORM + "src/libANGLE/renderer/gl/glx/*.cpp" + "src/libANGLE/renderer/gl/glx/*.h" + "src/libANGLE/renderer/gl/egl/*.cpp" + "src/libANGLE/renderer/gl/egl/*.h" + ) + endif() + + file(GLOB LIBANGLE_GL_SOURCES + "src/libANGLE/renderer/gl/*.cpp" + "src/libANGLE/renderer/gl/*.inc" + "src/libANGLE/renderer/gl/*.h" + + ${ANGLE_RENDERER_OPENGL_PLATFORM} + ) + list(FILTER LIBANGLE_GL_SOURCES EXCLUDE REGEX "_unittest") + add_library(angle_renderer_opengl INTERFACE) + target_sources(angle_renderer_opengl INTERFACE "$") + target_compile_definitions(angle_renderer_opengl INTERFACE -DANGLE_ENABLE_OPENGL -DANGLE_ENABLE_OPENGL_DESKTOP) + add_library(angle::renderer::opengl ALIAS angle_renderer_opengl) +endif() + +# D3D Renderers +if(WIN32) + ## All D3D Sources + file(GLOB_RECURSE LIBANGLE_D3D_SOURCES + "src/libANGLE/renderer/d3d/*.cpp" + "src/libANGLE/renderer/d3d/*.inc" + "src/libANGLE/renderer/d3d/*.h" + ) + list(FILTER LIBANGLE_D3D_SOURCES EXCLUDE REGEX "_unittest") + if(MINGW) + list(FILTER LIBANGLE_D3D_SOURCES EXCLUDE REGEX "CompositorNativeWindow11") + endif() + + ## WinRT D3D Renderer + if(WINDOWS_STORE) + set(LIBANGLE_D3D_WINRT_SOURCES ${LIBANGLE_D3D_SOURCES}) + list(FILTER LIBANGLE_D3D_WINRT_SOURCES INCLUDE REGEX "winrt") + add_library(angle_renderer_winrt INTERFACE) + target_sources(angle_renderer_winrt INTERFACE "$") + add_library(angle::renderer::winrt ALIAS angle_renderer_winrt) + endif() + + ## Win32/d3d9 D3D Renderer + if(WINDOWS_DESKTOP) + set(LIBANGLE_D3D_DESKTOP_SOURCES ${LIBANGLE_D3D_SOURCES}) + list(FILTER LIBANGLE_D3D_DESKTOP_SOURCES INCLUDE REGEX "d3d9|win32") + find_library(D3D9_LIB NAMES d3d9) + add_library(angle_renderer_win32 INTERFACE) + target_sources(angle_renderer_win32 INTERFACE "$") + target_compile_definitions(angle_renderer_win32 INTERFACE -DANGLE_ENABLE_D3D9) + target_link_libraries(angle_renderer_win32 INTERFACE d3d9) + add_library(angle::renderer::win32 ALIAS angle_renderer_win32) + endif() + + ## D3D11 Base renderer + list(FILTER LIBANGLE_D3D_SOURCES EXCLUDE REGEX "winrt|d3d9|win32") + find_library(DXGUID_LIB NAMES dxguid) + find_library(D3D11_LIB NAMES d3d11) + add_library(angle_renderer_d3d INTERFACE) + target_sources(angle_renderer_d3d INTERFACE "$") + target_compile_definitions(angle_renderer_d3d INTERFACE + -DANGLE_ENABLE_D3D11 + "-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ \"d3dcompiler_47.dll\", \"d3dcompiler_46.dll\", \"d3dcompiler_43.dll\" }" + ) + if(NOT MINGW) + target_compile_definitions(angle_renderer_d3d INTERFACE + -DANGLE_ENABLE_D3D11_COMPOSITOR_NATIVE_WINDOW + ) + endif() + target_link_libraries(angle_renderer_d3d INTERFACE d3d11 dxguid) + add_library(angle::renderer::d3d ALIAS angle_renderer_d3d) +endif() + +## angle::gpu_info_util +file(GLOB ANGLE_GPU_INFO_UTIL_SOURCES + "src/gpu_info_util/SystemInfo.h" + "src/gpu_info_util/SystemInfo_internal.h" + "src/gpu_info_util/SystemInfo.cpp" +) +add_library(angle_gpu_info_util OBJECT ${ANGLE_GPU_INFO_UTIL_SOURCES}) +if(WIN32) + target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_win.cpp") + target_link_libraries(angle_gpu_info_util PRIVATE setupapi.lib dxgi.lib) +elseif(APPLE) + target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_apple.mm") + if(CMAKE_SYSTEM_NAME MATCHES "Darwin") # macOS + target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_macos.mm") + endif() + find_library(IOKit IOKit) + find_library(CoreFoundation CoreFoundation) + find_library(CoreGraphics CoreGraphics) + target_link_libraries(angle_gpu_info_util PRIVATE ${IOKit} ${CoreFoundation} ${CoreGraphics}) +elseif(LINUX) + target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_linux.cpp" "src/gpu_info_util/SystemInfo_x11.cpp") + target_compile_definitions(angle_gpu_info_util PRIVATE GPU_INFO_USE_X11) + target_link_libraries(angle_gpu_info_util PRIVATE X11 Xi Xext) +elseif(ANDROID) + target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_android.cpp") +endif() +target_link_libraries(angle_gpu_info_util PRIVATE angle::common) +add_library(angle::gpu_info_util ALIAS angle_gpu_info_util) + +## Core libANGLE library +if(WIN32) + if(NOT WINDOWS_STORE) + set(LIBANGLE_SOURCES_PLATFORM + "src/third_party/systeminfo/SystemInfo.cpp" + ) + endif() +elseif(APPLE) + file(GLOB LIBANGLE_SOURCES_PLATFORM + "src/libANGLE/renderer/*.mm" + ) +else() + set(LIBANGLE_SOURCES_PLATFORM) +endif() + +file(GLOB LIBANGLE_SOURCES + "src/common/third_party/murmurhash/MurmurHash3.cpp" + "src/common/event_tracer.cpp" + + "src/libANGLE/*.cpp" + "src/libANGLE/*.inc" + "src/libANGLE/*.h" + + "src/libANGLE/renderer/*.cpp" + "src/libANGLE/renderer/*.h" + + "src/libANGLE/renderer/null/*.cpp" + "src/libANGLE/renderer/null/*.h" + + # The frame capture headers are always visible to libANGLE. + "src/libANGLE/capture/*.h" + + # angle_frame_capture_disabled + "src/libANGLE/capture/FrameCapture_mock.cpp" + "src/libANGLE/capture/frame_capture_utils_mock.cpp" + + # angle_gl_enum_utils + "src/libANGLE/capture/gl_enum_utils.cpp" + "src/libANGLE/capture/gl_enum_utils_autogen.cpp" + + ${LIBANGLE_SOURCES_PLATFORM} +) +list(FILTER LIBANGLE_SOURCES EXCLUDE REGEX "_unittest|glslang_wrapper|dxgi_|d3d_format") +if(WIN32) + set(LIBANGLE_D3D_FORMAT_TABLES_SOURCES_PLATFORM) + if(NOT WINDOWS_STORE) + list(APPEND LIBANGLE_D3D_FORMAT_TABLES_SOURCES_PLATFORM + "src/libANGLE/renderer/d3d_format.cpp" + "src/libANGLE/renderer/d3d_format.h" + ) + endif() + file(GLOB LIBANGLE_D3D_FORMAT_TABLES_SOURCES + "src/libANGLE/renderer/dxgi_format_map.h" + "src/libANGLE/renderer/dxgi_format_map_autogen.cpp" + "src/libANGLE/renderer/dxgi_support_table.h" + "src/libANGLE/renderer/dxgi_support_table_autogen.cpp" + + ${LIBANGLE_D3D_FORMAT_TABLES_SOURCES_PLATFORM} + ) + list(APPEND LIBANGLE_SOURCES "${LIBANGLE_D3D_FORMAT_TABLES_SOURCES}") +endif() + +if(LINUX OR APPLE) + set(LIBANGLE_RENDERER_PLATFORM + angle::renderer::opengl + ) +elseif(WINDOWS_STORE) + set(LIBANGLE_RENDERER_PLATFORM + angle::renderer::d3d + angle::renderer::winrt + ) +elseif(WINDOWS_DESKTOP) + set(LIBANGLE_RENDERER_PLATFORM + angle::renderer::d3d + angle::renderer::win32 + angle::renderer::opengl + gdi32 + ) +else() + set(LIBANGLE_RENDERER_PLATFORM ) +endif() + +if(LINUX) + find_package(X11) + include_directories(${X11_INCLUDE_DIR}) + list(APPEND LIBANGLE_RENDERER_PLATFORM ${X11_LIBRARIES}) + set(LIBANGLE_RENDERER_COMPILEDEF + -DANGLE_USE_X11 + ) +else() + set(LIBANGLE_RENDERER_COMPILEDEF ) +endif() + +add_library(libANGLE STATIC ${LIBANGLE_SOURCES}) +target_link_libraries(libANGLE PRIVATE + angle::common + angle::compression + angle::image_util + angle::gpu_info_util + angle::translator + angle::preprocessor + ${LIBANGLE_RENDERER_PLATFORM} +) +target_include_directories(libANGLE PRIVATE "$") +target_compile_definitions(libANGLE + PRIVATE -DANGLE_ENABLE_NULL + PUBLIC + -DLIBANGLE_IMPLEMENTATION + ${LIBANGLE_RENDERER_COMPILEDEF} + -DANGLE_EXPORT= + -DANGLE_UTIL_EXPORT= + -DEGLAPI= + -DGL_APICALL= + -DGL_API= + -DANGLE_CAPTURE_ENABLED=0 +) +add_library(angle::libANGLE ALIAS libANGLE) +if(BUILD_SHARED_LIBS) + target_compile_definitions(libANGLE + PRIVATE -DLIBANGLE_UTIL_IMPLEMENTATION + ) +endif() + +########## +# libGLESv2 +# Modified according to the file src/libGLESv2.gni +list(APPEND LIBGLESV2_SOURCES + "src/libGLESv2/egl_ext_stubs.cpp" + "src/libGLESv2/egl_ext_stubs_autogen.h" + "src/libGLESv2/egl_stubs.cpp" + "src/libGLESv2/egl_stubs_autogen.h" + "src/libGLESv2/entry_points_egl_autogen.cpp" + "src/libGLESv2/entry_points_egl_autogen.h" + "src/libGLESv2/entry_points_egl_ext_autogen.cpp" + "src/libGLESv2/entry_points_egl_ext_autogen.h" + "src/libGLESv2/entry_points_gles_1_0_autogen.cpp" + "src/libGLESv2/entry_points_gles_1_0_autogen.h" + "src/libGLESv2/entry_points_gles_2_0_autogen.cpp" + "src/libGLESv2/entry_points_gles_2_0_autogen.h" + "src/libGLESv2/entry_points_gles_3_0_autogen.cpp" + "src/libGLESv2/entry_points_gles_3_0_autogen.h" + "src/libGLESv2/entry_points_gles_3_1_autogen.cpp" + "src/libGLESv2/entry_points_gles_3_1_autogen.h" + "src/libGLESv2/entry_points_gles_3_2_autogen.cpp" + "src/libGLESv2/entry_points_gles_3_2_autogen.h" + "src/libGLESv2/entry_points_gles_ext_autogen.cpp" + "src/libGLESv2/entry_points_gles_ext_autogen.h" + "src/libGLESv2/global_state.cpp" + "src/libGLESv2/global_state.h" + "src/libGLESv2/libGLESv2_autogen.cpp" + "src/libGLESv2/proc_table_egl.h" + "src/libGLESv2/proc_table_egl_autogen.cpp" + "src/libGLESv2/resource.h" + "src/libGLESv2/libGLESv2_autogen.def" +) +add_library(libGLESv2 ${LIBGLESV2_SOURCES}) +target_link_libraries(libGLESv2 PRIVATE angle::common angle::libANGLE) +target_compile_definitions(libGLESv2 + PRIVATE -DLIBGLESV2_IMPLEMENTATION + PUBLIC + "-DGL_GLES_PROTOTYPES=1" + "-DGL_GLEXT_PROTOTYPES" + "-DEGL_EGL_PROTOTYPES=1" + "-DEGL_EGLEXT_PROTOTYPES" +) +if(BUILD_SHARED_LIBS) +else() + if(WIN32) + target_compile_definitions(libGLESv2 PRIVATE + "-DGL_API=" + "-DGL_APICALL=" + "-DEGLAPI=" + ) + else() + target_compile_definitions(libGLESv2 PRIVATE + "-DGL_API=__attribute__((visibility(\"default\")))" + "-DGL_APICALL=__attribute__((visibility(\"default\")))" + "-DEGLAPI=__attribute__((visibility(\"default\")))" + ) + endif() +endif() + +target_include_directories(libGLESv2 PUBLIC "$") + +########## +# libEGL +if(WIN32) + set(libEGL_def + "src/libEGL/libEGL_autogen.def" + ) +endif() +add_library(libEGL + "src/libEGL/egl_loader_autogen.h" + "src/libEGL/libEGL_autogen.cpp" + "src/libEGL/resource.h" + "src/libGLESv2/entry_points_egl_autogen.h" + "src/libGLESv2/entry_points_egl_ext_autogen.h" + ${libEGL_def} +) + +target_link_libraries(libEGL PRIVATE angle::common angle::libANGLE libGLESv2) +target_include_directories(libEGL PUBLIC "$" "$") +target_compile_definitions(libEGL + PRIVATE + "-DLIBEGL_IMPLEMENTATION" + PUBLIC + "-DGL_GLES_PROTOTYPES=1" + "-DGL_GLEXT_PROTOTYPES" + "-DEGL_EGL_PROTOTYPES=1" + "-DEGL_EGLEXT_PROTOTYPES" +) +add_library(GL_VISIBILITY INTERFACE) +if(WIN32) + target_compile_definitions(GL_VISIBILITY INTERFACE + "-DGL_API=" + "-DGL_APICALL=") +else() + target_compile_definitions(GL_VISIBILITY INTERFACE + "-DGL_API=__attribute__((visibility(\"default\")))" + "-DGL_APICALL=__attribute__((visibility(\"default\")))") +endif() +target_link_libraries(libEGL PRIVATE GL_VISIBILITY) +target_link_libraries(libGLESv2 PRIVATE GL_VISIBILITY) + +if(WIN32) + target_compile_definitions(libEGL PRIVATE + "-DEGLAPI=" + ) +else() + target_compile_definitions(libEGL PRIVATE + "-DEGLAPI=__attribute__((visibility(\"default\")))" + ) +endif() + +if(NOT BUILD_SHARED_LIBS) + add_definitions("-DANGLE_EXPORT=" "-DANGLE_UTIL_EXPORT=" "-DEGLAPI=" "-DGL_APICALL=" "-DGL_API=") +endif() + +set_target_properties(libANGLE PROPERTIES PREFIX "") +set_target_properties(libGLESv2 PROPERTIES PREFIX "" IMPORT_PREFIX "") +set_target_properties(libEGL PROPERTIES PREFIX "" IMPORT_PREFIX "") + +install(TARGETS libEGL libGLESv2 libANGLE angle_common angle_compression_utils angle_image_util angle_gpu_info_util angle_translator angle_preprocessor GL_VISIBILITY EXPORT ANGLEExport + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(WINDOWS_DESKTOP) + install(TARGETS angle_renderer_d3d angle_renderer_win32 angle_renderer_opengl EXPORT ANGLEExport + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + ) +elseif(WINDOWS_STORE) + install(TARGETS angle_renderer_d3d angle_renderer_winrt EXPORT ANGLEExport + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + ) +else() + install(TARGETS angle_renderer_opengl EXPORT ANGLEExport + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + ) +endif() + +install(EXPORT ANGLEExport FILE unofficial-angle-config.cmake NAMESPACE unofficial::angle:: DESTINATION share/unofficial-angle) + +if(NOT DISABLE_INSTALL_HEADERS) + install( + DIRECTORY include/ + DESTINATION include + FILES_MATCHING + PATTERN "*.h" + PATTERN "*.inc" + PATTERN "CL" EXCLUDE + PATTERN "GLSLANG" EXCLUDE + PATTERN "egl.h" EXCLUDE + PATTERN "eglext.h" EXCLUDE + PATTERN "eglplatform.h" EXCLUDE + PATTERN "KHR" EXCLUDE + PATTERN "WGL" EXCLUDE + PATTERN "export.h" EXCLUDE + ) +endif() diff --git a/externals/vcpkg/ports/angle/angle_commit.h b/externals/vcpkg/ports/angle/angle_commit.h new file mode 100755 index 000000000..57a20e3b7 --- /dev/null +++ b/externals/vcpkg/ports/angle/angle_commit.h @@ -0,0 +1,3 @@ +#define ANGLE_COMMIT_HASH "invalid-hash" +#define ANGLE_COMMIT_HASH_SIZE 12 +#define ANGLE_COMMIT_DATE "invalid-date" diff --git a/externals/vcpkg/ports/angle/portfile.cmake b/externals/vcpkg/ports/angle/portfile.cmake new file mode 100755 index 000000000..ed604ecb4 --- /dev/null +++ b/externals/vcpkg/ports/angle/portfile.cmake @@ -0,0 +1,99 @@ +if (VCPKG_TARGET_IS_LINUX) + message(WARNING "Building with a gcc version less than 6.1 is not supported.") + message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n libx11-dev\n libmesa-dev\n libxi-dev\n libxext-dev\n\nThese can be installed on Ubuntu systems via apt-get install libx11-dev libmesa-dev libxi-dev libxext-dev.") +endif() + +if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(ANGLE_CPU_BITNESS ANGLE_IS_32_BIT_CPU) +elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(ANGLE_CPU_BITNESS ANGLE_IS_64_BIT_CPU) +elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(ANGLE_CPU_BITNESS ANGLE_IS_32_BIT_CPU) +elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(ANGLE_CPU_BITNESS ANGLE_IS_64_BIT_CPU) +else() + message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/angle + REF d15be77864e18f407c317be6f6bc06ee2b7d070a # chromium/4472 + SHA512 aad8563ee65458a7865ec7c668d1f90ac2891583c569a22dcd2c557263b72b26386f56b74a7294398be2cf5c548df513159e4be53f3f096f19819ca06227d9ac + # On update check headers against opengl-registry + PATCHES + 001-fix-uwp.patch + 002-fix-builder-error.patch + 003-fix-mingw.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/angle_commit.h DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/angle_commit.h DESTINATION ${SOURCE_PATH}/src/common) + +function(checkout_in_path_with_patches PATH URL REF PATCHES) + if(EXISTS "${PATH}") + return() + endif() + + vcpkg_from_git( + OUT_SOURCE_PATH DEP_SOURCE_PATH + URL "${URL}" + REF "${REF}" + PATCHES ${PATCHES} + ) + file(RENAME "${DEP_SOURCE_PATH}" "${PATH}") + file(REMOVE_RECURSE "${DEP_SOURCE_PATH}") +endfunction() + +checkout_in_path_with_patches( + "${SOURCE_PATH}/third_party/zlib" + "https://chromium.googlesource.com/chromium/src/third_party/zlib" + "09490503d0f201b81e03f5ca0ab8ba8ee76d4a8e" + "third-party-zlib-far-undef.patch" +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1 + OPTIONS + -D${ANGLE_CPU_BITNESS}=1 +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-angle TARGET_PATH share/unofficial-angle) + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +# File conflict with opengl-registry! Make sure headers are similar on Update! +# angle defines some additional entrypoints. +# opengl-registry probably needs an upstream update to account for those +# Due to that all angle headers get moved to include/angle. +# If you want to use those instead of the onces provided by opengl-registry make sure +# VCPKG_INSTALLED_DIR/include/angle is before VCPKG_INSTALLED_DIR/include +file(GLOB_RECURSE angle_includes "${CURRENT_PACKAGES_DIR}/include") +file(COPY ${angle_includes} DESTINATION "${CURRENT_PACKAGES_DIR}/include/angle") + +set(_double_files + include/GLES/egl.h + include/GLES/gl.h + include/GLES/glext.h + include/GLES/glplatform.h + include/GLES2/gl2.h + include/GLES2/gl2ext.h + include/GLES2/gl2platform.h + include/GLES3/gl3.h + include/GLES3/gl31.h + include/GLES3/gl32.h + include/GLES3/gl3platform.h) +foreach(_file ${_double_files}) + if(EXISTS "${CURRENT_PACKAGES_DIR}/${_file}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/${_file}") + endif() +endforeach() + + diff --git a/externals/vcpkg/ports/angle/third-party-zlib-far-undef.patch b/externals/vcpkg/ports/angle/third-party-zlib-far-undef.patch new file mode 100755 index 000000000..c92b058d2 --- /dev/null +++ b/externals/vcpkg/ports/angle/third-party-zlib-far-undef.patch @@ -0,0 +1,13 @@ +diff --git a/google/compression_utils_portable.h b/google/compression_utils_portable.h +--- a/google/compression_utils_portable.h ++++ b/google/compression_utils_portable.h +@@ -13,6 +13,9 @@ + * zlib. + */ + #if defined(USE_SYSTEM_ZLIB) ++# if defined(WIN32) && defined(FAR) ++# undef FAR ++# endif + #include + /* AOSP build requires relative paths. */ + #else diff --git a/externals/vcpkg/ports/angle/vcpkg.json b/externals/vcpkg/ports/angle/vcpkg.json new file mode 100755 index 000000000..2c582aeb5 --- /dev/null +++ b/externals/vcpkg/ports/angle/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "angle", + "version-string": "chromium_4472", + "port-version": 3, + "description": [ + "A conformant OpenGL ES implementation for Windows, Mac and Linux.", + "The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support." + ], + "homepage": "https://github.com/google/angle", + "dependencies": [ + "egl-registry", + "opengl-registry", + "zlib" + ] +} diff --git a/externals/vcpkg/ports/antlr4/export_guid.patch b/externals/vcpkg/ports/antlr4/export_guid.patch new file mode 100755 index 000000000..053a6e236 --- /dev/null +++ b/externals/vcpkg/ports/antlr4/export_guid.patch @@ -0,0 +1,22 @@ +diff -urN a/runtime/src/support/Guid.h b/runtime/src/support/Guid.h +--- a/runtime/src/support/Guid.h ++++ b/runtime/src/support/Guid.h +@@ -42,7 +42,7 @@ namespace antlrcpp { + // 16 byte value that can be passed around by value. It also supports + // conversion to string (via the stream operator <<) and conversion from a + // string via constructor. +-class Guid final { ++class ANTLR4CPP_PUBLIC Guid final { + public: + using size_type = typename std::array::size_type; + using pointer = typename std::array::pointer; +@@ -131,7 +131,7 @@ private: + // function would no longer be cross-platform if we parameterized the android + // version. Instead, construction of the GuidGenerator may be different on + // each platform, but the use of newGuid is uniform. +-class GuidGenerator final { ++class ANTLR4CPP_PUBLIC GuidGenerator final { + public: + #ifdef GUID_ANDROID + GuidGenerator(JNIEnv *env); + diff --git a/externals/vcpkg/ports/antlr4/fixed_build.patch b/externals/vcpkg/ports/antlr4/fixed_build.patch new file mode 100755 index 000000000..3afb4c249 --- /dev/null +++ b/externals/vcpkg/ports/antlr4/fixed_build.patch @@ -0,0 +1,115 @@ +diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt +index c8b16c6..53b47dd 100644 +--- a/runtime/CMakeLists.txt ++++ b/runtime/CMakeLists.txt +@@ -21,10 +21,13 @@ file(GLOB libantlrcpp_SRC + "${PROJECT_SOURCE_DIR}/runtime/src/tree/xpath/*.cpp" + ) + ++if(BUILD_SHARED_LIBS) + add_library(antlr4_shared SHARED ${libantlrcpp_SRC}) ++else() + add_library(antlr4_static STATIC ${libantlrcpp_SRC}) ++endif() + +-set(LIB_OUTPUT_DIR "${CMAKE_HOME_DIRECTORY}/dist") # put generated libraries here. ++#set(LIB_OUTPUT_DIR "${CMAKE_HOME_DIRECTORY}/dist") # put generated libraries here. + message(STATUS "Output libraries to ${LIB_OUTPUT_DIR}") + + # make sure 'make' works fine even if ${LIB_OUTPUT_DIR} is deleted. +@@ -32,16 +35,22 @@ add_custom_target(make_lib_output_dir ALL + COMMAND ${CMAKE_COMMAND} -E make_directory ${LIB_OUTPUT_DIR} + ) + ++if(BUILD_SHARED_LIBS) + add_dependencies(antlr4_shared make_lib_output_dir) ++else() + add_dependencies(antlr4_static make_lib_output_dir) ++endif() + + find_package(utf8cpp QUIET) + + set(INSTALL_utf8cpp FALSE) + + if (utf8cpp_FOUND) ++ if(BUILD_SHARED_LIBS) + target_link_libraries(antlr4_shared utf8cpp) ++ else() + target_link_libraries(antlr4_static utf8cpp) ++ endif() + else() + + # older utf8cpp doesn't define the package above +@@ -51,7 +60,7 @@ else() + + if (utf8cpp_HEADER) + include_directories(${utf8cpp_HEADER}) +- else() ++ elseif(0) + include(${CMAKE_ROOT}/Modules/ExternalProject.cmake) + set(THIRDPARTY_DIR ${CMAKE_BINARY_DIR}/runtime/thirdparty) + set(UTFCPP_DIR ${THIRDPARTY_DIR}/utfcpp) +@@ -76,11 +85,17 @@ else() + endif() + + if(CMAKE_SYSTEM_NAME MATCHES "Linux") ++ if(BUILD_SHARED_LIBS) + target_link_libraries(antlr4_shared ${UUID_LIBRARIES}) ++ else() + target_link_libraries(antlr4_static ${UUID_LIBRARIES}) ++ endif() + elseif(APPLE) ++ if(BUILD_SHARED_LIBS) + target_link_libraries(antlr4_shared ${COREFOUNDATION_LIBRARY}) ++ else() + target_link_libraries(antlr4_static ${COREFOUNDATION_LIBRARY}) ++ endif() + endif() + + if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") +@@ -102,7 +117,7 @@ if(WIN32) + set(extra_share_compile_flags "-DANTLR4CPP_EXPORTS") + set(extra_static_compile_flags "-DANTLR4CPP_STATIC") + endif(WIN32) +-if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") ++if(0) + if(WITH_STATIC_CRT) + target_compile_options(antlr4_shared PRIVATE "/MT$<$:d>") + target_compile_options(antlr4_static PRIVATE "/MT$<$:d>") +@@ -122,6 +137,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") + set(extra_static_compile_flags "-DANTLR4CPP_STATIC -MP") + endif() + ++if(BUILD_SHARED_LIBS) + set_target_properties(antlr4_shared + PROPERTIES VERSION ${ANTLR_VERSION} + SOVERSION ${ANTLR_VERSION} +@@ -132,20 +148,25 @@ set_target_properties(antlr4_shared + RUNTIME_OUTPUT_DIRECTORY ${LIB_OUTPUT_DIR} + ARCHIVE_OUTPUT_DIRECTORY ${LIB_OUTPUT_DIR} + COMPILE_FLAGS "${disabled_compile_warnings} ${extra_share_compile_flags}") +- ++else() + set_target_properties(antlr4_static + PROPERTIES VERSION ${ANTLR_VERSION} + SOVERSION ${ANTLR_VERSION} + OUTPUT_NAME "antlr4-runtime${static_lib_suffix}" + ARCHIVE_OUTPUT_DIRECTORY ${LIB_OUTPUT_DIR} + COMPILE_FLAGS "${disabled_compile_warnings} ${extra_static_compile_flags}") ++endif() + +-install(TARGETS antlr4_shared ++if(BUILD_SHARED_LIBS) ++install(TARGETS antlr4_shared EXPORT antlr4-targets + DESTINATION lib +- EXPORT antlr4-targets) ++ RUNTIME DESTINATION bin ++ ) ++else() + install(TARGETS antlr4_static + DESTINATION lib + EXPORT antlr4-targets) ++endif() + + install(DIRECTORY "${PROJECT_SOURCE_DIR}/runtime/src/" + DESTINATION "include/antlr4-runtime" diff --git a/externals/vcpkg/ports/antlr4/portfile.cmake b/externals/vcpkg/ports/antlr4/portfile.cmake new file mode 100755 index 000000000..2cef839c0 --- /dev/null +++ b/externals/vcpkg/ports/antlr4/portfile.cmake @@ -0,0 +1,43 @@ +set(VERSION 4.9.3) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.antlr.org/download/antlr4-cpp-runtime-${VERSION}-source.zip" + FILENAME "antlr4-cpp-runtime-${VERSION}-source.zip" + SHA512 23995a6fa661ff038142fa7220a195db3a9a26744d516011dedc3192f152b06a8e31f6cc8f969f8927b86392a960d03e89572e753f033f950839a5bd38d4c722 +) + +# license not exist in antlr folder. +vcpkg_download_distfile(LICENSE + URLS https://raw.githubusercontent.com/antlr/antlr4/${VERSION}/LICENSE.txt + FILENAME "antlr4-copyright-${VERSION}" + SHA512 1e8414de5fdc211e3188a8ec3276c6b3c55235f5edaf48522045ae18fa79fd9049719cb8924d25145016f223ac9a178defada1eeb983ccff598a08b0c0f67a3b +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL + REF ${VERSION} + PATCHES + fixed_build.patch + uuid_discovery_fix.patch + export_guid.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DANTLR4_INSTALL=ON + OPTIONS_DEBUG -DLIB_OUTPUT_DIR=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/dist + OPTIONS_RELEASE -DLIB_OUTPUT_DIR=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/dist +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME antlr4-generator CONFIG_PATH lib/cmake/antlr4-generator DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME antlr4-runtime CONFIG_PATH lib/cmake/antlr4-runtime) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_copy_pdbs() + +file(INSTALL "${LICENSE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/antlr4/uuid_discovery_fix.patch b/externals/vcpkg/ports/antlr4/uuid_discovery_fix.patch new file mode 100755 index 000000000..9221d296c --- /dev/null +++ b/externals/vcpkg/ports/antlr4/uuid_discovery_fix.patch @@ -0,0 +1,35 @@ +diff -urN a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -42,8 +42,10 @@ if(CMAKE_VERSION VERSION_EQUAL "3.3.0" OR + endif() + + if(CMAKE_SYSTEM_NAME MATCHES "Linux") +- find_package(PkgConfig REQUIRED) +- pkg_check_modules(UUID REQUIRED uuid) ++ find_path(UUID_INCLUDE_DIR uuid/uuid.h) ++ find_library(UUID_LIBRARY NAMES uuid) ++ include_directories(${UUID_INCLUDE_DIR}) ++ link_libraries(${UUID_LIBRARY}) + endif() + if(APPLE) + find_library(COREFOUNDATION_LIBRARY CoreFoundation) +diff --git a/runtime/src/support/Guid.cpp b/runtime/src/support/Guid.cpp +--- a/runtime/src/support/Guid.cpp ++++ b/runtime/src/support/Guid.cpp +@@ -24,6 +24,7 @@ + + #include + ++#include "antlr4-common.h" + #include "Guid.h" + + #ifdef GUID_LIBUUID +@@ -35,6 +36,7 @@ + #endif + + #ifdef GUID_WINDOWS ++#define NOMINMAX + #include + #endif + diff --git a/externals/vcpkg/ports/antlr4/vcpkg.json b/externals/vcpkg/ports/antlr4/vcpkg.json new file mode 100755 index 000000000..d8db31ef5 --- /dev/null +++ b/externals/vcpkg/ports/antlr4/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "antlr4", + "version": "4.9.3", + "port-version": 2, + "description": "ANother Tool for Language Recognition", + "homepage": "https://www.antlr.org", + "license": "BSD-3-Clause", + "supports": "!uwp", + "dependencies": [ + { + "name": "libuuid", + "platform": "!uwp & !windows & !osx" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/any-lite/portfile.cmake b/externals/vcpkg/ports/any-lite/portfile.cmake new file mode 100755 index 000000000..a1b509d65 --- /dev/null +++ b/externals/vcpkg/ports/any-lite/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO martinmoene/any-lite + REF d45a83b8e49d09ff5e5b66c10a56c997946436d9 #v0.4.0 + SHA512 b73fe2d1e6de24e143337ef72f71949bf2ae4157a58a5c7e45dd0e9412dd798da6ef929fa09d104305483e769a603b37babd7ba65ab854a33483ab3ec8a921ec +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DANY_LITE_OPT_BUILD_TESTS=OFF + -DANY_LITE_OPT_BUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/any-lite/vcpkg.json b/externals/vcpkg/ports/any-lite/vcpkg.json new file mode 100755 index 000000000..31f836c51 --- /dev/null +++ b/externals/vcpkg/ports/any-lite/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "any-lite", + "version-semver": "0.4.0", + "description": "A C++17-like any, a type-safe container for single values of any type for C++98, C++11 and later in a single-file header-only library", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/anyrpc/portfile.cmake b/externals/vcpkg/ports/anyrpc/portfile.cmake new file mode 100755 index 000000000..3090d2db9 --- /dev/null +++ b/externals/vcpkg/ports/anyrpc/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sgieseking/anyrpc + REF b1949b3d40849229055ae75cf5334b9d08579502 + SHA512 8c674d29e80ec2522d6c1ec959663958ab4e1bf1135727c3c2aaa19e62a81ddbbd1e6a46f3e4679ee02894ad2ab26e70ca7e1e6c8750f3289994311069221b53 + HEAD_REF master + FILE_DISAMBIGUATOR 1 +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ANYRPC_LIB_BUILD_SHARED) + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF + -DBUILD_WITH_LOG4CPLUS=OFF + -DANYRPC_LIB_BUILD_SHARED=${ANYRPC_LIB_BUILD_SHARED} +) + +vcpkg_install_cmake() + +file(INSTALL "${SOURCE_PATH}/license" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/anyrpc/vcpkg.json b/externals/vcpkg/ports/anyrpc/vcpkg.json new file mode 100755 index 000000000..02ffac66d --- /dev/null +++ b/externals/vcpkg/ports/anyrpc/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "anyrpc", + "version-date": "2021-08-24", + "description": "A multiprotocol remote procedure call system for C++.", + "homepage": "https://github.com/sgieseking/anyrpc" +} diff --git a/externals/vcpkg/ports/aom/aom-install.diff b/externals/vcpkg/ports/aom/aom-install.diff new file mode 100755 index 000000000..e24b8c536 --- /dev/null +++ b/externals/vcpkg/ports/aom/aom-install.diff @@ -0,0 +1,75 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 18190f647..f4b1b359d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,6 +23,9 @@ endif() + + project(AOM C CXX) + ++include(GNUInstallDirs) ++include(CMakePackageConfigHelpers) ++ + # GENERATED source property global visibility. + if(POLICY CMP0118) + cmake_policy(SET CMP0118 NEW) +@@ -302,6 +305,52 @@ if(BUILD_SHARED_LIBS) + set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_static) + endif() + ++set(PUBLIC_HEADERS ++ aom/aom.h ++ aom/aom_codec.h ++ aom/aom_decoder.h ++ aom/aom_encoder.h ++ aom/aom_frame_buffer.h ++ aom/aom_image.h ++ aom/aom_integer.h ++ aom/aomcx.h ++ aom/aomdx.h ++) ++ ++set_target_properties(aom PROPERTIES ++ PUBLIC_HEADER "${PUBLIC_HEADERS}") ++ ++ ++target_include_directories(aom ++ PUBLIC $ ++ $) ++ ++install(TARGETS aom ++ EXPORT unofficial-aom-targets ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aom") ++ ++install(EXPORT unofficial-aom-targets ++ FILE unofficial-aom-targets.cmake ++ NAMESPACE unofficial:: ++ DESTINATION lib/cmake/aom) ++ ++configure_package_config_file(cmake/aom-config.cmake.in ++ ${CMAKE_CURRENT_BINARY_DIR}/aom-config.cmake ++ INSTALL_DESTINATION lib/cmake/aom ++ NO_SET_AND_CHECK_MACRO ++ NO_CHECK_REQUIRED_COMPONENTS_MACRO) ++ ++write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/aom-config-version.cmake ++ VERSION ${SO_FILE_VERSION} ++ COMPATIBILITY SameMajorVersion) ++ ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/aom-config.cmake ++ ${CMAKE_CURRENT_BINARY_DIR}/aom-config-version.cmake ++ DESTINATION lib/cmake/aom) ++ + # Setup dependencies. + if(CONFIG_THREE_PASS) + setup_ivf_dec_targets() +diff --git a/cmake/aom-config.cmake.in b/cmake/aom-config.cmake.in +new file mode 100644 +index 000000000..91cac3b5b +--- /dev/null ++++ b/cmake/aom-config.cmake.in +@@ -0,0 +1,2 @@ ++@PACKAGE_INIT@ ++include(${CMAKE_CURRENT_LIST_DIR}/unofficial-aom-targets.cmake) diff --git a/externals/vcpkg/ports/aom/aom-rename-static.diff b/externals/vcpkg/ports/aom/aom-rename-static.diff new file mode 100755 index 000000000..e38c73fb1 --- /dev/null +++ b/externals/vcpkg/ports/aom/aom-rename-static.diff @@ -0,0 +1,12 @@ +diff -pruN aom-3.0.0.o/CMakeLists.txt aom-3.0.0/CMakeLists.txt +--- aom-3.0.0.o/CMakeLists.txt 2021-04-15 20:05:52.695181200 +0300 ++++ aom-3.0.0/CMakeLists.txt 2021-04-15 22:34:16.147522600 +0300 +@@ -249,7 +249,7 @@ endif() + add_library(aom ${AOM_SOURCES} $) + if(BUILD_SHARED_LIBS) + add_library(aom_static STATIC ${AOM_SOURCES} $) +- set_target_properties(aom_static PROPERTIES OUTPUT_NAME aom) ++ set_target_properties(aom_static PROPERTIES OUTPUT_NAME aom_static) + + if(NOT MSVC) + # Extract version string and set VERSION/SOVERSION for the aom target. diff --git a/externals/vcpkg/ports/aom/aom-uninitialized-pointer.diff b/externals/vcpkg/ports/aom/aom-uninitialized-pointer.diff new file mode 100755 index 000000000..b80f2e08f --- /dev/null +++ b/externals/vcpkg/ports/aom/aom-uninitialized-pointer.diff @@ -0,0 +1,13 @@ +diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake +index 43d60ae..35c510b 100644 +--- a/build/cmake/aom_configure.cmake ++++ b/build/cmake/aom_configure.cmake +@@ -265,6 +265,8 @@ if(MSVC) + + # Disable MSVC warnings that suggest making code non-portable. + add_compiler_flag_if_supported("/wd4996") ++ # Disable MSVC warnings for potentially uninitialized local pointer variable. ++ add_compiler_flag_if_supported("/wd4703") + if(ENABLE_WERROR) + add_compiler_flag_if_supported("/WX") + endif() diff --git a/externals/vcpkg/ports/aom/portfile.cmake b/externals/vcpkg/ports/aom/portfile.cmake new file mode 100755 index 000000000..81152e05a --- /dev/null +++ b/externals/vcpkg/ports/aom/portfile.cmake @@ -0,0 +1,56 @@ +# NASM is required to build AOM +vcpkg_find_acquire_program(NASM) +get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) +vcpkg_add_to_path(${NASM_EXE_PATH}) + +# Perl is required to build AOM +vcpkg_find_acquire_program(PERL) +get_filename_component(PERL_PATH ${PERL} DIRECTORY) +vcpkg_add_to_path(${PERL_PATH}) + +vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH + URL "https://aomedia.googlesource.com/aom" + REF 6bbe6ae701d65bdf36bb72053db9b71f9739a083 + FETCH_REF v3.2.0 + PATCHES + aom-rename-static.diff + # Can be dropped when https://bugs.chromium.org/p/aomedia/issues/detail?id=3029 is merged into the upstream + aom-install.diff + aom-uninitialized-pointer.diff +) + +set(aom_target_cpu "") +if(VCPKG_TARGET_IS_UWP) + # UWP + aom's assembler files result in weirdness and build failures + set(aom_target_cpu "-DAOM_TARGET_CPU=generic") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${aom_target_cpu} + -DENABLE_DOCS=OFF + -DENABLE_EXAMPLES=OFF + -DENABLE_TESTDATA=OFF + -DENABLE_TESTS=OFF + -DENABLE_TOOLS=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +# Move cmake configs +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +# Remove duplicate files +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/aom/vcpkg.json b/externals/vcpkg/ports/aom/vcpkg.json new file mode 100755 index 000000000..8ecb61261 --- /dev/null +++ b/externals/vcpkg/ports/aom/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "aom", + "version-semver": "3.2.0", + "port-version": 3, + "description": "AV1 codec library", + "homepage": "https://aomedia.googlesource.com/aom", + "supports": "!(windows & arm & !uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/approval-tests-cpp/portfile.cmake b/externals/vcpkg/ports/approval-tests-cpp/portfile.cmake new file mode 100755 index 000000000..38eaf3acb --- /dev/null +++ b/externals/vcpkg/ports/approval-tests-cpp/portfile.cmake @@ -0,0 +1,14 @@ +vcpkg_download_distfile(single_header + URLS https://github.com/approvals/ApprovalTests.cpp/releases/download/v.10.12.2/ApprovalTests.v.10.12.2.hpp + FILENAME ApprovalTests.v.10.12.2.hpp + SHA512 ed59736f52afff246409dcf435ad12a8f15697ae80962c456ca877fbf8adcb99af1bb71424ebcb214df719506015aac27006c1cfec174700b1833db64efb3568 +) + +vcpkg_download_distfile(license_file + URLS https://raw.githubusercontent.com/approvals/ApprovalTests.cpp/v.10.12.2/LICENSE + FILENAME ApprovalTestsLicense.v.10.12.2 + SHA512 dc6b68d13b8cf959644b935f1192b02c71aa7a5cf653bd43b4480fa89eec8d4d3f16a2278ec8c3b40ab1fdb233b3173a78fd83590d6f739e0c9e8ff56c282557 +) + +file(INSTALL "${single_header}" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME ApprovalTests.hpp) +file(INSTALL "${license_file}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/approval-tests-cpp/vcpkg.json b/externals/vcpkg/ports/approval-tests-cpp/vcpkg.json new file mode 100755 index 000000000..a57ee3113 --- /dev/null +++ b/externals/vcpkg/ports/approval-tests-cpp/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "approval-tests-cpp", + "version": "10.12.2", + "description": "Approval Tests allow you to verify a chunk of output (such as a file) in one operation as opposed to writing test assertions for each element.", + "homepage": "https://github.com/approvals/ApprovalTests.cpp" +} diff --git a/externals/vcpkg/ports/apr-util/apr.patch b/externals/vcpkg/ports/apr-util/apr.patch new file mode 100755 index 000000000..581907fff --- /dev/null +++ b/externals/vcpkg/ports/apr-util/apr.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 69e45541..19b86129 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -35,7 +35,7 @@ IF(NOT EXISTS "${APR_INCLUDE_DIR}/apr.h") + MESSAGE(FATAL_ERROR "APR include directory ${APR_INCLUDE_DIR} is not correct.") + ENDIF() + FOREACH(onelib ${APR_LIBRARIES}) +- IF(NOT EXISTS ${onelib}) ++ IF(${onelib} MATCHES "NOTFOUND") + MESSAGE(FATAL_ERROR "APR library ${onelib} was not found.") + ENDIF() + ENDFOREACH() diff --git a/externals/vcpkg/ports/apr-util/portfile.cmake b/externals/vcpkg/ports/apr-util/portfile.cmake new file mode 100755 index 000000000..d50966c4e --- /dev/null +++ b/externals/vcpkg/ports/apr-util/portfile.cmake @@ -0,0 +1,89 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://archive.apache.org/dist/apr/apr-util-1.6.1.tar.bz2" + FILENAME "apr-util-1.6.1.tar.bz2" + SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d + +) + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES + use-vcpkg-expat.patch + apr.patch + ) + + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(APU_DECLARE_EXPORT ON) + set(APU_DECLARE_STATIC OFF) + else() + set(APU_DECLARE_EXPORT OFF) + set(APU_DECLARE_STATIC ON) + endif() + + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DAPU_DECLARE_EXPORT=${APU_DECLARE_EXPORT} + -DAPU_DECLARE_STATIC=${APU_DECLARE_STATIC} + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON + ) + + vcpkg_cmake_install() + vcpkg_copy_pdbs() + + file(READ ${CURRENT_PACKAGES_DIR}/include/apu.h APU_H) + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + string(REPLACE "defined(APU_DECLARE_EXPORT)" "1" APU_H "${APU_H}") + else() + string(REPLACE "defined(APU_DECLARE_STATIC)" "1" APU_H "${APU_H}") + endif() + file(WRITE ${CURRENT_PACKAGES_DIR}/include/apu.h "${APU_H}") + +else() + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + ) + + # To cross-compile you will need a triplet file that locates the tool chain and sets --host and --cache parameters of "./configure". + # The ${VCPKG_PLATFORM_TOOLSET}.cache file must have been generated on the targeted host using "./configure -C". + # For example, to target aarch64-linux-gnu, triplets/aarch64-linux-gnu.cmake should contain (beyond the standard content): + # set(VCPKG_PLATFORM_TOOLSET aarch64-linux-gnu) + # set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE ${MY_CROSS_DIR}/cmake/Toolchain-${VCPKG_PLATFORM_TOOLSET}.cmake) + # set(CONFIGURE_PARAMETER_1 --host=${VCPKG_PLATFORM_TOOLSET}) + # set(CONFIGURE_PARAMETER_2 --cache-file=${MY_CROSS_DIR}/autoconf/${VCPKG_PLATFORM_TOOLSET}.cache) + if(CONFIGURE_PARAMETER_1) + message(STATUS "Configuring apr-util with ${CONFIGURE_PARAMETER_1} ${CONFIGURE_PARAMETER_2} ${CONFIGURE_PARAMETER_3}") + else() + message(STATUS "Configuring apr-util") + endif() + + vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "--prefix=${CURRENT_INSTALLED_DIR}" + "--with-apr=${CURRENT_INSTALLED_DIR}/tools/apr" + "--with-openssl=${CURRENT_INSTALLED_DIR}" + "-with-expat=${CURRENT_INSTALLED_DIR}" + "${CONFIGURE_PARAMETER_1}" + "${CONFIGURE_PARAMETER_2}" + "${CONFIGURE_PARAMETER_3}" + ) + + vcpkg_install_make() + + vcpkg_fixup_pkgconfig() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/apr-util/bin/apu-1-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/apr-util/bin/apu-1-config" "${CURRENT_BUILDTREES_DIR}" "not/existing") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/apr-util/debug/bin/apu-1-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/apr-util/debug/bin/apu-1-config" "${CURRENT_BUILDTREES_DIR}" "not/existing") + endif() + +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/apr-util/use-vcpkg-expat.patch b/externals/vcpkg/ports/apr-util/use-vcpkg-expat.patch new file mode 100755 index 000000000..8a35f2bc5 --- /dev/null +++ b/externals/vcpkg/ports/apr-util/use-vcpkg-expat.patch @@ -0,0 +1,124 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9ae90b1..71a50b0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,16 +21,14 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) + + FIND_PACKAGE(OpenSSL) + +-FIND_PACKAGE(expat) +- + OPTION(APU_HAVE_CRYPTO "Crypto support" OFF) + OPTION(APU_HAVE_ODBC "Build ODBC DBD driver" ON) + OPTION(APR_HAS_LDAP "LDAP support" ON) + OPTION(INSTALL_PDB "Install .pdb files (if generated)" ON) + OPTION(APR_BUILD_TESTAPR "Build the test suite" OFF) + OPTION(TEST_STATIC_LIBS "Test programs use APR static libraries instead of shared libraries?" OFF) +-SET(APR_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE STRING "Directory with APR include files") +-SET(APR_LIBRARIES "${CMAKE_INSTALL_PREFIX}/lib/libapr-1.lib" CACHE STRING "APR library to link with") ++find_path(APR_INCLUDE_DIR apr.h) ++find_library(APR_LIBRARIES NAMES libapr-1 apr-1) + + IF(NOT EXISTS "${APR_INCLUDE_DIR}/apr.h") + MESSAGE(FATAL_ERROR "APR include directory ${APR_INCLUDE_DIR} is not correct.") +@@ -61,13 +59,13 @@ IF(APR_HAS_LDAP) + SET(apr_has_ldap_10 1) + ENDIF() + +-IF(NOT EXPAT_FOUND) ++find_package(expat) ++set(XMLLIB_INCLUDE_DIR ${EXPAT_INCLUDE_DIRS}) ++set(XMLLIB_LIBRARIES ${EXPAT_LIBRARIES}) ++IF(NOT XMLLIB_LIBRARIES) + MESSAGE(FATAL_ERROR "Expat is required, and it wasn't found!") + ENDIF() + +-SET(XMLLIB_INCLUDE_DIR ${EXPAT_INCLUDE_DIRS}) +-SET(XMLLIB_LIBRARIES ${EXPAT_LIBRARIES}) +- + SET(LDAP_LIBRARIES) + IF(APR_HAS_LDAP) + SET(LDAP_LIBRARIES wldap32) +@@ -229,17 +227,21 @@ SET(dbd_drivers) + # Note: The WINNT definition on some targets is used only by libaprutil.rc. + + # libaprutil-1 is shared, aprutil-1 is static ++if(BUILD_SHARED_LIBS) + ADD_LIBRARY(libaprutil-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libaprutil.rc) + SET(install_targets ${install_targets} libaprutil-1) + SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libaprutil-1.pdb) + TARGET_LINK_LIBRARIES(libaprutil-1 ${APR_LIBRARIES} ${XMLLIB_LIBRARIES}) +-SET_TARGET_PROPERTIES(libaprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_EXPORT;APR_DECLARE_EXPORT;XML_STATIC;WINNT") ++SET_TARGET_PROPERTIES(libaprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_EXPORT;APR_DECLARE_IMPORT;XML_STATIC;WINNT") + ++else(BUILD_SHARED_LIBS) + ADD_LIBRARY(aprutil-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED}) + SET(install_targets ${install_targets} aprutil-1) + TARGET_LINK_LIBRARIES(aprutil-1 ${APR_LIBRARIES} ${XMLLIB_LIBRARIES}) + SET_TARGET_PROPERTIES(aprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_STATIC;APR_DECLARE_STATIC;APU_DSO_MODULE_BUILD;XML_STATIC") ++endif(BUILD_SHARED_LIBS) + ++if(BUILD_SHARED_LIBS) + IF(APU_HAVE_CRYPTO) + IF(NOT OPENSSL_FOUND) + MESSAGE(FATAL_ERROR "Only OpenSSL-based crypto is currently implemented in the cmake build") +@@ -249,7 +251,7 @@ IF(APU_HAVE_CRYPTO) + SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/apr_crypto_openssl-1.pdb) + SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES INCLUDE_DIRECTORIES "${APR_INCLUDE_DIRECTORIES};${OPENSSL_INCLUDE_DIR}") + SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_DEFINITIONS "WINNT") +- SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_crypto_openssl") ++ SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_IMPORT -DAPU_DECLARE_IMPORT -DDLL_NAME=apr_crypto_openssl") + TARGET_LINK_LIBRARIES(apr_crypto_openssl-1 libaprutil-1 ${APR_LIBRARIES} ${OPENSSL_LIBRARIES}) + ENDIF() + +@@ -260,8 +262,8 @@ IF(APU_HAVE_ODBC) + SET(dbd_drivers ${dbd_drivers} odbc) + TARGET_LINK_LIBRARIES(apr_dbd_odbc-1 libaprutil-1 ${APR_LIBRARIES} odbc32 odbccp32) + SET_PROPERTY(TARGET apr_dbd_odbc-1 APPEND PROPERTY LINK_FLAGS /export:apr_dbd_odbc_driver) +- SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_DEFINITIONS "APU_HAVE_ODBC;HAVE_SQL_H;APU_DECLARE_EXPORT;APR_DECLARE_EXPORT;APU_DSO_MODULE_BUILD;WINNT") +- SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_dbd_odbc") ++ SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_DEFINITIONS "APU_HAVE_ODBC;HAVE_SQL_H;APU_DECLARE_IMPORT;APR_DECLARE_IMPORT;APU_DSO_MODULE_BUILD;WINNT") ++ SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_IMPORT -DAPU_DECLARE_IMPORT -DDLL_NAME=apr_dbd_odbc") + ENDIF() + + IF(APR_HAS_LDAP) +@@ -271,11 +273,12 @@ IF(APR_HAS_LDAP) + SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/apr_ldap-1.pdb) + TARGET_LINK_LIBRARIES(apr_ldap-1 libaprutil-1 ${APR_LIBRARIES} ${LDAP_LIBRARIES}) + SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_DEFINITIONS "WINNT") +- SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_ldap") ++ SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_IMPORT -DAPU_DECLARE_IMPORT -DDLL_NAME=apr_ldap") + SET(apr_ldap_libraries apr_ldap-1) + ELSE() + SET(apr_ldap_libraries) + ENDIF() ++endif(BUILD_SHARED_LIBS) + + IF(APR_BUILD_TESTAPR) + ENABLE_TESTING() +@@ -289,7 +292,7 @@ IF(APR_BUILD_TESTAPR) + ${PROJECT_SOURCE_DIR}/test/data/billion-laughs.xml + ${PROJECT_BINARY_DIR}/data/billion-laughs.xml) + +- IF(TEST_STATIC_LIBS) ++ IF(NOT BUILD_SHARED_LIBS) + SET(whichapr aprutil-1) + SET(apiflag "-DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC") + ELSE() +@@ -325,13 +328,9 @@ INSTALL(TARGETS ${install_targets} + ARCHIVE DESTINATION lib + ) + +-IF(INSTALL_PDB) +- INSTALL(FILES ${install_bin_pdb} +- DESTINATION bin +- CONFIGURATIONS RelWithDebInfo Debug) +-ENDIF() +- +-INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include) ++if(NOT DISABLE_INSTALL_HEADERS) ++ INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include) ++endif() + + STRING(TOUPPER "${CMAKE_BUILD_TYPE}" buildtype) + MESSAGE(STATUS "") diff --git a/externals/vcpkg/ports/apr-util/vcpkg.json b/externals/vcpkg/ports/apr-util/vcpkg.json new file mode 100755 index 000000000..0dbff727e --- /dev/null +++ b/externals/vcpkg/ports/apr-util/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "apr-util", + "version": "1.6.1", + "port-version": 7, + "description": "Apache Portable Runtime (APR) project mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation", + "homepage": "https://apr.apache.org/", + "dependencies": [ + "apr", + "expat", + "openssl", + { + "name": "vcpkg-cmake", + "host": true, + "platform": "windows" + } + ] +} diff --git a/externals/vcpkg/ports/apr/fix-configcmake.patch b/externals/vcpkg/ports/apr/fix-configcmake.patch new file mode 100755 index 000000000..8104810d0 --- /dev/null +++ b/externals/vcpkg/ports/apr/fix-configcmake.patch @@ -0,0 +1,62 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b4632c3..0b86d12 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -259,27 +259,35 @@ SET(install_targets) + SET(install_bin_pdb) + + # libapr-1 is shared, apr-1 is static ++IF(BUILD_SHARED_LIBS) + ADD_LIBRARY(libapr-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libapr.rc) + SET(install_targets ${install_targets} libapr-1) + SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libapr-1.pdb) + TARGET_LINK_LIBRARIES(libapr-1 ${APR_SYSTEM_LIBS}) + SET_TARGET_PROPERTIES(libapr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_EXPORT;WINNT") + ADD_DEPENDENCIES(libapr-1 test_char_header) +- ++TARGET_INCLUDE_DIRECTORIES(libapr-1 INTERFACE $) ++ELSE() + ADD_LIBRARY(apr-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED}) + SET(install_targets ${install_targets} apr-1) + TARGET_LINK_LIBRARIES(apr-1 ${APR_SYSTEM_LIBS}) + SET_TARGET_PROPERTIES(apr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;WINNT") + ADD_DEPENDENCIES(apr-1 test_char_header) ++TARGET_INCLUDE_DIRECTORIES(apr-1 INTERFACE $) ++ENDIF() + + # libaprapp-1 and aprapp-1 are static ++IF(BUILD_SHARED_LIBS) + ADD_LIBRARY(libaprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED}) + SET(install_targets ${install_targets} libaprapp-1) + SET_TARGET_PROPERTIES(libaprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_APP;WINNT") +- ++TARGET_INCLUDE_DIRECTORIES(libaprapp-1 INTERFACE $) ++ELSE() + ADD_LIBRARY(aprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED}) + SET(install_targets ${install_targets} aprapp-1) + SET_TARGET_PROPERTIES(aprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_APP;WINNT") ++TARGET_INCLUDE_DIRECTORIES(aprapp-1 INTERFACE $) ++ENDIF() + + IF(APR_BUILD_TESTAPR) + ENABLE_TESTING() +@@ -385,12 +393,18 @@ ENDIF (APR_BUILD_TESTAPR) + + # Installation + +-INSTALL(TARGETS ${install_targets} ++INSTALL(TARGETS ${install_targets} EXPORT unofficial-apr-config + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + ) + ++INSTALL(EXPORT unofficial-apr-config ++ NAMESPACE unofficial::apr:: ++ DESTINATION share/unofficial-apr ++ FILE unofficial-apr-config.cmake ++) ++ + IF(INSTALL_PDB) + INSTALL(FILES ${install_bin_pdb} + DESTINATION bin diff --git a/externals/vcpkg/ports/apr/portfile.cmake b/externals/vcpkg/ports/apr/portfile.cmake new file mode 100755 index 000000000..924d6ee7f --- /dev/null +++ b/externals/vcpkg/ports/apr/portfile.cmake @@ -0,0 +1,87 @@ + +set(VERSION 1.7.0) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.apache.org/dist/apr/apr-${VERSION}.tar.bz2" + FILENAME "apr-${VERSION}.tar.bz2" + SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES + fix-configcmake.patch +) + +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + private-headers APR_INSTALL_PRIVATE_H + ) + + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DINSTALL_PDB=OFF + -DMIN_WINDOWS_VER=Windows7 + -DAPR_HAVE_IPV6=ON + ${FEATURE_OPTIONS} + ) + + vcpkg_cmake_install() + vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-apr CONFIG_PATH share/unofficial-apr) + # There is no way to suppress installation of the headers in debug builds. + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + + vcpkg_copy_pdbs() +else() + # To cross-compile you will need a triplet file that locates the tool chain and sets --host and --cache parameters of "./configure". + # The ${VCPKG_PLATFORM_TOOLSET}.cache file must have been generated on the targeted host using "./configure -C". + # For example, to target aarch64-linux-gnu, triplets/aarch64-linux-gnu.cmake should contain (beyond the standard content): + # set(VCPKG_PLATFORM_TOOLSET aarch64-linux-gnu) + # set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE ${MY_CROSS_DIR}/cmake/Toolchain-${VCPKG_PLATFORM_TOOLSET}.cmake) + # set(CONFIGURE_PARAMETER_1 --host=${VCPKG_PLATFORM_TOOLSET}) + # set(CONFIGURE_PARAMETER_2 --cache-file=${MY_CROSS_DIR}/autoconf/${VCPKG_PLATFORM_TOOLSET}.cache) + if(CONFIGURE_PARAMETER_1) + message(STATUS "Configuring apr with ${CONFIGURE_PARAMETER_1} ${CONFIGURE_PARAMETER_2} ${CONFIGURE_PARAMETER_3}") + else() + message(STATUS "Configuring apr") + endif() + set(ENV{CFLAGS} "$ENV{CFLAGS} -Wno-error=implicit-function-declaration") + vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "--prefix=${CURRENT_INSTALLED_DIR}" + "${CONFIGURE_PARAMETER_1}" + "${CONFIGURE_PARAMETER_2}" + "${CONFIGURE_PARAMETER_3}" + ) + + vcpkg_install_make() + + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/apr-1.pc" + "-lapr-\${APR_MAJOR_VERSION}" "-lapr-1" + ) + endif() + + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/apr-1.pc" + "-lapr-\${APR_MAJOR_VERSION}" "-lapr-1" + ) + vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread rt dl uuid crypt) + + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/apr-1-config" "\"${CURRENT_INSTALLED_DIR}\"" "`dirname $0`/../../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/apr-1-config" "APR_SOURCE_DIR=\"${SOURCE_PATH}\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/apr-1-config" "APR_BUILD_DIR=\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel\"" "") + + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "\"${CURRENT_INSTALLED_DIR}/debug\"" "`dirname $0`/../../../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "APR_SOURCE_DIR=\"${SOURCE_PATH}\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "APR_BUILD_DIR=\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg\"" "") + endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/apr/vcpkg.json b/externals/vcpkg/ports/apr/vcpkg.json new file mode 100755 index 000000000..f8efdea9b --- /dev/null +++ b/externals/vcpkg/ports/apr/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "apr", + "version": "1.7.0", + "port-version": 9, + "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.", + "homepage": "https://apr.apache.org/", + "license": "Apache-2.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true, + "platform": "windows" + }, + { + "name": "vcpkg-cmake-config", + "host": true, + "platform": "windows" + } + ], + "features": { + "private-headers": { + "description": "Install non-standard files required for building Apache httpd" + } + } +} diff --git a/externals/vcpkg/ports/apsi/portfile.cmake b/externals/vcpkg/ports/apsi/portfile.cmake new file mode 100755 index 000000000..500089791 --- /dev/null +++ b/externals/vcpkg/ports/apsi/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/APSI + REF 6365cb774b81a2a731334c656db21e5fdfb92870 + SHA512 f21d710a345663aeb35035565c55fd900076589d087a03a1ad7df8b8004ae0e059196f3c94ee63b5ad815a858e5404eea34ae203f7778d4190fd323fd08b7084 + HEAD_REF main +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + log4cplus APSI_USE_LOG4CPLUS + zeromq APSI_USE_ZMQ +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE + OPTIONS + "-DAPSI_BUILD_TESTS=OFF" + "-DAPSI_BUILD_CLI=OFF" + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME "APSI" CONFIG_PATH "lib/cmake/APSI-0.7") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/apsi/vcpkg.json b/externals/vcpkg/ports/apsi/vcpkg.json new file mode 100755 index 000000000..29b3035df --- /dev/null +++ b/externals/vcpkg/ports/apsi/vcpkg.json @@ -0,0 +1,58 @@ +{ + "name": "apsi", + "version-semver": "0.7.0", + "port-version": 2, + "description": "APSI is a research library for asymmetric private set intersection.", + "homepage": "https://github.com/microsoft/APSI", + "supports": "static & !(arm & osx)", + "dependencies": [ + "flatbuffers", + "jsoncpp", + "kuku", + { + "name": "seal", + "features": [ + "no-throw-tran" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "log4cplus", + "zeromq" + ], + "features": { + "hexl": { + "description": "Use Intel® HEXL to accelerate Microsoft SEAL.", + "dependencies": [ + { + "name": "seal", + "features": [ + "hexl", + "no-throw-tran" + ], + "platform": "x64" + } + ] + }, + "log4cplus": { + "description": "Use log4cplus for logging.", + "dependencies": [ + "log4cplus" + ] + }, + "zeromq": { + "description": "Use ZeroMQ for networking.", + "dependencies": [ + "cppzmq" + ] + } + } +} diff --git a/externals/vcpkg/ports/arb/fix-build-error.patch b/externals/vcpkg/ports/arb/fix-build-error.patch new file mode 100755 index 000000000..fbebf0958 --- /dev/null +++ b/externals/vcpkg/ports/arb/fix-build-error.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d6136a8..9e260eb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -76,7 +76,8 @@ set (pthreads_header pthread.h) + set (flint2_header flint/flint.h) + + if(MSVC) +- set(DEPS ${DEPS} pthreads) ++ find_package(pthreads REQUIRED) ++ set(PTHREADS_LIBRARIES PThreads4W::PThreads4W) + else() + option(CMAKE_THREAD_PREFER_PTHREAD "Prefer pthreads" yes) + option(THREADS_PREFER_PTHREAD_FLAG "Prefer -pthread flag" yes) diff --git a/externals/vcpkg/ports/arb/portfile.cmake b/externals/vcpkg/ports/arb/portfile.cmake new file mode 100755 index 000000000..62879730a --- /dev/null +++ b/externals/vcpkg/ports/arb/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO fredrik-johansson/arb + REF e3a633dcc1adafeb7ca9648669f2b1fa2f433ee1 # 2.21.1 + SHA512 af864ea4f849d12dbaadec8cda7e6b1a7d349b7aa776966ec7f61ad7a5186dc3f280512218bcff28901e2d55d6c976525746e6de13925a9942ed947ac2253af6 + HEAD_REF master + PATCHES fix-build-error.patch +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" MSVC_USE_MT) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DMSVC_USE_MT=${MSVC_USE_MT} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +# Remove duplicate headers +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/arb/vcpkg.json b/externals/vcpkg/ports/arb/vcpkg.json new file mode 100755 index 000000000..9cfb617f3 --- /dev/null +++ b/externals/vcpkg/ports/arb/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "arb", + "version": "2.21.1", + "port-version": 1, + "description": "a C library for arbitrary-precision interval arithmetic", + "homepage": "https://github.com/fredrik-johansson/arb", + "license": "LGPL-2.1", + "dependencies": [ + "flint", + { + "name": "pthreads", + "platform": "windows" + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/arcus/0001-fix-protobuf-deprecated.patch b/externals/vcpkg/ports/arcus/0001-fix-protobuf-deprecated.patch new file mode 100755 index 000000000..a40da846d --- /dev/null +++ b/externals/vcpkg/ports/arcus/0001-fix-protobuf-deprecated.patch @@ -0,0 +1,13 @@ +diff --git a/src/Socket_p.h b/src/Socket_p.h +index 9c3c084..9ccabda 100644 +--- a/src/Socket_p.h ++++ b/src/Socket_p.h +@@ -548,7 +548,7 @@ namespace Arcus + + google::protobuf::io::ArrayInputStream array(wire_message->data, wire_message->size); + google::protobuf::io::CodedInputStream stream(&array); +- stream.SetTotalBytesLimit(message_size_maximum, message_size_warning); ++ stream.SetTotalBytesLimit(message_size_maximum); + if(!message->ParseFromCodedStream(&stream)) + { + error(ErrorCode::ParseFailedError, "Failed to parse message:" + std::string(wire_message->data)); diff --git a/externals/vcpkg/ports/arcus/portfile.cmake b/externals/vcpkg/ports/arcus/portfile.cmake new file mode 100755 index 000000000..c85b0f73f --- /dev/null +++ b/externals/vcpkg/ports/arcus/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Ultimaker/libArcus + REF 617f6f71572090f73cb44592b12f49567b539e5b #v4.10.0 + SHA512 cf0954d8b10d9f94165aa5c086d0e58c2925464f9fbe4252535c36d7e6bb12b767d89efb816c9e642f9cd7f0ec0d66d61ca21c5121a05340499d38d5d851f73b + HEAD_REF master + PATCHES + 0001-fix-protobuf-deprecated.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_PYTHON=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_STATIC=${ENABLE_STATIC} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME Arcus CONFIG_PATH lib/cmake/Arcus) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/arcus/vcpkg.json b/externals/vcpkg/ports/arcus/vcpkg.json new file mode 100755 index 000000000..356415b52 --- /dev/null +++ b/externals/vcpkg/ports/arcus/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "arcus", + "version-semver": "4.10.0", + "port-version": 2, + "description": "This library contains C++ bindings for creating a socket in a thread and using this socket to send and receive messages based on the Protocol Buffers library.", + "homepage": "https://github.com/Ultimaker/libArcus", + "supports": "!uwp", + "dependencies": [ + "protobuf", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/argagg/portfile.cmake b/externals/vcpkg/ports/argagg/portfile.cmake new file mode 100755 index 000000000..54d32171a --- /dev/null +++ b/externals/vcpkg/ports/argagg/portfile.cmake @@ -0,0 +1,25 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO vietjtnguyen/argagg + REF 0.4.6 + SHA512 7d8cf04a7c679518f01120830637c68719dd67a765457789eb4afedbead7be9efadc6bcdf640999329aaaf8659a5e5d1896f66587068cc668a7c49703aca3070 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DARGAGG_BUILD_EXAMPLES=OFF + -DARGAGG_BUILD_TESTS=OFF + -DARGAGG_BUILD_DOCS=OFF +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/argagg/vcpkg.json b/externals/vcpkg/ports/argagg/vcpkg.json new file mode 100755 index 000000000..73dc92e5d --- /dev/null +++ b/externals/vcpkg/ports/argagg/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "argagg", + "version-string": "0.4.6", + "port-version": 1, + "description": "A simple C++11 command line argument parser" +} diff --git a/externals/vcpkg/ports/argh/portfile.cmake b/externals/vcpkg/ports/argh/portfile.cmake new file mode 100755 index 000000000..176567767 --- /dev/null +++ b/externals/vcpkg/ports/argh/portfile.cmake @@ -0,0 +1,30 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO adishavit/argh + REF v1.3.2 + SHA512 66073718ef1fc31fbd0feb9daf366a2e28c759de44fb1882dc46a6d10f7a44635ae1155882dff916f55c51fad88bedebdfe361418f7669fac241feead68f2b5b + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTS=OFF + -DBUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/CMake") + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}") + vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/argh/vcpkg.json b/externals/vcpkg/ports/argh/vcpkg.json new file mode 100755 index 000000000..2329517f0 --- /dev/null +++ b/externals/vcpkg/ports/argh/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "argh", + "version": "1.3.2", + "description": "Argh! A minimalist argument handler.", + "homepage": "https://github.com/adishavit/argh", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/argparse/portfile.cmake b/externals/vcpkg/ports/argparse/portfile.cmake new file mode 100755 index 000000000..82142c63e --- /dev/null +++ b/externals/vcpkg/ports/argparse/portfile.cmake @@ -0,0 +1,24 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO p-ranav/argparse + REF b0cb28ab177cdbd19d439c02cdc217bdfc508ba9 # v2.2 + SHA512 247f27aa45994ee4629b947e3fe1b1df8fae4e773992c740a7c3d544e45ce83a68ecdcfdedf38c461ccb81cf93d88dfee21dc4f7d027677a3c7d930170446971 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DARGPARSE_BUILD_TESTS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/argparse/vcpkg.json b/externals/vcpkg/ports/argparse/vcpkg.json new file mode 100755 index 000000000..ca94bbc8b --- /dev/null +++ b/externals/vcpkg/ports/argparse/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "argparse", + "version": "2.2", + "description": "Argument parser for modern C++", + "homepage": "https://github.com/p-ranav/argparse", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/args/portfile.cmake b/externals/vcpkg/ports/args/portfile.cmake new file mode 100755 index 000000000..bf4f674a7 --- /dev/null +++ b/externals/vcpkg/ports/args/portfile.cmake @@ -0,0 +1,24 @@ +#header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Taywee/args + REF 6.3.0 + SHA512 7d554719781d5a096883e37cd5c1706782d06c2c4d7a9598142aec7f2e38d63438e82960b60a705baeb2aa5d31143c83fa6c0d1331a36b16f564a5ea56ad451d + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DARGS_BUILD_UNITTESTS=OFF + -DARGS_BUILD_EXAMPLE=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_fixup_pkgconfig() + +# Put the licence file where vcpkg expects it +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/externals/vcpkg/ports/args/vcpkg.json b/externals/vcpkg/ports/args/vcpkg.json new file mode 100755 index 000000000..01789e2e5 --- /dev/null +++ b/externals/vcpkg/ports/args/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "args", + "version": "6.3.0", + "description": "A simple header-only C++ argument parser library.", + "homepage": "https://github.com/Taywee/args", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/argtable2/0001-fix-install-dirs.patch b/externals/vcpkg/ports/argtable2/0001-fix-install-dirs.patch new file mode 100755 index 000000000..d852ffa62 --- /dev/null +++ b/externals/vcpkg/ports/argtable2/0001-fix-install-dirs.patch @@ -0,0 +1,35 @@ +From 6594abbd953d0e26105fd6c982990eb702f27804 Mon Sep 17 00:00:00 2001 +From: Nicole Mazzuca +Date: Tue, 22 Sep 2020 15:22:00 -0700 +Subject: [PATCH 1/2] fix install dirs + +--- + src/CMakeLists.txt | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 773c4c8..03e112c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,5 +1,4 @@ +-# for now, install in subdirectory of source directory by default +-SET( CMAKE_INSTALL_PREFIX .. ) ++include(GNUInstallDirs) + + IF( WIN32 ) + ADD_LIBRARY( argtable2 arg_dbl.c arg_end.c arg_file.c arg_int.c arg_lit.c arg_rem.c arg_str.c argtable2.c argtable2.h getopt.c getopt.h getopt1.c ) +@@ -7,5 +6,9 @@ ELSE( WIN32 ) + ADD_LIBRARY( argtable2 arg_date.c arg_dbl.c arg_end.c arg_file.c arg_int.c arg_lit.c arg_rem.c arg_rex.c arg_str.c argtable2.c argtable2.h getopt.c getopt.h getopt1.c ) + ENDIF( WIN32 ) + +-INSTALL( TARGETS argtable2 ARCHIVE DESTINATION lib) +-SET_TARGET_PROPERTIES( argtable2 PROPERTIES DEBUG_POSTFIX d ) ++INSTALL(TARGETS argtable2 ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++) ++INSTALL(FILES argtable2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +-- +2.24.3 (Apple Git-128) + diff --git a/externals/vcpkg/ports/argtable2/0002-include-correct-headers.patch b/externals/vcpkg/ports/argtable2/0002-include-correct-headers.patch new file mode 100755 index 000000000..f2e4d5f5a --- /dev/null +++ b/externals/vcpkg/ports/argtable2/0002-include-correct-headers.patch @@ -0,0 +1,60 @@ +From 271423adb2900c8bf4aad5d73d7ef1efbb5c35d8 Mon Sep 17 00:00:00 2001 +From: Nicole Mazzuca +Date: Tue, 22 Sep 2020 15:17:18 -0700 +Subject: [PATCH 2/2] include correct headers + +--- + src/arg_date.c | 4 +++- + src/arg_int.c | 1 + + src/getopt.c | 1 + + 3 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/arg_date.c b/src/arg_date.c +index 22b59e2..5004b42 100644 +--- a/src/arg_date.c ++++ b/src/arg_date.c +@@ -37,6 +37,8 @@ USA. + #include + #endif + ++#include ++ + #include "argtable2.h" + + /* local error codes */ +@@ -112,7 +114,7 @@ static void errorfn(struct arg_date *parent, FILE *fp, int errorcode, const char + char buff[200]; + + fprintf(fp,"illegal timestamp format \"%s\"\n",argval); +- bzero(&tm,sizeof(tm)); ++ memset(&tm, 0, sizeof(tm)); + strptime("1999-12-31 23:59:59","%F %H:%M:%S",&tm); + strftime(buff, sizeof(buff), parent->format, &tm); + printf("correct format is \"%s\"\n", buff); +diff --git a/src/arg_int.c b/src/arg_int.c +index 29c20e5..bc10012 100644 +--- a/src/arg_int.c ++++ b/src/arg_int.c +@@ -30,6 +30,7 @@ USA. + + #include "argtable2.h" + #include ++#include + + /* local error codes */ + enum {EMINCOUNT=1,EMAXCOUNT,EBADINT,EOVERFLOW}; +diff --git a/src/getopt.c b/src/getopt.c +index b208529..b13acc6 100644 +--- a/src/getopt.c ++++ b/src/getopt.c +@@ -47,6 +47,7 @@ + #endif + + #include ++#include + + /* Comment out all this code if we are using the GNU C Library, and are not + actually compiling the library itself. This code is part of the GNU C +-- +2.24.3 (Apple Git-128) + diff --git a/externals/vcpkg/ports/argtable2/portfile.cmake b/externals/vcpkg/ports/argtable2/portfile.cmake new file mode 100755 index 000000000..cf394f65a --- /dev/null +++ b/externals/vcpkg/ports/argtable2/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO argtable/argtable + REF argtable-2.13 + FILENAME "argtable2-13.tar.gz" + SHA512 3d8303f3ba529e3241d918c0127a16402ece951efb964d14a06a3a7d29a252812ad3c44e96da28798871e9923e73a2cfe7ebc84139c1397817d632cae25c4585 + PATCHES + 0001-fix-install-dirs.patch + 0002-include-correct-headers.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCMAKE_DEBUG_POSTFIX=d +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/argtable2/vcpkg.json b/externals/vcpkg/ports/argtable2/vcpkg.json new file mode 100755 index 000000000..54431fc62 --- /dev/null +++ b/externals/vcpkg/ports/argtable2/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "argtable2", + "version-string": "2.13", + "port-version": 9, + "description": "Argtable is an ANSI C library for parsing GNU style command line options with a minimum of fuss.", + "homepage": "http://argtable.sourceforge.net", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/argtable3/portfile.cmake b/externals/vcpkg/ports/argtable3/portfile.cmake new file mode 100755 index 000000000..428b9fa87 --- /dev/null +++ b/externals/vcpkg/ports/argtable3/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO argtable/argtable3 + REF 7704006f3cbb556e11da80a5b97469075a32892e # 3.2.1 + minor patches including ARGTABLE3_ENABLE_EXAMPLES support + SHA512 c51aa0a33a247c3801e36ca5d9523acefa31f21a34c1e86965a39290c1b437785e4d7e0ae80a65d811803b8fcbbc3a96ba3d6aefaea9bda15abc0f38bd1f45cc + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DARGTABLE3_ENABLE_CONAN=OFF + -DARGTABLE3_ENABLE_TESTS=OFF + -DARGTABLE3_ENABLE_EXAMPLES=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}") + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/argtable3/vcpkg.json b/externals/vcpkg/ports/argtable3/vcpkg.json new file mode 100755 index 000000000..527cc3bdf --- /dev/null +++ b/externals/vcpkg/ports/argtable3/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "argtable3", + "version": "3.2.1", + "port-version": 2, + "description": "A single-file, ANSI C, command-line parsing library that parses GNU-style command-line options", + "homepage": "https://www.argtable.org/", + "license": "BSD-2-Clause-FreeBSD", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/argumentum/portfile.cmake b/externals/vcpkg/ports/argumentum/portfile.cmake new file mode 100755 index 000000000..52d7d1c74 --- /dev/null +++ b/externals/vcpkg/ports/argumentum/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mmahnic/argumentum + REF v0.3.1 + SHA512 96f3a2077dacabf95d06120e24a50147b153090ddb0b6da17c960f8fe6724567bcd3337409f4729e1d8d15058550ed9f34a861da16fb6c999207554154e411c1 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DARGUMENTUM_BUILD_EXAMPLES=OFF + -DARGUMENTUM_BUILD_TESTS=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Argumentum) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright) diff --git a/externals/vcpkg/ports/argumentum/vcpkg.json b/externals/vcpkg/ports/argumentum/vcpkg.json new file mode 100755 index 000000000..282dbf6d3 --- /dev/null +++ b/externals/vcpkg/ports/argumentum/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "argumentum", + "version-string": "0.3.1", + "port-version": 1, + "description": "A C++17 command line argument parser inspired by Python argparse", + "homepage": "https://github.com/mmahnic/argumentum" +} diff --git a/externals/vcpkg/ports/aricpp/portfile.cmake b/externals/vcpkg/ports/aricpp/portfile.cmake new file mode 100755 index 000000000..189e85e6a --- /dev/null +++ b/externals/vcpkg/ports/aricpp/portfile.cmake @@ -0,0 +1,20 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO daniele77/aricpp + REF v1.1.2 + SHA512 bf325de240cdc9c567524cdc127c256d1ac783e785779117374f1d2a5fd4f352545e87f3d1556c2a24e47a203b55bc581a92fb20426295f5f9dcb4a8078cb215 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/aricpp) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/aricpp/vcpkg.json b/externals/vcpkg/ports/aricpp/vcpkg.json new file mode 100755 index 000000000..ec4431ea9 --- /dev/null +++ b/externals/vcpkg/ports/aricpp/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "aricpp", + "version-semver": "1.1.2", + "description": "Asterisk ARI interface bindings for modern C++", + "homepage": "https://github.com/daniele77/aricpp", + "license": "BSL-1.0", + "dependencies": [ + "boost-asio", + "boost-beast", + "boost-system", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/armadillo/add-disable-find-package.patch b/externals/vcpkg/ports/armadillo/add-disable-find-package.patch new file mode 100755 index 000000000..b5d67d5c2 --- /dev/null +++ b/externals/vcpkg/ports/armadillo/add-disable-find-package.patch @@ -0,0 +1,60 @@ +diff --git a/cmake_aux/Modules/ARMA_FindARPACK.cmake b/cmake_aux/Modules/ARMA_FindARPACK.cmake +index 1a709ad..3029c25 100644 +--- a/cmake_aux/Modules/ARMA_FindARPACK.cmake ++++ b/cmake_aux/Modules/ARMA_FindARPACK.cmake +@@ -4,6 +4,10 @@ + # ARPACK_FOUND - system has ARPACK + # ARPACK_LIBRARY - Link this to use ARPACK + ++if(CMAKE_DISABLE_FIND_PACKAGE_ARPACK) ++ set(ARPACK_FOUND NO) ++ return() ++endif() + + find_library(ARPACK_LIBRARY + NAMES arpack +diff --git a/cmake_aux/Modules/ARMA_FindATLAS.cmake b/cmake_aux/Modules/ARMA_FindATLAS.cmake +index 491a361..e40a0ff 100644 +--- a/cmake_aux/Modules/ARMA_FindATLAS.cmake ++++ b/cmake_aux/Modules/ARMA_FindATLAS.cmake +@@ -1,3 +1,8 @@ ++if(CMAKE_DISABLE_FIND_PACKAGE_ATLAS) ++ set(ATLAS_FOUND NO) ++ return() ++endif() ++ + find_path(ATLAS_CBLAS_INCLUDE_DIR + NAMES cblas.h + PATHS /usr/include/atlas/ /usr/include/ /usr/local/include/atlas/ /usr/local/include/ +diff --git a/cmake_aux/Modules/ARMA_FindMKL.cmake b/cmake_aux/Modules/ARMA_FindMKL.cmake +index 0fd5b06..d6bcd49 100644 +--- a/cmake_aux/Modules/ARMA_FindMKL.cmake ++++ b/cmake_aux/Modules/ARMA_FindMKL.cmake +@@ -6,6 +6,11 @@ + ## the link below explains why we're linking only with mkl_rt + ## https://software.intel.com/en-us/articles/a-new-linking-model-single-dynamic-library-mkl_rt-since-intel-mkl-103 + ++if(CMAKE_DISABLE_FIND_PACKAGE_MKL) ++ set(MKL_FOUND NO) ++ return() ++endif() ++ + set(MKL_NAMES ${MKL_NAMES} mkl_rt) + #set(MKL_NAMES ${MKL_NAMES} mkl_lapack) + #set(MKL_NAMES ${MKL_NAMES} mkl_intel_thread) +diff --git a/cmake_aux/Modules/ARMA_FindSuperLU5.cmake b/cmake_aux/Modules/ARMA_FindSuperLU5.cmake +index abf046d..e496cb0 100644 +--- a/cmake_aux/Modules/ARMA_FindSuperLU5.cmake ++++ b/cmake_aux/Modules/ARMA_FindSuperLU5.cmake +@@ -5,6 +5,11 @@ + # SuperLU_LIBRARY - Link this to use SuperLU + # SuperLU_INCLUDE_DIR - directory of SuperLU headers + ++if(CMAKE_DISABLE_FIND_PACKAGE_SuperLU) ++ set(SuperLU_FOUND OFF) ++ return() ++endif() ++ + find_path(SuperLU_INCLUDE_DIR slu_ddefs.h + /usr/include/superlu/ + /usr/include/SuperLU/ diff --git a/externals/vcpkg/ports/armadillo/fix-CMakePath.patch b/externals/vcpkg/ports/armadillo/fix-CMakePath.patch new file mode 100755 index 000000000..cfafc4f28 --- /dev/null +++ b/externals/vcpkg/ports/armadillo/fix-CMakePath.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ea5516e..ecd14bc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -615,7 +615,7 @@ install(EXPORT ArmadilloLibraryDepends DESTINATION + # and install it + set(ARMADILLO_INCLUDE_DIRS "${CMAKE_INSTALL_FULL_INCLUDEDIR}") + set(ARMADILLO_LIB_DIR "${CMAKE_INSTALL_FULL_LIBDIR}") +-set(ARMADILLO_CMAKE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/Armadillo/CMake") ++set(ARMADILLO_CMAKE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/Armadillo") + + + message(STATUS "Generating '${PROJECT_BINARY_DIR}/InstallFiles/ArmadilloConfig.cmake'") diff --git a/externals/vcpkg/ports/armadillo/portfile.cmake b/externals/vcpkg/ports/armadillo/portfile.cmake new file mode 100755 index 000000000..aa501fc5d --- /dev/null +++ b/externals/vcpkg/ports/armadillo/portfile.cmake @@ -0,0 +1,54 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO arma + FILENAME "armadillo-10.6.2.tar.xz" + SHA512 ae04e993830ca04e7eddfaf9c40a50fb9139b10b9667412f5a18707ac73ee529b8e3a5a91337782e4e01bae61207b44f24bdd8a77c6c2404011a06006d849aba + PATCHES + remove_custom_modules.patch + fix-CMakePath.patch + add-disable-find-package.patch +) + +file(REMOVE "${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindBLAS.cmake") +file(REMOVE "${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindLAPACK.cmake") +file(REMOVE "${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindOpenBLAS.cmake") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DDETECT_HDF5=false + -DCMAKE_DISABLE_FIND_PACKAGE_SuperLU=ON + -DCMAKE_DISABLE_FIND_PACKAGE_ARPACK=ON + -DCMAKE_DISABLE_FIND_PACKAGE_ATLAS=ON + -DCMAKE_DISABLE_FIND_PACKAGE_MKL=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME Armadillo CONFIG_PATH share/Armadillo/CMake) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(GLOB SHARE_CONTENT "${CURRENT_PACKAGES_DIR}/share/Armadillo") +list(LENGTH SHARE_CONTENT SHARE_LEN) +if(SHARE_LEN EQUAL 0) + # On case sensitive file system there is an extra empty directory created that should be removed + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Armadillo") +endif() + +set(filename "${CURRENT_PACKAGES_DIR}/include/armadillo_bits/config.hpp") +if(EXISTS "${filename}") + file(READ "${filename}" contents) + string(REGEX REPLACE "\n#define ARMA_AUX_LIBS [^\n]*\n" "\n" contents "${contents}") + file(WRITE "${filename}" "${contents}") +endif() + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/armadillo/remove_custom_modules.patch b/externals/vcpkg/ports/armadillo/remove_custom_modules.patch new file mode 100755 index 000000000..88631b573 --- /dev/null +++ b/externals/vcpkg/ports/armadillo/remove_custom_modules.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ab7dbed..ea5516e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -324,15 +324,15 @@ if(APPLE) + else() + + include(ARMA_FindMKL) +- include(ARMA_FindOpenBLAS) + include(ARMA_FindATLAS) +- include(ARMA_FindBLAS) +- include(ARMA_FindLAPACK) + + if(ALLOW_FLEXIBLAS_LINUX AND (${CMAKE_SYSTEM_NAME} MATCHES "Linux")) + include(ARMA_FindFlexiBLAS) + endif() + ++ find_package(BLAS) ++ find_package(LAPACK) ++ + message(STATUS " MKL_FOUND = ${MKL_FOUND}" ) + message(STATUS " OpenBLAS_FOUND = ${OpenBLAS_FOUND}" ) + message(STATUS " ATLAS_FOUND = ${ATLAS_FOUND}" ) diff --git a/externals/vcpkg/ports/armadillo/usage b/externals/vcpkg/ports/armadillo/usage new file mode 100755 index 000000000..58066f6a9 --- /dev/null +++ b/externals/vcpkg/ports/armadillo/usage @@ -0,0 +1,4 @@ +The package armadillo provides CMake targets: + + find_package(Armadillo CONFIG REQUIRED) + target_link_libraries(main PRIVATE ${ARMADILLO_LIBRARIES}) diff --git a/externals/vcpkg/ports/armadillo/vcpkg.json b/externals/vcpkg/ports/armadillo/vcpkg.json new file mode 100755 index 000000000..27e432049 --- /dev/null +++ b/externals/vcpkg/ports/armadillo/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "armadillo", + "version": "10.6.2", + "port-version": 5, + "description": "Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use", + "homepage": "http://arma.sourceforge.net", + "dependencies": [ + "blas", + "lapack", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/arrayfire/Fix-constexpr-error-with-vs2019-with-half.patch b/externals/vcpkg/ports/arrayfire/Fix-constexpr-error-with-vs2019-with-half.patch new file mode 100755 index 000000000..7766c3e75 --- /dev/null +++ b/externals/vcpkg/ports/arrayfire/Fix-constexpr-error-with-vs2019-with-half.patch @@ -0,0 +1,22 @@ +diff --git a/src/backend/common/half.hpp b/src/backend/common/half.hpp +index ce06eed..fb25d03 100644 +--- a/src/backend/common/half.hpp ++++ b/src/backend/common/half.hpp +@@ -879,15 +879,9 @@ class alignas(2) half { + return *this; + } + +-#if defined(NVCC) || defined(__CUDACC_RTC__) +- AF_CONSTEXPR __DH__ explicit half(__half value) noexcept + #ifdef __CUDA_ARCH__ +- : data_(value) { +- } +-#else +- : data_(*reinterpret_cast(&value)) { +- } +-#endif ++ AF_CONSTEXPR __DH__ explicit half(__half value) noexcept : data_(value) {} ++ + AF_CONSTEXPR __DH__ half& operator=(__half value) noexcept { + // NOTE Assignment to ushort from __half only works with device code. + // using memcpy instead diff --git a/externals/vcpkg/ports/arrayfire/build.patch b/externals/vcpkg/ports/arrayfire/build.patch new file mode 100755 index 000000000..b102dea9a --- /dev/null +++ b/externals/vcpkg/ports/arrayfire/build.patch @@ -0,0 +1,220 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 682f416..a8cbec8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -104,8 +104,6 @@ mark_as_advanced( + CUDA_HOST_COMPILER + CUDA_USE_STATIC_CUDA_RUNTIME + CUDA_rt_LIBRARY +- SPDLOG_BUILD_EXAMPLES +- SPDLOG_BUILD_TESTING + ADDR2LINE_PROGRAM + Backtrace_LIBRARY + AF_WITH_STATIC_MKL +@@ -159,9 +157,7 @@ if(NOT LAPACK_FOUND) + endif() + endif() + +-set(SPDLOG_BUILD_TESTING OFF CACHE INTERNAL "Disable testing in spdlog") +-add_subdirectory(extern/spdlog EXCLUDE_FROM_ALL) +-add_subdirectory(extern/glad) ++find_package(spdlog CONFIG REQUIRED) + add_subdirectory(src/backend/common) + add_subdirectory(src/api/c) + add_subdirectory(src/api/cpp) +@@ -269,10 +265,6 @@ install(DIRECTORY examples/ #NOTE The slash at the end is important + DESTINATION ${AF_INSTALL_EXAMPLE_DIR} + COMPONENT examples) + +-install(DIRECTORY assets/examples/ #NOTE The slash at the end is important +- DESTINATION ${AF_INSTALL_EXAMPLE_DIR} +- COMPONENT examples) +- + install(DIRECTORY "${ArrayFire_SOURCE_DIR}/LICENSES/" + DESTINATION LICENSES + COMPONENT licenses) +diff --git a/CMakeModules/AFInstallDirs.cmake b/CMakeModules/AFInstallDirs.cmake +index 2c7b96e..b5006ee 100644 +--- a/CMakeModules/AFInstallDirs.cmake ++++ b/CMakeModules/AFInstallDirs.cmake +@@ -7,8 +7,12 @@ include(GNUInstallDirs) + # NOTE: These paths are all relative to the project installation prefix. + + # Executables +-if(NOT DEFINED AF_INSTALL_BIN_DIR) +- set(AF_INSTALL_BIN_DIR "lib" CACHE PATH "Installation path for executables") ++if(CMAKE_BUILD_TYPE MATCHES Debug) ++ set(AF_INSTALL_BIN_DIR "${AF_BIN_DIR}/debug/bin") ++ message(STATUS " Setting install to debug path ${AF_INSTALL_BIN_DIR}") ++else() ++ set(AF_INSTALL_BIN_DIR "${AF_BIN_DIR}/bin") ++ message(STATUS " Setting install to release path ${AF_INSTALL_BIN_DIR}") + endif() + + # Libraries +diff --git a/CMakeModules/AFconfigure_forge_submodule.cmake b/CMakeModules/AFconfigure_forge_submodule.cmake +index d16849f..36ab01b 100644 +--- a/CMakeModules/AFconfigure_forge_submodule.cmake ++++ b/CMakeModules/AFconfigure_forge_submodule.cmake +@@ -39,13 +39,13 @@ if(AF_BUILD_FORGE) + COMPONENT common_backend_dependencies) + set_property(TARGET forge APPEND_STRING PROPERTY COMPILE_FLAGS " -w") + else(AF_BUILD_FORGE) +- set(FG_VERSION "1.0.0") ++ set(FG_VERSION "1.0.5") + set(FG_VERSION_MAJOR 1) + set(FG_VERSION_MINOR 0) +- set(FG_VERSION_PATCH 0) ++ set(FG_VERSION_PATCH 5) + set(FG_API_VERSION_CURRENT 10) + configure_file( +- ${PROJECT_SOURCE_DIR}/extern/forge/CMakeModules/version.h.in +- ${PROJECT_BINARY_DIR}/extern/forge/include/fg/version.h ++ ${AF_FORGE_PATH}/CMakeModules/version.h.in ++ ${AF_FORGE_PATH}/include/fg/version.h + ) + endif(AF_BUILD_FORGE) +diff --git a/src/api/unified/CMakeLists.txt b/src/api/unified/CMakeLists.txt +index 967eaa6..16bb633 100644 +--- a/src/api/unified/CMakeLists.txt ++++ b/src/api/unified/CMakeLists.txt +@@ -96,7 +96,8 @@ target_include_directories(af + target_link_libraries(af + PRIVATE + cpp_api_interface +- spdlog ++ spdlog::spdlog ++ spdlog::spdlog_header_only + Threads::Threads + Boost::boost + ${CMAKE_DL_LIBS} +diff --git a/src/backend/common/CMakeLists.txt b/src/backend/common/CMakeLists.txt +index c9fe088..8c128fa 100644 +--- a/src/backend/common/CMakeLists.txt ++++ b/src/backend/common/CMakeLists.txt +@@ -77,12 +77,15 @@ else() + target_sources(afcommon_interface INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/module_loading_unix.cpp) + endif() + ++find_package(glad CONFIG REQUIRED) ++ + target_link_libraries(afcommon_interface + INTERFACE +- spdlog ++ spdlog::spdlog ++ spdlog::spdlog_header_only + Boost::boost +- af_glad_interface + ${CMAKE_DL_LIBS} ++ glad::glad + ) + + if(AF_BUILD_FORGE) +@@ -93,10 +96,9 @@ target_include_directories(afcommon_interface + INTERFACE + ${ArrayFire_SOURCE_DIR}/src/backend + ${ArrayFire_BINARY_DIR} ++ ${AF_FORGE_PATH}/include # passed via vcpkg + SYSTEM INTERFACE + $<$:${OPENGL_INCLUDE_DIR}> +- ${ArrayFire_SOURCE_DIR}/extern/forge/include +- ${ArrayFire_BINARY_DIR}/extern/forge/include + ) + + if(APPLE AND NOT USE_MKL) +diff --git a/src/backend/cpu/CMakeLists.txt b/src/backend/cpu/CMakeLists.txt +index 170bb0f..c6e2017 100644 +--- a/src/backend/cpu/CMakeLists.txt ++++ b/src/backend/cpu/CMakeLists.txt +@@ -266,9 +266,10 @@ endif(AF_WITH_CPUID) + + target_sources(afcpu + PRIVATE +- ${CMAKE_CURRENT_SOURCE_DIR}/threads/async_queue.hpp +- ${CMAKE_CURRENT_SOURCE_DIR}/threads/event.hpp ++ ${AF_CPU_THREAD_PATH}/include/threads/async_queue.hpp ++ ${AF_CPU_THREAD_PATH}/include/threads/event.hpp + ) ++target_include_directories(afcpu PRIVATE ${AF_CPU_THREAD_PATH}/include) + + arrayfire_set_default_cxx_flags(afcpu) + +diff --git a/src/backend/cuda/CMakeLists.txt b/src/backend/cuda/CMakeLists.txt +index 7e3e408..2edaacd 100644 +--- a/src/backend/cuda/CMakeLists.txt ++++ b/src/backend/cuda/CMakeLists.txt +@@ -110,7 +110,11 @@ cuda_include_directories( + ${COMMON_INTERFACE_DIRS} + ) + if(CUDA_VERSION_MAJOR VERSION_LESS 11) +- cuda_include_directories(${ArrayFire_SOURCE_DIR}/extern/cub) ++ find_path(CUB_INCLUDE_DIRS "cub/agent/agent_histogram.cuh") ++ if (${CUB_INCLUDE_DIRS} EQUAL "CUB_INCLUDE_DIRS-NOTFOUND") ++ set(CUB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/cub) ++ endif() ++ cuda_include_directories(${CUB_INCLUDE_DIRS}) + endif() + + file(GLOB jit_src "kernel/jit.cuh") +@@ -242,7 +246,7 @@ endif() + + if(CUDA_VERSION_MAJOR VERSION_GREATER 10 OR + (UNIX AND +- CUDA_VERSION_MAJOR VERSION_EQUAL 10 AND CUDA_VERSION_MINOR VERSION_GREATER 0)) ++ CUDA_VERSION_MAJOR VERSION_EQUAL 10 AND CUDA_VERSION_MINOR VERSION_GREATER 1)) + list(APPEND cxx_definitions -DAF_USE_NEW_CUSPARSE_API) + endif() + +@@ -301,7 +305,7 @@ set_target_properties(af_cuda_static_cuda_library + + if(CUDA_VERSION_MAJOR VERSION_GREATER 10 OR + (UNIX AND +- CUDA_VERSION_MAJOR VERSION_EQUAL 10 AND CUDA_VERSION_MINOR VERSION_GREATER 0)) ++ CUDA_VERSION_MAJOR VERSION_EQUAL 10 AND CUDA_VERSION_MINOR VERSION_GREATER 1)) + target_compile_definitions(af_cuda_static_cuda_library PRIVATE AF_USE_NEW_CUSPARSE_API) + endif() + +diff --git a/src/backend/opencl/kernel/scan_by_key/CMakeLists.txt b/src/backend/opencl/kernel/scan_by_key/CMakeLists.txt +index 9a796c9..d9864b0 100644 +--- a/src/backend/opencl/kernel/scan_by_key/CMakeLists.txt ++++ b/src/backend/opencl/kernel/scan_by_key/CMakeLists.txt +@@ -27,6 +27,7 @@ foreach(SBK_BINARY_OP ${SBK_BINARY_OPS}) + add_dependencies(opencl_scan_by_key_${SBK_BINARY_OP} + ${cl_kernel_targets} OpenCL::cl2hpp Boost::boost) + ++ find_package(glad CONFIG REQUIRED) + target_include_directories(opencl_scan_by_key_${SBK_BINARY_OP} + PRIVATE + . +@@ -39,9 +40,7 @@ foreach(SBK_BINARY_OP ${SBK_BINARY_OPS}) + $ + $ + $ +- $ +- ${ArrayFire_SOURCE_DIR}/extern/forge/include +- ${ArrayFire_BINARY_DIR}/extern/forge/include ++ $ + ) + + set_target_properties(opencl_scan_by_key_${SBK_BINARY_OP} +diff --git a/src/backend/opencl/kernel/sort_by_key/CMakeLists.txt b/src/backend/opencl/kernel/sort_by_key/CMakeLists.txt +index d618ff2..9f51739 100644 +--- a/src/backend/opencl/kernel/sort_by_key/CMakeLists.txt ++++ b/src/backend/opencl/kernel/sort_by_key/CMakeLists.txt +@@ -32,14 +32,13 @@ foreach(SBK_TYPE ${SBK_TYPES}) + ../../../include + ${CMAKE_CURRENT_BINARY_DIR}) + ++ find_package(glad CONFIG REQUIRED) + target_include_directories(opencl_sort_by_key_${SBK_TYPE} + SYSTEM PRIVATE + $ + $ + $ +- $ +- ${ArrayFire_SOURCE_DIR}/extern/forge/include +- ${ArrayFire_BINARY_DIR}/extern/forge/include ++ $ + ) + + set_target_properties(opencl_sort_by_key_${SBK_TYPE} diff --git a/externals/vcpkg/ports/arrayfire/portfile.cmake b/externals/vcpkg/ports/arrayfire/portfile.cmake new file mode 100755 index 000000000..29322df6c --- /dev/null +++ b/externals/vcpkg/ports/arrayfire/portfile.cmake @@ -0,0 +1,88 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO arrayfire/arrayfire + REF d99887ae431fcd58168b653a1e69f027f04d5188 # v3.8.0 + SHA512 d8ddf6ba254744e62acf5ecf680f0ae56b05f8957b5463572923977ba2ffea7fa37cc1b6179421a1188a6f9e66565ca0f8cd00807513ccbe66ba1e9bbd41a3da + HEAD_REF master + PATCHES + build.patch + Fix-constexpr-error-with-vs2019-with-half.patch + ) + +# arrayfire cpu thread lib needed as a submodule for the CPU backend +vcpkg_from_github( + OUT_SOURCE_PATH CPU_THREADS_PATH + REPO arrayfire/threads + REF b666773940269179f19ef11c8f1eb77005e85d9a + SHA512 b3e8b54acf3a588b1f821c2774d5da2d8f8441962c6d99808d513f7117278b9066eb050b8b501bddbd3882e68eb5cc5da0b2fca54e15ab1923fe068a3fe834f5 + HEAD_REF master + ) + +# Get forge. We only need headers and aren't actually linking. +# We don't want to use the vcpkg dependency since it is broken in many +# environments - see https://github.com/microsoft/vcpkg/issues/14864. This +# can be relaxed when the issue is fixed. Forge and its dependencies +# are still runtime dependencies, so the user can use the graphics +# library by installing forge and freeimage. +vcpkg_from_github( + OUT_SOURCE_PATH FORGE_PATH + REPO arrayfire/forge + REF 1a0f0cb6371a8c8053ab5eb7cbe3039c95132389 # v1.0.5 + SHA512 8f8607421880a0f0013380eb5efb3a4f05331cd415d68c9cd84dd57eb727da1df6223fc6d65b106675d6aa09c3388359fab64443c31fadadf7641161be6b3b89 + HEAD_REF master +) + +################################### Build ################################### + +# Default flags +set(AF_DEFAULT_VCPKG_CMAKE_FLAGS + -DBUILD_TESTING=OFF + -DAF_BUILD_DOCS=OFF + -DAF_BUILD_EXAMPLES=OFF + -DUSE_CPU_MKL=ON + -DUSE_OPENCL_MKL=ON + -DAF_CPU_THREAD_PATH=${CPU_THREADS_PATH} # for building the arrayfire cpu threads lib + -DAF_FORGE_PATH=${FORGE_PATH} # forge headers for building the graphics lib + -DAF_BUILD_FORGE=OFF + -DAF_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/${PORT} # for CMake configs/targets + ) + +# bin/dll directory for Windows non-static builds for the unified backend dll +if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(AF_BIN_DIR ${CURRENT_PACKAGES_DIR}) + list(APPEND AF_DEFAULT_VCPKG_CMAKE_FLAGS "-DAF_BIN_DIR=${AF_BIN_DIR}") +endif() + +if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + message(WARNING "NOTE: Windows support with static linkeage is still experimental.") +endif() + +# Determine which backend to build via specified feature +vcpkg_check_features( + OUT_FEATURE_OPTIONS AF_BACKEND_FEATURE_OPTIONS + FEATURES + unified AF_BUILD_UNIFIED + cpu AF_BUILD_CPU + cuda AF_BUILD_CUDA + opencl AF_BUILD_OPENCL +) + +# Build and install +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${AF_DEFAULT_VCPKG_CMAKE_FLAGS} + ${AF_BACKEND_FEATURE_OPTIONS} + ) +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/examples") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/LICENSES") + +# Copyright and license +file(INSTALL "${SOURCE_PATH}/COPYRIGHT.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/arrayfire/vcpkg.json b/externals/vcpkg/ports/arrayfire/vcpkg.json new file mode 100755 index 000000000..91a39717c --- /dev/null +++ b/externals/vcpkg/ports/arrayfire/vcpkg.json @@ -0,0 +1,52 @@ +{ + "name": "arrayfire", + "version-semver": "3.8.0", + "description": "ArrayFire is a general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices.", + "supports": "x64", + "dependencies": [ + "boost-compute", + "boost-stacktrace", + "glad", + "spdlog", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "cpu", + "unified" + ], + "features": { + "cpu": { + "description": "ArrayFire CPU backend", + "dependencies": [ + "intel-mkl" + ] + }, + "cuda": { + "description": "ArrayFire CUDA backend. This feature only supports dynamic because dependency cudnn is dynamic only.", + "dependencies": [ + "cub", + "cuda", + "cudnn" + ] + }, + "opencl": { + "description": "ArrayFire OpenCL backend", + "dependencies": [ + "opencl" + ] + }, + "unified": { + "description": "ArrayFire unified backend", + "dependencies": [ + "intel-mkl" + ] + } + } +} diff --git a/externals/vcpkg/ports/arrow/all.patch b/externals/vcpkg/ports/arrow/all.patch new file mode 100755 index 000000000..45624f168 --- /dev/null +++ b/externals/vcpkg/ports/arrow/all.patch @@ -0,0 +1,13 @@ +diff --git a/cpp/cmake_modules/BuildUtils.cmake b/cpp/cmake_modules/BuildUtils.cmake +index 391c43e0a..50f6d3d3c 100644 +--- a/cpp/cmake_modules/BuildUtils.cmake ++++ b/cpp/cmake_modules/BuildUtils.cmake +@@ -427,7 +427,7 @@ function(ADD_ARROW_LIB LIB_NAME) + target_include_directories(${LIB_NAME}_static PRIVATE ${ARG_PRIVATE_INCLUDES}) + endif() + +- if(MSVC_TOOLCHAIN) ++ if(MSVC_TOOLCHAIN AND 0) + set(LIB_NAME_STATIC ${LIB_NAME}_static) + else() + set(LIB_NAME_STATIC ${LIB_NAME}) diff --git a/externals/vcpkg/ports/arrow/fix-ThirdPartyToolchain.patch b/externals/vcpkg/ports/arrow/fix-ThirdPartyToolchain.patch new file mode 100755 index 000000000..f39cc9758 --- /dev/null +++ b/externals/vcpkg/ports/arrow/fix-ThirdPartyToolchain.patch @@ -0,0 +1,143 @@ +diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake +index f070323..290b5a7 100644 +--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake ++++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake +@@ -53,7 +53,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES + AWSSDK + benchmark + Boost +- Brotli ++ unofficial-brotli + BZip2 + c-ares + gflags +@@ -62,7 +62,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES + gRPC + GTest + LLVM +- Lz4 ++ lz4 + nlohmann_json + opentelemetry-cpp + ORC +@@ -72,7 +72,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES + Snappy + Substrait + Thrift +- utf8proc ++ unofficial-utf8proc + xsimd + ZLIB + zstd) +@@ -139,6 +139,9 @@ foreach(DEPENDENCY ${ARROW_THIRDPARTY_DEPENDENCIES}) + endforeach() + + macro(build_dependency DEPENDENCY_NAME) ++ if(NOT "${DEPENDENCY_NAME}" STREQUAL "xsimd") ++ message(FATAL_ERROR "dependencies should never be built in vcpkg") ++ endif() + if("${DEPENDENCY_NAME}" STREQUAL "AWSSDK") + build_awssdk() + elseif("${DEPENDENCY_NAME}" STREQUAL "benchmark") +@@ -222,7 +225,7 @@ macro(resolve_dependency DEPENDENCY_NAME) + endif() + + if(ARG_HAVE_ALT) +- set(PACKAGE_NAME "${DEPENDENCY_NAME}Alt") ++ set(PACKAGE_NAME "${DEPENDENCY_NAME}") + else() + set(PACKAGE_NAME ${DEPENDENCY_NAME}) + endif() +@@ -1129,10 +1132,16 @@ macro(build_brotli) + endmacro() + + if(ARROW_WITH_BROTLI) +- resolve_dependency(Brotli PC_PACKAGE_NAMES libbrotlidec libbrotlienc) ++ resolve_dependency(unofficial-brotli USE_CONFIG TRUE PC_PACKAGE_NAMES libbrotlidec libbrotlienc) ++ add_library(Brotli::brotlicommon ALIAS unofficial::brotli::brotlicommon) ++ add_library(Brotli::brotlienc ALIAS unofficial::brotli::brotlienc) ++ add_library(Brotli::brotlidec ALIAS unofficial::brotli::brotlidec) ++ get_target_property(BROTLI_INCLUDE_DIR unofficial::brotli::brotlicommon-static INTERFACE_INCLUDE_DIRECTORIES) + # TODO: Don't use global includes but rather target_include_directories ++ if(NOT BROTLI_INCLUDE_DIR) + get_target_property(BROTLI_INCLUDE_DIR Brotli::brotlicommon + INTERFACE_INCLUDE_DIRECTORIES) ++ endif() + include_directories(SYSTEM ${BROTLI_INCLUDE_DIR}) + endif() + +@@ -1249,7 +1261,7 @@ macro(build_glog) + endmacro() + + if(ARROW_USE_GLOG) +- resolve_dependency(GLOG PC_PACKAGE_NAMES libglog) ++ resolve_dependency(glog USE_CONFIG TRUE PC_PACKAGE_NAMES libglog) + # TODO: Don't use global includes but rather target_include_directories + get_target_property(GLOG_INCLUDE_DIR glog::glog INTERFACE_INCLUDE_DIRECTORIES) + include_directories(SYSTEM ${GLOG_INCLUDE_DIR}) +@@ -1434,6 +1446,13 @@ if(ARROW_WITH_THRIFT) + # TODO: Don't use global includes but rather target_include_directories + include_directories(SYSTEM ${THRIFT_INCLUDE_DIR}) + ++ if(THRIFT_INCLUDE_DIR) ++ file(READ "${THRIFT_INCLUDE_DIR}/config.h" THRIFT_CONFIG_H_CONTENT) ++ string(REGEX MATCH "#define PACKAGE_VERSION \"[0-9.]+\"" THRIFT_VERSION_DEFINITION "${THRIFT_CONFIG_H_CONTENT}") ++ string(REGEX MATCH "[0-9.]+" THRIFT_VERSION "${THRIFT_VERSION_DEFINITION}") ++ set(THRIFT_VERSION "${THRIFT_VERSION}") ++ endif() ++ + string(REPLACE "." ";" VERSION_LIST ${THRIFT_VERSION}) + list(GET VERSION_LIST 0 THRIFT_VERSION_MAJOR) + list(GET VERSION_LIST 1 THRIFT_VERSION_MINOR) +@@ -1561,6 +1580,8 @@ if(ARROW_WITH_PROTOBUF) + ${ARROW_PROTOBUF_REQUIRED_VERSION} + PC_PACKAGE_NAMES + protobuf) ++ get_target_property(PROTOBUF_INCLUDE_DIR protobuf::libprotobuf ++ INTERFACE_INCLUDE_DIRECTORIES) + + if(NOT Protobuf_USE_STATIC_LIBS AND MSVC_TOOLCHAIN) + add_definitions(-DPROTOBUF_USE_DLLS) +@@ -2121,8 +2142,6 @@ endmacro() + if(ARROW_WITH_RAPIDJSON) + set(ARROW_RAPIDJSON_REQUIRED_VERSION "1.1.0") + resolve_dependency(RapidJSON +- HAVE_ALT +- TRUE + REQUIRED_VERSION + ${ARROW_RAPIDJSON_REQUIRED_VERSION} + IS_RUNTIME_DEPENDENCY +@@ -2260,7 +2279,8 @@ macro(build_lz4) + endmacro() + + if(ARROW_WITH_LZ4) +- resolve_dependency(Lz4 PC_PACKAGE_NAMES liblz4) ++ resolve_dependency(lz4 USE_CONFIG TRUE PC_PACKAGE_NAMES liblz4) ++ add_library(LZ4::lz4 ALIAS lz4::lz4) + + # TODO: Don't use global includes but rather target_include_directories + get_target_property(LZ4_INCLUDE_DIR LZ4::lz4 INTERFACE_INCLUDE_DIRECTORIES) +@@ -2517,11 +2537,10 @@ macro(build_utf8proc) + endmacro() + + if(ARROW_WITH_UTF8PROC) +- resolve_dependency(utf8proc +- REQUIRED_VERSION +- "2.2.0" ++ resolve_dependency(unofficial-utf8proc + PC_PACKAGE_NAMES + libutf8proc) ++ add_library(utf8proc::utf8proc ALIAS utf8proc) + + add_definitions(-DARROW_WITH_UTF8PROC) + +@@ -3719,6 +3738,9 @@ if(ARROW_WITH_GRPC) + # TODO: Don't use global includes but rather target_include_directories + get_target_property(GRPC_INCLUDE_DIR gRPC::grpc++ INTERFACE_INCLUDE_DIRECTORIES) + include_directories(SYSTEM ${GRPC_INCLUDE_DIR}) ++ if (ABSL_USE_CXX17) ++ set(CMAKE_CXX_STANDARD 17) ++ endif() + + if(GRPC_VENDORED) + set(GRPCPP_PP_INCLUDE TRUE) diff --git a/externals/vcpkg/ports/arrow/portfile.cmake b/externals/vcpkg/ports/arrow/portfile.cmake new file mode 100755 index 000000000..4f5e759d9 --- /dev/null +++ b/externals/vcpkg/ports/arrow/portfile.cmake @@ -0,0 +1,118 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO apache/arrow + REF apache-arrow-8.0.0 + SHA512 08b6ab4a3c5e0dd9c46402da8e7b9ef9f918eea177413cb31695192dfdb5a472ebbfef255b8343fe775d81e8b5eb268c3428a699fac48b36bf808f5b81e83a64 + HEAD_REF master + PATCHES + vs-2022-fixes.patch + all.patch + fix-ThirdPartyToolchain.patch +) +file(REMOVE "${SOURCE_PATH}/cpp/cmake_modules/Findzstd.cmake" + "${SOURCE_PATH}/cpp/cmake_modules/FindBrotli.cmake" + "${SOURCE_PATH}/cpp/cmake_modules/Find-c-aresAlt.cmake" + "${SOURCE_PATH}/cpp/cmake_modules/FindLz4.cmake" + "${SOURCE_PATH}/cpp/cmake_modules/FindSnappy.cmake" + "${SOURCE_PATH}/cpp/cmake_modules/FindThrift.cmake" + "${SOURCE_PATH}/cpp/cmake_modules/FindGLOG.cmake" + "${SOURCE_PATH}/cpp/cmake_modules/Findutf8proc.cmake" + "${SOURCE_PATH}/cpp/cmake_modules/FindRapidJSONAlt.cmake" + "${SOURCE_PATH}/cpp/cmake_modules/FindgRPCAlt.cmake" + "${SOURCE_PATH}/cpp/cmake_modules/FindgflagsAlt.cmake" +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + csv ARROW_CSV + dataset ARROW_DATASET + filesystem ARROW_FILESYSTEM + flight ARROW_FLIGHT + json ARROW_JSON + orc ARROW_ORC + parquet ARROW_PARQUET + parquet PARQUET_REQUIRE_ENCRYPTION + plasma ARROW_PLASMA + s3 ARROW_S3 + cuda ARROW_CUDA +) + +if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) + set(MALLOC_OPTIONS -DARROW_JEMALLOC=OFF) +elseif("jemalloc" IN_LIST FEATURES) + set(MALLOC_OPTIONS -DARROW_JEMALLOC=ON) +else() + set(MALLOC_OPTIONS -DARROW_JEMALLOC=OFF) +endif() + +if(VCPKG_TARGET_IS_WINDOWS AND ("mimalloc" IN_LIST FEATURES)) + set(MALLOC_OPTIONS ${MALLOC_OPTIONS} -DARROW_MIMALLOC=ON) +else() + set(MALLOC_OPTIONS ${MALLOC_OPTIONS} -DARROW_MIMALLOC=OFF) +endif() + +string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "dynamic" ARROW_BUILD_SHARED) +string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" ARROW_BUILD_STATIC) +string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "dynamic" ARROW_DEPENDENCY_USE_SHARED) + +if(VCPKG_TARGET_IS_WINDOWS) + set(THRIFT_USE_SHARED OFF) +else() + set(THRIFT_USE_SHARED ${ARROW_DEPENDENCY_USE_SHARED}) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/cpp" + OPTIONS + ${FEATURE_OPTIONS} + ${MALLOC_OPTIONS} + ${S3_OPTIONS} + -DCMAKE_SYSTEM_PROCESSOR=${VCPKG_TARGET_ARCHITECTURE} + -DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED} + -DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC} + -DARROW_BUILD_TESTS=OFF + -DARROW_DEPENDENCY_SOURCE=SYSTEM + -DARROW_DEPENDENCY_USE_SHARED=${ARROW_DEPENDENCY_USE_SHARED} + -DARROW_THRIFT_USE_SHARED=${THRIFT_USE_SHARED} + -DBUILD_WARNING_LEVEL=PRODUCTION + -DARROW_WITH_BROTLI=ON + -DARROW_WITH_BZ2=ON + -DARROW_WITH_LZ4=ON + -DARROW_WITH_SNAPPY=ON + -DARROW_WITH_ZLIB=ON + -DARROW_WITH_ZSTD=ON + -DZSTD_MSVC_LIB_PREFIX= + MAYBE_UNUSED_VARIABLES + ZSTD_MSVC_LIB_PREFIX +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib") + message(FATAL_ERROR "Installed lib file should be named 'arrow.lib' via patching the upstream build.") +endif() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/arrow) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake") + +configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT} @ONLY) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(GLOB PARQUET_FILES ${CURRENT_PACKAGES_DIR}/share/${PORT}/Parquet*) +file(COPY ${PARQUET_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/parquet") +file(REMOVE_RECURSE ${PARQUET_FILES}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/FindParquet.cmake ${CURRENT_PACKAGES_DIR}/share/parquet/FindParquet.cmake) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if ("plasma" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES plasma-store-server AUTO_CLEAN) +endif () + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/arrow/usage b/externals/vcpkg/ports/arrow/usage new file mode 100755 index 000000000..0dcfa79cb --- /dev/null +++ b/externals/vcpkg/ports/arrow/usage @@ -0,0 +1,7 @@ +The package arrow provides CMake targets: + + find_package(Arrow CONFIG REQUIRED) + target_link_libraries(main PRIVATE ${ARROW_LIBRARIES}) + + find_package(Parquet CONFIG REQUIRED) + target_link_libraries(main PRIVATE ${PARQUET_LIBRARIES}) \ No newline at end of file diff --git a/externals/vcpkg/ports/arrow/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/arrow/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..29d04506e --- /dev/null +++ b/externals/vcpkg/ports/arrow/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,9 @@ +_find_package(${ARGS}) + +if(TARGET arrow_static) + list(APPEND ARROW_LIBRARIES arrow_static) + list(APPEND PARQUET_LIBRARIES parquet_static) +elseif (TARGET arrow_shared) + list(APPEND ARROW_LIBRARIES arrow_shared) + list(APPEND PARQUET_LIBRARIES parquet_shared) +endif() diff --git a/externals/vcpkg/ports/arrow/vcpkg.json b/externals/vcpkg/ports/arrow/vcpkg.json new file mode 100755 index 000000000..f435e7112 --- /dev/null +++ b/externals/vcpkg/ports/arrow/vcpkg.json @@ -0,0 +1,110 @@ +{ + "name": "arrow", + "version": "8.0.0", + "description": "Cross-language development platform for in-memory analytics", + "homepage": "https://arrow.apache.org", + "license": "Apache-2.0", + "supports": "x64 | (arm64 & !windows)", + "dependencies": [ + "boost-filesystem", + "boost-multiprecision", + "boost-system", + "brotli", + "bzip2", + "gflags", + "glog", + "lz4", + "openssl", + "re2", + "snappy", + "thrift", + "utf8proc", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib", + "zstd" + ], + "default-features": [ + "csv", + "filesystem", + "json", + "parquet" + ], + "features": { + "csv": { + "description": "CSV support" + }, + "cuda": { + "description": "cuda support", + "dependencies": [ + "cuda" + ] + }, + "dataset": { + "description": "Dataset support" + }, + "filesystem": { + "description": "Filesystem support" + }, + "flight": { + "description": "Arrow Flight RPC support", + "dependencies": [ + "abseil", + "c-ares", + "grpc", + "protobuf" + ] + }, + "jemalloc": { + "description": "jemalloc allocator" + }, + "json": { + "description": "JSON support", + "dependencies": [ + "rapidjson" + ] + }, + "mimalloc": { + "description": "mimalloc allocator" + }, + "orc": { + "description": "ORC support", + "dependencies": [ + "orc" + ] + }, + "parquet": { + "description": "Parquet support", + "dependencies": [ + "rapidjson" + ] + }, + "plasma": { + "description": "Plasma support", + "supports": "!windows" + }, + "s3": { + "description": "S3 support", + "dependencies": [ + { + "name": "aws-sdk-cpp", + "default-features": false, + "features": [ + "cognito-identity", + "config", + "identity-management", + "s3", + "sts", + "transfer" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/arrow/vs-2022-fixes.patch b/externals/vcpkg/ports/arrow/vs-2022-fixes.patch new file mode 100755 index 000000000..964706331 --- /dev/null +++ b/externals/vcpkg/ports/arrow/vs-2022-fixes.patch @@ -0,0 +1,42 @@ +diff --git a/cpp/src/arrow/compute/light_array_test.cc b/cpp/src/arrow/compute/light_array_test.cc +index 3f6d47803..dcc7841a0 100644 +--- a/cpp/src/arrow/compute/light_array_test.cc ++++ b/cpp/src/arrow/compute/light_array_test.cc +@@ -18,6 +18,7 @@ + #include "arrow/compute/light_array.h" + + #include ++#include + + #include "arrow/compute/exec/test_util.h" + #include "arrow/testing/generator.h" +diff --git a/cpp/src/arrow/util/tracing.cc b/cpp/src/arrow/util/tracing.cc +index b8bddcd50..126c69781 100644 +--- a/cpp/src/arrow/util/tracing.cc ++++ b/cpp/src/arrow/util/tracing.cc +@@ -38,6 +38,7 @@ Span::Impl& Span::Set(Impl&& impl) { + #endif + + // Default destructor when impl type is complete. ++Span::Span() = default; + Span::~Span() = default; + + } // namespace tracing +diff --git a/cpp/src/arrow/util/tracing.h b/cpp/src/arrow/util/tracing.h +index 15f7fca1e..1d9d08b33 100644 +--- a/cpp/src/arrow/util/tracing.h ++++ b/cpp/src/arrow/util/tracing.h +@@ -35,11 +35,11 @@ class SpanImpl; + namespace util { + namespace tracing { + +-class ARROW_EXPORT Span { ++class Span { + public: + using Impl = arrow::internal::tracing::SpanImpl; + +- Span() = default; // Default constructor. The inner_impl is a nullptr. ++ Span(); // Default constructor. The inner_impl is a nullptr. + ~Span(); // Destructor. Default destructor defined in tracing.cc where impl is a + // complete type. + diff --git a/externals/vcpkg/ports/ashes/portfile.cmake b/externals/vcpkg/ports/ashes/portfile.cmake new file mode 100755 index 000000000..ddfea4593 --- /dev/null +++ b/externals/vcpkg/ports/ashes/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DragonJoker/Ashes + REF 0f8ad8edec1b0929ebd10247d3dd0a9ee8f8c91a + HEAD_REF master + SHA512 9f34c2f6760a74eb34fc02c5007af41a089ac8b01716f1ba3670014984ab277f02c4bbf14ce3f5996a164d24c1eb8edd525cb1c5da9fc0edbf2ccce3024cb11a +) + +vcpkg_from_github( + OUT_SOURCE_PATH CMAKE_SOURCE_PATH + REPO DragonJoker/CMakeUtils + REF 77734eff73c8bb9861591a9e910f34f2bafa5563 + HEAD_REF master + SHA512 f6110eafc8476f41490f7f9087a83ddf90d21f3cbf455edafd02e4805d3dd7f22ed955b8cba8a26600f080de06b19ce6c712e36f03c825fd3c4015b74d030e72 +) + +file(REMOVE_RECURSE "${SOURCE_PATH}/CMake") +file(COPY "${CMAKE_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/CMake") + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DVCPKG_PACKAGE_BUILD=ON + -DASHES_BUILD_TEMPLATES=OFF + -DASHES_BUILD_TESTS=OFF + -DASHES_BUILD_INFO=OFF + -DASHES_BUILD_SAMPLES=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ashes) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/ashes/vcpkg.json b/externals/vcpkg/ports/ashes/vcpkg.json new file mode 100755 index 000000000..6924e9793 --- /dev/null +++ b/externals/vcpkg/ports/ashes/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "ashes", + "version-date": "2022-06-08", + "description": "Drop-in replacement to Vulkan's shared library, allowing the use of OpenGL or Direct3D11 in addition to Vulkan.", + "homepage": "https://github.com/DragonJoker/Ashes", + "license": "MIT", + "supports": "!osx & !linux & !ios & !android & !uwp & !x86 & !arm & !static", + "dependencies": [ + "opengl", + "spirv-cross", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "vulkan-headers" + ] +} diff --git a/externals/vcpkg/ports/asio-grpc/portfile.cmake b/externals/vcpkg/ports/asio-grpc/portfile.cmake new file mode 100755 index 000000000..da91236ee --- /dev/null +++ b/externals/vcpkg/ports/asio-grpc/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Tradias/asio-grpc + REF v1.7.0 + SHA512 2a9c583678026e1eed4b2128ecf7bb18dff9a39e26de9a29f035cd7c6c838edc5d95015319407d493b09fd650de8b1b7b0bed1b92ba88d40f69d806adf6a0af1 + HEAD_REF master +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + boost-container ASIO_GRPC_USE_BOOST_CONTAINER +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS ${FEATURE_OPTIONS} + -DASIO_GRPC_CMAKE_CONFIG_INSTALL_DIR=share/asio-grpc +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/asio-grpc/usage b/externals/vcpkg/ports/asio-grpc/usage new file mode 100755 index 000000000..bb11c4a93 --- /dev/null +++ b/externals/vcpkg/ports/asio-grpc/usage @@ -0,0 +1,15 @@ +The package asio-grpc can be used with different backends. + + find_package(asio-grpc CONFIG REQUIRED) + +The Boost.Asio backend. Install "boost-asio" and link with: + + target_link_libraries(main PRIVATE asio-grpc::asio-grpc) + +The standalone Asio backend. Install "asio" and link with: + + target_link_libraries(main PRIVATE asio-grpc::asio-grpc-standalone-asio) + +The libunifex backend. Install "libunifex" and link with: + + target_link_libraries(main PRIVATE asio-grpc::asio-grpc-unifex) diff --git a/externals/vcpkg/ports/asio-grpc/vcpkg.json b/externals/vcpkg/ports/asio-grpc/vcpkg.json new file mode 100755 index 000000000..dedf1caf9 --- /dev/null +++ b/externals/vcpkg/ports/asio-grpc/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "asio-grpc", + "version": "1.7.0", + "description": "Asynchronous gRPC with Asio/unified executors", + "homepage": "https://github.com/Tradias/asio-grpc", + "license": "Apache-2.0", + "dependencies": [ + "grpc", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "boost-container": { + "description": "Use Boost.Container instead of ", + "dependencies": [ + "boost-container" + ] + } + } +} diff --git a/externals/vcpkg/ports/asio/CMakeLists.txt b/externals/vcpkg/ports/asio/CMakeLists.txt new file mode 100755 index 000000000..4241b1ffc --- /dev/null +++ b/externals/vcpkg/ports/asio/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.8) +project(asio) + +add_library(asio INTERFACE) + +# Export target +install(TARGETS asio + EXPORT asio + INCLUDES DESTINATION include/ +) + +install(EXPORT asio + DESTINATION "share/asio" + FILE asio-targets.cmake +) + +install(DIRECTORY + asio/include/asio + DESTINATION include/ + FILES_MATCHING + PATTERN "*.hpp" + PATTERN "*.ipp" +) + +install(FILES + asio/include/asio.hpp + DESTINATION include/ +) diff --git a/externals/vcpkg/ports/asio/asio-config.cmake b/externals/vcpkg/ports/asio/asio-config.cmake new file mode 100755 index 000000000..32e00095a --- /dev/null +++ b/externals/vcpkg/ports/asio/asio-config.cmake @@ -0,0 +1,6 @@ +include ("${CMAKE_CURRENT_LIST_DIR}/asio-targets.cmake") +add_library(asio::asio INTERFACE IMPORTED) +target_link_libraries(asio::asio INTERFACE asio) + +get_target_property(_ASIO_INCLUDE_DIR asio INTERFACE_INCLUDE_DIRECTORIES) +set(ASIO_INCLUDE_DIR "${_ASIO_INCLUDE_DIR}") diff --git a/externals/vcpkg/ports/asio/portfile.cmake b/externals/vcpkg/ports/asio/portfile.cmake new file mode 100755 index 000000000..6f83c5f40 --- /dev/null +++ b/externals/vcpkg/ports/asio/portfile.cmake @@ -0,0 +1,29 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO chriskohlhoff/asio + REF asio-1-22-1 + SHA512 7658293f2be1f5ea659a424614b2f3092954df45802fbb0031b7983d11762f4f68d18eab076e14954df3a24ce89ff26bd4bebea88b9a3dc680387252efec8398 + HEAD_REF master +) + +# Always use "ASIO_STANDALONE" to avoid boost dependency +vcpkg_replace_string("${SOURCE_PATH}/asio/include/asio/detail/config.hpp" "defined(ASIO_STANDALONE)" "!defined(VCPKG_DISABLE_ASIO_STANDALONE)") + +# CMake install +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() +file(INSTALL + "${CMAKE_CURRENT_LIST_DIR}/asio-config.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" +) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/asio/LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/asio/vcpkg.json b/externals/vcpkg/ports/asio/vcpkg.json new file mode 100755 index 000000000..ab4d14556 --- /dev/null +++ b/externals/vcpkg/ports/asio/vcpkg.json @@ -0,0 +1,37 @@ +{ + "name": "asio", + "version": "1.22.1", + "description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.", + "homepage": "https://github.com/chriskohlhoff/asio", + "documentation": "https://think-async.com/Asio/asio-1.22.1/doc/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "coroutine": { + "description": "Boost.Coroutine (optional) if you use spawn() to launch coroutines", + "dependencies": [ + "boost-coroutine" + ] + }, + "openssl": { + "description": "OpenSSL (optional) if you use Asio's SSL support.", + "dependencies": [ + "openssl" + ] + }, + "regex": { + "description": "Boost.Regex (optional) if you use any of the read_until() or async_read_until() overloads that take a boost::regex parameter.", + "dependencies": [ + "boost-regex" + ] + } + } +} diff --git a/externals/vcpkg/ports/asiosdk/Findasiosdk.cmake b/externals/vcpkg/ports/asiosdk/Findasiosdk.cmake new file mode 100755 index 000000000..b8f32f830 --- /dev/null +++ b/externals/vcpkg/ports/asiosdk/Findasiosdk.cmake @@ -0,0 +1,37 @@ +if(WIN32) +else(WIN32) + message(FATAL_ERROR "Findasiosdk.cmake: Unsupported platform ${CMAKE_SYSTEM_NAME}" ) +endif(WIN32) + +find_path( + ASIOSDK_ROOT_DIR + asiosdk +) + +if (NOT "${ASIOSDK_ROOT_DIR}" STREQUAL "") + set(ASIOSDK_ROOT_DIR + ${ASIOSDK_ROOT_DIR}/asiosdk + ) +endif() + +find_path(ASIOSDK_INCLUDE_DIR + asio.h + PATHS + ${ASIOSDK_ROOT_DIR}/common +) + + +if (NOT "${ASIOSDK_ROOT_DIR}" STREQUAL "") + set (ASIOSDK_INCLUDE_DIR + ${ASIOSDK_ROOT_DIR}/common + ${ASIOSDK_ROOT_DIR}/host + ${ASIOSDK_ROOT_DIR}/hostpc + ) +endif() + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(ASIOSDK DEFAULT_MSG ASIOSDK_ROOT_DIR ASIOSDK_INCLUDE_DIR) + +MARK_AS_ADVANCED( + ASIOSDK_ROOT_DIR ASIOSDK_INCLUDE_DIR +) diff --git a/externals/vcpkg/ports/asiosdk/portfile.cmake b/externals/vcpkg/ports/asiosdk/portfile.cmake new file mode 100755 index 000000000..a57601641 --- /dev/null +++ b/externals/vcpkg/ports/asiosdk/portfile.cmake @@ -0,0 +1,29 @@ +set(VERSION 2.3.3) + +vcpkg_download_distfile(ARCHIVE + URLS "https://download.steinberg.net/sdk_downloads/asiosdk_2.3.3_2019-06-14.zip" + FILENAME "asiosdk_2.3.3_2019-06-14-eac6c1a57829.zip" + SHA512 eac6c1a57829b7f722a681c54b2f6469d54695523f08f727d0dd6744dcd7fce4f3249c57689bb15ed7a8bcb912833b226439d800913e122e0ef9ab73672f6542 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${VERSION} +) + +file(INSTALL ${SOURCE_PATH}/asio/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/asio) +file(INSTALL ${SOURCE_PATH}/common/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/common) +file(INSTALL ${SOURCE_PATH}/driver/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/driver) +file(INSTALL ${SOURCE_PATH}/host/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/host) +file(INSTALL ${SOURCE_PATH}/readme.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL ${SOURCE_PATH}/readme.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/changes.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/Steinberg ASIO Logo Artwork.zip" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/Steinberg ASIO 2.3.3 Licensing Agreement 2.0.1 - 2019.pdf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/ASIO SDK 2.3.pdf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/Findasiosdk.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/externals/vcpkg/ports/asiosdk/usage b/externals/vcpkg/ports/asiosdk/usage new file mode 100755 index 000000000..1afa2ae84 --- /dev/null +++ b/externals/vcpkg/ports/asiosdk/usage @@ -0,0 +1,4 @@ +The package asiosdk provides CMake integration: + + find_package(asiosdk REQUIRED) + target_include_directories( PRIVATE ${ASIOSDK_INCLUDE_DIRS}) diff --git a/externals/vcpkg/ports/asiosdk/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/asiosdk/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..df14d7c82 --- /dev/null +++ b/externals/vcpkg/ports/asiosdk/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,6 @@ +set(ASIOSDK_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) + +_find_package(${ARGS}) + +set(CMAKE_MODULE_PATH ${ASIOSDK_PREV_MODULE_PATH}) diff --git a/externals/vcpkg/ports/asiosdk/vcpkg.json b/externals/vcpkg/ports/asiosdk/vcpkg.json new file mode 100755 index 000000000..6d3e9ce60 --- /dev/null +++ b/externals/vcpkg/ports/asiosdk/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "asiosdk", + "version": "2.3.3", + "port-version": 4, + "description": "ASIO is a low latency audio API from Steinberg.", + "homepage": "https://www.steinberg.net/en/company/developers.html", + "supports": "windows & !(arm | uwp)" +} diff --git a/externals/vcpkg/ports/asmjit/portfile.cmake b/externals/vcpkg/ports/asmjit/portfile.cmake new file mode 100755 index 000000000..ffcdcd59a --- /dev/null +++ b/externals/vcpkg/ports/asmjit/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO asmjit/asmjit + REF d0d14ac774977d0060a351f66e35cb57ba0bf59c # accessed on 2021-10-26 + SHA512 2822763fcb3c18f6699119c1773404667d81f8afb86f8f2e8dbe627526a2877b049d16505557e680e4e310f0e0667263dc4ac442f682e95f2568bf0bf8b61b4b + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ASMJIT_STATIC) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DASMJIT_STATIC=${ASMJIT_STATIC} + ) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/asmjit) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/asmjit/core/api-config.h" + "#if !defined(ASMJIT_STATIC)" + "#if 0" + ) +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/asmjit/vcpkg.json b/externals/vcpkg/ports/asmjit/vcpkg.json new file mode 100755 index 000000000..bf0644109 --- /dev/null +++ b/externals/vcpkg/ports/asmjit/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "asmjit", + "version-date": "2021-10-26", + "port-version": 1, + "description": "Complete x86/x64 JIT and Remote Assembler for C++", + "homepage": "https://github.com/asmjit/asmjit", + "supports": "!arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/assimp/build_fixes.patch b/externals/vcpkg/ports/assimp/build_fixes.patch new file mode 100755 index 000000000..7590aec96 --- /dev/null +++ b/externals/vcpkg/ports/assimp/build_fixes.patch @@ -0,0 +1,626 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dcafb64..761040d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,7 +51,7 @@ IF(HUNTER_ENABLED) + add_definitions(-DASSIMP_USE_HUNTER) + ENDIF(HUNTER_ENABLED) + +-PROJECT( Assimp VERSION 5.0.0 ) ++PROJECT( Assimp VERSION 5.0.1 ) + + # All supported options ############################################### + +@@ -130,6 +130,16 @@ OPTION ( IGNORE_GIT_HASH + OFF + ) + ++find_package(Stb REQUIRED) ++include_directories(${Stb_INCLUDE_DIR}) ++find_package(utf8cpp CONFIG REQUIRED) ++link_libraries(utf8cpp) ++find_package(RapidJSON CONFIG REQUIRED) ++include_directories(${RAPIDJSON_INCLUDE_DIRS}) ++find_path(UNZIP_INCLUDE_DIRS "minizip/unzip.h") ++include_directories(${UNZIP_INCLUDE_DIRS}/minizip) ++include_directories(${CMAKE_CURRENT_SOURCE_DIR}/contrib) ++ + IF (IOS AND NOT HUNTER_ENABLED) + IF (NOT CMAKE_BUILD_TYPE) + SET(CMAKE_BUILD_TYPE "Release") +@@ -230,10 +240,8 @@ SET(LIBASSIMP-DEV_COMPONENT "libassimp${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_M + SET(CPACK_COMPONENTS_ALL assimp-bin ${LIBASSIMP_COMPONENT} ${LIBASSIMP-DEV_COMPONENT} assimp-dev) + SET(ASSIMP_LIBRARY_SUFFIX "" CACHE STRING "Suffix to append to library names") + +-IF( UNIX ) + # Use GNUInstallDirs for Unix predefined directories + INCLUDE(GNUInstallDirs) +-ENDIF( UNIX ) + + # Grouped compiler settings + IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW) +@@ -253,7 +261,6 @@ ELSEIF(MSVC) + IF(MSVC12) + ADD_COMPILE_OPTIONS(/wd4351) + ENDIF() +- SET(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MDd /Ob2 /DEBUG:FULL /Zi") + ELSEIF ( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" ) + IF(NOT HUNTER_ENABLED) + SET(CMAKE_CXX_FLAGS "-fPIC -std=c++11 ${CMAKE_CXX_FLAGS}") +@@ -352,35 +359,21 @@ IF (NOT TARGET uninstall) + ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") + ENDIF() + +-IF(HUNTER_ENABLED) +- set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}") ++ set(CONFIG_INSTALL_DIR "share/assimp") + set(INCLUDE_INSTALL_DIR "include") + +- set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") ++ string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE) ++ set(NAMESPACE "${PROJECT_NAME_LOWERCASE}::") + +- # Configuration +- set(VERSION_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}ConfigVersion.cmake") +- set(PROJECT_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}Config.cmake") +- set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") +- set(NAMESPACE "${PROJECT_NAME}::") ++ set(TARGETS_EXPORT_NAME "${PROJECT_NAME_LOWERCASE}Config") ++ set(VERSION_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME_LOWERCASE}ConfigVersion.cmake") ++ set(NAMESPACE "${PROJECT_NAME_LOWERCASE}::") + +- # Include module with fuction 'write_basic_package_version_file' + include(CMakePackageConfigHelpers) +- +- # Note: PROJECT_VERSION is used as a VERSION +- write_basic_package_version_file("${VERSION_CONFIG}" COMPATIBILITY SameMajorVersion) +- +- # Use variables: +- # * TARGETS_EXPORT_NAME +- # * PROJECT_NAME +- configure_package_config_file( +- "cmake/assimp-hunter-config.cmake.in" +- "${PROJECT_CONFIG}" +- INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}" +- ) ++ write_basic_package_version_file("${VERSION_CONFIG}" VERSION ${${PROJECT_NAME}_VERSION} COMPATIBILITY SameMajorVersion) + + install( +- FILES "${PROJECT_CONFIG}" "${VERSION_CONFIG}" ++ FILES ${VERSION_CONFIG} + DESTINATION "${CONFIG_INSTALL_DIR}" + ) + +@@ -389,30 +382,6 @@ IF(HUNTER_ENABLED) + NAMESPACE "${NAMESPACE}" + DESTINATION "${CONFIG_INSTALL_DIR}" + ) +-ELSE(HUNTER_ENABLED) +- # cmake configuration files +- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" @ONLY IMMEDIATE) +- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" @ONLY IMMEDIATE) +- IF (is_multi_config) +- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-debug.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake" @ONLY IMMEDIATE) +- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-release.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake" @ONLY IMMEDIATE) +- SET(PACKAGE_TARGETS_FILE "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake") +- ELSEIF (CMAKE_BUILD_TYPE STREQUAL Debug) +- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-debug.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake" @ONLY IMMEDIATE) +- SET(PACKAGE_TARGETS_FILE "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake") +- ELSE() +- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-release.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake" @ONLY IMMEDIATE) +- SET(PACKAGE_TARGETS_FILE "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake") +- ENDIF() +- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config-version.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config-version.cmake" @ONLY IMMEDIATE) +- #we should generated these scripts after CMake VERSION 3.0.2 using export(EXPORT ...) and write_basic_package_version_file(...) +- INSTALL(FILES +- "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" +- "${CMAKE_CURRENT_BINARY_DIR}/assimp-config-version.cmake" +- "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" +- ${PACKAGE_TARGETS_FILE} +- DESTINATION "${ASSIMP_LIB_INSTALL_DIR}/cmake/assimp-${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}" COMPONENT ${LIBASSIMP-DEV_COMPONENT}) +-ENDIF(HUNTER_ENABLED) + + FIND_PACKAGE( DirectX ) + +@@ -422,63 +391,19 @@ ENDIF( BUILD_DOCS ) + + # Look for system installed irrXML + IF ( SYSTEM_IRRXML ) +- FIND_PACKAGE( IrrXML REQUIRED ) ++ FIND_PACKAGE( irrlicht CONFIG REQUIRED ) + ENDIF( SYSTEM_IRRXML ) + + # Search for external dependencies, and build them from source if not found + # Search for zlib +-IF(HUNTER_ENABLED) +- hunter_add_package(ZLIB) +- find_package(ZLIB CONFIG REQUIRED) ++ find_package(ZLIB REQUIRED) + + add_definitions(-DASSIMP_BUILD_NO_OWN_ZLIB) + set(ZLIB_FOUND TRUE) +- set(ZLIB_LIBRARIES ZLIB::zlib) +- set(ASSIMP_BUILD_MINIZIP TRUE) +-ELSE(HUNTER_ENABLED) +- IF ( NOT ASSIMP_BUILD_ZLIB ) +- FIND_PACKAGE(ZLIB) +- ENDIF( NOT ASSIMP_BUILD_ZLIB ) +- +- IF( NOT ZLIB_FOUND ) +- MESSAGE(STATUS "compiling zlib from sources") +- INCLUDE(CheckIncludeFile) +- INCLUDE(CheckTypeSize) +- INCLUDE(CheckFunctionExists) +- +- # Explicitly turn off ASM686 and AMD64 cmake options. +- # The AMD64 option causes a build failure on MSVC and the ASM builds seem to have problems: +- # https://github.com/madler/zlib/issues/41#issuecomment-125848075 +- # Also prevents these options from "polluting" the cmake options if assimp is being +- # included as a submodule. +- set( ASM686 FALSE CACHE INTERNAL "Override ZLIB flag to turn off assembly" FORCE ) +- set( AMD64 FALSE CACHE INTERNAL "Override ZLIB flag to turn off assembly" FORCE ) +- +- # compile from sources +- ADD_SUBDIRECTORY(contrib/zlib) +- SET(ZLIB_FOUND 1) +- SET(ZLIB_LIBRARIES zlibstatic) +- SET(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/contrib/zlib ${CMAKE_CURRENT_BINARY_DIR}/contrib/zlib) +- # need to ensure we don't link with system zlib or minizip as well. +- SET(ASSIMP_BUILD_MINIZIP 1) +- ELSE(NOT ZLIB_FOUND) +- ADD_DEFINITIONS(-DASSIMP_BUILD_NO_OWN_ZLIB) +- SET(ZLIB_LIBRARIES_LINKED -lz) +- ENDIF(NOT ZLIB_FOUND) ++ set(ZLIB_LIBRARIES ZLIB::ZLIB) + INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) +-ENDIF(HUNTER_ENABLED) + +-IF( NOT IOS ) +- IF( NOT ASSIMP_BUILD_MINIZIP ) +- use_pkgconfig(UNZIP minizip) +- ENDIF( NOT ASSIMP_BUILD_MINIZIP ) +-ELSE ( NOT IOS ) +- IF( NOT BUILD_SHARED_LIBS ) +- IF( NOT ASSIMP_BUILD_MINIZIP ) +- use_pkgconfig(UNZIP minizip) +- ENDIF( NOT ASSIMP_BUILD_MINIZIP ) +- ENDIF ( NOT BUILD_SHARED_LIBS ) +-ENDIF ( NOT IOS ) ++ find_package(minizip CONFIG REQUIRED) + + IF ( ASSIMP_NO_EXPORT ) + ADD_DEFINITIONS( -DASSIMP_BUILD_NO_EXPORT) +@@ -633,7 +558,7 @@ IF(CMAKE_CPACK_COMMAND AND UNIX AND ASSIMP_OPT_BUILD_PACKAGES) + INCLUDE(DebSourcePPA) + ENDIF() + +-if(WIN32) ++if(0) + if (CMAKE_SIZEOF_VOID_P EQUAL 8) + SET(BIN_DIR "${PROJECT_SOURCE_DIR}/bin64/") + SET(LIB_DIR "${PROJECT_SOURCE_DIR}/lib64/") +@@ -677,4 +602,4 @@ if(WIN32) + ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb VERBATIM) + ENDIF() + ENDIF(MSVC12 OR MSVC14 OR MSVC15 ) +-ENDIF (WIN32) ++ENDIF (0) +diff --git a/assimpTargets.cmake.in b/assimpTargets.cmake.in +index ab1a8d2..4b0729b 100644 +--- a/assimpTargets.cmake.in ++++ b/assimpTargets.cmake.in +@@ -5,6 +5,8 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) + endif() + cmake_policy(PUSH) + cmake_policy(VERSION 2.6) ++# Required for the evaluation of "if(@BUILD_SHARED_LIBS@)" below to function ++cmake_policy(SET CMP0012 NEW) + #---------------------------------------------------------------- + # Generated CMake target import file. + #---------------------------------------------------------------- +diff --git a/code/3MF/D3MFExporter.cpp b/code/3MF/D3MFExporter.cpp +index 1f388ad..1ccd2aa 100644 +--- a/code/3MF/D3MFExporter.cpp ++++ b/code/3MF/D3MFExporter.cpp +@@ -58,7 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #ifdef ASSIMP_USE_HUNTER + # include + #else +-# include ++# include + #endif + + namespace Assimp { +@@ -255,7 +255,7 @@ void D3MFExporter::writeBaseMaterials() { + hexDiffuseColor.clear(); + tmp.clear(); + hexDiffuseColor = "#"; +- ++ + tmp = DecimalToHexa( color.r ); + hexDiffuseColor += tmp; + tmp = DecimalToHexa( color.g ); +diff --git a/code/Blender/BlenderTessellator.h b/code/Blender/BlenderTessellator.h +index 518e56c..ec4a653 100644 +--- a/code/Blender/BlenderTessellator.h ++++ b/code/Blender/BlenderTessellator.h +@@ -147,7 +147,7 @@ namespace Assimp + #ifdef ASSIMP_USE_HUNTER + # include + #else +-# include "../contrib/poly2tri/poly2tri/poly2tri.h" ++# include + #endif + + namespace Assimp +diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt +index 55538d9..f5553e5 100644 +--- a/code/CMakeLists.txt ++++ b/code/CMakeLists.txt +@@ -862,89 +862,24 @@ SET( Extra_SRCS + SOURCE_GROUP( Extra FILES ${Extra_SRCS}) + + # irrXML +-IF(HUNTER_ENABLED) +- hunter_add_package(irrXML) + find_package(irrXML CONFIG REQUIRED) +-ELSE(HUNTER_ENABLED) +- # irrXML already included in contrib directory by parent CMakeLists.txt. +-ENDIF(HUNTER_ENABLED) +- +-# utf8 +-IF(HUNTER_ENABLED) +- hunter_add_package(utf8) +- find_package(utf8 CONFIG REQUIRED) +-ELSE(HUNTER_ENABLED) +- # utf8 is header-only, so Assimp doesn't need to do anything. +-ENDIF(HUNTER_ENABLED) + + # polyclipping +-IF(HUNTER_ENABLED) +- hunter_add_package(polyclipping) + find_package(polyclipping CONFIG REQUIRED) +-ELSE(HUNTER_ENABLED) + SET( Clipper_SRCS + ../contrib/clipper/clipper.hpp + ../contrib/clipper/clipper.cpp + ) + SOURCE_GROUP( Contrib\\Clipper FILES ${Clipper_SRCS}) +-ENDIF(HUNTER_ENABLED) + + # poly2tri +-IF(HUNTER_ENABLED) +- hunter_add_package(poly2tri) + find_package(poly2tri CONFIG REQUIRED) +-ELSE(HUNTER_ENABLED) +- SET( Poly2Tri_SRCS +- ../contrib/poly2tri/poly2tri/common/shapes.cc +- ../contrib/poly2tri/poly2tri/common/shapes.h +- ../contrib/poly2tri/poly2tri/common/utils.h +- ../contrib/poly2tri/poly2tri/sweep/advancing_front.h +- ../contrib/poly2tri/poly2tri/sweep/advancing_front.cc +- ../contrib/poly2tri/poly2tri/sweep/cdt.cc +- ../contrib/poly2tri/poly2tri/sweep/cdt.h +- ../contrib/poly2tri/poly2tri/sweep/sweep.cc +- ../contrib/poly2tri/poly2tri/sweep/sweep.h +- ../contrib/poly2tri/poly2tri/sweep/sweep_context.cc +- ../contrib/poly2tri/poly2tri/sweep/sweep_context.h +- ) +- SOURCE_GROUP( Contrib\\Poly2Tri FILES ${Poly2Tri_SRCS}) +-ENDIF(HUNTER_ENABLED) + + # minizip/unzip +-IF(HUNTER_ENABLED) +- hunter_add_package(minizip) + find_package(minizip CONFIG REQUIRED) +-ELSE(HUNTER_ENABLED) +- SET( unzip_SRCS +- ../contrib/unzip/crypt.h +- ../contrib/unzip/ioapi.c +- ../contrib/unzip/ioapi.h +- ../contrib/unzip/unzip.c +- ../contrib/unzip/unzip.h +- ) +- SOURCE_GROUP(Contrib\\unzip FILES ${unzip_SRCS}) +-ENDIF(HUNTER_ENABLED) + + # zip (https://github.com/kuba--/zip) +-IF(HUNTER_ENABLED) +- hunter_add_package(zip) +- find_package(zip CONFIG REQUIRED) +-ELSE(HUNTER_ENABLED) +- SET( ziplib_SRCS +- ../contrib/zip/src/miniz.h +- ../contrib/zip/src/zip.c +- ../contrib/zip/src/zip.h +- ) +- +- # TODO if cmake required version has been updated to >3.12.0, collapse this to the second case only +- if(${CMAKE_VERSION} VERSION_LESS "3.12.0") +- add_definitions(-DMINIZ_USE_UNALIGNED_LOADS_AND_STORES=0) +- else() +- add_compile_definitions(MINIZ_USE_UNALIGNED_LOADS_AND_STORES=0) +- endif() +- +- SOURCE_GROUP( ziplib FILES ${ziplib_SRCS} ) +-ENDIF(HUNTER_ENABLED) ++ find_package(kubazip CONFIG REQUIRED) + + # openddlparser + IF(HUNTER_ENABLED) +@@ -1021,13 +956,7 @@ ELSE () + ENDIF () + + # RapidJSON +-IF(HUNTER_ENABLED) +- hunter_add_package(RapidJSON) + find_package(RapidJSON CONFIG REQUIRED) +-ELSE(HUNTER_ENABLED) +- INCLUDE_DIRECTORIES( "../contrib/rapidjson/include" ) +- INCLUDE_DIRECTORIES( "../contrib" ) +-ENDIF(HUNTER_ENABLED) + + # VC2010 fixes + if(MSVC10) +@@ -1044,15 +973,6 @@ if ( MSVC ) + ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS ) + endif ( MSVC ) + +-IF(NOT HUNTER_ENABLED) +- if (UNZIP_FOUND) +- SET (unzip_compile_SRCS "") +- else (UNZIP_FOUND) +- SET (unzip_compile_SRCS ${unzip_SRCS}) +- INCLUDE_DIRECTORIES( "../contrib/unzip/" ) +- endif (UNZIP_FOUND) +-ENDIF(NOT HUNTER_ENABLED) +- + MESSAGE(STATUS "Enabled importer formats:${ASSIMP_IMPORTERS_ENABLED}") + MESSAGE(STATUS "Disabled importer formats:${ASSIMP_IMPORTERS_DISABLED}") + +@@ -1111,22 +1031,14 @@ TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC + $ + ) + +-IF(HUNTER_ENABLED) + TARGET_LINK_LIBRARIES(assimp +- PUBLIC + polyclipping::polyclipping + irrXML::irrXML +- openddlparser::openddl_parser +- poly2tri::poly2tri + minizip::minizip +- ZLIB::zlib +- RapidJSON::rapidjson +- utf8::utf8 +- zip::zip ++ ZLIB::ZLIB ++ kubazip::kubazip ++ poly2tri::poly2tri + ) +-ELSE(HUNTER_ENABLED) +- TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} ${IRRXML_LIBRARY} ) +-ENDIF(HUNTER_ENABLED) + + if(ASSIMP_ANDROID_JNIIOSYSTEM) + set(ASSIMP_ANDROID_JNIIOSYSTEM_PATH port/AndroidJNI) +@@ -1208,21 +1120,12 @@ ENDIF(APPLE) + + # Build against external unzip, or add ../contrib/unzip so + # assimp can #include "unzip.h" +-IF(NOT HUNTER_ENABLED) +- if (UNZIP_FOUND) +- INCLUDE_DIRECTORIES(${UNZIP_INCLUDE_DIRS}) +- TARGET_LINK_LIBRARIES(assimp ${UNZIP_LIBRARIES}) +- else (UNZIP_FOUND) +- INCLUDE_DIRECTORIES("../") +- endif (UNZIP_FOUND) +-ENDIF(NOT HUNTER_ENABLED) + + # Add RT-extension library for glTF importer with Open3DGC-compression. + IF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC) + TARGET_LINK_LIBRARIES(assimp ${RT_LIBRARY}) + ENDIF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC) + +-IF(HUNTER_ENABLED) + INSTALL( TARGETS assimp + EXPORT "${TARGETS_EXPORT_NAME}" + LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} +@@ -1231,14 +1134,6 @@ IF(HUNTER_ENABLED) + FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR} + COMPONENT ${LIBASSIMP_COMPONENT} + INCLUDES DESTINATION "include") +-ELSE(HUNTER_ENABLED) +-INSTALL( TARGETS assimp +- LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} +- ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR} +- RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR} +- FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR} +- COMPONENT ${LIBASSIMP_COMPONENT}) +-ENDIF(HUNTER_ENABLED) + INSTALL( FILES ${PUBLIC_HEADERS} DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp COMPONENT assimp-dev) + INSTALL( FILES ${COMPILER_HEADERS} DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp/Compiler COMPONENT assimp-dev) + +diff --git a/code/Common/BaseImporter.cpp b/code/Common/BaseImporter.cpp +index b77bbfe..51cba43 100644 +--- a/code/Common/BaseImporter.cpp ++++ b/code/Common/BaseImporter.cpp +@@ -344,7 +344,7 @@ std::string BaseImporter::GetExtension( const std::string& file ) { + #ifdef ASSIMP_USE_HUNTER + # include + #else +-# include "../contrib/utf8cpp/source/utf8.h" ++# include + #endif + + // ------------------------------------------------------------------------------------------------ +@@ -364,8 +364,8 @@ void BaseImporter::ConvertToUTF8(std::vector& data) + data.resize(data.size()-3); + return; + } +- +- ++ ++ + // UTF 32 BE with BOM + if(*((uint32_t*)&data.front()) == 0xFFFE0000) { + +@@ -507,7 +507,7 @@ struct Assimp::BatchData { + , next_id(0xffff) + , validate( validate ) { + ai_assert( nullptr != pIO ); +- ++ + pImporter = new Importer(); + pImporter->SetIOHandler( pIO ); + } +diff --git a/code/Importer/IFC/IFCGeometry.cpp b/code/Importer/IFC/IFCGeometry.cpp +index d1c7aee..8e11373 100644 +--- a/code/Importer/IFC/IFCGeometry.cpp ++++ b/code/Importer/IFC/IFCGeometry.cpp +@@ -51,9 +51,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + #ifdef ASSIMP_USE_HUNTER + # include +-# include ++# include "../contrib/clipper/clipper.hpp" + #else +-# include "../contrib/poly2tri/poly2tri/poly2tri.h" ++# include + # include "../contrib/clipper/clipper.hpp" + #endif + +diff --git a/code/Importer/IFC/IFCOpenings.cpp b/code/Importer/IFC/IFCOpenings.cpp +index d6c40b3..387c625 100644 +--- a/code/Importer/IFC/IFCOpenings.cpp ++++ b/code/Importer/IFC/IFCOpenings.cpp +@@ -51,9 +51,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + #ifdef ASSIMP_USE_HUNTER + # include +-# include ++# include "../contrib/clipper/clipper.hpp" + #else +-# include "../contrib/poly2tri/poly2tri/poly2tri.h" ++# include + # include "../contrib/clipper/clipper.hpp" + #endif + +@@ -911,14 +911,14 @@ size_t CloseWindows(ContourVector& contours, + // compare base poly normal and contour normal to detect if we need to reverse the face winding + if(curmesh.mVertcnt.size() > 0) { + IfcVector3 basePolyNormal = TempMesh::ComputePolygonNormal(curmesh.mVerts.data(), curmesh.mVertcnt.front()); +- ++ + std::vector worldSpaceContourVtx(it->contour.size()); +- ++ + for(size_t a = 0; a < it->contour.size(); ++a) + worldSpaceContourVtx[a] = minv * IfcVector3(it->contour[a].x, it->contour[a].y, 0.0); +- ++ + IfcVector3 contourNormal = TempMesh::ComputePolygonNormal(worldSpaceContourVtx.data(), worldSpaceContourVtx.size()); +- ++ + reverseCountourFaces = (contourNormal * basePolyNormal) > 0.0; + } + +diff --git a/code/Importer/STEPParser/STEPFileEncoding.cpp b/code/Importer/STEPParser/STEPFileEncoding.cpp +index 101dcdf..3f12403 100644 +--- a/code/Importer/STEPParser/STEPFileEncoding.cpp ++++ b/code/Importer/STEPParser/STEPFileEncoding.cpp +@@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #ifdef ASSIMP_USE_HUNTER + # include + #else +-# include ++# include + #endif + + #include +diff --git a/code/MMD/MMDPmxParser.cpp b/code/MMD/MMDPmxParser.cpp +index 80f0986..47725e2 100644 +--- a/code/MMD/MMDPmxParser.cpp ++++ b/code/MMD/MMDPmxParser.cpp +@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #ifdef ASSIMP_USE_HUNTER + # include + #else +-# include "../contrib/utf8cpp/source/utf8.h" ++# include + #endif + #include + +@@ -102,7 +102,7 @@ namespace pmx + const unsigned int targetSize = size * 3; // enough to encode + char *targetStart = new char[targetSize]; + std::memset(targetStart, 0, targetSize * sizeof(char)); +- ++ + utf8::utf16to8( sourceStart, sourceStart + size/2, targetStart ); + + std::string result(targetStart); +diff --git a/code/SIB/SIBImporter.cpp b/code/SIB/SIBImporter.cpp +index 20cdc80..46e9a32 100644 +--- a/code/SIB/SIBImporter.cpp ++++ b/code/SIB/SIBImporter.cpp +@@ -63,7 +63,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + # include + #else + //# include "../contrib/ConvertUTF/ConvertUTF.h" +-# include "../contrib/utf8cpp/source/utf8.h" ++# include + #endif + #include + #include +@@ -90,10 +90,10 @@ struct SIBChunk { + uint32_t Size; + } PACK_STRUCT; + +-enum { +- POS, +- NRM, +- UV, ++enum { ++ POS, ++ NRM, ++ UV, + N + }; + +diff --git a/code/X3D/FIReader.cpp b/code/X3D/FIReader.cpp +index 9bb2c69..525a084 100644 +--- a/code/X3D/FIReader.cpp ++++ b/code/X3D/FIReader.cpp +@@ -63,7 +63,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #ifdef ASSIMP_USE_HUNTER + # include + #else +-# include "../contrib/utf8cpp/source/utf8.h" ++# include + #endif + #include + #include +diff --git a/contrib/clipper/clipper.hpp b/contrib/clipper/clipper.hpp +index 7cdac6c..2728425 100644 +--- a/contrib/clipper/clipper.hpp ++++ b/contrib/clipper/clipper.hpp +@@ -302,5 +302,3 @@ class clipperException : public std::exception + } //ClipperLib namespace + + #endif //clipper_hpp +- +- +diff --git a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp b/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp +index 8d25aaa..e4bc306 100644 +--- a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp ++++ b/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp +@@ -19,7 +19,7 @@ + #include + + #define STB_IMAGE_IMPLEMENTATION +-#include "contrib/stb_image/stb_image.h" ++#include + + #include + diff --git a/externals/vcpkg/ports/assimp/irrlicht.patch b/externals/vcpkg/ports/assimp/irrlicht.patch new file mode 100755 index 000000000..3457056c4 --- /dev/null +++ b/externals/vcpkg/ports/assimp/irrlicht.patch @@ -0,0 +1,61 @@ +diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt +index f5553e5..5cffa0c 100644 +--- a/code/CMakeLists.txt ++++ b/code/CMakeLists.txt +@@ -862,7 +862,7 @@ SET( Extra_SRCS + SOURCE_GROUP( Extra FILES ${Extra_SRCS}) + + # irrXML +- find_package(irrXML CONFIG REQUIRED) ++ find_package(irrlicht CONFIG REQUIRED) + + # polyclipping + find_package(polyclipping CONFIG REQUIRED) +@@ -1033,7 +1033,7 @@ TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC + + TARGET_LINK_LIBRARIES(assimp + polyclipping::polyclipping +- irrXML::irrXML ++ Irrlicht + minizip::minizip + ZLIB::ZLIB + kubazip::kubazip +diff --git a/code/X3D/FIReader.cpp b/code/X3D/FIReader.cpp +index 525a084..0cbca48 100644 +--- a/code/X3D/FIReader.cpp ++++ b/code/X3D/FIReader.cpp +@@ -654,8 +654,8 @@ public: + return currentNodeType; + } + +- virtual int getAttributeCount() const /*override*/ { +- return static_cast(attributes.size()); ++ virtual unsigned int getAttributeCount() const /*override*/ { ++ return static_cast(attributes.size()); + } + + virtual const char* getAttributeName(int idx) const /*override*/ { +@@ -1733,7 +1733,7 @@ public: + return reader->getNodeType(); + } + +- virtual int getAttributeCount() const /*override*/ { ++ virtual unsigned int getAttributeCount() const /*override*/ { + return reader->getAttributeCount(); + } + +diff --git a/include/assimp/irrXMLWrapper.h b/include/assimp/irrXMLWrapper.h +index 77cfd5e..ba584a0 100644 +--- a/include/assimp/irrXMLWrapper.h ++++ b/include/assimp/irrXMLWrapper.h +@@ -133,8 +133,8 @@ public: + + // ---------------------------------------------------------------------------------- + //! Returns size of file in bytes +- virtual int getSize() { +- return (int)data.size(); ++ virtual long getSize() const override { ++ return (long)data.size(); + } + + private: diff --git a/externals/vcpkg/ports/assimp/portfile.cmake b/externals/vcpkg/ports/assimp/portfile.cmake new file mode 100755 index 000000000..3527124ce --- /dev/null +++ b/externals/vcpkg/ports/assimp/portfile.cmake @@ -0,0 +1,90 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO assimp/assimp + REF 8f0c6b04b2257a520aaab38421b2e090204b69df # v5.0.1 + SHA512 59b213428e2f7494cb5da423e6b2d51556318f948b00cea420090d74d4f5f0f8970d38dba70cd47b2ef35a1f57f9e15df8597411b6cd8732b233395080147c0f + HEAD_REF master + PATCHES + build_fixes.patch + irrlicht.patch +) + +file(REMOVE ${SOURCE_PATH}/cmake-modules/FindZLIB.cmake) +file(REMOVE ${SOURCE_PATH}/cmake-modules/FindIrrXML.cmake) +#file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/clipper) # https://github.com/assimp/assimp/issues/788 +file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/poly2tri) +file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/zlib) +file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/gtest) +file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/irrXML) +file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/rapidjson) +file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/stb_image) +file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/zip) +file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/unzip) +file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/utf8cpp) +#file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/Open3DGC) #TODO +#file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/openddlparser) #TODO + +set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS") +set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ASSIMP_BUILD_SHARED_LIBS) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DASSIMP_BUILD_TESTS=OFF + -DASSIMP_BUILD_ASSIMP_VIEW=OFF + -DASSIMP_BUILD_ZLIB=OFF + -DASSIMP_BUILD_SHARED_LIBS=${ASSIMP_BUILD_SHARED_LIBS} + -DASSIMP_BUILD_ASSIMP_TOOLS=OFF + -DASSIMP_INSTALL_PDB=OFF + -DSYSTEM_IRRXML=ON + -DIGNORE_GIT_HASH=ON +) + +vcpkg_install_cmake() + +if(VCPKG_TARGET_IS_WINDOWS) + set(VCVER vc140 vc141 vc142 ) + set(CRT mt md) + set(DBG_NAMES) + set(REL_NAMES) + foreach(_ver IN LISTS VCVER) + foreach(_crt IN LISTS CRT) + list(APPEND DBG_NAMES assimp-${_ver}-${_crt}d) + list(APPEND REL_NAMES assimp-${_ver}-${_crt}) + endforeach() + endforeach() +endif() + +find_library(ASSIMP_REL NAMES assimp ${REL_NAMES} PATHS "${CURRENT_PACKAGES_DIR}/lib" NO_DEFAULT_PATH) +find_library(ASSIMP_DBG NAMES assimp assimpd ${DBG_NAMES} PATHS "${CURRENT_PACKAGES_DIR}/debug/lib" NO_DEFAULT_PATH) +if(ASSIMP_REL) + get_filename_component(ASSIMP_NAME_REL "${ASSIMP_REL}" NAME_WLE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/assimp.pc" "-lassimp" "-l${ASSIMP_NAME_REL}") +endif() +if(ASSIMP_DBG) + get_filename_component(ASSIMP_NAME_DBG "${ASSIMP_DBG}" NAME_WLE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/assimp.pc" "-lassimp" "-l${ASSIMP_NAME_DBG}") +endif() + +vcpkg_fixup_cmake_targets() +vcpkg_fixup_pkgconfig() # Probably requires more fixing for static builds. See qt5-3d and the config changes below +vcpkg_copy_pdbs() + +file(READ ${CURRENT_PACKAGES_DIR}/share/assimp/assimpConfig.cmake ASSIMP_CONFIG) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/assimp/assimpConfig.cmake " +include(CMakeFindDependencyMacro) +find_dependency(ZLIB) +find_dependency(irrlicht CONFIG) +find_dependency(polyclipping CONFIG) +find_dependency(minizip CONFIG) +find_dependency(kubazip CONFIG) +find_dependency(poly2tri CONFIG) +find_dependency(utf8cpp CONFIG) +${ASSIMP_CONFIG}") + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/assimp/vcpkg.json b/externals/vcpkg/ports/assimp/vcpkg.json new file mode 100755 index 000000000..3e573c17d --- /dev/null +++ b/externals/vcpkg/ports/assimp/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "assimp", + "version-string": "5.0.1", + "port-version": 5, + "description": "The Open Asset import library", + "homepage": "https://github.com/assimp/assimp", + "dependencies": [ + "irrlicht", + "kubazip", + "minizip", + "poly2tri", + "polyclipping", + "rapidjson", + "stb", + "utfcpp", + "zlib" + ] +} diff --git a/externals/vcpkg/ports/asynch/portfile.cmake b/externals/vcpkg/ports/asynch/portfile.cmake new file mode 100755 index 000000000..8f538a222 --- /dev/null +++ b/externals/vcpkg/ports/asynch/portfile.cmake @@ -0,0 +1,13 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO naasking/async.h + REF 080cbb257ab60ad06008c574d7feb94f8478efdd #Commits on Sep 21, 2019 + SHA512 4fe0229ffd8b3c6438294a419ccb213b4d28a0a04d834406b67120e9bc90d339ec91f3b3eb52d4e27c1f12add41e9347bffbea47868b0d7a1da40f784d113c71 + HEAD_REF master +) + +# Copy the single reusable library header +file(COPY ${SOURCE_PATH}/async/async.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/asynch/vcpkg.json b/externals/vcpkg/ports/asynch/vcpkg.json new file mode 100755 index 000000000..0ee8a5df2 --- /dev/null +++ b/externals/vcpkg/ports/asynch/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "asynch", + "version-string": "2019-09-21", + "port-version": 2, + "description": "Async.h - asynchronous, stackless subroutines.", + "homepage": "https://github.com/naasking/async.h" +} diff --git a/externals/vcpkg/ports/asyncplusplus/portfile.cmake b/externals/vcpkg/ports/asyncplusplus/portfile.cmake new file mode 100755 index 000000000..d412f1148 --- /dev/null +++ b/externals/vcpkg/ports/asyncplusplus/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Amanieu/asyncplusplus + REF 172ca3f8e0df1b3f7f5ee8b8244e4ac67258b0d8 # v1.1 + SHA512 fd95b3349ceed4cab5cb0e146d2ccfe77c85318303015cf513037fc69c1ade7cfdb3dc81de8a90846c4387c5e31f5a70a64da770547c201dfe24d2c181be1933 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(RENAME ${CURRENT_PACKAGES_DIR}/cmake/Async++.cmake ${CURRENT_PACKAGES_DIR}/cmake/Async++Targets.cmake) + +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/async++) + +file(RENAME ${CURRENT_PACKAGES_DIR}/share/async++/Async++Targets.cmake ${CURRENT_PACKAGES_DIR}/share/async++/Async++.cmake) + +file(READ ${CURRENT_PACKAGES_DIR}/share/async++/Async++Config.cmake _contents) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/async++/Async++Config.cmake "include(CMakeFindDependencyMacro)\n${_contents}") + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) + +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/asyncplusplus) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/asyncplusplus/LICENSE ${CURRENT_PACKAGES_DIR}/share/asyncplusplus/copyright) diff --git a/externals/vcpkg/ports/asyncplusplus/vcpkg.json b/externals/vcpkg/ports/asyncplusplus/vcpkg.json new file mode 100755 index 000000000..d768e7bed --- /dev/null +++ b/externals/vcpkg/ports/asyncplusplus/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "asyncplusplus", + "version-string": "1.1", + "port-version": 1, + "description": "Async++ is a lightweight concurrency framework for C++11", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/atk/portfile.cmake b/externals/vcpkg/ports/atk/portfile.cmake new file mode 100755 index 000000000..952f2075f --- /dev/null +++ b/externals/vcpkg/ports/atk/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) + +set(ATK_VERSION 2.38.0) + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.gnome.org/ + OUT_SOURCE_PATH SOURCE_PATH + REPO GNOME/atk + REF "${ATK_VERSION}" + HEAD_REF master + SHA512 f31951ecbdace6a18fb9f772616137cb8732163b37448fef4daf1af60ba8479c94d498dcdaf4880468c80012c77a446da585926a99704a9a940b80e546080cf3 +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -Dintrospection=false + ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' + ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' +) +vcpkg_install_meson() + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/atk/vcpkg.json b/externals/vcpkg/ports/atk/vcpkg.json new file mode 100755 index 000000000..c04346e20 --- /dev/null +++ b/externals/vcpkg/ports/atk/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "atk", + "version": "2.38.0", + "port-version": 1, + "description": "GNOME Accessibility Toolkit", + "homepage": "https://developer.gnome.org/atk/", + "license": "GPL-2.0-only", + "supports": "!arm", + "dependencies": [ + "gettext", + "glib", + { + "name": "glib", + "host": true + }, + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/atkmm/portfile.cmake b/externals/vcpkg/ports/atkmm/portfile.cmake new file mode 100755 index 000000000..a4c337b6e --- /dev/null +++ b/externals/vcpkg/ports/atkmm/portfile.cmake @@ -0,0 +1,31 @@ +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +endif() + +set(ATKMM_VERSION 2.36.1) + +# Keep distfile, don't use GitLab! +vcpkg_download_distfile(ARCHIVE + URLS "https://ftp.gnome.org/pub/GNOME/sources/atkmm/2.36/atkmm-${ATKMM_VERSION}.tar.xz" + FILENAME "atkmm-${ATKMM_VERSION}.tar.xz" + SHA512 23c831afac6bb9a0f9f2e622f8f9ffea29445a33b1cd650e0c07ee77e60b28ae5ee978c029e8e0f9b94e9ff4679d69ebde833f15e0a5403d97914cc7ccf98a6a +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dbuild-documentation=false + -Dbuild-deprecated-api=true # Build deprecated API and include it in the library + -Dmsvc14x-parallel-installable=false # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019 +) +vcpkg_install_meson() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/atkmm/vcpkg.json b/externals/vcpkg/ports/atkmm/vcpkg.json new file mode 100755 index 000000000..426760e8f --- /dev/null +++ b/externals/vcpkg/ports/atkmm/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "atkmm", + "version": "2.36.1", + "description": "atkmm is the official C++ interface for the ATK accessibility toolkit library. It may be used, for instance, by user interfaces implemented with gtkmm.", + "homepage": "https://www.gtkmm.org", + "license": "LGPL-2.1", + "dependencies": [ + "atk", + "gettext", + "glib", + "glibmm", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/atlmfc/portfile.cmake b/externals/vcpkg/ports/atlmfc/portfile.cmake new file mode 100755 index 000000000..d11235dcc --- /dev/null +++ b/externals/vcpkg/ports/atlmfc/portfile.cmake @@ -0,0 +1,10 @@ +find_path(AFXRES_H + NAMES afxres.h + PATHS $ENV{INCLUDE} +) + +if(NOT AFXRES_H) + message(FATAL_ERROR "Unable to locate 'afxres.h'. Ensure you have installed the ATL/MFC component of Visual Studio.") +endif() + +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/atlmfc/vcpkg.json b/externals/vcpkg/ports/atlmfc/vcpkg.json new file mode 100755 index 000000000..5a8ce22d6 --- /dev/null +++ b/externals/vcpkg/ports/atlmfc/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "atlmfc", + "version-string": "0", + "port-version": 1, + "description": "a stub package that ensures VS has ATL/MFC installed.", + "supports": "windows" +} diff --git a/externals/vcpkg/ports/atomic-queue/portfile.cmake b/externals/vcpkg/ports/atomic-queue/portfile.cmake new file mode 100755 index 000000000..49c5e0576 --- /dev/null +++ b/externals/vcpkg/ports/atomic-queue/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO max0x7ba/atomic_queue + REF 7619054490efdbfe377bd528bc09b21f5cd38a02 + SHA512 0d145f461a5c978c4d6f6d8ec1f06f0c61f3d009e65eac12db806c2aa7941461f881b34b9c4dd9aeebd3206a4598e6081f89f983c389b2f5aecefefcbddd94b6 + HEAD_REF master +) + +file( + COPY + ${SOURCE_PATH}/include/atomic_queue/atomic_queue.h + ${SOURCE_PATH}/include/atomic_queue/atomic_queue_mutex.h + ${SOURCE_PATH}/include/atomic_queue/barrier.h + ${SOURCE_PATH}/include/atomic_queue/defs.h + ${SOURCE_PATH}/include/atomic_queue/spinlock.h + DESTINATION + ${CURRENT_PACKAGES_DIR}/include/atomic_queue +) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/atomic-queue/vcpkg.json b/externals/vcpkg/ports/atomic-queue/vcpkg.json new file mode 100755 index 000000000..7e7cbe56f --- /dev/null +++ b/externals/vcpkg/ports/atomic-queue/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "atomic-queue", + "version-date": "2021-05-03", + "description": "Minimalistic header-only thread-safe ultra-low-latency multiple-producer-multiple-consumer lockless queues based on circular buffer with std::atomic.", + "homepage": "https://github.com/max0x7ba/atomic_queue" +} diff --git a/externals/vcpkg/ports/aubio/CMakeLists.txt b/externals/vcpkg/ports/aubio/CMakeLists.txt new file mode 100755 index 000000000..b711c9f39 --- /dev/null +++ b/externals/vcpkg/ports/aubio/CMakeLists.txt @@ -0,0 +1,129 @@ +cmake_minimum_required(VERSION 3.8) +project(aubio C) + +option(WITH_DEPENDENCIES "Adds extra dependencies" ON) +option(BUILD_TOOLS "Build and install tools" ON) + +add_definitions( + -DHAVE_STDLIB_H=1 + -DHAVE_STDIO_H=1 + -DHAVE_MATH_H=1 + -DHAVE_STRING_H=1 + -DHAVE_LIMITS_H=1 + -DHAVE_STDARG_H=1 + -DHAVE_ERRNO_H=1 + -DHAVE_C99_VARARGS_MACROS=1 + -D_CRT_SECURE_NO_WARNINGS=1 +) + +if(WITH_DEPENDENCIES) + add_definitions( + -DHAVE_SNDFILE=1 + -DHAVE_WAVWRITE=1 + -DHAVE_WAVREAD=1 + -DHAVE_LIBAV=1 + -DHAVE_SWRESAMPLE=1 + ) +endif() + +set(TOOLS_INSTALLDIR "bin" CACHE STRING "Target directory for installed tools") + +if(WITH_DEPENDENCIES) + find_package(FFMPEG COMPONENTS avcodec avutil avformat swresample REQUIRED) + find_package(BZip2 REQUIRED) + find_package(LibLZMA REQUIRED) + find_package(SndFile REQUIRED) + + include_directories(${LIBLZMA_INCLUDE_DIRS}) +endif() + +include_directories(src) + +file(GLOB_RECURSE SOURCES src/*.c) + +if(WIN32 AND NOT MINGW) + set_source_files_properties(src/io/sink_wavwrite.c PROPERTIES COMPILE_FLAGS /FIWinsock2.h) +endif() + +add_library(aubio ${SOURCES}) +if(WITH_DEPENDENCIES) + target_link_libraries(aubio PUBLIC + SndFile::sndfile + ${FFMPEG_LIBRARIES} + BZip2::BZip2 + ${LIBLZMA_LIBRARIES} + ) +endif() + +if(WIN32) + target_link_libraries(aubio PUBLIC ws2_32) +endif() + +if(BUILD_TOOLS AND WITH_DEPENDENCIES) + set(EXAMPLE_EXECS aubiomfcc aubionotes aubioonset aubiopitch aubioquiet aubiotrack) + foreach(EXAMPLE_EXEC ${EXAMPLE_EXECS}) + add_executable(${EXAMPLE_EXEC} examples/${EXAMPLE_EXEC}.c examples/utils.c examples/jackio.c) + target_link_libraries(${EXAMPLE_EXEC} PRIVATE aubio) + if(WIN32) + target_compile_definitions(${EXAMPLE_EXEC} PRIVATE -DHAVE_WIN_HACKS=1) + target_link_libraries(${EXAMPLE_EXEC} PUBLIC ws2_32) + else() + target_compile_definitions(${EXAMPLE_EXEC} PRIVATE -DHAVE_UNISTD_H=1) + endif() + endforeach() + # Create and add fake config.h to avoid build errors (file is generated for + # cross-platform requirements in waf build-system) + file(WRITE "${CMAKE_BINARY_DIR}/config.h" "") + include_directories(${CMAKE_BINARY_DIR}) + + install( + TARGETS ${EXAMPLE_EXECS} + RUNTIME DESTINATION ${TOOLS_INSTALLDIR} + ) +endif() + +install( + TARGETS aubio EXPORT AubioTargets + INCLUDES DESTINATION include + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(EXPORT AubioTargets NAMESPACE Aubio:: DESTINATION share/aubio) + +install( + DIRECTORY src/ + DESTINATION include/aubio + FILES_MATCHING + PATTERN "*.h" + PATTERN "*_priv.h" EXCLUDE + PATTERN "config.h" EXCLUDE +) + +# Create CMake configuration export file. +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/AubioConfig.cmake.in "@PACKAGE_INIT@\n") +if(WITH_DEPENDENCIES) +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/AubioConfig.cmake.in " + include(CMakeFindDependencyMacro) + find_dependency(FFMPEG COMPONENTS avcodec avutil avformat swresample REQUIRED) + find_dependency(BZip2 REQUIRED) + find_dependency(LibLZMA REQUIRED) + find_dependency(SndFile REQUIRED) + ") +endif() +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/AubioConfig.cmake.in "include(\${CMAKE_CURRENT_LIST_DIR}/AubioTargets.cmake)") + +# Install CMake configuration export file. +include(CMakePackageConfigHelpers) +configure_package_config_file( + ${CMAKE_CURRENT_BINARY_DIR}/AubioConfig.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/AubioConfig.cmake + INSTALL_DESTINATION share/aubio +) +install( + FILES + ${CMAKE_BINARY_DIR}/AubioConfig.cmake + DESTINATION + share/aubio +) diff --git a/externals/vcpkg/ports/aubio/portfile.cmake b/externals/vcpkg/ports/aubio/portfile.cmake new file mode 100755 index 000000000..f7ab0f1ab --- /dev/null +++ b/externals/vcpkg/ports/aubio/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO aubio/aubio + REF 0.4.9 + SHA512 a22c7c581ce1f428270021591649273396e6dc222b3c7b3d46f5c4abf94a98be1ab89320cdbf1b6b60d4330eef23976439e3fc9e0f8d3cdd867dac4542fa48c9 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools WITH_DEPENDENCIES +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} + OPTIONS_RELEASE + -DTOOLS_INSTALLDIR=tools/aubio + -DBUILD_TOOLS=ON + OPTIONS_DEBUG + -DBUILD_TOOLS=OFF +) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_copy_pdbs() +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/aubio/vcpkg.json b/externals/vcpkg/ports/aubio/vcpkg.json new file mode 100755 index 000000000..e77404534 --- /dev/null +++ b/externals/vcpkg/ports/aubio/vcpkg.json @@ -0,0 +1,46 @@ +{ + "name": "aubio", + "version-semver": "0.4.9", + "port-version": 9, + "description": "Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.", + "homepage": "https://github.com/aubio/aubio", + "license": "GPL-3.0-or-later", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "tools" + ], + "features": { + "tools": { + "description": "Build tools and add extra dependencies", + "dependencies": [ + "bzip2", + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "avcodec", + "avformat", + "swresample" + ] + }, + "libflac", + "liblzma", + "libogg", + { + "name": "libsndfile", + "default-features": false + }, + "libvorbis" + ] + } + } +} diff --git a/externals/vcpkg/ports/audiofile/fix-cmakeLists.patch b/externals/vcpkg/ports/audiofile/fix-cmakeLists.patch new file mode 100755 index 000000000..a281171a5 --- /dev/null +++ b/externals/vcpkg/ports/audiofile/fix-cmakeLists.patch @@ -0,0 +1,13 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -42,3 +42,10 @@ endif () + + #=============================================================================== + set (CMAKE_SUPPRESS_REGENERATION true) ++ ++#install and export targets ++install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config) ++export(TARGETS ${PROJECT_NAME} FILE ${PROJECT_NAME}Config.cmake) ++install(EXPORT ${PROJECT_NAME}Config DESTINATION share/AudioFile FILE ${PROJECT_NAME}Config.cmake) ++#install headers ++install(FILES AudioFile.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/externals/vcpkg/ports/audiofile/portfile.cmake b/externals/vcpkg/ports/audiofile/portfile.cmake new file mode 100755 index 000000000..18188b654 --- /dev/null +++ b/externals/vcpkg/ports/audiofile/portfile.cmake @@ -0,0 +1,26 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO adamstark/AudioFile + REF 004065d01e9b7338580390d4fdbfbaa46adede4e # 1.1.0 + SHA512 99d31035fc82ca8da3c555c30b6b40ea99e15e1f82002c7f04c567ab7aee1de71deddf6930564c56f3a2e83eea1b5f5e9ca631673ed4a943579732b8d62e9603 + HEAD_REF master + PATCHES + fix-cmakeLists.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME AudioFile) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/audiofile/vcpkg.json b/externals/vcpkg/ports/audiofile/vcpkg.json new file mode 100755 index 000000000..e9c294bbe --- /dev/null +++ b/externals/vcpkg/ports/audiofile/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "audiofile", + "version": "1.1.0", + "description": "A simple header-only C++ library for reading and writing audio files.", + "homepage": "https://github.com/adamstark/AudioFile", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/aurora/portfile.cmake b/externals/vcpkg/ports/aurora/portfile.cmake new file mode 100755 index 000000000..bce54c2bc --- /dev/null +++ b/externals/vcpkg/ports/aurora/portfile.cmake @@ -0,0 +1,10 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Bromeon/Aurora + REF c75699d2a8caa726260c29b6d7a0fd35f8f28933 + SHA512 862253e281eb441b773feb330d5ce4d7fe10769f516e927c0f875477ec912671fc35132a48986b2394f6d0a7160a5cb70afe868c597350c385ce23686b9613d6 + HEAD_REF master +) +file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR}) +file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/aurora RENAME copyright) +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/aurora/vcpkg.json b/externals/vcpkg/ports/aurora/vcpkg.json new file mode 100755 index 000000000..e0efe0331 --- /dev/null +++ b/externals/vcpkg/ports/aurora/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "aurora", + "version-string": "2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933", + "port-version": 1, + "description": "Aurora is an open-source C++ library providing various rather uncommon C++ utilities", + "homepage": "https://github.com/Bromeon/Aurora" +} diff --git a/externals/vcpkg/ports/autobahn/portfile.cmake b/externals/vcpkg/ports/autobahn/portfile.cmake new file mode 100755 index 000000000..511ffb564 --- /dev/null +++ b/externals/vcpkg/ports/autobahn/portfile.cmake @@ -0,0 +1,28 @@ +#header-only library +set(USE_UPSTREAM OFF) +if("upstream" IN_LIST FEATURES) + set(USE_UPSTREAM ON) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO crossbario/autobahn-cpp + REF 84972fc81181bde635329bf0474e3874cc5c9091 # v20.8.1 + SHA512 fcd094907826e035188d19efc80f3caa6c90d7d7bd2c5b6796aea9de3a02052bd049329cbe5cb242bba535e70c127842c66d34956e715b4f6f37ffc54c39c483 + HEAD_REF master +) + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/autobahn) + +# Copy the header files +file(COPY "${SOURCE_PATH}/autobahn" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.hpp") +file(COPY "${SOURCE_PATH}/autobahn" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.ipp") + +set(PACKAGE_INSTALL_INCLUDE_DIR "\${CMAKE_CURRENT_LIST_DIR}/../../include") +set(PACKAGE_INIT " +macro(set_and_check) + set(\${ARGV}) +endmacro() +") + +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/autobahn/copyright COPYONLY) diff --git a/externals/vcpkg/ports/autobahn/vcpkg.json b/externals/vcpkg/ports/autobahn/vcpkg.json new file mode 100755 index 000000000..cc755ff05 --- /dev/null +++ b/externals/vcpkg/ports/autobahn/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "autobahn", + "version-string": "20.8.1", + "port-version": 1, + "description": "WAMP for C++ in Boost/Asio", + "homepage": "https://crossbar.io/autobahn", + "dependencies": [ + "boost-asio", + "boost-thread", + "msgpack", + "websocketpp" + ] +} diff --git a/externals/vcpkg/ports/autodock-vina/CMakeLists.txt b/externals/vcpkg/ports/autodock-vina/CMakeLists.txt new file mode 100755 index 000000000..5099bc23e --- /dev/null +++ b/externals/vcpkg/ports/autodock-vina/CMakeLists.txt @@ -0,0 +1,100 @@ +cmake_minimum_required(VERSION 3.11) +cmake_policy(VERSION 3.11) + +project(autodock-vina) + +set(GIT_VERSION v1.2.3) +set(CMAKE_CXX_STANDARD 11) + +find_package(Boost REQUIRED COMPONENTS + filesystem + log + math_tr1 + program_options + random + serialization + thread + timer +) + +file(GLOB SRC_AUTODOCK_VINA_LIBS + "src/lib/*.cpp" +) + +file(GLOB SRC_AUTODOCK_VINA_SPLIT + "src/split/*.cpp" +) + +file(GLOB HEADERS + "src/lib/*.h" +) + +add_library(vina ${SRC_AUTODOCK_VINA_LIBS}) +add_library(vina_split ${SRC_AUTODOCK_VINA_SPLIT}) + +target_include_directories(vina + PUBLIC + $ + $ + PRIVATE + $ +) + +target_include_directories(vina_split + PUBLIC + $ + $ + PRIVATE + $ +) + +target_compile_definitions(vina + PUBLIC + -DVERSION=\"${GIT_VERSION}\" +) + +target_compile_definitions(vina_split + PUBLIC + -DVERSION=\"${GIT_VERSION}\" +) + +target_link_libraries(vina + PRIVATE + Boost::boost + Boost::filesystem + Boost::log + Boost::math_tr1 + Boost::program_options + Boost::random + Boost::serialization + Boost::thread + Boost::timer +) + +target_link_libraries(vina_split + PRIVATE + Boost::boost + Boost::filesystem + Boost::log + Boost::math_tr1 + Boost::program_options + Boost::random + Boost::serialization + Boost::thread + Boost::timer +) + +install(TARGETS vina EXPORT autodock-vina-config + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) + +install(TARGETS vina_split EXPORT autodock-vina-config + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) + +install(FILES ${HEADERS} DESTINATION include/autodock-vina) +install(EXPORT autodock-vina-config NAMESPACE autodock-vina::autodock-vina:: DESTINATION share/autodock-vina) diff --git a/externals/vcpkg/ports/autodock-vina/portfile.cmake b/externals/vcpkg/ports/autodock-vina/portfile.cmake new file mode 100755 index 000000000..b910a40e6 --- /dev/null +++ b/externals/vcpkg/ports/autodock-vina/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ccsb-scripps/AutoDock-Vina + REF v1.2.3 + SHA512 ea3d3008553665af5fbafa3b4dfe379df257d9c5b957d81a91ec8b92f06a8d0f4c2dfc30b515a64c0bc6dcc70acedfdd498c3bb9a21cac58e43d4da37d2ff606 + HEAD_REF develop +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file( + INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/externals/vcpkg/ports/autodock-vina/vcpkg.json b/externals/vcpkg/ports/autodock-vina/vcpkg.json new file mode 100755 index 000000000..c8d9df0fa --- /dev/null +++ b/externals/vcpkg/ports/autodock-vina/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "autodock-vina", + "version-semver": "1.2.3", + "description": "AutoDock Vina is one of the fastest and most widely used open-source docking engines.", + "homepage": "http://vina.scripps.edu/", + "dependencies": [ + "boost-algorithm", + "boost-array", + "boost-filesystem", + "boost-lexical-cast", + "boost-log", + "boost-math", + "boost-optional", + "boost-program-options", + "boost-ptr-container", + "boost-random", + "boost-serialization", + "boost-static-assert", + "boost-thread", + "boost-timer", + "boost-utility", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/avcpp/0002-av_init_packet_deprecation.patch b/externals/vcpkg/ports/avcpp/0002-av_init_packet_deprecation.patch new file mode 100755 index 000000000..a243b0dfe --- /dev/null +++ b/externals/vcpkg/ports/avcpp/0002-av_init_packet_deprecation.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a5fed05..7875b91 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,6 +24,11 @@ set (AVCPP_WARNING_OPTIONS + $<$: + /W4>) + ++# fixes vcpkg uwp failures due to /sdl ++if(MSVC) ++ add_compile_options(/wd4996) ++endif() ++ + # -pthread sets also some useful compile-time flags + set(THREADS_PREFER_PTHREAD_FLAG ON) + find_package(Threads) diff --git a/externals/vcpkg/ports/avcpp/fix-pkgconfig-location.patch b/externals/vcpkg/ports/avcpp/fix-pkgconfig-location.patch new file mode 100755 index 000000000..d24d00602 --- /dev/null +++ b/externals/vcpkg/ports/avcpp/fix-pkgconfig-location.patch @@ -0,0 +1,13 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e0104f4..dae0942 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -128,7 +128,7 @@ if (AVCPP_NOT_SUBPROJECT) + ) + + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libavcpp.pc" +- DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig") ++ DESTINATION "lib/pkgconfig") + + endif() + endif() diff --git a/externals/vcpkg/ports/avcpp/portfile.cmake b/externals/vcpkg/ports/avcpp/portfile.cmake new file mode 100755 index 000000000..48ff0896b --- /dev/null +++ b/externals/vcpkg/ports/avcpp/portfile.cmake @@ -0,0 +1,37 @@ +# avcpp doesn't export any symbols +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO h4tr3d/avcpp + REF fa9a1ef70bbf9e9f3963fbaa4540e8aac4ad8daa + SHA512 e0821d8e01e0fdb28d58564c87cafa7f9349b1b31dc90d4f2ea4c22c51fc16555f4a01f30d7575798138067921a011faa10e4d2ac2ac02acdf224546724e0338 + HEAD_REF master + PATCHES + 0002-av_init_packet_deprecation.patch + fix-pkgconfig-location.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AVCPP_ENABLE_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" AVCPP_ENABLE_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DAV_ENABLE_STATIC=${AVCPP_ENABLE_STATIC}" + "-DAV_ENABLE_SHARED=${AVCPP_ENABLE_SHARED}" + -DAV_BUILD_EXAMPLES=OFF + -DBUILD_TESTING=OFF +) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/avcpp/vcpkg.json b/externals/vcpkg/ports/avcpp/vcpkg.json new file mode 100755 index 000000000..e619be0be --- /dev/null +++ b/externals/vcpkg/ports/avcpp/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "avcpp", + "version-date": "2021-06-14", + "port-version": 1, + "description": "Wrapper for the FFmpeg that simplify usage it from C++ projects.", + "homepage": "https://github.com/h4tr3d/avcpp", + "dependencies": [ + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "avcodec", + "avdevice", + "avfilter", + "avformat", + "postproc", + "swresample", + "swscale" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/avisynthplus/portfile.cmake b/externals/vcpkg/ports/avisynthplus/portfile.cmake new file mode 100755 index 000000000..4851bb0f9 --- /dev/null +++ b/externals/vcpkg/ports/avisynthplus/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO AviSynth/AviSynthPlus + REF v3.7.2 + SHA512 82cf2afed4cc53c0e09d367ff3df1db0e9ac17ff2458e4660c646430d8e72f472b072a3910c9595b26eb5ac89c82fe74699acab3869014f87d8e2738b81568a1 + HEAD_REF master +) + +vcpkg_download_distfile(GHC_ARCHIVE + URLS "https://github.com/gulrak/filesystem/archive/3f1c185ab414e764c694b8171d1c4d8c5c437517.zip" + FILENAME filesystem-3f1c185ab414e764c694b8171d1c4d8c5c437517.zip + SHA512 e3fe1e41b31f840ebc219fcd795e7be2973b80bb3843d6bb080786ad9e3e7f846a118673cb9e17d76bae66954e64e024a82622fb8cea7818d5d9357de661d3d1 +) + +file(REMOVE_RECURSE "${SOURCE_PATH}/filesystem") +vcpkg_extract_source_archive(extracted_archive ARCHIVE "${GHC_ARCHIVE}") +file(RENAME "${extracted_archive}" "${SOURCE_PATH}/filesystem") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENABLE_PLUGINS=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/distrib/gpl.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/avisynthplus/vcpkg.json b/externals/vcpkg/ports/avisynthplus/vcpkg.json new file mode 100755 index 000000000..f2a64817c --- /dev/null +++ b/externals/vcpkg/ports/avisynthplus/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "avisynthplus", + "version-semver": "3.7.2", + "description": "An improved version of the AviSynth frameserver, with improved features and developer friendliness", + "homepage": "https://avs-plus.net/", + "license": "GPL-2.0", + "supports": "!arm & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/avro-c/avro.patch b/externals/vcpkg/ports/avro-c/avro.patch new file mode 100755 index 000000000..513bbe0bb --- /dev/null +++ b/externals/vcpkg/ports/avro-c/avro.patch @@ -0,0 +1,377 @@ +diff --git a/lang/c/CMakeLists.txt b/lang/c/CMakeLists.txt +index aa923e1..9ee7937 100644 +--- a/lang/c/CMakeLists.txt ++++ b/lang/c/CMakeLists.txt +@@ -22,6 +22,9 @@ enable_testing() + + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}) + ++option(BUILD_EXAMPLES "Build examples." OFF) ++option(BUILD_TESTS "Build tests." OFF) ++option(BUILD_DOCS "Build docs." OFF) + # Eliminates warning about linker paths when linking both zlib and + # liblzma. + cmake_policy(SET CMP0003 NEW) +@@ -149,20 +152,25 @@ else (ZLIB_FOUND) + message("Disabled deflate codec. zlib not found.") + endif (ZLIB_FOUND) + +-find_package(Snappy) +-if (SNAPPY_FOUND AND ZLIB_FOUND) # Snappy borrows crc32 from zlib ++find_package(Snappy CONFIG REQUIRED) ++if (Snappy_FOUND AND ZLIB_FOUND) # Snappy borrows crc32 from zlib + set(SNAPPY_PKG libsnappy) + add_definitions(-DSNAPPY_CODEC) ++ set(SNAPPY_LIBRARIES Snappy::snappy) ++ if (UNIX) ++ set(SNAPPY_LIBRARIES ${SNAPPY_LIBRARIES} -lstdc++) ++ endif () + include_directories(${SNAPPY_INCLUDE_DIRS}) + message("Enabled snappy codec") +-else (SNAPPY_FOUND AND ZLIB_FOUND) ++else (Snappy_FOUND AND ZLIB_FOUND) + set(SNAPPY_PKG "") + set(SNAPPY_LIBRARIES "") + message("Disabled snappy codec. libsnappy not found or zlib not found.") +-endif (SNAPPY_FOUND AND ZLIB_FOUND) ++endif (Snappy_FOUND AND ZLIB_FOUND) + +-find_package(PkgConfig) +-pkg_check_modules(LZMA liblzma) ++find_package(LibLZMA REQUIRED) ++set(LZMA_FOUND 1) ++set(LZMA_LIBRARIES LibLZMA::LibLZMA) + if (LZMA_FOUND) + set(LZMA_PKG liblzma) + add_definitions(-DLZMA_CODEC) +@@ -179,20 +187,26 @@ set(CODEC_LIBRARIES ${ZLIB_LIBRARIES} ${LZMA_LIBRARIES} ${SNAPPY_LIBRARIES}) + set(CODEC_PKG "@ZLIB_PKG@ @LZMA_PKG@ @SNAPPY_PKG@") + + # Jansson JSON library +-pkg_check_modules(JANSSON jansson>=2.3) +-if (JANSSON_FOUND) ++find_package(jansson CONFIG REQUIRED) ++if (jansson_FOUND) + set(JANSSON_PKG libjansson) ++ set(JANSSON_LIBRARIES jansson::jansson) + include_directories(${JANSSON_INCLUDE_DIRS}) + link_directories(${JANSSON_LIBRARY_DIRS}) +-else (JANSSON_FOUND) ++else (jansson_FOUND) + message(FATAL_ERROR "libjansson >=2.3 not found") +-endif (JANSSON_FOUND) ++endif (jansson_FOUND) + + + add_subdirectory(src) ++if(BUILD_EXAMPLES) + add_subdirectory(examples) ++endif() ++if(BUILD_TESTS) + add_subdirectory(tests) ++endif() ++if(BUILD_DOCS) + add_subdirectory(docs) +- ++endif() + add_custom_target(pretty + "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_SOURCE_DIR}/cmake_pretty.cmake") +diff --git a/lang/c/src/avro/msinttypes.h b/lang/c/src/avro/msinttypes.h +index 29be14b..020346d 100644 +--- a/lang/c/src/avro/msinttypes.h ++++ b/lang/c/src/avro/msinttypes.h +@@ -54,6 +54,10 @@ + + // 7.8 Format conversion of integer types + ++#if (_MSC_VER >= 1900) ++# include ++#else ++ + typedef struct { + intmax_t quot; + intmax_t rem; +@@ -311,5 +315,6 @@ imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom) + #define wcstoimax _wcstoi64 + #define wcstoumax _wcstoui64 + ++#endif // (_MSC_VER >= 1900) + + #endif // _MSC_INTTYPES_H_ ] +diff --git a/lang/c/src/avro/msstdint.h b/lang/c/src/avro/msstdint.h +index d02608a..54e8972 100644 +--- a/lang/c/src/avro/msstdint.h ++++ b/lang/c/src/avro/msstdint.h +@@ -42,6 +42,10 @@ + + #include + ++#if (_MSC_VER >= 1900) ++# include ++#else ++ + // For Visual Studio 6 in C++ mode and for many Visual Studio versions when + // compiling for ARM we should wrap include with 'extern "C++" {}' + // or compiler give many errors like this: +@@ -243,5 +247,6 @@ typedef uint64_t uintmax_t; + + #endif // __STDC_CONSTANT_MACROS ] + ++#endif // (_MSC_VER >= 1900) + + #endif // _MSC_STDINT_H_ ] +diff --git a/lang/c/src/avro/platform.h b/lang/c/src/avro/platform.h +index 9293055..edfe1e0 100644 +--- a/lang/c/src/avro/platform.h ++++ b/lang/c/src/avro/platform.h +@@ -35,8 +35,10 @@ extern "C" { + // Defines for printing size_t. + #if defined(_WIN64) + #define PRIsz PRIu64 ++ typedef __int64 ssize_t; + #elif defined(_WIN32) + #define PRIsz PRIu32 ++ typedef long ssize_t; + #else // GCC + #define PRIsz "zu" + #endif +diff --git a/lang/c/src/avro_private.h b/lang/c/src/avro_private.h +index f97ef6b..9c47d26 100644 +--- a/lang/c/src/avro_private.h ++++ b/lang/c/src/avro_private.h +@@ -34,7 +34,7 @@ extern "C" { + #endif + + #ifdef _WIN32 +-#define snprintf _snprintf ++// #define snprintf _snprintf + #endif + + /* Note that AVRO_PLATFORM_IS_BIG_ENDIAN is *always* defined. It is +diff --git a/lang/c/src/avroappend.c b/lang/c/src/avroappend.c +index 7243c60..39656ff 100644 +--- a/lang/c/src/avroappend.c ++++ b/lang/c/src/avroappend.c +@@ -20,7 +20,7 @@ + #include + #include + #ifdef _WIN32 +-#include ++#include + #endif + + #include "avro.h" +diff --git a/lang/c/src/codec.c b/lang/c/src/codec.c +index 613a914..8092326 100644 +--- a/lang/c/src/codec.c ++++ b/lang/c/src/codec.c +@@ -272,7 +272,7 @@ static int encode_deflate(avro_codec_t c, void * data, int64_t len) + s->next_in = (Bytef*)data; + s->avail_in = (uInt)len; + +- s->next_out = c->block_data; ++ s->next_out = (Bytef*)c->block_data; + s->avail_out = (uInt)c->block_size; + + s->total_out = 0; +@@ -316,10 +316,10 @@ static int decode_deflate(avro_codec_t c, void * data, int64_t len) + + c->used_size = 0; + +- s->next_in = data; ++ s->next_in = (Bytef*)data; + s->avail_in = len; + +- s->next_out = c->block_data; ++ s->next_out = (Bytef*)c->block_data; + s->avail_out = c->block_size; + + s->total_out = 0; +@@ -340,7 +340,7 @@ static int decode_deflate(avro_codec_t c, void * data, int64_t len) + if (err == Z_BUF_ERROR) + { + c->block_data = avro_realloc(c->block_data, c->block_size, c->block_size * 2); +- s->next_out = c->block_data + s->total_out; ++ s->next_out = (Bytef*)c->block_data + s->total_out; + s->avail_out += c->block_size; + c->block_size = c->block_size * 2; + } +@@ -443,7 +443,7 @@ static int encode_lzma(avro_codec_t codec, void * data, int64_t len) + return 1; + } + +- ret = lzma_raw_buffer_encode(filters, NULL, data, len, codec->block_data, &written, codec->block_size); ++ ret = lzma_raw_buffer_encode(filters, NULL, (const uint8_t*)data, len, (uint8_t*)codec->block_data, &written, codec->block_size); + + codec->used_size = written; + +@@ -474,8 +474,8 @@ static int decode_lzma(avro_codec_t codec, void * data, int64_t len) + + do + { +- ret = lzma_raw_buffer_decode(filters, NULL, data, +- &read_pos, len, codec->block_data, &write_pos, ++ ret = lzma_raw_buffer_decode(filters, NULL, (const uint8_t*)data, ++ &read_pos, len, (uint8_t*)codec->block_data, &write_pos, + codec->block_size); + + codec->used_size = write_pos; +diff --git a/lang/c/src/schema.c b/lang/c/src/schema.c +index 7b38900..e3794d5 100644 +--- a/lang/c/src/schema.c ++++ b/lang/c/src/schema.c +@@ -74,7 +74,7 @@ static int is_avro_id(const char *name) + * namespace (as a newly allocated buffer using Avro's allocator). */ + static char *split_namespace_name(const char *fullname, const char **name_out) + { +- char *last_dot = strrchr(fullname, '.'); ++ const char *last_dot = strrchr(fullname, '.'); + if (last_dot == NULL) { + *name_out = fullname; + return NULL; +@@ -770,12 +770,12 @@ avro_schema_t avro_schema_link_target(avro_schema_t schema) + } + + static const char * +-qualify_name(const char *name, const char *namespace) ++qualify_name(const char *name, const char *namespaceX) + { + char *full_name; +- if (namespace != NULL && strchr(name, '.') == NULL) { +- full_name = avro_str_alloc(strlen(name) + strlen(namespace) + 2); +- sprintf(full_name, "%s.%s", namespace, name); ++ if (namespaceX != NULL && strchr(name, '.') == NULL) { ++ full_name = avro_str_alloc(strlen(name) + strlen(namespaceX) + 2); ++ sprintf(full_name, "%s.%s", namespaceX, name); + } else { + full_name = avro_strdup(name); + } +@@ -786,20 +786,20 @@ static int + save_named_schemas(const avro_schema_t schema, st_table *st) + { + const char *name = avro_schema_name(schema); +- const char *namespace = avro_schema_namespace(schema); +- const char *full_name = qualify_name(name, namespace); ++ const char *namespaceX = avro_schema_namespace(schema); ++ const char *full_name = qualify_name(name, namespaceX); + int rval = st_insert(st, (st_data_t) full_name, (st_data_t) schema); + return rval; + } + + static avro_schema_t +-find_named_schemas(const char *name, const char *namespace, st_table *st) ++find_named_schemas(const char *name, const char *namespaceX, st_table *st) + { + union { + avro_schema_t schema; + st_data_t data; + } val; +- const char *full_name = qualify_name(name, namespace); ++ const char *full_name = qualify_name(name, namespaceX); + int rval = st_lookup(st, (st_data_t) full_name, &(val.data)); + avro_str_free((char *)full_name); + if (rval) { +@@ -812,7 +812,7 @@ find_named_schemas(const char *name, const char *namespace, st_table *st) + static int + avro_type_from_json_t(json_t *json, avro_type_t *type, + st_table *named_schemas, avro_schema_t *named_type, +- const char *namespace) ++ const char *namespaceX) + { + json_t *json_type; + const char *type_str; +@@ -863,7 +863,7 @@ avro_type_from_json_t(json_t *json, avro_type_t *type, + *type = AVRO_MAP; + } else if (strcmp(type_str, "fixed") == 0) { + *type = AVRO_FIXED; +- } else if ((*named_type = find_named_schemas(type_str, namespace, named_schemas))) { ++ } else if ((*named_type = find_named_schemas(type_str, namespaceX, named_schemas))) { + *type = AVRO_LINK; + } else { + avro_set_error("Unknown Avro \"type\": %s", type_str); +@@ -954,15 +954,15 @@ avro_schema_from_json_t(json_t *json, avro_schema_t *schema, + } + + if (strchr(fullname, '.')) { +- char *namespace = split_namespace_name(fullname, &name); +- *schema = avro_schema_record(name, namespace); +- avro_str_free(namespace); ++ char *namespaceX = split_namespace_name(fullname, &name); ++ *schema = avro_schema_record(name, namespaceX); ++ avro_str_free(namespaceX); + } else if (json_is_string(json_namespace)) { +- const char *namespace = json_string_value(json_namespace); +- if (strlen(namespace) == 0) { +- namespace = NULL; ++ const char *namespaceX = json_string_value(json_namespace); ++ if (strlen(namespaceX) == 0) { ++ namespaceX = NULL; + } +- *schema = avro_schema_record(fullname, namespace); ++ *schema = avro_schema_record(fullname, namespaceX); + } else { + *schema = avro_schema_record(fullname, parent_namespace); + } +@@ -1053,16 +1053,16 @@ avro_schema_from_json_t(json_t *json, avro_schema_t *schema, + } + + if (strchr(fullname, '.')) { +- char *namespace; +- namespace = split_namespace_name(fullname, &name); +- *schema = avro_schema_enum_ns(name, namespace); +- avro_str_free(namespace); ++ char *namespaceX; ++ namespaceX = split_namespace_name(fullname, &name); ++ *schema = avro_schema_enum_ns(name, namespaceX); ++ avro_str_free(namespaceX); + } else if (json_is_string(json_namespace)) { +- const char *namespace = json_string_value(json_namespace); +- if (strlen(namespace) == 0) { +- namespace = NULL; ++ const char *namespaceX = json_string_value(json_namespace); ++ if (strlen(namespaceX) == 0) { ++ namespaceX = NULL; + } +- *schema = avro_schema_enum_ns(fullname, namespace); ++ *schema = avro_schema_enum_ns(fullname, namespaceX); + } else { + *schema = avro_schema_enum_ns(fullname, parent_namespace); + } +@@ -1190,16 +1190,16 @@ avro_schema_from_json_t(json_t *json, avro_schema_t *schema, + fullname = json_string_value(json_name); + + if (strchr(fullname, '.')) { +- char *namespace; +- namespace = split_namespace_name(fullname, &name); +- *schema = avro_schema_fixed_ns(name, namespace, (int64_t) size); +- avro_str_free(namespace); ++ char *namespaceX; ++ namespaceX = split_namespace_name(fullname, &name); ++ *schema = avro_schema_fixed_ns(name, namespaceX, (int64_t) size); ++ avro_str_free(namespaceX); + } else if (json_is_string(json_namespace)) { +- const char *namespace = json_string_value(json_namespace); +- if (strlen(namespace) == 0) { +- namespace = NULL; ++ const char *namespaceX = json_string_value(json_namespace); ++ if (strlen(namespaceX) == 0) { ++ namespaceX = NULL; + } +- *schema = avro_schema_fixed_ns(fullname, namespace, (int64_t) size); ++ *schema = avro_schema_fixed_ns(fullname, namespaceX, (int64_t) size); + } else { + *schema = avro_schema_fixed_ns(fullname, parent_namespace, (int64_t) size); + } +@@ -1821,9 +1821,9 @@ static int write_link(avro_writer_t out, const struct avro_link_schema_t *link, + { + int rval; + check(rval, avro_write_str(out, "\"")); +- const char *namespace = avro_schema_namespace(link->to); +- if (namespace && nullstrcmp(namespace, parent_namespace)) { +- check(rval, avro_write_str(out, namespace)); ++ const char *namespaceX = avro_schema_namespace(link->to); ++ if (namespaceX && nullstrcmp(namespaceX, parent_namespace)) { ++ check(rval, avro_write_str(out, namespaceX)); + check(rval, avro_write_str(out, ".")); + } + check(rval, avro_write_str(out, avro_schema_name(link->to))); diff --git a/externals/vcpkg/ports/avro-c/portfile.cmake b/externals/vcpkg/ports/avro-c/portfile.cmake new file mode 100755 index 000000000..ac0742680 --- /dev/null +++ b/externals/vcpkg/ports/avro-c/portfile.cmake @@ -0,0 +1,42 @@ +vcpkg_buildpath_length_warning(37) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO apache/avro + REF 4e1fefca493029ace961b7ef8889a3722458565a #release-1.11.0 + SHA512 6e787983d68bc6ecffd14ca585917f695bc1ae554de9146a436d342f32321c3e7878cdfa32989742e682ac12a6eb914b3e3b515ca3164f386c0281c8b50b53ad + HEAD_REF master + PATCHES + avro.patch # Private vcpkg build fixes +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/lang/c" + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF + -DBUILD_DOCS=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +# the files are broken and there is no way to fix it because the snappy dependency has no pkgconfig file +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + +vcpkg_copy_tools(TOOL_NAMES avroappend avrocat AUTO_CLEAN) + +if(NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_copy_tools(TOOL_NAMES avropipe avromod AUTO_CLEAN) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/lang/c/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/avro-c/vcpkg.json b/externals/vcpkg/ports/avro-c/vcpkg.json new file mode 100755 index 000000000..888afb3ba --- /dev/null +++ b/externals/vcpkg/ports/avro-c/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "avro-c", + "version": "1.11.0", + "port-version": 3, + "description": "Apache Avro is a data serialization system", + "homepage": "https://github.com/apache/avro", + "license": "Apache-2.0", + "supports": "!uwp", + "dependencies": [ + "jansson", + "liblzma", + "snappy", + { + "name": "vcpkg-cmake", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/avro-cpp/fix-windows-build.patch b/externals/vcpkg/ports/avro-cpp/fix-windows-build.patch new file mode 100755 index 000000000..b20706fdc --- /dev/null +++ b/externals/vcpkg/ports/avro-cpp/fix-windows-build.patch @@ -0,0 +1,33 @@ +diff --git a/lang/c++/impl/avrogencpp.cc b/lang/c++/impl/avrogencpp.cc +index 61570413..0b6b35a2 100644 +--- a/lang/c++/impl/avrogencpp.cc ++++ b/lang/c++/impl/avrogencpp.cc +@@ -804,8 +804,8 @@ static string readGuard(const string &filename) { + + int main(int argc, char **argv) { + const string NS("namespace"); +- const string OUT("output"); +- const string IN("input"); ++ const string OUT_FILE("output"); ++ const string IN_FILE("input"); + const string INCLUDE_PREFIX("include-prefix"); + const string NO_UNION_TYPEDEF("no-union-typedef"); + +@@ -817,14 +817,14 @@ int main(int argc, char **argv) { + po::store(po::parse_command_line(argc, argv, desc), vm); + po::notify(vm); + +- if (vm.count("help") || vm.count(IN) == 0 || vm.count(OUT) == 0) { ++ if (vm.count("help") || vm.count(IN_FILE) == 0 || vm.count(OUT_FILE) == 0) { + std::cout << desc << std::endl; + return 1; + } + + string ns = vm.count(NS) > 0 ? vm[NS].as() : string(); +- string outf = vm.count(OUT) > 0 ? vm[OUT].as() : string(); +- string inf = vm.count(IN) > 0 ? vm[IN].as() : string(); ++ string outf = vm.count(OUT_FILE) > 0 ? vm[OUT_FILE].as() : string(); ++ string inf = vm.count(IN_FILE) > 0 ? vm[IN_FILE].as() : string(); + string incPrefix = vm[INCLUDE_PREFIX].as(); + bool noUnion = vm.count(NO_UNION_TYPEDEF) != 0; + if (incPrefix == "-") { diff --git a/externals/vcpkg/ports/avro-cpp/install.patch b/externals/vcpkg/ports/avro-cpp/install.patch new file mode 100755 index 000000000..1035b3bf3 --- /dev/null +++ b/externals/vcpkg/ports/avro-cpp/install.patch @@ -0,0 +1,106 @@ +diff --git a/lang/c++/CMakeLists.txt b/lang/c++/CMakeLists.txt +index bf764ce4..e84524d0 100644 +--- a/lang/c++/CMakeLists.txt ++++ b/lang/c++/CMakeLists.txt +@@ -48,6 +48,8 @@ list(GET AVRO_VERSION 2 AVRO_VERSION_PATCH) + project (Avro-cpp) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}) + ++find_package(ZLIB REQUIRED) ++ + if (WIN32 AND NOT CYGWIN AND NOT MSYS) + add_definitions (/EHa) + add_definitions ( +@@ -125,12 +127,12 @@ set_target_properties (avrocpp PROPERTIES + set_target_properties (avrocpp_s PROPERTIES + VERSION ${AVRO_VERSION_MAJOR}.${AVRO_VERSION_MINOR}.${AVRO_VERSION_PATCH}) + +-target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) ++target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB) + target_include_directories(avrocpp PRIVATE ${SNAPPY_INCLUDE_DIR}) + + add_executable (precompile test/precompile.cc) + +-target_link_libraries (precompile avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) ++target_link_libraries (precompile avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB) + + macro (gen file ns) + add_custom_command (OUTPUT ${file}.hh +@@ -160,37 +162,42 @@ gen (primitivetypes pt) + gen (cpp_reserved_words cppres) + + add_executable (avrogencpp impl/avrogencpp.cc) +-target_link_libraries (avrogencpp avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) ++target_link_libraries (avrogencpp avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB) + +-enable_testing() ++if(BUILD_TESTING) ++ enable_testing() ++endif() + + macro (unittest name) + add_executable (${name} test/${name}.cc) +- target_link_libraries (${name} avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) ++ target_link_libraries (${name} avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB) + add_test (NAME ${name} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${name}) + endmacro (unittest) + +-unittest (buffertest) +-unittest (unittest) +-unittest (SchemaTests) +-unittest (LargeSchemaTests) +-unittest (CodecTests) +-unittest (StreamTests) +-unittest (SpecificTests) +-unittest (DataFileTests) +-unittest (JsonTests) +-unittest (AvrogencppTests) +-unittest (CompilerTests) +-unittest (AvrogencppTestReservedWords) +- +-add_dependencies (AvrogencppTestReservedWords cpp_reserved_words_hh) +- +-add_dependencies (AvrogencppTests bigrecord_hh bigrecord_r_hh bigrecord2_hh +- tweet_hh +- union_array_union_hh union_map_union_hh union_conflict_hh +- recursive_hh reuse_hh circulardep_hh tree1_hh tree2_hh crossref_hh +- primitivetypes_hh empty_record_hh) ++if(BUILD_TESTING) ++ unittest (buffertest) ++ unittest (unittest) ++ unittest (SchemaTests) ++ unittest (LargeSchemaTests) ++ unittest (CodecTests) ++ unittest (StreamTests) ++ unittest (SpecificTests) ++ unittest (DataFileTests) ++ unittest (JsonTests) ++ unittest (AvrogencppTests) ++ unittest (CompilerTests) ++ unittest (AvrogencppTestReservedWords) ++ ++ add_dependencies (AvrogencppTestReservedWords cpp_reserved_words_hh) ++ ++ add_dependencies (AvrogencppTests bigrecord_hh bigrecord_r_hh bigrecord2_hh ++ tweet_hh ++ union_array_union_hh union_map_union_hh union_conflict_hh ++ recursive_hh reuse_hh circulardep_hh tree1_hh tree2_hh crossref_hh ++ primitivetypes_hh empty_record_hh) ++ ++endif() + + include (InstallRequiredSystemLibraries) + +@@ -201,9 +208,9 @@ include (CPack) + install (TARGETS avrocpp avrocpp_s + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +- RUNTIME DESTINATION lib) ++ RUNTIME DESTINATION bin) + +-install (TARGETS avrogencpp RUNTIME DESTINATION bin) ++install (TARGETS avrogencpp RUNTIME DESTINATION tools/bin) + + install (DIRECTORY api/ DESTINATION include/avro + FILES_MATCHING PATTERN *.hh) diff --git a/externals/vcpkg/ports/avro-cpp/portfile.cmake b/externals/vcpkg/ports/avro-cpp/portfile.cmake new file mode 100755 index 000000000..43a2fd278 --- /dev/null +++ b/externals/vcpkg/ports/avro-cpp/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO apache/avro + REF 2ab8fa85d05f04387bd5d63b10ad1c8fd2243616 + SHA512 fd21f0919b0e5e884bdf4d66c4d5ba056f04c426b309ec0b5ab26642a5f6b00d46f4dd965431b10130bc5f0d81699e2195780e90e127f63049ee5763403ef7c8 + HEAD_REF master + PATCHES + install.patch + fix-windows-build.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + snappy CMAKE_DISABLE_FIND_PACKAGE_Snappy +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/lang/c++ + PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DBUILD_TESTING=OFF + ${FEATURE_OPTIONS} + OPTIONS_DEBUG + -DAVRO_ADD_PROTECTOR_FLAGS=1 +) + +vcpkg_install_cmake(ADD_BIN_TO_PATH) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/lang/c++/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/avro-cpp/vcpkg.json b/externals/vcpkg/ports/avro-cpp/vcpkg.json new file mode 100755 index 000000000..88c00cf79 --- /dev/null +++ b/externals/vcpkg/ports/avro-cpp/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "avro-cpp", + "version-date": "2021-06-01", + "port-version": 1, + "description": "Apache Avro is a data serialization system", + "homepage": "https://github.com/apache/avro", + "supports": "!(windows & static)", + "dependencies": [ + "boost-crc", + "boost-filesystem", + "boost-format", + "boost-iostreams", + "boost-math", + "boost-program-options", + "boost-random", + "boost-test", + "boost-thread", + "bzip2", + "liblzma", + "libzip", + "zlib", + "zstd" + ], + "features": { + "snappy": { + "description": "Support Snappy for compression", + "dependencies": [ + "snappy" + ] + } + } +} diff --git a/externals/vcpkg/ports/aws-c-auth/fix-cmake-target-path.patch b/externals/vcpkg/ports/aws-c-auth/fix-cmake-target-path.patch new file mode 100755 index 000000000..4eb3068a5 --- /dev/null +++ b/externals/vcpkg/ports/aws-c-auth/fix-cmake-target-path.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6a00afa..eba3d43 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -118,7 +118,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/aws-c-auth-config.cmake b/cmake/aws-c-auth-config.cmake +index 430c1d7..6adbe53 100644 +--- a/cmake/aws-c-auth-config.cmake ++++ b/cmake/aws-c-auth-config.cmake +@@ -5,9 +5,5 @@ find_dependency(aws-c-cal) + find_dependency(aws-c-io) + find_dependency(aws-c-http) + +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else() +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) + diff --git a/externals/vcpkg/ports/aws-c-auth/portfile.cmake b/externals/vcpkg/ports/aws-c-auth/portfile.cmake new file mode 100755 index 000000000..352e4fb8f --- /dev/null +++ b/externals/vcpkg/ports/aws-c-auth/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO awslabs/aws-c-auth + REF 61b6524960ad5e0c7aa2e38b343425d5941781bf # v0.6.3 + SHA512 b5dda92e4a8796f3f1b8e2d326f57979a673f57325c921cdbc9c44273ada2f2a8eb6723f0292d223175ba4cca24508d2b635fad2af5ec7dd9e7b06db9588ede6 + HEAD_REF master + PATCHES fix-cmake-target-path.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files + -DBUILD_TESTING=FALSE +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-auth/cmake) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-auth" + "${CURRENT_PACKAGES_DIR}/lib/aws-c-auth" + ) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/aws-c-auth/vcpkg.json b/externals/vcpkg/ports/aws-c-auth/vcpkg.json new file mode 100755 index 000000000..4fa7c1701 --- /dev/null +++ b/externals/vcpkg/ports/aws-c-auth/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "aws-c-auth", + "version": "0.6.3", + "port-version": 2, + "description": "C99 library implementation of AWS client-side authentication: standard credentials providers and signing.", + "homepage": "https://github.com/awslabs/aws-c-auth", + "supports": "!(windows & arm) & !uwp", + "dependencies": [ + "aws-c-common", + "aws-c-http", + { + "name": "s2n", + "platform": "!uwp & !windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/aws-c-cal/fix-cmake-target-path.patch b/externals/vcpkg/ports/aws-c-cal/fix-cmake-target-path.patch new file mode 100755 index 000000000..25d6749b8 --- /dev/null +++ b/externals/vcpkg/ports/aws-c-cal/fix-cmake-target-path.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6039819..b74b65c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -158,7 +158,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/aws-c-cal-config.cmake b/cmake/aws-c-cal-config.cmake +index 73e7311..e87c43a 100644 +--- a/cmake/aws-c-cal-config.cmake ++++ b/cmake/aws-c-cal-config.cmake +@@ -7,9 +7,5 @@ if (NOT BYO_CRYPTO AND NOT WIN32 AND NOT APPLE) + find_dependency(LibCrypto) + endif() + +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else() +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) + diff --git a/externals/vcpkg/ports/aws-c-cal/portfile.cmake b/externals/vcpkg/ports/aws-c-cal/portfile.cmake new file mode 100755 index 000000000..e9c8e4f7e --- /dev/null +++ b/externals/vcpkg/ports/aws-c-cal/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO awslabs/aws-c-cal + REF c4c5b175e05f2affe5e3f0203ca6c8bc5cdd8f51 # v0.5.12 + SHA512 25dd1d7f207f1324aed418555dda1c3d4ec64baf76431c9efd88fd3c34b163a2e5a6778192d2c0caf937f3efd31b2f21e6a0d0f7230684d176164da0e8bcc92e + HEAD_REF master + PATCHES fix-cmake-target-path.patch + remove-libcrypto-messages.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files + -DBUILD_TESTING=FALSE +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-cal/cmake) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-cal" + "${CURRENT_PACKAGES_DIR}/lib/aws-c-cal" + ) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/aws-c-cal/remove-libcrypto-messages.patch b/externals/vcpkg/ports/aws-c-cal/remove-libcrypto-messages.patch new file mode 100755 index 000000000..6115bb1d3 --- /dev/null +++ b/externals/vcpkg/ports/aws-c-cal/remove-libcrypto-messages.patch @@ -0,0 +1,14 @@ +diff --git a/cmake/modules/FindLibCrypto.cmake b/cmake/modules/FindLibCrypto.cmake +index 564ba97..f748212 100644 +--- a/cmake/modules/FindLibCrypto.cmake ++++ b/cmake/modules/FindLibCrypto.cmake +@@ -89,9 +89,6 @@ else() + set(LIBCRYPTO_FOUND true) + set(LibCrypto_FOUND true) + +- message(STATUS "LibCrypto Include Dir: ${LibCrypto_INCLUDE_DIR}") +- message(STATUS "LibCrypto Shared Lib: ${LibCrypto_SHARED_LIBRARY}") +- message(STATUS "LibCrypto Static Lib: ${LibCrypto_STATIC_LIBRARY}") + if (NOT TARGET crypto AND + (EXISTS "${LibCrypto_LIBRARY}") + ) diff --git a/externals/vcpkg/ports/aws-c-cal/vcpkg.json b/externals/vcpkg/ports/aws-c-cal/vcpkg.json new file mode 100755 index 000000000..94b2f1072 --- /dev/null +++ b/externals/vcpkg/ports/aws-c-cal/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "aws-c-cal", + "version": "0.5.12", + "port-version": 2, + "description": "C99 wrapper for cryptography primitives.", + "homepage": "https://github.com/awslabs/aws-c-cal", + "supports": "!(windows & arm) & !uwp", + "dependencies": [ + "aws-c-common", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/aws-c-common/disable-internal-crt-option.patch b/externals/vcpkg/ports/aws-c-common/disable-internal-crt-option.patch new file mode 100755 index 000000000..6fec4b214 --- /dev/null +++ b/externals/vcpkg/ports/aws-c-common/disable-internal-crt-option.patch @@ -0,0 +1,20 @@ +diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake +index 249b7d5..41a31e2 100644 +--- a/cmake/AwsCFlags.cmake ++++ b/cmake/AwsCFlags.cmake +@@ -38,15 +38,6 @@ function(aws_set_common_properties target) + list(APPEND AWS_C_FLAGS /DAWS_SUPPORT_WIN7=1) + endif() + +- string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE) +- if(STATIC_CRT) +- string(REPLACE "/MD" "/MT" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}") +- else() +- string(REPLACE "/MT" "/MD" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}") +- endif() +- string(REPLACE " " ";" _FLAGS "${_FLAGS}") +- list(APPEND AWS_C_FLAGS "${_FLAGS}") +- + else() + list(APPEND AWS_C_FLAGS -Wall -Wstrict-prototypes) + diff --git a/externals/vcpkg/ports/aws-c-common/fix-cmake-target-path.patch b/externals/vcpkg/ports/aws-c-common/fix-cmake-target-path.patch new file mode 100755 index 000000000..9ab97f679 --- /dev/null +++ b/externals/vcpkg/ports/aws-c-common/fix-cmake-target-path.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9b01f56..3cc541d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -239,7 +239,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/aws-c-common-config.cmake b/cmake/aws-c-common-config.cmake +index e495210..b7676c2 100644 +--- a/cmake/aws-c-common-config.cmake ++++ b/cmake/aws-c-common-config.cmake +@@ -4,9 +4,5 @@ if(WIN32 OR UNIX OR APPLE) + find_package(Threads REQUIRED) + endif() + +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else() +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) + diff --git a/externals/vcpkg/ports/aws-c-common/portfile.cmake b/externals/vcpkg/ports/aws-c-common/portfile.cmake new file mode 100755 index 000000000..1ab9f8b72 --- /dev/null +++ b/externals/vcpkg/ports/aws-c-common/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO awslabs/aws-c-common + REF fdd4a10243903260f412f587cc748f0ac79629b4 # v0.6.9 + SHA512 969c9b85af58fc144480f6548e78126cf3fe758951ecbdffb579163b9a505a7ea58c32430390102ff620e828bf241dd24c0167f205306949d36dcf4504efa09a + HEAD_REF master + PATCHES + disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow + fix-cmake-target-path.patch # Shared libraries and static libraries are not built at the same time +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=FALSE +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-common/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-common" + "${CURRENT_PACKAGES_DIR}/lib/aws-c-common" + ) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/aws-c-common/vcpkg.json b/externals/vcpkg/ports/aws-c-common/vcpkg.json new file mode 100755 index 000000000..7d927640d --- /dev/null +++ b/externals/vcpkg/ports/aws-c-common/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "aws-c-common", + "version": "0.6.9", + "port-version": 2, + "description": "AWS common library for C", + "homepage": "https://github.com/awslabs/aws-c-common", + "supports": "!(windows & arm) & !uwp", + "dependencies": [ + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/aws-c-compression/fix-cmake-target-path.patch b/externals/vcpkg/ports/aws-c-compression/fix-cmake-target-path.patch new file mode 100755 index 000000000..035b96cae --- /dev/null +++ b/externals/vcpkg/ports/aws-c-compression/fix-cmake-target-path.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e70e013..0639229 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -88,7 +88,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/aws-c-compression-config.cmake b/cmake/aws-c-compression-config.cmake +index d919e90..707ce3a 100644 +--- a/cmake/aws-c-compression-config.cmake ++++ b/cmake/aws-c-compression-config.cmake +@@ -2,9 +2,5 @@ include(CMakeFindDependencyMacro) + + find_dependency(aws-c-common) + +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else() +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) + diff --git a/externals/vcpkg/ports/aws-c-compression/portfile.cmake b/externals/vcpkg/ports/aws-c-compression/portfile.cmake new file mode 100755 index 000000000..cd13dcb56 --- /dev/null +++ b/externals/vcpkg/ports/aws-c-compression/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO awslabs/aws-c-compression + REF 5fab8bc5ab5321d86f6d153b06062419080820ec # v0.2.14 + SHA512 0063d0d644824d858211840115c17a33bfc2b67799e886c530ea8a42071b7bfc67bb6cf8135c538a292b8a7a6276b1d24bb7649f37ce335bc16938f2fca5cb7d + HEAD_REF master + PATCHES fix-cmake-target-path.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files + -DBUILD_TESTING=FALSE +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-compression/cmake) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-compression" + "${CURRENT_PACKAGES_DIR}/lib/aws-c-compression" +) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/aws-c-compression/vcpkg.json b/externals/vcpkg/ports/aws-c-compression/vcpkg.json new file mode 100755 index 000000000..1e994e501 --- /dev/null +++ b/externals/vcpkg/ports/aws-c-compression/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "aws-c-compression", + "version": "0.2.14", + "port-version": 2, + "description": "C99 implementation of huffman encoding/decoding", + "homepage": "https://github.com/awslabs/aws-c-compression", + "supports": "!(windows & arm) & !uwp", + "dependencies": [ + "aws-c-common", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/aws-c-event-stream/fix-cmake-target-path.patch b/externals/vcpkg/ports/aws-c-event-stream/fix-cmake-target-path.patch new file mode 100755 index 000000000..37d28ca9b --- /dev/null +++ b/externals/vcpkg/ports/aws-c-event-stream/fix-cmake-target-path.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index daf434c..32d7851 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -91,7 +91,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/aws-c-event-stream-config.cmake b/cmake/aws-c-event-stream-config.cmake +index 76adb84..7884368 100644 +--- a/cmake/aws-c-event-stream-config.cmake ++++ b/cmake/aws-c-event-stream-config.cmake +@@ -2,9 +2,5 @@ include(CMakeFindDependencyMacro) + find_dependency(aws-c-io) + find_dependency(aws-checksums) + +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else() +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) + diff --git a/externals/vcpkg/ports/aws-c-event-stream/portfile.cmake b/externals/vcpkg/ports/aws-c-event-stream/portfile.cmake new file mode 100755 index 000000000..be821d66b --- /dev/null +++ b/externals/vcpkg/ports/aws-c-event-stream/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO awslabs/aws-c-event-stream + REF e87537be561d753ec82e783bc0929b1979c585f8 # v0.2.7 + SHA512 651b05ba6d87ad8f65f6cf7e8940b7ea500722848f3e65c2de0bf84d2e6321d0aa1631d4f64a78cf5ed5ed5adac6805a4e91e5c31b3ae86e8c37afb38da4c786 + HEAD_REF master + PATCHES fix-cmake-target-path.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" + -DBUILD_TESTING=FALSE +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-event-stream/cmake) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-event-stream" + "${CURRENT_PACKAGES_DIR}/lib/aws-c-event-stream" + ) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/aws-c-event-stream/vcpkg.json b/externals/vcpkg/ports/aws-c-event-stream/vcpkg.json new file mode 100755 index 000000000..ebabcab6a --- /dev/null +++ b/externals/vcpkg/ports/aws-c-event-stream/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "aws-c-event-stream", + "version": "0.2.7", + "port-version": 2, + "description": "C99 implementation of the vnd.amazon.event-stream content-type.", + "homepage": "https://github.com/awslabs/aws-c-event-stream", + "supports": "!(windows & arm) & !uwp", + "dependencies": [ + "aws-c-cal", + "aws-c-common", + "aws-c-io", + "aws-checksums", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/aws-c-http/fix-cmake-target-path.patch b/externals/vcpkg/ports/aws-c-http/fix-cmake-target-path.patch new file mode 100755 index 000000000..1e2f40209 --- /dev/null +++ b/externals/vcpkg/ports/aws-c-http/fix-cmake-target-path.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7b0d8e5..d46b498 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -83,7 +83,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/aws-c-http-config.cmake b/cmake/aws-c-http-config.cmake +index 8633305..eb7f364 100644 +--- a/cmake/aws-c-http-config.cmake ++++ b/cmake/aws-c-http-config.cmake +@@ -3,9 +3,5 @@ include(CMakeFindDependencyMacro) + find_dependency(aws-c-io) + find_dependency(aws-c-compression) + +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else() +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) + diff --git a/externals/vcpkg/ports/aws-c-http/portfile.cmake b/externals/vcpkg/ports/aws-c-http/portfile.cmake new file mode 100755 index 000000000..aa01053c7 --- /dev/null +++ b/externals/vcpkg/ports/aws-c-http/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO awslabs/aws-c-http + REF 6ff61d621c374ab763f94584d26b1d29baa81c2e # v0.6.5 + SHA512 91a5f3c18e6c8d14368ad2b7275a1ebcc6398758f6b1f87ba6199998390a26e768e25c16b27f589e35371f7304b6784cfc21699ff724c811135f2f73732fe85b + HEAD_REF master + PATCHES fix-cmake-target-path.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files + -DBUILD_TESTING=FALSE +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-http/cmake) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-http" + "${CURRENT_PACKAGES_DIR}/lib/aws-c-http" + ) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/aws-c-http/vcpkg.json b/externals/vcpkg/ports/aws-c-http/vcpkg.json new file mode 100755 index 000000000..34b0ed7ad --- /dev/null +++ b/externals/vcpkg/ports/aws-c-http/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "aws-c-http", + "version": "0.6.5", + "port-version": 2, + "description": "C99 implementation of the HTTP/1.1 and HTTP/2 specifications", + "homepage": "https://github.com/awslabs/aws-c-http", + "supports": "!(windows & arm) & !uwp", + "dependencies": [ + "aws-c-cal", + "aws-c-common", + "aws-c-compression", + "aws-c-io", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/aws-c-io/fix-cmake-target-path.patch b/externals/vcpkg/ports/aws-c-io/fix-cmake-target-path.patch new file mode 100755 index 000000000..ca5d575e4 --- /dev/null +++ b/externals/vcpkg/ports/aws-c-io/fix-cmake-target-path.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a8a9099..a657782 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -215,7 +215,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/aws-c-io-config.cmake b/cmake/aws-c-io-config.cmake +index d4bc525..72a78ec 100644 +--- a/cmake/aws-c-io-config.cmake ++++ b/cmake/aws-c-io-config.cmake +@@ -7,8 +7,4 @@ endif() + find_dependency(aws-c-common) + find_dependency(aws-c-cal) + +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else() +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) diff --git a/externals/vcpkg/ports/aws-c-io/portfile.cmake b/externals/vcpkg/ports/aws-c-io/portfile.cmake new file mode 100755 index 000000000..b3a5996bf --- /dev/null +++ b/externals/vcpkg/ports/aws-c-io/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO awslabs/aws-c-io + REF 57b00febac48e78f8bf8cff4c82a249e6648842a # v0.10.7 + SHA512 ffcf5ba4ccdff23ca390fc4eb935f88040447589886348234aa1c24b531401521df99a6ac578c1679a3c1a06dfcef6deb833a0b9d53e31d42576a3ad03ade6fc + HEAD_REF master + PATCHES fix-cmake-target-path.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files + -DBUILD_TESTING=FALSE +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-io/cmake) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-io" + "${CURRENT_PACKAGES_DIR}/lib/aws-c-io" + ) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/aws-c-io/vcpkg.json b/externals/vcpkg/ports/aws-c-io/vcpkg.json new file mode 100755 index 000000000..9fddd3bf3 --- /dev/null +++ b/externals/vcpkg/ports/aws-c-io/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "aws-c-io", + "version": "0.10.7", + "port-version": 2, + "description": "Handles all IO and TLS work for application protocols.", + "homepage": "https://github.com/awslabs/aws-c-io", + "supports": "!(windows & arm) & !uwp", + "dependencies": [ + "aws-c-cal", + "aws-c-common", + { + "name": "s2n", + "platform": "!uwp & !windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/aws-c-mqtt/fix-cmake-target-path.patch b/externals/vcpkg/ports/aws-c-mqtt/fix-cmake-target-path.patch new file mode 100755 index 000000000..9490f42b9 --- /dev/null +++ b/externals/vcpkg/ports/aws-c-mqtt/fix-cmake-target-path.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3d80abb..36c027f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -94,7 +94,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/aws-c-mqtt-config.cmake b/cmake/aws-c-mqtt-config.cmake +index 4a4dcbb..2ad48d2 100644 +--- a/cmake/aws-c-mqtt-config.cmake ++++ b/cmake/aws-c-mqtt-config.cmake +@@ -6,9 +6,5 @@ if (@MQTT_WITH_WEBSOCKETS@) + find_dependency(aws-c-http) + endif() + +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else() +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) + diff --git a/externals/vcpkg/ports/aws-c-mqtt/portfile.cmake b/externals/vcpkg/ports/aws-c-mqtt/portfile.cmake new file mode 100755 index 000000000..811bd913d --- /dev/null +++ b/externals/vcpkg/ports/aws-c-mqtt/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO awslabs/aws-c-mqtt + REF 0a70bf814845e487b7e4862af7ad9e4a1199b5f4 # v0.7.6 + SHA512 9c8719004e9e4c56f270c5c5dcb41b5ecacb050dadf2a548ab2119a1a8f223c9117829346e2e86c8c77f6efe3502019085344fe4f470ccdd646dc87a3d4f4c3f + HEAD_REF master + PATCHES fix-cmake-target-path.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files + -DBUILD_TESTING=FALSE +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-mqtt/cmake) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-mqtt" + "${CURRENT_PACKAGES_DIR}/lib/aws-c-mqtt" + ) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/aws-c-mqtt/vcpkg.json b/externals/vcpkg/ports/aws-c-mqtt/vcpkg.json new file mode 100755 index 000000000..5b0aff0a4 --- /dev/null +++ b/externals/vcpkg/ports/aws-c-mqtt/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "aws-c-mqtt", + "version": "0.7.6", + "port-version": 3, + "description": "C99 implementation of the MQTT 3.1.1 specification.", + "homepage": "https://github.com/awslabs/aws-c-mqtt", + "supports": "!(windows & arm) & !uwp", + "dependencies": [ + "aws-c-common", + "aws-c-http", + "aws-c-io", + { + "name": "s2n", + "platform": "!uwp & !windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/aws-c-s3/fix-cmake-target-path.patch b/externals/vcpkg/ports/aws-c-s3/fix-cmake-target-path.patch new file mode 100755 index 000000000..cedeca96a --- /dev/null +++ b/externals/vcpkg/ports/aws-c-s3/fix-cmake-target-path.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 318b299..43f6d31 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -104,7 +104,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/aws-c-s3-config.cmake b/cmake/aws-c-s3-config.cmake +index eb62a4b..24debd9 100644 +--- a/cmake/aws-c-s3-config.cmake ++++ b/cmake/aws-c-s3-config.cmake +@@ -3,8 +3,4 @@ include(CMakeFindDependencyMacro) + find_dependency(aws-c-auth) + find_dependency(aws-c-http) + +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else() +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) +\ No newline at end of file diff --git a/externals/vcpkg/ports/aws-c-s3/portfile.cmake b/externals/vcpkg/ports/aws-c-s3/portfile.cmake new file mode 100755 index 000000000..f2ca71997 --- /dev/null +++ b/externals/vcpkg/ports/aws-c-s3/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO awslabs/aws-c-s3 + REF e38bdad12bd4c618e8d10489374d87e6ae3f7a19 # v0.1.25 + SHA512 1ed3313419416ce28373968cb692cf67230b1efced4e187cd5047b146db3bc769dc283dff1af2e41b05ad6f50cbeea58718a34945a93645abacca2515f2a6cf1 + HEAD_REF master + PATCHES fix-cmake-target-path.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files + -DBUILD_TESTING=FALSE +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-s3/cmake) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-s3" + "${CURRENT_PACKAGES_DIR}/lib/aws-c-s3" + ) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/aws-c-s3/vcpkg.json b/externals/vcpkg/ports/aws-c-s3/vcpkg.json new file mode 100755 index 000000000..d6fb5f033 --- /dev/null +++ b/externals/vcpkg/ports/aws-c-s3/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "aws-c-s3", + "version": "0.1.25", + "port-version": 2, + "description": "C99 library implementation for communicating with the S3 service, designed for maximizing throughput on high bandwidth EC2 instances.", + "homepage": "https://github.com/awslabs/aws-c-s3", + "supports": "!(windows & arm) & !uwp", + "dependencies": [ + "aws-c-auth", + "aws-c-cal", + "aws-c-common", + "aws-c-compression", + "aws-c-http", + "aws-c-io", + { + "name": "s2n", + "platform": "!uwp & !windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/aws-checksums/fix-cmake-target-path.patch b/externals/vcpkg/ports/aws-checksums/fix-cmake-target-path.patch new file mode 100755 index 000000000..101a5379f --- /dev/null +++ b/externals/vcpkg/ports/aws-checksums/fix-cmake-target-path.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 888742b..efdd817 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -140,7 +140,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/aws-checksums-config.cmake b/cmake/aws-checksums-config.cmake +index 6de2e44..84d55d1 100644 +--- a/cmake/aws-checksums-config.cmake ++++ b/cmake/aws-checksums-config.cmake +@@ -1,6 +1,2 @@ +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else() +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) + diff --git a/externals/vcpkg/ports/aws-checksums/portfile.cmake b/externals/vcpkg/ports/aws-checksums/portfile.cmake new file mode 100755 index 000000000..55f05f784 --- /dev/null +++ b/externals/vcpkg/ports/aws-checksums/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO awslabs/aws-checksums + REF 99bb0ad4b89d335d638536694352c45e0d2188f5 # v0.1.11 + SHA512 cb9c249496fd41fda1efb9330e823d8b965adca6c8f372a50fe97eda821e277780bf9af8f5977102c44121568993cca55edbb750967b41f323e07e06a93c50a8 + HEAD_REF master + PATCHES fix-cmake-target-path.patch +) + +if (VCPKG_CRT_LINKAGE STREQUAL static) + set(STATIC_CRT_LNK ON) +else() + set(STATIC_CRT_LNK OFF) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSTATIC_CRT=${STATIC_CRT_LNK} + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files + -DBUILD_TESTING=FALSE +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-checksums/cmake) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-checksums" + "${CURRENT_PACKAGES_DIR}/lib/aws-checksums" +) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/aws-checksums/vcpkg.json b/externals/vcpkg/ports/aws-checksums/vcpkg.json new file mode 100755 index 000000000..c31742e6a --- /dev/null +++ b/externals/vcpkg/ports/aws-checksums/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "aws-checksums", + "version": "0.1.11", + "port-version": 3, + "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.", + "homepage": "https://github.com/awslabs/aws-checksums", + "supports": "!(windows & arm)", + "dependencies": [ + "aws-c-common", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/aws-crt-cpp/fix-cmake-target-path.patch b/externals/vcpkg/ports/aws-crt-cpp/fix-cmake-target-path.patch new file mode 100755 index 000000000..69158ef74 --- /dev/null +++ b/externals/vcpkg/ports/aws-crt-cpp/fix-cmake-target-path.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4d935e2..7b0501c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -338,7 +338,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/${TARGET_DIR}" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/aws-crt-cpp-config.cmake b/cmake/aws-crt-cpp-config.cmake +index 4b20a07..faac626 100644 +--- a/cmake/aws-crt-cpp-config.cmake ++++ b/cmake/aws-crt-cpp-config.cmake +@@ -7,8 +7,4 @@ find_dependency(aws-c-auth) + find_dependency(aws-c-event-stream) + find_dependency(aws-c-s3) + +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else () +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) +\ No newline at end of file diff --git a/externals/vcpkg/ports/aws-crt-cpp/fix-ios-build.patch b/externals/vcpkg/ports/aws-crt-cpp/fix-ios-build.patch new file mode 100755 index 000000000..62d68f3e1 --- /dev/null +++ b/externals/vcpkg/ports/aws-crt-cpp/fix-ios-build.patch @@ -0,0 +1,21 @@ +diff --git a/source/io/TlsOptions.cpp b/source/io/TlsOptions.cpp +--- a/source/io/TlsOptions.cpp (revision 9ef58ff20df19e613c91c5f761e381c763da6810) ++++ b/source/io/TlsOptions.cpp (date 1635309758483) +@@ -90,7 +90,7 @@ + return ctxOptions; + } + #endif /* !AWS_OS_IOS */ +-#if defined(AWS_OS_APPLE) ++#if defined(AWS_OS_MACOS) + TlsContextOptions TlsContextOptions::InitClientWithMtlsPkcs12( + const char *pkcs12Path, + const char *pkcs12Pwd, +@@ -111,7 +111,7 @@ + AWS_ASSERT(m_isInit); + return aws_tls_ctx_options_set_keychain_path(&m_options, &keychain_path) == 0; + } +-#endif /* AWS_OS_APPLE */ ++#endif /* AWS_OS_MACOS */ + + #ifdef _WIN32 + TlsContextOptions TlsContextOptions::InitClientWithMtlsSystemPath( diff --git a/externals/vcpkg/ports/aws-crt-cpp/portfile.cmake b/externals/vcpkg/ports/aws-crt-cpp/portfile.cmake new file mode 100755 index 000000000..e80371a62 --- /dev/null +++ b/externals/vcpkg/ports/aws-crt-cpp/portfile.cmake @@ -0,0 +1,44 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO awslabs/aws-crt-cpp + REF 9ef58ff20df19e613c91c5f761e381c763da6810 # v0.15.1 + SHA512 3409b3e6a546ed585b90180807383e8731b36b0db149b5ff92701a43164c4282b1cea4a551bf4c7b1edec7b264098575cf919faee8a2520bb10bbae62258d463 + PATCHES + fix-cmake-target-path.patch + fix-ios-build.patch +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + "-DSTATIC_CRT=${STATIC_CRT}" + -DBUILD_DEPS=OFF + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files + -DBUILD_TESTING=FALSE +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-crt-cpp/cmake) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-crt-cpp" + "${CURRENT_PACKAGES_DIR}/lib/aws-crt-cpp" +) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/aws-crt-cpp/vcpkg.json b/externals/vcpkg/ports/aws-crt-cpp/vcpkg.json new file mode 100755 index 000000000..02a962c20 --- /dev/null +++ b/externals/vcpkg/ports/aws-crt-cpp/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "aws-crt-cpp", + "version": "0.15.1", + "port-version": 3, + "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.", + "homepage": "https://github.com/awslabs/aws-crt-cpp", + "supports": "!(windows & arm) & !uwp", + "dependencies": [ + "aws-c-auth", + "aws-c-cal", + "aws-c-common", + "aws-c-compression", + "aws-c-event-stream", + "aws-c-http", + "aws-c-io", + "aws-c-mqtt", + "aws-c-s3", + "aws-checksums", + { + "name": "s2n", + "platform": "!uwp & !windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/aws-lambda-cpp/portfile.cmake b/externals/vcpkg/ports/aws-lambda-cpp/portfile.cmake new file mode 100755 index 000000000..acebd82a3 --- /dev/null +++ b/externals/vcpkg/ports/aws-lambda-cpp/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO awslabs/aws-lambda-cpp + REF 8bcd8a201f9da613581a2748ca737ab09adbdae5 # v0.2.7 + SHA512 c59310dd839622cfc9ac2a1df5a492e9a6d629b671ed929813dbe51dfe76d4a4e381e78b11b206b66c2bee131a1544c3c8dfc4644981b708b589492763c7ed59 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME aws-lambda-runtime CONFIG_PATH lib/aws-lambda-runtime/cmake) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/aws-lambda-runtime") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/aws-lambda-runtime") + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/aws-lambda-cpp/vcpkg.json b/externals/vcpkg/ports/aws-lambda-cpp/vcpkg.json new file mode 100755 index 000000000..833eb112e --- /dev/null +++ b/externals/vcpkg/ports/aws-lambda-cpp/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "aws-lambda-cpp", + "version": "0.2.7", + "port-version": 1, + "description": "C++ Runtime for AWS Lambda.", + "supports": "linux", + "dependencies": [ + "curl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/aws-sdk-cpp/compute_build_only.cmake b/externals/vcpkg/ports/aws-sdk-cpp/compute_build_only.cmake new file mode 100755 index 000000000..05a4649c8 --- /dev/null +++ b/externals/vcpkg/ports/aws-sdk-cpp/compute_build_only.cmake @@ -0,0 +1,835 @@ +# Automatically generated by generateFeatures.ps1 +if("access-management" IN_LIST FEATURES) + list(APPEND BUILD_ONLY access-management) +endif() +if("accessanalyzer" IN_LIST FEATURES) + list(APPEND BUILD_ONLY accessanalyzer) +endif() +if("acm" IN_LIST FEATURES) + list(APPEND BUILD_ONLY acm) +endif() +if("acm-pca" IN_LIST FEATURES) + list(APPEND BUILD_ONLY acm-pca) +endif() +if("alexaforbusiness" IN_LIST FEATURES) + list(APPEND BUILD_ONLY alexaforbusiness) +endif() +if("amp" IN_LIST FEATURES) + list(APPEND BUILD_ONLY amp) +endif() +if("amplify" IN_LIST FEATURES) + list(APPEND BUILD_ONLY amplify) +endif() +if("amplifybackend" IN_LIST FEATURES) + list(APPEND BUILD_ONLY amplifybackend) +endif() +if("apigateway" IN_LIST FEATURES) + list(APPEND BUILD_ONLY apigateway) +endif() +if("apigatewaymanagementapi" IN_LIST FEATURES) + list(APPEND BUILD_ONLY apigatewaymanagementapi) +endif() +if("apigatewayv2" IN_LIST FEATURES) + list(APPEND BUILD_ONLY apigatewayv2) +endif() +if("appconfig" IN_LIST FEATURES) + list(APPEND BUILD_ONLY appconfig) +endif() +if("appflow" IN_LIST FEATURES) + list(APPEND BUILD_ONLY appflow) +endif() +if("appintegrations" IN_LIST FEATURES) + list(APPEND BUILD_ONLY appintegrations) +endif() +if("application-autoscaling" IN_LIST FEATURES) + list(APPEND BUILD_ONLY application-autoscaling) +endif() +if("application-insights" IN_LIST FEATURES) + list(APPEND BUILD_ONLY application-insights) +endif() +if("applicationcostprofiler" IN_LIST FEATURES) + list(APPEND BUILD_ONLY applicationcostprofiler) +endif() +if("appmesh" IN_LIST FEATURES) + list(APPEND BUILD_ONLY appmesh) +endif() +if("apprunner" IN_LIST FEATURES) + list(APPEND BUILD_ONLY apprunner) +endif() +if("appstream" IN_LIST FEATURES) + list(APPEND BUILD_ONLY appstream) +endif() +if("appsync" IN_LIST FEATURES) + list(APPEND BUILD_ONLY appsync) +endif() +if("athena" IN_LIST FEATURES) + list(APPEND BUILD_ONLY athena) +endif() +if("auditmanager" IN_LIST FEATURES) + list(APPEND BUILD_ONLY auditmanager) +endif() +if("autoscaling" IN_LIST FEATURES) + list(APPEND BUILD_ONLY autoscaling) +endif() +if("autoscaling-plans" IN_LIST FEATURES) + list(APPEND BUILD_ONLY autoscaling-plans) +endif() +if("awsmigrationhub" IN_LIST FEATURES) + list(APPEND BUILD_ONLY AWSMigrationHub) +endif() +if("awstransfer" IN_LIST FEATURES) + list(APPEND BUILD_ONLY awstransfer) +endif() +if("backup" IN_LIST FEATURES) + list(APPEND BUILD_ONLY backup) +endif() +if("batch" IN_LIST FEATURES) + list(APPEND BUILD_ONLY batch) +endif() +if("braket" IN_LIST FEATURES) + list(APPEND BUILD_ONLY braket) +endif() +if("budgets" IN_LIST FEATURES) + list(APPEND BUILD_ONLY budgets) +endif() +if("ce" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ce) +endif() +if("chime" IN_LIST FEATURES) + list(APPEND BUILD_ONLY chime) +endif() +if("cloud9" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cloud9) +endif() +if("clouddirectory" IN_LIST FEATURES) + list(APPEND BUILD_ONLY clouddirectory) +endif() +if("cloudformation" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cloudformation) +endif() +if("cloudfront" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cloudfront) +endif() +if("cloudhsm" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cloudhsm) +endif() +if("cloudhsmv2" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cloudhsmv2) +endif() +if("cloudsearch" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cloudsearch) +endif() +if("cloudsearchdomain" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cloudsearchdomain) +endif() +if("cloudtrail" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cloudtrail) +endif() +if("codeartifact" IN_LIST FEATURES) + list(APPEND BUILD_ONLY codeartifact) +endif() +if("codebuild" IN_LIST FEATURES) + list(APPEND BUILD_ONLY codebuild) +endif() +if("codecommit" IN_LIST FEATURES) + list(APPEND BUILD_ONLY codecommit) +endif() +if("codedeploy" IN_LIST FEATURES) + list(APPEND BUILD_ONLY codedeploy) +endif() +if("codeguru-reviewer" IN_LIST FEATURES) + list(APPEND BUILD_ONLY codeguru-reviewer) +endif() +if("codeguruprofiler" IN_LIST FEATURES) + list(APPEND BUILD_ONLY codeguruprofiler) +endif() +if("codepipeline" IN_LIST FEATURES) + list(APPEND BUILD_ONLY codepipeline) +endif() +if("codestar" IN_LIST FEATURES) + list(APPEND BUILD_ONLY codestar) +endif() +if("codestar-connections" IN_LIST FEATURES) + list(APPEND BUILD_ONLY codestar-connections) +endif() +if("codestar-notifications" IN_LIST FEATURES) + list(APPEND BUILD_ONLY codestar-notifications) +endif() +if("cognito-identity" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cognito-identity) +endif() +if("cognito-idp" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cognito-idp) +endif() +if("cognito-sync" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cognito-sync) +endif() +if("comprehend" IN_LIST FEATURES) + list(APPEND BUILD_ONLY comprehend) +endif() +if("comprehendmedical" IN_LIST FEATURES) + list(APPEND BUILD_ONLY comprehendmedical) +endif() +if("compute-optimizer" IN_LIST FEATURES) + list(APPEND BUILD_ONLY compute-optimizer) +endif() +if("config" IN_LIST FEATURES) + list(APPEND BUILD_ONLY config) +endif() +if("connect" IN_LIST FEATURES) + list(APPEND BUILD_ONLY connect) +endif() +if("connect-contact-lens" IN_LIST FEATURES) + list(APPEND BUILD_ONLY connect-contact-lens) +endif() +if("connectparticipant" IN_LIST FEATURES) + list(APPEND BUILD_ONLY connectparticipant) +endif() +if("cur" IN_LIST FEATURES) + list(APPEND BUILD_ONLY cur) +endif() +if("customer-profiles" IN_LIST FEATURES) + list(APPEND BUILD_ONLY customer-profiles) +endif() +if("databrew" IN_LIST FEATURES) + list(APPEND BUILD_ONLY databrew) +endif() +if("dataexchange" IN_LIST FEATURES) + list(APPEND BUILD_ONLY dataexchange) +endif() +if("datapipeline" IN_LIST FEATURES) + list(APPEND BUILD_ONLY datapipeline) +endif() +if("datasync" IN_LIST FEATURES) + list(APPEND BUILD_ONLY datasync) +endif() +if("dax" IN_LIST FEATURES) + list(APPEND BUILD_ONLY dax) +endif() +if("detective" IN_LIST FEATURES) + list(APPEND BUILD_ONLY detective) +endif() +if("devicefarm" IN_LIST FEATURES) + list(APPEND BUILD_ONLY devicefarm) +endif() +if("devops-guru" IN_LIST FEATURES) + list(APPEND BUILD_ONLY devops-guru) +endif() +if("directconnect" IN_LIST FEATURES) + list(APPEND BUILD_ONLY directconnect) +endif() +if("discovery" IN_LIST FEATURES) + list(APPEND BUILD_ONLY discovery) +endif() +if("dlm" IN_LIST FEATURES) + list(APPEND BUILD_ONLY dlm) +endif() +if("dms" IN_LIST FEATURES) + list(APPEND BUILD_ONLY dms) +endif() +if("docdb" IN_LIST FEATURES) + list(APPEND BUILD_ONLY docdb) +endif() +if("ds" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ds) +endif() +if("dynamodb" IN_LIST FEATURES) + list(APPEND BUILD_ONLY dynamodb) +endif() +if("dynamodbstreams" IN_LIST FEATURES) + list(APPEND BUILD_ONLY dynamodbstreams) +endif() +if("ebs" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ebs) +endif() +if("ec2" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ec2) +endif() +if("ec2-instance-connect" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ec2-instance-connect) +endif() +if("ecr" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ecr) +endif() +if("ecr-public" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ecr-public) +endif() +if("ecs" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ecs) +endif() +if("eks" IN_LIST FEATURES) + list(APPEND BUILD_ONLY eks) +endif() +if("elastic-inference" IN_LIST FEATURES) + list(APPEND BUILD_ONLY elastic-inference) +endif() +if("elasticache" IN_LIST FEATURES) + list(APPEND BUILD_ONLY elasticache) +endif() +if("elasticbeanstalk" IN_LIST FEATURES) + list(APPEND BUILD_ONLY elasticbeanstalk) +endif() +if("elasticfilesystem" IN_LIST FEATURES) + list(APPEND BUILD_ONLY elasticfilesystem) +endif() +if("elasticloadbalancing" IN_LIST FEATURES) + list(APPEND BUILD_ONLY elasticloadbalancing) +endif() +if("elasticloadbalancingv2" IN_LIST FEATURES) + list(APPEND BUILD_ONLY elasticloadbalancingv2) +endif() +if("elasticmapreduce" IN_LIST FEATURES) + list(APPEND BUILD_ONLY elasticmapreduce) +endif() +if("elastictranscoder" IN_LIST FEATURES) + list(APPEND BUILD_ONLY elastictranscoder) +endif() +if("email" IN_LIST FEATURES) + list(APPEND BUILD_ONLY email) +endif() +if("emr-containers" IN_LIST FEATURES) + list(APPEND BUILD_ONLY emr-containers) +endif() +if("es" IN_LIST FEATURES) + list(APPEND BUILD_ONLY es) +endif() +if("eventbridge" IN_LIST FEATURES) + list(APPEND BUILD_ONLY eventbridge) +endif() +if("events" IN_LIST FEATURES) + list(APPEND BUILD_ONLY events) +endif() +if("finspace" IN_LIST FEATURES) + list(APPEND BUILD_ONLY finspace) +endif() +if("finspace-data" IN_LIST FEATURES) + list(APPEND BUILD_ONLY finspace-data) +endif() +if("firehose" IN_LIST FEATURES) + list(APPEND BUILD_ONLY firehose) +endif() +if("fis" IN_LIST FEATURES) + list(APPEND BUILD_ONLY fis) +endif() +if("fms" IN_LIST FEATURES) + list(APPEND BUILD_ONLY fms) +endif() +if("forecast" IN_LIST FEATURES) + list(APPEND BUILD_ONLY forecast) +endif() +if("forecastquery" IN_LIST FEATURES) + list(APPEND BUILD_ONLY forecastquery) +endif() +if("frauddetector" IN_LIST FEATURES) + list(APPEND BUILD_ONLY frauddetector) +endif() +if("fsx" IN_LIST FEATURES) + list(APPEND BUILD_ONLY fsx) +endif() +if("gamelift" IN_LIST FEATURES) + list(APPEND BUILD_ONLY gamelift) +endif() +if("glacier" IN_LIST FEATURES) + list(APPEND BUILD_ONLY glacier) +endif() +if("globalaccelerator" IN_LIST FEATURES) + list(APPEND BUILD_ONLY globalaccelerator) +endif() +if("glue" IN_LIST FEATURES) + list(APPEND BUILD_ONLY glue) +endif() +if("greengrass" IN_LIST FEATURES) + list(APPEND BUILD_ONLY greengrass) +endif() +if("greengrassv2" IN_LIST FEATURES) + list(APPEND BUILD_ONLY greengrassv2) +endif() +if("groundstation" IN_LIST FEATURES) + list(APPEND BUILD_ONLY groundstation) +endif() +if("guardduty" IN_LIST FEATURES) + list(APPEND BUILD_ONLY guardduty) +endif() +if("health" IN_LIST FEATURES) + list(APPEND BUILD_ONLY health) +endif() +if("healthlake" IN_LIST FEATURES) + list(APPEND BUILD_ONLY healthlake) +endif() +if("honeycode" IN_LIST FEATURES) + list(APPEND BUILD_ONLY honeycode) +endif() +if("iam" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iam) +endif() +if("identity-management" IN_LIST FEATURES) + list(APPEND BUILD_ONLY identity-management) +endif() +if("identitystore" IN_LIST FEATURES) + list(APPEND BUILD_ONLY identitystore) +endif() +if("imagebuilder" IN_LIST FEATURES) + list(APPEND BUILD_ONLY imagebuilder) +endif() +if("importexport" IN_LIST FEATURES) + list(APPEND BUILD_ONLY importexport) +endif() +if("inspector" IN_LIST FEATURES) + list(APPEND BUILD_ONLY inspector) +endif() +if("iot" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iot) +endif() +if("iot-data" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iot-data) +endif() +if("iot-jobs-data" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iot-jobs-data) +endif() +if("iot1click-devices" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iot1click-devices) +endif() +if("iot1click-projects" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iot1click-projects) +endif() +if("iotanalytics" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iotanalytics) +endif() +if("iotdeviceadvisor" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iotdeviceadvisor) +endif() +if("iotevents" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iotevents) +endif() +if("iotevents-data" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iotevents-data) +endif() +if("iotfleethub" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iotfleethub) +endif() +if("iotsecuretunneling" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iotsecuretunneling) +endif() +if("iotsitewise" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iotsitewise) +endif() +if("iotthingsgraph" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iotthingsgraph) +endif() +if("iotwireless" IN_LIST FEATURES) + list(APPEND BUILD_ONLY iotwireless) +endif() +if("ivs" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ivs) +endif() +if("kafka" IN_LIST FEATURES) + list(APPEND BUILD_ONLY kafka) +endif() +if("kendra" IN_LIST FEATURES) + list(APPEND BUILD_ONLY kendra) +endif() +if("kinesis" IN_LIST FEATURES) + list(APPEND BUILD_ONLY kinesis) +endif() +if("kinesis-video-archived-media" IN_LIST FEATURES) + list(APPEND BUILD_ONLY kinesis-video-archived-media) +endif() +if("kinesis-video-media" IN_LIST FEATURES) + list(APPEND BUILD_ONLY kinesis-video-media) +endif() +if("kinesis-video-signaling" IN_LIST FEATURES) + list(APPEND BUILD_ONLY kinesis-video-signaling) +endif() +if("kinesisanalytics" IN_LIST FEATURES) + list(APPEND BUILD_ONLY kinesisanalytics) +endif() +if("kinesisanalyticsv2" IN_LIST FEATURES) + list(APPEND BUILD_ONLY kinesisanalyticsv2) +endif() +if("kinesisvideo" IN_LIST FEATURES) + list(APPEND BUILD_ONLY kinesisvideo) +endif() +if("kms" IN_LIST FEATURES) + list(APPEND BUILD_ONLY kms) +endif() +if("lakeformation" IN_LIST FEATURES) + list(APPEND BUILD_ONLY lakeformation) +endif() +if("lambda" IN_LIST FEATURES) + list(APPEND BUILD_ONLY lambda) +endif() +if("lex" IN_LIST FEATURES) + list(APPEND BUILD_ONLY lex) +endif() +if("lex-models" IN_LIST FEATURES) + list(APPEND BUILD_ONLY lex-models) +endif() +if("lexv2-models" IN_LIST FEATURES) + list(APPEND BUILD_ONLY lexv2-models) +endif() +if("lexv2-runtime" IN_LIST FEATURES) + list(APPEND BUILD_ONLY lexv2-runtime) +endif() +if("license-manager" IN_LIST FEATURES) + list(APPEND BUILD_ONLY license-manager) +endif() +if("lightsail" IN_LIST FEATURES) + list(APPEND BUILD_ONLY lightsail) +endif() +if("location" IN_LIST FEATURES) + list(APPEND BUILD_ONLY location) +endif() +if("logs" IN_LIST FEATURES) + list(APPEND BUILD_ONLY logs) +endif() +if("lookoutequipment" IN_LIST FEATURES) + list(APPEND BUILD_ONLY lookoutequipment) +endif() +if("lookoutmetrics" IN_LIST FEATURES) + list(APPEND BUILD_ONLY lookoutmetrics) +endif() +if("lookoutvision" IN_LIST FEATURES) + list(APPEND BUILD_ONLY lookoutvision) +endif() +if("machinelearning" IN_LIST FEATURES) + list(APPEND BUILD_ONLY machinelearning) +endif() +if("macie" IN_LIST FEATURES) + list(APPEND BUILD_ONLY macie) +endif() +if("macie2" IN_LIST FEATURES) + list(APPEND BUILD_ONLY macie2) +endif() +if("managedblockchain" IN_LIST FEATURES) + list(APPEND BUILD_ONLY managedblockchain) +endif() +if("marketplace-catalog" IN_LIST FEATURES) + list(APPEND BUILD_ONLY marketplace-catalog) +endif() +if("marketplace-entitlement" IN_LIST FEATURES) + list(APPEND BUILD_ONLY marketplace-entitlement) +endif() +if("marketplacecommerceanalytics" IN_LIST FEATURES) + list(APPEND BUILD_ONLY marketplacecommerceanalytics) +endif() +if("mediaconnect" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mediaconnect) +endif() +if("mediaconvert" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mediaconvert) +endif() +if("medialive" IN_LIST FEATURES) + list(APPEND BUILD_ONLY medialive) +endif() +if("mediapackage" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mediapackage) +endif() +if("mediapackage-vod" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mediapackage-vod) +endif() +if("mediastore" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mediastore) +endif() +if("mediastore-data" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mediastore-data) +endif() +if("mediatailor" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mediatailor) +endif() +if("meteringmarketplace" IN_LIST FEATURES) + list(APPEND BUILD_ONLY meteringmarketplace) +endif() +if("mgn" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mgn) +endif() +if("migrationhub-config" IN_LIST FEATURES) + list(APPEND BUILD_ONLY migrationhub-config) +endif() +if("mobile" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mobile) +endif() +if("mobileanalytics" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mobileanalytics) +endif() +if("monitoring" IN_LIST FEATURES) + list(APPEND BUILD_ONLY monitoring) +endif() +if("mq" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mq) +endif() +if("mturk-requester" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mturk-requester) +endif() +if("mwaa" IN_LIST FEATURES) + list(APPEND BUILD_ONLY mwaa) +endif() +if("neptune" IN_LIST FEATURES) + list(APPEND BUILD_ONLY neptune) +endif() +if("network-firewall" IN_LIST FEATURES) + list(APPEND BUILD_ONLY network-firewall) +endif() +if("networkmanager" IN_LIST FEATURES) + list(APPEND BUILD_ONLY networkmanager) +endif() +if("nimble" IN_LIST FEATURES) + list(APPEND BUILD_ONLY nimble) +endif() +if("opsworks" IN_LIST FEATURES) + list(APPEND BUILD_ONLY opsworks) +endif() +if("opsworkscm" IN_LIST FEATURES) + list(APPEND BUILD_ONLY opsworkscm) +endif() +if("organizations" IN_LIST FEATURES) + list(APPEND BUILD_ONLY organizations) +endif() +if("outposts" IN_LIST FEATURES) + list(APPEND BUILD_ONLY outposts) +endif() +if("personalize" IN_LIST FEATURES) + list(APPEND BUILD_ONLY personalize) +endif() +if("personalize-events" IN_LIST FEATURES) + list(APPEND BUILD_ONLY personalize-events) +endif() +if("personalize-runtime" IN_LIST FEATURES) + list(APPEND BUILD_ONLY personalize-runtime) +endif() +if("pi" IN_LIST FEATURES) + list(APPEND BUILD_ONLY pi) +endif() +if("pinpoint" IN_LIST FEATURES) + list(APPEND BUILD_ONLY pinpoint) +endif() +if("pinpoint-email" IN_LIST FEATURES) + list(APPEND BUILD_ONLY pinpoint-email) +endif() +if("polly" IN_LIST FEATURES) + list(APPEND BUILD_ONLY polly) +endif() +if("pricing" IN_LIST FEATURES) + list(APPEND BUILD_ONLY pricing) +endif() +if("qldb" IN_LIST FEATURES) + list(APPEND BUILD_ONLY qldb) +endif() +if("qldb-session" IN_LIST FEATURES) + list(APPEND BUILD_ONLY qldb-session) +endif() +if("queues" IN_LIST FEATURES) + list(APPEND BUILD_ONLY queues) +endif() +if("quicksight" IN_LIST FEATURES) + list(APPEND BUILD_ONLY quicksight) +endif() +if("ram" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ram) +endif() +if("rds" IN_LIST FEATURES) + list(APPEND BUILD_ONLY rds) +endif() +if("rds-data" IN_LIST FEATURES) + list(APPEND BUILD_ONLY rds-data) +endif() +if("redshift" IN_LIST FEATURES) + list(APPEND BUILD_ONLY redshift) +endif() +if("redshift-data" IN_LIST FEATURES) + list(APPEND BUILD_ONLY redshift-data) +endif() +if("rekognition" IN_LIST FEATURES) + list(APPEND BUILD_ONLY rekognition) +endif() +if("resource-groups" IN_LIST FEATURES) + list(APPEND BUILD_ONLY resource-groups) +endif() +if("resourcegroupstaggingapi" IN_LIST FEATURES) + list(APPEND BUILD_ONLY resourcegroupstaggingapi) +endif() +if("robomaker" IN_LIST FEATURES) + list(APPEND BUILD_ONLY robomaker) +endif() +if("route53" IN_LIST FEATURES) + list(APPEND BUILD_ONLY route53) +endif() +if("route53domains" IN_LIST FEATURES) + list(APPEND BUILD_ONLY route53domains) +endif() +if("route53resolver" IN_LIST FEATURES) + list(APPEND BUILD_ONLY route53resolver) +endif() +if("s3" IN_LIST FEATURES) + list(APPEND BUILD_ONLY s3) +endif() +if("s3-crt" IN_LIST FEATURES) + list(APPEND BUILD_ONLY s3-crt) +endif() +if("s3-encryption" IN_LIST FEATURES) + list(APPEND BUILD_ONLY s3-encryption) +endif() +if("s3control" IN_LIST FEATURES) + list(APPEND BUILD_ONLY s3control) +endif() +if("s3outposts" IN_LIST FEATURES) + list(APPEND BUILD_ONLY s3outposts) +endif() +if("sagemaker" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sagemaker) +endif() +if("sagemaker-a2i-runtime" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sagemaker-a2i-runtime) +endif() +if("sagemaker-edge" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sagemaker-edge) +endif() +if("sagemaker-featurestore-runtime" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sagemaker-featurestore-runtime) +endif() +if("sagemaker-runtime" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sagemaker-runtime) +endif() +if("savingsplans" IN_LIST FEATURES) + list(APPEND BUILD_ONLY savingsplans) +endif() +if("schemas" IN_LIST FEATURES) + list(APPEND BUILD_ONLY schemas) +endif() +if("sdb" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sdb) +endif() +if("secretsmanager" IN_LIST FEATURES) + list(APPEND BUILD_ONLY secretsmanager) +endif() +if("securityhub" IN_LIST FEATURES) + list(APPEND BUILD_ONLY securityhub) +endif() +if("serverlessrepo" IN_LIST FEATURES) + list(APPEND BUILD_ONLY serverlessrepo) +endif() +if("service-quotas" IN_LIST FEATURES) + list(APPEND BUILD_ONLY service-quotas) +endif() +if("servicecatalog" IN_LIST FEATURES) + list(APPEND BUILD_ONLY servicecatalog) +endif() +if("servicecatalog-appregistry" IN_LIST FEATURES) + list(APPEND BUILD_ONLY servicecatalog-appregistry) +endif() +if("servicediscovery" IN_LIST FEATURES) + list(APPEND BUILD_ONLY servicediscovery) +endif() +if("sesv2" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sesv2) +endif() +if("shield" IN_LIST FEATURES) + list(APPEND BUILD_ONLY shield) +endif() +if("signer" IN_LIST FEATURES) + list(APPEND BUILD_ONLY signer) +endif() +if("sms" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sms) +endif() +if("sms-voice" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sms-voice) +endif() +if("snowball" IN_LIST FEATURES) + list(APPEND BUILD_ONLY snowball) +endif() +if("sns" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sns) +endif() +if("sqs" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sqs) +endif() +if("ssm" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ssm) +endif() +if("ssm-contacts" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ssm-contacts) +endif() +if("ssm-incidents" IN_LIST FEATURES) + list(APPEND BUILD_ONLY ssm-incidents) +endif() +if("sso" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sso) +endif() +if("sso-admin" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sso-admin) +endif() +if("sso-oidc" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sso-oidc) +endif() +if("states" IN_LIST FEATURES) + list(APPEND BUILD_ONLY states) +endif() +if("storagegateway" IN_LIST FEATURES) + list(APPEND BUILD_ONLY storagegateway) +endif() +if("sts" IN_LIST FEATURES) + list(APPEND BUILD_ONLY sts) +endif() +if("support" IN_LIST FEATURES) + list(APPEND BUILD_ONLY support) +endif() +if("swf" IN_LIST FEATURES) + list(APPEND BUILD_ONLY swf) +endif() +if("synthetics" IN_LIST FEATURES) + list(APPEND BUILD_ONLY synthetics) +endif() +if("text-to-speech" IN_LIST FEATURES) + list(APPEND BUILD_ONLY text-to-speech) +endif() +if("textract" IN_LIST FEATURES) + list(APPEND BUILD_ONLY textract) +endif() +if("timestream-query" IN_LIST FEATURES) + list(APPEND BUILD_ONLY timestream-query) +endif() +if("timestream-write" IN_LIST FEATURES) + list(APPEND BUILD_ONLY timestream-write) +endif() +if("transcribe" IN_LIST FEATURES) + list(APPEND BUILD_ONLY transcribe) +endif() +if("transcribestreaming" IN_LIST FEATURES) + list(APPEND BUILD_ONLY transcribestreaming) +endif() +if("transfer" IN_LIST FEATURES) + list(APPEND BUILD_ONLY transfer) +endif() +if("translate" IN_LIST FEATURES) + list(APPEND BUILD_ONLY translate) +endif() +if("waf" IN_LIST FEATURES) + list(APPEND BUILD_ONLY waf) +endif() +if("waf-regional" IN_LIST FEATURES) + list(APPEND BUILD_ONLY waf-regional) +endif() +if("wafv2" IN_LIST FEATURES) + list(APPEND BUILD_ONLY wafv2) +endif() +if("wellarchitected" IN_LIST FEATURES) + list(APPEND BUILD_ONLY wellarchitected) +endif() +if("workdocs" IN_LIST FEATURES) + list(APPEND BUILD_ONLY workdocs) +endif() +if("worklink" IN_LIST FEATURES) + list(APPEND BUILD_ONLY worklink) +endif() +if("workmail" IN_LIST FEATURES) + list(APPEND BUILD_ONLY workmail) +endif() +if("workmailmessageflow" IN_LIST FEATURES) + list(APPEND BUILD_ONLY workmailmessageflow) +endif() +if("workspaces" IN_LIST FEATURES) + list(APPEND BUILD_ONLY workspaces) +endif() +if("xray" IN_LIST FEATURES) + list(APPEND BUILD_ONLY xray) +endif() diff --git a/externals/vcpkg/ports/aws-sdk-cpp/fix-aws-root.patch b/externals/vcpkg/ports/aws-sdk-cpp/fix-aws-root.patch new file mode 100755 index 000000000..da4365ad7 --- /dev/null +++ b/externals/vcpkg/ports/aws-sdk-cpp/fix-aws-root.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake +--- a/cmake/AWSSDKConfig.cmake (revision 2f90f9fd6c56460bd382243aa215fcddcb5883c8) ++++ b/cmake/AWSSDKConfig.cmake (date 1636913220527) +@@ -54,18 +54,14 @@ + string(REPLACE ";" "${AWS_MODULE_DIR};" SYSTEM_MODULE_PATH "${CMAKE_SYSTEM_PREFIX_PATH}${AWS_MODULE_DIR}") + list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH} ${SYSTEM_MODULE_PATH}) + +-# On Windows, dlls are treated as runtime target and installed in bindir + if (WIN32 AND AWSSDK_INSTALL_AS_SHARED_LIBS) +- set(AWSSDK_INSTALL_LIBDIR "${AWSSDK_INSTALL_BINDIR}") + # If installed CMake scripts are associated with dll library, define USE_IMPORT_EXPORT for customers + add_definitions(-DUSE_IMPORT_EXPORT) + endif() + + + # Compute the default installation root relative to this file. +-# from prefix/lib/cmake/AWSSDK/xx.cmake to prefix + get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +-get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH) + get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH) + get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH) + get_filename_component(AWS_NATIVE_SDK_ROOT "${CMAKE_CURRENT_SOURCE_DIR}" ABSOLUTE) diff --git a/externals/vcpkg/ports/aws-sdk-cpp/fix-openssl3.patch b/externals/vcpkg/ports/aws-sdk-cpp/fix-openssl3.patch new file mode 100755 index 000000000..bd7967892 --- /dev/null +++ b/externals/vcpkg/ports/aws-sdk-cpp/fix-openssl3.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/compiler_settings.cmake b/cmake/compiler_settings.cmake +index cae5b92248..1aa728b01c 100644 +--- a/cmake/compiler_settings.cmake ++++ b/cmake/compiler_settings.cmake +@@ -53,7 +53,7 @@ macro(set_gcc_flags) + endmacro() + + macro(set_gcc_warnings) +- list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-Werror" "-pedantic" "-Wextra") ++ list(APPEND AWS_COMPILER_WARNINGS "-Wno-deprecated-declarations" "-Wall" "-Werror" "-pedantic" "-Wextra") + if(COMPILER_CLANG) + if(PLATFORM_ANDROID) + # when using clang with libc and API lower than 21 we need to include Android support headers and ignore the gnu-include-next warning. diff --git a/externals/vcpkg/ports/aws-sdk-cpp/generateFeatures.ps1 b/externals/vcpkg/ports/aws-sdk-cpp/generateFeatures.ps1 new file mode 100755 index 000000000..89265ddbd --- /dev/null +++ b/externals/vcpkg/ports/aws-sdk-cpp/generateFeatures.ps1 @@ -0,0 +1,73 @@ +[CmdletBinding()] +param( + [Parameter(Mandatory=$true)][string]$SourcesRef, + [Parameter(Mandatory=$false)][string]$PortDirectory = $PSScriptRoot, + [Parameter(Mandatory=$false)][string]$vcpkg = "$PSScriptRoot/../../vcpkg" +) + +$ErrorActionPreference = "Stop" + +$ManifestIn = "$PortDirectory/vcpkg.in.json" +$ManifestOut = "$PortDirectory/vcpkg.json" +$CMakeFragmentFile = "$PortDirectory/compute_build_only.cmake" + +$ExtractedSources = "${env:TEMP}/aws-sdk-cpp-generateFeatures-$SourcesRef" +if (-not (Test-Path $ExtractedSources)) { + if (Test-Path "$ExtractedSources.tmp") { + Remove-Item -Force "$ExtractedSources.tmp" + } + git clone "https://github.com/aws/aws-sdk-cpp" "$ExtractedSources.tmp" | Out-Host + git -c "$ExtractedSources.tmp" checkout $SourcesRef + Move-Item "$ExtractedSources.tmp" "$ExtractedSources" +} +Write-Host "Using sources directory: $ExtractedSources" + + +$subfolders = Get-Item $ExtractedSources\aws-cpp-sdk-* + +$manifest = Get-Content $ManifestIn | ConvertFrom-Json +$manifest | Add-Member ` + -NotePropertyName '$note' ` + -NotePropertyValue 'Automatically generated by generateFeatures.ps1' +$manifest | Add-Member -NotePropertyName 'features' -NotePropertyValue @{} + +$cmakefragmenttext = @("# Automatically generated by generateFeatures.ps1") + +function GetDescription($dir, $modulename) +{ + if (Test-Path "$dir\CMakeLists.txt") + { + $descs = @(Select-String -Path "$dir\CMakeLists.txt" -Pattern "`"C\+\+ SDK for the AWS [^`"]*`"") + if ($descs.count -eq 1) { + $desc = $descs[0].Matches.Value -replace "`"","" + "$desc" + } + else { "C++ SDK for the AWS $modulename service" } + } + else { "C++ SDK for the AWS $modulename service" } +} + +foreach ($subfolder in $subfolders) +{ + $modulename = $subfolder.name -replace "^aws-cpp-sdk-","" + if ($modulename -match "-tests`$") { continue } + if ($modulename -match "-sample`$") { continue } + if ($modulename -eq "core") { continue } + + $lowermodulename = $modulename.ToLower() + + $manifest.features.Add("$lowermodulename", @{ description=(GetDescription $subfolder $modulename) }) + + $cmakefragmenttext += @( + "if(`"$lowermodulename`" IN_LIST FEATURES)", + " list(APPEND BUILD_ONLY $modulename)", + "endif()" + ) +} + +[IO.File]::WriteAllText($ManifestOut, (ConvertTo-Json -Depth 5 -InputObject $manifest)) + +Write-Verbose ($cmakefragmenttext -join "`n") +[IO.File]::WriteAllText($CMakeFragmentFile, ($cmakefragmenttext -join "`n") +"`n") + +& $vcpkg format-manifest --feature-flags=-manifests $ManifestOut diff --git a/externals/vcpkg/ports/aws-sdk-cpp/patch-relocatable-rpath.patch b/externals/vcpkg/ports/aws-sdk-cpp/patch-relocatable-rpath.patch new file mode 100755 index 000000000..828647cc4 --- /dev/null +++ b/externals/vcpkg/ports/aws-sdk-cpp/patch-relocatable-rpath.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a653e38628..76d6067646 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -142,7 +142,6 @@ else() + endif() + + # Add Linker search paths to RPATH so as to fix the problem where some linkers can't find cross-compiled dependent libraries in customer paths when linking executables. +-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true) + + # build the sdk targets + project("aws-cpp-sdk-all" VERSION "${PROJECT_VERSION}" LANGUAGES CXX) diff --git a/externals/vcpkg/ports/aws-sdk-cpp/portfile.cmake b/externals/vcpkg/ports/aws-sdk-cpp/portfile.cmake new file mode 100755 index 000000000..35873a4c9 --- /dev/null +++ b/externals/vcpkg/ports/aws-sdk-cpp/portfile.cmake @@ -0,0 +1,100 @@ +vcpkg_buildpath_length_warning(37) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO aws/aws-sdk-cpp + REF a72b841c91bd421fbb6deb516400b51c06bc596c # 1.9.220 + SHA512 9b7fa80ee155fa3c15e3e86c30b75c6019dc1672df711c4f656133fe005f104e4a30f5a99f1c0a0c6dab42007b5695169cd312bd0938b272c4c7b05765ce3421 + PATCHES + patch-relocatable-rpath.patch + fix-aws-root.patch + fix-openssl3.patch +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT) + +set(EXTRA_ARGS) +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) + set(rpath "@loader_path") +elseif (VCPKG_TARGET_IS_ANDROID) + set(EXTRA_ARGS "-DTARGET_ARCH=ANDROID" + "-DGIT_EXECUTABLE=--invalid-git-executable--" + "-DGIT_FOUND=TRUE" + "-DNDK_DIR=$ENV{ANDROID_NDK_HOME}" + "-DANDROID_BUILD_ZLIB=FALSE" + "-DANDROID_BUILD_CURL=FALSE" + "-DANDROID_BUILD_OPENSSL=FALSE" + ) +else() + set(rpath "\$ORIGIN") +endif() + +set(BUILD_ONLY core) +include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + ${EXTRA_ARGS} + "-DENABLE_UNITY_BUILD=ON" + "-DENABLE_TESTING=OFF" + "-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}" + "-DBUILD_ONLY=${BUILD_ONLY}" + "-DBUILD_DEPS=OFF" + "-DBUILD_SHARED_LIBS=OFF" + "-DCMAKE_INSTALL_RPATH=${rpath}" + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files +) +vcpkg_cmake_install() + +foreach(TARGET IN LISTS BUILD_ONLY) + vcpkg_cmake_config_fixup(PACKAGE_NAME "aws-cpp-sdk-${TARGET}" CONFIG_PATH "lib/cmake/aws-cpp-sdk-${TARGET}" DO_NOT_DELETE_PARENT_CONFIG_PATH) +endforeach() +vcpkg_cmake_config_fixup(PACKAGE_NAME "AWSSDK" CONFIG_PATH "lib/cmake/AWSSDK") + +vcpkg_copy_pdbs() + +file(GLOB_RECURSE AWS_TARGETS "${CURRENT_PACKAGES_DIR}/share/*/*-targets-*.cmake") +foreach(AWS_TARGET IN LISTS AWS_TARGETS) + file(READ ${AWS_TARGET} _contents) + string(REGEX REPLACE + "bin\\/([A-Za-z0-9_.-]+\\.lib)" + "lib/\\1" + _contents "${_contents}") + file(WRITE ${AWS_TARGET} "${_contents}") +endforeach() + +file(GLOB AWS_CONFIGS "${CURRENT_PACKAGES_DIR}/share/*/aws-cpp-sdk-*-config.cmake") +list(FILTER AWS_CONFIGS EXCLUDE REGEX "aws-cpp-sdk-core-config\\.cmake\$") +foreach(AWS_CONFIG IN LISTS AWS_CONFIGS) + file(READ "${AWS_CONFIG}" _contents) + file(WRITE "${AWS_CONFIG}" "include(CMakeFindDependencyMacro)\nfind_dependency(aws-cpp-sdk-core)\n${_contents}") +endforeach() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" + "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" + "${CURRENT_PACKAGES_DIR}/nuget" + "${CURRENT_PACKAGES_DIR}/debug/nuget" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(GLOB LIB_FILES ${CURRENT_PACKAGES_DIR}/bin/*.lib) + if(LIB_FILES) + file(COPY ${LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(REMOVE ${LIB_FILES}) + endif() + file(GLOB DEBUG_LIB_FILES ${CURRENT_PACKAGES_DIR}/debug/bin/*.lib) + if(DEBUG_LIB_FILES) + file(COPY ${DEBUG_LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(REMOVE ${DEBUG_LIB_FILES}) + endif() + + file(APPEND "${CURRENT_PACKAGES_DIR}/include/aws/core/SDKConfig.h" "#ifndef USE_IMPORT_EXPORT\n#define USE_IMPORT_EXPORT\n#endif") +endif() + +configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/aws-sdk-cpp/usage b/externals/vcpkg/ports/aws-sdk-cpp/usage new file mode 100755 index 000000000..c526d2c45 --- /dev/null +++ b/externals/vcpkg/ports/aws-sdk-cpp/usage @@ -0,0 +1,12 @@ +The package @PORT@:@TARGET_TRIPLET@ provides CMake targets: + + When using AWSSDK, AWSSDK_ROOT_DIR must be defined by the user. + find_package(AWSSDK CONFIG COMPONENTS core dynamodb kinesis s3 REQUIRED) + target_include_directories(main PRIVATE ${AWSSDK_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${AWSSDK_LIBRARIES}) + + OR + + find_package(aws-cpp-sdk-core REQUIRED) + target_include_directories(main PRIVATE aws-cpp-sdk-core) + target_link_libraries(main PRIVATE aws-cpp-sdk-core) diff --git a/externals/vcpkg/ports/aws-sdk-cpp/vcpkg.json b/externals/vcpkg/ports/aws-sdk-cpp/vcpkg.json new file mode 100755 index 000000000..7931c10a5 --- /dev/null +++ b/externals/vcpkg/ports/aws-sdk-cpp/vcpkg.json @@ -0,0 +1,870 @@ +{ + "$note": "Automatically generated by generateFeatures.ps1", + "name": "aws-sdk-cpp", + "version": "1.9.220", + "port-version": 1, + "description": "AWS SDK for C++", + "homepage": "https://github.com/aws/aws-sdk-cpp", + "supports": "!(windows & arm) & !uwp", + "dependencies": [ + "aws-crt-cpp", + { + "name": "curl", + "platform": "!uwp & !windows" + }, + { + "name": "openssl", + "platform": "!uwp & !windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "default-features": [ + "dynamodb", + "kinesis", + "s3" + ], + "features": { + "access-management": { + "description": "C++ SDK for the AWS access-management service" + }, + "accessanalyzer": { + "description": "C++ SDK for the AWS accessanalyzer service" + }, + "acm": { + "description": "C++ SDK for the AWS acm service" + }, + "acm-pca": { + "description": "C++ SDK for the AWS acm-pca service" + }, + "alexaforbusiness": { + "description": "C++ SDK for the AWS alexaforbusiness service" + }, + "amp": { + "description": "C++ SDK for the AWS amp service" + }, + "amplify": { + "description": "C++ SDK for the AWS amplify service" + }, + "amplifybackend": { + "description": "C++ SDK for the AWS amplifybackend service" + }, + "apigateway": { + "description": "C++ SDK for the AWS apigateway service" + }, + "apigatewaymanagementapi": { + "description": "C++ SDK for the AWS apigatewaymanagementapi service" + }, + "apigatewayv2": { + "description": "C++ SDK for the AWS apigatewayv2 service" + }, + "appconfig": { + "description": "C++ SDK for the AWS appconfig service" + }, + "appflow": { + "description": "C++ SDK for the AWS appflow service" + }, + "appintegrations": { + "description": "C++ SDK for the AWS appintegrations service" + }, + "application-autoscaling": { + "description": "C++ SDK for the AWS application-autoscaling service" + }, + "application-insights": { + "description": "C++ SDK for the AWS application-insights service" + }, + "applicationcostprofiler": { + "description": "C++ SDK for the AWS applicationcostprofiler service" + }, + "appmesh": { + "description": "C++ SDK for the AWS appmesh service" + }, + "apprunner": { + "description": "C++ SDK for the AWS apprunner service" + }, + "appstream": { + "description": "C++ SDK for the AWS appstream service" + }, + "appsync": { + "description": "C++ SDK for the AWS appsync service" + }, + "athena": { + "description": "C++ SDK for the AWS athena service" + }, + "auditmanager": { + "description": "C++ SDK for the AWS auditmanager service" + }, + "autoscaling": { + "description": "C++ SDK for the AWS autoscaling service" + }, + "autoscaling-plans": { + "description": "C++ SDK for the AWS autoscaling-plans service" + }, + "awsmigrationhub": { + "description": "C++ SDK for the AWS AWSMigrationHub service" + }, + "awstransfer": { + "description": "C++ SDK for the AWS awstransfer service" + }, + "backup": { + "description": "C++ SDK for the AWS backup service" + }, + "batch": { + "description": "C++ SDK for the AWS batch service" + }, + "braket": { + "description": "C++ SDK for the AWS braket service" + }, + "budgets": { + "description": "C++ SDK for the AWS budgets service" + }, + "ce": { + "description": "C++ SDK for the AWS ce service" + }, + "chime": { + "description": "C++ SDK for the AWS chime service" + }, + "cloud9": { + "description": "C++ SDK for the AWS cloud9 service" + }, + "clouddirectory": { + "description": "C++ SDK for the AWS clouddirectory service" + }, + "cloudformation": { + "description": "C++ SDK for the AWS cloudformation service" + }, + "cloudfront": { + "description": "C++ SDK for the AWS cloudfront service" + }, + "cloudhsm": { + "description": "C++ SDK for the AWS cloudhsm service" + }, + "cloudhsmv2": { + "description": "C++ SDK for the AWS cloudhsmv2 service" + }, + "cloudsearch": { + "description": "C++ SDK for the AWS cloudsearch service" + }, + "cloudsearchdomain": { + "description": "C++ SDK for the AWS cloudsearchdomain service" + }, + "cloudtrail": { + "description": "C++ SDK for the AWS cloudtrail service" + }, + "codeartifact": { + "description": "C++ SDK for the AWS codeartifact service" + }, + "codebuild": { + "description": "C++ SDK for the AWS codebuild service" + }, + "codecommit": { + "description": "C++ SDK for the AWS codecommit service" + }, + "codedeploy": { + "description": "C++ SDK for the AWS codedeploy service" + }, + "codeguru-reviewer": { + "description": "C++ SDK for the AWS codeguru-reviewer service" + }, + "codeguruprofiler": { + "description": "C++ SDK for the AWS codeguruprofiler service" + }, + "codepipeline": { + "description": "C++ SDK for the AWS codepipeline service" + }, + "codestar": { + "description": "C++ SDK for the AWS codestar service" + }, + "codestar-connections": { + "description": "C++ SDK for the AWS codestar-connections service" + }, + "codestar-notifications": { + "description": "C++ SDK for the AWS codestar-notifications service" + }, + "cognito-identity": { + "description": "C++ SDK for the AWS cognito-identity service" + }, + "cognito-idp": { + "description": "C++ SDK for the AWS cognito-idp service" + }, + "cognito-sync": { + "description": "C++ SDK for the AWS cognito-sync service" + }, + "comprehend": { + "description": "C++ SDK for the AWS comprehend service" + }, + "comprehendmedical": { + "description": "C++ SDK for the AWS comprehendmedical service" + }, + "compute-optimizer": { + "description": "C++ SDK for the AWS compute-optimizer service" + }, + "config": { + "description": "C++ SDK for the AWS config service" + }, + "connect": { + "description": "C++ SDK for the AWS connect service" + }, + "connect-contact-lens": { + "description": "C++ SDK for the AWS connect-contact-lens service" + }, + "connectparticipant": { + "description": "C++ SDK for the AWS connectparticipant service" + }, + "cur": { + "description": "C++ SDK for the AWS cur service" + }, + "customer-profiles": { + "description": "C++ SDK for the AWS customer-profiles service" + }, + "databrew": { + "description": "C++ SDK for the AWS databrew service" + }, + "dataexchange": { + "description": "C++ SDK for the AWS dataexchange service" + }, + "datapipeline": { + "description": "C++ SDK for the AWS datapipeline service" + }, + "datasync": { + "description": "C++ SDK for the AWS datasync service" + }, + "dax": { + "description": "C++ SDK for the AWS dax service" + }, + "detective": { + "description": "C++ SDK for the AWS detective service" + }, + "devicefarm": { + "description": "C++ SDK for the AWS devicefarm service" + }, + "devops-guru": { + "description": "C++ SDK for the AWS devops-guru service" + }, + "directconnect": { + "description": "C++ SDK for the AWS directconnect service" + }, + "discovery": { + "description": "C++ SDK for the AWS discovery service" + }, + "dlm": { + "description": "C++ SDK for the AWS dlm service" + }, + "dms": { + "description": "C++ SDK for the AWS dms service" + }, + "docdb": { + "description": "C++ SDK for the AWS docdb service" + }, + "ds": { + "description": "C++ SDK for the AWS ds service" + }, + "dynamodb": { + "description": "C++ SDK for the AWS dynamodb service" + }, + "dynamodbstreams": { + "description": "C++ SDK for the AWS dynamodbstreams service" + }, + "ebs": { + "description": "C++ SDK for the AWS ebs service" + }, + "ec2": { + "description": "C++ SDK for the AWS ec2 service" + }, + "ec2-instance-connect": { + "description": "C++ SDK for the AWS ec2-instance-connect service" + }, + "ecr": { + "description": "C++ SDK for the AWS ecr service" + }, + "ecr-public": { + "description": "C++ SDK for the AWS ecr-public service" + }, + "ecs": { + "description": "C++ SDK for the AWS ecs service" + }, + "eks": { + "description": "C++ SDK for the AWS eks service" + }, + "elastic-inference": { + "description": "C++ SDK for the AWS elastic-inference service" + }, + "elasticache": { + "description": "C++ SDK for the AWS elasticache service" + }, + "elasticbeanstalk": { + "description": "C++ SDK for the AWS elasticbeanstalk service" + }, + "elasticfilesystem": { + "description": "C++ SDK for the AWS elasticfilesystem service" + }, + "elasticloadbalancing": { + "description": "C++ SDK for the AWS elasticloadbalancing service" + }, + "elasticloadbalancingv2": { + "description": "C++ SDK for the AWS elasticloadbalancingv2 service" + }, + "elasticmapreduce": { + "description": "C++ SDK for the AWS elasticmapreduce service" + }, + "elastictranscoder": { + "description": "C++ SDK for the AWS elastictranscoder service" + }, + "email": { + "description": "C++ SDK for the AWS email service" + }, + "emr-containers": { + "description": "C++ SDK for the AWS emr-containers service" + }, + "es": { + "description": "C++ SDK for the AWS es service" + }, + "eventbridge": { + "description": "C++ SDK for the AWS eventbridge service" + }, + "events": { + "description": "C++ SDK for the AWS events service" + }, + "finspace": { + "description": "C++ SDK for the AWS finspace service" + }, + "finspace-data": { + "description": "C++ SDK for the AWS finspace-data service" + }, + "firehose": { + "description": "C++ SDK for the AWS firehose service" + }, + "fis": { + "description": "C++ SDK for the AWS fis service" + }, + "fms": { + "description": "C++ SDK for the AWS fms service" + }, + "forecast": { + "description": "C++ SDK for the AWS forecast service" + }, + "forecastquery": { + "description": "C++ SDK for the AWS forecastquery service" + }, + "frauddetector": { + "description": "C++ SDK for the AWS frauddetector service" + }, + "fsx": { + "description": "C++ SDK for the AWS fsx service" + }, + "gamelift": { + "description": "C++ SDK for the AWS gamelift service" + }, + "glacier": { + "description": "C++ SDK for the AWS glacier service" + }, + "globalaccelerator": { + "description": "C++ SDK for the AWS globalaccelerator service" + }, + "glue": { + "description": "C++ SDK for the AWS glue service" + }, + "greengrass": { + "description": "C++ SDK for the AWS greengrass service" + }, + "greengrassv2": { + "description": "C++ SDK for the AWS greengrassv2 service" + }, + "groundstation": { + "description": "C++ SDK for the AWS groundstation service" + }, + "guardduty": { + "description": "C++ SDK for the AWS guardduty service" + }, + "health": { + "description": "C++ SDK for the AWS health service" + }, + "healthlake": { + "description": "C++ SDK for the AWS healthlake service" + }, + "honeycode": { + "description": "C++ SDK for the AWS honeycode service" + }, + "iam": { + "description": "C++ SDK for the AWS iam service" + }, + "identity-management": { + "description": "C++ SDK for the AWS identity-management service" + }, + "identitystore": { + "description": "C++ SDK for the AWS identitystore service" + }, + "imagebuilder": { + "description": "C++ SDK for the AWS imagebuilder service" + }, + "importexport": { + "description": "C++ SDK for the AWS importexport service" + }, + "inspector": { + "description": "C++ SDK for the AWS inspector service" + }, + "iot": { + "description": "C++ SDK for the AWS iot service" + }, + "iot-data": { + "description": "C++ SDK for the AWS iot-data service" + }, + "iot-jobs-data": { + "description": "C++ SDK for the AWS iot-jobs-data service" + }, + "iot1click-devices": { + "description": "C++ SDK for the AWS iot1click-devices service" + }, + "iot1click-projects": { + "description": "C++ SDK for the AWS iot1click-projects service" + }, + "iotanalytics": { + "description": "C++ SDK for the AWS iotanalytics service" + }, + "iotdeviceadvisor": { + "description": "C++ SDK for the AWS iotdeviceadvisor service" + }, + "iotevents": { + "description": "C++ SDK for the AWS iotevents service" + }, + "iotevents-data": { + "description": "C++ SDK for the AWS iotevents-data service" + }, + "iotfleethub": { + "description": "C++ SDK for the AWS iotfleethub service" + }, + "iotsecuretunneling": { + "description": "C++ SDK for the AWS iotsecuretunneling service" + }, + "iotsitewise": { + "description": "C++ SDK for the AWS iotsitewise service" + }, + "iotthingsgraph": { + "description": "C++ SDK for the AWS iotthingsgraph service" + }, + "iotwireless": { + "description": "C++ SDK for the AWS iotwireless service" + }, + "ivs": { + "description": "C++ SDK for the AWS ivs service" + }, + "kafka": { + "description": "C++ SDK for the AWS kafka service" + }, + "kendra": { + "description": "C++ SDK for the AWS kendra service" + }, + "kinesis": { + "description": "C++ SDK for the AWS kinesis service" + }, + "kinesis-video-archived-media": { + "description": "C++ SDK for the AWS kinesis-video-archived-media service" + }, + "kinesis-video-media": { + "description": "C++ SDK for the AWS kinesis-video-media service" + }, + "kinesis-video-signaling": { + "description": "C++ SDK for the AWS kinesis-video-signaling service" + }, + "kinesisanalytics": { + "description": "C++ SDK for the AWS kinesisanalytics service" + }, + "kinesisanalyticsv2": { + "description": "C++ SDK for the AWS kinesisanalyticsv2 service" + }, + "kinesisvideo": { + "description": "C++ SDK for the AWS kinesisvideo service" + }, + "kms": { + "description": "C++ SDK for the AWS kms service" + }, + "lakeformation": { + "description": "C++ SDK for the AWS lakeformation service" + }, + "lambda": { + "description": "C++ SDK for the AWS lambda service" + }, + "lex": { + "description": "C++ SDK for the AWS lex service" + }, + "lex-models": { + "description": "C++ SDK for the AWS lex-models service" + }, + "lexv2-models": { + "description": "C++ SDK for the AWS lexv2-models service" + }, + "lexv2-runtime": { + "description": "C++ SDK for the AWS lexv2-runtime service" + }, + "license-manager": { + "description": "C++ SDK for the AWS license-manager service" + }, + "lightsail": { + "description": "C++ SDK for the AWS lightsail service" + }, + "location": { + "description": "C++ SDK for the AWS location service" + }, + "logs": { + "description": "C++ SDK for the AWS logs service" + }, + "lookoutequipment": { + "description": "C++ SDK for the AWS lookoutequipment service" + }, + "lookoutmetrics": { + "description": "C++ SDK for the AWS lookoutmetrics service" + }, + "lookoutvision": { + "description": "C++ SDK for the AWS lookoutvision service" + }, + "machinelearning": { + "description": "C++ SDK for the AWS machinelearning service" + }, + "macie": { + "description": "C++ SDK for the AWS macie service" + }, + "macie2": { + "description": "C++ SDK for the AWS macie2 service" + }, + "managedblockchain": { + "description": "C++ SDK for the AWS managedblockchain service" + }, + "marketplace-catalog": { + "description": "C++ SDK for the AWS marketplace-catalog service" + }, + "marketplace-entitlement": { + "description": "C++ SDK for the AWS marketplace-entitlement service" + }, + "marketplacecommerceanalytics": { + "description": "C++ SDK for the AWS marketplacecommerceanalytics service" + }, + "mediaconnect": { + "description": "C++ SDK for the AWS mediaconnect service" + }, + "mediaconvert": { + "description": "C++ SDK for the AWS mediaconvert service" + }, + "medialive": { + "description": "C++ SDK for the AWS medialive service" + }, + "mediapackage": { + "description": "C++ SDK for the AWS mediapackage service" + }, + "mediapackage-vod": { + "description": "C++ SDK for the AWS mediapackage-vod service" + }, + "mediastore": { + "description": "C++ SDK for the AWS mediastore service" + }, + "mediastore-data": { + "description": "C++ SDK for the AWS mediastore-data service" + }, + "mediatailor": { + "description": "C++ SDK for the AWS mediatailor service" + }, + "meteringmarketplace": { + "description": "C++ SDK for the AWS meteringmarketplace service" + }, + "mgn": { + "description": "C++ SDK for the AWS mgn service" + }, + "migrationhub-config": { + "description": "C++ SDK for the AWS migrationhub-config service" + }, + "mobile": { + "description": "C++ SDK for the AWS mobile service" + }, + "mobileanalytics": { + "description": "C++ SDK for the AWS mobileanalytics service" + }, + "monitoring": { + "description": "C++ SDK for the AWS monitoring service" + }, + "mq": { + "description": "C++ SDK for the AWS mq service" + }, + "mturk-requester": { + "description": "C++ SDK for the AWS mturk-requester service" + }, + "mwaa": { + "description": "C++ SDK for the AWS mwaa service" + }, + "neptune": { + "description": "C++ SDK for the AWS neptune service" + }, + "network-firewall": { + "description": "C++ SDK for the AWS network-firewall service" + }, + "networkmanager": { + "description": "C++ SDK for the AWS networkmanager service" + }, + "nimble": { + "description": "C++ SDK for the AWS nimble service" + }, + "opsworks": { + "description": "C++ SDK for the AWS opsworks service" + }, + "opsworkscm": { + "description": "C++ SDK for the AWS opsworkscm service" + }, + "organizations": { + "description": "C++ SDK for the AWS organizations service" + }, + "outposts": { + "description": "C++ SDK for the AWS outposts service" + }, + "personalize": { + "description": "C++ SDK for the AWS personalize service" + }, + "personalize-events": { + "description": "C++ SDK for the AWS personalize-events service" + }, + "personalize-runtime": { + "description": "C++ SDK for the AWS personalize-runtime service" + }, + "pi": { + "description": "C++ SDK for the AWS pi service" + }, + "pinpoint": { + "description": "C++ SDK for the AWS pinpoint service" + }, + "pinpoint-email": { + "description": "C++ SDK for the AWS pinpoint-email service" + }, + "polly": { + "description": "C++ SDK for the AWS polly service" + }, + "pricing": { + "description": "C++ SDK for the AWS pricing service" + }, + "qldb": { + "description": "C++ SDK for the AWS qldb service" + }, + "qldb-session": { + "description": "C++ SDK for the AWS qldb-session service" + }, + "queues": { + "description": "C++ SDK for the AWS queues service" + }, + "quicksight": { + "description": "C++ SDK for the AWS quicksight service" + }, + "ram": { + "description": "C++ SDK for the AWS ram service" + }, + "rds": { + "description": "C++ SDK for the AWS rds service" + }, + "rds-data": { + "description": "C++ SDK for the AWS rds-data service" + }, + "redshift": { + "description": "C++ SDK for the AWS redshift service" + }, + "redshift-data": { + "description": "C++ SDK for the AWS redshift-data service" + }, + "rekognition": { + "description": "C++ SDK for the AWS rekognition service" + }, + "resource-groups": { + "description": "C++ SDK for the AWS resource-groups service" + }, + "resourcegroupstaggingapi": { + "description": "C++ SDK for the AWS resourcegroupstaggingapi service" + }, + "robomaker": { + "description": "C++ SDK for the AWS robomaker service" + }, + "route53": { + "description": "C++ SDK for the AWS route53 service" + }, + "route53domains": { + "description": "C++ SDK for the AWS route53domains service" + }, + "route53resolver": { + "description": "C++ SDK for the AWS route53resolver service" + }, + "s3": { + "description": "C++ SDK for the AWS s3 service" + }, + "s3-crt": { + "description": "C++ SDK for the AWS s3-crt service" + }, + "s3-encryption": { + "description": "C++ SDK for the AWS s3-encryption service" + }, + "s3control": { + "description": "C++ SDK for the AWS s3control service" + }, + "s3outposts": { + "description": "C++ SDK for the AWS s3outposts service" + }, + "sagemaker": { + "description": "C++ SDK for the AWS sagemaker service" + }, + "sagemaker-a2i-runtime": { + "description": "C++ SDK for the AWS sagemaker-a2i-runtime service" + }, + "sagemaker-edge": { + "description": "C++ SDK for the AWS sagemaker-edge service" + }, + "sagemaker-featurestore-runtime": { + "description": "C++ SDK for the AWS sagemaker-featurestore-runtime service" + }, + "sagemaker-runtime": { + "description": "C++ SDK for the AWS sagemaker-runtime service" + }, + "savingsplans": { + "description": "C++ SDK for the AWS savingsplans service" + }, + "schemas": { + "description": "C++ SDK for the AWS schemas service" + }, + "sdb": { + "description": "C++ SDK for the AWS sdb service" + }, + "secretsmanager": { + "description": "C++ SDK for the AWS secretsmanager service" + }, + "securityhub": { + "description": "C++ SDK for the AWS securityhub service" + }, + "serverlessrepo": { + "description": "C++ SDK for the AWS serverlessrepo service" + }, + "service-quotas": { + "description": "C++ SDK for the AWS service-quotas service" + }, + "servicecatalog": { + "description": "C++ SDK for the AWS servicecatalog service" + }, + "servicecatalog-appregistry": { + "description": "C++ SDK for the AWS servicecatalog-appregistry service" + }, + "servicediscovery": { + "description": "C++ SDK for the AWS servicediscovery service" + }, + "sesv2": { + "description": "C++ SDK for the AWS sesv2 service" + }, + "shield": { + "description": "C++ SDK for the AWS shield service" + }, + "signer": { + "description": "C++ SDK for the AWS signer service" + }, + "sms": { + "description": "C++ SDK for the AWS sms service" + }, + "sms-voice": { + "description": "C++ SDK for the AWS sms-voice service" + }, + "snowball": { + "description": "C++ SDK for the AWS snowball service" + }, + "sns": { + "description": "C++ SDK for the AWS sns service" + }, + "sqs": { + "description": "C++ SDK for the AWS sqs service" + }, + "ssm": { + "description": "C++ SDK for the AWS ssm service" + }, + "ssm-contacts": { + "description": "C++ SDK for the AWS ssm-contacts service" + }, + "ssm-incidents": { + "description": "C++ SDK for the AWS ssm-incidents service" + }, + "sso": { + "description": "C++ SDK for the AWS sso service" + }, + "sso-admin": { + "description": "C++ SDK for the AWS sso-admin service" + }, + "sso-oidc": { + "description": "C++ SDK for the AWS sso-oidc service" + }, + "states": { + "description": "C++ SDK for the AWS states service" + }, + "storagegateway": { + "description": "C++ SDK for the AWS storagegateway service" + }, + "sts": { + "description": "C++ SDK for the AWS sts service" + }, + "support": { + "description": "C++ SDK for the AWS support service" + }, + "swf": { + "description": "C++ SDK for the AWS swf service" + }, + "synthetics": { + "description": "C++ SDK for the AWS synthetics service" + }, + "text-to-speech": { + "description": "C++ SDK for the AWS text-to-speech service" + }, + "textract": { + "description": "C++ SDK for the AWS textract service" + }, + "timestream-query": { + "description": "C++ SDK for the AWS timestream-query service" + }, + "timestream-write": { + "description": "C++ SDK for the AWS timestream-write service" + }, + "transcribe": { + "description": "C++ SDK for the AWS transcribe service" + }, + "transcribestreaming": { + "description": "C++ SDK for the AWS transcribestreaming service" + }, + "transfer": { + "description": "C++ SDK for the AWS transfer service" + }, + "translate": { + "description": "C++ SDK for the AWS translate service" + }, + "waf": { + "description": "C++ SDK for the AWS waf service" + }, + "waf-regional": { + "description": "C++ SDK for the AWS waf-regional service" + }, + "wafv2": { + "description": "C++ SDK for the AWS wafv2 service" + }, + "wellarchitected": { + "description": "C++ SDK for the AWS wellarchitected service" + }, + "workdocs": { + "description": "C++ SDK for the AWS workdocs service" + }, + "worklink": { + "description": "C++ SDK for the AWS worklink service" + }, + "workmail": { + "description": "C++ SDK for the AWS workmail service" + }, + "workmailmessageflow": { + "description": "C++ SDK for the AWS workmailmessageflow service" + }, + "workspaces": { + "description": "C++ SDK for the AWS workspaces service" + }, + "xray": { + "description": "C++ SDK for the AWS xray service" + } + } +} diff --git a/externals/vcpkg/ports/azmq/portfile.cmake b/externals/vcpkg/ports/azmq/portfile.cmake new file mode 100755 index 000000000..c2d333f60 --- /dev/null +++ b/externals/vcpkg/ports/azmq/portfile.cmake @@ -0,0 +1,13 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO zeromq/azmq + REF 6bb101eecb357ad9735ebc36e276b7526652d42d # commit on 2019-05-01 + SHA512 18812fd73c3c57aca8b17c2df0af01afb7864253d6ac6ce042e01ef04e81dd454438c9d01f5bb0fd7a4a445082a2eb3dd334ca1e05dafbe4ba602cad95ce7134 + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/azmq DESTINATION ${CURRENT_PACKAGES_DIR}/include/) + +file(INSTALL + ${SOURCE_PATH}/LICENSE-BOOST_1_0 + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/azmq/vcpkg.json b/externals/vcpkg/ports/azmq/vcpkg.json new file mode 100755 index 000000000..6344423fa --- /dev/null +++ b/externals/vcpkg/ports/azmq/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "azmq", + "version-string": "2020-03-03", + "port-version": 1, + "description": [ + "Boost Asio style bindings for ZeroMQ", + "This library is built on top of ZeroMQ's standard C interface and is intended to work well with C++ applications which use the Boost libraries in general, and Asio in particular.", + "The main abstraction exposed by the library is azmq::socket which provides an Asio style socket interface to the underlying zeromq socket and interfaces with Asio's io_service(). The socket implementation participates in the io_service's reactor for asynchronous IO and may be freely mixed with other Asio socket types (raw TCP/UDP/Serial/etc.)." + ], + "homepage": "https://github.com/zeromq/azmq", + "dependencies": [ + "boost-asio", + "boost-assert", + "boost-config", + "boost-container", + "boost-format", + "boost-intrusive", + "boost-iterator", + "boost-lexical-cast", + "boost-logic", + "boost-optional", + "boost-random", + "boost-range", + "boost-regex", + "boost-system", + "boost-thread", + "boost-utility", + "zeromq" + ] +} diff --git a/externals/vcpkg/ports/azure-c-shared-utility/disable-error.patch b/externals/vcpkg/ports/azure-c-shared-utility/disable-error.patch new file mode 100755 index 000000000..b2fd2f8d2 --- /dev/null +++ b/externals/vcpkg/ports/azure-c-shared-utility/disable-error.patch @@ -0,0 +1,26 @@ +diff --git a/configs/azure_iot_build_rules.cmake b/configs/azure_iot_build_rules.cmake +index be3e14fe..aa402902 100644 +--- a/configs/azure_iot_build_rules.cmake ++++ b/configs/azure_iot_build_rules.cmake +@@ -71,8 +71,6 @@ if(MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4") + elseif(UNIX) #LINUX OR APPLE +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") + if(NOT (IN_OPENWRT OR APPLE)) + set (CMAKE_C_FLAGS "-D_POSIX_C_SOURCE=200112L ${CMAKE_C_FLAGS}") + endif() +@@ -191,12 +189,6 @@ endfunction() + IF((WIN32) AND (NOT(MINGW))) + #windows needs this define + add_definitions(-D_CRT_SECURE_NO_WARNINGS) +- # Make warning as error +- add_definitions(/WX) +-ELSE() +- # Make warning as error +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") + ENDIF() + + diff --git a/externals/vcpkg/ports/azure-c-shared-utility/fix-install-location-preview.patch b/externals/vcpkg/ports/azure-c-shared-utility/fix-install-location-preview.patch new file mode 100755 index 000000000..41162fd2e --- /dev/null +++ b/externals/vcpkg/ports/azure-c-shared-utility/fix-install-location-preview.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 25bbf383..31ca2da2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -678,7 +678,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR) + set(CMAKE_INSTALL_LIBDIR "lib") + endif() + +-set(package_location "cmake") ++set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + + if(${build_as_dynamic}) + set(targets aziotsharedutil aziotsharedutil_dll) diff --git a/externals/vcpkg/ports/azure-c-shared-utility/fix-install-location.patch b/externals/vcpkg/ports/azure-c-shared-utility/fix-install-location.patch new file mode 100755 index 000000000..56d5b363e --- /dev/null +++ b/externals/vcpkg/ports/azure-c-shared-utility/fix-install-location.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index deeaae7d..c0c84275 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -689,7 +689,7 @@ install (TARGETS ${targets} EXPORT aziotsharedutilTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot + ) +-install (FILES ${source_h_files} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azure_c_shared_utility) ++install (FILES ${source_h_files} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot/azure_c_shared_utility) + install (FILES ${micromock_h_files_full_path} ${INSTALL_H_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot) + + diff --git a/externals/vcpkg/ports/azure-c-shared-utility/fix-utilityFunctions-conditions-preview.patch b/externals/vcpkg/ports/azure-c-shared-utility/fix-utilityFunctions-conditions-preview.patch new file mode 100755 index 000000000..c89d92f58 --- /dev/null +++ b/externals/vcpkg/ports/azure-c-shared-utility/fix-utilityFunctions-conditions-preview.patch @@ -0,0 +1,248 @@ +diff --git a/configs/azure_c_shared_utilityFunctions.cmake b/configs/azure_c_shared_utilityFunctions.cmake +index e85defa..7f450ab 100644 +--- a/configs/azure_c_shared_utilityFunctions.cmake ++++ b/configs/azure_c_shared_utilityFunctions.cmake +@@ -2,11 +2,11 @@ + #Licensed under the MIT license. See LICENSE file in the project root for full license information. + + function(target_link_libraries_with_arg_prefix arg_prefix whatIsBuilding lib) +- if(${arg_prefix} STREQUAL "debug") ++ if(arg_prefix STREQUAL "debug") + target_link_libraries(${whatIsBuilding} debug ${lib}) +- elseif(${arg_prefix} STREQUAL "optimized") ++ elseif(arg_prefix STREQUAL "optimized") + target_link_libraries(${whatIsBuilding} optimized ${lib}) +- elseif(${arg_prefix} STREQUAL "general") ++ elseif(arg_prefix STREQUAL "general") + target_link_libraries(${whatIsBuilding} general ${lib}) + else() + target_link_libraries(${whatIsBuilding} ${lib}) +@@ -43,13 +43,13 @@ function(windows_unittests_add_dll whatIsBuilding) + set(ARG_PREFIX "none") + foreach(f ${ARGN}) + set(skip_to_next FALSE) +- if(${f} STREQUAL "ADDITIONAL_LIBS") ++ if(f STREQUAL "ADDITIONAL_LIBS") + SET(PARSING_ADDITIONAL_LIBS ON) + SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF) + set(ARG_PREFIX "none") + #also unset all the other states + set(skip_to_next TRUE) +- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE") ++ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE") + SET(PARSING_ADDITIONAL_LIBS OFF) + SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON) + set(skip_to_next TRUE) +@@ -57,7 +57,7 @@ function(windows_unittests_add_dll whatIsBuilding) + + if(NOT skip_to_next) + if(PARSING_ADDITIONAL_LIBS) +- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general")) ++ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general")) + SET(ARG_PREFIX ${f}) + else() + target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_dll ${f}) +@@ -90,13 +90,13 @@ function(windows_unittests_add_exe whatIsBuilding) + set(ARG_PREFIX "none") + foreach(f ${ARGN}) + set(skip_to_next FALSE) +- if(${f} STREQUAL "ADDITIONAL_LIBS") ++ if(f STREQUAL "ADDITIONAL_LIBS") + SET(PARSING_ADDITIONAL_LIBS ON) + SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF) + set(ARG_PREFIX "none") + #also unset all the other states + set(skip_to_next TRUE) +- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE") ++ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE") + SET(PARSING_ADDITIONAL_LIBS OFF) + SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON) + set(skip_to_next TRUE) +@@ -104,7 +104,7 @@ function(windows_unittests_add_exe whatIsBuilding) + + if(NOT skip_to_next) + if(PARSING_ADDITIONAL_LIBS) +- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general")) ++ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general")) + SET(ARG_PREFIX ${f}) + else() + target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f}) +@@ -150,14 +150,14 @@ function(linux_unittests_add_exe whatIsBuilding) + set(ARG_PREFIX "none") + foreach(f ${ARGN}) + set(skip_to_next FALSE) +- if(${f} STREQUAL "ADDITIONAL_LIBS") ++ if(f STREQUAL "ADDITIONAL_LIBS") + SET(PARSING_ADDITIONAL_LIBS ON) + SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF) + set(ARG_PREFIX "none") + set(skip_to_next TRUE) + #also unset all the other states + +- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE") ++ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE") + SET(PARSING_ADDITIONAL_LIBS OFF) + SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON) + set(skip_to_next TRUE) +@@ -165,7 +165,7 @@ function(linux_unittests_add_exe whatIsBuilding) + + if(NOT skip_to_next) + if(PARSING_ADDITIONAL_LIBS) +- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general")) ++ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general")) + SET(ARG_PREFIX ${f}) + else() + target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f}) +@@ -184,7 +184,7 @@ function(linux_unittests_add_exe whatIsBuilding) + + if(${run_valgrind}) + find_program(VALGRIND_FOUND NAMES valgrind) +- if(${VALGRIND_FOUND} STREQUAL VALGRIND_FOUND-NOTFOUND) ++ if(VALGRIND_FOUND STREQUAL VALGRIND_FOUND-NOTFOUND) + message(WARNING "run_valgrind was TRUE, but valgrind was not found - there will be no tests run under valgrind") + else() + add_test(NAME ${whatIsBuilding}_valgrind COMMAND valgrind --num-callers=100 --error-exitcode=1 --leak-check=full --track-origins=yes ${VALGRIND_SUPPRESSIONS_FILE_EXTRA_PARAMETER} $) +@@ -307,13 +307,13 @@ function(c_windows_unittests_add_dll whatIsBuilding folder) + set(ARG_PREFIX "none") + foreach(f ${ARGN}) + set(skip_to_next FALSE) +- if(${f} STREQUAL "ADDITIONAL_LIBS") ++ if(f STREQUAL "ADDITIONAL_LIBS") + SET(PARSING_ADDITIONAL_LIBS ON) + SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF) + set(ARG_PREFIX "none") + #also unset all the other states + set(skip_to_next TRUE) +- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE") ++ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE") + SET(PARSING_ADDITIONAL_LIBS OFF) + SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON) + set(skip_to_next TRUE) +@@ -321,7 +321,7 @@ function(c_windows_unittests_add_dll whatIsBuilding folder) + + if(NOT skip_to_next) + if(PARSING_ADDITIONAL_LIBS) +- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general")) ++ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general")) + SET(ARG_PREFIX ${f}) + else() + target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_dll ${f}) +@@ -369,13 +369,13 @@ function(c_windows_unittests_add_exe whatIsBuilding folder) + set(ARG_PREFIX "none") + foreach(f ${ARGN}) + set(skip_to_next FALSE) +- if(${f} STREQUAL "ADDITIONAL_LIBS") ++ if(f STREQUAL "ADDITIONAL_LIBS") + SET(PARSING_ADDITIONAL_LIBS ON) + SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF) + set(ARG_PREFIX "none") + #also unset all the other states + set(skip_to_next TRUE) +- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE") ++ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE") + SET(PARSING_ADDITIONAL_LIBS OFF) + SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON) + set(skip_to_next TRUE) +@@ -383,7 +383,7 @@ function(c_windows_unittests_add_exe whatIsBuilding folder) + + if(NOT skip_to_next) + if(PARSING_ADDITIONAL_LIBS) +- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general")) ++ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general")) + SET(ARG_PREFIX ${f}) + else() + target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f}) +@@ -429,13 +429,13 @@ function(c_linux_unittests_add_exe whatIsBuilding folder) + set(ARG_PREFIX "none") + foreach(f ${ARGN}) + set(skip_to_next FALSE) +- if(${f} STREQUAL "ADDITIONAL_LIBS") ++ if(f STREQUAL "ADDITIONAL_LIBS") + SET(PARSING_ADDITIONAL_LIBS ON) + SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF) + set(ARG_PREFIX "none") + #also unset all the other states + set(skip_to_next TRUE) +- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE") ++ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE") + SET(PARSING_ADDITIONAL_LIBS OFF) + SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON) + set(skip_to_next TRUE) +@@ -443,7 +443,7 @@ function(c_linux_unittests_add_exe whatIsBuilding folder) + + if(NOT skip_to_next) + if(PARSING_ADDITIONAL_LIBS) +- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general")) ++ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general")) + SET(ARG_PREFIX ${f}) + else() + target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f}) +@@ -462,7 +462,7 @@ function(c_linux_unittests_add_exe whatIsBuilding folder) + + if(${run_valgrind}) + find_program(VALGRIND_FOUND NAMES valgrind) +- if(${VALGRIND_FOUND} STREQUAL VALGRIND_FOUND-NOTFOUND) ++ if(VALGRIND_FOUND STREQUAL VALGRIND_FOUND-NOTFOUND) + message(WARNING "run_valgrind was TRUE, but valgrind was not found - there will be no tests run under valgrind") + else() + add_test(NAME ${whatIsBuilding}_valgrind COMMAND valgrind --gen-suppressions=all --num-callers=100 --error-exitcode=1 --leak-check=full --track-origins=yes ${VALGRIND_SUPPRESSIONS_FILE_EXTRA_PARAMETER} $) +@@ -546,29 +546,29 @@ function(compile_c_test_artifacts_as whatIsBuilding compileAsWhat) + (("${whatIsBuilding}" MATCHES ".*int.*") AND ${run_int_tests}) + ) + if (${use_cppunittest}) +- if(${compileAsWhat} STREQUAL "C99") ++ if(compileAsWhat STREQUAL "C99") + compileTargetAsC99(${whatIsBuilding}_dll) + compileTargetAsC99(${whatIsBuilding}_testsonly_lib) + endif() +- if(${compileAsWhat} STREQUAL "C11") ++ if(compileAsWhat STREQUAL "C11") + compileTargetAsC11(${whatIsBuilding}_dll) + compileTargetAsC11(${whatIsBuilding}_testsonly_lib) + endif() + endif() +- if(${compileAsWhat} STREQUAL "C99") ++ if(compileAsWhat STREQUAL "C99") + compileTargetAsC99(${whatIsBuilding}_exe) + endif() +- if(${compileAsWhat} STREQUAL "C11") ++ if(compileAsWhat STREQUAL "C11") + compileTargetAsC11(${whatIsBuilding}_exe) + endif() + else() + if( + (("${whatIsBuilding}" MATCHES ".*e2e.*") AND ${nuget_e2e_tests}) + ) +- if(${compileAsWhat} STREQUAL "C99") ++ if(compileAsWhat STREQUAL "C99") + compileTargetAsC99(${whatIsBuilding}_exe) + endif() +- if(${compileAsWhat} STREQUAL "C11") ++ if(compileAsWhat STREQUAL "C11") + compileTargetAsC11(${whatIsBuilding}_exe) + endif() + else() +@@ -581,10 +581,10 @@ function(compile_c_test_artifacts_as whatIsBuilding compileAsWhat) + (("${whatIsBuilding}" MATCHES ".*e2e.*") AND ${run_e2e_tests}) OR + (("${whatIsBuilding}" MATCHES ".*int.*") AND ${run_int_tests}) + ) +- if(${compileAsWhat} STREQUAL "C99") ++ if(compileAsWhat STREQUAL "C99") + compileTargetAsC99(${whatIsBuilding}_exe) + endif() +- if(${compileAsWhat} STREQUAL "C11") ++ if(compileAsWhat STREQUAL "C11") + compileTargetAsC11(${whatIsBuilding}_exe) + endif() + endif() +@@ -641,8 +641,8 @@ function(set_platform_files c_shared_dir) + set(CONDITION_C_FILE ${c_shared_dir}/adapters/condition_win32.c PARENT_SCOPE) + endif() + if(use_etw) +- if(${use_etw} OR (${use_etw} STREQUAL "ON_WITH_CONSOLE")) +- if (${use_etw} STREQUAL "ON_WITH_CONSOLE") ++ if(use_etw OR (use_etw STREQUAL "ON_WITH_CONSOLE")) ++ if (use_etw STREQUAL "ON_WITH_CONSOLE") + set(XLOGGING_C_FILE ${c_shared_dir}/src/etwxlogging.c PARENT_SCOPE) + set(LOGGING_C_FILE ${c_shared_dir}/src/etwlogger_driver.c ${c_shared_dir}/src/consolelogger.c PARENT_SCOPE) + set(LOGGING_RC_FILE ${c_shared_dir}/res/etwlogger.rc CACHE INTERNAL "") diff --git a/externals/vcpkg/ports/azure-c-shared-utility/fix-utilityFunctions-conditions.patch b/externals/vcpkg/ports/azure-c-shared-utility/fix-utilityFunctions-conditions.patch new file mode 100755 index 000000000..7b60af94b --- /dev/null +++ b/externals/vcpkg/ports/azure-c-shared-utility/fix-utilityFunctions-conditions.patch @@ -0,0 +1,256 @@ +diff --git a/configs/azure_c_shared_utilityFunctions.cmake b/configs/azure_c_shared_utilityFunctions.cmake +index 6c2f415..e6133af 100644 +--- a/configs/azure_c_shared_utilityFunctions.cmake ++++ b/configs/azure_c_shared_utilityFunctions.cmake +@@ -2,11 +2,11 @@ + #Licensed under the MIT license. See LICENSE file in the project root for full license information. + + function(target_link_libraries_with_arg_prefix arg_prefix whatIsBuilding lib) +- if(${arg_prefix} STREQUAL "debug") ++ if(arg_prefix STREQUAL "debug") + target_link_libraries(${whatIsBuilding} debug ${lib}) +- elseif(${arg_prefix} STREQUAL "optimized") ++ elseif(arg_prefix STREQUAL "optimized") + target_link_libraries(${whatIsBuilding} optimized ${lib}) +- elseif(${arg_prefix} STREQUAL "general") ++ elseif(arg_prefix STREQUAL "general") + target_link_libraries(${whatIsBuilding} general ${lib}) + else() + target_link_libraries(${whatIsBuilding} ${lib}) +@@ -43,13 +43,13 @@ function(windows_unittests_add_dll whatIsBuilding) + set(ARG_PREFIX "none") + foreach(f ${ARGN}) + set(skip_to_next FALSE) +- if(${f} STREQUAL "ADDITIONAL_LIBS") ++ if(f STREQUAL "ADDITIONAL_LIBS") + SET(PARSING_ADDITIONAL_LIBS ON) + SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF) + set(ARG_PREFIX "none") + #also unset all the other states + set(skip_to_next TRUE) +- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE") ++ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE") + SET(PARSING_ADDITIONAL_LIBS OFF) + SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON) + set(skip_to_next TRUE) +@@ -57,7 +57,7 @@ function(windows_unittests_add_dll whatIsBuilding) + + if(NOT skip_to_next) + if(PARSING_ADDITIONAL_LIBS) +- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general")) ++ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general")) + SET(ARG_PREFIX ${f}) + else() + target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_dll ${f}) +@@ -90,13 +90,13 @@ function(windows_unittests_add_exe whatIsBuilding) + set(ARG_PREFIX "none") + foreach(f ${ARGN}) + set(skip_to_next FALSE) +- if(${f} STREQUAL "ADDITIONAL_LIBS") ++ if(f STREQUAL "ADDITIONAL_LIBS") + SET(PARSING_ADDITIONAL_LIBS ON) + SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF) + set(ARG_PREFIX "none") + #also unset all the other states + set(skip_to_next TRUE) +- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE") ++ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE") + SET(PARSING_ADDITIONAL_LIBS OFF) + SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON) + set(skip_to_next TRUE) +@@ -104,7 +104,7 @@ function(windows_unittests_add_exe whatIsBuilding) + + if(NOT skip_to_next) + if(PARSING_ADDITIONAL_LIBS) +- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general")) ++ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general")) + SET(ARG_PREFIX ${f}) + else() + target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f}) +@@ -150,14 +150,14 @@ function(linux_unittests_add_exe whatIsBuilding) + set(ARG_PREFIX "none") + foreach(f ${ARGN}) + set(skip_to_next FALSE) +- if(${f} STREQUAL "ADDITIONAL_LIBS") ++ if(f STREQUAL "ADDITIONAL_LIBS") + SET(PARSING_ADDITIONAL_LIBS ON) + SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF) + set(ARG_PREFIX "none") + set(skip_to_next TRUE) + #also unset all the other states + +- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE") ++ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE") + SET(PARSING_ADDITIONAL_LIBS OFF) + SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON) + set(skip_to_next TRUE) +@@ -165,7 +165,7 @@ function(linux_unittests_add_exe whatIsBuilding) + + if(NOT skip_to_next) + if(PARSING_ADDITIONAL_LIBS) +- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general")) ++ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general")) + SET(ARG_PREFIX ${f}) + else() + target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f}) +@@ -184,7 +184,7 @@ function(linux_unittests_add_exe whatIsBuilding) + + if(${run_valgrind}) + find_program(VALGRIND_FOUND NAMES valgrind) +- if(${VALGRIND_FOUND} STREQUAL VALGRIND_FOUND-NOTFOUND) ++ if(VALGRIND_FOUND STREQUAL VALGRIND_FOUND-NOTFOUND) + message(WARNING "run_valgrind was TRUE, but valgrind was not found - there will be no tests run under valgrind") + else() + add_test(NAME ${whatIsBuilding}_valgrind COMMAND valgrind --num-callers=100 --error-exitcode=1 --leak-check=full --track-origins=yes ${VALGRIND_SUPPRESSIONS_FILE_EXTRA_PARAMETER} $) +@@ -307,13 +307,13 @@ function(c_windows_unittests_add_dll whatIsBuilding folder) + set(ARG_PREFIX "none") + foreach(f ${ARGN}) + set(skip_to_next FALSE) +- if(${f} STREQUAL "ADDITIONAL_LIBS") ++ if(f STREQUAL "ADDITIONAL_LIBS") + SET(PARSING_ADDITIONAL_LIBS ON) + SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF) + set(ARG_PREFIX "none") + #also unset all the other states + set(skip_to_next TRUE) +- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE") ++ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE") + SET(PARSING_ADDITIONAL_LIBS OFF) + SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON) + set(skip_to_next TRUE) +@@ -321,7 +321,7 @@ function(c_windows_unittests_add_dll whatIsBuilding folder) + + if(NOT skip_to_next) + if(PARSING_ADDITIONAL_LIBS) +- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general")) ++ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general")) + SET(ARG_PREFIX ${f}) + else() + target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_dll ${f}) +@@ -369,13 +369,13 @@ function(c_windows_unittests_add_exe whatIsBuilding folder) + set(ARG_PREFIX "none") + foreach(f ${ARGN}) + set(skip_to_next FALSE) +- if(${f} STREQUAL "ADDITIONAL_LIBS") ++ if(f STREQUAL "ADDITIONAL_LIBS") + SET(PARSING_ADDITIONAL_LIBS ON) + SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF) + set(ARG_PREFIX "none") + #also unset all the other states + set(skip_to_next TRUE) +- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE") ++ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE") + SET(PARSING_ADDITIONAL_LIBS OFF) + SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON) + set(skip_to_next TRUE) +@@ -383,7 +383,7 @@ function(c_windows_unittests_add_exe whatIsBuilding folder) + + if(NOT skip_to_next) + if(PARSING_ADDITIONAL_LIBS) +- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general")) ++ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general")) + SET(ARG_PREFIX ${f}) + else() + target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f}) +@@ -429,13 +429,13 @@ function(c_linux_unittests_add_exe whatIsBuilding folder) + set(ARG_PREFIX "none") + foreach(f ${ARGN}) + set(skip_to_next FALSE) +- if(${f} STREQUAL "ADDITIONAL_LIBS") ++ if(f STREQUAL "ADDITIONAL_LIBS") + SET(PARSING_ADDITIONAL_LIBS ON) + SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF) + set(ARG_PREFIX "none") + #also unset all the other states + set(skip_to_next TRUE) +- elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE") ++ elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE") + SET(PARSING_ADDITIONAL_LIBS OFF) + SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON) + set(skip_to_next TRUE) +@@ -443,7 +443,7 @@ function(c_linux_unittests_add_exe whatIsBuilding folder) + + if(NOT skip_to_next) + if(PARSING_ADDITIONAL_LIBS) +- if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general")) ++ if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general")) + SET(ARG_PREFIX ${f}) + else() + target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f}) +@@ -462,7 +462,7 @@ function(c_linux_unittests_add_exe whatIsBuilding folder) + + if(${run_valgrind}) + find_program(VALGRIND_FOUND NAMES valgrind) +- if(${VALGRIND_FOUND} STREQUAL VALGRIND_FOUND-NOTFOUND) ++ if(VALGRIND_FOUND STREQUAL VALGRIND_FOUND-NOTFOUND) + message(WARNING "run_valgrind was TRUE, but valgrind was not found - there will be no tests run under valgrind") + else() + add_test(NAME ${whatIsBuilding}_valgrind COMMAND valgrind --gen-suppressions=all --num-callers=100 --error-exitcode=1 --leak-check=full --track-origins=yes ${VALGRIND_SUPPRESSIONS_FILE_EXTRA_PARAMETER} $) +@@ -546,29 +546,29 @@ function(compile_c_test_artifacts_as whatIsBuilding compileAsWhat) + (("${whatIsBuilding}" MATCHES ".*int.*") AND ${run_int_tests}) + ) + if (${use_cppunittest}) +- if(${compileAsWhat} STREQUAL "C99") ++ if(compileAsWhat STREQUAL "C99") + compileTargetAsC99(${whatIsBuilding}_dll) + compileTargetAsC99(${whatIsBuilding}_testsonly_lib) + endif() +- if(${compileAsWhat} STREQUAL "C11") ++ if(compileAsWhat STREQUAL "C11") + compileTargetAsC11(${whatIsBuilding}_dll) + compileTargetAsC11(${whatIsBuilding}_testsonly_lib) + endif() + endif() +- if(${compileAsWhat} STREQUAL "C99") ++ if(compileAsWhat STREQUAL "C99") + compileTargetAsC99(${whatIsBuilding}_exe) + endif() +- if(${compileAsWhat} STREQUAL "C11") ++ if(compileAsWhat STREQUAL "C11") + compileTargetAsC11(${whatIsBuilding}_exe) + endif() + else() + if( + (("${whatIsBuilding}" MATCHES ".*e2e.*") AND ${nuget_e2e_tests}) + ) +- if(${compileAsWhat} STREQUAL "C99") ++ if(compileAsWhat STREQUAL "C99") + compileTargetAsC99(${whatIsBuilding}_exe) + endif() +- if(${compileAsWhat} STREQUAL "C11") ++ if(compileAsWhat STREQUAL "C11") + compileTargetAsC11(${whatIsBuilding}_exe) + endif() + else() +@@ -581,10 +581,10 @@ function(compile_c_test_artifacts_as whatIsBuilding compileAsWhat) + (("${whatIsBuilding}" MATCHES ".*e2e.*") AND ${run_e2e_tests}) OR + (("${whatIsBuilding}" MATCHES ".*int.*") AND ${run_int_tests}) + ) +- if(${compileAsWhat} STREQUAL "C99") ++ if(compileAsWhat STREQUAL "C99") + compileTargetAsC99(${whatIsBuilding}_exe) + endif() +- if(${compileAsWhat} STREQUAL "C11") ++ if(compileAsWhat STREQUAL "C11") + compileTargetAsC11(${whatIsBuilding}_exe) + endif() + endif() +@@ -641,15 +641,15 @@ function(set_platform_files c_shared_dir) + set(CONDITION_C_FILE ${c_shared_dir}/adapters/condition_win32.c PARENT_SCOPE) + endif() + +- if(${use_etw} STREQUAL "OFF") ++ if(use_etw STREQUAL "OFF") + set(XLOGGING_C_FILE ${c_shared_dir}/src/xlogging.c PARENT_SCOPE) + set(LOGGING_C_FILE ${c_shared_dir}/src/consolelogger.c PARENT_SCOPE) + set(LOGGING_H_FILE ${c_shared_dir}/inc/azure_c_shared_utility/consolelogger.h PARENT_SCOPE) +- elseif(${use_etw} STREQUAL "TRACELOGGING") ++ elseif(use_etw STREQUAL "TRACELOGGING") + set(XLOGGING_C_FILE ${c_shared_dir}/src/etwxlogging.c PARENT_SCOPE) + set(LOGGING_C_FILE ${c_shared_dir}/src/etwlogger_driver.c PARENT_SCOPE) + set(LOGGING_H_FILE ${c_shared_dir}/inc/azure_c_shared_utility/etwlogger_driver.h PARENT_SCOPE) +- elseif(${use_etw} STREQUAL "TRACELOGGING_WITH_CONSOLE") ++ elseif(use_etw STREQUAL "TRACELOGGING_WITH_CONSOLE") + set(XLOGGING_C_FILE ${c_shared_dir}/src/etwxlogging.c PARENT_SCOPE) + set(LOGGING_C_FILE ${c_shared_dir}/src/etwlogger_driver.c ${c_shared_dir}/src/consolelogger.c PARENT_SCOPE) + set(LOGGING_H_FILE ${c_shared_dir}/inc/azure_c_shared_utility/etwlogger_driver.h ${c_shared_dir}/inc/azure_c_shared_utility/consolelogger.h PARENT_SCOPE) diff --git a/externals/vcpkg/ports/azure-c-shared-utility/improve-dependencies-preview.patch b/externals/vcpkg/ports/azure-c-shared-utility/improve-dependencies-preview.patch new file mode 100755 index 000000000..42fe1e658 --- /dev/null +++ b/externals/vcpkg/ports/azure-c-shared-utility/improve-dependencies-preview.patch @@ -0,0 +1,68 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 46334c1..aaeea20 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -115,7 +115,6 @@ if(${use_openssl}) + if (NOT TARGET OpenSSL::SSL OR NOT TARGET OpenSSL::Crypto OR NOT ${OPENSSL_INCLUDE_DIR}) + find_package(OpenSSL REQUIRED) + endif() +- include_directories(${OPENSSL_INCLUDE_DIR}) + endif() + + if(${use_applessl}) +@@ -521,8 +520,7 @@ if(${use_http}) + set(CURL_FIND_REQUIRED 1) + find_package_handle_standard_args(CURL DEFAULT_MSG CURL_LIBRARIES) + +- include_directories(${CURL_INCLUDE_DIRS}) +- set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${CURL_LIBRARIES}) ++ set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} CURL::libcurl) + endif(NOT use_builtin_httpapi) + endif() + endif(${use_http}) +@@ -561,7 +559,7 @@ if(${use_bearssl}) + endif() + + if(${use_openssl}) +- set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${OPENSSL_LIBRARIES}) ++ set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} OpenSSL::SSL) + if (WIN32) + set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} crypt32 ws2_32 secur32) + endif() +@@ -703,7 +701,7 @@ write_basic_package_version_file( + + configure_file("configs/${PROJECT_NAME}Config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" +- COPYONLY ++ @ONLY + ) + + install(EXPORT aziotsharedutilTargets +@@ -715,7 +713,7 @@ install(EXPORT aziotsharedutilTargets + + install( + FILES +- "configs/${PROJECT_NAME}Config.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" + "configs/${PROJECT_NAME}Functions.cmake" + "configs/azure_iot_build_rules.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake" +diff --git a/configs/azure_c_shared_utilityConfig.cmake b/configs/azure_c_shared_utilityConfig.cmake +index 52f2c7e1..11e9332b 100644 +--- a/configs/azure_c_shared_utilityConfig.cmake ++++ b/configs/azure_c_shared_utilityConfig.cmake +@@ -1,6 +1,14 @@ + #Copyright (c) Microsoft. All rights reserved. + #Licensed under the MIT license. See LICENSE file in the project root for full license information. + ++include(CMakeFindDependencyMacro) ++if("@use_openssl@") ++ find_dependency(OpenSSL) ++endif() ++if(UNIX AND NOT "@use_builtin_httpapi@") ++ find_dependency(CURL) ++endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/azure_c_shared_utilityTargets.cmake") + + get_target_property(AZURE_C_SHARED_UTILITY_INCLUDES aziotsharedutil INTERFACE_INCLUDE_DIRECTORIES) diff --git a/externals/vcpkg/ports/azure-c-shared-utility/improve-dependencies.patch b/externals/vcpkg/ports/azure-c-shared-utility/improve-dependencies.patch new file mode 100755 index 000000000..9afa24d13 --- /dev/null +++ b/externals/vcpkg/ports/azure-c-shared-utility/improve-dependencies.patch @@ -0,0 +1,67 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 46334c1..aaeea20 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -115,7 +115,6 @@ if(${use_openssl}) + if (NOT TARGET OpenSSL::SSL OR NOT TARGET OpenSSL::Crypto OR NOT ${OPENSSL_INCLUDE_DIR}) + find_package(OpenSSL REQUIRED) + endif() +- include_directories(${OPENSSL_INCLUDE_DIR}) + endif() + + if(${use_applessl}) +@@ -521,8 +520,7 @@ if(${use_http}) + set(CURL_FIND_REQUIRED 1) + find_package_handle_standard_args(CURL DEFAULT_MSG CURL_LIBRARIES) + +- include_directories(${CURL_INCLUDE_DIRS}) +- set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${CURL_LIBRARIES}) ++ set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} CURL::libcurl) + endif(NOT use_builtin_httpapi) + endif() + endif(${use_http}) +@@ -561,7 +559,7 @@ if(${use_bearssl}) + endif() + + if(${use_openssl}) +- set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${OPENSSL_LIBRARIES}) ++ set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} OpenSSL::SSL) + if (WIN32) + set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} crypt32 ws2_32 secur32) + endif() +@@ -703,7 +701,7 @@ write_basic_package_version_file( + + configure_file("configs/${PROJECT_NAME}Config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" +- COPYONLY ++ @ONLY + ) + + install(EXPORT aziotsharedutilTargets +@@ -715,7 +713,7 @@ install(EXPORT aziotsharedutilTargets + + install( + FILES +- "configs/${PROJECT_NAME}Config.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" + "configs/${PROJECT_NAME}Functions.cmake" + "configs/azure_iot_build_rules.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake" +diff --git a/configs/azure_c_shared_utilityConfig.cmake b/configs/azure_c_shared_utilityConfig.cmake +index 416dd1c..0e1e4d4 100644 +--- a/configs/azure_c_shared_utilityConfig.cmake ++++ b/configs/azure_c_shared_utilityConfig.cmake +@@ -1,8 +1,11 @@ + #Copyright (c) Microsoft. All rights reserved. + #Licensed under the MIT license. See LICENSE file in the project root for full license information. + +-if(UNIX) +- include(CMakeFindDependencyMacro) ++include(CMakeFindDependencyMacro) ++if("@use_openssl@") ++ find_dependency(OpenSSL) ++endif() ++if(UNIX AND NOT "@use_builtin_httpapi@") + find_dependency(CURL) + endif() + diff --git a/externals/vcpkg/ports/azure-c-shared-utility/openssl.patch b/externals/vcpkg/ports/azure-c-shared-utility/openssl.patch new file mode 100755 index 000000000..bdf46dd1d --- /dev/null +++ b/externals/vcpkg/ports/azure-c-shared-utility/openssl.patch @@ -0,0 +1,13 @@ +diff --git a/adapters/x509_openssl.c b/adapters/x509_openssl.c +index 5a9e5ac2..bb946c2d 100644 +--- a/adapters/x509_openssl.c ++++ b/adapters/x509_openssl.c +@@ -75,7 +75,7 @@ static int load_certificate_chain(SSL_CTX* ssl_ctx, const char* certificate) + // certificates. + + /* Codes_SRS_X509_OPENSSL_07_006: [ If successful x509_openssl_add_ecc_credentials shall to import each certificate in the cert chain. ] */ +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && (OPENSSL_VERSION_NUMBER < 0x20000000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) + SSL_CTX_clear_extra_chain_certs(ssl_ctx); + #else + if (ssl_ctx->extra_certs != NULL) diff --git a/externals/vcpkg/ports/azure-c-shared-utility/portfile.cmake b/externals/vcpkg/ports/azure-c-shared-utility/portfile.cmake new file mode 100755 index 000000000..5b9a85d1a --- /dev/null +++ b/externals/vcpkg/ports/azure-c-shared-utility/portfile.cmake @@ -0,0 +1,53 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +if("public-preview" IN_LIST FEATURES) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-c-shared-utility + REF 42574842914591aadc77701aac72f18cc72319ad + SHA512 dfe6ccede4bebdb3a39fbfea1dc55ddca57cced0d2656ee4bed1a5e5c9c434e1f2d892eb4e29bbb424cb9a02f2374a95fb9a020442bea580d39c242efad1b789 + HEAD_REF master + PATCHES + fix-install-location-preview.patch + fix-utilityFunctions-conditions-preview.patch + disable-error.patch + improve-dependencies-preview.patch + ) +else() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-c-shared-utility + REF 1a27846886a74702d409a8f0e2d77a38163cefc7 + SHA512 c30cba73692691fe1310b6180e3aeaf4d86b6276981c680cac31d605634e5dedbce3f823142dfebba4ae2f76ccead965a527d95df0e52af638a30ddec9818fbd + HEAD_REF master + PATCHES + openssl.patch + fix-install-location.patch + fix-utilityFunctions-conditions.patch + disable-error.patch + improve-dependencies.patch + ) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dskip_samples=ON + -Duse_installed_dependencies=ON + -Duse_default_uuid=ON + -Dbuild_as_dynamic=OFF + MAYBE_UNUSED_VARIABLES + build_as_dynamic +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME azure_c_shared_utility CONFIG_PATH lib/cmake/azure_c_shared_utility) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(COPY "${SOURCE_PATH}/configs/azure_iot_build_rules.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/azure-c-shared-utility/vcpkg.json b/externals/vcpkg/ports/azure-c-shared-utility/vcpkg.json new file mode 100755 index 000000000..f5f3c1abd --- /dev/null +++ b/externals/vcpkg/ports/azure-c-shared-utility/vcpkg.json @@ -0,0 +1,56 @@ +{ + "name": "azure-c-shared-utility", + "version-date": "2022-01-21", + "port-version": 3, + "description": "Azure C SDKs common code", + "homepage": "https://github.com/Azure/azure-c-shared-utility", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + "azure-macro-utils-c", + { + "name": "curl", + "platform": "linux" + }, + { + "name": "openssl", + "platform": "linux" + }, + "umock-c", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "public-preview": { + "description": "Azure C SDKs common code (public preview)", + "dependencies": [ + { + "name": "azure-macro-utils-c", + "features": [ + "public-preview" + ] + }, + { + "name": "curl", + "platform": "linux" + }, + { + "name": "openssl", + "platform": "linux" + }, + { + "name": "umock-c", + "features": [ + "public-preview" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/azure-core-cpp/portfile.cmake b/externals/vcpkg/ports/azure-core-cpp/portfile.cmake new file mode 100755 index 000000000..a7d0a06d2 --- /dev/null +++ b/externals/vcpkg/ports/azure-core-cpp/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-core_1.6.0 + SHA512 13374ddf74488c080ef19d78569961dc859cd95cb64f359e0d3a0d763a314f005a6ba51b8f8fe900a7acb3eb4b783f4570962569855f6e4839b02de4db0d026e +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + curl BUILD_TRANSPORT_CURL + winhttp BUILD_TRANSPORT_WINHTTP +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH}/sdk/core/azure-core/ + OPTIONS + ${FEATURE_OPTIONS} + -DWARNINGS_AS_ERRORS=OFF +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/azure-core-cpp/vcpkg.json b/externals/vcpkg/ports/azure-core-cpp/vcpkg.json new file mode 100755 index 000000000..c94da535b --- /dev/null +++ b/externals/vcpkg/ports/azure-core-cpp/vcpkg.json @@ -0,0 +1,76 @@ +{ + "name": "azure-core-cpp", + "version-semver": "1.6.0", + "description": [ + "Microsoft Azure Core SDK for C++", + "This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/core/azure-core", + "license": "MIT", + "dependencies": [ + { + "name": "openssl", + "platform": "!windows & !uwp", + "version>=": "1.1.1n" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "http" + ], + "features": { + "curl": { + "description": "Libcurl HTTP transport implementation", + "dependencies": [ + { + "name": "azure-core-cpp", + "default-features": false + }, + { + "name": "curl", + "default-features": false, + "features": [ + "ssl" + ] + } + ] + }, + "http": { + "description": "All HTTP transport implementations available on the platform", + "dependencies": [ + { + "name": "azure-core-cpp", + "default-features": false, + "features": [ + "curl" + ] + }, + { + "name": "azure-core-cpp", + "default-features": false, + "features": [ + "curl", + "winhttp" + ], + "platform": "windows & !uwp" + } + ] + }, + "winhttp": { + "description": "WinHTTP HTTP transport implementation", + "dependencies": [ + { + "name": "azure-core-cpp", + "default-features": false + } + ] + } + } +} diff --git a/externals/vcpkg/ports/azure-identity-cpp/portfile.cmake b/externals/vcpkg/ports/azure-identity-cpp/portfile.cmake new file mode 100755 index 000000000..a6b797a23 --- /dev/null +++ b/externals/vcpkg/ports/azure-identity-cpp/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-identity_1.2.0 + SHA512 f27adda21a7d7b687cae08bed6b9f1e7ef10a9f36a886021c939da570c01fe4ab153bbc5852280bb147c879d6cdb4361d9655656398368814f4842ebc9ddc2dc +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH}/sdk/identity/azure-identity/ + OPTIONS + -DWARNINGS_AS_ERRORS=OFF +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/azure-identity-cpp/vcpkg.json b/externals/vcpkg/ports/azure-identity-cpp/vcpkg.json new file mode 100755 index 000000000..d88dfb337 --- /dev/null +++ b/externals/vcpkg/ports/azure-identity-cpp/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "azure-identity-cpp", + "version-semver": "1.2.0", + "description": [ + "Microsoft Azure Identity SDK for C++", + "This library provides common authentication-related abstractions for Azure SDK." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/identity/azure-identity", + "license": "MIT", + "dependencies": [ + { + "name": "azure-core-cpp", + "default-features": false, + "version>=": "1.4.0" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/azure-iot-sdk-c/fix-install-location.patch b/externals/vcpkg/ports/azure-iot-sdk-c/fix-install-location.patch new file mode 100755 index 000000000..aeb0c817c --- /dev/null +++ b/externals/vcpkg/ports/azure-iot-sdk-c/fix-install-location.patch @@ -0,0 +1,40 @@ +diff --git a/provisioning_client/CMakeLists.txt b/provisioning_client/CMakeLists.txt +index 39f269d51..ff53ca32d 100644 +--- a/provisioning_client/CMakeLists.txt ++++ b/provisioning_client/CMakeLists.txt +@@ -357,7 +357,7 @@ if(${use_installed_dependencies}) + set(CMAKE_INSTALL_LIBDIR "lib") + endif() + +- install(TARGETS ${provisioning_libs} EXPORT azure_prov_sdksTargets ++ install(TARGETS ${provisioning_libs} EXPORT azure_iot_sdksTargets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +@@ -372,26 +372,6 @@ if(${use_installed_dependencies}) + VERSION ${PROV_SDK_VERSION} + COMPATIBILITY SameMajorVersion + ) +- +- configure_file("../configs/${PROJECT_NAME}Config.cmake" +- "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" +- COPYONLY +- ) +- +- install(EXPORT azure_prov_sdksTargets +- FILE +- "${PROJECT_NAME}Targets.cmake" +- DESTINATION +- ${package_location} +- ) +- +- install( +- FILES +- "../configs/${PROJECT_NAME}Config.cmake" +- "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake" +- DESTINATION +- ${package_location} +- ) + else() + # Install Provisioning libs + if(NOT DEFINED CMAKE_INSTALL_LIBDIR) diff --git a/externals/vcpkg/ports/azure-iot-sdk-c/fix-iothubclient-includes.patch b/externals/vcpkg/ports/azure-iot-sdk-c/fix-iothubclient-includes.patch new file mode 100755 index 000000000..9ccf48e5c --- /dev/null +++ b/externals/vcpkg/ports/azure-iot-sdk-c/fix-iothubclient-includes.patch @@ -0,0 +1,13 @@ +diff --git a/iothub_client/CMakeLists.txt b/iothub_client/CMakeLists.txt +index 07ab3b7..9769a08 100644 +--- a/iothub_client/CMakeLists.txt ++++ b/iothub_client/CMakeLists.txt +@@ -441,7 +441,7 @@ add_library(iothub_client + target_include_directories(iothub_client + PUBLIC + $ +- $ ++ $ + ) + applyXcodeBuildFlagsIfNeeded(iothub_client) + target_link_libraries(iothub_client ${iothub_client_libs}) diff --git a/externals/vcpkg/ports/azure-iot-sdk-c/improve-external-deps-preview.patch b/externals/vcpkg/ports/azure-iot-sdk-c/improve-external-deps-preview.patch new file mode 100755 index 000000000..8526cd6eb --- /dev/null +++ b/externals/vcpkg/ports/azure-iot-sdk-c/improve-external-deps-preview.patch @@ -0,0 +1,112 @@ +diff --git a/configs/azure_iot_sdksConfig.cmake b/configs/azure_iot_sdksConfig.cmake +index b9c62e8..edf5847 100644 +--- a/configs/azure_iot_sdksConfig.cmake ++++ b/configs/azure_iot_sdksConfig.cmake +@@ -1,5 +1,11 @@ + #Copyright (c) Microsoft. All rights reserved. + #Licensed under the MIT license. See LICENSE file in the project root for full license information. ++include(CMakeFindDependencyMacro) ++find_dependency(unofficial-parson) ++find_dependency(uamqp) ++find_dependency(uhttp) ++find_dependency(umqtt) ++find_dependency(azure_c_shared_utility) + + include("${CMAKE_CURRENT_LIST_DIR}/azure_iot_sdksTargets.cmake") + +diff --git a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt +index 33b5b8709..45ef7b87a 100644 +--- a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt ++++ b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt +@@ -31,12 +31,10 @@ set(${theseTestsName}_c_files + + set(${theseTestsName}_c_files + ../../../certs/certs.c +- ../../../deps/parson/parson.c + ) + + set(${theseTestsName}_h_files + ../../../certs/certs.h +- ../../../deps/parson/parson.h + ../common_dt_e2e/iothubclient_common_dt_e2e.h + ) + +diff --git a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt b/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt +index d05d654..5872c8d 100644 +--- a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt ++++ b/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt +@@ -31,12 +31,10 @@ set(${theseTestsName}_nuget_c_files + + set(${theseTestsName}_c_files + ../../../certs/certs.c +- ../../../deps/parson/parson.c + ) + + set(${theseTestsName}_h_files + ../../../certs/certs.h +- ../../../deps/parson/parson.h + ../common_dt_e2e/iothubclient_common_dt_e2e.h + ) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ba2f8e016..19885c8b8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -179,17 +179,6 @@ endif() + # Use solution folders. + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + +-# build the parson library for json parsing +-add_library(parson +- ./deps/parson/parson.c +- ./deps/parson/parson.h +-) +-if (MSVC) +- set_source_files_properties(../deps/parson/parson.c PROPERTIES COMPILE_FLAGS "/wd4244 /wd4232") +-endif() +-set(parson_h_install_files ./deps/parson/parson.h) +-set(parson_install_libs parson) +- + if (IN_OPENWRT) + ADD_DEFINITIONS("$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}") + INCLUDE_DIRECTORIES("$ENV{TOOLCHAIN_DIR}/usr/include" "$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}") +@@ -407,7 +396,7 @@ endif() + + if (${use_installed_dependencies}) + # Install azure_iot_sdks +- set(package_location "cmake") ++ set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + + include(CMakePackageConfigHelpers) + +@@ -422,14 +411,10 @@ if (${use_installed_dependencies}) + COPYONLY + ) + +- install(FILES ${parson_h_install_files} +- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot +- ) +- install(TARGETS ${parson_install_libs} EXPORT azure_iot_sdksTargets +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot +- ) ++ find_package(unofficial-parson REQUIRED CONFIG) ++ if(NOT TARGET parson) ++ add_library(parson ALIAS unofficial::parson::parson) ++ endif() + + install(EXPORT azure_iot_sdksTargets + FILE +@@ -446,11 +431,5 @@ if (${use_installed_dependencies}) + DESTINATION + ${package_location} + ) +-else() +- install(FILES ${parson_h_install_files} +- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot) +- install(TARGETS ${parson_install_libs} +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() + diff --git a/externals/vcpkg/ports/azure-iot-sdk-c/improve-external-deps.patch b/externals/vcpkg/ports/azure-iot-sdk-c/improve-external-deps.patch new file mode 100755 index 000000000..8f6168078 --- /dev/null +++ b/externals/vcpkg/ports/azure-iot-sdk-c/improve-external-deps.patch @@ -0,0 +1,79 @@ +diff --git a/configs/azure_iot_sdksConfig.cmake b/configs/azure_iot_sdksConfig.cmake +index b9c62e8..edf5847 100644 +--- a/configs/azure_iot_sdksConfig.cmake ++++ b/configs/azure_iot_sdksConfig.cmake +@@ -1,5 +1,11 @@ + #Copyright (c) Microsoft. All rights reserved. + #Licensed under the MIT license. See LICENSE file in the project root for full license information. ++include(CMakeFindDependencyMacro) ++find_dependency(unofficial-parson) ++find_dependency(uamqp) ++find_dependency(uhttp) ++find_dependency(umqtt) ++find_dependency(azure_c_shared_utility) + + include("${CMAKE_CURRENT_LIST_DIR}/azure_iot_sdksTargets.cmake") + +diff --git a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt +index 33b5b8709..45ef7b87a 100644 +--- a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt ++++ b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt +@@ -22,11 +22,9 @@ set(${theseTestsName}_c_files + + set(${theseTestsName}_c_files + ../../../certs/certs.c +- ../../../deps/parson/parson.c + ) + set(${theseTestsName}_h_files + ../../../certs/certs.h +- ../../../deps/parson/parson.h + ../common_dt_e2e/iothubclient_common_dt_e2e.h + ) + +diff --git a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt b/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt +index d05d654..5872c8d 100644 +--- a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt ++++ b/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt +@@ -22,12 +22,10 @@ set(${theseTestsName}_nuget_c_files + + set(${theseTestsName}_c_files + ../../../certs/certs.c +- ../../../deps/parson/parson.c + ) + + set(${theseTestsName}_h_files + ../../../certs/certs.h +- ../../../deps/parson/parson.h + ../common_dt_e2e/iothubclient_common_dt_e2e.h + ) + +diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt +index 22e24f851..7dc30beba 100644 +--- a/deps/CMakeLists.txt ++++ b/deps/CMakeLists.txt +@@ -37,5 +37,8 @@ endif() + if(NOT ${use_installed_dependencies}) + add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/parson) + else() +- find_package(parson REQUIRED CONFIG) ++ find_package(unofficial-parson REQUIRED CONFIG) ++ if(NOT TARGET parson) ++ add_library(parson ALIAS unofficial::parson::parson) ++ endif() + endif() +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b72bd41ed..b2812f1fd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -242,7 +242,10 @@ endif() + + add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/deps) + if(${use_installed_dependencies}) +- find_package(parson REQUIRED CONFIG) ++ find_package(unofficial-parson REQUIRED CONFIG) ++ if(NOT TARGET parson) ++ add_library(parson ALIAS unofficial::parson::parson) ++ endif() + endif() + + include_directories(${MACRO_UTILS_INC_FOLDER}) diff --git a/externals/vcpkg/ports/azure-iot-sdk-c/portfile.cmake b/externals/vcpkg/ports/azure-iot-sdk-c/portfile.cmake new file mode 100755 index 000000000..8edad3688 --- /dev/null +++ b/externals/vcpkg/ports/azure-iot-sdk-c/portfile.cmake @@ -0,0 +1,58 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +if("public-preview" IN_LIST FEATURES) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-iot-sdk-c + REF cb2e8d390df56ffa31d08ca0a79ab58ff96160cc + SHA512 6798b17d6768b3ccbd0eb66719b50f364cd951736eb71110e2dc9deca054a1566ff88b9e8c5e9b52536e4308cad6cd3cbebff3282c123083e3afaee5535e724b + HEAD_REF public-preview + PATCHES + improve-external-deps-preview.patch + ) +else() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-iot-sdk-c + REF 5805fb669ffe2adff021d68c62725d0bd783ac49 + SHA512 8f1aa1020f3bb8b3e801f3977d11be50fd07d961c89ac921f795ef8a99312f12e1ddb2268ce3d2fb84b6a42bb5806cde410e6b51c7c4539a9a11a9ae512dbcd1 + HEAD_REF master + PATCHES + fix-install-location.patch + improve-external-deps.patch + fix-iothubclient-includes.patch + ) +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + use-prov-client hsm_type_symm_key + use-prov-client use_prov_client +) + +file(COPY "${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake" DESTINATION "${SOURCE_PATH}/deps/azure-c-shared-utility/configs/") +file(COPY "${SOURCE_PATH}/configs/azure_iot_sdksFunctions.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cmake/azure_iot_sdks/") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} + -Dskip_samples=ON + -Duse_installed_dependencies=ON + -Duse_default_uuid=ON + -Dbuild_as_dynamic=OFF + -Duse_edge_modules=ON + -Dwarnings_as_errors=OFF + MAYBE_UNUSED_VARIABLES + build_as_dynamic + warnings_as_errors +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME azure_iot_sdks CONFIG_PATH "lib/cmake/azure_iot_sdks") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/azure-iot-sdk-c/vcpkg.json b/externals/vcpkg/ports/azure-iot-sdk-c/vcpkg.json new file mode 100755 index 000000000..eb8d7405f --- /dev/null +++ b/externals/vcpkg/ports/azure-iot-sdk-c/vcpkg.json @@ -0,0 +1,71 @@ +{ + "name": "azure-iot-sdk-c", + "version-date": "2022-01-21", + "port-version": 2, + "description": "A C99 SDK for connecting devices to Microsoft Azure IoT services", + "homepage": "https://github.com/Azure/azure-iot-sdk-c", + "license": "MIT", + "dependencies": [ + "azure-c-shared-utility", + "azure-macro-utils-c", + "azure-uamqp-c", + "azure-uhttp-c", + "azure-umqtt-c", + "parson", + "umock-c", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "public-preview": { + "description": "A version of the azure-iot-sdk-c containing public-preview features.", + "dependencies": [ + { + "name": "azure-c-shared-utility", + "features": [ + "public-preview" + ] + }, + { + "name": "azure-macro-utils-c", + "features": [ + "public-preview" + ] + }, + { + "name": "azure-uamqp-c", + "features": [ + "public-preview" + ] + }, + { + "name": "azure-uhttp-c", + "features": [ + "public-preview" + ] + }, + { + "name": "azure-umqtt-c", + "features": [ + "public-preview" + ] + }, + { + "name": "umock-c", + "features": [ + "public-preview" + ] + } + ] + }, + "use-prov-client": { + "description": "Enables device provisioning client for DPS" + } + } +} diff --git a/externals/vcpkg/ports/azure-kinect-sensor-sdk/fix-build-imgui.patch b/externals/vcpkg/ports/azure-kinect-sensor-sdk/fix-build-imgui.patch new file mode 100755 index 000000000..eb94390e6 --- /dev/null +++ b/externals/vcpkg/ports/azure-kinect-sensor-sdk/fix-build-imgui.patch @@ -0,0 +1,13 @@ +diff --git a/tools/k4aviewer/k4alogdockcontrol.cpp b/tools/k4aviewer/k4alogdockcontrol.cpp +index 4289f71..407e912 100644 +--- a/tools/k4aviewer/k4alogdockcontrol.cpp ++++ b/tools/k4aviewer/k4alogdockcontrol.cpp +@@ -161,7 +161,7 @@ K4ADockControlStatus K4ALogDockControl::Show() + + if (updated) + { +- ImGui::SetScrollHere(1.0f); ++ ImGui::SetScrollHereY(1.0f); + } + + ImGui::EndChild(); diff --git a/externals/vcpkg/ports/azure-kinect-sensor-sdk/fix-builds.patch b/externals/vcpkg/ports/azure-kinect-sensor-sdk/fix-builds.patch new file mode 100755 index 000000000..750667eef --- /dev/null +++ b/externals/vcpkg/ports/azure-kinect-sensor-sdk/fix-builds.patch @@ -0,0 +1,618 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4f002b5..d48f3f2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -27,8 +27,6 @@ option(K4A_BUILD_DOCS "Build K4A doxygen documentation" OFF) + option(K4A_MTE_VERSION "Skip FW version check" OFF) + option(K4A_SOURCE_LINK "Enable source linking on MSVC" OFF) + +-include(GitCommands) +- + # Set the project version + include(K4AProjectVersion) + +@@ -100,6 +98,43 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL + set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) + endif() + ++find_package(azure_c_shared_utility CONFIG REQUIRED) ++find_package(glfw3 CONFIG REQUIRED) ++find_package(cJSON CONFIG REQUIRED) ++find_package(GTest CONFIG REQUIRED) ++find_package(imgui CONFIG REQUIRED) ++find_package(EBML CONFIG REQUIRED) ++find_path(TURBOJPEG_INCLUDE_DIR NAMES turbojpeg.h PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" NO_DEFAULT_PATH REQUIRED) ++find_library(TURBOJPEG_LIBRARY_RELEASE NAMES turbojpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH REQUIRED) ++add_library(libjpeg-turbo::libjpeg-turbo UNKNOWN IMPORTED) ++set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${TURBOJPEG_INCLUDE_DIR}) ++set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY IMPORTED_LOCATION_RELEASE ${TURBOJPEG_LIBRARY_RELEASE}) ++if(EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib") ++ find_library(TURBOJPEG_LIBRARY_DEBUG NAMES turbojpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH REQUIRED) ++ set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY IMPORTED_LOCATION_DEBUG ${TURBOJPEG_LIBRARY_DEBUG}) ++endif() ++find_package(Matroska CONFIG REQUIRED) ++add_definitions(-DMATROSKA_VERSION=2) ++find_package(libsoundio CONFIG REQUIRED) ++if (NOT WIN32) ++ find_package(libusb CONFIG REQUIRED) ++ find_package(libuvc CONFIG REQUIRED) ++ add_library(libuvc::libuvc ALIAS LibUVC::UVCStatic) ++ find_package(OpenSSL REQUIRED) ++ find_package(ZLIB REQUIRED) ++else() ++ find_library(LibUSB libusb-1.0 REQUIRED) ++endif() ++find_package(libyuv CONFIG REQUIRED) ++find_package(spdlog CONFIG REQUIRED) ++if (BUILD_TOOLS) ++ find_package(gl3w CONFIG REQUIRED) ++endif() ++# Fix embl error ++if ("MSVC") ++add_compile_options(/wd4828 /wd4251 /wd4275) ++endif() ++ + # Find all dependencies + add_subdirectory(extern) + +@@ -161,10 +196,16 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") + endif() + endif() + +-add_subdirectory(examples) +-add_subdirectory(src) +-add_subdirectory(tests) +-add_subdirectory(tools) ++if (BUILD_EXAMPLES) ++ add_subdirectory(examples) ++endif() ++ add_subdirectory(src) ++if (WITH_TEST) ++ add_subdirectory(tests) ++endif() ++if (BUILD_TOOLS) ++ add_subdirectory(tools) ++endif() + + if (K4A_BUILD_DOCS) + find_package(Doxygen 1.8.14 EXACT) +diff --git a/examples/viewer/opengl/CMakeLists.txt b/examples/viewer/opengl/CMakeLists.txt +index 166fe2a..a3db07f 100644 +--- a/examples/viewer/opengl/CMakeLists.txt ++++ b/examples/viewer/opengl/CMakeLists.txt +@@ -14,6 +14,6 @@ add_executable(viewer_opengl + + target_link_libraries(viewer_opengl PRIVATE + k4a::k4a +- glfw::glfw ++ glfw + imgui::imgui + ${OPENGL_LIBRARIES}) +\ No newline at end of file +diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt +index cb4f7b4..3d00084 100644 +--- a/extern/CMakeLists.txt ++++ b/extern/CMakeLists.txt +@@ -1,7 +1,6 @@ + # External dependencies are pulled in via submodules. Lets make sure the user + # has updated all the submodules +-if ((NOT K4A_TURNED_ON_GIT_SUBMODULES_RECURSE) OR +- (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/azure_c_shared/src/CMakeLists.txt")) ++if (0) + find_package(Git REQUIRED QUIET) + if (Git_FOUND) + get_git_dir(${K4A_SOURCE_DIR} GIT_DIR) +@@ -57,18 +56,4 @@ endif() + # lower than CMake 3.3 + set(CMAKE_POLICY_DEFAULT_CMP0063 NEW) + +-add_subdirectory(azure_c_shared) +-add_subdirectory(cjson) +-add_subdirectory(glfw) +-add_subdirectory(googletest) +-add_subdirectory(imgui) +-add_subdirectory(libebml) +-add_subdirectory(libjpeg-turbo) +-add_subdirectory(libmatroska) +-add_subdirectory(libsoundio) +-add_subdirectory(libyuv) +-add_subdirectory(libuvc) +-add_subdirectory(spdlog) +-if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "WindowsStore") +- add_subdirectory(libusb) +-endif() ++ +diff --git a/src/allocator/CMakeLists.txt b/src/allocator/CMakeLists.txt +index 7140274..3bb6747 100644 +--- a/src/allocator/CMakeLists.txt ++++ b/src/allocator/CMakeLists.txt +@@ -11,7 +11,7 @@ target_include_directories(k4a_allocator PUBLIC + + # Dependencies of this library + target_link_libraries(k4a_allocator PUBLIC +- azure::aziotsharedutil ++ aziotsharedutil + k4ainternal::image + k4ainternal::logging) + +diff --git a/src/calibration/CMakeLists.txt b/src/calibration/CMakeLists.txt +index e96b7d0..ed69f41 100644 +--- a/src/calibration/CMakeLists.txt ++++ b/src/calibration/CMakeLists.txt +@@ -11,7 +11,7 @@ target_include_directories(k4a_calibration PUBLIC + + # Dependencies of this library + target_link_libraries(k4a_calibration PUBLIC +- cJSON::cJSON ++ cjson + k4ainternal::logging) + + # Define alias for other targets to link against +diff --git a/src/calibration/calibration.c b/src/calibration/calibration.c +index bf5f34a..d37c4e6 100644 +--- a/src/calibration/calibration.c ++++ b/src/calibration/calibration.c +@@ -6,7 +6,7 @@ + + // Dependent libraries + #include +-#include ++#include + #include //cJSON.h need this set correctly. + + // System dependencies +diff --git a/src/capturesync/CMakeLists.txt b/src/capturesync/CMakeLists.txt +index a434593..bcb19ba 100644 +--- a/src/capturesync/CMakeLists.txt ++++ b/src/capturesync/CMakeLists.txt +@@ -11,7 +11,7 @@ target_include_directories(k4a_capturesync PUBLIC + + # Dependencies of this library + target_link_libraries(k4a_capturesync PUBLIC +- azure::aziotsharedutil ++ aziotsharedutil + k4ainternal::logging) + + # Define alias for other targets to link against +diff --git a/src/dewrapper/CMakeLists.txt b/src/dewrapper/CMakeLists.txt +index 2756e43..f736fd1 100644 +--- a/src/dewrapper/CMakeLists.txt ++++ b/src/dewrapper/CMakeLists.txt +@@ -10,7 +10,7 @@ target_include_directories(k4a_dewrapper PUBLIC + ${K4A_PRIV_INCLUDE_DIR}) + + target_link_libraries(k4a_dewrapper PUBLIC +- azure::aziotsharedutil ++ aziotsharedutil + k4ainternal::allocator + k4ainternal::calibration + k4ainternal::logging +diff --git a/src/image/CMakeLists.txt b/src/image/CMakeLists.txt +index c40999b..82406e2 100644 +--- a/src/image/CMakeLists.txt ++++ b/src/image/CMakeLists.txt +@@ -11,7 +11,7 @@ target_include_directories(k4a_image PUBLIC + + # Dependencies of this library + target_link_libraries(k4a_image PUBLIC +- azure::aziotsharedutil ++ aziotsharedutil + k4ainternal::allocator + k4ainternal::logging) + +diff --git a/src/logging/CMakeLists.txt b/src/logging/CMakeLists.txt +index cbf0e4d..ca81c41 100644 +--- a/src/logging/CMakeLists.txt ++++ b/src/logging/CMakeLists.txt +@@ -11,7 +11,7 @@ target_include_directories(k4a_logging PUBLIC + + # Dependencies of this library + target_link_libraries(k4a_logging PUBLIC +- azure::aziotsharedutil ++ aziotsharedutil + spdlog::spdlog + k4ainternal::rwlock + k4ainternal::global +diff --git a/src/logging/logging.cpp b/src/logging/logging.cpp +index 05264c5..41185de 100644 +--- a/src/logging/logging.cpp ++++ b/src/logging/logging.cpp +@@ -24,6 +24,9 @@ + #pragma warning(disable : 4702) + #endif + #include ++#include ++#include ++#include + #ifdef _MSC_VER + #pragma warning(default : 4702) + #endif +diff --git a/src/queue/CMakeLists.txt b/src/queue/CMakeLists.txt +index 03d15f4..a42a135 100644 +--- a/src/queue/CMakeLists.txt ++++ b/src/queue/CMakeLists.txt +@@ -10,7 +10,7 @@ target_include_directories(k4a_queue PUBLIC + ${K4A_PRIV_INCLUDE_DIR}) + + target_link_libraries(k4a_queue PUBLIC +- azure::aziotsharedutil ++ aziotsharedutil + k4ainternal::allocator + k4ainternal::logging + ) +diff --git a/src/record/internal/CMakeLists.txt b/src/record/internal/CMakeLists.txt +index 97c6cf3..e9f5b1a 100644 +--- a/src/record/internal/CMakeLists.txt ++++ b/src/record/internal/CMakeLists.txt +@@ -22,16 +22,16 @@ target_include_directories(k4a_playback PUBLIC + target_link_libraries(k4a_record PUBLIC + k4a::k4a + k4ainternal::logging +- ebml::ebml +- matroska::matroska ++ EBML::ebml ++ Matroska::matroska + ) + + target_link_libraries(k4a_playback PUBLIC + k4a::k4a + k4ainternal::logging +- ebml::ebml +- matroska::matroska +- libyuv::libyuv ++ EBML::ebml ++ Matroska::matroska ++ yuv + libjpeg-turbo::libjpeg-turbo + ) + +diff --git a/src/record/sdk/CMakeLists.txt b/src/record/sdk/CMakeLists.txt +index 2e23295..d150e70 100644 +--- a/src/record/sdk/CMakeLists.txt ++++ b/src/record/sdk/CMakeLists.txt +@@ -40,8 +40,8 @@ target_link_libraries(k4arecord PRIVATE + k4ainternal::record + k4ainternal::playback + k4ainternal::logging +- ebml::ebml +- matroska::matroska ++ EBML::ebml ++ Matroska::matroska + ) + + target_link_libraries(k4arecord PUBLIC +diff --git a/src/tewrapper/CMakeLists.txt b/src/tewrapper/CMakeLists.txt +index e4a696e..6ee6696 100644 +--- a/src/tewrapper/CMakeLists.txt ++++ b/src/tewrapper/CMakeLists.txt +@@ -10,7 +10,7 @@ target_include_directories(k4a_tewrapper PUBLIC + ${K4A_PRIV_INCLUDE_DIR}) + + target_link_libraries(k4a_tewrapper PUBLIC +- azure::aziotsharedutil ++ aziotsharedutil + k4ainternal::logging + k4ainternal::deloader) + +diff --git a/src/usbcommand/CMakeLists.txt b/src/usbcommand/CMakeLists.txt +index f75bd55..5403216 100644 +--- a/src/usbcommand/CMakeLists.txt ++++ b/src/usbcommand/CMakeLists.txt +@@ -12,8 +12,8 @@ target_include_directories(k4a_usb_cmd PUBLIC + + # Dependencies of this library + target_link_libraries(k4a_usb_cmd PUBLIC +- azure::aziotsharedutil +- LibUSB::LibUSB ++ aziotsharedutil ++ ${LibUSB} + k4ainternal::allocator + k4ainternal::image + k4ainternal::logging) +diff --git a/src/usbcommand/usb_cmd_priv.h b/src/usbcommand/usb_cmd_priv.h +index 0aa502c..0405b58 100644 +--- a/src/usbcommand/usb_cmd_priv.h ++++ b/src/usbcommand/usb_cmd_priv.h +@@ -20,7 +20,7 @@ + #include + + // Exteranl dependencis +-#include ++#include + + // Ensure we have LIBUSB_API_VERSION defined if not defined by libusb.h + #ifndef LIBUSB_API_VERSION +diff --git a/tests/Calibration/CMakeLists.txt b/tests/Calibration/CMakeLists.txt +index ea6a9dd..c107269 100644 +--- a/tests/Calibration/CMakeLists.txt ++++ b/tests/Calibration/CMakeLists.txt +@@ -4,8 +4,8 @@ + add_executable(calibration_ut calibration.cpp) + + target_link_libraries(calibration_ut PRIVATE +- azure::aziotsharedutil +- gtest::gtest ++ aziotsharedutil ++ GTest::gtest + k4ainternal::calibration + k4ainternal::utcommon) + +diff --git a/tests/CaptureSync/CMakeLists.txt b/tests/CaptureSync/CMakeLists.txt +index 0a9a8e2..f7bff42 100644 +--- a/tests/CaptureSync/CMakeLists.txt ++++ b/tests/CaptureSync/CMakeLists.txt +@@ -4,8 +4,8 @@ + add_executable(capturesync_ut capturesync.cpp) + + target_link_libraries(capturesync_ut PRIVATE +- azure::aziotsharedutil +- gtest::gtest ++ aziotsharedutil ++ GTest::gtest + k4ainternal::allocator + k4ainternal::capturesync + k4ainternal::image +diff --git a/tests/ColorTests/FunctionalTest/CMakeLists.txt b/tests/ColorTests/FunctionalTest/CMakeLists.txt +index 1e65ad7..709dfb0 100644 +--- a/tests/ColorTests/FunctionalTest/CMakeLists.txt ++++ b/tests/ColorTests/FunctionalTest/CMakeLists.txt +@@ -6,7 +6,7 @@ add_executable(color_ft color_ft.cpp) + target_link_libraries(color_ft PRIVATE + k4a::k4a + k4ainternal::utcommon +- gtest::gtest +- azure::aziotsharedutil) ++ GTest::gtest ++ aziotsharedutil) + + k4a_add_tests(TARGET color_ft HARDWARE_REQUIRED TEST_TYPE FUNCTIONAL) +diff --git a/tests/DepthTests/FunctionalTest/CMakeLists.txt b/tests/DepthTests/FunctionalTest/CMakeLists.txt +index 469c125..00f15f8 100644 +--- a/tests/DepthTests/FunctionalTest/CMakeLists.txt ++++ b/tests/DepthTests/FunctionalTest/CMakeLists.txt +@@ -6,7 +6,7 @@ add_executable(depth_ft depth_ft.cpp) + target_link_libraries(depth_ft PRIVATE + k4a::k4a + k4ainternal::utcommon +- gtest::gtest +- azure::aziotsharedutil) ++ GTest::gtest ++ aziotsharedutil) + + k4a_add_tests(TARGET depth_ft HARDWARE_REQUIRED TEST_TYPE FUNCTIONAL) +diff --git a/tests/ExternLibraries/azure_c_shared/CMakeLists.txt b/tests/ExternLibraries/azure_c_shared/CMakeLists.txt +index a487cde..44170f4 100644 +--- a/tests/ExternLibraries/azure_c_shared/CMakeLists.txt ++++ b/tests/ExternLibraries/azure_c_shared/CMakeLists.txt +@@ -6,7 +6,7 @@ add_executable(azure_c_shared_test + threading.cpp) + + target_link_libraries(azure_c_shared_test PRIVATE +- azure::aziotsharedutil +- gtest::gtest) ++ aziotsharedutil ++ GTest::gtest) + + k4a_add_tests(TARGET azure_c_shared_test TEST_TYPE UNIT) +diff --git a/tests/IMUTests/FunctionalTest/CMakeLists.txt b/tests/IMUTests/FunctionalTest/CMakeLists.txt +index cc6b3c2..d8762f6 100644 +--- a/tests/IMUTests/FunctionalTest/CMakeLists.txt ++++ b/tests/IMUTests/FunctionalTest/CMakeLists.txt +@@ -6,7 +6,7 @@ add_executable(imu_ft imu_ft.cpp) + target_link_libraries(imu_ft PRIVATE + k4a::k4a + k4ainternal::utcommon +- gtest::gtest +- azure::aziotsharedutil) ++ GTest::gtest ++ aziotsharedutil) + + k4a_add_tests(TARGET imu_ft HARDWARE_REQUIRED TEST_TYPE FUNCTIONAL) +diff --git a/tests/Transformation/CMakeLists.txt b/tests/Transformation/CMakeLists.txt +index 7f11a2f..c4ddaf8 100644 +--- a/tests/Transformation/CMakeLists.txt ++++ b/tests/Transformation/CMakeLists.txt +@@ -4,8 +4,8 @@ + add_executable(transformation_ut transformation.cpp) + + target_link_libraries(transformation_ut PRIVATE +- azure::aziotsharedutil +- gtest::gtest ++ aziotsharedutil ++ GTest::gtest + k4ainternal::image + k4ainternal::transformation + k4ainternal::utcommon +diff --git a/tests/UnitTests/allocator_ut/CMakeLists.txt b/tests/UnitTests/allocator_ut/CMakeLists.txt +index 913a7d8..0b7baeb 100644 +--- a/tests/UnitTests/allocator_ut/CMakeLists.txt ++++ b/tests/UnitTests/allocator_ut/CMakeLists.txt +@@ -4,8 +4,8 @@ + add_executable(allocator_ut allocator.cpp) + + target_link_libraries(allocator_ut PRIVATE +- azure::aziotsharedutil +- gtest::gtest ++ aziotsharedutil ++ GTest::gtest + k4ainternal::allocator + k4ainternal::image + k4ainternal::utcommon) +diff --git a/tests/UnitTests/dynlib_ut/CMakeLists.txt b/tests/UnitTests/dynlib_ut/CMakeLists.txt +index fbecc17..af73be2 100644 +--- a/tests/UnitTests/dynlib_ut/CMakeLists.txt ++++ b/tests/UnitTests/dynlib_ut/CMakeLists.txt +@@ -34,7 +34,7 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + endif() + + target_link_libraries(dynlib_ut PRIVATE +- gtest::gtest ++ GTest::gtest + k4ainternal::dynlib + k4ainternal::utcommon) + +diff --git a/tests/UnitTests/queue_ut/CMakeLists.txt b/tests/UnitTests/queue_ut/CMakeLists.txt +index cf9b040..ec4a024 100644 +--- a/tests/UnitTests/queue_ut/CMakeLists.txt ++++ b/tests/UnitTests/queue_ut/CMakeLists.txt +@@ -4,8 +4,8 @@ + add_executable(queue_ut queue.cpp) + + target_link_libraries(queue_ut PRIVATE +- azure::aziotsharedutil +- gtest::gtest ++ aziotsharedutil ++ GTest::gtest + k4ainternal::allocator + k4ainternal::image + k4ainternal::queue +diff --git a/tests/UnitTests/utcommon/CMakeLists.txt b/tests/UnitTests/utcommon/CMakeLists.txt +index cca52c6..dfdd13d 100644 +--- a/tests/UnitTests/utcommon/CMakeLists.txt ++++ b/tests/UnitTests/utcommon/CMakeLists.txt +@@ -4,8 +4,8 @@ + add_library(utcommon STATIC utcommon.cpp) + + target_link_libraries(utcommon PUBLIC +- gtest::gtest +- gtest::gmock ++ GTest::gtest ++ GTest::gmock + k4ainternal::logging + ) + +diff --git a/tests/example/CMakeLists.txt b/tests/example/CMakeLists.txt +index 3305a1a..be0b667 100644 +--- a/tests/example/CMakeLists.txt ++++ b/tests/example/CMakeLists.txt +@@ -3,6 +3,6 @@ + + add_executable(k4a_example_test test.cpp) + target_link_libraries(k4a_example_test PRIVATE k4a::k4a) +-target_link_libraries(k4a_example_test PRIVATE gtest::gtest) ++target_link_libraries(k4a_example_test PRIVATE GTest::gtest) + + k4a_add_tests(TARGET k4a_example_test HARDWARE_REQUIRED TEST_TYPE FUNCTIONAL) +diff --git a/tests/executables/CMakeLists.txt b/tests/executables/CMakeLists.txt +index 7b03d15..6c070ee 100644 +--- a/tests/executables/CMakeLists.txt ++++ b/tests/executables/CMakeLists.txt +@@ -17,12 +17,12 @@ target_compile_definitions(executables_ft_custom PRIVATE -DUSE_CUSTOM_TEST_CONFI + target_link_libraries(executables_ft PRIVATE + k4a::k4a + k4ainternal::utcommon +- gtest::gtest) ++ GTest::gtest) + + target_link_libraries(executables_ft_custom PRIVATE + k4a::k4a + k4ainternal::utcommon +- gtest::gtest) ++ GTest::gtest) + + k4a_add_tests(TARGET executables_ft HARDWARE_REQUIRED TEST_TYPE FUNCTIONAL) + k4a_add_tests(TARGET executables_ft_custom HARDWARE_REQUIRED TEST_TYPE FUNCTIONAL_CUSTOM) +diff --git a/tests/global/CMakeLists.txt b/tests/global/CMakeLists.txt +index ea0a0e5..d85728d 100644 +--- a/tests/global/CMakeLists.txt ++++ b/tests/global/CMakeLists.txt +@@ -4,8 +4,8 @@ + add_executable(global_ft global.cpp) + + target_link_libraries(global_ft PRIVATE +- azure::aziotsharedutil +- gtest::gtest ++ aziotsharedutil ++ GTest::gtest + k4ainternal::global + k4ainternal::utcommon) + +diff --git a/tests/multidevice/CMakeLists.txt b/tests/multidevice/CMakeLists.txt +index 3fe044b..85f3058 100644 +--- a/tests/multidevice/CMakeLists.txt ++++ b/tests/multidevice/CMakeLists.txt +@@ -4,8 +4,8 @@ + add_executable(multidevice_ft multidevice.cpp) + + target_link_libraries(multidevice_ft PRIVATE +- azure::aziotsharedutil +- gtest::gtest ++ aziotsharedutil ++ GTest::gtest + k4a::k4a + k4ainternal::utcommon) + +diff --git a/tests/projections/cpp/CMakeLists.txt b/tests/projections/cpp/CMakeLists.txt +index 2fdfa2c..09b5303 100644 +--- a/tests/projections/cpp/CMakeLists.txt ++++ b/tests/projections/cpp/CMakeLists.txt +@@ -6,6 +6,6 @@ add_executable(cpp_projection_ft cpp_projection_ft.cpp) + target_link_libraries(cpp_projection_ft PRIVATE + k4a::k4a + k4ainternal::utcommon +- gtest::gtest) ++ GTest::gtest) + + k4a_add_tests(TARGET cpp_projection_ft HARDWARE_REQUIRED TEST_TYPE FUNCTIONAL) +diff --git a/tests/rwlock/CMakeLists.txt b/tests/rwlock/CMakeLists.txt +index 5889435..c6c1f73 100644 +--- a/tests/rwlock/CMakeLists.txt ++++ b/tests/rwlock/CMakeLists.txt +@@ -4,8 +4,8 @@ + add_executable(rwlock_ft rwlock.cpp) + + target_link_libraries(rwlock_ft PRIVATE +- azure::aziotsharedutil +- gtest::gtest ++ aziotsharedutil ++ GTest::gtest + k4ainternal::rwlock + k4ainternal::utcommon) + +diff --git a/tests/throughput/CMakeLists.txt b/tests/throughput/CMakeLists.txt +index c544e1e..9489bf8 100644 +--- a/tests/throughput/CMakeLists.txt ++++ b/tests/throughput/CMakeLists.txt +@@ -6,8 +6,8 @@ add_executable(throughput_perf throughput_perf.cpp) + target_compile_definitions(throughput_perf PRIVATE _CRT_SECURE_NO_WARNINGS) + + target_link_libraries(throughput_perf PRIVATE +- azure::aziotsharedutil +- gtest::gtest ++ aziotsharedutil ++ GTest::gtest + k4a::k4a + k4ainternal::logging + k4ainternal::utcommon) +diff --git a/tools/k4aviewer/CMakeLists.txt b/tools/k4aviewer/CMakeLists.txt +index 98578c0..6ab38d9 100644 +--- a/tools/k4aviewer/CMakeLists.txt ++++ b/tools/k4aviewer/CMakeLists.txt +@@ -60,10 +60,11 @@ set(EXTERNAL_LIBRARIES + imgui::imgui + libjpeg-turbo::libjpeg-turbo + libsoundio::libsoundio +- LibUSB::LibUSB +- libyuv::libyuv +- glfw::glfw ++ ${LibUSB} ++ yuv ++ glfw + ${OPENGL_LIBRARIES} ++ unofficial::gl3w::gl3w + ) + + # On Windows, we need to call into setupapi to get USB container ID information +diff --git a/tools/k4aviewer/k4aaudiomanager.cpp b/tools/k4aviewer/k4aaudiomanager.cpp +index 243c800..ef85d45 100644 +--- a/tools/k4aviewer/k4aaudiomanager.cpp ++++ b/tools/k4aviewer/k4aaudiomanager.cpp +@@ -11,7 +11,7 @@ + + // Library headers + // +-#include ++#include + + // Project headers + // diff --git a/externals/vcpkg/ports/azure-kinect-sensor-sdk/fix-calibration-c.patch b/externals/vcpkg/ports/azure-kinect-sensor-sdk/fix-calibration-c.patch new file mode 100755 index 000000000..59251912a --- /dev/null +++ b/externals/vcpkg/ports/azure-kinect-sensor-sdk/fix-calibration-c.patch @@ -0,0 +1,70 @@ +diff --git a/src/calibration/calibration.c b/src/calibration/calibration.c +index d37c4e6..ec477f5 100644 +--- a/src/calibration/calibration.c ++++ b/src/calibration/calibration.c +@@ -7,7 +7,6 @@ + // Dependent libraries + #include + #include +-#include //cJSON.h need this set correctly. + + // System dependencies + #include +@@ -637,27 +636,6 @@ k4a_result_t calibration_create_from_raw(char *raw_calibration, + + k4a_result_t result = K4A_RESULT_SUCCEEDED; + +-#ifdef _WIN32 +- int previous_thread_locale = -1; +- if (K4A_SUCCEEDED(result)) +- { +- previous_thread_locale = _configthreadlocale(_ENABLE_PER_THREAD_LOCALE); +- result = K4A_RESULT_FROM_BOOL(previous_thread_locale == _ENABLE_PER_THREAD_LOCALE || +- previous_thread_locale == _DISABLE_PER_THREAD_LOCALE); +- } +- +- if (K4A_SUCCEEDED(result)) +- { +- result = K4A_RESULT_FROM_BOOL(setlocale(LC_ALL, "C") != NULL); +- } +- +-#else // NOT _WIN32 +- +- locale_t thread_locale = newlocale(LC_ALL_MASK, "C", (locale_t)0); +- locale_t previous_locale = uselocale(thread_locale); +- +-#endif +- + if (K4A_SUCCEEDED(result) && depth_calibration != NULL) + { + result = get_camera_calibration(raw_calibration, depth_calibration, "CALIBRATION_CameraLocationD0"); +@@ -680,29 +658,6 @@ k4a_result_t calibration_create_from_raw(char *raw_calibration, + "CALIBRATION_InertialSensorType_Accelerometer"); + } + +-#ifdef _WIN32 +- if (previous_thread_locale == _ENABLE_PER_THREAD_LOCALE || previous_thread_locale == _DISABLE_PER_THREAD_LOCALE) +- { +- if (K4A_FAILED(K4A_RESULT_FROM_BOOL(_configthreadlocale(previous_thread_locale) != -1))) +- { +- // Only set result to failed, don't let this call succeed and clear a failure that might have happened +- // already. +- result = K4A_RESULT_FAILED; +- } +- } +-#else // NOT _WIN32 +- if ((previous_locale != NULL) && (K4A_FAILED(K4A_RESULT_FROM_BOOL(uselocale(previous_locale) != NULL)))) +- { +- // Only set result to failed, don't let this call succeed and clear a failure that might have happened +- // already. +- result = K4A_RESULT_FAILED; +- } +- if (thread_locale) +- { +- freelocale(thread_locale); +- } +-#endif +- + return result; + } + diff --git a/externals/vcpkg/ports/azure-kinect-sensor-sdk/fix-dependency-imgui.patch b/externals/vcpkg/ports/azure-kinect-sensor-sdk/fix-dependency-imgui.patch new file mode 100755 index 000000000..543bfd2bb --- /dev/null +++ b/externals/vcpkg/ports/azure-kinect-sensor-sdk/fix-dependency-imgui.patch @@ -0,0 +1,35 @@ +diff --git a/tools/k4aviewer/CMakeLists.txt b/tools/k4aviewer/CMakeLists.txt +index 6ab38d9..f31f570 100644 +--- a/tools/k4aviewer/CMakeLists.txt ++++ b/tools/k4aviewer/CMakeLists.txt +@@ -54,6 +54,8 @@ include_directories( + ${CMAKE_CURRENT_LIST_DIR} + ) + ++find_package(GLEW REQUIRED) ++ + set(EXTERNAL_LIBRARIES + k4a::k4a + k4a::k4arecord +@@ -65,6 +67,7 @@ set(EXTERNAL_LIBRARIES + glfw + ${OPENGL_LIBRARIES} + unofficial::gl3w::gl3w ++ GLEW::GLEW + ) + + # On Windows, we need to call into setupapi to get USB container ID information +diff --git a/tools/k4aviewer/k4asoundio_util.h b/tools/k4aviewer/k4asoundio_util.h +index c9c2718..011a76e 100644 +--- a/tools/k4aviewer/k4asoundio_util.h ++++ b/tools/k4aviewer/k4asoundio_util.h +@@ -16,7 +16,7 @@ + // This disables that behavior. + // + #define NOMINMAX +-#include ++#include + + // Project headers + // + \ No newline at end of file diff --git a/externals/vcpkg/ports/azure-kinect-sensor-sdk/fix-linux.patch b/externals/vcpkg/ports/azure-kinect-sensor-sdk/fix-linux.patch new file mode 100755 index 000000000..0dd8a15ae --- /dev/null +++ b/externals/vcpkg/ports/azure-kinect-sensor-sdk/fix-linux.patch @@ -0,0 +1,39 @@ +diff --git a/cmake/k4aCompilerFlags.cmake b/cmake/k4aCompilerFlags.cmake +index e938c907..ccea0a8e 100644 +--- a/cmake/k4aCompilerFlags.cmake ++++ b/cmake/k4aCompilerFlags.cmake +@@ -34,22 +34,16 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") + list(APPEND CLANG_ALL_WARNINGS "-Wno-extra-semi-stmt") # Allow semi-colons to be used after #define's + list(APPEND CLANG_ALL_WARNINGS "-Wno-atomic-implicit-seq-cst") # Allow use of __sync_add_and_fetch() atomic + endif() +- set(CLANG_WARNINGS_AS_ERRORS "-Werror") + add_compile_options(${CLANG_ALL_WARNINGS}) +- add_compile_options(${CLANG_WARNINGS_AS_ERRORS}) + elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") + set(GNU_ALL_WARNINGS "-Wall" "-Wextra") + list(APPEND GNU_ALL_WARNINGS "-Wno-missing-field-initializers") # Allow c structs without all fields initialized +- set(GNU_WARNINGS_AS_ERRORS "-Werror") + add_compile_options(${GNU_ALL_WARNINGS}) +- add_compile_options(${GNU_WARNINGS_AS_ERRORS}) + elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") + set(MSVC_ALL_WARNINGS "/W4" "/wd4200") #Note: allow zero length arrays +- set(MSVC_WARNINGS_AS_ERRORS "/WX") + string(REGEX REPLACE " /W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + string(REGEX REPLACE " /W[0-4]" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") + add_compile_options(${MSVC_ALL_WARNINGS}) +- add_compile_options(${MSVC_WARNINGS_AS_ERRORS}) + else() + message(FATAL_ERROR "Unknown C++ compiler: ${CMAKE_CXX_COMPILER_ID}") + endif() +diff --git a/src/logging/logging.cpp b/src/logging/logging.cpp +index 05264c5f..6cd41d32 100644 +--- a/src/logging/logging.cpp ++++ b/src/logging/logging.cpp +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + + // External dependencies + diff --git a/externals/vcpkg/ports/azure-kinect-sensor-sdk/k4adeploy.ps1 b/externals/vcpkg/ports/azure-kinect-sensor-sdk/k4adeploy.ps1 new file mode 100755 index 000000000..d6feb3b32 --- /dev/null +++ b/externals/vcpkg/ports/azure-kinect-sensor-sdk/k4adeploy.ps1 @@ -0,0 +1,10 @@ +# Note: This function signature and behavior is depended upon by applocal.ps1 + +function deployAzureKinectSensorSDK([string]$targetBinaryDir, [string]$installedDir, [string]$targetBinaryName) { + if ($targetBinaryName -like "k4a.dll") { + if(Test-Path "$installedDir\tools\azure-kinect-sensor-sdk\depthengine_2_0.dll") { + Write-Verbose " Deploying Azure Kinect Sensor SDK Initialization" + deployBinary "$targetBinaryDir" "$installedDir\tools\azure-kinect-sensor-sdk\" "depthengine_2_0.dll" + } + } +} diff --git a/externals/vcpkg/ports/azure-kinect-sensor-sdk/portfile.cmake b/externals/vcpkg/ports/azure-kinect-sensor-sdk/portfile.cmake new file mode 100755 index 000000000..414b6775f --- /dev/null +++ b/externals/vcpkg/ports/azure-kinect-sensor-sdk/portfile.cmake @@ -0,0 +1,91 @@ +set(VERSION 1.4.1) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/Azure-Kinect-Sensor-SDK + REF v${VERSION} + SHA512 ef94c072caae43b0a105b192013e09082d267d4064e6676fac981b52e7576a663f59fcb53f0afe66b425ef2cea0cb3aa224ff7be6485c0b5543ff9cdabd82d4d + HEAD_REF master + PATCHES + fix-builds.patch + fix-dependency-imgui.patch + fix-linux.patch + fix-calibration-c.patch + fix-build-imgui.patch +) + +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + docs K4A_BUILD_DOCS + tool BUILD_TOOLS +) + +# .rc file needs windows.h, so do not use PREFER_NINJA here +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS ${FEATURE_OPTIONS} + -DK4A_SOURCE_LINK=OFF + -DK4A_MTE_VERSION=ON + -DBUILD_EXAMPLES=OFF + -DWITH_TEST=OFF + -DIMGUI_EXTERNAL_PATH="${CURRENT_INSTALLED_DIR}/include/bindings" +) + +vcpkg_cmake_install() + +# Avoid deleting debug/lib/cmake when fixing the first cmake +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/share") +file(RENAME "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/share") + +vcpkg_cmake_config_fixup(PACKAGE_NAME k4a CONFIG_PATH share/k4a) +vcpkg_cmake_config_fixup(PACKAGE_NAME k4arecord CONFIG_PATH share/k4arecord) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if ("tool" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES k4arecorder k4aviewer AzureKinectFirmwareTool AUTO_CLEAN) +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# Install Depth Engine +vcpkg_download_distfile(ARCHIVE + URLS "https://www.nuget.org/api/v2/package/Microsoft.Azure.Kinect.Sensor/${VERSION}" + FILENAME "azure-kinect-sensor-sdk_17630a00.zip" + SHA512 17630a00f4e9ff3ef68945b62021f6d0390030b43c120c207afe934075a7a87c5848be1f46f4c35c7ecd5698012452ffcbb67f739e9048857410ec7077e5e8c6 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH PACKAGE_PATH + ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL +) + +if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) + set(ARCHITECTURE "x86") +elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL x64) + set(ARCHITECTURE "amd64") +else () + message(FATAL_ERROR "this architecture is not supported.") +endif () + +if (VCPKG_TARGET_IS_LINUX) + file(COPY "${PACKAGE_PATH}/linux/lib/native/${VCPKG_TARGET_ARCHITECTURE}/release/libdepthengine.so.2.0" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(COPY "${PACKAGE_PATH}/linux/lib/native/${VCPKG_TARGET_ARCHITECTURE}/release/libdepthengine.so.2.0" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +else() + file(COPY "${PACKAGE_PATH}/lib/native/${ARCHITECTURE}/release/depthengine_2_0.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/azure-kinect-sensor-sdk") + file(COPY "${PACKAGE_PATH}/lib/native/${ARCHITECTURE}/release/depthengine_2_0.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/azure-kinect-sensor-sdk") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/k4adeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/azure-kinect-sensor-sdk") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/k4adeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/azure-kinect-sensor-sdk") +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/azure-kinect-sensor-sdk/vcpkg.json b/externals/vcpkg/ports/azure-kinect-sensor-sdk/vcpkg.json new file mode 100755 index 000000000..3addef920 --- /dev/null +++ b/externals/vcpkg/ports/azure-kinect-sensor-sdk/vcpkg.json @@ -0,0 +1,53 @@ +{ + "name": "azure-kinect-sensor-sdk", + "version": "1.4.1", + "port-version": 4, + "description": "Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device.", + "homepage": "https://github.com/microsoft/Azure-Kinect-Sensor-SDK", + "supports": "linux | windows", + "dependencies": [ + "azure-c-shared-utility", + "cjson", + "ebml", + "glfw3", + "gtest", + "imgui", + "libjpeg-turbo", + "libsoundio", + "libusb", + { + "name": "libuvc", + "platform": "linux" + }, + "libyuv", + "matroska", + "spdlog", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "docs": { + "description": "Build K4A doxygen documentation." + }, + "tool": { + "description": "Build tools.", + "dependencies": [ + "gl3w", + "glew", + { + "name": "imgui", + "features": [ + "glfw-binding", + "opengl3-binding" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/azure-macro-utils-c/portfile.cmake b/externals/vcpkg/ports/azure-macro-utils-c/portfile.cmake new file mode 100755 index 000000000..225def814 --- /dev/null +++ b/externals/vcpkg/ports/azure-macro-utils-c/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +if("public-preview" IN_LIST FEATURES) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-macro-utils-c + REF 7523af934fc4d9423111e358f49b19314ec9c3e3 + SHA512 441d2420be319195ef50d0b03028e44c470adedc316dc338245cbc51ec2e78863cb42a9665d84a628056d212927abb5aeaf5c489e7c36b5257b16a28b3652e6e + HEAD_REF master + FILE_DISAMBIGUATOR 1 + ) +else() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-macro-utils-c + REF 5926caf4e42e98e730e6d03395788205649a3ada + SHA512 8f9fd02012202db6cff5b647edbc8332a2c03963e80182a630af6a884f23df96b8e24d60e5412bfc2a0a7f43240a54f9597040aa28a9d3e1566755e1d52aac62 + HEAD_REF master + FILE_DISAMBIGUATOR 1 + ) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -Drun_int_tests=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/azure_macro_utils_c) + +file(COPY ${SOURCE_PATH}/inc/azure_macro_utils/macro_utils.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/azure_macro_utils_c/include/azure_macro_utils) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug) + +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/azure-macro-utils-c/copyright COPYONLY) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/azure-macro-utils-c/vcpkg.json b/externals/vcpkg/ports/azure-macro-utils-c/vcpkg.json new file mode 100755 index 000000000..0d4df0005 --- /dev/null +++ b/externals/vcpkg/ports/azure-macro-utils-c/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "azure-macro-utils-c", + "version-date": "2022-01-21", + "description": "A library of macros for the Azure IoT SDK Suite", + "features": { + "public-preview": { + "description": "A library of macros for the Azure IoT SDK Suite (public-preview)" + } + } +} diff --git a/externals/vcpkg/ports/azure-security-attestation-cpp/portfile.cmake b/externals/vcpkg/ports/azure-security-attestation-cpp/portfile.cmake new file mode 100755 index 000000000..77750e714 --- /dev/null +++ b/externals/vcpkg/ports/azure-security-attestation-cpp/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-security-attestation_1.0.0-beta.3 + SHA512 8809bc3e44dc6e9f7a5ca98fdf23ef0058f5ba2321c34494931197e7d002dffab10161279bb5b7cf453593779db038f86abf377cb7788174ddbce9fc5199fe91 +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH}/sdk/attestation/azure-security-attestation/ + OPTIONS + -DWARNINGS_AS_ERRORS=OFF +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/azure-security-attestation-cpp/vcpkg.json b/externals/vcpkg/ports/azure-security-attestation-cpp/vcpkg.json new file mode 100755 index 000000000..b51db5606 --- /dev/null +++ b/externals/vcpkg/ports/azure-security-attestation-cpp/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "azure-security-attestation-cpp", + "version-semver": "1.0.0-beta.3", + "description": [ + "Microsoft Azure Attestation Service SDK for C++", + "This library provides API access to the Microsoft Azure Attestation service." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/attestation/azure-security-attestation", + "license": "MIT", + "dependencies": [ + { + "name": "azure-core-cpp", + "default-features": false, + "version>=": "1.5.0" + }, + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/azure-security-keyvault-certificates-cpp/portfile.cmake b/externals/vcpkg/ports/azure-security-keyvault-certificates-cpp/portfile.cmake new file mode 100755 index 000000000..f44a8c9e8 --- /dev/null +++ b/externals/vcpkg/ports/azure-security-keyvault-certificates-cpp/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-security-keyvault-certificates_4.0.0 + SHA512 c91d745ab009c5e66081785ba2f7279b7fad388c2f28c92e8d3c3c77a59157b8f7663e59474b325f669bc6e22aa820e7397d3a6813388133d2fa34b145b883e0 +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-certificates/ + OPTIONS + -DWARNINGS_AS_ERRORS=OFF +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/azure-security-keyvault-certificates-cpp/vcpkg.json b/externals/vcpkg/ports/azure-security-keyvault-certificates-cpp/vcpkg.json new file mode 100755 index 000000000..79da613d8 --- /dev/null +++ b/externals/vcpkg/ports/azure-security-keyvault-certificates-cpp/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "azure-security-keyvault-certificates-cpp", + "version-semver": "4.0.0", + "description": [ + "Microsoft Azure Key Vault Certificates SDK for C++", + "This library provides Azure Key Vault Certificates SDK." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/keyvault/azure-security-keyvault-certificates", + "license": "MIT", + "dependencies": [ + { + "name": "azure-core-cpp", + "default-features": false, + "version>=": "1.3.1" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/azure-security-keyvault-keys-cpp/portfile.cmake b/externals/vcpkg/ports/azure-security-keyvault-keys-cpp/portfile.cmake new file mode 100755 index 000000000..890652a7c --- /dev/null +++ b/externals/vcpkg/ports/azure-security-keyvault-keys-cpp/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-security-keyvault-keys_4.2.0 + SHA512 b7556019a23344c109f62120c9fc0451f81bf476700ef08c6968a3e731fa783522b2f9b4de411e6727cb1cb977cc4344303e32d825515c192544bb78d9517c32 +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-keys/ + OPTIONS + -DWARNINGS_AS_ERRORS=OFF +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/azure-security-keyvault-keys-cpp/vcpkg.json b/externals/vcpkg/ports/azure-security-keyvault-keys-cpp/vcpkg.json new file mode 100755 index 000000000..b214ba2dd --- /dev/null +++ b/externals/vcpkg/ports/azure-security-keyvault-keys-cpp/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "azure-security-keyvault-keys-cpp", + "version-semver": "4.2.0", + "description": [ + "Microsoft Azure Key Vault Keys SDK for C++", + "This library provides Azure Key Vault Keys SDK." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/keyvault/azure-security-keyvault-keys", + "license": "MIT", + "dependencies": [ + { + "name": "azure-core-cpp", + "default-features": false, + "version>=": "1.2.0" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/azure-security-keyvault-secrets-cpp/portfile.cmake b/externals/vcpkg/ports/azure-security-keyvault-secrets-cpp/portfile.cmake new file mode 100755 index 000000000..bef3d9cec --- /dev/null +++ b/externals/vcpkg/ports/azure-security-keyvault-secrets-cpp/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-security-keyvault-secrets_4.0.0 + SHA512 b82652debc1ce6d230ebd60fb5fab545fe633760f6be32a59bcef80ae2458a78150d072b599b91287fe9ec0d7e3b7e3852a54ddec319a5fcceacd095579abcdc +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-secrets/ + OPTIONS + -DWARNINGS_AS_ERRORS=OFF +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/azure-security-keyvault-secrets-cpp/vcpkg.json b/externals/vcpkg/ports/azure-security-keyvault-secrets-cpp/vcpkg.json new file mode 100755 index 000000000..4f9f9b2c4 --- /dev/null +++ b/externals/vcpkg/ports/azure-security-keyvault-secrets-cpp/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "azure-security-keyvault-secrets-cpp", + "version-semver": "4.0.0", + "description": [ + "Microsoft Azure Key Vault Secrets SDK for C++", + "This library provides Azure Key Vault Secrets SDK." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/keyvault/azure-security-keyvault-secrets", + "license": "MIT", + "dependencies": [ + { + "name": "azure-core-cpp", + "default-features": false, + "version>=": "1.3.1" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/azure-storage-blobs-cpp/portfile.cmake b/externals/vcpkg/ports/azure-storage-blobs-cpp/portfile.cmake new file mode 100755 index 000000000..3b69597be --- /dev/null +++ b/externals/vcpkg/ports/azure-storage-blobs-cpp/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-storage-blobs_12.4.0 + SHA512 8d60970d0eff794cfcb6fb8471e7b0086cd8620072845195f67ae2fe2a7e1ecdaf21f10a80a708c981afa3589115f0fd2477a8c398d06b66b4babcd49f0c4c9a +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-blobs/ + OPTIONS + -DWARNINGS_AS_ERRORS=OFF +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/azure-storage-blobs-cpp/vcpkg.json b/externals/vcpkg/ports/azure-storage-blobs-cpp/vcpkg.json new file mode 100755 index 000000000..2847c101f --- /dev/null +++ b/externals/vcpkg/ports/azure-storage-blobs-cpp/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "azure-storage-blobs-cpp", + "version-semver": "12.4.0", + "description": [ + "Microsoft Azure Storage Blobs SDK for C++", + "This library provides Azure Storage Blobs SDK." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-blobs", + "license": "MIT", + "dependencies": [ + { + "name": "azure-storage-common-cpp", + "default-features": false, + "version>=": "12.2.3" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/azure-storage-common-cpp/portfile.cmake b/externals/vcpkg/ports/azure-storage-common-cpp/portfile.cmake new file mode 100755 index 000000000..8e708dee9 --- /dev/null +++ b/externals/vcpkg/ports/azure-storage-common-cpp/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-storage-common_12.2.4 + SHA512 850588e1edcac6cc861d8ce4fe0e726f540e23f0c4839930ca229da27fc623559f3662ada238d0756ce14341729e34669e1278d6943caa9d3a902119c0a40b7f +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-common/ + OPTIONS + -DWARNINGS_AS_ERRORS=OFF +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/azure-storage-common-cpp/vcpkg.json b/externals/vcpkg/ports/azure-storage-common-cpp/vcpkg.json new file mode 100755 index 000000000..448f7f7bc --- /dev/null +++ b/externals/vcpkg/ports/azure-storage-common-cpp/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "azure-storage-common-cpp", + "version-semver": "12.2.4", + "description": [ + "Microsoft Azure Common Storage SDK for C++", + "This library provides common Azure Storage-related abstractions for Azure SDK." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-common", + "license": "MIT", + "dependencies": [ + { + "name": "azure-core-cpp", + "default-features": false, + "version>=": "1.5.0" + }, + { + "name": "libxml2", + "platform": "!windows" + }, + { + "name": "openssl", + "platform": "!windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/azure-storage-cpp/portfile.cmake b/externals/vcpkg/ports/azure-storage-cpp/portfile.cmake new file mode 100755 index 000000000..b4bad8eee --- /dev/null +++ b/externals/vcpkg/ports/azure-storage-cpp/portfile.cmake @@ -0,0 +1,32 @@ +message(WARNING "azure-storage-cpp is no longer actively developed. Instead, users should migrate to the new sdk:azure-core-cpp") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-storage-cpp + REF v7.5.0 + SHA512 83eabcaf2114c8af1cabbc96b6ef2b57c934a06f68e7a870adf336feaa19edd57aedaf8507d5c40500e46d4e77f5059f9286e319fe7cadeb9ffc8fa018fb030c + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/Microsoft.WindowsAzure.Storage + PREFER_NINJA + OPTIONS + -DCMAKE_FIND_FRAMEWORK=LAST + -DBUILD_TESTS=OFF + -DBUILD_SAMPLES=OFF + OPTIONS_RELEASE + -DGETTEXT_LIB_DIR=${CURRENT_INSTALLED_DIR}/lib + OPTIONS_DEBUG + -DGETTEXT_LIB_DIR=${CURRENT_INSTALLED_DIR}/debug/lib +) + +vcpkg_install_cmake() + +file(INSTALL + ${SOURCE_PATH}/LICENSE.txt + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/azure-storage-cpp/vcpkg.json b/externals/vcpkg/ports/azure-storage-cpp/vcpkg.json new file mode 100755 index 000000000..53dc1752c --- /dev/null +++ b/externals/vcpkg/ports/azure-storage-cpp/vcpkg.json @@ -0,0 +1,41 @@ +{ + "name": "azure-storage-cpp", + "version-string": "7.5.0", + "port-version": 3, + "description": [ + "[legacy] Microsoft Azure Storage Client SDK for C++", + "A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client." + ], + "homepage": "https://blogs.msdn.com/b/windowsazurestorage/", + "supports": "!uwp", + "dependencies": [ + { + "name": "atlmfc", + "platform": "windows" + }, + { + "name": "boost-locale", + "platform": "!windows & !uwp" + }, + { + "name": "boost-log", + "platform": "!windows & !uwp" + }, + { + "name": "cpprestsdk", + "default-features": false + }, + { + "name": "gettext", + "platform": "osx" + }, + { + "name": "libuuid", + "platform": "!windows & !uwp & !osx" + }, + { + "name": "libxml2", + "platform": "!windows & !uwp" + } + ] +} diff --git a/externals/vcpkg/ports/azure-storage-files-datalake-cpp/portfile.cmake b/externals/vcpkg/ports/azure-storage-files-datalake-cpp/portfile.cmake new file mode 100755 index 000000000..e29137531 --- /dev/null +++ b/externals/vcpkg/ports/azure-storage-files-datalake-cpp/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-storage-files-datalake_12.3.1 + SHA512 4d0879808e0d2c2ca0e2c6a89496af3f51a8bcebd071ea51359bb42f1ead193292bb3e21c8c3f023634a48585ab68bdd4d95af0b7357a3e92030c6d1a12ceba9 +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake/ + OPTIONS + -DWARNINGS_AS_ERRORS=OFF +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/azure-storage-files-datalake-cpp/vcpkg.json b/externals/vcpkg/ports/azure-storage-files-datalake-cpp/vcpkg.json new file mode 100755 index 000000000..fff483c12 --- /dev/null +++ b/externals/vcpkg/ports/azure-storage-files-datalake-cpp/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "azure-storage-files-datalake-cpp", + "version-semver": "12.3.1", + "description": [ + "Microsoft Azure Storage Files Data Lake SDK for C++", + "This library provides Azure Storage Files Data Lake SDK." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-files-datalake", + "license": "MIT", + "dependencies": [ + { + "name": "azure-storage-blobs-cpp", + "default-features": false, + "version>=": "12.3.0" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/azure-storage-files-shares-cpp/portfile.cmake b/externals/vcpkg/ports/azure-storage-files-shares-cpp/portfile.cmake new file mode 100755 index 000000000..21dacef3a --- /dev/null +++ b/externals/vcpkg/ports/azure-storage-files-shares-cpp/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-storage-files-shares_12.2.1 + SHA512 c3fd61496833fd90984c20c3ec6f3be663dda922458a7984ce6010c82df28a546f2e24f7d3690f327b22dbdf2abc669f12ebc182f43ba171111ece0450dbe35c +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-files-shares/ + OPTIONS + -DWARNINGS_AS_ERRORS=OFF +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/azure-storage-files-shares-cpp/vcpkg.json b/externals/vcpkg/ports/azure-storage-files-shares-cpp/vcpkg.json new file mode 100755 index 000000000..0d0d853eb --- /dev/null +++ b/externals/vcpkg/ports/azure-storage-files-shares-cpp/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "azure-storage-files-shares-cpp", + "version-semver": "12.2.1", + "description": [ + "Microsoft Azure Storage Files Shares SDK for C++", + "This library provides Azure Storage Files Shares SDK." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-files-shares", + "license": "MIT", + "dependencies": [ + { + "name": "azure-storage-common-cpp", + "default-features": false, + "version>=": "12.2.2" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/azure-storage-queues-cpp/portfile.cmake b/externals/vcpkg/ports/azure-storage-queues-cpp/portfile.cmake new file mode 100755 index 000000000..cabef6187 --- /dev/null +++ b/externals/vcpkg/ports/azure-storage-queues-cpp/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-storage-queues_12.0.0 + SHA512 f393d481a9bb098d1a361605d9d55e1385ec5417a20ea05c53d479dbe4dcb0e8be34c2b9fc31b64e7d78b81fd642461f27beb02b6ed047f87c968c0bb718b85b +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-queues/ + OPTIONS + -DWARNINGS_AS_ERRORS=OFF +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/azure-storage-queues-cpp/vcpkg.json b/externals/vcpkg/ports/azure-storage-queues-cpp/vcpkg.json new file mode 100755 index 000000000..e81924b0d --- /dev/null +++ b/externals/vcpkg/ports/azure-storage-queues-cpp/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "azure-storage-queues-cpp", + "version-semver": "12.0.0", + "description": [ + "Microsoft Azure Storage Queues SDK for C++", + "This library provides Azure Storage Queues SDK." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-queues", + "license": "MIT", + "dependencies": [ + { + "name": "azure-storage-common-cpp", + "default-features": false, + "version>=": "12.2.3" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/azure-uamqp-c/portfile.cmake b/externals/vcpkg/ports/azure-uamqp-c/portfile.cmake new file mode 100755 index 000000000..8e296ff0a --- /dev/null +++ b/externals/vcpkg/ports/azure-uamqp-c/portfile.cmake @@ -0,0 +1,42 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +if("public-preview" IN_LIST FEATURES) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-uamqp-c + REF 065ffdeeb47313ddbbc2a8e84ad52ab033e2e8d2 + SHA512 bade6fae2d5479b7690632dbcc58bda5dd871eb0aa63d6a56cb35e81630121b5148309cd3414e6339c1218ec59fc12ac318b4964d295b579f7a0cacf5593b7ba + HEAD_REF master + ) +else() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-uamqp-c + REF 85aae56beb717dddaf5512845de537d2926afb02 + SHA512 3d9e7788c784169e6d1d9abd233e00a4c1e6525d67cbc25f8ba42292b6d66d0179a742833a0c00a3a0df6498bf88dc8b12a40c183e7141f7290cbb4eceb67dbe + HEAD_REF master + ) +endif() + +file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/azure-c-shared-utility/configs/) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -Dskip_samples=ON + -Duse_installed_dependencies=ON + -Dbuild_as_dynamic=OFF + MAYBE_UNUSED_VARIABLES + build_as_dynamic +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/uamqp) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) + +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/azure-uamqp-c/vcpkg.json b/externals/vcpkg/ports/azure-uamqp-c/vcpkg.json new file mode 100755 index 000000000..40c1177fd --- /dev/null +++ b/externals/vcpkg/ports/azure-uamqp-c/vcpkg.json @@ -0,0 +1,38 @@ +{ + "name": "azure-uamqp-c", + "version-date": "2022-01-21", + "port-version": 1, + "description": "AMQP library for C", + "homepage": "https://github.com/Azure/azure-uamqp-c", + "license": "MIT", + "dependencies": [ + "azure-c-shared-utility", + "azure-macro-utils-c", + "umock-c" + ], + "features": { + "public-preview": { + "description": "AMQP library for C (public preview)", + "dependencies": [ + { + "name": "azure-c-shared-utility", + "features": [ + "public-preview" + ] + }, + { + "name": "azure-macro-utils-c", + "features": [ + "public-preview" + ] + }, + { + "name": "umock-c", + "features": [ + "public-preview" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/azure-uhttp-c/package-location-fix-preview.patch b/externals/vcpkg/ports/azure-uhttp-c/package-location-fix-preview.patch new file mode 100755 index 000000000..8544ae63b --- /dev/null +++ b/externals/vcpkg/ports/azure-uhttp-c/package-location-fix-preview.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 27eae0b..ef87ec0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -138,7 +138,7 @@ if (NOT ${skip_samples}) + endif() + + # Install uhttp +-set(package_location "cmake") ++set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + + if(NOT DEFINED CMAKE_INSTALL_LIBDIR) + set(CMAKE_INSTALL_LIBDIR "lib") diff --git a/externals/vcpkg/ports/azure-uhttp-c/portfile.cmake b/externals/vcpkg/ports/azure-uhttp-c/portfile.cmake new file mode 100755 index 000000000..0478c7174 --- /dev/null +++ b/externals/vcpkg/ports/azure-uhttp-c/portfile.cmake @@ -0,0 +1,44 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +if("public-preview" IN_LIST FEATURES) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-uhttp-c + REF d84a20609a2b5a555920389451fb3c9a2ed3656c + SHA512 4eadd7e120082cc3bcf696d6cd16bc7ee8e1082380dd7583fba7fad1bb95109f3456890495e25ae7675e656ef721fa12eff22eeb96d8a4cf359be5c96889cbd6 + HEAD_REF master + PATCHES + package-location-fix-preview.patch + ) +else() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-uhttp-c + REF 1cc70f4d21ad69768cafb9551b1b512118fba995 + SHA512 6604e82b347a1a4eb5072ab762fde7bd5ae9b32848a78da9103e0eb528b9ccd420a12dbc237dc0b5fe6db271d5cdcd24eedf1cde8ac058102fdd24c5a5a33f26 + HEAD_REF master + ) +endif() + +file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/c-utility/configs/) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dskip_samples=ON + -Duse_installed_dependencies=ON + -Dbuild_as_dynamic=OFF + -DCMAKE_INSTALL_INCLUDEDIR=include + MAYBE_UNUSED_VARIABLES + build_as_dynamic +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME uhttp CONFIG_PATH "lib/cmake/uhttp") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/azure-uhttp-c/vcpkg.json b/externals/vcpkg/ports/azure-uhttp-c/vcpkg.json new file mode 100755 index 000000000..ff97c54e3 --- /dev/null +++ b/externals/vcpkg/ports/azure-uhttp-c/vcpkg.json @@ -0,0 +1,46 @@ +{ + "name": "azure-uhttp-c", + "version-date": "2022-01-21", + "port-version": 1, + "description": "Azure HTTP Library written in C", + "homepage": "https://github.com/Azure/azure-uhttp-c", + "license": "MIT", + "dependencies": [ + "azure-c-shared-utility", + "azure-macro-utils-c", + "umock-c", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "public-preview": { + "description": "Azure HTTP Library written in C (public preview)", + "dependencies": [ + { + "name": "azure-c-shared-utility", + "features": [ + "public-preview" + ] + }, + { + "name": "azure-macro-utils-c", + "features": [ + "public-preview" + ] + }, + { + "name": "umock-c", + "features": [ + "public-preview" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/azure-umqtt-c/package-location-fix-preview.patch b/externals/vcpkg/ports/azure-umqtt-c/package-location-fix-preview.patch new file mode 100755 index 000000000..ec837b7c0 --- /dev/null +++ b/externals/vcpkg/ports/azure-umqtt-c/package-location-fix-preview.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8fd08f0..c228519 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -155,7 +155,7 @@ endif () + include(GNUInstallDirs) + + # Install umqtt +-set(package_location "cmake") ++set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + + if(NOT DEFINED CMAKE_INSTALL_LIBDIR) + set(CMAKE_INSTALL_LIBDIR "lib") diff --git a/externals/vcpkg/ports/azure-umqtt-c/portfile.cmake b/externals/vcpkg/ports/azure-umqtt-c/portfile.cmake new file mode 100755 index 000000000..e9e65434f --- /dev/null +++ b/externals/vcpkg/ports/azure-umqtt-c/portfile.cmake @@ -0,0 +1,43 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +if("public-preview" IN_LIST FEATURES) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-umqtt-c + REF 7557db6de094b67818d3c410dc95a3cf07cd86a6 + SHA512 f2577379f711e2576fdd6dfecbc4d8a0b26c7670a77bc468238e8dd5fa43f208db85eddd06dd570fde4219ba19304338c712f671c059c6cc10abb4892d58ae40 + HEAD_REF master + PATCHES + package-location-fix-preview.patch + ) +else() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-umqtt-c + REF 09558f380a314ea89b28f406cc810f47718cea49 + SHA512 7fc1b3d4ed6bd7401b764e27755270dd97caeb09f3bdede90e2e8c554acd13b5c24f9c7343e642bcb62d2937b8169d900fa46a1b97a8c439733c8cdcac19d548 + HEAD_REF master + ) +endif() + +file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/c-utility/configs/) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -Dskip_samples=ON + -Duse_installed_dependencies=ON + -Dbuild_as_dynamic=OFF + MAYBE_UNUSED_VARIABLES + build_as_dynamic +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME umqtt CONFIG_PATH "lib/cmake/umqtt") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/azure-umqtt-c/vcpkg.json b/externals/vcpkg/ports/azure-umqtt-c/vcpkg.json new file mode 100755 index 000000000..ec223bd03 --- /dev/null +++ b/externals/vcpkg/ports/azure-umqtt-c/vcpkg.json @@ -0,0 +1,46 @@ +{ + "name": "azure-umqtt-c", + "version-date": "2022-01-21", + "port-version": 1, + "description": "General purpose library for communication over the mqtt protocol", + "homepage": "https://github.com/Azure/azure-umqtt-c", + "license": "MIT", + "dependencies": [ + "azure-c-shared-utility", + "azure-macro-utils-c", + "umock-c", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "public-preview": { + "description": "General purpose library for communication over the mqtt protocol (public preview)", + "dependencies": [ + { + "name": "azure-c-shared-utility", + "features": [ + "public-preview" + ] + }, + { + "name": "azure-macro-utils-c", + "features": [ + "public-preview" + ] + }, + { + "name": "umock-c", + "features": [ + "public-preview" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/b64/CMakeLists.txt b/externals/vcpkg/ports/b64/CMakeLists.txt new file mode 100755 index 000000000..e40d14ef3 --- /dev/null +++ b/externals/vcpkg/ports/b64/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.20) +project(b64) + +if (BUILD_SHARED_LIBS) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/b64_dynamic_config.h ${CMAKE_CURRENT_BINARY_DIR}/b64_config.h) +else() + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/b64_static_config.h ${CMAKE_CURRENT_BINARY_DIR}/b64_config.h) +endif() + +set(SRC_DIR src) +set(INC_DIR include/b64) +set(SOURCE_FILES ${SRC_DIR}/cdecode.c ${SRC_DIR}/cencode.c) +set(HEADER_FILES ${INC_DIR}/cdecode.h ${INC_DIR}/cencode.h ${INC_DIR}/decode.h ${INC_DIR}/encode.h ${INC_DIR}/ccommon.h ${CMAKE_CURRENT_BINARY_DIR}/b64_config.h) + +add_library(b64 ${SOURCE_FILES} ${HEADER_FILES}) + +if (BUILD_SHARED_LIBS) + target_compile_definitions(b64 PRIVATE LIBB64_EXPORTS=1) +endif() + +target_include_directories(b64 + PRIVATE include ${CMAKE_CURRENT_BINARY_DIR} + INTERFACE $ +) + +set_property(TARGET b64 + PROPERTY PUBLIC_HEADER ${HEADER_FILES}) + +install(TARGETS b64 + EXPORT unofficial-b64-config + LIBRARY DESTINATION lib + PUBLIC_HEADER DESTINATION include/b64 +) + +install(EXPORT unofficial-b64-config + FILE unofficial-b64-config.cmake + NAMESPACE unofficial::b64:: + DESTINATION share/unofficial-b64 +) + diff --git a/externals/vcpkg/ports/b64/b64_dynamic_config.h b/externals/vcpkg/ports/b64/b64_dynamic_config.h new file mode 100755 index 000000000..b836ca2a5 --- /dev/null +++ b/externals/vcpkg/ports/b64/b64_dynamic_config.h @@ -0,0 +1,14 @@ +#ifndef B64_CONFIG_H +#define B64_CONFIG_H + +#ifdef _WIN32 + #ifdef LIBB64_EXPORTS + #define LIBB64 __declspec(dllexport) + #else + #define LIBB64 __declspec(dllimport) + #endif +#else +#define LIBB64 +#endif + +#endif diff --git a/externals/vcpkg/ports/b64/b64_static_config.h b/externals/vcpkg/ports/b64/b64_static_config.h new file mode 100755 index 000000000..f261c7cf2 --- /dev/null +++ b/externals/vcpkg/ports/b64/b64_static_config.h @@ -0,0 +1,6 @@ +#ifndef B64_CONFIG_H +#define B64_CONFIG_H + +#define LIBB64 + +#endif diff --git a/externals/vcpkg/ports/b64/portfile.cmake b/externals/vcpkg/ports/b64/portfile.cmake new file mode 100755 index 000000000..51ba61141 --- /dev/null +++ b/externals/vcpkg/ports/b64/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libb64/libb64 + REF v2.0.0.1 + SHA512 72c2fd4c81575b505f4851cd3820b6a2d8e78cd031a1ed138ffe5667ca711558f43b515428971966f7a73ace7c9951f1f0b39c362a59fe4691958875775cce23 + HEAD_REF master + PATCHES "windows-fix.patch" +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/b64_dynamic_config.h" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/b64_static_config.h" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-b64) + +vcpkg_copy_pdbs() + + +# handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/b64/vcpkg.json b/externals/vcpkg/ports/b64/vcpkg.json new file mode 100755 index 000000000..6c9d51104 --- /dev/null +++ b/externals/vcpkg/ports/b64/vcpkg.json @@ -0,0 +1,18 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", + "name": "b64", + "version": "2.0.0.1", + "port-version": 1, + "description": "libb64 is a library of ANSI C routines for fast encoding/decoding data into and from a base64-encoded format", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/b64/windows-fix.patch b/externals/vcpkg/ports/b64/windows-fix.patch new file mode 100755 index 000000000..ccabfad2e --- /dev/null +++ b/externals/vcpkg/ports/b64/windows-fix.patch @@ -0,0 +1,130 @@ +diff --git a/include/b64/ccommon.h b/include/b64/ccommon.h +index 2b614df..0e46141 100644 +--- a/include/b64/ccommon.h ++++ b/include/b64/ccommon.h +@@ -10,11 +10,12 @@ For details, see http://sourceforge.net/projects/libb64 + + #define BASE64_VER_MAJOR 2 + #define BASE64_VER_MINOR 0 ++#include "b64_config.h" + + #ifndef HAVE_SIZE_T + #ifdef _WIN32 + #include +- #elseif defined (__unix__) || (defined (__APPLE__) && defined (__MACH__)) ++ #elif defined (__unix__) || (defined (__APPLE__) && defined (__MACH__)) + #include + #else + typedef unsigned long size_t; +diff --git a/include/b64/cdecode.h b/include/b64/cdecode.h +index d6ff24c..4553efc 100644 +--- a/include/b64/cdecode.h ++++ b/include/b64/cdecode.h +@@ -24,11 +24,11 @@ typedef struct + char plainchar; + } base64_decodestate; + +-extern void base64_init_decodestate(base64_decodestate* state_in); ++extern LIBB64 void base64_init_decodestate(base64_decodestate* state_in); + +-extern size_t base64_decode_maxlength(size_t encode_len); ++extern LIBB64 size_t base64_decode_maxlength(size_t encode_len); + +-extern int base64_decode_value(signed char value_in); +-extern size_t base64_decode_block(const char* code_in, const size_t length_in, void* plaintext_out, base64_decodestate* state_in); ++extern LIBB64 int base64_decode_value(signed char value_in); ++extern LIBB64 size_t base64_decode_block(const char* code_in, const size_t length_in, void* plaintext_out, base64_decodestate* state_in); + + #endif /* BASE64_CDECODE_H */ +diff --git a/include/b64/cencode.h b/include/b64/cencode.h +index 96b0cdb..1feb695 100644 +--- a/include/b64/cencode.h ++++ b/include/b64/cencode.h +@@ -31,12 +31,12 @@ typedef struct + char result; + } base64_encodestate; + +-extern void base64_init_encodestate(base64_encodestate* state_in); ++extern LIBB64 void base64_init_encodestate(base64_encodestate* state_in); + +-extern size_t base64_encode_length(size_t plain_len, base64_encodestate* state_in); ++extern LIBB64 size_t base64_encode_length(size_t plain_len, base64_encodestate* state_in); + +-extern char base64_encode_value(signed char value_in); +-extern size_t base64_encode_block(const void* plaintext_in, const size_t length_in, char* code_out, base64_encodestate* state_in); +-extern size_t base64_encode_blockend(char* code_out, base64_encodestate* state_in); ++extern LIBB64 char base64_encode_value(signed char value_in); ++extern LIBB64 size_t base64_encode_block(const void* plaintext_in, const size_t length_in, char* code_out, base64_encodestate* state_in); ++extern LIBB64 size_t base64_encode_blockend(char* code_out, base64_encodestate* state_in); + + #endif /* BASE64_CENCODE_H */ +diff --git a/include/b64/decode.h b/include/b64/decode.h +index b2362e5..dd772d4 100644 +--- a/include/b64/decode.h ++++ b/include/b64/decode.h +@@ -22,23 +22,23 @@ namespace base64 + base64_decodestate _state; + int _buffersize; + +- decoder(int buffersize_in = BUFFERSIZE) ++ LIBB64 decoder(int buffersize_in = BUFFERSIZE) + : _buffersize(buffersize_in) + { + base64_init_decodestate(&_state); + } + +- int decode(char value_in) ++ LIBB64 int decode(char value_in) + { + return base64_decode_value(value_in); + } + +- std::streamsize decode(const char* code_in, const std::streamsize length_in, char* plaintext_out) ++ LIBB64 std::streamsize decode(const char* code_in, const std::streamsize length_in, char* plaintext_out) + { + return base64_decode_block(code_in, static_cast(length_in), plaintext_out, &_state); + } + +- void decode(std::istream& istream_in, std::ostream& ostream_in) ++ LIBB64 void decode(std::istream& istream_in, std::ostream& ostream_in) + { + base64_init_decodestate(&_state); + // +diff --git a/include/b64/encode.h b/include/b64/encode.h +index c1a5f88..ff2c9b4 100644 +--- a/include/b64/encode.h ++++ b/include/b64/encode.h +@@ -22,28 +22,28 @@ namespace base64 + base64_encodestate _state; + int _buffersize; + +- encoder(int buffersize_in = BUFFERSIZE) ++ LIBB64 encoder(int buffersize_in = BUFFERSIZE) + : _buffersize(buffersize_in) + { + base64_init_encodestate(&_state); + } + +- int encode(char value_in) ++ LIBB64 int encode(char value_in) + { + return base64_encode_value(value_in); + } + +- std::streamsize encode(const char* code_in, const std::streamsize length_in, char* plaintext_out) ++ LIBB64 std::streamsize encode(const char* code_in, const std::streamsize length_in, char* plaintext_out) + { + return base64_encode_block(code_in, static_cast(length_in), plaintext_out, &_state); + } + +- int encode_end(char* plaintext_out) ++ LIBB64 int encode_end(char* plaintext_out) + { + return base64_encode_blockend(plaintext_out, &_state); + } + +- void encode(std::istream& istream_in, std::ostream& ostream_in) ++ LIBB64 void encode(std::istream& istream_in, std::ostream& ostream_in) + { + base64_init_encodestate(&_state); + // diff --git a/externals/vcpkg/ports/basisu/fix-addostream.patch b/externals/vcpkg/ports/basisu/fix-addostream.patch new file mode 100755 index 000000000..cd9308bf5 --- /dev/null +++ b/externals/vcpkg/ports/basisu/fix-addostream.patch @@ -0,0 +1,12 @@ +diff --git a/src/encoder/basisu_enc.h b/src/encoder/basisu_enc.h +index 05656da..468f43b 100644 +--- a/src/encoder/basisu_enc.h ++++ b/src/encoder/basisu_enc.h +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + #ifndef _WIN32 + #include diff --git a/externals/vcpkg/ports/basisu/portfile.cmake b/externals/vcpkg/ports/basisu/portfile.cmake new file mode 100755 index 000000000..8873c52fc --- /dev/null +++ b/externals/vcpkg/ports/basisu/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jherico/basis_universal + REF 497875f756ed0e3eb62e0ff08d55c62242f4be74 + SHA512 2293b78620a7ed510dbecf48bcae5f4b8524fe9020f864c8e79cf94ea9d95d51dddf83a5b4ea29cc95db19f87137bfef1cb68b7fbc6387e08bb42898d81c9303 + HEAD_REF master + PATCHES fix-addostream.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTS=OFF +) + +vcpkg_install_cmake() + +#vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/basisu) +if (WIN32) + set(TOOL_NAME basisu_tool.exe) +else() + set(TOOL_NAME basisu_tool) +endif() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(COPY ${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/basisu) + +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/basisu) + +# Remove unnecessary files +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME}) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/basisu/vcpkg.json b/externals/vcpkg/ports/basisu/vcpkg.json new file mode 100755 index 000000000..a0fe5cc68 --- /dev/null +++ b/externals/vcpkg/ports/basisu/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "basisu", + "version-string": "1.11", + "port-version": 5, + "description": "Basis Universal is a supercompressed GPU texture and video compression format that outputs a highly compressed intermediate file format (.basis) that can be quickly transcoded to a wide variety of GPU texture compression formats.", + "homepage": "https://github.com/BinomialLLC/basis_universal", + "dependencies": [ + "lodepng" + ] +} diff --git a/externals/vcpkg/ports/bcg729/disable-alt-packaging.patch b/externals/vcpkg/ports/bcg729/disable-alt-packaging.patch new file mode 100755 index 000000000..b53c77d24 --- /dev/null +++ b/externals/vcpkg/ports/bcg729/disable-alt-packaging.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 69dbaef..695f4d0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -125,5 +125,4 @@ install(FILES + DESTINATION ${CONFIG_PACKAGE_LOCATION} + ) + +-add_subdirectory(build) + diff --git a/externals/vcpkg/ports/bcg729/portfile.cmake b/externals/vcpkg/ports/bcg729/portfile.cmake new file mode 100755 index 000000000..02b510a5b --- /dev/null +++ b/externals/vcpkg/ports/bcg729/portfile.cmake @@ -0,0 +1,46 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO BelledonneCommunications/bcg729 + REF 1.1.1 + SHA512 e8cc4b7486a9a29fb729ab9fd9e3c4a2155573f38cec16f5a53db3b416fc1119ea5f5a61243a8d37cb0b64580c5df1b632ff165dc7ff47421fa567dafffaacd8 + HEAD_REF master + PATCHES + disable-alt-packaging.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENABLE_STATIC=${ENABLE_STATIC} + -DENABLE_SHARED=${ENABLE_SHARED} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME Bcg729) +file(GLOB cmake_files "${CURRENT_PACKAGES_DIR}/share/Bcg729/cmake/*.cmake") +file(COPY ${cmake_files} DESTINATION "${CURRENT_PACKAGES_DIR}/share/bcg729") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Bcg729/cmake") +file(GLOB_RECURSE remaining_files "${CURRENT_PACKAGES_DIR}/share/Bcg729/*") +if(NOT remaining_files) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Bcg729") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() + +file(READ "${SOURCE_PATH}/LICENSE.txt" GPL3) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" [[ +bcg729 is dual licensed, and is available either: + - under a GNU/GPLv3 license, for free (open source). See below. + - under a proprietary license, for a fee, to be used in closed source applications. + Contact Belledonne Communications (https://www.linphone.org/contact) + for any question about costs and services. + + +]] ${GPL3}) diff --git a/externals/vcpkg/ports/bcg729/vcpkg.json b/externals/vcpkg/ports/bcg729/vcpkg.json new file mode 100755 index 000000000..4a08dcd9c --- /dev/null +++ b/externals/vcpkg/ports/bcg729/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "bcg729", + "version": "1.1.1", + "port-version": 3, + "description": "Bcg729 is an open source implementation of the ITU G.729 Annex A and B codec.", + "homepage": "https://github.com/BelledonneCommunications/bcg729", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/bddisasm/portfile.cmake b/externals/vcpkg/ports/bddisasm/portfile.cmake new file mode 100755 index 000000000..3a23531d0 --- /dev/null +++ b/externals/vcpkg/ports/bddisasm/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO bitdefender/bddisasm + REF v1.34.7 + SHA512 e4bd0895b285030f0aba4d5666a5da66cee6e1766e68a9527d1c2ca6160690270d55819ab8f6357b0f61fd52fb13b87ca7c15ee5694185564cc9bb55b62eb9ff + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DBDD_INCLUDE_TOOL=OFF +) + +vcpkg_cmake_install() + +file(INSTALL + ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright +) + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/bddisasm) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/bddisasm/vcpkg.json b/externals/vcpkg/ports/bddisasm/vcpkg.json new file mode 100755 index 000000000..4cbc024b4 --- /dev/null +++ b/externals/vcpkg/ports/bddisasm/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "bddisasm", + "version": "1.34.7", + "port-version": 1, + "maintainers": "Cristi Anichitei ", + "description": "bddisasm is a fast, lightweight, x86/x64 instruction decoder and emulator.", + "homepage": "https://github.com/bitdefender/bddisasm", + "documentation": "https://bddisasm.readthedocs.io/en/latest/", + "license": "Apache-2.0", + "supports": "!arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/bde/portfile.cmake b/externals/vcpkg/ports/bde/portfile.cmake new file mode 100755 index 000000000..63d4a8422 --- /dev/null +++ b/externals/vcpkg/ports/bde/portfile.cmake @@ -0,0 +1,138 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --library-type=static) + +set(BDE_VERSION 3.2.0.0) +set(BDE_TOOLS_VERSION 1.x) + +# Paths used in build +set(SOURCE_PATH_DEBUG ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bde-${BDE_VERSION}) +set(SOURCE_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bde-${BDE_VERSION}) + +# Acquire Python 2 and add it to PATH +vcpkg_find_acquire_program(PYTHON2) +get_filename_component(PYTHON2_EXE_PATH ${PYTHON2} DIRECTORY) + +# Acquire BDE Tools and add them to PATH +vcpkg_from_github( + OUT_SOURCE_PATH TOOLS_PATH + REPO "bloomberg/bde-tools" + REF d4b1a7670829228f4ec81ecdccc598ce03ae8e80 + SHA512 80af734c080adb225d5369157301ae0af18e02b1912351e34d23f5f2ba4e19f9ae2b5a367923f036330c9f9afd11a90cdf12680eb3e59b4297a312a1b713f17f + HEAD_REF master +) +message(STATUS "Configure bde-tools-v${BDE_TOOLS_VERSION}") +if(VCPKG_CMAKE_SYSTEM_NAME) + set(ENV{PATH} "$ENV{PATH}:${PYTHON2_EXE_PATH}") + set(ENV{PATH} "$ENV{PATH}:${TOOLS_PATH}/bin") +else() + set(ENV{PATH} "$ENV{PATH};${PYTHON2_EXE_PATH}") + set(ENV{PATH} "$ENV{PATH};${TOOLS_PATH}/bin") +endif() + +# Acquire BDE sources +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "bloomberg/bde" + REF 3720d132d0879f19b9084cca62ebc75f1f24e1a3 + SHA512 234ebb71997f5b7d3951584235ead10f977689cef323ae1c198629a6b1995b1481d8a1515d827c46df10209bdc66e1f3cc7780dafee9ca0ff4172be47c460d78 + HEAD_REF master +) + +# Clean up previous builds +file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel + ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) + +# Identify waf executable and calculate configure args +if(VCPKG_CMAKE_SYSTEM_NAME) + set(WAF_COMMAND waf) +else() + set(WAF_COMMAND waf.bat) +endif() +set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --use-flat-include-dir) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --abi-bits=32) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --abi-bits=64) +else() + message(FATAL_ERROR "Unsupported target architecture: ${VCPKG_TARGET_ARCHITECTURE}") +endif() +if(VCPKG_TARGET_IS_WINDOWS) + set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --msvc-runtime-type=static) +else() + set(ENV{CFLAGS} "$ENV{CFLAGS} -Wno-error=implicit-function-declaration") +endif() + +# Configure debug +message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") +vcpkg_execute_required_process( + COMMAND ${WAF_COMMAND} configure ${CONFIGURE_COMMON_ARGS} + --prefix=${CURRENT_PACKAGES_DIR}/debug --out=${SOURCE_PATH_DEBUG} + --build-type=debug + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME configure-${TARGET_TRIPLET}--dbg +) +message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done") + +# Build debug +message(STATUS "Building ${TARGET_TRIPLET}-dbg") +vcpkg_execute_required_process( + COMMAND ${WAF_COMMAND} build + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME build-${TARGET_TRIPLET}--dbg +) +message(STATUS "Building ${TARGET_TRIPLET}-dbg done") + +# Install debug +message(STATUS "Installing ${TARGET_TRIPLET}-dbg") +vcpkg_execute_required_process( + COMMAND ${WAF_COMMAND} install + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME install-${TARGET_TRIPLET}--dbg +) +# Include files should not be duplicated +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +# pkg-config files should point to correct include directory +file(GLOB PC_FILES "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc") +foreach(PC_FILE_NAME ${PC_FILES}) + file(READ "${PC_FILE_NAME}" _contents) + string(REPLACE "includedir=\${prefix}/include" "includedir=\${prefix}/../include" _contents "${_contents}") + file(WRITE "${PC_FILE_NAME}" "${_contents}") +endforeach() +message(STATUS "Installing ${TARGET_TRIPLET}-dbg done") + +# Configure release +message(STATUS "Configuring ${TARGET_TRIPLET}-rel") +vcpkg_execute_required_process( + COMMAND ${WAF_COMMAND} configure ${CONFIGURE_COMMON_ARGS} + --prefix=${CURRENT_PACKAGES_DIR} --out=${SOURCE_PATH_RELEASE} + --build-type=release + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME configure-${TARGET_TRIPLET}--rel +) +message(STATUS "Configuring ${TARGET_TRIPLET}-rel done") + +# Build release +message(STATUS "Building ${TARGET_TRIPLET}-rel") +vcpkg_execute_required_process( + COMMAND ${WAF_COMMAND} build + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME build-${TARGET_TRIPLET}--rel +) +message(STATUS "Building ${TARGET_TRIPLET}-rel done") + +# Install release +message(STATUS "Installing ${TARGET_TRIPLET}-rel") +vcpkg_execute_required_process( + COMMAND ${WAF_COMMAND} install + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME install-${TARGET_TRIPLET}--rel +) +message(STATUS "Installing ${TARGET_TRIPLET}-rel done") + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/bde + RENAME copyright +) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/bde/vcpkg.json b/externals/vcpkg/ports/bde/vcpkg.json new file mode 100755 index 000000000..b4e77488f --- /dev/null +++ b/externals/vcpkg/ports/bde/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "bde", + "version": "3.2.0.0", + "port-version": 5, + "description": "Basic Development Environment - a set of foundational C++ libraries used at Bloomberg.", + "supports": "!windows & !arm" +} diff --git a/externals/vcpkg/ports/bdwgc/portfile.cmake b/externals/vcpkg/ports/bdwgc/portfile.cmake new file mode 100755 index 000000000..9fe8ed0f8 --- /dev/null +++ b/externals/vcpkg/ports/bdwgc/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ivmai/bdwgc + REF 5fab1a01931a1a6934ccf1d5eaa1e51f0a8dac4d # v8.2.0-20211115 + SHA512 b1a97aad10df33bb242985eb48f1bb2d3082d88f26c34014efce3d0f233bcd18a0f43f1bd960600ad9e22bcb19ebf04e573c74dfc1abfb771aa6b8525053c14b + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Denable_cplusplus=ON + -Denable_docs=OFF + -DCFLAGS_EXTRA=-I${CURRENT_INSTALLED_DIR}/include # for libatomic_ops + OPTIONS_DEBUG + -Dinstall_headers=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/bdwgc) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/README.QUICK" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/bdwgc/vcpkg.json b/externals/vcpkg/ports/bdwgc/vcpkg.json new file mode 100755 index 000000000..f99581153 --- /dev/null +++ b/externals/vcpkg/ports/bdwgc/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "bdwgc", + "version": "8.2.0", + "port-version": 3, + "description": "The Boehm-Demers-Weiser conservative C/C++ Garbage Collector (libgc, bdwgc, boehm-gc)", + "homepage": "http://www.hboehm.info/gc/", + "dependencies": [ + "libatomic-ops", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/beast/portfile.cmake b/externals/vcpkg/ports/beast/portfile.cmake new file mode 100755 index 000000000..065116c27 --- /dev/null +++ b/externals/vcpkg/ports/beast/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/beast/vcpkg.json b/externals/vcpkg/ports/beast/vcpkg.json new file mode 100755 index 000000000..7fd6806ce --- /dev/null +++ b/externals/vcpkg/ports/beast/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "beast", + "version-string": "0", + "port-version": 1, + "description": "HTTP/1 and WebSocket, header-only using Boost.Asio and C++11", + "homepage": "https://www.boost.org/doc/libs/release/libs/beast/", + "dependencies": [ + "boost-beast" + ] +} diff --git a/externals/vcpkg/ports/behaviortree-cpp/001_port_fixes.patch b/externals/vcpkg/ports/behaviortree-cpp/001_port_fixes.patch new file mode 100755 index 000000000..9897caa18 --- /dev/null +++ b/externals/vcpkg/ports/behaviortree-cpp/001_port_fixes.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a390aed..658f994 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -233,7 +233,7 @@ if( ZMQ_FOUND ) + endif() + + if(MSVC) +- target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE /W3 /WX) ++ target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE /W3 /wd4702) + else() + target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE + -Wall -Wextra -Werror=return-type) diff --git a/externals/vcpkg/ports/behaviortree-cpp/002_fix_dependencies.patch b/externals/vcpkg/ports/behaviortree-cpp/002_fix_dependencies.patch new file mode 100755 index 000000000..d554e37ce --- /dev/null +++ b/externals/vcpkg/ports/behaviortree-cpp/002_fix_dependencies.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 658f994..a04cf27 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,7 +14,7 @@ if(MSVC) + endif() + + #---- Include boost to add coroutines ---- +-find_package(Boost COMPONENTS coroutine QUIET) ++find_package(Boost REQUIRED) # coroutine2 is header-only + + if(Boost_FOUND) + string(REPLACE "." "0" Boost_VERSION_NODOT ${Boost_VERSION}) +@@ -46,17 +46,18 @@ option(BUILD_SHARED_LIBS "Build shared libraries" ON) + + #---- Find other packages ---- + find_package(Threads) +-find_package(ZMQ) ++find_package(cppzmq) + + list(APPEND BEHAVIOR_TREE_PUBLIC_LIBRARIES + ${CMAKE_THREAD_LIBS_INIT} + ${CMAKE_DL_LIBS} + ) + +-if( ZMQ_FOUND ) ++if( ZMQ_FOUND OR ON ) + message(STATUS "ZeroMQ found.") + add_definitions( -DZMQ_FOUND ) + list(APPEND BT_SOURCE src/loggers/bt_zmq_publisher.cpp) ++ list(APPEND BEHAVIOR_TREE_EXTERNAL_LIBRARIES cppzmq) + else() + message(WARNING "ZeroMQ NOT found. Skipping the build of [PublisherZMQ] and [bt_recorder].") + endif() diff --git a/externals/vcpkg/ports/behaviortree-cpp/portfile.cmake b/externals/vcpkg/ports/behaviortree-cpp/portfile.cmake new file mode 100755 index 000000000..79feac53a --- /dev/null +++ b/externals/vcpkg/ports/behaviortree-cpp/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/BehaviorTree/BehaviorTree.CPP/archive/3.5.6.tar.gz" + FILENAME "BehaviorTree.CPP.3.5.6.tar.gz" + SHA512 cd3b15eb7c5bab68239b697da166220b4df8dd7e6cf5e831f316d411e24be56c9ed74e54a3e3dd332164d740159eaf9ce62d005601fd65133809dab29430c9b7 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + 001_port_fixes.patch + 002_fix_dependencies.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_ament_cmake=1 + -DCMAKE_DISABLE_FIND_PACKAGE_Curses=1 + -DBUILD_EXAMPLES=OFF + -DBUILD_UNIT_TESTS=OFF + -DBUILD_TOOLS=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/BehaviorTreeV3/cmake TARGET_PATH share/behaviortreev3) +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/lib/BehaviorTreeV3" + "${CURRENT_PACKAGES_DIR}/debug/lib/BehaviorTreeV3" +) diff --git a/externals/vcpkg/ports/behaviortree-cpp/vcpkg.json b/externals/vcpkg/ports/behaviortree-cpp/vcpkg.json new file mode 100755 index 000000000..835160cc3 --- /dev/null +++ b/externals/vcpkg/ports/behaviortree-cpp/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "behaviortree-cpp", + "version": "3.5.6", + "port-version": 2, + "description": "Behavior Trees Library in C++.", + "homepage": "https://www.behaviortree.dev", + "supports": "!uwp", + "dependencies": [ + "boost-coroutine2", + "cppzmq" + ] +} diff --git a/externals/vcpkg/ports/benchmark/portfile.cmake b/externals/vcpkg/ports/benchmark/portfile.cmake new file mode 100755 index 000000000..c89c45bb1 --- /dev/null +++ b/externals/vcpkg/ports/benchmark/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/benchmark + REF v1.6.1 + SHA512 7d3e3baf5a2d92e9552ab5007c37253b3510ac269edf8922a2794ff3dfbd0bf5b4c519240d4577b1ec30ef9e8a64caa17a809054c3dc7f2b1bcd410596177d67 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DBENCHMARK_ENABLE_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/benchmark) + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/benchmark/vcpkg.json b/externals/vcpkg/ports/benchmark/vcpkg.json new file mode 100755 index 000000000..d0764894c --- /dev/null +++ b/externals/vcpkg/ports/benchmark/vcpkg.json @@ -0,0 +1,18 @@ +{ + "$comment": "https://github.com/google/benchmark/issues/661 describes the missing UWP support upstream", + "name": "benchmark", + "version-semver": "1.6.1", + "description": "A library to support the benchmarking of functions, similar to unit-tests.", + "homepage": "https://github.com/google/benchmark", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/bento4/fix-install.patch b/externals/vcpkg/ports/bento4/fix-install.patch new file mode 100755 index 000000000..5de2edc72 --- /dev/null +++ b/externals/vcpkg/ports/bento4/fix-install.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6de3bfe..2b2239a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -81,3 +81,20 @@ foreach(app ${BENTO4_APPS}) + endif() + endforeach() + endif(BUILD_APPS) ++ ++file(GLOB AP4_INCLUDES ++ ${SOURCE_CODECS}/*.h ++ ${SOURCE_CORE}/*.h ++ ${SOURCE_CRYPTO}/*.h ++ ${SOURCE_METADATA}/*.h ++) ++ ++# Install targets ++install(TARGETS ap4 ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++) ++ ++# Install headers ++install(FILES ${AP4_INCLUDES} DESTINATION include/bento4) diff --git a/externals/vcpkg/ports/bento4/portfile.cmake b/externals/vcpkg/ports/bento4/portfile.cmake new file mode 100755 index 000000000..ae6e04103 --- /dev/null +++ b/externals/vcpkg/ports/bento4/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO axiomatic-systems/Bento4 + REF 83c48e6e2a3f8e4be7ad2eddaa0639303184146d # v1.6.0-639 + SHA512 764c1102dc1e2a0f48395427b5b0a96f87d7124cceb61eb24008f245cf1f5f057753307c38f6f7e74d6838d6600c436d8540e94cbca12385cb4fffb02995069b + HEAD_REF master + PATCHES + fix-install.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_APPS=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/Documents/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/bento4/vcpkg.json b/externals/vcpkg/ports/bento4/vcpkg.json new file mode 100755 index 000000000..9103b59eb --- /dev/null +++ b/externals/vcpkg/ports/bento4/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "bento4", + "version": "1.6.0-639", + "port-version": 1, + "description": "Bento4 is a C++ class library and tools designed to read and write ISO-MP4 files. This format is defined in international specifications ISO/IEC 14496-12, 14496-14 and 14496-15.", + "homepage": "https://github.com/axiomatic-systems/Bento4", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/berkeleydb/CMakeLists.txt b/externals/vcpkg/ports/berkeleydb/CMakeLists.txt new file mode 100755 index 000000000..9297aacef --- /dev/null +++ b/externals/vcpkg/ports/berkeleydb/CMakeLists.txt @@ -0,0 +1,278 @@ +cmake_minimum_required(VERSION 3.8) +project(berkeleydb C CXX) + +option(INSTALL_HEADERS "Install header files" ON) + +add_definitions( + -DWIN32 + -D_WINDOWS + -D_CRT_SECURE_NO_DEPRECATE + -D_CRT_NONSTDC_NO_DEPRECATE + -D_LIB + -DUNICODE + -D_UNICODE +) + +if (BUILD_SHARED_LIBS) + add_definitions( + -DDB_CREATE_DLL + -D_USRDLL + ) +else() + add_definitions( + -D_LIB + ) +endif() + +add_library(libdb48 + btree/bt_compact.c + btree/bt_compare.c + btree/bt_compress.c + btree/bt_conv.c + btree/bt_curadj.c + btree/bt_cursor.c + btree/bt_delete.c + btree/bt_method.c + btree/bt_open.c + btree/bt_put.c + btree/bt_rec.c + btree/bt_reclaim.c + btree/bt_recno.c + btree/bt_rsearch.c + btree/bt_search.c + btree/bt_split.c + btree/bt_stat.c + btree/bt_upgrade.c + btree/bt_verify.c + btree/btree_auto.c + db/crdel_auto.c + db/crdel_rec.c + common/crypto_stub.c + cxx/cxx_db.cpp + cxx/cxx_dbc.cpp + cxx/cxx_dbt.cpp + cxx/cxx_env.cpp + cxx/cxx_except.cpp + cxx/cxx_lock.cpp + cxx/cxx_logc.cpp + cxx/cxx_mpool.cpp + cxx/cxx_multi.cpp + cxx/cxx_seq.cpp + cxx/cxx_txn.cpp + db/db.c + db/db_am.c + db/db_auto.c + common/db_byteorder.c + db/db_cam.c + db/db_cds.c + db/db_conv.c + db/db_dispatch.c + db/db_dup.c + common/db_err.c + common/db_getlong.c + common/db_idspace.c + common/db_compint.c + db/db_iface.c + db/db_join.c + common/db_log2.c + db/db_meta.c + db/db_method.c + db/db_open.c + db/db_overflow.c + db/db_ovfl_vrfy.c + db/db_pr.c + db/db_rec.c + db/db_reclaim.c + db/db_remove.c + db/db_rename.c + db/db_ret.c + db/db_setid.c + db/db_setlsn.c + common/db_shash.c + db/db_sort_multiple.c + db/db_stati.c + db/db_truncate.c + db/db_upg.c + db/db_upg_opd.c + db/db_vrfy.c + db/db_vrfyutil.c + db/partition.c + dbm/dbm.c + dbreg/dbreg.c + dbreg/dbreg_auto.c + dbreg/dbreg_rec.c + dbreg/dbreg_stat.c + dbreg/dbreg_util.c + common/dbt.c + env/env_alloc.c + env/env_config.c + env/env_failchk.c + env/env_file.c + env/env_globals.c + env/env_method.c + env/env_name.c + env/env_open.c + env/env_recover.c + env/env_region.c + env/env_register.c + env/env_sig.c + env/env_stat.c + fileops/fileops_auto.c + fileops/fop_basic.c + fileops/fop_rec.c + fileops/fop_util.c + hash/hash.c + hash/hash_auto.c + hash/hash_conv.c + hash/hash_dup.c + hash/hash_func.c + hash/hash_meta.c + hash/hash_method.c + hash/hash_open.c + hash/hash_page.c + hash/hash_rec.c + hash/hash_reclaim.c + hash/hash_stat.c + hash/hash_upgrade.c + hash/hash_verify.c + hmac/hmac.c + hsearch/hsearch.c + build_windows/libdb.def + lock/lock.c + lock/lock_deadlock.c + lock/lock_failchk.c + lock/lock_id.c + lock/lock_list.c + lock/lock_method.c + lock/lock_region.c + lock/lock_stat.c + lock/lock_timer.c + lock/lock_util.c + log/log.c + log/log_archive.c + log/log_compare.c + log/log_debug.c + log/log_get.c + log/log_method.c + log/log_put.c + log/log_stat.c + common/mkpath.c + mp/mp_alloc.c + mp/mp_bh.c + mp/mp_fget.c + mp/mp_fmethod.c + mp/mp_fopen.c + mp/mp_fput.c + mp/mp_fset.c + mp/mp_method.c + mp/mp_mvcc.c + mp/mp_region.c + mp/mp_register.c + mp/mp_resize.c + mp/mp_stat.c + mp/mp_sync.c + mp/mp_trickle.c + mutex/mut_alloc.c + mutex/mut_failchk.c + mutex/mut_method.c + mutex/mut_region.c + mutex/mut_stat.c + mutex/mut_win32.c + common/openflags.c + os/os_abort.c + os/os_addrinfo.c + os_windows/os_abs.c + os/os_alloc.c + os_windows/os_clock.c + os_windows/os_config.c + os_windows/os_cpu.c + os/os_ctime.c + os_windows/os_dir.c + os_windows/os_errno.c + os_windows/os_fid.c + os_windows/os_flock.c + os_windows/os_fsync.c + os_windows/os_getenv.c + os_windows/os_handle.c + os_windows/os_map.c + os_windows/os_mkdir.c + os_windows/os_open.c + os/os_pid.c + os_windows/os_rename.c + os/os_root.c + os/os_rpath.c + os_windows/os_rw.c + os_windows/os_seek.c + os/os_stack.c + os_windows/os_stat.c + os/os_tmpdir.c + os_windows/os_truncate.c + os/os_uid.c + os_windows/os_unlink.c + os_windows/os_yield.c + qam/qam.c + qam/qam_auto.c + qam/qam_conv.c + qam/qam_files.c + qam/qam_method.c + qam/qam_open.c + qam/qam_rec.c + qam/qam_stat.c + qam/qam_upgrade.c + qam/qam_verify.c + rep/rep_auto.c + rep/rep_backup.c + rep/rep_elect.c + rep/rep_lease.c + rep/rep_log.c + rep/rep_method.c + rep/rep_record.c + rep/rep_region.c + rep/rep_stat.c + rep/rep_util.c + rep/rep_verify.c + repmgr/repmgr_auto.c + repmgr/repmgr_elect.c + repmgr/repmgr_method.c + repmgr/repmgr_msg.c + repmgr/repmgr_net.c + repmgr/repmgr_queue.c + repmgr/repmgr_sel.c + repmgr/repmgr_stat.c + repmgr/repmgr_util.c + repmgr/repmgr_windows.c + sequence/seq_stat.c + sequence/sequence.c + hmac/sha1.c + clib/strsep.c + txn/txn.c + txn/txn_auto.c + txn/txn_chkpt.c + txn/txn_failchk.c + txn/txn_method.c + txn/txn_rec.c + txn/txn_recover.c + txn/txn_region.c + txn/txn_stat.c + txn/txn_util.c + common/os_method.c + common/util_cache.c + common/util_log.c + common/util_sig.c + common/zerofill.c +) + +include_directories(${CMAKE_CURRENT_SOURCE_DIR} build_windows dbinc) + +target_link_libraries(libdb48 PUBLIC ws2_32.lib) + +install(TARGETS libdb48 + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) + +if(INSTALL_HEADERS) + file(GLOB HEADERS build_windows/*.h) + install(FILES ${HEADERS} DESTINATION include) +endif() \ No newline at end of file diff --git a/externals/vcpkg/ports/berkeleydb/fix-conflict-macro.patch b/externals/vcpkg/ports/berkeleydb/fix-conflict-macro.patch new file mode 100755 index 000000000..c15d7edff --- /dev/null +++ b/externals/vcpkg/ports/berkeleydb/fix-conflict-macro.patch @@ -0,0 +1,123 @@ +diff --git a/dbinc/atomic.h b/dbinc/atomic.h +index 0034dcc..2dd5e03 100644 +--- a/dbinc/atomic.h ++++ b/dbinc/atomic.h +@@ -70,7 +70,7 @@ typedef struct { + * These have no memory barriers; the caller must include them when necessary. + */ + #define atomic_read(p) ((p)->value) +-#define atomic_init(p, val) ((p)->value = (val)) ++#define bdb_atomic_init(p, val) ((p)->value = (val)) + + #ifdef HAVE_ATOMIC_SUPPORT + +@@ -206,7 +206,7 @@ static inline int __atomic_compare_exchange( + #define atomic_dec(env, p) (--(p)->value) + #define atomic_compare_exchange(env, p, oldval, newval) \ + (DB_ASSERT(env, atomic_read(p) == (oldval)), \ +- atomic_init(p, (newval)), 1) ++ bdb_atomic_init(p, (newval)), 1) + #else + #define atomic_inc(env, p) __atomic_inc(env, p) + #define atomic_dec(env, p) __atomic_dec(env, p) +diff --git a/mp/mp_fget.c b/mp/mp_fget.c +index 5fdee5a..452ef17 100644 +--- a/mp/mp_fget.c ++++ b/mp/mp_fget.c +@@ -617,7 +617,7 @@ alloc: /* Allocate a new buffer header and data space. */ + + /* Initialize enough so we can call __memp_bhfree. */ + alloc_bhp->flags = 0; +- atomic_init(&alloc_bhp->ref, 1); ++ bdb_atomic_init(&alloc_bhp->ref, 1); + #ifdef DIAGNOSTIC + if ((uintptr_t)alloc_bhp->buf & (sizeof(size_t) - 1)) { + __db_errx(env, +@@ -911,7 +911,7 @@ alloc: /* Allocate a new buffer header and data space. */ + MVCC_MPROTECT(bhp->buf, mfp->stat.st_pagesize, + PROT_READ); + +- atomic_init(&alloc_bhp->ref, 1); ++ bdb_atomic_init(&alloc_bhp->ref, 1); + MUTEX_LOCK(env, alloc_bhp->mtx_buf); + alloc_bhp->priority = bhp->priority; + alloc_bhp->pgno = bhp->pgno; +diff --git a/mp/mp_mvcc.c b/mp/mp_mvcc.c +index 34467d2..b604388 100644 +--- a/mp/mp_mvcc.c ++++ b/mp/mp_mvcc.c +@@ -276,7 +276,7 @@ __memp_bh_freeze(dbmp, infop, hp, bhp, need_frozenp) + #else + memcpy(frozen_bhp, bhp, SSZA(BH, buf)); + #endif +- atomic_init(&frozen_bhp->ref, 0); ++ bdb_atomic_init(&frozen_bhp->ref, 0); + if (mutex != MUTEX_INVALID) + frozen_bhp->mtx_buf = mutex; + else if ((ret = __mutex_alloc(env, MTX_MPOOL_BH, +@@ -428,7 +428,7 @@ __memp_bh_thaw(dbmp, infop, hp, frozen_bhp, alloc_bhp) + #endif + alloc_bhp->mtx_buf = mutex; + MUTEX_LOCK(env, alloc_bhp->mtx_buf); +- atomic_init(&alloc_bhp->ref, 1); ++ bdb_atomic_init(&alloc_bhp->ref, 1); + F_CLR(alloc_bhp, BH_FROZEN); + } + +diff --git a/mp/mp_region.c b/mp/mp_region.c +index e6cece9..e3e3382 100644 +--- a/mp/mp_region.c ++++ b/mp/mp_region.c +@@ -224,7 +224,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg) + MTX_MPOOL_FILE_BUCKET, 0, &htab[i].mtx_hash)) != 0) + return (ret); + SH_TAILQ_INIT(&htab[i].hash_bucket); +- atomic_init(&htab[i].hash_page_dirty, 0); ++ bdb_atomic_init(&htab[i].hash_page_dirty, 0); + } + + /* +@@ -269,7 +269,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg) + hp->mtx_hash = (mtx_base == MUTEX_INVALID) ? MUTEX_INVALID : + mtx_base + i; + SH_TAILQ_INIT(&hp->hash_bucket); +- atomic_init(&hp->hash_page_dirty, 0); ++ bdb_atomic_init(&hp->hash_page_dirty, 0); + #ifdef HAVE_STATISTICS + hp->hash_io_wait = 0; + hp->hash_frozen = hp->hash_thawed = hp->hash_frozen_freed = 0; +diff --git a/mutex/mut_method.c b/mutex/mut_method.c +index 2588763..56b6723 100644 +--- a/mutex/mut_method.c ++++ b/mutex/mut_method.c +@@ -426,7 +426,7 @@ atomic_compare_exchange(env, v, oldval, newval) + MUTEX_LOCK(env, mtx); + ret = atomic_read(v) == oldval; + if (ret) +- atomic_init(v, newval); ++ bdb_atomic_init(v, newval); + MUTEX_UNLOCK(env, mtx); + + return (ret); +diff --git a/mutex/mut_tas.c b/mutex/mut_tas.c +index f3922e0..934a654 100644 +--- a/mutex/mut_tas.c ++++ b/mutex/mut_tas.c +@@ -46,7 +46,7 @@ __db_tas_mutex_init(env, mutex, flags) + + #ifdef HAVE_SHARED_LATCHES + if (F_ISSET(mutexp, DB_MUTEX_SHARED)) +- atomic_init(&mutexp->sharecount, 0); ++ bdb_atomic_init(&mutexp->sharecount, 0); + else + #endif + if (MUTEX_INIT(&mutexp->tas)) { +@@ -486,7 +486,7 @@ __db_tas_mutex_unlock(env, mutex) + F_CLR(mutexp, DB_MUTEX_LOCKED); + /* Flush flag update before zeroing count */ + MEMBAR_EXIT(); +- atomic_init(&mutexp->sharecount, 0); ++ bdb_atomic_init(&mutexp->sharecount, 0); + } else { + DB_ASSERT(env, sharecount > 0); + MEMBAR_EXIT(); diff --git a/externals/vcpkg/ports/berkeleydb/portfile.cmake b/externals/vcpkg/ports/berkeleydb/portfile.cmake new file mode 100755 index 000000000..5d3495496 --- /dev/null +++ b/externals/vcpkg/ports/berkeleydb/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://download.oracle.com/berkeley-db/db-4.8.30.NC.zip" + FILENAME "db-4.8.30.NC.zip" + SHA512 59c1d2d5a3551f988ab1dc063900572b67ad087537e0d71760de34601f9ebd4d5c070a49b809bec4a599a62417e9a162683ce0f6442deb1a0dadb80764bf6eab +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES fix-conflict-macro.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG -DINSTALL_HEADERS=OFF +) + +vcpkg_install_cmake() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/berkeleydb/vcpkg.json b/externals/vcpkg/ports/berkeleydb/vcpkg.json new file mode 100755 index 000000000..d9436faa6 --- /dev/null +++ b/externals/vcpkg/ports/berkeleydb/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "berkeleydb", + "version": "4.8.30", + "port-version": 8, + "description": "BDB - A high-performance embedded database for key/value data.", + "homepage": "https://download.oracle.com/", + "supports": "!(uwp | linux | osx)" +} diff --git a/externals/vcpkg/ports/bext-di/portfile.cmake b/externals/vcpkg/ports/bext-di/portfile.cmake new file mode 100755 index 000000000..36ce8c0a9 --- /dev/null +++ b/externals/vcpkg/ports/bext-di/portfile.cmake @@ -0,0 +1,17 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boost-ext/di + REF 6078f073feb8560127fbf0308b3794a551146252 # v1.2.0 + SHA512 d7876b10b0365a92095ee7edefdc9cb9a0e237baf2bad124a927f22ed6ec30e18802b20517bc032184f39b7b4d71f44e965bdcea074646871d0194bd4e851d43 + HEAD_REF cpp14 +) + +file(INSTALL ${SOURCE_PATH}/include/boost + DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +vcpkg_download_distfile(LICENSE + URLS https://www.boost.org/LICENSE_1_0.txt + FILENAME "di-copyright" + SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 +) +file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/bext-di/vcpkg.json b/externals/vcpkg/ports/bext-di/vcpkg.json new file mode 100755 index 000000000..2b47e5578 --- /dev/null +++ b/externals/vcpkg/ports/bext-di/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "bext-di", + "version": "1.2.0", + "port-version": 1, + "description": "C++14 Dependency Injection Library.", + "homepage": "https://github.com/boost-ext/di" +} diff --git a/externals/vcpkg/ports/bext-sml/portfile.cmake b/externals/vcpkg/ports/bext-sml/portfile.cmake new file mode 100755 index 000000000..3701e1616 --- /dev/null +++ b/externals/vcpkg/ports/bext-sml/portfile.cmake @@ -0,0 +1,15 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boost-ext/sml + REF v1.1.5 + SHA512 6babee6da2db93912afa2eb932591674a73f43609b7c2b0523e84ba682c09f6d4f67d1c7f6ea48f73f1f09de8df2eaf2ae30b3399c1602189ea08d42689758d7 + HEAD_REF master +) + +file(INSTALL "${SOURCE_PATH}/include/boost/sml.hpp" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/boost" +) + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/bext-sml/vcpkg.json b/externals/vcpkg/ports/bext-sml/vcpkg.json new file mode 100755 index 000000000..5b04bc3fc --- /dev/null +++ b/externals/vcpkg/ports/bext-sml/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "bext-sml", + "version": "1.1.5", + "description": "Your scalable C++14 one header only State Machine Library with no dependencies", + "homepage": "https://github.com/boost-ext/sml", + "license": "BSL-1.0" +} diff --git a/externals/vcpkg/ports/bext-ut/avoid-cpm.patch b/externals/vcpkg/ports/bext-ut/avoid-cpm.patch new file mode 100755 index 000000000..c1022543a --- /dev/null +++ b/externals/vcpkg/ports/bext-ut/avoid-cpm.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -36,7 +36,7 @@ + # ---- Add dependencies via CPM ---- + # see https://github.com/cpm-cmake/CPM.cmake for more info + +-if(CMAKE_VERSION VERSION_LESS 3.20.0) ++if(1) + # see https://github.com/TheLartians/PackageProject.cmake/pull/19 + include(cmake/PackageProject.cmake) + else() diff --git a/externals/vcpkg/ports/bext-ut/portfile.cmake b/externals/vcpkg/ports/bext-ut/portfile.cmake new file mode 100755 index 000000000..a76999db0 --- /dev/null +++ b/externals/vcpkg/ports/bext-ut/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boost-ext/ut + REF v1.1.9 + SHA512 81a6b80948d3a203534244f62f5f3ac57593083cc0c32484498a7d01d29455f7dcb33e2ec0587609b8dff33a81a5551796d7681d48fd93e817d6d0c31697234e + HEAD_REF master + PATCHES + avoid-cpm.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBOOST_UT_BUILD_BENCHMARKS=OFF + -DBOOST_UT_BUILD_EXAMPLES=OFF + -DBOOST_UT_BUILD_TESTS=OFF +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME ut CONFIG_PATH lib/cmake/ut-1.1.8) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" +) + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/bext-ut/vcpkg.json b/externals/vcpkg/ports/bext-ut/vcpkg.json new file mode 100755 index 000000000..8ede04611 --- /dev/null +++ b/externals/vcpkg/ports/bext-ut/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "bext-ut", + "version": "1.1.9", + "description": "UT: C++20 μ(micro)/Unit Testing Framework", + "homepage": "https://boost-ext.github.io/ut/", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/bext-wintls/portfile.cmake b/externals/vcpkg/ports/bext-wintls/portfile.cmake new file mode 100755 index 000000000..14ac5c893 --- /dev/null +++ b/externals/vcpkg/ports/bext-wintls/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO laudrup/boost-wintls + REF v0.9.5 + SHA512 5b6a88d64225c0f065d18f65319d44b90eb594431c53d9fbff72edfe2fc909613a966062b5636db7a3d0e36a389a0948dada0fbfa61b21b7b52b1af952d93071 + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/include/boost/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/boost/") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/" RENAME copyright) diff --git a/externals/vcpkg/ports/bext-wintls/vcpkg.json b/externals/vcpkg/ports/bext-wintls/vcpkg.json new file mode 100755 index 000000000..cb39e3137 --- /dev/null +++ b/externals/vcpkg/ports/bext-wintls/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "bext-wintls", + "version": "0.9.5", + "description": "Native Windows TLS stream wrapper for use with boost::asio", + "homepage": "https://github.com/laudrup/boost-wintls", + "supports": "windows", + "dependencies": [ + "boost-asio", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/bfgroup-lyra/portfile.cmake b/externals/vcpkg/ports/bfgroup-lyra/portfile.cmake new file mode 100755 index 000000000..1dcab723d --- /dev/null +++ b/externals/vcpkg/ports/bfgroup-lyra/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO bfgroup/Lyra + REF 1.6 + SHA512 e357fd0e925b67a51ad7232035ac66842676837baebf7a69eb416807b11400c283d098a22bf3ae27ce904700c5b849953ede1873d6535a8b34c4704ebcb09748 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME lyra + CONFIG_PATH share/lyra/cmake +) + +# Library is header-only, so no debug content. +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/bfgroup-lyra/vcpkg.json b/externals/vcpkg/ports/bfgroup-lyra/vcpkg.json new file mode 100755 index 000000000..c7189d7d8 --- /dev/null +++ b/externals/vcpkg/ports/bfgroup-lyra/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "bfgroup-lyra", + "version": "1.6", + "description": "A simple to use, composable, command line parser for C++ 11 and beyond", + "homepage": "https://bfgroup.github.io/Lyra/", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/bigint/CMakeLists.txt b/externals/vcpkg/ports/bigint/CMakeLists.txt new file mode 100755 index 000000000..fffc94192 --- /dev/null +++ b/externals/vcpkg/ports/bigint/CMakeLists.txt @@ -0,0 +1,42 @@ +cmake_minimum_required(VERSION 3.14.0) +project(bigint CXX) + +if(MSVC) + add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS) +endif() + +set(BIGINT_SRCS + BigUnsigned.cc + BigInteger.cc + BigIntegerAlgorithms.cc + BigUnsignedInABase.cc + BigIntegerUtils.cc +) + +set(BIGINT_HH + NumberlikeArray.hh + BigUnsigned.hh + BigInteger.hh + BigIntegerAlgorithms.hh + BigUnsignedInABase.hh + BigIntegerLibrary.hh + BigIntegerUtils.hh +) + +add_library(bigint ${BIGINT_SRCS}) +target_include_directories(bigint PUBLIC $ $) + +install( + TARGETS bigint + EXPORT bigint-config +) + +install( + EXPORT bigint-config + NAMESPACE bigint:: + DESTINATION share/bigint +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES ${BIGINT_HH} DESTINATION include/bigint) +endif() diff --git a/externals/vcpkg/ports/bigint/fix-osx-usage.patch b/externals/vcpkg/ports/bigint/fix-osx-usage.patch new file mode 100755 index 000000000..f387d7b29 --- /dev/null +++ b/externals/vcpkg/ports/bigint/fix-osx-usage.patch @@ -0,0 +1,39 @@ +diff --git a/BigUnsigned.hh b/BigUnsigned.hh +index adf1c00..9228753 100644 +--- a/BigUnsigned.hh ++++ b/BigUnsigned.hh +@@ -20,7 +20,7 @@ public: + typedef unsigned long Blk; + + typedef NumberlikeArray::Index Index; +- NumberlikeArray::N; ++ using NumberlikeArray::N; + + protected: + // Creates a BigUnsigned with a capacity; for internal use. +@@ -84,8 +84,8 @@ public: + // BIT/BLOCK ACCESSORS + + // Expose these from NumberlikeArray directly. +- NumberlikeArray::getCapacity; +- NumberlikeArray::getLength; ++ using NumberlikeArray::getCapacity; ++ using NumberlikeArray::getLength; + + /* Returns the requested block, or 0 if it is beyond the length (as if + * the number had 0s infinitely to the left). */ +diff --git a/BigUnsignedInABase.hh b/BigUnsignedInABase.hh +index 8f9bdce..0ea89c6 100644 +--- a/BigUnsignedInABase.hh ++++ b/BigUnsignedInABase.hh +@@ -100,8 +100,8 @@ public: + Base getBase() const { return base; } + + // Expose these from NumberlikeArray directly. +- NumberlikeArray::getCapacity; +- NumberlikeArray::getLength; ++ using NumberlikeArray::getCapacity; ++ using NumberlikeArray::getLength; + + /* Returns the requested digit, or 0 if it is beyond the length (as if + * the number had 0s infinitely to the left). */ diff --git a/externals/vcpkg/ports/bigint/portfile.cmake b/externals/vcpkg/ports/bigint/portfile.cmake new file mode 100755 index 000000000..723169750 --- /dev/null +++ b/externals/vcpkg/ports/bigint/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_download_distfile(ARCHIVE + URLS "https://mattmccutchen.net/bigint/bigint-2010.04.30.tar.bz2" + FILENAME "bigint-2010.04.30.tar.bz2" + SHA512 bb64380e51991f97a2489c04801ab4372f795b5e23870ad12d71087f1a2afba9b32f74dcdbdcb5228ebf0dd74a37185285bac7653dd3c62d6118d63c298689af +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES fix-osx-usage.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets() + +file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/bigint/vcpkg.json b/externals/vcpkg/ports/bigint/vcpkg.json new file mode 100755 index 000000000..6a70944a6 --- /dev/null +++ b/externals/vcpkg/ports/bigint/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "bigint", + "version-string": "2010.04.30", + "port-version": 7, + "description": "C++ Big Integer Library", + "homepage": "https://mattmccutchen.net/bigint" +} diff --git a/externals/vcpkg/ports/binn/0001_fix_uwp.patch b/externals/vcpkg/ports/binn/0001_fix_uwp.patch new file mode 100755 index 000000000..f43cdd2c8 --- /dev/null +++ b/externals/vcpkg/ports/binn/0001_fix_uwp.patch @@ -0,0 +1,54 @@ +diff --git a/src/binn.c b/src/binn.c +index ef32f35..d12d473 100644 +--- a/src/binn.c ++++ b/src/binn.c +@@ -142,8 +142,14 @@ BINN_PRIVATE void copy_be64(u64 *pdest, u64 *psource) { + /***************************************************************************/ + + #ifndef WIN32 + #define stricmp strcasecmp + #define strnicmp strncasecmp ++#define sprintf_s(b, n, ...) sprintf(b, __VA_ARGS__) ++#define strcpy_s(b, n, s) strcpy(b, s) ++#else ++#define stricmp _stricmp ++#define strnicmp _strnicmp ++#define strdup _strdup + #endif + + BINN_PRIVATE BOOL IsValidBinnHeader(void *pbuf, int *ptype, int *pcount, int *psize, int *pheadersize); +@@ -1582,6 +1588,7 @@ BINN_PRIVATE BOOL binn_read_pair(int expected_type, void *ptr, int pos, int *pid + base = p; + plimit = p + size - 1; + p += header_size; ++ key = 0; + + for (i = 0; i < count; i++) { + switch (type) { +@@ -3333,7 +3340,7 @@ char * APIENTRY binn_get_str(binn *value) { + + if (type_family(value->type) == BINN_FAMILY_INT) { + if (copy_int_value(value->ptr, &vint, value->type, BINN_INT64) == FALSE) return NULL; +- sprintf(buf, "%" INT64_FORMAT, vint); ++ sprintf_s(buf, sizeof buf, "%" INT64_FORMAT, vint); + goto loc_convert_value; + } + +@@ -3341,14 +3348,14 @@ char * APIENTRY binn_get_str(binn *value) { + case BINN_FLOAT: + value->vdouble = value->vfloat; + case BINN_DOUBLE: +- sprintf(buf, "%g", value->vdouble); ++ sprintf_s(buf, sizeof buf, "%g", value->vdouble); + goto loc_convert_value; + case BINN_STRING: + return (char*) value->ptr; + case BINN_BOOL: + if (value->vbool) +- strcpy(buf, "true"); ++ strcpy_s(buf, sizeof buf, "true"); + else +- strcpy(buf, "false"); ++ strcpy_s(buf, sizeof buf, "false"); + goto loc_convert_value; + } diff --git a/externals/vcpkg/ports/binn/CMakeLists.txt b/externals/vcpkg/ports/binn/CMakeLists.txt new file mode 100755 index 000000000..f92b00cb8 --- /dev/null +++ b/externals/vcpkg/ports/binn/CMakeLists.txt @@ -0,0 +1,21 @@ +cmake_minimum_required(VERSION 3.8) + +project(binn + VERSION 1.0 + DESCRIPTION "Binn is a binary data serialization format designed to be compact, fast and easy to use." + HOMEPAGE_URL "https://github.com/liteserver/binn" +) + +add_library (binn src/binn.h src/binn.c) + +target_include_directories(binn + PUBLIC + ${PROJECT_SOURCE_DIR}/src +) + +install( + TARGETS binn + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) diff --git a/externals/vcpkg/ports/binn/portfile.cmake b/externals/vcpkg/ports/binn/portfile.cmake new file mode 100755 index 000000000..1ce3a8cd5 --- /dev/null +++ b/externals/vcpkg/ports/binn/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO liteserver/binn + REF b657ef3f38b37aa1e5dea88a9332889d0fbf3a81 # 3.0 + SHA512 14bf572152ec5343a161dea9ebfd2b63cd5ce48c0db3decf5591aa94ae7766771cf521ba22978e9ae8855feef694bad85951f3c4a29cb9ddd881918fc6d3722a + HEAD_REF master + PATCHES + 0001_fix_uwp.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +file(INSTALL ${SOURCE_PATH}/src/binn.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/binn) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/binn) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/binn/LICENSE ${CURRENT_PACKAGES_DIR}/share/binn/copyright) diff --git a/externals/vcpkg/ports/binn/vcpkg.json b/externals/vcpkg/ports/binn/vcpkg.json new file mode 100755 index 000000000..09fc20cb2 --- /dev/null +++ b/externals/vcpkg/ports/binn/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "binn", + "version-string": "3.0", + "port-version": 1, + "description": "Binn is a binary data serialization format designed to be compact, fast and easy to use." +} diff --git a/externals/vcpkg/ports/bitmagic/portfile.cmake b/externals/vcpkg/ports/bitmagic/portfile.cmake new file mode 100755 index 000000000..90c0bd446 --- /dev/null +++ b/externals/vcpkg/ports/bitmagic/portfile.cmake @@ -0,0 +1,13 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tlk00/BitMagic + REF v7.11.2 + SHA512 182456fc351a7df0cba0bb5b35d91bb8055891bf91a09fc5394149f3b0b1bd85b63ce88497d62ed68bb892481c15264cf44059d43023d1f2155ed43cafe3b933 + HEAD_REF master + +) + +file(GLOB HEADER_LIST "${SOURCE_PATH}/src/*.h") +file(INSTALL ${HEADER_LIST} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/bitmagic/vcpkg.json b/externals/vcpkg/ports/bitmagic/vcpkg.json new file mode 100755 index 000000000..0a675acfb --- /dev/null +++ b/externals/vcpkg/ports/bitmagic/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "bitmagic", + "version": "7.11.2", + "description": "Algorithms and tools for Algebra of Sets for information retrieval, indexing of databases, scientific algorithms, ranking, clustering, unsupervised machine learning and signal processing.", + "homepage": "http://bitmagic.io" +} diff --git a/externals/vcpkg/ports/bitserializer-cpprestjson/portfile.cmake b/externals/vcpkg/ports/bitserializer-cpprestjson/portfile.cmake new file mode 100755 index 000000000..0015715fb --- /dev/null +++ b/externals/vcpkg/ports/bitserializer-cpprestjson/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/externals/vcpkg/ports/bitserializer-cpprestjson/vcpkg.json b/externals/vcpkg/ports/bitserializer-cpprestjson/vcpkg.json new file mode 100755 index 000000000..e12e04f04 --- /dev/null +++ b/externals/vcpkg/ports/bitserializer-cpprestjson/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "bitserializer-cpprestjson", + "version-string": "alias", + "port-version": 1, + "description": "Deprecated alias for bitserializer-cpprestjson", + "dependencies": [ + { + "name": "bitserializer", + "features": [ + "cpprestjson-archive" + ] + } + ] +} diff --git a/externals/vcpkg/ports/bitserializer-pugixml/portfile.cmake b/externals/vcpkg/ports/bitserializer-pugixml/portfile.cmake new file mode 100755 index 000000000..0015715fb --- /dev/null +++ b/externals/vcpkg/ports/bitserializer-pugixml/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/externals/vcpkg/ports/bitserializer-pugixml/vcpkg.json b/externals/vcpkg/ports/bitserializer-pugixml/vcpkg.json new file mode 100755 index 000000000..8e705da12 --- /dev/null +++ b/externals/vcpkg/ports/bitserializer-pugixml/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "bitserializer-pugixml", + "version-string": "alias", + "port-version": 1, + "description": "Deprecated alias for bitserializer-pugixml", + "dependencies": [ + { + "name": "bitserializer", + "features": [ + "pugixml-archive" + ] + } + ] +} diff --git a/externals/vcpkg/ports/bitserializer-rapidjson/portfile.cmake b/externals/vcpkg/ports/bitserializer-rapidjson/portfile.cmake new file mode 100755 index 000000000..0015715fb --- /dev/null +++ b/externals/vcpkg/ports/bitserializer-rapidjson/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/externals/vcpkg/ports/bitserializer-rapidjson/vcpkg.json b/externals/vcpkg/ports/bitserializer-rapidjson/vcpkg.json new file mode 100755 index 000000000..2da6054e3 --- /dev/null +++ b/externals/vcpkg/ports/bitserializer-rapidjson/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "bitserializer-rapidjson", + "version-string": "alias", + "port-version": 1, + "description": "Deprecated alias for bitserializer-rapidjson", + "dependencies": [ + { + "name": "bitserializer", + "features": [ + "rapidjson-archive" + ] + } + ] +} diff --git a/externals/vcpkg/ports/bitserializer-rapidyaml/portfile.cmake b/externals/vcpkg/ports/bitserializer-rapidyaml/portfile.cmake new file mode 100755 index 000000000..0015715fb --- /dev/null +++ b/externals/vcpkg/ports/bitserializer-rapidyaml/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/externals/vcpkg/ports/bitserializer-rapidyaml/vcpkg.json b/externals/vcpkg/ports/bitserializer-rapidyaml/vcpkg.json new file mode 100755 index 000000000..c6fc4961e --- /dev/null +++ b/externals/vcpkg/ports/bitserializer-rapidyaml/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "bitserializer-rapidyaml", + "version-string": "alias", + "port-version": 2, + "description": "Deprecated alias for bitserializer-rapidyaml", + "supports": "!osx", + "dependencies": [ + { + "name": "bitserializer", + "features": [ + "rapidyaml-archive" + ] + } + ] +} diff --git a/externals/vcpkg/ports/bitserializer/portfile.cmake b/externals/vcpkg/ports/bitserializer/portfile.cmake new file mode 100755 index 000000000..28c43ace7 --- /dev/null +++ b/externals/vcpkg/ports/bitserializer/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_bitbucket( + OUT_SOURCE_PATH SOURCE_PATH + REPO Pavel_Kisliak/BitSerializer + REF 0.44 + SHA512 0629acc93807254bd51d9eed761a92be4780d01604a9ae4bf8a933af70fdb206ea9b4f4db3489805b4163f5071246529ea22f8b3e7fbcd77ed936c3ab24697b2 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "cpprestjson-archive" BUILD_CPPRESTJSON_ARCHIVE + "rapidjson-archive" BUILD_RAPIDJSON_ARCHIVE + "pugixml-archive" BUILD_PUGIXML_ARCHIVE + "rapidyaml-archive" BUILD_RAPIDYAML_ARCHIVE +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/bitserializer) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/bitserializer/vcpkg.json b/externals/vcpkg/ports/bitserializer/vcpkg.json new file mode 100755 index 000000000..42b09e65d --- /dev/null +++ b/externals/vcpkg/ports/bitserializer/vcpkg.json @@ -0,0 +1,47 @@ +{ + "name": "bitserializer", + "version": "0.44", + "port-version": 1, + "description": "C++ 17 library for serialization to JSON, XML, YAML", + "homepage": "https://bitbucket.org/Pavel_Kisliak/bitserializer", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cpprestjson-archive": { + "description": "Module for support JSON (implementation based on the CppRestSDK library)", + "dependencies": [ + "cpprestsdk" + ] + }, + "pugixml-archive": { + "description": "Module for support XML (implementation based on the PugiXml library)", + "dependencies": [ + "pugixml" + ] + }, + "rapidjson-archive": { + "description": "Module for support JSON (implementation based on the RapidJson library)", + "dependencies": [ + "rapidjson" + ] + }, + "rapidyaml-archive": { + "description": "Module for support YAML (implementation based on the RapidYaml library)", + "dependencies": [ + { + "name": "ryml", + "platform": "!osx" + } + ] + } + } +} diff --git a/externals/vcpkg/ports/bitsery/portfile.cmake b/externals/vcpkg/ports/bitsery/portfile.cmake new file mode 100755 index 000000000..16fec4c35 --- /dev/null +++ b/externals/vcpkg/ports/bitsery/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO fraillt/bitsery + REF c0fc083c9de805e5825d7553507569febf6a6f93 # v5.2.2 + SHA512 a4c8660f6e8dcb5162f6f75e0f1e4716032b8403e9461f42e0628955eb07dc7c17aec9f774f45c2c15cce28a231699a71815d3d6d7d0f34a1367ee1e2d944305 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/bitsery/vcpkg.json b/externals/vcpkg/ports/bitsery/vcpkg.json new file mode 100755 index 000000000..4fad88260 --- /dev/null +++ b/externals/vcpkg/ports/bitsery/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "bitsery", + "version": "5.2.2", + "description": "Header only C++ binary serialization library", + "homepage": "https://github.com/fraillt/bitsery", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/blas/CMakeLists.txt b/externals/vcpkg/ports/blas/CMakeLists.txt new file mode 100755 index 000000000..790f79e8b --- /dev/null +++ b/externals/vcpkg/ports/blas/CMakeLists.txt @@ -0,0 +1,4 @@ +cmake_minimum_required(VERSION 3.17) + +project(Find_BLAS_external) +find_package(BLAS REQUIRED) diff --git a/externals/vcpkg/ports/blas/portfile.cmake b/externals/vcpkg/ports/blas/portfile.cmake new file mode 100755 index 000000000..f70aa46ea --- /dev/null +++ b/externals/vcpkg/ports/blas/portfile.cmake @@ -0,0 +1,5 @@ +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +# Make sure BLAS can be found +vcpkg_configure_cmake(SOURCE_PATH ${CURRENT_PORT_DIR} + OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}") diff --git a/externals/vcpkg/ports/blas/vcpkg.json b/externals/vcpkg/ports/blas/vcpkg.json new file mode 100755 index 000000000..aca4cf894 --- /dev/null +++ b/externals/vcpkg/ports/blas/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "blas", + "version-string": "1", + "port-version": 1, + "description": "Metapackage for packages which provide BLAS", + "dependencies": [ + "openblas" + ] +} diff --git a/externals/vcpkg/ports/blaze/portfile.cmake b/externals/vcpkg/ports/blaze/portfile.cmake new file mode 100755 index 000000000..8a7954562 --- /dev/null +++ b/externals/vcpkg/ports/blaze/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_bitbucket( + OUT_SOURCE_PATH SOURCE_PATH + REPO blaze-lib/blaze + REF v3.8.1 + SHA512 6dfd3cb46d796b94cc44a30c4cd5ebfb366d2eb312d75a28787cacb4636df52e4e4e3dce3d9501bf2c07e7fd3621e8ce7f9ffa61a950a4146375b12d75d4872b + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBLAZE_SMP_THREADS=OpenMP +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/blaze/cmake) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/blaze/vcpkg.json b/externals/vcpkg/ports/blaze/vcpkg.json new file mode 100755 index 000000000..116078565 --- /dev/null +++ b/externals/vcpkg/ports/blaze/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "blaze", + "version": "3.8.1", + "description": "Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic.", + "homepage": "https://bitbucket.org/blaze-lib/blaze", + "license": "BSD-3-Clause", + "dependencies": [ + "boost-exception", + "lapack", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/blend2d/portfile.cmake b/externals/vcpkg/ports/blend2d/portfile.cmake new file mode 100755 index 000000000..8d49c0676 --- /dev/null +++ b/externals/vcpkg/ports/blend2d/portfile.cmake @@ -0,0 +1,59 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO blend2d/blend2d + REF 0ca46df1d8ec7d8bc5250329ce281d82cfc96b99 + SHA512 fbe54a59b0dc9fd0397619e3f6b1d336d3f906322a06583fe4f90bbb8bd95188f39f162b8ee66cc464050f6f40e856b72a80f37ac190a4a584fda71e2ce73689 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BLEND2D_STATIC) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + futex BLEND2D_NO_FUTEX + jit BLEND2D_NO_JIT + logging BLEND2D_NO_JIT_LOGGING + tls BLEND2D_NO_TLS +) + +if(NOT BLEND2D_NO_JIT) + vcpkg_from_github( + OUT_SOURCE_PATH ASMJIT_SOURCE_PATH + REPO asmjit/asmjit + REF a4e1e88374142f4a842892f9c4bd0b0776fdcd0a + SHA512 c8588e2185502c9d045a63ebf722d1cf14eb7373423ef36f0e410525837430f117ad6c841aac16af17246c4d348c3e9094a848b917985de3f677098c1e32606f + HEAD_REF master + ) + + file(REMOVE_RECURSE ${SOURCE_PATH}/3rdparty/asmjit) + + get_filename_component(ASMJIT_SOURCE_DIR_NAME ${ASMJIT_SOURCE_PATH} NAME) + file(COPY ${ASMJIT_SOURCE_PATH} DESTINATION ${SOURCE_PATH}/3rdparty) + file(RENAME ${SOURCE_PATH}/3rdparty/${ASMJIT_SOURCE_DIR_NAME} ${SOURCE_PATH}/3rdparty/asmjit) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DBLEND2D_STATIC=${BLEND2D_STATIC} + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +if(BLEND2D_STATIC) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) + +if(BLEND2D_STATIC) + # Install usage + configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) +endif() diff --git a/externals/vcpkg/ports/blend2d/usage b/externals/vcpkg/ports/blend2d/usage new file mode 100755 index 000000000..b6d8a652c --- /dev/null +++ b/externals/vcpkg/ports/blend2d/usage @@ -0,0 +1 @@ +Define BL_STATIC before any @PORT@ includes. diff --git a/externals/vcpkg/ports/blend2d/vcpkg.json b/externals/vcpkg/ports/blend2d/vcpkg.json new file mode 100755 index 000000000..36cf6f902 --- /dev/null +++ b/externals/vcpkg/ports/blend2d/vcpkg.json @@ -0,0 +1,39 @@ +{ + "name": "blend2d", + "version-date": "2022-05-02", + "description": "Beta 2D Vector Graphics Powered by a JIT Compiler", + "homepage": "https://github.com/blend2d/blend2d", + "documentation": "https://blend2d.com/doc/index.html", + "license": "Zlib", + "supports": "!arm & !uwp & !wasm32", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "futex", + "jit", + "logging", + "tls" + ], + "features": { + "futex": { + "description": "Default feature. Enables use of futex." + }, + "jit": { + "description": "Default feature. Enables jit pipeline compilation. Not supported for ARM and UWP." + }, + "logging": { + "description": "Default feature. Enables logging." + }, + "tls": { + "description": "Default feature. Enables use of thread_local feature. Disable for platforms where thread local storage is expensive or not supported." + } + } +} diff --git a/externals/vcpkg/ports/blitz/portfile.cmake b/externals/vcpkg/ports/blitz/portfile.cmake new file mode 100755 index 000000000..cba693f54 --- /dev/null +++ b/externals/vcpkg/ports/blitz/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO blitzpp/blitz + REF 839fc5e0f35b1c38a01cfd7a94e83de81e8a6b55 + SHA512 efb6b19691e23c95cf6abd59607bce299b0c02a12ce6be105a35ad8509ab564b8dac8d6363f048e547d199e117d2bdd0e4ef3046d3c411f669c0a453a0b75627 + HEAD_REF master +) + +vcpkg_find_acquire_program(PYTHON2) +get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) +vcpkg_add_to_path("${PYTHON2_DIR}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_DOC=OFF + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) +vcpkg_fixup_pkgconfig() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/blitz/matbops.h" "${SOURCE_PATH}" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/blitz/matuops.h" "${SOURCE_PATH}" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/blitz/mathfunc.h" "${SOURCE_PATH}" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/blitz/promote-old.h" "${SOURCE_PATH}" "") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/blitz/vcpkg.json b/externals/vcpkg/ports/blitz/vcpkg.json new file mode 100755 index 000000000..93da72b81 --- /dev/null +++ b/externals/vcpkg/ports/blitz/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "blitz", + "version-date": "2020-03-25", + "port-version": 5, + "description": "Blitz++ is a C++ template class library that provides high-performance multidimensional array containers for scientific computing.", + "homepage": "https://github.com/blitzpp/blitz", + "supports": "!(arm | arm64 | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + { + "name": "vcpkg-tool-python2", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/blosc/0001-find-deps.patch b/externals/vcpkg/ports/blosc/0001-find-deps.patch new file mode 100755 index 000000000..33407b9b3 --- /dev/null +++ b/externals/vcpkg/ports/blosc/0001-find-deps.patch @@ -0,0 +1,52 @@ +diff --git a/cmake/FindLZ4.cmake b/cmake/FindLZ4.cmake +index e581a80..8ce17c5 100644 +--- a/cmake/FindLZ4.cmake ++++ b/cmake/FindLZ4.cmake +@@ -1,10 +1,13 @@ +-find_path(LZ4_INCLUDE_DIR lz4.h) ++find_path(LZ4_INCLUDE_DIRS NAMES lz4.h) + +-find_library(LZ4_LIBRARY NAMES lz4) ++find_library(LZ4_LIBRARY_DEBUG NAMES lz4d) ++find_library(LZ4_LIBRARY_RELEASE NAMES lz4) + +-if (LZ4_INCLUDE_DIR AND LZ4_LIBRARY) +- set(LZ4_FOUND TRUE) +- message(STATUS "Found LZ4 library: ${LZ4_LIBRARY}") +-else () +- message(STATUS "No LZ4 library found. Using internal sources.") +-endif () ++include(SelectLibraryConfigurations) ++select_library_configurations(LZ4) ++ ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args( ++ LZ4 ++ REQUIRED_VARS LZ4_LIBRARIES LZ4_INCLUDE_DIRS ++) +diff --git a/cmake/FindSnappy.cmake b/cmake/FindSnappy.cmake +index 688d4d5..c8b9a05 100644 +--- a/cmake/FindSnappy.cmake ++++ b/cmake/FindSnappy.cmake +@@ -1,10 +1,13 @@ +-find_path(SNAPPY_INCLUDE_DIR snappy-c.h) ++find_path(SNAPPY_INCLUDE_DIR snappy.h) + +-find_library(SNAPPY_LIBRARY NAMES snappy) ++find_library(SNAPPY_LIBRARY_DEBUG NAMES snappyd) ++find_library(SNAPPY_LIBRARY_RELEASE NAMES snappy) + +-if (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARY) +- set(SNAPPY_FOUND TRUE) +- message(STATUS "Found SNAPPY library: ${SNAPPY_LIBRARY}") +-else () +- message(STATUS "No snappy found. Using internal sources.") +-endif () ++include(SelectLibraryConfigurations) ++select_library_configurations(SNAPPY) ++ ++include(FindPackageHandleStandardArgs) ++FIND_PACKAGE_HANDLE_STANDARD_ARGS( ++ SNAPPY DEFAULT_MSG ++ SNAPPY_LIBRARY SNAPPY_INCLUDE_DIR ++) diff --git a/externals/vcpkg/ports/blosc/0002-export-blosc-config.patch b/externals/vcpkg/ports/blosc/0002-export-blosc-config.patch new file mode 100755 index 000000000..31297f732 --- /dev/null +++ b/externals/vcpkg/ports/blosc/0002-export-blosc-config.patch @@ -0,0 +1,66 @@ +diff --git a/blosc/CMakeLists.txt b/blosc/CMakeLists.txt +index f4e5c29..24641ad 100644 +--- a/blosc/CMakeLists.txt ++++ b/blosc/CMakeLists.txt +@@ -122,14 +122,14 @@ endif (NOT DEACTIVATE_ZSTD) + + # targets + if (BUILD_SHARED) +- add_library(blosc_shared SHARED ${SOURCES}) +- set_target_properties(blosc_shared PROPERTIES OUTPUT_NAME blosc) +- set_target_properties(blosc_shared PROPERTIES ++ add_library(blosc SHARED ${SOURCES}) ++ #set_target_properties(blosc_shared PROPERTIES OUTPUT_NAME blosc) ++ set_target_properties(blosc PROPERTIES + VERSION ${version_string} + SOVERSION 1 # Change this when an ABI change happens + ) + set_property( +- TARGET blosc_shared ++ TARGET blosc + APPEND PROPERTY COMPILE_DEFINITIONS BLOSC_SHARED_LIBRARY) + endif() + +@@ -192,8 +192,8 @@ if (BUILD_TESTS) + endif() + + if (BUILD_SHARED) +- target_link_libraries(blosc_shared ${LIBS}) +- target_include_directories(blosc_shared PUBLIC ${BLOSC_INCLUDE_DIRS}) ++ target_link_libraries(blosc ${LIBS}) ++ target_include_directories(blosc PUBLIC $ $) + endif() + + if (BUILD_TESTS) +@@ -202,22 +202,24 @@ if (BUILD_TESTS) + endif() + + if(BUILD_STATIC) +- add_library(blosc_static STATIC ${SOURCES}) +- set_target_properties(blosc_static PROPERTIES OUTPUT_NAME blosc) ++ add_library(blosc STATIC ${SOURCES}) ++ #set_target_properties(blosc_static PROPERTIES OUTPUT_NAME blosc) + if (MSVC) +- set_target_properties(blosc_static PROPERTIES PREFIX lib) ++ #set_target_properties(blosc_static PROPERTIES PREFIX lib) + endif() +- target_link_libraries(blosc_static ${LIBS}) +- target_include_directories(blosc_static PUBLIC ${BLOSC_INCLUDE_DIRS}) ++ target_link_libraries(blosc ${LIBS}) ++ target_include_directories(blosc PUBLIC $ $) + endif(BUILD_STATIC) + + # install + if(BLOSC_INSTALL) + install(FILES blosc.h blosc-export.h DESTINATION include COMPONENT DEV) + if(BUILD_SHARED) +- install(TARGETS blosc_shared LIBRARY DESTINATION ${lib_dir} ARCHIVE DESTINATION ${lib_dir} RUNTIME DESTINATION bin COMPONENT LIB) ++ install(TARGETS blosc EXPORT blosc-config RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) + endif(BUILD_SHARED) + if(BUILD_STATIC) +- install(TARGETS blosc_static LIBRARY DESTINATION ${lib_dir} ARCHIVE DESTINATION ${lib_dir} RUNTIME DESTINATION bin COMPONENT DEV) ++ install(TARGETS blosc EXPORT blosc-config RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) + endif(BUILD_STATIC) + endif(BLOSC_INSTALL) ++ ++install(EXPORT blosc-config DESTINATION share/cmake/blosc) diff --git a/externals/vcpkg/ports/blosc/portfile.cmake b/externals/vcpkg/ports/blosc/portfile.cmake new file mode 100755 index 000000000..01c42a563 --- /dev/null +++ b/externals/vcpkg/ports/blosc/portfile.cmake @@ -0,0 +1,45 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Blosc/c-blosc + REF 9fae1c9acb659159321aca69aefcdbce663e2374 # v1.18.1 + SHA512 6cc77832100041aca8f320e44aa803adc0d3344b52742b995a3155b953e5d149534de65c8244d964448150b73715a81f54285d7d01f1b45d7b10fe07f5bdb141 + HEAD_REF master + PATCHES + 0001-find-deps.patch + 0002-export-blosc-config.patch +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(BLOSC_STATIC ON) + set(BLOSC_SHARED OFF) +else() + set(BLOSC_STATIC OFF) + set(BLOSC_SHARED ON) +endif() + +file(REMOVE_RECURSE ${SOURCE_PATH}/internal-complibs) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DPREFER_EXTERNAL_LZ4=ON + -DPREFER_EXTERNAL_SNAPPY=ON + -DPREFER_EXTERNAL_ZLIB=ON + -DPREFER_EXTERNAL_ZSTD=ON + -DBUILD_TESTS=OFF + -DBUILD_BENCHMARKS=OFF + -DBUILD_STATIC=${BLOSC_STATIC} + -DBUILD_SHARED=${BLOSC_SHARED} +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/blosc) + +# cleanup +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSES/BLOSC.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/blosc RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/blosc/vcpkg.json b/externals/vcpkg/ports/blosc/vcpkg.json new file mode 100755 index 000000000..ba1b06bc1 --- /dev/null +++ b/externals/vcpkg/ports/blosc/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "blosc", + "version-string": "1.18.1", + "port-version": 4, + "description": "A blocking, shuffling and loss-less compression library that can be faster than `memcpy()`", + "homepage": "https://github.com/Blosc/c-blosc", + "dependencies": [ + "lz4", + "snappy", + "zlib", + "zstd" + ] +} diff --git a/externals/vcpkg/ports/boinc/CMakeLists.txt b/externals/vcpkg/ports/boinc/CMakeLists.txt new file mode 100755 index 000000000..f00a67cdf --- /dev/null +++ b/externals/vcpkg/ports/boinc/CMakeLists.txt @@ -0,0 +1,238 @@ +cmake_minimum_required(VERSION 3.20) +project(boinc) + +find_package(OpenSSL REQUIRED) + +set(LIBBOINC_HEADERS_WIN + lib/boinc_win.h + lib/diagnostics_win.h + lib/idlemon.h + lib/stackwalker_imports.h + lib/stackwalker_win.h +) + +set(LIBBOINC_HEADERS_UNIX + lib/synch.h + lib/unix_util.h +) + +set(LIBBOINC_HEADERS_APPLE + lib/mac/dyld_gdb.h + lib/mac/mac_backtrace.h + lib/mac/mac_spawn.h + lib/mac/QBacktrace.h + lib/mac/QCrashReport.h + lib/mac/QMachOImage.h + lib/mac/QMachOImageList.h + lib/mac/QSymbols.h + lib/mac/QTaskMemory.h + lib/mac/mac_branding.h +) + +set(LIBBOINC_HEADERS_GENERIC + lib/app_ipc.h + lib/base64.h + lib/cal_boinc.h + lib/cc_config.h + lib/cert_sig.h + lib/cl_boinc.h + lib/common_defs.h + lib/coproc.h + lib/crypt.h + lib/diagnostics.h + lib/error_numbers.h + lib/filesys.h + lib/hostinfo.h + lib/keyword.h + lib/md5.h + lib/md5_file.h + lib/mem_usage.h + lib/mfile.h + lib/miofile.h + lib/network.h + lib/notice.h + lib/opencl_boinc.h + lib/parse.h + lib/prefs.h + lib/proc_control.h + lib/procinfo.h + lib/project_init.h + lib/proxy_info.h + lib/std_fixes.h + lib/str_replace.h + lib/str_util.h + lib/url.h + lib/util.h + lib/win_util.h + lib/wslinfo.h +) + +set(LIBBOINC_SOURCES_WIN + lib/boinc_win.cpp + lib/diagnostics_win.cpp + lib/idlemon_win.cpp + lib/procinfo_win.cpp + lib/stackwalker_win.cpp + lib/win_util.cpp +) + +set(LIBBOINC_SOURCES_UNIX + lib/procinfo_unix.cpp + lib/synch.cpp + lib/unix_util.cpp +) + +set(LIBBOINC_SOURCES_APPLE + lib/procinfo_mac.cpp + lib/mac/mac_backtrace.cpp + lib/mac/mac_spawn.cpp + lib/mac/QBacktrace.c + lib/mac/QCrashReport.c + lib/mac/QMachOImage.c + lib/mac/QMachOImageList.c + lib/mac/QSymbols.c + lib/mac/QTaskMemory.c + lib/mac/mac_branding.cpp +) + +set(LIBBOINC_SOURCES_GENERIC + lib/app_ipc.cpp + lib/base64.cpp + lib/cc_config.cpp + lib/cert_sig.cpp + lib/coproc.cpp + lib/crypt.cpp + lib/diagnostics.cpp + lib/filesys.cpp + lib/hostinfo.cpp + lib/keyword.cpp + lib/md5.cpp + lib/md5_file.cpp + lib/mem_usage.cpp + lib/mfile.cpp + lib/miofile.cpp + lib/network.cpp + lib/notice.cpp + lib/opencl_boinc.cpp + lib/parse.cpp + lib/prefs.cpp + lib/proc_control.cpp + lib/procinfo.cpp + lib/project_init.cpp + lib/proxy_info.cpp + lib/shmem.cpp + lib/str_util.cpp + lib/url.cpp + lib/util.cpp + lib/wslinfo.cpp +) + +set(LIBBOINCAPI_HEADERS + api/boinc_api.h +) + +set(LIBBOINCAPI_SOURCES_WIN + lib/boinc_win.cpp +) + +set(LIBBOINCAPI_SOURCES_GENERIC + api/boinc_api.cpp +) + +if(APPLE) + set(LIBBOINC_HEADERS ${LIBBOINC_HEADERS_GENERIC} ${LIBBOINC_HEADERS_APPLE}) + set(LIBBOINC_SOURCES ${LIBBOINC_SOURCES_GENERIC} ${LIBBOINC_SOURCES_APPLE}) + + set(LIBBOINCAPI_SOURCES ${LIBBOINCAPI_SOURCES_GENERIC}) +elseif(WIN32) + set(LIBBOINC_HEADERS ${LIBBOINC_HEADERS_GENERIC} ${LIBBOINC_HEADERS_WIN}) + set(LIBBOINC_SOURCES ${LIBBOINC_SOURCES_GENERIC} ${LIBBOINC_SOURCES_WIN}) + + set(LIBBOINCAPI_SOURCES ${LIBBOINCAPI_SOURCES_GENERIC} ${LIBBOINCAPI_SOURCES_WIN}) +elseif(UNIX) + set(LIBBOINC_HEADERS ${LIBBOINC_HEADERS_GENERIC} ${LIBBOINC_HEADERS_UNIX}) + set(LIBBOINC_SOURCES ${LIBBOINC_SOURCES_GENERIC} ${LIBBOINC_SOURCES_UNIX}) + + set(LIBBOINCAPI_SOURCES ${LIBBOINCAPI_SOURCES_GENERIC}) +endif() + +add_library(boinc ${LIBBOINC_SOURCES}) +add_library(boincapi ${LIBBOINCAPI_SOURCES}) + +if(WIN32 OR APPLE) + set_target_properties(boinc PROPERTIES PREFIX "lib") + set_target_properties(boinc PROPERTIES IMPORT_PREFIX "lib") + + set_target_properties(boincapi PROPERTIES PREFIX "lib") + set_target_properties(boincapi PROPERTIES IMPORT_PREFIX "lib") +endif() + +if(APPLE) + target_include_directories(boinc PUBLIC + $ + $ + ) + + target_include_directories(boincapi PUBLIC + $ + $ + ) +elseif(WIN32) + target_compile_definitions(boinc PUBLIC + -D_CRT_SECURE_NO_WARNINGS + -DWIN32 + -D_CONSOLE + ) + + target_compile_definitions(boincapi PUBLIC + -D_CRT_SECURE_NO_WARNINGS + -DWIN32 + -D_CONSOLE + ) + + target_include_directories(boinc PUBLIC + $ + ) + + target_include_directories(boincapi PUBLIC + $ + ) +elseif(UNIX) + target_include_directories(boinc PUBLIC + $ + ) + + target_include_directories(boincapi PUBLIC + $ + ) +endif() + +target_include_directories(boinc PUBLIC + $ + $ + $ +) + +target_include_directories(boincapi PUBLIC + $ + $ + $ +) + +target_link_libraries(boinc PRIVATE + OpenSSL::SSL + OpenSSL::Crypto +) + +target_link_libraries(boincapi PRIVATE + boinc +) + +install(TARGETS boinc boincapi EXPORT boinc-config + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + ) + +install(FILES ${LIBBOINC_HEADERS} ${LIBBOINCAPI_HEADERS} DESTINATION include/boinc) +install(EXPORT boinc-config NAMESPACE unofficial::boinc:: DESTINATION share/boinc) diff --git a/externals/vcpkg/ports/boinc/portfile.cmake b/externals/vcpkg/ports/boinc/portfile.cmake new file mode 100755 index 000000000..fd832485f --- /dev/null +++ b/externals/vcpkg/ports/boinc/portfile.cmake @@ -0,0 +1,46 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO BOINC/boinc + REF client_release/7.20/7.20.0 + SHA512 18e0dfa208b859399735c21ca5a07e008becfdfd384e394e307acd6a7d0e6431085f0f16fcf431ab10adbb29190b4272ecd978528a53c08781c194efee85954e + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID) + vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + NO_ADDITIONAL_PATHS + OPTIONS + ${OPTIONS} + --disable-server + --disable-client + --disable-manager + ) + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config.h DESTINATION ${SOURCE_PATH}/config-h-Release) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/config.h DESTINATION ${SOURCE_PATH}/config-h-Debug) + endif() +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME license) diff --git a/externals/vcpkg/ports/boinc/vcpkg.json b/externals/vcpkg/ports/boinc/vcpkg.json new file mode 100755 index 000000000..84ba23b5d --- /dev/null +++ b/externals/vcpkg/ports/boinc/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "boinc", + "version": "7.20.0", + "description": "Open-source software for volunteer computing and grid computing.", + "homepage": "https://boinc.berkeley.edu/", + "license": "LGPL-3.0-or-later", + "supports": "!(windows & arm) & !uwp", + "dependencies": [ + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/bond/fix-install-path.patch b/externals/vcpkg/ports/bond/fix-install-path.patch new file mode 100755 index 000000000..643e0cfbf --- /dev/null +++ b/externals/vcpkg/ports/bond/fix-install-path.patch @@ -0,0 +1,56 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f2f8eaa..1b0c01c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,7 +23,7 @@ set (BOND_FIND_RAPIDJSON + # settings so that we don't apply our settings to third-party code. + add_subdirectory (thirdparty) + +-enable_testing() ++#enable_testing() + + set (BOND_IDL ${CMAKE_CURRENT_SOURCE_DIR}/idl) + set (BOND_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/cpp/inc) +@@ -85,6 +85,6 @@ if (BOND_GBC_PATH) + + install ( + FILES ${BOND_GBC_PATH} +- DESTINATION bin ++ DESTINATION tools + RENAME ${INSTALLED_GBC_NAME}) + endif() +diff --git a/compiler/CMakeLists.txt b/compiler/CMakeLists.txt +index 1dff9d0..9a11575 100644 +--- a/compiler/CMakeLists.txt ++++ b/compiler/CMakeLists.txt +@@ -108,7 +108,7 @@ set (test_sources + tests/TestMain.hs + ${tests}) + +-set (completion_dir etc/bash_completion.d) ++set (completion_dir tools/bond) + set (completion ${CMAKE_CURRENT_BINARY_DIR}/gbc.comp) + set (output ${CMAKE_CURRENT_BINARY_DIR}/build/gbc/gbc${CMAKE_EXECUTABLE_SUFFIX}) + set (GBC_EXECUTABLE ${output} PARENT_SCOPE) +@@ -130,7 +130,7 @@ endif() + + install (FILES ${output} + PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE +- DESTINATION bin) ++ DESTINATION ${completion_dir}) + + install (FILES ${completion} + RENAME gbc +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index b45078e..1eebe9c 100644 +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -110,7 +110,7 @@ target_include_directories (bond_apply BEFORE PRIVATE + + install (TARGETS bond bond_apply + EXPORT bond +- ARCHIVE DESTINATION lib/bond ++ ARCHIVE DESTINATION lib + INCLUDES DESTINATION include) + + install (DIRECTORY ${BOND_IDL}/bond/core DESTINATION include/bond) diff --git a/externals/vcpkg/ports/bond/portfile.cmake b/externals/vcpkg/ports/bond/portfile.cmake new file mode 100755 index 000000000..5c72c8af4 --- /dev/null +++ b/externals/vcpkg/ports/bond/portfile.cmake @@ -0,0 +1,74 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +set(BOND_VER 9.0.3) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/bond + REF ${BOND_VER} + SHA512 3a7884eb00e6d0ab40c688f4a40cb2d3f356c48b38d48a9a08c756047a94b82619ef345483f42c3240732f5da06816b65a61acb83bfebb3c2c6b44099ce71bf9 + HEAD_REF master + PATCHES fix-install-path.patch skip-grpc-compilation.patch +) + +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_download_distfile(GBC_ARCHIVE + URLS "https://github.com/microsoft/bond/releases/download/${BOND_VER}/gbc-${BOND_VER}-amd64.zip" + FILENAME "gbc-${BOND_VER}-amd64.zip" + SHA512 41a4e01a9a0f6246a3c07f516f2c0cfc8a837eff2166c2bb787877e409d6f55eeb6084e63aabc3502492775a3fa7e381bf37fde0bdfced50a9d0b39dfaca7dfd + ) + + # Clear the generator to prevent it from updating + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/tools/") + # Extract the precompiled gbc + vcpkg_extract_source_archive(extracted_tool_dir ARCHIVE "${GBC_ARCHIVE}" NO_REMOVE_ONE_LEVEL) + file(RENAME "${extracted_tool_dir}" "${CURRENT_BUILDTREES_DIR}/tools") + + set(FETCHED_GBC_PATH "${CURRENT_BUILDTREES_DIR}/tools/gbc-${BOND_VER}-amd64.exe") + if(NOT EXISTS "${FETCHED_GBC_PATH}") + message(FATAL_ERROR "Fetching GBC failed. Expected '${FETCHED_GBC_PATH}' to exist, but it doesn't.") + endif() +else() + # According to the readme on https://github.com/microsoft/bond/ + # The build needs a version of the Haskel Tool stack that is newer than some distros ship with. + # For this reason the message is not guarded by checking to see if the tool is installed. + message("\nA recent version of Haskell Tool Stack is required to build.\n For information on how to install see https://docs.haskellstack.org/en/stable/README/\n") + +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + bond-over-grpc BOND_ENABLE_GRPC +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DBOND_LIBRARIES_ONLY=TRUE + -DBOND_GBC_PATH=${FETCHED_GBC_PATH} + -DBOND_SKIP_GBC_TESTS=TRUE + -DBOND_ENABLE_COMM=FALSE + -DBOND_FIND_RAPIDJSON=TRUE + -DBOND_STACK_OPTIONS=--allow-different-user + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/bond) + +vcpkg_copy_pdbs() + +cmake_path(NATIVE_PATH SOURCE_PATH native_source_path) +foreach(header bond_apply.h bond_const_apply.h bond_const_enum.h bond_const_reflection.h bond_const_types.h bond_enum.h bond_reflection.h bond_types.h) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/bond/core/${header}" "${native_source_path}" "") +endforeach() + +# There's no way to supress installation of the headers in the debug build, +# so we just delete them. +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Put the license file where vcpkg expects it +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/bond/skip-grpc-compilation.patch b/externals/vcpkg/ports/bond/skip-grpc-compilation.patch new file mode 100755 index 000000000..10906b131 --- /dev/null +++ b/externals/vcpkg/ports/bond/skip-grpc-compilation.patch @@ -0,0 +1,11 @@ +diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt +index f8c7bf3..e69de29 100644 +--- a/thirdparty/CMakeLists.txt ++++ b/thirdparty/CMakeLists.txt +@@ -1,6 +0,0 @@ +-include (Compiler) +- +-if (BOND_ENABLE_GRPC) +- cxx_add_compile_options (Clang -Wno-unused-value) +- add_subdirectory(grpc) +-endif() diff --git a/externals/vcpkg/ports/bond/vcpkg.json b/externals/vcpkg/ports/bond/vcpkg.json new file mode 100755 index 000000000..8abedfb47 --- /dev/null +++ b/externals/vcpkg/ports/bond/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "bond", + "version": "9.0.3", + "port-version": 3, + "description": "Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.", + "homepage": "https://github.com/Microsoft/bond", + "dependencies": [ + "boost-assign", + "boost-config", + "boost-locale", + "boost-utility", + "rapidjson", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "bond-over-grpc": { + "description": "Bond-over-gRPC provides code generation from Bond IDL service definitions to send Bond objects via gRPC.", + "dependencies": [ + "grpc" + ] + } + } +} diff --git a/externals/vcpkg/ports/boolinq/portfile.cmake b/externals/vcpkg/ports/boolinq/portfile.cmake new file mode 100755 index 000000000..916f606bb --- /dev/null +++ b/externals/vcpkg/ports/boolinq/portfile.cmake @@ -0,0 +1,13 @@ +# Single-file header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO k06a/boolinq + REF 0df37ed90570a148c9d2395f5066313fd59247c9 #v3.0.4 + SHA512 c1c23cf4e3c3f2a02a6c6ea59faf1eb223fe0a6ba840b4f306671e3e866bfd156d0a7a46542b684eeba3d9c744d678c48d4f1d7471f07fb7f1ba0bb8812f548f + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/include/boolinq/boolinq.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/boolinq") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/boolinq/vcpkg.json b/externals/vcpkg/ports/boolinq/vcpkg.json new file mode 100755 index 000000000..fbef717fe --- /dev/null +++ b/externals/vcpkg/ports/boolinq/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "boolinq", + "version": "3.0.4", + "description": "Super tiny C++11 single-file header-only LINQ library", + "homepage": "https://github.com/k06a/boolinq" +} diff --git a/externals/vcpkg/ports/boost-accumulators/portfile.cmake b/externals/vcpkg/ports/boost-accumulators/portfile.cmake new file mode 100755 index 000000000..8a666948b --- /dev/null +++ b/externals/vcpkg/ports/boost-accumulators/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/accumulators + REF boost-1.79.0 + SHA512 4f3531ac9a008a22cb252c7fd81fcfc10d93e9b643bdcdfe19bdc80a34cb2823eecbb09f83425485f3b31ba34c36910d2993b33acef8c5deb63a6572cbf124ee + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-accumulators/vcpkg.json b/externals/vcpkg/ports/boost-accumulators/vcpkg.json new file mode 100755 index 000000000..f3eb83b52 --- /dev/null +++ b/externals/vcpkg/ports/boost-accumulators/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "boost-accumulators", + "version": "1.79.0", + "description": "Boost accumulators module", + "homepage": "https://github.com/boostorg/accumulators", + "license": "BSL-1.0", + "dependencies": [ + "boost-array", + "boost-assert", + "boost-circular-buffer", + "boost-concept-check", + "boost-config", + "boost-core", + "boost-fusion", + "boost-iterator", + "boost-mpl", + "boost-numeric-conversion", + "boost-parameter", + "boost-preprocessor", + "boost-range", + "boost-serialization", + "boost-static-assert", + "boost-throw-exception", + "boost-tuple", + "boost-type-traits", + "boost-typeof", + "boost-ublas", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-algorithm/portfile.cmake b/externals/vcpkg/ports/boost-algorithm/portfile.cmake new file mode 100755 index 000000000..735cd4475 --- /dev/null +++ b/externals/vcpkg/ports/boost-algorithm/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/algorithm + REF boost-1.79.0 + SHA512 457f894e538182990c066fed06ce4ae1749e742eb31677bb00a60faab0072a3fddfbc993c467695ef52b7e0d72f13ee2bc5bf5d10176c091c68a59676426624b + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-algorithm/vcpkg.json b/externals/vcpkg/ports/boost-algorithm/vcpkg.json new file mode 100755 index 000000000..4c645ab21 --- /dev/null +++ b/externals/vcpkg/ports/boost-algorithm/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "boost-algorithm", + "version": "1.79.0", + "description": "Boost algorithm module", + "homepage": "https://github.com/boostorg/algorithm", + "license": "BSL-1.0", + "dependencies": [ + "boost-array", + "boost-assert", + "boost-bind", + "boost-concept-check", + "boost-config", + "boost-core", + "boost-exception", + "boost-function", + "boost-iterator", + "boost-mpl", + "boost-range", + "boost-regex", + "boost-static-assert", + "boost-throw-exception", + "boost-tuple", + "boost-type-traits", + "boost-unordered", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-align/portfile.cmake b/externals/vcpkg/ports/boost-align/portfile.cmake new file mode 100755 index 000000000..0fc01d0e3 --- /dev/null +++ b/externals/vcpkg/ports/boost-align/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/align + REF boost-1.79.0 + SHA512 9249c21cea651ea193b93d816de63e79d9cc014f6fb5d8087c96a0c193d98381db8b0e78e757d294ff078160f41d80c56f87cb03f84aa1bad942bd173086c41b + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-align/vcpkg.json b/externals/vcpkg/ports/boost-align/vcpkg.json new file mode 100755 index 000000000..f840bc0af --- /dev/null +++ b/externals/vcpkg/ports/boost-align/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "boost-align", + "version": "1.79.0", + "description": "Boost align module", + "homepage": "https://github.com/boostorg/align", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + "boost-static-assert", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-any/portfile.cmake b/externals/vcpkg/ports/boost-any/portfile.cmake new file mode 100755 index 000000000..c51c3be87 --- /dev/null +++ b/externals/vcpkg/ports/boost-any/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/any + REF boost-1.79.0 + SHA512 7085eacd189e8a1339e04c878cc20c2f45529d72048d992b0f9e8e35b7c002368f27ac54e495abcca0ecb998606db1a858df5ecb80b10301512da613b366876c + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-any/vcpkg.json b/externals/vcpkg/ports/boost-any/vcpkg.json new file mode 100755 index 000000000..1e3b7b55c --- /dev/null +++ b/externals/vcpkg/ports/boost-any/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "boost-any", + "version": "1.79.0", + "description": "Boost any module", + "homepage": "https://github.com/boostorg/any", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + "boost-static-assert", + "boost-throw-exception", + "boost-type-index", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-array/portfile.cmake b/externals/vcpkg/ports/boost-array/portfile.cmake new file mode 100755 index 000000000..de8a95dfc --- /dev/null +++ b/externals/vcpkg/ports/boost-array/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/array + REF boost-1.79.0 + SHA512 924a5b99721bda3e3ee4912858b02a44e6b94671718e1657340715d9929b5cdfb0fa394bab8f49b8c2bf553c285bc91c4e083c816352878a2ea6c08e79a28e9b + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-array/vcpkg.json b/externals/vcpkg/ports/boost-array/vcpkg.json new file mode 100755 index 000000000..4c95cd9a2 --- /dev/null +++ b/externals/vcpkg/ports/boost-array/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "boost-array", + "version": "1.79.0", + "description": "Boost array module", + "homepage": "https://github.com/boostorg/array", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + "boost-static-assert", + "boost-throw-exception", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-asio/portfile.cmake b/externals/vcpkg/ports/boost-asio/portfile.cmake new file mode 100755 index 000000000..850ead9d5 --- /dev/null +++ b/externals/vcpkg/ports/boost-asio/portfile.cmake @@ -0,0 +1,13 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/asio + REF boost-1.79.0 + SHA512 f4e84e4616ad9cc4fae1077e5d3de1ca4e93cf25c83b1fc4bf0130727b41cb3888516e212c89745831c33a9282cf6697742b716bc340c76939cd6335f035716f + HEAD_REF master + PATCHES windows_alloca_header.patch +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-asio/vcpkg.json b/externals/vcpkg/ports/boost-asio/vcpkg.json new file mode 100755 index 000000000..36be45fba --- /dev/null +++ b/externals/vcpkg/ports/boost-asio/vcpkg.json @@ -0,0 +1,40 @@ +{ + "name": "boost-asio", + "version": "1.79.0", + "description": "Boost asio module", + "homepage": "https://github.com/boostorg/asio", + "license": "BSL-1.0", + "dependencies": [ + "boost-align", + "boost-array", + "boost-assert", + "boost-bind", + "boost-chrono", + "boost-config", + "boost-core", + { + "name": "boost-coroutine", + "platform": "!arm & !uwp & !emscripten" + }, + "boost-date-time", + "boost-function", + "boost-regex", + "boost-smart-ptr", + "boost-system", + "boost-throw-exception", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ], + "features": { + "ssl": { + "description": "Build with SSL support", + "dependencies": [ + { + "name": "openssl", + "platform": "!emscripten" + } + ] + } + } +} diff --git a/externals/vcpkg/ports/boost-asio/windows_alloca_header.patch b/externals/vcpkg/ports/boost-asio/windows_alloca_header.patch new file mode 100755 index 000000000..609e1ebfe --- /dev/null +++ b/externals/vcpkg/ports/boost-asio/windows_alloca_header.patch @@ -0,0 +1,15 @@ +diff --git a/include/boost/asio/detail/impl/socket_ops.ipp b/include/boost/asio/detail/impl/socket_ops.ipp +index 7d7c31f..d2cd468 100644 +--- a/include/boost/asio/detail/impl/socket_ops.ipp ++++ b/include/boost/asio/detail/impl/socket_ops.ipp +@@ -27,6 +27,10 @@ + #include + #include + ++#if defined(BOOST_ASIO_WINDOWS) ++#include ++#endif ++ + #if defined(BOOST_ASIO_WINDOWS_RUNTIME) + # include + # include diff --git a/externals/vcpkg/ports/boost-assert/portfile.cmake b/externals/vcpkg/ports/boost-assert/portfile.cmake new file mode 100755 index 000000000..c7f7ad244 --- /dev/null +++ b/externals/vcpkg/ports/boost-assert/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/assert + REF boost-1.79.0 + SHA512 fc7f97ca1d58fc5e7ef8ebe45239cdbec6b239afe7cb137aed629051a59c356d9bd82c2a9e0e6ce4c0e9b779cac8c68f1969910ca4b936ce15770083182e34d8 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-assert/vcpkg.json b/externals/vcpkg/ports/boost-assert/vcpkg.json new file mode 100755 index 000000000..0ea351ed3 --- /dev/null +++ b/externals/vcpkg/ports/boost-assert/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "boost-assert", + "version": "1.79.0", + "description": "Boost assert module", + "homepage": "https://github.com/boostorg/assert", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-assign/portfile.cmake b/externals/vcpkg/ports/boost-assign/portfile.cmake new file mode 100755 index 000000000..48b30c19b --- /dev/null +++ b/externals/vcpkg/ports/boost-assign/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/assign + REF boost-1.79.0 + SHA512 0db0b6f4a93f8bd6d86a4db6390b7edc7717a490323121418c120e2d2b20322b73a6c7d9b18a4d7df357c7d36e111b548e78c72d32888089b460956476b8360b + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-assign/vcpkg.json b/externals/vcpkg/ports/boost-assign/vcpkg.json new file mode 100755 index 000000000..70e6dfe5f --- /dev/null +++ b/externals/vcpkg/ports/boost-assign/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "boost-assign", + "version": "1.79.0", + "description": "Boost assign module", + "homepage": "https://github.com/boostorg/assign", + "license": "BSL-1.0", + "dependencies": [ + "boost-array", + "boost-config", + "boost-core", + "boost-move", + "boost-mpl", + "boost-preprocessor", + "boost-ptr-container", + "boost-range", + "boost-static-assert", + "boost-throw-exception", + "boost-tuple", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-atomic/portfile.cmake b/externals/vcpkg/ports/boost-atomic/portfile.cmake new file mode 100755 index 000000000..d365cd297 --- /dev/null +++ b/externals/vcpkg/ports/boost-atomic/portfile.cmake @@ -0,0 +1,19 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/atomic + REF boost-1.79.0 + SHA512 0ac0c72b3455440ad93b3659ce3796916cf718ce4161d9391a397c8f687d2f73efe2a68bb134b178f4d004de769fc75ff75717802ca6c56968c28f46c50ce1eb + HEAD_REF master +) + +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]" + "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-atomic/vcpkg.json b/externals/vcpkg/ports/boost-atomic/vcpkg.json new file mode 100755 index 000000000..02b16d207 --- /dev/null +++ b/externals/vcpkg/ports/boost-atomic/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "boost-atomic", + "version": "1.79.0", + "description": "Boost atomic module", + "homepage": "https://github.com/boostorg/atomic", + "license": "BSL-1.0", + "dependencies": [ + "boost-align", + "boost-assert", + { + "name": "boost-build", + "host": true + }, + "boost-config", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-predef", + "boost-preprocessor", + "boost-static-assert", + "boost-type-traits", + "boost-vcpkg-helpers", + "boost-winapi", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-beast/portfile.cmake b/externals/vcpkg/ports/boost-beast/portfile.cmake new file mode 100755 index 000000000..68308327e --- /dev/null +++ b/externals/vcpkg/ports/boost-beast/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/beast + REF boost-1.79.0 + SHA512 d3f17b37fd503d9e65f0490832302d14318898a6b598864143fbd5310f69ade026499efe6947c66fd7309770ec63bb0dad1688cf3f750910426a058d53127e10 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-beast/vcpkg.json b/externals/vcpkg/ports/boost-beast/vcpkg.json new file mode 100755 index 000000000..bc2c62664 --- /dev/null +++ b/externals/vcpkg/ports/boost-beast/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "boost-beast", + "version": "1.79.0", + "description": "Boost beast module", + "homepage": "https://github.com/boostorg/beast", + "license": "BSL-1.0", + "supports": "!emscripten", + "dependencies": [ + "boost-asio", + "boost-assert", + "boost-bind", + "boost-config", + "boost-container", + "boost-container-hash", + "boost-core", + "boost-endian", + "boost-intrusive", + "boost-logic", + "boost-mp11", + "boost-optional", + "boost-smart-ptr", + "boost-static-assert", + "boost-system", + "boost-throw-exception", + "boost-type-index", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers", + "boost-winapi" + ] +} diff --git a/externals/vcpkg/ports/boost-bimap/portfile.cmake b/externals/vcpkg/ports/boost-bimap/portfile.cmake new file mode 100755 index 000000000..6ce6c2ec5 --- /dev/null +++ b/externals/vcpkg/ports/boost-bimap/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/bimap + REF boost-1.79.0 + SHA512 85e6c549433027a43f99e18d422be70055aa59e9548785c9ab1d166e49c21702b1d939070187c58b296ea20635a6ef6fa4d1040c9746eba96790f26200de7201 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-bimap/vcpkg.json b/externals/vcpkg/ports/boost-bimap/vcpkg.json new file mode 100755 index 000000000..67fe38b38 --- /dev/null +++ b/externals/vcpkg/ports/boost-bimap/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "boost-bimap", + "version": "1.79.0", + "description": "Boost bimap module", + "homepage": "https://github.com/boostorg/bimap", + "license": "BSL-1.0", + "dependencies": [ + "boost-concept-check", + "boost-config", + "boost-container-hash", + "boost-core", + "boost-iterator", + "boost-lambda", + "boost-mpl", + "boost-multi-index", + "boost-preprocessor", + "boost-serialization", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-bind/portfile.cmake b/externals/vcpkg/ports/boost-bind/portfile.cmake new file mode 100755 index 000000000..0df740c4a --- /dev/null +++ b/externals/vcpkg/ports/boost-bind/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/bind + REF boost-1.79.0 + SHA512 30ebcb26d0a719df2bfd23e25e86c15e8080219f6398c71c1d6cf230f1a10cccb0aee4d84e2bc116039c6597620ddae9bc5d7a40f0f5802644eff074e0c8e7af + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-bind/vcpkg.json b/externals/vcpkg/ports/boost-bind/vcpkg.json new file mode 100755 index 000000000..55fd5cd51 --- /dev/null +++ b/externals/vcpkg/ports/boost-bind/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "boost-bind", + "version": "1.79.0", + "description": "Boost bind module", + "homepage": "https://github.com/boostorg/bind", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-core", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-build/0001-don-t-skip-install-targets.patch b/externals/vcpkg/ports/boost-build/0001-don-t-skip-install-targets.patch new file mode 100755 index 000000000..8a0415c7c --- /dev/null +++ b/externals/vcpkg/ports/boost-build/0001-don-t-skip-install-targets.patch @@ -0,0 +1,75 @@ +From 78fd284a42caabe8815cb0870b46e5567872e75b Mon Sep 17 00:00:00 2001 +From: Dmitry +Date: Sat, 11 Dec 2021 16:58:23 +0300 +Subject: [PATCH] Don't skip install targets if there's no in ureqs + (#113) + +--- + src/tools/stage.jam | 4 ++++ + test/install_build_no.py | 26 ++++++++++++++++++++++++++ + test/test_all.py | 1 + + 3 files changed, 31 insertions(+) + create mode 100755 test/install_build_no.py + +diff --git a/src/tools/stage.jam b/src/tools/stage.jam +index c5f02e3b..325129dc 100644 +--- a/src/tools/stage.jam ++++ b/src/tools/stage.jam +@@ -478,6 +478,10 @@ class install-target-class : basic-target + return [ sequence.unique $(result2) ] ; + } + ++ rule skip-from-usage-requirements ( ) ++ { ++ } ++ + # Returns true iff 'type' is subtype of some element of 'types-to-include'. + # + local rule include-type ( type : types-to-include * ) +diff --git a/test/install_build_no.py b/test/install_build_no.py +new file mode 100755 +index 00000000..0ccf3c5c +--- /dev/null ++++ b/test/install_build_no.py +@@ -0,0 +1,26 @@ ++#!/usr/bin/python ++ ++# Copyright 2021 Dmitry Arkhipov (grisumbras@gmail.com) ++# Distributed under the Boost Software License, Version 1.0. ++# (See accompanying file LICENSE.txt or https://www.bfgroup.xyz/b2/LICENSE.txt) ++ ++# Check that no in usage-requirements of dependencies does not affect ++# install rule, i.e. a skipped installed target does not affect insallation of ++# other targets. ++ ++import BoostBuild ++ ++t = BoostBuild.Tester() ++ ++t.write("a.cpp", "int main() {}\n") ++ ++t.write("jamroot.jam", """ ++make x : : maker : no ; ++exe a : a.cpp ; ++install install : x a ; ++""") ++ ++t.run_build_system() ++t.expect_addition("install/a.exe") ++ ++t.cleanup() +diff --git a/test/test_all.py b/test/test_all.py +index b7ef5ad7..9ed729d0 100644 +--- a/test/test_all.py ++++ b/test/test_all.py +@@ -250,6 +250,7 @@ tests = ["abs_workdir", + "inherit_toolset", + "inherited_dependency", + "inline", ++ "install_build_no", + "libjpeg", + "liblzma", + "libpng", +-- +2.34.1.windows.1 + diff --git a/externals/vcpkg/ports/boost-build/0002-fix-get-version.patch b/externals/vcpkg/ports/boost-build/0002-fix-get-version.patch new file mode 100755 index 000000000..cf35e7831 --- /dev/null +++ b/externals/vcpkg/ports/boost-build/0002-fix-get-version.patch @@ -0,0 +1,13 @@ +diff --git a/src/tools/clang-linux.jam b/src/tools/clang-linux.jam +index 949e277..8934787 100644 +--- a/src/tools/clang-linux.jam ++++ b/src/tools/clang-linux.jam +@@ -97,7 +97,7 @@ rule init ( version ? : command * : options * ) { + + rule get-full-version ( command-string ) + { +- return [ common.match-command-output version : "version ([0-9.]+)" ++ return [ common.match-command-output version : "([0-9]+.[0-9]+.[0-9]+)" + : "$(command-string) --version" ] ; + } + diff --git a/externals/vcpkg/ports/boost-build/portfile.cmake b/externals/vcpkg/ports/boost-build/portfile.cmake new file mode 100755 index 000000000..ad45054ad --- /dev/null +++ b/externals/vcpkg/ports/boost-build/portfile.cmake @@ -0,0 +1,75 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +if(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW") + return() +endif() + +set(BOOST_VERSION 1.79.0) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/build + REF boost-${BOOST_VERSION} + SHA512 638f2883b9c49265d5566eadc8c93d16cb351edeb941110bad8a17871ea7d53df8eb13c80aaefb94f354b71a22454958af1ecb9a441686dbaa9631e33682a9f2 + HEAD_REF master + PATCHES + 0001-don-t-skip-install-targets.patch + 0002-fix-get-version.patch +) + +vcpkg_download_distfile(ARCHIVE + URLS "https://raw.githubusercontent.com/boostorg/boost/boost-${BOOST_VERSION}/LICENSE_1_0.txt" + FILENAME "boost_LICENSE_1_0.txt" + SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 +) + +vcpkg_download_distfile(BOOSTCPP_ARCHIVE + URLS "https://raw.githubusercontent.com/boostorg/boost/boost-${BOOST_VERSION}/boostcpp.jam" + FILENAME "boost-${BOOST_VERSION}-boostcpp.jam" + SHA512 0daa0dd315f7e426e7b9ada9cc4dad03da2eb257456e551de3fb3b2a8244f0117ed41d9d1ff77b5a3eee7a3c5fb466d345b9bb2af46004fc630209043d4862e3 +) + +# https://github.com/boostorg/boost/pull/206 +# do not add version suffix for android +file(READ "${BOOSTCPP_ARCHIVE}" _contents) +string(REPLACE "aix &&" "aix android &&" _contents "${_contents}") +file(WRITE "${SOURCE_PATH}/boostcpp.jam" "${_contents}") + +file(INSTALL ${ARCHIVE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-build RENAME copyright) + +# This fixes the lib path to use desktop libs instead of uwp -- TODO: improve this with better "host" compilation +string(REPLACE "\\store\\;" "\\;" LIB "$ENV{LIB}") +set(ENV{LIB} "${LIB}") + +file(COPY + ${SOURCE_PATH}/ + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/boost-build +) + +file(READ "${CURRENT_PACKAGES_DIR}/tools/boost-build/src/tools/msvc.jam" _contents) +string(REPLACE " /ZW /EHsc " "" _contents "${_contents}") +string(REPLACE "-nologo" "" _contents "${_contents}") +string(REPLACE "/nologo" "" _contents "${_contents}") +string(REPLACE "/Zm800" "" _contents "${_contents}") +string(REPLACE "_WIN32_WINNT=0x0602" "" _contents "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/tools/boost-build/src/tools/msvc.jam" "${_contents}") + +message(STATUS "Bootstrapping...") +if(CMAKE_HOST_WIN32) + if(VCPKG_TARGET_IS_MINGW) + set(TOOLSET mingw) + else() + set(TOOLSET msvc) + endif() + vcpkg_execute_required_process( + COMMAND "${CURRENT_PACKAGES_DIR}/tools/boost-build/bootstrap.bat" ${TOOLSET} + WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/boost-build + LOGNAME bootstrap-${TARGET_TRIPLET} + ) +else() + vcpkg_execute_required_process( + COMMAND "${CURRENT_PACKAGES_DIR}/tools/boost-build/bootstrap.sh" + WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/boost-build + LOGNAME bootstrap-${TARGET_TRIPLET} + ) +endif() diff --git a/externals/vcpkg/ports/boost-build/vcpkg.json b/externals/vcpkg/ports/boost-build/vcpkg.json new file mode 100755 index 000000000..75df22fac --- /dev/null +++ b/externals/vcpkg/ports/boost-build/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "boost-build", + "version": "1.79.0", + "description": "Boost.Build", + "homepage": "https://github.com/boostorg/build", + "license": "BSL-1.0", + "dependencies": [ + "boost-uninstall" + ] +} diff --git a/externals/vcpkg/ports/boost-callable-traits/portfile.cmake b/externals/vcpkg/ports/boost-callable-traits/portfile.cmake new file mode 100755 index 000000000..264d3edca --- /dev/null +++ b/externals/vcpkg/ports/boost-callable-traits/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/callable_traits + REF boost-1.79.0 + SHA512 1b937aa3ee79cf2d835a87922748fb891b6ffc5400d29fe6956114c840b90ab1cc4001076c8f7d63801d01c517dbbf0b0698b473041f5665a507e28a2c797c75 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-callable-traits/vcpkg.json b/externals/vcpkg/ports/boost-callable-traits/vcpkg.json new file mode 100755 index 000000000..aea6f2896 --- /dev/null +++ b/externals/vcpkg/ports/boost-callable-traits/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "boost-callable-traits", + "version": "1.79.0", + "description": "Boost callable_traits module", + "homepage": "https://github.com/boostorg/callable_traits", + "license": "BSL-1.0", + "dependencies": [ + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-chrono/portfile.cmake b/externals/vcpkg/ports/boost-chrono/portfile.cmake new file mode 100755 index 000000000..1448db292 --- /dev/null +++ b/externals/vcpkg/ports/boost-chrono/portfile.cmake @@ -0,0 +1,14 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/chrono + REF boost-1.79.0 + SHA512 b4809a49ca65bd7062a2bcc73dc044e7d47dfe058e31102977d1c394b78f806aa7b448a314aceef86d0939505a32a72cfd8101617be9037f4b591f1f04d8f303 + HEAD_REF master +) + +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-chrono/vcpkg.json b/externals/vcpkg/ports/boost-chrono/vcpkg.json new file mode 100755 index 000000000..7ef5d70c1 --- /dev/null +++ b/externals/vcpkg/ports/boost-chrono/vcpkg.json @@ -0,0 +1,37 @@ +{ + "name": "boost-chrono", + "version": "1.79.0", + "description": "Boost chrono module", + "homepage": "https://github.com/boostorg/chrono", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + { + "name": "boost-build", + "host": true + }, + "boost-config", + "boost-core", + "boost-integer", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-move", + "boost-mpl", + "boost-predef", + "boost-ratio", + "boost-static-assert", + "boost-system", + "boost-throw-exception", + "boost-type-traits", + "boost-typeof", + "boost-utility", + "boost-vcpkg-helpers", + "boost-winapi", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-circular-buffer/portfile.cmake b/externals/vcpkg/ports/boost-circular-buffer/portfile.cmake new file mode 100755 index 000000000..d851cb8f6 --- /dev/null +++ b/externals/vcpkg/ports/boost-circular-buffer/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/circular_buffer + REF boost-1.79.0 + SHA512 1779cc3a149c1be7686dd44c83efb6f1f4e5141d6d7905ef89cdabbbd3e93d56aaf0da7f81f4c8be0adada997e29b525cc2a41ad787fee6a7b453e7680417d03 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-circular-buffer/vcpkg.json b/externals/vcpkg/ports/boost-circular-buffer/vcpkg.json new file mode 100755 index 000000000..c2e9fa61c --- /dev/null +++ b/externals/vcpkg/ports/boost-circular-buffer/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "boost-circular-buffer", + "version": "1.79.0", + "description": "Boost circular_buffer module", + "homepage": "https://github.com/boostorg/circular_buffer", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-concept-check", + "boost-config", + "boost-core", + "boost-move", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-compatibility/portfile.cmake b/externals/vcpkg/ports/boost-compatibility/portfile.cmake new file mode 100755 index 000000000..fa0f6a7fe --- /dev/null +++ b/externals/vcpkg/ports/boost-compatibility/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/compatibility + REF boost-1.79.0 + SHA512 38a1c87c94ae91437b39fc2283b33150368dc7b90ef288da1d3d30969179e56040a3c697d28ba87a0e6a69b3697609b02835ffd29fb940b3f5b9e44b86694da8 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-compatibility/vcpkg.json b/externals/vcpkg/ports/boost-compatibility/vcpkg.json new file mode 100755 index 000000000..a9f342df1 --- /dev/null +++ b/externals/vcpkg/ports/boost-compatibility/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "boost-compatibility", + "version": "1.79.0", + "description": "Boost compatibility module", + "homepage": "https://github.com/boostorg/compatibility", + "license": "BSL-1.0", + "dependencies": [ + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-compute/portfile.cmake b/externals/vcpkg/ports/boost-compute/portfile.cmake new file mode 100755 index 000000000..2bb58e281 --- /dev/null +++ b/externals/vcpkg/ports/boost-compute/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/compute + REF boost-1.79.0 + SHA512 de8a38259c65e4ab0945dbad42ee507ac46974660beb2dce92212f5fd64fb963f7fa8eb9db907e435b72c430dff15405d7f04c3d4d8687c969608e88774e35e8 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-compute/vcpkg.json b/externals/vcpkg/ports/boost-compute/vcpkg.json new file mode 100755 index 000000000..620dd5bd0 --- /dev/null +++ b/externals/vcpkg/ports/boost-compute/vcpkg.json @@ -0,0 +1,40 @@ +{ + "name": "boost-compute", + "version": "1.79.0", + "description": "Boost compute module", + "homepage": "https://github.com/boostorg/compute", + "license": "BSL-1.0", + "dependencies": [ + "boost-algorithm", + "boost-array", + "boost-assert", + "boost-chrono", + "boost-config", + "boost-core", + { + "name": "boost-filesystem", + "platform": "!uwp" + }, + "boost-function", + "boost-function-types", + "boost-fusion", + "boost-iterator", + "boost-lexical-cast", + "boost-mpl", + "boost-optional", + "boost-preprocessor", + "boost-property-tree", + "boost-proto", + "boost-range", + "boost-smart-ptr", + "boost-static-assert", + "boost-thread", + "boost-throw-exception", + "boost-tuple", + "boost-type-traits", + "boost-typeof", + "boost-utility", + "boost-uuid", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-concept-check/portfile.cmake b/externals/vcpkg/ports/boost-concept-check/portfile.cmake new file mode 100755 index 000000000..e492b8cb7 --- /dev/null +++ b/externals/vcpkg/ports/boost-concept-check/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/concept_check + REF boost-1.79.0 + SHA512 dd8a43492d1eae6f3e2c5b1f6e011f04605817dec7e1358c18704a1e0432390f4304093670dc1892ec1080e438a33b17f80cae9c10b4fc99eb640a67b44d4004 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-concept-check/vcpkg.json b/externals/vcpkg/ports/boost-concept-check/vcpkg.json new file mode 100755 index 000000000..053d3a210 --- /dev/null +++ b/externals/vcpkg/ports/boost-concept-check/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "boost-concept-check", + "version": "1.79.0", + "description": "Boost concept_check module", + "homepage": "https://github.com/boostorg/concept_check", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-preprocessor", + "boost-static-assert", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-config/portfile.cmake b/externals/vcpkg/ports/boost-config/portfile.cmake new file mode 100755 index 000000000..bd6ad84ae --- /dev/null +++ b/externals/vcpkg/ports/boost-config/portfile.cmake @@ -0,0 +1,19 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/config + REF boost-1.79.0 + SHA512 e8d4f44d08865f83599b7580612055ab76b482c7ce6196d4e44c39480a39293685f1b4c683987c6eebe992141deb9c6be1f69ade4c68cbd30f7f97aa92134ebb + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) +file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp "\n#ifndef BOOST_ALL_NO_LIB\n#define BOOST_ALL_NO_LIB\n#endif\n") +file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp "\n#undef BOOST_ALL_DYN_LINK\n") + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp "\n#define BOOST_ALL_DYN_LINK\n") +endif() +file(COPY ${SOURCE_PATH}/checks DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-config) diff --git a/externals/vcpkg/ports/boost-config/vcpkg.json b/externals/vcpkg/ports/boost-config/vcpkg.json new file mode 100755 index 000000000..dc7268f2d --- /dev/null +++ b/externals/vcpkg/ports/boost-config/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "boost-config", + "version": "1.79.0", + "description": "Boost config module", + "homepage": "https://github.com/boostorg/config", + "license": "BSL-1.0", + "dependencies": [ + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-container-hash/portfile.cmake b/externals/vcpkg/ports/boost-container-hash/portfile.cmake new file mode 100755 index 000000000..28c84d479 --- /dev/null +++ b/externals/vcpkg/ports/boost-container-hash/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/container_hash + REF boost-1.79.0 + SHA512 97623e7b71944c0c3472aa96322a60e53a4231482938c3170d4493e090d999f6431f4e2f2ba7405fc37f2267869bf5265f674723a8d642e838a0f63ec0ff28d4 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-container-hash/vcpkg.json b/externals/vcpkg/ports/boost-container-hash/vcpkg.json new file mode 100755 index 000000000..7afac8c00 --- /dev/null +++ b/externals/vcpkg/ports/boost-container-hash/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "boost-container-hash", + "version": "1.79.0", + "description": "Boost container_hash module", + "homepage": "https://github.com/boostorg/container_hash", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + "boost-detail", + "boost-integer", + "boost-static-assert", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-container/portfile.cmake b/externals/vcpkg/ports/boost-container/portfile.cmake new file mode 100755 index 000000000..57eb5f90a --- /dev/null +++ b/externals/vcpkg/ports/boost-container/portfile.cmake @@ -0,0 +1,14 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/container + REF boost-1.79.0 + SHA512 934e136095d80ce1c862fa699b070908dffd9f278cdeeed3da6a0469f36fad7820ffd3cd9407bad8e8fd4606057c408cf31444140d8749db05b18934c3dd35fb + HEAD_REF master +) + +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-container/vcpkg.json b/externals/vcpkg/ports/boost-container/vcpkg.json new file mode 100755 index 000000000..2102cd57d --- /dev/null +++ b/externals/vcpkg/ports/boost-container/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "boost-container", + "version": "1.79.0", + "description": "Boost container module", + "homepage": "https://github.com/boostorg/container", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + { + "name": "boost-build", + "host": true + }, + "boost-config", + "boost-core", + "boost-intrusive", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-move", + "boost-static-assert", + "boost-type-traits", + "boost-vcpkg-helpers", + "boost-winapi", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-context/b2-options.cmake.in b/externals/vcpkg/ports/boost-context/b2-options.cmake.in new file mode 100755 index 000000000..a16d25fdb --- /dev/null +++ b/externals/vcpkg/ports/boost-context/b2-options.cmake.in @@ -0,0 +1,29 @@ + +if(@VCPKG_TARGET_IS_WINDOWS@) + list(APPEND B2_OPTIONS + abi=ms + binary-format=pe + ) +endif() + +if(@VCPKG_TARGET_IS_OSX@) + list(APPEND B2_OPTIONS + abi=sysv + binary-format=mach-o + ) +endif() + +if("@VCPKG_TARGET_IS_LINUX@" STREQUAL "ON" OR "@VCPKG_TARGET_IS_ANDROID@" STREQUAL "ON") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + list(APPEND B2_OPTIONS + abi=aapcs + ) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + list(APPEND B2_OPTIONS + abi=sysv + ) + endif() + list(APPEND B2_OPTIONS + binary-format=elf + ) +endif() diff --git a/externals/vcpkg/ports/boost-context/portfile.cmake b/externals/vcpkg/ports/boost-context/portfile.cmake new file mode 100755 index 000000000..97412ce79 --- /dev/null +++ b/externals/vcpkg/ports/boost-context/portfile.cmake @@ -0,0 +1,27 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/context + REF boost-1.79.0 + SHA512 25fc307a3ffa9b2b87199e0d7faf87ccd899c619d5043d3780e65476a0356a3edb0fcd55400bd2898f12de149952edf2fde58c79b62d993b534b81561bd174ea + HEAD_REF master +) + +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../config/checks/config" + "import ../config/checks/config" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +configure_file( + "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake.in" + "${CURRENT_BUILDTREES_DIR}/vcpkg-b2-options.cmake" + @ONLY +) +boost_modular_build( + SOURCE_PATH ${SOURCE_PATH} + BOOST_CMAKE_FRAGMENT "${CURRENT_BUILDTREES_DIR}/vcpkg-b2-options.cmake" +) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-context/vcpkg.json b/externals/vcpkg/ports/boost-context/vcpkg.json new file mode 100755 index 000000000..c77e45fe0 --- /dev/null +++ b/externals/vcpkg/ports/boost-context/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "boost-context", + "version": "1.79.0", + "description": "Boost context module", + "homepage": "https://github.com/boostorg/context", + "license": "BSL-1.0", + "supports": "!uwp & !emscripten", + "dependencies": [ + "boost-assert", + { + "name": "boost-build", + "host": true + }, + "boost-config", + "boost-core", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-mp11", + "boost-pool", + "boost-predef", + "boost-smart-ptr", + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-contract/portfile.cmake b/externals/vcpkg/ports/boost-contract/portfile.cmake new file mode 100755 index 000000000..2561d51b3 --- /dev/null +++ b/externals/vcpkg/ports/boost-contract/portfile.cmake @@ -0,0 +1,14 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/contract + REF boost-1.79.0 + SHA512 511df371ee4c1bc9e443a4df1c1156138187f94b549df0944cc46613bf3ce07e7002d3003a41385b7e0f43326590ae4d932a15fdf0cc4d883b4be05ce79c3a94 + HEAD_REF master +) + +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-contract/vcpkg.json b/externals/vcpkg/ports/boost-contract/vcpkg.json new file mode 100755 index 000000000..370c506bf --- /dev/null +++ b/externals/vcpkg/ports/boost-contract/vcpkg.json @@ -0,0 +1,38 @@ +{ + "name": "boost-contract", + "version": "1.79.0", + "description": "Boost contract module", + "homepage": "https://github.com/boostorg/contract", + "license": "BSL-1.0", + "dependencies": [ + "boost-any", + "boost-assert", + { + "name": "boost-build", + "host": true + }, + "boost-config", + "boost-core", + "boost-exception", + "boost-function", + "boost-function-types", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-mpl", + "boost-optional", + "boost-preprocessor", + "boost-smart-ptr", + "boost-static-assert", + "boost-thread", + "boost-type-traits", + "boost-typeof", + "boost-utility", + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-conversion/portfile.cmake b/externals/vcpkg/ports/boost-conversion/portfile.cmake new file mode 100755 index 000000000..eca7221e9 --- /dev/null +++ b/externals/vcpkg/ports/boost-conversion/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/conversion + REF boost-1.79.0 + SHA512 dc2ff45cd1e046039fddb4af2ea2651eabbacb047255e55be395e4d3a71bde719b6dcf5071143800f14b70522f8f9e5dde2acab871e1d0aa36c9be7d1f38ed3b + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-conversion/vcpkg.json b/externals/vcpkg/ports/boost-conversion/vcpkg.json new file mode 100755 index 000000000..2e341ca48 --- /dev/null +++ b/externals/vcpkg/ports/boost-conversion/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "boost-conversion", + "version": "1.79.0", + "description": "Boost conversion module", + "homepage": "https://github.com/boostorg/conversion", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + "boost-smart-ptr", + "boost-throw-exception", + "boost-type-traits", + "boost-typeof", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-convert/portfile.cmake b/externals/vcpkg/ports/boost-convert/portfile.cmake new file mode 100755 index 000000000..77a6f775f --- /dev/null +++ b/externals/vcpkg/ports/boost-convert/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/convert + REF boost-1.79.0 + SHA512 deb3b28c8c356f4d36c9f5af01f682572c14f10b3466acb34619aa56ee398b687a95a731cd144e870b3c6581540b7ae48a1cfe4b6926a9781470aac6e07da9c4 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-convert/vcpkg.json b/externals/vcpkg/ports/boost-convert/vcpkg.json new file mode 100755 index 000000000..d0bc0df76 --- /dev/null +++ b/externals/vcpkg/ports/boost-convert/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "boost-convert", + "version": "1.79.0", + "description": "Boost convert module", + "homepage": "https://github.com/boostorg/convert", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-core", + "boost-function-types", + "boost-lexical-cast", + "boost-math", + "boost-mpl", + "boost-optional", + "boost-parameter", + "boost-range", + "boost-spirit", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-core/portfile.cmake b/externals/vcpkg/ports/boost-core/portfile.cmake new file mode 100755 index 000000000..d0b92b175 --- /dev/null +++ b/externals/vcpkg/ports/boost-core/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/core + REF boost-1.79.0 + SHA512 f1fc5f371f52a0b12e72d9a9f11a57f561383195091b7252bc9fda39837504b29481e22750a526b54bd169ec3cc44b3d0d6bbd296027913858eb8c9326b56cdb + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-core/vcpkg.json b/externals/vcpkg/ports/boost-core/vcpkg.json new file mode 100755 index 000000000..fb0b225da --- /dev/null +++ b/externals/vcpkg/ports/boost-core/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "boost-core", + "version": "1.79.0", + "description": "Boost core module", + "homepage": "https://github.com/boostorg/core", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-static-assert", + "boost-throw-exception", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-coroutine/portfile.cmake b/externals/vcpkg/ports/boost-coroutine/portfile.cmake new file mode 100755 index 000000000..cab75fa11 --- /dev/null +++ b/externals/vcpkg/ports/boost-coroutine/portfile.cmake @@ -0,0 +1,14 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/coroutine + REF boost-1.79.0 + SHA512 a969a25627713fd0cf440ee1c60979c10465df95589dc829f8ee480c5a5cfd833ee3ea5f90616d175f06cf1b01750d682886e8d7e64038e159bfc15b184a5de4 + HEAD_REF master +) + +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-coroutine/vcpkg.json b/externals/vcpkg/ports/boost-coroutine/vcpkg.json new file mode 100755 index 000000000..89754e5e5 --- /dev/null +++ b/externals/vcpkg/ports/boost-coroutine/vcpkg.json @@ -0,0 +1,36 @@ +{ + "name": "boost-coroutine", + "version": "1.79.0", + "description": "Boost coroutine module", + "homepage": "https://github.com/boostorg/coroutine", + "license": "BSL-1.0", + "supports": "!arm & !uwp & !emscripten", + "dependencies": [ + "boost-assert", + { + "name": "boost-build", + "host": true + }, + "boost-config", + { + "name": "boost-context", + "platform": "!uwp & !emscripten" + }, + "boost-core", + "boost-exception", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-move", + "boost-system", + "boost-throw-exception", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-coroutine2/portfile.cmake b/externals/vcpkg/ports/boost-coroutine2/portfile.cmake new file mode 100755 index 000000000..e795fd594 --- /dev/null +++ b/externals/vcpkg/ports/boost-coroutine2/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/coroutine2 + REF boost-1.79.0 + SHA512 a93c43fea67d2963e90d9e84e7a6b2832d1f6a9810385092198300af35f1d27b4a33367eff256c7bd32beed0041d84ada62a12aeda45f5f7641fc801b94f0aeb + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-coroutine2/vcpkg.json b/externals/vcpkg/ports/boost-coroutine2/vcpkg.json new file mode 100755 index 000000000..44a94ff00 --- /dev/null +++ b/externals/vcpkg/ports/boost-coroutine2/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "boost-coroutine2", + "version": "1.79.0", + "description": "Boost coroutine2 module", + "homepage": "https://github.com/boostorg/coroutine2", + "license": "BSL-1.0", + "supports": "!emscripten", + "dependencies": [ + "boost-assert", + "boost-config", + { + "name": "boost-context", + "platform": "!uwp & !emscripten" + }, + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-crc/portfile.cmake b/externals/vcpkg/ports/boost-crc/portfile.cmake new file mode 100755 index 000000000..1c9c39f43 --- /dev/null +++ b/externals/vcpkg/ports/boost-crc/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/crc + REF boost-1.79.0 + SHA512 31d3b5f0f7e7beee47b4bee9531a598b7fe27681ea6719e68f6dfae4047aff0c453f5cd8668de2e0441cf8d04ae38a83f530ef56dc2e7262a975e567cdc0439d + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-crc/vcpkg.json b/externals/vcpkg/ports/boost-crc/vcpkg.json new file mode 100755 index 000000000..0803357c1 --- /dev/null +++ b/externals/vcpkg/ports/boost-crc/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "boost-crc", + "version": "1.79.0", + "description": "Boost crc module", + "homepage": "https://github.com/boostorg/crc", + "license": "BSL-1.0", + "dependencies": [ + "boost-array", + "boost-config", + "boost-integer", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-date-time/portfile.cmake b/externals/vcpkg/ports/boost-date-time/portfile.cmake new file mode 100755 index 000000000..195b3ff12 --- /dev/null +++ b/externals/vcpkg/ports/boost-date-time/portfile.cmake @@ -0,0 +1,14 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/date_time + REF boost-1.79.0 + SHA512 e24b9c1c2564395b673b32a8b2308f21846cdf74476a8391ff54af12bccea3a3522b035567318cea03393ad6729a7910210008780c450c126433a4117874a10d + HEAD_REF master +) + +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-date-time/vcpkg.json b/externals/vcpkg/ports/boost-date-time/vcpkg.json new file mode 100755 index 000000000..a878773ff --- /dev/null +++ b/externals/vcpkg/ports/boost-date-time/vcpkg.json @@ -0,0 +1,37 @@ +{ + "name": "boost-date-time", + "version": "1.79.0", + "description": "Boost date_time module", + "homepage": "https://github.com/boostorg/date_time", + "license": "BSL-1.0", + "dependencies": [ + "boost-algorithm", + "boost-assert", + { + "name": "boost-build", + "host": true + }, + "boost-config", + "boost-core", + "boost-io", + "boost-lexical-cast", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-numeric-conversion", + "boost-range", + "boost-smart-ptr", + "boost-static-assert", + "boost-throw-exception", + "boost-tokenizer", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers", + "boost-winapi", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-describe/portfile.cmake b/externals/vcpkg/ports/boost-describe/portfile.cmake new file mode 100755 index 000000000..2fedfe00c --- /dev/null +++ b/externals/vcpkg/ports/boost-describe/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/describe + REF boost-1.79.0 + SHA512 0a8ca55ac3c6b3a80c003d2817b16c1b2fd4730554cd392673efeb675a3ea54907abd4a54447fc3f83068ead9acf462af38fa9f3dbc6cce9644237892f5cc03e + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-describe/vcpkg.json b/externals/vcpkg/ports/boost-describe/vcpkg.json new file mode 100755 index 000000000..db52e9ea9 --- /dev/null +++ b/externals/vcpkg/ports/boost-describe/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "boost-describe", + "version": "1.79.0", + "description": "Boost describe module", + "homepage": "https://github.com/boostorg/describe", + "license": "BSL-1.0", + "dependencies": [ + "boost-mp11", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-detail/portfile.cmake b/externals/vcpkg/ports/boost-detail/portfile.cmake new file mode 100755 index 000000000..f603c5507 --- /dev/null +++ b/externals/vcpkg/ports/boost-detail/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/detail + REF boost-1.79.0 + SHA512 ca51c9127db37971b8ad32276d0aa666544a1382dc60298972a3075b81846b89257850cfd4ce7f9409bfb92c088c7df96618633a3b00f578dce86728074965b7 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-detail/vcpkg.json b/externals/vcpkg/ports/boost-detail/vcpkg.json new file mode 100755 index 000000000..5807a6541 --- /dev/null +++ b/externals/vcpkg/ports/boost-detail/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "boost-detail", + "version": "1.79.0", + "description": "Boost detail module", + "homepage": "https://github.com/boostorg/detail", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-core", + "boost-preprocessor", + "boost-static-assert", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-dll/portfile.cmake b/externals/vcpkg/ports/boost-dll/portfile.cmake new file mode 100755 index 000000000..c85b3452b --- /dev/null +++ b/externals/vcpkg/ports/boost-dll/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/dll + REF boost-1.79.0 + SHA512 cf77949934d835d9100cdf4e09b225085b94a73e4a2652aa939aa99a90cacce32fc90124a062d64677976a7c9573373ee97d274d1bda701127a7aa77fc010e2e + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-dll/vcpkg.json b/externals/vcpkg/ports/boost-dll/vcpkg.json new file mode 100755 index 000000000..02a91abd8 --- /dev/null +++ b/externals/vcpkg/ports/boost-dll/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "boost-dll", + "version": "1.79.0", + "description": "Boost dll module", + "homepage": "https://github.com/boostorg/dll", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + { + "name": "boost-filesystem", + "platform": "!uwp" + }, + "boost-function", + "boost-move", + "boost-predef", + "boost-smart-ptr", + "boost-spirit", + "boost-static-assert", + "boost-system", + "boost-throw-exception", + "boost-type-index", + "boost-type-traits", + "boost-vcpkg-helpers", + "boost-winapi" + ] +} diff --git a/externals/vcpkg/ports/boost-dynamic-bitset/portfile.cmake b/externals/vcpkg/ports/boost-dynamic-bitset/portfile.cmake new file mode 100755 index 000000000..08d1b037c --- /dev/null +++ b/externals/vcpkg/ports/boost-dynamic-bitset/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/dynamic_bitset + REF boost-1.79.0 + SHA512 c9aa196ddf479e2c6d3f92abcf1cd2fb5e459af8f47fac2dae7dd4355bb16ffba7ddcfd5750681cb0a5ba76503f2824bf5c0bbb7f3f8dc8320ba977df3baacab + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-dynamic-bitset/vcpkg.json b/externals/vcpkg/ports/boost-dynamic-bitset/vcpkg.json new file mode 100755 index 000000000..daecb6557 --- /dev/null +++ b/externals/vcpkg/ports/boost-dynamic-bitset/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "boost-dynamic-bitset", + "version": "1.79.0", + "description": "Boost dynamic_bitset module", + "homepage": "https://github.com/boostorg/dynamic_bitset", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-container-hash", + "boost-core", + "boost-integer", + "boost-move", + "boost-static-assert", + "boost-throw-exception", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-endian/portfile.cmake b/externals/vcpkg/ports/boost-endian/portfile.cmake new file mode 100755 index 000000000..4900f75c7 --- /dev/null +++ b/externals/vcpkg/ports/boost-endian/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/endian + REF boost-1.79.0 + SHA512 b2fa5408e863a250d749c7a86bf755d1e77243d410b11fa5d67c4361014d641feb6510c2e36393dcb3ebe4a2b81dde7858b976af4c46094e0e25bae904705207 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-endian/vcpkg.json b/externals/vcpkg/ports/boost-endian/vcpkg.json new file mode 100755 index 000000000..eb0700390 --- /dev/null +++ b/externals/vcpkg/ports/boost-endian/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "boost-endian", + "version": "1.79.0", + "description": "Boost endian module", + "homepage": "https://github.com/boostorg/endian", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-core", + "boost-static-assert", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-exception/portfile.cmake b/externals/vcpkg/ports/boost-exception/portfile.cmake new file mode 100755 index 000000000..107f7a23c --- /dev/null +++ b/externals/vcpkg/ports/boost-exception/portfile.cmake @@ -0,0 +1,14 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/exception + REF boost-1.79.0 + SHA512 a43b5b296f5af17ca447dd8ca5d89abbddf37969fef858f2d5966f57b336f5620b7e77ac5c99fe796d4440d66ecd376564c00b7936a5393a67045cbf148d520e + HEAD_REF master +) + +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-exception/vcpkg.json b/externals/vcpkg/ports/boost-exception/vcpkg.json new file mode 100755 index 000000000..f6009b54a --- /dev/null +++ b/externals/vcpkg/ports/boost-exception/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "boost-exception", + "version": "1.79.0", + "description": "Boost exception module", + "homepage": "https://github.com/boostorg/exception", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + { + "name": "boost-build", + "host": true + }, + "boost-config", + "boost-core", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-smart-ptr", + "boost-throw-exception", + "boost-tuple", + "boost-type-traits", + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-fiber/b2-options.cmake b/externals/vcpkg/ports/boost-fiber/b2-options.cmake new file mode 100755 index 000000000..296336aae --- /dev/null +++ b/externals/vcpkg/ports/boost-fiber/b2-options.cmake @@ -0,0 +1,3 @@ +if("numa" IN_LIST FEATURES) + list(APPEND B2_OPTIONS numa=on) +endif() diff --git a/externals/vcpkg/ports/boost-fiber/portfile.cmake b/externals/vcpkg/ports/boost-fiber/portfile.cmake new file mode 100755 index 000000000..de6e376e6 --- /dev/null +++ b/externals/vcpkg/ports/boost-fiber/portfile.cmake @@ -0,0 +1,22 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/fiber + REF boost-1.79.0 + SHA512 c264fe03b9cf08973acadeef3e00ea8b76610420b0b1a256a137a963f79f3b9114f07ceca6b604c4ea86e4088c954d3780f90bc13167d35f1ff38be237a216fb + HEAD_REF master +) + +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../config/checks/config" + "import ../config/checks/config" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build( + SOURCE_PATH ${SOURCE_PATH} + BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake" +) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-fiber/vcpkg.json b/externals/vcpkg/ports/boost-fiber/vcpkg.json new file mode 100755 index 000000000..1dd1d73fa --- /dev/null +++ b/externals/vcpkg/ports/boost-fiber/vcpkg.json @@ -0,0 +1,44 @@ +{ + "name": "boost-fiber", + "version": "1.79.0", + "description": "Boost fiber module", + "homepage": "https://github.com/boostorg/fiber", + "license": "BSL-1.0", + "supports": "!osx & !uwp & !arm & !emscripten", + "dependencies": [ + "boost-algorithm", + "boost-assert", + { + "name": "boost-build", + "host": true + }, + "boost-config", + { + "name": "boost-context", + "platform": "!uwp & !emscripten" + }, + "boost-core", + { + "name": "boost-filesystem", + "platform": "!uwp" + }, + "boost-format", + "boost-intrusive", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-predef", + "boost-smart-ptr", + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "numa": { + "description": "Enable NUMA support" + } + } +} diff --git a/externals/vcpkg/ports/boost-filesystem/portfile.cmake b/externals/vcpkg/ports/boost-filesystem/portfile.cmake new file mode 100755 index 000000000..68bad85a2 --- /dev/null +++ b/externals/vcpkg/ports/boost-filesystem/portfile.cmake @@ -0,0 +1,14 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/filesystem + REF boost-1.79.0 + SHA512 6f3ff9f3006110622642ec27c7913157bacdc3d5d1f19044d67bafb9be2f26e9feea26e91e6556f9806999524ae59d59527ccfd1d52b4bea7c9363ecbff4454d + HEAD_REF master +) + +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-filesystem/vcpkg.json b/externals/vcpkg/ports/boost-filesystem/vcpkg.json new file mode 100755 index 000000000..8c9bc6864 --- /dev/null +++ b/externals/vcpkg/ports/boost-filesystem/vcpkg.json @@ -0,0 +1,37 @@ +{ + "name": "boost-filesystem", + "version": "1.79.0", + "description": "Boost filesystem module", + "homepage": "https://github.com/boostorg/filesystem", + "license": "BSL-1.0", + "supports": "!uwp", + "dependencies": [ + "boost-assert", + "boost-atomic", + { + "name": "boost-build", + "host": true + }, + "boost-config", + "boost-container-hash", + "boost-core", + "boost-detail", + "boost-io", + "boost-iterator", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-predef", + "boost-smart-ptr", + "boost-system", + "boost-throw-exception", + "boost-type-traits", + "boost-vcpkg-helpers", + "boost-winapi", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-flyweight/portfile.cmake b/externals/vcpkg/ports/boost-flyweight/portfile.cmake new file mode 100755 index 000000000..e1dcc33a3 --- /dev/null +++ b/externals/vcpkg/ports/boost-flyweight/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/flyweight + REF boost-1.79.0 + SHA512 cd0b8d481989602a2deea71332434da4ef358e0a0ca81cdd7adedd01b70cba189aa93e3e7a92ea6dcb9614247ed063f18e099712fc7a42044da2461160435496 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-flyweight/vcpkg.json b/externals/vcpkg/ports/boost-flyweight/vcpkg.json new file mode 100755 index 000000000..e7ff57749 --- /dev/null +++ b/externals/vcpkg/ports/boost-flyweight/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "boost-flyweight", + "version": "1.79.0", + "description": "Boost flyweight module", + "homepage": "https://github.com/boostorg/flyweight", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-container-hash", + "boost-core", + "boost-detail", + "boost-interprocess", + "boost-mpl", + "boost-multi-index", + "boost-parameter", + "boost-preprocessor", + "boost-serialization", + "boost-smart-ptr", + "boost-throw-exception", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-foreach/portfile.cmake b/externals/vcpkg/ports/boost-foreach/portfile.cmake new file mode 100755 index 000000000..86e818cd9 --- /dev/null +++ b/externals/vcpkg/ports/boost-foreach/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/foreach + REF boost-1.79.0 + SHA512 3f003e96806543cebe888014e870d0e0030ad8fd3762332e548f6d9c146a45996a8bb1b29d2c91b5f3a39e7731a9c6c8447f95631e5e6dc12293e07f5bda55e2 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-foreach/vcpkg.json b/externals/vcpkg/ports/boost-foreach/vcpkg.json new file mode 100755 index 000000000..559acef07 --- /dev/null +++ b/externals/vcpkg/ports/boost-foreach/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "boost-foreach", + "version": "1.79.0", + "description": "Boost foreach module", + "homepage": "https://github.com/boostorg/foreach", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-core", + "boost-iterator", + "boost-mpl", + "boost-range", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-format/portfile.cmake b/externals/vcpkg/ports/boost-format/portfile.cmake new file mode 100755 index 000000000..c93a1427f --- /dev/null +++ b/externals/vcpkg/ports/boost-format/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/format + REF boost-1.79.0 + SHA512 46ef8394324925a427f5ba574c897d0b3d27389aed0a6085f4b8dc600c6a720f9f3f1ced3a368c5438f42ac8d204da833df228187e4a6fe7129be755cd16ae90 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-format/vcpkg.json b/externals/vcpkg/ports/boost-format/vcpkg.json new file mode 100755 index 000000000..53e9743a1 --- /dev/null +++ b/externals/vcpkg/ports/boost-format/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "boost-format", + "version": "1.79.0", + "description": "Boost format module", + "homepage": "https://github.com/boostorg/format", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + "boost-optional", + "boost-smart-ptr", + "boost-throw-exception", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-function-types/portfile.cmake b/externals/vcpkg/ports/boost-function-types/portfile.cmake new file mode 100755 index 000000000..9daab85d8 --- /dev/null +++ b/externals/vcpkg/ports/boost-function-types/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/function_types + REF boost-1.79.0 + SHA512 95fbe35406c1276a8170b7f83dcdc7285ee04ee2e14329544cbb2ccb3a8a24d05ca7cd2b762f88223505f4c4b379a523068492e625c58bb8eb961a6333966019 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-function-types/vcpkg.json b/externals/vcpkg/ports/boost-function-types/vcpkg.json new file mode 100755 index 000000000..3b9e49da2 --- /dev/null +++ b/externals/vcpkg/ports/boost-function-types/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "boost-function-types", + "version": "1.79.0", + "description": "Boost function_types module", + "homepage": "https://github.com/boostorg/function_types", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-core", + "boost-detail", + "boost-mpl", + "boost-preprocessor", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-function/portfile.cmake b/externals/vcpkg/ports/boost-function/portfile.cmake new file mode 100755 index 000000000..3ae65a5b5 --- /dev/null +++ b/externals/vcpkg/ports/boost-function/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/function + REF boost-1.79.0 + SHA512 a1f0e4ff828c286e9eb29a8cb8c203248605b9ddc9e81e0797ff62f1513f7debfe3c48fd158383cb2e963a442959e33de5fa7fb641690649ed402e782b411947 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-function/vcpkg.json b/externals/vcpkg/ports/boost-function/vcpkg.json new file mode 100755 index 000000000..67a1e8395 --- /dev/null +++ b/externals/vcpkg/ports/boost-function/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "boost-function", + "version": "1.79.0", + "description": "Boost function module", + "homepage": "https://github.com/boostorg/function", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-bind", + "boost-config", + "boost-core", + "boost-integer", + "boost-preprocessor", + "boost-throw-exception", + "boost-type-index", + "boost-type-traits", + "boost-typeof", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-functional/portfile.cmake b/externals/vcpkg/ports/boost-functional/portfile.cmake new file mode 100755 index 000000000..f705fafb2 --- /dev/null +++ b/externals/vcpkg/ports/boost-functional/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/functional + REF boost-1.79.0 + SHA512 17ab121ec3e9f2bdd9a3404861f6c2952ffda84bf2731fb3300e736c993cf4d49460d4e35edd6cccc123fe87d5c0b32ac0fa0c71770cfb74d8b3a7f14cbda991 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-functional/vcpkg.json b/externals/vcpkg/ports/boost-functional/vcpkg.json new file mode 100755 index 000000000..99b1ec1c3 --- /dev/null +++ b/externals/vcpkg/ports/boost-functional/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "boost-functional", + "version": "1.79.0", + "description": "Boost functional module", + "homepage": "https://github.com/boostorg/functional", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-core", + "boost-function", + "boost-function-types", + "boost-mpl", + "boost-preprocessor", + "boost-type-traits", + "boost-typeof", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-fusion/portfile.cmake b/externals/vcpkg/ports/boost-fusion/portfile.cmake new file mode 100755 index 000000000..f845397ed --- /dev/null +++ b/externals/vcpkg/ports/boost-fusion/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/fusion + REF boost-1.79.0 + SHA512 87347852c8aaed2287c409468b8fddba378698454bfc451c2832e99eb0b9dd3340c9d3c160e5313a72598c0787b4c28032bb4a0326cec505c93601afb0f5b06a + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-fusion/vcpkg.json b/externals/vcpkg/ports/boost-fusion/vcpkg.json new file mode 100755 index 000000000..67c0c521d --- /dev/null +++ b/externals/vcpkg/ports/boost-fusion/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "boost-fusion", + "version": "1.79.0", + "description": "Boost fusion module", + "homepage": "https://github.com/boostorg/fusion", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-container-hash", + "boost-core", + "boost-function-types", + "boost-mpl", + "boost-preprocessor", + "boost-static-assert", + "boost-tuple", + "boost-type-traits", + "boost-typeof", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-geometry/portfile.cmake b/externals/vcpkg/ports/boost-geometry/portfile.cmake new file mode 100755 index 000000000..b832776bc --- /dev/null +++ b/externals/vcpkg/ports/boost-geometry/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/geometry + REF boost-1.79.0 + SHA512 0f6e92d4dd9fc98598101bc0b581ffd22b7771686824aa37c713fd247cb19a4c60d750842a40da44438376a66ed067846381fba5b4cdc19a7182bf37d2d6fc77 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-geometry/vcpkg.json b/externals/vcpkg/ports/boost-geometry/vcpkg.json new file mode 100755 index 000000000..7ea8abcbb --- /dev/null +++ b/externals/vcpkg/ports/boost-geometry/vcpkg.json @@ -0,0 +1,43 @@ +{ + "name": "boost-geometry", + "version": "1.79.0", + "description": "Boost geometry module", + "homepage": "https://github.com/boostorg/geometry", + "license": "BSL-1.0", + "dependencies": [ + "boost-algorithm", + "boost-any", + "boost-array", + "boost-assert", + "boost-concept-check", + "boost-config", + "boost-container", + "boost-core", + "boost-function-types", + "boost-fusion", + "boost-integer", + "boost-iterator", + "boost-lexical-cast", + "boost-math", + "boost-move", + "boost-mpl", + "boost-multiprecision", + "boost-numeric-conversion", + "boost-polygon", + "boost-qvm", + "boost-range", + "boost-rational", + "boost-serialization", + "boost-smart-ptr", + "boost-static-assert", + "boost-thread", + "boost-throw-exception", + "boost-tokenizer", + "boost-tuple", + "boost-type-traits", + "boost-utility", + "boost-variant", + "boost-variant2", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-gil/portfile.cmake b/externals/vcpkg/ports/boost-gil/portfile.cmake new file mode 100755 index 000000000..f16d2bc2e --- /dev/null +++ b/externals/vcpkg/ports/boost-gil/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/gil + REF boost-1.79.0 + SHA512 a682481b9a7d75f9db477388c707eb277ded72bcc72a4e1d71ea5521f72d7dececb5ad3c558a449b630eb4eec15c805152f650f8a7981eaf15a0c1d819bc77d4 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-gil/vcpkg.json b/externals/vcpkg/ports/boost-gil/vcpkg.json new file mode 100755 index 000000000..081c1b749 --- /dev/null +++ b/externals/vcpkg/ports/boost-gil/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "boost-gil", + "version": "1.79.0", + "description": "Boost gil module", + "homepage": "https://github.com/boostorg/gil", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-concept-check", + "boost-config", + "boost-core", + "boost-integer", + "boost-iterator", + "boost-mp11", + "boost-numeric-conversion", + "boost-preprocessor", + "boost-variant2", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-graph-parallel/portfile.cmake b/externals/vcpkg/ports/boost-graph-parallel/portfile.cmake new file mode 100755 index 000000000..340f21c46 --- /dev/null +++ b/externals/vcpkg/ports/boost-graph-parallel/portfile.cmake @@ -0,0 +1,14 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/graph_parallel + REF boost-1.79.0 + SHA512 18c4a3272d08445bf6dfe23546d5380740979014207620b67890e20df21a7cd0d2c9c9f9b96ea240ceab5f4e1af98cc09518667959b4782595f36fa290e88a8e + HEAD_REF master +) + +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-graph-parallel/vcpkg.json b/externals/vcpkg/ports/boost-graph-parallel/vcpkg.json new file mode 100755 index 000000000..a05c2dd38 --- /dev/null +++ b/externals/vcpkg/ports/boost-graph-parallel/vcpkg.json @@ -0,0 +1,56 @@ +{ + "name": "boost-graph-parallel", + "version": "1.79.0", + "description": "Boost graph_parallel module", + "homepage": "https://github.com/boostorg/graph_parallel", + "license": "BSL-1.0", + "supports": "!uwp", + "dependencies": [ + "boost-algorithm", + "boost-assert", + { + "name": "boost-build", + "host": true + }, + "boost-concept-check", + "boost-config", + "boost-container-hash", + "boost-core", + "boost-detail", + "boost-dynamic-bitset", + { + "name": "boost-filesystem", + "platform": "!uwp" + }, + "boost-foreach", + "boost-function", + "boost-graph", + "boost-iterator", + "boost-lexical-cast", + { + "name": "boost-modular-build-helper", + "host": true + }, + { + "name": "boost-mpi", + "platform": "!uwp" + }, + "boost-mpl", + "boost-optional", + "boost-property-map", + "boost-property-map-parallel", + "boost-random", + "boost-serialization", + "boost-smart-ptr", + "boost-static-assert", + "boost-tuple", + "boost-type-traits", + "boost-variant", + "boost-vcpkg-helpers", + "mpi", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-graph/portfile.cmake b/externals/vcpkg/ports/boost-graph/portfile.cmake new file mode 100755 index 000000000..1d9422d96 --- /dev/null +++ b/externals/vcpkg/ports/boost-graph/portfile.cmake @@ -0,0 +1,14 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/graph + REF boost-1.79.0 + SHA512 abf24abcccc14145463d9a2b465137352703fd6d5fbb7bc2d8e1d7f126f165826a858a47d3d8ae0f2bec897875f77a138d03708dbcfa4b7ff31910fd6f1a7d63 + HEAD_REF master +) + +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-graph/vcpkg.json b/externals/vcpkg/ports/boost-graph/vcpkg.json new file mode 100755 index 000000000..18bfed790 --- /dev/null +++ b/externals/vcpkg/ports/boost-graph/vcpkg.json @@ -0,0 +1,63 @@ +{ + "name": "boost-graph", + "version": "1.79.0", + "description": "Boost graph module", + "homepage": "https://github.com/boostorg/graph", + "license": "BSL-1.0", + "dependencies": [ + "boost-algorithm", + "boost-any", + "boost-array", + "boost-assert", + "boost-bimap", + "boost-bind", + { + "name": "boost-build", + "host": true + }, + "boost-concept-check", + "boost-config", + "boost-container-hash", + "boost-conversion", + "boost-core", + "boost-detail", + "boost-foreach", + "boost-function", + "boost-integer", + "boost-iterator", + "boost-lexical-cast", + "boost-math", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-move", + "boost-mpl", + "boost-multi-index", + "boost-optional", + "boost-parameter", + "boost-preprocessor", + "boost-property-map", + "boost-property-tree", + "boost-random", + "boost-range", + "boost-regex", + "boost-serialization", + "boost-smart-ptr", + "boost-spirit", + "boost-static-assert", + "boost-throw-exception", + "boost-tti", + "boost-tuple", + "boost-type-traits", + "boost-typeof", + "boost-unordered", + "boost-utility", + "boost-vcpkg-helpers", + "boost-xpressive", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-hana/portfile.cmake b/externals/vcpkg/ports/boost-hana/portfile.cmake new file mode 100755 index 000000000..006fbfe36 --- /dev/null +++ b/externals/vcpkg/ports/boost-hana/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/hana + REF boost-1.79.0 + SHA512 e50511f768c16ba5eb41a4240e4df85f944443ae6b35848f079fec0ed65e27ba70c643f1cea58bf1fae2034a6c88be81ce23639e21c3030e43c2295652514f96 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-hana/vcpkg.json b/externals/vcpkg/ports/boost-hana/vcpkg.json new file mode 100755 index 000000000..0b59037c8 --- /dev/null +++ b/externals/vcpkg/ports/boost-hana/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "boost-hana", + "version": "1.79.0", + "description": "Boost hana module", + "homepage": "https://github.com/boostorg/hana", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-core", + "boost-fusion", + "boost-mpl", + "boost-tuple", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-heap/portfile.cmake b/externals/vcpkg/ports/boost-heap/portfile.cmake new file mode 100755 index 000000000..5288cd0bf --- /dev/null +++ b/externals/vcpkg/ports/boost-heap/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/heap + REF boost-1.79.0 + SHA512 f538cf751dd8909010613579a5b10da58b6d8474d9f58e9a6e2ab6ad95b52cd08c8e6a6c6d3abd5426508bc1de432a11a355652c6241ba474ddfeffa285f4411 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-heap/vcpkg.json b/externals/vcpkg/ports/boost-heap/vcpkg.json new file mode 100755 index 000000000..ff2b95818 --- /dev/null +++ b/externals/vcpkg/ports/boost-heap/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "boost-heap", + "version": "1.79.0", + "description": "Boost heap module", + "homepage": "https://github.com/boostorg/heap", + "license": "BSL-1.0", + "dependencies": [ + "boost-array", + "boost-assert", + "boost-bind", + "boost-concept-check", + "boost-config", + "boost-core", + "boost-intrusive", + "boost-iterator", + "boost-parameter", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-histogram/portfile.cmake b/externals/vcpkg/ports/boost-histogram/portfile.cmake new file mode 100755 index 000000000..1bff93ad5 --- /dev/null +++ b/externals/vcpkg/ports/boost-histogram/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/histogram + REF boost-1.79.0 + SHA512 abc02ad88428550899d03fc54b35e5c31ce967028e7453bb46c28cfc99272319a3aea145054eeb22ea3b75358548f863eb561228efbe47a3e732d1e3be1b698b + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-histogram/vcpkg.json b/externals/vcpkg/ports/boost-histogram/vcpkg.json new file mode 100755 index 000000000..d9e4f8122 --- /dev/null +++ b/externals/vcpkg/ports/boost-histogram/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "boost-histogram", + "version": "1.79.0", + "description": "Boost histogram module", + "homepage": "https://github.com/boostorg/histogram", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-core", + "boost-mp11", + "boost-serialization", + "boost-throw-exception", + "boost-variant2", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-hof/portfile.cmake b/externals/vcpkg/ports/boost-hof/portfile.cmake new file mode 100755 index 000000000..dacb48894 --- /dev/null +++ b/externals/vcpkg/ports/boost-hof/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/hof + REF boost-1.79.0 + SHA512 78e02a1b1f5f7b484d9c8e91d239147c9e37f58d7bda944bad5ec302a4dad0b4ea39efd3cc839540a12c5f17ec7944f6f27d9fc529b7992426393cdf30a2dcec + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-hof/vcpkg.json b/externals/vcpkg/ports/boost-hof/vcpkg.json new file mode 100755 index 000000000..883a6b393 --- /dev/null +++ b/externals/vcpkg/ports/boost-hof/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "boost-hof", + "version": "1.79.0", + "description": "Boost hof module", + "homepage": "https://github.com/boostorg/hof", + "license": "BSL-1.0", + "dependencies": [ + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-icl/portfile.cmake b/externals/vcpkg/ports/boost-icl/portfile.cmake new file mode 100755 index 000000000..30297b929 --- /dev/null +++ b/externals/vcpkg/ports/boost-icl/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/icl + REF boost-1.79.0 + SHA512 4a6297454579052d9fdcb76a2b1659dd5767cff751d35770ad34f9c48a9308a548d914b8ff7156f1c64866751538f68926e81ae1a09d8f7d8da14442ee90c679 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-icl/vcpkg.json b/externals/vcpkg/ports/boost-icl/vcpkg.json new file mode 100755 index 000000000..743875af8 --- /dev/null +++ b/externals/vcpkg/ports/boost-icl/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "boost-icl", + "version": "1.79.0", + "description": "Boost icl module", + "homepage": "https://github.com/boostorg/icl", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-concept-check", + "boost-config", + "boost-container", + "boost-core", + "boost-date-time", + "boost-detail", + "boost-iterator", + "boost-move", + "boost-mpl", + "boost-range", + "boost-rational", + "boost-static-assert", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-integer/portfile.cmake b/externals/vcpkg/ports/boost-integer/portfile.cmake new file mode 100755 index 000000000..36aa39949 --- /dev/null +++ b/externals/vcpkg/ports/boost-integer/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/integer + REF boost-1.79.0 + SHA512 97607006e8acf9c988dc951ca6c04d912bfbcbf86762b00cb5675dfb3e205ec60fa95c2b13c08dcbff4bccbd4775323fa6c2a2faddfbe1a9a2730b9e769761c7 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-integer/vcpkg.json b/externals/vcpkg/ports/boost-integer/vcpkg.json new file mode 100755 index 000000000..fc0f9b0af --- /dev/null +++ b/externals/vcpkg/ports/boost-integer/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "boost-integer", + "version": "1.79.0", + "description": "Boost integer module", + "homepage": "https://github.com/boostorg/integer", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-interprocess/portfile.cmake b/externals/vcpkg/ports/boost-interprocess/portfile.cmake new file mode 100755 index 000000000..31fc9e804 --- /dev/null +++ b/externals/vcpkg/ports/boost-interprocess/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/interprocess + REF boost-1.79.0 + SHA512 ab6f9fda45ba3896a7908a1f7659da690f4ebf988f084dc90f46197ee83bd8c824d14f44c1e080954c3e4c886cb447a980b8c1e5df91f552cec9c9b20f98d0c5 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-interprocess/vcpkg.json b/externals/vcpkg/ports/boost-interprocess/vcpkg.json new file mode 100755 index 000000000..bf29bb5f0 --- /dev/null +++ b/externals/vcpkg/ports/boost-interprocess/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "boost-interprocess", + "version": "1.79.0", + "description": "Boost interprocess module", + "homepage": "https://github.com/boostorg/interprocess", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-container", + "boost-core", + "boost-integer", + "boost-intrusive", + "boost-move", + "boost-static-assert", + "boost-type-traits", + "boost-unordered", + "boost-vcpkg-helpers", + "boost-winapi" + ] +} diff --git a/externals/vcpkg/ports/boost-interval/portfile.cmake b/externals/vcpkg/ports/boost-interval/portfile.cmake new file mode 100755 index 000000000..5c2ea2ace --- /dev/null +++ b/externals/vcpkg/ports/boost-interval/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/interval + REF boost-1.79.0 + SHA512 46af32271e33f2e004df2b8da5c117eff0a65bb229be788cae888ccc24e9f6e43d87ff151c5c242e90731a8e54fd95e7d3c6562e3a019bb551475c83e5a61a7f + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-interval/vcpkg.json b/externals/vcpkg/ports/boost-interval/vcpkg.json new file mode 100755 index 000000000..846b27686 --- /dev/null +++ b/externals/vcpkg/ports/boost-interval/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "boost-interval", + "version": "1.79.0", + "description": "Boost interval module", + "homepage": "https://github.com/boostorg/interval", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-detail", + "boost-logic", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-intrusive/portfile.cmake b/externals/vcpkg/ports/boost-intrusive/portfile.cmake new file mode 100755 index 000000000..92cd55b23 --- /dev/null +++ b/externals/vcpkg/ports/boost-intrusive/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/intrusive + REF boost-1.79.0 + SHA512 4536cc104c2538d2c7a4e22882a27c47732b69ead76fd49d75592f582bc1873a0731753eb421ad67576467d731169333a1e95a39efb0e977512a58b407d59fb4 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-intrusive/vcpkg.json b/externals/vcpkg/ports/boost-intrusive/vcpkg.json new file mode 100755 index 000000000..10191e751 --- /dev/null +++ b/externals/vcpkg/ports/boost-intrusive/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "boost-intrusive", + "version": "1.79.0", + "description": "Boost intrusive module", + "homepage": "https://github.com/boostorg/intrusive", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-container-hash", + "boost-core", + "boost-move", + "boost-static-assert", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-io/portfile.cmake b/externals/vcpkg/ports/boost-io/portfile.cmake new file mode 100755 index 000000000..7097641f4 --- /dev/null +++ b/externals/vcpkg/ports/boost-io/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/io + REF boost-1.79.0 + SHA512 e647ef4eefcf452b6b5f64ac39bd0661a39c78660a360e0bb009e8788b8d251a5d3bcde3c1edaedd7bbd588eb88eba495d52a52d504eac72e429ba0ae0a87482 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-io/vcpkg.json b/externals/vcpkg/ports/boost-io/vcpkg.json new file mode 100755 index 000000000..3f15640ed --- /dev/null +++ b/externals/vcpkg/ports/boost-io/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "boost-io", + "version": "1.79.0", + "description": "Boost io module", + "homepage": "https://github.com/boostorg/io", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-iostreams/Removeseekpos.patch b/externals/vcpkg/ports/boost-iostreams/Removeseekpos.patch new file mode 100755 index 000000000..c2a5d4770 --- /dev/null +++ b/externals/vcpkg/ports/boost-iostreams/Removeseekpos.patch @@ -0,0 +1,13 @@ +diff --git a/include/boost/iostreams/positioning.hpp b/include/boost/iostreams/positioning.hpp +index 12f2afc..709da7d 100644 +--- a/include/boost/iostreams/positioning.hpp ++++ b/include/boost/iostreams/positioning.hpp +@@ -93,7 +93,7 @@ inline stream_offset fpos_t_to_offset(std::fpos_t pos) + inline std::fpos_t streampos_to_fpos_t(std::streampos pos) + { + # if defined (_CPPLIB_VER) || defined(__IBMCPP__) +- return pos.seekpos(); ++ return pos; + # else + return pos.get_fpos_t(); + # endif diff --git a/externals/vcpkg/ports/boost-iostreams/b2-options.cmake b/externals/vcpkg/ports/boost-iostreams/b2-options.cmake new file mode 100755 index 000000000..b95c08db0 --- /dev/null +++ b/externals/vcpkg/ports/boost-iostreams/b2-options.cmake @@ -0,0 +1,74 @@ +if(CMAKE_BUILD_TYPE STREQUAL "Release") + set(lib_path_suffix lib) +else() + set(lib_path_suffix debug/lib) +endif() + +if("bzip2" IN_LIST FEATURES) + list(APPEND B2_OPTIONS + -sBZIP2_INCLUDE="${CURRENT_INSTALLED_DIR}/include" + ) + # Overwride debug library name + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + list(APPEND B2_OPTIONS + -sBZIP2_NAME=bz2d + ) + endif() + list(APPEND B2_OPTIONS + -sBZIP2_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_path_suffix}" + ) +else() + list(APPEND B2_OPTIONS + -sNO_BZIP2=1 + ) +endif() + +if("lzma" IN_LIST FEATURES) + list(APPEND B2_OPTIONS + -sLZMA_INCLUDE="${CURRENT_INSTALLED_DIR}/include" + ) + list(APPEND B2_OPTIONS + -sLZMA_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_path_suffix}" + ) +else() + list(APPEND B2_OPTIONS + -sNO_LZMA=1 + ) +endif() + +if("zlib" IN_LIST FEATURES) + list(APPEND B2_OPTIONS + -sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}/include" + ) + # Overwride debug library name + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + if(WIN32) + set(ZLIB_NAME zlibd) + else() + set(ZLIB_NAME z) + endif() + list(APPEND B2_OPTIONS + -sZLIB_NAME=${ZLIB_NAME} + ) + endif() + list(APPEND B2_OPTIONS + -sZLIB_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_path_suffix}" + ) +else() + list(APPEND B2_OPTIONS + -sNO_ZLIB=1 + ) +endif() + +if("zstd" IN_LIST FEATURES) + list(APPEND B2_OPTIONS + -sZSTD_INCLUDE="${CURRENT_INSTALLED_DIR}/include" + ) + list(APPEND B2_OPTIONS + -sZSTD_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_path_suffix}" + ) +else() + list(APPEND B2_OPTIONS + -sNO_ZSTD=1 + ) +endif() \ No newline at end of file diff --git a/externals/vcpkg/ports/boost-iostreams/portfile.cmake b/externals/vcpkg/ports/boost-iostreams/portfile.cmake new file mode 100755 index 000000000..b1aac2649 --- /dev/null +++ b/externals/vcpkg/ports/boost-iostreams/portfile.cmake @@ -0,0 +1,18 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/iostreams + REF boost-1.79.0 + SHA512 f733c586df4f267dba7b7181caa2e7ca1418d2cd843cf032121c06ffcda936c194fd7a78ebe292133217a8aae4bb83fd2c2890b52739da74c4833ecd950d0555 + HEAD_REF master + PATCHES Removeseekpos.patch +) + +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build( + SOURCE_PATH ${SOURCE_PATH} + BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake" +) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-iostreams/vcpkg.json b/externals/vcpkg/ports/boost-iostreams/vcpkg.json new file mode 100755 index 000000000..6d01ed79d --- /dev/null +++ b/externals/vcpkg/ports/boost-iostreams/vcpkg.json @@ -0,0 +1,73 @@ +{ + "name": "boost-iostreams", + "version": "1.79.0", + "description": "Boost iostreams module", + "homepage": "https://github.com/boostorg/iostreams", + "license": "BSL-1.0", + "supports": "!uwp", + "dependencies": [ + "boost-assert", + { + "name": "boost-build", + "host": true + }, + "boost-config", + "boost-core", + "boost-detail", + "boost-function", + "boost-integer", + "boost-iterator", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-mpl", + "boost-numeric-conversion", + "boost-preprocessor", + "boost-random", + "boost-range", + "boost-regex", + "boost-smart-ptr", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "default-features": [ + "bzip2", + "lzma", + "zlib", + "zstd" + ], + "features": { + "bzip2": { + "description": "Support bzip2 filters", + "dependencies": [ + "bzip2" + ] + }, + "lzma": { + "description": "Support LZMA/xz filters", + "dependencies": [ + "liblzma" + ] + }, + "zlib": { + "description": "Support zlib filters", + "dependencies": [ + "zlib" + ] + }, + "zstd": { + "description": "Support zstd filters", + "dependencies": [ + "zstd" + ] + } + } +} diff --git a/externals/vcpkg/ports/boost-iterator/portfile.cmake b/externals/vcpkg/ports/boost-iterator/portfile.cmake new file mode 100755 index 000000000..f26904249 --- /dev/null +++ b/externals/vcpkg/ports/boost-iterator/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/iterator + REF boost-1.79.0 + SHA512 26b0308126df522725887fcb9578d7e645f181cd8a6850915a5ce0c832a5f2e5521ba75a17f29a5eba788e3d8bd46d61ebb4b61fa40f233c33e99f83949516f6 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-iterator/vcpkg.json b/externals/vcpkg/ports/boost-iterator/vcpkg.json new file mode 100755 index 000000000..68f227529 --- /dev/null +++ b/externals/vcpkg/ports/boost-iterator/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "boost-iterator", + "version": "1.79.0", + "description": "Boost iterator module", + "homepage": "https://github.com/boostorg/iterator", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-concept-check", + "boost-config", + "boost-conversion", + "boost-core", + "boost-detail", + "boost-function-types", + "boost-fusion", + "boost-mpl", + "boost-optional", + "boost-smart-ptr", + "boost-static-assert", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-json/0001-json-array-erase-relocate.patch b/externals/vcpkg/ports/boost-json/0001-json-array-erase-relocate.patch new file mode 100755 index 000000000..1a8ade170 --- /dev/null +++ b/externals/vcpkg/ports/boost-json/0001-json-array-erase-relocate.patch @@ -0,0 +1,20 @@ + include/boost/json/impl/array.ipp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/include/boost/json/impl/array.ipp b/include/boost/json/impl/array.ipp +index 4d067fb..a2c7fd6 100644 +--- a/include/boost/json/impl/array.ipp ++++ b/include/boost/json/impl/array.ipp +@@ -491,8 +491,11 @@ erase( + auto const p = &(*t_)[0] + + (pos - &(*t_)[0]); + destroy(p, p + 1); +- relocate(p, p + 1, 1); + --t_->size; ++ if(t_->size > 0) ++ relocate(p, p + 1, ++ t_->size - (p - ++ &(*t_)[0])); + return p; + } + diff --git a/externals/vcpkg/ports/boost-json/b2-options.cmake b/externals/vcpkg/ports/boost-json/b2-options.cmake new file mode 100755 index 000000000..b05e7494f --- /dev/null +++ b/externals/vcpkg/ports/boost-json/b2-options.cmake @@ -0,0 +1,3 @@ +if(APPLE) + list(APPEND B2_OPTIONS cxxstd=11) +endif() \ No newline at end of file diff --git a/externals/vcpkg/ports/boost-json/portfile.cmake b/externals/vcpkg/ports/boost-json/portfile.cmake new file mode 100755 index 000000000..c72a07636 --- /dev/null +++ b/externals/vcpkg/ports/boost-json/portfile.cmake @@ -0,0 +1,23 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/json + REF boost-1.79.0 + SHA512 1243e4bdf5f2570c1f92e12dbe9cdef55d72d73d0e6abc6253eae928280ba913bfbc3a4d92d09a9c9b98e06ef95345c2c99dd0983d8dd2a7f1d8f0826530e1dd + HEAD_REF master + PATCHES 0001-json-array-erase-relocate.patch +) + +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" + "import ../../config/checks/config" + "import ../config/checks/config" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build( + SOURCE_PATH ${SOURCE_PATH} + BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake" +) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-json/vcpkg.json b/externals/vcpkg/ports/boost-json/vcpkg.json new file mode 100755 index 000000000..3fa10d633 --- /dev/null +++ b/externals/vcpkg/ports/boost-json/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "boost-json", + "version": "1.79.0", + "description": "Boost json module", + "homepage": "https://github.com/boostorg/json", + "license": "BSL-1.0", + "dependencies": [ + "boost-align", + "boost-assert", + { + "name": "boost-build", + "host": true + }, + "boost-config", + "boost-container", + "boost-core", + "boost-exception", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-mp11", + "boost-system", + "boost-throw-exception", + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-lambda/portfile.cmake b/externals/vcpkg/ports/boost-lambda/portfile.cmake new file mode 100755 index 000000000..bf54ef65b --- /dev/null +++ b/externals/vcpkg/ports/boost-lambda/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/lambda + REF boost-1.79.0 + SHA512 4baa279ae5ba4a0b63c3177bebb30a15f539f56e8786a4049a027a6593c73a07f6d397b3bdc07fedaa0407015a7320f1577a499ba463c8bfdb13d1fdad2394b7 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-lambda/vcpkg.json b/externals/vcpkg/ports/boost-lambda/vcpkg.json new file mode 100755 index 000000000..74f261687 --- /dev/null +++ b/externals/vcpkg/ports/boost-lambda/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "boost-lambda", + "version": "1.79.0", + "description": "Boost lambda module", + "homepage": "https://github.com/boostorg/lambda", + "license": "BSL-1.0", + "dependencies": [ + "boost-bind", + "boost-config", + "boost-core", + "boost-detail", + "boost-iterator", + "boost-mpl", + "boost-preprocessor", + "boost-tuple", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-lambda2/portfile.cmake b/externals/vcpkg/ports/boost-lambda2/portfile.cmake new file mode 100755 index 000000000..d4336f7bf --- /dev/null +++ b/externals/vcpkg/ports/boost-lambda2/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/lambda2 + REF boost-1.79.0 + SHA512 352b7070627458c63866c2b00829c84aa76c0188b772555fa019603d80314f446c38311b08e30c07d9fb337988a335109112aaa5cb188723effc54b7356d0a67 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-lambda2/vcpkg.json b/externals/vcpkg/ports/boost-lambda2/vcpkg.json new file mode 100755 index 000000000..a7f426306 --- /dev/null +++ b/externals/vcpkg/ports/boost-lambda2/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "boost-lambda2", + "version": "1.79.0", + "description": "Boost lambda2 module", + "homepage": "https://github.com/boostorg/lambda2", + "license": "BSL-1.0", + "dependencies": [ + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-leaf/portfile.cmake b/externals/vcpkg/ports/boost-leaf/portfile.cmake new file mode 100755 index 000000000..05189dc98 --- /dev/null +++ b/externals/vcpkg/ports/boost-leaf/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/leaf + REF boost-1.79.0 + SHA512 1f567029d8b737f6e7cb4fcd8df03f0aaf89bedf5c127b5cbd02ce27910934361254e2d03ba95614a7e41f2e2c4a09a346b41ea53aacc68dcf64e77e58b7fa23 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-leaf/vcpkg.json b/externals/vcpkg/ports/boost-leaf/vcpkg.json new file mode 100755 index 000000000..77395c01e --- /dev/null +++ b/externals/vcpkg/ports/boost-leaf/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "boost-leaf", + "version": "1.79.0", + "description": "Boost leaf module", + "homepage": "https://github.com/boostorg/leaf", + "license": "BSL-1.0", + "dependencies": [ + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-lexical-cast/portfile.cmake b/externals/vcpkg/ports/boost-lexical-cast/portfile.cmake new file mode 100755 index 000000000..46a076bf6 --- /dev/null +++ b/externals/vcpkg/ports/boost-lexical-cast/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/lexical_cast + REF boost-1.79.0 + SHA512 9d0b28cd20c88638d048ff48d2f0209627f15558c1ff2619ed28cc07207c71352799289004d4108c20187b1099720064a2d1ca517b8b19e523e6702acb8fe018 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-lexical-cast/vcpkg.json b/externals/vcpkg/ports/boost-lexical-cast/vcpkg.json new file mode 100755 index 000000000..1fcb7717e --- /dev/null +++ b/externals/vcpkg/ports/boost-lexical-cast/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "boost-lexical-cast", + "version": "1.79.0", + "description": "Boost lexical_cast module", + "homepage": "https://github.com/boostorg/lexical_cast", + "license": "BSL-1.0", + "dependencies": [ + "boost-array", + "boost-assert", + "boost-config", + "boost-container", + "boost-core", + "boost-integer", + "boost-numeric-conversion", + "boost-range", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-local-function/portfile.cmake b/externals/vcpkg/ports/boost-local-function/portfile.cmake new file mode 100755 index 000000000..fc2d6f97c --- /dev/null +++ b/externals/vcpkg/ports/boost-local-function/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/local_function + REF boost-1.79.0 + SHA512 c6dd1e1b397bea700c9692a1a71d2943c5221afbd0f82e5c67093154923537127a3cb1d727e532454363a58210feef638ebe1a2ebec22ae93c16f52f3c29203b + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-local-function/vcpkg.json b/externals/vcpkg/ports/boost-local-function/vcpkg.json new file mode 100755 index 000000000..e4a494a12 --- /dev/null +++ b/externals/vcpkg/ports/boost-local-function/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "boost-local-function", + "version": "1.79.0", + "description": "Boost local_function module", + "homepage": "https://github.com/boostorg/local_function", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-mpl", + "boost-preprocessor", + "boost-scope-exit", + "boost-type-traits", + "boost-typeof", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-locale/0001-Fix-boost-ICU-support.patch b/externals/vcpkg/ports/boost-locale/0001-Fix-boost-ICU-support.patch new file mode 100755 index 000000000..cd02f742e --- /dev/null +++ b/externals/vcpkg/ports/boost-locale/0001-Fix-boost-ICU-support.patch @@ -0,0 +1,100 @@ +--- + libs/locale/build/Jamfile.v2 | 63 ++++++-------------------------------- + libs/locale/build/has_icu_test.cpp | 4 --- + libs/regex/build/Jamfile.v2 | 47 +++++++--------------------- + 3 files changed, 20 insertions(+), 94 deletions(-) + +diff --git a/libs/locale/build/Jamfile.v2 b/libs/locale/build/Jamfile.v2 +index 578e722..5f25917 100644 +--- a/build/Jamfile.v2 ++++ b/build/Jamfile.v2 +@@ -70,62 +70,17 @@ if $(ICU_LINK) + } + else + { +- searched-lib icuuc : : icuuc +- $(ICU_PATH)/lib +- shared +- shared ; +- +- searched-lib icuuc : : msvc +- debug +- icuucd +- $(ICU_PATH)/lib +- shared +- shared ; +- +- searched-lib icuuc : : this_is_an_invalid_library_name ; +- +- searched-lib icudt : : $(ICU_PATH)/lib +- icudata +- shared +- shared ; +- +- searched-lib icudt : : $(ICU_PATH)/lib +- icudt +- msvc +- shared +- shared ; +- +- searched-lib icudt : : this_is_an_invalid_library_name ; +- +- searched-lib icuin : : $(ICU_PATH)/lib +- icui18n +- shared +- shared ; +- +- searched-lib icuin : : msvc +- debug +- icuind +- $(ICU_PATH)/lib +- shared +- shared ; +- +- searched-lib icuin : : msvc +- release +- icuin +- $(ICU_PATH)/lib +- shared +- shared ; +- +- searched-lib icuin : : this_is_an_invalid_library_name ; +- +- explicit icuuc icudt icuin ; ++ alias icuuc : /user-config//icuuc ; ++ alias icuin : /user-config//icuin ; ++ alias icudt : /user-config//icudt ; ++ ++ explicit icuuc icuin icudt ; + + ICU_OPTS = $(ICU_PATH)/include +- icuuc/shared/shared +- icudt/shared/shared +- icuin/shared/shared +- $(ICU_PATH)/bin +- shared ; ++ icuuc ++ icuin ++ icudt ++ $(ICU_PATH)/bin ; + + + +diff --git a/libs/locale/build/has_icu_test.cpp b/libs/locale/build/has_icu_test.cpp +index 9419b30..ed9be05 100644 +--- a/build/has_icu_test.cpp ++++ b/build/has_icu_test.cpp +@@ -15,10 +15,6 @@ + #include + #include + +-#if defined(_MSC_VER) && !defined(_DLL) +-#error "Mixing ICU with a static runtime doesn't work" +-#endif +- + int main() + { + icu::Locale loc; +-- +2.12.2.windows.2 + diff --git a/externals/vcpkg/ports/boost-locale/allow-force-finding-iconv.patch b/externals/vcpkg/ports/boost-locale/allow-force-finding-iconv.patch new file mode 100755 index 000000000..134cb81a1 --- /dev/null +++ b/externals/vcpkg/ports/boost-locale/allow-force-finding-iconv.patch @@ -0,0 +1,24 @@ +diff --git a/libs/locale/build/Jamfile.v2 b/libs/locale/build/Jamfile.v2 +index 88a8cb1..e6a6b7f 100644 +--- a/build/Jamfile.v2 ++++ b/build/Jamfile.v2 +@@ -17,6 +17,7 @@ import feature ; + # Features + + feature.feature boost.locale.iconv : on off : optional propagated ; ++feature.feature boost.locale.force-found-iconv : on off : optional propagated ; + feature.feature boost.locale.icu : on off : optional propagated ; + feature.feature boost.locale.posix : on off : optional propagated ; + feature.feature boost.locale.std : on off : optional propagated ; +@@ -164,6 +164,11 @@ local flags-result ; + + local found-iconv ; + ++ if on in $(properties) ++ { ++ found-iconv = true ; ++ } ++ + if on in $(properties) + || ! in $(properties:G) + && ! solaris in $(properties) diff --git a/externals/vcpkg/ports/boost-locale/b2-options.cmake.in b/externals/vcpkg/ports/boost-locale/b2-options.cmake.in new file mode 100755 index 000000000..66fa64326 --- /dev/null +++ b/externals/vcpkg/ports/boost-locale/b2-options.cmake.in @@ -0,0 +1,42 @@ +set(_B2_OPTIONS_FEATURES "@FEATURES@") +if("icu" IN_LIST _B2_OPTIONS_FEATURES) + set(BOOST_LOCALE_ENABLE_ICU on) +else() + set(BOOST_LOCALE_ENABLE_ICU off) +endif() + +if(@VCPKG_TARGET_IS_WINDOWS@) + set(BOOST_LOCALE_ENABLE_ICONV off) + set(BOOST_LOCALE_ENABLE_POSIX off) + set(BOOST_LOCALE_ENABLE_WINAPI on) +else() + find_library(VCPKG_ICONV_LIBRARY_RELEASE iconv PATHS "${CURRENT_INSTALLED_DIR}/lib/" NO_DEFAULT_PATH) + find_library(VCPKG_ICONV_LIBRARY_DEBUG iconv PATHS "${CURRENT_INSTALLED_DIR}/debug/lib/" NO_DEFAULT_PATH) + set(BOOST_LOCALE_ENABLE_ICONV on) + if(@VCPKG_TARGET_IS_ANDROID@) + set(BOOST_LOCALE_ENABLE_POSIX off) + else() + set(BOOST_LOCALE_ENABLE_POSIX on) + endif() + set(BOOST_LOCALE_ENABLE_WINAPI off) +endif() + +list(APPEND B2_OPTIONS + boost.locale.iconv=${BOOST_LOCALE_ENABLE_ICONV} + boost.locale.icu=${BOOST_LOCALE_ENABLE_ICU} + boost.locale.posix=${BOOST_LOCALE_ENABLE_POSIX} + boost.locale.winapi=${BOOST_LOCALE_ENABLE_WINAPI} + /boost/locale//boost_locale +) + +if(BOOST_LOCALE_ENABLE_ICONV) + list(APPEND B2_OPTIONS + -sICONV_PATH=${CURRENT_INSTALLED_DIR} + ) + + if(VCPKG_TARGET_IS_OSX OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32") + list(APPEND B2_OPTIONS + boost.locale.force-found-iconv=on + ) + endif() +endif() diff --git a/externals/vcpkg/ports/boost-locale/portfile.cmake b/externals/vcpkg/ports/boost-locale/portfile.cmake new file mode 100755 index 000000000..396f9c54f --- /dev/null +++ b/externals/vcpkg/ports/boost-locale/portfile.cmake @@ -0,0 +1,25 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/locale + REF boost-1.79.0 + SHA512 2f036406e8343895b3749bd7769b1dadb48d7552862898842b43eccf51c62153f4683c46cef91fd97228d6022e60a9bdb0726a00bcc74f519e0539b3a69dc0bf + HEAD_REF master + PATCHES + 0001-Fix-boost-ICU-support.patch + allow-force-finding-iconv.patch +) + +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +configure_file( + "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake.in" + "${CURRENT_BUILDTREES_DIR}/vcpkg-b2-options.cmake" + @ONLY +) +boost_modular_build( + SOURCE_PATH ${SOURCE_PATH} + BOOST_CMAKE_FRAGMENT "${CURRENT_BUILDTREES_DIR}/vcpkg-b2-options.cmake" +) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-locale/vcpkg.json b/externals/vcpkg/ports/boost-locale/vcpkg.json new file mode 100755 index 000000000..f09d93643 --- /dev/null +++ b/externals/vcpkg/ports/boost-locale/vcpkg.json @@ -0,0 +1,44 @@ +{ + "name": "boost-locale", + "version": "1.79.0", + "description": "Boost locale module", + "homepage": "https://github.com/boostorg/locale", + "license": "BSL-1.0", + "supports": "!uwp", + "dependencies": [ + "boost-assert", + { + "name": "boost-build", + "host": true + }, + "boost-config", + "boost-function", + "boost-iterator", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-smart-ptr", + "boost-static-assert", + "boost-thread", + "boost-type-traits", + "boost-unordered", + "boost-vcpkg-helpers", + { + "name": "libiconv", + "platform": "!uwp & !windows & !mingw" + }, + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "icu": { + "description": "ICU backend for Boost.Locale", + "dependencies": [ + "icu" + ] + } + } +} diff --git a/externals/vcpkg/ports/boost-lockfree/portfile.cmake b/externals/vcpkg/ports/boost-lockfree/portfile.cmake new file mode 100755 index 000000000..6d641d6e0 --- /dev/null +++ b/externals/vcpkg/ports/boost-lockfree/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/lockfree + REF boost-1.79.0 + SHA512 3251573a8ed7c974ea8cddbca086124d7b2503c1da482d3f6a024d5c69632606f36c00e33b13b2de44b5f41a1ed67d06d39014f0cdfb960c109b155f5c7eb3a4 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-lockfree/vcpkg.json b/externals/vcpkg/ports/boost-lockfree/vcpkg.json new file mode 100755 index 000000000..defe38b84 --- /dev/null +++ b/externals/vcpkg/ports/boost-lockfree/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "boost-lockfree", + "version": "1.79.0", + "description": "Boost lockfree module", + "homepage": "https://github.com/boostorg/lockfree", + "license": "BSL-1.0", + "dependencies": [ + "boost-align", + "boost-array", + "boost-assert", + "boost-atomic", + "boost-config", + "boost-core", + "boost-integer", + "boost-iterator", + "boost-mpl", + "boost-parameter", + "boost-predef", + "boost-static-assert", + "boost-tuple", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-log/portfile.cmake b/externals/vcpkg/ports/boost-log/portfile.cmake new file mode 100755 index 000000000..59d7b0dcb --- /dev/null +++ b/externals/vcpkg/ports/boost-log/portfile.cmake @@ -0,0 +1,23 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/log + REF boost-1.79.0 + SHA512 da3fff9756f991a6b3a1529499c4f58fa4ac6167c2dfaf1b7debd45e5a2c1f0687dee1e0edb21d28859971f9e0afab3e1aae3a48b6a39a98dc6d52a697b0f2c4 + HEAD_REF master +) + +file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) +string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") +string(REPLACE " @select-arch-specific-sources" "#@select-arch-specific-sources" _contents "${_contents}") +file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") +vcpkg_replace_string("${SOURCE_PATH}/build/log-arch-config.jam" + "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]" + "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-log/vcpkg.json b/externals/vcpkg/ports/boost-log/vcpkg.json new file mode 100755 index 000000000..4907092d1 --- /dev/null +++ b/externals/vcpkg/ports/boost-log/vcpkg.json @@ -0,0 +1,68 @@ +{ + "name": "boost-log", + "version": "1.79.0", + "description": "Boost log module", + "homepage": "https://github.com/boostorg/log", + "license": "BSL-1.0", + "supports": "!uwp & !emscripten", + "dependencies": [ + "boost-align", + "boost-array", + "boost-asio", + "boost-assert", + "boost-atomic", + "boost-bind", + { + "name": "boost-build", + "host": true + }, + "boost-config", + "boost-container", + "boost-core", + "boost-date-time", + "boost-exception", + { + "name": "boost-filesystem", + "platform": "!uwp" + }, + "boost-function-types", + "boost-fusion", + "boost-interprocess", + "boost-intrusive", + "boost-io", + "boost-iterator", + "boost-lexical-cast", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-move", + "boost-mpl", + "boost-optional", + "boost-parameter", + "boost-phoenix", + "boost-predef", + "boost-preprocessor", + "boost-property-tree", + "boost-proto", + "boost-random", + "boost-range", + "boost-regex", + "boost-smart-ptr", + "boost-spirit", + "boost-static-assert", + "boost-system", + "boost-thread", + "boost-throw-exception", + "boost-type-index", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers", + "boost-winapi", + "boost-xpressive", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-logic/portfile.cmake b/externals/vcpkg/ports/boost-logic/portfile.cmake new file mode 100755 index 000000000..96e7708b7 --- /dev/null +++ b/externals/vcpkg/ports/boost-logic/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/logic + REF boost-1.79.0 + SHA512 9b3689d4b08cc0edc69aa9f2ea2f182e94d734a407b030b9b41ebaccae20055fae8f8662324abfa1b8217bf10edbc996b6e218df9f9a4bb9dc8952460b5f3cef + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-logic/vcpkg.json b/externals/vcpkg/ports/boost-logic/vcpkg.json new file mode 100755 index 000000000..33bf21e27 --- /dev/null +++ b/externals/vcpkg/ports/boost-logic/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "boost-logic", + "version": "1.79.0", + "description": "Boost logic module", + "homepage": "https://github.com/boostorg/logic", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-core", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-math/001-remove-checks.patch b/externals/vcpkg/ports/boost-math/001-remove-checks.patch new file mode 100755 index 000000000..d25166fa3 --- /dev/null +++ b/externals/vcpkg/ports/boost-math/001-remove-checks.patch @@ -0,0 +1,23 @@ + build/Jamfile.v2 | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 +index fd84028..3537e9f 100644 +--- a/build/Jamfile.v2 ++++ b/build/Jamfile.v2 +@@ -5,7 +5,6 @@ + + import testing ; + import pch ; +-import ../../config/checks/config : requires ; + + project + : requirements +@@ -19,7 +18,6 @@ project + intel-linux:-fvisibility=hidden + #sun:-xldscope=hidden + [ check-target-builds ../config//has_gcc_visibility "gcc visibility" : gcc:-fvisibility=hidden : ] +- [ requires cxx11_noexcept cxx11_rvalue_references sfinae_expr cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_tuple cxx11_hdr_initializer_list cxx11_hdr_chrono cxx11_thread_local cxx11_constexpr cxx11_nullptr cxx11_numeric_limits cxx11_decltype cxx11_hdr_array cxx11_hdr_atomic cxx11_hdr_type_traits cxx11_allocator cxx11_explicit_conversion_operators ] + ; + + cpp-pch pch : ../src/tr1/pch.hpp : ../src/tr1 shared:BOOST_MATH_TR1_DYN_LINK=1 ; diff --git a/externals/vcpkg/ports/boost-math/b2-options.cmake b/externals/vcpkg/ports/boost-math/b2-options.cmake new file mode 100755 index 000000000..573883468 --- /dev/null +++ b/externals/vcpkg/ports/boost-math/b2-options.cmake @@ -0,0 +1,3 @@ +if(APPLE) + list(APPEND B2_OPTIONS cxxstd=11) +endif() diff --git a/externals/vcpkg/ports/boost-math/portfile.cmake b/externals/vcpkg/ports/boost-math/portfile.cmake new file mode 100755 index 000000000..e24679121 --- /dev/null +++ b/externals/vcpkg/ports/boost-math/portfile.cmake @@ -0,0 +1,18 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/math + REF boost-1.79.0 + SHA512 97d7d11b80c5d583ceed3548f294876180d4ff8e0aab5b39c1dc5249300a124c4ac2d8894b3c4e8bec9f7fa42e3886f679a47b8b86feb7c1d9e8389b767bb499 + HEAD_REF master + PATCHES 001-remove-checks.patch +) + +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build( + SOURCE_PATH ${SOURCE_PATH} + BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake" +) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-math/vcpkg.json b/externals/vcpkg/ports/boost-math/vcpkg.json new file mode 100755 index 000000000..9571b8de3 --- /dev/null +++ b/externals/vcpkg/ports/boost-math/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "boost-math", + "version": "1.79.0", + "description": "Boost math module", + "homepage": "https://github.com/boostorg/math", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + { + "name": "boost-build", + "host": true + }, + "boost-concept-check", + "boost-config", + "boost-core", + "boost-integer", + "boost-lexical-cast", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-predef", + "boost-random", + "boost-static-assert", + "boost-throw-exception", + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-metaparse/portfile.cmake b/externals/vcpkg/ports/boost-metaparse/portfile.cmake new file mode 100755 index 000000000..4bc880c41 --- /dev/null +++ b/externals/vcpkg/ports/boost-metaparse/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/metaparse + REF boost-1.79.0 + SHA512 851b34afc5badece71dbc2bd017e72dc6871ffc246fdedcc3f699b7afdda8b7140016f1f9f44af891aa25bf61aab990ac11e8541ae53a4cae1c25b05131f0a74 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-metaparse/vcpkg.json b/externals/vcpkg/ports/boost-metaparse/vcpkg.json new file mode 100755 index 000000000..1c1b5ce97 --- /dev/null +++ b/externals/vcpkg/ports/boost-metaparse/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "boost-metaparse", + "version": "1.79.0", + "description": "Boost metaparse module", + "homepage": "https://github.com/boostorg/metaparse", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-mpl", + "boost-predef", + "boost-preprocessor", + "boost-static-assert", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-modular-build-helper/CMakeLists.txt b/externals/vcpkg/ports/boost-modular-build-helper/CMakeLists.txt new file mode 100755 index 000000000..c395a4dfc --- /dev/null +++ b/externals/vcpkg/ports/boost-modular-build-helper/CMakeLists.txt @@ -0,0 +1,279 @@ +cmake_minimum_required(VERSION 3.9) +project(boost NONE) + +# The following variables are used in user-config.jam file +set(USER_CONFIG_TOOLSET "") +set(USER_CONFIG_TOOLSET_VERSION "") +set(USER_CONFIG_TOOLSET_INVOCATION_COMMAND "") +set(USER_CONFIG_TOOLSET_OPTIONS "") +set(USER_CONFIG_EXTRA_LINES "") +set(USER_CONFIG_REQUIREMENTS "") + +set(B2_OPTIONS) + +include("${VCPKG_CMAKE_VARS_FILE}") + +# Add build type specific options +if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + list(APPEND B2_OPTIONS runtime-link=shared) +else() + list(APPEND B2_OPTIONS runtime-link=static) +endif() + +if(BUILD_SHARED_LIBS) + list(APPEND B2_OPTIONS link=shared) +else() + list(APPEND B2_OPTIONS link=static) +endif() + +if(VCPKG_DETECTED_CMAKE_SIZEOF_VOID_P EQUAL "8") + list(APPEND B2_OPTIONS address-model=64) +else() + list(APPEND B2_OPTIONS address-model=32) +endif() + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "s390x") + list(APPEND B2_OPTIONS architecture=s390x) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + list(APPEND B2_OPTIONS architecture=arm) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "ppc64le") + list(APPEND B2_OPTIONS architecture=power) +else() + list(APPEND B2_OPTIONS architecture=x86) +endif() + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND WIN32) + list(APPEND B2_OPTIONS "asmflags=/safeseh") +endif() + +if(VCPKG_DETECTED_MSVC) + if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + set(USER_CONFIG_TOOLSET clang-win) + else() + set(USER_CONFIG_TOOLSET msvc) + endif() + if(VCPKG_DETECTED_MSVC_VERSION LESS "1900") + math(EXPR USER_CONFIG_TOOLSET_VERSION "${VCPKG_DETECTED_MSVC_VERSION} / 10 - 60") + else() + math(EXPR USER_CONFIG_TOOLSET_VERSION "${VCPKG_DETECTED_MSVC_VERSION} / 10 - 50") + endif() +elseif(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "Clang") + set(USER_CONFIG_TOOLSET clang) +else() + set(USER_CONFIG_TOOLSET gcc) +endif() + +if(WIN32) + list(APPEND B2_OPTIONS target-os=windows) +elseif(APPLE) + list(APPEND B2_OPTIONS target-os=darwin) +elseif(ANDROID) + list(APPEND B2_OPTIONS target-os=android) +else() + list(APPEND B2_OPTIONS target-os=linux) +endif() + +# Properly handle compiler and linker flags passed by VCPKG +string(TOUPPER "${CMAKE_BUILD_TYPE}" UPPER_BUILD_TYPE) + +set(CXXFLAGS "${VCPKG_COMBINED_CXX_FLAGS_${UPPER_BUILD_TYPE}}") +set(CFLAGS "${VCPKG_COMBINED_C_FLAGS_${UPPER_BUILD_TYPE}}") +set(LDFLAGS "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_${UPPER_BUILD_TYPE}}") +set(ARFLAGS "${VCPKG_COMBINED_STATIC_LINKER_FLAGS_${UPPER_BUILD_TYPE}}") + +if(APPLE) + string(APPEND COMPILEFLAGS " -D_DARWIN_C_SOURCE") + if(NOT CXXFLAGS MATCHES " -std=") + # If the user hasn't provided their own standard flag, use at least c++11 + string(APPEND CXXFLAGS " -std=c++11") + endif() +endif() + +if(VCPKG_DETECTED_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + # cl in b2 appears to not receive `LIBPATH` for finding winmd files, so we transform them to `/AI` options. + set(libpath_args "$ENV{LIBPATH}") + # Apply: {x -> /AI"x"} + list(TRANSFORM libpath_args PREPEND "/AI\"") + list(TRANSFORM libpath_args APPEND "\"") + list(JOIN libpath_args " " libpath_arg) + string(APPEND COMPILEFLAGS " ${libpath_arg} /D_WIN32_WINNT=0x0A00") + list(APPEND B2_OPTIONS windows-api=store) + list(APPEND B2_OPTIONS linkflags=WindowsApp.lib) +endif() + +set(USER_CONFIG_TOOLSET_INVOCATION_COMMAND "\"${VCPKG_DETECTED_CMAKE_CXX_COMPILER}\"") + +string(APPEND CXXFLAGS "${COMPILEFLAGS}") +string(APPEND CFLAGS "${COMPILEFLAGS}") + +foreach(var CXXFLAGS CFLAGS LDFLAGS ARFLAGS) + string(REPLACE [[\]] [[\\]] ${var} "${${var}}") + string(REPLACE [["]] [[\"]] ${var} "${${var}}") + string(REGEX REPLACE "[ \t\r\n]+" " " ${var} "${${var}}") + string(STRIP "${${var}}" ${var}) +endforeach() + +if(USER_CONFIG_TOOLSET STREQUAL "msvc") + file(TO_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}/nothing.bat" NOTHING_BAT) + string(APPEND USER_CONFIG_TOOLSET_OPTIONS + " \"${NOTHING_BAT}\"\n" + ) + if(NOT ARFLAGS STREQUAL "") + # Only apply these flags for MSVC + string(APPEND USER_CONFIG_REQUIREMENTS "\"${ARFLAGS}\"\n ") + endif() +else() + string(APPEND USER_CONFIG_TOOLSET_OPTIONS + " \"${VCPKG_DETECTED_CMAKE_RANLIB}\"\n" + " \"${VCPKG_DETECTED_CMAKE_AR}\"\n" + ) +endif() + +if(NOT CXXFLAGS STREQUAL "") + string(APPEND USER_CONFIG_TOOLSET_OPTIONS " \"${CXXFLAGS}\"\n") +endif() +if(NOT CFLAGS STREQUAL "") + string(APPEND USER_CONFIG_TOOLSET_OPTIONS " \"${CFLAGS}\"\n \"${CFLAGS}\"\n") +endif() +if(NOT LDFLAGS STREQUAL "") + string(APPEND USER_CONFIG_REQUIREMENTS "\"${LDFLAGS}\"\n ") + string(APPEND USER_CONFIG_TOOLSET_OPTIONS " \"${LDFLAGS}\"\n") +endif() + +if(WIN32 AND NOT USER_CONFIG_TOOLSET STREQUAL "msvc") + # MINGW here causes b2 to not run cygpath + string(APPEND USER_CONFIG_TOOLSET_OPTIONS + " mingw\n" + ) +endif() + +if(WIN32) + list(APPEND B2_OPTIONS threadapi=win32) +else() + list(APPEND B2_OPTIONS threadapi=pthread) +endif() + +if(CMAKE_BUILD_TYPE STREQUAL "Release") + list(APPEND B2_OPTIONS variant=release) +else() + list(APPEND B2_OPTIONS variant=debug) +endif() + +if(NOT WIN32) + list(APPEND B2_OPTIONS "--layout=system") +endif() + +include(ProcessorCount) +ProcessorCount(NUMBER_OF_PROCESSORS) +if(NOT NUMBER_OF_PROCESSORS) + set(NUMBER_OF_PROCESSORS 1) +endif() + +# Handle ICU +if(WIN32) + list(APPEND B2_OPTIONS "--disable-icu") +else() + find_path(ICU_PATH include/unicode/utf.h) + list(APPEND B2_OPTIONS "-sICU_PATH=\"${ICU_PATH}\"") +endif() + +# Handle Python +set(python_versions "") + +if(WITH_PYTHON2) + # Find Python2 in the current installed directory + file(GLOB python2_include_dir "${CURRENT_INSTALLED_DIR}/include/python2.*") + string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" python2_version "${python2_include_dir}") + string(APPEND USER_CONFIG_EXTRA_LINES + "using python : ${python2_version} : : \"${python2_include_dir}\" : \"${CURRENT_INSTALLED_DIR}/lib\" ;\n" + "using python : ${python2_version} : : \"${python2_include_dir}\" : \"${CURRENT_INSTALLED_DIR}/debug/lib\" : on ;\n" + ) + list(APPEND python_versions "${python2_version}") +endif() + +if(WITH_PYTHON3) + # Find Python3 in the current installed directory + file(GLOB python3_include_dir "${CURRENT_INSTALLED_DIR}/include/python3.*") + string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" python3_version "${python3_include_dir}") + string(APPEND USER_CONFIG_EXTRA_LINES + "using python : ${python3_version} : : \"${python3_include_dir}\" : \"${CURRENT_INSTALLED_DIR}/lib\" ;\n" + "using python : ${python3_version} : : \"${python3_include_dir}\" : \"${CURRENT_INSTALLED_DIR}/debug/lib\" : on ;\n" + ) + list(APPEND python_versions "${python3_version}") +endif() + +if("${PORT}" STREQUAL "boost-mpi" OR "${PORT}" STREQUAL "boost-graph-parallel") + string(APPEND USER_CONFIG_EXTRA_LINES + "using mpi : : \"${CURRENT_INSTALLED_DIR}/lib\"\n" + " \"${CURRENT_INSTALLED_DIR}/include\"\n" + ) + if(WIN32) + string(APPEND USER_CONFIG_EXTRA_LINES + " msmpi ;\n" + ) + else() + string(APPEND USER_CONFIG_EXTRA_LINES + " openmpi ;\n" + ) + endif() +endif() + +if(NOT python_versions STREQUAL "") + list(JOIN python_versions "," python_versions) + list(APPEND B2_OPTIONS "python=${python_versions}") +endif() + +# Include port specific CMake fragment +if(DEFINED BOOST_CMAKE_FRAGMENT) + message(STATUS "Including ${BOOST_CMAKE_FRAGMENT}") + include(${BOOST_CMAKE_FRAGMENT}) +endif() + +configure_file(${CMAKE_CURRENT_LIST_DIR}/user-config.jam.in ${CMAKE_CURRENT_BINARY_DIR}/user-config.jam @ONLY) + +add_custom_target(boost ALL + COMMAND "${B2_EXE}" + toolset=${USER_CONFIG_TOOLSET} + --user-config=${CMAKE_CURRENT_BINARY_DIR}/user-config.jam + --stagedir=${CMAKE_CURRENT_BINARY_DIR}/stage + --build-dir=${CMAKE_CURRENT_BINARY_DIR} + ${B2_OPTIONS} + --with-atomic + --with-random + --with-date_time + --with-filesystem + --with-system + --with-thread + --with-chrono + -j${NUMBER_OF_PROCESSORS} + -sBOOST_ROOT=${BOOST_BUILD_PATH} + -sBOOST_BUILD_PATH=${BOOST_BUILD_PATH} + --debug-configuration + --debug-building + --debug-generators + --ignore-site-config + --hash + -q + debug-symbols=on + # Enable debugging level 2. + -d +2 + + threading=multi + + stage + WORKING_DIRECTORY ${SOURCE_PATH}/build +) + +set(SUBDIR ${CMAKE_CURRENT_BINARY_DIR}/stage/lib) +install( + CODE " +file(GLOB LIBS \"${SUBDIR}/*.so.*\" \"${SUBDIR}/*.so\" \"${SUBDIR}/*.a\" \"${SUBDIR}/*.dylib\" \"${SUBDIR}/*.dylib.*\" \"${SUBDIR}/*.lib\") +if(LIBS) + file(INSTALL \${LIBS} DESTINATION \"\${CMAKE_INSTALL_PREFIX}/lib\") +endif() +file(GLOB DLLS \"${SUBDIR}/*.dll\" \"${SUBDIR}/*.pyd\") +if(DLLS) + file(INSTALL \${DLLS} DESTINATION \"\${CMAKE_INSTALL_PREFIX}/bin\") +endif() +" +) diff --git a/externals/vcpkg/ports/boost-modular-build-helper/Jamroot.jam.in b/externals/vcpkg/ports/boost-modular-build-helper/Jamroot.jam.in new file mode 100755 index 000000000..9a490b3ad --- /dev/null +++ b/externals/vcpkg/ports/boost-modular-build-helper/Jamroot.jam.in @@ -0,0 +1,180 @@ +constant BOOST_VERSION : @BOOST_VERSION@ ; +constant BOOST_VERSION_ABI_TAG : @BOOST_VERSION_ABI_TAG@ ; +constant BOOST_JAMROOT_MODULE : $(__name__) ; + +import boostcpp ; +import feature ; + +boostcpp.set-version $(BOOST_VERSION) ; + +project boost : requirements + include&&"@CURRENT_INSTALLED_DIR@/include" + BOOST_ALL_NO_LIB=1 + @$(__name__).tag + @B2_REQUIREMENTS@ + ; + +rule boost-install ( libraries * ) +{ + stagedir = [ option.get stagedir ] ; + install stage + : $(libraries) + : $(stagedir)/lib ; +} + +rule tag ( name : type ? : property-set ) +{ + return [ boostcpp.tag $(name) : $(type) : $(property-set) ] ; +} + +rule python-tag ( name : type ? : property-set ) +{ + return [ boostcpp.python-tag $(name) : $(type) : $(property-set) ] ; +} + +if "@PORT@" != "boost-system" +{ + use-project /boost/system : . ; + + lib boost_system : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_system@BOOST_LIB_RELEASE_SUFFIX@" release ; + lib boost_system : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_system@BOOST_LIB_DEBUG_SUFFIX@" debug ; + explicit boost_system ; + + use-project /boost : . ; + alias system : boost_system ; +} + +if "@PORT@" != "boost-chrono" +{ + use-project /boost/chrono : . ; + + lib boost_chrono : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_chrono@BOOST_LIB_RELEASE_SUFFIX@" release ; + lib boost_chrono : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_chrono@BOOST_LIB_DEBUG_SUFFIX@" debug ; + explicit boost_chrono ; +} + +if "@PORT@" != "boost-regex" +{ + use-project /boost/regex : . ; + + lib boost_regex : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_regex@BOOST_LIB_RELEASE_SUFFIX@" release ; + lib boost_regex : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_regex@BOOST_LIB_DEBUG_SUFFIX@" debug ; + explicit boost_regex ; +} + +if "@PORT@" != "boost-date-time" +{ + use-project /boost/date_time : . ; + + lib boost_date_time : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_date_time@BOOST_LIB_RELEASE_SUFFIX@" release -/boost/date_time//boost_date_time ; + lib boost_date_time : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_date_time@BOOST_LIB_DEBUG_SUFFIX@" debug -/boost/date_time//boost_date_time ; + explicit boost_date_time ; +} + +if "@PORT@" != "boost-thread" +{ + use-project /boost/thread : . ; + + lib boost_thread : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_thread@BOOST_LIB_RELEASE_SUFFIX@" release : : /boost/date_time//boost_date_time ; + lib boost_thread : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_thread@BOOST_LIB_DEBUG_SUFFIX@" debug : : /boost/date_time//boost_date_time ; + explicit boost_thread ; +} + +if "@PORT@" != "boost-timer" +{ + use-project /boost/timer : . ; + + lib boost_timer : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_timer@BOOST_LIB_RELEASE_SUFFIX@" release ; + lib boost_timer : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_timer@BOOST_LIB_DEBUG_SUFFIX@" debug ; + explicit boost_timer ; +} + +if "@PORT@" != "boost-filesystem" +{ + use-project /boost/filesystem : . ; + + lib boost_filesystem : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_filesystem@BOOST_LIB_RELEASE_SUFFIX@" release : : /boost/system//boost_system ; + lib boost_filesystem : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_filesystem@BOOST_LIB_DEBUG_SUFFIX@" debug : : /boost/system//boost_system ; + explicit boost_filesystem ; +} + +if "@PORT@" != "boost-atomic" +{ + use-project /boost/atomic : . ; + + lib boost_atomic : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_atomic@BOOST_LIB_RELEASE_SUFFIX@" release ; + lib boost_atomic : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_atomic@BOOST_LIB_DEBUG_SUFFIX@" debug ; + explicit boost_atomic ; +} + +if "@PORT@" != "boost-context" +{ + feature.feature segmented-stacks : on : optional propagated composite ; + feature.compose on : BOOST_USE_SEGMENTED_STACKS ; + + use-project /boost/context : . ; + + lib boost_context : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_context@BOOST_LIB_RELEASE_SUFFIX@" release ; + lib boost_context : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_context@BOOST_LIB_DEBUG_SUFFIX@" debug ; + explicit boost_context ; +} + +if "@PORT@" != "boost-test" +{ + use-project /boost/test : . ; + + lib boost_unit_test_framework : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_unit_test_framework@BOOST_LIB_RELEASE_SUFFIX@" release ; + lib boost_unit_test_framework : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_unit_test_framework@BOOST_LIB_DEBUG_SUFFIX@" debug ; + explicit boost_unit_test_framework ; +} + +if "@PORT@" != "boost-serialization" +{ + use-project /boost/serialization : . ; + + lib boost_serialization : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_serialization@BOOST_LIB_RELEASE_SUFFIX@" release ; + lib boost_serialization : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_serialization@BOOST_LIB_DEBUG_SUFFIX@" debug ; + explicit boost_serialization ; +} + +if "@PORT@" != "boost-mpi" +{ + use-project /boost/mpi : . ; + + lib boost_mpi : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_mpi@BOOST_LIB_RELEASE_SUFFIX@" release : : /boost/serialization//boost_serialization ; + lib boost_mpi : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_mpi@BOOST_LIB_DEBUG_SUFFIX@" debug : : /boost/serialization//boost_serialization ; + explicit boost_mpi ; +} + +if "@PORT@" != "boost-container" +{ + use-project /boost/container : . ; + + lib boost_container : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_container@BOOST_LIB_RELEASE_SUFFIX@" release ; + lib boost_container : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_container@BOOST_LIB_DEBUG_SUFFIX@" debug ; + explicit boost_container ; +} + +if "@PORT@" != "boost-python" +{ + use-project /boost/python : . ; + + lib boost_python : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_python@PYTHON_VERSION_TAG@@BOOST_LIB_RELEASE_SUFFIX@" release ; + lib boost_python : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_python@PYTHON_VERSION_TAG@@BOOST_LIB_DEBUG_SUFFIX@" debug ; + explicit boost_python ; +} + +rule requires ( foo * ) +{ +} + +rule boost-lib ( name : sources * : requirements * : default-build * : usage-requirements * ) +{ + name = boost_$(name) ; + lib $(name) : $(sources) : $(requirements) : $(default-build) : $(usage-requirements) ; + boost-install $(name) ; +} + +use-project /boost/@PORT@ : build ; + +build-project build ; diff --git a/externals/vcpkg/ports/boost-modular-build-helper/boost-modular-build.cmake b/externals/vcpkg/ports/boost-modular-build-helper/boost-modular-build.cmake new file mode 100755 index 000000000..bb0fb6a1d --- /dev/null +++ b/externals/vcpkg/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -0,0 +1,198 @@ +include_guard(GLOBAL) +include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake/vcpkg-port-config.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake-get-vars/vcpkg-port-config.cmake") + +get_filename_component(BOOST_BUILD_INSTALLED_DIR "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) +get_filename_component(BOOST_BUILD_INSTALLED_DIR "${BOOST_BUILD_INSTALLED_DIR}" DIRECTORY) + +set(BOOST_VERSION 1.79.0) +string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" BOOST_VERSION_MATCH "${BOOST_VERSION}") +if("${CMAKE_MATCH_3}" GREATER 0) + set(BOOST_VERSION_ABI_TAG "${CMAKE_MATCH_1}_${CMAKE_MATCH_2}_${CMAKE_MATCH_3}") +else() + set(BOOST_VERSION_ABI_TAG "${CMAKE_MATCH_1}_${CMAKE_MATCH_2}") +endif() + +function(boost_modular_build) + cmake_parse_arguments(_bm "" "SOURCE_PATH;BOOST_CMAKE_FRAGMENT" "" ${ARGN}) + + if(NOT DEFINED _bm_SOURCE_PATH) + message(FATAL_ERROR "SOURCE_PATH is a required argument to boost_modular_build.") + endif() + + # The following variables are used in the Jamroot.jam + set(B2_REQUIREMENTS) + + # Some CMake variables may be overridden in the file specified in ${_bm_BOOST_CMAKE_FRAGMENT} + if(DEFINED _bm_BOOST_CMAKE_FRAGMENT) + message(STATUS "Including ${_bm_BOOST_CMAKE_FRAGMENT}") + include(${_bm_BOOST_CMAKE_FRAGMENT}) + endif() + + set(BOOST_BUILD_PATH "${BOOST_BUILD_INSTALLED_DIR}/tools/boost-build") + + if(EXISTS "${BOOST_BUILD_PATH}/b2.exe") + set(B2_EXE "${BOOST_BUILD_PATH}/b2.exe") + elseif(EXISTS "${BOOST_BUILD_PATH}/b2") + set(B2_EXE "${BOOST_BUILD_PATH}/b2") + else() + message(FATAL_ERROR "Could not find b2 in ${BOOST_BUILD_PATH}") + endif() + + if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(BOOST_LIB_PREFIX) + if(VCPKG_PLATFORM_TOOLSET MATCHES "v14.") + set(BOOST_LIB_RELEASE_SUFFIX -vc140-mt.lib) + set(BOOST_LIB_DEBUG_SUFFIX -vc140-mt-gd.lib) + elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v120") + set(BOOST_LIB_RELEASE_SUFFIX -vc120-mt.lib) + set(BOOST_LIB_DEBUG_SUFFIX -vc120-mt-gd.lib) + else() + set(BOOST_LIB_RELEASE_SUFFIX .lib) + set(BOOST_LIB_DEBUG_SUFFIX d.lib) + endif() + else() + set(BOOST_LIB_PREFIX lib) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(BOOST_LIB_RELEASE_SUFFIX .a) + set(BOOST_LIB_DEBUG_SUFFIX .a) + elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(BOOST_LIB_RELEASE_SUFFIX .dylib) + set(BOOST_LIB_DEBUG_SUFFIX .dylib) + elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW") + set(BOOST_LIB_RELEASE_SUFFIX .dll.a) + set(BOOST_LIB_DEBUG_SUFFIX .dll.a) + else() + set(BOOST_LIB_RELEASE_SUFFIX .so) + set(BOOST_LIB_DEBUG_SUFFIX .so) + endif() + endif() + + set(_jamfile) + if(EXISTS "${_bm_SOURCE_PATH}/build/Jamfile.v2") + set(_jamfile "${_bm_SOURCE_PATH}/build/Jamfile.v2") + elseif(EXISTS "${_bm_SOURCE_PATH}/build/Jamfile") + set(_jamfile "${_bm_SOURCE_PATH}/build/Jamfile") + endif() + if(_jamfile) + file(READ "${_jamfile}" _contents) + string(REGEX REPLACE + "\.\./\.\./([^/ ]+)/build//(boost_[^/ ]+)" + "/boost/\\1//\\2" + _contents + "${_contents}" + ) + string(REGEX REPLACE "/boost//([^/ ]+)" "/boost/\\1//boost_\\1" _contents "${_contents}") + file(WRITE "${_jamfile}" "${_contents}") + endif() + + if("python2" IN_LIST FEATURES) + # Find Python2 in the current installed directory + file(GLOB python2_include_dir "${CURRENT_INSTALLED_DIR}/include/python2.*") + string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" python2_version "${python2_include_dir}") + string(REPLACE "." "" PYTHON_VERSION_TAG "${python2_version}") + endif() + if("python3" IN_LIST FEATURES) + # Find Python3 in the current installed directory + file(GLOB python3_include_dir "${CURRENT_INSTALLED_DIR}/include/python3.*") + string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" python3_version "${python3_include_dir}") + string(REPLACE "." "" PYTHON_VERSION_TAG "${python3_version}") + endif() + + configure_file(${BOOST_BUILD_INSTALLED_DIR}/share/boost-build/Jamroot.jam.in ${_bm_SOURCE_PATH}/Jamroot.jam @ONLY) + + set(configure_options) + if(_bm_BOOST_CMAKE_FRAGMENT) + list(APPEND configure_options "-DBOOST_CMAKE_FRAGMENT=${_bm_BOOST_CMAKE_FRAGMENT}") + endif() + + vcpkg_cmake_get_vars(cmake_vars_file) + + vcpkg_check_features( + OUT_FEATURE_OPTIONS feature_options + FEATURES + python2 WITH_PYTHON2 + python3 WITH_PYTHON3 + ) + + vcpkg_cmake_configure( + SOURCE_PATH ${BOOST_BUILD_INSTALLED_DIR}/share/boost-build + GENERATOR Ninja + OPTIONS + "-DPORT=${PORT}" + "-DFEATURES=${FEATURES}" + ${feature_options} + "-DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}" + "-DB2_EXE=${B2_EXE}" + "-DSOURCE_PATH=${_bm_SOURCE_PATH}" + "-DBOOST_BUILD_PATH=${BOOST_BUILD_PATH}" + "-DVCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE}" + "-DVCPKG_CMAKE_VARS_FILE=${cmake_vars_file}" + ${configure_options} + MAYBE_UNUSED_VARIABLES + FEATURES + ) + + vcpkg_cmake_install() + + vcpkg_copy_pdbs( + BUILD_PATHS + "${CURRENT_PACKAGES_DIR}/bin/*.dll" + "${CURRENT_PACKAGES_DIR}/bin/*.pyd" + "${CURRENT_PACKAGES_DIR}/debug/bin/*.dll" + "${CURRENT_PACKAGES_DIR}/debug/bin/*.pyd" + ) + + file(GLOB INSTALLED_LIBS "${CURRENT_PACKAGES_DIR}/debug/lib/*.lib" "${CURRENT_PACKAGES_DIR}/lib/*.lib") + foreach(LIB IN LISTS INSTALLED_LIBS) + get_filename_component(OLD_FILENAME ${LIB} NAME) + get_filename_component(DIRECTORY_OF_LIB_FILE ${LIB} DIRECTORY) + string(REPLACE "libboost_" "boost_" NEW_FILENAME ${OLD_FILENAME}) + string(REPLACE "-s-" "-" NEW_FILENAME ${NEW_FILENAME}) # For Release libs + string(REPLACE "-vc141-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2017 and VS2015 binaries + string(REPLACE "-vc142-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2019 and VS2015 binaries + string(REPLACE "-vc143-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2022 and VS2015 binaries + string(REPLACE "-sgd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs + string(REPLACE "-sgyd-" "-gyd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs + string(REPLACE "-x32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries + string(REPLACE "-x64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries + string(REPLACE "-a32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries + string(REPLACE "-a64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries + string(REPLACE "-${BOOST_VERSION_ABI_TAG}" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries + if("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}") + # nothing to do + elseif(EXISTS "${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}") + file(REMOVE "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}") + else() + file(RENAME "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}" "${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}") + endif() + endforeach() + # Similar for mingw + file(GLOB INSTALLED_LIBS "${CURRENT_PACKAGES_DIR}/debug/lib/*-mgw*-*.a" "${CURRENT_PACKAGES_DIR}/lib/*-mgw*-*.a") + foreach(LIB IN LISTS INSTALLED_LIBS) + get_filename_component(OLD_FILENAME "${LIB}" NAME) + get_filename_component(DIRECTORY_OF_LIB_FILE "${LIB}" DIRECTORY) + string(REGEX REPLACE "-mgw[0-9]+-.*[0-9](\\.dll\\.a|\\.a)$" "\\1" NEW_FILENAME "${OLD_FILENAME}") + if("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}") + # nothing to do + elseif(EXISTS "${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}") + file(REMOVE "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}") + else() + file(RENAME "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}" "${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}") + endif() + endforeach() + + # boost-regex[icu] and boost-locale[icu] generate has_icu.lib + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/has_icu.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/has_icu.lib") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/has_icu.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/has_icu.lib") + endif() + + if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/lib") + message(FATAL_ERROR "No libraries were produced. This indicates a failure while building the boost library.") + endif() + + configure_file(${BOOST_BUILD_INSTALLED_DIR}/share/boost-build/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage COPYONLY) +endfunction() diff --git a/externals/vcpkg/ports/boost-modular-build-helper/nothing.bat b/externals/vcpkg/ports/boost-modular-build-helper/nothing.bat new file mode 100755 index 000000000..e69de29bb diff --git a/externals/vcpkg/ports/boost-modular-build-helper/portfile.cmake b/externals/vcpkg/ports/boost-modular-build-helper/portfile.cmake new file mode 100755 index 000000000..3caa70b6c --- /dev/null +++ b/externals/vcpkg/ports/boost-modular-build-helper/portfile.cmake @@ -0,0 +1,13 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +file( + COPY + ${CMAKE_CURRENT_LIST_DIR}/boost-modular-build.cmake + ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_LIST_DIR}/Jamroot.jam.in + ${CMAKE_CURRENT_LIST_DIR}/nothing.bat + ${CMAKE_CURRENT_LIST_DIR}/usage + ${CMAKE_CURRENT_LIST_DIR}/user-config.jam.in + DESTINATION + ${CURRENT_PACKAGES_DIR}/share/boost-build +) \ No newline at end of file diff --git a/externals/vcpkg/ports/boost-modular-build-helper/usage b/externals/vcpkg/ports/boost-modular-build-helper/usage new file mode 100755 index 000000000..89a0376da --- /dev/null +++ b/externals/vcpkg/ports/boost-modular-build-helper/usage @@ -0,0 +1,4 @@ +The package boost is compatible with built-in CMake targets: + + find_package(Boost REQUIRED [COMPONENTS ...]) + target_link_libraries(main PRIVATE Boost::boost Boost:: Boost:: ...) diff --git a/externals/vcpkg/ports/boost-modular-build-helper/user-config.jam.in b/externals/vcpkg/ports/boost-modular-build-helper/user-config.jam.in new file mode 100755 index 000000000..fccfa1a43 --- /dev/null +++ b/externals/vcpkg/ports/boost-modular-build-helper/user-config.jam.in @@ -0,0 +1,53 @@ +import toolset ; + +using @USER_CONFIG_TOOLSET@ : @USER_CONFIG_TOOLSET_VERSION@ : @USER_CONFIG_TOOLSET_INVOCATION_COMMAND@ + : +@USER_CONFIG_TOOLSET_OPTIONS@ + ; + +@USER_CONFIG_EXTRA_LINES@ + +project user-config : requirements @USER_CONFIG_REQUIREMENTS@ ; + +if "@USER_CONFIG_TOOLSET@" = "msvc" || "@USER_CONFIG_TOOLSET@" = "clang-win" +{ + lib advapi32 ; + + lib icuuc : : "@CURRENT_INSTALLED_DIR@/lib/icuuc.lib" release : : advapi32 ; + lib icuuc : : "@CURRENT_INSTALLED_DIR@/debug/lib/icuucd.lib" debug : : advapi32 ; + + lib icuin : : "@CURRENT_INSTALLED_DIR@/lib/icuin.lib" release : : ; + lib icuin : : "@CURRENT_INSTALLED_DIR@/debug/lib/icuind.lib" debug : : ; + + lib icudt : : "@CURRENT_INSTALLED_DIR@/lib/icudt.lib" release : : ; + lib icudt : : "@CURRENT_INSTALLED_DIR@/debug/lib/icudtd.lib" debug : : ; +} +else +{ + if "@CMAKE_SYSTEM_NAME@" = "Windows" # We are hopelessly stuck inside boost-modular-build-helper, only this works + { + lib icuuc : : icuuc "@CURRENT_INSTALLED_DIR@/lib" release : : ; + lib icuuc : : icuucd "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; + + lib icuin : : icuin "@CURRENT_INSTALLED_DIR@/lib" release : : ; + lib icuin : : icuind "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; + + lib icudt : : icudt "@CURRENT_INSTALLED_DIR@/lib" release : : ; + lib icudt : : icudtd "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; + } + else + { + lib dl ; + lib icuuc : : icuuc "@CURRENT_INSTALLED_DIR@/lib" release : : dl ; + lib icuuc : : icuuc "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : dl ; + + lib icuin : : icui18n "@CURRENT_INSTALLED_DIR@/lib" release : : ; + lib icuin : : icui18n "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; + + lib icudt : : icudata "@CURRENT_INSTALLED_DIR@/lib" release : : ; + lib icudt : : icudata "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; + } +} + +lib iconv : : "@VCPKG_ICONV_LIBRARY_RELEASE@" shared shared release : : ; +lib iconv : : "@VCPKG_ICONV_LIBRARY_DEBUG@" shared shared debug : : ; diff --git a/externals/vcpkg/ports/boost-modular-build-helper/vcpkg.json b/externals/vcpkg/ports/boost-modular-build-helper/vcpkg.json new file mode 100755 index 000000000..04a067d59 --- /dev/null +++ b/externals/vcpkg/ports/boost-modular-build-helper/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "boost-modular-build-helper", + "version": "1.79.0", + "port-version": 2, + "description": "Internal vcpkg port used to build Boost libraries", + "license": "MIT", + "dependencies": [ + "boost-uninstall", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-get-vars", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-move/portfile.cmake b/externals/vcpkg/ports/boost-move/portfile.cmake new file mode 100755 index 000000000..6cc86d667 --- /dev/null +++ b/externals/vcpkg/ports/boost-move/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/move + REF boost-1.79.0 + SHA512 1c62ca4673ca70dd1334ac6380f74db2f3827631d1419f658461bd4ab22a81406a2b1229adf48f92cf827a627e1997409c9911d8bc9ed6a5d5ac320127818fb0 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-move/vcpkg.json b/externals/vcpkg/ports/boost-move/vcpkg.json new file mode 100755 index 000000000..479998601 --- /dev/null +++ b/externals/vcpkg/ports/boost-move/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "boost-move", + "version": "1.79.0", + "description": "Boost move module", + "homepage": "https://github.com/boostorg/move", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + "boost-static-assert", + "boost-vcpkg-helpers", + "boost-winapi" + ] +} diff --git a/externals/vcpkg/ports/boost-mp11/portfile.cmake b/externals/vcpkg/ports/boost-mp11/portfile.cmake new file mode 100755 index 000000000..75ad22305 --- /dev/null +++ b/externals/vcpkg/ports/boost-mp11/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/mp11 + REF boost-1.79.0 + SHA512 0955d8b9df916b8386edca235e0e142f43bf80e93fb44cb6c75ef9190668be04d07bccb68907d55222fa21c01729105e2c18d6a407b953eb62835622ad41b0d9 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-mp11/vcpkg.json b/externals/vcpkg/ports/boost-mp11/vcpkg.json new file mode 100755 index 000000000..e99a6d0da --- /dev/null +++ b/externals/vcpkg/ports/boost-mp11/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "boost-mp11", + "version": "1.79.0", + "description": "Boost mp11 module", + "homepage": "https://github.com/boostorg/mp11", + "license": "BSL-1.0", + "dependencies": [ + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-mpi/fix-build-boost_mpi_python-on-windows.patch b/externals/vcpkg/ports/boost-mpi/fix-build-boost_mpi_python-on-windows.patch new file mode 100755 index 000000000..884e65d35 --- /dev/null +++ b/externals/vcpkg/ports/boost-mpi/fix-build-boost_mpi_python-on-windows.patch @@ -0,0 +1,15 @@ + build/Jamfile.v2 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 +index 8a2f1ac..abfba37 100644 +--- a/build/Jamfile.v2 ++++ b/build/Jamfile.v2 +@@ -77,6 +77,7 @@ lib boost_mpi + : # Requirements + boost_mpi + /mpi//mpi [ mpi.extra-requirements ] ++ /python//python_for_extensions + /boost/python//boost_python + shared:BOOST_MPI_DYN_LINK=1 + shared:BOOST_MPI_PYTHON_DYN_LINK=1 diff --git a/externals/vcpkg/ports/boost-mpi/portfile.cmake b/externals/vcpkg/ports/boost-mpi/portfile.cmake new file mode 100755 index 000000000..4af9f1642 --- /dev/null +++ b/externals/vcpkg/ports/boost-mpi/portfile.cmake @@ -0,0 +1,15 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/mpi + REF boost-1.79.0 + SHA512 280b35c991741480a4ee9ae97c11ed14a108b200344ac5b4af2e5956041275dceeb1370320a90e30ac12a0ab0667afd80910776b1f0e404d5bc3637f53993010 + HEAD_REF master + PATCHES fix-build-boost_mpi_python-on-windows.patch +) + +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-mpi/vcpkg.json b/externals/vcpkg/ports/boost-mpi/vcpkg.json new file mode 100755 index 000000000..8d65e241f --- /dev/null +++ b/externals/vcpkg/ports/boost-mpi/vcpkg.json @@ -0,0 +1,57 @@ +{ + "name": "boost-mpi", + "version": "1.79.0", + "description": "Boost mpi module", + "homepage": "https://github.com/boostorg/mpi", + "license": "BSL-1.0", + "supports": "!uwp", + "dependencies": [ + "boost-assert", + { + "name": "boost-build", + "host": true + }, + "boost-config", + "boost-core", + "boost-foreach", + "boost-function", + "boost-graph", + "boost-integer", + "boost-iterator", + "boost-lexical-cast", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-mpl", + "boost-optional", + "boost-serialization", + "boost-smart-ptr", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers", + "mpi", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "python3": { + "description": "Build Python3 bindings", + "supports": "!static", + "dependencies": [ + { + "name": "boost-python", + "features": [ + "python3" + ], + "platform": "!uwp & !emscripten & !ios & !android" + }, + "python3" + ] + } + } +} diff --git a/externals/vcpkg/ports/boost-mpl/portfile.cmake b/externals/vcpkg/ports/boost-mpl/portfile.cmake new file mode 100755 index 000000000..5c086ddf7 --- /dev/null +++ b/externals/vcpkg/ports/boost-mpl/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/mpl + REF boost-1.79.0 + SHA512 55d1e6481269070d7ec45b11f19dc437f56ad72c869b82b312278cbddf5b4ae83dc70d74b2f0e99741f68d7c07d401b3c5c48a119f15825dea7164ea3cfcd275 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-mpl/vcpkg.json b/externals/vcpkg/ports/boost-mpl/vcpkg.json new file mode 100755 index 000000000..eb4badfe4 --- /dev/null +++ b/externals/vcpkg/ports/boost-mpl/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "boost-mpl", + "version": "1.79.0", + "description": "Boost mpl module", + "homepage": "https://github.com/boostorg/mpl", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-core", + "boost-predef", + "boost-preprocessor", + "boost-static-assert", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-msm/portfile.cmake b/externals/vcpkg/ports/boost-msm/portfile.cmake new file mode 100755 index 000000000..f73c01846 --- /dev/null +++ b/externals/vcpkg/ports/boost-msm/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/msm + REF boost-1.79.0 + SHA512 29ddbf189b699d1313950b7c30d2ad98e0e242508f9a8d81e98c384572808dfe55072af41f5c036bd2a51d39d7081d10c3c79d9f8f7a9245a67d3840974cb1b9 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-msm/vcpkg.json b/externals/vcpkg/ports/boost-msm/vcpkg.json new file mode 100755 index 000000000..fe38a7327 --- /dev/null +++ b/externals/vcpkg/ports/boost-msm/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "boost-msm", + "version": "1.79.0", + "description": "Boost msm module", + "homepage": "https://github.com/boostorg/msm", + "license": "BSL-1.0", + "dependencies": [ + "boost-any", + "boost-assert", + "boost-bind", + "boost-circular-buffer", + "boost-config", + "boost-core", + "boost-function", + "boost-fusion", + "boost-mpl", + "boost-parameter", + "boost-phoenix", + "boost-preprocessor", + "boost-proto", + "boost-serialization", + "boost-tuple", + "boost-type-traits", + "boost-typeof", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-multi-array/portfile.cmake b/externals/vcpkg/ports/boost-multi-array/portfile.cmake new file mode 100755 index 000000000..ad92053de --- /dev/null +++ b/externals/vcpkg/ports/boost-multi-array/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/multi_array + REF boost-1.79.0 + SHA512 5665ffa1b298320cd525b3d22a5e59c1c88a148672ed98295a00957b05316943f081821102c3881ba03b565d0c0879d11b0d3bdf1221a92fbfe4dddb98820074 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-multi-array/vcpkg.json b/externals/vcpkg/ports/boost-multi-array/vcpkg.json new file mode 100755 index 000000000..92ca481d6 --- /dev/null +++ b/externals/vcpkg/ports/boost-multi-array/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "boost-multi-array", + "version": "1.79.0", + "description": "Boost multi_array module", + "homepage": "https://github.com/boostorg/multi_array", + "license": "BSL-1.0", + "dependencies": [ + "boost-array", + "boost-assert", + "boost-concept-check", + "boost-config", + "boost-core", + "boost-functional", + "boost-iterator", + "boost-mpl", + "boost-static-assert", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-multi-index/portfile.cmake b/externals/vcpkg/ports/boost-multi-index/portfile.cmake new file mode 100755 index 000000000..f0a2fe3b6 --- /dev/null +++ b/externals/vcpkg/ports/boost-multi-index/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/multi_index + REF boost-1.79.0 + SHA512 359d68e58977e84c6fab0a0e6a1a64ae7589437b0847c0a492ba6bd0089b023729bebfae1c7f4e2f21a5289e11bd0dfa643f34fa913dda59dcecb49dd8adfe63 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-multi-index/vcpkg.json b/externals/vcpkg/ports/boost-multi-index/vcpkg.json new file mode 100755 index 000000000..778c02abf --- /dev/null +++ b/externals/vcpkg/ports/boost-multi-index/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "boost-multi-index", + "version": "1.79.0", + "description": "Boost multi_index module", + "homepage": "https://github.com/boostorg/multi_index", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-bind", + "boost-config", + "boost-container-hash", + "boost-core", + "boost-foreach", + "boost-integer", + "boost-iterator", + "boost-move", + "boost-mpl", + "boost-preprocessor", + "boost-serialization", + "boost-smart-ptr", + "boost-static-assert", + "boost-throw-exception", + "boost-tuple", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-multiprecision/portfile.cmake b/externals/vcpkg/ports/boost-multiprecision/portfile.cmake new file mode 100755 index 000000000..4d01bbd48 --- /dev/null +++ b/externals/vcpkg/ports/boost-multiprecision/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/multiprecision + REF boost-1.79.0 + SHA512 feb6f97d124032a22fe48989fd783242ca2db1adc3f821e36b6798fd068e038037dd32cc6c7cb0c3c76fe96074c9e7ff287809edc944d4f1c4f1aff686fda57d + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-multiprecision/vcpkg.json b/externals/vcpkg/ports/boost-multiprecision/vcpkg.json new file mode 100755 index 000000000..6b7a99432 --- /dev/null +++ b/externals/vcpkg/ports/boost-multiprecision/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "boost-multiprecision", + "version": "1.79.0", + "description": "Boost multiprecision module", + "homepage": "https://github.com/boostorg/multiprecision", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + "boost-integer", + "boost-lexical-cast", + "boost-math", + "boost-predef", + "boost-random", + "boost-throw-exception", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-nowide/b2-options.cmake b/externals/vcpkg/ports/boost-nowide/b2-options.cmake new file mode 100755 index 000000000..573883468 --- /dev/null +++ b/externals/vcpkg/ports/boost-nowide/b2-options.cmake @@ -0,0 +1,3 @@ +if(APPLE) + list(APPEND B2_OPTIONS cxxstd=11) +endif() diff --git a/externals/vcpkg/ports/boost-nowide/portfile.cmake b/externals/vcpkg/ports/boost-nowide/portfile.cmake new file mode 100755 index 000000000..cc1035d63 --- /dev/null +++ b/externals/vcpkg/ports/boost-nowide/portfile.cmake @@ -0,0 +1,22 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/nowide + REF boost-1.79.0 + SHA512 47169153491cf7589f8e0080c609caac55388b5bf89577fac60a1c7e94a46203652652ec904898a8f9b84319fb9f92ccea2eb2a892b49c69b82270f975c2cc25 + HEAD_REF master +) + +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../config/checks/config" + "import ../config/checks/config" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build( + SOURCE_PATH ${SOURCE_PATH} + BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake" +) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-nowide/vcpkg.json b/externals/vcpkg/ports/boost-nowide/vcpkg.json new file mode 100755 index 000000000..67021a29c --- /dev/null +++ b/externals/vcpkg/ports/boost-nowide/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "boost-nowide", + "version": "1.79.0", + "description": "Boost nowide module", + "homepage": "https://github.com/boostorg/nowide", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "boost-build", + "host": true + }, + "boost-config", + { + "name": "boost-filesystem", + "platform": "!uwp" + }, + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-numeric-conversion/portfile.cmake b/externals/vcpkg/ports/boost-numeric-conversion/portfile.cmake new file mode 100755 index 000000000..445031044 --- /dev/null +++ b/externals/vcpkg/ports/boost-numeric-conversion/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/numeric_conversion + REF boost-1.79.0 + SHA512 87b357355ddf1dfb565e770dbbbaf6b8b3d7005237ab01610170152d9cf4d6f3d7ba4bec8b127bce876abaf322af46e92f921f39b3ae41bd150ed29ff53b021e + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-numeric-conversion/vcpkg.json b/externals/vcpkg/ports/boost-numeric-conversion/vcpkg.json new file mode 100755 index 000000000..aa96a68ea --- /dev/null +++ b/externals/vcpkg/ports/boost-numeric-conversion/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "boost-numeric-conversion", + "version": "1.79.0", + "description": "Boost numeric_conversion module", + "homepage": "https://github.com/boostorg/numeric_conversion", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-conversion", + "boost-core", + "boost-mpl", + "boost-preprocessor", + "boost-throw-exception", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-odeint/portfile.cmake b/externals/vcpkg/ports/boost-odeint/portfile.cmake new file mode 100755 index 000000000..57a5b658e --- /dev/null +++ b/externals/vcpkg/ports/boost-odeint/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/odeint + REF boost-1.79.0 + SHA512 f774cf8f0b38472e99241be3aae5b4f7eae6ed450bba654a6d718c32a0e7c5e38c1e40cbb426d83428e97864a691c6522352c045f8fcdb8ca48ef041b8b1b3e2 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-odeint/vcpkg.json b/externals/vcpkg/ports/boost-odeint/vcpkg.json new file mode 100755 index 000000000..ddf84ae3b --- /dev/null +++ b/externals/vcpkg/ports/boost-odeint/vcpkg.json @@ -0,0 +1,38 @@ +{ + "name": "boost-odeint", + "version": "1.79.0", + "description": "Boost odeint module", + "homepage": "https://github.com/boostorg/odeint", + "license": "BSL-1.0", + "dependencies": [ + "boost-array", + "boost-assert", + "boost-bind", + "boost-compute", + "boost-config", + "boost-core", + "boost-function", + "boost-fusion", + "boost-iterator", + "boost-math", + "boost-mpl", + "boost-multi-array", + "boost-preprocessor", + "boost-range", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-ublas", + "boost-units", + "boost-utility", + "boost-vcpkg-helpers" + ], + "features": { + "mpi": { + "description": "Support parallelization with MPI", + "dependencies": [ + "boost-mpi" + ] + } + } +} diff --git a/externals/vcpkg/ports/boost-optional/portfile.cmake b/externals/vcpkg/ports/boost-optional/portfile.cmake new file mode 100755 index 000000000..6773a94e9 --- /dev/null +++ b/externals/vcpkg/ports/boost-optional/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/optional + REF boost-1.79.0 + SHA512 43f2a88c39049d9a419af63fbb9c2cbfcaad8a691289a2085d646b2b98711879801662ec6486cd83509797856c9ec8492010e9deb36da3a4b40e6df81c2dfad0 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-optional/vcpkg.json b/externals/vcpkg/ports/boost-optional/vcpkg.json new file mode 100755 index 000000000..9225d5d4a --- /dev/null +++ b/externals/vcpkg/ports/boost-optional/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "boost-optional", + "version": "1.79.0", + "description": "Boost optional module", + "homepage": "https://github.com/boostorg/optional", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + "boost-detail", + "boost-move", + "boost-predef", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-outcome/portfile.cmake b/externals/vcpkg/ports/boost-outcome/portfile.cmake new file mode 100755 index 000000000..ddd8ac2fa --- /dev/null +++ b/externals/vcpkg/ports/boost-outcome/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/outcome + REF boost-1.79.0 + SHA512 e0e4587ea19e70047790e86496d85a7c1e310e8b33af99dfbcad330243b9ff390d710cfebda15a94de4497f4a85498c051c043adbe8c41770b747a742a34634c + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-outcome/vcpkg.json b/externals/vcpkg/ports/boost-outcome/vcpkg.json new file mode 100755 index 000000000..4ffa96ebc --- /dev/null +++ b/externals/vcpkg/ports/boost-outcome/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "boost-outcome", + "version": "1.79.0", + "description": "Boost outcome module", + "homepage": "https://github.com/boostorg/outcome", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-exception", + "boost-system", + "boost-throw-exception", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-parameter-python/portfile.cmake b/externals/vcpkg/ports/boost-parameter-python/portfile.cmake new file mode 100755 index 000000000..dd8c5fefb --- /dev/null +++ b/externals/vcpkg/ports/boost-parameter-python/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/parameter_python + REF boost-1.79.0 + SHA512 caadacd40b1e51db7b4e0e42e920e8d3492fdcaee29760c398bac64a614df37f8e103c31dadb8496bc11312791a2bdd60b45a16c5019f11c601480019d7bd181 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-parameter-python/vcpkg.json b/externals/vcpkg/ports/boost-parameter-python/vcpkg.json new file mode 100755 index 000000000..ef3b2eb75 --- /dev/null +++ b/externals/vcpkg/ports/boost-parameter-python/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "boost-parameter-python", + "version": "1.79.0", + "description": "Boost parameter_python module", + "homepage": "https://github.com/boostorg/parameter_python", + "license": "BSL-1.0", + "supports": "!emscripten", + "dependencies": [ + "boost-mpl", + "boost-parameter", + "boost-preprocessor", + { + "name": "boost-python", + "platform": "!uwp & !emscripten & !ios & !android" + }, + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-parameter/portfile.cmake b/externals/vcpkg/ports/boost-parameter/portfile.cmake new file mode 100755 index 000000000..ad66cbc7d --- /dev/null +++ b/externals/vcpkg/ports/boost-parameter/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/parameter + REF boost-1.79.0 + SHA512 cc81271b12af89bb804187dbe004f011d24960419b4f5ee3cc83953eca09522d3578ef9972f0a22e2e03406fbb782abd6d12e584c55f0cac6062296b762c37e1 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-parameter/vcpkg.json b/externals/vcpkg/ports/boost-parameter/vcpkg.json new file mode 100755 index 000000000..6eb74f2fd --- /dev/null +++ b/externals/vcpkg/ports/boost-parameter/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "boost-parameter", + "version": "1.79.0", + "description": "Boost parameter module", + "homepage": "https://github.com/boostorg/parameter", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-core", + "boost-function", + "boost-fusion", + "boost-mp11", + "boost-mpl", + "boost-optional", + "boost-preprocessor", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-pfr/portfile.cmake b/externals/vcpkg/ports/boost-pfr/portfile.cmake new file mode 100755 index 000000000..cfbcd21ed --- /dev/null +++ b/externals/vcpkg/ports/boost-pfr/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/pfr + REF boost-1.79.0 + SHA512 bcecf3f189d2ceae2eed25d2bc0e5a20e858829f6e0ec281c523d7391e4340ab07847a8e9df78a69c2afd3235310f6044c86802b9e34bdbd8f9294176ec991b9 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-pfr/vcpkg.json b/externals/vcpkg/ports/boost-pfr/vcpkg.json new file mode 100755 index 000000000..add024455 --- /dev/null +++ b/externals/vcpkg/ports/boost-pfr/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "boost-pfr", + "version": "1.79.0", + "description": "Boost pfr module", + "homepage": "https://github.com/boostorg/pfr", + "license": "BSL-1.0", + "dependencies": [ + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-phoenix/portfile.cmake b/externals/vcpkg/ports/boost-phoenix/portfile.cmake new file mode 100755 index 000000000..34df6d961 --- /dev/null +++ b/externals/vcpkg/ports/boost-phoenix/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/phoenix + REF boost-1.79.0 + SHA512 4520aa72f01fd9a57b23262247f68d690eb1df996ca1f3119230d78c6b37b49634bd895b6e32faf4b6ddc8367121d67dc2e8ece0da3330a55eee51a3a66bee31 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-phoenix/vcpkg.json b/externals/vcpkg/ports/boost-phoenix/vcpkg.json new file mode 100755 index 000000000..6ac14bf4b --- /dev/null +++ b/externals/vcpkg/ports/boost-phoenix/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "boost-phoenix", + "version": "1.79.0", + "description": "Boost phoenix module", + "homepage": "https://github.com/boostorg/phoenix", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-bind", + "boost-config", + "boost-core", + "boost-function", + "boost-fusion", + "boost-mpl", + "boost-predef", + "boost-preprocessor", + "boost-proto", + "boost-range", + "boost-smart-ptr", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-poly-collection/portfile.cmake b/externals/vcpkg/ports/boost-poly-collection/portfile.cmake new file mode 100755 index 000000000..aa1dcd7d4 --- /dev/null +++ b/externals/vcpkg/ports/boost-poly-collection/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/poly_collection + REF boost-1.79.0 + SHA512 f9cc05b4a5537c4aba68c18ee04bbd7363bd2830c6028578955d2e694cd45e47ac10f73326b79616267a8edffaaf4aea44c9e5d3f3c473235887542d3efd10cb + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-poly-collection/vcpkg.json b/externals/vcpkg/ports/boost-poly-collection/vcpkg.json new file mode 100755 index 000000000..154d38bc0 --- /dev/null +++ b/externals/vcpkg/ports/boost-poly-collection/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "boost-poly-collection", + "version": "1.79.0", + "description": "Boost poly_collection module", + "homepage": "https://github.com/boostorg/poly_collection", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + "boost-iterator", + "boost-mp11", + "boost-mpl", + "boost-type-erasure", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-polygon/portfile.cmake b/externals/vcpkg/ports/boost-polygon/portfile.cmake new file mode 100755 index 000000000..f0cbef187 --- /dev/null +++ b/externals/vcpkg/ports/boost-polygon/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/polygon + REF boost-1.79.0 + SHA512 3df76a3777155cffd449c2a08cfe271a2735202e514a37029afd1800e4c1d887403e37980f3c6bdc056a0b1333b55e674bcb9acbe33c2e5ba956ac2995d4ed67 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-polygon/vcpkg.json b/externals/vcpkg/ports/boost-polygon/vcpkg.json new file mode 100755 index 000000000..8a787a301 --- /dev/null +++ b/externals/vcpkg/ports/boost-polygon/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "boost-polygon", + "version": "1.79.0", + "description": "Boost polygon module", + "homepage": "https://github.com/boostorg/polygon", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-pool/portfile.cmake b/externals/vcpkg/ports/boost-pool/portfile.cmake new file mode 100755 index 000000000..6ee1c8850 --- /dev/null +++ b/externals/vcpkg/ports/boost-pool/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/pool + REF boost-1.79.0 + SHA512 ea62735a0f53bf0f94fd994055dc422007557f4a42c35d9b76259fa23e01f7ed637334342e3127d725a187610fff9a76bba044837bfc545bac21594ea8d58500 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-pool/vcpkg.json b/externals/vcpkg/ports/boost-pool/vcpkg.json new file mode 100755 index 000000000..590068a8c --- /dev/null +++ b/externals/vcpkg/ports/boost-pool/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "boost-pool", + "version": "1.79.0", + "description": "Boost pool module", + "homepage": "https://github.com/boostorg/pool", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-integer", + "boost-throw-exception", + "boost-type-traits", + "boost-vcpkg-helpers", + "boost-winapi" + ] +} diff --git a/externals/vcpkg/ports/boost-predef/portfile.cmake b/externals/vcpkg/ports/boost-predef/portfile.cmake new file mode 100755 index 000000000..97635dea3 --- /dev/null +++ b/externals/vcpkg/ports/boost-predef/portfile.cmake @@ -0,0 +1,14 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/predef + REF boost-1.79.0 + SHA512 329616d4b1e1e160b92f3f33f3172eeb124c9167616c29443804a817230c747fb51f211b2727b28c9a9a50364b4b7fb535000f22572e6db4f9e4b31b8ca375b9 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) + +file(COPY ${SOURCE_PATH}/tools/check DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-predef) diff --git a/externals/vcpkg/ports/boost-predef/vcpkg.json b/externals/vcpkg/ports/boost-predef/vcpkg.json new file mode 100755 index 000000000..fe62d6055 --- /dev/null +++ b/externals/vcpkg/ports/boost-predef/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "boost-predef", + "version": "1.79.0", + "description": "Boost predef module", + "homepage": "https://github.com/boostorg/predef", + "license": "BSL-1.0", + "dependencies": [ + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-preprocessor/portfile.cmake b/externals/vcpkg/ports/boost-preprocessor/portfile.cmake new file mode 100755 index 000000000..528dae4cd --- /dev/null +++ b/externals/vcpkg/ports/boost-preprocessor/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/preprocessor + REF boost-1.79.0 + SHA512 1c9a03441f11d3f2c0eb33563fee28261ffcb20ef60d1b16c8a4fccf20158472574aea70e674bbcd67cba19b5b76bc93e886b6a7a9cb9de462de7597d00c9f06 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-preprocessor/vcpkg.json b/externals/vcpkg/ports/boost-preprocessor/vcpkg.json new file mode 100755 index 000000000..4ecfa6624 --- /dev/null +++ b/externals/vcpkg/ports/boost-preprocessor/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "boost-preprocessor", + "version": "1.79.0", + "description": "Boost preprocessor module", + "homepage": "https://github.com/boostorg/preprocessor", + "license": "BSL-1.0", + "dependencies": [ + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-process/portfile.cmake b/externals/vcpkg/ports/boost-process/portfile.cmake new file mode 100755 index 000000000..7443b5f21 --- /dev/null +++ b/externals/vcpkg/ports/boost-process/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/process + REF boost-1.79.0 + SHA512 f2d4fabb6d1c08d67394733a325b50b9384e6dd6fd7de163a5aab1fa70b881d26f13f2e48e8cb7df53598e2c5989ad36bd99d1aabc736eb8b150a0e4a6c17ff2 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-process/vcpkg.json b/externals/vcpkg/ports/boost-process/vcpkg.json new file mode 100755 index 000000000..8a0d8d549 --- /dev/null +++ b/externals/vcpkg/ports/boost-process/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "boost-process", + "version": "1.79.0", + "description": "Boost process module", + "homepage": "https://github.com/boostorg/process", + "license": "BSL-1.0", + "supports": "!emscripten", + "dependencies": [ + "boost-algorithm", + "boost-asio", + "boost-config", + "boost-core", + { + "name": "boost-filesystem", + "platform": "!uwp" + }, + "boost-fusion", + "boost-iterator", + "boost-move", + "boost-optional", + "boost-system", + "boost-tokenizer", + "boost-type-index", + "boost-vcpkg-helpers", + "boost-winapi" + ] +} diff --git a/externals/vcpkg/ports/boost-program-options/portfile.cmake b/externals/vcpkg/ports/boost-program-options/portfile.cmake new file mode 100755 index 000000000..fca7622b4 --- /dev/null +++ b/externals/vcpkg/ports/boost-program-options/portfile.cmake @@ -0,0 +1,14 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/program_options + REF boost-1.79.0 + SHA512 250ededd7a3933413354ecd808336cab4e50fbd41cb92e66ee64d7e8dd959872df3040e0a08683b150e043a92da5fc4e3b1373d642adc4af88d8672a02077098 + HEAD_REF master +) + +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-program-options/vcpkg.json b/externals/vcpkg/ports/boost-program-options/vcpkg.json new file mode 100755 index 000000000..b4c55ace0 --- /dev/null +++ b/externals/vcpkg/ports/boost-program-options/vcpkg.json @@ -0,0 +1,35 @@ +{ + "name": "boost-program-options", + "version": "1.79.0", + "description": "Boost program_options module", + "homepage": "https://github.com/boostorg/program_options", + "license": "BSL-1.0", + "dependencies": [ + "boost-any", + "boost-bind", + { + "name": "boost-build", + "host": true + }, + "boost-config", + "boost-core", + "boost-detail", + "boost-function", + "boost-iterator", + "boost-lexical-cast", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-smart-ptr", + "boost-static-assert", + "boost-throw-exception", + "boost-tokenizer", + "boost-type-traits", + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-property-map-parallel/portfile.cmake b/externals/vcpkg/ports/boost-property-map-parallel/portfile.cmake new file mode 100755 index 000000000..c6be30f8d --- /dev/null +++ b/externals/vcpkg/ports/boost-property-map-parallel/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/property_map_parallel + REF boost-1.79.0 + SHA512 fc4dc74098abb84d258377e63277ea2ef2d6d8bdd4d1f75bde65c223f4854d231c4f4681454b8475cd5b623f98220f31b51fbba2a9dba0b299f5a9b260a55ad3 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-property-map-parallel/vcpkg.json b/externals/vcpkg/ports/boost-property-map-parallel/vcpkg.json new file mode 100755 index 000000000..bf7ba49db --- /dev/null +++ b/externals/vcpkg/ports/boost-property-map-parallel/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "boost-property-map-parallel", + "version": "1.79.0", + "description": "Boost property_map_parallel module", + "homepage": "https://github.com/boostorg/property_map_parallel", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-concept-check", + "boost-config", + "boost-function", + { + "name": "boost-mpi", + "platform": "!uwp" + }, + "boost-mpl", + "boost-multi-index", + "boost-optional", + "boost-property-map", + "boost-serialization", + "boost-smart-ptr", + "boost-static-assert", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-property-map/portfile.cmake b/externals/vcpkg/ports/boost-property-map/portfile.cmake new file mode 100755 index 000000000..5aaed8b5c --- /dev/null +++ b/externals/vcpkg/ports/boost-property-map/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/property_map + REF boost-1.79.0 + SHA512 5265b559b942b581890d12beb625d83a4a0261cf3efb0cb381b4c5d1ee178f1ffabd7be1782d87747b2b2a0a3e5ceae8587f8728cb30ad4fbff49e1d15f9a645 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-property-map/vcpkg.json b/externals/vcpkg/ports/boost-property-map/vcpkg.json new file mode 100755 index 000000000..e102df02f --- /dev/null +++ b/externals/vcpkg/ports/boost-property-map/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "boost-property-map", + "version": "1.79.0", + "description": "Boost property_map module", + "homepage": "https://github.com/boostorg/property_map", + "license": "BSL-1.0", + "dependencies": [ + "boost-any", + "boost-assert", + "boost-concept-check", + "boost-config", + "boost-core", + "boost-function", + "boost-iterator", + "boost-lexical-cast", + "boost-mpl", + "boost-smart-ptr", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-property-tree/portfile.cmake b/externals/vcpkg/ports/boost-property-tree/portfile.cmake new file mode 100755 index 000000000..09a8d59ba --- /dev/null +++ b/externals/vcpkg/ports/boost-property-tree/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/property_tree + REF boost-1.79.0 + SHA512 d0c7fbd9c12cc07d55aafd0a629df668681fe170a2e231d3de166caecc86e1a8751416a366ae247327dd8a24dc2aa945ce125e3747af361325d7f76187a687d9 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-property-tree/vcpkg.json b/externals/vcpkg/ports/boost-property-tree/vcpkg.json new file mode 100755 index 000000000..ccbb057d6 --- /dev/null +++ b/externals/vcpkg/ports/boost-property-tree/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "boost-property-tree", + "version": "1.79.0", + "description": "Boost property_tree module", + "homepage": "https://github.com/boostorg/property_tree", + "license": "BSL-1.0", + "dependencies": [ + "boost-any", + "boost-assert", + "boost-bind", + "boost-config", + "boost-core", + "boost-format", + "boost-iterator", + "boost-mpl", + "boost-multi-index", + "boost-optional", + "boost-range", + "boost-serialization", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-proto/portfile.cmake b/externals/vcpkg/ports/boost-proto/portfile.cmake new file mode 100755 index 000000000..e4de4a00f --- /dev/null +++ b/externals/vcpkg/ports/boost-proto/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/proto + REF boost-1.79.0 + SHA512 9237f04f926a53acdf186611487bfd3b33647f7f3e90b4ca09159fd7c230dfd7ffcb5dd7c56766391815a4bb2f77d98182e5eff39a4e1207d32d75f294f8f97a + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-proto/vcpkg.json b/externals/vcpkg/ports/boost-proto/vcpkg.json new file mode 100755 index 000000000..21fc85e34 --- /dev/null +++ b/externals/vcpkg/ports/boost-proto/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "boost-proto", + "version": "1.79.0", + "description": "Boost proto module", + "homepage": "https://github.com/boostorg/proto", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-core", + "boost-fusion", + "boost-mpl", + "boost-preprocessor", + "boost-range", + "boost-static-assert", + "boost-type-traits", + "boost-typeof", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-ptr-container/portfile.cmake b/externals/vcpkg/ports/boost-ptr-container/portfile.cmake new file mode 100755 index 000000000..3163ce1d4 --- /dev/null +++ b/externals/vcpkg/ports/boost-ptr-container/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/ptr_container + REF boost-1.79.0 + SHA512 65e90c815331ff3ccb1fbec2745e03beb5f97431c54a9eb2b2d4813a2709e655313ff3d30e06e4fa5f84aa4488cf1c17cfd7e0913498dcbd11a706d8ba2f71d0 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-ptr-container/vcpkg.json b/externals/vcpkg/ports/boost-ptr-container/vcpkg.json new file mode 100755 index 000000000..0e4da19c8 --- /dev/null +++ b/externals/vcpkg/ports/boost-ptr-container/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "boost-ptr-container", + "version": "1.79.0", + "description": "Boost ptr_container module", + "homepage": "https://github.com/boostorg/ptr_container", + "license": "BSL-1.0", + "dependencies": [ + "boost-array", + "boost-assert", + "boost-circular-buffer", + "boost-config", + "boost-core", + "boost-iterator", + "boost-mpl", + "boost-range", + "boost-serialization", + "boost-smart-ptr", + "boost-static-assert", + "boost-type-traits", + "boost-unordered", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-python/portfile.cmake b/externals/vcpkg/ports/boost-python/portfile.cmake new file mode 100755 index 000000000..4aef0e8c3 --- /dev/null +++ b/externals/vcpkg/ports/boost-python/portfile.cmake @@ -0,0 +1,14 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/python + REF boost-1.79.0 + SHA512 de41d0eb76709c7aaeb2bf7a459c0c3a3372e0747e2261773569c27e8bf78baad158cfb3bc4316c3073b000665f6faf664bcd34a2f68c40382b9d3c935ce2c42 + HEAD_REF master +) + +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-python/vcpkg.json b/externals/vcpkg/ports/boost-python/vcpkg.json new file mode 100755 index 000000000..168ead861 --- /dev/null +++ b/externals/vcpkg/ports/boost-python/vcpkg.json @@ -0,0 +1,62 @@ +{ + "name": "boost-python", + "version": "1.79.0", + "description": "Boost python module", + "homepage": "https://github.com/boostorg/python", + "license": "BSL-1.0", + "supports": "!uwp & !emscripten & !ios & !android", + "dependencies": [ + "boost-align", + "boost-bind", + { + "name": "boost-build", + "host": true + }, + "boost-config", + "boost-conversion", + "boost-core", + "boost-detail", + "boost-foreach", + "boost-function", + "boost-graph", + "boost-integer", + "boost-iterator", + "boost-lexical-cast", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-mpl", + "boost-numeric-conversion", + "boost-preprocessor", + "boost-property-map", + "boost-smart-ptr", + "boost-static-assert", + "boost-tuple", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "default-features": [ + "python3" + ], + "features": { + "python2": { + "description": "Build with Python2 support", + "supports": "!(arm & windows)", + "dependencies": [ + "python2" + ] + }, + "python3": { + "description": "Build with Python3 support", + "dependencies": [ + "python3" + ] + } + } +} diff --git a/externals/vcpkg/ports/boost-qvm/portfile.cmake b/externals/vcpkg/ports/boost-qvm/portfile.cmake new file mode 100755 index 000000000..e3ca1e4e4 --- /dev/null +++ b/externals/vcpkg/ports/boost-qvm/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/qvm + REF boost-1.79.0 + SHA512 0c9887826884b8b75acfd4cb89c0817ff8b7000ac326586e5efa6950f0812822024eb5d6fa290408b2babcbc2ec5e7e135483f793ae0b5786a8cac28598cd748 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-qvm/vcpkg.json b/externals/vcpkg/ports/boost-qvm/vcpkg.json new file mode 100755 index 000000000..7aa7413a0 --- /dev/null +++ b/externals/vcpkg/ports/boost-qvm/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "boost-qvm", + "version": "1.79.0", + "description": "Boost qvm module", + "homepage": "https://github.com/boostorg/qvm", + "license": "BSL-1.0", + "dependencies": [ + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-random/portfile.cmake b/externals/vcpkg/ports/boost-random/portfile.cmake new file mode 100755 index 000000000..bd7524d77 --- /dev/null +++ b/externals/vcpkg/ports/boost-random/portfile.cmake @@ -0,0 +1,14 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/random + REF boost-1.79.0 + SHA512 3a4d20ea69c4565357bc4098a3acc1281903a6118280cde056755ef2fc184cccfcc7b6f5c29b938b4d0f0d41072fc9d174e524e8c48fed6bcb0cdd1692afa01a + HEAD_REF master +) + +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-random/vcpkg.json b/externals/vcpkg/ports/boost-random/vcpkg.json new file mode 100755 index 000000000..7e8eb77ce --- /dev/null +++ b/externals/vcpkg/ports/boost-random/vcpkg.json @@ -0,0 +1,35 @@ +{ + "name": "boost-random", + "version": "1.79.0", + "description": "Boost random module", + "homepage": "https://github.com/boostorg/random", + "license": "BSL-1.0", + "dependencies": [ + "boost-array", + "boost-assert", + { + "name": "boost-build", + "host": true + }, + "boost-config", + "boost-core", + "boost-dynamic-bitset", + "boost-integer", + "boost-io", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-range", + "boost-static-assert", + "boost-system", + "boost-throw-exception", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-range/portfile.cmake b/externals/vcpkg/ports/boost-range/portfile.cmake new file mode 100755 index 000000000..a85f44774 --- /dev/null +++ b/externals/vcpkg/ports/boost-range/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/range + REF boost-1.79.0 + SHA512 d612c58f0a75fb63f23a4e89d5eed3feda78617a3cdad0c0ee0c44184fbd36cf1cb99c59b94f737dee2588ef8dbf6ead05b94c584dbdd4acd9fdc1fd59c8cac1 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-range/vcpkg.json b/externals/vcpkg/ports/boost-range/vcpkg.json new file mode 100755 index 000000000..2c147e12f --- /dev/null +++ b/externals/vcpkg/ports/boost-range/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "boost-range", + "version": "1.79.0", + "description": "Boost range module", + "homepage": "https://github.com/boostorg/range", + "license": "BSL-1.0", + "dependencies": [ + "boost-array", + "boost-assert", + "boost-concept-check", + "boost-config", + "boost-container-hash", + "boost-conversion", + "boost-core", + "boost-detail", + "boost-iterator", + "boost-mpl", + "boost-optional", + "boost-preprocessor", + "boost-regex", + "boost-static-assert", + "boost-tuple", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-ratio/portfile.cmake b/externals/vcpkg/ports/boost-ratio/portfile.cmake new file mode 100755 index 000000000..90df48714 --- /dev/null +++ b/externals/vcpkg/ports/boost-ratio/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/ratio + REF boost-1.79.0 + SHA512 d3053b442cf2a00f0644d1f0ef438c6d2745edab3a6b0efe885e656c2072acbb09b69155bf7bf62a239820eddcecbb93be63c66864915a76bd169ec5916cdf7c + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-ratio/vcpkg.json b/externals/vcpkg/ports/boost-ratio/vcpkg.json new file mode 100755 index 000000000..a31509b11 --- /dev/null +++ b/externals/vcpkg/ports/boost-ratio/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "boost-ratio", + "version": "1.79.0", + "description": "Boost ratio module", + "homepage": "https://github.com/boostorg/ratio", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-core", + "boost-integer", + "boost-mpl", + "boost-rational", + "boost-static-assert", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-rational/portfile.cmake b/externals/vcpkg/ports/boost-rational/portfile.cmake new file mode 100755 index 000000000..bdc00bcd7 --- /dev/null +++ b/externals/vcpkg/ports/boost-rational/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/rational + REF boost-1.79.0 + SHA512 9192f72442d5b7037a0386cce26d412e6f576eb6352f259bd626ebeace472037a2363be235e1f1675f4fa5ab41212eca58045a584e81c36782b77d6965032106 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-rational/vcpkg.json b/externals/vcpkg/ports/boost-rational/vcpkg.json new file mode 100755 index 000000000..d6742887f --- /dev/null +++ b/externals/vcpkg/ports/boost-rational/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "boost-rational", + "version": "1.79.0", + "description": "Boost rational module", + "homepage": "https://github.com/boostorg/rational", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + "boost-integer", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-regex/b2-options.cmake b/externals/vcpkg/ports/boost-regex/b2-options.cmake new file mode 100755 index 000000000..ecbbcf974 --- /dev/null +++ b/externals/vcpkg/ports/boost-regex/b2-options.cmake @@ -0,0 +1,6 @@ +if("icu" IN_LIST FEATURES) + set(B2_REQUIREMENTS "/user-config//icuuc /user-config//icudt /user-config//icuin BOOST_HAS_ICU=1") + if(APPLE) + list(APPEND B2_OPTIONS cxxstd=11) + endif() +endif() diff --git a/externals/vcpkg/ports/boost-regex/portfile.cmake b/externals/vcpkg/ports/boost-regex/portfile.cmake new file mode 100755 index 000000000..aee64fd7c --- /dev/null +++ b/externals/vcpkg/ports/boost-regex/portfile.cmake @@ -0,0 +1,17 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/regex + REF boost-1.79.0 + SHA512 69cb333d35c81e24ec98e0d0498313bfb25429dadc8ded693b9fe8cf1fcfec489e3c3ccbc0b68971d5d7c1f50c29167fd85ca464ddadb64a7798b914f51d35c3 + HEAD_REF master +) + +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build( + SOURCE_PATH ${SOURCE_PATH} + BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake" +) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-regex/vcpkg.json b/externals/vcpkg/ports/boost-regex/vcpkg.json new file mode 100755 index 000000000..22e24b794 --- /dev/null +++ b/externals/vcpkg/ports/boost-regex/vcpkg.json @@ -0,0 +1,42 @@ +{ + "name": "boost-regex", + "version": "1.79.0", + "description": "Boost regex module", + "homepage": "https://github.com/boostorg/regex", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + { + "name": "boost-build", + "host": true + }, + "boost-concept-check", + "boost-config", + "boost-container-hash", + "boost-core", + "boost-integer", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-mpl", + "boost-predef", + "boost-smart-ptr", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "icu": { + "description": "ICU backend for Boost.Regex", + "dependencies": [ + "icu" + ] + } + } +} diff --git a/externals/vcpkg/ports/boost-safe-numerics/portfile.cmake b/externals/vcpkg/ports/boost-safe-numerics/portfile.cmake new file mode 100755 index 000000000..14b6290f5 --- /dev/null +++ b/externals/vcpkg/ports/boost-safe-numerics/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/safe_numerics + REF boost-1.79.0 + SHA512 54b9c3e3b1e7f58bf76fc332a6090dde800cfa3367a7a3848716815fba07ac7c03694e804af1665d0eeb0b096613bc40a937f81076eac73305f3c58ace9df3dc + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-safe-numerics/vcpkg.json b/externals/vcpkg/ports/boost-safe-numerics/vcpkg.json new file mode 100755 index 000000000..f51473f65 --- /dev/null +++ b/externals/vcpkg/ports/boost-safe-numerics/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "boost-safe-numerics", + "version": "1.79.0", + "description": "Boost safe_numerics module", + "homepage": "https://github.com/boostorg/safe_numerics", + "license": "BSL-1.0", + "dependencies": [ + "boost-concept-check", + "boost-config", + "boost-core", + "boost-integer", + "boost-logic", + "boost-mp11", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-scope-exit/portfile.cmake b/externals/vcpkg/ports/boost-scope-exit/portfile.cmake new file mode 100755 index 000000000..67856a860 --- /dev/null +++ b/externals/vcpkg/ports/boost-scope-exit/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/scope_exit + REF boost-1.79.0 + SHA512 92b4fac0a73455baede0625f5b56c8015e86ec61f90722b5ddb6c94a52f8a329ffd979d51e287b5a916f0e003cecd2bf6d6f246306499b423d98d4f652acc7f6 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-scope-exit/vcpkg.json b/externals/vcpkg/ports/boost-scope-exit/vcpkg.json new file mode 100755 index 000000000..f4e7b14c3 --- /dev/null +++ b/externals/vcpkg/ports/boost-scope-exit/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "boost-scope-exit", + "version": "1.79.0", + "description": "Boost scope_exit module", + "homepage": "https://github.com/boostorg/scope_exit", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-function", + "boost-preprocessor", + "boost-type-traits", + "boost-typeof", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-serialization/portfile.cmake b/externals/vcpkg/ports/boost-serialization/portfile.cmake new file mode 100755 index 000000000..36d25f30b --- /dev/null +++ b/externals/vcpkg/ports/boost-serialization/portfile.cmake @@ -0,0 +1,14 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/serialization + REF boost-1.79.0 + SHA512 d2b7039a25898d08ff586b1ce25183412defbfe6e6a7b6427ac54553de88ca079c1c15b92d34c9e76390692a22bc8b7821a53efc6eeb01a6520d4ce1d2fd675a + HEAD_REF master +) + +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-serialization/vcpkg.json b/externals/vcpkg/ports/boost-serialization/vcpkg.json new file mode 100755 index 000000000..c48ad725b --- /dev/null +++ b/externals/vcpkg/ports/boost-serialization/vcpkg.json @@ -0,0 +1,43 @@ +{ + "name": "boost-serialization", + "version": "1.79.0", + "description": "Boost serialization module", + "homepage": "https://github.com/boostorg/serialization", + "license": "BSL-1.0", + "dependencies": [ + "boost-array", + "boost-assert", + { + "name": "boost-build", + "host": true + }, + "boost-config", + "boost-core", + "boost-detail", + "boost-function", + "boost-integer", + "boost-io", + "boost-iterator", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-move", + "boost-mpl", + "boost-optional", + "boost-predef", + "boost-preprocessor", + "boost-smart-ptr", + "boost-spirit", + "boost-static-assert", + "boost-type-traits", + "boost-unordered", + "boost-utility", + "boost-variant", + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-signals2/portfile.cmake b/externals/vcpkg/ports/boost-signals2/portfile.cmake new file mode 100755 index 000000000..94ed6db0f --- /dev/null +++ b/externals/vcpkg/ports/boost-signals2/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/signals2 + REF boost-1.79.0 + SHA512 95739f7eb98c5e9fa5c7fb02d076239dc2f2fb3849b01a22298c06ae4454775f6b78b5c9739a5065d4a1e2ee30e771e5b3c1f3e567c4d76969281c5702ab2a50 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-signals2/vcpkg.json b/externals/vcpkg/ports/boost-signals2/vcpkg.json new file mode 100755 index 000000000..c5262128b --- /dev/null +++ b/externals/vcpkg/ports/boost-signals2/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "boost-signals2", + "version": "1.79.0", + "description": "Boost signals2 module", + "homepage": "https://github.com/boostorg/signals2", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-bind", + "boost-config", + "boost-core", + "boost-function", + "boost-iterator", + "boost-mpl", + "boost-optional", + "boost-parameter", + "boost-predef", + "boost-preprocessor", + "boost-smart-ptr", + "boost-throw-exception", + "boost-tuple", + "boost-type-traits", + "boost-variant", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-smart-ptr/portfile.cmake b/externals/vcpkg/ports/boost-smart-ptr/portfile.cmake new file mode 100755 index 000000000..a44474b4e --- /dev/null +++ b/externals/vcpkg/ports/boost-smart-ptr/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/smart_ptr + REF boost-1.79.0 + SHA512 fe39bf66b08e19fee5210969c5d71e9195b30003a48941c1002d718a2ab8972ff811302163d924efae54304f044e74aebd6a69894796dcfc03b09b10347e6fd2 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-smart-ptr/vcpkg.json b/externals/vcpkg/ports/boost-smart-ptr/vcpkg.json new file mode 100755 index 000000000..9faa1eef0 --- /dev/null +++ b/externals/vcpkg/ports/boost-smart-ptr/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "boost-smart-ptr", + "version": "1.79.0", + "description": "Boost smart_ptr module", + "homepage": "https://github.com/boostorg/smart_ptr", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + "boost-move", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-sort/portfile.cmake b/externals/vcpkg/ports/boost-sort/portfile.cmake new file mode 100755 index 000000000..3aa47ece1 --- /dev/null +++ b/externals/vcpkg/ports/boost-sort/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/sort + REF boost-1.79.0 + SHA512 779f1e7d78baa1147af8cdbcd5aa38576c8977ce5e17ea69b38028c6ed3366812875bcea7702e3efa3c6b55c941a4993ae68ec576a0775a61da0a101356632ef + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-sort/vcpkg.json b/externals/vcpkg/ports/boost-sort/vcpkg.json new file mode 100755 index 000000000..dfcc21c6c --- /dev/null +++ b/externals/vcpkg/ports/boost-sort/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "boost-sort", + "version": "1.79.0", + "description": "Boost sort module", + "homepage": "https://github.com/boostorg/sort", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-core", + "boost-range", + "boost-static-assert", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-spirit/portfile.cmake b/externals/vcpkg/ports/boost-spirit/portfile.cmake new file mode 100755 index 000000000..3a5f1e373 --- /dev/null +++ b/externals/vcpkg/ports/boost-spirit/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/spirit + REF boost-1.79.0 + SHA512 6b1c5c0995493039d6c1c0de175300813cbf67f8e347e886c0ded7432fdbdd90faa59d429c313bdcdd2afdbebbdc18d9f3302090e9915db949624f83fa8ce1a2 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-spirit/vcpkg.json b/externals/vcpkg/ports/boost-spirit/vcpkg.json new file mode 100755 index 000000000..b5ccd4fa7 --- /dev/null +++ b/externals/vcpkg/ports/boost-spirit/vcpkg.json @@ -0,0 +1,39 @@ +{ + "name": "boost-spirit", + "version": "1.79.0", + "description": "Boost spirit module", + "homepage": "https://github.com/boostorg/spirit", + "license": "BSL-1.0", + "dependencies": [ + "boost-array", + "boost-assert", + "boost-config", + "boost-core", + "boost-endian", + "boost-function", + "boost-function-types", + "boost-fusion", + "boost-integer", + "boost-io", + "boost-iterator", + "boost-move", + "boost-mpl", + "boost-optional", + "boost-phoenix", + "boost-pool", + "boost-preprocessor", + "boost-proto", + "boost-range", + "boost-regex", + "boost-smart-ptr", + "boost-static-assert", + "boost-thread", + "boost-throw-exception", + "boost-type-traits", + "boost-typeof", + "boost-unordered", + "boost-utility", + "boost-variant", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-stacktrace/portfile.cmake b/externals/vcpkg/ports/boost-stacktrace/portfile.cmake new file mode 100755 index 000000000..da5901bae --- /dev/null +++ b/externals/vcpkg/ports/boost-stacktrace/portfile.cmake @@ -0,0 +1,14 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/stacktrace + REF boost-1.79.0 + SHA512 d4816c160c0daf50ce1d864aba8be6e5216b356d76d2b2b5a4952e37aad557f1b4e59c1e7198c4616f3a5d3e92fc59b2405097b9ab4b6ff769dac0ba30cc3621 + HEAD_REF master +) + +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-stacktrace/vcpkg.json b/externals/vcpkg/ports/boost-stacktrace/vcpkg.json new file mode 100755 index 000000000..28cfb42ad --- /dev/null +++ b/externals/vcpkg/ports/boost-stacktrace/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "boost-stacktrace", + "version": "1.79.0", + "description": "Boost stacktrace module", + "homepage": "https://github.com/boostorg/stacktrace", + "license": "BSL-1.0", + "supports": "!uwp", + "dependencies": [ + "boost-array", + { + "name": "boost-build", + "host": true + }, + "boost-config", + "boost-container-hash", + "boost-core", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-predef", + "boost-static-assert", + "boost-type-traits", + "boost-vcpkg-helpers", + "boost-winapi", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-statechart/portfile.cmake b/externals/vcpkg/ports/boost-statechart/portfile.cmake new file mode 100755 index 000000000..54ec52406 --- /dev/null +++ b/externals/vcpkg/ports/boost-statechart/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/statechart + REF boost-1.79.0 + SHA512 db28105e06764987a3adcd2e5a30ef8803b862a4d1176da58f4950c10f4c06c174de9d8157c3bcaaa1cad81fbbed03f85309f2bb733ca177e12dd9cf59dc6eb5 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-statechart/vcpkg.json b/externals/vcpkg/ports/boost-statechart/vcpkg.json new file mode 100755 index 000000000..386576954 --- /dev/null +++ b/externals/vcpkg/ports/boost-statechart/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "boost-statechart", + "version": "1.79.0", + "description": "Boost statechart module", + "homepage": "https://github.com/boostorg/statechart", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-bind", + "boost-config", + "boost-conversion", + "boost-core", + "boost-detail", + "boost-function", + "boost-mpl", + "boost-smart-ptr", + "boost-static-assert", + "boost-thread", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-static-assert/portfile.cmake b/externals/vcpkg/ports/boost-static-assert/portfile.cmake new file mode 100755 index 000000000..6e9b3d0b1 --- /dev/null +++ b/externals/vcpkg/ports/boost-static-assert/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/static_assert + REF boost-1.79.0 + SHA512 3b0a26ec1ac9887610ebe68820c05324e1ac7a8ebff46333577b0d6571a512ffdccffc24124fa90f8cdf322bac8a66d4da523c8a872b0ff6e149fab4e921bdd3 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-static-assert/vcpkg.json b/externals/vcpkg/ports/boost-static-assert/vcpkg.json new file mode 100755 index 000000000..6546cf01c --- /dev/null +++ b/externals/vcpkg/ports/boost-static-assert/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "boost-static-assert", + "version": "1.79.0", + "description": "Boost static_assert module", + "homepage": "https://github.com/boostorg/static_assert", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-static-string/portfile.cmake b/externals/vcpkg/ports/boost-static-string/portfile.cmake new file mode 100755 index 000000000..4c9acceea --- /dev/null +++ b/externals/vcpkg/ports/boost-static-string/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/static_string + REF boost-1.79.0 + SHA512 bd94db596a4a8e4cdd1aca52fe75dbe46cd1242e67edee5f5fe236d39cb3368db7268ce9de6be5686da5fa19105c82616a3569b27c5c2e9974db9d18df73a8a7 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-static-string/vcpkg.json b/externals/vcpkg/ports/boost-static-string/vcpkg.json new file mode 100755 index 000000000..05c1baa5f --- /dev/null +++ b/externals/vcpkg/ports/boost-static-string/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "boost-static-string", + "version": "1.79.0", + "description": "Boost static_string module", + "homepage": "https://github.com/boostorg/static_string", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-container-hash", + "boost-static-assert", + "boost-throw-exception", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-stl-interfaces/portfile.cmake b/externals/vcpkg/ports/boost-stl-interfaces/portfile.cmake new file mode 100755 index 000000000..c6fc4875d --- /dev/null +++ b/externals/vcpkg/ports/boost-stl-interfaces/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/stl_interfaces + REF boost-1.79.0 + SHA512 e41e0465144ea65d10524f560a90b3a0ad1c60af8f5b679aba7e1bb12a09fccf9a4e271d6e1f6eff02ce7c444a21a8b9ea38709c5c6836ed4d7a35659756b0b8 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-stl-interfaces/vcpkg.json b/externals/vcpkg/ports/boost-stl-interfaces/vcpkg.json new file mode 100755 index 000000000..20b06ad49 --- /dev/null +++ b/externals/vcpkg/ports/boost-stl-interfaces/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "boost-stl-interfaces", + "version": "1.79.0", + "description": "Boost stl_interfaces module", + "homepage": "https://github.com/boostorg/stl_interfaces", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-system/portfile.cmake b/externals/vcpkg/ports/boost-system/portfile.cmake new file mode 100755 index 000000000..3b3a37f1b --- /dev/null +++ b/externals/vcpkg/ports/boost-system/portfile.cmake @@ -0,0 +1,16 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_buildpath_length_warning(37) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/system + REF boost-1.79.0 + SHA512 785aa2efff0c1e507ceb32a0d7f0c1034960ab5a87ebe45cf4acb5020d8cfcaa810ab3218d06e783ff7cafe661630fc67373d649865c6c0603b2be0c05b09b04 + HEAD_REF master +) + +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-system/vcpkg.json b/externals/vcpkg/ports/boost-system/vcpkg.json new file mode 100755 index 000000000..df081b0f2 --- /dev/null +++ b/externals/vcpkg/ports/boost-system/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "boost-system", + "version": "1.79.0", + "description": "Boost system module", + "homepage": "https://github.com/boostorg/system", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + { + "name": "boost-build", + "host": true + }, + "boost-config", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-throw-exception", + "boost-variant2", + "boost-vcpkg-helpers", + "boost-winapi", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-test/portfile.cmake b/externals/vcpkg/ports/boost-test/portfile.cmake new file mode 100755 index 000000000..80ef29269 --- /dev/null +++ b/externals/vcpkg/ports/boost-test/portfile.cmake @@ -0,0 +1,33 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/test + REF boost-1.79.0 + SHA512 040eb3137f5842e65a4a607417410d09a118baf1f92645974ba65e9dae4d6b6e727f28954d1733a96a83978da8d742d050c7ffc3013afa5d936efc47841547b9 + HEAD_REF master +) + +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../predef/check/predef" + "import ../predef/check/predef" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-predef/check" DESTINATION "${SOURCE_PATH}/predef") +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) + file(GLOB MONITOR_LIBS ${CURRENT_PACKAGES_DIR}/lib/*_exec_monitor*) + file(COPY ${MONITOR_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link) + file(REMOVE ${MONITOR_LIBS}) +endif() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) + file(GLOB DEBUG_MONITOR_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/*_exec_monitor*) + file(COPY ${DEBUG_MONITOR_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) + file(REMOVE ${DEBUG_MONITOR_LIBS}) +endif() + diff --git a/externals/vcpkg/ports/boost-test/vcpkg.json b/externals/vcpkg/ports/boost-test/vcpkg.json new file mode 100755 index 000000000..323c0c08e --- /dev/null +++ b/externals/vcpkg/ports/boost-test/vcpkg.json @@ -0,0 +1,41 @@ +{ + "name": "boost-test", + "version": "1.79.0", + "description": "Boost test module", + "homepage": "https://github.com/boostorg/test", + "license": "BSL-1.0", + "supports": "!uwp", + "dependencies": [ + "boost-algorithm", + "boost-assert", + "boost-bind", + { + "name": "boost-build", + "host": true + }, + "boost-config", + "boost-core", + "boost-detail", + "boost-exception", + "boost-function", + "boost-io", + "boost-iterator", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-mpl", + "boost-numeric-conversion", + "boost-optional", + "boost-preprocessor", + "boost-smart-ptr", + "boost-static-assert", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-thread/b2-options.cmake b/externals/vcpkg/ports/boost-thread/b2-options.cmake new file mode 100755 index 000000000..198b23084 --- /dev/null +++ b/externals/vcpkg/ports/boost-thread/b2-options.cmake @@ -0,0 +1,2 @@ +set(B2_REQUIREMENTS "/boost/date_time//boost_date_time") +list(APPEND B2_OPTIONS /boost/thread//boost_thread) diff --git a/externals/vcpkg/ports/boost-thread/portfile.cmake b/externals/vcpkg/ports/boost-thread/portfile.cmake new file mode 100755 index 000000000..51a707590 --- /dev/null +++ b/externals/vcpkg/ports/boost-thread/portfile.cmake @@ -0,0 +1,17 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/thread + REF boost-1.79.0 + SHA512 96003963e8d24d5436cf093b89367a0ae979fc0f2860af0cd7819976261987559002b68b7fb17030eb635622609324148a127beb2e462079fe17b5a983550111 + HEAD_REF master +) + +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build( + SOURCE_PATH ${SOURCE_PATH} + BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake" +) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-thread/vcpkg.json b/externals/vcpkg/ports/boost-thread/vcpkg.json new file mode 100755 index 000000000..7b0317dc3 --- /dev/null +++ b/externals/vcpkg/ports/boost-thread/vcpkg.json @@ -0,0 +1,51 @@ +{ + "name": "boost-thread", + "version": "1.79.0", + "description": "Boost thread module", + "homepage": "https://github.com/boostorg/thread", + "license": "BSL-1.0", + "dependencies": [ + "boost-algorithm", + "boost-assert", + "boost-atomic", + "boost-bind", + { + "name": "boost-build", + "host": true + }, + "boost-chrono", + "boost-concept-check", + "boost-config", + "boost-container", + "boost-container-hash", + "boost-core", + "boost-date-time", + "boost-exception", + "boost-function", + "boost-intrusive", + "boost-io", + "boost-iterator", + "boost-lexical-cast", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-move", + "boost-optional", + "boost-predef", + "boost-preprocessor", + "boost-smart-ptr", + "boost-static-assert", + "boost-system", + "boost-throw-exception", + "boost-tuple", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers", + "boost-winapi", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-throw-exception/portfile.cmake b/externals/vcpkg/ports/boost-throw-exception/portfile.cmake new file mode 100755 index 000000000..ad9650a61 --- /dev/null +++ b/externals/vcpkg/ports/boost-throw-exception/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/throw_exception + REF boost-1.79.0 + SHA512 b8c278d9a77ac3ac86d810dbd242a7abeeba66283bfebb66e191aa24ba94672344cf1473fddb9d143fcda8a95cac3020693ba6c7e798cf27593bcbd179ddb50f + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-throw-exception/vcpkg.json b/externals/vcpkg/ports/boost-throw-exception/vcpkg.json new file mode 100755 index 000000000..9a7979d88 --- /dev/null +++ b/externals/vcpkg/ports/boost-throw-exception/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "boost-throw-exception", + "version": "1.79.0", + "description": "Boost throw_exception module", + "homepage": "https://github.com/boostorg/throw_exception", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-timer/portfile.cmake b/externals/vcpkg/ports/boost-timer/portfile.cmake new file mode 100755 index 000000000..a0d42b3ad --- /dev/null +++ b/externals/vcpkg/ports/boost-timer/portfile.cmake @@ -0,0 +1,14 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/timer + REF boost-1.79.0 + SHA512 525f69db7b710a5d3f39b7c161e8ca60a72e48a17ccf0e31522cb5a0ddeac8ea03d9a41122b6ac25e8fbe11e28f563d8b52b7cd10817ff80bef597fe91860fe5 + HEAD_REF master +) + +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-timer/vcpkg.json b/externals/vcpkg/ports/boost-timer/vcpkg.json new file mode 100755 index 000000000..1155fb2c8 --- /dev/null +++ b/externals/vcpkg/ports/boost-timer/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "boost-timer", + "version": "1.79.0", + "description": "Boost timer module", + "homepage": "https://github.com/boostorg/timer", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "boost-build", + "host": true + }, + "boost-chrono", + "boost-config", + "boost-core", + "boost-io", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-predef", + "boost-system", + "boost-throw-exception", + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-tokenizer/portfile.cmake b/externals/vcpkg/ports/boost-tokenizer/portfile.cmake new file mode 100755 index 000000000..157c44291 --- /dev/null +++ b/externals/vcpkg/ports/boost-tokenizer/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/tokenizer + REF boost-1.79.0 + SHA512 001c9dbfc415aad9156b6d7aa9450d31cc7b02746eba5d089c9932bc99996473793996045c30f5e17c1e2ea6698ad56c0093ba420e3d7861387dacf69974a8b8 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-tokenizer/vcpkg.json b/externals/vcpkg/ports/boost-tokenizer/vcpkg.json new file mode 100755 index 000000000..ff833e5c6 --- /dev/null +++ b/externals/vcpkg/ports/boost-tokenizer/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "boost-tokenizer", + "version": "1.79.0", + "description": "Boost tokenizer module", + "homepage": "https://github.com/boostorg/tokenizer", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + "boost-iterator", + "boost-mpl", + "boost-throw-exception", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-tti/portfile.cmake b/externals/vcpkg/ports/boost-tti/portfile.cmake new file mode 100755 index 000000000..f1246ce5c --- /dev/null +++ b/externals/vcpkg/ports/boost-tti/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/tti + REF boost-1.79.0 + SHA512 35c0be969efa9c3144efe4a9e903aacaa7469ec1f7319fd9ef8077e00e3b96557fa9a8aea5d77275cd59f7de434ccaaddbbf72c9f1c5634c98fe996144a24ec0 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-tti/vcpkg.json b/externals/vcpkg/ports/boost-tti/vcpkg.json new file mode 100755 index 000000000..aaf16ee59 --- /dev/null +++ b/externals/vcpkg/ports/boost-tti/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "boost-tti", + "version": "1.79.0", + "description": "Boost tti module", + "homepage": "https://github.com/boostorg/tti", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-function-types", + "boost-mpl", + "boost-preprocessor", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-tuple/portfile.cmake b/externals/vcpkg/ports/boost-tuple/portfile.cmake new file mode 100755 index 000000000..1e3c1b8fa --- /dev/null +++ b/externals/vcpkg/ports/boost-tuple/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/tuple + REF boost-1.79.0 + SHA512 ef121e99ca697dc9237e824871401d88cf3edbbc394897b58157b66de77feeea85f664e285d4c10c8a24ebbf8b4e1b361b1ff18cc9d764dc4a1b2eb06f17e3c9 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-tuple/vcpkg.json b/externals/vcpkg/ports/boost-tuple/vcpkg.json new file mode 100755 index 000000000..369df1352 --- /dev/null +++ b/externals/vcpkg/ports/boost-tuple/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "boost-tuple", + "version": "1.79.0", + "description": "Boost tuple module", + "homepage": "https://github.com/boostorg/tuple", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-core", + "boost-static-assert", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-type-erasure/portfile.cmake b/externals/vcpkg/ports/boost-type-erasure/portfile.cmake new file mode 100755 index 000000000..370219be6 --- /dev/null +++ b/externals/vcpkg/ports/boost-type-erasure/portfile.cmake @@ -0,0 +1,14 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/type_erasure + REF boost-1.79.0 + SHA512 6da75295b96a61064038c93cf30ac06670f1856e4c7ef0489a656dbcc8547e1ecf42b4e52dbd28f63e1547761af89a21fe953d7fdaf664d759d2b50aed7be7a5 + HEAD_REF master +) + +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-type-erasure/vcpkg.json b/externals/vcpkg/ports/boost-type-erasure/vcpkg.json new file mode 100755 index 000000000..af4fc252c --- /dev/null +++ b/externals/vcpkg/ports/boost-type-erasure/vcpkg.json @@ -0,0 +1,36 @@ +{ + "name": "boost-type-erasure", + "version": "1.79.0", + "description": "Boost type_erasure module", + "homepage": "https://github.com/boostorg/type_erasure", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + { + "name": "boost-build", + "host": true + }, + "boost-config", + "boost-core", + "boost-fusion", + "boost-iterator", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-mp11", + "boost-mpl", + "boost-preprocessor", + "boost-smart-ptr", + "boost-thread", + "boost-throw-exception", + "boost-type-traits", + "boost-typeof", + "boost-vcpkg-helpers", + "boost-vmd", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-type-index/portfile.cmake b/externals/vcpkg/ports/boost-type-index/portfile.cmake new file mode 100755 index 000000000..e526b0ef9 --- /dev/null +++ b/externals/vcpkg/ports/boost-type-index/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/type_index + REF boost-1.79.0 + SHA512 47c5375c0a719f8d60be8d4550b35050e925eb1cb3b6e7825f6a9b1e8269d9983cf879882e03e1b25142871609e2b213e0a6a1dbafd7e5c27c6f0bee8c6d1588 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-type-index/vcpkg.json b/externals/vcpkg/ports/boost-type-index/vcpkg.json new file mode 100755 index 000000000..6833f900c --- /dev/null +++ b/externals/vcpkg/ports/boost-type-index/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "boost-type-index", + "version": "1.79.0", + "description": "Boost type_index module", + "homepage": "https://github.com/boostorg/type_index", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-container-hash", + "boost-core", + "boost-preprocessor", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-type-traits/portfile.cmake b/externals/vcpkg/ports/boost-type-traits/portfile.cmake new file mode 100755 index 000000000..66749bd77 --- /dev/null +++ b/externals/vcpkg/ports/boost-type-traits/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/type_traits + REF boost-1.79.0 + SHA512 ab325e4db39849667d2ce4dd3d7e77175e51909be9825d0edc102ef1edf75298744e5351c8891851e1cbc939064d352808a21753a7db429585ec34587be7374f + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-type-traits/vcpkg.json b/externals/vcpkg/ports/boost-type-traits/vcpkg.json new file mode 100755 index 000000000..0d269a244 --- /dev/null +++ b/externals/vcpkg/ports/boost-type-traits/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "boost-type-traits", + "version": "1.79.0", + "description": "Boost type_traits module", + "homepage": "https://github.com/boostorg/type_traits", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-static-assert", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-typeof/portfile.cmake b/externals/vcpkg/ports/boost-typeof/portfile.cmake new file mode 100755 index 000000000..333a08f2e --- /dev/null +++ b/externals/vcpkg/ports/boost-typeof/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/typeof + REF boost-1.79.0 + SHA512 ba0cfecb8c4ed750c46a9803350cc9e3e5a9493ef8b5f528003128039d57b13c10ec24ec31fa3e8d3d97a39a1d2381515ff340a471354a9fc8551268ca34aec5 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-typeof/vcpkg.json b/externals/vcpkg/ports/boost-typeof/vcpkg.json new file mode 100755 index 000000000..cacb60dc8 --- /dev/null +++ b/externals/vcpkg/ports/boost-typeof/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "boost-typeof", + "version": "1.79.0", + "description": "Boost typeof module", + "homepage": "https://github.com/boostorg/typeof", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-preprocessor", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-ublas/portfile.cmake b/externals/vcpkg/ports/boost-ublas/portfile.cmake new file mode 100755 index 000000000..5cad78ae1 --- /dev/null +++ b/externals/vcpkg/ports/boost-ublas/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/ublas + REF boost-1.79.0 + SHA512 080ccf36bef22c72620f595b41e7bcaf9e900335ba662d5c605b03b710ce2ca0b64c9666b970331a2ecab870c3f8f14705defe7d7de57821b0f070a74ee89606 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-ublas/vcpkg.json b/externals/vcpkg/ports/boost-ublas/vcpkg.json new file mode 100755 index 000000000..2cb2c3fb2 --- /dev/null +++ b/externals/vcpkg/ports/boost-ublas/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "boost-ublas", + "version": "1.79.0", + "description": "Boost ublas module", + "homepage": "https://github.com/boostorg/ublas", + "license": "BSL-1.0", + "dependencies": [ + "boost-compute", + "boost-concept-check", + "boost-config", + "boost-core", + "boost-interval", + "boost-iterator", + "boost-mpl", + "boost-range", + "boost-serialization", + "boost-smart-ptr", + "boost-static-assert", + "boost-type-traits", + "boost-typeof", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-uninstall/portfile.cmake b/externals/vcpkg/ports/boost-uninstall/portfile.cmake new file mode 100755 index 000000000..07fa29731 --- /dev/null +++ b/externals/vcpkg/ports/boost-uninstall/portfile.cmake @@ -0,0 +1,6 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +message(STATUS "\nPlease use the following command when you need to remove all boost ports/components:\n\ + \"./vcpkg remove boost-uninstall:${TARGET_TRIPLET} --recurse\"\n") + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/boost/vcpkg-cmake-wrapper.cmake" @ONLY) \ No newline at end of file diff --git a/externals/vcpkg/ports/boost-uninstall/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/boost-uninstall/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..d3e5109b2 --- /dev/null +++ b/externals/vcpkg/ports/boost-uninstall/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,11 @@ +set(Boost_USE_STATIC_LIBS OFF) +set(Boost_USE_MULTITHREADED ON) +unset(Boost_USE_STATIC_RUNTIME) +set(Boost_NO_BOOST_CMAKE ON) +unset(Boost_USE_STATIC_RUNTIME CACHE) +if("${CMAKE_VS_PLATFORM_TOOLSET}" STREQUAL "v120") + set(Boost_COMPILER "-vc120") +else() + set(Boost_COMPILER "-vc140") +endif() +_find_package(${ARGS}) \ No newline at end of file diff --git a/externals/vcpkg/ports/boost-uninstall/vcpkg.json b/externals/vcpkg/ports/boost-uninstall/vcpkg.json new file mode 100755 index 000000000..95ebab60f --- /dev/null +++ b/externals/vcpkg/ports/boost-uninstall/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "boost-uninstall", + "version": "1.79.0", + "description": "Internal vcpkg port used to uninstall Boost", + "license": "MIT" +} diff --git a/externals/vcpkg/ports/boost-units/portfile.cmake b/externals/vcpkg/ports/boost-units/portfile.cmake new file mode 100755 index 000000000..83cc9a0b2 --- /dev/null +++ b/externals/vcpkg/ports/boost-units/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/units + REF boost-1.79.0 + SHA512 babab18e42d3279f0a8705bb081e45c23d5bedff478145df453040f9b14b4619bd03702c2d6513a244846dcc8c4ebc401b014cbfef7d7c7a2208c9b184cf734f + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-units/vcpkg.json b/externals/vcpkg/ports/boost-units/vcpkg.json new file mode 100755 index 000000000..2b84fb167 --- /dev/null +++ b/externals/vcpkg/ports/boost-units/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "boost-units", + "version": "1.79.0", + "description": "Boost units module", + "homepage": "https://github.com/boostorg/units", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-core", + "boost-integer", + "boost-io", + "boost-lambda", + "boost-math", + "boost-mpl", + "boost-preprocessor", + "boost-static-assert", + "boost-type-traits", + "boost-typeof", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-unordered/portfile.cmake b/externals/vcpkg/ports/boost-unordered/portfile.cmake new file mode 100755 index 000000000..b0e57b01f --- /dev/null +++ b/externals/vcpkg/ports/boost-unordered/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/unordered + REF boost-1.79.0 + SHA512 2a4d3a0861c265cbd0fd9c366776d85a6204ab25383b924e4a596477f8d338aadcc5fd29c3dc4efc6b07ba3cd5c68deb3debc2a1ba6852d04fbf7e4910ac4ad6 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-unordered/vcpkg.json b/externals/vcpkg/ports/boost-unordered/vcpkg.json new file mode 100755 index 000000000..6b56be852 --- /dev/null +++ b/externals/vcpkg/ports/boost-unordered/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "boost-unordered", + "version": "1.79.0", + "description": "Boost unordered module", + "homepage": "https://github.com/boostorg/unordered", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-container-hash", + "boost-core", + "boost-detail", + "boost-move", + "boost-predef", + "boost-preprocessor", + "boost-throw-exception", + "boost-tuple", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-utility/portfile.cmake b/externals/vcpkg/ports/boost-utility/portfile.cmake new file mode 100755 index 000000000..116c900a8 --- /dev/null +++ b/externals/vcpkg/ports/boost-utility/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/utility + REF boost-1.79.0 + SHA512 f26aa277728231958a14b1d7522d72b7d511c419d72d08bd4df4fcd80d364f5abde98ad2f19e0fe2959524e0406e32c64bf6519d3f0a9d56ccab221b910a072e + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-utility/vcpkg.json b/externals/vcpkg/ports/boost-utility/vcpkg.json new file mode 100755 index 000000000..767088c97 --- /dev/null +++ b/externals/vcpkg/ports/boost-utility/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "boost-utility", + "version": "1.79.0", + "description": "Boost utility module", + "homepage": "https://github.com/boostorg/utility", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-core", + "boost-io", + "boost-preprocessor", + "boost-throw-exception", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-uuid/portfile.cmake b/externals/vcpkg/ports/boost-uuid/portfile.cmake new file mode 100755 index 000000000..0ca1a9eb0 --- /dev/null +++ b/externals/vcpkg/ports/boost-uuid/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/uuid + REF boost-1.79.0 + SHA512 52a78598f7120906b03a6ecacf9997926c4e7f0f9696138f25ff75956b012010be5c1f212fb498b064cd94b420182857a17a750558758d82dad4b44d1bbeba47 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-uuid/vcpkg.json b/externals/vcpkg/ports/boost-uuid/vcpkg.json new file mode 100755 index 000000000..22b368a89 --- /dev/null +++ b/externals/vcpkg/ports/boost-uuid/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "boost-uuid", + "version": "1.79.0", + "description": "Boost uuid module", + "homepage": "https://github.com/boostorg/uuid", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-container-hash", + "boost-core", + "boost-io", + "boost-move", + "boost-numeric-conversion", + "boost-predef", + "boost-random", + "boost-serialization", + "boost-static-assert", + "boost-throw-exception", + "boost-tti", + "boost-type-traits", + "boost-vcpkg-helpers", + "boost-winapi" + ] +} diff --git a/externals/vcpkg/ports/boost-variant/portfile.cmake b/externals/vcpkg/ports/boost-variant/portfile.cmake new file mode 100755 index 000000000..e4362294e --- /dev/null +++ b/externals/vcpkg/ports/boost-variant/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/variant + REF boost-1.79.0 + SHA512 e63699023a8d367fafd8197887bb12c998e25685db63c61ba06c32b628e55c7eca37692d95995875adfe47586bd79598e641ae284c585af10f050809f6118a38 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-variant/vcpkg.json b/externals/vcpkg/ports/boost-variant/vcpkg.json new file mode 100755 index 000000000..99b25d5bd --- /dev/null +++ b/externals/vcpkg/ports/boost-variant/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "boost-variant", + "version": "1.79.0", + "description": "Boost variant module", + "homepage": "https://github.com/boostorg/variant", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-bind", + "boost-config", + "boost-container-hash", + "boost-core", + "boost-detail", + "boost-integer", + "boost-move", + "boost-mpl", + "boost-preprocessor", + "boost-static-assert", + "boost-throw-exception", + "boost-type-index", + "boost-type-traits", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-variant2/portfile.cmake b/externals/vcpkg/ports/boost-variant2/portfile.cmake new file mode 100755 index 000000000..bfd98dfd8 --- /dev/null +++ b/externals/vcpkg/ports/boost-variant2/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/variant2 + REF boost-1.79.0 + SHA512 f4c2f2eaf9c285b747067aaa23ba9937d9bcaff1e1b9aaecdf347d0466775ebfe23aa36b16d1d70969604f81ba9762224cb59fe68c9e35d5a34f6184c7b92948 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-variant2/vcpkg.json b/externals/vcpkg/ports/boost-variant2/vcpkg.json new file mode 100755 index 000000000..fc6b8f5c0 --- /dev/null +++ b/externals/vcpkg/ports/boost-variant2/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "boost-variant2", + "version": "1.79.0", + "description": "Boost variant2 module", + "homepage": "https://github.com/boostorg/variant2", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-mp11", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-vcpkg-helpers/boost-modular-headers.cmake b/externals/vcpkg/ports/boost-vcpkg-helpers/boost-modular-headers.cmake new file mode 100755 index 000000000..6cb052392 --- /dev/null +++ b/externals/vcpkg/ports/boost-vcpkg-helpers/boost-modular-headers.cmake @@ -0,0 +1,20 @@ +function(boost_modular_headers) + cmake_parse_arguments(_bm "" "SOURCE_PATH" "" ${ARGN}) + + if(NOT DEFINED _bm_SOURCE_PATH) + message(FATAL_ERROR "SOURCE_PATH is a required argument to boost_modular_headers.") + endif() + + message(STATUS "Copying headers") + file( + COPY ${_bm_SOURCE_PATH}/include/boost + DESTINATION ${CURRENT_PACKAGES_DIR}/include + ) + message(STATUS "Copying headers done") + + file(INSTALL + ${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/usage + ${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/copyright + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + ) +endfunction() diff --git a/externals/vcpkg/ports/boost-vcpkg-helpers/portfile.cmake b/externals/vcpkg/ports/boost-vcpkg-helpers/portfile.cmake new file mode 100755 index 000000000..922531d12 --- /dev/null +++ b/externals/vcpkg/ports/boost-vcpkg-helpers/portfile.cmake @@ -0,0 +1,17 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(BOOST_VERSION 1.79.0) + +file(INSTALL + ${CMAKE_CURRENT_LIST_DIR}/boost-modular-headers.cmake + ${CMAKE_CURRENT_LIST_DIR}/usage + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} +) + +vcpkg_download_distfile(LICENSE + URLS "https://raw.githubusercontent.com/boostorg/boost/boost-${BOOST_VERSION}/LICENSE_1_0.txt" + FILENAME "boost_LICENSE_1_0.txt" + SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 +) + +file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/boost-vcpkg-helpers/usage b/externals/vcpkg/ports/boost-vcpkg-helpers/usage new file mode 100755 index 000000000..89a0376da --- /dev/null +++ b/externals/vcpkg/ports/boost-vcpkg-helpers/usage @@ -0,0 +1,4 @@ +The package boost is compatible with built-in CMake targets: + + find_package(Boost REQUIRED [COMPONENTS ...]) + target_link_libraries(main PRIVATE Boost::boost Boost:: Boost:: ...) diff --git a/externals/vcpkg/ports/boost-vcpkg-helpers/vcpkg.json b/externals/vcpkg/ports/boost-vcpkg-helpers/vcpkg.json new file mode 100755 index 000000000..121a55a4e --- /dev/null +++ b/externals/vcpkg/ports/boost-vcpkg-helpers/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "boost-vcpkg-helpers", + "version": "1.79.0", + "description": "Internal vcpkg port used to modularize Boost", + "license": "MIT", + "dependencies": [ + "boost-uninstall" + ] +} diff --git a/externals/vcpkg/ports/boost-vmd/portfile.cmake b/externals/vcpkg/ports/boost-vmd/portfile.cmake new file mode 100755 index 000000000..f36444d8e --- /dev/null +++ b/externals/vcpkg/ports/boost-vmd/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/vmd + REF boost-1.79.0 + SHA512 a224420e17b5dfc39d5928e35628b57aabba00619dfd17988345aae6595610253b518e35bdd04fcb286a2aa0627ca3c4bb8c2fb2260351865f81d7493ff19358 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-vmd/vcpkg.json b/externals/vcpkg/ports/boost-vmd/vcpkg.json new file mode 100755 index 000000000..fddb03b94 --- /dev/null +++ b/externals/vcpkg/ports/boost-vmd/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "boost-vmd", + "version": "1.79.0", + "description": "Boost vmd module", + "homepage": "https://github.com/boostorg/vmd", + "license": "BSL-1.0", + "dependencies": [ + "boost-preprocessor", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-wave/portfile.cmake b/externals/vcpkg/ports/boost-wave/portfile.cmake new file mode 100755 index 000000000..b9467a31d --- /dev/null +++ b/externals/vcpkg/ports/boost-wave/portfile.cmake @@ -0,0 +1,19 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/wave + REF boost-1.79.0 + SHA512 d573202b2eee3d2810c0cbbbffdb61dea957f8a4be33755a2e797fd23ae531a61a66a3b2cf1fa1d114781b72d280db8a45e350c437dc57d9bed1954c596a83c2 + HEAD_REF master +) + +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../config/checks/config" + "import ../config/checks/config" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-wave/vcpkg.json b/externals/vcpkg/ports/boost-wave/vcpkg.json new file mode 100755 index 000000000..cff18d82d --- /dev/null +++ b/externals/vcpkg/ports/boost-wave/vcpkg.json @@ -0,0 +1,45 @@ +{ + "name": "boost-wave", + "version": "1.79.0", + "description": "Boost wave module", + "homepage": "https://github.com/boostorg/wave", + "license": "BSL-1.0", + "supports": "!uwp", + "dependencies": [ + "boost-assert", + { + "name": "boost-build", + "host": true + }, + "boost-concept-check", + "boost-config", + "boost-core", + { + "name": "boost-filesystem", + "platform": "!uwp" + }, + "boost-format", + "boost-iterator", + "boost-lexical-cast", + { + "name": "boost-modular-build-helper", + "host": true + }, + "boost-mpl", + "boost-multi-index", + "boost-optional", + "boost-pool", + "boost-preprocessor", + "boost-serialization", + "boost-smart-ptr", + "boost-spirit", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/boost-winapi/portfile.cmake b/externals/vcpkg/ports/boost-winapi/portfile.cmake new file mode 100755 index 000000000..23948e33b --- /dev/null +++ b/externals/vcpkg/ports/boost-winapi/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/winapi + REF boost-1.79.0 + SHA512 c226df34607ee351715e66c28b2370aec12fa0df4505cd0e8ca3de96a61677ba86a662b292c4090b50fc28bb4629a64208155923393bb6b557dfef267e80db78 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-winapi/vcpkg.json b/externals/vcpkg/ports/boost-winapi/vcpkg.json new file mode 100755 index 000000000..96fc3a877 --- /dev/null +++ b/externals/vcpkg/ports/boost-winapi/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "boost-winapi", + "version": "1.79.0", + "description": "Boost winapi module", + "homepage": "https://github.com/boostorg/winapi", + "license": "BSL-1.0", + "dependencies": [ + "boost-config", + "boost-predef", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-xpressive/portfile.cmake b/externals/vcpkg/ports/boost-xpressive/portfile.cmake new file mode 100755 index 000000000..082e26372 --- /dev/null +++ b/externals/vcpkg/ports/boost-xpressive/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/xpressive + REF boost-1.79.0 + SHA512 b7d5504b99b9c3007a34a82cf4d8f061955b1c197a1eb7c9245166ece395c4620889e6e9b509fd0b7caff6d5d30bd36ee8eb928f6a069399845200785dd51b23 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-xpressive/vcpkg.json b/externals/vcpkg/ports/boost-xpressive/vcpkg.json new file mode 100755 index 000000000..de6691c04 --- /dev/null +++ b/externals/vcpkg/ports/boost-xpressive/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "boost-xpressive", + "version": "1.79.0", + "description": "Boost xpressive module", + "homepage": "https://github.com/boostorg/xpressive", + "license": "BSL-1.0", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-conversion", + "boost-core", + "boost-exception", + "boost-fusion", + "boost-integer", + "boost-iterator", + "boost-lexical-cast", + "boost-mpl", + "boost-numeric-conversion", + "boost-optional", + "boost-preprocessor", + "boost-proto", + "boost-range", + "boost-smart-ptr", + "boost-spirit", + "boost-static-assert", + "boost-throw-exception", + "boost-type-traits", + "boost-typeof", + "boost-utility", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost-yap/portfile.cmake b/externals/vcpkg/ports/boost-yap/portfile.cmake new file mode 100755 index 000000000..fe5d338f6 --- /dev/null +++ b/externals/vcpkg/ports/boost-yap/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/yap + REF boost-1.79.0 + SHA512 df10ca51af90cac70952f94265d09e14b499aa6d2c89977d93d202347bf497758229b98bad51e43b043957d7ae11801a2843aeb6f740f526adddda0a63404d1b + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/externals/vcpkg/ports/boost-yap/vcpkg.json b/externals/vcpkg/ports/boost-yap/vcpkg.json new file mode 100755 index 000000000..ad460bb2a --- /dev/null +++ b/externals/vcpkg/ports/boost-yap/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "boost-yap", + "version": "1.79.0", + "description": "Boost yap module", + "homepage": "https://github.com/boostorg/yap", + "license": "BSL-1.0", + "dependencies": [ + "boost-hana", + "boost-preprocessor", + "boost-type-index", + "boost-vcpkg-helpers" + ] +} diff --git a/externals/vcpkg/ports/boost/portfile.cmake b/externals/vcpkg/ports/boost/portfile.cmake new file mode 100755 index 000000000..065116c27 --- /dev/null +++ b/externals/vcpkg/ports/boost/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/boost/usage b/externals/vcpkg/ports/boost/usage new file mode 100755 index 000000000..28d429010 --- /dev/null +++ b/externals/vcpkg/ports/boost/usage @@ -0,0 +1,5 @@ +The package boost is compatible with built-in CMake targets: + + find_package(Boost REQUIRED [COMPONENTS ...]) + target_link_libraries(main PRIVATE ${Boost_LIBRARIES}) + target_include_directories(main PRIVATE ${Boost_INCLUDE_DIRS}) diff --git a/externals/vcpkg/ports/boost/vcpkg.json b/externals/vcpkg/ports/boost/vcpkg.json new file mode 100755 index 000000000..dd3c22765 --- /dev/null +++ b/externals/vcpkg/ports/boost/vcpkg.json @@ -0,0 +1,206 @@ +{ + "name": "boost", + "version": "1.79.0", + "description": "Peer-reviewed portable C++ source libraries", + "homepage": "https://boost.org", + "license": "BSL-1.0", + "dependencies": [ + "boost-accumulators", + "boost-algorithm", + "boost-align", + "boost-any", + "boost-array", + "boost-asio", + "boost-assert", + "boost-assign", + "boost-atomic", + { + "name": "boost-beast", + "platform": "!emscripten" + }, + "boost-bimap", + "boost-bind", + "boost-callable-traits", + "boost-chrono", + "boost-circular-buffer", + "boost-compatibility", + "boost-compute", + "boost-concept-check", + "boost-config", + "boost-container", + "boost-container-hash", + { + "name": "boost-context", + "platform": "!uwp & !emscripten" + }, + "boost-contract", + "boost-conversion", + "boost-convert", + "boost-core", + { + "name": "boost-coroutine", + "platform": "!arm & !uwp & !emscripten" + }, + { + "name": "boost-coroutine2", + "platform": "!emscripten" + }, + "boost-crc", + "boost-date-time", + "boost-describe", + "boost-detail", + "boost-dll", + "boost-dynamic-bitset", + "boost-endian", + "boost-exception", + { + "name": "boost-fiber", + "platform": "!osx & !uwp & !arm & !emscripten" + }, + { + "name": "boost-filesystem", + "platform": "!uwp" + }, + "boost-flyweight", + "boost-foreach", + "boost-format", + "boost-function", + "boost-function-types", + "boost-functional", + "boost-fusion", + "boost-geometry", + "boost-gil", + "boost-graph", + "boost-hana", + "boost-heap", + "boost-histogram", + "boost-hof", + "boost-icl", + "boost-integer", + "boost-interprocess", + "boost-interval", + "boost-intrusive", + "boost-io", + { + "name": "boost-iostreams", + "platform": "!uwp" + }, + "boost-iterator", + "boost-json", + "boost-lambda", + "boost-lambda2", + "boost-leaf", + "boost-lexical-cast", + "boost-local-function", + { + "name": "boost-locale", + "platform": "!uwp" + }, + "boost-lockfree", + { + "name": "boost-log", + "platform": "!uwp & !emscripten" + }, + "boost-logic", + "boost-math", + "boost-metaparse", + "boost-move", + "boost-mp11", + "boost-mpl", + "boost-msm", + "boost-multi-array", + "boost-multi-index", + "boost-multiprecision", + "boost-nowide", + "boost-numeric-conversion", + "boost-odeint", + "boost-optional", + "boost-outcome", + "boost-parameter", + { + "name": "boost-parameter-python", + "platform": "!emscripten" + }, + "boost-pfr", + "boost-phoenix", + "boost-poly-collection", + "boost-polygon", + "boost-pool", + "boost-predef", + "boost-preprocessor", + { + "name": "boost-process", + "platform": "!emscripten" + }, + "boost-program-options", + "boost-property-map", + "boost-property-tree", + "boost-proto", + "boost-ptr-container", + { + "name": "boost-python", + "platform": "!uwp & !emscripten & !ios & !android" + }, + "boost-qvm", + "boost-random", + "boost-range", + "boost-ratio", + "boost-rational", + "boost-regex", + "boost-safe-numerics", + "boost-scope-exit", + "boost-serialization", + "boost-signals2", + "boost-smart-ptr", + "boost-sort", + "boost-spirit", + { + "name": "boost-stacktrace", + "platform": "!uwp" + }, + "boost-statechart", + "boost-static-assert", + "boost-static-string", + "boost-stl-interfaces", + "boost-system", + { + "name": "boost-test", + "platform": "!uwp" + }, + "boost-thread", + "boost-throw-exception", + "boost-timer", + "boost-tokenizer", + "boost-tti", + "boost-tuple", + "boost-type-erasure", + "boost-type-index", + "boost-type-traits", + "boost-typeof", + "boost-ublas", + "boost-units", + "boost-unordered", + "boost-utility", + "boost-uuid", + "boost-variant", + "boost-variant2", + "boost-vmd", + { + "name": "boost-wave", + "platform": "!uwp" + }, + "boost-winapi", + "boost-xpressive", + "boost-yap" + ], + "features": { + "mpi": { + "description": "Build with MPI support", + "dependencies": [ + "boost-graph-parallel", + "boost-mpi", + "boost-property-map-parallel" + ] + } + } +} diff --git a/externals/vcpkg/ports/boringssl/0001-vcpkg.patch b/externals/vcpkg/ports/boringssl/0001-vcpkg.patch new file mode 100755 index 000000000..f871dd92b --- /dev/null +++ b/externals/vcpkg/ports/boringssl/0001-vcpkg.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 893bca7..83ff477 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -562,7 +562,7 @@ endif() + + # Add minimal googletest targets. The provided one has many side-effects, and + # googletest has a very straightforward build. +-add_library(boringssl_gtest third_party/googletest/src/gtest-all.cc) ++add_library(boringssl_gtest STATIC third_party/googletest/src/gtest-all.cc) + target_include_directories(boringssl_gtest PRIVATE third_party/googletest) + + include_directories(third_party/googletest/include) +@@ -649,3 +649,18 @@ add_custom_target( + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + DEPENDS all_tests bssl_shim handshaker fips_specific_tests_if_any + USES_TERMINAL) ++ ++install(TARGETS crypto ssl ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) ++ ++option(INSTALL_HEADERS "Install headers" ON) ++if(INSTALL_HEADERS) ++ install(DIRECTORY include/ DESTINATION include) ++endif() ++ ++option(INSTALL_TOOLS "Install bssl executable" OFF) ++if(INSTALL_TOOLS) ++ install(TARGETS bssl DESTINATION tools/boringssl) ++endif() diff --git a/externals/vcpkg/ports/boringssl/0002-remove-WX-Werror.patch b/externals/vcpkg/ports/boringssl/0002-remove-WX-Werror.patch new file mode 100755 index 000000000..c037b273a --- /dev/null +++ b/externals/vcpkg/ports/boringssl/0002-remove-WX-Werror.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 83ff477..3008c2a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -117,7 +117,7 @@ endif() + if(CMAKE_COMPILER_IS_GNUCXX OR CLANG) + # Note clang-cl is odd and sets both CLANG and MSVC. We base our configuration + # primarily on our normal Clang one. +- set(C_CXX_FLAGS "-Werror -Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla") ++ set(C_CXX_FLAGS "-Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla") + if(MSVC) + # clang-cl sets different default warnings than clang. It also treats -Wall + # as -Weverything, to match MSVC. Instead -W3 is the alias for -Wall. +@@ -238,8 +238,8 @@ elseif(MSVC) + ${MSVC_DISABLED_WARNINGS_LIST}) + string(REPLACE "C" " -w4" MSVC_LEVEL4_WARNINGS_STR + ${MSVC_LEVEL4_WARNINGS_LIST}) +- set(CMAKE_C_FLAGS "-utf-8 -Wall -WX ${MSVC_DISABLED_WARNINGS_STR} ${MSVC_LEVEL4_WARNINGS_STR}") +- set(CMAKE_CXX_FLAGS "-utf-8 -Wall -WX ${MSVC_DISABLED_WARNINGS_STR} ${MSVC_LEVEL4_WARNINGS_STR}") ++ set(CMAKE_C_FLAGS "-utf-8 -Wall ${MSVC_DISABLED_WARNINGS_STR} ${MSVC_LEVEL4_WARNINGS_STR}") ++ set(CMAKE_CXX_FLAGS "-utf-8 -Wall ${MSVC_DISABLED_WARNINGS_STR} ${MSVC_LEVEL4_WARNINGS_STR}") + endif() + + if(WIN32) diff --git a/externals/vcpkg/ports/boringssl/portfile.cmake b/externals/vcpkg/ports/boringssl/portfile.cmake new file mode 100755 index 000000000..be9ed1ee8 --- /dev/null +++ b/externals/vcpkg/ports/boringssl/portfile.cmake @@ -0,0 +1,48 @@ +if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h") + message(FATAL_ERROR "Can't build BoringSSL if OpenSSL is installed. Please remove OpenSSL, and try to install BoringSSL again if you need it. Build will continue since BoringSSL is a drop-in replacement for OpenSSL") +endif() + +vcpkg_find_acquire_program(PERL) +get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) +vcpkg_add_to_path(${PERL_EXE_PATH}) + +vcpkg_find_acquire_program(NASM) +get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) +vcpkg_add_to_path(${NASM_EXE_PATH}) + +vcpkg_find_acquire_program(GO) +get_filename_component(GO_EXE_PATH ${GO} DIRECTORY) +vcpkg_add_to_path(${GO_EXE_PATH}) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools INSTALL_TOOLS +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/boringssl + REF 479adf98d54a21c1d154aac59b2ce120e1d1a6d6 + SHA512 74b5d001c0f5c1846b8818e9e668fa35de5171fc21a8f713d241f57b3e8abe42426fdc66b085cca1853b904def6f4bea573dfed40b8b1422894cca85b0b1a44a + HEAD_REF master + PATCHES + 0001-vcpkg.patch + 0002-remove-WX-Werror.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + OPTIONS_DEBUG + -DINSTALL_HEADERS=OFF + -DINSTALL_TOOLS=OFF +) + +vcpkg_cmake_install() + +if(IS_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/boringssl) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/boringssl") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/boringssl/vcpkg.json b/externals/vcpkg/ports/boringssl/vcpkg.json new file mode 100755 index 000000000..9d0affcbb --- /dev/null +++ b/externals/vcpkg/ports/boringssl/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "boringssl", + "version-date": "2021-06-23", + "port-version": 2, + "description": "BoringSSl is a fork of OpenSSL developed by Google", + "homepage": "https://boringssl.googlesource.com/boringssl", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "tools": { + "description": "Build bssl executable" + } + } +} diff --git a/externals/vcpkg/ports/botan/embed-debug-info.patch b/externals/vcpkg/ports/botan/embed-debug-info.patch new file mode 100755 index 000000000..09a17202e --- /dev/null +++ b/externals/vcpkg/ports/botan/embed-debug-info.patch @@ -0,0 +1,17 @@ +diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt +index 2306a4485..977e2e958 100644 +--- a/src/build-data/cc/msvc.txt ++++ b/src/build-data/cc/msvc.txt +@@ -17,10 +17,10 @@ optimization_flags "/O2 /Oi" + size_optimization_flags "/O1 /Os" + + # for debug info in the object file: +-#debug_info_flags "/Z7" ++debug_info_flags "/Z7" + + # for using a PDB file: +-debug_info_flags "/Zi /FS" ++#debug_info_flags "/Zi /FS" + + preproc_flags "/nologo /EP" + diff --git a/externals/vcpkg/ports/botan/fix-generate-build-path.patch b/externals/vcpkg/ports/botan/fix-generate-build-path.patch new file mode 100755 index 000000000..455c1f139 --- /dev/null +++ b/externals/vcpkg/ports/botan/fix-generate-build-path.patch @@ -0,0 +1,13 @@ +diff --git a/configure.py b/configure.py +index 89f87d4..ba7914f 100644 +--- a/configure.py ++++ b/configure.py +@@ -2076,7 +2076,7 @@ def create_template_vars(source_paths, build_paths, options, modules, cc, arch, + 'maintainer_mode': options.maintainer_mode, + + 'out_dir': build_dir, +- 'build_dir': build_paths.build_dir, ++ 'build_dir': os.path.abspath(build_paths.build_dir), + + 'doc_stamp_file': os.path.join(build_paths.build_dir, 'doc.stamp'), + 'makefile_path': os.path.join(build_paths.build_dir, '..', 'Makefile'), diff --git a/externals/vcpkg/ports/botan/portfile.cmake b/externals/vcpkg/ports/botan/portfile.cmake new file mode 100755 index 000000000..dc8173601 --- /dev/null +++ b/externals/vcpkg/ports/botan/portfile.cmake @@ -0,0 +1,195 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO randombit/botan + REF fe62c1f5ce6c4379a52bd018c2ff68bed3024c4d # 2.19.1 + SHA512 09c5fdb3a05978373fb1512a7a9b5c3d89e6e103d7fe86a0e126c417117950c2a63559dc06e8a9c895c892e9fc3888d7ed97686e15d8c2fd941ddb629af0e5a0 + HEAD_REF master + PATCHES + fix-generate-build-path.patch + embed-debug-info.patch +) + +if(CMAKE_HOST_WIN32) + vcpkg_find_acquire_program(JOM) + set(build_tool "${JOM}") + set(parallel_build "/J${VCPKG_CONCURRENCY}") +else() + find_program(MAKE make) + set(build_tool "${MAKE}") + set(parallel_build "-j${VCPKG_CONCURRENCY}") +endif() + +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +set(ENV{PATH} "$ENV{PATH};${PYTHON3_DIR}") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(BOTAN_FLAG_SHARED --enable-shared-library) + set(BOTAN_FLAG_STATIC --disable-static-library) +else() + set(BOTAN_FLAG_SHARED --disable-shared-library) + set(BOTAN_FLAG_STATIC --enable-static-library) +endif() + +if(VCPKG_CRT_LINKAGE STREQUAL dynamic) + set(BOTAN_MSVC_RUNTIME "--msvc-runtime=MD") +else() + set(BOTAN_MSVC_RUNTIME "--msvc-runtime=MT") +endif() + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(BOTAN_FLAG_CPU x86) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(BOTAN_FLAG_CPU x86_64) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(BOTAN_FLAG_CPU arm32) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(BOTAN_FLAG_CPU arm64) +else() + message(FATAL_ERROR "Unsupported architecture") +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + amalgamation BOTAN_AMALGAMATION + zlib BOTAN_WITH_ZLIB +) + +function(BOTAN_BUILD BOTAN_BUILD_TYPE) + + if(BOTAN_BUILD_TYPE STREQUAL "dbg") + set(BOTAN_FLAG_PREFIX "${CURRENT_PACKAGES_DIR}/debug") + set(BOTAN_FLAG_DEBUGMODE --debug-mode) + set(BOTAN_DEBUG_SUFFIX "") + set(BOTAN_MSVC_RUNTIME_SUFFIX "d") + else() + set(BOTAN_FLAG_DEBUGMODE) + set(BOTAN_FLAG_PREFIX "${CURRENT_PACKAGES_DIR}") + set(BOTAN_MSVC_RUNTIME_SUFFIX "") + endif() + + message(STATUS "Configure ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}") + + if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}") + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}") + endif() + make_directory("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}") + + set(configure_arguments --cpu=${BOTAN_FLAG_CPU} + ${BOTAN_FLAG_SHARED} + ${BOTAN_FLAG_STATIC} + ${BOTAN_FLAG_DEBUGMODE} + "--distribution-info=vcpkg ${TARGET_TRIPLET}" + --prefix=${BOTAN_FLAG_PREFIX} + --with-pkg-config + --link-method=copy + --with-debug-info) + if(CMAKE_HOST_WIN32) + list(APPEND configure_arguments ${BOTAN_MSVC_RUNTIME}${BOTAN_MSVC_RUNTIME_SUFFIX}) + endif() + + if(VCPKG_CXX_FLAGS) + list(APPEND configure_arguments --extra-cxxflags ${VCPKG_CXX_FLAGS}) + endif() + + if("-DBOTAN_AMALGAMATION=ON" IN_LIST FEATURE_OPTIONS) + list(APPEND configure_arguments --amalgamation) + endif() + if("-DBOTAN_WITH_ZLIB=ON" IN_LIST FEATURE_OPTIONS) + list(APPEND configure_arguments --with-zlib) + list(APPEND configure_arguments --with-external-includedir="${CURRENT_INSTALLED_DIR}/include") + list(APPEND configure_arguments --with-external-libdir="${CURRENT_INSTALLED_DIR}/lib") + endif() + + vcpkg_execute_required_process( + COMMAND "${PYTHON3}" "${SOURCE_PATH}/configure.py" ${configure_arguments} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}" + LOGNAME configure-${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}) + message(STATUS "Configure ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE} done") + + message(STATUS "Build ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}") + vcpkg_execute_build_process( + COMMAND "${build_tool}" ${parallel_build} + NO_PARALLEL_COMMAND "${build_tool}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}" + LOGNAME build-${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}) + message(STATUS "Build ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE} done") + + message(STATUS "Package ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}") + vcpkg_execute_required_process( + COMMAND "${PYTHON3}" "${SOURCE_PATH}/src/scripts/install.py" + --prefix=${BOTAN_FLAG_PREFIX} + --bindir=${BOTAN_FLAG_PREFIX}/bin + --libdir=${BOTAN_FLAG_PREFIX}/lib + --pkgconfigdir=${BOTAN_FLAG_PREFIX}/lib + --includedir=${BOTAN_FLAG_PREFIX}/include + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}" + LOGNAME install-${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}) + + message(STATUS "Package ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE} done") +endfunction() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + BOTAN_BUILD(rel) +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + BOTAN_BUILD(dbg) +endif() + +file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-2/botan" "${CURRENT_PACKAGES_DIR}/include/botan") + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/botan-2.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/botan-2.pc") + if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/botan-2.pc" + [[\lib]] + [[/lib]] + ) + endif() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/botan-2.pc" + [[${prefix}/include/botan-2]] + [[${prefix}/include]] + ) +endif() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/botan-2.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/botan-2.pc") + if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/botan-2.pc" + [[\lib]] + [[/lib]] + ) + endif() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/botan-2.pc" + [[${prefix}/include/botan-2]] + [[${prefix}/include]] + ) +endif() +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() + +if(CMAKE_HOST_WIN32) + vcpkg_copy_tools(TOOL_NAMES botan-cli AUTO_CLEAN) +else() + vcpkg_copy_tools(TOOL_NAMES botan AUTO_CLEAN) +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/include/botan-2" + "${CURRENT_PACKAGES_DIR}/share/doc") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_PREFIX R\"(${CURRENT_PACKAGES_DIR})\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_LIB_DIR R\"(${CURRENT_PACKAGES_DIR}\\lib)\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_LIB_DIR R\"(${CURRENT_PACKAGES_DIR}/lib)\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "--prefix=${CURRENT_PACKAGES_DIR}" "") + +file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/botan/vcpkg.json b/externals/vcpkg/ports/botan/vcpkg.json new file mode 100755 index 000000000..f75b557be --- /dev/null +++ b/externals/vcpkg/ports/botan/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "botan", + "version": "2.19.1", + "description": "A cryptography library written in C++11", + "homepage": "https://botan.randombit.net", + "license": "BSD-2-Clause", + "supports": "!(windows & arm)", + "features": { + "amalgamation": { + "description": "Do an amalgamation build of the library" + }, + "zlib": { + "description": "Build with zlib. Enable compression pipes.", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/box2d/portfile.cmake b/externals/vcpkg/ports/box2d/portfile.cmake new file mode 100755 index 000000000..e209c85a3 --- /dev/null +++ b/externals/vcpkg/ports/box2d/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO erincatto/Box2D + REF 9ebbbcd960ad424e03e5de6e66a40764c16f51bc #v2.4.1 + SHA512 d9fa387ce893ed1fb73f80006491202f2624ef6d0fb37daf92fbd1a7f9071c84da45e4b418b333566435bbbdfd3d5f68a42dfca02416e9a3a2b4db039f1c6151 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBOX2D_BUILD_UNIT_TESTS=OFF + -DBOX2D_BUILD_TESTBED=OFF +) +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/box2d) + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/box2d/vcpkg.json b/externals/vcpkg/ports/box2d/vcpkg.json new file mode 100755 index 000000000..b1b4b1401 --- /dev/null +++ b/externals/vcpkg/ports/box2d/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "box2d", + "version-semver": "2.4.1", + "port-version": 2, + "description": "An open source C++ engine for simulating rigid bodies in 2D", + "homepage": "https://box2d.org", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/braft/export-target.patch b/externals/vcpkg/ports/braft/export-target.patch new file mode 100755 index 000000000..097a0570c --- /dev/null +++ b/externals/vcpkg/ports/braft/export-target.patch @@ -0,0 +1,48 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 78adc56..ff435a2 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -19,8 +19,10 @@ add_library(braft-static STATIC $) + endif() + + if (BUILD_SHARED_LIBS) ++target_include_directories(braft-shared PUBLIC $) + target_link_libraries(braft-shared PUBLIC ${DYNAMIC_LIB}) + else() ++target_include_directories(braft-static PUBLIC $) + target_link_libraries(braft-static PUBLIC ${DYNAMIC_LIB}) + endif() + +@@ -31,15 +33,30 @@ SET_TARGET_PROPERTIES(braft-shared PROPERTIES OUTPUT_NAME braft CLEAN_DIRECT_OUT + endif() + + if (NOT BUILD_SHARED_LIBS) +-install(TARGETS braft-static ++install(TARGETS braft-static EXPORT unofficial-braftTargets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIBSUFFIX} + ARCHIVE DESTINATION lib${LIBSUFFIX} + ) + else() +-install(TARGETS braft-shared ++install(TARGETS braft-shared EXPORT unofficial-braftTargets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIBSUFFIX} + ARCHIVE DESTINATION lib${LIBSUFFIX} + ) + endif() ++ ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-braft-config.cmake" ++[[include(CMakeFindDependencyMacro) ++find_dependency(gflags CONFIG) ++file(GLOB TARGET_FILES "${CMAKE_CURRENT_LIST_DIR}/unofficial-braftTargets.cmake") ++foreach (TARGET_FILE ${TARGET_FILES}) ++ include("${TARGET_FILE}") ++endforeach() ++]]) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-braft-config.cmake" DESTINATION share/unofficial-braft) ++ ++install(EXPORT unofficial-braftTargets ++ NAMESPACE unofficial::braft:: ++ DESTINATION share/unofficial-braft ++) diff --git a/externals/vcpkg/ports/braft/fix-build.patch b/externals/vcpkg/ports/braft/fix-build.patch new file mode 100755 index 000000000..1be7d3c97 --- /dev/null +++ b/externals/vcpkg/ports/braft/fix-build.patch @@ -0,0 +1,56 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a735c53..53ddaed 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -229,7 +229,9 @@ add_subdirectory(src) + if(BUILD_UNIT_TESTS) + add_subdirectory(test) + endif() ++if(BUILD_TOOLS) + add_subdirectory(tools) ++endif() + + file(COPY ${CMAKE_CURRENT_BINARY_DIR}/braft/ + DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/output/include/braft/ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index f587464..78adc56 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -12,22 +12,34 @@ include_directories(${CMAKE_SOURCE_DIR}/src) + add_library(OBJ_LIB OBJECT ${SOURCES}) + + set_property(TARGET ${OBJ_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1) ++if (BUILD_SHARED_LIBS) + add_library(braft-shared SHARED $) ++else() + add_library(braft-static STATIC $) +-target_link_libraries(braft-shared ${DYNAMIC_LIB}) +-target_link_libraries(braft-static ${DYNAMIC_LIB}) ++endif() ++ ++if (BUILD_SHARED_LIBS) ++target_link_libraries(braft-shared PUBLIC ${DYNAMIC_LIB}) ++else() ++target_link_libraries(braft-static PUBLIC ${DYNAMIC_LIB}) ++endif() + ++if (NOT BUILD_SHARED_LIBS) + SET_TARGET_PROPERTIES(braft-static PROPERTIES OUTPUT_NAME braft CLEAN_DIRECT_OUTPUT 1) ++else() + SET_TARGET_PROPERTIES(braft-shared PROPERTIES OUTPUT_NAME braft CLEAN_DIRECT_OUTPUT 1) ++endif() + ++if (NOT BUILD_SHARED_LIBS) + install(TARGETS braft-static + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIBSUFFIX} + ARCHIVE DESTINATION lib${LIBSUFFIX} + ) +- ++else() + install(TARGETS braft-shared + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIBSUFFIX} + ARCHIVE DESTINATION lib${LIBSUFFIX} + ) ++endif() diff --git a/externals/vcpkg/ports/braft/fix-dependency.patch b/externals/vcpkg/ports/braft/fix-dependency.patch new file mode 100755 index 000000000..b39ba03fa --- /dev/null +++ b/externals/vcpkg/ports/braft/fix-dependency.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 53ddaed..a851c00 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -47,8 +47,9 @@ if ((NOT LEVELDB_INCLUDE_PATH) OR (NOT LEVELDB_LIB)) + message(FATAL_ERROR "Fail to find leveldb") + endif() + +-find_path(GFLAGS_INCLUDE_PATH NAMES gflags/gflags.h) +-find_library(GFLAGS_LIB NAMES gflags) ++find_package(gflags CONFIG REQUIRED) ++get_target_property(GFLAGS_INCLUDE_PATH gflags::gflags INTERFACE_INCLUDE_DIRECTORIES) ++set(GFLAGS_LIB gflags::gflags) + if ((NOT GFLAGS_INCLUDE_PATH) OR (NOT GFLAGS_LIB)) + message(FATAL_ERROR "Fail to find gflags") + endif() diff --git a/externals/vcpkg/ports/braft/portfile.cmake b/externals/vcpkg/ports/braft/portfile.cmake new file mode 100755 index 000000000..c35fae993 --- /dev/null +++ b/externals/vcpkg/ports/braft/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO baidu/braft + REF 8d0128e02a2959f9cc427d5f97ed730ee6a6b410 + SHA512 f28afbf5fe8a354872c252580e2d679f7a66944a554f0c8e9331b8a68b6a87659d59fbbc41c3ada55e09a265032290bcef567c99a7428604d08f7885f97cf6d7 + HEAD_REF master + PATCHES + fix-build.patch + fix-dependency.patch + export-target.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBRPC_WITH_GLOG=ON + -DBUILD_TOOLS=OFF +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-braft CONFIG_PATH share/unofficial-braft) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/braft/vcpkg.json b/externals/vcpkg/ports/braft/vcpkg.json new file mode 100755 index 000000000..fc1294cab --- /dev/null +++ b/externals/vcpkg/ports/braft/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "braft", + "version-date": "2021-26-04", + "description": "Consesus algorithm library", + "homepage": "https://github.com/baidu/braft", + "license": "Apache-2.0", + "supports": "!windows", + "dependencies": [ + "brpc", + "gflags", + "glog", + "leveldb", + "protobuf", + "thrift", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/breakpad/CMakeLists.txt b/externals/vcpkg/ports/breakpad/CMakeLists.txt new file mode 100755 index 000000000..e7edf4b6b --- /dev/null +++ b/externals/vcpkg/ports/breakpad/CMakeLists.txt @@ -0,0 +1,137 @@ +cmake_minimum_required(VERSION 3.8) +project(breakpad CXX) + +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +add_definitions( + -DNOMINMAX + -DUNICODE + -DWIN32_LEAN_AND_MEAN + -D_CRT_SECURE_NO_WARNINGS + -D_CRT_SECURE_NO_DEPRECATE + -D_CRT_NONSTDC_NO_DEPRECATE +) + +set(CMAKE_DEBUG_POSTFIX d) + +string(COMPARE EQUAL "${CMAKE_BUILD_TYPE}" "Release" DEFAULT_INSTALL_HEADERS) +option(INSTALL_HEADERS "Install header files" ${DEFAULT_INSTALL_HEADERS}) + +# libbreakpad target +if(NOT CMAKE_SYSTEM_NAME STREQUAL Android) + file(GLOB_RECURSE LIBBREAKPAD_SOURCES src/processor/*.cc) + if(WIN32) + list(FILTER LIBBREAKPAD_SOURCES EXCLUDE REGEX + "_unittest|synth_minidump|/tests|/testdata|/linux|/mac|/android|/solaris|microdump_stackwalk|minidump_dump|minidump_stackwalk") + elseif(APPLE) + list(FILTER LIBBREAKPAD_SOURCES EXCLUDE REGEX + "_unittest|synth_minidump|/tests|/testdata|/linux|/windows|/android|/solaris|microdump_stackwalk|minidump_dump|minidump_stackwalk") + else() + list(FILTER LIBBREAKPAD_SOURCES EXCLUDE REGEX + "_unittest|synth_minidump|/tests|/testdata|/mac|/windows|/android|/solaris|microdump_stackwalk|minidump_dump|minidump_stackwalk") + endif() + + find_library(LIBDISASM_LIB NAMES libdisasmd libdisasm) + + add_library(libbreakpad ${LIBBREAKPAD_SOURCES}) + target_link_libraries(libbreakpad PRIVATE ${LIBDISASM_LIB}) + + target_include_directories(libbreakpad + PUBLIC + $ + $ + ) + + set(TARGETS libbreakpad) +endif() + +# libbreakpad_client target +if(CMAKE_SYSTEM_NAME STREQUAL Android) + file(READ "android/google_breakpad/Android.mk" android_mk) + string(REGEX MATCHALL "src/[^\n]*\\.cc" LIBBREAKPAD_CLIENT_SOURCES "${android_mk}") +else() + if(WIN32) + file(GLOB_RECURSE LIBBREAKPAD_CLIENT_SOURCES src/client/windows/*.cc src/common/windows/*.cc) + include_directories("$ENV{VSINSTALLDIR}/DIA SDK/include") + elseif(APPLE) + add_definitions(-DHAVE_MACH_O_NLIST_H) + file(GLOB_RECURSE LIBBREAKPAD_CLIENT_SOURCES src/client/mac/*.cc src/common/mac/*.cc) + list(APPEND LIBBREAKPAD_CLIENT_SOURCES src/common/mac/MachIPC.mm) + else() + add_definitions(-DHAVE_A_OUT_H) + file(GLOB_RECURSE LIBBREAKPAD_CLIENT_SOURCES src/client/linux/*.cc src/common/linux/*.cc) + endif() + file(GLOB LIBBREAKPAD_COMMON_SOURCES src/common/*.cc src/common/*.c src/client/*.cc) + list(APPEND LIBBREAKPAD_CLIENT_SOURCES ${LIBBREAKPAD_COMMON_SOURCES}) +endif() +list(FILTER LIBBREAKPAD_CLIENT_SOURCES EXCLUDE REGEX "/sender|/tests|/unittests|/testcases|_unittest|_test") +if(WIN32) + list(FILTER LIBBREAKPAD_CLIENT_SOURCES EXCLUDE REGEX "language.cc|path_helper.cc|stabs_to_module.cc|stabs_reader.cc|minidump_file_writer.cc") +elseif(NOT APPLE) + try_compile(HAVE_GETCONTEXT ${CMAKE_BINARY_DIR}/check_getcontext ${CMAKE_CURRENT_LIST_DIR}/check_getcontext.cc OUTPUT_VARIABLE BUILD_OUT) + if (NOT HAVE_GETCONTEXT) + enable_language(ASM) + list(APPEND LIBBREAKPAD_CLIENT_SOURCES src/common/linux/breakpad_getcontext.S) + endif() +endif() + +add_library(libbreakpad_client ${LIBBREAKPAD_CLIENT_SOURCES}) +if(WIN32) + target_link_libraries(libbreakpad_client PRIVATE wininet.lib) +elseif(APPLE) + find_library(CoreFoundation_FRAMEWORK CoreFoundation) + target_link_libraries(libbreakpad_client PRIVATE ${CoreFoundation_FRAMEWORK}) +else() + find_library(PTHREAD_LIBRARIES pthread) + if(PTHREAD_LIBRARIES) + target_link_libraries(libbreakpad_client PRIVATE ${PTHREAD_LIBRARIES}) + endif() + if (HAVE_GETCONTEXT) + target_compile_definitions(libbreakpad_client PRIVATE HAVE_GETCONTEXT=1) + endif() +endif() + +target_include_directories(libbreakpad_client + PUBLIC + $ + $ +) +list(APPEND TARGETS libbreakpad_client) + +# installation +install(TARGETS ${TARGETS} EXPORT unofficial-breakpad-targets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(INSTALL_HEADERS) + if(WIN32) + set(HEADER_EXCLUDE_REGEX "/apple|/ios|/linux|/mac|/solaris|/android|/dwarf|/tests|/testdata|/unittests") + elseif(APPLE) + set(HEADER_EXCLUDE_REGEX "/apple|/ios|/linux|/windows|/solaris|/android|/dwarf|/tests|/testdata|/unittests|/sender|/testapp|/*proj|/gcov") + else() + set(HEADER_EXCLUDE_REGEX "/apple|/ios|/windows|/mac|/solaris|/android|/dwarf|/tests|/testdata|/unittests") + install( + DIRECTORY src/third_party/lss + DESTINATION include/third_party + FILES_MATCHING PATTERN "*.h" + REGEX "${HEADER_EXCLUDE_REGEX}" EXCLUDE + ) + endif() + install( + DIRECTORY src/client src/common src/google_breakpad + DESTINATION include/ + FILES_MATCHING + PATTERN "*.h" + REGEX ${HEADER_EXCLUDE_REGEX} EXCLUDE + ) +endif() + +install( + EXPORT unofficial-breakpad-targets + FILE unofficial-breakpad-config.cmake + NAMESPACE unofficial::breakpad:: + DESTINATION share/unofficial-breakpad +) diff --git a/externals/vcpkg/ports/breakpad/check_getcontext.cc b/externals/vcpkg/ports/breakpad/check_getcontext.cc new file mode 100755 index 000000000..762147479 --- /dev/null +++ b/externals/vcpkg/ports/breakpad/check_getcontext.cc @@ -0,0 +1,9 @@ +#include +#include + +int main() { + ucontext_t context; + getcontext(&context); + + return 0; +} diff --git a/externals/vcpkg/ports/breakpad/fix-unique_ptr.patch b/externals/vcpkg/ports/breakpad/fix-unique_ptr.patch new file mode 100755 index 000000000..4f81de3d9 --- /dev/null +++ b/externals/vcpkg/ports/breakpad/fix-unique_ptr.patch @@ -0,0 +1,13 @@ +diff --git a/src/common/windows/pe_util.cc b/src/common/windows/pe_util.cc +index 9f9e8fa..d912635 100644 +--- a/src/common/windows/pe_util.cc ++++ b/src/common/windows/pe_util.cc +@@ -28,7 +28,7 @@ + // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + #include "pe_util.h" +- ++#include + #include + #include + #include diff --git a/externals/vcpkg/ports/breakpad/fix-unordered_map.patch b/externals/vcpkg/ports/breakpad/fix-unordered_map.patch new file mode 100755 index 000000000..0d131d2b8 --- /dev/null +++ b/externals/vcpkg/ports/breakpad/fix-unordered_map.patch @@ -0,0 +1,14 @@ +diff --git a/src/common/unordered.h b/src/common/unordered.h +index c9cbd58..7743eda 100644 +--- a/src/common/unordered.h ++++ b/src/common/unordered.h +@@ -46,7 +46,8 @@ struct unordered_map : public __gnu_cxx::hash_map {}; + template > + struct unordered_set : public __gnu_cxx::hash_set {}; + +-#elif defined(_LIBCPP_VERSION) // c++11 ++#elif (__cplusplus >= 201103L) || defined(_LIBCPP_VERSION) || \ ++ (defined(_MSC_VER) && (_MSC_VER >= 1800)) // c++11 + #include + #include + using std::unordered_map; diff --git a/externals/vcpkg/ports/breakpad/portfile.cmake b/externals/vcpkg/ports/breakpad/portfile.cmake new file mode 100755 index 000000000..9e083c42e --- /dev/null +++ b/externals/vcpkg/ports/breakpad/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/breakpad + REF 9c4671f2e3a63c0f155d9b2511192d0b5fa7f760 # accessed on 2020-09-14 + SHA512 4c9ed9b675a772f9a6a84692865381130901820cb395b725511e7a9e2cbf4aaa5212a9ef5f87086baf58bb9d729082232b564bd827a205f87b5c1ffc1c53892a + HEAD_REF master + PATCHES + fix-unique_ptr.patch + fix-unordered_map.patch +) + +if(VCPKG_HOST_IS_LINUX OR VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID) + vcpkg_from_git( + OUT_SOURCE_PATH LSS_SOURCE_PATH + URL https://chromium.googlesource.com/linux-syscall-support + REF 7bde79cc274d06451bf65ae82c012a5d3e476b5a + ) + + file(RENAME "${LSS_SOURCE_PATH}" "${SOURCE_PATH}/src/third_party/lss") +endif() + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" "${CMAKE_CURRENT_LIST_DIR}/check_getcontext.cc" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DINSTALL_HEADERS=ON +) + +vcpkg_cmake_install() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/client/linux/data" "${CURRENT_PACKAGES_DIR}/include/client/linux/sender") + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-breakpad CONFIG_PATH share/unofficial-breakpad) + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/breakpad/vcpkg.json b/externals/vcpkg/ports/breakpad/vcpkg.json new file mode 100755 index 000000000..59d1b8f78 --- /dev/null +++ b/externals/vcpkg/ports/breakpad/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "breakpad", + "version-date": "2020-09-14", + "port-version": 5, + "description": "a set of client and server components which implement a crash-reporting system.", + "homepage": "https://github.com/google/breakpad", + "supports": "!uwp", + "dependencies": [ + "libdisasm", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/brigand/portfile.cmake b/externals/vcpkg/ports/brigand/portfile.cmake new file mode 100755 index 000000000..1e50b92aa --- /dev/null +++ b/externals/vcpkg/ports/brigand/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO edouarda/brigand + REF 1.3.0 + SHA512 538d288d84265cc9a4563f1e84d55a174db461ffd1e4f510bfdaef04af9fbf8e7ca79817f9118378bf7d58d578699aae3072bbffa3fd727b2d93ee783337aea6 + HEAD_REF master + PATCHES + remove-tests.patch +) + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/brigand/remove-tests.patch b/externals/vcpkg/ports/brigand/remove-tests.patch new file mode 100755 index 000000000..a50f4b0e5 --- /dev/null +++ b/externals/vcpkg/ports/brigand/remove-tests.patch @@ -0,0 +1,55 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 13ea689..e723f85 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,11 +24,6 @@ else() + endif() + + # Install pre-commit git hook +-execute_process(COMMAND ${CMAKE_COMMAND} -E copy +- ${PROJECT_SOURCE_DIR}/script/pre-commit +- ${PROJECT_SOURCE_DIR}/.git/hooks +- ) +- + set ( STANDALONE_GROUP + script/embed.py + ) +@@ -204,17 +199,6 @@ source_group(brigand\\sequences FILES ${SEQUENCES_GROUP}) + source_group(brigand\\types FILES ${TYPES_GROUP}) + source_group(placeholder FILES ${PLACEHOLDER_GROUP}) + +-add_library(brigand +- ${BRIGAND_GROUP} +- ${ADAPTED_GROUP} +- ${ALGORITHMS_GROUP} +- ${ALGORITHMS_DETAIL_GROUP} +- ${FUNCTIONS_GROUPS} +- ${SEQUENCES_GROUP} +- ${TYPES_GROUP} +- ${PLACEHOLDER_GROUP} +-) +- + set(test_files + test/always.cpp + test/apply.cpp +@@ -276,10 +260,6 @@ endif() + + source_group(tests FILES ${test_files}) + +-add_executable(brigand_test ${test_files}) +- +-add_test(brigand brigand_test) +- + configure_file(libbrigand.pc.in + libbrigand.pc + @ONLY +diff --git a/libbrigand.pc.in b/libbrigand.pc.in +index 2ed570e..218215b 100644 +--- a/libbrigand.pc.in ++++ b/libbrigand.pc.in +@@ -6,5 +6,4 @@ Name: Brigand + Description: Light-weight, fully functional, instant-compile time C++ 11 meta-programming library + URL: https://github.com/edouarda/brigand + Version: 1.2.0 +-Libs: + Cflags: -I${includedir} diff --git a/externals/vcpkg/ports/brigand/vcpkg.json b/externals/vcpkg/ports/brigand/vcpkg.json new file mode 100755 index 000000000..99a5e0219 --- /dev/null +++ b/externals/vcpkg/ports/brigand/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "brigand", + "version-string": "1.3.0", + "port-version": 2, + "description": "Brigand is a light-weight, fully functional, instant-compile time C++ 11 meta-programming library.", + "homepage": "https://github.com/edouarda/brigand", + "dependencies": [ + "boost-fusion", + "boost-variant", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/brotli/fix-arm-uwp.patch b/externals/vcpkg/ports/brotli/fix-arm-uwp.patch new file mode 100755 index 000000000..7ed3fcd3d --- /dev/null +++ b/externals/vcpkg/ports/brotli/fix-arm-uwp.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e6c6054..2c4b757 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -124,6 +124,8 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + add_definitions(-DOS_FREEBSD) + elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + add_definitions(-DOS_MACOSX) ++elseif(MSVC) ++ add_definitions(-D_CRT_SECURE_NO_WARNINGS) + endif() + + function(transform_sources_list INPUT_FILE OUTPUT_FILE) diff --git a/externals/vcpkg/ports/brotli/fix-ios.patch b/externals/vcpkg/ports/brotli/fix-ios.patch new file mode 100755 index 000000000..b3dee6aa0 --- /dev/null +++ b/externals/vcpkg/ports/brotli/fix-ios.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fcd9024..a717b87 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -225,6 +225,7 @@ if(NOT BROTLI_BUNDLED_MODE) + install( + TARGETS brotli + RUNTIME DESTINATION tools/brotli ++ BUNDLE DESTINATION tools/brotli + CONFIGURATIONS Release + ) + diff --git a/externals/vcpkg/ports/brotli/install.patch b/externals/vcpkg/ports/brotli/install.patch new file mode 100755 index 000000000..af3d3f3ea --- /dev/null +++ b/externals/vcpkg/ports/brotli/install.patch @@ -0,0 +1,58 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4ff3401..46492d0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -185,14 +185,13 @@ endforeach() + + foreach(lib IN LISTS BROTLI_SHARED_LIBS BROTLI_STATIC_LIBS) + target_link_libraries(${lib} ${LIBM_LIBRARY}) +- set_property(TARGET ${lib} APPEND PROPERTY INCLUDE_DIRECTORIES ${BROTLI_INCLUDE_DIRS}) + set_target_properties(${lib} PROPERTIES + VERSION "${BROTLI_ABI_COMPATIBILITY}.${BROTLI_ABI_AGE}.${BROTLI_ABI_REVISION}" + SOVERSION "${BROTLI_ABI_COMPATIBILITY}") + if(NOT BROTLI_EMSCRIPTEN) + set_target_properties(${lib} PROPERTIES POSITION_INDEPENDENT_CODE TRUE) + endif() +- set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${BROTLI_INCLUDE_DIRS}") ++ set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$" $) + endforeach() + + if(NOT BROTLI_EMSCRIPTEN) +@@ -223,27 +222,35 @@ if(NOT BROTLI_EMSCRIPTEN) + if(NOT BROTLI_BUNDLED_MODE) + install( + TARGETS brotli +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ RUNTIME DESTINATION tools/brotli ++ CONFIGURATIONS Release + ) + ++ if(BUILD_SHARED_LIBS) + install( + TARGETS ${BROTLI_LIBRARIES_CORE} ++ EXPORT brotli + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ) +- ++ else() + install( + TARGETS ${BROTLI_LIBRARIES_CORE_STATIC} ++ EXPORT brotli + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ) ++ endif() + + install( + DIRECTORY ${BROTLI_INCLUDE_DIRS}/brotli + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ++ CONFIGURATIONS Release + ) ++ ++ install(EXPORT brotli FILE unofficial-brotli-config.cmake NAMESPACE unofficial::brotli:: DESTINATION share/unofficial-brotli) + endif() # BROTLI_BUNDLED_MODE + endif() # BROTLI_EMSCRIPTEN + diff --git a/externals/vcpkg/ports/brotli/pkgconfig.patch b/externals/vcpkg/ports/brotli/pkgconfig.patch new file mode 100755 index 000000000..c11e0d493 --- /dev/null +++ b/externals/vcpkg/ports/brotli/pkgconfig.patch @@ -0,0 +1,74 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b1c654b..fcd9024 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -390,7 +390,7 @@ function(generate_pkg_config_path outvar path) + set("${outvar}" "${${outvar}}" PARENT_SCOPE) + endfunction(generate_pkg_config_path) + +-function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION) ++function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION SHARED_TARGET STATIC_TARGET) + file(READ ${INPUT_FILE} TEXT) + + set(PREFIX "${CMAKE_INSTALL_PREFIX}") +@@ -404,15 +404,22 @@ function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION) + string(REGEX REPLACE "@includedir@" "${INCLUDEDIR}" TEXT ${TEXT}) + + string(REGEX REPLACE "@PACKAGE_VERSION@" "${VERSION}" TEXT ${TEXT}) ++ ++ if(BUILD_SHARED_LIBS) ++ set(LIB_NAME "${SHARED_TARGET}") ++ else() ++ set(LIB_NAME "${STATIC_TARGET}") ++ endif() ++ string(REGEX REPLACE "@lib_name@" "${LIB_NAME}" TEXT ${TEXT}) + + file(WRITE ${OUTPUT_FILE} ${TEXT}) + endfunction() + +-transform_pc_file("scripts/libbrotlicommon.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlicommon.pc" "${BROTLI_VERSION}") ++transform_pc_file("scripts/libbrotlicommon.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlicommon.pc" "${BROTLI_VERSION}" brotlicommon brotlicommon-static) + +-transform_pc_file("scripts/libbrotlidec.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlidec.pc" "${BROTLI_VERSION}") ++transform_pc_file("scripts/libbrotlidec.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlidec.pc" "${BROTLI_VERSION}" brotlidec brotlidec-static) + +-transform_pc_file("scripts/libbrotlienc.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlienc.pc" "${BROTLI_VERSION}") ++transform_pc_file("scripts/libbrotlienc.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlienc.pc" "${BROTLI_VERSION}" brotlienc brotlienc-static) + + if(NOT BROTLI_EMSCRIPTEN) + if(NOT BROTLI_BUNDLED_MODE) +diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in +index 10ca969..7736344 100644 +--- a/scripts/libbrotlicommon.pc.in ++++ b/scripts/libbrotlicommon.pc.in +@@ -7,5 +7,5 @@ Name: libbrotlicommon + URL: https://github.com/google/brotli + Description: Brotli common dictionary library + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -R${libdir} -lbrotlicommon ++Libs: -L${libdir} -l@lib_name@ + Cflags: -I${includedir} +diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in +index e7c3124..a7dc8ce 100644 +--- a/scripts/libbrotlidec.pc.in ++++ b/scripts/libbrotlidec.pc.in +@@ -7,6 +7,6 @@ Name: libbrotlidec + URL: https://github.com/google/brotli + Description: Brotli decoder library + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -R${libdir} -lbrotlidec ++Libs: -L${libdir} -l@lib_name@ + Requires.private: libbrotlicommon >= 1.0.2 + Cflags: -I${includedir} +diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in +index 4dd0811..eb2712e 100644 +--- a/scripts/libbrotlienc.pc.in ++++ b/scripts/libbrotlienc.pc.in +@@ -7,6 +7,6 @@ Name: libbrotlienc + URL: https://github.com/google/brotli + Description: Brotli encoder library + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -R${libdir} -lbrotlienc ++Libs: -L${libdir} -l@lib_name@ + Requires.private: libbrotlicommon >= 1.0.2 + Cflags: -I${includedir} diff --git a/externals/vcpkg/ports/brotli/portfile.cmake b/externals/vcpkg/ports/brotli/portfile.cmake new file mode 100755 index 000000000..9c1e3037d --- /dev/null +++ b/externals/vcpkg/ports/brotli/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/brotli + REF e61745a6b7add50d380cfd7d3883dd6c62fc2c71 # v1.0.9 + SHA512 303444695600b70ce59708e06bf21647d9b8dd33d772c53bbe49320f2f8f95ca8a7d6df2d29b7f36ff99001967e2d28380e0e305d778031940a3a5c6585f9a4f + HEAD_REF master + PATCHES + install.patch + fix-arm-uwp.patch + pkgconfig.patch + fix-ios.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DBROTLI_DISABLE_TESTS=ON +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/brotli) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-brotli TARGET_PATH share/unofficial-brotli) +vcpkg_fixup_pkgconfig() + + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-brotli) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/brotli/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/brotli/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..882106bcc --- /dev/null +++ b/externals/vcpkg/ports/brotli/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,11 @@ +_find_package(${ARGS}) +foreach(T brotlicommon brotlidec brotlienc) + if(TARGET unofficial::brotli::${T} AND NOT TARGET unofficial::brotli::${T}-static) + _add_library(unofficial::brotli::${T}-static INTERFACE IMPORTED) + set_target_properties(unofficial::brotli::${T}-static PROPERTIES INTERFACE_LINK_LIBRARIES "unofficial::brotli::${T}") + endif() + if(NOT TARGET unofficial::brotli::${T} AND TARGET unofficial::brotli::${T}-static) + _add_library(unofficial::brotli::${T} INTERFACE IMPORTED) + set_target_properties(unofficial::brotli::${T} PROPERTIES INTERFACE_LINK_LIBRARIES "unofficial::brotli::${T}-static") + endif() +endforeach() diff --git a/externals/vcpkg/ports/brotli/vcpkg.json b/externals/vcpkg/ports/brotli/vcpkg.json new file mode 100755 index 000000000..c5b7fc09d --- /dev/null +++ b/externals/vcpkg/ports/brotli/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "brotli", + "version-string": "1.0.9", + "port-version": 2, + "description": "a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling.", + "homepage": "https://github.com/google/brotli" +} diff --git a/externals/vcpkg/ports/brpc/fix-boost-ptr.patch b/externals/vcpkg/ports/brpc/fix-boost-ptr.patch new file mode 100755 index 000000000..2650a23da --- /dev/null +++ b/externals/vcpkg/ports/brpc/fix-boost-ptr.patch @@ -0,0 +1,14 @@ +diff --git a/src/brpc/policy/thrift_protocol.cpp b/src/brpc/policy/thrift_protocol.cpp +index 634f8f37..21b118b1 100755 +--- a/src/brpc/policy/thrift_protocol.cpp ++++ b/src/brpc/policy/thrift_protocol.cpp +@@ -45,8 +45,7 @@ + #if defined(_THRIFT_STDCXX_H_) + # define THRIFT_STDCXX apache::thrift::stdcxx + #else +- # define THRIFT_STDCXX boost +- # include ++ # define THRIFT_STDCXX std + #endif + #endif + diff --git a/externals/vcpkg/ports/brpc/fix-build.patch b/externals/vcpkg/ports/brpc/fix-build.patch new file mode 100755 index 000000000..a39f8030b --- /dev/null +++ b/externals/vcpkg/ports/brpc/fix-build.patch @@ -0,0 +1,202 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 057695af..ed4979f6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -63,7 +63,8 @@ endif() + + if(WITH_THRIFT) + set(THRIFT_CPP_FLAG "-DENABLE_THRIFT_FRAMED_PROTOCOL") +- set(THRIFT_LIB "thrift") ++ find_package(Thrift CONFIG REQUIRED) ++ set(THRIFT_LIB "thrift::thrift") + endif() + + include(GNUInstallDirs) +@@ -142,18 +143,21 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + endif() + endif() + +-find_package(Protobuf REQUIRED) ++find_package(protobuf CONFIG REQUIRED) ++get_target_property(PROTOBUF_INCLUDE_DIR protobuf::libprotobuf INTERFACE_INCLUDE_DIRECTORIES) ++set(PROTOBUF_LIBRARIES protobuf::libprotobuf) + find_package(Threads REQUIRED) +- +-find_path(LEVELDB_INCLUDE_PATH NAMES leveldb/db.h) +-find_library(LEVELDB_LIB NAMES leveldb) ++find_package(leveldb CONFIG REQUIRED) ++set(LEVELDB_INCLUDE_PATH ${PROTOBUF_INCLUDE_DIR}) ++set(LEVELDB_LIB leveldb::leveldb) + if ((NOT LEVELDB_INCLUDE_PATH) OR (NOT LEVELDB_LIB)) + message(FATAL_ERROR "Fail to find leveldb") + endif() + + if(WITH_GLOG) +- find_path(GLOG_INCLUDE_PATH NAMES glog/logging.h) +- find_library(GLOG_LIB NAMES glog) ++ find_package(glog CONFIG REQUIRED) ++ get_target_property(GLOG_INCLUDE_PATH glog::glog INTERFACE_INCLUDE_DIRECTORIES) ++ set(GLOG_LIB glog::glog) + if((NOT GLOG_INCLUDE_PATH) OR (NOT GLOG_LIB)) + message(FATAL_ERROR "Fail to find glog") + endif() +@@ -171,7 +175,7 @@ if(WITH_MESALINK) + include_directories(${MESALINK_INCLUDE_PATH}) + endif() + +-find_library(PROTOC_LIB NAMES protoc) ++set(PROTOC_LIB "protobuf::libprotoc") + if(NOT PROTOC_LIB) + message(FATAL_ERROR "Fail to find protoc lib") + endif() +@@ -182,7 +186,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + ) + endif() + +-find_package(OpenSSL) ++find_package(OpenSSL REQUIRED) + + include_directories( + ${GFLAGS_INCLUDE_PATH} +@@ -197,9 +201,9 @@ set(DYNAMIC_LIB + ${LEVELDB_LIB} + ${PROTOC_LIB} + ${CMAKE_THREAD_LIBS_INIT} +- ${THRIFT_LIB} +- ${THRIFTNB_LIB} + ${OPENSSL_CRYPTO_LIBRARY} ++ ${OPENSSL_SSL_LIBRARY} ++ ${THRIFT_LIB} + dl + z) + +@@ -434,7 +438,9 @@ if(BUILD_UNIT_TESTS) + enable_testing() + add_subdirectory(test) + endif() ++if(BUILD_TOOLS) + add_subdirectory(tools) ++endif() + + file(COPY ${CMAKE_CURRENT_BINARY_DIR}/brpc/ + DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/output/include/brpc/ +diff --git a/cmake/FindGFLAGS.cmake b/cmake/FindGFLAGS.cmake +index dfad5fd8..83a167f0 100644 +--- a/cmake/FindGFLAGS.cmake ++++ b/cmake/FindGFLAGS.cmake +@@ -15,7 +15,8 @@ + + set(_gflags_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) + +-find_path(GFLAGS_INCLUDE_PATH gflags/gflags.h) ++find_package(gflags CONFIG REQUIRED) ++get_target_property(GFLAGS_INCLUDE_PATH gflags::gflags INTERFACE_INCLUDE_DIRECTORIES) + + if (GFLAGS_STATIC) + if (WIN32) +@@ -24,7 +25,7 @@ if (GFLAGS_STATIC) + set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) + endif (WIN32) + endif (GFLAGS_STATIC) +-find_library(GFLAGS_LIBRARY NAMES gflags libgflags) ++set(GFLAGS_LIBRARY gflags::gflags) + if(GFLAGS_INCLUDE_PATH AND GFLAGS_LIBRARY) + set(GFLAGS_FOUND TRUE) + endif(GFLAGS_INCLUDE_PATH AND GFLAGS_LIBRARY) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index ee616eb1..35a5b48e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -31,45 +31,77 @@ add_dependencies(SOURCES_LIB PROTO_LIB) + set_property(TARGET ${SOURCES_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1) + set_property(TARGET ${BUTIL_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1) + +-add_library(brpc-shared SHARED $ ++if (BUILD_SHARED_LIBS) ++add_library(brpc-shared SHARED $ + $ + $) ++else() + add_library(brpc-static STATIC $ + $ + $) +- +-target_link_libraries(brpc-shared ${DYNAMIC_LIB}) ++endif() ++if (BUILD_SHARED_LIBS) ++target_include_directories(brpc-shared PUBLIC $) ++target_link_libraries(brpc-shared PUBLIC ${DYNAMIC_LIB}) ++else() ++target_include_directories(brpc-static PUBLIC $) ++target_link_libraries(brpc-static PUBLIC ${DYNAMIC_LIB}) ++endif() + + if(BRPC_WITH_GLOG) ++ if (BUILD_SHARED_LIBS) + target_link_libraries(brpc-shared ${GLOG_LIB}) ++ else() ++ target_link_libraries(brpc-static ${GLOG_LIB}) ++ endif() + endif() + + if(BRPC_WITH_THRIFT) ++ if (BUILD_SHARED_LIBS) + target_link_libraries(brpc-shared thrift) ++ else() + target_link_libraries(brpc-static thrift) ++ endif() + endif() + ++if (NOT BUILD_SHARED_LIBS) + SET_TARGET_PROPERTIES(brpc-static PROPERTIES OUTPUT_NAME brpc CLEAN_DIRECT_OUTPUT 1) ++else() + SET_TARGET_PROPERTIES(brpc-shared PROPERTIES OUTPUT_NAME brpc CLEAN_DIRECT_OUTPUT 1) ++endif() + +-# for protoc-gen-mcpack +-set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/output/bin) +- +-set(protoc_gen_mcpack_SOURCES +- ${PROJECT_SOURCE_DIR}/src/mcpack2pb/generator.cpp +- ) +-add_executable(protoc-gen-mcpack ${protoc_gen_mcpack_SOURCES}) +-target_link_libraries(protoc-gen-mcpack brpc-shared) +- + #install directory +-install(TARGETS brpc-shared ++if (BUILD_SHARED_LIBS) ++install(TARGETS brpc-shared EXPORT unofficial-brpcTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) +- +-install(TARGETS brpc-static ++else() ++install(TARGETS brpc-static EXPORT unofficial-brpcTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) ++endif() ++ ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-brpc-config.cmake" ++[[include(CMakeFindDependencyMacro) ++find_dependency(OpenSSL) ++find_dependency(Threads) ++find_dependency(gflags CONFIG) ++find_dependency(protobuf CONFIG) ++find_dependency(leveldb CONFIG) ++find_dependency(Thrift CONFIG) ++find_dependency(glog CONFIG) ++file(GLOB TARGET_FILES "${CMAKE_CURRENT_LIST_DIR}/unofficial-brpcTargets.cmake") ++foreach (TARGET_FILE ${TARGET_FILES}) ++ include("${TARGET_FILE}") ++endforeach() ++]]) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-brpc-config.cmake" DESTINATION share/unofficial-brpc) ++ ++install(EXPORT unofficial-brpcTargets ++ NAMESPACE unofficial::brpc:: ++ DESTINATION share/unofficial-brpc ++) diff --git a/externals/vcpkg/ports/brpc/portfile.cmake b/externals/vcpkg/ports/brpc/portfile.cmake new file mode 100755 index 000000000..8aa32069f --- /dev/null +++ b/externals/vcpkg/ports/brpc/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO apache/incubator-brpc + REF 06247c18ed6307613f04c0d2357cb91d0c14131b + SHA512 f31b1ce3bd99dd585686ec540c9713d5d5936b2d58aadfb3f0ef48faeaab1797f2373e14b73578c2f9f8355d1e9d03661e2ed9ed8c4349b4e43e510d2214b5ae + HEAD_REF master + PATCHES + fix-build.patch + fix-boost-ptr.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DWITH_THRIFT=ON + -DWITH_MESALINK=OFF + -DWITH_GLOG=ON + -DDOWNLOAD_GTEST=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-brpc CONFIG_PATH share/unofficial-brpc) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/butil/third_party/superfasthash") + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/brpc/vcpkg.json b/externals/vcpkg/ports/brpc/vcpkg.json new file mode 100755 index 000000000..7547db6da --- /dev/null +++ b/externals/vcpkg/ports/brpc/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "brpc", + "version": "1.1.0", + "description": "Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called \"baidu-rpc\" inside Baidu.", + "homepage": "https://github.com/apache/incubator-brpc", + "license": "Apache-2.0", + "supports": "!windows & !arm", + "dependencies": [ + "gflags", + "glog", + { + "name": "leveldb", + "default-features": false + }, + "openssl", + { + "name": "protobuf", + "features": [ + "zlib" + ] + }, + "thrift", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/brunocodutra-metal/portfile.cmake b/externals/vcpkg/ports/brunocodutra-metal/portfile.cmake new file mode 100755 index 000000000..7dc6ce530 --- /dev/null +++ b/externals/vcpkg/ports/brunocodutra-metal/portfile.cmake @@ -0,0 +1,24 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO brunocodutra/metal + REF 9db9b403e58e0be0bbd295ff64f01e700965f25d + SHA512 b611d88d310893329f48111716c849571cb1459da1e71851bf3ec7393f18f8eb94077ce12410a9bcb1953e6b4ea0e8f2d2db5ce7f555a72ab2b7dae434b52d62 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME Metal + CONFIG_PATH lib/cmake/Metal +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/brunocodutra-metal/vcpkg.json b/externals/vcpkg/ports/brunocodutra-metal/vcpkg.json new file mode 100755 index 000000000..400950a7c --- /dev/null +++ b/externals/vcpkg/ports/brunocodutra-metal/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "brunocodutra-metal", + "version": "2.1.4", + "description": "A single header C++11 library designed to make you love template metaprogramming", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/brynet/portfile.cmake b/externals/vcpkg/ports/brynet/portfile.cmake new file mode 100755 index 000000000..fc3865a37 --- /dev/null +++ b/externals/vcpkg/ports/brynet/portfile.cmake @@ -0,0 +1,13 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO IronsDu/brynet + REF 4d162460372b2385cea121da0403f55582b4e39b # v1.11.2 + SHA512 656e8e0bdf44e2fb9f17c622d517cafc5ff965402ccab4b96e6f4663e715396a962df0ebb2baaec871336e27c0129ceb47b80352bfcd28cdff731d46aad08d8a + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/include/brynet DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/brynet/vcpkg.json b/externals/vcpkg/ports/brynet/vcpkg.json new file mode 100755 index 000000000..026f2d895 --- /dev/null +++ b/externals/vcpkg/ports/brynet/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "brynet", + "version": "1.11.2", + "description": "A C++ header only cross platform high performance tcp network library, and support SSL/HTTP/Websocket.", + "homepage": "https://github.com/IronsDu/brynet" +} diff --git a/externals/vcpkg/ports/bshoshany-thread-pool/portfile.cmake b/externals/vcpkg/ports/bshoshany-thread-pool/portfile.cmake new file mode 100755 index 000000000..b95869349 --- /dev/null +++ b/externals/vcpkg/ports/bshoshany-thread-pool/portfile.cmake @@ -0,0 +1,19 @@ +#header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO bshoshany/thread-pool + REF v2.0.0 + SHA512 eac1674ea999d25d8d0b8f1b24714830330ba4d345e3f730e49359bae89d9259e429d48357a45f7b4355cbbe1a63f04e7fe2c4e0be08b3bbea51018c62721fcc + HEAD_REF master +) + +# Install headers (header-only): +file(GLOB HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/*.hpp") +file(INSTALL + "${HEADER_FILES}" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" + +) + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/bshoshany-thread-pool/vcpkg.json b/externals/vcpkg/ports/bshoshany-thread-pool/vcpkg.json new file mode 100755 index 000000000..86058533b --- /dev/null +++ b/externals/vcpkg/ports/bshoshany-thread-pool/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "bshoshany-thread-pool", + "version": "2.0.0", + "description": "A C++17 Thread Pool for High-Performance Scientific Computing", + "homepage": "https://github.com/bshoshany/thread-pool" +} diff --git a/externals/vcpkg/ports/bsio/portfile.cmake b/externals/vcpkg/ports/bsio/portfile.cmake new file mode 100755 index 000000000..f88038d87 --- /dev/null +++ b/externals/vcpkg/ports/bsio/portfile.cmake @@ -0,0 +1,19 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ArkNX/bsio + REF v1.0.0 + SHA512 28b895b823d84203f4cec531ddd5bb49dc915e9a4eb26e064834d1e999b98e512b37d361e59029eb6d7e44fe99ba81f9c5729f119eab7eb928de1a1374f0b7df + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -Dbsio_BUILD_EXAMPLES=OFF +) +vcpkg_cmake_install() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/externals/vcpkg/ports/bsio/vcpkg.json b/externals/vcpkg/ports/bsio/vcpkg.json new file mode 100755 index 000000000..fe8fad416 --- /dev/null +++ b/externals/vcpkg/ports/bsio/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "bsio", + "version": "1.0.0", + "description": "networking library, ans support HTTP/WebSocket, based on asio.", + "homepage": "https://github.com/ArkNX/bsio", + "dependencies": [ + "asio", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/buck-yeh-bux-mariadb-client/portfile.cmake b/externals/vcpkg/ports/buck-yeh-bux-mariadb-client/portfile.cmake new file mode 100755 index 000000000..fbae2b34a --- /dev/null +++ b/externals/vcpkg/ports/buck-yeh-bux-mariadb-client/portfile.cmake @@ -0,0 +1,15 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO buck-yeh/bux-mariadb-client + REF aa7a543ed98081f357f1f27e2d77b66b81d727d6 # v1.0.3 + SHA512 35877ec1f17f43c4215c2662613ec00fc4e8a851087809aadcf4770ef1691b645a6804bfd12124af39db9338e28e9c1ed87fe03bf38e1675651a9c325df23b24 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/buck-yeh-bux-mariadb-client/vcpkg.json b/externals/vcpkg/ports/buck-yeh-bux-mariadb-client/vcpkg.json new file mode 100755 index 000000000..4c20b9246 --- /dev/null +++ b/externals/vcpkg/ports/buck-yeh-bux-mariadb-client/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "buck-yeh-bux-mariadb-client", + "version": "1.0.3", + "port-version": 1, + "description": "Loose-coupled throw-on-error C++20 wrapper classes and utilities over mysql/mariadb Connector/C API", + "homepage": "https://github.com/buck-yeh/bux-mariadb-client", + "license": "MIT", + "supports": "!(arm | uwp | osx | linux)", + "dependencies": [ + "buck-yeh-bux", + "fmt", + "libmariadb", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/buck-yeh-bux-sqlite/portfile.cmake b/externals/vcpkg/ports/buck-yeh-bux-sqlite/portfile.cmake new file mode 100755 index 000000000..6846f4601 --- /dev/null +++ b/externals/vcpkg/ports/buck-yeh-bux-sqlite/portfile.cmake @@ -0,0 +1,15 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO buck-yeh/bux-sqlite + REF e8ab90da9586f61024b59aa1a4900efb94f1d3f4 # v1.0.1 + SHA512 27acefdb32dd00dbbef91479b5e682cf6a9281e13a596128d5050fe44ed4b8669d5e7279b4db30efbd4d016d268c6f2ce893f91bbdddff17f2a227ba3a292d01 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/buck-yeh-bux-sqlite/vcpkg.json b/externals/vcpkg/ports/buck-yeh-bux-sqlite/vcpkg.json new file mode 100755 index 000000000..17dae253f --- /dev/null +++ b/externals/vcpkg/ports/buck-yeh-bux-sqlite/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "buck-yeh-bux-sqlite", + "version": "1.0.1", + "description": "Modern C++ wrapper classes and utilities of the original sqlite3 API", + "homepage": "https://github.com/buck-yeh/bux-sqlite", + "license": "MIT", + "supports": "!(arm | uwp | osx | linux)", + "dependencies": [ + "buck-yeh-bux", + "fmt", + "sqlite3", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/buck-yeh-bux/portfile.cmake b/externals/vcpkg/ports/buck-yeh-bux/portfile.cmake new file mode 100755 index 000000000..807638d3a --- /dev/null +++ b/externals/vcpkg/ports/buck-yeh-bux/portfile.cmake @@ -0,0 +1,15 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO buck-yeh/bux + REF b125e31341660ea76ca51cc5013e52d8d34a1f27 # v1.6.5 + SHA512 c37fea47076a192161aacacf8694c5b6d487a1c2ebe1fa06acdd9948e42e1b1440d83ebe38f4ae3b86c90cb1aba76f7254cd434ea85e24484a9dacb6944511a9 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/buck-yeh-bux/vcpkg.json b/externals/vcpkg/ports/buck-yeh-bux/vcpkg.json new file mode 100755 index 000000000..a5bf5cd59 --- /dev/null +++ b/externals/vcpkg/ports/buck-yeh-bux/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "buck-yeh-bux", + "version": "1.6.5", + "port-version": 1, + "description": "A supplemental C++ library with functionalities not directly supported from Modern C++ standard.", + "homepage": "https://github.com/buck-yeh/bux", + "license": "MIT", + "supports": "!(arm | uwp | osx | linux)", + "dependencies": [ + "fmt", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/bullet3/cmake-fix.patch b/externals/vcpkg/ports/bullet3/cmake-fix.patch new file mode 100755 index 000000000..12457f4ca --- /dev/null +++ b/externals/vcpkg/ports/bullet3/cmake-fix.patch @@ -0,0 +1,515 @@ +diff --git a/BulletConfig.cmake.in b/BulletConfig.cmake.in +index f5dc7bd..50b3d67 100644 +--- a/BulletConfig.cmake.in ++++ b/BulletConfig.cmake.in +@@ -13,13 +13,23 @@ + # BULLET_LIBRARY_DIRS - List of directories containing Bullet' libraries + # BULLET_ROOT_DIR - The base directory of Bullet + # BULLET_VERSION_STRING - A human-readable string containing the version +- ++@PACKAGE_INIT@ + set ( BULLET_FOUND 1 ) +-set ( BULLET_USE_FILE "@BULLET_USE_FILE@" ) ++set_and_check ( BULLET_USE_FILE "@PACKAGE_BULLET_CONFIG_CMAKE_PATH@/UseBullet.cmake" ) + set ( BULLET_DEFINITIONS "@BULLET_DEFINITIONS@" ) +-set ( BULLET_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@" ) +-set ( BULLET_INCLUDE_DIRS "@INCLUDE_INSTALL_DIR@" ) ++set_and_check ( BULLET_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@" ) ++set_and_check ( BULLET_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@" ) + set ( BULLET_LIBRARIES "@BULLET_LIBRARIES@" ) +-set ( BULLET_LIBRARY_DIRS "@LIB_DESTINATION@" ) +-set ( BULLET_ROOT_DIR "@CMAKE_INSTALL_PREFIX@" ) +-set ( BULLET_VERSION_STRING "@BULLET_VERSION@" ) +\ No newline at end of file ++set_and_check ( BULLET_LIBRARY_DIRS "@PACKAGE_LIB_DESTINATION@" ) ++set_and_check ( BULLET_ROOT_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@" ) ++set ( BULLET_VERSION_STRING "@BULLET_VERSION@" ) ++# Load targets ++if(NOT TARGET Bullet3Common) ++ # ++ include("@PACKAGE_BULLET_CONFIG_CMAKE_PATH@/LinearMathTargets.cmake") ++ file(GLOB CONFIG_FILES "@PACKAGE_BULLET_CONFIG_CMAKE_PATH@/*Targets.cmake") ++ foreach(f IN LISTS CONFIG_FILES) ++ include(${f}) ++ endforeach() ++ set(_DIR) ++endif() +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a695b71..607edde 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.4.3) ++cmake_minimum_required(VERSION 3.0) + set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) + cmake_policy(SET CMP0017 NEW) + #this line has to appear before 'PROJECT' in order to be able to disable incremental linking +@@ -489,7 +489,14 @@ IF (BUILD_UNIT_TESTS) + SUBDIRS(test) + ENDIF() + +-set (BULLET_CONFIG_CMAKE_PATH lib${LIB_SUFFIX}/cmake/bullet ) ++include(CMakePackageConfigHelpers) ++write_basic_package_version_file( ++ "${CMAKE_CURRENT_BINARY_DIR}/BulletConfigVersion.cmake" ++ VERSION ${BULLET_VERSION} ++ COMPATIBILITY AnyNewerVersion ++) ++ ++set (BULLET_CONFIG_CMAKE_PATH share/bullet ) + list (APPEND BULLET_DEFINITIONS ${BULLET_DOUBLE_DEF}) + list (APPEND BULLET_LIBRARIES LinearMath) + list (APPEND BULLET_LIBRARIES Bullet3Common) +@@ -497,16 +504,18 @@ list (APPEND BULLET_LIBRARIES BulletInverseDynamics) + list (APPEND BULLET_LIBRARIES BulletCollision) + list (APPEND BULLET_LIBRARIES BulletDynamics) + list (APPEND BULLET_LIBRARIES BulletSoftBody) +-set (BULLET_USE_FILE ${BULLET_CONFIG_CMAKE_PATH}/UseBullet.cmake) +-configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/BulletConfig.cmake.in +- ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake +- @ONLY ESCAPE_QUOTES +- ) ++configure_package_config_file( ++ ${CMAKE_CURRENT_SOURCE_DIR}/BulletConfig.cmake.in ++ ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake ++ PATH_VARS INCLUDE_INSTALL_DIR LIB_DESTINATION CMAKE_INSTALL_PREFIX BULLET_CONFIG_CMAKE_PATH ++ INSTALL_DESTINATION ${BULLET_CONFIG_CMAKE_PATH} ++) + OPTION(INSTALL_CMAKE_FILES "Install generated CMake files" ON) + + IF (INSTALL_CMAKE_FILES) + install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/UseBullet.cmake + ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake ++ ${CMAKE_CURRENT_BINARY_DIR}/BulletConfigVersion.cmake + DESTINATION ${BULLET_CONFIG_CMAKE_PATH} + ) + ENDIF (INSTALL_CMAKE_FILES) +diff --git a/Extras/BulletRobotics/CMakeLists.txt b/Extras/BulletRobotics/CMakeLists.txt +index d2ab423..dabb504 100644 +--- a/Extras/BulletRobotics/CMakeLists.txt ++++ b/Extras/BulletRobotics/CMakeLists.txt +@@ -282,7 +282,7 @@ SET_TARGET_PROPERTIES(BulletRobotics PROPERTIES VERSION ${BULLET_VERSION}) + SET_TARGET_PROPERTIES(BulletRobotics PROPERTIES SOVERSION ${BULLET_VERSION}) + + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(BulletRobotics BulletInverseDynamicsUtils BulletWorldImporter BulletFileLoader BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamics LinearMath Bullet3Common) ++ TARGET_LINK_LIBRARIES(BulletRobotics PUBLIC BulletInverseDynamicsUtils BulletWorldImporter BulletFileLoader BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamics LinearMath Bullet3Common) + ENDIF (BUILD_SHARED_LIBS) + + +diff --git a/Extras/BulletRoboticsGUI/CMakeLists.txt b/Extras/BulletRoboticsGUI/CMakeLists.txt +index 57ab97f..27b9992 100644 +--- a/Extras/BulletRoboticsGUI/CMakeLists.txt ++++ b/Extras/BulletRoboticsGUI/CMakeLists.txt +@@ -166,7 +166,7 @@ SET_TARGET_PROPERTIES(BulletRoboticsGUI PROPERTIES VERSION ${BULLET_VERSION}) + SET_TARGET_PROPERTIES(BulletRoboticsGUI PROPERTIES SOVERSION ${BULLET_VERSION}) + + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(BulletRoboticsGUI BulletExampleBrowserLib BulletRobotics BulletInverseDynamicsUtils BulletWorldImporter BulletFileLoader BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamics LinearMath Bullet3Common) ++ TARGET_LINK_LIBRARIES(BulletRoboticsGUI PUBLIC BulletExampleBrowserLib BulletRobotics BulletInverseDynamicsUtils BulletWorldImporter BulletFileLoader BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamics LinearMath Bullet3Common) + ENDIF (BUILD_SHARED_LIBS) + + +diff --git a/Extras/ConvexDecomposition/CMakeLists.txt b/Extras/ConvexDecomposition/CMakeLists.txt +index 132a336..62babb0 100644 +--- a/Extras/ConvexDecomposition/CMakeLists.txt ++++ b/Extras/ConvexDecomposition/CMakeLists.txt +@@ -39,7 +39,7 @@ SET_TARGET_PROPERTIES(ConvexDecomposition PROPERTIES VERSION ${BULLET_VERSION}) + SET_TARGET_PROPERTIES(ConvexDecomposition PROPERTIES SOVERSION ${BULLET_VERSION}) + + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(ConvexDecomposition BulletCollision LinearMath) ++ TARGET_LINK_LIBRARIES(ConvexDecomposition PUBLIC BulletCollision LinearMath) + ENDIF (BUILD_SHARED_LIBS) + + IF (INSTALL_EXTRA_LIBS) +diff --git a/Extras/InverseDynamics/CMakeLists.txt b/Extras/InverseDynamics/CMakeLists.txt +index 22e953a..59b733d 100644 +--- a/Extras/InverseDynamics/CMakeLists.txt ++++ b/Extras/InverseDynamics/CMakeLists.txt +@@ -22,7 +22,7 @@ SET_TARGET_PROPERTIES(BulletInverseDynamicsUtils PROPERTIES VERSION ${BULLET_VER + SET_TARGET_PROPERTIES(BulletInverseDynamicsUtils PROPERTIES SOVERSION ${BULLET_VERSION}) + + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(BulletInverseDynamicsUtils BulletInverseDynamics BulletDynamics BulletCollision Bullet3Common LinearMath) ++ TARGET_LINK_LIBRARIES(BulletInverseDynamicsUtils PUBLIC BulletInverseDynamics BulletDynamics BulletCollision Bullet3Common LinearMath) + ENDIF (BUILD_SHARED_LIBS) + + IF (INSTALL_EXTRA_LIBS) +diff --git a/Extras/Serialize/BulletFileLoader/CMakeLists.txt b/Extras/Serialize/BulletFileLoader/CMakeLists.txt +index 9b5dce7..2f30385 100644 +--- a/Extras/Serialize/BulletFileLoader/CMakeLists.txt ++++ b/Extras/Serialize/BulletFileLoader/CMakeLists.txt +@@ -21,7 +21,7 @@ btBulletFile.h + ADD_LIBRARY(BulletFileLoader ${BulletFileLoader_SRCS} ${BulletFileLoader_HDRS}) + + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(BulletFileLoader LinearMath) ++ TARGET_LINK_LIBRARIES(BulletFileLoader PUBLIC LinearMath) + ENDIF (BUILD_SHARED_LIBS) + + SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES VERSION ${BULLET_VERSION}) +diff --git a/Extras/Serialize/BulletWorldImporter/CMakeLists.txt b/Extras/Serialize/BulletWorldImporter/CMakeLists.txt +index b56b39a..1684651 100644 +--- a/Extras/Serialize/BulletWorldImporter/CMakeLists.txt ++++ b/Extras/Serialize/BulletWorldImporter/CMakeLists.txt +@@ -16,7 +16,7 @@ SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES VERSION ${BULLET_VERSION}) + SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION}) + + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath) ++ TARGET_LINK_LIBRARIES(BulletWorldImporter PUBLIC BulletDynamics BulletCollision BulletFileLoader LinearMath) + ENDIF (BUILD_SHARED_LIBS) + + IF (INSTALL_EXTRA_LIBS) +diff --git a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt b/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt +index 9fd125e..889c30e 100644 +--- a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt ++++ b/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt +@@ -18,7 +18,7 @@ SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES VERSION ${BULLET_VERSIO + SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION}) + + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(BulletXmlWorldImporter BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath) ++ TARGET_LINK_LIBRARIES(BulletXmlWorldImporter PUBLIC BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath) + ENDIF (BUILD_SHARED_LIBS) + + IF (INSTALL_EXTRA_LIBS) +diff --git a/src/Bullet3Collision/CMakeLists.txt b/src/Bullet3Collision/CMakeLists.txt +index 130095c..661a461 100644 +--- a/src/Bullet3Collision/CMakeLists.txt ++++ b/src/Bullet3Collision/CMakeLists.txt +@@ -69,9 +69,10 @@ IF (INSTALL_LIBS) + #FILES_MATCHING requires CMake 2.6 + IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +- INSTALL(TARGETS Bullet3Collision DESTINATION .) ++ INSTALL(TARGETS Bullet3Collision EXPORT Bullet3CollisionTargets DESTINATION .) + ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) + INSTALL(TARGETS Bullet3Collision ++ EXPORT Bullet3CollisionTargets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) +@@ -89,5 +90,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN + #SET_PROPERTY(SOURCE ${Bullet3CollisionBroadPhase_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/BroadPhaseCollision) + + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ++ INSTALL(EXPORT Bullet3CollisionTargets ++ DESTINATION ${BULLET_CONFIG_CMAKE_PATH}) + ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) + ENDIF (INSTALL_LIBS) +diff --git a/src/Bullet3Common/CMakeLists.txt b/src/Bullet3Common/CMakeLists.txt +index e899e67..e990b16 100644 +--- a/src/Bullet3Common/CMakeLists.txt ++++ b/src/Bullet3Common/CMakeLists.txt +@@ -37,15 +37,17 @@ SET(Bullet3Common_HDRS + ADD_LIBRARY(Bullet3Common ${Bullet3Common_SRCS} ${Bullet3Common_HDRS}) + SET_TARGET_PROPERTIES(Bullet3Common PROPERTIES VERSION ${BULLET_VERSION}) + SET_TARGET_PROPERTIES(Bullet3Common PROPERTIES SOVERSION ${BULLET_VERSION}) ++TARGET_INCLUDE_DIRECTORIES(Bullet3Common INTERFACE $) + + IF (INSTALL_LIBS) + IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) + #FILES_MATCHING requires CMake 2.6 + IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +- INSTALL(TARGETS Bullet3Common DESTINATION .) ++ INSTALL(TARGETS Bullet3Common EXPORT Bullet3CommonTargets DESTINATION .) + ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) + INSTALL(TARGETS Bullet3Common ++ EXPORT Bullet3CommonTargets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) +@@ -59,5 +61,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN + SET_TARGET_PROPERTIES(Bullet3Common PROPERTIES FRAMEWORK true) + SET_TARGET_PROPERTIES(Bullet3Common PROPERTIES PUBLIC_HEADER "${Bullet3Common_HDRS}") + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ++ INSTALL(EXPORT Bullet3CommonTargets ++ DESTINATION ${BULLET_CONFIG_CMAKE_PATH}) + ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) + ENDIF (INSTALL_LIBS) +diff --git a/src/Bullet3Dynamics/CMakeLists.txt b/src/Bullet3Dynamics/CMakeLists.txt +index 94c120d..e83503a 100644 +--- a/src/Bullet3Dynamics/CMakeLists.txt ++++ b/src/Bullet3Dynamics/CMakeLists.txt +@@ -41,9 +41,10 @@ IF (INSTALL_LIBS) + #FILES_MATCHING requires CMake 2.6 + IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +- INSTALL(TARGETS Bullet3Dynamics DESTINATION .) ++ INSTALL(TARGETS Bullet3Dynamics EXPORT Bullet3DynamicsTargets DESTINATION .) + ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) + INSTALL(TARGETS Bullet3Dynamics ++ EXPORT Bullet3DynamicsTargets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) +@@ -57,5 +58,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN + SET_TARGET_PROPERTIES(Bullet3Dynamics PROPERTIES FRAMEWORK true) + SET_TARGET_PROPERTIES(Bullet3Dynamics PROPERTIES PUBLIC_HEADER "${Bullet3Dynamics_HDRS}") + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ++ INSTALL(EXPORT Bullet3DynamicsTargets ++ DESTINATION ${BULLET_CONFIG_CMAKE_PATH}) + ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) + ENDIF (INSTALL_LIBS) +diff --git a/src/Bullet3Geometry/CMakeLists.txt b/src/Bullet3Geometry/CMakeLists.txt +index 8206872..e605d79 100644 +--- a/src/Bullet3Geometry/CMakeLists.txt ++++ b/src/Bullet3Geometry/CMakeLists.txt +@@ -27,9 +27,12 @@ IF (INSTALL_LIBS) + #FILES_MATCHING requires CMake 2.6 + IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +- INSTALL(TARGETS Bullet3Geometry DESTINATION .) ++ INSTALL(TARGETS Bullet3Geometry ++ EXPORT Bullet3GeometryTargets ++ DESTINATION .) + ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) + INSTALL(TARGETS Bullet3Geometry ++ EXPORT Bullet3GeometryTargets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) +@@ -43,5 +46,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN + SET_TARGET_PROPERTIES(Bullet3Geometry PROPERTIES FRAMEWORK true) + SET_TARGET_PROPERTIES(Bullet3Geometry PROPERTIES PUBLIC_HEADER "${Bullet3Geometry_HDRS}") + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ++ ++ INSTALL(EXPORT Bullet3GeometryTargets ++ DESTINATION ${BULLET_CONFIG_CMAKE_PATH}) + ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) + ENDIF (INSTALL_LIBS) +diff --git a/src/Bullet3OpenCL/CMakeLists.txt b/src/Bullet3OpenCL/CMakeLists.txt +index 1da58d4..c1b21df 100644 +--- a/src/Bullet3OpenCL/CMakeLists.txt ++++ b/src/Bullet3OpenCL/CMakeLists.txt +@@ -44,7 +44,7 @@ ADD_LIBRARY(Bullet3OpenCL_clew ${Bullet3OpenCL_clew_SRCS} ${Bullet3OpenCL_clew_H + SET_TARGET_PROPERTIES(Bullet3OpenCL_clew PROPERTIES VERSION ${BULLET_VERSION}) + SET_TARGET_PROPERTIES(Bullet3OpenCL_clew PROPERTIES SOVERSION ${BULLET_VERSION}) + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(Bullet3OpenCL_clew LinearMath Bullet3Dynamics ${CMAKE_DL_LIBS}) ++ TARGET_LINK_LIBRARIES(Bullet3OpenCL_clew PUBLIC LinearMath Bullet3Dynamics ${CMAKE_DL_LIBS}) + ENDIF (BUILD_SHARED_LIBS) + + +@@ -53,9 +53,13 @@ IF (INSTALL_LIBS) + #INSTALL of other files requires CMake 2.6 + IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +- INSTALL(TARGETS Bullet3OpenCL_clew DESTINATION .) ++ INSTALL(TARGETS BulletDynamics ++ EXPORT Bullet3OpenCLTargets ++ DESTINATION .) + ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +- INSTALL(TARGETS Bullet3OpenCL_clew RUNTIME DESTINATION bin ++ INSTALL(TARGETS Bullet3OpenCL_clew ++ EXPORT Bullet3OpenCLTargets ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +@@ -73,5 +77,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" E + SET_PROPERTY(SOURCE ${BroadphaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/BroadphaseCollision) + + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ++ ++ INSTALL(EXPORT Bullet3OpenCLTargets ++ DESTINATION ${BULLET_CONFIG_CMAKE_PATH}) + ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) + ENDIF (INSTALL_LIBS) +diff --git a/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt b/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt +index 1255766..67112b4 100644 +--- a/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt ++++ b/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt +@@ -35,9 +35,12 @@ IF (INSTALL_LIBS) + #FILES_MATCHING requires CMake 2.6 + IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +- INSTALL(TARGETS Bullet2FileLoader DESTINATION .) ++ INSTALL(TARGETS Bullet2FileLoader ++ EXPORT Bullet2FileLoaderTargets ++ DESTINATION .) + ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) + INSTALL(TARGETS Bullet2FileLoader ++ EXPORT Bullet2FileLoaderTargets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) +@@ -51,5 +54,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN + SET_TARGET_PROPERTIES(Bullet2FileLoader PROPERTIES FRAMEWORK true) + SET_TARGET_PROPERTIES(Bullet2FileLoader PROPERTIES PUBLIC_HEADER "${Bullet2FileLoader_HDRS}") + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ++ ++ INSTALL(EXPORT Bullet2FileLoaderTargets ++ DESTINATION ${BULLET_CONFIG_CMAKE_PATH}) + ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) + ENDIF (INSTALL_LIBS) +diff --git a/src/BulletCollision/CMakeLists.txt b/src/BulletCollision/CMakeLists.txt +index f5d7255..d857637 100644 +--- a/src/BulletCollision/CMakeLists.txt ++++ b/src/BulletCollision/CMakeLists.txt +@@ -257,7 +257,7 @@ ADD_LIBRARY(BulletCollision ${BulletCollision_SRCS} ${BulletCollision_HDRS}) + SET_TARGET_PROPERTIES(BulletCollision PROPERTIES VERSION ${BULLET_VERSION}) + SET_TARGET_PROPERTIES(BulletCollision PROPERTIES SOVERSION ${BULLET_VERSION}) + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(BulletCollision LinearMath) ++ TARGET_LINK_LIBRARIES(BulletCollision PUBLIC LinearMath) + ENDIF (BUILD_SHARED_LIBS) + + +@@ -266,9 +266,13 @@ IF (INSTALL_LIBS) + #INSTALL of other files requires CMake 2.6 + IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +- INSTALL(TARGETS BulletCollision DESTINATION .) ++ INSTALL(TARGETS BulletCollision ++ EXPORT BulletCollisionTargets ++ DESTINATION .) + ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +- INSTALL(TARGETS BulletCollision RUNTIME DESTINATION bin ++ INSTALL(TARGETS BulletCollision ++ EXPORT BulletCollisionTargets ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +@@ -290,5 +294,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/BulletCollision) + SET_PROPERTY(SOURCE ${NarrowPhaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/NarrowPhaseCollision) + + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ++ ++ INSTALL(EXPORT BulletCollisionTargets ++ DESTINATION ${BULLET_CONFIG_CMAKE_PATH}) + ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) + ENDIF (INSTALL_LIBS) +diff --git a/src/BulletDynamics/CMakeLists.txt b/src/BulletDynamics/CMakeLists.txt +index 3332440..d1a1147 100644 +--- a/src/BulletDynamics/CMakeLists.txt ++++ b/src/BulletDynamics/CMakeLists.txt +@@ -140,16 +140,21 @@ ADD_LIBRARY(BulletDynamics ${BulletDynamics_SRCS} ${BulletDynamics_HDRS}) + SET_TARGET_PROPERTIES(BulletDynamics PROPERTIES VERSION ${BULLET_VERSION}) + SET_TARGET_PROPERTIES(BulletDynamics PROPERTIES SOVERSION ${BULLET_VERSION}) + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(BulletDynamics BulletCollision LinearMath) ++ TARGET_LINK_LIBRARIES(BulletDynamics PUBLIC BulletCollision) + ENDIF (BUILD_SHARED_LIBS) ++TARGET_LINK_LIBRARIES(BulletDynamics PUBLIC LinearMath) + + IF (INSTALL_LIBS) + IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) + IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +- INSTALL(TARGETS BulletDynamics DESTINATION .) ++ INSTALL(TARGETS BulletDynamics ++ EXPORT BulletDynamicsTargets ++ DESTINATION .) + ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +- INSTALL(TARGETS BulletDynamics RUNTIME DESTINATION bin ++ INSTALL(TARGETS BulletDynamics ++ EXPORT BulletDynamicsTargets ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +@@ -171,5 +176,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/BulletDynamics) + SET_PROPERTY(SOURCE ${Featherstone_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Featherstone) + SET_PROPERTY(SOURCE ${MLCPSolvers_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/MLCPSolvers) + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ++ ++ INSTALL(EXPORT BulletDynamicsTargets ++ DESTINATION ${BULLET_CONFIG_CMAKE_PATH}) + ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) + ENDIF (INSTALL_LIBS) +diff --git a/src/BulletInverseDynamics/CMakeLists.txt b/src/BulletInverseDynamics/CMakeLists.txt +index 3331c27..d4fad26 100644 +--- a/src/BulletInverseDynamics/CMakeLists.txt ++++ b/src/BulletInverseDynamics/CMakeLists.txt +@@ -33,7 +33,7 @@ ADD_LIBRARY(BulletInverseDynamics ${BulletInverseDynamics_SRCS} ${BulletInverseD + SET_TARGET_PROPERTIES(BulletInverseDynamics PROPERTIES VERSION ${BULLET_VERSION}) + SET_TARGET_PROPERTIES(BulletInverseDynamics PROPERTIES SOVERSION ${BULLET_VERSION}) + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(BulletInverseDynamics Bullet3Common LinearMath) ++ TARGET_LINK_LIBRARIES(BulletInverseDynamics PUBLIC Bullet3Common LinearMath) + ENDIF (BUILD_SHARED_LIBS) + + +@@ -42,9 +42,13 @@ IF (INSTALL_LIBS) + #INSTALL of other files requires CMake 2.6 + IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +- INSTALL(TARGETS BulletInverseDynamics DESTINATION .) ++ INSTALL(TARGETS BulletInverseDynamics ++ EXPORT BulletInverseDynamicsTargets ++ DESTINATION .) + ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +- INSTALL(TARGETS BulletInverseDynamics RUNTIME DESTINATION bin ++ INSTALL(TARGETS BulletInverseDynamics ++ EXPORT BulletInverseDynamicsTargets ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +@@ -62,5 +66,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/BulletInverseDynamics) + SET_PROPERTY(SOURCE ${BulletInverseDynamicsDetails_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/details) + + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ++ ++ INSTALL(EXPORT BulletInverseDynamicsTargets ++ DESTINATION ${BULLET_CONFIG_CMAKE_PATH}) + ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) + ENDIF (INSTALL_LIBS) +diff --git a/src/BulletSoftBody/CMakeLists.txt b/src/BulletSoftBody/CMakeLists.txt +index 9452768..5068a30 100644 +--- a/src/BulletSoftBody/CMakeLists.txt ++++ b/src/BulletSoftBody/CMakeLists.txt +@@ -78,9 +78,13 @@ IF (INSTALL_LIBS) + IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) + IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +- INSTALL(TARGETS BulletSoftBody DESTINATION .) ++ INSTALL(TARGETS BulletSoftBody ++ EXPORT BulletSoftBodyTargets ++ DESTINATION .) + ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +- INSTALL(TARGETS BulletSoftBody RUNTIME DESTINATION bin ++ INSTALL(TARGETS BulletSoftBody ++ EXPORT BulletSoftBodyTargets ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +@@ -93,5 +97,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN + SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES FRAMEWORK true) + SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES PUBLIC_HEADER "${BulletSoftBody_HDRS}") + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ++ ++ INSTALL(EXPORT BulletSoftBodyTargets ++ DESTINATION ${BULLET_CONFIG_CMAKE_PATH}) + ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) + ENDIF (INSTALL_LIBS) +diff --git a/src/LinearMath/CMakeLists.txt b/src/LinearMath/CMakeLists.txt +index a0532c7..ecf06b3 100644 +--- a/src/LinearMath/CMakeLists.txt ++++ b/src/LinearMath/CMakeLists.txt +@@ -63,9 +63,10 @@ IF (INSTALL_LIBS) + #FILES_MATCHING requires CMake 2.6 + IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +- INSTALL(TARGETS LinearMath DESTINATION .) ++ INSTALL(TARGETS LinearMath EXPORT LinearMathTargets DESTINATION .) + ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) + INSTALL(TARGETS LinearMath ++ EXPORT LinearMathTargets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) +@@ -79,5 +80,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN + SET_TARGET_PROPERTIES(LinearMath PROPERTIES FRAMEWORK true) + SET_TARGET_PROPERTIES(LinearMath PROPERTIES PUBLIC_HEADER "${LinearMath_HDRS}") + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ++ INSTALL(EXPORT LinearMathTargets ++ DESTINATION ${BULLET_CONFIG_CMAKE_PATH}) + ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) + ENDIF (INSTALL_LIBS) diff --git a/externals/vcpkg/ports/bullet3/portfile.cmake b/externals/vcpkg/ports/bullet3/portfile.cmake new file mode 100755 index 000000000..4c70019d3 --- /dev/null +++ b/externals/vcpkg/ports/bullet3/portfile.cmake @@ -0,0 +1,42 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO bulletphysics/bullet3 + REF 3.22 + SHA512 edacf643ca9621523812effe69a7499716bc65282c58c1f5b4eb4f17b2b1ab55a4f71b06a73483f57e57a5b032c234d09ba5fab9881321f2cbc3c27b43fdc95d + HEAD_REF master + PATCHES + cmake-fix.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + multithreading BULLET2_MULTITHREADING +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DUSE_MSVC_RUNTIME_LIBRARY_DLL=ON + -DBUILD_CPU_DEMOS=OFF + -DBUILD_BULLET2_DEMOS=OFF + -DBUILD_BULLET3=OFF + -DBUILD_EXTRAS=OFF + -DBUILD_UNIT_TESTS=OFF + -DINSTALL_LIBS=ON + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME bullet CONFIG_PATH share/bullet) + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/bullet/BulletInverseDynamics/details") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/bullet3/usage b/externals/vcpkg/ports/bullet3/usage new file mode 100755 index 000000000..43b6d667a --- /dev/null +++ b/externals/vcpkg/ports/bullet3/usage @@ -0,0 +1,4 @@ +The package bullet3 provides CMake targets: + +find_package(Bullet CONFIG REQUIRED) +target_link_libraries(main PRIVATE LinearMath Bullet3Common BulletDynamics BulletSoftBody) diff --git a/externals/vcpkg/ports/bullet3/vcpkg.json b/externals/vcpkg/ports/bullet3/vcpkg.json new file mode 100755 index 000000000..50853901d --- /dev/null +++ b/externals/vcpkg/ports/bullet3/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "bullet3", + "version": "3.22", + "description": "Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library", + "homepage": "https://github.com/bulletphysics/bullet3", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "multithreading": { + "description": "Multithreading functionality for bullet3" + } + } +} diff --git a/externals/vcpkg/ports/bustache/portfile.cmake b/externals/vcpkg/ports/bustache/portfile.cmake new file mode 100755 index 000000000..b720f0249 --- /dev/null +++ b/externals/vcpkg/ports/bustache/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jamboree/bustache + REF abb25ca189425783c6b7ec5c17c5284dccb59faf + SHA512 be00451f6a85edccacbdd5d8478d7af4f3162f9a9a31af876004237ca7f303c1262b2ea623e6ec595d73440dc14fcf22d185bc521fd3aca6e28ec43890d611c5 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "share/bustache/cmake") + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" +) + +# No license file --> use Readme +file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/bustache/vcpkg.json b/externals/vcpkg/ports/bustache/vcpkg.json new file mode 100755 index 000000000..fd4f73ddc --- /dev/null +++ b/externals/vcpkg/ports/bustache/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "bustache", + "version": "1.1.0", + "port-version": 2, + "description": "C++11 implementation of {{ mustache }}", + "homepage": "https://github.com/jamboree/bustache", + "license": "BSL-1.0", + "dependencies": [ + "boost-unordered", + "boost-utility", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/butteraugli/CMakeLists.txt b/externals/vcpkg/ports/butteraugli/CMakeLists.txt new file mode 100755 index 000000000..52963fbe0 --- /dev/null +++ b/externals/vcpkg/ports/butteraugli/CMakeLists.txt @@ -0,0 +1,38 @@ +cmake_minimum_required(VERSION 3.8.0) +project(butteraugli CXX) + +add_compile_options(-D_CRT_SECURE_NO_WARNINGS -DNOMINMAX) +if(MSVC) + add_compile_options(/W3 /wd4005 /wd4996 /wd4018) +else() + add_compile_options(-std=c++11) +endif() + +find_package(JPEG REQUIRED) +find_package(PNG REQUIRED) + +include_directories("." ${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIRS}) + +add_library(butteraugli_lib butteraugli/butteraugli.cc) + +install( + TARGETS butteraugli_lib + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_TOOLS) + add_executable(butteraugli butteraugli/butteraugli_main.cc) + find_library(TURBO turbojpeg) + target_link_libraries(butteraugli butteraugli_lib ${JPEG_LIBRARIES} ${TURBO} ${PNG_LIBRARIES}) + + install ( + TARGETS butteraugli + RUNTIME DESTINATION tools/butteraugli + ) +endif() + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES butteraugli/butteraugli.h DESTINATION include/butteraugli) +endif() diff --git a/externals/vcpkg/ports/butteraugli/missing_header.patch b/externals/vcpkg/ports/butteraugli/missing_header.patch new file mode 100755 index 000000000..11d314fad --- /dev/null +++ b/externals/vcpkg/ports/butteraugli/missing_header.patch @@ -0,0 +1,12 @@ +diff --git "a/butteraugli/butteraugli_main.cc" "b/butteraugli/butteraugli_main.cc" +index f38af1d..ebf3197 100644 +--- "a/butteraugli/butteraugli_main.cc" ++++ "b/butteraugli/butteraugli_main.cc" +@@ -2,6 +2,7 @@ + #include + #include + #include ++#include + #include "butteraugli/butteraugli.h" + + extern "C" { diff --git a/externals/vcpkg/ports/butteraugli/portfile.cmake b/externals/vcpkg/ports/butteraugli/portfile.cmake new file mode 100755 index 000000000..26ff21e42 --- /dev/null +++ b/externals/vcpkg/ports/butteraugli/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/butteraugli + REF 71b18b636b9c7d1ae0c1d3730b85b3c127eb4511 + SHA512 2e73f8ad8953307eea956ed8bd828e110419d6d9f8a42685d225953d3a8017a79d0701bde0282459dc51198e75a99dcd99dd3c4e7ef065736c512a7b11ea0fdf + HEAD_REF master + PATCHES + missing_header.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/butteraugli/vcpkg.json b/externals/vcpkg/ports/butteraugli/vcpkg.json new file mode 100755 index 000000000..d11da192d --- /dev/null +++ b/externals/vcpkg/ports/butteraugli/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "butteraugli", + "version-string": "2019-05-08", + "port-version": 2, + "description": "butteraugli estimates the psychovisual difference between two images", + "homepage": "https://github.com/google/butteraugli", + "dependencies": [ + "libjpeg-turbo", + "libpng" + ] +} diff --git a/externals/vcpkg/ports/byte-lite/portfile.cmake b/externals/vcpkg/ports/byte-lite/portfile.cmake new file mode 100755 index 000000000..0e744d9e5 --- /dev/null +++ b/externals/vcpkg/ports/byte-lite/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO martinmoene/byte-lite + REF v0.3.0 + SHA512 a49c7cf820db2bcf63f231324bca72642161fcaa4ecd9e4b18aa752902f393a3983014feae824fa4f5dea0e7182eadded1a9a83c469fa4039d4d17b3c814b2ef +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBYTE_LITE_OPT_BUILD_TESTS=OFF + -DBYTE_LITE_OPT_BUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" +) + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/byte-lite/vcpkg.json b/externals/vcpkg/ports/byte-lite/vcpkg.json new file mode 100755 index 000000000..66eb84265 --- /dev/null +++ b/externals/vcpkg/ports/byte-lite/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "byte-lite", + "version": "0.3.0", + "description": "A C++17-like byte type for C++98, C++11 and later in a single-file header-only library", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/bzip2/CMakeLists.txt b/externals/vcpkg/ports/bzip2/CMakeLists.txt new file mode 100755 index 000000000..e2da221d7 --- /dev/null +++ b/externals/vcpkg/ports/bzip2/CMakeLists.txt @@ -0,0 +1,45 @@ +cmake_minimum_required(VERSION 3.0) +project(bzip2 C) + +if(CMAKE_BUILD_TYPE STREQUAL Debug) + add_definitions(-DBZ_DEBUG) # enable extra assertions +endif() + +set(BZ2_SOURCES + blocksort.c + huffman.c + crctable.c + randtable.c + compress.c + decompress.c + bzlib.c) + +add_library(bz2 ${BZ2_SOURCES}) +set_target_properties(bz2 PROPERTIES + DEBUG_POSTFIX d + VERSION 1.0.6 + SOVERSION 1.0) +if(BUILD_SHARED_LIBS) + target_compile_definitions(bz2 PRIVATE -DBZ_BUILD_DLL) +endif() + +if(MSVC) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) + add_definitions(-D_CRT_SECURE_NO_DEPRECATE) + add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) +endif() + +install(TARGETS bz2 + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib) + +if(NOT BZIP2_SKIP_TOOLS) + add_executable(bzip2 bzip2.c ${BZ2_SOURCES}) + add_executable(bzip2recover bzip2recover.c ${BZ2_SOURCES}) + install(TARGETS bzip2 bzip2recover DESTINATION tools/bzip2) +endif() + +if(NOT BZIP2_SKIP_HEADERS) + install(FILES bzlib.h DESTINATION include) +endif() diff --git a/externals/vcpkg/ports/bzip2/bzip2.pc.in b/externals/vcpkg/ports/bzip2/bzip2.pc.in new file mode 100755 index 000000000..91153c13b --- /dev/null +++ b/externals/vcpkg/ports/bzip2/bzip2.pc.in @@ -0,0 +1,11 @@ +prefix=@BZIP2_PREFIX@ +exec_prefix=${prefix} +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: bzip2 +Description: bzip2 +Version: 1.0.6 +Requires: +Libs: -L${libdir} -l@bzname@ +Cflags: -I${includedir} \ No newline at end of file diff --git a/externals/vcpkg/ports/bzip2/fix-import-export-macros.patch b/externals/vcpkg/ports/bzip2/fix-import-export-macros.patch new file mode 100755 index 000000000..fc67887da --- /dev/null +++ b/externals/vcpkg/ports/bzip2/fix-import-export-macros.patch @@ -0,0 +1,40 @@ +diff --git a/bzlib.h b/bzlib.h +index 8277123..84fbd0a 100644 +--- a/bzlib.h ++++ b/bzlib.h +@@ -65,29 +65,23 @@ typedef + } + bz_stream; + +- +-#ifndef BZ_IMPORT +-#define BZ_EXPORT +-#endif +- + #ifndef BZ_NO_STDIO + /* Need a definitition for FILE */ + #include + #endif + + #ifdef _WIN32 +-# include + # ifdef small + /* windows.h define small to char */ + # undef small + # endif +-# ifdef BZ_EXPORT +-# define BZ_API(func) WINAPI func +-# define BZ_EXTERN extern ++# define BZ_API(func) func ++# if defined(BZ_BUILD_DLL) ++# define BZ_EXTERN __declspec(dllexport) ++# elif defined(BZ_IMPORT) ++# define BZ_EXTERN __declspec(dllimport) + # else +- /* import windows dll dynamically */ +-# define BZ_API(func) (WINAPI * func) +-# define BZ_EXTERN ++# define BZ_EXTERN + # endif + #else + # define BZ_API(func) func diff --git a/externals/vcpkg/ports/bzip2/portfile.cmake b/externals/vcpkg/ports/bzip2/portfile.cmake new file mode 100755 index 000000000..36141ffcb --- /dev/null +++ b/externals/vcpkg/ports/bzip2/portfile.cmake @@ -0,0 +1,50 @@ +set(BZIP2_VERSION 1.0.8) +vcpkg_download_distfile(ARCHIVE + URLS "https://sourceware.org/pub/bzip2/bzip2-${BZIP2_VERSION}.tar.gz" + FILENAME "bzip2-${BZIP2_VERSION}.tar.gz" + SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES fix-import-export-macros.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DBZIP2_SKIP_HEADERS=ON + -DBZIP2_SKIP_TOOLS=ON +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(READ "${CURRENT_PACKAGES_DIR}/include/bzlib.h" BZLIB_H) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + string(REPLACE "defined(BZ_IMPORT)" "0" BZLIB_H "${BZLIB_H}") +else() + string(REPLACE "defined(BZ_IMPORT)" "1" BZLIB_H "${BZLIB_H}") +endif() +file(WRITE "${CURRENT_PACKAGES_DIR}/include/bzlib.h" "${BZLIB_H}") + +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}") + set(bzname bz2) + configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/bzip2.pc" @ONLY) +endif() + +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}/debug") + set(bzname bz2d) + configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/bzip2.pc" @ONLY) +endif() + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/bzip2/usage b/externals/vcpkg/ports/bzip2/usage new file mode 100755 index 000000000..084bf390a --- /dev/null +++ b/externals/vcpkg/ports/bzip2/usage @@ -0,0 +1,4 @@ +The package bzip2 is compatible with built-in CMake targets: + + find_package(BZip2 REQUIRED) + target_link_libraries(main PRIVATE BZip2::BZip2) diff --git a/externals/vcpkg/ports/bzip2/vcpkg.json b/externals/vcpkg/ports/bzip2/vcpkg.json new file mode 100755 index 000000000..2f8b8aabf --- /dev/null +++ b/externals/vcpkg/ports/bzip2/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "bzip2", + "version-semver": "1.0.8", + "port-version": 2, + "description": "bzip2 is a freely available, patent free, high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression.", + "homepage": "https://sourceware.org/bzip2/", + "documentation": "https://sourceware.org/bzip2/docs.html" +} diff --git a/externals/vcpkg/ports/c-ares/avoid-docs.patch b/externals/vcpkg/ports/c-ares/avoid-docs.patch new file mode 100755 index 000000000..cd505ecce --- /dev/null +++ b/externals/vcpkg/ports/c-ares/avoid-docs.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 194485a..e903e50 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -618,7 +618,7 @@ ADD_SUBDIRECTORY (include) + ADD_SUBDIRECTORY (src) + + # Docs +-ADD_SUBDIRECTORY (docs) ++#ADD_SUBDIRECTORY (docs) + + # Tests + IF (CARES_BUILD_TESTS OR CARES_BUILD_CONTAINER_TESTS) diff --git a/externals/vcpkg/ports/c-ares/guard-imported-lib.patch b/externals/vcpkg/ports/c-ares/guard-imported-lib.patch new file mode 100755 index 000000000..8cb0de4dd --- /dev/null +++ b/externals/vcpkg/ports/c-ares/guard-imported-lib.patch @@ -0,0 +1,21 @@ +diff --git a/c-ares-config.cmake.in b/c-ares-config.cmake.in +index 464837b..b3c2bc4 100644 +--- a/c-ares-config.cmake.in ++++ b/c-ares-config.cmake.in +@@ -8,12 +8,16 @@ include("${CMAKE_CURRENT_LIST_DIR}/c-ares-targets.cmake") + set(c-ares_LIBRARY c-ares::cares) + + if(@CARES_SHARED@) ++ if(NOT TARGET c-ares::cares_shared) + add_library(c-ares::cares_shared INTERFACE IMPORTED) + set_target_properties(c-ares::cares_shared PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares") ++ endif() + set(c-ares_SHARED_LIBRARY c-ares::cares_shared) + elseif(@CARES_STATIC@) ++ if(NOT TARGET c-ares::cares_static) + add_library(c-ares::cares_static INTERFACE IMPORTED) + set_target_properties(c-ares::cares_static PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares") ++ endif() + endif() + + if(@CARES_STATIC@) diff --git a/externals/vcpkg/ports/c-ares/portfile.cmake b/externals/vcpkg/ports/c-ares/portfile.cmake new file mode 100755 index 000000000..9e8f9d852 --- /dev/null +++ b/externals/vcpkg/ports/c-ares/portfile.cmake @@ -0,0 +1,45 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO c-ares/c-ares + REF cares-1_18_1 + SHA512 9f5f9d5a22a4643aef8701c4abfd4b28e0bded2479bab462d2dfc63a8f84348f02d3cfbd7c85cc1e06a154a3e4206721cb6669c7c61538ecdcd44268e4ce073e + HEAD_REF main + PATCHES + avoid-docs.patch + guard-imported-lib.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCARES_STATIC=${BUILD_STATIC} + -DCARES_SHARED=${BUILD_SHARED} + -DCARES_BUILD_TOOLS=OFF + -DCARES_BUILD_TESTS=OFF + -DCARES_BUILD_CONTAINER_TESTS=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/c-ares) +vcpkg_fixup_pkgconfig() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/ares.h" + "#ifdef CARES_STATICLIB" "#if 1" + ) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") # Empty folders +endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/c-ares/usage b/externals/vcpkg/ports/c-ares/usage new file mode 100755 index 000000000..f560e8d64 --- /dev/null +++ b/externals/vcpkg/ports/c-ares/usage @@ -0,0 +1,4 @@ +The package c-ares provides CMake targets: + + find_package(c-ares CONFIG REQUIRED) + target_link_libraries(main PRIVATE c-ares::cares) diff --git a/externals/vcpkg/ports/c-ares/vcpkg.json b/externals/vcpkg/ports/c-ares/vcpkg.json new file mode 100755 index 000000000..488c5645a --- /dev/null +++ b/externals/vcpkg/ports/c-ares/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "c-ares", + "version-semver": "1.18.1", + "port-version": 1, + "description": "A C library for asynchronous DNS requests", + "homepage": "https://github.com/c-ares/c-ares", + "license": "MIT-CMU", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/c-dbg-macro/portfile.cmake b/externals/vcpkg/ports/c-dbg-macro/portfile.cmake new file mode 100755 index 000000000..95dd96ceb --- /dev/null +++ b/externals/vcpkg/ports/c-dbg-macro/portfile.cmake @@ -0,0 +1,14 @@ +# single header file library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO eerimoq/dbg-macro + REF 78b7655bd0cfc2389fe96a3b6584d2930eb7ebd7 + SHA512 f755c8cf17b422f43f09dcd4f8232b6130a5933d0ce537ce4874ecb886ad2fd5dee26fe12c10cb1554a3720a1263d0ce07252c0893de395b8c9042c9330e60be + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/include/dbg.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/c-dbg-macro/vcpkg.json b/externals/vcpkg/ports/c-dbg-macro/vcpkg.json new file mode 100755 index 000000000..0891d40d9 --- /dev/null +++ b/externals/vcpkg/ports/c-dbg-macro/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "c-dbg-macro", + "version-date": "2020-02-29", + "description": "A dbg(...) macro for C", + "homepage": "https://github.com/eerimoq/dbg-macro" +} diff --git a/externals/vcpkg/ports/c4core/portfile.cmake b/externals/vcpkg/ports/c4core/portfile.cmake new file mode 100755 index 000000000..fbfd0a0e3 --- /dev/null +++ b/externals/vcpkg/ports/c4core/portfile.cmake @@ -0,0 +1,90 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +# Get c4core src +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO biojppm/c4core + REF 8d1af00e2318e9d583c10fd3d89b8b1b1f923ea7 + SHA512 a9b4e418d31f00682f4a5224c685ebc3c1ef96a5334f1a42bfeea773dbdc7f4d67191ca0e91dca45130e4c385708c9530696b9b038bbdb03d7a331c87793185d + HEAD_REF master +) + +set(CM_COMMIT_HASH fe41e86552046c3df9ba73a40bf3d755df028c1e) + +# Get cmake scripts for c4core +vcpkg_download_distfile( + CMAKE_ARCHIVE + URLS "https://github.com/biojppm/cmake/archive/${CM_COMMIT_HASH}.zip" + FILENAME "cmake-${CM_COMMIT_HASH}.zip" + SHA512 7292f9856d9c41581f2731e73fdf08880e0f4353b757da38a13ec89b62c5c8cb52b9efc1a9ff77336efa0b6809727c17649e607d8ecacc965a9b2a7a49925237 +) + +vcpkg_extract_source_archive( + SOURCE_PATH_CMAKE + ARCHIVE ${CMAKE_ARCHIVE} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/deps" +) + +file(REMOVE_RECURSE "${SOURCE_PATH}/cmake") +file(RENAME "${SOURCE_PATH_CMAKE}" "${SOURCE_PATH}/cmake") + +set(DB_COMMIT_HASH 78e525c6e74df6d62d782864a52c0d279dcee24f) + +vcpkg_download_distfile( + DEBUGBREAK_ARCHIVE + URLS "https://github.com/biojppm/debugbreak/archive/${DB_COMMIT_HASH}.zip" + FILENAME "debugbreak-${DB_COMMIT_HASH}.zip" + SHA512 25f3d45b09ce362f736fac0f6d6a6c7f2053fec4975b32b0565288893e4658fd0648a7988c3a5fe0e373e92705d7a3970eaa7cfc053f375ffb75e80772d0df64 +) + +vcpkg_extract_source_archive( + SOURCE_PATH_DEBUGBREAK + ARCHIVE ${DEBUGBREAK_ARCHIVE} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/deps" +) + +file(REMOVE_RECURSE "${SOURCE_PATH}/src/c4/ext/debugbreak") +file(RENAME "${SOURCE_PATH_DEBUGBREAK}" "${SOURCE_PATH}/src/c4/ext/debugbreak") + +set(FF_COMMIT_HASH 8159e8bcf63c1b92f5a51fb550f966e56624b209) + +vcpkg_download_distfile( + FAST_FLOAT_ARCHIVE + URLS "https://github.com/biojppm/fast_float/archive/${FF_COMMIT_HASH}.zip" + FILENAME "fast_float-${FF_COMMIT_HASH}.zip" + SHA512 ae71f74d3bae782f62f037c034bea4e7f45462188c8285971c2959c6b2884d3bb58826681c0989f4290f26fa33237c1b63ceed77ed94f9e97c1cd01b4aa21cd3 +) + +vcpkg_extract_source_archive( + SOURCE_PATH_FAST_FLOAT + ARCHIVE ${FAST_FLOAT_ARCHIVE} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/deps" +) + +file(REMOVE_RECURSE "${SOURCE_PATH}/src/c4/ext/fast_float") +file(RENAME "${SOURCE_PATH_FAST_FLOAT}" "${SOURCE_PATH}/src/c4/ext/fast_float") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +elseif(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/c4core) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/c4core) +endif() + +# Fix paths in config file +file(READ "${CURRENT_PACKAGES_DIR}/share/c4core/c4coreConfig.cmake" _contents) +string(REGEX REPLACE [[[ \t\r\n]*"\${PACKAGE_PREFIX_DIR}[\./\\]*"]] [["${PACKAGE_PREFIX_DIR}/../.."]] _contents "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/c4core/c4coreConfig.cmake" "${_contents}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL + "${SOURCE_PATH}/LICENSE.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/c4core/vcpkg.json b/externals/vcpkg/ports/c4core/vcpkg.json new file mode 100755 index 000000000..cc75970c5 --- /dev/null +++ b/externals/vcpkg/ports/c4core/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "c4core", + "version": "0.1.9", + "description": "Library of low-level C++ utilities", + "homepage": "https://github.com/biojppm/c4core", + "license": "MIT", + "supports": "!(uwp | arm)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/c89stringutils/portfile.cmake b/externals/vcpkg/ports/c89stringutils/portfile.cmake new file mode 100755 index 000000000..ae15441cb --- /dev/null +++ b/externals/vcpkg/ports/c89stringutils/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO offscale/c89stringutils + REF 375c87aaf50a945b17a76727f3314eb217897caf + SHA512 395d942a133209daf510094814830e35daf2047c35b0ff15b17051d7095e4598fd830e0e7f763cac6929b867ff3b0c03c5350c4c3cfc68ed98b69c9c68c04be0 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DBUILD_TESTS=OFF" +) +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/cmake/LICENSE.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/c89stringutils" + RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/externals/vcpkg/ports/c89stringutils/vcpkg.json b/externals/vcpkg/ports/c89stringutils/vcpkg.json new file mode 100755 index 000000000..7a14d2046 --- /dev/null +++ b/externals/vcpkg/ports/c89stringutils/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "c89stringutils", + "version": "0.0.1", + "description": "string functions from newer standards / common non-standards for C89", + "license": "Apache-2.0 OR MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/c9y/portfile.cmake b/externals/vcpkg/ports/c9y/portfile.cmake new file mode 100755 index 000000000..42f281d8c --- /dev/null +++ b/externals/vcpkg/ports/c9y/portfile.cmake @@ -0,0 +1,16 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rioki/c9y + REF v0.3.0 + SHA512 9d105f5d8f93856d6104663704944e0456c779c9ae6469d4ad9a40f6e451065376a44e4efb61c2e0b5e79cb2f3ae78de72209b6668d56d7df7992275f2168336 + ) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/c9y/vcpkg.json b/externals/vcpkg/ports/c9y/vcpkg.json new file mode 100755 index 000000000..ebeff7610 --- /dev/null +++ b/externals/vcpkg/ports/c9y/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "c9y", + "version-semver": "0.3.0", + "description": "Concurency", + "homepage": "https://github.com/rioki/c9y", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/caf/fix_cxx17.patch b/externals/vcpkg/ports/caf/fix_cxx17.patch new file mode 100755 index 000000000..18094c07b --- /dev/null +++ b/externals/vcpkg/ports/caf/fix_cxx17.patch @@ -0,0 +1,8 @@ +--- a/CMakeLists.txt ++++ a/CMakeLists.txt +@@ -115,3 +115,4 @@ ++target_compile_features(caf_internal INTERFACE cxx_std_17) + # TODO: simply set CXX_STANDARD when switching to CMake ≥ 3.9.6 +-if(NOT CMAKE_CROSSCOMPILING) ++if(0) + try_compile(caf_has_cxx_17 diff --git a/externals/vcpkg/ports/caf/fix_dependency.patch b/externals/vcpkg/ports/caf/fix_dependency.patch new file mode 100755 index 000000000..10636ba71 --- /dev/null +++ b/externals/vcpkg/ports/caf/fix_dependency.patch @@ -0,0 +1,11 @@ +diff --git a/cmake/CAFConfig.cmake.in b/cmake/CAFConfig.cmake.in +index 1a2348c..6c0d0b2 100644 +--- a/cmake/CAFConfig.cmake.in ++++ b/cmake/CAFConfig.cmake.in +@@ -5,5 +5,6 @@ include(CMakeFindDependencyMacro) + set(CMAKE_THREAD_PREFER_PTHREAD TRUE) + set(THREADS_PREFER_PTHREAD_FLAG TRUE) + find_dependency(Threads) ++find_dependency(OpenSSL REQUIRED) + + include("${CMAKE_CURRENT_LIST_DIR}/CAFTargets.cmake") diff --git a/externals/vcpkg/ports/caf/portfile.cmake b/externals/vcpkg/ports/caf/portfile.cmake new file mode 100755 index 000000000..c186a2272 --- /dev/null +++ b/externals/vcpkg/ports/caf/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO actor-framework/actor-framework + REF bfa0f83dd5c9151c263c304300c79161ae8cb595 # 0.18.6 + SHA512 58ebd40623edc0245dd38b3a2bbbda7af7d9b030155746949dfe7c4c30bdc07ee2ee84d195dc2e914d69f58c6c46bc9ad496bbc34e7cafe0530200458a4c5a76 + HEAD_REF master + PATCHES + fix_dependency.patch + fix_cxx17.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON + -DCAF_ENABLE_CURL_EXAMPLES=OFF + -DCAF_ENABLE_PROTOBUF_EXAMPLES=OFF + -DCAF_ENABLE_QT6_EXAMPLES=OFF + -DCAF_ENABLE_RUNTIME_CHECKS=OFF + -DCAF_ENABLE_ACTOR_PROFILER=OFF + -DCAF_ENABLE_EXAMPLES=OFF + -DCAF_ENABLE_TESTING=OFF + -DCAF_ENABLE_TOOLS=OFF + -DCAF_ENABLE_IO_MODULE=ON + -DCAF_ENABLE_EXCEPTIONS=ON + -DCAF_ENABLE_UTILITY_TARGETS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME CAF CONFIG_PATH lib/cmake/CAF) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/caf/vcpkg.json b/externals/vcpkg/ports/caf/vcpkg.json new file mode 100755 index 000000000..5d89216c3 --- /dev/null +++ b/externals/vcpkg/ports/caf/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "caf", + "version": "0.18.6", + "port-version": 1, + "description": "an open source implementation of the actor model for C++ featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.", + "homepage": "https://github.com/actor-framework/actor-framework", + "license": "BSD-3-Clause", + "dependencies": [ + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/caffe2/fix-protobuf-deprecated.patch b/externals/vcpkg/ports/caffe2/fix-protobuf-deprecated.patch new file mode 100755 index 000000000..4f594d430 --- /dev/null +++ b/externals/vcpkg/ports/caffe2/fix-protobuf-deprecated.patch @@ -0,0 +1,26 @@ +diff --git a/caffe2/utils/proto_utils.cc b/caffe2/utils/proto_utils.cc +index ab2d756..2c36ec4 100644 +--- a/caffe2/utils/proto_utils.cc ++++ b/caffe2/utils/proto_utils.cc +@@ -102,10 +102,9 @@ bool ReadProtoFromBinaryFile(const char* filename, MessageLite* proto) { + ::google::protobuf::io::CopyingInputStreamAdaptor stream( + new IfstreamInputStream(filename)); + stream.SetOwnsCopyingStream(true); +- // Total bytes hard limit / warning limit are set to 1GB and 512MB +- // respectively. ++ // Total bytes hard limit is set to 1GB. + ::google::protobuf::io::CodedInputStream coded_stream(&stream); +- coded_stream.SetTotalBytesLimit(1024LL << 20, 512LL << 20); ++ coded_stream.SetTotalBytesLimit(1024LL << 20); + return proto->ParseFromCodedStream(&coded_stream); + } + +@@ -155,7 +154,7 @@ bool ReadProtoFromBinaryFile(const char* filename, MessageLite* proto) { + std::unique_ptr coded_input( + new CodedInputStream(raw_input.get())); + // A hack to manually allow using very large protocol buffers. +- coded_input->SetTotalBytesLimit(1073741824, 536870912); ++ coded_input->SetTotalBytesLimit(1073741824); + bool success = proto->ParseFromCodedStream(coded_input.get()); + coded_input.reset(); + raw_input.reset(); diff --git a/externals/vcpkg/ports/caffe2/fix-space.patch b/externals/vcpkg/ports/caffe2/fix-space.patch new file mode 100755 index 000000000..910f52f9c --- /dev/null +++ b/externals/vcpkg/ports/caffe2/fix-space.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake +index e082298..25186e4 100644 +--- a/cmake/Utils.cmake ++++ b/cmake/Utils.cmake +@@ -386,7 +386,7 @@ function(caffe_add_whole_archive_flag lib output_var) + set(${output_var} -Wl,-force_load,$ PARENT_SCOPE) + elseif(MSVC) + # In MSVC, we will add whole archive in default. +- set(${output_var} -WHOLEARCHIVE:$ PARENT_SCOPE) ++ set(${output_var} -WHOLEARCHIVE:"$" PARENT_SCOPE) + else() + # Assume everything else is like gcc + set(${output_var} -Wl,--whole-archive ${lib} -Wl,--no-whole-archive PARENT_SCOPE) diff --git a/externals/vcpkg/ports/caffe2/msvc-fixes.patch b/externals/vcpkg/ports/caffe2/msvc-fixes.patch new file mode 100755 index 000000000..446dbd44e --- /dev/null +++ b/externals/vcpkg/ports/caffe2/msvc-fixes.patch @@ -0,0 +1,396 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8054d98..35934f5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -56,6 +56,14 @@ option(USE_ROCKSDB "Use RocksDB" ON) + option(USE_SNPE "Use Qualcomm's SNPE library" OFF) + option(USE_THREADS "Use Threads" ON) + option(USE_ZMQ "Use ZMQ" OFF) ++if(MSVC) ++ if(BUILD_BUILD_SHARED_LIBS) ++ set(USE_STATIC_RUNTIME_DEFAULT OFF) ++ else() ++ set(USE_STATIC_RUNTIME_DEFAULT ON) ++ endif() ++ option(USE_STATIC_RUNTIME "Link to the static runtime (/MT) instead of dynamic (/MD)" ${USE_STATIC_RUNTIME_DEFAULT}) ++endif() + + # External projects + include(ExternalProject) +@@ -99,7 +107,7 @@ else() + foreach(flag_var + CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE + CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) +- if (NOT ${BUILD_SHARED_LIBS}) ++ if (USE_STATIC_RUNTIME) + if(${flag_var} MATCHES "/MD") + string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") + endif(${flag_var} MATCHES "/MD") +diff --git a/caffe2/core/logging.cc b/caffe2/core/logging.cc +index 1b4468e..1379f3a 100644 +--- a/caffe2/core/logging.cc ++++ b/caffe2/core/logging.cc +@@ -117,7 +117,7 @@ using fLB::FLAGS_logtostderr; + + #endif // CAFFE2_USE_GFLAGS + +-CAFFE2_DEFINE_int(caffe2_log_level, google::ERROR, ++CAFFE2_DEFINE_int(caffe2_log_level, google::GLOG_ERROR, + "The minimum log level that caffe2 will output."); + + // Google glog's api does not have an external function that allows one to check +@@ -134,15 +134,23 @@ bool IsGoogleLoggingInitialized(); + namespace caffe2 { + bool InitCaffeLogging(int* argc, char** argv) { + if (*argc == 0) return true; +- if (!::google::glog_internal_namespace_::IsGoogleLoggingInitialized()) { ++#if !(defined(_MSC_VER) && defined(GLOG_IS_A_DLL)) ++ // IsGoogleLoggingInitialized is not exported from the glog DLL ++ // so we can't call it. If our program calls InitGoogleLogging twice glog will ++ // abort it. ++ if (!::google::glog_internal_namespace_::IsGoogleLoggingInitialized()) ++#endif ++ { + ::google::InitGoogleLogging(argv[0]); ++#if !defined(_MSC_VER) + ::google::InstallFailureSignalHandler(); ++#endif + } + // If caffe2_log_level is set and is lower than the min log level by glog, + // we will transfer the caffe2_log_level setting to glog to override that. + FLAGS_minloglevel = std::min(FLAGS_caffe2_log_level, FLAGS_minloglevel); + // If caffe2_log_level is explicitly set, let's also turn on logtostderr. +- if (FLAGS_caffe2_log_level < google::ERROR) { ++ if (FLAGS_caffe2_log_level < google::GLOG_ERROR) { + FLAGS_logtostderr = 1; + } + // Also, transfer the caffe2_log_level verbose setting to glog. +@@ -154,7 +162,7 @@ bool InitCaffeLogging(int* argc, char** argv) { + + void ShowLogInfoToStderr() { + FLAGS_logtostderr = 1; +- FLAGS_minloglevel = std::min(FLAGS_minloglevel, google::INFO); ++ FLAGS_minloglevel = std::min(FLAGS_minloglevel, google::GLOG_INFO); + } + } // namespace caffe2 + +diff --git a/caffe2/core/logging_is_google_glog.h b/caffe2/core/logging_is_google_glog.h +index 7dd2b4f..2df4435 100644 +--- a/caffe2/core/logging_is_google_glog.h ++++ b/caffe2/core/logging_is_google_glog.h +@@ -8,7 +8,7 @@ + // it. Some mobile platforms do not like stl_logging, so we add an + // overload in that case as well. + +-#if !defined(__CUDACC__) && !defined(CAFFE2_USE_MINIMAL_GOOGLE_GLOG) ++#if !defined(__CUDARCH__) && !defined(CAFFE2_USE_MINIMAL_GOOGLE_GLOG) + #include + #else // !defined(__CUDACC__) && !!defined(CAFFE2_USE_MINIMAL_GOOGLE_GLOG) + +diff --git a/caffe2/image/image_input_op.h b/caffe2/image/image_input_op.h +index 9604e98..7d90014 100644 +--- a/caffe2/image/image_input_op.h ++++ b/caffe2/image/image_input_op.h +@@ -214,13 +214,13 @@ ImageInputOp::ImageInputOp( + + // hard-coded PCA eigenvectors and eigenvalues, based on RBG channel order + color_lighting_eigvecs_.push_back( +- std::vector{-144.7125, 183.396, 102.2295}); ++ std::vector{-144.7125f, 183.396f, 102.2295f}); + color_lighting_eigvecs_.push_back( +- std::vector{-148.104, -1.1475, -207.57}); ++ std::vector{-148.104f, -1.1475f, -207.57f}); + color_lighting_eigvecs_.push_back( +- std::vector{-148.818, -177.174, 107.1765}); ++ std::vector{-148.818f, -177.174f, 107.1765f}); + +- color_lighting_eigvals_ = std::vector{0.2175, 0.0188, 0.0045}; ++ color_lighting_eigvals_ = std::vector{0.2175f, 0.0188f, 0.0045f}; + + CAFFE_ENFORCE_GT(batch_size_, 0, "Batch size should be nonnegative."); + if (use_caffe_datum_) { +diff --git a/caffe2/operators/batch_matmul_op.cc b/caffe2/operators/batch_matmul_op.cc +index c2e578d..28cf030 100644 +--- a/caffe2/operators/batch_matmul_op.cc ++++ b/caffe2/operators/batch_matmul_op.cc +@@ -34,7 +34,7 @@ size (C x K x N) where C is the batch size and i ranges from 0 to C-1. + b_dim1 = in[1].dims(2); + } + return vector { +- CreateTensorShape(vector { ++ CreateTensorShape(vector { + in[0].dims(0), a_dim0, b_dim1}, + in[0].data_type()) + }; +diff --git a/caffe2/operators/layer_norm_op.cu b/caffe2/operators/layer_norm_op.cu +index df13fc3..68bbc97 100644 +--- a/caffe2/operators/layer_norm_op.cu ++++ b/caffe2/operators/layer_norm_op.cu +@@ -252,8 +252,8 @@ bool LayerNormGradientOp::DoRunWithType() { + auto* ginput = Output(0); + + const auto canonical_axis = norm_inputs.canonical_axis_index(axis_); +- const int left = norm_inputs.size_to_dim(canonical_axis); +- const int right = norm_inputs.size_from_dim(canonical_axis); ++ const TIndex left = norm_inputs.size_to_dim(canonical_axis); ++ const TIndex right = norm_inputs.size_from_dim(canonical_axis); + + ginput->ResizeLike(norm_inputs); + std::vector stats_dims( +@@ -261,7 +261,7 @@ bool LayerNormGradientOp::DoRunWithType() { + stats_dims.push_back(1); + dmean_.Resize(stats_dims); + dstdev_.Resize(stats_dims); +- gscratch_.Resize(std::vector{left, right}); ++ gscratch_.Resize(std::vector{left, right}); + + std::vector segs(left + 1); + std::iota(segs.begin(), segs.end(), 0); +@@ -291,7 +291,7 @@ bool LayerNormGradientOp::DoRunWithType() { + dout.data(), + gscratch_.mutable_data()); + +- dstdev_.Resize(vector{left, 1}); ++ dstdev_.Resize(vector{left, 1}); + // dstdev = reduce(temp1) + allocScratchAndReduce( + gscratch_.data(), +diff --git a/caffe2/operators/lengths_top_k_op.cc b/caffe2/operators/lengths_top_k_op.cc +index c871d53..bad741a 100644 +--- a/caffe2/operators/lengths_top_k_op.cc ++++ b/caffe2/operators/lengths_top_k_op.cc +@@ -14,7 +14,7 @@ bool LengthsTopKOp::RunOnDevice() { + + output_topk_values->Resize(N * k_); + output_topk_indices->Resize(N * k_); +- std::vector output_dims = std::vector({N, k_}); ++ std::vector output_dims = std::vector({N, k_}); + output_topk_values->Reshape(output_dims); + output_topk_indices->Reshape(output_dims); + T* output_topk_values_data = output_topk_values->template mutable_data(); +diff --git a/caffe2/operators/pool_op_cudnn.cu b/caffe2/operators/pool_op_cudnn.cu +index a380d8d..b0cd326 100644 +--- a/caffe2/operators/pool_op_cudnn.cu ++++ b/caffe2/operators/pool_op_cudnn.cu +@@ -467,6 +467,15 @@ class CuDNNPoolGradientOp : public ConvPoolOpBase { + cudnnPoolingDescriptor_t pooling_desc_; + cudnnPoolingMode_t mode_; + ++// MSVC defines IN and OUT in minwindef.h ++#ifdef IN ++#undef IN ++#endif ++ ++#ifdef OUT ++#undef OUT ++#endif ++ + // Input: X, Y, dY + // Output: dX + INPUT_TAGS(IN, OUT, OUT_GRAD); +diff --git a/caffe2/operators/recurrent_op_cudnn.cc b/caffe2/operators/recurrent_op_cudnn.cc +index 7777813..58bc8c3 100644 +--- a/caffe2/operators/recurrent_op_cudnn.cc ++++ b/caffe2/operators/recurrent_op_cudnn.cc +@@ -115,10 +115,11 @@ void RecurrentBaseOp::initialize( + + // RNN setup + { +- CUDNN_ENFORCE(cudnnSetRNNDescriptor( ++// Do not use #if condition inside CUDNN_ENFORCE ++// to avoid macro expansion errors. + #if CUDNN_MAJOR >= 7 ++CUDNN_ENFORCE(cudnnSetRNNDescriptor( + cudnn_wrapper_.inline_cudnn_handle(), +-#endif + rnnDesc_, + hiddenSize, + numLayers, +@@ -126,10 +127,19 @@ void RecurrentBaseOp::initialize( + rnnInput, + rnnDirection, + rnnMode, +-#if CUDNN_MAJOR >= 7 + CUDNN_RNN_ALGO_STANDARD, // TODO: verify correctness / efficiency. +-#endif + cudnnTypeWrapper::type)); ++#else ++ CUDNN_ENFORCE(cudnnSetRNNDescriptor( ++ rnnDesc_, ++ hiddenSize, ++ numLayers, ++ dropoutDesc_, ++ rnnInput, ++ rnnDirection, ++ rnnMode, ++ cudnnTypeWrapper::type)); ++#endif // CUDNN_MAJOR >= 7 + } + // X setup + { +diff --git a/caffe2/utils/CMakeLists.txt b/caffe2/utils/CMakeLists.txt +index f90af5a..919a638 100644 +--- a/caffe2/utils/CMakeLists.txt ++++ b/caffe2/utils/CMakeLists.txt +@@ -27,6 +27,10 @@ exclude(Caffe2_CPU_SRCS "${Caffe2_CPU_SRCS}" ${Caffe2_GPU_SRCS}) + # will directly link nnpack pthreadpool. + file(GLOB_RECURSE tmp pthreadpool*) + exclude(Caffe2_CPU_SRCS "${Caffe2_CPU_SRCS}" ${tmp}) ++if(MSVC) ++ file(GLOB_RECURSE tmp *ThreadPool.cc) ++ exclude(Caffe2_CPU_SRCS "${Caffe2_CPU_SRCS}" ${tmp}) ++endif() + + # ---[ GPU test files + file(GLOB_RECURSE tmp *_gpu_test.cc) +diff --git a/caffe2/utils/GpuBitonicSort.cuh b/caffe2/utils/GpuBitonicSort.cuh +index f52bb50..a199bcb 100644 +--- a/caffe2/utils/GpuBitonicSort.cuh ++++ b/caffe2/utils/GpuBitonicSort.cuh +@@ -39,9 +39,11 @@ __device__ inline void bitonicSort(K* keys, + // Assume the sort is taking place in shared memory + // static_assert(Power2SortSize * (sizeof(K) + sizeof(V)) < 32768, + // "sort data too large (>32768 bytes)"); +- static_assert(math::integerIsPowerOf2(Power2SortSize), ++ static_assert(math::integerIsPowerOf2( ++ std::integral_constant::value), + "sort size must be power of 2"); +- static_assert(math::integerIsPowerOf2(ThreadsPerBlock), ++ static_assert(math::integerIsPowerOf2( ++ std::integral_constant::value), + "threads in block must be power of 2"); + + // If what we are sorting is too small, then not all threads +@@ -107,7 +109,8 @@ __device__ inline void warpBitonicSort(K* keys, + // Smaller sorts should use a warp shuffle sort + static_assert(Power2SortSize > kWarpSize, + "sort not large enough"); +- static_assert(math::integerIsPowerOf2(Power2SortSize), ++ static_assert(math::integerIsPowerOf2( ++ std::integral_constant::value), + "sort size must be power of 2"); + static_assert(Power2SortSize <= kMaxBitonicSortSize, + "sort size <= 4096 only supported"); +diff --git a/caffe2/utils/math.h b/caffe2/utils/math.h +index 6c352dc..a1eda9d 100644 +--- a/caffe2/utils/math.h ++++ b/caffe2/utils/math.h +@@ -426,18 +426,10 @@ constexpr T roundUp(T a, T b) { + return divUp(a, b) * b; + } + +-// Returns true if the given integer type is a power-of-2 (positive only) +-// Note(jiayq): windows reported an error per +-// https://github.com/caffe2/caffe2/issues/997 +-// and as a result will make it a macro. +-#ifdef _MSC_VER +-#define integerIsPowerOf2(v) ((v) && !((v) & ((v) - 1))) +-#else // _MSC_VER + template + constexpr bool integerIsPowerOf2(T v) { + return (v && !(v & (v - 1))); + } +-#endif // _MSC_VER + + // Returns log2(n) for a positive integer type + template +diff --git a/cmake/Cuda.cmake b/cmake/Cuda.cmake +index df70e2f..ca1b123 100644 +--- a/cmake/Cuda.cmake ++++ b/cmake/Cuda.cmake +@@ -37,6 +37,10 @@ function(caffe2_detect_installed_gpus out_variable) + ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) + + if(__nvcc_res EQUAL 0) ++ # nvcc outputs text containing line breaks when building with MSVC. ++ # The line below prevents CMake from inserting a variable with line ++ # breaks in the cache ++ string(REGEX MATCH "([1-9].[0-9])" __nvcc_out "${__nvcc_out}") + string(REPLACE "2.1" "2.1(2.0)" __nvcc_out "${__nvcc_out}") + set(CUDA_gpu_detect_output ${__nvcc_out} CACHE INTERNAL "Returned GPU architetures from caffe_detect_gpus tool" FORCE) + endif() +@@ -249,7 +253,7 @@ endif() + # Debug and Release symbol support + if (MSVC) + if (${CMAKE_BUILD_TYPE} MATCHES "Release") +- if (${BUILD_SHARED_LIBS}) ++ if (NOT USE_STATIC_RUNTIME) + list(APPEND CUDA_NVCC_FLAGS "-Xcompiler -MD") + else() + list(APPEND CUDA_NVCC_FLAGS "-Xcompiler -MT") +@@ -259,7 +263,7 @@ if (MSVC) + "Caffe2 currently does not support the combination of MSVC, Cuda " + "and Debug mode. Either set USE_CUDA=OFF or set the build type " + "to Release") +- if (${BUILD_SHARED_LIBS}) ++ if (NOT USE_STATIC_RUNTIME) + list(APPEND CUDA_NVCC_FLAGS "-Xcompiler -MDd") + else() + list(APPEND CUDA_NVCC_FLAGS "-Xcompiler -MTd") +diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake +index afb6b68..bdad8b6 100644 +--- a/cmake/Dependencies.cmake ++++ b/cmake/Dependencies.cmake +@@ -182,6 +182,15 @@ if(USE_OPENCV) + message(WARNING "Not compiling with OpenCV. Suppress this warning with -DUSE_OPENCV=OFF") + set(USE_OPENCV OFF) + endif() ++ if(USE_OPENCV AND VCPKG_TARGET_TRIPLET MATCHES static) ++ find_package(LibLZMA QUIET) ++ if(LIBLZMA_FOUND) ++ list(APPEND Caffe2_DEPENDENCY_LIBS ${LIBLZMA_LIBRARIES}) ++ else() ++ message(WARNING "Not compiling with OpenCV. Could not find liblzma. Suppress this warning with -DUSE_OPENCV=OFF") ++ set(USE_OPENCV OFF) ++ endif() ++ endif() + endif() + + # ---[ FFMPEG +diff --git a/cmake/Modules/FindGlog.cmake b/cmake/Modules/FindGlog.cmake +index 1167532..9780ba5 100644 +--- a/cmake/Modules/FindGlog.cmake ++++ b/cmake/Modules/FindGlog.cmake +@@ -27,6 +27,10 @@ if(MSVC) + endif() + if(TARGET ${GLOG_LIBRARY}) + get_target_property(GLOG_INCLUDE_DIR ${GLOG_LIBRARY} INTERFACE_INCLUDE_DIRECTORIES) ++ get_target_property(GLOG_TYPE ${GLOG_LIBRARY} TYPE) ++ if("${GLOG_TYPE}" STREQUAL "SHARED_LIBRARY") ++ add_definitions(-DGLOG_IS_A_DLL=1) ++ endif() + endif() + else() + find_library(GLOG_LIBRARY glog +diff --git a/cmake/ProtoBuf.cmake b/cmake/ProtoBuf.cmake +index 89975c8..e37d6da 100644 +--- a/cmake/ProtoBuf.cmake ++++ b/cmake/ProtoBuf.cmake +@@ -13,6 +13,9 @@ function(custom_protobuf_find) + # so we turn it off here. + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations" PARENT_SCOPE) + endif() ++ if(MSVC) ++ set(protobuf_MSVC_STATIC_RUNTIME ${USE_STATIC_RUNTIME}) ++ endif() + add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/protobuf/cmake) + caffe2_include_directories(${PROJECT_SOURCE_DIR}/third_party/protobuf/src) + list(APPEND Caffe2_DEPENDENCY_LIBS libprotobuf) +diff --git a/cmake/Summary.cmake b/cmake/Summary.cmake +index b7423a6..2996484 100644 +--- a/cmake/Summary.cmake ++++ b/cmake/Summary.cmake +@@ -19,6 +19,13 @@ function (Caffe2_print_configuration_summary) + message(STATUS " System : ${CMAKE_SYSTEM_NAME}") + message(STATUS " C++ compiler : ${CMAKE_CXX_COMPILER}") + message(STATUS " C++ compiler version : ${CMAKE_CXX_COMPILER_VERSION}") ++ if(MSVC) ++ if(USE_STATIC_RUNTIME) ++ message(STATUS " Runtime : static (/MT)") ++ else() ++ message(STATUS " Runtime : dynamic (/MD)") ++ endif() ++ endif() + message(STATUS " Protobuf compiler : ${PROTOBUF_PROTOC_EXECUTABLE}") + message(STATUS " CXX flags : ${CMAKE_CXX_FLAGS}") + message(STATUS " Build type : ${CMAKE_BUILD_TYPE}") diff --git a/externals/vcpkg/ports/caffe2/no-inout-macros.patch b/externals/vcpkg/ports/caffe2/no-inout-macros.patch new file mode 100755 index 000000000..65f32e791 --- /dev/null +++ b/externals/vcpkg/ports/caffe2/no-inout-macros.patch @@ -0,0 +1,18 @@ +diff --git a/caffe2/core/logging_is_google_glog.h b/caffe2/core/logging_is_google_glog.h +index 2df4435..408bb4a 100644 +--- a/caffe2/core/logging_is_google_glog.h ++++ b/caffe2/core/logging_is_google_glog.h +@@ -30,5 +30,13 @@ INSTANTIATE_FOR_CONTAINER(std::set) + + #include + ++#ifdef IN ++#undef IN ++#endif ++ ++#ifdef OUT ++#undef OUT ++#endif ++ + + #endif // CAFFE2_CORE_LOGGING_IS_GOOGLE_GLOG_H_ diff --git a/externals/vcpkg/ports/caffe2/portfile.cmake b/externals/vcpkg/ports/caffe2/portfile.cmake new file mode 100755 index 000000000..b430b09c4 --- /dev/null +++ b/externals/vcpkg/ports/caffe2/portfile.cmake @@ -0,0 +1,101 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO caffe2/caffe2 + REF eab13a2d5c807bf5d49efd4584787b639a981b79 + SHA512 505a8540b0c28329c4e2ce443ac8e198c1ee613eb6b932927ee9d04c8afdc95081f3c4581408b7097d567840427b31f6d7626ea80f27e56532f2f2e6acd87023 + HEAD_REF master + PATCHES + msvc-fixes.patch + fix-space.patch + fix-protobuf-deprecated.patch + no-inout-macros.patch +) + +if(VCPKG_CRT_LINKAGE STREQUAL static) + set(USE_STATIC_RUNTIME ON) +else() + set(USE_STATIC_RUNTIME OFF) +endif() + +if(CMAKE_HOST_WIN32) + set(EXECUTABLE_SUFFIX ".exe") +else() + set(EXECUTABLE_SUFFIX "") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + # Set to ON to use python + -DBUILD_PYTHON=OFF + -DUSE_STATIC_RUNTIME=${USE_STATIC_RUNTIME} + -DUSE_GFLAGS=ON + -DUSE_GLOG=ON + # Cannot use OpenCV without USE_CUDA=ON right now + -DUSE_OPENCV=OFF + -DUSE_THREADS=ON + # Uncomment to use MKL + # -DBLAS=MKL + -DUSE_CUDA=OFF + -DUSE_FFMPEG=OFF + -DUSE_GLOO=OFF + -DUSE_LEVELDB=OFF + -DUSE_LITE_PROTO=OFF + -DUSE_METAL=OFF + -DUSE_MOBILE_OPENGL=OFF + -DUSE_MPI=OFF + -DUSE_NCCL=OFF + -DUSE_NERVANA_GPU=OFF + -DUSE_NNPACK=OFF + -DUSE_OBSERVERS=OFF + -DUSE_OPENMP=ON + -DUSE_REDIS=OFF + -DUSE_ROCKSDB=OFF + -DUSE_SNPE=OFF + -DUSE_ZMQ=OFF + -DBUILD_TEST=OFF + -DPROTOBUF_PROTOC_EXECUTABLE:FILEPATH=${CURRENT_INSTALLED_DIR}/tools/protobuf/protoc${EXECUTABLE_SUFFIX} +) + +vcpkg_cmake_install() + +# Remove folders from install +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/caffe") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/caffe2") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/caffe") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/caffe2") + +# Remove empty directories from include (should probably fix or +# patch caffe2 install script) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/test") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/python") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/experiments/python") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/opengl") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/nnpack") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/libopencl-stub") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/docker-ubuntu-14.04") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/binaries") + +# Move bin to tools +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") +file(GLOB BINARIES "${CURRENT_PACKAGES_DIR}/bin/*${EXECUTABLE_SUFFIX}") +foreach(binary IN LISTS BINARIES) + get_filename_component(binary_name ${binary} NAME) + file(RENAME ${binary} "${CURRENT_PACKAGES_DIR}/tools/${binary_name}") +endforeach() + +# Remove bin directory +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# Remove headers and tools from debug build +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# install license +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/caffe2/vcpkg.json b/externals/vcpkg/ports/caffe2/vcpkg.json new file mode 100755 index 000000000..8f4f65632 --- /dev/null +++ b/externals/vcpkg/ports/caffe2/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "caffe2", + "version": "0.8.1", + "port-version": 6, + "description": "Caffe2 is a lightweight, modular, and scalable deep learning framework.", + "homepage": "https://github.com/caffe2/caffe2", + "license": "Apache-2.0", + "supports": "!x86", + "dependencies": [ + "eigen3", + "gflags", + "glog", + "lmdb", + "protobuf", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/cairo/cairo_static_fix.patch b/externals/vcpkg/ports/cairo/cairo_static_fix.patch new file mode 100755 index 000000000..20c1c2877 --- /dev/null +++ b/externals/vcpkg/ports/cairo/cairo_static_fix.patch @@ -0,0 +1,16 @@ +--- meson.build.orig 2022-03-19 03:40:07.000000000 +0900 ++++ meson.build 2022-03-29 21:32:41.000000000 +0900 +@@ -100,6 +100,13 @@ + # Autotools compatibility + add_project_arguments('-DHAVE_CONFIG_H', language: 'c') + ++if host_machine.system() == 'windows' ++ lib_default = get_option('default_library') ++ if lib_default == 'static' ++ add_project_arguments('-DCAIRO_WIN32_STATIC_BUILD', language: 'c') ++ endif ++endif ++ + # Make sure source directory hasn't been configured with autotools + fs = import('fs') + if fs.exists('config.h') or fs.exists('src/cairo-features.h') or fs.exists('src/cairo-supported-features.h') diff --git a/externals/vcpkg/ports/cairo/disable-atomic-ops-check.patch b/externals/vcpkg/ports/cairo/disable-atomic-ops-check.patch new file mode 100755 index 000000000..b7768013d --- /dev/null +++ b/externals/vcpkg/ports/cairo/disable-atomic-ops-check.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index e3ec5d9..7b20c0c 100644 +--- a/meson.build ++++ b/meson.build +@@ -870,7 +870,7 @@ if cc.links(files('meson-cc-tests/atomic-ops-cxx11.c'), name: 'Atomic ops: cxx11 + conf.set('HAVE_CXX11_ATOMIC_PRIMITIVES', 1) + elif cc.links(files('meson-cc-tests/atomic-ops-gcc-legacy.c'), name: 'Atomic ops: gcc legacy') + conf.set('HAVE_GCC_LEGACY_ATOMICS', 1) +-elif cc.has_header('atomic_ops.h') ++elif false + conf.set('HAVE_LIB_ATOMIC_OPS', 1) + elif cc.has_header('libkern/OSAtomic.h') + conf.set('HAVE_OS_ATOMIC_OPS', 1) diff --git a/externals/vcpkg/ports/cairo/portfile.cmake b/externals/vcpkg/ports/cairo/portfile.cmake new file mode 100755 index 000000000..2a7390d82 --- /dev/null +++ b/externals/vcpkg/ports/cairo/portfile.cmake @@ -0,0 +1,90 @@ +set(CAIRO_VERSION 1.17.4) + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH SOURCE_PATH + REPO cairo/cairo + REF b43e7c6f3cf7855e16170a06d3a9c7234c60ca94 #v1.17.6 + SHA512 2d8f0cbb11638610eda104a370bb8450e28d835852b0f861928738a60949e0aaba7a554a9f9efabbefda10a37616d4cd0d3021b3fbb4ced1d52db1edb49bc358 + HEAD_REF master + PATCHES + cairo_static_fix.patch + disable-atomic-ops-check.patch # See https://gitlab.freedesktop.org/cairo/cairo/-/issues/554 +) + +if("fontconfig" IN_LIST FEATURES) + list(APPEND OPTIONS -Dfontconfig=enabled) +else() + list(APPEND OPTIONS -Dfontconfig=disabled) +endif() + +if("freetype" IN_LIST FEATURES) + list(APPEND OPTIONS -Dfreetype=enabled) +else() + list(APPEND OPTIONS -Dfreetype=disabled) +endif() + +if ("x11" IN_LIST FEATURES) + if (VCPKG_TARGET_IS_WINDOWS) + message(FATAL_ERROR "Feature x11 only support UNIX.") + endif() + message(WARNING "You will need to install Xorg dependencies to use feature x11:\nsudo apt install libx11-dev libxft-dev libxext-dev\n") + list(APPEND OPTIONS -Dxlib=enabled) +else() + list(APPEND OPTIONS -Dxlib=disabled) +endif() +list(APPEND OPTIONS -Dxcb=disabled) +list(APPEND OPTIONS -Dxlib-xcb=disabled) + +if("gobject" IN_LIST FEATURES) + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + message(FATAL_ERROR "Feature gobject currently only supports dynamic build.") + endif() + list(APPEND OPTIONS -Dglib=enabled) +else() + list(APPEND OPTIONS -Dglib=disabled) +endif() + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(ENV{CPP} "cl_cpp_wrapper") +endif() + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${OPTIONS} + -Dtests=disabled + -Dzlib=enabled + -Dpng=enabled + -Dspectre=auto + -Dgtk2-utils=disabled + -Dsymbol-lookup=disabled +) +vcpkg_install_meson() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +set(_file "${CURRENT_PACKAGES_DIR}/include/cairo/cairo.h") +file(READ ${_file} CAIRO_H) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + string(REPLACE "defined (CAIRO_WIN32_STATIC_BUILD)" "1" CAIRO_H "${CAIRO_H}") +else() + string(REPLACE "defined (CAIRO_WIN32_STATIC_BUILD)" "0" CAIRO_H "${CAIRO_H}") +endif() +file(WRITE ${_file} "${CAIRO_H}") + +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +#TODO: Fix script +#set(TOOLS) +#if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/cairo-trace${VCPKG_TARGET_EXECUTABLE_SUFFIX}") +# list(APPEND TOOLS cairo-trace) # sh script which needs to be fixed due to absolute paths in it. +#endif() +#vcpkg_copy_tools(TOOL_NAMES ${TOOLS} AUTO_CLEAN) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/cairo/vcpkg.json b/externals/vcpkg/ports/cairo/vcpkg.json new file mode 100755 index 000000000..f503956c5 --- /dev/null +++ b/externals/vcpkg/ports/cairo/vcpkg.json @@ -0,0 +1,48 @@ +{ + "name": "cairo", + "version": "1.17.6", + "port-version": 2, + "description": "Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.", + "homepage": "https://cairographics.org", + "license": "MPL-1.1", + "dependencies": [ + "dirent", + "expat", + "libpng", + "lzo", + "pixman", + "pthread", + { + "name": "vcpkg-tool-meson", + "host": true + }, + "zlib" + ], + "default-features": [ + "fontconfig", + "freetype" + ], + "features": { + "fontconfig": { + "description": "build with fontconfig", + "dependencies": [ + "fontconfig" + ] + }, + "freetype": { + "description": "use the freetype font backend", + "dependencies": [ + "freetype" + ] + }, + "gobject": { + "description": "build gobject module", + "dependencies": [ + "glib" + ] + }, + "x11": { + "description": "build with x11 support" + } + } +} diff --git a/externals/vcpkg/ports/cairomm/build-support-msvc2022.diff b/externals/vcpkg/ports/cairomm/build-support-msvc2022.diff new file mode 100755 index 000000000..b83bdd85f --- /dev/null +++ b/externals/vcpkg/ports/cairomm/build-support-msvc2022.diff @@ -0,0 +1,41 @@ +commit ed1ce9a630b375b0f43435e34fbe690eb8276178 +Author: Chun-wei Fan +Date: Wed Nov 10 16:11:04 2021 +0800 + + build: Support Visual Studio 2022 + + Make these builds distinct from the Visual Studio 2019 builds. + +diff --git a/MSVC_NMake/detectenv-msvc.mak b/MSVC_NMake/detectenv-msvc.mak +index bf2e906..58b7092 100644 +--- a/MSVC_NMake/detectenv-msvc.mak ++++ b/MSVC_NMake/detectenv-msvc.mak +@@ -98,9 +98,12 @@ PDBVER = 14 + !if $(VCVERSION) > 1909 && $(VCVERSION) < 1920 + VSVER_SUFFIX = 1 + VSVER = 15 +-!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 2000 ++!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 1930 + VSVER_SUFFIX = 2 + VSVER = 16 ++!elseif $(VCVERSION) > 1929 && $(VCVERSION) < 2000 ++VSVER_SUFFIX = 3 ++VSVER = 17 + !else + VSVER = $(PDBVER) + !endif +diff --git a/meson.build b/meson.build +index 8b18fc2..1fa2da0 100644 +--- a/meson.build ++++ b/meson.build +@@ -238,7 +238,9 @@ if is_msvc + add_project_arguments(disabled_warning, language: 'cpp') + endforeach + if use_msvc14x_toolset_ver +- if cpp_compiler.version().version_compare('>=19.20') ++ if cpp_compiler.version().version_compare('>=19.30') ++ msvc14x_toolset_ver = '-vc143' ++ elif cpp_compiler.version().version_compare('>=19.20') + msvc14x_toolset_ver = '-vc142' + elif cpp_compiler.version().version_compare('>=19.10') + msvc14x_toolset_ver = '-vc141' diff --git a/externals/vcpkg/ports/cairomm/portfile.cmake b/externals/vcpkg/ports/cairomm/portfile.cmake new file mode 100755 index 000000000..212310565 --- /dev/null +++ b/externals/vcpkg/ports/cairomm/portfile.cmake @@ -0,0 +1,41 @@ +set(CAIROMM_VERSION 1.16.1) +set(CAIROMM_HASH 2dbdd41f712d43573ad3118f37d443d2b9ae98737c240d5db8d830ef38f2b4a95182b2fc857577c7564eb94649e629f70380f16ee84f4978759f40e19d802757) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.cairographics.org/releases/cairomm-${CAIROMM_VERSION}.tar.xz" + FILENAME "cairomm-${CAIROMM_VERSION}.tar.xz" + SHA512 ${CAIROMM_HASH} +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + build-support-msvc2022.diff +) + +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -Dbuild-examples=false + -Dmsvc14x-parallel-installable=false # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019 +) + +vcpkg_install_meson() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +if(VCPKG_LIBRARY_LINAKGE STREQUAL "static") + set(_file "${CURRENT_PACKAGES_DIR}/lib/cairomm-1.16/include/cairommconfig.h") + if(EXISTS "${_file}") + vcpkg_replace_string("${_file}" "# define CAIROMM_DLL 1" "# undef CAIROMM_DLL\n# define CAIROMM_STATIC_LIB 1") + endif() + set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/cairomm-1.16/include/cairommconfig.h") + if(EXISTS "${_file}") + vcpkg_replace_string("${_file}" "# define CAIROMM_DLL 1" "# undef CAIROMM_DLL\n# define CAIROMM_STATIC_LIB 1") + endif() +endif() diff --git a/externals/vcpkg/ports/cairomm/vcpkg.json b/externals/vcpkg/ports/cairomm/vcpkg.json new file mode 100755 index 000000000..467d320c6 --- /dev/null +++ b/externals/vcpkg/ports/cairomm/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "cairomm", + "version": "1.16.1", + "description": "A C++ wrapper for the cairo graphics library", + "homepage": "https://www.cairographics.org", + "license": "LGPL-2.0-only", + "dependencies": [ + "cairo", + "libsigcpp", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/calceph/portfile.cmake b/externals/vcpkg/ports/calceph/portfile.cmake new file mode 100755 index 000000000..ecd7636e4 --- /dev/null +++ b/externals/vcpkg/ports/calceph/portfile.cmake @@ -0,0 +1,50 @@ +set(CALCEPH_VERSION "3.5.1") +set(CALCEPH_HASH 5e83bb46b92a0b53f2cae717363cb4497d5c9cb57b3903e70d9e2c50176ca7d234212d0209fd3fcb5feebfd0980313be17e2ad4e69482504bfe8686f93216b67) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/calceph-${CALCEPH_VERSION}.tar.gz" + FILENAME "calceph-${CALCEPH_VERSION}.tar.gz" + SHA512 ${CALCEPH_HASH} +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +if (VCPKG_TARGET_IS_WINDOWS) + + vcpkg_install_nmake( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + OPTIONS_DEBUG + DESTDIR="${CURRENT_INSTALLED_DIR}/calceph/debug" + CFLAGS="${VCPKG_C_FLAGS_DEBUG} " + OPTIONS_RELEASE + DESTDIR="${CURRENT_INSTALLED_DIR}/calceph" + CFLAGS="${VCPKG_C_FLAGS_RELEASE} " + ) + file(INSTALL "${CURRENT_INSTALLED_DIR}/calceph/include/calceph.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + file(INSTALL "${CURRENT_INSTALLED_DIR}/calceph/lib/libcalceph.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(INSTALL "${CURRENT_INSTALLED_DIR}/calceph/debug/lib/libcalceph.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + endif() + file(REMOVE_RECURSE "${CURRENT_INSTALLED_DIR}/calceph") + +else() # Build in UNIX + vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${OPTIONS} + --enable-fortran=no + --enable-thread=yes + ) + + vcpkg_install_make() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +endif() + + file(INSTALL "${SOURCE_PATH}/README.rst" DESTINATION "${CURRENT_PACKAGES_DIR}/share/calceph" RENAME readme.rst) + file(INSTALL "${SOURCE_PATH}/COPYING_CECILL_B.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/calceph" RENAME copyright) + file(INSTALL "${SOURCE_PATH}/doc/calceph_c.pdf" DESTINATION "${CURRENT_PACKAGES_DIR}/share/calceph" RENAME calceph_c.pdf) diff --git a/externals/vcpkg/ports/calceph/vcpkg.json b/externals/vcpkg/ports/calceph/vcpkg.json new file mode 100755 index 000000000..1c5b7b196 --- /dev/null +++ b/externals/vcpkg/ports/calceph/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "calceph", + "version": "3.5.1", + "description": "C library to access the binary planetary ephemeris files.", + "homepage": "https://www.imcce.fr/inpop/calceph/", + "documentation": "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/html/c/index.html", + "license": "CECILL-2.1 OR CECILL-B OR CECILL-C", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/camport3/portfile.cmake b/externals/vcpkg/ports/camport3/portfile.cmake new file mode 100755 index 000000000..3c5e4aea8 --- /dev/null +++ b/externals/vcpkg/ports/camport3/portfile.cmake @@ -0,0 +1,73 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO percipioxyz/camport3 + REF v1.6.2 + SHA512 e3b1fadb13b826e86aa174215430f5e4175aafd9a967f2401beb3768dcc489a8ce5a74c151d615bd3e34b837c81e201db55b290ef258612381141b0b94212fd1 + HEAD_REF master +) + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") +file(COPY + "${SOURCE_PATH}/include/TYApi.h" + "${SOURCE_PATH}/include/TYCoordinateMapper.h" + "${SOURCE_PATH}/include/TYImageProc.h" + "${SOURCE_PATH}/include/TyIsp.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +if(VCPKG_TARGET_IS_WINDOWS) + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib") + file(COPY + "${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib" + ) + file(COPY + "${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.dll" + DESTINATION "${CURRENT_PACKAGES_DIR}/bin" + ) + endif() + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") + file(COPY + "${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" + ) + file(COPY + "${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.dll" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" + ) + endif() + +elseif(VCPKG_TARGET_IS_LINUX) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set (CAMPORT3_ARCH "Aarch64") + elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set (CAMPORT3_ARCH "armv7hf") + elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set (CAMPORT3_ARCH "i686") + else() + set (CAMPORT3_ARCH ${VCPKG_TARGET_ARCHITECTURE}) + endif() + + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib") + file(COPY + "${SOURCE_PATH}/lib/linux/lib_${CAMPORT3_ARCH}/libtycam.so" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib" + ) + endif() + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") + file(COPY + "${SOURCE_PATH}/lib/linux/lib_${CAMPORT3_ARCH}/libtycam.so" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" + ) + endif() + +endif() + +file(INSTALL + "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/externals/vcpkg/ports/camport3/vcpkg.json b/externals/vcpkg/ports/camport3/vcpkg.json new file mode 100755 index 000000000..863706150 --- /dev/null +++ b/externals/vcpkg/ports/camport3/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "camport3", + "version": "1.6.2", + "description": "percipio.xyz cameras SDK", + "homepage": "https://github.com/percipioxyz/camport3", + "supports": "((windows & !uwp & !arm & !arm64 & !static) | linux) & !wasm32" +} diff --git a/externals/vcpkg/ports/capnproto/portfile.cmake b/externals/vcpkg/ports/capnproto/portfile.cmake new file mode 100755 index 000000000..a425280b3 --- /dev/null +++ b/externals/vcpkg/ports/capnproto/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO capnproto/capnproto + REF v0.9.1 + SHA512 BDC5960F26214139744D768CA4558B085E2D359C375A8849CA532A4C458A2DAF0EE1A1F4D00745DE5ABF353AA1E4084A2D85E5523006F23F591F21FAC2D847FD + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "openssl" OPENSSL_FEATURE +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + "-DWITH_OPENSSL=${OPENSSL_FEATURE}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CapnProto) + +vcpkg_copy_tools(TOOL_NAMES capnp capnpc-c++ capnpc-capnp AUTO_CLEAN) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/capnproto/vcpkg.json b/externals/vcpkg/ports/capnproto/vcpkg.json new file mode 100755 index 000000000..2a2c4f482 --- /dev/null +++ b/externals/vcpkg/ports/capnproto/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "capnproto", + "version": "0.9.1", + "port-version": 2, + "description": "Data interchange format and capability-based RPC system", + "homepage": "https://capnproto.org/", + "supports": "!windows | (!uwp & !arm)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "features": { + "openssl": { + "description": "Build libkj-tls by linking against OpenSSL.", + "dependencies": [ + "openssl" + ] + } + } +} diff --git a/externals/vcpkg/ports/capstone/001-silence-windows-crt-secure-warnings.patch b/externals/vcpkg/ports/capstone/001-silence-windows-crt-secure-warnings.patch new file mode 100755 index 000000000..a2e99e919 --- /dev/null +++ b/externals/vcpkg/ports/capstone/001-silence-windows-crt-secure-warnings.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f5f4448..5e5cc7e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -87,6 +87,10 @@ if(CAPSTONE_BUILD_STATIC_RUNTIME) + set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") + endif() + ++if(WIN32) ++ add_compile_definitions(_CRT_SECURE_NO_WARNINGS) ++endif() ++ + ## sources + set(SOURCES_ENGINE + cs.c diff --git a/externals/vcpkg/ports/capstone/portfile.cmake b/externals/vcpkg/ports/capstone/portfile.cmake new file mode 100755 index 000000000..86681b824 --- /dev/null +++ b/externals/vcpkg/ports/capstone/portfile.cmake @@ -0,0 +1,52 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "capstone-engine/capstone" + REF 000561b4f74dc15bda9af9544fe714efda7a6e13 # 5.0.0-rc2 + SHA512 66b09a7d2fda297836bbedaeece71dcfe39bdbd633d9b6ecb68ee2e5aa094b697226136ab172cdc4550e8b2ef1448d001c8ee4e0d456c6d277afe0b3d1aab5a1 + HEAD_REF next + PATCHES + 001-silence-windows-crt-secure-warnings.patch +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "arm" CAPSTONE_ARM_SUPPORT + "arm64" CAPSTONE_ARM64_SUPPORT + "evm" CAPSTONE_EVM_SUPPORT + "m680x" CAPSTONE_M680X_SUPPORT + "m68k" CAPSTONE_M68K_SUPPORT + "mips" CAPSTONE_MIPS_SUPPORT + "osxkernel" CAPSTONE_OSXKERNEL_SUPPORT + "ppc" CAPSTONE_PPC_SUPPORT + "sparc" CAPSTONE_SPARC_SUPPORT + "sysz" CAPSTONE_SYSZ_SUPPORT + "tms320c64x" CAPSTONE_TMS320C64X_SUPPORT + "x86" CAPSTONE_X86_SUPPORT + "x86-reduce" CAPSTONE_X86_REDUCE + "xcore" CAPSTONE_XCORE_SUPPORT + "diet" CAPSTONE_BUILD_DIET +) + +if ("osxkernel" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_OSX) + message(FATAL_ERROR "Feature 'osxkernel' only supported in OSX") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCAPSTONE_BUILD_TESTS=OFF + -DCAPSTONE_BUILD_CSTOOL=OFF + -DCAPSTONE_BUILD_STATIC_RUNTIME=${STATIC_CRT} + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/capstone/vcpkg.json b/externals/vcpkg/ports/capstone/vcpkg.json new file mode 100755 index 000000000..06ffbd968 --- /dev/null +++ b/externals/vcpkg/ports/capstone/vcpkg.json @@ -0,0 +1,72 @@ +{ + "name": "capstone", + "version": "5.0.0-rc2", + "port-version": 1, + "description": "Multi-architecture disassembly framework", + "homepage": "https://github.com/capstone-engine/capstone", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "arm": { + "description": "Capstone disassembly support for ARM" + }, + "arm64": { + "description": "Capstone disassembly support for ARM64" + }, + "diet": { + "description": "Build Capstone in diet mode (reduced features for smaller size)" + }, + "evm": { + "description": "Capstone disassembly support for EVM" + }, + "m680x": { + "description": "Capstone disassembly support for M680X" + }, + "m68k": { + "description": "Capstone disassembly support for M68k" + }, + "mips": { + "description": "Capstone disassembly support for MIPS" + }, + "osxkernel": { + "description": "Support for embedding Capstone into OSX Kernel extensions" + }, + "ppc": { + "description": "Capstone disassembly support for PowerPC" + }, + "sparc": { + "description": "Capstone disassembly support for SPARC" + }, + "sysz": { + "description": "Capstone disassembly support for SysZ" + }, + "tms320c64x": { + "description": "Capstone disassembly support for TMS320C64X" + }, + "x86": { + "description": "Capstone disassembly support for x86" + }, + "x86-reduce": { + "description": "Capstone disassembly support for x86 without support for less used instructions", + "dependencies": [ + { + "name": "capstone", + "features": [ + "x86" + ] + } + ] + }, + "xcore": { + "description": "Capstone disassembly support for XCore" + } + } +} diff --git a/externals/vcpkg/ports/cargs/portfile.cmake b/externals/vcpkg/ports/cargs/portfile.cmake new file mode 100755 index 000000000..6f42c0871 --- /dev/null +++ b/externals/vcpkg/ports/cargs/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO likle/cargs + REF v1.0.3 + SHA512 4f82f6857af6ae7bd1263f4c812a770fa3c3f94c84d5a0ba6256289a3d3084cd35b3aca6769241451d2acd57577ccc6638327b5bb70328800e9c3c4f5054f7de + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENABLE_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cargs) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/cargs/vcpkg.json b/externals/vcpkg/ports/cargs/vcpkg.json new file mode 100755 index 000000000..6a2d24f67 --- /dev/null +++ b/externals/vcpkg/ports/cargs/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "cargs", + "version": "1.0.3", + "description": "A lightweight cross-platform getopt alternative that works on Linux, Windows and macOS. Command line argument parser library for C/C++. Can be used to parse argv and argc parameters.", + "homepage": "https://likle.github.io/cargs/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/cartographer/fix-build-error.patch b/externals/vcpkg/ports/cartographer/fix-build-error.patch new file mode 100755 index 000000000..9474c78dc --- /dev/null +++ b/externals/vcpkg/ports/cartographer/fix-build-error.patch @@ -0,0 +1,25 @@ +diff --git a/cartographer/common/internal/testing/thread_pool_for_testing.cc b/cartographer/common/internal/testing/thread_pool_for_testing.cc +index f804e13..c987f68 100644 +--- a/cartographer/common/internal/testing/thread_pool_for_testing.cc ++++ b/cartographer/common/internal/testing/thread_pool_for_testing.cc +@@ -16,7 +16,7 @@ + + #include "cartographer/common/internal/testing/thread_pool_for_testing.h" + +-#include ++//#include + #include + #include + #include +diff --git a/cartographer/mapping/pose_graph_interface.h b/cartographer/mapping/pose_graph_interface.h +index 6483ef4..6456720 100644 +--- a/cartographer/mapping/pose_graph_interface.h ++++ b/cartographer/mapping/pose_graph_interface.h +@@ -18,6 +18,7 @@ + #define CARTOGRAPHER_MAPPING_POSE_GRAPH_INTERFACE_H_ + + #include ++#include + + #include "cartographer/common/optional.h" + #include "cartographer/mapping/id.h" diff --git a/externals/vcpkg/ports/cartographer/fix-cmake-location.patch b/externals/vcpkg/ports/cartographer/fix-cmake-location.patch new file mode 100755 index 000000000..b0eb12397 --- /dev/null +++ b/externals/vcpkg/ports/cartographer/fix-cmake-location.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2e3a686be..f2a0c5d8e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -300,7 +300,7 @@ foreach(HDR ${INSTALL_GENERATED_HDRS}) + ) + endforeach() + +-set(CARTOGRAPHER_CMAKE_DIR share/cartographer/cmake) ++set(CARTOGRAPHER_CMAKE_DIR share/cartographer) + include(CMakePackageConfigHelpers) + configure_package_config_file( + cartographer-config.cmake.in +@@ -311,7 +311,7 @@ configure_package_config_file( + + install( + EXPORT CartographerExport +- DESTINATION share/cartographer/cmake/ ++ DESTINATION share/cartographer/ + FILE CartographerTargets.cmake + ) + diff --git a/externals/vcpkg/ports/cartographer/fix-find-packages.patch b/externals/vcpkg/ports/cartographer/fix-find-packages.patch new file mode 100755 index 000000000..59e433c5f --- /dev/null +++ b/externals/vcpkg/ports/cartographer/fix-find-packages.patch @@ -0,0 +1,181 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2e3a686..f36f15a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,27 +25,33 @@ option(BUILD_GRPC "build Cartographer gRPC support" false) + option(BUILD_PROMETHEUS "build Prometheus monitoring support" false) + + include("${PROJECT_SOURCE_DIR}/cmake/functions.cmake") +-google_initialize_cartographer_project() +-google_enable_testing() ++#google_initialize_cartographer_project() ++#google_enable_testing() + + find_package(Boost REQUIRED COMPONENTS iostreams) + find_package(Ceres REQUIRED COMPONENTS SuiteSparse) + find_package(Eigen3 REQUIRED) +-find_package(LuaGoogle REQUIRED) ++find_package(Lua REQUIRED) + find_package(Protobuf 3.0.0 REQUIRED) ++find_package(glog REQUIRED) ++find_package(gflags REQUIRED) + + if (${BUILD_GRPC}) + find_package(async_grpc REQUIRED) + endif() + +-include(FindPkgConfig) +-PKG_SEARCH_MODULE(CAIRO REQUIRED cairo>=1.12.16) ++#include(FindPkgConfig) ++#PKG_SEARCH_MODULE(CAIRO REQUIRED cairo>=1.12.16) ++#if(CMAKE_BUILD_TYPE STREQUAL Debug) ++# set(CAIRO_LIB_SUFFIX d) ++#endif() ++find_library(CAIRO_LIBRARY cairo${CAIRO_LIB_SUFFIX}) + + # Only build the documentation if we can find Sphinx. +-find_package(Sphinx) +-if(SPHINX_FOUND) +- add_subdirectory("docs") +-endif() ++#find_package(Sphinx) ++#if(SPHINX_FOUND) ++# add_subdirectory("docs") ++#endif() + + # Install catkin package.xml + install(FILES package.xml DESTINATION share/cartographer) +@@ -169,20 +175,20 @@ configure_file( + ${PROJECT_SOURCE_DIR}/cartographer/common/config.h.cmake + ${PROJECT_BINARY_DIR}/cartographer/common/config.h) + +-google_binary(cartographer_autogenerate_ground_truth +- SRCS +- cartographer/ground_truth/autogenerate_ground_truth_main.cc +-) +- +-google_binary(cartographer_compute_relations_metrics +- SRCS +- cartographer/ground_truth/compute_relations_metrics_main.cc +-) +- +-google_binary(cartographer_migrate_serialization_format +- SRCS +- cartographer/io/migrate_serialization_format_main.cc +-) ++#google_binary(cartographer_autogenerate_ground_truth ++# SRCS ++# cartographer/ground_truth/autogenerate_ground_truth_main.cc ++#) ++# ++#google_binary(cartographer_compute_relations_metrics ++# SRCS ++# cartographer/ground_truth/compute_relations_metrics_main.cc ++#) ++# ++#google_binary(cartographer_migrate_serialization_format ++# SRCS ++# cartographer/io/migrate_serialization_format_main.cc ++#) + + if(${BUILD_GRPC}) + google_binary(cartographer_grpc_server +@@ -213,8 +219,9 @@ target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC + target_link_libraries(${PROJECT_NAME} PUBLIC ${Boost_LIBRARIES}) + + # We expect find_package(Ceres) to have located these for us. +-target_link_libraries(${PROJECT_NAME} PUBLIC glog) +-target_link_libraries(${PROJECT_NAME} PUBLIC gflags) ++#target_link_libraries(${PROJECT_NAME} PUBLIC glog) ++#target_link_libraries(${PROJECT_NAME} PUBLIC gflags) ++#target_link_libraries(${PROJECT_NAME} PUBLIC ${CAIRO_LIBRARY}) + + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC + "${CAIRO_INCLUDE_DIRS}") +@@ -224,7 +231,8 @@ target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC + ${PROTOBUF_INCLUDE_DIR}) + # TODO(hrapp): This should not explicitly list pthread and use + # PROTOBUF_LIBRARIES, but that failed on first try. +-target_link_libraries(${PROJECT_NAME} PUBLIC ${PROTOBUF_LIBRARY} pthread) ++#target_link_libraries(${PROJECT_NAME} PUBLIC ${PROTOBUF_LIBRARY} pthread) ++target_link_libraries(${PROJECT_NAME} PUBLIC ${PROTOBUF_LIBRARY}) + if(${BUILD_GRPC}) + target_link_libraries(${PROJECT_NAME} PUBLIC grpc++) + target_link_libraries(${PROJECT_NAME} PUBLIC async_grpc) +@@ -234,7 +242,7 @@ if(${BUILD_PROMETHEUS}) + target_compile_definitions(${PROJECT_NAME} PUBLIC USE_PROMETHEUS=1) + endif() + +-set(TARGET_COMPILE_FLAGS "${TARGET_COMPILE_FLAGS} ${GOOG_CXX_FLAGS}") ++set(TARGET_COMPILE_FLAGS "-D_DISABLE_EXTENDED_ALIGNED_STORAGE ${TARGET_COMPILE_FLAGS} ${GOOG_CXX_FLAGS}") + set_target_properties(${PROJECT_NAME} PROPERTIES + COMPILE_FLAGS ${TARGET_COMPILE_FLAGS}) + +@@ -255,7 +263,7 @@ foreach(ABS_FIL ${ALL_TESTS}) + get_filename_component(FIL_WE ${REL_FIL} NAME_WE) + # Replace slashes as required for CMP0037. + string(REPLACE "/" "." TEST_TARGET_NAME "${DIR}/${FIL_WE}") +- google_test("${TEST_TARGET_NAME}" ${ABS_FIL}) ++ #google_test("${TEST_TARGET_NAME}" ${ABS_FIL}) + if(${BUILD_GRPC}) + target_link_libraries("${TEST_TARGET_NAME}" PUBLIC grpc++) + target_link_libraries("${TEST_TARGET_NAME}" PUBLIC async_grpc) +@@ -263,7 +271,7 @@ foreach(ABS_FIL ${ALL_TESTS}) + if(${BUILD_PROMETHEUS}) + target_link_libraries("${TEST_TARGET_NAME}" PUBLIC prometheus-cpp) + endif() +- target_link_libraries("${TEST_TARGET_NAME}" PUBLIC ${TEST_LIB}) ++ #target_link_libraries("${TEST_TARGET_NAME}" PUBLIC ${TEST_LIB}) + endforeach() + + # Add the binary directory first, so that port.h is included after it has +diff --git a/cartographer/common/math.h b/cartographer/common/math.h +index c4a77ef..0248f66 100644 +--- a/cartographer/common/math.h ++++ b/cartographer/common/math.h +@@ -17,6 +17,10 @@ + #ifndef CARTOGRAPHER_COMMON_MATH_H_ + #define CARTOGRAPHER_COMMON_MATH_H_ + ++#ifndef M_PI ++#define M_PI 3.14159265358979323846 ++#endif ++ + #include + #include + +diff --git a/cartographer/common/thread_pool.cc b/cartographer/common/thread_pool.cc +index bc3c743..db424d1 100644 +--- a/cartographer/common/thread_pool.cc ++++ b/cartographer/common/thread_pool.cc +@@ -16,7 +16,7 @@ + + #include "cartographer/common/thread_pool.h" + +-#include ++//#include + #include + #include + #include +diff --git a/cmake/functions.cmake b/cmake/functions.cmake +index 3bfd343..3d961b0 100644 +--- a/cmake/functions.cmake ++++ b/cmake/functions.cmake +@@ -118,12 +118,12 @@ macro(google_initialize_cartographer_project) + set(LIST_FILES_CMD "find ${PROJECT_SOURCE_DIR}/ -not -iwholename '*.git*' | sort | sed 's/^/#/'") + set(FILES_LIST_PATH "${PROJECT_BINARY_DIR}/AllFiles.cmake") + set(DETECT_CHANGES_CMD "bash" "-c" "${LIST_FILES_CMD} | diff -N -q ${FILES_LIST_PATH} - || ${LIST_FILES_CMD} > ${FILES_LIST_PATH}") +- add_custom_target(${PROJECT_NAME}_detect_changes ALL +- COMMAND ${DETECT_CHANGES_CMD} +- VERBATIM +- ) ++ #add_custom_target(${PROJECT_NAME}_detect_changes ALL ++ # COMMAND ${DETECT_CHANGES_CMD} ++ # VERBATIM ++ #) + if(NOT EXISTS ${FILES_LIST_PATH}) +- execute_process(COMMAND ${DETECT_CHANGES_CMD}) ++ #execute_process(COMMAND ${DETECT_CHANGES_CMD}) + endif() + include(${FILES_LIST_PATH}) + endmacro() diff --git a/externals/vcpkg/ports/cartographer/portfile.cmake b/externals/vcpkg/ports/cartographer/portfile.cmake new file mode 100755 index 000000000..baff80a7d --- /dev/null +++ b/externals/vcpkg/ports/cartographer/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO googlecartographer/cartographer + REF 1.0.0 + SHA512 4e3b38ee40d9758cbd51f087578b82efb7d1199b4b7696d31f45938ac06250caaea2b4d85ccb0a848c958ba187a0101ee95c87323ca236c613995b23b215041c + HEAD_REF master + PATCHES + fix-find-packages.patch + fix-build-error.patch + fix-cmake-location.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DGFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION=OFF + -DGLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION=OFF + -Dgtest_disable_pthreads=ON + -DCMAKE_USE_PTHREADS_INIT=OFF + OPTIONS_DEBUG + -DFORCE_DEBUG_BUILD=True +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/cartographer/CartographerTargets.cmake" "${SOURCE_PATH}/;" "") +vcpkg_copy_pdbs() + +# Clean +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright of cartographer +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/cartographer/vcpkg.json b/externals/vcpkg/ports/cartographer/vcpkg.json new file mode 100755 index 000000000..9cc51693b --- /dev/null +++ b/externals/vcpkg/ports/cartographer/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "cartographer", + "version": "1.0.0", + "port-version": 5, + "description": "Google 2D & 3D SLAM package", + "homepage": "https://github.com/googlecartographer/cartographer", + "dependencies": [ + "boost-iostreams", + "cairo", + { + "name": "ceres", + "features": [ + "suitesparse" + ] + }, + "gflags", + "glog", + "gtest", + "lua", + "protobuf", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/casclib/fix-shared-windows-builds.patch b/externals/vcpkg/ports/casclib/fix-shared-windows-builds.patch new file mode 100755 index 000000000..d12ef301f --- /dev/null +++ b/externals/vcpkg/ports/casclib/fix-shared-windows-builds.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,8 +51,15 @@ set(SRC_FILES + src/CascRootFile_WoW.cpp + ) + ++if(WIN32) ++ set(SRC_FILES ${SRC_FILES} ++ src/DllMain.c ++ src/DllMain.def ++ ) ++endif() ++ + set(LINK_LIBS) +-find_package(ZLIB) ++find_package(ZLIB REQUIRED) + if (ZLIB_FOUND) + set(LINK_LIBS ${LINK_LIBS} ZLIB::ZLIB) + add_definitions(-DCASC_USE_SYSTEM_ZLIB) diff --git a/externals/vcpkg/ports/casclib/portfile.cmake b/externals/vcpkg/ports/casclib/portfile.cmake new file mode 100755 index 000000000..f96da8182 --- /dev/null +++ b/externals/vcpkg/ports/casclib/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ladislav-zezula/CascLib + REF 07bfe85fd0804cba49f072819af716274d82b855 + SHA512 b333fe6318aa95629aa67613287ac71b1931c6443985e7e52412066d769f7996bffca1c19e890851eba976f572c7a11f14a8ff5fb95433577e1c9af8de0f34af + HEAD_REF master + PATCHES + fix-shared-windows-builds.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CASC_BUILD_SHARED_LIB) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CASC_BUILD_STATIC_LIB) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCASC_BUILD_SHARED_LIB=${CASC_BUILD_SHARED_LIB} + -DCASC_BUILD_STATIC_LIB=${CASC_BUILD_STATIC_LIB} + -DCASC_UNICODE=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CascLib) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/casclib/vcpkg.json b/externals/vcpkg/ports/casclib/vcpkg.json new file mode 100755 index 000000000..0a0b24a42 --- /dev/null +++ b/externals/vcpkg/ports/casclib/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "casclib", + "version-date": "2021-11-16", + "port-version": 1, + "description": "An open-source implementation of library for reading CASC storage from Blizzard games since 2014", + "homepage": "http://www.zezula.net/en/casc/casclib.html", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/catch-classic/portfile.cmake b/externals/vcpkg/ports/catch-classic/portfile.cmake new file mode 100755 index 000000000..097ba07da --- /dev/null +++ b/externals/vcpkg/ports/catch-classic/portfile.cmake @@ -0,0 +1,16 @@ +set(CATCH_VERSION v1.12.2) + +vcpkg_download_distfile(HEADER + URLS "https://github.com/catchorg/Catch2/releases/download/${CATCH_VERSION}/catch.hpp" + FILENAME "catch-classic-${CATCH_VERSION}.hpp" + SHA512 d2cf8b2fe95aae061a7771a0e1b7135583595d1f36dfc8d5e4d10e101ab58f6fac9d260f77c5760906c24aa402d7433aa82b5d6a0ca6b3ad91092dc5cc2d9c22 +) + +vcpkg_download_distfile(LICENSE + URLS "https://raw.githubusercontent.com/catchorg/Catch2/${CATCH_VERSION}/LICENSE.txt" + FILENAME "catch-classic-LICENSE-${CATCH_VERSION}.txt" + SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 +) + +file(INSTALL ${HEADER} DESTINATION ${CURRENT_PACKAGES_DIR}/include RENAME catch.hpp) +file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/catch-classic RENAME copyright) diff --git a/externals/vcpkg/ports/catch-classic/vcpkg.json b/externals/vcpkg/ports/catch-classic/vcpkg.json new file mode 100755 index 000000000..bfe9b7ef4 --- /dev/null +++ b/externals/vcpkg/ports/catch-classic/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "catch-classic", + "version-string": "1.12.2", + "port-version": 1, + "description": [ + "A modern, header-only test framework for unit tests", + "This is specifically the legacy 1.x branch provided for compatibility", + "with older compilers." + ], + "homepage": "https://github.com/catchorg/Catch2" +} diff --git a/externals/vcpkg/ports/catch/portfile.cmake b/externals/vcpkg/ports/catch/portfile.cmake new file mode 100755 index 000000000..065116c27 --- /dev/null +++ b/externals/vcpkg/ports/catch/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/catch/vcpkg.json b/externals/vcpkg/ports/catch/vcpkg.json new file mode 100755 index 000000000..fccc68904 --- /dev/null +++ b/externals/vcpkg/ports/catch/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "catch", + "version-string": "alias", + "port-version": 1, + "description": "Deprecated alias for Catch2 unit testing framework", + "dependencies": [ + "catch2" + ] +} diff --git a/externals/vcpkg/ports/catch2/fix-install-path.patch b/externals/vcpkg/ports/catch2/fix-install-path.patch new file mode 100755 index 000000000..fc90c57cc --- /dev/null +++ b/externals/vcpkg/ports/catch2/fix-install-path.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -168,7 +168,7 @@ + + ## Provide some pkg-config integration + set(PKGCONFIG_INSTALL_DIR +- "${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig" ++ "${CMAKE_INSTALL_LIBDIR}/pkgconfig" + CACHE PATH "Path where catch2.pc is installed" + ) + configure_file( +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -335,12 +335,20 @@ + install( + TARGETS + Catch2 +- Catch2WithMain + EXPORT + Catch2Targets + DESTINATION + ${CMAKE_INSTALL_LIBDIR} + ) ++ ++ install( ++ TARGETS ++ Catch2WithMain ++ EXPORT ++ Catch2Targets ++ DESTINATION ++ ${CMAKE_INSTALL_LIBDIR}/manual-link ++ ) + + + install( diff --git a/externals/vcpkg/ports/catch2/portfile.cmake b/externals/vcpkg/ports/catch2/portfile.cmake new file mode 100755 index 000000000..5984aec7c --- /dev/null +++ b/externals/vcpkg/ports/catch2/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO catchorg/Catch2 + REF v3.0.1 + SHA512 065094c19cdf98b40f96a390e887542f895495562a91cdc28d68ce03690866d846ec87d320405312a2b97eacaa5351d3e55f0012bb9de40073c8d4444d82b0a1 + HEAD_REF devel + PATCHES + fix-install-path.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCATCH_INSTALL_DOCS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Catch2) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# We remove these folders because they are empty and cause warnings on the library installation +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/catch2/benchmark/internal") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/catch2/generators/internal") + +file(WRITE "${CURRENT_PACKAGES_DIR}/include/catch.hpp" "#include ") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/catch2/vcpkg.json b/externals/vcpkg/ports/catch2/vcpkg.json new file mode 100755 index 000000000..4d884128d --- /dev/null +++ b/externals/vcpkg/ports/catch2/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "catch2", + "version-semver": "3.0.1", + "port-version": 1, + "description": "A modern, header-only test framework for unit testing.", + "homepage": "https://github.com/catchorg/Catch2", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/cccapstone/fix-include-path.patch b/externals/vcpkg/ports/cccapstone/fix-include-path.patch new file mode 100755 index 000000000..266308149 --- /dev/null +++ b/externals/vcpkg/ports/cccapstone/fix-include-path.patch @@ -0,0 +1,24 @@ +diff --git a/cppbindings/CsCapstoneHelper.hh b/cppbindings/CsCapstoneHelper.hh +index daf7a73..8ed5194 100644 +--- a/cppbindings/CsCapstoneHelper.hh ++++ b/cppbindings/CsCapstoneHelper.hh +@@ -1,6 +1,6 @@ + #pragma once + +-#include ++#include + #include + + struct CS_HANDLE : +diff --git a/cppbindings/CsIns.hpp b/cppbindings/CsIns.hpp +index 6e8ba71..c723be9 100644 +--- a/cppbindings/CsIns.hpp ++++ b/cppbindings/CsIns.hpp +@@ -1,6 +1,6 @@ + #pragma once + +-#include ++#include + #include "CsCapstoneHelper.hh" + + //x86_insn_group, x86_reg, x86_op_type, x86_insn diff --git a/externals/vcpkg/ports/cccapstone/portfile.cmake b/externals/vcpkg/ports/cccapstone/portfile.cmake new file mode 100755 index 000000000..f68609498 --- /dev/null +++ b/externals/vcpkg/ports/cccapstone/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REF 9b4128ee1153e78288a1b5433e2c06a0d47a4c4e + REPO zer0mem/cccapstone + SHA512 d0023586281f921314dbba501fa2c06d822b1adba0a0c32f30b78628ee935e5822caebe3881a5d1cc4cc696b82a7e348044d887a7f652303359d2853d2ee45fb + HEAD_REF master + PATCHES fix-include-path.patch +) + +file(INSTALL ${SOURCE_PATH}/cppbindings/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/cccapstone/cppbindings) +file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/cccapstone RENAME copyright) diff --git a/externals/vcpkg/ports/cccapstone/vcpkg.json b/externals/vcpkg/ports/cccapstone/vcpkg.json new file mode 100755 index 000000000..239fdc3d1 --- /dev/null +++ b/externals/vcpkg/ports/cccapstone/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "cccapstone", + "version-string": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e", + "port-version": 2, + "description": "c++ bindings for capstone disasembly framework", + "homepage": "https://github.com/zer0mem/cccapstone", + "dependencies": [ + "capstone" + ] +} diff --git a/externals/vcpkg/ports/ccd/fix-static.patch b/externals/vcpkg/ports/ccd/fix-static.patch new file mode 100755 index 000000000..cfb4d388c --- /dev/null +++ b/externals/vcpkg/ports/ccd/fix-static.patch @@ -0,0 +1,13 @@ +diff --git a/src/ccd/ccd_export.h b/src/ccd/ccd_export.h +index e898d41..c6aa5fb 100644 +--- a/src/ccd/ccd_export.h ++++ b/src/ccd/ccd_export.h +@@ -1,7 +1,7 @@ + #ifndef CCD_EXPORT_H + #define CCD_EXPORT_H + +-#ifdef CCD_STATIC_DEFINE ++#if 1 + # define CCD_EXPORT + #else + # ifdef _MSC_VER diff --git a/externals/vcpkg/ports/ccd/portfile.cmake b/externals/vcpkg/ports/ccd/portfile.cmake new file mode 100755 index 000000000..c2c294d56 --- /dev/null +++ b/externals/vcpkg/ports/ccd/portfile.cmake @@ -0,0 +1,35 @@ +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(STATIC_PATCH fix-static.patch) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO danfis/libccd + REF v2.1 + SHA512 ff037d9c4df50f09600cf9b3514b259b2850ff43f74817853f5665d22812891168f70bd3cc3969b2c9e3c706f6254991a65421476349607fbd04d894b217456d + HEAD_REF master + # Backport https://github.com/danfis/libccd/pull/70 to support Emscripten + PATCHES + "support-emscripten.patch" + ${STATIC_PATCH} +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/ccd) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) + +file(INSTALL ${SOURCE_PATH}/BSD-LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/ccd/support-emscripten.patch b/externals/vcpkg/ports/ccd/support-emscripten.patch new file mode 100755 index 000000000..2fe689a79 --- /dev/null +++ b/externals/vcpkg/ports/ccd/support-emscripten.patch @@ -0,0 +1,25 @@ +From c3616f28d33019047e8e71df8abeb0493159539e Mon Sep 17 00:00:00 2001 +From: Silvio Traversaro +Date: Sun, 17 May 2020 11:42:24 +0200 +Subject: [PATCH] Fix configuration with Emscripten + +In Emscripten there is no separate libm library, so there is no need to explicitly link it, +and in particular the find_library call would fail as there is not libm to find. +See https://stackoverflow.com/questions/24663915/how-can-i-link-libm-to-my-emscripten-port +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 1407080..357ed76 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -48,7 +48,7 @@ target_include_directories(ccd PUBLIC + $ + $) + +-if(NOT WIN32) ++if(NOT WIN32 AND NOT (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")) + find_library(LIBM_LIBRARY NAMES m) + if(NOT LIBM_LIBRARY) + message(FATAL_ERROR "Could NOT find required library LibM") diff --git a/externals/vcpkg/ports/ccd/vcpkg.json b/externals/vcpkg/ports/ccd/vcpkg.json new file mode 100755 index 000000000..15978fb00 --- /dev/null +++ b/externals/vcpkg/ports/ccd/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "ccd", + "version-string": "2.1-4", + "port-version": 3, + "description": "Library for collision detection between two convex shapes", + "homepage": "https://github.com/danfis/libccd" +} diff --git a/externals/vcpkg/ports/ccfits/dll_exports.patch b/externals/vcpkg/ports/ccfits/dll_exports.patch new file mode 100755 index 000000000..6321cbb4e --- /dev/null +++ b/externals/vcpkg/ports/ccfits/dll_exports.patch @@ -0,0 +1,488 @@ +diff --git a/FITS.h b/FITS.h +index e21f3db..3e97c83 100644 +--- a/FITS.h ++++ b/FITS.h +@@ -21,6 +21,8 @@ + #include "HDUCreator.h" + // FitsError + #include "FitsError.h" ++//DLL Exporting ++#include "ccfits_export.h" + + namespace CCfits { + class FITSBase; +@@ -665,7 +667,7 @@ do this either). + + + +- class FITS ++ class CCFITS_EXPORT FITS + { + + public: +diff --git a/HDU.h b/HDU.h +index 07f68e7..047e731 100644 +--- a/HDU.h ++++ b/HDU.h +@@ -568,7 +568,7 @@ and return its value. + + + +- class HDU ++ class CCFITS_EXPORT HDU + { + + public: +diff --git a/Table.h b/Table.h +index a0c1afe..9a8a5db 100644 +--- a/Table.h ++++ b/Table.h +@@ -268,7 +268,7 @@ namespace CCfits { + + + +- class Table : public ExtHDU //## Inherits: %3804A126EB10 ++ class CCFITS_EXPORT Table : public ExtHDU //## Inherits: %3804A126EB10 + { + + public: +diff --git a/Column.h b/Column.h +index e4496a7..b798947 100644 +--- a/Column.h ++++ b/Column.h +@@ -838,14 +838,14 @@ namespace CCfits { + + + +- class Column ++ class CCFITS_EXPORT Column + { + + public: + + + +- class RangeError : public FitsException //## Inherits: %3946526D031A ++ class CCFITS_EXPORT RangeError : public FitsException //## Inherits: %3946526D031A + { + public: + RangeError (const String& msg, bool silent = true); +@@ -857,7 +857,7 @@ namespace CCfits { + + + +- class InvalidDataType : public FitsException //## Inherits: %3947CF30033E ++ class CCFITS_EXPORT InvalidDataType : public FitsException //## Inherits: %3947CF30033E + { + public: + InvalidDataType (const String& str = string(), bool silent = true); +@@ -869,7 +869,7 @@ namespace CCfits { + + + +- class InvalidRowParameter : public FitsException //## Inherits: %39B5310F01A0 ++ class CCFITS_EXPORT InvalidRowParameter : public FitsException //## Inherits: %39B5310F01A0 + { + public: + InvalidRowParameter (const String& diag, bool silent = true); +@@ -881,7 +881,7 @@ namespace CCfits { + + + +- class WrongColumnType : public FitsException //## Inherits: %39B545780082 ++ class CCFITS_EXPORT WrongColumnType : public FitsException //## Inherits: %39B545780082 + { + public: + WrongColumnType (const String& diag, bool silent = true); +@@ -893,7 +893,7 @@ namespace CCfits { + + + +- class UnspecifiedLengths : public FitsException //## Inherits: %3A018C9D007D ++ class CCFITS_EXPORT UnspecifiedLengths : public FitsException //## Inherits: %3A018C9D007D + { + public: + UnspecifiedLengths (const String& diag, bool silent = true); +@@ -905,7 +905,7 @@ namespace CCfits { + + + +- class InvalidRowNumber : public FitsException //## Inherits: %3B0A850F0307 ++ class CCFITS_EXPORT InvalidRowNumber : public FitsException //## Inherits: %3B0A850F0307 + { + public: + InvalidRowNumber (const String& diag, bool silent = true); +@@ -917,7 +917,7 @@ namespace CCfits { + + + +- class InsufficientElements : public FitsException //## Inherits: %3B0BE611010A ++ class CCFITS_EXPORT InsufficientElements : public FitsException //## Inherits: %3B0BE611010A + { + public: + InsufficientElements (const String& msg, bool silent = true); +@@ -929,7 +929,7 @@ namespace CCfits { + + + +- class NoNullValue : public FitsException //## Inherits: %3B0D589A0092 ++ class CCFITS_EXPORT NoNullValue : public FitsException //## Inherits: %3B0D589A0092 + { + public: + NoNullValue (const String& diag, bool silent = true); +@@ -941,7 +941,7 @@ namespace CCfits { + + + +- class InvalidNumberOfRows : public FitsException //## Inherits: %3B20EB8B0205 ++ class CCFITS_EXPORT InvalidNumberOfRows : public FitsException //## Inherits: %3B20EB8B0205 + { + public: + InvalidNumberOfRows (int number, bool silent = true); +diff --git a/AsciiTable.h b/AsciiTable.h +index 620cf41..d03aa44 100644 +--- a/AsciiTable.h ++++ b/AsciiTable.h +@@ -133,7 +133,7 @@ namespace CCfits { + + + +- class AsciiTable : public Table //## Inherits: %3804A75CE420 ++ class CCFITS_EXPORT AsciiTable : public Table //## Inherits: %3804A75CE420 + { + + public: +diff --git a/CCfits.h b/CCfits.h +index d09438a..a62b8a6 100644 +--- a/CCfits.h ++++ b/CCfits.h +@@ -23,7 +23,7 @@ namespace CCfits { + #include + #include "longnam.h" + #include "float.h" +- ++#include "ccfits_export.h" + + namespace CCfits { + /*! \namespace CCfits +@@ -32,8 +32,8 @@ namespace CCfits { + static const int BITPIX = -32; + static const int NAXIS = 2; + static const int MAXDIM = 99; +- extern const unsigned long USBASE; +- extern const unsigned long ULBASE; ++ extern const CCFITS_EXPORT unsigned long USBASE; ++ extern const CCFITS_EXPORT unsigned long ULBASE; + + extern char BSCALE[7]; + extern char BZERO[6]; +diff --git a/FITSBase.h b/FITSBase.h +index 996fdae..0c985f9 100644 +--- a/FITSBase.h ++++ b/FITSBase.h +@@ -30,7 +30,7 @@ namespace CCfits { + + + +- class FITSBase ++ class CCFITS_EXPORT FITSBase + { + + public: +diff --git a/Keyword.h b/Keyword.h +index 816c119..b6df1f1 100644 +--- a/Keyword.h ++++ b/Keyword.h +@@ -195,7 +195,7 @@ namespace CCfits { + + + +- class Keyword ++ class CCFITS_EXPORT Keyword + { + + public: +diff --git a/ExtHDU.h b/ExtHDU.h +index d075fa1..e2d7dc6 100644 +--- a/ExtHDU.h ++++ b/ExtHDU.h +@@ -435,7 +435,7 @@ namespace CCfits { + + + +- class ExtHDU : public HDU //## Inherits: %38048213E7A8 ++ class CCFITS_EXPORT ExtHDU : public HDU //## Inherits: %38048213E7A8 + { + + public: +diff --git a/PHDU.h b/PHDU.h +index fe5f799..d9669b4 100644 +--- a/PHDU.h ++++ b/PHDU.h +@@ -264,7 +264,7 @@ namespace CCfits { + + + +- class PHDU : public HDU //## Inherits: %394E6F9800C3 ++ class CCFITS_EXPORT PHDU : public HDU //## Inherits: %394E6F9800C3 + { + + public: +diff --git a/BinTable.h b/BinTable.h +index 68851e3..906005a 100644 +--- a/BinTable.h ++++ b/BinTable.h +@@ -127,7 +127,7 @@ namespace CCfits { + + + +- class BinTable : public Table //## Inherits: %3804A7E75F10 ++ class CCFITS_EXPORT BinTable : public Table //## Inherits: %3804A7E75F10 + { + + public: +diff --git a/ColumnCreator.h b/ColumnCreator.h +index 104bd4f..15cd0ea 100644 +--- a/ColumnCreator.h ++++ b/ColumnCreator.h +@@ -28,7 +28,7 @@ namespace CCfits { + + + +- class ColumnCreator ++ class CCFITS_EXPORT ColumnCreator + { + + public: +diff --git a/FitsError.h b/FitsError.h +index 593723c..52941f6 100644 +--- a/FitsError.h ++++ b/FitsError.h +@@ -13,6 +13,7 @@ + //#include + //#include + //#include ++#include "ccfits_export.h" + #include + using std::string; + +@@ -90,7 +91,7 @@ namespace CCfits { + + + +- class FitsException ++ class CCFITS_EXPORT FitsException + { + public: + FitsException (const string& msg, bool& silent); +@@ -109,7 +110,7 @@ namespace CCfits { + + + +- class FitsError : public FitsException //## Inherits: %399170BD017D ++ class CCFITS_EXPORT FitsError : public FitsException //## Inherits: %399170BD017D + { + public: + FitsError (int errornum, bool silent = true); +@@ -123,7 +124,7 @@ namespace CCfits { + + + +- class FitsFatal ++ class CCFITS_EXPORT FitsFatal + { + public: + FitsFatal (const string& diag); +diff --git a/HDUCreator.h b/HDUCreator.h +index 65b82b7..2b5f717 100644 +--- a/HDUCreator.h ++++ b/HDUCreator.h +@@ -35,7 +35,7 @@ namespace CCfits { + + + +- class HDUCreator ++ class CCFITS_EXPORT HDUCreator + { + + public: +diff --git a/ccfits_export.h b/ccfits_export.h +new file mode 100644 +index 0000000..a2540a6 100644 +--- /dev/null ++++ b/ccfits_export.h +@@ -0,0 +1,41 @@ ++#ifndef CCFITS_EXPORT_H ++#define CCFITS_EXPORT_H ++ ++#ifdef CCFITS_STATIC_DEFINE ++# define CCFITS_EXPORT ++# define CCFITS_NO_EXPORT ++#else ++# ifndef CCFITS_EXPORT ++# ifdef CCfits_EXPORTS ++ /* We are building this library */ ++# define CCFITS_EXPORT __declspec(dllexport) ++# else ++ /* We are using this library */ ++# define CCFITS_EXPORT __declspec(dllimport) ++# endif ++# endif ++ ++# ifndef CCFITS_NO_EXPORT ++# define CCFITS_NO_EXPORT ++# endif ++#endif ++ ++#ifndef CCFITS_DEPRECATED ++# define CCFITS_DEPRECATED __declspec(deprecated) ++#endif ++ ++#ifndef CCFITS_DEPRECATED_EXPORT ++# define CCFITS_DEPRECATED_EXPORT CCFITS_EXPORT CCFITS_DEPRECATED ++#endif ++ ++#ifndef CCFITS_DEPRECATED_NO_EXPORT ++# define CCFITS_DEPRECATED_NO_EXPORT CCFITS_NO_EXPORT CCFITS_DEPRECATED ++#endif ++ ++#if 0 /* DEFINE_NO_DEPRECATED */ ++# ifndef CCFITS_NO_DEPRECATED ++# define CCFITS_NO_DEPRECATED ++# endif ++#endif ++ ++#endif +\ No newline at end of file +diff --git a/FITSUtil.h b/FITSUtil.h +index 762d430..e2eee33 100644 +--- a/FITSUtil.h ++++ b/FITSUtil.h +@@ -22,6 +22,7 @@ + #include + // FitsError + #include "FitsError.h" ++#include "ccfits_export.h" + #include + + +@@ -287,21 +288,21 @@ object. + template + void swap(std::vector& left, std::vector& right); + +- string lowerCase(const string& inputString); ++ string CCFITS_EXPORT lowerCase(const string& inputString); + +- string upperCase(const string& inputString); ++ string CCFITS_EXPORT upperCase(const string& inputString); + + // Check if a file name includes an image compression specifier, + // and return its location if it exists. +- string::size_type checkForCompressString(const string& fileName); ++ string::size_type CCFITS_EXPORT checkForCompressString(const string& fileName); + +- struct InvalidConversion : public FitsException ++ struct CCFITS_EXPORT InvalidConversion : public FitsException + { + InvalidConversion(const string& diag, bool silent=false); + + }; + +- struct MatchStem : public std::binary_function ++ struct CCFITS_EXPORT MatchStem : public std::binary_function + { + bool operator()(const string& left, const string& right) const; + }; +@@ -323,7 +324,7 @@ object. + + char** CharArray(const std::vector& inArray); + +- string FITSType2String( int typeInt ); ++ string CCFITS_EXPORT FITSType2String( int typeInt ); + + + template +@@ -633,7 +634,7 @@ object. + + + +- class UnrecognizedType : public FitsException //## Inherits: %3CE143AB00C6 ++ class CCFITS_EXPORT UnrecognizedType : public FitsException //## Inherits: %3CE143AB00C6 + { + public: + UnrecognizedType (string diag, bool silent = true); +diff --git a/KeywordCreator.h b/KeywordCreator.h +index d878a26..b2c0c70 100644 +--- a/KeywordCreator.h ++++ b/KeywordCreator.h +@@ -24,7 +24,7 @@ namespace CCfits { + + + +- class KeywordCreator ++ class CCFITS_EXPORT KeywordCreator + { + + public: +diff --git a/CCfits b/CCfits +index e9848c9..f30c9ad 100644 +--- a/CCfits ++++ b/CCfits +@@ -2,20 +2,20 @@ + #ifndef CCFITS + #define CCFITS 20031208 + +-#include ++#include + +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + + + #endif +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b958fc7..0b1fb4e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -30,6 +30,11 @@ IF (BUILD_SHARED_LIBS) + SET (LIB_TYPE SHARED) + ENDIF (BUILD_SHARED_LIBS) + ++ ++IF (NOT BUILD_SHARED_LIBS) ++ ADD_DEFINITIONS(-DCCFITS_STATIC_DEFINE) ++ENDIF() ++ + FILE(GLOB H_FILES "*.h") + SET(H_FILES ${H_FILES} CCfits) + +@@ -55,6 +60,7 @@ SET(SRC_FILES + ) + + ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${H_FILES} ${SRC_FILES}) ++ + TARGET_LINK_LIBRARIES(${LIB_NAME} ${CFITSIO_LIBRARY} + ) + diff --git a/externals/vcpkg/ports/ccfits/fix-dependency.patch b/externals/vcpkg/ports/ccfits/fix-dependency.patch new file mode 100755 index 000000000..15cffeb4e --- /dev/null +++ b/externals/vcpkg/ports/ccfits/fix-dependency.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d72ae85..405d96b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,8 +22,8 @@ ENDIF() + + #add_subdirectory (src) + +-find_package(CFITSIO REQUIRED) +-INCLUDE_DIRECTORIES(${CFITSIO_INCLUDE_DIR}) ++find_package(unofficial-cfitsio CONFIG REQUIRED) ++set(CFITSIO_LIBRARY cfitsio) + + SET (LIB_TYPE STATIC) + IF (BUILD_SHARED_LIBS) diff --git a/externals/vcpkg/ports/ccfits/portfile.cmake b/externals/vcpkg/ports/ccfits/portfile.cmake new file mode 100755 index 000000000..7c1f7e88a --- /dev/null +++ b/externals/vcpkg/ports/ccfits/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://heasarc.gsfc.nasa.gov/fitsio/CCfits-2.5/CCfits-2.5.tar.gz" + FILENAME "CCfits-2.5.tar.gz" + SHA512 63ab4d153063960510cf60651d5c832824cf85f937f84adc5390c7c2fb46eb8e9f5d8cda2554d79d24c7a4f1b6cf0b7a6e20958fb69920b65d7c362c0a5f26b5 +) + +vcpkg_extract_source_archive_ex( + ARCHIVE "${ARCHIVE}" + OUT_SOURCE_PATH SOURCE_PATH + PATCHES + dll_exports.patch + fix-dependency.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/CCfits.dll" "${CURRENT_PACKAGES_DIR}/bin/CCfits.dll") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/CCfits.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/CCfits.dll") +endif() + +# Remove duplicate include files +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Patch installed headers to look in the correct subdirectory +file(GLOB HEADERS "${CURRENT_PACKAGES_DIR}/include/CCfits/*") +foreach(HEADER IN LISTS HEADERS) + vcpkg_replace_string("${HEADER}" "\"fitsio.h\"" "\"cfitsio/fitsio.h\"") +endforeach() + +vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/CCfits/CCfits.h + "#include \"longnam.h\"" "#include \"cfitsio/longnam.h\"" +) + +file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/ccfits/vcpkg.json b/externals/vcpkg/ports/ccfits/vcpkg.json new file mode 100755 index 000000000..7124381b9 --- /dev/null +++ b/externals/vcpkg/ports/ccfits/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "ccfits", + "version": "2.5", + "port-version": 8, + "description": "CCfits is an object oriented interface to the cfitsio library. It is designed to make the capabilities of cfitsio available to programmers working in C++.", + "homepage": "https://heasarc.gsfc.nasa.gov/fitsio/CCfits/", + "dependencies": [ + "cfitsio", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/cctag/portfile.cmake b/externals/vcpkg/ports/cctag/portfile.cmake new file mode 100755 index 000000000..a217d98f7 --- /dev/null +++ b/externals/vcpkg/ports/cctag/portfile.cmake @@ -0,0 +1,48 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO alicevision/cctag + REF v1.0.1 + SHA512 94992141094162d44cf45ad85324517638bf794d693c6a059d6ba5d5ccbedea4f98664a0cc49ebca78f85d2860b637dfcb9d5315114493643a6c7f8fabab3073 + HEAD_REF develop +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cuda CCTAG_WITH_CUDA + apps CCTAG_BUILD_APPS +) + +if("cuda" IN_LIST FEATURES) + include(${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake) + vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT) + + message(STATUS "CUDA_TOOLKIT_ROOT ${CUDA_TOOLKIT_ROOT}") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -DCCTAG_BUILD_TESTS:BOOL=OFF ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CCTag) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) + +# remove test files +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/cctag/geometry/test" "${CURRENT_PACKAGES_DIR}/include/cctag/test") +# remove cuda headers +if(NOT "cuda" IN_LIST FEATURES) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/cctag/cuda") +endif() + + # move the bin directory to tools +if ("apps" IN_LIST FEATURES) + set(CCTAG_TOOLS detection regression simulation) + vcpkg_copy_tools(TOOL_NAMES ${CCTAG_TOOLS} AUTO_CLEAN) +endif() + +file(INSTALL ${SOURCE_PATH}/COPYING.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/cctag RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/cctag/vcpkg.json b/externals/vcpkg/ports/cctag/vcpkg.json new file mode 100755 index 000000000..37d3e6460 --- /dev/null +++ b/externals/vcpkg/ports/cctag/vcpkg.json @@ -0,0 +1,60 @@ +{ + "name": "cctag", + "version-semver": "1.0.1", + "maintainers": "alicevision-team@googlegroups.com", + "description": "Computer vision library for detecting CCTag markers made up of concentric circles", + "homepage": "https://github.com/alicevision/CCTag", + "documentation": "https://cctag.readthedocs.io/", + "supports": "!(uwp | arm | arm64 | android | x86)", + "dependencies": [ + "boost-accumulators", + "boost-algorithm", + "boost-container", + "boost-date-time", + "boost-exception", + "boost-filesystem", + "boost-iterator", + "boost-lexical-cast", + "boost-math", + "boost-mpl", + "boost-multi-array", + "boost-program-options", + "boost-ptr-container", + "boost-serialization", + "boost-spirit", + "boost-stacktrace", + "boost-static-assert", + "boost-test", + "boost-thread", + "boost-throw-exception", + "boost-timer", + "boost-type-traits", + "boost-unordered", + "eigen3", + "opencv3", + "tbb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "apps": { + "description": "Sample applications for detecting CCTag markers in images and videos", + "dependencies": [ + "boost-program-options", + "boost-system" + ] + }, + "cuda": { + "description": "Enable Cuda support for faster detection", + "dependencies": [ + "cuda" + ] + } + } +} diff --git a/externals/vcpkg/ports/cctz/CMakeLists.txt b/externals/vcpkg/ports/cctz/CMakeLists.txt new file mode 100755 index 000000000..e21b1ca68 --- /dev/null +++ b/externals/vcpkg/ports/cctz/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.8) +project(cctz CXX) + +set(CMAKE_CXX_STANDARD 14) + +set(CMAKE_DEBUG_POSTFIX d) + +if(CMAKE_BUILD_TYPE STREQUAL "Release") + option(INSTALL_HEADERS "Install header files" ON) +else() + option(INSTALL_HEADERS "Install header files" OFF) +endif() + +find_package(benchmark CONFIG REQUIRED) + +file(GLOB SOURCES src/*.cc) +list(FILTER SOURCES EXCLUDE REGEX "_test.cc$|benchmarks|_tool.cc$") + +file(GLOB HEADERS include/cctz/*.h) + +add_library(cctz ${SOURCES}) +target_include_directories(cctz PUBLIC $ $) +target_link_libraries(cctz PRIVATE benchmark::benchmark benchmark::benchmark_main) + +if(INSTALL_HEADERS) + install(FILES ${HEADERS} DESTINATION "include/cctz") +endif() + +install(TARGETS cctz EXPORT unofficial-cctz-targets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install( + EXPORT unofficial-cctz-targets + FILE unofficial-cctz-config.cmake + NAMESPACE unofficial:: + DESTINATION share/unofficial-cctz +) diff --git a/externals/vcpkg/ports/cctz/portfile.cmake b/externals/vcpkg/ports/cctz/portfile.cmake new file mode 100755 index 000000000..195af4fe6 --- /dev/null +++ b/externals/vcpkg/ports/cctz/portfile.cmake @@ -0,0 +1,28 @@ +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "${PORT} does not currently support UWP") +endif() + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/cctz + REF v2.3 + SHA512 e688ddac1bff108e8315bf94cb61483b72b0d16f601e4e1eeb0fd5c064aefe5a573eee66e8903401aa4c2be71ea9f10dd6c9a9cdf8379f5bb6073248a21a83ff + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-cctz TARGET_PATH share/unofficial-cctz) + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cctz RENAME copyright) diff --git a/externals/vcpkg/ports/cctz/vcpkg.json b/externals/vcpkg/ports/cctz/vcpkg.json new file mode 100755 index 000000000..aaf937dfb --- /dev/null +++ b/externals/vcpkg/ports/cctz/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "cctz", + "version-string": "2.3", + "port-version": 3, + "description": "two libraries that cooperate with to give C++ programmers all the necessary tools for computing with dates, times, and time zones in a simple and correct manner.", + "homepage": "https://github.com/google/cctz", + "dependencies": [ + "benchmark" + ] +} diff --git a/externals/vcpkg/ports/celero/fix-bin-install-path.patch b/externals/vcpkg/ports/celero/fix-bin-install-path.patch new file mode 100755 index 000000000..3a73c3600 --- /dev/null +++ b/externals/vcpkg/ports/celero/fix-bin-install-path.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0158c4f..5be0fbc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -220,9 +220,11 @@ install( + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) + install( + TARGETS celero +- DESTINATION ${CMAKE_INSTALL_LIBDIR} + EXPORT celero-targets ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib + ) + install( + EXPORT celero-targets diff --git a/externals/vcpkg/ports/celero/portfile.cmake b/externals/vcpkg/ports/celero/portfile.cmake new file mode 100755 index 000000000..94524f521 --- /dev/null +++ b/externals/vcpkg/ports/celero/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DigitalInBlue/Celero + REF v2.8.3 + SHA512 f6774f6076bae5d37d4f5bd12153bc99b97893f43fe9253fe805b5b0c2475ffe878e32f3fc7391544ea24020e59d5ae48e44e5b3a302f7280ad15b6a6820f70b + HEAD_REF master + PATCHES + fix-bin-install-path.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CELERO_COMPILE_DYNAMIC_LIBRARIES) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCELERO_ENABLE_EXPERIMENTS=OFF + -DCELERO_ENABLE_TESTS=OFF + -DCELERO_COMPILE_DYNAMIC_LIBRARIES=${CELERO_COMPILE_DYNAMIC_LIBRARIES} + -DCELERO_TREAT_WARNINGS_AS_ERRORS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/celero/Export.h" "#ifdef CELERO_STATIC" "#define CELERO_STATIC\n#ifdef CELERO_STATIC") +endif() + +file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/celero/vcpkg.json b/externals/vcpkg/ports/celero/vcpkg.json new file mode 100755 index 000000000..fbf37ae55 --- /dev/null +++ b/externals/vcpkg/ports/celero/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "celero", + "version": "2.8.3", + "description": "Celero is a modern cross-platform (Windows, Linux, MacOS) Microbenchmarking library for C++.", + "homepage": "https://github.com/DigitalInBlue/Celero", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/cello/CMakeLists.txt b/externals/vcpkg/ports/cello/CMakeLists.txt new file mode 100755 index 000000000..b54507f07 --- /dev/null +++ b/externals/vcpkg/ports/cello/CMakeLists.txt @@ -0,0 +1,26 @@ +cmake_minimum_required(VERSION 3.14) + +project(cello LANGUAGES C) + +include(GNUInstallDirs) + +file(GLOB cello_sources src/*.c) +add_library(cello ${cello_sources}) + +target_include_directories( + cello + PUBLIC + $ + $ +) + +set_target_properties(cello PROPERTIES PUBLIC_HEADER include/Cello.h) + +install(TARGETS cello EXPORT unofficial-cello-config) + +install( + EXPORT unofficial-cello-config + NAMESPACE unofficial::cello:: + DESTINATION share/unofficial-cello + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +) diff --git a/externals/vcpkg/ports/cello/portfile.cmake b/externals/vcpkg/ports/cello/portfile.cmake new file mode 100755 index 000000000..279d5c4a8 --- /dev/null +++ b/externals/vcpkg/ports/cello/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO orangeduck/Cello + REF da28eefbc95d8bd5628e5f1c4cc12bc1b13fef4f + SHA512 64825cf37223dd679b379d78475218a543690c3b78333acb906d42982261df4b9ada3a87bea183fad5e2cf220311904e657b0bf5051b141c389d5ee1d2974e5b + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/cello/vcpkg.json b/externals/vcpkg/ports/cello/vcpkg.json new file mode 100755 index 000000000..67e817b41 --- /dev/null +++ b/externals/vcpkg/ports/cello/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cello", + "version-date": "2019-07-23", + "port-version": 2, + "description": "Higher level programming in C", + "homepage": "https://libcello.org/" +} diff --git a/externals/vcpkg/ports/cereal/portfile.cmake b/externals/vcpkg/ports/cereal/portfile.cmake new file mode 100755 index 000000000..cf667b6f3 --- /dev/null +++ b/externals/vcpkg/ports/cereal/portfile.cmake @@ -0,0 +1,25 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO USCiLab/cereal + REF v1.3.2 + SHA512 98d306d6292789129675f1c5c5aedcb90cfcc1029c4482893a8f9b23f3c9755e5ed4762d7a528f215345cae6392e87cd8d89467115b6f031b41c8673d6b4b109 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DJUST_INSTALL_CEREAL=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cereal) + +# Clean +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/cereal/vcpkg.json b/externals/vcpkg/ports/cereal/vcpkg.json new file mode 100755 index 000000000..aface78b9 --- /dev/null +++ b/externals/vcpkg/ports/cereal/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "cereal", + "version": "1.3.2", + "port-version": 1, + "description": "a header-only C++11 serialization library (built in support for binary, XML and JSon)", + "homepage": "https://github.com/USCiLab/cereal", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ceres/0001_cmakelists_fixes.patch b/externals/vcpkg/ports/ceres/0001_cmakelists_fixes.patch new file mode 100755 index 000000000..bb5942723 --- /dev/null +++ b/externals/vcpkg/ports/ceres/0001_cmakelists_fixes.patch @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 33e98b1..f275d68 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -426,27 +426,7 @@ if (MINIGLOG) + GLOG_LIBRARY) + else (MINIGLOG) + unset(MINIGLOG_MAX_LOG_LEVEL CACHE) +- # Don't search with REQUIRED so that configuration continues if not found and +- # we can output an error messages explaining MINIGLOG option. +- find_package(Glog) +- if (NOT GLOG_FOUND) +- message(FATAL_ERROR "Can't find Google Log (glog). Please set either: " +- "glog_DIR (newer CMake built versions of glog) or GLOG_INCLUDE_DIR & " +- "GLOG_LIBRARY or enable MINIGLOG option to use minimal glog " +- "implementation.") +- endif(NOT GLOG_FOUND) +- # By default, assume gflags was found, updating the message if it was not. +- set(GLOG_GFLAGS_DEPENDENCY_MESSAGE +- " Assuming glog was built with gflags support as gflags was found. " +- "This will make gflags a public dependency of Ceres.") +- if (NOT gflags_FOUND) +- set(GLOG_GFLAGS_DEPENDENCY_MESSAGE +- " Assuming glog was NOT built with gflags support as gflags was " +- "not found. If glog was built with gflags, please set the " +- "gflags search locations such that it can be found by Ceres. " +- "Otherwise, Ceres may fail to link due to missing gflags symbols.") +- endif(NOT gflags_FOUND) +- message("-- Found Google Log (glog)." ${GLOG_GFLAGS_DEPENDENCY_MESSAGE}) ++ find_package(Glog REQUIRED) + endif (MINIGLOG) + + if (NOT SCHUR_SPECIALIZATIONS) +@@ -760,12 +740,6 @@ install(FILES "${Ceres_BINARY_DIR}/CeresConfig-install.cmake" + DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR}) + install(FILES "${Ceres_BINARY_DIR}/CeresConfigVersion.cmake" + DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR}) +-if (GLOG_FOUND AND NOT FOUND_INSTALLED_GLOG_CMAKE_CONFIGURATION) +- # Version of glog detected was not built with CMake, install our glog module +- # file to enable detection in CeresConfig. +- install(FILES "${Ceres_SOURCE_DIR}/cmake/FindGlog.cmake" +- DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR}) +-endif() + + if (PROVIDE_UNINSTALL_TARGET) + # Create an uninstall target to remove all installed files. diff --git a/externals/vcpkg/ports/ceres/0002_use_glog_target.patch b/externals/vcpkg/ports/ceres/0002_use_glog_target.patch new file mode 100755 index 000000000..01ac27d4a --- /dev/null +++ b/externals/vcpkg/ports/ceres/0002_use_glog_target.patch @@ -0,0 +1,25 @@ +diff --git a/internal/ceres/CMakeLists.txt b/internal/ceres/CMakeLists.txt +index 0e33263..299b373 100644 +--- a/internal/ceres/CMakeLists.txt ++++ b/internal/ceres/CMakeLists.txt +@@ -101,17 +101,9 @@ endif() + find_package(Threads QUIET) + list(APPEND CERES_LIBRARY_PUBLIC_DEPENDENCIES Threads::Threads) + +-if (NOT MINIGLOG AND GLOG_FOUND) +- list(APPEND CERES_LIBRARY_PUBLIC_DEPENDENCIES ${GLOG_LIBRARIES}) +- if (gflags_FOUND) +- # If glog & gflags are both found, we assume that glog was built with +- # gflags, as it is awkward to perform a try_compile() to verify this +- # when gflags is an imported target (as it is in newer versions). +- # As glog #includes gflags/gflags.h in glog/logging.h if compiled with +- # gflags, it is thus a public dependency for Ceres in this case. +- list(APPEND CERES_LIBRARY_PUBLIC_DEPENDENCIES gflags) +- endif() +-endif (NOT MINIGLOG AND GLOG_FOUND) ++if (NOT MINIGLOG) ++ list(APPEND CERES_LIBRARY_PUBLIC_DEPENDENCIES glog::glog) ++endif (NOT MINIGLOG) + + if (SUITESPARSE AND SuiteSparse_FOUND) + # Define version information for use in Solver::FullReport. diff --git a/externals/vcpkg/ports/ceres/0003_fix_exported_ceres_config.patch b/externals/vcpkg/ports/ceres/0003_fix_exported_ceres_config.patch new file mode 100755 index 000000000..9505707da --- /dev/null +++ b/externals/vcpkg/ports/ceres/0003_fix_exported_ceres_config.patch @@ -0,0 +1,66 @@ +diff --git a/cmake/CeresConfig.cmake.in b/cmake/CeresConfig.cmake.in +index 4745483..b55462d 100644 +--- a/cmake/CeresConfig.cmake.in ++++ b/cmake/CeresConfig.cmake.in +@@ -217,55 +217,14 @@ else (Eigen3_FOUND) + endif (Eigen3_FOUND) + + # glog (and maybe gflags). +-# +-# Flags set during configuration and build of Ceres. +-set(CERES_USES_MINIGLOG @MINIGLOG@) +-set(CERES_GLOG_VERSION @glog_VERSION@) +-set(CERES_GLOG_WAS_BUILT_WITH_CMAKE @FOUND_INSTALLED_GLOG_CMAKE_CONFIGURATION@) +- +-set(CERES_USES_GFLAGS @GFLAGS@) +-set(CERES_GFLAGS_VERSION @gflags_VERSION@) +- +-if (CERES_USES_MINIGLOG) +- # Output message at standard log level (not the lower STATUS) so that +- # the message is output in GUI during configuration to warn user. +- ceres_message("-- Found Ceres compiled with miniglog substitute " +- "for glog, beware this will likely cause problems if glog is later linked.") +-else(CERES_USES_MINIGLOG) +- if (CERES_GLOG_WAS_BUILT_WITH_CMAKE) +- find_package(glog ${CERES_GLOG_VERSION} CONFIG QUIET) +- set(GLOG_FOUND ${glog_FOUND}) +- else() +- # Version of glog against which Ceres was built was not built with CMake, +- # use the exported glog find_package() module from Ceres to find it again. +- # Append the locations of glog when Ceres was built to the search path hints. +- list(APPEND GLOG_INCLUDE_DIR_HINTS "@GLOG_INCLUDE_DIR@") +- get_filename_component(CERES_BUILD_GLOG_LIBRARY_DIR "@GLOG_LIBRARY@" PATH) +- list(APPEND GLOG_LIBRARY_DIR_HINTS ${CERES_BUILD_GLOG_LIBRARY_DIR}) +- +- # Search quietly s/t we control the timing of the error message if not found. +- find_package(Glog QUIET) +- endif() + +- if (GLOG_FOUND) +- ceres_message(STATUS "Found required Ceres dependency: glog") +- else() +- ceres_report_not_found("Missing required Ceres dependency: glog.") +- endif() ++include (CMakeFindDependencyMacro) ++find_dependency (glog NO_MODULE) + +- # gflags is only a public dependency of Ceres via glog, thus is not required +- # if Ceres was built with MINIGLOG. +- if (CERES_USES_GFLAGS) +- # Search quietly s/t we control the timing of the error message if not found. +- find_package(gflags ${CERES_GFLAGS_VERSION} QUIET) +- if (gflags_FOUND AND TARGET gflags) +- ceres_message(STATUS "Found required Ceres dependency: gflags") +- else() +- ceres_report_not_found("Missing required Ceres " +- "dependency: gflags (not found, or not found as exported CMake target).") +- endif() +- endif() +-endif(CERES_USES_MINIGLOG) ++# SuiteSparse ++if (@SUITESPARSE@) ++ find_dependency(SuiteSparse CONFIG) ++endif() + + # Import exported Ceres targets, if they have not already been imported. + if (NOT TARGET ceres AND NOT Ceres_BINARY_DIR) diff --git a/externals/vcpkg/ports/ceres/find-package-required.patch b/externals/vcpkg/ports/ceres/find-package-required.patch new file mode 100755 index 000000000..07785dd13 --- /dev/null +++ b/externals/vcpkg/ports/ceres/find-package-required.patch @@ -0,0 +1,112 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2d241fe..b79454d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -244,7 +244,7 @@ else (CUDA) + endif (CUDA) + + if (LAPACK) +- find_package(LAPACK QUIET) ++ find_package(LAPACK REQUIRED) + if (LAPACK_FOUND) + message("-- Found LAPACK library: ${LAPACK_LIBRARIES}") + else (LAPACK_FOUND) +@@ -266,7 +266,8 @@ if (SUITESPARSE) + # built with SuiteSparse support. + + # Check for SuiteSparse and dependencies. +- find_package(SuiteSparse 4.0 COMPONENTS CHOLMOD SPQR) ++ find_package(suitesparse CONFIG REQUIRED) ++ set(SuiteSparse_FOUND 1) + if (SuiteSparse_FOUND) + set(SuiteSparse_DEPENDENCY "find_dependency(SuiteSparse ${SuiteSparse_VERSION})") + # By default, if all of SuiteSparse's dependencies are found, Ceres is +@@ -274,11 +275,11 @@ if (SUITESPARSE) + message("-- Found SuiteSparse ${SuiteSparse_VERSION}, " + "building with SuiteSparse.") + +- if (SuiteSparse_NO_CMAKE OR NOT SuiteSparse_DIR) ++ if (0) + install(FILES ${Ceres_SOURCE_DIR}/cmake/FindSuiteSparse.cmake + ${Ceres_SOURCE_DIR}/cmake/FindMETIS.cmake + DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR}) +- endif (SuiteSparse_NO_CMAKE OR NOT SuiteSparse_DIR) ++ endif () + else (SuiteSparse_FOUND) + # Disable use of SuiteSparse if it cannot be found and continue. + message("-- Did not find all SuiteSparse dependencies, disabling " +@@ -294,7 +295,7 @@ endif (SUITESPARSE) + # CXSparse. + if (CXSPARSE) + # Don't search with REQUIRED as we can continue without CXSparse. +- find_package(CXSparse) ++ find_package(CXSparse REQUIRED) + if (CXSparse_FOUND) + set(CXSparse_DEPENDENCY "find_dependency(CXSparse ${CXSparse_VERSION})") + # By default, if CXSparse and all dependencies are found, Ceres is +@@ -302,10 +303,10 @@ if (CXSPARSE) + message("-- Found CXSparse version: ${CXSparse_VERSION}, " + "building with CXSparse.") + +- if (CXSparse_NO_CMAKE OR NOT CXSparse_DIR) ++ if (0) + install(FILES ${Ceres_SOURCE_DIR}/cmake/FindCXSparse.cmake + DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR}) +- endif (CXSparse_NO_CMAKE OR NOT CXSparse_DIR) ++ endif () + else (CXSparse_FOUND) + # Disable use of CXSparse if it cannot be found and continue. + message("-- Did not find CXSparse, Building without CXSparse.") +@@ -367,9 +368,10 @@ endif() + # GFlags. + if (GFLAGS) + # Don't search with REQUIRED as we can continue without gflags. +- find_package(gflags 2.2.0) ++ find_package(gflags CONFIG REQUIRED) + if (gflags_FOUND) +- if (TARGET gflags) ++ if (TARGET gflags::gflags) ++ add_library(gflags ALIAS gflags::gflags) + message("-- Found Google Flags (gflags) version ${gflags_VERSION}: ${gflags_DIR}") + else() + message("-- Detected version of gflags: ${gflags_VERSION} does not define " +@@ -420,7 +422,7 @@ set_ceres_threading_model("${CERES_THREADING_MODEL}") + + if (BUILD_BENCHMARKS) + # Version 1.3 was first to provide import targets +- find_package(benchmark 1.3 QUIET) ++ find_package(benchmark CONFIG REQUIRED) + if (benchmark_FOUND) + message("-- Found Google benchmark library. Building Ceres benchmarks.") + else() +@@ -611,7 +613,7 @@ create_ceres_config("${CERES_COMPILE_OPTIONS}" + add_subdirectory(internal/ceres) + + if (BUILD_DOCUMENTATION) +- find_package(Sphinx) ++ find_package(Sphinx REQUIRED) + if (NOT SPHINX_FOUND) + message("-- Failed to find Sphinx and/or its dependencies, disabling build of documentation.") + update_cache_variable(BUILD_DOCUMENTATION OFF) +diff --git a/internal/ceres/CMakeLists.txt b/internal/ceres/CMakeLists.txt +index 299b373..33d41d8 100644 +--- a/internal/ceres/CMakeLists.txt ++++ b/internal/ceres/CMakeLists.txt +@@ -108,14 +108,14 @@ endif (NOT MINIGLOG) + if (SUITESPARSE AND SuiteSparse_FOUND) + # Define version information for use in Solver::FullReport. + add_definitions(-DCERES_SUITESPARSE_VERSION="${SuiteSparse_VERSION}") +- list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES SuiteSparse::CHOLMOD +- SuiteSparse::SPQR) ++ list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES SuiteSparse::cholmod ++ SuiteSparse::spqr) + endif (SUITESPARSE AND SuiteSparse_FOUND) + + if (CXSPARSE AND CXSparse_FOUND) + # Define version information for use in Solver::FullReport. + add_definitions(-DCERES_CXSPARSE_VERSION="${CXSparse_VERSION}") +- list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES CXSparse::CXSparse) ++ list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES ${CXSparse_LIBRARIES}) + endif (CXSPARSE AND CXSparse_FOUND) + + if (ACCELERATESPARSE AND AccelerateSparse_FOUND) diff --git a/externals/vcpkg/ports/ceres/portfile.cmake b/externals/vcpkg/ports/ceres/portfile.cmake new file mode 100755 index 000000000..c3aad8224 --- /dev/null +++ b/externals/vcpkg/ports/ceres/portfile.cmake @@ -0,0 +1,62 @@ +set(MSVC_USE_STATIC_CRT_VALUE OFF) +if(VCPKG_CRT_LINKAGE STREQUAL "static") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + message(FATAL_ERROR "Ceres does not support mixing static CRT and dynamic library linkage") + endif() + set(MSVC_USE_STATIC_CRT_VALUE ON) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ceres-solver/ceres-solver + REF f68321e7de8929fbcdb95dd42877531e64f72f66 #2.1.0 + SHA512 67bbd8a9385a40fe69d118fbc84da0fcc9aa1fbe14dd52f5403ed09686504213a1d931e95a1a0148d293b27ab5ce7c1d618fbf2e8fed95f2bbafab851a1ef449 + HEAD_REF master + PATCHES + 0001_cmakelists_fixes.patch + 0002_use_glog_target.patch + 0003_fix_exported_ceres_config.patch + find-package-required.patch +) + +file(REMOVE "${SOURCE_PATH}/cmake/FindCXSparse.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/FindGflags.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/FindGlog.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/FindEigen.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/FindSuiteSparse.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/FindMETIS.cmake") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "suitesparse" SUITESPARSE + "cxsparse" CXSPARSE + "lapack" LAPACK + "eigensparse" EIGENSPARSE + "tools" GFLAGS + "cuda" CUDA +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DEXPORT_BUILD_DIR=ON + -DBUILD_BENCHMARKS=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTING=OFF + -DBUILD_BENCHMARKS=OFF + -DPROVIDE_UNINSTALL_TARGET=OFF + -DMSVC_USE_STATIC_CRT=${MSVC_USE_STATIC_CRT_VALUE} + -DLIB_SUFFIX=${LIB_SUFFIX} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib${LIB_SUFFIX}/cmake/Ceres") + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/ceres/vcpkg.json b/externals/vcpkg/ports/ceres/vcpkg.json new file mode 100755 index 000000000..6b1e2e7b4 --- /dev/null +++ b/externals/vcpkg/ports/ceres/vcpkg.json @@ -0,0 +1,68 @@ +{ + "name": "ceres", + "version": "2.1.0", + "port-version": 1, + "description": "non-linear optimization package", + "homepage": "https://github.com/ceres-solver/ceres-solver", + "license": "Apache-2.0", + "dependencies": [ + "eigen3", + "glog", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cuda": { + "description": "Support for CUDA based dense solvers", + "supports": "linux | (!osx & !uwp & !(arm64 & windows))", + "dependencies": [ + "cuda" + ] + }, + "cxsparse": { + "description": "CXSparse support for Ceres", + "dependencies": [ + { + "name": "suitesparse", + "default-features": false + } + ] + }, + "eigensparse": { + "description": "Use of Eigen as a sparse linear algebra library in Ceres" + }, + "lapack": { + "description": "Use Lapack in Ceres", + "dependencies": [ + "lapack" + ] + }, + "suitesparse": { + "description": "SuiteSparse support for Ceres", + "dependencies": [ + { + "name": "ceres", + "features": [ + "lapack" + ] + }, + { + "name": "suitesparse", + "default-features": false + } + ] + }, + "tools": { + "description": "Ceres tools", + "dependencies": [ + "gflags" + ] + } + } +} diff --git a/externals/vcpkg/ports/cfitsio/0001-fix-dependencies.patch b/externals/vcpkg/ports/cfitsio/0001-fix-dependencies.patch new file mode 100755 index 000000000..d8df38548 --- /dev/null +++ b/externals/vcpkg/ports/cfitsio/0001-fix-dependencies.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6d6af49..9e7d2ee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -94,9 +94,8 @@ IF (NOT MSVC) + + # Find curl library, for HTTPS support: + IF (UseCurl) +- FIND_PACKAGE(CURL) ++ FIND_PACKAGE(CURL CONFIG REQUIRED) + IF (CURL_FOUND) +- INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIR}) + ADD_DEFINITIONS(-DCFITSIO_HAVE_CURL) + ENDIF() + ENDIF() +@@ -128,18 +127,20 @@ SET(SRC_FILES + + # Only include zlib source files if we are building a shared library. + # Users will need to link their executable with zlib independently. +-IF (BUILD_SHARED_LIBS) ++IF (0) + set(SRC_FILES ${SRC_FILES} + zlib/adler32.c zlib/crc32.c zlib/deflate.c zlib/infback.c + zlib/inffast.c zlib/inflate.c zlib/inftrees.c zlib/trees.c + zlib/uncompr.c zlib/zutil.c + ) ++ELSE() ++ FIND_PACKAGE(ZLIB REQUIRED) + ENDIF() + + ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${H_FILES} ${SRC_FILES}) +-TARGET_LINK_LIBRARIES(${LIB_NAME} ${PTHREADS_LIBRARY} ${M_LIB}) ++TARGET_LINK_LIBRARIES(${LIB_NAME} ${PTHREADS_LIBRARY} ${M_LIB} ZLIB::ZLIB) + IF (CURL_FOUND) +- TARGET_LINK_LIBRARIES(${LIB_NAME} ${CURL_LIBRARIES}) ++ TARGET_LINK_LIBRARIES(${LIB_NAME} CURL::libcurl) + ENDIF(CURL_FOUND) + + SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION} SOVERSION ${${PROJECT_NAME}_MAJOR_VERSION}) diff --git a/externals/vcpkg/ports/cfitsio/0002-export-cmake-targets.patch b/externals/vcpkg/ports/cfitsio/0002-export-cmake-targets.patch new file mode 100755 index 000000000..ab3a46cfe --- /dev/null +++ b/externals/vcpkg/ports/cfitsio/0002-export-cmake-targets.patch @@ -0,0 +1,48 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9e7d2ee..5b37adc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,7 +24,7 @@ OPTION(UseCurl "UseCurl" ON) + + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}") + set (LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") +-set (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/") ++set (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/cfitsio") + + # Define project version + SET(${PROJECT_NAME}_MAJOR_VERSION 3) +@@ -138,19 +138,31 @@ ELSE() + ENDIF() + + ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${H_FILES} ${SRC_FILES}) +-TARGET_LINK_LIBRARIES(${LIB_NAME} ${PTHREADS_LIBRARY} ${M_LIB} ZLIB::ZLIB) ++TARGET_INCLUDE_DIRECTORIES(${LIB_NAME} PUBLIC $) ++TARGET_LINK_LIBRARIES(${LIB_NAME} PUBLIC ${PTHREADS_LIBRARY} ${M_LIB} ZLIB::ZLIB) + IF (CURL_FOUND) +- TARGET_LINK_LIBRARIES(${LIB_NAME} CURL::libcurl) ++ TARGET_LINK_LIBRARIES(${LIB_NAME} PUBLIC CURL::libcurl) + ENDIF(CURL_FOUND) + + SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION} SOVERSION ${${PROJECT_NAME}_MAJOR_VERSION}) +-install(TARGETS ${LIB_NAME} DESTINATION ${LIB_DESTINATION}) + install(TARGETS ${LIB_NAME} ++ EXPORT unofficial-${LIB_NAME}-config + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + install(FILES ${H_FILES} DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) + ++set(CFITSIO_VERSION 3.49) ++include(CMakePackageConfigHelpers) ++write_basic_package_version_file(unofficial-${LIB_NAME}-version.cmake VERSION ${CFITSIO_VERSION} COMPATIBILITY ExactVersion) ++ ++install(FILES ${CMAKE_BINARY_DIR}/unofficial-${LIB_NAME}-version.cmake DESTINATION share/unofficial-${LIB_NAME}) ++ ++install( ++ EXPORT unofficial-${LIB_NAME}-config ++ DESTINATION share/unofficial-${LIB_NAME} ++) ++ + # Only build test code and executables if building a shared library: + IF (BUILD_SHARED_LIBS) + diff --git a/externals/vcpkg/ports/cfitsio/0003-add-Wno-error-implicit-funciton-declaration-to-cmake.patch b/externals/vcpkg/ports/cfitsio/0003-add-Wno-error-implicit-funciton-declaration-to-cmake.patch new file mode 100755 index 000000000..288a1d263 --- /dev/null +++ b/externals/vcpkg/ports/cfitsio/0003-add-Wno-error-implicit-funciton-declaration-to-cmake.patch @@ -0,0 +1,27 @@ +From af09ca45ad71a540aafc4989676e9a0b88bf2948 Mon Sep 17 00:00:00 2001 +From: Nicole Mazzuca +Date: Fri, 16 Oct 2020 12:28:37 -0700 +Subject: [PATCH] add `-Wno-error=implicit-funciton-declaration` to cmake + +--- + CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5b37adc..fead70c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,10 @@ SET(CMAKE_LEGACY_CYGWIN_WIN32 0) + PROJECT(CFITSIO) + CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0) + ++if (NOT MSVC) ++ add_compile_options(-Wno-error=implicit-function-declaration) ++endif() ++ + # Allow @rpath token in target install name on Macs. + # See "cmake --help-policy CMP0042" for more information. + IF(POLICY CMP0042) +-- +2.28.0.windows.1 + diff --git a/externals/vcpkg/ports/cfitsio/0004-pkg-config.patch b/externals/vcpkg/ports/cfitsio/0004-pkg-config.patch new file mode 100755 index 000000000..65d98b56a --- /dev/null +++ b/externals/vcpkg/ports/cfitsio/0004-pkg-config.patch @@ -0,0 +1,13 @@ +diff -urw cfitsio-3-7822097674.clean/cfitsio.pc.cmake cfitsio-3-7822097674/cfitsio.pc.cmake +--- cfitsio-3-7822097674.clean/cfitsio.pc.cmake 2020-08-12 20:01:04.000000000 +0200 ++++ cfitsio-3-7822097674/cfitsio.pc.cmake 2021-05-06 08:46:49.160351519 +0200 +@@ -6,7 +6,8 @@ + Name: cfitsio + Description: FITS File Subroutine Library + URL: https://heasarc.gsfc.nasa.gov/fitsio/ +-Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@ ++Version: @CFITSIO_VERSION@ ++Requires.private: @PKG_CONFIG_REQUIRES_PRIVATE@ + Libs: -L${libdir} @PKG_CONFIG_LIBS@ + Libs.private: -lm + Cflags: -I${includedir} diff --git a/externals/vcpkg/ports/cfitsio/portfile.cmake b/externals/vcpkg/ports/cfitsio/portfile.cmake new file mode 100755 index 000000000..e75a10945 --- /dev/null +++ b/externals/vcpkg/ports/cfitsio/portfile.cmake @@ -0,0 +1,73 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-3.49.tar.gz" + FILENAME "cfitsio-3.49.tar.gz" + SHA512 9836a4af3bbbfed1ea1b4c70b9d500ac485d7c3d8131eb8a25ee6ef6662f46ba52b5161c45c709ed9a601ff0e9ec36daa5650eaaf4f2cc7d6f4bb5640f10da15 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + 0001-fix-dependencies.patch + 0002-export-cmake-targets.patch + 0003-add-Wno-error-implicit-funciton-declaration-to-cmake.patch + 0004-pkg-config.patch +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + curl UseCurl +) + +set(PKG_CONFIG_REQUIRES_PRIVATE zlib) +if ("curl" IN_LIST FEATURES) + set(FIND_CURL_DEPENDENCY "find_dependency(CURL CONFIG)") + string(APPEND PKG_CONFIG_REQUIRES_PRIVATE " libcurl") +endif() + +if ("pthreads" IN_LIST FEATURES) + if (VCPKG_TARGET_IS_WINDOWS) + set(WITH_PTHREADS ON) + set(FIND_PTHREADS_DEPENDENCY "find_dependency(pthreads)") + else() + message(WARNING "Feature pthreads only support Windows, disable it now.") + set(WITH_PTHREADS OFF) + endif() +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + ${FEATURE_OPTIONS} + -DUSE_PTHREADS=${WITH_PTHREADS} + "-DPKG_CONFIG_REQUIRES_PRIVATE=${PKG_CONFIG_REQUIRES_PRIVATE}" + -DPKG_CONFIG_LIBS=-lcfitsio +) + +vcpkg_install_cmake() +vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-cfitsio TARGET_PATH share/unofficial-cfitsio) + +file(READ ${CURRENT_PACKAGES_DIR}/share/unofficial-cfitsio/unofficial-cfitsio-config.cmake ASSIMP_CONFIG) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/unofficial-cfitsio/unofficial-cfitsio-config.cmake " +include(CMakeFindDependencyMacro) +${FIND_CURL_DEPENDENCY} +${FIND_PTHREADS_DEPENDENCY} +find_dependency(ZLIB) +${ASSIMP_CONFIG} +") + +vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/unofficial-cfitsio/unofficial-cfitsio-config.cmake + "cmake_policy(VERSION 2.6)" + "cmake_policy(VERSION 2.6)\r\n\ +# Required for the evaluation of \"if(@BUILD_SHARED_LIBS@)\" below to function\r\n\ +cmake_policy(SET CMP0012 NEW)\r\n" +) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/include/unistd.h ${CURRENT_PACKAGES_DIR}/debug/share) + +file(INSTALL ${SOURCE_PATH}/FindPthreads.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-cfitsio) + +file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/cfitsio/vcpkg.json b/externals/vcpkg/ports/cfitsio/vcpkg.json new file mode 100755 index 000000000..9ecf0be86 --- /dev/null +++ b/externals/vcpkg/ports/cfitsio/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "cfitsio", + "version": "3.49", + "port-version": 2, + "description": "Library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format", + "homepage": "https://heasarc.gsfc.nasa.gov/fitsio/", + "dependencies": [ + "zlib" + ], + "features": { + "curl": { + "description": "UseCurl", + "dependencies": [ + "curl" + ] + }, + "pthreads": { + "description": "Thread-safe build (using pthreads)", + "dependencies": [ + { + "name": "pthreads", + "platform": "windows" + } + ] + } + } +} diff --git a/externals/vcpkg/ports/cgal/fix-incorrect-warning.patch b/externals/vcpkg/ports/cgal/fix-incorrect-warning.patch new file mode 100755 index 000000000..f8d002fab --- /dev/null +++ b/externals/vcpkg/ports/cgal/fix-incorrect-warning.patch @@ -0,0 +1,15 @@ +diff --git a/Installation/lib/cmake/CGAL/CGALConfig.cmake b/Installation/lib/cmake/CGAL/CGALConfig.cmake +index 4f3a16b..6edefb1 100644 +--- a/Installation/lib/cmake/CGAL/CGALConfig.cmake ++++ b/Installation/lib/cmake/CGAL/CGALConfig.cmake +@@ -89,7 +89,9 @@ if (NOT CGAL_DATA_DIR) + if (EXISTS "${CMAKE_SOURCE_DIR}/../../data") + set(CGAL_DATA_DIR "${CMAKE_SOURCE_DIR}/../../data") + else() +- message(WARNING "CGAL_DATA_DIR cannot be deduced, set the variable CGAL_DATA_DIR to set the default value of CGAL::data_file_path()") ++ if(CGAL_TEST_SUITE) ++ message(WARNING "CGAL_DATA_DIR cannot be deduced, set the variable CGAL_DATA_DIR to set the default value of CGAL::data_file_path()") ++ endif() + endif() + endif() + endif() diff --git a/externals/vcpkg/ports/cgal/portfile.cmake b/externals/vcpkg/ports/cgal/portfile.cmake new file mode 100755 index 000000000..34880b2e9 --- /dev/null +++ b/externals/vcpkg/ports/cgal/portfile.cmake @@ -0,0 +1,64 @@ +# Header only +vcpkg_buildpath_length_warning(37) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO CGAL/cgal + REF v5.4.1 + SHA512 2ec6167d8ebf1df121f1ac372d01862f7f3acb043deea4a334e0329976306f9c9e917cdc66b355728d3f99fdb76f5491d96f10fff660716ce27bfd3793380875 + HEAD_REF master + PATCHES fix-incorrect-warning.patch # https://github.com/CGAL/cgal/pull/6649 +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + qt WITH_CGAL_Qt5 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCGAL_HEADER_ONLY=ON + -DCGAL_INSTALL_CMAKE_DIR=share/cgal + -DBUILD_TESTING=OFF + -DBUILD_DOC=OFF + -DCGAL_BUILD_THREE_DOC=OFF + ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + CGAL_BUILD_THREE_DOC + CGAL_HEADER_ONLY + WITH_CGAL_Qt5 +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +vcpkg_copy_pdbs() + +# Clean +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") +else() + foreach(ROOT "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE + "${ROOT}/cgal_create_CMakeLists" + "${ROOT}/cgal_create_cmake_script" + "${ROOT}/cgal_make_macosx_app" + ) + endforeach() +endif() + +file(INSTALL "${SOURCE_PATH}/Installation/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file( + COPY + "${SOURCE_PATH}/Installation/LICENSE.BSL" + "${SOURCE_PATH}/Installation/LICENSE.RFL" + "${SOURCE_PATH}/Installation/LICENSE.GPL" + "${SOURCE_PATH}/Installation/LICENSE.LGPL" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" +) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/cgal/usage b/externals/vcpkg/ports/cgal/usage new file mode 100755 index 000000000..9ea12d70b --- /dev/null +++ b/externals/vcpkg/ports/cgal/usage @@ -0,0 +1,5 @@ +The package cgal provides CMake targets: + + find_package(CGAL CONFIG REQUIRED) + target_link_libraries(main PRIVATE CGAL::CGAL) + diff --git a/externals/vcpkg/ports/cgal/vcpkg.json b/externals/vcpkg/ports/cgal/vcpkg.json new file mode 100755 index 000000000..fce76bdb4 --- /dev/null +++ b/externals/vcpkg/ports/cgal/vcpkg.json @@ -0,0 +1,79 @@ +{ + "name": "cgal", + "version": "5.4.1", + "port-version": 1, + "description": "The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.", + "homepage": "https://github.com/CGAL/cgal", + "license": "GPL-3.0-or-later AND LGPL-3.0-or-later AND BSL-1.0", + "dependencies": [ + "boost-accumulators", + "boost-algorithm", + "boost-bimap", + "boost-callable-traits", + "boost-concept-check", + "boost-container", + "boost-core", + "boost-detail", + "boost-filesystem", + "boost-functional", + "boost-fusion", + "boost-geometry", + "boost-graph", + "boost-heap", + "boost-intrusive", + "boost-iostreams", + "boost-iterator", + "boost-lambda", + "boost-logic", + "boost-math", + "boost-mpl", + "boost-multi-array", + "boost-multi-index", + "boost-multiprecision", + "boost-numeric-conversion", + "boost-optional", + "boost-parameter", + "boost-pool", + "boost-preprocessor", + "boost-property-map", + "boost-property-tree", + "boost-ptr-container", + "boost-random", + "boost-range", + "boost-serialization", + "boost-spirit", + "boost-thread", + "boost-tuple", + "boost-type-traits", + "boost-units", + "boost-utility", + "boost-variant", + "gmp", + "mpfr", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "features": { + "qt": { + "description": "Qt GUI support for CGAL", + "dependencies": [ + "eigen3", + "qt5-3d", + { + "name": "qt5-base", + "default-features": false + }, + "qt5-script", + "qt5-svg", + "qt5-xmlpatterns" + ] + } + } +} diff --git a/externals/vcpkg/ports/cgicc/CMakeLists.txt b/externals/vcpkg/ports/cgicc/CMakeLists.txt new file mode 100755 index 000000000..8a74f6bff --- /dev/null +++ b/externals/vcpkg/ports/cgicc/CMakeLists.txt @@ -0,0 +1,121 @@ + +cmake_minimum_required (VERSION 3.8) +project (cgicc) +include (CheckIncludeFiles) +include(CheckSymbolExists) +include (CheckCXXSourceCompiles) + +set (VERSION "3.2.19") +execute_process (COMMAND hostname OUTPUT_VARIABLE HOST OUTPUT_STRIP_TRAILING_WHITESPACE) +check_include_files (dlfcn.h HAVE_DLFCN_H) +check_symbol_exists(gettimeofday sys/time.h HAVE_GETTIMEOFDAY) +check_include_files (inttypes.h HAVE_INTTYPES_H) +check_include_files (memory.h HAVE_MEMORY_H) + +check_cxx_source_compiles (" + namespace test { } + int main(int, char**) { + using namespace ::test; +}" HAVE_NAMESPACES) +check_include_files (stdint.h HAVE_STDINT_H) +check_include_files (stdlib.h HAVE_STDLIB_H) +set (CMAKE_REQUIRED_FLAGS "-DHAVE_NAMESPACES") +check_cxx_source_compiles (" + #include + #include + #ifdef HAVE_NAMESPACES + using namespace std; +#endif +int +main () +{ +list x; x.push_back(5); +list::iterator iter = x.begin(); if (iter != x.end()) ++iter; return 0; + ; + return 0; +}" HAVE_STL) +check_include_files (strings.h HAVE_STRINGS_H) +check_include_files (string.h HAVE_STRING_H) +check_include_files (sys/stat.h HAVE_SYS_STAT_H) +check_include_files (sys/time.h HAVE_SYS_TIME_H) +check_include_files (sys/types.h HAVE_SYS_TYPES_H) +check_include_files (sys/utsname.h HAVE_SYS_UTSNAME_H) +check_symbol_exists (uname sys/utsname.h HAVE_UNAME) +check_include_files (unistd.h HAVE_UNISTD_H) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cgicc/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cgicc/CgiDefs.h.in ${CMAKE_CURRENT_BINARY_DIR}/CgiDefs.h @ONLY) +add_definitions (-DHAVE_CONFIG_H) +set (cgicc_SOURCES + cgicc/CgiEnvironment.cpp + cgicc/CgiInput.cpp + cgicc/CgiUtils.cpp + cgicc/Cgicc.cpp + cgicc/FormEntry.cpp + cgicc/FormFile.cpp + cgicc/HTMLAttribute.cpp + cgicc/HTMLAttributeList.cpp + cgicc/HTMLDoctype.cpp + cgicc/HTMLElement.cpp + cgicc/HTMLElementList.cpp + cgicc/HTTPContentHeader.cpp + cgicc/HTTPCookie.cpp + cgicc/HTTPHTMLHeader.cpp + cgicc/HTTPHeader.cpp + cgicc/HTTPPlainHeader.cpp + cgicc/HTTPRedirectHeader.cpp + cgicc/HTTPResponseHeader.cpp + cgicc/HTTPStatusHeader.cpp + cgicc/HTTPXHTMLHeader.cpp + cgicc/MStreamable.cpp + cgicc/XHTMLDoctype.cpp +cgicc/XMLPI.cpp) +set (cgicc_HEADERS + cgicc/Cgicc.h + cgicc/CgiEnvironment.h + cgicc/CgiInput.h + cgicc/CgiUtils.h + cgicc/FormEntry.h + cgicc/FormFile.h + cgicc/HTMLAtomicElement.h + cgicc/HTMLAttribute.h + cgicc/HTMLAttributeList.h + cgicc/HTMLBooleanElement.h + cgicc/HTMLClasses.h + cgicc/HTMLDoctype.h + cgicc/HTMLElement.h + cgicc/HTMLElementList.h + cgicc/HTTPContentHeader.h + cgicc/HTTPCookie.h + cgicc/HTTPHeader.h + cgicc/HTTPHTMLHeader.h + cgicc/HTTPPlainHeader.h + cgicc/HTTPRedirectHeader.h + cgicc/HTTPResponseHeader.h + cgicc/HTTPStatusHeader.h + cgicc/HTTPXHTMLHeader.h + cgicc/MStreamable.h + cgicc/XHTMLDoctype.h + cgicc/XMLDeclaration.h + cgicc/XMLPI.h + ${CMAKE_CURRENT_BINARY_DIR}/CgiDefs.h + ${CMAKE_CURRENT_BINARY_DIR}/config.h +) + +include_directories (. ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}) +add_library (cgicc ${cgicc_SOURCES} ${cgicc_HEADERS}) + +if (BUILD_SHARED_LIBS) + add_definitions(-DCGICC_EXPORTS) +else() + add_definitions(-DCGICC_STATIC) +endif() + +install(TARGETS cgicc + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES ${cgicc_HEADERS} DESTINATION include/cgicc) +endif() diff --git a/externals/vcpkg/ports/cgicc/fix-define.patch b/externals/vcpkg/ports/cgicc/fix-define.patch new file mode 100755 index 000000000..2c3f9bca1 --- /dev/null +++ b/externals/vcpkg/ports/cgicc/fix-define.patch @@ -0,0 +1,22 @@ +diff --git a/cgicc/config.h.in b/cgicc/config.h.in +index 6870cc2..ee7b5b4 100644 +--- a/cgicc/config.h.in ++++ b/cgicc/config.h.in +@@ -76,7 +76,7 @@ + #undef HAVE__BOOL + + /* The host system cgicc was configured for */ +-#undef HOST ++#cmakedefine HOST "@HOST@" + + /* Define to the sub-directory where libtool stores uninstalled libraries. */ + #undef LT_OBJDIR +@@ -106,7 +106,7 @@ + #undef STDC_HEADERS + + /* Version number of package */ +-#undef VERSION ++#cmakedefine VERSION "@VERSION@" + + /* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ diff --git a/externals/vcpkg/ports/cgicc/fix-static-build.patch b/externals/vcpkg/ports/cgicc/fix-static-build.patch new file mode 100755 index 000000000..4bd21794c --- /dev/null +++ b/externals/vcpkg/ports/cgicc/fix-static-build.patch @@ -0,0 +1,15 @@ +diff --git a/cgicc/CgiDefs.h.in b/cgicc/CgiDefs.h.in +index 71b70ad..3793cd8 100644 +--- a/cgicc/CgiDefs.h.in ++++ b/cgicc/CgiDefs.h.in +@@ -47,7 +47,9 @@ + #ifdef WIN32 + + // export library symbols +-# ifdef CGICC_EXPORTS ++# ifdef CGICC_STATIC ++# define CGICC_API ++# elif defined(CGICC_EXPORTS) + # define CGICC_API __declspec(dllexport) + # else + # define CGICC_API __declspec(dllimport) diff --git a/externals/vcpkg/ports/cgicc/portfile.cmake b/externals/vcpkg/ports/cgicc/portfile.cmake new file mode 100755 index 000000000..0be8d1825 --- /dev/null +++ b/externals/vcpkg/ports/cgicc/portfile.cmake @@ -0,0 +1,41 @@ +set(CGICC_VERSION 3.2.19) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_download_distfile(ARCHIVE + URLS "https://ftp.gnu.org/gnu/cgicc/cgicc-${CGICC_VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/cgicc/cgicc-${CGICC_VERSION}.tar.gz" + FILENAME "cgicc-${CGICC_VERSION}.tar.gz" + SHA512 c361923cf3ac876bc3fc94dffd040d2be7cd44751d8534f4cfa3545e9f58a8ec35ebcd902a8ce6a19da0efe52db67506d8b02e5cc868188d187ce3092519abdf +) + +vcpkg_extract_source_archive_ex( + ARCHIVE ${ARCHIVE} + OUT_SOURCE_PATH SOURCE_PATH + PATCHES + fix-define.patch + fix-static-build.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON + -DDISABLE_INSTALL_TOOLS=ON +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(READ ${CURRENT_PACKAGES_DIR}/include/cgicc/CgiDefs.h CGI_H) +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + string(REPLACE "# ifdef CGICC_STATIC" "# if 0" CGI_H "${CGI_H}") +else() + string(REPLACE "# ifdef CGICC_STATIC" "# if 1" CGI_H "${CGI_H}") +endif() +file(WRITE ${CURRENT_PACKAGES_DIR}/include/cgicc/CgiDefs.h "${CGI_H}") + + +file(INSTALL ${SOURCE_PATH}/COPYING.DOC DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/cgicc/vcpkg.json b/externals/vcpkg/ports/cgicc/vcpkg.json new file mode 100755 index 000000000..5d3b9b146 --- /dev/null +++ b/externals/vcpkg/ports/cgicc/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cgicc", + "version-string": "3.2.19", + "port-version": 5, + "description": "GNU Cgicc is an ANSI C++ compliant class library that greatly simplifies the creation of CGI applications for the World Wide Web", + "homepage": "https://www.gnu.org/software/cgicc/" +} diff --git a/externals/vcpkg/ports/cgl/CMakeLists.txt b/externals/vcpkg/ports/cgl/CMakeLists.txt new file mode 100755 index 000000000..ce859f192 --- /dev/null +++ b/externals/vcpkg/ports/cgl/CMakeLists.txt @@ -0,0 +1,125 @@ +cmake_minimum_required(VERSION 3.11) + +project(Cgl LANGUAGES C CXX) + +set(PROJECT_VERSION 0.60.2) +set(PROJECT_VERSION_MAJOR 0) +set(PROJECT_VERSION_MINOR 60) +set(PROJECT_VERSION_PATCH 2) + +set(CMAKE_CXX_STANDARD 14) + +set(INSTALL_BIN_DIR "bin" CACHE PATH "Path where exe and dll will be installed") +set(INSTALL_LIB_DIR "lib" CACHE PATH "Path where lib will be installed") +set(INSTALL_INCLUDE_DIR "include/Coin" CACHE PATH "Path where headers will be installed") +set(INSTALL_CMAKE_DIR "share/cgl" CACHE PATH "Path where cmake configs will be installed") + +# Make relative paths absolute (needed later on) +set(RELATIVE_INSTALL_INCLUDE_DIR ${INSTALL_INCLUDE_DIR}) +foreach(p LIB BIN INCLUDE CMAKE) + set(var INSTALL_${p}_DIR) + if(NOT IS_ABSOLUTE "${${var}}") + set(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}") + endif() +endforeach() + +find_package(CoinUtils REQUIRED) +find_package(Osi REQUIRED) +find_package(Clp REQUIRED) + +file(GLOB CGL_SOURCES + Cgl/src/CglConfig.h + Cgl/src/*.hpp + Cgl/src/*.cpp + Cgl/src/CglAllDifferent/*.cpp + Cgl/src/CglAllDifferent/*.hpp + Cgl/src/CglBKClique/*.cpp + Cgl/src/CglBKClique/*.hpp + Cgl/src/CglClique/*.cpp + Cgl/src/CglClique/*.hpp + Cgl/src/CglCliqueMerging/*.cpp + Cgl/src/CglCliqueMerging/*.hpp + Cgl/src/CglDuplicateRow/*.cpp + Cgl/src/CglDuplicateRow/*.hpp + Cgl/src/CglFlowCover/*.cpp + Cgl/src/CglFlowCover/*.hpp + Cgl/src/CglGMI/*.cpp + Cgl/src/CglGMI/*.hpp + Cgl/src/CglGomory/*.cpp + Cgl/src/CglGomory/*.hpp + Cgl/src/CglKnapsackCover/*.cpp + Cgl/src/CglKnapsackCover/*.hpp + Cgl/src/CglLandP/*.cpp + Cgl/src/CglLandP/*.hpp + Cgl/src/CglLiftAndProject/*.cpp + Cgl/src/CglLiftAndProject/*.hpp + Cgl/src/CglMixedIntegerRounding/*.cpp + Cgl/src/CglMixedIntegerRounding/*.hpp + Cgl/src/CglMixedIntegerRounding2/*.cpp + Cgl/src/CglMixedIntegerRounding2/*.hpp + Cgl/src/CglOddHole/*.cpp + Cgl/src/CglOddHole/*.hpp + Cgl/src/CglOddHoleWC/*.cpp + Cgl/src/CglOddHoleWC/*.hpp + Cgl/src/CglPreProcess/*.cpp + Cgl/src/CglPreProcess/*.hpp + Cgl/src/CglProbing/*.cpp + Cgl/src/CglProbing/*.hpp + Cgl/src/CglRedSplit/*.cpp + Cgl/src/CglRedSplit/*.hpp + Cgl/src/CglRedSplit2/*.cpp + Cgl/src/CglRedSplit2/*.hpp + Cgl/src/CglResidualCapacity/*.cpp + Cgl/src/CglResidualCapacity/*.hpp + Cgl/src/CglSimpleRounding/*.cpp + Cgl/src/CglSimpleRounding/*.hpp + Cgl/src/CglTwomir/*.cpp + Cgl/src/CglTwomir/*.hpp + Cgl/src/CglZeroHalf/*.cpp + Cgl/src/CglZeroHalf/*.hpp) + +add_library(${PROJECT_NAME} ${CGL_SOURCES}) + +target_include_directories(${PROJECT_NAME} + PUBLIC + $ + $) + +target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_CMATH) +target_compile_definitions(${PROJECT_NAME} PUBLIC COIN_HAS_CLP) + +target_link_libraries(${PROJECT_NAME} PRIVATE Coin::CoinUtils Coin::Osi Coin::Clp) + +install(DIRECTORY Cgl/src/ + DESTINATION ${INSTALL_INCLUDE_DIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN "*.hpp" + PATTERN "config_default.h" EXCLUDE) + +install(TARGETS ${PROJECT_NAME} + EXPORT "${PROJECT_NAME}Targets" + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin) + +include(CMakePackageConfigHelpers) + +set(version_config "${CMAKE_CURRENT_BINARY_DIR}/temp/${PROJECT_NAME}ConfigVersion.cmake") +set(project_config "${CMAKE_CURRENT_BINARY_DIR}/temp/${PROJECT_NAME}Config.cmake") +set(namespace "Coin::") + +write_basic_package_version_file("${version_config}" + COMPATIBILITY SameMajorVersion) + +configure_package_config_file("Config.cmake.in" + "${project_config}" + INSTALL_DESTINATION + "${INSTALL_CMAKE_DIR}") + +install(FILES "${project_config}" "${version_config}" + DESTINATION "${INSTALL_CMAKE_DIR}") + +install(EXPORT "${PROJECT_NAME}Targets" + NAMESPACE "${namespace}" + DESTINATION "${INSTALL_CMAKE_DIR}") \ No newline at end of file diff --git a/externals/vcpkg/ports/cgl/Config.cmake.in b/externals/vcpkg/ports/cgl/Config.cmake.in new file mode 100755 index 000000000..a9af95692 --- /dev/null +++ b/externals/vcpkg/ports/cgl/Config.cmake.in @@ -0,0 +1,5 @@ + +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") +check_required_components("@PROJECT_NAME@") \ No newline at end of file diff --git a/externals/vcpkg/ports/cgl/fix-c1083-error.patch b/externals/vcpkg/ports/cgl/fix-c1083-error.patch new file mode 100755 index 000000000..bc5b62a00 --- /dev/null +++ b/externals/vcpkg/ports/cgl/fix-c1083-error.patch @@ -0,0 +1,30 @@ +diff --git a/Cgl/src/CglLandP/CglLandP.cpp b/Cgl/src/CglLandP/CglLandP.cpp +index 2676790..af90a6e 100644 +--- a/Cgl/src/CglLandP/CglLandP.cpp ++++ b/Cgl/src/CglLandP/CglLandP.cpp +@@ -22,7 +22,7 @@ + #define CLONE_SI //Solver is cloned between two cuts + + #include "CoinTime.hpp" +-#include "CglGomory.hpp" ++#include "CglGomory/CglGomory.hpp" + #include "CoinFactorization.hpp" + #include + namespace LAP +diff --git a/Cgl/src/CglPreProcess/CglPreProcess.cpp b/Cgl/src/CglPreProcess/CglPreProcess.cpp +index 17cf372..8cb738f 100644 +--- a/Cgl/src/CglPreProcess/CglPreProcess.cpp ++++ b/Cgl/src/CglPreProcess/CglPreProcess.cpp +@@ -24,9 +24,9 @@ + #include "CoinHelperFunctions.hpp" + #include "CoinWarmStartBasis.hpp" + +-#include "CglProbing.hpp" +-#include "CglDuplicateRow.hpp" +-#include "CglClique.hpp" ++#include "CglProbing/CglProbing.hpp" ++#include "CglDuplicateRow/CglDuplicateRow.hpp" ++#include "CglClique/CglClique.hpp" + //#define PRINT_DEBUG 1 + //#define COIN_DEVELOP 1 + #ifdef COIN_DEVELOP diff --git a/externals/vcpkg/ports/cgl/portfile.cmake b/externals/vcpkg/ports/cgl/portfile.cmake new file mode 100755 index 000000000..97583b097 --- /dev/null +++ b/externals/vcpkg/ports/cgl/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO coin-or/Cgl + REF 31797b2997219934db02a40d501c4b6d8efa7398 # 0.60.3 + SHA512 33e01acdfd2057541492f4e83c0554ed74489995c47cef0b954529d4603090d03457fdababb331132b3fd286c985e46a3c8e3abbdb2eed36e7eaa8102acd095e + PATCHES fix-c1083-error.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/cgl/vcpkg.json b/externals/vcpkg/ports/cgl/vcpkg.json new file mode 100755 index 000000000..7b72af761 --- /dev/null +++ b/externals/vcpkg/ports/cgl/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "cgl", + "version": "0.60.3", + "description": "The COIN-OR Cut Generation Library (Cgl) is a collection of cut generators that can be used with other COIN-OR packages that make use of cuts, such as, among others, the linear solver Clp or the mixed integer linear programming solvers Cbc or BCP.", + "homepage": "https://github.com/coin-or/Cgl", + "dependencies": [ + "clp", + "coinutils", + "osi", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/cgltf/portfile.cmake b/externals/vcpkg/ports/cgltf/portfile.cmake new file mode 100755 index 000000000..181e95d98 --- /dev/null +++ b/externals/vcpkg/ports/cgltf/portfile.cmake @@ -0,0 +1,15 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jkuhlmann/cgltf + REF v1.11 + SHA512 b3350d34670dac6756ea010bd030c4709f3a6c86d43b5099d10b505437422951e5db7f8e521ec9590a7aada535146614936ff990533d07084b1e50c216572943 + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/cgltf.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(COPY "${SOURCE_PATH}/cgltf_write.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +# Handle copyright +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) \ No newline at end of file diff --git a/externals/vcpkg/ports/cgltf/vcpkg.json b/externals/vcpkg/ports/cgltf/vcpkg.json new file mode 100755 index 000000000..e787feea1 --- /dev/null +++ b/externals/vcpkg/ports/cgltf/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "cgltf", + "version": "1.11", + "description": "Single-file glTF 2.0 loader and writer written in C99", + "homepage": "https://github.com/jkuhlmann/cgltf" +} diff --git a/externals/vcpkg/ports/cgns/cgnsconfig.h b/externals/vcpkg/ports/cgns/cgnsconfig.h new file mode 100755 index 000000000..7ebe18ac5 --- /dev/null +++ b/externals/vcpkg/ports/cgns/cgnsconfig.h @@ -0,0 +1,6 @@ +#ifndef CGNSCONFIG_H +#define CGNSCONFIG_H + +#include "cgnstypes.h" + +#endif \ No newline at end of file diff --git a/externals/vcpkg/ports/cgns/hdf5.patch b/externals/vcpkg/ports/cgns/hdf5.patch new file mode 100755 index 000000000..82316913d --- /dev/null +++ b/externals/vcpkg/ports/cgns/hdf5.patch @@ -0,0 +1,61 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 60f9de4..e980ef7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -261,51 +261,12 @@ if (CGNS_ENABLE_HDF5) + cmake_policy(SET CMP0074 NEW) + endif() + +- find_package (HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS ${FIND_HDF_COMPONENTS}) +- message (STATUS "HDF5 C libs:${HDF5_FOUND} static:${HDF5_static_C_FOUND} and shared:${HDF5_shared_C_FOUND}") +- if (HDF5_FOUND) +- if (NOT HDF5_static_C_FOUND AND NOT HDF5_shared_C_FOUND) +- if (CG_HDF5_LINK_TYPE STREQUAL "shared") +- set(CG_HDF5_LINK_TYPE "static") +- set(CG_HDF5_LINK_TYPE_UPPER "STATIC") +- else() +- set(CG_HDF5_LINK_TYPE "shared") +- set(CG_HDF5_LINK_TYPE_UPPER "SHARED") +- endif() +- +- set (FIND_HDF_COMPONENTS C ${CG_HDF5_LINK_TYPE}) +- +- find_package (HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS ${FIND_HDF_COMPONENTS} REQUIRED) +- message (STATUS "HDF5 libs:${HDF5_FOUND} C:${HDF5_C_${CG_HDF5_LINK_TYPE_UPPER}_LIBRARY}") +- endif() +- +- set(LINK_LIBS ${HDF5_C_${CG_HDF5_LINK_TYPE_UPPER}_LIBRARY}) +- else () +- find_package (HDF5) # Legacy find +- +- #Legacy find_package does not set HDF5_TOOLS_DIR, so we set it here +- set(HDF5_TOOLS_DIR ${HDF5_LIBRARY}/../bin) +- +- #Legacy find_package does not set HDF5_BUILD_SHARED_LIBS, so we set it here +- set(GUESS_SHARED "${HDF5_LIBRARY}/libhdf5${CMAKE_SHARED_LIBRARY_SUFFIX}") +- foreach (ITEM ${HDF5_LIBRARIES}) +- if (ITEM MATCHES "(.*)hdf5${CMAKE_SHARED_LIBRARY_SUFFIX}") +- set(GUESS_SHARED "${ITEM}") +- break() +- endif() +- endforeach() +- if (CGNS_BUILD_SHARED AND EXISTS "${GUESS_SHARED}") +- set (HDF5_BUILD_SHARED_LIBS 1) +- set (CG_HDF5_LINK_TYPE "shared") +- set (CG_HDF5_LINK_TYPE_UPPER "SHARED") +- else () +- set (HDF5_BUILD_SHARED_LIBS 0) +- set (CG_HDF5_LINK_TYPE "static") +- set (CG_HDF5_LINK_TYPE_UPPER "STATIC") +- endif () +- set (LINK_LIBS ${HDF5_LIBRARIES}) ++ find_package (HDF5 CONFIG REQUIRED) ++ if (TARGET hdf5::hdf5-shared) ++ set (LINK_LIBS ${LINK_LIBS} hdf5::hdf5-shared) ++ else () ++ set (LINK_LIBS ${LINK_LIBS} hdf5::hdf5-static) + endif () +- set (HDF5_PACKAGE_NAME ${SEARCH_PACKAGE_NAME}) + + if (HDF5_FOUND) + if (NOT DEFINED HDF5_INCLUDE_DIRS) diff --git a/externals/vcpkg/ports/cgns/linux_lfs.patch b/externals/vcpkg/ports/cgns/linux_lfs.patch new file mode 100755 index 000000000..af3d411cf --- /dev/null +++ b/externals/vcpkg/ports/cgns/linux_lfs.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 46446da8a..a3d8cd98f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -116,6 +116,7 @@ if (CGNS_ENABLE_LFS) + else () + check_symbol_exists(open64 "sys/types.h;sys/stat.h;unistd.h" HAVE_OPEN64) + check_symbol_exists(lseek64 "sys/types.h;unistd.h" HAVE_LSEEK64) ++ add_definitions(-D_FILE_OFFSET_BITS=64 -D__LARGEFILE64_SOURCE -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE) + endif () + if (HAVE_OPEN64) + add_compile_definitions(HAVE_OPEN64) diff --git a/externals/vcpkg/ports/cgns/portfile.cmake b/externals/vcpkg/ports/cgns/portfile.cmake new file mode 100755 index 000000000..9181d0090 --- /dev/null +++ b/externals/vcpkg/ports/cgns/portfile.cmake @@ -0,0 +1,83 @@ + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO CGNS/CGNS + REF ec538ac11dbaff510464a831ef094b0d6bf7216c # v4.3.0 + SHA512 3c04829ff99c0f4f1cd705f0807fda0a65f970c7eecd23ec624cf09fb6fa2a566c63fc94d46c1d0754910bbff8f98c3723e4f32ef66c3e7e41930313454fa10b + HEAD_REF develop + PATCHES + hdf5.patch + linux_lfs.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "fortran" CGNS_ENABLE_FORTRAN + "tests" CGNS_ENABLE_TESTS + "hdf5" CGNS_ENABLE_HDF5 + "lfs" CGNS_ENABLE_LFS + "legacy" CGNS_ENABLE_LEGACY +) + +set(CGNS_BUILD_OPTS "") +if(VCPKG_TARGET_ARCHITECTURE MATCHES "64") + list(APPEND CGNS_BUILD_OPTS "-DCGNS_ENABLE_64BIT=ON") +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + list(APPEND CGNS_BUILD_OPTS "-DCGNS_BUILD_SHARED=ON;-DCGNS_USE_SHARED=ON") +else() + list(APPEND CGNS_BUILD_OPTS "-DCGNS_BUILD_SHARED=OFF;-DCGNS_USE_SHARED=OFF") +endif() + +# By default, when possible, vcpkg_cmake_configure uses ninja-build as its build system +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + ${CGNS_BUILD_OPTS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +# Moves all *.cmake files from /debug/lib/cmake/cgns/ to /share/cgns/ +# See /docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md for more details +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/cgns") + +vcpkg_copy_tools( + TOOL_NAMES + cgnscheck + cgnscompress + cgnsconvert + cgnsdiff + cgnslist + cgnsnames + AUTO_CLEAN +) + +if(VCPKG_TARGET_IS_WINDOWS) + set(TOOLS "adf2hdf.bat" "hdf2adf.bat" "cgnsupdate.bat") +elseif(VCPKG_TARGET_IS_LINUX) + set(TOOLS "adf2hdf" "hdf2adf" "cgnsupdate") +endif() + +foreach(TOOL ${TOOLS}) + file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/${TOOL}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${TOOL}") +endforeach() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") +endif() + +if (EXISTS "${CURRENT_PACKAGES_DIR}/debug") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +endif() + +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs" "${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h") +file(INSTALL "${CURRENT_PORT_DIR}/cgnsconfig.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") # the include is all that is needed + +# Handle copyright +configure_file("${SOURCE_PATH}/license.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/cgns/vcpkg.json b/externals/vcpkg/ports/cgns/vcpkg.json new file mode 100755 index 000000000..04a85921f --- /dev/null +++ b/externals/vcpkg/ports/cgns/vcpkg.json @@ -0,0 +1,72 @@ +{ + "name": "cgns", + "version-semver": "4.3.0", + "description": "The CFD General Notation System (CGNS) provides a standard for recording and recovering computer data associated with the numerical solution of fluid dynamics equations.", + "homepage": "http://cgns.org/", + "default-features": [ + "hdf5", + "lfsselector" + ], + "features": { + "fortran": { + "description": "Enable fortran support (not yet implemented)" + }, + "hdf5": { + "description": "Enable hdf5 support", + "dependencies": [ + { + "name": "hdf5", + "default-features": false, + "features": [ + "tools" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] + }, + "legacy": { + "description": "Enable legacy support" + }, + "lfs": { + "description": "Enable LFS support" + }, + "lfsselector": { + "description": "Selector for LFS", + "dependencies": [ + { + "name": "cgns", + "default-features": false, + "features": [ + "lfs" + ], + "platform": "!osx" + } + ] + }, + "mpi": { + "description": "Enable MPI support", + "dependencies": [ + { + "name": "hdf5", + "default-features": false, + "features": [ + "parallel" + ] + } + ] + }, + "tests": { + "description": "Build tests" + }, + "tools": { + "description": "No effects, preserved for upgrade compatibility" + } + } +} diff --git a/externals/vcpkg/ports/chaiscript/portfile.cmake b/externals/vcpkg/ports/chaiscript/portfile.cmake new file mode 100755 index 000000000..6ee7170e5 --- /dev/null +++ b/externals/vcpkg/ports/chaiscript/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ChaiScript/ChaiScript + REF v6.1.0 + SHA512 7728abd8d3e1e8007f4d95c8065ba5a9154583bcd1d493bfd96d608ff91f4c9bb23e538378b77c1cfd6c637d6b4885af94ac0a2a9a34b6bae19581d9f1a831cc + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/chaiscript/vcpkg.json b/externals/vcpkg/ports/chaiscript/vcpkg.json new file mode 100755 index 000000000..e4362e804 --- /dev/null +++ b/externals/vcpkg/ports/chaiscript/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "chaiscript", + "version-string": "6.1.0", + "port-version": 2, + "description": "Embedded Scripting Language Designed for C++", + "homepage": "https://github.com/ChaiScript/ChaiScript" +} diff --git a/externals/vcpkg/ports/chakracore/fix-debug-linux-build.patch b/externals/vcpkg/ports/chakracore/fix-debug-linux-build.patch new file mode 100755 index 000000000..10c1ca5e7 --- /dev/null +++ b/externals/vcpkg/ports/chakracore/fix-debug-linux-build.patch @@ -0,0 +1,13 @@ +diff --git a/lib/Common/Memory/RecyclerObjectGraphDumper.cpp b/lib/Common/Memory/RecyclerObjectGraphDumper.cpp +index 0885df3fb..12bdfb96e 100644 +--- a/lib/Common/Memory/RecyclerObjectGraphDumper.cpp ++++ b/lib/Common/Memory/RecyclerObjectGraphDumper.cpp +@@ -58,7 +58,7 @@ void RecyclerObjectGraphDumper::BeginDumpObject(void * objectAddress) + { + Assert(false); + this->dumpObjectTypeInfo = nullptr; +- this->dumpObjectIsArray = nullptr; ++ this->dumpObjectIsArray = 0; + } + } + #endif diff --git a/externals/vcpkg/ports/chakracore/no-warning-as-error.props b/externals/vcpkg/ports/chakracore/no-warning-as-error.props new file mode 100755 index 000000000..6020ed1e8 --- /dev/null +++ b/externals/vcpkg/ports/chakracore/no-warning-as-error.props @@ -0,0 +1,8 @@ + + + + + false + + + diff --git a/externals/vcpkg/ports/chakracore/portfile.cmake b/externals/vcpkg/ports/chakracore/portfile.cmake new file mode 100755 index 000000000..5cbe8e570 --- /dev/null +++ b/externals/vcpkg/ports/chakracore/portfile.cmake @@ -0,0 +1,146 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Microsoft/ChakraCore + REF 385409ee4b634b860e090606a28acbc99f4d2567 + SHA512 ef47db988c4ddd77fa87f4c5e1ac91d9f6b31b35aa6934d8b2863ee1274776d90a2b85dbad51eef069c96777d3cd7729349b89f23eda8c61b4cb637150bead71 + HEAD_REF master + PATCHES + fix-debug-linux-build.patch +) + +if(WIN32) + find_path(COR_H_PATH cor.h) + if(COR_H_PATH MATCHES "NOTFOUND") + message(FATAL_ERROR "Could not find . Ensure the NETFXSDK is installed.") + endif() + get_filename_component(NETFXSDK_PATH "${COR_H_PATH}/../.." ABSOLUTE) +endif() + +set(BUILDTREE_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) +file(REMOVE_RECURSE ${BUILDTREE_PATH}) +file(COPY ${SOURCE_PATH}/ DESTINATION ${BUILDTREE_PATH}) + +if(WIN32) + set(CHAKRA_RUNTIME_LIB "static_library") # ChakraCore only supports static CRT linkage + vcpkg_build_msbuild( + PROJECT_PATH "${BUILDTREE_PATH}/Build/Chakra.Core.sln" + OPTIONS + "/p:DotNetSdkRoot=${NETFXSDK_PATH}/" + "/p:CustomBeforeMicrosoftCommonTargets=${CMAKE_CURRENT_LIST_DIR}/no-warning-as-error.props" + "/p:RuntimeLib=${CHAKRA_RUNTIME_LIB}" + ) +else() + if(VCPKG_TARGET_ARCHITECTURE MATCHES "x64") + set(CHAKRACORE_TARGET_ARCH amd64) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x86") + set(CHAKRACORE_TARGET_ARCH x86) + endif() + + if (VCPKG_TARGET_IS_LINUX) + message(WARNING "${PORT} requires Clang from the system package manager, this can be installed on Ubuntu systems via sudo apt install clang") + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + list(APPEND configs "debug") + execute_process( + COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "--debug" "-j=${VCPKG_CONCURRENCY}" + WORKING_DIRECTORY "${BUILDTREE_PATH}" + + OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT + ERROR_VARIABLE CHAKRA_BUILD_SH_ERR + RESULT_VARIABLE CHAKRA_BUILD_SH_RES + ECHO_OUTPUT_VARIABLE + ECHO_ERROR_VARIABLE + ) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + list(APPEND configs "release") + execute_process( + COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "-j=${VCPKG_CONCURRENCY}" + WORKING_DIRECTORY "${BUILDTREE_PATH}" + OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT + ERROR_VARIABLE CHAKRA_BUILD_SH_ERR + RESULT_VARIABLE CHAKRA_BUILD_SH_RES + ECHO_OUTPUT_VARIABLE + ECHO_ERROR_VARIABLE + ) + endif() +endif() + +file(INSTALL + "${BUILDTREE_PATH}/lib/Jsrt/ChakraCore.h" + "${BUILDTREE_PATH}/lib/Jsrt/ChakraCommon.h" + "${BUILDTREE_PATH}/lib/Jsrt/ChakraDebug.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" +) +if(WIN32) + file(INSTALL + "${BUILDTREE_PATH}/lib/Jsrt/ChakraCommonWindows.h" + "${BUILDTREE_PATH}/lib/Jsrt/ChakraCoreWindows.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" + ) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(INSTALL + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/ChakraCore.dll" + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/ChakraCore.pdb" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" + ) + file(INSTALL + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/Chakracore.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" + ) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(INSTALL + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ChakraCore.dll" + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ChakraCore.pdb" + DESTINATION "${CURRENT_PACKAGES_DIR}/bin" + ) + file(INSTALL + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/Chakracore.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib" + ) + file(INSTALL + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ch.exe" + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/GCStress.exe" + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/rl.exe" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/chakracore" + ) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/chakracore") + endif() +else() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(out_file libChakraCore.so) + else() + set(out_file lib/libChakraCoreStatic.a) + endif() + + set(destination_dir_debug "${CURRENT_PACKAGES_DIR}/debug/bin") + set(destination_dir_release "${CURRENT_PACKAGES_DIR}/bin") + set(out_dir_debug "${BUILDTREE_PATH}/out/Debug") + set(out_dir_release "${BUILDTREE_PATH}/out/Release") + foreach(config ${configs}) + file(INSTALL + ${out_dir_${config}}/${out_file} + DESTINATION ${destination_dir_${config}} + ) + endforeach() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(INSTALL + "${out_dir_release}/ch" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/chakracore" + ) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/chakracore") + endif() +endif() + +vcpkg_copy_pdbs() + +file(INSTALL + "${SOURCE_PATH}/LICENSE.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/chakracore" + RENAME copyright +) diff --git a/externals/vcpkg/ports/chakracore/vcpkg.json b/externals/vcpkg/ports/chakracore/vcpkg.json new file mode 100755 index 000000000..df0c0ffee --- /dev/null +++ b/externals/vcpkg/ports/chakracore/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "chakracore", + "version-date": "2021-04-22", + "port-version": 2, + "description": "Core part of the Chakra Javascript engine", + "homepage": "https://github.com/Microsoft/ChakraCore", + "supports": "!osx & !uwp & (linux | (!static & !staticcrt))" +} diff --git a/externals/vcpkg/ports/charls/portfile.cmake b/externals/vcpkg/ports/charls/portfile.cmake new file mode 100755 index 000000000..6b32b5683 --- /dev/null +++ b/externals/vcpkg/ports/charls/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO team-charls/charls + REF 662d4f2a0238357ccc4d89cd14b1fa67d2597ff1 #v2.3.4 + SHA512 f022d025ae1d5ff624982ceb61ee88c5a42ee958afcff39fbc3e698030092b6667c3a685b66b7fd16ab7c3d3af1d44b773f761e2eefd7f026432b80176b6894b + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCHARLS_BUILD_TESTS=OFF + -DCHARLS_BUILD_SAMPLES=OFF + -DCHARLS_BUILD_FUZZ_TEST=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/charls) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/charls/vcpkg.json b/externals/vcpkg/ports/charls/vcpkg.json new file mode 100755 index 000000000..805b20f15 --- /dev/null +++ b/externals/vcpkg/ports/charls/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "charls", + "version": "2.3.4", + "description": "CharLS, a C++ JPEG-LS library implementation.", + "homepage": "https://github.com/team-charls/charls", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/chartdir/Config.cmake.in b/externals/vcpkg/ports/chartdir/Config.cmake.in new file mode 100755 index 000000000..d943c4a81 --- /dev/null +++ b/externals/vcpkg/ports/chartdir/Config.cmake.in @@ -0,0 +1,21 @@ + +get_filename_component(_chartdir_root "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_chartdir_root "${_chartdir_root}" PATH) +get_filename_component(_chartdir_root "${_chartdir_root}" PATH) + +set(_chartdir_lib "${_chartdir_root}/lib/@CHARTDIR_LIB@") +if (EXISTS "${_chartdir_lib}") + + add_library(chartdir UNKNOWN IMPORTED) + set_target_properties(chartdir PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_chartdir_root}/include") + set_target_properties(chartdir PROPERTIES IMPORTED_LOCATION "${_chartdir_lib}") + set_property(TARGET chartdir APPEND PROPERTY IMPORTED_CONFIGURATIONS) + +else() + + set(chartdir_FOUND FALSE) + +endif() +unset(_chartdir_lib) + +unset(_chartdir_root) diff --git a/externals/vcpkg/ports/chartdir/chartdir.h b/externals/vcpkg/ports/chartdir/chartdir.h new file mode 100755 index 000000000..2fa308a07 --- /dev/null +++ b/externals/vcpkg/ports/chartdir/chartdir.h @@ -0,0 +1,6 @@ +#ifndef __CHARTDIR_H__ +#define __CHARTDIR_H__ + +#include + +#endif // __CHARTDIR_H__ diff --git a/externals/vcpkg/ports/chartdir/portfile.cmake b/externals/vcpkg/ports/chartdir/portfile.cmake new file mode 100755 index 000000000..f4ad36e81 --- /dev/null +++ b/externals/vcpkg/ports/chartdir/portfile.cmake @@ -0,0 +1,93 @@ +# ChartDirector's DLL interface only contains primitive types, so it is CRT agnostic. +if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + message(STATUS "Note: ${PORT} only supports dynamic library linkage. Building dynamic library.") + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif() + +if(VCPKG_TARGET_IS_WINDOWS) + + vcpkg_download_distfile(ARCHIVE_FILE + URLS "https://www.advsofteng.com/vcpkg/chartdir_cpp_win_7.0.0.zip" + FILENAME "chartdir_cpp_win-7.0.0.zip" + SHA512 e5b5d387cff693a7f5ee98c2d2df75f421129b006e4324ae30ace0cbaac58867f048868ddfacdb3224c7165c8f27219c4273f3c778be3330d39ef95260d4186b + ) + + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE_FILE}" + REF 7.0.0 + ) + + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(LIBDIR "${SOURCE_PATH}/lib64") + else() + set(LIBDIR "${SOURCE_PATH}/lib32") + endif() + + file(COPY "${LIBDIR}/chartdir70.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(COPY "${LIBDIR}/chartdir70.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(COPY "${LIBDIR}/chartdir70.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${LIBDIR}/chartdir70.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + + set(CHARTDIR_LIB "chartdir70.lib") + +elseif(VCPKG_TARGET_IS_OSX) + + vcpkg_download_distfile(ARCHIVE_FILE + URLS "https://www.advsofteng.com/vcpkg/chartdir_cpp_mac_7.0.0.tar.gz" + FILENAME "chartdir_cpp_mac-7.0.0.tar.gz" + SHA512 fd46ac45e8906854ededb9e30ee3ba8bdd05588e6ca7c9fdf140254ee637d32565417d799da33b23228f1ade8111fcae037eed4cf978a11d35e70ab8861214a2 + ) + + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE_FILE}" + REF 7.0.0 + ) + + file(COPY "${SOURCE_PATH}/lib/libchartdir.7.dylib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(COPY "${SOURCE_PATH}/lib/libchartdir.7.dylib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + + set(CHARTDIR_LIB "libchartdir.7.dylib") + +elseif(VCPKG_TARGET_IS_LINUX) + + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + + vcpkg_download_distfile(ARCHIVE_FILE + URLS "https://www.advsofteng.com/vcpkg/chartdir_cpp_linux_64_7.0.0.tar.gz" + FILENAME "chartdir_cpp_linux_64-7.0.0.tar.gz" + SHA512 ea2e05f28dd9647fed49feaf130d8034065067463965f144b3fae4eae482579b1ecf528dc86d1b3602887d5ca0c3b1569404489b0f4cb2300b798fed940cd467 + ) + + else() + + vcpkg_download_distfile(ARCHIVE_FILE + URLS "https://www.advsofteng.com/vcpkg/chartdir_cpp_linux_7.0.0.tar.gz" + FILENAME "chartdir_cpp_linux-7.0.0.tar.gz" + SHA512 54720fb431fa0fb34be3a187ec3886b0f2a7307ea52a0415fab8513117a157f64a8c0e0b01304aac1d313e4557768242e6b12002509fde2e5303d930c78c0e03 + ) + + endif() + + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE_FILE}" + REF 7.0.0 + ) + + file(COPY "${SOURCE_PATH}/lib/libchartdir.so.7.0.0" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(COPY "${SOURCE_PATH}/lib/libchartdir.so.7.0.0" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + + set(CHARTDIR_LIB "libchartdir.so.7.0.0") + + file(COPY "${SOURCE_PATH}/lib/fonts" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +endif() + +file(GLOB HEADERS "${SOURCE_PATH}/include/*.h") +file(COPY ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/chartdir.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(COPY "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +configure_file("${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/chartdir-config.cmake" @ONLY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/chartdir/usage b/externals/vcpkg/ports/chartdir/usage new file mode 100755 index 000000000..a270b780e --- /dev/null +++ b/externals/vcpkg/ports/chartdir/usage @@ -0,0 +1,4 @@ +The package chartdir provides CMake targets: + + find_package(chartdir CONFIG REQUIRED) + target_link_libraries(main PRIVATE chartdir) diff --git a/externals/vcpkg/ports/chartdir/vcpkg.json b/externals/vcpkg/ports/chartdir/vcpkg.json new file mode 100755 index 000000000..9e8fcacfa --- /dev/null +++ b/externals/vcpkg/ports/chartdir/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "chartdir", + "version": "7.0.0", + "port-version": 4, + "description": "ChartDirector is a powerful chart component for creating professional looking charts for web and windows applications.", + "homepage": "https://www.advsofteng.com/", + "supports": "!arm & !uwp" +} diff --git a/externals/vcpkg/ports/check/fix-lib-path.patch b/externals/vcpkg/ports/check/fix-lib-path.patch new file mode 100755 index 000000000..d3086e74f --- /dev/null +++ b/externals/vcpkg/ports/check/fix-lib-path.patch @@ -0,0 +1,43 @@ +diff --git a/doc/example/src/CMakeLists.txt b/doc/example/src/CMakeLists.txt +index b5e211e..2a92a1a 100644 +--- a/doc/example/src/CMakeLists.txt ++++ b/doc/example/src/CMakeLists.txt +@@ -18,7 +18,7 @@ target_link_libraries(main money) + + install(TARGETS money + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib) ++ LIBRARY DESTINATION lib/manual-link ++ ARCHIVE DESTINATION lib/manual-link) + + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/money.h DESTINATION include) +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 38cbc53..d8a4272 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -75,5 +75,11 @@ set(HEADERS libcompat.h) + + add_library(compat STATIC ${SOURCES} ${HEADERS}) + ++install(TARGETS compat ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib/manual-link ++ ARCHIVE DESTINATION lib/manual-link ++) ++ + # vim: shiftwidth=2:softtabstop=2:tabstop=2:expandtab:autoindent + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 4a02dbe..3bf2fa6 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -191,7 +191,7 @@ if(NOT THIS_IS_SUBPROJECT) + install(TARGETS check checkShared + EXPORT check-targets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/manual-link + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) diff --git a/externals/vcpkg/ports/check/portfile.cmake b/externals/vcpkg/ports/check/portfile.cmake new file mode 100755 index 000000000..1d0920ddb --- /dev/null +++ b/externals/vcpkg/ports/check/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libcheck/check + REF 11970a7e112dfe243a2e68773f014687df2900e8 # 0.15.2 + SHA512 210c9617fa1c1ce16bef983b0e6cb587b1774c3f7ce27a53ca7799642dc7a14be8de567d69dc0e57845684c6f7991d772c73654f63c8755afda3b37a35c7156e + HEAD_REF master + PATCHES fix-lib-path.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCHECK_ENABLE_TESTS=OFF + -DBUILD_TESTING=OFF + -DCHECK_ENABLE_GCOV=OFF + -DENABLE_MEMORY_LEAKING_TESTS=OFF + -DCHECK_ENABLE_TIMEOUT_TESTS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/check) + +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# cleanup +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/check/vcpkg.json b/externals/vcpkg/ports/check/vcpkg.json new file mode 100755 index 000000000..94886beda --- /dev/null +++ b/externals/vcpkg/ports/check/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "check", + "version": "0.15.2", + "port-version": 4, + "description": "A unit testing framework for C", + "homepage": "https://github.com/libcheck/check", + "license": "LGPL-2.1-only", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/chipmunk/portfile.cmake b/externals/vcpkg/ports/chipmunk/portfile.cmake new file mode 100755 index 000000000..f0f72cd6c --- /dev/null +++ b/externals/vcpkg/ports/chipmunk/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO slembcke/Chipmunk2D + REF 87340c216bf97554dc552371bbdecf283f7c540e + SHA512 9094017755e9c140aa5bf8a1b5502077ae4fb2b0a3e12f1114e86d8591a6188f89822ecc578a2b5e95f61c555018f1b3273fe50e833fe2daf30e94b180a3d07c + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KEYSTONE_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" KEYSTONE_BUILD_SHARED) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_DEMOS=OFF + -DBUILD_SHARED=${KEYSTONE_BUILD_SHARED} + -DBUILD_STATIC=${KEYSTONE_BUILD_STATIC} + -DINSTALL_STATIC=${KEYSTONE_BUILD_STATIC} +) + +vcpkg_install_cmake() + +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +endif() + +file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/lib/*.dll) +if(DLLS) + file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE ${DLLS}) +endif() + +file(INSTALL + ${SOURCE_PATH}/include/chipmunk + DESTINATION ${CURRENT_PACKAGES_DIR}/include +) + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/chipmunk/vcpkg.json b/externals/vcpkg/ports/chipmunk/vcpkg.json new file mode 100755 index 000000000..07bda6fcb --- /dev/null +++ b/externals/vcpkg/ports/chipmunk/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "chipmunk", + "version-string": "7.0.3", + "port-version": 2, + "description": "A fast and lightweight 2D game physics library.", + "homepage": "https://github.com/slembcke/Chipmunk2D" +} diff --git a/externals/vcpkg/ports/chmlib/CMakeLists.txt b/externals/vcpkg/ports/chmlib/CMakeLists.txt new file mode 100755 index 000000000..49ce1f129 --- /dev/null +++ b/externals/vcpkg/ports/chmlib/CMakeLists.txt @@ -0,0 +1,23 @@ +cmake_minimum_required(VERSION 3.5) +project(chm C) + +add_library(chm src/lzx.c src/chm_lib.c) + +if(BUILD_TOOLS) + link_libraries(chm) + add_executable(enum_chmLib src/enum_chmLib.c) + add_executable(enumdir_chmLib src/enumdir_chmLib.c) + add_executable(extract_chmLib src/extract_chmLib.c) + + install(TARGETS enum_chmLib extract_chmLib enumdir_chmLib + RUNTIME DESTINATION tools/chmlib + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + ) +endif() + +install(TARGETS chm + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) diff --git a/externals/vcpkg/ports/chmlib/portfile.cmake b/externals/vcpkg/ports/chmlib/portfile.cmake new file mode 100755 index 000000000..32ac77243 --- /dev/null +++ b/externals/vcpkg/ports/chmlib/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +set(CHMLIB_VERSION chmlib-0.40) +set(CHMLIB_FILENAME ${CHMLIB_VERSION}.zip) +set(CHMLIB_URL http://www.jedrea.com/chmlib/${CHMLIB_FILENAME}) + +vcpkg_download_distfile( + ARCHIVE + URLS ${CHMLIB_URL} + FILENAME ${CHMLIB_FILENAME} + SHA512 ad3b0d49fcf99e724c0c38b9c842bae9508d0e4ad47122b0f489c113160f5344223d311abb79f25cbb0b662bb00e2925d338d60dd20a0c309bda2822cda4cd24 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_RELEASE -DBUILD_TOOLS=ON + OPTIONS_DEBUG -DBUILD_TOOLS=OFF +) + +vcpkg_install_cmake() + +file(INSTALL ${SOURCE_PATH}/src/chm_lib.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/chmlib) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/chmlib/COPYING ${CURRENT_PACKAGES_DIR}/share/chmlib/copyright) diff --git a/externals/vcpkg/ports/chmlib/vcpkg.json b/externals/vcpkg/ports/chmlib/vcpkg.json new file mode 100755 index 000000000..f3fcf3d84 --- /dev/null +++ b/externals/vcpkg/ports/chmlib/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "chmlib", + "version-string": "0.40", + "port-version": 5, + "description": "CHMLIB is a library for dealing with Microsoft ITSS/CHM format files. Right now, it is a very simple library, but sufficient for dealing with all of the .chm files I've come across. Due to the fairly well-designed indexing built into this particular file format, even a small library is able to gain reasonably good performance indexing into ITSS archives.", + "homepage": "https://www.jedrea.com/chmlib/" +} diff --git a/externals/vcpkg/ports/chromaprint/fix_lrintf_detection.patch b/externals/vcpkg/ports/chromaprint/fix_lrintf_detection.patch new file mode 100755 index 000000000..27248f0c8 --- /dev/null +++ b/externals/vcpkg/ports/chromaprint/fix_lrintf_detection.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3a0eecb..4fa5e8d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,6 +17,7 @@ set_property(CACHE FFT_LIB PROPERTY STRINGS avfft fftw3 fftw3f kissfft vdsp) + + include(CMakePushCheckState) + include(CheckFunctionExists) ++include(CheckSymbolExists) + include(CheckCXXCompilerFlag) + + find_package(Threads) +@@ -37,8 +38,8 @@ endif() + + cmake_push_check_state(RESET) + set(CMAKE_REQUIRED_LIBRARIES -lm) +-check_function_exists(lrintf HAVE_LRINTF) +-check_function_exists(round HAVE_ROUND) ++check_symbol_exists(lrintf math.h HAVE_LRINTF) ++check_symbol_exists(round math.h HAVE_ROUND) + cmake_pop_check_state() + + add_definitions( diff --git a/externals/vcpkg/ports/chromaprint/portfile.cmake b/externals/vcpkg/ports/chromaprint/portfile.cmake new file mode 100755 index 000000000..286edaeb3 --- /dev/null +++ b/externals/vcpkg/ports/chromaprint/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO acoustid/chromaprint + REF v1.5.0 + SHA512 333114949928abdf5d4b11aba1db6ec487eebe526324c68d903b3fa80a3af87a28d942af765a2f873e63a1bf222b658b6438cd10cde4446f61b26ea91f537469 + PATCHES + fix_lrintf_detection.patch # submitted upstream as https://github.com/acoustid/chromaprint/pull/85 +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) +vcpkg_install_cmake() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/chromaprint/vcpkg.json b/externals/vcpkg/ports/chromaprint/vcpkg.json new file mode 100755 index 000000000..271532380 --- /dev/null +++ b/externals/vcpkg/ports/chromaprint/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "chromaprint", + "version": "1.5.0", + "port-version": 1, + "description": "C library for generating audio fingerprints used by AcoustID", + "homepage": "https://github.com/acoustid/chromaprint", + "license": "LGPL-2.1-or-later", + "dependencies": [ + "ffmpeg" + ] +} diff --git a/externals/vcpkg/ports/chromium-base/chromium-baseConfig.cmake.in b/externals/vcpkg/ports/chromium-base/chromium-baseConfig.cmake.in new file mode 100755 index 000000000..95ce316c6 --- /dev/null +++ b/externals/vcpkg/ports/chromium-base/chromium-baseConfig.cmake.in @@ -0,0 +1,81 @@ +if(TARGET chromium-base) + return() +endif() + +set(DEFINITIONS_DBG @DEFINITIONS_DBG@) +set(DEFINITIONS_REL @DEFINITIONS_DBG@) + +# Compute the installation prefix relative to this file. +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +if(_IMPORT_PREFIX STREQUAL "/") + set(_IMPORT_PREFIX "") +endif() + +add_library(chromium-base INTERFACE IMPORTED GLOBAL) +add_library(chromium-base::chromium-base ALIAS chromium-base) + +set(LIBRARIES_ chromium_base chromium_base_static dynamic_annotations double_conversion) + +if(WIN32) + list(APPEND LIBRARIES_ + cfgmgr32 + powrprof + propsys + setupapi + userenv + wbemuuid + winmm + advapi32 + comdlg32 + dbghelp + dnsapi + gdi32 + msimg32 + odbc32 + odbccp32 + oleaut32 + shell32 + shlwapi + user32 + usp10 + uuid + version + wininet + winspool + ws2_32 + delayimp + kernel32 + ole32) +elseif(APPLE) + list(APPEND LIBRARIES_ + ApplicationServices + AppKit + CoreFoundation + IOKit + OpenDirectory + Security + bsm + pmenergy + pmsample) +endif() + +foreach(LIB_NAME ${LIBRARIES_}) + find_library(_LIB NAMES ${LIB_NAME} ${LIB_NAME}.dll) + target_link_libraries(chromium-base INTERFACE ${_LIB}) + unset(_LIB CACHE) +endforeach() + +if(UNIX AND NOT APPLE) + target_link_libraries(chromium-base INTERFACE -ldl -latomic -lpthread) +endif() + +target_include_directories(chromium-base + INTERFACE ${_IMPORT_PREFIX}/include/chromium-base) + +target_compile_definitions(chromium-base INTERFACE + $<$:${DEFINITIONS_DBG}> + $<$:${DEFINITIONS_REL}>) + +target_compile_features(chromium-base INTERFACE cxx_std_14) diff --git a/externals/vcpkg/ports/chromium-base/portfile.cmake b/externals/vcpkg/ports/chromium-base/portfile.cmake new file mode 100755 index 000000000..f7fd3a013 --- /dev/null +++ b/externals/vcpkg/ports/chromium-base/portfile.cmake @@ -0,0 +1,152 @@ +# Patches may be provided at the end +function(checkout_in_path PATH URL REF) + if(EXISTS "${PATH}") + file(GLOB FILES "${PATH}") + list(LENGTH FILES COUNT) + if(COUNT GREATER 0) + return() + endif() + file(REMOVE_RECURSE "${PATH}") + endif() + + vcpkg_from_git( + OUT_SOURCE_PATH DEP_SOURCE_PATH + URL "${URL}" + REF "${REF}" + PATCHES "${ARGN}" + ) + file(RENAME "${DEP_SOURCE_PATH}" "${PATH}") + file(REMOVE_RECURSE "${DEP_SOURCE_PATH}") +endfunction() + +# Commits are based on https://chromium.googlesource.com/chromium/src/+/refs/tags/86.0.4199.1 +set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/25ce732") +file(MAKE_DIRECTORY "${SOURCE_PATH}/third_party") + +set(CHROMIUM_GIT "https://chromium.googlesource.com/chromium/src") +checkout_in_path( + "${SOURCE_PATH}/base" + "${CHROMIUM_GIT}/base" + "25ce73258703a5ac018da0e203fb3d4a98c2136e" + res/0001-base.patch) +checkout_in_path( + "${SOURCE_PATH}/build" + "${CHROMIUM_GIT}/build" + "312532ee66abdacbe58afb5df7ddf05e3a6399f9" + res/0002-build.patch) +checkout_in_path( + "${SOURCE_PATH}/third_party/apple_apsl" + "${CHROMIUM_GIT}/third_party/apple_apsl" + "4cc25bbf65194f6726f7f10da0a885818e35d53e") +checkout_in_path( + "${SOURCE_PATH}/third_party/ced" + "${CHROMIUM_GIT}/third_party/ced" + "4cd87a44674edd9fe1f01c4cb5f1b73907ce4236") +checkout_in_path( + "${SOURCE_PATH}/third_party/modp_b64" + "${CHROMIUM_GIT}/third_party/modp_b64" + "509f005fa65e652dc4a6f636da6fa1002b6dce16") + +set(RES "${CMAKE_CURRENT_LIST_DIR}/res") +file(COPY "${RES}/.gn" DESTINATION "${SOURCE_PATH}") +file(COPY "${RES}/BUILD.gn" DESTINATION "${SOURCE_PATH}") +file(COPY "${RES}/build_overrides" DESTINATION "${SOURCE_PATH}") +file(COPY "${RES}/testing" DESTINATION "${SOURCE_PATH}") +file(COPY "${RES}/tools" DESTINATION "${SOURCE_PATH}") +file(COPY "${RES}/gclient_args.gni" DESTINATION "${SOURCE_PATH}/build/config") +file(COPY "${RES}/LASTCHANGE.committime" DESTINATION "${SOURCE_PATH}/build/util") +file(COPY "${RES}/icu" DESTINATION "${SOURCE_PATH}/third_party") +file(COPY "${RES}/libxml" DESTINATION "${SOURCE_PATH}/third_party") +file(COPY "${RES}/protobuf" DESTINATION "${SOURCE_PATH}/third_party") +file(COPY "${RES}/fontconfig" DESTINATION "${SOURCE_PATH}/third_party") +file(COPY "${RES}/test_fonts" DESTINATION "${SOURCE_PATH}/third_party") + +set(OPTIONS "\ + use_custom_libcxx=false \ + clang_use_chrome_plugins=false \ + forbid_non_component_debug_builds=false \ + treat_warnings_as_errors=false") +set(DEFINITIONS "") + +if(WIN32) + # Windows 10 SDK >= (10.0.19041.0) is required + # https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk + SET(VCPKG_POLICY_SKIP_ARCHITECTURE_CHECK enabled) + set(ENV{DEPOT_TOOLS_WIN_TOOLCHAIN} 0) + set(OPTIONS "${OPTIONS} use_lld=false") +endif() + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL Linux) + set(OPTIONS "${OPTIONS} use_allocator=\"none\" use_sysroot=false use_glib=false") +endif() + +# Find the directory that contains "bin/clang" +# Note: Only clang-cl is supported on Windows, see https://crbug.com/988071 +vcpkg_find_acquire_program(CLANG) +if(CLANG MATCHES "-NOTFOUND") + message(FATAL_ERROR "Clang is required.") +endif() +get_filename_component(CLANG "${CLANG}" DIRECTORY) +get_filename_component(CLANG "${CLANG}" DIRECTORY) +if((WIN32 AND NOT EXISTS "${CLANG}/bin/clang-cl.exe") OR + (APPLE AND NOT EXISTS "${CLANG}/bin/clang")) + message(FATAL_ERROR "Clang needs to be inside a bin directory.") +endif() +set(OPTIONS "${OPTIONS} clang_base_path=\"${CLANG}\"") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(OPTIONS "${OPTIONS} is_component_build=true") + list(APPEND DEFINITIONS COMPONENT_BUILD) +else() + set(OPTIONS "${OPTIONS} is_component_build=false") +endif() + +if(APPLE) + set(OPTIONS "${OPTIONS} enable_dsyms=true") +endif() + +set(OPTIONS_DBG "${OPTIONS} is_debug=true symbol_level=2") +set(OPTIONS_REL "${OPTIONS} is_debug=false symbol_level=0") +set(DEFINITIONS_DBG ${DEFINITIONS}) +set(DEFINITIONS_REL ${DEFINITIONS}) + +vcpkg_configure_gn( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG "${OPTIONS_DBG}" + OPTIONS_RELEASE "${OPTIONS_REL}" +) + +# Prevent a ninja re-config loop +set(NINJA_REBUILD "build build.ninja: gn\n generator = 1\n depfile = build.ninja.d") +vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/build.ninja" "${NINJA_REBUILD}" "") +vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/build.ninja" "${NINJA_REBUILD}" "") + +set(TARGETS + base base:base_static + base/third_party/dynamic_annotations + base/third_party/double_conversion) + +if(WIN32) + list(APPEND TARGETS base/win:pe_image) +endif() + +vcpkg_install_gn( + SOURCE_PATH "${SOURCE_PATH}" + TARGETS ${TARGETS} +) + +# Install includes +set(PACKAGES_INCLUDE_DIR "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(GLOB_RECURSE INCLUDE_FILES LIST_DIRECTORIES false RELATIVE "${SOURCE_PATH}" "${SOURCE_PATH}/*.h") +foreach(file_ ${INCLUDE_FILES}) + configure_file("${SOURCE_PATH}/${file_}" "${PACKAGES_INCLUDE_DIR}/${file_}" COPYONLY) +endforeach() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/chromium-baseConfig.cmake.in" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/chromium-baseConfig.cmake" @ONLY) + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/third_party/ced/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) diff --git a/externals/vcpkg/ports/chromium-base/res/.gn b/externals/vcpkg/ports/chromium-base/res/.gn new file mode 100755 index 000000000..4fcb7c405 --- /dev/null +++ b/externals/vcpkg/ports/chromium-base/res/.gn @@ -0,0 +1 @@ +buildconfig = "//build/config/BUILDCONFIG.gn" \ No newline at end of file diff --git a/externals/vcpkg/ports/chromium-base/res/0001-base.patch b/externals/vcpkg/ports/chromium-base/res/0001-base.patch new file mode 100755 index 000000000..ca8c05975 --- /dev/null +++ b/externals/vcpkg/ports/chromium-base/res/0001-base.patch @@ -0,0 +1,101 @@ +diff --git a/BUILD.gn b/BUILD.gn +index 7b7cd51..2961688 100644 +--- a/BUILD.gn ++++ b/BUILD.gn +@@ -155,6 +155,7 @@ if (is_android) { + # test code (test support and anything in the test directory) which should use + # source_set as is recommended for GN targets). + jumbo_component("base") { ++ output_name = "chromium_base" + if (is_nacl || is_ios) { + # Link errors related to malloc functions if libbase for nacl is + # compiled with jumbo: https://crbug.com/775959. +@@ -162,6 +163,11 @@ jumbo_component("base") { + never_build_jumbo = true + } + ++ if (!is_component_build) { ++ complete_static_lib = true ++ configs -= [ "//build/config/compiler:thin_archive" ] ++ } ++ + sources = [ + "allocator/allocator_check.cc", + "allocator/allocator_check.h", +@@ -1638,7 +1644,7 @@ jumbo_component("base") { + "hash/md5_constexpr_internal.h", + "hash/sha1.h", + ] +- if (is_nacl) { ++ if (true) { + sources += [ + "hash/md5_nacl.cc", + "hash/md5_nacl.h", +@@ -2298,6 +2304,7 @@ buildflag_header("tracing_buildflags") { + # library. Note that this library cannot depend on base because base depends on + # base_static. + static_library("base_static") { ++ output_name = "chromium_base_static" + sources = [ + "base_switches.cc", + "base_switches.h", +@@ -2325,7 +2332,7 @@ static_library("base_static") { + } + + component("i18n") { +- output_name = "base_i18n" ++ output_name = "chromium_base_i18n" + sources = [ + "i18n/base_i18n_export.h", + "i18n/base_i18n_switches.cc", +diff --git a/gtest_prod_util.h b/gtest_prod_util.h +index 2ca267e..0a0b6df 100644 +--- a/gtest_prod_util.h ++++ b/gtest_prod_util.h +@@ -5,7 +5,8 @@ + #ifndef BASE_GTEST_PROD_UTIL_H_ + #define BASE_GTEST_PROD_UTIL_H_ + +-#include "testing/gtest/include/gtest/gtest_prod.h" // nogncheck ++#define FRIEND_TEST(test_case_name, test_name)\ ++friend class test_case_name##_##test_name##_Test + + // This is a wrapper for gtest's FRIEND_TEST macro that friends + // test with all possible prefixes. This is very helpful when changing the test +diff --git a/hash/md5.h b/hash/md5.h +index 8a49f08..24acdab 100644 +--- a/hash/md5.h ++++ b/hash/md5.h +@@ -11,7 +11,7 @@ + #include "base/strings/string_piece.h" + #include "build/build_config.h" + +-#if defined(OS_NACL) ++#if true + #include "base/hash/md5_nacl.h" + #else + #include "base/hash/md5_boringssl.h" +diff --git a/hash/md5_nacl.cc b/hash/md5_nacl.cc +index 827bbbd..4b22c59 100644 +--- a/hash/md5_nacl.cc ++++ b/hash/md5_nacl.cc +@@ -22,6 +22,7 @@ + */ + + #include ++#include + + #include "base/hash/md5.h" + +diff --git a/profiler/stack_copier_signal.cc b/profiler/stack_copier_signal.cc +index 5a7d8b9..f959f2f 100644 +--- a/profiler/stack_copier_signal.cc ++++ b/profiler/stack_copier_signal.cc +@@ -6,6 +6,7 @@ + + #include + #include ++#include + #include + #include + diff --git a/externals/vcpkg/ports/chromium-base/res/0002-build.patch b/externals/vcpkg/ports/chromium-base/res/0002-build.patch new file mode 100755 index 000000000..94568d169 --- /dev/null +++ b/externals/vcpkg/ports/chromium-base/res/0002-build.patch @@ -0,0 +1,144 @@ +diff --git a/config/BUILDCONFIG.gn b/config/BUILDCONFIG.gn +index 4cc6bfc..9ea83a9 100644 +--- a/config/BUILDCONFIG.gn ++++ b/config/BUILDCONFIG.gn +@@ -657,6 +657,7 @@ template("component") { + # See http://crbug.com/594610 + forward_variables_from(invoker, [ "visibility" ]) + forward_variables_from(invoker, "*", [ "visibility" ]) ++ not_needed("*") + } + } + +diff --git a/config/clang/BUILD.gn b/config/clang/BUILD.gn +index 960726e..87886dc 100644 +--- a/config/clang/BUILD.gn ++++ b/config/clang/BUILD.gn +@@ -38,5 +38,7 @@ config("extra_warnings") { + "-Wstring-conversion", + + "-Wtautological-overlap-compare", ++ "-Wno-unknown-warning-option", ++ "-Wno-unknown-pragmas" + ] + } +diff --git a/config/mac/sdk_info.py b/config/mac/sdk_info.py +index 1ad11d3..99b21f9 100644 +--- a/config/mac/sdk_info.py ++++ b/config/mac/sdk_info.py +@@ -61,10 +61,15 @@ def FillXcodeVersion(settings, developer_dir): + settings['xcode_build'] = version_plist['ProductBuildVersion'] + return + +- lines = subprocess.check_output(['xcodebuild', '-version']).splitlines() +- settings['xcode_version'] = FormatVersion(lines[0].split()[-1]) +- settings['xcode_version_int'] = int(settings['xcode_version'], 10) +- settings['xcode_build'] = lines[-1].split()[-1] ++ try: ++ lines = subprocess.check_output(['xcodebuild', '-version']).splitlines() ++ settings['xcode_version'] = FormatVersion(lines[0].split()[-1]) ++ settings['xcode_version_int'] = int(settings['xcode_version'], 10) ++ settings['xcode_build'] = lines[-1].split()[-1] ++ except: ++ settings['xcode_version'] = "" ++ settings['xcode_version_int'] = 0 ++ settings['xcode_build'] = "" + + + def FillMachineOSBuild(settings): +diff --git a/mac/find_sdk.py b/mac/find_sdk.py +index 58362bf..a6069b6 100755 +--- a/mac/find_sdk.py ++++ b/mac/find_sdk.py +@@ -68,6 +68,8 @@ def main(): + dev_dir = out.rstrip() + sdk_dir = os.path.join( + dev_dir, 'Platforms/MacOSX.platform/Developer/SDKs') ++ if not os.path.isdir(sdk_dir): ++ sdk_dir = os.path.join(dev_dir, 'SDKs') + + if not os.path.isdir(sdk_dir): + raise SdkError('Install Xcode, launch it, accept the license ' + +@@ -87,7 +89,10 @@ def main(): + + if options.print_bin_path: + bin_path = 'Toolchains/XcodeDefault.xctoolchain/usr/bin/' +- print(os.path.join(dev_dir, bin_path)) ++ if os.path.isdir(os.path.join(dev_dir, bin_path)): ++ print(os.path.join(dev_dir, bin_path)) ++ else: ++ print(os.path.join(dev_dir, 'usr/bin/')) + + return best_sdk + +diff --git a/toolchain/mac/BUILD.gn b/toolchain/mac/BUILD.gn +index 8fdada0..8d5e6b7 100644 +--- a/toolchain/mac/BUILD.gn ++++ b/toolchain/mac/BUILD.gn +@@ -184,9 +184,9 @@ template("mac_toolchain") { + # If dSYMs are enabled, this flag will be added to the link tools. + if (_enable_dsyms) { + dsym_switch = " -Wcrl,dsym,{{root_out_dir}} " +- dsym_switch += "-Wcrl,dsymutilpath," + +- rebase_path("//tools/clang/dsymutil/bin/dsymutil", +- root_build_dir) + " " ++ # dsym_switch += "-Wcrl,dsymutilpath," + ++ # rebase_path("//tools/clang/dsymutil/bin/dsymutil", ++ # root_build_dir) + " " + + dsym_output_dir = + "{{root_out_dir}}/{{target_output_name}}{{output_extension}}.dSYM" +diff --git a/toolchain/win/BUILD.gn b/toolchain/win/BUILD.gn +index be08930..04fb374 100644 +--- a/toolchain/win/BUILD.gn ++++ b/toolchain/win/BUILD.gn +@@ -98,7 +98,7 @@ template("msvc_toolchain") { + } else { + lld_link = "lld-link" + } +- prefix = rebase_path("$clang_base_path/bin", root_build_dir) ++ prefix = "$clang_base_path/bin" + + # lld-link includes a replacement for lib.exe that can produce thin + # archives and understands bitcode (for lto builds). +@@ -190,7 +190,7 @@ template("msvc_toolchain") { + # amount of data to parse and store in .ninja_deps. We do this on non-Windows too, + # and already make sure rebuilds after win sdk / libc++ / clang header updates happen via + # changing commandline flags. +- show_includes = "/showIncludes:user" ++ show_includes = "" + } else { + show_includes = "/showIncludes" + } +@@ -235,7 +235,7 @@ template("msvc_toolchain") { + + if (toolchain_args.current_cpu == "arm64") { + if (is_clang) { +- prefix = rebase_path("$clang_base_path/bin", root_build_dir) ++ prefix = "$clang_base_path/bin" + ml = "${clang_prefix}${prefix}/${clang_cl} --target=arm64-windows" + if (host_os == "win") { + # Flip the slashes so that copy/paste of the command works. +@@ -444,11 +444,9 @@ template("win_toolchains") { + + msvc_toolchain("win_clang_" + target_name) { + environment = "environment." + toolchain_arch +- prefix = rebase_path("$clang_base_path/bin", root_build_dir) ++ prefix = "$clang_base_path/bin" + cl = "${clang_prefix}$prefix/${clang_cl}" +- _clang_lib_dir = +- rebase_path("$clang_base_path/lib/clang/$clang_version/lib/windows", +- root_build_dir) ++ _clang_lib_dir = "$clang_base_path/lib/clang/$clang_version/lib/windows" + if (host_os == "win") { + # Flip the slashes so that copy/paste of the command works. + cl = string_replace(cl, "/", "\\") +@@ -459,7 +457,7 @@ template("win_toolchains") { + + sys_include_flags = "${win_toolchain_data.include_flags_imsvc}" + sys_lib_flags = +- "-libpath:$_clang_lib_dir ${win_toolchain_data.libpath_flags}" ++ "-libpath:\"$_clang_lib_dir\" ${win_toolchain_data.libpath_flags}" + + toolchain_args = { + if (defined(invoker.toolchain_args)) { diff --git a/externals/vcpkg/ports/chromium-base/res/BUILD.gn b/externals/vcpkg/ports/chromium-base/res/BUILD.gn new file mode 100755 index 000000000..01d935ba0 --- /dev/null +++ b/externals/vcpkg/ports/chromium-base/res/BUILD.gn @@ -0,0 +1,5 @@ +static_library("chromium-base") { + deps = [ + "//base", + ] +} diff --git a/externals/vcpkg/ports/chromium-base/res/LASTCHANGE.committime b/externals/vcpkg/ports/chromium-base/res/LASTCHANGE.committime new file mode 100755 index 000000000..6acbbf691 --- /dev/null +++ b/externals/vcpkg/ports/chromium-base/res/LASTCHANGE.committime @@ -0,0 +1 @@ +1594430814 \ No newline at end of file diff --git a/externals/vcpkg/ports/chromium-base/res/build_overrides/build.gni b/externals/vcpkg/ports/chromium-base/res/build_overrides/build.gni new file mode 100755 index 000000000..47ac03644 --- /dev/null +++ b/externals/vcpkg/ports/chromium-base/res/build_overrides/build.gni @@ -0,0 +1,16 @@ +import("//build/config/gclient_args.gni") + +# Some non-Chromium builds don't support building java targets. +enable_java_templates = true + +# Don't use Chromium's third_party/binutils. +linux_use_bundled_binutils_override = false + +# Tracing requires //third_party/perfetto. +enable_base_tracing = false + +# Skip assertions about 4GiB file size limit. See https://crbug.com/648948. +ignore_elf32_limitations = false + +# Use the system install of Xcode for tools like ibtool, libtool, etc. +use_system_xcode = true diff --git a/externals/vcpkg/ports/chromium-base/res/fontconfig/BUILD.gn b/externals/vcpkg/ports/chromium-base/res/fontconfig/BUILD.gn new file mode 100755 index 000000000..5c26eaf19 --- /dev/null +++ b/externals/vcpkg/ports/chromium-base/res/fontconfig/BUILD.gn @@ -0,0 +1 @@ +component("fontconfig") {} \ No newline at end of file diff --git a/externals/vcpkg/ports/chromium-base/res/gclient_args.gni b/externals/vcpkg/ports/chromium-base/res/gclient_args.gni new file mode 100755 index 000000000..bd1145a79 --- /dev/null +++ b/externals/vcpkg/ports/chromium-base/res/gclient_args.gni @@ -0,0 +1,7 @@ +build_with_chromium = true +checkout_android = false +checkout_android_native_support = false +checkout_ios_webkit = false +checkout_nacl = false +checkout_oculus_sdk = false +checkout_openxr = false \ No newline at end of file diff --git a/externals/vcpkg/ports/chromium-base/res/icu/BUILD.gn b/externals/vcpkg/ports/chromium-base/res/icu/BUILD.gn new file mode 100755 index 000000000..22356981f --- /dev/null +++ b/externals/vcpkg/ports/chromium-base/res/icu/BUILD.gn @@ -0,0 +1,2 @@ +component("icuuc") {} +component("icu") {} \ No newline at end of file diff --git a/externals/vcpkg/ports/chromium-base/res/icu/config.gni b/externals/vcpkg/ports/chromium-base/res/icu/config.gni new file mode 100755 index 000000000..4e9ad6a5e --- /dev/null +++ b/externals/vcpkg/ports/chromium-base/res/icu/config.gni @@ -0,0 +1,3 @@ +declare_args() { + icu_use_data_file = false +} \ No newline at end of file diff --git a/externals/vcpkg/ports/chromium-base/res/libxml/BUILD.gn b/externals/vcpkg/ports/chromium-base/res/libxml/BUILD.gn new file mode 100755 index 000000000..b48056ab8 --- /dev/null +++ b/externals/vcpkg/ports/chromium-base/res/libxml/BUILD.gn @@ -0,0 +1,2 @@ +component("libxml_utils") {} +component("xml_reader") {} \ No newline at end of file diff --git a/externals/vcpkg/ports/chromium-base/res/protobuf/proto_library.gni b/externals/vcpkg/ports/chromium-base/res/protobuf/proto_library.gni new file mode 100755 index 000000000..e69de29bb diff --git a/externals/vcpkg/ports/chromium-base/res/test_fonts/BUILD.gn b/externals/vcpkg/ports/chromium-base/res/test_fonts/BUILD.gn new file mode 100755 index 000000000..b95c104e1 --- /dev/null +++ b/externals/vcpkg/ports/chromium-base/res/test_fonts/BUILD.gn @@ -0,0 +1 @@ +component("test_fonts") {} \ No newline at end of file diff --git a/externals/vcpkg/ports/chromium-base/res/testing/gmock/BUILD.gn b/externals/vcpkg/ports/chromium-base/res/testing/gmock/BUILD.gn new file mode 100755 index 000000000..acd0ec30c --- /dev/null +++ b/externals/vcpkg/ports/chromium-base/res/testing/gmock/BUILD.gn @@ -0,0 +1 @@ +component("gmock") {} \ No newline at end of file diff --git a/externals/vcpkg/ports/chromium-base/res/testing/gtest/BUILD.gn b/externals/vcpkg/ports/chromium-base/res/testing/gtest/BUILD.gn new file mode 100755 index 000000000..2463cc7c0 --- /dev/null +++ b/externals/vcpkg/ports/chromium-base/res/testing/gtest/BUILD.gn @@ -0,0 +1 @@ +component("gtest") {} \ No newline at end of file diff --git a/externals/vcpkg/ports/chromium-base/res/testing/libfuzzer/fuzzer_test.gni b/externals/vcpkg/ports/chromium-base/res/testing/libfuzzer/fuzzer_test.gni new file mode 100755 index 000000000..6e2a4c20f --- /dev/null +++ b/externals/vcpkg/ports/chromium-base/res/testing/libfuzzer/fuzzer_test.gni @@ -0,0 +1 @@ +import("//testing/test.gni") \ No newline at end of file diff --git a/externals/vcpkg/ports/chromium-base/res/testing/test.gni b/externals/vcpkg/ports/chromium-base/res/testing/test.gni new file mode 100755 index 000000000..2d6f8c103 --- /dev/null +++ b/externals/vcpkg/ports/chromium-base/res/testing/test.gni @@ -0,0 +1,20 @@ +template("test") { + not_needed(invoker, "*") + not_needed("*") +} + +set_defaults("test") { + configs = [ + "//build/config/compiler:chromium_code" + ] +} + +template("fuzzer_test") { + not_needed(invoker, "*") + not_needed("*") +} + +template("protoc_convert") { + not_needed(invoker, "*") + not_needed("*") +} \ No newline at end of file diff --git a/externals/vcpkg/ports/chromium-base/res/tools/win/DebugVisualizers/BUILD.gn b/externals/vcpkg/ports/chromium-base/res/tools/win/DebugVisualizers/BUILD.gn new file mode 100755 index 000000000..5c2c1f68e --- /dev/null +++ b/externals/vcpkg/ports/chromium-base/res/tools/win/DebugVisualizers/BUILD.gn @@ -0,0 +1 @@ +config("chrome") {} \ No newline at end of file diff --git a/externals/vcpkg/ports/chromium-base/res/tools/win/DebugVisualizers/chrome.natvis b/externals/vcpkg/ports/chromium-base/res/tools/win/DebugVisualizers/chrome.natvis new file mode 100755 index 000000000..e69de29bb diff --git a/externals/vcpkg/ports/chromium-base/vcpkg.json b/externals/vcpkg/ports/chromium-base/vcpkg.json new file mode 100755 index 000000000..d84ea24e0 --- /dev/null +++ b/externals/vcpkg/ports/chromium-base/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "chromium-base", + "version": "86.0.4199.1", + "port-version": 4, + "description": "Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.", + "homepage": "https://chromium.googlesource.com/chromium/src", + "license": "BSD-3-Clause", + "supports": "x64 & (osx | windows | linux) & !uwp", + "dependencies": [ + { + "name": "vcpkg-tool-gn", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/cimg/CMakeLists.txt b/externals/vcpkg/ports/cimg/CMakeLists.txt new file mode 100755 index 000000000..75ae59cd5 --- /dev/null +++ b/externals/vcpkg/ports/cimg/CMakeLists.txt @@ -0,0 +1,21 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 3.9) +project(CImg) + +add_library(${PROJECT_NAME} INTERFACE) + +target_include_directories(${PROJECT_NAME} INTERFACE + $ + $ +) + +install(TARGETS ${PROJECT_NAME} + EXPORT CImgExport + INCLUDES DESTINATION include +) + +install(EXPORT CImgExport FILE ${PROJECT_NAME}Config.cmake NAMESPACE ${PROJECT_NAME}:: DESTINATION share/cimg) + +install( + FILES ${CMAKE_CURRENT_SOURCE_DIR}/CImg.h + DESTINATION include +) diff --git a/externals/vcpkg/ports/cimg/portfile.cmake b/externals/vcpkg/ports/cimg/portfile.cmake new file mode 100755 index 000000000..8e128a33e --- /dev/null +++ b/externals/vcpkg/ports/cimg/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH + REPO dtschump/CImg + REF b33dcc8f9f1acf1f276ded92c04f8231f6c23fcd # v2.9.9 + SHA512 327c72320e7cac386ba72d417c45b9e8b40df34650370c34e687c362731919af1b447b2ee498f21278d4af155f0d9dbfabd222856d5f18c2e05569fa638a5909 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +# Move cmake files, ensuring they will be 3 directories up the import prefix +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/Licence_CeCILL-C_V1-en.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/Licence_CeCILL_V2-en.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright2) diff --git a/externals/vcpkg/ports/cimg/vcpkg.json b/externals/vcpkg/ports/cimg/vcpkg.json new file mode 100755 index 000000000..cc1c448bd --- /dev/null +++ b/externals/vcpkg/ports/cimg/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "cimg", + "version": "2.9.9", + "description": "The CImg Library is a small, open-source, and modern C++ toolkit for image processing", + "homepage": "https://github.com/dtschump/CImg", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/cityhash/CMakeLists.txt b/externals/vcpkg/ports/cityhash/CMakeLists.txt new file mode 100755 index 000000000..5a5a3120c --- /dev/null +++ b/externals/vcpkg/ports/cityhash/CMakeLists.txt @@ -0,0 +1,62 @@ +cmake_minimum_required(VERSION 3.13) +project(cityhash CXX) + +option(ENABLE_SSE "Build CityHash variants that depend on the _mm_crc32_u64 intrinsic." OFF) + +set(CMAKE_CXX_STANDARD 11) + +if (ENABLE_SSE) + include (CMakePushCheckState) + cmake_push_check_state() + if (MSVC) + include(CheckCXXSourceCompiles) + + check_cxx_source_compiles( + "#include + int main() { + _mm_crc32_u64(0, 0); + return 0; + }" + USE_SSE) + else() + include(CheckCXXCompilerFlag) + check_cxx_compiler_flag ("-msse4.2" USE_SSE) + if (USE_SSE) + set (SSE2_FLAG "-msse4.2") + endif() + endif() + + cmake_pop_check_state() + + if (NOT USE_SSE) + message(FATAL_ERROR "This platform doesn't support feature SSE4.2") + endif() +else() + set(USE_SSE OFF) +endif() + +add_library(cityhash STATIC src/city.cc) + +list(APPEND CITY_HEADERS src/city.h) +if (USE_SSE) + list(APPEND CITY_HEADERS src/citycrc.h) + + target_compile_options(cityhash PRIVATE ${SSE2_FLAG}) + if (MSVC) + target_compile_definitions(cityhash PRIVATE __SSE4_2__) + endif() +endif() + +target_include_directories(cityhash PUBLIC + $ + $ +) + +install(TARGETS cityhash EXPORT cityhash-config + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) + +install(EXPORT cityhash-config DESTINATION share/cmake/cityhash) +install(FILES ${CITY_HEADERS} DESTINATION include) diff --git a/externals/vcpkg/ports/cityhash/config.h b/externals/vcpkg/ports/cityhash/config.h new file mode 100755 index 000000000..190c1da38 --- /dev/null +++ b/externals/vcpkg/ports/cityhash/config.h @@ -0,0 +1,118 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* Define to 1 if the compiler supports __builtin_expect. */ +#if WIN32 || WIN64 +# define HAVE_BUILTIN_EXPECT 0 +#else +# define HAVE_BUILTIN_EXPECT 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "cityhash-discuss@googlegroups.com" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "CityHash" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "CityHash 1.1.1" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "cityhash" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "1.1.1" + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +/* # undef WORDS_BIGENDIAN */ +# endif +#endif + +/* Define for Solaris 2.5.1 so the uint32_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT32_T */ + +/* Define for Solaris 2.5.1 so the uint64_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT64_T */ + +/* Define for Solaris 2.5.1 so the uint8_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT8_T */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif + +/* Define to `unsigned int' if does not define. */ +/* #undef size_t */ + +/* Define to `int' if does not define. */ +/* #undef ssize_t */ + +/* Define to the type of an unsigned integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint32_t */ + +/* Define to the type of an unsigned integer type of width exactly 64 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint64_t */ + +/* Define to the type of an unsigned integer type of width exactly 8 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint8_t */ diff --git a/externals/vcpkg/ports/cityhash/portfile.cmake b/externals/vcpkg/ports/cityhash/portfile.cmake new file mode 100755 index 000000000..f904d8f4e --- /dev/null +++ b/externals/vcpkg/ports/cityhash/portfile.cmake @@ -0,0 +1,47 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/cityhash + REF 8af9b8c2b889d80c22d6bc26ba0df1afb79a30db + SHA512 5878a6a4f8ee99593412d446d96c05be1f89fa7771eca49ff4a52ce181de8199ba558170930996d36f6df80a65889d93c81ab2611868b015d8db913e2ecd2eb9 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +if(VCPKG_TARGET_IS_WINDOWS) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/config.h" DESTINATION "${SOURCE_PATH}/src") +else() + file(MAKE_DIRECTORY "${SOURCE_PATH}/out") + vcpkg_execute_required_process( + COMMAND "${SOURCE_PATH}/configure" + WORKING_DIRECTORY "${SOURCE_PATH}/out" + LOGNAME configure-${TARGET_TRIPLET} + ) + file(COPY "${SOURCE_PATH}/out/config.h" DESTINATION "${SOURCE_PATH}/src") +endif() + +if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND "sse" IN_LIST FEATURES) + message(FATAL_ERROR "Feature 'sse' does not support Windows x86 triplet.") +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "sse" ENABLE_SSE +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/cityhash) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share") + +configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/cityhash/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/cityhash/vcpkg.json b/externals/vcpkg/ports/cityhash/vcpkg.json new file mode 100755 index 000000000..431de018b --- /dev/null +++ b/externals/vcpkg/ports/cityhash/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "cityhash", + "version-date": "2013-01-08", + "port-version": 2, + "description": "CityHash, a family of hash functions for strings.", + "homepage": "https://github.com/google/cityhash", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "sse": { + "description": "Build CityHash variants that depend on the _mm_crc32_u64 intrinsic." + } + } +} diff --git a/externals/vcpkg/ports/civetweb/portfile.cmake b/externals/vcpkg/ports/civetweb/portfile.cmake new file mode 100755 index 000000000..1797bf083 --- /dev/null +++ b/externals/vcpkg/ports/civetweb/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO civetweb/civetweb + REF eefb26f82b233268fc98577d265352720d477ba4 # v1.15 + SHA512 5ce962e31b3c07b7110cbc645458dba9c0e26e693fbe3b4a7ffe8a28563827049a22fc5596a911fbcea4d88a9adbef3f82000ff61027ff4387f40e4a4045c26d + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + ssl CIVETWEB_ENABLE_SSL +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + # PREFER_NINJA - See https://github.com/civetweb/civetweb/issues/1024 + OPTIONS + -DCIVETWEB_BUILD_TESTING=OFF + -DCIVETWEB_ENABLE_DEBUG_TOOLS=OFF + -DCIVETWEB_ENABLE_ASAN=OFF + -DCIVETWEB_ENABLE_CXX=ON + -DCIVETWEB_ENABLE_IPV6=ON + -DCIVETWEB_ENABLE_SERVER_EXECUTABLE=OFF + -DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=OFF + -DCIVETWEB_ENABLE_WEBSOCKETS=ON + ${FEATURE_OPTIONS} +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/civetweb) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/civetweb/vcpkg.json b/externals/vcpkg/ports/civetweb/vcpkg.json new file mode 100755 index 000000000..e804454c3 --- /dev/null +++ b/externals/vcpkg/ports/civetweb/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "civetweb", + "version": "1.15", + "port-version": 1, + "description": "Easy to use, powerful, C/C++ embeddable web server.", + "homepage": "https://github.com/civetweb/civetweb", + "supports": "!uwp", + "features": { + "ssl": { + "description": "Enable SSL support", + "dependencies": [ + "openssl" + ] + } + } +} diff --git a/externals/vcpkg/ports/cjson/portfile.cmake b/externals/vcpkg/ports/cjson/portfile.cmake new file mode 100755 index 000000000..340de48e5 --- /dev/null +++ b/externals/vcpkg/ports/cjson/portfile.cmake @@ -0,0 +1,60 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DaveGamble/cJSON + REF v1.7.15 + SHA512 0b32a758c597fcc90c8ed0af493c9bccd611b9d4f9a03e87de3f7337bb9a28990b810befd44bc321a0cb42cbcd0b026d45761f9bab7bd798f920b7b6975fb124 + HEAD_REF master +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + utils ENABLE_CJSON_UTILS +) + +if(CMAKE_HOST_WIN32) + string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_PUBLIC_SYMBOLS) + string(COMPARE NOTEQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" DENABLE_HIDDEN_SYMBOLS) +else() + set(ENABLE_PUBLIC_SYMBOLS OFF) + set(DENABLE_HIDDEN_SYMBOLS OFF) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_SHARED_AND_STATIC_LIBS=OFF + -DCJSON_OVERRIDE_BUILD_SHARED_LIBS=OFF + -DENABLE_PUBLIC_SYMBOLS=${ENABLE_PUBLIC_SYMBOLS} + -DENABLE_HIDDEN_SYMBOLS=${DENABLE_HIDDEN_SYMBOLS} + -DENABLE_TARGET_EXPORT=ON # Export CMake config files + -DENABLE_CJSON_TEST=OFF + -DENABLE_FUZZING=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cJSON) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +file(READ "${CURRENT_PACKAGES_DIR}/include/cjson/cJSON.h" _contents) +if(ENABLE_PUBLIC_SYMBOLS) + string(REPLACE "defined(CJSON_HIDE_SYMBOLS)" "0 /* defined(CJSON_HIDE_SYMBOLS) */" _contents "${_contents}") + string(REPLACE "defined(CJSON_EXPORT_SYMBOLS)" "0 /* defined(CJSON_EXPORT_SYMBOLS) */" _contents "${_contents}") + string(REPLACE "defined(CJSON_IMPORT_SYMBOLS)" "1 /* defined(CJSON_IMPORT_SYMBOLS) */" _contents "${_contents}") +else() + string(REPLACE "defined(CJSON_HIDE_SYMBOLS)" "1 /* defined(CJSON_HIDE_SYMBOLS) */" _contents "${_contents}") +endif() +file(WRITE "${CURRENT_PACKAGES_DIR}/include/cjson/cJSON.h" "${_contents}") + +# Handle copyright +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/cjson/vcpkg.json b/externals/vcpkg/ports/cjson/vcpkg.json new file mode 100755 index 000000000..cfdfb121e --- /dev/null +++ b/externals/vcpkg/ports/cjson/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "cjson", + "version": "1.7.15", + "port-version": 1, + "description": "Ultralightweight JSON parser in ANSI C", + "homepage": "https://github.com/DaveGamble/cJSON", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "utils": { + "description": "Enable building the cJSON_Utils library" + } + } +} diff --git a/externals/vcpkg/ports/clamav/build.patch b/externals/vcpkg/ports/clamav/build.patch new file mode 100755 index 000000000..ee94a710b --- /dev/null +++ b/externals/vcpkg/ports/clamav/build.patch @@ -0,0 +1,26 @@ +diff --git a/cmake/FindCURSES.cmake b/cmake/FindCURSES.cmake +index a0755c697..f60735a91 100644 +--- a/cmake/FindCURSES.cmake ++++ b/cmake/FindCURSES.cmake +@@ -107,7 +107,7 @@ else() + set(CURSES_INCLUDE "") + + find_library(CURSES_LIBRARY +- NAMES curses ++ NAMES curses pdcurses + PATHS ${PC_PDCurses_LIBRARY_DIRS} + ) + +diff --git a/cmake/FindPthreadW32.cmake b/cmake/FindPthreadW32.cmake +index 4fded1eb7..0d44af310 100644 +--- a/cmake/FindPthreadW32.cmake ++++ b/cmake/FindPthreadW32.cmake +@@ -54,7 +54,7 @@ find_path(PThreadW32_INCLUDE_DIR + PATH_SUFFIXES pthreadw32 + ) + find_library(PThreadW32_LIBRARY +- NAMES pthreadVC2 ++ NAMES pthreadVC2 pthreadVC3 + PATHS ${PC_PThreadW32_LIBRARY_DIRS} + ) + diff --git a/externals/vcpkg/ports/clamav/cmakefiles.patch b/externals/vcpkg/ports/clamav/cmakefiles.patch new file mode 100755 index 000000000..cca4e6eff --- /dev/null +++ b/externals/vcpkg/ports/clamav/cmakefiles.patch @@ -0,0 +1,136 @@ +diff --git a/freshclam/CMakeLists.txt b/freshclam/CMakeLists.txt +index 545d5d4ba..59cbbc4ce 100644 +--- a/freshclam/CMakeLists.txt ++++ b/freshclam/CMakeLists.txt +@@ -28,18 +28,8 @@ target_link_libraries(freshclam-bin + ClamAV::libfreshclam + ClamAV::libclamav + ClamAV::shared ) +-if(WIN32) +- install(TARGETS freshclam-bin DESTINATION ${CMAKE_INSTALL_PREFIX}) +-else() +- install(TARGETS freshclam-bin DESTINATION ${CMAKE_INSTALL_BINDIR}) +-endif() + +-# Install an empty database directory +-if(WIN32) +- INSTALL(CODE "FILE(MAKE_DIRECTORY \${ENV}\${CMAKE_INSTALL_PREFIX}/database)") +-else() +- INSTALL(CODE "FILE(MAKE_DIRECTORY \${ENV}\${CMAKE_INSTALL_PREFIX}/share/clamav)") +-endif() ++install(TARGETS freshclam-bin) + + # now we rename resman-bin executable to resman using target properties + set_target_properties( freshclam-bin +diff --git a/libclamav/CMakeLists.txt b/libclamav/CMakeLists.txt +index bb14510db..136ea308a 100644 +--- a/libclamav/CMakeLists.txt ++++ b/libclamav/CMakeLists.txt +@@ -564,11 +564,7 @@ if(ENABLE_SHARED_LIB) + else() + target_link_libraries( clamav PUBLIC Iconv::Iconv ) + endif() +- if(WIN32) +- install(TARGETS clamav DESTINATION ${CMAKE_INSTALL_PREFIX}) +- else() +- install(TARGETS clamav DESTINATION ${CMAKE_INSTALL_LIBDIR}) +- endif() ++ install(TARGETS clamav) + + if(LLVM_FOUND) + target_link_directories( clamav PRIVATE ${LLVM_LIBRARY_DIRS} ) +@@ -609,11 +605,7 @@ if(ENABLE_STATIC_LIB) + COMPILE_FLAGS "${WARNCFLAGS}" + VERSION ${LIBCLAMAV_VERSION} SOVERSION ${LIBCLAMAV_SOVERSION}) + target_compile_definitions(clamav_static PUBLIC clamav_staticLIB) +- if(WIN32) +- install(TARGETS clamav_static DESTINATION ${CMAKE_INSTALL_PREFIX}) +- else() +- install(TARGETS clamav_static DESTINATION ${CMAKE_INSTALL_LIBDIR}) +- endif() ++ install(TARGETS clamav_static) + + add_library( ClamAV::libclamav_static ALIAS clamav_static ) + endif() +diff --git a/libclammspack/CMakeLists.txt b/libclammspack/CMakeLists.txt +index 1b5edbd4d..bba781d76 100644 +--- a/libclammspack/CMakeLists.txt ++++ b/libclammspack/CMakeLists.txt +@@ -73,11 +73,7 @@ endif() + target_sources( mspack + PUBLIC + "${CMAKE_CURRENT_SOURCE_DIR}/mspack/mspack.h" ) +-if(WIN32) +- install(TARGETS mspack DESTINATION ${CMAKE_INSTALL_PREFIX}) +-else() +- install(TARGETS mspack DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-endif() ++install(TARGETS mspack) + + # Public (forwarded) dependencies. + target_link_libraries( mspack +diff --git a/libclamunrar/CMakeLists.txt b/libclamunrar/CMakeLists.txt +index 03dbc3387..267690b1c 100644 +--- a/libclamunrar/CMakeLists.txt ++++ b/libclamunrar/CMakeLists.txt +@@ -90,10 +90,6 @@ target_link_libraries( clamunrar + PUBLIC + unrar_obj ) + +-if(WIN32) +- install(TARGETS clamunrar DESTINATION ${CMAKE_INSTALL_PREFIX}) +-else() +- install(TARGETS clamunrar DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-endif() ++install(TARGETS clamunrar) + + add_library( ClamAV::libclamunrar ALIAS clamunrar ) +diff --git a/libclamunrar_iface/CMakeLists.txt b/libclamunrar_iface/CMakeLists.txt +index 42f81544d..61f21da33 100644 +--- a/libclamunrar_iface/CMakeLists.txt ++++ b/libclamunrar_iface/CMakeLists.txt +@@ -55,11 +55,7 @@ if(ENABLE_UNRAR) + PUBLIC + ClamAV::libclamunrar_iface_iface) + +- if(WIN32) +- install(TARGETS clamunrar_iface DESTINATION ${CMAKE_INSTALL_PREFIX}) +- else() +- install(TARGETS clamunrar_iface DESTINATION ${CMAKE_INSTALL_LIBDIR}) +- endif() ++ install(TARGETS clamunrar_iface) + + add_library( ClamAV::libclamunrar_iface ALIAS clamunrar_iface ) +-endif() +\ No newline at end of file ++endif() +diff --git a/libfreshclam/CMakeLists.txt b/libfreshclam/CMakeLists.txt +index 6fb711818..27321ceb4 100644 +--- a/libfreshclam/CMakeLists.txt ++++ b/libfreshclam/CMakeLists.txt +@@ -65,11 +65,7 @@ if(ENABLE_SHARED_LIB) + set_target_properties(freshclam PROPERTIES + COMPILE_FLAGS "${WARNCFLAGS}" + VERSION ${LIBFRESHCLAM_VERSION} SOVERSION ${LIBFRESHCLAM_SOVERSION}) +- if(WIN32) +- install(TARGETS freshclam DESTINATION ${CMAKE_INSTALL_PREFIX}) +- else() +- install(TARGETS freshclam DESTINATION ${CMAKE_INSTALL_LIBDIR}) +- endif() ++ install(TARGETS freshclam) + + add_library( ClamAV::libfreshclam ALIAS freshclam ) + endif() +@@ -88,11 +84,7 @@ if(ENABLE_STATIC_LIB) + COMPILE_FLAGS "${WARNCFLAGS}" + VERSION ${LIBFRESHCLAM_VERSION} SOVERSION ${LIBFRESHCLAM_SOVERSION}) + target_compile_definitions(freshclam_static PUBLIC freshclam_staticLIB) +- if(WIN32) +- install(TARGETS freshclam_static DESTINATION ${CMAKE_INSTALL_PREFIX}) +- else() +- install(TARGETS freshclam_static DESTINATION ${CMAKE_INSTALL_LIBDIR}) +- endif() ++ install(TARGETS freshclam_static) + + add_library( ClamAV::libfreshclam_static ALIAS freshclam_static ) + endif() diff --git a/externals/vcpkg/ports/clamav/curl.patch b/externals/vcpkg/ports/clamav/curl.patch new file mode 100755 index 000000000..444f61da3 --- /dev/null +++ b/externals/vcpkg/ports/clamav/curl.patch @@ -0,0 +1,38 @@ +commit 59516af244a840aa95a8f15f978ac24ec97178cf +Author: jzaddach +Date: Fri Nov 27 14:24:31 2020 +0100 + + Fix curl usage + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e85d03e20..9f1cd42c5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -685,7 +685,7 @@ endif() + + add_subdirectory( libclamav ) + +-if(NOT LIBCLAMAV_ONLY) ++if(NOT ENABLE_LIBCLAMAV_ONLY) + add_subdirectory( shared ) + + add_subdirectory( libfreshclam ) +diff --git a/shared/CMakeLists.txt b/shared/CMakeLists.txt +index d9c8b6bfe..30df5a1a4 100644 +--- a/shared/CMakeLists.txt ++++ b/shared/CMakeLists.txt +@@ -59,9 +59,13 @@ target_link_libraries( shared_obj + PUBLIC + ClamAV::libclamav + ZLIB::ZLIB +- CURL::libcurl + OpenSSL::SSL + OpenSSL::Crypto ) ++if(CURL_FOUND) ++ target_link_libraries( shared_obj ++ PUBLIC ++ CURL::libcurl ) ++endif() + if(WIN32) + target_link_libraries( shared_obj + PUBLIC diff --git a/externals/vcpkg/ports/clamav/mspack.patch b/externals/vcpkg/ports/clamav/mspack.patch new file mode 100755 index 000000000..567788763 --- /dev/null +++ b/externals/vcpkg/ports/clamav/mspack.patch @@ -0,0 +1,44 @@ +diff --git a/cmake/FindMSPack.cmake b/cmake/FindMSPack.cmake +index cad448f..4ce4f87 100644 +--- a/cmake/FindMSPack.cmake ++++ b/cmake/FindMSPack.cmake +@@ -50,7 +50,7 @@ find_path(MSPack_INCLUDE_DIR + PATH_SUFFIXES mspack + ) + find_library(MSPack_LIBRARY +- NAMES mspack ++ NAMES libmspack + PATHS ${PC_MSPack_LIBRARY_DIRS} + ) + +diff --git a/libclamav/CMakeLists.txt b/libclamav/CMakeLists.txt +index 136ea30..72db826 100644 +--- a/libclamav/CMakeLists.txt ++++ b/libclamav/CMakeLists.txt +@@ -504,7 +504,7 @@ target_link_libraries( clamav_obj + yara + tomsfastmath + bytecode_runtime +- ClamAV::libmspack ++ ${MSPack_LIBRARIES} + ClamAV::libclamunrar_iface_iface + OpenSSL::SSL + OpenSSL::Crypto +@@ -547,7 +547,7 @@ if(ENABLE_SHARED_LIB) + yara + tomsfastmath + bytecode_runtime +- ClamAV::libmspack ++ ${MSPack_LIBRARIES} + ClamAV::libclamunrar_iface_iface + OpenSSL::SSL + OpenSSL::Crypto +@@ -588,7 +588,7 @@ if(ENABLE_STATIC_LIB) + yara + tomsfastmath + bytecode_runtime +- ClamAV::libmspack ++ ${MSPack_LIBRARIES} + ClamAV::libclamunrar_iface_iface + OpenSSL::SSL + OpenSSL::Crypto diff --git a/externals/vcpkg/ports/clamav/portfile.cmake b/externals/vcpkg/ports/clamav/portfile.cmake new file mode 100755 index 000000000..3697306a1 --- /dev/null +++ b/externals/vcpkg/ports/clamav/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Cisco-Talos/clamav-devel + REF clamav-0.103.0 + SHA512 e7ff4d98e0615a9fec0752bbfa2b882ae95034a8e01d0f7cc635ee520ff917c3be2a2d3273caa2fc1598e7d5ec4fd60d59b517cb439c5454d32447f8c8d7ba5a + FILE_DISAMBIGUATOR 1 + HEAD_REF master + PATCHES + "build.patch" + "cmakefiles.patch" + "curl.patch" + "mspack.patch" +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DENABLE_LIBCLAMAV_ONLY=ON + -DENABLE_DOCS=OFF + -DENABLE_SHARED_LIB=ON + -DENABLE_STATIC_LIB=OFF + -DENABLE_EXTERNAL_MSPACK=ON +) + +vcpkg_install_cmake() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# On Linux, clamav will still build and install clamav-config +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/clamav/vcpkg.json b/externals/vcpkg/ports/clamav/vcpkg.json new file mode 100755 index 000000000..ca212c576 --- /dev/null +++ b/externals/vcpkg/ports/clamav/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "clamav", + "version-semver": "0.103.0", + "port-version": 3, + "description": "ClamAV is an open-source anti-virus toolkit.", + "homepage": "https://www.clamav.net", + "supports": "!uwp & !static", + "dependencies": [ + "bzip2", + "json-c", + "libmspack", + "libxml2", + "openssl", + "pcre2", + "pthreads", + "zlib" + ] +} diff --git a/externals/vcpkg/ports/clapack/FindLAPACK.cmake b/externals/vcpkg/ports/clapack/FindLAPACK.cmake new file mode 100755 index 000000000..aa546e672 --- /dev/null +++ b/externals/vcpkg/ports/clapack/FindLAPACK.cmake @@ -0,0 +1,239 @@ +#.rst: +# clapack config for vcpkg +# ------------ +# +# Find the clapack includes and library. +# +# Result Variables +# ^^^^^^^^^^^^^^^^ +# +# This script defines the following variables: +# +# ``CLAPACK_FOUND`` +# True if clapack library found +# +# ``CLAPACK_VERSION`` +# Containing the clapack version tag (manually defined) +# +# ``CLAPACK_INCLUDE_DIR`` +# Location of clapack headers +# +# ``CLAPACK_LIBRARY`` +# List of libraries to link with when using clapack +# +# Result Targets +# ^^^^^^^^^^^^^^ +# +# This script defines the following targets: +# +# ``clapack::clapack`` +# Target to use clapack +# +# Compatibility Variables +# ^^^^^^^^^^^^^^^^^^^^^^^ +# +# This script defines the following variables for compatibility reasons: +# +# ``F2C_FOUND`` +# True if f2c (fortran-to-c wrap layer) library found +# +# ``F2C_INCLUDE_DIR`` +# Location of clapack headers +# +# ``F2C_LIBRARY`` +# Library containing the fortran-to-c wrap layer, necessary for clapack and automatically included when used +# +# ``LAPACK_FOUND`` +# True if clapack library found +# +# ``LAPACK_VERSION`` +# Containing the clapack version tag (manually defined) +# +# ``LAPACK_INCLUDE_DIR`` +# Location of clapack headers +# +# ``LAPACK_LIBRARY`` +# List of libraries to link with when using clapack +# +# Compatibility Targets +# ^^^^^^^^^^^^^^ +# +# This script defines the following targets for compatibility reasons: +# +# ``lapack`` +# Target to use lapack + +include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) +include(${CMAKE_ROOT}/Modules/CheckSymbolExists.cmake) +include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) +include(${CMAKE_ROOT}/Modules/CMakeFindDependencyMacro.cmake) + +set(CLAPACK_VERSION "3.2.1") + +set(CMAKE_THREAD_PREFER_PTHREAD TRUE) +find_dependency(Threads) + +if(UNIX) + find_library(ADDITIONAL_LAPACK_LIBRARY m) + set(PTHREAD_LINK_NAME "-pthread") +endif() + +if(NOT F2C_LIBRARY) + find_library(F2C_LIBRARY_RELEASE NAMES f2c libf2c) + find_library(F2C_LIBRARY_DEBUG NAMES f2cd libf2cd) + select_library_configurations(F2C) + + #keep a list of "pure" f2c libs, without dependencies + set(oF2C_LIBRARY_RELEASE ${F2C_LIBRARY_RELEASE}) + set(oF2C_LIBRARY_DEBUG ${F2C_LIBRARY_DEBUG}) + set(oF2C_LIBRARY ${F2C_LIBRARY}) + + list(APPEND F2C_LIBRARY ${ADDITIONAL_LAPACK_LIBRARY}) +endif() + +if(NOT LAPACK_LIBRARY) + find_library(LAPACK_LIBRARY_RELEASE NAMES lapack) + find_library(LAPACK_LIBRARY_DEBUG NAMES lapackd) + + #keep a list of "pure" lapack libs, without dependencies + set(oLAPACK_LIBRARY_RELEASE ${LAPACK_LIBRARY_RELEASE}) + set(oLAPACK_LIBRARY_DEBUG ${LAPACK_LIBRARY_DEBUG}) + select_library_configurations(oLAPACK) + + list(APPEND LAPACK_LIBRARY_RELEASE ${F2C_LIBRARY_RELEASE}) + list(APPEND LAPACK_LIBRARY_DEBUG ${F2C_LIBRARY_DEBUG}) + + find_dependency(OpenBLAS) + get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY IMPORTED_IMPLIB_RELEASE) + if(NOT _loc) + get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY LOCATION_RELEASE) + endif() + set(LAPACK_BLAS_LIBRARY_RELEASE ${_loc}) + get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY IMPORTED_IMPLIB_DEBUG) + if(NOT _loc) + get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY LOCATION_DEBUG) + endif() + set(LAPACK_BLAS_LIBRARY_DEBUG ${_loc}) + select_library_configurations(LAPACK_BLAS) + list(APPEND LAPACK_LIBRARY_RELEASE ${LAPACK_BLAS_LIBRARY_RELEASE}) + list(APPEND LAPACK_LIBRARY_DEBUG ${LAPACK_BLAS_LIBRARY_DEBUG}) + + select_library_configurations(LAPACK) + if(UNIX) + list(APPEND LAPACK_LIBRARY ${PTHREAD_LINK_NAME}) + endif() +endif() + +if(NOT F2C_INCLUDE_DIR) + find_path(F2C_INCLUDE_DIR NAMES f2c.h) +endif() + +if(NOT LAPACK_INCLUDE_DIR) + find_path(LAPACK_INCLUDE_DIR NAMES clapack.h) +endif() + +list(APPEND LAPACK_INCLUDE_DIR ${F2C_INCLUDE_DIR}) +set(LAPACK_INCLUDE_DIR "${LAPACK_INCLUDE_DIR}" CACHE PATH "" FORCE) +set(LAPACK_INCLUDE_DIRS "${LAPACK_INCLUDE_DIR}" CACHE PATH "" FORCE) +set(CLAPACK_INCLUDE_DIR "${LAPACK_INCLUDE_DIR}" CACHE PATH "" FORCE) +set(CLAPACK_INCLUDE_DIRS "${LAPACK_INCLUDE_DIR}" CACHE PATH "" FORCE) +set(F2C_INCLUDE_DIRS "${F2C_INCLUDE_DIR}" CACHE PATH "" FORCE) + +set(LAPACK_DLL_DIR ${LAPACK_INCLUDE_DIR}) +list(TRANSFORM LAPACK_DLL_DIR APPEND "/../bin") +message(STATUS "LAPACK_DLL_DIR: ${LAPACK_DLL_DIR}") + +if(WIN32) + find_file(LAPACK_LIBRARY_RELEASE_DLL NAMES lapack.dll PATHS ${LAPACK_DLL_DIR}) + find_file(LAPACK_LIBRARY_DEBUG_FOLDER NAMES lapackd.dll PATHS ${LAPACK_DLL_DIR}) + find_file(F2C_LIBRARY_RELEASE_DLL NAMES f2c.dll libf2c.dll PATHS ${LAPACK_DLL_DIR}) + find_file(F2C_LIBRARY_DEBUG_DLL NAMES f2cd.dll libf2cd.dll PATHS ${LAPACK_DLL_DIR}) +endif() + +set(LAPACK_BLAS_LIBRARY "${LAPACK_BLAS_LIBRARY}" CACHE STRING "" FORCE) +set(F2C_LIBRARIES "${F2C_LIBRARY}" CACHE STRING "" FORCE) +set(LAPACK_VERSION "${CLAPACK_VERSION}" CACHE STRING "" FORCE) +set(LAPACK_LIBRARIES "${LAPACK_LIBRARY}" CACHE STRING "" FORCE) +set(CLAPACK_LIBRARY "${LAPACK_LIBRARY}" CACHE STRING "" FORCE) +set(CLAPACK_LIBRARIES "${LAPACK_LIBRARY}" CACHE STRING "" FORCE) + +set(LAPACK_LIBRARY "${LAPACK_LIBRARY}" CACHE STRING "" FORCE) +set(F2C_LIBRARY "${F2C_LIBRARY}" CACHE STRING "" FORCE) +set(LAPACK_LIBRARY_RELEASE "${LAPACK_LIBRARY_RELEASE}" CACHE STRING "" FORCE) +set(LAPACK_LIBRARY_DEBUG "${LAPACK_LIBRARY_DEBUG}" CACHE STRING "" FORCE) +set(F2C_LIBRARY_RELEASE "${F2C_LIBRARY_RELEASE}" CACHE STRING "" FORCE) +set(F2C_LIBRARY_DEBUG "${F2C_LIBRARY_DEBUG}" CACHE STRING "" FORCE) + +find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARY LAPACK_INCLUDE_DIR) +mark_as_advanced(LAPACK_INCLUDE_DIR LAPACK_LIBRARY) + +#TARGETS +if(CLAPACK_FOUND AND NOT TARGET clapack::clapack) + if(EXISTS "${LAPACK_LIBRARY_RELEASE_DLL}") + add_library(clapack::clapack SHARED IMPORTED) + set_target_properties(clapack::clapack PROPERTIES + IMPORTED_LOCATION_RELEASE "${LAPACK_LIBRARY_RELEASE_DLL}" + IMPORTED_IMPLIB_RELEASE "${oLAPACK_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${LAPACK_INCLUDE_DIR}" + INTERFACE_LINK_LIBRARIES "$<$>:${oF2C_LIBRARY_RELEASE}>;$<$:${oF2C_LIBRARY_DEBUG}>;$<$>:${LAPACK_BLAS_LIBRARY_RELEASE}>;$<$:${LAPACK_BLAS_LIBRARY_DEBUG}>;$;$" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + if(EXISTS "${LAPACK_LIBRARY_DEBUG_DLL}") + set_property(TARGET clapack::clapack APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug) + set_target_properties(clapack::clapack PROPERTIES + IMPORTED_LOCATION_DEBUG "${LAPACK_LIBRARY_DEBUG_DLL}" + IMPORTED_IMPLIB_DEBUG "${oLAPACK_LIBRARY_DEBUG}") + endif() + else() + add_library(clapack::clapack UNKNOWN IMPORTED) + set_target_properties(clapack::clapack PROPERTIES + IMPORTED_LOCATION_RELEASE "${oLAPACK_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${LAPACK_INCLUDE_DIR}" + INTERFACE_LINK_LIBRARIES "$<$>:${oF2C_LIBRARY_RELEASE}>;$<$:${oF2C_LIBRARY_DEBUG}>;$<$>:${LAPACK_BLAS_LIBRARY_RELEASE}>;$<$:${LAPACK_BLAS_LIBRARY_DEBUG}>;$;$" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + if(EXISTS "${LAPACK_LIBRARY_DEBUG}") + set_property(TARGET clapack::clapack APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug) + set_target_properties(clapack::clapack PROPERTIES + IMPORTED_LOCATION_DEBUG "${oLAPACK_LIBRARY_DEBUG}") + endif() + endif() +endif() + +# Ensure consistency with both CMake's vanilla as well as lapack-reference's FindLAPACK.cmake module and register the LAPACK::LAPACK target +if(CLAPACK_FOUND AND NOT TARGET LAPACK::LAPACK) + if(EXISTS "${LAPACK_LIBRARY_RELEASE_DLL}") + add_library(LAPACK::LAPACK SHARED IMPORTED) + set_target_properties(LAPACK::LAPACK PROPERTIES + IMPORTED_LOCATION_RELEASE "${LAPACK_LIBRARY_RELEASE_DLL}" + IMPORTED_IMPLIB_RELEASE "${oLAPACK_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${LAPACK_INCLUDE_DIR}" + INTERFACE_LINK_LIBRARIES "$<$>:${oF2C_LIBRARY_RELEASE}>;$<$:${oF2C_LIBRARY_DEBUG}>;$<$>:${LAPACK_BLAS_LIBRARY_RELEASE}>;$<$:${LAPACK_BLAS_LIBRARY_DEBUG}>;$;$" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + if(EXISTS "${LAPACK_LIBRARY_DEBUG_DLL}") + set_property(TARGET LAPACK::LAPACK APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug) + set_target_properties(LAPACK::LAPACK PROPERTIES + IMPORTED_LOCATION_DEBUG "${LAPACK_LIBRARY_DEBUG_DLL}" + IMPORTED_IMPLIB_DEBUG "${oLAPACK_LIBRARY_DEBUG}") + endif() + else() + add_library(LAPACK::LAPACK UNKNOWN IMPORTED) + set_target_properties(LAPACK::LAPACK PROPERTIES + IMPORTED_LOCATION_RELEASE "${oLAPACK_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${LAPACK_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS Release + INTERFACE_LINK_LIBRARIES "$<$>:${oF2C_LIBRARY_RELEASE}>;$<$:${oF2C_LIBRARY_DEBUG}>;$<$>:${LAPACK_BLAS_LIBRARY_RELEASE}>;$<$:${LAPACK_BLAS_LIBRARY_DEBUG}>;$;$" + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + if(EXISTS "${LAPACK_LIBRARY_DEBUG}") + set_property(TARGET LAPACK::LAPACK APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug) + set_target_properties(LAPACK::LAPACK PROPERTIES + IMPORTED_LOCATION_DEBUG "${oLAPACK_LIBRARY_DEBUG}") + endif() + endif() +endif() + +# Preserve backwards compatibility and also register the 'lapack' target +if(CLAPACK_FOUND AND NOT TARGET lapack) + add_library(lapack ALIAS LAPACK::LAPACK) +endif() diff --git a/externals/vcpkg/ports/clapack/arith_linux64.h b/externals/vcpkg/ports/clapack/arith_linux64.h new file mode 100755 index 000000000..1bc8dcee8 --- /dev/null +++ b/externals/vcpkg/ports/clapack/arith_linux64.h @@ -0,0 +1,9 @@ +#define IEEE_8087 +#define Arith_Kind_ASL 1 +#define Long int +#define Intcast (int)(long) +#define Double_Align +#define X64_bit_pointers +#define NO_LONG_LONG +#define QNaN0 0x0 +#define QNaN1 0xfff80000 diff --git a/externals/vcpkg/ports/clapack/arith_osx.h b/externals/vcpkg/ports/clapack/arith_osx.h new file mode 100755 index 000000000..936533849 --- /dev/null +++ b/externals/vcpkg/ports/clapack/arith_osx.h @@ -0,0 +1,12 @@ +/* Suitable for macOS on x86_64 and arm64 */ +/* Not suitable for 32-bit macOS */ + +#define IEEE_8087 +#define Arith_Kind_ASL 1 +#define Long int +#define Intcast (int)(long) +#define Double_Align +#define X64_bit_pointers +#define NANCHECK +#define QNaN0 0x0 +#define QNaN1 0x7ff80000 diff --git a/externals/vcpkg/ports/clapack/arith_win32.h b/externals/vcpkg/ports/clapack/arith_win32.h new file mode 100755 index 000000000..68b45b9ea --- /dev/null +++ b/externals/vcpkg/ports/clapack/arith_win32.h @@ -0,0 +1,8 @@ +/* Windows 32-bit */ + +#define IEEE_8087 +#define Arith_Kind_ASL 1 +#define Double_Align +#define NANCHECK +#define QNaN0 0x0 +#define QNaN1 0x7ff80000 diff --git a/externals/vcpkg/ports/clapack/arith_win64.h b/externals/vcpkg/ports/clapack/arith_win64.h new file mode 100755 index 000000000..359639521 --- /dev/null +++ b/externals/vcpkg/ports/clapack/arith_win64.h @@ -0,0 +1,9 @@ +/* Windows 64-bit */ + +#define IEEE_8087 +#define Arith_Kind_ASL 1 +#define Double_Align +#define X64_bit_pointers +#define NANCHECK +#define QNaN0 0x0 +#define QNaN1 0x7ff80000 diff --git a/externals/vcpkg/ports/clapack/fix-ConfigFile.patch b/externals/vcpkg/ports/clapack/fix-ConfigFile.patch new file mode 100755 index 000000000..295c2bc1c --- /dev/null +++ b/externals/vcpkg/ports/clapack/fix-ConfigFile.patch @@ -0,0 +1,7 @@ +diff --git a/clapack-config.cmake.in b/clapack-config.cmake.in +index cd19f1d..49af4f0 100644 +--- a/clapack-config.cmake.in ++++ b/clapack-config.cmake.in +@@ -1 +1 @@ +-include("@CLAPACK_BINARY_DIR@/clapack-targets.cmake") ++include("${CMAKE_CURRENT_LIST_DIR}/clapack-targets.cmake") diff --git a/externals/vcpkg/ports/clapack/fix-install.patch b/externals/vcpkg/ports/clapack/fix-install.patch new file mode 100755 index 000000000..b475c6b85 --- /dev/null +++ b/externals/vcpkg/ports/clapack/fix-install.patch @@ -0,0 +1,45 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 414ac8e..db58b4e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,7 +19,7 @@ include_directories(${CLAPACK_SOURCE_DIR}/INCLUDE) + add_subdirectory(F2CLIBS) + add_subdirectory(SRC) + set(CLAPACK_VERSION 3.2.1) +-export(TARGETS f2c lapack FILE ${CMAKE_INSTALL_PREFIX}/share/clapack/clapack-targets.cmake) ++install(EXPORT clapack-targets FILE clapack-targets.cmake DESTINATION share/clapack) + configure_file(${CLAPACK_SOURCE_DIR}/clapack-config-version.cmake.in + ${CMAKE_INSTALL_PREFIX}/share/clapack/clapack-config-version.cmake @ONLY) + configure_file(${CLAPACK_SOURCE_DIR}/clapack-config.cmake.in +diff --git a/F2CLIBS/libf2c/CMakeLists.txt b/F2CLIBS/libf2c/CMakeLists.txt +index 6fa3598..c855e38 100644 +--- a/F2CLIBS/libf2c/CMakeLists.txt ++++ b/F2CLIBS/libf2c/CMakeLists.txt +@@ -63,8 +63,9 @@ set_property(TARGET f2c PROPERTY PREFIX lib) + if(UNIX) + target_link_libraries(f2c m) + endif() +-install(TARGETS f2c ++install(TARGETS f2c EXPORT clapack-targets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib) ++ ARCHIVE DESTINATION lib ++ INCLUDES DESTINATION include) + +diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt +index 07dc8c7..2355225 100644 +--- a/SRC/CMakeLists.txt ++++ b/SRC/CMakeLists.txt +@@ -377,8 +377,9 @@ if(BUILD_COMPLEX16) + endif() + add_library(lapack ${ALLOBJ} ${ALLXOBJ}) + target_link_libraries(lapack ${BLAS_LIBRARIES} f2c) +-install(TARGETS lapack ++install(TARGETS lapack EXPORT clapack-targets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib) ++ ARCHIVE DESTINATION lib ++ INCLUDES DESTINATION include) + diff --git a/externals/vcpkg/ports/clapack/portfile.cmake b/externals/vcpkg/ports/clapack/portfile.cmake new file mode 100755 index 000000000..d84c864e2 --- /dev/null +++ b/externals/vcpkg/ports/clapack/portfile.cmake @@ -0,0 +1,67 @@ +if(EXISTS "${CURRENT_INSTALLED_DIR}/share/lapack-reference/copyright") + message(FATAL_ERROR "Can't build ${PORT} if lapack-reference is installed. Please remove lapack-reference:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.") +endif() + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.netlib.org/clapack/clapack-3.2.1-CMAKE.tgz" + FILENAME "clapack-3.2.1.tgz" + SHA512 cf19c710291ddff3f6ead7d86bdfdeaebca21291d9df094bf0a8ef599546b007757fb2dbb19b56511bb53ef7456eac0c73973b9627bf4d02982c856124428b49 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + remove_internal_blas.patch + fix-ConfigFile.patch + fix-install.patch + support-uwp.patch +) + +set(ARITH_PATH) +if(DEFINED CLAPACK_ARITH_PATH) + set(ARITH_PATH "-DARITH_PATH=${CLAPACK_ARITH_PATH}") +elseif(NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET) + if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) + if(VCPKG_TARGET_ARCHITECTURE MATCHES "^x64$|^arm64$") + set(ARITH_PATH "-DARITH_PATH=${CMAKE_CURRENT_LIST_DIR}/arith_win64.h") + else() + set(ARITH_PATH "-DARITH_PATH=${CMAKE_CURRENT_LIST_DIR}/arith_win32.h") + endif() + elseif(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) + set(ARITH_PATH "-DARITH_PATH=${CMAKE_CURRENT_LIST_DIR}/arith_osx.h") + elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(ARITH_PATH "-DARITH_PATH=${CMAKE_CURRENT_LIST_DIR}/arith_linux64.h") + else() + message(WARNING +"Unable to cross-compile clapack for ${VCPKG_TARGET_ARCHITECTURE}-${VCPKG_CMAKE_SYSTEM_NAME}. +No arith.h is available and arithchk must be executed for the target. +To fix this issue, define CLAPACK_ARITH_PATH in your triplet to the location of a pre-generated arith.h file. + +Continuing with trying to run arithchk anyway.") + endif() +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCMAKE_DEBUG_POSTFIX=d + ${ARITH_PATH} +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +#TODO: fix the official exported targets, since they are broken (luckily it seems that no-one uses them for now) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/clapack) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Install clapack wrappers. +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/lapack) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/lapack) +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/clapack/remove_internal_blas.patch b/externals/vcpkg/ports/clapack/remove_internal_blas.patch new file mode 100755 index 000000000..3b8c59b4c --- /dev/null +++ b/externals/vcpkg/ports/clapack/remove_internal_blas.patch @@ -0,0 +1,77 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 320ccc6..414ac8e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,7 +1,6 @@ + cmake_minimum_required(VERSION 2.6) + project(CLAPACK C) +-enable_testing() +-include(CTest) ++find_package(BLAS REQUIRED) + + if(WIN32 AND NOT CYGWIN) + set(SECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/winsecond.c) +@@ -11,7 +10,6 @@ else() + set(SECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/second.c) + set(DSECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/dsecnd.c) + endif() +-enable_testing() + option(USE_BLAS_WRAP "pre-pend f2c_ to each function in blas" OFF) + if(NOT USE_BLAS_WRAP) + # _zrotg_ seems to be missing in the wrap header +@@ -19,16 +17,15 @@ if(NOT USE_BLAS_WRAP) + endif() + include_directories(${CLAPACK_SOURCE_DIR}/INCLUDE) + add_subdirectory(F2CLIBS) +-add_subdirectory(BLAS) + add_subdirectory(SRC) +-add_subdirectory(TESTING) + set(CLAPACK_VERSION 3.2.1) +-set(CPACK_PACKAGE_VERSION_MAJOR 3) +-set(CPACK_PACKAGE_VERSION_MINOR 2) +-set(CPACK_PACKAGE_VERSION_PATCH 1) +-include(CPack) +-export(TARGETS f2c blas lapack FILE clapack-targets.cmake) ++export(TARGETS f2c lapack FILE ${CMAKE_INSTALL_PREFIX}/share/clapack/clapack-targets.cmake) + configure_file(${CLAPACK_SOURCE_DIR}/clapack-config-version.cmake.in +- ${CLAPACK_BINARY_DIR}/clapack-config-version.cmake @ONLY) ++ ${CMAKE_INSTALL_PREFIX}/share/clapack/clapack-config-version.cmake @ONLY) + configure_file(${CLAPACK_SOURCE_DIR}/clapack-config.cmake.in +- ${CLAPACK_BINARY_DIR}/clapack-config.cmake @ONLY) ++ ${CMAKE_INSTALL_PREFIX}/share/clapack/clapack-config.cmake @ONLY) ++install(FILES ++ ${CMAKE_CURRENT_LIST_DIR}/INCLUDE/clapack.h ++ ${CMAKE_CURRENT_LIST_DIR}/INCLUDE/f2c.h ++ DESTINATION include) ++ +diff --git a/F2CLIBS/libf2c/CMakeLists.txt b/F2CLIBS/libf2c/CMakeLists.txt +index 43d7b3f..6fa3598 100644 +--- a/F2CLIBS/libf2c/CMakeLists.txt ++++ b/F2CLIBS/libf2c/CMakeLists.txt +@@ -60,3 +60,11 @@ include_directories(${CLAPACK_SOURCE_DIR}/F2CLIBS/libf2c) + include_directories(${CLAPACK_BINARY_DIR}/F2CLIBS/libf2c) + add_library(f2c ${OFILES} ${CMAKE_CURRENT_BINARY_DIR}/arith.h) + set_property(TARGET f2c PROPERTY PREFIX lib) ++if(UNIX) ++ target_link_libraries(f2c m) ++endif() ++install(TARGETS f2c ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) ++ +diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt +index ac4cce3..07dc8c7 100644 +--- a/SRC/CMakeLists.txt ++++ b/SRC/CMakeLists.txt +@@ -376,5 +376,9 @@ if(BUILD_COMPLEX16) + set(ALLOBJ ${ZLASRC} ${ALLAUX} ${DZLAUX}) + endif() + add_library(lapack ${ALLOBJ} ${ALLXOBJ}) +-target_link_libraries(lapack blas) ++target_link_libraries(lapack ${BLAS_LIBRARIES} f2c) ++install(TARGETS lapack ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + diff --git a/externals/vcpkg/ports/clapack/support-uwp.patch b/externals/vcpkg/ports/clapack/support-uwp.patch new file mode 100755 index 000000000..6f229ade2 --- /dev/null +++ b/externals/vcpkg/ports/clapack/support-uwp.patch @@ -0,0 +1,87 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index db58b4e..0fb61a0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,6 +15,9 @@ if(NOT USE_BLAS_WRAP) + # _zrotg_ seems to be missing in the wrap header + add_definitions(-DNO_BLAS_WRAP) + endif() ++if (MSVC) ++ add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE) ++endif() + include_directories(${CLAPACK_SOURCE_DIR}/INCLUDE) + add_subdirectory(F2CLIBS) + add_subdirectory(SRC) +diff --git a/F2CLIBS/libf2c/CMakeLists.txt b/F2CLIBS/libf2c/CMakeLists.txt +index 094614a..e5b40ab 100644 +--- a/F2CLIBS/libf2c/CMakeLists.txt ++++ b/F2CLIBS/libf2c/CMakeLists.txt +@@ -44,12 +44,19 @@ if(UNIX) + endif() + set_target_properties(arithchk PROPERTIES COMPILE_DEFINITIONS + "NO_FPINIT;NO_LONG_LONG") ++ ++if (ARITH_PATH) ++configure_file( ++ "${ARITH_PATH}" ++ "${CMAKE_CURRENT_BINARY_DIR}/arith.h" ++ COPYONLY) ++else() + ADD_CUSTOM_COMMAND( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/arith.h + COMMAND arithchk > ${CMAKE_CURRENT_BINARY_DIR}/arith.h + DEPENDS arithchk + ) +- ++endif() + + set(OFILES ${MISC} ${POW} ${CX} ${DCX} ${REAL} ${DBL} ${INT} + ${HALF} ${CMP} ${EFL} ${CHAR} ${I77} ${TIME}) +diff --git a/F2CLIBS/libf2c/inquire.c b/F2CLIBS/libf2c/inquire.c +index 5936a67..4846d41 100644 +--- a/F2CLIBS/libf2c/inquire.c ++++ b/F2CLIBS/libf2c/inquire.c +@@ -32,7 +32,7 @@ integer f_inqu(inlist *a) + { byfile=1; + g_char(a->infile,a->infilen,buf); + #ifdef NON_UNIX_STDIO +- x = access(buf,0) ? -1 : 0; ++ x = _access(buf,0) ? -1 : 0; + for(i=0,p=NULL;inext) + if (nl == y->nl) + return y; +@@ -308,7 +308,7 @@ x_rsne(cilist *a) + char buf[64]; + hashtab *ht; + Vardesc *v; +- dimen *dn, *dn0, *dn1; ++ dimen *dn = NULL, *dn0 = NULL, *dn1; + ftnlen *dims, *dims1; + ftnlen b, b0, b1, ex, no, nomax, size, span; + ftnint no1, no2, type; diff --git a/externals/vcpkg/ports/clapack/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/clapack/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..cb2e08fdf --- /dev/null +++ b/externals/vcpkg/ports/clapack/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,11 @@ +message(STATUS "Using VCPKG FindLAPACK from package 'clapack'") +set(LAPACK_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) + +list(REMOVE_ITEM ARGS "NO_MODULE") +list(REMOVE_ITEM ARGS "CONFIG") +list(REMOVE_ITEM ARGS "MODULE") + +_find_package(${ARGS}) + +set(CMAKE_MODULE_PATH ${LAPACK_PREV_MODULE_PATH}) diff --git a/externals/vcpkg/ports/clapack/vcpkg.json b/externals/vcpkg/ports/clapack/vcpkg.json new file mode 100755 index 000000000..78b840f56 --- /dev/null +++ b/externals/vcpkg/ports/clapack/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "clapack", + "version": "3.2.1", + "port-version": 20, + "description": "CLAPACK (f2c'ed version of LAPACK)", + "homepage": "https://www.netlib.org/clapack", + "dependencies": [ + "blas" + ] +} diff --git a/externals/vcpkg/ports/clara/portfile.cmake b/externals/vcpkg/ports/clara/portfile.cmake new file mode 100755 index 000000000..7b4799844 --- /dev/null +++ b/externals/vcpkg/ports/clara/portfile.cmake @@ -0,0 +1,10 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO philsquared/Clara + REF v1.1.5 + SHA512 10aed7452eaf95c785899086118181615d29496d9f6e5b7054005b565afb642fcdf18b87ebb2dae4e9e365c434be9463c1a5d1a4c4ab17b95a87b89a7f7e3b08 + HEAD_REF master +) +file(INSTALL ${SOURCE_PATH}/single_include/clara.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL ${SOURCE_PATH}/single_include/clara.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/share/clara RENAME copyright) +vcpkg_copy_pdbs() \ No newline at end of file diff --git a/externals/vcpkg/ports/clara/vcpkg.json b/externals/vcpkg/ports/clara/vcpkg.json new file mode 100755 index 000000000..7752fb520 --- /dev/null +++ b/externals/vcpkg/ports/clara/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "clara", + "version-string": "1.1.5", + "port-version": 1, + "description": "A simple to use command line parser for C++", + "homepage": "https://github.com/philsquared/Clara" +} diff --git a/externals/vcpkg/ports/clblas/Fix-BuildDLL.patch b/externals/vcpkg/ports/clblas/Fix-BuildDLL.patch new file mode 100755 index 000000000..f717c28dc --- /dev/null +++ b/externals/vcpkg/ports/clblas/Fix-BuildDLL.patch @@ -0,0 +1,16 @@ +diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt +index f2d5a88..8f84133 100644 +--- a/src/library/CMakeLists.txt ++++ b/src/library/CMakeLists.txt +@@ -910,11 +910,6 @@ endif( ) + + include( InstallRequiredSystemLibraries ) + +-# Install necessary runtime files for debug builds +-install( PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} +- CONFIGURATIONS Debug +- DESTINATION ${CLBLAS_RUNTIME_DESTINATION} ) +- + # Install all *.pdb files for debug builds + install( DIRECTORY ${PROJECT_BINARY_DIR}/staging/ + DESTINATION ${CLBLAS_RUNTIME_DESTINATION} diff --git a/externals/vcpkg/ports/clblas/cmake.patch b/externals/vcpkg/ports/clblas/cmake.patch new file mode 100755 index 000000000..ebe2c0e85 --- /dev/null +++ b/externals/vcpkg/ports/clblas/cmake.patch @@ -0,0 +1,36 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 6a88c41..05b8029 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -276,6 +276,9 @@ endif() + + # This will define OPENCL_FOUND + find_package( OpenCL ${OPENCL_VERSION} ) ++set( OPENCL_FOUND ${OpenCL_FOUND}) ++set( OPENCL_LIBRARIES ${OpenCL_LIBRARIES} ) ++set( OPENCL_INCLUDE_DIRS ${OpenCL_INCLUDE_DIRS} ) + + # Find Boost on the system, and configure the type of boost build we want + set( Boost_USE_MULTITHREADED ON ) +diff --git a/src/clBLASConfig.cmake.in b/src/clBLASConfig.cmake.in +index f52d1d6..464feca 100644 +--- a/src/clBLASConfig.cmake.in ++++ b/src/clBLASConfig.cmake.in +@@ -1,3 +1,3 @@ + include(${CMAKE_CURRENT_LIST_DIR}/clBLASTargets.cmake) +-get_filename_component(CLBLAS_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/@reldir@/include ABSOLUTE) ++get_filename_component(CLBLAS_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/@reldir@/../include ABSOLUTE) + set(CLBLAS_LIBRARIES clBLAS) +diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt +index 5164898..f2d5a88 100644 +--- a/src/library/CMakeLists.txt ++++ b/src/library/CMakeLists.txt +@@ -894,7 +894,7 @@ install( TARGETS clBLAS + EXPORT Library + RUNTIME DESTINATION bin${SUFFIX_BIN} + LIBRARY DESTINATION lib${SUFFIX_LIB} +- ARCHIVE DESTINATION lib${SUFFIX_LIB}/import ++ ARCHIVE DESTINATION lib${SUFFIX_LIB} + ) + + # For debug builds, include the debug runtimes into the package for testing on non-developer machines diff --git a/externals/vcpkg/ports/clblas/portfile.cmake b/externals/vcpkg/ports/clblas/portfile.cmake new file mode 100755 index 000000000..b173c90bd --- /dev/null +++ b/externals/vcpkg/ports/clblas/portfile.cmake @@ -0,0 +1,50 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO clMathLibraries/clBLAS + REF v2.12 + SHA512 5d9b0c58adde69e83d95e9c713e0cdc5f64785fe7e05553a14c57fa483c4ef39e9dc780c26880a7f15924967d5ce4ea29035c29d63eac7ee5a2ae5ddacac2b72 + HEAD_REF master + PATCHES + cmake.patch + Fix-BuildDLL.patch +) + +# v2.12 has a very old FindOpenCL.cmake using OPENCL_ vs. OpenCL_ var names +# conflicting with the built-in, more modern FindOpenCL.cmake +file(REMOVE "${SOURCE_PATH}/src/FindOpenCL.cmake") + +vcpkg_find_acquire_program(PYTHON3) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/src" + OPTIONS + -DBUILD_TEST=OFF + -DBUILD_KTEST=OFF + -DSUFFIX_LIB= + -DPYTHON_EXECUTABLE=${PYTHON3} +) + +vcpkg_cmake_install() +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_TARGET_IS_WINDOWS) + file(REMOVE + "${CURRENT_PACKAGES_DIR}/debug/bin/clBLAS-tune.pdb" + "${CURRENT_PACKAGES_DIR}/debug/bin/clBLAS-tune.exe" + "${CURRENT_PACKAGES_DIR}/bin/clBLAS-tune.exe" + ) +endif() + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) +else() + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/clBLAS) +endif() + +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/clblas" RENAME copyright) diff --git a/externals/vcpkg/ports/clblas/vcpkg.json b/externals/vcpkg/ports/clblas/vcpkg.json new file mode 100755 index 000000000..ee4c8bf76 --- /dev/null +++ b/externals/vcpkg/ports/clblas/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "clblas", + "version": "2.12", + "port-version": 6, + "description": "clBLAS is an OpenCL 1.2 accelerated BLAS (Basic Linear Algebra Subsystem) library.", + "dependencies": [ + "opencl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/clblast/portfile.cmake b/externals/vcpkg/ports/clblast/portfile.cmake new file mode 100755 index 000000000..74e7e3d4b --- /dev/null +++ b/externals/vcpkg/ports/clblast/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO CNugteren/CLBlast + REF 1.5.2 + SHA512 6693704321bb7623a632ebfc71dcf07bbe4ba6c6f03a2ecf52bc10b401ae546bf82cdd3f6cc28aa9ea10f40dc7b2e86a6530f32cfbd522e24d4cf6a75c8c1100 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DTUNERS=OFF +) + +vcpkg_cmake_install() + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/clblast.dll" "${CURRENT_PACKAGES_DIR}/bin/clblast.dll") + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/clblast.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/clblast.dll") + endif() +endif() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CLBLast) +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/clblast/vcpkg.json b/externals/vcpkg/ports/clblast/vcpkg.json new file mode 100755 index 000000000..bc77f3498 --- /dev/null +++ b/externals/vcpkg/ports/clblast/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "clblast", + "version": "1.5.2", + "port-version": 2, + "description": "A modern, lightweight, performant and tunable OpenCL BLAS library written in C++11.", + "homepage": "https://github.com/CNugteren/CLBlast", + "license": "Apache-2.0", + "dependencies": [ + "opencl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/clfft/portfile.cmake b/externals/vcpkg/ports/clfft/portfile.cmake new file mode 100755 index 000000000..bd52b1230 --- /dev/null +++ b/externals/vcpkg/ports/clfft/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO clMathLibraries/clFFT + REF v2.12.2 + SHA512 19e9a4e06f76ae7c7808d1188677d5553c43598886a75328b7801ab2ca68e35206839a58fe2f958a44a6f7c83284dc9461cd0e21c37d1042bf82e24aad066be8 + HEAD_REF master + PATCHES + tweak-install.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/src" + OPTIONS + -DBUILD_LOADLIBRARIES=OFF + -DBUILD_EXAMPLES=OFF + -DSUFFIX_LIB= +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) +else() + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/clFFT) +endif() + +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/clfft/tweak-install.patch b/externals/vcpkg/ports/clfft/tweak-install.patch new file mode 100755 index 000000000..45952032f --- /dev/null +++ b/externals/vcpkg/ports/clfft/tweak-install.patch @@ -0,0 +1,28 @@ +diff --git a/src/clFFTConfig.cmake.in b/src/clFFTConfig.cmake.in +index 5b58c35..ee749a2 100644 +--- a/src/clFFTConfig.cmake.in ++++ b/src/clFFTConfig.cmake.in +@@ -1,3 +1,3 @@ + include(${CMAKE_CURRENT_LIST_DIR}/clFFTTargets.cmake) +-get_filename_component(CLFFT_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/@reldir@/include ABSOLUTE) ++get_filename_component(CLFFT_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/@reldir@/../include ABSOLUTE) + set(CLFFT_LIBRARIES clFFT) +diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt +index 132ef86..12ba905 100644 +--- a/src/library/CMakeLists.txt ++++ b/src/library/CMakeLists.txt +@@ -90,6 +90,7 @@ target_link_libraries( clFFT ${OPENCL_LIBRARIES} ${CMAKE_DL_LIBS} ) + set_target_properties( clFFT PROPERTIES VERSION ${CLFFT_VERSION} ) + set_target_properties( clFFT PROPERTIES SOVERSION ${CLFFT_SOVERSION} ) + set_target_properties( clFFT PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" ) ++set_target_properties( clFFT PROPERTIES INTERFACE_INCLUDE_DIRECTORIES $ ) + + if( CMAKE_COMPILER_IS_GNUCC ) + configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/clFFT.pc.in +@@ -104,5 +105,5 @@ install( TARGETS clFFT + EXPORT Library + RUNTIME DESTINATION bin${SUFFIX_BIN} + LIBRARY DESTINATION lib${SUFFIX_LIB} +- ARCHIVE DESTINATION lib${SUFFIX_LIB}/import ++ ARCHIVE DESTINATION lib${SUFFIX_LIB} + ) diff --git a/externals/vcpkg/ports/clfft/vcpkg.json b/externals/vcpkg/ports/clfft/vcpkg.json new file mode 100755 index 000000000..15886ab2f --- /dev/null +++ b/externals/vcpkg/ports/clfft/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "clfft", + "version": "2.12.2", + "port-version": 5, + "description": "clFFT is an OpenCL 1.2 accelerated Fast Fourier Transform library.", + "homepage": "https://github.com/clMathLibraries/clFFT", + "license": "Apache-2.0", + "dependencies": [ + "opencl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/cli/portfile.cmake b/externals/vcpkg/ports/cli/portfile.cmake new file mode 100755 index 000000000..0ab65b1a9 --- /dev/null +++ b/externals/vcpkg/ports/cli/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO daniele77/cli + REF v2.0.1 + SHA512 cf91512bb960ead60b7a2a021e3851b998a2228f482a1a7921acb3e2ab4ff10e542c6c910997326b3e059cef7509223ec34077ce545d9af29d8903e8fecfd5ac + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cli) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/cli/vcpkg.json b/externals/vcpkg/ports/cli/vcpkg.json new file mode 100755 index 000000000..472af76a5 --- /dev/null +++ b/externals/vcpkg/ports/cli/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "cli", + "version": "2.0.1", + "description": "A library for interactive command line interfaces in modern C++", + "homepage": "https://github.com/daniele77/cli", + "license": "BSL-1.0", + "dependencies": [ + "boost-asio", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/cli11/portfile.cmake b/externals/vcpkg/ports/cli11/portfile.cmake new file mode 100755 index 000000000..1e34f3e0c --- /dev/null +++ b/externals/vcpkg/ports/cli11/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO CLIUtils/CLI11 + REF v2.2.0 + SHA512 ee8994c99dd8119e612be0339252b863d6db9d85a10c15a6e60e56c6f387bbefaf479679bc85aed2cb6539aeb82b3e7543673a5b97eb04b61793b6946582241d + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCLI11_BUILD_EXAMPLES=OFF + -DCLI11_BUILD_DOCS=OFF + -DCLI11_BUILD_TESTS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/CLI11) +vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/cli11/vcpkg.json b/externals/vcpkg/ports/cli11/vcpkg.json new file mode 100755 index 000000000..339a2931a --- /dev/null +++ b/externals/vcpkg/ports/cli11/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "cli11", + "version": "2.2.0", + "description": "CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface.", + "homepage": "https://github.com/CLIUtils/CLI11", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/clickhouse-cpp/fix-error-C4996.patch b/externals/vcpkg/ports/clickhouse-cpp/fix-error-C4996.patch new file mode 100755 index 000000000..8da054b57 --- /dev/null +++ b/externals/vcpkg/ports/clickhouse-cpp/fix-error-C4996.patch @@ -0,0 +1,15 @@ +diff --git a/clickhouse/CMakeLists.txt b/clickhouse/CMakeLists.txt +index 7e10ffd..cbbffdc 100644 +--- a/clickhouse/CMakeLists.txt ++++ b/clickhouse/CMakeLists.txt +@@ -31,6 +31,10 @@ SET ( clickhouse-cpp-lib-src + query.cpp + ) + ++if (MSVC) ++ add_compile_options(/wd4996) ++endif() ++ + ADD_LIBRARY (clickhouse-cpp-lib SHARED ${clickhouse-cpp-lib-src}) + SET_TARGET_PROPERTIES(clickhouse-cpp-lib PROPERTIES LINKER_LANGUAGE CXX) + TARGET_LINK_LIBRARIES (clickhouse-cpp-lib diff --git a/externals/vcpkg/ports/clickhouse-cpp/fix-error-c2668.patch b/externals/vcpkg/ports/clickhouse-cpp/fix-error-c2668.patch new file mode 100755 index 000000000..4ad1df953 --- /dev/null +++ b/externals/vcpkg/ports/clickhouse-cpp/fix-error-c2668.patch @@ -0,0 +1,13 @@ +diff --git a/clickhouse/columns/decimal.cpp b/clickhouse/columns/decimal.cpp +index 7334bb1..41d43b6 100644 +--- a/clickhouse/columns/decimal.cpp ++++ b/clickhouse/columns/decimal.cpp +@@ -27,7 +27,7 @@ inline bool mulOverflow(const Int128 & l, const T & r, Int128 * result) + + #else + template +-inline bool getSignBit(const T & v) ++inline bool getSignBit(const T & (long double v)) + { + return std::signbit(v); + } diff --git a/externals/vcpkg/ports/clickhouse-cpp/portfile.cmake b/externals/vcpkg/ports/clickhouse-cpp/portfile.cmake new file mode 100755 index 000000000..5837fb88f --- /dev/null +++ b/externals/vcpkg/ports/clickhouse-cpp/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ClickHouse/clickhouse-cpp + REF 1415b5936a2ac2f084850b09057e05fb5798b2f1 #v1.5.0 + SHA512 222b31b16744af64f0a874ec956568adcecb553e43f8d4a2d16c00d55b31015d917a4dc7bb30d5430a894459b1be5e05b292e2d0918bf6f5609046a60539f80f + HEAD_REF master + PATCHES + fix-error-c2668.patch + fix-error-C4996.patch #fix x64-uwp error:std::uncaught_exception() is deprecated in C++17 +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/clickhouse-cpp/vcpkg.json b/externals/vcpkg/ports/clickhouse-cpp/vcpkg.json new file mode 100755 index 000000000..e3a5b37f1 --- /dev/null +++ b/externals/vcpkg/ports/clickhouse-cpp/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "clickhouse-cpp", + "version": "1.5.0", + "description": "C++ client for Yandex ClickHouse", + "homepage": "https://github.com/ClickHouse/clickhouse-cpp", + "dependencies": [ + "cityhash", + "lz4", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/clipboardxx/portfile.cmake b/externals/vcpkg/ports/clipboardxx/portfile.cmake new file mode 100755 index 000000000..fa06e40cf --- /dev/null +++ b/externals/vcpkg/ports/clipboardxx/portfile.cmake @@ -0,0 +1,24 @@ +# Download the code from GitHub +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Arian8j2/ClipboardXX + REF d404c39ba384f8e16555610b3633cd7b58d84c59 + SHA512 503bc78cd9fd6096fa92524973d19cbc9169fca91450837a2af7f1518eb928dce10c01e446de1ab76ae0dc366b26831df403f021118fe5c3c2eaeb4d752f638f + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +configure_file( + "${CMAKE_CURRENT_LIST_DIR}/unofficial-clipboardxx-config.cmake.in" + "${CURRENT_PACKAGES_DIR}/share/unofficial-clipboardxx/unofficial-clipboardxx-config.cmake" + @ONLY +) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/clipboardxx/unofficial-clipboardxx-config.cmake.in b/externals/vcpkg/ports/clipboardxx/unofficial-clipboardxx-config.cmake.in new file mode 100755 index 000000000..80e258e85 --- /dev/null +++ b/externals/vcpkg/ports/clipboardxx/unofficial-clipboardxx-config.cmake.in @@ -0,0 +1,19 @@ +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +if(_IMPORT_PREFIX STREQUAL "/") + set(_IMPORT_PREFIX "") +endif() + +add_library(unofficial::ClipboardXX INTERFACE IMPORTED) +set_target_properties(unofficial::ClipboardXX PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${PACKAGE_PREFIX_DIR}/include" +) + +if("@VCPKG_TARGET_IS_LINUX@") + set_target_properties(unofficial::ClipboardXX PROPERTIES + INTERFACE_LINK_LIBRARIES "xcb;pthread" + ) +endif() + +unset(_IMPORT_PREFIX) diff --git a/externals/vcpkg/ports/clipboardxx/vcpkg.json b/externals/vcpkg/ports/clipboardxx/vcpkg.json new file mode 100755 index 000000000..d274c9070 --- /dev/null +++ b/externals/vcpkg/ports/clipboardxx/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "clipboardxx", + "version-date": "2022-02-04", + "description": "Header only, lightweight and cross platform C++ library for copy and paste text from clipboard.", + "homepage": "https://github.com/Arian8j2/ClipboardXX", + "license": "MIT", + "supports": "!osx", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/clipp/portfile.cmake b/externals/vcpkg/ports/clipp/portfile.cmake new file mode 100755 index 000000000..4793be823 --- /dev/null +++ b/externals/vcpkg/ports/clipp/portfile.cmake @@ -0,0 +1,17 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "muellan/clipp" + REF 2c32b2f1f7cc530b1ec1f62c92f698643bb368db + SHA512 4645fafe85a8099ea97b85e939747a12e9b3b92213b5b8207a9c277537377b77b5daebd88a4c090ea89cfff2937a9fc155da6e8b5558574d7129227c28826e1c + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/clipp RENAME copyright) diff --git a/externals/vcpkg/ports/clipp/vcpkg.json b/externals/vcpkg/ports/clipp/vcpkg.json new file mode 100755 index 000000000..e5fc0850c --- /dev/null +++ b/externals/vcpkg/ports/clipp/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "clipp", + "version-string": "2019-04-30", + "port-version": 1, + "description": "command line interfaces for modern C++" +} diff --git a/externals/vcpkg/ports/clockutils/fix-warningC4643.patch b/externals/vcpkg/ports/clockutils/fix-warningC4643.patch new file mode 100755 index 000000000..49bc32386 --- /dev/null +++ b/externals/vcpkg/ports/clockutils/fix-warningC4643.patch @@ -0,0 +1,29 @@ +diff --git a/include/clockUtils/sockets/TcpSocket.h b/include/clockUtils/sockets/TcpSocket.h +index 6e0d9c8..3bb97a9 100644 +--- a/include/clockUtils/sockets/TcpSocket.h ++++ b/include/clockUtils/sockets/TcpSocket.h +@@ -57,9 +57,6 @@ + #define INVALID_SOCKET -1 + #endif + +-namespace std { +- class thread; +-} /* namespace std */ + namespace clockUtils { + enum class ClockError; + namespace sockets { +diff --git a/include/clockUtils/sockets/UdpSocket.h b/include/clockUtils/sockets/UdpSocket.h +index 31eeeb5..c5da451 100644 +--- a/include/clockUtils/sockets/UdpSocket.h ++++ b/include/clockUtils/sockets/UdpSocket.h +@@ -60,10 +60,6 @@ + #define INVALID_SOCKET -1 + #endif + +-namespace std { +- class thread; +-} /* namespace std */ +- + namespace clockUtils { + enum class ClockError; + namespace sockets { diff --git a/externals/vcpkg/ports/clockutils/portfile.cmake b/externals/vcpkg/ports/clockutils/portfile.cmake new file mode 100755 index 000000000..d3c42fef1 --- /dev/null +++ b/externals/vcpkg/ports/clockutils/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ClockworkOrigins/clockUtils + REF 3651f232c27074c4ceead169e223edf5f00247c5 + SHA512 ddb70cae9ced25de77a2df1854dac15e58a77347042ba3ee9c691f85f49edbc6539c84929a7477d429fb9161ba24c57d24d767793b8b1180216d5ddfc5d3ed6a + HEAD_REF dev-1.2 + PATCHES + fix-warningC4643.patch +) + +set(SHARED_FLAG OFF) +set(USE_MSBUILD "") +if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "dynamic") + set(SHARED_FLAG ON) + set(USE_MSBUILD WINDOWS_USE_MSBUILD) # MS Build only required for dynamic builds +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + ${USE_MSBUILD} + OPTIONS + -DWITH_LIBRARY_ARGPARSER=ON + -DWITH_LIBRARY_COMPRESSION=ON + -DWITH_LIBRARY_CONTAINER=ON + -DWITH_LIBRARY_INIPARSER=ON + -DWITH_LIBRARY_SOCKETS=ON + -DWITH_TESTING=OFF + -DCLOCKUTILS_BUILD_SHARED=${SHARED_FLAG} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/clockutils/vcpkg.json b/externals/vcpkg/ports/clockutils/vcpkg.json new file mode 100755 index 000000000..1939b6aa8 --- /dev/null +++ b/externals/vcpkg/ports/clockutils/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "clockutils", + "version": "1.1.1", + "port-version": 1, + "description": "A lightweight c++ library for commonly needed tasks. Optimized for simplicity and speed.", + "homepage": "https://github.com/ClockworkOrigins/clockUtils", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/clp/CMakeLists.txt b/externals/vcpkg/ports/clp/CMakeLists.txt new file mode 100755 index 000000000..cced65c98 --- /dev/null +++ b/externals/vcpkg/ports/clp/CMakeLists.txt @@ -0,0 +1,121 @@ +cmake_minimum_required(VERSION 3.11) + +project(Clp LANGUAGES C CXX) + +set(PROJECT_VERSION 1.16.11) +set(PROJECT_VERSION_MAJOR 1) +set(PROJECT_VERSION_MINOR 16) +set(PROJECT_VERSION_PATCH 11) + +set(CMAKE_CXX_STANDARD 14) + +set(INSTALL_BIN_DIR "bin" CACHE PATH "Path where exe and dll will be installed") +set(INSTALL_LIB_DIR "lib" CACHE PATH "Path where lib will be installed") +set(INSTALL_INCLUDE_DIR "include/Coin" CACHE PATH "Path where headers will be installed") +set(INSTALL_CMAKE_DIR "share/clp" CACHE PATH "Path where cmake configs will be installed") + +# Make relative paths absolute (needed later on) +set(RELATIVE_INSTALL_INCLUDE_DIR ${INSTALL_INCLUDE_DIR}) +foreach(p LIB BIN INCLUDE CMAKE) + set(var INSTALL_${p}_DIR) + if(NOT IS_ABSOLUTE "${${var}}") + set(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}") + endif() +endforeach() + +if(MSVC) + set( + CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} /bigobj /MP /wd4996 /wd4819 /wd4251 /wd4267 /wd4244 /wd4275" + ) +endif() + +if(APPLE) + set( + CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override -Wno-unused-command-line-argument -Wno-unused-result -Wno-exceptions" + ) + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" + CACHE STRING "Minimum OS X deployment version") +endif() + +find_package(CoinUtils REQUIRED) +find_package(Osi REQUIRED) + +file(GLOB CLP_SOURCES + Clp/src/*.hpp + Clp/src/*.cpp + Clp/src/OsiClp/*.hpp + Clp/src/OsiClp/*.cpp) +file(GLOB CLP_REMOVE + Clp/src/ClpCholeskyMumps.cpp + Clp/src/ClpCholeskyUfl.cpp + Clp/src/ClpCholeskyWssmp.cpp + Clp/src/ClpCholeskyWssmpKKT.cpp + Clp/src/ClpMain.cpp + Clp/src/*Abc*.cpp + Clp/src/ClpCholeskyMumps.hpp + Clp/src/ClpCholeskyUfl.hpp + Clp/src/ClpCholeskyWssmp.hpp + Clp/src/ClpCholeskyWssmpKKT.hpp + Clp/src/ClpMain.hpp + Clp/src/*Abc*.hpp + Clp/src/*Abc*.h) +list(REMOVE_ITEM CLP_SOURCES ${CLP_REMOVE}) + +add_library(${PROJECT_NAME} ${CLP_SOURCES}) + +target_include_directories(${PROJECT_NAME} + PUBLIC + $ + $ + $) + +if(MSVC) + target_compile_definitions(${PROJECT_NAME} PRIVATE _CRT_SECURE_NO_WARNINGS) +endif() +target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_CMATH) +target_compile_definitions(${PROJECT_NAME} PUBLIC COIN_HAS_CLP) + +target_link_libraries(${PROJECT_NAME} PRIVATE Coin::CoinUtils Coin::Osi) + +install(DIRECTORY Clp/src/ + DESTINATION ${INSTALL_INCLUDE_DIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN "*.hpp" + PATTERN "config_default.h" EXCLUDE) + +install(DIRECTORY Clp/src/OsiClp/ + DESTINATION ${INSTALL_INCLUDE_DIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN "*.hpp" + PATTERN "config_default.h" EXCLUDE) + +install(TARGETS ${PROJECT_NAME} + EXPORT "${PROJECT_NAME}Targets" + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin) + +include(CMakePackageConfigHelpers) + +set(version_config "${CMAKE_CURRENT_BINARY_DIR}/temp/${PROJECT_NAME}ConfigVersion.cmake") +set(project_config "${CMAKE_CURRENT_BINARY_DIR}/temp/${PROJECT_NAME}Config.cmake") +set(namespace "Coin::") + +write_basic_package_version_file("${version_config}" + COMPATIBILITY SameMajorVersion) + +configure_package_config_file("Config.cmake.in" + "${project_config}" + INSTALL_DESTINATION + "${INSTALL_CMAKE_DIR}") + +install(FILES "${project_config}" "${version_config}" + DESTINATION "${INSTALL_CMAKE_DIR}") + +install(EXPORT "${PROJECT_NAME}Targets" + NAMESPACE "${namespace}" + DESTINATION "${INSTALL_CMAKE_DIR}") diff --git a/externals/vcpkg/ports/clp/Config.cmake.in b/externals/vcpkg/ports/clp/Config.cmake.in new file mode 100755 index 000000000..2c12f83f0 --- /dev/null +++ b/externals/vcpkg/ports/clp/Config.cmake.in @@ -0,0 +1,5 @@ + +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") +check_required_components("@PROJECT_NAME@") diff --git a/externals/vcpkg/ports/clp/portfile.cmake b/externals/vcpkg/ports/clp/portfile.cmake new file mode 100755 index 000000000..055ceea18 --- /dev/null +++ b/externals/vcpkg/ports/clp/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO coin-or/Clp + REF 756ddd3ed813eb1fa8b2d1b4fe813e6a4d7aa1eb # releases/1.17.6 + SHA512 579f6f47a4878ce82b69474880ef0796893279a8dac6e40feb7c29c5249180704c9b7a6443e717190b85811af3f1768d097511de2aa99396f725d6d02eb1a621 +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/clp RENAME copyright) diff --git a/externals/vcpkg/ports/clp/vcpkg.json b/externals/vcpkg/ports/clp/vcpkg.json new file mode 100755 index 000000000..7e598d199 --- /dev/null +++ b/externals/vcpkg/ports/clp/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "clp", + "version-string": "1.17.6", + "port-version": 1, + "description": "Clp (Coin-or linear programming) is an open-source linear programming solver written in C++. It is primarily meant to be used as a callable library, but a basic, stand-alone executable version is also available.", + "dependencies": [ + "coinutils", + "osi" + ] +} diff --git a/externals/vcpkg/ports/clrng/001-build-fixup.patch b/externals/vcpkg/ports/clrng/001-build-fixup.patch new file mode 100755 index 000000000..4bdd727ee --- /dev/null +++ b/externals/vcpkg/ports/clrng/001-build-fixup.patch @@ -0,0 +1,124 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 65f51db..f010bb8 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -31,7 +31,7 @@ + # ######################################################################## + + +-cmake_minimum_required( VERSION 2.8.10 ) ++cmake_minimum_required( VERSION 3.0 ) + + if( CMAKE_GENERATOR MATCHES "NMake" ) + option( NMAKE_COMPILE_VERBOSE "Print compile and link strings to the console" OFF ) +@@ -127,7 +127,6 @@ if( BUILD64 ) + set_property( GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE ) + message( STATUS "64bit build - FIND_LIBRARY_USE_LIB64_PATHS TRUE" ) + +- set( SUFFIX_LIB_DEFAULT "64" ) + else( ) + set_property( GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE ) + message( STATUS "32bit build - FIND_LIBRARY_USE_LIB64_PATHS FALSE" ) +@@ -161,7 +160,8 @@ set( SUFFIX_BIN ${SUFFIX_BIN_DEFAULT} CACHE STRING "String to append to 'bin' in + #endif( ) + + # This will define OPENCL_FOUND +-find_package( OpenCL ) ++find_package( OpenCL REQUIRED ) ++find_package( Threads REQUIRED ) + + if( (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_LESS 2.8) ) + message( STATUS "Cmake version 2.8 or greater needed to use GTest" ) +@@ -170,7 +170,7 @@ else() + find_package( GTest ) + + # Hack to get googletest v1.6 to work with vs2012 +- if( MSVC11 ) ++ if( 0 ) + add_definitions( "/D_VARIADIC_MAX=10" ) + endif( ) + endif() +@@ -196,7 +196,7 @@ get_filename_component( C_COMPILER_NAME ${CMAKE_C_COMPILER} NAME_WE ) + # message( "CMAKE_C_COMPILER: " ${CMAKE_C_COMPILER} ) + + # Set common compile and link options +-if( MSVC ) ++if( 0 ) + # Following options for nMake + message( STATUS "Detected MSVS Ver: " ${MSVC_VERSION} ) + +@@ -206,6 +206,7 @@ if( MSVC ) + string( REGEX REPLACE "/STACK:[0-9]+" "" CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}" ) + + elseif( CMAKE_COMPILER_IS_GNUCXX ) ++ if( 0 ) + message( STATUS "Detected GNU fortran compiler." ) + EXEC_PROGRAM( ${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE vnum ) + STRING(REGEX REPLACE ".*([0-9])\\.([0-9])\\.([0-9]).*" "\\1\\2\\3" vnum ${vnum}) +@@ -216,6 +217,7 @@ elseif( CMAKE_COMPILER_IS_GNUCXX ) + + set( CMAKE_CXX_FLAGS "-pthread ${CMAKE_CXX_FLAGS}" ) + set( CMAKE_C_FLAGS "-std=c11 -Wall -pedantic-errors -pthread ${CMAKE_C_FLAGS}" ) ++ endif() + + if( BUILD64 ) + set( CMAKE_CXX_FLAGS "-m64 ${CMAKE_CXX_FLAGS}" ) +diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt +index dbe479d..8717e58 100644 +--- a/src/library/CMakeLists.txt ++++ b/src/library/CMakeLists.txt +@@ -62,8 +62,6 @@ set( clRNG.Headers private.h + + set( clRNG.Files ${clRNG.Source} ${clRNG.Headers} ) + +-# Include standard OpenCL headers +-include_directories( ${OPENCL_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/include ../include ) + + if(BUILD_SHARED_LIBRARY) + add_library( clRNG SHARED ${clRNG.Files} ) +@@ -72,6 +70,15 @@ else() + endif() + target_link_libraries( clRNG ${OPENCL_LIBRARIES} ) + ++target_link_libraries( clRNG PUBLIC ++ OpenCL::OpenCL ++ Threads::Threads ++) ++target_include_directories( clRNG PUBLIC ++ $ ++ $ ++) ++ + set_target_properties( clRNG PROPERTIES VERSION ${CLRNG_VERSION} ) + set_target_properties( clRNG PROPERTIES SOVERSION ${CLRNG_SOVERSION} ) + set_target_properties( clRNG PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" ) +@@ -89,7 +96,7 @@ install( TARGETS clRNG + EXPORT clRNG-Targets + RUNTIME DESTINATION bin${SUFFIX_BIN} + LIBRARY DESTINATION lib${SUFFIX_LIB} +- ARCHIVE DESTINATION lib${SUFFIX_LIB}/import ++ ARCHIVE DESTINATION lib${SUFFIX_LIB} + ) + + # CMake config files for clRNG +@@ -139,9 +146,9 @@ endif( ) + include( InstallRequiredSystemLibraries ) + + # Install necessary runtime files for debug builds +-install( PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} +- CONFIGURATIONS Debug +- DESTINATION ${CLRNG_RUNTIME_DESTINATION} ) ++#install( PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} ++# CONFIGURATIONS Debug ++# DESTINATION ${CLRNG_RUNTIME_DESTINATION} ) + + # Install all *.pdb files for debug builds + install( DIRECTORY ${PROJECT_BINARY_DIR}/staging/ +@@ -152,6 +159,6 @@ install( DIRECTORY ${PROJECT_BINARY_DIR}/staging/ + + # Install a snapshot of the source as it was for this build; useful for the .pdb's + install( DIRECTORY ${PROJECT_SOURCE_DIR} +- DESTINATION ${CLRNG_RUNTIME_DESTINATION} ++ DESTINATION "." + OPTIONAL + CONFIGURATIONS Debug ) diff --git a/externals/vcpkg/ports/clrng/portfile.cmake b/externals/vcpkg/ports/clrng/portfile.cmake new file mode 100755 index 000000000..1c9fe2bb3 --- /dev/null +++ b/externals/vcpkg/ports/clrng/portfile.cmake @@ -0,0 +1,45 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO clMathLibraries/clRNG + REF 4a16519ddf52ee0a5f0b7e6288b0803b9019c13b + SHA512 28bda5d2a156e7394917f8c40bd1e8e7b52cf680abc0ef50c2650b1d546c0a1d0bd47ceeccce3cd7c79c90a15494c3d27829e153613a7d8e18267ce7262eeb6e + HEAD_REF master + PATCHES + 001-build-fixup.patch +) + +file(REMOVE ${SOURCE_PATH}/src/FindOpenCL.cmake) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND NOT VCPKG_CMAKE_SYSTEM_NAME) + set(R123_SSE_FLAG [[-DCMAKE_C_FLAGS="/DR123_USE_SSE=0"]]) +endif() + +# We only have x64 and x86 as valid archs, as arm64 fails fast +string(COMPARE EQUAL "${VCPKG_TARGET_ARCHITECTURE}" "x64" BUILD64) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBRARY) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/src" + OPTIONS + -DBUILD_SHARED_LIBRARY=${BUILD_SHARED_LIBRARY} + -DBUILD64=${BUILD64} + -DBUILD_TEST=OFF + -DBUILD_CLIENT=OFF + ${R123_SSE_FLAG} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file( + REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/clRNG) +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/clrng/vcpkg.json b/externals/vcpkg/ports/clrng/vcpkg.json new file mode 100755 index 000000000..9e90dccd0 --- /dev/null +++ b/externals/vcpkg/ports/clrng/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "clrng", + "version-date": "2020-12-01", + "port-version": 3, + "description": "clRNG is a library for uniform random number generation in OpenCL.", + "homepage": "https://github.com/clMathLibraries/clRNG", + "supports": "!arm64", + "dependencies": [ + "opencl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/clue/CMakeLists.txt b/externals/vcpkg/ports/clue/CMakeLists.txt new file mode 100755 index 000000000..da8afe69f --- /dev/null +++ b/externals/vcpkg/ports/clue/CMakeLists.txt @@ -0,0 +1,25 @@ +cmake_minimum_required(VERSION 3.5) + +project(clue VERSION 1.0.0 LANGUAGES CXX) + +option(CLUE_BUILD_TEST "Build tests for clue" OFF) +option(CLUE_BUILD_EXAMPLE "Build examples" OFF) + +include(GNUInstallDirs) +include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/clue.hpp") + +if(CLUE_BUILD_TEST) + file(GLOB TEST_SOURCES "tests/*.cpp") + add_executable(test_clue ${TEST_SOURCES}) + target_include_directories(test_clue PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/tests") + install(TARGETS test_clue + RUNTIME DESTINATION tools) +endif() + +if(CLUE_BUILD_EXAMPLE) + file(GLOB EXAMPLES "examples/*.cpp") + install(FILES ${EXAMPLES} DESTINATION examples) +endif() + +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/clue.hpp" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") +# end of file \ No newline at end of file diff --git a/externals/vcpkg/ports/clue/portfile.cmake b/externals/vcpkg/ports/clue/portfile.cmake new file mode 100755 index 000000000..3be585eb6 --- /dev/null +++ b/externals/vcpkg/ports/clue/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO martinmoene/clue + REF v1.0.0 + SHA512 A142EDD57753DA36687803332E81BD9D4413203F69F0055466219437C3385C593384DA2A3C6BC67B39EC7ED0C36854354F34C2AA2D4CE4F1D2B912546F4F46B2 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + test CLUE_BUILD_TEST +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/clue/vcpkg.json b/externals/vcpkg/ports/clue/vcpkg.json new file mode 100755 index 000000000..bed4f2fe6 --- /dev/null +++ b/externals/vcpkg/ports/clue/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "clue", + "version": "1.0.0", + "description": "clue is a C++03 header-only library to log messages with a severity and optional module identifier.", + "homepage": "https://github.com/martinmoene/clue", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "test": { + "description": "Build test" + } + } +} diff --git a/externals/vcpkg/ports/cmakerc/portfile.cmake b/externals/vcpkg/ports/cmakerc/portfile.cmake new file mode 100755 index 000000000..1a0d3ba55 --- /dev/null +++ b/externals/vcpkg/ports/cmakerc/portfile.cmake @@ -0,0 +1,14 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO vector-of-bool/cmrc + REF a64bea50c05594c8e7cf1f08e441bb9507742e2e + SHA512 134c358143bd43d38802c5b00b3f5cd6a0e4c7918659dd4cc6726a15048e11376e915889788d0dd6bbfe4c4057e18c9b5306c4e785ad16cb0f4cd1c5c4634f80 + HEAD_REF master +) + +file(INSTALL "${SOURCE_PATH}/CMakeRC.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME cmakerc-config.cmake) + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/cmakerc/vcpkg.json b/externals/vcpkg/ports/cmakerc/vcpkg.json new file mode 100755 index 000000000..39162213e --- /dev/null +++ b/externals/vcpkg/ports/cmakerc/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cmakerc", + "version-date": "2021-08-27", + "description": "A Resource Compiler in a Single CMake Script", + "homepage": "https://github.com/vector-of-bool/cmrc", + "license": "MIT" +} diff --git a/externals/vcpkg/ports/cmark/add-feature-tools.patch b/externals/vcpkg/ports/cmark/add-feature-tools.patch new file mode 100755 index 000000000..5410ff68b --- /dev/null +++ b/externals/vcpkg/ports/cmark/add-feature-tools.patch @@ -0,0 +1,54 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 3a78d0b..7065c89 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -52,6 +52,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmark_version.h.in + include(GNUInstallDirs) + include (GenerateExportHeader) + ++if (BUILD_TOOLS) + add_executable(${PROGRAM} ${PROGRAM_SOURCES}) + cmark_add_compile_options(${PROGRAM}) + set_target_properties(${PROGRAM} PROPERTIES +@@ -65,6 +66,7 @@ if (CMARK_STATIC) + elseif (CMARK_SHARED) + target_link_libraries(${PROGRAM} ${LIBRARY}) + endif() ++endif() + + # -fvisibility=hidden + set(CMAKE_C_VISIBILITY_PRESET hidden) +@@ -114,23 +116,30 @@ if (CMARK_STATIC) + list(APPEND CMARK_INSTALL ${STATICLIBRARY}) + endif() + +-if (MSVC) ++if (MSVC AND BUILD_TOOLS) + set_property(TARGET ${PROGRAM} + APPEND PROPERTY LINK_FLAGS /INCREMENTAL:NO) +-endif(MSVC) ++endif(MSVC AND BUILD_TOOLS) + + if(NOT MSVC OR CMAKE_HOST_SYSTEM_NAME STREQUAL Windows) + set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON) + include(InstallRequiredSystemLibraries) + endif() + +-install(TARGETS ${PROGRAM} ${CMARK_INSTALL} ++install(TARGETS ${CMARK_INSTALL} + EXPORT cmark-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) + ++if (BUILD_TOOLS) ++ install(TARGETS ${PROGRAM} ++ EXPORT cmark-targets ++ RUNTIME DESTINATION tools/cmark ++ ) ++endif() ++ + if(CMARK_SHARED OR CMARK_STATIC) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libcmark.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/libcmark.pc @ONLY) diff --git a/externals/vcpkg/ports/cmark/portfile.cmake b/externals/vcpkg/ports/cmark/portfile.cmake new file mode 100755 index 000000000..b263deaca --- /dev/null +++ b/externals/vcpkg/ports/cmark/portfile.cmake @@ -0,0 +1,48 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO commonmark/cmark + REF 977b128291c0cf6c5053cdcf2ac72e627f09c105 #0.30.1 + SHA512 ff8139fbb45549d6bea70e11c35ae1d8cf6108d0141688cc2b878afa6247147e0c15ac885e6ed8fa2263534dc79e88e398b30d3d3ae800f13dcdd878114adac8 + HEAD_REF master + PATCHES + add-feature-tools.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CMARK_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CMARK_SHARED) + +if ("tools" IN_LIST FEATURES AND VCPKG_TARGET_IS_UWP) + message(FATAL_ERROR "${PORT} does no support to build tools on UWP") +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} + -DCMARK_TESTS=OFF + -DCMARK_SHARED=${CMARK_SHARED} + -DCMARK_STATIC=${CMARK_STATIC} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cmark) + +vcpkg_fixup_pkgconfig() + +if ("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES cmark SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools/cmark" AUTO_CLEAN) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/cmark/vcpkg.json b/externals/vcpkg/ports/cmark/vcpkg.json new file mode 100755 index 000000000..bfb1999a6 --- /dev/null +++ b/externals/vcpkg/ports/cmark/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "cmark", + "version-semver": "0.30.1", + "description": "CommonMark parsing and rendering library", + "homepage": "https://github.com/commonmark/cmark", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "Build tools" + } + } +} diff --git a/externals/vcpkg/ports/cmcstl2/portfile.cmake b/externals/vcpkg/ports/cmcstl2/portfile.cmake new file mode 100755 index 000000000..d1e7125a5 --- /dev/null +++ b/externals/vcpkg/ports/cmcstl2/portfile.cmake @@ -0,0 +1,26 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO CaseyCarter/cmcstl2 + REF cca84b9fd362ea37334ccbe09a66be4121768ac9 + SHA512 a528dda26964a8c29f2bf7ddb24a861f337246e9ab2bda19f62d4ca107951aa77e37070623db3b5574973404ccf2f201bc2020654b3d53de36d8a22de521e5b9 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DSTL2_BUILD_EXAMPLES=OFF + -DSTL2_BUILD_TESTING=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/cmcstl2/vcpkg.json b/externals/vcpkg/ports/cmcstl2/vcpkg.json new file mode 100755 index 000000000..df0d6a2a5 --- /dev/null +++ b/externals/vcpkg/ports/cmcstl2/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cmcstl2", + "version-string": "2019-07-20", + "port-version": 1, + "description": "An implementation of C++ Extensions for Ranges", + "homepage": "https://github.com/CaseyCarter/cmcstl2" +} diff --git a/externals/vcpkg/ports/cminpack/portfile.cmake b/externals/vcpkg/ports/cminpack/portfile.cmake new file mode 100755 index 000000000..d01068df6 --- /dev/null +++ b/externals/vcpkg/ports/cminpack/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO devernay/cminpack + REF v1.3.8 + SHA512 0cab275074a31af69dbaf3ef6d41b20184c7cf9f33c78014a69ae7a022246fa79e7b4851341c6934ca1e749955b7e1096a40b4300a109ad64ebb1b2ea5d1d8ae +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF + -DCMINPACK_LIB_INSTALL_DIR=lib +) + +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/CopyrightMINPACK.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/cminpack/vcpkg.json b/externals/vcpkg/ports/cminpack/vcpkg.json new file mode 100755 index 000000000..aa37c1135 --- /dev/null +++ b/externals/vcpkg/ports/cminpack/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "cminpack", + "version": "1.3.8", + "port-version": 1, + "description": "A C/C++ rewrite of the MINPACK software (originally in FORTRAN) for solving nonlinear equations and nonlinear least squares problems", + "homepage": "http://devernay.free.fr/hacks/cminpack/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/cmocka/portfile.cmake b/externals/vcpkg/ports/cmocka/portfile.cmake new file mode 100755 index 000000000..53c9aee69 --- /dev/null +++ b/externals/vcpkg/ports/cmocka/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.com + OUT_SOURCE_PATH SOURCE_PATH + REPO cmocka/cmocka + REF 672c5cee79eb412025c3dd8b034e611c1f119055 + SHA512 e02ffe780698ce3930aceb1b927f7d48c932c6bb251a32b1f4ab44ecb4ff6bfe5c2a6b9e2dfede49cd4cc1d68a8bb903ef1d26c28536abf3581a9d803287aa0a + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DWITH_CMOCKERY_SUPPORT=ON + -DUNIT_TESTING=OFF + -DWITH_EXAMPLES=OFF + -DPICKY_DEVELOPER=OFF +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/cmocka/vcpkg.json b/externals/vcpkg/ports/cmocka/vcpkg.json new file mode 100755 index 000000000..8978acdb4 --- /dev/null +++ b/externals/vcpkg/ports/cmocka/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "cmocka", + "version-string": "2020-08-01", + "port-version": 1, + "description": "An elegant unit testing framework for C with support for mock objects", + "homepage": "https://cmocka.org/", + "license": "Apache-2.0" +} diff --git a/externals/vcpkg/ports/cnats/portfile.cmake b/externals/vcpkg/ports/cnats/portfile.cmake new file mode 100755 index 000000000..22bc7cd6c --- /dev/null +++ b/externals/vcpkg/ports/cnats/portfile.cmake @@ -0,0 +1,76 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nats-io/nats.c + REF v3.2.0 + SHA512 570bbd5b6ed25db17755f4cbd2df9449bf1f838450e29aaa1483c11e6131293490d302031e3039d710bbbc3563ce72fb72cd3ad2c98618977a4858a5a3f2abe3 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "streaming" NATS_BUILD_STREAMING +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + list(APPEND OPTIONS -DNATS_BUILD_LIB_SHARED=ON) + list(APPEND OPTIONS -DNATS_BUILD_LIB_STATIC=OFF) + list(APPEND OPTIONS -DBUILD_TESTING=OFF) + list(APPEND OPTIONS -DNATS_BUILD_USE_SODIUM=ON) +else() + list(APPEND OPTIONS -DNATS_BUILD_LIB_SHARED=OFF) + list(APPEND OPTIONS -DNATS_BUILD_LIB_STATIC=ON) + list(APPEND OPTIONS -DBUILD_TESTING=ON) + if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS -DNATS_BUILD_USE_SODIUM=OFF) + else() + list(APPEND OPTIONS -DNATS_BUILD_USE_SODIUM=ON) + endif() +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} + ${OPTIONS} + -DNATS_BUILD_TLS_USE_OPENSSL_1_1_API=ON + -DNATS_BUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install(ADD_BIN_TO_PATH) + +if(VCPKG_TARGET_IS_WINDOWS) + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/nats.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/nats.dll" "${CURRENT_PACKAGES_DIR}/bin/nats.dll") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/natsd.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/natsd.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/natsd.dll") + endif() + endif() +endif() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +if(VCPKG_TARGET_IS_WINDOWS) + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if(EXISTS "${CURRENT_PACKAGES_DIR}/share/cnats/cnats-config-debug.cmake") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/cnats/cnats-config-debug.cmake" + "\${_IMPORT_PREFIX}/debug/lib/natsd.dll" "\${_IMPORT_PREFIX}/debug/bin/natsd.dll") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/share/cnats/cnats-config-release.cmake") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/cnats/cnats-config-release.cmake" + "\${_IMPORT_PREFIX}/lib/nats.dll" "\${_IMPORT_PREFIX}/bin/nats.dll") + endif() + endif() +endif() + +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/externals/vcpkg/ports/cnats/vcpkg.json b/externals/vcpkg/ports/cnats/vcpkg.json new file mode 100755 index 000000000..8ea3c8113 --- /dev/null +++ b/externals/vcpkg/ports/cnats/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "cnats", + "version": "3.2.0", + "description": "A C client for the NATS messaging system", + "homepage": "https://github.com/nats-io/nats.c", + "license": "Apache-2.0", + "dependencies": [ + "libsodium", + "openssl", + "protobuf-c", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "streaming": { + "description": "Include NATS Streaming APIs in the NATS library", + "supports": "!windows" + } + } +} diff --git a/externals/vcpkg/ports/cnl/disable-test.patch b/externals/vcpkg/ports/cnl/disable-test.patch new file mode 100755 index 000000000..58ecad535 --- /dev/null +++ b/externals/vcpkg/ports/cnl/disable-test.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 73111fc..a0cb3db 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,8 +9,8 @@ project(cnl) + + cmake_minimum_required(VERSION 3.5.1) + +-include(CTest) +-add_subdirectory("test") ++# include(CTest) ++# add_subdirectory("test") + + # the CNL library + add_library(Cnl INTERFACE) diff --git a/externals/vcpkg/ports/cnl/portfile.cmake b/externals/vcpkg/ports/cnl/portfile.cmake new file mode 100755 index 000000000..13ba73275 --- /dev/null +++ b/externals/vcpkg/ports/cnl/portfile.cmake @@ -0,0 +1,24 @@ +# header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO johnmcfarlane/cnl + REF 2dde6e62e608a4adc3c5504f067575efa4910568 #v1.1.7 + SHA512 33a81ea726802c71a684bcd002b5119cde4db471ebc9ba02cd15c7487ab468eeca09fb8dcaed953e3f3cded2cd813a903f808d97527b0ec7f393647b64a22572 + HEAD_REF main + PATCHES + disable-test.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/cnl/vcpkg.json b/externals/vcpkg/ports/cnl/vcpkg.json new file mode 100755 index 000000000..930fcdeed --- /dev/null +++ b/externals/vcpkg/ports/cnl/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cnl", + "version-string": "1.1.7", + "port-version": 1, + "description": "A Compositional Numeric Library for C++", + "homepage": "https://github.com/johnmcfarlane/cnl" +} diff --git a/externals/vcpkg/ports/co/portfile.cmake b/externals/vcpkg/ports/co/portfile.cmake new file mode 100755 index 000000000..0015715fb --- /dev/null +++ b/externals/vcpkg/ports/co/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/externals/vcpkg/ports/co/vcpkg.json b/externals/vcpkg/ports/co/vcpkg.json new file mode 100755 index 000000000..6bbd68588 --- /dev/null +++ b/externals/vcpkg/ports/co/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "co", + "version-semver": "2.0.3", + "port-version": 1, + "description": "A go-style coroutine library in C++11 and more", + "homepage": "https://github.com/idealvin/cocoyaxi", + "supports": "!uwp & !(arm & windows)", + "dependencies": [ + "cocoyaxi" + ] +} diff --git a/externals/vcpkg/ports/cocoyaxi/fix-event-destruct.patch b/externals/vcpkg/ports/cocoyaxi/fix-event-destruct.patch new file mode 100755 index 000000000..b5abc57e7 --- /dev/null +++ b/externals/vcpkg/ports/cocoyaxi/fix-event-destruct.patch @@ -0,0 +1,13 @@ +diff --git a/src/co/co.cc b/src/co/co.cc +index 8921296..838ac16 100644 +--- a/src/co/co.cc ++++ b/src/co/co.cc +@@ -8,7 +8,7 @@ namespace co { + class EventImpl { + public: + EventImpl() : _counter(0), _signaled(false), _has_cond(false) {} +- ~EventImpl() { co::xx::cond_destroy(&_cond); } ++ ~EventImpl() { if (_has_cond) co::xx::cond_destroy(&_cond); } + + bool wait(uint32 ms); + diff --git a/externals/vcpkg/ports/cocoyaxi/install-dll.patch b/externals/vcpkg/ports/cocoyaxi/install-dll.patch new file mode 100755 index 000000000..9332f3296 --- /dev/null +++ b/externals/vcpkg/ports/cocoyaxi/install-dll.patch @@ -0,0 +1,10 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9e03c9a..499b550 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -112,4 +112,5 @@ install( + TARGETS co + LIBRARY DESTINATION lib # shared lib installed to ${CMAKE_INSTALL_PREFIX}/lib + ARCHIVE DESTINATION lib # static lib installed to ${CMAKE_INSTALL_PREFIX}/lib ++ RUNTIME DESTINATION bin + ) diff --git a/externals/vcpkg/ports/cocoyaxi/portfile.cmake b/externals/vcpkg/ports/cocoyaxi/portfile.cmake new file mode 100755 index 000000000..309011b71 --- /dev/null +++ b/externals/vcpkg/ports/cocoyaxi/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO idealvin/cocoyaxi + REF 3fd22601de4d7a06548ca4d24ac36b4f82cde8c5 #v2.0.3 + SHA512 15a7fbd934b44ffd981067c18a66bf07423d8ded102d0c15b79c2f451192f17541b9c1a3d4eb913d9f8c7a55e051e4e1968e16a1113fa81038b3ad9534c57874 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + libcurl WITH_LIBCURL + openssl WITH_OPENSSL +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DSTATIC_VS_CRT=${STATIC_CRT} + DISABLE_PARALLEL_CONFIGURE +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/cocoyaxi/vcpkg.json b/externals/vcpkg/ports/cocoyaxi/vcpkg.json new file mode 100755 index 000000000..37ecc51c7 --- /dev/null +++ b/externals/vcpkg/ports/cocoyaxi/vcpkg.json @@ -0,0 +1,34 @@ +{ + "name": "cocoyaxi", + "version-semver": "2.0.3", + "port-version": 2, + "description": "A go-style coroutine library in C++11 and more", + "homepage": "https://github.com/idealvin/cocoyaxi", + "supports": "!uwp & !(arm & windows)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "libcurl": { + "description": "libcurl with OpenSSL support", + "dependencies": [ + { + "name": "curl", + "default-features": false, + "features": [ + "openssl" + ] + } + ] + }, + "openssl": { + "description": "SSL support (OpenSSL)", + "dependencies": [ + "openssl" + ] + } + } +} diff --git a/externals/vcpkg/ports/coin/disable-cpackd.patch b/externals/vcpkg/ports/coin/disable-cpackd.patch new file mode 100755 index 000000000..81afeb668 --- /dev/null +++ b/externals/vcpkg/ports/coin/disable-cpackd.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f32f6ffe3..639fc4109 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -815,4 +815,4 @@ endif() + + # ############################################################################ + # New CPACK section, please see the README file inside cpack.d directory. +-add_subdirectory(cpack.d) ++#add_subdirectory(cpack.d) diff --git a/externals/vcpkg/ports/coin/portfile.cmake b/externals/vcpkg/ports/coin/portfile.cmake new file mode 100755 index 000000000..22f97663d --- /dev/null +++ b/externals/vcpkg/ports/coin/portfile.cmake @@ -0,0 +1,47 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Coin3D/coin + REF Coin-4.0.0 + SHA512 8a0289cab3e02a7417022fe659ec30a2dd705b9bacb254e0269ada9155c76c6aea0285c475cd6e663f5d7f2b49e60244b16baac7188d57e3d7f8ab08d228f21f + HEAD_REF master + PATCHES + disable-cpackd.patch +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(COIN_BUILD_SHARED_LIBS OFF) +else() + set(COIN_BUILD_SHARED_LIBS ON) +endif() + +if(VCPKG_CRT_LINKAGE STREQUAL dynamic) + set(COIN_BUILD_MSVC_STATIC_RUNTIME OFF) +elseif(VCPKG_CRT_LINKAGE STREQUAL static) + set(COIN_BUILD_MSVC_STATIC_RUNTIME ON) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCOIN_BUILD_DOCUMENTATION=OFF + -DCOIN_BUILD_MSVC_STATIC_RUNTIME=${COIN_BUILD_MSVC_STATIC_RUNTIME} + -DCOIN_BUILD_SHARED_LIBS=${COIN_BUILD_SHARED_LIBS} + -DCOIN_BUILD_TESTS=OFF +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Coin-4.0.0) + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/Coin/profiler) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/coin/vcpkg.json b/externals/vcpkg/ports/coin/vcpkg.json new file mode 100755 index 000000000..02430c765 --- /dev/null +++ b/externals/vcpkg/ports/coin/vcpkg.json @@ -0,0 +1,65 @@ +{ + "name": "coin", + "version-string": "4.0.0", + "port-version": 5, + "description": "A high-level 3D visualization library with Open Inventor 2.1 API", + "homepage": "https://github.com/coin3d/coin", + "supports": "!(arm | arm64 | uwp)", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-lexical-cast", + "boost-math", + "boost-smart-ptr", + "boost-static-assert", + "opengl-registry" + ], + "default-features": [ + "simage", + "zlib" + ], + "features": { + "bzip2": { + "description": "Support bzip2 compressed fonts", + "dependencies": [ + "bzip2", + { + "name": "freetype", + "features": [ + "bzip2" + ] + } + ] + }, + "fontconfig": { + "description": "Use fontconfig for font support", + "dependencies": [ + "fontconfig" + ] + }, + "freetype": { + "description": "Use freetype for font support", + "dependencies": [ + "freetype" + ] + }, + "openal": { + "description": "Use OpenAL for sound support in VRML97", + "dependencies": [ + "openal-soft" + ] + }, + "simage": { + "description": "Use simage for loading images (textures), audio, and animations", + "dependencies": [ + "simage" + ] + }, + "zlib": { + "description": "Use zlib for reading/writing compressed files", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/coinutils/CMakeLists.txt b/externals/vcpkg/ports/coinutils/CMakeLists.txt new file mode 100755 index 000000000..643bbec44 --- /dev/null +++ b/externals/vcpkg/ports/coinutils/CMakeLists.txt @@ -0,0 +1,95 @@ +cmake_minimum_required(VERSION 3.11) + +project(CoinUtils LANGUAGES C CXX) + +set(PROJECT_VERSION 2.10.14) +set(PROJECT_VERSION_MAJOR 2) +set(PROJECT_VERSION_MINOR 10) +set(PROJECT_VERSION_PATCH 14) + +set(CMAKE_CXX_STANDARD 14) + +set(INSTALL_BIN_DIR "bin" CACHE PATH "Path where exe and dll will be installed") +set(INSTALL_LIB_DIR "lib" CACHE PATH "Path where lib will be installed") +set(INSTALL_INCLUDE_DIR "include/Coin" CACHE PATH "Path where headers will be installed") +set(INSTALL_CMAKE_DIR "share/coinutils" CACHE PATH "Path where cmake configs will be installed") + +# Make relative paths absolute (needed later on) +set(RELATIVE_INSTALL_INCLUDE_DIR ${INSTALL_INCLUDE_DIR}) +foreach(p LIB BIN INCLUDE CMAKE) + set(var INSTALL_${p}_DIR) + if(NOT IS_ABSOLUTE "${${var}}") + set(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}") + endif() +endforeach() + +if(MSVC) + set( + CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} /bigobj /MP /wd4996 /wd4819 /wd4251 /wd4267 /wd4244 /wd4275" + ) +endif() + +if(APPLE) + set( + CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override -Wno-unused-command-line-argument -Wno-unused-result -Wno-exceptions" + ) + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" + CACHE STRING "Minimum OS X deployment version") +endif() + +include(CheckIncludeFileCXX) +include(CheckIncludeFile) +check_include_file_cxx("cmath" HAVE_CMATH) +check_include_file_cxx("cfloat" HAVE_CFLOAT) +if(NOT HAVE_CMATH OR NOT HAVE_CFLOAT) + message(FATAL_ERROR "Missing necessary include files, like cmath or cfloat") +endif() + +file(GLOB UTILS_SOURCES + CoinUtils/src/*.hpp + CoinUtils/src/*.cpp + CoinUtils/src/*.h) + +add_library(${PROJECT_NAME} ${UTILS_SOURCES}) + +target_include_directories(${PROJECT_NAME} PUBLIC $ $) + +if(MSVC) + target_compile_definitions(${PROJECT_NAME} PRIVATE _CRT_SECURE_NO_WARNINGS) +endif() +target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_CMATH HAVE_CFLOAT) + +install(DIRECTORY CoinUtils/src/ + DESTINATION ${INSTALL_INCLUDE_DIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN "*.hpp") + +install(TARGETS ${PROJECT_NAME} + EXPORT "${PROJECT_NAME}Targets" + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin) + +include(CMakePackageConfigHelpers) + +set(version_config "${CMAKE_CURRENT_BINARY_DIR}/temp/${PROJECT_NAME}ConfigVersion.cmake") +set(project_config "${CMAKE_CURRENT_BINARY_DIR}/temp/${PROJECT_NAME}Config.cmake") +set(namespace "Coin::") + +write_basic_package_version_file("${version_config}" + COMPATIBILITY SameMajorVersion) + +configure_package_config_file("Config.cmake.in" + "${project_config}" + INSTALL_DESTINATION + "${INSTALL_CMAKE_DIR}") + +install(FILES "${project_config}" "${version_config}" + DESTINATION "${INSTALL_CMAKE_DIR}") + +install(EXPORT "${PROJECT_NAME}Targets" + NAMESPACE "${namespace}" + DESTINATION "${INSTALL_CMAKE_DIR}") diff --git a/externals/vcpkg/ports/coinutils/Config.cmake.in b/externals/vcpkg/ports/coinutils/Config.cmake.in new file mode 100755 index 000000000..2c12f83f0 --- /dev/null +++ b/externals/vcpkg/ports/coinutils/Config.cmake.in @@ -0,0 +1,5 @@ + +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") +check_required_components("@PROJECT_NAME@") diff --git a/externals/vcpkg/ports/coinutils/portfile.cmake b/externals/vcpkg/ports/coinutils/portfile.cmake new file mode 100755 index 000000000..dc479dbd1 --- /dev/null +++ b/externals/vcpkg/ports/coinutils/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO coin-or/CoinUtils + REF f709081c9b57cc2dd32579d804b30689ca789982 # releases/2.11.4 + SHA512 1c2e7f796524d67d87253bc7938c1a6db3c8266acec6b6399aeb83c0fb253b77507e6b5e84f16b0b8e40098aef94676499f396d1c7f653b1e04cbadca7620185 +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/coinutils RENAME copyright) diff --git a/externals/vcpkg/ports/coinutils/vcpkg.json b/externals/vcpkg/ports/coinutils/vcpkg.json new file mode 100755 index 000000000..2f7144376 --- /dev/null +++ b/externals/vcpkg/ports/coinutils/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "coinutils", + "version-string": "2.11.4", + "port-version": 1, + "description": "CoinUtils (Coin-or Utilities) is an open-source collection of classes and functions that are generally useful to more than one COIN-OR project" +} diff --git a/externals/vcpkg/ports/collada-dom/fix-shared-keyword.patch b/externals/vcpkg/ports/collada-dom/fix-shared-keyword.patch new file mode 100755 index 000000000..1066622ad --- /dev/null +++ b/externals/vcpkg/ports/collada-dom/fix-shared-keyword.patch @@ -0,0 +1,13 @@ +diff --git a/dom/CMakeLists.txt b/dom/CMakeLists.txt +index 62e1b8a..7ff49b5 100644 +--- a/dom/CMakeLists.txt ++++ b/dom/CMakeLists.txt +@@ -28,7 +28,7 @@ if( OPT_COLLADA14 ) + install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/1.4 DESTINATION ${COLLADA_DOM_INCLUDE_INSTALL_DIR} COMPONENT ${COMPONENT_PREFIX}-dev PATTERN ".svn" EXCLUDE PATTERN ".~" EXCLUDE) + endif() + +-add_library(collada-dom SHARED ${COLLADA_BASE_SOURCES}) ++add_library(collada-dom ${COLLADA_BASE_SOURCES}) + target_link_libraries(collada-dom ${COLLADA_LIBS}) + set_target_properties(collada-dom PROPERTIES + COMPILE_FLAGS "${COLLADA_COMPILE_FLAGS}" diff --git a/externals/vcpkg/ports/collada-dom/portfile.cmake b/externals/vcpkg/ports/collada-dom/portfile.cmake new file mode 100755 index 000000000..a3deb51fd --- /dev/null +++ b/externals/vcpkg/ports/collada-dom/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rdiankov/collada-dom + REF d37ae7532e350b87c88712e9f6ab4b1f440d20cd + SHA512 cb923d296219765096f5246cc7a2b69712931f58171ae885dbdbd215fca86d911c34d12748d3304d6a5a350dc737ff0caead2495acac488af5431b437cbacc7d + HEAD_REF v2.5.0 + PATCHES + vs-version-detection.patch + use-uriparser.patch + use-vcpkg-minizip.patch + fix-shared-keyword.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/collada_dom-2.5) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/licenses/license_e.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/collada-dom/use-uriparser.patch b/externals/vcpkg/ports/collada-dom/use-uriparser.patch new file mode 100755 index 000000000..6de0662ef --- /dev/null +++ b/externals/vcpkg/ports/collada-dom/use-uriparser.patch @@ -0,0 +1,127 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3ec1527..3f044d3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -237,23 +237,29 @@ else() + set(MINIZIP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dom/external-libs/minizip-1.1 ${ZLIB_INCLUDE_DIR}) + endif() + +-pkg_check_modules(liburiparser liburiparser) +- +-if(liburiparser_FOUND) +- set(liburiparser_CFLAGS_OTHERS "-DUSE_URIPARSER") ++find_package(UriParser) ++if(URIPARSER_FOUND) ++ set(URIPARSER_CFLAGS_OTHERS "-DUSE_URIPARSER") ++ set(URIPARSER_LIBRARIES ${URIPARSER_LIBRARY}) ++ message(STATUS "liburiparser found") + else() +- # try using pcrecpp +- pkg_check_modules(libpcrecpp libpcrecpp) +- if( libpcrecpp_FOUND ) ++ pkg_check_modules(liburiparser liburiparser) ++ if(liburiparser_FOUND) ++ set(URIPARSER_CFLAGS_OTHERS "-DUSE_URIPARSER") ++ message(STATUS "liburiparser found") ++ else() ++ # try using pcrecpp ++ pkg_check_modules(libpcrecpp libpcrecpp) ++ if( libpcrecpp_FOUND ) + set(CMAKE_REQUIRED_INCLUDES ${libpcrecpp_INCLUDE_DIRS}) + check_include_file_cxx(pcrecpp.h HAVE_PCRECPP_H) + set(CMAKE_REQUIRED_INCLUDES) + if( NOT HAVE_PCRECPP_H ) +- set(libpcrecpp_FOUND 0) ++ set(libpcrecpp_FOUND 0) ++ endif() + endif() +- endif() + +- if( NOT libpcrecpp_FOUND ) ++ if( NOT libpcrecpp_FOUND ) + message(STATUS "System pcre not found, using local from sources") + # include the local pcre + add_subdirectory(dom/external-libs/pcre-8.02) +@@ -262,6 +268,7 @@ else() + set(libpcrecpp_LIBRARIES pcrecpp_local) + set(libpcrecpp_CFLAGS_OTHERS "-DPCRE_STATIC") + set(libpcrecpp_LDFLAGS_OTHERS) ++ endif() + endif() + endif() + +diff --git a/cmake-modules/FindUriParser.cmake b/cmake-modules/FindUriParser.cmake +new file mode 100644 +index 0000000..91f466b +--- /dev/null ++++ b/cmake-modules/FindUriParser.cmake +@@ -0,0 +1,35 @@ ++# Find the UriParser library ++# Defines: ++ ++# URIPARSER_INCLUDE_DIR - uriparser include directory ++# URIPARSER_LIBRARY - uriparser library file ++# URIPARSER_FOUND - TRUE if uriparser is found ++ ++if (URIPARSER_INCLUDE_DIR) ++ #check cache ++ set(URIPARSER_FIND_QUIETLY TRUE) ++endif () ++ ++if (NOT URIPARSER_INCLUDE_DIR) ++ find_path(URIPARSER_INCLUDE_DIR NAMES Uri.h PATH_SUFFIXES uriparser) ++ set(URIPARSER_INCLUDE_DIR ${URIPARSER_INCLUDE_DIR}/uriparser CACHE PATH "uriparser includes") ++endif () ++ ++find_library(URIPARSER_LIBRARY NAMES uriparser) ++ ++if (URIPARSER_INCLUDE_DIR AND URIPARSER_LIBRARY) ++ set(URIPARSER_FOUND TRUE) ++ set(UriParser_FOUND TRUE) ++endif () ++ ++if (URIPARSER_FOUND) ++ if (NOT URIPARSER_FIND_QUIETLY) ++ message(STATUS "Found UriParser library: ${URIPARSER_LIBRARY}") ++ endif () ++else () ++ if (NOT URIPARSER_FIND_QUIETLY) ++ message(FATAL_ERROR "Could NOT find UriParser library") ++ else () ++ message(STATUS "Could NOT find UriParser library") ++ endif () ++endif () +diff --git a/dom/CMakeLists.txt b/dom/CMakeLists.txt +index f7ffb27..62e1b8a 100644 +--- a/dom/CMakeLists.txt ++++ b/dom/CMakeLists.txt +@@ -1,6 +1,6 @@ + set(COLLADA_INTERNAL_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/include) + include_directories(${COLLADA_INTERNAL_INCLUDE}) +-set(COLLADA_LIBS minizip ${liburiparser_LIBRARIES} ${libpcrecpp_LIBRARIES} ${ZLIB_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}) ++set(COLLADA_LIBS minizip ${URIPARSER_LIBRARIES} ${libpcrecpp_LIBRARIES} ${ZLIB_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}) + + file(GLOB dae_files ${CMAKE_CURRENT_SOURCE_DIR}/src/dae/*.cpp) + if( LIBXML2_FOUND ) +@@ -13,7 +13,7 @@ file(GLOB stddatabase_files ${CMAKE_CURRENT_SOURCE_DIR}/src/modules/STLDatabase/ + file(GLOB stderrplugin_files ${CMAKE_CURRENT_SOURCE_DIR}/src/modules/stdErrPlugin/*.cpp) + + set(COLLADA_BASE_SOURCES ${dae_files} ${libxmlplugin_files} ${stddatabase_files} ${stderrplugin_files}) +-set(COLLADA_COMPILE_FLAGS "${liburiparser_CFLAGS_OTHERS} ${libpcrecpp_CFLAGS_OTHERS} ${EXTRA_COMPILE_FLAGS} ${Boost_CFLAGS}") ++set(COLLADA_COMPILE_FLAGS "${URIPARSER_CFLAGS_OTHERS} ${libpcrecpp_CFLAGS_OTHERS} ${EXTRA_COMPILE_FLAGS} ${Boost_CFLAGS}") + # create dynamic libraries + set(COLLADA_COMPILE_FLAGS "${COLLADA_COMPILE_FLAGS} -DDOM_DYNAMIC -DDOM_EXPORT") + +diff --git a/dom/src/dae/daeURI.cpp b/dom/src/dae/daeURI.cpp +index 3a8f815..1623753 100644 +--- a/dom/src/dae/daeURI.cpp ++++ b/dom/src/dae/daeURI.cpp +@@ -790,7 +790,7 @@ bool cdom::parseUriRef(const string& uriRef, + scheme = fromRange(uri.scheme); + authority = fromRange(uri.hostText); + path = fromList(uri.pathHead, "/"); +- if (uri.absolutePath != URI_TRUE and uri.hostText.first == NULL) ++ if (uri.absolutePath != URI_TRUE && uri.hostText.first == NULL) + path = path.erase(0, 1); + query = fromRange(uri.query); + fragment = fromRange(uri.fragment); diff --git a/externals/vcpkg/ports/collada-dom/use-vcpkg-minizip.patch b/externals/vcpkg/ports/collada-dom/use-vcpkg-minizip.patch new file mode 100755 index 000000000..daaaf0f48 --- /dev/null +++ b/externals/vcpkg/ports/collada-dom/use-vcpkg-minizip.patch @@ -0,0 +1,13 @@ +diff --git a/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp b/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp +index 4536275..77651f9 100644 +--- a/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp ++++ b/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp +@@ -32,7 +32,7 @@ + #include + using namespace std; + +-#include // for saving compressed files ++#include // for saving compressed files + #ifdef _WIN32 + #include + #else diff --git a/externals/vcpkg/ports/collada-dom/vcpkg.json b/externals/vcpkg/ports/collada-dom/vcpkg.json new file mode 100755 index 000000000..66e14efe6 --- /dev/null +++ b/externals/vcpkg/ports/collada-dom/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "collada-dom", + "version-string": "2.5.0", + "port-version": 6, + "description": "The COLLADA Document Object Model (DOM) is an application programming interface (API) that provides a C++ object representation of a COLLADA XML instance document.", + "homepage": "https://github.com/rdiankov/collada-dom", + "dependencies": [ + "boost-filesystem", + "boost-system", + "libxml2", + "minizip", + "pcre", + "uriparser", + "zlib" + ] +} diff --git a/externals/vcpkg/ports/collada-dom/vs-version-detection.patch b/externals/vcpkg/ports/collada-dom/vs-version-detection.patch new file mode 100755 index 000000000..7379f33be --- /dev/null +++ b/externals/vcpkg/ports/collada-dom/vs-version-detection.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2596a23..3ec1527 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 2.6.0) ++cmake_minimum_required (VERSION 3.7.0) + project (collada-dom) + set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE ) + +@@ -89,14 +89,22 @@ string(TOUPPER ${COMPONENT_PREFIX} COMPONENT_PREFIX_UPPER) + set(CPACK_COMPONENTS_ALL ${COMPONENT_PREFIX}-base ${COMPONENT_PREFIX}-dev) + + if( MSVC ) +- if( MSVC70 OR MSVC71 ) +- set(MSVC_PREFIX "vc70") +- elseif( MSVC80 ) +- set(MSVC_PREFIX "vc80") +- elseif( MSVC90 ) ++ if( MSVC_VERSION GREATER_EQUAL 1910 ) ++ set(MSVC_PREFIX "vc140") ++ elseif( MSVC_VERSION GREATER_EQUAL 1900 ) ++ set(MSVC_PREFIX "vc130") ++ elseif( MSVC_VERSION GREATER_EQUAL 1800 ) ++ set(MSVC_PREFIX "vc120") ++ elseif( MSVC_VERSION GREATER_EQUAL 1700 ) ++ set(MSVC_PREFIX "vc110") ++ elseif( MSVC_VERSION GREATER_EQUAL 1600 ) ++ set(MSVC_PREFIX "vc100") ++ elseif( MSVC_VERSION GREATER_EQUAL 1500 ) + set(MSVC_PREFIX "vc90") ++ elseif( MSVC_VERSION GREATER_EQUAL 1400 ) ++ set(MSVC_PREFIX "vc80") + else() +- set(MSVC_PREFIX "vc100") ++ set(MSVC_PREFIX "vc70") + endif() + set(COLLADA_DOM_LIBRARY_SUFFIX "${COLLADA_DOM_SOVERSION}-${COLLADA_PRECISION}-${MSVC_PREFIX}-mt") + else() diff --git a/externals/vcpkg/ports/colmap/fix-dependencies.patch b/externals/vcpkg/ports/colmap/fix-dependencies.patch new file mode 100755 index 000000000..62650bd8b --- /dev/null +++ b/externals/vcpkg/ports/colmap/fix-dependencies.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4759a94..3d25164 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -98,9 +98,11 @@ find_package(Boost REQUIRED COMPONENTS + + find_package(Eigen3 REQUIRED) + +-find_package(FreeImage REQUIRED) ++find_package(freeimage CONFIG REQUIRED) ++set(FREEIMAGE_LIBRARIES freeimage::FreeImage) + +-find_package(Metis REQUIRED) ++find_package(metis CONFIG REQUIRED) ++set(METIS_LIBRARIES metis) + + find_package(Glog REQUIRED) + diff --git a/externals/vcpkg/ports/colmap/portfile.cmake b/externals/vcpkg/ports/colmap/portfile.cmake new file mode 100755 index 000000000..a9971e6cc --- /dev/null +++ b/externals/vcpkg/ports/colmap/portfile.cmake @@ -0,0 +1,83 @@ +set(COLMAP_REF "29a1e3642a3b00734a52b21e597ea4d576485fe6") # 3.7 fix + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO colmap/colmap + REF ${COLMAP_REF} + SHA512 c22511592dadd1fce51baeaa5ab3ca48b0df5f1c02f9e2a97593ea1b01c5aea0e1054063a5665e2653f2c7b1b7525ce4c62ae35fb4197df614112861045b76fd + HEAD_REF dev + PATCHES + fix-dependencies.patch +) + +if (NOT TRIPLET_SYSTEM_ARCH STREQUAL "x64" AND ("cuda" IN_LIST FEATURES OR "cuda-redist" IN_LIST FEATURES)) + message(FATAL_ERROR "Feature cuda and cuda-redist require x64 triplet.") +endif() + +# set GIT_COMMIT_ID and GIT_COMMIT_DATE +if(DEFINED VCPKG_HEAD_VERSION) + set(GIT_COMMIT_ID "${VCPKG_HEAD_VERSION}") +else() + set(GIT_COMMIT_ID "${COLMAP_REF}") +endif() + +string(TIMESTAMP COLMAP_GIT_COMMIT_DATE "%Y-%m-%d") + +set(CUDA_ENABLED OFF) +set(TESTS_ENABLED OFF) + +if("cuda" IN_LIST FEATURES) + set(CUDA_ENABLED ON) +endif() + +if("cuda-redist" IN_LIST FEATURES) + set(CUDA_ENABLED ON) + set(CUDA_ARCHS "Common") +endif() + +if("tests" IN_LIST FEATURES) + set(TESTS_ENABLED ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DCUDA_ENABLED=${CUDA_ENABLED} + -DCUDA_ARCHS=${CUDA_ARCHS} + -DTESTS_ENABLED=${TESTS_ENABLED} + -DGIT_COMMIT_ID=${GIT_COMMIT_ID} + -DGIT_COMMIT_DATE=${COLMAP_GIT_COMMIT_DATE} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +file(GLOB TOOL_FILENAMES "${CURRENT_PACKAGES_DIR}/bin/*") +foreach(TOOL_FILENAME ${TOOL_FILENAMES}) + get_filename_component(TEST_TOOL_NAME ${TOOL_FILENAME} NAME_WLE) + list(APPEND COLMAP_TOOL_NAMES "${TEST_TOOL_NAME}") +endforeach() + +vcpkg_copy_tools(TOOL_NAMES ${COLMAP_TOOL_NAMES} AUTO_CLEAN) + +# remove empty folders and unused files +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/include/colmap/exe" + "${CURRENT_PACKAGES_DIR}/include/colmap/lib/Graclus/multilevelLib" + "${CURRENT_PACKAGES_DIR}/include/colmap/tools" + "${CURRENT_PACKAGES_DIR}/include/colmap/ui/media" + "${CURRENT_PACKAGES_DIR}/include/colmap/ui/shaders" + "${CURRENT_PACKAGES_DIR}/COLMAP.bat" + "${CURRENT_PACKAGES_DIR}/RUN_TESTS.bat" + "${CURRENT_PACKAGES_DIR}/debug/COLMAP.bat" + "${CURRENT_PACKAGES_DIR}/debug/RUN_TESTS.bat" + "${CURRENT_PACKAGES_DIR}/debug/bin" +) + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/colmap/usage b/externals/vcpkg/ports/colmap/usage new file mode 100755 index 000000000..b71316b3c --- /dev/null +++ b/externals/vcpkg/ports/colmap/usage @@ -0,0 +1,10 @@ +For example, under Windows, execute COLMAP as: + + \packages\colmap_\tools\colmap\colmap.exe gui + \packages\colmap_\tools\colmap\colmap.exe mapper + \packages\colmap_\tools\colmap\colmap.exe ... + +The package colmap provides CMake integration: + + find_package(COLMAP REQUIRED) + target_link_libraries(main ${COLMAP_LIBRARIES}) diff --git a/externals/vcpkg/ports/colmap/vcpkg.json b/externals/vcpkg/ports/colmap/vcpkg.json new file mode 100755 index 000000000..f1f0a09b6 --- /dev/null +++ b/externals/vcpkg/ports/colmap/vcpkg.json @@ -0,0 +1,59 @@ +{ + "name": "colmap", + "version-date": "2022-03-14", + "description": "COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. It offers a wide range of features for reconstruction of ordered and unordered image collections. The software is licensed under the new BSD license.", + "homepage": "https://colmap.github.io/", + "license": "BSD-3-Clause", + "dependencies": [ + "boost-filesystem", + "boost-graph", + "boost-program-options", + "boost-system", + "boost-test", + { + "name": "ceres", + "features": [ + "lapack", + "suitesparse" + ] + }, + { + "name": "cgal", + "features": [ + "qt" + ] + }, + "eigen3", + "freeimage", + "gflags", + "glew", + "glog", + "qt5-base", + "suitesparse", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cuda": { + "description": "CUDA support for current compute architecture of this machine.", + "dependencies": [ + "cuda" + ] + }, + "cuda-redist": { + "description": "Redistributable CUDA support for common supported compute architectures.", + "dependencies": [ + "cuda" + ] + }, + "tests": { + "description": "Build all tests." + } + } +} diff --git a/externals/vcpkg/ports/color-console/portfile.cmake b/externals/vcpkg/ports/color-console/portfile.cmake new file mode 100755 index 000000000..392a600a7 --- /dev/null +++ b/externals/vcpkg/ports/color-console/portfile.cmake @@ -0,0 +1,16 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO imfl/color-console + REF 745f57141e6322e20cdda59a74ab1e00d107ade1 + SHA512 d4d919eb211f2981daf6b9af93262fc8ac89bac0db755ba30b31d6aa1b981e5383fb23ef95d1ff004606d138fee630fd790c72e92440b684306c6780750bd9fd + HEAD_REF master +) + +# Install source file +file(INSTALL ${SOURCE_PATH}/include/color.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include RENAME colorconsole.hpp) + +# Install license +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +# Install usage +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) \ No newline at end of file diff --git a/externals/vcpkg/ports/color-console/usage b/externals/vcpkg/ports/color-console/usage new file mode 100755 index 000000000..ec734688d --- /dev/null +++ b/externals/vcpkg/ports/color-console/usage @@ -0,0 +1,4 @@ +The package zstr is header only and can be used from CMake via: + + find_path(COLORCONSOLE_INCLUDE_DIRS "colorconsole.hpp") + target_include_directories(main PRIVATE ${COLORCONSOLE_INCLUDE_DIRS}) \ No newline at end of file diff --git a/externals/vcpkg/ports/color-console/vcpkg.json b/externals/vcpkg/ports/color-console/vcpkg.json new file mode 100755 index 000000000..2475ce2cc --- /dev/null +++ b/externals/vcpkg/ports/color-console/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "color-console", + "version-date": "2022-03-20", + "description": "A lightweight header-only C++ library to bring colors to your Windows console with a very-easy-to-use API.", + "homepage": "https://github.com/imfl/color-console", + "license": "MIT" +} diff --git a/externals/vcpkg/ports/comms-ublox/fix-comms.patch b/externals/vcpkg/ports/comms-ublox/fix-comms.patch new file mode 100755 index 000000000..d9620a4aa --- /dev/null +++ b/externals/vcpkg/ports/comms-ublox/fix-comms.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e2b69fe..aff5917 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -66,6 +66,7 @@ endif () + ###################################################################### + + # Use external CommsChampion project or compile it in place ++if(FALSE) + set (CC_EXTERNAL_TGT "comms_champion_external") + if (OPT_BUILD_TEST OR OPT_BUILD_PLUGIN) + set (external_cc_needed TRUE) +@@ -107,6 +108,10 @@ elseif (external_cc_needed) + find_package(CommsChampion NO_MODULE) + set (cc_compile_file "${OPT_CC_MAIN_INSTALL_DIR}/lib/LibComms/cmake/CC_Compile.cmake") + endif () ++else() ++ find_package(LibComms CONFIG REQUIRED) ++ set(cc_compile_file "${LibComms_DIR}/CC_Compile.cmake") ++endif() + + if (EXISTS ${cc_compile_file}) + # Set compiler flags diff --git a/externals/vcpkg/ports/comms-ublox/portfile.cmake b/externals/vcpkg/ports/comms-ublox/portfile.cmake new file mode 100755 index 000000000..d5fd4bcea --- /dev/null +++ b/externals/vcpkg/ports/comms-ublox/portfile.cmake @@ -0,0 +1,30 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO commschamp/cc.ublox.generated + REF v0.20.2 + SHA512 5672d964ea3e505837e44a5fd928069a219a5731764cb54bfe8609e39c6c6dd0059660bcde317c6c60cd1bd8d1f7942d2faa022095bf651817568291bc6a7569 + HEAD_REF master + PATCHES + fix-comms.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS + -DOPT_BUILD_TEST=OFF + -DOPT_BUILD_PLUGIN=OFF + -DOPT_NO_COMMS=ON + -DOPT_EXTERNALS_UPDATE_DISCONNECTED=ON +) +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/ublox/cmake TARGET_PATH share/ublox) +# currently this is only a header only library. after moving lib/ublox to share this lib path will be empty +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/comms-ublox/vcpkg.json b/externals/vcpkg/ports/comms-ublox/vcpkg.json new file mode 100755 index 000000000..93668cae0 --- /dev/null +++ b/externals/vcpkg/ports/comms-ublox/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "comms-ublox", + "version-semver": "0.20.2", + "description": "UBLOX (UBX) protocol definition, generated out of cc.ublox.commsdsl", + "homepage": "https://commschamp.github.io/", + "documentation": "https://github.com/commschamp/cc.ublox.generated", + "dependencies": [ + "comms" + ] +} diff --git a/externals/vcpkg/ports/comms/portfile.cmake b/externals/vcpkg/ports/comms/portfile.cmake new file mode 100755 index 000000000..0ea8ef045 --- /dev/null +++ b/externals/vcpkg/ports/comms/portfile.cmake @@ -0,0 +1,57 @@ +#header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO commschamp/comms_champion + REF v3.4 + SHA512 573afbc0aebd72d8a047067410f0f54588675c4cbad37f824edbb6d8303e9c191c573ac9325bf5fec575dffd3d05562c04e75c1e5b748a34d01056bc8b766fb1 + HEAD_REF master +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools CC_BUILD_TOOLS_LIBRARY + tools CC_INSTALL_TOOLS_LIBRARY + tools CC_BUILD_TOOLS + tools CC_INSTALL_TOOLS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DCC_INSTALL_COMMS_LIB=ON + -DCC_BUILD_UNIT_TESTS=OFF + -DCC_WARN_AS_ERR=OFF + -DCC_BUILD_DEMO_PROTOCOL=OFF + -DCC_INSTALL_DEMO_PROTOCOL=OFF +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME "LibComms" CONFIG_PATH "lib/LibComms/cmake" ) + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES cc_dump cc_view + AUTO_CLEAN + ) + + file(INSTALL "${CURRENT_PACKAGES_DIR}/lib/CommsChampion/plugin" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/lib/CommsChampion/plugin") + vcpkg_cmake_config_fixup(PACKAGE_NAME "CommsChampion" CONFIG_PATH "lib/CommsChampion/cmake") + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/LibComms") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/CommsChampion") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/LibComms") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/CommsChampion") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +else() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/externals/vcpkg/ports/comms/usage b/externals/vcpkg/ports/comms/usage new file mode 100755 index 000000000..9273c0283 --- /dev/null +++ b/externals/vcpkg/ports/comms/usage @@ -0,0 +1,4 @@ +The package comms provides CMake targets: + + find_package(LibComms CONFIG REQUIRED) + target_link_libraries(main PRIVATE cc::comms) diff --git a/externals/vcpkg/ports/comms/vcpkg.json b/externals/vcpkg/ports/comms/vcpkg.json new file mode 100755 index 000000000..fe4c58918 --- /dev/null +++ b/externals/vcpkg/ports/comms/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "comms", + "version-semver": "3.4.0", + "port-version": 1, + "description": "COMMS is the C++(11) headers only, platform independent library, which makes the implementation of a communication protocol to be an easy and relatively quick process.", + "homepage": "https://commschamp.github.io/", + "documentation": "https://github.com/commschamp/comms_champion", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "Builds CommsChampion tools", + "supports": "!static", + "dependencies": [ + "qt5-base" + ] + } + } +} diff --git a/externals/vcpkg/ports/commsdsl/portfile.cmake b/externals/vcpkg/ports/commsdsl/portfile.cmake new file mode 100755 index 000000000..e7131d93a --- /dev/null +++ b/externals/vcpkg/ports/commsdsl/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO commschamp/commsdsl + REF v3.6.4 + SHA512 dd997bb063baf4e6bc15666539e8d3e8cf435cfda88e8b115b8a1568c8c77cc2ca6dbf1a77ae2fcf9b24f68cb35aa2ae583852cf887fbc85f74e868230374055 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS + -DCOMMSDSL_NO_COMMS_CHAMPION=ON + -DCOMMSDSL_BUILD_APPS=ON + -DCOMMSDSL_INSTALL_APPS=ON + -DCOMMSDSL_CHECKOUT_COMMS_CHAMPION=OFF + -DCOMMSDSL_BUILD_UNIT_TESTS=OFF + -DCOMMSDSL_WARN_AS_ERR=OFF +) +vcpkg_install_cmake() + +vcpkg_copy_tools( + TOOL_NAMES commsdsl2comms + AUTO_CLEAN +) + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/LibCommsdsl/cmake TARGET_PATH share/LibCommsdsl) +# after fixing the following dirs are empty +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/LibCommsdsl") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/LibCommsdsl") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/commsdsl/vcpkg.json b/externals/vcpkg/ports/commsdsl/vcpkg.json new file mode 100755 index 000000000..84ceafc77 --- /dev/null +++ b/externals/vcpkg/ports/commsdsl/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "commsdsl", + "version-semver": "3.6.4", + "port-version": 1, + "description": "DSL schemas parser and code generator for CommsChampion Ecosystem", + "homepage": "https://commschamp.github.io/", + "documentation": "https://github.com/commschamp/commsdsl", + "supports": "!uwp & !static", + "dependencies": [ + "boost-algorithm", + "boost-filesystem", + "boost-program-options", + "libxml2" + ] +} diff --git a/externals/vcpkg/ports/compoundfilereader/portfile.cmake b/externals/vcpkg/ports/compoundfilereader/portfile.cmake new file mode 100755 index 000000000..aba7039f1 --- /dev/null +++ b/externals/vcpkg/ports/compoundfilereader/portfile.cmake @@ -0,0 +1,10 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Microsoft/compoundfilereader + REF v0.1.0 + SHA512 0ebb3ad02e4723d5e00a553d608dd8760614a3d83785c0e96a6d9a04df7e92486f6a4ecc0f7327a593776865abe697d21125554d547e89c838c69ab2da24d906 +) + +file(COPY "${SOURCE_PATH}/src/include/compoundfilereader.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(COPY "${SOURCE_PATH}/src/include/utf.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/compoundfilereader/vcpkg.json b/externals/vcpkg/ports/compoundfilereader/vcpkg.json new file mode 100755 index 000000000..577b43c2b --- /dev/null +++ b/externals/vcpkg/ports/compoundfilereader/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "compoundfilereader", + "version": "0.1.0", + "description": "Simple standalone c++ header file to read compound file (Structured Storage File) content.", + "homepage": "https://github.com/microsoft/compoundfilereader" +} diff --git a/externals/vcpkg/ports/concurrencpp/fix-include-path.patch b/externals/vcpkg/ports/concurrencpp/fix-include-path.patch new file mode 100755 index 000000000..7b2da1920 --- /dev/null +++ b/externals/vcpkg/ports/concurrencpp/fix-include-path.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 351aa65..ab06584 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -94,7 +94,7 @@ include(CMakePackageConfigHelpers) + include(GNUInstallDirs) + + set(concurrencpp_directory "concurrencpp-${PROJECT_VERSION}") +-set(concurrencpp_include_directory "${CMAKE_INSTALL_INCLUDEDIR}/${concurrencpp_directory}") ++set(concurrencpp_include_directory "${CMAKE_INSTALL_INCLUDEDIR}") + + install(TARGETS concurrencpp + EXPORT concurrencppTargets diff --git a/externals/vcpkg/ports/concurrencpp/portfile.cmake b/externals/vcpkg/ports/concurrencpp/portfile.cmake new file mode 100755 index 000000000..64231d30b --- /dev/null +++ b/externals/vcpkg/ports/concurrencpp/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO David-Haim/concurrencpp + REF v.0.1.4 + SHA512 494680b8a642d9c2ad1e31a6b52ecac672af7b8ba2213fc6b0d525968bd27122c9b3c7105286af22fd6ebfa3cee4bb3b2c8948062418ad8419a305f7c3df0d4b + HEAD_REF master + PATCHES + fix-include-path.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/concurrencpp-0.1.4) + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/concurrencpp RENAME copyright) diff --git a/externals/vcpkg/ports/concurrencpp/vcpkg.json b/externals/vcpkg/ports/concurrencpp/vcpkg.json new file mode 100755 index 000000000..85ab61dc3 --- /dev/null +++ b/externals/vcpkg/ports/concurrencpp/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "concurrencpp", + "version": "0.1.4", + "description": "concurrencpp is a tasking library for C++ allowing developers to write highly concurrent applications easily and safely by using tasks, executors and coroutines.", + "homepage": "https://github.com/David-Haim/concurrencpp/", + "license": "MIT", + "supports": "(windows & static) | linux | osx", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/concurrentqueue/CMakeLists.txt b/externals/vcpkg/ports/concurrentqueue/CMakeLists.txt new file mode 100755 index 000000000..99de84178 --- /dev/null +++ b/externals/vcpkg/ports/concurrentqueue/CMakeLists.txt @@ -0,0 +1,11 @@ +cmake_minimum_required(VERSION 3.5) +project(concurrentqueue C) + +add_library(concurrentqueue INTERFACE) + +target_include_directories(concurrentqueue INTERFACE $ $) + +install(TARGETS concurrentqueue + EXPORT concurrentqueue +) +install(EXPORT concurrentqueue FILE unofficial-concurrentqueue-targets.cmake NAMESPACE unofficial::concurrentqueue:: DESTINATION share/unofficial-concurrentqueue) diff --git a/externals/vcpkg/ports/concurrentqueue/portfile.cmake b/externals/vcpkg/ports/concurrentqueue/portfile.cmake new file mode 100755 index 000000000..ed5c189f9 --- /dev/null +++ b/externals/vcpkg/ports/concurrentqueue/portfile.cmake @@ -0,0 +1,30 @@ +# header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cameron314/concurrentqueue + REF 3747268264d0fa113e981658a99ceeae4dad05b7# v1.0.3 + SHA512 798d61e8e5b87cd1870df20410db18e2fcbc5e4e1d849308663cc0403a0d50d29b72428fc0a39231ae8bcb460c946559bde0f2d22584c335fe849cbcbe607ec2 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-concurrentqueue TARGET_PATH share/unofficial-concurrentqueue) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +configure_file( + ${CMAKE_CURRENT_LIST_DIR}/unofficial-concurrentqueue-config.in.cmake + ${CURRENT_PACKAGES_DIR}/share/unofficial-concurrentqueue/unofficial-concurrentqueue-config.cmake + @ONLY +) + +file(GLOB HEADER_FILES ${SOURCE_PATH}/*.h) +file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/concurrentqueue/unofficial-concurrentqueue-config.in.cmake b/externals/vcpkg/ports/concurrentqueue/unofficial-concurrentqueue-config.in.cmake new file mode 100755 index 000000000..c3639637a --- /dev/null +++ b/externals/vcpkg/ports/concurrentqueue/unofficial-concurrentqueue-config.in.cmake @@ -0,0 +1,6 @@ +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32) + include(CMakeFindDependencyMacro) + find_dependency(Threads) +endif() + +include(${CMAKE_CURRENT_LIST_DIR}/unofficial-concurrentqueue-targets.cmake) \ No newline at end of file diff --git a/externals/vcpkg/ports/concurrentqueue/vcpkg.json b/externals/vcpkg/ports/concurrentqueue/vcpkg.json new file mode 100755 index 000000000..f091937d6 --- /dev/null +++ b/externals/vcpkg/ports/concurrentqueue/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "concurrentqueue", + "version": "1.0.3", + "description": "A fast multi-producer, multi-consumer lock-free concurrent queue for C++11", + "homepage": "https://github.com/cameron314/concurrentqueue" +} diff --git a/externals/vcpkg/ports/console-bridge/portfile.cmake b/externals/vcpkg/ports/console-bridge/portfile.cmake new file mode 100755 index 000000000..37b7f84e1 --- /dev/null +++ b/externals/vcpkg/ports/console-bridge/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ros/console_bridge + REF 1.0.2 + SHA512 ed427da8e59f9629f8d70e0a14415f88177c06fbaf7334bee56135dde91d19a1b54f5c9c668e0fd68314ab8dfd61446a174b9f528304decc5d4626a7c98882cb + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/CMake") + vcpkg_cmake_config_fixup(PACKAGE_NAME console_bridge CONFIG_PATH CMake) +else() + vcpkg_cmake_config_fixup(PACKAGE_NAME console_bridge CONFIG_PATH lib/console_bridge/cmake) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/console_bridge") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/console_bridge") +endif() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") + vcpkg_fixup_pkgconfig() +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(READ "${CURRENT_PACKAGES_DIR}/include/console_bridge/console_bridge_export.h" _contents) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + string(REPLACE "ifdef CONSOLE_BRIDGE_STATIC_DEFINE" "if 1" _contents "${_contents}") +else() + string(REPLACE "ifdef CONSOLE_BRIDGE_STATIC_DEFINE" "if 0" _contents "${_contents}") +endif() +file(WRITE "${CURRENT_PACKAGES_DIR}/include/console_bridge/console_bridge_export.h" "${_contents}") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/console-bridge/vcpkg.json b/externals/vcpkg/ports/console-bridge/vcpkg.json new file mode 100755 index 000000000..55788a26e --- /dev/null +++ b/externals/vcpkg/ports/console-bridge/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "console-bridge", + "version-semver": "1.0.2", + "description": "A ROS-independent package for logging that seamlessly pipes into rosconsole/rosout for ROS-dependent packages.", + "homepage": "https://github.com/ros/console_bridge", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/constexpr-contracts/portfile.cmake b/externals/vcpkg/ports/constexpr-contracts/portfile.cmake new file mode 100755 index 000000000..d189ba43d --- /dev/null +++ b/externals/vcpkg/ports/constexpr-contracts/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cjdb/constexpr-contracts + REF 58154e9010cb80aad4e95ef6f1835ebd7db3780a # commit 2020-05-25 + SHA512 b634267a4044cd712c8e52f65cd305f437864cab591f2b22104581f70b305ba52889dd46724e6047386463a010ee78fdd951411ea3691b5725d52d13f7adda76 + HEAD_REF main +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/constexpr-contracts) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib + ${CURRENT_PACKAGES_DIR}/debug) +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/constexpr-contracts/vcpkg.json b/externals/vcpkg/ports/constexpr-contracts/vcpkg.json new file mode 100755 index 000000000..1e5da4135 --- /dev/null +++ b/externals/vcpkg/ports/constexpr-contracts/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "constexpr-contracts", + "version-string": "2020-08-09", + "port-version": 1, + "description": "A constexpr-friendly, optimisation-friendly contracts library.", + "homepage": "https://github.com/cjdb/constexpr-contracts" +} diff --git a/externals/vcpkg/ports/constexpr/portfile.cmake b/externals/vcpkg/ports/constexpr/portfile.cmake new file mode 100755 index 000000000..493e78d7b --- /dev/null +++ b/externals/vcpkg/ports/constexpr/portfile.cmake @@ -0,0 +1,14 @@ +#header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO elbeno/constexpr + REF a98b1db39c909e0130d21d3910d4faf97035a625 + SHA512 8802ee43b510ea1f0c00949eecd84eb2bf3ac721802e6bc6755db9e6e2742d8b97fef427eca7d4d9a282c60a18ca10401386022eac995bd22624f45e3fc2c370 + HEAD_REF master +) + +# Copy the constexpr header files +file(GLOB HEADER_FILES "${SOURCE_PATH}/src/include/*.h") +file(COPY ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/constexpr/vcpkg.json b/externals/vcpkg/ports/constexpr/vcpkg.json new file mode 100755 index 000000000..b7f266515 --- /dev/null +++ b/externals/vcpkg/ports/constexpr/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "constexpr", + "version": "1.0", + "port-version": 3, + "description": "Small MIT License Library of general stdlib functions written as C++11 constexpr functions.", + "homepage": "https://github.com/elbeno/constexpr", + "license": "MIT" +} diff --git a/externals/vcpkg/ports/continuable/fix-cmakelists.patch b/externals/vcpkg/ports/continuable/fix-cmakelists.patch new file mode 100755 index 000000000..a2d73ad5b --- /dev/null +++ b/externals/vcpkg/ports/continuable/fix-cmakelists.patch @@ -0,0 +1,55 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,13 +23,6 @@ cmake_minimum_required(VERSION 3.11) + + project(continuable VERSION 4.0.0 LANGUAGES C CXX) + +-if (CTI_CONTINUABLE_IS_FIND_INCLUDED) +- set(CTI_CONTINUABLE_IS_TOP_LEVEL_PROJECT OFF) +-else() +- string(COMPARE EQUAL ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} +- CTI_CONTINUABLE_IS_TOP_LEVEL_PROJECT) +-endif() +- + option(CTI_CONTINUABLE_WITH_INSTALL + "Add the continuable install targets" + ${CTI_CONTINUABLE_IS_TOP_LEVEL_PROJECT}) +@@ -80,7 +73,7 @@ if(NOT TARGET Threads::Threads) + find_package(Threads REQUIRED) + endif() + +-if (CTI_CONTINUABLE_IS_TOP_LEVEL_PROJECT) ++if (FALSE) + include(cmake/CMakeLists.txt) + add_subdirectory(dep) + else() +@@ -90,7 +83,7 @@ else() + endif() + + # continuable-base +-if (CTI_CONTINUABLE_IS_TOP_LEVEL_PROJECT) ++if (TRUE) + add_library(continuable-base INTERFACE) + else() + add_library(continuable-base INTERFACE IMPORTED GLOBAL) +@@ -146,7 +139,7 @@ if (CTI_CONTINUABLE_WITH_UNHANDLED_EXCEPTIONS) + CONTINUABLE_WITH_UNHANDLED_EXCEPTIONS) + endif() + +-if (CTI_CONTINUABLE_IS_TOP_LEVEL_PROJECT) ++if (TRUE) + add_library(continuable INTERFACE) + else() + add_library(continuable INTERFACE IMPORTED GLOBAL) +@@ -168,8 +161,8 @@ if (CTI_CONTINUABLE_WITH_INSTALL) + # Headers and license files + install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/continuable" + DESTINATION "include") +- install(FILES "LICENSE.txt" DESTINATION .) +- install(FILES "Readme.md" DESTINATION .) ++ install(FILES "LICENSE.txt" DESTINATION share/${PROJECT_NAME} RENAME copyright) ++ install(FILES "Readme.md" DESTINATION share/${PROJECT_NAME}) + + # Config.cmake + write_basic_package_version_file( diff --git a/externals/vcpkg/ports/continuable/portfile.cmake b/externals/vcpkg/ports/continuable/portfile.cmake new file mode 100755 index 000000000..e4dd72c83 --- /dev/null +++ b/externals/vcpkg/ports/continuable/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Naios/continuable + REF 4.1.0 + SHA512 b80b1c13b068382553b727fd3b346323e2051b1c92237efa151ba8ec92b6d722ca993ae4bbf0e6e308a92834ae92011a179e74fcf713a09beaa48676f7d08340 + HEAD_REF master + PATCHES + fix-cmakelists.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCTI_CONTINUABLE_WITH_INSTALL=ON + -DCTI_CONTINUABLE_WITH_TESTS=OFF + -DCTI_CONTINUABLE_WITH_EXAMPLES=OFF + -DCTI_CONTINUABLE_WITH_BENCHMARKS=OFF + -DCTI_CONTINUABLE_WITH_NO_EXCEPTIONS=OFF + -DCTI_CONTINUABLE_WITH_UNHANDLED_EXCEPTIONS=ON + -DCTI_CONTINUABLE_WITH_EXPERIMENTAL_COROUTINE=ON + -DCTI_CONTINUABLE_WITH_CPP_LATEST=ON # requires cxx_std_17 +) +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib + ${CURRENT_PACKAGES_DIR}/debug +) diff --git a/externals/vcpkg/ports/continuable/vcpkg.json b/externals/vcpkg/ports/continuable/vcpkg.json new file mode 100755 index 000000000..d62451c96 --- /dev/null +++ b/externals/vcpkg/ports/continuable/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "continuable", + "version-string": "4.1.0", + "description": "C++14 asynchronous allocation aware futures (supporting then, exception handling, coroutines and connections)", + "homepage": "https://naios.github.io/continuable/", + "dependencies": [ + "function2" + ] +} diff --git a/externals/vcpkg/ports/convectionkernels/CMakeLists.txt b/externals/vcpkg/ports/convectionkernels/CMakeLists.txt new file mode 100755 index 000000000..9b289bdcb --- /dev/null +++ b/externals/vcpkg/ports/convectionkernels/CMakeLists.txt @@ -0,0 +1,30 @@ +cmake_minimum_required(VERSION 3.3.0) + +project( convectionkernels ) + +file(GLOB SRC_FILES *.cpp) +file(GLOB HDR_FILES *.h) +add_library( ${PROJECT_NAME} + STATIC + ${HDR_FILES} + ${SRC_FILES} +) +set_property( TARGET ${PROJECT_NAME} + PROPERTY PUBLIC_HEADER ${HDR_FILES} +) +target_include_directories( ${PROJECT_NAME} + PRIVATE ${CMAKE_CURRENT_LIST_DIR} + INTERFACE $ +) +install( TARGETS ${PROJECT_NAME} + EXPORT unofficial-convectionkernels-config + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + PUBLIC_HEADER DESTINATION include/convectionkernels +) +install( EXPORT unofficial-convectionkernels-config + FILE unofficial-convectionkernels-config.cmake + NAMESPACE unofficial::convectionkernels:: + DESTINATION share/unofficial-convectionkernels +) diff --git a/externals/vcpkg/ports/convectionkernels/portfile.cmake b/externals/vcpkg/ports/convectionkernels/portfile.cmake new file mode 100755 index 000000000..9ea14cd5b --- /dev/null +++ b/externals/vcpkg/ports/convectionkernels/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO elasota/ConvectionKernels + REF dc2dbbe0ae2cf2be06ef56d1021e2222a56c7fe2 + SHA512 2bf3aff1acb7b2365b882b4c1274ea8bcb9aea3015b5009e0ec50279122ecc623074d0f4fa04ddf8cd457e1f6868075a773bf8a2fa5b4fa9e2fd51d0a76d2560 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-convectionkernels) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/convectionkernels/vcpkg.json b/externals/vcpkg/ports/convectionkernels/vcpkg.json new file mode 100755 index 000000000..b43e3244c --- /dev/null +++ b/externals/vcpkg/ports/convectionkernels/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "convectionkernels", + "version-date": "2022-06-08", + "description": "Fast, high-quality texture compression library for many formats, also known as cvtt", + "homepage": "https://github.com/elasota/ConvectionKernels", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/coolprop/fix-builderror.patch b/externals/vcpkg/ports/coolprop/fix-builderror.patch new file mode 100755 index 000000000..0c2f9c4ca --- /dev/null +++ b/externals/vcpkg/ports/coolprop/fix-builderror.patch @@ -0,0 +1,13 @@ +diff --git a/src/ODEIntegrators.cpp b/src/ODEIntegrators.cpp +index 4152f01..e5986ca 100644 +--- a/src/ODEIntegrators.cpp ++++ b/src/ODEIntegrators.cpp +@@ -4,6 +4,8 @@ + #include "CPstrings.h" + #include "Exceptions.h" + #include ++#undef max ++#undef min + + bool ODEIntegrators::AdaptiveRK54(AbstractODEIntegrator &ode, double tstart, double tend, double hmin, double hmax, double eps_allowed, double step_relax) + { diff --git a/externals/vcpkg/ports/coolprop/fix-dependency.patch b/externals/vcpkg/ports/coolprop/fix-dependency.patch new file mode 100755 index 000000000..69d3f1806 --- /dev/null +++ b/externals/vcpkg/ports/coolprop/fix-dependency.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2d61aff..80ac50a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -237,10 +237,10 @@ list(REMOVE_ITEM APP_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/Tests/CoolProp-Te + list(REMOVE_ITEM APP_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/CoolPropLib.cpp") + + set (APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}") +-list (APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/externals/Eigen") +-list (APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/externals/msgpack-c/include") +-list (APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/externals/fmtlib/include") +-list (APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/externals/fmtlib") # should be deprecated ++find_package(Eigen3 CONFIG REQUIRED) ++find_package(msgpack CONFIG REQUIRED) ++find_package(fmt CONFIG REQUIRED) ++link_libraries(Eigen3::Eigen msgpackc msgpackc-cxx fmt::fmt) + list (APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include") + list (APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src") + diff --git a/externals/vcpkg/ports/coolprop/fix-install.patch b/externals/vcpkg/ports/coolprop/fix-install.patch new file mode 100755 index 000000000..73732f4db --- /dev/null +++ b/externals/vcpkg/ports/coolprop/fix-install.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 80ac50a..36819dd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -493,13 +493,13 @@ IF ( COOLPROP_OBJECT_LIBRARY OR COOLPROP_STATIC_LIBRARY OR COOLPROP_SHARED_LIBRA + SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY RELEASE_POSTFIX ) + modify_msvc_flags("/MD") # Note that the default is not used if ${COOLPROP_MSVC_REL} or ${COOLPROP_MSVC_DBG} is set + ENDIF (MSVC) +- INSTALL(TARGETS ${LIB_NAME} DESTINATION static_library/${CMAKE_SYSTEM_NAME}/${BITNESS}bit_${CMAKE_CXX_COMPILER_ID}_${CMAKE_CXX_COMPILER_VERSION} ) +- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${COOLPROP_LIBRARY_HEADER} DESTINATION static_library) ++ INSTALL(TARGETS ${LIB_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) ++ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${COOLPROP_LIBRARY_HEADER} DESTINATION include) + ELSEIF (COOLPROP_SHARED_LIBRARY) + LIST(APPEND APP_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/${COOLPROP_LIBRARY_SOURCE}") + ADD_LIBRARY(${LIB_NAME} SHARED ${APP_SOURCES} ${COOLPROP_LIBRARY_EXPORTS}) +- INSTALL(TARGETS ${LIB_NAME} DESTINATION shared_library/${CMAKE_SYSTEM_NAME}/${BITNESS}bit${CONVENTION} ) +- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${COOLPROP_LIBRARY_HEADER} DESTINATION shared_library) ++ INSTALL(TARGETS ${LIB_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) ++ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${COOLPROP_LIBRARY_HEADER} DESTINATION include) + SET_PROPERTY (TARGET ${LIB_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS " -DCOOLPROP_LIB") + # Now all the compiler specific settings for Visual Studio + IF (MSVC) +@@ -732,7 +732,7 @@ if (COOLPROP_EES_MODULE) + VERBATIM + ) + # install the generated library and the other files +- install(TARGETS COOLPROP_EES DESTINATION "${CMAKE_INSTALL_PREFIX}/EES/${CMAKE_SYSTEM_NAME}") ++ install(TARGETS COOLPROP_EES RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) + install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/wrappers/EES/CoolProp.htm" DESTINATION "${CMAKE_INSTALL_PREFIX}/EES/${CMAKE_SYSTEM_NAME}") + install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/wrappers/EES/CoolProp.LIB" DESTINATION "${CMAKE_INSTALL_PREFIX}/EES/${CMAKE_SYSTEM_NAME}") + install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/wrappers/EES/CoolProp_EES_Sample.EES" DESTINATION "${CMAKE_INSTALL_PREFIX}/EES/${CMAKE_SYSTEM_NAME}") diff --git a/externals/vcpkg/ports/coolprop/fmt-fix.patch b/externals/vcpkg/ports/coolprop/fmt-fix.patch new file mode 100755 index 000000000..9baeb2c62 --- /dev/null +++ b/externals/vcpkg/ports/coolprop/fmt-fix.patch @@ -0,0 +1,39 @@ +diff --git a/include/CPstrings.h b/include/CPstrings.h +index b99820a..fe6a2aa 100644 +--- a/include/CPstrings.h ++++ b/include/CPstrings.h +@@ -6,6 +6,8 @@ + #include + #include + #include ++ #include ++ #include + + #if !defined(NO_FMTLIB) + #ifndef FMT_HEADER_ONLY +@@ -14,9 +16,6 @@ + #include "fmt/format.h" // For addition of the string formatting functions and macros from fmtlib + #include "fmt/printf.h" // For sprintf + #undef FMT_HEADER_ONLY +-#else +- #include +- #include + #endif + + #include "Exceptions.h" +@@ -58,11 +57,11 @@ + // Missing string formatting function, this old guy is needed for ancient gcc compilers on PowerPC for VxWorks + inline std::string format(const char* fmt, ...); + #else +- // Missing std::string formatting function - provided by the fmtlib library +- inline std::string format(const char *format, fmt::ArgList args) { +- return fmt::sprintf(format, args); ++ template ++ std::string format(const Args & ... args) ++ { ++ return fmt::sprintf(args...); + } +- FMT_VARIADIC(std::string, format, const char *) + // For latest FMTLIB + /*template + inline std::string format(const char *format_str, const Args & ... args) { diff --git a/externals/vcpkg/ports/coolprop/portfile.cmake b/externals/vcpkg/ports/coolprop/portfile.cmake new file mode 100755 index 000000000..a1e7b978d --- /dev/null +++ b/externals/vcpkg/ports/coolprop/portfile.cmake @@ -0,0 +1,102 @@ +set(PORT_VERSION 6.1.0) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO CoolProp/CoolProp + REF f5ebb4e655add4c23bb327ab5209f3dbf919bc6d # v6.4.1 + SHA512 916d00777fe56035171ed0a6cbe09b8d4487317772802e4fe9b43f5965f3212dcb3754e18fe1db9c748a4d17facbbe6cb2244451cf5cf66334465760fc1701b7 + HEAD_REF master + PATCHES + fmt-fix.patch + fix-builderror.patch + fix-dependency.patch + fix-install.patch +) + +vcpkg_find_acquire_program(PYTHON2) +get_filename_component(PYTHON2_DIR ${PYTHON2} DIRECTORY) +vcpkg_add_to_path(${PYTHON2_DIR}) + +file(REMOVE_RECURSE ${SOURCE_PATH}/externals) + +# Patch up the file locations +file(COPY + ${CURRENT_INSTALLED_DIR}/include/catch.hpp + DESTINATION ${SOURCE_PATH}/externals/Catch/single_include +) + +file(COPY + ${CURRENT_INSTALLED_DIR}/include/eigen3/Eigen + DESTINATION ${SOURCE_PATH}/externals/Eigen +) +file(COPY + ${CURRENT_INSTALLED_DIR}/include/eigen3/unsupported/Eigen + DESTINATION ${SOURCE_PATH}/externals/Eigen/unsupported +) + +file(COPY + ${CURRENT_INSTALLED_DIR}/include/rapidjson + DESTINATION ${SOURCE_PATH}/externals/rapidjson/include +) + +file(COPY + ${CURRENT_INSTALLED_DIR}/include/IF97.h + DESTINATION ${SOURCE_PATH}/externals/IF97 +) + +file(COPY + ${CURRENT_INSTALLED_DIR}/include/msgpack.h + ${CURRENT_INSTALLED_DIR}/include/msgpack.hpp + ${CURRENT_INSTALLED_DIR}/include/msgpack + DESTINATION ${SOURCE_PATH}/externals/msgpack-c/include +) + +file(COPY + ${CURRENT_INSTALLED_DIR}/include/fmt + DESTINATION ${SOURCE_PATH}/externals/cppformat +) + +file(COPY + ${CURRENT_INSTALLED_DIR}/include/REFPROP_lib.h + DESTINATION ${SOURCE_PATH}/externals/REFPROP-headers/ +) + +# Use a nasty hack to include the correct header +file(APPEND + ${SOURCE_PATH}/externals/msgpack-c/include/fmt/format.h + "#include \"fmt/printf.h\"" +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" COOLPROP_SHARED_LIBRARY) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" COOLPROP_STATIC_LIBRARY) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" COOLPROP_MSVC_DYNAMIC) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" COOLPROP_MSVC_STATIC) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCOOLPROP_SHARED_LIBRARY=${COOLPROP_SHARED_LIBRARY} + -DCOOLPROP_STATIC_LIBRARY=${COOLPROP_STATIC_LIBRARY} + -DCOOLPROP_MSVC_DYNAMIC=${COOLPROP_MSVC_DYNAMIC} + -DCOOLPROP_MSVC_STATIC=${COOLPROP_MSVC_STATIC} + OPTIONS_RELEASE + -DCOOLPROP_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR} + OPTIONS_DEBUG + -DCOOLPROP_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +if (VCPKG_TARGET_IS_WINDOWS AND COOLPROP_SHARED_LIBRARY) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/CoolPropLib.h + "#if defined(COOLPROP_LIB)" "#if 1" + ) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/coolprop/vcpkg.json b/externals/vcpkg/ports/coolprop/vcpkg.json new file mode 100755 index 000000000..acd6b2f17 --- /dev/null +++ b/externals/vcpkg/ports/coolprop/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "coolprop", + "version-semver": "6.4.1", + "port-version": 1, + "description": "Thermophysical properties for the masses", + "homepage": "https://github.com/CoolProp/CoolProp", + "dependencies": [ + "catch", + "eigen3", + "fmt", + "if97", + "msgpack", + "pybind11", + "rapidjson", + "refprop-headers" + ] +} diff --git a/externals/vcpkg/ports/coroutine/add-noexcept-to-frame.patch b/externals/vcpkg/ports/coroutine/add-noexcept-to-frame.patch new file mode 100755 index 000000000..fe5c6c6d3 --- /dev/null +++ b/externals/vcpkg/ports/coroutine/add-noexcept-to-frame.patch @@ -0,0 +1,13 @@ +--- a/interface/coroutine/frame.h ++++ a/interface/coroutine/frame.h +@@ -119,8 +119,8 @@ + return *this; + } + // 17.12.3.2, export/import +- static /*constexpr*/ coroutine_handle from_address(void* _Addr) { ++ static /*constexpr*/ coroutine_handle from_address(void* _Addr) noexcept { + coroutine_handle _Result{}; + _Result._Ptr = reinterpret_cast(_Addr); + return _Result; + } + diff --git a/externals/vcpkg/ports/coroutine/fix-errorC7651.patch b/externals/vcpkg/ports/coroutine/fix-errorC7651.patch new file mode 100755 index 000000000..42c4291a5 --- /dev/null +++ b/externals/vcpkg/ports/coroutine/fix-errorC7651.patch @@ -0,0 +1,68 @@ +diff --git a/modules/portable/frame.cpp b/modules/portable/frame.cpp +index 2cedf81..f413f28 100644 +--- a/modules/portable/frame.cpp ++++ b/modules/portable/frame.cpp +@@ -77,13 +77,31 @@ size_t _coro_done(void*); + // + // intrinsic: Clang/GCC + // +-extern "C" { +-bool __builtin_coro_done(void*); +-void __builtin_coro_resume(void*); +-void __builtin_coro_destroy(void*); +-// void* __builtin_coro_promise(void* ptr, int align, bool p); ++//extern "C" { ++template ++void resume_wrapper(void *p) ++{ ++ if constexpr (B) ++ __builtin_coro_resume(p); ++} ++ ++template ++void destroy_wrapper(void *p) ++{ ++ if constexpr(B) ++ __builtin_coro_destroy(p); + } + ++template ++bool done_wrapper(void *p) ++{ ++ if constexpr(B) ++ return __builtin_coro_done(p); ++ return false; ++} ++// void* __builtin_coro_promise(void* ptr, int align, bool p); ++//} ++ + bool _coro_finished(portable_coro_prefix* _Handle); + + #if defined(__clang__) +@@ -124,7 +142,7 @@ bool portable_coro_done(portable_coro_prefix* _Handle) { + if constexpr (is_msvc) { + return _coro_finished(_Handle); + } else if constexpr (is_clang) { +- return __builtin_coro_done(_Handle); ++ return done_wrapper(_Handle); + } + return false; // follow `noop_coroutine` + } +@@ -133,7 +151,7 @@ void portable_coro_resume(portable_coro_prefix* _Handle) { + if constexpr (is_msvc) { + _coro_resume(_Handle); + } else if constexpr (is_clang) { +- __builtin_coro_resume(_Handle); ++ resume_wrapper(_Handle); + } + } + +@@ -141,7 +159,7 @@ void portable_coro_destroy(portable_coro_prefix* _Handle) { + if constexpr (is_msvc) { + _coro_destroy(_Handle); + } else if constexpr (is_clang) { +- __builtin_coro_destroy(_Handle); ++ destroy_wrapper(_Handle); + } + } + diff --git a/externals/vcpkg/ports/coroutine/gsl-4_0_0.patch b/externals/vcpkg/ports/coroutine/gsl-4_0_0.patch new file mode 100755 index 000000000..466d3ff13 --- /dev/null +++ b/externals/vcpkg/ports/coroutine/gsl-4_0_0.patch @@ -0,0 +1,80 @@ +diff --git a/interface/coroutine/net.h b/interface/coroutine/net.h +index 17b70a8..3c44827 100644 +--- a/interface/coroutine/net.h ++++ b/interface/coroutine/net.h +@@ -344,7 +344,7 @@ void poll_net_tasks(uint64_t nano) noexcept(false); + * @ingroup Network + */ + uint32_t get_address(const addrinfo& hint, // +- gsl::czstring<> host, gsl::czstring<> serv, ++ gsl::czstring host, gsl::czstring serv, + gsl::span output) noexcept; + + /** +@@ -361,7 +361,7 @@ uint32_t get_address(const addrinfo& hint, // + * @ingroup Network + */ + uint32_t get_address(const addrinfo& hint, // +- gsl::czstring<> host, gsl::czstring<> serv, ++ gsl::czstring host, gsl::czstring serv, + gsl::span output) noexcept; + + /** +@@ -377,7 +377,7 @@ uint32_t get_address(const addrinfo& hint, // + * @ingroup Network + */ + uint32_t get_name(const sockaddr_in& addr, // +- gsl::zstring name, gsl::zstring serv, ++ gsl::basic_zstring name, gsl::basic_zstring serv, + int32_t flags = NI_NUMERICHOST | NI_NUMERICSERV) noexcept; + + /** +@@ -392,7 +392,7 @@ uint32_t get_name(const sockaddr_in& addr, // + * @ingroup Network + */ + uint32_t get_name(const sockaddr_in6& addr, // +- gsl::zstring name, gsl::zstring serv, ++ gsl::basic_zstring name, gsl::basic_zstring serv, + int32_t flags = NI_NUMERICHOST | NI_NUMERICSERV) noexcept; + + } // namespace coro +diff --git a/modules/net/resolver.cpp b/modules/net/resolver.cpp +index 21a9800..5328939 100644 +--- a/modules/net/resolver.cpp ++++ b/modules/net/resolver.cpp +@@ -9,7 +9,7 @@ namespace coro { + + GSL_SUPPRESS(type .1) + uint32_t get_name(const sockaddr_in& addr, // +- gsl::zstring name, gsl::zstring serv, ++ gsl::basic_zstring name, gsl::basic_zstring serv, + int32_t flags) noexcept { + const auto* ptr = reinterpret_cast(addressof(addr)); + return ::getnameinfo(ptr, sizeof(sockaddr_in), // +@@ -20,7 +20,7 @@ uint32_t get_name(const sockaddr_in& addr, // + + GSL_SUPPRESS(type .1) + uint32_t get_name(const sockaddr_in6& addr, // +- gsl::zstring name, gsl::zstring serv, ++ gsl::basic_zstring name, gsl::basic_zstring serv, + int32_t flags) noexcept { + const auto* ptr = reinterpret_cast(addressof(addr)); + return ::getnameinfo(ptr, sizeof(sockaddr_in6), // +@@ -58,7 +58,7 @@ auto get_address(addrinfo* list, sockaddr_in6 addr) noexcept + } + + uint32_t get_address(const addrinfo& hint, // +- gsl::czstring<> host, gsl::czstring<> serv, ++ gsl::czstring host, gsl::czstring serv, + gsl::span output) noexcept { + addrinfo* list = nullptr; + if (const auto ec = ::getaddrinfo(host, serv, // +@@ -74,7 +74,7 @@ uint32_t get_address(const addrinfo& hint, // + } + + uint32_t get_address(const addrinfo& hint, // +- gsl::czstring<> host, gsl::czstring<> serv, ++ gsl::czstring host, gsl::czstring serv, + gsl::span output) noexcept { + addrinfo* list = nullptr; + if (const auto ec = ::getaddrinfo(host, serv, // diff --git a/externals/vcpkg/ports/coroutine/portfile.cmake b/externals/vcpkg/ports/coroutine/portfile.cmake new file mode 100755 index 000000000..f01475086 --- /dev/null +++ b/externals/vcpkg/ports/coroutine/portfile.cmake @@ -0,0 +1,33 @@ +if(VCPKG_TARGET_IS_LINUX) + message("Warning: `coroutine` requires libc++ and Clang or GCC 10+ on Linux") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO luncliff/coroutine + REF 1.5.0 + SHA512 61b91fdc641b6905b884e99c5bf193ec2cf6962144ab3baafdb9432115757d96f3797f116b30356f0d21417b23082bc908f75042721caeab3329c4910b654594 + HEAD_REF master + PATCHES + fix-errorC7651.patch + add-noexcept-to-frame.patch + gsl-4_0_0.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DGSL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include + -DBUILD_TESTING=False +) +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets() + +file(INSTALL ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright +) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/externals/vcpkg/ports/coroutine/vcpkg.json b/externals/vcpkg/ports/coroutine/vcpkg.json new file mode 100755 index 000000000..e1b0a5d77 --- /dev/null +++ b/externals/vcpkg/ports/coroutine/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "coroutine", + "version": "1.5.0", + "port-version": 4, + "description": "C++ 20 Coroutines helper/example library", + "homepage": "https://github.com/luncliff/coroutine", + "supports": "!uwp", + "dependencies": [ + "ms-gsl" + ] +} diff --git a/externals/vcpkg/ports/corrade/build-corrade-rc-always.patch b/externals/vcpkg/ports/corrade/build-corrade-rc-always.patch new file mode 100755 index 000000000..0e46a5250 --- /dev/null +++ b/externals/vcpkg/ports/corrade/build-corrade-rc-always.patch @@ -0,0 +1,27 @@ +--- a/src/Corrade/Utility/CMakeLists.txt ++++ b/src/Corrade/Utility/CMakeLists.txt +@@ -185,13 +185,12 @@ + # corrade-rc when generating WinRT targets by setting + # set_target_properties(corrade-rc PROPERTIES VS_WINRT_COMPONENT OFF) + # Then this would be if(NOT CMAKE_CROSSCOMPILING OR CORRADE_TARGET_WINDOWS_RT). + # However, it seems like this feature never materialized, as doing this will + # result in corrade-rc that's looking for vcruntime140_app.dll in order to be + # run. Last checked: Nov 2019. +-if(NOT CMAKE_CROSSCOMPILING) + # Sources for standalone corrade-rc + set(CorradeUtilityRc_SRCS + Arguments.cpp + Debug.cpp + Directory.cpp + Configuration.cpp +@@ -235,9 +234,10 @@ + if(CORRADE_TARGET_UNIX) + target_link_libraries(corrade-rc PRIVATE ${CMAKE_DL_LIBS}) + endif() + set_target_properties(corrade-rc PROPERTIES FOLDER "Corrade/Utility") + install(TARGETS corrade-rc DESTINATION ${CORRADE_BINARY_INSTALL_DIR}) + ++if(NOT CMAKE_CROSSCOMPILING) + # Corrade::rc target alias for superprojects + add_executable(Corrade::rc ALIAS corrade-rc) + endif() diff --git a/externals/vcpkg/ports/corrade/fix-vs2019.patch b/externals/vcpkg/ports/corrade/fix-vs2019.patch new file mode 100755 index 000000000..b7e659913 --- /dev/null +++ b/externals/vcpkg/ports/corrade/fix-vs2019.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e0cc288..e5a4648 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -195,7 +195,7 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + set(MSVC2017_COMPATIBILITY ON) + message(WARNING "MSVC 2017 detected, automatically enabling MSVC2017_COMPATIBILITY. Note that some features may not be available with this compiler.") + endif() +- elseif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19.30") ++ elseif(CMAKE_CXX_COMPILER_VERSION GREATER "19.20") + if(NOT MSVC2019_COMPATIBILITY) + set(MSVC2019_COMPATIBILITY ON) + message(WARNING "MSVC 2019 detected, automatically enabling MSVC2019_COMPATIBILITY. Note that some features may not be available with this compiler.") diff --git a/externals/vcpkg/ports/corrade/portfile.cmake b/externals/vcpkg/ports/corrade/portfile.cmake new file mode 100755 index 000000000..8dd02a9a6 --- /dev/null +++ b/externals/vcpkg/ports/corrade/portfile.cmake @@ -0,0 +1,81 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mosra/corrade + REF v2020.06 + SHA512 94cc8959b0ee43ecd8d13a25307e7829d53dc6601628d97c32288d1704e2c0835b755bffc06b2105e6aa5a612f119a60e83cb475860b51e6a35999215c100227 + HEAD_REF master + PATCHES + fix-vs2019.patch + build-corrade-rc-always.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) + +# Handle features +set(_COMPONENTS "") +foreach(_feature IN LISTS ALL_FEATURES) + # Uppercase the feature name and replace "-" with "_" + string(TOUPPER "${_feature}" _FEATURE) + string(REPLACE "-" "_" _FEATURE "${_FEATURE}") + + # Final feature is empty, ignore it + if(_feature) + list(APPEND _COMPONENTS ${_feature} WITH_${_FEATURE}) + endif() +endforeach() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS}) + +set(corrade_rc_param "") +if(VCPKG_CROSSCOMPILING) + set(corrade_rc_param + "-DCORRADE_RC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/corrade/corrade-rc${VCPKG_HOST_EXECUTABLE_SUFFIX}" + ) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA # Disable this option if project cannot be built with Ninja + OPTIONS + ${FEATURE_OPTIONS} + "${corrade_rc_param}" + -DUTILITY_USE_ANSI_COLORS=ON + -DBUILD_STATIC=${BUILD_STATIC} + MAYBE_UNUSED_VARIABLES + CORRADE_RC_EXECUTABLE +) + +vcpkg_install_cmake() + +# Debug includes and share are the same as release +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# corrade-rc is not built when CMAKE_CROSSCOMPILING +if("utility" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES "corrade-rc" AUTO_CLEAN) +endif() + +# Ensure no empty folders are left behind +if(NOT FEATURES) + # No features, no binaries (only Corrade.h). + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/lib" + "${CURRENT_PACKAGES_DIR}/debug") + # debug is completely empty, as include and share + # have already been removed. + +elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # No dlls + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/corrade/vcpkg.json b/externals/vcpkg/ports/corrade/vcpkg.json new file mode 100755 index 000000000..17c71da34 --- /dev/null +++ b/externals/vcpkg/ports/corrade/vcpkg.json @@ -0,0 +1,61 @@ +{ + "name": "corrade", + "version-string": "2020.06", + "port-version": 4, + "description": "C++11/C++14 multiplatform utility library.", + "homepage": "https://magnum.graphics/corrade/", + "dependencies": [ + { + "name": "corrade", + "host": true, + "default-features": false, + "features": [ + "utility" + ] + } + ], + "default-features": [ + "interconnect", + "pluginmanager", + "testsuite", + "utility" + ], + "features": { + "interconnect": { + "description": "Interconnect library", + "dependencies": [ + { + "name": "corrade", + "features": [ + "utility" + ] + } + ] + }, + "pluginmanager": { + "description": "PluginManager library", + "dependencies": [ + { + "name": "corrade", + "features": [ + "utility" + ] + } + ] + }, + "testsuite": { + "description": "TestSuite library", + "dependencies": [ + { + "name": "corrade", + "features": [ + "utility" + ] + } + ] + }, + "utility": { + "description": "Utility library" + } + } +} diff --git a/externals/vcpkg/ports/cpp-base64/portfile.cmake b/externals/vcpkg/ports/cpp-base64/portfile.cmake new file mode 100755 index 000000000..2e4defadc --- /dev/null +++ b/externals/vcpkg/ports/cpp-base64/portfile.cmake @@ -0,0 +1,13 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ReneNyffenegger/cpp-base64 + REF V2.rc.08 # V2.rc.08 + SHA512 8d115c3341bee31c3d83f5ad07d457a507f42d58bb5db8d9ead213494f7f25065eeeac06226f9cc34235c0360eb893e7bc66a95aa3bfbc9ea0d179f5a0b7af0a + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/base64.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) +file(COPY ${SOURCE_PATH}/base64.cpp DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/cpp-base64/vcpkg.json b/externals/vcpkg/ports/cpp-base64/vcpkg.json new file mode 100755 index 000000000..b0918e770 --- /dev/null +++ b/externals/vcpkg/ports/cpp-base64/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "cpp-base64", + "version-string": "V2.rc.08", + "description": "Base64 encoding and decoding with c++.", + "homepage": "https://github.com/ReneNyffenegger/cpp-base64/" +} diff --git a/externals/vcpkg/ports/cpp-httplib/portfile.cmake b/externals/vcpkg/ports/cpp-httplib/portfile.cmake new file mode 100755 index 000000000..fe22c0e76 --- /dev/null +++ b/externals/vcpkg/ports/cpp-httplib/portfile.cmake @@ -0,0 +1,13 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO yhirose/cpp-httplib + REF 9452c0a4b69c5e4e31169ed32e961d330695122c #v0.10.7 + SHA512 23c4ca159ed4ddf29c3911436436502df76420d8bc8b202f290627de96ee6a741b74409a90f943f3fbbb59af1975bd8c36a94bd4c5eff3981f4514feb326e110 + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/httplib.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/cpp-httplib/vcpkg.json b/externals/vcpkg/ports/cpp-httplib/vcpkg.json new file mode 100755 index 000000000..9c06a6f65 --- /dev/null +++ b/externals/vcpkg/ports/cpp-httplib/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cpp-httplib", + "version": "0.10.7", + "description": "A single file C++11 header-only HTTP/HTTPS server and client library", + "homepage": "https://github.com/yhirose/cpp-httplib", + "license": "MIT" +} diff --git a/externals/vcpkg/ports/cpp-ipc/portfile.cmake b/externals/vcpkg/ports/cpp-ipc/portfile.cmake new file mode 100755 index 000000000..6dfacba15 --- /dev/null +++ b/externals/vcpkg/ports/cpp-ipc/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mutouyun/cpp-ipc + REF f2f1af8f8e7877a28deb2eacdc379a22a99e4c82 #v1.2.0 + SHA512 e01fe5e2612141af64a9c44773a49c566b89ecf0a77164c6eb0a6d68bd7ff5830843ce42df5d53a863882b582a8d6a2e9f69026f244d8d1d96e83f0f4c9e8972 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBIPC_BUILD_SHARED_LIBS) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" LIBIPC_USE_STATIC_CRT) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DLIBIPC_BUILD_SHARED_LIBS:BOOL=${LIBIPC_BUILD_SHARED_LIBS} + -DLIBIPC_USE_STATIC_CRT:BOOL=${LIBIPC_USE_STATIC_CRT} + -DLIBIPC_BUILD_TESTS:BOOL=OFF + -DLIBIPC_BUILD_DEMOS:BOOL=OFF +) + +vcpkg_cmake_install() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/cpp-ipc") + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cpp-ipc) +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/share/cpp-ipc") + vcpkg_cmake_config_fixup(CONFIG_PATH share/cpp-ipc) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libipc/export.h" "#elif defined(LIBIPC_LIBRARY_SHARED_USING__)" "#elif 1") +endif() + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/externals/vcpkg/ports/cpp-ipc/vcpkg.json b/externals/vcpkg/ports/cpp-ipc/vcpkg.json new file mode 100755 index 000000000..62e2bb49f --- /dev/null +++ b/externals/vcpkg/ports/cpp-ipc/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "cpp-ipc", + "version": "1.2.0", + "description": "C++ IPC Library: A high-performance inter-process communication using shared memory on Linux/Windows.", + "homepage": "https://github.com/mutouyun/cpp-ipc", + "supports": "!osx", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/cpp-jwt/portfile.cmake b/externals/vcpkg/ports/cpp-jwt/portfile.cmake new file mode 100755 index 000000000..148fbb395 --- /dev/null +++ b/externals/vcpkg/ports/cpp-jwt/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO arun11299/cpp-jwt + REF 0d662241daf54d8b9911bf8f54784bd2da5a3d19 + SHA512 06a508872f0920ed078b5f9250fe1d5011ad41773c4b8631d7c7947d9f9be4d5e24ca4a7d98c79eb8cd14118effa8893a862089bdc90af6d75031bbb9fc2ee5f + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCPP_JWT_BUILD_EXAMPLES=off + -DCPP_JWT_BUILD_TESTS=off + -DCPP_JWT_USE_VENDORED_NLOHMANN_JSON=off +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/cpp-jwt/vcpkg.json b/externals/vcpkg/ports/cpp-jwt/vcpkg.json new file mode 100755 index 000000000..88e12684f --- /dev/null +++ b/externals/vcpkg/ports/cpp-jwt/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "cpp-jwt", + "version-date": "2021-10-18", + "description": "JSON Web Token library for C++", + "homepage": "https://github.com/arun11299/cpp-jwt", + "dependencies": [ + "nlohmann-json", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/cpp-netlib/portfile.cmake b/externals/vcpkg/ports/cpp-netlib/portfile.cmake new file mode 100755 index 000000000..4674917b6 --- /dev/null +++ b/externals/vcpkg/ports/cpp-netlib/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cpp-netlib/cpp-netlib + REF 31d304cdf52b485f465ada433d8905171b61cbff + SHA512 6d157e6d950dd76a6d16b9c13d4d29f188d9f540eb0b44ab169016e1d7a360995e51d9923b532503a17dd2c8e0e2a38b2f9b531db03b33239e7fb9ca4d047b0c + HEAD_REF master + # Updator's note: cpp-netlib has many templates that are not fully instantiated when not building examples. + # This patch specifically fixes one of those issues + # To test updates, enable building examples below (may also require patching out uses of cxxopts) + PATCHES stream-handler-executor.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCPP-NETLIB_BUILD_TESTS=OFF + -DCPP-NETLIB_BUILD_EXAMPLES=OFF +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/cppnetlib) +else() + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cppnetlib TARGET_PATH share/cppnetlib) +endif() + +file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/cpp-netlib/stream-handler-executor.patch b/externals/vcpkg/ports/cpp-netlib/stream-handler-executor.patch new file mode 100755 index 000000000..7152f2349 --- /dev/null +++ b/externals/vcpkg/ports/cpp-netlib/stream-handler-executor.patch @@ -0,0 +1,27 @@ +diff --git a/boost/network/protocol/stream_handler.hpp b/boost/network/protocol/stream_handler.hpp +index ffb09b8..f3b3e99 100644 +--- a/boost/network/protocol/stream_handler.hpp ++++ b/boost/network/protocol/stream_handler.hpp +@@ -41,6 +40,7 @@ typedef boost::asio::ssl::context ssl_context; + + struct stream_handler { + public: ++ typedef tcp_socket::executor_type executor_type; + stream_handler(std::shared_ptr socket) + : tcp_sock_(std::move(socket)), ssl_enabled(false) {} + +@@ -52,12 +52,12 @@ struct stream_handler { + stream_handler(boost::asio::io_service& io, + std::shared_ptr ctx = + std::shared_ptr()) { +- tcp_sock_ = std::make_shared(boost::ref(io)); ++ tcp_sock_ = std::make_shared(io.get_executor()); + ssl_enabled = false; + if (ctx) { + /// SSL is enabled + ssl_sock_ = +- std::make_shared(boost::ref(io), boost::ref(*ctx)); ++ std::make_shared(io.get_executor(), boost::ref(*ctx)); + ssl_enabled = true; + } + } diff --git a/externals/vcpkg/ports/cpp-netlib/vcpkg.json b/externals/vcpkg/ports/cpp-netlib/vcpkg.json new file mode 100755 index 000000000..40f200d78 --- /dev/null +++ b/externals/vcpkg/ports/cpp-netlib/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "cpp-netlib", + "version-string": "0.13.0", + "port-version": 6, + "description": "A collection of network-related routines/implementations geared towards providing a robust cross-platform networking library", + "homepage": "https://cpp-netlib.org/", + "supports": "!uwp", + "dependencies": [ + "boost-asio", + "boost-assign", + "boost-logic", + "boost-program-options", + "boost-scope-exit", + "boost-smart-ptr", + "boost-spirit" + ] +} diff --git a/externals/vcpkg/ports/cpp-peglib/portfile.cmake b/externals/vcpkg/ports/cpp-peglib/portfile.cmake new file mode 100755 index 000000000..c365ad781 --- /dev/null +++ b/externals/vcpkg/ports/cpp-peglib/portfile.cmake @@ -0,0 +1,16 @@ +#header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO yhirose/cpp-peglib + REF adfd2d6014f6cce9510ac2374b277ac8fb931c49 + SHA512 8a930286a20098efc053988bd5b7e0d3117ce3851a79acf3c9991b75ff85a6340d106522f66ee322f8e7809143f9f74fa1fb051da277db02532dface5cb6f5c3 + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/peglib.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cpp-peglib" RENAME copyright) + diff --git a/externals/vcpkg/ports/cpp-peglib/vcpkg.json b/externals/vcpkg/ports/cpp-peglib/vcpkg.json new file mode 100755 index 000000000..01021728c --- /dev/null +++ b/externals/vcpkg/ports/cpp-peglib/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "cpp-peglib", + "version": "1.3.10", + "description": "C++11 header-only PEG (Parsing Expression Grammars) library.", + "license": "MIT" +} diff --git a/externals/vcpkg/ports/cpp-redis/fix-sleep_for.patch b/externals/vcpkg/ports/cpp-redis/fix-sleep_for.patch new file mode 100755 index 000000000..54bc953f3 --- /dev/null +++ b/externals/vcpkg/ports/cpp-redis/fix-sleep_for.patch @@ -0,0 +1,12 @@ +diff --git a/sources/core/client.cpp b/sources/core/client.cpp +index 7ea20e2..c5d2c40 100644 +--- a/sources/core/client.cpp ++++ b/sources/core/client.cpp +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + namespace cpp_redis { + diff --git a/externals/vcpkg/ports/cpp-redis/portfile.cmake b/externals/vcpkg/ports/cpp-redis/portfile.cmake new file mode 100755 index 000000000..f12a5709b --- /dev/null +++ b/externals/vcpkg/ports/cpp-redis/portfile.cmake @@ -0,0 +1,62 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cpp-redis/cpp_redis + REF 4.3.1 + SHA512 abf372542c53f37f504b3211b840b100d07a8f4b2e7f5584cc7550ab16ed617838e2df79064374c7a409458d8567f4834686318ea3a40249c767e36c744c7a47 + HEAD_REF master + PATCHES + "fix-sleep_for.patch" +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/tacopie/CMakeLists.txt DESTINATION ${SOURCE_PATH}/tacopie) + +if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + set(MSVC_RUNTIME_LIBRARY_CONFIG "/MD") +else() + set(MSVC_RUNTIME_LIBRARY_CONFIG "/MT") +endif() + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) + # cpp-redis forcibly removes "/RTC1" in its cmake file. Because this is an ABI-sensitive flag, we need to re-add it in a form that won't be detected. + set(VCPKG_CXX_FLAGS_DEBUG "${VCPKG_CXX_FLAGS_DEBUG} -RTC1") + set(VCPKG_C_FLAGS_DEBUG "${VCPKG_C_FLAGS_DEBUG} -RTC1") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DMSVC_RUNTIME_LIBRARY_CONFIG=${MSVC_RUNTIME_LIBRARY_CONFIG} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(GLOB_RECURSE FILES "${CURRENT_PACKAGES_DIR}/include/*") +foreach(file ${FILES}) + file(READ ${file} _contents) + string(REPLACE "ifndef __CPP_REDIS_USE_CUSTOM_TCP_CLIENT" "if 1" _contents "${_contents}") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + string(REPLACE + "extern std::unique_ptr active_logger;" + "extern __declspec(dllimport) std::unique_ptr active_logger;" + _contents "${_contents}") + endif() + file(WRITE ${file} "${_contents}") +endforeach() + +file(GLOB FILES_TO_REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/cpp_redis.ilk" "${CURRENT_PACKAGES_DIR}/bin/cpp_redis.dll.manifest") +if(FILES_TO_REMOVE) + file(REMOVE_RECURSE ${FILES_TO_REMOVE}) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/cpp-redis/tacopie/CMakeLists.txt b/externals/vcpkg/ports/cpp-redis/tacopie/CMakeLists.txt new file mode 100755 index 000000000..74959e2e1 --- /dev/null +++ b/externals/vcpkg/ports/cpp-redis/tacopie/CMakeLists.txt @@ -0,0 +1,8 @@ +find_library(TACOPIE tacopie) +find_path(TACOPIE_H tacopie/tacopie) + +message(STATUS "TACOPIE_H: ${TACOPIE_H}") + +add_library(tacopie INTERFACE) +target_link_libraries(tacopie INTERFACE "${TACOPIE}") +target_include_directories(tacopie INTERFACE "${TACOPIE_H}") \ No newline at end of file diff --git a/externals/vcpkg/ports/cpp-redis/vcpkg.json b/externals/vcpkg/ports/cpp-redis/vcpkg.json new file mode 100755 index 000000000..604bfd19d --- /dev/null +++ b/externals/vcpkg/ports/cpp-redis/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "cpp-redis", + "version": "4.3.1", + "port-version": 5, + "description": "cpp-redis is a C++11 Asynchronous Multi-Platform Lightweight Redis Client, with support for synchronous operations and pipelining.", + "homepage": "https://github.com/cpp-redis/cpp_redis", + "license": "MIT", + "dependencies": [ + "tacopie", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/cpp-taskflow/portfile.cmake b/externals/vcpkg/ports/cpp-taskflow/portfile.cmake new file mode 100755 index 000000000..0988d57b2 --- /dev/null +++ b/externals/vcpkg/ports/cpp-taskflow/portfile.cmake @@ -0,0 +1,2 @@ +message(WARNING "The port 'cpp-taskflow' has been replaced with 'taskflow'.") +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/cpp-taskflow/vcpkg.json b/externals/vcpkg/ports/cpp-taskflow/vcpkg.json new file mode 100755 index 000000000..ca690bb21 --- /dev/null +++ b/externals/vcpkg/ports/cpp-taskflow/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "cpp-taskflow", + "version-string": "2.6.0", + "port-version": 1, + "description": "Fast Parallel Tasking Programming Library using Modern C++.", + "homepage": "https://github.com/taskflow/taskflow", + "dependencies": [ + "taskflow" + ] +} diff --git a/externals/vcpkg/ports/cpp-timsort/portfile.cmake b/externals/vcpkg/ports/cpp-timsort/portfile.cmake new file mode 100755 index 000000000..b5a5e47be --- /dev/null +++ b/externals/vcpkg/ports/cpp-timsort/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO timsort/cpp-TimSort + REF v2.1.0 + SHA512 57fe79d3174d9939a3212282cf64f4fdd90586eba806f57df65eb42c2b4783a68f39bd2b6709830b1688ae15f1a83f554468059b2ddf52b31805bfd23efc7db1 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gfx PACKAGE_NAME gfx-timsort) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/cpp-timsort/vcpkg.json b/externals/vcpkg/ports/cpp-timsort/vcpkg.json new file mode 100755 index 000000000..334f1d78b --- /dev/null +++ b/externals/vcpkg/ports/cpp-timsort/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "cpp-timsort", + "version": "2.1.0", + "description": "A C++ implementation of timsort", + "homepage": "https://github.com/timsort/cpp-TimSort", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/cppad/portfile.cmake b/externals/vcpkg/ports/cppad/portfile.cmake new file mode 100755 index 000000000..23ddddb60 --- /dev/null +++ b/externals/vcpkg/ports/cppad/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO coin-or/CppAD + REF 90c510458b61049c51f937fc6ed2e611fbb17b8b #20210000.7 + SHA512 112a4663a3e13f2d852c4ce4e57f6bee2dc7584915fcbab75972568258faab0d4a5761c4eaa4c664543cb8674e8e70c0623054c07dff933f9513a47f1c7d6261 + HEAD_REF master + PATCHES + windows-fix.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -Dcppad_prefix=${CURRENT_PACKAGES_DIR} + OPTIONS_RELEASE + -Dcmake_install_libdirs=lib + -Dcppad_debug_which:STRING=debug_none + OPTIONS_DEBUG + -Dcmake_install_libdirs=debug/lib +) + +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/pkgconfig") + +# Add the copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/cppad/vcpkg.json b/externals/vcpkg/ports/cppad/vcpkg.json new file mode 100755 index 000000000..494ccdfa5 --- /dev/null +++ b/externals/vcpkg/ports/cppad/vcpkg.json @@ -0,0 +1,19 @@ +{ + "$comment": "See related issue for compilation failure on UWP and ARM: https://github.com/microsoft/vcpkg/pull/12560#issuecomment-668412073", + "name": "cppad", + "version-string": "20210000.7", + "port-version": 3, + "description": "CppAD: A Package for Differentiation of C++ Algorithms", + "homepage": "https://github.com/coin-or/CppAD", + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/cppad/windows-fix.patch b/externals/vcpkg/ports/cppad/windows-fix.patch new file mode 100755 index 000000000..585e3294e --- /dev/null +++ b/externals/vcpkg/ports/cppad/windows-fix.patch @@ -0,0 +1,48 @@ +diff --git a/include/cppad/local/cppad_colpack.hpp b/include/cppad/local/cppad_colpack.hpp +index ee96ab5fe..6dd022180 100644 +--- a/include/cppad/local/cppad_colpack.hpp ++++ b/include/cppad/local/cppad_colpack.hpp +@@ -59,7 +59,7 @@ it is not the case that both + This routine tries to minimize, with respect to the choice of colors, + the number of colors. + */ +-extern void cppad_colpack_general( ++CPPAD_LIB_EXPORT void cppad_colpack_general( + CppAD::vector& color , + size_t m , + size_t n , +@@ -91,7 +91,7 @@ The properties of this coloring have not yet been determined; see + Efficient Computation of Sparse Hessians Using Coloring + and Automatic Differentiation (pdf/ad/gebemedhin14.pdf) + */ +-extern void cppad_colpack_symmetric( ++CPPAD_LIB_EXPORT void cppad_colpack_symmetric( + CppAD::vector& color , + size_t n , + const CppAD::vector& adolc_pattern +diff --git a/include/cppad/local/graph/json_parser.hpp b/include/cppad/local/graph/json_parser.hpp +index 17bcc7c7e..a28d2c045 100644 +--- a/include/cppad/local/graph/json_parser.hpp ++++ b/include/cppad/local/graph/json_parser.hpp +@@ -42,7 +42,7 @@ Upon return it is a $cref cpp_ad_graph$$ representation of this function. + $head Prototype$$ + $srccode%hpp% */ + namespace CppAD { namespace local { namespace graph { +- void json_parser( ++ CPPAD_LIB_EXPORT void json_parser( + const std::string& json , + cpp_graph& graph_obj + ); +diff --git a/include/cppad/local/graph/json_writer.hpp b/include/cppad/local/graph/json_writer.hpp +index 36a4cb39f..299c56cc0 100644 +--- a/include/cppad/local/graph/json_writer.hpp ++++ b/include/cppad/local/graph/json_writer.hpp +@@ -41,7 +41,7 @@ This is a $code cpp_graph$$ object. + $head Prototype$$ + $srccode%hpp% */ + namespace CppAD { namespace local { namespace graph { +- void json_writer( ++ CPPAD_LIB_EXPORT void json_writer( + std::string& json , + const cpp_graph& graph_obj + ); diff --git a/externals/vcpkg/ports/cppcms/portfile.cmake b/externals/vcpkg/ports/cppcms/portfile.cmake new file mode 100755 index 000000000..54bc57039 --- /dev/null +++ b/externals/vcpkg/ports/cppcms/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO artyom-beilis/cppcms + REF b72b19915794d1af63c9a9e9bea58e20a4ad93d4 + SHA512 e99d34d14fbde22be725ac2c0bec069fb584e45c66767af75efaf454ca61a7a5e57434bf86109f910884c72202b8cf98fe16505e7d3d30d9218abd4d8b27d5df +) + +vcpkg_find_acquire_program(PYTHON2) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DPYTHON=${PYTHON2} # Switch to python3 on the next update + -DUSE_WINDOWS6_API=ON +) + +vcpkg_install_cmake() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(GLOB EXE_DEBUG_FILES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) +file(REMOVE ${EXE_DEBUG_FILES}) +file(GLOB EXE_FILES ${CURRENT_PACKAGES_DIR}/bin/*.exe) +file(REMOVE ${EXE_FILES}) + +file(INSTALL ${SOURCE_PATH}/MIT.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/cppcms/vcpkg.json b/externals/vcpkg/ports/cppcms/vcpkg.json new file mode 100755 index 000000000..601d57550 --- /dev/null +++ b/externals/vcpkg/ports/cppcms/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "cppcms", + "version-string": "1.2.1", + "port-version": 4, + "description": "CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed at Rapid Web Application Development", + "homepage": "https://github.com/artyom-beilis/cppcms", + "supports": "!(linux | osx)", + "dependencies": [ + "icu", + "openssl", + "pcre", + "zlib" + ] +} diff --git a/externals/vcpkg/ports/cppcodec/portfile.cmake b/externals/vcpkg/ports/cppcodec/portfile.cmake new file mode 100755 index 000000000..792e734f5 --- /dev/null +++ b/externals/vcpkg/ports/cppcodec/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tplgy/cppcodec + REF v0.2 + SHA512 50c9c81cdb12560c87e513e1fd22c1ad24ea37b7d20a0e3044d43fb887f4c6494c69468e4d0811cd2fc1ae8fdb01b01cfb9f3cfdd8611d4bb0221cbd38cbead3 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTING=OFF + +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/cppcodec/vcpkg.json b/externals/vcpkg/ports/cppcodec/vcpkg.json new file mode 100755 index 000000000..1066a7b85 --- /dev/null +++ b/externals/vcpkg/ports/cppcodec/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "cppcodec", + "version-string": "0.2", + "port-version": 2, + "description": "Header-only C++11 library to encode/decode base64, base64url, base32, base32hex and hex (a.k.a. base16) as specified in RFC 4648, plus Crockford's base32." +} diff --git a/externals/vcpkg/ports/cppcoro/CMakeLists.txt b/externals/vcpkg/ports/cppcoro/CMakeLists.txt new file mode 100755 index 000000000..975dae4f2 --- /dev/null +++ b/externals/vcpkg/ports/cppcoro/CMakeLists.txt @@ -0,0 +1,202 @@ +cmake_minimum_required(VERSION 3.8) +project(cppcoro VERSION 2020.2 LANGUAGES CXX) + +set(CMAKE_CXX_STANDARD 17) + +add_library(cppcoro + lib/async_mutex.cpp + lib/lightweight_manual_reset_event.cpp + lib/async_auto_reset_event.cpp + lib/async_manual_reset_event.cpp + lib/auto_reset_event.cpp + lib/auto_reset_event.hpp + lib/cancellation_registration.cpp + lib/cancellation_source.cpp + lib/cancellation_state.cpp + lib/cancellation_state.hpp + lib/cancellation_token.cpp + lib/spin_mutex.cpp + lib/spin_mutex.hpp + lib/spin_wait.cpp + lib/spin_wait.hpp + lib/static_thread_pool.cpp + lib/ip_address.cpp + lib/ip_endpoint.cpp + lib/ipv4_address.cpp + lib/ipv4_endpoint.cpp + lib/ipv6_address.cpp + lib/ipv6_endpoint.cpp +) + +if(APPLE) + message(STATUS "using sysroot: ${CMAKE_OSX_SYSROOT}") +elseif(WIN32) + message(STATUS "using platform: ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}") + # for now, build in single target + target_sources(cppcoro + PRIVATE + lib/win32.cpp + lib/file.cpp + lib/file_read_operation.cpp + lib/file_write_operation.cpp + lib/read_only_file.cpp + lib/read_write_file.cpp + lib/readable_file.cpp + lib/writable_file.cpp + lib/write_only_file.cpp + lib/socket.cpp + lib/socket_accept_operation.cpp + lib/socket_connect_operation.cpp + lib/socket_send_operation.cpp + lib/socket_send_to_operation.cpp + lib/socket_disconnect_operation.cpp + lib/socket_helpers.cpp + lib/socket_helpers.hpp + lib/socket_recv_from_operation.cpp + lib/socket_recv_operation.cpp + lib/io_service.cpp + ) +elseif(CMAKE_SYSTEM_NAME MATCHES "Linux") + message(STATUS "using system: ${CMAKE_HOST_SYSTEM_VERSION}") +endif() + +target_include_directories(cppcoro +PUBLIC + $ + $ +) + +if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") + if(WIN32) + message(FATAL_ERROR " doesn't support clang-cl compiler") + else() + target_compile_options(cppcoro + PUBLIC + -std=c++1z -fcoroutines-ts + -stdlib=libc++ + ) + target_link_libraries(cppcoro + PUBLIC + c++ pthread + ) + endif() + +elseif(MSVC) + target_compile_options(cppcoro + PUBLIC + /await + PRIVATE + "/analyze:max_paths 512" + -D_SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING=1 + ) + if(CMAKE_GENERATOR_PLATFORM STREQUAL x64) + target_compile_options(cppcoro + PUBLIC + /await:heapelide + ) + endif() + +endif() + +if(WIN32) + target_link_libraries(cppcoro + PUBLIC + kernel32 synchronization ws2_32 mswsock + # msvcrt[d] msvcprt[d] vcruntime ucrt + ) +elseif(APPLE) + +elseif(CMAKE_SYSTEM_NAME MATCHES Linux) + target_link_libraries(cppcoro + PUBLIC + c++ # stdc++ # expect libc++ instead of libstdc++ + ) +endif() + +install(DIRECTORY include/cppcoro + DESTINATION include +) + +install(TARGETS cppcoro + EXPORT ${PROJECT_NAME}-config + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(EXPORT ${PROJECT_NAME}-config + DESTINATION share/${PROJECT_NAME} +) + +include(CMakePackageConfigHelpers) +set(VERSION_FILE_PATH ${CMAKE_BINARY_DIR}/cmake/${PROJECT_NAME}-config-version.cmake) +write_basic_package_version_file(${VERSION_FILE_PATH} + VERSION ${PROJECT_VERSION} + COMPATIBILITY SameMajorVersion +) + +install(FILES ${VERSION_FILE_PATH} + DESTINATION share/${PROJECT_NAME} +) + +if(NOT BUILD_TESTING) + return() +endif() +enable_testing() +find_package(Threads REQUIRED) + +add_executable(cppcoro_test + test/main.cpp test/counted.cpp + test/generator_tests.cpp + # test/recursive_generator_tests.cpp # clang crash + test/async_generator_tests.cpp + test/async_auto_reset_event_tests.cpp + test/async_manual_reset_event_tests.cpp + test/async_mutex_tests.cpp + test/async_latch_tests.cpp + test/cancellation_token_tests.cpp + test/task_tests.cpp + test/sequence_barrier_tests.cpp + test/shared_task_tests.cpp + test/sync_wait_tests.cpp + test/single_consumer_async_auto_reset_event_tests.cpp + test/single_producer_sequencer_tests.cpp + test/multi_producer_sequencer_tests.cpp + test/when_all_tests.cpp + test/when_all_ready_tests.cpp + test/ip_address_tests.cpp + test/ip_endpoint_tests.cpp + test/ipv4_address_tests.cpp + test/ipv4_endpoint_tests.cpp + test/ipv6_address_tests.cpp + test/ipv6_endpoint_tests.cpp + test/static_thread_pool_tests.cpp +) + +target_link_libraries(cppcoro_test +PRIVATE + cppcoro + Threads::Threads +) + +find_package(doctest CONFIG REQUIRED) +get_target_property(DOCTEST_INCLUDE_DIR doctest::doctest + INTERFACE_INCLUDE_DIRECTORIES +) +message(STATUS "using doctest: ${DOCTEST_INCLUDE_DIR}") +target_link_libraries(cppcoro_test +PRIVATE + doctest::doctest +) + +if(WIN32) + target_sources(cppcoro_test + PRIVATE + test/scheduling_operator_tests.cpp + test/io_service_tests.cpp + test/file_tests.cpp + test/socket_tests.cpp + ) +endif() + +add_test(NAME test_all COMMAND cppcoro_test --duration=true ) \ No newline at end of file diff --git a/externals/vcpkg/ports/cppcoro/portfile.cmake b/externals/vcpkg/ports/cppcoro/portfile.cmake new file mode 100755 index 000000000..39c110e2a --- /dev/null +++ b/externals/vcpkg/ports/cppcoro/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +if(VCPKG_TARGET_IS_LINUX) + message("Warning: cppcoro requires libc++ and Clang on Linux. See https://github.com/microsoft/vcpkg/pull/10693#issuecomment-610394650.") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lewissbaker/cppcoro + REF 92892f31d0c41b8e34e6292d7c9d99228da5c501 + SHA512 d1997b7449f1c5c0790575d0755ffbb5f9eef13a7610f3ec666a585bdbb93bb1553f79214c1023a1ef23aaeef64078ca6ee3784107645d7a75c7bba943c10b84 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt + DESTINATION ${SOURCE_PATH} +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTING=False +) +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets() + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright +) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/externals/vcpkg/ports/cppcoro/vcpkg.json b/externals/vcpkg/ports/cppcoro/vcpkg.json new file mode 100755 index 000000000..794309e34 --- /dev/null +++ b/externals/vcpkg/ports/cppcoro/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "cppcoro", + "version-date": "2020-02-28", + "port-version": 3, + "description": "A library of C++ coroutine abstractions for the Coroutines TS", + "homepage": "https://github.com/lewissbaker/cppcoro", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/cppfs/LibCrypto-fix.patch b/externals/vcpkg/ports/cppfs/LibCrypto-fix.patch new file mode 100755 index 000000000..144d2aabe --- /dev/null +++ b/externals/vcpkg/ports/cppfs/LibCrypto-fix.patch @@ -0,0 +1,53 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ea9fd15..af63d1e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,7 +7,7 @@ + cmake_minimum_required(VERSION 3.0 FATAL_ERROR) + + # Include cmake modules +-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") ++# list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") + + include(GenerateExportHeader) + +diff --git a/source/cppfs/CMakeLists.txt b/source/cppfs/CMakeLists.txt +index aa37eda..d29176a 100644 +--- a/source/cppfs/CMakeLists.txt ++++ b/source/cppfs/CMakeLists.txt +@@ -4,18 +4,18 @@ + # + + find_package(LibSSH2) +-find_package(LibCrypto) ++# find_package(LibCrypto) + find_package(ZLIB) + find_package(OpenSSL) + +-if (LibSSH2_FOUND AND LibCrypto_FOUND AND ZLIB_FOUND AND OpenSSL_FOUND) ++if (LibSSH2_FOUND AND ZLIB_FOUND AND OpenSSL_FOUND) + set(SSH_DEPS_MET TRUE) + else() + set(SSH_DEPS_MET FALSE) + endif() + + if (OPTION_BUILD_SSH_BACKEND AND NOT SSH_DEPS_MET) +- message(FATAL_ERROR "Requested to build ssh module but not all dependencies are found! LibSSH2: ${LibSSH2_FOUND}, LibCrypto: ${LibCrypto_FOUND}, ZLIB: ${ZLIB_FOUND}, OpenSSL: ${OpenSSL_FOUND}") ++ message(FATAL_ERROR "Requested to build ssh module but not all dependencies are found! LibSSH2: ${LibSSH2_FOUND}, ZLIB: ${ZLIB_FOUND}, OpenSSL: ${OpenSSL_FOUND}") + endif() + + +@@ -207,10 +207,9 @@ target_link_libraries(${target} + if (OPTION_BUILD_SSH_BACKEND) + target_link_libraries(${target} + PRIVATE +- ${OPENSSL_LIBRARIES} +- ${LIBSSH2_LIBRARY} +- ${LIBCRYPTO_LIBRARY} +- ${ZLIB_LIBRARY} ++ Libssh2::libssh2 ++ OpenSSL::SSL OpenSSL::Crypto ++ ZLIB::ZLIB + ) + + if("${CMAKE_SYSTEM_NAME}" MATCHES "Windows") diff --git a/externals/vcpkg/ports/cppfs/cmake-export-fix.patch b/externals/vcpkg/ports/cppfs/cmake-export-fix.patch new file mode 100755 index 000000000..344700002 --- /dev/null +++ b/externals/vcpkg/ports/cppfs/cmake-export-fix.patch @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ea9fd15..c62c6fd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -124,7 +124,7 @@ endif() + if((UNIX AND SYSTEM_DIR_INSTALL) OR OPTION_FORCE_SYSTEM_DIR_INSTALL) + # Install into the system (/usr/bin or /usr/local/bin) + set(INSTALL_ROOT "share/${project}") # /usr/[local]/share/ +- set(INSTALL_CMAKE "share/${project}/cmake") # /usr/[local]/share//cmake ++ set(INSTALL_CMAKE "share/${project}") # /usr/[local]/share/ + set(INSTALL_EXAMPLES "share/${project}") # /usr/[local]/share/ + set(INSTALL_DATA "share/${project}") # /usr/[local]/share/ + set(INSTALL_BIN "bin") # /usr/[local]/bin +@@ -183,7 +183,7 @@ add_subdirectory(deploy) + install(FILES "${PROJECT_BINARY_DIR}/VERSION" DESTINATION ${INSTALL_ROOT} COMPONENT runtime) + + # Install cmake find script for the project +-install(FILES ${META_PROJECT_NAME}-config.cmake DESTINATION ${INSTALL_ROOT} COMPONENT dev) ++# install(FILES ${META_PROJECT_NAME}-config.cmake DESTINATION ${INSTALL_ROOT} COMPONENT dev) + + # Install the project meta files + install(FILES AUTHORS DESTINATION ${INSTALL_ROOT} COMPONENT runtime) +diff --git a/source/cppfs/CMakeLists.txt b/source/cppfs/CMakeLists.txt +index aa37eda..e8a59e0 100644 +--- a/source/cppfs/CMakeLists.txt ++++ b/source/cppfs/CMakeLists.txt +@@ -283,7 +283,7 @@ perform_health_checks( + + # Library + install(TARGETS ${target} +- EXPORT "${target}-export" COMPONENT dev ++ EXPORT "${target}-config" COMPONENT dev + RUNTIME DESTINATION ${INSTALL_BIN} COMPONENT runtime + LIBRARY DESTINATION ${INSTALL_SHARED} COMPONENT runtime + ARCHIVE DESTINATION ${INSTALL_LIB} COMPONENT dev +@@ -302,8 +302,8 @@ install(DIRECTORY + ) + + # CMake config +-install(EXPORT ${target}-export ++install(EXPORT ${target}-config + NAMESPACE ${META_PROJECT_NAME}:: +- DESTINATION ${INSTALL_CMAKE}/${target} ++ DESTINATION ${INSTALL_CMAKE} + COMPONENT dev + ) diff --git a/externals/vcpkg/ports/cppfs/portfile.cmake b/externals/vcpkg/ports/cppfs/portfile.cmake new file mode 100755 index 000000000..ce7c696ad --- /dev/null +++ b/externals/vcpkg/ports/cppfs/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cginternals/cppfs + REF 156d72e2cf0a9b12bdce369fc5b5d98fb5dffe2d # v1.3.0 + SHA512 da1e09f79d9e65e7676784f47196645aabe1e1284f0ea5e48e845a244f5d49f5ea4b032f9e2e38c8e6a29657ebe636c9b1c9a4601c4bbc7637e7f592c52a8961 + HEAD_REF master + PATCHES + LibCrypto-fix.patch + cmake-export-fix.patch +) + +if(${TARGET_TRIPLET} MATCHES "uwp") + message(FATAL_ERROR "cppfs does not support uwp") +endif() + +set(SSH_BACKEND OFF) +if("ssh" IN_LIST FEATURES) + set(SSH_BACKEND ON) + if("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") + message(FATAL_ERROR "SSH backend of cppfs does not support arm64.") + endif() +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DOPTION_BUILD_SSH_BACKEND=${SSH_BACKEND} + -DOPTION_BUILD_TESTS=Off + -DOPTION_FORCE_SYSTEM_DIR_INSTALL=On +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppfs RENAME copyright) diff --git a/externals/vcpkg/ports/cppfs/vcpkg.json b/externals/vcpkg/ports/cppfs/vcpkg.json new file mode 100755 index 000000000..75db6fc3e --- /dev/null +++ b/externals/vcpkg/ports/cppfs/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "cppfs", + "version-string": "1.3.0", + "port-version": 1, + "description": "Cross-platform C++ file system library supporting multiple backends", + "supports": "!uwp", + "features": { + "ssh": { + "description": "SSH backend for cppfs", + "dependencies": [ + "libssh2", + "openssl", + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/cppgraphqlgen/portfile.cmake b/externals/vcpkg/ports/cppgraphqlgen/portfile.cmake new file mode 100755 index 000000000..1270b2f9e --- /dev/null +++ b/externals/vcpkg/ports/cppgraphqlgen/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/cppgraphqlgen + REF v4.5.0 + SHA512 5a8eb6fc90aee05ae25245fac3e97a00c637d61340a070a28f1e5b7827d0e18ed01d3e6c4dcc138961769f7eef64ac8c6b33f7f16f8536d070a5ddffad0de414 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DGRAPHQL_BUILD_TESTS=OFF + -DGRAPHQL_UPDATE_VERSION=OFF + -DGRAPHQL_UPDATE_SAMPLES=OFF + -DGRAPHQL_INSTALL_CONFIGURATIONS=Release + OPTIONS_RELEASE + -DGRAPHQL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share + -DGRAPHQL_INSTALL_TOOLS_DIR=${CURRENT_PACKAGES_DIR}/tools + OPTIONS_DEBUG + -DGRAPHQL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share + -DGRAPHQL_INSTALL_TOOLS_DIR=${CURRENT_PACKAGES_DIR}/debug/tools +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +vcpkg_copy_tools( + TOOL_NAMES schemagen clientgen + SEARCH_DIR ${CURRENT_PACKAGES_DIR}/tools/cppgraphqlgen) + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/cppgraphqlgen/vcpkg.json b/externals/vcpkg/ports/cppgraphqlgen/vcpkg.json new file mode 100755 index 000000000..16e12c038 --- /dev/null +++ b/externals/vcpkg/ports/cppgraphqlgen/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "cppgraphqlgen", + "version": "4.5.0", + "description": "C++ GraphQL schema service generator", + "homepage": "https://github.com/microsoft/cppgraphqlgen", + "license": "MIT", + "dependencies": [ + "boost-program-options", + "pegtl", + "rapidjson", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/cppitertools/portfile.cmake b/externals/vcpkg/ports/cppitertools/portfile.cmake new file mode 100755 index 000000000..8d92a0f22 --- /dev/null +++ b/externals/vcpkg/ports/cppitertools/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ryanhaining/cppitertools + REF 539a5be8359c4330b3f88ed1821f32bb5c89f5f6 + SHA512 cab0cb8a6b711824c13ca013b3349b9decb84f2dab6305bfb1bdd013f7426d5b199c127dadabeaaafc2e7ff6ad442222dd0fffee9aaacfa27d3aeb82c344ae4f + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -Dcppitertools_INSTALL_CMAKE_DIR=share +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug + ${CURRENT_PACKAGES_DIR}/share/cppitertools-config-version.cmake) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE.md + DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppitertools + RENAME copyright) diff --git a/externals/vcpkg/ports/cppitertools/vcpkg.json b/externals/vcpkg/ports/cppitertools/vcpkg.json new file mode 100755 index 000000000..936e372f9 --- /dev/null +++ b/externals/vcpkg/ports/cppitertools/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "cppitertools", + "version": "2.1", + "port-version": 2, + "description": "Range-based for loop add-ons inspired by the Python builtins and itertools library", + "homepage": "https://github.com/ryanhaining/cppitertools", + "dependencies": [ + "boost-optional" + ] +} diff --git a/externals/vcpkg/ports/cppkafka/fix-dynamic.patch b/externals/vcpkg/ports/cppkafka/fix-dynamic.patch new file mode 100755 index 000000000..f18a0fbf7 --- /dev/null +++ b/externals/vcpkg/ports/cppkafka/fix-dynamic.patch @@ -0,0 +1,12 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 5d31078..b1d3634 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -43,6 +43,7 @@ target_include_directories(cppkafka PUBLIC ${PROJECT_SOURCE_DIR}/include) + + install( + TARGETS cppkafka ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + COMPONENT dev diff --git a/externals/vcpkg/ports/cppkafka/portfile.cmake b/externals/vcpkg/ports/cppkafka/portfile.cmake new file mode 100755 index 000000000..ccaee4ed4 --- /dev/null +++ b/externals/vcpkg/ports/cppkafka/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mfontanini/cppkafka + REF v0.3.1 + SHA512 60d01ce1dd9bd9119676be939ed5ab03539abb1f945c1b31e432edfe0f06542778f7fef37696f5ff19c53024f44d5cbd8aeddbbb231c38b098e05285d3ff0cab + HEAD_REF master + PATCHES fix-dynamic.patch +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(CPPKAFKA_BUILD_SHARED OFF) +else() + set(CPPKAFKA_BUILD_SHARED ON) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCPPKAFKA_BUILD_SHARED=${CPPKAFKA_BUILD_SHARED} + -DCPPKAFKA_DISABLE_TESTS=ON + -DCPPKAFKA_DISABLE_EXAMPLES=ON +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/cppkafka/vcpkg.json b/externals/vcpkg/ports/cppkafka/vcpkg.json new file mode 100755 index 000000000..00473d972 --- /dev/null +++ b/externals/vcpkg/ports/cppkafka/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "cppkafka", + "version-string": "0.3.1", + "port-version": 3, + "description": "cppkafka allows C++ applications to consume and produce messages using the Apache Kafka protocol. The library is built on top of librdkafka, and provides a high level API that uses modern C++ features to make it easier to write code while keeping the wrapper's performance overhead to a minimum.", + "homepage": "https://github.com/mfontanini/cppkafka", + "dependencies": [ + "boost-program-options", + "librdkafka" + ] +} diff --git a/externals/vcpkg/ports/cppmicroservices/fix-dependency-gtest.patch b/externals/vcpkg/ports/cppmicroservices/fix-dependency-gtest.patch new file mode 100755 index 000000000..9eb9459f1 --- /dev/null +++ b/externals/vcpkg/ports/cppmicroservices/fix-dependency-gtest.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 136edff..9d29522 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -288,6 +288,10 @@ if(US_COMPILER_APPLE_CLANG OR US_COMPILER_CLANG) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") + endif() + ++# Dependency ++find_package(GTest CONFIG REQUIRED) ++link_libraries(GTest::gtest GTest::gmock) ++ + #----------------------------------------------------------------------------- + # Testing configuration + #----------------------------------------------------------------------------- +@@ -338,7 +342,7 @@ if(US_BUILD_TESTING) + endif() + + if(US_USE_SYSTEM_GTEST) +- find_package(GTest REQUIRED) ++ find_package(GTest CONFIG REQUIRED) + else() + # This keeps GTest CMake variables hidden from users unless they explicitly want to view/modify them. + us_cache_var(BUILD_GMOCK ON BOOL "Build GMock" ADVANCED FORCE) diff --git a/externals/vcpkg/ports/cppmicroservices/fix-warning-c4834.patch b/externals/vcpkg/ports/cppmicroservices/fix-warning-c4834.patch new file mode 100755 index 000000000..893b28d30 --- /dev/null +++ b/externals/vcpkg/ports/cppmicroservices/fix-warning-c4834.patch @@ -0,0 +1,25 @@ +diff --git a/httpservice/src/ServletContainer.cpp b/httpservice/src/ServletContainer.cpp +index b4af8c9..8713066 100644 +--- a/httpservice/src/ServletContainer.cpp ++++ b/httpservice/src/ServletContainer.cpp +@@ -279,7 +279,9 @@ void ServletContainer::SetContextPath(const std::string& path) + + std::string ServletContainer::GetContextPath() const + { +- return Lock(d->m_Mutex), d->m_ContextPath; ++ Lock l(d->m_Mutex); ++ US_UNUSED(l); ++ return d->m_ContextPath; + } + + void ServletContainer::Start() +@@ -306,6 +308,8 @@ std::shared_ptr ServletContainer::GetContext( + std::string ServletContainer::GetContextPath( + const ServletContext* /*context*/) const + { +- return Lock(d->m_Mutex), d->m_ContextPath; ++ Lock l(d->m_Mutex); ++ US_UNUSED(l); ++ return d->m_ContextPath; + } + } diff --git a/externals/vcpkg/ports/cppmicroservices/portfile.cmake b/externals/vcpkg/ports/cppmicroservices/portfile.cmake new file mode 100755 index 000000000..f8f94aec1 --- /dev/null +++ b/externals/vcpkg/ports/cppmicroservices/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO CppMicroServices/CppMicroservices + REF v3.6.0 + SHA512 C1407E1D3C2FD31675C32D8C00F7D005C09B03A835D5B09411B0043DDEAF5E3A1A0C7A5FA34FA04D5A643169D222D0E8D3A3C31CDA69FB64CDF1A8CCA276BE18 + HEAD_REF development + PATCHES + werror.patch + fix-dependency-gtest.patch + fix-warning-c4834.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS + -DTOOLS_INSTALL_DIR:STRING=tools/cppmicroservices + -DAUXILIARY_INSTALL_DIR:STRING=share/cppmicroservices + -DUS_USE_SYSTEM_GTEST=TRUE +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_fixup_cmake_targets() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# CppMicroServices uses a custom resource compiler to compile resources +# the zipped resources are then appended to the target which cause the linker to crash +# when compiling a static library +if(NOT BUILD_SHARED_LIBS) + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +endif() \ No newline at end of file diff --git a/externals/vcpkg/ports/cppmicroservices/vcpkg.json b/externals/vcpkg/ports/cppmicroservices/vcpkg.json new file mode 100755 index 000000000..1ddf09e6e --- /dev/null +++ b/externals/vcpkg/ports/cppmicroservices/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "cppmicroservices", + "version": "3.6.0", + "description": "An OSGi-like C++ dynamic module system and service registry", + "homepage": "https://github.com/CppMicroServices/CppMicroServices", + "dependencies": [ + "gtest" + ] +} diff --git a/externals/vcpkg/ports/cppmicroservices/werror.patch b/externals/vcpkg/ports/cppmicroservices/werror.patch new file mode 100755 index 000000000..b06f43a72 --- /dev/null +++ b/externals/vcpkg/ports/cppmicroservices/werror.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 24fd87e..974064c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -382,7 +382,7 @@ else() + usFunctionCheckCompilerFlags(-fstack-protector-all US_CXX_FLAGS) + endif() + +- foreach(_cxxflag -Werror -Wall -Wextra -Wpointer-arith -Winvalid-pch -Wcast-align ++ foreach(_cxxflag -Wall -Wextra -Wpointer-arith -Winvalid-pch -Wcast-align + -Wwrite-strings -Woverloaded-virtual -Wnon-virtual-dtor -Wold-style-cast + -Wstrict-null-sentinel -Wsign-promo -fdiagnostics-show-option ) + usFunctionCheckCompilerFlags(${_cxxflag} US_CXX_FLAGS) diff --git a/externals/vcpkg/ports/cpprestsdk/fix-find-openssl.patch b/externals/vcpkg/ports/cpprestsdk/fix-find-openssl.patch new file mode 100755 index 000000000..ec420e677 --- /dev/null +++ b/externals/vcpkg/ports/cpprestsdk/fix-find-openssl.patch @@ -0,0 +1,18 @@ +diff --git a/Release/cmake/cpprest_find_openssl.cmake b/Release/cmake/cpprest_find_openssl.cmake +index 9333663..c1df089 100644 +--- a/Release/cmake/cpprest_find_openssl.cmake ++++ b/Release/cmake/cpprest_find_openssl.cmake +@@ -36,8 +36,11 @@ function(cpprest_find_openssl) + # Prefer a homebrew version of OpenSSL over the one in /usr/lib + file(GLOB OPENSSL_ROOT_DIR /usr/local/Cellar/openssl*/*) + # Prefer the latest (make the latest one first) +- list(REVERSE OPENSSL_ROOT_DIR) +- list(GET OPENSSL_ROOT_DIR 0 OPENSSL_ROOT_DIR) ++ if(OPENSSL_ROOT_DIR) ++ # Prefer the latest (make the latest one first) ++ list(REVERSE OPENSSL_ROOT_DIR) ++ list(GET OPENSSL_ROOT_DIR 0 OPENSSL_ROOT_DIR) ++ endif() + endif() + # This should prevent linking against the system provided 0.9.8y + message(STATUS "OPENSSL_ROOT_DIR = ${OPENSSL_ROOT_DIR}") diff --git a/externals/vcpkg/ports/cpprestsdk/portfile.cmake b/externals/vcpkg/ports/cpprestsdk/portfile.cmake new file mode 100755 index 000000000..666cb1c0b --- /dev/null +++ b/externals/vcpkg/ports/cpprestsdk/portfile.cmake @@ -0,0 +1,57 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Microsoft/cpprestsdk + REF 122d09549201da5383321d870bed45ecb9e168c5 + SHA512 c9ded33d3c67880e2471e479a38b40a14a9ff45d241e928b6339eca697b06ad621846260eca47b6b1b8a2bc9ab7bf4fea8d3e8e795cd430d8839beb530e16dd7 + HEAD_REF master + PATCHES fix-find-openssl.patch +) + +set(OPTIONS) +if(NOT VCPKG_TARGET_IS_UWP) + SET(WEBSOCKETPP_PATH "${CURRENT_INSTALLED_DIR}/share/websocketpp") + list(APPEND OPTIONS + -DWEBSOCKETPP_CONFIG=${WEBSOCKETPP_PATH} + -DWEBSOCKETPP_CONFIG_VERSION=${WEBSOCKETPP_PATH}) +endif() + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + brotli CPPREST_EXCLUDE_BROTLI + compression CPPREST_EXCLUDE_COMPRESSION + websockets CPPREST_EXCLUDE_WEBSOCKETS +) + +if(VCPKG_TARGET_IS_UWP) + set(configure_opts WINDOWS_USE_MSBUILD) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/Release" + ${configure_opts} + OPTIONS + ${OPTIONS} + ${FEATURE_OPTIONS} + -DBUILD_TESTS=OFF + -DBUILD_SAMPLES=OFF + -DCPPREST_EXPORT_DIR=share/cpprestsdk + -DWERROR=OFF + -DPKG_CONFIG_EXECUTABLE=FALSE + OPTIONS_DEBUG + -DCPPREST_INSTALL_HEADERS=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/share/${PORT}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/share" "${CURRENT_PACKAGES_DIR}/lib/share") + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/cpprest/details/cpprest_compat.h" + "#ifdef _NO_ASYNCRTIMP" "#if 1") +endif() + +file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/cpprestsdk/vcpkg.json b/externals/vcpkg/ports/cpprestsdk/vcpkg.json new file mode 100755 index 000000000..3a4610ef7 --- /dev/null +++ b/externals/vcpkg/ports/cpprestsdk/vcpkg.json @@ -0,0 +1,131 @@ +{ + "name": "cpprestsdk", + "version": "2.10.18", + "port-version": 1, + "description": [ + "C++11 JSON, REST, and OAuth library", + "The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services." + ], + "homepage": "https://github.com/Microsoft/cpprestsdk", + "dependencies": [ + { + "name": "boost-asio", + "platform": "!uwp & !windows" + }, + { + "name": "boost-chrono", + "platform": "!uwp & !windows" + }, + { + "name": "boost-date-time", + "platform": "!uwp & !windows" + }, + { + "name": "boost-filesystem", + "platform": "!uwp & !windows" + }, + { + "name": "boost-random", + "platform": "!uwp & !windows" + }, + { + "name": "boost-regex", + "platform": "!uwp & !windows" + }, + { + "name": "boost-system", + "platform": "!uwp & !windows" + }, + { + "name": "boost-thread", + "platform": "!uwp & !windows" + }, + { + "name": "openssl", + "platform": "!uwp & !windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "default-features" + ], + "features": { + "brotli": { + "description": "Brotli compression support", + "dependencies": [ + "brotli", + { + "name": "cpprestsdk", + "default-features": false, + "features": [ + "compression" + ] + } + ] + }, + "compression": { + "description": "HTTP Compression support", + "dependencies": [ + "zlib" + ] + }, + "default-features": { + "description": "Features installed by default", + "dependencies": [ + { + "name": "cpprestsdk", + "default-features": false, + "features": [ + "compression" + ] + }, + { + "name": "cpprestsdk", + "features": [ + "brotli" + ], + "platform": "windows" + } + ] + }, + "websockets": { + "description": "Websockets support", + "dependencies": [ + { + "name": "boost-date-time", + "platform": "!uwp" + }, + { + "name": "boost-regex", + "platform": "!uwp" + }, + { + "name": "boost-system", + "platform": "!uwp" + }, + { + "name": "cpprestsdk", + "default-features": false, + "features": [ + "compression" + ] + }, + { + "name": "openssl", + "platform": "!uwp" + }, + { + "name": "websocketpp", + "platform": "!uwp" + } + ] + } + } +} diff --git a/externals/vcpkg/ports/cpptoml/portfile.cmake b/externals/vcpkg/ports/cpptoml/portfile.cmake new file mode 100755 index 000000000..62ea5fdec --- /dev/null +++ b/externals/vcpkg/ports/cpptoml/portfile.cmake @@ -0,0 +1,14 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO skystrife/cpptoml + + REF fededad7169e538ca47e11a9ee9251bc361a9a65 + SHA512 2ec50f4585bca33bb343170470048a7d7e7902f1ffa5709cf84ddf9f53a899ff1cc9ffa49e059f6dad93d13823c4d2661bc8109e4356078cdbdfef1a2be6a622 + + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.h") + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cpptoml RENAME copyright) diff --git a/externals/vcpkg/ports/cpptoml/vcpkg.json b/externals/vcpkg/ports/cpptoml/vcpkg.json new file mode 100755 index 000000000..13afe69b4 --- /dev/null +++ b/externals/vcpkg/ports/cpptoml/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "cpptoml", + "version-string": "v0.1.1", + "port-version": 1, + "description": "A header-only library for parsing TOML configuration files." +} diff --git a/externals/vcpkg/ports/cppunit/CMakeLists.txt b/externals/vcpkg/ports/cppunit/CMakeLists.txt new file mode 100755 index 000000000..68b684db8 --- /dev/null +++ b/externals/vcpkg/ports/cppunit/CMakeLists.txt @@ -0,0 +1,51 @@ +project(cppunit) +cmake_minimum_required(VERSION 2.8.12) + +set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" + CACHE PATH "Installation directory for executables" +) +set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" + CACHE PATH "Installation directory for libraries" +) +set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" + CACHE PATH "Installation directory for headers" +) + +file(GLOB CPPUNIT_SRC RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" + "${CMAKE_CURRENT_SOURCE_DIR}/src/cppunit/*.cpp") +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) + +set(DLLPLUGINTESTER_SRC + ${CMAKE_CURRENT_SOURCE_DIR}/src/DllPlugInTester/CommandLineParser.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/DllPlugInTester/DllPlugInTester.cpp +) + +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/DllPlugInTester) + +if(WIN32) + set(CMAKE_DEBUG_POSTFIX d) +endif() + +if(BUILD_SHARED_LIBS) + add_library(cppunit SHARED ${CPPUNIT_SRC}) + add_definitions(-DCPPUNIT_BUILD_DLL) +else() + add_library(cppunit STATIC ${CPPUNIT_SRC}) +endif() + +add_executable(DllPlugInTester ${DLLPLUGINTESTER_SRC}) +target_link_libraries(DllPlugInTester cppunit) + +install(TARGETS cppunit + RUNTIME DESTINATION "${INSTALL_BIN_DIR}" + ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" + LIBRARY DESTINATION "${INSTALL_LIB_DIR}" +) + +install(TARGETS DllPlugInTester + RUNTIME DESTINATION "${INSTALL_BIN_DIR}" +) + +install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/cppunit" + DESTINATION "${INSTALL_INC_DIR}" +) diff --git a/externals/vcpkg/ports/cppunit/CppUnitConfig.cmake b/externals/vcpkg/ports/cppunit/CppUnitConfig.cmake new file mode 100755 index 000000000..b3e6146d1 --- /dev/null +++ b/externals/vcpkg/ports/cppunit/CppUnitConfig.cmake @@ -0,0 +1,83 @@ + +include(SelectLibraryConfigurations) + +find_path(CppUnit_INCLUDE_DIR TestCase.h PATH_SUFFIXES cppunit) +find_library(CppUnit_LIBRARY_RELEASE NAMES cppunit PATHS "${CMAKE_CURRENT_LIST_DIR}/../../lib" NO_DEFAULT_PATH) +find_library(CppUnit_LIBRARY_DEBUG NAMES cppunitd cppunit PATHS "${CMAKE_CURRENT_LIST_DIR}/../../debug/lib" NO_DEFAULT_PATH) +select_library_configurations(CppUnit) + +if(NOT CppUnit_LIBRARY) + set(CppUnit_FOUND FALSE) + set(CPPUNIT_FOUND FALSE) + return() +endif() + +if(WIN32) + find_file(CppUnit_LIBRARY_RELEASE_DLL NAMES cppunit.dll PATHS "${CMAKE_CURRENT_LIST_DIR}/../../bin" NO_DEFAULT_PATH) + find_file(CppUnit_LIBRARY_DEBUG_DLL NAMES cppunitd.dll PATHS "${CMAKE_CURRENT_LIST_DIR}/../../debug/bin" NO_DEFAULT_PATH) +endif() + +# Manage Release Windows shared +if(EXISTS "${CppUnit_LIBRARY_RELEASE_DLL}") + add_library(CppUnit SHARED IMPORTED) + set_target_properties(CppUnit PROPERTIES + IMPORTED_CONFIGURATIONS Release + IMPORTED_LOCATION_RELEASE "${CppUnit_LIBRARY_RELEASE_DLL}" + IMPORTED_IMPLIB_RELEASE "${CppUnit_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${CppUnit_INCLUDE_DIR}" + ) +endif() + +# Manage Debug Windows shared +if(EXISTS "${CppUnit_LIBRARY_DEBUG_DLL}") + if(EXISTS "${CppUnit_LIBRARY_RELEASE_DLL}") + set_target_properties(CppUnit PROPERTIES + IMPORTED_CONFIGURATIONS "Release;Debug" + IMPORTED_LOCATION_RELEASE "${CppUnit_LIBRARY_RELEASE_DLL}" + IMPORTED_IMPLIB_RELEASE "${CppUnit_LIBRARY_RELEASE}" + IMPORTED_LOCATION_DEBUG "${CppUnit_LIBRARY_DEBUG_DLL}" + IMPORTED_IMPLIB_DEBUG "${CppUnit_LIBRARY_DEBUG}" + INTERFACE_INCLUDE_DIRECTORIES "${CppUnit_INCLUDE_DIR}" + ) + else() + add_library(CppUnit SHARED IMPORTED) + set_target_properties(CppUnit PROPERTIES + IMPORTED_CONFIGURATIONS Debug + IMPORTED_LOCATION_DEBUG "${CppUnit_LIBRARY_DEBUG_DLL" + IMPORTED_IMPLIB_DEBUG "${CppUnit_LIBRARY_DEBUG}" + INTERFACE_INCLUDE_DIRECTORIES "${CppUnit_INCLUDE_DIR}" + ) + endif() +endif() + +# Manage Release Windows static and Linux shared/static +if((NOT EXISTS "${CppUnit_LIBRARY_RELEASE_DLL}") AND (EXISTS "${CppUnit_LIBRARY_RELEASE}")) + add_library(CppUnit UNKNOWN IMPORTED) + set_target_properties(CppUnit PROPERTIES + IMPORTED_CONFIGURATIONS Release + IMPORTED_LOCATION_RELEASE "${CppUnit_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${CppUnit_INCLUDE_DIR}" + ) +endif() + +# Manage Debug Windows static and Linux shared/static +if((NOT EXISTS "${CppUnit_LIBRARY_DEBUG_DLL}") AND (EXISTS "${CppUnit_LIBRARY_DEBUG}")) + if(EXISTS "${CppUnit_LIBRARY_RELEASE}") + set_target_properties(CppUnit PROPERTIES + IMPORTED_CONFIGURATIONS "Release;Debug" + IMPORTED_LOCATION_RELEASE "${CppUnit_LIBRARY_RELEASE}" + IMPORTED_LOCATION_DEBUG "${CppUnit_LIBRARY_DEBUG}" + INTERFACE_INCLUDE_DIRECTORIES "${CppUnit_INCLUDE_DIR}" + ) + else() + add_library(CppUnit UNKNOWN IMPORTED) + set_target_properties(CppUnit PROPERTIES + IMPORTED_CONFIGURATIONS Debug + IMPORTED_LOCATION_DEBUG "${CppUnit_LIBRARY_DEBUG}" + INTERFACE_INCLUDE_DIRECTORIES "${CppUnit_INCLUDE_DIR}" + ) + endif() +endif() + +set(CppUnit_FOUND TRUE) +set(CPPUNIT_FOUND TRUE) \ No newline at end of file diff --git a/externals/vcpkg/ports/cppunit/portfile.cmake b/externals/vcpkg/ports/cppunit/portfile.cmake new file mode 100755 index 000000000..5daefd732 --- /dev/null +++ b/externals/vcpkg/ports/cppunit/portfile.cmake @@ -0,0 +1,62 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz" + FILENAME "cppunit-1.15.1.tar.gz" + SHA512 0feb47faec451357bb4c4e287efa17bb60fd3ad966d5350e9f25b414aaab79e94921024b0c0497672f8d3eeb22a599213d2d71d9e1d28b243b3e37f3a9a43691 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" +) + +if(VCPKG_TARGET_IS_WINDOWS) + # Use a simple CMakeLists.txt to build CppUnit on windows + file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + ) + + vcpkg_cmake_install() + + # Move EXE to 'tools' + vcpkg_copy_tools(TOOL_NAMES DllPlugInTester AUTO_CLEAN) +else() + # Use a configure on unix. It should be doable to use the cmake, but may require some patching + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(LINKAGE_DYNAMIC yes) + set(LINKAGE_STATIC no) + else() + set(LINKAGE_DYNAMIC no) + set(LINKAGE_STATIC yes) + endif() + + vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + OPTIONS + "--enable-shared=${LINKAGE_DYNAMIC}" + "--enable-static=${LINKAGE_STATIC}" + "--prefix=${CURRENT_INSTALLED_DIR}" + "--disable-doxygen" + OPTIONS_DEBUG + "--enable-debug" + ) + + vcpkg_install_make() +endif() + +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# Install CppUnitConfig.cmake +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/CppUnitConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +# Cleanup +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) diff --git a/externals/vcpkg/ports/cppunit/vcpkg.json b/externals/vcpkg/ports/cppunit/vcpkg.json new file mode 100755 index 000000000..15fef69b6 --- /dev/null +++ b/externals/vcpkg/ports/cppunit/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "cppunit", + "version": "1.15.1", + "port-version": 3, + "description": "Unit testing framework module for the C++ programming language", + "homepage": "https://www.freedesktop.org/wiki/Software/cppunit", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true, + "platform": "windows" + }, + { + "name": "vcpkg-cmake-config", + "host": true, + "platform": "windows" + } + ] +} diff --git a/externals/vcpkg/ports/cpputest/fix-arm-build-error.patch b/externals/vcpkg/ports/cpputest/fix-arm-build-error.patch new file mode 100755 index 000000000..5b017cb63 --- /dev/null +++ b/externals/vcpkg/ports/cpputest/fix-arm-build-error.patch @@ -0,0 +1,20 @@ +diff --git a/tests/CppUTest/CMakeLists.txt b/tests/CppUTest/CMakeLists.txt +index 7df07c1..d7317aa 100644 +--- a/tests/CppUTest/CMakeLists.txt ++++ b/tests/CppUTest/CMakeLists.txt +@@ -56,4 +56,4 @@ add_executable(CppUTestTests ${CppUTestTests_src}) + cpputest_normalize_test_output_location(CppUTestTests) + target_link_libraries(CppUTestTests CppUTest ${THREAD_LIB}) + +-cpputest_buildtime_discover_tests(CppUTestTests) ++#cpputest_buildtime_discover_tests(CppUTestTests) +diff --git a/tests/CppUTestExt/CMakeLists.txt b/tests/CppUTestExt/CMakeLists.txt +index b83ceb2..2abf274 100644 +--- a/tests/CppUTestExt/CMakeLists.txt ++++ b/tests/CppUTestExt/CMakeLists.txt +@@ -37,4 +37,4 @@ endif (MINGW) + add_executable(CppUTestExtTests ${CppUTestExtTests_src}) + cpputest_normalize_test_output_location(CppUTestExtTests) + target_link_libraries(CppUTestExtTests CppUTest CppUTestExt ${THREAD_LIB} ${CPPUNIT_EXTERNAL_LIBRARIES}) +-cpputest_buildtime_discover_tests(CppUTestExtTests) ++#cpputest_buildtime_discover_tests(CppUTestExtTests) diff --git a/externals/vcpkg/ports/cpputest/portfile.cmake b/externals/vcpkg/ports/cpputest/portfile.cmake new file mode 100755 index 000000000..4745ea469 --- /dev/null +++ b/externals/vcpkg/ports/cpputest/portfile.cmake @@ -0,0 +1,60 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cpputest/cpputest + REF 4699da9942a1bdcc33e2a8c8a48e863b0f18188e + SHA512 6f588691f1b4092b3be8167ab09f3a4a64c34715ac9397210724121d161024a43b12a88198b02b0cc8da7d72406670daaf375bb64cc4cf92c8bd2479e7a881bc + HEAD_REF master + PATCHES + fix-arm-build-error.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/CppUTest/cmake TARGET_PATH share/CppUTest) +if (EXISTS ${CURRENT_PACKAGES_DIR}/lib/CppUTest) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/CppUTest) +endif() + +if (EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/CppUTest) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/CppUTest) +endif() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) + file(GLOB CPPUTEST_LIBS ${CURRENT_PACKAGES_DIR}/lib/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}) + file(COPY ${CPPUTEST_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link) + file(REMOVE ${CPPUTEST_LIBS}) + + file(READ ${CURRENT_PACKAGES_DIR}/share/CppUTest/CppUTestTargets-release.cmake RELEASE_CONFIG) + # Replace CppUTestExt first + string(REPLACE "\${_IMPORT_PREFIX}/lib/" + "\${_IMPORT_PREFIX}/lib/manual-link/" RELEASE_CONFIG "${RELEASE_CONFIG}") + file(WRITE ${CURRENT_PACKAGES_DIR}/share/CppUTest/CppUTestTargets-release.cmake "${RELEASE_CONFIG}") +endif() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) + file(GLOB CPPUTEST_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}) + file(COPY ${CPPUTEST_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) + file(REMOVE ${CPPUTEST_LIBS}) + + file(READ ${CURRENT_PACKAGES_DIR}/share/CppUTest/CppUTestTargets-debug.cmake DEBUG_CONFIG) + # Replace CppUTestExt first + string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/" + "\${_IMPORT_PREFIX}/debug/lib/manual-link/" DEBUG_CONFIG "${DEBUG_CONFIG}") + file(WRITE ${CURRENT_PACKAGES_DIR}/share/CppUTest/CppUTestTargets-debug.cmake "${DEBUG_CONFIG}") +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/cpputest/vcpkg.json b/externals/vcpkg/ports/cpputest/vcpkg.json new file mode 100755 index 000000000..3e5867d70 --- /dev/null +++ b/externals/vcpkg/ports/cpputest/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cpputest", + "version-string": "2019-9-16", + "port-version": 2, + "description": "CppUTest unit testing and mocking framework for C/C++.", + "homepage": "https://github.com/cpputest/cpputest" +} diff --git a/externals/vcpkg/ports/cppwinrt/cppwinrt-config.cmake b/externals/vcpkg/ports/cppwinrt/cppwinrt-config.cmake new file mode 100755 index 000000000..c3e757525 --- /dev/null +++ b/externals/vcpkg/ports/cppwinrt/cppwinrt-config.cmake @@ -0,0 +1,14 @@ +set(CppWinRT_FOUND TRUE) + +if(NOT TARGET Microsoft::CppWinRT) + get_filename_component(cppwinrt_root "${CMAKE_CURRENT_LIST_DIR}" PATH) + get_filename_component(cppwinrt_root "${cppwinrt_root}" PATH) + + add_library(Microsoft::CppWinRT INTERFACE IMPORTED) + set_target_properties(Microsoft::CppWinRT PROPERTIES + INTERFACE_COMPILE_FEATURES cxx_std_17 + INTERFACE_INCLUDE_DIRECTORIES "${cppwinrt_root}/include" + INTERFACE_LINK_LIBRARIES "${cppwinrt_root}/lib/cppwinrt_fast_forwarder.lib" + ) + unset(cppwinrt_root) +endif() diff --git a/externals/vcpkg/ports/cppwinrt/portfile.cmake b/externals/vcpkg/ports/cppwinrt/portfile.cmake new file mode 100755 index 000000000..7a3cd021c --- /dev/null +++ b/externals/vcpkg/ports/cppwinrt/portfile.cmake @@ -0,0 +1,70 @@ +set(CPPWINRT_VERSION 2.0.220418.1) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.nuget.org/api/v2/package/Microsoft.Windows.CppWinRT/${CPPWINRT_VERSION}" + FILENAME "cppwinrt.${CPPWINRT_VERSION}.zip" + SHA512 67738587f7b1ca98a7c2c2c0733dd09612deb5ef6bcfa788ca0bcccbbfde2c706a675316085a41e79ab2c8796a0dd3bdba87d5c996dc0b6f76b438b5d75d2567 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH src + ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL +) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(CPPWINRT_ARCH win32) +else() + set(CPPWINRT_ARCH ${VCPKG_TARGET_ARCHITECTURE}) +endif() + +set(CPPWINRT_TOOL "${src}/bin/cppwinrt.exe") + +#--- Find Windows SDK Version +if (NOT EXISTS "$ENV{WindowsSDKDir}/Lib/$ENV{WindowsSDKVersion}.") + message(FATAL_ERROR "ERROR: Cannot locate the Windows SDK. Please define %WindowsSDKDir% and %WindowsSDKVersion%. +(Expected file to exist: $ENV{WindowsSDKDir}/Lib/$ENV{WindowsSDKVersion})") +endif() +if (NOT EXISTS "$ENV{WindowsSDKDir}References/$ENV{WindowsSDKVersion}Windows.Foundation.FoundationContract") + message(FATAL_ERROR "ERROR: The Windows SDK is too old (needs 14393 or later, found $ENV{WindowsSDKVersion}).") +endif() + +file(TO_CMAKE_PATH "$ENV{WindowsSDKDir}References/$ENV{WindowsSDKVersion}" winsdk) + +file(GLOB winmds "${winsdk}/*/*/*.winmd") + +#--- Create response file +set(args "") +foreach(winmd IN LISTS winmds) + string(APPEND args "-input \"${winmd}\"\n") +endforeach() + +file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") +file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") +file(WRITE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/cppwinrt.rsp" "${args}") + +#--- Generate headers +message(STATUS "Generating headers for Windows SDK $ENV{WindowsSDKVersion}") +vcpkg_execute_required_process( + COMMAND "${CPPWINRT_TOOL}" + "@${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/cppwinrt.rsp" + -output "${CURRENT_PACKAGES_DIR}/include" + -verbose + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}" + LOGNAME "cppwinrt-generate-${TARGET_TRIPLET}" +) + +set(CPPWINRT_LIB "${src}/build/native/lib/${CPPWINRT_ARCH}/cppwinrt_fast_forwarder.lib") +file(COPY "${CPPWINRT_LIB}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +if(NOT VCPKG_BUILD_TYPE) + file(COPY "${CPPWINRT_LIB}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +endif() +file(COPY + "${CPPWINRT_TOOL}" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/cppwinrt") +file(COPY + "${CMAKE_CURRENT_LIST_DIR}/cppwinrt-config.cmake" + "${CMAKE_CURRENT_LIST_DIR}/usage" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/cppwinrt") + +configure_file("${src}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/cppwinrt/usage b/externals/vcpkg/ports/cppwinrt/usage new file mode 100755 index 000000000..a83a44a7e --- /dev/null +++ b/externals/vcpkg/ports/cppwinrt/usage @@ -0,0 +1,4 @@ +cppwinrt provides CMake targets: + + find_package(cppwinrt CONFIG REQUIRED) + target_link_libraries(main PRIVATE Microsoft::CppWinRT) diff --git a/externals/vcpkg/ports/cppwinrt/vcpkg.json b/externals/vcpkg/ports/cppwinrt/vcpkg.json new file mode 100755 index 000000000..679191ebe --- /dev/null +++ b/externals/vcpkg/ports/cppwinrt/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "cppwinrt", + "version": "2.0.220418.1", + "description": "C++/WinRT is a standard C++ language projection for the Windows Runtime.", + "homepage": "https://github.com/microsoft/cppwinrt", + "documentation": "https://docs.microsoft.com/windows/uwp/cpp-and-winrt-apis/", + "license": "MIT", + "supports": "windows" +} diff --git a/externals/vcpkg/ports/cppxaml/portfile.cmake b/externals/vcpkg/ports/cppxaml/portfile.cmake new file mode 100755 index 000000000..0a76e0e7a --- /dev/null +++ b/externals/vcpkg/ports/cppxaml/portfile.cmake @@ -0,0 +1,11 @@ +#header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO asklar/xaml-islands + REF 0.0.16 + SHA512 30fba1ef9264bf2eeaf0e48898c6b138adef9ee98d758ac91bcc7f2c90e50f00ec35925705347c3fc5c84b97652caeece7b3854be5b468a02e51fed23eda8007 + HEAD_REF main +) + +file(INSTALL "${SOURCE_PATH}/inc/cppxaml" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/cppxaml/vcpkg.json b/externals/vcpkg/ports/cppxaml/vcpkg.json new file mode 100755 index 000000000..d99f00387 --- /dev/null +++ b/externals/vcpkg/ports/cppxaml/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cppxaml", + "version": "0.0.16", + "description": "CppXaml is a library to facilitate usage of the XAML UI framework in C++ Windows apps.", + "homepage": "https://asklar.github.io/xaml-islands", + "supports": "windows" +} diff --git a/externals/vcpkg/ports/cppzmq/portfile.cmake b/externals/vcpkg/ports/cppzmq/portfile.cmake new file mode 100755 index 000000000..a4642d308 --- /dev/null +++ b/externals/vcpkg/ports/cppzmq/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO zeromq/cppzmq + REF v4.8.1 + SHA512 02F9B77F67DD46557705511195EB3F4F4E52381256BC9687F36D3E69DB6A628C19CFFF02209B6E6B53822A60781AB0850EB064D8F020E059FC1ACA4D191B66DB + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + draft ENABLE_DRAFTS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} + -DCPPZMQ_BUILD_TESTS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/cppzmq) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/share/${PORT}/libzmq-pkg-config") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/cppzmq/vcpkg.json b/externals/vcpkg/ports/cppzmq/vcpkg.json new file mode 100755 index 000000000..0fe1d26b3 --- /dev/null +++ b/externals/vcpkg/ports/cppzmq/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "cppzmq", + "version": "4.8.1", + "description": "lightweight messaging kernel, C++ bindings", + "homepage": "https://github.com/zeromq/cppzmq", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zeromq" + ], + "features": { + "draft": { + "description": "Build and install draft" + } + } +} diff --git a/externals/vcpkg/ports/cpr/001-cpr-config.patch b/externals/vcpkg/ports/cpr/001-cpr-config.patch new file mode 100755 index 000000000..9d666553d --- /dev/null +++ b/externals/vcpkg/ports/cpr/001-cpr-config.patch @@ -0,0 +1,15 @@ +diff --git a/cpr/CMakeLists.txt b/cpr/CMakeLists.txt +index 66fc9eb..cc00c72 100644 +--- a/cpr/CMakeLists.txt ++++ b/cpr/CMakeLists.txt +@@ -30,6 +30,10 @@ set_target_properties(cpr + VERSION ${${PROJECT_NAME}_VERSION} + SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR}) + ++if (NOT DISABLE_INSTALL_HEADERS) ++ install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../include/cpr DESTINATION include) ++endif() ++ + # Import GNU common install directory variables + include(GNUInstallDirs) + diff --git a/externals/vcpkg/ports/cpr/portfile.cmake b/externals/vcpkg/ports/cpr/portfile.cmake new file mode 100755 index 000000000..3c3738296 --- /dev/null +++ b/externals/vcpkg/ports/cpr/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libcpr/cpr + REF db351ffbbadc6c4e9239daaa26e9aefa9f0ec82d #v1.8.3 + SHA512 4ce4e791c5a29584eaf147b2efc4e5c0fb363cf254e6ec0c66734f7ec8da538b5b295300fee3de218da6daf4107fc11e0eac695885a3380e03a72720d328c3db + HEAD_REF master + PATCHES + 001-cpr-config.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + ssl CPR_ENABLE_SSL +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCPR_BUILD_TESTS=OFF + -DCPR_FORCE_USE_SYSTEM_CURL=ON + ${FEATURE_OPTIONS} + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cpr) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/cpr/vcpkg.json b/externals/vcpkg/ports/cpr/vcpkg.json new file mode 100755 index 000000000..1b53b85d2 --- /dev/null +++ b/externals/vcpkg/ports/cpr/vcpkg.json @@ -0,0 +1,42 @@ +{ + "name": "cpr", + "version-semver": "1.8.3", + "description": "C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project.", + "homepage": "https://github.com/libcpr/cpr", + "license": "MIT", + "dependencies": [ + { + "name": "curl", + "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "ssl" + ], + "features": { + "ssl": { + "description": "Enable SSL support", + "dependencies": [ + { + "name": "curl", + "default-features": false, + "features": [ + "ssl" + ] + }, + { + "name": "openssl", + "platform": "linux" + } + ] + } + } +} diff --git a/externals/vcpkg/ports/cpu-features/make_list_cpu_features_optional.patch b/externals/vcpkg/ports/cpu-features/make_list_cpu_features_optional.patch new file mode 100755 index 000000000..bceeb6f64 --- /dev/null +++ b/externals/vcpkg/ports/cpu-features/make_list_cpu_features_optional.patch @@ -0,0 +1,70 @@ +From 68ece3bba0d79ab721a0c50ee1e6014a37f759dc Mon Sep 17 00:00:00 2001 +From: Wei Dai +Date: Mon, 24 May 2021 10:02:07 -0700 +Subject: [PATCH] Added an option to disable the executable target + list_cpu_feature. + +--- + CMakeLists.txt | 23 ++++++++++++++++++----- + 1 file changed, 18 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f9daeac..48eea0e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,6 +17,8 @@ if(NOT CMAKE_BUILD_TYPE) + FORCE) + endif(NOT CMAKE_BUILD_TYPE) + ++# An option to disable the executable target list_cpu_features. ++option(BUILD_EXECUTABLE "Build list_cpu_features executable." ON) + # BUILD_TESTING is a standard CMake variable, but we declare it here to make it + # prominent in the GUI. + option(BUILD_TESTING "Enable test (depends on googletest)." OFF) +@@ -157,9 +159,11 @@ add_library(CpuFeature::cpu_features ALIAS cpu_features) + # program : list_cpu_features + # + +-add_executable(list_cpu_features ${PROJECT_SOURCE_DIR}/src/utils/list_cpu_features.c) +-target_link_libraries(list_cpu_features PRIVATE cpu_features) +-add_executable(CpuFeature::list_cpu_features ALIAS list_cpu_features) ++if(BUILD_EXECUTABLE) ++ add_executable(list_cpu_features ${PROJECT_SOURCE_DIR}/src/utils/list_cpu_features.c) ++ target_link_libraries(list_cpu_features PRIVATE cpu_features) ++ add_executable(CpuFeature::list_cpu_features ALIAS list_cpu_features) ++endif() + + # + # ndk_compat +@@ -223,17 +227,26 @@ if(BUILD_TESTING) + endif() + + # +-# Install cpu_features and list_cpu_features ++# Install cpu_features and optionally list_cpu_features + # + + include(GNUInstallDirs) +-install(TARGETS cpu_features list_cpu_features ++install(TARGETS cpu_features + EXPORT CpuFeaturesTargets + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cpu_features + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) ++if(BUILD_EXECUTABLE) ++ install(TARGETS list_cpu_features ++ EXPORT CpuFeaturesTargets ++ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cpu_features ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ ) ++endif() + install(EXPORT CpuFeaturesTargets + NAMESPACE CpuFeatures:: + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/CpuFeatures +-- +2.25.1 + diff --git a/externals/vcpkg/ports/cpu-features/portfile.cmake b/externals/vcpkg/ports/cpu-features/portfile.cmake new file mode 100755 index 000000000..0e431e353 --- /dev/null +++ b/externals/vcpkg/ports/cpu-features/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/cpu_features + REF a8397ba4591237c17d18e4acc091f5f3ebe7391e # 0.6.0 + SHA512 71a583e8190699d6df3dfa2857886089265cdfbcb916d9828a3611a1d6d23487464d6448b900b49637f015dd7d4e18bb206e0249af0932928f8ced13a081d42b + HEAD_REF master + PATCHES + make_list_cpu_features_optional.patch + windows-x86-fix.patch +) + +# If feature "tools" is not specified, disable building/exporting executable targets. +# This is necessary so that downstream find_package(CpuFeatures) does not fail. +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_EXECUTABLE +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME "CpuFeatures" CONFIG_PATH "lib/cmake/CpuFeatures") + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES "list_cpu_features" AUTO_CLEAN) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/cpu-features/vcpkg.json b/externals/vcpkg/ports/cpu-features/vcpkg.json new file mode 100755 index 000000000..0953cb962 --- /dev/null +++ b/externals/vcpkg/ports/cpu-features/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "cpu-features", + "version": "0.6.0", + "port-version": 2, + "description": "A cross-platform C library to retrieve CPU features (such as available instructions) at runtime", + "homepage": "https://github.com/google/cpu_features", + "license": "Apache-2.0", + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "list_cpu_features command line tool" + } + } +} diff --git a/externals/vcpkg/ports/cpu-features/windows-x86-fix.patch b/externals/vcpkg/ports/cpu-features/windows-x86-fix.patch new file mode 100755 index 000000000..4dc7bf767 --- /dev/null +++ b/externals/vcpkg/ports/cpu-features/windows-x86-fix.patch @@ -0,0 +1,17 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,13 +60,13 @@ + if(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") + set(PROCESSOR_IS_MIPS TRUE) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") + set(PROCESSOR_IS_ARM TRUE) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") + set(PROCESSOR_IS_AARCH64 TRUE) +-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64|amd64)|(^i.86$)") ++elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(AMD64|amd64)|(^i.86$)") + set(PROCESSOR_IS_X86 TRUE) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)") + set(PROCESSOR_IS_POWER TRUE) + endif() + + macro(add_cpu_features_headers_and_sources HDRS_LIST_NAME SRCS_LIST_NAME) diff --git a/externals/vcpkg/ports/cpuid/portfile.cmake b/externals/vcpkg/ports/cpuid/portfile.cmake new file mode 100755 index 000000000..6f38ec89b --- /dev/null +++ b/externals/vcpkg/ports/cpuid/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO anrieff/libcpuid + REF 179fbcb713566c2084a1903729b6eebba68a4424 #0.5.1 + SHA512 76eef8147a9ed2f116ddfd07ab95f76126bee0e23d0e6b5be54d157a1456b769fb698a4799a43c5f81ac12368d76fe8904bff735a698342ad8ee41d43e72645b + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENABLE_DOCS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cpuid) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/cpuid/vcpkg.json b/externals/vcpkg/ports/cpuid/vcpkg.json new file mode 100755 index 000000000..1e77b381c --- /dev/null +++ b/externals/vcpkg/ports/cpuid/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "cpuid", + "version": "0.5.1", + "port-version": 3, + "description": "Provides CPU identification for the x86 (and x86_64)", + "homepage": "https://github.com/anrieff/libcpuid", + "supports": "(x86 | x64) & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/cpuinfo/portfile.cmake b/externals/vcpkg/ports/cpuinfo/portfile.cmake new file mode 100755 index 000000000..aa964e6e1 --- /dev/null +++ b/externals/vcpkg/ports/cpuinfo/portfile.cmake @@ -0,0 +1,76 @@ +# On Windows, we can get a cpuinfo.dll, but it exports no symbols. +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO pytorch/cpuinfo + REF b40bae27785787b6dd70788986fd96434cf90ae2 + SHA512 dbbe4f3e1d5ae74ffc8ba2cba0ab745a23f4993788f4947825ef5125dd1cbed3e13e0c98e020e6fcfa9879f54f06d7cba4de73ec29f77649b6a27b4ab82c8f1c + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools CPUINFO_BUILD_TOOLS +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + list(APPEND LINK_OPTIONS -DCPUINFO_LIBRARY_TYPE=shared) +else() + list(APPEND LINK_OPTIONS -DCPUINFO_LIBRARY_TYPE=static) +endif() + +if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + list(APPEND LINK_OPTIONS -DCPUINFO_RUNTIME_TYPE=shared) +else() + list(APPEND LINK_OPTIONS -DCPUINFO_RUNTIME_TYPE=static) +endif() + +# hack to get around that toolchains/windows.cmake doesn't set CMAKE_SYSTEM_ARCHITECTURE +set(CPUINFO_TARGET_PROCESSOR_param "") +if(VCPKG_TARGET_IS_WINDOWS) + # NOTE: arm64-windows is unsupported for now; + # see https://github.com/pytorch/cpuinfo/pull/82 for updates + # NOTE: arm-windows is unsupported + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(CPUINFO_TARGET_PROCESSOR_param "-DCPUINFO_TARGET_PROCESSOR=x86") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(CPUINFO_TARGET_PROCESSOR_param "-DCPUINFO_TARGET_PROCESSOR=AMD64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(CPUINFO_TARGET_PROCESSOR_param "-DCPUINFO_TARGET_PROCESSOR=ARM") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(CPUINFO_TARGET_PROCESSOR_param "-DCPUINFO_TARGET_PROCESSOR=ARM64") + endif() +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + ${LINK_OPTIONS} + ${CPUINFO_TARGET_PROCESSOR_param} + -DCPUINFO_BUILD_UNIT_TESTS=OFF + -DCPUINFO_BUILD_MOCK_TESTS=OFF + -DCPUINFO_BUILD_BENCHMARKS=OFF + OPTIONS_DEBUG + -DCPUINFO_LOG_LEVEL=debug + OPTIONS_RELEASE + -DCPUINFO_LOG_LEVEL=default +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() # pkg_check_modules(libcpuinfo) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES cache-info cpuid-dump cpu-info isa-info + AUTO_CLEAN + ) +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/cpuinfo/vcpkg.json b/externals/vcpkg/ports/cpuinfo/vcpkg.json new file mode 100755 index 000000000..d718f9393 --- /dev/null +++ b/externals/vcpkg/ports/cpuinfo/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "cpuinfo", + "version-date": "2022-04-02", + "description": "CPU INFOrmation library (x86/x86-64/ARM/ARM64, Linux/Windows/Android/macOS/iOS)", + "homepage": "https://github.com/pytorch/cpuinfo", + "license": "BSD-2-Clause", + "supports": "!(arm & windows)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "Build cpuinfo command-line tools" + } + } +} diff --git a/externals/vcpkg/ports/cr/portfile.cmake b/externals/vcpkg/ports/cr/portfile.cmake new file mode 100755 index 000000000..d6d536759 --- /dev/null +++ b/externals/vcpkg/ports/cr/portfile.cmake @@ -0,0 +1,15 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO fungos/cr + REF 66b76e24611c3b87566e5365e8c422387bc85916 + SHA512 002162461ecf131d717f7567cf13ee1345b7b359bb17c0801f4246c472c1b180f4f8937e9a3f4c186d95c41c20ffcc5ba5e953f197f344fb1000f51d8c4ee473 + HEAD_REF master +) + +file( + COPY ${SOURCE_PATH}/cr.h + DESTINATION ${CURRENT_PACKAGES_DIR}/include +) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/cr/vcpkg.json b/externals/vcpkg/ports/cr/vcpkg.json new file mode 100755 index 000000000..a80ef7059 --- /dev/null +++ b/externals/vcpkg/ports/cr/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cr", + "version-string": "2020-04-26", + "port-version": 1, + "description": "cr.h: A Simple C Hot Reload Header-only Library", + "homepage": "https://fungos.github.io/cr-simple-c-hot-reload/" +} diff --git a/externals/vcpkg/ports/crashpad/crashpadConfig.cmake.in b/externals/vcpkg/ports/crashpad/crashpadConfig.cmake.in new file mode 100755 index 000000000..1c95bf1b7 --- /dev/null +++ b/externals/vcpkg/ports/crashpad/crashpadConfig.cmake.in @@ -0,0 +1,31 @@ +# Compute the installation prefix relative to this file. +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +if(_IMPORT_PREFIX STREQUAL "/") + set(_IMPORT_PREFIX "") +endif() + +add_library(crashpad INTERFACE) +add_library(crashpad::crashpad ALIAS crashpad) + +set(CRASHPAD_LIBRARIES client util base) + +if(WIN32) + target_compile_definitions(crashpad INTERFACE NOMINMAX) +elseif(APPLE) + list(APPEND CRASHPAD_LIBRARIES ApplicationServices + CoreFoundation Foundation IOKit Security bsm) +endif() + +foreach(LIB_NAME ${CRASHPAD_LIBRARIES}) + find_library(_LIB ${LIB_NAME}) + target_link_libraries(crashpad INTERFACE ${_LIB}) + unset(_LIB CACHE) +endforeach() + +find_package(ZLIB REQUIRED) +target_link_libraries(crashpad INTERFACE ZLIB::ZLIB) + +target_include_directories(crashpad + INTERFACE ${_IMPORT_PREFIX}/include/crashpad) diff --git a/externals/vcpkg/ports/crashpad/portfile.cmake b/externals/vcpkg/ports/crashpad/portfile.cmake new file mode 100755 index 000000000..a8b5c6b71 --- /dev/null +++ b/externals/vcpkg/ports/crashpad/portfile.cmake @@ -0,0 +1,131 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH + URL https://chromium.googlesource.com/crashpad/crashpad + REF 68aba08c48bb428b7b159b3371163f86e8d5a126 +) + +vcpkg_find_acquire_program(PYTHON3) +vcpkg_replace_string("${SOURCE_PATH}/.gn" "script_executable = \"python3\"" "script_executable = \"${PYTHON3}\"") + +function(checkout_in_path PATH URL REF) + if(EXISTS "${PATH}") + return() + endif() + + vcpkg_from_git( + OUT_SOURCE_PATH DEP_SOURCE_PATH + URL "${URL}" + REF "${REF}" + ) + file(RENAME "${DEP_SOURCE_PATH}" "${PATH}") + file(REMOVE_RECURSE "${DEP_SOURCE_PATH}") +endfunction() + +# mini_chromium contains the toolchains and build configuration +checkout_in_path( + "${SOURCE_PATH}/third_party/mini_chromium/mini_chromium" + "https://chromium.googlesource.com/chromium/mini_chromium" + "5654edb4225bcad13901155c819febb5748e502b" +) + +function(replace_gn_dependency INPUT_FILE OUTPUT_FILE LIBRARY_NAMES) + unset(_LIBRARY_DEB CACHE) + find_library(_LIBRARY_DEB NAMES ${LIBRARY_NAMES} + PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" + NO_DEFAULT_PATH) + + if(_LIBRARY_DEB MATCHES "-NOTFOUND") + message(FATAL_ERROR "Could not find debug library with names: ${LIBRARY_NAMES}") + endif() + + unset(_LIBRARY_REL CACHE) + find_library(_LIBRARY_REL NAMES ${LIBRARY_NAMES} + PATHS "${CURRENT_INSTALLED_DIR}/lib" + NO_DEFAULT_PATH) + + if(_LIBRARY_REL MATCHES "-NOTFOUND") + message(FATAL_ERROR "Could not find library with names: ${LIBRARY_NAMES}") + endif() + + set(_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include") + + file(REMOVE "${OUTPUT_FILE}") + configure_file("${INPUT_FILE}" "${OUTPUT_FILE}" @ONLY) +endfunction() + +replace_gn_dependency( + "${CMAKE_CURRENT_LIST_DIR}/zlib.gn" + "${SOURCE_PATH}/third_party/zlib/BUILD.gn" + "z;zlib;zlibd" +) + +set(OPTIONS_DBG "is_debug=true") +set(OPTIONS_REL "") + +if(CMAKE_HOST_WIN32) + # Load toolchains + if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") + endif() + include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") + + foreach(_VAR CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS + CMAKE_C_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELEASE) + string(STRIP "${${_VAR}}" ${_VAR}) + endforeach() + + set(OPTIONS_DBG "${OPTIONS_DBG} \ + extra_cflags_c=\"${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_DEBUG}\" \ + extra_cflags_cc=\"${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}\"") + + set(OPTIONS_REL "${OPTIONS_REL} \ + extra_cflags_c=\"${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELEASE}\" \ + extra_cflags_cc=\"${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}\"") + + set(DISABLE_WHOLE_PROGRAM_OPTIMIZATION "\ + extra_cflags=\"/GL-\" \ + extra_ldflags=\"/LTCG:OFF\" \ + extra_arflags=\"/LTCG:OFF\"") + + set(OPTIONS_DBG "${OPTIONS_DBG} ${DISABLE_WHOLE_PROGRAM_OPTIMIZATION}") + set(OPTIONS_REL "${OPTIONS_REL} ${DISABLE_WHOLE_PROGRAM_OPTIMIZATION}") +endif() + +vcpkg_configure_gn( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG "${OPTIONS_DBG}" + OPTIONS_RELEASE "${OPTIONS_REL}" +) + +vcpkg_install_gn( + SOURCE_PATH "${SOURCE_PATH}" + TARGETS client util third_party/mini_chromium/mini_chromium/base handler:crashpad_handler +) + +message(STATUS "Installing headers...") +set(PACKAGES_INCLUDE_DIR "${CURRENT_PACKAGES_DIR}/include/${PORT}") +function(install_headers DIR) + file(COPY "${DIR}" DESTINATION "${PACKAGES_INCLUDE_DIR}" FILES_MATCHING PATTERN "*.h") +endfunction() +install_headers("${SOURCE_PATH}/client") +install_headers("${SOURCE_PATH}/util") +install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/base") +install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/build") + +# remove empty directories +file(REMOVE_RECURSE + "${PACKAGES_INCLUDE_DIR}/util/net/testdata" + "${PACKAGES_INCLUDE_DIR}/build/ios") + +configure_file("${CMAKE_CURRENT_LIST_DIR}/crashpadConfig.cmake.in" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/crashpadConfig.cmake" @ONLY) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/${PORT}/build/config") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/${PORT}/util/mach/__pycache__") + +vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) diff --git a/externals/vcpkg/ports/crashpad/vcpkg.json b/externals/vcpkg/ports/crashpad/vcpkg.json new file mode 100755 index 000000000..13c15178c --- /dev/null +++ b/externals/vcpkg/ports/crashpad/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "crashpad", + "version-date": "2022-04-16", + "port-version": 1, + "description": [ + "Crashpad is a crash-reporting system.", + "Crashpad is a library for capturing, storing and transmitting postmortem crash reports from a client to an upstream collection server. Crashpad aims to make it possible for clients to capture process state at the time of crash with the best possible fidelity and coverage, with the minimum of fuss." + ], + "homepage": "https://chromium.googlesource.com/crashpad/crashpad/+/master/README.md", + "license": "Apache-2.0", + "supports": "osx | windows", + "dependencies": [ + { + "name": "vcpkg-tool-gn", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/crashpad/zlib.gn b/externals/vcpkg/ports/crashpad/zlib.gn new file mode 100755 index 000000000..5b551a30a --- /dev/null +++ b/externals/vcpkg/ports/crashpad/zlib.gn @@ -0,0 +1,15 @@ +import("../../build/crashpad_buildconfig.gni") + +config("zlib_config") { + defines = [ "CRASHPAD_ZLIB_SOURCE_EXTERNAL" ] + include_dirs = [ "@_INCLUDE_DIR@" ] +} + +source_set("zlib") { + public_configs = [ ":zlib_config" ] + if(is_debug) { + libs = [ "@_LIBRARY_DEB@" ] + } else { + libs = [ "@_LIBRARY_REL@" ] + } +} \ No newline at end of file diff --git a/externals/vcpkg/ports/crashrpt/001-add-install-target-and-find-deps.patch b/externals/vcpkg/ports/crashrpt/001-add-install-target-and-find-deps.patch new file mode 100755 index 000000000..2d983800d --- /dev/null +++ b/externals/vcpkg/ports/crashrpt/001-add-install-target-and-find-deps.patch @@ -0,0 +1,809 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 44d7df0..ed9e3d3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,6 +17,9 @@ set (CRASHRPT_VER 1403) + # Build options + option(CRASHRPT_BUILD_SHARED_LIBS "If set (default), CrashRpt modules are built as dynamic-link libraries, otherwise as static libs." ON) + option(CRASHRPT_LINK_CRT_AS_DLL "If set (default), CrashRpt modules link C run-time (CRT) as multi-threaded dynamic libraries, otherwise as multi-threaded static libs." ON) ++option(CRASHRPT_BUILD_PROBE "If set (default), CrashRpt builds the CrashRptProbe project." ON) ++option(CRASHRPT_BUILD_DEMOS "If set (default), CrashRpt builds the demo projects." ON) ++option(CRASHRPT_BUILD_TESTS "If set (default), CrashRpt builds the test projects." ON) + + # Set output directory for executable files + if(CMAKE_CL_64) +@@ -94,19 +97,65 @@ macro(fix_default_compiler_settings_) + + endmacro() + ++find_package(ZLIB REQUIRED) ++find_package(PNG REQUIRED) ++find_package(Ogg REQUIRED) ++find_package(JPEG REQUIRED) ++ ++find_library(THEORA_LIBRARY theora) ++if(NOT THEORA_LIBRARY) ++ message(FATAL_ERROR "theora library not found") ++endif() ++ ++find_path(THEORA_INCLUDE_DIR theora/theora.h) ++if(NOT THEORA_INCLUDE_DIR) ++ message(FATAL_ERROR "theora include dir not found") ++endif() ++ ++find_library(TINYXML_LIBRARY NAMES tinyxml) ++if(NOT TINYXML_LIBRARY) ++ message(FATAL_ERROR "tinyxml library not found") ++endif() ++ ++find_path(TINYXML_INCLUDE_DIR tinyxml.h) ++if(NOT TINYXML_INCLUDE_DIR) ++ message(FATAL_ERROR "tinyxml include dir not found") ++endif() ++ ++find_path(WTL_INCLUDE_DIR wtl/atlapp.h) ++if(NOT WTL_INCLUDE_DIR) ++ message(FATAL_ERROR "WTL include dir not found") ++endif() ++ ++find_library(DBGHELP_LIBRARY dbghelp) ++if(NOT DBGHELP_LIBRARY) ++ message(FATAL_ERROR "dbghelp library not found") ++endif() ++ ++find_path(DBGHELP_INCLUDE_DIR dbghelp.h) ++if(NOT DBGHELP_INCLUDE_DIR) ++ message(FATAL_ERROR "dbghelp include dir not found") ++endif() ++ + # Other CMakeLists are located in project subdirectories + ++if(CRASHRPT_BUILD_DEMOS) + add_subdirectory("demos/ConsoleDemo") + add_subdirectory("demos/WTLDemo") + add_subdirectory("demos/MFCDemo") ++endif() + + add_subdirectory("reporting/crashrpt") + add_subdirectory("reporting/crashsender") + ++if(CRASHRPT_BUILD_PROBE) + add_subdirectory("processing/crashrptprobe") + add_subdirectory("processing/crprober") ++endif() + ++if(CRASHRPT_BUILD_TESTS) + add_subdirectory("tests") ++endif() + + # Set output directory for LIB files + if(CMAKE_CL_64) +@@ -117,13 +166,13 @@ else(CMAKE_CL_64) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/thirdparty/lib) + endif(CMAKE_CL_64) + +-add_subdirectory("thirdparty/tinyxml") +-add_subdirectory("thirdparty/jpeg") +-add_subdirectory("thirdparty/libpng") ++#add_subdirectory("thirdparty/tinyxml") ++#add_subdirectory("thirdparty/jpeg") ++#add_subdirectory("thirdparty/libpng") + add_subdirectory("thirdparty/minizip") +-add_subdirectory("thirdparty/zlib") +-add_subdirectory("thirdparty/libogg") +-add_subdirectory("thirdparty/libtheora") ++#add_subdirectory("thirdparty/zlib") ++#add_subdirectory("thirdparty/libogg") ++#add_subdirectory("thirdparty/libtheora") + + + +diff --git a/demos/ConsoleDemo/CMakeLists.txt b/demos/ConsoleDemo/CMakeLists.txt +index e47ef4c..4df7b12 100644 +--- a/demos/ConsoleDemo/CMakeLists.txt ++++ b/demos/ConsoleDemo/CMakeLists.txt +@@ -12,12 +12,12 @@ fix_default_compiler_settings_() + # Add include dir + include_directories(${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/reporting/CrashRpt +- ${CMAKE_SOURCE_DIR}/thirdparty/wtl +- ${CMAKE_SOURCE_DIR}/thirdparty/zlib ++ ${WTL_INCLUDE_DIR} ++ ${ZLIB_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/thirdparty/minizip +- ${CMAKE_SOURCE_DIR}/thirdparty/jpeg +- ${CMAKE_SOURCE_DIR}/thirdparty/libpng +- ${CMAKE_SOURCE_DIR}/thirdparty/tinyxml ) ++ ${JPEG_INCLUDE_DIR} ++ ${PNG_INCLUDE_DIRS} ++ ${TINYXML_INCLUDE_DIR} ) + + # Add executable build target + add_executable(ConsoleDemo ${source_files} ${header_files}) +@@ -26,3 +26,7 @@ add_executable(ConsoleDemo ${source_files} ${header_files}) + target_link_libraries(ConsoleDemo CrashRpt) + + set_target_properties(ConsoleDemo PROPERTIES DEBUG_POSTFIX d ) ++ ++install(TARGETS ConsoleDemo ++ RUNTIME DESTINATION tools/crashrpt ++) +diff --git a/demos/MFCDemo/CMakeLists.txt b/demos/MFCDemo/CMakeLists.txt +index a250ecc..ade93cb 100644 +--- a/demos/MFCDemo/CMakeLists.txt ++++ b/demos/MFCDemo/CMakeLists.txt +@@ -44,7 +44,7 @@ if(CMAKE_CL_64) + ADD_CUSTOM_COMMAND( + TARGET WTLDemo + POST_BUILD +- COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/bin\\dbghelp.dll\" \"${CMAKE_BINARY_DIR}/bin\\x64\"" ++ #COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/bin\\dbghelp.dll\" \"${CMAKE_BINARY_DIR}/bin\\x64\"" + COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/demos/WTLDemo\\dummy.ini\" \"${CMAKE_BINARY_DIR}/bin\\x64\"" + COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/demos/WTLDemo\\dummy.log\" \"${CMAKE_BINARY_DIR}/bin\\x64\"" + COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/lang_files\\crashrpt_lang_EN.ini\" \"${CMAKE_BINARY_DIR}/bin\\x64\\crashrpt_lang.ini\"" +@@ -53,9 +53,13 @@ else(CMAKE_CL_64) + ADD_CUSTOM_COMMAND( + TARGET WTLDemo + POST_BUILD +- COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/bin\\dbghelp.dll\" \"${CMAKE_BINARY_DIR}/bin\"" ++ #COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/bin\\dbghelp.dll\" \"${CMAKE_BINARY_DIR}/bin\"" + COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/demos/WTLDemo\\dummy.ini\" \"${CMAKE_BINARY_DIR}/bin\"" + COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/demos/WTLDemo\\dummy.log\" \"${CMAKE_BINARY_DIR}/bin\"" + COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/lang_files\\crashrpt_lang_EN.ini\" \"${CMAKE_BINARY_DIR}/bin\\crashrpt_lang.ini\"" + ) +-endif(CMAKE_CL_64) +\ No newline at end of file ++endif(CMAKE_CL_64) ++ ++install(TARGETS MFCDemo ++ RUNTIME DESTINATION tools/crashrpt ++) +diff --git a/demos/WTLDemo/AboutDlg.h b/demos/WTLDemo/AboutDlg.h +index 83eaac0..e96d1c2 100644 +--- a/demos/WTLDemo/AboutDlg.h ++++ b/demos/WTLDemo/AboutDlg.h +@@ -33,7 +33,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #pragma once + #include "stdafx.h" + #include +-#include ++#include + #include "CrashRpt.h" + + class CAboutDlg : public CDialogImpl +diff --git a/demos/WTLDemo/CMakeLists.txt b/demos/WTLDemo/CMakeLists.txt +index 40aaefb..42c0f5a 100644 +--- a/demos/WTLDemo/CMakeLists.txt ++++ b/demos/WTLDemo/CMakeLists.txt +@@ -19,7 +19,7 @@ fix_default_compiler_settings_() + + # Add include dir + include_directories(${CMAKE_SOURCE_DIR}/include +- ${CMAKE_SOURCE_DIR}/thirdparty/wtl) ++ ${WTL_INCLUDE_DIR}) + + # Add executable build target + add_executable(WTLDemo WIN32 ${source_files} ${header_files}) +@@ -36,7 +36,7 @@ if(CMAKE_CL_64) + ADD_CUSTOM_COMMAND( + TARGET WTLDemo + POST_BUILD +- COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/bin\\dbghelp.dll\" \"${CMAKE_BINARY_DIR}/bin\\x64\"" ++ #COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/bin\\dbghelp.dll\" \"${CMAKE_BINARY_DIR}/bin\\x64\"" + COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/demos/WTLDemo\\dummy.ini\" \"${CMAKE_BINARY_DIR}/bin\\x64\"" + COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/demos/WTLDemo\\dummy.log\" \"${CMAKE_BINARY_DIR}/bin\\x64\"" + COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/lang_files\\crashrpt_lang_EN.ini\" \"${CMAKE_BINARY_DIR}/bin\\x64\\crashrpt_lang.ini\"" +@@ -45,9 +45,13 @@ else(CMAKE_CL_64) + ADD_CUSTOM_COMMAND( + TARGET WTLDemo + POST_BUILD +- COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/bin\\dbghelp.dll\" \"${CMAKE_BINARY_DIR}/bin\"" ++ #COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/bin\\dbghelp.dll\" \"${CMAKE_BINARY_DIR}/bin\"" + COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/demos/WTLDemo\\dummy.ini\" \"${CMAKE_BINARY_DIR}/bin\"" + COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/demos/WTLDemo\\dummy.log\" \"${CMAKE_BINARY_DIR}/bin\"" + COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/lang_files\\crashrpt_lang_EN.ini\" \"${CMAKE_BINARY_DIR}/bin\\crashrpt_lang.ini\"" + ) +-endif(CMAKE_CL_64) +\ No newline at end of file ++endif(CMAKE_CL_64) ++ ++install(TARGETS WTLDemo ++ RUNTIME DESTINATION tools/crashrpt ++) +diff --git a/demos/WTLDemo/DocumentDlg.h b/demos/WTLDemo/DocumentDlg.h +index afce8fe..9b47728 100644 +--- a/demos/WTLDemo/DocumentDlg.h ++++ b/demos/WTLDemo/DocumentDlg.h +@@ -33,7 +33,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #pragma once + #include "stdafx.h" + #include +-#include ++#include + #include "CrashRpt.h" + + class CDocumentDlg : public CDialogImpl +diff --git a/demos/WTLDemo/WTLDemo.rc b/demos/WTLDemo/WTLDemo.rc +index c651841..71f4b39 100644 +--- a/demos/WTLDemo/WTLDemo.rc ++++ b/demos/WTLDemo/WTLDemo.rc +@@ -7,7 +7,7 @@ + // + // Generated from the TEXTINCLUDE 2 resource. + // +-#include "atlres.h" ++#include "wtl/atlres.h" + + ///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS +@@ -32,7 +32,7 @@ END + + 2 TEXTINCLUDE + BEGIN +- "#include ""atlres.h""\r\n" ++ "#include ""wtl/atlres.h""\r\n" + "\0" + END + +diff --git a/demos/WTLDemo/stdafx.h b/demos/WTLDemo/stdafx.h +index a601446..658d9e5 100644 +--- a/demos/WTLDemo/stdafx.h ++++ b/demos/WTLDemo/stdafx.h +@@ -16,10 +16,10 @@ be found in the Authors.txt file in the root of the source tree. + #pragma once + + // Change these values to use different versions +-#define WINVER 0x0500 ++#define WINVER 0x0501 + #define _WIN32_WINNT 0x0501 +-#define _WIN32_IE 0x0501 +-#define _RICHEDIT_VER 0x0200 ++#define _WIN32_IE 0x0600 ++#define _RICHEDIT_VER 0x0300 + + #include + #if ( _ATL_VER < 0x0800 ) +@@ -52,18 +52,18 @@ namespace ATL + }; + #endif // _WTL_SUPPORT_SDK_ATL3 + +-#include ++#include + + extern CAppModule _Module; + + #include + +-#include +-#include +-#include ++#include ++#include ++#include + + #define _WTL_USE_CSTRING +-#include ++#include + + #if _MSC_VER>=1400 + #if defined _M_IX86 +diff --git a/processing/crashrptprobe/CMakeLists.txt b/processing/crashrptprobe/CMakeLists.txt +index a6c692a..c513c6d 100644 +--- a/processing/crashrptprobe/CMakeLists.txt ++++ b/processing/crashrptprobe/CMakeLists.txt +@@ -21,11 +21,11 @@ fix_default_compiler_settings_() + include_directories( ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/reporting/crashrpt + ${CMAKE_SOURCE_DIR}/reporting/crashsender +- ${CMAKE_SOURCE_DIR}/thirdparty/wtl +- ${CMAKE_SOURCE_DIR}/thirdparty/zlib ++ ${WTL_INCLUDE_DIR} ++ ${ZLIB_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/thirdparty/minizip +- ${CMAKE_SOURCE_DIR}/thirdparty/tinyxml +- ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/include) ++ ${TINYXML_INCLUDE_DIR} ++ ${DBGHELP_INCLUDE_DIR}) + + # Add library build target + if(CRASHRPT_BUILD_SHARED_LIBS) +@@ -34,15 +34,15 @@ else(CRASHRPT_BUILD_SHARED_LIBS) + add_library(CrashRptProbe STATIC ${source_files} ${header_files}) + endif(CRASHRPT_BUILD_SHARED_LIBS) + +-if(CMAKE_CL_64) +- link_directories( ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib/amd64 ) +- target_link_libraries(CrashRptProbe ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib/amd64/dbghelp.lib) +-else(CMAKE_CL_64) +- link_directories( ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib ) +- target_link_libraries(CrashRptProbe ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib/dbghelp.lib) +-endif(CMAKE_CL_64) ++#if(CMAKE_CL_64) ++# link_directories( ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib/amd64 ) ++# target_link_libraries(CrashRptProbe ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib/amd64/dbghelp.lib) ++#else(CMAKE_CL_64) ++# link_directories( ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib ) ++# target_link_libraries(CrashRptProbe ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib/dbghelp.lib) ++#endif(CMAKE_CL_64) + +-target_link_libraries(CrashRptProbe zlib minizip tinyxml Rpcrt4.lib shell32.lib gdi32.lib version.lib psapi.lib) ++target_link_libraries(CrashRptProbe ZLIB::ZLIB minizip ${TINYXML_LIBRARY} ${DBGHELP_LIBRARY} Rpcrt4.lib shell32.lib gdi32.lib version.lib psapi.lib) + + if(CRASHRPT_BUILD_SHARED_LIBS) + +@@ -58,4 +58,11 @@ else(CRASHRPT_BUILD_SHARED_LIBS) + + endif(CRASHRPT_BUILD_SHARED_LIBS) + ++set_target_properties(CrashRptProbe PROPERTIES PUBLIC_HEADER ${CMAKE_SOURCE_DIR}/include/CrashRptProbe.h) + ++INSTALL(TARGETS CrashRptProbe ++ PUBLIC_HEADER DESTINATION include/crashrpt ++ LIBRARY ++ ARCHIVE ++ RUNTIME ++) +diff --git a/processing/crashrptprobe/CrashRptProbe.rc b/processing/crashrptprobe/CrashRptProbe.rc +index a08f63e..e12b8e9 100644 +--- a/processing/crashrptprobe/CrashRptProbe.rc ++++ b/processing/crashrptprobe/CrashRptProbe.rc +@@ -7,7 +7,7 @@ + // + // Generated from the TEXTINCLUDE 2 resource. + // +-#include "atlres.h" ++#include "wtl/atlres.h" + + ///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS +@@ -32,7 +32,7 @@ END + + 2 TEXTINCLUDE + BEGIN +- "#include ""atlres.h""\r\n" ++ "#include ""wtl/atlres.h""\r\n" + "\0" + END + +diff --git a/processing/crashrptprobe/stdafx.h b/processing/crashrptprobe/stdafx.h +index 2b027b2..0b60659 100644 +--- a/processing/crashrptprobe/stdafx.h ++++ b/processing/crashrptprobe/stdafx.h +@@ -70,13 +70,13 @@ namespace ATL + }; + #endif // _WTL_SUPPORT_SDK_ATL3 + +-#include ++#include + extern CAppModule _Module; + #include + + // CString-related includes + #define _WTL_USE_CSTRING +-#include ++#include + + #if _MSC_VER<1400 + #define WCSNCPY_S(strDest, sizeInBytes, strSource, count) wcsncpy(strDest, strSource, count) +diff --git a/processing/crprober/CMakeLists.txt b/processing/crprober/CMakeLists.txt +index 046ba57..255e200 100644 +--- a/processing/crprober/CMakeLists.txt ++++ b/processing/crprober/CMakeLists.txt +@@ -18,4 +18,8 @@ add_executable(crprober ${source_files} ${header_files}) + # Add input link libraries + target_link_libraries(crprober CrashRptProbe) + +-set_target_properties(crprober PROPERTIES DEBUG_POSTFIX d ) +\ No newline at end of file ++set_target_properties(crprober PROPERTIES DEBUG_POSTFIX d ) ++ ++install(TARGETS crprober ++ RUNTIME DESTINATION tools/crashrpt ++) +diff --git a/reporting/crashrpt/CMakeLists.txt b/reporting/crashrpt/CMakeLists.txt +index 42d40e2..c7e4fd6 100644 +--- a/reporting/crashrpt/CMakeLists.txt ++++ b/reporting/crashrpt/CMakeLists.txt +@@ -18,7 +18,7 @@ add_definitions(-D_UNICODE -D_CRT_SECURE_NO_DEPRECATE) + fix_default_compiler_settings_() + + # Add include dir +-include_directories( ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/thirdparty/wtl) ++include_directories( ${CMAKE_SOURCE_DIR}/include ${WTL_INCLUDE_DIR}) + + # Add library build target + if(CRASHRPT_BUILD_SHARED_LIBS) +@@ -55,3 +55,11 @@ else(CRASHRPT_BUILD_SHARED_LIBS) + RELEASE_POSTFIX LIB ) + endif(CRASHRPT_BUILD_SHARED_LIBS) + ++set_target_properties(CrashRpt PROPERTIES PUBLIC_HEADER ${CMAKE_SOURCE_DIR}/include/CrashRpt.h) ++ ++INSTALL(TARGETS CrashRpt ++ PUBLIC_HEADER DESTINATION include/crashrpt ++ LIBRARY ++ ARCHIVE ++ RUNTIME ++) +diff --git a/reporting/crashrpt/CrashRpt.rc b/reporting/crashrpt/CrashRpt.rc +index 95e7502..a8c821b 100644 +--- a/reporting/crashrpt/CrashRpt.rc ++++ b/reporting/crashrpt/CrashRpt.rc +@@ -7,7 +7,7 @@ + // + // Generated from the TEXTINCLUDE 2 resource. + // +-#include "atlres.h" ++#include "wtl/atlres.h" + + ///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS +@@ -32,7 +32,7 @@ END + + 2 TEXTINCLUDE + BEGIN +- "#include ""atlres.h""\r\n" ++ "#include ""wtl/atlres.h""\r\n" + "\0" + END + +diff --git a/reporting/crashrpt/StdAfx.h b/reporting/crashrpt/StdAfx.h +index 77d8c36..13bbe50 100644 +--- a/reporting/crashrpt/StdAfx.h ++++ b/reporting/crashrpt/StdAfx.h +@@ -19,7 +19,7 @@ be found in the Authors.txt file in the root of the source tree. + #define WINVER 0x0501 + #define _WIN32_WINNT 0x0501 + #define _WIN32_IE 0x0600 +-#define _RICHEDIT_VER 0x0200 ++#define _RICHEDIT_VER 0x0300 + + #include + #include +@@ -54,12 +54,12 @@ namespace ATL + }; + #endif // _WTL_SUPPORT_SDK_ATL3 + +-#include ++#include + extern CAppModule _Module; + #include + // CString-related includes + #define _WTL_USE_CSTRING +-#include ++#include + #include + #include + #include +diff --git a/reporting/crashsender/CMakeLists.txt b/reporting/crashsender/CMakeLists.txt +index 9b444c5..aa4ab8a 100644 +--- a/reporting/crashsender/CMakeLists.txt ++++ b/reporting/crashsender/CMakeLists.txt +@@ -22,27 +22,27 @@ fix_default_compiler_settings_() + # Add include dir + include_directories( ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/reporting/CrashRpt +- ${CMAKE_SOURCE_DIR}/thirdparty/wtl +- ${CMAKE_SOURCE_DIR}/thirdparty/zlib ++ ${WTL_INCLUDE_DIR} + ${CMAKE_SOURCE_DIR}/thirdparty/minizip +- ${CMAKE_SOURCE_DIR}/thirdparty/jpeg +- ${CMAKE_SOURCE_DIR}/thirdparty/libpng +- ${CMAKE_SOURCE_DIR}/thirdparty/tinyxml +- ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/include +- ${CMAKE_SOURCE_DIR}/thirdparty/libogg/include +- ${CMAKE_SOURCE_DIR}/thirdparty/libtheora/include) +- +-if(NOT CMAKE_CL_64) +- link_directories( ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib ) +-else(NOT CMAKE_CL_64) +- link_directories( ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib/amd64 ) +-endif(NOT CMAKE_CL_64) ++ ${ZLIB_INCLUDE_DIRS} ++ ${JPEG_INCLUDE_DIR} ++ ${PNG_INCLUDE_DIRS} ++ ${TINYXML_INCLUDE_DIR} ++ ${DBGHELP_INCLUDE_DIR} ++ ${OGG_INCLUDE_DIRS} ++ ${THEORA_INCLUDE_DIR}) ++ ++#if(NOT CMAKE_CL_64) ++# link_directories( ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib ) ++#else(NOT CMAKE_CL_64) ++# link_directories( ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib/amd64 ) ++#endif(NOT CMAKE_CL_64) + + # Add executable build target + add_executable(CrashSender WIN32 ${source_files} ${header_files}) + + # Add input link libraries +-target_link_libraries(CrashSender zlib minizip libjpeg libpng tinyxml libogg libtheora WS2_32.lib Dnsapi.lib wininet.lib Rpcrt4.lib Gdi32.lib shell32.lib Comdlg32.lib version.lib psapi.lib) ++target_link_libraries(CrashSender ZLIB::ZLIB minizip ${JPEG_LIBRARIES} PNG::PNG ${TINYXML_LIBRARY} Ogg::ogg ${THEORA_LIBRARY} WS2_32.lib Dnsapi.lib wininet.lib Rpcrt4.lib Gdi32.lib shell32.lib Comdlg32.lib version.lib psapi.lib) + + # Add compiler flags (/MP for multi-processor compilation, /Os to favor small code) + set_target_properties(CrashRpt PROPERTIES COMPILE_FLAGS "/Os") +@@ -52,4 +52,12 @@ set_target_properties(CrashRpt PROPERTIES COMPILE_FLAGS "/Os") + + set_target_properties(CrashSender PROPERTIES + DEBUG_POSTFIX ${CRASHRPT_VER}d +- RELEASE_POSTFIX ${CRASHRPT_VER} ) +\ No newline at end of file ++ RELEASE_POSTFIX ${CRASHRPT_VER} ) ++ ++install(TARGETS CrashSender ++ RUNTIME DESTINATION tools/crashrpt ++) ++ ++file(GLOB LANG_FILES "${CMAKE_SOURCE_DIR}/lang_files/crashrpt_lang_*.ini") ++install(FILES ${LANG_FILES} DESTINATION tools/crashrpt) ++install(FILES "${CMAKE_SOURCE_DIR}/lang_files/crashrpt_lang_EN.ini" DESTINATION tools/crashrpt RENAME crashrpt_lang.ini) +diff --git a/reporting/crashsender/CrashSender.rc b/reporting/crashsender/CrashSender.rc +index 0502962..e10e269 100644 +--- a/reporting/crashsender/CrashSender.rc ++++ b/reporting/crashsender/CrashSender.rc +@@ -7,7 +7,7 @@ + // + // Generated from the TEXTINCLUDE 2 resource. + // +-#include "atlres.h" ++#include "wtl/atlres.h" + + ///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS +@@ -243,7 +243,7 @@ END + + 2 TEXTINCLUDE + BEGIN +- "#include ""atlres.h""\r\n" ++ "#include ""wtl/atlres.h""\r\n" + "\0" + END + +diff --git a/reporting/crashsender/ErrorReportSender.cpp b/reporting/crashsender/ErrorReportSender.cpp +index ac9603c..64cf2b5 100644 +--- a/reporting/crashsender/ErrorReportSender.cpp ++++ b/reporting/crashsender/ErrorReportSender.cpp +@@ -722,9 +722,9 @@ BOOL CErrorReportSender::CreateMiniDump() + CompiledApiVer.Reserved = 0; + LPAPI_VERSION pActualApiVer = lpImagehlpApiVersionEx(&CompiledApiVer); + pActualApiVer; +- ATLASSERT(CompiledApiVer.MajorVersion==pActualApiVer->MajorVersion); +- ATLASSERT(CompiledApiVer.MinorVersion==pActualApiVer->MinorVersion); +- ATLASSERT(CompiledApiVer.Revision==pActualApiVer->Revision); ++ //ATLASSERT(CompiledApiVer.MajorVersion==pActualApiVer->MajorVersion); ++ //ATLASSERT(CompiledApiVer.MinorVersion==pActualApiVer->MinorVersion); ++ //ATLASSERT(CompiledApiVer.Revision==pActualApiVer->Revision); + } + + // Write minidump to the file +@@ -1086,7 +1086,7 @@ BOOL CErrorReportSender::CreateCrashDescriptionXML(CErrorReportInfo& eri) + goto cleanup; + } + +- doc.useMicrosoftBOM = true; ++ //doc.useMicrosoftBOM = true; + bool bSave = doc.SaveFile(f); + if(!bSave) + { +diff --git a/reporting/crashsender/FilePreviewCtrl.cpp b/reporting/crashsender/FilePreviewCtrl.cpp +index e71aafc..5650291 100644 +--- a/reporting/crashsender/FilePreviewCtrl.cpp ++++ b/reporting/crashsender/FilePreviewCtrl.cpp +@@ -365,7 +365,7 @@ BOOL CImage::LoadBitmapFromPNGFile(LPTSTR szFileName) + if (!png_ptr) + goto cleanup; + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + goto cleanup; + + info_ptr = png_create_info_struct(png_ptr); +@@ -389,7 +389,7 @@ BOOL CImage::LoadBitmapFromPNGFile(LPTSTR szFileName) + width = png_get_image_width(png_ptr, info_ptr); + height = png_get_image_height(png_ptr, info_ptr); + +- if(info_ptr->channels==3) ++ if (png_get_channels(png_ptr, info_ptr) == 3) + { + png_set_strip_16(png_ptr); + png_set_packing(png_ptr); +@@ -408,14 +408,14 @@ BOOL CImage::LoadBitmapFromPNGFile(LPTSTR szFileName) + pBMI = (BITMAPINFO*)new BYTE[sizeof(BITMAPINFO)+256*4]; + memset(pBMI, 0, sizeof(BITMAPINFO)+256*4); + pBMI->bmiHeader.biSize = sizeof(BITMAPINFO); +- pBMI->bmiHeader.biBitCount = 8*info_ptr->channels; ++ pBMI->bmiHeader.biBitCount = 8 * png_get_channels(png_ptr, info_ptr); + pBMI->bmiHeader.biWidth = width; + pBMI->bmiHeader.biHeight = height; + pBMI->bmiHeader.biPlanes = 1; + pBMI->bmiHeader.biCompression = BI_RGB; + pBMI->bmiHeader.biSizeImage = rowbytes*height; + +- if( info_ptr->channels == 1 ) ++ if (png_get_channels(png_ptr, info_ptr) == 1) + { + RGBQUAD* palette = pBMI->bmiColors; + +@@ -431,7 +431,7 @@ BOOL CImage::LoadBitmapFromPNGFile(LPTSTR szFileName) + + for(y=height-1; y>=0; y--) + { +- png_read_rows(png_ptr, &row, png_bytepp_NULL, 1); ++ png_read_rows(png_ptr, &row, NULL, 1); + + { + CAutoLock lock(&m_csLock); +diff --git a/reporting/crashsender/ScreenCap.cpp b/reporting/crashsender/ScreenCap.cpp +index c183c19..8f5643d 100644 +--- a/reporting/crashsender/ScreenCap.cpp ++++ b/reporting/crashsender/ScreenCap.cpp +@@ -11,6 +11,7 @@ be found in the Authors.txt file in the root of the source tree. + #include "stdafx.h" + #include "ScreenCap.h" + #include "Utility.h" ++#include "zlib.h" + + // Disable warning C4611: interaction between '_setjmp' and C++ object destruction is non-portable + #pragma warning(disable:4611) +diff --git a/reporting/crashsender/stdafx.h b/reporting/crashsender/stdafx.h +index f087ff4..4494d3a 100644 +--- a/reporting/crashsender/stdafx.h ++++ b/reporting/crashsender/stdafx.h +@@ -19,7 +19,7 @@ be found in the Authors.txt file in the root of the source tree. + #define WINVER 0x0501 + #define _WIN32_WINNT 0x0501 + #define _WIN32_IE 0x0600 +-#define _RICHEDIT_VER 0x0200 ++#define _RICHEDIT_VER 0x0300 + + typedef __int64 off_t, _off_t; + #define _OFF_T_DEFINED +@@ -61,19 +61,19 @@ namespace ATL + }; + #endif // _WTL_SUPPORT_SDK_ATL3 + +-#include ++#include + + extern CAppModule _Module; + + #include + +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + + #define _WTL_USE_CSTRING +-#include ++#include + + #include + #include +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index f7bfede..9358bef 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -32,7 +32,7 @@ set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG") + # Add include dir + include_directories( ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/reporting/CrashRpt +- ${CMAKE_SOURCE_DIR}/thirdparty/wtl ) ++ ${WTL_INCLUDE_DIR} ) + + # Add executable build target + add_executable(Tests ${source_files} ${header_files}) +@@ -42,3 +42,10 @@ target_link_libraries(Tests CrashRpt CrashRptProbe) + + set_target_properties(Tests PROPERTIES DEBUG_POSTFIX d ) + #set_target_properties(Tests PROPERTIES COMPILE_FLAGS "/Zi" LINK_FLAGS "/DEBUG") ++ ++install(TARGETS Tests ++ RUNTIME DESTINATION tools/crashrpt ++) ++ ++install(FILES "${CMAKE_SOURCE_DIR}/demos/WTLDemo/dummy.ini" DESTINATION tools/crashrpt) ++install(FILES "${CMAKE_SOURCE_DIR}/demos/WTLDemo/dummy.log" DESTINATION tools/crashrpt) +diff --git a/tests/stdafx.h b/tests/stdafx.h +index f12675b..0ec2117 100644 +--- a/tests/stdafx.h ++++ b/tests/stdafx.h +@@ -19,7 +19,7 @@ be found in the Authors.txt file in the root of the source tree. + #define WINVER 0x0501 + #define _WIN32_WINNT 0x0501 + #define _WIN32_IE 0x0600 +-#define _RICHEDIT_VER 0x0200 ++#define _RICHEDIT_VER 0x0300 + + #include + #include +@@ -58,15 +58,15 @@ namespace ATL + }; + #endif // _WTL_SUPPORT_SDK_ATL3 + +-#include ++#include + + extern CAppModule _Module; + + #include + +-#include +-#include +-#include ++#include ++#include ++#include + #include + #include + #include +@@ -75,7 +75,7 @@ extern CAppModule _Module; + #include + + #define _WTL_USE_CSTRING +-#include ++#include + + #if _MSC_VER<1400 + #define _TCSCPY_S(strDestination, numberOfElements, strSource) _tcscpy(strDestination, strSource) +diff --git a/thirdparty/libpng/CMakeLists.txt b/thirdparty/libpng/CMakeLists.txt +index b358c4e..e0f7a33 100644 +--- a/thirdparty/libpng/CMakeLists.txt ++++ b/thirdparty/libpng/CMakeLists.txt +@@ -7,7 +7,7 @@ aux_source_directory( . source_files ) + add_definitions(-D_UNICODE -D_CRT_SECURE_NO_DEPRECATE /wd4244 /wd4267) + + # Add include dir +-include_directories( ${CMAKE_SOURCE_DIR}/thirdparty/zlib ) ++include_directories( ${ZLIB_INCLUDE_DIRS} ) + + fix_default_compiler_settings_() + +@@ -15,6 +15,6 @@ fix_default_compiler_settings_() + add_library(libpng STATIC ${source_files}) + + # Add linker input libraries +-target_link_libraries(libpng zlib) ++target_link_libraries(libpng ZLIB::ZLIB) + + set_target_properties(libpng PROPERTIES DEBUG_POSTFIX d ) +\ No newline at end of file +diff --git a/thirdparty/libtheora/CMakeLists.txt b/thirdparty/libtheora/CMakeLists.txt +index 896fb47..f3cf5eb 100644 +--- a/thirdparty/libtheora/CMakeLists.txt ++++ b/thirdparty/libtheora/CMakeLists.txt +@@ -8,7 +8,7 @@ aux_source_directory( ./lib/x86_vc x86_source_files ) + add_definitions(-D_UNICODE -D_CRT_SECURE_NO_DEPRECATE /wd4244 /wd4700 /wd4214 /wd4554 /wd4018 /wd4100 /wd4132 /wd4389 /wd4127 /wd4701 /wd4245 /wd4267 /wd4334) + + # Add include dir +-include_directories( ${CMAKE_SOURCE_DIR}/thirdparty/libogg/include ++include_directories( ${OGG_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/thirdparty/libtheora/include) + + fix_default_compiler_settings_() +diff --git a/thirdparty/minizip/CMakeLists.txt b/thirdparty/minizip/CMakeLists.txt +index 5f4d0af..2b015c9 100644 +--- a/thirdparty/minizip/CMakeLists.txt ++++ b/thirdparty/minizip/CMakeLists.txt +@@ -7,7 +7,7 @@ aux_source_directory( . source_files ) + add_definitions(-D_UNICODE -D_CRT_SECURE_NO_DEPRECATE /wd4127 /wd4131 /wd4100 /wd4189 /wd4244) + + # Add include dir +-include_directories( ${CMAKE_SOURCE_DIR}/thirdparty/zlib ) ++include_directories( ${ZLIB_INCLUDE_DIRS} ) + + fix_default_compiler_settings_() + +@@ -15,6 +15,6 @@ fix_default_compiler_settings_() + add_library(minizip STATIC ${source_files}) + + # Add linker input libraries +-target_link_libraries(minizip zlib) ++target_link_libraries(minizip ZLIB::ZLIB) + + set_target_properties(minizip PROPERTIES DEBUG_POSTFIX d ) +\ No newline at end of file diff --git a/externals/vcpkg/ports/crashrpt/portfile.cmake b/externals/vcpkg/ports/crashrpt/portfile.cmake new file mode 100755 index 000000000..a4265e0f8 --- /dev/null +++ b/externals/vcpkg/ports/crashrpt/portfile.cmake @@ -0,0 +1,52 @@ +if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) + set(ARCH_DIR "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) + set(ARCH_DIR "x64/") +else() + message(FATAL_ERROR "${PORT} only supports x86 and x64 architectures") +endif() + +vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH + URL https://git.code.sf.net/p/crashrpt/code + REF 4616504670be5a425a525376648d912a72ce18f2 + PATCHES + 001-add-install-target-and-find-deps.patch +) + +# Remove vendored dependencies to ensure they are not picked up by the build +# Vendored minizip is still used since it contains modifications needed for CrashRpt +foreach(DEPENDENCY dbghelp jpeg libogg libpng libtheora tinyxml wtl zlib) + if(EXISTS ${SOURCE_PATH}/thirdparty/${DEPENDENCY}) + file(REMOVE_RECURSE ${SOURCE_PATH}/thirdparty/${DEPENDENCY}) + endif() +endforeach() + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CRASHRPT_BUILD_SHARED_LIBS) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" CRASHRPT_LINK_CRT_AS_DLL) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + probe CRASHRPT_BUILD_PROBE + tests CRASHRPT_BUILD_TESTS + demos CRASHRPT_BUILD_DEMOS +) + +# PREFER_NINJA is not used below since CrashSender fails to build with errors like this one: +# C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.23.28105\ATLMFC\include\atlconv.h(788): error C2440: 'return': cannot convert from 'LPCTSTR' to 'LPCOLESTR' +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + # PREFER_NINJA + OPTIONS + -DCRASHRPT_BUILD_SHARED_LIBS=${CRASHRPT_BUILD_SHARED_LIBS} + -DCRASHRPT_LINK_CRT_AS_DLL=${CRASHRPT_LINK_CRT_AS_DLL} + ${FEATURE_OPTIONS} +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/crashrpt/vcpkg.json b/externals/vcpkg/ports/crashrpt/vcpkg.json new file mode 100755 index 000000000..4b36fcda6 --- /dev/null +++ b/externals/vcpkg/ports/crashrpt/vcpkg.json @@ -0,0 +1,38 @@ +{ + "name": "crashrpt", + "version": "1.4.3", + "port-version": 2, + "description": "A crash reporting system for Windows applications", + "homepage": "http://crashrpt.sourceforge.net/", + "supports": "!osx & !linux & !uwp & (x86 | x64)", + "dependencies": [ + "dbghelp", + "libjpeg-turbo", + "libogg", + "libpng", + "libtheora", + "tinyxml", + "wtl", + "zlib" + ], + "features": { + "demos": { + "description": "Demo applications for CrashRptProbe" + }, + "probe": { + "description": "The CrashRptProbe library" + }, + "tests": { + "description": "Test application for crashrpt", + "dependencies": [ + { + "name": "crashrpt", + "default-features": false, + "features": [ + "probe" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/crc32c/portfile.cmake b/externals/vcpkg/ports/crc32c/portfile.cmake new file mode 100755 index 000000000..63a613028 --- /dev/null +++ b/externals/vcpkg/ports/crc32c/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/crc32c + REF 1.1.2 + SHA512 6325c52b5a6850b9f90086e0c0c86798c008af36e7cfd3a0216184a2d37b3bf7323481ddc6bfe4cbd5b31288b3ee6c69772d03085a13094cf95d00a9756a7196 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DCRC32C_BUILD_TESTS=OFF + -DCRC32C_BUILD_BENCHMARKS=OFF + -DCRC32C_USE_GLOG=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Crc32c) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/crc32c/vcpkg.json b/externals/vcpkg/ports/crc32c/vcpkg.json new file mode 100755 index 000000000..ac03f93e3 --- /dev/null +++ b/externals/vcpkg/ports/crc32c/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "crc32c", + "version": "1.1.2", + "description": "CRC32C implementation with support for CPU-specific acceleration instructions.", + "homepage": "https://github.com/google/crc32c", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/crfsuite/CMakeLists.txt b/externals/vcpkg/ports/crfsuite/CMakeLists.txt new file mode 100755 index 000000000..05dfa88d0 --- /dev/null +++ b/externals/vcpkg/ports/crfsuite/CMakeLists.txt @@ -0,0 +1,71 @@ +cmake_minimum_required(VERSION 3.19 FATAL_ERROR) +PROJECT(crfsuite) + +file(GLOB SOURCE_FILE_CQDB + "lib/cqdb/src/*.c" +) +file(GLOB HEADERS_FILE_CQDB + "lib/cqdb/include/*.h" +) + +file(GLOB SOURCE_FILE_CRF + "lib/crf/src/*.c" +) +file(GLOB HEADERS_FILE_CRF + "lib/crf/src/*.h" +) +file(GLOB SOURCE_FILE_FRONTEND + "frontend/*.c" +) +file(GLOB HEADERS_FILE_FRONTEND + "frontend/*.h" +) +file(GLOB SOURCE_FILE + "swig/*.cpp" + "frontend/*.c" +) +file(GLOB HEADERS_FILE + "include/*.h" + "include/*.hpp" + "frontend/*.h" +) + +find_library(LBFGS_LIBRARY lbfgs) + +include_directories(lib/cqdb/include/) +include_directories(include/) +include_directories(win32/liblbfgs/) + +add_library(cqdb STATIC ${SOURCE_FILE_CQDB} ${HEADERS_FILE_CQDB}) +add_library(crf STATIC ${SOURCE_FILE_CRF} ${HEADERS_FILE_CRF}) +add_library(crfsuite STATIC ${SOURCE_FILE} ${HEADERS_FILE}) + +target_link_libraries(crf PUBLIC cqdb ${LBFGS_LIBRARY}) +target_link_libraries(crfsuite PUBLIC crf) + +install(TARGETS cqdb crf crfsuite + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) + +if (WIN32) + add_executable(frontend ${SOURCE_FILE_FRONTEND} ${HEADERS_FILE_FRONTEND}) + target_link_libraries(frontend PUBLIC crf) + install(TARGETS frontend + RUNTIME DESTINATION tools + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + ) +endif() + + +install( + FILES + ${HEADERS_FILE} + ${HEADERS_FILE_CQDB} + ${HEADERS_FILE_CRF} + ${HEADERS_FILE_FRONTEND} + DESTINATION + include/crfsuite + ) diff --git a/externals/vcpkg/ports/crfsuite/portfile.cmake b/externals/vcpkg/ports/crfsuite/portfile.cmake new file mode 100755 index 000000000..dac715441 --- /dev/null +++ b/externals/vcpkg/ports/crfsuite/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO chokkan/crfsuite + REF a2a1547727985e3aff6a35cffe073f57f0223e9d + SHA512 d80f72fe13288bc516772542438c09439c6abbd4c15b06650f1de1fee7f7f710c1eed924d4300141807b8f86af398ae5d217974c13a65044515ceb163de441a4 + HEAD_REF master +) + +list(REMOVE_ITEM SOURCE_FILE "${SOURCE_PATH}/win32/liblbfgs/lbfgs.lib") +list(REMOVE_ITEM SOURCE_FILE "${SOURCE_PATH}/win32/liblbfgs/lbfgs_debug.lib") + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/crfsuite/vcpkg.json b/externals/vcpkg/ports/crfsuite/vcpkg.json new file mode 100755 index 000000000..b15828231 --- /dev/null +++ b/externals/vcpkg/ports/crfsuite/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "crfsuite", + "version-date": "2020-08-27", + "description": "CRFSuite is an implementation of Conditional Random Fields (CRFs) for labeling sequential data.", + "homepage": "https://www.chokkan.org/software/crfsuite/", + "license": null, + "supports": "!uwp", + "dependencies": [ + "liblbfgs", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/croncpp/0001-fix-cmake.patch b/externals/vcpkg/ports/croncpp/0001-fix-cmake.patch new file mode 100755 index 000000000..735c9df34 --- /dev/null +++ b/externals/vcpkg/ports/croncpp/0001-fix-cmake.patch @@ -0,0 +1,82 @@ +From 30db118abd484c59efada27d9d6956b5f68bcee6 Mon Sep 17 00:00:00 2001 +From: Robert Kesterson +Date: Fri, 4 Sep 2020 16:31:55 +0000 +Subject: [PATCH] vcpkg + +--- + CMakeLists.txt | 47 +++++++++++++++++++++++++++++++++++++++++++-- + croncppConfig.cmake | 1 + + 2 files changed, 46 insertions(+), 2 deletions(-) + create mode 100644 croncppConfig.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9114b39..8d46e6b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 3.7.0) +-project(croncpp) ++project(croncpp VERSION 1.0.0) + + if(WIN32) + message(status "Setting MSVC flags") +@@ -24,4 +24,47 @@ if(BUILD_TESTS) + endif() + + add_subdirectory(benchmark) +-add_subdirectory(test) +\ No newline at end of file ++add_subdirectory(test) ++ ++add_library( croncpp INTERFACE ) ++add_library( croncpp::croncpp ALIAS croncpp ) ++ ++include(GNUInstallDirs) ++target_include_directories( croncpp INTERFACE ++ $ ++ $ ) ++ ++if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.15) ++ # public headers will get installed: ++ set_target_properties( croncpp PROPERTIES PUBLIC_HEADER include/croncpp.h ) ++endif () ++ ++ ++set( version_config "${CMAKE_CURRENT_BINARY_DIR}/croncppConfigVersion.cmake" ) ++ ++include( CMakePackageConfigHelpers ) ++write_basic_package_version_file( "${version_config}" ++ VERSION ${PROJECT_VERSION} ++ COMPATIBILITY SameMajorVersion ) ++ ++message(STATUS "CMAKE_INSTALL_INCLUDEDIR = ${CMAKE_INSTALL_INCLUDEDIR}") ++ ++install( TARGETS croncpp ++ EXPORT croncppConfig ++ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/croncpp ) ++export( TARGETS croncpp NAMESPACE croncpp:: FILE croncppTargets.cmake ) ++if (CMAKE_VERSION VERSION_LESS 3.15) ++ install( ++ FILES include/croncpp.h ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/croncpp ) ++endif () ++ ++set( CONFIG_LOC "share/croncpp" ) ++ ++install( EXPORT croncppConfig ++ FILE croncppTargets.cmake ++ NAMESPACE croncpp:: ++ DESTINATION ${CONFIG_LOC} ) ++install ( ++ FILES croncppConfig.cmake "${version_config}" ++ DESTINATION ${CONFIG_LOC}) +diff --git a/croncppConfig.cmake b/croncppConfig.cmake +new file mode 100644 +index 0000000..3c4702c +--- /dev/null ++++ b/croncppConfig.cmake +@@ -0,0 +1 @@ ++include( "${CMAKE_CURRENT_LIST_DIR}/croncppTargets.cmake" ) +-- +2.20.1 + diff --git a/externals/vcpkg/ports/croncpp/no-test.patch b/externals/vcpkg/ports/croncpp/no-test.patch new file mode 100755 index 000000000..0860e3f10 --- /dev/null +++ b/externals/vcpkg/ports/croncpp/no-test.patch @@ -0,0 +1,17 @@ +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index a82e605..405f306 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -1,3 +1,4 @@ ++if(BUILD_TESTS) + cmake_minimum_required(VERSION 3.7.0) + project(test_croncpp) + +@@ -9,7 +10,6 @@ file(GLOB SOURCES "*.cpp" "include/*.cpp") + + add_executable(test_croncpp ${SOURCES} ${headers}) + +-if(BUILD_TESTS) + enable_testing() + + add_test(NAME "test_croncpp" COMMAND "test_croncpp" "-r compact") diff --git a/externals/vcpkg/ports/croncpp/portfile.cmake b/externals/vcpkg/ports/croncpp/portfile.cmake new file mode 100755 index 000000000..bfdd2f84f --- /dev/null +++ b/externals/vcpkg/ports/croncpp/portfile.cmake @@ -0,0 +1,26 @@ + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mariusbancila/croncpp + REF 11cce4666a06c40346c7ba380ddd90c53806809d #master on 9/4/2020 + SHA512 8f4d892ce90d8eca3711b21728bb599bf64857b20c0b143c5277687d0b6e5d5b8bf3e6dc7f9e8d028ba4e5ee711a5a9e750bcc2f771177d2f659c0c19e12207a + HEAD_REF master + PATCHES + 0001-fix-cmake.patch + no-test.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/croncpp/vcpkg.json b/externals/vcpkg/ports/croncpp/vcpkg.json new file mode 100755 index 000000000..e41db7b77 --- /dev/null +++ b/externals/vcpkg/ports/croncpp/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "croncpp", + "version-date": "2020-09-04", + "port-version": 3, + "description": "croncpp is a C++17 header-only cross-platform library for handling CRON expressions.", + "homepage": "https://github.com/mariusbancila/croncpp", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/crossguid/portfile.cmake b/externals/vcpkg/ports/crossguid/portfile.cmake new file mode 100755 index 000000000..5be5064d1 --- /dev/null +++ b/externals/vcpkg/ports/crossguid/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO graeme-hill/crossguid + REF ca1bf4b810e2d188d04cb6286f957008ee1b7681 #2021-10-22 + SHA512 f0a80d8e99b10473bcfdfde3d1c5fd7b766959819f0d1c0595ac84ce46db9007a5fbfde9a55aca60530c46cb7f8ef4c7e472c6191559ded92f868589c141ccaf + HEAD_REF master + PATCHES + warnings.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCROSSGUID_TESTS:BOOL=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/crossguid/cmake) + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/crossguid/vcpkg.json b/externals/vcpkg/ports/crossguid/vcpkg.json new file mode 100755 index 000000000..aa9aecd85 --- /dev/null +++ b/externals/vcpkg/ports/crossguid/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "crossguid", + "version-date": "2021-10-22", + "port-version": 2, + "description": "CrossGuid is a minimal, cross platform, C++ GUID library.", + "dependencies": [ + { + "name": "libuuid", + "platform": "!windows & !osx & !android" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/crossguid/warnings.patch b/externals/vcpkg/ports/crossguid/warnings.patch new file mode 100755 index 000000000..d0ffc790a --- /dev/null +++ b/externals/vcpkg/ports/crossguid/warnings.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 76b5a62..174d981 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -40,15 +40,6 @@ else() + target_compile_definitions(crossguid PRIVATE GUID_LIBUUID) + endif() + +-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +- set(WARNINGS "-Werror" "-Wall") +-elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- set(WARNINGS "-Werror" "-Wall") +-elseif(MSVC) +- set(WARNINGS "/WX" "/W4") +-endif() +-target_compile_options(crossguid PRIVATE ${WARNINGS}) +- + set_target_properties(crossguid + PROPERTIES + VERSION ${PROJECT_VERSION} diff --git a/externals/vcpkg/ports/crow/portfile.cmake b/externals/vcpkg/ports/crow/portfile.cmake new file mode 100755 index 000000000..5f792e668 --- /dev/null +++ b/externals/vcpkg/ports/crow/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO CrowCpp/crow + REF 4d2f26ee8ff2c96c6c93e7e2b7f5162027f2482d # v1.0+1 + SHA512 69a27ae87eaa5523905e80fd1028208f2862cdd76c467e8d12dc1cca388965edb7615ae102bc1af13d824ad681eea17f69a42e790755f88ad57cae11b4268683 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCROW_BUILD_EXAMPLES=OFF + -DCROW_BUILD_TESTS=OFF +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Crow) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/crow/vcpkg.json b/externals/vcpkg/ports/crow/vcpkg.json new file mode 100755 index 000000000..70e70f380 --- /dev/null +++ b/externals/vcpkg/ports/crow/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "crow", + "version": "1.0-1", + "description": "Very fast and easy to use C++ micro web framework", + "homepage": "https://github.com/CrowCpp/crow", + "license": "BSD-3-Clause", + "dependencies": [ + "boost-algorithm", + "boost-array", + "boost-asio", + "boost-date-time", + "boost-functional", + "boost-lexical-cast", + "boost-optional", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/cryptopp/cmake.patch b/externals/vcpkg/ports/cryptopp/cmake.patch new file mode 100755 index 000000000..b0839bca7 --- /dev/null +++ b/externals/vcpkg/ports/cryptopp/cmake.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fb43b95..c39e470 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -451,6 +451,10 @@ if (MSVC) + endif() + endif () + ++if(WINDOWS_STORE) ++ add_definitions(-DCRYPTOPP_DISABLE_NACL=1) ++endif() ++ + # Enable PIC for all target machines except 32-bit i386 due to register pressures. + if (NOT CRYPTOPP_I386) + SET(CMAKE_POSITION_INDEPENDENT_CODE 1) +@@ -1022,10 +1026,10 @@ endif () + # add_compile_definitions added in CMake 3.12 + if (${CMAKE_VERSION} VERSION_LESS "3.12") + # https://stackoverflow.com/q/61250087 +- add_definitions("${CMAKE_CPP_FLAGS}" "${CMAKE_CXX_FLAGS}" "${CRYPTOPP_COMPILE_DEFINITIONS}" "${CRYPTOPP_COMPILE_OPTIONS}") ++ add_definitions(${CMAKE_CPP_FLAGS} ${CRYPTOPP_COMPILE_DEFINITIONS} ${CRYPTOPP_COMPILE_OPTIONS}) + else() +- add_compile_definitions("${CMAKE_CPP_FLAGS}" "${CRYPTOPP_COMPILE_DEFINITIONS}") +- add_compile_options("${CMAKE_CXX_FLAGS}" "${CRYPTOPP_COMPILE_OPTIONS}") ++ add_compile_definitions(${CRYPTOPP_COMPILE_DEFINITIONS}) ++ add_compile_options(${CMAKE_CPP_FLAGS} ${CRYPTOPP_COMPILE_OPTIONS}) + endif() + + #============================================================================ diff --git a/externals/vcpkg/ports/cryptopp/patch.patch b/externals/vcpkg/ports/cryptopp/patch.patch new file mode 100755 index 000000000..c202564e9 --- /dev/null +++ b/externals/vcpkg/ports/cryptopp/patch.patch @@ -0,0 +1,12 @@ +diff --git a/config_os.h b/config_os.h +index da27de22..9703f77d 100644 +--- a/config_os.h ++++ b/config_os.h +@@ -126,6 +126,7 @@ + #endif + + #ifdef CRYPTOPP_WIN32_AVAILABLE ++#include + # if !defined(WINAPI_FAMILY) + # define THREAD_TIMER_AVAILABLE + # elif defined(WINAPI_FAMILY) diff --git a/externals/vcpkg/ports/cryptopp/portfile.cmake b/externals/vcpkg/ports/cryptopp/portfile.cmake new file mode 100755 index 000000000..584eb7144 --- /dev/null +++ b/externals/vcpkg/ports/cryptopp/portfile.cmake @@ -0,0 +1,72 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH CMAKE_SOURCE_PATH + REPO noloader/cryptopp-cmake + REF CRYPTOPP_8_6_0 + SHA512 655107b8a41e1e6603a6b3ed2ddc95fad22b646c071c7251c3c7e2151afe439de848679235a3790fe540263424324f06c922687719da6dfea341bc2a75337bdc + HEAD_REF master + PATCHES + cmake.patch +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO weidai11/cryptopp + REF CRYPTOPP_8_6_0 + SHA512 ccb4baa6674cd830cddb779216ce702b3cdba6de8a3d627c218861507c36bddd2861b0d0e8cad35001a1e9f0c3d5020404684c87dd05d85264ac166fa7f70589 + HEAD_REF master + PATCHES patch.patch +) + +file(COPY ${CMAKE_SOURCE_PATH}/cryptopp-config.cmake DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_SOURCE_PATH}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +if("pem-pack" IN_LIST FEATURES) + vcpkg_from_github( + OUT_SOURCE_PATH PEM_PACK_SOURCE_PATH + REPO noloader/cryptopp-pem + REF 095f08ff2ef9bca7b81036a59f2395e4f08ce2e8 + SHA512 49912758a635faca1f49665ac9552b20576b46e0283aaabc19bb012bdc80586106452018e5088b9b46967717982ca6022ca968edc4cac96a7506d2b1a3e4bf13 + HEAD_REF master + ) + + file(GLOB PEM_PACK_FILES + ${PEM_PACK_SOURCE_PATH}/*.h + ${PEM_PACK_SOURCE_PATH}/*.cpp + ) + file(COPY ${PEM_PACK_FILES} DESTINATION ${SOURCE_PATH}) +endif() + +# disable assembly on ARM Windows to fix broken build +if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "^arm") + set(CRYPTOPP_DISABLE_ASM "ON") +else() + set(CRYPTOPP_DISABLE_ASM "OFF") +endif() + +# Dynamic linking should be avoided for Crypto++ to reduce the attack surface, +# so generate a static lib for both dynamic and static vcpkg targets. +# See also: +# https://www.cryptopp.com/wiki/Visual_Studio#Dynamic_Runtime_Linking +# https://www.cryptopp.com/wiki/Visual_Studio#The_DLL + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DBUILD_SHARED=OFF + -DBUILD_STATIC=ON + -DBUILD_TESTING=OFF + -DBUILD_DOCUMENTATION=OFF + -DDISABLE_ASM=${CRYPTOPP_DISABLE_ASM} +) + +vcpkg_cmake_install () +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cryptopp) + +# There is no way to suppress installation of the headers and resource files in debug build. +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(COPY ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cryptopp) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/cryptopp/License.txt ${CURRENT_PACKAGES_DIR}/share/cryptopp/copyright) diff --git a/externals/vcpkg/ports/cryptopp/vcpkg.json b/externals/vcpkg/ports/cryptopp/vcpkg.json new file mode 100755 index 000000000..02ffa51b1 --- /dev/null +++ b/externals/vcpkg/ports/cryptopp/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "cryptopp", + "version": "8.6.0", + "description": "Crypto++ is a free C++ class library of cryptographic schemes.", + "homepage": "https://github.com/weidai11/cryptopp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "pem-pack": { + "description": "Crypto++ with PEM pack" + } + } +} diff --git a/externals/vcpkg/ports/cspice/CMakeLists.txt b/externals/vcpkg/ports/cspice/CMakeLists.txt new file mode 100755 index 000000000..042a7af81 --- /dev/null +++ b/externals/vcpkg/ports/cspice/CMakeLists.txt @@ -0,0 +1,46 @@ +cmake_minimum_required(VERSION 3.1) +project(cspice LANGUAGES C) + +set(SOVERSION 67) + +# Include all *.c files from the library +file(GLOB CSPICE_SOURCE ${PROJECT_SOURCE_DIR}/cspice/src/cspice/*.c) +set(INCLUDE_PATH "${PROJECT_SOURCE_DIR}/cspice/include") + +if (_STATIC_BUILD) + add_library(cspice STATIC ${CSPICE_SOURCE}) +else() + add_library(cspice SHARED ${CSPICE_SOURCE}) +endif() +target_include_directories(cspice PUBLIC "${INCLUDE_PATH}") + +if (WIN32) + target_compile_definitions(cspice PUBLIC "_COMPLEX_DEFINED;MSDOS;OMIT_BLANK_CC;NON_ANSI_STDIO;_CRT_SECURE_NO_WARNINGS") + set_target_properties(cspice PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE) +elseif (UNIX) + target_compile_definitions(cspice PUBLIC "NON_UNIX_STDIO") + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + target_compile_options(cspice PUBLIC -m64 -ansi -fPIC) + elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) + target_compile_options(cspice PUBLIC -m32 -ansi -fPIC) + endif() + target_compile_options(cspice PRIVATE -Wno-error=implicit-function-declaration) +endif () + +if (NOT _SKIP_HEADERS) + file(GLOB SPICE_HEADERS ${INCLUDE_PATH}/*.h) + install(FILES ${SPICE_HEADERS} DESTINATION include/cspice) +endif() + +set_target_properties( + cspice + PROPERTIES SOVERSION ${SOVERSION} +) + +install( + TARGETS cspice + EXPORT cspice + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin +) diff --git a/externals/vcpkg/ports/cspice/License.txt b/externals/vcpkg/ports/cspice/License.txt new file mode 100755 index 000000000..dcec937a1 --- /dev/null +++ b/externals/vcpkg/ports/cspice/License.txt @@ -0,0 +1,16 @@ +This software and any related materials were created by the California +Institute of Technology (Caltech) under U.S. government contract with the +National Aeronautics and Space Administration (NASA). The software is +Technology and Software Publicly Available under U.S. export laws and is +provided "as-is" to the recipient without warranty of any kind, including any +warranties of performance or merchantability or fitness for particular use or +purpose (as set forth in United States UCC§2312-§2313) or for any purpose +whatsoever, for the software and related materials, however used. In no event +shall Caltech, its Jet Propulsion Laboratory, or NASA be liable for any damages +and/or costs, including, but not limited to, incidental or consequential +damages of any kind, including economic damage or injury to property and lost +profits, regardless of whether Caltech, JPL, or NASA be advised, have reason to +know, or, in fact, shall know of the possibility. Recipient bears all risk +relating to quality and performance of the software and any related materials, +and agrees to indemnify Caltech and NASA for all third-party claims resulting +from the actions of recipient in the use of the software. diff --git a/externals/vcpkg/ports/cspice/isatty.patch b/externals/vcpkg/ports/cspice/isatty.patch new file mode 100755 index 000000000..a6d201d77 --- /dev/null +++ b/externals/vcpkg/ports/cspice/isatty.patch @@ -0,0 +1,19 @@ +--- a/cspice/src/cspice/fio.h 2019-11-01 20:51:53.198400000 +0300 ++++ b/cspice/src/cspice/fio.h 2019-11-01 21:19:58.123200000 +0300 +@@ -1,3 +1,6 @@ ++#ifdef _WIN32 ++#include /* for isatty() */ ++#endif + #include "stdio.h" + #include "errno.h" + #ifndef NULL +@@ -75,7 +76,9 @@ + extern int (*f__donewrec)(void), t_putc(int), x_wSL(void); + extern void b_char(char*,char*,ftnlen), g_char(char*,ftnlen,char*); + extern int c_sfe(cilist*), z_rnew(void); ++#ifndef _WIN32 + extern int isatty(int); ++#endif + extern int err__fl(int,int,char*); + extern int xrd_SL(void); + extern int f__putbuf(int); diff --git a/externals/vcpkg/ports/cspice/mktemp.patch b/externals/vcpkg/ports/cspice/mktemp.patch new file mode 100755 index 000000000..5a7cc0ee0 --- /dev/null +++ b/externals/vcpkg/ports/cspice/mktemp.patch @@ -0,0 +1,11 @@ +--- a/cspice/src/cspice/open.c 2019-11-02 10:57:10.073886963 +0300 ++++ b/cspice/src/cspice/open.c 2019-11-02 10:57:49.230398941 +0300 +@@ -324,7 +324,7 @@ + #ifdef NON_ANSI_STDIO + + (void) strcpy(buf,"tmp.FXXXXXX"); +- (void) mktemp(buf); ++ fclose(mktemp(buf)); + goto replace; + + #else diff --git a/externals/vcpkg/ports/cspice/portfile.cmake b/externals/vcpkg/ports/cspice/portfile.cmake new file mode 100755 index 000000000..33d481d7b --- /dev/null +++ b/externals/vcpkg/ports/cspice/portfile.cmake @@ -0,0 +1,70 @@ +if (VCPKG_TARGET_IS_WINDOWS) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(SUBPATH "PC_Windows_VisualC_32bit/packages/cspice.zip") + set(SHA512 1949fd12b30ca0e42f53311a97d8571e68737f6a667a56946d3415ee715dda0a1adca9bfc985b9b9447084189c50d261f2c00960cbe2ddf6a1d1d92cf8fa17ab) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(SUBPATH "PC_Windows_VisualC_64bit/packages/cspice.zip") + set(SHA512 5457f24279fb485b0ac92713dab026d1c1ed766a358fcf7d9ce3f70693e75da85a656e72b1ada4dc334e9e68d6c0eb42b2a31f3ad0c83b491dd3afc79e5cda98) + endif() +elseif(VCPKG_TARGET_IS_OSX) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(SUBPATH "MacIntel_OSX_AppleC_64bit/packages/cspice.tar.Z") + set(SHA512 ea9a32c763cd54303de180b4895a195cd5ef6774051f18a1812f2fff39adc0ca9d5dd7878853af40e766882e79a0f542a45139656fb79fb4b436c4bc5bdecddc) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(SUBPATH "MacM1_OSX_clang_64bit/packages/cspice.tar.Z") + set(SHA512 a64f028ec1935dbc7f8d03c903fbfa40cfff097ec4aa0ca4aa1d2ee08561833000e7caf99d6550b06d2a0874cbaf1767382e7a9aea6a39228f3eaa89c6c31a6d) + endif() +else() + if ((VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") OR (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")) + set(SUBPATH "PC_Linux_GCC_32bit/packages/cspice.tar.Z") + set(SHA512 22a6250376e9f98d75ecc8682c5432a07a89addc9812010ad97059491e2c19cab418d7aa3f591bded9df132fcfb6865686f0ecfe70821ad31061ae2f7b165f2b) + elseif((VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") OR (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")) + set(SUBPATH "PC_Linux_GCC_64bit/packages/cspice.tar.Z") + set(SHA512 59946f628284cd31c75a23c152d725ae7e01b179f97c52b98518eceeda54bc38875b1dd93dc17574c0bf00e706e0ee35d06ecb5d7871d49633baa8f16eb6c7c8) + endif() +endif() + +set(VERSION 67) +set(URL "https://naif.jpl.nasa.gov/pub/naif/misc/toolkit_N00${VERSION}/C/${SUBPATH}") +get_filename_component(ext "${SUBPATH}" EXT) +string(SUBSTRING "${SHA512}" 0 6 subsha) +vcpkg_download_distfile(ARCHIVE URLS "${URL}" FILENAME "cspice-${subsha}${ext}" SHA512 "${SHA512}") + +set(PATCHES isatty.patch) +if (NOT VCPKG_TARGET_IS_WINDOWS) + set(PATCHES ${PATCHES} mktemp.patch) +endif() + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL + PATCHES ${PATCHES} +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(_STATIC_BUILD ON) +endif() + +if (VCPKG_TARGET_IS_UWP) + set(VCPKG_C_FLAGS "/sdl- ${VCPKG_C_FLAGS}") + set(VCPKG_CXX_FLAGS "/sdl- ${VCPKG_CXX_FLAGS}") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS -D_STATIC_BUILD=${_STATIC_BUILD} + OPTIONS_DEBUG -D_SKIP_HEADERS=ON +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +file( + INSTALL ${CMAKE_CURRENT_LIST_DIR}/License.txt + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright +) diff --git a/externals/vcpkg/ports/cspice/vcpkg.json b/externals/vcpkg/ports/cspice/vcpkg.json new file mode 100755 index 000000000..d84c24ae0 --- /dev/null +++ b/externals/vcpkg/ports/cspice/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "cspice", + "version": "67", + "port-version": 2, + "description": "NASA C SPICE toolkit", + "homepage": "https://naif.jpl.nasa.gov/naif/toolkit_C.html", + "license": null, + "supports": "!((arm | arm64) & windows)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ctbignum/portfile.cmake b/externals/vcpkg/ports/ctbignum/portfile.cmake new file mode 100755 index 000000000..9bafbc9ba --- /dev/null +++ b/externals/vcpkg/ports/ctbignum/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO niekbouman/ctbignum + REF cf3233d8b7dcff59f29a7389204959ee2228a4af + SHA512 8cd5e187836f48165a088a171c87ce438393e66f7362af1b67a253ae6ef0b17c41468e21e0dfe337094796f2b2a2fa5062cc9a9231afc377f187baf1ead1257e + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCTBIGNUM_BuildTests=OFF + -DCTBIGNUM_BuildBenchmarks=OFF +) + +vcpkg_install_cmake() + +# Move CMake files to the right place +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +# Remove empty files +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) + diff --git a/externals/vcpkg/ports/ctbignum/vcpkg.json b/externals/vcpkg/ports/ctbignum/vcpkg.json new file mode 100755 index 000000000..093dfbcfb --- /dev/null +++ b/externals/vcpkg/ports/ctbignum/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "ctbignum", + "version-string": "2019-08-02", + "port-version": 1, + "description": "This is a header-only template library for fixed-width \"small big-integer\" computations, for use during run-time as well as compile-time.", + "homepage": "https://github.com/niekbouman/ctbignum", + "dependencies": [ + "boost" + ] +} diff --git a/externals/vcpkg/ports/ctemplate/CMakeLists.txt b/externals/vcpkg/ports/ctemplate/CMakeLists.txt new file mode 100755 index 000000000..63e6fc6b3 --- /dev/null +++ b/externals/vcpkg/ports/ctemplate/CMakeLists.txt @@ -0,0 +1,96 @@ +cmake_minimum_required(VERSION 3.5.1) +project(libctemplate C CXX) + +# find_package(PythonInterp) +if(NOT PYTHON_EXECUTABLE) + message(FATAL_ERROR "PYTHON_EXECUTABLE must be set") +endif() + +if(MSVC) + add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS) + add_definitions(-D_VARIADIC_MAX=10) +endif() + +set(SOURCE_PATH ${PROJECT_SOURCE_DIR}/src) +set(BASE_SOURCE_PATH ${SOURCE_PATH}/base) +set(WINDOWS_SOURCE_PATH ${SOURCE_PATH}/windows) +set(HTMLPARSER_SOURCE_PATH ${SOURCE_PATH}/htmlparser) + +set(COMMON_INCLUDES ${PROJECT_BINARY_DIR}/include) + +set(HTMLPARSER_CONFIG ${HTMLPARSER_SOURCE_PATH}/htmlparser_fsm.config) +set(JSPASPER_CONFIG ${HTMLPARSER_SOURCE_PATH}/jsparser_fsm.config) +set(FSM_GENERATOR ${HTMLPARSER_SOURCE_PATH}/generate_fsm.py) + +set(BASE_HEADERS + "${BASE_SOURCE_PATH}/arena.h" + "${BASE_SOURCE_PATH}/manual_constructor.h" + "${BASE_SOURCE_PATH}/mutex.h" + "${BASE_SOURCE_PATH}/small_map.h" + "${BASE_SOURCE_PATH}/thread_annotations.h" + "${BASE_SOURCE_PATH}/util.h" + "${BASE_SOURCE_PATH}/arena-inl.h" +) + +set( + HTMLPARSER_HEADERS + "${HTMLPARSER_SOURCE_PATH}/htmlparser.h" + "${HTMLPARSER_SOURCE_PATH}/htmlparser_cpp.h" + "${HTMLPARSER_SOURCE_PATH}/jsparser.h" + "${HTMLPARSER_SOURCE_PATH}/statemachine.h" +) +set(SRC_FILES + "${SOURCE_PATH}/base/arena.cc" + "${SOURCE_PATH}/htmlparser/htmlparser.cc" + "${SOURCE_PATH}/htmlparser/jsparser.cc" + "${SOURCE_PATH}/htmlparser/statemachine.cc" + "${SOURCE_PATH}/per_expand_data.cc" + "${SOURCE_PATH}/template.cc" + "${SOURCE_PATH}/template_annotator.cc" + "${SOURCE_PATH}/template_cache.cc" + "${SOURCE_PATH}/template_dictionary.cc" + "${SOURCE_PATH}/template_modifiers.cc" + "${SOURCE_PATH}/template_namelist.cc" + "${SOURCE_PATH}/template_pathops.cc" + "${SOURCE_PATH}/template_string.cc" + "${SOURCE_PATH}/windows/port.cc" +) + +file(COPY "${WINDOWS_SOURCE_PATH}/" DESTINATION ${COMMON_INCLUDES}) +file(COPY "${WINDOWS_SOURCE_PATH}/config.h" DESTINATION ${COMMON_INCLUDES}/windows) +file(COPY "${WINDOWS_SOURCE_PATH}/port.h" DESTINATION ${COMMON_INCLUDES}/windows) +file(COPY ${HTMLPARSER_HEADERS} DESTINATION ${COMMON_INCLUDES}/htmlparser) +file(COPY ${BASE_HEADERS} DESTINATION ${COMMON_INCLUDES}/base) + +execute_process( + COMMAND ${PYTHON_EXECUTABLE} ${FSM_GENERATOR} ${HTMLPARSER_CONFIG} + WORKING_DIRECTORY ${COMMON_INCLUDES}/htmlparser + OUTPUT_VARIABLE HTMLPARSER_CONFIG_H +) +execute_process( + COMMAND ${PYTHON_EXECUTABLE} ${FSM_GENERATOR} ${JSPASPER_CONFIG} + WORKING_DIRECTORY ${COMMON_INCLUDES}/htmlparser + OUTPUT_VARIABLE JSPASPER_CONFIG_H +) + +file(WRITE "${COMMON_INCLUDES}/htmlparser/htmlparser_fsm.h" "${HTMLPARSER_CONFIG_H}") +file(WRITE "${COMMON_INCLUDES}/htmlparser/jsparser_fsm.h" "${JSPASPER_CONFIG_H}") + +include_directories(${COMMON_INCLUDES}) + +add_library(libctemplate ${SRC_FILES}) +if(NOT BUILD_SHARED_LIBS) + # Note: CTEMPLATE_DLL_DECL should be empty to build static file + target_compile_definitions(libctemplate PRIVATE -DCTEMPLATE_DLL_DECL=) +endif() + +install( + TARGETS libctemplate + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(DIRECTORY "${COMMON_INCLUDES}/ctemplate" DESTINATION include FILES_MATCHING PATTERN "*.h") +endif() diff --git a/externals/vcpkg/ports/ctemplate/portfile.cmake b/externals/vcpkg/ports/ctemplate/portfile.cmake new file mode 100755 index 000000000..f55a7c7e0 --- /dev/null +++ b/externals/vcpkg/ports/ctemplate/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO OlafvdSpek/ctemplate + REF 1c397b63e62dc6547054f4711c27918aedce4c2d # accessed on 2020-09-14 + SHA512 9691393cbb89972e95dba3cb802d0a0379f8f45cddc696e4ce223eb94887b3be46a9d999cac161069261ef63ba26fbdc392c53c3f977e1a7ae51768caa7739ea + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_find_acquire_program(PYTHON3) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DPYTHON_EXECUTABLE=${PYTHON3} + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_install_cmake() + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ctemplate RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/ctemplate/vcpkg.json b/externals/vcpkg/ports/ctemplate/vcpkg.json new file mode 100755 index 000000000..7a8c84bbf --- /dev/null +++ b/externals/vcpkg/ports/ctemplate/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "ctemplate", + "version-date": "2020-09-14", + "port-version": 3, + "description": "C++ CTemplate system", + "homepage": "https://github.com/OlafvdSpek/ctemplate", + "supports": "!arm" +} diff --git a/externals/vcpkg/ports/ctp/portfile.cmake b/externals/vcpkg/ports/ctp/portfile.cmake new file mode 100755 index 000000000..2c291b8ab --- /dev/null +++ b/externals/vcpkg/ports/ctp/portfile.cmake @@ -0,0 +1,96 @@ +message(STATUS "Note: the downloading server may only be avilable from 8:00AM-5:00PM (UTC+8), Mon-Fri (except public holidays in China)") + +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_download_distfile(TRADEAPI_ARCHIVE + URLS "http://www.sfit.com.cn/DocumentDown/api_3/5_2_2/v6.6.1_P1_tradeapi.zip" + FILENAME "v6.6.1_P1_tradeapi.zip" + SHA512 04d8ba233394fea04dacfa4bcb8758d9e068025ab3d963f6a89dcdfb79bbe10d58c10a71f630a039e130e4f8dfdc05cb4d1a52fd23d908f0798e43792d656cc4 +) + +if("datacollect" IN_LIST FEATURES) + # Data collect library is not included in this version, and official release note said we should get it from traderapi_v6.3.19_P1 + vcpkg_download_distfile(DATACOLLECT_ARCHIVE + URLS "http://www.sfit.com.cn/DocumentDown/api_3/5_2_2/traderapi_v6.3.19_P1.zip" + FILENAME "traderapi_v6.3.19_P1.zip" + SHA512 ce44d761b2aebaaf131b91bcfc2fa0d5466c023310bcae1f03297fe228f62d2c281c09a82bb4068ae92ddd3d5ba00359b7b44b8c44af1181fff1954317d24bbb + ) +endif() + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH TRADEAPI_UNPACK_PATH + ARCHIVE ${TRADEAPI_ARCHIVE} + NO_REMOVE_ONE_LEVEL +) + +if("datacollect" IN_LIST FEATURES) + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH DATACOLLECT_UNPACK_PATH + ARCHIVE ${DATACOLLECT_ARCHIVE} + NO_REMOVE_ONE_LEVEL + ) +endif() + + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(TRADEAPI_SOURCE_PATH "${TRADEAPI_UNPACK_PATH}/v6.6.1_P1_20210406_winApi/tradeapi/20210406_tradeapi_se_windows") +elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(TRADEAPI_SOURCE_PATH "${TRADEAPI_UNPACK_PATH}/v6.6.1_P1_20210406_winApi/tradeapi/20210406_tradeapi64_se_windows") +elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH TRADEAPI_LINUX_TAR_PATH + ARCHIVE "${TRADEAPI_UNPACK_PATH}/v6.6.1_P1_20210406_api_tradeapi_linux64.tar" + ) + set(TRADEAPI_SOURCE_PATH "${TRADEAPI_LINUX_TAR_PATH}/v6.6.1_P1_20210406_api_tradeapi_se_linux64") +else() + message(FATAL_ERROR "${TARGET_TRIPLET} is not a supported platform" ) +endif() + +if("datacollect" IN_LIST FEATURES) + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(DATACOLLECT_SOURCE_PATH "${DATACOLLECT_UNPACK_PATH}/v6.3.19_P1_20200106_winApi/20200106_clientdll_windows") + elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(DATACOLLECT_SOURCE_PATH "${DATACOLLECT_UNPACK_PATH}/v6.3.19_P1_20200106_winApi/20200106_clientdll64_windows") + elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH DATACOLLECT_LINUX_TAR_PATH + ARCHIVE "${DATACOLLECT_UNPACK_PATH}/v6.3.19_P1_20200106_api.tar" + ) + set(DATACOLLECT_SOURCE_PATH "${DATACOLLECT_LINUX_TAR_PATH}/v6.3.19_P1_20200106_api_clientdatacollectdll_linux64") + else() + message(FATAL_ERROR "${TARGET_TRIPLET} is not a supported platform" ) + endif() +endif() + + +file(INSTALL ${TRADEAPI_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.h") + +if(VCPKG_TARGET_IS_WINDOWS) + file(INSTALL ${TRADEAPI_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.lib") + file(INSTALL ${TRADEAPI_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dll") + file(INSTALL ${TRADEAPI_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.lib") + file(INSTALL ${TRADEAPI_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dll") +elseif(VCPKG_TARGET_IS_LINUX) + file(INSTALL ${TRADEAPI_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.so") + file(INSTALL ${TRADEAPI_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.so") +endif() + +file(INSTALL ${TRADEAPI_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} FILES_MATCHING PATTERN "*.xml") +file(INSTALL ${TRADEAPI_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} FILES_MATCHING PATTERN "*.dtd") + +if("datacollect" IN_LIST FEATURES) + file(INSTALL ${DATACOLLECT_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.h") + + if(VCPKG_TARGET_IS_WINDOWS) + file(INSTALL ${DATACOLLECT_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.lib") + file(INSTALL ${DATACOLLECT_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dll") + file(INSTALL ${DATACOLLECT_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.lib") + file(INSTALL ${DATACOLLECT_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dll") + elseif(VCPKG_TARGET_IS_LINUX) + file(INSTALL ${DATACOLLECT_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.so") + file(INSTALL ${DATACOLLECT_SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.so") + endif() + +endif() + +file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "Copyright By Shanghai Futures Information Technology Co.,Ltd") diff --git a/externals/vcpkg/ports/ctp/vcpkg.json b/externals/vcpkg/ports/ctp/vcpkg.json new file mode 100755 index 000000000..4893cae5f --- /dev/null +++ b/externals/vcpkg/ports/ctp/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "ctp", + "version-string": "6.6.1_P1_20210406_se", + "port-version": 3, + "description": "The Comprehensive Transaction Platform (CTP) is a future brokerage management system developed specially for futures companies. CTP API client library allows users to connect to CTP gateway for algorithmic trading.", + "homepage": "http://www.sfit.com.cn/index.htm", + "supports": "!osx & !uwp & !arm & !(static & staticcrt)", + "features": { + "datacollect": { + "description": "Data collect support of CTP" + } + } +} diff --git a/externals/vcpkg/ports/ctre/portfile.cmake b/externals/vcpkg/ports/ctre/portfile.cmake new file mode 100755 index 000000000..b1f209399 --- /dev/null +++ b/externals/vcpkg/ports/ctre/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO hanickadot/compile-time-regular-expressions + REF v3.6 + SHA512 ad39da95cafa0198a14362492c083541dfe9beafae9adfdfc5ec5adc9bba7395553abd9799b414493c962c3dd25a79af8c7cc9b7af35392049e2ab9f8b679362 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCTRE_BUILD_TESTS=OFF + -DCTRE_BUILD_PACKAGE=OFF +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/ctre") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/ctre/vcpkg.json b/externals/vcpkg/ports/ctre/vcpkg.json new file mode 100755 index 000000000..490a91f21 --- /dev/null +++ b/externals/vcpkg/ports/ctre/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "ctre", + "version-semver": "3.6.0", + "description": "A Compile time PCRE (almost) compatible regular expression matcher", + "homepage": "https://github.com/hanickadot/compile-time-regular-expressions", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/cub/fix-usage.patch b/externals/vcpkg/ports/cub/fix-usage.patch new file mode 100755 index 000000000..56801fdb9 --- /dev/null +++ b/externals/vcpkg/ports/cub/fix-usage.patch @@ -0,0 +1,24 @@ +diff --git a/cub/cmake/cub-config.cmake b/cub/cmake/cub-config.cmake +index 3d7f64b..213a95e 100644 +--- a/cub/cmake/cub-config.cmake ++++ b/cub/cmake/cub-config.cmake +@@ -8,6 +8,7 @@ if (TARGET CUB::CUB) + return() + endif() + ++include("${CMAKE_CURRENT_LIST_DIR}/cub-header-search.cmake") + function(_cub_declare_interface_alias alias_name ugly_name) + # 1) Only IMPORTED and ALIAS targets can be placed in a namespace. + # 2) When an IMPORTED library is linked to another target, its include +diff --git a/cub/cmake/cub-header-search.cmake.in b/cub/cmake/cub-header-search.cmake.in +index 2a46606..d2c38ef 100644 +--- a/cub/cmake/cub-header-search.cmake.in ++++ b/cub/cmake/cub-header-search.cmake.in +@@ -3,6 +3,6 @@ unset(_CUB_VERSION_INCLUDE_DIR CACHE) # Clear old result to force search + find_path(_CUB_VERSION_INCLUDE_DIR cub/version.cuh + NO_DEFAULT_PATH # Only search explicit paths below: + PATHS +- "${CMAKE_CURRENT_LIST_DIR}/../../../@CMAKE_INSTALL_INCLUDEDIR@" # Install tree ++ "${CMAKE_CURRENT_LIST_DIR}/../../@CMAKE_INSTALL_INCLUDEDIR@" # Install tree + ) + set_property(CACHE _CUB_VERSION_INCLUDE_DIR PROPERTY TYPE INTERNAL) diff --git a/externals/vcpkg/ports/cub/portfile.cmake b/externals/vcpkg/ports/cub/portfile.cmake new file mode 100755 index 000000000..69f73ad63 --- /dev/null +++ b/externals/vcpkg/ports/cub/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO NVlabs/cub + REF ed040d585c3237d706973d7ad290bfee40958270 #v1.16.0 + SHA512 81e0bacb0aa4ee7a1c86f3c12e3135a133579678d3530e0e0b8310f716d0355e5096925ac6de5865140a7aac08d974ea5169d47e34951b932a23965f74fe4ee6 + HEAD_REF master + PATCHES fix-usage.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCUB_ENABLE_INSTALL_RULES=ON + -DCUB_ENABLE_HEADER_TESTING=OFF + -DCUB_ENABLE_TESTING=OFF + -DCUB_ENABLE_EXAMPLES=OFF + -DCUB_ENABLE_CPP_DIALECT_IN_NAMES=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cub) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/cub/cmake" + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" +) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/cub/usage b/externals/vcpkg/ports/cub/usage new file mode 100755 index 000000000..bea0cf585 --- /dev/null +++ b/externals/vcpkg/ports/cub/usage @@ -0,0 +1,4 @@ +The package cub is header only and can be used from CMake via: + + find_package(cub CONFIG REQUIRED) + target_include_directories(main PRIVATE CUB::CUB) diff --git a/externals/vcpkg/ports/cub/vcpkg.json b/externals/vcpkg/ports/cub/vcpkg.json new file mode 100755 index 000000000..f6988759f --- /dev/null +++ b/externals/vcpkg/ports/cub/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "cub", + "version": "1.16.0", + "description": "CUB is a flexible library of cooperative threadblock primitives and other utilities for CUDA kernel programming", + "homepage": "https://github.com/NVIDIA/cub", + "license": "BSD-3-Clause", + "dependencies": [ + "cuda", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/cuda/portfile.cmake b/externals/vcpkg/ports/cuda/portfile.cmake new file mode 100755 index 000000000..a4b202cd9 --- /dev/null +++ b/externals/vcpkg/ports/cuda/portfile.cmake @@ -0,0 +1,13 @@ +# This package doesn't install CUDA. It instead verifies that CUDA is installed. +# Other packages can depend on this package to declare a dependency on CUDA. +# If this package is installed, we assume that CUDA is properly installed. + +#note: this port must be kept in sync with CUDNN and NCCL ports: every time one is upgraded, the other must be too + +include(${CMAKE_CURRENT_LIST_DIR}/vcpkg_find_cuda.cmake) + +vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg_find_cuda.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/cuda/vcpkg.json b/externals/vcpkg/ports/cuda/vcpkg.json new file mode 100755 index 000000000..61a3ce96c --- /dev/null +++ b/externals/vcpkg/ports/cuda/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "cuda", + "version": "10.1", + "port-version": 10, + "description": "A parallel computing platform and programming model", + "homepage": "https://developer.nvidia.com/cuda-toolkit", + "license": null, + "supports": "(windows & x64 & !uwp) | (linux & x64) | (linux & arm64)" +} diff --git a/externals/vcpkg/ports/cuda/vcpkg_find_cuda.cmake b/externals/vcpkg/ports/cuda/vcpkg_find_cuda.cmake new file mode 100755 index 000000000..64b758540 --- /dev/null +++ b/externals/vcpkg/ports/cuda/vcpkg_find_cuda.cmake @@ -0,0 +1,93 @@ +function(vcpkg_find_cuda) + cmake_parse_arguments(PARSE_ARGV 0 vfc "" "OUT_CUDA_TOOLKIT_ROOT;OUT_CUDA_VERSION" "") + + if(NOT vfc_OUT_CUDA_TOOLKIT_ROOT) + message(FATAL_ERROR "vcpkg_find_cuda() requres an OUT_CUDA_TOOLKIT_ROOT argument") + endif() + + set(CUDA_REQUIRED_VERSION "10.1.0") + + set(CUDA_PATHS + ENV CUDA_PATH + ENV CUDA_HOME + ENV CUDA_BIN_PATH + ENV CUDA_TOOLKIT_ROOT_DIR) + + if (VCPKG_TARGET_IS_WINDOWS) + find_program(NVCC + NAMES nvcc.exe + PATHS + ${CUDA_PATHS} + PATH_SUFFIXES bin bin64 + DOC "Toolkit location." + NO_DEFAULT_PATH + ) + else() + if (VCPKG_TARGET_IS_LINUX) + set(platform_base "/usr/local/cuda-") + else() + set(platform_base "/Developer/NVIDIA/CUDA-") + endif() + + file(GLOB possible_paths "${platform_base}*") + set(FOUND_PATH ) + foreach (p ${possible_paths}) + # Extract version number from end of string + string(REGEX MATCH "[0-9][0-9]?\\.[0-9]$" p_version ${p}) + if (IS_DIRECTORY ${p} AND p_version) + if (p_version VERSION_GREATER_EQUAL CUDA_REQUIRED_VERSION) + set(FOUND_PATH ${p}) + break() + endif() + endif() + endforeach() + + find_program(NVCC + NAMES nvcc + PATHS + ${CUDA_PATHS} + PATHS ${FOUND_PATH} + PATH_SUFFIXES bin bin64 + DOC "Toolkit location." + NO_DEFAULT_PATH + ) + endif() + + set(error_code 1) + if (NVCC) + execute_process( + COMMAND ${NVCC} --version + OUTPUT_VARIABLE NVCC_OUTPUT + RESULT_VARIABLE error_code) + endif() + + + if (error_code) + message(STATUS "Executing ${NVCC} --version resulted in error: ${error_code}") + message(FATAL_ERROR "Could not find CUDA. Before continuing, please download and install CUDA (v${CUDA_REQUIRED_VERSION} or higher) from:" + "\n https://developer.nvidia.com/cuda-downloads\n") + endif() + + # Sample output: + # NVIDIA (R) Cuda compiler driver + # Copyright (c) 2005-2016 NVIDIA Corporation + # Built on Sat_Sep__3_19:05:48_CDT_2016 + # Cuda compilation tools, release 8.0, V8.0.44 + string(REGEX MATCH "V([0-9]+)\\.([0-9]+)\\.([0-9]+)" CUDA_VERSION ${NVCC_OUTPUT}) + message(STATUS "Found CUDA ${CUDA_VERSION}") + set(CUDA_VERSION_MAJOR "${CMAKE_MATCH_1}") + set(CUDA_VERSION_MINOR "${CMAKE_MATCH_2}") + set(CUDA_VERSION_MAJOR_MINOR "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}") + + if (CUDA_VERSION_MAJOR_MINOR VERSION_LESS CUDA_REQUIRED_VERSION) + message(FATAL_ERROR "CUDA v${CUDA_VERSION_MAJOR_MINOR} found, but v${CUDA_REQUIRED_VERSION} is required. Please download and install a more recent version of CUDA from:" + "\n https://developer.nvidia.com/cuda-downloads\n") + endif() + + get_filename_component(CUDA_TOOLKIT_ROOT "${NVCC}" DIRECTORY) + get_filename_component(CUDA_TOOLKIT_ROOT "${CUDA_TOOLKIT_ROOT}" DIRECTORY) + set(${vfc_OUT_CUDA_TOOLKIT_ROOT} "${CUDA_TOOLKIT_ROOT}" PARENT_SCOPE) + if(DEFINED vfc_OUT_CUDA_VERSION) + set(${vfc_OUT_CUDA_VERSION} "${CUDA_VERSION_MAJOR_MINOR}" PARENT_SCOPE) + endif() +endfunction() diff --git a/externals/vcpkg/ports/cudnn/FindCUDNN.cmake b/externals/vcpkg/ports/cudnn/FindCUDNN.cmake new file mode 100755 index 000000000..c90f3a791 --- /dev/null +++ b/externals/vcpkg/ports/cudnn/FindCUDNN.cmake @@ -0,0 +1,103 @@ +# Distributed under the OSI-approved BSD 3-Clause License. + +#.rst: +# FindCUDNN +# -------- +# +# Result Variables +# ^^^^^^^^^^^^^^^^ +# +# This module will set the following variables in your project:: +# +# ``CUDNN_FOUND`` +# True if CUDNN found on the local system +# +# ``CUDNN_INCLUDE_DIRS`` +# Location of CUDNN header files. +# +# ``CUDNN_LIBRARIES`` +# The CUDNN libraries. +# +# ``CuDNN::CuDNN`` +# The CUDNN target +# + +include(FindPackageHandleStandardArgs) + +find_path(CUDNN_INCLUDE_DIR NAMES cudnn.h cudnn_v8.h cudnn_v7.h + HINTS $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/include + PATH_SUFFIXES cuda/include include) +find_library(CUDNN_LIBRARY NAMES cudnn cudnn8 cudnn7 + HINTS $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/lib/x86_64-linux-gnu/ /usr/ + PATH_SUFFIXES lib lib64 cuda/lib cuda/lib64 lib/x64 cuda/lib/x64) +if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn.h") + file(READ ${CUDNN_INCLUDE_DIR}/cudnn.h CUDNN_HEADER_CONTENTS) +elseif(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn_v8.h") + file(READ ${CUDNN_INCLUDE_DIR}/cudnn_v8.h CUDNN_HEADER_CONTENTS) +elseif(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn_v7.h") + file(READ ${CUDNN_INCLUDE_DIR}/cudnn_v7.h CUDNN_HEADER_CONTENTS) +endif() +if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn_version.h") + file(READ "${CUDNN_INCLUDE_DIR}/cudnn_version.h" CUDNN_VERSION_H_CONTENTS) + string(APPEND CUDNN_HEADER_CONTENTS "${CUDNN_VERSION_H_CONTENTS}") + unset(CUDNN_VERSION_H_CONTENTS) +elseif(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn_version_v8.h") + file(READ "${CUDNN_INCLUDE_DIR}/cudnn_version_v8.h" CUDNN_VERSION_H_CONTENTS) + string(APPEND CUDNN_HEADER_CONTENTS "${CUDNN_VERSION_H_CONTENTS}") + unset(CUDNN_VERSION_H_CONTENTS) +elseif(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn_version_v7.h") + file(READ "${CUDNN_INCLUDE_DIR}/cudnn_version_v7.h" CUDNN_VERSION_H_CONTENTS) + string(APPEND CUDNN_HEADER_CONTENTS "${CUDNN_VERSION_H_CONTENTS}") + unset(CUDNN_VERSION_H_CONTENTS) +endif() +if(CUDNN_HEADER_CONTENTS) + string(REGEX MATCH "define CUDNN_MAJOR * +([0-9]+)" + _CUDNN_VERSION_MAJOR "${CUDNN_HEADER_CONTENTS}") + string(REGEX REPLACE "define CUDNN_MAJOR * +([0-9]+)" "\\1" + _CUDNN_VERSION_MAJOR "${_CUDNN_VERSION_MAJOR}") + string(REGEX MATCH "define CUDNN_MINOR * +([0-9]+)" + _CUDNN_VERSION_MINOR "${CUDNN_HEADER_CONTENTS}") + string(REGEX REPLACE "define CUDNN_MINOR * +([0-9]+)" "\\1" + _CUDNN_VERSION_MINOR "${_CUDNN_VERSION_MINOR}") + string(REGEX MATCH "define CUDNN_PATCHLEVEL * +([0-9]+)" + _CUDNN_VERSION_PATCH "${CUDNN_HEADER_CONTENTS}") + string(REGEX REPLACE "define CUDNN_PATCHLEVEL * +([0-9]+)" "\\1" + _CUDNN_VERSION_PATCH "${_CUDNN_VERSION_PATCH}") + if(NOT _CUDNN_VERSION_MAJOR) + set(_CUDNN_VERSION "?") + else() + set(_CUDNN_VERSION "${_CUDNN_VERSION_MAJOR}.${_CUDNN_VERSION_MINOR}.${_CUDNN_VERSION_PATCH}") + endif() +endif() + +set(CUDNN_INCLUDE_DIRS ${CUDNN_INCLUDE_DIR}) +set(CUDNN_LIBRARIES ${CUDNN_LIBRARY}) +mark_as_advanced(CUDNN_LIBRARY CUDNN_INCLUDE_DIR) + +find_package_handle_standard_args(CUDNN + REQUIRED_VARS CUDNN_INCLUDE_DIR CUDNN_LIBRARY + VERSION_VAR CUDNN_VERSION +) + +if(WIN32) + set(CUDNN_DLL_DIR ${CUDNN_INCLUDE_DIR}) + list(TRANSFORM CUDNN_DLL_DIR APPEND "/../bin") + find_file(CUDNN_LIBRARY_DLL NAMES cudnn64_${CUDNN_VERSION_MAJOR}.dll PATHS ${CUDNN_DLL_DIR}) +endif() + +if( CUDNN_FOUND AND NOT TARGET CuDNN::CuDNN ) + if( EXISTS "${CUDNN_LIBRARY_DLL}" ) + add_library( CuDNN::CuDNN SHARED IMPORTED ) + set_target_properties( CuDNN::CuDNN PROPERTIES + IMPORTED_LOCATION "${CUDNN_LIBRARY_DLL}" + IMPORTED_IMPLIB "${CUDNN_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${CUDNN_INCLUDE_DIR}" + IMPORTED_LINK_INTERFACE_LANGUAGES "C" ) + else() + add_library( CuDNN::CuDNN UNKNOWN IMPORTED ) + set_target_properties( CuDNN::CuDNN PROPERTIES + IMPORTED_LOCATION "${CUDNN_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${CUDNN_INCLUDE_DIR}" + IMPORTED_LINK_INTERFACE_LANGUAGES "C" ) + endif() +endif() diff --git a/externals/vcpkg/ports/cudnn/portfile.cmake b/externals/vcpkg/ports/cudnn/portfile.cmake new file mode 100755 index 000000000..594c74fed --- /dev/null +++ b/externals/vcpkg/ports/cudnn/portfile.cmake @@ -0,0 +1,76 @@ +if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_OSX) + message(FATAL_ERROR "This port is only for Windows Desktop or Linux") +endif() + +if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + message(FATAL_ERROR "This port is only for x64 architectures") +endif() + +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) + +set(MINIMUM_CUDNN_VERSION "7.6.5") + +include(${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake) +vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT OUT_CUDA_VERSION CUDA_VERSION) + +# Try to find CUDNN if it exists; only download if it doesn't exist +find_path(CUDNN_INCLUDE_DIR NAMES cudnn.h cudnn_v8.h cudnn_v7.h + HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/include + PATH_SUFFIXES cuda/include include) +message(STATUS "CUDNN_INCLUDE_DIR: ${CUDNN_INCLUDE_DIR}") +find_library(CUDNN_LIBRARY NAMES cudnn cudnn8 cudnn7 + HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/lib/x86_64-linux-gnu/ /usr/ + PATH_SUFFIXES lib lib64 cuda/lib cuda/lib64 lib/x64 cuda/lib/x64) +message(STATUS "CUDNN_LIBRARY: ${CUDNN_LIBRARY}") +if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn.h") + file(READ ${CUDNN_INCLUDE_DIR}/cudnn.h CUDNN_HEADER_CONTENTS) +elseif(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn_v8.h") + file(READ ${CUDNN_INCLUDE_DIR}/cudnn_v8.h CUDNN_HEADER_CONTENTS) +elseif(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn_v7.h") + file(READ ${CUDNN_INCLUDE_DIR}/cudnn_v7.h CUDNN_HEADER_CONTENTS) +endif() +if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn_version.h") + file(READ "${CUDNN_INCLUDE_DIR}/cudnn_version.h" CUDNN_VERSION_H_CONTENTS) + string(APPEND CUDNN_HEADER_CONTENTS "${CUDNN_VERSION_H_CONTENTS}") + unset(CUDNN_VERSION_H_CONTENTS) +elseif(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn_version_v8.h") + file(READ "${CUDNN_INCLUDE_DIR}/cudnn_version_v8.h" CUDNN_VERSION_H_CONTENTS) + string(APPEND CUDNN_HEADER_CONTENTS "${CUDNN_VERSION_H_CONTENTS}") + unset(CUDNN_VERSION_H_CONTENTS) +elseif(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn_version_v7.h") + file(READ "${CUDNN_INCLUDE_DIR}/cudnn_version_v7.h" CUDNN_VERSION_H_CONTENTS) + string(APPEND CUDNN_HEADER_CONTENTS "${CUDNN_VERSION_H_CONTENTS}") + unset(CUDNN_VERSION_H_CONTENTS) +endif() +if(CUDNN_HEADER_CONTENTS) + string(REGEX MATCH "define CUDNN_MAJOR * +([0-9]+)" + _CUDNN_VERSION_MAJOR "${CUDNN_HEADER_CONTENTS}") + string(REGEX REPLACE "define CUDNN_MAJOR * +([0-9]+)" "\\1" + _CUDNN_VERSION_MAJOR "${_CUDNN_VERSION_MAJOR}") + string(REGEX MATCH "define CUDNN_MINOR * +([0-9]+)" + _CUDNN_VERSION_MINOR "${CUDNN_HEADER_CONTENTS}") + string(REGEX REPLACE "define CUDNN_MINOR * +([0-9]+)" "\\1" + _CUDNN_VERSION_MINOR "${_CUDNN_VERSION_MINOR}") + string(REGEX MATCH "define CUDNN_PATCHLEVEL * +([0-9]+)" + _CUDNN_VERSION_PATCH "${CUDNN_HEADER_CONTENTS}") + string(REGEX REPLACE "define CUDNN_PATCHLEVEL * +([0-9]+)" "\\1" + _CUDNN_VERSION_PATCH "${_CUDNN_VERSION_PATCH}") + if(NOT _CUDNN_VERSION_MAJOR) + set(_CUDNN_VERSION "?") + else() + set(_CUDNN_VERSION "${_CUDNN_VERSION_MAJOR}.${_CUDNN_VERSION_MINOR}.${_CUDNN_VERSION_PATCH}") + endif() +endif() + +if (CUDNN_INCLUDE_DIR AND CUDNN_LIBRARY AND _CUDNN_VERSION VERSION_GREATER_EQUAL MINIMUM_CUDNN_VERSION) + message(STATUS "Found CUDNN ${_CUDNN_VERSION} located on system: (include ${CUDNN_INCLUDE_DIR} lib: ${CUDNN_LIBRARY})") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +elseif(VCPKG_TARGET_IS_WINDOWS) + message(FATAL_ERROR "Please download CUDNN from official sources (such as https://developer.nvidia.com/rdp/cudnn-download ) and extract the zip into your CUDA_TOOLKIT_ROOT (${CUDA_TOOLKIT_ROOT}). (For example: tar.exe -xvf cudnn-11.2-windows-x64-v8.1.1.33.zip --strip 1 --directory \"${CUDA_TOOLKIT_ROOT}\"") +else() + message(FATAL_ERROR "Please install CUDNN using your system package manager (the same way you installed CUDA). For example: apt install libcudnn8-dev.") +endif() + +file(INSTALL "${CURRENT_PORT_DIR}/FindCUDNN.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/externals/vcpkg/ports/cudnn/usage b/externals/vcpkg/ports/cudnn/usage new file mode 100755 index 000000000..f528e0154 --- /dev/null +++ b/externals/vcpkg/ports/cudnn/usage @@ -0,0 +1,10 @@ +The package cudnn provides CMake variables: + + find_package(CUDNN REQUIRED) + target_link_libraries(main PRIVATE ${CUDNN_LIBRARIES}) + target_include_directories(main PRIVATE ${CUDNN_INCLUDE_DIRS}) + +Or the following CMake target: + + find_package(CUDNN REQUIRED) + target_link_libraries(main PRIVATE CuDNN::CuDNN) diff --git a/externals/vcpkg/ports/cudnn/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/cudnn/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..5a69edec5 --- /dev/null +++ b/externals/vcpkg/ports/cudnn/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,6 @@ +set(CUDNN_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) + +_find_package(${ARGS}) + +set(CMAKE_MODULE_PATH ${CUDNN_PREV_MODULE_PATH}) diff --git a/externals/vcpkg/ports/cudnn/vcpkg.json b/externals/vcpkg/ports/cudnn/vcpkg.json new file mode 100755 index 000000000..ffb97ee17 --- /dev/null +++ b/externals/vcpkg/ports/cudnn/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "cudnn", + "version": "7.6.5", + "port-version": 6, + "description": "NVIDIA's cuDNN deep neural network acceleration library.", + "homepage": "https://developer.nvidia.com/cudnn", + "license": null, + "supports": "(windows & x64 & !uwp) | (linux & x64) | (linux & arm64)", + "dependencies": [ + "cuda" + ] +} diff --git a/externals/vcpkg/ports/cunit/CMakeLists.txt b/externals/vcpkg/ports/cunit/CMakeLists.txt new file mode 100755 index 000000000..b796355aa --- /dev/null +++ b/externals/vcpkg/ports/cunit/CMakeLists.txt @@ -0,0 +1,61 @@ +cmake_minimum_required (VERSION 3.8.0) +project (libcunit C) + +set(HEADERS_DIR "${PROJECT_SOURCE_DIR}/CUnit/Headers") +set(SOURCES_DIR "${PROJECT_SOURCE_DIR}/CUnit/Sources") +set(EXAMPLES_DIR "${PROJECT_SOURCE_DIR}/Examples") + +if(MSVC) + add_compile_options(/W3 /wd4005 /wd4996 -D_CRT_SECURE_NO_WARNINGS) +endif() + +configure_file( + "${HEADERS_DIR}/CUnit.h.in" + "${PROJECT_BINARY_DIR}/CUnit.h" +) + +file(READ "${PROJECT_BINARY_DIR}/CUnit.h" CUNIT_H) +if (BUILD_SHARED_LIBS) + string(REPLACE "ifdef CU_DLL" "if 1" CUNIT_H "${CUNIT_H}") +else() + string(REPLACE "ifdef CU_DLL" "if 0" CUNIT_H "${CUNIT_H}") +endif() +file(WRITE "${PROJECT_BINARY_DIR}/CUnit.h" "${CUNIT_H}") + +include_directories("${PROJECT_BINARY_DIR}") +include_directories(${HEADERS_DIR}) + +add_library(libcunit + "${SOURCES_DIR}/Automated/Automated.c" + "${SOURCES_DIR}/Basic/Basic.c" + "${SOURCES_DIR}/Console/Console.c" + "${SOURCES_DIR}/Framework/CUError.c" + "${SOURCES_DIR}/Framework/MyMem.c" + "${SOURCES_DIR}/Framework/TestDB.c" + "${SOURCES_DIR}/Framework/TestRun.c" + "${SOURCES_DIR}/Framework/Util.c" +) +target_compile_definitions(libcunit PRIVATE -DCU_BUILD_DLL) + +if(BUILD_EXAMPLES) + include_directories(${EXAMPLES_DIR}) + add_executable(AutomatedTest ${EXAMPLES_DIR}/AutomatedTest/AutomatedTest.c "${EXAMPLES_DIR}/ExampleTests.c") + add_executable(BasicTest ${EXAMPLES_DIR}/BasicTest/BasicTest.c "${EXAMPLES_DIR}/ExampleTests.c") + add_executable(ConsoleTest ${EXAMPLES_DIR}/ConsoleTest/ConsoleTest.c "${EXAMPLES_DIR}/ExampleTests.c") + + target_link_libraries(AutomatedTest libcunit) + target_link_libraries(BasicTest libcunit) + target_link_libraries(ConsoleTest libcunit) +endif() + +install( + TARGETS libcunit + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(DIRECTORY "${HEADERS_DIR}/" DESTINATION include/cunit FILES_MATCHING PATTERN "*.h") + install(FILES "${PROJECT_BINARY_DIR}/CUnit.h" DESTINATION include/cunit) +endif() diff --git a/externals/vcpkg/ports/cunit/portfile.cmake b/externals/vcpkg/ports/cunit/portfile.cmake new file mode 100755 index 000000000..88b9be6b5 --- /dev/null +++ b/externals/vcpkg/ports/cunit/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO cunit/CUnit + REF 2.1-3 + FILENAME "CUnit-2.1-3.tar.bz2" + SHA512 547b417109332446dfab8fda17bf4ccd2da841dc93f824dc90a20635bcf1fb80fb2176500d8a0906940f3f3d3e2f77b2d70a71090c9ab84ad9af43f3582bc487 +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/cunit/vcpkg.json b/externals/vcpkg/ports/cunit/vcpkg.json new file mode 100755 index 000000000..c3b2d3032 --- /dev/null +++ b/externals/vcpkg/ports/cunit/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cunit", + "version-string": "2.1.3", + "port-version": 7, + "description": "CUnit is a lightweight system for writing, administering, and running unit tests in C. It provides C programmers a basic testing functionality with a flexible variety of user interfaces", + "homepage": "https://sourceforge.net/projects/cunit/" +} diff --git a/externals/vcpkg/ports/curl/0002_fix_uwp.patch b/externals/vcpkg/ports/curl/0002_fix_uwp.patch new file mode 100755 index 000000000..e31cb9fbf --- /dev/null +++ b/externals/vcpkg/ports/curl/0002_fix_uwp.patch @@ -0,0 +1,15 @@ +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 62b7b33..8a4bd71 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -115,6 +115,10 @@ if(CURL_HAS_LTO) + INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO TRUE) + endif() + ++if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") ++ set_property(TARGET ${LIB_NAME} APPEND PROPERTY COMPILE_DEFINITIONS "_WINSOCK_DEPRECATED_NO_WARNINGS") ++endif() ++ + if(WIN32) + if(BUILD_SHARED_LIBS) + set_property(TARGET ${LIB_NAME} APPEND PROPERTY COMPILE_DEFINITIONS "_USRDLL") diff --git a/externals/vcpkg/ports/curl/0005_remove_imp_suffix.patch b/externals/vcpkg/ports/curl/0005_remove_imp_suffix.patch new file mode 100755 index 000000000..e52da2585 --- /dev/null +++ b/externals/vcpkg/ports/curl/0005_remove_imp_suffix.patch @@ -0,0 +1,12 @@ +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 1d71e14..62b7b33 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -125,7 +125,6 @@ if(WIN32) + if(MSVC) + # Add "_imp" as a suffix before the extension to avoid conflicting with + # the statically linked "libcurl.lib" +- set_target_properties(${LIB_NAME} PROPERTIES IMPORT_SUFFIX "_imp.lib") + endif() + endif() + endif() diff --git a/externals/vcpkg/ports/curl/0012-fix-dependency-idn2.patch b/externals/vcpkg/ports/curl/0012-fix-dependency-idn2.patch new file mode 100755 index 000000000..e1d59bf5d --- /dev/null +++ b/externals/vcpkg/ports/curl/0012-fix-dependency-idn2.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9f6de81..6702845 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -632,6 +632,9 @@ endif() + option(USE_LIBIDN2 "Use libidn2 for IDN support" ON) + set(HAVE_LIBIDN2 OFF) + if(USE_LIBIDN2) ++ set(HAVE_LIBIDN2 TRUE) ++ list(INSERT CURL_LIBS 0 ${LIBIDN2_LINK_LIBRARIES}) ++elseif(0) + check_library_exists_concat("idn2" idn2_lookup_ul HAVE_LIBIDN2) + endif() + diff --git a/externals/vcpkg/ports/curl/0020-fix-pc-file.patch b/externals/vcpkg/ports/curl/0020-fix-pc-file.patch new file mode 100755 index 000000000..21eab0933 --- /dev/null +++ b/externals/vcpkg/ports/curl/0020-fix-pc-file.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8b2e428..ea430f4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1505,7 +1505,9 @@ set(includedir "\${prefix}/include") + set(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS}") + set(LIBCURL_LIBS "") + set(libdir "${CMAKE_INSTALL_PREFIX}/lib") +-foreach(_lib ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${CURL_LIBS}) ++set(CURL_LIBS_FLAT "") ++vcpkg_curl_flatten(CURL_LIBS CURL_LIBS_FLAT) ++foreach(_lib ${CURL_LIBS_FLAT}) + if(TARGET "${_lib}") + set(_libname "${_lib}") + get_target_property(_imported "${_libname}" IMPORTED) diff --git a/externals/vcpkg/ports/curl/0021-normaliz.patch b/externals/vcpkg/ports/curl/0021-normaliz.patch new file mode 100755 index 000000000..ca331cf9a --- /dev/null +++ b/externals/vcpkg/ports/curl/0021-normaliz.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6d209be..9f6de81 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -638,7 +638,7 @@ endif() + if(WIN32) + option(USE_WIN32_IDN "Use WinIDN for IDN support" OFF) + if(USE_WIN32_IDN) +- list(APPEND CURL_LIBS "Normaliz") ++ list(APPEND CURL_LIBS "normaliz") + set(WANT_IDN_PROTOTYPES ON) + endif() + endif() diff --git a/externals/vcpkg/ports/curl/0022-deduplicate-libs.patch b/externals/vcpkg/ports/curl/0022-deduplicate-libs.patch new file mode 100755 index 000000000..16cc0498a --- /dev/null +++ b/externals/vcpkg/ports/curl/0022-deduplicate-libs.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 09d82f1..f0d99e6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1507,6 +1507,7 @@ else() + set(ENABLE_SHARED "no") + set(ENABLE_STATIC "yes") + set(LIBCURL_NO_SHARED "${LIBCURL_LIBS}") ++ set(LIBCURL_LIBS "") + endif() + # "a" (Linux) or "lib" (Windows) + string(REPLACE "." "" libext "${CMAKE_STATIC_LIBRARY_SUFFIX}") diff --git a/externals/vcpkg/ports/curl/cmake-project-include.cmake b/externals/vcpkg/ports/curl/cmake-project-include.cmake new file mode 100755 index 000000000..27254864c --- /dev/null +++ b/externals/vcpkg/ports/curl/cmake-project-include.cmake @@ -0,0 +1,82 @@ +# Process the libs and targets in the variable named by `input` +# into a flat list of libs in the variable named by `output`. +# Simplify -framework elements. +# Use -l where possible. +# Avoid duplicates. +function(vcpkg_curl_flatten input output) + set(output_libs "${${output}}") + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + string(REGEX REPLACE ";optimized;[^;]*|;debug" "" input_libs "VCPKG;${${input}}") + else() + string(REGEX REPLACE ";debug;[^;]*|;optimized" "" input_libs "VCPKG;${${input}}") + endif() + list(REMOVE_AT input_libs 0) + while(input_libs) + list(POP_BACK input_libs lib) + if(TARGET "${lib}") + set(import_lib "") + set(import_location "") + get_target_property(type "${lib}" TYPE) + if(NOT type STREQUAL "INTERFACE_LIBRARY") + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + get_target_property(link_libs "${lib}" IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG) + get_target_property(import_lib "${lib}" IMPORTED_IMPLIB_DEBUG) + get_target_property(import_location "${lib}" IMPORTED_LOCATION_DEBUG) + else() + get_target_property(link_libs "${lib}" IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE) + get_target_property(import_lib "${lib}" IMPORTED_IMPLIB_RELEASE) + get_target_property(import_location "${lib}" IMPORTED_LOCATION_RELEASE) + endif() + if(link_libs) + vcpkg_curl_flatten(link_libs output_libs) + endif() + get_target_property(link_libs "${lib}" IMPORTED_LINK_INTERFACE_LIBRARIES) + if(link_libs) + vcpkg_curl_flatten(link_libs output_libs) + endif() + if(NOT import_lib) + get_target_property(import_lib "${lib}" IMPORTED_IMPLIB) + endif() + if(NOT import_location) + get_target_property(import_location "${lib}" IMPORTED_LOCATION) + endif() + endif() + get_target_property(link_libs "${lib}" INTERFACE_LINK_LIBRARIES) + if(link_libs) + vcpkg_curl_flatten(link_libs output_libs) + endif() + if(import_lib) + set(lib "${import_lib}") + elseif(import_location) + set(lib "${import_location}") + endif() + endif() + if(lib MATCHES "^(.*)/([^/]*)[.]framework$") + if(CMAKE_MATCH_1 IN_LIST CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES) + set(lib "-framework ${CMAKE_MATCH_2}") + else() + set(lib "-framework ${lib}") + endif() + elseif(WIN32 AND lib MATCHES ".*/${CMAKE_IMPORT_LIBRARY_PREFIX}([^/]*)${CMAKE_IMPORT_LIBRARY_SUFFIX}") + set(lib -l${CMAKE_MATCH_1}) + elseif(lib MATCHES ".*/${CMAKE_STATIC_LIBRARY_PREFIX}([^/]*)${CMAKE_STATIC_LIBRARY_SUFFIX}") + set(lib -l${CMAKE_MATCH_1}) + endif() + if(NOT "${lib}" IN_LIST output_libs) + list(PREPEND output_libs "${lib}") + endif() + endwhile() + set("${output}" "${output_libs}" PARENT_SCOPE) +endfunction() + +if(CURL_USE_LIBSSH2) + find_package(Libssh2 CONFIG REQUIRED) + set(LIBSSH2_FOUND TRUE) + get_target_property(LIBSSH2_INCLUDE_DIR Libssh2::libssh2 INTERFACE_INCLUDE_DIRECTORIES) + set(LIBSSH2_LIBRARY Libssh2::libssh2) +endif() + +if(USE_LIBIDN2) + find_package(PkgConfig REQUIRED) + pkg_check_modules(LIBIDN2 REQUIRED libidn2) +endif() diff --git a/externals/vcpkg/ports/curl/export-components.patch b/externals/vcpkg/ports/curl/export-components.patch new file mode 100755 index 000000000..1a727e5de --- /dev/null +++ b/externals/vcpkg/ports/curl/export-components.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 874a237..3974956 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1617,8 +1617,17 @@ if(CURL_ENABLE_EXPORT_TARGET) + ) + endif() + ++set(components_file "${CMAKE_CURRENT_BINARY_DIR}/CURLConfigComponents.cmake") ++file(CONFIGURE OUTPUT "${components_file}" CONTENT [[ ++foreach(z_vcpkg_curl_component IN ITEMS @SUPPORT_FEATURES@ @SUPPORT_PROTOCOLS@) ++ if(z_vcpkg_curl_component MATCHES "^[-_a-zA-Z0-9]*$") ++ set(CURL_${z_vcpkg_curl_component}_FOUND TRUE) ++ endif() ++endforeach() ++]] @ONLY) ++ + install( +- FILES ${version_config} ${project_config} ++ FILES ${version_config} ${project_config} ${components_file} + DESTINATION ${CURL_INSTALL_CMAKE_DIR} + ) + diff --git a/externals/vcpkg/ports/curl/mbedtls-ws2_32.patch b/externals/vcpkg/ports/curl/mbedtls-ws2_32.patch new file mode 100755 index 000000000..37e4f18c9 --- /dev/null +++ b/externals/vcpkg/ports/curl/mbedtls-ws2_32.patch @@ -0,0 +1,14 @@ +diff --git a/CMake/FindMbedTLS.cmake b/CMake/FindMbedTLS.cmake +index 7bdb197..c8c5a73 100644 +--- a/CMake/FindMbedTLS.cmake ++++ b/CMake/FindMbedTLS.cmake +@@ -26,6 +26,9 @@ find_library(MBEDX509_LIBRARY mbedx509) + find_library(MBEDCRYPTO_LIBRARY mbedcrypto) + + set(MBEDTLS_LIBRARIES "${MBEDTLS_LIBRARY}" "${MBEDX509_LIBRARY}" "${MBEDCRYPTO_LIBRARY}") ++if(WIN32) ++ list(APPEND MBEDTLS_LIBRARIES ws2_32) ++endif() + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(MbedTLS DEFAULT_MSG diff --git a/externals/vcpkg/ports/curl/portfile.cmake b/externals/vcpkg/ports/curl/portfile.cmake new file mode 100755 index 000000000..98c30a528 --- /dev/null +++ b/externals/vcpkg/ports/curl/portfile.cmake @@ -0,0 +1,148 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO curl/curl + REF curl-7_83_1 + SHA512 f4ede3c829aaa1142358d956cba4b33f06d3f0319c9f1cd65b63413de60a8690165e10fcb876fc413a20fcfa53bba2a064bb4b8c3070dbf474c2f2288eeab019 + HEAD_REF master + PATCHES + 0002_fix_uwp.patch + 0005_remove_imp_suffix.patch + 0012-fix-dependency-idn2.patch + 0020-fix-pc-file.patch + 0021-normaliz.patch # for mingw on case-sensitive file system + 0022-deduplicate-libs.patch + mbedtls-ws2_32.patch + export-components.patch + wolfssl-ntlm.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB) + +# schannel will enable sspi, but sspi do not support uwp +foreach(feature IN ITEMS "schannel" "sspi" "tool" "winldap") + if(feature IN_LIST FEATURES AND VCPKG_TARGET_IS_UWP) + message(FATAL_ERROR "Feature ${feature} is not supported on UWP.") + endif() +endforeach() + +if("sectransp" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_OSX) + message(FATAL_ERROR "sectransp is not supported on non-Apple platforms") +endif() + +foreach(feature IN ITEMS "winldap" "winidn") + if(feature IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(FATAL_ERROR "Feature ${feature} is not supported on non-Windows platforms.") + endif() +endforeach() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + # Support HTTP2 TLS Download https://curl.haxx.se/ca/cacert.pem rename to curl-ca-bundle.crt, copy it to libcurl.dll location. + http2 USE_NGHTTP2 + wolfssl CURL_USE_WOLFSSL + openssl CURL_USE_OPENSSL + mbedtls CURL_USE_MBEDTLS + ssh CURL_USE_LIBSSH2 + tool BUILD_CURL_EXE + c-ares ENABLE_ARES + sspi CURL_WINDOWS_SSPI + brotli CURL_BROTLI + schannel CURL_USE_SCHANNEL + sectransp CURL_USE_SECTRANSP + idn2 USE_LIBIDN2 + winidn USE_WIN32_IDN + winldap USE_WIN32_LDAP + INVERTED_FEATURES + non-http HTTP_ONLY + winldap CURL_DISABLE_LDAP # Only WinLDAP support ATM +) + +set(OPTIONS "") +set(OPTIONS_RELEASE "") +set(OPTIONS_DEBUG "") +if("idn2" IN_LIST FEATURES) + vcpkg_find_acquire_program(PKGCONFIG) + list(APPEND OPTIONS "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}") +endif() + +if("sectransp" IN_LIST FEATURES) + list(APPEND OPTIONS -DCURL_CA_PATH=none) +endif() + +# UWP targets +if(VCPKG_TARGET_IS_UWP) + list(APPEND OPTIONS + -DCURL_DISABLE_TELNET=ON + -DENABLE_IPV6=OFF + -DENABLE_UNIX_SOCKETS=OFF + ) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" + ${FEATURE_OPTIONS} + ${OPTIONS} + -DBUILD_TESTING=OFF + -DENABLE_MANUAL=OFF + -DCURL_STATICLIB=${CURL_STATICLIB} + -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON + -DENABLE_DEBUG=ON + -DCURL_CA_FALLBACK=ON + OPTIONS_RELEASE + ${OPTIONS_RELEASE} + OPTIONS_DEBUG + ${OPTIONS_DEBUG} +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +if ("tool" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES curl AUTO_CLEAN) +endif() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CURL) + +vcpkg_fixup_pkgconfig() +set(namespec "curl") +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(namespec "libcurl") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libcurl.pc" " -lcurl" " -l${namespec}") +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libcurl.pc" " -lcurl" " -l${namespec}-d") +endif() + +#Fix install path +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/curl-config" "${CURRENT_PACKAGES_DIR}" "\${prefix}") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/curl-config" "${CURRENT_INSTALLED_DIR}" "\${prefix}") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/curl-config" "\nprefix=\${prefix}" [=[prefix=$(CDPATH= cd -- "$(dirname -- "$0")"/../../.. && pwd -P)]=]) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/curl-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/curl-config") +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/curl-config") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curl-config" "${CURRENT_PACKAGES_DIR}" "\${prefix}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curl-config" "${CURRENT_INSTALLED_DIR}" "\${prefix}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curl-config" "\nprefix=\${prefix}/debug" [=[prefix=$(CDPATH= cd -- "$(dirname -- "$0")"/../../../.. && pwd -P)]=]) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curl-config" "-lcurl" "-l${namespec}-d") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curl-config" "curl." "curl-d.") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/curl-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/curl-config") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/curl/curl.h" + "#ifdef CURL_STATICLIB" + "#if 1" + ) +endif() + +file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/curl/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/curl/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..526cb515c --- /dev/null +++ b/externals/vcpkg/ports/curl/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,51 @@ +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0054 NEW) +cmake_policy(SET CMP0057 NEW) + +if(NOT CMAKE_VERSION VERSION_LESS 3.14 AND COMPONENTS IN_LIST ARGS) + include("${CMAKE_CURRENT_LIST_DIR}/CURLConfigComponents.cmake") +endif() + +list(REMOVE_ITEM ARGS "NO_MODULE" "CONFIG" "MODULE") +_find_package(${ARGS} CONFIG) + +if(CURL_FOUND) + get_target_property(_curl_include_dirs CURL::libcurl INTERFACE_INCLUDE_DIRECTORIES) + get_target_property(_curl_link_libraries CURL::libcurl INTERFACE_LINK_LIBRARIES) + + if (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + get_target_property(_curl_location_debug CURL::libcurl IMPORTED_IMPLIB_DEBUG) + get_target_property(_curl_location_release CURL::libcurl IMPORTED_IMPLIB_RELEASE) + endif() + + if(NOT _curl_location_debug AND NOT _curl_location_release) + get_target_property(_curl_location_debug CURL::libcurl IMPORTED_LOCATION_DEBUG) + get_target_property(_curl_location_release CURL::libcurl IMPORTED_LOCATION_RELEASE) + endif() + + if(NOT _curl_link_libraries) + set(_curl_link_libraries "") + endif() + + if("Libssh2::libssh2" IN_LIST _curl_link_libraries) + find_package(Libssh2 CONFIG QUIET) + endif() + + set(CURL_INCLUDE_DIRS "${_curl_include_dirs}") + set(CURL_LIBRARY_DEBUG "${_curl_location_debug}") + set(CURL_LIBRARY_RELEASE "${_curl_location_release}") + + #For builds which rely on CURL_LIBRAR(Y/IES) + include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) + select_library_configurations(CURL) + + set(CURL_LIBRARIES ${CURL_LIBRARY} ${_curl_link_libraries}) + set(CURL_VERSION_STRING "${CURL_VERSION}") + + unset(_curl_include_dirs) + unset(_curl_link_libraries) + unset(_curl_location_debug) + unset(_curl_location_release) +endif() +cmake_policy(POP) diff --git a/externals/vcpkg/ports/curl/vcpkg.json b/externals/vcpkg/ports/curl/vcpkg.json new file mode 100755 index 000000000..0352d403f --- /dev/null +++ b/externals/vcpkg/ports/curl/vcpkg.json @@ -0,0 +1,195 @@ +{ + "name": "curl", + "version": "7.83.1", + "port-version": 2, + "description": "A library for transferring data with URLs", + "homepage": "https://curl.se/", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "default-features": [ + "non-http", + "ssl" + ], + "features": { + "brotli": { + "description": "brotli support (brotli)", + "dependencies": [ + "brotli" + ] + }, + "c-ares": { + "description": "c-ares support", + "dependencies": [ + "c-ares" + ] + }, + "http2": { + "description": "HTTP2 support", + "dependencies": [ + { + "name": "curl", + "default-features": false, + "features": [ + "ssl" + ] + }, + "nghttp2" + ] + }, + "idn": { + "description": "Default IDN support", + "dependencies": [ + { + "name": "curl", + "default-features": false, + "features": [ + "winidn" + ], + "platform": "windows" + }, + { + "name": "curl", + "default-features": false, + "features": [ + "idn2" + ], + "platform": "!windows" + } + ] + }, + "idn2": { + "description": "idn2 support (libidn2)", + "dependencies": [ + "libidn2" + ] + }, + "mbedtls": { + "description": "SSL support (mbedTLS)", + "dependencies": [ + "mbedtls" + ] + }, + "non-http": { + "description": "Enables protocols beyond HTTP/HTTPS/HTTP2" + }, + "openssl": { + "description": "SSL support (OpenSSL)", + "dependencies": [ + "openssl" + ] + }, + "schannel": { + "description": "SSL support (Secure Channel)", + "dependencies": [ + { + "name": "curl", + "default-features": false, + "features": [ + "sspi" + ] + } + ] + }, + "sectransp": { + "description": "SSL support (sectransp)" + }, + "ssh": { + "description": "SSH support via libssh2", + "dependencies": [ + { + "name": "curl", + "default-features": false, + "features": [ + "non-http" + ] + }, + { + "name": "curl", + "default-features": false, + "features": [ + "openssl" + ] + }, + "libssh2" + ] + }, + "ssl": { + "description": "Default SSL backend", + "dependencies": [ + { + "name": "curl", + "default-features": false, + "features": [ + "sectransp" + ], + "platform": "osx" + }, + { + "name": "curl", + "default-features": false, + "features": [ + "schannel" + ], + "platform": "(windows & !uwp) | mingw" + }, + { + "name": "curl", + "default-features": false, + "features": [ + "openssl" + ], + "platform": "(uwp | !windows) & !osx & !mingw" + } + ] + }, + "sspi": { + "description": "SSPI support" + }, + "tool": { + "description": "Builds curl executable" + }, + "winidn": { + "description": "WinIDN support" + }, + "winldap": { + "description": "LDAP support (WinLDAP). This feature does not include LDAPS support.", + "dependencies": [ + { + "name": "curl", + "default-features": false, + "features": [ + "non-http" + ] + } + ] + }, + "winssl": { + "description": "Legacy name for schannel", + "dependencies": [ + { + "name": "curl", + "default-features": false, + "features": [ + "schannel" + ] + } + ] + }, + "wolfssl": { + "description": "SSL support (wolfSSL)", + "dependencies": [ + "wolfssl" + ] + } + } +} diff --git a/externals/vcpkg/ports/curl/wolfssl-ntlm.patch b/externals/vcpkg/ports/curl/wolfssl-ntlm.patch new file mode 100755 index 000000000..40e2dd67f --- /dev/null +++ b/externals/vcpkg/ports/curl/wolfssl-ntlm.patch @@ -0,0 +1,38 @@ +--- a/lib/curl_ntlm_core.c ++++ b/lib/curl_ntlm_core.c +@@ -60,12 +60,17 @@ + + #ifdef USE_WOLFSSL + #include +-#endif +- ++# include ++# include ++# include ++# include ++#else + # include + # include + # include + # include ++#endif ++ + # if (defined(OPENSSL_VERSION_NUMBER) && \ + (OPENSSL_VERSION_NUMBER < 0x00907001L)) && !defined(USE_WOLFSSL) + # define DES_key_schedule des_key_schedule +diff -ur a/lib/curl_ntlm_core.h b/lib/curl_ntlm_core.h +--- a/lib/curl_ntlm_core.h 2022-05-10 23:11:15.000000000 -0700 ++++ b/lib/curl_ntlm_core.h 2022-05-16 16:48:39.931726300 -0700 +@@ -35,10 +35,10 @@ + #define NTLM_NEEDS_NSS_INIT + #endif + +-#if defined(USE_OPENSSL) || defined(USE_WOLFSSL) + #ifdef USE_WOLFSSL + # include +-#endif ++# include ++#elif defined(USE_OPENSSL) + # include + #endif + diff --git a/externals/vcpkg/ports/curlpp/fix-cmake.patch b/externals/vcpkg/ports/curlpp/fix-cmake.patch new file mode 100755 index 000000000..a7cd79413 --- /dev/null +++ b/externals/vcpkg/ports/curlpp/fix-cmake.patch @@ -0,0 +1,52 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8b183a0..a801ae8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -85,11 +85,12 @@ endif() + + file(GLOB_RECURSE HeaderFileList "${CMAKE_CURRENT_SOURCE_DIR}/include/*") + file(GLOB_RECURSE SourceFileList "${CMAKE_CURRENT_SOURCE_DIR}/src/*") ++if(BUILD_SHARED_LIBS) + add_library(${PROJECT_NAME} SHARED ${HeaderFileList} ${SourceFileList}) + target_link_libraries(${PROJECT_NAME} ${CURL_LIBRARIES} ${CONAN_LIBS}) + set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION 1 VERSION 1.0.0) +- +-add_library(${PROJECT_NAME}_static STATIC ${HeaderFileList} ${SourceFileList}) ++else() ++add_library(${PROJECT_NAME} STATIC ${HeaderFileList} ${SourceFileList}) + + # Make sure that on unix-platforms shared and static libraries have + # the same root name, but different suffixes. +@@ -97,19 +98,28 @@ add_library(${PROJECT_NAME}_static STATIC ${HeaderFileList} ${SourceFileList}) + # (solution taken from https://cmake.org/Wiki/CMake_FAQ#How_do_I_make_my_shared_and_static_libraries_have_the_same_root_name.2C_but_different_suffixes.3F) + # + # Making shared and static libraries have the same root name, but different suffixes +-SET_TARGET_PROPERTIES(${PROJECT_NAME}_static PROPERTIES OUTPUT_NAME ${PROJECT_NAME}) ++SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME}) + # Now the library target "curlpp_static" will be named "curlpp.lib" with MS tools. + # This conflicts with the "curlpp.lib" import library corresponding to "curlpp.dll", + # so we add a "lib" prefix (which is default on other platforms anyway): +-SET_TARGET_PROPERTIES(${PROJECT_NAME}_static PROPERTIES PREFIX "lib") +-target_link_libraries(${PROJECT_NAME}_static ${CURL_LIBRARIES} ${CONAN_LIBS}) ++SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "lib") ++target_link_libraries(${PROJECT_NAME} CURL::libcurl) ++endif() ++ ++target_include_directories(${PROJECT_NAME} PUBLIC $) + + # install headers + install(DIRECTORY include/utilspp/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/utilspp") + install(DIRECTORY include/curlpp/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/curlpp") + +-install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_static ++install(TARGETS ${PROJECT_NAME} ++ EXPORT ${PROJECT_NAME}-config + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + ++install(EXPORT ${PROJECT_NAME}-config ++ FILE unofficial-${PROJECT_NAME}-config.cmake ++ NAMESPACE unofficial::${PROJECT_NAME}:: ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++) diff --git a/externals/vcpkg/ports/curlpp/fix-findzliberror.patch b/externals/vcpkg/ports/curlpp/fix-findzliberror.patch new file mode 100755 index 000000000..4876d0f25 --- /dev/null +++ b/externals/vcpkg/ports/curlpp/fix-findzliberror.patch @@ -0,0 +1,9 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c42943c..12d402c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,3 +1,4 @@ ++cmake_minimum_required(VERSION 2.8) + project(curlpp) + + diff --git a/externals/vcpkg/ports/curlpp/portfile.cmake b/externals/vcpkg/ports/curlpp/portfile.cmake new file mode 100755 index 000000000..8a2652fc4 --- /dev/null +++ b/externals/vcpkg/ports/curlpp/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jpbarrette/curlpp + REF 8810334c830faa3b38bcd94f5b1ab695a4f05eb9 + SHA512 47eb0738d7cd2d4262c455f9472a21535343bcf08bda6de19771dab9204e068272b41782c87057d50e3781683a29e79d6387577be68d175a7fa890367f15d0d2 + HEAD_REF master + PATCHES + fix-cmake.patch + fix-findzliberror.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT} PACKAGE_NAME unofficial-${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) +endif() + +if(VCPKG_TARGET_IS_WINDOWS AND NOT (VCPKG_LIBRARY_LINKAGE STREQUAL static)) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/curlpp-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/..") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curlpp-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") + endif() +endif() + +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}") +file(INSTALL "${SOURCE_PATH}/doc/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/curlpp/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/curlpp/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..a7f88cd72 --- /dev/null +++ b/externals/vcpkg/ports/curlpp/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,5 @@ +set(FIND_CURLPP_ARGS ${ARGS}) +include(CMakeFindDependencyMacro) +find_dependency(CURL) + +_find_package(${FIND_CURLPP_ARGS}) diff --git a/externals/vcpkg/ports/curlpp/vcpkg.json b/externals/vcpkg/ports/curlpp/vcpkg.json new file mode 100755 index 000000000..00b45a3f3 --- /dev/null +++ b/externals/vcpkg/ports/curlpp/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "curlpp", + "version-date": "2018-06-15", + "port-version": 7, + "description": "C++ wrapper around libcURL", + "dependencies": [ + "curl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/cute-headers/portfile.cmake b/externals/vcpkg/ports/cute-headers/portfile.cmake new file mode 100755 index 000000000..2153db229 --- /dev/null +++ b/externals/vcpkg/ports/cute-headers/portfile.cmake @@ -0,0 +1,30 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO RandyGaul/cute_headers + REF 4f765abf4a59660e72f9f49c444371ba373e834b + SHA512 e898520dc668ce9d1f51c748da1c674f9fa0540bac7a0d10a45fde5ebb0ca6573dc5178ce41199a138e3153343b1ff0c589bc7908a8edcd4a7753d5a1440030b + HEAD_REF master +) + +file(GLOB CUTE_HEADERS_FILES ${SOURCE_PATH}/*.h) +file(COPY ${CUTE_HEADERS_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +file(STRINGS "${SOURCE_PATH}/cute_math2d.h" SOURCE_LINES) +list(REVERSE SOURCE_LINES) + +set(line_no 0) +foreach(line ${SOURCE_LINES}) + math(EXPR line_no "${line_no} + 1") + if(line STREQUAL "/*") + break() + endif() +endforeach() + +list(SUBLIST SOURCE_LINES 0 ${line_no} SOURCE_LINES) +list(REVERSE SOURCE_LINES) +list(JOIN SOURCE_LINES "\n" _contents) + +file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "${_contents}") diff --git a/externals/vcpkg/ports/cute-headers/vcpkg.json b/externals/vcpkg/ports/cute-headers/vcpkg.json new file mode 100755 index 000000000..bd12b94b4 --- /dev/null +++ b/externals/vcpkg/ports/cute-headers/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cute-headers", + "version-string": "2019-09-20", + "port-version": 1, + "description": "Collection of cross-platform one-file C/C++ libraries with no dependencies", + "homepage": "https://github.com/RandyGaul/cute_headers" +} diff --git a/externals/vcpkg/ports/cutelyst2/fix-static-build.patch b/externals/vcpkg/ports/cutelyst2/fix-static-build.patch new file mode 100755 index 000000000..e40cd1dab --- /dev/null +++ b/externals/vcpkg/ports/cutelyst2/fix-static-build.patch @@ -0,0 +1,38 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9a695fd..0667668 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -129,6 +129,33 @@ add_definitions( + -DQT_DISABLE_DEPRECATED_BEFORE=0x050c00 + ) + ++if (BUILD_WIN_STATIC) ++ add_definitions( ++ -DCutelyst2Qt5_EXPORTS ++ -DActionRenderView_EXPORTS ++ -DActionREST_EXPORTS ++ -DActionRoleACL_EXPORTS ++ -DCutelyst2Qt5Authentication_EXPORTS ++ -DCutelyst2Qt5Session_EXPORTS ++ -DCutelyst2Qt5StaticSimple_EXPORTS ++ -DCutelyst2Qt5StaticCompressed_EXPORTS ++ -DCutelyst2Qt5UtilsPagination_EXPORTS ++ -DCutelyst2Qt5StatusMessage_EXPORTS ++ -DCutelyst2Qt5Memcached_EXPORTS ++ -DCutelyst2Qt5MemcachedSessionStore_EXPORTS ++ -DCutelyst2Qt5CSRFProtection_EXPORTS ++ -DCutelyst2Qt5UtilsSql_EXPORTS ++ -DCutelyst2Qt5UtilsValidator_EXPORTS ++ -DCutelyst2Qt5UtilsLangSelect_EXPORTS ++ -DCutelyst2Qt5ViewClearSilver_EXPORTS ++ -DCutelyst2Qt5ViewEmail_EXPORTS ++ -DCutelyst2Qt5ViewGrantlee_EXPORTS ++ -DCutelyst2Qt5ViewJson_EXPORTS ++ -DCutelyst2Qt5Wsgi_EXPORTS ++ -DCutelyst2Qt5UserAgent_EXPORTS ++ ) ++endif() ++ + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) diff --git a/externals/vcpkg/ports/cutelyst2/portfile.cmake b/externals/vcpkg/ports/cutelyst2/portfile.cmake new file mode 100755 index 000000000..10a5d4d34 --- /dev/null +++ b/externals/vcpkg/ports/cutelyst2/portfile.cmake @@ -0,0 +1,53 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cutelyst/cutelyst + REF 526aef6b4c1a48f8e91d59607763fade9157d01f # v2.12.0 + SHA512 0960801ae8d772a93e3f2dcd221f919ff28000076cecd4d1a2ff7b6e62575805738292257e63a48e455f6fc0bc446c90214fc33679ea1deb17b0c31d6f125e2a + HEAD_REF master + PATCHES fix-static-build.patch +) + +set(BUILD_WIN_STATIC OFF) +if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(BUILD_WIN_STATIC ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTS:BOOL=OFF + -DBUILD_WIN_STATIC=${BUILD_WIN_STATIC} +) + +vcpkg_cmake_install() + +# Move CMake config files to the right place +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Cutelyst2Qt5) + +file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/cutelyst2" "${CURRENT_PACKAGES_DIR}/bin/cutelyst2-wsgi" "${CURRENT_PACKAGES_DIR}/bin/cutelyst2.exe" "${CURRENT_PACKAGES_DIR}/bin/cutelyst-wsgi2.exe") +file(GLOB DEBUG_EXES "${CURRENT_PACKAGES_DIR}/debug/bin/cutelyst2" "${CURRENT_PACKAGES_DIR}/debug/bin/cutelyst2-wsgi" "${CURRENT_PACKAGES_DIR}/debug/bin/cutelyst2.exe" "${CURRENT_PACKAGES_DIR}/debug/bin/cutelyst-wsgi2.exe") +if(EXES OR DEBUG_EXES) + file(COPY ${EXES} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/cutelyst2") + file(REMOVE ${EXES} ${DEBUG_EXES}) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/cutelyst2") +endif() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cutelyst2-plugins/ActionREST.dll") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/cutelyst2-plugins" "${CURRENT_PACKAGES_DIR}/bin/cutelyst2-plugins") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/cutelyst2-plugins/ActionREST.dll") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/cutelyst2-plugins" "${CURRENT_PACKAGES_DIR}/debug/bin/cutelyst2-plugins") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/cutelyst2/copyright" COPYONLY) + +vcpkg_copy_pdbs() +if(VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +else() + vcpkg_fixup_pkgconfig() +endif() diff --git a/externals/vcpkg/ports/cutelyst2/vcpkg.json b/externals/vcpkg/ports/cutelyst2/vcpkg.json new file mode 100755 index 000000000..928b6140e --- /dev/null +++ b/externals/vcpkg/ports/cutelyst2/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "cutelyst2", + "version": "2.12.0", + "port-version": 2, + "description": "A C++ Web Framework built on top of Qt, using the simple approach of Catalyst (Perl) framework", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/cwalk/portfile.cmake b/externals/vcpkg/ports/cwalk/portfile.cmake new file mode 100755 index 000000000..a795d1a40 --- /dev/null +++ b/externals/vcpkg/ports/cwalk/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO likle/cwalk + REF v1.2.6 + SHA512 d43f339178367facd2f80944f5491631edab24fa4a92e30fd8f4d9c533ec3a2edbc04105066148be8458b64d0fac9e7d86408ca9601db291b93df222dc875fd4 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENABLE_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cwalk) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/cwalk/vcpkg.json b/externals/vcpkg/ports/cwalk/vcpkg.json new file mode 100755 index 000000000..d3e1cf9c1 --- /dev/null +++ b/externals/vcpkg/ports/cwalk/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "cwalk", + "version": "1.2.6", + "description": "Path library for C/C++. Cross-Platform for Windows, MacOS and Linux. Supports UNIX and Windows path styles on those platforms.", + "homepage": "https://likle.github.io/cwalk/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/cxxopts/portfile.cmake b/externals/vcpkg/ports/cxxopts/portfile.cmake new file mode 100755 index 000000000..51626b190 --- /dev/null +++ b/externals/vcpkg/ports/cxxopts/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jarro2783/cxxopts + REF v3.0.0 + SHA512 239479a3b35ddef6fc380ac9371e1cf7e3aea066f03e1ea538151fa2fff4296838daa976d55e988d8f87f40c0ae027767bcb214754177499413af1081315565c + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCXXOPTS_BUILD_EXAMPLES=OFF + -DCXXOPTS_BUILD_TESTS=OFF + -DCXXOPTS_ENABLE_WARNINGS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cxxopts) + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cxxopts" RENAME copyright) diff --git a/externals/vcpkg/ports/cxxopts/vcpkg.json b/externals/vcpkg/ports/cxxopts/vcpkg.json new file mode 100755 index 000000000..1a5c7506a --- /dev/null +++ b/externals/vcpkg/ports/cxxopts/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "cxxopts", + "version-semver": "3.0.0", + "description": "This is a lightweight C++ option parser library, supporting the standard GNU style syntax for options", + "homepage": "https://github.com/jarro2783/cxxopts", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/czmq/Findlibcurl.cmake b/externals/vcpkg/ports/czmq/Findlibcurl.cmake new file mode 100755 index 000000000..6a8f90bbd --- /dev/null +++ b/externals/vcpkg/ports/czmq/Findlibcurl.cmake @@ -0,0 +1,11 @@ +find_package(CURL CONFIG QUIET) + +if(CURL_FOUND) + set(LIBCURL_INCLUDE_DIRS ${CURL_INCLUDE_DIRS}) + set(LIBCURL_LIBRARIES CURL::libcurl) + set(LIBCURL_FOUND TRUE) + message(STATUS "Found libcurl: ${LIBCURL_LIBRARIES}") +else() + set(LIBCURL_FOUND FALSE) + message(STATUS "Could not find libcurl") +endif() diff --git a/externals/vcpkg/ports/czmq/Findlibmicrohttpd.cmake b/externals/vcpkg/ports/czmq/Findlibmicrohttpd.cmake new file mode 100755 index 000000000..c7d0b4c19 --- /dev/null +++ b/externals/vcpkg/ports/czmq/Findlibmicrohttpd.cmake @@ -0,0 +1,32 @@ +find_path(LIBMICROHTTPD_INCLUDE_DIR NAMES microhttpd.h) + +get_filename_component(_prefix_path ${LIBMICROHTTPD_INCLUDE_DIR} PATH) + +find_library( + LIBMICROHTTPD_LIBRARY_DEBUG + NAMES libmicrohttpd-dll_d libmicrohttpd microhttpd + PATHS ${_prefix_path}/debug/lib + NO_DEFAULT_PATH +) + +find_library( + LIBMICROHTTPD_LIBRARY_RELEASE + NAMES libmicrohttpd-dll libmicrohttpd microhttpd + PATHS ${_prefix_path}/lib + NO_DEFAULT_PATH +) + +unset(_prefix_path) + +include(SelectLibraryConfigurations) +select_library_configurations(LIBMICROHTTPD) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args( + LIBMICROHTTPD + REQUIRED_VARS LIBMICROHTTPD_LIBRARY LIBMICROHTTPD_INCLUDE_DIR +) + +if(LIBMICROHTTPD_FOUND) + set(LIBMICROHTTPD_INCLUDE_DIRS ${LIBMICROHTTPD_INCLUDE_DIR}) +endif() diff --git a/externals/vcpkg/ports/czmq/Findlibzmq.cmake b/externals/vcpkg/ports/czmq/Findlibzmq.cmake new file mode 100755 index 000000000..80ce140e7 --- /dev/null +++ b/externals/vcpkg/ports/czmq/Findlibzmq.cmake @@ -0,0 +1,6 @@ +find_package(ZeroMQ CONFIG REQUIRED) + +set(LIBZMQ_INCLUDE_DIRS ${ZeroMQ_INCLUDE_DIR}) +set(LIBZMQ_LIBRARIES libzmq libzmq-static) +set(LIBZMQ_FOUND TRUE) +message(STATUS "Found libzmq: ${LIBZMQ_LIBRARIES}") diff --git a/externals/vcpkg/ports/czmq/Findlz4.cmake b/externals/vcpkg/ports/czmq/Findlz4.cmake new file mode 100755 index 000000000..bb9797368 --- /dev/null +++ b/externals/vcpkg/ports/czmq/Findlz4.cmake @@ -0,0 +1,17 @@ +find_path(LZ4_INCLUDE_DIR NAMES lz4.h) + +find_library(LZ4_LIBRARY_DEBUG NAMES lz4d) +find_library(LZ4_LIBRARY_RELEASE NAMES lz4) + +include(SelectLibraryConfigurations) +select_library_configurations(LZ4) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args( + LZ4 + REQUIRED_VARS LZ4_LIBRARY LZ4_INCLUDE_DIR +) + +if(LZ4_FOUND) + set(LZ4_INCLUDE_DIRS ${LZ4_INCLUDE_DIR}) +endif() diff --git a/externals/vcpkg/ports/czmq/Finduuid.cmake b/externals/vcpkg/ports/czmq/Finduuid.cmake new file mode 100755 index 000000000..96e61e057 --- /dev/null +++ b/externals/vcpkg/ports/czmq/Finduuid.cmake @@ -0,0 +1,35 @@ +find_path( + UUID_INCLUDE_DIR + NAMES uuid/uuid.h +) + +get_filename_component(_prefix_path ${UUID_INCLUDE_DIR} PATH) + +find_library( + UUID_LIBRARY_DEBUG + NAMES uuid + PATHS ${_prefix_path}/debug/lib + NO_DEFAULT_PATH +) + +find_library( + UUID_LIBRARY_RELEASE + NAMES uuid + PATHS ${_prefix_path}/lib + NO_DEFAULT_PATH +) + +unset(_prefix_path) + +include(SelectLibraryConfigurations) +select_library_configurations(UUID) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args( + UUID + REQUIRED_VARS UUID_LIBRARY UUID_INCLUDE_DIR +) + +if(UUID_FOUND) + set(UUID_INCLUDE_DIRS ${UUID_INCLUDE_DIR}) +endif() diff --git a/externals/vcpkg/ports/czmq/fix-dependencies.patch b/externals/vcpkg/ports/czmq/fix-dependencies.patch new file mode 100755 index 000000000..4612b8939 --- /dev/null +++ b/externals/vcpkg/ports/czmq/fix-dependencies.patch @@ -0,0 +1,17 @@ +diff --git a/builds/cmake/Config.cmake.in b/builds/cmake/Config.cmake.in +index 9c15f36a..5afff016 100644 +--- a/builds/cmake/Config.cmake.in ++++ b/builds/cmake/Config.cmake.in +@@ -1,4 +1,12 @@ + @PACKAGE_INIT@ + ++include(CMakeFindDependencyMacro) ++ ++find_dependency(ZeroMQ) ++ ++if ("@CZMQ_WITH_LIBCURL@" AND "@LIBCURL_FOUND@") ++ find_dependency(CURL) ++endif () ++ + include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") + check_required_components("@PROJECT_NAME@") diff --git a/externals/vcpkg/ports/czmq/portfile.cmake b/externals/vcpkg/ports/czmq/portfile.cmake new file mode 100755 index 000000000..5ed28189d --- /dev/null +++ b/externals/vcpkg/ports/czmq/portfile.cmake @@ -0,0 +1,87 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO zeromq/czmq + REF v4.2.1 + SHA512 65a21f7bd5935b119e1b24ce3b2ce8462031ab7c9a4ba587bb99fe618c9f8cb672cfa202993ddd79e0fb0f154ada06560b79a1b4f762fcce8f88f2f450ecee01 + HEAD_REF master + PATCHES + fix-dependencies.patch +) + +foreach(_cmake_module + Findlibcurl.cmake + Findlibmicrohttpd.cmake + Findlibzmq.cmake + Findlz4.cmake + Finduuid.cmake +) + file(COPY + ${CMAKE_CURRENT_LIST_DIR}/${_cmake_module} + DESTINATION ${SOURCE_PATH} + ) +endforeach() + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + draft ENABLE_DRAFTS + curl CZMQ_WITH_LIBCURL + httpd CZMQ_WITH_LIBMICROHTTPD + lz4 CZMQ_WITH_LZ4 + uuid CZMQ_WITH_UUID +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DCZMQ_BUILD_SHARED=${BUILD_SHARED} + -DCZMQ_BUILD_STATIC=${BUILD_STATIC} + -DBUILD_TESTING=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) +endif() +if(EXISTS ${CURRENT_PACKAGES_DIR}/share/cmake/${PORT}) + vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/${PORT}) +endif() + +vcpkg_fixup_pkgconfig() + +file(COPY + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" +) + +if ("tool" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES zmakecert) +endif() + +vcpkg_clean_executables_in_bin(FILE_NAMES zmakecert) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +# Remove headers with "common" names that conflict with other packages which aren't intended to be installed +# See https://github.com/zeromq/czmq/issues/2197 +foreach(FILE readme.txt sha1.h sha1.inc_c slre.h slre.inc_c zgossip_engine.inc zgossip_msg.h zhash_primes.inc zsock_option.inc) + file(REMOVE "${CURRENT_PACKAGES_DIR}/include/${FILE}") +endforeach() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/czmq_library.h + "if defined CZMQ_STATIC" + "if 1 //if defined CZMQ_STATIC" + ) +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/czmq/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/czmq/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..4535e889b --- /dev/null +++ b/externals/vcpkg/ports/czmq/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,9 @@ +_find_package(${ARGS}) + +if(TARGET czmq AND NOT TARGET czmq-static) + add_library(czmq-static INTERFACE IMPORTED) + set_target_properties(czmq-static PROPERTIES INTERFACE_LINK_LIBRARIES czmq) +elseif(TARGET czmq-static AND NOT TARGET czmq) + add_library(czmq INTERFACE IMPORTED) + set_target_properties(czmq PROPERTIES INTERFACE_LINK_LIBRARIES czmq-static) +endif() diff --git a/externals/vcpkg/ports/czmq/vcpkg.json b/externals/vcpkg/ports/czmq/vcpkg.json new file mode 100755 index 000000000..09b2d59d7 --- /dev/null +++ b/externals/vcpkg/ports/czmq/vcpkg.json @@ -0,0 +1,54 @@ +{ + "name": "czmq", + "version-semver": "4.2.1", + "port-version": 1, + "description": "High-level C binding for ZeroMQ", + "homepage": "https://github.com/zeromq/czmq", + "license": "MPL-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zeromq" + ], + "features": { + "curl": { + "description": "Build with libcurl", + "dependencies": [ + "curl" + ] + }, + "draft": { + "description": "Build and install draft APIs" + }, + "httpd": { + "description": "Build with HTTP server support (libmicrohttpd)", + "dependencies": [ + "libmicrohttpd" + ] + }, + "lz4": { + "description": "Build with lz4", + "dependencies": [ + "lz4" + ] + }, + "tool": { + "description": "Build and install czmq tools (zmakecert)" + }, + "uuid": { + "description": "Build with libuuid", + "dependencies": [ + { + "name": "libuuid", + "platform": "!windows & !uwp & !osx" + } + ] + } + } +} diff --git a/externals/vcpkg/ports/d3d12-memory-allocator/CMakeLists.txt b/externals/vcpkg/ports/d3d12-memory-allocator/CMakeLists.txt new file mode 100755 index 000000000..884610b06 --- /dev/null +++ b/externals/vcpkg/ports/d3d12-memory-allocator/CMakeLists.txt @@ -0,0 +1,21 @@ +cmake_minimum_required(VERSION 3.0) +project(d3d12-memory-allocator) + +add_library(${PROJECT_NAME} STATIC + "src/D3D12MemAlloc.h" + "src/D3D12MemAlloc.cpp" +) + +set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "src/D3D12MemAlloc.h") +#target_include_directories(${PROJECT_NAME} PRIVATE "src/") + +install( + TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-config + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION include/ +) +install( + EXPORT ${PROJECT_NAME}-config DESTINATION cmake/ + NAMESPACE "unofficial::" +) \ No newline at end of file diff --git a/externals/vcpkg/ports/d3d12-memory-allocator/portfile.cmake b/externals/vcpkg/ports/d3d12-memory-allocator/portfile.cmake new file mode 100755 index 000000000..89a4093bb --- /dev/null +++ b/externals/vcpkg/ports/d3d12-memory-allocator/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator + REF 10f148cef0dfd34ae1a9373b9396beb1581c992a + SHA512 c99934a606ce5a5c9c59e05faf2e659bfad2e485b58aaf00f38219a6c89f17b62033f4a69935915f0d5269a4f0ecba41037b044913ae6f4077fa981eaab470c8 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH cmake/) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/d3d12-memory-allocator/vcpkg.json b/externals/vcpkg/ports/d3d12-memory-allocator/vcpkg.json new file mode 100755 index 000000000..b31b48509 --- /dev/null +++ b/externals/vcpkg/ports/d3d12-memory-allocator/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "d3d12-memory-allocator", + "version-date": "2021-05-05", + "description": "Easy to integrate D3d12 memory allocation library from GPUOpen", + "homepage": "https://gpuopen.com/gaming-product/d3d12-memory-allocator/", + "license": "MIT", + "supports": "windows", + "dependencies": [ + "directx-headers", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/d3dx12/portfile.cmake b/externals/vcpkg/ports/d3dx12/portfile.cmake new file mode 100755 index 000000000..467685cff --- /dev/null +++ b/externals/vcpkg/ports/d3dx12/portfile.cmake @@ -0,0 +1,22 @@ +set(VERSION may2021) + +# The official D3DX12.H is hosted on https://github.com/microsoft/DirectX-Headers. +# +# This port uses the version from directx-vs-templates instead because it is compatible with multiple +# versions of the Windows 10 SDK. The official version only supports the 'latest' Windows 10 SDK. + +message(NOTICE "Consider using the 'directx-headers' port instead. See https://aka.ms/directx12agility") + +vcpkg_download_distfile(D3DX12_H + URLS "https://raw.githubusercontent.com/walbourn/directx-vs-templates/${VERSION}/d3d12game_win32_dr/d3dx12.h" + FILENAME "directx-vs-templates-${VERSION}-d3dx12.h" + SHA512 b053a8e6593c701a0827f8a52f20e160070b8b71242fd60a57617e46b87e909e11f814fc15b084b4f83b7ff5b9a562280da64a77cee3a171ef17839315df4245 +) +vcpkg_download_distfile(LICENSE + URLS "https://raw.githubusercontent.com/walbourn/directx-vs-templates/${VERSION}/LICENSE" + FILENAME "directx-vs-templates-${VERSION}-LICENSE" + SHA512 ce7d8ec7bfb58ef36a95b20f6f0fc4e3cd4923bb3ac6bd1f62e8215df2ee83d2a594ce84b15951310f05a819a0370468af781e73a10e536d23965421466851f4 +) + +file(INSTALL "${D3DX12_H}" DESTINATION ${CURRENT_PACKAGES_DIR}/include RENAME d3dx12.h) +file(INSTALL "${LICENSE}" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/d3dx12/vcpkg.json b/externals/vcpkg/ports/d3dx12/vcpkg.json new file mode 100755 index 000000000..1886ec5a1 --- /dev/null +++ b/externals/vcpkg/ports/d3dx12/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "d3dx12", + "version-string": "may2021", + "description": "The D3D12 Helper Library", + "homepage": "https://docs.microsoft.com/en-us/windows/win32/direct3d12/helper-structures-and-functions-for-d3d12" +} diff --git a/externals/vcpkg/ports/darknet/portfile.cmake b/externals/vcpkg/ports/darknet/portfile.cmake new file mode 100755 index 000000000..5274e101b --- /dev/null +++ b/externals/vcpkg/ports/darknet/portfile.cmake @@ -0,0 +1,63 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO AlexeyAB/darknet + REF 8a0bf84c19e38214219dbd3345f04ce778426c57 + SHA512 6253d5b498f4f6eba7fc539d5a4b4e163139f4841623f11d84760bcf1ffabe6519f85e98e3d4aeac6846313fea3b98451407134b6b6f5b91137c62d1647109d9 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cuda ENABLE_CUDA + cudnn ENABLE_CUDNN +) + +#do not move following features to vcpkg_check_features because they break themselves: one off will turn off the others even if true +set(ENABLE_OPENCV FALSE) +if ("opencv-base" IN_LIST FEATURES OR "opencv2-base" IN_LIST FEATURES OR "opencv3-base" IN_LIST FEATURES OR "opencv-cuda" IN_LIST FEATURES OR "opencv2-cuda" IN_LIST FEATURES OR "opencv3-cuda" IN_LIST FEATURES) + set(ENABLE_OPENCV TRUE) +endif() + +if ("cuda" IN_LIST FEATURES) + if (NOT VCPKG_CMAKE_SYSTEM_NAME AND NOT ENV{CUDACXX}) + #CMake looks for nvcc only in PATH and CUDACXX env vars for the Ninja generator. Since we filter path on vcpkg and CUDACXX env var is not set by CUDA installer on Windows, CMake cannot find CUDA when using Ninja generator, so we need to manually enlight it if necessary (https://gitlab.kitware.com/cmake/cmake/issues/19173). Otherwise we could just disable Ninja and use MSBuild, but unfortunately CUDA installer does not integrate with some distributions of MSBuild (like the ones inside Build Tools), making CUDA unavailable otherwise in those cases, which we want to avoid + set(ENV{CUDACXX} "$ENV{CUDA_PATH}/bin/nvcc.exe") + endif() +endif() + +#make sure we don't use any integrated pre-built library nor any unnecessary CMake module +file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty") +file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindPThreads_windows.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindCUDNN.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindStb.cmake") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS ${FEATURE_OPTIONS} + -DINSTALL_BIN_DIR:STRING=bin + -DINSTALL_LIB_DIR:STRING=lib + -DENABLE_OPENCV:BOOL=${ENABLE_OPENCV} +) + +vcpkg_cmake_install() +vcpkg_copy_tools(AUTO_CLEAN TOOL_NAMES darknet uselib) +if ("opencv-cuda" IN_LIST FEATURES OR "opencv3-cuda" IN_LIST FEATURES) + vcpkg_copy_tools(AUTO_CLEAN TOOL_NAMES uselib_track) +endif() + +file(COPY "${SOURCE_PATH}/cfg" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +file(COPY "${SOURCE_PATH}/data" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/scripts/download_weights.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/scripts") +message(STATUS "To download weight files, please go to ${CURRENT_INSTALLED_DIR}/tools/${PORT}/scripts and run ./download_weights.ps1") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/darknet/vcpkg.json b/externals/vcpkg/ports/darknet/vcpkg.json new file mode 100755 index 000000000..0f4c99a52 --- /dev/null +++ b/externals/vcpkg/ports/darknet/vcpkg.json @@ -0,0 +1,124 @@ +{ + "name": "darknet", + "version-date": "2022-03-06", + "description": "Darknet is an open source neural network framework written in C and CUDA. You only look once (YOLO) is a state-of-the-art, real-time object detection system, best example of darknet functionalities.", + "homepage": "https://github.com/alexeyab/darknet", + "license": null, + "dependencies": [ + "pthreads", + "stb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cuda": { + "description": "Build darknet with support for CUDA", + "dependencies": [ + "cuda" + ] + }, + "cudnn": { + "description": "Build darknet with support for cuDNN", + "dependencies": [ + "cuda", + "cudnn" + ] + }, + "full": { + "description": "Build darknet fully featured", + "dependencies": [ + { + "name": "darknet", + "features": [ + "cuda", + "cudnn", + "opencv-cuda" + ] + } + ] + }, + "opencv-base": { + "description": "Build darknet with support for latest version of OpenCV", + "dependencies": [ + { + "name": "opencv", + "features": [ + "contrib", + "dnn", + "ffmpeg" + ] + } + ] + }, + "opencv-cuda": { + "description": "Build darknet with support for latest version of CUDA-enabled OpenCV", + "dependencies": [ + { + "name": "opencv", + "features": [ + "contrib", + "cuda", + "dnn", + "ffmpeg" + ] + } + ] + }, + "opencv2-base": { + "description": "Build darknet with support for OpenCV2", + "dependencies": [ + { + "name": "opencv2", + "features": [ + "ffmpeg" + ] + } + ] + }, + "opencv2-cuda": { + "description": "Build darknet with support for CUDA-enabled OpenCV2", + "dependencies": [ + { + "name": "opencv2", + "features": [ + "cuda", + "ffmpeg" + ] + } + ] + }, + "opencv3-base": { + "description": "Build darknet with support for OpenCV3", + "dependencies": [ + { + "name": "opencv3", + "features": [ + "contrib", + "dnn", + "ffmpeg" + ] + } + ] + }, + "opencv3-cuda": { + "description": "Build darknet with support for CUDA-enabled OpenCV3", + "dependencies": [ + { + "name": "opencv3", + "features": [ + "contrib", + "cuda", + "dnn", + "ffmpeg" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/darts-clone/CMakeLists.txt b/externals/vcpkg/ports/darts-clone/CMakeLists.txt new file mode 100755 index 000000000..024cd2f74 --- /dev/null +++ b/externals/vcpkg/ports/darts-clone/CMakeLists.txt @@ -0,0 +1,29 @@ +cmake_minimum_required(VERSION 3.8) +project(darts) + +if(MSVC) + add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS) +endif() + +add_library(darts src/darts.cc) + +target_include_directories(darts + PUBLIC + $ + $ + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/src +) + +install( + TARGETS darts + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_HEADERS) + install( + DIRECTORY include/ DESTINATION include/ + ) +endif() diff --git a/externals/vcpkg/ports/darts-clone/portfile.cmake b/externals/vcpkg/ports/darts-clone/portfile.cmake new file mode 100755 index 000000000..7ed6e4d59 --- /dev/null +++ b/externals/vcpkg/ports/darts-clone/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_check_linkage( + ONLY_STATIC_LIBRARY +) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO s-yata/darts-clone + REF 1767ab87cffe7302856d1bb41e1c21b1df93f19e + SHA512 63112a4d8d6302d2602a8f161bf5fe5ec1b5b3b3097de9b28331f5261d76c06efb48601c08df26f242ddc881b917928baf54f24ccebac65da29e94380b6db0f5 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE ${CURRENT_PACKAGES_DIR}/include/Makefile.am) + +file(INSTALL ${SOURCE_PATH}/COPYING.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/darts-clone RENAME copyright) diff --git a/externals/vcpkg/ports/darts-clone/vcpkg.json b/externals/vcpkg/ports/darts-clone/vcpkg.json new file mode 100755 index 000000000..e99a2315f --- /dev/null +++ b/externals/vcpkg/ports/darts-clone/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "darts-clone", + "version-string": "1767ab87cffe", + "port-version": 2, + "description": "A static double-array trie structure" +} diff --git a/externals/vcpkg/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch b/externals/vcpkg/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch new file mode 100755 index 000000000..e20d8de07 --- /dev/null +++ b/externals/vcpkg/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9940065eb8..b25fa4919a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -298,7 +298,7 @@ add_subdirectory(dart) + + set(DART_IN_SOURCE_BUILD TRUE) + +-if(TARGET dart) ++if(false) + + # Add a "tests" target to build unit tests. + enable_testing() diff --git a/externals/vcpkg/ports/dartsim/portfile.cmake b/externals/vcpkg/ports/dartsim/portfile.cmake new file mode 100755 index 000000000..0a12d6a14 --- /dev/null +++ b/externals/vcpkg/ports/dartsim/portfile.cmake @@ -0,0 +1,45 @@ +# Shared library support is broken upstream (https://github.com/dartsim/dart/issues/1005#issuecomment-375406260) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO dartsim/dart + REF v6.11.0 + SHA512 01fbff039bcec71d41334db2d07d0973b1ba58d30d05b29e35e1e3cee853917753b64e1101881113a33adb801559855d38d274fbb3383cfb24d85565254d112d + HEAD_REF main + PATCHES + disable_unit_tests_examples_and_tutorials.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DDART_VERBOSE=ON + -DDART_MSVC_DEFAULT_OPTIONS=ON + -DDART_SKIP_DOXYGEN=ON + -DDART_SKIP_FLANN=ON + -DDART_SKIP_IPOPT=ON + -DDART_SKIP_NLOPT=ON + -DDART_SKIP_OPENGL=ON + -DDART_SKIP_pagmo=ON + -Durdfdom_headers_VERSION_MAJOR=1 + -Durdfdom_headers_VERSION_MINOR=0 + -Durdfdom_headers_VERSION_PATCH=4 +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/dart/cmake PACKAGE_NAME dart) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# only used for tests and examples (we removed the examples in share/doc above): +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dart/config.hpp" "#define DART_ROOT_PATH \"${SOURCE_PATH}/\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dart/config.hpp" "#define DART_DATA_PATH \"${SOURCE_PATH}/data/\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dart/config.hpp" "#define DART_DATA_LOCAL_PATH \"${SOURCE_PATH}/data/\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dart/config.hpp" "#define DART_DATA_GLOBAL_PATH \"${CURRENT_PACKAGES_DIR}/share/doc/dart/data/\"" "") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/dartsim/vcpkg.json b/externals/vcpkg/ports/dartsim/vcpkg.json new file mode 100755 index 000000000..6bc7403f1 --- /dev/null +++ b/externals/vcpkg/ports/dartsim/vcpkg.json @@ -0,0 +1,34 @@ +{ + "name": "dartsim", + "version": "6.11.0", + "port-version": 3, + "description": "Dynamic Animation and Robotics Toolkit", + "homepage": "https://dartsim.github.io/", + "dependencies": [ + "assimp", + "boost-algorithm", + "boost-filesystem", + "boost-functional", + "boost-lexical-cast", + "boost-math", + "boost-optional", + "boost-regex", + "boost-system", + "bullet3", + "ccd", + "eigen3", + "fcl", + "octomap", + "ode", + "tinyxml2", + "urdfdom", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/dataframe/portfile.cmake b/externals/vcpkg/ports/dataframe/portfile.cmake new file mode 100755 index 000000000..0694da42f --- /dev/null +++ b/externals/vcpkg/ports/dataframe/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO hosseinmoein/DataFrame + REF 1.19.0 + SHA512 4415644b04d9c3b5ab3487ee896d0f020f0659d71b8bc128a649e14c6edb22c4848d228016a0108a122060d5aa9452260a3936761cf228eb7a7a436a64f031ff + HEAD_REF master +) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENABLE_TESTING:BOOL=OFF +) + +vcpkg_cmake_install() + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +else() + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/DataFrame) +endif() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/License" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/dataframe/vcpkg.json b/externals/vcpkg/ports/dataframe/vcpkg.json new file mode 100755 index 000000000..dbfb63e38 --- /dev/null +++ b/externals/vcpkg/ports/dataframe/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "dataframe", + "version": "1.19.0", + "description": "This is a C++ statistical library that provides an interface similar to Pandas package in Python", + "homepage": "https://github.com/hosseinmoein/DataFrame", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/date/0001-fix-uwp.patch b/externals/vcpkg/ports/date/0001-fix-uwp.patch new file mode 100755 index 000000000..b414722cd --- /dev/null +++ b/externals/vcpkg/ports/date/0001-fix-uwp.patch @@ -0,0 +1,13 @@ +diff --git i/include/date/date.h w/include/date/date.h +index fce6200..6a77ad4 100644 +--- i/include/date/date.h ++++ w/include/date/date.h +@@ -82,7 +82,7 @@ + #ifdef _MSC_VER + # pragma warning(push) + // warning C4127: conditional expression is constant +-# pragma warning(disable : 4127) ++# pragma warning(disable : 4127 4996) + #endif + + namespace date diff --git a/externals/vcpkg/ports/date/0002-fix-cmake-3.14.patch b/externals/vcpkg/ports/date/0002-fix-cmake-3.14.patch new file mode 100755 index 000000000..4fece8fa8 --- /dev/null +++ b/externals/vcpkg/ports/date/0002-fix-cmake-3.14.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ad74900..42d55af 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -73,7 +73,7 @@ target_sources( date INTERFACE + $ + $ + ) +-if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.15) ++if (0) + # public headers will get installed: + set_target_properties( date PROPERTIES PUBLIC_HEADER include/date/date.h ) + endif () +@@ -144,7 +144,6 @@ if( BUILD_TZ_LIB ) + endif( ) + set_target_properties( date-tz PROPERTIES + POSITION_INDEPENDENT_CODE ON +- PUBLIC_HEADER "${TZ_HEADERS}" + VERSION "${PROJECT_VERSION}" + SOVERSION "${ABI_VERSION}" ) + if( NOT MSVC ) +@@ -169,8 +169,8 @@ write_basic_package_version_file( "${version_config}" + COMPATIBILITY SameMajorVersion ) + + install( TARGETS date +- EXPORT dateConfig +- PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/date ) ++ EXPORT dateConfig ) ++install( FILES include/date/date.h ${TZ_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/date ) + export( TARGETS date NAMESPACE date:: FILE dateTargets.cmake ) + if (CMAKE_VERSION VERSION_LESS 3.15) + install( diff --git a/externals/vcpkg/ports/date/fix-uninitialized-values.patch b/externals/vcpkg/ports/date/fix-uninitialized-values.patch new file mode 100755 index 000000000..422696e70 --- /dev/null +++ b/externals/vcpkg/ports/date/fix-uninitialized-values.patch @@ -0,0 +1,40 @@ +diff --git a/include/date/date.h b/include/date/date.h +index 9c6f335..3967d6b 100644 +--- a/include/date/date.h ++++ b/include/date/date.h +@@ -6767,7 +6767,7 @@ from_stream(std::basic_istream& is, const CharT* fmt, + CONSTDATA auto w = Duration::period::den == 1 ? 2 : 3 + dfs::width; + int tH; + int tM; +- long double S; ++ long double S{}; + read(is, ru{tH, 1, 2}, CharT{':'}, ru{tM, 1, 2}, + CharT{':'}, rld{S, 1, w}); + checked_set(H, tH, not_a_hour, is); +@@ -7202,7 +7202,7 @@ from_stream(std::basic_istream& is, const CharT* fmt, + // "%I:%M:%S %p" + using dfs = detail::decimal_format_seconds; + CONSTDATA auto w = Duration::period::den == 1 ? 2 : 3 + dfs::width; +- long double S; ++ long double S{}; + int tI = not_a_hour_12_value; + int tM = not_a_minute; + read(is, ru{tI, 1, 2}, CharT{':'}, ru{tM, 1, 2}, +@@ -7258,7 +7258,7 @@ from_stream(std::basic_istream& is, const CharT* fmt, + { + using dfs = detail::decimal_format_seconds; + CONSTDATA auto w = Duration::period::den == 1 ? 2 : 3 + dfs::width; +- long double S; ++ long double S{}; + read(is, rld{S, 1, width == -1 ? w : static_cast(width)}); + checked_set(s, round_i(duration{S}), + not_a_second, is); +@@ -7292,7 +7292,7 @@ from_stream(std::basic_istream& is, const CharT* fmt, + CONSTDATA auto w = Duration::period::den == 1 ? 2 : 3 + dfs::width; + int tH = not_a_hour; + int tM = not_a_minute; +- long double S; ++ long double S{}; + read(is, ru{tH, 1, 2}, CharT{':'}, ru{tM, 1, 2}, + CharT{':'}, rld{S, 1, w}); + checked_set(H, tH, not_a_hour, is); diff --git a/externals/vcpkg/ports/date/portfile.cmake b/externals/vcpkg/ports/date/portfile.cmake new file mode 100755 index 000000000..876e0529f --- /dev/null +++ b/externals/vcpkg/ports/date/portfile.cmake @@ -0,0 +1,44 @@ +if(VCPKG_TARGET_IS_WINDOWS) + message(WARNING + "You will need to also install https://raw.githubusercontent.com/unicode-org/cldr/master/common/supplemental/windowsZones.xml into your install location.\n" + "See https://howardhinnant.github.io/date/tz.html" + ) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO HowardHinnant/date + REF v3.0.1 + SHA512 6bdc7cba821d66e17a559250cc0ce0095808e9db81cec9e16eaa4c31abdfa705299c67b72016d9b06b302bc306d063e83a374eb00728071b83a5ad650d59034f + HEAD_REF master + PATCHES + 0001-fix-uwp.patch + 0002-fix-cmake-3.14.patch + fix-uninitialized-values.patch #Update the new version please remove this patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + remote-api USE_SYSTEM_TZ_DB +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DBUILD_TZ_LIB=ON +) + +vcpkg_cmake_install() + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) +else() + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/date) +endif() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/date/vcpkg.json b/externals/vcpkg/ports/date/vcpkg.json new file mode 100755 index 000000000..35e75e421 --- /dev/null +++ b/externals/vcpkg/ports/date/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "date", + "version": "3.0.1", + "port-version": 2, + "description": "A date and time library based on the C++17 header", + "homepage": "https://github.com/HowardHinnant/date", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "remote-api": { + "description": "support automatic download of tz data", + "dependencies": [ + "curl" + ] + } + } +} diff --git a/externals/vcpkg/ports/dav1d/patch_underscore_prefix.patch b/externals/vcpkg/ports/dav1d/patch_underscore_prefix.patch new file mode 100755 index 000000000..30506faf5 --- /dev/null +++ b/externals/vcpkg/ports/dav1d/patch_underscore_prefix.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 07b2586..02acd91 100644 +--- a/meson.build ++++ b/meson.build +@@ -370,7 +370,7 @@ endif + + cdata.set10('ARCH_PPC64LE', host_machine.cpu() == 'ppc64le') + +-if cc.symbols_have_underscore_prefix() ++if cc.symbols_have_underscore_prefix() or (host_machine.cpu_family() == 'x86' and host_machine.system() == 'windows') + cdata.set10('PREFIX', true) + cdata_asm.set10('PREFIX', true) + endif diff --git a/externals/vcpkg/ports/dav1d/portfile.cmake b/externals/vcpkg/ports/dav1d/portfile.cmake new file mode 100755 index 000000000..4709b593b --- /dev/null +++ b/externals/vcpkg/ports/dav1d/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_gitlab( + GITLAB_URL https://code.videolan.org + OUT_SOURCE_PATH SOURCE_PATH + REPO videolan/dav1d + REF 7b433e077298d0f4faf8da6d6eb5774e29bffa54 #v0.9.2 + SHA512 f889f969f6d612770132cbd2faf8685b1613661b5fbb9e7efe86e9cd074cbd99d5d0cd23894ffc3743fb34301b387df3a81bf067d2c7102358e3fdacf5959782 + PATCHES + patch_underscore_prefix.patch +) + +vcpkg_find_acquire_program(NASM) +get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) +vcpkg_add_to_path(${NASM_EXE_PATH}) + +set(LIBRARY_TYPE ${VCPKG_LIBRARY_LINKAGE}) +if (LIBRARY_TYPE STREQUAL "dynamic") + set(LIBRARY_TYPE "shared") +endif(LIBRARY_TYPE STREQUAL "dynamic") + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + --default-library=${LIBRARY_TYPE} + -Denable_tests=false + -Denable_tools=false +) + +vcpkg_install_meson() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/dav1d/vcpkg.json b/externals/vcpkg/ports/dav1d/vcpkg.json new file mode 100755 index 000000000..9460efa85 --- /dev/null +++ b/externals/vcpkg/ports/dav1d/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "dav1d", + "version": "0.9.2", + "description": "dav1d is a new open-source AV1 decoder developed by the VideoLAN and FFmpeg communities and sponsored by the Alliance for Open Media.", + "homepage": "https://code.videolan.org/videolan/dav1d", + "license": "BSD-2-Clause", + "supports": "!(uwp | arm | x86)", + "dependencies": [ + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/daw-header-libraries/portfile.cmake b/externals/vcpkg/ports/daw-header-libraries/portfile.cmake new file mode 100755 index 000000000..da89659fb --- /dev/null +++ b/externals/vcpkg/ports/daw-header-libraries/portfile.cmake @@ -0,0 +1,18 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO beached/header_libraries + REF 7115af99360fec13278b54662fd07f43675a78ae #v2.46.0 + SHA512 0a760e6adb4e10ecc8f14cf83f2fd8f85ec554647b9f4eb6c35b84aa068ed4bba71fdd02bffef78e889c07f5a8589f10fbc6c71e5fe8f5d05ef8fc6e4511b5d0 + HEAD_REF master +) + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +# remove empty lib and debug/lib directories (and duplicate files from debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/daw-header-libraries/vcpkg.json b/externals/vcpkg/ports/daw-header-libraries/vcpkg.json new file mode 100755 index 000000000..3c0a1bf69 --- /dev/null +++ b/externals/vcpkg/ports/daw-header-libraries/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "daw-header-libraries", + "version": "2.46.0", + "description": "Set of header-only algorithms used in daw-utf8-range and daw-json-link.", + "homepage": "https://github.com/beached/header_libraries", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/daw-json-link/portfile.cmake b/externals/vcpkg/ports/daw-json-link/portfile.cmake new file mode 100755 index 000000000..e9a330ebf --- /dev/null +++ b/externals/vcpkg/ports/daw-json-link/portfile.cmake @@ -0,0 +1,40 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO beached/daw_json_link + REF b90116a13ca3e2ce37e6890b309d1fd2c1979ae3 #v2.14.0 + SHA512 d185e0849592d5a871d453a8a27a265c51d5aafb6284b03c64400a9e316afa3f502bd9a1983aed5cfd58509a212e2eb1293887dd672523e71c89c2ec089235ce + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DDAW_USE_PACKAGE_MANAGEMENT=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/${PORT}/cmake) + +# remove empty lib and debug/lib directories (and duplicate files from debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +# Append the json-link and dragonbox license information into a single +# copyright file (they are both Boost v1.0 but it is good to be clear). +file(APPEND "${SOURCE_PATH}/copyright" [=[+----------------------------------------------------------------------------+ +| json-link copywrite | ++----------------------------------------------------------------------------+ +]=]) +file(READ "${SOURCE_PATH}/LICENSE" json_link_copywrite) +file(APPEND "${SOURCE_PATH}/copyright" ${json_link_copywrite}) +file(APPEND "${SOURCE_PATH}/copyright" [=[ + + ++----------------------------------------------------------------------------+ +| dragonbox copywrite | ++----------------------------------------------------------------------------+ +]=]) + +file(READ "${SOURCE_PATH}/LICENSE_Dragonbox" dragonbox_copywrite) +file(APPEND "${SOURCE_PATH}/copyright" ${dragonbox_copywrite}) +file(INSTALL "${SOURCE_PATH}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/daw-json-link/vcpkg.json b/externals/vcpkg/ports/daw-json-link/vcpkg.json new file mode 100755 index 000000000..e00baf48d --- /dev/null +++ b/externals/vcpkg/ports/daw-json-link/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "daw-json-link", + "version": "2.14.0", + "description": "Perhaps the fastest JSON deserializer/serializer posssible or at least close to it.", + "homepage": "https://github.com/beached/daw_json_link", + "license": "BSL-1.0", + "dependencies": [ + "daw-utf-range", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/daw-utf-range/portfile.cmake b/externals/vcpkg/ports/daw-utf-range/portfile.cmake new file mode 100755 index 000000000..ba75d4fac --- /dev/null +++ b/externals/vcpkg/ports/daw-utf-range/portfile.cmake @@ -0,0 +1,22 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO beached/utf_range + REF 105862ffe283e96ae514d4a6ec98d6ea16b25827 #v2.2.2 + SHA512 49772c7450ec432925b44ecddaee594ecec01afa4cc49db88e798347d6e5df51b7acf2bea7e11951b7de42a0a4d5a6c9046d5cb101a65e7da68b7d7242ad5b1c + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DDAW_USE_PACKAGE_MANAGEMENT=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +# remove empty lib and debug/lib directories (and duplicate files from debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/daw-utf-range/vcpkg.json b/externals/vcpkg/ports/daw-utf-range/vcpkg.json new file mode 100755 index 000000000..5a2708850 --- /dev/null +++ b/externals/vcpkg/ports/daw-utf-range/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "daw-utf-range", + "version": "2.2.2", + "description": "Header-only utf8 string range used by daw-json-link. Includes a constexpr/noexcept modified version of utfcpp.", + "homepage": "https://github.com/beached/header_libraries", + "license": "BSL-1.0", + "dependencies": [ + "daw-header-libraries", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/dbg-macro/portfile.cmake b/externals/vcpkg/ports/dbg-macro/portfile.cmake new file mode 100755 index 000000000..15fd2aabd --- /dev/null +++ b/externals/vcpkg/ports/dbg-macro/portfile.cmake @@ -0,0 +1,14 @@ +# single header file library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sharkdp/dbg-macro + REF 4db61805d90cb66d91bcc56c2703591a0127ed11 + SHA512 68afaedce857f6007edbb65527745aa07ab3dd736e65602b4c6da04646730ef4c09d9a239a9bcae1806c5a0bc0f70b5766edf245b2fd5f84d64cc03a5cadc5c8 + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/dbg.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/dbg-macro/vcpkg.json b/externals/vcpkg/ports/dbg-macro/vcpkg.json new file mode 100755 index 000000000..77d5be57e --- /dev/null +++ b/externals/vcpkg/ports/dbg-macro/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "dbg-macro", + "version-date": "2021-11-02", + "description": "A dbg(...) macro for C++", + "homepage": "https://github.com/sharkdp/dbg-macro" +} diff --git a/externals/vcpkg/ports/dbghelp/portfile.cmake b/externals/vcpkg/ports/dbghelp/portfile.cmake new file mode 100755 index 000000000..1b902cff3 --- /dev/null +++ b/externals/vcpkg/ports/dbghelp/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_get_windows_sdk(WINDOWS_SDK) + +if (WINDOWS_SDK VERSION_GREATER "10") + set(LIBFILEPATH "$ENV{WindowsSdkDir}Debuggers\\lib\\${TRIPLET_SYSTEM_ARCH}\\dbghelp.lib") + message("LIBFILEPATH: ${LIBFILEPATH}") + set(DLLFILEPATH "$ENV{WindowsSdkDir}Debuggers\\${TRIPLET_SYSTEM_ARCH}\\dbghelp.dll") + message("DLLFILEPATH: ${DLLFILEPATH}") + set(HEADERPATH "$ENV{WindowsSdkDir}Debuggers\\inc\\dbghelp.h") + message("HEADERPATH: ${HEADERPATH}") +else() + message(FATAL_ERROR "Portfile not yet configured for Windows SDK with version: ${WINDOWS_SDK}") +endif() + +if (NOT EXISTS "${LIBFILEPATH}" OR NOT EXISTS "${DLLFILEPATH}" OR NOT EXISTS "${HEADERPATH}") + message(FATAL_ERROR "Cannot find debugging tools in Windows SDK ${WINDOWS_SDK}. Please reinstall the Windows SDK and select \"Debugging Tools\".") +endif() + +file(INSTALL ${LIBFILEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +file(INSTALL ${LIBFILEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +file(INSTALL ${DLLFILEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) +file(INSTALL ${DLLFILEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) +file(INSTALL ${HEADERPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "See https://developer.microsoft.com/windows/downloads/windows-10-sdk for the Windows 10 SDK license") diff --git a/externals/vcpkg/ports/dbghelp/vcpkg.json b/externals/vcpkg/ports/dbghelp/vcpkg.json new file mode 100755 index 000000000..85c4d7c8f --- /dev/null +++ b/externals/vcpkg/ports/dbghelp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "dbghelp", + "version": "0", + "port-version": 2, + "description": "Windows Debug Help Library", + "supports": "windows" +} diff --git a/externals/vcpkg/ports/dbow2/portfile.cmake b/externals/vcpkg/ports/dbow2/portfile.cmake new file mode 100755 index 000000000..1518c7820 --- /dev/null +++ b/externals/vcpkg/ports/dbow2/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO dorian3d/DBoW2 + REF 4d08e9fc751fac9063874d85a43c1ccdcda8b401 + SHA512 0a4ad8506c731395cb23d96d0e8afe4131576af88468723b9496cdbc95a031089ecdeb61dbb7205cb3a7599acb60a39887fa9852e7d7a690b8152a1bd26d9bd0 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DBUILD_Demo=OFF +) + +vcpkg_install_cmake() + +# Move CMake files to the right place +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/DBoW2) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/DBoW2/DBoW2Config.cmake) + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) + diff --git a/externals/vcpkg/ports/dbow2/vcpkg.json b/externals/vcpkg/ports/dbow2/vcpkg.json new file mode 100755 index 000000000..6f0fec46d --- /dev/null +++ b/externals/vcpkg/ports/dbow2/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "dbow2", + "version-string": "2019-08-05", + "port-version": 1, + "description": "DBoW2 is an improved version of the DBow library, an open source C++ library for indexing and converting images into a bag-of-word representation.", + "homepage": "https://github.com/dorian3d/DBoW2", + "dependencies": [ + "opencv" + ] +} diff --git a/externals/vcpkg/ports/dbow3/fix_cmake.patch b/externals/vcpkg/ports/dbow3/fix_cmake.patch new file mode 100755 index 000000000..0b802425e --- /dev/null +++ b/externals/vcpkg/ports/dbow3/fix_cmake.patch @@ -0,0 +1,2496 @@ +From d72cb42f5147f7648c462ee1b211070c1691a887 Mon Sep 17 00:00:00 2001 +From: Ramadan +Date: Thu, 15 Aug 2019 12:27:19 +0200 +Subject: [PATCH 1/2] Fix CMakeLists.txt and installation + +--- + .gitignore | 249 ++++++++++ + CMakeLists.txt | 275 +---------- + Lib/CMakeLists.txt | 99 ++++ + Lib/DBow3Config.cmake | 4 + + {src => Lib/include/DBow3}/BowVector.h | 1 + + {src => Lib/include/DBow3}/DBoW3.h | 0 + {src => Lib/include/DBow3}/Database.h | 0 + {src => Lib/include/DBow3}/DescManip.h | 0 + {src => Lib/include/DBow3}/FeatureVector.h | 0 + {src => Lib/include/DBow3}/QueryResults.h | 0 + {src => Lib/include/DBow3}/ScoringObject.h | 0 + {src => Lib/include/DBow3}/Vocabulary.h | 0 + {src => Lib/include/DBow3}/exports.h | 16 +- + {src => Lib/include/DBow3}/quicklz.h | 0 + {src => Lib/include/DBow3}/timers.h | 0 + {src => Lib/src}/BowVector.cpp | 2 +- + {src => Lib/src}/Database.cpp | 2 +- + {src => Lib/src}/DescManip.cpp | 546 ++++++++++----------- + {src => Lib/src}/FeatureVector.cpp | 2 +- + {src => Lib/src}/QueryResults.cpp | 2 +- + {src => Lib/src}/ScoringObject.cpp | 4 +- + {src => Lib/src}/Vocabulary.cpp | 8 +- + {src => Lib/src}/quicklz.c | 2 +- + cmake/instructionSet.cmake | 13 + + cmake_uninstall.cmake.in | 28 -- + config.cmake.in | 36 -- + {utils => examples}/CMakeLists.txt | 0 + {utils => examples}/create_voc_step0.cpp | 252 +++++----- + {utils => examples}/create_voc_step1.cpp | 142 +++--- + {utils => examples}/demo_general.cpp | 404 +++++++-------- + {utils => examples}/images/image0.png | Bin + {utils => examples}/images/image1.png | Bin + {utils => examples}/images/image2.png | Bin + {utils => examples}/images/image3.png | Bin + src/CMakeLists.txt | 35 -- + orbvoc.dbow3 => voc/orbvoc.dbow3 | Bin + 36 files changed, 1072 insertions(+), 1050 deletions(-) + create mode 100644 .gitignore + create mode 100644 Lib/CMakeLists.txt + create mode 100644 Lib/DBow3Config.cmake + rename {src => Lib/include/DBow3}/BowVector.h (99%) + rename {src => Lib/include/DBow3}/DBoW3.h (100%) + rename {src => Lib/include/DBow3}/Database.h (100%) + rename {src => Lib/include/DBow3}/DescManip.h (100%) + rename {src => Lib/include/DBow3}/FeatureVector.h (100%) + rename {src => Lib/include/DBow3}/QueryResults.h (100%) + rename {src => Lib/include/DBow3}/ScoringObject.h (100%) + rename {src => Lib/include/DBow3}/Vocabulary.h (100%) + rename {src => Lib/include/DBow3}/exports.h (78%) + rename {src => Lib/include/DBow3}/quicklz.h (100%) + rename {src => Lib/include/DBow3}/timers.h (100%) + rename {src => Lib/src}/BowVector.cpp (99%) + rename {src => Lib/src}/Database.cpp (99%) + rename {src => Lib/src}/DescManip.cpp (96%) + rename {src => Lib/src}/FeatureVector.cpp (98%) + rename {src => Lib/src}/QueryResults.cpp (97%) + rename {src => Lib/src}/ScoringObject.cpp (99%) + rename {src => Lib/src}/Vocabulary.cpp (99%) + rename {src => Lib/src}/quicklz.c (99%) + create mode 100644 cmake/instructionSet.cmake + delete mode 100644 cmake_uninstall.cmake.in + delete mode 100644 config.cmake.in + rename {utils => examples}/CMakeLists.txt (100%) + rename {utils => examples}/create_voc_step0.cpp (97%) + rename {utils => examples}/create_voc_step1.cpp (97%) + rename {utils => examples}/demo_general.cpp (96%) + rename {utils => examples}/images/image0.png (100%) + rename {utils => examples}/images/image1.png (100%) + rename {utils => examples}/images/image2.png (100%) + rename {utils => examples}/images/image3.png (100%) + delete mode 100644 src/CMakeLists.txt + rename orbvoc.dbow3 => voc/orbvoc.dbow3 (100%) + +diff --git a/.gitignore b/.gitignore +new file mode 100644 +index 0000000..8c4285e +--- /dev/null ++++ b/.gitignore +@@ -0,0 +1,249 @@ ++## Ignore Visual Studio temporary files, build results, and ++## files generated by popular Visual Studio add-ons. ++ ++# User-specific files ++*.suo ++*.user ++*.userosscache ++*.sln.docstates ++ ++# User-specific files (MonoDevelop/Xamarin Studio) ++*.userprefs ++ ++# Build results ++[Dd]ebug/ ++[Dd]ebugPublic/ ++[Rr]elease/ ++[Rr]eleases/ ++[Xx]64/ ++[Xx]86/ ++[Bb]uild/ ++bld/ ++[Bb]in/ ++[Oo]bj/ ++ ++# Visual Studio 2015 cache/options directory ++.vs/ ++out/ ++# Uncomment if you have tasks that create the project's static files in wwwroot ++#wwwroot/ ++ ++# MSTest test Results ++[Tt]est[Rr]esult*/ ++[Bb]uild[Ll]og.* ++ ++# NUNIT ++*.VisualState.xml ++TestResult.xml ++ ++# Build Results of an ATL Project ++[Dd]ebugPS/ ++[Rr]eleasePS/ ++dlldata.c ++ ++# DNX ++project.lock.json ++artifacts/ ++ ++*_i.c ++*_p.c ++*_i.h ++*.ilk ++*.meta ++*.obj ++*.pch ++*.pdb ++*.pgc ++*.pgd ++*.rsp ++*.sbr ++*.tlb ++*.tli ++*.tlh ++*.tmp ++*.tmp_proj ++*.log ++*.vspscc ++*.vssscc ++.builds ++*.pidb ++*.svclog ++*.scc ++*.tlog ++*.idb ++# Chutzpah Test files ++_Chutzpah* ++ ++# Visual C++ cache files ++ipch/ ++*.aps ++*.ncb ++*.opendb ++*.opensdf ++*.sdf ++*.cachefile ++*.VC.db ++ ++# Visual Studio profiler ++*.psess ++*.vsp ++*.vspx ++*.sap ++ ++# TFS 2012 Local Workspace ++$tf/ ++ ++# Guidance Automation Toolkit ++*.gpState ++ ++# ReSharper is a .NET coding add-in ++_ReSharper*/ ++*.[Rr]e[Ss]harper ++*.DotSettings.user ++ ++# JustCode is a .NET coding add-in ++.JustCode ++ ++# TeamCity is a build add-in ++_TeamCity* ++ ++# DotCover is a Code Coverage Tool ++*.dotCover ++ ++# NCrunch ++_NCrunch_* ++.*crunch*.local.xml ++nCrunchTemp_* ++ ++# MightyMoose ++*.mm.* ++AutoTest.Net/ ++ ++# Web workbench (sass) ++.sass-cache/ ++ ++# Installshield output folder ++[Ee]xpress/ ++ ++# DocProject is a documentation generator add-in ++DocProject/buildhelp/ ++DocProject/Help/*.HxT ++DocProject/Help/*.HxC ++DocProject/Help/*.hhc ++DocProject/Help/*.hhk ++DocProject/Help/*.hhp ++DocProject/Help/Html2 ++DocProject/Help/html ++ ++# Click-Once directory ++publish/ ++ ++# Publish Web Output ++*.[Pp]ublish.xml ++*.azurePubxml ++ ++# TODO: Un-comment the next line if you do not want to checkin ++# your web deploy settings because they may include unencrypted ++# passwords ++#*.pubxml ++*.publishproj ++ ++# NuGet Packages ++*.nupkg ++# The packages folder can be ignored because of Package Restore ++**/packages/* ++# except build/, which is used as an MSBuild target. ++!**/packages/build/ ++# Uncomment if necessary however generally it will be regenerated when needed ++#!**/packages/repositories.config ++# NuGet v3's project.json files produces more ignoreable files ++*.nuget.props ++*.nuget.targets ++ ++# Microsoft Azure Build Output ++csx/ ++*.build.csdef ++ ++# Microsoft Azure Emulator ++ecf/ ++rcf/ ++ ++# Microsoft Azure ApplicationInsights config file ++ApplicationInsights.config ++ ++# Windows Store app package directory ++AppPackages/ ++BundleArtifacts/ ++ ++# Visual Studio cache files ++# files ending in .cache can be ignored ++*.[Cc]ache ++# but keep track of directories ending in .cache ++!*.[Cc]ache/ ++ ++# Others ++ClientBin/ ++[Ss]tyle[Cc]op.* ++~$* ++*~ ++*.dbmdl ++*.dbproj.schemaview ++*.pfx ++*.publishsettings ++node_modules/ ++orleans.codegen.cs ++ ++# RIA/Silverlight projects ++Generated_Code/ ++ ++# Backup & report files from converting an old project file ++# to a newer Visual Studio version. Backup files are not needed, ++# because we have git ;-) ++_UpgradeReport_Files/ ++Backup*/ ++UpgradeLog*.XML ++UpgradeLog*.htm ++ ++# SQL Server files ++*.mdf ++*.ldf ++ ++# Business Intelligence projects ++*.rdl.data ++*.bim.layout ++*.bim_*.settings ++ ++# Microsoft Fakes ++FakesAssemblies/ ++ ++# GhostDoc plugin setting file ++*.GhostDoc.xml ++ ++# Node.js Tools for Visual Studio ++.ntvs_analysis.dat ++ ++# Visual Studio 6 build log ++*.plg ++ ++# Visual Studio 6 workspace options file ++*.opt ++ ++# Visual Studio LightSwitch build output ++**/*.HTMLClient/GeneratedArtifacts ++**/*.DesktopClient/GeneratedArtifacts ++**/*.DesktopClient/ModelManifest.xml ++**/*.Server/GeneratedArtifacts ++**/*.Server/ModelManifest.xml ++_Pvt_Extensions ++ ++# LightSwitch generated files ++GeneratedArtifacts/ ++ModelManifest.xml ++ ++# Paket dependency manager ++.paket/paket.exe ++ ++# FAKE - F# Make ++.fake/ ++html ++xml +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9541cd7..a2a563a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,268 +1,25 @@ +-# ---------------------------------------------------------------------------- +-# Basic Configuration +-# ---------------------------------------------------------------------------- +-CMAKE_MINIMUM_REQUIRED(VERSION 2.8) ++cmake_minimum_required(VERSION 3.10) + +-set(CMAKE_CXX_STANDARD 11) ++project(DBow3 VERSION 1.0.0) + +-PROJECT(DBoW3) +-set(PROJECT_VERSION "0.0.1") +-string(REGEX MATCHALL "[0-9]" PROJECT_VERSION_PARTS "${PROJECT_VERSION}") +-list(GET PROJECT_VERSION_PARTS 0 PROJECT_VERSION_MAJOR) +-list(GET PROJECT_VERSION_PARTS 1 PROJECT_VERSION_MINOR) +-list(GET PROJECT_VERSION_PARTS 2 PROJECT_VERSION_PATCH) +-set(PROJECT_SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") ++option(BUILD_EXAMPLES "Set to ON to build examples" OFF) ++option(BUILD_TESTS "Set to ON to build tests" OFF) ++option(BUILD_SHARED_LIBS "Set to OFF to build static libraries" ON) + +-message("LIB_INSTALL_DIR: ${LIB_INSTALL_DIR}") ++# OpenCV ++option(USE_OPENCV_CONTRIB "Set on to use opencv-contrib" ON) + +-#------------------------------------------------------ +-# Build type +-#------------------------------------------------------ ++# Optimization ++option(USE_SIMD "Set on to enabel avx optimization" ON) + +-IF(NOT CMAKE_BUILD_TYPE ) +- SET( CMAKE_BUILD_TYPE "Release" ) +-ENDIF() + +-#------------------------------------------------------ +-# Lib Names and Dirs +-#------------------------------------------------------ ++add_subdirectory(Lib) + +-if(WIN32) +- # Postfix of DLLs: +- SET(PROJECT_DLLVERSION "${PROJECT_VERSION_MAJOR}${PROJECT_VERSION_MINOR}${PROJECT_VERSION_PATCH}") +- SET(RUNTIME_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH "Directory for dlls and binaries") +- SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH "Directory for binaries") +- SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH "Directory for dlls") +-else() +- # Postfix of so's: +- set(PROJECT_DLLVERSION) +- set(LIB_INSTALL_DIR lib CACHE STRING "Install location of libraries (e.g. lib32 or lib64 for multilib installations)") +- SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/cmake/ /usr/${LIB_INSTALL_DIR}/cmake ) +-endif() ++if(BUILD_EXAMPLES) ++ add_subdirectory(examples) ++endif(BUILD_EXAMPLES) + ++if(BUILD_TESTS) ++ add_subdirectory(tests) ++endif(BUILD_TESTS) + +- +-# +-OPTION(BUILD_UTILS "Set to OFF to not build utils" ON) +-OPTION(USE_CONTRIB "Set to ON if contrib are installed" OFF) +-OPTION(BUILD_SHARED_LIBS "Set to OFF to build static libraries" ON) +- +-# ---------------------------------------------------------------------------- +-# Find Dependencies +-# ---------------------------------------------------------------------------- +-find_package(OpenCV REQUIRED) +-IF(USE_CONTRIB) +-add_definitions(-DUSE_CONTRIB) +-ENDIF() +-if(NOT OpenCV_VERSION VERSION_LESS "3.0") +- ADD_DEFINITIONS(-DOPENCV_VERSION_3) +- SET(OPENCV_VERSION_3 ON) +-ELSE() +- SET(OPENCV_VERSION_3 OFF) +-ENDIF() +- +-include_directories(${OpenCV_INCLUDE_DIRS}) +- +-SET(REQUIRED_LIBRARIES ${REQUIRED_LIBRARIES} ${OpenCV_LIBS}) +- +-# ---------------------------------------------------------------------------- +-# PROJECT CONFIGURATION +-# force some variables that could be defined in the command line to be written to cache +-# ---------------------------------------------------------------------------- +-OPTION(INSTALL_DOC "Set to ON to build/install Documentation" OFF) +-IF (INSTALL_DOC) +- FIND_PACKAGE(Doxygen REQUIRED) +- MESSAGE( STATUS "INSTALL_DOC: ${INSTALL_DOC} ") +- INCLUDE("${PROJECT_SOURCE_DIR}/generateDoc.cmake") +- GENERATE_DOCUMENTATION(${PROJECT_SOURCE_DIR}/dox.in) +-ENDIF() +- +-# ---------------------------------------------------------------------------- +-# Uninstall target, for "make uninstall" +-# ---------------------------------------------------------------------------- +-CONFIGURE_FILE( "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) +-ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") +- +-# ---------------------------------------------------------------------------- +-# create configuration file from .in file (If you use windows take care with paths) +-# ---------------------------------------------------------------------------- +- +-CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/config.cmake.in" "${PROJECT_BINARY_DIR}/Find${PROJECT_NAME}.cmake") +-CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/config.cmake.in" "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake") +-INSTALL(FILES "${PROJECT_BINARY_DIR}/Find${PROJECT_NAME}.cmake" DESTINATION ${LIB_INSTALL_DIR}/cmake/ ) +-INSTALL(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" DESTINATION ${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} ) +- +- +- +- +-# ---------------------------------------------------------------------------- +-# Program Optimization and debug (Extracted from OpenCV) +-# ---------------------------------------------------------------------------- +-set(WARNINGS_ARE_ERRORS OFF CACHE BOOL "Treat warnings as errors") +-set(WHOLE_PROGRAM_OPTIMIZATION OFF CACHE BOOL "Flags for whole program optimization.") +- +-set(EXTRA_C_FLAGS "") +-set(EXTRA_C_FLAGS_RELEASE "") +-set(EXTRA_C_FLAGS_DEBUG "") +-set(EXTRA_EXE_LINKER_FLAGS "") +-set(EXTRA_EXE_LINKER_FLAGS_RELEASE "") +-set(EXTRA_EXE_LINKER_FLAGS_DEBUG "") +- +-IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) +- set(ENABLE_PROFILING OFF CACHE BOOL "Enable profiling in the GCC compiler (Add flags: -g -pg)") +- set(USE_OMIT_FRAME_POINTER ON CACHE BOOL "Enable -fomit-frame-pointer for GCC") +- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES arm*) # We can use only -O2 because the -O3 causes gcc crash +- set(USE_O2 ON CACHE BOOL "Enable -O2 for GCC") +- set(USE_FAST_MATH OFF CACHE BOOL "Enable -ffast-math for GCC") +- endif() +- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES powerpc*) +- set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC") +- set(USE_POWERPC ON CACHE BOOL "Enable PowerPC for GCC") +- endif () +- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64* OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES x86_64*) +- set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC") +- set(USE_FAST_MATH OFF CACHE BOOL "Enable -ffast-math for GCC") +- set(USE_MMX ON CACHE BOOL "Enable MMX for GCC") +- set(USE_SSE ON CACHE BOOL "Enable SSE for GCC") +- set(USE_SSE2 ON CACHE BOOL "Enable SSE2 for GCC") +- set(USE_SSE3 ON CACHE BOOL "Enable SSE3 for GCC") +- endif() +- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES i686* OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES x86) +- set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC") +- set(USE_FAST_MATH OFF CACHE BOOL "Enable -ffast-math for GCC") +- set(USE_MMX ON CACHE BOOL "Enable MMX for GCC") +- set(USE_SSE OFF CACHE BOOL "Enable SSE for GCC") +- set(USE_SSE2 OFF CACHE BOOL "Enable SSE2 for GCC") +- set(USE_SSE3 OFF CACHE BOOL "Enable SSE3 for GCC") +- endif () +- +- set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Wall") +- +- if(WARNINGS_ARE_ERRORS) +- set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Werror") +- endif() +- +- # The -Wno-long-long is required in 64bit systems when including sytem headers. +- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86_64* OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*) +- set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Wno-long-long") +- endif() +- +- # Whole program optimization +- if(WHOLE_PROGRAM_OPTIMIZATION) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -fwhole-program --combine") +- endif() +- +- # Other optimizations +- if(USE_OMIT_FRAME_POINTER) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -fomit-frame-pointer") +- endif() +- if(USE_O2) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -O2") +- endif() +- if(USE_O3) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -O3") +- endif() +- if(USE_FAST_MATH) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -ffast-math") +- endif() +- if(USE_POWERPC) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -mcpu=G3 -mtune=G5") +- endif() +- if(USE_MMX) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -mmmx") +- endif() +- if(USE_SSE) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -msse") +- endif() +- if(USE_SSE2) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -msse2") +- endif() +- if(USE_SSE3 AND NOT MINGW) # SSE3 should be disabled under MingW because it generates compiler errors +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -msse3") +- endif() +- +- if(ENABLE_PROFILING) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -pg -g") +- else() +- if(NOT APPLE) +- set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -ffunction-sections") +- endif() +- endif() +- +- +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -DNDEBUG ") +- set(EXTRA_C_FLAGS_DEBUG "-g3 -O0 -DDEBUG -D_DEBUG -W -Wextra -Wno-return-type ") +- +- MESSAGE( STATUS "-------------------------------------------------------------------------------" ) +- message( STATUS "GNU COMPILER") +- MESSAGE( STATUS "-------------------------------------------------------------------------------" ) +- +- +- +- +-ELSE() # MSVC +- +- +-ENDIF()#END OF COMPILER SPECIFIC OPTIONS +-SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} ${EXTRA_C_FLAGS_RELEASE}") +-SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} ${EXTRA_C_FLAGS_DEBUG}") +-SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -std=c++11") +-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -std=c++11") +-set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} ${CMAKE_C_FLAGS_DEBUG}") +-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} ${CMAKE_CXX_FLAGS_DEBUG}") +-SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EXTRA_EXE_LINKER_FLAGS}") +-SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${EXTRA_EXE_LINKER_FLAGS_RELEASE}") +-SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${EXTRA_EXE_LINKER_FLAGS_DEBUG}") +- +- +- +-#------------------------------------------------ +-# DIRS +-#------------------------------------------------ +-ADD_SUBDIRECTORY(src) +-IF (BUILD_UTILS) +-ADD_SUBDIRECTORY(utils) +-ENDIF() +- +-IF (BUILD_TESTS) +-ADD_SUBDIRECTORY(tests) +-ENDIF() +- +- +-# ---------------------------------------------------------------------------- +-# display status message for important variables +-# ---------------------------------------------------------------------------- +-message( STATUS ) +-MESSAGE( STATUS "-------------------------------------------------------------------------------" ) +-message( STATUS "General configuration for ${PROJECT_NAME} ${PROJECT_VERSION}") +-MESSAGE( STATUS "-------------------------------------------------------------------------------" ) +-message(" Built as dynamic libs?:" ${BUILD_SHARED_LIBS}) +-message(" Compiler:" "${CMAKE_COMPILER}" "${CMAKE_CXX_COMPILER}") +- +-message( STATUS "Build Type: ${CMAKE_BUILD_TYPE}") +-message( STATUS "C++ flags (Release): ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") +-message( STATUS "C++ flags (Debug): ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") +-message( STATUS "C++ flags (Relase+Debug): ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") +- +-message( STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}") +-message( STATUS "CMAKE_BINARY_DIR: ${CMAKE_BINARY_DIR}") +- +-MESSAGE( STATUS ) +-MESSAGE( STATUS "CMAKE_SYSTEM_PROCESSOR = ${CMAKE_SYSTEM_PROCESSOR}" ) +-MESSAGE( STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" ) +-MESSAGE( STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}" ) +-MESSAGE( STATUS "CMAKE_MODULE_PATH = ${CMAKE_MODULE_PATH}" ) +-MESSAGE( STATUS "BUILD_UTILS= ${BUILD_UTILS}" ) +-MESSAGE( STATUS "BUILD_TESTS= ${BUILD_TESTS}" ) +-MESSAGE( STATUS "OPENCV_DIR= ${OpenCV_DIR} VERSION=${OpenCV_VERSION}" ) +- +-MESSAGE( STATUS "USE_CONTRIB= ${USE_CONTRIB}" ) +- +-MESSAGE( STATUS ) +-MESSAGE( STATUS "OpenCV_LIB_DIR=${OpenCV_LIB_DIR}") +-MESSAGE( STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}") +- +-MESSAGE( STATUS ) +-MESSAGE( STATUS ) +-MESSAGE( STATUS "Change a value with: cmake -D=" ) +-MESSAGE( STATUS ) +diff --git a/Lib/CMakeLists.txt b/Lib/CMakeLists.txt +new file mode 100644 +index 0000000..e56077b +--- /dev/null ++++ b/Lib/CMakeLists.txt +@@ -0,0 +1,99 @@ ++cmake_minimum_required(VERSION 3.10) ++ ++find_package(OpenCV REQUIRED) ++ ++find_package(OpenMP REQUIRED) ++ ++include(${CMAKE_SOURCE_DIR}/cmake/instructionSet.cmake) ++ ++if(BUILD_SHARED_LIBS) ++ add_library(DBow3 SHARED) ++ ++ target_compile_definitions(DBow3 ++ PUBLIC ++ DBOW_API ++ ) ++ ++else() ++ add_library(DBow3 STATIC) ++endif() ++ ++add_library(DBow3::DBow3 ALIAS DBow3) ++ ++target_sources(DBow3 ++ PRIVATE ++ src/BowVector.cpp ++ src/Database.cpp ++ src/DescManip.cpp ++ src/FeatureVector.cpp ++ src/QueryResults.cpp ++ src/ScoringObject.cpp ++ src/Vocabulary.cpp ++ src/quicklz.c ++) ++ ++target_include_directories(DBow3 ++ PUBLIC ++ $ ++ $ ++) ++ ++target_link_libraries(DBow3 ++ PUBLIC ++ OpenMP::OpenMP_CXX ++) ++ ++if(USE_OPENCV_CONTRIB) ++target_link_libraries(DBow3 ++ PUBLIC ++ ${OpenCV_LIBS} ++) ++ ++target_include_directories(DBow3 ++ PUBLIC ++ ${OpenCV_INCLUDE_DIR} ++) ++endif() ++ ++if(USE_SIMD) ++ target_link_libraries(DBow3 ++ PRIVATE ++ SIMD::SSE4.1 ++ ) ++endif() ++ ++target_compile_definitions(DBow3 ++ PUBLIC ++ NOMINMAX ++ _USE_MATH_DEFINES ++) ++ ++target_compile_features(DBow3 ++ PRIVATE ++ cxx_std_14 ++) ++ ++ ++install(TARGETS DBow3 EXPORT DBow3Targets ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++ RUNTIME DESTINATION bin ++ INCLUDES DESTINATION include ++) ++ ++install (DIRECTORY include/ DESTINATION include) ++ ++install(EXPORT DBow3Targets ++ FILE DBow3Targets.cmake ++ NAMESPACE DBow3:: ++ DESTINATION cmake/DBow3 ++) ++ ++include(CMakePackageConfigHelpers) ++ ++write_basic_package_version_file(DBow3ConfigVersion.cmake ++ COMPATIBILITY SameMajorVersion ++) ++ ++install(FILES DBow3Config.cmake ${CMAKE_CURRENT_BINARY_DIR}/DBow3ConfigVersion.cmake ++ DESTINATION cmake/DBow3) +\ No newline at end of file +diff --git a/Lib/DBow3Config.cmake b/Lib/DBow3Config.cmake +new file mode 100644 +index 0000000..9720a14 +--- /dev/null ++++ b/Lib/DBow3Config.cmake +@@ -0,0 +1,4 @@ ++include(CMakeFindDependencyMacro) ++find_dependency(OpenCV) ++find_dependency(OpenMP) ++include("${CMAKE_CURRENT_LIST_DIR}/FbowTargets.cmake") +\ No newline at end of file +diff --git a/src/BowVector.h b/Lib/include/DBow3/BowVector.h +similarity index 99% +rename from src/BowVector.h +rename to Lib/include/DBow3/BowVector.h +index d8c17e0..cdbf517 100644 +--- a/src/BowVector.h ++++ b/Lib/include/DBow3/BowVector.h +@@ -12,6 +12,7 @@ + + #include + #include ++#include + #include "exports.h" + #if _WIN32 + #include +diff --git a/src/DBoW3.h b/Lib/include/DBow3/DBoW3.h +similarity index 100% +rename from src/DBoW3.h +rename to Lib/include/DBow3/DBoW3.h +diff --git a/src/Database.h b/Lib/include/DBow3/Database.h +similarity index 100% +rename from src/Database.h +rename to Lib/include/DBow3/Database.h +diff --git a/src/DescManip.h b/Lib/include/DBow3/DescManip.h +similarity index 100% +rename from src/DescManip.h +rename to Lib/include/DBow3/DescManip.h +diff --git a/src/FeatureVector.h b/Lib/include/DBow3/FeatureVector.h +similarity index 100% +rename from src/FeatureVector.h +rename to Lib/include/DBow3/FeatureVector.h +diff --git a/src/QueryResults.h b/Lib/include/DBow3/QueryResults.h +similarity index 100% +rename from src/QueryResults.h +rename to Lib/include/DBow3/QueryResults.h +diff --git a/src/ScoringObject.h b/Lib/include/DBow3/ScoringObject.h +similarity index 100% +rename from src/ScoringObject.h +rename to Lib/include/DBow3/ScoringObject.h +diff --git a/src/Vocabulary.h b/Lib/include/DBow3/Vocabulary.h +similarity index 100% +rename from src/Vocabulary.h +rename to Lib/include/DBow3/Vocabulary.h +diff --git a/src/exports.h b/Lib/include/DBow3/exports.h +similarity index 78% +rename from src/exports.h +rename to Lib/include/DBow3/exports.h +index c324953..a31b317 100644 +--- a/src/exports.h ++++ b/Lib/include/DBow3/exports.h +@@ -35,17 +35,15 @@ or implied, of Rafael Muñoz Salinas. + #define _CRT_SECURE_NO_DEPRECATE /* to avoid multiple Visual Studio 2005 warnings */ + #endif + +-#if (defined WIN32 || defined _WIN32 || defined WINCE) && defined DBOW_DSO_EXPORTS +- #define DBOW_API __declspec(dllexport) +- #pragma warning ( disable : 4251 ) //disable warning to templates with dll linkage. +- #pragma warning ( disable : 4290 ) //disable warning due to exception specifications. +- #pragma warning ( disable : 4996 ) //disable warning regarding unsafe vsprintf. +- #pragma warning ( disable : 4244 ) //disable warning convesions with lost of data. +- ++#ifdef _WIN32 ++# ifdef DBOW_API ++# define DBOW_API __declspec(dllexport) ++# else ++# define DBOW_API __declspec(dllimport) ++# endif + #else +- #define DBOW_API ++# define DBOW_API + #endif + +- + #define DBOW_VERSION "3.0.0" + #endif +diff --git a/src/quicklz.h b/Lib/include/DBow3/quicklz.h +similarity index 100% +rename from src/quicklz.h +rename to Lib/include/DBow3/quicklz.h +diff --git a/src/timers.h b/Lib/include/DBow3/timers.h +similarity index 100% +rename from src/timers.h +rename to Lib/include/DBow3/timers.h +diff --git a/src/BowVector.cpp b/Lib/src/BowVector.cpp +similarity index 99% +rename from src/BowVector.cpp +rename to Lib/src/BowVector.cpp +index d132213..f61d421 100644 +--- a/src/BowVector.cpp ++++ b/Lib/src/BowVector.cpp +@@ -13,7 +13,7 @@ + #include + #include + +-#include "BowVector.h" ++#include "DBow3/BowVector.h" + + namespace DBoW3 { + +diff --git a/src/Database.cpp b/Lib/src/Database.cpp +similarity index 99% +rename from src/Database.cpp +rename to Lib/src/Database.cpp +index d8a1b81..25610a0 100644 +--- a/src/Database.cpp ++++ b/Lib/src/Database.cpp +@@ -1,4 +1,4 @@ +-#include "Database.h" ++#include "DBow3/Database.h" + + namespace DBoW3{ + +diff --git a/src/DescManip.cpp b/Lib/src/DescManip.cpp +similarity index 96% +rename from src/DescManip.cpp +rename to Lib/src/DescManip.cpp +index d6331af..430ce2b 100644 +--- a/src/DescManip.cpp ++++ b/Lib/src/DescManip.cpp +@@ -1,273 +1,273 @@ +-/** +- * File: DescManip.cpp +- * Date: June 2012 +- * Author: Dorian Galvez-Lopez +- * Description: functions for ORB descriptors +- * License: see the LICENSE.txt file +- * +- */ +- +-#include +-#include +-#include +-#include +-#include +-#include +- +-#include "DescManip.h" +- +-using namespace std; +- +-namespace DBoW3 { +- +-// -------------------------------------------------------------------------- +- +-void DescManip::meanValue(const std::vector &descriptors, +- cv::Mat &mean) +-{ +- +- if(descriptors.empty()) return; +- +- if(descriptors.size() == 1) +- { +- mean = descriptors[0].clone(); +- return; +- } +- //binary descriptor +- if (descriptors[0].type()==CV_8U ){ +- //determine number of bytes of the binary descriptor +- int L= getDescSizeBytes( descriptors[0]); +- vector sum( L * 8, 0); +- +- for(size_t i = 0; i < descriptors.size(); ++i) +- { +- const cv::Mat &d = descriptors[i]; +- const unsigned char *p = d.ptr(); +- +- for(int j = 0; j < d.cols; ++j, ++p) +- { +- if(*p & (1 << 7)) ++sum[ j*8 ]; +- if(*p & (1 << 6)) ++sum[ j*8 + 1 ]; +- if(*p & (1 << 5)) ++sum[ j*8 + 2 ]; +- if(*p & (1 << 4)) ++sum[ j*8 + 3 ]; +- if(*p & (1 << 3)) ++sum[ j*8 + 4 ]; +- if(*p & (1 << 2)) ++sum[ j*8 + 5 ]; +- if(*p & (1 << 1)) ++sum[ j*8 + 6 ]; +- if(*p & (1)) ++sum[ j*8 + 7 ]; +- } +- } +- +- mean = cv::Mat::zeros(1, L, CV_8U); +- unsigned char *p = mean.ptr(); +- +- const int N2 = (int)descriptors.size() / 2 + descriptors.size() % 2; +- for(size_t i = 0; i < sum.size(); ++i) +- { +- if(sum[i] >= N2) +- { +- // set bit +- *p |= 1 << (7 - (i % 8)); +- } +- +- if(i % 8 == 7) ++p; +- } +- } +- //non binary descriptor +- else{ +- assert(descriptors[0].type()==CV_32F );//ensure it is float +- +- mean.create(1, descriptors[0].cols,descriptors[0].type()); +- mean.setTo(cv::Scalar::all(0)); +- float inv_s =1./double( descriptors.size()); +- for(size_t i=0;i(); // a & b are actually CV_8U +- pb = b.ptr(); +- +- uint64_t v, ret = 0; +- for(size_t i = 0; i < a.cols / sizeof(uint64_t); ++i, ++pa, ++pb) +- { +- v = *pa ^ *pb; +- v = v - ((v >> 1) & (uint64_t)~(uint64_t)0/3); +- v = (v & (uint64_t)~(uint64_t)0/15*3) + ((v >> 2) & +- (uint64_t)~(uint64_t)0/15*3); +- v = (v + (v >> 4)) & (uint64_t)~(uint64_t)0/255*15; +- ret += (uint64_t)(v * ((uint64_t)~(uint64_t)0/255)) >> +- (sizeof(uint64_t) - 1) * CHAR_BIT; +- } +- +- return ret; +- } +- else{ +- double sqd = 0.; +- assert(a.type()==CV_32F); +- assert(a.rows==1); +- const float *a_ptr=a.ptr(0); +- const float *b_ptr=b.ptr(0); +- for(int i = 0; i < a.cols; i ++) +- sqd += (a_ptr[i ] - b_ptr[i ])*(a_ptr[i ] - b_ptr[i ]); +- return sqd; +- } +-} +- +- +- +- +-// -------------------------------------------------------------------------- +- +-std::string DescManip::toString(const cv::Mat &a) +-{ +- stringstream ss; +- //introduce a magic value to distinguish from DBOw2 +- ss<<"dbw3 "; +- //save size and type +- +- +- ss <(); +- for(int i = 0; i < a.cols; ++i, ++p) +- ss << (int)*p << " "; +- }else{ +- +- const float *p = a.ptr(); +- for(int i = 0; i < a.cols; ++i, ++p) +- ss << *p << " "; +- +- } +- +- return ss.str(); +-} +- +-// -------------------------------------------------------------------------- +- +-void DescManip::fromString(cv::Mat &a, const std::string &s) +-{ +- +- //check if the dbow3 is present +- string ss_aux;ss_aux.reserve(10); +- for(size_t i=0;i<10 && i data;data.reserve(100); +- while( ss>>val) data.push_back(val); +- //copy to a +- a.create(1,data.size(),CV_8UC1); +- memcpy(a.ptr(0),&data[0],data.size()); +- } +- else { +- char szSign[10]; +- int type,cols; +- stringstream ss(s); +- ss >> szSign >> type >> cols; +- a.create(1, cols, type); +- if(type==CV_8UC1){ +- unsigned char *p = a.ptr(); +- int n; +- for(int i = 0; i < a.cols; ++i, ++p) +- if ( ss >> n) *p = (unsigned char)n; +- } +- else{ +- float *p = a.ptr(); +- for(int i = 0; i < a.cols; ++i, ++p) +- if ( !(ss >> *p))cerr<<"Error reading. Unexpected EOF. DescManip::fromString"< &descriptors, +- cv::Mat &mat) +-{ +- if(descriptors.empty()) +- { +- mat.release(); +- return; +- } +- +- if(descriptors[0].type()==CV_8UC1){ +- +- const size_t N = descriptors.size(); +- int L=getDescSizeBytes(descriptors[0]); +- mat.create(N, L*8, CV_32F); +- float *p = mat.ptr(); +- +- for(size_t i = 0; i < N; ++i) +- { +- const int C = descriptors[i].cols; +- const unsigned char *desc = descriptors[i].ptr(); +- +- for(int j = 0; j < C; ++j, p += 8) +- { +- p[0] = (desc[j] & (1 << 7) ? 1 : 0); +- p[1] = (desc[j] & (1 << 6) ? 1 : 0); +- p[2] = (desc[j] & (1 << 5) ? 1 : 0); +- p[3] = (desc[j] & (1 << 4) ? 1 : 0); +- p[4] = (desc[j] & (1 << 3) ? 1 : 0); +- p[5] = (desc[j] & (1 << 2) ? 1 : 0); +- p[6] = (desc[j] & (1 << 1) ? 1 : 0); +- p[7] = desc[j] & (1); +- } +- } +- } +- else{ +- assert(descriptors[0].type()==CV_32F); +- const int N = descriptors.size(); +- int L=descriptors[0].cols; +- mat.create(N, L, CV_32F); +- for(int i = 0; i < N; ++i) +- memcpy(mat.ptr(i),descriptors[i].ptr(0),sizeof(float)*L); +- } +-} +- +-void DescManip::toStream(const cv::Mat &m,std::ostream &str){ +- assert(m.rows==1 || m.isContinuous()); +- int type=m.type(); +- int cols=m.cols; +- int rows=m.rows; +- str.write((char*)&cols,sizeof(cols)); +- str.write((char*)&rows,sizeof(rows)); +- str.write((char*)&type,sizeof(type)); +- str.write((char*)m.ptr(0),m.elemSize()*m.cols); +-} +- +-void DescManip::fromStream(cv::Mat &m,std::istream &str){ +- int type,cols,rows; +- str.read((char*)&cols,sizeof(cols)); +- str.read((char*)&rows,sizeof(rows)); +- str.read((char*)&type,sizeof(type)); +- m.create(rows,cols,type); +- str.read((char*)m.ptr(0),m.elemSize()*m.cols); +-} +- +- +-// -------------------------------------------------------------------------- +- +-} // namespace DBoW3 +- ++/** ++ * File: DescManip.cpp ++ * Date: June 2012 ++ * Author: Dorian Galvez-Lopez ++ * Description: functions for ORB descriptors ++ * License: see the LICENSE.txt file ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "DBow3/DescManip.h" ++ ++using namespace std; ++ ++namespace DBoW3 { ++ ++// -------------------------------------------------------------------------- ++ ++void DescManip::meanValue(const std::vector &descriptors, ++ cv::Mat &mean) ++{ ++ ++ if(descriptors.empty()) return; ++ ++ if(descriptors.size() == 1) ++ { ++ mean = descriptors[0].clone(); ++ return; ++ } ++ //binary descriptor ++ if (descriptors[0].type()==CV_8U ){ ++ //determine number of bytes of the binary descriptor ++ int L= getDescSizeBytes( descriptors[0]); ++ vector sum( L * 8, 0); ++ ++ for(size_t i = 0; i < descriptors.size(); ++i) ++ { ++ const cv::Mat &d = descriptors[i]; ++ const unsigned char *p = d.ptr(); ++ ++ for(int j = 0; j < d.cols; ++j, ++p) ++ { ++ if(*p & (1 << 7)) ++sum[ j*8 ]; ++ if(*p & (1 << 6)) ++sum[ j*8 + 1 ]; ++ if(*p & (1 << 5)) ++sum[ j*8 + 2 ]; ++ if(*p & (1 << 4)) ++sum[ j*8 + 3 ]; ++ if(*p & (1 << 3)) ++sum[ j*8 + 4 ]; ++ if(*p & (1 << 2)) ++sum[ j*8 + 5 ]; ++ if(*p & (1 << 1)) ++sum[ j*8 + 6 ]; ++ if(*p & (1)) ++sum[ j*8 + 7 ]; ++ } ++ } ++ ++ mean = cv::Mat::zeros(1, L, CV_8U); ++ unsigned char *p = mean.ptr(); ++ ++ const int N2 = (int)descriptors.size() / 2 + descriptors.size() % 2; ++ for(size_t i = 0; i < sum.size(); ++i) ++ { ++ if(sum[i] >= N2) ++ { ++ // set bit ++ *p |= 1 << (7 - (i % 8)); ++ } ++ ++ if(i % 8 == 7) ++p; ++ } ++ } ++ //non binary descriptor ++ else{ ++ assert(descriptors[0].type()==CV_32F );//ensure it is float ++ ++ mean.create(1, descriptors[0].cols,descriptors[0].type()); ++ mean.setTo(cv::Scalar::all(0)); ++ float inv_s =1./double( descriptors.size()); ++ for(size_t i=0;i(); // a & b are actually CV_8U ++ pb = b.ptr(); ++ ++ uint64_t v, ret = 0; ++ for(size_t i = 0; i < a.cols / sizeof(uint64_t); ++i, ++pa, ++pb) ++ { ++ v = *pa ^ *pb; ++ v = v - ((v >> 1) & (uint64_t)~(uint64_t)0/3); ++ v = (v & (uint64_t)~(uint64_t)0/15*3) + ((v >> 2) & ++ (uint64_t)~(uint64_t)0/15*3); ++ v = (v + (v >> 4)) & (uint64_t)~(uint64_t)0/255*15; ++ ret += (uint64_t)(v * ((uint64_t)~(uint64_t)0/255)) >> ++ (sizeof(uint64_t) - 1) * CHAR_BIT; ++ } ++ ++ return ret; ++ } ++ else{ ++ double sqd = 0.; ++ assert(a.type()==CV_32F); ++ assert(a.rows==1); ++ const float *a_ptr=a.ptr(0); ++ const float *b_ptr=b.ptr(0); ++ for(int i = 0; i < a.cols; i ++) ++ sqd += (a_ptr[i ] - b_ptr[i ])*(a_ptr[i ] - b_ptr[i ]); ++ return sqd; ++ } ++} ++ ++ ++ ++ ++// -------------------------------------------------------------------------- ++ ++std::string DescManip::toString(const cv::Mat &a) ++{ ++ stringstream ss; ++ //introduce a magic value to distinguish from DBOw2 ++ ss<<"dbw3 "; ++ //save size and type ++ ++ ++ ss <(); ++ for(int i = 0; i < a.cols; ++i, ++p) ++ ss << (int)*p << " "; ++ }else{ ++ ++ const float *p = a.ptr(); ++ for(int i = 0; i < a.cols; ++i, ++p) ++ ss << *p << " "; ++ ++ } ++ ++ return ss.str(); ++} ++ ++// -------------------------------------------------------------------------- ++ ++void DescManip::fromString(cv::Mat &a, const std::string &s) ++{ ++ ++ //check if the dbow3 is present ++ string ss_aux;ss_aux.reserve(10); ++ for(size_t i=0;i<10 && i data;data.reserve(100); ++ while( ss>>val) data.push_back(val); ++ //copy to a ++ a.create(1,data.size(),CV_8UC1); ++ memcpy(a.ptr(0),&data[0],data.size()); ++ } ++ else { ++ char szSign[10]; ++ int type,cols; ++ stringstream ss(s); ++ ss >> szSign >> type >> cols; ++ a.create(1, cols, type); ++ if(type==CV_8UC1){ ++ unsigned char *p = a.ptr(); ++ int n; ++ for(int i = 0; i < a.cols; ++i, ++p) ++ if ( ss >> n) *p = (unsigned char)n; ++ } ++ else{ ++ float *p = a.ptr(); ++ for(int i = 0; i < a.cols; ++i, ++p) ++ if ( !(ss >> *p))cerr<<"Error reading. Unexpected EOF. DescManip::fromString"< &descriptors, ++ cv::Mat &mat) ++{ ++ if(descriptors.empty()) ++ { ++ mat.release(); ++ return; ++ } ++ ++ if(descriptors[0].type()==CV_8UC1){ ++ ++ const size_t N = descriptors.size(); ++ int L=getDescSizeBytes(descriptors[0]); ++ mat.create(N, L*8, CV_32F); ++ float *p = mat.ptr(); ++ ++ for(size_t i = 0; i < N; ++i) ++ { ++ const int C = descriptors[i].cols; ++ const unsigned char *desc = descriptors[i].ptr(); ++ ++ for(int j = 0; j < C; ++j, p += 8) ++ { ++ p[0] = (desc[j] & (1 << 7) ? 1 : 0); ++ p[1] = (desc[j] & (1 << 6) ? 1 : 0); ++ p[2] = (desc[j] & (1 << 5) ? 1 : 0); ++ p[3] = (desc[j] & (1 << 4) ? 1 : 0); ++ p[4] = (desc[j] & (1 << 3) ? 1 : 0); ++ p[5] = (desc[j] & (1 << 2) ? 1 : 0); ++ p[6] = (desc[j] & (1 << 1) ? 1 : 0); ++ p[7] = desc[j] & (1); ++ } ++ } ++ } ++ else{ ++ assert(descriptors[0].type()==CV_32F); ++ const int N = descriptors.size(); ++ int L=descriptors[0].cols; ++ mat.create(N, L, CV_32F); ++ for(int i = 0; i < N; ++i) ++ memcpy(mat.ptr(i),descriptors[i].ptr(0),sizeof(float)*L); ++ } ++} ++ ++void DescManip::toStream(const cv::Mat &m,std::ostream &str){ ++ assert(m.rows==1 || m.isContinuous()); ++ int type=m.type(); ++ int cols=m.cols; ++ int rows=m.rows; ++ str.write((char*)&cols,sizeof(cols)); ++ str.write((char*)&rows,sizeof(rows)); ++ str.write((char*)&type,sizeof(type)); ++ str.write((char*)m.ptr(0),m.elemSize()*m.cols); ++} ++ ++void DescManip::fromStream(cv::Mat &m,std::istream &str){ ++ int type,cols,rows; ++ str.read((char*)&cols,sizeof(cols)); ++ str.read((char*)&rows,sizeof(rows)); ++ str.read((char*)&type,sizeof(type)); ++ m.create(rows,cols,type); ++ str.read((char*)m.ptr(0),m.elemSize()*m.cols); ++} ++ ++ ++// -------------------------------------------------------------------------- ++ ++} // namespace DBoW3 ++ +diff --git a/src/FeatureVector.cpp b/Lib/src/FeatureVector.cpp +similarity index 98% +rename from src/FeatureVector.cpp +rename to Lib/src/FeatureVector.cpp +index 880eab1..a9cd792 100644 +--- a/src/FeatureVector.cpp ++++ b/Lib/src/FeatureVector.cpp +@@ -7,7 +7,7 @@ + * + */ + +-#include "FeatureVector.h" ++#include "DBow3/FeatureVector.h" + #include + #include + #include +diff --git a/src/QueryResults.cpp b/Lib/src/QueryResults.cpp +similarity index 97% +rename from src/QueryResults.cpp +rename to Lib/src/QueryResults.cpp +index 7062400..b852979 100644 +--- a/src/QueryResults.cpp ++++ b/Lib/src/QueryResults.cpp +@@ -9,7 +9,7 @@ + + #include + #include +-#include "QueryResults.h" ++#include "DBow3/QueryResults.h" + + using namespace std; + +diff --git a/src/ScoringObject.cpp b/Lib/src/ScoringObject.cpp +similarity index 99% +rename from src/ScoringObject.cpp +rename to Lib/src/ScoringObject.cpp +index 7cf0812..adde8e9 100644 +--- a/src/ScoringObject.cpp ++++ b/Lib/src/ScoringObject.cpp +@@ -8,8 +8,8 @@ + */ + + #include +-#include "Vocabulary.h" +-#include "BowVector.h" ++#include "DBow3/Vocabulary.h" ++#include "DBow3/BowVector.h" + + using namespace DBoW3; + +diff --git a/src/Vocabulary.cpp b/Lib/src/Vocabulary.cpp +similarity index 99% +rename from src/Vocabulary.cpp +rename to Lib/src/Vocabulary.cpp +index 9f0eff3..6ccbbea 100644 +--- a/src/Vocabulary.cpp ++++ b/Lib/src/Vocabulary.cpp +@@ -1,8 +1,8 @@ +-#include "Vocabulary.h" +-#include "DescManip.h" +-#include "quicklz.h" ++#include "DBow3/Vocabulary.h" ++#include "DBow3/DescManip.h" ++#include "DBow3/quicklz.h" + #include +-#include "timers.h" ++#include "DBow3/timers.h" + namespace DBoW3{ + // -------------------------------------------------------------------------- + +diff --git a/src/quicklz.c b/Lib/src/quicklz.c +similarity index 99% +rename from src/quicklz.c +rename to Lib/src/quicklz.c +index 3742129..bd3cb11 100644 +--- a/src/quicklz.c ++++ b/Lib/src/quicklz.c +@@ -9,7 +9,7 @@ + + // 1.5.0 final + +-#include "quicklz.h" ++#include "DBow3/quicklz.h" + + #if QLZ_VERSION_MAJOR != 1 || QLZ_VERSION_MINOR != 5 || QLZ_VERSION_REVISION != 0 + #error quicklz.c and quicklz.h have different versions +diff --git a/cmake/instructionSet.cmake b/cmake/instructionSet.cmake +new file mode 100644 +index 0000000..d0febeb +--- /dev/null ++++ b/cmake/instructionSet.cmake +@@ -0,0 +1,13 @@ ++add_library( ++ SSE4.1 ++ INTERFACE ++) ++ ++add_library(SIMD::SSE4.1 ALIAS SSE4.1) ++ ++target_compile_options( ++ SSE4.1 ++ INTERFACE ++ $<$:-msse4.1;-march=native> ++ $<$:/arch:AVX2> ++) +diff --git a/cmake_uninstall.cmake.in b/cmake_uninstall.cmake.in +deleted file mode 100644 +index 81482da..0000000 +--- a/cmake_uninstall.cmake.in ++++ /dev/null +@@ -1,28 +0,0 @@ +-# ----------------------------------------------- +-# File that provides "make uninstall" target +-# We use the file 'install_manifest.txt' +-# ----------------------------------------------- +-IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") +- MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"") +-ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") +- +-FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files) +-STRING(REGEX REPLACE "\n" ";" files "${files}") +-FOREACH(file ${files}) +- MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"") +-# IF(EXISTS "$ENV{DESTDIR}${file}") +-# EXEC_PROGRAM( +-# "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" +-# OUTPUT_VARIABLE rm_out +-# RETURN_VALUE rm_retval +-# ) +- EXECUTE_PROCESS(COMMAND rm $ENV{DESTDIR}${file}) +-# IF(NOT "${rm_retval}" STREQUAL 0) +-# MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"") +-# ENDIF(NOT "${rm_retval}" STREQUAL 0) +-# ELSE(EXISTS "$ENV{DESTDIR}${file}") +-# MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.") +-# ENDIF(EXISTS "$ENV{DESTDIR}${file}") +-ENDFOREACH(file) +- +- +diff --git a/config.cmake.in b/config.cmake.in +deleted file mode 100644 +index 9d15feb..0000000 +--- a/config.cmake.in ++++ /dev/null +@@ -1,36 +0,0 @@ +-# =================================================================================== +-# @PROJECT_NAME@ CMake configuration file +-# +-# ** File generated automatically, do not modify ** +-# +-# Usage from an external project: +-# In your CMakeLists.txt, add these lines: +-# +-# FIND_PACKAGE(@PROJECT_NAME@ REQUIRED ) +-# TARGET_LINK_LIBRARIES(MY_TARGET_NAME ${@PROJECT_NAME@_LIBS}) +-# +-# This file will define the following variables: +-# - @PROJECT_NAME@_LIBS : The list of libraries to links against. +-# - @PROJECT_NAME@_LIB_DIR : The directory where lib files are. Calling LINK_DIRECTORIES +-# with this path is NOT needed. +-# - @PROJECT_NAME@_VERSION : The version of this PROJECT_NAME build. Example: "1.2.0" +-# - @PROJECT_NAME@_VERSION_MAJOR : Major version part of VERSION. Example: "1" +-# - @PROJECT_NAME@_VERSION_MINOR : Minor version part of VERSION. Example: "2" +-# - @PROJECT_NAME@_VERSION_PATCH : Patch version part of VERSION. Example: "0" +-# +-# =================================================================================== +-INCLUDE_DIRECTORIES("@CMAKE_INSTALL_PREFIX@/include") +-SET(@PROJECT_NAME@_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/include") +- +-LINK_DIRECTORIES("@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@") +-SET(@PROJECT_NAME@_LIB_DIR "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@") +- +-SET(@PROJECT_NAME@_LIBS @REQUIRED_LIBRARIES@ @PROJECT_NAME@@PROJECT_DLLVERSION@) +-SET(@PROJECT_NAME@_LIBRARIES @REQUIRED_LIBRARIES@ @PROJECT_NAME@@PROJECT_DLLVERSION@) +- +-SET(@PROJECT_NAME@_FOUND YES) +-SET(@PROJECT_NAME@_FOUND "YES") +-SET(@PROJECT_NAME@_VERSION @PROJECT_VERSION@) +-SET(@PROJECT_NAME@_VERSION_MAJOR @PROJECT_VERSION_MAJOR@) +-SET(@PROJECT_NAME@_VERSION_MINOR @PROJECT_VERSION_MINOR@) +-SET(@PROJECT_NAME@_VERSION_PATCH @PROJECT_VERSION_PATCH@) +diff --git a/utils/CMakeLists.txt b/examples/CMakeLists.txt +similarity index 100% +rename from utils/CMakeLists.txt +rename to examples/CMakeLists.txt +diff --git a/utils/create_voc_step0.cpp b/examples/create_voc_step0.cpp +similarity index 97% +rename from utils/create_voc_step0.cpp +rename to examples/create_voc_step0.cpp +index 4fd78f6..c48a3c4 100644 +--- a/utils/create_voc_step0.cpp ++++ b/examples/create_voc_step0.cpp +@@ -1,126 +1,126 @@ +- +-//First step of creating a vocabulary is extracting features from a set of images. We save them to a file for next step +-#include +-#include +- +-// DBoW3 +-#include "DBoW3.h" +- +-// OpenCV +-#include +-#include +-#include +-#ifdef USE_CONTRIB +-#include +-#include +-#endif +-#include "DescManip.h" +- +-using namespace DBoW3; +-using namespace std; +- +- +-//command line parser +-class CmdLineParser{int argc; char **argv; public: CmdLineParser(int _argc,char **_argv):argc(_argc),argv(_argv){} bool operator[] ( string param ) {int idx=-1; for ( int i=0; i readImagePaths(int argc,char **argv,int start){ +- vector paths; +- for(int i=start;i loadFeatures( std::vector path_to_images,string descriptor="") throw (std::exception){ +- //select detector +- cv::Ptr fdetector; +- if (descriptor=="orb") fdetector=cv::ORB::create(); +- else if (descriptor=="brisk") fdetector=cv::BRISK::create(); +-#ifdef OPENCV_VERSION_3 +- else if (descriptor=="akaze") fdetector=cv::AKAZE::create(); +-#endif +-#ifdef USE_CONTRIB +- else if(descriptor=="surf" ) fdetector=cv::xfeatures2d::SURF::create(400, 4, 2, EXTENDED_SURF); +-#endif +- +- else throw std::runtime_error("Invalid descriptor"); +- assert(!descriptor.empty()); +- vector features; +- +- +- cout << "Extracting features..." << endl; +- for(size_t i = 0; i < path_to_images.size(); ++i) +- { +- vector keypoints; +- cv::Mat descriptors; +- cout<<"reading image: "<detectAndCompute(image, cv::Mat(), keypoints, descriptors); +- features.push_back(descriptors); +- cout<<"done detecting features"< &features){ +- +- //test it is not created +- std::ifstream ifile(filename); +- if (ifile.is_open()){cerr<<"ERROR::: Output File "<(0),f.total()*f.elemSize()); +- } +-} +- +-// ---------------------------------------------------------------------------- +- +-int main(int argc,char **argv) +-{ +- +- try{ +- CmdLineParser cml(argc,argv); +- if (cml["-h"] || argc==1){ +- cerr<<"Usage: descriptor_name output image0 image1 ... \n\t descriptors:brisk,surf,orb(default),akaze(only if using opencv 3)"< features= loadFeatures(images,descriptor); +- +- //save features to file +- saveToFile(argv[2],features); +- +- }catch(std::exception &ex){ +- cerr< ++#include ++ ++// DBoW3 ++#include "DBoW3.h" ++ ++// OpenCV ++#include ++#include ++#include ++#ifdef USE_CONTRIB ++#include ++#include ++#endif ++#include "DescManip.h" ++ ++using namespace DBoW3; ++using namespace std; ++ ++ ++//command line parser ++class CmdLineParser{int argc; char **argv; public: CmdLineParser(int _argc,char **_argv):argc(_argc),argv(_argv){} bool operator[] ( string param ) {int idx=-1; for ( int i=0; i readImagePaths(int argc,char **argv,int start){ ++ vector paths; ++ for(int i=start;i loadFeatures( std::vector path_to_images,string descriptor="") throw (std::exception){ ++ //select detector ++ cv::Ptr fdetector; ++ if (descriptor=="orb") fdetector=cv::ORB::create(); ++ else if (descriptor=="brisk") fdetector=cv::BRISK::create(); ++#ifdef OPENCV_VERSION_3 ++ else if (descriptor=="akaze") fdetector=cv::AKAZE::create(); ++#endif ++#ifdef USE_CONTRIB ++ else if(descriptor=="surf" ) fdetector=cv::xfeatures2d::SURF::create(400, 4, 2, EXTENDED_SURF); ++#endif ++ ++ else throw std::runtime_error("Invalid descriptor"); ++ assert(!descriptor.empty()); ++ vector features; ++ ++ ++ cout << "Extracting features..." << endl; ++ for(size_t i = 0; i < path_to_images.size(); ++i) ++ { ++ vector keypoints; ++ cv::Mat descriptors; ++ cout<<"reading image: "<detectAndCompute(image, cv::Mat(), keypoints, descriptors); ++ features.push_back(descriptors); ++ cout<<"done detecting features"< &features){ ++ ++ //test it is not created ++ std::ifstream ifile(filename); ++ if (ifile.is_open()){cerr<<"ERROR::: Output File "<(0),f.total()*f.elemSize()); ++ } ++} ++ ++// ---------------------------------------------------------------------------- ++ ++int main(int argc,char **argv) ++{ ++ ++ try{ ++ CmdLineParser cml(argc,argv); ++ if (cml["-h"] || argc==1){ ++ cerr<<"Usage: descriptor_name output image0 image1 ... \n\t descriptors:brisk,surf,orb(default),akaze(only if using opencv 3)"< features= loadFeatures(images,descriptor); ++ ++ //save features to file ++ saveToFile(argv[2],features); ++ ++ }catch(std::exception &ex){ ++ cerr< +-#include +- +-// DBoW3 +-#include "DBoW3.h" +- +-// OpenCV +-#include +-using namespace DBoW3; +-using namespace std; +- +-//command line parser +-class CmdLineParser{int argc; char **argv; public: CmdLineParser(int _argc,char **_argv):argc(_argc),argv(_argv){} bool operator[] ( string param ) {int idx=-1; for ( int i=0; i readFeaturesFromFile(string filename){ +-vector features; +- //test it is not created +- std::ifstream ifile(filename); +- if (!ifile.is_open()){cerr<<"could not open input file"<(0),features[i].total()*features[i].elemSize()); +- } +- return features; +-} +- +-// ---------------------------------------------------------------------------- +- +-int main(int argc,char **argv) +-{ +- +- try{ +- CmdLineParser cml(argc,argv); +- if (cml["-h"] || argc!=3){ +- cerr<<"Usage: features output_voc.yml[.gz]"< ++#include ++ ++// DBoW3 ++#include "DBoW3.h" ++ ++// OpenCV ++#include ++using namespace DBoW3; ++using namespace std; ++ ++//command line parser ++class CmdLineParser{int argc; char **argv; public: CmdLineParser(int _argc,char **_argv):argc(_argc),argv(_argv){} bool operator[] ( string param ) {int idx=-1; for ( int i=0; i readFeaturesFromFile(string filename){ ++vector features; ++ //test it is not created ++ std::ifstream ifile(filename); ++ if (!ifile.is_open()){cerr<<"could not open input file"<(0),features[i].total()*features[i].elemSize()); ++ } ++ return features; ++} ++ ++// ---------------------------------------------------------------------------- ++ ++int main(int argc,char **argv) ++{ ++ ++ try{ ++ CmdLineParser cml(argc,argv); ++ if (cml["-h"] || argc!=3){ ++ cerr<<"Usage: features output_voc.yml[.gz]"< +-#include +- +-// DBoW3 +-#include "DBoW3.h" +- +-// OpenCV +-#include +-#include +-#include +-#ifdef USE_CONTRIB +-#include +-#include +-#endif +-#include "DescManip.h" +- +-using namespace DBoW3; +-using namespace std; +- +- +-//command line parser +-class CmdLineParser{int argc; char **argv; public: CmdLineParser(int _argc,char **_argv):argc(_argc),argv(_argv){} bool operator[] ( string param ) {int idx=-1; for ( int i=0; i readImagePaths(int argc,char **argv,int start){ +- vector paths; +- for(int i=start;i loadFeatures( std::vector path_to_images,string descriptor="") throw (std::exception){ +- //select detector +- cv::Ptr fdetector; +- if (descriptor=="orb") fdetector=cv::ORB::create(); +- else if (descriptor=="brisk") fdetector=cv::BRISK::create(); +-#ifdef OPENCV_VERSION_3 +- else if (descriptor=="akaze") fdetector=cv::AKAZE::create(); +-#endif +-#ifdef USE_CONTRIB +- else if(descriptor=="surf" ) fdetector=cv::xfeatures2d::SURF::create(400, 4, 2, EXTENDED_SURF); +-#endif +- +- else throw std::runtime_error("Invalid descriptor"); +- assert(!descriptor.empty()); +- vector features; +- +- +- cout << "Extracting features..." << endl; +- for(size_t i = 0; i < path_to_images.size(); ++i) +- { +- vector keypoints; +- cv::Mat descriptors; +- cout<<"reading image: "<detectAndCompute(image, cv::Mat(), keypoints, descriptors); +- features.push_back(descriptors); +- cout<<"done detecting features"< &features) +-{ +- // branching factor and depth levels +- const int k = 9; +- const int L = 3; +- const WeightingType weight = TF_IDF; +- const ScoringType score = L1_NORM; +- +- DBoW3::Vocabulary voc(k, L, weight, score); +- +- cout << "Creating a small " << k << "^" << L << " vocabulary..." << endl; +- voc.create(features); +- cout << "... done!" << endl; +- +- cout << "Vocabulary information: " << endl +- << voc << endl << endl; +- +- // lets do something with this vocabulary +- cout << "Matching images against themselves (0 low, 1 high): " << endl; +- BowVector v1, v2; +- for(size_t i = 0; i < features.size(); i++) +- { +- voc.transform(features[i], v1); +- for(size_t j = 0; j < features.size(); j++) +- { +- voc.transform(features[j], v2); +- +- double score = voc.score(v1, v2); +- cout << "Image " << i << " vs Image " << j << ": " << score << endl; +- } +- } +- +- // save the vocabulary to disk +- cout << endl << "Saving vocabulary..." << endl; +- voc.save("small_voc.yml.gz"); +- cout << "Done" << endl; +-} +- +-////// ---------------------------------------------------------------------------- +- +-void testDatabase(const vector &features) +-{ +- cout << "Creating a small database..." << endl; +- +- // load the vocabulary from disk +- Vocabulary voc("small_voc.yml.gz"); +- +- Database db(voc, false, 0); // false = do not use direct index +- // (so ignore the last param) +- // The direct index is useful if we want to retrieve the features that +- // belong to some vocabulary node. +- // db creates a copy of the vocabulary, we may get rid of "voc" now +- +- // add images to the database +- for(size_t i = 0; i < features.size(); i++) +- db.add(features[i]); +- +- cout << "... done!" << endl; +- +- cout << "Database information: " << endl << db << endl; +- +- // and query the database +- cout << "Querying the database: " << endl; +- +- QueryResults ret; +- for(size_t i = 0; i < features.size(); i++) +- { +- db.query(features[i], ret, 4); +- +- // ret[0] is always the same image in this case, because we added it to the +- // database. ret[1] is the second best match. +- +- cout << "Searching for Image " << i << ". " << ret << endl; +- } +- +- cout << endl; +- +- // we can save the database. The created file includes the vocabulary +- // and the entries added +- cout << "Saving database..." << endl; +- db.save("small_db.yml.gz"); +- cout << "... done!" << endl; +- +- // once saved, we can load it again +- cout << "Retrieving database once again..." << endl; +- Database db2("small_db.yml.gz"); +- cout << "... done! This is: " << endl << db2 << endl; +-} +- +- +-// ---------------------------------------------------------------------------- +- +-int main(int argc,char **argv) +-{ +- +- try{ +- CmdLineParser cml(argc,argv); +- if (cml["-h"] || argc<=2){ +- cerr<<"Usage: descriptor_name image0 image1 ... \n\t descriptors:brisk,surf,orb ,akaze(only if using opencv 3)"< features= loadFeatures(images,descriptor); +- testVocCreation(features); +- +- +- testDatabase(features); +- +- }catch(std::exception &ex){ +- cerr< ++#include ++ ++// DBoW3 ++#include "DBoW3.h" ++ ++// OpenCV ++#include ++#include ++#include ++#ifdef USE_CONTRIB ++#include ++#include ++#endif ++#include "DescManip.h" ++ ++using namespace DBoW3; ++using namespace std; ++ ++ ++//command line parser ++class CmdLineParser{int argc; char **argv; public: CmdLineParser(int _argc,char **_argv):argc(_argc),argv(_argv){} bool operator[] ( string param ) {int idx=-1; for ( int i=0; i readImagePaths(int argc,char **argv,int start){ ++ vector paths; ++ for(int i=start;i loadFeatures( std::vector path_to_images,string descriptor="") throw (std::exception){ ++ //select detector ++ cv::Ptr fdetector; ++ if (descriptor=="orb") fdetector=cv::ORB::create(); ++ else if (descriptor=="brisk") fdetector=cv::BRISK::create(); ++#ifdef OPENCV_VERSION_3 ++ else if (descriptor=="akaze") fdetector=cv::AKAZE::create(); ++#endif ++#ifdef USE_CONTRIB ++ else if(descriptor=="surf" ) fdetector=cv::xfeatures2d::SURF::create(400, 4, 2, EXTENDED_SURF); ++#endif ++ ++ else throw std::runtime_error("Invalid descriptor"); ++ assert(!descriptor.empty()); ++ vector features; ++ ++ ++ cout << "Extracting features..." << endl; ++ for(size_t i = 0; i < path_to_images.size(); ++i) ++ { ++ vector keypoints; ++ cv::Mat descriptors; ++ cout<<"reading image: "<detectAndCompute(image, cv::Mat(), keypoints, descriptors); ++ features.push_back(descriptors); ++ cout<<"done detecting features"< &features) ++{ ++ // branching factor and depth levels ++ const int k = 9; ++ const int L = 3; ++ const WeightingType weight = TF_IDF; ++ const ScoringType score = L1_NORM; ++ ++ DBoW3::Vocabulary voc(k, L, weight, score); ++ ++ cout << "Creating a small " << k << "^" << L << " vocabulary..." << endl; ++ voc.create(features); ++ cout << "... done!" << endl; ++ ++ cout << "Vocabulary information: " << endl ++ << voc << endl << endl; ++ ++ // lets do something with this vocabulary ++ cout << "Matching images against themselves (0 low, 1 high): " << endl; ++ BowVector v1, v2; ++ for(size_t i = 0; i < features.size(); i++) ++ { ++ voc.transform(features[i], v1); ++ for(size_t j = 0; j < features.size(); j++) ++ { ++ voc.transform(features[j], v2); ++ ++ double score = voc.score(v1, v2); ++ cout << "Image " << i << " vs Image " << j << ": " << score << endl; ++ } ++ } ++ ++ // save the vocabulary to disk ++ cout << endl << "Saving vocabulary..." << endl; ++ voc.save("small_voc.yml.gz"); ++ cout << "Done" << endl; ++} ++ ++////// ---------------------------------------------------------------------------- ++ ++void testDatabase(const vector &features) ++{ ++ cout << "Creating a small database..." << endl; ++ ++ // load the vocabulary from disk ++ Vocabulary voc("small_voc.yml.gz"); ++ ++ Database db(voc, false, 0); // false = do not use direct index ++ // (so ignore the last param) ++ // The direct index is useful if we want to retrieve the features that ++ // belong to some vocabulary node. ++ // db creates a copy of the vocabulary, we may get rid of "voc" now ++ ++ // add images to the database ++ for(size_t i = 0; i < features.size(); i++) ++ db.add(features[i]); ++ ++ cout << "... done!" << endl; ++ ++ cout << "Database information: " << endl << db << endl; ++ ++ // and query the database ++ cout << "Querying the database: " << endl; ++ ++ QueryResults ret; ++ for(size_t i = 0; i < features.size(); i++) ++ { ++ db.query(features[i], ret, 4); ++ ++ // ret[0] is always the same image in this case, because we added it to the ++ // database. ret[1] is the second best match. ++ ++ cout << "Searching for Image " << i << ". " << ret << endl; ++ } ++ ++ cout << endl; ++ ++ // we can save the database. The created file includes the vocabulary ++ // and the entries added ++ cout << "Saving database..." << endl; ++ db.save("small_db.yml.gz"); ++ cout << "... done!" << endl; ++ ++ // once saved, we can load it again ++ cout << "Retrieving database once again..." << endl; ++ Database db2("small_db.yml.gz"); ++ cout << "... done! This is: " << endl << db2 << endl; ++} ++ ++ ++// ---------------------------------------------------------------------------- ++ ++int main(int argc,char **argv) ++{ ++ ++ try{ ++ CmdLineParser cml(argc,argv); ++ if (cml["-h"] || argc<=2){ ++ cerr<<"Usage: descriptor_name image0 image1 ... \n\t descriptors:brisk,surf,orb ,akaze(only if using opencv 3)"< features= loadFeatures(images,descriptor); ++ testVocCreation(features); ++ ++ ++ testDatabase(features); ++ ++ }catch(std::exception &ex){ ++ cerr< +Date: Thu, 15 Aug 2019 14:00:28 +0200 +Subject: [PATCH 2/2] Fix DBow3Config.cmake + +--- + Lib/DBow3Config.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Lib/DBow3Config.cmake b/Lib/DBow3Config.cmake +index 9720a14..da63d5e 100644 +--- a/Lib/DBow3Config.cmake ++++ b/Lib/DBow3Config.cmake +@@ -1,4 +1,4 @@ + include(CMakeFindDependencyMacro) + find_dependency(OpenCV) + find_dependency(OpenMP) +-include("${CMAKE_CURRENT_LIST_DIR}/FbowTargets.cmake") +\ No newline at end of file ++include("${CMAKE_CURRENT_LIST_DIR}/DBow3Targets.cmake") +\ No newline at end of file diff --git a/externals/vcpkg/ports/dbow3/portfile.cmake b/externals/vcpkg/ports/dbow3/portfile.cmake new file mode 100755 index 000000000..3b209b0f3 --- /dev/null +++ b/externals/vcpkg/ports/dbow3/portfile.cmake @@ -0,0 +1,32 @@ +#the port produces some empty dlls when building shared libraries, since some components do not export anything, breaking the internal build itself +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rmsalinas/DBow3 + REF master + SHA512 16e6789b77e8b42428d156ae5efa667861fa8ef2e85b54e3dd1d28e6f8dc7d119e973234c77cac82e775080fb9c859640d04159659a7d63941325e13e40b2814 + PATCHES + fix_cmake.patch +) + + + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DUSE_SIMD=ON + -DUSE_OPENCV_CONTRIB=ON + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake/DBow3) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL + ${SOURCE_PATH}/LICENSE.txt + DESTINATION ${CURRENT_PACKAGES_DIR}/share/DBow3 RENAME copyright) +vcpkg_copy_pdbs() \ No newline at end of file diff --git a/externals/vcpkg/ports/dbow3/vcpkg.json b/externals/vcpkg/ports/dbow3/vcpkg.json new file mode 100755 index 000000000..4e213ba47 --- /dev/null +++ b/externals/vcpkg/ports/dbow3/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "dbow3", + "version-string": "1.0.0", + "port-version": 1, + "description": "DBoW3 is an improved version of the DBow2 library, an open source C++ library for indexing and converting images into a bag-of-word representation.", + "dependencies": [ + { + "name": "opencv3", + "features": [ + "contrib" + ] + } + ] +} diff --git a/externals/vcpkg/ports/dcmtk/dcmtk.patch b/externals/vcpkg/ports/dcmtk/dcmtk.patch new file mode 100755 index 000000000..7f2c95a40 --- /dev/null +++ b/externals/vcpkg/ports/dcmtk/dcmtk.patch @@ -0,0 +1,16 @@ +diff --git a/CMake/dcmtkPrepare.cmake b/CMake/dcmtkPrepare.cmake +index 23a9278..15e9391 100644 +--- a/CMake/dcmtkPrepare.cmake ++++ b/CMake/dcmtkPrepare.cmake +@@ -210,9 +210,9 @@ include(GNUInstallDirs) + # CMake's files (DCMTKTarget.cmake, DCMTKConfigVersion.cmake and DCMTKConfig.cmake) are installed + # to different installation paths under Unix- and Windows-based systems + if(UNIX) +- set(DCMTK_INSTALL_CMKDIR "${CMAKE_INSTALL_LIBDIR}/cmake/dcmtk") ++ set(DCMTK_INSTALL_CMKDIR "share/dcmtk") + elseif(WIN32) +- set(DCMTK_INSTALL_CMKDIR "cmake") ++ set(DCMTK_INSTALL_CMKDIR "share/dcmtk") + endif() + + #----------------------------------------------------------------------------- diff --git a/externals/vcpkg/ports/dcmtk/portfile.cmake b/externals/vcpkg/ports/dcmtk/portfile.cmake new file mode 100755 index 000000000..7e792dfed --- /dev/null +++ b/externals/vcpkg/ports/dcmtk/portfile.cmake @@ -0,0 +1,50 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DCMTK/dcmtk + REF 6cb30bd7fb42190e0188afbd8cb961c62a6fb9c9 # DCMTK-3.6.6 + SHA512 3fbd524bc0b9dced2cdddca850c88d8785ca5f333c5f1598ffbffb8e5c33d11eebdce9ed935245048ac45a7ccd7bd9e4ca79eaacf752cba64a5534b76e5efcdb + HEAD_REF master + PATCHES ${CMAKE_CURRENT_LIST_DIR}/dcmtk.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DDCMTK_WITH_DOXYGEN=OFF + -DDCMTK_WITH_ZLIB=OFF + -DDCMTK_WITH_OPENSSL=OFF + -DDCMTK_WITH_PNG=OFF + -DDCMTK_WITH_TIFF=OFF + -DDCMTK_WITH_XML=OFF + -DDCMTK_WITH_ICONV=OFF + -DDCMTK_FORCE_FPIC_ON_UNIX=ON + -DDCMTK_OVERWRITE_WIN32_COMPILER_FLAGS=OFF + -DDCMTK_ENABLE_BUILTIN_DICTIONARY=ON + -DDCMTK_ENABLE_PRIVATE_TAGS=ON + -DBUILD_APPS=OFF + -DDCMTK_ENABLE_CXX11=ON + -DDCMTK_WIDE_CHAR_FILE_IO_FUNCTIONS=ON + -DDCMTK_WIDE_CHAR_MAIN_FUNCTION=ON + -DCMAKE_DEBUG_POSTFIX=d + OPTIONS_DEBUG + -DINSTALL_HEADERS=OFF + -DINSTALL_OTHER=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DCMTK_PREFIX \"${CURRENT_PACKAGES_DIR}\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DCM_DICT_DEFAULT_PATH \"${CURRENT_PACKAGES_DIR}/share/dcmtk/dicom.dic:${CURRENT_PACKAGES_DIR}/share/dcmtk/private.dic\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DEFAULT_CONFIGURATION_DIR \"${CURRENT_PACKAGES_DIR}/etc/dcmtk/\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DEFAULT_SUPPORT_DATA_DIR \"${CURRENT_PACKAGES_DIR}/share/dcmtk/\"" "") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/dcmtk" RENAME copyright) diff --git a/externals/vcpkg/ports/dcmtk/usage b/externals/vcpkg/ports/dcmtk/usage new file mode 100755 index 000000000..7702d1c40 --- /dev/null +++ b/externals/vcpkg/ports/dcmtk/usage @@ -0,0 +1,18 @@ +The package dcmtk provides CMake targets: + + find_package(DCMTK CONFIG REQUIRED) + # Note: 23 target(s) were omitted. + target_link_libraries(main PRIVATE cmr i2d ijg8 dcmfg) + +Add the following cmake code to your CMakeLists.txt to create definitions for DCMTK + if ("${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" STREQUAL "/") + message(WARNING "No vcpkg install dir found, DCMTK definitions are not set") + else() + target_compile_definitions(main + PUBLIC + "DCMTK_PREFIX=${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" + "DCM_DICT_DEFAULT_PATH=${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/dcmtk/dicom.dic:${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/dcmtk/private.dic" + "DEFAULT_CONFIGURATION_DIR=${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/etc/dcmtk/" + "DEFAULT_SUPPORT_DATA_DIR=${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/dcmtk/" + ) + endif() diff --git a/externals/vcpkg/ports/dcmtk/vcpkg.json b/externals/vcpkg/ports/dcmtk/vcpkg.json new file mode 100755 index 000000000..8f0d893d0 --- /dev/null +++ b/externals/vcpkg/ports/dcmtk/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "dcmtk", + "version": "3.6.6", + "port-version": 3, + "description": "This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard.", + "supports": "!arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/debug-assert/portfile.cmake b/externals/vcpkg/ports/debug-assert/portfile.cmake new file mode 100755 index 000000000..41f9385ff --- /dev/null +++ b/externals/vcpkg/ports/debug-assert/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO foonathan/debug_assert + REF 0144b6532ec80349780ffac3cf85a92d87eb7b1b + SHA512 16cf38406d5f71585b763ff8af59b09c7b8b05372b07714cdc82f6f27292597c0b6d9025f823515744f8235b326b95e1d630af34db4a0e15d4ded79364290630 + HEAD_REF v1.3.3 +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DDEBUG_ASSERT_INSTALL=ON +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/debug_assert TARGET_PATH share/debug_assert) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/debug-assert/vcpkg.json b/externals/vcpkg/ports/debug-assert/vcpkg.json new file mode 100755 index 000000000..413b23d30 --- /dev/null +++ b/externals/vcpkg/ports/debug-assert/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "debug-assert", + "version-string": "1.3.3", + "description": "Provides flexible DEBUG_ASSERT() macro.", + "homepage": "https://github.com/foonathan/debug_assert" +} diff --git a/externals/vcpkg/ports/decimal-for-cpp/portfile.cmake b/externals/vcpkg/ports/decimal-for-cpp/portfile.cmake new file mode 100755 index 000000000..c84b65c5c --- /dev/null +++ b/externals/vcpkg/ports/decimal-for-cpp/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO vpiotr/decimal_for_cpp + REF 98265a57385ec14ae84fc0b2b0f15c770b30f548 + SHA512 b8779ffb81567309ab07fa17eb6d3eb8bb94f77f5a388fd395433a304923ccf75e753a5822f36e5ad9d8959ee1a92b660639367d3a443f353e3e22d36a056f4d + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/include/decimal.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/decimal-for-cpp) +file(COPY ${SOURCE_PATH}/doc/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/decimal-for-cpp) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/decimal-for-cpp/license.txt ${CURRENT_PACKAGES_DIR}/share/decimal-for-cpp/copyright) diff --git a/externals/vcpkg/ports/decimal-for-cpp/vcpkg.json b/externals/vcpkg/ports/decimal-for-cpp/vcpkg.json new file mode 100755 index 000000000..0aec858a5 --- /dev/null +++ b/externals/vcpkg/ports/decimal-for-cpp/vcpkg.json @@ -0,0 +1,5 @@ +{ + "name": "decimal-for-cpp", + "version-string": "1.18", + "description": "Decimal data type support, for COBOL-like fixed-point operations on currency values." +} diff --git a/externals/vcpkg/ports/detours/find-jmp-bounds-arm64.patch b/externals/vcpkg/ports/detours/find-jmp-bounds-arm64.patch new file mode 100755 index 000000000..21390cec0 --- /dev/null +++ b/externals/vcpkg/ports/detours/find-jmp-bounds-arm64.patch @@ -0,0 +1,24 @@ +diff --git a/src/detours.cpp b/src/detours.cpp +index 8345c4d..3cd0e9d 100644 +--- a/src/detours.cpp ++++ b/src/detours.cpp +@@ -974,6 +974,19 @@ inline PBYTE detour_skip_jmp(PBYTE pbCode, PVOID *ppGlobals) + return pbCode; + } + ++inline void detour_find_jmp_bounds(PBYTE pbCode, ++ PDETOUR_TRAMPOLINE *ppLower, ++ PDETOUR_TRAMPOLINE *ppUpper) ++{ ++ // We have to place trampolines within +/- 2GB of code. ++ ULONG_PTR lo = detour_2gb_below((ULONG_PTR)pbCode); ++ ULONG_PTR hi = detour_2gb_above((ULONG_PTR)pbCode); ++ DETOUR_TRACE(("[%p..%p..%p]\n", lo, pbCode, hi)); ++ ++ *ppLower = (PDETOUR_TRAMPOLINE)lo; ++ *ppUpper = (PDETOUR_TRAMPOLINE)hi; ++} ++ + inline BOOL detour_does_code_end_function(PBYTE pbCode) + { + ULONG Opcode = fetch_opcode(pbCode); diff --git a/externals/vcpkg/ports/detours/portfile.cmake b/externals/vcpkg/ports/detours/portfile.cmake new file mode 100755 index 000000000..f583d287c --- /dev/null +++ b/externals/vcpkg/ports/detours/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/Detours + REF v4.0.1 + SHA512 0a9c21b8222329add2de190d2e94d99195dfa55de5a914b75d380ffe0fb787b12e016d0723ca821001af0168fd1643ffd2455298bf3de5fdc155b3393a3ccc87 + HEAD_REF master + PATCHES + find-jmp-bounds-arm64.patch +) + +vcpkg_build_nmake( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "src" + PROJECT_NAME "Makefile" + OPTIONS "PROCESSOR_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}" + OPTIONS_RELEASE "DETOURS_CONFIG=Release" + OPTIONS_DEBUG "DETOURS_CONFIG=Debug" +) + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib.${VCPKG_TARGET_ARCHITECTURE}Release/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib.${VCPKG_TARGET_ARCHITECTURE}Debug/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +endif() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME detours) +else() + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME detours) +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/detours/vcpkg.json b/externals/vcpkg/ports/detours/vcpkg.json new file mode 100755 index 000000000..ba134218d --- /dev/null +++ b/externals/vcpkg/ports/detours/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "detours", + "version": "4.0.1", + "port-version": 5, + "description": "Detours is a software package for monitoring and instrumenting API calls on Windows.", + "homepage": "https://github.com/microsoft/Detours", + "supports": "windows" +} diff --git a/externals/vcpkg/ports/devicenameresolver/CMakeLists.txt b/externals/vcpkg/ports/devicenameresolver/CMakeLists.txt new file mode 100755 index 000000000..64adad4d5 --- /dev/null +++ b/externals/vcpkg/ports/devicenameresolver/CMakeLists.txt @@ -0,0 +1,23 @@ +cmake_minimum_required(VERSION 3.8.0) +project(DeviceNameResolver CXX) + +if(MSVC) + add_compile_options(/W3 /wd4005 /wd4996 /wd4018 /DUNICODE /D_UNICODE -D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DNOMINMAX) +endif() + +include_directories(.) + +file(GLOB DeviceNameResolver_srcs "*.cpp") + +add_library(DeviceNameResolver ${DeviceNameResolver_srcs}) + +install( + TARGETS DeviceNameResolver + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES DeviceNameResolver.h DESTINATION include) +endif() diff --git a/externals/vcpkg/ports/devicenameresolver/add-string-headfile.patch b/externals/vcpkg/ports/devicenameresolver/add-string-headfile.patch new file mode 100755 index 000000000..da78f227b --- /dev/null +++ b/externals/vcpkg/ports/devicenameresolver/add-string-headfile.patch @@ -0,0 +1,12 @@ +diff --git a/NativeWinApi.h b/NativeWinApi.h +index 63fced1..582306b 100644 +--- a/NativeWinApi.h ++++ b/NativeWinApi.h +@@ -1,6 +1,7 @@ + #pragma once + + #include ++#include + + #define STATUS_INFO_LENGTH_MISMATCH ((NTSTATUS)0xC0000004L) + #define STATUS_SUCCESS ((NTSTATUS)0x00000000L) diff --git a/externals/vcpkg/ports/devicenameresolver/portfile.cmake b/externals/vcpkg/ports/devicenameresolver/portfile.cmake new file mode 100755 index 000000000..b08e2f681 --- /dev/null +++ b/externals/vcpkg/ports/devicenameresolver/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_bitbucket( + OUT_SOURCE_PATH SOURCE_PATH + REPO mrexodia/devicenameresolver + REF 0850d88fa6a759d79b3c859933870d9aa602aa79 + SHA512 9161411d3c8c17f49f5ff9482a007a6608872c948ef856aa7076a45c246e8d777e4cd6b54169d9c1b9e99e7b383436e1a084e168fafff1ca5f2b28260bac1452 + HEAD_REF master + PATCHES add-string-headfile.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/DeviceNameResolver.h" "__declspec(dllexport)" "") + +file(INSTALL "${SOURCE_PATH}/readme.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/devicenameresolver" RENAME copyright) diff --git a/externals/vcpkg/ports/devicenameresolver/vcpkg.json b/externals/vcpkg/ports/devicenameresolver/vcpkg.json new file mode 100755 index 000000000..0647d0831 --- /dev/null +++ b/externals/vcpkg/ports/devicenameresolver/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "devicenameresolver", + "version-string": "2016-06-26-0850d88fa6", + "port-version": 3, + "description": "a little library that resolves a path from a (virtual) device name.", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/devil/0001_fix-encoding.patch b/externals/vcpkg/ports/devil/0001_fix-encoding.patch new file mode 100755 index 000000000..59d826d25 --- /dev/null +++ b/externals/vcpkg/ports/devil/0001_fix-encoding.patch @@ -0,0 +1,173 @@ +diff --git a/DevIL/src-ILU/include/ilu_error/ilu_err-french.h b/DevIL/src-ILU/include/ilu_error/ilu_err-french.h +index d3b280d..445440e 100644 +--- a/DevIL/src-ILU/include/ilu_error/ilu_err-french.h ++++ b/DevIL/src-ILU/include/ilu_error/ilu_err-french.h +@@ -17,19 +17,19 @@ + #include "ilu_internal.h" + + ILconst_string iluErrorStringsFrench[IL_FILE_READ_ERROR - IL_INVALID_ENUM + 1] = { +- IL_TEXT("énumération invalide"), +- IL_TEXT("dépassement de mémoire"), +- IL_TEXT("format non supporté"), ++ IL_TEXT("énumération invalide"), ++ IL_TEXT("dépassement de mémoire"), ++ IL_TEXT("format non supporté"), + IL_TEXT("erreur interne"), +- IL_TEXT("valeur illégale"), +- IL_TEXT("opération illégale"), +- IL_TEXT("valeur de fichier illégale"), +- IL_TEXT("en-tête de fichier invalide"), +- IL_TEXT("paramètre invalide"), ++ IL_TEXT("valeur illégale"), ++ IL_TEXT("opération illégale"), ++ IL_TEXT("valeur de fichier illégale"), ++ IL_TEXT("en-tête de fichier invalide"), ++ IL_TEXT("paramètre invalide"), + IL_TEXT("ne peut pas ouvrir le fichier"), + IL_TEXT("extension invalide"), +- IL_TEXT("fichier déjà existant"), +- IL_TEXT("équivalent hors-format"), ++ IL_TEXT("fichier déjà existant"), ++ IL_TEXT("équivalent hors-format"), + IL_TEXT("stack overflow"), //often used like this in French, so no need to translate + IL_TEXT("stack underflow"), + IL_TEXT("conversion invalide"), +@@ -38,7 +38,7 @@ ILconst_string iluErrorStringsFrench[IL_FILE_READ_ERROR - IL_INVALID_ENUM + 1] = + }; + + ILconst_string iluLibErrorStringsFrench[IL_LIB_EXR_ERROR - IL_LIB_GIF_ERROR + 1] = { +- IL_TEXT("gif : erreur dans la librairie"), //or: gif : erreur dans la bibliothèque (but less used) ++ IL_TEXT("gif : erreur dans la librairie"), //or: gif : erreur dans la bibliothèque (but less used) + IL_TEXT("jpeg : erreur dans la librairie"), + IL_TEXT("png : erreur dans la librairie"), + IL_TEXT("tiff : erreur dans la librairie"), +diff --git a/DevIL/src-ILU/include/ilu_error/ilu_err-german.h b/DevIL/src-ILU/include/ilu_error/ilu_err-german.h +index bf3f05c..acdbe8a 100644 +--- a/DevIL/src-ILU/include/ilu_error/ilu_err-german.h ++++ b/DevIL/src-ILU/include/ilu_error/ilu_err-german.h +@@ -6,7 +6,7 @@ + // + // Filename: src-ILU/include/ilu_error/ilu_err_German.h + // +-// Description: Error functions in German, translated by Andreas Stöckel. ++// Description: Error functions in German, translated by Andreas Stöckel. + // + //----------------------------------------------------------------------------- + +@@ -17,23 +17,23 @@ + #include "ilu_internal.h" + + ILconst_string iluErrorStringsGerman[IL_FILE_READ_ERROR - IL_INVALID_ENUM + 1] = { +- IL_TEXT("Ungültiger Enumerator"), +- IL_TEXT("Kein Speicher verfügbar"), +- IL_TEXT("Das Format wird noch nicht unterstützt"), ++ IL_TEXT("Ungültiger Enumerator"), ++ IL_TEXT("Kein Speicher verfügbar"), ++ IL_TEXT("Das Format wird noch nicht unterstützt"), + IL_TEXT("Interner Fehler"), +- IL_TEXT("Ungültiger Wert"), +- IL_TEXT("Unzulässige Operation"), +- IL_TEXT("Unzulässiger Datei-Wert"), +- IL_TEXT("Unzulässiger Datei-Header"), +- IL_TEXT("Unzulässiger Parameter"), +- IL_TEXT("Datei konnte nicht geöffnet werden"), +- IL_TEXT("Ungültiger Erweiterung"), ++ IL_TEXT("Ungültiger Wert"), ++ IL_TEXT("Unzulässige Operation"), ++ IL_TEXT("Unzulässiger Datei-Wert"), ++ IL_TEXT("Unzulässiger Datei-Header"), ++ IL_TEXT("Unzulässiger Parameter"), ++ IL_TEXT("Datei konnte nicht geöffnet werden"), ++ IL_TEXT("Ungültiger Erweiterung"), + IL_TEXT("Die Datei existiert bereits"), + IL_TEXT("out format equivalent"), +- IL_TEXT("Stack Überlauf"), ++ IL_TEXT("Stack Ãœberlauf"), + IL_TEXT("Stack Unterlauf"), +- IL_TEXT("Ungültige Konvertierung"), +- IL_TEXT("Unzulässige Abmessungen"), ++ IL_TEXT("Ungültige Konvertierung"), ++ IL_TEXT("Unzulässige Abmessungen"), + IL_TEXT("Fehler beim Lesen der Datei") + }; + +diff --git a/DevIL/src-ILU/include/ilu_error/ilu_err-italian.h b/DevIL/src-ILU/include/ilu_error/ilu_err-italian.h +index 09d7bd1..d34b23f 100644 +--- a/DevIL/src-ILU/include/ilu_error/ilu_err-italian.h ++++ b/DevIL/src-ILU/include/ilu_error/ilu_err-italian.h +@@ -22,13 +22,13 @@ ILconst_string iluErrorStringsItalian[IL_FILE_READ_ERROR - IL_INVALID_ENUM + 1] + IL_TEXT("configuri non sostenne"), + IL_TEXT("erreur interne"), + IL_TEXT("errore interno"), +- IL_TEXT("opération illégale"), ++ IL_TEXT("opération illégale"), + IL_TEXT("operazione illegale"), + IL_TEXT("inebri archivio nullo"), + IL_TEXT("parametro nullo"), +- IL_TEXT("non può aprire l'archivio"), ++ IL_TEXT("non può aprire l'archivio"), + IL_TEXT("dilazione nulla"), +- IL_TEXT("archivi già esistendo"), ++ IL_TEXT("archivi già esistendo"), + IL_TEXT("equivalente fuori-configuri"), + IL_TEXT("inondi di batteria"), + IL_TEXT("insufficienza di batteria"), +diff --git a/DevIL/src-ILU/include/ilu_error/ilu_err-spanish.h b/DevIL/src-ILU/include/ilu_error/ilu_err-spanish.h +index 77b5a24..0945fdf 100644 +--- a/DevIL/src-ILU/include/ilu_error/ilu_err-spanish.h ++++ b/DevIL/src-ILU/include/ilu_error/ilu_err-spanish.h +@@ -6,7 +6,7 @@ + // + // Filename: src-ILU/include/ilu_error/ilu_err-spanish.h + // +-// Description: Error functions in Spanish, translated by Carlos Aragonés ++// Description: Error functions in Spanish, translated by Carlos Aragonés + // + //----------------------------------------------------------------------------- + +@@ -19,32 +19,32 @@ + ILconst_string iluErrorStringsSpanish[IL_FILE_READ_ERROR - IL_INVALID_ENUM + 1] = { + IL_TEXT("enumerador incorrecto"), + IL_TEXT("no queda memoria disponible"), +- IL_TEXT("formato no soportado todavía"), ++ IL_TEXT("formato no soportado todavía"), + IL_TEXT("error interno"), + IL_TEXT("valor incorrecto"), +- IL_TEXT("operación ilegaIL_TEXT("), ++ IL_TEXT("operación ilegaIL_TEXT("), + IL_TEXT("valor de fichero ilegaIL_TEXT("), + IL_TEXT("cabecera incorrecta"), +- IL_TEXT("parámetro incorrecto"), ++ IL_TEXT("parámetro incorrecto"), + IL_TEXT("no se puede abrir el fichero"), +- IL_TEXT("extensión desconocida"), ++ IL_TEXT("extensión desconocida"), + IL_TEXT("el fichero ya existe"), + IL_TEXT("formato de salida equivalente"), + IL_TEXT("desbordamiento superior de pila"), + IL_TEXT("desbordamiento inferior de pila"), +- IL_TEXT("conversión incorrecta"), +- IL_TEXT("número de dimensiones incorrecto"), ++ IL_TEXT("conversión incorrecta"), ++ IL_TEXT("número de dimensiones incorrecto"), + IL_TEXT("error de lectura en el fichero") + }; + + ILconst_string iluLibErrorStringsSpanish[IL_LIB_EXR_ERROR - IL_LIB_GIF_ERROR + 1] = { +- IL_TEXT("error en la librería gif"), // the correct translation will be 'error en la biblioteca gif', but nobody in spain uses the word 'biblioteca' for the translation the word 'library'. Almost all Spanish programmers translate 'library' incorrectly to 'librería'. +- IL_TEXT("error en la librería jpeg"), +- IL_TEXT("error en la librería png"), +- IL_TEXT("error en la librería tiff"), +- IL_TEXT("error en la librería mng"), +- IL_TEXT("error en la librería jp2"), +- IL_TEXT("error en la librería exr"), ++ IL_TEXT("error en la librería gif"), // the correct translation will be 'error en la biblioteca gif', but nobody in spain uses the word 'biblioteca' for the translation the word 'library'. Almost all Spanish programmers translate 'library' incorrectly to 'librería'. ++ IL_TEXT("error en la librería jpeg"), ++ IL_TEXT("error en la librería png"), ++ IL_TEXT("error en la librería tiff"), ++ IL_TEXT("error en la librería mng"), ++ IL_TEXT("error en la librería jp2"), ++ IL_TEXT("error en la librería exr"), + }; + + ILconst_string iluMiscErrorStringsSpanish[2] = { diff --git a/externals/vcpkg/ports/devil/0002_fix-missing-mfc-includes.patch b/externals/vcpkg/ports/devil/0002_fix-missing-mfc-includes.patch new file mode 100755 index 000000000..3b18981ce --- /dev/null +++ b/externals/vcpkg/ports/devil/0002_fix-missing-mfc-includes.patch @@ -0,0 +1,102 @@ +diff --git a/DevIL/src-IL/msvc/IL Unicode.rc b/DevIL/src-IL/msvc/IL Unicode.rc +index 346758f..298a207 100644 +--- a/DevIL/src-IL/msvc/IL Unicode.rc ++++ b/DevIL/src-IL/msvc/IL Unicode.rc +@@ -7,7 +7,11 @@ + // + // Generated from the TEXTINCLUDE 2 resource. + // +-#include "afxres.h" ++#define APSTUDIO_HIDDEN_SYMBOLS ++#include "windows.h" ++#undef APSTUDIO_HIDDEN_SYMBOLS ++#include "resource.h" ++ + ///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS + +diff --git a/DevIL/src-IL/msvc/IL.rc b/DevIL/src-IL/msvc/IL.rc +index 8bfadf9..0b8289f 100644 +--- a/DevIL/src-IL/msvc/IL.rc ++++ b/DevIL/src-IL/msvc/IL.rc +@@ -7,10 +7,13 @@ + // + // Generated from the TEXTINCLUDE 2 resource. + // +-#include "afxres.h" ++#define APSTUDIO_HIDDEN_SYMBOLS ++#include "windows.h" ++#undef APSTUDIO_HIDDEN_SYMBOLS ++#include "resource.h" + +-///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS ++///////////////////////////////////////////////////////////////////////////// + + ///////////////////////////////////////////////////////////////////////////// + // English (United States) resources +diff --git a/DevIL/src-IL/msvc8/IL Unicode.rc b/DevIL/src-IL/msvc8/IL Unicode.rc +index 026ee49..66ca4bf 100644 +--- a/DevIL/src-IL/msvc8/IL Unicode.rc ++++ b/DevIL/src-IL/msvc8/IL Unicode.rc +@@ -7,7 +7,10 @@ + // + // Generated from the TEXTINCLUDE 2 resource. + // +-#include "afxres.h" ++#define APSTUDIO_HIDDEN_SYMBOLS ++#include "windows.h" ++#undef APSTUDIO_HIDDEN_SYMBOLS ++#include "resource.h" + + ///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS +diff --git a/DevIL/src-IL/msvc8/IL.rc b/DevIL/src-IL/msvc8/IL.rc +index 9301d41..3ad52c0 100644 +--- a/DevIL/src-IL/msvc8/IL.rc ++++ b/DevIL/src-IL/msvc8/IL.rc +@@ -7,7 +7,10 @@ + // + // Generated from the TEXTINCLUDE 2 resource. + // +-#include "afxres.h" ++#define APSTUDIO_HIDDEN_SYMBOLS ++#include "windows.h" ++#undef APSTUDIO_HIDDEN_SYMBOLS ++#include "resource.h" + + ///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS +diff --git a/DevIL/src-IL/msvc9/IL Unicode.rc b/DevIL/src-IL/msvc9/IL Unicode.rc +index d0dff4f..c9cf51f 100644 +--- a/DevIL/src-IL/msvc9/IL Unicode.rc ++++ b/DevIL/src-IL/msvc9/IL Unicode.rc +@@ -7,7 +7,10 @@ + // + // Generated from the TEXTINCLUDE 2 resource. + // +-#include "afxres.h" ++#define APSTUDIO_HIDDEN_SYMBOLS ++#include "windows.h" ++#undef APSTUDIO_HIDDEN_SYMBOLS ++#include "resource.h" + + ///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS +diff --git a/DevIL/src-IL/msvc9/IL.rc b/DevIL/src-IL/msvc9/IL.rc +index 9f5c795..6b8c891 100644 +--- a/DevIL/src-IL/msvc9/IL.rc ++++ b/DevIL/src-IL/msvc9/IL.rc +@@ -7,7 +7,10 @@ + // + // Generated from the TEXTINCLUDE 2 resource. + // +-#include "afxres.h" ++#define APSTUDIO_HIDDEN_SYMBOLS ++#include "windows.h" ++#undef APSTUDIO_HIDDEN_SYMBOLS ++#include "resource.h" + + ///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS + \ No newline at end of file diff --git a/externals/vcpkg/ports/devil/0003_fix-openexr.patch b/externals/vcpkg/ports/devil/0003_fix-openexr.patch new file mode 100755 index 000000000..2465bb905 --- /dev/null +++ b/externals/vcpkg/ports/devil/0003_fix-openexr.patch @@ -0,0 +1,55 @@ +diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt +index 02e4f03..4accaa1 100644 +--- a/DevIL/src-IL/CMakeLists.txt ++++ b/DevIL/src-IL/CMakeLists.txt +@@ -235,8 +235,12 @@ target_link_libraries(IL ${libs}) + + # generate config.h + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/config.h.cmake.in ${CMAKE_CURRENT_SOURCE_DIR}/include/config.h) +- +- ++add_definitions(-DHAVE_CONFIG_H) ++if(WIN32) ++ if(BUILD_SHARED_LIBS) ++ add_definitions(-DOPENEXR_DLL) ++ endif() ++endif() + + # generate pkg-config file + # TODO: add Requires.private or Libs.private +diff --git a/DevIL/src-IL/src/il_exr.cpp b/DevIL/src-IL/src/il_exr.cpp +index bbb3978..3916c6f 100644 +--- a/DevIL/src-IL/src/il_exr.cpp ++++ b/DevIL/src-IL/src/il_exr.cpp +@@ -14,15 +14,10 @@ + #include "il_internal.h" + #ifndef IL_NO_EXR + +-#ifndef HAVE_CONFIG_H // We are probably on a Windows box . +-//#define OPENEXR_DLL +-#define HALF_EXPORTS +-#endif //HAVE_CONFIG_H +- + #include "il_exr.h" +-#include +-#include +-#include ++#include ++#include ++#include + //#include + //#include + //#include +diff --git a/DevIL/src-IL/include/il_exr.h b/DevIL/src-IL/include/il_exr.h +index 3d880c4..04d721a 100644 +--- a/DevIL/src-IL/include/il_exr.h ++++ b/DevIL/src-IL/include/il_exr.h +@@ -15,7 +15,7 @@ + #define EXR_H + + #include "il_internal.h" +-#include ++#include + + + //using namespace Imf; // Using this leads to errors with Microsoft's IStream. diff --git a/externals/vcpkg/ports/devil/0004_compatible-jasper-2-0-20.patch b/externals/vcpkg/ports/devil/0004_compatible-jasper-2-0-20.patch new file mode 100755 index 000000000..5cb236375 --- /dev/null +++ b/externals/vcpkg/ports/devil/0004_compatible-jasper-2-0-20.patch @@ -0,0 +1,52 @@ +diff --git a/DevIL/src-IL/src/il_jp2.cpp b/DevIL/src-IL/src/il_jp2.cpp +index 730afee..a419c14 100644 +--- a/DevIL/src-IL/src/il_jp2.cpp ++++ b/DevIL/src-IL/src/il_jp2.cpp +@@ -313,20 +313,31 @@ ILboolean iLoadJp2Internal(jas_stream_t *Stream, ILimage *Image) + } + + +- +-static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, int cnt) ++#ifdef __APPLE__ ++static int iJp2_file_read(void *obj, char *buf, unsigned int cnt) ++#else ++static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, unsigned int cnt) ++#endif + { + obj; +- return iread(buf, 1, cnt); ++ return iread((void*)buf, 1, cnt); + } + +-static int iJp2_file_write(jas_stream_obj_t *obj, char *buf, int cnt) ++#ifdef __APPLE__ ++static int iJp2_file_write(void *obj, const char *buf, unsigned int cnt) ++#else ++static int iJp2_file_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt) ++#endif + { + obj; + return iwrite(buf, 1, cnt); + } + ++#ifdef __APPLE__ + static long iJp2_file_seek(jas_stream_obj_t *obj, long offset, int origin) ++#else ++static long iJp2_file_seek(void *obj, long offset, int origin) ++#endif + { + obj; + +@@ -343,7 +354,11 @@ static long iJp2_file_seek(jas_stream_obj_t *obj, long offset, int origin) + return 0; // Failed + } + ++#ifdef __APPLE__ ++static int iJp2_file_close(void *obj) ++#else + static int iJp2_file_close(jas_stream_obj_t *obj) ++#endif + { + obj; + return 0; // We choose when we want to close the file. diff --git a/externals/vcpkg/ports/devil/0005-fix-pkgconfig.patch b/externals/vcpkg/ports/devil/0005-fix-pkgconfig.patch new file mode 100755 index 000000000..d45af68f7 --- /dev/null +++ b/externals/vcpkg/ports/devil/0005-fix-pkgconfig.patch @@ -0,0 +1,52 @@ +diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt +index 4accaa1..c3a1874 100644 +--- a/DevIL/src-IL/CMakeLists.txt ++++ b/DevIL/src-IL/CMakeLists.txt +@@ -160,6 +160,27 @@ if(WIN32) + # Linux uses libIL.so, libILU.so, and libILUT.so, but Windows uses + # DevIL.dll, ILU.dll, and ILUT.dll. + set_target_properties(IL PROPERTIES OUTPUT_NAME "DevIL") ++ ++ configure_file(${CMAKE_CURRENT_LIST_DIR}/pkgconfig/IL.pc.cmake.in ${CMAKE_CURRENT_LIST_DIR}/pkgconfig/DevIL.pc.cmake.in COPYONLY) ++ ++ file(READ ${CMAKE_CURRENT_LIST_DIR}/pkgconfig/DevIL.pc.cmake.in PKGCONFIG_FILE) ++ string(REPLACE "IL" "DevIL" PKGCONFIG_FILE "${PKGCONFIG_FILE}") ++ file(WRITE ${CMAKE_CURRENT_LIST_DIR}/pkgconfig/DevIL.pc.cmake.in "${PKGCONFIG_FILE}") ++ ++ file(READ ${CMAKE_CURRENT_LIST_DIR}/../src-ILU/pkgconfig/ILU.pc.cmake.in PKGCONFIG_FILE) ++ string(REPLACE "Requires: IL" "Requires: DevIL" PKGCONFIG_FILE "${PKGCONFIG_FILE}") ++ string(REPLACE "Libs.private: -lIL" "Libs.private: -lDevIL" PKGCONFIG_FILE "${PKGCONFIG_FILE}") ++ file(WRITE ${CMAKE_CURRENT_LIST_DIR}/../src-ILU/pkgconfig/ILU.pc.cmake.in "${PKGCONFIG_FILE}") ++ ++ file(READ ${CMAKE_CURRENT_LIST_DIR}/../src-ILUT/pkgconfig/ILUT.pc.cmake.in PKGCONFIG_FILE) ++ string(REPLACE "Requires: IL" "Requires: DevIL" PKGCONFIG_FILE "${PKGCONFIG_FILE}") ++ string(REPLACE "Libs.private: -lIL" "Libs.private: -lDevIL" PKGCONFIG_FILE "${PKGCONFIG_FILE}") ++ file(WRITE ${CMAKE_CURRENT_LIST_DIR}/../src-ILUT/pkgconfig/ILUT.pc.cmake.in "${PKGCONFIG_FILE}") ++ set(PKGCFG_IN_FILE pkgconfig/DevIL.pc.cmake.in) ++ set(PKGCFG_FILE DevIL.pc) ++else(WIN32) ++ set(PKGCFG_IN_FILE pkgconfig/IL.pc.cmake.in) ++ set(PKGCFG_FILE IL.pc) + endif(WIN32) + + if(UNICODE) +@@ -246,8 +267,8 @@ endif() + # TODO: add Requires.private or Libs.private + # (needed to support static linking?) + # TODO: sort out version number +-configure_file( pkgconfig/IL.pc.cmake.in +- ${CMAKE_CURRENT_BINARY_DIR}/IL.pc @ONLY) ++configure_file( ${PKGCFG_IN_FILE} ++ ${CMAKE_CURRENT_BINARY_DIR}/${PKGCFG_FILE} @ONLY) + + + # Installation +@@ -259,7 +280,7 @@ install (TARGETS IL + install (FILES ../include/IL/il.h DESTINATION include/IL) + + install(FILES +- ${CMAKE_CURRENT_BINARY_DIR}/IL.pc ++ ${CMAKE_CURRENT_BINARY_DIR}/${PKGCFG_FILE} + DESTINATION lib/pkgconfig + ) + diff --git a/externals/vcpkg/ports/devil/0006-fix-ilut-header.patch b/externals/vcpkg/ports/devil/0006-fix-ilut-header.patch new file mode 100755 index 000000000..5af04e897 --- /dev/null +++ b/externals/vcpkg/ports/devil/0006-fix-ilut-header.patch @@ -0,0 +1,12 @@ +diff --git a/DevIL/src-ILUT/CMakeLists.txt b/DevIL/src-ILUT/CMakeLists.txt +index 398d3c1..617c8d8 100644 +--- a/DevIL/src-ILUT/CMakeLists.txt ++++ b/DevIL/src-ILUT/CMakeLists.txt +@@ -77,6 +77,7 @@ install (TARGETS ILUT + RUNTIME DESTINATION bin + ) + install (FILES ../include/IL/ilut.h DESTINATION include/IL) ++install (FILES ../include/IL/ilut_config.h DESTINATION include/IL) + + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/ILUT.pc diff --git a/externals/vcpkg/ports/devil/enable-static.patch b/externals/vcpkg/ports/devil/enable-static.patch new file mode 100755 index 000000000..8d77c0d5e --- /dev/null +++ b/externals/vcpkg/ports/devil/enable-static.patch @@ -0,0 +1,26 @@ +diff --git a/DevIL/src-ILU/CMakeLists.txt b/DevIL/src-ILU/CMakeLists.txt +index 17a3afe..a46ab41 100644 +--- a/DevIL/src-ILU/CMakeLists.txt ++++ b/DevIL/src-ILU/CMakeLists.txt +@@ -43,7 +43,7 @@ source_group("Header Files" FILES ${ILU_INC} ) + source_group("Resource Files" FILES ${ILU_RSRC} ) + + # Remove SHARED to create a static library +-add_library(ILU SHARED ${ILU_SRCS} ${ILU_INC} ${ILU_RSRC}) ++add_library(ILU ${ILU_SRCS} ${ILU_INC} ${ILU_RSRC}) + + + ## ILU requires IL +diff --git a/DevIL/src-ILUT/CMakeLists.txt b/DevIL/src-ILUT/CMakeLists.txt +index 21470cb..398d3c1 100644 +--- a/DevIL/src-ILUT/CMakeLists.txt ++++ b/DevIL/src-ILUT/CMakeLists.txt +@@ -43,7 +43,7 @@ source_group("Header Files" FILES ${ILUT_INC} ) + source_group("Resource Files" FILES ${ILUT_RSRC} ) + + # Remove SHARED to create a static library +-add_library(ILUT SHARED ${ILUT_SRCS} ${ILUT_INC} ${ILUT_RSRC}) ++add_library(ILUT ${ILUT_SRCS} ${ILUT_INC} ${ILUT_RSRC}) + + ## add link sub library info + target_link_libraries(ILUT diff --git a/externals/vcpkg/ports/devil/portfile.cmake b/externals/vcpkg/ports/devil/portfile.cmake new file mode 100755 index 000000000..bb5d4357b --- /dev/null +++ b/externals/vcpkg/ports/devil/portfile.cmake @@ -0,0 +1,49 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DentonW/DevIL + REF v1.8.0 + SHA512 4aed5e50a730ece8b1eb6b2f6204374c6fb6f5334cf7c880d84c0f79645ea7c6b5118f57a7868a487510fc59c452f51472b272215d4c852f265f58b5857e17c7 + HEAD_REF master + PATCHES + 0001_fix-encoding.patch + 0002_fix-missing-mfc-includes.patch + 0003_fix-openexr.patch + enable-static.patch + 0004_compatible-jasper-2-0-20.patch + 0005-fix-pkgconfig.patch + 0006-fix-ilut-header.patch +) + +file(REMOVE ${SOURCE_PATH}/DevIL/src-IL/cmake/FindOpenEXR.cmake) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + INVERTED_FEATURES + libpng IL_NO_PNG + tiff IL_NO_TIF + libjpeg IL_NO_JPG + openexr IL_NO_EXR + jasper IL_NO_JP2 + lcms IL_NO_LCMS +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/DevIL + PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE + OPTIONS + ${FEATURE_OPTIONS} + -DIL_NO_MNG=ON + -DIL_USE_DXTC_NVIDIA=OFF + -DIL_USE_DXTC_SQUISH=OFF +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/devil/vcpkg.json b/externals/vcpkg/ports/devil/vcpkg.json new file mode 100755 index 000000000..2d716cbe6 --- /dev/null +++ b/externals/vcpkg/ports/devil/vcpkg.json @@ -0,0 +1,53 @@ +{ + "name": "devil", + "version": "1.8.0", + "port-version": 8, + "description": "A full featured cross-platform image library", + "homepage": "https://github.com/DentonW/DevIL", + "default-features": [ + "jasper", + "lcms", + "libjpeg", + "libpng", + "openexr", + "tiff" + ], + "features": { + "jasper": { + "description": "Use JasPer for .jp2 (and some .icns) support", + "dependencies": [ + "jasper" + ] + }, + "lcms": { + "description": "Use Little CMS for color profiles", + "dependencies": [ + "lcms" + ] + }, + "libjpeg": { + "description": "Use Libjpeg for .jpg (and some .blp) support", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "libpng": { + "description": "Use Libpng for .png (and some .ico)", + "dependencies": [ + "libpng" + ] + }, + "openexr": { + "description": " Use openexr", + "dependencies": [ + "openexr" + ] + }, + "tiff": { + "description": "Use Libtiff for .tif support", + "dependencies": [ + "tiff" + ] + } + } +} diff --git a/externals/vcpkg/ports/dimcli/fix-build.patch b/externals/vcpkg/ports/dimcli/fix-build.patch new file mode 100755 index 000000000..0ec5659c8 --- /dev/null +++ b/externals/vcpkg/ports/dimcli/fix-build.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 509e634..8b5a30b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -392,7 +392,7 @@ if(MSVC) + set(CMAKE_CXX_FLAGS "\ + /EHsc /GF /nologo /std:c++latest /utf-8 /W4 /WX \ + /Zc:inline /Zc:rvalueCast /Zc:strictStrings \ +- /Fa$(IntDir)") ++ /Fa${CMAKE_SOURCE_DIR}/libs/dimcli") + if(NOT MSVC_VERSION LESS 1910) + # /permissive- // reject non-conforming backward compatibility-isms + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /permissive-") +@@ -431,8 +431,8 @@ elseif(CMAKE_COMPILER_IS_GNUCXX) + if(BUILD_COVERAGE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage") + endif() +-elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang) ++elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1z") + else() +@@ -533,7 +533,6 @@ endforeach() + # test targets + if(BUILD_TESTING) + enable_testing() +-endif() + file(GLOB allnames tests/*) + foreach(var ${allnames}) + if(IS_DIRECTORY "${var}") +@@ -548,6 +547,7 @@ foreach(var ${allnames}) + endif() + endif() + endforeach() ++endif() + + # update deps file + update_deps_file(${deps}) diff --git a/externals/vcpkg/ports/dimcli/portfile.cmake b/externals/vcpkg/ports/dimcli/portfile.cmake new file mode 100755 index 000000000..af02f7705 --- /dev/null +++ b/externals/vcpkg/ports/dimcli/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gknowles/dimcli + REF a4dbb4b1c8a3825fc304bbbad3438dbe1840feae # v5.0.2 + SHA512 25cc9002fd46856854545934f385d8578f207b1ce01802a172e49e008cdf1db0db11db7cefeef18258b99c13570af9193e83f5826613d8b0a118d7bae3f0d03f + HEAD_REF master + PATCHES fix-build.patch +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" staticCrt) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DLINK_STATIC_RUNTIME:BOOL=${staticCrt} + -DINSTALL_LIBS:BOOL=ON + -DBUILD_PROJECT_NAME=dimcli + -DBUILD_TESTING=OFF + -DINSTALL_TOOLS=OFF + -DINSTALL_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +# Remove includes from ${CMAKE_INSTALL_PREFIX}/debug +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/dimcli" RENAME copyright) diff --git a/externals/vcpkg/ports/dimcli/vcpkg.json b/externals/vcpkg/ports/dimcli/vcpkg.json new file mode 100755 index 000000000..3de3fc1b4 --- /dev/null +++ b/externals/vcpkg/ports/dimcli/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "dimcli", + "version-semver": "5.0.2", + "port-version": 3, + "description": "C++ command line parser toolkit", + "homepage": "https://github.com/gknowles/dimcli", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/directx-dxc/directx-dxc-config.cmake.in b/externals/vcpkg/ports/directx-dxc/directx-dxc-config.cmake.in new file mode 100755 index 000000000..bf8c7cebc --- /dev/null +++ b/externals/vcpkg/ports/directx-dxc/directx-dxc-config.cmake.in @@ -0,0 +1,29 @@ + +get_filename_component(_dxc_root "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_dxc_root "${_dxc_root}" PATH) +get_filename_component(_dxc_root "${_dxc_root}" PATH) + +set(_dxc_exe "${_dxc_root}/tools/directx-dxc/dxc.exe") +if (EXISTS "${_dxc_exe}") + + add_library(Microsoft::DirectXShaderCompiler SHARED IMPORTED) + set_target_properties(Microsoft::DirectXShaderCompiler PROPERTIES + IMPORTED_LOCATION_RELEASE "${_dxc_root}/bin/dxcompiler.dll" + IMPORTED_LOCATION_DEBUG "${_dxc_root}/bin/dxcompiler.dll" + IMPORTED_IMPLIB_RELEASE "${_dxc_root}/lib/dxcompiler.lib" + IMPORTED_IMPLIB_DEBUG "${_dxc_root}/lib/dxcompiler.lib" + INTERFACE_INCLUDE_DIRECTORIES "${_dxc_root}/include" + IMPORTED_CONFIGURATIONS "Debug;Release" + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + + set(directx-dxc_FOUND TRUE) + set(DIRECTX_DXC_TOOL ${_dxc_exe}) + +else() + + set(directx-dxc_FOUND FALSE) + +endif() + +unset(_dxc_exe) +unset(_dxc_root) diff --git a/externals/vcpkg/ports/directx-dxc/portfile.cmake b/externals/vcpkg/ports/directx-dxc/portfile.cmake new file mode 100755 index 000000000..5c735aa6b --- /dev/null +++ b/externals/vcpkg/ports/directx-dxc/portfile.cmake @@ -0,0 +1,46 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.6.2112/dxc_2021_12_08.zip" + FILENAME "dxc_2021_12_08.zip" + SHA512 e9b36e896c1d47b39b648adbecf44da7f8543216fd1df539760f0c591907aea081ea6bfc59eb927073aaa1451110c5dc63003546509ff84c9e4445488df97c27 +) + +vcpkg_download_distfile( + LICENSE_TXT + URLS "https://raw.githubusercontent.com/microsoft/DirectXShaderCompiler/v1.6.2112/LICENSE.TXT" + FILENAME "LICENSE.v1.6.2112" + SHA512 7589f152ebc3296dca1c73609a2a23a911b8fc0029731268a6151710014d82005a868c85c8249219f060f64ab1ddecdddff5ed6ea34ff509f63ea3e42bbbf47e +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH PACKAGE_PATH + ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL +) + +file(INSTALL "${PACKAGE_PATH}/inc/d3d12shader.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(INSTALL "${PACKAGE_PATH}/inc/dxcapi.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") + +file(INSTALL "${PACKAGE_PATH}/lib/x64/dxcompiler.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${PACKAGE_PATH}/lib/x64/dxcompiler.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + +file(COPY "${PACKAGE_PATH}/bin/x64/dxcompiler.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +file(COPY "${PACKAGE_PATH}/bin/x64/dxcompiler.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + +file(COPY "${PACKAGE_PATH}/bin/x64/dxil.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +file(COPY "${PACKAGE_PATH}/bin/x64/dxil.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/") + +file(INSTALL + "${PACKAGE_PATH}/bin/x64/dxc.exe" + "${PACKAGE_PATH}/bin/x64/dxcompiler.dll" + "${PACKAGE_PATH}/bin/x64/dxil.dll" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${LICENSE_TXT}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +configure_file("${CMAKE_CURRENT_LIST_DIR}/directx-dxc-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" COPYONLY) diff --git a/externals/vcpkg/ports/directx-dxc/vcpkg.json b/externals/vcpkg/ports/directx-dxc/vcpkg.json new file mode 100755 index 000000000..67feec1ab --- /dev/null +++ b/externals/vcpkg/ports/directx-dxc/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "directx-dxc", + "version-date": "2021-12-08", + "description": "DirectX Shader Compiler (LLVM/Clang)", + "homepage": "https://github.com/microsoft/DirectXShaderCompiler", + "documentation": "https://github.com/microsoft/DirectXShaderCompiler/wiki", + "license": null, + "supports": "windows & x64 & !uwp & !staticcrt" +} diff --git a/externals/vcpkg/ports/directx-headers/portfile.cmake b/externals/vcpkg/ports/directx-headers/portfile.cmake new file mode 100755 index 000000000..02dad0355 --- /dev/null +++ b/externals/vcpkg/ports/directx-headers/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Microsoft/DirectX-Headers + REF v1.602.0 + SHA512 75d81191e3e0b60bc901f04fcb9cf53f0faae7f0c196a1b04f2b9199c72243d4dddaeacad29d82ca7ccb209b16d07b4f1b71a58368fccad13c4d8421e0c9f0d9 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS -DDXHEADERS_BUILD_TEST=OFF -DDXHEADERS_BUILD_GOOGLE_TEST=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/directx-headers/cmake) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/directx-headers/vcpkg.json b/externals/vcpkg/ports/directx-headers/vcpkg.json new file mode 100755 index 000000000..b250c966d --- /dev/null +++ b/externals/vcpkg/ports/directx-headers/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "directx-headers", + "version": "1.602.0", + "description": "Official DirectX 12 Headers", + "homepage": "https://devblogs.microsoft.com/directx/", + "documentation": "https://devblogs.microsoft.com/directx/gettingstarted-dx12agility/", + "license": "MIT", + "supports": "windows | linux", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/directxmath/portfile.cmake b/externals/vcpkg/ports/directxmath/portfile.cmake new file mode 100755 index 000000000..ac48abe34 --- /dev/null +++ b/externals/vcpkg/ports/directxmath/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Microsoft/DirectXMath + REF may2022 + SHA512 685e5a0cdd1bc66a5df628f864eae0959d5d5abdcc7e9242ea7af1d5b011cb0705447c366bacd456db96e39dac8cf0e0618a6e055a7db821cdcfa20a1ad08868 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/directxmath/cmake) + +if(NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_download_distfile( + SAL_HEADER + URLS "https://raw.githubusercontent.com/dotnet/corert/master/src/Native/inc/unix/sal.h" + FILENAME "sal.h" + SHA512 1643571673195d9eb892d2f2ac76eac7113ef7aa0ca116d79f3e4d3dc9df8a31600a9668b7e7678dfbe5a76906f9e0734ef8d6db0903ccc68fc742dd8238d8b0 + ) + + file(INSTALL + ${DOWNLOADS}/sal.h + DESTINATION ${CURRENT_PACKAGES_DIR}/include/DirectXMath) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/directxmath/vcpkg.json b/externals/vcpkg/ports/directxmath/vcpkg.json new file mode 100755 index 000000000..af66543c5 --- /dev/null +++ b/externals/vcpkg/ports/directxmath/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "directxmath", + "version-date": "2022-05-18", + "description": "DirectXMath SIMD C++ math library", + "homepage": "https://github.com/Microsoft/DirectXMath", + "documentation": "https://docs.microsoft.com/windows/win32/dxmath/directxmath-portal", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/directxmesh/portfile.cmake b/externals/vcpkg/ports/directxmesh/portfile.cmake new file mode 100755 index 000000000..807ef0517 --- /dev/null +++ b/externals/vcpkg/ports/directxmesh/portfile.cmake @@ -0,0 +1,62 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Microsoft/DirectXMesh + REF may2022 + SHA512 f82ac5bf8211cb5699caf79cf2fb13eb23b4c3c8de807bc114966cc8e933b3bdb2c98940c9add74ee9ad0addb1bdf91dd16cbe2efe2db2afd96f69fd3871d556 + HEAD_REF main +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + dx12 BUILD_DX12 +) + +if (VCPKG_HOST_IS_LINUX) + message(WARNING "Build ${PORT} requires GCC version 9 or later") +endif() + +if(VCPKG_TARGET_IS_UWP) + set(EXTRA_OPTIONS -DBUILD_TOOLS=OFF) +else() + set(EXTRA_OPTIONS -DBUILD_TOOLS=ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS ${FEATURE_OPTIONS} ${EXTRA_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/directxmesh/cmake) + +if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) + vcpkg_download_distfile( + MESHCONVERT_EXE + URLS "https://github.com/Microsoft/DirectXMesh/releases/download/may2022/meshconvert.exe" + FILENAME "meshconvert-may2022.exe" + SHA512 0fcc3728425bc9681bdc4e1fae79a0f3da638d1b43597171e6829fca85cec8e7f1aa30a51c2f9457074c0a7bb9f358da06df666b6ae054266ceb1c9c38874547 + ) + + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxmesh/") + + file(INSTALL + ${MESHCONVERT_EXE} + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxmesh/) + + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-may2022.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe) + +elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) + + vcpkg_copy_tools( + TOOL_NAMES meshconvert + SEARCH_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake + ) + +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/directxmesh/vcpkg.json b/externals/vcpkg/ports/directxmesh/vcpkg.json new file mode 100755 index 000000000..e864903f0 --- /dev/null +++ b/externals/vcpkg/ports/directxmesh/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "directxmesh", + "version-date": "2022-05-09", + "description": "DirectXMesh geometry processing library", + "homepage": "https://github.com/Microsoft/DirectXMesh", + "documentation": "https://github.com/microsoft/DirectXMesh/wiki", + "license": "MIT", + "supports": "windows | linux", + "dependencies": [ + "directx-headers", + "directxmath", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "dx12": { + "description": "Build with DirectX12 support for Windows 10" + } + } +} diff --git a/externals/vcpkg/ports/directxsdk/portfile.cmake b/externals/vcpkg/ports/directxsdk/portfile.cmake new file mode 100755 index 000000000..3e38e42e1 --- /dev/null +++ b/externals/vcpkg/ports/directxsdk/portfile.cmake @@ -0,0 +1,150 @@ +if(EXISTS "${CURRENT_INSTALLED_DIR}/share/dxsdk-d3dx/copyright") + message(FATAL_ERROR "Can't build ${PORT} if dxsdk-d3dx is installed. Please remove dxsdk-d3dx, and try to install ${PORT} again if you need it.") +endif() + +message(WARNING "Build ${PORT} is deprecated, untested in CI, and requires the use of the DirectSetup legacy REDIST solution. See https://aka.ms/dxsdk for more information.") + +vcpkg_download_distfile(ARCHIVE + URLS "https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/DXSDK_Jun10.exe" + FILENAME "DXSDK_Jun10_SHA256.exe" + SHA512 24e1e9bda319b780124b865f4640822cfc44e4d18fbdcc8456d48fe54081652ce4ddb63d3bd8596351057cbae50fc824b8297e99f0f7c97547153162562ba73f +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +# See https://walbourn.github.io/the-zombie-directx-sdk/ +set(INC_DIR "${SOURCE_PATH}/Include") +set(LIB_DIR "${SOURCE_PATH}/Lib/${VCPKG_TARGET_ARCHITECTURE}") + +set(HEADERS + ${INC_DIR}/audiodefs.h + ${INC_DIR}/comdecl.h + ${INC_DIR}/D3DX10.h + ${INC_DIR}/d3dx10async.h + ${INC_DIR}/D3DX10core.h + ${INC_DIR}/D3DX10math.h + ${INC_DIR}/D3DX10math.inl + ${INC_DIR}/D3DX10mesh.h + ${INC_DIR}/D3DX10tex.h + ${INC_DIR}/D3DX11.h + ${INC_DIR}/D3DX11async.h + ${INC_DIR}/D3DX11core.h + ${INC_DIR}/D3DX11tex.h + ${INC_DIR}/d3dx9.h + ${INC_DIR}/d3dx9anim.h + ${INC_DIR}/d3dx9core.h + ${INC_DIR}/d3dx9effect.h + ${INC_DIR}/d3dx9math.h + ${INC_DIR}/d3dx9math.inl + ${INC_DIR}/d3dx9mesh.h + ${INC_DIR}/d3dx9shader.h + ${INC_DIR}/d3dx9shape.h + ${INC_DIR}/d3dx9tex.h + ${INC_DIR}/d3dx9xof.h + ${INC_DIR}/D3DX_DXGIFormatConvert.inl + ${INC_DIR}/dsetup.h + ${INC_DIR}/dxdiag.h + ${INC_DIR}/DxErr.h + ${INC_DIR}/dxfile.h + ${INC_DIR}/dxsdkver.h + ${INC_DIR}/PIXPlugin.h + ${INC_DIR}/rmxfguid.h + ${INC_DIR}/rmxftmpl.h + ${INC_DIR}/xact3.h + ${INC_DIR}/xact3d3.h + ${INC_DIR}/xact3wb.h + ${INC_DIR}/XDSP.h + ${INC_DIR}/xma2defs.h) + +set(DEBUG_LIBS + ${LIB_DIR}/d3dx10d.lib + ${LIB_DIR}/d3dx11d.lib + ${LIB_DIR}/d3dx9d.lib +) +set(RELEASE_LIBS + ${LIB_DIR}/d3dx10.lib + ${LIB_DIR}/d3dx11.lib + ${LIB_DIR}/d3dx9.lib +) +set(OTHER_LIBS + ${LIB_DIR}/d3dxof.lib + ${LIB_DIR}/DxErr.lib +) +if(${VCPKG_TARGET_ARCHITECTURE} STREQUAL "x86") + list(APPEND OTHER_LIBS ${LIB_DIR}/dsetup.lib) +endif() + +set(XINPUT13_HEADER ${INC_DIR}/XInput.h) +set(XINPUT13_LIB ${LIB_DIR}/XInput.lib) + +set(XAUDIO27_HEADERS + ${INC_DIR}/X3DAudio.h + ${INC_DIR}/XAPO.h + ${INC_DIR}/XAPOBase.h + ${INC_DIR}/XAPOFX.h + ${INC_DIR}/XAudio2.h + ${INC_DIR}/XAudio2fx.h) +set(XAUDIO27_DEBUG_LIBS ${LIB_DIR}/xapobased.lib) +set(XAUDIO27_RELEASE_LIBS ${LIB_DIR}/xapobase.lib) +set(XAUDIO27_OTHER_LIBS + ${LIB_DIR}/X3DAudio.lib + ${LIB_DIR}/XAPOFX.lib +) + +set(XP_HEADERS + ${INC_DIR}/D3D10.h + ${INC_DIR}/D3D10effect.h + ${INC_DIR}/d3d10misc.h + ${INC_DIR}/d3d10sdklayers.h + ${INC_DIR}/D3D10shader.h + ${INC_DIR}/D3D10_1.h + ${INC_DIR}/D3D10_1shader.h + ${INC_DIR}/D3D11.h + ${INC_DIR}/D3D11SDKLayers.h + ${INC_DIR}/D3D11Shader.h + ${INC_DIR}/D3Dcommon.h + ${INC_DIR}/D3Dcompiler.h + ${INC_DIR}/D3DCSX.h + ${INC_DIR}/D3DX_DXGIFormatConvert.inl + ${INC_DIR}/xnamath.h + ${INC_DIR}/xnamathconvert.inl + ${INC_DIR}/xnamathmatrix.inl + ${INC_DIR}/xnamathmisc.inl + ${INC_DIR}/xnamathvector.inl) + +set(XP_DEBUG_LIBS ${LIB_DIR}/D3DCSXd.lib) +set(XP_RELEASE_LIBS ${LIB_DIR}/D3DCSX.lib) +set(XP_OTHER_LIBS + ${LIB_DIR}/d3dcompiler.lib + ${LIB_DIR}/dxguid.lib +) + + +#install(DIRECTORY "${SOURCE_PATH}/Include" DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) +file(COPY ${RELEASE_LIBS} ${OTHER_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +file(COPY ${DEBUG_LIBS} ${OTHER_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + +if(("xinput1-3" IN_LIST FEATURES) OR ("xp" IN_LIST FEATURES)) + file(COPY ${XINPUT13_HEADER} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) + file(COPY ${XINPUT13_LIB} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY ${XINPUT13_LIB} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +endif() + +if(("xaudio2-7" IN_LIST FEATURES) OR ("xp" IN_LIST FEATURES)) + file(COPY ${XAUDIO27_HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) + file(COPY ${XAUDIO27_RELEASE_LIBS} ${XAUDIO27_OTHER_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY ${XAUDIO27_DEBUG_LIBS} ${XAUDIO27_OTHER_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +endif() + +if("xp" IN_LIST FEATURES) + file(COPY ${XP_HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) + file(COPY ${XP_RELEASE_LIBS} ${XP_OTHER_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY ${XP_DEBUG_LIBS} ${XP_OTHER_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +endif() + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/Documentation/License Agreements/DirectX SDK EULA.txt" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/directxsdk/vcpkg.json b/externals/vcpkg/ports/directxsdk/vcpkg.json new file mode 100755 index 000000000..178026f01 --- /dev/null +++ b/externals/vcpkg/ports/directxsdk/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "directxsdk", + "version-string": "jun10", + "port-version": 5, + "description": "Legacy DirectX SDK", + "homepage": "https://docs.microsoft.com/en-us/windows/win32/directx-sdk--august-2009-", + "supports": "windows & !uwp & !arm", + "features": { + "xaudio2-7": { + "description": "Include headers/libs for legacy XAudio 2.7 (prefer use of XAudio2Redist)" + }, + "xinput1-3": { + "description": "Include headers for legacy XInput 1.3 (prefer use of XInput 9.1.0 or 1.4)" + }, + "xp": { + "description": "Include headers/libs needed for Windows 7.1A targeting Windows XP / Server 2003" + } + } +} diff --git a/externals/vcpkg/ports/directxtex/enable_openexr_support.patch b/externals/vcpkg/ports/directxtex/enable_openexr_support.patch new file mode 100755 index 000000000..2a7141371 --- /dev/null +++ b/externals/vcpkg/ports/directxtex/enable_openexr_support.patch @@ -0,0 +1,22 @@ +diff --git a/DirectXTexEXR.cpp b/DirectXTexEXR.cpp +index 17bd171..825cfe4 100644 +--- a/DirectXTex/DirectXTexEXR.cpp ++++ b/DirectXTex/DirectXTexEXR.cpp +@@ -8,7 +8,7 @@ + //-------------------------------------------------------------------------------------- + + //Uncomment if you add DirectXTexEXR to your copy of the DirectXTex library +-//#include "DirectXTexP.h" ++#include "DirectXTexP.h" + + #include "DirectXTexEXR.h" + +@@ -57,7 +57,7 @@ using namespace DirectX; + using PackedVector::XMHALF4; + + // Comment out this first anonymous namespace if you add the include of DirectXTexP.h above +-#ifdef WIN32 ++#if 0 + namespace + { + struct handle_closer { void operator()(HANDLE h) noexcept { assert(h != INVALID_HANDLE_VALUE); if (h) CloseHandle(h); } }; diff --git a/externals/vcpkg/ports/directxtex/portfile.cmake b/externals/vcpkg/ports/directxtex/portfile.cmake new file mode 100755 index 000000000..f1af64d1d --- /dev/null +++ b/externals/vcpkg/ports/directxtex/portfile.cmake @@ -0,0 +1,112 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +if(VCPKG_TARGET_IS_MINGW) + message(NOTICE "Building ${PORT} for MinGW requires the HLSL Compiler fxc.exe also be in the PATH. See https://aka.ms/windowssdk.") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Microsoft/DirectXTex + REF may2022 + SHA512 b5783c55a1faa9ac616f93d13af91d072e5cef65bcb02c402f2a4d072036135ae610264dc5ebe4e15c56b152c0b3fd0fb87666ab16e74507218906f4210687db + HEAD_REF main +) + +if("openexr" IN_LIST FEATURES) + vcpkg_download_distfile( + DIRECTXTEX_EXR_HEADER + URLS "https://raw.githubusercontent.com/wiki/Microsoft/DirectXTex/DirectXTexEXR.h" + FILENAME "DirectXTexEXR-3.h" + SHA512 b4c75fa0e3365d63beba0ba471f0ded124b2f0e20f2c11cef76a88e6af1582889abcf5aa2ec74270d7b9bde7f7b4bc36fd17f030357b4139d8c83c35060344be + ) + + vcpkg_download_distfile( + DIRECTXTEX_EXR_SOURCE + URLS "https://raw.githubusercontent.com/wiki/Microsoft/DirectXTex/DirectXTexEXR.cpp" + FILENAME "DirectXTexEXR-3.cpp" + SHA512 9192cfea01654b1537b444cc6e3369de2f721959ad749551ad06ba92a12fa61e12f2169cf412788b0156220bb8bacf531160f924a4744e43e875163463586620 + ) + + file(COPY ${DIRECTXTEX_EXR_HEADER} DESTINATION "${SOURCE_PATH}/DirectXTex") + file(COPY ${DIRECTXTEX_EXR_SOURCE} DESTINATION "${SOURCE_PATH}/DirectXTex") + file(RENAME "${SOURCE_PATH}/DirectXTex/DirectXTexEXR-3.h" "${SOURCE_PATH}/DirectXTex/DirectXTexEXR.h") + file(RENAME "${SOURCE_PATH}/DirectXTex/DirectXTexEXR-3.cpp" "${SOURCE_PATH}/DirectXTex/DirectXTexEXR.cpp") + vcpkg_apply_patches(SOURCE_PATH "${SOURCE_PATH}" PATCHES enable_openexr_support.patch) +endif() + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + dx12 BUILD_DX12 + openexr ENABLE_OPENEXR_SUPPORT +) + +if (VCPKG_HOST_IS_LINUX) + message(WARNING "Build ${PORT} requires GCC version 9 or later") +endif() + +if(VCPKG_TARGET_IS_UWP) + set(EXTRA_OPTIONS -DBUILD_TOOLS=OFF) +else() + set(EXTRA_OPTIONS -DBUILD_TOOLS=ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + ${EXTRA_OPTIONS} + -DBUILD_SAMPLE=OFF + -DBC_USE_OPENMP=ON + -DBUILD_DX11=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/directxtex/cmake) + +if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("openexr" IN_LIST FEATURES))) + vcpkg_download_distfile( + TEXASSEMBLE_EXE + URLS "https://github.com/Microsoft/DirectXTex/releases/download/may2022/texassemble.exe" + FILENAME "texassemble-may2022.exe" + SHA512 22963920f3047533d2ec6d9751f4d2eb4d530e6c4a96099322a070f5f311785d79d07c2e79fd05daa9992deba116f630de14436df4f42b415d7511fd6193241e + ) + + vcpkg_download_distfile( + TEXCONV_EXE + URLS "https://github.com/Microsoft/DirectXTex/releases/download/may2022/texconv.exe" + FILENAME "texconv-may2022.exe" + SHA512 9f0c9307f00062883be8a2afff0f6428020d9f056db5a2f175ea3ff72e50f6fd5c57b2dbc448fe8352a86837b318bd3874995dc87d741bdeb413060618a0b08f + ) + + vcpkg_download_distfile( + TEXDIAG_EXE + URLS "https://github.com/Microsoft/DirectXTex/releases/download/may2022/texdiag.exe" + FILENAME "texdiag-may2022.exe" + SHA512 01fc96ea5cc286dfea097d3b8bedb92d41dbbab949953315e640ee019578c33e2e1b0db476e51576c92763bacfa4cdf270ebad7cac1c59b185d5fdc0752f0393 + ) + + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtex/") + + file(INSTALL + ${TEXASSEMBLE_EXE} + ${TEXCONV_EXE} + ${TEXDIAG_EXE} + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtex/") + + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-may2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-may2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-may2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe") + +elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) + + vcpkg_copy_tools( + TOOL_NAMES texassemble texconv texdiag + SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake" + ) + +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/directxtex/vcpkg.json b/externals/vcpkg/ports/directxtex/vcpkg.json new file mode 100755 index 000000000..a9699dcb9 --- /dev/null +++ b/externals/vcpkg/ports/directxtex/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "directxtex", + "version-date": "2022-05-09", + "description": "DirectXTex texture processing library", + "homepage": "https://github.com/Microsoft/DirectXTex", + "documentation": "https://github.com/microsoft/DirectXTex/wiki", + "license": "MIT", + "supports": "windows | linux", + "dependencies": [ + "directx-headers", + "directxmath", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "dx12": { + "description": "Build with DirectX12 support for Windows 10" + }, + "openexr": { + "description": "Enable OpenEXR support", + "dependencies": [ + "openexr" + ] + } + } +} diff --git a/externals/vcpkg/ports/directxtk/portfile.cmake b/externals/vcpkg/ports/directxtk/portfile.cmake new file mode 100755 index 000000000..4fb408166 --- /dev/null +++ b/externals/vcpkg/ports/directxtk/portfile.cmake @@ -0,0 +1,73 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +if(VCPKG_TARGET_IS_MINGW) + message(NOTICE "Building ${PORT} for MinGW requires the HLSL Compiler fxc.exe also be in the PATH. See https://aka.ms/windowssdk.") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Microsoft/DirectXTK + REF may2022 + SHA512 739d50c8dfa88a8905e61a797889a33c8b5a32a2e8ded1eea4c4f5fea82a9e8c04f6414ce709410def905d711cf7c8daf40e38579b355071288423b193196444 + HEAD_REF main +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + xaudio2-9 BUILD_XAUDIO_WIN10 + xaudio2-8 BUILD_XAUDIO_WIN8 + xaudio2redist BUILD_XAUDIO_WIN7 +) + +if(VCPKG_TARGET_IS_UWP) + set(EXTRA_OPTIONS -DBUILD_TOOLS=OFF) +else() + set(EXTRA_OPTIONS -DBUILD_TOOLS=ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} ${EXTRA_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/directxtk/cmake) + +if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) + vcpkg_download_distfile( + MAKESPRITEFONT_EXE + URLS "https://github.com/Microsoft/DirectXTK/releases/download/may2022/MakeSpriteFont.exe" + FILENAME "makespritefont-may2022.exe" + SHA512 6f88fec787f9db0823cc0c5aa3d2579248c3dea566909a8d41417f42a3bd2af147ff9af82a3b96a3b1d0f8661dffda27530565bb8fed0a2e7d819d471e51493b + ) + + vcpkg_download_distfile( + XWBTOOL_EXE + URLS "https://github.com/Microsoft/DirectXTK/releases/download/may2022/XWBTool.exe" + FILENAME "xwbtool-may2022.exe" + SHA512 505c7aa7a22ea78a793ba70f136b13548a69b36cd8ec1631969203deff6e93236460c674b219316793aa475f1350ad56f4a3f844e94c3adba0af7b1723c8765e + ) + + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/") + + file(INSTALL + ${MAKESPRITEFONT_EXE} + ${XWBTOOL_EXE} + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk/") + + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-may2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-may2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe") + +elseif(NOT VCPKG_TARGET_IS_UWP) + + vcpkg_copy_tools( + TOOL_NAMES XWBTool + SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake" + ) + +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/directxtk/vcpkg.json b/externals/vcpkg/ports/directxtk/vcpkg.json new file mode 100755 index 000000000..682bd7717 --- /dev/null +++ b/externals/vcpkg/ports/directxtk/vcpkg.json @@ -0,0 +1,37 @@ +{ + "name": "directxtk", + "version-date": "2022-05-09", + "description": "A collection of helper classes for writing DirectX 11.x code in C++.", + "homepage": "https://github.com/Microsoft/DirectXTK", + "documentation": "https://github.com/microsoft/DirectXTK/wiki", + "license": "MIT", + "supports": "windows", + "dependencies": [ + "directxmath", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "xaudio2-8": { + "description": "Build with XAudio 2.8 support for Windows 8.x or later" + }, + "xaudio2-9": { + "description": "Build with XAudio 2.9 support for Windows 10/11" + }, + "xaudio2redist": { + "description": "Build with XAudio2Redist support for Windows 7 SP1 or later", + "dependencies": [ + { + "name": "xaudio2redist", + "platform": "!uwp & !arm" + } + ] + } + } +} diff --git a/externals/vcpkg/ports/directxtk12/portfile.cmake b/externals/vcpkg/ports/directxtk12/portfile.cmake new file mode 100755 index 000000000..ba2f498a2 --- /dev/null +++ b/externals/vcpkg/ports/directxtk12/portfile.cmake @@ -0,0 +1,58 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +if(VCPKG_TARGET_IS_MINGW) + message(NOTICE "Building ${PORT} for MinGW requires the HLSL Compiler dxc.exe also be in the PATH. See https://github.com/microsoft/DirectXShaderCompiler.") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Microsoft/DirectXTK12 + REF may2022 + SHA512 a306792c134458766ff0ce2672b4769d261080258207173aaff9e59c3a975859df2a540ea8537e28fc2aa1693237c3609665b87c4cf1d9115ac41c7a45ff5d61 + HEAD_REF main +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + xaudio2-9 BUILD_XAUDIO_WIN10 + xaudio2redist BUILD_XAUDIO_REDIST +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} -DBUILD_DXIL_SHADERS=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/directxtk12/cmake) + +if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) + vcpkg_download_distfile( + MAKESPRITEFONT_EXE + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/may2022/MakeSpriteFont.exe" + FILENAME "makespritefont-may2022.exe" + SHA512 6f88fec787f9db0823cc0c5aa3d2579248c3dea566909a8d41417f42a3bd2af147ff9af82a3b96a3b1d0f8661dffda27530565bb8fed0a2e7d819d471e51493b + ) + + vcpkg_download_distfile( + XWBTOOL_EXE + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/may2022/XWBTool.exe" + FILENAME "xwbtool-may2022.exe" + SHA512 505c7aa7a22ea78a793ba70f136b13548a69b36cd8ec1631969203deff6e93236460c674b219316793aa475f1350ad56f4a3f844e94c3adba0af7b1723c8765e + ) + + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") + + file(INSTALL + ${MAKESPRITEFONT_EXE} + ${XWBTOOL_EXE} + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") + + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-may2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-may2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/directxtk12/vcpkg.json b/externals/vcpkg/ports/directxtk12/vcpkg.json new file mode 100755 index 000000000..e86107c4b --- /dev/null +++ b/externals/vcpkg/ports/directxtk12/vcpkg.json @@ -0,0 +1,38 @@ +{ + "name": "directxtk12", + "version-date": "2022-05-09", + "description": "A collection of helper classes for writing DirectX 12 code in C++.", + "homepage": "https://github.com/Microsoft/DirectXTK12", + "documentation": "https://github.com/microsoft/DirectXTK12/wiki", + "license": "MIT", + "supports": "windows", + "dependencies": [ + "directx-headers", + "directxmath", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "xaudio2-9" + ], + "features": { + "xaudio2-9": { + "description": "Build with XAudio 2.9 support for Windows 10/11" + }, + "xaudio2redist": { + "description": "Build with XAudio2Redist", + "dependencies": [ + { + "name": "xaudio2redist", + "platform": "!uwp & !arm" + } + ] + } + } +} diff --git a/externals/vcpkg/ports/dirent/portfile.cmake b/externals/vcpkg/ports/dirent/portfile.cmake new file mode 100755 index 000000000..945f6017a --- /dev/null +++ b/externals/vcpkg/ports/dirent/portfile.cmake @@ -0,0 +1,17 @@ +if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + return() +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tronkko/dirent + REF 1.23.2 + SHA512 e7a991445ee9ca8f1118753df559d28beb283b3c0d25edcfb23dd5322f2bdfeadffe802d0c908bb6d4dfc17bf5ec38bdecfa717319fb4e26682bee0ba0d14c5c + HEAD_REF master +) +file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/dirent RENAME copyright) +vcpkg_copy_pdbs() + +set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) diff --git a/externals/vcpkg/ports/dirent/vcpkg.json b/externals/vcpkg/ports/dirent/vcpkg.json new file mode 100755 index 000000000..82a21b2ce --- /dev/null +++ b/externals/vcpkg/ports/dirent/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "dirent", + "version-string": "1.23.2", + "port-version": 1, + "description": "Dirent is a C/C++ programming interface that allows programmers to retrieve information about files and directories under Linux/UNIX. This project provides Linux compatible Dirent interface for Microsoft Windows.", + "homepage": "https://github.com/tronkko/dirent" +} diff --git a/externals/vcpkg/ports/discord-game-sdk/CMakeLists.txt b/externals/vcpkg/ports/discord-game-sdk/CMakeLists.txt new file mode 100755 index 000000000..f5a1d5136 --- /dev/null +++ b/externals/vcpkg/ports/discord-game-sdk/CMakeLists.txt @@ -0,0 +1,19 @@ +cmake_minimum_required(VERSION 3.5) + +project(discord_game_sdk_cpp) + +find_library(SDK_LIB + "discord_game_sdk" + PATHS "${SDK_LIB_FOLDER}" + NO_DEFAULT_PATH +) + +file(GLOB SRC_FILES "${PROJECT_SOURCE_DIR}/cpp/*.cpp") +file(GLOB_RECURSE HDR_FILES "${PROJECT_SOURCE_DIR}/*.h") + +add_library(discord_game_sdk_cpp STATIC ${SRC_FILES}) +target_link_libraries(discord_game_sdk_cpp PUBLIC ${SDK_LIB}) +set_property(TARGET discord_game_sdk_cpp PROPERTY CXX_STANDARD 11) + +install(TARGETS discord_game_sdk_cpp ARCHIVE) +install(FILES ${HDR_FILES} DESTINATION "include/discord-game-sdk") \ No newline at end of file diff --git a/externals/vcpkg/ports/discord-game-sdk/copyright b/externals/vcpkg/ports/discord-game-sdk/copyright new file mode 100755 index 000000000..78b9e4fbf --- /dev/null +++ b/externals/vcpkg/ports/discord-game-sdk/copyright @@ -0,0 +1 @@ +Your use of the GameSDK is bound by the Discord Developer Terms of Service, whose text is available online at https://discord.com/developers/docs/legal. diff --git a/externals/vcpkg/ports/discord-game-sdk/include-cstdint.patch b/externals/vcpkg/ports/discord-game-sdk/include-cstdint.patch new file mode 100755 index 000000000..6e61c4c25 --- /dev/null +++ b/externals/vcpkg/ports/discord-game-sdk/include-cstdint.patch @@ -0,0 +1,25 @@ +From 91fab7c4b8f7da3182f07f5392ebe9388f979157 Mon Sep 17 00:00:00 2001 +From: Maki +Date: Wed, 3 Jun 2020 01:40:58 +0100 +Subject: [PATCH] Include cstdint + +--- + cpp/types.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/cpp/types.h b/cpp/types.h +index 8c7cc2b..122dc71 100644 +--- a/cpp/types.h ++++ b/cpp/types.h +@@ -3,6 +3,8 @@ + #include "ffi.h" + #include "event.h" + ++#include ++ + namespace discord { + + enum class Result { +-- +2.26.2 + diff --git a/externals/vcpkg/ports/discord-game-sdk/portfile.cmake b/externals/vcpkg/ports/discord-game-sdk/portfile.cmake new file mode 100755 index 000000000..ab3bec66b --- /dev/null +++ b/externals/vcpkg/ports/discord-game-sdk/portfile.cmake @@ -0,0 +1,48 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_download_distfile(ARCHIVE + URLS https://dl-game-sdk.discordapp.net/2.5.6/discord_game_sdk.zip + FILENAME discord_game_sdk.zip + SHA512 4c8f72c7bdf92bc969fb86b96ea0d835e01b9bab1a2cc27ae00bdac1b9733a1303ceadfe138c24a7609b76d61d49999a335dd596cf3f335d894702e2aa23406f +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL + PATCHES + include-cstdint.patch # allows compiling on newer versions of GCC +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION ${SOURCE_PATH}) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(ARCH_FOLDER "x86") +else(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(ARCH_FOLDER "x86_64") +endif() + +if(VCPKG_TARGET_IS_WINDOWS) + file(INSTALL "${SOURCE_PATH}/lib/${ARCH_FOLDER}/discord_game_sdk.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${SOURCE_PATH}/lib/${ARCH_FOLDER}/discord_game_sdk.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${SOURCE_PATH}/lib/${ARCH_FOLDER}/discord_game_sdk.dll.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib" RENAME "discord_game_sdk.lib") + file(INSTALL "${SOURCE_PATH}/lib/${ARCH_FOLDER}/discord_game_sdk.dll.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" RENAME "discord_game_sdk.lib") +elseif(VCPKG_TARGET_IS_OSX) + file(INSTALL "${SOURCE_PATH}/lib/${ARCH_FOLDER}/discord_game_sdk.dylib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib" RENAME "libdiscord_game_sdk.dylib") + file(INSTALL "${SOURCE_PATH}/lib/${ARCH_FOLDER}/discord_game_sdk.dylib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" RENAME "libdiscord_game_sdk.dylib") +elseif(VCPKG_TARGET_IS_LINUX) + file(INSTALL "${SOURCE_PATH}/lib/${ARCH_FOLDER}/discord_game_sdk.so" DESTINATION "${CURRENT_PACKAGES_DIR}/lib" RENAME "libdiscord_game_sdk.so") + file(INSTALL "${SOURCE_PATH}/lib/${ARCH_FOLDER}/discord_game_sdk.so" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" RENAME "libdiscord_game_sdk.so") +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + "-DSDK_LIB_FOLDER=${CURRENT_PACKAGES_DIR}/lib" +) +vcpkg_install_cmake() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/discord-game-sdk/usage b/externals/vcpkg/ports/discord-game-sdk/usage new file mode 100755 index 000000000..11faa0c98 --- /dev/null +++ b/externals/vcpkg/ports/discord-game-sdk/usage @@ -0,0 +1,12 @@ +The package discord-game-sdk does not provides CMake integration: + + find_library(GAME_SDK discord_game_sdk) + target_link_libraries( PRIVATE ${GAME_SDK}) + + find_path(GAME_SDK_INCLUDE discord-game-sdk/discord.h) + target_include_directories( PRIVATE ${GAME_SDK_INCLUDE}) + +The C++ SDK source code is compiled in a static library: + + find_library(CPP_GAME_SDK discord_game_sdk_cpp) + target_link_libraries( PRIVATE ${CPP_GAME_SDK}) diff --git a/externals/vcpkg/ports/discord-game-sdk/vcpkg.json b/externals/vcpkg/ports/discord-game-sdk/vcpkg.json new file mode 100755 index 000000000..5282f601e --- /dev/null +++ b/externals/vcpkg/ports/discord-game-sdk/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "discord-game-sdk", + "version": "2.5.6", + "port-version": 4, + "description": "The Discord GameSDK is an easy drop-in SDK to help you manage all the hard things that come with making a game.", + "homepage": "https://discord.com/developers/docs/game-sdk/sdk-starter-guide", + "supports": "((x64 & (windows | osx | linux)) | (x86 & windows)) & !uwp & !static" +} diff --git a/externals/vcpkg/ports/discord-rpc/disable-downloading.patch b/externals/vcpkg/ports/discord-rpc/disable-downloading.patch new file mode 100755 index 000000000..bb8504960 --- /dev/null +++ b/externals/vcpkg/ports/discord-rpc/disable-downloading.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5dad9e9..961f02d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,6 +12,7 @@ file(GLOB_RECURSE ALL_SOURCE_FILES + src/*.cpp src/*.h src/*.c + ) + ++if(0) + # Set CLANG_FORMAT_SUFFIX if you are using custom clang-format, e.g. clang-format-5.0 + find_program(CLANG_FORMAT_CMD clang-format${CLANG_FORMAT_SUFFIX}) + +@@ -43,7 +44,7 @@ if (NOT RAPIDJSONTEST) + ) + file(REMOVE ${RJ_TAR_FILE}) + endif(NOT RAPIDJSONTEST) +- ++endif() + find_file(RAPIDJSON NAMES rapidjson rapidjson-1.1.0 PATHS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty CMAKE_FIND_ROOT_PATH_BOTH) + + add_library(rapidjson STATIC IMPORTED ${RAPIDJSON}) diff --git a/externals/vcpkg/ports/discord-rpc/portfile.cmake b/externals/vcpkg/ports/discord-rpc/portfile.cmake new file mode 100755 index 000000000..9553f4de9 --- /dev/null +++ b/externals/vcpkg/ports/discord-rpc/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO discordapp/discord-rpc + REF v3.4.0 + SHA512 ca981b833aff5f21fd629a704deadd8e3fb5423d959ddb75e381313f6462d984c567671b10c8f031905c08d85792ddbe2dddc402ba2613c42de9e80fc68d0d51 + HEAD_REF master + PATCHES disable-downloading.patch +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) +file(REMOVE_RECURSE ${SOURCE_PATH}/thirdparty) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DUSE_STATIC_CRT=${STATIC_CRT} + -DBUILD_EXAMPLES=OFF + -DRAPIDJSONTEST=TRUE + -DRAPIDJSON=${CURRENT_INSTALLED_DIR} +) + +if(EXISTS ${SOURCE_PATH}/thirdparty) + message(FATAL_ERROR "The source directory should not be modified during the build.") +endif() + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Copy copright information +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/discord-rpc" RENAME "copyright") + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/discord-rpc/vcpkg.json b/externals/vcpkg/ports/discord-rpc/vcpkg.json new file mode 100755 index 000000000..12ab91796 --- /dev/null +++ b/externals/vcpkg/ports/discord-rpc/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "discord-rpc", + "version-string": "3.4.0", + "port-version": 1, + "description": "Rich Presence allows you to leverage the totally overhauled \"Now Playing\" section in a Discord user's profile to help people play your game together.", + "homepage": "https://github.com/discordapp/discord-rpc", + "dependencies": [ + "rapidjson" + ] +} diff --git a/externals/vcpkg/ports/discordcoreapi/portfile.cmake b/externals/vcpkg/ports/discordcoreapi/portfile.cmake new file mode 100755 index 000000000..c5bbb6f52 --- /dev/null +++ b/externals/vcpkg/ports/discordcoreapi/portfile.cmake @@ -0,0 +1,31 @@ +if(VCPKG_TARGET_IS_LINUX) + message(WARNING "DiscordCoreAPI only supports g++ 11 on linux.") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO RealTimeChris/DiscordCoreAPI + REF e80a0209c3192252ac7f7cd6a4d16afaf42f7902 + SHA512 6f318e12613b5a5103ffdd093ab7e281ffcc1320de2f7612a55d5402d2dc85d24356acd8a27c0734b1eec2bc0dc6f8a6e1fa97ea200a18c2d05225ab472ecffc + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(NO_PREFIX_CORRECTION) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file( + INSTALL "${SOURCE_PATH}/License.md" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/externals/vcpkg/ports/discordcoreapi/vcpkg.json b/externals/vcpkg/ports/discordcoreapi/vcpkg.json new file mode 100755 index 000000000..86fd14e0e --- /dev/null +++ b/externals/vcpkg/ports/discordcoreapi/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "discordcoreapi", + "version-date": "2022-05-05", + "description": "A Discord bot library written in C++ using custom asynchronous coroutines.", + "homepage": "https://discordcoreapi.com", + "license": "AGPL-3.0-or-later", + "supports": "(windows & x64 & !static) | (linux & x64)", + "dependencies": [ + "curl", + "ffmpeg", + "glib", + "libsodium", + "nlohmann-json", + "openssl", + "opus", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/discount/blocktags b/externals/vcpkg/ports/discount/blocktags new file mode 100755 index 000000000..dfd3957c3 --- /dev/null +++ b/externals/vcpkg/ports/discount/blocktags @@ -0,0 +1,34 @@ +static struct kw blocktags[] = { + { "P", 1, 0 }, + { "DL", 2, 0 }, + { "H1", 2, 0 }, + { "H2", 2, 0 }, + { "H3", 2, 0 }, + { "H4", 2, 0 }, + { "H5", 2, 0 }, + { "H6", 2, 0 }, + { "HR", 2, 1 }, + { "OL", 2, 0 }, + { "UL", 2, 0 }, + { "BDO", 3, 0 }, + { "DFN", 3, 0 }, + { "DIV", 3, 0 }, + { "MAP", 3, 0 }, + { "PRE", 3, 0 }, + { "WBR", 3, 0 }, + { "XMP", 3, 0 }, + { "FORM", 4, 0 }, + { "NOBR", 4, 0 }, + { "STYLE", 5, 0 }, + { "TABLE", 5, 0 }, + { "CENTER", 6, 0 }, + { "IFRAME", 6, 0 }, + { "OBJECT", 6, 0 }, + { "SCRIPT", 6, 0 }, + { "ADDRESS", 7, 0 }, + { "LISTING", 7, 0 }, + { "PLAINTEXT", 9, 0 }, + { "BLOCKQUOTE", 10, 0 }, +}; + +#define NR_blocktags 30 diff --git a/externals/vcpkg/ports/discount/cmake.patch b/externals/vcpkg/ports/discount/cmake.patch new file mode 100755 index 000000000..8a2278cf7 --- /dev/null +++ b/externals/vcpkg/ports/discount/cmake.patch @@ -0,0 +1,27 @@ +diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt +index 3895fdb..a183836 100644 +--- a/cmake/CMakeLists.txt ++++ b/cmake/CMakeLists.txt +@@ -182,7 +182,10 @@ if(${PROJECT_NAME}_MAKE_INSTALL) + target_include_directories(libmarkdown INTERFACE + $ + ) +- set(_TARGETS libmarkdown markdown) ++ set(_TARGETS libmarkdown) ++ if(NOT ${PROJECT_NAME}_ONLY_LIBRARY) ++ set(_TARGETS ${_TARGETS} markdown) ++ endif() + if(${PROJECT_NAME}_INSTALL_SAMPLES) + list(APPEND _TARGETS mkd2html makepage) + endif() +diff --git a/cmake/config.h.in b/cmake/config.h.in +index e08220d..e630934 100644 +--- a/cmake/config.h.in ++++ b/cmake/config.h.in +@@ -74,4 +74,6 @@ + + #define TABSTOP @TABSTOP@ + ++#define DESTRUCTOR ++ + #endif /* _CONFIG_D */ diff --git a/externals/vcpkg/ports/discount/disable-deprecated-warnings.patch b/externals/vcpkg/ports/discount/disable-deprecated-warnings.patch new file mode 100755 index 000000000..e8f4f0fb7 --- /dev/null +++ b/externals/vcpkg/ports/discount/disable-deprecated-warnings.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt +index 11fa675..34cc9ed 100644 +--- a/cmake/CMakeLists.txt ++++ b/cmake/CMakeLists.txt +@@ -20,6 +20,11 @@ set(${PROJECT_NAME}_INSTALL_SAMPLES OFF CACHE BOOL + set(${PROJECT_NAME}_ONLY_LIBRARY OFF CACHE BOOL + "Set to ON to only build markdown library (default is OFF)") + ++# MSVC deprecated warnings (C4996,strdup, ...) ++if(MSVC) ++ add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS) ++endif() ++ + # Check headers + include(CheckIncludeFile) + check_include_file(libgen.h HAVE_LIBGEN_H) diff --git a/externals/vcpkg/ports/discount/generate-blocktags-command.patch b/externals/vcpkg/ports/discount/generate-blocktags-command.patch new file mode 100755 index 000000000..13d63a25d --- /dev/null +++ b/externals/vcpkg/ports/discount/generate-blocktags-command.patch @@ -0,0 +1,29 @@ +diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt +index a183836..e9deef5 100644 +--- a/cmake/CMakeLists.txt ++++ b/cmake/CMakeLists.txt +@@ -113,12 +115,19 @@ configure_file("${_ROOT}/mkdio.h.in" + + include_directories("${_ROOT}") + +-add_executable(mktags +- "${_ROOT}/mktags.c") + +-add_custom_command(OUTPUT "${_ROOT}/blocktags" +- COMMAND mktags > blocktags +- WORKING_DIRECTORY "${_ROOT}") ++if(NOT GENERATE_BLOCKTAGS) ++ message(STATUS "Not generating blocktags") ++else() ++ message(STATUS "Using mktags to generate blocktags") ++ ++ add_executable(mktags ++ "${_ROOT}/mktags.c") ++ ++ add_custom_command(OUTPUT "${_ROOT}/blocktags" ++ COMMAND mktags > blocktags ++ WORKING_DIRECTORY "${_ROOT}") ++endif() + + add_library(libmarkdown + "${_ROOT}/mkdio.c" diff --git a/externals/vcpkg/ports/discount/portfile.cmake b/externals/vcpkg/ports/discount/portfile.cmake new file mode 100755 index 000000000..bac98be81 --- /dev/null +++ b/externals/vcpkg/ports/discount/portfile.cmake @@ -0,0 +1,43 @@ +# No dynamic link for MSVC +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Orc/discount + REF v2.2.6 + SHA512 4c5956dea78aacd3a105ddac13f1671d811a5b2b04990cdf8485c36190c8872c4b1b9432a7236f669c34b07564ecd0096632dced54d67de9eaf4f23641417ecc + HEAD_REF master + PATCHES + cmake.patch + generate-blocktags-command.patch + disable-deprecated-warnings.patch +) + +set(GENERATE_BLOCKTAGS ON) +if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm" OR VCPKG_TARGET_ARCHITECTURE MATCHES "arm64" OR VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore") + set(GENERATE_BLOCKTAGS OFF) +endif() + +if(NOT GENERATE_BLOCKTAGS) + configure_file("${CURRENT_PORT_DIR}/blocktags" "${SOURCE_PATH}/blocktags" COPYONLY) + message(STATUS "Copied blocktags") +endif() + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}/cmake" + PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DDISCOUNT_ONLY_LIBRARY=ON + -DGENERATE_BLOCKTAGS=${GENERATE_BLOCKTAGS} +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/discount) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/discount" RENAME copyright) + diff --git a/externals/vcpkg/ports/discount/vcpkg.json b/externals/vcpkg/ports/discount/vcpkg.json new file mode 100755 index 000000000..7fcbc5103 --- /dev/null +++ b/externals/vcpkg/ports/discount/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "discount", + "version-string": "2.2.6", + "port-version": 1, + "description": "DISCOUNT is a implementation of John Gruber & Aaron Swartz's Markdown markup language.", + "homepage": "https://github.com/Orc/discount" +} diff --git a/externals/vcpkg/ports/discreture/portfile.cmake b/externals/vcpkg/ports/discreture/portfile.cmake new file mode 100755 index 000000000..51bec5feb --- /dev/null +++ b/externals/vcpkg/ports/discreture/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mraggi/discreture + REF eeeec31c814e6a9a8506a6bfd6a5b35704350605 + SHA512 de1c7d74d337605fd9b9d1f3ee6637b4afd179d495de243b21168b0a4376b83c0519b4cced985af694850755ab1e3caca5087b3ca0cd6ccb3b73b10bd6b25b49 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/externals/vcpkg/ports/discreture/usage b/externals/vcpkg/ports/discreture/usage new file mode 100755 index 000000000..00af38177 --- /dev/null +++ b/externals/vcpkg/ports/discreture/usage @@ -0,0 +1,4 @@ +The package discreture is header only and can be used from CMake via: + + find_path(DISCRETURE_INCLUDE_DIRS "discreture.hpp") + target_include_directories(main PRIVATE ${DISCRETURE_INCLUDE_DIRS}) \ No newline at end of file diff --git a/externals/vcpkg/ports/discreture/vcpkg.json b/externals/vcpkg/ports/discreture/vcpkg.json new file mode 100755 index 000000000..f5869ba4c --- /dev/null +++ b/externals/vcpkg/ports/discreture/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "discreture", + "version-string": "2020-01-29", + "port-version": 1, + "description": "A modern C++ library for efficiently and easily iterating through common combinatorial objects, such as combinations, permutations, partitions and more.", + "homepage": "https://github.com/mraggi/discreture", + "dependencies": [ + "boost-container", + "boost-iterator" + ] +} diff --git a/externals/vcpkg/ports/distorm/CMakeLists.txt b/externals/vcpkg/ports/distorm/CMakeLists.txt new file mode 100755 index 000000000..80fc9202b --- /dev/null +++ b/externals/vcpkg/ports/distorm/CMakeLists.txt @@ -0,0 +1,38 @@ +cmake_minimum_required(VERSION 3.8.0) +project(distorm C) + +set(CMAKE_C_STANDARD 99) + +if(MSVC) + add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS -DNOMINMAX) +endif() + +include_directories(include src) + +add_library(distorm + src/decoder.c + src/distorm.c + src/instructions.c + src/insts.c + src/mnemonics.c + src/operands.c + src/prefix.c + src/textdefs.c +) + +if(BUILD_SHARED_LIBS) + target_compile_definitions(distorm PRIVATE -DDISTORM_DYNAMIC=1 -DSUPPORT_64BIT_OFFSET=1) +else() + target_compile_definitions(distorm PRIVATE -DDISTORM_STATIC=1 -DSUPPORT_64BIT_OFFSET=1) +endif() + +install( + TARGETS distorm + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES include/distorm.h include/mnemonics.h DESTINATION include) +endif() diff --git a/externals/vcpkg/ports/distorm/fix-arm-builds.patch b/externals/vcpkg/ports/distorm/fix-arm-builds.patch new file mode 100755 index 000000000..cf2921266 --- /dev/null +++ b/externals/vcpkg/ports/distorm/fix-arm-builds.patch @@ -0,0 +1,12 @@ +--- a/src/textdefs.c ++++ b/src/textdefs.c +@@ -42,7 +42,8 @@ + s->length = len * 2; + s->p[len * 2] = 0; + do { +- RSHORT(&s->p[i]) = RSHORT(&TextBTable[(*buf) * 2]); ++ s->p[i] = TextBTable[(*buf) * 2]; ++ s->p[i + 1] = TextBTable[(*buf) * 2 + 1]; + buf++; + i += 2; + } while (i < len * 2); diff --git a/externals/vcpkg/ports/distorm/portfile.cmake b/externals/vcpkg/ports/distorm/portfile.cmake new file mode 100755 index 000000000..bcdcbadb1 --- /dev/null +++ b/externals/vcpkg/ports/distorm/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gdabah/distorm + REF 3.5.2b + SHA512 8AAD0C51E8D9DFAEAA069A3D4FADE4BDF87CCE464C85898B6B4888FA51A9BB6EC1221FAF32ACF59EBD047CCEB9A535B2FF93D196FD14FA834D8ECE5685417A55 + HEAD_REF master + PATCHES + fix-arm-builds.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/distorm/vcpkg.json b/externals/vcpkg/ports/distorm/vcpkg.json new file mode 100755 index 000000000..c4daddc21 --- /dev/null +++ b/externals/vcpkg/ports/distorm/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "distorm", + "version-string": "3.5.2b", + "description": "Powerful Disassembler Library For x86/AMD64", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/dlfcn-win32/portfile.cmake b/externals/vcpkg/ports/dlfcn-win32/portfile.cmake new file mode 100755 index 000000000..29726bcc3 --- /dev/null +++ b/externals/vcpkg/ports/dlfcn-win32/portfile.cmake @@ -0,0 +1,29 @@ +set(SOURCE_VERSION 1.1.1) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO dlfcn-win32/dlfcn-win32 + REF v${SOURCE_VERSION} + SHA512 557729511546f574487f8c7de437c53bcf5ae11640349c338ead9965a4ac0f937de647839b63c821003be54dca5bcbf28f2899d2348acf7dfef31e487da1cba1 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +file(READ "${CURRENT_PACKAGES_DIR}/debug/share/dlfcn-win32/dlfcn-win32-targets-debug.cmake" dlfcn-win32_DEBUG_MODULE) +string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" dlfcn-win32_DEBUG_MODULE "${dlfcn-win32_DEBUG_MODULE}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/dlfcn-win32/dlfcn-win32-targets-debug.cmake" "${dlfcn-win32_DEBUG_MODULE}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + + +set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) diff --git a/externals/vcpkg/ports/dlfcn-win32/vcpkg.json b/externals/vcpkg/ports/dlfcn-win32/vcpkg.json new file mode 100755 index 000000000..e4d0b1651 --- /dev/null +++ b/externals/vcpkg/ports/dlfcn-win32/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "dlfcn-win32", + "version": "1.1.1", + "port-version": 6, + "description": "dlfcn-win32 is an implementation of dlfcn for Windows.", + "homepage": "https://github.com/dlfcn-win32/dlfcn-win32", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/dlib/find_blas.patch b/externals/vcpkg/ports/dlib/find_blas.patch new file mode 100755 index 000000000..47b07a483 --- /dev/null +++ b/externals/vcpkg/ports/dlib/find_blas.patch @@ -0,0 +1,13 @@ +diff --git a/dlib/cmake_utils/find_blas.cmake b/dlib/cmake_utils/find_blas.cmake +index 806b938..507f871 100644 +--- a/dlib/cmake_utils/find_blas.cmake ++++ b/dlib/cmake_utils/find_blas.cmake +@@ -438,7 +438,7 @@ endif() + # If using lapack, determine whether to mangle functions + if (lapack_found) + include(CheckFortranFunctionExists) +- set(CMAKE_REQUIRED_LIBRARIES ${lapack_libraries}) ++ set(CMAKE_REQUIRED_LIBRARIES ${lapack_libraries} ${blas_libraries}) + + check_function_exists("sgesv" LAPACK_FOUND_C_UNMANGLED) + check_function_exists("sgesv_" LAPACK_FOUND_C_MANGLED) diff --git a/externals/vcpkg/ports/dlib/fix-sqlite3-fftw-linkage.patch b/externals/vcpkg/ports/dlib/fix-sqlite3-fftw-linkage.patch new file mode 100755 index 000000000..41ba700b4 --- /dev/null +++ b/externals/vcpkg/ports/dlib/fix-sqlite3-fftw-linkage.patch @@ -0,0 +1,57 @@ +diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt +--- a/dlib/CMakeLists.txt ++++ b/dlib/CMakeLists.txt +@@ -747,32 +750,15 @@ + + + if (DLIB_LINK_WITH_SQLITE3) +- find_library(sqlite sqlite3) +- # make sure sqlite3.h is in the include path +- find_path(sqlite_path sqlite3.h) +- if (sqlite AND sqlite_path) +- set(dlib_needed_includes ${dlib_needed_includes} ${sqlite_path}) +- set(dlib_needed_libraries ${dlib_needed_libraries} ${sqlite} ) +- else() +- set(DLIB_LINK_WITH_SQLITE3 OFF CACHE STRING ${DLIB_LINK_WITH_SQLITE3_STR} FORCE ) +- endif() +- mark_as_advanced(sqlite sqlite_path) ++ find_package(unofficial-sqlite3 CONFIG) ++ set(dlib_needed_libraries ${dlib_needed_libraries} unofficial::sqlite3::sqlite3) + endif() + + + + if (DLIB_USE_FFTW) +- find_library(fftw fftw3) +- # make sure fftw3.h is in the include path +- find_path(fftw_path fftw3.h) +- if (fftw AND fftw_path) +- set(dlib_needed_includes ${dlib_needed_includes} ${fftw_path}) +- set(dlib_needed_libraries ${dlib_needed_libraries} ${fftw} ) +- else() +- set(DLIB_USE_FFTW OFF CACHE STRING ${DLIB_USE_FFTW_STR} FORCE ) +- toggle_preprocessor_switch(DLIB_USE_FFTW) +- endif() +- mark_as_advanced(fftw fftw_path) ++ find_package(FFTW3 CONFIG) ++ set(dlib_needed_libraries ${dlib_needed_libraries} FFTW3::fftw3) + endif() + + +--- a/dlib/cmake_utils/dlibConfig.cmake.in ++++ b/dlib/cmake_utils/dlibConfig.cmake.in +@@ -28,6 +28,14 @@ + include("${dlib_CMAKE_DIR}/dlib.cmake") + endif() + ++include(CMakeFindDependencyMacro) ++if("@DLIB_USE_FFTW@") ++ find_dependency(FFTW3 CONFIG) ++endif() ++if("@DLIB_LINK_WITH_SQLITE3@") ++ find_dependency(unofficial-sqlite3 CONFIG) ++endif() ++ + set(dlib_LIBRARIES dlib::dlib) + set(dlib_LIBS dlib::dlib) + set(dlib_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@" "@dlib_needed_includes@") diff --git a/externals/vcpkg/ports/dlib/force_finding_packages.patch b/externals/vcpkg/ports/dlib/force_finding_packages.patch new file mode 100755 index 000000000..558b75f1f --- /dev/null +++ b/externals/vcpkg/ports/dlib/force_finding_packages.patch @@ -0,0 +1,44 @@ +diff --git a/dlib/cmake_utils/find_libjpeg.cmake b/dlib/cmake_utils/find_libjpeg.cmake +index 3b9e656..d741f31 100644 +--- a/dlib/cmake_utils/find_libjpeg.cmake ++++ b/dlib/cmake_utils/find_libjpeg.cmake +@@ -14,7 +14,7 @@ if (DEFINED JPEG_FOUND) + return() + endif() + +-find_package(JPEG QUIET) ++find_package(JPEG REQUIRED) + + if(JPEG_FOUND) + set(JPEG_TEST_CMAKE_FLAGS +@@ -31,7 +31,7 @@ if(JPEG_FOUND) + message (STATUS "Found system copy of libjpeg: ${JPEG_LIBRARY}") + if(NOT test_for_libjpeg_worked) + set(JPEG_FOUND 0) +- message (STATUS "System copy of libjpeg is broken or too old. Will build our own libjpeg and use that instead.") ++ message (FATAL_ERROR "System copy of libjpeg is broken or too old. Will build our own libjpeg and use that instead.") + endif() + endif() + +diff --git a/dlib/cmake_utils/find_libpng.cmake b/dlib/cmake_utils/find_libpng.cmake +index 1b35604..489a4c8 100644 +--- a/dlib/cmake_utils/find_libpng.cmake ++++ b/dlib/cmake_utils/find_libpng.cmake +@@ -14,7 +14,7 @@ if (DEFINED PNG_FOUND) + return() + endif() + +-find_package(PNG QUIET) ++find_package(PNG REQUIRED) + + if(PNG_FOUND) + set(PNG_TEST_CMAKE_FLAGS +@@ -31,7 +31,7 @@ if(PNG_FOUND) + message (STATUS "Found system copy of libpng: ${PNG_LIBRARIES}") + if(NOT test_for_libpng_worked) + set(PNG_FOUND 0) +- message (STATUS "System copy of libpng is broken. Will build our own libpng and use that instead.") ++ message (FATAL_ERROR "System copy of libpng is broken. Will build our own libpng and use that instead.") + endif() + endif() + diff --git a/externals/vcpkg/ports/dlib/portfile.cmake b/externals/vcpkg/ports/dlib/portfile.cmake new file mode 100755 index 000000000..8df6a8c2b --- /dev/null +++ b/externals/vcpkg/ports/dlib/portfile.cmake @@ -0,0 +1,78 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO davisking/dlib + REF 074ab8bdbadbee1afb95653c3ce46867ed32dfa1 #v19.23 + SHA512 da7942cf006566bafdd7079cc31ac445cd66e300714e522c53dfcf6b1a811de4cf2188c9a75c978388b09554bccc4164d40afc907bf9e6f75a17f8ca10ee0355 + HEAD_REF master + PATCHES + fix-sqlite3-fftw-linkage.patch + force_finding_packages.patch + find_blas.patch +) + +file(REMOVE_RECURSE "${SOURCE_PATH}/dlib/external/libjpeg") +file(REMOVE_RECURSE "${SOURCE_PATH}/dlib/external/libpng") +file(REMOVE_RECURSE "${SOURCE_PATH}/dlib/external/zlib") + +# This fixes static builds; dlib doesn't pull in the needed transitive dependencies +file(READ "${SOURCE_PATH}/dlib/CMakeLists.txt" DLIB_CMAKE) +string(REPLACE "PNG_LIBRARY" "PNG_LIBRARIES" DLIB_CMAKE "${DLIB_CMAKE}") +file(WRITE "${SOURCE_PATH}/dlib/CMakeLists.txt" "${DLIB_CMAKE}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "sqlite3" DLIB_LINK_WITH_SQLITE3 + "fftw3" DLIB_USE_FFTW + "cuda" DLIB_USE_CUDA +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DDLIB_PNG_SUPPORT=ON + -DDLIB_JPEG_SUPPORT=ON + -DDLIB_USE_BLAS=ON + -DDLIB_USE_LAPACK=ON + -DDLIB_GIF_SUPPORT=OFF + -DDLIB_USE_MKL_FFT=OFF + -DCMAKE_DEBUG_POSTFIX=d + OPTIONS_DEBUG + -DDLIB_ENABLE_ASSERTS=ON + #-DDLIB_ENABLE_STACK_TRACE=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/dlib) + +vcpkg_fixup_pkgconfig() + +# There is no way to suppress installation of the headers and resource files in debug build. +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Remove other files not required in package +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/all") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/appveyor") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/test") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/travis") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_neon") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_cudnn") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_cuda") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_cpp11") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_avx") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_sse4") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_libjpeg") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_libpng") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/external/libpng/arm") + +# Dlib encodes debug/release in its config.h. Patch it to respond to the NDEBUG macro instead. +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dlib/config.h" "/* #undef ENABLE_ASSERTS */" "#if defined(_DEBUG)\n#define ENABLE_ASSERTS\n#endif") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dlib/config.h" "#define DLIB_DISABLE_ASSERTS" "#if !defined(_DEBUG)\n#define DLIB_DISABLE_ASSERTS\n#endif") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/dlib/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") diff --git a/externals/vcpkg/ports/dlib/vcpkg.json b/externals/vcpkg/ports/dlib/vcpkg.json new file mode 100755 index 000000000..fa7907dec --- /dev/null +++ b/externals/vcpkg/ports/dlib/vcpkg.json @@ -0,0 +1,46 @@ +{ + "name": "dlib", + "version": "19.23", + "description": "Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++", + "homepage": "https://github.com/davisking/dlib", + "license": "BSL-1.0", + "dependencies": [ + "blas", + "lapack", + "libjpeg-turbo", + "libpng", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "fftw3", + "sqlite3" + ], + "features": { + "cuda": { + "description": "CUDA support for dlib", + "dependencies": [ + "cuda", + "cudnn" + ] + }, + "fftw3": { + "description": "fftw3 support for dlib", + "dependencies": [ + "fftw3" + ] + }, + "sqlite3": { + "description": "sqlite3 support for dlib", + "dependencies": [ + "sqlite3" + ] + } + } +} diff --git a/externals/vcpkg/ports/dmlc/portfile.cmake b/externals/vcpkg/ports/dmlc/portfile.cmake new file mode 100755 index 000000000..bae56fc77 --- /dev/null +++ b/externals/vcpkg/ports/dmlc/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO dmlc/dmlc-core + REF d3fd7c5e9b9c280d3081ada3fb62705547c00bf1 + SHA512 6887d52ddd00949866c27bea3c860abb8a7ecf61feeac79d67d260635e9c3e490b6f0538cbc0ccc1f03e90ab4094bfc0fcb938adb3fb5afe9fea813d47cc7430 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openmp ENABLE_OPENMP +) + +if(VCPKG_CRT_LINKAGE STREQUAL dynamic) + set(DMLC_FORCE_SHARED_CRT ON) +else() + set(DMLC_FORCE_SHARED_CRT OFF) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DDMLC_FORCE_SHARED_CRT=${DMLC_FORCE_SHARED_CRT} + -DUSE_OPENMP=${ENABLE_OPENMP} +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/dmlc) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/dmlc/vcpkg.json b/externals/vcpkg/ports/dmlc/vcpkg.json new file mode 100755 index 000000000..d5f74b3d7 --- /dev/null +++ b/externals/vcpkg/ports/dmlc/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "dmlc", + "version-date": "2019-08-12", + "port-version": 7, + "description": "DMLC-Core is the backbone library to support all DMLC projects, offers the bricks to build efficient and scalable distributed machine learning libraries.", + "homepage": "https://github.com/dmlc/dmlc-core", + "supports": "!uwp", + "features": { + "openmp": { + "description": "Build with openmp" + } + } +} diff --git a/externals/vcpkg/ports/docopt/001-fix-unresolved-symbol.patch b/externals/vcpkg/ports/docopt/001-fix-unresolved-symbol.patch new file mode 100755 index 000000000..3078fa44c --- /dev/null +++ b/externals/vcpkg/ports/docopt/001-fix-unresolved-symbol.patch @@ -0,0 +1,28 @@ +diff --git a/docopt.h b/docopt.h +index 4c40741..06a04f8 100644 +--- a/docopt.h ++++ b/docopt.h +@@ -85,6 +85,9 @@ namespace docopt { + bool help = true, + std::string const& version = {}, + bool options_first = false) noexcept; ++ ++ /// Write out the contents to the ostream ++ std::ostream DOCOPT_API & operator<<(std::ostream&, value const&); + } + + #ifdef DOCOPT_HEADER_ONLY +diff --git a/docopt_value.h b/docopt_value.h +index a923219..7f0d6d6 100644 +--- a/docopt_value.h ++++ b/docopt_value.h +@@ -102,9 +102,6 @@ namespace docopt { + Kind kind = Kind::Empty; + Variant variant {}; + }; +- +- /// Write out the contents to the ostream +- std::ostream& operator<<(std::ostream&, value const&); + } + + namespace std { diff --git a/externals/vcpkg/ports/docopt/002-fix-install-path.patch b/externals/vcpkg/ports/docopt/002-fix-install-path.patch new file mode 100755 index 000000000..332e6e4c2 --- /dev/null +++ b/externals/vcpkg/ports/docopt/002-fix-install-path.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1aba5ae..5407e4a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -113,7 +113,10 @@ endif() + set(export_name "docopt-targets") + + # Runtime package +-install(TARGETS docopt EXPORT ${export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(TARGETS docopt EXPORT ${export_name} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + # Development package + install(TARGETS docopt_s EXPORT ${export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/externals/vcpkg/ports/docopt/install-one-flavor.patch b/externals/vcpkg/ports/docopt/install-one-flavor.patch new file mode 100755 index 000000000..f6cda826a --- /dev/null +++ b/externals/vcpkg/ports/docopt/install-one-flavor.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bff867c..cc7d706 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -113,13 +113,15 @@ endif() + set(export_name "docopt-targets") + + # Runtime package ++if(BUILD_SHARED_LIBS) + install(TARGETS docopt EXPORT ${export_name} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +- ++else() + # Development package + install(TARGETS docopt_s EXPORT ${export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++endif() + install(FILES ${docopt_HEADERS} DESTINATION include/docopt) + + # CMake Package diff --git a/externals/vcpkg/ports/docopt/portfile.cmake b/externals/vcpkg/ports/docopt/portfile.cmake new file mode 100755 index 000000000..03c6fd637 --- /dev/null +++ b/externals/vcpkg/ports/docopt/portfile.cmake @@ -0,0 +1,44 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO docopt/docopt.cpp + REF 7476f8e56b4650aaeafb4e1cda2e5d8f01fddd97 + SHA512 6765e8a3a834ad75bd87effee5ac7e174482039d26015346b95d7d64e4e0097cc3f1f2e6fd9e3e5970bf4c5719095c0a3e5edfac18217913dc88fbe569d37ae8 + HEAD_REF master + PATCHES + 001-fix-unresolved-symbol.patch + 002-fix-install-path.patch + install-one-flavor.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DWITH_EXAMPLE=OFF + -DWITH_TESTS=OFF + -DUSE_BOOST_REGEX=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/docopt) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(READ ${CURRENT_PACKAGES_DIR}/include/docopt/docopt.h _contents) + string(REPLACE "#ifdef DOCOPT_DLL" "#if 1" _contents "${_contents}") + file(WRITE ${CURRENT_PACKAGES_DIR}/include/docopt/docopt.h "${_contents}") +endif() + +# Header-only style when DOCOPT_HEADER_ONLY is defined +file(COPY + ${SOURCE_PATH}/docopt.cpp + DESTINATION ${CURRENT_PACKAGES_DIR}/include/docopt) + +# Handle copyright +file(INSTALL + ${SOURCE_PATH}/LICENSE-MIT + DESTINATION ${CURRENT_PACKAGES_DIR}/share/docopt RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/docopt/vcpkg.json b/externals/vcpkg/ports/docopt/vcpkg.json new file mode 100755 index 000000000..8e17436c4 --- /dev/null +++ b/externals/vcpkg/ports/docopt/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "docopt", + "version-string": "2018-11-01", + "port-version": 1, + "description": "Command line arguments parser that will make you smile (C++11 port)." +} diff --git a/externals/vcpkg/ports/doctest/portfile.cmake b/externals/vcpkg/ports/doctest/portfile.cmake new file mode 100755 index 000000000..2f78fb5b3 --- /dev/null +++ b/externals/vcpkg/ports/doctest/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO onqtam/doctest + REF v2.4.8 + SHA512 f9b40abfd756331f9b667f3c1e7dcf2652effacac70523834dd3946522f01459c095bdbad04651ad2ad155977e1395025f868ed4dcf5d5712aae9807afb5699c + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS + -DDOCTEST_WITH_TESTS=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/doctest) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/doctest/vcpkg.json b/externals/vcpkg/ports/doctest/vcpkg.json new file mode 100755 index 000000000..8b838d450 --- /dev/null +++ b/externals/vcpkg/ports/doctest/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "doctest", + "version": "2.4.8", + "description": "The fastest feature-rich C++11/14/17/20 single-header testing framework", + "homepage": "https://github.com/onqtam/doctest" +} diff --git a/externals/vcpkg/ports/double-conversion/portfile.cmake b/externals/vcpkg/ports/double-conversion/portfile.cmake new file mode 100755 index 000000000..39f311e13 --- /dev/null +++ b/externals/vcpkg/ports/double-conversion/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/double-conversion + REF 9e0c13564e17362aad8a32c1344a2214f71952c6 #v3.2.0 + SHA512 4579ae02196a2722cbce2888a404d026d62523256aa5f726c4b46aa25aa76d3caaf653848afb88939aac697049afc8968ddecda8a093520b392c9f963559a992 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +# Rename exported target files into something vcpkg_fixup_cmake_targets expects +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}") + vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") +endif() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/double-conversion/vcpkg.json b/externals/vcpkg/ports/double-conversion/vcpkg.json new file mode 100755 index 000000000..604189ded --- /dev/null +++ b/externals/vcpkg/ports/double-conversion/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "double-conversion", + "version": "3.2.0", + "description": "Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles.", + "homepage": "https://github.com/google/double-conversion", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/dpdk/CMakeLists.txt b/externals/vcpkg/ports/dpdk/CMakeLists.txt new file mode 100755 index 000000000..1952227ae --- /dev/null +++ b/externals/vcpkg/ports/dpdk/CMakeLists.txt @@ -0,0 +1,63 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 3.9) +PROJECT(dpdk C) + +LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}") +LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}") + +INCLUDE(ProcessorCount) +PROCESSORCOUNT(PROCS) + +#ARCH can be: i686, x86_64, ppc_64, arm64 +#MACHINE can be: native, power8, armv8a +#EXECENV can be: linuxapp, bsdapp +#TOOLCHAIN can be: gcc, icc + +SET(ARCH x86_64) +SET(MACHINE native) +SET(EXECENV linuxapp) +SET(TOOLCHAIN gcc) + +IF (CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") + SET(ARCH "i686") +ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") + SET(MACHINE arm8a) +ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") + SET(MACHINE power8) + SET(ARCH ppc_64) +ENDIF () + +IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + SET(EXECENV bsdapp) +ENDIF () + +FIND_PACKAGE(Numa REQUIRED) +FIND_PROGRAM(MAKE make) + +SET(DPDK_CFLAGS "-fPIC") +IF (CMAKE_BUILD_TYPE STREQUAL Debug) + STRING(APPEND ${DPDK_CFLAGS} "-O0 -g") +ENDIF () + +SET(DPDK_TARGET ${ARCH}-${MACHINE}-${EXECENV}-${TOOLCHAIN}) +#SET(DPDK_CONFIG O=${CMAKE_BUILD_TYPE}/build T=${DPDK_TARGET}) +SET(DPDK_CONFIG "T=${DPDK_TARGET}") + +IF (SOURCE_PATH) + SET(CMAKE_SOURCE_DIR ${SOURCE_PATH}) +ENDIF () + +ADD_CUSTOM_TARGET(dpdk-configure + COMMAND ${MAKE} config ${DPDK_CONFIG} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/ + VERBATIM + ) + +ADD_CUSTOM_TARGET(dpdk ALL + COMMAND ${MAKE} EXTRA_CFLAGS=\"${DPDK_CFLAGS}\" MAKEFLAGS=\"${DPDK_CONFIG} -j ${PROCS}\" + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/ + ) + +ADD_DEPENDENCIES(dpdk dpdk-configure) + +INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/build/lib + DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/) diff --git a/externals/vcpkg/ports/dpdk/FindNuma.cmake b/externals/vcpkg/ports/dpdk/FindNuma.cmake new file mode 100755 index 000000000..d5bb61435 --- /dev/null +++ b/externals/vcpkg/ports/dpdk/FindNuma.cmake @@ -0,0 +1,26 @@ +INCLUDE(FindPackageHandleStandardArgs) + +FIND_PATH(NUMA_ROOT_DIR + NAMES include/numa.h + PATHS ENV NUMA_ROOT + DOC "NUMA library root directory") + +FIND_PATH(NUMA_INCLUDE_DIR + NAMES numa.h + HINTS ${NUMA_ROOT_DIR} + PATH_SUFFIXES include + DOC "NUMA include directory") + +FIND_LIBRARY(NUMA_LIBRARY + NAMES numa + HINTS ${NUMA_ROOT_DIR} + DOC "NUMA library file") + +IF (NUMA_LIBRARY) + GET_FILENAME_COMPONENT(NUMA_LIBRARY_DIR ${NUMA_LIBRARY} PATH) + MARK_AS_ADVANCED(NUMA_INCLUDE_DIR NUMA_LIBRARY_DIR NUMA_LIBRARY) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(NUMA REQUIRED_VARS NUMA_ROOT_DIR NUMA_INCLUDE_DIR NUMA_LIBRARY) +ELSE () + SET(NUMA_FOUND FALSE) + MESSAGE(FATAL_ERROR "Numa library not found.\nTry: 'sudo yum install numactl numactl-devel' (or sudo apt-get install libnuma1 libnuma-dev)") +ENDIF () diff --git a/externals/vcpkg/ports/dpdk/dpdkConfig.cmake b/externals/vcpkg/ports/dpdk/dpdkConfig.cmake new file mode 100755 index 000000000..d60265a77 --- /dev/null +++ b/externals/vcpkg/ports/dpdk/dpdkConfig.cmake @@ -0,0 +1,31 @@ + +FUNCTION(SET_LIBRARY_TARGET NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR) + ADD_LIBRARY(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED) + SET_TARGET_PROPERTIES(${NAMESPACE}::${LIB_NAME} PROPERTIES + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}" + IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}" + INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}" + ) + SET(${NAMESPACE}_${LIB_NAME}_FOUND 1) +ENDFUNCTION() + +GET_FILENAME_COMPONENT(DPDK_ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) +GET_FILENAME_COMPONENT(DPDK_ROOT "${DPDK_ROOT}" PATH) +GET_FILENAME_COMPONENT(DPDK_ROOT "${DPDK_ROOT}" PATH) + +SET_LIBRARY_TARGET("DPDK" "dpdk" "${DPDK_ROOT}/debug/lib/libdpdk.a" "${DPDK_ROOT}/lib/libdpdk.a" "${DPDK_ROOT}/include/dpdk") + +IF (CMAKE_BUILD_TYPE STREQUAL Debug) + LINK_DIRECTORIES(${DPDK_ROOT}/debug/lib/) +ELSE () + LINK_DIRECTORIES(${DPDK_ROOT}/lib/) +ENDIF () + +FILE(GLOB DPDK_LIBS ${DPDK_ROOT}/lib/librte*.*) +FOREACH (LIB_FILE_NAME ${DPDK_LIBS}) + GET_FILENAME_COMPONENT(LIB_NAME ${LIB_FILE_NAME} NAME_WE) + GET_FILENAME_COMPONENT(FULL_LIB_NAME ${LIB_FILE_NAME} NAME) + STRING(REPLACE "lib" "" LIB_NAME "${LIB_NAME}") + SET_LIBRARY_TARGET("DPDK" "${LIB_NAME}" "${DPDK_ROOT}/debug/lib/${FULL_LIB_NAME}" "${DPDK_ROOT}/lib/${FULL_LIB_NAME}" "${DPDK_ROOT}/include/dpdk") +ENDFOREACH () diff --git a/externals/vcpkg/ports/dpdk/portfile.cmake b/externals/vcpkg/ports/dpdk/portfile.cmake new file mode 100755 index 000000000..9ac5fa161 --- /dev/null +++ b/externals/vcpkg/ports/dpdk/portfile.cmake @@ -0,0 +1,43 @@ +IF (NOT VCPKG_CMAKE_SYSTEM_NAME OR NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + MESSAGE(FATAL_ERROR "Intel dpdk currently only supports Linux/BSD platforms") +ENDIF () + +VCPKG_FROM_GITHUB( + OUT_SOURCE_PATH SOURCE_PATH + REPO DPDK/dpdk + REF v19.02 + SHA512 e0cc7081b163b4e264b65c1abb7e0f8aa29211539cecc5cf52986699b800eb4d4f2026377c3048c5c3bd2791e41f21645bb655797a3300740aa83633fb87626e + HEAD_REF master +) + +FIND_PATH(NUMA_INCLUDE_DIR NAME numa.h + PATHS ENV NUMA_ROOT + HINTS $ENV{HOME}/local/include /opt/local/include /usr/local/include /usr/include + ) +IF (NOT NUMA_INCLUDE_DIR) + MESSAGE(FATAL_ERROR "Numa library not found.\nTry: 'sudo yum install numactl numactl-devel' (or sudo apt-get install libnuma1 libnuma-dev)") +ENDIF () + +VCPKG_CONFIGURE_CMAKE( + SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR} + PREFER_NINJA + OPTIONS + -DSOURCE_PATH=${SOURCE_PATH} +) + +VCPKG_INSTALL_CMAKE() + +# Headers are symbolic links here, gather all, resolve and copy real files +FILE(GLOB_RECURSE HEADERS FOLLOW_SYMLINKS "${SOURCE_PATH}/build/include/*") +SET(REAL_FILES "") +FOREACH (HEADER ${HEADERS}) + GET_FILENAME_COMPONENT(REAL_FILE "${HEADER}" REALPATH) + LIST(APPEND REAL_FILES "${REAL_FILE}") +ENDFOREACH () + +FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +FILE(INSTALL ${REAL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) +FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/dpdkConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +FILE(INSTALL ${SOURCE_PATH}/license/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/dpdk/usage b/externals/vcpkg/ports/dpdk/usage new file mode 100755 index 000000000..6ecb606dd --- /dev/null +++ b/externals/vcpkg/ports/dpdk/usage @@ -0,0 +1,4 @@ +The package dpdk is compatible with built-in CMake targets: + + FIND_PACKAGE(dpdk CONFIGURE REQUIRED) + TARGET_LINK_LIBRARIES(main PRIVATE DPDK::dpdk) diff --git a/externals/vcpkg/ports/dpdk/vcpkg.json b/externals/vcpkg/ports/dpdk/vcpkg.json new file mode 100755 index 000000000..111defe83 --- /dev/null +++ b/externals/vcpkg/ports/dpdk/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "dpdk", + "version-string": "19.02", + "port-version": 1, + "description": "A set of libraries and drivers for fast packet processing", + "supports": "linux" +} diff --git a/externals/vcpkg/ports/draco/disable-symlinks.patch b/externals/vcpkg/ports/draco/disable-symlinks.patch new file mode 100755 index 000000000..62221b983 --- /dev/null +++ b/externals/vcpkg/ports/draco/disable-symlinks.patch @@ -0,0 +1,31 @@ +diff --git a/cmake/draco_targets.cmake b/cmake/draco_targets.cmake +index f2acc72..fb8ce4a 100644 +--- a/cmake/draco_targets.cmake ++++ b/cmake/draco_targets.cmake +@@ -102,10 +102,6 @@ macro(draco_add_executable) + + add_executable(${exe_NAME} ${exe_SOURCES}) + +- if(NOT EMSCRIPTEN) +- set_target_properties(${exe_NAME} PROPERTIES VERSION ${DRACO_VERSION}) +- endif() +- + if(exe_OUTPUT_NAME) + set_target_properties(${exe_NAME} PROPERTIES OUTPUT_NAME ${exe_OUTPUT_NAME}) + endif() +@@ -337,15 +333,6 @@ macro(draco_add_library) + set_target_properties(${lib_NAME} PROPERTIES PREFIX "") + endif() + +- if(NOT EMSCRIPTEN) +- # VERSION and SOVERSION as necessary +- if((lib_TYPE STREQUAL BUNDLE OR lib_TYPE STREQUAL SHARED) AND NOT MSVC) +- set_target_properties(${lib_NAME} +- PROPERTIES VERSION ${DRACO_SOVERSION} SOVERSION +- ${DRACO_SOVERSION_MAJOR}) +- endif() +- endif() +- + if(BUILD_SHARED_LIBS AND (MSVC OR WIN32)) + if(lib_TYPE STREQUAL SHARED) + target_compile_definitions(${lib_NAME} PRIVATE "DRACO_BUILDING_DLL=1") diff --git a/externals/vcpkg/ports/draco/fix-compile-error-uwp.patch b/externals/vcpkg/ports/draco/fix-compile-error-uwp.patch new file mode 100755 index 000000000..63f672d81 --- /dev/null +++ b/externals/vcpkg/ports/draco/fix-compile-error-uwp.patch @@ -0,0 +1,30 @@ +diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc +index 6e42a58..3c302b9 100644 +--- a/src/draco/io/parser_utils.cc ++++ b/src/draco/io/parser_utils.cc +@@ -152,7 +152,9 @@ bool ParseSignedInt(DecoderBuffer *buffer, int32_t *value) { + if (!ParseUnsignedInt(buffer, &v)) { + return false; + } +- *value = (sign < 0) ? -v : v; ++ if (sign < 0) ++ v *= -1; ++ *value = v; + return true; + } + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7e79da7..c4d9880 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -70,6 +70,10 @@ draco_set_build_definitions() + draco_set_cxx_flags() + draco_generate_features_h() + ++if (MSVC) ++ add_compile_options(/wd4996) ++endif() ++ + # Draco source file listing variables. + list(APPEND draco_attributes_sources + "${draco_src_root}/attributes/attribute_octahedron_transform.cc" diff --git a/externals/vcpkg/ports/draco/fix-uwperror.patch b/externals/vcpkg/ports/draco/fix-uwperror.patch new file mode 100755 index 000000000..54e2cc9ab --- /dev/null +++ b/externals/vcpkg/ports/draco/fix-uwperror.patch @@ -0,0 +1,13 @@ +diff --git a/src/draco/core/bit_utils.h b/src/draco/core/bit_utils.h +index a102095..b6ba69b 100644 +--- a/src/draco/core/bit_utils.h ++++ b/src/draco/core/bit_utils.h +@@ -27,6 +27,8 @@ + #include + #endif // defined(_MSC_VER) + ++#pragma warning(disable:4146) ++ + namespace draco { + + // Returns the number of '1' bits within the input 32 bit integer. diff --git a/externals/vcpkg/ports/draco/portfile.cmake b/externals/vcpkg/ports/draco/portfile.cmake new file mode 100755 index 000000000..bde70c664 --- /dev/null +++ b/externals/vcpkg/ports/draco/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/draco + REF 1.4.3 + SHA512 f2220d5e84a4ca2d14c6bbc3dca0a2ed5c988849d3a98ce3dea910efe005e0ccdff06677d782cdb1673db9e158905aa91a9305432dc5621e8947b2d90f5996d3 + HEAD_REF master + PATCHES + fix-compile-error-uwp.patch + fix-uwperror.patch + disable-symlinks.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake) +vcpkg_fixup_pkgconfig() + +# Install tools and plugins +vcpkg_copy_tools( + TOOL_NAMES + draco_encoder + draco_decoder + AUTO_CLEAN +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/draco/vcpkg.json b/externals/vcpkg/ports/draco/vcpkg.json new file mode 100755 index 000000000..288be5537 --- /dev/null +++ b/externals/vcpkg/ports/draco/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "draco", + "version": "1.4.3", + "description": " A library for compressing and decompressing 3D geometric meshes and point clouds. It is intended to improve the storage and transmission of 3D graphics.", + "homepage": "https://github.com/google/draco", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/drlibs/portfile.cmake b/externals/vcpkg/ports/drlibs/portfile.cmake new file mode 100755 index 000000000..9919d67a6 --- /dev/null +++ b/externals/vcpkg/ports/drlibs/portfile.cmake @@ -0,0 +1,15 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mackron/dr_libs + REF c729134b41cf09542542b5da841ac2f933b36cba + SHA512 3760a5921d120db21c9351e7edf1877b7052783e20dd7f6ab673992db0f6e4014c07c559f993f7870f6e7fe021b5e47b10b27ea0ed3895d07077b0eea8e13078 + HEAD_REF master +) + +# Copy the header files +file(GLOB HEADER_FILES "${SOURCE_PATH}/*.h") +file(COPY ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +# Put the licence file where vcpkg expects it +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/drlibs/vcpkg.json b/externals/vcpkg/ports/drlibs/vcpkg.json new file mode 100755 index 000000000..db59c2fe4 --- /dev/null +++ b/externals/vcpkg/ports/drlibs/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "drlibs", + "version-date": "2022-04-03", + "description": "Single-file audio decoding libraries for C/C++", + "homepage": "https://github.com/mackron/dr_libs", + "license": "Unlicense OR MIT-0" +} diff --git a/externals/vcpkg/ports/drogon/drogon_config.patch b/externals/vcpkg/ports/drogon/drogon_config.patch new file mode 100755 index 000000000..61b7c964a --- /dev/null +++ b/externals/vcpkg/ports/drogon/drogon_config.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/templates/DrogonConfig.cmake.in b/cmake/templates/DrogonConfig.cmake.in +index a21122a..6367259 100644 +--- a/cmake/templates/DrogonConfig.cmake.in ++++ b/cmake/templates/DrogonConfig.cmake.in +@@ -19,7 +19,7 @@ find_dependency(UUID REQUIRED) + endif(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" AND NOT WIN32) + find_dependency(ZLIB REQUIRED) + if(@pg_FOUND@) +-find_dependency(pg) ++find_dependency(PostgreSQL) + endif() + if(@SQLite3_FOUND@) + find_dependency(SQLite3) diff --git a/externals/vcpkg/ports/drogon/portfile.cmake b/externals/vcpkg/ports/drogon/portfile.cmake new file mode 100755 index 000000000..4f24228c3 --- /dev/null +++ b/externals/vcpkg/ports/drogon/portfile.cmake @@ -0,0 +1,63 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO an-tao/drogon + REF v1.7.5 + SHA512 8be77961026d13b55dbfcc2e43972b4fb8f1cd9a6bfb8098d5bdfc8b60ff67c2d3ede4bdb5815614a8233dc184cbf3aa363a9d33eed96b9f748544e20b15f2c7 + HEAD_REF master + PATCHES + vcpkg.patch + drogon_config.patch + static-brotli.patch + use-libmariadb.patch +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + ctl BUILD_CTL + mysql BUILD_MYSQL + orm BUILD_ORM + postgres BUILD_POSTGRESQL + postgres LIBPQ_BATCH_MODE + redis BUILD_REDIS + sqlite3 BUILD_SQLITE +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_DROGON_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DBUILD_DROGON_SHARED=${BUILD_DROGON_SHARED} + -DBUILD_EXAMPLES=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON + ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_Boost +) + +vcpkg_cmake_install(ADD_BIN_TO_PATH) + +# Fix CMake files +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Drogon) + +vcpkg_fixup_pkgconfig() + +# Copy drogon_ctl +if("ctl" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES drogon_ctl AUTO_CLEAN) +endif() + +# Remove includes in debug +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# Copy pdb files +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/drogon/static-brotli.patch b/externals/vcpkg/ports/drogon/static-brotli.patch new file mode 100755 index 000000000..a44a40cc5 --- /dev/null +++ b/externals/vcpkg/ports/drogon/static-brotli.patch @@ -0,0 +1,17 @@ +diff --git a/cmake_modules/FindBrotli.cmake b/cmake_modules/FindBrotli.cmake +index da5b6d2..6b631ab 100755 +--- a/cmake_modules/FindBrotli.cmake ++++ b/cmake_modules/FindBrotli.cmake +@@ -23,9 +23,9 @@ include(FindPackageHandleStandardArgs) + + find_path(BROTLI_INCLUDE_DIR "brotli/decode.h") + +-find_library(BROTLICOMMON_LIBRARY NAMES brotlicommon) +-find_library(BROTLIDEC_LIBRARY NAMES brotlidec) +-find_library(BROTLIENC_LIBRARY NAMES brotlienc) ++find_library(BROTLICOMMON_LIBRARY NAMES brotlicommon brotlicommon-static) ++find_library(BROTLIDEC_LIBRARY NAMES brotlidec brotlidec-static) ++find_library(BROTLIENC_LIBRARY NAMES brotlienc brotlienc-static) + + find_package_handle_standard_args(Brotli + REQUIRED_VARS diff --git a/externals/vcpkg/ports/drogon/usage b/externals/vcpkg/ports/drogon/usage new file mode 100755 index 000000000..7887e3474 --- /dev/null +++ b/externals/vcpkg/ports/drogon/usage @@ -0,0 +1,4 @@ +The package drogon provides CMake targets: + + find_package(Drogon CONFIG REQUIRED) + target_link_libraries(main PRIVATE Drogon::Drogon) diff --git a/externals/vcpkg/ports/drogon/use-libmariadb.patch b/externals/vcpkg/ports/drogon/use-libmariadb.patch new file mode 100755 index 000000000..71ca89892 --- /dev/null +++ b/externals/vcpkg/ports/drogon/use-libmariadb.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 146d2b8..f180498 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -360,12 +360,8 @@ endif (BUILD_POSTGRESQL) + + if (BUILD_MYSQL) + # Find mysql, only mariadb client library is supported +- find_package(MySQL QUIET) + find_package(unofficial-libmariadb QUIET) +- if (MySQL_FOUND) +- target_link_libraries(${PROJECT_NAME} PRIVATE MySQL_lib) +- set(DROGON_FOUND_MYSQL TRUE) +- elseif (unofficial-libmariadb_FOUND) ++ if (unofficial-libmariadb_FOUND) + target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::libmariadb) + set(DROGON_FOUND_MYSQL TRUE) + endif () +diff --git a/cmake/templates/DrogonConfig.cmake.in b/cmake/templates/DrogonConfig.cmake.in +index 199cfb9..a3fbde0 100644 +--- a/cmake/templates/DrogonConfig.cmake.in ++++ b/cmake/templates/DrogonConfig.cmake.in +@@ -25,7 +25,7 @@ if(@SQLite3_FOUND@) + find_dependency(SQLite3) + endif() + if(@MySQL_FOUND@) +-find_dependency(MySQL) ++find_dependency(unofficial-libmariadb CONFIG REQUIRED) + endif() + if(@Boost_FOUND@) + find_dependency(Boost) diff --git a/externals/vcpkg/ports/drogon/vcpkg.json b/externals/vcpkg/ports/drogon/vcpkg.json new file mode 100755 index 000000000..f6e70f75d --- /dev/null +++ b/externals/vcpkg/ports/drogon/vcpkg.json @@ -0,0 +1,92 @@ +{ + "name": "drogon", + "version-semver": "1.7.5", + "description": "A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows", + "homepage": "https://github.com/an-tao/drogon", + "documentation": "https://drogon.docsforge.com/master/overview/", + "license": "MIT", + "dependencies": [ + "brotli", + "jsoncpp", + { + "name": "libuuid", + "platform": "!windows & !osx" + }, + "trantor", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "features": { + "ctl": { + "description": "Build drogon_ctl tool." + }, + "mysql": { + "description": "Support reading and writing from/to MySQL databases.", + "dependencies": [ + { + "name": "drogon", + "features": [ + "orm" + ] + }, + { + "name": "libmariadb", + "features": [ + "iconv" + ], + "platform": "osx" + }, + { + "name": "libmariadb", + "platform": "!osx" + } + ] + }, + "orm": { + "description": "Build with object-relational mapping support." + }, + "postgres": { + "description": "Support reading and writing from/to Postgres databases.", + "dependencies": [ + { + "name": "drogon", + "features": [ + "orm" + ] + }, + "libpq" + ] + }, + "redis": { + "description": "Support reading and writing from/to Redis databases.", + "dependencies": [ + { + "name": "drogon", + "features": [ + "orm" + ] + }, + "hiredis" + ] + }, + "sqlite3": { + "description": "Support reading and writing from/to SQLite databases.", + "dependencies": [ + { + "name": "drogon", + "features": [ + "orm" + ] + }, + "sqlite3" + ] + } + } +} diff --git a/externals/vcpkg/ports/drogon/vcpkg.patch b/externals/vcpkg/ports/drogon/vcpkg.patch new file mode 100755 index 000000000..489acd938 --- /dev/null +++ b/externals/vcpkg/ports/drogon/vcpkg.patch @@ -0,0 +1,52 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -120,9 +120,9 @@ if (WIN32) + PRIVATE $) + endif (WIN32) + +-add_subdirectory(trantor) ++find_package(Trantor CONFIG REQUIRED) + +-target_link_libraries(${PROJECT_NAME} PUBLIC trantor) ++target_link_libraries(${PROJECT_NAME} PUBLIC Trantor::Trantor) + + if(${CMAKE_SYSTEM_NAME} STREQUAL "Haiku") + target_link_libraries(${PROJECT_NAME} PRIVATE network) +@@ -316,11 +316,10 @@ endif (NOT WIN32) + + if (BUILD_POSTGRESQL) + # find postgres +- find_package(pg) +- if (pg_FOUND) +- message(STATUS "libpq inc path:" ${PG_INCLUDE_DIRS}) +- message(STATUS "libpq lib:" ${PG_LIBRARIES}) +- target_link_libraries(${PROJECT_NAME} PRIVATE pg_lib) ++ find_package(PostgreSQL REQUIRED) ++ if(PostgreSQL_FOUND) ++ set(pg_FOUND true) ++ target_link_libraries(${PROJECT_NAME} PRIVATE PostgreSQL::PostgreSQL) + set(DROGON_SOURCES + ${DROGON_SOURCES} + orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc) +@@ -348,7 +348,7 @@ if (BUILD_POSTGRESQL) + ${private_headers} + orm_lib/src/postgresql_impl/PgConnection.h) + endif (libpq_supports_batch) +- endif (pg_FOUND) ++ endif (PostgreSQL_FOUND) + endif (BUILD_POSTGRESQL) + + if (BUILD_MYSQL) +diff --git a/drogon_ctl/CMakeLists.txt b/drogon_ctl/CMakeLists.txt +--- a/drogon_ctl/CMakeLists.txt ++++ b/drogon_ctl/CMakeLists.txt +@@ -19,7 +19,7 @@ add_executable(_drogon_ctl + target_link_libraries(_drogon_ctl ${PROJECT_NAME}) + if (WIN32 AND BUILD_DROGON_SHARED) + set(DROGON_FILE $) +- set(TRANTOR_FILE $) ++ set(TRANTOR_FILE $) + add_custom_command(TARGET _drogon_ctl POST_BUILD + COMMAND ${CMAKE_COMMAND} + -DCTL_FILE=${DROGON_FILE} diff --git a/externals/vcpkg/ports/dstorage/dstorage-config.cmake.in b/externals/vcpkg/ports/dstorage/dstorage-config.cmake.in new file mode 100755 index 000000000..c29561951 --- /dev/null +++ b/externals/vcpkg/ports/dstorage/dstorage-config.cmake.in @@ -0,0 +1,25 @@ + +get_filename_component(_dstorage_root "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_dstorage_root "${_dstorage_root}" PATH) +get_filename_component(_dstorage_root "${_dstorage_root}" PATH) + +set(_dstorage_root_lib "${_dstorage_root}/lib/dstorage.lib") +if (EXISTS "${_dstorage_root_lib}") + + add_library(Microsoft::DirectStorage SHARED IMPORTED) + set_target_properties(Microsoft::DirectStorage PROPERTIES + IMPORTED_LOCATION "${_dstorage_root}/bin/dstorage.dll" + IMPORTED_IMPLIB "${_dstorage_root_lib}" + INTERFACE_INCLUDE_DIRECTORIES "${_dstorage_root}/include" + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + + set(dstorage_FOUND TRUE) + +else() + + set(dstorage_FOUND FALSE) + +endif() + +unset(_dstorage_root_lib) +unset(_dstorage_root) diff --git a/externals/vcpkg/ports/dstorage/portfile.cmake b/externals/vcpkg/ports/dstorage/portfile.cmake new file mode 100755 index 000000000..b05d0e5d0 --- /dev/null +++ b/externals/vcpkg/ports/dstorage/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.DirectStorage/1.0.2" + FILENAME "directstorage.1.0.2.zip" + SHA512 42a8d21a1be9981d5fcaaa2aa90d1e4bfe20969ee7959803f6acb76b0846d91d49ad89cebac069463729d013532508c6fbe41af3a1e99187ac13e849d747dd7e +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH PACKAGE_PATH + ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL +) + +file(INSTALL "${PACKAGE_PATH}/native/include/dstorage.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${PACKAGE_PATH}/native/include/dstorageerr.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(INSTALL "${PACKAGE_PATH}/native/lib/${VCPKG_TARGET_ARCHITECTURE}/dstorage.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + +file(COPY "${PACKAGE_PATH}/native/bin/${VCPKG_TARGET_ARCHITECTURE}/dstorage.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +file(COPY "${PACKAGE_PATH}/native/bin/${VCPKG_TARGET_ARCHITECTURE}/dstoragecore.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug") +file(COPY "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${PACKAGE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +configure_file("${CMAKE_CURRENT_LIST_DIR}/dstorage-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" COPYONLY) diff --git a/externals/vcpkg/ports/dstorage/vcpkg.json b/externals/vcpkg/ports/dstorage/vcpkg.json new file mode 100755 index 000000000..3e6c4bbae --- /dev/null +++ b/externals/vcpkg/ports/dstorage/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "dstorage", + "version": "1.0.2", + "description": "DirectStorage for Windows", + "homepage": "https://aka.ms/directstorage/", + "documentation": "https://github.com/microsoft/DirectStorage", + "license": null, + "supports": "windows & !uwp & !staticcrt" +} diff --git a/externals/vcpkg/ports/dtl/portfile.cmake b/externals/vcpkg/ports/dtl/portfile.cmake new file mode 100755 index 000000000..d36e30760 --- /dev/null +++ b/externals/vcpkg/ports/dtl/portfile.cmake @@ -0,0 +1,15 @@ +#header-only library +include(CMakePackageConfigHelpers) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cubicdaiya/dtl + REF v1.19 + SHA512 77c767451b1b78ce49085da6ff5bb8a23c96dec56a37d96ef357a6b69a1b2cd45e2c6c4e8f91ee34ca080ce03a26518c478ff207309326a4bc7e729eaa2824b2 + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/dtl + DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION + ${CURRENT_PACKAGES_DIR}/share/dtl RENAME copyright) diff --git a/externals/vcpkg/ports/dtl/vcpkg.json b/externals/vcpkg/ports/dtl/vcpkg.json new file mode 100755 index 000000000..d4a696474 --- /dev/null +++ b/externals/vcpkg/ports/dtl/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "dtl", + "version-string": "1.19", + "port-version": 1, + "description": "Diff template library" +} diff --git a/externals/vcpkg/ports/duckx/fix_dependencies.patch b/externals/vcpkg/ports/duckx/fix_dependencies.patch new file mode 100755 index 000000000..c48daacb0 --- /dev/null +++ b/externals/vcpkg/ports/duckx/fix_dependencies.patch @@ -0,0 +1,66 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f45218659..1ec4250c0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,9 +9,11 @@ endif() + option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF) + option(BUILD_SAMPLE "Build provided sample" OFF) + +-set(HEADERS src/duckx.hpp src/zip.h src/miniz.h +- src/pugixml.hpp src/pugiconfig.hpp) +-set(SOURCES src/duckx.cpp src/zip.c src/pugixml.cpp) ++find_package(libzip REQUIRED) ++find_package(pugixml REQUIRED) ++ ++set(HEADERS src/duckx.hpp) ++set(SOURCES src/duckx.cpp) + + if(BUILD_SHARED_LIBS) + add_library(duckx SHARED ${HEADERS} ${SOURCES}) +@@ -19,6 +21,8 @@ else() + add_library(duckx STATIC ${HEADERS} ${SOURCES}) + endif() + ++target_link_libraries(duckx PUBLIC libzip::zip pugixml::pugixml) ++ + add_library(duckx::duckx ALIAS duckx) + + target_include_directories(duckx PUBLIC +@@ -38,12 +42,22 @@ endif() + include(GNUInstallDirs) + install( + TARGETS duckx +- EXPORT duckxConfig ++ EXPORT duckxTargets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) +-install(EXPORT duckxConfig NAMESPACE duckx:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/duckx) ++install(EXPORT duckxTargets NAMESPACE duckx:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/duckx) ++include(CMakePackageConfigHelpers) ++configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/duckxConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/duckxConfig.cmake" ++ INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/duckx" ++ NO_SET_AND_CHECK_MACRO ++ NO_CHECK_REQUIRED_COMPONENTS_MACRO) ++write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/duckxConfigVersion.cmake" COMPATIBILITY ExactVersion) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/duckxConfig.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/duckxConfigVersion.cmake" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/duckx") ++ + install(FILES ${HEADERS} DESTINATION include) + + +diff --git a/duckxConfig.cmake.in b/duckxConfig.cmake.in +new file mode 100644 +index 000000000..960b03b3b +--- /dev/null ++++ b/duckxConfig.cmake.in +@@ -0,0 +1,6 @@ ++@PACKAGE_INIT@ ++ ++include(CMakeFindDependencyMacro) ++find_dependency(libzip) ++find_dependency(pugixml) ++include("${CMAKE_CURRENT_LIST_DIR}/duckxTargets.cmake") +\ No newline at end of file diff --git a/externals/vcpkg/ports/duckx/portfile.cmake b/externals/vcpkg/ports/duckx/portfile.cmake new file mode 100755 index 000000000..9ee068c1b --- /dev/null +++ b/externals/vcpkg/ports/duckx/portfile.cmake @@ -0,0 +1,26 @@ +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO amiremohamadi/DuckX + REF v1.2.2 + SHA512 3f1e626973b4638adaffcc0a20f59791f3a70abda1d2d09fddca9312014cef86d097f24873e74ef58c775b27c71a637e44f340da01a301b00ef334600bd412d6 + PATCHES fix_dependencies.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/duckx) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(COPY "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/duckx/vcpkg.json b/externals/vcpkg/ports/duckx/vcpkg.json new file mode 100755 index 000000000..36de4bea7 --- /dev/null +++ b/externals/vcpkg/ports/duckx/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "duckx", + "version": "1.2.2", + "port-version": 1, + "description": "DuckX is a library for creation of Office docx files.", + "homepage": "https://github.com/amiremohamadi/DuckX", + "license": "MIT", + "dependencies": [ + "libzip", + "pugixml", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/duilib/enable-static.patch b/externals/vcpkg/ports/duilib/enable-static.patch new file mode 100755 index 000000000..6f069d4a7 --- /dev/null +++ b/externals/vcpkg/ports/duilib/enable-static.patch @@ -0,0 +1,20 @@ +diff --git a/DuiLib/CMakeLists.txt b/DuiLib/CMakeLists.txt +index 96b8fe4..99dc314 100644 +--- a/DuiLib/CMakeLists.txt ++++ b/DuiLib/CMakeLists.txt +@@ -19,8 +19,14 @@ if (MSVC) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /source-charset:.936") + endif() + ++if (BUILD_SHARED_LIBS STREQUAL ON) ++ SET(LINKAGE SHARED) ++else() ++ SET(LINKAGE STATIC) ++endif() ++ + set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) +-add_library(duilib SHARED ${Control_src} ${Core_src} ${Layout_src} ${Utils_src} ${Root_src}) ++add_library(duilib ${LINKAGE} ${Control_src} ${Core_src} ${Layout_src} ${Utils_src} ${Root_src}) + + add_definitions(-DUILIB_EXPORTS) + target_link_libraries(duilib comctl32 gdi32 user32) diff --git a/externals/vcpkg/ports/duilib/enable-unicode-for-vcpkg.patch b/externals/vcpkg/ports/duilib/enable-unicode-for-vcpkg.patch new file mode 100755 index 000000000..1d0aa02da --- /dev/null +++ b/externals/vcpkg/ports/duilib/enable-unicode-for-vcpkg.patch @@ -0,0 +1,15 @@ +diff --git a/DuiLib/CMakeLists.txt b/DuiLib/CMakeLists.txt +index 835d430..b178984 100644 +--- a/DuiLib/CMakeLists.txt ++++ b/DuiLib/CMakeLists.txt +@@ -2,6 +2,9 @@ + #Author Qi Gao(monkgau@gmail.com) + #Created: 2012/09/16 + ++#if use vcpkg to build, need to add extra unicode definitions ++add_definitions(-DUNICODE -D_UNICODE) ++ + aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} Root_src) + aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/Control Control_src) + aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/Core Core_src) + diff --git a/externals/vcpkg/ports/duilib/fix-arm-build.patch b/externals/vcpkg/ports/duilib/fix-arm-build.patch new file mode 100755 index 000000000..c4dbd902e --- /dev/null +++ b/externals/vcpkg/ports/duilib/fix-arm-build.patch @@ -0,0 +1,11 @@ +diff --git a/DuiLib/CMakeLists.txt b/DuiLib/CMakeLists.txt +index 6a4da5a..4961174 100644 +--- a/DuiLib/CMakeLists.txt ++++ b/DuiLib/CMakeLists.txt +@@ -18,5 +18,5 @@ set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) + add_library(duilib SHARED ${Control_src} ${Core_src} ${Layout_src} ${Utils_src} ${Root_src}) + + add_definitions(-DUILIB_EXPORTS) +-target_link_libraries(duilib comctl32) ++target_link_libraries(duilib comctl32 gdi32 user32) + set_target_properties(duilib PROPERTIES OUTPUT_NAME "duilib") diff --git a/externals/vcpkg/ports/duilib/fix-encoding.patch b/externals/vcpkg/ports/duilib/fix-encoding.patch new file mode 100755 index 000000000..cf0947e77 --- /dev/null +++ b/externals/vcpkg/ports/duilib/fix-encoding.patch @@ -0,0 +1,28 @@ +diff --git a/DuiLib/CMakeLists.txt b/DuiLib/CMakeLists.txt +index 4961174..96b8fe4 100644 +--- a/DuiLib/CMakeLists.txt ++++ b/DuiLib/CMakeLists.txt +@@ -14,6 +14,11 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Core) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Layout) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Utils) + ++if (MSVC) ++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /source-charset:.936") ++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /source-charset:.936") ++endif() ++ + set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) + add_library(duilib SHARED ${Control_src} ${Core_src} ${Layout_src} ${Utils_src} ${Root_src}) + +diff --git a/DuiLib/Control/UIGifAnim.cpp b/DuiLib/Control/UIGifAnim.cpp +index 870c9da..61aa32f 100644 +--- a/DuiLib/Control/UIGifAnim.cpp ++++ b/DuiLib/Control/UIGifAnim.cpp +@@ -319,7 +319,6 @@ namespace DuiLib + + while (!pData) + { +- //读ä¸åˆ°å›¾ç‰‡, 则直接去读å–bitmap.m_lpstr指å‘的路径 + HANDLE hFile = ::CreateFile(pstrGifPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, \ + FILE_ATTRIBUTE_NORMAL, NULL); + if( hFile == INVALID_HANDLE_VALUE ) break; diff --git a/externals/vcpkg/ports/duilib/fix-post-build-errors.patch b/externals/vcpkg/ports/duilib/fix-post-build-errors.patch new file mode 100755 index 000000000..35fa5cc89 --- /dev/null +++ b/externals/vcpkg/ports/duilib/fix-post-build-errors.patch @@ -0,0 +1,11 @@ +diff --git a/DuiLib/CMakeLists.txt b/DuiLib/CMakeLists.txt +index 835d430..6a4da5a 100644 +--- a/DuiLib/CMakeLists.txt ++++ b/DuiLib/CMakeLists.txt +@@ -20,6 +20,3 @@ add_library(duilib SHARED ${Control_src} ${Core_src} ${Layout_src} ${Utils_src} + add_definitions(-DUILIB_EXPORTS) + target_link_libraries(duilib comctl32) + set_target_properties(duilib PROPERTIES OUTPUT_NAME "duilib") +-add_custom_command(TARGET duilib POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E copy_if_different +- ${PROJECT_BINARY_DIR}/lib/duilib.dll ${PROJECT_SOURCE_DIR}/bin/duilib.dll) diff --git a/externals/vcpkg/ports/duilib/portfile.cmake b/externals/vcpkg/ports/duilib/portfile.cmake new file mode 100755 index 000000000..06d536cfa --- /dev/null +++ b/externals/vcpkg/ports/duilib/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO duilib/duilib + REF d7f3a331a0fc6ba48429cd9e5c427570cc73bc35 + SHA512 6381cac467d42e4811859411a5fa620e52075622e8fbec38a6ab320c33bc7d6fdddc809c150d6a10cc40c55a651345bda9387432898d24957b6ab0f5c4b5391c + HEAD_REF master + PATCHES + "fix-post-build-errors.patch" + "fix-arm-build.patch" + "fix-encoding.patch" + "enable-static.patch" + "enable-unicode-for-vcpkg.patch" +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/DuiLib" + NO_CHARSET_FLAG +) + +vcpkg_cmake_build() + +file(INSTALL "${SOURCE_PATH}/DuiLib" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN *.h) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +else() + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/duilib/vcpkg.json b/externals/vcpkg/ports/duilib/vcpkg.json new file mode 100755 index 000000000..3c9946e1c --- /dev/null +++ b/externals/vcpkg/ports/duilib/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "duilib", + "version-date": "2019-04-28", + "port-version": 5, + "description": "Duilib is a free open source DirectUI interface library under Windows. It is widely accepted by major Internet companies due to its simple and easy to expand design and stable and efficient implementation. It is widely used in IM, video client, stock market software, navigation software, and mobile phone assistive software. Duilib is still evolving, and will continue to improve in many aspects such as documentation, examples, animations, and rendering engines.", + "homepage": "https://github.com/duilib/duilib", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/duktape/CMakeLists.txt b/externals/vcpkg/ports/duktape/CMakeLists.txt new file mode 100755 index 000000000..746aaa910 --- /dev/null +++ b/externals/vcpkg/ports/duktape/CMakeLists.txt @@ -0,0 +1,55 @@ +cmake_minimum_required(VERSION 3.13) + + +set(duktape_MAJOR_VERSION 2) +set(duktape_MINOR_VERSION 4) +set(duktape_PATCH_VERSION 0) +set(duktape_VERSION ${duktape_MAJOR_VERSION}.${duktape_MINOR_VERSION}.${duktape_PATCH_VERSION}) + +option(CMAKE_VERBOSE_MAKEFILE "Create verbose makefile" OFF) +option(BUILD_SHARED_LIBS "Create duktape as a shared library" ON) + +project(duktape VERSION ${duktape_VERSION}) + +file(GLOB_RECURSE DUKTAPE_SOURCES "${CMAKE_CURRENT_LIST_DIR}/src/*.c") +file(GLOB_RECURSE DUKTAPE_HEADERS "${CMAKE_CURRENT_LIST_DIR}/src/*.h") + +add_library(duktape ${DUKTAPE_SOURCES} ${DUKTAPE_HEADERS}) +target_include_directories(duktape PRIVATE "${CMAKE_CURRENT_LIST_DIR}/src") +set_target_properties(duktape PROPERTIES PUBLIC_HEADER "${DUKTAPE_HEADERS}") +set_target_properties(duktape PROPERTIES VERSION ${duktape_VERSION}) +set_target_properties(duktape PROPERTIES SOVERSION ${duktape_MAJOR_VERSION}) + +if (BUILD_SHARED_LIBS) + target_compile_definitions(duktape PRIVATE -DDUK_F_DLL_BUILD) +endif () + +install(TARGETS duktape + EXPORT duktapeTargets + ARCHIVE DESTINATION "lib" + LIBRARY DESTINATION "lib" + RUNTIME DESTINATION "bin" + PUBLIC_HEADER DESTINATION "include" + COMPONENT dev +) + +install(EXPORT duktapeTargets + FILE duktapeTargets.cmake + NAMESPACE duktape:: + DESTINATION "share/duktape" +) + +export(PACKAGE duktape) + +include(CMakePackageConfigHelpers) +write_basic_package_version_file("${PROJECT_BINARY_DIR}/duktapeConfigVersion.cmake" + COMPATIBILITY SameMajorVersion +) + +configure_file(duktapeConfig.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/duktapeConfig.cmake" @ONLY) + +install(FILES + "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/duktapeConfig.cmake" + "${PROJECT_BINARY_DIR}/duktapeConfigVersion.cmake" + DESTINATION "share/duktape" +) diff --git a/externals/vcpkg/ports/duktape/duktapeConfig.cmake.in b/externals/vcpkg/ports/duktape/duktapeConfig.cmake.in new file mode 100755 index 000000000..56d7798fd --- /dev/null +++ b/externals/vcpkg/ports/duktape/duktapeConfig.cmake.in @@ -0,0 +1,33 @@ +# - Try to find duktape +# Once done this will define +# +# DUKTAPE_FOUND - system has Duktape +# DUKTAPE_INCLUDE_DIRS - the Duktape include directory +# DUKTAPE_LIBRARIES - Link these to use DUKTAPE +# DUKTAPE_DEFINITIONS - Compiler switches required for using Duktape +# + +find_package(PkgConfig QUIET) +pkg_check_modules(PC_DUK QUIET duktape libduktape) + +find_path(DUKTAPE_INCLUDE_DIR duktape.h + HINTS ${PC_DUK_INCLUDEDIR} ${PC_DUK_INCLUDE_DIRS} + PATH_SUFFIXES duktape) + +find_library(DUKTAPE_LIBRARY + NAMES duktape libduktape + HINTS ${PC_DUK_LIBDIR} ${PC_DUK_LIBRARY_DIRS}) + +include(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Duktape + REQUIRED_VARS DUKTAPE_LIBRARY DUKTAPE_INCLUDE_DIR) + +if (DUKTAPE_FOUND) + set (DUKTAPE_LIBRARIES ${DUKTAPE_LIBRARY}) + set (DUKTAPE_INCLUDE_DIRS ${DUKTAPE_INCLUDE_DIR} ) +endif () + +MARK_AS_ADVANCED( + DUKTAPE_INCLUDE_DIR + DUKTAPE_LIBRARY +) \ No newline at end of file diff --git a/externals/vcpkg/ports/duktape/portfile.cmake b/externals/vcpkg/ports/duktape/portfile.cmake new file mode 100755 index 000000000..abdc8aa1d --- /dev/null +++ b/externals/vcpkg/ports/duktape/portfile.cmake @@ -0,0 +1,76 @@ +if(VCPKG_TARGET_IS_LINUX) + message("${PORT} currently requires the following tools from the system package manager:\n python-yaml\n\nThis can be installed on Ubuntu systems via apt-get install python-yaml PYTHON2-yaml (depending on your current python default interpreter)") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO svaarala/duktape + REF 6001888049cb42656f8649db020e804bcdeca6a7 # v2.5.0 + SHA512 ffbc7f1b16b7469ddfc0af0054a7891ffda128cc099e693773c6b4597ee6a96f8a08d354f7a7cf3a1f16369bef7b7a94c2670a617ec0355cc3614f56e1668dc4 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/duktapeConfig.cmake.in DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +if (VCPKG_TARGET_IS_WINDOWS) + set(EXECUTABLE_SUFFIX ".exe") + set(PYTHON_OPTION "") +else() + set(EXECUTABLE_SUFFIX "") + set(PYTHON_OPTION "--user") +endif() + +vcpkg_find_acquire_program(PYTHON2) +get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) +vcpkg_add_to_path("${PYTHON2_DIR}") + +if(NOT EXISTS ${PYTHON2_DIR}/easy_install${EXECUTABLE_SUFFIX}) + if(NOT EXISTS ${PYTHON2_DIR}/Scripts/pip${EXECUTABLE_SUFFIX}) + vcpkg_from_github( + OUT_SOURCE_PATH PYFILE_PATH + REPO pypa/get-pip + REF 309a56c5fd94bd1134053a541cb4657a4e47e09d #2019-08-25 + SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a + HEAD_REF master + ) + execute_process(COMMAND ${PYTHON2_DIR}/python${EXECUTABLE_SUFFIX} ${PYFILE_PATH}/get-pip.py ${PYTHON_OPTION}) + endif() + execute_process(COMMAND ${PYTHON2_DIR}/Scripts/pip${EXECUTABLE_SUFFIX} install pyyaml ${PYTHON_OPTION}) +else() + execute_process(COMMAND ${PYTHON2_DIR}/easy_install${EXECUTABLE_SUFFIX} pyyaml) +endif() + +vcpkg_execute_required_process( + COMMAND ${PYTHON2} tools/configure.py --source-directory src-input --output-directory src --config-metadata config -DDUK_USE_FASTINT + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME pre-configure +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(DUK_CONFIG_H_PATH "${SOURCE_PATH}/src/duk_config.h") + file(READ ${DUK_CONFIG_H_PATH} CONTENT) + string(REPLACE "#undef DUK_F_DLL_BUILD" "#define DUK_F_DLL_BUILD" CONTENT "${CONTENT}") + file(WRITE ${DUK_CONFIG_H_PATH} "${CONTENT}") +else() + set(DUK_CONFIG_H_PATH "${SOURCE_PATH}/src/duk_config.h") + file(READ ${DUK_CONFIG_H_PATH} CONTENT) + string(REPLACE "#define DUK_F_DLL_BUILD" "#undef DUK_F_DLL_BUILD" CONTENT "${CONTENT}") + file(WRITE ${DUK_CONFIG_H_PATH} "${CONTENT}") +endif() + +vcpkg_configure_cmake( + PREFER_NINJA + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_fixup_cmake_targets() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/duktape/usage b/externals/vcpkg/ports/duktape/usage new file mode 100755 index 000000000..5870cb2bb --- /dev/null +++ b/externals/vcpkg/ports/duktape/usage @@ -0,0 +1,5 @@ +find_package(duktape CONFIG REQUIRED) + +include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${DUKTAPE_INCLUDE_DIRS}) + +target_link_libraries(main ${DUKTAPE_LIBRARY}) \ No newline at end of file diff --git a/externals/vcpkg/ports/duktape/vcpkg.json b/externals/vcpkg/ports/duktape/vcpkg.json new file mode 100755 index 000000000..59a78b9d6 --- /dev/null +++ b/externals/vcpkg/ports/duktape/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "duktape", + "version-string": "2.5.0", + "port-version": 2, + "description": "Embeddable Javascript engine with a focus on portability and compact footprint.", + "homepage": "https://github.com/svaarala/duktape" +} diff --git a/externals/vcpkg/ports/dx/portfile.cmake b/externals/vcpkg/ports/dx/portfile.cmake new file mode 100755 index 000000000..61500c5c0 --- /dev/null +++ b/externals/vcpkg/ports/dx/portfile.cmake @@ -0,0 +1,19 @@ +#header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sdcb/dx + REF v1.0.1 + SHA512 b40eb4daf774bfdb394b207bb29652fbf44361f5d8f9b60509c7a3215cd403dbf0c10454979c0c2e97d839496ef20940070a42837375993cd67d58afacc990e0 + HEAD_REF master +) + +file(INSTALL + ${SOURCE_PATH}/dx.h + ${SOURCE_PATH}/debug.h + ${SOURCE_PATH}/handle.h + DESTINATION ${CURRENT_PACKAGES_DIR}/include/dx +) + +file(INSTALL + ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/dx RENAME copyright) diff --git a/externals/vcpkg/ports/dx/vcpkg.json b/externals/vcpkg/ports/dx/vcpkg.json new file mode 100755 index 000000000..ddee48410 --- /dev/null +++ b/externals/vcpkg/ports/dx/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "dx", + "version-string": "1.0.1", + "port-version": 2, + "description": "A modern C++ library for DirectX programming", + "homepage": "https://github.com/sdcb/dx" +} diff --git a/externals/vcpkg/ports/dxsdk-d3dx/dxsdk-d3dx-config.cmake.in b/externals/vcpkg/ports/dxsdk-d3dx/dxsdk-d3dx-config.cmake.in new file mode 100755 index 000000000..039d0a3b0 --- /dev/null +++ b/externals/vcpkg/ports/dxsdk-d3dx/dxsdk-d3dx-config.cmake.in @@ -0,0 +1,48 @@ + +get_filename_component(_d3dx_root "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_d3dx_root "${_d3dx_root}" PATH) +get_filename_component(_d3dx_root "${_d3dx_root}" PATH) + +set(_d3dx_root_lib "${_d3dx_root}/lib/d3dx9.lib") +if (EXISTS "${_d3dx_root_lib}") + + add_library(Microsoft::D3DX9 SHARED IMPORTED) + set_target_properties(Microsoft::D3DX9 PROPERTIES + IMPORTED_LOCATION_RELEASE "${_d3dx_root}/bin/D3DX9_43.dll" + IMPORTED_IMPLIB_RELEASE "${_d3dx_root_lib}" + IMPORTED_LOCATION_DEBUG "${_d3dx_root}/debug/bin/D3DX9d_43.dll" + IMPORTED_IMPLIB_DEBUG "${_d3dx_root}/debug/lib/d3dx9d.lib" + INTERFACE_INCLUDE_DIRECTORIES "${_d3dx_root}/include/dxsdk-d3dx" + IMPORTED_CONFIGURATIONS "Debug;Release" + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + + add_library(Microsoft::D3DX10 SHARED IMPORTED) + set_target_properties(Microsoft::D3DX10 PROPERTIES + IMPORTED_LOCATION_RELEASE "${_d3dx_root}/bin/d3dx10_43.dll" + IMPORTED_IMPLIB_RELEASE "${_d3dx_root}/lib/d3dx10.lib" + IMPORTED_LOCATION_DEBUG "${_d3dx_root}/debug/bin/D3DX10d_43.dll" + IMPORTED_IMPLIB_DEBUG "${_d3dx_root}/debug/lib/d3dx10d.lib" + INTERFACE_INCLUDE_DIRECTORIES "${_d3dx_root}/include/dxsdk-d3dx" + IMPORTED_CONFIGURATIONS "Debug;Release" + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + + add_library(Microsoft::D3DX11 SHARED IMPORTED) + set_target_properties(Microsoft::D3DX11 PROPERTIES + IMPORTED_LOCATION_RELEASE "${_d3dx_root}/bin/d3dx11_43.dll" + IMPORTED_IMPLIB_RELEASE "${_d3dx_root}/lib/d3dx11.lib" + IMPORTED_LOCATION_DEBUG "${_d3dx_root}/debug/bin/D3DX11d_43.dll" + IMPORTED_IMPLIB_DEBUG "${_d3dx_root}/debug/lib/d3dx11d.lib" + INTERFACE_INCLUDE_DIRECTORIES "${_d3dx_root}/include/dxsdk-d3dx" + IMPORTED_CONFIGURATIONS "Debug;Release" + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + + set(dxsdk-d3dx_FOUND TRUE) + +else() + + set(dxsdk-d3dx_FOUND FALSE) + +endif() + +unset(_d3dx_root_lib) +unset(_d3dx_root) diff --git a/externals/vcpkg/ports/dxsdk-d3dx/portfile.cmake b/externals/vcpkg/ports/dxsdk-d3dx/portfile.cmake new file mode 100755 index 000000000..30bd0351f --- /dev/null +++ b/externals/vcpkg/ports/dxsdk-d3dx/portfile.cmake @@ -0,0 +1,40 @@ +if(EXISTS "${CURRENT_INSTALLED_DIR}/share/directxsdk/copyright") + message(FATAL_ERROR "Can't build ${PORT} if directxsdk is installed. Please remove directxsdk, and try to install ${PORT} again if you need it.") +endif() + +message(WARNING "Use of ${PORT} is not recommended for new projects. See https://aka.ms/dxsdk for more information.") + +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +set(VCPKG_POLICY_ALLOW_OBSOLETE_MSVCRT enabled) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.nuget.org/api/v2/package/Microsoft.DXSDK.D3DX/9.29.952.8" + FILENAME "dxsdk-d3dx.9.29.952.8.zip" + SHA512 9f6a95ed858555c1c438a85219ede32c82729068b21dd7ecf11de01cf3cdd525b2f04a58643bfcc14c48a29403dc1c80246f0a12a1ef4377b91b855f6d6d7986 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH PACKAGE_PATH + ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL +) + +file(GLOB HEADER_FILES "${PACKAGE_PATH}/build/native/include/*.h" "${PACKAGE_PATH}/build/native/include/*.inl") +file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") + +file(GLOB RELEASE_LIB_FILES "${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/*.lib") +file(INSTALL ${RELEASE_LIB_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/lib/") + +file(GLOB DEBUG_LIB_FILES "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/*.lib") +file(INSTALL ${DEBUG_LIB_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/") + +file(GLOB RELEASE_DLL_FILES "${PACKAGE_PATH}/build/native/release/bin/${VCPKG_TARGET_ARCHITECTURE}/*.dll") +file(INSTALL ${RELEASE_DLL_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/bin/") + +file(GLOB DEBUG_DLL_FILES "${PACKAGE_PATH}/build/native/debug/bin/${VCPKG_TARGET_ARCHITECTURE}/*.dll") +file(INSTALL ${DEBUG_DLL_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/") + +file(INSTALL "${PACKAGE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +configure_file("${CMAKE_CURRENT_LIST_DIR}/dxsdk-d3dx-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" COPYONLY) diff --git a/externals/vcpkg/ports/dxsdk-d3dx/vcpkg.json b/externals/vcpkg/ports/dxsdk-d3dx/vcpkg.json new file mode 100755 index 000000000..d4a951815 --- /dev/null +++ b/externals/vcpkg/ports/dxsdk-d3dx/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "dxsdk-d3dx", + "version": "9.29.952.8", + "port-version": 4, + "description": "Redistributable package for the legacy DirectX SDK's D3DX9, D3DX10, and/or D3DX11 utility libraries.", + "homepage": "https://walbourn.github.io/legacy-d3dx-on-nuget/", + "license": null, + "supports": "windows & !arm & !uwp & !staticcrt" +} diff --git a/externals/vcpkg/ports/dxut/portfile.cmake b/externals/vcpkg/ports/dxut/portfile.cmake new file mode 100755 index 000000000..e38856c50 --- /dev/null +++ b/externals/vcpkg/ports/dxut/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/DXUT + REF may2022 + SHA512 ea8ba759666acb4520c2dc1754e937433a1c54f1c83fe15396c573a6513d9b3fd49d1712eae9fc42fff9cddc4f3a4a759a7fc99377ef9750c6c55813d8c90000 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/dxut/cmake) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/dxut/vcpkg.json b/externals/vcpkg/ports/dxut/vcpkg.json new file mode 100755 index 000000000..fad08c19d --- /dev/null +++ b/externals/vcpkg/ports/dxut/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "dxut", + "version": "11.27", + "description": "A \"GLUT\"-like framework for Direct3D 11.x Win32 desktop applications", + "homepage": "https://github.com/Microsoft/DXUT", + "documentation": "https://github.com/microsoft/DXUT/wiki", + "license": "MIT", + "supports": "windows & !uwp", + "dependencies": [ + "directxmath", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/eabase/EABaseConfig.cmake.in b/externals/vcpkg/ports/eabase/EABaseConfig.cmake.in new file mode 100755 index 000000000..afc9b104a --- /dev/null +++ b/externals/vcpkg/ports/eabase/EABaseConfig.cmake.in @@ -0,0 +1,6 @@ +@PACKAGE_INIT@ + +# Provide path for scripts +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") + +include(${CMAKE_CURRENT_LIST_DIR}/EABaseTargets.cmake) \ No newline at end of file diff --git a/externals/vcpkg/ports/eabase/fix_cmake_install.patch b/externals/vcpkg/ports/eabase/fix_cmake_install.patch new file mode 100755 index 000000000..ea83e66b2 --- /dev/null +++ b/externals/vcpkg/ports/eabase/fix_cmake_install.patch @@ -0,0 +1,75 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 89c6703..ab8e553 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,6 +4,9 @@ + cmake_minimum_required(VERSION 3.1) + project(EABase CXX) + ++include(GNUInstallDirs) ++include(CMakePackageConfigHelpers) ++ + #------------------------------------------------------------------------------------------- + # Options + #------------------------------------------------------------------------------------------- +@@ -22,13 +25,51 @@ endif() + add_definitions(-D_CHAR16T) + + if (NOT EABASE_BUILD_TESTS) +- #------------------------------------------------------------------------------------------- +- # Header only library +- #------------------------------------------------------------------------------------------- +- add_library(EABase INTERFACE) +- +- #------------------------------------------------------------------------------------------- +- # Include dirs +- #------------------------------------------------------------------------------------------- +- target_include_directories(EABase INTERFACE include/Common) ++ #------------------------------------------------------------------------------------------- ++ # Header only library ++ #------------------------------------------------------------------------------------------- ++ add_library(EABase INTERFACE) ++ add_library(EABase::EABase ALIAS EABase) ++ ++ #------------------------------------------------------------------------------------------- ++ # Include dirs ++ #------------------------------------------------------------------------------------------- ++ target_include_directories(EABase INTERFACE ++ $ ++ $ ++ ) ++ ++ # create and install an export set for eabase target as EABase::EABase ++ set(EABase_CMAKE_CONFIG_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/EABase") ++ ++ configure_package_config_file( ++ EABaseConfig.cmake.in ++ ${CMAKE_CURRENT_BINARY_DIR}/EABaseConfig.cmake ++ INSTALL_DESTINATION ${EABase_CMAKE_CONFIG_DESTINATION} ++ ) ++ ++ # create and install an export set for Terra target as Terra ++ install( ++ TARGETS EABase EXPORT EABaseTargets ++ DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ) ++ ++ ++ install(EXPORT EABaseTargets DESTINATION ${EABase_CMAKE_CONFIG_DESTINATION}) ++ ++ write_basic_package_version_file( ++ "${CMAKE_CURRENT_BINARY_DIR}/EABaseConfigVersion.cmake" ++ VERSION 2.09.12 ++ COMPATIBILITY SameMajorVersion ++ ) ++ ++ install(TARGETS EABase LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") ++ install(DIRECTORY "include/Common/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") ++ ++ install( ++ FILES ++ "${CMAKE_CURRENT_BINARY_DIR}/EABaseConfig.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/EABaseConfigVersion.cmake" ++ DESTINATION ${EABase_CMAKE_CONFIG_DESTINATION} ++ ) + endif() diff --git a/externals/vcpkg/ports/eabase/portfile.cmake b/externals/vcpkg/ports/eabase/portfile.cmake new file mode 100755 index 000000000..8ebb2ab14 --- /dev/null +++ b/externals/vcpkg/ports/eabase/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO electronicarts/EABase + REF d1be0a1d0fc01a9bf8f3f2cea75018df0d2410ee + SHA512 84a11bea06aecbf9a659d92b1ac904b99b2b82023650f4f376b5e68a744f631c5dbdd53d25f746ffb01b428415ac86e4fb8ba758db844acf80560fabe4d77733 + HEAD_REF master + PATCHES + fix_cmake_install.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/EABaseConfig.cmake.in DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DEABASE_BUILD_TESTS:BOOL=OFF +) +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/EABase) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/eabase/vcpkg.json b/externals/vcpkg/ports/eabase/vcpkg.json new file mode 100755 index 000000000..d9032602c --- /dev/null +++ b/externals/vcpkg/ports/eabase/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "eabase", + "version-string": "2.09.12", + "port-version": 2, + "description": "Electronic Arts Base. EABase is a small set of header files that define platform-independent data types and macros.", + "homepage": "https://github.com/electronicarts/EABase" +} diff --git a/externals/vcpkg/ports/earcut-hpp/portfile.cmake b/externals/vcpkg/ports/earcut-hpp/portfile.cmake new file mode 100755 index 000000000..7cdb44ea2 --- /dev/null +++ b/externals/vcpkg/ports/earcut-hpp/portfile.cmake @@ -0,0 +1,13 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mapbox/earcut.hpp + REF v2.2.3 + SHA512 f87f0084dbbcda85b409c326587a376d443f2484b6a69c216d2ad94ea8ea238912dfe1174b464b08faec10ea5c29ebae6478e7abfe5ff682a7b043784c1e3acf + HEAD_REF master +) + +# This is a header only library +file(INSTALL "${SOURCE_PATH}/include/mapbox/earcut.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/mapbox") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") diff --git a/externals/vcpkg/ports/earcut-hpp/vcpkg.json b/externals/vcpkg/ports/earcut-hpp/vcpkg.json new file mode 100755 index 000000000..053a57abe --- /dev/null +++ b/externals/vcpkg/ports/earcut-hpp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "earcut-hpp", + "version": "2.2.3", + "description": "earcut.hpp is a C++ port of earcut.js, a fast, header-only polygon triangulation library.", + "homepage": "https://github.com/mapbox/earcut.hpp", + "license": "ISC" +} diff --git a/externals/vcpkg/ports/eastl/EASTLConfig.cmake.in b/externals/vcpkg/ports/eastl/EASTLConfig.cmake.in new file mode 100755 index 000000000..92fb2b18d --- /dev/null +++ b/externals/vcpkg/ports/eastl/EASTLConfig.cmake.in @@ -0,0 +1,9 @@ +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) +find_dependency(EABase CONFIG REQUIRED) + +# Provide path for scripts +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") + +include(${CMAKE_CURRENT_LIST_DIR}/EASTLTargets.cmake) \ No newline at end of file diff --git a/externals/vcpkg/ports/eastl/Fix-error-C2338.patch b/externals/vcpkg/ports/eastl/Fix-error-C2338.patch new file mode 100755 index 000000000..61d75dddc --- /dev/null +++ b/externals/vcpkg/ports/eastl/Fix-error-C2338.patch @@ -0,0 +1,14 @@ +diff --git a/scripts/CMake/CommonCppFlags.cmake b/scripts/CMake/CommonCppFlags.cmake +index 08b6af5..281665e 100644 +--- a/scripts/CMake/CommonCppFlags.cmake ++++ b/scripts/CMake/CommonCppFlags.cmake +@@ -74,6 +74,9 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU") + endif() + elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest /W4 /permissive-") ++ if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "19.31.30911.95") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:static_assert-") ++ endif() + endif() + + diff --git a/externals/vcpkg/ports/eastl/fix_cmake_install.patch b/externals/vcpkg/ports/eastl/fix_cmake_install.patch new file mode 100755 index 000000000..a2dbfd821 --- /dev/null +++ b/externals/vcpkg/ports/eastl/fix_cmake_install.patch @@ -0,0 +1,75 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e8700dc..6d3e2f1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,12 +4,17 @@ + cmake_minimum_required(VERSION 3.1) + project(EASTL CXX) + ++include(GNUInstallDirs) ++include(CMakePackageConfigHelpers) ++ + #------------------------------------------------------------------------------------------- + # Options + #------------------------------------------------------------------------------------------- + option(EASTL_BUILD_BENCHMARK "Enable generation of build files for benchmark" OFF) + option(EASTL_BUILD_TESTS "Enable generation of build files for tests" OFF) + ++find_package(EABase CONFIG REQUIRED) ++ + #------------------------------------------------------------------------------------------- + # Compiler Flags + #------------------------------------------------------------------------------------------- +@@ -41,7 +46,10 @@ add_definitions(-DEASTL_OPENSOURCE=1) + #------------------------------------------------------------------------------------------- + # Include dirs + #------------------------------------------------------------------------------------------- +-target_include_directories(EASTL PUBLIC include) ++target_include_directories(EASTL PUBLIC ++ $ ++ $ ++ ) + + #------------------------------------------------------------------------------------------- + # Dependencies +@@ -50,5 +58,39 @@ if (NOT TARGET EABase) + add_subdirectory(test/packages/EABase) + endif() + +-target_link_libraries(EASTL EABase) ++target_link_libraries(EASTL PUBLIC EABase) ++ ++# create and install an export set for eabase target as EABase::EABase ++set(EASTL_CMAKE_CONFIG_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/EASTL") ++ ++configure_package_config_file( ++ EASTLConfig.cmake.in ++ ${CMAKE_CURRENT_BINARY_DIR}/EASTLConfig.cmake ++ INSTALL_DESTINATION ${EASTL_CMAKE_CONFIG_DESTINATION} ++) ++ ++# create and install an export set for Terra target as Terra ++install( ++ TARGETS EASTL EXPORT EASTLTargets ++ DESTINATION ${CMAKE_INSTALL_LIBDIR} ++) ++ ++ ++install(EXPORT EASTLTargets DESTINATION ${EASTL_CMAKE_CONFIG_DESTINATION}) ++ ++write_basic_package_version_file( ++ "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfigVersion.cmake" ++ VERSION 3.16.05 ++ COMPATIBILITY SameMajorVersion ++) ++ ++install(TARGETS EASTL LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") ++install(DIRECTORY "include/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") ++ ++install( ++ FILES ++ "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfig.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfigVersion.cmake" ++ DESTINATION ${EASTL_CMAKE_CONFIG_DESTINATION} ++) + diff --git a/externals/vcpkg/ports/eastl/portfile.cmake b/externals/vcpkg/ports/eastl/portfile.cmake new file mode 100755 index 000000000..04ba63fc5 --- /dev/null +++ b/externals/vcpkg/ports/eastl/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO electronicarts/EASTL + REF e8bdd5531ed79c30ccef2fd71e070f5ab9f1222a #v3.18.00 + SHA512 3e5d97a77b8610a2efdb9156b47c91e8a8dd5629ff95ea6d2c65016b067ab645df5beddc8c7f93d89c3d1a6f404ff71282efc6db9885a6e6240fa444fe2be79c + HEAD_REF master + PATCHES + fix_cmake_install.patch + Fix-error-C2338.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/EASTLConfig.cmake.in" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DEASTL_BUILD_TESTS=OFF + -DEASTL_BUILD_BENCHMARK=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/EASTL) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/3RDPARTYLICENSES.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +# CommonCppFlags used by EAThread +file(INSTALL "${SOURCE_PATH}/scripts/CMake/CommonCppFlags.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/eastl/vcpkg.json b/externals/vcpkg/ports/eastl/vcpkg.json new file mode 100755 index 000000000..b2c97ba50 --- /dev/null +++ b/externals/vcpkg/ports/eastl/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "eastl", + "version-string": "3.18.00", + "port-version": 2, + "description": "Electronic Arts Standard Template Library. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is a fairly extensive and robust implementation of such a library and has an emphasis on high performance above all other considerations.", + "homepage": "https://github.com/electronicarts/EASTL", + "license": "BSD-3-Clause", + "dependencies": [ + "eabase", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/easycl/portfile.cmake b/externals/vcpkg/ports/easycl/portfile.cmake new file mode 100755 index 000000000..554639473 --- /dev/null +++ b/externals/vcpkg/ports/easycl/portfile.cmake @@ -0,0 +1,13 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO architector1324/EasyCL + REF 0.3 + SHA512 c0e9aa03c9039e9ffe4794ccc4e85654f8267924e577cf96fd8d5e141fab9e8f6dc4668ee4475d6df3ba77572e52a181493acd3dfdb0abf7bd83b7e3d4d08a29 + HEAD_REF master +) + +# Handle headers +file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.hpp") + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/easycl RENAME copyright) diff --git a/externals/vcpkg/ports/easycl/vcpkg.json b/externals/vcpkg/ports/easycl/vcpkg.json new file mode 100755 index 000000000..2df4f3609 --- /dev/null +++ b/externals/vcpkg/ports/easycl/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "easycl", + "version-string": "0.3", + "port-version": 1, + "description": "OpenCL based lightweight c++ computing library", + "homepage": "https://github.com/architector1324/EasyCL", + "dependencies": [ + "opencl" + ] +} diff --git a/externals/vcpkg/ports/easyhook/fix-build.patch b/externals/vcpkg/ports/easyhook/fix-build.patch new file mode 100755 index 000000000..b8802afc8 --- /dev/null +++ b/externals/vcpkg/ports/easyhook/fix-build.patch @@ -0,0 +1,154 @@ +diff --git a/EasyHookDll/EasyHookDll.vcxproj b/EasyHookDll/EasyHookDll.vcxproj +index ec66f91..5773555 100644 +--- a/EasyHookDll/EasyHookDll.vcxproj ++++ b/EasyHookDll/EasyHookDll.vcxproj +@@ -188,7 +188,7 @@ + true + true + EnableFastChecks +- true ++ false + MultiThreadedDebug + + +@@ -207,10 +207,6 @@ + MachineX86 + false + +- +- copy "$(TargetPath)" "$(TargetDir)..\x64\EasyHook32.dll" +-copy "$(TargetDir)EasyHook32.lib" "$(TargetDir)..\x64\EasyHook32.lib" +- + + false + +@@ -223,7 +219,7 @@ copy "$(TargetDir)EasyHook32.lib" "$(TargetDir)..\x64\EasyHook32.lib" + true + true + EnableFastChecks +- true ++ false + MultiThreadedDebug + + +@@ -242,10 +238,6 @@ copy "$(TargetDir)EasyHook32.lib" "$(TargetDir)..\x64\EasyHook32.lib" + MachineX86 + false + +- +- copy "$(TargetPath)" "$(TargetDir)..\x64\EasyHook32.dll" +-copy "$(TargetDir)EasyHook32.lib" "$(TargetDir)..\x64\EasyHook32.lib" +- + + false + +@@ -261,7 +253,7 @@ copy "$(TargetDir)EasyHook32.lib" "$(TargetDir)..\x64\EasyHook32.lib" + true + true + EnableFastChecks +- true ++ false + MultiThreadedDebug + + +@@ -278,10 +270,6 @@ copy "$(TargetDir)EasyHook32.lib" "$(TargetDir)..\x64\EasyHook32.lib" + Windows + MachineX64 + +- +- copy "$(TargetPath)" "$(TargetDir)..\x86\EasyHook64.dll" +-copy "$(TargetDir)EasyHook64.lib" "$(TargetDir)..\x86\EasyHook64.lib" +- + + false + +@@ -297,7 +285,7 @@ copy "$(TargetDir)EasyHook64.lib" "$(TargetDir)..\x86\EasyHook64.lib" + true + true + EnableFastChecks +- true ++ false + MultiThreadedDebug + + +@@ -314,10 +302,6 @@ copy "$(TargetDir)EasyHook64.lib" "$(TargetDir)..\x86\EasyHook64.lib" + Windows + MachineX64 + +- +- copy "$(TargetPath)" "$(TargetDir)..\x86\EasyHook64.dll" +-copy "$(TargetDir)EasyHook64.lib" "$(TargetDir)..\x86\EasyHook64.lib" +- + + false + +@@ -355,10 +339,6 @@ copy "$(TargetDir)EasyHook64.lib" "$(TargetDir)..\x86\EasyHook64.lib" + MachineX86 + false + +- +- copy "$(TargetPath)" "$(TargetDir)..\x64\EasyHook32.dll" +-copy "$(TargetDir)EasyHook32.lib" "$(TargetDir)..\x64\EasyHook32.lib" +- + + false + false +@@ -397,10 +377,6 @@ copy "$(TargetDir)EasyHook32.lib" "$(TargetDir)..\x64\EasyHook32.lib" + MachineX86 + false + +- +- copy "$(TargetPath)" "$(TargetDir)..\x64\EasyHook32.dll" +-copy "$(TargetDir)EasyHook32.lib" "$(TargetDir)..\x64\EasyHook32.lib" +- + + false + false +@@ -439,10 +415,6 @@ copy "$(TargetDir)EasyHook32.lib" "$(TargetDir)..\x64\EasyHook32.lib" + true + MachineX64 + +- +- copy "$(TargetPath)" "$(TargetDir)..\x86\EasyHook64.dll" +-copy "$(TargetDir)EasyHook64.lib" "$(TargetDir)..\x86\EasyHook64.lib" +- + + false + false +@@ -481,10 +453,6 @@ copy "$(TargetDir)EasyHook64.lib" "$(TargetDir)..\x86\EasyHook64.lib" + true + MachineX64 + +- +- copy "$(TargetPath)" "$(TargetDir)..\x86\EasyHook64.dll" +-copy "$(TargetDir)EasyHook64.lib" "$(TargetDir)..\x86\EasyHook64.lib" +- + + false + false +diff --git a/EasyHookDll/EasyHookDll_32.rc b/EasyHookDll/EasyHookDll_32.rc +index 2a8dfb6..abf5ae3 100644 +--- a/EasyHookDll/EasyHookDll_32.rc ++++ b/EasyHookDll/EasyHookDll_32.rc +@@ -7,7 +7,7 @@ + // + // Generated from the TEXTINCLUDE 2 resource. + // +-#include "afxres.h" ++#include "windows.h" + + ///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS +diff --git a/EasyHookDll/EasyHookDll_64.rc b/EasyHookDll/EasyHookDll_64.rc +index 163a2f0..b32a4d4 100644 +--- a/EasyHookDll/EasyHookDll_64.rc ++++ b/EasyHookDll/EasyHookDll_64.rc +@@ -7,7 +7,7 @@ + // + // Generated from the TEXTINCLUDE 2 resource. + // +-#include "afxres.h" ++#include "windows.h" + + ///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS diff --git a/externals/vcpkg/ports/easyhook/portfile.cmake b/externals/vcpkg/ports/easyhook/portfile.cmake new file mode 100755 index 000000000..d67dc1d8f --- /dev/null +++ b/externals/vcpkg/ports/easyhook/portfile.cmake @@ -0,0 +1,113 @@ +message(WARNING ".Net framework 4.7.2 is required, please install it before installing easyhook.") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO EasyHook/EasyHook + REF v2.7.7097.0 + SHA512 D0CA5B64E77F6281B2DD7EE0DC492A9B07DDB60A9F514037938CC3E3FFA5DD57C95CB630E18C02C984A89070839E4188044896D4EE57A21E43E6EA3A4918255A + HEAD_REF master + PATCHES fix-build.patch +) + +if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(BUILD_ARCH "Win32") +elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(BUILD_ARCH "x64") +else() + message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") +endif() + +# Use /Z7 rather than /Zi to avoid "fatal error C1090: PDB API call failed, error code '23': (0x00000006)" +foreach(VCXPROJ IN ITEMS + "${SOURCE_PATH}/EasyHookDll/EasyHookDll.vcxproj" + "${SOURCE_PATH}/Examples/UnmanagedHook/UnmanagedHook.vcxproj") + vcpkg_replace_string( + "${VCXPROJ}" + "ProgramDatabase" + "OldStyle" + ) + vcpkg_replace_string( + "${VCXPROJ}" + "EditAndContinue" + "OldStyle" + ) + vcpkg_replace_string( + "${VCXPROJ}" + "true" + "" + ) +endforeach() + +# Use modern .NET Framework +foreach(CSPROJ IN ITEMS + "${SOURCE_PATH}/EasyHook/EasyHook.csproj" + "${SOURCE_PATH}/EasyHookSvc/EasyHookSvc.csproj" + "${SOURCE_PATH}/EasyLoad/EasyLoad.csproj" + "${SOURCE_PATH}/Examples/FileMon/FileMon.csproj" + "${SOURCE_PATH}/Examples/FileMonInject/FileMonInject.csproj" + "${SOURCE_PATH}/Examples/FileMonitorController/FileMonitorController.csproj" + "${SOURCE_PATH}/Examples/FileMonitorInterceptor/FileMonitorInterceptor.csproj" + "${SOURCE_PATH}/Examples/FileMonitorInterface/FileMonitorInterface.csproj" + "${SOURCE_PATH}/Examples/ProcessMonitor/ProcessMonitor.csproj" + "${SOURCE_PATH}/Examples/ProcMonInject/ProcMonInject.csproj" + "${SOURCE_PATH}/Test/ComplexParameterInject/ComplexParameterInject.csproj" + "${SOURCE_PATH}/Test/ComplexParameterTest/ComplexParameterTest.csproj" + "${SOURCE_PATH}/Test/EasyHook.Tests/EasyHook.Tests.csproj" + "${SOURCE_PATH}/Test/ManagedTarget/ManagedTarget.csproj" + "${SOURCE_PATH}/Test/ManagedTest/ManagedTest.csproj" + "${SOURCE_PATH}/Test/MultipleHooks/MultipleHooks/MultipleHooks.csproj" + "${SOURCE_PATH}/Test/MultipleHooks/SimpleHook1/SimpleHook1.csproj" + "${SOURCE_PATH}/Test/MultipleHooks/SimpleHook2/SimpleHook2.csproj" + "${SOURCE_PATH}/Test/TestFuncHooks/TestFuncHooks.csproj") + + vcpkg_replace_string( + "${CSPROJ}" + "v4.0" + "4.7.2" + ) + vcpkg_replace_string( + "${CSPROJ}" + "Client" + "" + ) +endforeach() + +vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH EasyHook.sln + TARGET EasyHookDll + RELEASE_CONFIGURATION "netfx4-Release" + DEBUG_CONFIGURATION "netfx4-Debug" + PLATFORM ${BUILD_ARCH} +) + +# Remove the mismatch rebuild library +if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/AUX_ULIB_x64.LIB") + endif() + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/AUX_ULIB_x64.LIB") + endif() +elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/AUX_ULIB_x86.LIB") + endif() + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/AUX_ULIB_x86.LIB") + endif() +endif() + +# These libraries are useless, so remove. +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/EasyHook.dll" "${CURRENT_PACKAGES_DIR}/bin/EasyHook.pdb") +endif() +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/EasyHook.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/EasyHook.pdb") +endif() + +# Install includes +file(INSTALL "${SOURCE_PATH}/Public/easyhook.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/easyhook") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/easyhook/vcpkg.json b/externals/vcpkg/ports/easyhook/vcpkg.json new file mode 100755 index 000000000..0a894137a --- /dev/null +++ b/externals/vcpkg/ports/easyhook/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "easyhook", + "version": "2.7.7097.0", + "port-version": 5, + "description": "This project supports extending (hooking) unmanaged code (APIs) with pure managed ones, from within a fully managed environment on 32- or 64-bit Windows Vista x64, Windows Server 2008 x64, Windows 7, Windows 8.1, and Windows 10.", + "homepage": "https://github.com/EasyHook/EasyHook", + "supports": "windows & !static & !uwp & (x86 | x64)" +} diff --git a/externals/vcpkg/ports/easyloggingpp/portfile.cmake b/externals/vcpkg/ports/easyloggingpp/portfile.cmake new file mode 100755 index 000000000..22f8b5ab9 --- /dev/null +++ b/externals/vcpkg/ports/easyloggingpp/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO muflihun/easyloggingpp + REF v9.97.0 + SHA512 e45789edaf7a43ad6a73861840d24ccce9b9d6bba1aaacf93c6ac26ff7449957251d2ca322c9da85130b893332dd305b13a2499eaffc65ecfaaafa3e11f8d63d + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dbuild_static_lib=ON +) +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/easyloggingpp/vcpkg.json b/externals/vcpkg/ports/easyloggingpp/vcpkg.json new file mode 100755 index 000000000..8a5e5bbe1 --- /dev/null +++ b/externals/vcpkg/ports/easyloggingpp/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "easyloggingpp", + "version": "9.97.0", + "port-version": 2, + "description": "Easylogging++ is a single header efficient logging library for C++ applications.", + "homepage": "https://github.com/amrayn/easyloggingpp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/eathread/EAThreadConfig.cmake.in b/externals/vcpkg/ports/eathread/EAThreadConfig.cmake.in new file mode 100755 index 000000000..9ab444e5b --- /dev/null +++ b/externals/vcpkg/ports/eathread/EAThreadConfig.cmake.in @@ -0,0 +1,6 @@ +@PACKAGE_INIT@ + +# Provide path for scripts +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") + +include(${CMAKE_CURRENT_LIST_DIR}/EAThreadTargets.cmake) \ No newline at end of file diff --git a/externals/vcpkg/ports/eathread/fix_cmake_install.patch b/externals/vcpkg/ports/eathread/fix_cmake_install.patch new file mode 100755 index 000000000..bc3327951 --- /dev/null +++ b/externals/vcpkg/ports/eathread/fix_cmake_install.patch @@ -0,0 +1,75 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 34fc37a..60d201a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,15 +4,21 @@ + cmake_minimum_required(VERSION 3.1) + project(EAThread CXX) + ++include(GNUInstallDirs) ++include(CMakePackageConfigHelpers) ++ + #------------------------------------------------------------------------------------------- + # Options + #------------------------------------------------------------------------------------------- + option(EATHREAD_BUILD_TESTS "Enable generation of build files for tests" OFF) + ++find_package(EABase CONFIG REQUIRED) ++find_package(EASTL CONFIG REQUIRED) ++ + #------------------------------------------------------------------------------------------- + # Compiler Flags + #------------------------------------------------------------------------------------------- +-set (CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/test/packages/EASTL/scripts/CMake") ++set (CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${_VCPKG_ROOT_DIR}/installed/${VCPKG_TARGET_TRIPLET}/share/eastl") + include(CommonCppFlags) + + #------------------------------------------------------------------------------------------- +@@ -34,10 +40,45 @@ add_definitions(-D_CRT_SECURE_NO_WARNINGS) + #------------------------------------------------------------------------------------------- + # Export Include Directories + #------------------------------------------------------------------------------------------- +-target_include_directories(EAThread PUBLIC include) ++target_include_directories(EAThread PUBLIC ++ $ ++ $ ++ ) + + #------------------------------------------------------------------------------------------- + # Package Dependencies + #------------------------------------------------------------------------------------------- +-target_link_libraries(EAThread EABase) ++target_link_libraries(EAThread PUBLIC EABase) ++ ++# create and install an export set for eabase target as EABase::EABase ++set(EAThread_CMAKE_CONFIG_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/EAThread") ++ ++configure_package_config_file( ++ EAThreadConfig.cmake.in ++ ${CMAKE_CURRENT_BINARY_DIR}/EAThreadConfig.cmake ++ INSTALL_DESTINATION ${EAThread_CMAKE_CONFIG_DESTINATION} ++) ++ ++# create and install an export set for Terra target as Terra ++install( ++ TARGETS EAThread EXPORT EAThreadTargets ++ DESTINATION ${CMAKE_INSTALL_LIBDIR} ++) ++ ++install(EXPORT EAThreadTargets DESTINATION ${EAThread_CMAKE_CONFIG_DESTINATION}) ++ ++write_basic_package_version_file( ++ "${CMAKE_CURRENT_BINARY_DIR}/EAThreadConfigVersion.cmake" ++ VERSION 3.16.01 ++ COMPATIBILITY SameMajorVersion ++) ++ ++install(TARGETS EAThread LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") ++install(DIRECTORY "include/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + ++install( ++ FILES ++ "${CMAKE_CURRENT_BINARY_DIR}/EAThreadConfig.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/EAThreadConfigVersion.cmake" ++ DESTINATION ${EAThread_CMAKE_CONFIG_DESTINATION} ++) diff --git a/externals/vcpkg/ports/eathread/portfile.cmake b/externals/vcpkg/ports/eathread/portfile.cmake new file mode 100755 index 000000000..421f7c591 --- /dev/null +++ b/externals/vcpkg/ports/eathread/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO electronicarts/EAThread + REF e4367a36f2e55d10b2b994bfbae8edf21f15bafd + SHA512 cd5a2aa6cdfe6fa538067919aa49e5ecd901898e12929dc852068ce66efe386032eb1fe667ea7d9b7a3d73a7bef1d90a683c0b90b6fb0d6d9a27950b05c4ab6a + HEAD_REF master + PATCHES + fix_cmake_install.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/EAThreadConfig.cmake.in DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DEATHREAD_BUILD_TESTS=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/EAThread) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/3RDPARTYLICENSES.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/eathread) diff --git a/externals/vcpkg/ports/eathread/vcpkg.json b/externals/vcpkg/ports/eathread/vcpkg.json new file mode 100755 index 000000000..4f18b4c7a --- /dev/null +++ b/externals/vcpkg/ports/eathread/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "eathread", + "version-string": "1.32.09", + "port-version": 3, + "description": "Electronic Arts Thread Library. EAThread implements a unified cross-platform interface for multithreaded programming on various platforms.", + "homepage": "https://github.com/electronicarts/EAThread", + "supports": "!uwp & x64", + "dependencies": [ + "eabase", + "eastl" + ] +} diff --git a/externals/vcpkg/ports/ebml/include-limits.patch b/externals/vcpkg/ports/ebml/include-limits.patch new file mode 100755 index 000000000..3d548edd3 --- /dev/null +++ b/externals/vcpkg/ports/ebml/include-limits.patch @@ -0,0 +1,24 @@ +diff --git a/src/EbmlString.cpp b/src/EbmlString.cpp +index 27e55fd..4c05fcf 100644 +--- a/src/EbmlString.cpp ++++ b/src/EbmlString.cpp +@@ -34,6 +34,7 @@ + \author Steve Lhomme + */ + #include ++#include + + #include "ebml/EbmlString.h" + +diff --git a/src/EbmlUnicodeString.cpp b/src/EbmlUnicodeString.cpp +index 496a16a..99fc073 100644 +--- a/src/EbmlUnicodeString.cpp ++++ b/src/EbmlUnicodeString.cpp +@@ -36,6 +36,7 @@ + */ + + #include ++#include + + #include "ebml/EbmlUnicodeString.h" + diff --git a/externals/vcpkg/ports/ebml/portfile.cmake b/externals/vcpkg/ports/ebml/portfile.cmake new file mode 100755 index 000000000..e92897923 --- /dev/null +++ b/externals/vcpkg/ports/ebml/portfile.cmake @@ -0,0 +1,27 @@ +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "${PORT} does not currently support UWP") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Matroska-Org/libebml + REF release-1.4.2 + SHA512 2A03CA1D82A41EE05CFE4DD2726CC79295FA06A4D8ECEB93FE8F41BDFF09F04897B434B49DD1F496E1C014289B14C3F3416EAB4C8B1E745652FF1AB4A620BF83 + HEAD_REF master + PATCHES + include-limits.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -DDISABLE_PKGCONFIG=1 +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/EBML) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/ebml/vcpkg.json b/externals/vcpkg/ports/ebml/vcpkg.json new file mode 100755 index 000000000..18e817f26 --- /dev/null +++ b/externals/vcpkg/ports/ebml/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ebml", + "version": "1.4.2", + "port-version": 1, + "description": "A C++ library to parse EBML files", + "homepage": "https://github.com/Matroska-Org/libebml", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ecm/fix_canberra.patch b/externals/vcpkg/ports/ecm/fix_canberra.patch new file mode 100755 index 000000000..1a6d72a94 --- /dev/null +++ b/externals/vcpkg/ports/ecm/fix_canberra.patch @@ -0,0 +1,39 @@ +From 203c65c562453385e3ffc4485844b15e80b93107 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= +Date: Fri, 17 Sep 2021 00:07:08 +0200 +Subject: [PATCH] FindCanberra: link against target provided by pkgconfig + +target_link_libraries() against the target generated by +pkg_check_modules() so that the additional linker options are not +lost, such as the additional libraries to link against when +building statically. + +BUG: 442555 +--- + find-modules/FindCanberra.cmake | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/find-modules/FindCanberra.cmake b/find-modules/FindCanberra.cmake +index c54adf99..f9561118 100644 +--- a/find-modules/FindCanberra.cmake ++++ b/find-modules/FindCanberra.cmake +@@ -34,7 +34,7 @@ Since 5.56.0. + #]=======================================================================] + + find_package(PkgConfig QUIET) +-pkg_check_modules(PC_Canberra libcanberra QUIET) ++pkg_check_modules(PC_Canberra IMPORTED_TARGET libcanberra QUIET) + + find_library(Canberra_LIBRARIES + NAMES canberra +@@ -66,6 +66,7 @@ if(Canberra_FOUND AND NOT TARGET Canberra::Canberra) + INTERFACE_COMPILE_OPTIONS "${PC_Canberra_CFLAGS}" + INTERFACE_INCLUDE_DIRECTORIES "${Canberra_INCLUDE_DIRS}" + ) ++ target_link_libraries(Canberra::Canberra INTERFACE PkgConfig::PC_Canberra) + endif() + + mark_as_advanced(Canberra_LIBRARIES Canberra_INCLUDE_DIRS Canberra_VERSION) +-- +GitLab + diff --git a/externals/vcpkg/ports/ecm/fix_generateqmltypes.patch b/externals/vcpkg/ports/ecm/fix_generateqmltypes.patch new file mode 100755 index 000000000..5ed5dc525 --- /dev/null +++ b/externals/vcpkg/ports/ecm/fix_generateqmltypes.patch @@ -0,0 +1,31 @@ +diff --git a/modules/ECMGenerateQmlTypes.cmake b/modules/ECMGenerateQmlTypes.cmake +index d6e124266308028b8533203da63f572f6e99b308..7d7cecb5201521019764102eba0da2abf8b4d911 100644 +--- a/modules/ECMGenerateQmlTypes.cmake ++++ b/modules/ECMGenerateQmlTypes.cmake +@@ -1,4 +1,5 @@ + # SPDX-FileCopyrightText: 2017 Aleix Pol Gonzalez ++# SPDX-FileCopyrightText: 2021 Dawid Wrobel + # + # SPDX-License-Identifier: BSD-3-Clause + +@@ -18,10 +19,7 @@ our project offers. These files offer introspection upon our plugin and are + useful for integrating with IDE language support of our plugin. It offers + information about the objects its methods and their argument types. + +-The developer will be in charge of making sure that these files are up to date. +-The plugin.qmltypes file will sit in the source directory. This function will +-include the code that installs the file in the right place and a small unit +-test named qmltypes-pluginname-version that makes sure that it doesn't need updating. ++This function installs the file in DESTINATION folder. + + + Since 5.33.0 +@@ -40,7 +38,7 @@ function(ecm_generate_qmltypes) + set(targetname "qmltypes-${ARG_UNPARSED_ARGUMENTS}") + string(REPLACE ";" - targetname "${targetname}") + +- set(generatedFile ${CMAKE_CURRENT_SOURCE_DIR}/plugins.qmltypes) ++ set(generatedFile plugins.qmltypes) + add_custom_target(${targetname} + BYPRODUCTS ${generatedFile} + COMMAND qmlplugindump -nonrelocatable ${ARG_UNPARSED_ARGUMENTS} ${KDE_INSTALL_QMLDIR} > ${generatedFile} diff --git a/externals/vcpkg/ports/ecm/fix_libmount.patch b/externals/vcpkg/ports/ecm/fix_libmount.patch new file mode 100755 index 000000000..8f2f480ac --- /dev/null +++ b/externals/vcpkg/ports/ecm/fix_libmount.patch @@ -0,0 +1,23 @@ +diff --git a/find-modules/FindLibMount.cmake b/find-modules/FindLibMount.cmake +index 3fcde4c5435a79c61c53bbd27e1932441a056d98..1f53f0218faa82fdf9713ab768080ab7c1d72b4a 100644 +--- a/find-modules/FindLibMount.cmake ++++ b/find-modules/FindLibMount.cmake +@@ -30,7 +30,7 @@ Since 5.83.0 + #]=======================================================================] + + find_package(PkgConfig QUIET) +-pkg_check_modules(PC_LIBMOUNT QUIET mount) ++pkg_check_modules(PC_LIBMOUNT QUIET IMPORTED_TARGET mount) + + find_path(LibMount_INCLUDE_DIRS NAMES libmount/libmount.h HINTS ${PC_LIBMOUNT_INCLUDE_DIRS}) + find_library(LibMount_LIBRARIES NAMES mount HINTS ${PC_LIBMOUNT_LIBRARY_DIRS}) +@@ -62,6 +62,9 @@ if(LibMount_FOUND AND NOT TARGET LibMount::LibMount) + INTERFACE_INCLUDE_DIRECTORIES "${LibMount_INCLUDE_DIRS}" + INTERFACE_COMPILE_DEFINITIONS "${PC_LIBMOUNT_CFLAGS_OTHER}" + ) ++ if (TARGET PkgConfig::PC_LIBMOUNT) ++ target_link_libraries(LibMount::LibMount INTERFACE PkgConfig::PC_LIBMOUNT) ++ endif() + endif() + + include(FeatureSummary) diff --git a/externals/vcpkg/ports/ecm/portfile.cmake b/externals/vcpkg/ports/ecm/portfile.cmake new file mode 100755 index 000000000..63ab654f9 --- /dev/null +++ b/externals/vcpkg/ports/ecm/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/extra-cmake-modules + REF v5.89.0 + SHA512 1c3f6ad5dbe1485d1602e297989d6cd53e7646aa99dc28ac1159d0aa22134c97efd74b2c01923e74732f59c861ce05486adb7cff7de050237a35b0980e92cbcf + HEAD_REF master + PATCHES + fix_canberra.patch # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/187 + fix_libmount.patch # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/200 + fix_generateqmltypes.patch # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/201 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_HTML_DOCS=OFF + -DBUILD_MAN_DOCS=OFF + -DBUILD_QTHELP_DOCS=OFF + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +# Remove debug files +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING-CMAKE-SCRIPTS" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# Allow empty include directory +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/externals/vcpkg/ports/ecm/usage b/externals/vcpkg/ports/ecm/usage new file mode 100755 index 000000000..b0c8e7b71 --- /dev/null +++ b/externals/vcpkg/ports/ecm/usage @@ -0,0 +1,9 @@ +The package ecm provides CMake targets: + + find_package(ECM CONFIG REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) + include(KDEInstallDirs) + include(KDECompilerSettings) + include(KDECMakeSettings) + +For more infomation, see https://api.kde.org/ecm/ diff --git a/externals/vcpkg/ports/ecm/vcpkg.json b/externals/vcpkg/ports/ecm/vcpkg.json new file mode 100755 index 000000000..a744a9bcf --- /dev/null +++ b/externals/vcpkg/ports/ecm/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "ecm", + "version": "5.89.0", + "description": "Extra CMake Modules (ECM), extra modules and scripts for CMake", + "homepage": "https://github.com/KDE/extra-cmake-modules", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ecos/CMakeLists.txt b/externals/vcpkg/ports/ecos/CMakeLists.txt new file mode 100755 index 000000000..231b31f2e --- /dev/null +++ b/externals/vcpkg/ports/ecos/CMakeLists.txt @@ -0,0 +1,49 @@ +cmake_minimum_required(VERSION 3.14) +project(ecos C) + +#include(GNUInstallDirs) + +set(EXTERNAL_SRC ${CMAKE_CURRENT_SOURCE_DIR}/external) + +set(SUITESPARSE ${EXTERNAL_SRC}/SuiteSparse_config) +add_library(ecos-suitesparse INTERFACE) +target_sources(ecos-suitesparse INTERFACE $ $) +target_include_directories(ecos-suitesparse INTERFACE $ $) +target_compile_definitions(ecos-suitesparse INTERFACE DLONG LDL_LONG) + +set(AMD_SRC ${EXTERNAL_SRC}/amd/src) +set(AMD_INCLUDE ${EXTERNAL_SRC}/amd/include) +add_library(ecos-amd STATIC + ${AMD_SRC}/amd_1.c ${AMD_SRC}/amd_2.c ${AMD_SRC}/amd_aat.c ${AMD_SRC}/amd_control.c ${AMD_SRC}/amd_defaults.c ${AMD_SRC}/amd_dump.c ${AMD_SRC}/amd_global.c ${AMD_SRC}/amd_info.c ${AMD_SRC}/amd_order.c ${AMD_SRC}/amd_post_tree.c ${AMD_SRC}/amd_postorder.c ${AMD_SRC}/amd_preprocess.c ${AMD_SRC}/amd_valid.c +) +file(GLOB AMD_HEADERS ${EXTERNAL_SRC}/amd/include/*.h) +target_include_directories(ecos-amd PUBLIC $ $) +target_link_libraries(ecos-amd ecos-suitesparse) + + +add_library(ecos-ldl STATIC + ${EXTERNAL_SRC}/ldl/src/ldl.c +) +file(GLOB LDL_HEADERS ${EXTERNAL_SRC}/ldl/include/*.h) +target_include_directories(ecos-ldl PUBLIC $ $) +target_link_libraries(ecos-ldl ecos-suitesparse) + + +add_library(ecos STATIC + src/cone.c src/ecos.c src/expcone.c src/preproc.c src/splamm.c src/wright_omega.c src/ctrlc.c src/equil.c src/kkt.c src/spla.c src/timer.c +) +file(GLOB ECOS_HEADERS include/*.h) +target_include_directories(ecos PUBLIC $ $) +target_link_libraries(ecos ecos-amd ecos-ldl) + +install(FILES ${SUITESPARSE}/SuiteSparse_config.h DESTINATION "include/ecos/") +install(FILES ${ECOS_HEADERS} DESTINATION "include/ecos/") +install(FILES ${LDL_HEADERS} DESTINATION "include/ecos/") +install(FILES ${AMD_HEADERS} DESTINATION "include/ecos/") + +install(TARGETS ecos ecos-amd ecos-ldl ecos-suitesparse EXPORT ecos-targets) +install( + EXPORT ecos-targets + FILE ecos-config.cmake + DESTINATION share/ecos/ +) \ No newline at end of file diff --git a/externals/vcpkg/ports/ecos/portfile.cmake b/externals/vcpkg/ports/ecos/portfile.cmake new file mode 100755 index 000000000..213d3266f --- /dev/null +++ b/externals/vcpkg/ports/ecos/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO embotech/ecos + REF v2.0.8 + SHA512 c1adb188d6b2c400f817de15272472adfd013e2a174f49ec0bb2f7f889f26ba2b7ea165d9bedac3031bd2da7a770f2a285ad825d5b22ccc6cf43c756a20f844f + HEAD_REF develop +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ecos RENAME copyright) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_fixup_cmake_targets(CONFIG_PATH "share/ecos") \ No newline at end of file diff --git a/externals/vcpkg/ports/ecos/vcpkg.json b/externals/vcpkg/ports/ecos/vcpkg.json new file mode 100755 index 000000000..a6e6dfbe0 --- /dev/null +++ b/externals/vcpkg/ports/ecos/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "ecos", + "version-string": "2.0.8", + "port-version": 1, + "description": "A lightweight conic solver for second-order cone programming." +} diff --git a/externals/vcpkg/ports/ecsutil/portfile.cmake b/externals/vcpkg/ports/ecsutil/portfile.cmake new file mode 100755 index 000000000..98f5c2e13 --- /dev/null +++ b/externals/vcpkg/ports/ecsutil/portfile.cmake @@ -0,0 +1,45 @@ +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(PLATFORM x86) +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(ECSUtil_CONFIGURATION_RELEASE Release) + set(ECSUtil_CONFIGURATION_DEBUG Debug) +else() + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib") + else() + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") + endif() +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO EMCECS/ecs-object-client-windows-cpp + REF af9fd3cc0be5eacfeb431ca4607d3b73dd318353 # v1.0.7.15 + SHA512 091f4b4870d5bdcbd46c35b2d75e927c9da69e2aba9a24b36504ab9fa3e33fba6eec2a8a5b649fc3ad793e3043c3f2702b753341f74d87de1a7f96c251839c69 + HEAD_REF master +) + +vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH ECSUtil.sln + PLATFORM ${PLATFORM} + LICENSE_SUBPATH license.txt + TARGET ECSUtil + RELEASE_CONFIGURATION ${ECSUtil_CONFIGURATION_RELEASE} + DEBUG_CONFIGURATION ${ECSUtil_CONFIGURATION_DEBUG} +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res ${CURRENT_PACKAGES_DIR}/tools) +file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/NatvisAddIn.dll ${CURRENT_PACKAGES_DIR}/debug/bin/NatvisAddIn.dll) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() diff --git a/externals/vcpkg/ports/ecsutil/vcpkg.json b/externals/vcpkg/ports/ecsutil/vcpkg.json new file mode 100755 index 000000000..1e909e922 --- /dev/null +++ b/externals/vcpkg/ports/ecsutil/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "ecsutil", + "version-string": "1.0.7.15", + "port-version": 2, + "description": "Native Windows SDK for accessing ECS via the S3 HTTP protocol.", + "homepage": "https://github.com/EMCECS/ecs-object-client-windows-cpp", + "supports": "windows & (x64 | x86)", + "dependencies": [ + { + "name": "atlmfc", + "platform": "windows" + } + ] +} diff --git a/externals/vcpkg/ports/edlib/portfile.cmake b/externals/vcpkg/ports/edlib/portfile.cmake new file mode 100755 index 000000000..60a6cca63 --- /dev/null +++ b/externals/vcpkg/ports/edlib/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Martinsos/edlib + REF v1.2.7 + SHA512 720C732C76D0D9ABE28ADCE9972B355864571A2E6CBD2C72C3B4A92E045A99E3A688153865586F7E8B6C90433E2EB1BB024AD0A6E9D4EB4B4D401A160D3F13CE + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/edlib) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/edlib/vcpkg.json b/externals/vcpkg/ports/edlib/vcpkg.json new file mode 100755 index 000000000..f66b09ff1 --- /dev/null +++ b/externals/vcpkg/ports/edlib/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "edlib", + "version": "1.2.7", + "port-version": 1, + "description": "Lightweight, super fast C/C++ (& Python) library for sequence alignment using edit (Levenshtein) distance.", + "homepage": "https://github.com/Martinsos/edlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/effects11/portfile.cmake b/externals/vcpkg/ports/effects11/portfile.cmake new file mode 100755 index 000000000..c1c3e87d0 --- /dev/null +++ b/externals/vcpkg/ports/effects11/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/FX11 + REF may2022 + SHA512 e395071430d7e6cd717729846e8d0f44700185597684f722cceb084df2a89b89ef7c04b5dfe948790640134838f409f0a3071e5d74760f8a9fcd74b0840ce78c + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/effects11/cmake) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/effects11/vcpkg.json b/externals/vcpkg/ports/effects11/vcpkg.json new file mode 100755 index 000000000..bcabd7295 --- /dev/null +++ b/externals/vcpkg/ports/effects11/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "effects11", + "version": "11.27", + "description": "Effects for Direct3D 11 (FX11) is a management runtime for authoring HLSL shaders, render state, and runtime variables together.", + "homepage": "https://github.com/Microsoft/FX11", + "documentation": "https://github.com/microsoft/FX11/wiki", + "license": "MIT", + "supports": "windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/effolkronium-random/portfile.cmake b/externals/vcpkg/ports/effolkronium-random/portfile.cmake new file mode 100755 index 000000000..3acd390fb --- /dev/null +++ b/externals/vcpkg/ports/effolkronium-random/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO effolkronium/random + REF v1.4.1 + SHA512 215fd34ea3a99c955a1fcd70d6c317e3829b3c562c737d22be1371213b3e14346b2f61fc76afbbcc55e26b4fdf630fa428b8bc34104170cbfc4afebcf24d160b + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DRandom_BuildTests=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME effolkronium_random CONFIG_PATH cmake) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${SOURCE_PATH}/LICENSE.MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/effolkronium-random/vcpkg.json b/externals/vcpkg/ports/effolkronium-random/vcpkg.json new file mode 100755 index 000000000..9c4be3d55 --- /dev/null +++ b/externals/vcpkg/ports/effolkronium-random/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "effolkronium-random", + "version": "1.4.1", + "description": "Random with a modern C++ API", + "homepage": "https://github.com/effolkronium/random", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/efsw/portfile.cmake b/externals/vcpkg/ports/efsw/portfile.cmake new file mode 100755 index 000000000..450443fa1 --- /dev/null +++ b/externals/vcpkg/ports/efsw/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO SpartanJ/efsw + REF b62d04829bb0a6f3cacc7859e0b046a3c053bc50 + SHA512 fc16ef6ad330941dc0a1112ce645b57bd126d353556d50f45fadf150f25edd42c1d4946bc54d629d94c208d67d4ce17dbf5d1079cbeed51f0f6b1ccbe2199132 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DVERBOSE=OFF + -DBUILD_TEST_APP=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/efsw) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/efsw/vcpkg.json b/externals/vcpkg/ports/efsw/vcpkg.json new file mode 100755 index 000000000..f992dc8a5 --- /dev/null +++ b/externals/vcpkg/ports/efsw/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "efsw", + "version-date": "2020-06-08", + "port-version": 3, + "description": "efsw is a C++ cross-platform file system watcher and notifier.", + "homepage": "https://github.com/SpartanJ/efsw", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/egl-registry/portfile.cmake b/externals/vcpkg/ports/egl-registry/portfile.cmake new file mode 100755 index 000000000..f3b3ff65e --- /dev/null +++ b/externals/vcpkg/ports/egl-registry/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KhronosGroup/EGL-Registry + REF 992aa3914f8fea801b1034c992db389911d9f3c3 + SHA512 75524ed23066e856f080f6551a6c7b6573d13ff7b4555594e2987e1e6a38ba13042d5037d56d656048e83c0b4ff002b5badacf9224516f9f5e521d4af653805a + HEAD_REF master +) + +file( + COPY + "${SOURCE_PATH}/api/KHR" + "${SOURCE_PATH}/api/EGL" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" +) + +file( + COPY + "${SOURCE_PATH}/api/egl.xml" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/opengl" +) + +file( + INSTALL "${SOURCE_PATH}/sdk/docs/man/copyright.xml" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/externals/vcpkg/ports/egl-registry/vcpkg.json b/externals/vcpkg/ports/egl-registry/vcpkg.json new file mode 100755 index 000000000..95e58339c --- /dev/null +++ b/externals/vcpkg/ports/egl-registry/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "egl-registry", + "version-date": "2021-11-23", + "description": "the EGL API and Extension Registry", + "homepage": "https://github.com/KhronosGroup/EGL-Registry" +} diff --git a/externals/vcpkg/ports/eigen3/fix-vectorized-reductions-half.patch b/externals/vcpkg/ports/eigen3/fix-vectorized-reductions-half.patch new file mode 100755 index 000000000..1c5e592db --- /dev/null +++ b/externals/vcpkg/ports/eigen3/fix-vectorized-reductions-half.patch @@ -0,0 +1,26 @@ +diff --git a/Eigen/src/Core/PartialReduxEvaluator.h b/Eigen/src/Core/PartialReduxEvaluator.h +index 29abf35..4051fcf 100644 +--- a/Eigen/src/Core/PartialReduxEvaluator.h ++++ b/Eigen/src/Core/PartialReduxEvaluator.h +@@ -54,12 +54,19 @@ struct packetwise_redux_traits + /* Value to be returned when size==0 , by default let's return 0 */ + template + EIGEN_DEVICE_FUNC +-PacketType packetwise_redux_empty_value(const Func& ) { return pset1(0); } ++PacketType packetwise_redux_empty_value(const Func& ) { ++ const typename unpacket_traits::type zero(0); ++ return pset1(zero); ++} ++ + + /* For products the default is 1 */ + template + EIGEN_DEVICE_FUNC +-PacketType packetwise_redux_empty_value(const scalar_product_op& ) { return pset1(1); } ++PacketType packetwise_redux_empty_value(const scalar_product_op& ) { ++ return pset1(Scalar(1)); ++} ++ + + /* Perform the actual reduction */ + template= 9.0 when multiple ISAs are selected. +Please install embree3 with only one feature using command "./vcpkg install embree3[core,FEATURE_NAME]" +Only set feature avx automaticlly. + ]]) + set(FEATURE_OPTIONS + -DEMBREE_ISA_AVX=ON + -DEMBREE_ISA_AVX2=OFF + -DEMBREE_ISA_AVX512=OFF + -DEMBREE_ISA_SSE2=OFF + -DEMBREE_ISA_SSE42=OFF + ) + endif() +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE + PREFER_NINJA + OPTIONS ${FEATURE_OPTIONS} + -DEMBREE_ISPC_SUPPORT=OFF + -DEMBREE_TUTORIALS=OFF + -DEMBREE_STATIC_RUNTIME=${EMBREE_STATIC_RUNTIME} + -DEMBREE_STATIC_LIB=${EMBREE_STATIC_LIB} +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/embree TARGET_PATH share/embree) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() +if(APPLE) + file(REMOVE "${CURRENT_PACKAGES_DIR}/uninstall.command" "${CURRENT_PACKAGES_DIR}/debug/uninstall.command") +endif() +file(RENAME "${CURRENT_PACKAGES_DIR}/share/doc" "${CURRENT_PACKAGES_DIR}/share/${PORT}/") + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/embree3/usage b/externals/vcpkg/ports/embree3/usage new file mode 100755 index 000000000..8622f121d --- /dev/null +++ b/externals/vcpkg/ports/embree3/usage @@ -0,0 +1,4 @@ +The package embree3 provides CMake targets: + + find_package(embree 3 CONFIG REQUIRED) + target_link_libraries(main PRIVATE embree) diff --git a/externals/vcpkg/ports/embree3/vcpkg.json b/externals/vcpkg/ports/embree3/vcpkg.json new file mode 100755 index 000000000..80e51d514 --- /dev/null +++ b/externals/vcpkg/ports/embree3/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "embree3", + "version-semver": "3.12.2", + "port-version": 2, + "description": "High Performance Ray Tracing Kernels.", + "homepage": "https://github.com/embree/embree", + "dependencies": [ + "tbb" + ], + "default-features": [ + "avx", + "avx2", + "sse2", + "sse42" + ], + "features": { + "avx": { + "description": "Enables AVX ISA." + }, + "avx2": { + "description": "Enables AVX2 ISA." + }, + "avx512": { + "description": "Enables AVX512 ISA." + }, + "sse2": { + "description": "Enables SSE2 ISA." + }, + "sse42": { + "description": "Enables SSE4.2 ISA." + } + } +} diff --git a/externals/vcpkg/ports/enet/CMakeLists.txt b/externals/vcpkg/ports/enet/CMakeLists.txt new file mode 100755 index 000000000..a82e7aa4a --- /dev/null +++ b/externals/vcpkg/ports/enet/CMakeLists.txt @@ -0,0 +1,103 @@ +cmake_minimum_required(VERSION 3.0.2) + +project(enet) + +# The "configure" step. +include(CheckFunctionExists) +include(CheckStructHasMember) +include(CheckTypeSize) +check_function_exists("fcntl" HAS_FCNTL) +check_function_exists("poll" HAS_POLL) +check_function_exists("getaddrinfo" HAS_GETADDRINFO) +check_function_exists("getnameinfo" HAS_GETNAMEINFO) +check_function_exists("gethostbyname_r" HAS_GETHOSTBYNAME_R) +check_function_exists("gethostbyaddr_r" HAS_GETHOSTBYADDR_R) +check_function_exists("inet_pton" HAS_INET_PTON) +check_function_exists("inet_ntop" HAS_INET_NTOP) +check_struct_has_member("struct msghdr" "msg_flags" "sys/types.h;sys/socket.h" HAS_MSGHDR_FLAGS) +set(CMAKE_EXTRA_INCLUDE_FILES "sys/types.h" "sys/socket.h") +check_type_size("socklen_t" HAS_SOCKLEN_T BUILTIN_TYPES_ONLY) +unset(CMAKE_EXTRA_INCLUDE_FILES) +if(MSVC) + add_definitions(-W3) +else() + add_definitions(-Wno-error) +endif() + +if(HAS_FCNTL) + add_definitions(-DHAS_FCNTL=1) +endif() +if(HAS_POLL) + add_definitions(-DHAS_POLL=1) +endif() +if(HAS_GETNAMEINFO) + add_definitions(-DHAS_GETNAMEINFO=1) +endif() +if(HAS_GETADDRINFO) + add_definitions(-DHAS_GETADDRINFO=1) +endif() +if(HAS_GETHOSTBYNAME_R) + add_definitions(-DHAS_GETHOSTBYNAME_R=1) +endif() +if(HAS_GETHOSTBYADDR_R) + add_definitions(-DHAS_GETHOSTBYADDR_R=1) +endif() +if(HAS_INET_PTON) + add_definitions(-DHAS_INET_PTON=1) +endif() +if(HAS_INET_NTOP) + add_definitions(-DHAS_INET_NTOP=1) +endif() +if(HAS_MSGHDR_FLAGS) + add_definitions(-DHAS_MSGHDR_FLAGS=1) +endif() +if(HAS_SOCKLEN_T) + add_definitions(-DHAS_SOCKLEN_T=1) +endif() + +add_library(enet + callbacks.c + compress.c + host.c + list.c + packet.c + peer.c + protocol.c + unix.c + win32.c + ) + +add_library(enet::enet ALIAS enet) + +target_include_directories(enet PUBLIC + $ + $ +) + +if (BUILD_SHARED_LIBS) + target_compile_definitions(enet + PUBLIC ENET_DLL + PRIVATE ENET_BUILDING_LIB + ) +endif() + + +if (WIN32) + target_link_libraries(enet winmm ws2_32) +endif() + +set(ENET_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/enet) + +install(TARGETS enet EXPORT unofficial-enet-config + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin) + +INSTALL(EXPORT unofficial-enet-config + NAMESPACE unofficial::enet:: + FILE unofficial-enet-config.cmake + DESTINATION share/unofficial-enet +) + +install(DIRECTORY include/ + DESTINATION include) \ No newline at end of file diff --git a/externals/vcpkg/ports/enet/portfile.cmake b/externals/vcpkg/ports/enet/portfile.cmake new file mode 100755 index 000000000..ad4d17374 --- /dev/null +++ b/externals/vcpkg/ports/enet/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH + REPO "lsalzman/enet" + REF e0e7045b7e056b454b5093cb34df49dc4cee0bee # v1.3.17 + HEAD_REF master + SHA512 006a78edcc2059d8cee47a163d308dd02120a54f9c203401b83eb6cb4ab3e56cf09988d3c35b436a1e9f74c01296995ae6fdd46f6d354fe8261cf19cdde3df5d +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 + # OPTIONS_RELEASE -DOPTIMIZE=1 + # OPTIONS_DEBUG -DDEBUGGABLE=1 +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-enet CONFIG_PATH share/unofficial-enet) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/enet/vcpkg.json b/externals/vcpkg/ports/enet/vcpkg.json new file mode 100755 index 000000000..7d2a4289a --- /dev/null +++ b/externals/vcpkg/ports/enet/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "enet", + "version": "1.3.17", + "port-version": 1, + "description": "Reliable UDP networking library", + "homepage": "https://github.com/lsalzman/enet", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ensmallen/portfile.cmake b/externals/vcpkg/ports/ensmallen/portfile.cmake new file mode 100755 index 000000000..301f3fd7c --- /dev/null +++ b/externals/vcpkg/ports/ensmallen/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mlpack/ensmallen + REF bf42276c5a44eed31e5bacec95d166d01d65f9a4 #v2.18.1 + SHA512 09f96b2f0e0bd34245c34ee727e633bbb3957c2ab8076cfac66f976ba4e327096e2e76fadcc729dfffe73b56348bcc14fa61e3bb59a7ca0e17221f8f4cd0d59c + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTS=OFF +) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ensmallen) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/COPYRIGHT.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/ensmallen/vcpkg.json b/externals/vcpkg/ports/ensmallen/vcpkg.json new file mode 100755 index 000000000..614ae5743 --- /dev/null +++ b/externals/vcpkg/ports/ensmallen/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "ensmallen", + "version-semver": "2.18.1", + "description": "A header-only C++ library for mathematical optimization", + "homepage": "https://github.com/mlpack/ensmallen", + "dependencies": [ + "armadillo", + "blas", + "lapack", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/entityx/portfile.cmake b/externals/vcpkg/ports/entityx/portfile.cmake new file mode 100755 index 000000000..d0f83eef4 --- /dev/null +++ b/externals/vcpkg/ports/entityx/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO alecthomas/entityx + REF 1.3.0 + SHA512 724a3f421f802e60a1106ff8a69435c9a9da14e35c3e88565bbc17bff3a17f2d9771818aac83320cc4f14de0ec770a66f1eb7cbf4318f43abd516c63e077c07d + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE + PREFER_NINJA + OPTIONS + -DENTITYX_BUILD_TESTING=false + -DENTITYX_BUILD_SHARED=0 +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/entityx) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/entityx/COPYING ${CURRENT_PACKAGES_DIR}/share/entityx/copyright) diff --git a/externals/vcpkg/ports/entityx/vcpkg.json b/externals/vcpkg/ports/entityx/vcpkg.json new file mode 100755 index 000000000..101eb1fa0 --- /dev/null +++ b/externals/vcpkg/ports/entityx/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "entityx", + "version-string": "1.3.0", + "port-version": 3, + "description": "EntityX - A fast, type-safe C++ Entity-Component system.", + "homepage": "https://github.com/alecthomas/entityx" +} diff --git a/externals/vcpkg/ports/entt/portfile.cmake b/externals/vcpkg/ports/entt/portfile.cmake new file mode 100755 index 000000000..ab578ea38 --- /dev/null +++ b/externals/vcpkg/ports/entt/portfile.cmake @@ -0,0 +1,38 @@ +if ("experimental" IN_LIST FEATURES) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO skypjack/entt + HEAD_REF experimental + ) +else() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO skypjack/entt + REF v3.10.1 + SHA512 ce611f8892626d8df2d6be6a0e7c0218683899bae5665b4466f149c6a5b6a4d184b390370262faa3ea822a399ac71a92f4780e9a22438d4a7a14ca5f554e94c4 + HEAD_REF master + ) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DENTT_BUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +else() + vcpkg_cmake_config_fixup(CONFIG_PATH lib/EnTT/cmake) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +# Install natvis files +file(INSTALL "${SOURCE_PATH}/natvis/entt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/natvis") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/entt/vcpkg.json b/externals/vcpkg/ports/entt/vcpkg.json new file mode 100755 index 000000000..4bec827d4 --- /dev/null +++ b/externals/vcpkg/ports/entt/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "entt", + "version": "3.10.1", + "port-version": 1, + "description": "Gaming meets modern C++ - a fast and reliable entity-component system and much more", + "homepage": "https://github.com/skypjack/entt", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "experimental": { + "description": "Use experimental features right away" + } + } +} diff --git a/externals/vcpkg/ports/epsilon/0001-VS2015-provides-snprintf.patch b/externals/vcpkg/ports/epsilon/0001-VS2015-provides-snprintf.patch new file mode 100755 index 000000000..0fc664f60 --- /dev/null +++ b/externals/vcpkg/ports/epsilon/0001-VS2015-provides-snprintf.patch @@ -0,0 +1,51 @@ +From 8b5b2ea5ba695252abaad4234c951675d5f733ec Mon Sep 17 00:00:00 2001 +From: Hiroshi Miura +Date: Wed, 7 Feb 2018 12:28:54 +0900 +Subject: [PATCH 1/2] VS2015 provides snprintf + +Signed-off-by: Hiroshi Miura +--- + lib/common.h | 27 +++++++++++++++++++++++---- + 1 file changed, 23 insertions(+), 4 deletions(-) + +diff --git a/lib/common.h b/lib/common.h +index c5db1ed..73c4118 100644 +--- a/lib/common.h ++++ b/lib/common.h +@@ -39,10 +39,29 @@ extern "C" { + /** \addtogroup misc Miscellanea */ + /*@{*/ + +-/* Use _snprintf instead of snprintf under MSVC compiler */ +-#if defined(_WIN32) && !defined(__MINGW32__) +-#define snprintf _snprintf +-#endif ++#ifdef _MSC_VER ++#if _MSC_VER < 1900 // VS2015/17 provides snprintf ++#include ++#include ++/* Want safe, 'n += snprintf(b + n ...)' like function. If cp_max_len is 1 ++* then assume cp is pointing to a null char and do nothing. Returns number ++* number of chars placed in cp excluding the trailing null char. So for ++* cp_max_len > 0 the return value is always < cp_max_len; for cp_max_len ++* <= 0 the return value is 0 (and no chars are written to cp). */ ++static int snprintf(char * cp, int cp_max_len, const char * fmt, ...) ++{ ++ va_list args; ++ int n; ++ ++ if (cp_max_len < 2) ++ return 0; ++ va_start(args, fmt); ++ n = vsnprintf(cp, cp_max_len, fmt, args); ++ va_end(args); ++ return (n < cp_max_len) ? n : (cp_max_len - 1); ++} ++#endif // _MSC_VER < 1900 ++#endif // _MSC_VER + + #ifdef HAVE_CONFIG_H + # include +-- +2.16.1 + diff --git a/externals/vcpkg/ports/epsilon/0002-Add-CFLAGS-for-CRT-selection-and-warning-supression.patch b/externals/vcpkg/ports/epsilon/0002-Add-CFLAGS-for-CRT-selection-and-warning-supression.patch new file mode 100755 index 000000000..f76aed10b --- /dev/null +++ b/externals/vcpkg/ports/epsilon/0002-Add-CFLAGS-for-CRT-selection-and-warning-supression.patch @@ -0,0 +1,81 @@ +From 4969dd6e7b656e92bf1bc921f0cd1af00707e17f Mon Sep 17 00:00:00 2001 +From: Hiroshi Miura +Date: Wed, 7 Feb 2018 10:47:53 +0900 +Subject: [PATCH 2/2] Add CFLAGS for CRT selection and warning supression + +Signed-off-by: Hiroshi Miura +--- + makefile.vc | 2 +- + nmake.opt | 42 +++++++++++++++++++++++++++++++++++++++--- + 2 files changed, 40 insertions(+), 4 deletions(-) + +diff --git a/makefile.vc b/makefile.vc +index 33f1f34..64fb9f3 100644 +--- a/makefile.vc ++++ b/makefile.vc +@@ -20,7 +20,7 @@ EPSILON_EXE = epsilon.exe + +-CFLAGS = /nologo -IC:\OSGeo4W\include -I.\lib -I.\lib\msvc \ ++CFLAGS = /nologo -I$(INSTALLED_ROOT)\include -I.\lib -I.\lib\msvc \ + -I.\src -I..\popt\include \ +- $(OPTFLAGS) ++ $(OPTFLAGS) $(WARNFLAGS) + + default: all + +diff --git a/nmake.opt b/nmake.opt +index d5a51e2..d8088df 100644 +--- a/nmake.opt ++++ b/nmake.opt +@@ -1,9 +1,45 @@ + # Directory tree where EPSILON will be installed. ++!IFNDEF INSTDIR + INSTDIR=C:\OSGeo4W ++!ENDIF ++ ++# Flags to choose CRT variant to link against (e.g. static: /MT, /MTd, dynamic: /MD, /MDd) ++!IFNDEF CRT_FLAGS ++!IFNDEF DEBUG ++CRT_FLAGS=/MD ++!ELSE ++CRT_FLAGS=/MDd ++!ENDIF ++!ENDIF ++ ++# Flags for enforcing PDB use ++!IFNDEF PDB_FLAGS ++PDB_FLAGS=/Fdepsilon.pdb ++!ENDIF ++ ++# Set flags controlling warnings level, and suppression of some warnings. ++!IFNDEF WARNFLAGS ++# 4127: conditional expression is constant ++# 4251: 'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2' ++# 4275: non – DLL-interface classkey 'identifier' used as base for DLL-interface classkey 'identifier' ++# 4786: ?????????? ++# 4100: 'identifier' : unreferenced formal parameter ++# 4245: 'conversion' : conversion from 'type1' to 'type2', signed/unsigned mismatch ++# 4206: nonstandard extension used : translation unit is empty (only applies to C source code) ++# 4351: new behavior: elements of array 'array' will be default initialized (needed for https://trac.osgeo.org/gdal/changeset/35593) ++# 4611: interaction between '_setjmp' and C++ object destruction is non-portable ++# ++WARNFLAGS = /W3 /wd4127 /wd4251 /wd4275 /wd4786 /wd4100 /wd4245 /wd4206 /wd4351 /wd4611 ++!ENDIF ++ ++!IFNDEF OPTFLAGS ++!IFNDEF DEBUG ++OPTFLAGS= $(PDB_FLAGS) /nologo $(CRT_FLAGS) /D_CRT_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG ++!ELSE ++OPTFLAGS= $(PDB_FLAGS) /nologo $(CRT_FLAGS) /EHsc /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG ++!ENDIF ++!ENDIF + +-# Uncomment the first for an optimized build, or the second for debug. +-OPTFLAGS= /nologo /Ox /fp:precise /W3 /MD /D_CRT_SECURE_NO_WARNINGS +-#OPTFLAGS= /nologo /Zi /MD /Fdepsilon.pdb + + # Set the version number for the DLL. Normally we leave this blank since + # we want software that is dynamically loading the DLL to have no problem +-- +2.16.1 + diff --git a/externals/vcpkg/ports/epsilon/0003-Fix-build-error.patch b/externals/vcpkg/ports/epsilon/0003-Fix-build-error.patch new file mode 100755 index 000000000..73309b747 --- /dev/null +++ b/externals/vcpkg/ports/epsilon/0003-Fix-build-error.patch @@ -0,0 +1,52 @@ +diff --git a/makefile.vc b/makefile.vc +index cd0fc5a..7ce6861 100644 +--- a/makefile.vc ++++ b/makefile.vc +@@ -32,6 +32,12 @@ epsilon.lib: $(LIBOBJ) + + $(EPSILON_DLL): epsilon_i.lib + ++!IFNDEF DEBUG ++POPTLIB=$(LIBPATH)popt.lib ++!ELSE ++POPTLIB=$(LIBPATH)poptd.lib ++!ENDIF ++ + epsilon_i.lib: $(LIBOBJ) + link /debug /dll /def:libepsilon.def /out:$(EPSILON_DLL) \ + /implib:epsilon_i.lib $(LIBOBJ) +@@ -48,8 +54,8 @@ $(EPSILON_EXE): $(EPSILON_DLL) src\epsilon.obj \ + src\cmd_truncate_file.obj src\cmd_decode_file.obj \ + src\cmd_encode_file.obj src\misc.obj \ + src\psi.obj src\pbm.obj \ +- ..\popt\lib\libpopt.lib +- /Fe$(EPSILON_EXE) ++ $(POPTLIB) \ ++ /Fe"$(EPSILON_EXE)" + if exist $(EPSILON_EXE).manifest mt -manifest \ + $(EPSILON_EXE).manifest -outputresource:$(EPSILON_EXE);1 + +@@ -71,8 +77,9 @@ install: all + -mkdir $(INSTDIR)\bin + -mkdir $(INSTDIR)\lib + -mkdir $(INSTDIR)\include ++ -mkdir $(INSTDIR)\tools + copy *.dll $(INSTDIR)\bin + copy *.lib $(INSTDIR)\lib +- copy *.exe $(INSTDIR)\bin ++ copy *.exe $(INSTDIR)\tools + copy lib\epsilon.h $(INSTDIR)\include + +diff --git a/src/misc.h b/src/misc.h +index 9023dce..d8ce602 100644 +--- a/src/misc.h ++++ b/src/misc.h +@@ -30,7 +30,7 @@ extern "C" { + #endif + + /* Use _snprintf instead of snprintf under MSVC compiler */ +-#if defined(_WIN32) && !defined(__MINGW32__) ++#if 0 + #define snprintf _snprintf + #endif + diff --git a/externals/vcpkg/ports/epsilon/portfile.cmake b/externals/vcpkg/ports/epsilon/portfile.cmake new file mode 100755 index 000000000..525974ab5 --- /dev/null +++ b/externals/vcpkg/ports/epsilon/portfile.cmake @@ -0,0 +1,48 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO epsilon-project/epsilon + REF 0.9.2 + FILENAME "epsilon-0.9.2.tar.gz" + SHA512 95f427c68a4a4eb784f7d484d87fc573133983510f6b030663f88955e2446490a07b1343ae4668251b466f67cf9a79bd834b933c57c5ed12327f32174f20ac0f + PATCHES + 0001-VS2015-provides-snprintf.patch + 0002-Add-CFLAGS-for-CRT-selection-and-warning-supression.patch + 0003-Fix-build-error.patch +) + +if (VCPKG_CRT_LINKAGE STREQUAL static) + set(CL_FLAGS_REL "/MT /Ox /fp:precise") + set(CL_FLAGS_DBG "/MTd /Zi") + set(TARGET_LIB epsilon.lib) +else() + set(CL_FLAGS_REL "/MD /Ox /fp:precise") + set(CL_FLAGS_DBG "/MDd /Zi") + set(TARGET_LIB epsilon_i.lib) +endif() + +vcpkg_install_nmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + INSTALLED_ROOT="${CURRENT_INSTALLED_DIR}" + OPTIONS_DEBUG + INSTDIR="${CURRENT_PACKAGES_DIR}/debug" + MSVC_VER=1900 + CRT_FLAGS=${CL_FLAGS_DBG} + DEBUG=1 + ${TARGET_LIB} + LIBPATH="${CURRENT_INSTALLED_DIR}/debug/lib/" + OPTIONS_RELEASE + INSTDIR="${CURRENT_PACKAGES_DIR}" + MSVC_VER=1900 + CRT_FLAGS=${CL_FLAGS_REL} + ${TARGET_LIB} + LIBPATH="${CURRENT_INSTALLED_DIR}/lib/" +) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/epsilon/vcpkg.json b/externals/vcpkg/ports/epsilon/vcpkg.json new file mode 100755 index 000000000..d19ef5749 --- /dev/null +++ b/externals/vcpkg/ports/epsilon/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "epsilon", + "version-string": "0.9.2", + "port-version": 6, + "description": "EPSILON is an Open Source wavelet image compressor, that is aimed on parallel and robust image processing.", + "homepage": "https://sourceforge.net/projects/epsilon-project/", + "supports": "windows", + "dependencies": [ + "libpopt" + ] +} diff --git a/externals/vcpkg/ports/esaxx/portfile.cmake b/externals/vcpkg/ports/esaxx/portfile.cmake new file mode 100755 index 000000000..c81a2b1f5 --- /dev/null +++ b/externals/vcpkg/ports/esaxx/portfile.cmake @@ -0,0 +1,15 @@ +#header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO hillbig/esaxx + REF ca7cb332011ec37a8436487f210f396b84bd8273 + SHA512 8346fc93498f7979fd422db527d0e2db73080b2c372263a72a887ddc8328a29391bce6def5845f4500a180f5c2e641105d0ce108092e6eac9020c6bd67fb46df +) + +file(INSTALL + ${SOURCE_PATH}/esa.hxx + DESTINATION ${CURRENT_PACKAGES_DIR}/include +) + +# Handle copyright/readme/package files +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/esaxx RENAME copyright) diff --git a/externals/vcpkg/ports/esaxx/vcpkg.json b/externals/vcpkg/ports/esaxx/vcpkg.json new file mode 100755 index 000000000..74c69bddf --- /dev/null +++ b/externals/vcpkg/ports/esaxx/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "esaxx", + "version-string": "ca7cb332011ec37", + "port-version": 1, + "description": "This library provides the implementation of enhanced suffix array." +} diff --git a/externals/vcpkg/ports/eve/portfile.cmake b/externals/vcpkg/ports/eve/portfile.cmake new file mode 100755 index 000000000..621fe8a3c --- /dev/null +++ b/externals/vcpkg/ports/eve/portfile.cmake @@ -0,0 +1,15 @@ +message(WARNING "EVE requires a C++ 20 compliant compiler. GCC-11 and clang-12 are known to work.") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jfalcou/eve + REF v2021.10.0 + SHA512 bdac483d07c968cfe2cd2e0f26df68f0e3b6cd83fbfe4b89650dc58fb534fd37c5540682283a2ee29a82e87bdfc678beac3651e40cde5b4cf30c20ea8304c72c + HEAD_REF master +) + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/eve" RENAME copyright) diff --git a/externals/vcpkg/ports/eve/vcpkg.json b/externals/vcpkg/ports/eve/vcpkg.json new file mode 100755 index 000000000..24d27832a --- /dev/null +++ b/externals/vcpkg/ports/eve/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "eve", + "version-date": "2021-10-16", + "description": "EVE - the Expressive Vector Engine", + "homepage": "https://github.com/jfalcou/eve", + "documentation": "https://jfalcou.github.io/eve/html/pages.html", + "supports": "!windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/eventpp/portfile.cmake b/externals/vcpkg/ports/eventpp/portfile.cmake new file mode 100755 index 000000000..bd689e51c --- /dev/null +++ b/externals/vcpkg/ports/eventpp/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wqking/eventpp + REF v0.1.2 + SHA512 01fd536024dfef8c4025fc184f6b6326a901849dbf73d81430d7cfadeff25c9c140ab6a28b0143a4090703668c1d9e743a54e874c0321c3453cf40aeb4583db3 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/eventpp") +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/license" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/eventpp/vcpkg.json b/externals/vcpkg/ports/eventpp/vcpkg.json new file mode 100755 index 000000000..a2740ba56 --- /dev/null +++ b/externals/vcpkg/ports/eventpp/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "eventpp", + "version-semver": "0.1.2", + "description": "C++ library for event dispatcher and callback list", + "homepage": "https://github.com/wqking/eventpp", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/evpp/fix-linux-build.patch b/externals/vcpkg/ports/evpp/fix-linux-build.patch new file mode 100755 index 000000000..b5673b27c --- /dev/null +++ b/externals/vcpkg/ports/evpp/fix-linux-build.patch @@ -0,0 +1,112 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7872fc8..2a06614 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -47,7 +47,11 @@ string (REPLACE ";" " " CMAKE_CXX_FLAGS "${CXX_FLAGS}") + if (UNIX) + SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -ggdb -D_DEBUG -DGOOGLE_STRIP_LOG=0") + SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -g -ggdb -DNDEBUG -DGOOGLE_STRIP_LOG=1") +- SET(DEPENDENT_LIBRARIES event glog pthread) ++ find_package(glog CONFIG REQUIRED) ++ find_path(GLOG_INCLUDE_DIRS logging.h PATH_SUFFIXES glog) ++ find_package(Libevent CONFIG REQUIRED) ++ list(APPEND DEPENDENT_INCLUDE_DIRS "${GLOG_INCLUDE_DIRS}/../") ++ SET(DEPENDENT_LIBRARIES libevent::core libevent::extra libevent::openssl glog::glog pthread) + else (UNIX) + SET(DEPENDENT_LIBRARIES event glog) + endif (UNIX) +diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt +index 469ed1c..8219424 100644 +--- a/apps/CMakeLists.txt ++++ b/apps/CMakeLists.txt +@@ -2,7 +2,7 @@ + include_directories(${PROJECT_SOURCE_DIR}/apps ${PROJECT_SOURCE_DIR}/3rdparty) + + if (UNIX) +-set(LIBRARIES evpp_concurrentqueue event glog pthread) ++set(LIBRARIES evpp_concurrentqueue libevent::core libevent::extra libevent::openssl glog::glog pthread) + link_directories("/home/s/safe/lib" ${PROJECT_BUILD_DIR}/lib) + else(UNIX) + set(LIBRARIES evpp_static event glog) +diff --git a/benchmark/http/libevent/CMakeLists.txt b/benchmark/http/libevent/CMakeLists.txt +index 1148616..0356b71 100644 +--- a/benchmark/http/libevent/CMakeLists.txt ++++ b/benchmark/http/libevent/CMakeLists.txt +@@ -1,3 +1,3 @@ + + add_executable(benchmark_http_libevent libevent_http_bench.c) +-target_link_libraries(benchmark_http_libevent event) ++target_link_libraries(benchmark_http_libevent libevent::core libevent::extra libevent::openssl) +diff --git a/benchmark/ioevent/libevent/CMakeLists.txt b/benchmark/ioevent/libevent/CMakeLists.txt +index dfa51a3..de4849d 100644 +--- a/benchmark/ioevent/libevent/CMakeLists.txt ++++ b/benchmark/ioevent/libevent/CMakeLists.txt +@@ -1,3 +1,3 @@ + + add_executable(benchmark_ioevent_libevent libevent_ioevent_bench.c) +-target_link_libraries(benchmark_ioevent_libevent event) ++target_link_libraries(benchmark_ioevent_libevent libevent::core libevent::extra libevent::openssl) +diff --git a/benchmark/throughput/libevent/CMakeLists.txt b/benchmark/throughput/libevent/CMakeLists.txt +index 21dab84..aefe698 100644 +--- a/benchmark/throughput/libevent/CMakeLists.txt ++++ b/benchmark/throughput/libevent/CMakeLists.txt +@@ -1,5 +1,5 @@ + add_executable(benchmark_tcp_libevent_client client.c) +-target_link_libraries(benchmark_tcp_libevent_client event) ++target_link_libraries(benchmark_tcp_libevent_client libevent::core libevent::extra libevent::openssl) + + add_executable(benchmark_tcp_libevent_server server.c) +-target_link_libraries(benchmark_tcp_libevent_server event) ++target_link_libraries(benchmark_tcp_libevent_server libevent::core libevent::extra libevent::openssl) +diff --git a/examples/recipes/self_control_timer/basic_01/CMakeLists.txt b/examples/recipes/self_control_timer/basic_01/CMakeLists.txt +index 7834db4..82294c5 100644 +--- a/examples/recipes/self_control_timer/basic_01/CMakeLists.txt ++++ b/examples/recipes/self_control_timer/basic_01/CMakeLists.txt +@@ -1,7 +1,7 @@ + file(GLOB SRCS *.cc *.h) + + add_executable(example_recipes_self_control_timer_basic_01 ${SRCS}) +-target_link_libraries(example_recipes_self_control_timer_basic_01 event) ++target_link_libraries(example_recipes_self_control_timer_basic_01 libevent::core libevent::extra libevent::openssl) + + + +diff --git a/examples/recipes/self_control_timer/basic_02/CMakeLists.txt b/examples/recipes/self_control_timer/basic_02/CMakeLists.txt +index a8be419..0329ccc 100644 +--- a/examples/recipes/self_control_timer/basic_02/CMakeLists.txt ++++ b/examples/recipes/self_control_timer/basic_02/CMakeLists.txt +@@ -1,7 +1,7 @@ + file(GLOB SRCS *.cc *.h) + + add_executable(example_recipes_self_control_timer_basic_02 ${SRCS}) +-target_link_libraries(example_recipes_self_control_timer_basic_02 event) ++target_link_libraries(example_recipes_self_control_timer_basic_02 libevent::core libevent::extra libevent::openssl) + + + +diff --git a/examples/recipes/self_control_timer/cancel_03/CMakeLists.txt b/examples/recipes/self_control_timer/cancel_03/CMakeLists.txt +index 1cae9bb..218b771 100644 +--- a/examples/recipes/self_control_timer/cancel_03/CMakeLists.txt ++++ b/examples/recipes/self_control_timer/cancel_03/CMakeLists.txt +@@ -1,7 +1,7 @@ + file(GLOB SRCS *.cc *.h) + + add_executable(example_recipes_self_control_timer_cancel_03 ${SRCS}) +-target_link_libraries(example_recipes_self_control_timer_cancel_03 event) ++target_link_libraries(example_recipes_self_control_timer_cancel_03 libevent::core libevent::extra libevent::openssl) + + + +diff --git a/examples/recipes/self_control_timer/periodic_04/CMakeLists.txt b/examples/recipes/self_control_timer/periodic_04/CMakeLists.txt +index 749c584..e7c658e 100644 +--- a/examples/recipes/self_control_timer/periodic_04/CMakeLists.txt ++++ b/examples/recipes/self_control_timer/periodic_04/CMakeLists.txt +@@ -1,7 +1,7 @@ + file(GLOB SRCS *.cc *.h) + + add_executable(example_recipes_self_control_timer_periodic_04 ${SRCS}) +-target_link_libraries(example_recipes_self_control_timer_periodic_04 event) ++target_link_libraries(example_recipes_self_control_timer_periodic_04 libevent::core libevent::extra libevent::openssl) + + + diff --git a/externals/vcpkg/ports/evpp/fix-osx-build.patch b/externals/vcpkg/ports/evpp/fix-osx-build.patch new file mode 100755 index 000000000..47c758fde --- /dev/null +++ b/externals/vcpkg/ports/evpp/fix-osx-build.patch @@ -0,0 +1,45 @@ +diff --git a/evpp/server_status.h b/evpp/server_status.h +index 3a83725..f28f833 100644 +--- a/evpp/server_status.h ++++ b/evpp/server_status.h +@@ -25,7 +25,7 @@ public: + }; + + std::string StatusToString() const { +- H_CASE_STRING_BIGIN(status_); ++ H_CASE_STRING_BIGIN(+status_); + H_CASE_STRING(kNull); + H_CASE_STRING(kInitialized); + H_CASE_STRING(kRunning); +diff --git a/evpp/sockets.cc b/evpp/sockets.cc +index 333c05c..c547d88 100644 +--- a/evpp/sockets.cc ++++ b/evpp/sockets.cc +@@ -22,6 +22,14 @@ std::string strerror(int e) { + } + + return empty_string; ++#elif defined(__APPLE__) ++ char buf[2048] = {}; ++ strerror_r(e, buf, sizeof(buf) - 1); ++ const char* s = buf; ++ if (s) { ++ return std::string(s); ++ } ++ return std::string(); + #else + char buf[2048] = {}; + const char* s = strerror_r(e, buf, sizeof(buf) - 1); +diff --git a/evpp/tcp_conn.cc b/evpp/tcp_conn.cc +index b7678d0..527b2b9 100644 +--- a/evpp/tcp_conn.cc ++++ b/evpp/tcp_conn.cc +@@ -309,7 +309,7 @@ void TCPConn::SetTCPNoDelay(bool on) { + } + + std::string TCPConn::StatusToString() const { +- H_CASE_STRING_BIGIN(status_); ++ H_CASE_STRING_BIGIN(+status_); + H_CASE_STRING(kDisconnected); + H_CASE_STRING(kConnecting); + H_CASE_STRING(kConnected); diff --git a/externals/vcpkg/ports/evpp/fix-rapidjson-1-1.patch b/externals/vcpkg/ports/evpp/fix-rapidjson-1-1.patch new file mode 100755 index 000000000..1dda0b895 --- /dev/null +++ b/externals/vcpkg/ports/evpp/fix-rapidjson-1-1.patch @@ -0,0 +1,159 @@ +diff --git a/3rdparty/libhashkit/crc32.c b/3rdparty/libhashkit/crc32.c +index 6db0478..ff34194 100644 +--- a/3rdparty/libhashkit/crc32.c ++++ b/3rdparty/libhashkit/crc32.c +@@ -73,7 +73,7 @@ static const uint32_t crc32tab[256] = { + 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d, + }; + +-uint32_t hashkit_crc32(const char *key, size_t key_length, void *context __attribute__((unused))) ++uint32_t hashkit_crc32(const char *key, size_t key_length, void * context) + { + uint64_t x; + uint32_t crc= UINT32_MAX; +diff --git a/3rdparty/libhashkit/fnv.c b/3rdparty/libhashkit/fnv.c +index ee3754d..d79fe39 100644 +--- a/3rdparty/libhashkit/fnv.c ++++ b/3rdparty/libhashkit/fnv.c +@@ -14,7 +14,7 @@ static uint64_t FNV_64_PRIME= UINT64_C(0x100000001b3); + static uint32_t FNV_32_INIT= 2166136261UL; + static uint32_t FNV_32_PRIME= 16777619; + +-uint32_t hashkit_fnv1_64(const char *key, size_t key_length, void *context __attribute__((unused))) ++uint32_t hashkit_fnv1_64(const char *key, size_t key_length, void * context) + { + /* Thanks to pierre@demartines.com for the pointer */ + uint64_t hash= FNV_64_INIT; +@@ -28,7 +28,7 @@ uint32_t hashkit_fnv1_64(const char *key, size_t key_length, void *context __att + return (uint32_t)hash; + } + +-uint32_t hashkit_fnv1a_64(const char *key, size_t key_length, void *context __attribute__((unused))) ++uint32_t hashkit_fnv1a_64(const char *key, size_t key_length, void * context) + { + uint32_t hash= (uint32_t) FNV_64_INIT; + +@@ -42,7 +42,7 @@ uint32_t hashkit_fnv1a_64(const char *key, size_t key_length, void *context __at + return hash; + } + +-uint32_t hashkit_fnv1_32(const char *key, size_t key_length, void *context __attribute__((unused))) ++uint32_t hashkit_fnv1_32(const char *key, size_t key_length, void * context) + { + uint32_t hash= FNV_32_INIT; + +@@ -56,7 +56,7 @@ uint32_t hashkit_fnv1_32(const char *key, size_t key_length, void *context __att + return hash; + } + +-uint32_t hashkit_fnv1a_32(const char *key, size_t key_length, void *context __attribute__((unused))) ++uint32_t hashkit_fnv1a_32(const char *key, size_t key_length, void * context) + { + uint32_t hash= FNV_32_INIT; + +diff --git a/3rdparty/libhashkit/hsieh.c b/3rdparty/libhashkit/hsieh.c +index ba46ed2..c3e9a38 100644 +--- a/3rdparty/libhashkit/hsieh.c ++++ b/3rdparty/libhashkit/hsieh.c +@@ -17,7 +17,7 @@ + +(uint32_t)(((const uint8_t *)(d))[0]) ) + #endif + +-uint32_t hashkit_hsieh(const char *key, size_t key_length, void *context __attribute__((unused))) ++uint32_t hashkit_hsieh(const char *key, size_t key_length, void * context) + { + uint32_t hash = 0, tmp; + int rem; +diff --git a/3rdparty/libhashkit/jenkins.c b/3rdparty/libhashkit/jenkins.c +index b684d7a..2b59714 100644 +--- a/3rdparty/libhashkit/jenkins.c ++++ b/3rdparty/libhashkit/jenkins.c +@@ -56,7 +56,7 @@ use a bitmask. For example, if you need only 10 bits, do + In which case, the hash table should have hashsize(10) elements. + */ + +-uint32_t hashkit_jenkins(const char *key, size_t length, void *context __attribute__((unused))) ++uint32_t hashkit_jenkins(const char *key, size_t length, void * context) + { + uint32_t a,b,c; /* internal state */ + union { const void *ptr; size_t i; } u; /* needed for Mac Powerbook G4 */ +diff --git a/3rdparty/libhashkit/md5.c b/3rdparty/libhashkit/md5.c +index 7371c6d..0e3181b 100644 +--- a/3rdparty/libhashkit/md5.c ++++ b/3rdparty/libhashkit/md5.c +@@ -352,7 +352,7 @@ unsigned int len) + (((UINT4)input[j+2]) << 16) | (((UINT4)input[j+3]) << 24); + } + +-uint32_t hashkit_md5(const char *key, size_t key_length, void *context __attribute__((unused))) ++uint32_t hashkit_md5(const char *key, size_t key_length, void * context) + { + unsigned char results[16]; + +diff --git a/3rdparty/libhashkit/murmur.c b/3rdparty/libhashkit/murmur.c +index a18ac40..9e55eec 100644 +--- a/3rdparty/libhashkit/murmur.c ++++ b/3rdparty/libhashkit/murmur.c +@@ -17,7 +17,7 @@ + + #include "common.h" + +-uint32_t hashkit_murmur(const char *key, size_t length, void *context __attribute__((unused))) ++uint32_t hashkit_murmur(const char *key, size_t length, void * context) + { + /* + 'm' and 'r' are mixing constants generated offline. They're not +diff --git a/3rdparty/libhashkit/one_at_a_time.c b/3rdparty/libhashkit/one_at_a_time.c +index 579d044..539861c 100644 +--- a/3rdparty/libhashkit/one_at_a_time.c ++++ b/3rdparty/libhashkit/one_at_a_time.c +@@ -13,7 +13,7 @@ http://en.wikipedia.org/wiki/Jenkins_hash_function + + #include "common.h" + +-uint32_t hashkit_one_at_a_time(const char *key, size_t key_length, void *context __attribute__((unused))) ++uint32_t hashkit_one_at_a_time(const char *key, size_t key_length, void * context) + { + const char *ptr= key; + uint32_t value= 0; +diff --git a/3rdparty/libhashkit/strerror.c b/3rdparty/libhashkit/strerror.c +index 270fa21..7446782 100644 +--- a/3rdparty/libhashkit/strerror.c ++++ b/3rdparty/libhashkit/strerror.c +@@ -8,7 +8,7 @@ + + #include "common.h" + +-const char *hashkit_strerror(hashkit_st *ptr __attribute__((unused)), hashkit_return_t rc) ++const char *hashkit_strerror(hashkit_st *ptr, hashkit_return_t rc) + { + switch (rc) + { +diff --git a/apps/evnsq/option.cc b/apps/evnsq/option.cc +index e2128f5..0248ace 100644 +--- a/apps/evnsq/option.cc ++++ b/apps/evnsq/option.cc +@@ -21,14 +21,14 @@ std::string Option::ToJSON() const { + doc.AddMember("write_timeout", rapidjson::Value(int64_t(write_timeout.Milliseconds())), doc.GetAllocator()); + doc.AddMember("msg_timeout", rapidjson::Value(int64_t(msg_timeout.Milliseconds())), doc.GetAllocator()); + +- doc.AddMember("client_id", rapidjson::Value(client_id, doc.GetAllocator()), doc.GetAllocator()); +- doc.AddMember("hostname", rapidjson::Value(hostname, doc.GetAllocator()), doc.GetAllocator()); +- doc.AddMember("user_agent", rapidjson::Value(user_agent, doc.GetAllocator()), doc.GetAllocator()); ++ doc.AddMember("client_id", rapidjson::Value(client_id.data(), client_id.size(), doc.GetAllocator()), doc.GetAllocator()); ++ doc.AddMember("hostname", rapidjson::Value(hostname.data(), hostname.size(), doc.GetAllocator()), doc.GetAllocator()); ++ doc.AddMember("user_agent", rapidjson::Value(user_agent.data(), user_agent.size(), doc.GetAllocator()), doc.GetAllocator()); + + doc.AddMember("heartbeat_interval", rapidjson::Value(int64_t(heartbeat_interval.Milliseconds())), doc.GetAllocator()); + + doc.AddMember("deflate", rapidjson::Value(false), doc.GetAllocator()); +- doc.AddMember("long_id", rapidjson::Value(hostname, doc.GetAllocator()), doc.GetAllocator()); ++ doc.AddMember("long_id", rapidjson::Value(hostname.data(), hostname.size(), doc.GetAllocator()), doc.GetAllocator()); + doc.AddMember("output_buffer_size", rapidjson::Value(int64_t(16384)), doc.GetAllocator()); + doc.AddMember("output_buffer_timeout", rapidjson::Value(int64_t(250)), doc.GetAllocator()); + doc.AddMember("feature_negotiation", rapidjson::Value(feature_negotiation), doc.GetAllocator()); +@@ -40,3 +40,4 @@ std::string Option::ToJSON() const { + return std::string(buffer.GetString(), buffer.GetSize()); + } + } ++ diff --git a/externals/vcpkg/ports/evpp/portfile.cmake b/externals/vcpkg/ports/evpp/portfile.cmake new file mode 100755 index 000000000..b3edaf3aa --- /dev/null +++ b/externals/vcpkg/ports/evpp/portfile.cmake @@ -0,0 +1,29 @@ +set(EVPP_VERSION 0.7.0) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Qihoo360/evpp + REF v${EVPP_VERSION} + SHA512 ddcef8d2af6b3c46473d755c0f0994d63d56240ea85d6b44ceb6b77724c3c56bbf1156f7188e270fb5f9f36f25bfc2f96669d7249a34c921922671e3fe267e88 + HEAD_REF master + PATCHES + fix-rapidjson-1-1.patch + fix-linux-build.patch + fix-osx-build.patch +) + +file(REMOVE_RECURSE ${SOURCE_PATH}/3rdparty/rapidjson ${SOURCE_PATH}/3rdparty/concurrentqueue) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DEVPP_VCPKG_BUILD=ON +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/evpp/vcpkg.json b/externals/vcpkg/ports/evpp/vcpkg.json new file mode 100755 index 000000000..ee95a96a7 --- /dev/null +++ b/externals/vcpkg/ports/evpp/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "evpp", + "version-string": "0.7.0", + "port-version": 5, + "description": "A modern C++ network library based on libevent for developing high performance network services in TCP/UDP/HTTP protocols.", + "homepage": "https://github.com/Qihoo360/evpp", + "dependencies": [ + { + "name": "boost-lockfree", + "platform": "!windows" + }, + { + "name": "concurrentqueue", + "platform": "!windows" + }, + "glog", + { + "name": "libevent", + "platform": "windows" + }, + { + "name": "libevent", + "features": [ + "openssl" + ], + "platform": "!windows" + }, + "rapidjson" + ] +} diff --git a/externals/vcpkg/ports/exiv2/fix-find_expat.patch b/externals/vcpkg/ports/exiv2/fix-find_expat.patch new file mode 100755 index 000000000..a2de4228a --- /dev/null +++ b/externals/vcpkg/ports/exiv2/fix-find_expat.patch @@ -0,0 +1,64 @@ +diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake +index ec3a43f..d8637cc 100644 +--- a/cmake/findDependencies.cmake ++++ b/cmake/findDependencies.cmake +@@ -42,7 +42,8 @@ if (EXIV2_ENABLE_XMP AND EXIV2_ENABLE_EXTERNAL_XMP) + message(FATAL_ERROR "EXIV2_ENABLE_XMP AND EXIV2_ENABLE_EXTERNAL_XMP are mutually exclusive. You can only choose one of them") + else() + if (EXIV2_ENABLE_XMP) +- find_package(EXPAT REQUIRED) ++ find_package(expat CONFIG REQUIRED) ++ set(EXPAT_FOUND 1) + elseif (EXIV2_ENABLE_EXTERNAL_XMP) + find_package(XmpSdk REQUIRED) + endif () +diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt +index de8aa1d..524724c 100644 +--- a/samples/CMakeLists.txt ++++ b/samples/CMakeLists.txt +@@ -77,11 +77,10 @@ if( EXPAT_FOUND ) + target_link_libraries(geotag + PRIVATE + exiv2-xmp +- ${EXPAT_LIBRARIES} ++ expat::expat + ) + target_include_directories(geotag PRIVATE ${CMAKE_BINARY_DIR}) # exv_conf.h + target_include_directories(geotag PRIVATE ${CMAKE_SOURCE_DIR}/include) # +- target_include_directories(geotag PRIVATE ${EXPAT_INCLUDE_DIR}) + target_include_directories(geotag PRIVATE ${CMAKE_SOURCE_DIR}/src) # To find unused.h + + if (WIN32) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 26e5a95..5dc722c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -154,8 +154,7 @@ target_include_directories(exiv2lib SYSTEM PRIVATE + ) + + if (EXIV2_ENABLE_XMP OR EXIV2_ENABLE_EXTERNAL_XMP) +- target_include_directories(exiv2lib PRIVATE ${EXPAT_INCLUDE_DIR}) +- target_link_libraries(exiv2lib PRIVATE ${EXPAT_LIBRARIES}) ++ target_link_libraries(exiv2lib PRIVATE expat::expat) + + if (WIN32) + target_compile_definitions(exiv2lib PRIVATE XML_STATIC) +diff --git a/xmpsdk/CMakeLists.txt b/xmpsdk/CMakeLists.txt +index a22698f..55102ce 100644 +--- a/xmpsdk/CMakeLists.txt ++++ b/xmpsdk/CMakeLists.txt +@@ -28,13 +28,12 @@ add_library(exiv2-xmp STATIC + + target_link_libraries(exiv2-xmp + PRIVATE +- $ ++ $ + ) + + target_include_directories(exiv2-xmp + PRIVATE + $ +- ${EXPAT_INCLUDE_DIR} + ) + + # Prevent a denial-service-attack related to XML entity expansion diff --git a/externals/vcpkg/ports/exiv2/portfile.cmake b/externals/vcpkg/ports/exiv2/portfile.cmake new file mode 100755 index 000000000..661431c79 --- /dev/null +++ b/externals/vcpkg/ports/exiv2/portfile.cmake @@ -0,0 +1,76 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Exiv2/exiv2 + REF ad5484cb1eaba3ad0e49b290d244f6b1ee9ff076 #v0.27.5 + SHA512 33b8c60990b05f1599860974d6fe44baba8369356acd2cab3ce4919a48bb44348ed0496ffc4581d9fd5eb8a1b36d48a0eaa3fafe4584bfd655d0a88e7a9458ef + HEAD_REF master + PATCHES + fix-find_expat.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + unicode EXIV2_ENABLE_WIN_UNICODE + xmp EXIV2_ENABLE_XMP + video EXIV2_ENABLE_VIDEO + png EXIV2_ENABLE_PNG + nls EXIV2_ENABLE_NLS +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" EXIV2_CRT_DYNAMIC) + +if("unicode" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(FATAL_ERROR "Feature unicode only supports Windows platform.") +endif() + +vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DEXIV2_BUILD_EXIV2_COMMAND=OFF + -DEXIV2_BUILD_UNIT_TESTS=OFF + -DEXIV2_BUILD_SAMPLES=OFF + -DEXIV2_BUILD_DOC=OFF + -DEXIV2_ENABLE_EXTERNAL_XMP=OFF + -DEXIV2_ENABLE_PRINTUCS2=OFF + -DEXIV2_ENABLE_LENSDATA=ON + -DEXIV2_ENABLE_DYNAMIC_RUNTIME=${EXIV2_CRT_DYNAMIC} + -DEXIV2_ENABLE_WEBREADY=OFF + -DEXIV2_ENABLE_CURL=OFF + -DEXIV2_ENABLE_SSH=OFF + -DEXIV2_ENABLE_BMFF=OFF + -DEXIV2_TEAM_EXTRA_WARNINGS=OFF + -DEXIV2_TEAM_WARNINGS_AS_ERRORS=OFF + -DEXIV2_TEAM_PACKAGING=OFF + -DEXIV2_TEAM_USE_SANITIZERS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/exiv2) +vcpkg_fixup_pkgconfig() + +if("nls" IN_LIST FEATURES) + set(EXIV2_ENABLE_NLS ON) +else() + set(EXIV2_ENABLE_NLS OFF) +endif() +configure_file( + ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake + ${CURRENT_PACKAGES_DIR}/share/${PORT} + @ONLY +) + +vcpkg_copy_pdbs() + +# Clean +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/exiv2" "${CURRENT_PACKAGES_DIR}/lib/exiv2") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/exiv2/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/exiv2/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..62f4ecca3 --- /dev/null +++ b/externals/vcpkg/ports/exiv2/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,16 @@ +_find_package(${ARGS}) + +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + find_package(Iconv REQUIRED) + if(@EXIV2_ENABLE_NLS@) + find_package(Intl REQUIRED) + endif() + if(TARGET exiv2lib) + set_property(TARGET exiv2lib APPEND PROPERTY INTERFACE_LINK_LIBRARIES + Iconv::Iconv + ) + if(@EXIV2_ENABLE_NLS@) + set_property(TARGET exiv2lib APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${Intl_LIBRARIES}) + endif() + endif() +endif() diff --git a/externals/vcpkg/ports/exiv2/vcpkg.json b/externals/vcpkg/ports/exiv2/vcpkg.json new file mode 100755 index 000000000..6bbb69c99 --- /dev/null +++ b/externals/vcpkg/ports/exiv2/vcpkg.json @@ -0,0 +1,52 @@ +{ + "name": "exiv2", + "version": "0.27.5", + "port-version": 1, + "description": "Image metadata library and tools", + "homepage": "https://www.exiv2.org", + "supports": "!uwp", + "dependencies": [ + "libiconv", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "nls": { + "description": "Build native language support", + "dependencies": [ + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + } + ] + }, + "png": { + "description": "Build with png support (requires libz)", + "dependencies": [ + "libpng", + "zlib" + ] + }, + "unicode": { + "description": "Compile with unicode support on windows" + }, + "video": { + "description": "Build video support into library" + }, + "xmp": { + "description": "Build with XMP metadata support", + "dependencies": [ + "expat" + ] + } + } +} diff --git a/externals/vcpkg/ports/expat/portfile.cmake b/externals/vcpkg/ports/expat/portfile.cmake new file mode 100755 index 000000000..64cedf590 --- /dev/null +++ b/externals/vcpkg/ports/expat/portfile.cmake @@ -0,0 +1,43 @@ +set(EX_VERSION 2.4.8) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libexpat/libexpat + REF 3bab6c09bbe8bf42d84b81563ddbcf4cca4be838 #v2.4.8 + SHA512 6bddf6514183b3bfa6bf869e63cf838cfe2912941ef04543bce00bee84a305f494368fb7cbd80404d06877a1d8da82de5ac2b44074b25e34aeaee7949d37e451 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" EXPAT_LINKAGE) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/expat" + OPTIONS + -DEXPAT_BUILD_EXAMPLES=OFF + -DEXPAT_BUILD_TESTS=OFF + -DEXPAT_BUILD_TOOLS=OFF + -DEXPAT_BUILD_DOCS=OFF + -DEXPAT_SHARED_LIBS=${EXPAT_LINKAGE} + -DEXPAT_BUILD_PKGCONFIG=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/expat-${EX_VERSION}") +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/expat_external.h" + "! defined(XML_STATIC)" + "/* vcpkg static build ! defined(XML_STATIC) */ 0" + ) +endif() + +vcpkg_copy_pdbs() + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/expat/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/expat/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/expat/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..2bdace20c --- /dev/null +++ b/externals/vcpkg/ports/expat/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,27 @@ +include(SelectLibraryConfigurations) + +set(EXPATNAMES expat expatw libexpat libexpatw) +set(DEBUGNAMES) +foreach(_CRT "" MT MD) + foreach(name IN LISTS EXPATNAMES) + list(APPEND EXPATNAMES ${name}${_CRT}) + list(APPEND DEBUGNAMES ${name}d${_CRT}) + endforeach() +endforeach() + +find_library(EXPAT_LIBRARY_DEBUG NAMES ${DEBUGNAMES} ${EXPATNAMES} NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH) +find_library(EXPAT_LIBRARY_RELEASE NAMES ${EXPATNAMES} NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) +select_library_configurations(EXPAT) +set(EXPAT_LIBRARY "${EXPAT_LIBRARIES}" CACHE STRING "" FORCE) +_find_package(${ARGS}) +if(EXPAT_FOUND AND TARGET EXPAT::EXPAT) + if(EXPAT_LIBRARY_DEBUG) + set_target_properties(EXPAT::EXPAT PROPERTIES IMPORTED_LOCATION_DEBUG "${EXPAT_LIBRARY_DEBUG}") + endif() + if(EXPAT_LIBRARY_RELEASE) + set_target_properties(EXPAT::EXPAT PROPERTIES IMPORTED_LOCATION_RELEASE "${EXPAT_LIBRARY_RELEASE}") + endif() +endif() + +unset(EXPATNAMES) +unset(DEBUGNAMES) diff --git a/externals/vcpkg/ports/expat/vcpkg.json b/externals/vcpkg/ports/expat/vcpkg.json new file mode 100755 index 000000000..c56815d50 --- /dev/null +++ b/externals/vcpkg/ports/expat/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "expat", + "version": "2.4.8", + "port-version": 1, + "description": "XML parser library written in C", + "homepage": "https://github.com/libexpat/libexpat", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/expected-lite/portfile.cmake b/externals/vcpkg/ports/expected-lite/portfile.cmake new file mode 100755 index 000000000..a0fffa756 --- /dev/null +++ b/externals/vcpkg/ports/expected-lite/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO martinmoene/expected-lite + REF v0.6.0 + SHA512 83b6b1ab2f1683aede5b9d00798f821299a1e78ab10d4d321c3def0d1d4be25f0f9fd244530715408940fc36c1dff7d635861cf52f10f7dbd3b975840150c121 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DEXPECTED_LITE_OPT_BUILD_TESTS=OFF + -DEXPECTED_LITE_OPT_BUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + CONFIG_PATH lib/cmake/${PORT} +) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" +) + +file(INSTALL + "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright +) diff --git a/externals/vcpkg/ports/expected-lite/vcpkg.json b/externals/vcpkg/ports/expected-lite/vcpkg.json new file mode 100755 index 000000000..4111de4fd --- /dev/null +++ b/externals/vcpkg/ports/expected-lite/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "expected-lite", + "version": "0.6.0", + "description": "Expected objects in C++11 and later in a single-file header-only library", + "homepage": "https://github.com/martinmoene/expected-lite", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/exprtk/copyright b/externals/vcpkg/ports/exprtk/copyright new file mode 100755 index 000000000..f52eae229 --- /dev/null +++ b/externals/vcpkg/ports/exprtk/copyright @@ -0,0 +1,8 @@ +Copyright 1999-2022 Arash Partow +https://www.partow.net/programming/exprtk/index.html + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/externals/vcpkg/ports/exprtk/portfile.cmake b/externals/vcpkg/ports/exprtk/portfile.cmake new file mode 100755 index 000000000..3217882eb --- /dev/null +++ b/externals/vcpkg/ports/exprtk/portfile.cmake @@ -0,0 +1,10 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ArashPartow/exprtk + REF 806C519C91FD08BA4FA19380DBF3F6E42DE9E2D1 + SHA512 A323CCAF161FD0087FD8208D1B24C2A3FD422F8875E29B22AE70E6DD2F10F396F6BF1AD36D3FFDC10D32314AE8F83749974301A349BE0F27733292BCF5193640 + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/exprtk.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/externals/vcpkg/ports/exprtk/vcpkg.json b/externals/vcpkg/ports/exprtk/vcpkg.json new file mode 100755 index 000000000..90bc3a428 --- /dev/null +++ b/externals/vcpkg/ports/exprtk/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "exprtk", + "version-date": "2022-01-01", + "port-version": 2, + "description": "Simple to use, easy to integrate and extremely efficient run-time C++ mathematical expression parser and evaluation engine.", + "homepage": "https://www.partow.net/programming/exprtk/index.html", + "license": "MIT" +} diff --git a/externals/vcpkg/ports/ezc3d/portfile.cmake b/externals/vcpkg/ports/ezc3d/portfile.cmake new file mode 100755 index 000000000..8a334db2a --- /dev/null +++ b/externals/vcpkg/ports/ezc3d/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO pyomeca/ezc3d + REF Release_1.4.7 + SHA512 ba234be76b5d95b9527952c7e1bf67d9725fc280bf991f45e7cbd68f1aeeab7e963c8c4d928e720d02ebc02ec2b0e41f1c28036cd728ccb4c5a77c6fa81a74ad + HEAD_REF dev +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-Dezc3d_BIN_FOLDER=bin" + "-Dezc3d_LIB_FOLDER=lib" + -DBUILD_EXAMPLE=OFF +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(CONFIG_PATH "CMake") +else() + vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/ezc3d") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/ezc3d/vcpkg.json b/externals/vcpkg/ports/ezc3d/vcpkg.json new file mode 100755 index 000000000..aa503641f --- /dev/null +++ b/externals/vcpkg/ports/ezc3d/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "ezc3d", + "version": "1.4.7", + "description": "C3D reader/writer", + "homepage": "https://github.com/pyomeca/ezc3d", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/faad2/0001-Fix-non-x86-msvc.patch b/externals/vcpkg/ports/faad2/0001-Fix-non-x86-msvc.patch new file mode 100755 index 000000000..821dfb09b --- /dev/null +++ b/externals/vcpkg/ports/faad2/0001-Fix-non-x86-msvc.patch @@ -0,0 +1,13 @@ +diff --git a/libfaad/common.h b/libfaad/common.h +index 897a0f0..8b78807 100644 +--- a/libfaad/common.h ++++ b/libfaad/common.h +@@ -313,7 +313,7 @@ char *strchr(), *strrchr(); + } + + +- #if defined(_WIN32) && !defined(_WIN64) && !defined(__MINGW32__) ++ #if defined(_WIN32) && defined(_M_IX86) && !defined(__MINGW32__) + #ifndef HAVE_LRINTF + #define HAS_LRINTF + static INLINE int lrintf(float f) diff --git a/externals/vcpkg/ports/faad2/0002-Fix-unary-minus.patch b/externals/vcpkg/ports/faad2/0002-Fix-unary-minus.patch new file mode 100755 index 000000000..28e11603f --- /dev/null +++ b/externals/vcpkg/ports/faad2/0002-Fix-unary-minus.patch @@ -0,0 +1,24 @@ +diff --git a/libfaad/decoder.c b/libfaad/decoder.c +index 4f4b011..9bed248 100644 +--- a/libfaad/decoder.c ++++ b/libfaad/decoder.c +@@ -239,7 +239,7 @@ static int latmCheck(latm_header *latm, bitfile *ld) + while (ld->bytes_left) + { + bits = faad_latm_frame(latm, ld); +- if(bits==-1U) ++ if(bits==0xFFFFFFFF) + bad++; + else + { +diff --git a/libfaad/syntax.c b/libfaad/syntax.c +index c992543..be8c541 100644 +--- a/libfaad/syntax.c ++++ b/libfaad/syntax.c +@@ -2644,5 +2644,5 @@ uint32_t faad_latm_frame(latm_header *latm, bitfile *ld) + return (len*8)-(endpos-initpos); + //faad_getbits(ld, initpos-endpos); //go back to initpos, but is valid a getbits(-N) ? + } +- return -1U; ++ return 0xFFFFFFFF; + } diff --git a/externals/vcpkg/ports/faad2/0003-Initialize-pointers.patch b/externals/vcpkg/ports/faad2/0003-Initialize-pointers.patch new file mode 100755 index 000000000..29c572597 --- /dev/null +++ b/externals/vcpkg/ports/faad2/0003-Initialize-pointers.patch @@ -0,0 +1,28 @@ +diff --git a/frontend/main.c b/frontend/main.c +index e1d3c7d..25881c7 100644 +--- a/frontend/main.c ++++ b/frontend/main.c +@@ -462,9 +462,9 @@ static int decodeAACfile(char *aacfile, char *sndfile, char *adts_fn, int to_std + unsigned char channels; + void *sample_buffer; + +- audio_file *aufile; ++ audio_file *aufile = NULL; + +- FILE *adtsFile; ++ FILE *adtsFile = NULL; + unsigned char *adtsData; + int adtsDataSize; + +@@ -796,9 +796,9 @@ static int decodeMP4file(char *mp4file, char *sndfile, char *adts_fn, int to_std + + long sampleId, startSampleId; + +- audio_file *aufile; ++ audio_file *aufile = NULL; + +- FILE *adtsFile; ++ FILE *adtsFile = NULL; + unsigned char *adtsData; + int adtsDataSize; + diff --git a/externals/vcpkg/ports/faad2/CMakeLists.txt b/externals/vcpkg/ports/faad2/CMakeLists.txt new file mode 100755 index 000000000..10305eb00 --- /dev/null +++ b/externals/vcpkg/ports/faad2/CMakeLists.txt @@ -0,0 +1,38 @@ +cmake_minimum_required(VERSION 3.7.2) +project (faad VERSION 2.9.1) + +option(FAAD_BUILD_BINARIES "Build faad2 binaries" OFF) + +file(GLOB_RECURSE FAAD_SOURCES "${CMAKE_CURRENT_LIST_DIR}/libfaad/*.c") +file(GLOB_RECURSE FAAD_HEADERS "${CMAKE_CURRENT_LIST_DIR}/libfaad/*.h") + +if (BUILD_SHARED_LIBS) + list(APPEND FAAD_SOURCES "${CMAKE_CURRENT_LIST_DIR}/project/msvc/libfaad2.def") +endif () + +add_definitions(-DSTDC_HEADERS -DPACKAGE_VERSION=\"${PROJECT_VERSION}\" -D_CRT_SECURE_NO_WARNINGS -DHAVE_LRINTF) +include_directories( + "${CMAKE_CURRENT_LIST_DIR}/include" + "${CMAKE_CURRENT_LIST_DIR}/libfaad" +) +add_library(faad ${FAAD_SOURCES} ${FAAD_HEADERS}) + +if (FAAD_BUILD_BINARIES) + include_directories( + "${CMAKE_CURRENT_LIST_DIR}/frontend" + ) + add_executable(faad_decoder + "${CMAKE_SOURCE_DIR}/frontend/audio.c" + "${CMAKE_SOURCE_DIR}/frontend/main.c" + "${CMAKE_SOURCE_DIR}/frontend/mp4read.c" + "${CMAKE_SOURCE_DIR}/frontend/unicode_support.c" + ) + target_link_libraries(faad_decoder PRIVATE faad shell32) +endif () + +install( + TARGETS faad + ARCHIVE DESTINATION "lib" + LIBRARY DESTINATION "lib" + RUNTIME DESTINATION "bin" + ) diff --git a/externals/vcpkg/ports/faad2/portfile.cmake b/externals/vcpkg/ports/faad2/portfile.cmake new file mode 100755 index 000000000..8596e1a8b --- /dev/null +++ b/externals/vcpkg/ports/faad2/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO knik0/faad2 + REF 043d37b60cdded2abed7c4054f954e # 2_9_1 + SHA512 8658256bbcb3ce641eef67c4f5d22d54b348805a06b2954718a44910861a9882371c887feb085060c524f955993ae26c211c6bb4fb8d95f9e9d1d0b5dca0ebe4 + HEAD_REF master + PATCHES + 0001-Fix-non-x86-msvc.patch # https://github.com/knik0/faad2/pull/42 + 0002-Fix-unary-minus.patch # https://github.com/knik0/faad2/pull/43 + 0003-Initialize-pointers.patch # https://github.com/knik0/faad2/pull/44 +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + build-decoder FAAD_BUILD_BINARIES +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/faad2/vcpkg.json b/externals/vcpkg/ports/faad2/vcpkg.json new file mode 100755 index 000000000..f2d6031f7 --- /dev/null +++ b/externals/vcpkg/ports/faad2/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "faad2", + "version": "2.9.1", + "port-version": 5, + "description": "Freeware Advanced Audio (AAC) Decoder", + "homepage": "https://sourceforge.net/projects/faac/", + "supports": "windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "build-decoder": { + "description": "Build the embedded decoder executable" + } + } +} diff --git a/externals/vcpkg/ports/fadbad/portfile.cmake b/externals/vcpkg/ports/fadbad/portfile.cmake new file mode 100755 index 000000000..35c0ff8f5 --- /dev/null +++ b/externals/vcpkg/ports/fadbad/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_download_distfile(ARCHIVE + URLS "http://www.fadbad.com/download/FADBAD++-2.1.tar.gz" + FILENAME "FADBAD++-2.1.tar.gz" + SHA512 7a82c51c03acb0806d673853f391379ea974e304c831ee15ef05a90c30661736ff572481b5b8254b2646c63968043ee90a06cba88261b87fc34d01f92403360a +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +file(INSTALL + ${SOURCE_PATH}/tadiff.h + ${SOURCE_PATH}/fadbad.h + ${SOURCE_PATH}/fadiff.h + ${SOURCE_PATH}/badiff.h + DESTINATION ${CURRENT_PACKAGES_DIR}/include +) + +file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/fadbad RENAME copyright) diff --git a/externals/vcpkg/ports/fadbad/vcpkg.json b/externals/vcpkg/ports/fadbad/vcpkg.json new file mode 100755 index 000000000..162be3706 --- /dev/null +++ b/externals/vcpkg/ports/fadbad/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "fadbad", + "version-string": "2.1.0", + "port-version": 1, + "description": "FADBAD++ Templates for Automatic Differentiation", + "homepage": "https://www.fadbad.com/" +} diff --git a/externals/vcpkg/ports/faiss/fix-dependencies.patch b/externals/vcpkg/ports/faiss/fix-dependencies.patch new file mode 100755 index 000000000..81b9fd58f --- /dev/null +++ b/externals/vcpkg/ports/faiss/fix-dependencies.patch @@ -0,0 +1,39 @@ +diff --git a/cmake/faiss-config.cmake.in b/cmake/faiss-config.cmake.in +index 43ea9d4..437a7f8 100644 +--- a/cmake/faiss-config.cmake.in ++++ b/cmake/faiss-config.cmake.in +@@ -4,4 +4,7 @@ + # This source code is licensed under the BSD-style license found in the + # LICENSE file in the root directory of this source tree. + ++find_dependency(OpenMP REQUIRED) ++find_dependency(BLAS REQUIRED) ++find_dependency(LAPACK REQUIRED) + include("${CMAKE_CURRENT_LIST_DIR}/faiss-targets.cmake") +diff --git a/faiss/CMakeLists.txt b/faiss/CMakeLists.txt +index 30d573f..9af8baf 100644 +--- a/faiss/CMakeLists.txt ++++ b/faiss/CMakeLists.txt +@@ -212,17 +212,17 @@ target_link_libraries(faiss PRIVATE OpenMP::OpenMP_CXX) + target_link_libraries(faiss_avx2 PRIVATE OpenMP::OpenMP_CXX) + + find_package(MKL) +-if(MKL_FOUND) ++if(0) + target_link_libraries(faiss PRIVATE ${MKL_LIBRARIES}) + target_link_libraries(faiss_avx2 PRIVATE ${MKL_LIBRARIES}) + else() + find_package(BLAS REQUIRED) +- target_link_libraries(faiss PRIVATE ${BLAS_LIBRARIES}) +- target_link_libraries(faiss_avx2 PRIVATE ${BLAS_LIBRARIES}) ++ target_link_libraries(faiss PRIVATE BLAS::BLAS) ++ target_link_libraries(faiss_avx2 PRIVATE BLAS::BLAS) + + find_package(LAPACK REQUIRED) +- target_link_libraries(faiss PRIVATE ${LAPACK_LIBRARIES}) +- target_link_libraries(faiss_avx2 PRIVATE ${LAPACK_LIBRARIES}) ++ target_link_libraries(faiss PRIVATE LAPACK::LAPACK) ++ target_link_libraries(faiss_avx2 PRIVATE LAPACK::LAPACK) + endif() + + install(TARGETS faiss diff --git a/externals/vcpkg/ports/faiss/portfile.cmake b/externals/vcpkg/ports/faiss/portfile.cmake new file mode 100755 index 000000000..505609f68 --- /dev/null +++ b/externals/vcpkg/ports/faiss/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO facebookresearch/faiss + REF v1.7.2 + SHA512 dddf55af3cc73a15fbbd104ab75942194a4d5d088611bd98b11e459e034ba5df1d9247eb8c8b9f4631cc64c6ed284b2cf407041be7b6095f9395f9ac29d78df4 + HEAD_REF master + PATCHES + fix-dependencies.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + gpu FAISS_ENABLE_GPU +) + +if ("${FAISS_ENABLE_GPU}") + if (NOT VCPKG_CMAKE_SYSTEM_NAME AND NOT ENV{CUDACXX}) + set(ENV{CUDACXX} "$ENV{CUDA_PATH}/bin/nvcc.exe") + endif() +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DFAISS_ENABLE_PYTHON=OFF # Requires SWIG + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/externals/vcpkg/ports/faiss/vcpkg.json b/externals/vcpkg/ports/faiss/vcpkg.json new file mode 100755 index 000000000..27f35e035 --- /dev/null +++ b/externals/vcpkg/ports/faiss/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "faiss", + "version-semver": "1.7.2", + "description": "Faiss is a library for efficient similarity search and clustering of dense vectors.", + "homepage": "https://github.com/facebookresearch/faiss", + "license": "MIT", + "supports": "!uwp & !osx & !x86", + "dependencies": [ + "lapack", + "openblas", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "gpu": { + "description": "Whether to enable GPU support", + "dependencies": [ + "cuda" + ] + } + } +} diff --git a/externals/vcpkg/ports/fakeit/portfile.cmake b/externals/vcpkg/ports/fakeit/portfile.cmake new file mode 100755 index 000000000..c17a64311 --- /dev/null +++ b/externals/vcpkg/ports/fakeit/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO eranpeer/FakeIt + REF 38c118c2be2fe33148545b1c32dc568eeabe1f23 #v2.1.1 + SHA512 32b91a1d2fc156cd2293774fea0196492356411ad2437acde1488e087a62f921e13dd75d850be3d50c380e3d525759273eba5b40771fe140581d5ffaefe16842 + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/single_header/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/fakeit/vcpkg.json b/externals/vcpkg/ports/fakeit/vcpkg.json new file mode 100755 index 000000000..837586d55 --- /dev/null +++ b/externals/vcpkg/ports/fakeit/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "fakeit", + "version": "2.1.1", + "description": "FakeIt is a simple mocking framework for C++. It supports GCC, Clang and MS Visual C++.", + "homepage": "https://github.com/eranpeer/FakeIt", + "license": "MIT" +} diff --git a/externals/vcpkg/ports/fann/fix-installation.patch b/externals/vcpkg/ports/fann/fix-installation.patch new file mode 100755 index 000000000..270f0877a --- /dev/null +++ b/externals/vcpkg/ports/fann/fix-installation.patch @@ -0,0 +1,70 @@ +diff --git a/cmake/Modules/DefineInstallationPaths.cmake b/cmake/Modules/DefineInstallationPaths.cmake +index 644cf1b..81e7c74 100644 +--- a/cmake/Modules/DefineInstallationPaths.cmake ++++ b/cmake/Modules/DefineInstallationPaths.cmake +@@ -3,7 +3,7 @@ if (UNIX) + MESSAGE(STATUS "${PROJECT_NAME} is used as APPLICATION_NAME") + SET(APPLICATION_NAME ${PROJECT_NAME}) + ENDIF (NOT APPLICATION_NAME) +- ++if (0) + # Suffix for Linux + SET(LIB_SUFFIX + CACHE STRING "Define suffix of directory name (32/64)" +@@ -122,9 +122,10 @@ if (UNIX) + CACHE PATH "The ${APPLICATION_NAME} info install dir (default prefix/info)" + FORCE + ) ++endif() + endif (UNIX) + +-if (WIN32) ++if (0) + # Same same + SET(BIN_INSTALL_DIR .) + SET(SBIN_INSTALL_DIR .) +@@ -134,5 +135,5 @@ if (WIN32) + SET(ICON_INSTALL_DIR .) + SET(SOUND_INSTALL_DIR .) + SET(LOCALE_INSTALL_DIR lang) +-endif (WIN32) ++endif (0) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index fade00c..a4e6c3f 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -14,7 +14,7 @@ floatfann.c + ADD_LIBRARY(floatfann SHARED ${floatfann_LIB_SRCS}) + + SET_TARGET_PROPERTIES(floatfann PROPERTIES VERSION ${VERSION} SOVERSION 2 ) +-INSTALL(TARGETS floatfann DESTINATION ${LIB_INSTALL_DIR} ) ++INSTALL(TARGETS floatfann RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) + + + ########### next target ############### +@@ -26,7 +26,7 @@ doublefann.c + ADD_LIBRARY(doublefann SHARED ${doublefann_LIB_SRCS}) + + SET_TARGET_PROPERTIES(doublefann PROPERTIES VERSION ${VERSION} SOVERSION 2 ) +-INSTALL(TARGETS doublefann DESTINATION ${LIB_INSTALL_DIR} ) ++INSTALL(TARGETS doublefann RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) + + + ########### next target ############### +@@ -38,7 +38,7 @@ fixedfann.c + ADD_LIBRARY(fixedfann SHARED ${fixedfann_LIB_SRCS}) + + SET_TARGET_PROPERTIES(fixedfann PROPERTIES VERSION ${VERSION} SOVERSION 2 ) +-INSTALL(TARGETS fixedfann DESTINATION ${LIB_INSTALL_DIR} ) ++INSTALL(TARGETS fixedfann RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) + + + ########### next target ############### +@@ -50,5 +50,5 @@ floatfann.c + ADD_LIBRARY(fann SHARED ${fann_LIB_SRCS}) + + SET_TARGET_PROPERTIES(fann PROPERTIES VERSION ${VERSION} SOVERSION 2 ) +-INSTALL(TARGETS fann DESTINATION ${LIB_INSTALL_DIR} ) ++INSTALL(TARGETS fann RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) + diff --git a/externals/vcpkg/ports/fann/fix-uwp-build.patch b/externals/vcpkg/ports/fann/fix-uwp-build.patch new file mode 100755 index 000000000..dd42358bd --- /dev/null +++ b/externals/vcpkg/ports/fann/fix-uwp-build.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b91f6fb..22c39d7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,6 +22,10 @@ SET(PKGCONFIG_INSTALL_DIR /lib/pkgconfig) + + INSTALL_FILES( ${PKGCONFIG_INSTALL_DIR} FILES fann.pc ) + ++if (MSVC) ++ add_compile_options(/wd4996) ++endif() ++ + ADD_SUBDIRECTORY( src ) + + ################# cpack ################ diff --git a/externals/vcpkg/ports/fann/portfile.cmake b/externals/vcpkg/ports/fann/portfile.cmake new file mode 100755 index 000000000..716bf3e8b --- /dev/null +++ b/externals/vcpkg/ports/fann/portfile.cmake @@ -0,0 +1,61 @@ +# Official design +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libfann/fann + REF 2.2.0 + SHA512 b307539a39d93078a489710ac77aa8c6e324f3cf5ef80299ce257d10c043913764abef83aceac5278a5bd243b1ee245b4e8331a9e13c774aa63c9cb604f86bdd + HEAD_REF master + PATCHES + fix-installation.patch + fix-uwp-build.patch +) + +set(INSTALL_BASE_DIR_DBG ${CURRENT_PACKAGES_DIR}/debug) +set(INSTALL_BASE_DIR_REL ${CURRENT_PACKAGES_DIR}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DBIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/bin + -DSBIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/sbin + -DLIB_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/bin + -DEXEC_INSTALL_PREFIX=${INSTALL_BASE_DIR_DBG}/tools/${PORT} + -DXDG_APPS_DIR=${INSTALL_BASE_DIR_DBG}/tools/${PORT} + -DPLUGIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/tools/${PORT} + -DSHARE_INSTALL_PREFIX=${INSTALL_BASE_DIR_DBG}/share/${PORT} + -DDATA_INSTALL_PREFIX=${INSTALL_BASE_DIR_DBG}/share/${PORT} + -DHTML_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/share/${PORT}/doc + -DICON_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/share/${PORT}/data/icons + -DSOUND_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/share/${PORT}/sounds + -DLOCALE_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/share/${PORT}/locale + -DSYSCONF_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/share/${PORT}/etc + -DINFO_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/share/${PORT}/info + OPTIONS_RELEASE + -DBIN_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/bin + -DSBIN_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/sbin + -DLIB_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/bin + -DEXEC_INSTALL_PREFIX=${INSTALL_BASE_DIR_REL}/tools/${PORT} + -DXDG_APPS_DIR=${INSTALL_BASE_DIR_REL}/tools/${PORT} + -DPLUGIN_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/tools/${PORT} + -DSHARE_INSTALL_PREFIX=${INSTALL_BASE_DIR_REL}/share/${PORT} + -DDATA_INSTALL_PREFIX=${INSTALL_BASE_DIR_REL}/share/${PORT} + -DHTML_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/share/${PORT}/doc + -DICON_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/share/${PORT}/data/icons + -DSOUND_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/share/${PORT}/sounds + -DLOCALE_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/share/${PORT}/locale + -DSYSCONF_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/share/${PORT}/etc + -DINFO_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/share/${PORT}/info +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/fann/vcpkg.json b/externals/vcpkg/ports/fann/vcpkg.json new file mode 100755 index 000000000..c4bc01717 --- /dev/null +++ b/externals/vcpkg/ports/fann/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "fann", + "version": "2.2.0", + "port-version": 2, + "description": "Fast Artificial Neural Network (FANN) Library is a free open source neural network library, which implements multilayer artificial neural networks in C with support for both fully connected and sparsely connected networks.", + "homepage": "https://github.com/libfann/fann" +} diff --git a/externals/vcpkg/ports/farmhash/farmhashConfig.cmake b/externals/vcpkg/ports/farmhash/farmhashConfig.cmake new file mode 100755 index 000000000..e091d5c05 --- /dev/null +++ b/externals/vcpkg/ports/farmhash/farmhashConfig.cmake @@ -0,0 +1,19 @@ +function(set_library_target NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR) + add_library(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED) + set_target_properties(${NAMESPACE}::${LIB_NAME} PROPERTIES + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}" + IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}" + INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}" + ) + set(${NAMESPACE}_${LIB_NAME}_FOUND 1) +endfunction() + +get_filename_component(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(ROOT "${ROOT}" PATH) +get_filename_component(ROOT "${ROOT}" PATH) + +set_library_target("GOOGLE" "farmhash" + "${ROOT}/debug/lib/${CMAKE_STATIC_LIBRARY_PREFIX}farmhash${CMAKE_STATIC_LIBRARY_SUFFIX}" + "${ROOT}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}farmhash${CMAKE_STATIC_LIBRARY_SUFFIX}" + "${ROOT}/include/") diff --git a/externals/vcpkg/ports/farmhash/portfile.cmake b/externals/vcpkg/ports/farmhash/portfile.cmake new file mode 100755 index 000000000..496e5e317 --- /dev/null +++ b/externals/vcpkg/ports/farmhash/portfile.cmake @@ -0,0 +1,37 @@ +#Requires a compiler which understands '__builtin_unreachable': +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_download_distfile(WIN_PR_PATCH + URLS "https://github.com/google/farmhash/pull/40.diff" + FILENAME farmhash-pr-40.patch + SHA512 265f5c15c17da2b88c82e6016a181abe73d2d94492cdb0cba892acf67a9d40815d54fa81e07351254fe2a39aea143b125924db0e7df14aac84a7469a78612cbd +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/farmhash + REF 0d859a811870d10f53a594927d0d0b97573ad06d + SHA512 7bc14931e488464c1cedbc17551fb90a8cec494d0e0860db9df8efff09000fd8d91e01060dd5c5149b1104ac4ac8bf7eb57e5b156b05ef42636938edad1518f1 + HEAD_REF master + PATCHES ${WIN_PR_PATCH} +) + +if((VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) AND NOT ENV{CXX_FLAGS}) # This should be a compiler check + set(ENV{CXXFLAGS} "-maes -msse4.2") +endif() +file(REMOVE_RECURSE "${SOURCE_PATH}/configure") +vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH ${SOURCE_PATH} +) +vcpkg_install_make() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share" # eliminate unused files +) +file(INSTALL "${SOURCE_PATH}/COPYING" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/farmhashConfig.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/farmhash/usage b/externals/vcpkg/ports/farmhash/usage new file mode 100755 index 000000000..6ec1706dc --- /dev/null +++ b/externals/vcpkg/ports/farmhash/usage @@ -0,0 +1,4 @@ +The package farmhash is compatible with built-in CMake targets: + + FIND_PACKAGE(farmhash REQUIRED) + TARGET_LINK_LIBRARIES(main PRIVATE GOOGLE::farmhash) for linkage \ No newline at end of file diff --git a/externals/vcpkg/ports/farmhash/vcpkg.json b/externals/vcpkg/ports/farmhash/vcpkg.json new file mode 100755 index 000000000..962408890 --- /dev/null +++ b/externals/vcpkg/ports/farmhash/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "farmhash", + "version-string": "1.1", + "port-version": 4, + "description": "FarmHash, a family of hash functions.", + "homepage": "https://github.com/google/farmhash", + "supports": "!arm" +} diff --git a/externals/vcpkg/ports/fast-cpp-csv-parser/portfile.cmake b/externals/vcpkg/ports/fast-cpp-csv-parser/portfile.cmake new file mode 100755 index 000000000..212c97ed9 --- /dev/null +++ b/externals/vcpkg/ports/fast-cpp-csv-parser/portfile.cmake @@ -0,0 +1,14 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ben-strasser/fast-cpp-csv-parser + REF 75600d0b77448e6c410893830df0aec1dbacf8e3 + SHA512 aab418e98eb895dabd6369b186b7a55beddb84b89e358395a9f125829074916eff9086d80f9cd342d1bfd91acacc7103875c970a84164b75fff259cc93729285 + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/csv.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/fast-cpp-csv-parser/vcpkg.json b/externals/vcpkg/ports/fast-cpp-csv-parser/vcpkg.json new file mode 100755 index 000000000..8e2640a61 --- /dev/null +++ b/externals/vcpkg/ports/fast-cpp-csv-parser/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "fast-cpp-csv-parser", + "version-string": "2021-01-03", + "port-version": 1, + "description": "A small, easy-to-use and fast header-only library for reading comma separated value (CSV) files", + "homepage": "https://github.com/ben-strasser/fast-cpp-csv-parser" +} diff --git a/externals/vcpkg/ports/fast-float/portfile.cmake b/externals/vcpkg/ports/fast-float/portfile.cmake new file mode 100755 index 000000000..267abb3a2 --- /dev/null +++ b/externals/vcpkg/ports/fast-float/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO fastfloat/fast_float + REF v3.2.0 + SHA512 8c0819501f854688942bf2676a9592c537b14b472a942695d589a75499f43bef57a8cb98b41b285dcfc0122f804c85e477d5aee82750a69308bdbf16c98ce2a7 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME FastFloat CONFIG_PATH share/FastFloat) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(INSTALL "${SOURCE_PATH}/LICENSE-MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/fast-float/vcpkg.json b/externals/vcpkg/ports/fast-float/vcpkg.json new file mode 100755 index 000000000..b2155a266 --- /dev/null +++ b/externals/vcpkg/ports/fast-float/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "fast-float", + "version": "3.2.0", + "description": "Fast and exact implementation of the C++ from_chars functions for float and double types: 4x faster than strtod", + "homepage": "https://github.com/fastfloat/fast_float", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/fastcdr/install-cmake.patch b/externals/vcpkg/ports/fastcdr/install-cmake.patch new file mode 100755 index 000000000..04296897b --- /dev/null +++ b/externals/vcpkg/ports/fastcdr/install-cmake.patch @@ -0,0 +1,13 @@ +diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt +index 14747c9..65c3ddb 100644 +--- a/src/cpp/CMakeLists.txt ++++ b/src/cpp/CMakeLists.txt +@@ -155,7 +155,7 @@ elseif(NOT EPROSIMA_INSTALLER) + COMPONENT cmake + ) + +- if(MSVC OR MSVC_IDE) ++ if(MSVC OR MSVC_IDE AND 0) + if(TARGET_TYPE STREQUAL "SHARED_LIBRARY") + # Install pdb files + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Debug/ diff --git a/externals/vcpkg/ports/fastcdr/portfile.cmake b/externals/vcpkg/ports/fastcdr/portfile.cmake new file mode 100755 index 000000000..1bd5034a7 --- /dev/null +++ b/externals/vcpkg/ports/fastcdr/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO eProsima/Fast-CDR + REF 065d49248bd4afbae670836ee1f1c718b9760dde # v1.0.15 + SHA512 1e011f1848abace94299368a5150f9f7513a676ccdc2b2247cebcb098f7b397e9bd20f5663bc35ea9921b1c91654af39e19b867b73c38bdc5612e0e2b926743a + HEAD_REF master + PATCHES install-cmake.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_GTest=ON +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/fastcdr) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/lib/fastcdr ${CURRENT_PACKAGES_DIR}/debug/lib/fastcdr) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(READ ${CURRENT_PACKAGES_DIR}/include/fastcdr/eProsima_auto_link.h EPROSIMA_AUTO_LINK_H) + string(REPLACE "#define EPROSIMA_LIB_PREFIX \"lib\"" "#define EPROSIMA_LIB_PREFIX" EPROSIMA_AUTO_LINK_H "${EPROSIMA_AUTO_LINK_H}") + file(WRITE ${CURRENT_PACKAGES_DIR}/include/fastcdr/eProsima_auto_link.h "${EPROSIMA_AUTO_LINK_H}") +else() + file(READ ${CURRENT_PACKAGES_DIR}/include/fastcdr/config.h FASTCDR_H) + string(REPLACE "#define _FASTCDR_CONFIG_H_" "#define _FASTCDR_CONFIG_H_\r\n#define FASTCDR_DYN_LINK" FASTCDR_H "${FASTCDR_H}") + file(WRITE ${CURRENT_PACKAGES_DIR}/include/fastcdr/config.h "${FASTCDR_H}") +endif() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/fastcdr/vcpkg.json b/externals/vcpkg/ports/fastcdr/vcpkg.json new file mode 100755 index 000000000..0f2241e4e --- /dev/null +++ b/externals/vcpkg/ports/fastcdr/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "fastcdr", + "version-semver": "1.0.15", + "port-version": 1, + "description": "eProsima FastCDR is a C++ library that provides two serialization mechanisms. One is the standard CDR serialization mechanism, while the other is a faster implementation that modifies the standard.", + "homepage": "https://github.com/eProsima/Fast-CDR" +} diff --git a/externals/vcpkg/ports/fastcgi/dll.patch b/externals/vcpkg/ports/fastcgi/dll.patch new file mode 100755 index 000000000..14e94faef --- /dev/null +++ b/externals/vcpkg/ports/fastcgi/dll.patch @@ -0,0 +1,109 @@ +diff --git a/include/fcgi_stdio.h b/include/fcgi_stdio.h +index 6d242f36f..ec57131ce 100644 +--- a/include/fcgi_stdio.h ++++ b/include/fcgi_stdio.h +@@ -23,14 +23,6 @@ + extern "C" { + #endif + +-#ifndef DLLAPI +-#if defined (_WIN32) && defined (_MSC_VER) +-#define DLLAPI __declspec(dllimport) +-#else +-#define DLLAPI +-#endif +-#endif +- + /* + * Wrapper type for FILE + */ +diff --git a/include/fcgiapp.h b/include/fcgiapp.h +index 8cadde16d..9b034def3 100644 +--- a/include/fcgiapp.h ++++ b/include/fcgiapp.h +@@ -23,11 +23,19 @@ + #endif + + #ifndef DLLAPI +-#if defined (_WIN32) && defined (_MSC_VER) +-#define DLLAPI __declspec(dllimport) +-#else +-#define DLLAPI +-#endif ++# if defined (_WIN32) && defined (_MSC_VER) ++# if defined(DLL_EXPORT) && defined(LIBFCGI_BUILD) ++# define DLLAPI __declspec(dllexport) ++# else ++# ifdef LIBFCGI_DLL_IMPORT ++# define DLLAPI extern __declspec(dllimport) ++# else ++# define DLLAPI ++# endif ++# endif ++# else ++# define DLLAPI ++# endif + #endif + + #if defined (c_plusplus) || defined (__cplusplus) +diff --git a/include/fcgio.h b/include/fcgio.h +index ce8b930a8..81981974a 100644 +--- a/include/fcgio.h ++++ b/include/fcgio.h +@@ -34,14 +34,6 @@ + + #include "fcgiapp.h" + +-#ifndef DLLAPI +-#if defined (_WIN32) && defined (_MSC_VER) +-#define DLLAPI __declspec(dllimport) +-#else +-#define DLLAPI +-#endif +-#endif +- + #if ! HAVE_STREAMBUF_CHAR_TYPE + typedef char char_type; + #endif +diff --git a/include/fcgios.h b/include/fcgios.h +index 206973137..7a2f5333a 100644 +--- a/include/fcgios.h ++++ b/include/fcgios.h +@@ -50,11 +50,19 @@ extern "C" { + #endif /* !_WIN32 */ + + #ifndef DLLAPI +-#if defined (_WIN32) && defined (_MSC_VER) +-#define DLLAPI __declspec(dllimport) +-#else +-#define DLLAPI +-#endif ++# if defined (_WIN32) && defined (_MSC_VER) ++# if defined(DLL_EXPORT) && defined(LIBFCGI_BUILD) ++# define DLLAPI __declspec(dllexport) ++# else ++# ifdef LIBFCGI_DLL_IMPORT ++# define DLLAPI extern __declspec(dllimport) ++# else ++# define DLLAPI ++# endif ++# endif ++# else ++# define DLLAPI ++# endif + #endif + + +diff --git a/libfcgi/Makefile.am b/libfcgi/Makefile.am +index 42d507253..26f06f550 100644 +--- a/libfcgi/Makefile.am ++++ b/libfcgi/Makefile.am +@@ -1,7 +1,7 @@ + # $Id: Makefile.am,v 1.9 2001/12/22 03:16:20 robs Exp $ + + INCLUDEDIR = ../include +-AM_CPPFLAGS = -I$(top_srcdir)/include -W -Wall -pedantic -Wno-unused-parameter ++AM_CPPFLAGS = -I$(top_srcdir)/include -DLIBFCGI_BUILD + + INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \ + $(INCLUDEDIR)/fcgiapp.h \ diff --git a/externals/vcpkg/ports/fastcgi/portfile.cmake b/externals/vcpkg/ports/fastcgi/portfile.cmake new file mode 100755 index 000000000..56fa6f863 --- /dev/null +++ b/externals/vcpkg/ports/fastcgi/portfile.cmake @@ -0,0 +1,47 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO FastCGI-Archives/fcgi2 + REF fc8c6547ae38faf9926205a23075c47fbd4370c8 + SHA512 7f27b1060fbeaf0de9b8a43aa4ff954a004c49e99f7d6ea11119a438fcffe575fb469ba06262e71ac8132f92e74189e2097fd049595a6a61d4d5a5bac2733f7a + HEAD_REF master + PATCHES + dll.patch +) + +# Check build system first +if(VCPKG_TARGET_IS_OSX) + message("${PORT} currently requires the following library from the system package manager:\n gettext\n automake\n libtool\n\nIt can be installed with brew install gettext automake libtool") +elseif(NOT VCPKG_TARGET_IS_WINDOWS) + message("${PORT} currently requires the following library from the system package manager:\n gettext\n automake\n libtool\n libtool-bin\n\nIt can be installed with apt-get install gettext automake libtool libtool-bin") +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + COPY_SOURCE + OPTIONS + --disable-examples +) + +vcpkg_install_make() + +# switch ${PORT} into /${PORT} +file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include2") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") +file(RENAME "${CURRENT_PACKAGES_DIR}/include2" "${CURRENT_PACKAGES_DIR}/include/${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_fixup_pkgconfig() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/fcgi.pc" "Version: 2.4.2\n" "Version: 2.4.2\nCflags: -I\"\${prefix}/include/fastcgi\"\n") +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/fcgi.pc" "Version: 2.4.2\n" "Version: 2.4.2\nCflags: -I\"\${prefix}/../include/fastcgi\"\n") +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/${PORT}/fcgiapp.h" "ifdef LIBFCGI_DLL_IMPORT" "if 1") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/${PORT}/fcgios.h" "ifdef LIBFCGI_DLL_IMPORT" "if 1") +endif() +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.TERMS" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/fastcgi/vcpkg.json b/externals/vcpkg/ports/fastcgi/vcpkg.json new file mode 100755 index 000000000..a85856361 --- /dev/null +++ b/externals/vcpkg/ports/fastcgi/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "fastcgi", + "version-date": "2020-09-11", + "port-version": 5, + "description": "The FastCGI interface combines the best aspects of CGI and vendor APIs. Like CGI, FastCGI applications run in separate, isolated processes.", + "homepage": "https://fastcgi-archives.github.io/", + "license": "OML", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/fastfeat/CMakeLists.txt b/externals/vcpkg/ports/fastfeat/CMakeLists.txt new file mode 100755 index 000000000..89f1dc226 --- /dev/null +++ b/externals/vcpkg/ports/fastfeat/CMakeLists.txt @@ -0,0 +1,24 @@ +cmake_minimum_required(VERSION 3.8) +project(fastfeat) + +if(MSVC) + add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS) +endif() + +include_directories(.) +file( GLOB SRCS *.c *.def) +add_library(fastfeat ${SRCS}) + + +install( + TARGETS fastfeat + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_HEADERS) + install( + FILES fast.h DESTINATION include + ) +endif() diff --git a/externals/vcpkg/ports/fastfeat/fastfeat.def b/externals/vcpkg/ports/fastfeat/fastfeat.def new file mode 100755 index 000000000..21e048362 --- /dev/null +++ b/externals/vcpkg/ports/fastfeat/fastfeat.def @@ -0,0 +1,19 @@ +LIBRARY fastfeat +EXPORTS + fast9_detect_nonmax @1 + fast10_detect_nonmax @2 + fast9_corner_score @3 + fast10_corner_score @4 + fast11_corner_score @5 + fast12_corner_score @6 + fast9_detect @7 + fast10_detect @8 + fast11_detect @9 + fast12_detect @10 + fast9_score @11 + fast10_score @12 + fast11_score @13 + fast12_score @14 + fast11_detect_nonmax @15 + fast12_detect_nonmax @16 + nonmax_suppression @17 diff --git a/externals/vcpkg/ports/fastfeat/portfile.cmake b/externals/vcpkg/ports/fastfeat/portfile.cmake new file mode 100755 index 000000000..18ec525ca --- /dev/null +++ b/externals/vcpkg/ports/fastfeat/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO edrosten/fast-C-src + REF 391d5e939eb1545d24c10533d7de424db8d9c191 + SHA512 d6f401e2f80193c4f1f99e1ef59af7107d674c515574cf513c5977c4c95c49c0520d2a6e6787f617b42d9e3bd93c78b8fa7f1d8dc8901351820590078e62130e + HEAD_REF master +) + + +file(COPY +${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_LIST_DIR}/fastfeat.def +DESTINATION ${SOURCE_PATH} +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fastfeat RENAME copyright) diff --git a/externals/vcpkg/ports/fastfeat/vcpkg.json b/externals/vcpkg/ports/fastfeat/vcpkg.json new file mode 100755 index 000000000..550c8b708 --- /dev/null +++ b/externals/vcpkg/ports/fastfeat/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "fastfeat", + "version-string": "391d5e9", + "port-version": 2, + "description": "FAST feature detectors in C" +} diff --git a/externals/vcpkg/ports/fastlz/CMakeLists.txt b/externals/vcpkg/ports/fastlz/CMakeLists.txt new file mode 100755 index 000000000..79a7a2a73 --- /dev/null +++ b/externals/vcpkg/ports/fastlz/CMakeLists.txt @@ -0,0 +1,16 @@ +CMAKE_MINIMUM_REQUIRED ( VERSION 2.6) + +add_library (fastlz fastlz.c) + +install (TARGETS fastlz DESTINATION + RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib + ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib +) +IF (NOT DEFINED SKIP_INSTALL_HEADERS) + INSTALL( + FILES + fastlz.h + DESTINATION include + ) +ENDIF () \ No newline at end of file diff --git a/externals/vcpkg/ports/fastlz/portfile.cmake b/externals/vcpkg/ports/fastlz/portfile.cmake new file mode 100755 index 000000000..b9923d374 --- /dev/null +++ b/externals/vcpkg/ports/fastlz/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ariya/FastLZ + REF c3bdfad9e0094d0fb15c12cd300e647c13dc85f9 #2021-5-10 + SHA512 cb1c7e365e955f4cabfcb0bebf9cb57e88e81183fc0bec0713a88acee6bc3aeb31cdf8fa0b56b4b7c63f220ab7b50c299b13df15912a3b4a01ec70dd2a9513f7 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE.MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/fastlz/vcpkg.json b/externals/vcpkg/ports/fastlz/vcpkg.json new file mode 100755 index 000000000..c27e1a601 --- /dev/null +++ b/externals/vcpkg/ports/fastlz/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "fastlz", + "version-date": "2021-05-10", + "description": "A lightning-fast lossless compression library", + "homepage": "https://github.com/ariya/FastLZ" +} diff --git a/externals/vcpkg/ports/fastor/portfile.cmake b/externals/vcpkg/ports/fastor/portfile.cmake new file mode 100755 index 000000000..7e4a96e5f --- /dev/null +++ b/externals/vcpkg/ports/fastor/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO romeric/Fastor + REF 76152e2fded7f014af969089e7d2ca966cef4d3b + SHA512 e2c4a267f592a7fbb92a54f7bf774a709b2a6d4a7bd3d338a20c455299a30d8352bfc6dd6c71eafa21ac70331ac0f4a86b176a56577699b82fde6f536429fb39 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/externals/vcpkg/ports/fastor/vcpkg.json b/externals/vcpkg/ports/fastor/vcpkg.json new file mode 100755 index 000000000..d7c08c649 --- /dev/null +++ b/externals/vcpkg/ports/fastor/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "fastor", + "version-date": "2021-11-22", + "port-version": 1, + "description": "a high performance tensor library for modern C++", + "homepage": "https://github.com/romeric/Fastor", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/fastrtps/disable-symlink.patch b/externals/vcpkg/ports/fastrtps/disable-symlink.patch new file mode 100755 index 000000000..a35558a19 --- /dev/null +++ b/externals/vcpkg/ports/fastrtps/disable-symlink.patch @@ -0,0 +1,16 @@ +Normally, the build script attempts to create a symlink to fast-discovery-server on Windows +and only falls back to a batch file if the necessary administrator privileges are not available. +Since symlinks do not work well with vcpkg binary caching, +we force the build script to create a batch file in any case. +diff --git a/tools/fds/CMakeLists.txt b/tools/fds/CMakeLists.txt +--- a/tools/fds/CMakeLists.txt ++++ b/tools/fds/CMakeLists.txt +@@ -124,7 +124,7 @@ if(NOT BUILD_SHARED_LIBS) + if( WIN32 ) + # Use powershell to generate the link + install( +- CODE "execute_process( COMMAND PowerShell -Command \"if( test-path ${PROJECT_NAME}.exe -PathType Leaf ) { rm ${PROJECT_NAME}.exe } ; New-Item -ItemType SymbolicLink -Target $ -Path ${PROJECT_NAME}.exe \" ERROR_QUIET RESULTS_VARIABLE SYMLINK_FAILED WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}\") \n if( SYMLINK_FAILED ) \n message(STATUS \"Windows requires admin installation rights to create symlinks. A bat script will be provided instead.\") \n set(FAST_SERVER_BINARY_NAME $) \n configure_file(${CMAKE_CURRENT_LIST_DIR}/fast-discovery-server.bat.in ${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}/${PROJECT_NAME}.bat @ONLY) \n endif()" ++ CODE "set(FAST_SERVER_BINARY_NAME $) \n configure_file(${CMAKE_CURRENT_LIST_DIR}/fast-discovery-server.bat.in ${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}/${PROJECT_NAME}.bat @ONLY) \n" + COMPONENT discovery) + else() + # Use ln to create the symbolic link. We remove the version from the file name but keep the debug suffix diff --git a/externals/vcpkg/ports/fastrtps/fix-find-package-asio.patch b/externals/vcpkg/ports/fastrtps/fix-find-package-asio.patch new file mode 100755 index 000000000..4592311e2 --- /dev/null +++ b/externals/vcpkg/ports/fastrtps/fix-find-package-asio.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -141,7 +141,7 @@ if(NOT BUILD_SHARED_LIBS) + endif() + + eprosima_find_package(fastcdr REQUIRED) +-eprosima_find_thirdparty(Asio asio VERSION 1.10.8) ++find_package(asio CONFIG REQUIRED) + eprosima_find_thirdparty(TinyXML2 tinyxml2) + + find_package(foonathan_memory REQUIRED) diff --git a/externals/vcpkg/ports/fastrtps/portfile.cmake b/externals/vcpkg/ports/fastrtps/portfile.cmake new file mode 100755 index 000000000..48342bd53 --- /dev/null +++ b/externals/vcpkg/ports/fastrtps/portfile.cmake @@ -0,0 +1,69 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO eProsima/Fast-DDS + REF v2.4.0 + SHA512 2E9C0378AF86DD657391D577F6951096DD45970A2C4D9C384EE5A452A1DD129E6E0AED91E0B908A35A04CAF979253700560561D34082DA81FE737FE104C149AF + HEAD_REF master + PATCHES + fix-find-package-asio.patch + disable-symlink.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/fastrtps/cmake) + +if(VCPKG_TARGET_IS_WINDOWS) + # copy tools from "bin" to "tools" folder + foreach(TOOL "fast-discovery-server-1.0.0.exe" "fast-discovery-server.bat" "fastdds.bat" "ros-discovery.bat") + file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/${TOOL}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${TOOL}") + endforeach() + + # remove tools from debug builds + foreach(TOOL "fast-discovery-serverd-1.0.0.exe" "fast-discovery-server.bat" "fastdds.bat" "ros-discovery.bat") + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL}") + endif() + endforeach() + + # adjust paths in batch files + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/fastdds.bat" "%dir%\\..\\tools\\fastdds\\fastdds.py" "%dir%\\..\\fastdds\\fastdds.py") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/ros-discovery.bat" "%dir%\\..\\tools\\fastdds\\fastdds.py" "%dir%\\..\\fastdds\\fastdds.py") + + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") +elseif(VCPKG_TARGET_IS_LINUX) + # copy tools from "bin" to "tools" folder + foreach(TOOL "fast-discovery-server-1.0.0" "fast-discovery-server" "fastdds" "ros-discovery") + file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/${TOOL}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${TOOL}") + endforeach() + + # replace symlink by a copy because symlinks do not work well together with vcpkg binary caching + file(REMOVE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/fast-discovery-server") + file(INSTALL "${CURRENT_PACKAGES_DIR}/tools/${PORT}/fast-discovery-server-1.0.0" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}" RENAME "fast-discovery-server") + + # remove tools from debug builds + foreach(TOOL "fast-discovery-serverd-1.0.0" "fast-discovery-server" "fastdds" "ros-discovery") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL}") + endforeach() + + # adjust paths in batch files + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/fastdds" "$dir/../tools/fastdds/fastdds.py" "$dir/../fastdds/fastdds.py") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/ros-discovery" "$dir/../tools/fastdds/fastdds.py" "$dir/../fastdds/fastdds.py") +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/fastrtps/vcpkg.json b/externals/vcpkg/ports/fastrtps/vcpkg.json new file mode 100755 index 000000000..6c846645c --- /dev/null +++ b/externals/vcpkg/ports/fastrtps/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "fastrtps", + "version": "2.4.0", + "description": "Eprosima Fast RTPS is a C++ implementation of the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium.", + "homepage": "https://www.eprosima.com/", + "dependencies": [ + "asio", + "fastcdr", + "foonathan-memory", + "openssl", + "tinyxml2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/fawdlstty-libfv/portfile.cmake b/externals/vcpkg/ports/fawdlstty-libfv/portfile.cmake new file mode 100755 index 000000000..868d11aee --- /dev/null +++ b/externals/vcpkg/ports/fawdlstty-libfv/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO fawdlstty/libfv + REF v0.0.6 + SHA512 0fdc947cc7035f4218259810ba4a2c951cd45a510daa9cf98caccfbb184808ea76af916db55cac662127a981e8b9c3db76149b6ec1748778728cff98d3f396a2 + HEAD_REF master +) + +file(WRITE "${CURRENT_PACKAGES_DIR}/share/fawdlstty-libfv/fawdlstty-libfv-config.cmake" " +include(CMakeFindDependencyMacro) +find_dependency(OpenSSL) +find_dependency(ZLIB) +if(NOT TARGET fawdlstty-libfv::libfv) + add_library(fawdlstty-libfv::libfv INTERFACE IMPORTED) + target_include_directories(fawdlstty-libfv::libfv INTERFACE \"\${CMAKE_CURRENT_LIST_DIR}/../../include\") + target_link_libraries(fawdlstty-libfv::libfv INTERFACE ZLIB::ZLIB OpenSSL::SSL) +endif() +") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}") diff --git a/externals/vcpkg/ports/fawdlstty-libfv/vcpkg.json b/externals/vcpkg/ports/fawdlstty-libfv/vcpkg.json new file mode 100755 index 000000000..210dfeb69 --- /dev/null +++ b/externals/vcpkg/ports/fawdlstty-libfv/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "fawdlstty-libfv", + "version": "0.0.6", + "description": "libfv is C++20 header-only network library, support TCP/SSL/Http/websocket server and client", + "homepage": "https://github.com/fawdlstty/libfv", + "license": "MIT", + "dependencies": [ + "asio", + "fmt", + "gzip-hpp", + "nlohmann-json", + "openssl", + "zlib" + ] +} diff --git a/externals/vcpkg/ports/fbgemm/fix-cmakelists.patch b/externals/vcpkg/ports/fbgemm/fix-cmakelists.patch new file mode 100755 index 000000000..3f0b9015c --- /dev/null +++ b/externals/vcpkg/ports/fbgemm/fix-cmakelists.patch @@ -0,0 +1,146 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6f19a16..3c758d2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,7 +6,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") + include(GNUInstallDirs) + + # function to extract filelists from defs.bzl file +-find_package(PythonInterp) + function(get_filelist name outputvar) + execute_process( + COMMAND "${PYTHON_EXECUTABLE}" -c +@@ -19,9 +18,6 @@ endfunction() + + project(fbgemm VERSION 0.1 LANGUAGES CXX C) + +-set(FBGEMM_LIBRARY_TYPE "default" CACHE STRING +- "Type of library (shared, static, or default) to build") +-set_property(CACHE FBGEMM_LIBRARY_TYPE PROPERTY STRINGS default static shared) + option(FBGEMM_BUILD_TESTS "Build fbgemm unit tests" ON) + option(FBGEMM_BUILD_BENCHMARKS "Build fbgemm benchmarks" ON) + option(FBGEMM_BUILD_DOCS "Build fbgemm documentation" OFF) +@@ -101,18 +97,11 @@ set_target_properties(fbgemm_generic fbgemm_avx2 fbgemm_avx512 PROPERTIES + #2) MSVC uses /MD in default cxx compiling flags, + #need to change it to /MT in static case + if(MSVC) +- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4267 /wd4305 /wd4309") +- if(FBGEMM_LIBRARY_TYPE STREQUAL "static") ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4267 /wd4305 /wd4309 /wd4703") ++ if(NOT BUILD_SHARED_LIBS) + target_compile_definitions(fbgemm_generic PRIVATE ASMJIT_STATIC) + target_compile_definitions(fbgemm_avx2 PRIVATE ASMJIT_STATIC) + target_compile_definitions(fbgemm_avx512 PRIVATE ASMJIT_STATIC) +- foreach(flag_var +- CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE +- CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) +- if(${flag_var} MATCHES "/MD") +- string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") +- endif(${flag_var} MATCHES "/MD") +- endforeach(flag_var) + endif() + target_compile_options(fbgemm_avx2 PRIVATE "/arch:AVX2") + target_compile_options(fbgemm_avx512 PRIVATE "/arch:AVX512") +@@ -145,7 +134,8 @@ message(WARNING "CMAKE_CXX_FLAGS_DEBUG is ${CMAKE_CXX_FLAGS_DEBUG}") + message(WARNING "CMAKE_CXX_FLAGS_RELEASE is ${CMAKE_CXX_FLAGS_RELEASE}") + message(WARNING "==========") + +-if(NOT TARGET asmjit) ++find_package(asmjit CONFIG REQUIRED) # target 'asmjit::asmjit' ++if(FALSE) + #Download asmjit from github if ASMJIT_SRC_DIR is not specified. + if(NOT DEFINED ASMJIT_SRC_DIR) + set(ASMJIT_SRC_DIR "${FBGEMM_SOURCE_DIR}/third_party/asmjit" +@@ -164,7 +154,8 @@ if(NOT TARGET asmjit) + set_property(TARGET asmjit PROPERTY POSITION_INDEPENDENT_CODE ON) + endif() + +-if(NOT TARGET cpuinfo) ++find_package(cpuinfo CONFIG REQUIRED) # target 'cpuinfo::cpuinfo' ++if(FALSE) + #Download cpuinfo from github if CPUINFO_SOURCE_DIR is not specified. + if(NOT DEFINED CPUINFO_SOURCE_DIR) + set(CPUINFO_SOURCE_DIR "${FBGEMM_SOURCE_DIR}/third_party/cpuinfo" +@@ -185,49 +176,38 @@ endif() + target_include_directories(fbgemm_generic BEFORE + PUBLIC $ + PUBLIC $ +- PRIVATE "${ASMJIT_SRC_DIR}/src" +- PRIVATE "${CPUINFO_SOURCE_DIR}/include") ++) ++target_link_libraries(fbgemm_generic PUBLIC asmjit::asmjit cpuinfo::cpuinfo) + + target_include_directories(fbgemm_avx2 BEFORE + PUBLIC $ + PUBLIC $ +- PRIVATE "${ASMJIT_SRC_DIR}/src" +- PRIVATE "${CPUINFO_SOURCE_DIR}/include") ++) ++target_link_libraries(fbgemm_avx2 PUBLIC asmjit::asmjit cpuinfo::cpuinfo) + + target_include_directories(fbgemm_avx512 BEFORE + PUBLIC $ + PUBLIC $ +- PRIVATE "${ASMJIT_SRC_DIR}/src" +- PRIVATE "${CPUINFO_SOURCE_DIR}/include") +- +-if(FBGEMM_LIBRARY_TYPE STREQUAL "default") +- add_library(fbgemm +- $ +- $ +- $) +-elseif(FBGEMM_LIBRARY_TYPE STREQUAL "shared") +- add_library(fbgemm SHARED +- $ +- $ +- $) ++) ++target_link_libraries(fbgemm_avx512 PUBLIC asmjit::asmjit cpuinfo::cpuinfo) ++ ++add_library(fbgemm ++ $ ++ $ ++ $) ++if(BUILD_SHARED_LIBS) + set_property(TARGET fbgemm_generic PROPERTY POSITION_INDEPENDENT_CODE ON) + set_property(TARGET fbgemm_avx2 PROPERTY POSITION_INDEPENDENT_CODE ON) + set_property(TARGET fbgemm_avx512 PROPERTY POSITION_INDEPENDENT_CODE ON) + set_target_properties(fbgemm PROPERTIES + CXX_VISIBILITY_PRESET hidden) +-elseif(FBGEMM_LIBRARY_TYPE STREQUAL "static") +- add_library(fbgemm STATIC +- $ +- $ +- $) ++else() + #MSVC need to define FBGEMM_STATIC for fbgemm_generic also to + #avoid generating _dllimport functions. + target_compile_definitions(fbgemm_generic PRIVATE FBGEMM_STATIC) + target_compile_definitions(fbgemm_avx2 PRIVATE FBGEMM_STATIC) + target_compile_definitions(fbgemm_avx512 PRIVATE FBGEMM_STATIC) + target_compile_definitions(fbgemm PRIVATE FBGEMM_STATIC) +-else() +- message(FATAL_ERROR "Unsupported library type ${FBGEMM_LIBRARY_TYPE}") + endif() + + if(USE_SANITIZER) +@@ -239,9 +219,7 @@ target_include_directories(fbgemm BEFORE + PUBLIC $ + PUBLIC $) + +-target_link_libraries(fbgemm $ +- $) +-add_dependencies(fbgemm asmjit cpuinfo) ++target_link_libraries(fbgemm PUBLIC asmjit::asmjit cpuinfo::cpuinfo) + + install(TARGETS fbgemm EXPORT fbgemmLibraryConfig + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +@@ -254,7 +232,7 @@ install(FILES ${FBGEMM_PUBLIC_HEADERS} + install(EXPORT fbgemmLibraryConfig DESTINATION share/cmake/fbgemm + FILE fbgemmLibraryConfig.cmake) + +-if(MSVC) ++if(FALSE) + if(FBGEMM_LIBRARY_TYPE STREQUAL "shared") + install( + FILES $ $ diff --git a/externals/vcpkg/ports/fbgemm/portfile.cmake b/externals/vcpkg/ports/fbgemm/portfile.cmake new file mode 100755 index 000000000..d7c443c0a --- /dev/null +++ b/externals/vcpkg/ports/fbgemm/portfile.cmake @@ -0,0 +1,29 @@ +# The project's CMakeLists.txt uses Python to select source files. Check if it is available in advance. +vcpkg_find_acquire_program(PYTHON3) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO pytorch/fbgemm + REF 51bc2ecc7086980fd9e6190163b04486cd37ac2a + SHA512 43e59ff25ec9365061be6a8db7ec592f096e74897e338dd3e17401f2188986cf3b7e26f82f7c1e2adf34496fb32cb4b50d40731bee3bf9fa5b1f2ac92a09e671 + PATCHES + fix-cmakelists.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DUSE_SANITIZER=OFF + -DFBGEMM_BUILD_TESTS=OFF + -DFBGEMM_BUILD_BENCHMARKS=OFF + -DPYTHON_EXECUTABLE=${PYTHON3} # inject the path instead of find_package(Python) +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME fbgemmLibrary CONFIG_PATH share/cmake/${PORT}) + +# this internal header is required by pytorch +file(INSTALL "${SOURCE_PATH}/src/RefImplementations.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/fbgemm/src") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/externals/vcpkg/ports/fbgemm/vcpkg.json b/externals/vcpkg/ports/fbgemm/vcpkg.json new file mode 100755 index 000000000..40cef6526 --- /dev/null +++ b/externals/vcpkg/ports/fbgemm/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "fbgemm", + "version-date": "2021-03-18", + "port-version": 4, + "description": "FB (Facebook) + GEMM (General Matrix-Matrix Multiplication)", + "homepage": "https://code.fb.com/ml-applications/fbgemm/", + "license": "BSD-3-Clause", + "supports": "!(x86 | uwp)", + "dependencies": [ + "asmjit", + "cpuinfo", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/fbthrift/0001-fix-compatibility-with-boost-1.79.0.patch b/externals/vcpkg/ports/fbthrift/0001-fix-compatibility-with-boost-1.79.0.patch new file mode 100755 index 000000000..f189e8777 --- /dev/null +++ b/externals/vcpkg/ports/fbthrift/0001-fix-compatibility-with-boost-1.79.0.patch @@ -0,0 +1,60 @@ +From 5bd55f11e1b6cc2cb08a0001f9c77f56fb8ac649 Mon Sep 17 00:00:00 2001 +From: Kevin Lin +Date: Mon, 18 Apr 2022 12:17:40 -0700 +Subject: [PATCH] thrift/compiler/compiler.cc: Include fstream to fix + compatibility with Boost 1.79.0 (#494) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Summary: +This patch fixes fbthrift build compatibility with Boost 1.79.0. The symptom is the following compiler error: + +``` +/opt/mcrouter-build/fbthrift/thrift/compiler/compiler.cc: In function ‘bool apache::thrift::compiler::{anonymous}::generate(const apache::thrift::compiler::{anonymous}::gen_params&, apache::thrift::compiler::t_program*, std::set >&)’: +/opt/mcrouter-build/fbthrift/thrift/compiler/compiler.cc:331:19: error: aggregate ‘std::ofstream genfile’ has incomplete type and cannot be defined + 331 | std::ofstream genfile; + | ^~~~~~~ +make[2]: *** [thrift/compiler/CMakeFiles/thrift1.dir/build.make:76: thrift/compiler/CMakeFiles/thrift1.dir/compiler.cc.o] Error 1 +make[1]: *** [CMakeFiles/Makefile2:253: thrift/compiler/CMakeFiles/thrift1.dir/all] Error 2 +make: *** [Makefile:152: all] Error 2 +``` + +To reproduce, install the standard fbthrift dependencies, but with Boost 1.79.0 compiled from source, followed by: + +``` +$ mkdir build && cd build +$ cmake -DCMAKE_BUILD_TYPE=RELEASE CXXFLAGS="-fPIC" .. +$ make -j +``` + +Adding an include on `fstream` allows for the build to complete successfully. + +Pull Request resolved: https://github.com/facebook/fbthrift/pull/494 + +Reviewed By: iahs + +Differential Revision: D35709922 + +Pulled By: vitaut + +fbshipit-source-id: 96f0764c7b33047acb7b5ad26b21076757aaa5e7 +--- + thrift/compiler/compiler.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/thrift/compiler/compiler.cc b/thrift/compiler/compiler.cc +index 721ff7dbf3..da944c2950 100644 +--- a/thrift/compiler/compiler.cc ++++ b/thrift/compiler/compiler.cc +@@ -32,6 +32,7 @@ + #include + #endif + #include ++#include + + #include + #include +-- +2.34.1.windows.1 + diff --git a/externals/vcpkg/ports/fbthrift/portfile.cmake b/externals/vcpkg/ports/fbthrift/portfile.cmake new file mode 100755 index 000000000..cd9252c65 --- /dev/null +++ b/externals/vcpkg/ports/fbthrift/portfile.cmake @@ -0,0 +1,65 @@ +vcpkg_find_acquire_program(FLEX) +vcpkg_find_acquire_program(BISON) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO facebook/fbthrift + REF v2022.03.21.00 + SHA512 8d2d9430dc3a4ecc23042cd9bcf4eee888824449d05d98baec408aef806b934d643e578d3876169f69966c846aeddbe0aa84416c4e020cba028a49d2fccfe7ab + HEAD_REF master + PATCHES 0001-fix-compatibility-with-boost-1.79.0.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DBISON_EXECUTABLE=${BISON}" + "-DFLEX_EXECUTABLE=${FLEX}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/fbthrift) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# There should be no empty directories in vcpkg/packages/fbthrift_x64-linux +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/transport/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/util/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/server/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/common/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/core/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/inmemory/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/extensions/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/frozen/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/util/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/visitation/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/server/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/benchmark" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/thrift/annotation" +) + +vcpkg_copy_tools(TOOL_NAMES thrift1 AUTO_CLEAN) +vcpkg_copy_pdbs() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftConfig.cmake") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftConfig.cmake" + "${PACKAGE_PREFIX_DIR}/lib/cmake/fbthrift" "${PACKAGE_PREFIX_DIR}/share/fbthrift") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftConfig.cmake" + "${PACKAGE_PREFIX_DIR}/bin/thrift1.exe" "${PACKAGE_PREFIX_DIR}/tools/fbthrift/thrift1.exe") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftConfig.cmake" + "${PACKAGE_PREFIX_DIR}/bin/thrift1" "${PACKAGE_PREFIX_DIR}/tools/fbthrift/thrift1") +endif() + +# Only used internally and removed in master +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftTargets.cmake" "LOCATION_HH=\\\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/thrift/compiler/location.hh\\\"" "") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/fbthrift/vcpkg.json b/externals/vcpkg/ports/fbthrift/vcpkg.json new file mode 100755 index 000000000..76699b09f --- /dev/null +++ b/externals/vcpkg/ports/fbthrift/vcpkg.json @@ -0,0 +1,34 @@ +{ + "name": "fbthrift", + "version-string": "2022.03.21.00", + "port-version": 1, + "description": "Facebook's branch of Apache Thrift, including a new C++ server.", + "homepage": "https://github.com/facebook/fbthrift", + "license": "Apache-2.0", + "supports": "x64 & static", + "dependencies": [ + "boost-context", + "boost-filesystem", + "boost-program-options", + "boost-regex", + "boost-system", + "boost-thread", + "fizz", + "fmt", + "folly", + "gflags", + "glog", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "wangle", + "zlib", + "zstd" + ] +} diff --git a/externals/vcpkg/ports/fcl/portfile.cmake b/externals/vcpkg/ports/fcl/portfile.cmake new file mode 100755 index 000000000..b9c9fef7d --- /dev/null +++ b/externals/vcpkg/ports/fcl/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO flexible-collision-library/fcl + REF 0.7.0 + SHA512 95612476f4706fcd60812204ec7495a956c4e318cc6ace9526ac93dc765605ddf73b2d0d9ff9f4c9c739e43c5f8e24670113c86e02868a2949ab234c3bf82374 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FCL_STATIC_LIBRARY) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(FCL_USE_X64_SSE ON) +else() + set(FCL_USE_X64_SSE OFF) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=1 + -DFCL_STATIC_LIBRARY=${FCL_STATIC_LIBRARY} + -DFCL_BUILD_TESTS=OFF + -DFCL_USE_X64_SSE=${FCL_USE_X64_SSE} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/CMake") + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) +else() + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/fcl) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/fcl/vcpkg.json b/externals/vcpkg/ports/fcl/vcpkg.json new file mode 100755 index 000000000..e6edbc50a --- /dev/null +++ b/externals/vcpkg/ports/fcl/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "fcl", + "version": "0.7.0", + "port-version": 3, + "description": "a library for performing three types of proximity queries on a pair of geometric models composed of triangles", + "homepage": "https://github.com/flexible-collision-library/fcl", + "dependencies": [ + "ccd", + "eigen3", + "octomap", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/fdk-aac/portfile.cmake b/externals/vcpkg/ports/fdk-aac/portfile.cmake new file mode 100755 index 000000000..4b44fb062 --- /dev/null +++ b/externals/vcpkg/ports/fdk-aac/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + FEATURES + he-aac HE_AAC +) + +if(HE_AAC) + vcpkg_from_github( + REPO mstorsjo/fdk-aac + REF v2.0.2 + SHA512 616207e85035d1659a2b7808ca6ec02ef53c1c4b39eb280fe861f82a4cf548e5db2ac381c496bad37dfc2b8c6677fe704d9fd8449e43d1f93d3e636239e0191b + HEAD_REF master + OUT_SOURCE_PATH SOURCE_PATH + ) +else() + vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/ + REPO wtaymans/fdk-aac-stripped + REF 585981a49f2186b0d2e47c64bf6b5abf539395f8 # corresponds to v2.0.2 tag in mstorsjo/fdk-aac GitHub repository + HEAD_REF stripped4 + SHA512 e0e56396ed0be427302ed4b54fc6e8dc522a172c288b7c1ec40cc3a9ceb13518ca7bbb874bc71b88b2a91e0bbbe4ad0bab6910efa1db63d91e6370976641bac4 + OUT_SOURCE_PATH SOURCE_PATH + ) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS_RELEASE -DBUILD_PROGRAMS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") +file(INSTALL "${SOURCE_PATH}/NOTICE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/externals/vcpkg/ports/fdk-aac/vcpkg.json b/externals/vcpkg/ports/fdk-aac/vcpkg.json new file mode 100755 index 000000000..046d06500 --- /dev/null +++ b/externals/vcpkg/ports/fdk-aac/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "fdk-aac", + "version-semver": "2.0.2", + "port-version": 1, + "description": "A standalone Third-Party Modified Version of the Fraunhofer FDK AAC Codec Library for Android. Uses a fork without HE-AAC, HE-AACv2, or xHE-AAC support to avoid patent licensing and GPL compatibility issues when built without the he-aac option.", + "homepage": "https://gitlab.freedesktop.org/wtaymans/fdk-aac-stripped", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "he-aac": { + "description": "Support patent-encumbered HE-AAC, HE-AACv2, and xHE-AAC codec profiles. Do not distribute binaries with this option without the relevant patent licenses if you are in a jurisdiction that recognizes software patents. Might not be compatible with the GPL depending on legal interpretation. Refer to https://bugzilla.redhat.com/show_bug.cgi?id=1501522#c112" + } + } +} diff --git a/externals/vcpkg/ports/fdlibm/CMakeLists.txt b/externals/vcpkg/ports/fdlibm/CMakeLists.txt new file mode 100755 index 000000000..c31f04ab4 --- /dev/null +++ b/externals/vcpkg/ports/fdlibm/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.8) +project(fdlibm C) + +file(GLOB fdlibm_SOURCES "*.c") + +include_directories(".") + +if(WIN32) +set(fdlibm_SOURCES ${fdlibm_SOURCES} libm5.def) +endif() + + +add_library(fdlibm ${fdlibm_SOURCES}) + +install( + TARGETS fdlibm + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib/manual-link + ARCHIVE DESTINATION lib/manual-link +) + +if(NOT DISABLE_INSTALL_HEADERS) + install( + FILES + fdlibm.h + DESTINATION include + ) +endif() diff --git a/externals/vcpkg/ports/fdlibm/libm5.def b/externals/vcpkg/ports/fdlibm/libm5.def new file mode 100755 index 000000000..2de0ad485 --- /dev/null +++ b/externals/vcpkg/ports/fdlibm/libm5.def @@ -0,0 +1,88 @@ +EXPORTS + __ieee754_acos @ 1 ; + __ieee754_acosh @ 2 ; + __ieee754_asin @ 3 ; + __ieee754_atan2 @ 4 ; + __ieee754_atanh @ 5 ; + __ieee754_cosh @ 6 ; + __ieee754_exp @ 7 ; + __ieee754_fmod @ 8 ; + __ieee754_gamma @ 9 ; + __ieee754_gamma_r @ 10 ; + __ieee754_hypot @ 11 ; + __ieee754_j0 @ 12 ; + __ieee754_j1 @ 13 ; + __ieee754_jn @ 14 ; + __ieee754_lgamma @ 15 ; + __ieee754_lgamma_r @ 16 ; + __ieee754_log @ 17 ; + __ieee754_log10 @ 18 ; + __ieee754_pow @ 19 ; + __ieee754_rem_pio2 @ 20 ; + __ieee754_remainder @ 21 ; + __ieee754_scalb @ 22 ; + __ieee754_sinh @ 23 ; + __ieee754_sqrt @ 24 ; + __ieee754_y0 @ 25 ; + __ieee754_y1 @ 26 ; + __ieee754_yn @ 27 ; + __kernel_cos @ 28 ; + __kernel_rem_pio2 @ 29 ; + __kernel_sin @ 30 ; + __kernel_standard @ 31 ; + __kernel_tan @ 32 ; + _fdlib_version @ 33 DATA ; + acos @ 34 ; + acosh @ 35 ; + asin @ 36 ; + asinh @ 37 ; + atan @ 38 ; + atan2 @ 39 ; + atanh @ 40 ; + cbrt @ 41 ; + ceil @ 42 ; + copysign @ 43 ; + cos @ 44 ; + cosh @ 45 ; + erf @ 46 ; + erfc @ 47 ; + exp @ 48 ; + expm1 @ 49 ; + fabs @ 50 ; + ieee_finite @ 51 ; + floor @ 52 ; + fmod @ 53 ; + frexp @ 54 ; + ieee_gamma @ 55 ; + ieee_gamma_r @ 56 ; + hypot @ 57 ; + ilogb @ 58 ; + ieee_isnan @ 59 ; + j0 @ 60 ; + j1 @ 61 ; + jn @ 62 ; + ldexp @ 63 ; + ieee_lgamma @ 64 ; + ieee_lgamma_r @ 65 ; + log @ 66 ; + log10 @ 67 ; + log1p @ 68 ; + logb @ 69 ; + ieee_matherr @ 70 ; + modf @ 71 ; + nextafter @ 72 ; + pow @ 73 ; + remainder @ 74 ; + rint @ 75 ; + ieee_scalb @ 76 ; + scalbn @ 77 ; + signgam @ 78 DATA ; + ieee_significand @ 79 ; + sin @ 80 ; + sinh @ 81 ; + sqrt @ 82 ; + tan @ 83 ; + tanh @ 84 ; + y0 @ 85 ; + y1 @ 86 ; + yn @ 87 ; diff --git a/externals/vcpkg/ports/fdlibm/portfile.cmake b/externals/vcpkg/ports/fdlibm/portfile.cmake new file mode 100755 index 000000000..f822cef95 --- /dev/null +++ b/externals/vcpkg/ports/fdlibm/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH + URL https://android.googlesource.com/platform/external/fdlibm + REF 59f7335e4dd8275a7dc2f8aeb4fd00758fde37ac +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/libm5.def DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +# Handle copyright +configure_file(${SOURCE_PATH}/NOTICE ${CURRENT_PACKAGES_DIR}/share/fdlibm/copyright COPYONLY) + diff --git a/externals/vcpkg/ports/fdlibm/vcpkg.json b/externals/vcpkg/ports/fdlibm/vcpkg.json new file mode 100755 index 000000000..f90a637c9 --- /dev/null +++ b/externals/vcpkg/ports/fdlibm/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "fdlibm", + "version-string": "5.3", + "port-version": 5, + "description": "FDLIBM (Freely Distributable LIBM) is a C math library for machines that support IEEE 754 floating-point arithmetic" +} diff --git a/externals/vcpkg/ports/ffmpeg/0001-create-lib-libraries.patch b/externals/vcpkg/ports/ffmpeg/0001-create-lib-libraries.patch new file mode 100755 index 000000000..493e24c1b --- /dev/null +++ b/externals/vcpkg/ports/ffmpeg/0001-create-lib-libraries.patch @@ -0,0 +1,25 @@ +diff --git a/configure b/configure +index 34c2adb..1c8008a 100755 +--- a/configure ++++ b/configure +@@ -5352,15 +5352,17 @@ case $target_os in + ;; + win32|win64) + disable symver +- if enabled shared; then ++# if enabled shared; then + # Link to the import library instead of the normal static library + # for shared libs. + LD_LIB='%.lib' + # Cannot build both shared and static libs with MSVC or icl. +- disable static +- fi ++# disable static ++# fi + enabled x86_32 && check_ldflags -LARGEADDRESSAWARE + shlibdir_default="$bindir_default" ++ LIBPREF="" ++ LIBSUF=".lib" + SLIBPREF="" + SLIBSUF=".dll" + SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' diff --git a/externals/vcpkg/ports/ffmpeg/0003-fix-windowsinclude.patch b/externals/vcpkg/ports/ffmpeg/0003-fix-windowsinclude.patch new file mode 100755 index 000000000..8ac04c865 --- /dev/null +++ b/externals/vcpkg/ports/ffmpeg/0003-fix-windowsinclude.patch @@ -0,0 +1,13 @@ +diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c +index 9cfbc45..e3447e6 100644 +--- a/fftools/cmdutils.c ++++ b/fftools/cmdutils.c +@@ -63,6 +63,8 @@ + #include + #endif + #ifdef _WIN32 ++#define _WIN32_WINNT 0x0502 ++#define WIN32_LEAN_AND_MEAN + #include + #endif + diff --git a/externals/vcpkg/ports/ffmpeg/0004-fix-debug-build.patch b/externals/vcpkg/ports/ffmpeg/0004-fix-debug-build.patch new file mode 100755 index 000000000..513dc966b --- /dev/null +++ b/externals/vcpkg/ports/ffmpeg/0004-fix-debug-build.patch @@ -0,0 +1,40 @@ +diff --git a/configure b/configure +index bd2de34..fba948a 100755 +--- a/configure ++++ b/configure +@@ -3993,6 +3993,9 @@ for opt do + --libfuzzer=*) + libfuzzer_path="$optval" + ;; ++ --debug) ++ enable debug_configure ++ ;; + *) + optname="${opt%%=*}" + optname="${optname#--}" +@@ -6152,7 +6153,11 @@ + + enabled zlib && { check_pkg_config zlib zlib "zlib.h" zlibVersion || + check_lib zlib zlib.h zlibVersion -lz; } +-enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2 ++if enabled debug_configure; then ++ enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2d ++else ++ enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2 ++fi + enabled lzma && check_lib lzma lzma.h lzma_version_number -llzma + + # On some systems dynamic loading requires no extra linker flags +@@ -6350,7 +6350,11 @@ enabled librubberband && require_pkg_config librubberband "rubberband >= 1.8 + enabled libshine && require_pkg_config libshine shine shine/layer3.h shine_encode_buffer + enabled libsmbclient && { check_pkg_config libsmbclient smbclient libsmbclient.h smbc_init || + require libsmbclient libsmbclient.h smbc_init -lsmbclient; } +-enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++ ++if enabled debug_configure; then ++ enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappyd -lstdc++ ++else ++ enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++ ++fi + enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr + enabled libssh && require_pkg_config libssh libssh libssh/sftp.h sftp_init + enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init diff --git a/externals/vcpkg/ports/ffmpeg/0006-fix-StaticFeatures.patch b/externals/vcpkg/ports/ffmpeg/0006-fix-StaticFeatures.patch new file mode 100755 index 000000000..ce5c2f9e3 --- /dev/null +++ b/externals/vcpkg/ports/ffmpeg/0006-fix-StaticFeatures.patch @@ -0,0 +1,49 @@ +diff --git a/configure b/configure +index 3bdcfc6..00b2f13 100644 +--- a/configure ++++ b/configure +@@ -6351,7 +6351,8 @@ if enabled libmfx; then + fi + + enabled libmodplug && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load +-enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame $libm_extralibs ++enabled libmp3lame && { check_lib libmp3lame lame/lame.h lame_set_VBR_quality -lmp3lame $libm_extralibs || ++ require libmp3lame lame/lame.h lame_set_VBR_quality -llibmp3lame-static -llibmpghip-static $libm_extralibs; } + enabled libmysofa && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine || + require libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine -lmysofa $zlib_extralibs; } + enabled libnpp && { check_lib libnpp npp.h nppGetLibVersion -lnppig -lnppicc -lnppc -lnppidei || +@@ -6392,7 +6393,7 @@ if enabled debug_configure; then + else + enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++ + fi +-enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr ++enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr -lm + enabled libssh && require_pkg_config libssh libssh libssh/sftp.h sftp_init + enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init + enabled libsrt && require_pkg_config libsrt "srt >= 1.3.0" srt/srt.h srt_socket +@@ -6460,6 +6461,8 @@ enabled openal && { { for al_extralibs in "${OPENAL_LIBS}" "-lopenal" + enabled opencl && { check_pkg_config opencl OpenCL CL/cl.h clEnqueueNDRangeKernel || + check_lib opencl OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-framework,OpenCL || + check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL || ++ check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL -lAdvapi32 -lOle32 -lCfgmgr32|| ++ check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL -pthread -ldl || + die "ERROR: opencl not found"; } && + { test_cpp_condition "OpenCL/cl.h" "defined(CL_VERSION_1_2)" || + test_cpp_condition "CL/cl.h" "defined(CL_VERSION_1_2)" || +@@ -6479,6 +6482,7 @@ enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OP + check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto || + check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 || + check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 || ++ check_lib openssl openssl/ssl.h OPENSSL_init_ssl -llibssl -llibcrypto -lws2_32 -lgdi32 -lcrypt32 -lAdvapi32 -lUser32|| + die "ERROR: openssl not found"; } + enabled pocketsphinx && require_pkg_config pocketsphinx pocketsphinx pocketsphinx/pocketsphinx.h ps_init + enabled rkmpp && { require_pkg_config rkmpp rockchip_mpp rockchip/rk_mpi.h mpp_create && +@@ -6707,7 +6711,7 @@ enabled amf && + if enabled libc_iconv; then + check_func_headers iconv.h iconv + elif enabled iconv; then +- check_func_headers iconv.h iconv || check_lib iconv iconv.h iconv -liconv ++ check_func_headers iconv.h iconv || check_lib iconv iconv.h iconv -liconv || check_lib iconv iconv.h iconv -liconv -llibcharset + fi + + enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel" diff --git a/externals/vcpkg/ports/ffmpeg/0007-fix-lib-naming.patch b/externals/vcpkg/ports/ffmpeg/0007-fix-lib-naming.patch new file mode 100755 index 000000000..7e4aa7102 --- /dev/null +++ b/externals/vcpkg/ports/ffmpeg/0007-fix-lib-naming.patch @@ -0,0 +1,15 @@ +diff --git a/configure b/configure +index d6c4388..75b96c3 100644 +--- a/configure ++++ b/configure +@@ -4378,6 +4378,10 @@ msvc_common_flags(){ + -march=*) ;; + -lz) echo zlib.lib ;; + -lx264) echo libx264.lib ;; ++ -lx265) echo libx265.lib ;; ++ -lmp3lame) echo libmp3lame.lib ;; ++ -liconv) echo iconv.lib ;; ++ -lm) ;; + -lstdc++) ;; + -l*) echo ${flag#-l}.lib ;; + -LARGEADDRESSAWARE) echo $flag ;; diff --git a/externals/vcpkg/ports/ffmpeg/0009-Fix-fdk-detection.patch b/externals/vcpkg/ports/ffmpeg/0009-Fix-fdk-detection.patch new file mode 100755 index 000000000..3d280fd2b --- /dev/null +++ b/externals/vcpkg/ports/ffmpeg/0009-Fix-fdk-detection.patch @@ -0,0 +1,14 @@ +diff --git a/configure b/configure +index b137669dd3..34c92230f4 100755 +--- a/configure ++++ b/configure +@@ -6331,7 +6331,7 @@ enabled libdavs2 && require_pkg_config libdavs2 "davs2 >= 1.6.0" davs2. + enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new + enabled libdrm && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion + enabled libfdk_aac && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen || +- { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac && ++ { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac -lm -lstdc++ && + warn "using libfdk without pkg-config"; } } + flite_extralibs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite" + enabled libflite && require libflite "flite/flite.h" flite_init $flite_extralibs + diff --git a/externals/vcpkg/ports/ffmpeg/0010-Fix-x264-detection.patch b/externals/vcpkg/ports/ffmpeg/0010-Fix-x264-detection.patch new file mode 100755 index 000000000..2cbf85eaf --- /dev/null +++ b/externals/vcpkg/ports/ffmpeg/0010-Fix-x264-detection.patch @@ -0,0 +1,14 @@ +diff --git a/configure b/configure +index b137669dd3..34a2e644c4 100755 +--- a/configure ++++ b/configure +@@ -6443,7 +6443,7 @@ enabled libwebp && { + enabled libwebp_encoder && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion + enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; } + enabled libx264 && { check_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode || +- { require libx264 "stdint.h x264.h" x264_encoder_encode "-lx264 $pthreads_extralibs $libm_extralibs" && ++ { require libx264 "stdint.h x264.h" x264_encoder_encode "-lx264 $pthreads_extralibs $libm_extralibs -ldl" && + warn "using libx264 without pkg-config"; } } && + require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && + check_cpp_condition libx262 x264.h "X264_MPEG2" + diff --git a/externals/vcpkg/ports/ffmpeg/0011-Fix-x265-detection.patch b/externals/vcpkg/ports/ffmpeg/0011-Fix-x265-detection.patch new file mode 100755 index 000000000..69c6380a1 --- /dev/null +++ b/externals/vcpkg/ports/ffmpeg/0011-Fix-x265-detection.patch @@ -0,0 +1,17 @@ +diff --git a/configure b/configure +index 34a2e644c4..0ea64bd306 100755 +--- a/configure ++++ b/configure +@@ -6447,7 +6447,10 @@ enabled libx264 && { check_pkg_config libx264 x264 "stdint.h x264.h" x + warn "using libx264 without pkg-config"; } } && + require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && + check_cpp_condition libx262 x264.h "X264_MPEG2" +-enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get && ++enabled libx265 && { check_pkg_config libx265 x265 x265.h x265_api_get || ++ { { check_lib libx265 x265.h x265_api_get "-lx265 $pthreads_extralibs $libm_extralibs -ldl -lstdc++ -lgcc_s -lgcc -lrt -lnuma" || ++ require libx265 x265.h x265_api_get "-lx265 $pthreads_extralibs $libm_extralibs -ldl -lstdc++"; } && ++ warn "using libx265 without pkg-config"; } } && + require_cpp_condition libx265 x265.h "X265_BUILD >= 70" + enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" + enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get + diff --git a/externals/vcpkg/ports/ffmpeg/0012-Fix-ssl-110-detection.patch b/externals/vcpkg/ports/ffmpeg/0012-Fix-ssl-110-detection.patch new file mode 100755 index 000000000..e9dd21553 --- /dev/null +++ b/externals/vcpkg/ports/ffmpeg/0012-Fix-ssl-110-detection.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index 2be953f7e7..e075949ffc 100755 +--- a/configure ++++ b/configure +@@ -6497,6 +6497,7 @@ enabled omx_rpi && { test_code cc OMX_Core.h OMX_IndexConfigBrcmVideoR + enabled omx && require_headers OMX_Core.h + enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl || + check_pkg_config openssl openssl openssl/ssl.h SSL_library_init || ++ check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto $pthreads_extralibs -ldl || + check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto || + check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto || + check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 || + diff --git a/externals/vcpkg/ports/ffmpeg/0013-define-WINVER.patch b/externals/vcpkg/ports/ffmpeg/0013-define-WINVER.patch new file mode 100755 index 000000000..295a738e7 --- /dev/null +++ b/externals/vcpkg/ports/ffmpeg/0013-define-WINVER.patch @@ -0,0 +1,15 @@ +diff --color -Naur src_old/libavcodec/mf_utils.c src/libavcodec/mf_utils.c +--- src_old/libavcodec/mf_utils.c 2020-07-11 05:26:17.000000000 +0700 ++++ src/libavcodec/mf_utils.c 2020-11-13 12:55:57.226976400 +0700 +@@ -22,6 +22,11 @@ + #define _WIN32_WINNT 0x0602 + #endif + ++#if !defined(WINVER) || WINVER < 0x0602 ++#undef WINVER ++#define WINVER 0x0602 ++#endif ++ + #include "mf_utils.h" + #include "libavutil/pixdesc.h" + diff --git a/externals/vcpkg/ports/ffmpeg/0014-avfilter-dependency-fix.patch b/externals/vcpkg/ports/ffmpeg/0014-avfilter-dependency-fix.patch new file mode 100755 index 000000000..bc9dc0219 --- /dev/null +++ b/externals/vcpkg/ports/ffmpeg/0014-avfilter-dependency-fix.patch @@ -0,0 +1,23 @@ +diff --git a/configure b/configure +index a092a6b457..41e55b4101 100755 +--- a/configure ++++ b/configure +@@ -3666,6 +3666,18 @@ vpp_qsv_filter_select="qsvvpp" + xfade_opencl_filter_deps="opencl" + yadif_cuda_filter_deps="ffnvcodec" + yadif_cuda_filter_deps_any="cuda_nvcc cuda_llvm" ++ametadata_filter_deps="avformat" ++metadata_filter_deps="avformat" ++headphone_filter_deps="avcodec" ++headphone_filter_select="fft" ++showspatial_filter_deps="avcodec" ++showspatial_filter_select="fft" ++superequalizer_filter_deps="avcodec" ++superequalizer_filter_select="rdft" ++surround_filter_deps="avcodec" ++surround_filter_select="rdft" ++sinc_filter_deps="avcodec" ++sinc_filter_select="rdft" + + # examples + avio_list_dir_deps="avformat avutil" diff --git a/externals/vcpkg/ports/ffmpeg/0015-Fix-xml2-detection.patch b/externals/vcpkg/ports/ffmpeg/0015-Fix-xml2-detection.patch new file mode 100755 index 000000000..7d2f148b0 --- /dev/null +++ b/externals/vcpkg/ports/ffmpeg/0015-Fix-xml2-detection.patch @@ -0,0 +1,17 @@ + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 900505756b..8d1388a347 100755 +--- a/configure ++++ b/configure +@@ -6476,7 +6476,7 @@ enabled libzmq && require_pkg_config libzmq "libzmq >= 4.2.1" zmq.h z + enabled libzvbi && require_pkg_config libzvbi zvbi-0.2 libzvbi.h vbi_decoder_new && + { test_cpp_condition libzvbi.h "VBI_VERSION_MAJOR > 0 || VBI_VERSION_MINOR > 2 || VBI_VERSION_MINOR == 2 && VBI_VERSION_MICRO >= 28" || + enabled gpl || die "ERROR: libzvbi requires version 0.2.28 or --enable-gpl."; } +-enabled libxml2 && require_pkg_config libxml2 libxml-2.0 libxml2/libxml/xmlversion.h xmlCheckVersion ++enabled libxml2 && require_pkg_config libxml2 libxml-2.0 libxml/xmlversion.h xmlCheckVersion + enabled mbedtls && { check_pkg_config mbedtls mbedtls mbedtls/x509_crt.h mbedtls_x509_crt_init || + check_pkg_config mbedtls mbedtls mbedtls/ssl.h mbedtls_ssl_init || + check_lib mbedtls mbedtls/ssl.h mbedtls_ssl_init -lmbedtls -lmbedx509 -lmbedcrypto || + diff --git a/externals/vcpkg/ports/ffmpeg/0016-configure-dnn-needs-avformat.patch b/externals/vcpkg/ports/ffmpeg/0016-configure-dnn-needs-avformat.patch new file mode 100755 index 000000000..e789e5bec --- /dev/null +++ b/externals/vcpkg/ports/ffmpeg/0016-configure-dnn-needs-avformat.patch @@ -0,0 +1,25 @@ +From 7ca15b7f337b00a71384f748d05fce89fcf15a8d Mon Sep 17 00:00:00 2001 +From: "Matthias C. M. Troffaes" +Date: Tue, 4 May 2021 13:03:17 +0100 +Subject: [PATCH] configure: dnn needs avformat + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 9e45c0822c..8725a94f8a 100755 +--- a/configure ++++ b/configure +@@ -2660,7 +2660,7 @@ cbs_vp9_select="cbs" + dct_select="rdft" + dirac_parse_select="golomb" + dnn_suggest="libtensorflow libopenvino" +-dnn_deps="swscale" ++dnn_deps="avformat swscale" + error_resilience_select="me_cmp" + faandct_deps="faan" + faandct_select="fdctdsp" +-- +2.25.1 + diff --git a/externals/vcpkg/ports/ffmpeg/0017-Patch-for-ticket-9019-CUDA-Compile-Broken-Using-MSVC.patch b/externals/vcpkg/ports/ffmpeg/0017-Patch-for-ticket-9019-CUDA-Compile-Broken-Using-MSVC.patch new file mode 100755 index 000000000..c80e51ad7 --- /dev/null +++ b/externals/vcpkg/ports/ffmpeg/0017-Patch-for-ticket-9019-CUDA-Compile-Broken-Using-MSVC.patch @@ -0,0 +1,44 @@ +From 6dd12a7210fb4cf2e69b6c83628021d83ba132c3 Mon Sep 17 00:00:00 2001 +From: "Don C. Bigler" +Date: Fri, 4 Dec 2020 12:39:55 -0500 +Subject: [PATCH] Patch for ticket #9019 CUDA Compile Broken Using MSVC + +Signed-off-by: Don C. Bigler +--- + compat/cuda/ptx2c.sh | 7 ++++--- + configure | 1 + + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/compat/cuda/ptx2c.sh b/compat/cuda/ptx2c.sh +index 48452379c2..1c486dc30e 100755 +--- a/compat/cuda/ptx2c.sh ++++ b/compat/cuda/ptx2c.sh +@@ -26,9 +26,10 @@ OUT="$1" + IN="$2" + NAME="$(basename "$IN" | sed 's/\..*//')" + +-printf "const char %s_ptx[] = \\" "$NAME" > "$OUT" ++printf "const char %s_ptx[] = {\\" "$NAME" > "$OUT" + echo >> "$OUT" +-sed -e "$(printf 's/\r//g')" -e 's/["\\]/\\&/g' -e "$(printf 's/^/\t"/')" -e 's/$/\\n"/' < "$IN" >> "$OUT" +-echo ";" >> "$OUT" ++xxd -i < "$IN" >> "$OUT" ++echo " ,0x00" >> "$OUT" ++echo "};" >> "$OUT" + + exit 0 +diff --git a/configure b/configure +index 1b1b140d6f..048e02355f 100755 +--- a/configure ++++ b/configure +@@ -1050,6 +1050,7 @@ test_nvcc(){ + tmpo_=$TMPO + [ -x "$(command -v cygpath)" ] && tmpcu_=$(cygpath -m $tmpcu_) && tmpo_=$(cygpath -m $tmpo_) + test_cmd $nvcc $nvccflags "$@" $NVCC_C $(nvcc_o $tmpo_) $tmpcu_ ++ test_cmd xxd + } + + check_nvcc() { +-- +2.26.2.windows.1 + diff --git a/externals/vcpkg/ports/ffmpeg/0018-libaom-Dont-use-aom_codec_av1_dx_algo.patch b/externals/vcpkg/ports/ffmpeg/0018-libaom-Dont-use-aom_codec_av1_dx_algo.patch new file mode 100755 index 000000000..f70c2a029 --- /dev/null +++ b/externals/vcpkg/ports/ffmpeg/0018-libaom-Dont-use-aom_codec_av1_dx_algo.patch @@ -0,0 +1,26 @@ +From 6ff9f56f2b0bface43c6b0810cfda458695600f3 Mon Sep 17 00:00:00 2001 +From: Matt Oliver +Date: Wed, 20 Oct 2021 06:55:48 +1100 +Subject: [PATCH] libaom: Dont use aom_codec_av1_dx_algo. + +This fixes linking errors where variables cannot be correctly linked in from an external shared library such as with msvc. +--- + libavcodec/libaomdec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c +index 75ecc08970..d6b822fda2 100644 +--- a/libavcodec/libaomdec.c ++++ b/libavcodec/libaomdec.c +@@ -223,7 +223,7 @@ static av_cold int aom_free(AVCodecContext *avctx) + + static av_cold int av1_init(AVCodecContext *avctx) + { +- return aom_init(avctx, &aom_codec_av1_dx_algo); ++ return aom_init(avctx, aom_codec_av1_dx()); + } + + AVCodec ff_libaom_av1_decoder = { +-- +2.33.1.windows.1 + diff --git a/externals/vcpkg/ports/ffmpeg/0019-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch b/externals/vcpkg/ports/ffmpeg/0019-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch new file mode 100755 index 000000000..f3c5bf04d --- /dev/null +++ b/externals/vcpkg/ports/ffmpeg/0019-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch @@ -0,0 +1,46 @@ +From d5fca748d76602a912590b64022560283db6fae6 Mon Sep 17 00:00:00 2001 +From: Matt Oliver +Date: Sat, 30 Oct 2021 14:09:29 +1100 +Subject: [PATCH] libx264: Do not explicitly set X264_API_IMPORTS + +--- + configure | 8 +++----- + libavcodec/libx264.c | 4 ---- + 2 files changed, 3 insertions(+), 9 deletions(-) + +diff --git a/configure b/configure +index ede8f9777b..b35728aace 100755 +--- a/configure ++++ b/configure +@@ -6535,11 +6535,8 @@ enabled libvpx && { + enabled libwebp && { + enabled libwebp_encoder && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion + enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; } +-enabled libx264 && { check_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode || +- { require libx264 "stdint.h x264.h" x264_encoder_encode "-lx264 $pthreads_extralibs $libm_extralibs -ldl" && +- warn "using libx264 without pkg-config"; } } && +- require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && +- check_cpp_condition libx262 x264.h "X264_MPEG2" ++enabled libx264 && check_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode && ++ require_cpp_condition libx264 x264.h "X264_BUILD >= 158" + enabled libx265 && { check_pkg_config libx265 x265 x265.h x265_api_get || + { { check_lib libx265 x265.h x265_api_get "-lx265 $pthreads_extralibs $libm_extralibs -ldl -lstdc++ -lgcc_s -lgcc -lrt -lnuma" || + require libx265 x265.h x265_api_get "-lx265 $pthreads_extralibs $libm_extralibs -ldl -lstdc++"; } && +diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c +index 21f434d06d..efbc9608c7 100644 +--- a/libavcodec/libx264.c ++++ b/libavcodec/libx264.c +@@ -34,10 +34,6 @@ + #include "packet_internal.h" + #include "atsc_a53.h" + +-#if defined(_MSC_VER) +-#define X264_API_IMPORTS 1 +-#endif +- + #include + #include + #include +-- +2.33.1.windows.1 + diff --git a/externals/vcpkg/ports/ffmpeg/FindFFMPEG.cmake.in b/externals/vcpkg/ports/ffmpeg/FindFFMPEG.cmake.in new file mode 100755 index 000000000..0c98b6558 --- /dev/null +++ b/externals/vcpkg/ports/ffmpeg/FindFFMPEG.cmake.in @@ -0,0 +1,165 @@ +# Distributed under the OSI-approved BSD 3-Clause License. +# +#.rst: +# FindFFMPEG +# -------- +# +# Find the FFPMEG libraries +# +# Result Variables +# ^^^^^^^^^^^^^^^^ +# +# The following variables will be defined: +# +# ``FFMPEG_FOUND`` +# True if FFMPEG found on the local system +# +# ``FFMPEG_INCLUDE_DIRS`` +# Location of FFMPEG header files +# +# ``FFMPEG_LIBRARY_DIRS`` +# Location of FFMPEG libraries +# +# ``FFMPEG_LIBRARIES`` +# List of the FFMPEG libraries found +# +# + +include(FindPackageHandleStandardArgs) +include(SelectLibraryConfigurations) +include(CMakeFindDependencyMacro) + +if(NOT FFMPEG_FOUND) + +# Compute the installation path relative to this file. +get_filename_component(SEARCH_PATH "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(SEARCH_PATH "${SEARCH_PATH}" PATH) +get_filename_component(SEARCH_PATH "${SEARCH_PATH}" PATH) +if(SEARCH_PATH STREQUAL "/") + set(SEARCH_PATH "") +endif() + +set(FFMPEG_VERSION "@FFMPEG_VERSION@") + +function(append_dependencies out) + cmake_parse_arguments(PARSE_ARGV 1 "arg" "DEBUG" "NAMES" "") + if(${arg_DEBUG}) + set(config DEBUG) + set(path "${CURRENT_INSTALLED_DIR}/debug/lib/") + else() + set(config RELEASE) + set(path "${CURRENT_INSTALLED_DIR}/lib/") + endif() + foreach(lib_name ${arg_NAMES}) + if("${lib_name}" STREQUAL "-pthread") + list(APPEND ${out} "-pthread") + elseif("${lib_name}" STREQUAL "-pthreads") + list(APPEND ${out} "-pthreads") + elseif("${lib_name}" STREQUAL "gcc") + list(APPEND ${out} "-lgcc") + elseif("${lib_name}" STREQUAL "gcc_s") + list(APPEND ${out} "-lgcc_s") + elseif("${lib_name}" STREQUAL "stdc++") + list(APPEND ${out} "-lstdc++") + else() + # first look in ${path} specifically to ensure we find the right release/debug variant + find_library(FFMPEG_DEPENDENCY_${lib_name}_${config} NAMES "${lib_name}" PATHS "${path}" NO_DEFAULT_PATH) + # if not found there, must be a system dependency, so look elsewhere + find_library(FFMPEG_DEPENDENCY_${lib_name}_${config} NAMES "${lib_name}" REQUIRED) + list(APPEND ${out} "${FFMPEG_DEPENDENCY_${lib_name}_${config}}") + endif() + endforeach() + set("${out}" "${${out}}" PARENT_SCOPE) +endfunction() + +macro(FFMPEG_FIND varname shortname headername) + if(NOT FFMPEG_${varname}_INCLUDE_DIRS) + find_path(FFMPEG_${varname}_INCLUDE_DIRS NAMES lib${shortname}/${headername} ${headername} PATHS ${SEARCH_PATH}/include NO_DEFAULT_PATH) + endif() + if(NOT FFMPEG_${varname}_LIBRARY) + find_library(FFMPEG_${varname}_LIBRARY_RELEASE NAMES ${shortname} PATHS ${SEARCH_PATH}/lib/ NO_DEFAULT_PATH) + find_library(FFMPEG_${varname}_LIBRARY_DEBUG NAMES ${shortname}d ${shortname} PATHS ${SEARCH_PATH}/debug/lib/ NO_DEFAULT_PATH) + get_filename_component(FFMPEG_${varname}_LIBRARY_RELEASE_DIR ${FFMPEG_${varname}_LIBRARY_RELEASE} DIRECTORY) + get_filename_component(FFMPEG_${varname}_LIBRARY_DEBUG_DIR ${FFMPEG_${varname}_LIBRARY_DEBUG} DIRECTORY) + select_library_configurations(FFMPEG_${varname}) + set(FFMPEG_${varname}_LIBRARY ${FFMPEG_${varname}_LIBRARY} CACHE STRING "") + endif() + if (FFMPEG_${varname}_LIBRARY AND FFMPEG_${varname}_INCLUDE_DIRS) + set(FFMPEG_${varname}_FOUND TRUE BOOL) + list(APPEND FFMPEG_INCLUDE_DIRS ${FFMPEG_${varname}_INCLUDE_DIRS}) + list(APPEND FFMPEG_LIBRARIES ${FFMPEG_${varname}_LIBRARY}) + list(APPEND FFMPEG_LIBRARY_DIRS ${FFMPEG_${varname}_LIBRARY_RELEASE_DIR} ${FFMPEG_${varname}_LIBRARY_DEBUG_DIR}) + endif() +endmacro(FFMPEG_FIND) + +if(@ENABLE_AVDEVICE@) + FFMPEG_FIND(libavdevice avdevice avdevice.h) +endif() +if(@ENABLE_AVFILTER@) + FFMPEG_FIND(libavfilter avfilter avfilter.h) +endif() +if(@ENABLE_AVFORMAT@) + FFMPEG_FIND(libavformat avformat avformat.h) +endif() +if(@ENABLE_AVCODEC@) + FFMPEG_FIND(libavcodec avcodec avcodec.h) +endif() +if(@ENABLE_AVRESAMPLE@) + FFMPEG_FIND(libavresample avresample avresample.h) +endif() +if(@ENABLE_POSTPROC@) + FFMPEG_FIND(libpostproc postproc postprocess.h) +endif() +if(@ENABLE_SWRESAMPLE@) + FFMPEG_FIND(libswresample swresample swresample.h) +endif() +if(@ENABLE_SWSCALE@) + FFMPEG_FIND(libswscale swscale swscale.h) +endif() +FFMPEG_FIND(libavutil avutil avutil.h) + +if (FFMPEG_libavutil_FOUND) + list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS) + list(REMOVE_DUPLICATES FFMPEG_LIBRARY_DIRS) + set(FFMPEG_libavutil_VERSION "@LIBAVUTIL_VERSION@" CACHE STRING "") + + if(FFMPEG_libavcodec_FOUND) + set(FFMPEG_libavcodec_VERSION "@LIBAVCODEC_VERSION@" CACHE STRING "") + endif() + if(FFMPEG_libavdevice_FOUND) + set(FFMPEG_libavdevice_VERSION "@LIBAVDEVICE_VERSION@" CACHE STRING "") + endif() + if(FFMPEG_libavfilter_FOUND) + set(FFMPEG_libavfilter_VERSION "@LIBAVFILTER_VERSION@" CACHE STRING "") + endif() + if(FFMPEG_libavformat_FOUND) + set(FFMPEG_libavformat_VERSION "@LIBAVFORMAT_VERSION@" CACHE STRING "") + endif() + if(FFMPEG_libavresample_FOUND) + set(FFMPEG_libavresample_VERSION "@LIBAVRESAMPLE_VERSION@" CACHE STRING "") + endif() + if(FFMPEG_libswresample_FOUND) + set(FFMPEG_libswresample_VERSION "@LIBSWRESAMPLE_VERSION@" CACHE STRING "") + endif() + if(FFMPEG_libswscale_FOUND) + set(FFMPEG_libswscale_VERSION "@LIBSWSCALE_VERSION@" CACHE STRING "") + endif() + + append_dependencies(FFMPEG_DEPS_LIBRARY_RELEASE NAMES "@FFMPEG_DEPENDENCIES_RELEASE@") + append_dependencies(FFMPEG_DEPS_LIBRARY_DEBUG NAMES "@FFMPEG_DEPENDENCIES_DEBUG@" DEBUG) + if(FFMPEG_DEPS_LIBRARY_RELEASE OR FFMPEG_DEPS_LIBRARY_DEBUG) + select_library_configurations(FFMPEG_DEPS) + list(APPEND FFMPEG_LIBRARIES ${FFMPEG_DEPS_LIBRARY}) + endif() + + set(FFMPEG_LIBRARY ${FFMPEG_LIBRARIES}) + + set(FFMPEG_FOUND TRUE CACHE BOOL "") + set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} CACHE STRING "") + set(FFMPEG_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIRS} CACHE STRING "") + set(FFMPEG_LIBRARY_DIRS ${FFMPEG_LIBRARY_DIRS} CACHE STRING "") +endif() + +find_package_handle_standard_args(FFMPEG REQUIRED_VARS FFMPEG_LIBRARIES FFMPEG_LIBRARY_DIRS FFMPEG_INCLUDE_DIRS) + +endif() diff --git a/externals/vcpkg/ports/ffmpeg/build.sh.in b/externals/vcpkg/ports/ffmpeg/build.sh.in new file mode 100755 index 000000000..c6f94fa87 --- /dev/null +++ b/externals/vcpkg/ports/ffmpeg/build.sh.in @@ -0,0 +1,126 @@ +#!/bin/sh + +set -e + +export PATH="/usr/bin:$PATH" + +command -v cygpath >/dev/null && have_cygpath=1 + +cygpath() { + if [ -n "$have_cygpath" ]; then + command cygpath "$@" + else + eval _p='$'$# + printf '%s\n' "$_p" + fi +} + +move_binary() { + SOURCE=$1 + TARGET=$2 + BINARY=$3 + + # run lipo over the command to check whether it really + # is a binary that we need to merge architectures + lipo $SOURCE/$BINARY -info &> /dev/null || return 0 + + # get the directory name the file is in + DIRNAME=$(dirname $BINARY) + + # ensure the directory to move the binary to exists + mkdir -p $TARGET/$DIRNAME + + # now finally move the binary + mv $SOURCE/$BINARY $TARGET/$BINARY +} + +move_binaries() { + SOURCE=$1 + TARGET=$2 + + [ ! -d $SOURCE ] && return 0 + pushd $SOURCE + + for BINARY in $(find . -type f); do + move_binary $SOURCE $TARGET $BINARY + done + + popd +} + +merge_binaries() { + TARGET=$1 + SOURCE=$2 + + shift + shift + + pushd $SOURCE/$1 + BINARIES=$(find . -type f) + popd + + for BINARY in $BINARIES; do + COMMAND="lipo -create -output $TARGET/$BINARY" + + for ARCH in $@; do + COMMAND="$COMMAND -arch $ARCH $SOURCE/$ARCH/$BINARY" + done + + $($COMMAND) + done +} + +export PKG_CONFIG_PATH="$(cygpath -p "${PKG_CONFIG_PATH}")" + +# Export HTTP(S)_PROXY as http(s)_proxy: +[ -n "$HTTP_PROXY" ] && export http_proxy="$HTTP_PROXY" +[ -n "$HTTPS_PROXY" ] && export https_proxy="$HTTPS_PROXY" + +PATH_TO_BUILD_DIR=$( cygpath "@BUILD_DIR@") +PATH_TO_SRC_DIR=$( cygpath "@SOURCE_PATH@") +PATH_TO_PACKAGE_DIR=$(cygpath "@INST_PREFIX@") + +JOBS=@VCPKG_CONCURRENCY@ + +OSX_ARCHS="@OSX_ARCHS@" +OSX_ARCH_COUNT=0@OSX_ARCH_COUNT@ + +# Default to hardware concurrency if unset. +: ${JOBS:=$(nproc)} + +build_ffmpeg() { + echo "=== CONFIGURING ===" + + sh "$PATH_TO_SRC_DIR/configure" "--prefix=$PATH_TO_PACKAGE_DIR" "--cc=$CC" @CONFIGURE_OPTIONS@ $@ + + echo "=== BUILDING ===" + + make -j${JOBS} V=1 + + echo "=== INSTALLING ===" + + make install +} + +cd "$PATH_TO_BUILD_DIR" + +if [ $OSX_ARCH_COUNT -gt 1 ]; then + for ARCH in $OSX_ARCHS; do + echo "=== CLEANING FOR $ARCH ===" + + make clean && make distclean + + build_ffmpeg --enable-cross-compile --arch=$ARCH --extra-cflags=-arch --extra-cflags=$ARCH --extra-ldflags=-arch --extra-ldflags=$ARCH + + echo "=== COLLECTING BINARIES FOR $ARCH ===" + + move_binaries $PATH_TO_PACKAGE_DIR/lib $PATH_TO_BUILD_DIR/stage/$ARCH/lib + move_binaries $PATH_TO_PACKAGE_DIR/bin $PATH_TO_BUILD_DIR/stage/$ARCH/bin + done + + echo "=== MERGING ARCHITECTURES ===" + + merge_binaries $PATH_TO_PACKAGE_DIR $PATH_TO_BUILD_DIR/stage $OSX_ARCHS +else + build_ffmpeg +fi diff --git a/externals/vcpkg/ports/ffmpeg/portfile.cmake b/externals/vcpkg/ports/ffmpeg/portfile.cmake new file mode 100755 index 000000000..76cc00805 --- /dev/null +++ b/externals/vcpkg/ports/ffmpeg/portfile.cmake @@ -0,0 +1,810 @@ +if(VCPKG_TARGET_IS_WINDOWS) + set(PATCHES 0017-Patch-for-ticket-9019-CUDA-Compile-Broken-Using-MSVC.patch) # https://trac.ffmpeg.org/ticket/9019 +endif() +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ffmpeg/ffmpeg + REF n4.4.1 + SHA512 a53e617937f9892c5cfddb00896be9ad8a3e398dc7cf3b6c893b52ff38aff6ff0cbc61a44cd5f93d9a28f775e71ae82996a5e2b699a769c1de8f882aab34c797 + HEAD_REF master + PATCHES + 0001-create-lib-libraries.patch + 0003-fix-windowsinclude.patch + 0004-fix-debug-build.patch + 0006-fix-StaticFeatures.patch + 0007-fix-lib-naming.patch + 0009-Fix-fdk-detection.patch + 0010-Fix-x264-detection.patch + 0011-Fix-x265-detection.patch + 0012-Fix-ssl-110-detection.patch + 0013-define-WINVER.patch + 0014-avfilter-dependency-fix.patch # https://ffmpeg.org/pipermail/ffmpeg-devel/2021-February/275819.html + 0015-Fix-xml2-detection.patch + 0016-configure-dnn-needs-avformat.patch # https://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279926.html + ${PATCHES} + 0018-libaom-Dont-use-aom_codec_av1_dx_algo.patch + 0019-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch +) + +if (SOURCE_PATH MATCHES " ") + message(FATAL_ERROR "Error: ffmpeg will not build with spaces in the path. Please use a directory with no spaces") +endif() + + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + # ffmpeg nasm build gives link error on x86, so fall back to yasm + vcpkg_find_acquire_program(YASM) + get_filename_component(YASM_EXE_PATH "${YASM}" DIRECTORY) + vcpkg_add_to_path("${YASM_EXE_PATH}") +else() + vcpkg_find_acquire_program(NASM) + get_filename_component(NASM_EXE_PATH "${NASM}" DIRECTORY) + vcpkg_add_to_path("${NASM_EXE_PATH}") +endif() + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + #We're assuming that if we're building for Windows we're using MSVC + set(INCLUDE_VAR "INCLUDE") + set(LIB_PATH_VAR "LIB") +else() + set(INCLUDE_VAR "CPATH") + set(LIB_PATH_VAR "LIBRARY_PATH") +endif() + +set(OPTIONS "--enable-pic --disable-doc --enable-debug --enable-runtime-cpudetect") + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(OPTIONS "${OPTIONS} --disable-asm --disable-x86asm") +endif() +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(OPTIONS "${OPTIONS} --enable-asm --disable-x86asm") +endif() +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(OPTIONS "${OPTIONS} --enable-asm --enable-x86asm") +endif() + +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + vcpkg_acquire_msys(MSYS_ROOT + DIRECT_PACKAGES + # Required for "cpp.exe" preprocessor + "https://repo.msys2.org/msys/x86_64/gcc-9.3.0-1-x86_64.pkg.tar.xz" + 76af0192a092278e6b26814b2d92815a2c519902a3fec056b057faec19623b1770ac928a59a39402db23cfc23b0d7601b7f88b367b27269361748c69d08654b2 + "https://repo.msys2.org/msys/x86_64/isl-0.22.1-1-x86_64.pkg.tar.xz" + f4db50d00bad0fa0abc6b9ad965b0262d936d437a9faa35308fa79a7ee500a474178120e487b2db2259caf51524320f619e18d92acf4f0b970b5cbe5cc0f63a2 + "https://repo.msys2.org/msys/x86_64/zlib-1.2.11-1-x86_64.pkg.tar.xz" + b607da40d3388b440f2a09e154f21966cd55ad77e02d47805f78a9dee5de40226225bf0b8335fdfd4b83f25ead3098e9cb974d4f202f28827f8468e30e3b790d + "https://repo.msys2.org/msys/x86_64/mpc-1.1.0-1-x86_64.pkg.tar.xz" + 7d0715c41c27fdbf91e6dcc73d6b8c02ee62c252e027f0a17fa4bfb974be8a74d8e3a327ef31c2460721902299ef69a7ef3c7fce52c8f02ce1cb47f0b6e073e9 + "https://repo.msys2.org/msys/x86_64/mpfr-4.1.0-1-x86_64.pkg.tar.zst" + d64fa60e188124591d41fc097d7eb51d7ea4940bac05cdcf5eafde951ed1eaa174468f5ede03e61106e1633e3428964b34c96de76321ed8853b398fbe8c4d072 + "https://repo.msys2.org/msys/x86_64/gmp-6.2.0-1-x86_64.pkg.tar.xz" + 1389a443e775bb255d905665dd577bef7ed71d51a8c24d118097f8119c08c4dfe67505e88ddd1e9a3764dd1d50ed8b84fa34abefa797d257e90586f0cbf54de8 + ) + else() + vcpkg_acquire_msys(MSYS_ROOT) + endif() + + set(SHELL "${MSYS_ROOT}/usr/bin/bash.exe") +else() + set(SHELL /bin/sh) +endif() + +if(VCPKG_TARGET_IS_MINGW) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + string(APPEND OPTIONS " --target-os=mingw32") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + string(APPEND OPTIONS " --target-os=mingw64") + endif() +elseif(VCPKG_TARGET_IS_WINDOWS) + string(APPEND OPTIONS " --target-os=win32") +elseif(VCPKG_TARGET_IS_OSX) + string(APPEND OPTIONS " --target-os=darwin") +elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") + string(APPEND OPTIONS " --target-os=android") +else() +endif() + +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") + +if(VCPKG_DETECTED_MSVC) + set(OPTIONS "--toolchain=msvc ${OPTIONS}") + # This is required because ffmpeg depends upon optimizations to link correctly + string(APPEND VCPKG_COMBINED_C_FLAGS_DEBUG " -O2") + string(REGEX REPLACE "(^| )-RTC1( |$)" " " VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") + string(REGEX REPLACE "(^| )-Od( |$)" " " VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") + string(REGEX REPLACE "(^| )-Ob0( |$)" " " VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") +endif() + +string(APPEND VCPKG_COMBINED_C_FLAGS_DEBUG " -I \"${CURRENT_INSTALLED_DIR}/include\"") +string(APPEND VCPKG_COMBINED_C_FLAGS_RELEASE " -I \"${CURRENT_INSTALLED_DIR}/include\"") + +set(_csc_PROJECT_PATH ffmpeg) + +file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) + +set(FFMPEG_PKGCONFIG_MODULES libavutil) + +if("nonfree" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-nonfree") +endif() + +if("gpl" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-gpl") +endif() + +if("version3" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-version3") +endif() + +if("ffmpeg" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-ffmpeg") +else() + set(OPTIONS "${OPTIONS} --disable-ffmpeg") +endif() + +if("ffplay" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-ffplay") +else() + set(OPTIONS "${OPTIONS} --disable-ffplay") +endif() + +if("ffprobe" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-ffprobe") +else() + set(OPTIONS "${OPTIONS} --disable-ffprobe") +endif() + +if (NOT "alsa" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --disable-alsa") +endif() + +if("avcodec" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-avcodec") + set(ENABLE_AVCODEC ON) + list(APPEND FFMPEG_PKGCONFIG_MODULES libavcodec) +else() + set(OPTIONS "${OPTIONS} --disable-avcodec") + set(ENABLE_AVCODEC OFF) +endif() + +if("avdevice" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-avdevice") + set(ENABLE_AVDEVICE ON) + list(APPEND FFMPEG_PKGCONFIG_MODULES libavdevice) +else() + set(OPTIONS "${OPTIONS} --disable-avdevice") + set(ENABLE_AVDEVICE OFF) +endif() + +if("avformat" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-avformat") + set(ENABLE_AVFORMAT ON) + list(APPEND FFMPEG_PKGCONFIG_MODULES libavformat) +else() + set(OPTIONS "${OPTIONS} --disable-avformat") + set(ENABLE_AVFORMAT OFF) +endif() + +if("avfilter" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-avfilter") + set(ENABLE_AVFILTER ON) + list(APPEND FFMPEG_PKGCONFIG_MODULES libavfilter) +else() + set(OPTIONS "${OPTIONS} --disable-avfilter") + set(ENABLE_AVFILTER OFF) +endif() + +if("postproc" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-postproc") + set(ENABLE_POSTPROC ON) + list(APPEND FFMPEG_PKGCONFIG_MODULES libpostproc) +else() + set(OPTIONS "${OPTIONS} --disable-postproc") + set(ENABLE_POSTPROC OFF) +endif() + +if("swresample" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-swresample") + set(ENABLE_SWRESAMPLE ON) + list(APPEND FFMPEG_PKGCONFIG_MODULES libswresample) +else() + set(OPTIONS "${OPTIONS} --disable-swresample") + set(ENABLE_SWRESAMPLE OFF) +endif() + +if("swscale" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-swscale") + set(ENABLE_SWSCALE ON) + list(APPEND FFMPEG_PKGCONFIG_MODULES libswscale) +else() + set(OPTIONS "${OPTIONS} --disable-swscale") + set(ENABLE_SWSCALE OFF) +endif() + +set(ENABLE_AVRESAMPLE OFF) +if("avresample" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-avresample") + set(ENABLE_AVRESAMPLE ON) + list(APPEND FFMPEG_PKGCONFIG_MODULES libavresample) +endif() + +set(STATIC_LINKAGE OFF) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(STATIC_LINKAGE ON) +endif() + +if("aom" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libaom") +else() + set(OPTIONS "${OPTIONS} --disable-libaom") +endif() + +if("ass" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libass") +else() + set(OPTIONS "${OPTIONS} --disable-libass") +endif() + +if("avisynthplus" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-avisynth") +else() + set(OPTIONS "${OPTIONS} --disable-avisynth") +endif() + +if("bzip2" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-bzlib") +else() + set(OPTIONS "${OPTIONS} --disable-bzlib") +endif() + +if("dav1d" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libdav1d") +else() + set(OPTIONS "${OPTIONS} --disable-libdav1d") +endif() + +if("fdk-aac" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libfdk-aac") +else() + set(OPTIONS "${OPTIONS} --disable-libfdk-aac") +endif() + +if("fontconfig" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libfontconfig") +else() + set(OPTIONS "${OPTIONS} --disable-libfontconfig") +endif() + +if("freetype" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libfreetype") +else() + set(OPTIONS "${OPTIONS} --disable-libfreetype") +endif() + +if("fribidi" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libfribidi") +else() + set(OPTIONS "${OPTIONS} --disable-libfribidi") +endif() + +if("iconv" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-iconv") +else() + set(OPTIONS "${OPTIONS} --disable-iconv") +endif() + +if("ilbc" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libilbc") +else() + set(OPTIONS "${OPTIONS} --disable-libilbc") +endif() + +if("lzma" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-lzma") +else() + set(OPTIONS "${OPTIONS} --disable-lzma") +endif() + +if("mp3lame" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libmp3lame") +else() + set(OPTIONS "${OPTIONS} --disable-libmp3lame") +endif() + +if("modplug" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libmodplug") +else() + set(OPTIONS "${OPTIONS} --disable-libmodplug") +endif() + +if("nvcodec" IN_LIST FEATURES) + #Note: the --enable-cuda option does not actually require the cuda sdk or toolset port dependency as ffmpeg uses runtime detection and dynamic loading + set(OPTIONS "${OPTIONS} --enable-cuda --enable-nvenc --enable-nvdec --enable-cuvid --enable-ffnvcodec") +else() + set(OPTIONS "${OPTIONS} --disable-cuda --disable-nvenc --disable-nvdec --disable-cuvid --disable-ffnvcodec") +endif() + +if("opencl" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-opencl") +else() + set(OPTIONS "${OPTIONS} --disable-opencl") +endif() + +if("opengl" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-opengl") +else() + set(OPTIONS "${OPTIONS} --disable-opengl") +endif() + +if("openh264" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libopenh264") +else() + set(OPTIONS "${OPTIONS} --disable-libopenh264") +endif() + +if("openjpeg" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libopenjpeg") +else() + set(OPTIONS "${OPTIONS} --disable-libopenjpeg") +endif() + +if("openssl" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-openssl") +else() + set(OPTIONS "${OPTIONS} --disable-openssl") +endif() + +if("opus" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libopus") +else() + set(OPTIONS "${OPTIONS} --disable-libopus") +endif() + +if("sdl2" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-sdl2") +else() + set(OPTIONS "${OPTIONS} --disable-sdl2") +endif() + +if("snappy" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libsnappy") +else() + set(OPTIONS "${OPTIONS} --disable-libsnappy") +endif() + +if("soxr" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libsoxr") +else() + set(OPTIONS "${OPTIONS} --disable-libsoxr") +endif() + +if("speex" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libspeex") +else() + set(OPTIONS "${OPTIONS} --disable-libspeex") +endif() + +if("ssh" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libssh") +else() + set(OPTIONS "${OPTIONS} --disable-libssh") +endif() + +if("tensorflow" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libtensorflow") +else() + set(OPTIONS "${OPTIONS} --disable-libtensorflow") +endif() + +if("tesseract" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libtesseract") +else() + set(OPTIONS "${OPTIONS} --disable-libtesseract") +endif() + +if("theora" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libtheora") +else() + set(OPTIONS "${OPTIONS} --disable-libtheora") +endif() + +if("vorbis" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libvorbis") +else() + set(OPTIONS "${OPTIONS} --disable-libvorbis") +endif() + +if("vpx" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libvpx") +else() + set(OPTIONS "${OPTIONS} --disable-libvpx") +endif() + +if("webp" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libwebp") +else() + set(OPTIONS "${OPTIONS} --disable-libwebp") +endif() + +if("x264" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libx264") +else() + set(OPTIONS "${OPTIONS} --disable-libx264") +endif() + +if("x265" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libx265") +else() + set(OPTIONS "${OPTIONS} --disable-libx265") +endif() + +if("xml2" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libxml2") +else() + set(OPTIONS "${OPTIONS} --disable-libxml2") +endif() + +if("zlib" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-zlib") +else() + set(OPTIONS "${OPTIONS} --disable-zlib") +endif() + +if (VCPKG_TARGET_IS_OSX) + set(OPTIONS "${OPTIONS} --disable-vdpau") # disable vdpau in OSX +endif() + +set(OPTIONS_CROSS " --enable-cross-compile") + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + string(APPEND OPTIONS_CROSS " --arch=x86_64") +else() + string(APPEND OPTIONS_CROSS " --arch=${VCPKG_TARGET_ARCHITECTURE}") +endif() + +if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_find_acquire_program(GASPREPROCESSOR) + foreach(GAS_PATH ${GASPREPROCESSOR}) + get_filename_component(GAS_ITEM_PATH ${GAS_PATH} DIRECTORY) + set(ENV{PATH} "$ENV{PATH}${VCPKG_HOST_PATH_SEPARATOR}${GAS_ITEM_PATH}") + endforeach(GAS_PATH) + endif() +endif() + +if(VCPKG_TARGET_IS_UWP) + set(ENV{LIBPATH} "$ENV{LIBPATH};$ENV{_WKITS10}references\\windows.foundation.foundationcontract\\2.0.0.0\\;$ENV{_WKITS10}references\\windows.foundation.universalapicontract\\3.0.0.0\\") + string(APPEND OPTIONS " --disable-programs") + string(APPEND OPTIONS " --extra-cflags=-DWINAPI_FAMILY=WINAPI_FAMILY_APP --extra-cflags=-D_WIN32_WINNT=0x0A00") + string(APPEND OPTIONS " --extra-ldflags=-APPCONTAINER --extra-ldflags=WindowsApp.lib") +endif() + +# Note: --disable-optimizations can't be used due to https://ffmpeg.org/pipermail/libav-user/2013-March/003945.html +set(OPTIONS_DEBUG "--debug") +set(OPTIONS_RELEASE "") + +set(OPTIONS "${OPTIONS} ${OPTIONS_CROSS}") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(OPTIONS "${OPTIONS} --disable-static --enable-shared") +endif() + +if(VCPKG_TARGET_IS_MINGW) + set(OPTIONS "${OPTIONS} --extra_cflags=-D_WIN32_WINNT=0x0601") +elseif(VCPKG_TARGET_IS_WINDOWS) + set(OPTIONS "${OPTIONS} --extra-cflags=-DHAVE_UNISTD_H=0") +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(OPTIONS "${OPTIONS} --pkg-config-flags=--static") +endif() + +set(ENV_LIB_PATH "$ENV{${LIB_PATH_VAR}}") + +get_filename_component(CC_path "${VCPKG_DETECTED_CMAKE_C_COMPILER}" DIRECTORY) +get_filename_component(CC_filename "${VCPKG_DETECTED_CMAKE_C_COMPILER}" NAME) +set(ENV{CC} "${CC_filename}") +if(CC_path) + vcpkg_add_to_path(PREPEND "${CC_path}") +endif() + +message(STATUS "Building Options: ${OPTIONS}") + +# Release build +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + message(STATUS "Building Release Options: ${OPTIONS_RELEASE}") + set(ENV{${LIB_PATH_VAR}} "${CURRENT_INSTALLED_DIR}/lib${VCPKG_HOST_PATH_SEPARATOR}${ENV_LIB_PATH}") + set(ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/lib/pkgconfig") + message(STATUS "Building ${_csc_PROJECT_PATH} for Release") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + # We use response files here as the only known way to handle spaces in paths + set(crsp "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/cflags.rsp") + file(WRITE "${crsp}" "${VCPKG_COMBINED_C_FLAGS_RELEASE}") + set(ldrsp "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/ldflags.rsp") + file(WRITE "${ldrsp}" "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_RELEASE}") + set(ENV{CFLAGS} "@${crsp}") + # All tools except the msvc arm{,64} assembler accept @... as response file syntax. + # For that assembler, there is no known way to pass in flags. We must hope that not passing flags will work acceptably. + if(NOT VCPKG_DETECTED_MSVC OR NOT VCPKG_TARGET_ARCHITECTURE MATCHES "^arm") + set(ENV{ASFLAGS} "@${crsp}") + endif() + set(ENV{LDFLAGS} "@${ldrsp}") + + set(BUILD_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + set(CONFIGURE_OPTIONS "${OPTIONS} ${OPTIONS_RELEASE}") + set(INST_PREFIX "${CURRENT_PACKAGES_DIR}") + + configure_file("${CMAKE_CURRENT_LIST_DIR}/build.sh.in" "${BUILD_DIR}/build.sh" @ONLY) + + vcpkg_execute_required_process( + COMMAND "${SHELL}" ./build.sh + WORKING_DIRECTORY "${BUILD_DIR}" + LOGNAME "build-${TARGET_TRIPLET}-rel" + ) +endif() + +# Debug build +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + message(STATUS "Building Debug Options: ${OPTIONS_DEBUG}") + set(ENV{${LIB_PATH_VAR}} "${CURRENT_INSTALLED_DIR}/debug/lib${VCPKG_HOST_PATH_SEPARATOR}${ENV_LIB_PATH}") + set(ENV{LDFLAGS} "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG}") + set(ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig") + message(STATUS "Building ${_csc_PROJECT_PATH} for Debug") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + set(crsp "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/cflags.rsp") + file(WRITE "${crsp}" "${VCPKG_COMBINED_C_FLAGS_DEBUG}") + set(ldrsp "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/ldflags.rsp") + file(WRITE "${ldrsp}" "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG}") + set(ENV{CFLAGS} "@${crsp}") + if(NOT VCPKG_DETECTED_MSVC OR NOT VCPKG_TARGET_ARCHITECTURE MATCHES "^arm") + set(ENV{ASFLAGS} "@${crsp}") + endif() + set(ENV{LDFLAGS} "@${ldrsp}") + + set(BUILD_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + set(CONFIGURE_OPTIONS "${OPTIONS} ${OPTIONS_DEBUG}") + set(INST_PREFIX "${CURRENT_PACKAGES_DIR}/debug") + + configure_file("${CMAKE_CURRENT_LIST_DIR}/build.sh.in" "${BUILD_DIR}/build.sh" @ONLY) + + vcpkg_execute_required_process( + COMMAND "${SHELL}" ./build.sh + WORKING_DIRECTORY "${BUILD_DIR}" + LOGNAME "build-${TARGET_TRIPLET}-dbg" + ) +endif() + +if(VCPKG_TARGET_IS_WINDOWS) + file(GLOB DEF_FILES "${CURRENT_PACKAGES_DIR}/lib/*.def" "${CURRENT_PACKAGES_DIR}/debug/lib/*.def") + + if(NOT VCPKG_TARGET_IS_MINGW) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(LIB_MACHINE_ARG /machine:ARM) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(LIB_MACHINE_ARG /machine:ARM64) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(LIB_MACHINE_ARG /machine:x86) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(LIB_MACHINE_ARG /machine:x64) + else() + message(FATAL_ERROR "Unsupported target architecture") + endif() + + foreach(DEF_FILE ${DEF_FILES}) + get_filename_component(DEF_FILE_DIR "${DEF_FILE}" DIRECTORY) + get_filename_component(DEF_FILE_NAME "${DEF_FILE}" NAME) + string(REGEX REPLACE "-[0-9]*\\.def" "${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" OUT_FILE_NAME "${DEF_FILE_NAME}") + file(TO_NATIVE_PATH "${DEF_FILE}" DEF_FILE_NATIVE) + file(TO_NATIVE_PATH "${DEF_FILE_DIR}/${OUT_FILE_NAME}" OUT_FILE_NATIVE) + message(STATUS "Generating ${OUT_FILE_NATIVE}") + vcpkg_execute_required_process( + COMMAND lib.exe "/def:${DEF_FILE_NATIVE}" "/out:${OUT_FILE_NATIVE}" ${LIB_MACHINE_ARG} + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}" + LOGNAME "libconvert-${TARGET_TRIPLET}" + ) + endforeach() + endif() + + file(GLOB EXP_FILES "${CURRENT_PACKAGES_DIR}/lib/*.exp" "${CURRENT_PACKAGES_DIR}/debug/lib/*.exp") + file(GLOB LIB_FILES "${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/bin/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + if(VCPKG_TARGET_IS_MINGW) + file(GLOB LIB_FILES_2 "${CURRENT_PACKAGES_DIR}/bin/*.lib" "${CURRENT_PACKAGES_DIR}/debug/bin/*.lib") + endif() + set(files_to_remove ${EXP_FILES} ${LIB_FILES} ${LIB_FILES_2} ${DEF_FILES}) + if(files_to_remove) + file(REMOVE ${files_to_remove}) + endif() +endif() + +if("ffmpeg" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES ffmpeg AUTO_CLEAN) +endif() +if("ffprobe" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES ffprobe AUTO_CLEAN) +endif() +if("ffplay" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES ffplay AUTO_CLEAN) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +vcpkg_copy_pdbs() + +if (VCPKG_TARGET_IS_WINDOWS) + set(_dirs "/") + if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + list(APPEND _dirs "/debug/") + endif() + foreach(_debug IN LISTS _dirs) + foreach(PKGCONFIG_MODULE IN LISTS FFMPEG_PKGCONFIG_MODULES) + set(PKGCONFIG_FILE "${CURRENT_PACKAGES_DIR}${_debug}lib/pkgconfig/${PKGCONFIG_MODULE}.pc") + # remove redundant cygwin style -libpath entries + execute_process( + COMMAND "${MSYS_ROOT}/usr/bin/cygpath.exe" -u "${CURRENT_INSTALLED_DIR}" + OUTPUT_VARIABLE CYG_INSTALLED_DIR + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + vcpkg_replace_string("${PKGCONFIG_FILE}" "-libpath:${CYG_INSTALLED_DIR}${_debug}lib/pkgconfig/../../lib " "") + # transform libdir, includedir, and prefix paths from cygwin style to windows style + file(READ "${PKGCONFIG_FILE}" PKGCONFIG_CONTENT) + foreach(PATH_NAME prefix libdir includedir) + string(REGEX MATCH "${PATH_NAME}=[^\n]*" PATH_VALUE "${PKGCONFIG_CONTENT}") + string(REPLACE "${PATH_NAME}=" "" PATH_VALUE "${PATH_VALUE}") + if(NOT PATH_VALUE) + message(FATAL_ERROR "failed to find pkgconfig variable ${PATH_NAME}") + endif() + execute_process( + COMMAND "${MSYS_ROOT}/usr/bin/cygpath.exe" -w "${PATH_VALUE}" + OUTPUT_VARIABLE FIXED_PATH + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + file(TO_CMAKE_PATH "${FIXED_PATH}" FIXED_PATH) + vcpkg_replace_string("${PKGCONFIG_FILE}" "${PATH_NAME}=${PATH_VALUE}" "${PATH_NAME}=${FIXED_PATH}") + endforeach() + # list libraries with -l flag (so pkgconf knows they are libraries and not just linker flags) + foreach(LIBS_ENTRY Libs Libs.private) + string(REGEX MATCH "${LIBS_ENTRY}: [^\n]*" LIBS_VALUE "${PKGCONFIG_CONTENT}") + if(NOT LIBS_VALUE) + message(FATAL_ERROR "failed to find pkgconfig entry ${LIBS_ENTRY}") + endif() + string(REPLACE "${LIBS_ENTRY}: " "" LIBS_VALUE "${LIBS_VALUE}") + if(LIBS_VALUE) + set(LIBS_VALUE_OLD "${LIBS_VALUE}") + string(REGEX REPLACE "([^ ]+)[.]lib" "-l\\1" LIBS_VALUE "${LIBS_VALUE}") + set(LIBS_VALUE_NEW "${LIBS_VALUE}") + vcpkg_replace_string("${PKGCONFIG_FILE}" "${LIBS_ENTRY}: ${LIBS_VALUE_OLD}" "${LIBS_ENTRY}: ${LIBS_VALUE_NEW}") + endif() + endforeach() + endforeach() + endforeach() +endif() + +vcpkg_fixup_pkgconfig() + +# Handle dependencies + +x_vcpkg_pkgconfig_get_modules(PREFIX FFMPEG_PKGCONFIG MODULES ${FFMPEG_PKGCONFIG_MODULES} LIBS) + +function(append_dependencies_from_libs out) + cmake_parse_arguments(PARSE_ARGV 1 "arg" "" "LIBS" "") + string(REGEX REPLACE "[ ]+" ";" contents "${arg_LIBS}") + list(FILTER contents EXCLUDE REGEX "^-framework$") + list(FILTER contents EXCLUDE REGEX "^-L.+") + list(FILTER contents EXCLUDE REGEX "^-libpath:.+") + list(TRANSFORM contents REPLACE "^-Wl,-framework," "-l") + list(FILTER contents EXCLUDE REGEX "^-Wl,.+") + list(TRANSFORM contents REPLACE "^-l" "") + list(FILTER contents EXCLUDE REGEX "^avresample$") + list(FILTER contents EXCLUDE REGEX "^avutil$") + list(FILTER contents EXCLUDE REGEX "^avcodec$") + list(FILTER contents EXCLUDE REGEX "^avdevice$") + list(FILTER contents EXCLUDE REGEX "^avfilter$") + list(FILTER contents EXCLUDE REGEX "^avformat$") + list(FILTER contents EXCLUDE REGEX "^postproc$") + list(FILTER contents EXCLUDE REGEX "^swresample$") + list(FILTER contents EXCLUDE REGEX "^swscale$") + if(VCPKG_TARGET_IS_WINDOWS) + list(TRANSFORM contents TOLOWER) + endif() + if(contents) + list(APPEND "${out}" "${contents}") + set("${out}" "${${out}}" PARENT_SCOPE) + endif() +endfunction() + +append_dependencies_from_libs(FFMPEG_DEPENDENCIES_RELEASE LIBS "${FFMPEG_PKGCONFIG_LIBS_RELEASE}") +append_dependencies_from_libs(FFMPEG_DEPENDENCIES_DEBUG LIBS "${FFMPEG_PKGCONFIG_LIBS_DEBUG}") + +# must remove duplicates from the front to respect link order so reverse first +list(REVERSE FFMPEG_DEPENDENCIES_RELEASE) +list(REVERSE FFMPEG_DEPENDENCIES_DEBUG) +list(REMOVE_DUPLICATES FFMPEG_DEPENDENCIES_RELEASE) +list(REMOVE_DUPLICATES FFMPEG_DEPENDENCIES_DEBUG) +list(REVERSE FFMPEG_DEPENDENCIES_RELEASE) +list(REVERSE FFMPEG_DEPENDENCIES_DEBUG) + +message(STATUS "Dependencies (release): ${FFMPEG_DEPENDENCIES_RELEASE}") +message(STATUS "Dependencies (debug): ${FFMPEG_DEPENDENCIES_DEBUG}") + +# Handle version strings + +function(extract_regex_from_file out) + cmake_parse_arguments(PARSE_ARGV 1 "arg" "" "FILE;REGEX" "") + file(READ "${arg_FILE}" contents) + if (contents MATCHES "${arg_REGEX}") + if(NOT CMAKE_MATCH_COUNT EQUAL 1) + message(FATAL_ERROR "Could not identify match group in regular expression \"${arg_REGEX}\"") + endif() + else() + message(FATAL_ERROR "Could not find line matching \"${arg_REGEX}\" in file \"${arg_FILE}\"") + endif() + set("${out}" "${CMAKE_MATCH_1}" PARENT_SCOPE) +endfunction() + +function(extract_version_from_component out) + cmake_parse_arguments(PARSE_ARGV 1 "arg" "" "COMPONENT" "") + string(TOLOWER "${arg_COMPONENT}" component_lower) + string(TOUPPER "${arg_COMPONENT}" component_upper) + extract_regex_from_file(major_version + FILE "${SOURCE_PATH}/${component_lower}/version.h" + REGEX "#define ${component_upper}_VERSION_MAJOR[ ]+([0-9]+)" + ) + extract_regex_from_file(minor_version + FILE "${SOURCE_PATH}/${component_lower}/version.h" + REGEX "#define ${component_upper}_VERSION_MINOR[ ]+([0-9]+)" + ) + extract_regex_from_file(micro_version + FILE "${SOURCE_PATH}/${component_lower}/version.h" + REGEX "#define ${component_upper}_VERSION_MICRO[ ]+([0-9]+)" + ) + set("${out}" "${major_version}.${minor_version}.${micro_version}" PARENT_SCOPE) +endfunction() + +extract_regex_from_file(FFMPEG_VERSION + FILE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libavutil/ffversion.h" + REGEX "#define FFMPEG_VERSION[ ]+\"(.+)\"" +) + +extract_version_from_component(LIBAVUTIL_VERSION + COMPONENT libavutil) +extract_version_from_component(LIBAVCODEC_VERSION + COMPONENT libavcodec) +extract_version_from_component(LIBAVDEVICE_VERSION + COMPONENT libavdevice) +extract_version_from_component(LIBAVFILTER_VERSION + COMPONENT libavfilter) +extract_version_from_component( LIBAVFORMAT_VERSION + COMPONENT libavformat) +extract_version_from_component(LIBAVRESAMPLE_VERSION + COMPONENT libavresample) +extract_version_from_component(LIBSWRESAMPLE_VERSION + COMPONENT libswresample) +extract_version_from_component(LIBSWSCALE_VERSION + COMPONENT libswscale) + +# Handle copyright +file(STRINGS "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-out.log" LICENSE_STRING REGEX "License: .*" LIMIT_COUNT 1) +if(LICENSE_STRING STREQUAL "License: LGPL version 2.1 or later") + set(LICENSE_FILE "COPYING.LGPLv2.1") +elseif(LICENSE_STRING STREQUAL "License: LGPL version 3 or later") + set(LICENSE_FILE "COPYING.LGPLv3") +elseif(LICENSE_STRING STREQUAL "License: GPL version 2 or later") + set(LICENSE_FILE "COPYING.GPLv2") +elseif(LICENSE_STRING STREQUAL "License: GPL version 3 or later") + set(LICENSE_FILE "COPYING.GPLv3") +elseif(LICENSE_STRING STREQUAL "License: nonfree and unredistributable") + set(LICENSE_FILE "COPYING.NONFREE") + file(WRITE "${SOURCE_PATH}/${LICENSE_FILE}" "${LICENSE_STRING}") +else() + message(FATAL_ERROR "Failed to identify license (${LICENSE_STRING})") +endif() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/FindFFMPEG.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/FindFFMPEG.cmake" @ONLY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/${LICENSE_FILE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/ffmpeg/usage b/externals/vcpkg/ports/ffmpeg/usage new file mode 100755 index 000000000..6ef6c3bd0 --- /dev/null +++ b/externals/vcpkg/ports/ffmpeg/usage @@ -0,0 +1,6 @@ +To use ffmpeg add the following to your CMake project: + + find_package(FFMPEG REQUIRED) + target_include_directories(main PRIVATE ${FFMPEG_INCLUDE_DIRS}) + target_link_directories(main PRIVATE ${FFMPEG_LIBRARY_DIRS}) + target_link_libraries(main PRIVATE ${FFMPEG_LIBRARIES}) diff --git a/externals/vcpkg/ports/ffmpeg/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/ffmpeg/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..170bf6333 --- /dev/null +++ b/externals/vcpkg/ports/ffmpeg/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,8 @@ +set(FFMPEG_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) + +cmake_policy(SET CMP0012 NEW) + +_find_package(${ARGS}) + +set(CMAKE_MODULE_PATH ${FFMPEG_PREV_MODULE_PATH}) diff --git a/externals/vcpkg/ports/ffmpeg/vcpkg.json b/externals/vcpkg/ports/ffmpeg/vcpkg.json new file mode 100755 index 000000000..b17921673 --- /dev/null +++ b/externals/vcpkg/ports/ffmpeg/vcpkg.json @@ -0,0 +1,643 @@ +{ + "name": "ffmpeg", + "version": "4.4.1", + "port-version": 13, + "description": [ + "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", + "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." + ], + "homepage": "https://ffmpeg.org", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake-get-vars", + "host": true + }, + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true + } + ], + "default-features": [ + "avcodec", + "avdevice", + "avfilter", + "avformat", + "swresample", + "swscale" + ], + "features": { + "all": { + "description": "Build with all allowed dependencies selected that are compatible with the lgpl license", + "dependencies": [ + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "avcodec", + "avdevice", + "avfilter", + "avformat", + "avresample", + "bzip2", + "freetype", + "iconv", + "lzma", + "mp3lame", + "openjpeg", + "opus", + "snappy", + "soxr", + "speex", + "swresample", + "swscale", + "theora", + "vorbis", + "vpx", + "webp", + "xml2", + "zlib" + ] + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "alsa" + ], + "platform": "linux" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "sdl2" + ], + "platform": "!osx" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "ass" + ], + "platform": "!uwp" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "fontconfig" + ], + "platform": "!uwp" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "fribidi" + ], + "platform": "!uwp" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "modplug" + ], + "platform": "!uwp" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "opencl" + ], + "platform": "!uwp" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "openh264" + ], + "platform": "!uwp" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "ilbc" + ], + "platform": "!(arm & uwp)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "ssh" + ], + "platform": "!(uwp | arm)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "tensorflow" + ], + "platform": "x64 & !static & !uwp" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "aom" + ], + "platform": "!(windows & arm & !uwp)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "dav1d" + ], + "platform": "!(uwp | arm | x86 | osx)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "opengl" + ], + "platform": "!uwp & !(arm64 & windows)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "tesseract" + ], + "platform": "!(windows & arm) & !static & !uwp" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "nvcodec" + ], + "platform": "linux | (!osx & !uwp & !(arm64 & windows))" + } + ] + }, + "all-gpl": { + "description": "Build with all allowed dependencies selected that are compatible with the gpl license", + "dependencies": [ + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "all", + "gpl", + "postproc" + ] + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "x265" + ], + "platform": "!(uwp | arm)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "x264" + ], + "platform": "!(arm & windows)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "avisynthplus" + ], + "platform": "windows & !arm & !uwp & !static" + } + ] + }, + "all-nonfree": { + "description": "Build with all allowed dependencies selected with a non-redistributable license", + "dependencies": [ + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "all-gpl", + "fdk-aac", + "nonfree", + "openssl" + ] + } + ] + }, + "alsa": { + "description": "Enable ALSA support", + "dependencies": [ + "alsa" + ] + }, + "aom": { + "description": "AV1 video encoding/decoding via libaom support in ffmpeg", + "dependencies": [ + "aom" + ] + }, + "ass": { + "description": "Libass subtitles rendering, needed for subtitles and ass filter support in ffmpeg", + "dependencies": [ + "libass" + ] + }, + "avcodec": { + "description": "Build the avcodec library" + }, + "avdevice": { + "description": "Build the avdevice library", + "dependencies": [ + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "avcodec", + "avformat" + ] + } + ] + }, + "avfilter": { + "description": "Build the avfilter library" + }, + "avformat": { + "description": "Build the avformat library", + "dependencies": [ + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "avcodec" + ] + } + ] + }, + "avisynthplus": { + "description": "Reading of AviSynth script files", + "supports": "windows & !static", + "dependencies": [ + "avisynthplus", + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "gpl" + ] + } + ] + }, + "avresample": { + "description": "Build the avresample library" + }, + "bzip2": { + "description": "Bzip2 support", + "dependencies": [ + "bzip2" + ] + }, + "dav1d": { + "description": "AV1 decoding via libdav1d", + "supports": "!osx", + "dependencies": [ + "dav1d" + ] + }, + "fdk-aac": { + "description": "AAC de/encoding via libfdk-aac, **including GPL-incompatible patent-encumbered HE-AAC**. If you do not require HE-AAC, use the built-in FFmpeg AAC codec.", + "dependencies": [ + { + "name": "fdk-aac", + "default-features": false, + "features": [ + "he-aac" + ] + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "nonfree" + ] + } + ] + }, + "ffmpeg": { + "description": "Build the ffmpeg application", + "supports": "!uwp", + "dependencies": [ + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "avcodec", + "avfilter", + "avformat" + ] + } + ] + }, + "ffplay": { + "description": "Build the ffplay application", + "supports": "!uwp", + "dependencies": [ + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "avcodec", + "avfilter", + "avformat", + "sdl2", + "swresample", + "swscale" + ] + } + ] + }, + "ffprobe": { + "description": "Build the ffprobe application", + "supports": "!uwp", + "dependencies": [ + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "avcodec", + "avformat" + ] + } + ] + }, + "fontconfig": { + "description": "Useful for drawtext filter", + "dependencies": [ + "fontconfig" + ] + }, + "freetype": { + "description": "Needed for drawtext filter", + "dependencies": [ + "freetype" + ] + }, + "fribidi": { + "description": "Improves drawtext filter", + "dependencies": [ + "fribidi" + ] + }, + "gpl": { + "description": "Allow use of GPL code, the resulting libs and binaries will be under GPL" + }, + "iconv": { + "description": "Iconv support", + "dependencies": [ + "libiconv" + ] + }, + "ilbc": { + "description": "iLBC de/encoding via libilbc", + "dependencies": [ + "libilbc" + ] + }, + "lzma": { + "description": "lzma support", + "dependencies": [ + "liblzma" + ] + }, + "modplug": { + "description": "ModPlug via libmodplug", + "dependencies": [ + "libmodplug" + ] + }, + "mp3lame": { + "description": "MP3 encoding via libmp3lame", + "dependencies": [ + "mp3lame" + ] + }, + "nonfree": { + "description": "Allow use of nonfree code, the resulting libs and binaries will be unredistributable" + }, + "nvcodec": { + "description": "Nvidia video decoding/encoding acceleration", + "supports": "linux | (!osx & !uwp & !(arm64 & windows))", + "dependencies": [ + "ffnvcodec" + ] + }, + "opencl": { + "description": "OpenCL processing", + "supports": "!uwp", + "dependencies": [ + "opencl" + ] + }, + "opengl": { + "description": "OpenGL rendering", + "supports": "!uwp", + "dependencies": [ + "opengl", + "opengl-registry" + ] + }, + "openh264": { + "description": "H.264 de/encoding via openh264", + "dependencies": [ + "openh264" + ] + }, + "openjpeg": { + "description": "JPEG 2000 de/encoding via OpenJPEG", + "dependencies": [ + "openjpeg" + ] + }, + "openssl": { + "description": "Needed for https support if gnutls, libtls or mbedtls is not used", + "dependencies": [ + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "nonfree" + ] + }, + "openssl" + ] + }, + "opus": { + "description": "Opus de/encoding via libopus", + "dependencies": [ + "opus" + ] + }, + "postproc": { + "description": "Build the postproc library", + "dependencies": [ + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "gpl" + ] + } + ] + }, + "sdl2": { + "description": "Sdl2 support", + "dependencies": [ + { + "name": "sdl2", + "default-features": false, + "features": [ + "x11" + ], + "platform": "linux" + }, + { + "name": "sdl2", + "platform": "!linux" + } + ] + }, + "snappy": { + "description": "Snappy compression, needed for hap encoding", + "dependencies": [ + "snappy" + ] + }, + "soxr": { + "description": "Include libsoxr resampling", + "dependencies": [ + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "swresample" + ] + }, + "soxr" + ] + }, + "speex": { + "description": "Speex de/encoding via libspeex", + "dependencies": [ + "speex" + ] + }, + "ssh": { + "description": "SFTP protocol via libssh", + "dependencies": [ + "libssh" + ] + }, + "swresample": { + "description": "Build the swresample library" + }, + "swscale": { + "description": "Build the swscale library" + }, + "tensorflow": { + "description": "TensorFlow as a DNN module backend for DNN based filters like sr", + "supports": "!static", + "dependencies": [ + "tensorflow" + ] + }, + "tesseract": { + "description": "Tesseract, needed for ocr filter", + "supports": "!static", + "dependencies": [ + "tesseract" + ] + }, + "theora": { + "description": "Theora encoding via libtheora", + "dependencies": [ + "libtheora" + ] + }, + "version3": { + "description": "Upgrade (L)GPL to version 3" + }, + "vorbis": { + "description": "Vorbis en/decoding via libvorbis, native implementation exists", + "dependencies": [ + "libvorbis" + ] + }, + "vpx": { + "description": "VP8 and VP9 de/encoding via libvpx", + "dependencies": [ + "libvpx" + ] + }, + "webp": { + "description": "WebP encoding via libwebp", + "dependencies": [ + "libwebp" + ] + }, + "x264": { + "description": "H.264 encoding via x264", + "dependencies": [ + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "gpl" + ] + }, + "x264" + ] + }, + "x265": { + "description": "HEVC encoding via x265", + "dependencies": [ + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "gpl" + ] + }, + "x265" + ] + }, + "xml2": { + "description": "XML parsing using the C library libxml2, needed for dash demuxing support", + "dependencies": [ + "libxml2" + ] + }, + "zlib": { + "description": "zlib support", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/ffnvcodec/LICENSE.txt b/externals/vcpkg/ports/ffnvcodec/LICENSE.txt new file mode 100755 index 000000000..a91215677 --- /dev/null +++ b/externals/vcpkg/ports/ffnvcodec/LICENSE.txt @@ -0,0 +1,169 @@ +GNU LESSER GENERAL PUBLIC LICENSE +Version 2.1, February 1999 + +Copyright (C) 1991, 1999 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] +Preamble +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. + +This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. + +When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. + +To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. + +For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. + +We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. + +To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. + +Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. + +Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. + +When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. + +We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. + +For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. + +In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. + +Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. + +The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION +0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". + +A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. + +The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) + +"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. + +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. + +1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + +a) The modified work must itself be a software library. +b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. +c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. +d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. +(For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + +3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. + +Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. + +This option is useful when you wish to copy part of the code of the Library into a program that is not a library. + +4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. + +If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. + +5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. + +However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. + +When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. + +If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) + +Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. + +6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. + +You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: + +a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) +b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. +c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. +d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. +e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. +For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + +It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. + +7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: + +a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. +b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. +8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + +9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. + +10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. + +11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + +12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + +13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. + +14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS +How to Apply These Terms to Your New Libraries +If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting redistribution under these terms (or, alternatively, under the terms of the ordinary General Public License). + +To apply these terms, attach the following notices to the library. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. + +one line to give the library's name and an idea of what it does. +Copyright (C) year name of author + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the library, if necessary. Here is a sample; alter the names: + +Yoyodyne, Inc., hereby disclaims all copyright interest in +the library `Frob' (a library for tweaking knobs) written +by James Random Hacker. + +signature of Ty Coon, 1 April 1990 +Ty Coon, President of Vice +That's all there is to it! \ No newline at end of file diff --git a/externals/vcpkg/ports/ffnvcodec/build.sh b/externals/vcpkg/ports/ffnvcodec/build.sh new file mode 100755 index 000000000..416c6bd8f --- /dev/null +++ b/externals/vcpkg/ports/ffnvcodec/build.sh @@ -0,0 +1,18 @@ +#!/usr/bin/bash + +# Deploys the ffnvcodec.pc file to the MSYS rootfs so that pkgconfig can find it. + +set -e +export PATH=/usr/bin:$PATH + +SOURCE_PATH="$1" +CURRENT_PACKAGES_DIR="$2" + +pushd ${SOURCE_PATH} + +# Create ffnvcodec.pc +make PREFIX=${CURRENT_PACKAGES_DIR} +make install PREFIX=${CURRENT_PACKAGES_DIR} + + +popd diff --git a/externals/vcpkg/ports/ffnvcodec/copyright b/externals/vcpkg/ports/ffnvcodec/copyright new file mode 100755 index 000000000..07c1bc4d7 --- /dev/null +++ b/externals/vcpkg/ports/ffnvcodec/copyright @@ -0,0 +1,26 @@ +/* + * This copyright notice applies to this header file only: + * + * Copyright (c) 2010-2019 NVIDIA Corporation + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the software, and to permit persons to whom the + * software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ diff --git a/externals/vcpkg/ports/ffnvcodec/portfile.cmake b/externals/vcpkg/ports/ffnvcodec/portfile.cmake new file mode 100755 index 000000000..1b67cba6f --- /dev/null +++ b/externals/vcpkg/ports/ffnvcodec/portfile.cmake @@ -0,0 +1,57 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO FFmpeg/nv-codec-headers + REF b641a195edbe3ac9788e681e22c2e2fad8aacddb # 11.1.5.0 + SHA512 e8b4c21ddc9c39dadd9b69ebdfcf38cf1e61f19ffb88d0a4d9086ddbf69285d2c8c946bb02bde3ee943accae559a72468f096718ad69ac03a43746c1eb0ed483 + HEAD_REF master +) + +# ==================================================== +# Install the pkgconfig info for the `nvcodec` package +# ==================================================== + +# Windows +if(VCPKG_TARGET_IS_WINDOWS) + set(BUILD_SCRIPT ${CMAKE_CURRENT_LIST_DIR}\\build.sh) + vcpkg_acquire_msys(MSYS_ROOT PACKAGES make pkg-config) + set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) + + message(STATUS "Building ${_csc_PROJECT_PATH} for Release") + file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) + + # Make and deploy the ffnvcodec.pc file using MSYS + # (so that FFmpeg can find it in the MSYS rootfs) + vcpkg_execute_required_process( + COMMAND ${BASH} --noprofile --norc "${BUILD_SCRIPT}" + "${SOURCE_PATH}" + "${CURRENT_PACKAGES_DIR}" + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET} + LOGNAME build-${TARGET_TRIPLET} + ) + + file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + +# Linux, etc. +else() + FIND_PROGRAM(MAKE make) + IF (NOT MAKE) + MESSAGE(FATAL_ERROR "MAKE not found") + ENDIF () + + vcpkg_execute_required_process( + COMMAND make PREFIX=$${CURRENT_PACKAGES_DIR} + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME make-${TARGET_TRIPLET} + ) + + # FFmpeg uses pkgconfig to find ffnvcodec.pc, so install it where + # FFMpeg's call to pkgconfig expects to find it. + file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") + file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +endif() + +vcpkg_fixup_pkgconfig() + +# Install the files to their default vcpkg locations +file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}") +file(INSTALL "${CURRENT_PORT_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/ffnvcodec/vcpkg.json b/externals/vcpkg/ports/ffnvcodec/vcpkg.json new file mode 100755 index 000000000..47418dc0c --- /dev/null +++ b/externals/vcpkg/ports/ffnvcodec/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "ffnvcodec", + "version": "11.1.5.0", + "port-version": 1, + "description": "FFmpeg version of Nvidia Codec SDK headers.", + "homepage": "https://github.com/FFmpeg/nv-codec-headers", + "supports": "linux | (!osx & !uwp & !(arm64 & windows))" +} diff --git a/externals/vcpkg/ports/fftw3/aligned_malloc.patch b/externals/vcpkg/ports/fftw3/aligned_malloc.patch new file mode 100755 index 000000000..447ded62b --- /dev/null +++ b/externals/vcpkg/ports/fftw3/aligned_malloc.patch @@ -0,0 +1,38 @@ +diff --git a/cmake.config.h.in b/cmake.config.h.in +index 1f4c505..fd763cc 100644 +--- a/cmake.config.h.in ++++ b/cmake.config.h.in +@@ -112,6 +112,10 @@ + you don't. */ + #cmakedefine01 HAVE_DECL_POSIX_MEMALIGN + ++/* Define to 1 if you have the declaration of `_aligned_malloc', and to 0 if you ++ don't. */ ++#cmakedefine01 HAVE_DECL_ALIGNED_MALLOC ++ + /* Define to 1 if you have the declaration of `sinl', and to 0 if you don't. + */ + #cmakedefine01 HAVE_DECL_SINL +@@ -184,6 +188,9 @@ + /* Define to 1 if you have the `memalign' function. */ + #cmakedefine HAVE_MEMALIGN 1 + ++/* Define to 1 if you have the `_aligned_malloc' function. */ ++#cmakedefine HAVE_ALIGNED_MALLOC 1 ++ + /* Define to 1 if you have the `memmove' function. */ + #cmakedefine HAVE_MEMMOVE 1 + +diff --git a/kernel/kalloc.c b/kernel/kalloc.c +index e42f6f3..ffc2257 100644 +--- a/kernel/kalloc.c ++++ b/kernel/kalloc.c +@@ -103,7 +103,7 @@ void *X(kernel_malloc)(size_t n) + # undef real_free + # define real_free _mm_free + +-# elif defined(_MSC_VER) ++# elif defined(_MSC_VER) || defined (HAVE_ALIGNED_MALLOC) + /* MS Visual C++ 6.0 with a "Processor Pack" supports SIMD + and _aligned_malloc/free (uses malloc.h) */ + p = (void *) _aligned_malloc(n, MIN_ALIGNMENT); diff --git a/externals/vcpkg/ports/fftw3/fftw3_arch_fix.patch b/externals/vcpkg/ports/fftw3/fftw3_arch_fix.patch new file mode 100755 index 000000000..53fd7c0e7 --- /dev/null +++ b/externals/vcpkg/ports/fftw3/fftw3_arch_fix.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 49be67d..ef69fa6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -66,6 +66,7 @@ check_prototype_definition (cosl "long double cosl( long double arg )" "0" math. + check_prototype_definition (sinl "long double sinl( long double arg )" "0" math.h HAVE_DECL_SINL) + check_prototype_definition (memalign "void *memalign(size_t alignment, size_t size)" "0" malloc.h HAVE_DECL_MEMALIGN) + check_prototype_definition (posix_memalign "int posix_memalign(void **memptr, size_t alignment, size_t size)" "0" stdlib.h HAVE_DECL_POSIX_MEMALIGN) ++check_prototype_definition (_aligned_malloc "void* __cdecl _aligned_malloc(size_t _Size, size_t _Alignment)" "0" malloc.h HAVE_DECL_ALIGNED_MALLOC) + + include (CheckSymbolExists) + check_symbol_exists (clock_gettime time.h HAVE_CLOCK_GETTIME) +@@ -75,6 +76,7 @@ check_symbol_exists (drand48 stdlib.h HAVE_DRAND48) + check_symbol_exists (srand48 stdlib.h HAVE_SRAND48) + check_symbol_exists (memalign malloc.h HAVE_MEMALIGN) + check_symbol_exists (posix_memalign stdlib.h HAVE_POSIX_MEMALIGN) ++check_symbol_exists (_aligned_malloc malloc.h HAVE_ALIGNED_MALLOC) + check_symbol_exists (mach_absolute_time mach/mach_time.h HAVE_MACH_ABSOLUTE_TIME) + check_symbol_exists (alloca alloca.h HAVE_ALLOCA) + if (NOT HAVE_ALLOCA) +@@ -131,6 +133,7 @@ endif () + + include (CheckCCompilerFlag) + ++#All those checks fail due to linkage errors so we directly set HAVE_ in the PORTFILE! We assume the user knows what (s)he is doing! + if (ENABLE_SSE) + foreach (FLAG "-msse" "/arch:SSE") + unset (HAVE_SSE CACHE) +@@ -180,8 +183,9 @@ if (ENABLE_AVX2) + endif () + + # AVX2 codelets require FMA support as well ++# AVX2 implicitly includes FMA using Visual Studio (also definition __FMA__ is not set) + if (ENABLE_AVX2) +- foreach (FLAG "-mfma" "/arch:FMA") ++ foreach (FLAG "-mfma" "/arch:AVX2") + unset (HAVE_FMA CACHE) + unset (HAVE_FMA) + check_c_compiler_flag (${FLAG} HAVE_FMA) diff --git a/externals/vcpkg/ports/fftw3/omp_test.patch b/externals/vcpkg/ports/fftw3/omp_test.patch new file mode 100755 index 000000000..6123798a2 --- /dev/null +++ b/externals/vcpkg/ports/fftw3/omp_test.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f3cfc20..9826bff 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -385,6 +385,12 @@ if (BUILD_TESTS) + target_link_libraries (bench ${fftw3_lib}) + endif () + ++ if (ENABLE_OPENMP) ++ target_link_libraries (bench ${fftw3_lib}_omp) ++ else () ++ target_link_libraries (bench ${fftw3_lib}) ++ endif () ++ + + enable_testing () + diff --git a/externals/vcpkg/ports/fftw3/patch_targets.patch b/externals/vcpkg/ports/fftw3/patch_targets.patch new file mode 100755 index 000000000..a0df5cf90 --- /dev/null +++ b/externals/vcpkg/ports/fftw3/patch_targets.patch @@ -0,0 +1,41 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 335808a..90772b4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -358,7 +358,7 @@ foreach(subtarget ${subtargets}) + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endforeach () + install(TARGETS ${fftw3_lib} +- EXPORT FFTW3LibraryDepends ++ EXPORT FFTW3${PREC_SUFFIX}LibraryDepends + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +@@ -419,11 +419,11 @@ configure_file (FFTW3ConfigVersion.cmake.in FFTW3${PREC_SUFFIX}ConfigVersion.cma + install (FILES + ${CMAKE_CURRENT_BINARY_DIR}/FFTW3${PREC_SUFFIX}Config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/FFTW3${PREC_SUFFIX}ConfigVersion.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/fftw3${PREC_SUFFIX} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake + COMPONENT Development) + +-export (TARGETS ${fftw3_lib} NAMESPACE FFTW3:: FILE ${PROJECT_BINARY_DIR}/FFTW3LibraryDepends.cmake) +-install(EXPORT FFTW3LibraryDepends ++export (TARGETS ${fftw3_lib} NAMESPACE FFTW3:: FILE ${PROJECT_BINARY_DIR}/FFTW3${PREC_SUFFIX}LibraryDepends.cmake) ++install(EXPORT FFTW3${PREC_SUFFIX}LibraryDepends + NAMESPACE FFTW3:: +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/fftw3${PREC_SUFFIX} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake + COMPONENT Development) +--- a/FFTW3Config.cmake.in ++++ b/FFTW3Config.cmake.in +@@ -10,7 +10,7 @@ set (FFTW3@PREC_SUFFIX@_LIBRARIES fftw3@PREC_SUFFIX@) + set (FFTW3@PREC_SUFFIX@_LIBRARY_DIRS @CMAKE_INSTALL_FULL_LIBDIR@) + set (FFTW3@PREC_SUFFIX@_INCLUDE_DIRS @CMAKE_INSTALL_FULL_INCLUDEDIR@) + +-include ("${CMAKE_CURRENT_LIST_DIR}/FFTW3LibraryDepends.cmake") ++include ("${CMAKE_CURRENT_LIST_DIR}/FFTW3@PREC_SUFFIX@LibraryDepends.cmake") + + if (CMAKE_VERSION VERSION_LESS 2.8.3) + set (CMAKE_CURRENT_LIST_DIR) + \ No newline at end of file diff --git a/externals/vcpkg/ports/fftw3/portfile.cmake b/externals/vcpkg/ports/fftw3/portfile.cmake new file mode 100755 index 000000000..7d3c75f19 --- /dev/null +++ b/externals/vcpkg/ports/fftw3/portfile.cmake @@ -0,0 +1,74 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://www.fftw.org/fftw-3.3.10.tar.gz" + FILENAME "fftw-3.3.10.tar.gz" + SHA512 2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + omp_test.patch + patch_targets.patch + fftw3_arch_fix.patch + aligned_malloc.patch +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openmp ENABLE_OPENMP + threads ENABLE_THREADS + threads WITH_COMBINED_THREADS + avx2 ENABLE_AVX2 + avx ENABLE_AVX + sse2 ENABLE_SSE2 + sse ENABLE_SSE +) + +set(ENABLE_FLOAT_CMAKE fftw3f) +set(ENABLE_LONG_DOUBLE_CMAKE fftw3l) +set(ENABLE_DEFAULT_PRECISION_CMAKE fftw3) + +foreach(PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE ENABLE_DEFAULT_PRECISION) + if(PRECISION STREQUAL "ENABLE_LONG_DOUBLE") + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -D${PRECISION}=ON + -DENABLE_OPENMP=${ENABLE_OPENMP} + -DENABLE_THREADS=${HAVE_THREADS} + -DWITH_COMBINED_THREADS=${HAVE_THREADS} + -DBUILD_TESTS=OFF + ) + else() + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -D${PRECISION}=ON + ${FEATURE_OPTIONS} + -DBUILD_TESTS=OFF + ) + endif() + + vcpkg_cmake_install() + + vcpkg_copy_pdbs() + + vcpkg_cmake_config_fixup(PACKAGE_NAME ${${PRECISION}_CMAKE} CONFIG_PATH lib/cmake) +endforeach() + +file(READ "${SOURCE_PATH}/api/fftw3.h" _contents) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + string(REPLACE "defined(FFTW_DLL)" "0" _contents "${_contents}") +else() + string(REPLACE "defined(FFTW_DLL)" "1" _contents "${_contents}") +endif() +file(WRITE "${SOURCE_PATH}/include/fftw3.h" "${_contents}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/fftw3/vcpkg.json b/externals/vcpkg/ports/fftw3/vcpkg.json new file mode 100755 index 000000000..99fe9ed09 --- /dev/null +++ b/externals/vcpkg/ports/fftw3/vcpkg.json @@ -0,0 +1,37 @@ +{ + "name": "fftw3", + "version": "3.3.10", + "port-version": 3, + "description": "FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).", + "homepage": "https://www.fftw.org/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "avx": { + "description": "Builds part of the library with avx, sse2, sse" + }, + "avx2": { + "description": "Builds part of the library with avx2, fma, avx, sse2, sse" + }, + "openmp": { + "description": "Builds openmp enabled lib" + }, + "sse": { + "description": "Builds part of the library with sse" + }, + "sse2": { + "description": "Builds part of the library with sse2, sse" + }, + "threads": { + "description": "Enable threads in fftw3" + } + } +} diff --git a/externals/vcpkg/ports/fftwpp/portfile.cmake b/externals/vcpkg/ports/fftwpp/portfile.cmake new file mode 100755 index 000000000..b24c5652d --- /dev/null +++ b/externals/vcpkg/ports/fftwpp/portfile.cmake @@ -0,0 +1,34 @@ + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO dealias/fftwpp + REF d05a2812995a52a3834140fd3ddd2e80bf8fcd42 + SHA512 851c79245eb61ebebfde97e7a8f3b9c061e84c9df571b5a7cafc3e959941e7b0792923e0ddefde4739582932d135c578c703195017da4bd34872adce7ab8c5ee + HEAD_REF master +) + +# fftwpp is a header-only library +set (FFWTPP_SOURCE_FILES + ${SOURCE_PATH}/Array.h + ${SOURCE_PATH}/Array.cc + ${SOURCE_PATH}/Complex.h + ${SOURCE_PATH}/Complex.cc + ${SOURCE_PATH}/align.h + ${SOURCE_PATH}/cmult-sse2.h + ${SOURCE_PATH}/convolution.h + ${SOURCE_PATH}/convolution.cc + ${SOURCE_PATH}/fftw++.h + ${SOURCE_PATH}/fftw++.cc + ${SOURCE_PATH}/seconds.h + ${SOURCE_PATH}/statistics.h + ${SOURCE_PATH}/transposeoptions.h +) + +set(FFWTPP_DOXY_CFG ${SOURCE_PATH}/fftw++.doxycfg) + +file(INSTALL ${FFWTPP_SOURCE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) +file(INSTALL ${FFWTPP_DOXY_CFG} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/fftwpp/vcpkg.json b/externals/vcpkg/ports/fftwpp/vcpkg.json new file mode 100755 index 000000000..175e29ab3 --- /dev/null +++ b/externals/vcpkg/ports/fftwpp/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "fftwpp", + "version-date": "2019-12-19", + "port-version": 2, + "description": "FFTW++ is a C++ header/MPI transpose for Version 3 of the highly optimized FFTW (https://www.fftw.org) Fourier Transform library.", + "homepage": "https://www.fftw.org/", + "dependencies": [ + "fftw3" + ] +} diff --git a/externals/vcpkg/ports/fixed-string/portfile.cmake b/externals/vcpkg/ports/fixed-string/portfile.cmake new file mode 100755 index 000000000..5442bfeaa --- /dev/null +++ b/externals/vcpkg/ports/fixed-string/portfile.cmake @@ -0,0 +1,26 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO unterumarmung/fixed_string + REF v0.1.1 + SHA512 8367f7cf898dd88918913f6e788cc5841eab7cd56d61f3ea21636bf3253f450d5dd6207a259d4c5980d863c2ce55fba35e3e8944341f56dbfd56faa29c39746e + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DFIXED_STRING_OPT_BUILD_EXAMPLES=OFF + -DFIXED_STRING_OPT_BUILD_TESTS=OFF + -DFIXED_STRING_OPT_INSTALL=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME fixed_string CONFIG_PATH lib/cmake/fixed_string) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +# Handle copyright +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/fixed-string/vcpkg.json b/externals/vcpkg/ports/fixed-string/vcpkg.json new file mode 100755 index 000000000..cbb1a272a --- /dev/null +++ b/externals/vcpkg/ports/fixed-string/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "fixed-string", + "version": "0.1.1", + "description": "Header-only C++17 library provides a string class with std::array fixed-size semantic.", + "homepage": "https://github.com/unterumarmung/fixed_string", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/fizz/0001-fix-libsodium.patch b/externals/vcpkg/ports/fizz/0001-fix-libsodium.patch new file mode 100755 index 000000000..454964212 --- /dev/null +++ b/externals/vcpkg/ports/fizz/0001-fix-libsodium.patch @@ -0,0 +1,35 @@ +diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt +index bb3e15e5..80c5051e 100644 +--- a/fizz/CMakeLists.txt ++++ b/fizz/CMakeLists.txt +@@ -64,7 +64,7 @@ endif() + + include(CheckAtomic) + +-find_package(Sodium REQUIRED) ++find_package(unofficial-sodium CONFIG REQUIRED) + + SET(FIZZ_SHINY_DEPENDENCIES "") + SET(FIZZ_LINK_LIBRARIES "") +@@ -255,7 +255,7 @@ target_link_libraries(fizz + PUBLIC + ${FOLLY_LIBRARIES} + ${OPENSSL_LIBRARIES} +- sodium ++ unofficial-sodium::sodium + Threads::Threads + ZLIB::ZLIB + ${ZSTD_LIBRARY} +diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in +index 679b0e61..b28750fa 100644 +--- a/fizz/cmake/fizz-config.cmake.in ++++ b/fizz/cmake/fizz-config.cmake.in +@@ -26,7 +26,7 @@ endif() + set(FIZZ_LIBRARIES fizz::fizz) + + include(CMakeFindDependencyMacro) +-find_dependency(Sodium) ++find_dependency(unofficial-sodium CONFIG REQUIRED) + find_dependency(folly CONFIG) + find_dependency(ZLIB) + diff --git a/externals/vcpkg/ports/fizz/0002-fix-libevent.patch b/externals/vcpkg/ports/fizz/0002-fix-libevent.patch new file mode 100755 index 000000000..b07161d95 --- /dev/null +++ b/externals/vcpkg/ports/fizz/0002-fix-libevent.patch @@ -0,0 +1,30 @@ +diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt +index 80c5051..9f2e3e6 100644 +--- a/fizz/CMakeLists.txt ++++ b/fizz/CMakeLists.txt +@@ -92,10 +92,10 @@ endif() + + find_package(ZLIB REQUIRED) + +-find_package(Libevent CONFIG QUIET) +-if(TARGET event) ++find_package(Libevent CONFIG REQUIRED) ++if(TARGET libevent::core) + message(STATUS "Found libevent from package config") +- list(APPEND FIZZ_SHINY_DEPENDENCIES event) ++ list(APPEND FIZZ_SHINY_DEPENDENCIES libevent::core) + else() + find_package(Libevent MODULE REQUIRED) + list(APPEND FIZZ_LINK_LIBRARIES ${LIBEVENT_LIB}) +diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in +index b28750f..282c42d 100644 +--- a/fizz/cmake/fizz-config.cmake.in ++++ b/fizz/cmake/fizz-config.cmake.in +@@ -29,6 +29,7 @@ include(CMakeFindDependencyMacro) + find_dependency(unofficial-sodium CONFIG REQUIRED) + find_dependency(folly CONFIG) + find_dependency(ZLIB) ++find_dependency(Libevent CONFIG) + + if (NOT fizz_FIND_QUIETLY) + message(STATUS "Found fizz: ${PACKAGE_PREFIX_DIR}") diff --git a/externals/vcpkg/ports/fizz/portfile.cmake b/externals/vcpkg/ports/fizz/portfile.cmake new file mode 100755 index 000000000..1fe719a78 --- /dev/null +++ b/externals/vcpkg/ports/fizz/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO facebookincubator/fizz + REF v2022.03.21.00 + SHA512 81a7b764c2c2e17fd5df32a69ecb368eb01df04df6dbd1155a40b68fc39cda4f86ce81afc5c89425a5751ef7f4dbb8a40df8b5095685e72ce5e9043c0a74682e + HEAD_REF master + PATCHES + 0001-fix-libsodium.patch + 0002-fix-libevent.patch +) + +# Prefer installed config files +file(REMOVE + ${SOURCE_PATH}/fizz/cmake/FindGMock.cmake + ${SOURCE_PATH}/fizz/cmake/FindGflags.cmake + ${SOURCE_PATH}/fizz/cmake/FindGlog.cmake + ${SOURCE_PATH}/fizz/cmake/FindLibevent.cmake +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/fizz" + OPTIONS + -DBUILD_TESTS=OFF + -DBUILD_EXAMPLES=OFF + -DINCLUDE_INSTALL_DIR:STRING=include +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/fizz) +vcpkg_copy_pdbs() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake" "lib/cmake/fizz" "share/fizz") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/fizz/tool/test" "${CURRENT_PACKAGES_DIR}/include/fizz/util/test") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/fizz/vcpkg.json b/externals/vcpkg/ports/fizz/vcpkg.json new file mode 100755 index 000000000..84d086bf1 --- /dev/null +++ b/externals/vcpkg/ports/fizz/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "fizz", + "version-string": "2022.03.21.00", + "port-version": 1, + "description": "a TLS 1.3 implementation by Facebook", + "homepage": "https://github.com/facebookincubator/fizz", + "dependencies": [ + "double-conversion", + "fmt", + "folly", + "libevent", + "libsodium", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zstd" + ] +} diff --git a/externals/vcpkg/ports/flann/fix-build-error.patch b/externals/vcpkg/ports/flann/fix-build-error.patch new file mode 100755 index 000000000..5b5530eb0 --- /dev/null +++ b/externals/vcpkg/ports/flann/fix-build-error.patch @@ -0,0 +1,278 @@ +From c111a280591aa542914ca845c0be6099a94315ad Mon Sep 17 00:00:00 2001 +From: Lars Glud +Date: Tue, 16 Mar 2021 10:40:06 +0100 +Subject: [PATCH] fix build error + +--- + CMakeLists.txt | 8 ++- + cmake/Config.cmake.in | 5 ++ + src/cpp/CMakeLists.txt | 149 ++++++++++++++++++++++++----------------- + 3 files changed, 96 insertions(+), 66 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f4b94d2..33b2c26 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 2.8.12) + + if(COMMAND cmake_policy) + cmake_policy(SET CMP0003 NEW) +@@ -49,6 +49,8 @@ set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) + # set output path for tests + set(TEST_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/test) + ++option(BUILD_SHARED_LIBS "Build shared version of libs" ON) ++option(WITH_HDF5 "Build hdf5 library" OFF) + option(BUILD_C_BINDINGS "Build C bindings" ON) + option(BUILD_PYTHON_BINDINGS "Build Python bindings" ON) + option(BUILD_MATLAB_BINDINGS "Build Matlab bindings" ON) +@@ -146,8 +148,9 @@ if (BUILD_CUDA_LIB) + endif(CUDA_FOUND) + endif(BUILD_CUDA_LIB) + +-find_package(PkgConfig REQUIRED) +-pkg_check_modules(LZ4 REQUIRED liblz4) ++find_package(PkgConfig) ++find_package(lz4 CONFIG REQUIRED) ++set(PKG_EXTERNAL_DEPS "${PKG_EXTERNAL_DEPS} liblz4") + + #set the C/C++ include path to the "include" directory + include_directories(BEFORE ${PROJECT_SOURCE_DIR}/src/cpp) +diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in +index 6b95a71..e8bb3f7 100644 +--- a/cmake/Config.cmake.in ++++ b/cmake/Config.cmake.in +@@ -1,5 +1,11 @@ + @PACKAGE_INIT@ + ++# Get definition of 'find_dependency' macro ++include(CMakeFindDependencyMacro) ++# Find lz4. This will create 'lz4::lz4' target ++find_dependency(lz4) ++@CMAKE_EXTERNAL_DEPS@ ++ + include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake") + check_required_components("flann") + +diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt +index b421abb..474cd7e 100644 +--- a/src/cpp/CMakeLists.txt ++++ b/src/cpp/CMakeLists.txt +@@ -8,13 +8,7 @@ file(GLOB_RECURSE C_SOURCES flann.cpp) + file(GLOB_RECURSE CPP_SOURCES flann_cpp.cpp) + file(GLOB_RECURSE CU_SOURCES *.cu) + +-add_library(flann_cpp_s STATIC ${CPP_SOURCES}) +-target_link_libraries(flann_cpp_s ${LZ4_LIBRARIES}) +-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG) +- set_target_properties(flann_cpp_s PROPERTIES COMPILE_FLAGS -fPIC) +-endif() +-set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC FLANN_USE_CUDA) +- ++#Set flags if we build CUDA versions + if (BUILD_CUDA_LIB) + SET(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-DFLANN_USE_CUDA") + if(CMAKE_COMPILER_IS_GNUCC) +@@ -25,75 +19,93 @@ if (BUILD_CUDA_LIB) + else() + set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};" ) + endif() +- cuda_add_library(flann_cuda_s STATIC ${CU_SOURCES}) +- set_property(TARGET flann_cuda_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC) + endif() + +-if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC) +- add_library(flann_cpp SHARED "") +- set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX) +- target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive) ++if(NOT BUILD_SHARED_LIBS) ++ add_library(flann_cpp_s STATIC ${CPP_SOURCES}) ++ target_link_libraries(flann_cpp_s PUBLIC lz4::lz4) ++ set_property(TARGET flann_cpp_s PROPERTY OUTPUT_NAME flann_cpp) ++ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG) ++ set_target_properties(flann_cpp_s PROPERTIES COMPILE_FLAGS -fPIC) ++ endif() ++ ++ if (BUILD_CUDA_LIB) ++ cuda_add_library(flann_cuda_s STATIC ${CU_SOURCES}) ++ target_link_libraries(flann_cuda_s lz4::lz4) ++ set_property(TARGET flann_cuda_s PROPERTY OUTPUT_NAME flann_cuda) ++ set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC FLANN_USE_CUDA) ++ endif() ++endif() + +- if (BUILD_CUDA_LIB) +- cuda_add_library(flann_cuda SHARED "") ++if(BUILD_SHARED_LIBS) ++ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC) ++ add_library(flann_cpp SHARED ${CPP_SOURCES}) ++ set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX) ++ target_link_libraries(flann_cpp PUBLIC lz4::lz4) ++ if (BUILD_CUDA_LIB) ++ cuda_add_library(flann_cuda SHARED ${CU_SOURCES}) + set_target_properties(flann_cuda PROPERTIES LINKER_LANGUAGE CXX) +- target_link_libraries(flann_cuda -Wl,-whole-archive flann_cuda_s -Wl,-no-whole-archive) +- set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA) +- # target_link_libraries(flann_cuda cudpp_x86_64) +- endif() +-else() +- add_library(flann_cpp SHARED ${CPP_SOURCES}) +- target_link_libraries(flann_cpp -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) +- # export lz4 headers, so that MSVC to creates flann_cpp.lib +- set_target_properties(flann_cpp PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS YES) +- if (BUILD_CUDA_LIB) +- cuda_add_library(flann_cuda SHARED ${CPP_SOURCES}) + set_property(TARGET flann_cpp PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA) +- endif() +-endif() +- +-set_target_properties(flann_cpp PROPERTIES +- VERSION ${FLANN_VERSION} +- SOVERSION ${FLANN_SOVERSION} +- DEFINE_SYMBOL FLANN_EXPORTS +-) +- +-if (BUILD_CUDA_LIB) +- set_target_properties(flann_cuda PROPERTIES +- VERSION ${FLANN_VERSION} +- SOVERSION ${FLANN_SOVERSION} +- DEFINE_SYMBOL FLANN_EXPORTS +- ) ++ endif() ++ else() ++ add_library(flann_cpp SHARED ${CPP_SOURCES}) ++ target_link_libraries(flann_cpp PUBLIC lz4::lz4) ++ # export lz4 headers, so that MSVC to creates flann_cpp.lib ++ set_target_properties(flann_cpp PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS YES) ++ if (BUILD_CUDA_LIB) ++ cuda_add_library(flann_cuda SHARED ${CU_SOURCES}) ++ target_link_libraries(flann_cuda lz4::lz4) ++ set_property(TARGET flann_cpp PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA) ++ endif() ++ endif() ++ ++ set_target_properties(flann_cpp PROPERTIES ++ VERSION ${FLANN_VERSION} ++ SOVERSION ${FLANN_SOVERSION} ++ DEFINE_SYMBOL FLANN_EXPORTS ++ ) ++ ++ if (BUILD_CUDA_LIB) ++ set_target_properties(flann_cuda PROPERTIES ++ VERSION ${FLANN_VERSION} ++ SOVERSION ${FLANN_SOVERSION} ++ DEFINE_SYMBOL FLANN_EXPORTS ++ ) ++ endif() + endif() + +- + if (USE_MPI AND HDF5_IS_PARALLEL) +- add_executable(flann_mpi_server flann/mpi/flann_mpi_server.cpp) +- target_link_libraries(flann_mpi_server flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES}) ++ if(BUILD_SHARED_LIBS) ++ add_executable(flann_mpi_server flann/mpi/flann_mpi_server.cpp) ++ target_link_libraries(flann_mpi_server flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES}) + +- add_executable(flann_mpi_client flann/mpi/flann_mpi_client.cpp) +- target_link_libraries(flann_mpi_client flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES}) ++ add_executable(flann_mpi_client flann/mpi/flann_mpi_client.cpp) ++ target_link_libraries(flann_mpi_client flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES}) + +- install (TARGETS flann_mpi_client flann_mpi_server +- DESTINATION bin) ++ install (TARGETS flann_mpi_client flann_mpi_server ++ DESTINATION bin) ++ endif() + endif() + +- + if (BUILD_C_BINDINGS) ++ if(NOT BUILD_SHARED_LIBS) + add_library(flann_s STATIC ${C_SOURCES}) +- target_link_libraries(flann_s -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) ++ target_link_libraries(flann_s PUBLIC lz4::lz4) ++ set_property(TARGET flann_s PROPERTY OUTPUT_NAME flann) + if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG) + set_target_properties(flann_s PROPERTIES COMPILE_FLAGS -fPIC) + endif() + set_property(TARGET flann_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC) +- ++ endif() ++ ++ if(BUILD_SHARED_LIBS) + if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC) +- add_library(flann SHARED "") ++ add_library(flann SHARED ${C_SOURCES}) ++ target_link_libraries(flann PUBLIC lz4::lz4) + set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX) +- target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive) + else() + add_library(flann SHARED ${C_SOURCES}) +- target_link_libraries(flann -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) ++ target_link_libraries(flann PUBLIC lz4::lz4) + + if(MINGW AND OPENMP_FOUND) + target_link_libraries(flann gomp) +@@ -105,20 +117,31 @@ if (BUILD_C_BINDINGS) + SOVERSION ${FLANN_SOVERSION} + DEFINE_SYMBOL FLANN_EXPORTS + ) ++ endif() + endif() + + if(WIN32) +-if (BUILD_C_BINDINGS AND BUILD_MATLAB_BINDINGS) +- install ( +- TARGETS flann +- RUNTIME DESTINATION share/flann/matlab +- ) +-endif() ++ if (BUILD_C_BINDINGS AND BUILD_MATLAB_BINDINGS) ++ install ( ++ TARGETS flann ++ RUNTIME DESTINATION share/flann/matlab ++ ) ++ endif() + endif(WIN32) + ++if(NOT BUILD_SHARED_LIBS) ++ list(APPEND FLANN_TARGETS_CPP "flann_cpp_s") ++ list(APPEND FLANN_TARGETS_C "flann_s") ++ list(APPEND FLANN_TARGETS_CUDA "flann_cuda_s") ++endif() ++if(BUILD_SHARED_LIBS) ++ list(APPEND FLANN_TARGETS_CPP "flann_cpp") ++ list(APPEND FLANN_TARGETS_C "flann") ++ list(APPEND FLANN_TARGETS_CUDA "flann_cuda") ++endif() + + install ( +- TARGETS flann_cpp flann_cpp_s ++ TARGETS ${FLANN_TARGETS_CPP} + EXPORT ${targets_export_name} + INCLUDES DESTINATION include + RUNTIME DESTINATION bin +@@ -128,7 +151,7 @@ install ( + + if (BUILD_CUDA_LIB) + install ( +- TARGETS flann_cuda flann_cuda_s ++ TARGETS ${FLANN_TARGETS_CUDA} + EXPORT ${targets_export_name} + INCLUDES DESTINATION include + RUNTIME DESTINATION bin +@@ -139,7 +162,7 @@ endif() + + if (BUILD_C_BINDINGS) + install ( +- TARGETS flann flann_s ++ TARGETS ${FLANN_TARGETS_C} + EXPORT ${targets_export_name} + INCLUDES DESTINATION include + RUNTIME DESTINATION bin +-- +2.29.2.windows.2 + diff --git a/externals/vcpkg/ports/flann/fix-dependency-hdf5.patch b/externals/vcpkg/ports/flann/fix-dependency-hdf5.patch new file mode 100755 index 000000000..1d5e6ee01 --- /dev/null +++ b/externals/vcpkg/ports/flann/fix-dependency-hdf5.patch @@ -0,0 +1,56 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9f1dbcb74..5587c896e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -77,11 +77,19 @@ if (NOT PYTHON_EXECUTABLE) + endif() + endif() + +-find_hdf5() ++if (WITH_HDF5) ++find_package(HDF5 CONFIG REQUIRED) + if (NOT HDF5_FOUND) +- message(WARNING "hdf5 library not found, some tests will not be run") ++ message(ERROR "hdf5 library not found") + else() +- include_directories(${HDF5_INCLUDE_DIR}) ++ if (TARGET hdf5::hdf5-shared) ++ link_libraries(hdf5::hdf5-shared) ++ elseif (TARGET hdf5::hdf5-static) ++ link_libraries(hdf5::hdf5-static) ++ endif() ++ set(PKG_EXTERNAL_DEPS "${PKG_EXTERNAL_DEPS} hdf5") ++ set(CMAKE_EXTERNAL_DEPS "find_dependency(HDF5)") ++endif() + endif() + + if (USE_MPI OR HDF5_IS_PARALLEL) + +diff --git a/cmake/flann_utils.cmake b/cmake/flann_utils.cmake +index 8aef8e0..747414f 100644 +--- a/cmake/flann_utils.cmake ++++ b/cmake/flann_utils.cmake +@@ -21,21 +21,8 @@ endmacro(DISSECT_VERSION) + + # workaround a FindHDF5 bug + macro(find_hdf5) +- find_package(HDF5) +- +- set( HDF5_IS_PARALLEL FALSE ) +- foreach( _dir ${HDF5_INCLUDE_DIRS} ) +- if( EXISTS "${_dir}/H5pubconf.h" ) +- file( STRINGS "${_dir}/H5pubconf.h" +- HDF5_HAVE_PARALLEL_DEFINE +- REGEX "HAVE_PARALLEL 1" ) +- if( HDF5_HAVE_PARALLEL_DEFINE ) +- set( HDF5_IS_PARALLEL TRUE ) +- endif() +- endif() +- endforeach() +- set( HDF5_IS_PARALLEL ${HDF5_IS_PARALLEL} CACHE BOOL +- "HDF5 library compiled with parallel IO support" ) ++ find_package(hdf5 CONFIG) ++ set(HDF5_IS_PARALLEL ${HDF5_ENABLE_PARALLEL}) + mark_as_advanced( HDF5_IS_PARALLEL ) + endmacro(find_hdf5) + diff --git a/externals/vcpkg/ports/flann/portfile.cmake b/externals/vcpkg/ports/flann/portfile.cmake new file mode 100755 index 000000000..ce9bb2d3b --- /dev/null +++ b/externals/vcpkg/ports/flann/portfile.cmake @@ -0,0 +1,41 @@ +#the port uses inside the CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS, which is discouraged by vcpkg. + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO flann-lib/flann + REF 1d04523268c388dabf1c0865d69e1b638c8c7d9d + SHA512 61e322222c2daa0b9677095e5ca231cba7c305ce754ad8e659eee350111c1e04351181c3af04e45ab6e5c9edea49c7b9ec6499bb0dbc080b87af36eb11c6ef7c + HEAD_REF master + PATCHES + fix-build-error.patch + fix-dependency-hdf5.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + hdf5 WITH_HDF5 + cuda BUILD_CUDA_LIB +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE + OPTIONS ${FEATURE_OPTIONS} + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF + -DBUILD_DOC=OFF + -DBUILD_PYTHON_BINDINGS=OFF + -DBUILD_MATLAB_BINDINGS=OFF + OPTIONS_DEBUG + -DCMAKE_DEBUG_POSTFIX=d +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/flann RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/flann/vcpkg.json b/externals/vcpkg/ports/flann/vcpkg.json new file mode 100755 index 000000000..782fb321b --- /dev/null +++ b/externals/vcpkg/ports/flann/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "flann", + "version-date": "2019-04-07", + "port-version": 5, + "description": "Fast Library for Approximate Nearest Neighbors", + "homepage": "https://github.com/mariusmuja/flann", + "license": "BSD-3-Clause", + "dependencies": [ + "lz4", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cuda": { + "description": "CUDA support for FLANN", + "dependencies": [ + "cuda" + ] + }, + "hdf5": { + "description": "Build with hdf5", + "dependencies": [ + "hdf5" + ] + } + } +} diff --git a/externals/vcpkg/ports/flash-runtime-extensions/README.md b/externals/vcpkg/ports/flash-runtime-extensions/README.md new file mode 100755 index 000000000..6915690e5 --- /dev/null +++ b/externals/vcpkg/ports/flash-runtime-extensions/README.md @@ -0,0 +1,2 @@ +# flash-runtime-extensions +CMake port of FlashRuntimeExtensions for vcpkg diff --git a/externals/vcpkg/ports/flash-runtime-extensions/portfile.cmake b/externals/vcpkg/ports/flash-runtime-extensions/portfile.cmake new file mode 100755 index 000000000..9275d347c --- /dev/null +++ b/externals/vcpkg/ports/flash-runtime-extensions/portfile.cmake @@ -0,0 +1,23 @@ +set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO al-sabr/FlashRuntimeExtensions + REF v2.4 + SHA512 16db340a9c8d868c64b9771e3ac9a20e775fa145f36158e798733b788fd99d1ac101bfae93b8f88b0e5a0a530e0261c1fbdf7d367031dd3108c14ee00a106c10 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") \ No newline at end of file diff --git a/externals/vcpkg/ports/flash-runtime-extensions/vcpkg.json b/externals/vcpkg/ports/flash-runtime-extensions/vcpkg.json new file mode 100755 index 000000000..0fdd91d73 --- /dev/null +++ b/externals/vcpkg/ports/flash-runtime-extensions/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "flash-runtime-extensions", + "version": "2.4", + "port-version": 1, + "description": "Adobe AIR Native Extension API for Windows/MacOS/Linux", + "homepage": "https://github.com/al-sabr/FlashRuntimeExtensions", + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/flashlight-cpu/fix-dependencies.patch b/externals/vcpkg/ports/flashlight-cpu/fix-dependencies.patch new file mode 100755 index 000000000..6d4c1b40e --- /dev/null +++ b/externals/vcpkg/ports/flashlight-cpu/fix-dependencies.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9d9eacb..b530743 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -183,7 +183,7 @@ if (FL_BUILD_CORE) + + # If cereal is found in a user-defined location, use it rather than + # downloading from source +- find_package(cereal) ++ find_package(cereal CONFIG REQUIRED) + if (NOT TARGET cereal AND NOT cereal_FOUND AND FL_BUILD_STANDALONE) + message(STATUS "cereal NOT found. Will download from source") + set(CEREAL_INSTALL_PATH ${FL_INSTALL_INC_DIR}/cereal) +@@ -206,7 +206,6 @@ if (FL_BUILD_CORE) + message(STATUS "Found cereal") + target_link_libraries(flashlight PRIVATE cereal) + endif() +- setup_install_find_module(${CMAKE_MODULE_PATH}/Findcereal.cmake) + + # -------------------- Locate Backend-specific Dependencies -------------------- + # TODO: rather than conditionally searching for backend-specific dependencies, +diff --git a/cmake/flashlightConfig.cmake.in b/cmake/flashlightConfig.cmake.in +index 00f9442..f265b8f 100644 +--- a/cmake/flashlightConfig.cmake.in ++++ b/cmake/flashlightConfig.cmake.in +@@ -36,6 +36,7 @@ if (@FL_BUILD_LIBRARIES@) + endif() + # Core dependencies + if (@FL_BUILD_CORE@) ++ find_dependency(cereal CONFIG) + find_dependency(ArrayFire 3.7.1) + endif() + if (@FL_BUILD_DISTRIBUTED@) diff --git a/externals/vcpkg/ports/flashlight-cpu/portfile.cmake b/externals/vcpkg/ports/flashlight-cpu/portfile.cmake new file mode 100755 index 000000000..cf4f1cdcc --- /dev/null +++ b/externals/vcpkg/ports/flashlight-cpu/portfile.cmake @@ -0,0 +1,88 @@ +if (EXISTS "${CURRENT_INSTALLED_DIR}/share/flashlight") + message(FATAL_ERROR "Only one of flashlight-cpu and flashlight-cuda" + "can be installed at once. Uninstall and try again:" + "\n vcpkg remove flashlight-cuda\n") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO flashlight/flashlight + REF 626914e79073c5547513de649af706f7e2b796ad # 0.3 branch tip + SHA512 a22057cfa4cfe7acd95cbc5445a30870cce3cdde89066d1d75f40be0d73b069a49e89b226fe5337488cfe5618dd25958679c0636a3e4008312f01606328becfa + HEAD_REF master + PATCHES fix-dependencies.patch +) + +################################### Build ################################### +# Default flags +set(FL_DEFAULT_VCPKG_CMAKE_FLAGS + -DFL_BUILD_TESTS=OFF + -DFL_BUILD_EXAMPLES=OFF + -DFL_BACKEND=CPU # this port is CPU-backend only + -DFL_BUILD_STANDALONE=OFF +) + +# Determine which components to build via specified feature +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + lib FL_BUILD_LIBRARIES + fl FL_BUILD_CORE + asr FL_BUILD_APP_ASR + imgclass FL_BUILD_APP_IMGCLASS + lm FL_BUILD_APP_LM + objdet FL_BUILD_APP_OBJDET +) + +# Build and install +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + ${FL_DEFAULT_VCPKG_CMAKE_FLAGS} + ${FEATURE_OPTIONS} + OPTIONS_DEBUG + -DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/flashlight + OPTIONS_RELEASE + -DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/flashlight +) +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/flashlight TARGET_PATH share/flashlight) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Binaries/tools +set(FLASHLIGHT_TOOLS "") +if ("imgclass" IN_LIST FEATURES) + list(APPEND FLASHLIGHT_TOOLS + fl_img_imagenet_resnet34 + fl_img_imagenet_eval + fl_img_imagenet_vit + ) +endif() +if ("asr" IN_LIST FEATURES) + list(APPEND FLASHLIGHT_TOOLS + fl_asr_train + fl_asr_test + fl_asr_decode + fl_asr_align + fl_asr_voice_activity_detection_ctc + fl_asr_arch_benchmark + ) +endif() +if ("lm" IN_LIST FEATURES) + list(APPEND FLASHLIGHT_TOOLS + fl_lm_dictionary_builder + fl_lm_train + fl_lm_test + ) +endif() +list(LENGTH FLASHLIGHT_TOOLS NUM_TOOLS) +if (NUM_TOOLS GREATER 0) + vcpkg_copy_tools(TOOL_NAMES ${FLASHLIGHT_TOOLS} AUTO_CLEAN) +endif() + +# Copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/flashlight-cpu/vcpkg.json b/externals/vcpkg/ports/flashlight-cpu/vcpkg.json new file mode 100755 index 000000000..03ef5e957 --- /dev/null +++ b/externals/vcpkg/ports/flashlight-cpu/vcpkg.json @@ -0,0 +1,103 @@ +{ + "name": "flashlight-cpu", + "version": "0.3", + "port-version": 3, + "description": "A C++ standalone library for machine learning. CPU backend.", + "homepage": "https://github.com/facebookresearch/flashlight", + "license": "MIT", + "supports": "!(windows | osx)", + "default-features": [ + "fl" + ], + "features": { + "asr": { + "description": "flashlight asr app", + "dependencies": [ + { + "name": "flashlight-cpu", + "features": [ + "fl", + "lib" + ] + }, + "gflags", + { + "name": "libsndfile", + "default-features": false, + "features": [ + "external-libs" + ] + } + ] + }, + "fl": { + "description": "flashlight core autograd and neural net library", + "dependencies": [ + { + "name": "arrayfire", + "features": [ + "cpu" + ] + }, + "cereal", + { + "name": "gloo", + "features": [ + "mpi" + ] + }, + "onednn", + "openmpi", + "stb" + ] + }, + "imgclass": { + "description": "flashlight image classification app", + "dependencies": [ + { + "name": "flashlight-cpu", + "features": [ + "fl", + "lib" + ] + }, + "gflags" + ] + }, + "lib": { + "description": "flashlight libraries", + "dependencies": [ + "fftw3", + "intel-mkl", + "kenlm" + ] + }, + "lm": { + "description": "flashlight lm app", + "dependencies": [ + { + "name": "flashlight-cpu", + "features": [ + "fl", + "lib" + ] + }, + "gflags" + ] + }, + "objdet": { + "description": "flashlight object detection app", + "dependencies": [ + { + "name": "flashlight-cpu", + "features": [ + "fl", + "imgclass", + "lib" + ] + }, + "gflags" + ] + } + } +} diff --git a/externals/vcpkg/ports/flashlight-cuda/portfile.cmake b/externals/vcpkg/ports/flashlight-cuda/portfile.cmake new file mode 100755 index 000000000..9935ea94e --- /dev/null +++ b/externals/vcpkg/ports/flashlight-cuda/portfile.cmake @@ -0,0 +1,87 @@ +if (EXISTS "${CURRENT_INSTALLED_DIR}/share/flashlight") + message(FATAL_ERROR "Only one of flashlight-cpu and flashlight-cuda" + "can be installed at once. Uninstall and try again:" + "\n vcpkg remove flashlight-cuda\n") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO flashlight/flashlight + REF 626914e79073c5547513de649af706f7e2b796ad # 0.3 branch tip + SHA512 a22057cfa4cfe7acd95cbc5445a30870cce3cdde89066d1d75f40be0d73b069a49e89b226fe5337488cfe5618dd25958679c0636a3e4008312f01606328becfa + HEAD_REF master +) + +################################### Build ################################### +# Default flags +set(FL_DEFAULT_VCPKG_CMAKE_FLAGS + -DFL_BUILD_TESTS=OFF + -DFL_BUILD_EXAMPLES=OFF + -DFL_BACKEND=CUDA # this port is CUDA-backend only + -DFL_BUILD_STANDALONE=OFF +) + +# Determine which components to build via specified feature +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + lib FL_BUILD_LIBRARIES + fl FL_BUILD_CORE + asr FL_BUILD_APP_ASR + imgclass FL_BUILD_APP_IMGCLASS + lm FL_BUILD_APP_LM + objdet FL_BUILD_APP_OBJDET +) + +# Build and install +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + ${FL_DEFAULT_VCPKG_CMAKE_FLAGS} + ${FEATURE_OPTIONS} + OPTIONS_DEBUG + -DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/flashlight + OPTIONS_RELEASE + -DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/flashlight +) +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/flashlight TARGET_PATH share/flashlight) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Binaries/tools +set(FLASHLIGHT_TOOLS "") +if ("imgclass" IN_LIST FEATURES) + list(APPEND FLASHLIGHT_TOOLS + fl_img_imagenet_resnet34 + fl_img_imagenet_eval + fl_img_imagenet_vit + ) +endif() +if ("asr" IN_LIST FEATURES) + list(APPEND FLASHLIGHT_TOOLS + fl_asr_train + fl_asr_test + fl_asr_decode + fl_asr_align + fl_asr_voice_activity_detection_ctc + fl_asr_arch_benchmark + ) +endif() +if ("lm" IN_LIST FEATURES) + list(APPEND FLASHLIGHT_TOOLS + fl_lm_dictionary_builder + fl_lm_train + fl_lm_test + ) +endif() +list(LENGTH FLASHLIGHT_TOOLS NUM_TOOLS) +if (NUM_TOOLS GREATER 0) + vcpkg_copy_tools(TOOL_NAMES ${FLASHLIGHT_TOOLS} AUTO_CLEAN) +endif() + +# Copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/flashlight-cuda/vcpkg.json b/externals/vcpkg/ports/flashlight-cuda/vcpkg.json new file mode 100755 index 000000000..0f0afd075 --- /dev/null +++ b/externals/vcpkg/ports/flashlight-cuda/vcpkg.json @@ -0,0 +1,101 @@ +{ + "name": "flashlight-cuda", + "version": "0.3", + "port-version": 4, + "description": "A C++ standalone library for machine learning. CUDA backend.", + "homepage": "https://github.com/facebookresearch/flashlight", + "license": "MIT", + "supports": "!(windows | osx)", + "default-features": [ + "fl" + ], + "features": { + "asr": { + "description": "flashlight asr app", + "dependencies": [ + { + "name": "flashlight-cuda", + "features": [ + "fl", + "lib" + ] + }, + "gflags", + { + "name": "libsndfile", + "default-features": false, + "features": [ + "external-libs" + ] + } + ] + }, + "fl": { + "description": "flashlight core autograd and neural net library", + "dependencies": [ + { + "name": "arrayfire", + "features": [ + "cuda" + ] + }, + "cereal", + "cuda", + "cudnn", + "nccl", + "openmpi", + "stb" + ] + }, + "imgclass": { + "description": "flashlight image classification app", + "dependencies": [ + { + "name": "flashlight-cuda", + "features": [ + "fl", + "lib" + ] + }, + "gflags" + ] + }, + "lib": { + "description": "flashlight libraries", + "dependencies": [ + "cub", + "cuda", + "fftw3", + "intel-mkl", + "kenlm" + ] + }, + "lm": { + "description": "flashlight lm app", + "dependencies": [ + { + "name": "flashlight-cuda", + "features": [ + "fl", + "lib" + ] + }, + "gflags" + ] + }, + "objdet": { + "description": "flashlight object detection app", + "dependencies": [ + { + "name": "flashlight-cuda", + "features": [ + "fl", + "imgclass", + "lib" + ] + }, + "gflags" + ] + } + } +} diff --git a/externals/vcpkg/ports/flatbuffers/fix-uwp-build.patch b/externals/vcpkg/ports/flatbuffers/fix-uwp-build.patch new file mode 100755 index 000000000..44513b9e8 --- /dev/null +++ b/externals/vcpkg/ports/flatbuffers/fix-uwp-build.patch @@ -0,0 +1,20 @@ +diff --git a/src/util.cpp b/src/util.cpp +index 3670a019..fb5d884f 100644 +--- a/src/util.cpp ++++ b/src/util.cpp +@@ -255,9 +255,15 @@ bool ReadEnvironmentVariable(const char *var_name, std::string *_value) { + #ifdef _MSC_VER + __pragma(warning(disable : 4996)); // _CRT_SECURE_NO_WARNINGS + #endif ++#if _WIN32_WINNT < 0x0A00 + auto env_str = std::getenv(var_name); + if (!env_str) return false; + if (_value) *_value = std::string(env_str); ++#else ++ //There is no support for environment variables in UWP ++ var_name; // Do nothing ++ *_value = std::string(""); ++#endif + return true; + } + diff --git a/externals/vcpkg/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch b/externals/vcpkg/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch new file mode 100755 index 000000000..8bd99db36 --- /dev/null +++ b/externals/vcpkg/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ec782239..f163b64d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -216,7 +216,7 @@ set(FlatBuffers_GRPCTest_SRCS + # source_group(Compiler FILES ${FlatBuffers_Compiler_SRCS}) + # source_group(Tests FILES ${FlatBuffers_Tests_SRCS}) + +-if(EXISTS "${CMAKE_TOOLCHAIN_FILE}") ++if(EXISTS "${CMAKE_TOOLCHAIN_FILE}" AND NOT DEFINED VCPKG_TOOLCHAIN) + # do not apply any global settings if the toolchain + # is being configured externally + message(STATUS "Using toolchain file: ${CMAKE_TOOLCHAIN_FILE}.") diff --git a/externals/vcpkg/ports/flatbuffers/no-werror.patch b/externals/vcpkg/ports/flatbuffers/no-werror.patch new file mode 100755 index 000000000..dcc5cde41 --- /dev/null +++ b/externals/vcpkg/ports/flatbuffers/no-werror.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ec782239..57566c5a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -233,13 +233,17 @@ elseif(CMAKE_COMPILER_IS_GNUCXX) + "${CMAKE_CXX_FLAGS} -std=c++0x") + endif(CYGWIN) + set(CMAKE_CXX_FLAGS +- "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror -Wextra -Werror=shadow") ++ "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Werror=shadow") + set(FLATBUFFERS_PRIVATE_CXX_FLAGS "-Wold-style-cast") + if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.4) + if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) + set(CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} -faligned-new -Werror=implicit-fallthrough=2") + endif() ++ if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0) ++ set(CMAKE_CXX_FLAGS ++ "${CMAKE_CXX_FLAGS} -Wextra") ++ endif() + set(CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} -Wunused-result -Werror=unused-result -Wunused-parameter -Werror=unused-parameter") + endif() diff --git a/externals/vcpkg/ports/flatbuffers/portfile.cmake b/externals/vcpkg/ports/flatbuffers/portfile.cmake new file mode 100755 index 000000000..ce824f022 --- /dev/null +++ b/externals/vcpkg/ports/flatbuffers/portfile.cmake @@ -0,0 +1,51 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/flatbuffers + REF v2.0.6 + SHA512 be631f34064c28d81876bf137c796e9736623cf2cc4f2a05dd45372e7195729c99fad1fa795f8ce71a408756a842edbdc0c3bc714a7cf63203a1de8681d86fb6 + HEAD_REF master + PATCHES + ignore_use_of_cmake_toolchain_file.patch + no-werror.patch + fix-uwp-build.patch +) + +set(options "") +if(VCPKG_CROSSCOMPILING) + list(APPEND options -DFLATBUFFERS_BUILD_FLATC=OFF -DFLATBUFFERS_BUILD_FLATHASH=OFF) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DFLATBUFFERS_BUILD_TESTS=OFF + -DFLATBUFFERS_BUILD_GRPCTEST=OFF + ${options} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/flatbuffers) +vcpkg_fixup_pkgconfig() + +file(GLOB flatc_path ${CURRENT_PACKAGES_DIR}/bin/flatc*) +if(flatc_path) + make_directory("${CURRENT_PACKAGES_DIR}/tools/flatbuffers") + get_filename_component(flatc_executable ${flatc_path} NAME) + file( + RENAME + ${flatc_path} + ${CURRENT_PACKAGES_DIR}/tools/flatbuffers/${flatc_executable} + ) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/flatbuffers") +else() + file(APPEND "${CURRENT_PACKAGES_DIR}/share/flatbuffers/FlatbuffersConfig.cmake" +"include(\"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}/share/flatbuffers/FlatcTargets.cmake\")\n") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/flatbuffers/vcpkg.json b/externals/vcpkg/ports/flatbuffers/vcpkg.json new file mode 100755 index 000000000..5a5545748 --- /dev/null +++ b/externals/vcpkg/ports/flatbuffers/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "flatbuffers", + "version": "2.0.6", + "description": [ + "Memory Efficient Serialization Library", + "FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility." + ], + "homepage": "https://google.github.io/flatbuffers/", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "flatbuffers", + "host": true + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/flecs/portfile.cmake b/externals/vcpkg/ports/flecs/portfile.cmake new file mode 100755 index 000000000..334b359d8 --- /dev/null +++ b/externals/vcpkg/ports/flecs/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO SanderMertens/flecs + REF v2.4.8 + SHA512 4d4ee41a457f6e13b5913bbc12f66dc9a3bcab3f39ad398da55892bb80649cf416d82255f17bbcef4fee11992028cbb2972d0e9e435435cb58a7b33ec2ebe526 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FLECS_STATIC_LIBS) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" FLECS_SHARED_LIBS) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DFLECS_STATIC_LIBS=${FLECS_STATIC_LIBS} + -DFLECS_SHARED_LIBS=${FLECS_SHARED_LIBS} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +if(FLECS_STATIC_LIBS) + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/${PORT}/bake_config.h" + "#ifndef flecs_STATIC" + "#if 0 // #ifndef flecs_STATIC" + ) +endif() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/flecs/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/flecs/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..194a66af4 --- /dev/null +++ b/externals/vcpkg/ports/flecs/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,9 @@ +_find_package(${ARGS}) + +if(TARGET flecs::flecs AND NOT TARGET flecs::flecs_static) + add_library(flecs::flecs_static INTERFACE IMPORTED) + set_target_properties(flecs::flecs_static PROPERTIES INTERFACE_LINK_LIBRARIES flecs::flecs) +elseif(TARGET flecs::flecs_static AND NOT TARGET flecs::flecs) + add_library(flecs::flecs INTERFACE IMPORTED) + set_target_properties(flecs::flecs PROPERTIES INTERFACE_LINK_LIBRARIES flecs::flecs_static) +endif() diff --git a/externals/vcpkg/ports/flecs/vcpkg.json b/externals/vcpkg/ports/flecs/vcpkg.json new file mode 100755 index 000000000..1a4caa150 --- /dev/null +++ b/externals/vcpkg/ports/flecs/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "flecs", + "version": "2.4.8", + "description": "A fast entity component system (ECS) for C & C++", + "homepage": "https://github.com/SanderMertens/flecs", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/flint/fix-cmakelists.patch b/externals/vcpkg/ports/flint/fix-cmakelists.patch new file mode 100755 index 000000000..0111a0dd3 --- /dev/null +++ b/externals/vcpkg/ports/flint/fix-cmakelists.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2616d06..4be28ac 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,10 +34,11 @@ find_package(MPFR REQUIRED) + if (WITH_NTL) + find_package(NTL REQUIRED) + endif() +-find_package(PythonInterp REQUIRED) + ++if(WITH_CBLAS) + find_package(CBLAS) + set(FLINT_USES_BLAS ${CBLAS_FOUND}) ++endif() + + if(CMAKE_BUILD_TYPE STREQUAL Debug) + set(FLINT_WANT_ASSERT ON) +@@ -47,6 +48,8 @@ endif() + + if(MSVC) + find_package(PThreads REQUIRED) ++ set(PThreads_LIBRARIES ${PThreads4W_LIBRARY}) ++ set(PThreads_INCLUDE_DIRS ${PThreads4W_INCLUDE_DIR}) + set(FLINT_USES_PTHREAD ON CACHE BOOL "Use POSIX Threads.") + else() + option(CMAKE_THREAD_PREFER_PTHREAD "Prefer pthreads" yes) diff --git a/externals/vcpkg/ports/flint/portfile.cmake b/externals/vcpkg/ports/flint/portfile.cmake new file mode 100755 index 000000000..cd8c8ed03 --- /dev/null +++ b/externals/vcpkg/ports/flint/portfile.cmake @@ -0,0 +1,37 @@ +set(FLINT_VERSION 2.8.0) +set(FLINT_HASH "916285d13a55d12a041236195a9d7bbc5c1c3c30c3aa2f169efee6063b800d34f96ad3235f1c77285b04305ce685e5890169c984108d50d0c9ee7a77c3f6e73d") + +vcpkg_download_distfile(ARCHIVE + URLS "http://www.flintlib.org/flint-${FLINT_VERSION}.zip" + FILENAME "flint-${FLINT_VERSION}.zip" + SHA512 ${FLINT_HASH} +) + +vcpkg_find_acquire_program(PYTHON3) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + fix-cmakelists.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DPYTHON_EXECUTABLE=${PYTHON3} + -DWITH_NTL=OFF + -DWITH_CBLAS=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/flint/flint-config.h" + "#elif defined(MSC_USE_DLL)" "#elif 1" + ) +endif() + +file(INSTALL "${SOURCE_PATH}/gpl-2.0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/flint/vcpkg.json b/externals/vcpkg/ports/flint/vcpkg.json new file mode 100755 index 000000000..9c85c6007 --- /dev/null +++ b/externals/vcpkg/ports/flint/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "flint", + "version-semver": "2.8.0", + "port-version": 1, + "description": "Fast Library for Number Theory", + "homepage": "https://www.flintlib.org/", + "supports": "!uwp", + "dependencies": [ + "gettimeofday", + "gmp", + "mpfr", + { + "name": "pthreads", + "platform": "windows" + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/fltk/config-path.patch b/externals/vcpkg/ports/fltk/config-path.patch new file mode 100755 index 000000000..946f4462b --- /dev/null +++ b/externals/vcpkg/ports/fltk/config-path.patch @@ -0,0 +1,13 @@ +diff --git a/CMake/setup.cmake b/CMake/setup.cmake +index 60b7da1..6831d29 100644 +--- a/CMake/setup.cmake ++++ b/CMake/setup.cmake +@@ -65,6 +65,8 @@ else () + set (FLTK_CONFIG_PATH ${FLTK_DATADIR}/fltk) + endif (WIN32 AND NOT CYGWIN) + ++set(FLTK_CONFIG_PATH share/fltk) ++ + include(TestBigEndian) + TEST_BIG_ENDIAN(WORDS_BIGENDIAN) + diff --git a/externals/vcpkg/ports/fltk/findlibsfix.patch b/externals/vcpkg/ports/fltk/findlibsfix.patch new file mode 100755 index 000000000..80cfa7fa0 --- /dev/null +++ b/externals/vcpkg/ports/fltk/findlibsfix.patch @@ -0,0 +1,47 @@ +diff --git a/CMake/resources.cmake b/CMake/resources.cmake +index 57173f2..149aa62 100644 +--- a/CMake/resources.cmake ++++ b/CMake/resources.cmake +@@ -52,10 +52,8 @@ include (FindPkgConfig) + fl_find_header (HAVE_ALSA_ASOUNDLIB_H alsa/asoundlib.h) + fl_find_header (HAVE_DLFCN_H dlfcn.h) + fl_find_header (HAVE_GL_GLU_H GL/glu.h) +-fl_find_header (HAVE_LIBPNG_PNG_H libpng/png.h) + fl_find_header (HAVE_LOCALE_H locale.h) + fl_find_header (HAVE_OPENGL_GLU_H OpenGL/glu.h) +-fl_find_header (HAVE_PNG_H png.h) + fl_find_header (HAVE_STDIO_H stdio.h) + fl_find_header (HAVE_STRINGS_H strings.h) + fl_find_header (HAVE_SYS_SELECT_H sys/select.h) +@@ -64,6 +62,17 @@ fl_find_header (HAVE_SYS_STDTYPES_H sys/stdtypes.h) + fl_find_header (HAVE_X11_XREGION_H "X11/Xlib.h;X11/Xregion.h") + fl_find_header (HAVE_XDBE_H "X11/Xlib.h;X11/extensions/Xdbe.h") + ++find_package(PNG REQUIRED) ++if(PNG_FOUND) ++ set(LIB_png ${PNG_LIBRARIES}) ++ set(HAVE_PNG_H ${PNG_FOUND}) ++ ++endif() ++find_package(ZLIB REQUIRED) ++if(ZLIB_FOUND) ++ set(LIB_zlib ${ZLIB_LIBRARIES}) ++endif() ++ + if (WIN32 AND NOT CYGWIN) + # we don't use pthreads on Windows (except for Cygwin, see options.cmake) + set (HAVE_PTHREAD_H 0) +@@ -171,12 +180,10 @@ find_library (LIB_GL GL) + find_library (LIB_MesaGL MesaGL) + find_library (LIB_GLEW GLEW) + find_library (LIB_jpeg jpeg) +-find_library (LIB_png png) +-find_library (LIB_zlib z) + + mark_as_advanced (LIB_dl LIB_fontconfig LIB_freetype) + mark_as_advanced (LIB_GL LIB_MesaGL LIB_GLEW) +-mark_as_advanced (LIB_jpeg LIB_png LIB_zlib) ++mark_as_advanced (LIB_jpeg) + + ####################################################################### + # functions diff --git a/externals/vcpkg/ports/fltk/fix-system-link.patch b/externals/vcpkg/ports/fltk/fix-system-link.patch new file mode 100755 index 000000000..45a4c3521 --- /dev/null +++ b/externals/vcpkg/ports/fltk/fix-system-link.patch @@ -0,0 +1,16 @@ +diff --git a/CMake/fl_add_library.cmake b/CMake/fl_add_library.cmake +index 6fa2fc5..e5ba493 100644 +--- a/CMake/fl_add_library.cmake ++++ b/CMake/fl_add_library.cmake +@@ -38,6 +38,11 @@ macro (FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES) + add_library(${TARGET_NAME} ${LIBTYPE} ${LIBFILES}) + + target_include_directories(${TARGET_NAME} PUBLIC $) ++ ++ if (APPLE) ++ find_library(Cocoa Cocoa) ++ target_link_libraries(${TARGET_NAME} $<$:${Cocoa}>) ++ endif() + + # target properties for all libraries + diff --git a/externals/vcpkg/ports/fltk/include.patch b/externals/vcpkg/ports/fltk/include.patch new file mode 100755 index 000000000..d460134dc --- /dev/null +++ b/externals/vcpkg/ports/fltk/include.patch @@ -0,0 +1,13 @@ +diff --git a/CMake/fl_add_library.cmake b/CMake/fl_add_library.cmake +index 29baa95..6fa2fc5 100644 +--- a/CMake/fl_add_library.cmake ++++ b/CMake/fl_add_library.cmake +@@ -36,6 +36,8 @@ macro (FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES) + endif (MSVC) + + add_library(${TARGET_NAME} ${LIBTYPE} ${LIBFILES}) ++ ++ target_include_directories(${TARGET_NAME} PUBLIC $) + + # target properties for all libraries + diff --git a/externals/vcpkg/ports/fltk/portfile.cmake b/externals/vcpkg/ports/fltk/portfile.cmake new file mode 100755 index 000000000..d43a8fcb5 --- /dev/null +++ b/externals/vcpkg/ports/fltk/portfile.cmake @@ -0,0 +1,86 @@ +# FLTK has many improperly shared global variables that get duplicated into every DLL +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO fltk/fltk + REF release-1.3.8 + SHA512 197848d3b80a65cca936daf4f0b74609f0fe8332a4cd11af53385fb2aa45ad698b1e239a48732b118cd3cb189bc531711b72fb2eeeb85be887dc6c5a558fa4b3 + PATCHES + findlibsfix.patch + config-path.patch + include.patch + fix-system-link.patch +) + +if (VCPKG_TARGET_ARCHITECTURE MATCHES "arm" OR VCPKG_TARGET_ARCHITECTURE MATCHES "arm64") + set(OPTION_USE_GL "-DOPTION_USE_GL=OFF") +else() + set(OPTION_USE_GL "-DOPTION_USE_GL=ON") +endif() + +set(fluid_path_param "") +if(VCPKG_CROSSCOMPILING) + set(fluid_path_param "-DFLUID_PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/fltk/fluid${VCPKG_HOST_EXECUTABLE_SUFFIX}") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DFLTK_BUILD_TEST=OFF + -DOPTION_LARGE_FILE=ON + -DOPTION_USE_THREADS=ON + -DOPTION_USE_SYSTEM_ZLIB=ON + -DOPTION_USE_SYSTEM_LIBPNG=ON + -DOPTION_USE_SYSTEM_LIBJPEG=ON + -DOPTION_BUILD_SHARED_LIBS=OFF + -DFLTK_CONFIG_PATH=share/fltk + ${fluid_path_param} + ${OPTION_USE_GL} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +vcpkg_copy_pdbs() + +# don't install fluid +if(VCPKG_CROSSCOMPILING) + if(NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_copy_tools(TOOL_NAMES fltk-config AUTO_CLEAN) + endif() +elseif(VCPKG_TARGET_IS_OSX) + vcpkg_copy_tools(TOOL_NAMES fluid.app fltk-config AUTO_CLEAN) +elseif(VCPKG_TARGET_IS_WINDOWS) + file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/fltk-config" "${CURRENT_PACKAGES_DIR}/debug/bin/fltk-config") + vcpkg_copy_tools(TOOL_NAMES fluid AUTO_CLEAN) +else() + vcpkg_copy_tools(TOOL_NAMES fluid fltk-config AUTO_CLEAN) +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/fltk/fltk-config") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/fltk/fltk-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/bin" + "${CURRENT_PACKAGES_DIR}/bin" + ) +endif() +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +foreach(FILE Fl_Export.H fl_utf8.h) + if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/FL/${FILE}" "defined(FL_DLL)" "0") + else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/FL/${FILE}" "defined(FL_DLL)" "1") + endif() +endforeach() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fltk/UseFLTK.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel;${SOURCE_PATH}" [[${CMAKE_CURRENT_LIST_DIR}/../../include]]) + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/fltk/vcpkg.json b/externals/vcpkg/ports/fltk/vcpkg.json new file mode 100755 index 000000000..ada834120 --- /dev/null +++ b/externals/vcpkg/ports/fltk/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "fltk", + "version": "1.3.8", + "port-version": 2, + "description": "FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation.", + "homepage": "https://www.fltk.org/", + "supports": "!uwp", + "dependencies": [ + { + "name": "fltk", + "host": true + }, + "libjpeg-turbo", + "libpng", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/fluidlite/portfile.cmake b/externals/vcpkg/ports/fluidlite/portfile.cmake new file mode 100755 index 000000000..8e99d8f01 --- /dev/null +++ b/externals/vcpkg/ports/fluidlite/portfile.cmake @@ -0,0 +1,33 @@ +if(EXISTS "${CURRENT_INSTALLED_DIR}/include/fluidsynth/settings.h") + message(FATAL_ERROR "Can't build fluidlite if fluidsynth is installed. Please remove fluidsynth, and try to install fluidlite again if you need it.") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO divideconcept/FluidLite + REF fdd05bad03cdb24d1f78b5fe3453842890c1b0e8 + SHA512 8118bec2cb5ee48b8064ed2111610f1917ee8e6f1dc213121b2311d056da21d7f618ef50735e7653d2cccf1e96652f3ccf026101fccb9863448008918add53e0 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FLUIDLITE_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" FLUIDLITE_BUILD_SHARED) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DFLUIDLITE_BUILD_STATIC=${FLUIDLITE_BUILD_STATIC} + -DFLUIDLITE_BUILD_SHARED=${FLUIDLITE_BUILD_SHARED} + -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON +) + +vcpkg_install_cmake() + +# Remove unnecessary files +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/fluidlite/vcpkg.json b/externals/vcpkg/ports/fluidlite/vcpkg.json new file mode 100755 index 000000000..ea960e89b --- /dev/null +++ b/externals/vcpkg/ports/fluidlite/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "fluidlite", + "version-string": "2020-08-27", + "port-version": 2, + "description": "FluidLite is a very light version of FluidSynth designed to be hardware, platform and external dependency independant.", + "homepage": "https://github.com/divideconcept/FluidLite" +} diff --git a/externals/vcpkg/ports/fluidsynth/fix-dependencies.patch b/externals/vcpkg/ports/fluidsynth/fix-dependencies.patch new file mode 100755 index 000000000..fd2e94824 --- /dev/null +++ b/externals/vcpkg/ports/fluidsynth/fix-dependencies.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e4ea71c..df37028 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -517,8 +517,9 @@ else(NOT enable-pkgconfig) + find_package ( PkgConfig REQUIRED ) + + # Mandatory libraries: glib and gthread +- pkg_check_modules ( GLIB REQUIRED glib-2.0>=2.6.5 gthread-2.0>=2.6.5 ) ++ pkg_check_modules ( GLIB IMPORTED_TARGET REQUIRED glib-2.0>=2.6.5 gthread-2.0>=2.6.5 ) + list( APPEND PC_REQUIRES_PRIV "glib-2.0" "gthread-2.0") ++ set(GLIB_LIBRARIES PkgConfig::GLIB) + + if ( GLIB_glib-2.0_VERSION AND GLIB_glib-2.0_VERSION VERSION_LESS "2.26.0" ) + message ( WARNING "Your version of glib is very old. This may cause problems with fluidsynth's sample cache on Windows. Consider updating to glib 2.26 or newer!" ) diff --git a/externals/vcpkg/ports/fluidsynth/portfile.cmake b/externals/vcpkg/ports/fluidsynth/portfile.cmake new file mode 100755 index 000000000..e94e1852f --- /dev/null +++ b/externals/vcpkg/ports/fluidsynth/portfile.cmake @@ -0,0 +1,91 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO FluidSynth/fluidsynth + REF 8b00644751578ba67b709a827cbe5133d849d339 #v2.2.6 + SHA512 37361c6fdbb54eba78e59f03c9ca702129f0fb522721dfb4e744fdc9a8721e665728fa5606bc68c2fb2ce971b4829cfc472f0a7cd72ce3fe14b3a335b098f7ec + HEAD_REF master + PATCHES + fix-dependencies.patch + separate-gentables.patch +) + +if ("buildtools" IN_LIST FEATURES) + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/src/gentables" + LOGFILE_BASE configure-tools + ) + + vcpkg_cmake_build( + LOGFILE_BASE install-tools + TARGET install + ) + + vcpkg_copy_tools(TOOL_NAMES make_tables AUTO_CLEAN) + + vcpkg_add_to_path(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +endif() + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + sndfile enable-libsndfile +) + +set(feature_list dbus jack libinstpatch midishare opensles oboe oss sdl2 pulseaudio readline lash systemd dart) +vcpkg_list(SET FEATURE_OPTIONS) +foreach(_feature IN LISTS feature_list) + list(APPEND FEATURE_OPTIONS -Denable-${_feature}:BOOL=OFF) +endforeach() + +# enable platform-specific features, and force the build to fail if the +# required libraries are not found +list(APPEND FEATURE_OPTIONS -Denable-dsound=${VCPKG_TARGET_IS_WINDOWS}) +list(APPEND FEATURE_OPTIONS -Denable-wasapi=${VCPKG_TARGET_IS_WINDOWS}) +list(APPEND FEATURE_OPTIONS -Denable-waveout=${VCPKG_TARGET_IS_WINDOWS}) +list(APPEND FEATURE_OPTIONS -Denable-winmidi=${VCPKG_TARGET_IS_WINDOWS}) +list(APPEND FEATURE_OPTIONS -DHAVE_MMSYSTEM_H=${VCPKG_TARGET_IS_WINDOWS}) +list(APPEND FEATURE_OPTIONS -DHAVE_DSOUND_H=${VCPKG_TARGET_IS_WINDOWS}) +list(APPEND FEATURE_OPTIONS -DHAVE_WASAPI_HEADERS=${VCPKG_TARGET_IS_WINDOWS}) +list(APPEND FEATURE_OPTIONS -DHAVE_OBJBASE_H=${VCPKG_TARGET_IS_WINDOWS}) +list(APPEND FEATURE_OPTIONS -Denable-coreaudio=${VCPKG_TARGET_IS_OSX}) +list(APPEND FEATURE_OPTIONS -Denable-coremidi=${VCPKG_TARGET_IS_OSX}) +list(APPEND FEATURE_OPTIONS -DCOREAUDIO_FOUND=${VCPKG_TARGET_IS_OSX}) +list(APPEND FEATURE_OPTIONS -DCOREMIDI_FOUND=${VCPKG_TARGET_IS_OSX}) +list(APPEND FEATURE_OPTIONS -Denable-alsa=${VCPKG_TARGET_IS_LINUX}) +list(APPEND FEATURE_OPTIONS -DALSA_FOUND=${VCPKG_TARGET_IS_LINUX}) + +vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}") + +vcpkg_find_acquire_program(PKGCONFIG) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} + -DLIB_INSTALL_DIR=lib + -Denable-pkgconfig=ON + -Denable-framework=OFF # Needs system permission to install framework + OPTIONS_DEBUG + -Denable-debug:BOOL=ON + MAYBE_UNUSED_VARIABLES + enable-coreaudio + enable-coremidi + enable-dart +) + +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() + +# Copy fluidsynth.exe to tools dir +vcpkg_copy_tools(TOOL_NAMES fluidsynth AUTO_CLEAN) + +# Remove unnecessary files +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/fluidsynth/separate-gentables.patch b/externals/vcpkg/ports/fluidsynth/separate-gentables.patch new file mode 100755 index 000000000..3c018110a --- /dev/null +++ b/externals/vcpkg/ports/fluidsynth/separate-gentables.patch @@ -0,0 +1,46 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e913cb2..570207e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -268,6 +268,9 @@ generate_product_version( + ) + endif ( WIN32 ) + ++find_program(GENTABLES make_tables REQUIRED) ++execute_process(COMMAND ${GENTABLES} "${CMAKE_BINARY_DIR}/") ++ + add_library ( libfluidsynth-OBJ OBJECT + ${config_SOURCES} + ${fluid_alsa_SOURCES} +@@ -413,6 +416,7 @@ else ( MACOSX_FRAMEWORK ) + install ( FILES ${public_main_HEADER} DESTINATION ${INCLUDE_INSTALL_DIR} ) + endif ( MACOSX_FRAMEWORK ) + ++if (0) + # ******* Auto Generated Lookup Tables ****** + + include(ExternalProject) +@@ -435,3 +439,4 @@ ExternalProject_Add(gentables + INSTALL_COMMAND ${GENTAB_BDIR}/make_tables.exe "${CMAKE_BINARY_DIR}/" + ) + add_dependencies(libfluidsynth-OBJ gentables) ++endif() +diff --git a/src/gentables/CMakeLists.txt b/src/gentables/CMakeLists.txt +index 638f299..e834e34 100644 +--- a/src/gentables/CMakeLists.txt ++++ b/src/gentables/CMakeLists.txt +@@ -15,7 +15,6 @@ project (gentables C) + set ( CMAKE_BUILD_TYPE Debug ) + + # hardcode ".exe" as suffix to the binary, else in case of cross-platform cross-compiling the calling cmake will not know the suffix used here and fail to find the binary +-set ( CMAKE_EXECUTABLE_SUFFIX ".exe" ) + + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}) +@@ -34,3 +33,5 @@ if ( WIN32 ) + else ( WIN32 ) + target_link_libraries (make_tables "m") + endif () ++ ++install(TARGETS make_tables DESTINATION bin) +\ No newline at end of file diff --git a/externals/vcpkg/ports/fluidsynth/vcpkg.json b/externals/vcpkg/ports/fluidsynth/vcpkg.json new file mode 100755 index 000000000..499513780 --- /dev/null +++ b/externals/vcpkg/ports/fluidsynth/vcpkg.json @@ -0,0 +1,43 @@ +{ + "name": "fluidsynth", + "version": "2.2.6", + "port-version": 2, + "description": "FluidSynth reads and handles MIDI events from the MIDI input device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont.", + "homepage": "https://github.com/FluidSynth/fluidsynth", + "license": "LGPL-2.1-or-later", + "dependencies": [ + { + "name": "alsa", + "platform": "linux" + }, + { + "name": "fluidsynth", + "host": true, + "features": [ + "buildtools" + ] + }, + "glib", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "buildtools": { + "description": "Build tools gentables" + }, + "sndfile": { + "description": "Enable rendering to file and SF3 support", + "dependencies": [ + { + "name": "libsndfile", + "default-features": false, + "features": [ + "external-libs" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/fmem/portfile.cmake b/externals/vcpkg/ports/fmem/portfile.cmake new file mode 100755 index 000000000..36e4e45f3 --- /dev/null +++ b/externals/vcpkg/ports/fmem/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO c-libs/fmem + REF 2ccee3d2fb2fc72370a9bb2131bfc9167e0d9022 + SHA512 4a63332eb5df7f30bdad9e4233171b5c21dd2b092e525e9dcc4f602295ffff50c555c80fd74d964bc3daeffd8001a9b852f1769ef3161259dd8a3cae3ca3a4df + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fmem RENAME copyright) diff --git a/externals/vcpkg/ports/fmem/vcpkg.json b/externals/vcpkg/ports/fmem/vcpkg.json new file mode 100755 index 000000000..17d54850a --- /dev/null +++ b/externals/vcpkg/ports/fmem/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "fmem", + "version-string": "c-libs-2ccee3d2fb", + "port-version": 1, + "description": "A cross-platform library for opening memory-backed libc streams." +} diff --git a/externals/vcpkg/ports/fmi4cpp/portfile.cmake b/externals/vcpkg/ports/fmi4cpp/portfile.cmake new file mode 100755 index 000000000..32a3e220f --- /dev/null +++ b/externals/vcpkg/ports/fmi4cpp/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO NTNU-IHB/FMI4cpp + REF 0.8.0 + SHA512 547f61dfbd57593ff8839fbed3f8a5624551ee4be5e0dd7773384a869086af8a4483cfe17dc087e3f03c9ea2038b537c8c4998a405687c1a353d08e52dac411e + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DFMI4CPP_BUILD_TESTS=OFF + -DFMI4CPP_BUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/fmi4cpp/vcpkg.json b/externals/vcpkg/ports/fmi4cpp/vcpkg.json new file mode 100755 index 000000000..399c65f1f --- /dev/null +++ b/externals/vcpkg/ports/fmi4cpp/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "fmi4cpp", + "version": "0.8.0", + "description": "FMI 2.0 implementation written in modern C++", + "homepage": "https://github.com/NTNU-IHB/FMI4cpp", + "dependencies": [ + "boost-property-tree", + { + "name": "libzip", + "features": [ + "openssl" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/fmilib/0001-remove-install-prefix.patch b/externals/vcpkg/ports/fmilib/0001-remove-install-prefix.patch new file mode 100755 index 000000000..42ba75701 --- /dev/null +++ b/externals/vcpkg/ports/fmilib/0001-remove-install-prefix.patch @@ -0,0 +1,48 @@ +From 04bb359c724308e30268840c64932ea1d05b9077 Mon Sep 17 00:00:00 2001 +From: Nicole Mazzuca +Date: Wed, 23 Sep 2020 10:00:23 -0700 +Subject: [PATCH 1/2] remove install prefix + +--- + CMakeLists.txt | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f7372bf..f3c11f1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,7 +26,6 @@ set(FMILIBRARYHOME ${FMILibrary_SOURCE_DIR}) + set(FMILIBRARYBUILD ${FMILibrary_BINARY_DIR}) + + # User configuration options and parameters +-SET(FMILIB_INSTALL_PREFIX ${FMILibrary_BINARY_DIR}/../install CACHE PATH "Prefix prepended to install directories") + set(FMILIB_THIRDPARTYLIBS ${FMILibrary_SOURCE_DIR}/ThirdParty CACHE PATH "Path to the ThirdParty library dir" ) + set(FMILIB_FMI_STANDARD_HEADERS ${FMILIB_THIRDPARTYLIBS}/FMI/default CACHE PATH "Path to the FMI standard headers dir" ) + +@@ -84,7 +83,6 @@ IF(NOT CMAKE_BUILD_TYPE) + SET(CMAKE_BUILD_TYPE ${FMILIB_DEFAULT_BUILD_TYPE}) + ENDIF(NOT CMAKE_BUILD_TYPE) + +-SET(CMAKE_INSTALL_PREFIX ${FMILIB_INSTALL_PREFIX} CACHE INTERNAL "Prefix prepended to install directories" FORCE) + + # debug_message is used to trace the build script + function(debug_message) +@@ -350,7 +348,6 @@ endfunction() + + if(FMILIB_GENERATE_DOXYGEN_DOC) + +- file(MAKE_DIRECTORY "${FMILIB_INSTALL_PREFIX}/doc") + + set(DOXYFILE_IN ${FMILIBRARYHOME}/Config.cmake/fmilib_doxydoc.conf CACHE INTERNAL "Doxygen config file") + set(DOXYFILE_IMAGE_DIR "${FMILIBRARYHOME}/images" CACHE INTERNAL "Doxygen images" FORCE) +@@ -372,7 +369,6 @@ if(FMILIB_GENERATE_DOXYGEN_DOC) + set(DOXYFILE_SOURCE_DIR "${FMILIBRARYBUILD}/doc" CACHE INTERNAL "Doxygen default source dir" FORCE) + set(DOXYFILE_EXTRA_SOURCES "${DOXYFILE_EXTRA_SOURCES} \"${FMILIBRARYHOME}/Test\"") + +- set(DOXYFILE_OUTPUT_DIR "${FMILIB_INSTALL_PREFIX}/doc") + + set(DOXYFILE_STRIP_FROM_PATH "${FMILIBRARYHOME}") + +-- +2.24.3 (Apple Git-128) + diff --git a/externals/vcpkg/ports/fmilib/0002-include-sys-stat.h-for-mkdir.patch b/externals/vcpkg/ports/fmilib/0002-include-sys-stat.h-for-mkdir.patch new file mode 100755 index 000000000..a39617e47 --- /dev/null +++ b/externals/vcpkg/ports/fmilib/0002-include-sys-stat.h-for-mkdir.patch @@ -0,0 +1,20 @@ +From 080876bf3735efeedaab0b211d2be7b3c3524d97 Mon Sep 17 00:00:00 2001 +From: Nicole Mazzuca +Date: Wed, 23 Sep 2020 10:03:30 -0700 +Subject: [PATCH 2/2] include sys/stat.h for mkdir + +--- + ThirdParty/Minizip/minizip/miniunz.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/ThirdParty/Minizip/minizip/miniunz.c b/ThirdParty/Minizip/minizip/miniunz.c +index 2264705..e0167d5 100644 +--- a/ThirdParty/Minizip/minizip/miniunz.c ++++ b/ThirdParty/Minizip/minizip/miniunz.c +@@ -53,5 +53,6 @@ + #else + # include + # include ++# include + #endif + diff --git a/externals/vcpkg/ports/fmilib/portfile.cmake b/externals/vcpkg/ports/fmilib/portfile.cmake new file mode 100755 index 000000000..6164254aa --- /dev/null +++ b/externals/vcpkg/ports/fmilib/portfile.cmake @@ -0,0 +1,67 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_download_distfile(ARCHIVE + URLS "https://jmodelica.org/fmil/FMILibrary-2.0.3-src.zip" + FILENAME "FMILibrary-2.0.3-src.zip" + SHA512 86e4b5019d8f2a76b01141411845d977fb3949617604de0b34351f23647e3e8b378477de184e1c4f2f59297bc4c7de3155e0edba9099b8924594a36b37b04cc8 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + 0001-remove-install-prefix.patch + 0002-include-sys-stat.h-for-mkdir.patch +) + +# Note that if you have configured and built both static and shared library on Windows +# but want to link with the static library compile time define "FMILIB_BUILDING_LIBRARY" must be set. +if ((NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") AND VCPKG_LIBRARY_LINKAGE STREQUAL static) + SET(FMILIB_BUILDING_LIBRARY ON) +else() + SET(FMILIB_BUILDING_LIBRARY OFF) +endif() + +# Use static run-time libraries (/MT or /MTd code generation flags) +# This is only used when generating Microsoft Visual Studio solutions. If the options is on then the library will +# be built against static runtime, otherwise - dynamic runtime (/MD or /MDd). Make sure the client code is using +# matching runtime +if ((NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") AND VCPKG_CRT_LINKAGE STREQUAL static) + SET(FMILIB_BUILD_WITH_STATIC_RTLIB ON) +else() + SET(FMILIB_BUILD_WITH_STATIC_RTLIB OFF) +endif() + +# On LINUX position independent code (-fPIC) must be used on all files to be linked into a shared library (.so file). +# On other systems this is not needed (either is default or relocation is done). Set this option to OFF if you +# are building an application on Linux and use static library only +if ((VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") AND VCPKG_LIBRARY_LINKAGE STREQUAL static) + SET(FMILIB_BUILD_FOR_SHARED_LIBS OFF) +else() + SET(FMILIB_BUILD_FOR_SHARED_LIBS ON) +endif() + +# Only build the requested library +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + SET(FMILIB_BUILD_STATIC_LIB ON) + SET(FMILIB_BUILD_SHARED_LIB OFF) +else() + SET(FMILIB_BUILD_STATIC_LIB OFF) + SET(FMILIB_BUILD_SHARED_LIB ON) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DFMILIB_BUILD_TESTS=OFF + -DFMILIB_BUILD_STATIC_LIB=${FMILIB_BUILD_STATIC_LIB} + -DFMILIB_BUILD_SHARED_LIB=${FMILIB_BUILD_SHARED_LIB} + -DFMILIB_BUILDING_LIBRARY=${FMILIB_BUILDING_LIBRARY} + -DFMILIB_BUILD_WITH_STATIC_RTLIB=${FMILIB_BUILD_WITH_STATIC_RTLIB} +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/fmilib/vcpkg.json b/externals/vcpkg/ports/fmilib/vcpkg.json new file mode 100755 index 000000000..6f0afd8aa --- /dev/null +++ b/externals/vcpkg/ports/fmilib/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "fmilib", + "version-string": "2.0.3", + "port-version": 4, + "description": "FMI library is intended as a foundation for applications interfacing FMUs (Functional Mockup Units) that follow FMI Standard. This version of the library supports FMI 1.0 and FMI2.0.", + "homepage": "https://www.fmi-standard.org/" +} diff --git a/externals/vcpkg/ports/fmt/fix-invalid-command.patch b/externals/vcpkg/ports/fmt/fix-invalid-command.patch new file mode 100755 index 000000000..c554188bd --- /dev/null +++ b/externals/vcpkg/ports/fmt/fix-invalid-command.patch @@ -0,0 +1,11 @@ +diff --git a/include/fmt/locale.h b/include/fmt/locale.h +index 7571b52..0a34eb4 100644 +--- a/include/fmt/locale.h ++++ b/include/fmt/locale.h +@@ -1,2 +1,6 @@ + #include "xchar.h" ++#ifdef _WIN32 ++#pragma message ("fmt/locale.h is deprecated, include fmt/format.h or fmt/xchar.h instead") ++#else + #warning fmt/locale.h is deprecated, include fmt/format.h or fmt/xchar.h instead ++#endif diff --git a/externals/vcpkg/ports/fmt/fix-write-batch.patch b/externals/vcpkg/ports/fmt/fix-write-batch.patch new file mode 100755 index 000000000..7c17d6037 --- /dev/null +++ b/externals/vcpkg/ports/fmt/fix-write-batch.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f21cf45..691a632 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -157,7 +157,7 @@ if (MASTER_PROJECT AND CMAKE_GENERATOR MATCHES "Visual Studio") + join(netfxpath + "C:\\Program Files\\Reference Assemblies\\Microsoft\\Framework\\" + ".NETFramework\\v4.0") +- file(WRITE run-msbuild.bat " ++ file(WRITE ${CMAKE_BINARY_DIR}/run-msbuild.bat " + ${MSBUILD_SETUP} + ${CMAKE_MAKE_PROGRAM} -p:FrameworkPathOverride=\"${netfxpath}\" %*") + endif () diff --git a/externals/vcpkg/ports/fmt/portfile.cmake b/externals/vcpkg/ports/fmt/portfile.cmake new file mode 100755 index 000000000..10362875e --- /dev/null +++ b/externals/vcpkg/ports/fmt/portfile.cmake @@ -0,0 +1,66 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO fmtlib/fmt + REF 8.1.1 + SHA512 794a47d7cb352a2a9f2c050a60a46b002e4157e5ad23e15a5afc668e852b1e1847aeee3cda79e266c789ff79310d792060c94976ceef6352e322d60b94e23189 + HEAD_REF master + PATCHES + fix-write-batch.patch + fix-invalid-command.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DFMT_CMAKE_DIR=share/fmt + -DFMT_TEST=OFF + -DFMT_DOC=OFF +) + +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/LICENSE.rst" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if(VCPKG_TARGET_IS_WINDOWS) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/fmtd.dll") + endif() + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/fmt.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/fmt.dll" "${CURRENT_PACKAGES_DIR}/bin/fmt.dll") + endif() + endif() + endif() + + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/fmt/core.h + "defined(FMT_SHARED)" + "1" + ) +endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_cmake_config_fixup() +vcpkg_fixup_pkgconfig() + +if(VCPKG_TARGET_IS_WINDOWS) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake + "lib/fmtd.dll" + "bin/fmtd.dll" + ) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-release.cmake + "lib/fmt.dll" + "bin/fmt.dll" + ) + endif() +endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle post-build CMake instructions +vcpkg_copy_pdbs() +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/fmt/usage b/externals/vcpkg/ports/fmt/usage new file mode 100755 index 000000000..e5a9d7048 --- /dev/null +++ b/externals/vcpkg/ports/fmt/usage @@ -0,0 +1,8 @@ +The package fmt provides CMake targets: + + find_package(fmt CONFIG REQUIRED) + target_link_libraries(main PRIVATE fmt::fmt) + + # Or use the header-only version + find_package(fmt CONFIG REQUIRED) + target_link_libraries(main PRIVATE fmt::fmt-header-only) diff --git a/externals/vcpkg/ports/fmt/vcpkg.json b/externals/vcpkg/ports/fmt/vcpkg.json new file mode 100755 index 000000000..7386b40b6 --- /dev/null +++ b/externals/vcpkg/ports/fmt/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "fmt", + "version": "8.1.1", + "port-version": 1, + "description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.", + "homepage": "https://github.com/fmtlib/fmt", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/folly/FindLZ4.cmake b/externals/vcpkg/ports/folly/FindLZ4.cmake new file mode 100755 index 000000000..f80962c66 --- /dev/null +++ b/externals/vcpkg/ports/folly/FindLZ4.cmake @@ -0,0 +1,13 @@ +find_path(LZ4_INCLUDE_DIR lz4.h) + +find_library(LZ4_LIBRARY_DEBUG NAMES lz4d) +find_library(LZ4_LIBRARY_RELEASE NAMES lz4) + +include(SelectLibraryConfigurations) +select_library_configurations(LZ4) + +include(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS( + LZ4 DEFAULT_MSG + LZ4_LIBRARY LZ4_INCLUDE_DIR +) diff --git a/externals/vcpkg/ports/folly/FindSnappy.cmake b/externals/vcpkg/ports/folly/FindSnappy.cmake new file mode 100755 index 000000000..253d0d84c --- /dev/null +++ b/externals/vcpkg/ports/folly/FindSnappy.cmake @@ -0,0 +1,13 @@ +find_path(SNAPPY_INCLUDE_DIR snappy.h) + +find_library(SNAPPY_LIBRARY_DEBUG NAMES snappyd) +find_library(SNAPPY_LIBRARY_RELEASE NAMES snappy) + +include(SelectLibraryConfigurations) +select_library_configurations(SNAPPY) + +include(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS( + SNAPPY DEFAULT_MSG + SNAPPY_LIBRARY SNAPPY_INCLUDE_DIR +) diff --git a/externals/vcpkg/ports/folly/boost-1.70.patch b/externals/vcpkg/ports/folly/boost-1.70.patch new file mode 100755 index 000000000..bca0c99e0 --- /dev/null +++ b/externals/vcpkg/ports/folly/boost-1.70.patch @@ -0,0 +1,22 @@ +diff --git a/folly/portability/PThread.cpp b/folly/portability/PThread.cpp +index 2126ec0..ef82ade 100644 +--- a/folly/portability/PThread.cpp ++++ b/folly/portability/PThread.cpp +@@ -20,6 +20,8 @@ + #include + #include + #include ++#include ++#include + + #include + +@@ -691,7 +693,7 @@ int pthread_setspecific(pthread_key_t key, const void* value) { + boost::detail::thread::cleanup_caller_t(), + boost::detail::thread::cleanup_func_t(), + #else +- boost::shared_ptr(), ++ 0,0, + #endif + const_cast(value), + false); diff --git a/externals/vcpkg/ports/folly/disable-non-underscore-posix-names.patch b/externals/vcpkg/ports/folly/disable-non-underscore-posix-names.patch new file mode 100755 index 000000000..ad36fad7a --- /dev/null +++ b/externals/vcpkg/ports/folly/disable-non-underscore-posix-names.patch @@ -0,0 +1,34 @@ +diff --git a/folly/portability/Windows.h b/folly/portability/Windows.h +index 86fd0f9..ccad11e 100644 +--- a/folly/portability/Windows.h ++++ b/folly/portability/Windows.h +@@ -32,24 +32,17 @@ + // disabled to ensure all of the normal names get declared properly. + #include + +-#ifndef __STDC__ +-/* nolint */ +-#define __STDC__ 1 + #pragma push_macro("_CRT_DECLARE_NONSTDC_NAMES") + #ifdef _CRT_DECLARE_NONSTDC_NAMES + #undef _CRT_DECLARE_NONSTDC_NAMES + #endif ++ ++#include + #pragma push_macro("_CRT_INTERNAL_NONSTDC_NAMES") +-#undef _CRT_INTERNAL_NONSTDC_NAMES +-#include // @manual nolint +-#include // @manual nolint +-#undef __STDC__ ++#define _CRT_INTERNAL_NONSTDC_NAMES 0 ++#include ++#include + #pragma pop_macro("_CRT_INTERNAL_NONSTDC_NAMES") +-#pragma pop_macro("_CRT_DECLARE_NONSTDC_NAMES") +-#else +-#include // @manual nolint +-#include // @manual nolint +-#endif + + #if defined(min) || defined(max) + #error Windows.h needs to be included by this header, or else NOMINMAX needs \ diff --git a/externals/vcpkg/ports/folly/fix-windows-minmax.patch b/externals/vcpkg/ports/folly/fix-windows-minmax.patch new file mode 100755 index 000000000..1fc69a43a --- /dev/null +++ b/externals/vcpkg/ports/folly/fix-windows-minmax.patch @@ -0,0 +1,12 @@ +diff --git a/CMake/FollyCompilerMSVC.cmake b/CMake/FollyCompilerMSVC.cmake +index ec2ce1a1d..16deda71c 100644 +--- a/CMake/FollyCompilerMSVC.cmake ++++ b/CMake/FollyCompilerMSVC.cmake +@@ -289,6 +289,7 @@ function(apply_folly_compile_options_to_target THETARGET) + # And the extra defines: + target_compile_definitions(${THETARGET} + PUBLIC ++ NOMINMAX + _CRT_NONSTDC_NO_WARNINGS # Don't deprecate posix names of functions. + _CRT_SECURE_NO_WARNINGS # Don't deprecate the non _s versions of various standard library functions, because safety is for chumps. + _SCL_SECURE_NO_WARNINGS # Don't deprecate the non _s versions of various standard library functions, because safety is for chumps. diff --git a/externals/vcpkg/ports/folly/portfile.cmake b/externals/vcpkg/ports/folly/portfile.cmake new file mode 100755 index 000000000..79536aae7 --- /dev/null +++ b/externals/vcpkg/ports/folly/portfile.cmake @@ -0,0 +1,94 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +# Required to run build/generate_escape_tables.py et al. +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO facebook/folly + REF v2022.03.21.00 + SHA512 4e0fda55f007179883af30024fe1d389642159b1b4c915f7ef1a3c1003c8c52e2370f53ffa79d5fa75533d33becfb946d2bcbb2abdc62b9a297f977403d13dd7 + HEAD_REF main + PATCHES + reorder-glog-gflags.patch + disable-non-underscore-posix-names.patch + boost-1.70.patch + fix-windows-minmax.patch +) + +file(COPY + "${CMAKE_CURRENT_LIST_DIR}/FindLZ4.cmake" + "${CMAKE_CURRENT_LIST_DIR}/FindSnappy.cmake" + DESTINATION "${SOURCE_PATH}/CMake/" +) +file(REMOVE "${SOURCE_PATH}/CMake/FindGFlags.cmake") + +if(VCPKG_CRT_LINKAGE STREQUAL static) + set(MSVC_USE_STATIC_RUNTIME ON) +else() + set(MSVC_USE_STATIC_RUNTIME OFF) +endif() + +set(FEATURE_OPTIONS) + +macro(feature FEATURENAME PACKAGENAME) + if("${FEATURENAME}" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_${PACKAGENAME}=OFF) + else() + list(APPEND FEATURE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_${PACKAGENAME}=ON) + endif() +endmacro() + +feature(zlib ZLIB) +feature(bzip2 BZip2) +feature(lzma LibLZMA) +feature(lz4 LZ4) +feature(zstd Zstd) +feature(snappy Snappy) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DMSVC_USE_STATIC_RUNTIME=${MSVC_USE_STATIC_RUNTIME} + -DCMAKE_DISABLE_FIND_PACKAGE_LibDwarf=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Libiberty=ON + -DCMAKE_DISABLE_FIND_PACKAGE_LibAIO=ON + -DLIBAIO_FOUND=OFF + -DLIBURCU_FOUND=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_LibURCU=ON + -DCMAKE_INSTALL_DIR=share/folly + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install(ADD_BIN_TO_PATH) + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup() + +# Release folly-targets.cmake does not link to the right libraries in debug mode. +# We substitute with generator expressions so that the right libraries are linked for debug and release. +set(FOLLY_TARGETS_CMAKE "${CURRENT_PACKAGES_DIR}/share/folly/folly-targets.cmake") +FILE(READ ${FOLLY_TARGETS_CMAKE} _contents) +string(REPLACE "\${VCPKG_IMPORT_PREFIX}/lib/zlib.lib" "ZLIB::ZLIB" _contents "${_contents}") +STRING(REPLACE "\${VCPKG_IMPORT_PREFIX}/lib/" "\${VCPKG_IMPORT_PREFIX}/\$<\$:debug/>lib/" _contents "${_contents}") +STRING(REPLACE "\${VCPKG_IMPORT_PREFIX}/debug/lib/" "\${VCPKG_IMPORT_PREFIX}/\$<\$:debug/>lib/" _contents "${_contents}") +string(REPLACE "-vc140-mt.lib" "-vc140-mt\$<\$:-gd>.lib" _contents "${_contents}") +FILE(WRITE ${FOLLY_TARGETS_CMAKE} "${_contents}") +FILE(READ "${CURRENT_PACKAGES_DIR}/share/folly/folly-config.cmake" _contents) +FILE(WRITE "${CURRENT_PACKAGES_DIR}/share/folly/folly-config.cmake" +"include(CMakeFindDependencyMacro) +find_dependency(Threads) +find_dependency(glog CONFIG) +find_dependency(gflags CONFIG REQUIRED) +find_dependency(ZLIB) +${_contents}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/folly/reorder-glog-gflags.patch b/externals/vcpkg/ports/folly/reorder-glog-gflags.patch new file mode 100755 index 000000000..38ddbc166 --- /dev/null +++ b/externals/vcpkg/ports/folly/reorder-glog-gflags.patch @@ -0,0 +1,28 @@ +diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake +index 92b8ce7..04589ed 100644 +--- a/CMake/folly-deps.cmake ++++ b/CMake/folly-deps.cmake +@@ -52,6 +52,11 @@ find_package(DoubleConversion MODULE REQUIRED) + list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY}) + list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR}) + ++find_package(Glog CONFIG REQUIRED) ++set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND}) ++list(APPEND FOLLY_LINK_LIBRARIES glog::glog) ++list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR}) ++ + find_package(Gflags MODULE) + set(FOLLY_HAVE_LIBGFLAGS ${LIBGFLAGS_FOUND}) + if(LIBGFLAGS_FOUND) +@@ -61,11 +66,6 @@ if(LIBGFLAGS_FOUND) + set(FOLLY_LIBGFLAGS_INCLUDE ${LIBGFLAGS_INCLUDE_DIR}) + endif() + +-find_package(Glog MODULE) +-set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND}) +-list(APPEND FOLLY_LINK_LIBRARIES ${GLOG_LIBRARY}) +-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR}) +- + find_package(LibEvent MODULE REQUIRED) + list(APPEND FOLLY_LINK_LIBRARIES ${LIBEVENT_LIB}) + list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR}) diff --git a/externals/vcpkg/ports/folly/vcpkg.json b/externals/vcpkg/ports/folly/vcpkg.json new file mode 100755 index 000000000..dd9c35fec --- /dev/null +++ b/externals/vcpkg/ports/folly/vcpkg.json @@ -0,0 +1,77 @@ +{ + "name": "folly", + "version-string": "2022.03.21.00", + "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", + "homepage": "https://github.com/facebook/folly", + "license": "Apache-2.0", + "supports": "(windows & x64 & !uwp) | (!windows & (x64 | arm64))", + "dependencies": [ + "boost-chrono", + "boost-context", + "boost-conversion", + "boost-crc", + "boost-date-time", + "boost-filesystem", + "boost-multi-index", + "boost-program-options", + "boost-regex", + "boost-smart-ptr", + "boost-system", + "boost-thread", + "double-conversion", + "fmt", + "gflags", + "glog", + "libevent", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "zlib" + ], + "features": { + "bzip2": { + "description": "Support bzip2 for compression", + "dependencies": [ + "bzip2" + ] + }, + "lz4": { + "description": "Support lz4 for compression", + "dependencies": [ + "lz4" + ] + }, + "lzma": { + "description": "Support LZMA for compression", + "dependencies": [ + "liblzma" + ] + }, + "snappy": { + "description": "Support Snappy for compression", + "dependencies": [ + "snappy" + ] + }, + "zlib": { + "description": "Support zlib for compression", + "dependencies": [ + "zlib" + ] + }, + "zstd": { + "description": "Support zstd for compression", + "dependencies": [ + "zstd" + ] + } + } +} diff --git a/externals/vcpkg/ports/font-chef/disable-warnings-as-errors.patch b/externals/vcpkg/ports/font-chef/disable-warnings-as-errors.patch new file mode 100755 index 000000000..31b69f82a --- /dev/null +++ b/externals/vcpkg/ports/font-chef/disable-warnings-as-errors.patch @@ -0,0 +1,12 @@ +diff --git a/src/font-chef/CMakeLists.txt b/src/font-chef/CMakeLists.txt +--- a/src/font-chef/CMakeLists.txt ++++ b/src/font-chef/CMakeLists.txt +@@ -68,7 +68,7 @@ target_include_directories(font-chef++ INTERFACE + if (NOT CMAKE_BUILD_TYPE MATCHES "Release") + target_compile_options(font-chef PRIVATE + $<$,$>:-Wall -Wextra -pedantic -fvisibility=hidden -Werror> +- $<$:/W3 /WX /wd4820 /wd4668 /wd4204> ++ $<$:/W3 /wd4820 /wd4668 /wd4204> + ) + endif() + diff --git a/externals/vcpkg/ports/font-chef/portfile.cmake b/externals/vcpkg/ports/font-chef/portfile.cmake new file mode 100755 index 000000000..304d870f4 --- /dev/null +++ b/externals/vcpkg/ports/font-chef/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mobius3/font-chef + REF v1.1.0 + SHA512 3df1e31e4405bcbb05ffed8fe618eb953498389adef3d83d337ac570644008bee031e08cd64382443ad123c4abf7e0acca5e3e16288caf6225672d6796a9494f + HEAD_REF master + PATCHES + disable-warnings-as-errors.patch # to workaround https://github.com/mobius3/font-chef/issues/3 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/font-chef/vcpkg.json b/externals/vcpkg/ports/font-chef/vcpkg.json new file mode 100755 index 000000000..a293eb6ba --- /dev/null +++ b/externals/vcpkg/ports/font-chef/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "font-chef", + "version": "1.1.0", + "description": "A font cooking library", + "homepage": "https://github.com/mobius3/font-chef", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/fontconfig/libgetopt.patch b/externals/vcpkg/ports/fontconfig/libgetopt.patch new file mode 100755 index 000000000..ced94ddb8 --- /dev/null +++ b/externals/vcpkg/ports/fontconfig/libgetopt.patch @@ -0,0 +1,130 @@ +diff --git a/fc-cache/meson.build b/fc-cache/meson.build +index 5e40fac..3c3e46b 100644 +--- a/fc-cache/meson.build ++++ b/fc-cache/meson.build +@@ -1,6 +1,7 @@ + fccache = executable('fc-cache', ['fc-cache.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], ++ dependencies: [getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/fc-cat/meson.build b/fc-cat/meson.build +index f26e4b8..476c0f9 100644 +--- a/fc-cat/meson.build ++++ b/fc-cat/meson.build +@@ -1,6 +1,7 @@ + fccat = executable('fc-cat', ['fc-cat.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], ++ dependencies: [getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/fc-conflist/meson.build b/fc-conflist/meson.build +index f543cf9..f06640b 100644 +--- a/fc-conflist/meson.build ++++ b/fc-conflist/meson.build +@@ -1,6 +1,7 @@ + fcconflist = executable('fc-conflist', ['fc-conflist.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], ++ dependencies: [getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/fc-list/meson.build b/fc-list/meson.build +index 2f679d5..4b0fb62 100644 +--- a/fc-list/meson.build ++++ b/fc-list/meson.build +@@ -1,6 +1,7 @@ + fclist = executable('fc-list', ['fc-list.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], ++ dependencies: [getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/fc-match/meson.build b/fc-match/meson.build +index aca8bc8..cab4f09 100644 +--- a/fc-match/meson.build ++++ b/fc-match/meson.build +@@ -1,6 +1,7 @@ + fcmatch = executable('fc-match', ['fc-match.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], ++ dependencies: [getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/fc-pattern/meson.build b/fc-pattern/meson.build +index 07de245..b957c67 100644 +--- a/fc-pattern/meson.build ++++ b/fc-pattern/meson.build +@@ -1,6 +1,7 @@ + fcpattern = executable('fc-pattern', ['fc-pattern.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], ++ dependencies: [getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/fc-query/meson.build b/fc-query/meson.build +index d0f2dd4..940b021 100644 +--- a/fc-query/meson.build ++++ b/fc-query/meson.build +@@ -1,7 +1,7 @@ + fcquery = executable('fc-query', ['fc-query.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], +- dependencies: [freetype_dep], ++ dependencies: [freetype_dep, getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/fc-scan/meson.build b/fc-scan/meson.build +index 4de2134..c5b2b67 100644 +--- a/fc-scan/meson.build ++++ b/fc-scan/meson.build +@@ -1,7 +1,7 @@ + fcscan = executable('fc-scan', ['fc-scan.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], +- dependencies: [freetype_dep], ++ dependencies: [freetype_dep, getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/fc-validate/meson.build b/fc-validate/meson.build +index e2b956e..8902d59 100644 +--- a/fc-validate/meson.build ++++ b/fc-validate/meson.build +@@ -1,7 +1,7 @@ + fcvalidate = executable('fc-validate', ['fc-validate.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], +- dependencies: [freetype_dep], ++ dependencies: [freetype_dep, getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/meson.build b/meson.build +index f616600..6d82a16 100644 +--- a/meson.build ++++ b/meson.build +@@ -202,6 +202,14 @@ if cc.links(files('meson-cc-tests/solaris-atomic-operations.c'), name: 'Solaris + conf.set('HAVE_SOLARIS_ATOMIC_OPS', 1) + endif + ++if host_machine.system() == 'windows' ++ conf.set('HAVE_GETOPT', 1) ++ conf.set('HAVE_GETOPT_LONG', 1) ++ getopt_dep = cc.find_library('getopt', required: true) ++else ++ getopt_dep = dependency('', required: false) ++endif ++ + + prefix = get_option('prefix') + diff --git a/externals/vcpkg/ports/fontconfig/no-etc-symlinks.patch b/externals/vcpkg/ports/fontconfig/no-etc-symlinks.patch new file mode 100755 index 000000000..275797d65 --- /dev/null +++ b/externals/vcpkg/ports/fontconfig/no-etc-symlinks.patch @@ -0,0 +1,19 @@ +--- a/conf.d/link_confs.py 2022-03-24 04:13:59.000982000 +0900 ++++ b/conf.d/link_confs.py 2022-03-24 04:14:46.271964000 +0900 +@@ -4,6 +4,7 @@ + import sys + import argparse + import platform ++import shutil + + if __name__=='__main__': + parser = argparse.ArgumentParser() +@@ -32,7 +33,7 @@ + except FileNotFoundError: + pass + try: +- os.symlink(src, dst) ++ shutil.copyfile(src, dst) + except NotImplementedError: + # Not supported on this version of Windows + break diff --git a/externals/vcpkg/ports/fontconfig/portfile.cmake b/externals/vcpkg/ports/fontconfig/portfile.cmake new file mode 100755 index 000000000..da4002236 --- /dev/null +++ b/externals/vcpkg/ports/fontconfig/portfile.cmake @@ -0,0 +1,79 @@ +set(FONTCONFIG_VERSION 2.14.0) + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH SOURCE_PATH + REPO fontconfig/fontconfig + REF ${FONTCONFIG_VERSION} + SHA512 0f36fa503c0277750ff253534f9305c9b4c86fd0d88a470e3b666080951714c51f13a69eecab382d0a7883a07494fc71730213e6086194a92aa5dfc075789e85 + HEAD_REF master + PATCHES + no-etc-symlinks.patch + libgetopt.patch +) + +vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf") + +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -Ddoc=disabled + -Dcache-build=disabled + -Dtests=disabled +) +vcpkg_install_meson(ADD_BIN_TO_PATH) + +vcpkg_copy_pdbs() +#Fix missing libintl static dependency +if(NOT VCPKG_TARGET_IS_MINGW AND VCPKG_TARGET_IS_WINDOWS) + if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/fontconfig.pc" "-liconv" "-liconv -lintl") + endif() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/fontconfig.pc" "-liconv" "-liconv -lintl") +endif() +vcpkg_fixup_pkgconfig() + +# Fix paths in debug pc file. +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/fontconfig.pc") +if(EXISTS "${_file}") + file(READ "${_file}" _contents) + string(REPLACE "/etc" "/../etc" _contents "${_contents}") + string(REPLACE "/var" "/../var" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") +endif() + +# Make path to cache in fonts.conf relative +set(_file "${CURRENT_PACKAGES_DIR}/etc/fonts/fonts.conf") +if(EXISTS "${_file}") + vcpkg_replace_string("${_file}" "${CURRENT_PACKAGES_DIR}/var/cache/fontconfig" "./../../var/cache/fontconfig") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/var" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/etc") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if(VCPKG_TARGET_IS_WINDOWS) + set(DEFINE_FC_PUBLIC "#define FcPublic __declspec(dllimport)") + else() + set(DEFINE_FC_PUBLIC "#define FcPublic __attribute__((visibility(\"default\")))") + endif() + foreach(HEADER fcfreetype.h fontconfig.h) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fontconfig/${HEADER}" + "#define FcPublic" + "${DEFINE_FC_PUBLIC}" + ) + endforeach() +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +if(NOT VCPKG_TARGET_IS_LINUX) + set(VCPKG_TARGET_IS_LINUX 0) # To not leave empty AND statements in the wrapper +endif() +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) + +vcpkg_copy_tools( + TOOL_NAMES fc-match fc-cat fc-list fc-pattern fc-query fc-scan fc-cache fc-validate fc-conflist + AUTO_CLEAN +) diff --git a/externals/vcpkg/ports/fontconfig/vcpkg-cmake-wrapper.cmake.in b/externals/vcpkg/ports/fontconfig/vcpkg-cmake-wrapper.cmake.in new file mode 100755 index 000000000..ab2b5679b --- /dev/null +++ b/externals/vcpkg/ports/fontconfig/vcpkg-cmake-wrapper.cmake.in @@ -0,0 +1,46 @@ +_find_package(${ARGS}) +if(Fontconfig_FOUND) # theoretically this could be skipped. If the wrapper is installed it should be found! + find_package(Freetype) + if(Freetype_FOUND AND TARGET Fontconfig::Fontconfig) + if(TARGET Freetype::Freetype) + set_property(TARGET Fontconfig::Fontconfig APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Freetype::Freetype") + else() + # TODO link Freetype libraries to the target if the target Freetype::Freetype is not defined; + endif() + endif() + if(FREETYPE_LIBRARIES) + list(APPEND Fontconfig_LIBRARIES "${FREETYPE_LIBRARIES}") + endif() + find_package(EXPAT) + if(EXPAT_FOUND AND TARGET Fontconfig::Fontconfig) + set_property(TARGET Fontconfig::Fontconfig APPEND PROPERTY INTERFACE_LINK_LIBRARIES "EXPAT::EXPAT") + endif() + if(EXPAT_LIBRARIES) + list(APPEND Fontconfig_LIBRARIES "${EXPAT_LIBRARIES}") + endif() + include(SelectLibraryConfigurations) + find_library(Fontconfig_LIBRARY_DEBUG NAMES fontconfig fontconfigd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_INSTALLED_DIR}/debug" NO_DEFAULT_PATH) + find_library(Fontconfig_LIBRARY_RELEASE NAMES fontconfig NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) + select_library_configurations(Fontconfig) + if(@VCPKG_TARGET_IS_LINUX@) + find_library(UUID_LIBRARY_DEBUG NAMES uuid uuidd uuid_d NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_INSTALLED_DIR}/debug" NO_DEFAULT_PATH) + find_library(UUID_LIBRARY_RELEASE NAMES uuid NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) + select_library_configurations(UUID) + endif() + if(Fontconfig_LIBRARY_DEBUG AND TARGET Fontconfig::Fontconfig) + set_target_properties(Fontconfig::Fontconfig PROPERTIES IMPORTED_LOCATION_DEBUG "${Fontconfig_LIBRARY_DEBUG}") + if(UUID_LIBRARY_DEBUG AND @VCPKG_TARGET_IS_LINUX@) + set_property(TARGET Fontconfig::Fontconfig APPEND PROPERTY INTERFACE_LINK_LIBRARIES "$<$:${UUID_LIBRARY_DEBUG}>") + endif() + endif() + if(Fontconfig_LIBRARY_RELEASE AND TARGET Fontconfig::Fontconfig) + set_target_properties(Fontconfig::Fontconfig PROPERTIES IMPORTED_LOCATION_RELEASE "${Fontconfig_LIBRARY_RELEASE}") + if(UUID_LIBRARY_RELEASE AND @VCPKG_TARGET_IS_LINUX@) + set_property(TARGET Fontconfig::Fontconfig APPEND PROPERTY INTERFACE_LINK_LIBRARIES "$<$>:${UUID_LIBRARY_RELEASE}>") + endif() + endif() + + if(UUID_LIBRARIES AND @VCPKG_TARGET_IS_LINUX@) + list(APPEND Fontconfig_LIBRARIES "${UUID_LIBRARIES}") + endif() +endif() diff --git a/externals/vcpkg/ports/fontconfig/vcpkg.json b/externals/vcpkg/ports/fontconfig/vcpkg.json new file mode 100755 index 000000000..7631fae57 --- /dev/null +++ b/externals/vcpkg/ports/fontconfig/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "fontconfig", + "version": "2.14.0", + "port-version": 2, + "description": "Library for configuring and customizing font access.", + "homepage": "https://www.freedesktop.org/wiki/Software/fontconfig", + "license": "MIT", + "dependencies": [ + "dirent", + "expat", + "freetype", + "getopt", + "gettext", + { + "name": "gperf", + "host": true + }, + "libiconv", + { + "name": "libuuid", + "platform": "!windows & !osx & !mingw" + }, + "pthread", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/foonathan-memory/portfile.cmake b/externals/vcpkg/ports/foonathan-memory/portfile.cmake new file mode 100755 index 000000000..170eb4369 --- /dev/null +++ b/externals/vcpkg/ports/foonathan-memory/portfile.cmake @@ -0,0 +1,125 @@ +# WINDOWS_EXPORT_ALL_SYMBOLS doesn't work. +# unresolved external symbol "public: static unsigned int const foonathan::memory::detail::memory_block_stack::implementation_offset +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO foonathan/memory + REF 885a9d97bebe9a2f131d21d3c0928c42ab377c8b + SHA512 7ce78a6e67d590a41b7f8a3d4ae0f6c1fa157c561b718a63973dffc000df74a9f0a0d7955a099e84fbeb3cf4085092eb866a6b8cec8bafd50bdcee94d069f65d + HEAD_REF master +) + +vcpkg_from_github( + OUT_SOURCE_PATH COMP_SOURCE_PATH + REPO foonathan/compatibility + REF cd142129e30f5b3e6c6d96310daf94242c0b03bf + SHA512 1d144f82ec46dcc546ee292846330d39536a3145e5a5d8065bda545f55699aeb9a4ef7dea5e5f684ce2327fad210488fe6bb4ba7f84ceac867ac1c72b90c6d69 + HEAD_REF master +) + +file(COPY ${COMP_SOURCE_PATH}/comp_base.cmake DESTINATION ${SOURCE_PATH}/cmake/comp) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + tool FOONATHAN_MEMORY_BUILD_TOOLS +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + ${FEATURE_OPTIONS} + -DFOONATHAN_MEMORY_BUILD_EXAMPLES=OFF + -DFOONATHAN_MEMORY_BUILD_TESTS=OFF +) + +vcpkg_install_cmake() + +if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake) + vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/foonathan_memory) +elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/foonathan_memory/cmake) + vcpkg_fixup_cmake_targets(CONFIG_PATH share/foonathan_memory/cmake TARGET_PATH share/foonathan_memory) +endif() + +vcpkg_copy_pdbs() + +# Place header files into the right folders +# The original layout is not a problem for CMake-based project. +file(COPY + ${CURRENT_PACKAGES_DIR}/include/foonathan_memory/foonathan + DESTINATION ${CURRENT_PACKAGES_DIR}/include +) +file(GLOB + COMP_INCLUDE_FILES + ${CURRENT_PACKAGES_DIR}/include/foonathan_memory/comp/foonathan/*.hpp +) +file(COPY + ${COMP_INCLUDE_FILES} + DESTINATION ${CURRENT_PACKAGES_DIR}/include/foonathan +) +file(COPY + ${CURRENT_PACKAGES_DIR}/include/foonathan_memory/config_impl.hpp + DESTINATION ${CURRENT_PACKAGES_DIR}/include/foonathan/memory +) +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/include/foonathan_memory +) +vcpkg_replace_string( + ${CURRENT_PACKAGES_DIR}/share/foonathan_memory/foonathan_memory-config.cmake + "\${_IMPORT_PREFIX}/include/foonathan_memory/comp;\${_IMPORT_PREFIX}/include/foonathan_memory" + "\${_IMPORT_PREFIX}/include" +) +# Place header files into the right folders - Done! + +# The Debug version of this lib is built with: +# #define FOONATHAN_MEMORY_DEBUG_FILL 1 +# and Release version is built with: +# #define FOONATHAN_MEMORY_DEBUG_FILL 0 +# We only have the Release version header files installed, however. +vcpkg_replace_string( + ${CURRENT_PACKAGES_DIR}/include/foonathan/memory/detail/debug_helpers.hpp + "#if FOONATHAN_MEMORY_DEBUG_FILL" + "#ifndef NDEBUG //#if FOONATHAN_MEMORY_DEBUG_FILL" +) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share +) + +file(REMOVE + ${CURRENT_PACKAGES_DIR}/debug/LICENSE + ${CURRENT_PACKAGES_DIR}/debug/README.md + ${CURRENT_PACKAGES_DIR}/LICENSE + ${CURRENT_PACKAGES_DIR}/README.md +) + +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR + VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(EXECUTABLE_SUFFIX ".exe") +else() + set(EXECUTABLE_SUFFIX "") +endif() + +if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX}) + file(COPY + ${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX} + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT} + ) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + + if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/bin + ${CURRENT_PACKAGES_DIR}/debug/bin + ) + else() + file(REMOVE + ${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/nodesize_dbg${EXECUTABLE_SUFFIX} + ) + endif() +endif() + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/foonathan-memory/vcpkg.json b/externals/vcpkg/ports/foonathan-memory/vcpkg.json new file mode 100755 index 000000000..e668bd94f --- /dev/null +++ b/externals/vcpkg/ports/foonathan-memory/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "foonathan-memory", + "version-string": "2019-07-21", + "port-version": 2, + "description": "STL compatible C++ memory allocator library", + "homepage": "https://foonathan.net/doc/memory/", + "default-features": [ + "tool" + ], + "features": { + "tool": { + "description": "Build foonathan memory tool" + } + } +} diff --git a/externals/vcpkg/ports/forge/cmake_config.patch b/externals/vcpkg/ports/forge/cmake_config.patch new file mode 100755 index 000000000..4775ec0d1 --- /dev/null +++ b/externals/vcpkg/ports/forge/cmake_config.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeModules/ForgeConfig.cmake.in b/CMakeModules/ForgeConfig.cmake.in +index 6fb18ac..5a3b000 100644 +--- a/CMakeModules/ForgeConfig.cmake.in ++++ b/CMakeModules/ForgeConfig.cmake.in +@@ -83,3 +83,22 @@ if ((TARGET Forge::forge AND Forge_BINARY_EXISTS) OR TARGET forge) + else () + set(Forge_FOUND OFF) + endif () ++ ++if(Forge_FOUND) ++ # Check for dependencies when Forge binary and cmake files are found ++ include(CMakeFindDependencyMacro) ++ ++ find_dependency(glad CONFIG) ++ find_dependency(glfw3 CONFIG) ++ find_dependency(freetype CONFIG) ++ find_dependency(freeimage CONFIG) ++ find_dependency(OpenGL) ++ ++ if(NOT WIN32) ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules(fontconfig REQUIRED) ++ if(NOT fontconfig_FOUND) ++ message(FATAL_ERROR "Please install Fontconfig dependency") ++ endif() ++ endif() ++endif() diff --git a/externals/vcpkg/ports/forge/portfile.cmake b/externals/vcpkg/ports/forge/portfile.cmake new file mode 100755 index 000000000..956de3d37 --- /dev/null +++ b/externals/vcpkg/ports/forge/portfile.cmake @@ -0,0 +1,37 @@ +if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + message(FATAL_ERROR "This port currently only supports x64 architecture") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO arrayfire/forge + REF v1.0.8 + SHA512 08e5eb89d80f7fa3310f0eb37481492b5c1dfff00b33c308169862d8b25cf93ad1d9c0db78667c0207a7f6f8ca4046c196bd3a987af839ea1864b49c738ee8e3 + HEAD_REF master + PATCHES cmake_config.patch +) +file(REMOVE ${SOURCE_PATH}/CMakeModules/FindOpenGL.cmake) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DFG_BUILD_DOCS=OFF + -DFG_BUILD_EXAMPLES=OFF + -DFG_INSTALL_BIN_DIR=bin + -DFG_INSTALL_CMAKE_DIR=share/Forge +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/Forge TARGET_PATH share/Forge) + +file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/bin/* ${CURRENT_PACKAGES_DIR}/debug/bin/*) +list(FILTER DLLS EXCLUDE REGEX "forge\\.dll\$") +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share + ${CURRENT_PACKAGES_DIR}/debug/examples + ${CURRENT_PACKAGES_DIR}/examples + ${DLLS} +) + +file(INSTALL ${SOURCE_PATH}/.github/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/forge/vcpkg.json b/externals/vcpkg/ports/forge/vcpkg.json new file mode 100755 index 000000000..afd8df8d3 --- /dev/null +++ b/externals/vcpkg/ports/forge/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "forge", + "version-semver": "1.0.8", + "description": "An OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend.", + "homepage": "https://github.com/arrayfire/forge", + "supports": "x64", + "dependencies": [ + "boost-functional", + { + "name": "fontconfig", + "platform": "!windows" + }, + "freeimage", + "freetype", + "glad", + "glfw3", + "glm" + ] +} diff --git a/externals/vcpkg/ports/foxi/portfile.cmake b/externals/vcpkg/ports/foxi/portfile.cmake new file mode 100755 index 000000000..5517378b8 --- /dev/null +++ b/externals/vcpkg/ports/foxi/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO houseroad/foxi + REF c278588e34e535f0bb8f00df3880d26928038cad + SHA512 ad42cfd70e40ba0f0a9187b34ae9e3bd361c8c0038669f4c1591c4f7421d12ad93f76f42b33c2575eea1a3ddb3ff781da2895cdc636df5b60422598f450203c7 + PATCHES + remove-test-targets.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) diff --git a/externals/vcpkg/ports/foxi/remove-test-targets.patch b/externals/vcpkg/ports/foxi/remove-test-targets.patch new file mode 100755 index 000000000..9e53390ba --- /dev/null +++ b/externals/vcpkg/ports/foxi/remove-test-targets.patch @@ -0,0 +1,60 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b406d0f..c5d04d5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,7 +65,7 @@ if(MSVC) + add_msvc_runtime_flag(foxi_loader) + endif() + +-if (NOT ANDROID AND NOT IOS) ++if (FALSE) + # ---[ FOXI wrapper + add_library(foxi_wrapper MODULE foxi/onnxifi_wrapper.c) + target_include_directories(foxi_wrapper PRIVATE +@@ -93,17 +93,6 @@ if (NOT ANDROID AND NOT IOS) + endif() + endif() + +-# ---[ FOXI dummy backend +-add_library(foxi_dummy SHARED foxi/onnxifi_dummy.c) +-target_include_directories(foxi_dummy PRIVATE +- $ +- $) +-target_link_libraries(foxi_dummy PUBLIC foxi ${CMAKE_DL_LIBS}) +-target_compile_definitions(foxi_dummy PRIVATE ONNXIFI_BUILD_LIBRARY=TRUE) +-if(MSVC) +- add_msvc_runtime_flag(foxi_dummy) +-endif() +- + install(DIRECTORY ${FOXI_ROOT}/foxi + DESTINATION include + FILES_MATCHING +@@ -114,10 +103,10 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/foxi + PATTERN "*.h") + + install(TARGETS +- foxi foxi_dummy foxi_loader ++ foxi_loader + EXPORT ONNXTargets DESTINATION lib) + +-if(NOT ANDROID AND NOT IOS) ++if(FALSE) + install(TARGETS foxi_wrapper + EXPORT ONNXTargets DESTINATION lib) + endif() + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c5d04d5..cc7d18a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -61,9 +61,6 @@ set_target_properties(foxi_loader + C_EXTENSIONS + NO) + target_link_libraries(foxi_loader PUBLIC foxi ${CMAKE_DL_LIBS}) +-if(MSVC) +- add_msvc_runtime_flag(foxi_loader) +-endif() + + if (FALSE) + # ---[ FOXI wrapper + diff --git a/externals/vcpkg/ports/foxi/vcpkg.json b/externals/vcpkg/ports/foxi/vcpkg.json new file mode 100755 index 000000000..4fbccecb4 --- /dev/null +++ b/externals/vcpkg/ports/foxi/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "foxi", + "version-date": "2021-12-01", + "description": "ONNXIFI with Facebook Extension", + "homepage": "https://github.com/houseroad/foxi", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/fp16/find-psimd.patch b/externals/vcpkg/ports/fp16/find-psimd.patch new file mode 100755 index 000000000..6eeed9aa7 --- /dev/null +++ b/externals/vcpkg/ports/fp16/find-psimd.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -33,7 +33,8 @@ SET(CONFU_DEPENDENCIES_SOURCE_DIR ${CMAKE_SOURCE_DIR}/deps + SET(CONFU_DEPENDENCIES_BINARY_DIR ${CMAKE_BINARY_DIR}/deps + CACHE PATH "Confu-style dependencies binary directory") + +-IF(NOT DEFINED PSIMD_SOURCE_DIR) ++find_path(PSIMD_INCLUDE_DIRS "psimd.h") ++IF(FALSE) + MESSAGE(STATUS "Downloading PSimd to ${CONFU_DEPENDENCIES_SOURCE_DIR}/psimd (define PSIMD_SOURCE_DIR to avoid it)") + CONFIGURE_FILE(cmake/DownloadPSimd.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/psimd-download/CMakeLists.txt") + EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . +@@ -76,7 +77,7 @@ ELSE() + ENDIF() + TARGET_INCLUDE_DIRECTORIES(fp16 INTERFACE + $ +- $) ++ $ $) + + INSTALL(FILES include/fp16.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +@@ -90,7 +91,7 @@ INSTALL(FILES + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fp16) + + # ---[ Configure psimd +-IF(NOT TARGET psimd) ++IF(FALSE) + ADD_SUBDIRECTORY( + "${PSIMD_SOURCE_DIR}" + "${CONFU_DEPENDENCIES_BINARY_DIR}/psimd") diff --git a/externals/vcpkg/ports/fp16/portfile.cmake b/externals/vcpkg/ports/fp16/portfile.cmake new file mode 100755 index 000000000..101255b8b --- /dev/null +++ b/externals/vcpkg/ports/fp16/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Maratyszcza/fp16 + REF 4dfe081cf6bcd15db339cf2680b9281b8451eeb3 + SHA512 e79a1f6f8d4aeca85982158d5b070923d31d4f2062ed84cfa6f26c47a34f2e8ac49e0f330b7d49f5732d5e1eec6e7afccdac43645070060fb7827e2ce261dd3e + PATCHES + find-psimd.patch +) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DFP16_BUILD_TESTS=OFF + -DFP16_BUILD_BENCHMARKS=OFF +) +vcpkg_install_cmake() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) diff --git a/externals/vcpkg/ports/fp16/vcpkg.json b/externals/vcpkg/ports/fp16/vcpkg.json new file mode 100755 index 000000000..76eac902f --- /dev/null +++ b/externals/vcpkg/ports/fp16/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "fp16", + "version-date": "2021-02-21", + "description": "Header-only library for conversion to/from half-precision floating point formats", + "homepage": "https://github.com/Maratyszcza/FP16", + "dependencies": [ + "psimd" + ] +} diff --git a/externals/vcpkg/ports/fplus/portfile.cmake b/externals/vcpkg/ports/fplus/portfile.cmake new file mode 100755 index 000000000..efe04fcdb --- /dev/null +++ b/externals/vcpkg/ports/fplus/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Dobiasd/FunctionalPlus + REF v0.2.18-p0 + SHA512 119aaef75020ef06818bf5d33db8bce272e89d69699df9be636bc6fdf06b584e1842440896a431ea2a75b88ce01472f3a9886b8dd781f5e5533315e9ad6860ac + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DFunctionalPlus_INSTALL_CMAKEDIR=share/FunctionalPlus +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/fplus/vcpkg.json b/externals/vcpkg/ports/fplus/vcpkg.json new file mode 100755 index 000000000..bdf521b10 --- /dev/null +++ b/externals/vcpkg/ports/fplus/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "fplus", + "version": "0.2.18-p0", + "description": "Functional Programming Library for C++. Write concise and readable C++ code", + "homepage": "https://github.com/Dobiasd/FunctionalPlus", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/freealut/cmake_builds.patch b/externals/vcpkg/ports/freealut/cmake_builds.patch new file mode 100755 index 000000000..187b32669 --- /dev/null +++ b/externals/vcpkg/ports/freealut/cmake_builds.patch @@ -0,0 +1,114 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 963c530..656ce14 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,6 @@ + # cmake project file by Prakash Punnoor + # improved by Ryan Pavlik +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 2.8.12) + + project(Alut C) + +@@ -27,7 +27,6 @@ include_directories(${Alut_SOURCE_DIR}/include) + + # What to build? + option(BUILD_EXAMPLES "build example applications" ON) +-option(BUILD_STATIC "build static library too" OFF) + option(BUILD_TESTS "build the test-suite" ON) + + # How to build it? +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index b72d1a1..5fc6cdc 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -39,35 +39,7 @@ set(ALUT_HEADERS + ../include/AL/alut.h) + source_group(APIHeader FILES ${ALUT_HEADERS}) + +- +-if(BUILD_STATIC) +- # we can't create a static library with the same name +- # as the shared one, so we copy it over after creation +- add_library(alut_static STATIC ${ALUT_SOURCES} ${ALUT_INTERNAL_HEADERS} ${ALUT_HEADERS}) +- target_link_libraries(alut_static ${OPENAL_LIBRARY} ${ADD_LIBS}) +- if(UNIX) +- target_link_libraries(alut_static m) +- endif() +- if(NOT WIN32) +- # TODO this is an inelegant hack... +- add_custom_command(TARGET +- alut_static +- POST_BUILD +- COMMAND +- ${CMAKE_COMMAND} +- ARGS +- -E +- copy +- ${CMAKE_BINARY_DIR}/src/${CMAKE_STATIC_LIBRARY_PREFIX}alut_static${CMAKE_STATIC_LIBRARY_SUFFIX} +- ${CMAKE_BINARY_DIR}/src/${CMAKE_STATIC_LIBRARY_PREFIX}alut${CMAKE_STATIC_LIBRARY_SUFFIX}) +- install_files(/lib${LIB_SUFFIX} +- FILES +- ${CMAKE_STATIC_LIBRARY_PREFIX}alut${CMAKE_STATIC_LIBRARY_SUFFIX}) +- endif() +-endif() +- +- +-add_library(alut SHARED ${ALUT_SOURCES} ${ALUT_INTERNAL_HEADERS} ${ALUT_HEADERS}) ++add_library(alut ${ALUT_SOURCES} ${ALUT_INTERNAL_HEADERS} ${ALUT_HEADERS}) + set_property(TARGET + alut + PROPERTY +@@ -80,12 +52,40 @@ set_target_properties(alut + SOVERSION + ${MAJOR_VERSION}) + target_link_libraries(alut ${OPENAL_LIBRARY}) ++target_include_directories(alut PUBLIC ${OPENAL_INCLUDE_DIR}) + if(UNIX) + target_link_libraries(alut m) + endif() ++if(NOT BUILD_SHARED_LIBS) ++ target_compile_definitions(alut PUBLIC ALUT_BUILD_STATIC) ++endif() + + install(TARGETS alut ++ EXPORT "FreeALUTTargets" + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX} + RUNTIME DESTINATION bin +- PUBLIC_HEADER DESTINATION include/AL) ++ PUBLIC_HEADER DESTINATION include/AL ++ ) ++ ++include(CMakePackageConfigHelpers) ++ ++set(version_config "${CMAKE_CURRENT_BINARY_DIR}/temp/FreeALUTConfigVersion.cmake") ++set(project_config "${CMAKE_CURRENT_BINARY_DIR}/temp/FreeALUTConfig.cmake") ++set(namespace "FreeALUT::") ++ ++write_basic_package_version_file("${version_config}" ++ COMPATIBILITY SameMajorVersion ++ VERSION ${PACKAGE_VERSION}) ++ ++configure_package_config_file("Config.cmake.in" ++ "${project_config}" ++ INSTALL_DESTINATION ++ lib${LIB_SUFFIX}/cmake/freealut) ++ ++install(FILES "${project_config}" "${version_config}" ++ DESTINATION lib${LIB_SUFFIX}/cmake/freealut) ++ ++install(EXPORT "FreeALUTTargets" ++ NAMESPACE "${namespace}" ++ DESTINATION lib${LIB_SUFFIX}/cmake/freealut) +diff --git a/src/Config.cmake.in b/src/Config.cmake.in +new file mode 100644 +index 0000000..2a20f59 +--- /dev/null ++++ b/src/Config.cmake.in +@@ -0,0 +1,5 @@ ++ ++@PACKAGE_INIT@ ++ ++include("${CMAKE_CURRENT_LIST_DIR}/FreeALUTTargets.cmake") ++check_required_components("FreeALUT") diff --git a/externals/vcpkg/ports/freealut/portfile.cmake b/externals/vcpkg/ports/freealut/portfile.cmake new file mode 100755 index 000000000..5db22992d --- /dev/null +++ b/externals/vcpkg/ports/freealut/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO vancegroup/freealut + REF fc814e316c2bfa6e05b723b8cc9cb276da141aae + SHA512 046990cc13822ca6eea0b8e412aa95a994b881429e0b15cefee379f08bd9636d4a4598292a8d46b30c3cd06814bfaeae3298e8ef4087a46eede344f3880e9fed + HEAD_REF master + PATCHES + cmake_builds.patch + unix_headers.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include" + ) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/freealut-config") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/freealut-config") +endif() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/freealut-config") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/freealut-config") +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/freealut/unix_headers.patch b/externals/vcpkg/ports/freealut/unix_headers.patch new file mode 100755 index 000000000..aabf69e77 --- /dev/null +++ b/externals/vcpkg/ports/freealut/unix_headers.patch @@ -0,0 +1,32 @@ +diff --git a/include/AL/alut.h b/include/AL/alut.h +index 4b05a3c..1084604 100644 +--- a/include/AL/alut.h ++++ b/include/AL/alut.h +@@ -1,24 +1,18 @@ + #if !defined(AL_ALUT_H) + #define AL_ALUT_H + +-#if defined(_MSC_VER) + #include + #include +-#elif defined(__APPLE__) +-#include +-#include +-#else +-#include +-#include +-#endif + + #if defined(__cplusplus) + extern "C" { + #endif + + #if defined(_WIN32) && !defined(_XBOX) +- #if defined (ALUT_BUILD_LIBRARY) ++ #if defined(ALUT_BUILD_LIBRARY) + #define ALUT_API __declspec(dllexport) ++ #elif defined(ALUT_BUILD_STATIC) ++ #define ALUT_API extern + #else + #define ALUT_API __declspec(dllimport) + #endif diff --git a/externals/vcpkg/ports/freealut/vcpkg.json b/externals/vcpkg/ports/freealut/vcpkg.json new file mode 100755 index 000000000..a6f1860ae --- /dev/null +++ b/externals/vcpkg/ports/freealut/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "freealut", + "version": "1.1.0", + "port-version": 2, + "description": [ + "FreeALUT is a free implementation of OpenAL's ALUT standard.", + "ALUT is a set of portable functions which remove the annoying details of getting an audio application started. It is the OpenAL counterpart of what GLUT is for OpenGL. " + ], + "homepage": "https://github.com/vancegroup/freealut", + "license": "LGPL-2.0-only", + "supports": "!uwp", + "dependencies": [ + "openal-soft", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/freeglut/fix-debug-macro.patch b/externals/vcpkg/ports/freeglut/fix-debug-macro.patch new file mode 100755 index 000000000..69f9e82bc --- /dev/null +++ b/externals/vcpkg/ports/freeglut/fix-debug-macro.patch @@ -0,0 +1,35 @@ +diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h +index a658c7c..a5efb3b 100644 +--- a/include/GL/freeglut_std.h ++++ b/include/GL/freeglut_std.h +@@ -70,7 +70,7 @@ + + /* Link with Win32 static freeglut lib */ + # if FREEGLUT_LIB_PRAGMAS +-# ifdef NDEBUG ++# if defined(NDEBUG) || !defined(_DEBUG) + # pragma comment (lib, "freeglut_static.lib") + # else + # pragma comment (lib, "freeglut_staticd.lib") +@@ -88,7 +88,7 @@ + + /* Link with Win32 shared freeglut lib */ + # if FREEGLUT_LIB_PRAGMAS +-# ifdef NDEBUG ++# if defined(NDEBUG) || !defined(_DEBUG) + # pragma comment (lib, "freeglut.lib") + # else + # pragma comment (lib, "freeglutd.lib") +diff --git a/src/blackberry/fg_main_blackberry.c b/src/blackberry/fg_main_blackberry.c +index a1b9cbb..a20c53d 100644 +--- a/src/blackberry/fg_main_blackberry.c ++++ b/src/blackberry/fg_main_blackberry.c +@@ -31,7 +31,7 @@ + #include "fg_internal.h" + #include "egl/fg_window_egl.h" + +-#ifdef NDEBUG ++#if defined(NDEBUG) || !defined(_DEBUG) + #define LOGI(...) + #endif + diff --git a/externals/vcpkg/ports/freeglut/macOS_Xquartz.patch b/externals/vcpkg/ports/freeglut/macOS_Xquartz.patch new file mode 100755 index 000000000..c154dceb5 --- /dev/null +++ b/externals/vcpkg/ports/freeglut/macOS_Xquartz.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6f403af..ce6f9f2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -258,6 +258,16 @@ ENDIF() + IF(FREEGLUT_GLES) + LIST(APPEND PUBLIC_DEFINITIONS -DFREEGLUT_GLES) + LIST(APPEND LIBS GLESv2 GLESv1_CM EGL) ++ELSEIF(APPLE) ++ # on OSX FindOpenGL uses framework version of OpenGL, but we need X11 version ++ FIND_PATH(GLX_INCLUDE_DIR GL/glx.h ++ PATHS /opt/X11/include /usr/X11/include /usr/X11R6/include) ++ FIND_LIBRARY(OPENGL_gl_LIBRARY GL ++ PATHS /opt/X11/lib /usr/X11/lib /usr/X11R6/lib) ++ FIND_LIBRARY(OPENGL_glu_LIBRARY GLU ++ PATHS /opt/X11/lib /usr/X11/lib /usr/X11R6/lib) ++ LIST(APPEND LIBS ${OPENGL_gl_LIBRARY}) ++ INCLUDE_DIRECTORIES(${GLX_INCLUDE_DIR}) + ELSE() + FIND_PACKAGE(OpenGL REQUIRED) + LIST(APPEND LIBS ${OPENGL_gl_LIBRARY}) diff --git a/externals/vcpkg/ports/freeglut/no_x64_enforcement.patch b/externals/vcpkg/ports/freeglut/no_x64_enforcement.patch new file mode 100755 index 000000000..d98332366 --- /dev/null +++ b/externals/vcpkg/ports/freeglut/no_x64_enforcement.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt.orig b/CMakeLists.txt +index 6f403af..d1ba4e7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -418,12 +418,6 @@ IF(WIN32) + IF(FREEGLUT_REPLACE_GLUT) + SET_TARGET_PROPERTIES(freeglut_static PROPERTIES OUTPUT_NAME ${LIBNAME}) + ENDIF() +- # need to set machine:x64 for linker, at least for VC10, and +- # doesn't hurt for older compilers: +- # http://public.kitware.com/Bug/view.php?id=11240#c22768 +- IF (CMAKE_CL_64) +- SET_TARGET_PROPERTIES(freeglut_static PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") +- ENDIF() + ENDIF() + ELSE() + # on UNIX we need to make sure: diff --git a/externals/vcpkg/ports/freeglut/portfile.cmake b/externals/vcpkg/ports/freeglut/portfile.cmake new file mode 100755 index 000000000..714a393a6 --- /dev/null +++ b/externals/vcpkg/ports/freeglut/portfile.cmake @@ -0,0 +1,50 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO FreeGLUTProject/freeglut + REF v3.2.2 + SHA512 caaed8af95c2d0ecbc785229e26433978a0f606ae2b9f0b3cd794bb5bb70a1cc54d21f941a1a03e20c7e0fa3eba9d54a21d6e23e44f243899c0fdf146066cf29 + HEAD_REF master + PATCHES + x11-dependencies-export.patch + macOS_Xquartz.patch + fix-debug-macro.patch + no_x64_enforcement.patch + windows-static-output-name.patch +) + +if(NOT VCPKG_TARGET_IS_WINDOWS) + message("Freeglut currently requires the following libraries from the system package manager:\n opengl\n glu\n libx11\n xrandr\n xi\n xxf86vm\n\nThese can be installed on Ubuntu systems via apt-get install libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev\nOn macOS Xquartz is required.") +endif() + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FREEGLUT_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" FREEGLUT_DYNAMIC) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DFREEGLUT_BUILD_STATIC_LIBS=${FREEGLUT_STATIC} + -DFREEGLUT_BUILD_SHARED_LIBS=${FREEGLUT_DYNAMIC} + -DFREEGLUT_BUILD_DEMOS=OFF + -DINSTALL_PDB=OFF # Installing pdbs failed on debug static. So, disable it and let vcpkg_copy_pdbs() do it +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeGLUT) +vcpkg_fixup_pkgconfig() + +# Rename static lib (otherwise it's incompatible with FindGLUT.cmake) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/GL/freeglut_std.h" + "ifdef FREEGLUT_STATIC" + "if 1 //ifdef FREEGLUT_STATIC" + ) +endif() + +# Clean +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/glut") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/freeglut/usage b/externals/vcpkg/ports/freeglut/usage new file mode 100755 index 000000000..40e214fde --- /dev/null +++ b/externals/vcpkg/ports/freeglut/usage @@ -0,0 +1,4 @@ +The package freeglut is compatible with built-in CMake targets: + + find_package(GLUT REQUIRED) + target_link_libraries(main PRIVATE GLUT::GLUT) diff --git a/externals/vcpkg/ports/freeglut/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/freeglut/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..c8cfa2516 --- /dev/null +++ b/externals/vcpkg/ports/freeglut/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,33 @@ +_find_package(${ARGS}) +if(GLUT_FOUND AND UNIX AND NOT ANDROID) + cmake_policy(PUSH) + cmake_policy(SET CMP0012 NEW) + cmake_policy(SET CMP0054 NEW) + cmake_policy(SET CMP0057 NEW) + + if(GLUT_LINK_LIBRARIES) + # Since CMake 3.22, FindGLUT.cmake loads the glut pkg-config module. + # We need `-lglut` resolved to an absolute path. + set(GLUT_LIBRARIES "${GLUT_LINK_LIBRARIES}") + else() + find_package(X11) + # Before CMake 3.14, FindX11.cmake doesn't create imported targets. + # For X11, we simply assume shared linkage of system libs, + # so order and transitive usage requirements don't matter. + if(X11_Xrandr_FOUND AND NOT "Xrandr" IN_LIST GLUT_LIBRARIES) + list(APPEND GLUT_LIBRARIES "${X11_Xrandr_LIB}") + set_property(TARGET GLUT::GLUT APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${X11_Xrandr_LIB}") + endif() + # X11_xf86vmode_FOUND for CMake < 3.14 + if((X11_xf86vm_FOUND OR X11_xf86vmode_FOUND) AND NOT "Xxf86vm" IN_LIST GLUT_LIBRARIES) + list(APPEND GLUT_LIBRARIES "${X11_Xxf86vm_LIB}") + set_property(TARGET GLUT::GLUT APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${X11_Xxf86vm_LIB}") + endif() + if(X11_Xi_FOUND AND NOT GLUT_Xi_LIBRARY AND NOT "Xi" IN_LIST GLUT_LIBRARIES) + list(APPEND GLUT_LIBRARIES "${X11_Xi_LIB}") + set_property(TARGET GLUT::GLUT APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${X11_Xi_LIB}") + endif() + endif() + + cmake_policy(POP) +endif() diff --git a/externals/vcpkg/ports/freeglut/vcpkg.json b/externals/vcpkg/ports/freeglut/vcpkg.json new file mode 100755 index 000000000..d1708bd73 --- /dev/null +++ b/externals/vcpkg/ports/freeglut/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "freeglut", + "version": "3.2.2", + "description": "Open source implementation of GLUT with source and binary backwards compatibility.", + "homepage": "https://sourceforge.net/projects/freeglut/", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/freeglut/windows-static-output-name.patch b/externals/vcpkg/ports/freeglut/windows-static-output-name.patch new file mode 100755 index 000000000..750d4bee0 --- /dev/null +++ b/externals/vcpkg/ports/freeglut/windows-static-output-name.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index aec0a27..73ccbdb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -429,7 +429,7 @@ IF(WIN32) + ENDIF() + IF(FREEGLUT_BUILD_STATIC_LIBS) + TARGET_COMPILE_DEFINITIONS(freeglut_static PUBLIC FREEGLUT_STATIC) +- IF(FREEGLUT_REPLACE_GLUT) ++ IF(1) + SET_TARGET_PROPERTIES(freeglut_static PROPERTIES OUTPUT_NAME ${LIBNAME}) + ENDIF() + ENDIF() +diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h +index a5efb3b..6bdcdfb 100644 +--- a/include/GL/freeglut_std.h ++++ b/include/GL/freeglut_std.h +@@ -71,9 +71,9 @@ + /* Link with Win32 static freeglut lib */ + # if FREEGLUT_LIB_PRAGMAS + # if defined(NDEBUG) || !defined(_DEBUG) +-# pragma comment (lib, "freeglut_static.lib") ++# pragma comment (lib, "freeglut.lib") + # else +-# pragma comment (lib, "freeglut_staticd.lib") ++# pragma comment (lib, "freeglutd.lib") + # endif + # endif + diff --git a/externals/vcpkg/ports/freeglut/x11-dependencies-export.patch b/externals/vcpkg/ports/freeglut/x11-dependencies-export.patch new file mode 100755 index 000000000..814802f33 --- /dev/null +++ b/externals/vcpkg/ports/freeglut/x11-dependencies-export.patch @@ -0,0 +1,63 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6f403af..4ced28a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -72,7 +72,7 @@ SET(FREEGLUT_HEADERS + include/GL/freeglut_ext.h + include/GL/freeglut_std.h + ) +-IF(FREEGLUT_REPLACE_GLUT) ++IF(TRUE) + LIST(APPEND FREEGLUT_HEADERS + include/GL/glut.h + ) +@@ -319,23 +319,27 @@ IF(CMAKE_COMPILER_IS_GNUCC) + ENDIF() + ENDIF(CMAKE_COMPILER_IS_GNUCC) + ++SET(xlibs_private "") + INCLUDE(CheckIncludeFiles) + IF(UNIX AND NOT(ANDROID OR BLACKBERRY OR FREEGLUT_WAYLAND)) + FIND_PACKAGE(X11 REQUIRED) +- INCLUDE_DIRECTORIES(${X11_X11_INCLUDE_PATH}) +- LIST(APPEND LIBS ${X11_X11_LIB}) ++ LIST(APPEND LIBS X11::X11) ++ set(xlibs_private "-lX11") + IF(X11_Xrandr_FOUND) + SET(HAVE_X11_EXTENSIONS_XRANDR_H TRUE) +- LIST(APPEND LIBS ${X11_Xrandr_LIB}) ++ LIST(APPEND LIBS X11::Xrandr) ++ STRING(APPEND xlibs_private " -lXrandr") + ENDIF() +- IF(X11_xf86vmode_FOUND) ++ IF(X11_Xxf86vm_FOUND) + SET(HAVE_X11_EXTENSIONS_XF86VMODE_H TRUE) +- LIST(APPEND LIBS ${X11_Xxf86vm_LIB}) ++ LIST(APPEND LIBS X11::Xxf86vm) ++ STRING(APPEND xlibs_private " -lXxf86vm") + ENDIF() + IF(X11_Xinput_FOUND) + # Needed for multi-touch: + CHECK_INCLUDE_FILES("${X11_Xinput_INCLUDE_PATH}/X11/extensions/XInput2.h" HAVE_X11_EXTENSIONS_XINPUT2_H) +- LIST(APPEND LIBS ${X11_Xinput_LIB}) ++ LIST(APPEND LIBS X11::Xi) ++ STRING(APPEND xlibs_private " -lXi") + ELSE() + MESSAGE(FATAL_ERROR "Missing X11's XInput.h (X11/extensions/XInput.h)") + ENDIF() +@@ -586,13 +590,13 @@ ELSEIF(FREEGLUT_GLES) + ELSEIF(FREEGLUT_WAYLAND) + SET(PC_LIBS_PRIVATE "-lwayland-client -lwayland-cursor -lwayland-egl -lGLESv2 -lGLESv1_CM -lEGL -lxkbcommon -lm") + ELSE() +- SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGLESv2 -lGLESv1_CM -lEGL -lm") ++ SET(PC_LIBS_PRIVATE "${xlibs_private} -lGLESv2 -lGLESv1_CM -lEGL -lm") + ENDIF() + ELSE() + IF(FREEGLUT_WAYLAND) + SET(PC_LIBS_PRIVATE "-lwayland-client -lwayland-cursor -lwayland-egl -lGL -lxkbcommon -lm") + ELSE() +- SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGL -lm") ++ SET(PC_LIBS_PRIVATE "${xlibs_private} -lGL -lm") + ENDIF() + ENDIF() + # Client applications need to define FreeGLUT GLES version to diff --git a/externals/vcpkg/ports/freeimage/CMakeLists.txt b/externals/vcpkg/ports/freeimage/CMakeLists.txt new file mode 100755 index 000000000..d31c8aa05 --- /dev/null +++ b/externals/vcpkg/ports/freeimage/CMakeLists.txt @@ -0,0 +1,162 @@ +cmake_minimum_required(VERSION 3.4) + +include(GNUInstallDirs) + +project(FreeImage C CXX) + +if(MSVC) + add_definitions("-D_CRT_SECURE_NO_WARNINGS") + set(CMAKE_CXX_FLAGS "/wd4828 ${CMAKE_CXX_FLAGS}") +endif() + +find_package(ZLIB REQUIRED) +find_package(PNG REQUIRED) +find_package(JPEG REQUIRED) +find_package(TIFF REQUIRED) +find_package(OpenJPEG REQUIRED) +find_package(WebP CONFIG REQUIRED) +find_package(JXR REQUIRED) +find_package(LibRaw REQUIRED) +find_package(OpenEXR REQUIRED) + +option(BUILD_SHARED_LIBS "Build shared libraries" ON) +option(INSTALL_HEADERS "Install the development headers" ON) + +set(REAL_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Source) + +# Add a debug postfix +set(CMAKE_DEBUG_POSTFIX "d") + +# List the public header files +set(PUBLIC_HEADERS ${REAL_SOURCE_DIR}/FreeImage.h) + +# List the private header files +set(ROOT_PRIVATE_HEADERS ${REAL_SOURCE_DIR}/CacheFile.h + ${REAL_SOURCE_DIR}/FreeImageIO.h + ${REAL_SOURCE_DIR}/MapIntrospector.h + ${REAL_SOURCE_DIR}/Plugin.h + ${REAL_SOURCE_DIR}/Quantizers.h + ${REAL_SOURCE_DIR}/ToneMapping.h + ${REAL_SOURCE_DIR}/Utilities.h) + +file(GLOB FREEIMAGE_PRIVATE_HEADERS ${REAL_SOURCE_DIR}/FreeImage/*.h) +file(GLOB FREEIMAGE_TOOLKIT_PRIVATE_HEADERS ${REAL_SOURCE_DIR}/FreeImageToolkit/*.h) +file(GLOB METADATA_PRIVATE_HEADERS ${REAL_SOURCE_DIR}/Metadata/*.h) + +set(PRIVATE_HEADERS ${ROOT_PRIVATE_HEADERS} + ${FREEIMAGE_PRIVATE_HEADERS} + ${FREEIMAGE_TOOLKIT_PRIVATE_HEADERS} + ${METADATA_PRIVATE_HEADERS}) + +# List the source files +file(GLOB DEPRECATION_SRCS ${REAL_SOURCE_DIR}/DeprecationManager/*.cpp) +file(GLOB FREEIMAGE_TOOLKIT_SRCS ${REAL_SOURCE_DIR}/FreeImageToolkit/*.cpp) +file(GLOB FREEIMAGE_SRCS ${REAL_SOURCE_DIR}/FreeImage/*.cpp) +file(GLOB METADATA_SRCS ${REAL_SOURCE_DIR}/Metadata/*.cpp) + +# The G3 plugin is disabled because it require the private copy of tiff +list(REMOVE_ITEM FREEIMAGE_SRCS ${REAL_SOURCE_DIR}/FreeImage/PluginG3.cpp) + +# The JPEGTransform plugin is disable because it requires a private copy of jpeg +list(REMOVE_ITEM FREEIMAGE_TOOLKIT_SRCS ${REAL_SOURCE_DIR}/FreeImageToolkit/JPEGTransform.cpp) + + +set(SRCS ${DEPRECATION_SRCS} + ${FREEIMAGE_SRCS} + ${FREEIMAGE_TOOLKIT_SRCS} + ${METADATA_SRCS} +) + +# If FreeImage is used as a static library, FREEIMAGE_LIB +# needs to be defined (at the C preprocessor level) to correctly +# define (to nothing instead of _declspec(dllimport) ) the DLL_API macro. +# For this purpouse we include (depending on the BUILD_SHARED_LIBS ) +# the appropriate FreeImageConfig.h . +if(BUILD_SHARED_LIBS) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/FreeImageConfig-dynamic.h ${CMAKE_CURRENT_BINARY_DIR}/FreeImageConfig.h) +else() + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/FreeImageConfig-static.h ${CMAKE_CURRENT_BINARY_DIR}/FreeImageConfig.h) +endif() +list(APPEND PUBLIC_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/FreeImageConfig.h) + +add_library(FreeImage ${SRCS} ${PRIVATE_HEADERS} ${PUBLIC_HEADERS} ${CMAKE_CURRENT_SOURCE_DIR}/FreeImage.rc) + +if(BUILD_SHARED_LIBS) + target_compile_definitions(FreeImage PRIVATE -DFREEIMAGE_EXPORTS) +else() + target_compile_definitions(FreeImage PRIVATE -DFREEIMAGE_LIB) +endif() + +target_include_directories(FreeImage PRIVATE ${REAL_SOURCE_DIR} + ${ZLIB_INCLUDE_DIRS} + ${JPEG_INCLUDE_DIRS} + ${TIFF_INCLUDE_DIRS} + ${PNG_INCLUDE_DIRS} + ${OPENJPEG_INCLUDE_DIRS} + ${JXR_INCLUDE_DIRS} + ${LibRaw_INCLUDE_DIRS} + ${CMAKE_CURRENT_BINARY_DIR} + PUBLIC $) + + +target_link_libraries(FreeImage ${ZLIB_LIBRARIES} + ${JPEG_LIBRARIES} + ${TIFF_LIBRARIES} + ${PNG_LIBRARIES} + ${OPENJPEG_LIBRARIES} + WebP::webp WebP::webpdemux WebP::libwebpmux WebP::webpdecoder + ${JXR_LIBRARIES} + ${LibRaw_LIBRARIES} + OpenEXR::IlmImf) + +target_compile_definitions(FreeImage PRIVATE ${PNG_DEFINITIONS}) + +# FreeImagePlus +file(GLOB FREEIMAGEPLUS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Wrapper/FreeImagePlus/src/*.cpp) +add_library(FreeImagePlus + ${FREEIMAGEPLUS_SOURCES} + ${CMAKE_CURRENT_SOURCE_DIR}/Wrapper/FreeImagePlus/FreeImagePlus.h + ${CMAKE_CURRENT_SOURCE_DIR}/Wrapper/FreeImagePlus/FreeImagePlus.rc) + +if(BUILD_SHARED_LIBS) + target_compile_definitions(FreeImagePlus PRIVATE -DFIP_EXPORTS) +else() + target_compile_definitions(FreeImagePlus PRIVATE -DFREEIMAGE_LIB) +endif() + +target_include_directories(FreeImagePlus PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Wrapper/FreeImagePlus + ${CMAKE_CURRENT_BINARY_DIR} + ${REAL_SOURCE_DIR} + PUBLIC $) + +target_link_libraries(FreeImagePlus PUBLIC FreeImage) + +list(APPEND PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/Wrapper/FreeImagePlus/FreeImagePlus.h) + +install(TARGETS FreeImage FreeImagePlus + EXPORT freeimage-targets + COMPONENT runtime + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") + +install(EXPORT freeimage-targets NAMESPACE freeimage:: DESTINATION share/freeimage) + +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/freeimage-config.cmake" +"include(CMakeFindDependencyMacro) +find_dependency(ZLIB) +find_dependency(PNG) +find_dependency(JPEG) +find_dependency(TIFF) +find_dependency(OpenJPEG) +find_dependency(WebP CONFIG) +find_dependency(JXR) +find_dependency(LibRaw) +find_dependency(OpenEXR) +include(\"\${CMAKE_CURRENT_LIST_DIR}/freeimage-targets.cmake\") +") + +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/freeimage-config.cmake DESTINATION share/freeimage) +if(INSTALL_HEADERS) + install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +endif() diff --git a/externals/vcpkg/ports/freeimage/FreeImageConfig-dynamic.h b/externals/vcpkg/ports/freeimage/FreeImageConfig-dynamic.h new file mode 100755 index 000000000..41dcf57d9 --- /dev/null +++ b/externals/vcpkg/ports/freeimage/FreeImageConfig-dynamic.h @@ -0,0 +1,6 @@ +#ifndef FREEIMAGE_CONFIG_H +#define FREEIMAGE_CONFIG_H + +#undef FREEIMAGE_LIB + +#endif diff --git a/externals/vcpkg/ports/freeimage/FreeImageConfig-static.h b/externals/vcpkg/ports/freeimage/FreeImageConfig-static.h new file mode 100755 index 000000000..ed723490e --- /dev/null +++ b/externals/vcpkg/ports/freeimage/FreeImageConfig-static.h @@ -0,0 +1,6 @@ +#ifndef FREEIMAGE_CONFIG_H +#define FREEIMAGE_CONFIG_H + +#define FREEIMAGE_LIB + +#endif diff --git a/externals/vcpkg/ports/freeimage/disable-plugins-depending-on-internal-third-party-libraries.patch b/externals/vcpkg/ports/freeimage/disable-plugins-depending-on-internal-third-party-libraries.patch new file mode 100755 index 000000000..c22828dee --- /dev/null +++ b/externals/vcpkg/ports/freeimage/disable-plugins-depending-on-internal-third-party-libraries.patch @@ -0,0 +1,89 @@ +diff --git a/Source/FreeImage.h b/Source/FreeImage.h +index 12182cd..ebd0453 100644 +--- a/Source/FreeImage.h ++++ b/Source/FreeImage.h +@@ -410,16 +410,20 @@ FI_ENUM(FREE_IMAGE_FORMAT) { + FIF_DDS = 24, + FIF_GIF = 25, + FIF_HDR = 26, +- FIF_FAXG3 = 27, +- FIF_SGI = 28, +- FIF_EXR = 29, +- FIF_J2K = 30, +- FIF_JP2 = 31, +- FIF_PFM = 32, +- FIF_PICT = 33, +- FIF_RAW = 34, +- FIF_WEBP = 35, +- FIF_JXR = 36 ++/* vcpkg: The G3 fax format plugin is deliberately disabled in our build of ++ FreeImage, since it requires usage of the vendored copy of libtiff. */ ++#if 0 ++ FIF_FAXG3 = 27, ++#endif ++ FIF_SGI = 27, ++ FIF_EXR = 28, ++ FIF_J2K = 29, ++ FIF_JP2 = 30, ++ FIF_PFM = 31, ++ FIF_PICT = 32, ++ FIF_RAW = 33, ++ FIF_WEBP = 34, ++ FIF_JXR = 35 + }; + + /** Image type used in FreeImage. +@@ -476,6 +480,9 @@ FI_ENUM(FREE_IMAGE_DITHER) { + /** Lossless JPEG transformations + Constants used in FreeImage_JPEGTransform + */ ++/* vcpkg: The JPEGTransform functions are deliberately disabled in our build ++ of FreeImage, since they require usage of the vendored copy of libjpeg. */ ++#if 0 + FI_ENUM(FREE_IMAGE_JPEG_OPERATION) { + FIJPEG_OP_NONE = 0, //! no transformation + FIJPEG_OP_FLIP_H = 1, //! horizontal flip +@@ -486,6 +493,7 @@ FI_ENUM(FREE_IMAGE_JPEG_OPERATION) { + FIJPEG_OP_ROTATE_180 = 6, //! 180-degree rotation + FIJPEG_OP_ROTATE_270 = 7 //! 270-degree clockwise (or 90 ccw) + }; ++#endif + + /** Tone mapping operators. + Constants used in FreeImage_ToneMapping. +@@ -1089,6 +1097,9 @@ DLL_API const char* DLL_CALLCONV FreeImage_TagToString(FREE_IMAGE_MDMODEL model, + // JPEG lossless transformation routines + // -------------------------------------------------------------------------- + ++/* vcpkg: The JPEGTransform functions are deliberately disabled in our build ++ of FreeImage, since they require usage of the vendored copy of libjpeg. */ ++#if 0 + DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransform(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(TRUE)); + DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(TRUE)); + DLL_API BOOL DLL_CALLCONV FreeImage_JPEGCrop(const char *src_file, const char *dst_file, int left, int top, int right, int bottom); +@@ -1097,7 +1108,7 @@ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformFromHandle(FreeImageIO* src_io, + DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombined(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE)); + DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE)); + DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedFromMemory(FIMEMORY* src_stream, FIMEMORY* dst_stream, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE)); +- ++#endif + + // -------------------------------------------------------------------------- + // Image manipulation toolkit +diff --git a/Source/FreeImage/Plugin.cpp b/Source/FreeImage/Plugin.cpp +index 11e7294..0119ba7 100644 +--- a/Source/FreeImage/Plugin.cpp ++++ b/Source/FreeImage/Plugin.cpp +@@ -263,7 +263,11 @@ FreeImage_Initialise(BOOL load_local_plugins_only) { + s_plugins->AddNode(InitDDS); + s_plugins->AddNode(InitGIF); + s_plugins->AddNode(InitHDR); +- s_plugins->AddNode(InitG3); ++/* vcpkg: The G3 fax format plugin is deliberately disabled in our build of FreeImage +++ since it requires usage of the vendored copy of libtiff. */ ++#if 0 ++ s_plugins->AddNode(InitG3); ++#endif + s_plugins->AddNode(InitSGI); + s_plugins->AddNode(InitEXR); + s_plugins->AddNode(InitJ2K); diff --git a/externals/vcpkg/ports/freeimage/fix-function-overload.patch b/externals/vcpkg/ports/freeimage/fix-function-overload.patch new file mode 100755 index 000000000..adb1164f6 --- /dev/null +++ b/externals/vcpkg/ports/freeimage/fix-function-overload.patch @@ -0,0 +1,40 @@ +diff --git a/Source/FreeImage/PluginJPEG.cpp b/Source/FreeImage/PluginJPEG.cpp +index 8db177d..efa2c4e 100644 +--- a/Source/FreeImage/PluginJPEG.cpp ++++ b/Source/FreeImage/PluginJPEG.cpp +@@ -503,7 +503,7 @@ marker_is_icc(jpeg_saved_marker_ptr marker) { + return FALSE. You might want to issue an error message instead. + */ + static BOOL +-jpeg_read_icc_profile(j_decompress_ptr cinfo, JOCTET **icc_data_ptr, unsigned *icc_data_len) { ++jpeg_read_icc_profile_(j_decompress_ptr cinfo, JOCTET **icc_data_ptr, unsigned *icc_data_len) { + jpeg_saved_marker_ptr marker; + int num_markers = 0; + int seq_no; +@@ -745,7 +745,7 @@ read_markers(j_decompress_ptr cinfo, FIBITMAP *dib) { + BYTE *icc_profile = NULL; + unsigned icc_length = 0; + +- if( jpeg_read_icc_profile(cinfo, &icc_profile, &icc_length) ) { ++ if( jpeg_read_icc_profile_(cinfo, &icc_profile, &icc_length) ) { + // copy ICC profile data + FreeImage_CreateICCProfile(dib, icc_profile, icc_length); + // clean up +@@ -785,7 +785,7 @@ jpeg_write_comment(j_compress_ptr cinfo, FIBITMAP *dib) { + Write JPEG_APP2 marker (ICC profile) + */ + static BOOL +-jpeg_write_icc_profile(j_compress_ptr cinfo, FIBITMAP *dib) { ++jpeg_write_icc_profile_(j_compress_ptr cinfo, FIBITMAP *dib) { + // marker identifying string "ICC_PROFILE" (null-terminated) + BYTE icc_signature[12] = { 0x49, 0x43, 0x43, 0x5F, 0x50, 0x52, 0x4F, 0x46, 0x49, 0x4C, 0x45, 0x00 }; + +@@ -1038,7 +1038,7 @@ write_markers(j_compress_ptr cinfo, FIBITMAP *dib) { + jpeg_write_comment(cinfo, dib); + + // write ICC profile +- jpeg_write_icc_profile(cinfo, dib); ++ jpeg_write_icc_profile_(cinfo, dib); + + // write IPTC profile + jpeg_write_iptc_profile(cinfo, dib); diff --git a/externals/vcpkg/ports/freeimage/portfile.cmake b/externals/vcpkg/ports/freeimage/portfile.cmake new file mode 100755 index 000000000..ce1b86821 --- /dev/null +++ b/externals/vcpkg/ports/freeimage/portfile.cmake @@ -0,0 +1,51 @@ +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO freeimage/Source%20Distribution + REF 3.18.0 + FILENAME "FreeImage3180.zip" + SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818 + PATCHES + disable-plugins-depending-on-internal-third-party-libraries.patch + use-external-jpeg.patch + use-external-jxrlib.patch + use-external-libtiff.patch + use-external-openjpeg.patch + use-external-png-zlib.patch + use-external-rawlib.patch + use-external-webp.patch + use-external-openexr.patch + use-freeimage-config-include.patch + fix-function-overload.patch + use-typedef-as-already-declared.patch + use-functions-to-override-libtiff-warning-error-handlers.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/FreeImageConfig-static.h DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/FreeImageConfig-dynamic.h DESTINATION ${SOURCE_PATH}) + +# This is not strictly necessary, but to make sure +# that no "internal" libraries are used we remove them +file(REMOVE_RECURSE ${SOURCE_PATH}/Source/LibJPEG) +file(REMOVE_RECURSE ${SOURCE_PATH}/Source/LibPNG) +file(REMOVE_RECURSE ${SOURCE_PATH}/Source/LibTIFF4) +file(REMOVE_RECURSE ${SOURCE_PATH}/Source/ZLib) +file(REMOVE_RECURSE ${SOURCE_PATH}/Source/LibOpenJPEG) +file(REMOVE_RECURSE ${SOURCE_PATH}/Source/LibJXR) +file(REMOVE_RECURSE ${SOURCE_PATH}/Source/LibWebP) +file(REMOVE_RECURSE ${SOURCE_PATH}/Source/LibRawLite) +file(REMOVE_RECURSE ${SOURCE_PATH}/Source/OpenEXR) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DINSTALL_HEADERS=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets() + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/license-fi.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/freeimage/use-external-jpeg.patch b/externals/vcpkg/ports/freeimage/use-external-jpeg.patch new file mode 100755 index 000000000..2df2c9d2d --- /dev/null +++ b/externals/vcpkg/ports/freeimage/use-external-jpeg.patch @@ -0,0 +1,17 @@ +diff --git a/Source/FreeImage/PluginJPEG.cpp b/Source/FreeImage/PluginJPEG.cpp +index 573989c..aaeefa4 100644 +--- a/Source/FreeImage/PluginJPEG.cpp ++++ b/Source/FreeImage/PluginJPEG.cpp +@@ -35,9 +35,9 @@ extern "C" { + #undef FAR + #include + +-#include "../LibJPEG/jinclude.h" +-#include "../LibJPEG/jpeglib.h" +-#include "../LibJPEG/jerror.h" ++#include ++#include ++#include + } + + #include "FreeImage.h" diff --git a/externals/vcpkg/ports/freeimage/use-external-jxrlib.patch b/externals/vcpkg/ports/freeimage/use-external-jxrlib.patch new file mode 100755 index 000000000..d86a18e82 --- /dev/null +++ b/externals/vcpkg/ports/freeimage/use-external-jxrlib.patch @@ -0,0 +1,14 @@ +diff --git a/Source/FreeImage/PluginJXR.cpp b/Source/FreeImage/PluginJXR.cpp +index 0e14e09..8eb9d5d 100644 +--- a/Source/FreeImage/PluginJXR.cpp ++++ b/Source/FreeImage/PluginJXR.cpp +@@ -23,7 +23,8 @@ + #include "Utilities.h" + #include "../Metadata/FreeImageTag.h" + +-#include "../LibJXR/jxrgluelib/JXRGlue.h" ++#define INITGUID ++#include + + // ========================================================== + // Plugin Interface diff --git a/externals/vcpkg/ports/freeimage/use-external-libtiff.patch b/externals/vcpkg/ports/freeimage/use-external-libtiff.patch new file mode 100755 index 000000000..23d5dfd1d --- /dev/null +++ b/externals/vcpkg/ports/freeimage/use-external-libtiff.patch @@ -0,0 +1,204 @@ +diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp +index 5068d94..8947b03 100644 +--- a/Source/FreeImage/PluginTIFF.cpp ++++ b/Source/FreeImage/PluginTIFF.cpp +@@ -37,9 +37,9 @@ + + #include "FreeImage.h" + #include "Utilities.h" +-#include "../LibTIFF4/tiffiop.h" ++#include + #include "../Metadata/FreeImageTag.h" + #include "../OpenEXR/Half/half.h" + + #include "FreeImageIO.h" + #include "PSDParser.h" +@@ -199,15 +199,18 @@ Open a TIFF file for reading or writing + @param name + @param mode + */ ++/* + TIFF* + TIFFOpen(const char* name, const char* mode) { + return 0; + } ++*/ + + // ---------------------------------------------------------- + // TIFF library FreeImage-specific routines. + // ---------------------------------------------------------- + ++/* + void* + _TIFFmalloc(tmsize_t s) { + return malloc(s); +@@ -245,6 +248,7 @@ int + _TIFFmemcmp(const void* p1, const void* p2, tmsize_t c) { + return (memcmp(p1, p2, (size_t) c)); + } ++*/ + + // ---------------------------------------------------------- + // in FreeImage warnings and errors are disabled + +diff --git a/Source/Metadata/XTIFF.cpp b/Source/Metadata/XTIFF.cpp +index d5be902..8dbcd5d 100644 +--- a/Source/Metadata/XTIFF.cpp ++++ b/Source/Metadata/XTIFF.cpp +@@ -29,7 +29,7 @@ + #pragma warning (disable : 4786) // identifier was truncated to 'number' characters + #endif + +-#include "../LibTIFF4/tiffiop.h" ++#include + + #include "FreeImage.h" + #include "Utilities.h" +@@ -40,6 +40,43 @@ + // Extended TIFF Directory GEO Tag Support + // ---------------------------------------------------------- + ++// vcpkg: function imported from libtiff/tif_dirinfo.c, in which it is not exported ++/* ++ * Return size of TIFFDataType in bytes. ++ * ++ * XXX: We need a separate function to determine the space needed ++ * to store the value. For TIFF_RATIONAL values TIFFDataWidth() returns 8, ++ * but we use 4-byte float to represent rationals. ++ */ ++int ++FreeImage_TIFFDataSize(TIFFDataType type) ++{ ++ switch (type) ++ { ++ case TIFF_BYTE: ++ case TIFF_SBYTE: ++ case TIFF_ASCII: ++ case TIFF_UNDEFINED: ++ return 1; ++ case TIFF_SHORT: ++ case TIFF_SSHORT: ++ return 2; ++ case TIFF_LONG: ++ case TIFF_SLONG: ++ case TIFF_FLOAT: ++ case TIFF_IFD: ++ case TIFF_RATIONAL: ++ case TIFF_SRATIONAL: ++ return 4; ++ case TIFF_DOUBLE: ++ case TIFF_LONG8: ++ case TIFF_SLONG8: ++ case TIFF_IFD8: ++ return 8; ++ default: ++ return 0; ++ } ++} + /** + Tiff info structure. + Entry format: +@@ -224,6 +261,33 @@ tiff_write_geotiff_profile(TIFF *tif, FIBITMAP *dib) { + // TIFF EXIF tag reading & writing + // ---------------------------------------------------------- + ++static uint32 exif_tag_ids[] = { ++ EXIFTAG_EXPOSURETIME, EXIFTAG_FNUMBER, EXIFTAG_EXPOSUREPROGRAM, ++ EXIFTAG_SPECTRALSENSITIVITY, EXIFTAG_ISOSPEEDRATINGS, EXIFTAG_OECF, ++ EXIFTAG_EXIFVERSION, EXIFTAG_DATETIMEORIGINAL, EXIFTAG_DATETIMEDIGITIZED, ++ EXIFTAG_COMPONENTSCONFIGURATION, EXIFTAG_COMPRESSEDBITSPERPIXEL, ++ EXIFTAG_SHUTTERSPEEDVALUE, EXIFTAG_APERTUREVALUE, ++ EXIFTAG_BRIGHTNESSVALUE, EXIFTAG_EXPOSUREBIASVALUE, ++ EXIFTAG_MAXAPERTUREVALUE, EXIFTAG_SUBJECTDISTANCE, EXIFTAG_METERINGMODE, ++ EXIFTAG_LIGHTSOURCE, EXIFTAG_FLASH, EXIFTAG_FOCALLENGTH, ++ EXIFTAG_SUBJECTAREA, EXIFTAG_MAKERNOTE, EXIFTAG_USERCOMMENT, ++ EXIFTAG_SUBSECTIME, EXIFTAG_SUBSECTIMEORIGINAL, ++ EXIFTAG_SUBSECTIMEDIGITIZED, EXIFTAG_FLASHPIXVERSION, EXIFTAG_COLORSPACE, ++ EXIFTAG_PIXELXDIMENSION, EXIFTAG_PIXELYDIMENSION, ++ EXIFTAG_RELATEDSOUNDFILE, EXIFTAG_FLASHENERGY, ++ EXIFTAG_SPATIALFREQUENCYRESPONSE, EXIFTAG_FOCALPLANEXRESOLUTION, ++ EXIFTAG_FOCALPLANEYRESOLUTION, EXIFTAG_FOCALPLANERESOLUTIONUNIT, ++ EXIFTAG_SUBJECTLOCATION, EXIFTAG_EXPOSUREINDEX, EXIFTAG_SENSINGMETHOD, ++ EXIFTAG_FILESOURCE, EXIFTAG_SCENETYPE, EXIFTAG_CFAPATTERN, ++ EXIFTAG_CUSTOMRENDERED, EXIFTAG_EXPOSUREMODE, EXIFTAG_WHITEBALANCE, ++ EXIFTAG_DIGITALZOOMRATIO, EXIFTAG_FOCALLENGTHIN35MMFILM, ++ EXIFTAG_SCENECAPTURETYPE, EXIFTAG_GAINCONTROL, EXIFTAG_CONTRAST, ++ EXIFTAG_SATURATION, EXIFTAG_SHARPNESS, EXIFTAG_DEVICESETTINGDESCRIPTION, ++ EXIFTAG_SUBJECTDISTANCERANGE, EXIFTAG_GAINCONTROL, EXIFTAG_GAINCONTROL, ++ EXIFTAG_IMAGEUNIQUEID ++}; ++static int nExifTags = sizeof(exif_tag_ids) / sizeof(exif_tag_ids[0]); ++ + /** + Read a single Exif tag + +@@ -575,43 +639,10 @@ tiff_read_exif_tags(TIFF *tif, TagLib::MDMODEL md_model, FIBITMAP *dib) { + + // loop over all Core Directory Tags + // ### uses private data, but there is no other way ++ // -> vcpkg: Best we can do without private headers is to hard-code a list of known EXIF tags and read those + if(md_model == TagLib::EXIF_MAIN) { +- const TIFFDirectory *td = &tif->tif_dir; +- +- uint32 lastTag = 0; //<- used to prevent reading some tags twice (as stored in tif_fieldinfo) +- +- for (int fi = 0, nfi = (int)tif->tif_nfields; nfi > 0; nfi--, fi++) { +- const TIFFField *fld = tif->tif_fields[fi]; +- +- const uint32 tag_id = TIFFFieldTag(fld); +- +- if(tag_id == lastTag) { +- continue; +- } +- +- // test if tag value is set +- // (lifted directly from LibTiff _TIFFWriteDirectory) +- +- if( fld->field_bit == FIELD_CUSTOM ) { +- int is_set = FALSE; +- +- for(int ci = 0; ci < td->td_customValueCount; ci++ ) { +- is_set |= (td->td_customValues[ci].info == fld); +- } +- +- if( !is_set ) { +- continue; +- } +- +- } else if(!TIFFFieldSet(tif, fld->field_bit)) { +- continue; +- } +- +- // process *all* other tags (some will be ignored) +- +- tiff_read_exif_tag(tif, tag_id, dib, md_model); +- +- lastTag = tag_id; ++ for (int i = 0; i < nExifTags; ++i) { ++ tiff_read_exif_tag(tif, exif_tag_ids[i], dib, md_model); + } + + } +@@ -723,10 +754,9 @@ tiff_write_exif_tags(TIFF *tif, TagLib::MDMODEL md_model, FIBITMAP *dib) { + + TagLib& tag_lib = TagLib::instance(); + +- for (int fi = 0, nfi = (int)tif->tif_nfields; nfi > 0; nfi--, fi++) { +- const TIFFField *fld = tif->tif_fields[fi]; +- +- const uint32 tag_id = TIFFFieldTag(fld); ++ for (int fi = 0, nfi = nExifTags; nfi > 0; nfi--, fi++) { ++ const uint32 tag_id = exif_tag_ids[fi]; ++ const TIFFField *fld = TIFFFieldWithTag(tif, tag_id); + + if(skip_write_field(tif, tag_id)) { + // skip tags that are already handled by the LibTIFF writing process +@@ -749,7 +779,7 @@ tiff_write_exif_tags(TIFF *tif, TagLib::MDMODEL md_model, FIBITMAP *dib) { + continue; + } + // type of storage may differ (e.g. rationnal array vs float array type) +- if((unsigned)_TIFFDataSize(tif_tag_type) != FreeImage_TagDataWidth(tag_type)) { ++ if((unsigned)FreeImage_TIFFDataSize(tif_tag_type) != FreeImage_TagDataWidth(tag_type)) { + // skip tag or _TIFFmemcpy will fail + continue; + } diff --git a/externals/vcpkg/ports/freeimage/use-external-openexr.patch b/externals/vcpkg/ports/freeimage/use-external-openexr.patch new file mode 100755 index 000000000..08915da72 --- /dev/null +++ b/externals/vcpkg/ports/freeimage/use-external-openexr.patch @@ -0,0 +1,44 @@ +diff --git a/Source/FreeImage/PluginEXR.cpp b/Source/FreeImage/PluginEXR.cpp +index b286430..82b3b72 100644 +--- a/Source/FreeImage/PluginEXR.cpp ++++ b/Source/FreeImage/PluginEXR.cpp +@@ -28,16 +28,16 @@ + #pragma warning (disable : 4800) // ImfVersion.h - 'const int' : forcing value to bool 'true' or 'false' (performance warning) + #endif + +-#include "../OpenEXR/IlmImf/ImfIO.h" +-#include "../OpenEXR/Iex/Iex.h" +-#include "../OpenEXR/IlmImf/ImfOutputFile.h" +-#include "../OpenEXR/IlmImf/ImfInputFile.h" +-#include "../OpenEXR/IlmImf/ImfRgbaFile.h" +-#include "../OpenEXR/IlmImf/ImfChannelList.h" +-#include "../OpenEXR/IlmImf/ImfRgba.h" +-#include "../OpenEXR/IlmImf/ImfArray.h" +-#include "../OpenEXR/IlmImf/ImfPreviewImage.h" +-#include "../OpenEXR/Half/half.h" ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + + + // ========================================================== +diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp +index 562fdd7..ce12649 100644 +--- a/Source/FreeImage/PluginTIFF.cpp ++++ b/Source/FreeImage/PluginTIFF.cpp +@@ -39,7 +39,7 @@ + #include "Utilities.h" + #include + #include "../Metadata/FreeImageTag.h" +-#include "../OpenEXR/Half/half.h" ++#include + + #include "FreeImageIO.h" + #include "PSDParser.h" diff --git a/externals/vcpkg/ports/freeimage/use-external-openjpeg.patch b/externals/vcpkg/ports/freeimage/use-external-openjpeg.patch new file mode 100755 index 000000000..fa4f8e7b6 --- /dev/null +++ b/externals/vcpkg/ports/freeimage/use-external-openjpeg.patch @@ -0,0 +1,39 @@ +diff --git a/Source/FreeImage/J2KHelper.cpp b/Source/FreeImage/J2KHelper.cpp +index 1776c3b..538f1c5 100644 +--- a/Source/FreeImage/J2KHelper.cpp ++++ b/Source/FreeImage/J2KHelper.cpp +@@ -21,7 +21,7 @@ + + #include "FreeImage.h" + #include "Utilities.h" +-#include "../LibOpenJPEG/openjpeg.h" ++#include + #include "J2KHelper.h" + + // -------------------------------------------------------------------------- +diff --git a/Source/FreeImage/PluginJ2K.cpp b/Source/FreeImage/PluginJ2K.cpp +index b8bcfc8..621a903 100644 +--- a/Source/FreeImage/PluginJ2K.cpp ++++ b/Source/FreeImage/PluginJ2K.cpp +@@ -21,7 +21,7 @@ + + #include "FreeImage.h" + #include "Utilities.h" +-#include "../LibOpenJPEG/openjpeg.h" ++#include + #include "J2KHelper.h" + + // ========================================================== +diff --git a/Source/FreeImage/PluginJP2.cpp b/Source/FreeImage/PluginJP2.cpp +index 742fe2c..c57f626 100644 +--- a/Source/FreeImage/PluginJP2.cpp ++++ b/Source/FreeImage/PluginJP2.cpp +@@ -21,7 +21,7 @@ + + #include "FreeImage.h" + #include "Utilities.h" +-#include "../LibOpenJPEG/openjpeg.h" ++#include + #include "J2KHelper.h" + + // ========================================================== diff --git a/externals/vcpkg/ports/freeimage/use-external-png-zlib.patch b/externals/vcpkg/ports/freeimage/use-external-png-zlib.patch new file mode 100755 index 000000000..da489b6b8 --- /dev/null +++ b/externals/vcpkg/ports/freeimage/use-external-png-zlib.patch @@ -0,0 +1,40 @@ +diff --git a/Source/FreeImage/PluginPNG.cpp b/Source/FreeImage/PluginPNG.cpp +index ba2ef17..c3c5cd6 100644 +--- a/Source/FreeImage/PluginPNG.cpp ++++ b/Source/FreeImage/PluginPNG.cpp +@@ -40,8 +40,8 @@ + + // ---------------------------------------------------------- + +-#include "../ZLib/zlib.h" +-#include "../LibPNG/png.h" ++#include ++#include + + // ---------------------------------------------------------- + +diff --git a/Source/FreeImage/ZLibInterface.cpp b/Source/FreeImage/ZLibInterface.cpp +index 3ab6d32..725618b 100644 +--- a/Source/FreeImage/ZLibInterface.cpp ++++ b/Source/FreeImage/ZLibInterface.cpp +@@ -19,10 +19,9 @@ + // Use at your own risk! + // ========================================================== + +-#include "../ZLib/zlib.h" ++#include + #include "FreeImage.h" + #include "Utilities.h" +-#include "../ZLib/zutil.h" /* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */ + + /** + Compresses a source buffer into a target buffer, using the ZLib library. +@@ -115,7 +114,7 @@ FreeImage_ZLibGZip(BYTE *target, DWORD target_size, BYTE *source, DWORD source_s + return 0; + case Z_OK: { + // patch header, setup crc and length (stolen from mod_trace_output) +- BYTE *p = target + 8; *p++ = 2; *p = OS_CODE; // xflags, os_code ++ BYTE *p = target + 8; *p++ = 2; *p = 0x03; // xflags, os_code + crc = crc32(crc, source, source_size); + memcpy(target + 4 + dest_len, &crc, 4); + memcpy(target + 8 + dest_len, &source_size, 4); diff --git a/externals/vcpkg/ports/freeimage/use-external-rawlib.patch b/externals/vcpkg/ports/freeimage/use-external-rawlib.patch new file mode 100755 index 000000000..6afa0bffa --- /dev/null +++ b/externals/vcpkg/ports/freeimage/use-external-rawlib.patch @@ -0,0 +1,13 @@ +diff --git a/Source/FreeImage/PluginRAW.cpp b/Source/FreeImage/PluginRAW.cpp +index e9bd5bf..c7f8758 100644 +--- a/Source/FreeImage/PluginRAW.cpp ++++ b/Source/FreeImage/PluginRAW.cpp +@@ -19,7 +19,7 @@ + // Use at your own risk! + // ========================================================== + +-#include "../LibRawLite/libraw/libraw.h" ++#include + + #include "FreeImage.h" + #include "Utilities.h" diff --git a/externals/vcpkg/ports/freeimage/use-external-webp.patch b/externals/vcpkg/ports/freeimage/use-external-webp.patch new file mode 100755 index 000000000..4d1757c39 --- /dev/null +++ b/externals/vcpkg/ports/freeimage/use-external-webp.patch @@ -0,0 +1,17 @@ +diff --git a/Source/FreeImage/PluginWebP.cpp b/Source/FreeImage/PluginWebP.cpp +index 7c9f62f..c401447 100644 +--- a/Source/FreeImage/PluginWebP.cpp ++++ b/Source/FreeImage/PluginWebP.cpp +@@ -24,9 +24,9 @@ + + #include "../Metadata/FreeImageTag.h" + +-#include "../LibWebP/src/webp/decode.h" +-#include "../LibWebP/src/webp/encode.h" +-#include "../LibWebP/src/webp/mux.h" ++#include ++#include ++#include + + // ========================================================== + // Plugin Interface diff --git a/externals/vcpkg/ports/freeimage/use-freeimage-config-include.patch b/externals/vcpkg/ports/freeimage/use-freeimage-config-include.patch new file mode 100755 index 000000000..579f08845 --- /dev/null +++ b/externals/vcpkg/ports/freeimage/use-freeimage-config-include.patch @@ -0,0 +1,16 @@ +diff --git a/Source/FreeImage.h b/Source/FreeImage.h +index 12182cd..86a1e68 100644 +--- a/Source/FreeImage.h ++++ b/Source/FreeImage.h +@@ -32,6 +32,11 @@ + #define FREEIMAGE_MINOR_VERSION 18 + #define FREEIMAGE_RELEASE_SERIAL 0 + ++// vcpkg specific includes -------------------------------------------------- ++// Include FreeImageConfig.h to define FREEIMAGE_LIB in static builds, ++// or do not define it in dynamic builds ++#include "FreeImageConfig.h" ++ + // Compiler options --------------------------------------------------------- + + #include // needed for UNICODE functions diff --git a/externals/vcpkg/ports/freeimage/use-functions-to-override-libtiff-warning-error-handlers.patch b/externals/vcpkg/ports/freeimage/use-functions-to-override-libtiff-warning-error-handlers.patch new file mode 100755 index 000000000..270331e26 --- /dev/null +++ b/externals/vcpkg/ports/freeimage/use-functions-to-override-libtiff-warning-error-handlers.patch @@ -0,0 +1,31 @@ +diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp +index a9fcf0e..b1f7b32 100644 +--- a/Source/FreeImage/PluginTIFF.cpp ++++ b/Source/FreeImage/PluginTIFF.cpp +@@ -258,7 +258,7 @@ static void + msdosWarningHandler(const char* module, const char* fmt, va_list ap) { + } + +-TIFFErrorHandler _TIFFwarningHandler = msdosWarningHandler; ++//TIFFErrorHandler _TIFFwarningHandler = msdosWarningHandler; + + static void + msdosErrorHandler(const char* module, const char* fmt, va_list ap) { +@@ -273,7 +273,7 @@ msdosErrorHandler(const char* module, const char* fmt, va_list ap) { + */ + } + +-TIFFErrorHandler _TIFFerrorHandler = msdosErrorHandler; ++//TIFFErrorHandler _TIFFerrorHandler = msdosErrorHandler; + + // ---------------------------------------------------------- + +@@ -2659,6 +2659,8 @@ InitTIFF(Plugin *plugin, int format_id) { + // Set up the callback for extended TIFF directory tag support (see XTIFF.cpp) + // Must be called before using libtiff + XTIFFInitialize(); ++ TIFFSetWarningHandler(msdosWarningHandler); ++ TIFFSetErrorHandler(msdosErrorHandler); + + plugin->format_proc = Format; + plugin->description_proc = Description; diff --git a/externals/vcpkg/ports/freeimage/use-typedef-as-already-declared.patch b/externals/vcpkg/ports/freeimage/use-typedef-as-already-declared.patch new file mode 100755 index 000000000..80d367bcb --- /dev/null +++ b/externals/vcpkg/ports/freeimage/use-typedef-as-already-declared.patch @@ -0,0 +1,15 @@ +diff --git a/Source/FreeImage.h b/Source/FreeImage.h +index 1fd9c2f..59de277 100644 +--- a/Source/FreeImage.h ++++ b/Source/FreeImage.h +@@ -160,8 +160,8 @@ typedef uint8_t BYTE; + typedef uint16_t WORD; + typedef uint32_t DWORD; + typedef int32_t LONG; +-typedef int64_t INT64; +-typedef uint64_t UINT64; ++typedef long long int INT64; ++typedef long long unsigned int UINT64; + #else + // MS is not C99 ISO compliant + typedef long BOOL; diff --git a/externals/vcpkg/ports/freeimage/vcpkg.json b/externals/vcpkg/ports/freeimage/vcpkg.json new file mode 100755 index 000000000..08fbf28d2 --- /dev/null +++ b/externals/vcpkg/ports/freeimage/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "freeimage", + "version": "3.18.0", + "port-version": 22, + "description": "Support library for graphics image formats", + "homepage": "https://sourceforge.net/projects/freeimage/", + "dependencies": [ + "jxrlib", + "libjpeg-turbo", + "libpng", + "libraw", + { + "name": "libwebp", + "platform": "!uwp" + }, + "openexr", + "openjpeg", + "tiff", + "zlib" + ] +} diff --git a/externals/vcpkg/ports/freeopcua/boost-1.70.patch b/externals/vcpkg/ports/freeopcua/boost-1.70.patch new file mode 100755 index 000000000..d099af4cc --- /dev/null +++ b/externals/vcpkg/ports/freeopcua/boost-1.70.patch @@ -0,0 +1,29 @@ +diff --git a/src/server/opc_tcp_async.cpp b/src/server/opc_tcp_async.cpp +index 9c34d72..9e68d9b 100644 +--- a/src/server/opc_tcp_async.cpp ++++ b/src/server/opc_tcp_async.cpp +@@ -106,7 +106,11 @@ public: + */ + typedef std::promise Promise; + Promise promise; ++#if BOOST_VERSION >= 107000 ++ boost::asio::post(Socket.get_executor(), bind(&Promise::set_value, &promise)); ++#else + Socket.get_io_service().post(bind(&Promise::set_value, &promise)); ++#endif + promise.get_future().wait(); + } + +@@ -372,7 +376,11 @@ void OpcTcpServer::Shutdown() + */ + typedef std::promise Promise; + Promise promise; +- acceptor.get_io_service().post(bind(&Promise::set_value, &promise)); ++#if BOOST_VERSION >= 107000 ++ boost::asio::post(acceptor.get_executor(), bind(&Promise::set_value, &promise)); ++#else ++ acceptor.get_io_service().post(bind(&Promise::set_value, &promise)); ++#endif + promise.get_future().wait(); + } + diff --git a/externals/vcpkg/ports/freeopcua/cmakelists_fixes.patch b/externals/vcpkg/ports/freeopcua/cmakelists_fixes.patch new file mode 100755 index 000000000..f818eab35 --- /dev/null +++ b/externals/vcpkg/ports/freeopcua/cmakelists_fixes.patch @@ -0,0 +1,238 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index de03564..df3fcf6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,11 +1,8 @@ + cmake_minimum_required(VERSION 2.8) + +-#It seems Cmake does not set default bild type so we force it +-if( NOT CMAKE_BUILD_TYPE ) +- set( CMAKE_BUILD_TYPE Debug CACHE STRING "Debug" FORCE ) +-endif() +- + project(freeopcua) ++set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_POSITION_INDEPENDENT_CODE ON) + + option(BUILD_CLIENT "Build Client" ON) + option(BUILD_SERVER "Build Server" ON) +@@ -16,28 +13,6 @@ option(BUILD_PYTHON "Build Python bindings" ON) + option(BUILD_TESTING "Build and run tests" OFF) + OPTION(BUILD_SHARED_LIBS "Build shared libraries." ON) + +-IF (NOT DEFINED CMAKE_INSTALL_LIBDIR) +- SET(CMAKE_INSTALL_LIBDIR lib) +-ENDIF () +- +-SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY +- ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR} +- CACHE PATH +- "" +- ) +- +-SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY +- ${PROJECT_BINARY_DIR}/bin +- CACHE PATH +- "" +- ) +- +-SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY +- ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR} +- CACHE PATH +- "" +- ) +- + # Helper function to generate a pkg-config file for a single library + # Takes the filename of the .pc file as a parameter and replaces all + # placeholders in the .pc.in file with the actual values +@@ -60,23 +35,9 @@ function(generate_pkgconfig BASENAME) + endif() + endfunction(generate_pkgconfig) + if(MSVC) +- SET(STATIC_LIBRARY_CXX_FLAGS /MDd CACHE STRING "") +- SET(EXECUTABLE_CXX_FLAGS /MDd CACHE STRING "") +- SET(DYNAMIC_LIBRARY_CXX_FLAGS /MDd CACHE STRING "") +- SET(D /D) +- +- add_definitions(/D_SCL_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS /D_WIN32 /D_WINDOWS /FS /D_WIN32_WINNT=0x0600) +- add_compile_options(/Zi /Od /EHsc /W4) +-else(MSVC) +- set(CMAKE_CXX_FLAGS_DEBUG " -Wall -ggdb -o0 ${CMAKE_CXX_FLAGS_DEBUG}") +- +- SET(STATIC_LIBRARY_CXX_FLAGS) +- SET(EXECUTABLE_CXX_FLAGS) +- SET(DYNAMIC_LIBRARY_CXX_FLAGS) +- SET(D -D) +- set(CMAKE_CXX_FLAGS " -std=c++11 -Wall -fPIC ${CMAKE_CXX_FLAGS} ") +- SET (CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS_INIT} $ENV{LDFLAGS}) +- #set(CMAKE_SHARED_LINKER_FLAGS "--no-undefined" ) ++ add_definitions(-D_SCL_SECURE_NO_WARNINGS) ++ add_definitions(-D_CRT_SECURE_NO_WARNINGS) ++ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE) + endif() + + if(WIN32) +@@ -105,7 +66,7 @@ else(WIN32) + + endif(WIN32) + +-find_package( Boost COMPONENTS system program_options filesystem thread REQUIRED ) ++find_package( Boost COMPONENTS system program_options filesystem thread date_time REQUIRED ) + include_directories( ${Boost_INCLUDE_DIRS} ) + link_directories( ${Boost_LIBRARY_DIRS} ) + message(STATUS "Boost INCLUDE DIR IS: " ${Boost_INCLUDE_DIRS}) +@@ -185,14 +146,12 @@ add_library(opcuaprotocol + src/protocol/subscriptions.cpp + ) + +-if (NOT CMAKE_VERSION VERSION_LESS 2.8.12) +- target_compile_options(opcuaprotocol PUBLIC ${STATIC_LIBRARY_CXX_FLAGS}) +-endif () + target_link_libraries(opcuaprotocol ${ADDITIONAL_LINK_LIBRARIES}) + target_include_directories(opcuaprotocol PUBLIC $) + install(TARGETS opcuaprotocol EXPORT FreeOpcUa ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/static) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + generate_pkgconfig("libopcuaprotocol.pc") + +@@ -227,10 +186,6 @@ if (BUILD_TESTING) + gtest_main + ) + +- if (NOT CMAKE_VERSION VERSION_LESS 2.8.12) +- target_compile_options(test_opcuaprotocol PUBLIC ${EXECUTABLE_CXX_FLAGS}) +- endif () +- + add_test(NAME opcuaprotocol COMMAND test_opcuaprotocol) + endif() + +@@ -266,15 +221,12 @@ SET(opcuacore_SOURCES + + add_library(opcuacore ${opcuacore_SOURCES}) + +-if (NOT CMAKE_VERSION VERSION_LESS 2.8.12) +- target_compile_options(opcuacore PUBLIC ${STATIC_LIBRARY_CXX_FLAGS}) +-endif () +- +-target_link_libraries(opcuacore ${ADDITIONAL_LINK_LIBRARIES} opcuaprotocol ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}) ++target_link_libraries(opcuacore ${ADDITIONAL_LINK_LIBRARIES} opcuaprotocol ${Boost_LIBRARIES}) + target_include_directories(opcuacore PUBLIC $) + install(TARGETS opcuacore EXPORT FreeOpcUa ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/static) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + generate_pkgconfig("libopcuacore.pc") + +@@ -306,7 +258,7 @@ if (BUILD_TESTING) + ) + + if (NOT CMAKE_VERSION VERSION_LESS 2.8.12) +- target_compile_options(test_opcuacore PUBLIC ${D}DYNAMIC_ADDON_PATH="${DYNAMIC_ADDON_PATH}" ${D}TEST_CORE_CONFIG_PATH="${TEST_CORE_CONFIG_PATH}" ${EXECUTABLE_CXX_FLAGS}) ++ target_compile_options(test_opcuacore PUBLIC -DDYNAMIC_ADDON_PATH="${DYNAMIC_ADDON_PATH}" -DTEST_CORE_CONFIG_PATH="${TEST_CORE_CONFIG_PATH}" ) + endif () + + add_test(NAME opcuacore COMMAND test_opcuacore) +@@ -327,9 +279,6 @@ if (BUILD_CLIENT) + src/client/client.cpp + ) + +- if (NOT CMAKE_VERSION VERSION_LESS 2.8.12) +- target_compile_options(opcuaclient PUBLIC ${STATIC_LIBRARY_CXX_FLAGS}) +- endif () + target_link_libraries(opcuaclient + opcuacore + ${ADDITIONAL_LINK_LIBRARIES} +@@ -338,8 +287,9 @@ if (BUILD_CLIENT) + + target_include_directories(opcuaclient PUBLIC $) + install(TARGETS opcuaclient EXPORT FreeOpcUa ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/static) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + generate_pkgconfig("libopcuaclient.pc") + +@@ -371,9 +321,6 @@ if (BUILD_CLIENT) + opcuacore + ) + +- if (NOT CMAKE_VERSION VERSION_LESS 2.8.12) +- target_compile_options(opcuaclient PUBLIC ${EXECUTABLE_CXX_FLAGS}) +- endif () + endif(BUILD_CLIENT) + + +@@ -423,14 +370,12 @@ if(BUILD_SERVER) + src/server/subscription_service_internal.cpp + ) + +- if (NOT CMAKE_VERSION VERSION_LESS 2.8.12) +- target_compile_options(opcuaserver PUBLIC ${STATIC_LIBRARY_CXX_FLAGS}) +- endif () +- target_link_libraries(opcuaserver ${ADDITIONAL_LINK_LIBRARIES} opcuacore opcuaprotocol ${Boost_SYSTEM_LIBRARY}) ++ target_link_libraries(opcuaserver ${ADDITIONAL_LINK_LIBRARIES} opcuacore opcuaprotocol ${Boost_LIBRARIES}) + target_include_directories(opcuaserver PUBLIC $) + install(TARGETS opcuaserver EXPORT FreeOpcUa ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/static) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + generate_pkgconfig("libopcuaserver.pc") + +@@ -481,7 +426,7 @@ if(BUILD_SERVER) + + target_include_directories(test_opcuaserver PUBLIC .) + if (NOT CMAKE_VERSION VERSION_LESS 2.8.12) +- target_compile_options(test_opcuaserver PUBLIC ${D}TEST_CORE_CONFIG_PATH="${TEST_CORE_CONFIG_PATH}" ${STATIC_LIBRARY_CXX_FLAGS}) ++ target_compile_options(test_opcuaserver PUBLIC -DTEST_CORE_CONFIG_PATH="${TEST_CORE_CONFIG_PATH}") + endif () + + add_test(NAME opcuaserverapp COMMAND test_opcuaserver) +@@ -510,9 +455,6 @@ if(BUILD_SERVER) + opcuaserver + ${Boost_PROGRAM_OPTIONS_LIBRARY} + ) +- if (NOT CMAKE_VERSION VERSION_LESS 2.8.12) +- target_compile_options(opcuaserverapp PUBLIC ${EXECUTABLE_CXX_FLAGS}) +- endif () + + endif(BUILD_SERVER) + +@@ -533,9 +475,6 @@ if (BUILD_CLIENT) + ${SSL_SUPPORT_LINK_LIBRARIES} + ) + +- if (NOT CMAKE_VERSION VERSION_LESS 2.8.12) +- target_compile_options(example_client PUBLIC ${EXECUTABLE_CXX_FLAGS}) +- endif () + + endif (BUILD_CLIENT) + +@@ -555,9 +494,6 @@ if(BUILD_SERVER) + opcuaserver + ) + +- if (NOT CMAKE_VERSION VERSION_LESS 2.8.12) +- target_compile_options(example_server PUBLIC ${EXECUTABLE_CXX_FLAGS}) +- endif () + if(MSVC) + set_target_properties(example_server PROPERTIES LINK_FLAGS /STACK:3000000) + endif(MSVC) +@@ -572,8 +508,8 @@ if (BUILD_PYTHON) + add_subdirectory(python) + endif (BUILD_PYTHON) + +-install(EXPORT FreeOpcUa DESTINATION lib/cmake/FreeOpcUa FILE FreeOpcUaConfig.cmake) ++install(EXPORT FreeOpcUa DESTINATION share/freeopcua FILE freeopcuaConfig.cmake) + + SET(CPACK_GENERATOR "DEB") +-SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "FreeOpcUa") ++SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "freeopcua") + INCLUDE(CPack) diff --git a/externals/vcpkg/ports/freeopcua/fix-std-headers.patch b/externals/vcpkg/ports/freeopcua/fix-std-headers.patch new file mode 100755 index 000000000..d846a6176 --- /dev/null +++ b/externals/vcpkg/ports/freeopcua/fix-std-headers.patch @@ -0,0 +1,24 @@ +diff --git a/include/opc/ua/protocol/utils.h b/include/opc/ua/protocol/utils.h +index e23bffe..5c8c2ad 100644 +--- a/include/opc/ua/protocol/utils.h ++++ b/include/opc/ua/protocol/utils.h +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + namespace OpcUa + { +diff --git a/src/core/model_impl.h b/src/core/model_impl.h +index 0f548c5..c29626b 100644 +--- a/src/core/model_impl.h ++++ b/src/core/model_impl.h +@@ -20,6 +20,7 @@ + #pragma once + + #include ++#include + + namespace OpcUa + { diff --git a/externals/vcpkg/ports/freeopcua/improve_compatibility_with_recent_boost.patch b/externals/vcpkg/ports/freeopcua/improve_compatibility_with_recent_boost.patch new file mode 100755 index 000000000..14e78a68e --- /dev/null +++ b/externals/vcpkg/ports/freeopcua/improve_compatibility_with_recent_boost.patch @@ -0,0 +1,54 @@ +diff --git a/include/opc/ua/services/services.h b/include/opc/ua/services/services.h +index f138831..4732a59 100644 +--- a/include/opc/ua/services/services.h ++++ b/include/opc/ua/services/services.h +@@ -26,20 +26,7 @@ + #include + + #include +- +- +-namespace boost +-{ +-namespace asio +-{ +-#if BOOST_VERSION < 106600 +- class io_service; +-#else +- class io_context; +- typedef io_context io_service; +-#endif +-} +-} ++#include + + namespace OpcUa + { +diff --git a/src/server/internal_subscription.cpp b/src/server/internal_subscription.cpp +index edf4715..69ef74a 100644 +--- a/src/server/internal_subscription.cpp ++++ b/src/server/internal_subscription.cpp +@@ -14,7 +14,7 @@ InternalSubscription::InternalSubscription(SubscriptionServiceInternal & service + , CurrentSession(SessionAuthenticationToken) + , Callback(callback) + , io(service.GetIOService()) +- , Timer(io, boost::posix_time::milliseconds(data.RevisedPublishingInterval)) ++ , Timer(io, boost::posix_time::milliseconds((int)data.RevisedPublishingInterval)) + , LifeTimeCount(data.RevisedLifetimeCount) + , Logger(logger) + { +@@ -105,7 +105,7 @@ void InternalSubscription::PublishResults(const boost::system::error_code & erro + } + + TimerStopped = false; +- Timer.expires_at(Timer.expires_at() + boost::posix_time::milliseconds(Data.RevisedPublishingInterval)); ++ Timer.expires_at(Timer.expires_at() + boost::posix_time::milliseconds((int)Data.RevisedPublishingInterval)); + std::shared_ptr self = shared_from_this(); + Timer.async_wait([self](const boost::system::error_code & error) { self->PublishResults(error); }); + } +@@ -615,5 +615,3 @@ std::vector InternalSubscription::GetEventFields(const EventFilter & fi + + } + } +- +- diff --git a/externals/vcpkg/ports/freeopcua/include_asio_first.patch b/externals/vcpkg/ports/freeopcua/include_asio_first.patch new file mode 100755 index 000000000..d540a38ab --- /dev/null +++ b/externals/vcpkg/ports/freeopcua/include_asio_first.patch @@ -0,0 +1,138 @@ +diff --git a/src/core/subscription.cpp b/src/core/subscription.cpp +index b690d3a..fdac2f3 100644 +--- a/src/core/subscription.cpp ++++ b/src/core/subscription.cpp +@@ -17,11 +17,10 @@ + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ******************************************************************************/ + +- +-#include ++#include + #include ++#include + +-#include + #include + + namespace OpcUa +diff --git a/src/server/asio_addon.cpp b/src/server/asio_addon.cpp +index 795a6b2..532ac3c 100644 +--- a/src/server/asio_addon.cpp ++++ b/src/server/asio_addon.cpp +@@ -17,9 +17,9 @@ + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ******************************************************************************/ + ++#include + #include + +-#include + #include + #include + +diff --git a/src/server/internal_subscription.h b/src/server/internal_subscription.h +index d42aa65..dd193a9 100644 +--- a/src/server/internal_subscription.h ++++ b/src/server/internal_subscription.h +@@ -1,6 +1,7 @@ + + #pragma once + ++#include + //#include "address_space_internal.h" + #include "subscription_service_internal.h" + +@@ -11,7 +12,6 @@ + #include + #include + +-#include + #include + #include + #include +@@ -115,5 +115,3 @@ private: + + } + } +- +- +diff --git a/src/server/opc_tcp_async.cpp b/src/server/opc_tcp_async.cpp +index dc700c2..f3a66b8 100644 +--- a/src/server/opc_tcp_async.cpp ++++ b/src/server/opc_tcp_async.cpp +@@ -17,6 +17,7 @@ + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ******************************************************************************/ + ++#include + #include "opc_tcp_processor.h" + + #include +@@ -29,7 +30,6 @@ + #include + + #include +-#include + #include + #include + #include +diff --git a/src/server/subscription_service_internal.h b/src/server/subscription_service_internal.h +index 6b16e1d..f7e5dfe 100644 +--- a/src/server/subscription_service_internal.h ++++ b/src/server/subscription_service_internal.h +@@ -9,6 +9,7 @@ + + #pragma once + ++#include + #include "address_space_addon.h" + #include "internal_subscription.h" + +@@ -20,7 +21,6 @@ + #include + #include + +-#include + #include + #include + #include +@@ -76,4 +76,3 @@ private: + } + + } +- +diff --git a/src/server/tcp_server.cpp b/src/server/tcp_server.cpp +index b4f2000..2430820 100644 +--- a/src/server/tcp_server.cpp ++++ b/src/server/tcp_server.cpp +@@ -8,9 +8,6 @@ + /// http://www.gnu.org/licenses/lgpl.html) + /// + +-#ifdef _WIN32 +-#include +-#endif + + #include "tcp_server.h" + +@@ -34,8 +31,18 @@ + #include + #include + +- + #ifdef _WIN32 ++#include ++#include ++#if !defined SHUT_RD && defined SD_RECEIVE ++#define SHUT_RD SD_RECEIVE ++#endif ++#if !defined SHUT_WR && defined SD_SEND ++#define SHUT_WR SD_SEND ++#endif ++#if !defined SHUT_RDWR && defined SD_BOTH ++#define SHUT_RDWR SD_BOTH ++#endif + #else + #include + #include diff --git a/externals/vcpkg/ports/freeopcua/portfile.cmake b/externals/vcpkg/ports/freeopcua/portfile.cmake new file mode 100755 index 000000000..566c7a527 --- /dev/null +++ b/externals/vcpkg/ports/freeopcua/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO FreeOpcUa/freeopcua + REF 2f2c886eb2da46b9dc8944c8f79ac31a9f116a81 + SHA512 f19c1489eb116224ac3192e646c08cf3967c9a07064a09c4cbdef89d93e98c7541bb3edd030be22f6daf3f831ff92a324bc3734a8fe34cdd9d5a5ff7cb7f2f19 + HEAD_REF master + PATCHES + cmakelists_fixes.patch + improve_compatibility_with_recent_boost.patch + use_another_implementation_of_has_begin_end.patch + uri_facade_win.patch + serverObj.patch + include_asio_first.patch + boost-1.70.patch + fix-std-headers.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_PYTHON=OFF + -DBUILD_TESTING=OFF + -DSSL_SUPPORT_MBEDTLS=OFF + -DCMAKE_DEBUG_POSTFIX=d +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +#Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/freeopcua RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/freeopcua/serverObj.patch b/externals/vcpkg/ports/freeopcua/serverObj.patch new file mode 100755 index 000000000..6680e587b --- /dev/null +++ b/externals/vcpkg/ports/freeopcua/serverObj.patch @@ -0,0 +1,14 @@ +diff --git a/src/server/server_object.cpp b/src/server/server_object.cpp +index f35b168..b6c816a 100644 +--- a/src/server/server_object.cpp ++++ b/src/server/server_object.cpp +@@ -25,9 +25,6 @@ + #include + #include + +-#ifdef WIN32 +-#undef GetObject +-#endif + + namespace + { diff --git a/externals/vcpkg/ports/freeopcua/uri_facade_win.patch b/externals/vcpkg/ports/freeopcua/uri_facade_win.patch new file mode 100755 index 000000000..e6cc601dc --- /dev/null +++ b/externals/vcpkg/ports/freeopcua/uri_facade_win.patch @@ -0,0 +1,28 @@ +diff --git a/src/core/common/uri_facade_win.cpp b/src/core/common/uri_facade_win.cpp +index 1a807fb..c579e2d 100644 +--- a/src/core/common/uri_facade_win.cpp ++++ b/src/core/common/uri_facade_win.cpp +@@ -19,7 +19,7 @@ + namespace Common + { + +-void Uri::Initialize(const char * uriString, std::size_t size) ++void Uri::Initialize(const std::string& uriString) + { + URL_COMPONENTS url = {0}; + url.dwStructSize = sizeof(url); +@@ -31,7 +31,7 @@ void Uri::Initialize(const char * uriString, std::size_t size) + + // TODO msdn says do not use this function in services and in server patforms. :( + // TODO http://msdn.microsoft.com/en-us/library/windows/desktop/aa384376(v=vs.85).aspx +- if (!InternetCrackUrl(uriString, size, options, &url)) ++ if (!InternetCrackUrl(uriString.c_str(), uriString.size(), options, &url)) + { + THROW_ERROR1(CannotParseUri, uriString); + } +@@ -50,5 +50,3 @@ void Uri::Initialize(const char * uriString, std::size_t size) + } + + } // namespace Common +- +- diff --git a/externals/vcpkg/ports/freeopcua/use_another_implementation_of_has_begin_end.patch b/externals/vcpkg/ports/freeopcua/use_another_implementation_of_has_begin_end.patch new file mode 100755 index 000000000..34fa77f7c --- /dev/null +++ b/externals/vcpkg/ports/freeopcua/use_another_implementation_of_has_begin_end.patch @@ -0,0 +1,39 @@ +diff --git a/include/opc/ua/protocol/variant.h b/include/opc/ua/protocol/variant.h +index 9dc5b15..317cb17 100644 +--- a/include/opc/ua/protocol/variant.h ++++ b/include/opc/ua/protocol/variant.h +@@ -76,22 +76,25 @@ public: + template + struct has_begin_end + { +- template static char (&f(typename std::enable_if < +- std::is_same(&C::begin)), +- typename C::const_iterator(C::*)() const>::value, void >::type *))[1]; ++ struct Dummy { typedef void const_iterator; }; ++ typedef typename std::conditional::value, T, Dummy>::type TType; ++ typedef typename TType::const_iterator iter; + +- template static char (&f(...))[2]; ++ struct Fallback { iter begin() const; iter end() const; }; ++ struct Derived : TType, Fallback { }; + +- template static char (&g(typename std::enable_if < +- std::is_same(&C::end)), +- typename C::const_iterator(C::*)() const>::value, void >::type *))[1]; ++ template struct ChT; + ++ template static char (&f(ChT*))[1]; ++ template static char (&f(...))[2]; ++ template static char (&g(ChT*))[1]; + template static char (&g(...))[2]; + +- static bool const beg_value = sizeof(f(0)) == 1; +- static bool const end_value = sizeof(g(0)) == 1; ++ static bool const beg_value = sizeof(f(0)) == 2; ++ static bool const end_value = sizeof(g(0)) == 2; + }; + ++ + template + struct is_container_not_string : std::integral_constant < bool, has_const_iterator::value && has_begin_end::beg_value && has_begin_end::end_value > + { }; diff --git a/externals/vcpkg/ports/freeopcua/vcpkg.json b/externals/vcpkg/ports/freeopcua/vcpkg.json new file mode 100755 index 000000000..02da47e65 --- /dev/null +++ b/externals/vcpkg/ports/freeopcua/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "freeopcua", + "version-string": "20190125", + "port-version": 5, + "description": "OPC-UA server and client library written in C++ and with a lot of code auto-generated from xml specification using python.", + "dependencies": [ + "boost-asio", + "boost-date-time", + "boost-filesystem", + "boost-foreach", + "boost-format", + "boost-program-options", + "boost-property-tree", + "boost-system", + "boost-thread" + ] +} diff --git a/externals/vcpkg/ports/freerdp/DontInstallSystemRuntimeLibs.patch b/externals/vcpkg/ports/freerdp/DontInstallSystemRuntimeLibs.patch new file mode 100755 index 000000000..7a1d542a2 --- /dev/null +++ b/externals/vcpkg/ports/freerdp/DontInstallSystemRuntimeLibs.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake +index 6ccfc7d..75479bf 100644 +--- a/CMakeCPack.cmake ++++ b/CMakeCPack.cmake +@@ -67,9 +67,9 @@ if(MSVC) + set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE) + include(InstallRequiredSystemLibraries) + +- install(PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} +- DESTINATION ${CMAKE_INSTALL_BINDIR} +- COMPONENT libraries) ++ # install(PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} ++ # DESTINATION ${CMAKE_INSTALL_BINDIR} ++ # COMPONENT libraries) + endif() + endif() + diff --git a/externals/vcpkg/ports/freerdp/fix-include-path.patch b/externals/vcpkg/ports/freerdp/fix-include-path.patch new file mode 100755 index 000000000..dc6523080 --- /dev/null +++ b/externals/vcpkg/ports/freerdp/fix-include-path.patch @@ -0,0 +1,52 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 97ba2f9..64a2f33 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -107,7 +107,7 @@ else() + endif() + message("FREERDP_VERSION=${FREERDP_VERSION_FULL}") + +-set(FREERDP_INCLUDE_DIR "include/freerdp${FREERDP_VERSION_MAJOR}/") ++set(FREERDP_INCLUDE_DIR "include/") + + # Compatibility options + if(DEFINED STATIC_CHANNELS) +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index a020dc5..0bc1157 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -19,7 +19,7 @@ + + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp/version.h) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp/build-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp/build-config.h) +-set(FREERDP_INSTALL_INCLUDE_DIR include/freerdp${FREERDP_VERSION_MAJOR}/freerdp) ++set(FREERDP_INSTALL_INCLUDE_DIR include/freerdp) + + file(GLOB FREERDP_HEADERS "freerdp/*.h") + install(FILES ${FREERDP_HEADERS} DESTINATION ${FREERDP_INSTALL_INCLUDE_DIR} COMPONENT headers) +diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt +index a94090a..08b6b88 100644 +--- a/winpr/CMakeLists.txt ++++ b/winpr/CMakeLists.txt +@@ -215,7 +215,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10") + + SetFreeRDPCMakeInstallDir(WINPR_CMAKE_INSTALL_DIR "WinPR${WINPR_VERSION_MAJOR}") + +- set(WINPR_INCLUDE_DIR "include/winpr${WINPR_VERSION_MAJOR}") ++ set(WINPR_INCLUDE_DIR "include") + + configure_package_config_file(WinPRConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/WinPRConfig.cmake + INSTALL_DESTINATION ${WINPR_CMAKE_INSTALL_DIR} +diff --git a/winpr/include/CMakeLists.txt b/winpr/include/CMakeLists.txt +index 452383d..3faab0c 100644 +--- a/winpr/include/CMakeLists.txt ++++ b/winpr/include/CMakeLists.txt +@@ -17,7 +17,7 @@ + + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/version.h) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr/wtypes.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/wtypes.h) +-set(WINPR_INSTALL_INCLUDE_DIR include/winpr${WINPR_VERSION_MAJOR}/winpr) ++set(WINPR_INSTALL_INCLUDE_DIR include/winpr) + + file(GLOB WINPR_HEADERS "winpr/*.h") + install(FILES ${WINPR_HEADERS} DESTINATION ${WINPR_INSTALL_INCLUDE_DIR} COMPONENT headers) diff --git a/externals/vcpkg/ports/freerdp/fix-libusb.patch b/externals/vcpkg/ports/freerdp/fix-libusb.patch new file mode 100755 index 000000000..51f98b471 --- /dev/null +++ b/externals/vcpkg/ports/freerdp/fix-libusb.patch @@ -0,0 +1,45 @@ +diff --git a/channels/urbdrc/client/libusb/libusb_udevice.c b/channels/urbdrc/client/libusb/libusb_udevice.c +index 814540756..56809fe45 100644 +--- a/channels/urbdrc/client/libusb/libusb_udevice.c ++++ b/channels/urbdrc/client/libusb/libusb_udevice.c +@@ -232,7 +232,7 @@ static void async_transfer_user_data_free(ASYNC_TRANSFER_USER_DATA* user_data) + } + } + +-static void func_iso_callback(struct libusb_transfer* transfer) ++static void LIBUSB_CALL func_iso_callback(struct libusb_transfer* transfer) + { + ASYNC_TRANSFER_USER_DATA* user_data = (ASYNC_TRANSFER_USER_DATA*)transfer->user_data; + const UINT32 streamID = stream_id_from_buffer(transfer); +@@ -331,7 +331,7 @@ static const LIBUSB_ENDPOINT_DESCEIPTOR* func_get_ep_desc(LIBUSB_CONFIG_DESCRIPT + return NULL; + } + +-static void func_bulk_transfer_cb(struct libusb_transfer* transfer) ++static void LIBUSB_CALL func_bulk_transfer_cb(struct libusb_transfer* transfer) + { + ASYNC_TRANSFER_USER_DATA* user_data; + uint32_t streamID; +diff --git a/channels/urbdrc/client/libusb/libusb_udevman.c b/channels/urbdrc/client/libusb/libusb_udevman.c +index 1638b8c13..b1440f300 100644 +--- a/channels/urbdrc/client/libusb/libusb_udevman.c ++++ b/channels/urbdrc/client/libusb/libusb_udevman.c +@@ -580,7 +580,7 @@ static BOOL device_is_filtered(struct libusb_device* dev, + return filtered; + } + +-static int hotplug_callback(struct libusb_context* ctx, struct libusb_device* dev, ++static int LIBUSB_CALL hotplug_callback(struct libusb_context* ctx, struct libusb_device* dev, + libusb_hotplug_event event, void* user_data) + { + VID_PID_PAIR pair; +@@ -859,7 +859,7 @@ static BOOL poll_libusb_events(UDEVMAN* udevman) + return rc > 0; + } + +-static DWORD poll_thread(LPVOID lpThreadParameter) ++static DWORD __stdcall poll_thread(LPVOID lpThreadParameter) + { + libusb_hotplug_callback_handle handle; + UDEVMAN* udevman = (UDEVMAN*)lpThreadParameter; + \ No newline at end of file diff --git a/externals/vcpkg/ports/freerdp/fix-linux-build.patch b/externals/vcpkg/ports/freerdp/fix-linux-build.patch new file mode 100755 index 000000000..92f2cd4c1 --- /dev/null +++ b/externals/vcpkg/ports/freerdp/fix-linux-build.patch @@ -0,0 +1,13 @@ +diff --git a/winpr/tools/makecert-cli/CMakeLists.txt b/winpr/tools/makecert-cli/CMakeLists.txt +index 48fda5b..4e15a22 100644 +--- a/winpr/tools/makecert-cli/CMakeLists.txt ++++ b/winpr/tools/makecert-cli/CMakeLists.txt +@@ -42,7 +42,7 @@ add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) + + set(${MODULE_PREFIX}_LIBS winpr-tools) + +-target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} winpr) ++target_link_libraries(${MODULE_NAME} ${OPENSSL_LIBRARIES} ${${MODULE_PREFIX}_LIBS} winpr) + + set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools") + diff --git a/externals/vcpkg/ports/freerdp/install-dirs.patch b/externals/vcpkg/ports/freerdp/install-dirs.patch new file mode 100755 index 000000000..5b5e178be --- /dev/null +++ b/externals/vcpkg/ports/freerdp/install-dirs.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5e67ef9..4ef3e8e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,7 +18,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.11) + + project(FreeRDP C CXX) + diff --git a/externals/vcpkg/ports/freerdp/openssl_threads.patch b/externals/vcpkg/ports/freerdp/openssl_threads.patch new file mode 100755 index 000000000..ca312df40 --- /dev/null +++ b/externals/vcpkg/ports/freerdp/openssl_threads.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 97ba2f9..fc36185 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -907,6 +907,7 @@ if(OPENSSL_FOUND) + add_definitions("-DWITH_OPENSSL") + message(STATUS "Using OpenSSL Version: ${OPENSSL_VERSION}") + include_directories(${OPENSSL_INCLUDE_DIR}) ++ list(APPEND OPENSSL_LIBRARIES Threads::Threads) + endif() + + if(MBEDTLS_FOUND) diff --git a/externals/vcpkg/ports/freerdp/portfile.cmake b/externals/vcpkg/ports/freerdp/portfile.cmake new file mode 100755 index 000000000..f9ec5abfa --- /dev/null +++ b/externals/vcpkg/ports/freerdp/portfile.cmake @@ -0,0 +1,145 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO FreeRDP/FreeRDP + REF 2.5.0 + SHA512 7720306c8d0915578f6758f46ba0e0b8a81bbdcd1c80e08711576605142467f6735f644099e79a05113959fb30cd1070ca138a523537a41a7102880daf89c04c + HEAD_REF master + PATCHES + DontInstallSystemRuntimeLibs.patch + fix-linux-build.patch + openssl_threads.patch + fix-include-path.patch + fix-libusb.patch + install-dirs.patch +) + +if (NOT VCPKG_TARGET_IS_WINDOWS) + message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n libxfixes-dev\n") +endif() +set(FREERDP_WITH_CLIENT) +if (VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX) + set(FREERDP_WITH_CLIENT -DWITH_CLIENT=OFF) +endif() + +set(FREERDP_CRT_LINKAGE) +if(VCPKG_CRT_LINKAGE STREQUAL "static") + set(FREERDP_CRT_LINKAGE -DMSVC_RUNTIME=static) +endif() + +get_filename_component(SOURCE_VERSION "${SOURCE_PATH}" NAME) +file(WRITE "${SOURCE_PATH}/.source_version" "${SOURCE_VERSION}-vcpkg") + +file(REMOVE "${SOURCE_PATH}/cmake/FindOpenSSL.cmake") # Remove outdated Module + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + urbdrc CHANNEL_URBDRC +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FREERDP_CRT_LINKAGE} + ${FREERDP_WITH_CLIENT} + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(GLOB_RECURSE TOOLS_RELEASE "${CURRENT_PACKAGES_DIR}/bin/*.exe") + +if(TOOLS_RELEASE) + file(COPY ${TOOLS_RELEASE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + + file(GLOB_RECURSE TOOLS_DEBUG "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") + file(REMOVE ${TOOLS_RELEASE} ${TOOLS_DEBUG}) +endif() + +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(GLOB_RECURSE FREERDP_DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll") + foreach(FREERDP_DLL ${FREERDP_DLLS}) + file(COPY "${FREERDP_DLL}" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE "${FREERDP_DLL}") + endforeach() + + file(GLOB_RECURSE FREERDP_DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll") + foreach(FREERDP_DLL ${FREERDP_DLLS}) + file(COPY "${FREERDP_DLL}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE "${FREERDP_DLL}") + endforeach() +else() + file(GLOB_RECURSE FREERDP_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*") + foreach(FREERDP_TOOL ${FREERDP_TOOLS}) + file(COPY "${FREERDP_TOOL}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(REMOVE "${FREERDP_TOOL}") + endforeach() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +foreach(PACKAGE FreeRDP-Client2 FreeRDP2 WinPR2) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/cmake/${PACKAGE}_temp") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/cmake/${PACKAGE}" "${CURRENT_PACKAGES_DIR}/lib/cmake/${PACKAGE}_temp/${PACKAGE}") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}_temp") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}_temp/${PACKAGE}") +endforeach() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Client2_temp/FreeRDP-Client2 PACKAGE_NAME FreeRDP-Client) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP2_temp/FreeRDP2 PACKAGE_NAME FreeRDP) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/WinPR2_temp/WinPR2 PACKAGE_NAME WinPR) + +vcpkg_fixup_pkgconfig(SKIP_CHECK) + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-debug.cmake" + "debug/lib/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" + "debug/bin/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" +) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-debug.cmake" + "debug/lib/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" + "debug/bin/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" +) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-release.cmake" + "lib/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" + "bin/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" +) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-release.cmake" + "lib/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" + "bin/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" +) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP/FreeRDPTargets-debug.cmake" + "debug/lib/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" + "debug/bin/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" +) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP/FreeRDPTargets-release.cmake" + "lib/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" + "bin/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" +) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP-Client/FreeRDP-ClientTargets-debug.cmake" + "debug/lib/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" + "debug/bin/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" +) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP-Client/FreeRDP-ClientTargets-release.cmake" + "lib/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" + "bin/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" +) + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(GLOB OBJS "${CURRENT_PACKAGES_DIR}/debug/*.lib") + file(REMOVE ${OBJS}) + file(GLOB OBJS "${CURRENT_PACKAGES_DIR}/*.lib") + file(REMOVE ${OBJS}) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" + "${CURRENT_PACKAGES_DIR}/lib/cmake") + + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/build-config.h" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" ".") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/build-config.h" "${CURRENT_PACKAGES_DIR}/" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/build-config.h" "${CURRENT_PACKAGES_DIR}" "") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/freerdp/vcpkg.json b/externals/vcpkg/ports/freerdp/vcpkg.json new file mode 100755 index 000000000..ef18342f9 --- /dev/null +++ b/externals/vcpkg/ports/freerdp/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "freerdp", + "version": "2.5.0", + "description": "A free implementation of the Remote Desktop Protocol (RDP)", + "homepage": "https://github.com/FreeRDP/FreeRDP", + "license": "Apache-2.0", + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "glib", + "platform": "!windows" + }, + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "urbdrc": { + "description": "USB redirection channel support", + "dependencies": [ + "libusb" + ] + } + } +} diff --git a/externals/vcpkg/ports/freetds/disable-tests.patch b/externals/vcpkg/ports/freetds/disable-tests.patch new file mode 100755 index 000000000..0cf0c6ee0 --- /dev/null +++ b/externals/vcpkg/ports/freetds/disable-tests.patch @@ -0,0 +1,94 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7ac6cc58..1a6a4f0e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -64,9 +64,9 @@ math(EXPR BUILD_NUMBER "${BUILD_NUMBER}") + + set(FREETDS_TOPDIR ${CMAKE_CURRENT_LIST_DIR}) + +-enable_testing() +-set(CMAKE_CTEST_COMMAND ctest) +-add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) ++#enable_testing() ++#set(CMAKE_CTEST_COMMAND ctest) ++#add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) + + # TODO depends on configure + add_definitions(-D_REENTRANT -D_THREAD_SAFE) +@@ -459,9 +459,11 @@ add_subdirectory(src/tds) + add_subdirectory(src/ctlib) + add_subdirectory(src/dblib) + add_subdirectory(src/odbc) +-add_subdirectory(src/apps) ++if(WITH_TOOLS) ++ add_subdirectory(src/apps) ++ add_subdirectory(src/pool) ++endif() + add_subdirectory(src/server) +-add_subdirectory(src/pool) + + configure_file(${CMAKE_BINARY_DIR}/include/config.h.in ${CMAKE_BINARY_DIR}/include/config.h) + configure_file(${CMAKE_SOURCE_DIR}/include/tds_sysdep_public.h.in ${CMAKE_BINARY_DIR}/include/tds_sysdep_public.h) +diff --git a/src/ctlib/CMakeLists.txt b/src/ctlib/CMakeLists.txt +index e83b0b1a..017d571a 100644 +--- a/src/ctlib/CMakeLists.txt ++++ b/src/ctlib/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_subdirectory(unittests) ++#add_subdirectory(unittests) + + set(static_lib_name ct) + if(WIN32) +diff --git a/src/dblib/CMakeLists.txt b/src/dblib/CMakeLists.txt +index 5f1766f4..c70e87a3 100644 +--- a/src/dblib/CMakeLists.txt ++++ b/src/dblib/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_subdirectory(unittests) ++#add_subdirectory(unittests) + + if(WIN32) + set(win_SRCS winmain.c dblib.def dbopen.c) +diff --git a/src/odbc/CMakeLists.txt b/src/odbc/CMakeLists.txt +index ec8eaadd..6f9f32c9 100644 +--- a/src/odbc/CMakeLists.txt ++++ b/src/odbc/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_subdirectory(unittests) ++#add_subdirectory(unittests) + + # TODO checks + add_definitions(-DUNIXODBC -DHAVE_SQLGETPRIVATEPROFILESTRING) +diff --git a/src/replacements/CMakeLists.txt b/src/replacements/CMakeLists.txt +index 48d7e536..f7b490f8 100644 +--- a/src/replacements/CMakeLists.txt ++++ b/src/replacements/CMakeLists.txt +@@ -41,7 +41,7 @@ if (NOT WIN32) + set_target_properties(replacements PROPERTIES POSITION_INDEPENDENT_CODE ON) + endif() + +-add_subdirectory(unittests) ++#add_subdirectory(unittests) + + + INSTALL(TARGETS replacements +diff --git a/src/tds/CMakeLists.txt b/src/tds/CMakeLists.txt +index 134a30cb..5426571b 100644 +--- a/src/tds/CMakeLists.txt ++++ b/src/tds/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_subdirectory(unittests) ++#add_subdirectory(unittests) + + if(PERL_FOUND AND NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tds_willconvert.h") + if (NOT GPERF) +diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt +index 2a1935c9..a46483e0 100644 +--- a/src/utils/CMakeLists.txt ++++ b/src/utils/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_subdirectory(unittests) ++#add_subdirectory(unittests) + + if(WIN32) + set(add_SRCS md5.c) diff --git a/externals/vcpkg/ports/freetds/portfile.cmake b/externals/vcpkg/ports/freetds/portfile.cmake new file mode 100755 index 000000000..288f2de31 --- /dev/null +++ b/externals/vcpkg/ports/freetds/portfile.cmake @@ -0,0 +1,53 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO freetds/freetds + REF v1.3.10 + HEAD_REF master + SHA512 78b494c04e3436bfdc4997e6f0196baef27246bb7ad825c487a16f247d13c99324a39d52bfe8f5306164ae3f5c7eb43ca83944b24a3ce6b4bcd733849b4064ad + PATCHES + disable-tests.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openssl WITH_OPENSSL + tools WITH_TOOLS +) + +vcpkg_find_acquire_program(PERL) +get_filename_component(PERL_PATH ${PERL} DIRECTORY) +vcpkg_add_to_path("${PERL_PATH}") + +vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf") + +set(_WCHAR_SUPPORT ON) +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(_WCHAR_SUPPORT OFF) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + ${FEATURE_OPTIONS} + -DENABLE_ODBC_WIDE=${_WCHAR_SUPPORT} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES bsqldb bsqlodbc datacopy defncopy freebcp tdspool tsql AUTO_CLEAN) + if(EXISTS "${CURRENT_PACKAGES_DIR}/etc") + file(INSTALL "${CURRENT_PACKAGES_DIR}/etc" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/etc") + endif() +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/etc" "${CURRENT_PACKAGES_DIR}/debug/etc") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/freetds/vcpkg.json b/externals/vcpkg/ports/freetds/vcpkg.json new file mode 100755 index 000000000..5483fdf99 --- /dev/null +++ b/externals/vcpkg/ports/freetds/vcpkg.json @@ -0,0 +1,41 @@ +{ + "name": "freetds", + "version": "1.3.10", + "port-version": 1, + "description": "Implementation of the Tabular Data Stream protocol", + "homepage": "https://www.freetds.org", + "license": "GPL-2.0-only", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "gperf", + "host": true + }, + { + "name": "libmysql", + "platform": "windows" + }, + { + "name": "unixodbc", + "platform": "!windows" + }, + { + "name": "vcpkg-cmake", + "host": true + } + ], + "default-features": [ + "openssl" + ], + "features": { + "openssl": { + "description": "OpenSSL support", + "dependencies": [ + "openssl" + ] + }, + "tools": { + "description": "Build tools" + } + } +} diff --git a/externals/vcpkg/ports/freetype-gl/0001-Link-to-dependencies-also-for-static-build.patch b/externals/vcpkg/ports/freetype-gl/0001-Link-to-dependencies-also-for-static-build.patch new file mode 100755 index 000000000..d81093da3 --- /dev/null +++ b/externals/vcpkg/ports/freetype-gl/0001-Link-to-dependencies-also-for-static-build.patch @@ -0,0 +1,43 @@ +From 1ad7d07765445511d51f3888ffdedba2cb282e84 Mon Sep 17 00:00:00 2001 +From: Stig Hornang +Date: Sun, 1 May 2022 21:57:18 +0200 +Subject: [PATCH 1/4] Link to dependencies also for static build + +--- + CMakeLists.txt | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2ccbf9a..b5db60a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -185,12 +185,6 @@ if(freetype-gl_BUILD_SHARED) + PROPERTIES + VERSION 0.3.2 + SOVERSION 0) +- target_link_libraries (freetype-gl +- ${OPENGL_LIBRARY} +- ${FREETYPE_LIBRARIES} +- ${MATH_LIBRARY} +- ${GLEW_LIBRARY} +- ) + else() + add_library(freetype-gl STATIC + ${FREETYPE_GL_SRC} +@@ -198,6 +192,13 @@ else() + ) + endif() + ++target_link_libraries(freetype-gl ++ ${OPENGL_LIBRARY} ++ ${FREETYPE_LIBRARIES} ++ ${MATH_LIBRARY} ++ ${GLEW_LIBRARY} ++) ++ + if(freetype-gl_BUILD_MAKEFONT) + add_executable(makefont makefont.c) + +-- +2.27.0 + diff --git a/externals/vcpkg/ports/freetype-gl/0002-Remove-duplicate-installs.patch b/externals/vcpkg/ports/freetype-gl/0002-Remove-duplicate-installs.patch new file mode 100755 index 000000000..2006d4ee3 --- /dev/null +++ b/externals/vcpkg/ports/freetype-gl/0002-Remove-duplicate-installs.patch @@ -0,0 +1,31 @@ +From 9af89db45ef951d5fd8e8be5b4029136f59e94a1 Mon Sep 17 00:00:00 2001 +From: Stig Hornang +Date: Sun, 1 May 2022 22:00:38 +0200 +Subject: [PATCH 2/4] Remove duplicate installs + +--- + CMakeLists.txt | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b5db60a..09163ec 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -249,14 +249,3 @@ if ("${LIB64}" STREQUAL "TRUE") + else() + set(LIBSUFFIX "") + endif() +- +-set(INSTALL_LIB_DIR lib${LIBSUFFIX} CACHE PATH "Installation directory for libraries") +-mark_as_advanced(INSTALL_LIB_DIR) +- +-install(TARGETS freetype-gl +- ARCHIVE DESTINATION ${INSTALL_LIB_DIR} +- LIBRARY DESTINATION ${INSTALL_LIB_DIR} +- COMPONENT library) +-install(FILES ${FREETYPE_GL_HDR} DESTINATION include +- COMPONENT headers) +- +-- +2.27.0 + diff --git a/externals/vcpkg/ports/freetype-gl/0003-Add-exports.patch b/externals/vcpkg/ports/freetype-gl/0003-Add-exports.patch new file mode 100755 index 000000000..2fdfe8ae6 --- /dev/null +++ b/externals/vcpkg/ports/freetype-gl/0003-Add-exports.patch @@ -0,0 +1,34 @@ +From 2c2e7e6cc7cb55eff502889421fe7a207cec932d Mon Sep 17 00:00:00 2001 +From: Stig Hornang +Date: Sun, 1 May 2022 22:01:00 +0200 +Subject: [PATCH 3/4] Add exports + +--- + CMakeLists.txt | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 09163ec..fd40e68 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -217,7 +217,7 @@ if(freetype-gl_BUILD_MAKEFONT) + endif() + endif() + +-install(TARGETS freetype-gl ++install(TARGETS freetype-gl EXPORT freetype-glConfig + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) +@@ -249,3 +249,8 @@ if ("${LIB64}" STREQUAL "TRUE") + else() + set(LIBSUFFIX "") + endif() ++ ++install( ++ EXPORT freetype-glConfig ++ DESTINATION share/freetype-gl ++) +-- +2.27.0 + diff --git a/externals/vcpkg/ports/freetype-gl/0004-Change-install-dir-for-pkgconfig.patch b/externals/vcpkg/ports/freetype-gl/0004-Change-install-dir-for-pkgconfig.patch new file mode 100755 index 000000000..8938ce606 --- /dev/null +++ b/externals/vcpkg/ports/freetype-gl/0004-Change-install-dir-for-pkgconfig.patch @@ -0,0 +1,25 @@ +From ad0c57a370a15e8114447b8170ecddf14f21d352 Mon Sep 17 00:00:00 2001 +From: Stig Hornang +Date: Tue, 3 May 2022 20:27:09 +0200 +Subject: [PATCH 4/4] Change install dir for pkgconfig + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fd40e68..4f8d7dd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -172,7 +172,7 @@ if(NOT MSVC) + set(PKG_CONFIG_LIBDIR "\${exec_prefix}/lib") + set(PKG_CONFIG_INCLUDEDIR "\${prefix}/include") + configure_file(freetype-gl.pc.in ${CMAKE_CURRENT_BINARY_DIR}/freetype-gl.pc @ONLY) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/freetype-gl.pc DESTINATION ${PKG_CONFIG_PREFIX}/share/pkgconfig) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/freetype-gl.pc DESTINATION ${PKG_CONFIG_PREFIX}/lib/pkgconfig) + endif() + + if(freetype-gl_BUILD_SHARED) +-- +2.27.0 + diff --git a/externals/vcpkg/ports/freetype-gl/0005-add-version.patch b/externals/vcpkg/ports/freetype-gl/0005-add-version.patch new file mode 100755 index 000000000..f23c2e4ca --- /dev/null +++ b/externals/vcpkg/ports/freetype-gl/0005-add-version.patch @@ -0,0 +1,11 @@ +diff --git a/freetype-gl.pc.in b/freetype-gl.pc.in +index 3b33096..a5ae350 100644 +--- a/freetype-gl.pc.in ++++ b/freetype-gl.pc.in +@@ -5,5 +5,6 @@ includedir=@PKG_CONFIG_INCLUDEDIR@ + + Name: freetype-gl + Description: OpenGL text using one vertex buffer, one texture and FreeType ++Version: 2022-01-17 + Libs: -L${libdir} -lfreetype-gl + Cflags: -I${includedir} diff --git a/externals/vcpkg/ports/freetype-gl/portfile.cmake b/externals/vcpkg/ports/freetype-gl/portfile.cmake new file mode 100755 index 000000000..36c0282bc --- /dev/null +++ b/externals/vcpkg/ports/freetype-gl/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rougier/freetype-gl + REF 85d7850744465ac1dcd00b202787d72a4a3a1f5d + SHA512 4505b2162610500336ab975a5a0ac2c09503f51b2fb52b433018059f628ef6f6add9618c940a80efebc311d82fe96fa813d356acbd858cc2dbac6a1829ab3031 + HEAD_REF master + PATCHES + 0001-Link-to-dependencies-also-for-static-build.patch + 0002-Remove-duplicate-installs.patch + 0003-Add-exports.patch + 0004-Change-install-dir-for-pkgconfig.patch + 0005-add-version.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dfreetype-gl_BUILD_APIDOC=OFF + -Dfreetype-gl_BUILD_DEMOS=OFF + -Dfreetype-gl_BUILD_TESTS=OFF + -Dfreetype-gl_BUILD_MAKEFONT=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/freetype-gl" RENAME copyright) + diff --git a/externals/vcpkg/ports/freetype-gl/vcpkg.json b/externals/vcpkg/ports/freetype-gl/vcpkg.json new file mode 100755 index 000000000..3acfe4cbb --- /dev/null +++ b/externals/vcpkg/ports/freetype-gl/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "freetype-gl", + "version-date": "2022-01-17", + "port-version": 1, + "description": "OpenGL text using one vertex buffer, one texture and FreeType", + "homepage": "https://github.com/rougier/freetype-gl", + "dependencies": [ + "freetype", + "glew", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/freetype/0003-Fix-UWP.patch b/externals/vcpkg/ports/freetype/0003-Fix-UWP.patch new file mode 100755 index 000000000..b3a04188c --- /dev/null +++ b/externals/vcpkg/ports/freetype/0003-Fix-UWP.patch @@ -0,0 +1,65 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index db48e9f..5c35276 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -328,6 +328,10 @@ else () + list(APPEND BASE_SRCS src/base/ftdebug.c) + endif () + ++if(MSVC) ++ add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS) ++endif() ++ + if (BUILD_FRAMEWORK) + list(APPEND BASE_SRCS builds/mac/freetype-Info.plist) + endif () +diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h +index 4f2eaca..1e01fe4 100644 +--- a/include/freetype/freetype.h ++++ b/include/freetype/freetype.h +@@ -1038,6 +1038,11 @@ FT_BEGIN_HEADER + * Especially for TrueType fonts see also the documentation for + * @FT_Size_Metrics. + */ ++ ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) ++#define generic GenericFromFreeTypeLibrary ++#endif ++ + typedef struct FT_FaceRec_ + { + FT_Long num_faces; +@@ -1910,6 +1915,9 @@ FT_BEGIN_HEADER + + } FT_GlyphSlotRec; + ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) ++#undef generic ++#endif + + /*************************************************************************/ + /*************************************************************************/ +diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c +index 3f8619d..edf03b6 100644 +--- a/src/base/ftobjs.c ++++ b/src/base/ftobjs.c +@@ -528,6 +528,9 @@ + return error; + } + ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) ++#define generic GenericFromFreeTypeLibrary ++#endif + + static void + ft_glyphslot_clear( FT_GlyphSlot slot ) +@@ -1195,6 +1198,9 @@ + FT_FREE( face ); + } + ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) ++#undef generic ++#endif + + static void + Destroy_Driver( FT_Driver driver ) diff --git a/externals/vcpkg/ports/freetype/brotli-static.patch b/externals/vcpkg/ports/freetype/brotli-static.patch new file mode 100755 index 000000000..6d657aa5a --- /dev/null +++ b/externals/vcpkg/ports/freetype/brotli-static.patch @@ -0,0 +1,23 @@ +diff --git a/builds/cmake/FindBrotliDec.cmake b/builds/cmake/FindBrotliDec.cmake +index 46356b1fd..ed4cc2409 100644 +--- a/builds/cmake/FindBrotliDec.cmake ++++ b/builds/cmake/FindBrotliDec.cmake +@@ -35,10 +35,17 @@ find_path(BROTLIDEC_INCLUDE_DIRS + PATH_SUFFIXES brotli) + + find_library(BROTLIDEC_LIBRARIES +- NAMES brotlidec ++ NAMES brotlidec brotlidec-static NAMES_PER_DIR + HINTS ${PC_BROTLIDEC_LIBDIR} + ${PC_BROTLIDEC_LIBRARY_DIRS}) + ++if(BROTLIDEC_LIBRARIES MATCHES "-static") ++ find_library(BROTLICOMMON_LIBRARIES ++ NAMES brotlicommon-static ++ HINTS ${PC_BROTLIDEC_LIBDIR} ++ ${PC_BROTLIDEC_LIBRARY_DIRS}) ++ set(BROTLIDEC_LIBRARIES ${BROTLIDEC_LIBRARIES} ${BROTLICOMMON_LIBRARIES}) ++endif() + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args( diff --git a/externals/vcpkg/ports/freetype/bzip2.patch b/externals/vcpkg/ports/freetype/bzip2.patch new file mode 100755 index 000000000..c0f9101f7 --- /dev/null +++ b/externals/vcpkg/ports/freetype/bzip2.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 469a141a2..eec19c7d0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -517,7 +517,7 @@ if (BZIP2_FOUND) + if (PC_BZIP2_FOUND) + list(APPEND PKGCONFIG_REQUIRES_PRIVATE "bzip2") + else () +- list(APPEND PKGCONFIG_LIBS_PRIVATE "-lbz2") ++ list(APPEND PKGCONFIG_REQUIRES_PRIVATE "bzip2") + endif () + endif () + if (PNG_FOUND) diff --git a/externals/vcpkg/ports/freetype/fix-exports.patch b/externals/vcpkg/ports/freetype/fix-exports.patch new file mode 100755 index 000000000..39b1e1581 --- /dev/null +++ b/externals/vcpkg/ports/freetype/fix-exports.patch @@ -0,0 +1,40 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cb1b9a0f2..edca5d579 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -508,7 +508,6 @@ set(PKG_CONFIG_REQUIRED_PRIVATE "") + set(PKGCONFIG_LIBS_PRIVATE "") + + if (ZLIB_FOUND) +- target_link_libraries(freetype PRIVATE ${ZLIB_LIBRARIES}) ++ target_link_libraries(freetype PRIVATE ZLIB::ZLIB) +- target_include_directories(freetype PRIVATE ${ZLIB_INCLUDE_DIRS}) + list(APPEND PKGCONFIG_REQUIRES_PRIVATE "zlib") + endif () +@@ -596,12 +596,25 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) + install( + EXPORT freetype-targets + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype +- FILE freetype-config.cmake + COMPONENT headers) + install( + FILES ${PROJECT_BINARY_DIR}/freetype-config-version.cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype + COMPONENT headers) ++ ++ if(ZLIB_FOUND) ++ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/freetype-config.cmake" ++[[include(CMakeFindDependencyMacro) ++find_dependency(ZLIB) ++include("${CMAKE_CURRENT_LIST_DIR}/freetype-targets.cmake") ++]]) ++ else() ++ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/freetype-config.cmake" ++[[include("${CMAKE_CURRENT_LIST_DIR}/freetype-targets.cmake") ++]]) ++ endif() ++ ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/freetype-config.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype) + endif () + + diff --git a/externals/vcpkg/ports/freetype/portfile.cmake b/externals/vcpkg/ports/freetype/portfile.cmake new file mode 100755 index 000000000..daa4ebf79 --- /dev/null +++ b/externals/vcpkg/ports/freetype/portfile.cmake @@ -0,0 +1,83 @@ +set(FT_VERSION 2.12.1) + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO freetype/freetype2 + REF ${FT_VERSION} + FILENAME freetype-${FT_VERSION}.tar.xz + SHA512 6482de1748dc2cc01e033d21a3b492dadb1f039d13d9179685fdcf985e24d7f587cbca4c27ed8a7fdb7d9ad59612642ac5f4db062443154753295363f45c052f + PATCHES + 0003-Fix-UWP.patch + brotli-static.patch + bzip2.patch + fix-exports.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + zlib FT_REQUIRE_ZLIB + bzip2 FT_REQUIRE_BZIP2 + png FT_REQUIRE_PNG + brotli FT_REQUIRE_BROTLI + INVERTED_FEATURES + zlib FT_DISABLE_ZLIB + bzip2 FT_DISABLE_BZIP2 + png FT_DISABLE_PNG + brotli FT_DISABLE_BROTLI +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DFT_DISABLE_HARFBUZZ=ON + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/freetype) + +# Rename for easy usage (VS integration; CMake and autotools will not care) +file(RENAME "${CURRENT_PACKAGES_DIR}/include/freetype2/freetype" "${CURRENT_PACKAGES_DIR}/include/freetype") +file(RENAME "${CURRENT_PACKAGES_DIR}/include/freetype2/ft2build.h" "${CURRENT_PACKAGES_DIR}/include/ft2build.h") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/freetype2") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Fix the include dir [freetype2 -> freetype] +file(READ "${CURRENT_PACKAGES_DIR}/share/freetype/freetype-targets.cmake" CONFIG_MODULE) +string(REPLACE "\${_IMPORT_PREFIX}/include/freetype2" "\${_IMPORT_PREFIX}/include" CONFIG_MODULE "${CONFIG_MODULE}") +string(REPLACE "\${_IMPORT_PREFIX}/lib/brotlicommon-static.lib" [[\$<\$>:${_IMPORT_PREFIX}/lib/brotlicommon-static.lib>;\$<\$:${_IMPORT_PREFIX}/debug/lib/brotlicommon-static.lib>]] CONFIG_MODULE "${CONFIG_MODULE}") +string(REPLACE "\${_IMPORT_PREFIX}/lib/brotlidec-static.lib" [[\$<\$>:${_IMPORT_PREFIX}/lib/brotlidec-static.lib>;\$<\$:${_IMPORT_PREFIX}/debug/lib/brotlidec-static.lib>]] CONFIG_MODULE "${CONFIG_MODULE}") +string(REPLACE "\${_IMPORT_PREFIX}/lib/brotlidec.lib" [[\$<\$>:${_IMPORT_PREFIX}/lib/brotlidec.lib>;\$<\$:${_IMPORT_PREFIX}/debug/lib/brotlidec.lib>]] CONFIG_MODULE "${CONFIG_MODULE}") +string(REPLACE "\${_IMPORT_PREFIX}/lib/brotlidec.lib" [[\$<\$>:${_IMPORT_PREFIX}/lib/brotlidec.lib>;\$<\$:${_IMPORT_PREFIX}/debug/lib/brotlidec.lib>]] CONFIG_MODULE "${CONFIG_MODULE}") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/freetype/freetype-targets.cmake "${CONFIG_MODULE}") + +find_library(FREETYPE_DEBUG NAMES freetyped PATHS "${CURRENT_PACKAGES_DIR}/debug/lib/" NO_DEFAULT_PATH) +if(NOT VCPKG_BUILD_TYPE) + file(READ "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/freetype2.pc" _contents) + if(FREETYPE_DEBUG) + string(REPLACE "-lfreetype" "-lfreetyped" _contents "${_contents}") + endif() + string(REPLACE "-I\${includedir}/freetype2" "-I\${includedir}" _contents "${_contents}") + file(WRITE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/freetype2.pc" "${_contents}") +endif() + +file(READ "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/freetype2.pc" _contents) +string(REPLACE "-I\${includedir}/freetype2" "-I\${includedir}" _contents "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/freetype2.pc" "${_contents}") + + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) + +file(COPY + "${SOURCE_PATH}/docs/FTL.TXT" + "${SOURCE_PATH}/docs/GPLv2.TXT" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" +) +file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") diff --git a/externals/vcpkg/ports/freetype/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/freetype/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..ee332c3c6 --- /dev/null +++ b/externals/vcpkg/ports/freetype/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,64 @@ +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0054 NEW) + +_find_package(${ARGS}) + +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + if("@FT_REQUIRE_ZLIB@") + find_package(ZLIB) + endif() + if("@FT_REQUIRE_BZIP2@") + find_package(BZip2) + endif() + if("@FT_REQUIRE_PNG@") + find_package(PNG) + endif() + if("@FT_REQUIRE_BROTLI@") + find_library(BROTLIDEC_LIBRARY_RELEASE NAMES brotlidec brotlidec-static PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) + find_library(BROTLIDEC_LIBRARY_DEBUG NAMES brotlidec brotlidec-static brotlidecd brotlidec-staticd PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) + find_library(BROTLICOMMON_LIBRARY_RELEASE NAMES brotlicommon brotlicommon-static PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) + find_library(BROTLICOMMON_LIBRARY_DEBUG NAMES brotlicommon brotlicommon-static brotlicommond brotlicommon-staticd PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) + include(SelectLibraryConfigurations) + select_library_configurations(BROTLIDEC) + select_library_configurations(BROTLICOMMON) + endif("@FT_REQUIRE_BROTLI@") + + if(TARGET Freetype::Freetype) + if("@FT_REQUIRE_ZLIB@") + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES ZLIB::ZLIB) + endif() + if("@FT_REQUIRE_BZIP2@") + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES BZip2::BZip2) + endif() + if("@FT_REQUIRE_PNG@") + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES PNG::PNG) + endif() + if("@FT_REQUIRE_BROTLI@") + if(BROTLIDEC_LIBRARY_DEBUG) + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<\$:${BROTLIDEC_LIBRARY_DEBUG}>") + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<\$:${BROTLICOMMON_LIBRARY_DEBUG}>") + endif() + if(BROTLIDEC_LIBRARY_RELEASE) + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<\$>:${BROTLIDEC_LIBRARY_RELEASE}>") + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<\$>:${BROTLICOMMON_LIBRARY_RELEASE}>") + endif() + endif() + endif() + + if(FREETYPE_LIBRARIES) + if("@FT_REQUIRE_ZLIB@") + list(APPEND FREETYPE_LIBRARIES ${ZLIB_LIBRARIES}) + endif() + if("@FT_REQUIRE_BZIP2@") + list(APPEND FREETYPE_LIBRARIES ${BZIP2_LIBRARIES}) + endif() + if("@FT_REQUIRE_PNG@") + list(APPEND FREETYPE_LIBRARIES ${PNG_LIBRARIES}) + endif() + if("@FT_REQUIRE_BROTLI@") + list(APPEND FREETYPE_LIBRARIES ${BROTLIDEC_LIBRARIES} ${BROTLICOMMON_LIBRARIES}) + endif() + endif() +endif() +cmake_policy(POP) diff --git a/externals/vcpkg/ports/freetype/vcpkg.json b/externals/vcpkg/ports/freetype/vcpkg.json new file mode 100755 index 000000000..70ed7e938 --- /dev/null +++ b/externals/vcpkg/ports/freetype/vcpkg.json @@ -0,0 +1,49 @@ +{ + "name": "freetype", + "version": "2.12.1", + "description": "A library to render fonts.", + "homepage": "https://www.freetype.org/", + "license": "FTL OR GPL-2.0-or-later", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "brotli", + "bzip2", + "png", + "zlib" + ], + "features": { + "brotli": { + "description": "Support decompression of WOFF2 streams", + "dependencies": [ + "brotli" + ] + }, + "bzip2": { + "description": "Support bzip2 compressed fonts.", + "dependencies": [ + "bzip2" + ] + }, + "png": { + "description": "Support PNG compressed OpenType embedded bitmaps.", + "dependencies": [ + "libpng" + ] + }, + "zlib": { + "description": "Use zlib instead of internal library for DEFLATE", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/freexl/fix-makefiles.patch b/externals/vcpkg/ports/freexl/fix-makefiles.patch new file mode 100755 index 000000000..f6e8251c7 --- /dev/null +++ b/externals/vcpkg/ports/freexl/fix-makefiles.patch @@ -0,0 +1,16 @@ +diff --git a/makefile.vc b/makefile.vc +index cb8bd36..85c0352 100644 +--- a/makefile.vc ++++ b/makefile.vc +@@ -23,9 +23,9 @@ freexl.lib: $(LIBOBJ) + $(FREEXL_DLL): freexl_i.lib + + freexl_i.lib: $(LIBOBJ) +- link /debug /dll /out:$(FREEXL_DLL) \ ++ link $(LINK_FLAGS) /dll /out:$(FREEXL_DLL) \ + /implib:freexl_i.lib $(LIBOBJ) \ +- C:\OSGeo4w\lib\iconv.lib ++ $(LIBS_ALL) + if exist $(FREEXL_DLL).manifest mt -manifest \ + $(FREEXL_DLL).manifest -outputresource:$(FREEXL_DLL);2 + diff --git a/externals/vcpkg/ports/freexl/fix-pc-file.patch b/externals/vcpkg/ports/freexl/fix-pc-file.patch new file mode 100755 index 000000000..5a429026d --- /dev/null +++ b/externals/vcpkg/ports/freexl/fix-pc-file.patch @@ -0,0 +1,26 @@ +diff --git a/configure.ac b/configure.ac +index a44dbf4..55bd768 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -64,9 +64,11 @@ AC_CONFIG_FILES([Makefile \ + AC_CHECK_HEADERS(iconv.h,, [AC_MSG_ERROR([cannot find iconv.h, bailing out])]) + # on some systems "iconv()" lives in libc. On others it lives in libiconv + # on older systems "libiconv()" lives in libiconv ++SAVED_LIBS="${LIBS}" + AC_SEARCH_LIBS(iconv,iconv,, + AC_SEARCH_LIBS(libiconv,iconv,,AC_MSG_ERROR(['libiconv' is required but it doesn't seem to be installed on this system.]),)) + AC_SEARCH_LIBS(locale_charset,charset,, + AC_SEARCH_LIBS(nl_langinfo,c,,AC_MSG_ERROR(['libcharset' is required but it doesn't seem to be installed on this system.]),)) ++AC_SUBST(ICONV_LIBS, "${LIBS%${SAVED_LIBS}}") + + AC_OUTPUT + +diff --git a/freexl.pc.in b/freexl.pc.in +index 5813e68..8fc671d 100644 +--- a/freexl.pc.in ++++ b/freexl.pc.in +@@ -10,3 +10,4 @@ Description: a simple library extracting data from .xls (Excel BIFF) files + Version: @VERSION@ + Libs: -L${libdir} -lfreexl -lm + Cflags: -I${includedir} ++Libs.private: @ICONV_LIBS@ diff --git a/externals/vcpkg/ports/freexl/fix-sources.patch b/externals/vcpkg/ports/freexl/fix-sources.patch new file mode 100755 index 000000000..ffac02751 --- /dev/null +++ b/externals/vcpkg/ports/freexl/fix-sources.patch @@ -0,0 +1,13 @@ +diff --git a/config-msvc.h b/config-msvc.h +index a39d4e7..37f1c0b 100644 +--- a/config-msvc.h ++++ b/config-msvc.h +@@ -66,7 +66,7 @@ + #define HAVE_SYS_TYPES_H 1 + + /* Define to 1 if you have the header file. */ +-#define HAVE_UNISTD_H 1 ++#undef HAVE_UNISTD_H + + /* Define to 1 if `lstat' dereferences a symlink specified with a trailing + slash. */ diff --git a/externals/vcpkg/ports/freexl/portfile.cmake b/externals/vcpkg/ports/freexl/portfile.cmake new file mode 100755 index 000000000..b337c8030 --- /dev/null +++ b/externals/vcpkg/ports/freexl/portfile.cmake @@ -0,0 +1,86 @@ +set(FREEXL_VERSION_STR "1.0.6") + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.gaia-gis.it/gaia-sins/freexl-sources/freexl-${FREEXL_VERSION_STR}.tar.gz" + FILENAME "freexl-${FREEXL_VERSION_STR}.tar.gz" + SHA512 efbbe261e57d5c05167ad8e1d5a5b348a7e702c0a4030b18dd2a8c60a38332caccbb073ff604bdf5bafac827310b41c7b79f9fa519ea512d6de2eafd9c1f71f6 +) + +vcpkg_extract_source_archive_ex( + ARCHIVE "${ARCHIVE}" + OUT_SOURCE_PATH SOURCE_PATH + PATCHES + fix-makefiles.patch + fix-sources.patch + fix-pc-file.patch +) + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(OPTFLAGS "/nologo /fp:precise /W3 /D_CRT_SECURE_NO_WARNINGS /DDLL_EXPORT") + set(LIBS_ALL "iconv.lib charset.lib") + if(VCPKG_TARGET_IS_UWP) + string(APPEND OPTFLAGS " /DWINAPI_FAMILY=WINAPI_FAMILY_APP") + string(APPEND LIBS_ALL " WindowsApp.lib /APPCONTAINER") + endif() + cmake_path(NATIVE_PATH CURRENT_PACKAGES_DIR INSTDIR) + vcpkg_install_nmake( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "OPTFLAGS=${OPTFLAGS}" + "CFLAGS=-I. -Iheaders ${OPTFLAGS}" + "LIBS_ALL=${LIBS_ALL}" + OPTIONS_DEBUG + "INSTDIR=${INSTDIR}\\debug" + "LINK_FLAGS=/debug /LIBPATH:\"${CURRENT_INSTALLED_DIR}/debug/lib\"" + OPTIONS_RELEASE + "INSTDIR=${INSTDIR}" + "LINK_FLAGS=/LIBPATH:\"${CURRENT_INSTALLED_DIR}/lib\"" + ) + + if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/freexl_i.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/freexl_i.lib") + else() + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/freexl.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/freexl.lib") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/freexl_i.lib" "${CURRENT_PACKAGES_DIR}/lib/freexl.lib") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/freexl_i.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/freexl.lib") + endif() + endif() + + set(VERSION "${FREEXL_VERSION_STR}") + set(libdir [[${prefix}/lib]]) + set(exec_prefix [[${prefix}]]) + set(ICONV_LIBS "-liconv -lcharset") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(includedir [[${prefix}/include]]) + set(outfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/freexl.pc") + configure_file("${SOURCE_PATH}/freexl.pc.in" "${outfile}" @ONLY) + vcpkg_replace_string("${outfile}" " -lm" "") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(includedir [[${prefix}/../include]]) + set(outfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/freexl.pc") + configure_file("${SOURCE_PATH}/freexl.pc.in" "${outfile}" @ONLY) + vcpkg_replace_string("${outfile}" " -lm" "") + endif() + +else() + + vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + ) + vcpkg_install_make() + +endif() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/freexl/vcpkg.json b/externals/vcpkg/ports/freexl/vcpkg.json new file mode 100755 index 000000000..39faf316c --- /dev/null +++ b/externals/vcpkg/ports/freexl/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "freexl", + "version-string": "1.0.6", + "description": "FreeXL is an open source library to extract valid data from within an Excel (.xls) spreadsheet", + "homepage": "https://www.gaia-gis.it/gaia-sins/freexl-sources", + "dependencies": [ + "libiconv" + ] +} diff --git a/externals/vcpkg/ports/fribidi/meson-crosscompile.patch b/externals/vcpkg/ports/fribidi/meson-crosscompile.patch new file mode 100755 index 000000000..07368a087 --- /dev/null +++ b/externals/vcpkg/ports/fribidi/meson-crosscompile.patch @@ -0,0 +1,36 @@ +diff --git a/gen.tab/meson.build b/gen.tab/meson.build +index 8c21e98..1cd9960 100644 +--- a/gen.tab/meson.build ++++ b/gen.tab/meson.build +@@ -1,5 +1,10 @@ + # gen.tab + ++if get_option('pregenerated_tab') != '' ++ generated_tab_include_files = [] ++ fribidi_unicode_version_h = files() ++ add_project_arguments('-I' + get_option('pregenerated_tab'), language: 'c') ++else + native_cc = meson.get_compiler('c') + + # Don't pick up top-level config.h, as that has defines for the cross-compiler +@@ -75,7 +80,10 @@ foreach tab : tabs + input: gen_prog_inputs, + output: gen_prog_out, + command: [gen_exe, COMPRESSION, '@INPUT@', gen_prog_name], ++ install: true, ++ install_dir: 'share/fribidi/gen.tab', + capture: true) + + generated_tab_include_files += [tab_inc_file] + endforeach ++endif +diff --git a/meson_options.txt b/meson_options.txt +index f54a639..8f60205 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -8,3 +8,5 @@ option('tests', type : 'boolean', value : true, + description: 'Build tests') + option('fuzzer_ldflags', type : 'string', + description: 'Extra LDFLAGS used during linking of fuzzing binaries') ++option('pregenerated_tab', type: 'string', ++ description: 'Path to pregenerated table sources') diff --git a/externals/vcpkg/ports/fribidi/portfile.cmake b/externals/vcpkg/ports/fribidi/portfile.cmake new file mode 100755 index 000000000..b112c046c --- /dev/null +++ b/externals/vcpkg/ports/fribidi/portfile.cmake @@ -0,0 +1,56 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO fribidi/fribidi + REF v1.0.12 + SHA512 a3a63e1dde1cffb097376df0b34522700cff600da61bdafd6f4f50db6937383b9f73a82081cb1a7f2e1946ba07fea13e2880a4250b1508850bffa500046a7fa5 + HEAD_REF master + PATCHES meson-crosscompile.patch +) + +set(gen_tab_subdir "share/${PORT}/gen.tab") + +set(options "") +if(VCPKG_CROSSCOMPILING) + set(gen_tab "${CURRENT_HOST_INSTALLED_DIR}/${gen_tab_subdir}") + cmake_path(NATIVE_PATH gen_tab gen_tab) + set(options "-Dpregenerated_tab=${gen_tab}") +endif() + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${options} + -Ddocs=false + -Dbin=false + -Dtests=false +) + +vcpkg_install_meson() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +# Define static macro +file(READ "${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h" FRIBIDI_COMMON_H) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + string(REPLACE "#ifndef FRIBIDI_LIB_STATIC" "#if 0" FRIBIDI_COMMON_H "${FRIBIDI_COMMON_H}") +else() + string(REPLACE "#ifndef FRIBIDI_LIB_STATIC" "#if 1" FRIBIDI_COMMON_H "${FRIBIDI_COMMON_H}") +endif() +file(WRITE "${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h" "${FRIBIDI_COMMON_H}") + +if(VCPKG_CROSSCOMPILING) + file( + COPY "${gen_tab}/fribidi-unicode-version.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/fribidi" + ) +else() + file( + COPY "${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-unicode-version.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/${gen_tab_subdir}" + ) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/fribidi/vcpkg.json b/externals/vcpkg/ports/fribidi/vcpkg.json new file mode 100755 index 000000000..0b28f86bc --- /dev/null +++ b/externals/vcpkg/ports/fribidi/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "fribidi", + "version": "1.0.12", + "description": "GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi)", + "supports": "!uwp", + "dependencies": [ + { + "name": "fribidi", + "host": true + }, + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/frozen/portfile.cmake b/externals/vcpkg/ports/frozen/portfile.cmake new file mode 100755 index 000000000..ab316e426 --- /dev/null +++ b/externals/vcpkg/ports/frozen/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO serge-sans-paille/frozen + REF 1.1.1 + SHA512 e22561a4e634e388e11f95b3005bc711e543013d314f6aaeda34befb2c673aea2d71a717d8822bc8fa85bdc8409945ba2ad91a1bac4f8cb5303080de01a5f60e + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dfrozen.benchmark=OFF + -Dfrozen.coverage=OFF + -Dfrozen.installation=ON + -Dfrozen.tests=OFF +) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/frozen) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/frozen/vcpkg.json b/externals/vcpkg/ports/frozen/vcpkg.json new file mode 100755 index 000000000..e6671fc4b --- /dev/null +++ b/externals/vcpkg/ports/frozen/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "frozen", + "version": "1.1.1", + "description": "Header-only library that provides 0 cost initialization for immutable containers and various algorithms. Frozen provides:immutable (a.k.a. frozen), constexpr-compatible versions of std::set, std::unordered_set, std::map and std::unordered_map and 0-cost initialization version of std::search for frozen needles using Boyer-Moore or Knuth-Morris-Pratt algorithms.", + "homepage": "https://github.com/serge-sans-paille/frozen", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/frugally-deep/portfile.cmake b/externals/vcpkg/ports/frugally-deep/portfile.cmake new file mode 100755 index 000000000..1350a728c --- /dev/null +++ b/externals/vcpkg/ports/frugally-deep/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Dobiasd/frugally-deep + REF v0.15.10-p0 + SHA512 e665df59c83fea5fc0a89158639c83f9c72cba1fc8c61086032db60c395606dab4e9085f1380714e4f8a82c1f2b143aa22ff6212d9180c368283e1965e6dea87 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + double FDEEP_USE_DOUBLE +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DFDEEP_BUILD_UNITTEST=OFF + -DFDEEP_USE_TOOLCHAIN=ON + ${FEATURE_OPTIONS} +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/frugally-deep TARGET_PATH share/${PORT}) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/frugally-deep/vcpkg.json b/externals/vcpkg/ports/frugally-deep/vcpkg.json new file mode 100755 index 000000000..8dfe3eca9 --- /dev/null +++ b/externals/vcpkg/ports/frugally-deep/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "frugally-deep", + "version-semver": "0.15.10-p0", + "description": "Header-only library for using Keras models in C++.", + "homepage": "https://github.com/Dobiasd/frugally-deep", + "dependencies": [ + "eigen3", + "fplus", + "nlohmann-json" + ], + "features": { + "double": { + "description": "Use double precision" + } + } +} diff --git a/externals/vcpkg/ports/fruit/portfile.cmake b/externals/vcpkg/ports/fruit/portfile.cmake new file mode 100755 index 000000000..8fc652387 --- /dev/null +++ b/externals/vcpkg/ports/fruit/portfile.cmake @@ -0,0 +1,23 @@ + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/fruit + REF 29c9fd265cfa72ee72fb64257fe4b72198d87264 # v3.6.0 + SHA512 1a8f5b126492dd81fe40bbedd0ead839fd25dac6ea569dd51879e288a4c5850c6618754547ac201d82875781ee0490261372df7a0d1cf50e90c3a9b9da9aaed4 + HEAD_REF master +) + +# TODO: Make boost an optional dependency? +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DFRUIT_USES_BOOST=False + -DFRUIT_TESTS_USE_PRECOMPILED_HEADERS=OFF +) + +vcpkg_install_cmake() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/fruit/vcpkg.json b/externals/vcpkg/ports/fruit/vcpkg.json new file mode 100755 index 000000000..b182643b3 --- /dev/null +++ b/externals/vcpkg/ports/fruit/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "fruit", + "version-string": "3.6.0", + "port-version": 1, + "description": "Fruit, a dependency injection framework for C++ by Google", + "homepage": "https://github.com/google/fruit" +} diff --git a/externals/vcpkg/ports/ftgl/01_disable_doxygen.patch b/externals/vcpkg/ports/ftgl/01_disable_doxygen.patch new file mode 100755 index 000000000..5443554e7 --- /dev/null +++ b/externals/vcpkg/ports/ftgl/01_disable_doxygen.patch @@ -0,0 +1,30 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 303fcae..718ae88 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -35,15 +35,16 @@ ENDIF(BUILD_SHARED_LIBS) + + ADD_CUSTOM_TARGET(doc) + +-FIND_PACKAGE(Doxygen) +-IF(DOXYGEN_FOUND) +- ADD_CUSTOM_TARGET(doxygen +- ${DOXYGEN_EXECUTABLE} +- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} +- COMMENT "Doxygen ...") +- ADD_DEPENDENCIES(doc doxygen) +- +-ENDIF(DOXYGEN_FOUND) ++IF (WIN32) # doxygen only have windows package in vcpkg now. ++ FIND_PACKAGE(Doxygen) ++ IF(DOXYGEN_FOUND) ++ ADD_CUSTOM_TARGET(doxygen ++ ${DOXYGEN_EXECUTABLE} ++ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} ++ COMMENT "Doxygen ...") ++ ADD_DEPENDENCIES(doc doxygen) ++ ENDIF(DOXYGEN_FOUND) ++ENDIF() + + SUBDIRS(src) + diff --git a/externals/vcpkg/ports/ftgl/02_enable-cpp11-std.patch b/externals/vcpkg/ports/ftgl/02_enable-cpp11-std.patch new file mode 100755 index 000000000..37ae283af --- /dev/null +++ b/externals/vcpkg/ports/ftgl/02_enable-cpp11-std.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 718ae88..e53e0da 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,9 @@ + CMAKE_MINIMUM_REQUIRED(VERSION 2.8) + + PROJECT(FTGL) ++set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD_REQUIRED ON) ++ + SET(CMAKE_MODULE_PATH ${FTGL_SOURCE_DIR}) + + SET(VERSION_SERIES 2) diff --git a/externals/vcpkg/ports/ftgl/portfile.cmake b/externals/vcpkg/ports/ftgl/portfile.cmake new file mode 100755 index 000000000..56553a8f6 --- /dev/null +++ b/externals/vcpkg/ports/ftgl/portfile.cmake @@ -0,0 +1,32 @@ +if (VCPKG_TARGET_IS_WINDOWS) + # doxygen only have windows package in vcpkg now. + vcpkg_find_acquire_program(DOXYGEN) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO frankheckenbach/ftgl + REF 36e8cd683492456def3b6a54c6dcb56cd6ee4bb4 #commmit-data 2022-05-18 + SHA512 b357cf18890664d437f41d7bf18f39c894743e76e2e0b2296254b27e5675866956473e7b78139d0e6cdd7e8310bf8d2943ba0ddeea494ee67857d6083c490dc2 + HEAD_REF master + PATCHES + 01_disable_doxygen.patch + 02_enable-cpp11-std.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +else () + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/ftgl/vcpkg.json b/externals/vcpkg/ports/ftgl/vcpkg.json new file mode 100755 index 000000000..aa1c67265 --- /dev/null +++ b/externals/vcpkg/ports/ftgl/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "ftgl", + "version-date": "2022-05-18", + "port-version": 1, + "description": [ + "FTGL is a free open source library to enable developers to use arbitrary fonts in their OpenGL (www.opengl.org) applications.", + "Unlike other OpenGL font libraries FTGL uses standard font file formats so doesn't need a preprocessing step to convert the high quality font data into a lesser quality, proprietary format.", + "FTGL uses the Freetype (www.freetype.org) font library to open and 'decode' the fonts. It then takes that output and stores it in a format most efficient for OpenGL rendering." + ], + "homepage": "https://github.com/frankheckenbach/ftgl", + "license": "MIT", + "dependencies": [ + "freetype", + "opengl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ftxui/portfile.cmake b/externals/vcpkg/ports/ftxui/portfile.cmake new file mode 100755 index 000000000..0399a8dd4 --- /dev/null +++ b/externals/vcpkg/ports/ftxui/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ArthurSonzogni/FTXUI + REF c033ca61ae8fb264542d0326d1309e0a3bde945a # 3.0.0 + SHA512 ca1468f30f90c3a886fbb6dea113699623d601da10b39a6a33d89780cd825bec8deb431872a2515fce05c7a5d581d4b56860b19654df8cf90e389dfa964f013c + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DFTXUI_BUILD_EXAMPLES=OFF + -DFTXUI_ENABLE_INSTALL=ON + -DFTXUI_BUILD_TESTS=OFF + -DFTXUI_BUILD_DOCS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/ftxui/vcpkg.json b/externals/vcpkg/ports/ftxui/vcpkg.json new file mode 100755 index 000000000..b185c67ca --- /dev/null +++ b/externals/vcpkg/ports/ftxui/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ftxui", + "version-semver": "3.0.0", + "description": "C++ Functional Terminal User Interface", + "homepage": "https://github.com/ArthurSonzogni/FTXUI", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/function2/disable-testing.patch b/externals/vcpkg/ports/function2/disable-testing.patch new file mode 100755 index 000000000..c17403c33 --- /dev/null +++ b/externals/vcpkg/ports/function2/disable-testing.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 684abe0..32a5cf6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -75,7 +75,9 @@ if (FU2_IS_TOP_LEVEL_PROJECT) + install(EXPORT "${PROJECT_NAME}Targets" + NAMESPACE ${PROJECT_NAME}:: + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") ++endif() + ++if(0) + # Setup CPack for bundling + set(CPACK_GENERATOR "ZIP") + set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) diff --git a/externals/vcpkg/ports/function2/portfile.cmake b/externals/vcpkg/ports/function2/portfile.cmake new file mode 100755 index 000000000..f3b06e923 --- /dev/null +++ b/externals/vcpkg/ports/function2/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Naios/function2 + REF 02ca99831de59c7c3a4b834789260253cace0ced # 4.2.0 + SHA512 5b14d95584586c7365119f5171c86c7556ce402ae3c5db09e4e54e1225fc71e40f88ab77188986ecf9dac5eecbfd6330c5a7ecfe0375cb37773d007ebef1ba93 + HEAD_REF master + PATCHES + disable-testing.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE ${CURRENT_PACKAGES_DIR}/Readme.md) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +# Put the installed licence file where vcpkg expects it +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(RENAME ${CURRENT_PACKAGES_DIR}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/function2/vcpkg.json b/externals/vcpkg/ports/function2/vcpkg.json new file mode 100755 index 000000000..6bea8f2aa --- /dev/null +++ b/externals/vcpkg/ports/function2/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "function2", + "version-string": "4.2.0", + "port-version": 1, + "description": "Improved drop-in replacement to std::function", + "homepage": "https://github.com/Naios/function2" +} diff --git a/externals/vcpkg/ports/functions-framework-cpp/portfile.cmake b/externals/vcpkg/ports/functions-framework-cpp/portfile.cmake new file mode 100755 index 000000000..89123d06a --- /dev/null +++ b/externals/vcpkg/ports/functions-framework-cpp/portfile.cmake @@ -0,0 +1,33 @@ +# TODO(coryan) - fix support for DLLs +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO GoogleCloudPlatform/functions-framework-cpp + REF v1.1.0 + SHA512 2dcedbded84fdd604724b4f2482ee531aaa640ebdbb69f77978e1af8943d9d7746152953953ebd89d8304ed3efbc334c620890142b0ba2e1239862e43a158364 + HEAD_REF main +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_install_cmake(ADD_BIN_TO_PATH) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file( + INSTALL ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright) + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/functions-framework-cpp/vcpkg.json b/externals/vcpkg/ports/functions-framework-cpp/vcpkg.json new file mode 100755 index 000000000..ce0094b49 --- /dev/null +++ b/externals/vcpkg/ports/functions-framework-cpp/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "functions-framework-cpp", + "version": "1.1.0", + "description": "Functions Framework for C++.", + "homepage": "https://github.com/GoogleCloudPlatform/functions-framework-cpp/", + "license": "Apache-2.0", + "dependencies": [ + "abseil", + "boost-beast", + "boost-program-options", + "boost-serialization", + "nlohmann-json" + ] +} diff --git a/externals/vcpkg/ports/fuzzylite/portfile.cmake b/externals/vcpkg/ports/fuzzylite/portfile.cmake new file mode 100755 index 000000000..79ec38f10 --- /dev/null +++ b/externals/vcpkg/ports/fuzzylite/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO fuzzylite/fuzzylite + REF v6.0 + SHA512 6f5d40d0359458e109ac2aebfbf571f61867a8b49920f4a5e1b5d86bdf578dba038b942c9e05eab0d4620f73e8cded770abe7b5e597a3b4c39dbcf6a1259f4af + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FL_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" FL_BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/fuzzylite" + OPTIONS + -DFL_BUILD_SHARED=${FL_BUILD_SHARED} + -DFL_BUILD_STATIC=${FL_BUILD_STATIC} + -DFL_BUILD_BINARY=OFF + -DFL_BUILD_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fl/fuzzylite.h" + "#elif defined(FL_IMPORT_LIBRARY)" + "#elif 1" + ) +elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fl/fuzzylite.h" + "#elif defined(FL_IMPORT_LIBRARY)" + "#elif 0" + ) +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/fuzzylite/vcpkg.json b/externals/vcpkg/ports/fuzzylite/vcpkg.json new file mode 100755 index 000000000..98bb4ba80 --- /dev/null +++ b/externals/vcpkg/ports/fuzzylite/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "fuzzylite", + "version": "6.0", + "port-version": 5, + "description": "A fuzzy logic control library in C++", + "homepage": "https://github.com/fuzzylite/fuzzylite", + "license": "GPL-3.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/fxdiv/portfile.cmake b/externals/vcpkg/ports/fxdiv/portfile.cmake new file mode 100755 index 000000000..a62cefcd8 --- /dev/null +++ b/externals/vcpkg/ports/fxdiv/portfile.cmake @@ -0,0 +1,18 @@ + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Maratyszcza/fxdiv + REF 63058eff77e11aa15bf531df5dd34395ec3017c8 + SHA512 da33eab4d006645f383a1f24fc3e747db3aeb0613219297ec0ae69aa2617f07ba050ebd6a64a8cbde6d25481f176d0ec3b9753a95d1fbcead2136595f3e50e97 +) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DFXDIV_BUILD_TESTS=OFF + -DFXDIV_BUILD_BENCHMARKS=OFF +) +vcpkg_install_cmake() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) diff --git a/externals/vcpkg/ports/fxdiv/vcpkg.json b/externals/vcpkg/ports/fxdiv/vcpkg.json new file mode 100755 index 000000000..e120815ee --- /dev/null +++ b/externals/vcpkg/ports/fxdiv/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "fxdiv", + "version-string": "2021-02-21", + "description": "C99/C++ header-only library for division via fixed-point multiplication by inverse", + "homepage": "https://github.com/Maratyszcza/FXdiv" +} diff --git a/externals/vcpkg/ports/g2o/portfile.cmake b/externals/vcpkg/ports/g2o/portfile.cmake new file mode 100755 index 000000000..010a10ccf --- /dev/null +++ b/externals/vcpkg/ports/g2o/portfile.cmake @@ -0,0 +1,43 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO RainerKuemmerle/g2o + REF fcba4eaca6f20d9a5792404cc8ef303aeb8ba5d2 + SHA512 41e5a6d40db10d66182653d56f937f29264bf4f9412dfa651be949caeb055741c9d9ba75a122180892aafe7d45b334d50470284121148c0561e1d49f6ba5e20a + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_LGPL_SHARED_LIBS) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_LGPL_SHARED_LIBS=${BUILD_LGPL_SHARED_LIBS} + -DG2O_BUILD_EXAMPLES=OFF + -DG2O_BUILD_APPS=OFF +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/g2o) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(GLOB_RECURSE HEADERS "${CURRENT_PACKAGES_DIR}/include/*") + foreach(HEADER ${HEADERS}) + file(READ ${HEADER} HEADER_CONTENTS) + string(REPLACE "#ifdef G2O_SHARED_LIBS" "#if 1" HEADER_CONTENTS "${HEADER_CONTENTS}") + file(WRITE ${HEADER} "${HEADER_CONTENTS}") + endforeach() +endif() + +file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*.exe) +file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) +if(EXE OR DEBUG_EXE) + file(REMOVE ${EXE} ${DEBUG_EXE}) +endif() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +file(INSTALL ${SOURCE_PATH}/doc/license-bsd.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/g2o/vcpkg.json b/externals/vcpkg/ports/g2o/vcpkg.json new file mode 100755 index 000000000..b81b5d65c --- /dev/null +++ b/externals/vcpkg/ports/g2o/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "g2o", + "version-string": "2020-02-07", + "port-version": 2, + "description": "g2o: A General Framework for Graph Optimization", + "homepage": "https://openslam.org/g2o.html", + "dependencies": [ + "ceres", + "eigen3", + "lapack", + "suitesparse" + ] +} diff --git a/externals/vcpkg/ports/g3log/portfile.cmake b/externals/vcpkg/ports/g3log/portfile.cmake new file mode 100755 index 000000000..6cd6d0837 --- /dev/null +++ b/externals/vcpkg/ports/g3log/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KjellKod/g3log + REF 2fca06ff6da5c67465b591f4d45e8fd14d531142 #v1.3.4 + SHA512 8dba89e5a08e44d585478470725e25e37486685d8fe4d3cb5e97c81013389c95d96bdde658244e425008169bc8a9fc2d34a065b83b110c62e73d3ccab9b2b9e1 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" G3_SHARED_LIB) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" G3_SHARED_RUNTIME) + +# https://github.com/KjellKod/g3log#prerequisites +set(VERSION "1.3.4") + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DG3_SHARED_LIB=${G3_SHARED_LIB} # Options.cmake + -DG3_SHARED_RUNTIME=${G3_SHARED_RUNTIME} # Options.cmake + -DADD_FATAL_EXAMPLE=OFF + -DADD_G3LOG_BENCH_PERFORMANCE=OFF + -DADD_G3LOG_UNIT_TEST=OFF + -DVERSION=${VERSION} +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/g3log) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/g3log/vcpkg.json b/externals/vcpkg/ports/g3log/vcpkg.json new file mode 100755 index 000000000..a1333a69b --- /dev/null +++ b/externals/vcpkg/ports/g3log/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "g3log", + "version": "1.3.4", + "port-version": 2, + "description": "Asynchronous logger with Dynamic Sinks", + "homepage": "https://github.com/KjellKod/g3log", + "supports": "!(arm | uwp)" +} diff --git a/externals/vcpkg/ports/gainput/fix-build.patch b/externals/vcpkg/ports/gainput/fix-build.patch new file mode 100755 index 000000000..912828713 --- /dev/null +++ b/externals/vcpkg/ports/gainput/fix-build.patch @@ -0,0 +1,47 @@ +set(XINPUT, "xinput") sets the variable "XINPUT," to "xinput", +so this variable is never used anyways + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a443b66..61ff7b8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,11 +9,11 @@ option(GAINPUT_TESTS "Build Tests for Gainput" ON) + option(GAINPUT_BUILD_SHARED "BUILD_SHARED" ON) + option(GAINPUT_BUILD_STATIC "BUILD_STATIC" ON) + +-if(!WIN32) ++if(NOT WIN32) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra") + else() + set(XINPUT "Xinput9_1_0") +- if ( ${CMAKE_SYSTEM_VERSION} LESS 6.1 ) ++ if ( 0 ) + set(XINPUT, "xinput") + endif() + endif() +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index cb7232f..a6ae3d9 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -55,15 +55,21 @@ elseif(APPLE) + find_library(FOUNDATION Foundation) + find_library(IOKIT IOKit) + find_library(GAME_CONTROLLER GameController) ++ if (GAINPUT_BUILD_SHARED) + target_link_libraries(gainput ${FOUNDATION} ${IOKIT} ${GAME_CONTROLLER}) ++ endif() + if(IOS) + find_library(UIKIT UIKit) + find_library(COREMOTION CoreMotion) + find_library(QUARTZCORE QuartzCore) ++ if (GAINPUT_BUILD_SHARED) + target_link_libraries(gainput ${UIKIT} ${COREMOTION}) ++ endif() + else() + find_library(APPKIT AppKit) ++ if (GAINPUT_BUILD_SHARED) + target_link_libraries(gainput ${APPKIT}) ++ endif() + endif() + endif() + diff --git a/externals/vcpkg/ports/gainput/install_as_cmake_package.patch b/externals/vcpkg/ports/gainput/install_as_cmake_package.patch new file mode 100755 index 000000000..aaee43a2f --- /dev/null +++ b/externals/vcpkg/ports/gainput/install_as_cmake_package.patch @@ -0,0 +1,69 @@ +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 14d5e85..cb7232f 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -30,19 +30,27 @@ if (GAINPUT_BUILD_SHARED) + endif (GAINPUT_BUILD_SHARED) + + if (GAINPUT_BUILD_STATIC) +- message(STATUS "..Building shared libraries (-DGAINPUT_BUILD_STATIC=OFF to disable)") ++ message(STATUS "..Building static libraries (-DGAINPUT_BUILD_STATIC=OFF to disable)") + add_library(gainputstatic STATIC ${sources} ${mmsources}) + set_target_properties(gainputstatic PROPERTIES DEBUG_POSTFIX -d FOLDER gainput) + set(install_libs ${install_libs} gainputstatic) + endif (GAINPUT_BUILD_STATIC) + + if(WIN32) +- target_link_libraries(gainput ${XINPUT} ws2_32) +- target_link_libraries(gainputstatic ${XINPUT} ws2_32) ++ if (GAINPUT_BUILD_SHARED) ++ target_link_libraries(gainput ${XINPUT} ws2_32) ++ endif(GAINPUT_BUILD_SHARED) ++ if(GAINPUT_BUILD_STATIC) ++ target_link_libraries(gainputstatic ${XINPUT} ws2_32) ++ endif(GAINPUT_BUILD_STATIC) + add_definitions(-DGAINPUT_LIB_DYNAMIC=1) + elseif(ANDROID) +- target_link_libraries(gainputstatic native_app_glue log android) +- target_link_libraries(gainput native_app_glue log android) ++ if (GAINPUT_BUILD_SHARED) ++ target_link_libraries(gainput native_app_glue log android) ++ endif(GAINPUT_BUILD_SHARED) ++ if(GAINPUT_BUILD_STATIC) ++ target_link_libraries(gainputstatic native_app_glue log android) ++ endif(GAINPUT_BUILD_STATIC) + elseif(APPLE) + find_library(FOUNDATION Foundation) + find_library(IOKIT IOKit) +@@ -65,6 +73,14 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR) + endif(NOT DEFINED CMAKE_INSTALL_LIBDIR) + set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) + ++foreach(t ${install_libs}) ++ target_include_directories( ++ ${t} ++ INTERFACE $ ++ $ ++ ) ++endforeach() ++ + install( + DIRECTORY "include/gainput" + DESTINATION "include" +@@ -73,7 +89,15 @@ install( + + install( + TARGETS ${install_libs} ++ EXPORT unofficial-${PROJECT_NAME}-Targets + LIBRARY DESTINATION "${libdir}" + ARCHIVE DESTINATION "${libdir}" + RUNTIME DESTINATION "bin" + ) ++ ++install( ++ EXPORT unofficial-${PROJECT_NAME}-Targets ++ FILE unofficial-${PROJECT_NAME}Config.cmake ++ NAMESPACE unofficial::${PROJECT_NAME}:: ++ DESTINATION share/unofficial-${PROJECT_NAME} ++) +\ No newline at end of file diff --git a/externals/vcpkg/ports/gainput/portfile.cmake b/externals/vcpkg/ports/gainput/portfile.cmake new file mode 100755 index 000000000..338147249 --- /dev/null +++ b/externals/vcpkg/ports/gainput/portfile.cmake @@ -0,0 +1,34 @@ +if (VCPKG_TARGET_IS_OSX) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jkuhlmann/gainput + REF v1.0.0 + SHA512 56fdc4c0613d7260861885b270ebe9e624e940175f41e3ac82516e2eb0d6d229e405fbcc2e54608e7d6751c1d8658b5b5e186153193badc6487274cb284a8cd6 + HEAD_REF master + PATCHES + install_as_cmake_package.patch + fix-build.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" GAINPUT_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" GAINPUT_BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DGAINPUT_BUILD_SHARED=${GAINPUT_BUILD_SHARED} + -DGAINPUT_BUILD_STATIC=${GAINPUT_BUILD_STATIC} + -DGAINPUT_TESTS=OFF + -DGAINPUT_SAMPLES=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-gainput CONFIG_PATH share/unofficial-gainput) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/gainput/vcpkg.json b/externals/vcpkg/ports/gainput/vcpkg.json new file mode 100755 index 000000000..ca764891c --- /dev/null +++ b/externals/vcpkg/ports/gainput/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "gainput", + "version": "1.0.0", + "port-version": 6, + "description": "Gainput is a multiplatform C++ input library, supporting mouse, keyboard and controllers", + "homepage": "https://github.com/jkuhlmann/gainput", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/gamedev-framework/portfile.cmake b/externals/vcpkg/ports/gamedev-framework/portfile.cmake new file mode 100755 index 000000000..1d32d1f96 --- /dev/null +++ b/externals/vcpkg/ports/gamedev-framework/portfile.cmake @@ -0,0 +1,48 @@ +if (VCPKG_HOST_IS_LINUX) + message(WARNING "gamedev-framework requires gcc version 8.3 or later.") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO GamedevFramework/gf + HEAD_REF master + REF v0.20.0 + SHA512 57b0e87f8713268d7bd4e68fb65f57715af6617582e3ce342a10a66f2ebfeeacdd11e1df0abbd13a2d1d9e6222def94bcf7b522ef5411043668e4c6f0fea1dd7 +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DGF_VCPKG=ON + -DGF_USE_EMBEDDED_LIBS=OFF + -DGF_BUILD_GAMES=OFF + -DGF_BUILD_EXAMPLES=OFF + -DGF_BUILD_DOCUMENTATION=OFF + -DGF_SINGLE_COMPILTATION_UNIT=ON + -DBUILD_TESTING=OFF + -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} + OPTIONS_RELEASE -DGF_DEBUG=OFF + OPTIONS_DEBUG -DGF_DEBUG=ON +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gf TARGET_PATH share/gf) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/share/doc" + "${CURRENT_PACKAGES_DIR}/debug/bin/gf_info.exe" + "${CURRENT_PACKAGES_DIR}/bin/gf_info.exe" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) +endif() + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/gamedev-framework/vcpkg.json b/externals/vcpkg/ports/gamedev-framework/vcpkg.json new file mode 100755 index 000000000..c00c80c35 --- /dev/null +++ b/externals/vcpkg/ports/gamedev-framework/vcpkg.json @@ -0,0 +1,35 @@ +{ + "name": "gamedev-framework", + "version-semver": "0.20.0", + "port-version": 2, + "maintainers": [ + "Julien Bernard ", + "Arthur Hugeat " + ], + "description": "gamedev-framework is a framework to build 2D games in C++17", + "homepage": "https://gamedevframework.github.io/", + "license": "Zlib", + "supports": "!arm", + "dependencies": [ + "boost-algorithm", + "boost-container", + "boost-filesystem", + "boost-heap", + "freetype", + "pugixml", + { + "name": "sdl2", + "default-features": false, + "features": [ + "x11" + ], + "platform": "linux" + }, + { + "name": "sdl2", + "platform": "!linux" + }, + "stb", + "zlib" + ] +} diff --git a/externals/vcpkg/ports/gamenetworkingsockets/portfile.cmake b/externals/vcpkg/ports/gamenetworkingsockets/portfile.cmake new file mode 100755 index 000000000..212d5ceea --- /dev/null +++ b/externals/vcpkg/ports/gamenetworkingsockets/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ValveSoftware/GameNetworkingSockets + REF b99aa75ed9b1ec57d5c90ee009f8de8882eeca13 # v1.4.0 + SHA512 1776a6a66d2c6546a8a3d71123544ea9590ab6b123d4a92eebd38c0a195f09a55185b999250c518527e1d8983176732429901a2f781a883715e6695b597229f5 + HEAD_REF master +) + +set(CRYPTO_BACKEND OpenSSL) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTS=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_TOOLS=OFF + -DUSE_CRYPTO=${CRYPTO_BACKEND} + -DUSE_CRYPTO25519=${CRYPTO_BACKEND} +) + +vcpkg_install_cmake() +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/GameNetworkingSockets" TARGET_PATH "share/GameNetworkingSockets") +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/gamenetworkingsockets/vcpkg.json b/externals/vcpkg/ports/gamenetworkingsockets/vcpkg.json new file mode 100755 index 000000000..433753e0d --- /dev/null +++ b/externals/vcpkg/ports/gamenetworkingsockets/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "gamenetworkingsockets", + "version": "1.4.0", + "description": "GameNetworkingSockets is a basic transport layer for games.", + "homepage": "https://github.com/ValveSoftware/GameNetworkingSockets", + "license": "BSD-3-Clause", + "supports": "!(static & windows) & !uwp & !(arm64 & windows)", + "dependencies": [ + "openssl", + "protobuf" + ] +} diff --git a/externals/vcpkg/ports/gamma/CMakeLists.txt b/externals/vcpkg/ports/gamma/CMakeLists.txt new file mode 100755 index 000000000..45f0ba78b --- /dev/null +++ b/externals/vcpkg/ports/gamma/CMakeLists.txt @@ -0,0 +1,41 @@ +cmake_minimum_required (VERSION 3.0) + +project (gamma) + +# dependent on libsndfile and portaudio +find_package(SndFile CONFIG REQUIRED) +find_path(PORTAUDIO_H portaudio.h) +find_library(PORTAUDIO_LIB NAMES portaudio) + +set(SOURCEFILES + src/arr.cpp + src/AudioIO.cpp + src/Conversion.cpp + src/Domain.cpp + src/DFT.cpp + src/FFT_fftpack.cpp + src/fftpack++1.cpp + src/fftpack++2.cpp + src/SoundFile.cpp + src/Print.cpp + src/Recorder.cpp + src/scl.cpp + src/Scheduler.cpp + src/Timer.cpp + src/SoundFile.cpp) + +include_directories(. Gamma ${CMAKE_INSTALL_FULL_INCLUDEDIR} ${PORTAUDIO_H}) + +add_library (gamma ${SOURCEFILES}) +target_link_libraries(gamma PUBLIC SndFile::sndfile ${PORTAUDIO_LIB}) + +install( + TARGETS gamma + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(DIRECTORY Gamma DESTINATION include FILES_MATCHING PATTERN "*.h") +endif() diff --git a/externals/vcpkg/ports/gamma/portfile.cmake b/externals/vcpkg/ports/gamma/portfile.cmake new file mode 100755 index 000000000..0437842d8 --- /dev/null +++ b/externals/vcpkg/ports/gamma/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +set(GAMMA_RELEASE_TAG "cc442ad0c5da369966cd937a96925c7b9a04e9e5") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "LancePutnam/Gamma" + REF ${GAMMA_RELEASE_TAG} + SHA512 431f17f053ca1c5ba0117b7ae7af8efae9df454593437de00dfea8ee04991b5701bee99d79deb074e60e397981a7fc1ce3476ec118d0f369e71e2cbaa696383d + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1 +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/gamma/vcpkg.json b/externals/vcpkg/ports/gamma/vcpkg.json new file mode 100755 index 000000000..3fcba5d20 --- /dev/null +++ b/externals/vcpkg/ports/gamma/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "gamma", + "version-string": "gamma-2018-01-27", + "port-version": 4, + "description": "Gamma is a cross-platform, C++ library for doing generic synthesis and filtering of signals. It is oriented towards real-time sound and graphics applications, but is equally useful for non-real-time tasks. Gamma is designed to be \"light-footed\" in terms of memory and processing making it highly suitable for plug-in development or embedding in other C++ projects.", + "homepage": "https://github.com/LancePutnam/Gamma", + "license": "MIT", + "dependencies": [ + { + "name": "libsndfile", + "default-features": false, + "features": [ + "external-libs" + ] + }, + "portaudio" + ] +} diff --git a/externals/vcpkg/ports/gasol/fix-install.patch b/externals/vcpkg/ports/gasol/fix-install.patch new file mode 100755 index 000000000..5d2be99d7 --- /dev/null +++ b/externals/vcpkg/ports/gasol/fix-install.patch @@ -0,0 +1,19 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 0cba691..51e47a3 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,3 +1,13 @@ + file(GLOB GASol_SRC *.cpp) + add_library(GASol STATIC ${GASol_SRC}) + ++file(GLOB GASol_INCLUDES *.h) ++ ++install(FILES ${GASol_INCLUDES} DESTINATION include) ++ ++install( ++ TARGETS GASol ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++) +\ No newline at end of file diff --git a/externals/vcpkg/ports/gasol/gasol.patch b/externals/vcpkg/ports/gasol/gasol.patch new file mode 100755 index 000000000..92d484e2a --- /dev/null +++ b/externals/vcpkg/ports/gasol/gasol.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4a21f65..a4cede0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,11 +15,15 @@ set(CMAKE_CXX_EXTENSIONS OFF) + # Find OpenMP. + find_package(OpenMP) + if (OPENMP_FOUND) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS} -fPIC -Wall -Wextra -Werror -pedantic") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS} -fPIC -pedantic") + else() +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -Wextra -Werror -pedantic") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -pedantic") + endif() + ++if(CMAKE_COMPILER_IS_GNUCXX) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror") ++endif(CMAKE_COMPILER_IS_GNUCXX) ++ + if (COV) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage") + endif() +@@ -39,7 +43,7 @@ endif() + add_subdirectory(src) + + # GASol test dir. +-add_subdirectory(unittest) ++# add_subdirectory(unittest) + + # GASol run dir. + add_subdirectory(example) diff --git a/externals/vcpkg/ports/gasol/portfile.cmake b/externals/vcpkg/ports/gasol/portfile.cmake new file mode 100755 index 000000000..b53522965 --- /dev/null +++ b/externals/vcpkg/ports/gasol/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO PytLab/GASol + REF 05af009bca2903c1cc491c9a6eed01bc3c936637 + SHA512 a8546bf565a389b919dd1dd5b88b4985c1803cbb09fab0715d1b0abfda92a6bf3adea7e4b3329ad82a6f6892f1747a73a632687fd79fb77c937e7ba07c62268a + HEAD_REF master + PATCHES + gasol.patch + fix-install.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/gasol/vcpkg.json b/externals/vcpkg/ports/gasol/vcpkg.json new file mode 100755 index 000000000..aa06ae3c2 --- /dev/null +++ b/externals/vcpkg/ports/gasol/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "gasol", + "version-date": "2018-01-04", + "port-version": 2, + "description": "A general Genetic Algorithm Solver in C++", + "homepage": "https://github.com/PytLab/GASol", + "supports": "!uwp & !arm" +} diff --git a/externals/vcpkg/ports/gaussianlib/portfile.cmake b/externals/vcpkg/ports/gaussianlib/portfile.cmake new file mode 100755 index 000000000..45f6b7ff4 --- /dev/null +++ b/externals/vcpkg/ports/gaussianlib/portfile.cmake @@ -0,0 +1,14 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LukasBanana/GaussianLib + REF 8630d4ac14a37f01c71bdf0c1c653e3746aa08da + SHA512 70de394496f20fe7037782d16cfa4bcd85beefdb25094247b8b572e6bb55866be6e2c82722d705141919b91f24428dde7b32f3d8a39670e7ef324c81b1ebe7e2 + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/include/Gauss DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/gaussianlib/vcpkg.json b/externals/vcpkg/ports/gaussianlib/vcpkg.json new file mode 100755 index 000000000..81ed9e446 --- /dev/null +++ b/externals/vcpkg/ports/gaussianlib/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "gaussianlib", + "version-string": "2019-08-04", + "port-version": 1, + "description": "Basic linear algebra C++ library for 2D and 3D applications", + "homepage": "https://github.com/LukasBanana/GaussianLib" +} diff --git a/externals/vcpkg/ports/gazebo/0001-Fix-deps.patch b/externals/vcpkg/ports/gazebo/0001-Fix-deps.patch new file mode 100755 index 000000000..a933d6884 --- /dev/null +++ b/externals/vcpkg/ports/gazebo/0001-Fix-deps.patch @@ -0,0 +1,102 @@ +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index 4085b5aaeb..f89ac88333 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -179,7 +179,7 @@ if (PKG_CONFIG_FOUND) + # (needed, at least, for MacOS) + + # Use system installation on UNIX and Apple, and internal copy on Windows +- if (UNIX OR APPLE) ++ if (true) + message (STATUS "Using system tinyxml.") + set (USE_EXTERNAL_TINYXML True) + elseif(WIN32) +@@ -225,7 +225,7 @@ if (PKG_CONFIG_FOUND) + # (needed, at least, for MacOS) + + # Use system installation on UNIX and Apple, and internal copy on Windows +- if (UNIX OR APPLE) ++ if (true) + message (STATUS "Using system tinyxml2.") + set (USE_EXTERNAL_TINYXML2 True) + elseif(WIN32) +@@ -513,7 +513,7 @@ if (PKG_CONFIG_FOUND) + endif () + + if (libavutil_FOUND AND libavformat_FOUND AND libavcodec_FOUND AND +- libswscale_FOUND) ++ libswscale_FOUND AND FFMPEG_FEATURE) + set (HAVE_FFMPEG TRUE) + else () + set (HAVE_FFMPEG FALSE) +@@ -538,7 +538,7 @@ if (PKG_CONFIG_FOUND) + ######################################## + # Find GNU Triangulation Surface Library + pkg_check_modules(gts gts) +- if (gts_FOUND) ++ if (GTS_FEATURE) + message (STATUS "Looking for GTS - found") + set (HAVE_GTS TRUE) + else () +@@ -551,13 +551,14 @@ if (PKG_CONFIG_FOUND) + # First and preferred option is to look for bullet standard pkgconfig, + # so check it first. if it is not present, check for the OSRF + # custom bullet2.82.pc file +- pkg_check_modules(BULLET bullet>=2.82) ++ find_package(BULLET CONFIG 2.82) + if (NOT BULLET_FOUND) + pkg_check_modules(BULLET bullet2.82>=2.82) + endif() + + if (BULLET_FOUND) + set (HAVE_BULLET TRUE) ++ set(BULLET_VERSION ${BULLET_VERSION_STRING}) + add_definitions( -DLIBBULLET_VERSION=${BULLET_VERSION} ) + else() + set (HAVE_BULLET FALSE) +@@ -572,7 +573,7 @@ if (PKG_CONFIG_FOUND) + ######################################## + # Find libusb + pkg_check_modules(libusb-1.0 libusb-1.0) +- if (NOT libusb-1.0_FOUND) ++ if (NO_LIBUSB_FEATURE) + BUILD_WARNING ("libusb-1.0 not found. USB peripherals support will be disabled.") + set (HAVE_USB OFF CACHE BOOL "HAVE USB" FORCE) + else() +@@ -648,7 +649,7 @@ endif () + ######################################## + # Find gdal + include (FindGDAL) +-if (NOT GDAL_FOUND) ++if (NO_GDAL_FEATURE) + message (STATUS "Looking for libgdal - not found") + BUILD_WARNING ("GDAL not found, Digital elevation terrains support will be disabled.") + set (HAVE_GDAL OFF CACHE BOOL "HAVE GDAL" FORCE) +@@ -718,7 +719,7 @@ endif() + ######################################## + # Find graphviz + include (${gazebo_cmake_dir}/FindGraphviz.cmake) +-if (NOT GRAPHVIZ_FOUND) ++if (NO_GRAPHVIZ_FEATURE) + message (STATUS "Looking for libgraphviz-dev - not found") + BUILD_WARNING ("Graphviz not found, Model editor's schematic view will be disabled.") + set (HAVE_GRAPHVIZ OFF CACHE BOOL "HAVE GRAPHVIZ" FORCE) +diff --git a/cmake/gazebo-config.cmake.in b/cmake/gazebo-config.cmake.in +index b57a90dd76..63ce97095e 100644 +--- a/cmake/gazebo-config.cmake.in ++++ b/cmake/gazebo-config.cmake.in +@@ -99,12 +99,13 @@ list(APPEND @PKG_NAME@_CFLAGS -I${GAZEBO_INSTALL_INCLUDE_DIR}/gazebo-@GAZEBO_MAJ + + if (GAZEBO_HAS_BULLET) + if (PKG_CONFIG_FOUND) +- pkg_check_modules(BULLET bullet>=2.82) ++ find_package(BULLET CONFIG 2.82) + if (NOT BULLET_FOUND) + pkg_check_modules(BULLET bullet2.82>=2.82) + endif() + + if (BULLET_FOUND) ++ set(BULLET_VERSION ${BULLET_VERSION_STRING}) + add_definitions(-DLIBBULLET_VERSION=${BULLET_VERSION}) + else() + message(FATAL_ERROR "Error: Bullet > 2.82 not found, please install libbullet2.82-dev.") diff --git a/externals/vcpkg/ports/gazebo/portfile.cmake b/externals/vcpkg/ports/gazebo/portfile.cmake new file mode 100755 index 000000000..5be5d42d0 --- /dev/null +++ b/externals/vcpkg/ports/gazebo/portfile.cmake @@ -0,0 +1,61 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO osrf/gazebo + REF 382dcc3f36095a8d79b5bc9c8b8ad346e867c51d + SHA512 57638cd0b23b5f2bfd32fdc159d6cd77ca34e3bd695c225591979aef4b7271eac93d3706fa1ffa2340f90013267a4171bebe1e4c142f19ad2bf67963dfed627e + HEAD_REF gazebo11 + PATCHES + 0001-Fix-deps.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openal HAVE_OPENAL + ffmpeg FFMPEG_FEATURE + gts GTS_FEATURE + INVERTED_FEATURES + simbody CMAKE_DISABLE_FIND_PACKAGE_Simbody + dart CMAKE_DISABLE_FIND_PACKAGE_DART + bullet CMAKE_DISABLE_FIND_PACKAGE_BULLET + libusb NO_LIBUSB_FEATURE + gdal NO_GDAL_FEATURE + graphviz NO_GRAPHVIZ_FEATURE +) + +vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/debug/bin") +vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/bin") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DUSE_EXTERNAL_TINY_PROCESS_LIBRARY=ON + -DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf.exe + ${FEATURE_OPTIONS} + -DBUILD_TESTING=OFF # Not enabled by default, but to be sure +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/gazebo") +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/gazebo-11/gazebo/test") + +foreach(postfix "" "-11") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}${postfix}/setup.sh" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}${postfix}/setup.sh" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../..") +endforeach() + +vcpkg_copy_tools( + TOOL_NAMES gazebo gz gzclient gzserver + AUTO_CLEAN +) +set(EXTRA_OGRE_LIBS Codec_EXR Codec_FreeImage Codec_STBI OgreBites OgreMain OgreMeshLodGenerator OgreOverlay OgrePaging OgreProperty OgreRTShaderSystem OgreTerrain OgreVolume Plugin_BSPSceneManager Plugin_DotScene Plugin_OctreeSceneManager Plugin_OctreeZone Plugin_ParticleFX Plugin_PCZSceneManager RenderSystem_Direct3D11 RenderSystem_GL RenderSystem_GL3Plus) +foreach(LIB IN LISTS EXTRA_OGRE_LIBS) + set(FILE_NAME "${CMAKE_SHARED_LIBRARY_PREFIX}${LIB}${CMAKE_SHARED_LIBRARY_SUFFIX}") + file(COPY "${CURRENT_INSTALLED_DIR}/bin/${FILE_NAME}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +endforeach() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/gazebo/vcpkg.json b/externals/vcpkg/ports/gazebo/vcpkg.json new file mode 100755 index 000000000..0d88306bc --- /dev/null +++ b/externals/vcpkg/ports/gazebo/vcpkg.json @@ -0,0 +1,126 @@ +{ + "name": "gazebo", + "version-date": "2022-01-20", + "port-version": 1, + "description": "Open source robotics simulator.", + "homepage": "http://gazebosim.org", + "license": "Apache-2.0", + "dependencies": [ + "boost-asio", + "boost-date-time", + "boost-filesystem", + "boost-format", + "boost-interprocess", + "boost-iostreams", + "boost-program-options", + "boost-property-tree", + "boost-regex", + "boost-system", + "boost-thread", + "boost-uuid", + "ccd", + { + "name": "hdf5", + "features": [ + "cpp" + ] + }, + "ignition-common3", + "ignition-fuel-tools4", + "ignition-math6", + "ignition-msgs5", + "ignition-transport8", + "ogre", + { + "name": "pkgconf", + "host": true + }, + "protobuf", + "qwt", + "sdformat9", + "tbb", + "tiny-process-library", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "bullet", + "dart", + "ffmpeg", + "gdal", + "graphviz", + "gts", + "libusb", + "openal", + "simbody" + ], + "features": { + "bullet": { + "description": "Use the bullet physics engine", + "dependencies": [ + "bullet3" + ] + }, + "dart": { + "description": "Use the dart physics engine", + "dependencies": [ + "dartsim" + ] + }, + "ffmpeg": { + "description": "Enable audio-video capabilities", + "dependencies": [ + { + "name": "ffmpeg", + "features": [ + "avcodec", + "avformat", + "swscale" + ] + } + ] + }, + "gdal": { + "description": "Enable digital elevation terrains support", + "dependencies": [ + "gdal" + ] + }, + "graphviz": { + "description": "Enable model editor's schematic view", + "dependencies": [ + "graphviz" + ] + }, + "gts": { + "description": "Enable CSG support", + "dependencies": [ + "gts" + ] + }, + "libusb": { + "description": "Enable USB peripheral support", + "dependencies": [ + "libusb" + ] + }, + "openal": { + "description": "Enable audio support", + "dependencies": [ + "openal-soft" + ] + }, + "simbody": { + "description": "Use the simbody physics engine", + "dependencies": [ + "simbody" + ] + } + } +} diff --git a/externals/vcpkg/ports/gcem/portfile.cmake b/externals/vcpkg/ports/gcem/portfile.cmake new file mode 100755 index 000000000..86d33636b --- /dev/null +++ b/externals/vcpkg/ports/gcem/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kthohr/gcem + REF v1.14.1 + SHA512 c4d6d50b541d71552ef5c3467bc2abe448a08627964c612abcfacc381b0f07399bdd03643e0914ad3c89116c3eae37ed96ee2cfce35d7ec47e6c0f53bab91f57 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gcem) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/gcem/vcpkg.json b/externals/vcpkg/ports/gcem/vcpkg.json new file mode 100755 index 000000000..e7a977299 --- /dev/null +++ b/externals/vcpkg/ports/gcem/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "gcem", + "version": "1.14.1", + "description": "A C++ compile-time math library using generalized constant expressions", + "homepage": "https://www.kthohr.com/gcem.html", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/gdal/0001-Fix-debug-crt-flags.patch b/externals/vcpkg/ports/gdal/0001-Fix-debug-crt-flags.patch new file mode 100755 index 000000000..76af77b90 --- /dev/null +++ b/externals/vcpkg/ports/gdal/0001-Fix-debug-crt-flags.patch @@ -0,0 +1,43 @@ +diff --git a/gdal/nmake.opt b/gdal/nmake.opt +index 8253ae2..9456b79 100644 +--- a/gdal/nmake.opt ++++ b/gdal/nmake.opt +@@ -148,16 +148,26 @@ GDAL_PDB = $(GDAL_ROOT)\gdal$(VERSION)$(POSTFIX).pdb + !ENDIF + + !IFDEF WITH_PDB +-CXX_PDB_FLAGS=/Zi /Fd$(GDAL_PDB) ++CXX_PDB_FLAGS=/Z7 /Fd$(GDAL_PDB) + !ELSE + CXX_PDB_FLAGS= + !ENDIF + ++# Flags to choose CRT variant to link against (e.g. static: /MT, /MTd, dynamic: /MD, /MDd) ++# Ensure MRSID_CONFIG in mrsid/nmake.opt is set appropriately as well ++!IFNDEF CXX_CRT_FLAGS ++!IFNDEF DEBUG ++CXX_CRT_FLAGS=/MD ++!ELSE ++CXX_CRT_FLAGS=/MDd ++!ENDIF ++!ENDIF ++ + !IFNDEF OPTFLAGS + !IF "$(DEBUG)" == "0" +-OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP$(CPU_COUNT) /MD /EHsc /Ox /FC /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG ++OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP$(CPU_COUNT) $(CXX_CRT_FLAGS) /EHsc /Ox /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG + !ELSE +-OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP$(CPU_COUNT) /MDd /EHsc /FC /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG ++OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP$(CPU_COUNT) $(CXX_CRT_FLAGS) /EHsc /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG + !ENDIF + !ENDIF # OPTFLAGS + +@@ -175,7 +185,7 @@ OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP$(CPU_COUNT) /MDd /EH + # 4351: new behavior: elements of array 'array' will be default initialized (needed for https://trac.osgeo.org/gdal/changeset/35593) + # 4611: interaction between '_setjmp' and C++ object destruction is non-portable + # +-WARNFLAGS = /W4 /wd4127 /wd4251 /wd4275 /wd4786 /wd4100 /wd4245 /wd4206 /wd4351 /wd4611 ++WARNFLAGS = /W3 /wd4127 /wd4251 /wd4275 /wd4786 /wd4100 /wd4245 /wd4206 /wd4351 /wd4611 + + !ENDIF + diff --git a/externals/vcpkg/ports/gdal/0002-Fix-build.patch b/externals/vcpkg/ports/gdal/0002-Fix-build.patch new file mode 100755 index 000000000..9b62737d2 --- /dev/null +++ b/externals/vcpkg/ports/gdal/0002-Fix-build.patch @@ -0,0 +1,38 @@ +diff --git a/gdal/makefile.vc b/gdal/makefile.vc +index 9e0bd44..8559f79 100644 +--- a/gdal/makefile.vc ++++ b/gdal/makefile.vc +@@ -84,7 +84,7 @@ staticlib: $(LIB_DEPENDS) + call < +-#include ++#include + + #include + #include diff --git a/externals/vcpkg/ports/gdal/0005-Fix-configure.patch b/externals/vcpkg/ports/gdal/0005-Fix-configure.patch new file mode 100755 index 000000000..0a032c405 --- /dev/null +++ b/externals/vcpkg/ports/gdal/0005-Fix-configure.patch @@ -0,0 +1,334 @@ +diff --git a/gdal/configure.ac b/gdal/configure.ac +index 30cd613..43f1daf 100644 +--- a/gdal/configure.ac ++++ b/gdal/configure.ac +@@ -48,6 +48,8 @@ dnl Compute the canonical host-system (the system we are building for) + dnl type variable $host + AC_CANONICAL_HOST + ++PKG_PROG_PKG_CONFIG([0.21]) ++ + dnl Enable as much warnings as possible + AC_LANG_PUSH([C]) + AX_COMPILER_VENDOR +@@ -1111,6 +1111,8 @@ dnl --------------------------------------------------------------------------- + AC_ARG_WITH(libz,[ --with-libz[=ARG] Include libz support (ARG=internal or libz directory)],,) + + if test "$with_libz" = "external" -o "$with_libz" = "" -o "$with_libz" = "yes" ; then ++ PKG_CHECK_MODULES([ZLIB], [zlib], [LIBZ_SETTING=external], [LIBZ_SETTING=internal]) ++elif false ; then + + AC_CHECK_LIB(z,deflateInit_,LIBZ_SETTING=external,LIBZ_SETTING=internal,) + +@@ -1144,7 +1146,8 @@ elif test "$with_libz" != "no" -a "$with_libz" != "internal" ; then + fi + + if test "$LIBZ_SETTING" = "external" ; then +- LIBS="-lz $LIBS" ++ LIBS="${ZLIB_LIBS} $LIBS" ++ EXTRA_INCLUDES="${ZLIB_CFLAGS} $EXTRA_INCLUDES" + if test "$with_libz" != "" -a "$with_libz" != "yes" -a "$with_libz" != "external" ; then + EXTRA_INCLUDES="-I$with_libz -I$with_libz/include $EXTRA_INCLUDES" + fi +@@ -1336,12 +1338,15 @@ AC_MSG_CHECKING([for libtiff]) + + if test "x${with_libtiff}" = "xyes" -o "x${with_libtiff}" = "x" ; then + +- dnl Only automatically pick up the external libtiff if it is >= 4.0. +- AC_CHECK_LIB(tiff,TIFFScanlineSize64,TIFF_SETTING=external HAVE_BIGTIFF=yes,TIFF_SETTING=internal HAVE_BIGTIFF=yes,) ++ PKG_CHECK_MODULES([TIFF],[libtiff-4 > 4.0], [TIFF_SETTING=external], [TIFF_SETTING=internal HAVE_BIGTIFF=yes]) + + if test "$TIFF_SETTING" = "external" ; then +- LIBS="-ltiff $LIBS" + AC_MSG_RESULT([using pre-installed libtiff.]) ++ EXTRA_INCLUDES="$TIFF_CFLAGS $EXTRA_INCLUDES" ++ SAVED_LIBS="$LIBS" ++ LIBS="$TIFF_LIBS" ++ AC_SEARCH_LIBS(TIFFScanlineSize64,[],HAVE_BIGTIFF=yes,HAVE_BIGTIFF=no,) ++ LIBS="$TIFF_LIBS $SAVED_LIBS" + else + AC_MSG_RESULT([using internal TIFF code.]) + fi +@@ -1402,22 +1407,28 @@ AC_ARG_WITH(curl, + dnl Clear some cache variables + unset ac_cv_path_LIBCURL + ++LIBCURL_MODVERSION= + if test "`basename xx/$with_curl`" = "curl-config" ; then + LIBCURL_CONFIG="$with_curl" + elif test "$with_curl" = "no" ; then + LIBCURL_CONFIG=no ++elif test "$with_curl" = "yes" -o "$with_curl" = "" ; then ++ PKG_CHECK_EXISTS([libcurl], [LIBCURL_CONFIG="${PKG_CONFIG} libcurl"], [LIBCURL_CONFIG=false]) ++ LIBCURL_MODVERSION=`$LIBCURL_CONFIG --modversion` + else + AC_PATH_PROG(LIBCURL_CONFIG, curl-config, no) + fi + + if test "$LIBCURL_CONFIG" != "no" ; then + +- CURL_VERNUM=`$LIBCURL_CONFIG --vernum` +- CURL_VER=`$LIBCURL_CONFIG --version | awk '{print $2}'` ++ CURL_VER="`$LIBCURL_CONFIG --version | awk '{print $2}'`$LIBCURL_MODVERSION" + + AC_MSG_RESULT([ found libcurl version $CURL_VER]) + +- AC_CHECK_LIB(curl,curl_global_init,CURL_SETTING=yes,CURL_SETTING=no,`$LIBCURL_CONFIG --libs`) ++ SAVED_LIBS="$LIBS" ++ LIBS=`$LIBCURL_CONFIG --libs` ++ AC_SEARCH_LIBS(curl_global_init,[],CURL_SETTING=yes,CURL_SETTING=no,) ++ LIBS="$SAVED_LIBS" + + fi + +@@ -1431,7 +1442,9 @@ dnl Proj depends on it so it must appear before. + dnl --------------------------------------------------------------------------- + + SQLITE3_REQ_VERSION="3.0.0" +-AX_LIB_SQLITE3($SQLITE3_REQ_VERSION) ++AC_CHECK_LIB(sqlite3,sqlite3_open,HAVE_SQLITE3=yes,AC_MSG_ERROR([vcpkg sqlite3 not found]),) ++SQLITE3_CFLAGS= ++SQLITE3_LDFLAGS=-lsqlite3 + + if test "$HAVE_SQLITE3" = "yes"; then + LIBS="$SQLITE3_LDFLAGS $LIBS" +@@ -1571,6 +1584,11 @@ HAVE_SPATIALITE=no + if test -z "$with_spatialite" -o "$with_spatialite" = "no"; then + AC_MSG_RESULT(disabled) + elif test "$with_spatialite" = "yes"; then ++ PKG_CHECK_MODULES([SPATIALITE],[spatialite >= 5],[HAVE_SPATIALITE=yes],AC_MSG_ERROR([vcpkg libspatialite not found])) ++ SPATIALITE_INC="$SPATIALITE_CFLAGS" ++ LIBS="$LIBS $SPATIALITE_LIBS" ++ ac_cv_lib_spatialite_spatialite_target_cpu=yes ++elif false; then + AC_CHECK_HEADERS(sqlite3.h) + if test "$ac_cv_header_sqlite3_h" = "yes"; then + AC_MSG_CHECKING([for spatialite.h in /usr/include or /usr/local/include]) +@@ -1639,6 +1652,19 @@ dnl --------------------------------------------------------------------------- + AC_ARG_WITH(liblzma,[ --with-liblzma[=ARG] Include liblzma support (ARG=yes/no)],,) + + if test "$with_liblzma" = "yes" ; then ++ PKG_CHECK_MODULES([LIBLZMA],[liblzma],[HAVE_LIBLZMA_PC=yes],[HAVE_LIBLZMA_PC=no]) ++ SAVED_LIBS="$LIBS" ++ LIBS="$LIBLZMA_LIBS" ++ AC_SEARCH_LIBS(lzma_code,[],LIBLZMA_SETTING=yes,LIBLZMA_SETTING=no,) ++ if test "$LIBLZMA_SETTING" = "yes" ; then ++ LIBS="$LIBLZMA_LIBS $SAVED_LIBS" ++ elif test "$HAVE_LIBLZMA_PC" = "yes" ; then ++ AC_MSG_ERROR([vcpkg liblzma broken]) ++ else ++ LIBS="$SAVED_LIBS" ++ fi ++ ++elif false; then + AC_CHECK_LIB(lzma,lzma_code,LIBLZMA_SETTING=yes,LIBLZMA_SETTING=no,) + AC_CHECK_HEADERS(lzma.h) + +@@ -1661,6 +1687,19 @@ dnl --------------------------------------------------------------------------- + AC_ARG_WITH(zstd,[ --with-zstd[=ARG] Include zstd support (ARG=yes/no/installation_prefix)],,) + + if test "$with_zstd" = "" -o "$with_zstd" = "yes" ; then ++ PKG_CHECK_MODULES([ZSTD],[libzstd],[HAVE_LIBZSTD_PC=yes],[HAVE_LIBZSTD_PC=no]) ++ SAVED_LIBS="$LIBS" ++ LIBS="$ZSTD_LIBS" ++ AC_SEARCH_LIBS(ZSTD_decompressStream,[],ZSTD_SETTING=yes,ZSTD_SETTING=no,) ++ if test "$ZSTD_SETTING" = "yes" ; then ++ LIBS="$ZSTD_LIBS $SAVED_LIBS" ++ elif test "$HAVE_LIBZSTD_PC" = "yes" ; then ++ AC_MSG_ERROR([vcpkg libzstd broken]) ++ else ++ LIBS="$SAVED_LIBS" ++ fi ++ ++elif false; then + AC_CHECK_LIB(zstd,ZSTD_decompressStream,ZSTD_SETTING=yes,ZSTD_SETTING=no,) + + if test "$ZSTD_SETTING" = "yes" ; then +@@ -1962,6 +2001,12 @@ else + SAVED_LIBS="${LIBS}" + LIBS="${PG_LIB}" + AC_CHECK_LIB(pq,PQconnectdb,HAVE_PG=yes,HAVE_PG=no) ++ if test "${HAVE_PG}" = "no" ; then ++ unset ac_cv_lib_pq_PQconnectdb ++ PG_LIB="${PG_LIB} -lpgcommon -lpgport" ++ LIBS="${PG_LIB} ${SAVED_LIBS}" ++ AC_CHECK_LIB(pq,PQconnectdb,HAVE_PG=yes,HAVE_PG=no,[-lpgcommon -lpgport]) ++ fi + LIBS="${SAVED_LIBS}" + if test "${HAVE_PG}" = "yes" ; then + LIBS="${PG_LIB} ${LIBS}" +@@ -2322,6 +2367,15 @@ AC_ARG_WITH(geotiff,[ --with-geotiff=ARG Libgeotiff library to use (ARG=inte + + if test "$with_geotiff" = "yes" -o "$with_geotiff" = "" ; then + ++ AC_CHECK_LIB(geotiff,GTIFAttachPROJContext,GEOTIFF_SETTING=external,GEOTIFF_SETTING=internal) ++ if test $GEOTIFF_SETTING = "external" ; then ++ LIBS="-lgeotiff $LIBS" ++ else ++ AC_MSG_ERROR([vcpkg geotiff broken]) ++ fi ++ ++elif false; then ++ + if test "$TIFF_SETTING" = "internal" ; then + GEOTIFF_SETTING=internal + else +@@ -3005,7 +3059,7 @@ elif test "$with_hdf5" = "yes" -o "$with_hdf5" = "" ; then + # Test that the package found is for the right architecture + saved_LIBS="$LIBS" + LIBS="$HDF5_LIBS" +- AC_CHECK_LIB(hdf5,H5Fopen, [HAVE_HDF5=yes], [HAVE_HDF5=no]) ++ AC_SEARCH_LIBS(H5Fopen,[],[HAVE_HDF5=yes],[HAVE_HDF5=no],) + LIBS="$saved_LIBS" + + if test "$HAVE_HDF5" = "yes"; then +@@ -3135,6 +3189,24 @@ if test "$with_netcdf" = "no" ; then + + echo "netCDF support disabled." + ++elif true ; then ++ ++ PKG_CHECK_MODULES([NETCDF],[netcdf],[HAVE_NETCDF_PC=yes],[HAVE_NETCDF_PC=no]) ++ SAVED_LIBS="$LIBS" ++ LIBS="$NETCDF_LIBS" ++ AC_SEARCH_LIBS(nc_open,[],NETCDF_SETTING=yes,NETCDF_SETTING=no,) ++ if test "$NETCDF_SETTING" = "yes" ; then ++ LIBS="$NETCDF_LIBS $SAVED_LIBS" ++ EXTRA_INCLUDES="$NETCDF_CFLAGS $EXTRA_INCLUDES" ++ PKG_CHECK_VAR([NETCDF_ROOT],[netcdf],[prefix],,) ++ PKG_CHECK_VAR([NETCDF_INCLUDEDIR],[netcdf],[includedir],,) ++ NETCDF_NCCONFIG= ++ elif test "$HAVE_NETCDF_PC" = "yes" ; then ++ AC_MSG_ERROR([vcpkg netcdf-c broken]) ++ else ++ LIBS="$SAVED_LIBS" ++ fi ++ + else + + dnl find nc-config location +@@ -3355,6 +3427,21 @@ if test "$with_openjpeg" = "no" ; then + + AC_MSG_NOTICE([OpenJPEG (JPEG2000) support disabled.]) + ++elif true ; then ++ ++ PKG_CHECK_MODULES([OPENJPEG],[libopenjp2 >= 2.1.0],[HAVE_LIBOPENJP2_PC=yes],[HAVE_LIBOPENJP2_PC=no]) ++ SAVED_LIBS="$LIBS" ++ LIBS="$OPENJPEG_LIBS" ++ AC_SEARCH_LIBS(opj_setup_decoder,[],HAVE_OPENJPEG=yes,HAVE_OPENJPEG=no,) ++ if test "$HAVE_OPENJPEG" = "yes" ; then ++ EXTRA_INCLUDES="$OPENJPEG_CFLAGS $EXTRA_INCLUDES" ++ LIBS="$OPENJPEG_LIBS $SAVED_LIBS" ++ elif test "$HAVE_LIBOPENJP2_PC" = "yes" ; then ++ AC_MSG_ERROR([vcpkg libopenjpeg broken]) ++ else ++ LIBS="$SAVED_LIBS" ++ fi ++ + else + + PKG_PROG_PKG_CONFIG([0.21]) +@@ -4046,7 +4133,9 @@ dnl --------------------------------------------------------------------------- + + dnl Expat 1.95.0 released in 2000-09-28 + EXPAT_REQ_VERSION="1.95.0" +-AX_LIB_EXPAT($EXPAT_REQ_VERSION) ++PKG_CHECK_MODULES([EXPAT],[expat],[HAVE_EXPAT=yes],[AC_MSG_ERROR([vcpkg expat not found])]) ++EXPAT_LDFLAGS="$EXPAT_LIBS" ++EXPAT_INCLUDE="" + + if test "$HAVE_EXPAT" = "yes"; then + LIBS="$EXPAT_LDFLAGS $LIBS" +@@ -4069,7 +4158,13 @@ dnl Check for Google libkml support. + dnl --------------------------------------------------------------------------- + + LIBKML_REQ_VERSION="1.3.0" ++if test "x${with_libkml}" = "xno"; then ++ echo "libkml support disabled." ++ HAVE_LIBKML="no" ++ LIBKML_CFLAGS= ++else + AX_LIB_LIBKML($LIBKML_REQ_VERSION) ++fi + + if test "$HAVE_LIBKML" = "yes"; then + LIBS="$LIBKML_LDFLAGS $LIBS" +@@ -4252,8 +4347,8 @@ else + dnl Add curl to LIBS; it might be local to DODS or generally installed + if test -x $DODS_BIN/curl-config; then + LIBS="$LIBS `$DODS_BIN/curl-config --libs`" +- elif which curl-config > /dev/null 2>&1; then +- LIBS="$LIBS `curl-config --libs`" ++ elif test "$CURL_SETTING" = "yes"; then ++ LIBS="$LIBS $CURL_LIB" + else + AC_MSG_ERROR([You gave a dods root, but I can't find curl!]) + fi +@@ -4295,7 +4390,7 @@ if test "x$with_xml2" = "xyes" -o "x$with_xml2" = "x" ; then + if test "${HAVE_LIBXML2}" = "yes"; then + SAVED_LIBS="${LIBS}" + LIBS="${LIBXML2_LIBS}" +- AC_CHECK_LIB(xml2,xmlParseDoc,HAVE_LIBXML2=yes,HAVE_LIBXML2=no) ++ AC_SEARCH_LIBS(xmlParseDoc,[],HAVE_LIBXML2=yes,HAVE_LIBXML2=no,) + LIBS="${SAVED_LIBS}" + fi + +@@ -4509,6 +4604,22 @@ WEBP_SETTING=no + + if test "$with_webp" = "yes" -o "$with_webp" = "" ; then + ++ PKG_CHECK_MODULES([WEBP],[libwebp],[HAVE_LIBWEBP_PC=yes],[HAVE_LIBWEBP_PC=no]) ++ SAVED_LIBS="$LIBS" ++ LIBS="$WEBP_LIBS" ++ AC_SEARCH_LIBS(WebPDecodeRGB,[],WEBP_SETTING=yes,WEBP_SETTING=no,) ++ ++ if test "$WEBP_SETTING" = "yes" ; then ++ LIBS="$WEBP_LIBS $SAVED_LIBS" ++ elif test "$HAVE_LIBWEBP_PC" = "yes" ; then ++ AC_MSG_ERROR([vcpkg libwebp broken]) ++ else ++ echo "libwebp not found - WEBP support disabled" ++ LIBS="$SAVED_LIBS" ++ fi ++ ++elif false ; then ++ + AC_CHECK_LIB(webp,WebPDecodeRGB,WEBP_SETTING=yes,WEBP_SETTING=no,) + + if test "$WEBP_SETTING" = "yes" ; then +@@ -4540,7 +4651,7 @@ dnl --------------------------------------------------------------------------- + dnl Check if geos library is available. + dnl --------------------------------------------------------------------------- + +-GEOS_INIT(3.1.0) ++PKG_CHECK_MODULES(GEOS,geos >= 3.1.0,HAVE_GEOS=yes,AC_MSG_ERROR([vcpkg geos not found])) + if test "${HAVE_GEOS}" = "yes" ; then + AC_MSG_NOTICE([Using C API from GEOS $GEOS_VERSION]) + STRIP_SYSTEM_LIBRARY_PATHS("${GEOS_LIBS}") +@@ -4779,6 +4890,16 @@ dnl --------------------------------------------------------------------------- + + AC_ARG_WITH(libjson-c,[ --with-libjson-c[=ARG] Include libjson-c support (ARG=internal or libjson-c directory)],,) + ++PKG_CHECK_MODULES([JSONC],[json-c],[HAVE_JSONC=yes],[HAVE_JSONC=no]) ++SAVED_LIBS="$LIBS" ++LIBS="$JSONC_LIBS" ++AC_SEARCH_LIBS(json_object_set_serializer,[],LIBJSONC_SETTING=external,LIBJSONC_SETTING=,) ++if test "$LIBJSONC_SETTING" = "external" ; then ++ LIBS="$JSONC_LIBS $SAVED_LIBS" ++ JSON_INCLUDE="$JSONC_CFLAGS" ++else ++ LIBS="$SAVED_LIBS" ++ + if test "$with_libjson_c" = "external" -o "$with_libjson_c" = "" -o "$with_libjson_c" = "yes" ; then + AC_CHECK_LIB(json-c,json_object_set_serializer,LIBJSONC_SETTING=external,LIBJSONC_SETTING=internal,) + elif test "$with_libjson_c" = "internal" ; then +@@ -4807,6 +4928,8 @@ else + AC_MSG_RESULT([using internal libjson-c code]) + fi + ++fi # json-c.pc ++ + AC_SUBST(LIBJSONC_SETTING,$LIBJSONC_SETTING) + AC_SUBST(JSON_INCLUDE,$JSON_INCLUDE) + diff --git a/externals/vcpkg/ports/gdal/0006-Fix-mingw-dllexport.patch b/externals/vcpkg/ports/gdal/0006-Fix-mingw-dllexport.patch new file mode 100755 index 000000000..c1f524527 --- /dev/null +++ b/externals/vcpkg/ports/gdal/0006-Fix-mingw-dllexport.patch @@ -0,0 +1,13 @@ +diff --git a/gdal/port/cpl_port.h b/gdal/port/cpl_port.h +index 98805cf..a6a1846 100644 +--- a/gdal/port/cpl_port.h ++++ b/gdal/port/cpl_port.h +@@ -343,7 +343,7 @@ typedef unsigned int GUIntptr_t; + #endif + + #ifndef CPL_DLL +-#if defined(_MSC_VER) && !defined(CPL_DISABLE_DLL) ++#if defined(WIN32) && (!defined(CPL_DISABLE_DLL) || defined(DLL_EXPORT)) + # ifdef GDAL_COMPILATION + # define CPL_DLL __declspec(dllexport) + # else diff --git a/externals/vcpkg/ports/gdal/0007-Control-tools.patch b/externals/vcpkg/ports/gdal/0007-Control-tools.patch new file mode 100755 index 000000000..fd1f5c9a3 --- /dev/null +++ b/externals/vcpkg/ports/gdal/0007-Control-tools.patch @@ -0,0 +1,83 @@ +diff --git a/gdal/GDALmake.opt.in b/gdal/GDALmake.opt.in +index e8d2b05..1f19a4b 100644 +--- a/gdal/GDALmake.opt.in ++++ b/gdal/GDALmake.opt.in +@@ -662,3 +662,6 @@ O_OBJ = $(foreach file,$(OBJ),../o/$(file)) + + %-clean: + $(MAKE) -C $* clean ++ ++ ++BUILD_TOOLS = @BUILD_TOOLS@ +\ No newline at end of file +diff --git a/gdal/apps/GNUmakefile b/gdal/apps/GNUmakefile +index 9624cf7..f91403d 100644 +--- a/gdal/apps/GNUmakefile ++++ b/gdal/apps/GNUmakefile +@@ -43,6 +43,11 @@ NON_DEFAULT_LIST = multireadtest$(EXE) dumpoverviews$(EXE) \ + gdaltorture$(EXE) gdal2ogr$(EXE) test_ogrsf$(EXE) \ + gdalasyncread$(EXE) testreprojmulti$(EXE) + ++ifeq ($(BUILD_TOOLS),no) ++BIN_LIST = ++NON_DEFAULT_LIST = ++endif ++ + default: gdal-config-inst gdal-config $(BIN_LIST) + + all: default $(NON_DEFAULT_LIST) +diff --git a/gdal/apps/makefile.vc b/gdal/apps/makefile.vc +index 6e1fc9b..66f9b29 100644 +--- a/gdal/apps/makefile.vc ++++ b/gdal/apps/makefile.vc +@@ -20,6 +20,7 @@ GNM_PROGRAMS = gnmmanage.exe gnmanalyse.exe + !ENDIF + + ++!IF "$(BUILD_TOOLS)" == "1" + default: gdal_translate.exe gdalinfo.exe gdaladdo.exe gdalwarp.exe \ + nearblack.exe gdalmanage.exe gdalenhance.exe gdaltransform.exe\ + gdaldem.exe gdallocationinfo.exe gdalsrsinfo.exe gdalmdiminfo.exe \ +@@ -28,6 +29,10 @@ default: gdal_translate.exe gdalinfo.exe gdaladdo.exe gdalwarp.exe \ + all: default multireadtest.exe \ + dumpoverviews.exe gdalwarpsimple.exe gdalflattenmask.exe \ + gdaltorture.exe gdal2ogr.exe test_ogrsf.exe ++!ELSE ++default: ++all: ++!ENDIF + OBJ = commonutils.obj gdalinfo_lib.obj gdal_translate_lib.obj gdalwarp_lib.obj ogr2ogr_lib.obj \ + gdaldem_lib.obj nearblack_lib.obj gdal_grid_lib.obj gdal_rasterize_lib.obj gdalbuildvrt_lib.obj \ + gdalmdiminfo_lib.obj gdalmdimtranslate_lib.obj +@@ -223,5 +228,9 @@ clean: + -del *.manifest + -del *.exp + ++!IF "$(BUILD_TOOLS)" == "1" + install: default + copy *.exe $(BINDIR) ++!ELSE ++install: ++!ENDIF +\ No newline at end of file +diff --git a/gdal/configure.ac b/gdal/configure.ac +index 1098b39..e4d985e 100644 +--- a/gdal/configure.ac ++++ b/gdal/configure.ac +@@ -6165,6 +6165,16 @@ case "${host_os}" in + ;; + esac + ++BUILD_TOOLS=yes ++AC_ARG_WITH([tools], AS_HELP_STRING([--with-tools], [Build the tools]),,) ++if test "$with_tools" = "yes"; then ++ AC_MSG_RESULT([enabled]) ++else ++ BUILD_TOOLS=no ++ AC_MSG_RESULT([disabled by user]) ++fi ++AC_SUBST(BUILD_TOOLS,$BUILD_TOOLS) ++ + AC_CONFIG_FILES([GDALmake.opt]) + AC_OUTPUT + diff --git a/externals/vcpkg/ports/gdal/0008-Fix-absl-string_view.patch b/externals/vcpkg/ports/gdal/0008-Fix-absl-string_view.patch new file mode 100755 index 000000000..ff5af90f6 --- /dev/null +++ b/externals/vcpkg/ports/gdal/0008-Fix-absl-string_view.patch @@ -0,0 +1,13 @@ +diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base.h b/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base.h +index 9557380..17edcf8 100644 +--- a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base.h ++++ b/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base.h +@@ -213,7 +213,7 @@ namespace flatbuffers { + } + #define FLATBUFFERS_HAS_STRING_VIEW 1 + // Check for absl::string_view +- #elif __has_include("absl/strings/string_view.h") ++ #elif __has_include("absl/strings/string_view.h") && 0 + #include "absl/strings/string_view.h" + namespace flatbuffers { + typedef absl::string_view string_view; diff --git a/externals/vcpkg/ports/gdal/0009-atlbase.patch b/externals/vcpkg/ports/gdal/0009-atlbase.patch new file mode 100755 index 000000000..b2c423e1c --- /dev/null +++ b/externals/vcpkg/ports/gdal/0009-atlbase.patch @@ -0,0 +1,72 @@ +diff --git a/gdal/nmake.opt b/gdal/nmake.opt +index 7e7871e..ac01bf2 100644 +--- a/gdal/nmake.opt ++++ b/gdal/nmake.opt +@@ -239,6 +239,11 @@ STDCALL=YES + VERSION = 304 + !ENDIF + ++# Set HAVE_ATLBASE_H=NO if atlbase.h header is not available ++!IFNDEF HAVE_ATLBASE_H ++HAVE_ATLBASE_H=YES ++!ENDIF ++ + # Comment the following out if you want PAM supported disabled + # by default. + !IFNDEF PAM_SETTING +diff --git a/gdal/port/cpl_aws.cpp b/gdal/port/cpl_aws.cpp +index eed23f9..e3a1578 100644 +--- a/gdal/port/cpl_aws.cpp ++++ b/gdal/port/cpl_aws.cpp +@@ -43,7 +43,7 @@ CPL_CVSID("$Id$") + // #define DEBUG_VERBOSE 1 + + #ifdef WIN32 +-#if defined(_MSC_VER) ++#if defined(HAVE_ATLBASE_H) + bool CPLFetchWindowsProductUUID(CPLString &osStr); // defined in cpl_aws_win32.cpp + #endif + const char* CPLGetWineVersion(); // defined in cpl_vsil_win32.cpp +@@ -688,7 +688,7 @@ static bool IsMachinePotentiallyEC2Instance() + } + else + { +-#if defined(_MSC_VER) ++#if defined(HAVE_ATLBASE_H) + CPLString osMachineUUID; + if( CPLFetchWindowsProductUUID(osMachineUUID) ) + { +diff --git a/gdal/port/cpl_aws_win32.cpp b/gdal/port/cpl_aws_win32.cpp +index 7742a35..98be522 100644 +--- a/gdal/port/cpl_aws_win32.cpp ++++ b/gdal/port/cpl_aws_win32.cpp +@@ -28,7 +28,7 @@ + + #include "cpl_port.h" + +-#if defined(WIN32) && defined(_MSC_VER) ++#if defined(HAVE_ATLBASE_H) + + #define _WIN32_DCOM + #include +@@ -140,4 +140,4 @@ bool CPLFetchWindowsProductUUID(CPLString &osStr) + return !osWindowsProductUUID.empty(); + } + +-#endif /* defined(WIN32) && defined(_MSC_VER) */ ++#endif /* defined(HAVE_ATLBASE_H) */ +diff --git a/gdal/port/makefile.vc b/gdal/port/makefile.vc +index a8b0e02..68da2dd 100644 +--- a/gdal/port/makefile.vc ++++ b/gdal/port/makefile.vc +@@ -141,6 +141,10 @@ EXTRAFLAGS = $(EXTRAFLAGS) $(LZ4_CFLAGS) -DHAVE_LZ4 + ODBC_OBJ = cpl_odbc.obj + !ENDIF + ++!IF "$(HAVE_ATLBASE_H)" == "YES" ++EXTRAFLAGS = $(EXTRAFLAGS) -DHAVE_ATLBASE_H ++!ENDIF ++ + default: prev_dllbuild cpl_config.h $(LIB) + + $(LIB): $(OBJ) diff --git a/externals/vcpkg/ports/gdal/0010-symprefix.patch b/externals/vcpkg/ports/gdal/0010-symprefix.patch new file mode 100755 index 000000000..e21fb8d77 --- /dev/null +++ b/externals/vcpkg/ports/gdal/0010-symprefix.patch @@ -0,0 +1,13 @@ +diff --git a/gdal/makefile.vc b/gdal/makefile.vc +index 9de546c..56f617d 100644 +--- a/gdal/makefile.vc ++++ b/gdal/makefile.vc +@@ -27,7 +27,7 @@ OGR_INCLUDE = $(OGR_BASE_INCLUDE) \ + CPPFLAGS = $(CPPFLAGS) -DGNM_ENABLED + !ENDIF + +-!IF DEFINED(STDCALL) && !DEFINED(WIN64) ++!IF DEFINED(STDCALL) && !DEFINED(WIN64) && "$(SYM_PREFIX)" == "_" + + BASE_INCLUDE = /INCLUDE:_GDALSimpleImageWarp@36 \ + /INCLUDE:_GDALReprojectImage@48 \ diff --git a/externals/vcpkg/ports/gdal/dependency_win.cmake b/externals/vcpkg/ports/gdal/dependency_win.cmake new file mode 100755 index 000000000..c3be0f562 --- /dev/null +++ b/externals/vcpkg/ports/gdal/dependency_win.cmake @@ -0,0 +1,219 @@ +macro(find_dependency_win) + # curl + x_vcpkg_pkgconfig_get_modules(PREFIX CURL MODULES --msvc-syntax libcurl INCLUDE_DIRS LIBS) + list(APPEND NMAKE_OPTIONS_REL "CURL_INC=${CURL_INCLUDE_DIRS_RELEASE}" "CURL_LIB=${CURL_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "CURL_INC=${CURL_INCLUDE_DIRS_DEBUG}" "CURL_LIB=${CURL_LIBS_DEBUG}") + + # expat + list(APPEND NMAKE_OPTIONS "EXPAT_DIR=YES") + x_vcpkg_pkgconfig_get_modules(PREFIX EXPAT MODULES --msvc-syntax expat INCLUDE_DIRS LIBS) + list(APPEND NMAKE_OPTIONS_REL "EXPAT_INCLUDE=${EXPAT_INCLUDE_DIRS}" "EXPAT_LIB=${EXPAT_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "EXPAT_INCLUDE=${EXPAT_INCLUDE_DIRS}" "EXPAT_LIB=${EXPAT_LIBS_DEBUG}") + + # geos + x_vcpkg_pkgconfig_get_modules(PREFIX GEOS MODULES --msvc-syntax geos INCLUDE_DIRS LIBS) + list(APPEND NMAKE_OPTIONS_REL "GEOS_CFLAGS=${GEOS_INCLUDE_DIRS_RELEASE} -DHAVE_GEOS" "GEOS_LIB=${GEOS_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "GEOS_CFLAGS=${GEOS_INCLUDE_DIRS_DEBUG} -DHAVE_GEOS" "GEOS_LIB=${GEOS_LIBS_DEBUG}") + + # libgeotiff + list(APPEND NMAKE_OPTIONS "GEOTIFF_INC=-I${CURRENT_INSTALLED_DIR}/include") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + list(APPEND NMAKE_OPTIONS_REL "GEOTIFF_LIB=${CURRENT_INSTALLED_DIR}/lib/geotiff_i.lib") + list(APPEND NMAKE_OPTIONS_DBG "GEOTIFF_LIB=${CURRENT_INSTALLED_DIR}/debug/lib/geotiff_d_i.lib") + else() + # libgeotiff may need tiff and proj4, but these are added separately, with all transitive deps. + list(APPEND NMAKE_OPTIONS_REL "GEOTIFF_LIB=${CURRENT_INSTALLED_DIR}/lib/geotiff.lib") + list(APPEND NMAKE_OPTIONS_DBG "GEOTIFF_LIB=${CURRENT_INSTALLED_DIR}/debug/lib/geotiff_d.lib") + endif() + + # libiconv + # There is no pc file, and CMake added the Find module in version 3.11. + list(APPEND extra_exports ICONV) + set(ICONV_LIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/iconv.lib ${CURRENT_INSTALLED_DIR}/lib/charset.lib") + set(ICONV_LIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib ${CURRENT_INSTALLED_DIR}/debug/lib/charset.lib") + list(APPEND NMAKE_OPTIONS "LIBICONV_INCLUDE=-I${CURRENT_INSTALLED_DIR}/include" "LIBICONV_CFLAGS=-DICONV_CONST=") + list(APPEND NMAKE_OPTIONS_REL "LIBICONV_LIBRARY=${ICONV_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "LIBICONV_LIBRARY=${ICONV_LIBS_DEBUG}") + + # libjpeg-turbo + list(APPEND NMAKE_OPTIONS "JPEG_EXTERNAL_LIB=1" "JPEGDIR=${CURRENT_INSTALLED_DIR}/include") + x_vcpkg_pkgconfig_get_modules(PREFIX JPEG MODULES --msvc-syntax libjpeg LIBS) + list(APPEND NMAKE_OPTIONS_REL "JPEG_LIB=${JPEG_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "JPEG_LIB=${JPEG_LIBS_DEBUG}") + + # liblzma + x_vcpkg_pkgconfig_get_modules(PREFIX LZMA MODULES --msvc-syntax liblzma INCLUDE_DIRS LIBS) + list(APPEND NMAKE_OPTIONS_REL "LZMA_CFLAGS=${LZMA_INCLUDE_DIRS_RELEASE}" "LZMA_LIBS=${LZMA_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "LZMA_CFLAGS=${LZMA_INCLUDE_DIRS_DEBUG}" "LZMA_LIBS=${LZMA_LIBS_DEBUG}") + + # libpng + list(APPEND NMAKE_OPTIONS "PNG_EXTERNAL_LIB=1" "PNGDIR=${CURRENT_INSTALLED_DIR}/include") + x_vcpkg_pkgconfig_get_modules(PREFIX PNG MODULES --msvc-syntax libpng LIBS) + list(APPEND NMAKE_OPTIONS_REL "PNG_LIB=${PNG_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "PNG_LIB=${PNG_LIBS_DEBUG}") + + # libwebp + list(APPEND NMAKE_OPTIONS "WEBP_ENABLED=YES") + x_vcpkg_pkgconfig_get_modules(PREFIX WEBP MODULES --msvc-syntax libwebp INCLUDE_DIRS LIBS) + list(APPEND NMAKE_OPTIONS_REL "WEBP_CFLAGS=${WEBP_INCLUDE_DIRS_RELEASE}" "WEBP_LIBS=${WEBP_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "WEBP_CFLAGS=${WEBP_INCLUDE_DIRS_DEBUG}" "WEBP_LIBS=${WEBP_LIBS_DEBUG}") + + # libxml2 + x_vcpkg_pkgconfig_get_modules(PREFIX LIBXML2 MODULES --msvc-syntax libxml-2.0 INCLUDE_DIRS LIBS) + list(APPEND NMAKE_OPTIONS_REL "LIBXML2_INC=${LIBXML2_INCLUDE_DIRS_RELEASE}" "LIBXML2_LIB=${LIBXML2_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "LIBXML2_INC=${LIBXML2_INCLUDE_DIRS_DEBUG}" "LIBXML2_LIB=${LIBXML2_LIBS_DEBUG}") + + # openjpeg + list(APPEND NMAKE_OPTIONS "OPENJPEG_ENABLED=YES") + x_vcpkg_pkgconfig_get_modules(PREFIX OPENJPEG MODULES --msvc-syntax libopenjp2 INCLUDE_DIRS LIBS) + list(APPEND NMAKE_OPTIONS_REL "OPENJPEG_CFLAGS=${OPENJPEG_INCLUDE_DIRS_RELEASE}" "OPENJPEG_LIB=${OPENJPEG_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "OPENJPEG_CFLAGS=${OPENJPEG_INCLUDE_DIRS_DEBUG}" "OPENJPEG_LIB=${OPENJPEG_LIBS_DEBUG}") + + # proj + x_vcpkg_pkgconfig_get_modules(PREFIX PROJ MODULES --msvc-syntax proj INCLUDE_DIRS LIBS) + list(APPEND NMAKE_OPTIONS_REL "PROJ_INCLUDE=${PROJ_INCLUDE_DIRS_RELEASE}" "PROJ_LIBRARY=${PROJ_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "PROJ_INCLUDE=${PROJ_INCLUDE_DIRS_DEBUG}" "PROJ_LIBRARY=${PROJ_LIBS_DEBUG}") + + # sqlite3 and spatialite + if ("libspatialite" IN_LIST FEATURES) + list(APPEND extra_exports SPATIALITE) + list(APPEND NMAKE_OPTIONS "SPATIALITE_412_OR_LATER=yes") + x_vcpkg_pkgconfig_get_modules(PREFIX SQLITE MODULES --msvc-syntax spatialite sqlite3 INCLUDE_DIRS LIBS) + string(APPEND SQLITE_INCLUDE_DIRS_RELEASE " -DHAVE_SPATIALITE") + string(APPEND SQLITE_INCLUDE_DIRS_DEBUG " -DHAVE_SPATIALITE") + else() + x_vcpkg_pkgconfig_get_modules(PREFIX SQLITE MODULES --msvc-syntax sqlite3 INCLUDE_DIRS LIBS) + endif() + list(APPEND NMAKE_OPTIONS_REL "SQLITE_INC=${SQLITE_INCLUDE_DIRS_RELEASE}" "SQLITE_LIB=${SQLITE_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "SQLITE_INC=${SQLITE_INCLUDE_DIRS_DEBUG}" "SQLITE_LIB=${SQLITE_LIBS_DEBUG}") + + # tiff + x_vcpkg_pkgconfig_get_modules(PREFIX TIFF MODULES --msvc-syntax libtiff-4 INCLUDE_DIRS LIBS) + list(APPEND NMAKE_OPTIONS_REL "TIFF_INC=${TIFF_INCLUDE_DIRS_RELEASE} -DBIGTIFF_SUPPORT" "TIFF_LIB=${TIFF_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "TIFF_INC=${TIFF_INCLUDE_DIRS_DEBUG} -DBIGTIFF_SUPPORT" "TIFF_LIB=${TIFF_LIBS_DEBUG}") + + # zlib + list(APPEND NMAKE_OPTIONS "ZLIB_EXTERNAL_LIB=1") + x_vcpkg_pkgconfig_get_modules(PREFIX ZLIB MODULES --msvc-syntax zlib INCLUDE_DIRS LIBS) + list(APPEND NMAKE_OPTIONS_REL "ZLIB_INC=${ZLIB_INCLUDE_DIRS_RELEASE}" "ZLIB_LIB=${ZLIB_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "ZLIB_INC=${ZLIB_INCLUDE_DIRS_DEBUG}" "ZLIB_LIB=${ZLIB_LIBS_DEBUG}") + + # zstd + x_vcpkg_pkgconfig_get_modules(PREFIX ZSTD MODULES --msvc-syntax libzstd INCLUDE_DIRS LIBS) + list(APPEND NMAKE_OPTIONS_REL "ZSTD_CFLAGS=${ZSTD_INCLUDE_DIRS_RELEASE}" "ZSTD_LIBS=${ZSTD_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "ZSTD_CFLAGS=${ZSTD_INCLUDE_DIRS_DEBUG}" "ZSTD_LIBS=${ZSTD_LIBS_DEBUG}") + + # Features + + if ("cfitsio" IN_LIST FEATURES) + list(APPEND NMAKE_OPTIONS "FITS_INC_DIR=${CURRENT_INSTALLED_DIR}/include" "FITS_PLUGIN=NO") + list(APPEND NMAKE_OPTIONS_REL "FITS_LIB=${CURRENT_INSTALLED_DIR}/lib/cfitsio.lib") + list(APPEND NMAKE_OPTIONS_DBG "FITS_LIB=${CURRENT_INSTALLED_DIR}/debug/lib/cfitsio.lib") + endif() + + if("hdf5" IN_LIST FEATURES) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" HDF5_DIR) + x_vcpkg_pkgconfig_get_modules(PREFIX HDF5 MODULES --msvc-syntax hdf5 LIBS) + list(APPEND NMAKE_OPTIONS "HDF5_DIR=${CURRENT_INSTALLED_DIR}" "HDF5_PLUGIN=NO") + list(APPEND NMAKE_OPTIONS_REL "HDF5_LIB=${HDF5_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "HDF5_LIB=${HDF5_LIBS_DEBUG}") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + list(APPEND NMAKE_OPTIONS "HDF5_H5_IS_DLL=YES") + endif() + endif() + + if("mysql-libmariadb" IN_LIST FEATURES) + list(APPEND NMAKE_OPTIONS "MYSQL_INC_DIR=${CURRENT_INSTALLED_DIR}/include/mysql") + list(APPEND NMAKE_OPTIONS_REL "MYSQL_LIB=${CURRENT_INSTALLED_DIR}/lib/libmariadb.lib") + list(APPEND NMAKE_OPTIONS_DBG "MYSQL_LIB=${CURRENT_INSTALLED_DIR}/debug/lib/libmariadb.lib") + endif() + + if("netcdf" IN_LIST FEATURES) + list(APPEND NMAKE_OPTIONS "NETCDF_INC_DIR=${CURRENT_INSTALLED_DIR}/include" "NETCDF_SETTING=yes" "NETCDF_PLUGIN=NO") + x_vcpkg_pkgconfig_get_modules(PREFIX NETCDF MODULES --msvc-syntax netcdf LIBS) + list(APPEND NMAKE_OPTIONS_REL "NETCDF_LIB=${NETCDF_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "NETCDF_LIB=${NETCDF_LIBS_DEBUG}") + endif() + + if("poppler" IN_LIST FEATURES) + list(APPEND NMAKE_OPTIONS "POPPLER_ENABLED=YES") + list(APPEND NMAKE_OPTIONS "POPPLER_MAJOR_VERSION=22" "POPPLER_MINOR_VERSION=3") # Bump as needed + list(APPEND NMAKE_OPTIONS "POPPLER_CFLAGS=-I${CURRENT_INSTALLED_DIR}/include -I${CURRENT_INSTALLED_DIR}/include/poppler /std:c++17") + x_vcpkg_pkgconfig_get_modules(PREFIX POPPLER MODULES --msvc-syntax poppler LIBS) + list(APPEND NMAKE_OPTIONS_REL "POPPLER_LIBS=${POPPLER_LIBS_RELEASE}") + list(APPEND NMAKE_OPTIONS_DBG "POPPLER_LIBS=${POPPLER_LIBS_DEBUG}") + endif() + + if("postgresql" IN_LIST FEATURES) + list(APPEND NMAKE_OPTIONS "PG_INC_DIR=${CURRENT_INSTALLED_DIR}/include") + x_vcpkg_pkgconfig_get_modules(PREFIX OPENSSL MODULES --msvc-syntax openssl LIBS) + set(PGSQL_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libpq.lib ${CURRENT_INSTALLED_DIR}/lib/libpgcommon.lib ${CURRENT_INSTALLED_DIR}/lib/libpgport.lib") + list(APPEND NMAKE_OPTIONS_REL "PG_LIB=${PGSQL_LIBRARY_REL} Secur32.lib Shell32.lib Advapi32.lib Crypt32.lib Gdi32.lib ${OPENSSL_LIBS_RELEASE}") + set(PGSQL_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libpq.lib ${CURRENT_INSTALLED_DIR}/debug/lib/libpgcommon.lib ${CURRENT_INSTALLED_DIR}/debug/lib/libpgport.lib") + list(APPEND NMAKE_OPTIONS_DBG "PG_LIB=${PGSQL_LIBRARY_DBG} Secur32.lib Shell32.lib Advapi32.lib Crypt32.lib Gdi32.lib ${OPENSSL_LIBS_DEBUG}") + endif() + + # Dependencies which are not in vpckg.json + + # cryptopp + if("system-libraries" IN_LIST FEATURES AND EXISTS "${CURRENT_INSTALLED_DIR}/lib/cryptopp-static.lib") + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" CRYPTOPP_INCLUDE) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/cryptopp-static.lib" CRYPTOPP_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/cryptopp-static.lib" CRYPTOPP_LIBRARY_DBG) + list(APPEND NMAKE_OPTIONS CRYPTOPP_INC=-I${CRYPTOPP_INCLUDE}) + list(APPEND NMAKE_OPTIONS_REL CRYPTOPP_LIB=${CRYPTOPP_LIBRARY_REL}) + list(APPEND NMAKE_OPTIONS_DBG CRYPTOPP_LIB=${CRYPTOPP_LIBRARY_DBG}) + endif() + + # freexl + if("system-libraries" IN_LIST FEATURES AND EXISTS "${CURRENT_INSTALLED_DIR}/lib/freexl.lib") + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" FREEXL_INCLUDE) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/freexl.lib" FREEXL_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/freexl.lib" FREEXL_LIBRARY_DBG) + list(APPEND NMAKE_OPTIONS FREEXL_CFLAGS=-I${FREEXL_INCLUDE}) + list(APPEND NMAKE_OPTIONS_REL FREEXL_LIBS=${FREEXL_LIBRARY_REL}) + list(APPEND NMAKE_OPTIONS_DBG FREEXL_LIBS=${FREEXL_LIBRARY_DBG}) + endif() + + # libkml + if("system-libraries" IN_LIST FEATURES AND EXISTS "${CURRENT_INSTALLED_DIR}/lib/kmlbase.lib") + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" LIBKML_DIR) + list(APPEND NMAKE_OPTIONS LIBKML_DIR=${LIBKML_DIR}) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" LIBKML_INCLUDE) + list(APPEND NMAKE_OPTIONS LIBKML_INCLUDE=-I${LIBKML_INCLUDE}) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmlbase.lib" KMLBASE_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmlbase.lib" KMLBASE_DBG) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmlconvenience.lib" KMLCONVENIENCE_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmlconvenience.lib" KMLCONVENIENCE_DBG) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmldom.lib" KMLDOM_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmldom.lib" KMLDOM_DBG) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmlengine.lib" KMLENGINE_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmlengine.lib" KMLENGINE_DBG) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmlregionator.lib" KMLREGIONATOR_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmlregionator.lib" KMLREGIONATOR_DBG) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmlxsd.lib" KMLXSD_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmlxsd.lib" KMLXSD_DBG) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/bz2.lib" BZIP2_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/bz2d.lib" BZIP2_DBG) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/minizip.lib" MINIZIP_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/minizip.lib" MINIZIP_DBG) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/uriparser.lib" URIPARSER_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/uriparser.lib" URIPARSER_DBG) + list(APPEND NMAKE_OPTIONS_REL "LIBKML_LIBS=${KMLBASE_REL} ${KMLCONVENIENCE_REL} ${KMLDOM_REL} ${KMLENGINE_REL} ${KMLREGIONATOR_REL} ${KMLXSD_REL} ${BZIP2_REL} ${MINIZIP_REL} ${URIPARSER_REL} ${EXPAT_LIBRARY_REL} ${ZLIB_LIBRARY_REL}") + list(APPEND NMAKE_OPTIONS_DBG "LIBKML_LIBS=${KMLBASE_DBG} ${KMLCONVENIENCE_DBG} ${KMLDOM_DBG} ${KMLENGINE_DBG} ${KMLREGIONATOR_DBG} ${KMLXSD_DBG} ${BZIP2_DBG} ${MINIZIP_DBG} ${URIPARSER_DBG} ${EXPAT_LIBRARY_DBG} ${ZLIB_LIBRARY_DBG}") + endif() + + # xerces-c + if("system-libraries" IN_LIST FEATURES AND EXISTS "${CURRENT_INSTALLED_DIR}/lib/xerces-c_3.lib") + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" XERCES_DIR) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" XERCES_INCLUDE) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/xerces-c_3.lib" XERCES_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/xerces-c_3D.lib" XERCES_LIBRARY_DBG) + list(APPEND NMAKE_OPTIONS ILI_ENABLED=YES) + list(APPEND NMAKE_OPTIONS XERCES_DIR=${XERCES_DIR}) + list(APPEND NMAKE_OPTIONS "XERCES_INCLUDE=-I${XERCES_INCLUDE} -I${XERCES_INCLUDE}/xercesc") + list(APPEND NMAKE_OPTIONS_REL XERCES_LIB=${XERCES_LIBRARY_REL}) + list(APPEND NMAKE_OPTIONS_DBG XERCES_LIB=${XERCES_LIBRARY_DBG}) + endif() + +endmacro() diff --git a/externals/vcpkg/ports/gdal/portfile.cmake b/externals/vcpkg/ports/gdal/portfile.cmake new file mode 100755 index 000000000..23de39e5c --- /dev/null +++ b/externals/vcpkg/ports/gdal/portfile.cmake @@ -0,0 +1,375 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO OSGeo/gdal + REF v3.4.3 + SHA512 702bcb220abc7cf978e8f70a1b2835a20ce5abe405014b9690cab311c00837e57555bb371ff5e2655f9eed63cfd461d6cec5e654001b276dd79a6d2ec0c21f0b + HEAD_REF master + PATCHES + 0001-Fix-debug-crt-flags.patch + 0002-Fix-build.patch + 0004-Fix-cfitsio.patch + 0005-Fix-configure.patch + 0006-Fix-mingw-dllexport.patch + 0007-Control-tools.patch + 0008-Fix-absl-string_view.patch + 0009-atlbase.patch + 0010-symprefix.patch +) +# `vcpkg clean` stumbles over one subdir +file(REMOVE_RECURSE "${SOURCE_PATH}/autotest") + +set(extra_exports "") +if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + if (VCPKG_CRT_LINKAGE STREQUAL "static") + set(LINKAGE_FLAGS "/MT") + else() + set(LINKAGE_FLAGS "/MD") + endif() + + set(NMAKE_OPTIONS + "DATADIR=${CURRENT_PACKAGES_DIR}/share/gdal" + "HTMLDIR=${CURRENT_PACKAGES_DIR}/share/gdal/html" + "MSVC_VER=1900" + ) + set(NMAKE_OPTIONS_REL + "GDAL_HOME=${CURRENT_PACKAGES_DIR}" + "CXX_CRT_FLAGS=${LINKAGE_FLAGS}" + ) + set(NMAKE_OPTIONS_DBG + "GDAL_HOME=${CURRENT_PACKAGES_DIR}/debug" + "CXX_CRT_FLAGS=${LINKAGE_FLAGS}d" + DEBUG=1 + ) + + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + list(APPEND NMAKE_OPTIONS "WIN64=YES") + endif() + + if(VCPKG_TARGET_IS_UWP) + list(APPEND NMAKE_OPTIONS "SYM_PREFIX=" "EXTRA_LINKER_FLAGS=/APPCONTAINER WindowsApp.lib") + endif() + + if(NOT "aws-ec2-windows" IN_LIST FEATURES) + list(APPEND NMAKE_OPTIONS "HAVE_ATLBASE_H=NO") + endif() + + if(VCPKG_TARGET_ARCHITECTURE MATCHES "^arm") + list(APPEND NMAKE_OPTIONS "SSEFLAGS=/DNO_SSSE" "AVXFLAGS=/DNO_AVX") + endif() + + if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND NMAKE_OPTIONS "DLLBUILD=0") + else() + list(APPEND NMAKE_OPTIONS "DLLBUILD=1" "WITH_PDB=1") + endif() + + include("${CMAKE_CURRENT_LIST_DIR}/dependency_win.cmake") + find_dependency_win() + + if("tools" IN_LIST FEATURES) + list(APPEND NMAKE_OPTIONS_REL "BUILD_TOOLS=1") + else() + list(APPEND NMAKE_OPTIONS_REL "BUILD_TOOLS=0") + endif() + list(APPEND NMAKE_OPTIONS_DBG "BUILD_TOOLS=0") + + # Begin build process + vcpkg_install_nmake( + SOURCE_PATH "${SOURCE_PATH}/gdal" + TARGET devinstall + OPTIONS + ${NMAKE_OPTIONS} + OPTIONS_RELEASE + ${NMAKE_OPTIONS_REL} + OPTIONS_DEBUG + ${NMAKE_OPTIONS_DBG} + ) + + if("tools" IN_LIST FEATURES) + set(GDAL_EXES + gdal_contour + gdal_create + gdal_grid + gdal_rasterize + gdal_translate + gdal_viewshed + gdaladdo + gdalbuildvrt + gdaldem + gdalenhance + gdalinfo + gdallocationinfo + gdalmanage + gdalmdiminfo + gdalmdimtranslate + gdalsrsinfo + gdaltindex + gdaltransform + gdalwarp + gnmanalyse + gnmmanage + nearblack + ogr2ogr + ogrinfo + ogrlineref + ogrtindex + ) + # vcpkg_copy_tools removes the bin directories for us so no need to remove again + vcpkg_copy_tools(TOOL_NAMES ${GDAL_EXES} AUTO_CLEAN) + elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/share/gdal/html") + + vcpkg_copy_pdbs() + + if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/gdal204.pdb") + endif() + +else() + # See https://github.com/microsoft/vcpkg/issues/16990 + file(TOUCH "${SOURCE_PATH}/gdal/config.rpath") + + set(CONF_OPTS + --with-gnm=yes + --with-hide-internal-symbols=yes + --with-java=no + --with-perl=no + --with-python=no + ) + set(CONF_CHECKS "") + function(add_config option check) + list(APPEND CONF_OPTS "${option}") + set(CONF_OPTS "${CONF_OPTS}" PARENT_SCOPE) + list(APPEND CONF_CHECKS "${check}") + set(CONF_CHECKS "${CONF_CHECKS}" PARENT_SCOPE) + endfunction() + # parameters in the same order as the dependencies in vcpkg.json + add_config("--with-curl=yes" "cURL support .wms/wcs/....:yes") + add_config("--with-expat=yes" "Expat support: yes") + add_config("--with-geos=yes" "GEOS support: yes") + add_config("--with-gif=yes" "LIBGIF support: external") + add_config("--with-libjson=yes" "checking for JSONC... yes") + add_config("--with-geotiff=yes" "LIBGEOTIFF support: external") + add_config("--with-jpeg=yes" "LIBJPEG support: external") + add_config("--with-liblzma=yes" "LIBLZMA support: yes") + add_config("--with-png=yes" "LIBPNG support: external") + add_config("--with-webp=yes" "WebP support: yes") + add_config("--with-xml2=yes" "libxml2 support: yes") + add_config("--with-openjpeg=yes" "OpenJPEG support: yes") + add_config("--with-proj=yes" "PROJ >= 6: yes") + add_config("--with-sqlite3=yes" "SQLite support: yes") + add_config("--with-libtiff=yes" "LIBTIFF support: external") + add_config("--with-libz=yes" "LIBZ support: external") + add_config("--with-zstd=yes" "ZSTD support: yes") + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND CONF_OPTS --without-libtool --without-ld-shared) + endif() + + if("system-libraries" IN_LIST FEATURES) + set(DISABLE_SYSTEM_LIBRARIES OFF) + else() + set(DISABLE_SYSTEM_LIBRARIES ON) + endif() + + if ("libspatialite" IN_LIST FEATURES) + add_config("--with-spatialite=yes" "SpatiaLite support: yes") + elseif(DISABLE_SYSTEM_LIBRARIES) + add_config("--with-spatialite=no" "SpatiaLite support: no") + endif() + + if ("poppler" IN_LIST FEATURES) + add_config("--with-poppler=yes" "Poppler support: yes") + elseif(DISABLE_SYSTEM_LIBRARIES) + add_config("--with-poppler=no" "Poppler support: no") + endif() + if ("postgresql" IN_LIST FEATURES) + add_config("--with-pg=yes" "PostgreSQL support: yes") + elseif(DISABLE_SYSTEM_LIBRARIES) + add_config("--with-pg=no" "PostgreSQL support: no") + endif() + + if ("mysql-libmariadb" IN_LIST FEATURES) + add_config("--with-mysql=yes" "MySQL support: yes") + elseif(DISABLE_SYSTEM_LIBRARIES) + add_config("--with-mysql=no" "MySQL support: no") + endif() + + if ("cfitsio" IN_LIST FEATURES) + add_config("--with-cfitsio=yes" "CFITSIO support: external") + elseif(DISABLE_SYSTEM_LIBRARIES) + add_config("--with-cfitsio=no" "CFITSIO support: no") + endif() + + if ("hdf5" IN_LIST FEATURES) + add_config("--with-hdf5=yes" "HDF5 support: yes") + elseif(DISABLE_SYSTEM_LIBRARIES) + add_config("--with-hdf5=no" "HDF5 support: no") + endif() + + if ("netcdf" IN_LIST FEATURES) + add_config("--with-netcdf=yes" "NetCDF support: yes") + elseif(DISABLE_SYSTEM_LIBRARIES) + add_config("--with-netcdf=no" "NetCDF support: no") + endif() + + if(DISABLE_SYSTEM_LIBRARIES) + list(APPEND CONF_OPTS + # Too much: --disable-all-optional-drivers + # alphabetical order + --with-armadillo=no + --with-blosc=no + --with-brunsli=no + --with-charls=no + --with-crypto=no + --with-cryptopp=no + --with-dds=no + --with-dods-root=no + --with-ecw=no + --with-epsilon=no + --with-exr=no + --with-fgdb=no + --with-fme=no + --with-freexl=no + --with-grass=no + --with-gta=no + --with-hdf4=no + --with-hdfs=no + --with-heif=no + --with-idb=no + --with-ingres=no + --with-jp2lura=no + --with-jp2mrsid=no + --with-jasper=no + --with-jxl=no + --with-kakadu=no + --with-kea=no + --with-lerc=no + --with-libdeflate=no + --with-libgrass=no + --with-libkml=no + --with-lz4=no + --with-mdb=no + --with-mongocxx=no + --with-mongocxxv3=no + --with-mrsid=no + --with-mrsid_lidar=no + --with-msg=no + --with-null=no + --with-oci=no + --with-odbc=no + --with-ogdi=no + --with-opencl=no + --with-pcidsk=no + --with-pcraster=no + --with-pcre=no + --with-pcre2=no + --with-pdfium=no + --with-podofo=no + --with-qhull=no + --with-rasdaman=no + --with-rasterlite2=no + --with-rdb=no + --with-sfcgal=no + --with-sosi=no + --with-teigha=no + --with-tiledb=no + --with-xerces=no + ) + endif() + + x_vcpkg_pkgconfig_get_modules(PREFIX PROJ MODULES proj LIBS) + + if("tools" IN_LIST FEATURES) + list(APPEND CONF_OPTS "--with-tools=yes") + else() + list(APPEND CONF_OPTS "--with-tools=no") + endif() + + if(VCPKG_TARGET_IS_ANDROID AND (VCPKG_TARGET_ARCHITECTURE MATCHES "x86" OR VCPKG_TARGET_ARCHITECTURE MATCHES "arm")) + list(APPEND CONF_OPTS --with-unix-stdio-64=no) + endif() + + vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}/gdal" + AUTOCONFIG + COPY_SOURCE + OPTIONS + ${CONF_OPTS} + OPTIONS_RELEASE + "--with-proj-extra-lib-for-test=${PROJ_LIBS_RELEASE}" + OPTIONS_DEBUG + --enable-debug + --with-tools=no + "--with-proj-extra-lib-for-test=${PROJ_LIBS_DEBUG}" + ) + + # Verify configuration results (tightly coupled to vcpkg_configure_make) + function(check_config logfile) + set(failed_checks "") + file(READ "${logfile}" log) + foreach(check IN LISTS CONF_CHECKS) + if(NOT log MATCHES "${check}") + string(APPEND failed_checks "\n ${check}") + endif() + endforeach() + if(failed_checks) + get_filename_component(file "${logfile}" NAME_WE) + message(FATAL_ERROR "${file}: Configuration failed for ${failed_checks}") + endif() + endfunction() + foreach(suffix IN ITEMS rel dbg) + set(log "${CURRENT_BUILDTREES_DIR}/config-${TARGET_TRIPLET}-${suffix}-out.log") + if(EXISTS "${log}") + check_config("${log}") + endif() + endforeach() + + vcpkg_install_make(MAKEFILE GNUmakefile) + + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/lib/gdalplugins" + "${CURRENT_PACKAGES_DIR}/debug/lib/gdalplugins" + "${CURRENT_PACKAGES_DIR}/debug/share" + ) + + vcpkg_fixup_pkgconfig() + set(pc_file_debug "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gdal.pc") + if(EXISTS "${pc_file_debug}") + vcpkg_replace_string("${pc_file_debug}" "\${prefix}/../../include" "\${prefix}/../include") + vcpkg_replace_string("${pc_file_debug}" "\${exec_prefix}/include" "\${prefix}/../include") + endif() + + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/gdal/bin/gdal-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/gdal/debug/bin/gdal-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") + endif() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/cpl_config.h" "#define GDAL_PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") + + if("libspatialite" IN_LIST FEATURES) + list(APPEND extra_exports SPATIALITE) + x_vcpkg_pkgconfig_get_modules( + PREFIX SPATIALITE + MODULES spatialite + LIBS + ) + endif() +endif() + +string(COMPARE NOTEQUAL "${NMAKE_OPTIONS}" "" NMAKE_BUILD) +set(GDAL_EXTRA_LIBS_DEBUG "") +set(GDAL_EXTRA_LIBS_RELEASE "") +foreach(prefix IN LISTS extra_exports) + string(REPLACE "${CURRENT_INSTALLED_DIR}/" "\${CMAKE_CURRENT_LIST_DIR}/../../" libs "${${prefix}_LIBS_DEBUG}") + string(APPEND GDAL_EXTRA_LIBS_DEBUG " ${libs}") + string(REPLACE "${CURRENT_INSTALLED_DIR}/" "\${CMAKE_CURRENT_LIST_DIR}/../../" libs "${${prefix}_LIBS_RELEASE}") + string(APPEND GDAL_EXTRA_LIBS_RELEASE " ${libs}") +endforeach() +string(REPLACE "/lib/pkgconfig/../.." "" GDAL_EXTRA_LIBS_DEBUG "${GDAL_EXTRA_LIBS_DEBUG}") +string(REPLACE "/lib/pkgconfig/../.." "" GDAL_EXTRA_LIBS_RELEASE "${GDAL_EXTRA_LIBS_RELEASE}") +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/gdal/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/gdal/usage b/externals/vcpkg/ports/gdal/usage new file mode 100755 index 000000000..63a67bc07 --- /dev/null +++ b/externals/vcpkg/ports/gdal/usage @@ -0,0 +1,5 @@ +The package GDAL provides CMake targets: + + find_package(GDAL REQUIRED) + target_include_directories(main PRIVATE ${GDAL_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${GDAL_LIBRARIES}) diff --git a/externals/vcpkg/ports/gdal/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/gdal/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..305de834e --- /dev/null +++ b/externals/vcpkg/ports/gdal/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,151 @@ +include(SelectLibraryConfigurations) + +find_path(GDAL_INCLUDE_DIR + NAMES gdal.h + PATHS "${CMAKE_CURRENT_LIST_DIR}/../../include" + NO_DEFAULT_PATH +) +find_library(GDAL_LIBRARY_DEBUG + NAMES gdal_d gdal_i_d gdal + NAMES_PER_DIR + PATHS "${CMAKE_CURRENT_LIST_DIR}/../../debug/lib" + NO_DEFAULT_PATH +) +find_library(GDAL_LIBRARY_RELEASE + NAMES gdal_i gdal + NAMES_PER_DIR + PATHS "${CMAKE_CURRENT_LIST_DIR}/../../lib" + NO_DEFAULT_PATH +) +select_library_configurations(GDAL) + +if(NOT GDAL_INCLUDE_DIR OR NOT GDAL_LIBRARY) + message(FATAL_ERROR "Installation of vcpkg port gdal is broken.") +endif() + +set(GDAL_LIBRARY "${GDAL_LIBRARY}" CACHE STRING "") + +set(FindGDAL_SKIP_GDAL_CONFIG TRUE) + +_find_package(${ARGS}) + +set(_gdal_dep_find_args "") +if(";${ARGS};" MATCHES ";REQUIRED;") + list(APPEND _gdal_dep_find_args "REQUIRED") +endif() +function(_gdal_add_dependency target package) + find_package(${package} ${ARGN} ${_gdal_dep_find_args}) + if(${package}_FOUND) + foreach(suffix IN ITEMS "" "-shared" "_shared" "-static" "_static" "-NOTFOUND") + set(dependency "${target}${suffix}") + if(TARGET ${dependency}) + break() + endif() + endforeach() + if(NOT TARGET ${dependency}) + string(TOUPPER ${package} _gdal_deps_package) + if(DEFINED ${_gdal_deps_package}_LIBRARIES) + set(dependency ${${_gdal_deps_package}_LIBRARIES}) + elseif(DEFINED ${package}_LIBRARIES) + set(dependency ${${package}_LIBRARIES}) + elseif(DEFINED ${_gdal_deps_package}_LIBRARY) + set(dependency ${${_gdal_deps_package}_LIBRARY}) + elseif(DEFINED ${package}_LIBRARY) + set(dependency ${${package}_LIBRARY}) + endif() + endif() + if(dependency) + if(TARGET GDAL::GDAL) # CMake 3.14 + set_property(TARGET GDAL::GDAL APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${dependency}) + endif() + if(NOT GDAL_LIBRARIES STREQUAL "GDAL::GDAL") + set(GDAL_LIBRARIES "${GDAL_LIBRARIES};${dependency}" PARENT_SCOPE) + endif() + else() + message(WARNING "Did not find which libraries are exported by ${package}") + set(GDAL_FOUND false PARENT_SCOPE) + endif() + else() + message(WARNING "Could not find package ${package}") + set(GDAL_FOUND false PARENT_SCOPE) + endif() +endfunction() +function(z_vcpkg_gdal_add_libs keyword config) + set(gdal_deps_target "unofficial::gdal::deps::${keyword}") + if(NOT TARGET "${gdal_deps_target}") + add_library("${gdal_deps_target}" INTERFACE IMPORTED) + if(TARGET GDAL::GDAL) # CMake 3.14 + set_property(TARGET GDAL::GDAL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "$<$:${gdal_deps_target}>") + endif() + if(NOT GDAL_LIBRARIES STREQUAL "GDAL::GDAL") + set(GDAL_LIBRARIES "${GDAL_LIBRARIES};${keyword};${gdal_deps_target}" PARENT_SCOPE) + endif() + endif() + # The Ninja build system stumbles over '/libpath:` in INTERFACE_LINK_LIBRARIES. + set(lib_paths "${ARGN}") + list(REMOVE_DUPLICATES lib_paths) # For lib paths, late duplicates are redundant. + foreach(item IN LISTS lib_paths) + # INTERFACE_LINK_OPTIONS needs CMake 3.13. There is no direct alternative for older versions. + if(item MATCHES "^/libpath:(.*)|^-L") + set_property(TARGET "${gdal_deps_target}" APPEND PROPERTY INTERFACE_LINK_OPTIONS "${item}") + list(REMOVE_ITEM ARGN "${item}") + endif() + endforeach() + foreach(item IN LISTS ARGN) + get_property(libs TARGET "${gdal_deps_target}" PROPERTY INTERFACE_LINK_LIBRARIES) + if(item MATCHES "^-l|-pthread") + list(REMOVE_ITEM libs "${item}") # For libs, early duplicates are normally redundant. + endif() + list(APPEND libs "${item}") + set_property(TARGET "${gdal_deps_target}" PROPERTY INTERFACE_LINK_LIBRARIES "${libs}") + endforeach() +endfunction() +if(GDAL_FOUND) + cmake_policy(PUSH) + cmake_policy(SET CMP0057 NEW) + set(Z_VCPKG_PORT_FEATURES "@FEATURES@") + if("cfitsio" IN_LIST Z_VCPKG_PORT_FEATURES) + _gdal_add_dependency(cfitsio unofficial-cfitsio CONFIG) + endif() + _gdal_add_dependency(CURL::libcurl CURL CONFIG) + _gdal_add_dependency(expat::expat expat CONFIG) + _gdal_add_dependency(GEOS::geos_c geos CONFIG) + if(NOT "@NMAKE_BUILD@") + _gdal_add_dependency(GIF::GIF GIF) + endif() + if("hdf5" IN_LIST Z_VCPKG_PORT_FEATURES) + _gdal_add_dependency(hdf5::hdf5 hdf5 CONFIG) + endif() + if(NOT "@NMAKE_BUILD@") + _gdal_add_dependency(json-c::json-c json-c CONFIG) + endif() + _gdal_add_dependency(geotiff_library GeoTIFF CONFIG) + _gdal_add_dependency(JPEG::JPEG JPEG) + _gdal_add_dependency(LibLZMA::LibLZMA LibLZMA) + _gdal_add_dependency(png libpng CONFIG) + if("poppler" IN_LIST Z_VCPKG_PORT_FEATURES) + _gdal_add_dependency(unofficial::poppler::poppler-private unofficial-poppler) + endif() + if("postgresql" IN_LIST Z_VCPKG_PORT_FEATURES) + _gdal_add_dependency(PostgreSQL::PostgreSQL PostgreSQL) + endif() + _gdal_add_dependency(WebP::webp WebP CONFIG) + _gdal_add_dependency(LibXml2::LibXml2 LibXml2) + if("netcdf" IN_LIST Z_VCPKG_PORT_FEATURES) + _gdal_add_dependency(netCDF::netcdf netCDF CONFIG) + endif() + _gdal_add_dependency(openjp2 OpenJPEG CONFIG) + _gdal_add_dependency(PROJ::proj PROJ4 CONFIG) + _gdal_add_dependency(unofficial::sqlite3::sqlite3 unofficial-sqlite3 CONFIG) + _gdal_add_dependency(TIFF::TIFF TIFF) + _gdal_add_dependency(ZLIB::ZLIB ZLIB) + _gdal_add_dependency(zstd::libzstd zstd CONFIG) + z_vcpkg_gdal_add_libs(optimized Release @GDAL_EXTRA_LIBS_RELEASE@) + z_vcpkg_gdal_add_libs(debug Debug @GDAL_EXTRA_LIBS_DEBUG@) + list(FIND ARGS "REQUIRED" required) + if(NOT GDAL_FOUND AND NOT required EQUAL "-1") + message(FATAL_ERROR "Failed to find dependencies of GDAL") + endif() + unset(Z_VCPKG_PORT_FEATURES) + cmake_policy(POP) +endif() diff --git a/externals/vcpkg/ports/gdal/vcpkg.json b/externals/vcpkg/ports/gdal/vcpkg.json new file mode 100755 index 000000000..3f0251185 --- /dev/null +++ b/externals/vcpkg/ports/gdal/vcpkg.json @@ -0,0 +1,128 @@ +{ + "name": "gdal", + "version-semver": "3.4.3", + "port-version": 2, + "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", + "homepage": "https://gdal.org", + "license": null, + "dependencies": [ + "curl", + "expat", + "geos", + { + "name": "giflib", + "platform": "!windows | mingw" + }, + { + "name": "json-c", + "platform": "!windows | mingw" + }, + "libgeotiff", + { + "name": "libiconv", + "platform": "windows & !mingw" + }, + "libjpeg-turbo", + "liblzma", + "libpng", + "libwebp", + "libxml2", + "openjpeg", + "proj", + "sqlite3", + "tiff", + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true + }, + "zlib", + "zstd" + ], + "default-features": [ + "supported-default-features" + ], + "features": { + "aws-ec2-windows": { + "description": "Optimized detection of AWS EC2 Windows hosts", + "dependencies": [ + "atlmfc" + ] + }, + "cfitsio": { + "description": "Enable cfitsio support", + "dependencies": [ + "cfitsio" + ] + }, + "hdf5": { + "description": "Enable HDF5 support", + "dependencies": [ + "hdf5" + ] + }, + "libspatialite": { + "description": "Create or update SpatiaLite databases using libspatialite", + "dependencies": [ + "libspatialite" + ] + }, + "mysql-libmariadb": { + "description": "Add mysql support using libmariadb", + "dependencies": [ + "libmariadb" + ] + }, + "netcdf": { + "description": "Enable NetCDF support", + "dependencies": [ + "netcdf-c" + ] + }, + "poppler": { + "description": "Enable poppler support", + "dependencies": [ + { + "name": "poppler", + "default-features": false, + "features": [ + "private-api" + ] + } + ] + }, + "postgresql": { + "description": "Enable PostgreSQL support", + "dependencies": [ + "libpq" + ] + }, + "supported-default-features": { + "description": "Default set of features, dependent on platform", + "dependencies": [ + { + "name": "gdal", + "default-features": false, + "features": [ + "postgresql" + ], + "platform": "!uwp" + }, + { + "name": "gdal", + "default-features": false, + "features": [ + "hdf5", + "netcdf" + ], + "platform": "!uwp & !(windows & arm64)" + } + ] + }, + "system-libraries": { + "description": "Include drivers which need additional libraries" + }, + "tools": { + "description": "Builds gdal and ogr executables" + } + } +} diff --git a/externals/vcpkg/ports/gdcm/Fix-Cmake_DIR.patch b/externals/vcpkg/ports/gdcm/Fix-Cmake_DIR.patch new file mode 100755 index 000000000..189b28e05 --- /dev/null +++ b/externals/vcpkg/ports/gdcm/Fix-Cmake_DIR.patch @@ -0,0 +1,41 @@ +diff --git a/CMake/ExportConfiguration/GDCMConfig.cmake.in b/CMake/ExportConfiguration/GDCMConfig.cmake.in +index f8e9d0b..ab28546 100644 +--- a/CMake/ExportConfiguration/GDCMConfig.cmake.in ++++ b/CMake/ExportConfiguration/GDCMConfig.cmake.in +@@ -33,28 +33,28 @@ if(GDCM_USE_VTK) + set(GDCM_VTK_DIR "@GDCM_VTK_DIR_CONFIG@") + endif() + +-get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +-if(EXISTS ${SELF_DIR}/GDCMTargets.cmake) ++get_filename_component(GDCM_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) ++if(EXISTS ${GDCM_SELF_DIR}/GDCMTargets.cmake) + # This is an install tree +- include(${SELF_DIR}/GDCMTargets.cmake) +- get_filename_component(GDCM_INCLUDE_ROOT "${SELF_DIR}/../../@GDCM_INSTALL_INCLUDE_DIR@" ABSOLUTE) ++ include(${GDCM_SELF_DIR}/GDCMTargets.cmake) ++ get_filename_component(GDCM_INCLUDE_ROOT "${GDCM_SELF_DIR}/../../@GDCM_INSTALL_INCLUDE_DIR@" ABSOLUTE) + set(GDCM_INCLUDE_DIRS ${GDCM_INCLUDE_ROOT}) +- get_filename_component(GDCM_LIB_ROOT "${SELF_DIR}/../../@GDCM_INSTALL_LIB_DIR@" ABSOLUTE) ++ get_filename_component(GDCM_LIB_ROOT "${GDCM_SELF_DIR}/../../@GDCM_INSTALL_LIB_DIR@" ABSOLUTE) + set(GDCM_LIBRARY_DIRS ${GDCM_LIB_ROOT}) + else() +- if(EXISTS ${SELF_DIR}/GDCMExports.cmake) ++ if(EXISTS ${GDCM_SELF_DIR}/GDCMExports.cmake) + # This is a build tree + set( GDCM_INCLUDE_DIRS "@GDCM_INCLUDE_PATH@") + set(GDCM_LIBRARY_DIRS "@GDCM_LIBRARY_DIR@") + +- include(${SELF_DIR}/GDCMExports.cmake) ++ include(${GDCM_SELF_DIR}/GDCMExports.cmake) + + else() + message(FATAL_ERROR "ooops") + endif() + endif() + +-set(GDCM_USE_FILE ${SELF_DIR}/UseGDCM.cmake) ++set(GDCM_USE_FILE ${GDCM_SELF_DIR}/UseGDCM.cmake) + + # Backward compatible part: + set(GDCM_FOUND TRUE) diff --git a/externals/vcpkg/ports/gdcm/fix-share-path.patch b/externals/vcpkg/ports/gdcm/fix-share-path.patch new file mode 100755 index 000000000..931094681 --- /dev/null +++ b/externals/vcpkg/ports/gdcm/fix-share-path.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6ac16ab..842d833 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -246,15 +246,15 @@ if(NOT GDCM_INSTALL_LIB_DIR) + endif() + + if(NOT GDCM_INSTALL_DATA_DIR) +- set(GDCM_INSTALL_DATA_DIR "share/${subdir}") ++ set(GDCM_INSTALL_DATA_DIR "share/${projectname}") + endif() + + if(NOT GDCM_INSTALL_INCLUDE_DIR) +- set(GDCM_INSTALL_INCLUDE_DIR "include/${subdir}") ++ set(GDCM_INSTALL_INCLUDE_DIR "include/${projectname}") + endif() + + if(NOT GDCM_INSTALL_DOC_DIR) +- set(GDCM_INSTALL_DOC_DIR "share/doc/${subdir}") ++ set(GDCM_INSTALL_DOC_DIR "share/doc/${projectname}") + endif() + + if(NOT GDCM_INSTALL_MAN_DIR) +@@ -262,7 +262,7 @@ if(NOT GDCM_INSTALL_MAN_DIR) + endif() + + if(NOT GDCM_INSTALL_PACKAGE_DIR) +- set(GDCM_INSTALL_PACKAGE_DIR ${GDCM_INSTALL_LIB_DIR}/${subdir} ++ set(GDCM_INSTALL_PACKAGE_DIR ${GDCM_INSTALL_LIB_DIR}/${projectname} + CACHE INTERNAL "") + endif() + diff --git a/externals/vcpkg/ports/gdcm/portfile.cmake b/externals/vcpkg/ports/gdcm/portfile.cmake new file mode 100755 index 000000000..3055b1a42 --- /dev/null +++ b/externals/vcpkg/ports/gdcm/portfile.cmake @@ -0,0 +1,62 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO malaterre/GDCM + REF 1f94bafc929db3648612848836f7899f101d6641 # v3.0.12 + SHA512 cec050c61d9880880b8b72234f8b0824a1f1fa8f9b2419fec85a0f27fe3bca4f9f80aa735b35775ac098f5827fde454aba700ebea17f5f8657894d26f5140f4a + HEAD_REF master + PATCHES + use-openjpeg-config.patch + fix-share-path.patch + Fix-Cmake_DIR.patch +) + +file(REMOVE "${SOURCE_PATH}/CMake/FindOpenJPEG.cmake") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(VCPKG_BUILD_SHARED_LIBS ON) +else() + set(VCPKG_BUILD_SHARED_LIBS OFF) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DGDCM_BUILD_DOCBOOK_MANPAGES=OFF + -DGDCM_BUILD_SHARED_LIBS=${VCPKG_BUILD_SHARED_LIBS} + -DGDCM_INSTALL_INCLUDE_DIR=include + -DGDCM_USE_SYSTEM_EXPAT=ON + -DGDCM_USE_SYSTEM_ZLIB=ON + -DGDCM_USE_SYSTEM_OPENJPEG=ON + -DGDCM_BUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/gdcm) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/gdcm/GDCMTargets.cmake" + "set(CMAKE_IMPORT_FILE_VERSION 1)" + "set(CMAKE_IMPORT_FILE_VERSION 1) + find_package(OpenJPEG QUIET)" +) + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gdcmConfigure.h" "#define GDCM_SOURCE_DIR \"${SOURCE_PATH}\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gdcmConfigure.h" "#define GDCM_EXECUTABLE_OUTPUT_PATH \"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gdcmConfigure.h" "#define GDCM_LIBRARY_OUTPUT_PATH \"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gdcmConfigure.h" "#define GDCM_CMAKE_INSTALL_PREFIX \"${CURRENT_PACKAGES_DIR}\"" "") + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/gdcm/GDCMConfig.cmake" "set( GDCM_INCLUDE_DIRS \"${SOURCE_PATH}/Source/Common;${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Source/Common;${SOURCE_PATH}/Source/DataStructureAndEncodingDefinition;${SOURCE_PATH}/Source/MediaStorageAndFileFormat;${SOURCE_PATH}/Source/MessageExchangeDefinition;${SOURCE_PATH}/Source/DataDictionary;${SOURCE_PATH}/Source/InformationObjectDefinition\")" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/gdcm/GDCMConfig.cmake" "set(GDCM_LIBRARY_DIRS \"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/.\")" "") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/gdcm/use-openjpeg-config.patch b/externals/vcpkg/ports/gdcm/use-openjpeg-config.patch new file mode 100755 index 000000000..ff64bb1c2 --- /dev/null +++ b/externals/vcpkg/ports/gdcm/use-openjpeg-config.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f82bfd2..a062170 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -375,7 +375,10 @@ else() + endif() + + if(GDCM_USE_SYSTEM_OPENJPEG) +- find_package(OpenJPEG 2.0.0 REQUIRED) ++ find_package(OpenJPEG REQUIRED) ++ if(OPENJPEG_MAJOR_VERSION VERSION_LESS 2) ++ message( FATAL_ERROR "You need at least OpenJPEG 2") ++ endif() + set(GDCM_OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARIES}) + else() + set(GDCM_OPENJPEG_LIBRARIES gdcmopenjp2) diff --git a/externals/vcpkg/ports/gdcm/vcpkg.json b/externals/vcpkg/ports/gdcm/vcpkg.json new file mode 100755 index 000000000..e0dedd842 --- /dev/null +++ b/externals/vcpkg/ports/gdcm/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "gdcm", + "version": "3.0.12", + "description": "Grassroots DICOM library", + "homepage": "https://github.com/malaterre/GDCM", + "license": "BSD-3-Clause", + "supports": "!uwp & !(windows & arm)", + "dependencies": [ + "expat", + "openjpeg", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/gdcm2/portfile.cmake b/externals/vcpkg/ports/gdcm2/portfile.cmake new file mode 100755 index 000000000..0015715fb --- /dev/null +++ b/externals/vcpkg/ports/gdcm2/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/externals/vcpkg/ports/gdcm2/vcpkg.json b/externals/vcpkg/ports/gdcm2/vcpkg.json new file mode 100755 index 000000000..bdbe890c5 --- /dev/null +++ b/externals/vcpkg/ports/gdcm2/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "gdcm2", + "version-string": "deprecated", + "port-version": 1, + "description": "This port was renamed to gdcm. The gdcm2 name is deprecated.", + "homepage": "https://github.com/malaterre/GDCM", + "dependencies": [ + "gdcm" + ] +} diff --git a/externals/vcpkg/ports/gdk-pixbuf/fix_build_error_windows.patch b/externals/vcpkg/ports/gdk-pixbuf/fix_build_error_windows.patch new file mode 100755 index 000000000..b213ac865 --- /dev/null +++ b/externals/vcpkg/ports/gdk-pixbuf/fix_build_error_windows.patch @@ -0,0 +1,19 @@ +--- a/meson.build ++++ b/meson.build +@@ -90,8 +90,14 @@ + gdk_pixbuf_conf.set('HAVE_ROUND', 1) + endif + +-if cc.has_function('lrint', dependencies: mathlib_dep) +- gdk_pixbuf_conf.set('HAVE_LRINT', 1) ++if cc.get_id() == 'msvc' ++ if cc.has_function('lrint', dependencies: mathlib_dep, args: '-Oi-') ++ gdk_pixbuf_conf.set('HAVE_LRINT', 1) ++ endif ++else ++ if cc.has_function('lrint', dependencies: mathlib_dep) ++ gdk_pixbuf_conf.set('HAVE_LRINT', 1) ++ endif + endif + + intl_dep = cc.find_library('intl', required: false) diff --git a/externals/vcpkg/ports/gdk-pixbuf/portfile.cmake b/externals/vcpkg/ports/gdk-pixbuf/portfile.cmake new file mode 100755 index 000000000..64d541833 --- /dev/null +++ b/externals/vcpkg/ports/gdk-pixbuf/portfile.cmake @@ -0,0 +1,71 @@ +set(GDK_PIXBUF_VERSION 2.42) +set(GDK_PIXBUF_PATCH 8) + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.gnome.org/ + OUT_SOURCE_PATH SOURCE_PATH + REPO GNOME/gdk-pixbuf + REF "${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}" + SHA512 ea3b7d47f2ef3dbb88f640629e03eb4fab4a371da2545c199274d75b993b176af0c69ea72b46d5fadf58f82dff9a809fe1e0a4802ad1f1f13eaa9d757ebfeb4c + HEAD_REF master + PATCHES + fix_build_error_windows.patch +) + +if(VCPKG_TARGET_IS_WINDOWS) + #list(APPEND OPTIONS -Dnative_windows_loaders=true) # Use Windows system components to handle BMP, EMF, GIF, ICO, JPEG, TIFF and WMF images, overriding jpeg and tiff. To build this into gdk-pixbuf, pass in windows" with the other loaders to build in or use "all" with the builtin_loaders option +endif() +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dman=false # Whether to generate man pages (requires xlstproc) + -Dgtk_doc=false # Whether to generate the API reference (requires GTK-Doc) + -Ddocs=false + -Dpng=enabled # Enable PNG loader (requires libpng) + -Dtiff=enabled # Enable TIFF loader (requires libtiff), disabled on Windows if "native_windows_loaders" is used + -Djpeg=enabled # Enable JPEG loader (requires libjpeg), disabled on Windows if "native_windows_loaders" is used + -Dintrospection=disabled # Whether to generate the API introspection data (requires GObject-Introspection) + -Drelocatable=true # Whether to enable application bundle relocation support + -Dinstalled_tests=false + -Dgio_sniffing=false # Perform file type detection using GIO (Unused on MacOS and Windows) + -Dbuiltin_loaders=all # since it is unclear where loadable plugins should be located; + # Comma-separated list of loaders to build into gdk-pixbuf, or "none", or "all" to build all buildable loaders into gdk-pixbuf + ADDITIONAL_NATIVE_BINARIES glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources' + glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' + ADDITIONAL_CROSS_BINARIES glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources' + glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' + ) +vcpkg_install_meson(ADD_BIN_TO_PATH) + +# Fix paths in pc file. +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gdk-pixbuf-2.0.pc") +if(EXISTS "${_file}") + file(READ "${_file}" _contents) + string(REPLACE [[${bindir}]] "\${bindir}/../../tools/${PORT}" _contents "${_contents}") + string(REPLACE [[gdk_pixbuf_binarydir=${libdir}/gdk-pixbuf-2.0/2.10.0]] "gdk_pixbuf_binarydir=\${libdir}/../gdk-pixbuf-2.0/2.10.0" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") +endif() +set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gdk-pixbuf-2.0.pc") +if(EXISTS "${_file}") + file(READ "${_file}" _contents) + string(REPLACE [[${bindir}]] "\${bindir}/../tools/${PORT}" _contents "${_contents}") + string(REPLACE [[gdk_pixbuf_binarydir=${libdir}/gdk-pixbuf-2.0/2.10.0]] "gdk_pixbuf_binarydir=\${libdir}/../gdk-pixbuf-2.0/2.10.0" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") +endif() + +vcpkg_fixup_pkgconfig() + +set(TOOL_NAMES gdk-pixbuf-csource gdk-pixbuf-pixdata gdk-pixbuf-query-loaders gdk-pixbuf-thumbnailer) + +if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm" AND VCPKG_TARGET_IS_WINDOWS) + list(REMOVE_ITEM TOOL_NAMES gdk-pixbuf-thumbnailer) +endif() + +vcpkg_copy_pdbs() +vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/externals/vcpkg/ports/gdk-pixbuf/vcpkg.json b/externals/vcpkg/ports/gdk-pixbuf/vcpkg.json new file mode 100755 index 000000000..8151baa5f --- /dev/null +++ b/externals/vcpkg/ports/gdk-pixbuf/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "gdk-pixbuf", + "version": "2.42.8", + "port-version": 2, + "description": "Image loading library.", + "homepage": "https://gitlab.gnome.org/GNOME/gdk-pixbuf", + "license": "LGPL-2.1-only", + "dependencies": [ + "gettext", + "glib", + { + "name": "glib", + "host": true + }, + "libpng", + "tiff", + { + "name": "vcpkg-tool-meson", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/gemmlowp/portfile.cmake b/externals/vcpkg/ports/gemmlowp/portfile.cmake new file mode 100755 index 000000000..7a58537f6 --- /dev/null +++ b/externals/vcpkg/ports/gemmlowp/portfile.cmake @@ -0,0 +1,22 @@ +if(NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/gemmlowp + REF daf630d3d0c439dbe22229838a5ba1bc5f82908d + SHA512 8d1a422bbf2495dcec1c30147bc96d0a2ca494220a45050937f84567c3352cd8916f07d1bbab68c8d36ae7ce3e9b8bee8b518900e21967a3185bf7ff25812785 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/contrib" + OPTIONS + -DBUILD_TESTING=OFF +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/externals/vcpkg/ports/gemmlowp/vcpkg.json b/externals/vcpkg/ports/gemmlowp/vcpkg.json new file mode 100755 index 000000000..329fa1101 --- /dev/null +++ b/externals/vcpkg/ports/gemmlowp/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "gemmlowp", + "version-date": "2021-09-28", + "description": "Low-precision matrix multiplication", + "homepage": "https://github.com/google/gemmlowp", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/genann/CMakeLists.txt b/externals/vcpkg/ports/genann/CMakeLists.txt new file mode 100755 index 000000000..80b7ab9bf --- /dev/null +++ b/externals/vcpkg/ports/genann/CMakeLists.txt @@ -0,0 +1,25 @@ +cmake_minimum_required(VERSION 3.11) +project(genann) + +set(SRC_FILES +genann.c +) + +add_library(genann ${SRC_FILES}) + +target_include_directories(genann PUBLIC + $ + $ +) + +# Install targets +install(TARGETS genann + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +# Install headers +if (INSTALL_HEADERS) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/genann.h DESTINATION include/genann) +endif() \ No newline at end of file diff --git a/externals/vcpkg/ports/genann/portfile.cmake b/externals/vcpkg/ports/genann/portfile.cmake new file mode 100755 index 000000000..56bcd4aee --- /dev/null +++ b/externals/vcpkg/ports/genann/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO codeplea/genann + REF 122243f9449b3e33a4e11450b70c10576d4559d7 + SHA512 d70cb8bc678d80ed3e790866f6060850cf9309eefe90d3ca4d77e28538639a927333d49c4d1af3e81123b8e88224f2f51b74ec41ca22639a276359568652ed15 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_RELEASE -DINSTALL_HEADERS=ON + OPTIONS_DEBUG -DINSTALL_HEADERS=OFF +) + +vcpkg_install_cmake() + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/genann) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/genann/LICENSE ${CURRENT_PACKAGES_DIR}/share/genann/copyright) + diff --git a/externals/vcpkg/ports/genann/vcpkg.json b/externals/vcpkg/ports/genann/vcpkg.json new file mode 100755 index 000000000..7e9de8815 --- /dev/null +++ b/externals/vcpkg/ports/genann/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "genann", + "version-string": "2019-07-10", + "port-version": 1, + "description": "Genann is a minimal, well-tested library for training and using feedforward artificial neural networks (ANN) in C.", + "homepage": "https://github.com/codeplea/genann" +} diff --git a/externals/vcpkg/ports/geogram/Config.cmake.in b/externals/vcpkg/ports/geogram/Config.cmake.in new file mode 100755 index 000000000..72808723e --- /dev/null +++ b/externals/vcpkg/ports/geogram/Config.cmake.in @@ -0,0 +1,4 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake") +check_required_components("@PROJECT_NAME@") \ No newline at end of file diff --git a/externals/vcpkg/ports/geogram/fix-vcpkg-install.patch b/externals/vcpkg/ports/geogram/fix-vcpkg-install.patch new file mode 100755 index 000000000..e859b7890 --- /dev/null +++ b/externals/vcpkg/ports/geogram/fix-vcpkg-install.patch @@ -0,0 +1,211 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8713b2f..0e034fa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,7 +51,7 @@ set(VORPALINE_VERSION_MINOR 7) + set(VORPALINE_VERSION_PATCH 6) + set(VORPALINE_VERSION ${VORPALINE_VERSION_MAJOR}.${VORPALINE_VERSION_MINOR}.${VORPALINE_VERSION_PATCH}) + +-set(VORPALINE_INCLUDE_SUBPATH geogram${VORPALINE_VERSION_MAJOR}) ++set(VORPALINE_INCLUDE_SUBPATH ./) + + # Determine the current Build-OS (Build-platform without the compiler info) + string(REGEX REPLACE "-[^-]+$" "" VORPALINE_OS ${VORPALINE_PLATFORM}) +@@ -116,6 +116,7 @@ endif() + add_subdirectory(src/lib/third_party) + + if(GEOGRAM_WITH_GRAPHICS) ++ find_package(GLFW3 REQUIRED) + add_subdirectory(src/lib/geogram_gfx) + endif() + +@@ -146,7 +147,44 @@ file(REMOVE ${CMAKE_BINARY_DIR}/doc/LICENSE.txt) + + # FindGeogram.cmake + +-install(FILES cmake/FindGeogram.cmake DESTINATION lib/cmake/modules COMPONENT devkit) ++# This installation is not suitable for vcpkg ++# install(FILES cmake/FindGeogram.cmake DESTINATION lib/cmake/modules COMPONENT devkit) ++ ++set(config_install_dir "share/geogram") ++set(include_install_dir "include") ++set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") ++ ++# Configuration ++set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake") ++set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake") ++set(targets_export_name "${PROJECT_NAME}Targets") ++set(namespace "${PROJECT_NAME}::") ++ ++# Include module with fuction 'write_basic_package_version_file' ++include(CMakePackageConfigHelpers) ++ ++write_basic_package_version_file( ++ "${version_config}" COMPATIBILITY SameMajorVersion VERSION ${VORPALINE_VERSION} ++) ++ ++configure_package_config_file( ++ "cmake/Config.cmake.in" ++ "${project_config}" ++ INSTALL_DESTINATION "${config_install_dir}" ++) ++ ++# Config ++install( ++ FILES "${project_config}" "${version_config}" ++ DESTINATION "${config_install_dir}" ++) ++ ++# Config ++install( ++ EXPORT "${targets_export_name}" ++ NAMESPACE "${namespace}" ++ DESTINATION "${config_install_dir}" ++) + + # Configure CPack + +diff --git a/src/lib/geogram/CMakeLists.txt b/src/lib/geogram/CMakeLists.txt +index 49cb2ba..8985137 100644 +--- a/src/lib/geogram/CMakeLists.txt ++++ b/src/lib/geogram/CMakeLists.txt +@@ -61,8 +61,19 @@ if(WIN32) + target_link_libraries(geogram psapi) + endif() + ++if(WIN32 AND VORPALINE_BUILD_DYNAMIC) ++ target_compile_definitions(geogram PUBLIC GEO_DYNAMIC_LIBS) ++endif() ++ + # Install the library +-install_devkit_targets(geogram) ++install( ++ TARGETS geogram ++ EXPORT "${PROJECT_NAME}Targets" ++ LIBRARY DESTINATION "lib" ++ ARCHIVE DESTINATION "lib" ++ RUNTIME DESTINATION "bin" ++ INCLUDES DESTINATION "include" ++) + + # Install include files for the standard devkit + install( +diff --git a/src/lib/geogram_gfx/CMakeLists.txt b/src/lib/geogram_gfx/CMakeLists.txt +index b155975..ad66440 100644 +--- a/src/lib/geogram_gfx/CMakeLists.txt ++++ b/src/lib/geogram_gfx/CMakeLists.txt +@@ -47,14 +47,21 @@ if(VORPALINE_BUILD_DYNAMIC) + endif() + + # Install the library +-install_devkit_targets(geogram_gfx) ++install( ++ TARGETS geogram_gfx ++ EXPORT "${PROJECT_NAME}Targets" ++ LIBRARY DESTINATION "lib" ++ ARCHIVE DESTINATION "lib" ++ RUNTIME DESTINATION "bin" ++ INCLUDES DESTINATION "include" ++) + + # Install include files for the standard devkit + install( + DIRECTORY . + DESTINATION include/${VORPALINE_INCLUDE_SUBPATH}/geogram_gfx + COMPONENT devkit +- FILES_MATCHING PATTERN *.h ++ FILES_MATCHING PATTERN *.h PATTERN *.xpm # xpm is the colrbar file + ) + + # Install include files for the full devkit +@@ -62,7 +69,7 @@ install( + DIRECTORY . + DESTINATION include/${VORPALINE_INCLUDE_SUBPATH}/geogram_gfx + COMPONENT devkit-full +- FILES_MATCHING PATTERN *.h ++ FILES_MATCHING PATTERN *.h PATTERN *.xpm # xpm is the colrbar file + ) + + install( +diff --git a/src/lib/third_party/numerics/CMakeLists.txt b/src/lib/third_party/numerics/CMakeLists.txt +index 8fd39b0..46d5cc6 100644 +--- a/src/lib/third_party/numerics/CMakeLists.txt ++++ b/src/lib/third_party/numerics/CMakeLists.txt +@@ -10,17 +10,19 @@ endif() + + include_directories(${GEOGRAM_SOURCE_DIR}/src/lib/third_party/numerics/INCLUDE) + +-aux_source_directories(SOURCES "Source Files" .) ++set(LAPACK_lapack_WORKS TRUE) ++find_package(BLAS REQUIRED) ++find_package(LAPACK REQUIRED) ++ aux_source_directories(SOURCES "Source Files" .) + aux_source_directories(SOURCES "Source Files\\LIBF2C" LIBF2C) +-aux_source_directories(SOURCES "Source Files\\CBLAS" CBLAS) +-aux_source_directories(SOURCES "Source Files\\CLAPACK" CLAPACK) + aux_source_directories(SOURCES "Source Files\\SUPERLU" SUPERLU) + aux_source_directories(SOURCES "Source Files\\ARPACK" ARPACK) + aux_source_directories(SOURCES "Source Files\\ARPACK_UTIL" ARPACK_UTIL) + + add_library(geogram_num_3rdparty ${SOURCES}) + +-if(UNIX) ++target_link_libraries(geogram_num_3rdparty ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES}) ++ if(UNIX) + target_link_libraries(geogram_num_3rdparty m) + endif() + +diff --git a/src/lib/third_party/numerics/LIBF2C/getarg_.c b/src/lib/third_party/numerics/LIBF2C/getarg_.c +index 2b69a1e..a504538 100644 +--- a/src/lib/third_party/numerics/LIBF2C/getarg_.c ++++ b/src/lib/third_party/numerics/LIBF2C/getarg_.c +@@ -17,20 +17,20 @@ VOID getarg_(n, s, ls) ftnint *n; char *s; ftnlen ls; + void getarg_(ftnint *n, char *s, ftnlen ls) + #endif + { +- extern int xargc; +- extern char **xargv; +- Const char *t; +- int i; ++ // extern int xargc; ++ // extern char **xargv; ++ // Const char *t; ++ // int i; + +- if(*n>=0 && *n=0 && *n,$>:-ffp-contract=off>" + "$<$:-ffp-contract=off>" +- "$<$:/fp:precise>" ++ $<$:/fp:precise /wd4996> + ) + + # Use -ffloat-store for 32-bit builds (needed to make some tests pass) diff --git a/externals/vcpkg/ports/geos/fix-exported-config.patch b/externals/vcpkg/ports/geos/fix-exported-config.patch new file mode 100755 index 000000000..40aa835e0 --- /dev/null +++ b/externals/vcpkg/ports/geos/fix-exported-config.patch @@ -0,0 +1,76 @@ +diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt +index bc0e774..e3ca0bd 100644 +--- a/tools/CMakeLists.txt ++++ b/tools/CMakeLists.txt +@@ -45,11 +45,18 @@ function(configure_install_geos_pc) + set(includedir "$\{prefix\}/${CMAKE_INSTALL_INCLUDEDIR}") + set(libdir "$\{exec_prefix\}/${CMAKE_INSTALL_LIBDIR}") + set(VERSION ${GEOS_VERSION}) +- set(EXTRA_LIBS "-lstdc++") ++ if(APPLE OR CMAKE_ANDROID_STL_TYPE MATCHES "^c\\+\\+") ++ set(EXTRA_LIBS "-lc++") ++ elseif(UNIX OR MINGW) ++ set(EXTRA_LIBS "-lstdc++") ++ else() ++ set(EXTRA_LIBS "") ++ endif() + if(HAVE_LIBM) + list(APPEND EXTRA_LIBS "-lm") + endif() + list(JOIN EXTRA_LIBS " " EXTRA_LIBS) ++ set(EXTRA_LIBS "${EXTRA_LIBS}" PARENT_SCOPE) # for geos-config + + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/geos.pc.in +@@ -61,9 +68,9 @@ function(configure_install_geos_pc) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endfunction() + ++configure_install_geos_pc() + if(NOT MSVC) + configure_install_geos_config() +- configure_install_geos_pc() + endif() + + option(BUILD_ASTYLE "Build astyle (Artistic Style) tool" OFF) +diff --git a/tools/geos-config.in b/tools/geos-config.in +index 6eff1eb..8827f6a 100644 +--- a/tools/geos-config.in ++++ b/tools/geos-config.in +@@ -1,9 +1,11 @@ + #!/bin/sh + +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-includedir=@includedir@ +-libdir=@libdir@ ++DIRNAME=$(dirname $0) ++TOOLS=$(dirname $DIRNAME) ++prefix=$(CDPATH= cd -- "${DIRNAME%/tools/geos/*}" && pwd -P) ++exec_prefix=${prefix} ++includedir=${prefix}/include ++libdir=${prefix}${TOOLS##*/geos}/lib + + usage() + { +@@ -47,16 +49,16 @@ while test $# -gt 0; do + echo -L${libdir} -lgeos-@VERSION_RELEASE@ + ;; + --clibs) +- echo -L${libdir} -lgeos_c ++ echo -L${libdir} -lgeos_c $(if test "@BUILD_SHARED_LIBS@" != "ON"; then echo "-lgeos @EXTRA_LIBS@"; fi) + ;; + --cclibs) +- echo -L${libdir} -lgeos ++ echo -L${libdir} -lgeos $(if test "@BUILD_SHARED_LIBS@" != "ON"; then echo "@EXTRA_LIBS@"; fi) + ;; + --static-clibs) +- echo -L${libdir} -lgeos_c -lgeos -lm ++ echo -L${libdir} -lgeos_c -lgeos @EXTRA_LIBS@ + ;; + --static-cclibs) +- echo -L${libdir} -lgeos -lm ++ echo -L${libdir} -lgeos @EXTRA_LIBS@ + ;; + --cflags) + echo -I${includedir} diff --git a/externals/vcpkg/ports/geos/portfile.cmake b/externals/vcpkg/ports/geos/portfile.cmake new file mode 100755 index 000000000..6118fcf62 --- /dev/null +++ b/externals/vcpkg/ports/geos/portfile.cmake @@ -0,0 +1,63 @@ +set(GEOS_VERSION 3.10.2) + +vcpkg_download_distfile(ARCHIVE + URLS "https://download.osgeo.org/geos/geos-${GEOS_VERSION}.tar.bz2" + FILENAME "geos-${GEOS_VERSION}.tar.bz2" + SHA512 390381711ccf56b862c2736cf6329200822f121de1c49df52b8b85cabea8c7787b199df2196acacc2e5c677ff3ebe042d93d70e89deadbc19d754499edb65126 +) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF "${GEOS_VERSION}" + PATCHES + disable-warning-4996.patch + fix-exported-config.patch +) + +vcpkg_list(SET EXTRA_OPTIONS) +if(VCPKG_TARGET_IS_MINGW) + vcpkg_list(APPEND EXTRA_OPTIONS "-DDISABLE_GEOS_INLINE=ON") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_ASTYLE=OFF + -DBUILD_DOCUMENTATION=OFF + -DBUILD_GEOSOP=OFF + -DBUILD_TESTING=OFF + -DBUILD_BENCHMARKS=OFF + ${EXTRA_OPTIONS} +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/GEOS) +vcpkg_fixup_pkgconfig() + +if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/geos-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/geos-config") + file(CHMOD "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/geos-config" FILE_PERMISSIONS + OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + ) + if(NOT VCPKG_BUILD_TYPE) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/geos-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/geos-config") + file(CHMOD "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/geos-config" FILE_PERMISSIONS + OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + ) + endif() +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +vcpkg_copy_pdbs() + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/geos/usage b/externals/vcpkg/ports/geos/usage new file mode 100755 index 000000000..139e40dd2 --- /dev/null +++ b/externals/vcpkg/ports/geos/usage @@ -0,0 +1,10 @@ +The package geos provides CMake targets: + + # C API (provides long-term ABI stability) + find_package(GEOS CONFIG REQUIRED) + target_link_libraries(main PRIVATE GEOS::geos_c) + + # C++ API (will likely change across versions) + find_package(GEOS CONFIG REQUIRED) + target_link_libraries(main PRIVATE GEOS::geos) + diff --git a/externals/vcpkg/ports/geos/vcpkg.json b/externals/vcpkg/ports/geos/vcpkg.json new file mode 100755 index 000000000..826736d01 --- /dev/null +++ b/externals/vcpkg/ports/geos/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "geos", + "version": "3.10.2", + "description": "Geometry Engine Open Source", + "homepage": "https://libgeos.org/", + "license": "LGPL-2.1-only", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/geotrans/CMakeLists.txt b/externals/vcpkg/ports/geotrans/CMakeLists.txt new file mode 100755 index 000000000..f2deeda14 --- /dev/null +++ b/externals/vcpkg/ports/geotrans/CMakeLists.txt @@ -0,0 +1,151 @@ +cmake_minimum_required(VERSION 3.10) +project(geotrans CXX) + +file(GLOB_RECURSE DTCC_CPP CCS/src/dtcc/*.cpp) +include_directories( +CCS/src/CoordinateConversion +CCS/src/dtcc +CCS/src/dtcc/CoordinateSystemParameters +CCS/src/dtcc/CoordinateSystems +CCS/src/dtcc/CoordinateSystems/albers +CCS/src/dtcc/CoordinateSystems/azeq +CCS/src/dtcc/CoordinateSystems/bng +CCS/src/dtcc/CoordinateSystems/bonne +CCS/src/dtcc/CoordinateSystems/cassini +CCS/src/dtcc/CoordinateSystems/cyleqa +CCS/src/dtcc/CoordinateSystems/datum +CCS/src/dtcc/CoordinateSystems/eckert4 +CCS/src/dtcc/CoordinateSystems/eckert6 +CCS/src/dtcc/CoordinateSystems/ellipse +CCS/src/dtcc/CoordinateSystems/eqdcyl +CCS/src/dtcc/CoordinateSystems/gars +CCS/src/dtcc/CoordinateSystems/geocent +CCS/src/dtcc/CoordinateSystems/georef +CCS/src/dtcc/CoordinateSystems/gnomonic +CCS/src/dtcc/CoordinateSystems/grinten +CCS/src/dtcc/CoordinateSystems/lambert +CCS/src/dtcc/CoordinateSystems/loccart +CCS/src/dtcc/CoordinateSystems/locspher +CCS/src/dtcc/CoordinateSystems/mercator +CCS/src/dtcc/CoordinateSystems/mgrs +CCS/src/dtcc/CoordinateSystems/miller +CCS/src/dtcc/CoordinateSystems/misc +CCS/src/dtcc/CoordinateSystems/mollweid +CCS/src/dtcc/CoordinateSystems/neys +CCS/src/dtcc/CoordinateSystems/nzmg +CCS/src/dtcc/CoordinateSystems/omerc +CCS/src/dtcc/CoordinateSystems/orthogr +CCS/src/dtcc/CoordinateSystems/polarst +CCS/src/dtcc/CoordinateSystems/polycon +CCS/src/dtcc/CoordinateSystems/sinusoid +CCS/src/dtcc/CoordinateSystems/spherical +CCS/src/dtcc/CoordinateSystems/stereogr +CCS/src/dtcc/CoordinateSystems/threads +CCS/src/dtcc/CoordinateSystems/tranmerc +CCS/src/dtcc/CoordinateSystems/trcyleqa +CCS/src/dtcc/CoordinateSystems/ups +CCS/src/dtcc/CoordinateSystems/usng +CCS/src/dtcc/CoordinateSystems/utm +CCS/src/dtcc/CoordinateSystems/webmerc +CCS/src/dtcc/CoordinateTuples +CCS/src/dtcc/Enumerations +CCS/src/dtcc/Exception +) +set(DTCC_INCLUDES +include/CoordinateConversion +include/dtcc/ +include/dtcc/CoordinateSystemParameters +include/dtcc/CoordinateSystems +include/dtcc/CoordinateSystems/albers +include/dtcc/CoordinateSystems/azeq +include/dtcc/CoordinateSystems/bng +include/dtcc/CoordinateSystems/bonne +include/dtcc/CoordinateSystems/cassini +include/dtcc/CoordinateSystems/cyleqa +include/dtcc/CoordinateSystems/datum +include/dtcc/CoordinateSystems/eckert4 +include/dtcc/CoordinateSystems/eckert6 +include/dtcc/CoordinateSystems/ellipse +include/dtcc/CoordinateSystems/eqdcyl +include/dtcc/CoordinateSystems/gars +include/dtcc/CoordinateSystems/geocent +include/dtcc/CoordinateSystems/georef +include/dtcc/CoordinateSystems/gnomonic +include/dtcc/CoordinateSystems/grinten +include/dtcc/CoordinateSystems/lambert +include/dtcc/CoordinateSystems/loccart +include/dtcc/CoordinateSystems/locspher +include/dtcc/CoordinateSystems/mercator +include/dtcc/CoordinateSystems/mgrs +include/dtcc/CoordinateSystems/miller +include/dtcc/CoordinateSystems/misc +include/dtcc/CoordinateSystems/mollweid +include/dtcc/CoordinateSystems/neys +include/dtcc/CoordinateSystems/nzmg +include/dtcc/CoordinateSystems/omerc +include/dtcc/CoordinateSystems/orthogr +include/dtcc/CoordinateSystems/polarst +include/dtcc/CoordinateSystems/polycon +include/dtcc/CoordinateSystems/sinusoid +include/dtcc/CoordinateSystems/spherical +include/dtcc/CoordinateSystems/stereogr +include/dtcc/CoordinateSystems/threads +include/dtcc/CoordinateSystems/tranmerc +include/dtcc/CoordinateSystems/trcyleqa +include/dtcc/CoordinateSystems/ups +include/dtcc/CoordinateSystems/usng +include/dtcc/CoordinateSystems/utm +include/dtcc/CoordinateSystems/webmerc +include/dtcc/CoordinateTuples +include/dtcc/Enumerations +include/dtcc/Exception +) + +if(WIN32) + add_definitions(-DLITTLE_ENDIAN) +endif() + +add_library(MSPdtcc ${DTCC_CPP}) +add_library(MSPCoordinateConversionService CCS/src/CoordinateConversion/CoordinateConversionService.cpp ${DTCC_CPP}) + +target_include_directories(MSPdtcc INTERFACE "$") +target_include_directories(MSPCoordinateConversionService INTERFACE $) + +if(WIN32) + if (BUILD_SHARED_LIBS) + add_definitions( + -DMSP_CCS_EXPORTS + -D_USRDLL + ) + endif() + add_definitions(-D_CRT_SECURE_NO_WARNINGS) +else() + find_package(Threads REQUIRED) + target_link_libraries(MSPdtcc PRIVATE Threads::Threads ${CMAKE_DL_LIBS}) +endif() + + +install( + TARGETS MSPdtcc + EXPORT geotrans + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install( + TARGETS MSPCoordinateConversionService + EXPORT geotrans + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(DIRECTORY "${CMAKE_SOURCE_DIR}/CCS/src/" + DESTINATION "include" + CONFIGURATIONS Release + FILES_MATCHING + PATTERN "*.h" +) + +install(EXPORT geotrans NAMESPACE geotrans:: DESTINATION share/geotrans CONFIGURATIONS Release) diff --git a/externals/vcpkg/ports/geotrans/geotrans-config.in.cmake b/externals/vcpkg/ports/geotrans/geotrans-config.in.cmake new file mode 100755 index 000000000..f25224c0b --- /dev/null +++ b/externals/vcpkg/ports/geotrans/geotrans-config.in.cmake @@ -0,0 +1,7 @@ + +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32) + include(CMakeFindDependencyMacro) + find_dependency(Threads) +endif() + +include(${CMAKE_CURRENT_LIST_DIR}/geotrans.cmake) diff --git a/externals/vcpkg/ports/geotrans/portfile.cmake b/externals/vcpkg/ports/geotrans/portfile.cmake new file mode 100755 index 000000000..6b56785bc --- /dev/null +++ b/externals/vcpkg/ports/geotrans/portfile.cmake @@ -0,0 +1,37 @@ +set(VCPKG_LIBRARY_LINKAGE "dynamic") + +# We specify the Linux URL, but the only difference between the Windows/Linux packages are the included libraries +# which we re-build anyway. There is no source only package provided or it would be preferred (and smaller). +vcpkg_download_distfile(ARCHIVE + URLS "https://earth-info.nga.mil/php/download.php?file=wgs-mastertgz" + FILENAME "geotrans-3.8-master.tgz" + SHA512 359704ee9700762111006d126872feab9f644af0cebd433a657473347ea48f4eb172681f5f564fbca171bbf58fe0e8fb0829597403958770b7d22ad380afeac3 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +configure_file( + ${CMAKE_CURRENT_LIST_DIR}/geotrans-config.in.cmake + ${CURRENT_PACKAGES_DIR}/share/${PORT}/geotrans-config.cmake + @ONLY +) + +configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT} @ONLY) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/GEOTRANS3/docs/MSP_Geotrans_Terms_Of_Use.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +# Install the geo model data +file(COPY ${SOURCE_PATH}/data DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) \ No newline at end of file diff --git a/externals/vcpkg/ports/geotrans/usage b/externals/vcpkg/ports/geotrans/usage new file mode 100755 index 000000000..83430e426 --- /dev/null +++ b/externals/vcpkg/ports/geotrans/usage @@ -0,0 +1,11 @@ +The package geotrans provides CMake targets: + + find_package(geotrans CONFIG REQUIRED) + target_link_libraries(main PRIVATE geotrans::MSPdtcc geotrans::MSPCoordinateConversionService) + + +The geotrans library depends on being able to read it's model data so you'll need to +set an environment variable to let geotrans know where the models are installed: + +export MSPCCS_DATA=@CURRENT_INSTALLED_DIR@/share/@PORT@/data + diff --git a/externals/vcpkg/ports/geotrans/vcpkg.json b/externals/vcpkg/ports/geotrans/vcpkg.json new file mode 100755 index 000000000..ba21e7c05 --- /dev/null +++ b/externals/vcpkg/ports/geotrans/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "geotrans", + "version": "3.8", + "port-version": 1, + "description": "GEOTRANS is an application that allows you to convert geographic coordinates among a wide variety of coordinate systems, map projections, grids, and datums. GEOTRANS runs in Microsoft Windows and LINUX environments.", + "homepage": "https://earth-info.nga.mil/GandG/update/index.php?action=home", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/getdns/disable-docs.patch b/externals/vcpkg/ports/getdns/disable-docs.patch new file mode 100755 index 000000000..ffa7afa56 --- /dev/null +++ b/externals/vcpkg/ports/getdns/disable-docs.patch @@ -0,0 +1,42 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 413709da..d3dd03f0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1039,9 +1039,9 @@ configure_file(src/version.c.in version.c) + + set(version ${PACKAGE_VERSION}) + set(date ${API_VERSION}) +-file(GLOB mans doc/*.3.in) +-file(MAKE_DIRECTORY man3) +-foreach (man ${mans}) ++#file(GLOB mans doc/*.3.in) ++#file(MAKE_DIRECTORY man3) ++if (FALSE) + get_filename_component(out ${man} NAME_WE) + configure_file(${man} man3/${out}.3 @ONLY) + +@@ -1061,7 +1061,7 @@ foreach (man ${mans}) + configure_file(${man} man3/${alt}.3 @ONLY) + endif () + endforeach() +-endforeach() ++endif() + + set(prefix ${CMAKE_INSTALL_PREFIX}) + configure_file(getdns.pc.in getdns.pc @ONLY) +@@ -1099,11 +1099,11 @@ if (BUILD_GETDNS_SERVER_MON) + endif () + + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/getdns DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION share/man) ++#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION share/man) + +-set(docdir share/doc/getdns) +-install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir}) +-install(FILES spec/index.html DESTINATION ${docdir}/spec) ++#set(docdir share/doc/getdns) ++#install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir}) ++#install(FILES spec/index.html DESTINATION ${docdir}/spec) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/getdns.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + install(CODE "message(\"\ diff --git a/externals/vcpkg/ports/getdns/portfile.cmake b/externals/vcpkg/ports/getdns/portfile.cmake new file mode 100755 index 000000000..07a11fe80 --- /dev/null +++ b/externals/vcpkg/ports/getdns/portfile.cmake @@ -0,0 +1,52 @@ +set(GETDNS_VERSION 1.7.0) +set(GETDNS_HASH d09b8bdd0b4a3df2d25b9689166226da83a5a7eb2c7436487dc637539ac6077624a4d66cf684c4e6c4911561872c6bd191af3afd90d275b1662e4c6c47773ef6) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" GETDNS_ENABLE_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" GETDNS_ENABLE_SHARED) + +vcpkg_download_distfile(ARCHIVE + URLS "https://getdnsapi.net/dist/getdns-${GETDNS_VERSION}.tar.gz" + FILENAME "getdns-${GETDNS_VERSION}.tar.gz" + SHA512 ${GETDNS_HASH} +) + +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES disable-docs.patch +) + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(VCPKG_CXX_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_CXX_FLAGS}") + set(VCPKG_C_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_C_FLAGS}") +endif() + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + libevent BUILD_LIBEVENT2 + libuv BUILD_LIBUV +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DBUILD_GETDNS_QUERY=OFF + -DBUILD_GETDNS_SERVER_MON=OFF + -DENABLE_STATIC=${GETDNS_ENABLE_STATIC} + -DENABLE_SHARED=${GETDNS_ENABLE_SHARED} + ${FEATURE_OPTIONS} + -DBUILD_TESTING=OFF + -DENABLE_STUB_ONLY=ON #if setting ON, it will require libunbound to build on Unix platform. +) +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/getdns/vcpkg.json b/externals/vcpkg/ports/getdns/vcpkg.json new file mode 100755 index 000000000..98b9d3304 --- /dev/null +++ b/externals/vcpkg/ports/getdns/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "getdns", + "version": "1.7.0", + "port-version": 3, + "description": "GetDNS is a modern asynchronous DNS API", + "homepage": "https://getdnsapi.net/", + "license": "BSD-3-Clause", + "supports": "!uwp", + "dependencies": [ + "libidn2", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "libevent": { + "description": "libevent event loop integration", + "dependencies": [ + "libevent" + ] + }, + "libuv": { + "description": "libuv event loop integration", + "dependencies": [ + "libuv" + ] + } + } +} diff --git a/externals/vcpkg/ports/getopt-win32/CMakeLists.txt b/externals/vcpkg/ports/getopt-win32/CMakeLists.txt new file mode 100755 index 000000000..ffa02c808 --- /dev/null +++ b/externals/vcpkg/ports/getopt-win32/CMakeLists.txt @@ -0,0 +1,11 @@ +cmake_minimum_required(VERSION 3.14) + +project(getopt-win32 C) + +if(BUILD_SHARED_LIBS) + add_definitions(-DEXPORTS_GETOPT) +else() + add_definitions(-DSTATIC_GETOPT) +endif() +add_library(getopt getopt.c) +install(TARGETS getopt) diff --git a/externals/vcpkg/ports/getopt-win32/getopt.h.patch b/externals/vcpkg/ports/getopt-win32/getopt.h.patch new file mode 100755 index 000000000..58435f481 --- /dev/null +++ b/externals/vcpkg/ports/getopt-win32/getopt.h.patch @@ -0,0 +1,50 @@ +commit 81c35ed14e07138e44b5b30f52fbc2bb26ae1fed +Author: Max Khon +Date: Mon Jan 24 23:05:24 2022 +0700 + + Rename "extern C" macros as MS VC C++ headers use _END_EXTERN_C macro + +diff --git a/getopt.h b/getopt.h +index 5ed4a46..5e33682 100644 +--- a/getopt.h ++++ b/getopt.h +@@ -57,12 +57,12 @@ EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + + // Change behavior for C\C++ + #ifdef __cplusplus +- #define _BEGIN_EXTERN_C extern "C" { +- #define _END_EXTERN_C } ++ #define _GETOPT_BEGIN_EXTERN_C extern "C" { ++ #define _GETOPT_END_EXTERN_C } + #define _GETOPT_THROW throw() + #else +- #define _BEGIN_EXTERN_C +- #define _END_EXTERN_C ++ #define _GETOPT_BEGIN_EXTERN_C ++ #define _GETOPT_END_EXTERN_C + #define _GETOPT_THROW + #endif + +@@ -81,7 +81,7 @@ EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + #include + #include + +-_BEGIN_EXTERN_C ++_GETOPT_BEGIN_EXTERN_C + + extern _GETOPT_API int optind; + extern _GETOPT_API int opterr; +@@ -113,10 +113,10 @@ _BEGIN_EXTERN_C + extern _GETOPT_API int getopt_long_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW; + extern _GETOPT_API int getopt_long_only_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW; + +-_END_EXTERN_C ++_GETOPT_END_EXTERN_C + +- #undef _BEGIN_EXTERN_C +- #undef _END_EXTERN_C ++ #undef _GETOPT_BEGIN_EXTERN_C ++ #undef _GETOPT_END_EXTERN_C + #undef _GETOPT_THROW + #undef _GETOPT_API + diff --git a/externals/vcpkg/ports/getopt-win32/portfile.cmake b/externals/vcpkg/ports/getopt-win32/portfile.cmake new file mode 100755 index 000000000..6528e442d --- /dev/null +++ b/externals/vcpkg/ports/getopt-win32/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libimobiledevice-win32/getopt + REF 0.1 + SHA512 40e2a901241a5d751cec741e5de423c8f19b105572c7cae18adb6e69be0b408efc6c9a2ecaeb62f117745eac0d093f30d6b91d88c1a27e1f7be91f0e84fdf199 + HEAD_REF master + PATCHES getopt.h.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() + +file(COPY "${SOURCE_PATH}/getopt.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/") +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/getopt.h" + " #define __GETOPT_H_" " #define __GETOPT_H_\n #define STATIC_GETOPT" + ) +endif() + +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) diff --git a/externals/vcpkg/ports/getopt-win32/vcpkg.json b/externals/vcpkg/ports/getopt-win32/vcpkg.json new file mode 100755 index 000000000..81213e0d4 --- /dev/null +++ b/externals/vcpkg/ports/getopt-win32/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "getopt-win32", + "version": "0.1", + "port-version": 4, + "description": "An implementation of getopt.", + "homepage": "https://github.com/libimobiledevice-win32/getopt", + "license": "LGPL-3.0-only", + "supports": "windows & !mingw", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/getopt/portfile.cmake b/externals/vcpkg/ports/getopt/portfile.cmake new file mode 100755 index 000000000..21d59ebcb --- /dev/null +++ b/externals/vcpkg/ports/getopt/portfile.cmake @@ -0,0 +1,5 @@ +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "No implementation of getopt is currently available for UWP targets") +endif() + +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/getopt/vcpkg.json b/externals/vcpkg/ports/getopt/vcpkg.json new file mode 100755 index 000000000..4626df727 --- /dev/null +++ b/externals/vcpkg/ports/getopt/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "getopt", + "version-string": "0", + "port-version": 2, + "description": "The getopt and getopt_long functions automate some of the chore involved in parsing typical unix command line options.", + "supports": "!uwp", + "dependencies": [ + { + "name": "getopt-win32", + "platform": "windows & !mingw" + } + ] +} diff --git a/externals/vcpkg/ports/gettext/0002-Fix-uwp-build.patch b/externals/vcpkg/ports/gettext/0002-Fix-uwp-build.patch new file mode 100755 index 000000000..ba98e2665 --- /dev/null +++ b/externals/vcpkg/ports/gettext/0002-Fix-uwp-build.patch @@ -0,0 +1,80 @@ +diff --git "a/gettext-runtime/intl/langprefs.c" "b/gettext-runtime/intl/langprefs.c" +index aeb1c4e9..2ac531be 100644 +--- "a/gettext-runtime/intl/langprefs.c" ++++ "b/gettext-runtime/intl/langprefs.c" +@@ -33,7 +33,13 @@ extern void _nl_locale_name_canonicalize (char *name); + #endif + + #if defined _WIN32 +-# define WIN32_NATIVE ++# if !defined(WINAPI_FAMILY) ++# define WIN32_NATIVE ++# else ++# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) ++# define WIN32_NATIVE ++# endif ++# endif + #endif + + #ifdef WIN32_NATIVE +diff --git "a/gettext-runtime/intl/localcharset.c" "b/gettext-runtime/intl/localcharset.c" +index 670b8e6c..035a96bd 100644 +--- "a/gettext-runtime/intl/localcharset.c" ++++ "b/gettext-runtime/intl/localcharset.c" +@@ -36,6 +36,16 @@ + # include + #endif + ++#if defined _WIN32 ++# if !defined(WINAPI_FAMILY) ++# define HAVE_ACP ++# else ++# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) ++# define HAVE_ACP ++# endif ++# endif ++#endif ++ + #if defined __EMX__ + /* Assume EMX program runs on OS/2, even if compiled under DOS. */ + # ifndef OS2 +@@ -830,7 +830,7 @@ STATIC + const char * + locale_charset (void) + { +- const char *codeset; ++ const char *codeset = NULL; + + /* This function must be multithread-safe. To achieve this without using + thread-local storage, we use a simple strcpy or memcpy to fill this static +@@ -912,7 +912,7 @@ locale_charset (void) + /* The canonical name cannot be determined. */ + codeset = ""; + +-# elif defined WINDOWS_NATIVE ++# elif defined WINDOWS_NATIVE && defined HAVE_ACP + + char buf[2 + 10 + 1]; + static char resultbuf[2 + 10 + 1]; +diff --git "a/gettext-runtime/intl/localename.c" "b/gettext-runtime/intl/localename.c" +index 108dd6f1..ace3aa88 100644 +--- "a/gettext-runtime/intl/localename.c" ++++ "b/gettext-runtime/intl/localename.c" +@@ -75,10 +75,16 @@ + #endif + + #if defined _WIN32 && !defined __CYGWIN__ +-# define WINDOWS_NATIVE ++# if !defined(WINAPI_FAMILY) ++# define WINDOWS_NATIVE ++# else ++# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) ++# define WINDOWS_NATIVE ++# endif ++# endif + # if !defined IN_LIBINTL + # include "glthread/lock.h" + # endif + #endif + + #if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */ diff --git a/externals/vcpkg/ports/gettext/0003-Fix-win-unicode-paths.patch b/externals/vcpkg/ports/gettext/0003-Fix-win-unicode-paths.patch new file mode 100755 index 000000000..d8e52719f --- /dev/null +++ b/externals/vcpkg/ports/gettext/0003-Fix-win-unicode-paths.patch @@ -0,0 +1,60 @@ +diff --git "a/gettext-runtime/intl/loadmsgcat.c" "b/gettext-runtime/intl/loadmsgcat.c" +index 63351523..c078de3f 100644 +--- a/gettext-runtime/intl/loadmsgcat.c ++++ b/gettext-runtime/intl/loadmsgcat.c +@@ -388,6 +388,55 @@ char *alloca (); + # define munmap(addr, len) __munmap (addr, len) + #endif + ++#ifdef _WIN32 ++/* Provide wrapper of "open" for Windows that supports UTF-8 filenames. */ ++# ifndef WIN32_LEAN_AND_MEAN ++# define WIN32_LEAN_AND_MEAN ++# endif ++# ifndef WIN32_EXTRA_LEAN ++# define WIN32_EXTRA_LEAN ++# endif ++# undef NOMINMAX ++# define NOMINMAX ++# include // For: MultiByteToWideChar ++# include ++# include ++ ++int _open_utf8_windows_wrapper( ++ const char *filename, ++ int flags ++) ++{ ++ int wstr_len = -1; ++ wchar_t* pUtf16FileName = NULL; ++ int fh = -1; ++ ++ // on Windows, convert the filename from UTF-8 to UTF-16 ++ wstr_len = MultiByteToWideChar(CP_UTF8, 0, filename, -1, NULL, 0); ++ if (wstr_len <= 0) ++ { ++ // MultiByteToWideChar failed ++ errno = ENOENT; ++ return -1; ++ } ++ pUtf16FileName = malloc(wstr_len * sizeof(wchar_t)); ++ if (MultiByteToWideChar(CP_UTF8, 0, filename, -1, pUtf16FileName, wstr_len) == 0) ++ { ++ // MultiByteToWideChar failed ++ free(pUtf16FileName); ++ errno = ENOENT; ++ return -1; ++ } ++ ++ // and call _wopen ++ fh = _wopen(pUtf16FileName, flags); ++ ++ free(pUtf16FileName); ++ return fh; ++} ++# define open(name, flags) _open_utf8_windows_wrapper(name, flags) ++#endif // #ifdef _WIN32 ++ + /* For those losing systems which don't have `alloca' we have to add + some additional code emulating it. */ + #ifdef HAVE_ALLOCA diff --git a/externals/vcpkg/ports/gettext/0004-Fix-uwp-tools-build.patch b/externals/vcpkg/ports/gettext/0004-Fix-uwp-tools-build.patch new file mode 100755 index 000000000..65dfce570 --- /dev/null +++ b/externals/vcpkg/ports/gettext/0004-Fix-uwp-tools-build.patch @@ -0,0 +1,116 @@ +--- a/gettext-runtime/gnulib-lib/fcntl.c 2022-01-11 11:11:28.406622100 +0700 ++++ b/gettext-runtime/gnulib-lib/fcntl.c 2022-01-11 11:11:03.406190800 +0700 +@@ -38,6 +38,10 @@ + # define WIN32_LEAN_AND_MEAN + # include + ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) ++#define HANDLE_FLAG_INHERIT 0 ++#endif ++ + /* Get _get_osfhandle. */ + # if GNULIB_MSVC_NOTHROW + # include "msvc-nothrow.h" +--- a/gettext-tools/gnulib-lib/fcntl.c 2022-01-11 11:11:28.406622100 +0700 ++++ b/gettext-tools/gnulib-lib/fcntl.c 2022-01-11 11:11:03.406190800 +0700 +@@ -38,6 +38,10 @@ + # define WIN32_LEAN_AND_MEAN + # include + ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) ++#define HANDLE_FLAG_INHERIT 0 ++#endif ++ + /* Get _get_osfhandle. */ + # if GNULIB_MSVC_NOTHROW + # include "msvc-nothrow.h" +--- a/gettext-tools/src/hostname.c 2022-01-12 01:41:13.725124300 +0700 ++++ b/gettext-tools/src/hostname.c 2022-01-12 01:47:39.384274300 +0700 +@@ -35,15 +35,15 @@ + /* Get gethostname(). */ + #include + ++#if !HAVE_GETHOSTNAME + #ifdef WIN32_NATIVE + /* Native Woe32 API lacks gethostname() but has GetComputerName() instead. */ + # include + #else + /* Some systems, like early Solaris versions, lack gethostname() but + have uname() instead. */ +-# if !HAVE_GETHOSTNAME +-# include +-# endif ++# include ++#endif + #endif + + /* Get MAXHOSTNAMELEN. */ +@@ -56,6 +56,9 @@ + + /* Support for using gethostbyname(). */ + #if HAVE_GETHOSTBYNAME ++#if HAVE_WINSOCK2_H ++# include ++#else + # include + # include /* defines AF_INET, AF_INET6 */ + # include /* declares ntohs(), defines struct sockaddr_in */ +@@ -77,6 +80,7 @@ + # endif + # include /* defines struct hostent, declares gethostbyname() */ + #endif ++#endif + + /* Include this after , to avoid a syntax error on BeOS. */ + #include +@@ -250,7 +254,7 @@ + static char * + xgethostname () + { +-#ifdef WIN32_NATIVE ++#ifdef WIN32_NATIVE && !HAVE_GETHOSTNAME + char hostname[MAX_COMPUTERNAME_LENGTH+1]; + DWORD size = sizeof (hostname); + +--- a/libtextstyle/lib/fcntl.c 2020-06-27 03:00:38.000000000 +0700 ++++ b/libtextstyle/lib/fcntl.c 2022-01-11 11:10:29.936269800 +0700 +@@ -38,6 +38,10 @@ + # define WIN32_LEAN_AND_MEAN + # include + ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) ++#define HANDLE_FLAG_INHERIT 0 ++#endif ++ + /* Get _get_osfhandle. */ + # if GNULIB_MSVC_NOTHROW + # include "msvc-nothrow.h" +--- a/libtextstyle/lib/isatty.c 2020-06-27 03:00:40.000000000 +0700 ++++ b/libtextstyle/lib/isatty.c 2022-01-11 11:19:04.852685700 +0700 +@@ -99,6 +99,7 @@ + BOOL result = FALSE; + ULONG processId; + ++#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_APP) + #if !(_WIN32_WINNT >= _WIN32_WINNT_VISTA) + if (!initialized) + initialize (); +@@ -137,6 +138,7 @@ + CloseHandle (processHandle); + } + } ++#endif // !WINAPI_FAMILY_APP + return result; + } + +--- a/libtextstyle/lib/unistd.in.h 2020-07-08 08:33:18.000000000 +0700 ++++ b/libtextstyle/lib/unistd.in.h 2022-01-11 22:11:46.402435600 +0700 +@@ -828,7 +828,7 @@ + Null terminate it if the name is shorter than LEN. + If the host name is longer than LEN, set errno = EINVAL and return -1. + Return 0 if successful, otherwise set errno and return -1. */ +-# if @UNISTD_H_HAVE_WINSOCK2_H@ ++# if !@HAVE_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef gethostname + # define gethostname rpl_gethostname diff --git a/externals/vcpkg/ports/gettext/Makefile b/externals/vcpkg/ports/gettext/Makefile new file mode 100755 index 000000000..b2b36d2ab --- /dev/null +++ b/externals/vcpkg/ports/gettext/Makefile @@ -0,0 +1,70 @@ +all: build-gettext-runtime-intl build-gettext-runtime-po build-gettext-runtime-src +all: build-gettext-tools build-gettext-tools-gnulib build-gettext-tools-its build-gettext-tools-m4 build-gettext-tools-misc build-gettext-tools-po build-gettext-tools-projects build-gettext-tools-styles +all: build-libtextstyle + +install: install-gettext-runtime-intl install-gettext-runtime-po install-gettext-runtime-src +install: install-gettext-tools install-gettext-tools-gnulib install-gettext-tools-its install-gettext-tools-m4 install-gettext-tools-misc install-gettext-tools-po install-gettext-tools-projects install-gettext-tools-styles +install: install-libtextstyle + +build-intl: + $(MAKE) -C intl all +install-intl: + $(MAKE) -C intl install + +build-gettext-runtime-gnulib: build-gettext-runtime-intl + $(MAKE) -C gettext-runtime/gnulib-lib all +build-gettext-runtime-intl: + $(MAKE) -C gettext-runtime/intl all +build-gettext-runtime-po: + $(MAKE) -C gettext-runtime/po all +build-gettext-runtime-src: build-gettext-runtime-intl build-gettext-runtime-gnulib + $(MAKE) -C gettext-runtime/src all +build-gettext-tools: build-gettext-runtime-intl build-libtextstyle build-gettext-tools-gnulib build-gettext-tools-intl build-gettext-tools-libgrep build-gnulib-local + $(MAKE) -C gettext-tools/src all +build-gettext-tools-gnulib: build-gettext-tools-intl + $(MAKE) -C gettext-tools/gnulib-lib all +build-gettext-tools-libgrep: build-gettext-tools-gnulib + $(MAKE) -C gettext-tools/libgrep all +build-gettext-tools-intl: + $(MAKE) -C gettext-tools/intl all +build-gettext-tools-its: + $(MAKE) -C gettext-tools/its all +build-gettext-tools-m4: + $(MAKE) -C gettext-tools/m4 all +build-gettext-tools-misc: + $(MAKE) -C gettext-tools/misc all +build-gettext-tools-po: + $(MAKE) -C gettext-tools/po all +build-gettext-tools-projects: + $(MAKE) -C gettext-tools/projects all +build-gettext-tools-styles: + $(MAKE) -C gettext-tools/styles all +build-gnulib-local: + $(MAKE) -C gnulib-local all +build-libtextstyle: + $(MAKE) -C libtextstyle/lib all + +install-gettext-runtime-intl: + $(MAKE) -C gettext-runtime/intl install +install-gettext-runtime-po: + $(MAKE) -C gettext-runtime/po install +install-gettext-runtime-src: + $(MAKE) -C gettext-runtime/src install +install-gettext-tools: + $(MAKE) -C gettext-tools/src install +install-gettext-tools-gnulib: + $(MAKE) -C gettext-tools/gnulib-lib install +install-gettext-tools-its: + $(MAKE) -C gettext-tools/its install +install-gettext-tools-m4: + $(MAKE) -C gettext-tools/m4 install +install-gettext-tools-misc: + $(MAKE) -C gettext-tools/misc install +install-gettext-tools-po: + $(MAKE) -C gettext-tools/po install +install-gettext-tools-projects: + $(MAKE) -C gettext-tools/projects install +install-gettext-tools-styles: + $(MAKE) -C gettext-tools/styles install +install-libtextstyle: + $(MAKE) -C libtextstyle/lib install diff --git a/externals/vcpkg/ports/gettext/android.patch b/externals/vcpkg/ports/gettext/android.patch new file mode 100755 index 000000000..6f2a7d43f --- /dev/null +++ b/externals/vcpkg/ports/gettext/android.patch @@ -0,0 +1,12 @@ +diff --color -ruN a/gettext-runtime/intl/dcigettext.c src/gettext-runtime/intl/dcigettext.c +--- a/gettext-runtime/intl/dcigettext.c 2021-05-26 16:27:55.420544597 +0200 ++++ src/gettext-runtime/intl/dcigettext.c 2021-05-26 16:29:14.546516701 +0200 +@@ -143,7 +143,7 @@ + # else + # if VMS + # define getcwd(buf, max) (getcwd) (buf, max, 0) +-# else ++# elif !(defined(__clang__) && defined(__BIONIC_FORTIFY)) + char *getcwd (); + # endif + # endif diff --git a/externals/vcpkg/ports/gettext/gettext-tools_woe32dll_gettextsrc-exports.c.patch b/externals/vcpkg/ports/gettext/gettext-tools_woe32dll_gettextsrc-exports.c.patch new file mode 100755 index 000000000..1eedbecd2 --- /dev/null +++ b/externals/vcpkg/ports/gettext/gettext-tools_woe32dll_gettextsrc-exports.c.patch @@ -0,0 +1,14 @@ +X-Git-Url: https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=blobdiff_plain;f=gettext-tools%2Fwoe32dll%2Fgettextsrc-exports.c;h=6d760895961db57e013552b6b3f248bfa8eb17c2;hp=4477ae8d4b2e887592d4019432b91ea31b84ba59;hb=7cf68dffb2adb76375bfb0781e277510523a1f3e;hpb=3564f5f885544514bd2e345c36b74e5d91cad3e8 + +diff --git a/gettext-tools/woe32dll/gettextsrc-exports.c b/gettext-tools/woe32dll/gettextsrc-exports.c +index 4477ae8..6d76089 100644 +--- a/gettext-tools/woe32dll/gettextsrc-exports.c ++++ b/gettext-tools/woe32dll/gettextsrc-exports.c +@@ -50,6 +50,7 @@ VARIABLE(formatstring_python) + VARIABLE(formatstring_python_brace) + VARIABLE(formatstring_qt) + VARIABLE(formatstring_qt_plural) ++VARIABLE(formatstring_ruby) + VARIABLE(formatstring_scheme) + VARIABLE(formatstring_sh) + VARIABLE(formatstring_smalltalk) diff --git a/externals/vcpkg/ports/gettext/install-autopoint.cmake b/externals/vcpkg/ports/gettext/install-autopoint.cmake new file mode 100755 index 000000000..45f806b4a --- /dev/null +++ b/externals/vcpkg/ports/gettext/install-autopoint.cmake @@ -0,0 +1,49 @@ +function(install_autopoint) + # variables for configuring autopoint.in + set(PACKAGE "gettext-tools") + set(VERSION "${GETTEXT_VERSION}") + set(ARCHIVE_VERSION "${GETTEXT_VERSION}") + set(ARCHIVE_FORMAT "dirgz") + set(bindir [[${prefix}/tools/gettext/bin]]) + set(datadir [[${datarootdir}]]) + set(exec_prefix [[${prefix}]]) + set(PATH_SEPARATOR ":") + set(RELOCATABLE "yes") + + file(STRINGS "${SOURCE_PATH}/gettext-tools/configure" + VERSIONS_FROM_CONFIGURE + REGEX "^ *(ARCHIVE_VERSION|VERSION)=.*$" + ) + foreach(LINE IN LISTS VERSIONS_FROM_CONFIGURE) + if(LINE MATCHES "^ *(ARCHIVE_VERSION|VERSION)='?([0-9.]+)'?$") + set(${CMAKE_MATCH_1} "${CMAKE_MATCH_2}") + endif() + endforeach() + + set(WORKING_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") + file(MAKE_DIRECTORY "${WORKING_DIR}") + + # autopoint script + configure_file("${SOURCE_PATH}/gettext-tools/misc/autopoint.in" "${WORKING_DIR}/autopoint" @ONLY) + + # data tarball + if(WIN32) + vcpkg_acquire_msys(MSYS_ROOT PACKAGES gzip) + vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") + endif() + file(COPY "${SOURCE_PATH}/gettext-tools/misc/archive.dir.tar" DESTINATION "${WORKING_DIR}") + vcpkg_execute_required_process( + COMMAND gzip -f archive.dir.tar + WORKING_DIRECTORY "${WORKING_DIR}" + LOGNAME gzip-${TARGET_TRIPLET} + ) + + # installation + file(INSTALL "${WORKING_DIR}/autopoint" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin" + FILE_PERMISSIONS + OWNER_WRITE OWNER_READ OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + ) + file(INSTALL "${WORKING_DIR}/archive.dir.tar.gz" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gettext/gettext") +endfunction() diff --git a/externals/vcpkg/ports/gettext/portfile.cmake b/externals/vcpkg/ports/gettext/portfile.cmake new file mode 100755 index 000000000..bd46f930b --- /dev/null +++ b/externals/vcpkg/ports/gettext/portfile.cmake @@ -0,0 +1,165 @@ +if(VCPKG_TARGET_IS_LINUX AND NOT EXISTS "/usr/include/libintl.h") + message(FATAL_ERROR "When targeting Linux, `libintl.h` is expected to come from the C Runtime Library (glibc). " + "Please use \"sudo apt-get install libc-dev\" or the equivalent to install development files." + ) +endif() + +set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) + +#Based on https://github.com/winlibs/gettext + +set(GETTEXT_VERSION 0.21) + +vcpkg_download_distfile(ARCHIVE + URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-${GETTEXT_VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-${GETTEXT_VERSION}.tar.gz" + FILENAME "gettext-${GETTEXT_VERSION}.tar.gz" + SHA512 bbe590c5dd3580c75bf30ff768da99a88eb8d466ec1ac9eea20be4cab4357ecf72448e6b81b47425e39d50fa6320ba426632914d7898dfebb4f159abc39c31d1 +) +set(PATCHES "") +if(VCPKG_TARGET_IS_UWP) + set(PATCHES uwp_remove_localcharset.patch) +endif() +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF "${GETTEXT_VERSION}" + PATCHES + 0002-Fix-uwp-build.patch + 0003-Fix-win-unicode-paths.patch + 0004-Fix-uwp-tools-build.patch + rel_path.patch + android.patch + gettext-tools_woe32dll_gettextsrc-exports.c.patch + ${PATCHES} +) +vcpkg_find_acquire_program(BISON) +get_filename_component(BISON_PATH "${BISON}" DIRECTORY) +vcpkg_add_to_path("${BISON_PATH}") + +set(OPTIONS + --enable-relocatable #symbol duplication with glib-init.c? + --enable-c++ + --disable-acl + --disable-csharp + --disable-curses + --disable-java + --disable-openmp +) +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS + # Avoid unnecessary test. + --with-included-glib + # This is required. For some reason these do not get correctly identified for release builds. + ac_cv_func_wcslen=yes + ac_cv_func_memmove=yes + # The following are required for a full gettext built (libintl and tools). + gl_cv_func_printf_directive_n=no # segfaults otherwise with popup window + ac_cv_func_memset=yes # not detected in release builds + ac_cv_header_pthread_h=no + ac_cv_header_dirent_h=no + ac_cv_header_getopt_h=no + ) +endif() + +# These functions scope any changes to VCPKG_BUILD_TYPE +function(build_libintl_and_tools) + cmake_parse_arguments(arg "" "BUILD_TYPE" "" ${ARGN}) + if(DEFINED arg_BUILD_TYPE) + set(VCPKG_BUILD_TYPE "${arg_BUILD_TYPE}") + endif() + vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}" + DETERMINE_BUILD_TRIPLET + USE_WRAPPERS + ADD_BIN_TO_PATH # So configure can check for working iconv + ADDITIONAL_MSYS_PACKAGES gzip + OPTIONS + ${OPTIONS} + ) + vcpkg_install_make(MAKEFILE "${CMAKE_CURRENT_LIST_DIR}/Makefile") +endfunction() + +function(build_libintl_only) + cmake_parse_arguments(arg "" "BUILD_TYPE" "" ${ARGN}) + if(DEFINED arg_BUILD_TYPE) + set(VCPKG_BUILD_TYPE "${arg_BUILD_TYPE}") + endif() + vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}/gettext-runtime" + DETERMINE_BUILD_TRIPLET + USE_WRAPPERS + ADD_BIN_TO_PATH # So configure can check for working iconv + OPTIONS + ${OPTIONS} + ) + vcpkg_install_make( + MAKEFILE "${CMAKE_CURRENT_LIST_DIR}/Makefile" + BUILD_TARGET build-intl + INSTALL_TARGET install-intl + ) +endfunction() + +if("tools" IN_LIST FEATURES) + # Minimization of gettext tools build time by: + # - building tools only for release configuration + # - custom top-level Makefile + # - configuration cache + list(APPEND OPTIONS "--cache-file=../config.cache-${TARGET_TRIPLET}") + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}") + build_libintl_and_tools(BUILD_TYPE "release") + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") + file(GLOB tool_libs + LIST_DIRECTORIES false + "${CURRENT_PACKAGES_DIR}/bin/*" + "${CURRENT_PACKAGES_DIR}/lib/*" + ) + list(FILTER tool_libs EXCLUDE REGEX "intl[^/\\\\]*$") + file(REMOVE ${tool_libs}) + file(GLOB tool_includes + LIST_DIRECTORIES true + "${CURRENT_PACKAGES_DIR}/include/*" + ) + list(FILTER tool_includes EXCLUDE REGEX "intl[^/\\\\]*$") + file(REMOVE_RECURSE ${tool_includes}) + if(VCPKG_TARGET_IS_LINUX) + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + elseif(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}.release") + file(RENAME "${CURRENT_PACKAGES_DIR}" "${CURRENT_PACKAGES_DIR}.release") + file(READ "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}" config_cache) + string(REGEX REPLACE "\nac_cv_env[^\n]*" "" config_cache "${config_cache}") # Eliminate build type flags + file(WRITE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}" "${config_cache}") + build_libintl_only(BUILD_TYPE "debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}.release/debug") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}") + file(RENAME "${CURRENT_PACKAGES_DIR}.release" "${CURRENT_PACKAGES_DIR}") + endif() +else() + if(VCPKG_TARGET_IS_LINUX) + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + else() + list(APPEND OPTIONS "--config-cache") + build_libintl_only() + endif() + # A fast installation of the autopoint tool and data, needed for autotools + include("${CMAKE_CURRENT_LIST_DIR}/install-autopoint.cmake") + install_autopoint() +endif() + +# Handle copyright +configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/gettext/copyright" COPYONLY) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_copy_pdbs() + +if(NOT VCPKG_TARGET_IS_LINUX) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/intl") +endif() +if("tools" IN_LIST FEATURES AND NOT VCPKG_CROSSCOMPILING) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gettext") +endif() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/gettext/user-email") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/gettext/user-email" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../..") +endif() diff --git a/externals/vcpkg/ports/gettext/rel_path.patch b/externals/vcpkg/ports/gettext/rel_path.patch new file mode 100755 index 000000000..c0301cc75 --- /dev/null +++ b/externals/vcpkg/ports/gettext/rel_path.patch @@ -0,0 +1,31 @@ +diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in +index 3a24eee5d..56b36d5ff 100644 +--- a/gettext-tools/misc/autopoint.in ++++ b/gettext-tools/misc/autopoint.in +@@ -27,8 +27,9 @@ archive_version=@ARCHIVE_VERSION@ + + # Set variables + # - gettext_datadir directory where the data files are stored. +-prefix="@prefix@" +-datarootdir="@datarootdir@" ++ ++prefix="$(dirname "$0")/../../../" ++datarootdir="${prefix}/share/gettext" + : ${gettext_datadir="@datadir@/gettext"} + : ${AUTOM4TE=autom4te} + +diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in +index c78c308bf..175ad57e7 100644 +--- a/gettext-tools/misc/gettextize.in ++++ b/gettext-tools/misc/gettextize.in +@@ -27,8 +27,8 @@ archive_version=@ARCHIVE_VERSION@ + + # Set variables + # - gettext_datadir directory where the data files are stored. +-prefix="@prefix@" +-datarootdir="@datarootdir@" ++prefix="$(dirname "$0")/../../../" ++datarootdir="${prefix}/share/gettext" + : ${gettext_datadir="@datadir@/gettext"} + : ${AUTOM4TE=autom4te} + diff --git a/externals/vcpkg/ports/gettext/uwp_remove_localcharset.patch b/externals/vcpkg/ports/gettext/uwp_remove_localcharset.patch new file mode 100755 index 000000000..285f81cf1 --- /dev/null +++ b/externals/vcpkg/ports/gettext/uwp_remove_localcharset.patch @@ -0,0 +1,79 @@ +diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in +index 7999d3456..b3ef40340 100644 +--- a/gettext-runtime/intl/Makefile.in ++++ b/gettext-runtime/intl/Makefile.in +@@ -252,7 +252,7 @@ am__libgnuintl_la_SOURCES_DIST = bindtextdom.c dcgettext.c dgettext.c \ + gettext.c finddomain.c hash-string.c loadmsgcat.c \ + localealias.c textdomain.c l10nflist.c explodename.c \ + dcigettext.c dcngettext.c dngettext.c ngettext.c plural.y \ +- plural-exp.c localcharset.c threadlib.c lock.c relocatable.c \ ++ plural-exp.c threadlib.c lock.c relocatable.c \ + langprefs.c localename.c localename-table.c log.c printf.c \ + setlocale.c setlocale-lock.c setlocale_null.c version.c \ + xsize.c osdep.c intl-compat.c windows-mutex.c windows-rwlock.c \ +@@ -264,7 +264,7 @@ am__objects_2 = bindtextdom.lo dcgettext.lo dgettext.lo gettext.lo \ + finddomain.lo hash-string.lo loadmsgcat.lo localealias.lo \ + textdomain.lo l10nflist.lo explodename.lo dcigettext.lo \ + dcngettext.lo dngettext.lo ngettext.lo plural.lo plural-exp.lo \ +- localcharset.lo threadlib.lo lock.lo relocatable.lo \ ++ threadlib.lo lock.lo relocatable.lo \ + langprefs.lo localename.lo localename-table.lo log.lo \ + printf.lo setlocale.lo setlocale-lock.lo setlocale_null.lo \ + version.lo xsize.lo osdep.lo intl-compat.lo $(am__objects_1) +@@ -282,7 +282,7 @@ am__libintl_la_SOURCES_DIST = bindtextdom.c dcgettext.c dgettext.c \ + gettext.c finddomain.c hash-string.c loadmsgcat.c \ + localealias.c textdomain.c l10nflist.c explodename.c \ + dcigettext.c dcngettext.c dngettext.c ngettext.c plural.y \ +- plural-exp.c localcharset.c threadlib.c lock.c relocatable.c \ ++ plural-exp.c threadlib.c lock.c relocatable.c \ + langprefs.c localename.c localename-table.c log.c printf.c \ + setlocale.c setlocale-lock.c setlocale_null.c version.c \ + xsize.c osdep.c intl-compat.c windows-mutex.c windows-rwlock.c \ +@@ -1387,7 +1387,7 @@ AUTOMAKE_OPTIONS = 1.10 gnu no-dependencies + + # Miscellaneous files. + EXTRA_DIST = gmo.h gettextP.h hash-string.h loadinfo.h plural-exp.h \ +- eval-plural.h localcharset.h lock.h windows-mutex.h \ ++ eval-plural.h lock.h windows-mutex.h \ + windows-rwlock.h windows-recmutex.h windows-once.h \ + windows-initguard.h relocatable.h arg-nonnull.h attribute.h \ + filename.h flexmember.h localename-table.in.h setlocale_null.h \ +@@ -1543,7 +1543,7 @@ LIBINTLSOURCES = bindtextdom.c dcgettext.c dgettext.c gettext.c \ + finddomain.c hash-string.c loadmsgcat.c localealias.c \ + textdomain.c l10nflist.c explodename.c dcigettext.c \ + dcngettext.c dngettext.c ngettext.c plural.y plural-exp.c \ +- localcharset.c threadlib.c lock.c relocatable.c langprefs.c \ ++ threadlib.c lock.c relocatable.c langprefs.c \ + localename.c localename-table.c log.c printf.c setlocale.c \ + setlocale-lock.c setlocale_null.c version.c xsize.c osdep.c \ + intl-compat.c $(am__append_2) +@@ -2016,8 +2016,6 @@ plural.lo: $(srcdir)/plural.c + $(AM_V_CC)$(LTCOMPILE) -c -o $@ $(srcdir)/plural.c + plural-exp.lo: $(srcdir)/plural-exp.c + $(AM_V_CC)$(LTCOMPILE) -c -o $@ $(srcdir)/plural-exp.c +-localcharset.lo: $(srcdir)/localcharset.c +- $(AM_V_CC)$(LTCOMPILE) -c -o $@ $(srcdir)/localcharset.c + threadlib.lo: $(srcdir)/threadlib.c + $(AM_V_CC)$(LTCOMPILE) -c -o $@ $(srcdir)/threadlib.c + lock.lo: $(srcdir)/lock.c +@@ -2074,7 +2072,6 @@ dngettext.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo + ngettext.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h $(srcdir)/lock.h $(srcdir)/windows-mutex.h $(srcdir)/windows-rwlock.h $(srcdir)/windows-recmutex.h $(srcdir)/windows-once.h $(srcdir)/windows-initguard.h + plural.lo: ../config.h $(srcdir)/plural-exp.h $(PLURAL_DEPS) + plural-exp.lo: ../config.h $(srcdir)/plural-exp.h +-localcharset.lo: ../config.h $(srcdir)/localcharset.h + threadlib.lo: ../config.h + lock.lo: ../config.h $(srcdir)/lock.h $(srcdir)/windows-mutex.h $(srcdir)/windows-rwlock.h $(srcdir)/windows-recmutex.h $(srcdir)/windows-once.h $(srcdir)/windows-initguard.h + relocatable.lo: ../config.h $(srcdir)/relocatable.h +diff --git a/gettext-runtime/intl/localcharset.c b/gettext-runtime/intl/localcharset.c +index 1a1627888..3e6582f17 100644 +--- a/gettext-runtime/intl/localcharset.c ++++ b/gettext-runtime/intl/localcharset.c +@@ -1021,7 +1021,7 @@ locale_charset (void) + + # else + +-# error "Add code for other platforms here." ++//# error "Add code for other platforms here." + + # endif + diff --git a/externals/vcpkg/ports/gettext/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/gettext/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..03bcb0569 --- /dev/null +++ b/externals/vcpkg/ports/gettext/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,14 @@ +_find_package(${ARGS}) + +if(Intl_FOUND AND Intl_LIBRARIES) + include(SelectLibraryConfigurations) + find_library(Intl_LIBRARY_DEBUG NAMES intl libintl intl-8 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH) + find_library(Intl_LIBRARY_RELEASE NAMES intl libintl intl-8 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) + unset(Intl_LIBRARIES) + unset(Intl_LIBRARIES CACHE) + select_library_configurations(Intl) + find_package(Iconv) # Since CMake 3.11 + if(Iconv_FOUND AND NOT Iconv_IS_BUILT_IN) + list(APPEND Intl_LIBRARIES ${Iconv_LIBRARIES}) + endif() +endif() diff --git a/externals/vcpkg/ports/gettext/vcpkg-port-config.cmake b/externals/vcpkg/ports/gettext/vcpkg-port-config.cmake new file mode 100755 index 000000000..67a636bd3 --- /dev/null +++ b/externals/vcpkg/ports/gettext/vcpkg-port-config.cmake @@ -0,0 +1,6 @@ +get_filename_component(gettext_tools_dir "${CMAKE_CURRENT_LIST_DIR}/../../tools/gettext/bin" ABSOLUTE) +if(CMAKE_HOST_WIN32) + set(ENV{PATH} "$ENV{PATH};${gettext_tools_dir}") +else() + set(ENV{PATH} "$ENV{PATH}:${gettext_tools_dir}") +endif() diff --git a/externals/vcpkg/ports/gettext/vcpkg.json b/externals/vcpkg/ports/gettext/vcpkg.json new file mode 100755 index 000000000..aa6ebb5f3 --- /dev/null +++ b/externals/vcpkg/ports/gettext/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "gettext", + "version": "0.21", + "port-version": 9, + "description": "GNU gettext provides libintl and a set of tools to help produce multi-lingual messages.", + "homepage": "https://www.gnu.org/software/gettext/", + "dependencies": [ + "libiconv" + ], + "features": { + "tools": { + "description": "Build gettext tools" + } + } +} diff --git a/externals/vcpkg/ports/gettimeofday/CMakeLists.txt b/externals/vcpkg/ports/gettimeofday/CMakeLists.txt new file mode 100755 index 000000000..1f8d891ae --- /dev/null +++ b/externals/vcpkg/ports/gettimeofday/CMakeLists.txt @@ -0,0 +1,14 @@ +cmake_minimum_required(VERSION 3.8) +project(gettimeofday C) + +add_library(gettimeofday gettimeofday.c gettimeofday.def) + +install(TARGETS gettimeofday + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib/manual-link + LIBRARY DESTINATION lib/manual-link +) + +if(CMAKE_BUILD_TYPE STREQUAL "Release") + install(FILES gettimeofday.h DESTINATION include) +endif() diff --git a/externals/vcpkg/ports/gettimeofday/LICENSE b/externals/vcpkg/ports/gettimeofday/LICENSE new file mode 100755 index 000000000..57c986d30 --- /dev/null +++ b/externals/vcpkg/ports/gettimeofday/LICENSE @@ -0,0 +1,33 @@ +/* + * Copied from PostgreSQL source: + * http://doxygen.postgresql.org/gettimeofday_8c_source.html + * + */ + +/* + * gettimeofday.c + * Win32 gettimeofday() replacement + * + * src/port/gettimeofday.c + * + * Copyright (c) 2003 SRA, Inc. + * Copyright (c) 2003 SKC, Inc. + * + * Permission to use, copy, modify, and distribute this software and + * its documentation for any purpose, without fee, and without a + * written agreement is hereby granted, provided that the above + * copyright notice and this paragraph and the following two + * paragraphs appear in all copies. + * + * IN NO EVENT SHALL THE AUTHOR BE LIABLE TO ANY PARTY FOR DIRECT, + * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING + * LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS + * DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * + * THE AUTHOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS + * IS" BASIS, AND THE AUTHOR HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, + * SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ diff --git a/externals/vcpkg/ports/gettimeofday/gettimeofday.c b/externals/vcpkg/ports/gettimeofday/gettimeofday.c new file mode 100755 index 000000000..62abf344a --- /dev/null +++ b/externals/vcpkg/ports/gettimeofday/gettimeofday.c @@ -0,0 +1,67 @@ +/* + * Copied from PostgreSQL source: + * http://doxygen.postgresql.org/gettimeofday_8c_source.html + * + */ + +/* + * gettimeofday.c + * Win32 gettimeofday() replacement + * + * src/port/gettimeofday.c + * + * Copyright (c) 2003 SRA, Inc. + * Copyright (c) 2003 SKC, Inc. + * + * Permission to use, copy, modify, and distribute this software and + * its documentation for any purpose, without fee, and without a + * written agreement is hereby granted, provided that the above + * copyright notice and this paragraph and the following two + * paragraphs appear in all copies. + * + * IN NO EVENT SHALL THE AUTHOR BE LIABLE TO ANY PARTY FOR DIRECT, + * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING + * LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS + * DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * + * THE AUTHOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS + * IS" BASIS, AND THE AUTHOR HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, + * SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + +#ifdef _MSC_VER + +#include + + +/* FILETIME of Jan 1 1970 00:00:00. */ +static const unsigned __int64 epoch = 116444736000000000Ui64; + +/* + * timezone information is stored outside the kernel so tzp isn't used anymore. + * + * Note: this function is not for Win32 high precision timing purpose. See + * elapsed_time(). + */ +int +gettimeofday(struct timeval * tp, struct timezone * tzp) +{ + FILETIME file_time; + SYSTEMTIME system_time; + ULARGE_INTEGER ularge; + + GetSystemTime(&system_time); + SystemTimeToFileTime(&system_time, &file_time); + ularge.LowPart = file_time.dwLowDateTime; + ularge.HighPart = file_time.dwHighDateTime; + + tp->tv_sec = (long) ((ularge.QuadPart - epoch) / 10000000L); + tp->tv_usec = (long) (system_time.wMilliseconds * 1000); + + return 0; +} + +#endif /* _MSC_VER */ diff --git a/externals/vcpkg/ports/gettimeofday/gettimeofday.def b/externals/vcpkg/ports/gettimeofday/gettimeofday.def new file mode 100755 index 000000000..7a46b866b --- /dev/null +++ b/externals/vcpkg/ports/gettimeofday/gettimeofday.def @@ -0,0 +1,2 @@ +EXPORTS + gettimeofday diff --git a/externals/vcpkg/ports/gettimeofday/gettimeofday.h b/externals/vcpkg/ports/gettimeofday/gettimeofday.h new file mode 100755 index 000000000..227317524 --- /dev/null +++ b/externals/vcpkg/ports/gettimeofday/gettimeofday.h @@ -0,0 +1,13 @@ +#ifndef _MY_GETTIMEOFDAY_H_ +#define _MY_GETTIMEOFDAY_H_ + +#ifdef _MSC_VER + +#include +#include + +int gettimeofday(struct timeval * tp, struct timezone * tzp); + +#endif /* _MSC_VER */ + +#endif /* _MY_GETTIMEOFDAY_H_ */ diff --git a/externals/vcpkg/ports/gettimeofday/portfile.cmake b/externals/vcpkg/ports/gettimeofday/portfile.cmake new file mode 100755 index 000000000..0d08bacc8 --- /dev/null +++ b/externals/vcpkg/ports/gettimeofday/portfile.cmake @@ -0,0 +1,9 @@ +vcpkg_configure_cmake( + SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/gettimeofday/vcpkg.json b/externals/vcpkg/ports/gettimeofday/vcpkg.json new file mode 100755 index 000000000..9528e9a2c --- /dev/null +++ b/externals/vcpkg/ports/gettimeofday/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "gettimeofday", + "version-string": "2017-10-14", + "port-version": 4, + "description": "An implementation of gettimeofday for WIN32" +} diff --git a/externals/vcpkg/ports/gflags/0001-patch-dir.patch b/externals/vcpkg/ports/gflags/0001-patch-dir.patch new file mode 100755 index 000000000..d3aaa00fb --- /dev/null +++ b/externals/vcpkg/ports/gflags/0001-patch-dir.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3709073..8e919cb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -503,7 +503,7 @@ endif () + # ---------------------------------------------------------------------------- + # installation rules + set (EXPORT_NAME ${PACKAGE_NAME}-targets) +-file (RELATIVE_PATH INSTALL_PREFIX_REL2CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CONFIG_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}") ++set (INSTALL_PREFIX_REL2CONFIG_DIR "../..") + configure_file (cmake/config.cmake.in "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-install.cmake" @ONLY) + configure_file (cmake/version.cmake.in "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-version.cmake" @ONLY) + diff --git a/externals/vcpkg/ports/gflags/fix_cmake_config.patch b/externals/vcpkg/ports/gflags/fix_cmake_config.patch new file mode 100755 index 000000000..bea561ecb --- /dev/null +++ b/externals/vcpkg/ports/gflags/fix_cmake_config.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in +index a512c2a..e7f50d0 100644 +--- a/cmake/config.cmake.in ++++ b/cmake/config.cmake.in +@@ -78,7 +78,7 @@ if (NOT DEFINED @PACKAGE_PREFIX@_NOTHREADS) + else () + set (@PACKAGE_PREFIX@_NOTHREADS FALSE) + endif () +- elseif (TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}PACKAGE_NAME@_static OR TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_shared) ++ elseif (TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_static OR TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_shared) + set (@PACKAGE_PREFIX@_NOTHREADS FALSE) + else () + set (@PACKAGE_PREFIX@_NOTHREADS TRUE) diff --git a/externals/vcpkg/ports/gflags/portfile.cmake b/externals/vcpkg/ports/gflags/portfile.cmake new file mode 100755 index 000000000..f1c22ff1a --- /dev/null +++ b/externals/vcpkg/ports/gflags/portfile.cmake @@ -0,0 +1,43 @@ +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "${PORT} does not currently support UWP") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gflags/gflags + REF v2.2.2 + SHA512 98c4703aab24e81fe551f7831ab797fb73d0f7dfc516addb34b9ff6d0914e5fd398207889b1ae555bac039537b1d4677067dae403b64903577078d99c1bdb447 + HEAD_REF master + PATCHES + 0001-patch-dir.patch # gflags was estimating a wrong relative path between the gflags-config.cmake file and the include path; "../.." goes from share/gflags/ to the triplet root + fix_cmake_config.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DGFLAGS_REGISTER_BUILD_DIR:BOOL=OFF + -DGFLAGS_REGISTER_INSTALL_PREFIX:BOOL=OFF + -DBUILD_gflags_nothreads_LIB:BOOL=OFF + -DGFLAGS_USE_TARGET_NAMESPACE:BOOL=ON + -DCMAKE_DEBUG_POSTFIX=d +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gflags) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/gflags/usage b/externals/vcpkg/ports/gflags/usage new file mode 100755 index 000000000..67fb74789 --- /dev/null +++ b/externals/vcpkg/ports/gflags/usage @@ -0,0 +1,4 @@ +The package gflags provides CMake targets: + + find_package(gflags CONFIG REQUIRED) + target_link_libraries(main PRIVATE gflags::gflags) diff --git a/externals/vcpkg/ports/gflags/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/gflags/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..55b3fc8dc --- /dev/null +++ b/externals/vcpkg/ports/gflags/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,10 @@ +set(GFLAGS_USE_TARGET_NAMESPACE ON) + +_find_package(${ARGS}) + +foreach(tgt gflags gflags_shared gflags_static) + if (NOT TARGET ${tgt} AND TARGET "gflags::${tgt}") + add_library(${tgt} INTERFACE IMPORTED) + target_link_libraries(${tgt} INTERFACE "gflags::${tgt}") + endif() +endforeach(tgt) diff --git a/externals/vcpkg/ports/gflags/vcpkg.json b/externals/vcpkg/ports/gflags/vcpkg.json new file mode 100755 index 000000000..3b8d22a06 --- /dev/null +++ b/externals/vcpkg/ports/gflags/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "gflags", + "version-string": "2.2.2", + "port-version": 5, + "description": "A C++ library that implements commandline flags processing", + "homepage": "https://github.com/gflags/gflags", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/ghc-filesystem/portfile.cmake b/externals/vcpkg/ports/ghc-filesystem/portfile.cmake new file mode 100755 index 000000000..369cc0893 --- /dev/null +++ b/externals/vcpkg/ports/ghc-filesystem/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gulrak/filesystem + REF v1.5.10 + HEAD_REF master + SHA512 470dd9e1c4358f9d8d9f531d8c3c6716cdd156c815315748436a1dc3caf095d320e58eae2274df8c15e293cc96170752fb00aed8ad2210d417b174c13297fbac +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DGHC_FILESYSTEM_BUILD_TESTING=OFF + -DGHC_FILESYSTEM_BUILD_EXAMPLES=OFF + -DGHC_FILESYSTEM_WITH_INSTALL=ON +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME ghc_filesystem + CONFIG_PATH lib/cmake/ghc_filesystem +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/ghc-filesystem/vcpkg.json b/externals/vcpkg/ports/ghc-filesystem/vcpkg.json new file mode 100755 index 000000000..03117dfae --- /dev/null +++ b/externals/vcpkg/ports/ghc-filesystem/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "ghc-filesystem", + "version": "1.5.10", + "description": "An implementation of C++17 std::filesystem for C++11/C++14/C++17/C++20 on Windows, macOS, Linux and FreeBSD", + "homepage": "https://github.com/gulrak/filesystem", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/gherkin-c/fix-include-path.patch b/externals/vcpkg/ports/gherkin-c/fix-include-path.patch new file mode 100755 index 000000000..ddaf80d31 --- /dev/null +++ b/externals/vcpkg/ports/gherkin-c/fix-include-path.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 74b9ffb..6af4645 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,7 +60,7 @@ LIST(APPEND GHERKIN_SRS + ) + + add_library(gherkin ${GHERKIN_SRS}) +-target_include_directories(gherkin PUBLIC "$") ++target_include_directories(gherkin PUBLIC "$" "$") + + if (BUILD_GHERKIN_TESTS) + LIST(APPEND GENERATE_TOKEN +@@ -96,7 +96,7 @@ if (BUILD_GHERKIN_TESTS) + ENDFOREACH() + endif() + +-set(include_install_dir "include") ++set(include_install_dir "include/gherkin-c") + set(lib_install_dir "lib/") + set(bin_install_dir "bin/") + set(config_install_dir "lib/cmake/") diff --git a/externals/vcpkg/ports/gherkin-c/fix-install-error.patch b/externals/vcpkg/ports/gherkin-c/fix-install-error.patch new file mode 100755 index 000000000..a695e0c7b --- /dev/null +++ b/externals/vcpkg/ports/gherkin-c/fix-install-error.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3227bf5..74b9ffb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -131,7 +131,3 @@ install( + # NAMESPACE "${namespace}" + # DESTINATION "${config_install_dir}") + +-add_custom_target(install_${PROJECT_NAME} +- $(MAKE) install +- DEPENDS gherkin +- COMMENT "Installing ${PROJECT_NAME}") diff --git a/externals/vcpkg/ports/gherkin-c/portfile.cmake b/externals/vcpkg/ports/gherkin-c/portfile.cmake new file mode 100755 index 000000000..3e4a7ad0a --- /dev/null +++ b/externals/vcpkg/ports/gherkin-c/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO c-libs/gherkin-c + REF dd180edc7d092311f2e90a0c4957061156d39dd3 + SHA512 c6b38ab0e7a0fd1061d86b0ff9d9140f8c3d6f15cfc1673e947254c6c03a66d3e6aae5b267b074aa10fa30ba2850190c9e9ea7c12e340e4f8c5575b9bf31bab3 + HEAD_REF master + PATCHES + fix-install-error.patch + fix-include-path.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_GHERKIN_TESTS=OFF +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gherkin-c" RENAME copyright) diff --git a/externals/vcpkg/ports/gherkin-c/vcpkg.json b/externals/vcpkg/ports/gherkin-c/vcpkg.json new file mode 100755 index 000000000..a91fd90b5 --- /dev/null +++ b/externals/vcpkg/ports/gherkin-c/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "gherkin-c", + "version-date": "2019-10-07", + "port-version": 3, + "description": "Gherkin parser/compiler in C", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/giflib/CMakeLists.txt b/externals/vcpkg/ports/giflib/CMakeLists.txt new file mode 100755 index 000000000..a5c69381a --- /dev/null +++ b/externals/vcpkg/ports/giflib/CMakeLists.txt @@ -0,0 +1,44 @@ +cmake_minimum_required(VERSION 3.4) + +project(giflib C) + +set(GIFLIB_EXPORTS "NOTFOUND" CACHE FILEPATH "The path of the DEF file listing the DLL exports.") + +set(GIFLIB_HEADERS + gif_lib.h +) + +set(GIFLIB_SOURCES + dgif_lib.c + egif_lib.c + gifalloc.c + gif_err.c + gif_font.c + gif_hash.c + openbsd-reallocarray.c +) + +add_definitions(-D_CRT_SECURE_NO_WARNINGS) + +include(CheckSymbolExists) +check_symbol_exists(reallocarray "stdlib.h" HAVE_REALLOCARRAY) +if(HAVE_REALLOCARRAY) + add_definitions(-DHAVE_REALLOCARRAY) +endif() + +add_library(gif ${GIFLIB_SOURCES}) +if(BUILD_SHARED_LIBS AND WIN32) + target_sources(gif PRIVATE "${GIFLIB_EXPORTS}") +else() + set(UNUSED "${GIFLIB_EXPORTS}") +endif() + +if (NOT GIFLIB_SKIP_HEADERS) + install(FILES ${GIFLIB_HEADERS} DESTINATION include) +endif () + +install(TARGETS gif + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) diff --git a/externals/vcpkg/ports/giflib/disable-GifDrawBoxedText8x8-win32.patch b/externals/vcpkg/ports/giflib/disable-GifDrawBoxedText8x8-win32.patch new file mode 100755 index 000000000..095edb3ce --- /dev/null +++ b/externals/vcpkg/ports/giflib/disable-GifDrawBoxedText8x8-win32.patch @@ -0,0 +1,36 @@ +diff --git a/gif_font.c b/gif_font.c +index d90783c..b682c7a 100644 +--- a/gif_font.c ++++ b/gif_font.c +@@ -204,6 +204,7 @@ GifDrawRectangle(SavedImage *Image, + memset(bp + (i * Image->ImageDesc.Width), color, (size_t)w); + } + ++#if !defined(_WIN32) + void + GifDrawBoxedText8x8(SavedImage *Image, + const int x, const int y, +@@ -257,5 +258,6 @@ GifDrawBoxedText8x8(SavedImage *Image, + border + LineCount * GIF_FONT_HEIGHT + border, fg); + } + } ++#endif + + /* end */ +diff --git a/gif_lib.h b/gif_lib.h +index ebdbd3c..41bf7a2 100644 +--- a/gif_lib.h ++++ b/gif_lib.h +@@ -290,10 +290,12 @@ extern void GifDrawRectangle(SavedImage *Image, + const int x, const int y, + const int w, const int d, const int color); + ++#if !defined(_WIN32) + extern void GifDrawBoxedText8x8(SavedImage *Image, + const int x, const int y, + const char *legend, + const int border, const int bg, const int fg); ++#endif + + #ifdef __cplusplus + } diff --git a/externals/vcpkg/ports/giflib/exports.def b/externals/vcpkg/ports/giflib/exports.def new file mode 100755 index 000000000..d38549373 --- /dev/null +++ b/externals/vcpkg/ports/giflib/exports.def @@ -0,0 +1,55 @@ +EXPORTS + DGifCloseFile @1 + DGifExtensionToGCB @2 + DGifGetCode @3 + DGifGetCodeNext @4 + DGifGetExtension @5 + DGifGetExtensionNext @6 + DGifGetImageDesc @7 + DGifGetLZCodes @8 + DGifGetLine @9 + DGifGetPixel @10 + DGifGetRecordType @11 + DGifGetScreenDesc @12 + DGifOpen @13 + DGifOpenFileHandle @14 + DGifOpenFileName @15 + DGifSavedExtensionToGCB @16 + DGifSlurp @17 + EGifCloseFile @18 + EGifGCBToExtension @19 + EGifGCBToSavedExtension @20 + EGifGetGifVersion @21 + EGifOpen @22 + EGifOpenFileHandle @23 + EGifOpenFileName @24 + EGifPutCode @25 + EGifPutCodeNext @26 + EGifPutComment @27 + EGifPutExtension @28 + EGifPutExtensionBlock @29 + EGifPutExtensionLeader @30 + EGifPutExtensionTrailer @31 + EGifPutImageDesc @32 + EGifPutLine @33 + EGifPutPixel @34 + EGifPutScreenDesc @35 + EGifSetGifVersion @36 + EGifSpew @37 + FreeLastSavedImage @38 + GifAddExtensionBlock @39 + GifApplyTranslation @40 + GifAsciiTable8x8 @41 DATA + GifBitSize @42 + GifDrawBox @43 + ; needs strtok_r: GifDrawBoxedText8x8 @44 + GifDrawRectangle @45 + GifDrawText8x8 @46 + GifErrorString @47 + GifFreeExtensions @48 + GifFreeMapObject @49 + GifFreeSavedImages @50 + GifMakeMapObject @51 + GifMakeSavedImage @52 + GifUnionColorMap @53 + openbsd_reallocarray @54 diff --git a/externals/vcpkg/ports/giflib/fix-compile-error.patch b/externals/vcpkg/ports/giflib/fix-compile-error.patch new file mode 100755 index 000000000..970b05576 --- /dev/null +++ b/externals/vcpkg/ports/giflib/fix-compile-error.patch @@ -0,0 +1,75 @@ +diff --git a/dgif_lib.c b/dgif_lib.c +index 82fc097..3bb302b 100644 +--- a/dgif_lib.c ++++ b/dgif_lib.c +@@ -58,7 +58,7 @@ DGifOpenFileName(const char *FileName, int *Error) + int FileHandle; + GifFileType *GifFile; + +- if ((FileHandle = open(FileName, O_RDONLY)) == -1) { ++ if ((FileHandle = _open(FileName, O_RDONLY)) == -1) { + if (Error != NULL) + *Error = D_GIF_ERR_OPEN_FAILED; + return NULL; +@@ -85,7 +85,7 @@ DGifOpenFileHandle(int FileHandle, int *Error) + if (GifFile == NULL) { + if (Error != NULL) + *Error = D_GIF_ERR_NOT_ENOUGH_MEM; +- (void)close(FileHandle); ++ (void)_close(FileHandle); + return NULL; + } + +@@ -99,7 +99,7 @@ DGifOpenFileHandle(int FileHandle, int *Error) + if (Private == NULL) { + if (Error != NULL) + *Error = D_GIF_ERR_NOT_ENOUGH_MEM; +- (void)close(FileHandle); ++ (void)_close(FileHandle); + free((char *)GifFile); + return NULL; + } +@@ -110,7 +110,7 @@ DGifOpenFileHandle(int FileHandle, int *Error) + _setmode(FileHandle, O_BINARY); /* Make sure it is in binary mode. */ + #endif /* _WIN32 */ + +- f = fdopen(FileHandle, "rb"); /* Make it into a stream: */ ++ f = _fdopen(FileHandle, "rb"); /* Make it into a stream: */ + + /*@-mustfreeonly@*/ + GifFile->Private = (void *)Private; +diff --git a/egif_lib.c b/egif_lib.c +index 6219af0..8ddda1b 100644 +--- a/egif_lib.c ++++ b/egif_lib.c +@@ -67,10 +67,10 @@ EGifOpenFileName(const char *FileName, const bool TestExistence, int *Error) + GifFileType *GifFile; + + if (TestExistence) +- FileHandle = open(FileName, O_WRONLY | O_CREAT | O_EXCL, ++ FileHandle = _open(FileName, O_WRONLY | O_CREAT | O_EXCL, + S_IREAD | S_IWRITE); + else +- FileHandle = open(FileName, O_WRONLY | O_CREAT | O_TRUNC, ++ FileHandle = _open(FileName, O_WRONLY | O_CREAT | O_TRUNC, + S_IREAD | S_IWRITE); + + if (FileHandle == -1) { +@@ -80,7 +80,7 @@ EGifOpenFileName(const char *FileName, const bool TestExistence, int *Error) + } + GifFile = EGifOpenFileHandle(FileHandle, Error); + if (GifFile == (GifFileType *) NULL) +- (void)close(FileHandle); ++ (void)_close(FileHandle); + return GifFile; + } + +@@ -125,7 +125,7 @@ EGifOpenFileHandle(const int FileHandle, int *Error) + _setmode(FileHandle, O_BINARY); /* Make sure it is in binary mode. */ + #endif /* _WIN32 */ + +- f = fdopen(FileHandle, "wb"); /* Make it into a stream: */ ++ f = _fdopen(FileHandle, "wb"); /* Make it into a stream: */ + + GifFile->Private = (void *)Private; + Private->FileHandle = FileHandle; diff --git a/externals/vcpkg/ports/giflib/msvc-guard-unistd-h.patch b/externals/vcpkg/ports/giflib/msvc-guard-unistd-h.patch new file mode 100755 index 000000000..36cef4491 --- /dev/null +++ b/externals/vcpkg/ports/giflib/msvc-guard-unistd-h.patch @@ -0,0 +1,14 @@ +diff --git a/gif_hash.h b/gif_hash.h +index 6a1b585..e6712e8 100644 +--- a/gif_hash.h ++++ b/gif_hash.h +@@ -9,7 +9,9 @@ SPDX-License-Identifier: MIT + #ifndef _GIF_HASH_H_ + #define _GIF_HASH_H_ + ++#ifndef _MSC_VER + #include ++#endif + #include + + #define HT_SIZE 8192 /* 12bits = 4096 or twice as big! */ diff --git a/externals/vcpkg/ports/giflib/portfile.cmake b/externals/vcpkg/ports/giflib/portfile.cmake new file mode 100755 index 000000000..8a58b690a --- /dev/null +++ b/externals/vcpkg/ports/giflib/portfile.cmake @@ -0,0 +1,32 @@ +set(GIFLIB_VERSION 5.2.1) + +set(EXTRA_PATCHES "") +if (VCPKG_TARGET_IS_WINDOWS) + list(APPEND EXTRA_PATCHES fix-compile-error.patch) +endif() + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO "giflib" + FILENAME "giflib-${GIFLIB_VERSION}.tar.gz" + SHA512 4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736 + PATCHES + msvc-guard-unistd-h.patch + disable-GifDrawBoxedText8x8-win32.patch # MSVC doesn't have strtok_r + ${EXTRA_PATCHES} +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DGIFLIB_EXPORTS=${CMAKE_CURRENT_LIST_DIR}/exports.def" + OPTIONS_DEBUG + -DGIFLIB_SKIP_HEADERS=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/giflib/vcpkg.json b/externals/vcpkg/ports/giflib/vcpkg.json new file mode 100755 index 000000000..2e950baed --- /dev/null +++ b/externals/vcpkg/ports/giflib/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "giflib", + "version": "5.2.1", + "port-version": 2, + "description": "A library for reading and writing gif images.", + "homepage": "https://sourceforge.net/projects/giflib/", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ginkgo/portfile.cmake b/externals/vcpkg/ports/ginkgo/portfile.cmake new file mode 100755 index 000000000..2faede6d5 --- /dev/null +++ b/externals/vcpkg/ports/ginkgo/portfile.cmake @@ -0,0 +1,53 @@ +vcpkg_download_distfile(WINDOWS_SYMBOLS_PATCH + URLS https://github.com/ginkgo-project/ginkgo/commit/7481b2fffb51d73492ef9017045450b29b820f81.diff + FILENAME 7481b2fffb51d73492ef9017045450b29b820f81.diff + SHA512 f81c57aacc30680383ccfb21ca08987d8ea19a23c0c7bbc5ae590c3c7eca4eed72cea84410357e080e5bb35f08f6b57834b3cdace6d91cc3fde0a1930aa4270a +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ginkgo-project/ginkgo + REF v1.4.0 + SHA512 9bfcb2c415c7a1a70cf8e49f20adf62d02cab83bb23b6fcecfeaeeb322b2d4e1ad8d8fa6582735073753f9a05eac8688b9bd1ff1d4203957c1a80702d117e807 + HEAD_REF master + PATCHES + ${WINDOWS_SYMBOLS_PATCH} +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openmp GINKGO_BUILD_OMP + cuda GINKGO_BUILD_CUDA +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DGINKGO_BUILD_REFERENCE=ON + -DGINKGO_BUILD_TESTS=OFF + -DGINKGO_BUILD_EXAMPLES=OFF + -DGINKGO_BUILD_HIP=OFF + -DGINKGO_BUILD_DPCPP=OFF + -DGINKGO_BUILD_HWLOC=OFF + -DGINKGO_BUILD_BENCHMARKS=OFF + -DGINKGO_DEVEL_TOOLS=OFF + -DGINKGO_SKIP_DEPENDENCY_UPDATE=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON + -DGinkgo_NAME=ginkgo + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Ginkgo) +vcpkg_fixup_pkgconfig() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" [[string(REPLACE "lib/cmake/Ginkgo" "" GINKGO_INSTALL_PREFIX "${GINKGO_CONFIG_FILE_PATH}")]] "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" "GINKGO_INSTALL_PREFIX" "_IMPORT_PREFIX") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" "/lib/cmake/Ginkgo\"" "/share/ginkgo\"") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" "/lib/cmake/Ginkgo/Modules\"" "/share/ginkgo/Modules/Modules\"") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" "\"${SOURCE_PATH}/cmake/Modules/\"" "") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/ginkgo" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/ginkgo") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/externals/vcpkg/ports/ginkgo/usage b/externals/vcpkg/ports/ginkgo/usage new file mode 100755 index 000000000..5dfe203f7 --- /dev/null +++ b/externals/vcpkg/ports/ginkgo/usage @@ -0,0 +1,4 @@ +The package ginkgo provides CMake targets: + + find_package(Ginkgo CONFIG REQUIRED) + target_link_libraries(main PRIVATE Ginkgo::ginkgo) diff --git a/externals/vcpkg/ports/ginkgo/vcpkg.json b/externals/vcpkg/ports/ginkgo/vcpkg.json new file mode 100755 index 000000000..426e388af --- /dev/null +++ b/externals/vcpkg/ports/ginkgo/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "ginkgo", + "version-semver": "1.4.0", + "port-version": 1, + "description": "Ginkgo is a high-performance linear algebra library for manycore systems, with a focus on sparse solution of linear systems. Note that the OpenMP feature is not available on Windows.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cuda": { + "description": "Build the CUDA backend of Ginkgo", + "dependencies": [ + "cuda" + ] + }, + "openmp": { + "description": "Build the OpenMP backend of Ginkgo" + } + } +} diff --git a/externals/vcpkg/ports/gl2ps/portfile.cmake b/externals/vcpkg/ports/gl2ps/portfile.cmake new file mode 100755 index 000000000..d18d2fcb4 --- /dev/null +++ b/externals/vcpkg/ports/gl2ps/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_gitlab( + GITLAB_URL http://gitlab.onelab.info + OUT_SOURCE_PATH SOURCE_PATH + REPO gl2ps/gl2ps + REF gl2ps_1_4_2 + SHA512 cb4abd79f6790e229a0b05a6d12e4bd4d24885c89c4cb8644e49b0459361565c5c5379b53d85f59eeaba16144d3288dbd06c90f55a739f0928a788224ccb8085 + HEAD_REF master + PATCHES separate-static-dynamic-build.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_install_cmake() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING.GL2PS DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright.LGPL) diff --git a/externals/vcpkg/ports/gl2ps/separate-static-dynamic-build.patch b/externals/vcpkg/ports/gl2ps/separate-static-dynamic-build.patch new file mode 100755 index 000000000..8bc8f2910 --- /dev/null +++ b/externals/vcpkg/ports/gl2ps/separate-static-dynamic-build.patch @@ -0,0 +1,208 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0001c4f..36ec0f7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,33 +1,41 @@ + # GL2PS, an OpenGL to PostScript Printing Library + # Copyright (C) 1999-2017 C. Geuzaine ++ + # + # This program is free software; you can redistribute it and/or + # modify it under the terms of either: ++ + # + # a) the GNU Library General Public License as published by the Free + # Software Foundation, either version 2 of the License, or (at your + # option) any later version; or ++ + # + # b) the GL2PS License as published by Christophe Geuzaine, either + # version 2 of the License, or (at your option) any later version. ++ + # + # This program is distributed in the hope that it will be useful, but + # WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See either + # the GNU Library General Public License or the GL2PS License for + # more details. ++ + # + # You should have received a copy of the GNU Library General Public + # License along with this library in the file named "COPYING.LGPL"; + # if not, write to the Free Software Foundation, Inc., 675 Mass Ave, + # Cambridge, MA 02139, USA. ++ + # + # You should have received a copy of the GL2PS License with this + # library in the file named "COPYING.GL2PS"; if not, I will be glad + # to provide one. ++ + # + # For the latest info about gl2ps and a full list of contributors, + # see http://www.geuz.org/gl2ps/. ++ + # + # Please report all bugs and problems to . + +@@ -59,7 +67,7 @@ set(GL2PS_VERSION "${GL2PS_MAJOR_VERSION}.${GL2PS_MINOR_VERSION}") + set(GL2PS_VERSION "${GL2PS_VERSION}.${GL2PS_PATCH_VERSION}${GL2PS_EXTRA_VERSION}") + + execute_process(COMMAND date "+%Y%m%d" OUTPUT_VARIABLE DATE +- OUTPUT_STRIP_TRAILING_WHITESPACE) ++OUTPUT_STRIP_TRAILING_WHITESPACE) + if(NOT DATE) + set(DATE "unknown") + endif() +@@ -138,30 +146,30 @@ if(APPLE) + endif() + endif() + +-if(OPENGL_FOUND) +- add_library(lib STATIC gl2ps.c gl2ps.h) +- set_target_properties(lib PROPERTIES OUTPUT_NAME gl2ps) +- +- add_library(shared SHARED gl2ps.c gl2ps.h) +- target_link_libraries(shared ${EXTERNAL_LIBRARIES}) +- set_target_properties(shared PROPERTIES OUTPUT_NAME gl2ps +- VERSION ${GL2PS_MAJOR_VERSION}.${GL2PS_MINOR_VERSION}.${GL2PS_PATCH_VERSION} +- SOVERSION ${GL2PS_MAJOR_VERSION}) +- if(WIN32 OR CYGWIN) +- set_target_properties(shared PROPERTIES +- COMPILE_FLAGS "-DGL2PSDLL -DGL2PSDLL_EXPORTS") +- endif() +- install(TARGETS lib shared RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib${LIB_SUFFIX} +- ARCHIVE DESTINATION lib${LIB_SUFFIX}) ++add_library(gl2ps gl2ps.c gl2ps.h) ++target_link_libraries(gl2ps ${EXTERNAL_LIBRARIES}) ++set_target_properties(gl2ps PROPERTIES ++ VERSION ${GL2PS_MAJOR_VERSION}.${GL2PS_MINOR_VERSION}.${GL2PS_PATCH_VERSION} ++SOVERSION ${GL2PS_MAJOR_VERSION}) ++ ++if(BUILD_SHARED_LIBS) ++ target_compile_definitions(gl2ps PRIVATE -DGL2PSDLL -DGL2PSDLL_EXPORTS) + endif() + ++install( ++ TARGETS gl2ps ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++) ++ + if(WIN32) +- set(GL2PS_DOC .) ++ set(GL2PS_DOC share/gl2ps/docs) + else() + set(GL2PS_DOC share/doc/gl2ps) + endif() + ++if(NOT DISABLE_INSTALL_HEADERS) + install(FILES gl2ps.h DESTINATION include) + install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION ${GL2PS_DOC}) + install(FILES ${CMAKE_SOURCE_DIR}/COPYING.LGPL DESTINATION ${GL2PS_DOC}) +@@ -169,30 +177,36 @@ install(FILES ${CMAKE_SOURCE_DIR}/COPYING.GL2PS DESTINATION ${GL2PS_DOC}) + install(FILES ${CMAKE_SOURCE_DIR}/gl2psTest.c DESTINATION ${GL2PS_DOC}) + install(FILES ${CMAKE_SOURCE_DIR}/gl2psTestSimple.c DESTINATION ${GL2PS_DOC}) + +-if(GLUT_FOUND) +- add_executable(gl2psTest WIN32 gl2psTest.c) +- target_link_libraries(gl2psTest lib ${EXTERNAL_LIBRARIES}) +- add_executable(gl2psTestSimple WIN32 gl2psTestSimple.c) +- target_link_libraries(gl2psTestSimple lib ${EXTERNAL_LIBRARIES}) + endif() + +-find_package(LATEX) +-if(PDFLATEX_COMPILER) +- add_custom_command(OUTPUT gl2ps.pdf DEPENDS gl2ps.tex +- COMMAND ${PDFLATEX_COMPILER} ARGS ${CMAKE_SOURCE_DIR}/gl2ps.tex +- COMMAND ${PDFLATEX_COMPILER} ARGS ${CMAKE_SOURCE_DIR}/gl2ps.tex +- COMMAND ${PDFLATEX_COMPILER} ARGS ${CMAKE_SOURCE_DIR}/gl2ps.tex +- COMMAND ${CMAKE_COMMAND} -E copy gl2ps.pdf ${CMAKE_SOURCE_DIR}) +- add_custom_target(pdf ALL DEPENDS gl2ps.pdf) +- install(FILES gl2ps.pdf DESTINATION ${GL2PS_DOC}) +- find_program(TTH tth) +- if(TTH) +- add_custom_command(OUTPUT gl2ps.html DEPENDS gl2ps.tex gl2ps.pdf +- COMMAND ${CMAKE_COMMAND} -E copy_if_different +- ${CMAKE_SOURCE_DIR}/gl2ps.tex ${CMAKE_BINARY_DIR}/gl2ps.tex +- COMMAND ${TTH} ARGS -w1 gl2ps.tex) +- add_custom_target(html DEPENDS gl2ps.html) +- endif() ++if(BUILD_TESTS) ++ ++ if(GLUT_FOUND) ++ add_executable(gl2psTest gl2psTest.c) ++ target_link_libraries(gl2psTest gl2ps ${EXTERNAL_LIBRARIES}) ++ add_executable(gl2psTestSimple gl2psTestSimple.c) ++ target_link_libraries(gl2psTestSimple gl2ps ${EXTERNAL_LIBRARIES}) ++ endif(GLUT_FOUND) ++ ++ find_package(LATEX) ++ if(PDFLATEX_COMPILER) ++ add_custom_command(OUTPUT gl2ps.pdf DEPENDS gl2ps.tex ++ COMMAND ${PDFLATEX_COMPILER} ARGS ${CMAKE_SOURCE_DIR}/gl2ps.tex ++ COMMAND ${PDFLATEX_COMPILER} ARGS ${CMAKE_SOURCE_DIR}/gl2ps.tex ++ COMMAND ${PDFLATEX_COMPILER} ARGS ${CMAKE_SOURCE_DIR}/gl2ps.tex ++ COMMAND ${CMAKE_COMMAND} -E copy gl2ps.pdf ${CMAKE_SOURCE_DIR}) ++ add_custom_target(pdf ALL DEPENDS gl2ps.pdf) ++ install(FILES gl2ps.pdf DESTINATION ${GL2PS_DOC}) ++ find_program(TTH tth) ++ if(TTH) ++ add_custom_command(OUTPUT gl2ps.html DEPENDS gl2ps.tex gl2ps.pdf ++ COMMAND ${CMAKE_COMMAND} -E copy_if_different ++ ${CMAKE_SOURCE_DIR}/gl2ps.tex ${CMAKE_BINARY_DIR}/gl2ps.tex ++ COMMAND ${TTH} ARGS -w1 gl2ps.tex) ++ add_custom_target(html DEPENDS gl2ps.html) ++ endif(TTH) ++ endif(PDFLATEX_COMPILER) ++ + endif() + + set(CPACK_PACKAGE_VENDOR "Christophe Geuzaine") +@@ -201,27 +215,22 @@ set(CPACK_PACKAGE_VERSION_MINOR ${GL2PS_MINOR_VERSION}) + set(CPACK_PACKAGE_VERSION_PATCH ${GL2PS_PATCH_VERSION}) + set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_SOURCE_DIR}/README.txt) + set(CPACK_PACKAGE_DESCRIPTION_SUMMARY +- "An OpenGL to PostScript (and PDF, and SVG...) printing library") +-if(GL2PS_EXTRA_VERSION MATCHES "-git.*") # so that we'll overwrite the archives +- set(CPACK_PACKAGE_FILE_NAME gl2ps-git-${GL2PS_OS}) +- set(CPACK_SOURCE_PACKAGE_FILE_NAME gl2ps-git) +-else() ++ "An OpenGL to PostScript (and PDF, and SVG...) printing library") + set(CPACK_PACKAGE_FILE_NAME gl2ps-${GL2PS_VERSION}-${GL2PS_OS}) +- set(CPACK_SOURCE_PACKAGE_FILE_NAME gl2ps-${GL2PS_VERSION}) +-endif() +-set(CPACK_PACKAGE_INSTALL_DIRECTORY "gl2ps") +-set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/COPYING.LGPL) +-set(CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/README.txt) +-set(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_SOURCE_DIR}/README.txt) +-set(CPACK_PACKAGE_EXECUTABLE "gl2ps;gl2ps") +-set(CPACK_STRIP_FILES TRUE) +-set(CPACK_SOURCE_GENERATOR TGZ) +-set(CPACK_SOURCE_IGNORE_FILES "TODO.txt" "${CMAKE_BINARY_DIR}" "/CVS/" +- "/.svn" "/.git" "~$" "DS_Store$" "/tmp/" "/bin/" "/lib/") +-if(WIN32) +- set(CPACK_GENERATOR ZIP) +-else() +- set(CPACK_GENERATOR TGZ) +-endif() +- +-include(CPack) ++ set(CPACK_PACKAGE_INSTALL_DIRECTORY "gl2ps") ++ set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/COPYING.LGPL) ++ set(CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/README.txt) ++ set(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_SOURCE_DIR}/README.txt) ++ set(CPACK_PACKAGE_EXECUTABLE "gl2ps;gl2ps") ++ set(CPACK_STRIP_FILES TRUE) ++ set(CPACK_SOURCE_PACKAGE_FILE_NAME gl2ps-${GL2PS_VERSION}-source) ++ set(CPACK_SOURCE_GENERATOR TGZ) ++ set(CPACK_SOURCE_IGNORE_FILES "TODO.txt" "${CMAKE_BINARY_DIR}" "/CVS/" ++ "/.svn" "~$" "DS_Store$" "/tmp/" "/bin/" "/lib/") ++ if(WIN32) ++ set(CPACK_GENERATOR ZIP) ++ else(WIN32) ++ set(CPACK_GENERATOR TGZ) ++ endif(WIN32) ++ ++ # include(CPack) diff --git a/externals/vcpkg/ports/gl2ps/vcpkg.json b/externals/vcpkg/ports/gl2ps/vcpkg.json new file mode 100755 index 000000000..4230bc45c --- /dev/null +++ b/externals/vcpkg/ports/gl2ps/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "gl2ps", + "version-string": "1.4.2", + "port-version": 1, + "description": "OpenGL to PostScript Printing Library", + "homepage": "https://gitlab.onelab.info/gl2ps/gl2ps", + "dependencies": [ + "freeglut", + "libpng", + "zlib" + ] +} diff --git a/externals/vcpkg/ports/gl3w/0001-enable-shared-build.patch b/externals/vcpkg/ports/gl3w/0001-enable-shared-build.patch new file mode 100755 index 000000000..f43437e9d --- /dev/null +++ b/externals/vcpkg/ports/gl3w/0001-enable-shared-build.patch @@ -0,0 +1,60 @@ +From 5f482a64c642f830f1d25f8abae7cae6dd2c6c2b Mon Sep 17 00:00:00 2001 +From: Stanislav Ershov +Date: Mon, 8 Jan 2018 03:16:07 +0300 +Subject: [PATCH] enable shared build + +--- + gl3w_gen.py | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +diff --git a/gl3w_gen.py b/gl3w_gen.py +index 611331a..3515cf9 100755 +--- a/gl3w_gen.py ++++ b/gl3w_gen.py +@@ -130,6 +130,10 @@ with open(os.path.join(args.root, 'include/GL/gl3w.h'), 'wb') as f: + + #include + ++#ifndef GL3W_API ++ #define GL3W_API ++#endif ++ + #ifndef __gl_h_ + #define __gl_h_ + #endif +@@ -147,10 +151,10 @@ typedef void (*GL3WglProc)(void); + typedef GL3WglProc (*GL3WGetProcAddressProc)(const char *proc); + + /* gl3w api */ +-int gl3wInit(void); +-int gl3wInit2(GL3WGetProcAddressProc proc); +-int gl3wIsSupported(int major, int minor); +-GL3WglProc gl3wGetProcAddress(const char *proc); ++GL3W_API int gl3wInit(void); ++GL3W_API int gl3wInit2(GL3WGetProcAddressProc proc); ++GL3W_API int gl3wIsSupported(int major, int minor); ++GL3W_API GL3WglProc gl3wGetProcAddress(const char *proc); + + /* gl3w internal state */ + ''') +@@ -162,7 +168,7 @@ GL3WglProc gl3wGetProcAddress(const char *proc); + write(f, r''' } gl; + }; + +-extern union GL3WProcs gl3wProcs; ++GL3W_API extern union GL3WProcs gl3wProcs; + + /* OpenGL functions */ + ''') +@@ -329,7 +333,7 @@ static const char *proc_names[] = { + write(f, '\t"{0}",\n'.format(proc)) + write(f, r'''}; + +-union GL3WProcs gl3wProcs; ++GL3W_API union GL3WProcs gl3wProcs; + + static void load_procs(GL3WGetProcAddressProc proc) + { +-- +2.15.0.windows.1 + diff --git a/externals/vcpkg/ports/gl3w/CMakeLists.txt b/externals/vcpkg/ports/gl3w/CMakeLists.txt new file mode 100755 index 000000000..41f75b21b --- /dev/null +++ b/externals/vcpkg/ports/gl3w/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.9) +project(gl3w C) + +find_package(OpenGL REQUIRED) +find_path(GLCOREARB_H NAMES GL/glcorearb.h) + +add_library(gl3w src/gl3w.c) + +target_include_directories(gl3w + PUBLIC + $ + $ + PRIVATE + ${GLCOREARB_H} + ${OPENGL_INCLUDE_DIR} +) + +if(BUILD_SHARED_LIBS) + target_compile_definitions(gl3w PRIVATE "-DGL3W_API=__declspec(dllexport)") +endif() + +target_link_libraries(gl3w PRIVATE ${OPENGL_LIBRARIES}) + +install(TARGETS gl3w + EXPORT gl3wExport + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install( + EXPORT gl3wExport + FILE gl3wConfig.cmake + NAMESPACE unofficial::gl3w:: + DESTINATION share/gl3w +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES include/GL/gl3w.h DESTINATION include/GL) +endif() diff --git a/externals/vcpkg/ports/gl3w/portfile.cmake b/externals/vcpkg/ports/gl3w/portfile.cmake new file mode 100755 index 000000000..2633bf05a --- /dev/null +++ b/externals/vcpkg/ports/gl3w/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO skaslev/gl3w + REF 99ed321100d37032cb6bfa7dd8dea85f10c86132 + SHA512 217f65644c73c33383b09893fa5ede066cc4b1cddab051feac11d7e939dba14ed637b297ea42a0426bc0a1a3bc665998a91c27ca10d28704ce9e2d3d90e73595 + HEAD_REF master + PATCHES + 0001-enable-shared-build.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CURRENT_INSTALLED_DIR}/include/GL/glcorearb.h" DESTINATION "${SOURCE_PATH}/include/GL") +file(COPY "${CURRENT_INSTALLED_DIR}/include/KHR/khrplatform.h" DESTINATION "${SOURCE_PATH}/include/KHR") + +vcpkg_find_acquire_program(PYTHON3) + +vcpkg_execute_required_process( + COMMAND "${PYTHON3}" "${SOURCE_PATH}/gl3w_gen.py" + WORKING_DIRECTORY "${SOURCE_PATH}" + LOGNAME gl3w-gen +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/GL/gl3w.h" "#define GL3W_API" "#define GL3W_API __declspec(dllimport)") +endif() + +file(INSTALL "${SOURCE_PATH}/UNLICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/gl3w/vcpkg.json b/externals/vcpkg/ports/gl3w/vcpkg.json new file mode 100755 index 000000000..096357171 --- /dev/null +++ b/externals/vcpkg/ports/gl3w/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "gl3w", + "version-date": "2018-05-31", + "port-version": 4, + "description": "Simple OpenGL core profile loading", + "homepage": "https://github.com/skaslev/gl3w", + "dependencies": [ + "egl-registry", + "opengl-registry", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/glad/encoding.patch b/externals/vcpkg/ports/glad/encoding.patch new file mode 100755 index 000000000..0497cc79a --- /dev/null +++ b/externals/vcpkg/ports/glad/encoding.patch @@ -0,0 +1,13 @@ +diff --git a/glad/__main__.py b/glad/__main__.py +index e7c0544a5..1e10dcc60 100644 +--- a/glad/__main__.py ++++ b/glad/__main__.py +@@ -32,7 +32,7 @@ def main(): + if reproducible: + logger.info('reproducible build, using packaged specification: \'%s.xml\'', value) + try: +- return spec_cls.from_file(glad.files.open_local(value + '.xml')) ++ return spec_cls.from_file(glad.files.open_local(value + '.xml', encoding='utf-8-sig')) + except IOError: + raise ValueError('unable to open reproducible copy of {}.xml, ' + 'try dropping --reproducible'.format(value)) diff --git a/externals/vcpkg/ports/glad/find_python.patch b/externals/vcpkg/ports/glad/find_python.patch new file mode 100755 index 000000000..c1f13229b --- /dev/null +++ b/externals/vcpkg/ports/glad/find_python.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c4031a6..6a106e9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,16 +23,6 @@ project(GLAD VERSION 0.1.34 LANGUAGES C) + + set(GLAD_DIR "${CMAKE_CURRENT_SOURCE_DIR}") + +-# Find the python interpreter, set the PYTHON_EXECUTABLE variable +-if (CMAKE_VERSION VERSION_LESS 3.12) +- # this logic is deprecated in CMake after 3.12 +- find_package(PythonInterp REQUIRED) +-else() +- # the new hotness. This will preferentially find Python3 instead of Python2 +- find_package(Python) +- set(PYTHON_EXECUTABLE ${Python_EXECUTABLE}) +-endif() +- + # Options + set(GLAD_OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}" CACHE STRING "Output directory") + set(GLAD_PROFILE "compatibility" CACHE STRING "OpenGL profile") diff --git a/externals/vcpkg/ports/glad/portfile.cmake b/externals/vcpkg/ports/glad/portfile.cmake new file mode 100755 index 000000000..f37f873c8 --- /dev/null +++ b/externals/vcpkg/ports/glad/portfile.cmake @@ -0,0 +1,149 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Dav1dde/glad + REF 7ece538856bf124d798ab323c8e1e64ebb83cb50 + SHA512 f6a8ba7d0d09b89c23b6f76962d3e6eef1babc8e1a659e238d30e143eb33ccba424957e5a6d46d99a714bfa2967523b193586d0ff24e29ad8d86c92c9faf9c02 + HEAD_REF master + PATCHES encoding.patch find_python.patch +) + +if(NOT GLAD_PROFILE) + set(GLAD_PROFILE "compatibility") +endif() +message(STATUS "This version of glad uses the compatibility profile. To use the core profile instead, create an overlay port of this with GLAD_PROFILE set to 'core' or set GLAD_PROFILE to 'core' in a custom triplet.") +message(STATUS "This recipe is at ${CMAKE_CURRENT_LIST_DIR}") +message(STATUS "See the overlay ports documentation at https://github.com/microsoft/vcpkg/blob/master/docs/specifications/ports-overlay.md") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + extensions GLAD_ALL_EXTENSIONS + INVERTED_FEATURES + loader GLAD_NO_LOADER +) + +set(GLAD_SPEC "gl") + +if("egl" IN_LIST FEATURES) + string(APPEND GLAD_SPEC ",egl") +endif() + +if("wgl" IN_LIST FEATURES) + string(APPEND GLAD_SPEC ",wgl") +endif() + +if("glx" IN_LIST FEATURES) + string(APPEND GLAD_SPEC ",glx") +endif() + +# This needs to be ordered highest to lowest for it to be correct! +if("gl-api-latest" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gl=") +elseif("gl-api-46" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gl=4.6") +elseif("gl-api-45" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gl=4.5") +elseif("gl-api-44" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gl=4.4") +elseif("gl-api-43" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gl=4.3") +elseif("gl-api-42" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gl=4.2") +elseif("gl-api-41" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gl=4.1") +elseif("gl-api-40" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gl=4.0") +elseif("gl-api-33" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gl=3.3") +elseif("gl-api-32" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gl=3.2") +elseif("gl-api-31" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gl=3.1") +elseif("gl-api-30" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gl=3.0") +elseif("gl-api-21" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gl=2.1") +elseif("gl-api-20" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gl=2.0") +elseif("gl-api-15" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gl=1.5") +elseif("gl-api-14" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gl=1.4") +elseif("gl-api-13" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gl=1.3") +elseif("gl-api-12" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gl=1.2") +elseif("gl-api-11" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gl=1.1") +elseif("gl-api-10" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gl=1.0") +endif() + +# This needs to be ordered highest to lowest for it to be correct! +if("gles1-api-latest" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gles1=") +elseif("gles1-api-10" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gles1=1.0") +endif() + +# This needs to be ordered highest to lowest for it to be correct! +if("gles2-api-latest" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gles2=") +elseif("gles2-api-32" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gles2=3.2") +elseif("gles2-api-31" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gles2=3.1") +elseif("gles2-api-30" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gles2=3.0") +elseif("gles2-api-20" IN_LIST FEATURES) + LIST(APPEND GLAD_API "gles2=2.0") +endif() + +# This needs to be ordered highest to lowest for it to be correct! +if("glsc2-api-latest" IN_LIST FEATURES) + LIST(APPEND GLAD_API "glsc2=") +elseif("glsc2-api-20" IN_LIST FEATURES) + LIST(APPEND GLAD_API "glsc2=2.0") +endif() + +string(REPLACE ";" "," GLAD_API "${GLAD_API}") + +vcpkg_find_acquire_program(PYTHON3) + +file(COPY + "${CURRENT_INSTALLED_DIR}/include/KHR/khrplatform.h" + "${CURRENT_INSTALLED_DIR}/include/EGL/eglplatform.h" + "${CURRENT_INSTALLED_DIR}/share/opengl/egl.xml" + "${CURRENT_INSTALLED_DIR}/share/opengl/gl.xml" + "${CURRENT_INSTALLED_DIR}/share/opengl/glx.xml" + "${CURRENT_INSTALLED_DIR}/share/opengl/wgl.xml" + DESTINATION "${SOURCE_PATH}/glad/files" +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DGLAD_EXPORT=OFF + -DGLAD_INSTALL=ON + -DGLAD_REPRODUCIBLE=ON + -DGLAD_SPEC=${GLAD_SPEC} + -DGLAD_API=${GLAD_API} + -DGLAD_PROFILE=${GLAD_PROFILE} + -DPYTHON_EXECUTABLE=${PYTHON3} + ${FEATURE_OPTIONS} + OPTIONS_DEBUG + -DGLAD_GENERATOR="c-debug" + OPTIONS_RELEASE + -DGLAD_GENERATOR="c" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/glad) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/include/KHR") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/include/EGL") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/glad/vcpkg.json b/externals/vcpkg/ports/glad/vcpkg.json new file mode 100755 index 000000000..2be2bd2a1 --- /dev/null +++ b/externals/vcpkg/ports/glad/vcpkg.json @@ -0,0 +1,353 @@ +{ + "name": "glad", + "version": "0.1.34", + "port-version": 3, + "description": "Multi-Language Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specs.", + "homepage": "https://github.com/Dav1dde/glad", + "documentation": "https://github.com/Dav1dde/glad/wiki", + "license": "MIT", + "dependencies": [ + "egl-registry", + "opengl-registry", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "loader" + ], + "features": { + "egl": { + "description": "Use `egl` spec instead of `gl`." + }, + "extensions": { + "description": "Enables all extensions." + }, + "gl-api-10": { + "description": "Imports extensions from OpenGL API specification version 1.0." + }, + "gl-api-11": { + "description": "Imports extensions from OpenGL API specification version 1.1.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "gl-api-10" + ] + } + ] + }, + "gl-api-12": { + "description": "Imports extensions from OpenGL API specification version 1.2.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "gl-api-11" + ] + } + ] + }, + "gl-api-13": { + "description": "Imports extensions from OpenGL API specification version 1.3.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "gl-api-12" + ] + } + ] + }, + "gl-api-14": { + "description": "Imports extensions from OpenGL API specification version 1.4.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "gl-api-13" + ] + } + ] + }, + "gl-api-15": { + "description": "Imports extensions from OpenGL API specification version 1.5.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "gl-api-14" + ] + } + ] + }, + "gl-api-20": { + "description": "Imports extensions from OpenGL API specification version 2.0.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "gl-api-15" + ] + } + ] + }, + "gl-api-21": { + "description": "Imports extensions from OpenGL API specification version 2.1.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "gl-api-20" + ] + } + ] + }, + "gl-api-30": { + "description": "Imports extensions from OpenGL API specification version 3.0.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "gl-api-21" + ] + } + ] + }, + "gl-api-31": { + "description": "Imports extensions from OpenGL API specification version 3.1.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "gl-api-30" + ] + } + ] + }, + "gl-api-32": { + "description": "Imports extensions from OpenGL API specification version 3.2.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "gl-api-31" + ] + } + ] + }, + "gl-api-33": { + "description": "Imports extensions from OpenGL API specification version 3.3.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "gl-api-32" + ] + } + ] + }, + "gl-api-40": { + "description": "Imports extensions from OpenGL API specification version 4.0.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "gl-api-33" + ] + } + ] + }, + "gl-api-41": { + "description": "Imports extensions from OpenGL API specification version 4.1.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "gl-api-40" + ] + } + ] + }, + "gl-api-42": { + "description": "Imports extensions from OpenGL API specification version 4.2.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "gl-api-41" + ] + } + ] + }, + "gl-api-43": { + "description": "Imports extensions from OpenGL API specification version 4.3.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "gl-api-42" + ] + } + ] + }, + "gl-api-44": { + "description": "Imports extensions from OpenGL API specification version 4.4.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "gl-api-43" + ] + } + ] + }, + "gl-api-45": { + "description": "Imports extensions from OpenGL API specification version 4.5.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "gl-api-44" + ] + } + ] + }, + "gl-api-46": { + "description": "Imports extensions from OpenGL API specification version 4.6.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "gl-api-45" + ] + } + ] + }, + "gl-api-latest": { + "description": "Imports extensions from latest OpenGL API specification version.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "gl-api-46" + ] + } + ] + }, + "gles1-api-10": { + "description": "Imports extensions from OpenGL ES 1 specification version 1.0." + }, + "gles1-api-latest": { + "description": "Imports extensions from latest OpenGL ES 1 specification.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "gles1-api-10" + ] + } + ] + }, + "gles2-api-20": { + "description": "Imports extensions from OpenGL ES 2 specification version 2.0." + }, + "gles2-api-30": { + "description": "Imports extensions from OpenGL ES 2 specification version 3.0.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "gles2-api-20" + ] + } + ] + }, + "gles2-api-31": { + "description": "Imports extensions from OpenGL ES 2 specification version 3.1.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "gles2-api-30" + ] + } + ] + }, + "gles2-api-32": { + "description": "Imports extensions from OpenGL ES 2 specification version 3.2.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "gles2-api-31" + ] + } + ] + }, + "gles2-api-latest": { + "description": "Imports extensions from latest OpenGL ES 2 specification.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "gles2-api-32" + ] + } + ] + }, + "glsc2-api-20": { + "description": "Imports extensions from OpenGL SC API specification version 2.0." + }, + "glsc2-api-latest": { + "description": "Imports extensions from latest OpenGL SC API specification.", + "dependencies": [ + { + "name": "glad", + "default-features": false, + "features": [ + "glsc2-api-20" + ] + } + ] + }, + "glx": { + "description": "Use `glx` spec instead of `gl`. Only available with the X Window System." + }, + "loader": { + "description": "Generate loader logic." + }, + "wgl": { + "description": "Use `wgl` spec instead of `gl`. Only available for Windows and UWP platforms." + } + } +} diff --git a/externals/vcpkg/ports/glbinding/0001_force-system-install.patch b/externals/vcpkg/ports/glbinding/0001_force-system-install.patch new file mode 100755 index 000000000..1674f145a --- /dev/null +++ b/externals/vcpkg/ports/glbinding/0001_force-system-install.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 011577a..e52d19d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -42,11 +42,13 @@ include(cmake/GenerateTemplateExportHeader.cmake) + # + + # Get git revision ++if(NOT DEFINED GIT_REV) + get_git_head_revision(GIT_REFSPEC GIT_SHA1) + string(SUBSTRING "${GIT_SHA1}" 0 12 GIT_REV) + if(NOT GIT_SHA1) + set(GIT_REV "0") + endif() ++endif() + + # Meta information about the project + set(META_PROJECT_NAME "glbinding") +@@ -135,7 +137,7 @@ if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr" OR "${CMAKE_INSTALL_PREFIX}" STREQU + endif() + + # Installation paths +-if(UNIX AND SYSTEM_DIR_INSTALL) ++if(1) + # Install into the system (/usr/bin or /usr/local/bin) + set(INSTALL_ROOT "share/${project}") # /usr/[local]/share/ + set(INSTALL_CMAKE "share/${project}/cmake") # /usr/[local]/share//cmake +@@ -148,7 +150,7 @@ if(UNIX AND SYSTEM_DIR_INSTALL) + set(INSTALL_DOC "share/doc/${project}") # /usr/[local]/share/doc/ + set(INSTALL_SHORTCUTS "share/applications") # /usr/[local]/share/applications + set(INSTALL_ICONS "share/pixmaps") # /usr/[local]/share/pixmaps +- set(INSTALL_INIT "/etc/init") # /etc/init (upstart init scripts) ++ set(INSTALL_INIT "etc/init") # /etc/init (upstart init scripts) + else() + # Install into local directory + set(INSTALL_ROOT ".") # ./ diff --git a/externals/vcpkg/ports/glbinding/0002_fix-uwpmacro.patch b/externals/vcpkg/ports/glbinding/0002_fix-uwpmacro.patch new file mode 100755 index 000000000..61c179662 --- /dev/null +++ b/externals/vcpkg/ports/glbinding/0002_fix-uwpmacro.patch @@ -0,0 +1,33 @@ +diff --git a/source/glbinding/CMakeLists.txt b/source/glbinding/CMakeLists.txt +index 97654c8..bca68d1 100644 +--- a/source/glbinding/CMakeLists.txt ++++ b/source/glbinding/CMakeLists.txt +@@ -261,6 +261,11 @@ target_link_libraries(${target} + # Compile definitions + # + ++ ++if (CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") ++ target_compile_definitions(${target} PRIVATE SYSTEM_WINDOWS WINDOWS_STORE) ++endif() ++ + target_compile_definitions(${target} + PRIVATE + # since we use stl and stl is intended to use exceptions, exceptions should not be disabled +diff --git a/source/glbinding/source/getProcAddress.cpp b/source/glbinding/source/getProcAddress.cpp +index c1cfc5c..7e5f8bc 100644 +--- a/source/glbinding/source/getProcAddress.cpp ++++ b/source/glbinding/source/getProcAddress.cpp +@@ -18,7 +18,11 @@ namespace glbinding { + + ProcAddress getProcAddress(const char * name) + { +- static auto module = LoadLibrary(_T("OPENGL32.DLL")); ++#ifdef WINDOWS_STORE ++ static auto module = ::LoadPackagedLibrary(_T("OPENGL32.DLL"), 0); ++#else ++ static auto module = ::LoadLibrary(_T("OPENGL32.DLL")); ++#endif + + // Prevent static linking of opengl32 + static auto wglGetProcAddress_ = reinterpret_cast(::GetProcAddress(module, "wglGetProcAddress")); diff --git a/externals/vcpkg/ports/glbinding/0003_fix-cmake-configs-paths.patch b/externals/vcpkg/ports/glbinding/0003_fix-cmake-configs-paths.patch new file mode 100755 index 000000000..359837784 --- /dev/null +++ b/externals/vcpkg/ports/glbinding/0003_fix-cmake-configs-paths.patch @@ -0,0 +1,62 @@ +diff --git a/3rdparty/KHR/CMakeLists.txt b/3rdparty/KHR/CMakeLists.txt +index 25fac3a..429544f 100644 +--- a/3rdparty/KHR/CMakeLists.txt ++++ b/3rdparty/KHR/CMakeLists.txt +@@ -43,7 +43,7 @@ add_library(${target} INTERFACE) + add_library(externals::${target} ALIAS ${target}) + + # Export library for downstream projects +-export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/cmake/${target}/${target}-export.cmake) ++export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/${target}-export.cmake) + + + # +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 700b48b..8aaab8d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -141,15 +141,15 @@ endif() + if(1) + # Install into the system (/usr/bin or /usr/local/bin) + set(INSTALL_ROOT "share/${project}") # /usr/[local]/share/ +- set(INSTALL_CMAKE "share/${project}/cmake") # /usr/[local]/share//cmake ++ set(INSTALL_CMAKE "share/${project}") # /usr/[local]/share//cmake + set(INSTALL_EXAMPLES "share/${project}") # /usr/[local]/share/ + set(INSTALL_DATA "share/${project}") # /usr/[local]/share/ + set(INSTALL_BIN "bin") # /usr/[local]/bin + set(INSTALL_SHARED "lib") # /usr/[local]/lib + set(INSTALL_LIB "lib") # /usr/[local]/lib + set(INSTALL_INCLUDE "include") # /usr/[local]/include +- set(INSTALL_DOC "share/doc/${project}") # /usr/[local]/share/doc/ +- set(INSTALL_SHORTCUTS "share/applications") # /usr/[local]/share/applications ++ set(INSTALL_DOC "share/${project}/doc") # /usr/[local]/share/doc/ ++ set(INSTALL_SHORTCUTS "share/${project}/applications") # /usr/[local]/share/applications + set(INSTALL_ICONS "share/pixmaps") # /usr/[local]/share/pixmaps + set(INSTALL_INIT "etc/init") # /etc/init (upstart init scripts) + else() +diff --git a/source/glbinding-aux/CMakeLists.txt b/source/glbinding-aux/CMakeLists.txt +index 61cc166..cb0758a 100644 +--- a/source/glbinding-aux/CMakeLists.txt ++++ b/source/glbinding-aux/CMakeLists.txt +@@ -137,7 +137,7 @@ add_library(${target} + add_library(${META_PROJECT_NAME}::${target} ALIAS ${target}) + + # Export library for downstream projects +-export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/cmake/${target}/${target}-export.cmake) ++export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/${target}-export.cmake) + + # Create API export header + generate_export_header(${target} +diff --git a/source/glbinding/CMakeLists.txt b/source/glbinding/CMakeLists.txt +index bca68d1..f014494 100644 +--- a/source/glbinding/CMakeLists.txt ++++ b/source/glbinding/CMakeLists.txt +@@ -172,7 +172,7 @@ add_library(${target} + add_library(${META_PROJECT_NAME}::${target} ALIAS ${target}) + + # Export library for downstream projects +-export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/cmake/${target}/${target}-export.cmake) ++export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/${target}-export.cmake) + + # Create API export header + generate_export_header(${target} diff --git a/externals/vcpkg/ports/glbinding/0004_fix-config-expected-paths.patch b/externals/vcpkg/ports/glbinding/0004_fix-config-expected-paths.patch new file mode 100755 index 000000000..e6fb16440 --- /dev/null +++ b/externals/vcpkg/ports/glbinding/0004_fix-config-expected-paths.patch @@ -0,0 +1,35 @@ +diff --git a/glbinding-config.cmake b/glbinding-config.cmake +index 03fc505..01b6cc8 100644 +--- a/glbinding-config.cmake ++++ b/glbinding-config.cmake +@@ -1,7 +1,7 @@ + + # This config script tries to locate the project either in its source tree + # or from an install location. +-# ++# + # Please adjust the list of submodules to search for. + + +@@ -35,20 +35,11 @@ endmacro() + + # Try install location + set(MODULE_FOUND FALSE) +-find_modules("cmake") ++find_modules(".") + + if(MODULE_FOUND) + return() + endif() + +-# Try common build locations +-if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") +- find_modules("build-debug/cmake") +- find_modules("build/cmake") +-else() +- find_modules("build/cmake") +- find_modules("build-debug/cmake") +-endif() +- + # Signal success/failure to CMake + set(glbinding_FOUND ${MODULE_FOUND}) diff --git a/externals/vcpkg/ports/glbinding/portfile.cmake b/externals/vcpkg/ports/glbinding/portfile.cmake new file mode 100755 index 000000000..6aa2e4e39 --- /dev/null +++ b/externals/vcpkg/ports/glbinding/portfile.cmake @@ -0,0 +1,59 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cginternals/glbinding + REF v3.1.0 + SHA512 d7294c9a0dc47a7c107b134e5dfa78c5812fc6bf739b9fd778fa7ce946d5ea971839a65c3985e0915fd75311e4a85fb221d33a71856c460199eab0e7622f7151 + HEAD_REF master + PATCHES + 0001_force-system-install.patch + 0002_fix-uwpmacro.patch + 0003_fix-cmake-configs-paths.patch + 0004_fix-config-expected-paths.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DOPTION_BUILD_TESTS=OFF + -DOPTION_BUILD_GPU_TESTS=OFF + -DOPTION_BUILD_TOOLS=OFF + -DOPTION_BUILD_EXAMPLES=OFF + -DGIT_REV=0 + -DCMAKE_DISABLE_FIND_PACKAGE_cpplocate=ON + -DOPTION_BUILD_EXAMPLES=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/glbinding) +vcpkg_copy_pdbs() + +## _IMPORT_PREFIX needs to go up one extra level in the directory tree. +file(GLOB_RECURSE TARGET_CMAKES "${CURRENT_PACKAGES_DIR}/*-export.cmake") +foreach(TARGET_CMAKE IN LISTS TARGET_CMAKES) + file(READ ${TARGET_CMAKE} _contents) + string(REPLACE +[[ +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +]] +[[ +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +]] + _contents "${_contents}") + file(WRITE ${TARGET_CMAKE} "${_contents}") +endforeach() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Remove files already published by egl-registry +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/KHR) + +# Handle copyright +file(RENAME ${CURRENT_PACKAGES_DIR}/share/glbinding/LICENSE ${CURRENT_PACKAGES_DIR}/share/glbinding/copyright) +configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/glbinding/usage @ONLY) diff --git a/externals/vcpkg/ports/glbinding/usage b/externals/vcpkg/ports/glbinding/usage new file mode 100755 index 000000000..010a5c6da --- /dev/null +++ b/externals/vcpkg/ports/glbinding/usage @@ -0,0 +1,4 @@ +The package glbinding:@TARGET_TRIPLET@ provides CMake targets: + + find_package(glbinding CONFIG REQUIRED) + target_link_libraries(main PRIVATE glbinding::glbinding glbinding::glbinding-aux) diff --git a/externals/vcpkg/ports/glbinding/vcpkg.json b/externals/vcpkg/ports/glbinding/vcpkg.json new file mode 100755 index 000000000..4a1330896 --- /dev/null +++ b/externals/vcpkg/ports/glbinding/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "glbinding", + "version-string": "3.1.0", + "port-version": 3, + "description": "glbinding is an MIT licensed, cross-platform C++ binding for the OpenGL API", + "homepage": "https://github.com/cginternals/glbinding", + "dependencies": [ + "egl-registry" + ] +} diff --git a/externals/vcpkg/ports/glew/fix-LNK2019.patch b/externals/vcpkg/ports/glew/fix-LNK2019.patch new file mode 100755 index 000000000..8b628fa88 --- /dev/null +++ b/externals/vcpkg/ports/glew/fix-LNK2019.patch @@ -0,0 +1,17 @@ +diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt +index 419c243..f81fab4 100644 +--- a/build/cmake/CMakeLists.txt ++++ b/build/cmake/CMakeLists.txt +@@ -120,9 +120,9 @@ if (MSVC) + target_compile_options (glew PRIVATE -GS-) + target_compile_options (glew_s PRIVATE -GS-) + # remove stdlib dependency +- target_link_libraries (glew LINK_PRIVATE -nodefaultlib -noentry) +- target_link_libraries (glew LINK_PRIVATE libvcruntime.lib) +- target_link_libraries (glew LINK_PRIVATE msvcrt.lib ) ++ #target_link_libraries (glew LINK_PRIVATE -nodefaultlib -noentry) ++ #target_link_libraries (glew LINK_PRIVATE libvcruntime.lib) ++ #target_link_libraries (glew LINK_PRIVATE msvcrt.lib ) + string(REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) + elseif (WIN32 AND ((CMAKE_C_COMPILER_ID MATCHES "GNU") OR (CMAKE_C_COMPILER_ID MATCHES "Clang"))) + # remove stdlib dependency on windows with GCC and Clang (for similar reasons diff --git a/externals/vcpkg/ports/glew/portfile.cmake b/externals/vcpkg/ports/glew/portfile.cmake new file mode 100755 index 000000000..dc64a2aca --- /dev/null +++ b/externals/vcpkg/ports/glew/portfile.cmake @@ -0,0 +1,73 @@ +if(VCPKG_TARGET_IS_LINUX) + message(WARNING "${PORT} requires the following libraries from the system package manager:\n libxmu-dev\n libxi-dev\n libgl-dev\n\nThese can be installed on Ubuntu systems via apt-get install libxmu-dev libxi-dev libgl-dev.") +endif() + +# Don't change to vcpkg_from_github! The sources in the git repository (archives) are missing some files that are distributed inside releases. +# More info: https://github.com/nigels-com/glew/issues/31 and https://github.com/nigels-com/glew/issues/13 +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/nigels-com/glew/releases/download/glew-2.2.0/glew-2.2.0.tgz" + FILENAME "glew-2.2.0.tgz" + SHA512 57453646635609d54f62fb32a080b82b601fd471fcfd26e109f479b3fef6dfbc24b83f4ba62916d07d62cd06d1409ad7aa19bc1cd7cf3639c103c815b8be31d1 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF glew + PATCHES + fix-LNK2019.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/build/cmake" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DBUILD_UTILS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/glew) +# Skip check the required dependency opengl +vcpkg_fixup_pkgconfig(SKIP_CHECK) + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) +set(_targets_cmake_files) +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + list(APPEND _targets_cmake_files "${CURRENT_PACKAGES_DIR}/share/glew/glew-targets-debug.cmake") +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + list(APPEND _targets_cmake_files "${CURRENT_PACKAGES_DIR}/share/glew/glew-targets-release.cmake") +endif() + +foreach(FILE ${_targets_cmake_files}) + file(READ ${FILE} _contents) + string(REPLACE "libglew32" "glew32" _contents "${_contents}") + file(WRITE ${FILE} "${_contents}") +endforeach() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/libglew32.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libglew32.lib" "${CURRENT_PACKAGES_DIR}/lib/glew32.lib") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/libglew32d.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libglew32d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/glew32d.lib") +endif() +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + foreach(FILE "${CURRENT_PACKAGES_DIR}/include/GL/glew.h" "${CURRENT_PACKAGES_DIR}/include/GL/wglew.h" "${CURRENT_PACKAGES_DIR}/include/GL/glxew.h") + file(READ ${FILE} _contents) + string(REPLACE "#ifdef GLEW_STATIC" "#if 1" _contents "${_contents}") + file(WRITE ${FILE} "${_contents}") + endforeach() +endif() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/glew/usage b/externals/vcpkg/ports/glew/usage new file mode 100755 index 000000000..c0678a825 --- /dev/null +++ b/externals/vcpkg/ports/glew/usage @@ -0,0 +1,4 @@ +The package glew is compatible with built-in CMake targets: + + find_package(GLEW REQUIRED) + target_link_libraries(main PRIVATE GLEW::GLEW) diff --git a/externals/vcpkg/ports/glew/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/glew/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..6ad9ae434 --- /dev/null +++ b/externals/vcpkg/ports/glew/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,25 @@ +include(SelectLibraryConfigurations) +_find_package(GLEW CONFIG) +if(GLEW_FOUND AND TARGET GLEW::GLEW AND NOT DEFINED GLEW_INCLUDE_DIRS) + get_target_property(GLEW_INCLUDE_DIRS GLEW::GLEW INTERFACE_INCLUDE_DIRECTORIES) + set(GLEW_INCLUDE_DIR ${GLEW_INCLUDE_DIRS}) + get_target_property(_GLEW_DEFS GLEW::GLEW INTERFACE_COMPILE_DEFINITIONS) + if("${_GLEW_DEFS}" MATCHES "GLEW_STATIC") + get_target_property(GLEW_LIBRARY_DEBUG GLEW::GLEW IMPORTED_LOCATION_DEBUG) + get_target_property(GLEW_LIBRARY_RELEASE GLEW::GLEW IMPORTED_LOCATION_RELEASE) + else() + get_target_property(GLEW_LIBRARY_DEBUG GLEW::GLEW IMPORTED_IMPLIB_DEBUG) + get_target_property(GLEW_LIBRARY_RELEASE GLEW::GLEW IMPORTED_IMPLIB_RELEASE) + endif() + get_target_property(_GLEW_LINK_INTERFACE GLEW::GLEW IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE) # same for debug and release + list(APPEND GLEW_LIBRARIES ${_GLEW_LINK_INTERFACE}) + list(APPEND GLEW_LIBRARY ${_GLEW_LINK_INTERFACE}) + select_library_configurations(GLEW) + if("${_GLEW_DEFS}" MATCHES "GLEW_STATIC") + set(GLEW_STATIC_LIBRARIES ${GLEW_LIBRARIES}) + else() + set(GLEW_SHARED_LIBRARIES ${GLEW_LIBRARIES}) + endif() + unset(_GLEW_DEFS) + unset(_GLEW_LINK_INTERFACE) +endif() \ No newline at end of file diff --git a/externals/vcpkg/ports/glew/vcpkg.json b/externals/vcpkg/ports/glew/vcpkg.json new file mode 100755 index 000000000..7468ecadf --- /dev/null +++ b/externals/vcpkg/ports/glew/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "glew", + "version-string": "2.2.0", + "description": "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library.", + "homepage": "https://github.com/nigels-com/glew", + "dependencies": [ + "opengl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/glfw3/portfile.cmake b/externals/vcpkg/ports/glfw3/portfile.cmake new file mode 100755 index 000000000..c95a6d6b3 --- /dev/null +++ b/externals/vcpkg/ports/glfw3/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO glfw/glfw + REF 45ce5ddd197d5c58f50fdd3296a5131c894e5527 #v3.3.7 + SHA512 0802b499cb56f5c4f575304279aafe7d812443fcf3dbfa75178cfba7a3693fb88731ae5dd29c6937598ba977de156d92af1ea99929b70ff72ed8429693f301c7 + HEAD_REF master +) + +if(VCPKG_TARGET_IS_LINUX) + message( +"GLFW3 currently requires the following libraries from the system package manager: + xinerama + xcursor + xorg + libglu1-mesa + +These can be installed on Ubuntu systems via sudo apt install libxinerama-dev libxcursor-dev xorg-dev libglu1-mesa-dev") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DGLFW_BUILD_EXAMPLES=OFF + -DGLFW_BUILD_TESTS=OFF + -DGLFW_BUILD_DOCS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/glfw3) + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/glfw3/vcpkg.json b/externals/vcpkg/ports/glfw3/vcpkg.json new file mode 100755 index 000000000..ef22ea545 --- /dev/null +++ b/externals/vcpkg/ports/glfw3/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "glfw3", + "version-semver": "3.3.7", + "description": "GLFW is a free, Open Source, multi-platform library for OpenGL, OpenGL ES and Vulkan application development. It provides a simple, platform-independent API for creating windows, contexts and surfaces, reading input, handling events, etc.", + "homepage": "https://github.com/glfw/glfw", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/gli/disable-test.patch b/externals/vcpkg/ports/gli/disable-test.patch new file mode 100755 index 000000000..d6bf0d7ce --- /dev/null +++ b/externals/vcpkg/ports/gli/disable-test.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6eb1a68..610c0bc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -71,7 +71,7 @@ endmacro(addExternalPackageGTC) + # Add subdirectory + + add_subdirectory(gli) +-add_subdirectory(test) ++#add_subdirectory(test) + #add_subdirectory(doc) + + ################################ diff --git a/externals/vcpkg/ports/gli/portfile.cmake b/externals/vcpkg/ports/gli/portfile.cmake new file mode 100755 index 000000000..5168aca1e --- /dev/null +++ b/externals/vcpkg/ports/gli/portfile.cmake @@ -0,0 +1,28 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO g-truc/gli + REF 779b99ac6656e4d30c3b24e96e0136a59649a869 + SHA512 6e7ab46b7943cb185c8c1f6e45b765f5463e03628973043a0e8b866458ccceb5249f69a2a77b5e69c73f3ace85af96c7b9b2137685ceb6d0fcb67e491a49be69 + HEAD_REF master + PATCHES + disable-test.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gli) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE ${CURRENT_PACKAGES_DIR}/include/gli/CMakeLists.txt) + +# Put the license file where vcpkg expects it +# manual.md contains the "licenses" section for the project +file(INSTALL ${SOURCE_PATH}/manual.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/gli/vcpkg.json b/externals/vcpkg/ports/gli/vcpkg.json new file mode 100755 index 000000000..e1d746619 --- /dev/null +++ b/externals/vcpkg/ports/gli/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "gli", + "version-date": "2021-07-06", + "description": "OpenGL Image (GLI)", + "homepage": "https://gli.g-truc.net", + "dependencies": [ + "glm" + ] +} diff --git a/externals/vcpkg/ports/glib/libintl.patch b/externals/vcpkg/ports/glib/libintl.patch new file mode 100755 index 000000000..c21c27942 --- /dev/null +++ b/externals/vcpkg/ports/glib/libintl.patch @@ -0,0 +1,50 @@ +diff --git a/meson.build b/meson.build +index c418f50b1..e7158c036 100644 +--- a/meson.build ++++ b/meson.build +@@ -2048,42 +2048,10 @@ endif + # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible + # implementations. This could be extended if issues are found in some platforms. + libintl_deps = [] +-if cc.has_function('ngettext', args : osx_ldflags) +- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset') +-else +- # First just find the bare library. +- libintl = cc.find_library('intl', required : false) +- # The bare library probably won't link without help if it's static. +- if libintl.found() and not cc.has_function('ngettext', args : osx_ldflags, dependencies : libintl) +- libintl_iconv = cc.find_library('iconv', required : false) +- # libintl supports different threading APIs, which may not +- # require additional flags, but it defaults to using pthreads if +- # found. Meson's "threads" dependency does not allow you to +- # prefer pthreads. We may not be using pthreads for glib itself +- # either so just link the library to satisfy libintl rather than +- # also defining the macros with the -pthread flag. +- libintl_pthread = cc.find_library('pthread', required : false) +- # Try linking with just libiconv. +- if libintl_iconv.found() and cc.has_function('ngettext', args : osx_ldflags, dependencies : [libintl, libintl_iconv]) +- libintl_deps += [libintl_iconv] +- # Then also try linking with pthreads. +- elif libintl_iconv.found() and libintl_pthread.found() and cc.has_function('ngettext', args : osx_ldflags, dependencies : [libintl, libintl_iconv, libintl_pthread]) +- libintl_deps += [libintl_iconv, libintl_pthread] +- else +- libintl = disabler() +- endif +- endif +- if not libintl.found() +- libintl = subproject('proxy-libintl').get_variable('intl_dep') +- libintl_deps = [libintl] + libintl_deps +- have_bind_textdomain_codeset = true # proxy-libintl supports it +- else +- libintl_deps = [libintl] + libintl_deps +- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', args : osx_ldflags, ++libintl = dependency('Intl', method:'cmake', required : true) ++libintl_deps += [libintl] ++have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', args : osx_ldflags, + dependencies : libintl_deps) +- endif +-endif +- + glib_conf.set('HAVE_BIND_TEXTDOMAIN_CODESET', have_bind_textdomain_codeset) + + # We require gettext to always be present diff --git a/externals/vcpkg/ports/glib/portfile.cmake b/externals/vcpkg/ports/glib/portfile.cmake new file mode 100755 index 000000000..945b2783b --- /dev/null +++ b/externals/vcpkg/ports/glib/portfile.cmake @@ -0,0 +1,125 @@ +# Glib relies on DllMain on Windows +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + #remove if merged: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1655 +endif() + +set(GLIB_MAJOR_MINOR 2.70) +set(GLIB_PATCH 5) +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.gnome.org/ + OUT_SOURCE_PATH SOURCE_PATH + REPO GNOME/glib + REF "${GLIB_MAJOR_MINOR}.${GLIB_PATCH}" + SHA512 69c032358e0a0d88414a97e0bc898b5ce2797839a432b95790d03f108e55a79eee2d51bab5e281cc9469e2a57accc0d2c9bbaa80f9369050534387d1a215dd98 + PATCHES + use-libiconv-on-windows.patch + libintl.patch +) + +if (selinux IN_LIST FEATURES) + if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT EXISTS "/usr/include/selinux") + message("Selinux was not found in its typical system location. Your build may fail. You can install Selinux with \"apt-get install selinux\".") + endif() + list(APPEND OPTIONS -Dselinux=enabled) +else() + list(APPEND OPTIONS -Dselinux=disabled) +endif() + +if (libmount IN_LIST FEATURES) + list(APPEND OPTIONS -Dlibmount=enabled) +else() + list(APPEND OPTIONS -Dlibmount=disabled) +endif() + +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS -Diconv=external) +endif() + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dinstalled_tests=false + ${OPTIONS} + -Dtests=false + -Dxattr=false + -Dlibelf=disabled +) + +vcpkg_install_meson(ADD_BIN_TO_PATH) + +vcpkg_copy_pdbs() + +set(GLIB_TOOLS gdbus + gio + gio-querymodules + glib-compile-resources + glib-compile-schemas + gobject-query + gresource + gsettings + ) + +if(NOT VCPKG_TARGET_IS_WINDOWS) + if(NOT VCPKG_TARGET_IS_OSX) + list(APPEND GLIB_TOOLS gapplication) + endif() + list(APPEND GLIB_TOOLS glib-gettextize gtester) +endif() +set(GLIB_SCRIPTS gdbus-codegen glib-genmarshal glib-mkenums gtester-report) + + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "x64|arm64") + list(APPEND GLIB_TOOLS gspawn-win64-helper${VCPKG_EXECUTABLE_SUFFIX} + gspawn-win64-helper-console${VCPKG_EXECUTABLE_SUFFIX}) +elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + list(APPEND GLIB_TOOLS gspawn-win32-helper${VCPKG_EXECUTABLE_SUFFIX} + gspawn-win32-helper-console${VCPKG_EXECUTABLE_SUFFIX}) +endif() +vcpkg_copy_tools(TOOL_NAMES ${GLIB_TOOLS} AUTO_CLEAN) +foreach(script IN LISTS GLIB_SCRIPTS) + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${script}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${script}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${script}") +endforeach() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +IF(VCPKG_TARGET_IS_WINDOWS) + set(SYSTEM_LIBRARIES dnsapi iphlpapi winmm lshlwapi) +else() + set(SYSTEM_LIBRARIES resolv mount blkid selinux) +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gio-2.0.pc") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gio-2.0.pc" "\${bindir}" "\${bindir}/../tools/${PORT}") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gio-2.0.pc") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gio-2.0.pc" "\${bindir}" "\${bindir}/../../tools/${PORT}") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glib-2.0.pc") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glib-2.0.pc" "\${bindir}" "\${bindir}/../tools/${PORT}") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glib-2.0.pc") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glib-2.0.pc" "\${bindir}" "\${bindir}/../../tools/${PORT}") +endif() +vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES ${SYSTEM_LIBRARIES}) + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# Fix python scripts +set(_file "${CURRENT_PACKAGES_DIR}/tools/${PORT}/gdbus-codegen") +file(READ "${_file}" _contents) +string(REPLACE "elif os.path.basename(filedir) == 'bin':" "elif os.path.basename(filedir) == 'tools':" _contents "${_contents}") +string(REPLACE "path = os.path.join(filedir, '..', 'share', 'glib-2.0')" "path = os.path.join(filedir, '../..', 'share', 'glib-2.0')" _contents "${_contents}") +string(REPLACE "path = os.path.join(filedir, '..')" "path = os.path.join(filedir, '../../share/glib-2.0')" _contents "${_contents}") +string(REPLACE "path = os.path.join('${CURRENT_PACKAGES_DIR}/share', 'glib-2.0')" "path = os.path.join('unuseable/share', 'glib-2.0')" _contents "${_contents}") + +file(WRITE "${_file}" "${_contents}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/gdb") +if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/glib/glib-gettextize") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/glib/glib-gettextize" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") +endif() diff --git a/externals/vcpkg/ports/glib/use-libiconv-on-windows.patch b/externals/vcpkg/ports/glib/use-libiconv-on-windows.patch new file mode 100755 index 000000000..a8ccde0a5 --- /dev/null +++ b/externals/vcpkg/ports/glib/use-libiconv-on-windows.patch @@ -0,0 +1,28 @@ +diff --git a/glib/gconvert.c b/glib/gconvert.c +index 3deac78..134ded9 100644 +--- a/glib/gconvert.c ++++ b/glib/gconvert.c +@@ -30,7 +30,8 @@ + #include + + #ifdef G_OS_WIN32 +-#include "win_iconv.c" ++#define USE_LIBICONV_GNU ++#include + #endif + + #ifdef G_PLATFORM_WIN32 +diff --git a/meson.build b/meson.build +index d938ddf51..2ba256115 100644 +--- a/meson.build ++++ b/meson.build +@@ -1914,7 +1914,8 @@ glibconfig_conf.set10('G_HAVE_GROWING_STACK', growing_stack) + # the built-in implementation + iconv_opt = get_option('iconv') + if host_system == 'windows' +- libiconv = [] ++ libiconv = [cc.find_library('iconv')] ++ found_iconv = true + # We have a #include "win_iconv.c" in gconvert.c on Windows, so we don't need + # any external library for it + if iconv_opt != 'auto' diff --git a/externals/vcpkg/ports/glib/vcpkg.json b/externals/vcpkg/ports/glib/vcpkg.json new file mode 100755 index 000000000..b431aa6e4 --- /dev/null +++ b/externals/vcpkg/ports/glib/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "glib", + "version": "2.70.5", + "port-version": 2, + "description": "Portable, general-purpose utility library.", + "homepage": "https://developer.gnome.org/glib/", + "license": "LGPL-2.1-only", + "supports": "!uwp & !(windows & static)", + "dependencies": [ + "dirent", + "gettext", + "libffi", + "libiconv", + "pcre", + { + "name": "vcpkg-tool-meson", + "host": true + }, + "zlib" + ], + "features": { + "libmount": { + "description": "Build with libmount support.", + "supports": "linux", + "dependencies": [ + "libmount" + ] + }, + "selinux": { + "description": "Build with selinux support." + } + } +} diff --git a/externals/vcpkg/ports/glibmm/build-support-vs2022-builds.patch b/externals/vcpkg/ports/glibmm/build-support-vs2022-builds.patch new file mode 100755 index 000000000..b1efb9c20 --- /dev/null +++ b/externals/vcpkg/ports/glibmm/build-support-vs2022-builds.patch @@ -0,0 +1,41 @@ +commit b3a77c3f0b7dd2e1405a781ac9a76f648779d7fa +Author: Chun-wei Fan +Date: Tue Nov 9 14:28:14 2021 +0800 + + Build: Support VS2022 builds + + Make these builds distinct from the Visual Studio 2019 builds. + +diff --git a/MSVC_NMake/detectenv-msvc.mak b/MSVC_NMake/detectenv-msvc.mak +index 6933505d..16d57810 100644 +--- a/MSVC_NMake/detectenv-msvc.mak ++++ b/MSVC_NMake/detectenv-msvc.mak +@@ -98,9 +98,12 @@ PDBVER = 14 + !if $(VCVERSION) > 1909 && $(VCVERSION) < 1920 + VSVER_SUFFIX = 1 + VSVER = 15 +-!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 2000 ++!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 1930 + VSVER_SUFFIX = 2 + VSVER = 16 ++!elseif $(VCVERSION) > 1929 && $(VCVERSION) < 2000 ++VSVER_SUFFIX = 3 ++VSVER = 17 + !else + VSVER = $(PDBVER) + !endif +diff --git a/meson.build b/meson.build +index b7c7f77e..a2ee5ef3 100644 +--- a/meson.build ++++ b/meson.build +@@ -231,7 +231,9 @@ if is_msvc + add_project_arguments(disabled_warnings, language: 'cpp') + + if use_msvc14x_toolset_ver +- if cpp_compiler.version().version_compare('>=19.20') ++ if cpp_compiler.version().version_compare('>=19.30') ++ msvc14x_toolset_ver = '-vc143' ++ elif cpp_compiler.version().version_compare('>=19.20') + msvc14x_toolset_ver = '-vc142' + elif cpp_compiler.version().version_compare('>=19.10') + msvc14x_toolset_ver = '-vc141' diff --git a/externals/vcpkg/ports/glibmm/portfile.cmake b/externals/vcpkg/ports/glibmm/portfile.cmake new file mode 100755 index 000000000..4e81c03de --- /dev/null +++ b/externals/vcpkg/ports/glibmm/portfile.cmake @@ -0,0 +1,35 @@ +# Glib uses winapi functions not available in WindowsStore + +vcpkg_download_distfile(ARCHIVE + URLS "https://ftp.gnome.org/pub/GNOME/sources/glibmm/2.70/glibmm-2.70.0.tar.xz" + FILENAME "glibmm-2.70.0.tar.xz" + SHA512 059cab7f0b865303cef3cba6c4f3a29ae4e359aba428f5e79cea6fedd3f1e082199f673323cf804902cee14b91739598fbc6ff706ec36f19c4d793d032782518 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + build-support-vs2022-builds.patch +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dbuild-examples=false + -Dmsvc14x-parallel-installable=false +) +vcpkg_install_meson() +vcpkg_copy_pdbs() + +# intentionally 2.68 - glib does not install glibmm-2.70 files +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/lib/glibmm-2.68/proc" + "${CURRENT_PACKAGES_DIR}/lib/glibmm-2.68/proc" +) + +vcpkg_fixup_pkgconfig() + +# Handle copyright and readme +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME readme.txt) diff --git a/externals/vcpkg/ports/glibmm/vcpkg.json b/externals/vcpkg/ports/glibmm/vcpkg.json new file mode 100755 index 000000000..65316647d --- /dev/null +++ b/externals/vcpkg/ports/glibmm/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "glibmm", + "version": "2.70.0", + "port-version": 1, + "description": "This is glibmm, a C++ API for parts of glib that are useful for C++.", + "homepage": "https://www.gtkmm.org.", + "license": "LGPL-2.1-or-later", + "supports": "!uwp", + "dependencies": [ + "gettext", + "glib", + "libffi", + "libiconv", + "libsigcpp-3", + "pcre", + { + "name": "vcpkg-tool-meson", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/glm/CMakeLists.txt b/externals/vcpkg/ports/glm/CMakeLists.txt new file mode 100755 index 000000000..c8a92c151 --- /dev/null +++ b/externals/vcpkg/ports/glm/CMakeLists.txt @@ -0,0 +1,27 @@ +cmake_minimum_required(VERSION 3.12 FATAL_ERROR) + +project(glm LANGUAGES CXX) + +include(GNUInstallDirs) + +add_library(glm INTERFACE) +target_include_directories(glm INTERFACE $) + +install( + TARGETS glm EXPORT glm-config + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/ + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/ + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/ +) + +install( + EXPORT glm-config + NAMESPACE glm:: + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/glm +) + +install( + DIRECTORY ${CMAKE_SOURCE_DIR}/glm + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING PATTERN "*.hpp*" PATTERN "*.inl*" PATTERN "*.h*" +) diff --git a/externals/vcpkg/ports/glm/portfile.cmake b/externals/vcpkg/ports/glm/portfile.cmake new file mode 100755 index 000000000..40d5115ac --- /dev/null +++ b/externals/vcpkg/ports/glm/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO g-truc/glm + REF bf71a834948186f4097caa076cd2663c69a10e1e #v0.9.9.8 + SHA512 226266c02af616a96fb19ee32cf3f98347daa43a4fde5d618d36b38709dce1280de126c542524d40725ecf70359edcc5b60660554c65ce246514501fb4c9c87c + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +# Put the license file where vcpkg expects it +file(INSTALL ${SOURCE_PATH}/copying.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/glm/vcpkg.json b/externals/vcpkg/ports/glm/vcpkg.json new file mode 100755 index 000000000..45a3b3c71 --- /dev/null +++ b/externals/vcpkg/ports/glm/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "glm", + "version-string": "0.9.9.8", + "port-version": 1, + "description": "OpenGL Mathematics (GLM)", + "homepage": "https://glm.g-truc.net" +} diff --git a/externals/vcpkg/ports/globjects/fix-dependency-glm.patch b/externals/vcpkg/ports/globjects/fix-dependency-glm.patch new file mode 100755 index 000000000..e867da1b1 --- /dev/null +++ b/externals/vcpkg/ports/globjects/fix-dependency-glm.patch @@ -0,0 +1,13 @@ +diff --git a/source/globjects/CMakeLists.txt b/source/globjects/CMakeLists.txt +index 71e92d8..b8b4408 100644 +--- a/source/globjects/CMakeLists.txt ++++ b/source/globjects/CMakeLists.txt +@@ -359,7 +359,7 @@ target_link_libraries(${target} + + PUBLIC + ${DEFAULT_LIBRARIES} +- glm ++ glm::glm + glbinding::glbinding + glbinding::glbinding-aux + diff --git a/externals/vcpkg/ports/globjects/portfile.cmake b/externals/vcpkg/ports/globjects/portfile.cmake new file mode 100755 index 000000000..4103fd3ab --- /dev/null +++ b/externals/vcpkg/ports/globjects/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cginternals/globjects + REF dc68b09a53ec20683d3b3a12ed8d9cb12602bb9a + SHA512 5145df795a73a8d74e983e143fd57441865f3082860efb89a3aa8c4d64c2eb6f0256a8049ccd5479dd77e53ef6638d9c903b29a8ef2b41a076003d9595912500 + HEAD_REF master + PATCHES + system-install.patch + fix-dependency-glm.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DOPTION_BUILD_TESTS=OFF + -DOPTION_BUILD_GPU_TESTS=OFF + -DGIT_REV=0 +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/globjects/cmake/globjects) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) + +file(WRITE ${CURRENT_PACKAGES_DIR}/share/globjects/globjects-config.cmake "include(CMakeFindDependencyMacro) +find_dependency(glm) +find_dependency(glbinding) + +include(\${CMAKE_CURRENT_LIST_DIR}/globjects-export.cmake) +") + +# Handle copyright +file(RENAME ${CURRENT_PACKAGES_DIR}/share/globjects/LICENSE ${CURRENT_PACKAGES_DIR}/share/globjects/copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/globjects/system-install.patch b/externals/vcpkg/ports/globjects/system-install.patch new file mode 100755 index 000000000..10e0c5b49 --- /dev/null +++ b/externals/vcpkg/ports/globjects/system-install.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6556346..48ba95d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -42,11 +42,13 @@ include(cmake/GenerateTemplateExportHeader.cmake) + # + + # Get git revision ++if(NOT DEFINED GIT_REV) + get_git_head_revision(GIT_REFSPEC GIT_SHA1) + string(SUBSTRING "${GIT_SHA1}" 0 12 GIT_REV) + if(NOT GIT_SHA1) + set(GIT_REV "0") + endif() ++endif() + + # Meta information about the project + set(META_PROJECT_NAME "globjects") +@@ -133,7 +135,7 @@ if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr" OR "${CMAKE_INSTALL_PREFIX}" STREQU + endif() + + # Installation paths +-if(UNIX AND SYSTEM_DIR_INSTALL) ++if(1) + # Install into the system (/usr/bin or /usr/local/bin) + set(INSTALL_ROOT "share/${project}") # /usr/[local]/share/ + set(INSTALL_CMAKE "share/${project}/cmake") # /usr/[local]/share//cmake diff --git a/externals/vcpkg/ports/globjects/vcpkg.json b/externals/vcpkg/ports/globjects/vcpkg.json new file mode 100755 index 000000000..8878d2865 --- /dev/null +++ b/externals/vcpkg/ports/globjects/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "globjects", + "version-string": "1.1.0", + "port-version": 4, + "description": "C++ library strictly wrapping OpenGL objects", + "homepage": "https://github.com/cginternals/globjects", + "dependencies": [ + "glbinding", + "glm" + ] +} diff --git a/externals/vcpkg/ports/glog/cmakelists_atomicdetect.patch b/externals/vcpkg/ports/glog/cmakelists_atomicdetect.patch new file mode 100755 index 000000000..0b02e1a9a --- /dev/null +++ b/externals/vcpkg/ports/glog/cmakelists_atomicdetect.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 13c474b..7858c8f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -398,6 +398,12 @@ if (HAVE_EXECINFO_H) + set (HAVE_STACKTRACE 1) + endif (HAVE_EXECINFO_H) + ++if (HAVE_CXX11_ATOMIC) ++ set (ac_cv_cxx11_atomic 1) ++else () ++ set (ac_cv_cxx11_atomic 0) ++endif () ++ + if (WITH_SYMBOLIZE) + if (WIN32 OR CYGWIN) + if(CMAKE_CROSSCOMPILING) diff --git a/externals/vcpkg/ports/glog/fix-SOME_KIND_OF_LOG.patch b/externals/vcpkg/ports/glog/fix-SOME_KIND_OF_LOG.patch new file mode 100755 index 000000000..7e48d2cfc --- /dev/null +++ b/externals/vcpkg/ports/glog/fix-SOME_KIND_OF_LOG.patch @@ -0,0 +1,58 @@ +diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in +index 3ecacfb..ef10284 100644 +--- a/src/glog/logging.h.in ++++ b/src/glog/logging.h.in +@@ -100,7 +100,7 @@ + #include + #endif + +-#ifdef HAVE_CXX11_ATOMIC ++#if @ac_cv_cxx11_atomic@ + #include + #elif defined(GLOG_OS_WINDOWS) + #include +@@ -1014,7 +1014,7 @@ extern "C" void AnnotateBenignRaceSized( + namespace google { + #endif + +-#ifdef HAVE_CXX11_ATOMIC ++#if @ac_cv_cxx11_atomic@ + #define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ + static std::atomic LOG_OCCURRENCES(0), LOG_OCCURRENCES_MOD_N(0); \ + _GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ +@@ -1061,7 +1061,7 @@ namespace google { + #elif defined(GLOG_OS_WINDOWS) + + #define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ +- static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ ++ static volatile unsigned LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ + InterlockedIncrement(&LOG_OCCURRENCES); \ + if (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) > n) \ + InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n); \ +@@ -1071,7 +1071,7 @@ namespace google { + &what_to_do).stream() + + #define SOME_KIND_OF_LOG_IF_EVERY_N(severity, condition, n, what_to_do) \ +- static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ ++ static volatile unsigned LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ + InterlockedIncrement(&LOG_OCCURRENCES); \ + if (condition && \ + (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) || true) && \ +@@ -1082,7 +1082,7 @@ namespace google { + &what_to_do).stream() + + #define SOME_KIND_OF_PLOG_EVERY_N(severity, n, what_to_do) \ +- static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ ++ static volatile unsigned LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ + InterlockedIncrement(&LOG_OCCURRENCES); \ + if (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) > n) \ + InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n); \ +@@ -1092,7 +1092,7 @@ namespace google { + &what_to_do).stream() + + #define SOME_KIND_OF_LOG_FIRST_N(severity, n, what_to_do) \ +- static int LOG_OCCURRENCES = 0; \ ++ static volatile unsigned LOG_OCCURRENCES = 0; \ + if (LOG_OCCURRENCES <= n) \ + InterlockedIncrement(&LOG_OCCURRENCES); \ + if (LOG_OCCURRENCES <= n) \ diff --git a/externals/vcpkg/ports/glog/fix_crosscompile_symbolize.patch b/externals/vcpkg/ports/glog/fix_crosscompile_symbolize.patch new file mode 100755 index 000000000..65f0fd266 --- /dev/null +++ b/externals/vcpkg/ports/glog/fix_crosscompile_symbolize.patch @@ -0,0 +1,18 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -401,4 +401,7 @@ + if (WITH_SYMBOLIZE) + if (WIN32 OR CYGWIN) ++ if(CMAKE_CROSSCOMPILING) ++ set(HAVE_SYMBOLIZE 0) ++ else() + cmake_push_check_state (RESET) + set (CMAKE_REQUIRED_LIBRARIES DbgHelp) +@@ -430,6 +433,7 @@ + ]=] HAVE_SYMBOLIZE) + + cmake_pop_check_state () ++ endif() + + if (HAVE_SYMBOLIZE) + set (HAVE_STACKTRACE 1) diff --git a/externals/vcpkg/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch b/externals/vcpkg/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch new file mode 100755 index 000000000..31219437b --- /dev/null +++ b/externals/vcpkg/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch @@ -0,0 +1,77 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 28e2688..cf87798 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -843,36 +843,6 @@ write_basic_package_version_file ( + export (TARGETS glog NAMESPACE glog:: FILE glog-targets.cmake) + export (PACKAGE glog) + +-get_filename_component (_PREFIX "${CMAKE_INSTALL_PREFIX}" ABSOLUTE) +- +-# Directory containing the find modules relative to the config install +-# directory. +-file (RELATIVE_PATH glog_REL_CMake_MODULES +- ${_PREFIX}/${_glog_CMake_INSTALLDIR} +- ${_PREFIX}/${_glog_CMake_DATADIR}/glog-modules.cmake) +- +-get_filename_component (glog_REL_CMake_DATADIR ${glog_REL_CMake_MODULES} +- DIRECTORY) +- +-set (glog_FULL_CMake_DATADIR +- ${CMAKE_CURRENT_BINARY_DIR}/${_glog_CMake_DATADIR}) +- +-configure_file (glog-modules.cmake.in +- ${CMAKE_CURRENT_BINARY_DIR}/glog-modules.cmake @ONLY) +- +-install (CODE +-" +-set (glog_FULL_CMake_DATADIR \"\\\${CMAKE_CURRENT_LIST_DIR}/${glog_REL_CMake_DATADIR}\") +-configure_file (\"${CMAKE_CURRENT_SOURCE_DIR}/glog-modules.cmake.in\" +- \"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/glog-modules.cmake\" @ONLY) +-file (INSTALL +- \"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/glog-modules.cmake\" +- DESTINATION +- \"\${CMAKE_INSTALL_PREFIX}/${_glog_CMake_INSTALLDIR}\") +-" +- COMPONENT Development +-) +- + install (FILES + ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake +diff --git a/glog-config.cmake.in b/glog-config.cmake.in +index 5c5c9c0..31fac52 100644 +--- a/glog-config.cmake.in ++++ b/glog-config.cmake.in +@@ -5,7 +5,6 @@ endif (CMAKE_VERSION VERSION_LESS @glog_CMake_VERSION@) + @PACKAGE_INIT@ + + include (CMakeFindDependencyMacro) +-include (${CMAKE_CURRENT_LIST_DIR}/glog-modules.cmake) + + @gflags_DEPENDENCY@ + @Unwind_DEPENDENCY@ +diff --git a/glog-modules.cmake.in b/glog-modules.cmake.in +deleted file mode 100644 +index 71c5160..0000000 +--- a/glog-modules.cmake.in ++++ /dev/null +@@ -1,18 +0,0 @@ +-cmake_policy (PUSH) +-cmake_policy (SET CMP0057 NEW) +- +-if (CMAKE_VERSION VERSION_LESS 3.3) +- message (FATAL_ERROR "glog-modules.cmake requires the consumer " +- "to use CMake 3.3 (or newer)") +-endif (CMAKE_VERSION VERSION_LESS 3.3) +- +-set (glog_MODULE_PATH "@glog_FULL_CMake_DATADIR@") +-list (APPEND CMAKE_MODULE_PATH ${glog_MODULE_PATH}) +- +-if (NOT glog_MODULE_PATH IN_LIST CMAKE_MODULE_PATH) +- message (FATAL_ERROR "Cannot add '${glog_MODULE_PATH}' to " +- "CMAKE_MODULE_PATH. This will cause glog-config.cmake to fail at " +- "locating required find modules. Make sure CMAKE_MODULE_PATH is not a cache variable.") +-endif (NOT glog_MODULE_PATH IN_LIST CMAKE_MODULE_PATH) +- +-cmake_policy (POP) diff --git a/externals/vcpkg/ports/glog/fix_log_every_n.patch b/externals/vcpkg/ports/glog/fix_log_every_n.patch new file mode 100755 index 000000000..52950481c --- /dev/null +++ b/externals/vcpkg/ports/glog/fix_log_every_n.patch @@ -0,0 +1,839 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 61e5f6c..889df87 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -501,6 +501,7 @@ set (GLOG_PUBLIC_H + ${CMAKE_CURRENT_BINARY_DIR}/glog/stl_logging.h + ${CMAKE_CURRENT_BINARY_DIR}/glog/vlog_is_on.h + src/glog/log_severity.h ++ src/glog/platform.h + ) + + set (GLOG_SRCS +diff --git a/src/demangle.cc b/src/demangle.cc +index f3e6ad7..8c0bdc7 100644 +--- a/src/demangle.cc ++++ b/src/demangle.cc +@@ -38,14 +38,14 @@ + #include "utilities.h" + #include "demangle.h" + +-#if defined(OS_WINDOWS) ++#if defined(GLOG_OS_WINDOWS) + #include + #pragma comment(lib, "dbghelp") + #endif + + _START_GOOGLE_NAMESPACE_ + +-#if !defined(OS_WINDOWS) ++#if !defined(GLOG_OS_WINDOWS) + typedef struct { + const char *abbrev; + const char *real_name; +@@ -1324,7 +1324,7 @@ static bool ParseTopLevelMangledName(State *state) { + + // The demangler entry point. + bool Demangle(const char *mangled, char *out, int out_size) { +-#if defined(OS_WINDOWS) ++#if defined(GLOG_OS_WINDOWS) + // When built with incremental linking, the Windows debugger + // library provides a more complicated `Symbol->Name` with the + // Incremental Linking Table offset, which looks like +diff --git a/src/demangle_unittest.cc b/src/demangle_unittest.cc +index be48341..c65adc4 100644 +--- a/src/demangle_unittest.cc ++++ b/src/demangle_unittest.cc +@@ -62,7 +62,7 @@ static const char *DemangleIt(const char * const mangled) { + } + } + +-#if defined(OS_WINDOWS) ++#if defined(GLOG_OS_WINDOWS) + + TEST(Demangle, Windows) { + EXPECT_STREQ( +diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in +index 421f1e0..3ecacfb 100644 +--- a/src/glog/logging.h.in ++++ b/src/glog/logging.h.in +@@ -35,7 +35,6 @@ + // + #ifndef _LOGGING_H_ + #define _LOGGING_H_ +- + #include + #include + #include +@@ -58,6 +57,8 @@ + #define GLOG_MSVC_POP_WARNING() + #endif + ++#include ++ + #if @ac_cv_have_glog_export@ + #include "glog/export.h" + #endif +@@ -101,7 +102,7 @@ + + #ifdef HAVE_CXX11_ATOMIC + #include +-#elif defined(OS_WINDOWS) ++#elif defined(GLOG_OS_WINDOWS) + #include + #endif + +@@ -1057,7 +1058,7 @@ namespace google { + __FILE__, __LINE__, @ac_google_namespace@::GLOG_ ## severity, LOG_OCCURRENCES, \ + &what_to_do).stream() + +-#elif defined(OS_WINDOWS) ++#elif defined(GLOG_OS_WINDOWS) + + #define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ + static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ +diff --git a/src/glog/platform.h b/src/glog/platform.h +new file mode 100644 +index 0000000..e614411 +--- /dev/null ++++ b/src/glog/platform.h +@@ -0,0 +1,58 @@ ++// Copyright (c) 2008, Google Inc. ++// All rights reserved. ++// ++// Redistribution and use in source and binary forms, with or without ++// modification, are permitted provided that the following conditions are ++// met: ++// ++// * Redistributions of source code must retain the above copyright ++// notice, this list of conditions and the following disclaimer. ++// * Redistributions in binary form must reproduce the above ++// copyright notice, this list of conditions and the following disclaimer ++// in the documentation and/or other materials provided with the ++// distribution. ++// * Neither the name of Google Inc. nor the names of its ++// contributors may be used to endorse or promote products derived from ++// this software without specific prior written permission. ++// ++// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ++// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT ++// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ++// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++// ++// Author: Shinichiro Hamaji ++// ++// Detect supported platforms. ++ ++#ifndef GLOG_PLATFORM_H ++#define GLOG_PLATFORM_H ++ ++#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) ++#define GLOG_OS_WINDOWS ++#elif defined(__CYGWIN__) || defined(__CYGWIN32__) ++#define GLOG_OS_CYGWIN ++#elif defined(linux) || defined(__linux) || defined(__linux__) ++#ifndef GLOG_OS_LINUX ++#define GLOG_OS_LINUX ++#endif ++#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) ++#define GLOG_OS_MACOSX ++#elif defined(__FreeBSD__) ++#define GLOG_OS_FREEBSD ++#elif defined(__NetBSD__) ++#define GLOG_OS_NETBSD ++#elif defined(__OpenBSD__) ++#define GLOG_OS_OPENBSD ++#else ++// TODO(hamaji): Add other platforms. ++#error Platform not supported by glog. Please consider to contribute platform information by submitting a pull request on Github. ++#endif ++ ++#endif // GLOG_PLATFORM_H +diff --git a/src/googletest.h b/src/googletest.h +index 7230606..a7ce3c2 100644 +--- a/src/googletest.h ++++ b/src/googletest.h +@@ -72,7 +72,7 @@ _END_GOOGLE_NAMESPACE_ + #define GOOGLE_GLOG_DLL_DECL + + static inline string GetTempDir() { +-#ifndef OS_WINDOWS ++#ifndef GLOG_OS_WINDOWS + return "/tmp"; + #else + char tmp[MAX_PATH]; +@@ -81,7 +81,7 @@ static inline string GetTempDir() { + #endif + } + +-#if defined(OS_WINDOWS) && defined(_MSC_VER) && !defined(TEST_SRC_DIR) ++#if defined(GLOG_OS_WINDOWS) && defined(_MSC_VER) && !defined(TEST_SRC_DIR) + // The test will run in glog/vsproject/ + // (e.g., glog/vsproject/logging_unittest). + static const char TEST_SRC_DIR[] = "../.."; +@@ -207,7 +207,7 @@ static inline void CalledAbort() { + longjmp(g_jmp_buf, 1); + } + +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + // TODO(hamaji): Death test somehow doesn't work in Windows. + #define ASSERT_DEATH(fn, msg) + #else +@@ -490,7 +490,7 @@ static inline bool MungeAndDiffTestStderr(const string& golden_filename) { + WriteToFile(golden, munged_golden); + string munged_captured = cap->filename() + ".munged"; + WriteToFile(captured, munged_captured); +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + string diffcmd("fc " + munged_golden + " " + munged_captured); + #else + string diffcmd("diff -u " + munged_golden + " " + munged_captured); +@@ -532,7 +532,7 @@ class Thread { + virtual ~Thread() {} + + void SetJoinable(bool) {} +-#if defined(OS_WINDOWS) && !defined(OS_CYGWIN) ++#if defined(GLOG_OS_WINDOWS) && !defined(GLOG_OS_CYGWIN) + void Start() { + handle_ = CreateThread(NULL, + 0, +@@ -565,7 +565,7 @@ class Thread { + return NULL; + } + +-#if defined(OS_WINDOWS) && !defined(OS_CYGWIN) ++#if defined(GLOG_OS_WINDOWS) && !defined(GLOG_OS_CYGWIN) + HANDLE handle_; + DWORD th_; + #else +@@ -574,7 +574,7 @@ class Thread { + }; + + static inline void SleepForMilliseconds(int t) { +-#ifndef OS_WINDOWS ++#ifndef GLOG_OS_WINDOWS + # if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309L + const struct timespec req = {0, t * 1000 * 1000}; + nanosleep(&req, NULL); +diff --git a/src/logging.cc b/src/logging.cc +index 71de91d..f251d67 100644 +--- a/src/logging.cc ++++ b/src/logging.cc +@@ -59,7 +59,7 @@ + #include + #include // for errno + #include +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + #include "windows/dirent.h" + #else + #include // for automatic removal of old logs +@@ -122,7 +122,7 @@ GLOG_DEFINE_bool(alsologtostderr, BoolFromEnv("GOOGLE_ALSOLOGTOSTDERR", false), + "log messages go to stderr in addition to logfiles"); + GLOG_DEFINE_bool(colorlogtostderr, false, + "color messages logged to stderr (if supported by terminal)"); +-#ifdef OS_LINUX ++#ifdef GLOG_OS_LINUX + GLOG_DEFINE_bool(drop_log_memory, true, "Drop in-memory buffers of log contents. " + "Logs can grow very quickly and they are rarely read before they " + "need to be evicted from memory. Instead, drop them from memory " +@@ -198,7 +198,7 @@ GLOG_DEFINE_bool(log_utc_time, false, + #define PATH_SEPARATOR '/' + + #ifndef HAVE_PREAD +-#if defined(OS_WINDOWS) ++#if defined(GLOG_OS_WINDOWS) + #include + #define ssize_t SSIZE_T + #endif +@@ -241,7 +241,7 @@ static void GetHostName(string* hostname) { + *buf.nodename = '\0'; + } + *hostname = buf.nodename; +-#elif defined(OS_WINDOWS) ++#elif defined(GLOG_OS_WINDOWS) + char buf[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD len = MAX_COMPUTERNAME_LENGTH + 1; + if (GetComputerNameA(buf, &len)) { +@@ -258,7 +258,7 @@ static void GetHostName(string* hostname) { + // Returns true iff terminal supports using colors in output. + static bool TerminalSupportsColor() { + bool term_supports_color = false; +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + // on Windows TERM variable is usually not set, but the console does + // support colors. + term_supports_color = true; +@@ -312,7 +312,7 @@ static GLogColor SeverityToColor(LogSeverity severity) { + return color; + } + +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + + // Returns the character attribute for the given color. + static WORD GetColorAttribute(GLogColor color) { +@@ -337,7 +337,7 @@ static const char* GetAnsiColorCode(GLogColor color) { + return NULL; // stop warning about return type. + } + +-#endif // OS_WINDOWS ++#endif // GLOG_OS_WINDOWS + + // Safely get max_log_size, overriding to 1 if it somehow gets defined as 0 + static int32 MaxLogSize() { +@@ -753,7 +753,7 @@ static void ColoredWriteToStderr(LogSeverity severity, + fwrite(message, len, 1, stderr); + return; + } +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + const HANDLE stderr_handle = GetStdHandle(STD_ERROR_HANDLE); + + // Gets the current text color. +@@ -775,7 +775,7 @@ static void ColoredWriteToStderr(LogSeverity severity, + fprintf(stderr, "\033[0;3%sm", GetAnsiColorCode(color)); + fwrite(message, len, 1, stderr); + fprintf(stderr, "\033[m"); // Resets the terminal to default. +-#endif // OS_WINDOWS ++#endif // GLOG_OS_WINDOWS + } + + static void WriteToStderr(const char* message, size_t len) { +@@ -788,7 +788,7 @@ inline void LogDestination::MaybeLogToStderr(LogSeverity severity, + const char* message, size_t message_len, size_t prefix_len) { + if ((severity >= FLAGS_stderrthreshold) || FLAGS_alsologtostderr) { + ColoredWriteToStderr(severity, message, message_len); +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + // On Windows, also output to the debugger + ::OutputDebugStringA(message); + #elif defined(__ANDROID__) +@@ -1056,7 +1056,7 @@ bool LogFileObject::CreateLogfile(const string& time_pid_string) { + } + return false; + } +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + // https://github.com/golang/go/issues/27638 - make sure we seek to the end to append + // empirically replicated with wine over mingw build + if (!FLAGS_timestamp_in_logfile_name) { +@@ -1080,7 +1080,7 @@ bool LogFileObject::CreateLogfile(const string& time_pid_string) { + linkpath += linkname; + unlink(linkpath.c_str()); // delete old one if it exists + +-#if defined(OS_WINDOWS) ++#if defined(GLOG_OS_WINDOWS) + // TODO(hamaji): Create lnk file on Windows? + #elif defined(HAVE_UNISTD_H) + // We must have unistd.h. +@@ -1270,7 +1270,7 @@ void LogFileObject::Write(bool force_flush, + (bytes_since_flush_ >= 1000000) || + (CycleClock_Now() >= next_flush_time_) ) { + FlushUnlocked(); +-#ifdef OS_LINUX ++#ifdef GLOG_OS_LINUX + // Only consider files >= 3MiB + if (FLAGS_drop_log_memory && file_length_ >= (3 << 20)) { + // Don't evict the most recent 1-2MiB so as not to impact a tailer +@@ -1305,7 +1305,7 @@ void LogFileObject::Write(bool force_flush, + + + LogCleaner::LogCleaner() : enabled_(false), overdue_days_(7), dir_delim_('/') { +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + dir_delim_ = '\\'; + #endif + } +@@ -1898,7 +1898,7 @@ void LogMessage::RecordCrashReason( + # define ATTRIBUTE_NORETURN + #endif + +-#if defined(OS_WINDOWS) ++#if defined(GLOG_OS_WINDOWS) + __declspec(noreturn) + #endif + static void logging_fail() ATTRIBUTE_NORETURN; +@@ -2223,7 +2223,7 @@ bool SendEmail(const char*dest, const char *subject, const char*body){ + + static void GetTempDirectories(vector* list) { + list->clear(); +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + // On windows we'll try to find a directory in this order: + // C:/Documents & Settings/whomever/TEMP (or whatever GetTempPath() is) + // C:/TMP/ +@@ -2282,7 +2282,7 @@ const vector& GetLoggingDirectories() { + logging_directories_list->push_back(FLAGS_log_dir.c_str()); + } else { + GetTempDirectories(logging_directories_list); +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + char tmp[MAX_PATH]; + if (GetWindowsDirectoryA(tmp, MAX_PATH)) + logging_directories_list->push_back(tmp); +@@ -2325,7 +2325,7 @@ void TruncateLogFile(const char *path, int64 limit, int64 keep) { + // Don't follow symlinks unless they're our own fd symlinks in /proc + int flags = O_RDWR; + // TODO(hamaji): Support other environments. +-#ifdef OS_LINUX ++#ifdef GLOG_OS_LINUX + const char *procfd_prefix = "/proc/self/fd/"; + if (strncmp(procfd_prefix, path, strlen(procfd_prefix))) flags |= O_NOFOLLOW; + #endif +@@ -2464,7 +2464,7 @@ int posix_strerror_r(int err, char *buf, size_t len) { + return 0; + } else { + buf[0] = '\000'; +-#if defined(OS_MACOSX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) ++#if defined(GLOG_OS_MACOSX) || defined(GLOG_OS_FREEBSD) || defined(GLOG_OS_OPENBSD) + if (reinterpret_cast(rc) < sys_nerr) { + // This means an error on MacOSX or FreeBSD. + return -1; +diff --git a/src/logging_custom_prefix_unittest.cc b/src/logging_custom_prefix_unittest.cc +index c9fb5b8..8740fad 100644 +--- a/src/logging_custom_prefix_unittest.cc ++++ b/src/logging_custom_prefix_unittest.cc +@@ -588,7 +588,7 @@ void TestCHECK() { + + // Tests using CHECK*() on anonymous enums. + // Apple's GCC doesn't like this. +-#if !defined(OS_MACOSX) ++#if !defined(GLOG_OS_MACOSX) + CHECK_EQ(CASE_A, CASE_A); + CHECK_NE(CASE_A, CASE_B); + CHECK_GE(CASE_A, CASE_A); +@@ -670,7 +670,7 @@ static void GetFiles(const string& pattern, vector* files) { + files->push_back(string(g.gl_pathv[i])); + } + globfree(&g); +-#elif defined(OS_WINDOWS) ++#elif defined(GLOG_OS_WINDOWS) + WIN32_FIND_DATAA data; + HANDLE handle = FindFirstFileA(pattern.c_str(), &data); + size_t index = pattern.rfind('\\'); +@@ -799,7 +799,7 @@ static void TestTwoProcessesWrite() { + } + + static void TestSymlink() { +-#ifndef OS_WINDOWS ++#ifndef GLOG_OS_WINDOWS + fprintf(stderr, "==== Test setting log file symlink\n"); + string dest = FLAGS_test_tmpdir + "/logging_test_symlink"; + string sym = FLAGS_test_tmpdir + "/symlinkbase"; +@@ -942,7 +942,7 @@ static void TestTruncate() { + // MacOSX 10.4 doesn't fail in this case. + // Windows doesn't have symlink. + // Let's just ignore this test for these cases. +-#if !defined(OS_MACOSX) && !defined(OS_WINDOWS) ++#if !defined(GLOG_OS_MACOSX) && !defined(GLOG_OS_WINDOWS) + // Through a symlink should fail to truncate + string linkname = path + ".link"; + unlink(linkname.c_str()); +@@ -951,7 +951,7 @@ static void TestTruncate() { + #endif + + // The /proc/self path makes sense only for linux. +-#if defined(OS_LINUX) ++#if defined(GLOG_OS_LINUX) + // Through an open fd symlink should work + int fd; + CHECK_ERR(fd = open(path.c_str(), O_APPEND | O_WRONLY)); +@@ -1205,7 +1205,7 @@ TEST(Strerror, logging) { + CHECK_EQ(posix_strerror_r(errcode, buf, 0), -1); + CHECK_EQ(buf[0], 'A'); + CHECK_EQ(posix_strerror_r(errcode, NULL, buf_size), -1); +-#if defined(OS_MACOSX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) ++#if defined(GLOG_OS_MACOSX) || defined(GLOG_OS_FREEBSD) || defined(GLOG_OS_OPENBSD) + // MacOSX or FreeBSD considers this case is an error since there is + // no enough space. + CHECK_EQ(posix_strerror_r(errcode, buf, 1), -1); +diff --git a/src/logging_unittest.cc b/src/logging_unittest.cc +index edc7d35..ce3c483 100644 +--- a/src/logging_unittest.cc ++++ b/src/logging_unittest.cc +@@ -561,7 +561,7 @@ void TestCHECK() { + + // Tests using CHECK*() on anonymous enums. + // Apple's GCC doesn't like this. +-#if !defined(OS_MACOSX) ++#if !defined(GLOG_OS_MACOSX) + CHECK_EQ(CASE_A, CASE_A); + CHECK_NE(CASE_A, CASE_B); + CHECK_GE(CASE_A, CASE_A); +@@ -643,7 +643,7 @@ static void GetFiles(const string& pattern, vector* files) { + files->push_back(string(g.gl_pathv[i])); + } + globfree(&g); +-#elif defined(OS_WINDOWS) ++#elif defined(GLOG_OS_WINDOWS) + WIN32_FIND_DATAA data; + HANDLE handle = FindFirstFileA(pattern.c_str(), &data); + size_t index = pattern.rfind('\\'); +@@ -772,7 +772,7 @@ static void TestTwoProcessesWrite() { + } + + static void TestSymlink() { +-#ifndef OS_WINDOWS ++#ifndef GLOG_OS_WINDOWS + fprintf(stderr, "==== Test setting log file symlink\n"); + string dest = FLAGS_test_tmpdir + "/logging_test_symlink"; + string sym = FLAGS_test_tmpdir + "/symlinkbase"; +@@ -915,7 +915,7 @@ static void TestTruncate() { + // MacOSX 10.4 doesn't fail in this case. + // Windows doesn't have symlink. + // Let's just ignore this test for these cases. +-#if !defined(OS_MACOSX) && !defined(OS_WINDOWS) ++#if !defined(GLOG_OS_MACOSX) && !defined(GLOG_OS_WINDOWS) + // Through a symlink should fail to truncate + string linkname = path + ".link"; + unlink(linkname.c_str()); +@@ -924,7 +924,7 @@ static void TestTruncate() { + #endif + + // The /proc/self path makes sense only for linux. +-#if defined(OS_LINUX) ++#if defined(GLOG_OS_LINUX) + // Through an open fd symlink should work + int fd; + CHECK_ERR(fd = open(path.c_str(), O_APPEND | O_WRONLY)); +@@ -1178,7 +1178,7 @@ TEST(Strerror, logging) { + CHECK_EQ(posix_strerror_r(errcode, buf, 0), -1); + CHECK_EQ(buf[0], 'A'); + CHECK_EQ(posix_strerror_r(errcode, NULL, buf_size), -1); +-#if defined(OS_MACOSX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) ++#if defined(GLOG_OS_MACOSX) || defined(GLOG_OS_FREEBSD) || defined(GLOG_OS_OPENBSD) + // MacOSX or FreeBSD considers this case is an error since there is + // no enough space. + CHECK_EQ(posix_strerror_r(errcode, buf, 1), -1); +diff --git a/src/signalhandler.cc b/src/signalhandler.cc +index b6d6e25..ababf86 100644 +--- a/src/signalhandler.cc ++++ b/src/signalhandler.cc +@@ -63,7 +63,7 @@ const struct { + { SIGILL, "SIGILL" }, + { SIGFPE, "SIGFPE" }, + { SIGABRT, "SIGABRT" }, +-#if !defined(OS_WINDOWS) ++#if !defined(GLOG_OS_WINDOWS) + { SIGBUS, "SIGBUS" }, + #endif + { SIGTERM, "SIGTERM" }, +@@ -208,7 +208,7 @@ void DumpSignalInfo(int signal_number, siginfo_t *siginfo) { + formatter.AppendUint64((uintptr_t)pthread_self(), 16); + formatter.AppendString(") "); + // Only linux has the PID of the signal sender in si_pid. +-#ifdef OS_LINUX ++#ifdef GLOG_OS_LINUX + formatter.AppendString("from PID "); + formatter.AppendUint64(siginfo->si_pid, 10); + formatter.AppendString("; "); +@@ -253,7 +253,7 @@ void InvokeDefaultSignalHandler(int signal_number) { + sig_action.sa_handler = SIG_DFL; + sigaction(signal_number, &sig_action, NULL); + kill(getpid(), signal_number); +-#elif defined(OS_WINDOWS) ++#elif defined(GLOG_OS_WINDOWS) + signal(signal_number, SIG_DFL); + raise(signal_number); + #endif +@@ -267,7 +267,7 @@ static pthread_t* g_entered_thread_id_pointer = NULL; + + // Dumps signal and stack frame information, and invokes the default + // signal handler once our job is done. +-#if defined(OS_WINDOWS) ++#if defined(GLOG_OS_WINDOWS) + void FailureSignalHandler(int signal_number) + #else + void FailureSignalHandler(int signal_number, +@@ -314,7 +314,7 @@ void FailureSignalHandler(int signal_number, + // First dump time info. + DumpTimeInfo(); + +-#if !defined(OS_WINDOWS) ++#if !defined(GLOG_OS_WINDOWS) + // Get the program counter from ucontext. + void *pc = GetPC(ucontext); + DumpStackFrameInfo("PC: ", pc); +@@ -364,7 +364,7 @@ bool IsFailureSignalHandlerInstalled() { + sigaction(SIGABRT, NULL, &sig_action); + if (sig_action.sa_sigaction == &FailureSignalHandler) + return true; +-#elif defined(OS_WINDOWS) ++#elif defined(GLOG_OS_WINDOWS) + return kFailureSignalHandlerInstalled; + #endif // HAVE_SIGACTION + return false; +@@ -385,7 +385,7 @@ void InstallFailureSignalHandler() { + CHECK_ERR(sigaction(kFailureSignals[i].number, &sig_action, NULL)); + } + kFailureSignalHandlerInstalled = true; +-#elif defined(OS_WINDOWS) ++#elif defined(GLOG_OS_WINDOWS) + for (size_t i = 0; i < ARRAYSIZE(kFailureSignals); ++i) { + CHECK_NE(signal(kFailureSignals[i].number, &FailureSignalHandler), + SIG_ERR); +@@ -395,7 +395,7 @@ void InstallFailureSignalHandler() { + } + + void InstallFailureWriter(void (*writer)(const char* data, int size)) { +-#if defined(HAVE_SIGACTION) || defined(OS_WINDOWS) ++#if defined(HAVE_SIGACTION) || defined(GLOG_OS_WINDOWS) + g_failure_writer = writer; + #endif // HAVE_SIGACTION + } +diff --git a/src/stacktrace_x86-inl.h b/src/stacktrace_x86-inl.h +index af2783d..99c5de7 100644 +--- a/src/stacktrace_x86-inl.h ++++ b/src/stacktrace_x86-inl.h +@@ -31,9 +31,9 @@ + + #include // for uintptr_t + +-#include "utilities.h" // for OS_* macros ++#include "utilities.h" // for GLOG_OS_* macros + +-#if !defined(OS_WINDOWS) ++#if !defined(GLOG_OS_WINDOWS) + #include + #include + #endif +@@ -74,7 +74,7 @@ static void **NextStackFrame(void **old_sp) { + // last two pages in the address space + if ((uintptr_t)new_sp >= 0xffffe000) return NULL; + #endif +-#if !defined(OS_WINDOWS) ++#if !defined(GLOG_OS_WINDOWS) + if (!STRICT_UNWINDING) { + // Lax sanity checks cause a crash in 32-bit tcmalloc/crash_reason_test + // on AMD-based machines with VDSO-enabled kernels. +diff --git a/src/symbolize.cc b/src/symbolize.cc +index f7fbc53..8688ca2 100644 +--- a/src/symbolize.cc ++++ b/src/symbolize.cc +@@ -46,7 +46,7 @@ + // and memmove(). We assume they are async-signal-safe. + // + // Additional header can be specified by the GLOG_BUILD_CONFIG_INCLUDE +-// macro to add platform specific defines (e.g. OS_OPENBSD). ++// macro to add platform specific defines (e.g. GLOG_OS_OPENBSD). + + #ifdef GLOG_BUILD_CONFIG_INCLUDE + #include GLOG_BUILD_CONFIG_INCLUDE +@@ -113,7 +113,7 @@ _END_GOOGLE_NAMESPACE_ + #if defined(HAVE_DLFCN_H) + #include + #endif +-#if defined(OS_OPENBSD) ++#if defined(GLOG_OS_OPENBSD) + #include + #else + #include +@@ -846,7 +846,7 @@ static ATTRIBUTE_NOINLINE bool SymbolizeAndDemangle(void *pc, char *out, + + _END_GOOGLE_NAMESPACE_ + +-#elif defined(OS_MACOSX) && defined(HAVE_DLADDR) ++#elif defined(GLOG_OS_MACOSX) && defined(HAVE_DLADDR) + + #include + #include +@@ -871,7 +871,7 @@ static ATTRIBUTE_NOINLINE bool SymbolizeAndDemangle(void *pc, char *out, + + _END_GOOGLE_NAMESPACE_ + +-#elif defined(OS_WINDOWS) || defined(OS_CYGWIN) ++#elif defined(GLOG_OS_WINDOWS) || defined(GLOG_OS_CYGWIN) + + #include + #include +diff --git a/src/symbolize_unittest.cc b/src/symbolize_unittest.cc +index 0b53230..7e8f6d4 100644 +--- a/src/symbolize_unittest.cc ++++ b/src/symbolize_unittest.cc +@@ -359,7 +359,7 @@ static void ATTRIBUTE_NOINLINE TestWithReturnAddress() { + #endif + } + +-# elif defined(OS_WINDOWS) || defined(OS_CYGWIN) ++# elif defined(GLOG_OS_WINDOWS) || defined(GLOG_OS_CYGWIN) + + #ifdef _MSC_VER + #include +@@ -411,10 +411,10 @@ int main(int argc, char **argv) { + TestWithPCInsideNonInlineFunction(); + TestWithReturnAddress(); + return RUN_ALL_TESTS(); +-# elif defined(OS_WINDOWS) || defined(OS_CYGWIN) ++# elif defined(GLOG_OS_WINDOWS) || defined(GLOG_OS_CYGWIN) + TestWithReturnAddress(); + return RUN_ALL_TESTS(); +-# else // OS_WINDOWS ++# else // GLOG_OS_WINDOWS + printf("PASS (no symbolize_unittest support)\n"); + return 0; + # endif // __ELF__ +diff --git a/src/utilities.cc b/src/utilities.cc +index 6b9a69e..ecda730 100644 +--- a/src/utilities.cc ++++ b/src/utilities.cc +@@ -151,7 +151,7 @@ static void DumpStackTraceAndExit() { + sigemptyset(&sig_action.sa_mask); + sig_action.sa_handler = SIG_DFL; + sigaction(SIGABRT, &sig_action, NULL); +-#elif defined(OS_WINDOWS) ++#elif defined(GLOG_OS_WINDOWS) + signal(SIGABRT, SIG_DFL); + #endif // HAVE_SIGACTION + } +@@ -180,7 +180,7 @@ bool IsGoogleLoggingInitialized() { + return g_program_invocation_short_name != NULL; + } + +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + struct timeval { + long tv_sec, tv_usec; + }; +@@ -236,9 +236,9 @@ bool PidHasChanged() { + + pid_t GetTID() { + // On Linux and MacOSX, we try to use gettid(). +-#if defined OS_LINUX || defined OS_MACOSX ++#if defined GLOG_OS_LINUX || defined GLOG_OS_MACOSX + #ifndef __NR_gettid +-#ifdef OS_MACOSX ++#ifdef GLOG_OS_MACOSX + #define __NR_gettid SYS_gettid + #elif ! defined __i386__ + #error "Must define __NR_gettid for non-x86 platforms" +@@ -258,12 +258,12 @@ pid_t GetTID() { + // the value change to "true". + lacks_gettid = true; + } +-#endif // OS_LINUX || OS_MACOSX ++#endif // GLOG_OS_LINUX || GLOG_OS_MACOSX + + // If gettid() could not be used, we use one of the following. +-#if defined OS_LINUX ++#if defined GLOG_OS_LINUX + return getpid(); // Linux: getpid returns thread ID when gettid is absent +-#elif defined OS_WINDOWS && !defined OS_CYGWIN ++#elif defined GLOG_OS_WINDOWS && !defined GLOG_OS_CYGWIN + return GetCurrentThreadId(); + #elif defined(HAVE_PTHREAD) + // If none of the techniques above worked, we use pthread_self(). +@@ -275,7 +275,7 @@ pid_t GetTID() { + + const char* const_basename(const char* filepath) { + const char* base = strrchr(filepath, '/'); +-#ifdef OS_WINDOWS // Look for either path separator in Windows ++#ifdef GLOG_OS_WINDOWS // Look for either path separator in Windows + if (!base) + base = strrchr(filepath, '\\'); + #endif +@@ -288,7 +288,7 @@ const string& MyUserName() { + } + static void MyUserNameInitializer() { + // TODO(hamaji): Probably this is not portable. +-#if defined(OS_WINDOWS) ++#if defined(GLOG_OS_WINDOWS) + const char* user = getenv("USERNAME"); + #else + const char* user = getenv("USER"); +@@ -337,7 +337,7 @@ void InitGoogleLoggingUtilities(const char* argv0) { + CHECK(!IsGoogleLoggingInitialized()) + << "You called InitGoogleLogging() twice!"; + const char* slash = strrchr(argv0, '/'); +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + if (!slash) slash = strrchr(argv0, '\\'); + #endif + g_program_invocation_short_name = slash ? slash + 1 : argv0; +diff --git a/src/utilities.h b/src/utilities.h +index e4115ad..86bc296 100644 +--- a/src/utilities.h ++++ b/src/utilities.h +@@ -34,25 +34,6 @@ + #ifndef UTILITIES_H__ + #define UTILITIES_H__ + +-#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) +-# define OS_WINDOWS +-#elif defined(__CYGWIN__) || defined(__CYGWIN32__) +-# define OS_CYGWIN +-#elif defined(linux) || defined(__linux) || defined(__linux__) +-# ifndef OS_LINUX +-# define OS_LINUX +-# endif +-#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) +-# define OS_MACOSX +-#elif defined(__FreeBSD__) +-# define OS_FREEBSD +-#elif defined(__NetBSD__) +-# define OS_NETBSD +-#elif defined(__OpenBSD__) +-# define OS_OPENBSD +-#else +-// TODO(hamaji): Add other platforms. +-#endif + + // printf macros for size_t, in the style of inttypes.h + #ifdef _LP64 +@@ -76,12 +57,12 @@ + + #include + +-#if defined(OS_WINDOWS) ++#include "glog/logging.h" ++#if defined(GLOG_OS_WINDOWS) + # include "port.h" + #endif + + #include "config.h" +-#include "glog/logging.h" + + // There are three different ways we can try to get the stack trace: + // +@@ -114,7 +95,7 @@ + # define STACKTRACE_H "stacktrace_x86_64-inl.h" + # elif (defined(__ppc__) || defined(__PPC__)) && __GNUC__ >= 2 + # define STACKTRACE_H "stacktrace_powerpc-inl.h" +-# elif defined(OS_WINDOWS) ++# elif defined(GLOG_OS_WINDOWS) + # define STACKTRACE_H "stacktrace_windows-inl.h" + # endif + #endif +@@ -130,12 +111,12 @@ + #ifndef GLOG_NO_SYMBOLIZE_DETECTION + #ifndef HAVE_SYMBOLIZE + // defined by gcc +-#if defined(__ELF__) && defined(OS_LINUX) ++#if defined(__ELF__) && defined(GLOG_OS_LINUX) + # define HAVE_SYMBOLIZE +-#elif defined(OS_MACOSX) && defined(HAVE_DLADDR) ++#elif defined(GLOG_OS_MACOSX) && defined(HAVE_DLADDR) + // Use dladdr to symbolize. + # define HAVE_SYMBOLIZE +-#elif defined(OS_WINDOWS) ++#elif defined(GLOG_OS_WINDOWS) + // Use DbgHelp to symbolize + # define HAVE_SYMBOLIZE + #endif +@@ -154,7 +135,7 @@ namespace glog_internal_namespace_ { + #ifdef HAVE___ATTRIBUTE__ + # define ATTRIBUTE_NOINLINE __attribute__ ((noinline)) + # define HAVE_ATTRIBUTE_NOINLINE +-#elif defined(OS_WINDOWS) ++#elif defined(GLOG_OS_WINDOWS) + # define ATTRIBUTE_NOINLINE __declspec(noinline) + # define HAVE_ATTRIBUTE_NOINLINE + #else diff --git a/externals/vcpkg/ports/glog/glog_disable_debug_postfix.patch b/externals/vcpkg/ports/glog/glog_disable_debug_postfix.patch new file mode 100755 index 000000000..9f62ec379 --- /dev/null +++ b/externals/vcpkg/ports/glog/glog_disable_debug_postfix.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 62ebbcc..28e2688 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,7 +65,7 @@ include (GenerateExportHeader) + include (GetCacheVariables) + include (GNUInstallDirs) + +-set (CMAKE_DEBUG_POSTFIX d) ++#set (CMAKE_DEBUG_POSTFIX d) + set (CMAKE_THREAD_PREFER_PTHREAD 1) + + find_package (GTest) diff --git a/externals/vcpkg/ports/glog/portfile.cmake b/externals/vcpkg/ports/glog/portfile.cmake new file mode 100755 index 000000000..e8b8033b6 --- /dev/null +++ b/externals/vcpkg/ports/glog/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/glog + REF v0.5.0 + SHA512 445e4338f3d81cd0b065f2da9c6ce343c243263ca144cea424ef97531a4e9e09c06ffd6942ac01c5213a8003c75cfbbede3c4028d12f0134f23ff29314769c1a + HEAD_REF master + PATCHES + glog_disable_debug_postfix.patch + fix_glog_CMAKE_MODULE_PATH.patch + fix_log_every_n.patch + fix-SOME_KIND_OF_LOG.patch + fix_crosscompile_symbolize.patch + cmakelists_atomicdetect.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + unwind WITH_UNWIND +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/glog) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/glog/vcpkg.json b/externals/vcpkg/ports/glog/vcpkg.json new file mode 100755 index 000000000..d53b0421e --- /dev/null +++ b/externals/vcpkg/ports/glog/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "glog", + "version": "0.5.0", + "port-version": 5, + "description": "C++ implementation of the Google logging module", + "homepage": "https://github.com/google/glog", + "license": "BSD-3-Clause", + "dependencies": [ + "gflags", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "unwind": { + "description": "Enable libunwind support", + "supports": "linux" + } + } +} diff --git a/externals/vcpkg/ports/gloo/portfile.cmake b/externals/vcpkg/ports/gloo/portfile.cmake new file mode 100755 index 000000000..cc168af4a --- /dev/null +++ b/externals/vcpkg/ports/gloo/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO facebookincubator/gloo + REF 1da21174054eaabbbd189b7f657ea24842d821e2 + SHA512 ebd8369e413aee739a3928f8e6738c15708f009e0cd5a3763b8cadbe6f6d0a9d758585a7a2b0f7dd6d39a12882ff2f9497ab2d4edcebd4eb2a7237ab857f317e + HEAD_REF master + ) + +# Determine which backend to build via specified feature +vcpkg_check_features( + OUT_FEATURE_OPTIONS GLOO_FEATURE_OPTIONS + FEATURES + mpi USE_MPI + redis USE_REDIS + ) + +if ("cuda" IN_LIST FEATURES) + list(APPEND GLOO_FEATURE_OPTIONS "-DUSE_CUDA=1" "-DUSE_NCCL=1") +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS ${GLOO_FEATURE_OPTIONS} + ) +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/Gloo) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/gloo/vcpkg.json b/externals/vcpkg/ports/gloo/vcpkg.json new file mode 100755 index 000000000..15c4593c1 --- /dev/null +++ b/externals/vcpkg/ports/gloo/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "gloo", + "version-string": "20201203", + "description": "Collective communications library with various primitives for multi-machine training.", + "homepage": "https://github.com/facebookincubator/gloo", + "supports": "x64 & linux", + "features": { + "cuda": { + "description": "for CUDA aware algorithms", + "dependencies": [ + "cuda", + "nccl" + ] + }, + "mpi": { + "description": "for coordinating machine rendezvous through MPI", + "dependencies": [ + "openmpi" + ] + }, + "redis": { + "description": "for coordinating machine rendezvous through Redis", + "dependencies": [ + "hiredis" + ] + } + } +} diff --git a/externals/vcpkg/ports/glslang/always-install-resource-limits.patch b/externals/vcpkg/ports/glslang/always-install-resource-limits.patch new file mode 100755 index 000000000..56c34dfc4 --- /dev/null +++ b/externals/vcpkg/ports/glslang/always-install-resource-limits.patch @@ -0,0 +1,13 @@ +diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt +index 751d1cd71..0f5cf0dc0 100644 +--- a/StandAlone/CMakeLists.txt ++++ b/StandAlone/CMakeLists.txt +@@ -98,7 +98,7 @@ if(ENABLE_GLSLANG_INSTALL) + install(EXPORT spirv-remapTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) + endif() + +- if(BUILD_SHARED_LIBS) ++ if(BUILD_SHARED_LIBS OR TRUE) + install(TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/externals/vcpkg/ports/glslang/glslang-config.cmake b/externals/vcpkg/ports/glslang/glslang-config.cmake new file mode 100755 index 000000000..5eb356151 --- /dev/null +++ b/externals/vcpkg/ports/glslang/glslang-config.cmake @@ -0,0 +1,7 @@ +include(CMakeFindDependencyMacro) + +find_dependency(Threads) + +foreach(targets OGLCompiler OSDependent glslang glslang-default-resource-limits glslangValidator HLSL SPIRV spirv-remap SPVRemapper) + include("${CMAKE_CURRENT_LIST_DIR}/${targets}Targets.cmake" OPTIONAL) +endforeach() diff --git a/externals/vcpkg/ports/glslang/ignore-crt.patch b/externals/vcpkg/ports/glslang/ignore-crt.patch new file mode 100755 index 000000000..0835b49a9 --- /dev/null +++ b/externals/vcpkg/ports/glslang/ignore-crt.patch @@ -0,0 +1,9 @@ +diff --git a/ChooseMSVCCRT.cmake b/ChooseMSVCCRT.cmake +index b1561263..b6c8c3a6 100644 +--- a/ChooseMSVCCRT.cmake ++++ b/ChooseMSVCCRT.cmake +@@ -135,4 +135,3 @@ set(MSVC_CRT + MT + MTd) + +-choose_msvc_crt(MSVC_CRT) diff --git a/externals/vcpkg/ports/glslang/portfile.cmake b/externals/vcpkg/ports/glslang/portfile.cmake new file mode 100755 index 000000000..e153195dc --- /dev/null +++ b/externals/vcpkg/ports/glslang/portfile.cmake @@ -0,0 +1,55 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KhronosGroup/glslang + REF 11.8.0 + SHA512 b60d328fab6d5319e49fbf8aeb86c31a7c8dfb4bc75d39c081cbb72f90750fd98f2a4f3ab091614187ad9e0d2e27471f9dab7ca5547cabb856d17bff694f8c98 + HEAD_REF master + PATCHES + ignore-crt.patch + always-install-resource-limits.patch +) + +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON_PATH ${PYTHON3} DIRECTORY) +vcpkg_add_to_path("${PYTHON_PATH}") + +if(VCPKG_TARGET_IS_IOS) + # this case will report error since all executable will require BUNDLE DESTINATION + set(BUILD_BINARIES OFF) +else() + set(BUILD_BINARIES ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSKIP_GLSLANG_INSTALL=OFF + -DBUILD_EXTERNAL=OFF + -DENABLE_GLSLANG_BINARIES=${BUILD_BINARIES} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) + +vcpkg_copy_pdbs() + +if(NOT BUILD_BINARIES) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") +else() + vcpkg_copy_tools(TOOL_NAMES glslangValidator spirv-remap AUTO_CLEAN) +endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/bin") + +if(EXISTS "${CURRENT_PACKAGES_DIR}/share/glslang/glslang-config.cmake" OR EXISTS "${CURRENT_PACKAGES_DIR}/share/glslang/glslangConfig.cmake") + message(FATAL_ERROR "glslang has been updated to provide a -config file -- please remove the vcpkg provided version from the portfile") +endif() + +file(COPY + "${CMAKE_CURRENT_LIST_DIR}/glslang-config.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" +) + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/glslang/vcpkg.json b/externals/vcpkg/ports/glslang/vcpkg.json new file mode 100755 index 000000000..b09ee8ded --- /dev/null +++ b/externals/vcpkg/ports/glslang/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "glslang", + "version": "11.8.0", + "description": "Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator", + "homepage": "https://github.com/KhronosGroup/glslang", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/glui/install-one-flavor.patch b/externals/vcpkg/ports/glui/install-one-flavor.patch new file mode 100755 index 000000000..fb66d92c7 --- /dev/null +++ b/externals/vcpkg/ports/glui/install-one-flavor.patch @@ -0,0 +1,70 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c0f7d32..8446f3c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,6 +59,22 @@ target_include_directories(glui_obj + # create static *and* shared libraries without double compilation + set_target_properties( glui_obj PROPERTIES POSITION_INDEPENDENT_CODE 1) + ++if (MSVC) ++ target_compile_options(glui_obj ++ PRIVATE ++ /D_CRT_SECURE_NO_WARNINGS ++ /wd4244 ++ /wd4305 ++ ) ++endif() ++ ++if(BUILD_SHARED_LIBS) ++ if(WIN32) ++ target_compile_definitions(glui_obj ++ PRIVATE GLUI_BUILDING_LIB ++ PUBLIC GLUIDLL ++ ) ++ endif() + add_library(glui SHARED $) + target_include_directories(glui + PUBLIC +@@ -71,7 +87,7 @@ set_target_properties(glui PROPERTIES + DEBUG_POSTFIX "d" + VERSION ${PROJECT_VERSION} + SOVERSION ${PROJECT_VERSION}) +- ++else() + add_library(glui_static STATIC $) + target_include_directories(glui_static + PUBLIC +@@ -81,7 +97,9 @@ target_include_directories(glui_static + ${GLUT_INCLUDE_DIR}) + target_link_libraries(glui_static PUBLIC ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES}) + set_target_properties(glui_static PROPERTIES DEBUG_POSTFIX "d") ++endif() + ++if(GLUI_BUILD_EXAMPLES) + add_executable(ppm2array tools/ppm.cpp tools/ppm2array.cpp) + target_link_libraries(ppm2array) + +@@ -97,7 +115,7 @@ add_executable(example5 example/example5.cpp) + target_link_libraries(example5 glui_static ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES}) + add_executable(example6 example/example6.cpp) + target_link_libraries(example6 glui_static ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES}) +- ++endif() + + + #### +@@ -130,8 +148,13 @@ configure_package_config_file( + ) + + # Targets: ++if(BUILD_SHARED_LIBS) ++ set(glui_target glui) ++else() ++ set(glui_target glui_static) ++endif() + install( +- TARGETS glui_static glui ++ TARGETS ${glui_target} + EXPORT "${targets_export_name}" + LIBRARY DESTINATION "lib" + ARCHIVE DESTINATION "lib" diff --git a/externals/vcpkg/ports/glui/portfile.cmake b/externals/vcpkg/ports/glui/portfile.cmake new file mode 100755 index 000000000..a3b37a597 --- /dev/null +++ b/externals/vcpkg/ports/glui/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libglui/glui + REF 093edc777c02118282910bdee59f8db1bd46a84d + SHA512 650e169a6a55cd7d599176ac0767cd95b511fbc0a9b27aab2fa4f94a6395fa1a5762b6c23f5f1a9fc5ac9ce70c44fee4e4cbb6d6afd2307130cedfb80aae877a + HEAD_REF master + PATCHES + install-one-flavor.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(COPY + ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} +) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + vcpkg_replace_string( + ${CURRENT_PACKAGES_DIR}/include/GL/glui.h + "ifdef GLUIDLL" + "if 1 //ifdef GLUIDLL" + ) +endif() + +file(INSTALL ${SOURCE_PATH}/license.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/glui/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/glui/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..6fefefc7c --- /dev/null +++ b/externals/vcpkg/ports/glui/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,9 @@ +_find_package(${ARGS}) + +if(TARGET glui::glui AND NOT TARGET glui::glui_static) + add_library(glui::glui_static INTERFACE IMPORTED) + set_target_properties(glui::glui_static PROPERTIES INTERFACE_LINK_LIBRARIES glui::glui) +elseif(TARGET glui::glui_static AND NOT TARGET glui::glui) + add_library(glui::glui INTERFACE IMPORTED) + set_target_properties(glui::glui PROPERTIES INTERFACE_LINK_LIBRARIES glui::glui_static) +endif() diff --git a/externals/vcpkg/ports/glui/vcpkg.json b/externals/vcpkg/ports/glui/vcpkg.json new file mode 100755 index 000000000..c585a4f2b --- /dev/null +++ b/externals/vcpkg/ports/glui/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "glui", + "version-string": "2019-11-30", + "port-version": 1, + "description": "GLUI is a GLUT-based C++ user interface library", + "homepage": "https://github.com/libglui/glui", + "dependencies": [ + "freeglut" + ] +} diff --git a/externals/vcpkg/ports/gmime/CMakeLists.txt b/externals/vcpkg/ports/gmime/CMakeLists.txt new file mode 100755 index 000000000..b957e4656 --- /dev/null +++ b/externals/vcpkg/ports/gmime/CMakeLists.txt @@ -0,0 +1,58 @@ +cmake_minimum_required(VERSION 3.8) + +project(gmime C) + +set(GMIME_DLL_SUFFIX 3) +set(GMIME_LIB_SUFFIX 3.0) + +find_package(ZLIB REQUIRED) +find_package(PkgConfig REQUIRED) +pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 IMPORTED_TARGET) +find_package(Iconv REQUIRED) + +find_library(IDN_LIBRARY NAMES libidn2) + +if(MSVC) + add_definitions(-D_CRT_SECURE_NO_DEPRECATE) + add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) +endif() + +add_definitions(-DHAVE_CONFIG_H) +add_definitions(-DG_DISABLE_DEPRECATED) +add_definitions(-DG_LOG_DOMAIN="GMime") + +# Source files +file(GLOB LIB_SRC gmime/gmime-*.c) +list(APPEND LIB_SRC gmime/gmime.c + gmime/internet-address.c + util/packed.c + util/url-scanner.c + util/gtrie.c) + +# Headers +file(GLOB LIB_HEADERS gmime/gmime-*.h) +list(APPEND LIB_HEADERS gmime/gmime.h) +list(APPEND LIB_HEADERS gmime/internet-address.h) + +if(MSVC AND BUILD_SHARED_LIBS) + set(MSVC_SRC gmime.def) +endif() + +add_library(${PROJECT_NAME} ${LIB_SRC} ${MSVC_SRC}) + +set_target_properties(${PROJECT_NAME} PROPERTIES + OUTPUT_NAME ${PROJECT_NAME}-${GMIME_DLL_SUFFIX} + ARCHIVE_OUTPUT_NAME ${PROJECT_NAME}-${GMIME_LIB_SUFFIX} +) + +target_include_directories(${PROJECT_NAME} PRIVATE . ./util) +target_link_libraries(${PROJECT_NAME} PRIVATE Iconv::Iconv ZLIB::ZLIB ${IDN_LIBRARY}) +target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::GLIB2) +target_link_libraries(${PROJECT_NAME} PRIVATE Ws2_32.lib) + +install(TARGETS ${PROJECT_NAME} + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + +install(FILES ${LIB_HEADERS} DESTINATION include/gmime) diff --git a/externals/vcpkg/ports/gmime/portfile.cmake b/externals/vcpkg/ports/gmime/portfile.cmake new file mode 100755 index 000000000..d1e145a83 --- /dev/null +++ b/externals/vcpkg/ports/gmime/portfile.cmake @@ -0,0 +1,39 @@ +set(LIB_NAME gmime) +set(LIB_VERSION 3.2.6) + +set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.xz) + +vcpkg_download_distfile(ARCHIVE + URLS "https://download.gnome.org/sources/gmime/3.2/${LIB_FILENAME}" + FILENAME "${LIB_FILENAME}" + SHA512 a60d3f9f1aa8490865c22cd9539544e9c9f3ceb4037b9749cf9e5c279f97aa88fc4cd077bf2aff314ba0db2a1b7bbe76f9b1ca5a17fffcbd6315ecebc5414a3d +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${LIB_VERSION} +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +# We can use file supplied with original sources +configure_file(${SOURCE_PATH}/build/vs2017/unistd.h ${SOURCE_PATH} COPYONLY) +configure_file(${SOURCE_PATH}/build/vs2017/config.h ${SOURCE_PATH} COPYONLY) +configure_file(${SOURCE_PATH}/build/vs2017/gmime.def ${SOURCE_PATH} COPYONLY) +vcpkg_find_acquire_program(PKGCONFIG) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# License and man +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${LIB_NAME} RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/gmime/vcpkg.json b/externals/vcpkg/ports/gmime/vcpkg.json new file mode 100755 index 000000000..356f24e44 --- /dev/null +++ b/externals/vcpkg/ports/gmime/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "gmime", + "version": "3.2.6", + "port-version": 2, + "description": "GMime is a C/C++ library which may be used for the creation and parsing of messages using the Multipurpose Internet Mail Extension (MIME).", + "homepage": "https://developer.gnome.org/gmime/", + "supports": "windows", + "dependencies": [ + "glib", + "libiconv", + "libidn2", + "zlib" + ] +} diff --git a/externals/vcpkg/ports/gmmlib/portfile.cmake b/externals/vcpkg/ports/gmmlib/portfile.cmake new file mode 100755 index 000000000..4fb8c4520 --- /dev/null +++ b/externals/vcpkg/ports/gmmlib/portfile.cmake @@ -0,0 +1,30 @@ +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "Intel gmmlib currently only supports Linux platforms") +endif() + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO intel/gmmlib + REF intel-gmmlib-21.3.2 + SHA512 155f7077f3135ff812b9fe759e56fecd595f1c5dde9a377df31a9acedcfeea9d93751badba68077c00929a21cb87e1bd69b8fe3961ac61765fabbc5d6d89e6be + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -DARCH=64 +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/igdgmm/GmmLib/Scripts") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/igdgmm/GmmLib/Resource") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/igdgmm/GmmLib/GlobalInfo") + +vcpkg_fixup_pkgconfig() + +# Handle copyright +configure_file("${SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/gmmlib/vcpkg.json b/externals/vcpkg/ports/gmmlib/vcpkg.json new file mode 100755 index 000000000..cd2ee1825 --- /dev/null +++ b/externals/vcpkg/ports/gmmlib/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "gmmlib", + "version": "21.3.2", + "port-version": 1, + "description": "Intel(R) Graphics Memory Management Library", + "homepage": "https://github.com/intel/gmmlib", + "license": "MIT", + "supports": "linux", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/gmp/msvc_symbol.patch b/externals/vcpkg/ports/gmp/msvc_symbol.patch new file mode 100755 index 000000000..c416595b3 --- /dev/null +++ b/externals/vcpkg/ports/gmp/msvc_symbol.patch @@ -0,0 +1,28 @@ +diff --git a/configure.ac b/configure.ac +index cafdb3c71..bd92bc4bb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2703,8 +2703,8 @@ Use "--disable-static --enable-shared" to build just a DLL.]) + # + if test "$enable_shared" = yes; then + GMP_LDFLAGS="$GMP_LDFLAGS -no-undefined -Wl,--export-all-symbols" +- LIBGMP_LDFLAGS="$LIBGMP_LDFLAGS -Wl,--output-def,.libs/libgmp-3.dll.def" +- LIBGMPXX_LDFLAGS="$LIBGMP_LDFLAGS -Wl,--output-def,.libs/libgmpxx-3.dll.def" ++ #LIBGMP_LDFLAGS="$LIBGMP_LDFLAGS -Wl,--output-def,.libs/libgmp-3.dll.def" ++ #LIBGMPXX_LDFLAGS="$LIBGMP_LDFLAGS -Wl,--output-def,.libs/libgmpxx-3.dll.def" + LIBGMP_DLL=1 + fi + ;; +diff --git a/gmp-h.in b/gmp-h.in +index 3d449d427..18a03b753 100644 +--- a/gmp-h.in ++++ b/gmp-h.in +@@ -398,7 +398,7 @@ typedef __mpq_struct *mpq_ptr; + + /* Microsoft's C compiler accepts __inline */ + #ifdef _MSC_VER +-#define __GMP_EXTERN_INLINE __inline ++#define __GMP_EXTERN_INLINE static __inline + #endif + + /* Recent enough Sun C compilers want "inline" */ diff --git a/externals/vcpkg/ports/gmp/portfile.cmake b/externals/vcpkg/ports/gmp/portfile.cmake new file mode 100755 index 000000000..2138744fc --- /dev/null +++ b/externals/vcpkg/ports/gmp/portfile.cmake @@ -0,0 +1,80 @@ +if(EXISTS "${CURRENT_INSTALLED_DIR}/include/gmp.h" OR "${CURRENT_INSTALLED_DIR}/include/gmpxx.h") + message(FATAL_ERROR "Can't build ${PORT} if mpir is installed. Please remove mpir, and try install ${PORT} again if you need it.") +endif() + +vcpkg_download_distfile( + ARCHIVE + URLS https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz + FILENAME gmp-6.2.1.tar.xz + SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84 +) + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(PATCHES yasm.patch + msvc_symbol.patch) +endif() + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF gmp-6.2.1 + PATCHES + ${PATCHES} + tools.patch +) + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(ENV{CCAS} "${CURRENT_HOST_INSTALLED_DIR}/tools/yasm/yasm${VCPKG_HOST_EXECUTABLE_SUFFIX}") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(asmflag win64) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(asmflag win32) + endif() + set(ENV{ASMFLAGS} "-Xvc -f ${asmflag} -pgas -rraw") + set(OPTIONS ac_cv_func_memset=yes + "gmp_cv_asm_w32=.word" + ) + +endif() + +if(VCPKG_CROSSCOMPILING) + # Silly trick to make configure accept CC_FOR_BUILD but in reallity CC_FOR_BUILD is deactivated. + set(ENV{CC_FOR_BUILD} "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + set(ENV{CPP_FOR_BUILD} "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + ${OPTIONS} + --enable-cxx + --with-pic +) + +set(tool_names bases fac fib jacobitab psqr trialdivtab) +list(TRANSFORM tool_names PREPEND "gen-") +list(TRANSFORM tool_names APPEND "${VCPKG_HOST_EXECUTABLE_SUFFIX}") + +if(VCPKG_CROSSCOMPILING) + list(TRANSFORM tool_names PREPEND "${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}/") + file(COPY ${tool_names} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/" ) + if(NOT VCPKG_BUILD_TYPE) + file(COPY ${tool_names} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/" ) + endif() +endif() + +vcpkg_install_make() + +if(NOT VCPKG_CROSSCOMPILING) + list(TRANSFORM tool_names PREPEND "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/") + file(COPY ${tool_names} DESTINATION "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}" ) +endif() + +vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYINGv3" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/externals/vcpkg/ports/gmp/tools.patch b/externals/vcpkg/ports/gmp/tools.patch new file mode 100755 index 000000000..193f3835b --- /dev/null +++ b/externals/vcpkg/ports/gmp/tools.patch @@ -0,0 +1,58 @@ +diff --git a/Makefile.am b/Makefile.am +index 1c24694..656aa3a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -349,7 +349,7 @@ fac_table.h: gen-fac$(EXEEXT_FOR_BUILD) + BUILT_SOURCES += fac_table.h + + gen-fac$(EXEEXT_FOR_BUILD): gen-fac$(U_FOR_BUILD).c bootstrap.c +- $(CC_FOR_BUILD) `test -f 'gen-fac$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-fac$(U_FOR_BUILD).c -o gen-fac$(EXEEXT_FOR_BUILD) ++ $(CC_FOR_BUILD) `test -f 'gen-fac$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-fac$(U_FOR_BUILD).c $(CFLAGS) -o gen-fac$(EXEEXT_FOR_BUILD) + DISTCLEANFILES += gen-fac$(EXEEXT_FOR_BUILD) + EXTRA_DIST += gen-fac.c + +@@ -363,7 +363,7 @@ mpn/fib_table.c: gen-fib$(EXEEXT_FOR_BUILD) + BUILT_SOURCES += mpn/fib_table.c + + gen-fib$(EXEEXT_FOR_BUILD): gen-fib$(U_FOR_BUILD).c bootstrap.c +- $(CC_FOR_BUILD) `test -f 'gen-fib$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-fib$(U_FOR_BUILD).c -o gen-fib$(EXEEXT_FOR_BUILD) ++ $(CC_FOR_BUILD) `test -f 'gen-fib$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-fib$(U_FOR_BUILD).c $(CFLAGS) -o gen-fib$(EXEEXT_FOR_BUILD) + DISTCLEANFILES += gen-fib$(EXEEXT_FOR_BUILD) + EXTRA_DIST += gen-fib.c + +@@ -377,7 +377,7 @@ mpn/mp_bases.c: gen-bases$(EXEEXT_FOR_BUILD) + BUILT_SOURCES += mpn/mp_bases.c + + gen-bases$(EXEEXT_FOR_BUILD): gen-bases$(U_FOR_BUILD).c bootstrap.c +- $(CC_FOR_BUILD) `test -f 'gen-bases$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-bases$(U_FOR_BUILD).c -o gen-bases$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD) ++ $(CC_FOR_BUILD) `test -f 'gen-bases$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-bases$(U_FOR_BUILD).c $(CFLAGS) -o gen-bases$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD) + DISTCLEANFILES += gen-bases$(EXEEXT_FOR_BUILD) + EXTRA_DIST += gen-bases.c + +@@ -387,7 +387,7 @@ trialdivtab.h: gen-trialdivtab$(EXEEXT_FOR_BUILD) + BUILT_SOURCES += trialdivtab.h + + gen-trialdivtab$(EXEEXT_FOR_BUILD): gen-trialdivtab$(U_FOR_BUILD).c bootstrap.c +- $(CC_FOR_BUILD) `test -f 'gen-trialdivtab$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-trialdivtab$(U_FOR_BUILD).c -o gen-trialdivtab$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD) ++ $(CC_FOR_BUILD) `test -f 'gen-trialdivtab$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-trialdivtab$(U_FOR_BUILD).c $(CFLAGS) -o gen-trialdivtab$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD) + DISTCLEANFILES += gen-trialdivtab$(EXEEXT_FOR_BUILD) + EXTRA_DIST += gen-trialdivtab.c + +@@ -397,7 +397,7 @@ mpn/jacobitab.h: gen-jacobitab$(EXEEXT_FOR_BUILD) + BUILT_SOURCES += mpn/jacobitab.h + + gen-jacobitab$(EXEEXT_FOR_BUILD): gen-jacobitab$(U_FOR_BUILD).c +- $(CC_FOR_BUILD) `test -f 'gen-jacobitab$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-jacobitab$(U_FOR_BUILD).c -o gen-jacobitab$(EXEEXT_FOR_BUILD) ++ $(CC_FOR_BUILD) `test -f 'gen-jacobitab$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-jacobitab$(U_FOR_BUILD).c $(CFLAGS) -o gen-jacobitab$(EXEEXT_FOR_BUILD) + DISTCLEANFILES += gen-jacobitab$(EXEEXT_FOR_BUILD) + EXTRA_DIST += gen-jacobitab.c + +@@ -407,7 +407,7 @@ mpn/perfsqr.h: gen-psqr$(EXEEXT_FOR_BUILD) + BUILT_SOURCES += mpn/perfsqr.h + + gen-psqr$(EXEEXT_FOR_BUILD): gen-psqr$(U_FOR_BUILD).c bootstrap.c +- $(CC_FOR_BUILD) `test -f 'gen-psqr$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-psqr$(U_FOR_BUILD).c -o gen-psqr$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD) ++ $(CC_FOR_BUILD) `test -f 'gen-psqr$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-psqr$(U_FOR_BUILD).c $(CFLAGS) -o gen-psqr$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD) + DISTCLEANFILES += gen-psqr$(EXEEXT_FOR_BUILD) + EXTRA_DIST += gen-psqr.c + diff --git a/externals/vcpkg/ports/gmp/vcpkg.json b/externals/vcpkg/ports/gmp/vcpkg.json new file mode 100755 index 000000000..12a6e0d43 --- /dev/null +++ b/externals/vcpkg/ports/gmp/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "gmp", + "version": "6.2.1", + "port-version": 10, + "description": "The GNU Multiple Precision Arithmetic Library", + "homepage": "https://gmplib.org", + "supports": "!(windows & (arm | arm64))", + "dependencies": [ + { + "name": "gmp", + "host": true + }, + { + "name": "yasm", + "host": true, + "features": [ + "tools" + ], + "platform": "windows" + } + ] +} diff --git a/externals/vcpkg/ports/gmp/yasm.patch b/externals/vcpkg/ports/gmp/yasm.patch new file mode 100755 index 000000000..8ea6ac356 --- /dev/null +++ b/externals/vcpkg/ports/gmp/yasm.patch @@ -0,0 +1,83 @@ +diff --git a/acinclude.m4 b/acinclude.m4 +index 86175ce42..8228d20dc 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -1649,7 +1649,7 @@ AC_DEFUN([GMP_TRY_ASSEMBLE], + [cat >conftest.s <&AC_FD_CC + ifelse([$2],,:,[$2]) +@@ -2382,7 +2382,7 @@ for tmp_underscore in "" "_"; do + ${tmp_gsym_prefix}main$gmp_cv_asm_label_suffix + addl $ ${tmp_underscore}_GLOBAL_OFFSET_TABLE_, %ebx + EOF +- gmp_compile="$CCAS $CFLAGS $CPPFLAGS $lt_prog_compiler_pic conftest.s >&AC_FD_CC && $CC $CFLAGS $CPPFLAGS $lt_prog_compiler_pic conftest.$OBJEXT >&AC_FD_CC" ++ gmp_compile="$CCAS $CPPFLAGS $ASMFLAGS $lt_prog_compiler_pic conftest.s >&AC_FD_CC && $CC $CPPFLAGS $ASMFLAGS $lt_prog_compiler_pic conftest.$OBJEXT >&AC_FD_CC" + if AC_TRY_EVAL(gmp_compile); then + if test "$tmp_underscore" = "_"; then + gmp_cv_asm_x86_got_underscore=yes +@@ -2556,7 +2556,7 @@ movq-bug) + AC_MSG_WARN([+----------------------------------------------------------]) + AC_MSG_WARN([| WARNING WARNING WARNING]) + AC_MSG_WARN([| Host CPU has MMX code, but the assembler]) +- AC_MSG_WARN([| $CCAS $CFLAGS $CPPFLAGS]) ++ AC_MSG_WARN([| $CCAS $CPPFLAGS $ASMFLAGS]) + AC_MSG_WARN([| has the Solaris 2.6 and 2.7 bug where register to register]) + AC_MSG_WARN([| movq operands are reversed.]) + AC_MSG_WARN([| Non-MMX replacements will be used.]) +diff --git a/mpn/Makeasm.am b/mpn/Makeasm.am +index 5d7306c22..75692128d 100644 +--- a/mpn/Makeasm.am ++++ b/mpn/Makeasm.am +@@ -32,7 +32,7 @@ + # COMPILE minus CC. + # + COMPILE_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASMFLAGS) ++ $(CPPFLAGS) $(ASMFLAGS) + + # Flags used for preprocessing (in ansi2knr rules). + # +diff --git a/mpn/Makefile.in b/mpn/Makefile.in +index 2bc061012..59c805976 100644 +--- a/mpn/Makefile.in ++++ b/mpn/Makefile.in +@@ -403,7 +403,7 @@ EXTRA_DIST = asm-defs.m4 cpp-ccas m4-ccas $(TARG_DIST) + # COMPILE minus CC. + # + COMPILE_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASMFLAGS) ++ $(CPPFLAGS) $(ASMFLAGS) + + + # Flags used for preprocessing (in ansi2knr rules). +diff --git a/tests/Makefile.in b/tests/Makefile.in +index 9742a4016..430603cef 100644 +--- a/tests/Makefile.in ++++ b/tests/Makefile.in +@@ -666,7 +666,7 @@ SUBDIRS = . devel mpn mpz mpq mpf rand misc cxx + # COMPILE minus CC. + # + COMPILE_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASMFLAGS) ++ $(CPPFLAGS) $(ASMFLAGS) + + + # Flags used for preprocessing (in ansi2knr rules). +diff --git a/tune/Makefile.in b/tune/Makefile.in +index f82cd13e2..351bcd9b1 100644 +--- a/tune/Makefile.in ++++ b/tune/Makefile.in +@@ -549,7 +549,7 @@ TUNE_MPN_SRCS_BASIC = div_qr_2.c bdiv_q.c bdiv_qr.c \ + # COMPILE minus CC. + # + COMPILE_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASMFLAGS) ++ $(CPPFLAGS) $(ASMFLAGS) + + + # Flags used for preprocessing (in ansi2knr rules). diff --git a/externals/vcpkg/ports/gmsh/fix-install.patch b/externals/vcpkg/ports/gmsh/fix-install.patch new file mode 100755 index 000000000..2f4510240 --- /dev/null +++ b/externals/vcpkg/ports/gmsh/fix-install.patch @@ -0,0 +1,38 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7040709..a4b8c61 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1872,12 +1872,30 @@ endif() + + # mark targets as optional so we can install them separately if needed + # (e.g. "make lib" or "make shared" followed by "make install/fast") +-install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL) ++install( ++ TARGETS gmsh ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++ OPTIONAL ++) + if(ENABLE_BUILD_LIB) +- install(TARGETS lib DESTINATION ${GMSH_LIB} OPTIONAL) ++ install( ++ TARGETS lib ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++ OPTIONAL ++ ) + endif() + if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) +- install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL) ++ install( ++ TARGETS shared ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++ OPTIONAL ++ ) + endif() + + if(ENABLE_ONELAB AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/onelab) diff --git a/externals/vcpkg/ports/gmsh/portfile.cmake b/externals/vcpkg/ports/gmsh/portfile.cmake new file mode 100755 index 000000000..78f9194a1 --- /dev/null +++ b/externals/vcpkg/ports/gmsh/portfile.cmake @@ -0,0 +1,111 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.onelab.info + OUT_SOURCE_PATH SOURCE_PATH + REPO gmsh/gmsh + REF gmsh_4_9_0 + SHA512 e70a09741a86a9131094e77742078aec1cc94517e1d7c855c257bc93c21c057e25c7ac5168d31ec4d905d78f31d5704faf63bfd3a81b4b9e2ebbcfacf2fdaa8b + HEAD_REF master + PATCHES fix-install.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_LIB) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_RUNTIME) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + opencascade ENABLE_OCC + opencascade ENABLE_OCC_CAF + opencascade ENABLE_OCC_TBB + mpi ENABLE_MPI + zipper ENABLE_ZIPPER +) + + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + ${FEATURE_OPTIONS} + -DENABLE_BUILD_LIB=${BUILD_LIB} + -DENABLE_BUILD_SHARED=${BUILD_SHARED} + -DENABLE_MSVC_STATIC_RUNTIME=${STATIC_RUNTIME} + -DGMSH_RELEASE=ON + -DENABLE_PACKAGE_STRIP=ON + -DENABLE_SYSTEM_CONTRIB=ON + # Not implement + -DENABLE_GRAPHICS=OFF # Requires mesh, post, plugins and onelab + -DENABLE_POST=OFF + -DENABLE_PLUGINS=OFF + -DENABLE_MESH=OFF + -DENABLE_PARSER=OFF + -DENABLE_PROFILE=OFF + -DENABLE_PRIVATE_API=OFF + -DENABLE_QUADMESHINGTOOLS=OFF + -DENABLE_PRO=OFF + -DENABLE_TOUCHBAR=OFF + -DENABLE_VISUDEV=OFF + -DENABLE_BLAS_LAPACK=OFF + -DENABLE_CAIRO=OFF + -DENABLE_CGNS=OFF + -DENABLE_CGNS_CPEX0045=OFF + -DENABLE_EIGEN=OFF + -DENABLE_GMP=OFF + -DENABLE_OPENMP=OFF + -DENABLE_POPPLER=OFF + -DENABLE_WRAP_JAVA=OFF + -DENABLE_WRAP_PYTHON=OFF + # Requies dependencies which not included in vcpkg yet + -DENABLE_3M=OFF + -DENABLE_ALGLIB=OFF + -DENABLE_ANN=OFF + -DENABLE_BAMG=OFF + -DENABLE_BLOSSOM=OFF + -DENABLE_BUILD_DYNAMIC=OFF # Needs gfortran + -DENABLE_FLTK=OFF # Needs executable fltk-config + -DENABLE_DINTEGRATION=OFF + -DENABLE_GEOMETRYCENTRAL=OFF + -DENABLE_DOMHEX=OFF + -DENABLE_GETDP=OFF + -DENABLE_GMM=OFF + -DENABLE_HXT=OFF + -DENABLE_KBIPACK=OFF + -DENABLE_MATHEX=OFF + -DENABLE_MED=OFF + -DENABLE_METIS=OFF + -DENABLE_MMG=OFF + -DENABLE_MPEG_ENCODE=OFF + -DENABLE_MUMPS=OFF + -DENABLE_NUMPY=OFF + -DENABLE_NETGEN=OFF + -DENABLE_PETSC4PY=OFF + -DENABLE_ONELAB_METAMODEL=OFF + -DENABLE_ONELAB=OFF + -DENABLE_OPENACC=OFF + -DENABLE_OPTHOM=OFF + -DENABLE_OSMESA=OFF + -DENABLE_P4EST=OFF + -DENABLE_PETSC=OFF + -DENABLE_QUADTRI=OFF + -DENABLE_REVOROPT=OFF + -DENABLE_SLEPC=OFF + -DENABLE_SOLVER=OFF + -DENABLE_TCMALLOC=OFF + -DENABLE_VOROPP=OFF + -DENABLE_WINSLOWUNTANGLER=OFF + # experimental + -DENABLE_BUILD_ANDROID=OFF + -DENABLE_BUILD_IOS=OFF + + -DENABLE_OS_SPECIFIC_INSTALL=OFF # Needs system permission + -DENABLE_RPATH=OFF # Should use dependencies in vcpkg + -DENABLE_TESTS=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_tools(TOOL_NAMES gmsh AUTO_CLEAN) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/gmsh/vcpkg.json b/externals/vcpkg/ports/gmsh/vcpkg.json new file mode 100755 index 000000000..70b1d266e --- /dev/null +++ b/externals/vcpkg/ports/gmsh/vcpkg.json @@ -0,0 +1,46 @@ +{ + "name": "gmsh", + "version": "4.9.0", + "description": "Gmsh is an open source 3D finite element mesh generator with a built-in CAD engine and post-processor.", + "homepage": "https://gmsh.info", + "supports": "!uwp", + "dependencies": [ + "blas", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "graphics": { + "description": "Enable building graphics lib even without GUI (advanced)", + "dependencies": [ + "libjpeg-turbo", + "libpng", + "opengl", + "zlib" + ] + }, + "mpi": { + "description": "Enable MPI (experimental, not used for meshing)", + "dependencies": [ + "openmpi" + ] + }, + "occ": { + "description": "Enable OpenCASCADE modules", + "dependencies": [ + "caf", + "freetype", + "opencascade", + "tbb" + ] + }, + "zipper": { + "description": "Enable Zip file compression/decompression", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/gobject-introspection/0001-g-ir-tool-template.in.patch b/externals/vcpkg/ports/gobject-introspection/0001-g-ir-tool-template.in.patch new file mode 100755 index 000000000..c3d4e35de --- /dev/null +++ b/externals/vcpkg/ports/gobject-introspection/0001-g-ir-tool-template.in.patch @@ -0,0 +1,23 @@ +--- a/tools/g-ir-tool-template.in 2021-09-17 23:02:42.601052000 +0700 ++++ b/tools/g-ir-tool-template.in 2021-12-29 21:41:52.987141900 +0700 +@@ -59,7 +59,7 @@ + builtins.__dict__['GIRDIR'] = [girdir] + + # Again, relative paths first so that the installation prefix is relocatable +-pylibdir = os.path.abspath(os.path.join(filedir, '..', 'lib', 'gobject-introspection')) ++pylibdir = os.path.abspath(os.path.join(filedir, '..', '..', 'lib', 'gobject-introspection')) + + # EXT_SUFFIX for py3 SO for py2 + py_mod_suffix = sysconfig.get_config_var('EXT_SUFFIX') or sysconfig.get_config_var('SO') +@@ -91,6 +91,11 @@ + + sys.path.insert(0, pylibdir) + ++pkg_config_path = os.getenv('PKG_CONFIG_PATH', '') ++if pkg_config_path: ++ pkg_config_path = os.pathsep + pkg_config_path ++os.environ['PKG_CONFIG_PATH'] = os.path.normpath(os.path.join(pylibdir, '..', 'pkgconfig')) + pkg_config_path ++ + from giscanner.utils import dll_dirs + dll_dirs = dll_dirs() + dll_dirs.add_dll_dirs(['gio-2.0']) diff --git a/externals/vcpkg/ports/gobject-introspection/0002-cross-build.patch b/externals/vcpkg/ports/gobject-introspection/0002-cross-build.patch new file mode 100755 index 000000000..aa962c9d0 --- /dev/null +++ b/externals/vcpkg/ports/gobject-introspection/0002-cross-build.patch @@ -0,0 +1,60 @@ +--- a/gir/meson.build 2021-09-17 23:02:42.502052000 +0700 ++++ b/gir/meson.build 2022-01-05 02:31:25.960457800 +0700 +@@ -42,7 +42,7 @@ + install_data(gir_files, install_dir: girdir) + + scanner_command = [ +- find_program('g-ir-scanner', native: true), ++ find_program('g-ir-scanner'), + '--output=@OUTPUT@', + '--no-libtool', + '--quiet', +@@ -495,6 +495,7 @@ + ) + + typelibs = [] ++gircompiler = find_program('g-ir-compiler') + if get_option('gi_cross_binary_wrapper') != '' + gircompiler_command = [get_option('gi_cross_binary_wrapper'), gircompiler.full_path(), ] + else +@@ -510,7 +511,7 @@ + typelibs += custom_target('generate-typelib-@0@'.format(gir).underscorify(), + input: gir, + output: '@BASENAME@.typelib', +- depends: [gobject_gir, gircompiler, ], ++ depends: [gobject_gir, ], + command: gircompiler_command, + install: true, + install_dir: typelibdir, +--- a/tools/meson.build 2021-09-17 23:02:42.601052000 +0700 ++++ b/tools/meson.build 2022-01-05 02:36:06.103763400 +0700 +@@ -64,7 +64,9 @@ + install: true, + c_args: custom_c_args, + ) +-meson.override_find_program('g-ir-compiler', gircompiler) ++if not get_option('gi_cross_use_prebuilt_gi') ++ meson.override_find_program('g-ir-compiler', gircompiler) ++endif + + girgenerate = executable('g-ir-generate', 'generate.c', + dependencies: [ +@@ -74,11 +76,15 @@ + install: true, + c_args: custom_c_args, + ) +-meson.override_find_program('g-ir-generate', girgenerate) ++if not get_option('gi_cross_use_prebuilt_gi') ++ meson.override_find_program('g-ir-generate', girgenerate) ++endif + + girinspect = executable('g-ir-inspect', 'g-ir-inspect.c', + dependencies: girepo_dep, + install: true, + c_args: custom_c_args, + ) +-meson.override_find_program('g-ir-inspect', girinspect) ++if not get_option('gi_cross_use_prebuilt_gi') ++ meson.override_find_program('g-ir-inspect', girinspect) ++endif +\ No newline at end of file diff --git a/externals/vcpkg/ports/gobject-introspection/portfile.cmake b/externals/vcpkg/ports/gobject-introspection/portfile.cmake new file mode 100755 index 000000000..b5ae3bc05 --- /dev/null +++ b/externals/vcpkg/ports/gobject-introspection/portfile.cmake @@ -0,0 +1,82 @@ + +set(GI_MAJOR_MINOR 1.72) +set(GI_PATCH 0) + +vcpkg_download_distfile(ARCHIVE + URLS "https://download.gnome.org/sources/gobject-introspection/${GI_MAJOR_MINOR}/gobject-introspection-${GI_MAJOR_MINOR}.${GI_PATCH}.tar.xz" + FILENAME "gobject-introspection-${GI_MAJOR_MINOR}.${GI_PATCH}.tar.xz" + SHA512 b8fba2bd12e93776c55228acf3487bef36ee40b1abdc7f681b827780ac94a8bfa1f59b0c30d60fa5a1fea2f610de78b9e52029f411128067808f17eb6374cdc5 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + 0001-g-ir-tool-template.in.patch + 0002-cross-build.patch + python.patch +) + +vcpkg_find_acquire_program(FLEX) +vcpkg_find_acquire_program(BISON) + +set(OPTIONS_DEBUG -Dbuild_introspection_data=false) +set(OPTIONS_RELEASE -Dbuild_introspection_data=true) +if(VCPKG_CROSSCOMPILING AND + NOT (CMAKE_HOST_WIN32 AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")) + list(APPEND OPTIONS_RELEASE -Dgi_cross_use_prebuilt_gi=true) +endif() + +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS_DEBUG + ${OPTIONS_DEBUG} + OPTIONS_RELEASE + ${OPTIONS_RELEASE} + ADDITIONAL_NATIVE_BINARIES + flex='${FLEX}' + bison='${BISON}' + ADDITIONAL_CROSS_BINARIES + flex='${FLEX}' + bison='${BISON}' + g-ir-annotation-tool='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-annotation-tool' + g-ir-compiler='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-compiler${VCPKG_HOST_EXECUTABLE_SUFFIX}' + g-ir-scanner='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-scanner' +) + +vcpkg_host_path_list(APPEND ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/lib/pkgconfig") +vcpkg_host_path_list(APPEND ENV{LIB} "${CURRENT_INSTALLED_DIR}/lib") +vcpkg_install_meson(ADD_BIN_TO_PATH) + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +set(GI_TOOLS + g-ir-compiler + g-ir-generate + g-ir-inspect +) +set(GI_SCRIPTS + g-ir-annotation-tool + g-ir-scanner +) + +vcpkg_copy_tools(TOOL_NAMES ${GI_TOOLS} AUTO_CLEAN) +foreach(script IN LISTS GI_SCRIPTS) + file(READ "${CURRENT_PACKAGES_DIR}/bin/${script}" _contents) + string(REPLACE "#!/usr/bin/env ${PYTHON3}" "#!/usr/bin/env python3" _contents "${_contents}") + string(REPLACE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_INSTALLED_DIR}/lib" _contents "${_contents}") + file(WRITE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${script}" "${_contents}") + + file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${script}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${script}") +endforeach() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") + +set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) # _giscanner.lib diff --git a/externals/vcpkg/ports/gobject-introspection/python.patch b/externals/vcpkg/ports/gobject-introspection/python.patch new file mode 100755 index 000000000..5a196ae65 --- /dev/null +++ b/externals/vcpkg/ports/gobject-introspection/python.patch @@ -0,0 +1,29 @@ +diff --git a/giscanner/meson.build b/giscanner/meson.build +index e63a5ab78..3d7dc678a 100644 +--- a/giscanner/meson.build ++++ b/giscanner/meson.build +@@ -97,11 +97,11 @@ giscanner_lib = static_library('giscanner', + dependencies: [glib_dep, gobject_dep, gio_dep, gmodule_dep], + ) + + # https://github.com/mesonbuild/meson/issues/4117 + if host_machine.system() == 'windows' ++ python_ext_dep = libpython_dep +- python_ext_dep = python.dependency() + else ++ python_ext_dep = libpython_dep +- python_ext_dep = python.dependency().partial_dependency(compile_args: true) + endif + + if not python_ext_dep.found() +diff --git a/meson.build b/meson.build +index 2a9d68556..cffe9014c 100644 +--- a/meson.build ++++ b/meson.build +@@ -156,4 +156,5 @@ libffi_dep = dependency('libffi', + + # python headers +-cc.check_header('Python.h', dependencies: [python.dependency()], required: true) ++libpython_dep = dependency('python-3.10', method : 'pkg-config') ++cc.check_header('Python.h', dependencies: [libpython_dep], required: true) + diff --git a/externals/vcpkg/ports/gobject-introspection/vcpkg.json b/externals/vcpkg/ports/gobject-introspection/vcpkg.json new file mode 100755 index 000000000..1da115b5f --- /dev/null +++ b/externals/vcpkg/ports/gobject-introspection/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "gobject-introspection", + "version": "1.72.0", + "description": "A middleware layer between C libraries (using GObject) and language bindings.", + "homepage": "https://gi.readthedocs.io/en/latest/", + "license": null, + "supports": "!static & (native | (windows & x86))", + "dependencies": [ + { + "name": "cairo", + "default-features": false, + "features": [ + "gobject" + ] + }, + "glib", + { + "name": "glib", + "host": true + }, + { + "name": "gobject-introspection", + "host": true + }, + "python3", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/google-cloud-cpp-common/portfile.cmake b/externals/vcpkg/ports/google-cloud-cpp-common/portfile.cmake new file mode 100755 index 000000000..065116c27 --- /dev/null +++ b/externals/vcpkg/ports/google-cloud-cpp-common/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/google-cloud-cpp-common/vcpkg.json b/externals/vcpkg/ports/google-cloud-cpp-common/vcpkg.json new file mode 100755 index 000000000..12377d6c8 --- /dev/null +++ b/externals/vcpkg/ports/google-cloud-cpp-common/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "google-cloud-cpp-common", + "version-string": "alias", + "port-version": 1, + "description": "Deprecated, use google-cloud-cpp instead", + "dependencies": [ + "google-cloud-cpp" + ] +} diff --git a/externals/vcpkg/ports/google-cloud-cpp-spanner/portfile.cmake b/externals/vcpkg/ports/google-cloud-cpp-spanner/portfile.cmake new file mode 100755 index 000000000..065116c27 --- /dev/null +++ b/externals/vcpkg/ports/google-cloud-cpp-spanner/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/google-cloud-cpp-spanner/vcpkg.json b/externals/vcpkg/ports/google-cloud-cpp-spanner/vcpkg.json new file mode 100755 index 000000000..87f8b18c5 --- /dev/null +++ b/externals/vcpkg/ports/google-cloud-cpp-spanner/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "google-cloud-cpp-spanner", + "version-string": "alias", + "port-version": 1, + "description": "Deprecated, use google-cloud-cpp instead", + "dependencies": [ + "google-cloud-cpp" + ] +} diff --git a/externals/vcpkg/ports/google-cloud-cpp/portfile.cmake b/externals/vcpkg/ports/google-cloud-cpp/portfile.cmake new file mode 100755 index 000000000..850ce2aa7 --- /dev/null +++ b/externals/vcpkg/ports/google-cloud-cpp/portfile.cmake @@ -0,0 +1,82 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO googleapis/google-cloud-cpp + REF v1.41.0 + SHA512 41bee9fce6d7bbb0cdd201f9902b1bb0b3c94e4e42719332021fdd7ba1e1b1d503cd7e480c6318da658595100d63223f8f11c3d7f5e4965c1c815ab703a9c224 + HEAD_REF main + PATCHES + support_absl_cxx17.patch +) + +vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc") + +set(GOOGLE_CLOUD_CPP_ENABLE "${FEATURES}") +list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "core") +# This feature does not exist, but allows us to simplify the vcpkg.json file. +list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "grpc-common") +list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "googleapis") + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE + OPTIONS + "-DGOOGLE_CLOUD_CPP_ENABLE=${GOOGLE_CLOUD_CPP_ENABLE}" + -DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF + -DGOOGLE_CLOUD_CPP_ENABLE_WERROR=OFF + -DGOOGLE_CLOUD_CPP_ENABLE_CCACHE=OFF + -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +foreach(feature IN LISTS FEATURES) + set(config_path "lib/cmake/google_cloud_cpp_${feature}") + # Most features get their own package in `google-cloud-cpp`. + # The exceptions are captured by this `if()` command, basically + # things like `core` and `experimental-storage-grpc` are skipped. + if(NOT IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/${config_path}") + continue() + endif() + vcpkg_cmake_config_fixup(PACKAGE_NAME "google_cloud_cpp_${feature}" + CONFIG_PATH "${config_path}" + DO_NOT_DELETE_PARENT_CONFIG_PATH) +endforeach() +# These packages are automatically installed depending on what features are +# enabled. +foreach(suffix common googleapis grpc_utils rest_internal) + set(config_path "lib/cmake/google_cloud_cpp_${suffix}") + if(NOT IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/${config_path}") + continue() + endif() + vcpkg_cmake_config_fixup(PACKAGE_NAME "google_cloud_cpp_${suffix}" + CONFIG_PATH "${config_path}" + DO_NOT_DELETE_PARENT_CONFIG_PATH) +endforeach() + +# These packages are only for backwards compability. The google-cloud-cpp team +# is planning to remove them around 2022-02-15. +foreach(package + googleapis + bigtable_client + pubsub_client + spanner_client + storage_client) + set(config_path "lib/cmake/${package}") + if(NOT IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/${config_path}") + continue() + endif() + vcpkg_cmake_config_fixup(PACKAGE_NAME "${package}" + CONFIG_PATH "${config_path}" + DO_NOT_DELETE_PARENT_CONFIG_PATH) +endforeach() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" + "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" + "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/google-cloud-cpp/support_absl_cxx17.patch b/externals/vcpkg/ports/google-cloud-cpp/support_absl_cxx17.patch new file mode 100755 index 000000000..5697fd3a9 --- /dev/null +++ b/externals/vcpkg/ports/google-cloud-cpp/support_absl_cxx17.patch @@ -0,0 +1,32 @@ +diff --git a//CMakeLists.txt b/CMakeLists.txt +index 4d03fee..42bb13c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -43,6 +43,14 @@ if (APPLE AND NOT DEFINED CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 11) + endif () + ++find_package(absl CONFIG REQUIRED) ++ ++# Use CMAKE_CXX_STANDARD=17 if ABSL_USE_CXX17 is set ++if (ABSL_USE_CXX17) ++ message(STATUS "Found absl uses CXX17, enable CXX17 feature.") ++ set(CMAKE_CXX_STANDARD 17) ++endif () ++ + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) + message( +diff --git a/google/cloud/internal/port_platform.h b/google/cloud/internal/port_platform.h +index f02cb7a..0ea8c9c 100644 +--- a/google/cloud/internal/port_platform.h ++++ b/google/cloud/internal/port_platform.h +@@ -49,6 +49,8 @@ + // Abort compilation if the compiler does not support C++11. + #if GOOGLE_CLOUD_CPP_CPP_VERSION < 201103L + # error "C++11 or newer is required" ++#elif defined(ABSL_USE_CXX17) && GOOGLE_CLOUD_CPP_CPP_VERSION < 201703L ++# error "Compiled to use Abseil with C++17 support, but using with C++ < C++17" + #endif // GOOGLE_CLOUD_CPP_CPP_VERSION < 201103L + + // Abort the build if the version of the compiler is too old. With CMake we diff --git a/externals/vcpkg/ports/google-cloud-cpp/vcpkg.json b/externals/vcpkg/ports/google-cloud-cpp/vcpkg.json new file mode 100755 index 000000000..cb541dd71 --- /dev/null +++ b/externals/vcpkg/ports/google-cloud-cpp/vcpkg.json @@ -0,0 +1,994 @@ +{ + "name": "google-cloud-cpp", + "version": "1.41.0", + "description": "C++ Client Libraries for Google Cloud Platform APIs.", + "homepage": "https://github.com/googleapis/google-cloud-cpp", + "license": "Apache-2.0", + "supports": "!uwp", + "dependencies": [ + "abseil", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "bigquery", + "bigtable", + "iam", + "pubsub", + "spanner", + "storage" + ], + "features": { + "accessapproval": { + "description": "Access Approval API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "accesscontextmanager": { + "description": "Access Context Manager API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "apigateway": { + "description": "API Gateway API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "apigeeconnect": { + "description": "Apigee Connect API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "appengine": { + "description": "App Engine Admin API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "artifactregistry": { + "description": "Artifact Registry API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "asset": { + "description": "Cloud Asset API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "assuredworkloads": { + "description": "Assured Workloads API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "automl": { + "description": "Cloud AutoML API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "bigquery": { + "description": "The Google Cloud BigQuery C++ client library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "bigtable": { + "description": "The Google Cloud Bigtable C++ client library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "billing": { + "description": "Cloud Billing Budget API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "binaryauthorization": { + "description": "Binary Authorization API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "channel": { + "description": "Cloud Channel API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "cloudbuild": { + "description": "Cloud Build API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "composer": { + "description": "Cloud Composer C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "contactcenterinsights": { + "description": "Contact Center AI Insights API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "container": { + "description": "Kubernetes Engine API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "containeranalysis": { + "description": "Container Analysis API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "datacatalog": { + "description": "Google Cloud Data Catalog API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "datamigration": { + "description": "Database Migration API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "dataproc": { + "description": "Cloud Dataproc API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "debugger": { + "description": "Stackdriver Debugger API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "dlp": { + "description": "Cloud Data Loss Prevention (DLP) API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "documentai": { + "description": "Cloud Document AI API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "eventarc": { + "description": "Eventarc API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "experimental-storage-grpc": { + "description": "The GCS+gRPC plugin", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common", + "storage" + ] + } + ] + }, + "filestore": { + "description": "Cloud Filestore API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "functions": { + "description": "Cloud Functions API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "gameservices": { + "description": "Game Services API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "gkehub": { + "description": "GKE Hub C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "grpc-common": { + "description": "Dependencies used by all gRPC-based libraries", + "dependencies": [ + "grpc", + { + "name": "grpc", + "host": true + }, + "protobuf", + { + "name": "protobuf", + "host": true + } + ] + }, + "iam": { + "description": "The Google Cloud IAM C++ client library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "iap": { + "description": "Cloud Identity-Aware Proxy API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "ids": { + "description": "Cloud IDS API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "iot": { + "description": "Cloud IoT API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "kms": { + "description": "Cloud Key Management Service (KMS) API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "language": { + "description": "Cloud Natural Language API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "logging": { + "description": "Google Cloud Logging C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "managedidentities": { + "description": "Managed Service for Microsoft Active Directory API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "memcache": { + "description": "Cloud Memorystore for Memcached API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "monitoring": { + "description": "Cloud Monitoring API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "networkmanagement": { + "description": "Network Management API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "notebooks": { + "description": "Notebooks API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "orgpolicy": { + "description": "Organization Policy API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "oslogin": { + "description": "Cloud OS Login API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "policytroubleshooter": { + "description": "Policy Troubleshooter API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "privateca": { + "description": "Certificate Authority API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "profiler": { + "description": "Cloud Profiler API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "pubsub": { + "description": "The Google Cloud Bigtable C++ client library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "recommender": { + "description": "Recommender C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "redis": { + "description": "Google Cloud Memorystore for Redis API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "resourcemanager": { + "description": "Cloud Resource Manager API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "resourcesettings": { + "description": "Resource Settings API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "retail": { + "description": "Retail API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "scheduler": { + "description": "Cloud Scheduler API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "secretmanager": { + "description": "The Google Cloud Secret Manager C++ client library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "securitycenter": { + "description": "Security Command Center API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "servicecontrol": { + "description": "Service Control API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "servicedirectory": { + "description": "Service Directory API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "servicemanagement": { + "description": "Service Management API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "serviceusage": { + "description": "Service Usage API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "shell": { + "description": "Cloud Shell API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "spanner": { + "description": "The Google Cloud Spanner C++ client library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "speech": { + "description": "The Google Cloud Speech-to-Text C++ client library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "storage": { + "description": "The Google Cloud Storage C++ client library", + "dependencies": [ + "crc32c", + { + "name": "curl", + "features": [ + "ssl" + ] + }, + "nlohmann-json" + ] + }, + "storagetransfer": { + "description": "Storage Transfer API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "talent": { + "description": "Cloud Talent Solution API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "tasks": { + "description": "The Google Cloud Tasks C++ client library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "texttospeech": { + "description": "Cloud Text-to-Speech API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "tpu": { + "description": "Cloud TPU API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "trace": { + "description": "Stackdriver Trace API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "translate": { + "description": "Cloud Translation API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "videointelligence": { + "description": "Cloud Video Intelligence API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "vision": { + "description": "Cloud Vision API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "vmmigration": { + "description": "VM Migration API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "vpcaccess": { + "description": "Serverless VPC Access API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "webrisk": { + "description": "Web Risk API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "websecurityscanner": { + "description": "Web Security Scanner API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "workflows": { + "description": "Workflow Executions API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/googleapis/portfile.cmake b/externals/vcpkg/ports/googleapis/portfile.cmake new file mode 100755 index 000000000..065116c27 --- /dev/null +++ b/externals/vcpkg/ports/googleapis/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/googleapis/usage b/externals/vcpkg/ports/googleapis/usage new file mode 100755 index 000000000..00ca628e5 --- /dev/null +++ b/externals/vcpkg/ports/googleapis/usage @@ -0,0 +1,6 @@ +The package googleapis is compatible with built-in CMake targets: + + find_package(googleapis CONFIG REQUIRED) + + # Then link against the proto libraries that you want to use, for example: + target_link_libraries(main PRIVATE googleapis-c++::bigtable_protos gRPC::grpc gRPC::grpc++) diff --git a/externals/vcpkg/ports/googleapis/vcpkg.json b/externals/vcpkg/ports/googleapis/vcpkg.json new file mode 100755 index 000000000..37755f8db --- /dev/null +++ b/externals/vcpkg/ports/googleapis/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "googleapis", + "version-string": "alias", + "port-version": 1, + "description": "Deprecated, use google-cloud-cpp instead.", + "dependencies": [ + "google-cloud-cpp" + ] +} diff --git a/externals/vcpkg/ports/gperf/CMakeLists.txt b/externals/vcpkg/ports/gperf/CMakeLists.txt new file mode 100755 index 000000000..d9cad0d89 --- /dev/null +++ b/externals/vcpkg/ports/gperf/CMakeLists.txt @@ -0,0 +1,53 @@ +cmake_minimum_required(VERSION 3.0) +project(gperf LANGUAGES C CXX) + +include(CheckCXXSourceCompiles) +include(GNUInstallDirs) + +CHECK_CXX_SOURCE_COMPILES("int main(int n) { int dynamic_array[n]; }" HAVE_DYNAMIC_ARRAY) + +set(LIBGP_SOURCES + lib/getline.cc + lib/getline.h + lib/getopt.c + lib/getopt.h + lib/getopt1.c + lib/hash.cc + lib/hash.h) +add_library(gp STATIC ${LIBGP_SOURCES}) +target_include_directories(gp PUBLIC "${CMAKE_SOURCE_DIR}/lib") + +set(GPERF_SOURCES + src/bool-array.cc + src/bool-array.h + src/bool-array.icc + src/hash-table.cc + src/hash-table.h + src/input.cc + src/input.h + src/keyword-list.cc + src/keyword-list.h + src/keyword-list.icc + src/keyword.cc + src/keyword.h + src/keyword.icc + src/main.cc + src/options.cc + src/options.h + src/options.icc + src/output.cc + src/output.h + src/positions.cc + src/positions.h + src/positions.icc + src/search.cc + src/search.h + src/version.cc + src/version.h) +add_executable(gperf ${GPERF_SOURCES}) +target_link_libraries(gperf gp) +target_include_directories(gperf PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") + +configure_file(config.h.in config.h @ONLY) + +install(TARGETS gperf RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/externals/vcpkg/ports/gperf/config.h.in b/externals/vcpkg/ports/gperf/config.h.in new file mode 100755 index 000000000..f1f643d7b --- /dev/null +++ b/externals/vcpkg/ports/gperf/config.h.in @@ -0,0 +1 @@ +#cmakedefine HAVE_DYNAMIC_ARRAY @HAVE_DYNAMIC_ARRAY@ diff --git a/externals/vcpkg/ports/gperf/portfile.cmake b/externals/vcpkg/ports/gperf/portfile.cmake new file mode 100755 index 000000000..34644af1b --- /dev/null +++ b/externals/vcpkg/ports/gperf/portfile.cmake @@ -0,0 +1,28 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +vcpkg_download_distfile(ARCHIVE + URLS http://ftp.gnu.org/pub/gnu/gperf/gperf-3.1.tar.gz + FILENAME gperf-3.1.tar.gz + SHA512 855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.in DESTINATION ${SOURCE_PATH}) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS_RELEASE -DCMAKE_INSTALL_BINDIR=tools/gperf +) + +vcpkg_cmake_install() + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() diff --git a/externals/vcpkg/ports/gperf/vcpkg.json b/externals/vcpkg/ports/gperf/vcpkg.json new file mode 100755 index 000000000..02f6116f1 --- /dev/null +++ b/externals/vcpkg/ports/gperf/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "gperf", + "version": "3.1", + "port-version": 4, + "description": "GNU perfect hash function generator", + "homepage": "https://www.gnu.org/software/gperf/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/gperftools/CMakeLists.txt b/externals/vcpkg/ports/gperftools/CMakeLists.txt new file mode 100755 index 000000000..a4bf860af --- /dev/null +++ b/externals/vcpkg/ports/gperftools/CMakeLists.txt @@ -0,0 +1,211 @@ +cmake_minimum_required(VERSION 3.5) + +project(gperftools LANGUAGES C CXX) + +include(GNUInstallDirs) + +option(GPERFTOOLS_BUILD_TOOLS "Build tools" ON) + +if(WIN32) # TODO: MINGW, MSYS + option(GPERFTOOLS_WIN32_OVERRIDE "Override allocators" OFF) +endif() + +set(deprecated_public_headers + src/google/heap-checker.h + src/google/heap-profiler.h + src/google/malloc_extension.h + src/google/malloc_extension_c.h + src/google/malloc_hook.h + src/google/malloc_hook_c.h + src/google/profiler.h + src/google/stacktrace.h +) + +set(gperftools_public_headers + src/gperftools/heap-checker.h + src/gperftools/heap-profiler.h + src/gperftools/malloc_extension.h + src/gperftools/malloc_extension_c.h + src/gperftools/malloc_hook.h + src/gperftools/malloc_hook_c.h + src/gperftools/nallocx.h + src/gperftools/profiler.h + src/gperftools/stacktrace.h +) + +if(WIN32) # TODO: MINGW, MSYS + list(APPEND deprecated_public_headers + src/windows/google/tcmalloc.h + ) + + list(APPEND gperftools_public_headers + src/windows/gperftools/tcmalloc.h + ) + + set(libtcmalloc_minimal_headers + src/addressmap-inl.h + src/base/arm_instruction_set_select.h + src/base/atomicops-internals-arm-generic.h + src/base/atomicops-internals-arm-v6plus.h + src/base/atomicops-internals-gcc.h + src/base/atomicops-internals-linuxppc.h + src/base/atomicops-internals-macosx.h + src/base/atomicops-internals-mips.h + src/base/atomicops-internals-windows.h + src/base/atomicops-internals-x86.h + src/base/atomicops.h + src/base/basictypes.h + src/base/commandlineflags.h + src/base/googleinit.h + src/base/logging.h + src/base/low_level_alloc.h + src/base/spinlock.h + src/base/spinlock_internal.h + src/base/spinlock_linux-inl.h + src/base/spinlock_posix-inl.h + src/base/spinlock_win32-inl.h + src/base/stl_allocator.h + src/base/sysinfo.h + src/base/thread_annotations.h + src/central_freelist.h + src/common.h + src/gperftools/heap-checker.h + src/gperftools/heap-profiler.h + src/gperftools/malloc_extension.h + src/gperftools/malloc_hook.h + src/gperftools/profiler.h + src/gperftools/stacktrace.h + src/heap-profile-table.h + src/internal_logging.h + src/malloc_hook-inl.h + src/memory_region_map.h + src/packed-cache-inl.h + src/pagemap.h + src/page_heap.h + src/page_heap_allocator.h + src/raw_printer.h + src/sampler.h + src/span.h + src/stacktrace_win32-inl.h + src/stack_trace_table.h + src/static_vars.h + src/symbolize.h + src/system-alloc.h + src/tcmalloc.h + src/thread_cache.h + src/windows/config.h + src/windows/mini_disassembler.h + src/windows/mini_disassembler_types.h + src/windows/port.h + src/windows/preamble_patcher.h + ) + + set(libtcmalloc_minimal_sources + src/base/dynamic_annotations.c + src/base/logging.cc + src/base/low_level_alloc.cc + src/base/spinlock.cc + src/base/spinlock_internal.cc + src/base/sysinfo.cc + src/central_freelist.cc + src/common.cc + src/fake_stacktrace_scope.cc + src/heap-profile-table.cc + src/internal_logging.cc + src/malloc_extension.cc + src/malloc_hook.cc + src/memory_region_map.cc + src/page_heap.cc + src/raw_printer.cc + src/sampler.cc + src/span.cc + src/stacktrace.cc + src/stack_trace_table.cc + src/static_vars.cc + src/symbolize.cc + src/thread_cache.cc + src/windows/ia32_modrm_map.cc + src/windows/ia32_opcode_map.cc + src/windows/mini_disassembler.cc + src/windows/port.cc + src/windows/preamble_patcher.cc + src/windows/preamble_patcher_with_stub.cc + src/windows/system-alloc.cc + ) + + if(GPERFTOOLS_WIN32_OVERRIDE) + list(APPEND libtcmalloc_minimal_sources src/windows/override_functions.cc) + else() + list(APPEND libtcmalloc_minimal_sources src/windows/patch_functions.cc) + endif() + + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + source_group("Header Files" FILES ${libtcmalloc_minimal_headers}) + source_group("Source Files" FILES ${libtcmalloc_minimal_sources}) + + if(GPERFTOOLS_WIN32_OVERRIDE) + add_library(libtcmalloc_minimal + STATIC + ${libtcmalloc_minimal_headers} + ${libtcmalloc_minimal_sources} + ) + else() + add_library(libtcmalloc_minimal + ${libtcmalloc_minimal_headers} + ${libtcmalloc_minimal_sources} + ) + endif() + + target_compile_definitions( + libtcmalloc_minimal + PRIVATE + $<$: + WIN32_OVERRIDE_ALLOCATORS + PERFTOOLS_DLL_DECL= + > + ) + + target_compile_options( + libtcmalloc_minimal + PRIVATE + $<$: + /wd4141 + /wd4251 + > + ) + + target_include_directories( + libtcmalloc_minimal + PUBLIC + $ + ) + + install(FILES ${deprecated_public_headers} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/google + ) + + install(FILES ${gperftools_public_headers} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gperftools + ) + + install(TARGETS libtcmalloc_minimal + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) + + if(GPERFTOOLS_BUILD_TOOLS) + add_executable(addr2line-pdb src/windows/addr2line-pdb.c) + target_link_libraries(addr2line-pdb PRIVATE DbgHelp) + + add_executable(nm-pdb src/windows/nm-pdb.c) + target_link_libraries(nm-pdb PRIVATE DbgHelp) + + install(TARGETS addr2line-pdb nm-pdb DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() +else() +endif() diff --git a/externals/vcpkg/ports/gperftools/portfile.cmake b/externals/vcpkg/ports/gperftools/portfile.cmake new file mode 100755 index 000000000..4d03e0e07 --- /dev/null +++ b/externals/vcpkg/ports/gperftools/portfile.cmake @@ -0,0 +1,82 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gperftools/gperftools + REF fe62a0baab87ba3abca12f4a621532bf67c9a7d2 + SHA512 fc0fb2c56d38046ac7bc2d36863dabf073b7aede7ce18916228d7b9f64cf33ae754708bff028353ada52bf4b79a7cd3e3334c1558a9ba64b06326b1537faf690 + HEAD_REF master +) + +if(VCPKG_TARGET_IS_WINDOWS) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + + if(override IN_LIST FEATURES) + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + message(STATUS "${PORT}[override] only supports static library linkage. Building static library.") + vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_STATIC_CRT) + endif() + endif() + + vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + override GPERFTOOLS_WIN32_OVERRIDE + tools GPERFTOOLS_BUILD_TOOLS + ) + + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + ${FEATURE_OPTIONS} + ) + + vcpkg_cmake_install() + + vcpkg_copy_pdbs() + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + + if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(GLOB gperf_public_headers "${CURRENT_PACKAGES_DIR}/include/gperftools/*.h") + + foreach(gperf_header ${gperf_public_headers}) + vcpkg_replace_string(${gperf_header} "__declspec(dllimport)" "") + endforeach() + endif() + + if(tools IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES addr2line-pdb nm-pdb AUTO_CLEAN) + endif() +else() + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(BUILD_OPTS --enable-shared --disable-static) + else() + set(BUILD_OPTS --enable-static --disable-shared) + endif() + + vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + OPTIONS + ${BUILD_OPTS} + ) + + vcpkg_install_make() + + if(tools IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES pprof pprof-symbolize AUTO_CLEAN) + endif() + + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + ) + + # https://github.com/microsoft/vcpkg/pull/8750#issuecomment-625590773 + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() + + vcpkg_fixup_pkgconfig() +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/gperftools/vcpkg.json b/externals/vcpkg/ports/gperftools/vcpkg.json new file mode 100755 index 000000000..556db9a29 --- /dev/null +++ b/externals/vcpkg/ports/gperftools/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "gperftools", + "version-date": "2019-09-02", + "port-version": 3, + "description": "A set of tools for performance profiling and memory checking", + "homepage": "https://github.com/gperftools/gperftools", + "supports": "!(arm | arm64 | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true, + "platform": "windows" + } + ], + "features": { + "override": { + "description": "Override allocators" + }, + "tools": { + "description": "Build gperftools CLI tools" + } + } +} diff --git a/externals/vcpkg/ports/gpgme/disable-docs.patch b/externals/vcpkg/ports/gpgme/disable-docs.patch new file mode 100755 index 000000000..b45ca6ec6 --- /dev/null +++ b/externals/vcpkg/ports/gpgme/disable-docs.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.am b/Makefile.am +index 1772d69..9bf9863 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -45,7 +45,7 @@ else + tests = + endif + +-SUBDIRS = src ${tests} doc lang ++SUBDIRS = src ${tests} lang + + # Fix the version of the spec file. + dist-hook: gen-ChangeLog diff --git a/externals/vcpkg/ports/gpgme/disable-tests.patch b/externals/vcpkg/ports/gpgme/disable-tests.patch new file mode 100755 index 000000000..c7158508f --- /dev/null +++ b/externals/vcpkg/ports/gpgme/disable-tests.patch @@ -0,0 +1,51 @@ +From b05747aea79083106b27ac7d829db3e65e192682 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= +Date: Thu, 29 Oct 2020 13:23:56 -0400 +Subject: [PATCH] cpp,python: Respect --disable-gpg-test for tests + +* lang/cpp/Makefile.am: Respect --disable-gpg-test +* lang/python/Makefile.am: Respect --disable-gpg-test + +This is similar to the qt that had it already enabled +--- + lang/cpp/Makefile.am | 8 +++++++- + lang/python/Makefile.am | 8 +++++++- + 2 files changed, 14 insertions(+), 2 deletions(-) + +diff --git a/lang/cpp/Makefile.am b/lang/cpp/Makefile.am +index 724da6ca..70ca7462 100644 +--- a/lang/cpp/Makefile.am ++++ b/lang/cpp/Makefile.am +@@ -18,6 +18,12 @@ + # License along with this program; if not, see . + # SPDX-License-Identifier: LGPL-2.1-or-later + +-SUBDIRS = src tests ++if RUN_GPG_TESTS ++tests = tests ++else ++tests = ++endif ++ ++SUBDIRS = src ${tests} + + EXTRA_DIST = README +diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am +index 845b7b17..68b98e8e 100644 +--- a/lang/python/Makefile.am ++++ b/lang/python/Makefile.am +@@ -23,7 +23,13 @@ EXTRA_DIST = \ + gpgme.i \ + helpers.c helpers.h private.h + +-SUBDIRS = . tests examples doc src ++if RUN_GPG_TESTS ++tests = tests ++else ++tests = ++endif ++ ++SUBDIRS = . ${tests} examples doc src + + .PHONY: prepare + prepare: copystamp diff --git a/externals/vcpkg/ports/gpgme/portfile.cmake b/externals/vcpkg/ports/gpgme/portfile.cmake new file mode 100755 index 000000000..96e09c1c7 --- /dev/null +++ b/externals/vcpkg/ports/gpgme/portfile.cmake @@ -0,0 +1,42 @@ + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gpg/gpgme + REF gpgme-1.14.0 + SHA512 b4608fd1d9a4122d8886917274e323afc9a30494c13a3dea51e17e9779f925bf8d67e584434d6a13018f274a6cbcf0a5e36f2fea794a065906bbb556b765398e + HEAD_REF master + PATCHES + disable-tests.patch + disable-docs.patch +) + +list(REMOVE_ITEM FEATURES core) +string(REPLACE ";" "," LANGUAGES "${FEATURES}") + +vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + --disable-gpgconf-test + --disable-gpg-test + --disable-gpgsm-test + --disable-g13-test + --enable-languages=${LANGUAGES} + --with-libgpg-error-prefix=${CURRENT_INSTALLED_DIR}/tools/libgpg-error + --with-libassuan-prefix=${CURRENT_INSTALLED_DIR}/tools/libassuan +) + +vcpkg_install_make() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Gpgmepp) +vcpkg_copy_pdbs() +# We have no dependency on glib, so remove this extra .pc file +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gpgme-glib.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gpgme-glib.pc") +vcpkg_fixup_pkgconfig() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/gpgme/bin/gpgme-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") +if (NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/gpgme/debug/bin/gpgme-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/gpgme/vcpkg.json b/externals/vcpkg/ports/gpgme/vcpkg.json new file mode 100755 index 000000000..684533569 --- /dev/null +++ b/externals/vcpkg/ports/gpgme/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "gpgme", + "version-string": "1.14.0", + "port-version": 2, + "description": "A library designed to make access to GnuPG easier for applications", + "homepage": "https://gnupg.org/software/gpgme/index.html", + "supports": "!windows", + "dependencies": [ + "libassuan", + "libgpg-error", + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "cpp" + ], + "features": { + "cpp": { + "description": "C++ bindings" + } + } +} diff --git a/externals/vcpkg/ports/gppanel/00001-fix-build.patch b/externals/vcpkg/ports/gppanel/00001-fix-build.patch new file mode 100755 index 000000000..bf394d63f --- /dev/null +++ b/externals/vcpkg/ports/gppanel/00001-fix-build.patch @@ -0,0 +1,24 @@ +diff --git a/gpPanel/gpPanel.cpp b/gpPanel/gpPanel.cpp +index 7af20b5..908523c 100644 +--- a/gpPanel/gpPanel.cpp ++++ b/gpPanel/gpPanel.cpp +@@ -720,8 +720,8 @@ void gpPanel::OnMenuItemPrintPreview(wxCommandEvent& event) + gpLayer_s *gp = GetLayerByMenuId(event.GetId() ); + if(gp==NULL)return; + +- mpPrintout *plotPrint = new mpPrintout(gp->m_plot, gp->layer->GetName()); +- mpPrintout *plotPrintPreview = new mpPrintout(gp->m_plot, gp->layer->GetName()); ++ mpPrintout *plotPrint = new mpPrintout(gp->m_plot, gp->layer->GetName().c_str()); ++ mpPrintout *plotPrintPreview = new mpPrintout(gp->m_plot, gp->layer->GetName().c_str()); + + wxPrintPreview *preview = new wxPrintPreview(plotPrintPreview, plotPrint); + +@@ -765,7 +765,7 @@ void gpPanel::OnMenuItemSaveScreenshot(wxCommandEvent& event) + if(index!=-1) + { + wxString reso = aChoices.Item(index); +- if( reso.CompareTo(_("custom")) == 0 ){ ++ if( reso.CompareTo(_("custom").c_str()) == 0 ){ + reso = wxGetTextFromUser(_("Write image resolution (format: [width]x[height]"), _("Custom resolution for image"), _("640x480"), this); + } + if(reso.Find('x') != -1) diff --git a/externals/vcpkg/ports/gppanel/CMakeLists.txt b/externals/vcpkg/ports/gppanel/CMakeLists.txt new file mode 100755 index 000000000..e300f2854 --- /dev/null +++ b/externals/vcpkg/ports/gppanel/CMakeLists.txt @@ -0,0 +1,32 @@ +cmake_minimum_required(VERSION 3.13) +project(gpPanel CXX) + +set(wxWidgets_EXCLUDE_COMMON_LIBRARIES TRUE) +find_package(wxWidgets REQUIRED COMPONENTS core base) +include(${wxWidgets_USE_FILE}) + +file(GLOB_RECURSE SOURCES "gpPanel/*.cpp") +file(GLOB HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/include" "include/*.h") + +add_library(gpPanel STATIC ${SOURCES}) +target_compile_definitions(gpPanel PRIVATE _CRT_SECURE_NO_WARNINGS) + +target_include_directories(gpPanel PUBLIC + $ + $ +) + +target_link_libraries(gpPanel PRIVATE ${wxWidgets_LIBRARIES}) + +install(TARGETS gpPanel EXPORT gpPanel-config + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) + +install(EXPORT gpPanel-config DESTINATION share/cmake/gpPanel) + +foreach(HEADER ${HEADERS}) + get_filename_component(HEADER_DIR ${HEADER} DIRECTORY) + install(FILES include/${HEADER} DESTINATION include/gpPanel/${HEADER_DIR}) +endforeach() diff --git a/externals/vcpkg/ports/gppanel/portfile.cmake b/externals/vcpkg/ports/gppanel/portfile.cmake new file mode 100755 index 000000000..b05377133 --- /dev/null +++ b/externals/vcpkg/ports/gppanel/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO woollybah/gppanel + REF f58a9028f7c9a8e9b4324ff2165951f558365f90 + SHA512 4ec5fbef4c487d351c60f48b0c0e41c5d077989ab96f827b9fd5ef01c167d50f39a313bd82db1b5df19d14025983e83db4d19cc4048c1c50fc8ef9128de15575 + HEAD_REF master + PATCHES 00001-fix-build.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/gpPanel) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/gppanel/copyright COPYONLY) diff --git a/externals/vcpkg/ports/gppanel/vcpkg.json b/externals/vcpkg/ports/gppanel/vcpkg.json new file mode 100755 index 000000000..2493d41a8 --- /dev/null +++ b/externals/vcpkg/ports/gppanel/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "gppanel", + "version-date": "2020-05-20", + "port-version": 1, + "description": "gpPanel is chart library for wxWidget. It inheritance from wxPanel and use modified wxMathPlot library at chart engine.", + "homepage": "https://github.com/woollybah/gppanel", + "dependencies": [ + "wxwidgets" + ] +} diff --git a/externals/vcpkg/ports/graphene/portfile.cmake b/externals/vcpkg/ports/graphene/portfile.cmake new file mode 100755 index 000000000..8b5066367 --- /dev/null +++ b/externals/vcpkg/ports/graphene/portfile.cmake @@ -0,0 +1,35 @@ + +set(VERSION 1.10.2) + +vcpkg_download_distfile(ARCHIVE + URLS "https://download.gnome.org/sources/graphene/1.10/graphene-${VERSION}.tar.xz" + FILENAME "graphene-${VERSION}.tar.xz" + SHA512 a8a8ef1e4ccffee2313a18b9b8dda06c7ede6d49fdde8578694500634e3c90278fd30af7d88938d5ecb08c519cc3e09d21fe69d0f21cb766e056ceedbb3eafb0 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -Dgtk_doc=false #Enable generating the API reference (depends on GTK-Doc) + -Dgobject_types=true #Enable GObject types (depends on GObject) + -Dintrospection=false #Enable GObject Introspection (depends on GObject)' + -Dtests=false + -Dinstalled_tests=false + ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' + ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' +) + +vcpkg_install_meson() + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/graphene/vcpkg.json b/externals/vcpkg/ports/graphene/vcpkg.json new file mode 100755 index 000000000..f34bcb799 --- /dev/null +++ b/externals/vcpkg/ports/graphene/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "graphene", + "version": "1.10.2", + "port-version": 2, + "description": "A thin layer of types for graphic libraries.", + "homepage": "https://www.gtk.org/", + "supports": "!(arm & windows)", + "dependencies": [ + "gettext", + "glib", + { + "name": "glib", + "host": true + }, + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/graphicsmagick/CMakeLists.txt b/externals/vcpkg/ports/graphicsmagick/CMakeLists.txt new file mode 100755 index 000000000..c71495951 --- /dev/null +++ b/externals/vcpkg/ports/graphicsmagick/CMakeLists.txt @@ -0,0 +1,282 @@ +cmake_minimum_required (VERSION 3.6) +project (graphicsmagick) + +find_package(ZLIB REQUIRED) +find_package(BZip2 REQUIRED) +find_package(JPEG REQUIRED) +find_package(PNG REQUIRED) +find_package(TIFF REQUIRED) +find_package(Freetype REQUIRED) + +add_definitions(-D_MAGICKLIB_ -D_WANDLIB_ -DMAGICK_IMPLEMENTATION) + +if (BUILD_SHARED_LIBS) + add_definitions(-D_DLL -DDLL) +endif () + +if (MSVC) + add_definitions( -D_VISUALC_ -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE) +endif () + +if (WIN32) + add_definitions(-DWIN32 -D_WIN32) + add_definitions(-D_WIN32_WINNT=0x0501) +endif () + +include_directories(".") +include_directories("magick") +include_directories("Magick++") +include_directories("Magick++/lib") +include_directories("wand") +include_directories("jbig/libjbig") + +file(READ "magick/magick_config.h.in" CONFIG_H) +string(REPLACE "#undef HasBZLIB" "#define HasBZLIB" CONFIG_H "${CONFIG_H}") +string(REPLACE "#undef HasJPEG" "#define HasJPEG" CONFIG_H "${CONFIG_H}") +string(REPLACE "#undef HasPNG" "#define HasPNG" CONFIG_H "${CONFIG_H}") +string(REPLACE "#undef HasTIFF" "#define HasTIFF" CONFIG_H "${CONFIG_H}") +string(REPLACE "#undef HasTTF" "#define HasTTF" CONFIG_H "${CONFIG_H}") +string(REPLACE "#undef HasTTF" "#define HasTTF" CONFIG_H "${CONFIG_H}") +string(REPLACE "#undef HAVE_FT2BUILD_H" "#define HAVE_FT2BUILD_H" CONFIG_H "${CONFIG_H}") +string(REPLACE "#undef HasZLIB" "#define HasZLIB" CONFIG_H "${CONFIG_H}") +string(REPLACE "#undef HasJBIG" "#define HasJBIG" CONFIG_H "${CONFIG_H}") +string(REPLACE "#undef HasWEBP" "#define HasWEBP" CONFIG_H "${CONFIG_H}") +string(REPLACE "#undef QuantumDepth" "#define QuantumDepth 16" CONFIG_H "${CONFIG_H}") +string(REPLACE "#undef restrict" "#define restrict" CONFIG_H "${CONFIG_H}") +string(REPLACE "#undef size_t" "/* #undef size_t */" CONFIG_H "${CONFIG_H}") +if (WIN32) +string(REPLACE "#undef HasWINGDI32" "#define HasWINGDI32" CONFIG_H "${CONFIG_H}") +else () +string(REPLACE "#undef HAVE_VSNPRINTF" "#define HAVE_VSNPRINTF" CONFIG_H "${CONFIG_H}") +string(REPLACE "#undef MagickLibSubdir" "#define MagickLibSubdir \"magick\"" CONFIG_H "${CONFIG_H}") +string(REPLACE "#undef MagickLibConfigSubDir" "#define MagickLibConfigSubDir \"magick/config\"" CONFIG_H "${CONFIG_H}") +string(REPLACE "#undef MagickShareConfigSubDir" "#define MagickShareConfigSubDir \"magick/config\"" CONFIG_H "${CONFIG_H}") +string(REPLACE "#undef HAVE_STDINT_H" "#define HAVE_STDINT_H" CONFIG_H "${CONFIG_H}") +endif () +file(WRITE "magick/magick_config.h" "${CONFIG_H}") + +file(READ "magick/magick_config_api.h.in" CONFIG_API_H) +string(REPLACE "#undef QuantumDepth" "#define QuantumDepth 16" CONFIG_API_H "${CONFIG_API_H}") +string(REPLACE "#undef size_t" "/* #undef size_t */" CONFIG_API_H "${CONFIG_API_H}") +file(WRITE "magick/magick_config_api.h" "${CONFIG_API_H}") + +add_library(graphicsmagick coders/art.c coders/avs.c + coders/bmp.c coders/braille.c coders/cals.c coders/caption.c + coders/cineon.c coders/clipboard.c coders/cmyk.c + coders/cut.c coders/dcm.c coders/dcraw.c coders/dib.c + coders/dps.c coders/dpx.c coders/emf.c coders/ept.c + coders/fax.c coders/fits.c coders/fpx.c coders/gif.c + coders/gradient.c coders/gray.c coders/histogram.c + coders/hrz.c coders/html.c coders/icon.c coders/identity.c + coders/info.c coders/jbig.c coders/jnx.c coders/jp2.c + coders/jpeg.c coders/label.c coders/locale.c coders/logo.c + coders/mac.c coders/map.c coders/mat.c coders/matte.c + coders/meta.c coders/miff.c coders/mono.c coders/mpc.c + coders/mpeg.c coders/mpr.c coders/msl.c coders/mtv.c + coders/mvg.c coders/null.c coders/otb.c coders/palm.c + coders/pcd.c coders/pcl.c coders/pcx.c coders/pdb.c + coders/pdf.c coders/pict.c coders/pix.c coders/plasma.c + coders/png.c coders/pnm.c coders/preview.c coders/ps.c + coders/ps2.c coders/ps3.c coders/psd.c coders/pwp.c coders/rgb.c + coders/rla.c coders/rle.c coders/sct.c coders/sfw.c coders/sgi.c + coders/stegano.c coders/sun.c coders/svg.c coders/tga.c + coders/tiff.c coders/tile.c coders/tim.c coders/topol.c + coders/ttf.c coders/txt.c coders/uil.c coders/url.c + coders/uyvy.c coders/vicar.c coders/vid.c coders/viff.c + coders/wbmp.c coders/webp.c coders/wmf.c coders/wpg.c + coders/x.c coders/xbm.c coders/xc.c coders/xcf.c + coders/xpm.c coders/xtrn.c coders/xwd.c coders/yuv.c + filters/analyze.c + magick/analyze.c magick/animate.c magick/annotate.c magick/attribute.c + magick/average.c magick/bit_stream.c magick/blob.c magick/cdl.c + magick/channel.c magick/color.c magick/color_lookup.c magick/colormap.c + magick/colorspace.c magick/command.c magick/compare.c magick/composite.c + magick/compress.c magick/confirm_access.c magick/constitute.c magick/decorate.c + magick/delegate.c magick/deprecate.c magick/describe.c magick/display.c magick/draw.c + magick/effect.c magick/enhance.c magick/enum_strings.c magick/error.c magick/export.c + magick/floats.c magick/fx.c magick/gem.c magick/gradient.c magick/hclut.c + magick/image.c magick/import.c magick/list.c magick/locale.c magick/log.c + magick/magic.c magick/magick.c magick/magick_endian.c magick/map.c + magick/memory.c magick/module.c magick/monitor.c magick/montage.c magick/nt_base.c + magick/nt_feature.c magick/omp_data_view.c magick/operator.c magick/paint.c + magick/pixel_cache.c magick/pixel_iterator.c magick/plasma.c magick/PreRvIcccm.c + magick/profile.c magick/quantize.c magick/random.c magick/registry.c magick/render.c + magick/resize.c magick/resource.c magick/segment.c magick/semaphore.c + magick/shear.c magick/signature.c magick/static.c magick/statistics.c + magick/tempfile.c magick/texture.c magick/timer.c magick/transform.c + magick/tsd.c magick/type.c magick/unix_port.c magick/utility.c + magick/version.c magick/widget.c magick/xwindow.c + Magick++/lib/Blob.cpp Magick++/lib/BlobRef.cpp Magick++/lib/CoderInfo.cpp + Magick++/lib/Color.cpp Magick++/lib/Drawable.cpp Magick++/lib/Exception.cpp + Magick++/lib/Functions.cpp Magick++/lib/Geometry.cpp Magick++/lib/Image.cpp + Magick++/lib/ImageRef.cpp Magick++/lib/Montage.cpp Magick++/lib/Options.cpp + Magick++/lib/Pixels.cpp Magick++/lib/STL.cpp Magick++/lib/Thread.cpp + Magick++/lib/TypeMetric.cpp + wand/drawing_wand.c wand/magick_compat.c wand/magick_wand.c wand/pixel_wand.c + jbig/libjbig/jbig.c jbig/libjbig/jbig_ar.c jbig/libjbig/jbig85.c) + +TARGET_LINK_LIBRARIES(graphicsmagick PRIVATE + ZLIB::ZLIB + BZip2::BZip2 + #${JPEG_LIBRARIES} + JPEG::JPEG + PNG::PNG + TIFF::TIFF + Freetype::Freetype + WebP::webp WebP::webpdemux WebP::libwebpmux WebP::webpdecoder +) +target_include_directories(graphicsmagick INTERFACE $) + +install(TARGETS graphicsmagick + EXPORT graphicsmagick-targets + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib) + +install( + EXPORT graphicsmagick-targets + FILE unofficial-graphicsmagick-targets.cmake + NAMESPACE unofficial::graphicsmagick:: + DESTINATION share/unofficial-graphicsmagick +) +find_package(ZLIB REQUIRED) +find_package(BZip2 REQUIRED) +find_package(JPEG REQUIRED) +find_package(PNG REQUIRED) +find_package(TIFF REQUIRED) +find_package(Freetype REQUIRED) +find_package(WebP CONFIG REQUIRED) + +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-graphicsmagick-config.cmake " +include(CMakeFindDependencyMacro) +find_dependency(ZLIB) +find_dependency(BZip2) +find_dependency(JPEG) +find_dependency(PNG) +find_dependency(TIFF) +find_dependency(Freetype) +find_dependency(WebP) + +include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-graphicsmagick-targets.cmake) +") +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-graphicsmagick-config.cmake DESTINATION share/unofficial-graphicsmagick) + +option(INSTALL_HEADERS "Install development header files" ON) + +if (INSTALL_HEADERS) + install(FILES magick/alpha_composite.h DESTINATION include/magick) + install(FILES magick/analyze.h DESTINATION include/magick) + install(FILES magick/api.h DESTINATION include/magick) + install(FILES magick/attribute.h DESTINATION include/magick) + install(FILES magick/average.h DESTINATION include/magick) + install(FILES magick/bit_stream.h DESTINATION include/magick) + install(FILES magick/blob.h DESTINATION include/magick) + install(FILES magick/cdl.h DESTINATION include/magick) + install(FILES magick/channel.h DESTINATION include/magick) + install(FILES magick/color.h DESTINATION include/magick) + install(FILES magick/colormap.h DESTINATION include/magick) + install(FILES magick/colorspace.h DESTINATION include/magick) + install(FILES magick/color_lookup.h DESTINATION include/magick) + install(FILES magick/command.h DESTINATION include/magick) + install(FILES magick/common.h DESTINATION include/magick) + install(FILES magick/compare.h DESTINATION include/magick) + install(FILES magick/composite.h DESTINATION include/magick) + install(FILES magick/compress.h DESTINATION include/magick) + install(FILES magick/confirm_access.h DESTINATION include/magick) + install(FILES magick/constitute.h DESTINATION include/magick) + install(FILES magick/decorate.h DESTINATION include/magick) + install(FILES magick/delegate.h DESTINATION include/magick) + install(FILES magick/deprecate.h DESTINATION include/magick) + install(FILES magick/describe.h DESTINATION include/magick) + install(FILES magick/draw.h DESTINATION include/magick) + install(FILES magick/effect.h DESTINATION include/magick) + install(FILES magick/enhance.h DESTINATION include/magick) + install(FILES magick/enum_strings.h DESTINATION include/magick) + install(FILES magick/error.h DESTINATION include/magick) + install(FILES magick/floats.h DESTINATION include/magick) + install(FILES magick/forward.h DESTINATION include/magick) + install(FILES magick/fx.h DESTINATION include/magick) + install(FILES magick/gem.h DESTINATION include/magick) + install(FILES magick/gradient.h DESTINATION include/magick) + install(FILES magick/hclut.h DESTINATION include/magick) + install(FILES magick/image.h DESTINATION include/magick) + install(FILES magick/list.h DESTINATION include/magick) + install(FILES magick/locale_c.h DESTINATION include/magick) + install(FILES magick/log.h DESTINATION include/magick) + install(FILES magick/magic.h DESTINATION include/magick) + install(FILES magick/magick.h DESTINATION include/magick) + install(FILES magick/magick_config.h DESTINATION include/magick) + install(FILES magick/magick_config_api.h DESTINATION include/magick) + install(FILES magick/magick_endian.h DESTINATION include/magick) + install(FILES magick/magick_types.h DESTINATION include/magick) + install(FILES magick/map.h DESTINATION include/magick) + install(FILES magick/memory.h DESTINATION include/magick) + install(FILES magick/module.h DESTINATION include/magick) + install(FILES magick/module_aliases.h DESTINATION include/magick) + install(FILES magick/monitor.h DESTINATION include/magick) + install(FILES magick/montage.h DESTINATION include/magick) + install(FILES magick/nt_base.h DESTINATION include/magick) + install(FILES magick/nt_feature.h DESTINATION include/magick) + install(FILES magick/omp_data_view.h DESTINATION include/magick) + install(FILES magick/operator.h DESTINATION include/magick) + install(FILES magick/paint.h DESTINATION include/magick) + install(FILES magick/pixel_cache.h DESTINATION include/magick) + install(FILES magick/pixel_iterator.h DESTINATION include/magick) + install(FILES magick/plasma.h DESTINATION include/magick) + install(FILES magick/prefetch.h DESTINATION include/magick) + install(FILES magick/PreRvIcccm.h DESTINATION include/magick) + install(FILES magick/profile.h DESTINATION include/magick) + install(FILES magick/quantize.h DESTINATION include/magick) + install(FILES magick/random-private.h DESTINATION include/magick) + install(FILES magick/random.h DESTINATION include/magick) + install(FILES magick/registry.h DESTINATION include/magick) + install(FILES magick/render.h DESTINATION include/magick) + install(FILES magick/resize.h DESTINATION include/magick) + install(FILES magick/resource.h DESTINATION include/magick) + install(FILES magick/semaphore.h DESTINATION include/magick) + install(FILES magick/shear.h DESTINATION include/magick) + install(FILES magick/signature.h DESTINATION include/magick) + install(FILES magick/spinlock.h DESTINATION include/magick) + install(FILES magick/static.h DESTINATION include/magick) + install(FILES magick/statistics.h DESTINATION include/magick) + install(FILES magick/studio.h DESTINATION include/magick) + install(FILES magick/symbols.h DESTINATION include/magick) + install(FILES magick/tempfile.h DESTINATION include/magick) + install(FILES magick/texture.h DESTINATION include/magick) + install(FILES magick/timer.h DESTINATION include/magick) + install(FILES magick/transform.h DESTINATION include/magick) + install(FILES magick/tsd.h DESTINATION include/magick) + install(FILES magick/type.h DESTINATION include/magick) + install(FILES magick/unix_port.h DESTINATION include/magick) + install(FILES magick/utility.h DESTINATION include/magick) + install(FILES magick/version.h DESTINATION include/magick) + install(FILES magick/widget.h DESTINATION include/magick) + install(FILES magick/xwindow.h DESTINATION include/magick) + + install(FILES Magick++/lib/Magick++.h DESTINATION include) + + install(FILES Magick++/lib/Magick++/Blob.h DESTINATION include/Magick++) + install(FILES Magick++/lib/Magick++/BlobRef.h DESTINATION include/Magick++) + install(FILES Magick++/lib/Magick++/CoderInfo.h DESTINATION include/Magick++) + install(FILES Magick++/lib/Magick++/Color.h DESTINATION include/Magick++) + install(FILES Magick++/lib/Magick++/Drawable.h DESTINATION include/Magick++) + install(FILES Magick++/lib/Magick++/Exception.h DESTINATION include/Magick++) + install(FILES Magick++/lib/Magick++/Functions.h DESTINATION include/Magick++) + install(FILES Magick++/lib/Magick++/Geometry.h DESTINATION include/Magick++) + install(FILES Magick++/lib/Magick++/Image.h DESTINATION include/Magick++/) + install(FILES Magick++/lib/Magick++/ImageRef.h DESTINATION include/Magick++) + install(FILES Magick++/lib/Magick++/Include.h DESTINATION include/Magick++) + install(FILES Magick++/lib/Magick++/Montage.h DESTINATION include/Magick++) + install(FILES Magick++/lib/Magick++/Options.h DESTINATION include/Magick++) + install(FILES Magick++/lib/Magick++/Pixels.h DESTINATION include/Magick++) + install(FILES Magick++/lib/Magick++/STL.h DESTINATION include/Magick++) + install(FILES Magick++/lib/Magick++/Thread.h DESTINATION include/Magick++) + install(FILES Magick++/lib/Magick++/TypeMetric.h DESTINATION include/Magick++) + + install(FILES wand/drawing_wand.h DESTINATION include/wand) + install(FILES wand/magick_wand.h DESTINATION include/wand) + install(FILES wand/pixel_wand.h DESTINATION include/wand) + install(FILES wand/wand_api.h DESTINATION include/wand) + install(FILES wand/wand_private.h DESTINATION include/wand) + install(FILES wand/wand_symbols.h DESTINATION include/wand) +endif () diff --git a/externals/vcpkg/ports/graphicsmagick/disable_graphicsmagick_modules.patch b/externals/vcpkg/ports/graphicsmagick/disable_graphicsmagick_modules.patch new file mode 100755 index 000000000..3ef174106 --- /dev/null +++ b/externals/vcpkg/ports/graphicsmagick/disable_graphicsmagick_modules.patch @@ -0,0 +1,16 @@ +--- a/magick/studio.h 2019-12-24 13:18:50.000000000 -0200 ++++ b/magick/studio.h 2020-01-08 20:43:08.325889700 -0200 +@@ -470,10 +470,10 @@ + */ + + #if defined(HasLTDL) +-# define SupportMagickModules ++//# define SupportMagickModules + #elif !defined(__MINGW32__) && !defined(__MINGW64__) + # if defined(MSWINDOWS) && defined(_DLL) +-# define SupportMagickModules ++//# define SupportMagickModules + # endif + #endif + + \ No newline at end of file diff --git a/externals/vcpkg/ports/graphicsmagick/dynamic_bzip2.patch b/externals/vcpkg/ports/graphicsmagick/dynamic_bzip2.patch new file mode 100755 index 000000000..e2bf95385 --- /dev/null +++ b/externals/vcpkg/ports/graphicsmagick/dynamic_bzip2.patch @@ -0,0 +1,20 @@ +From: Josue Andrade Gomes +Date: Tue, 18 Apr 2017 09:56:53 -0300 +Subject: [PATCH] dynamic bzip2 only if dynamic gm + +--- + +diff -ur a/magick/nt_base.h b/magick/nt_base.h +--- a/magick/nt_base.h Mon May 30 14:19:55 2016 ++++ b/magick/nt_base.h Mon Apr 17 15:10:01 2017 +@@ -275,7 +275,9 @@ + */ + #if defined(HasBZLIB) + # if defined(_WIN32) +-# define BZ_IMPORT 1 ++# if defined(_DLL) // For vcpkg. Building GM DLL requires BZIP2 DLL too, otherwise static ++# define BZ_IMPORT 1 ++# endif + # endif + #endif /* defined(HasBZLIB) */ + diff --git a/externals/vcpkg/ports/graphicsmagick/magick_types.h b/externals/vcpkg/ports/graphicsmagick/magick_types.h new file mode 100755 index 000000000..93404cb4e --- /dev/null +++ b/externals/vcpkg/ports/graphicsmagick/magick_types.h @@ -0,0 +1,133 @@ +/* + Copyright (C) 2003 - 2012 GraphicsMagick Group + + This program is covered by multiple licenses, which are described in + Copyright.txt. You should have received a copy of Copyright.txt with this + package; otherwise see http://www.graphicsmagick.org/www/Copyright.html. + + GraphicsMagick types typedefs. + + GraphicsMagick is expected to compile with any C '89 ANSI C compiler + supporting at least 16-bit 'short', 32-bit 'int', and 32-bit 'long'. + It is also expected to take advantage of 64-bit LP64 and Windows + WIN64 LLP64. We use C '99 style types but declare our own types so + as to not depend on C '99 header files, and take care to depend only + on C '89 library functions, POSIX, or well-known extensions. Any C + '99 syntax used is removed if the compiler does not support it. +*/ + +#ifndef _MAGICK_TYPES_H +#define _MAGICK_TYPES_H + +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + +/* + Assign ANSI C stdint.h-like typedefs based on the sizes of native types + magick_int8_t -- -128 to 127 + magick_uint8_t -- 0 to 255 + magick_int16_t -- -32,768 to 32,767 + magick_uint16_t -- 0 to 65,535 + magick_int32_t -- -2,147,483,648 to 2,147,483,647 + magick_uint32_t -- 0 to 4,294,967,295 + magick_int64_t -- -9,223,372,036,854,775,807 to 9,223,372,036,854,775,807 + magick_uint64_t -- 0 to 18,446,744,073,709,551,615 + + magick_uintmax_t -- largest native unsigned integer type ("%ju") + 0 to UINTMAX_MAX + UINTMAX_C(value) declares constant value + magick_uintptr_t -- unsigned type for storing a pointer value ("%tu") + 0 to UINTPTR_MAX + + ANSI C '99 stddef.h-like types + size_t -- unsigned type representing sizes of objects ("%zu") + 0 to SIZE_MAX + magick_ptrdiff_t -- signed type for subtracting two pointers ("%td") + PTRDIFF_MIN to PTRDIFF_MAX + + EEE Std 1003.1, 2004 types + ssize_t -- signed type for a count of bytes or an error indication ("%zd") + ? to SSIZE_MAX +*/ + +#if (defined(WIN32) || defined(WIN64)) && \ + !defined(__MINGW32__) && !defined(__MINGW64__) + + /* The following typedefs are used for WIN32 & WIN64 (without + configure) */ + typedef signed char magick_int8_t; + typedef unsigned char magick_uint8_t; + + typedef signed short magick_int16_t; + typedef unsigned short magick_uint16_t; + + typedef signed int magick_int32_t; +# define MAGICK_INT32_F "" + typedef unsigned int magick_uint32_t; +# define MAGICK_UINT32_F "" + + typedef signed __int64 magick_int64_t; +# define MAGICK_INT64_F "I64" + typedef unsigned __int64 magick_uint64_t; +# define MAGICK_UINT64_F "I64" + + typedef magick_uint64_t magick_uintmax_t; + +# if defined(WIN32) + typedef unsigned long magick_uintptr_t; +# define MAGICK_SIZE_T_F "l" +# define MAGICK_SIZE_T unsigned long +# define MAGICK_SSIZE_T_F "l" +# define MAGICK_SSIZE_T long +# elif defined(WIN64) + /* WIN64 uses the LLP64 model */ + typedef unsigned long long magick_uintptr_t; +# define MAGICK_SIZE_T_F "I64" +# define MAGICK_SIZE_T unsigned __int64 +# define MAGICK_SSIZE_T_F "I64" +# define MAGICK_SSIZE_T signed __int64 +# endif + +#else + + /* The following typedefs are subtituted when using Unixish configure */ + typedef signed char magick_int8_t; + typedef unsigned char magick_uint8_t; + + typedef signed short magick_int16_t; + typedef unsigned short magick_uint16_t; + + typedef signed int magick_int32_t; +# define MAGICK_INT32_F "" + typedef unsigned int magick_uint32_t; +# define MAGICK_UINT32_F "" + + typedef signed long magick_int64_t; +# define MAGICK_INT64_F "l" + typedef unsigned long magick_uint64_t; +# define MAGICK_UINT64_F "l" + + typedef unsigned long magick_uintmax_t; +# define MAGICK_UINTMAX_F "l" + + typedef unsigned long magick_uintptr_t; +# define MAGICK_UINTPTR_F "l" + +# define MAGICK_SIZE_T_F "l" +# define MAGICK_SIZE_T unsigned long + +# define MAGICK_SSIZE_T_F "l" +# define MAGICK_SSIZE_T signed long + +#endif + + /* 64-bit file and blob offset type */ + typedef magick_int64_t magick_off_t; +#define MAGICK_OFF_F MAGICK_INT64_F + +#if defined(__cplusplus) || defined(c_plusplus) +} +#endif /* defined(__cplusplus) || defined(c_plusplus) */ + +#endif /* _MAGICK_TYPES_H */ diff --git a/externals/vcpkg/ports/graphicsmagick/portfile.cmake b/externals/vcpkg/ports/graphicsmagick/portfile.cmake new file mode 100755 index 000000000..142364ea9 --- /dev/null +++ b/externals/vcpkg/ports/graphicsmagick/portfile.cmake @@ -0,0 +1,47 @@ +set(GM_VERSION 1.3.37) + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO graphicsmagick/graphicsmagick + REF ${GM_VERSION} + FILENAME "GraphicsMagick-${GM_VERSION}-windows.7z" + SHA512 2e465a290946d730c0da1b45602ebdebc256d9a0705d6d79784efcefb0760a923dd78c73f7a563ce6ec41e4199da66d3b31cc8c6b8f821ff993092d348aeaa2f + PATCHES + # GM always requires a dynamic BZIP2. This patch makes this dependent if _DLL is defined + dynamic_bzip2.patch + + # Bake GM's own modules into the .dll itself. This fixes a bug whereby + # 'vcpkg install graphicsmagick' did not lead to a copy of GM that could + # load either PNG or JPEG files (due to missing GM Modules, with names + # matching "IM_*.DLL"). + disable_graphicsmagick_modules.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/magick_types.h DESTINATION ${SOURCE_PATH}/magick) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DINSTALL_HEADERS=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-graphicsmagick TARGET_PATH share/unofficial-graphicsmagick) + +# copy license +file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +# copy config +file(COPY ${SOURCE_PATH}/config/colors.mgk DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/config) +file(COPY ${SOURCE_PATH}/config/log.mgk DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/config) +file(COPY ${SOURCE_PATH}/config/modules.mgk DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/config) + +file(READ ${SOURCE_PATH}/config/type-windows.mgk.in TYPE_MGK) +string(REPLACE "@windows_font_dir@" "$ENV{SYSTEMROOT}/Fonts/" TYPE_MGK "${TYPE_MGK}") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/graphicsmagick/config/type.mgk "${TYPE_MGK}") + +configure_file(${SOURCE_PATH}/config/delegates.mgk.in ${CURRENT_PACKAGES_DIR}/share/${PORT}/config/delegates.mgk @ONLY) +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/graphicsmagick/vcpkg.json b/externals/vcpkg/ports/graphicsmagick/vcpkg.json new file mode 100755 index 000000000..e343f1eb4 --- /dev/null +++ b/externals/vcpkg/ports/graphicsmagick/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "graphicsmagick", + "version": "1.3.37", + "port-version": 1, + "description": "Image processing library", + "homepage": "https://sourceforge.net/projects/graphicsmagick/", + "dependencies": [ + "bzip2", + "freetype", + "libjpeg-turbo", + "libpng", + "libwebp", + "tiff", + "zlib" + ] +} diff --git a/externals/vcpkg/ports/graphite2/disable-tests.patch b/externals/vcpkg/ports/graphite2/disable-tests.patch new file mode 100755 index 000000000..d1c1fd971 --- /dev/null +++ b/externals/vcpkg/ports/graphite2/disable-tests.patch @@ -0,0 +1,48 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 496712d..3df05c7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -82,10 +82,12 @@ if (BUILD_SHARED_LIBS) + endif() + + add_subdirectory(src) +-add_subdirectory(tests) +-add_subdirectory(doc) +-if (NOT GRAPHITE2_NFILEFACE) +- add_subdirectory(gr2fonttest) ++if(NOT DISABLE_TESTS) ++ add_subdirectory(tests) ++ add_subdirectory(doc) ++ if (NOT GRAPHITE2_NFILEFACE) ++ add_subdirectory(gr2fonttest) ++ endif() + endif() + + set(version 3.0.1) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index b6ac26b..851a97f 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -127,9 +127,9 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + endif () + endif() + include(Graphite) +- if (BUILD_SHARED_LIBS) ++ if (NOT DISABLE_TESTS) + nolib_test(stdc++ $) +- endif () ++ endif() + set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "") + CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}") + endif() +@@ -144,7 +144,9 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + endif() + target_link_libraries(graphite2 c) + include(Graphite) +- nolib_test(stdc++ $) ++ if (NOT DISABLE_TESTS) ++ nolib_test(stdc++ $) ++ endif() + set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "") + CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}") + endif() diff --git a/externals/vcpkg/ports/graphite2/portfile.cmake b/externals/vcpkg/ports/graphite2/portfile.cmake new file mode 100755 index 000000000..62a71bb17 --- /dev/null +++ b/externals/vcpkg/ports/graphite2/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO silnrsi/graphite + REF 92f59dcc52f73ce747f1cdc831579ed2546884aa # 1.3.14 + SHA512 011855576124b2f9ae9d7d3a0dfc5489794cf82b81bebc02c11c9cca350feb9fbb411844558811dff1ebbacac58a24a7cf56a374fc2c27e97a5fb4795a01486e + HEAD_REF master + PATCHES disable-tests.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DDISABLE_TESTS=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libgraphite2.la" "${CURRENT_PACKAGES_DIR}/debug/lib/libgraphite2.la") + +file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/graphite2/vcpkg.json b/externals/vcpkg/ports/graphite2/vcpkg.json new file mode 100755 index 000000000..1dc5a3fc2 --- /dev/null +++ b/externals/vcpkg/ports/graphite2/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "graphite2", + "version": "1.3.14", + "port-version": 3, + "description": [ + "Graphite is a \"smart font\" system developed specifically to handle the complexities of lesser-known languages of the world.", + "Graphite2 is a rework of the original Graphite engine that is faster, smaller, and uses an API that is better suited to the layout architecture of most text-processing applications." + ], + "homepage": "https://github.com/silnrsi/graphite", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/graphqlparser/portfile.cmake b/externals/vcpkg/ports/graphqlparser/portfile.cmake new file mode 100755 index 000000000..70b34fa18 --- /dev/null +++ b/externals/vcpkg/ports/graphqlparser/portfile.cmake @@ -0,0 +1,44 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO graphql/libgraphqlparser + REF v0.7.0 + SHA512 973292b164d0d2cfe453a2f01559dbdb1b9d22b6304f6a3aabf71e2c0a3e24ab69dfd72a086764ad5befecf0005620f8e86f552dacc324f9615a05f31de7cede + HEAD_REF master + PATCHES + win-cmake.patch + static-compile-fix.patch + remove-invalid-bison-directive.patch +) + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + ) +elseif(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + vcpkg_find_acquire_program(PYTHON2) + vcpkg_find_acquire_program(FLEX) + vcpkg_find_acquire_program(BISON) + + get_filename_component(VCPKG_DOWNLOADS_PYTHON2_DIR "${PYTHON2}" DIRECTORY) + get_filename_component(VCPKG_DOWNLOADS_FLEX_DIR "${FLEX}" DIRECTORY) + get_filename_component(VCPKG_DOWNLOADS_BISON_DIR "${BISON}" DIRECTORY) + + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DVCPKG_DOWNLOADS_PYTHON2_DIR=${VCPKG_DOWNLOADS_PYTHON2_DIR} + -DVCPKG_DOWNLOADS_FLEX_DIR=${VCPKG_DOWNLOADS_FLEX_DIR} + -DVCPKG_DOWNLOADS_BISON_DIR=${VCPKG_DOWNLOADS_BISON_DIR} + ) +endif() + +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/graphqlparser/parser.tab.hpp" "${SOURCE_PATH}" "") + +# Handle copyright +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/graphqlparser/copyright" COPYONLY) + diff --git a/externals/vcpkg/ports/graphqlparser/remove-invalid-bison-directive.patch b/externals/vcpkg/ports/graphqlparser/remove-invalid-bison-directive.patch new file mode 100755 index 000000000..0e0b896dc --- /dev/null +++ b/externals/vcpkg/ports/graphqlparser/remove-invalid-bison-directive.patch @@ -0,0 +1,13 @@ +diff --git a/parser.ypp b/parser.ypp +index 2afbcac..baa9cab 100644 +--- a/parser.ypp ++++ b/parser.ypp +@@ -7,8 +7,6 @@ + * of patent rights can be found in the PATENTS file in the same directory. + */ + +-%require "3" +- + %skeleton "lalr1.cc" + + %defines diff --git a/externals/vcpkg/ports/graphqlparser/static-compile-fix.patch b/externals/vcpkg/ports/graphqlparser/static-compile-fix.patch new file mode 100755 index 000000000..3f2756d71 --- /dev/null +++ b/externals/vcpkg/ports/graphqlparser/static-compile-fix.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 56741c2..313308a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -142,8 +142,11 @@ if (UNIX) + elseif(WIN32) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/graphqlparser.lib + DESTINATION lib) ++ # do not install pdb when static compilation. ++ if (BUILD_SHARED_LIBS) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/graphqlparser.pdb + DESTINATION bin) ++ endif() + endif() + + IF (test) diff --git a/externals/vcpkg/ports/graphqlparser/vcpkg.json b/externals/vcpkg/ports/graphqlparser/vcpkg.json new file mode 100755 index 000000000..8531686cc --- /dev/null +++ b/externals/vcpkg/ports/graphqlparser/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "graphqlparser", + "version": "0.7.0", + "port-version": 4, + "description": "A GraphQL query parser in C++ with C and C++ APIs", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/graphqlparser/win-cmake.patch b/externals/vcpkg/ports/graphqlparser/win-cmake.patch new file mode 100755 index 000000000..bd2f4c7c1 --- /dev/null +++ b/externals/vcpkg/ports/graphqlparser/win-cmake.patch @@ -0,0 +1,100 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c4c8b3e..3373d82 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,9 +3,26 @@ PROJECT(libgraphqlparser C CXX) + + SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}") + +-INCLUDE(version) ++IF(UNIX) ++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") ++ SET(FLEX_COMPILE_FLAGS "--header-file=lexer.h") ++ELSEIF(WIN32) ++ # If we're building this with vcpkg on Windows, let portfile.cmake tell us where it ++ # stored these tools. Otherwise these variables should be empty and we'll fall back ++ # to the normal CMake FIND_PACKAGE logic for each of these programs. ++ SET(CMAKE_PROGRAM_PATH ++ "${VCPKG_DOWNLOADS_PYTHON2_DIR}" ++ "${VCPKG_DOWNLOADS_FLEX_DIR}" ++ "${VCPKG_DOWNLOADS_BISON_DIR}" ++ "${CMAKE_PROGRAM_PATH}") ++ ++ SET(FLEX_COMPILE_FLAGS "--header-file=lexer.h --wincompat") ++ ++ # Let CMake figure out the exports for the SHARED library (DLL) on Windows. ++ SET(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE) ++ENDIF() + +-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") ++INCLUDE(version) + + FIND_PACKAGE(PythonInterp 2 REQUIRED) + IF (NOT PYTHON_VERSION_MAJOR EQUAL 2) +@@ -21,7 +38,7 @@ IF (BISON_FOUND) + ENDIF() + + IF(FLEX_FOUND) +- FLEX_TARGET(GraphQLScanner lexer.lpp ${CMAKE_CURRENT_SOURCE_DIR}/lexer.cpp COMPILE_FLAGS "--header-file=lexer.h") ++ FLEX_TARGET(GraphQLScanner lexer.lpp ${CMAKE_CURRENT_SOURCE_DIR}/lexer.cpp COMPILE_FLAGS ${FLEX_COMPILE_FLAGS}) + IF (BISON_FOUND) + ADD_FLEX_BISON_DEPENDENCY(GraphQLScanner graphqlparser) + ENDIF() +@@ -31,7 +48,7 @@ FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/c) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) + +-ADD_LIBRARY(graphqlparser SHARED ++ADD_LIBRARY(graphqlparser + JsonVisitor.cpp + ${CMAKE_CURRENT_BINARY_DIR}/Ast.h + ${CMAKE_CURRENT_BINARY_DIR}/Ast.cpp +@@ -87,7 +104,9 @@ ADD_SUBDIRECTORY(python) + + OPTION(test "Build tests." OFF) + +-INSTALL(DIRECTORY c ${CMAKE_CURRENT_BINARY_DIR}/c DESTINATION include/graphqlparser ++INSTALL(DIRECTORY c ${CMAKE_CURRENT_BINARY_DIR}/c ++ DESTINATION include/graphqlparser ++ CONFIGURATIONS Release + FILES_MATCHING PATTERN "*.h" + PATTERN "build" EXCLUDE) + +@@ -103,9 +122,13 @@ INSTALL(FILES + position.hh + stack.hh + syntaxdefs.h +- DESTINATION include/graphqlparser) ++ DESTINATION include/graphqlparser ++ CONFIGURATIONS Release) ++ + INSTALL(TARGETS graphqlparser +- LIBRARY DESTINATION lib) ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++ RUNTIME DESTINATION bin) + + if (UNIX) + # generate pkgconfig file +@@ -116,6 +139,11 @@ if (UNIX) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libgraphqlparser.pc" + DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") + endif() ++elseif(WIN32) ++ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/graphqlparser.lib ++ DESTINATION lib) ++ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/graphqlparser.pdb ++ DESTINATION bin) + endif() + + IF (test) +@@ -126,6 +154,8 @@ IF (test) + ADD_CUSTOM_TARGET(memcheck + valgrind --leak-check=full --suppressions=./test/valgrind.supp --dsymutil=yes --error-exitcode=1 ./test/runTests >/dev/null + ) ++ else() ++ ADD_CUSTOM_TARGET(runTests ++ ./test/runTests >/dev/null) + endif() +- + ENDIF() diff --git a/externals/vcpkg/ports/graphviz/0001-Fix-build.patch b/externals/vcpkg/ports/graphviz/0001-Fix-build.patch new file mode 100755 index 000000000..4accf3e94 --- /dev/null +++ b/externals/vcpkg/ports/graphviz/0001-Fix-build.patch @@ -0,0 +1,94 @@ +diff --git a/cmake/FindCairo.cmake b/cmake/FindCairo.cmake +index dce05ea96..cbd879fee 100644 +--- a/cmake/FindCairo.cmake ++++ b/cmake/FindCairo.cmake +@@ -1,6 +1,6 @@ + include(FindPackageHandleStandardArgs) + +-if (WIN32) ++if (false) + find_path(Cairo_INCLUDE_DIR cairo/cairo.h) + + find_library(Cairo_LIBRARY NAMES cairo) +diff --git a/cmake/FindPangoCairo.cmake b/cmake/FindPangoCairo.cmake +index 0937e41ef..bb876ce46 100644 +--- a/cmake/FindPangoCairo.cmake ++++ b/cmake/FindPangoCairo.cmake +@@ -1,6 +1,6 @@ + include(FindPackageHandleStandardArgs) + +-if (WIN32) ++if (false) + find_path(PangoCairo_INCLUDE_DIR pango/pangocairo.h PATH_SUFFIXES pango-1.0) + find_path(GLIB_INCLUDE_DIR glib.h PATH_SUFFIXES glib-2.0) + find_path(GLIBCONFIG_INCLUDE_DIR glibconfig.h PATH_SUFFIXES glib-2.0/include) +@@ -69,6 +69,9 @@ if (WIN32) + else() + find_package(PkgConfig) + pkg_check_modules(PangoCairo pangocairo) ++ list(REMOVE_ITEM PangoCairo_LINK_LIBRARIES ffi) ++ find_library(ACTUAL_FFI libffi PangoCairo_LIBRARY_DIRS) ++ list(APPEND PangoCairo_LINK_LIBRARIES ${ACTUAL_FFI}) + + # prior to CMake 3.12, PkgConfig does not set *_LINK_LIBRARIES, so do it + # manually +diff --git a/cmd/tools/CMakeLists.txt b/cmd/tools/CMakeLists.txt +index 8d7b88484..58f8d80fe 100644 +--- a/cmd/tools/CMakeLists.txt ++++ b/cmd/tools/CMakeLists.txt +@@ -392,14 +392,14 @@ tool_defaults(sccmap) + + # ===================== Install third party DLLs on Windows ==================== + +-if (WIN32 AND EXPAT_FOUND) ++if (false) + install( + FILES ${EXPAT_RUNTIME_LIBRARIES} + DESTINATION ${BINARY_INSTALL_DIR} + ) +-endif(WIN32 AND EXPAT_FOUND) ++endif(false) + +-if (WIN32) ++if (false) + install( + FILES ${Getopt_RUNTIME_LIBRARIES} + DESTINATION ${BINARY_INSTALL_DIR} +diff --git a/lib/common/CMakeLists.txt b/lib/common/CMakeLists.txt +index 144c442ae..fa56739b0 100644 +--- a/lib/common/CMakeLists.txt ++++ b/lib/common/CMakeLists.txt +@@ -93,6 +93,7 @@ target_include_directories(common_obj PRIVATE + ${GRAPHVIZ_LIB_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} ++ ${EXPAT_INCLUDE_DIRS} + ${GRAPHVIZ_LIB_DIR}/cdt + ${GRAPHVIZ_LIB_DIR}/cgraph + ${GRAPHVIZ_LIB_DIR}/gvc +diff --git a/lib/gvc/CMakeLists.txt b/lib/gvc/CMakeLists.txt +index 745841176..57e2dd32b 100644 +--- a/lib/gvc/CMakeLists.txt ++++ b/lib/gvc/CMakeLists.txt +@@ -134,7 +134,7 @@ set_target_properties(gvc PROPERTIES + ) + + # Include DLLs with this library on Windows +-if (WIN32 AND EXPAT_FOUND) ++if (false) + install( + FILES + ${EXPAT_RUNTIME_LIBRARIES} +diff --git a/plugin/gd/CMakeLists.txt b/plugin/gd/CMakeLists.txt +index fe7ed264d..dce635185 100644 +--- a/plugin/gd/CMakeLists.txt ++++ b/plugin/gd/CMakeLists.txt +@@ -36,7 +36,7 @@ install( + ) + + # Include DLLs with this library on Windows +-if (WIN32) ++if (false) + install( + FILES + ${GD_RUNTIME_LIBRARIES} diff --git a/externals/vcpkg/ports/graphviz/portfile.cmake b/externals/vcpkg/ports/graphviz/portfile.cmake new file mode 100755 index 000000000..3310b5be7 --- /dev/null +++ b/externals/vcpkg/ports/graphviz/portfile.cmake @@ -0,0 +1,79 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.com + OUT_SOURCE_PATH SOURCE_PATH + REPO graphviz/graphviz + REF 2.49.1 + SHA512 ac14303f67d0840b260c5f2f99c53049a1e444a963d31387ae7a44ffc24757bd44f1c40ddd3fdb6a8d0e0bb1dde0e15d320f613729fb631efd4f078fcb3a4f62 + HEAD_REF main + PATCHES + 0001-Fix-build.patch +) + +if(VCPKG_TARGET_IS_OSX) + message("${PORT} currently requires the following libraries from the system package manager:\n libtool\n\nThey can be installed with brew install libtool") +elseif(VCPKG_TARGET_IS_LINUX) + message("${PORT} currently requires the following libraries from the system package manager:\n libtool\n\nThey can be installed with apt-get install libtool") +else() + vcpkg_download_distfile( + LTDL_H_PATH + URLS "https://gitlab.com/graphviz/graphviz-windows-dependencies/-/raw/141d3a21be904fa8dc2ae3ed01d36684db07a35d/${VCPKG_TARGET_ARCHITECTURE}/include/ltdl.h" + FILENAME ltdl.h + SHA512 f2d20e849e35060536265f47014c40eb70e57dacd600a9db112fc465fbfa6a66217b44a8c3dc33039c260a27f09d9034b329b03cc28c32a22ec503fcd17b78cd + ) + file(COPY ${LTDL_H_PATH} DESTINATION ${SOURCE_PATH}/lib/common) + set(EXTRA_CMAKE_OPTION "-DLTDL_INCLUDE_DIR=${SOURCE_PATH}/lib/common") +endif() + +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(EXTRA_CMAKE_OPTION "-DCMAKE_INSTALL_RPATH=${CURRENT_INSTALLED_DIR}/lib") +endif() + +if(VCPKG_HOST_IS_WINDOWS) + vcpkg_acquire_msys(MSYS_ROOT PACKAGES gawk) + vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") +endif() + +vcpkg_find_acquire_program(BISON) +vcpkg_find_acquire_program(FLEX) +vcpkg_find_acquire_program(GIT) +vcpkg_find_acquire_program(PYTHON3) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + "-DBISON_EXECUTABLE=${BISON}" + "-DFLEX_EXECUTABLE=${FLEX}" + "-DGIT_EXECUTABLE=${GIT}" + "-DPython3_EXECUTABLE=${PYTHON3}" + "-DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf" + ${EXTRA_CMAKE_OPTION} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_copy_tools( + TOOL_NAMES acyclic bcomps ccomps circo dijkstra dot fdp gc gml2gv graphml2gv gv2gml gvcolor gvgen gvpack gvpr gxl2gv mm2gv neato nop osage patchwork sccmap sfdp tred twopi unflatten + AUTO_CLEAN +) + +if(VCPKG_TARGET_IS_WINDOWS) + file(GLOB PLUGINS "${CURRENT_PACKAGES_DIR}/bin/gvplugin_*") + file(COPY ${PLUGINS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + vcpkg_execute_required_process( + COMMAND dot -c + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}" + LOGNAME configure-plugins + ) + file(COPY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/config6" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/graphviz/vcpkg.json b/externals/vcpkg/ports/graphviz/vcpkg.json new file mode 100755 index 000000000..ea8b7ad36 --- /dev/null +++ b/externals/vcpkg/ports/graphviz/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "graphviz", + "version-semver": "2.49.1", + "port-version": 4, + "description": "Graph Visualization Tools", + "homepage": "https://graphviz.org/", + "license": "EPL-1.0", + "supports": "!(windows & arm64)", + "dependencies": [ + "cairo", + "getopt", + "libffi", + "libgd", + "pango", + { + "name": "pkgconf", + "host": true + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/greatest/portfile.cmake b/externals/vcpkg/ports/greatest/portfile.cmake new file mode 100755 index 000000000..676e4cd5a --- /dev/null +++ b/externals/vcpkg/ports/greatest/portfile.cmake @@ -0,0 +1,13 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO silentbicycle/greatest + REF v1.5.0 + SHA512 836392A7C9C56C6A5658FD18B4BBB146304B1997DFD9CB59F2A83C18A5EC140C8DDE64A2C0CF9A169C426B9E586D37E2ED7D7FB792402DBB4149CC424EC2DB2E + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/greatest.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/greatest/vcpkg.json b/externals/vcpkg/ports/greatest/vcpkg.json new file mode 100755 index 000000000..dce04ff5e --- /dev/null +++ b/externals/vcpkg/ports/greatest/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "greatest", + "version": "1.5.0", + "description": "Single-file testing system for C", + "homepage": "https://github.com/silentbicycle/greatest" +} diff --git a/externals/vcpkg/ports/grpc/00001-fix-uwp.patch b/externals/vcpkg/ports/grpc/00001-fix-uwp.patch new file mode 100755 index 000000000..a7f353d70 --- /dev/null +++ b/externals/vcpkg/ports/grpc/00001-fix-uwp.patch @@ -0,0 +1,73 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7a97604..4967c4f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -215,6 +215,9 @@ if(UNIX) + endif() + if(WIN32) + set(_gRPC_PLATFORM_WINDOWS ON) ++ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") ++ set(_gRPC_PLATFORM_UWP ON) ++ endif() + endif() + + # Use C99 standard +@@ -259,6 +262,9 @@ if(MSVC) + set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4267") + # TODO(jtattermusch): needed to build boringssl with VS2017, revisit later + set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4987 /wd4774 /wd4819 /wd4996 /wd4619") ++ if(_gRPC_PLATFORM_UWP) ++ add_definitions(-DGRPC_ARES=0) ++ endif() + # Silences thousands of trucation warnings + set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4503") + endif() +@@ -336,6 +342,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR}) + # ``.proto`` files + # + function(protobuf_generate_grpc_cpp) ++ if(_gRPC_PLATFORM_UWP) ++ return() ++ endif() ++ + if(NOT ARGN) + message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files") + return() +@@ -408,6 +418,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN) + list(APPEND _gRPC_PLUGIN_LIST grpc_ruby_plugin) + endif () + ++if(NOT _gRPC_PLATFORM_UWP) + add_custom_target(plugins + DEPENDS ${_gRPC_PLUGIN_LIST} + ) +@@ -424,6 +435,7 @@ add_custom_target(tools_cxx + + add_custom_target(tools + DEPENDS tools_c tools_cxx) ++endif() + + protobuf_generate_grpc_cpp( + src/proto/grpc/channelz/channelz.proto +diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc +index 5d2bdc1..e9870c2 100644 +--- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc ++++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc +@@ -39,6 +39,7 @@ bool check_bios_data(const char*) { return false; } + bool check_windows_registry_product_name(HKEY root_key, + const char* reg_key_path, + const char* reg_key_name) { ++#if !defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP + const size_t kProductNameBufferSize = 256; + char const expected_substr[] = "Google"; + +@@ -71,6 +72,9 @@ bool check_windows_registry_product_name(HKEY root_key, + } + + return strstr(buffer, expected_substr) != nullptr; ++#else ++ return false; ++#endif + } + + } // namespace internal diff --git a/externals/vcpkg/ports/grpc/00002-static-linking-in-linux.patch b/externals/vcpkg/ports/grpc/00002-static-linking-in-linux.patch new file mode 100755 index 000000000..8999a24ae --- /dev/null +++ b/externals/vcpkg/ports/grpc/00002-static-linking-in-linux.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8f78306f77..e09f8fcc1e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -211,6 +211,11 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) + endif() + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") + ++if (gRPC_STATIC_LINKING AND NOT _gRPC_PLATFORM_WINDOWS) ++ # Force to static link ++ set(CMAKE_EXE_LINKER_FLAGS "-Bstatic") ++endif() ++ + if(MSVC) + include(cmake/msvc_static_runtime.cmake) + add_definitions(-D_WIN32_WINNT=0x600 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS) diff --git a/externals/vcpkg/ports/grpc/00003-undef-base64-macro.patch b/externals/vcpkg/ports/grpc/00003-undef-base64-macro.patch new file mode 100755 index 000000000..be182659d --- /dev/null +++ b/externals/vcpkg/ports/grpc/00003-undef-base64-macro.patch @@ -0,0 +1,13 @@ +diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc +index 5d74ec2..89494b5 100644 +--- a/src/core/lib/transport/transport.cc ++++ b/src/core/lib/transport/transport.cc +@@ -77,6 +77,8 @@ void grpc_stream_ref_init(grpc_stream_refcount* refcount, int /*initial_refs*/, + : nullptr); + } + ++#undef move64 ++ + static void move64bits(uint64_t* from, uint64_t* to) { + *to += *from; + *from = 0; diff --git a/externals/vcpkg/ports/grpc/00004-link-gdi32-on-windows.patch b/externals/vcpkg/ports/grpc/00004-link-gdi32-on-windows.patch new file mode 100755 index 000000000..0d1abe7f8 --- /dev/null +++ b/externals/vcpkg/ports/grpc/00004-link-gdi32-on-windows.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 14514b7..497470c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -323,7 +323,7 @@ include(cmake/xxhash.cmake) + include(cmake/zlib.cmake) + + if(WIN32) +- set(_gRPC_BASELIB_LIBRARIES ws2_32 crypt32) ++ set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32) + endif() + + # Create directory for generated .proto files diff --git a/externals/vcpkg/ports/grpc/00005-fix-uwp-error.patch b/externals/vcpkg/ports/grpc/00005-fix-uwp-error.patch new file mode 100755 index 000000000..ff86f68fe --- /dev/null +++ b/externals/vcpkg/ports/grpc/00005-fix-uwp-error.patch @@ -0,0 +1,34 @@ +diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc +index 0dacbfef3e..0743a1b003 100644 +--- a/src/core/lib/slice/slice.cc ++++ b/src/core/lib/slice/slice.cc +@@ -234,6 +234,7 @@ grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr p, + size_t len) { + uint8_t* ptr = reinterpret_cast(p.get()); + grpc_slice slice; ++ memset(&slice, 0, sizeof(grpc_slice)); + if (len <= sizeof(slice.data.inlined.bytes)) { + slice.refcount = nullptr; + slice.data.inlined.length = len; +@@ -253,7 +254,7 @@ grpc_slice grpc_slice_from_moved_string(grpc_core::UniquePtr p) { + } + + grpc_slice grpc_slice_from_cpp_string(std::string str) { +- grpc_slice slice; ++ grpc_slice slice = { 0 }; + if (str.size() <= sizeof(slice.data.inlined.bytes)) { + slice.refcount = nullptr; + slice.data.inlined.length = str.size(); +diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc +index c94551545d..3fd9797316 100644 +--- a/src/core/lib/surface/server.cc ++++ b/src/core/lib/surface/server.cc +@@ -878,7 +878,7 @@ grpc_call_error Server::QueueRequestedCall(size_t cq_idx, RequestedCall* rc) { + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown")); + return GRPC_CALL_OK; + } +- RequestMatcherInterface* rm; ++ RequestMatcherInterface* rm = nullptr; + switch (rc->type) { + case RequestedCall::Type::BATCH_CALL: + rm = unregistered_request_matcher_.get(); diff --git a/externals/vcpkg/ports/grpc/00006-fix-uwp-error.patch b/externals/vcpkg/ports/grpc/00006-fix-uwp-error.patch new file mode 100755 index 000000000..871e170c4 --- /dev/null +++ b/externals/vcpkg/ports/grpc/00006-fix-uwp-error.patch @@ -0,0 +1,13 @@ +diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc +index 18abbda..9789983 100644 +--- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc ++++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc +@@ -1052,7 +1052,7 @@ class HPackParser::Parser { + + private: + void GPR_ATTRIBUTE_NOINLINE LogHeader(const HPackTable::Memento& memento) { +- const char* type; ++ const char* type = nullptr; + switch (log_info_.type) { + case LogInfo::kHeaders: + type = "HDR"; diff --git a/externals/vcpkg/ports/grpc/00009-use-system-upb.patch b/externals/vcpkg/ports/grpc/00009-use-system-upb.patch new file mode 100755 index 000000000..e40b27dbb --- /dev/null +++ b/externals/vcpkg/ports/grpc/00009-use-system-upb.patch @@ -0,0 +1,78 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1c3146b..ae06ea3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -84,6 +84,9 @@ set_property(CACHE gRPC_SSL_PROVIDER PROPERTY STRINGS "module" "package") + set(gRPC_PROTOBUF_PROVIDER "module" CACHE STRING "Provider of protobuf library") + set_property(CACHE gRPC_PROTOBUF_PROVIDER PROPERTY STRINGS "module" "package") + ++set(gRPC_UPB_PROVIDER "module" CACHE STRING "Provider of upb library") ++set_property(CACHE gRPC_UPB_PROVIDER PROPERTY STRINGS "module" "package") ++ + set(gRPC_PROTOBUF_PACKAGE_TYPE "" CACHE STRING "Algorithm for searching protobuf package") + set_property(CACHE gRPC_PROTOBUF_PACKAGE_TYPE PROPERTY STRINGS "CONFIG" "MODULE") + +@@ -1504,7 +1507,6 @@ target_link_libraries(gpr + absl::synchronization + absl::time + absl::optional +- upb + ) + if(_gRPC_PLATFORM_ANDROID) + target_link_libraries(gpr +@@ -3927,6 +3929,7 @@ endif() + + endif() + ++if (gRPC_UPB_PROVIDER STREQUAL "module") + add_library(upb + third_party/upb/upb/decode_fast.c + third_party/upb/upb/decode.c +@@ -3984,7 +3987,7 @@ if(gRPC_INSTALL) + ) + endif() + +- ++endif() + + add_executable(check_epollexclusive + test/build/check_epollexclusive.c +diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in +index 3623f4a..df6ced5 100644 +--- a/cmake/gRPCConfig.cmake.in ++++ b/cmake/gRPCConfig.cmake.in +@@ -8,6 +8,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules) + @_gRPC_FIND_CARES@ + @_gRPC_FIND_ABSL@ + @_gRPC_FIND_RE2@ ++@_gRPC_FIND_UPB@ + + # Targets + include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake) +diff --git a/cmake/upb.cmake b/cmake/upb.cmake +index f2a0e50..ac6d397 100644 +--- a/cmake/upb.cmake ++++ b/cmake/upb.cmake +@@ -12,9 +12,21 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + ++set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated" "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated") ++if (gRPC_UPB_PROVIDER STREQUAL "module") ++ + set(UPB_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/upb) + + set(_gRPC_UPB_INCLUDE_DIR "${UPB_ROOT_DIR}") + set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated" "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated") + + set(_gRPC_UPB_LIBRARIES upb) ++ ++ ++elseif(gRPC_UPB_PROVIDER STREQUAL "package") ++ find_package(upb CONFIG REQUIRED) ++ set(_gRPC_UPB_LIBRARIES upb::upb) ++ set(_gRPC_UPB_INCLUDE_DIR) ++ set(upb ${_gRPC_UPB_LIBRARIES}) ++ set(_gRPC_FIND_UPB "if(NOT upb_FOUND)\n find_package(upb CONFIG REQUIRED)\nendif()") ++endif() +\ No newline at end of file diff --git a/externals/vcpkg/ports/grpc/00010-add-feature-absl-sync.patch b/externals/vcpkg/ports/grpc/00010-add-feature-absl-sync.patch new file mode 100755 index 000000000..75d986d61 --- /dev/null +++ b/externals/vcpkg/ports/grpc/00010-add-feature-absl-sync.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 497470c..9c07732 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2196,6 +2196,8 @@ target_link_libraries(grpc + ${_gRPC_UPB_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + absl::flat_hash_map ++ absl::time ++ absl::synchronization + absl::inlined_vector + absl::bind_front + absl::hash +@@ -2753,6 +2755,8 @@ target_link_libraries(grpc_unsecure + ${_gRPC_UPB_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + absl::flat_hash_map ++ absl::time ++ absl::synchronization + absl::inlined_vector + absl::bind_front + absl::statusor +diff --git a/cmake/abseil-cpp.cmake b/cmake/abseil-cpp.cmake +index c89ba26..81212b9 100644 +--- a/cmake/abseil-cpp.cmake ++++ b/cmake/abseil-cpp.cmake +@@ -35,3 +35,6 @@ elseif(gRPC_ABSL_PROVIDER STREQUAL "package") + find_package(absl REQUIRED CONFIG) + endif() + set(_gRPC_FIND_ABSL "if(NOT TARGET absl::strings)\n find_package(absl CONFIG)\nendif()") ++ if (gRPC_ABSL_SYNC_ENABLE) ++ add_definitions(-DGPR_ABSEIL_SYNC=1) ++ endif() diff --git a/externals/vcpkg/ports/grpc/00011-fix-csharp_plugin.patch b/externals/vcpkg/ports/grpc/00011-fix-csharp_plugin.patch new file mode 100755 index 000000000..fb258f900 --- /dev/null +++ b/externals/vcpkg/ports/grpc/00011-fix-csharp_plugin.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ae77375eae..ad8815d2f9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1960,10 +1960,14 @@ endif() + + if(gRPC_BUILD_CSHARP_EXT) + +-add_library(grpc_csharp_ext SHARED ++add_library(grpc_csharp_ext + src/csharp/ext/grpc_csharp_ext.c + ) + ++if (WIN32 AND BUILD_SHARED_LIBS) ++ target_compile_definitions(grpc_csharp_ext PUBLIC GPR_WINDOWS) ++endif() ++ + set_target_properties(grpc_csharp_ext PROPERTIES + VERSION ${gRPC_CORE_VERSION} + SOVERSION ${gRPC_CORE_SOVERSION} +@@ -1977,6 +1981,12 @@ if(WIN32 AND MSVC) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_csharp_ext.pdb + DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL + ) ++ ++ install(TARGETS grpc_csharp_ext ++ RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} ++ ) + endif() + endif() + diff --git a/externals/vcpkg/ports/grpc/00012-fix-use-cxx17.patch b/externals/vcpkg/ports/grpc/00012-fix-use-cxx17.patch new file mode 100755 index 000000000..7ff404a8e --- /dev/null +++ b/externals/vcpkg/ports/grpc/00012-fix-use-cxx17.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9c07732..54b4b23 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -321,6 +321,11 @@ include(cmake/ssl.cmake) + include(cmake/upb.cmake) + include(cmake/xxhash.cmake) + include(cmake/zlib.cmake) ++ ++if (ABSL_USE_CXX17) ++ message(STATUS "Found absl uses CXX17, enable CXX17 feature.") ++ set(CMAKE_CXX_STANDARD 17) ++endif() + + if(WIN32) + set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32) diff --git a/externals/vcpkg/ports/grpc/00013-build-upbdefs.patch b/externals/vcpkg/ports/grpc/00013-build-upbdefs.patch new file mode 100755 index 000000000..9a601ec5a --- /dev/null +++ b/externals/vcpkg/ports/grpc/00013-build-upbdefs.patch @@ -0,0 +1,28 @@ +diff --git a/cmake/upb.cmake b/cmake/upb.cmake +index 59d6813..1ce8bce 100644 +--- a/cmake/upb.cmake ++++ b/cmake/upb.cmake +@@ -24,8 +24,21 @@ set(_gRPC_UPB_LIBRARIES upb) + + elseif(gRPC_UPB_PROVIDER STREQUAL "package") + find_package(upb CONFIG REQUIRED) +- set(_gRPC_UPB_LIBRARIES upb::upb) ++ set(_gRPC_UPB_LIBRARIES upb) + set(_gRPC_UPB_INCLUDE_DIR) +- set(upb ${_gRPC_UPB_LIBRARIES}) ++ add_library(upb STATIC ++ ${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c ++ ${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated/google/protobuf/descriptor.upb.c ++ ) ++ set_target_properties(upb PROPERTIES OUTPUT_NAME grpc_upbdefs) ++ target_include_directories(upb PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated" "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated") ++ target_link_libraries(upb PUBLIC upb::all_libs) ++ if(gRPC_INSTALL) ++ install(TARGETS upb EXPORT gRPCTargets ++ RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} ++ ) ++ endif() + set(_gRPC_FIND_UPB "if(NOT upb_FOUND)\n find_package(upb CONFIG REQUIRED)\nendif()") + endif() diff --git a/externals/vcpkg/ports/grpc/00014-pkgconfig-upbdefs.patch b/externals/vcpkg/ports/grpc/00014-pkgconfig-upbdefs.patch new file mode 100755 index 000000000..01e064e3b --- /dev/null +++ b/externals/vcpkg/ports/grpc/00014-pkgconfig-upbdefs.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 54b4b23..83fab3b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17276,7 +17276,7 @@ generate_pkgconfig( + "high performance general RPC framework" + "${gRPC_CORE_VERSION}" + "gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_hash absl_inlined_vector absl_memory absl_optional absl_random_random absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_utility absl_variant" +- "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz" ++ "-lgrpc -lgrpc_upbdefs -laddress_sorting -lre2 -lupb_fastdecode -lupb_json -lupb_pb -lupb_handlers -lupb_textformat -lupb_reflection -lupb -lcares -lz" + "" + "grpc.pc") + diff --git a/externals/vcpkg/ports/grpc/gRPCTargets-vcpkg-tools.cmake b/externals/vcpkg/ports/grpc/gRPCTargets-vcpkg-tools.cmake new file mode 100755 index 000000000..08e3ee3af --- /dev/null +++ b/externals/vcpkg/ports/grpc/gRPCTargets-vcpkg-tools.cmake @@ -0,0 +1,10 @@ +file(GLOB GRPC_PLUGINS "${_IMPORT_PREFIX}/../@HOST_TRIPLET@/tools/grpc/grpc_*_plugin*") + +foreach(PLUGIN ${GRPC_PLUGINS}) + get_filename_component(PLUGIN_NAME "${PLUGIN}" NAME_WE) + add_executable(gRPC::${PLUGIN_NAME} IMPORTED) + set_property(TARGET gRPC::${PLUGIN_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + set_target_properties(gRPC::${PLUGIN_NAME} PROPERTIES + IMPORTED_LOCATION_RELEASE "${PLUGIN}" + ) +endforeach() diff --git a/externals/vcpkg/ports/grpc/portfile.cmake b/externals/vcpkg/ports/grpc/portfile.cmake new file mode 100755 index 000000000..4c68ff112 --- /dev/null +++ b/externals/vcpkg/ports/grpc/portfile.cmake @@ -0,0 +1,100 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO grpc/grpc + REF 591d56e1300b6d11948e1b821efac785a295989c # v1.44.0 + SHA512 b24f82768eed95b017a499ffb539af1f59d6916ab2da5ffb1de344ea7b0b7df536d1bb29a9bcb273bd84bc1f11b62383dc6c7df62e50d57621228f5aeeca6d5d + HEAD_REF master + PATCHES + 00001-fix-uwp.patch + 00002-static-linking-in-linux.patch + 00003-undef-base64-macro.patch + 00004-link-gdi32-on-windows.patch + 00005-fix-uwp-error.patch + 00006-fix-uwp-error.patch + 00009-use-system-upb.patch + 00010-add-feature-absl-sync.patch + 00011-fix-csharp_plugin.patch + snprintf.patch + 00012-fix-use-cxx17.patch + 00013-build-upbdefs.patch + 00014-pkgconfig-upbdefs.patch +) + +if(NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET) + vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc") +endif() + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" gRPC_MSVC_STATIC_RUNTIME) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" gRPC_STATIC_LINKING) + +if(VCPKG_TARGET_IS_UWP) + set(cares_CARES_PROVIDER OFF) +else() + set(cares_CARES_PROVIDER "package") +endif() + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + absl-sync gRPC_ABSL_SYNC_ENABLE + codegen gRPC_BUILD_CODEGEN +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} + -DgRPC_INSTALL=ON + -DgRPC_BUILD_TESTS=OFF + -DgRPC_STATIC_LINKING=${gRPC_STATIC_LINKING} + -DgRPC_MSVC_STATIC_RUNTIME=${gRPC_MSVC_STATIC_RUNTIME} + -DgRPC_ZLIB_PROVIDER=package + -DgRPC_SSL_PROVIDER=package + -DgRPC_PROTOBUF_PROVIDER=package + -DgRPC_ABSL_PROVIDER=package + -DgRPC_UPB_PROVIDER=package + -DgRPC_RE2_PROVIDER=package + -DgRPC_PROTOBUF_PACKAGE_TYPE=CONFIG + -DgRPC_CARES_PROVIDER=${cares_CARES_PROVIDER} + -DgRPC_BENCHMARK_PROVIDER=none + -DgRPC_INSTALL_BINDIR:STRING=bin + -DgRPC_INSTALL_LIBDIR:STRING=lib + -DgRPC_INSTALL_INCLUDEDIR:STRING=include + -DgRPC_INSTALL_CMAKEDIR:STRING=share/grpc + "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" + "-DPROTOBUF_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" + MAYBE_UNUSED_VARIABLES + gRPC_MSVC_STATIC_RUNTIME +) + +vcpkg_cmake_install(ADD_BIN_TO_PATH) + +vcpkg_cmake_config_fixup() + +if (gRPC_BUILD_CODEGEN) + vcpkg_copy_tools( + AUTO_CLEAN + TOOL_NAMES + grpc_php_plugin + grpc_python_plugin + grpc_node_plugin + grpc_objective_c_plugin + grpc_csharp_plugin + grpc_cpp_plugin + grpc_ruby_plugin + ) +else() + configure_file("${CMAKE_CURRENT_LIST_DIR}/gRPCTargets-vcpkg-tools.cmake" "${CURRENT_PACKAGES_DIR}/share/grpc/gRPCTargets-vcpkg-tools.cmake" @ONLY) +endif() + +# Ignore the C# extension DLL in bin/ +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) diff --git a/externals/vcpkg/ports/grpc/snprintf.patch b/externals/vcpkg/ports/grpc/snprintf.patch new file mode 100755 index 000000000..b5012ad2d --- /dev/null +++ b/externals/vcpkg/ports/grpc/snprintf.patch @@ -0,0 +1,12 @@ +diff --git a/src/core/tsi/alts/crypt/aes_gcm.cc b/src/core/tsi/alts/crypt/aes_gcm.cc +index b761224..88a3d6b 100644 +--- a/src/core/tsi/alts/crypt/aes_gcm.cc ++++ b/src/core/tsi/alts/crypt/aes_gcm.cc +@@ -19,6 +19,7 @@ + #include + + #include ++#include + + #include + #include diff --git a/externals/vcpkg/ports/grpc/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/grpc/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..9adf02880 --- /dev/null +++ b/externals/vcpkg/ports/grpc/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,2 @@ +list(REMOVE_AT ARGS 0) +_find_package(gRPC ${ARGS}) # Shouldn't this be fixed downstream instead of using a Wrapper? \ No newline at end of file diff --git a/externals/vcpkg/ports/grpc/vcpkg.json b/externals/vcpkg/ports/grpc/vcpkg.json new file mode 100755 index 000000000..4b6c322df --- /dev/null +++ b/externals/vcpkg/ports/grpc/vcpkg.json @@ -0,0 +1,47 @@ +{ + "name": "grpc", + "version-semver": "1.44.0", + "port-version": 1, + "description": "An RPC library and framework", + "homepage": "https://github.com/grpc/grpc", + "license": "Apache-2.0", + "dependencies": [ + "abseil", + { + "name": "c-ares", + "platform": "!uwp" + }, + { + "name": "grpc", + "host": true, + "features": [ + "codegen" + ] + }, + "openssl", + "protobuf", + { + "name": "protobuf", + "host": true + }, + "re2", + "upb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "features": { + "absl-sync": { + "description": "Use abseil synchronization module" + }, + "codegen": { + "description": "Build code generator machinery" + } + } +} diff --git a/externals/vcpkg/ports/grppi/fix-build-error.patch b/externals/vcpkg/ports/grppi/fix-build-error.patch new file mode 100755 index 000000000..edbdc3ad5 --- /dev/null +++ b/externals/vcpkg/ports/grppi/fix-build-error.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 09f1f9b..9ef62e9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,7 +13,7 @@ message(STATUS "CMAKE_CXX_COMPILER_ID: " ${CMAKE_CXX_COMPILER_ID} ) + + set(CMAKE_CXX_STANDARD 14) + +-add_compile_options(-Wall -Werror -pedantic -pedantic-errors -Wextra -Weffc++) ++add_compile_options(-Wall -Werror -pedantic -pedantic-errors -Wextra) + + # Set specific options depending on compiler + if ( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" ) diff --git a/externals/vcpkg/ports/grppi/fix-support-other-compilers.patch b/externals/vcpkg/ports/grppi/fix-support-other-compilers.patch new file mode 100755 index 000000000..d347b2674 --- /dev/null +++ b/externals/vcpkg/ports/grppi/fix-support-other-compilers.patch @@ -0,0 +1,44 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 09f1f9b..e7b562b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,22 +20,19 @@ if ( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" ) + if(NOT(${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER 3.9.0)) + message(FATAL_ERROR "Clang version " ${CMAKE_CXX_COMPILER_VERSION} + " not supported. Upgrade to 3.9 or above.") +- else() +- message( STATUS "C++ Compiler is Clang" ) + endif() + elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") + if(NOT(${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER 6.0)) + message(FATAL_ERROR "g++ version " ${CMAKE_CXX_COMPILER_VERSION} + " not supported. Upgrade to 6.0 or above.") + else() +- message( STATUS "C++ Compiler is GNU") + if (${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER 7.0) + #g++ 7 warns in non C++17 for over-aligned new otherwise + add_compile_options(-faligned-new) + endif() + endif() + elseif ( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel" ) +- message(FATAL_ERROR "Intel compiler is not currently supported") ++ message(WARNING "Intel compiler is not currently supported") + # if(NOT(${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER 16.0)) + # message( FATAL_ERROR "Intel version " ${CMAKE_CXX_COMPILER_VERSION} + # " not supported. Upgrade to 16.0 or above.") +@@ -43,12 +40,11 @@ elseif ( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel" ) + # message( STATUS "C++ Compiler is Intel" ) + # message( WARNING "WARNING: GrPPI has not been fully tested with Intel compiler." ) + # endif() +-else() +- message( FATAL_ERROR "Unsupported compiler: " +- ${CMAKE_CXX_COMPILER_ID} +- ${CMAKE_CXX_COMPILER_VERSION}) + endif() + ++message(STATUS "C++ Compiler is " ${CMAKE_CXX_COMPILER_ID} ++ " version " ${CMAKE_CXX_COMPILER_VERSION}) ++ + # GrPPI library + include_directories("${CMAKE_SOURCE_DIR}/include") + diff --git a/externals/vcpkg/ports/grppi/portfile.cmake b/externals/vcpkg/ports/grppi/portfile.cmake new file mode 100755 index 000000000..058f39fd0 --- /dev/null +++ b/externals/vcpkg/ports/grppi/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO arcosuc3m/grppi + REF v0.4.0 + SHA512 f8235af6832958de420a68d4465a6c63701ab4385f3430d32f77c1d5e8212001262aad1a8aae04261ba889d592798cd3963843b190d325bddc1fe7dcc4aebd7d + HEAD_REF master + PATCHES + fix-build-error.patch + fix-support-other-compilers.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DGRPPI_DOXY_ENABLE=OFF + -DGRPPI_EXAMPLE_APPLICATIONS_ENABLE=OFF + -DGRPPI_UNIT_TEST_ENABLE=OFF +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/grppi/vcpkg.json b/externals/vcpkg/ports/grppi/vcpkg.json new file mode 100755 index 000000000..1cc832ab3 --- /dev/null +++ b/externals/vcpkg/ports/grppi/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "grppi", + "version-string": "0.4.0", + "port-version": 1, + "description": "GrPPI is an open source generic and reusable parallel pattern programming interface developed at University Carlos III of Madrid.", + "homepage": "https://github.com/arcosuc3m/grppi" +} diff --git a/externals/vcpkg/ports/gsl-lite/portfile.cmake b/externals/vcpkg/ports/gsl-lite/portfile.cmake new file mode 100755 index 000000000..1cc23b2c7 --- /dev/null +++ b/externals/vcpkg/ports/gsl-lite/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gsl-lite/gsl-lite + REF 4b5e9ab7474841fc2d7efc2e0064ef81785535d1 + SHA512 d5678743f2aebf9b8311e1484d8d22d995f4920632c55ff2f45e463f435a087d25bbf79749c179cfa2f96e799a55e5ee2e59eb2cc6962b8f5922ea56789e16b1 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + CONFIG_PATH "lib/cmake/gsl-lite" +) + +file(WRITE ${CURRENT_PACKAGES_DIR}/include/gsl-lite.hpp "#ifndef GSL_LITE_HPP_VCPKG_COMPAT_HEADER_INCLUDED +#define GSL_LITE_HPP_VCPKG_COMPAT_HEADER_INCLUDED +#pragma message(\"The header is deprecated and provided by Vcpkg for compatibility only; please include instead.\") +#include +#endif // GSL_LITE_HPP_VCPKG_COMPAT_HEADER_INCLUDED") + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/lib" + "${CURRENT_PACKAGES_DIR}/debug" +) + +file(INSTALL + "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/externals/vcpkg/ports/gsl-lite/vcpkg.json b/externals/vcpkg/ports/gsl-lite/vcpkg.json new file mode 100755 index 000000000..0fdc05f41 --- /dev/null +++ b/externals/vcpkg/ports/gsl-lite/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "gsl-lite", + "version": "0.40.0", + "description": "A single-file header-only implementation of ISO C++ Guidelines Support Library (GSL) for C++98, C++11 and later.", + "homepage": "https://github.com/gsl-lite/gsl-lite/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/gsl/0001-configure.patch b/externals/vcpkg/ports/gsl/0001-configure.patch new file mode 100755 index 000000000..404ae879b --- /dev/null +++ b/externals/vcpkg/ports/gsl/0001-configure.patch @@ -0,0 +1,158 @@ +--- +diff --git a/config.h.in b/config.h +index adab7a58d..f6dc2278e 100644 +--- a/config.h.in ++++ b/config.h +@@ -11,19 +11,19 @@ + + /* Define to 1 if you have the declaration of `acosh', and to 0 if you don't. + */ +-#undef HAVE_DECL_ACOSH ++#define HAVE_DECL_ACOSH 1 + + /* Define to 1 if you have the declaration of `asinh', and to 0 if you don't. + */ +-#undef HAVE_DECL_ASINH ++#define HAVE_DECL_ASINH 1 + + /* Define to 1 if you have the declaration of `atanh', and to 0 if you don't. + */ +-#undef HAVE_DECL_ATANH ++#define HAVE_DECL_ATANH 1 + + /* Define to 1 if you have the declaration of `expm1', and to 0 if you don't. + */ +-#undef HAVE_DECL_EXPM1 ++#define HAVE_DECL_EXPM1 1 + + /* Define to 1 if you have the declaration of `feenableexcept', and to 0 if + you don't. */ +@@ -43,31 +43,31 @@ + + /* Define to 1 if you have the declaration of `frexp', and to 0 if you don't. + */ +-#undef HAVE_DECL_FREXP ++#define HAVE_DECL_FREXP 1 + + /* Define to 1 if you have the declaration of `hypot', and to 0 if you don't. + */ +-#undef HAVE_DECL_HYPOT ++#define HAVE_DECL_HYPOT 1 + + /* Define to 1 if you have the declaration of `isfinite', and to 0 if you + don't. */ +-#undef HAVE_DECL_ISFINITE ++#define HAVE_DECL_ISFINITE 1 + + /* Define to 1 if you have the declaration of `isinf', and to 0 if you don't. + */ +-#undef HAVE_DECL_ISINF ++#define HAVE_DECL_ISINF 1 + + /* Define to 1 if you have the declaration of `isnan', and to 0 if you don't. + */ +-#undef HAVE_DECL_ISNAN ++#define HAVE_DECL_ISNAN 1 + + /* Define to 1 if you have the declaration of `ldexp', and to 0 if you don't. + */ +-#undef HAVE_DECL_LDEXP ++#define HAVE_DECL_LDEXP 1 + + /* Define to 1 if you have the declaration of `log1p', and to 0 if you don't. + */ +-#undef HAVE_DECL_LOG1P ++#define HAVE_DECL_LOG1P 1 + + /* Define to 1 if you have the header file. */ + #undef HAVE_DLFCN_H +@@ -76,13 +76,13 @@ + #undef HAVE_DOPRNT + + /* Defined if you have ansi EXIT_SUCCESS and EXIT_FAILURE in stdlib.h */ +-#undef HAVE_EXIT_SUCCESS_AND_FAILURE ++#define HAVE_EXIT_SUCCESS_AND_FAILURE 1 + + /* Defined on architectures with excess floating-point precision */ + #undef HAVE_EXTENDED_PRECISION_REGISTERS + + /* Define if x86 processor has sse extensions. */ +-#undef HAVE_FPU_X86_SSE ++#define HAVE_FPU_X86_SSE 1 + + /* Define to 1 if you have the header file. */ + #undef HAVE_IEEEFP_H +@@ -97,43 +97,43 @@ + #undef HAVE_INLINE + + /* Define to 1 if you have the header file. */ +-#undef HAVE_INTTYPES_H ++#define HAVE_INTTYPES_H 1 + + /* Define to 1 if you have the `m' library (-lm). */ + #undef HAVE_LIBM + + /* Define to 1 if you have the `memcpy' function. */ +-#undef HAVE_MEMCPY ++#define HAVE_MEMCPY 1 + + /* Define to 1 if you have the `memmove' function. */ +-#undef HAVE_MEMMOVE ++#define HAVE_MEMMOVE 1 + + /* Define this if printf can handle %Lf for long double */ + #undef HAVE_PRINTF_LONGDOUBLE + + /* Define to 1 if you have the header file. */ +-#undef HAVE_STDINT_H ++#define HAVE_STDINT_H 1 + + /* Define to 1 if you have the header file. */ +-#undef HAVE_STDIO_H ++#define HAVE_STDIO_H 1 + + /* Define to 1 if you have the header file. */ +-#undef HAVE_STDLIB_H ++#define HAVE_STDLIB_H 1 + + /* Define to 1 if you have the `strdup' function. */ +-#undef HAVE_STRDUP ++#define HAVE_STRDUP 1 + + /* Define to 1 if you have the header file. */ + #undef HAVE_STRINGS_H + + /* Define to 1 if you have the header file. */ +-#undef HAVE_STRING_H ++#define HAVE_STRING_H 1 + + /* Define to 1 if you have the `strtol' function. */ +-#undef HAVE_STRTOL ++#define HAVE_STRTOL 1 + + /* Define to 1 if you have the `strtoul' function. */ +-#undef HAVE_STRTOUL ++#define HAVE_STRTOUL 1 + + /* Define to 1 if you have the header file. */ + #undef HAVE_SYS_STAT_H +@@ -145,7 +145,7 @@ + #undef HAVE_UNISTD_H + + /* Define to 1 if you have the `vprintf' function. */ +-#undef HAVE_VPRINTF ++#define HAVE_VPRINTF 1 + + /* Define if you need to hide the static definitions of inline functions */ + #undef HIDE_INLINE_STATIC +@@ -180,7 +180,7 @@ + /* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ +-#undef STDC_HEADERS ++#define STDC_HEADERS 1 + + /* Version number of package */ + #undef VERSION +--- + diff --git a/externals/vcpkg/ports/gsl/0002-add-fp-control.patch b/externals/vcpkg/ports/gsl/0002-add-fp-control.patch new file mode 100755 index 000000000..dceeb3881 --- /dev/null +++ b/externals/vcpkg/ports/gsl/0002-add-fp-control.patch @@ -0,0 +1,97 @@ +--- + ieee-utils/fp-win.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + ieee-utils/fp.c | 2 ++ + 2 files changed, 72 insertions(+) + create mode 100644 ieee-utils/fp-win.c + +diff --git a/ieee-utils/fp-win.c b/ieee-utils/fp-win.c +new file mode 100644 +index 0000000..e024eae +--- /dev/null ++++ b/ieee-utils/fp-win.c +@@ -0,0 +1,70 @@ ++/* fp-win.c ++ * ++ * Author: Brian Gladman ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or (at ++ * your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ */ ++ ++#include ++ ++#include ++#include ++#include ++ ++const char *fp_env_string = "round-to-nearest,double-precision,mask-all"; ++ ++int ++gsl_ieee_set_mode (int precision, int rounding, int exception_mask) ++{ ++ unsigned int old, mode = _DN_SAVE, mask = _MCW_DN | _MCW_RC | _MCW_EM; ++ ++ switch(precision) ++ { ++ case GSL_IEEE_SINGLE_PRECISION: mode |= _PC_24; break; ++ case GSL_IEEE_EXTENDED_PRECISION: mode |= _PC_64; break; ++ case GSL_IEEE_DOUBLE_PRECISION: ++ default: mode |= _PC_53; ++ } ++#ifndef _M_AMD64 ++ mask |= _MCW_PC; ++#endif ++ ++ switch(rounding) ++ { ++ case GSL_IEEE_ROUND_DOWN: mode |= _RC_DOWN; break; ++ case GSL_IEEE_ROUND_UP: mode |= _RC_UP; break; ++ case GSL_IEEE_ROUND_TO_ZERO: mode |= _RC_CHOP; break; ++ case GSL_IEEE_ROUND_TO_NEAREST: ++ default: mode |= _RC_NEAR; ++ } ++ ++ if(exception_mask & GSL_IEEE_MASK_INVALID) ++ mode |= _EM_INVALID; ++ if(exception_mask & GSL_IEEE_MASK_DENORMALIZED) ++ mode |= _EM_DENORMAL; ++ if(exception_mask & GSL_IEEE_MASK_DIVISION_BY_ZERO) ++ mode |= _EM_ZERODIVIDE; ++ if(exception_mask & GSL_IEEE_MASK_OVERFLOW) ++ mode |= _EM_OVERFLOW; ++ if(exception_mask & GSL_IEEE_MASK_UNDERFLOW) ++ mode |= _EM_UNDERFLOW; ++ if(exception_mask & GSL_IEEE_TRAP_INEXACT) ++ mode &= ~_EM_INEXACT; ++ else ++ mode |= _EM_INEXACT; ++ ++ _controlfp_s( &old, mode, mask); ++ return GSL_SUCCESS; ++} +diff --git a/ieee-utils/fp.c b/ieee-utils/fp.c +index 445a14f..b6ae5af 100644 +--- a/ieee-utils/fp.c ++++ b/ieee-utils/fp.c +@@ -45,6 +45,8 @@ + #endif + #elif HAVE_DECL_FEENABLEEXCEPT || HAVE_DECL_FESETTRAPENABLE + #include "fp-gnuc99.c" ++#elif _MSC_VER ++#include "fp-win.c" + #else + #include "fp-unknown.c" + #endif +-- + diff --git a/externals/vcpkg/ports/gsl/CMakeLists.txt b/externals/vcpkg/ports/gsl/CMakeLists.txt new file mode 100755 index 000000000..7e522cc5c --- /dev/null +++ b/externals/vcpkg/ports/gsl/CMakeLists.txt @@ -0,0 +1,86 @@ +cmake_minimum_required(VERSION 3.8) +project(gsl C) + +option(INSTALL_HEADERS "Install public header files" ON) + +# Function to extract parameter from makefile. Space separated values are returned as lists +function(extract_from_makefile PATTERN RETURN FILEPATH) + file(READ ${FILEPATH} MAKEFILE_CONTENT) + string(REGEX MATCH "${PATTERN}" CONTENTS "${MAKEFILE_CONTENT}") + set(CONTENTS ${CMAKE_MATCH_1}) + # Split string into list + string(REGEX REPLACE "([\t ]+(\\\\\n)?)+" ";" CONTENTS "${CONTENTS}") + string(REGEX REPLACE "[\t ]*\\\\\n[\t ]*;" "" CONTENTS "${CONTENTS}") + if("${CONTENTS}" STREQUAL "") + message(AUTHOR_WARNING "No match for \"${PATTERN}\" found in file ${FILEPATH}") + endif() + # Return + set(${RETURN} ${CONTENTS} PARENT_SCOPE) +endfunction(extract_from_makefile) + +# Function to extract C sources from makefile +function(extract_sources SUBFOLDER ALLSOURCES) + extract_from_makefile("lib[a-zA-Z1-9_]*_la_SOURCES[ \t]*=[ \t]*(((\\\\\n)?[^\n])*)" SOURCEFILES "${SUBFOLDER}/Makefile.am") + # Add the folder in front of the file names + string(REGEX REPLACE "([^;]+)" "${SUBFOLDER}/\\1" SOURCEFILES "${SOURCEFILES}") + # Return + set(${ALLSOURCES} ${${ALLSOURCES}} ${SOURCEFILES} PARENT_SCOPE) +endfunction(extract_sources) + +set(SOURCES) +set(CBLAS_SOURCES) +extract_from_makefile("SUBDIRS = (((\\\\\n)?[^\n])*)" FOLDERS "./Makefile.am") +extract_sources("." SOURCES) +foreach(DIR IN LISTS FOLDERS) + if("${DIR}" STREQUAL "cblas") + extract_sources("${DIR}" CBLAS_SOURCES) + else() + extract_sources("${DIR}" SOURCES) + endif() +endforeach() + +file(READ gsl_types.h GSLTYPES_H) +string(REPLACE "#ifdef WIN32" "#if 1 /*WIN32*/" GSLTYPES_H "${GSLTYPES_H}") +if(BUILD_SHARED_LIBS) + string(REPLACE "# ifdef GSL_DLL" "# if 1 /*GSL_DLL*/" GSLTYPES_H "${GSLTYPES_H}") +endif() +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/gsl_types.h "${GSLTYPES_H}") + +file(GLOB_RECURSE PUBLIC_HEADERS gsl*.h) +list(APPEND PUBLIC_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/gsl_types.h) + +# The debug libraries have a "d" postfix so that CMake's FindGSL.cmake +# module can distinguish between Release and Debug libraries +set(CMAKE_DEBUG_POSTFIX "d") + +add_library(gslcblas ${CBLAS_SOURCES}) +set_target_properties(gslcblas PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) + +add_library(gsl ${SOURCES}) +set_target_properties(gsl PROPERTIES DEFINE_SYMBOL DLL_EXPORT WINDOWS_EXPORT_ALL_SYMBOLS ON) +target_link_libraries(gsl PUBLIC gslcblas) + + +if(INSTALL_HEADERS) + set_target_properties(gsl PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADERS}") +endif() +target_include_directories(gslcblas PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(gsl PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) +# For the build, we need to copy all headers to the gsl directory +file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gsl) +file(COPY ${PUBLIC_HEADERS} DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gsl") + +set(TARGET_INSTALL_OPTIONS) +if(INSTALL_HEADERS) + set(TARGET_INSTALL_OPTIONS PUBLIC_HEADER DESTINATION include/gsl) +endif() + +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/gsl.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/gsl.pc" @ONLY) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gsl.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + +install(TARGETS gsl gslcblas + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + ${TARGET_INSTALL_OPTIONS} +) diff --git a/externals/vcpkg/ports/gsl/portfile.cmake b/externals/vcpkg/ports/gsl/portfile.cmake new file mode 100755 index 000000000..a107ce7b7 --- /dev/null +++ b/externals/vcpkg/ports/gsl/portfile.cmake @@ -0,0 +1,31 @@ +set(GSL_VERSION 2.7.1) + +vcpkg_download_distfile(ARCHIVE + URLS "https://ftp.gnu.org/gnu/gsl/gsl-${GSL_VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gsl/gsl-${GSL_VERSION}.tar.gz" + FILENAME "gsl-${GSL_VERSION}.tar.gz" + SHA512 3300a748b63b583374701d5ae2a9db7349d0de51061a9f98e7c145b2f7de9710b3ad58b3318d0be2a9a287ace4cc5735bb9348cdf48075b98c1f6cc1029df131 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + 0001-configure.patch + 0002-add-fp-control.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG -DINSTALL_HEADERS=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) \ No newline at end of file diff --git a/externals/vcpkg/ports/gsl/usage b/externals/vcpkg/ports/gsl/usage new file mode 100755 index 000000000..f1ae92436 --- /dev/null +++ b/externals/vcpkg/ports/gsl/usage @@ -0,0 +1,4 @@ +The package gsl is compatible with built-in CMake targets: + + find_package(GSL REQUIRED) + target_link_libraries(main PRIVATE GSL::gsl GSL::gslcblas) diff --git a/externals/vcpkg/ports/gsl/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/gsl/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..7a3ea854c --- /dev/null +++ b/externals/vcpkg/ports/gsl/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,11 @@ +_find_package(${ARGS}) +if(GSL_FOUND AND TARGET GSL::gsl) + set_property( TARGET GSL::gslcblas APPEND PROPERTY IMPORTED_CONFIGURATIONS Release ) + set_property( TARGET GSL::gsl APPEND PROPERTY IMPORTED_CONFIGURATIONS Release ) + if( EXISTS "${GSL_LIBRARY_DEBUG}" AND EXISTS "${GSL_CBLAS_LIBRARY_DEBUG}") + set_property( TARGET GSL::gsl APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) + set_target_properties( GSL::gsl PROPERTIES IMPORTED_LOCATION_DEBUG "${GSL_LIBRARY_DEBUG}" ) + set_property( TARGET GSL::gslcblas APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) + set_target_properties( GSL::gslcblas PROPERTIES IMPORTED_LOCATION_DEBUG "${GSL_CBLAS_LIBRARY_DEBUG}" ) + endif() +endif() \ No newline at end of file diff --git a/externals/vcpkg/ports/gsl/vcpkg.json b/externals/vcpkg/ports/gsl/vcpkg.json new file mode 100755 index 000000000..44c14d97f --- /dev/null +++ b/externals/vcpkg/ports/gsl/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "gsl", + "version": "2.7.1", + "port-version": 1, + "description": "The GNU Scientific Library is a numerical library for C and C++ programmers", + "homepage": "https://www.gnu.org/software/gsl/", + "license": "GPL-3.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/gsoap/fix-build-in-windows.patch b/externals/vcpkg/ports/gsoap/fix-build-in-windows.patch new file mode 100755 index 000000000..e661fb7c7 --- /dev/null +++ b/externals/vcpkg/ports/gsoap/fix-build-in-windows.patch @@ -0,0 +1,307 @@ + gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln | 8 +- + .../soapcpp2/soapcpp2/soapcpp2.vcxproj | 114 +++++++++++++++++ + gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln | 8 +- + .../VisualStudio2005/wsdl2h/wsdl2h/wsdl2h.vcxproj | 139 +++++++++++++++++++++ + 4 files changed, 263 insertions(+), 6 deletions(-) + +diff --git a/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln b/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln +index 68bacf1..5d74e6b 100644 +--- a/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln ++++ b/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln +@@ -1,7 +1,9 @@ +  +-Microsoft Visual Studio Solution File, Format Version 9.00 +-# Visual C++ Express 2005 +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soapcpp2", "soapcpp2\soapcpp2.vcproj", "{BDD1B293-CE39-4BEC-8E63-8B1621F3EB56}" ++Microsoft Visual Studio Solution File, Format Version 12.00 ++# Visual Studio 14 ++VisualStudioVersion = 14.0.25420.1 ++MinimumVisualStudioVersion = 10.0.40219.1 ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soapcpp2", "soapcpp2\soapcpp2.vcxproj", "{BDD1B293-CE39-4BEC-8E63-8B1621F3EB56}" + EndProject + Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution +diff --git a/gsoap/VisualStudio2005/soapcpp2/soapcpp2/soapcpp2.vcxproj b/gsoap/VisualStudio2005/soapcpp2/soapcpp2/soapcpp2.vcxproj +new file mode 100644 +index 0000000..17f1d75 +--- /dev/null ++++ b/gsoap/VisualStudio2005/soapcpp2/soapcpp2/soapcpp2.vcxproj +@@ -0,0 +1,114 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Release ++ Win32 ++ ++ ++ ++ {BDD1B293-CE39-4BEC-8E63-8B1621F3EB56} ++ soapcpp2 ++ Win32Proj ++ 8.1 ++ ++ ++ ++ Application ++ v140 ++ Unicode ++ true ++ ++ ++ Application ++ v140 ++ Unicode ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>14.0.25431.1 ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ true ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ false ++ ++ ++ ++ Disabled ++ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ Level3 ++ EditAndContinue ++ ++ ++ kernel32.lib ++ true ++ Console ++ MachineX86 ++ ++ ++ ++ ++ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ MultiThreaded ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ kernel32.lib ++ true ++ Console ++ true ++ true ++ MachineX86 ++ ++ ++ ++ ++ ++ ++ ++ $(IntDir)%(Filename)1.obj ++ $(IntDir)%(Filename)1.xdc ++ $(IntDir)%(Filename)1.obj ++ $(IntDir)%(Filename)1.xdc ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff --git a/gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln b/gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln +index ffa3fa4..3f23607 100644 +--- a/gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln ++++ b/gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln +@@ -1,7 +1,9 @@ +  +-Microsoft Visual Studio Solution File, Format Version 9.00 +-# Visual C++ Express 2005 +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wsdl2h", "wsdl2h\wsdl2h.vcproj", "{6CBC554A-4FFB-461F-91D4-11B358802815}" ++Microsoft Visual Studio Solution File, Format Version 12.00 ++# Visual Studio 14 ++VisualStudioVersion = 14.0.25420.1 ++MinimumVisualStudioVersion = 10.0.40219.1 ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wsdl2h", "wsdl2h\wsdl2h.vcxproj", "{6CBC554A-4FFB-461F-91D4-11B358802815}" + EndProject + Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution +diff --git a/gsoap/VisualStudio2005/wsdl2h/wsdl2h/wsdl2h.vcxproj b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/wsdl2h.vcxproj +new file mode 100644 +index 0000000..abf3ea6 +--- /dev/null ++++ b/gsoap/VisualStudio2005/wsdl2h/wsdl2h/wsdl2h.vcxproj +@@ -0,0 +1,139 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Release ++ Win32 ++ ++ ++ ++ {6CBC554A-4FFB-461F-91D4-11B358802815} ++ wsdl2h ++ Win32Proj ++ 8.1 ++ ++ ++ ++ Application ++ v140 ++ Unicode ++ true ++ ++ ++ Application ++ v140 ++ Unicode ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>14.0.25431.1 ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ true ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ false ++ ++ ++ ++ Disabled ++ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ Level3 ++ EditAndContinue ++ ++ ++ kernel32.lib ++ true ++ Console ++ MachineX86 ++ ++ ++ ++ ++ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ MultiThreaded ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ kernel32.lib ++ true ++ Console ++ true ++ true ++ MachineX86 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Parsing WSDL and Schema definitions ++ soapcpp2.exe -SC -pwsdl %(Filename)%(Extension) ++ ++ wsdlStub.h wsdlH.h wsdlC.cpp;%(Outputs) ++ Parsing WSDL and Schema definitions ++ soapcpp2.exe -SC -pwsdl %(Filename)%(Extension) ++ ++ wsdlStub.h wsdlH.h wsdlC.cpp;%(Outputs) ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file diff --git a/externals/vcpkg/ports/gsoap/portfile.cmake b/externals/vcpkg/ports/gsoap/portfile.cmake new file mode 100755 index 000000000..d60732746 --- /dev/null +++ b/externals/vcpkg/ports/gsoap/portfile.cmake @@ -0,0 +1,60 @@ +message(FATAL_ERROR "gsoap does not offer permanent public downloads of its sources; all versions except the latest are removed from sourceforge. Therefore, vcpkg cannot support this library directly in the central catalog. If you would like to use gsoap, you can use this port as a starting point (${CMAKE_CURRENT_LIST_DIR}) and update it to use a permanent commercial copy or the latest public download. Do not report issues with this library to the vcpkg GitHub.") + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO gsoap2 + REF gsoap-2.8 + FILENAME "gsoap_2.8.112.zip" + SHA512 0c2562891a738916235f1d4b19d8419d96d0466ca4b729766551183c7b9b90cbe35bbf7fe126b3ea6b18138cbf591c9a9b5b73ddea7152ccdd2f790777c2b6d8 + PATCHES fix-build-in-windows.patch +) + +set(BUILD_ARCH "Win32") + +# Handle binary files and includes +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/gsoap ${CURRENT_PACKAGES_DIR}/debug/tools) + +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_build_msbuild( + USE_VCPKG_INTEGRATION + PROJECT_PATH ${SOURCE_PATH}/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln + PLATFORM ${BUILD_ARCH} + TARGET Build + ) + vcpkg_build_msbuild( + USE_VCPKG_INTEGRATION + PROJECT_PATH ${SOURCE_PATH}/gsoap/VisualStudio2005/wsdl2h/wsdl2h.sln + PLATFORM ${BUILD_ARCH} + TARGET Build + ) + + file(COPY ${SOURCE_PATH}/gsoap/VisualStudio2005/soapcpp2/release/soapcpp2.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/gsoap/) + file(COPY ${SOURCE_PATH}/gsoap/VisualStudio2005/wsdl2h/release/wsdl2h.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/gsoap/) + file(COPY ${SOURCE_PATH}/gsoap/VisualStudio2005/soapcpp2/debug/soapcpp2.exe DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/gsoap/) + file(COPY ${SOURCE_PATH}/gsoap/VisualStudio2005/wsdl2h/debug/wsdl2h.exe DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/gsoap/) +else() + message(FATAL_ERROR "Sorry but gsoap only can be build in Windows temporary") +endif() + + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${SOURCE_PATH}/gsoap/stdsoap2.h ${SOURCE_PATH}/gsoap/stdsoap2.c ${SOURCE_PATH}/gsoap/stdsoap2.cpp ${SOURCE_PATH}/gsoap/dom.c ${SOURCE_PATH}/gsoap/dom.cpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle import files +file(COPY ${SOURCE_PATH}/gsoap/import DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +# Handle custom files +file(COPY ${SOURCE_PATH}/gsoap/custom DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +# Handle plugin files +file(COPY ${SOURCE_PATH}/gsoap/plugin DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +# Cleanup surplus empty directory +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/gsoap/plugin/.deps") + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/INSTALL.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME install) +file(INSTALL ${SOURCE_PATH}/README.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME readme) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/gsoap/vcpkg.json b/externals/vcpkg/ports/gsoap/vcpkg.json new file mode 100755 index 000000000..4fce1bad3 --- /dev/null +++ b/externals/vcpkg/ports/gsoap/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "gsoap", + "version": "2.8.112", + "port-version": 1, + "description": "The gSOAP toolkit is a C and C++ software development toolkit for SOAP and REST XML Web services and generic C/C++ XML data bindings.", + "homepage": "https://sourceforge.net/projects/gsoap2/", + "supports": "!(linux | osx | arm | uwp)" +} diff --git a/externals/vcpkg/ports/gst-rtsp-server/portfile.cmake b/externals/vcpkg/ports/gst-rtsp-server/portfile.cmake new file mode 100755 index 000000000..d184c1aff --- /dev/null +++ b/externals/vcpkg/ports/gst-rtsp-server/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH SOURCE_PATH + REPO gstreamer/gst-rtsp-server + REF 1.19.2 + SHA512 a227471c790ea4f399748233128558cbd43e941ad9774b99ecd88c1b521a0adfe2932212e7d854f041892a7c3bfc63a1b3ea9dd06d2f0b75b7eee38e392d8c51 + HEAD_REF master +) + +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -Dgstreamer:examples=disabled + -Dgstreamer:tests=disabled + -Dpackage-origin="vcpkg" +) + +vcpkg_install_meson() + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(GLOB DBG_BINS ${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.dll + ${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.pdb + ) + file(COPY ${DBG_BINS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(GLOB REL_BINS ${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.dll + ${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.pdb + ) + file(COPY ${REL_BINS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE ${DBG_BINS} ${REL_BINS}) +endif() + +vcpkg_fixup_pkgconfig() + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/gst-rtsp-server/vcpkg.json b/externals/vcpkg/ports/gst-rtsp-server/vcpkg.json new file mode 100755 index 000000000..cd58d37f0 --- /dev/null +++ b/externals/vcpkg/ports/gst-rtsp-server/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "gst-rtsp-server", + "version": "1.19.2", + "port-version": 1, + "description": "gst-rtsp-server is a library on top of GStreamer for building an RTSP server", + "dependencies": [ + "gstreamer", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/gstreamer/gstreamer-disable-hot-doc.patch b/externals/vcpkg/ports/gstreamer/gstreamer-disable-hot-doc.patch new file mode 100755 index 000000000..e952046f7 --- /dev/null +++ b/externals/vcpkg/ports/gstreamer/gstreamer-disable-hot-doc.patch @@ -0,0 +1,34 @@ +diff --git a/meson.build b/meson.build +index 4a2eb27..1316366 100644 +--- a/meson.build ++++ b/meson.build +@@ -70,19 +70,19 @@ endif + + # Ordered list of subprojects (dict has no ordering guarantees) + subprojects = [ +- ['gstreamer', {'build-hotdoc': true}], +- ['gst-plugins-base', {'option': get_option('base'), 'build-hotdoc': true}], +- ['gst-plugins-good', {'option': get_option('good'), 'build-hotdoc': true}], ++ ['gstreamer', {'build-hotdoc': false}], ++ ['gst-plugins-base', {'option': get_option('base'), 'build-hotdoc': false}], ++ ['gst-plugins-good', {'option': get_option('good'), 'build-hotdoc': false}], + ['libnice', { 'option': get_option('libnice'), 'match_gst_version': false}], + ['gst-plugins-bad', { 'option': get_option('bad'), 'build-hotdoc': true}], +- ['gst-plugins-ugly', { 'option': get_option('ugly'), 'build-hotdoc': true}], +- ['gst-libav', { 'option': get_option('libav'), 'build-hotdoc': true}], +- ['gst-rtsp-server', { 'option': get_option('rtsp_server'), 'build-hotdoc': true}], +- ['gst-devtools', { 'option': get_option('devtools'), 'build-hotdoc': true }], ++ ['gst-plugins-ugly', { 'option': get_option('ugly'), 'build-hotdoc': false}], ++ ['gst-libav', { 'option': get_option('libav'), 'build-hotdoc': false}], ++ ['gst-rtsp-server', { 'option': get_option('rtsp_server'), 'build-hotdoc': false}], ++ ['gst-devtools', { 'option': get_option('devtools'), 'build-hotdoc': false }], + ['gst-integration-testsuites', { 'option': get_option('devtools') }], +- ['gst-editing-services', { 'option': get_option('ges'), 'build-hotdoc': true}], +- ['gstreamer-vaapi', { 'option': get_option('vaapi'), 'build-hotdoc': true}], +- ['gst-omx', { 'option': get_option('omx'), 'build-hotdoc': true}], ++ ['gst-editing-services', { 'option': get_option('ges'), 'build-hotdoc': false}], ++ ['gstreamer-vaapi', { 'option': get_option('vaapi'), 'build-hotdoc': false}], ++ ['gst-omx', { 'option': get_option('omx'), 'build-hotdoc': false}], + ['gstreamer-sharp', { 'option': get_option('sharp') }], + ['pygobject', { 'option': get_option('python'), 'match_gst_version': false }], + ['gst-python', { 'option': get_option('python')}], diff --git a/externals/vcpkg/ports/gstreamer/gstreamer-disable-no-unused.patch b/externals/vcpkg/ports/gstreamer/gstreamer-disable-no-unused.patch new file mode 100755 index 000000000..4fd3e068f --- /dev/null +++ b/externals/vcpkg/ports/gstreamer/gstreamer-disable-no-unused.patch @@ -0,0 +1,15 @@ +diff --git a/meson.build b/meson.build +index bed8c4e..772809e 100644 +--- a/meson.build ++++ b/meson.build +@@ -435,8 +435,9 @@ if cc.has_header('execinfo.h') + endif + endif + ++build_system = build_machine.system() + gst_debug = get_option('gst_debug') +-if not gst_debug ++if not gst_debug and build_system != 'windows' + add_project_arguments(['-Wno-unused'], language: 'c') + endif + diff --git a/externals/vcpkg/ports/gstreamer/plugin-base-disable-no-unused.patch b/externals/vcpkg/ports/gstreamer/plugin-base-disable-no-unused.patch new file mode 100755 index 000000000..dbd5d345f --- /dev/null +++ b/externals/vcpkg/ports/gstreamer/plugin-base-disable-no-unused.patch @@ -0,0 +1,26 @@ +diff --git a/meson.build b/meson.build +index 9b00253..495671e 100644 +--- a/meson.build ++++ b/meson.build +@@ -388,10 +388,11 @@ int32x4_t testfunc(int16_t *a, int16_t *b) { + endif + endif + ++build_system = build_machine.system() + if gst_dep.type_name() == 'internal' + gst_proj = subproject('gstreamer') + +- if not gst_proj.get_variable('gst_debug') ++ if not gst_proj.get_variable('gst_debug') and build_system != 'windows' + message('GStreamer debug system is disabled') + add_project_arguments('-Wno-unused', language: 'c') + else +@@ -404,7 +405,7 @@ else + #include + #ifdef GST_DISABLE_GST_DEBUG + #error "debugging disabled, make compiler fail" +-#endif''' , dependencies: gst_dep) ++#endif''' , dependencies: gst_dep) and build_system != 'windows' + message('GStreamer debug system is disabled') + add_project_arguments('-Wno-unused', language: 'c') + else diff --git a/externals/vcpkg/ports/gstreamer/plugins-base-use-zlib.patch b/externals/vcpkg/ports/gstreamer/plugins-base-use-zlib.patch new file mode 100755 index 000000000..57b997ca7 --- /dev/null +++ b/externals/vcpkg/ports/gstreamer/plugins-base-use-zlib.patch @@ -0,0 +1,13 @@ +diff --git a/gst-libs/gst/tag/meson.build b/gst-libs/gst/tag/meson.build +index 5ec3739..a6cff8d 100644 +--- a/gst-libs/gst/tag/meson.build ++++ b/gst-libs/gst/tag/meson.build +@@ -70,7 +70,7 @@ endif + core_conf.set('HAVE_ISO_CODES', have_iso_codes) + + # could drop optional zlib dep and use g_zlib_decompressor_new() +-zlib_dep = dependency('zlib', required : false) ++zlib_dep = dependency('zlib', required : true) + if not zlib_dep.found() + zlib_dep = cc.find_library('z', required : false) + if not zlib_dep.found() or not cc.has_header('zlib.h') diff --git a/externals/vcpkg/ports/gstreamer/plugins-good-use-zlib.patch b/externals/vcpkg/ports/gstreamer/plugins-good-use-zlib.patch new file mode 100755 index 000000000..efea351f1 --- /dev/null +++ b/externals/vcpkg/ports/gstreamer/plugins-good-use-zlib.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 9de3b01..091a7f0 100644 +--- a/meson.build ++++ b/meson.build +@@ -326,7 +326,7 @@ if have_gstgl + endif + endif + +-zlib_dep = dependency('zlib', required : false) ++zlib_dep = dependency('zlib', required : true) + if not zlib_dep.found() + zlib_dep = cc.find_library('z', required : false) + if not zlib_dep.found() or not cc.has_header('zlib.h') diff --git a/externals/vcpkg/ports/gstreamer/plugins-ugly-disable-doc.patch b/externals/vcpkg/ports/gstreamer/plugins-ugly-disable-doc.patch new file mode 100755 index 000000000..46adcbeeb --- /dev/null +++ b/externals/vcpkg/ports/gstreamer/plugins-ugly-disable-doc.patch @@ -0,0 +1,16 @@ +diff --git a/meson.build b/meson.build +index c5c78fc..14be48c 100644 +--- a/meson.build ++++ b/meson.build +@@ -281,7 +281,11 @@ if find_program('xgettext', required : get_option('nls')).found() + cdata.set('ENABLE_NLS', 1) + subdir('po') + endif ++ ++enable_doc = get_option('doc') ++if enable_doc.enabled() + subdir('docs') ++endif + subdir('scripts') + + # Set release date diff --git a/externals/vcpkg/ports/gstreamer/portfile.cmake b/externals/vcpkg/ports/gstreamer/portfile.cmake new file mode 100755 index 000000000..25cfb74b8 --- /dev/null +++ b/externals/vcpkg/ports/gstreamer/portfile.cmake @@ -0,0 +1,307 @@ +vcpkg_from_github( + OUT_SOURCE_PATH GST_BUILD_SOURCE_PATH + REPO gstreamer/gst-build + REF 1.19.2 + SHA512 d6b8e9fc195a60dfb83fe8a49040c21ca5603e3ada2036d56851e6e61a1cd2653ad45f33e39388bde859dfb4806f4a60d9dbfac5fe41b6d2a8b395c44d4525e3 + HEAD_REF master + PATCHES gstreamer-disable-hot-doc.patch +) +vcpkg_from_github( + OUT_SOURCE_PATH GST_SOURCE_PATH + REPO gstreamer/gstreamer + REF 1.19.2 + SHA512 6070f1febf2a1bcc6e68f1e03c1b76891db210773065696e26fac20f0bd3ff47e1634222a49f93a10f6e47717ff21084c9ae0feed6a20facb9650aeb879cc380 + HEAD_REF master + PATCHES gstreamer-disable-no-unused.patch +) +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND PLUGIN_BASE_PATCHES plugins-base-use-zlib.patch plugin-base-disable-no-unused.patch) + list(APPEND PLUGIN_GOOD_PATCHES plugins-good-use-zlib.patch) + list(APPEND PLUGIN_UGLY_PATCHES plugins-ugly-disable-doc.patch) +endif() +vcpkg_from_github( + OUT_SOURCE_PATH GST_PLUGIN_BASE_SOURCE_PATH + REPO gstreamer/gst-plugins-base + REF 1.19.2 + SHA512 d2005e6a3bda5f08395b131347e8f4054c2469e04e65d1acc1a1572bf10d81d4dad4e43d6a8600346b6175a2310f81157a0cd27398ef69b5363b16346febfb39 + HEAD_REF master + PATCHES ${PLUGIN_BASE_PATCHES} +) +vcpkg_from_github( + OUT_SOURCE_PATH GST_PLUGIN_GOOD_SOURCE_PATH + REPO gstreamer/gst-plugins-good + REF 1.19.2 + SHA512 71e9f36d407db3b75d9a68f6447093aa011b2b586b06e0a1bb79c7db37c9114de505699e99a4dad06d8d9c742e91f48dd35457283babe440f88a9e40d3da465b + HEAD_REF master + PATCHES ${PLUGIN_GOOD_PATCHES} +) +vcpkg_from_github( + OUT_SOURCE_PATH GST_PLUGIN_BAD_SOURCE_PATH + REPO gstreamer/gst-plugins-bad + REF 1.19.2 + SHA512 f63ca3abf380bba92dca4ac3a51cba5ea95093693cf64d167a7a9c0bf6341c35a74fd42332673dbd1581ea70da0a35026aa3e2ce99b5e573268ccb55b5491c1d + HEAD_REF master +) +vcpkg_from_github( + OUT_SOURCE_PATH GST_PLUGIN_UGLY_SOURCE_PATH + REPO gstreamer/gst-plugins-ugly + REF 1.19.2 + SHA512 70dcd4a36d3bd35f680eaa3c980842fbb57f55f17d1453c6a95640709b1b33a263689bf54caa367154267d281e5474686fedaa980de24094de91886a57b6547a + HEAD_REF master + PATCHES ${PLUGIN_UGLY_PATCHES} +) +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH GST_MESON_PORTS_SOURCE_PATH + REPO gstreamer/meson-ports/gl-headers + REF 5c8c7c0d3ca1f0b783272dac0b95e09414e49bc8 # master commit. Date 2021-04-21 + SHA512 d001535e1c1b5bb515ac96c7d15b25ca51460a5af0c858df53b11c7bae87c4a494e4a1b1b9c3c41a5989001db083645dde2054b82acbbeab7f9939308b676f9c + HEAD_REF master +) + +if (NOT EXISTS "${GST_BUILD_SOURCE_PATH}/subprojects/gstreamer") + file(RENAME "${GST_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gstreamer") +endif() +if (NOT EXISTS "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-base") + file(RENAME "${GST_PLUGIN_BASE_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-base") +endif() +if (NOT EXISTS "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-good") + file(RENAME "${GST_PLUGIN_GOOD_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-good") +endif() +if (NOT EXISTS "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-bad") + file(RENAME "${GST_PLUGIN_BAD_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-bad") +endif() +if (NOT EXISTS "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-ugly") + file(RENAME "${GST_PLUGIN_UGLY_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-ugly") +endif() +if (NOT EXISTS "${GST_BUILD_SOURCE_PATH}/subprojects/gl-headers") + file(RENAME "${GST_MESON_PORTS_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gl-headers") +endif() + +if(VCPKG_TARGET_IS_OSX) + # In Darwin platform, there can be an old version of `bison`, + # Which can't be used for `gst-build`. It requires 2.4+ + vcpkg_find_acquire_program(BISON) + execute_process( + COMMAND ${BISON} --version + OUTPUT_VARIABLE BISON_OUTPUT + ) + string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" BISON_VERSION "${BISON_OUTPUT}") + set(BISON_MAJOR ${CMAKE_MATCH_1}) + set(BISON_MINOR ${CMAKE_MATCH_2}) + message(STATUS "Using bison: ${BISON_MAJOR}.${BISON_MINOR}.${CMAKE_MATCH_3}") + if(NOT (BISON_MAJOR GREATER_EQUAL 2 AND BISON_MINOR GREATER_EQUAL 4)) + message(WARNING "'bison' upgrade is required. Please check the https://stackoverflow.com/a/35161881") + endif() +endif() + +# make tools like 'glib-mkenums' visible +get_filename_component(GLIB_TOOL_DIR "${CURRENT_INSTALLED_DIR}/tools/glib" ABSOLUTE) +message(STATUS "Using glib tools: ${GLIB_TOOL_DIR}") +vcpkg_add_to_path(PREPEND "${GLIB_TOOL_DIR}") + +if ("x264" IN_LIST FEATURES) + set(PLUGIN_UGLY_X264 enabled) +else() + set(PLUGIN_UGLY_X264 disabled) +endif() + +if("plugins-base" IN_LIST FEATURES) + set(PLUGIN_BASE_SUPPORT enabled) +else() + set(PLUGIN_BASE_SUPPORT disabled) +endif() +if("plugins-bad" IN_LIST FEATURES) + # requires 'libdrm', 'dssim', 'libmicrodns' + message(FATAL_ERROR "The feature 'plugins-bad' is not supported in this port version") + set(PLUGIN_BAD_SUPPORT enabled) +else() + set(PLUGIN_BAD_SUPPORT disabled) +endif() +if("plugins-ugly" IN_LIST FEATURES) + set(PLUGIN_UGLY_SUPPORT enabled) +else() + set(PLUGIN_UGLY_SUPPORT disabled) +endif() + +if ("gl-graphene" IN_LIST FEATURES) + set(GL_GRAPHENE enabled) +else() + set(GL_GRAPHENE disabled) +endif() + +if ("flac" IN_LIST FEATURES) + set(PLUGIN_GOOD_FLAC enabled) +else() + set(PLUGIN_GOOD_FLAC disabled) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(LIBRARY_LINKAGE "shared") +else() + set(LIBRARY_LINKAGE "static") +endif() + +# gst-build's meson configuration needs git. Make the tool visible. +vcpkg_find_acquire_program(GIT) +get_filename_component(GIT_DIR "${GIT}" DIRECTORY) +vcpkg_add_to_path("${GIT_DIR}") + +# +# check scripts/cmake/vcpkg_configure_meson.cmake +# --wrap-mode=nodownload +# +# References +# https://github.com/GStreamer/gst-build/blob/1.18.4/meson_options.txt +# https://github.com/GStreamer/gst-plugins-base/blob/1.18.4/meson_options.txt +# https://github.com/GStreamer/gst-plugins-good/blob/1.18.4/meson_options.txt +# https://github.com/GStreamer/gst-plugins-bad/blob/1.18.4/meson_options.txt +# https://github.com/GStreamer/gst-plugins-ugly/blob/1.18.4/meson_options.txt +# +vcpkg_configure_meson( + SOURCE_PATH "${GST_BUILD_SOURCE_PATH}" + OPTIONS + # gstreamer + -Dgstreamer:default_library=${LIBRARY_LINKAGE} + -Dgstreamer:check=disabled + -Dgstreamer:libunwind=disabled + -Dgstreamer:libdw=disabled + -Dgstreamer:dbghelp=disabled + -Dgstreamer:bash-completion=disabled + -Dgstreamer:coretracers=disabled + -Dgstreamer:examples=disabled + -Dgstreamer:tests=disabled + -Dgstreamer:benchmarks=disabled + -Dgstreamer:tools=disabled + -Dgstreamer:doc=disabled + -Dgstreamer:introspection=disabled + -Dgstreamer:nls=disabled + # gst-plugins-base + -Dbase=${PLUGIN_BASE_SUPPORT} + -Dgst-plugins-base:default_library=${LIBRARY_LINKAGE} + -Dgst-plugins-base:examples=disabled + -Dgst-plugins-base:tests=disabled + -Dgst-plugins-base:doc=disabled + -Dgst-plugins-base:tools=disabled + -Dgst-plugins-base:introspection=disabled + -Dgst-plugins-base:nls=disabled + -Dgst-plugins-base:orc=disabled + -Dgst-plugins-base:pango=disabled + -Dgst-plugins-base:gl-graphene=${GL_GRAPHENE} + # gst-plugins-good + -Dgst-plugins-good:default_library=${LIBRARY_LINKAGE} + -Dgst-plugins-good:qt5=disabled + -Dgst-plugins-good:soup=disabled + -Dgst-plugins-good:cairo=auto # cairo[gobject] + -Dgst-plugins-good:speex=auto # speex + -Dgst-plugins-good:taglib=auto # taglib + -Dgst-plugins-good:vpx=auto # libvpx + -Dgst-plugins-good:examples=disabled + -Dgst-plugins-good:tests=disabled + -Dgst-plugins-good:doc=disabled + -Dgst-plugins-good:nls=disabled + -Dgst-plugins-good:orc=disabled + -Dgst-plugins-good:flac=${PLUGIN_GOOD_FLAC} + # gst-plugins-bad + -Dbad=${PLUGIN_BAD_SUPPORT} + -Dgst-plugins-bad:default_library=${LIBRARY_LINKAGE} + -Dgst-plugins-bad:opencv=disabled + -Dgst-plugins-bad:hls-crypto=openssl + -Dgst-plugins-bad:examples=disabled + -Dgst-plugins-bad:tests=disabled + -Dgst-plugins-bad:doc=disabled + -Dgst-plugins-bad:introspection=disabled + -Dgst-plugins-bad:nls=${LIBRARY_LINKAGE} + -Dgst-plugins-bad:orc=disabled + # gst-plugins-ugly + -Dugly=${PLUGIN_UGLY_SUPPORT} + -Dgst-plugins-ugly:default_library=${LIBRARY_LINKAGE} + -Dgst-plugins-ugly:tests=disabled + -Dgst-plugins-ugly:doc=disabled + -Dgst-plugins-ugly:nls=disabled + -Dgst-plugins-ugly:orc=disabled + -Dgst-plugins-ugly:x264=${PLUGIN_UGLY_X264} + # see ${GST_BUILD_SOURCE_PATH}/meson_options.txt + -Dpython=disabled + -Dlibav=disabled + -Dlibnice=disabled # libnice + -Ddevtools=disabled + -Dges=disabled + -Drtsp_server=disabled + -Domx=disabled + -Dvaapi=disabled + -Dsharp=disabled + -Drs=disabled + -Dgst-examples=disabled + -Dtls=disabled + -Dtests=disabled # common options + -Dexamples=disabled + -Dintrospection=disabled + -Dnls=disabled + -Dorc=disabled + -Ddoc=disabled + -Dgtk_doc=disabled + -Ddevtools=disabled + OPTIONS_DEBUG + -Dgstreamer:gst_debug=true # plugins will reference this value + OPTIONS_RELEASE + -Dgstreamer:gst_debug=false + -Dgstreamer:gobject-cast-checks=disabled + -Dgstreamer:glib-asserts=disabled + -Dgstreamer:glib-checks=disabled + -Dgstreamer:extra-checks=disabled + -Dgst-plugins-base:gobject-cast-checks=disabled + -Dgst-plugins-base:glib-asserts=disabled + -Dgst-plugins-base:glib-checks=disabled + -Dgst-plugins-good:gobject-cast-checks=disabled + -Dgst-plugins-good:glib-asserts=disabled + -Dgst-plugins-good:glib-checks=disabled + -Dgst-plugins-bad:gobject-cast-checks=disabled + -Dgst-plugins-bad:glib-asserts=disabled + -Dgst-plugins-bad:glib-checks=disabled +) + +vcpkg_install_meson() + +# Remove duplicated GL headers (we already have `opengl-registry`) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/KHR" + "${CURRENT_PACKAGES_DIR}/include/GL" +) +file(RENAME "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/include/gst/gl/gstglconfig.h" + "${CURRENT_PACKAGES_DIR}/include/gstreamer-1.0/gst/gl/gstglconfig.h" +) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/libexec" + "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/include" + "${CURRENT_PACKAGES_DIR}/libexec" + "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/include" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" + "${CURRENT_PACKAGES_DIR}/bin" + ) + set(PREFIX "${CMAKE_SHARED_LIBRARY_PREFIX}") + set(SUFFIX "${CMAKE_SHARED_LIBRARY_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${PREFIX}gstreamer-full-1.0${SUFFIX}" + "${CURRENT_PACKAGES_DIR}/lib/${PREFIX}gstreamer-full-1.0${SUFFIX}" + ) +endif() + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + if (NOT VCPKG_BUILD_TYPE) + file(GLOB DBG_BINS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.dll" + "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.pdb" + ) + file(COPY ${DBG_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() + file(GLOB REL_BINS "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.dll" + "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.pdb" + ) + file(COPY ${REL_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE ${DBG_BINS} ${REL_BINS}) +endif() + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${GST_BUILD_SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/gstreamer/vcpkg.json b/externals/vcpkg/ports/gstreamer/vcpkg.json new file mode 100755 index 000000000..43bfd15e6 --- /dev/null +++ b/externals/vcpkg/ports/gstreamer/vcpkg.json @@ -0,0 +1,142 @@ +{ + "name": "gstreamer", + "version": "1.19.2", + "port-version": 5, + "description": "GStreamer open-source multimedia framework core library", + "homepage": "https://gstreamer.freedesktop.org/", + "license": "LGPL-2.0", + "supports": "!linux & !uwp", + "dependencies": [ + { + "name": "cairo", + "features": [ + "gobject" + ], + "platform": "windows | osx" + }, + { + "name": "freetype", + "features": [ + "brotli", + "png", + "zlib" + ] + }, + { + "name": "glib", + "host": true + }, + "libnice", + "libxml2", + { + "name": "opengl-registry", + "platform": "windows | osx" + }, + "openssl", + { + "name": "vcpkg-tool-meson", + "host": true + }, + { + "name": "yasm-tool-helper", + "platform": "windows" + } + ], + "default-features": [ + "plugins-base", + "plugins-good", + "plugins-ugly" + ], + "features": { + "flac": { + "description": "FLAC audio codec plugin", + "supports": "!arm", + "dependencies": [ + "libflac" + ] + }, + "gl-graphene": { + "description": "Use Graphene in OpenGL plugin", + "supports": "!arm", + "dependencies": [ + "graphene" + ] + }, + "plugins-bad": { + "description": "'Bad' GStreamer plugins and helper libraries", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "rawparse" + ], + "platform": "!arm" + }, + "openh264" + ] + }, + "plugins-base": { + "description": "'Base' GStreamer plugins and helper libraries", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "gl-graphene", + "rawparse" + ], + "platform": "!arm" + } + ] + }, + "plugins-good": { + "description": "'Good' GStreamer plugins and helper libraries", + "dependencies": [ + "bzip2", + { + "name": "gstreamer", + "default-features": false, + "features": [ + "flac" + ], + "platform": "!arm" + }, + "jack2", + "libjpeg-turbo", + "libpng", + "libvpx", + "mpg123", + "speex", + "taglib" + ] + }, + "plugins-ugly": { + "description": "'Ugly' GStreamer plugins and helper libraries", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "x264" + ], + "platform": "!arm" + } + ] + }, + "rawparse": { + "description": "Build with libraw support", + "supports": "!arm", + "dependencies": [ + "libraw" + ] + }, + "x264": { + "description": "Colon separated list of additional x264 library paths, e.g. for 10-bit version", + "supports": "!arm", + "dependencies": [ + "x264" + ] + } + } +} diff --git a/externals/vcpkg/ports/gtest/clang-tidy-no-lint.patch b/externals/vcpkg/ports/gtest/clang-tidy-no-lint.patch new file mode 100755 index 000000000..588a1d637 --- /dev/null +++ b/externals/vcpkg/ports/gtest/clang-tidy-no-lint.patch @@ -0,0 +1,13 @@ +diff --git a/googletest/include/gtest/gtest-matchers.h b/googletest/include/gtest/gtest-matchers.h +index 2bd3dcf6..12cd60f6 100644 +--- a/googletest/include/gtest/gtest-matchers.h ++++ b/googletest/include/gtest/gtest-matchers.h +@@ -403,6 +403,7 @@ class MatcherBase : private MatcherDescriberInterface { + }; + + void Destroy() { ++ // NOLINTNEXTLINE + if (IsShared() && buffer_.shared->Unref()) { + vtable_->shared_destroy(buffer_.shared); + } + diff --git a/externals/vcpkg/ports/gtest/fix-main-lib-path.patch b/externals/vcpkg/ports/gtest/fix-main-lib-path.patch new file mode 100755 index 000000000..c2998f3e4 --- /dev/null +++ b/externals/vcpkg/ports/gtest/fix-main-lib-path.patch @@ -0,0 +1,59 @@ +diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt +index e7df8ec..1ecd596 100644 +--- a/googlemock/CMakeLists.txt ++++ b/googlemock/CMakeLists.txt +@@ -120,7 +120,8 @@ endif() + ######################################################################## + # + # Install rules +-install_project(gmock gmock_main) ++install_project(gmock) ++install_project(gmock_main) + + ######################################################################## + # +diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt +index abdd98b..7d1c01d 100644 +--- a/googletest/CMakeLists.txt ++++ b/googletest/CMakeLists.txt +@@ -148,7 +148,8 @@ target_link_libraries(gtest_main PUBLIC gtest) + ######################################################################## + # + # Install rules +-install_project(gtest gtest_main) ++install_project(gtest) ++install_project(gtest_main) + + ######################################################################## + # +diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake +index 8d8d60a..b08ce28 100644 +--- a/googletest/cmake/internal_utils.cmake ++++ b/googletest/cmake/internal_utils.cmake +@@ -315,11 +315,15 @@ function(install_project) + install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + # Install the project targets. ++ set (LIB_INSTALL_DST ${CMAKE_INSTALL_LIBDIR}) ++ if (${ARGN} MATCHES "_main") ++ set (LIB_INSTALL_DST ${CMAKE_INSTALL_LIBDIR}/manual-link) ++ endif() + install(TARGETS ${ARGN} + EXPORT ${targets_export_name} + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" +- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" +- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") ++ ARCHIVE DESTINATION "${LIB_INSTALL_DST}" ++ LIBRARY DESTINATION "${LIB_INSTALL_DST}") + if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") + # Install PDBs + foreach(t ${ARGN}) +@@ -328,7 +332,7 @@ function(install_project) + get_target_property(t_pdb_output_directory ${t} PDB_OUTPUT_DIRECTORY) + install(FILES + "${t_pdb_output_directory}/\${CMAKE_INSTALL_CONFIG_NAME}/$<$:${t_pdb_name_debug}>$<$>:${t_pdb_name}>.pdb" +- DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ DESTINATION ${LIB_INSTALL_DST} + OPTIONAL) + endforeach() + endif() diff --git a/externals/vcpkg/ports/gtest/portfile.cmake b/externals/vcpkg/ports/gtest/portfile.cmake new file mode 100755 index 000000000..b2bff3768 --- /dev/null +++ b/externals/vcpkg/ports/gtest/portfile.cmake @@ -0,0 +1,59 @@ +if (EXISTS "${CURRENT_BUILDTREES_DIR}/src/.git") + file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/googletest + REF release-1.11.0 + SHA512 6fcc7827e4c4d95e3ae643dd65e6c4fc0e3d04e1778b84f6e06e390410fe3d18026c131d828d949d2f20dde6327d30ecee24dcd3ef919e21c91e010d149f3a28 + HEAD_REF main + PATCHES + clang-tidy-no-lint.patch + fix-main-lib-path.patch + remove-werror.patch +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" GTEST_FORCE_SHARED_CRT) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DBUILD_GMOCK=ON + -Dgtest_force_shared_crt=${GTEST_FORCE_SHARED_CRT} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/GTest) + +file( + INSTALL + "${SOURCE_PATH}/googletest/src/gtest.cc" + "${SOURCE_PATH}/googletest/src/gtest_main.cc" + "${SOURCE_PATH}/googletest/src/gtest-all.cc" + "${SOURCE_PATH}/googletest/src/gtest-death-test.cc" + "${SOURCE_PATH}/googletest/src/gtest-filepath.cc" + "${SOURCE_PATH}/googletest/src/gtest-internal-inl.h" + "${SOURCE_PATH}/googletest/src/gtest-matchers.cc" + "${SOURCE_PATH}/googletest/src/gtest-port.cc" + "${SOURCE_PATH}/googletest/src/gtest-printers.cc" + "${SOURCE_PATH}/googletest/src/gtest-test-part.cc" + "${SOURCE_PATH}/googletest/src/gtest-typed-test.cc" + DESTINATION + ${CURRENT_PACKAGES_DIR}/src +) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_fixup_pkgconfig() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gmock_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gtest_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link") +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gmock_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gtest_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link") +endif() +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/gtest/remove-werror.patch b/externals/vcpkg/ports/gtest/remove-werror.patch new file mode 100755 index 000000000..96eba0202 --- /dev/null +++ b/externals/vcpkg/ports/gtest/remove-werror.patch @@ -0,0 +1,20 @@ +diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake +index 8d8d60a8..58fc9bfb 100644 +--- a/googletest/cmake/internal_utils.cmake ++++ b/googletest/cmake/internal_utils.cmake +@@ -84,13 +84,13 @@ macro(config_compiler_and_linker) + # Ensure MSVC treats source files as UTF-8 encoded. + set(cxx_base_flags "${cxx_base_flags} -utf-8") + elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") +- set(cxx_base_flags "-Wall -Wshadow -Werror -Wconversion") ++ set(cxx_base_flags "-Wall -Wshadow -Wconversion") + set(cxx_exception_flags "-fexceptions") + set(cxx_no_exception_flags "-fno-exceptions") + set(cxx_strict_flags "-W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls") + set(cxx_no_rtti_flags "-fno-rtti") + elseif (CMAKE_COMPILER_IS_GNUCXX) +- set(cxx_base_flags "-Wall -Wshadow -Werror") ++ set(cxx_base_flags "-Wall -Wshadow") + if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0) + set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else") + endif() diff --git a/externals/vcpkg/ports/gtest/usage b/externals/vcpkg/ports/gtest/usage new file mode 100755 index 000000000..3ed194453 --- /dev/null +++ b/externals/vcpkg/ports/gtest/usage @@ -0,0 +1,8 @@ +The package gtest is compatible with built-in CMake targets: + + enable_testing() + + find_package(GTest CONFIG REQUIRED) + target_link_libraries(main PRIVATE GTest::gtest GTest::gtest_main GTest::gmock GTest::gmock_main) + + add_test(AllTestsInMain main) diff --git a/externals/vcpkg/ports/gtest/vcpkg.json b/externals/vcpkg/ports/gtest/vcpkg.json new file mode 100755 index 000000000..9bd6e0194 --- /dev/null +++ b/externals/vcpkg/ports/gtest/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "gtest", + "version-semver": "1.11.0", + "port-version": 5, + "description": "GoogleTest and GoogleMock testing frameworks", + "homepage": "https://github.com/google/googletest", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/gtk/0001-build.patch b/externals/vcpkg/ports/gtk/0001-build.patch new file mode 100755 index 000000000..f0e2d2e87 --- /dev/null +++ b/externals/vcpkg/ports/gtk/0001-build.patch @@ -0,0 +1,47 @@ +diff --git a/meson.build b/meson.build +index 41cf592..cb4d638 100644 +--- a/meson.build ++++ b/meson.build +@@ -897,24 +897,24 @@ subdir('po-properties') + subdir('docs/tools') + subdir('docs/reference') + +-if not meson.is_cross_build() +- if meson.version().version_compare('>=0.57.0') +- gnome.post_install( +- glib_compile_schemas: true, +- gio_querymodules: gio_module_dirs, +- gtk_update_icon_cache: get_option('demos'), +- ) +- else +- meson.add_install_script('build-aux/meson/post-install.py', +- gtk_api_version, +- gtk_binary_version, +- gtk_libdir, +- gtk_datadir, +- gtk_bindir) +- endif +-else +- message('Not executing post-install steps automatically when cross compiling') +-endif ++#if not meson.is_cross_build() ++# if meson.version().version_compare('>=0.57.0') ++# gnome.post_install( ++# glib_compile_schemas: true, ++# gio_querymodules: gio_module_dirs, ++# gtk_update_icon_cache: get_option('demos'), ++# ) ++# else ++# meson.add_install_script('build-aux/meson/post-install.py', ++# gtk_api_version, ++# gtk_binary_version, ++# gtk_libdir, ++# gtk_datadir, ++# gtk_bindir) ++# endif ++#else ++# message('Not executing post-install steps automatically when cross compiling') ++#endif + + if not meson.is_subproject() + meson.add_dist_script('build-aux/meson/dist-data.py') diff --git a/externals/vcpkg/ports/gtk/0002-windows-build.patch b/externals/vcpkg/ports/gtk/0002-windows-build.patch new file mode 100755 index 000000000..27f6680ce --- /dev/null +++ b/externals/vcpkg/ports/gtk/0002-windows-build.patch @@ -0,0 +1,11 @@ +diff -ru /gdk/win32/gdkinput-winpointer.c b/gdk/win32/gdkinput-winpointer.c +--- a/gdk/win32/gdkinput-winpointer.c ++++ b/gdk/win32/gdkinput-winpointer.c +@@ -18,6 +18,7 @@ + #include "config.h" + + #include ++#include "gdk-private.h" + #include "gdkwin32.h" + #include "gdkprivate-win32.h" + #include "gdkdevicemanager-win32.h" diff --git a/externals/vcpkg/ports/gtk/0004-macos-build.patch b/externals/vcpkg/ports/gtk/0004-macos-build.patch new file mode 100755 index 000000000..e49086ced --- /dev/null +++ b/externals/vcpkg/ports/gtk/0004-macos-build.patch @@ -0,0 +1,12 @@ +diff -u a/gdk/macos/gdkmacoseventsource-private.h b/gdk/macos/gdkmacoseventsource-private.h +--- a/gdk/macos/gdkmacoseventsource-private.h ++++ b/gdk/macos/gdkmacoseventsource-private.h +@@ -24,6 +24,8 @@ + + #include "gdkmacosdisplay.h" + ++#include "gdk-private.h" ++ + G_BEGIN_DECLS + + typedef enum diff --git a/externals/vcpkg/ports/gtk/portfile.cmake b/externals/vcpkg/ports/gtk/portfile.cmake new file mode 100755 index 000000000..5c89135dd --- /dev/null +++ b/externals/vcpkg/ports/gtk/portfile.cmake @@ -0,0 +1,127 @@ +set(GTK_VERSION 4.6.2) + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.gnome.org/ + OUT_SOURCE_PATH SOURCE_PATH + REPO GNOME/gtk + REF aec7ca82007dbe07faee6be084d20758ebac2b91 #v4.6.2 + SHA512 05ebba53e71a997b4dc04bc018f420f62d569cb66a2f3e713bd2b48abd7c0051f67939e42c812388bd0565d12a3f82b45731a086d3ab0e75d16eee200a3be95f + HEAD_REF master # branch name + PATCHES + 0001-build.patch + 0002-windows-build.patch + 0004-macos-build.patch +) + +vcpkg_find_acquire_program(PKGCONFIG) +get_filename_component(PKGCONFIG_DIR "${PKGCONFIG}" DIRECTORY ) +vcpkg_add_to_path("${PKGCONFIG_DIR}") # Post install script runs pkg-config so it needs to be on PATH +vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/glib/") + +set(x11 false) +set(win32 false) +set(osx false) +if(VCPKG_TARGET_IS_LINUX) + set(OPTIONS -Dwayland-backend=false) # CI missing at least wayland-protocols + set(x11 true) + # Enable the wayland gdk backend (only when building on Unix except for macOS) +elseif(VCPKG_TARGET_IS_WINDOWS) + set(win32 true) +elseif(VCPKG_TARGET_IS_OSX) + set(osx true) +endif() + +list(APPEND OPTIONS -Dx11-backend=${x11}) #Enable the X11 gdk backend (only when building on Unix) +list(APPEND OPTIONS -Dbroadway-backend=false) #Enable the broadway (HTML5) gdk backend +list(APPEND OPTIONS -Dwin32-backend=${win32}) #Enable the Windows gdk backend (only when building on Windows) +list(APPEND OPTIONS -Dmacos-backend=${osx}) #Enable the macOS gdk backend (only when building on macOS) + +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${OPTIONS} + -Ddemos=false + -Dbuild-examples=false + -Dbuild-tests=false + -Dinstall-tests=false + -Dgtk_doc=false + -Dman-pages=false + -Dintrospection=disabled + -Dmedia-ffmpeg=disabled # Build the ffmpeg media backend + -Dmedia-gstreamer=disabled # Build the gstreamer media backend + -Dprint-cups=disabled # Build the cups print backend + -Dvulkan=disabled # Enable support for the Vulkan graphics API + -Dcloudproviders=disabled # Enable the cloudproviders support + -Dsysprof=disabled # include tracing support for sysprof + -Dtracker=disabled # Enable Tracker3 filechooser search + -Dcolord=disabled # Build colord support for the CUPS printing backend + ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' + glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' + gdbus-codegen='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gdbus-codegen' + glib-compile-schemas='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-schemas${VCPKG_HOST_EXECUTABLE_SUFFIX}' + sassc='${CURRENT_INSTALLED_DIR}/tools/sassc/bin/sassc${VCPKG_HOST_EXECUTABLE_SUFFIX}' + ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' + glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' + gdbus-codegen='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gdbus-codegen' + glib-compile-schemas='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-schemas${VCPKG_HOST_EXECUTABLE_SUFFIX}' + sassc='${CURRENT_INSTALLED_DIR}/tools/sassc/bin/sassc${VCPKG_HOST_EXECUTABLE_SUFFIX}' +) + +vcpkg_install_meson() + +# If somebody finds out how to access and forward env variables to +# the meson install script be my guest. Nevertheless the script still +# needs manual execution in the crosscompiling case. +vcpkg_find_acquire_program(PYTHON3) +foreach(_config release debug) + if(_config STREQUAL "release") + set(_short rel) + set(_path_suffix) + else() + set(_short dbg) + set(_path_suffix /debug) + endif() + if(NOT EXISTS "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib") + continue() + endif() + message(STATUS "Running post install script: ${TARGET_TRIPLET}-${_short}") + + set(PKGCONFIG_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}${_path_suffix}/lib/pkgconfig/") + set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}") + #file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/4.0.0/media") + #file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/4.0.0/immodules") + #file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/4.0.0/printbackends") + vcpkg_execute_required_process( + COMMAND "${PYTHON3}" "${SOURCE_PATH}/build-aux/meson/post-install.py" 4.0 4.0.0 "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib" "${CURRENT_PACKAGES_DIR}${_path_suffix}/share" "${CURRENT_PACKAGES_DIR}${_path_suffix}/bin" + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME post-install-${TARGET_TRIPLET}-${_short} + ) + unset(ENV{PKG_CONFIG_PATH}) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0") + #file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}${_path_suffix}/bin/gtk-4.0") + #file(RENAME "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/" "${CURRENT_PACKAGES_DIR}${_path_suffix}/bin/gtk-4.0") + message(STATUS "Post install ${TARGET_TRIPLET}-${_short} done") +endforeach() + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +set(TOOL_NAMES gtk4-builder-tool + gtk4-encode-symbolic-svg + gtk4-query-settings + gtk4-update-icon-cache) +if(VCPKG_TARGET_IS_LINUX) + list(APPEND TOOL_NAMES gtk4-launch) +endif() +vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() diff --git a/externals/vcpkg/ports/gtk/vcpkg.json b/externals/vcpkg/ports/gtk/vcpkg.json new file mode 100755 index 000000000..4a8a991c7 --- /dev/null +++ b/externals/vcpkg/ports/gtk/vcpkg.json @@ -0,0 +1,40 @@ +{ + "name": "gtk", + "version": "4.6.2", + "description": "Portable library for creating graphical user interfaces.", + "homepage": "https://www.gtk.org/", + "license": "LGPL-2.0-only", + "dependencies": [ + "atk", + { + "name": "cairo", + "default-features": false, + "features": [ + "gobject" + ] + }, + { + "name": "cairo", + "default-features": false, + "features": [ + "x11" + ], + "platform": "linux" + }, + "gdk-pixbuf", + "gettext", + "glib", + { + "name": "glib", + "host": true + }, + "graphene", + "libepoxy", + "pango", + "sassc", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/gtkmm/portfile.cmake b/externals/vcpkg/ports/gtkmm/portfile.cmake new file mode 100755 index 000000000..634367eae --- /dev/null +++ b/externals/vcpkg/ports/gtkmm/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://ftp.gnome.org/pub/GNOME/sources/gtkmm/4.6/gtkmm-4.6.0.tar.xz" + FILENAME "gtkmm-4.6.0.tar.xz" + SHA512 d1040be44d133cfa016efc581b79c5303806d0d441b57dcc22bd84a05c3e7934f9b7b894e71d7f4a0be332daba3dd58ef558f58070b83bf8a9de7d1027d92199 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -Dmsvc14x-parallel-installable=false # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019 + -Dbuild-tests=false + -Dbuild-demos=false + ADDITIONAL_NATIVE_BINARIES glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' + ADDITIONAL_CROSS_BINARIES glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' +) + +vcpkg_install_meson() + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/gtkmm/vcpkg.json b/externals/vcpkg/ports/gtkmm/vcpkg.json new file mode 100755 index 000000000..47cbec9f5 --- /dev/null +++ b/externals/vcpkg/ports/gtkmm/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "gtkmm", + "version": "4.6.0", + "description": "gtkmm is the official C++ interface for the popular GUI library GTK+.", + "homepage": "https://www.gtkmm.org/", + "license": "LGPL-3.0-or-later", + "supports": "!uwp", + "dependencies": [ + "atk", + "atkmm", + "cairo", + "cairomm", + "gdk-pixbuf", + "gettext", + "glib", + { + "name": "glib", + "host": true + }, + "glibmm", + "gtk", + "libepoxy", + "pango", + "pangomm", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/gtl/portfile.cmake b/externals/vcpkg/ports/gtl/portfile.cmake new file mode 100755 index 000000000..ed16730c1 --- /dev/null +++ b/externals/vcpkg/ports/gtl/portfile.cmake @@ -0,0 +1,21 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO greg7mdp/gtl + REF 1.00 + SHA512 842a5e2634919a04fdd87995a8ada2f949c51a070a7c175043e0f9105a93248325023f85b28f9406276c2912a0fb4015a2e9ba30113d4a0214492da0dc5e5716 + HEAD_REF main +) + +# Use greg7mdp/gtl's own build process, skipping examples and tests +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() + +# Delete redundant directories +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/share/doc") + +# Put the licence file where vcpkg expects it +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/gtl/vcpkg.json b/externals/vcpkg/ports/gtl/vcpkg.json new file mode 100755 index 000000000..b6b93c45f --- /dev/null +++ b/externals/vcpkg/ports/gtl/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "gtl", + "version": "1.0.0", + "description": "Greg's Template Library of useful classes.", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/gts/CMakeLists.txt b/externals/vcpkg/ports/gts/CMakeLists.txt new file mode 100755 index 000000000..295c0c6f7 --- /dev/null +++ b/externals/vcpkg/ports/gts/CMakeLists.txt @@ -0,0 +1,43 @@ +cmake_minimum_required(VERSION 3.14) + +project(gts C) + +find_package(PkgConfig REQUIRED) +pkg_check_modules(GLIB2 glib-2.0 IMPORTED_TARGET) + +if(WIN32) + add_definitions(-DNATIVE_WIN32 -D_USE_MATH_DEFINES) +else() + add_definitions(-DHAVE_FPU_CONTROL_H) +endif() + +add_definitions( + -DGTS_COMPILATION + -DGTS_MAJOR_VERSION=0 + -DGTS_MINOR_VERSION=7 + -DGTS_MICRO_VERSION=6 + -DGTS_INTERFACE_AGE=1 + -DGTS_BINARY_AGE=1 + -DGTS_VERSION=${GTS_MAJOR_VERSION}.${GTS_MINOR_VERSION}.${GTS_MICRO_VERSION} +) + +file(GLOB src src/*.c src/gts.def) +list(REMOVE_ITEM src src/predicate_init.c) +add_library(gts ${src}) +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/config.h" "") +target_include_directories(gts PUBLIC + $ + $ + $ +) +target_link_libraries(gts PUBLIC PkgConfig::GLIB2) + +set(prefix ?) +set(exec_prefix \${prefix}) +set(libdir \${prefix}/lib) +set(includedir \${prefix}/include) +configure_file(gts.pc.in gts.pc @ONLY) + +install(FILES src/gts.h src/gtsconfig.h DESTINATION include) +install(TARGETS gts) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gts.pc" DESTINATION lib/pkgconfig) diff --git a/externals/vcpkg/ports/gts/fix-dllexport.patch b/externals/vcpkg/ports/gts/fix-dllexport.patch new file mode 100755 index 000000000..dd9eb175e --- /dev/null +++ b/externals/vcpkg/ports/gts/fix-dllexport.patch @@ -0,0 +1,13 @@ +diff --git a/src/gts.h b/src/gts.h +index 1b76915..ae1d888 100644 +--- a/src/gts.h ++++ b/src/gts.h +@@ -38,7 +38,7 @@ extern "C" { + * we prefix variable declarations so they can + * properly get exported in windows dlls. + */ +-#ifdef NATIVE_WIN32 ++#if 0 + # ifdef GTS_COMPILATION + # define GTS_C_VAR __declspec(dllexport) + # else /* not GTS_COMPILATION */ diff --git a/externals/vcpkg/ports/gts/portfile.cmake b/externals/vcpkg/ports/gts/portfile.cmake new file mode 100755 index 000000000..62613257e --- /dev/null +++ b/externals/vcpkg/ports/gts/portfile.cmake @@ -0,0 +1,34 @@ +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(patches fix-dllexport.patch) +else() + set(patches "") +endif() + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO gts/gts + REF 0.7.6 + FILENAME gts-0.7.6.tar.gz + SHA512 645123b72dba3d04dad3c5d936d7e55947826be0fb25e84595368919b720deccddceb7c3b30865a5a40f2458254c2af793b7c014e6719cf07e7f8e6ff30890f8 + PATCHES ${patches} +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/predicates_init.h" DESTINATION "${SOURCE_PATH}/src") + +vcpkg_find_acquire_program(PKGCONFIG) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/gts/predicates_init.h b/externals/vcpkg/ports/gts/predicates_init.h new file mode 100755 index 000000000..059ecf6ff --- /dev/null +++ b/externals/vcpkg/ports/gts/predicates_init.h @@ -0,0 +1,26 @@ +/* This file was generated automatically by predicates_init + * + * This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +static double splitter = 134217729.000000; +static double resulterrbound = 3.330669073875471e-16; +static double ccwerrboundA = 3.330669073875472e-16; +static double ccwerrboundB = 2.220446049250315e-16; +static double ccwerrboundC = 1.109335647967049e-31; +static double o3derrboundA = 7.771561172376103e-16; +static double o3derrboundB = 3.330669073875473e-16; +static double o3derrboundC = 3.204747427460364e-31; +static double iccerrboundA = 1.110223024625158e-15; +static double iccerrboundB = 4.440892098500632e-16; +static double iccerrboundC = 5.423418723394464e-31; +static double isperrboundA = 1.776356839400253e-15; +static double isperrboundB = 5.551115123125792e-16; +static double isperrboundC = 8.751425667295619e-31; diff --git a/externals/vcpkg/ports/gts/usage b/externals/vcpkg/ports/gts/usage new file mode 100755 index 000000000..ccd803ef8 --- /dev/null +++ b/externals/vcpkg/ports/gts/usage @@ -0,0 +1,6 @@ +The port gts supports consumption from CMake: + + find_package(PkgConfig REQUIRED) + pkg_check_modules(GTS gts REQUIRED) + target_compile_options(main PRIVATE ${GTS_CFLAGS}) + target_link_libraries(main PRIVATE ${GTS_LDFLAGS}) diff --git a/externals/vcpkg/ports/gts/vcpkg.json b/externals/vcpkg/ports/gts/vcpkg.json new file mode 100755 index 000000000..a81898372 --- /dev/null +++ b/externals/vcpkg/ports/gts/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "gts", + "version": "0.7.6", + "port-version": 5, + "description": "3D surfaces meshed with interconnected triangles", + "homepage": "http://gts.sourceforge.net/", + "dependencies": [ + "glib", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/guetzli/CMakeLists.txt b/externals/vcpkg/ports/guetzli/CMakeLists.txt new file mode 100755 index 000000000..af5eea6c7 --- /dev/null +++ b/externals/vcpkg/ports/guetzli/CMakeLists.txt @@ -0,0 +1,44 @@ +cmake_minimum_required(VERSION 3.8.0) +project(guetzli) + +if(MSVC) + add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS -DNOMINMAX) +endif() + +find_path(butteraugli_include butteraugli/butteraugli.h) +find_library(butteraugli_library NAMES butteraugli_lib) +find_package(PNG REQUIRED) + +include_directories("." ${PNG_INCLUDE_DIRS} ${butteraugli_include}) + +file(GLOB guetzli_srcs "guetzli/*.cc") +file(GLOB guetzli_includes "guetzli/*.h") +list(REMOVE_ITEM guetzli_srcs "guetzli/guetzli.cc") + +add_library(guetzli_lib ${guetzli_srcs}) + +target_compile_features(guetzli_lib PUBLIC cxx_std_11) + +add_executable(guetzli guetzli/guetzli.cc) + +target_link_libraries(guetzli_lib ${butteraugli_library} ${PNG_LIBRARIES}) +target_link_libraries(guetzli guetzli_lib ${butteraugli_library} ${PNG_LIBRARIES}) + + +install( + TARGETS guetzli_lib + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_TOOLS) + install ( + TARGETS guetzli + RUNTIME DESTINATION tools/guetzli + ) +endif() + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES ${guetzli_includes} DESTINATION include/guetzli) +endif() diff --git a/externals/vcpkg/ports/guetzli/butteraugli.patch b/externals/vcpkg/ports/guetzli/butteraugli.patch new file mode 100755 index 000000000..ac124ca54 --- /dev/null +++ b/externals/vcpkg/ports/guetzli/butteraugli.patch @@ -0,0 +1,13 @@ +diff --git a/guetzli/butteraugli_comparator.cc b/guetzli/butteraugli_comparator.cc +index 142c203..f4e710d 100644 +--- a/guetzli/butteraugli_comparator.cc ++++ b/guetzli/butteraugli_comparator.cc +@@ -56,7 +56,7 @@ ButteraugliComparator::ButteraugliComparator(const int width, const int height, + height_(height), + target_distance_(target_distance), + rgb_orig_(*rgb), +- comparator_(LinearRgb(width_, height_, *rgb)), ++ comparator_(LinearRgb(width_, height_, *rgb), 1.0f), + distance_(0.0), + stats_(stats) {} + diff --git a/externals/vcpkg/ports/guetzli/portfile.cmake b/externals/vcpkg/ports/guetzli/portfile.cmake new file mode 100755 index 000000000..828730701 --- /dev/null +++ b/externals/vcpkg/ports/guetzli/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/guetzli + REF 214f2bb42abf5a577c079d00add5d6cc470620d3 # accessed on 2020-09-14 + SHA512 841cb14df4d27d3227e0ef8ecff6bd8a222d791abfc8fb593bf68996ed8861a9cc483f1a9b140023a247a5b1a350197601ca75a990507aaafa1b2dd03f8577d0 + HEAD_REF master + PATCHES butteraugli.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/guetzli") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/guetzli" RENAME copyright) diff --git a/externals/vcpkg/ports/guetzli/vcpkg.json b/externals/vcpkg/ports/guetzli/vcpkg.json new file mode 100755 index 000000000..05da33a62 --- /dev/null +++ b/externals/vcpkg/ports/guetzli/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "guetzli", + "version-date": "2020-09-14", + "port-version": 2, + "description": "Perceptual JPEG encoder", + "homepage": "https://github.com/google/guetzli", + "dependencies": [ + "butteraugli", + "libpng", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/guilite/portfile.cmake b/externals/vcpkg/ports/guilite/portfile.cmake new file mode 100755 index 000000000..ff509f9bc --- /dev/null +++ b/externals/vcpkg/ports/guilite/portfile.cmake @@ -0,0 +1,10 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO idea4good/GuiLite + REF 61d1bd94cbc35da74c0f3c40422a7d783c04d40b + SHA512 b428e9bfc62fabb4d23d4c39b78d521aa13eb52e571a5aaab7609a03bb88e6f2184587885cd4df950eb5f48dece2b8fbff2264f158251ed06c6a6415b9b59f1a + HEAD_REF master +) + +file(INSTALL "${SOURCE_PATH}/GuiLite.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/guilite/vcpkg.json b/externals/vcpkg/ports/guilite/vcpkg.json new file mode 100755 index 000000000..630d5c6cd --- /dev/null +++ b/externals/vcpkg/ports/guilite/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "guilite", + "version-date": "2022-05-05", + "description": "The smallest header-only GUI library (4 KLOC) for all platforms.", + "homepage": "https://github.com/idea4good/GuiLite", + "license": "Apache-2.0" +} diff --git a/externals/vcpkg/ports/gumbo/CMakeLists.txt b/externals/vcpkg/ports/gumbo/CMakeLists.txt new file mode 100755 index 000000000..f5d170d33 --- /dev/null +++ b/externals/vcpkg/ports/gumbo/CMakeLists.txt @@ -0,0 +1,42 @@ +cmake_minimum_required(VERSION 3.8.0) + +project(gumbo) + +set(gumbo_srcs + src/attribute.c + src/char_ref.c + src/error.c + src/parser.c + src/string_buffer.c + src/string_piece.c + src/tag.c + src/tokenizer.c + src/utf8.c + src/util.c + src/vector.c +) + +include_directories(src) +if (MSVC) + include_directories(visualc/include) +endif (MSVC) + +add_library(gumbo ${gumbo_srcs}) + +install( + TARGETS gumbo EXPORT unofficial-gumbo-config + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(EXPORT unofficial-gumbo-config + NAMESPACE unofficial::gumbo:: + DESTINATION share/unofficial-gumbo + ) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/gumbo.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/lib/pkgconfig/gumbo.pc" @ONLY) + +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lib/pkgconfig/gumbo.pc" DESTINATION "lib/pkgconfig") +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES src/gumbo.h src/tag_enum.h DESTINATION include) +endif() diff --git a/externals/vcpkg/ports/gumbo/portfile.cmake b/externals/vcpkg/ports/gumbo/portfile.cmake new file mode 100755 index 000000000..e6b0764fe --- /dev/null +++ b/externals/vcpkg/ports/gumbo/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/gumbo-parser + REF v0.10.1 + SHA512 bb1fb55cd07076ab6a9f38dc14db50397dbdca9a04ace4895dfba8b8cbc09038a96e26070c09c75fa929ada2e815affe233c1e2ecd8afe2aba6201647cf277d1 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-gumbo CONFIG_PATH share/unofficial-gumbo) + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gumbo" RENAME copyright) diff --git a/externals/vcpkg/ports/gumbo/vcpkg.json b/externals/vcpkg/ports/gumbo/vcpkg.json new file mode 100755 index 000000000..6ec0a368f --- /dev/null +++ b/externals/vcpkg/ports/gumbo/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "gumbo", + "version": "0.10.1", + "port-version": 5, + "description": "An HTML5 parsing library in pure C99", + "homepage": "https://github.com/google/gumbo-parser", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/gzip-hpp/portfile.cmake b/externals/vcpkg/ports/gzip-hpp/portfile.cmake new file mode 100755 index 000000000..c490c726e --- /dev/null +++ b/externals/vcpkg/ports/gzip-hpp/portfile.cmake @@ -0,0 +1,14 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mapbox/gzip-hpp + REF v0.1.0 + SHA512 4f332f08e842583b421932f14ee736a64d090ac22fd4e4654e5d84667c2fd6dcd73206b27b7c0c4f364104af7f4a5ad765c38125574bc239fa93b0b0ec4dad56 + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/include/gzip DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/gzip-hpp/vcpkg.json b/externals/vcpkg/ports/gzip-hpp/vcpkg.json new file mode 100755 index 000000000..96cb8d6f0 --- /dev/null +++ b/externals/vcpkg/ports/gzip-hpp/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "gzip-hpp", + "version-string": "0.1.0", + "port-version": 1, + "description": "Gzip header-only C++ library", + "homepage": "https://github.com/mapbox/gzip-hpp/", + "dependencies": [ + "zlib" + ] +} diff --git a/externals/vcpkg/ports/h3/portfile.cmake b/externals/vcpkg/ports/h3/portfile.cmake new file mode 100755 index 000000000..f691fe780 --- /dev/null +++ b/externals/vcpkg/ports/h3/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO uber/h3 + REF 26a6409156ba8539b2b332f799486572f1f8bab2 #v3.6.3 + SHA512 ee3450a5720951254fcdd9bb3acc4b33ed4a58c214e1ed8a091791674b57f0a48de76f0483b31b0b2ad9c316af6a5fcb0c3b72428b8f6380d6b6f717aaed73d7 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DBUILD_BENCHMARKS=OFF + -DBUILD_FILTERS=OFF + -DBUILD_GENERATORS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/h3/vcpkg.json b/externals/vcpkg/ports/h3/vcpkg.json new file mode 100755 index 000000000..183a69dfe --- /dev/null +++ b/externals/vcpkg/ports/h3/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "h3", + "version-semver": "3.7.2", + "port-version": 1, + "description": "A Hexagonal Hierarchical Geospatial Indexing System", + "homepage": "https://github.com/uber/h3", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/h5py-lzf/0001-disable-H5PLget_plugin-api.patch b/externals/vcpkg/ports/h5py-lzf/0001-disable-H5PLget_plugin-api.patch new file mode 100755 index 000000000..12f89845f --- /dev/null +++ b/externals/vcpkg/ports/h5py-lzf/0001-disable-H5PLget_plugin-api.patch @@ -0,0 +1,16 @@ +diff --git a/lzf/lzf_filter.c b/lzf/lzf_filter.c +index 951b1e4c..b2fbffc1 100644 +--- a/lzf/lzf_filter.c ++++ b/lzf/lzf_filter.c +@@ -93,9 +93,9 @@ static const H5Z_class_t filter_class = { + + #include "H5PLextern.h" + +-H5PL_type_t H5PLget_plugin_type(void){ return H5PL_TYPE_FILTER; } ++//H5PL_type_t H5PLget_plugin_type(void){ return H5PL_TYPE_FILTER; } + +-const void *H5PLget_plugin_info(void){ return &filter_class; } ++//const void *H5PLget_plugin_info(void){ return &filter_class; } + + #endif + #endif diff --git a/externals/vcpkg/ports/h5py-lzf/CMakeLists.txt b/externals/vcpkg/ports/h5py-lzf/CMakeLists.txt new file mode 100755 index 000000000..3ef3950c7 --- /dev/null +++ b/externals/vcpkg/ports/h5py-lzf/CMakeLists.txt @@ -0,0 +1,11 @@ +cmake_minimum_required(VERSION 3.13) +project(h5py-lzf) + +find_package(hdf5 CONFIG REQUIRED) + +add_library(h5py-lzf STATIC lzf_filter.c lzf/lzf_c.c lzf/lzf_d.c) +target_include_directories(h5py-lzf PUBLIC $) +target_link_libraries(h5py-lzf PRIVATE libzstd $) +install(TARGETS h5py-lzf EXPORT h5py-lzf-config ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) +install(EXPORT h5py-lzf-config DESTINATION share/cmake/h5py-lzf) +install(FILES lzf_filter.h lzf/lzf.h DESTINATION include) diff --git a/externals/vcpkg/ports/h5py-lzf/portfile.cmake b/externals/vcpkg/ports/h5py-lzf/portfile.cmake new file mode 100755 index 000000000..71b4709b8 --- /dev/null +++ b/externals/vcpkg/ports/h5py-lzf/portfile.cmake @@ -0,0 +1,34 @@ +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(link_hdf5_SHARED 0) +else() + set(link_hdf5_SHARED 1) +endif() + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO h5py/h5py + REF 81ba118ee66b97a94678e8f5675c4114649dfda4 + SHA512 c789abdc563f8d2535f0a2ef5e233eb862281559a9cdc3ec560dd69b4d403b6f923f5390390da54851e1bfef1be8de7f80999c25a7f3ac4962ee0620179c6420 + HEAD_REF master + PATCHES + 0001-disable-H5PLget_plugin-api.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/lzf) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/lzf + PREFER_NINJA + OPTIONS + -Dlink_hdf5_SHARED=${link_hdf5_SHARED} +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) + +configure_file(${SOURCE_PATH}/lzf/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/h5py-lzf/vcpkg.json b/externals/vcpkg/ports/h5py-lzf/vcpkg.json new file mode 100755 index 000000000..eb203ee5f --- /dev/null +++ b/externals/vcpkg/ports/h5py-lzf/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "h5py-lzf", + "version-string": "2019-12-04", + "port-version": 1, + "description": "The LZF filter is an alternative DEFLATE-style compressor for HDF5 datasets, using the free LZF library by Marc Alexander Lehmann.", + "homepage": "https://github.com/h5py/h5py/tree/master/lzf", + "dependencies": [ + "hdf5" + ] +} diff --git a/externals/vcpkg/ports/halide/portfile.cmake b/externals/vcpkg/ports/halide/portfile.cmake new file mode 100755 index 000000000..c5fcb86a1 --- /dev/null +++ b/externals/vcpkg/ports/halide/portfile.cmake @@ -0,0 +1,74 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +set(HALIDE_VERSION_TAG v14.0.0) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO halide/Halide + REF ${HALIDE_VERSION_TAG} + SHA512 c7b1186cca545f30d038f1e9bb28ca7231023869d191c50722213da4c7e9adfd4a53129fe395cd7938cb7cb3fb1bf80f9cd3b4b8473a0246f15b9ad8d3e40fe2 + HEAD_REF release/14.x +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + target-aarch64 TARGET_AARCH64 + target-amdgpu TARGET_AMDGPU + target-arm TARGET_ARM + target-d3d12compute TARGET_D3D12COMPUTE + target-hexagon TARGET_HEXAGON + target-metal TARGET_METAL + target-mips TARGET_MIPS + target-nvptx TARGET_NVPTX + target-opencl TARGET_OPENCL + target-powerpc TARGET_POWERPC + target-riscv TARGET_RISCV + target-x86 TARGET_X86 +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS ${FEATURE_OPTIONS} + -DWITH_DOCS=NO + -DWITH_PYTHON_BINDINGS=NO + -DWITH_TESTS=NO + -DWITH_TUTORIALS=NO + -DWITH_UTILS=NO + -DCMAKE_INSTALL_LIBDIR=bin + -DCMAKE_INSTALL_DATADIR=share/${PORT} + -DHalide_INSTALL_CMAKEDIR=share/${PORT} + -DHalide_INSTALL_HELPERSDIR=share/HalideHelpers + -DHalide_INSTALL_PLUGINDIR=bin +) + +# ADD_BIN_TO_PATH needed to compile autoschedulers, +# which use Halide.dll (and deps) during the build. +vcpkg_cmake_install(ADD_BIN_TO_PATH) + +vcpkg_copy_tools( + TOOL_NAMES + featurization_to_sample + get_host_target + retrain_cost_model + weightsdir_to_weightsfile + AUTO_CLEAN +) + +# Release mode MODULE targets in CMake don't get PDBs. +# Exclude those to avoid warning with default globs. +vcpkg_copy_pdbs( + BUILD_PATHS + "${CURRENT_PACKAGES_DIR}/bin/Halide.dll" + "${CURRENT_PACKAGES_DIR}/debug/bin/*.dll" +) + +vcpkg_cmake_config_fixup() +vcpkg_cmake_config_fixup(PACKAGE_NAME HalideHelpers) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/tutorial) + +configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file(${CMAKE_CURRENT_LIST_DIR}/usage.in ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) diff --git a/externals/vcpkg/ports/halide/usage.in b/externals/vcpkg/ports/halide/usage.in new file mode 100755 index 000000000..70cb98bd3 --- /dev/null +++ b/externals/vcpkg/ports/halide/usage.in @@ -0,0 +1,27 @@ +The package halide provides CMake targets: + + set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED YES) + set(CMAKE_CXX_EXTENSIONS NO) + + find_package(Halide REQUIRED) + + # JIT mode: + add_executable(my_halide_app main.cpp) + target_link_libraries(my_halide_app PRIVATE Halide::Halide) + + # AOT mode: + add_executable(my_generators my_generators.cpp) + target_link_libraries(my_generators PRIVATE Halide::Generator) + add_halide_library(my_first_generator FROM my_generators) + add_halide_library(my_second_generator FROM my_generators + PARAMS parallel=false scale=3.0 rotation=ccw output.type=uint16) + add_halide_library(my_second_generator_2 FROM my_generators + GENERATOR my_second_generator + PARAMS scale=9.0 rotation=ccw output.type=float32) + add_halide_library(my_second_generator_3 FROM my_generators + GENERATOR my_second_generator + PARAMS parallel=false output.type=float64) + +For more information see: + https://github.com/halide/Halide/blob/@HALIDE_VERSION_TAG@/README_cmake.md diff --git a/externals/vcpkg/ports/halide/vcpkg.json b/externals/vcpkg/ports/halide/vcpkg.json new file mode 100755 index 000000000..d24aa98e0 --- /dev/null +++ b/externals/vcpkg/ports/halide/vcpkg.json @@ -0,0 +1,206 @@ +{ + "name": "halide", + "version": "14.0.0", + "description": "Halide is a programming language designed to make it easier to write high-performance image and array processing code on modern machines.", + "homepage": "https://github.com/halide/Halide", + "supports": "!uwp", + "dependencies": [ + { + "name": "llvm", + "features": [ + "clang", + "enable-rtti", + "tools" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "jit" + ], + "features": { + "jit": { + "description": "Include targets required for jit compilation", + "dependencies": [ + { + "name": "halide", + "default-features": false, + "features": [ + "target-aarch64" + ], + "platform": "arm64" + }, + { + "name": "halide", + "default-features": false, + "features": [ + "target-x86" + ], + "platform": "x86 | x64" + }, + { + "name": "halide", + "default-features": false, + "features": [ + "target-arm" + ], + "platform": "arm & !arm64" + }, + { + "name": "halide", + "features": [ + "target-all" + ], + "platform": "!x86 & !x64 & !arm & !arm64" + } + ] + }, + "target-aarch64": { + "description": "Include AArch64 target", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-aarch64" + ] + } + ] + }, + "target-all": { + "description": "Include all targets", + "dependencies": [ + { + "name": "halide", + "default-features": false, + "features": [ + "target-aarch64", + "target-amdgpu", + "target-arm", + "target-d3d12compute", + "target-hexagon", + "target-metal", + "target-mips", + "target-nvptx", + "target-opencl", + "target-powerpc", + "target-riscv", + "target-x86" + ] + } + ] + }, + "target-amdgpu": { + "description": "Include AMDGPU target", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-amdgpu" + ] + } + ] + }, + "target-arm": { + "description": "Include ARM target", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-arm" + ] + } + ] + }, + "target-d3d12compute": { + "description": "Include Direct3D 12 Compute target" + }, + "target-hexagon": { + "description": "Include Hexagon target", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-hexagon" + ] + } + ] + }, + "target-metal": { + "description": "Include Metal target" + }, + "target-mips": { + "description": "Include Mips target", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-mips" + ] + } + ] + }, + "target-nvptx": { + "description": "Include NVPTX target", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-nvptx" + ] + } + ] + }, + "target-opencl": { + "description": "Include OpenCL-C target" + }, + "target-powerpc": { + "description": "Include PowerPC target", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-powerpc" + ] + } + ] + }, + "target-riscv": { + "description": "Include RISCV target", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-riscv" + ] + } + ] + }, + "target-x86": { + "description": "Include X86 target", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-x86" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/happly/portfile.cmake b/externals/vcpkg/ports/happly/portfile.cmake new file mode 100755 index 000000000..f10a673b4 --- /dev/null +++ b/externals/vcpkg/ports/happly/portfile.cmake @@ -0,0 +1,13 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nmwsharp/happly + REF 88f79725d32d78e0e637ebf42d8432d519e1c7d0 + SHA512 79f2be2d4f5583bc4ea63d92af142fc1a59c91610dee5d2bbbd3fbfb6ff6cd697cd6cc6d740ac3878278257f550c739832b2ecf10887b0607045e9f09a35c92c + HEAD_REF master +) + +file( + COPY ${SOURCE_PATH}/happly.h + DESTINATION ${CURRENT_PACKAGES_DIR}/include +) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/happly/vcpkg.json b/externals/vcpkg/ports/happly/vcpkg.json new file mode 100755 index 000000000..d9439a11c --- /dev/null +++ b/externals/vcpkg/ports/happly/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "happly", + "version-date": "2021-03-19", + "description": "A header-only C++ reader/writer for the PLY file format.", + "homepage": "https://github.com/nmwsharp/happly" +} diff --git a/externals/vcpkg/ports/hareflow/portfile.cmake b/externals/vcpkg/ports/hareflow/portfile.cmake new file mode 100755 index 000000000..aca8ed9c0 --- /dev/null +++ b/externals/vcpkg/ports/hareflow/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO coveooss/hareflow + REF a59406398c60d4908a9f894c187ef90370119594 # 0.1.0 + SHA512 ed9e3b54f879fed65cf7765b37951a0da04e99b09950316d9108ea35917d05b4733c5cb8f3c161e42f1baab5978affd4522e5b5028861b3f7d6cc0bfe0a40363 + HEAD_REF main +) + +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) + set(rpath "@loader_path") +else() + set(rpath "\$ORIGIN") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DCMAKE_INSTALL_RPATH=${rpath}" +) +vcpkg_cmake_install() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/externals/vcpkg/ports/hareflow/vcpkg.json b/externals/vcpkg/ports/hareflow/vcpkg.json new file mode 100755 index 000000000..7452a5ffe --- /dev/null +++ b/externals/vcpkg/ports/hareflow/vcpkg.json @@ -0,0 +1,42 @@ +{ + "name": "hareflow", + "version-semver": "0.1.0", + "description": "Hareflow: A RabbitMQ C++ stream client.", + "homepage": "https://github.com/coveooss/hareflow", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "boost-asio", + "features": [ + "ssl" + ], + "version>=": "1.78.0" + }, + { + "name": "boost-endian", + "version>=": "1.78.0" + }, + { + "name": "fmt", + "version>=": "8.0.1" + }, + { + "name": "openssl", + "version>=": "3.0.2#3" + }, + { + "name": "qpid-proton", + "version>=": "0.37.0#2" + }, + { + "name": "vcpkg-cmake", + "host": true, + "version>=": "2021-02-28" + }, + { + "name": "vcpkg-cmake-config", + "host": true, + "version>=": "2021-02-26" + } + ] +} diff --git a/externals/vcpkg/ports/harfbuzz/harfbuzzConfig.cmake.in b/externals/vcpkg/ports/harfbuzz/harfbuzzConfig.cmake.in new file mode 100755 index 000000000..42f8b2ee7 --- /dev/null +++ b/externals/vcpkg/ports/harfbuzz/harfbuzzConfig.cmake.in @@ -0,0 +1,69 @@ +# For old projects where the minimum CMake version is lower than 3.3. +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0054 NEW) +cmake_policy(SET CMP0057 NEW) + +# Traditional find module variables (vcpkg polyfill) +set(HARFBUZZ_INCLUDE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/harfbuzz" CACHE INTERNAL "") +set(HARFBUZZ_INCLUDE_DIRS "${HARFBUZZ_INCLUDE_DIR}") +set(HARFBUZZ_LIBRARY harfbuzz::harfbuzz CACHE INTERNAL "") +set(HARFBUZZ_LIBRARIES harfbuzz::harfbuzz) + +if(TARGET harfbuzz) + set(HARFBUZZ_FOUND TRUE) + return() +endif() + +include(CMakeFindDependencyMacro) + +add_library(harfbuzz INTERFACE IMPORTED GLOBAL) +add_library(harfbuzz::harfbuzz ALIAS harfbuzz) + +find_library(HARFBUZZ_LIBRARY_DEBUG NAMES harfbuzz PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) +if(HARFBUZZ_LIBRARY_DEBUG) + target_link_libraries(harfbuzz INTERFACE $<$:${HARFBUZZ_LIBRARY_DEBUG}>) +endif() + +find_library(HARFBUZZ_LIBRARY_RELEASE NAMES harfbuzz PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) +target_link_libraries(harfbuzz INTERFACE $<$>:${HARFBUZZ_LIBRARY_RELEASE}>) + +set(HARFBUZZ_FEATURES @FEATURES@) + +if(APPLE) + find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices) + target_link_libraries(harfbuzz INTERFACE ${APPLICATIONSERVICES_LIBRARY}) +endif() + +find_dependency(freetype CONFIG) +target_link_libraries(harfbuzz INTERFACE freetype) + +if ("graphite2" IN_LIST HARFBUZZ_FEATURES) + find_library(GRAPHITE2_LIBRARY_DEBUG NAMES graphite2 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) + if(GRAPHITE2_LIBRARY_DEBUG) + target_link_libraries(harfbuzz INTERFACE $<$:${GRAPHITE2_LIBRARY_DEBUG}>) + endif() + + find_library(GRAPHITE2_LIBRARY_RELEASE NAMES graphite2 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) + if(GRAPHITE2_LIBRARY_RELEASE) + target_link_libraries(harfbuzz INTERFACE $<$>:${GRAPHITE2_LIBRARY_RELEASE}>) + endif() +endif() + +if ("glib" IN_LIST HARFBUZZ_FEATURES) + find_library(GLIB_LIBRARY_DEBUG NAMES glib glib-2.0 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) + if(GLIB_LIBRARY_DEBUG) + target_link_libraries(harfbuzz INTERFACE $<$:${GLIB_LIBRARY_DEBUG}>) + endif() + + find_library(GLIB_LIBRARY_RELEASE NAMES glib glib-2.0 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) + if(GLIB_LIBRARY_RELEASE) + target_link_libraries(harfbuzz INTERFACE $<$>:${GLIB_LIBRARY_RELEASE}>) + endif() +endif() + +if ("icu" IN_LIST HARFBUZZ_FEATURES) + find_dependency(ICU 61 COMPONENTS uc) + target_link_libraries(harfbuzz INTERFACE ICU::uc) +endif() + +target_include_directories(harfbuzz INTERFACE "${HARFBUZZ_INCLUDE_DIR}") diff --git a/externals/vcpkg/ports/harfbuzz/portfile.cmake b/externals/vcpkg/ports/harfbuzz/portfile.cmake new file mode 100755 index 000000000..6e618698b --- /dev/null +++ b/externals/vcpkg/ports/harfbuzz/portfile.cmake @@ -0,0 +1,89 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO harfbuzz/harfbuzz + REF 4.2.0 + SHA512 2aff1e6a41d6186b71f2915296c46c0b2ffc67371e1f05c13a62c237ff7a84d7d78d414d7a395e1616a2861c83c4792ef5936a492713780564b994d18e2d3e38 + HEAD_REF master +) + +if("icu" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS -Dicu=enabled) # Enable ICU library unicode functions +else() + list(APPEND FEATURE_OPTIONS -Dicu=disabled) +endif() +if("graphite2" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS -Dgraphite=enabled) #Enable Graphite2 complementary shaper +else() + list(APPEND FEATURE_OPTIONS -Dgraphite=disabled) +endif() +if("coretext" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS -Dcoretext=enabled) # Enable CoreText shaper backend on macOS +else() + list(APPEND FEATURE_OPTIONS -Dcoretext=disabled) +endif() +if("glib" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS -Dglib=enabled) # Enable GLib unicode functions + list(APPEND FEATURE_OPTIONS -Dgobject=enabled) #Enable GObject bindings +else() + list(APPEND FEATURE_OPTIONS -Dglib=disabled) + list(APPEND FEATURE_OPTIONS -Dgobject=disabled) +endif() +list(APPEND FEATURE_OPTIONS -Dfreetype=enabled) #Enable freetype interop helpers +#if(VCPKG_TARGET_IS_WINDOWS) + #link errors in qt5-base. probably requires changes to the pc files generated by meson + #list(APPEND FEATURE_OPTIONS -Dgdi=enabled) # enable gdi helpers and uniscribe shaper backend (windows only) +#endif() + + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -Dcairo=disabled # Use Cairo graphics library + -Dintrospection=disabled # Generate gobject-introspection bindings (.gir/.typelib files) + -Ddocs=disabled # Generate documentation with gtk-doc + -Dtests=disabled + -Dbenchmark=disabled + ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' + ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' +) + +vcpkg_install_meson() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(GLOB PC_FILES + "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc" + "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc") + + foreach(PC_FILE IN LISTS PC_FILES) + file(READ "${PC_FILE}" PC_FILE_CONTENT) + string(REGEX REPLACE + "\\$\\{prefix\}\\/lib\\/([a-zA-Z0-9\-]*)\\.lib" + "-l\\1" PC_FILE_CONTENT + "${PC_FILE_CONTENT}") + file(WRITE "${PC_FILE}" ${PC_FILE_CONTENT}) + endforeach() +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake") +configure_file("${CMAKE_CURRENT_LIST_DIR}/harfbuzzConfig.cmake.in" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/harfbuzzConfig.cmake" @ONLY) + +vcpkg_list(SET TOOL_NAMES) +if("glib" IN_LIST FEATURES) + vcpkg_list(APPEND TOOL_NAMES hb-subset hb-shape hb-ot-shape-closure) +endif() +if(TOOL_NAMES) + vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/harfbuzz/vcpkg.json b/externals/vcpkg/ports/harfbuzz/vcpkg.json new file mode 100755 index 000000000..948366a2f --- /dev/null +++ b/externals/vcpkg/ports/harfbuzz/vcpkg.json @@ -0,0 +1,50 @@ +{ + "name": "harfbuzz", + "version": "4.2.0", + "port-version": 1, + "description": "HarfBuzz OpenType text shaping engine", + "homepage": "https://github.com/harfbuzz/harfbuzz", + "license": "MIT-Modern-Variant", + "dependencies": [ + { + "name": "freetype", + "default-features": false + }, + { + "name": "gettext", + "platform": "osx" + }, + { + "name": "vcpkg-tool-meson", + "host": true + } + ], + "features": { + "coretext": { + "description": "Enable CoreText shaper backend on macOS", + "supports": "osx" + }, + "glib": { + "description": "Glib Unicode callbacks support", + "dependencies": [ + "glib", + { + "name": "glib", + "host": true + } + ] + }, + "graphite2": { + "description": "Graphite2 shaper support", + "dependencies": [ + "graphite2" + ] + }, + "icu": { + "description": "icu support for harfbuzz", + "dependencies": [ + "icu" + ] + } + } +} diff --git a/externals/vcpkg/ports/hash-library/001-fix-macos.patch b/externals/vcpkg/ports/hash-library/001-fix-macos.patch new file mode 100755 index 000000000..60658e316 --- /dev/null +++ b/externals/vcpkg/ports/hash-library/001-fix-macos.patch @@ -0,0 +1,98 @@ +Fixes includes of endian.h on MacOS, see https://github.com/stbrumme/hash-library/pull/4. + +diff --git a/crc32.cpp b/crc32.cpp +--- a/crc32.cpp ++++ b/crc32.cpp +@@ -7,8 +7,10 @@ + #include "crc32.h" + + // big endian architectures need #define __BYTE_ORDER __BIG_ENDIAN +-#ifndef _MSC_VER +-#include ++#if defined(__APPLE__) ++ #include ++#elif !defined(_MSC_VER) ++ #include + #endif + + +diff --git a/keccak.cpp b/keccak.cpp +--- a/keccak.cpp ++++ b/keccak.cpp +@@ -7,8 +7,10 @@ + #include "keccak.h" + + // big endian architectures need #define __BYTE_ORDER __BIG_ENDIAN +-#ifndef _MSC_VER +-#include ++#if defined(__APPLE__) ++ #include ++#elif !defined(_MSC_VER) ++ #include + #endif + + +diff --git a/md5.cpp b/md5.cpp +--- a/md5.cpp ++++ b/md5.cpp +@@ -6,8 +6,10 @@ + + #include "md5.h" + +-#ifndef _MSC_VER +-#include ++#if defined(__APPLE__) ++ #include ++#elif !defined(_MSC_VER) ++ #include + #endif + + +diff --git a/sha1.cpp b/sha1.cpp +--- a/sha1.cpp ++++ b/sha1.cpp +@@ -7,8 +7,10 @@ + #include "sha1.h" + + // big endian architectures need #define __BYTE_ORDER __BIG_ENDIAN +-#ifndef _MSC_VER +-#include ++#if defined(__APPLE__) ++ #include ++#elif !defined(_MSC_VER) ++ #include + #endif + + +diff --git a/sha256.cpp b/sha256.cpp +--- a/sha256.cpp ++++ b/sha256.cpp +@@ -7,8 +7,10 @@ + #include "sha256.h" + + // big endian architectures need #define __BYTE_ORDER __BIG_ENDIAN +-#ifndef _MSC_VER +-#include ++#if defined(__APPLE__) ++ #include ++#elif !defined(_MSC_VER) ++ #include + #endif + + +diff --git a/sha3.cpp b/sha3.cpp +--- a/sha3.cpp ++++ b/sha3.cpp +@@ -7,8 +7,10 @@ + #include "sha3.h" + + // big endian architectures need #define __BYTE_ORDER __BIG_ENDIAN +-#ifndef _MSC_VER +-#include ++#if defined(__APPLE__) ++ #include ++#elif !defined(_MSC_VER) ++ #include + #endif + + #include diff --git a/externals/vcpkg/ports/hash-library/CMakeLists.txt b/externals/vcpkg/ports/hash-library/CMakeLists.txt new file mode 100755 index 000000000..dbc1d8ea7 --- /dev/null +++ b/externals/vcpkg/ports/hash-library/CMakeLists.txt @@ -0,0 +1,45 @@ +cmake_minimum_required(VERSION 3.5.1) +project(hash-library CXX) + +set(HEADERS + crc32.h + hash.h + hmac.h + keccak.h + md5.h + sha1.h + sha256.h + sha3.h +) + +set(SRCS + crc32.cpp + keccak.cpp + md5.cpp + sha1.cpp + sha256.cpp + sha3.cpp +) + +add_library(hash-library ${SRCS}) + +target_include_directories(hash-library PUBLIC $ $) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES ${HEADERS} DESTINATION include/hash-library) +endif() + +install( + TARGETS hash-library + EXPORT unofficial-hash-library-targets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install( + EXPORT unofficial-hash-library-targets + FILE unofficial-hash-library-targets.cmake + NAMESPACE unofficial:: + DESTINATION share/unofficial-hash-library +) diff --git a/externals/vcpkg/ports/hash-library/portfile.cmake b/externals/vcpkg/ports/hash-library/portfile.cmake new file mode 100755 index 000000000..6d6ced518 --- /dev/null +++ b/externals/vcpkg/ports/hash-library/portfile.cmake @@ -0,0 +1,26 @@ +if(WIN32) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO stbrumme/hash-library + REF hash_library_v8 + SHA512 1c428710c0c3e4d5d1114d757a5d9145ed12c7e2fbbfa51635f43a349ddb5634bdf49e8d8fdbc7576e90b319989fb85efec433bb43ddb551c2cf29a8e80ba78b + HEAD_REF master + PATCHES + 001-fix-macos.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME "unofficial-${PORT}" CONFIG_PATH "share/unofficial-${PORT}") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/hash-library/vcpkg.json b/externals/vcpkg/ports/hash-library/vcpkg.json new file mode 100755 index 000000000..0f3ad3dc7 --- /dev/null +++ b/externals/vcpkg/ports/hash-library/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "hash-library", + "version": "8", + "port-version": 1, + "description": "Portable C++ hashing library", + "homepage": "https://create.stephan-brumme.com/hash-library/", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/hayai/portfile.cmake b/externals/vcpkg/ports/hayai/portfile.cmake new file mode 100755 index 000000000..4fa698d18 --- /dev/null +++ b/externals/vcpkg/ports/hayai/portfile.cmake @@ -0,0 +1,65 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nickbruun/hayai + REF 0234860c7a851362ab33efc6c018203cded3eb48 + SHA512 e4c65d834eddaeb77e73a3bc24645a531b93d26e32ff1daffbe71c579b76b4b8b4865f6c7ea07b378cafbe2da3a698414d4135f28fc9821eef995ed78d0987f2 + HEAD_REF master +) + +if(VCPKG_TARGET_IS_UWP) + set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS") + set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DINSTALL_HAYAI=ON + -DBUILD_HAYAI_TESTS=OFF + -DBUILD_HAYAI_SAMPLES=OFF +) + +vcpkg_install_cmake() + +if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) + vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) +elseif(EXISTS ${CURRENT_PACKAGES_DIR}/lib/CMake/${PORT}) + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/CMake/${PORT}) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle manual-link libraries +if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/hayai_main.lib) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) + file(RENAME + ${CURRENT_PACKAGES_DIR}/debug/lib/hayai_main.lib + ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/hayai_main.lib + ) + + vcpkg_replace_string( + ${CURRENT_PACKAGES_DIR}/share/${PORT}/hayai-targets-debug.cmake + "\${CMAKE_CURRENT_LIST_DIR}/../../debug/lib/hayai_main.lib" + "\${CMAKE_CURRENT_LIST_DIR}/../../debug/lib/manual-link/hayai_main.lib" + ) +endif() + +if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/hayai_main.lib) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) + file(RENAME + ${CURRENT_PACKAGES_DIR}/lib/hayai_main.lib + ${CURRENT_PACKAGES_DIR}/lib/manual-link/hayai_main.lib + ) + + vcpkg_replace_string( + ${CURRENT_PACKAGES_DIR}/share/${PORT}/hayai-targets-release.cmake + "\${CMAKE_CURRENT_LIST_DIR}/../../lib/hayai_main.lib" + "\${CMAKE_CURRENT_LIST_DIR}/../../lib/manual-link/hayai_main.lib" + ) +endif() + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/hayai/vcpkg.json b/externals/vcpkg/ports/hayai/vcpkg.json new file mode 100755 index 000000000..847c0d2fc --- /dev/null +++ b/externals/vcpkg/ports/hayai/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "hayai", + "version-string": "2019-08-10", + "port-version": 1, + "description": "C++ benchmarking framework", + "homepage": "https://github.com/nickbruun/hayai" +} diff --git a/externals/vcpkg/ports/hazelcast-cpp-client/portfile.cmake b/externals/vcpkg/ports/hazelcast-cpp-client/portfile.cmake new file mode 100755 index 000000000..09b7b61e3 --- /dev/null +++ b/externals/vcpkg/ports/hazelcast-cpp-client/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO hazelcast/hazelcast-cpp-client + REF v5.0.0 + SHA512 7cf85eadeed212871d2a6c5c0aa9d9640c9c89e126c3e383981ddd4cb222390e4ce8307b554766666b8d7816bd5e0fed4242bc674e20423570726c261c182559 + HEAD_REF master +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openssl WITH_OPENSSL + example BUILD_EXAMPLES +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/hazelcast-cpp-client) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/hazelcast-cpp-client/vcpkg.json b/externals/vcpkg/ports/hazelcast-cpp-client/vcpkg.json new file mode 100755 index 000000000..6e3e7e759 --- /dev/null +++ b/externals/vcpkg/ports/hazelcast-cpp-client/vcpkg.json @@ -0,0 +1,38 @@ +{ + "name": "hazelcast-cpp-client", + "version-semver": "5.0.0", + "description": "C++ client library for Hazelcast in-memory database.", + "homepage": "https://github.com/hazelcast/hazelcast-cpp-client", + "documentation": "http://hazelcast.github.io/hazelcast-cpp-client/index.html", + "supports": "!uwp", + "dependencies": [ + "boost-any", + "boost-asio", + "boost-chrono", + "boost-format", + "boost-optional", + "boost-property-tree", + "boost-system", + "boost-thread", + "boost-uuid", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "example": { + "description": "Build examples for Hazelcast C++ client" + }, + "openssl": { + "description": "Build hazelcast C++ client with SSL support", + "dependencies": [ + "openssl" + ] + } + } +} diff --git a/externals/vcpkg/ports/hdf5/hdf5_config.patch b/externals/vcpkg/ports/hdf5/hdf5_config.patch new file mode 100755 index 000000000..bcd76519c --- /dev/null +++ b/externals/vcpkg/ports/hdf5/hdf5_config.patch @@ -0,0 +1,31 @@ +diff --git a/config/cmake/hdf5-config.cmake.in b/config/cmake/hdf5-config.cmake.in +index 4d02c9c..8c10d2d 100644 +--- a/config/cmake/hdf5-config.cmake.in ++++ b/config/cmake/hdf5-config.cmake.in +@@ -55,7 +55,10 @@ set (${HDF5_PACKAGE_NAME}_PARALLEL_FILTERED_WRITES "@PARALLEL_FILTERED_WRITES@") + #----------------------------------------------------------------------------- + # Dependencies + #----------------------------------------------------------------------------- ++include(CMakeFindDependencyMacro) ++ + if (${HDF5_PACKAGE_NAME}_ENABLE_PARALLEL) ++ find_dependency(MPI) + set (${HDF5_PACKAGE_NAME}_MPI_C_INCLUDE_PATH "@MPI_C_INCLUDE_DIRS@") + set (${HDF5_PACKAGE_NAME}_MPI_C_LIBRARIES "@MPI_C_LIBRARIES@") + if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN) +@@ -111,11 +114,11 @@ set (${HDF5_PACKAGE_NAME}_VERSION_MINOR @HDF5_VERSION_MINOR@) + # project which has already built hdf5 as a subproject + #----------------------------------------------------------------------------- + if (NOT TARGET "@HDF5_PACKAGE@") +- if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS) +- include (@PACKAGE_SHARE_INSTALL_DIR@/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake) ++ if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT) ++ find_dependency(ZLIB) + endif () +- if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS) +- include (@PACKAGE_SHARE_INSTALL_DIR@/@SZIP_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake) ++ if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT) ++ find_dependency(szip) + endif () + include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake) + endif () diff --git a/externals/vcpkg/ports/hdf5/pkgconfig-link-order.patch b/externals/vcpkg/ports/hdf5/pkgconfig-link-order.patch new file mode 100755 index 000000000..a3bcbb080 --- /dev/null +++ b/externals/vcpkg/ports/hdf5/pkgconfig-link-order.patch @@ -0,0 +1,11 @@ +diff --git a/config/libhdf5.pc.in b/config/libhdf5.pc.in +index 4a2ebaa..3cb42d2 100644 +--- a/config/libhdf5.pc.in ++++ b/config/libhdf5.pc.in +@@ -10,5 +10,5 @@ Version: @_PKG_CONFIG_VERSION@ + Cflags: -I${includedir} + Libs: -L${libdir} @_PKG_CONFIG_SH_LIBS@ + Requires: @_PKG_CONFIG_REQUIRES@ +-Libs.private: @_PKG_CONFIG_LIBS_PRIVATE@ @_PKG_CONFIG_LIBS@ ++Libs.private: @_PKG_CONFIG_LIBS@ @_PKG_CONFIG_LIBS_PRIVATE@ + Requires.private: @_PKG_CONFIG_REQUIRES_PRIVATE@ diff --git a/externals/vcpkg/ports/hdf5/pkgconfig-requires.patch b/externals/vcpkg/ports/hdf5/pkgconfig-requires.patch new file mode 100755 index 000000000..c95f0ab43 --- /dev/null +++ b/externals/vcpkg/ports/hdf5/pkgconfig-requires.patch @@ -0,0 +1,192 @@ +diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake +index 141ab44..66b7efa 100644 +--- a/CMakeFilters.cmake ++++ b/CMakeFilters.cmake +@@ -74,6 +74,7 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT) + set (H5_ZLIB_HEADER "zlib.h") + set (ZLIB_INCLUDE_DIR_GEN ${ZLIB_INCLUDE_DIR}) + set (ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR}) ++ set (zlib_PC_LIBS_PRIVATE "${ZLIB_LIBRARIES}") + else () + if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") + EXTERNAL_ZLIB_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT}) +@@ -134,6 +135,7 @@ if (HDF5_ENABLE_SZIP_SUPPORT) + else() + set(SZIP_STATIC_LIBRARY szip-static) + endif() ++ set(szip_PC_LIBS_PRIVATE "${SZIP_STATIC_LIBRARY}") + else () + if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") + EXTERNAL_SZIP_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT} ${HDF5_ENABLE_SZIP_ENCODING}) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b75fdd2..a2e88fd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -750,6 +750,9 @@ if (H5_HAVE_PARALLEL) + if (MPI_C_LINK_FLAGS) + set (CMAKE_EXE_LINKER_FLAGS "${MPI_C_LINK_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}") + endif () ++ if(UNIX) ++ set(ompi-c_PC_LIBS_PRIVATE ${MPI_C_LIBRARIES}) ++ endif() + endif () + + #option (DEFAULT_API_VERSION "Enable v1.12 API (v16, v18, v110, v112)" "v112") +diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt +index 835d422..9a7176f 100644 +--- a/c++/src/CMakeLists.txt ++++ b/c++/src/CMakeLists.txt +@@ -188,14 +188,14 @@ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}") + set (_PKG_CONFIG_LIBS_PRIVATE) + + if (NOT ONLY_SHARED_LIBS) +- set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_CPP_LIB_CORENAME}") ++ set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_CPP_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") + endif () + if (BUILD_SHARED_LIBS) +- set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_CPP_LIB_CORENAME}") ++ set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_CPP_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") + endif () + +-set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") +-set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") ++set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}") ++set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}") + + configure_file ( + ${HDF_CONFIG_DIR}/libhdf5.pc.in +diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake +index ae0ebca..095fae4 100644 +--- a/config/cmake_ext_mod/HDFMacros.cmake ++++ b/config/cmake_ext_mod/HDFMacros.cmake +@@ -384,7 +384,7 @@ macro (HDF_DIR_PATHS package_prefix) + endif () + + #set the default debug suffix for all library targets +- if(NOT CMAKE_DEBUG_POSTFIX) ++ if(NOT DEFINED CMAKE_DEBUG_POSTFIX) + if (WIN32) + set (CMAKE_DEBUG_POSTFIX "_D") + else () +diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt +index e59a829..8da64dd 100644 +--- a/fortran/src/CMakeLists.txt ++++ b/fortran/src/CMakeLists.txt +@@ -545,14 +545,14 @@ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}") + set (_PKG_CONFIG_LIBS_PRIVATE) + + if (NOT ONLY_SHARED_LIBS) +- set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_F90_LIB_CORENAME}") ++ set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_F90_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") + endif () + if (BUILD_SHARED_LIBS) +- set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_F90_LIB_CORENAME}") ++ set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_F90_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") + endif () + +-set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") +-set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") ++set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}") ++set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}") + + configure_file ( + ${HDF_CONFIG_DIR}/libhdf5.pc.in +diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt +index c516df1..89bd31f 100644 +--- a/hl/c++/src/CMakeLists.txt ++++ b/hl/c++/src/CMakeLists.txt +@@ -99,14 +99,14 @@ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}") + set (_PKG_CONFIG_LIBS_PRIVATE) + + if (NOT ONLY_SHARED_LIBS) +- set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}") ++ set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") + endif () + if (BUILD_SHARED_LIBS) +- set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}") ++ set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") + endif () + +-set (_PKG_CONFIG_REQUIRES "${HDF5_HL_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") +-set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_HL_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") ++set (_PKG_CONFIG_REQUIRES "${HDF5_HL_LIB_CORENAME}") ++set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_HL_LIB_CORENAME}") + + configure_file ( + ${HDF_CONFIG_DIR}/libhdf5.pc.in +diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt +index 973299f..8eadfe5 100644 +--- a/hl/fortran/src/CMakeLists.txt ++++ b/hl/fortran/src/CMakeLists.txt +@@ -332,14 +332,14 @@ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}") + set (_PKG_CONFIG_LIBS_PRIVATE) + + if (NOT ONLY_SHARED_LIBS) +- set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_F90_LIB_CORENAME}") ++ set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_F90_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") + endif () + if (BUILD_SHARED_LIBS) +- set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_F90_LIB_CORENAME}") ++ set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_F90_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") + endif () + +-set (_PKG_CONFIG_REQUIRES "${HDF5_F90_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") +-set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_F90_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") ++set (_PKG_CONFIG_REQUIRES "${HDF5_F90_LIB_CORENAME}") ++set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_F90_LIB_CORENAME}") + + configure_file ( + ${HDF_CONFIG_DIR}/libhdf5.pc.in +diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt +index 7678de8..2d398cc 100644 +--- a/hl/src/CMakeLists.txt ++++ b/hl/src/CMakeLists.txt +@@ -131,14 +131,14 @@ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}") + set (_PKG_CONFIG_LIBS_PRIVATE) + + if (NOT ONLY_SHARED_LIBS) +- set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_LIB_CORENAME}") ++ set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") + endif () + if (BUILD_SHARED_LIBS) +- set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_LIB_CORENAME}") ++ set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") + endif () + +-set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") +-set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") ++set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}") ++set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}") + + configure_file ( + ${HDF_CONFIG_DIR}/libhdf5.pc.in +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index b3c2226..ea80d60 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1321,14 +1321,23 @@ foreach (libs ${LINK_LIBS} ${LINK_COMP_LIBS}) + endforeach () + + if (NOT ONLY_SHARED_LIBS) +- set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_LIB_CORENAME}") ++ set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") + endif () + if (BUILD_SHARED_LIBS) +- set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_LIB_CORENAME}") ++ set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") + endif () + + set (_PKG_CONFIG_REQUIRES) + set (_PKG_CONFIG_REQUIRES_PRIVATE) ++set(_PKG_CONFIG_LIBS_PRIVATE " ${_PKG_CONFIG_LIBS_PRIVATE} ") ++foreach(_module IN ITEMS ompi-c szip zlib) ++ if(${_module}_PC_LIBS_PRIVATE) ++ foreach(_lib IN LISTS ${_module}_PC_LIBS_PRIVATE) ++ string(REPLACE " -l${_lib} " " " _PKG_CONFIG_LIBS_PRIVATE "${_PKG_CONFIG_LIBS_PRIVATE}") ++ endforeach() ++ string(APPEND _PKG_CONFIG_REQUIRES_PRIVATE " ${_module}") ++ endif() ++endforeach() + + configure_file ( + ${HDF_CONFIG_DIR}/libhdf5.pc.in diff --git a/externals/vcpkg/ports/hdf5/portfile.cmake b/externals/vcpkg/ports/hdf5/portfile.cmake new file mode 100755 index 000000000..da9f53e78 --- /dev/null +++ b/externals/vcpkg/ports/hdf5/portfile.cmake @@ -0,0 +1,148 @@ +# highfive should be updated together with hdf5 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO HDFGroup/hdf5 + REF hdf5-1_12_2 + SHA512 8f110e035a9bd5b07687b30fb944ed72e5b6a6e0ea74ee650250f40f0d4ff81e304366a76129a50a2d37c7f4c59a57356d0d9eed18db6cb90e924c62273d17a4 + HEAD_REF develop + PATCHES + hdf5_config.patch + szip.patch + pkgconfig-requires.patch + pkgconfig-link-order.patch +) + +set(ALLOW_UNSUPPORTED OFF) +if ("parallel" IN_LIST FEATURES AND "cpp" IN_LIST FEATURES) + message(WARNING "Feature 'Parallel' and 'cpp' are mutually exclusive, enable feature ALLOW_UNSUPPORTED automatically to enable them both.") + set(ALLOW_UNSUPPORTED ON) +endif() + +if ("threadsafe" IN_LIST FEATURES AND + ("parallel" IN_LIST FEATURES + OR "fortran" IN_LIST FEATURES + OR "cpp" IN_LIST FEATURES) + ) + message(WARNING "Feture 'threadsafe' and other features are mutually exclusive, enable feature ALLOW_UNSUPPORTED automatically to enable them both.") + set(ALLOW_UNSUPPORTED ON) +endif() + +if ("fortran" IN_LIST FEATURE) + message(WARNING "Feature 'fortran' is not yet official supported within VCPKG. Build will most likly fail if ninja 1.10 and a Fortran compiler are not available.") +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + parallel HDF5_ENABLE_PARALLEL + tools HDF5_BUILD_TOOLS + cpp HDF5_BUILD_CPP_LIB + szip HDF5_ENABLE_SZIP_SUPPORT + szip HDF5_ENABLE_SZIP_ENCODING + zlib HDF5_ENABLE_Z_LIB_SUPPORT + fortran HDF5_BUILD_FORTRAN + threadsafe HDF5_ENABLE_THREADSAFE + utils HDF5_BUILD_UTILS +) + +file(REMOVE "${SOURCE_PATH}/config/cmake_ext_mod/FindSZIP.cmake")#Outdated; does not find debug szip + +if("tools" IN_LIST FEATURES AND VCPKG_CRT_LINKAGE STREQUAL "static") + list(APPEND FEATURE_OPTIONS -DBUILD_STATIC_EXECS=ON) +endif() + +if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND FEATURE_OPTIONS + -DBUILD_STATIC_LIBS=OFF + -DONLY_SHARED_LIBS=ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + ${FEATURE_OPTIONS} + -DBUILD_TESTING=OFF + -DHDF5_BUILD_EXAMPLES=OFF + -DHDF5_INSTALL_DATA_DIR=share/hdf5/data + -DHDF5_INSTALL_CMAKE_DIR=share/hdf5 + -DHDF_PACKAGE_NAMESPACE:STRING=hdf5:: + -DHDF5_MSVC_NAMING_CONVENTION=OFF + -DSZIP_USE_EXTERNAL=ON + -DALLOW_UNSUPPORTED=${ALLOW_UNSUPPORTED} + OPTIONS_RELEASE + -DCMAKE_DEBUG_POSTFIX= # For lib name in pkgconfig files +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup() + +set(debug_suffix debug) +if(VCPKG_TARGET_IS_WINDOWS) + set(debug_suffix D) +endif() + +vcpkg_fixup_pkgconfig() + +file(GLOB pc_files "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc") +foreach(file IN LISTS pc_files) + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${file}" " -lhdf5" " -llibhdf5") + endif() + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${file}" "/msmpi.lib\"" "/msmpi\"") + endif() +endforeach() + +file(READ "${CURRENT_PACKAGES_DIR}/share/hdf5/hdf5-config.cmake" contents) +string(REPLACE [[${HDF5_PACKAGE_NAME}_TOOLS_DIR "${PACKAGE_PREFIX_DIR}/bin"]] + [[${HDF5_PACKAGE_NAME}_TOOLS_DIR "${PACKAGE_PREFIX_DIR}/tools/hdf5"]] + contents ${contents} +) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/hdf5/hdf5-config.cmake" ${contents}) + +if("tools" IN_LIST FEATURES) + set(HDF5_TOOLS h5cc h5hlcc h5c++ h5hlc++ h5copy h5diff h5dump h5ls h5stat gif2h5 h52gif h5clear h5debug + h5format_convert h5jam h5unjam h5ls h5mkgrp h5repack h5repart h5watch ph5diff h5import + ) + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + list(TRANSFORM HDF5_TOOLS REPLACE "^(.+)$" "\\1-shared") + else() + endif() + + foreach(HDF5_TOOL IN LISTS HDF5_TOOLS) + if (NOT EXISTS "${CURRENT_PACKAGES_DIR}/bin/${HDF5_TOOL}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" + OR NOT EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/${HDF5_TOOL}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + list(REMOVE_ITEM HDF5_TOOLS "${HDF5_TOOL}") + endif() + endforeach() + + if("parallel" IN_LIST FEATURES) + list(APPEND HDF5_TOOLS h5perf) + else() + list(APPEND HDF5_TOOLS h5perf_serial) + endif() + + vcpkg_copy_tools(TOOL_NAMES ${HDF5_TOOLS} AUTO_CLEAN) +endif() + +if ("utils" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES mirror_server mirror_server_stop + AUTO_CLEAN + ) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# Clean up +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) + +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/data/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/hdf5/szip.patch b/externals/vcpkg/ports/hdf5/szip.patch new file mode 100755 index 000000000..98702bbdc --- /dev/null +++ b/externals/vcpkg/ports/hdf5/szip.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake +index d5f801e..141ab44 100644 +--- a/CMakeFilters.cmake ++++ b/CMakeFilters.cmake +@@ -124,6 +124,16 @@ if (HDF5_ENABLE_SZIP_SUPPORT) + set (H5_HAVE_LIBSZ 1) + set (SZIP_INCLUDE_DIR_GEN ${SZIP_INCLUDE_DIR}) + set (SZIP_INCLUDE_DIRS ${SZIP_INCLUDE_DIRS} ${SZIP_INCLUDE_DIR}) ++ elseif(1) ++ find_package(szip CONFIG REQUIRED) ++ set(SZIP_INCLUDE_DIRS "") ++ # SZIP_STATIC_LIBRARY will be used in linking, in cmake and in pkgconfig, ++ # but the actual linkage doesn't matter. ++ if (TARGET szip-shared) ++ set(SZIP_STATIC_LIBRARY szip-shared) ++ else() ++ set(SZIP_STATIC_LIBRARY szip-static) ++ endif() + else () + if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") + EXTERNAL_SZIP_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT} ${HDF5_ENABLE_SZIP_ENCODING}) diff --git a/externals/vcpkg/ports/hdf5/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/hdf5/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..695befcdc --- /dev/null +++ b/externals/vcpkg/ports/hdf5/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,17 @@ + +if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.3) + cmake_policy(PUSH) + cmake_policy(SET CMP0057 NEW) + if(NOT "CONFIG" IN_LIST ARGS AND NOT "NO_MODULE" IN_LIST ARGS AND "HDF5" IN_LIST ARGS) + # The caller hasn't said "CONFIG", so they want the built-in FindHDF5.cmake behavior. Set configurations macros to ensure the built-in script finds us. + if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + set(HDF5_USE_STATIC_LIBRARIES ON) + add_compile_definitions(H5_BUILT_AS_STATIC_LIB) + else() + set(HDF5_USE_STATIC_LIBRARIES OFF) + add_compile_definitions(H5_BUILT_AS_DYNAMIC_LIB) + endif() + endif() + cmake_policy(POP) +endif() +_find_package(${ARGS}) diff --git a/externals/vcpkg/ports/hdf5/vcpkg.json b/externals/vcpkg/ports/hdf5/vcpkg.json new file mode 100755 index 000000000..363719571 --- /dev/null +++ b/externals/vcpkg/ports/hdf5/vcpkg.json @@ -0,0 +1,61 @@ +{ + "name": "hdf5", + "version": "1.12.2", + "port-version": 1, + "description": "HDF5 is a data model, library, and file format for storing and managing data", + "homepage": "https://www.hdfgroup.org/downloads/hdf5/", + "license": "BSD-3-Clause", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "szip", + "zlib" + ], + "features": { + "cpp": { + "description": "Builds cpp lib" + }, + "fortran": { + "description": "Build with fortran" + }, + "parallel": { + "description": "parallel support for HDF5", + "dependencies": [ + "mpi" + ] + }, + "szip": { + "description": "Build with szip", + "dependencies": [ + "szip" + ] + }, + "threadsafe": { + "description": "thread safety for HDF5", + "dependencies": [ + "pthreads" + ] + }, + "tools": { + "description": "Build hdf tools" + }, + "utils": { + "description": "Build HDF5 Utils" + }, + "zlib": { + "description": "Build with zlib", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/healpix/fix-dependency.patch b/externals/vcpkg/ports/healpix/fix-dependency.patch new file mode 100755 index 000000000..87d7336f5 --- /dev/null +++ b/externals/vcpkg/ports/healpix/fix-dependency.patch @@ -0,0 +1,13 @@ +diff --git a/src/cxx/configure.ac b/src/cxx/configure.ac +index 63f05d7..e284f0d 100644 +--- a/src/cxx/configure.ac ++++ b/src/cxx/configure.ac +@@ -175,7 +175,7 @@ CXXCFLAGS_NO_C="$CXXCFLAGS $CPPFLAGS" + LDCCFLAGS="$LDFLAGS $CCFLAGS" + LDCXXFLAGS="$LDFLAGS $CXXCFLAGS" + +-AC_CHECK_LIB([cfitsio],[ffgnrwll],,AC_MSG_ERROR([could not find the cfitsio library]),[-lm]) ++AC_CHECK_LIB([cfitsio -lz],[ffgnrwll],,AC_MSG_ERROR([could not find the cfitsio library]),[-lm -lz]) + AC_CHECK_HEADERS([fitsio.h],,AC_MSG_ERROR([could not find the cfitsio header file]),) + + AC_SUBST(SILENT_RULE) diff --git a/externals/vcpkg/ports/healpix/portfile.cmake b/externals/vcpkg/ports/healpix/portfile.cmake new file mode 100755 index 000000000..dde1ac3c1 --- /dev/null +++ b/externals/vcpkg/ports/healpix/portfile.cmake @@ -0,0 +1,44 @@ +set(HEALPIX_VER 3.50) +set(HEALPIX_PACK_NAME ${HEALPIX_VER}_2018Dec10) + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO healpix + REF Healpix_${HEALPIX_VER} + FILENAME "Healpix_${HEALPIX_PACK_NAME}.tar.gz" + SHA512 29fe680d757bd94651bf029654257cb67286643aad510df4c2f0b06245174411376ec1beca64feebfac14a6fc0194525170635842916d79dcaddeddd9ac6f6c7 + PATCHES fix-dependency.patch +) + +vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH src/cxx + COPY_SOURCE + OPTIONS + --with-libcfitsio-include=${CURRENT_INSTALLED_DIR}/include/cfitsio + --with-libcfitsio-lib=${CURRENT_INSTALLED_DIR}/lib +) + +vcpkg_build_make(BUILD_TARGET compile_all) +#vcpkg_fixup_pkgconfig() + +# Install manually because healpix has no install target +set(OBJ_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/auto") +file(GLOB_RECURSE HEALPIX_LIBS ${OBJ_DIR}/lib/*) +file(INSTALL ${HEALPIX_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + +file(GLOB_RECURSE HEALPIX_INCLUDES ${OBJ_DIR}/include/*) +file(INSTALL ${HEALPIX_INCLUDES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(GLOB_RECURSE HEALPIX_TOOLS ${OBJ_DIR}/bin/*) +file(INSTALL ${HEALPIX_TOOLS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + +if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/") + set(OBJ_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/auto") + file(GLOB_RECURSE HEALPIX_LIBS ${OBJ_DIR}/lib/*) + file(INSTALL ${HEALPIX_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +endif() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/healpix/vcpkg.json b/externals/vcpkg/ports/healpix/vcpkg.json new file mode 100755 index 000000000..15b383f08 --- /dev/null +++ b/externals/vcpkg/ports/healpix/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "healpix", + "version-string": "1.12.10", + "port-version": 8, + "description": "HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelation of a sphere.", + "homepage": "http://healpix.sourceforge.net/", + "supports": "linux", + "dependencies": [ + "cfitsio" + ] +} diff --git a/externals/vcpkg/ports/hedley/portfile.cmake b/externals/vcpkg/ports/hedley/portfile.cmake new file mode 100755 index 000000000..db9d49abc --- /dev/null +++ b/externals/vcpkg/ports/hedley/portfile.cmake @@ -0,0 +1,17 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nemequ/hedley + REF 8fb0604a8095f6c907378cc3f0391520ae843f6f + SHA512 3ce102d348f96bd8c7d44bc7119a8f637041f613e1e6a578c15e24c56f79dbcb0b1bce93bc8779a90cc2e34ab74d09f29d240b4519d592973c59da49923460da + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/hedley.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +file(STRINGS ${SOURCE_PATH}/hedley.h SOURCE_LINES) +# Capture more lines than required to handle future license file changes +list(SUBLIST SOURCE_LINES 0 30 SOURCE_LINES) +list(JOIN SOURCE_LINES "\n" _contents) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "${_contents}") diff --git a/externals/vcpkg/ports/hedley/vcpkg.json b/externals/vcpkg/ports/hedley/vcpkg.json new file mode 100755 index 000000000..636c91c53 --- /dev/null +++ b/externals/vcpkg/ports/hedley/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "hedley", + "version": "15", + "description": "A C/C++ header to help move #ifdefs out of your code", + "homepage": "https://nemequ.github.io/hedley/" +} diff --git a/externals/vcpkg/ports/hexl/portfile.cmake b/externals/vcpkg/ports/hexl/portfile.cmake new file mode 100755 index 000000000..e18590542 --- /dev/null +++ b/externals/vcpkg/ports/hexl/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO intel/hexl + REF b4589b6149a46dd287bcc0c81c746f72bcf6b37d # 1.2.4 + SHA512 79eaec45cf5b83459e41cd26c58118a1d0fa4bc1f07ebb00ebd646c90effb0d1dc26f3c33d28f3f1d3cd1cdff8fd23053790156b1c1a736525681bb6fa1fe027 + HEAD_REF development +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" HEXL_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DHEXL_BENCHMARK=OFF + -DHEXL_COVERAGE=OFF + -DHEXL_TESTING=OFF + -DHEXL_SHARED_LIB=${HEXL_SHARED} +) + +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(PACKAGE_NAME "HEXL" CONFIG_PATH "lib/cmake/hexl-1.2.4") +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") diff --git a/externals/vcpkg/ports/hexl/vcpkg.json b/externals/vcpkg/ports/hexl/vcpkg.json new file mode 100755 index 000000000..86e61f459 --- /dev/null +++ b/externals/vcpkg/ports/hexl/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "hexl", + "version": "1.2.4", + "description": "Intel® HEXL is an open-source library which provides efficient implementations of integer arithmetic on Galois fields.", + "homepage": "https://github.com/intel/hexl", + "license": "Apache-2.0", + "supports": "x64", + "dependencies": [ + "cpu-features", + "easyloggingpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/hffix/CMakeLists.txt b/externals/vcpkg/ports/hffix/CMakeLists.txt new file mode 100755 index 000000000..1f3a52846 --- /dev/null +++ b/externals/vcpkg/ports/hffix/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.10) + +set(PROJECT_NAME hffix) +project(${PROJECT_NAME}) + +include(GNUInstallDirs) + +add_library(hffix INTERFACE) +target_include_directories(hffix INTERFACE + $ + $ +) + +install( + FILES + ${CMAKE_SOURCE_DIR}/include/hffix.hpp + ${CMAKE_SOURCE_DIR}/include/hffix_fields.hpp + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} +) + +install( + TARGETS hffix + EXPORT hffix-config + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) +install(EXPORT hffix-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} NAMESPACE ${PROJECT_NAME}::) \ No newline at end of file diff --git a/externals/vcpkg/ports/hffix/portfile.cmake b/externals/vcpkg/ports/hffix/portfile.cmake new file mode 100755 index 000000000..6a421d731 --- /dev/null +++ b/externals/vcpkg/ports/hffix/portfile.cmake @@ -0,0 +1,23 @@ +# header only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jamesdbrock/hffix + REF v1.0.0 + SHA512 0043b789e6ffdc32eaf2736a8621dd7fd54e1a16aae33bb1d5f642da1b04d150ed42d8f9ddd046013242164854d9091540452153f09459d05f9bf4a186c7b860 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/hffix/vcpkg.json b/externals/vcpkg/ports/hffix/vcpkg.json new file mode 100755 index 000000000..64e8946e9 --- /dev/null +++ b/externals/vcpkg/ports/hffix/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "hffix", + "version-string": "1.0.0", + "port-version": 1, + "description": "Financial Information Exchange Protocol C++ Library", + "homepage": "https://jamesdbrock.github.io/hffix" +} diff --git a/externals/vcpkg/ports/hfsm2/portfile.cmake b/externals/vcpkg/ports/hfsm2/portfile.cmake new file mode 100755 index 000000000..09e71e139 --- /dev/null +++ b/externals/vcpkg/ports/hfsm2/portfile.cmake @@ -0,0 +1,16 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO andrew-gresyk/HFSM2 + REF 1_10_1 + SHA512 49ae09a3e4052c7a70390510d128d4d0a41f3c2b6bb9cf2c0b36d272ca1a2524c1d2b544e4c36655681255ce6a5e2f3f90f8c4e9957e8c49e49a62927134a718 + HEAD_REF master +) + +# Install include directory +file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# Copy usage file +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/hfsm2/usage b/externals/vcpkg/ports/hfsm2/usage new file mode 100755 index 000000000..9c7b99766 --- /dev/null +++ b/externals/vcpkg/ports/hfsm2/usage @@ -0,0 +1,4 @@ +The package hfsm2 is header only and can be used from CMake via: + + find_path(HFSM2_INCLUDE_DIRS "hfsm2/machine.hpp") + target_include_directories(main PRIVATE ${HFSM2_INCLUDE_DIRS}) diff --git a/externals/vcpkg/ports/hfsm2/vcpkg.json b/externals/vcpkg/ports/hfsm2/vcpkg.json new file mode 100755 index 000000000..78e243c50 --- /dev/null +++ b/externals/vcpkg/ports/hfsm2/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "hfsm2", + "version": "1.10.1", + "description": "Header-only heriarchical FSM framework in C++14, with fully statically-defined structure (no dynamic allocations), built with variadic templates.", + "homepage": "https://github.com/andrew-gresyk/HFSM2" +} diff --git a/externals/vcpkg/ports/hidapi/portfile.cmake b/externals/vcpkg/ports/hidapi/portfile.cmake new file mode 100755 index 000000000..b83a4d416 --- /dev/null +++ b/externals/vcpkg/ports/hidapi/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libusb/hidapi + REF hidapi-0.12.0 + SHA512 866268927698db6fa553e000ead3c0c4b8df67ea768d36acac9c71f06f0bd8283778e90eee03f81aaa930f38dbb5719391906c7d2742b74479ffa436104f5fa4 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -DHIDAPI_BUILD_HIDTEST=OFF +) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/hidapi/libhidapi.cmake" "\"/hidapi\"" "\"\${_IMPORT_PREFIX}/include\"") + +file(INSTALL "${SOURCE_PATH}/LICENSE-bsd.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/externals/vcpkg/ports/hidapi/vcpkg.json b/externals/vcpkg/ports/hidapi/vcpkg.json new file mode 100755 index 000000000..4d60e3dc4 --- /dev/null +++ b/externals/vcpkg/ports/hidapi/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "hidapi", + "version-semver": "0.12.0", + "description": "A Simple library for communicating with USB and Bluetooth HID devices on Linux, Mac and Windows.", + "homepage": "https://github.com/libusb/hidapi", + "license": "BSD-3-Clause-Clear", + "supports": "!uwp", + "dependencies": [ + { + "name": "libusb", + "platform": "!(windows | osx)" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/highfive/fix-dependency-hdf5.patch b/externals/vcpkg/ports/highfive/fix-dependency-hdf5.patch new file mode 100755 index 000000000..0220435fd --- /dev/null +++ b/externals/vcpkg/ports/highfive/fix-dependency-hdf5.patch @@ -0,0 +1,19 @@ +diff --git a/CMake/HighFiveTargetDeps.cmake b/CMake/HighFiveTargetDeps.cmake +index 51bc7b2..f04bf4c 100644 +--- a/CMake/HighFiveTargetDeps.cmake ++++ b/CMake/HighFiveTargetDeps.cmake +@@ -10,7 +10,13 @@ if(NOT TARGET libdeps) + if(NOT DEFINED HDF5_C_LIBRARIES) + set(HDF5_NO_FIND_PACKAGE_CONFIG_FILE TRUE) # Consistency + set(HDF5_PREFER_PARALLEL ${HIGHFIVE_PARALLEL_HDF5}) +- find_package(HDF5 REQUIRED) ++ find_package(hdf5 CONFIG REQUIRED) ++ set(HIGHFIVE_PARALLEL_HDF5 ${HDF5_ENABLE_PARALLEL}) ++ if(TARGET hdf5::hdf5-shared) ++ set(HDF5_C_LIBRARIES hdf5::hdf5-shared) ++ elseif(TARGET hdf5::hdf5-static) ++ set(HDF5_C_LIBRARIES hdf5::hdf5-static) ++ endif() + endif() + + if(HIGHFIVE_PARALLEL_HDF5 AND NOT HDF5_IS_PARALLEL) diff --git a/externals/vcpkg/ports/highfive/fix-error-C1128.patch b/externals/vcpkg/ports/highfive/fix-error-C1128.patch new file mode 100755 index 000000000..89b88960a --- /dev/null +++ b/externals/vcpkg/ports/highfive/fix-error-C1128.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9d42b6e..e6d9f18 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,6 +41,10 @@ option(HIGHFIVE_BUILD_DOCS "Enable documentation building" ON) + option(HIGHFIVE_USE_INSTALL_DEPS "End applications by default use detected dependencies here" OFF) + mark_as_advanced(HIGHFIVE_USE_INSTALL_DEPS) + ++# Allow big object ++if(MSVC) ++ add_compile_options(/bigobj) ++endif() + + # Check compiler cxx_std requirements + # ----------------------------------- diff --git a/externals/vcpkg/ports/highfive/portfile.cmake b/externals/vcpkg/ports/highfive/portfile.cmake new file mode 100755 index 000000000..f43ab26b5 --- /dev/null +++ b/externals/vcpkg/ports/highfive/portfile.cmake @@ -0,0 +1,47 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO BlueBrain/HighFive + REF v2.3 + SHA512 5bf8bc6d3a57be39a4fd15f28f8c839706e2c8d6e2270f45ea39c28a2ac1e3c7f31ed2f48390a45a868c714c85f03f960a0bc8fad945c80b41f495e6f4aca36a + HEAD_REF master + PATCHES + fix-dependency-hdf5.patch + fix-error-C1128.patch +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + boost HIGHFIVE_USE_BOOST + tests HIGHFIVE_UNIT_TESTS + xtensor HIGHFIVE_USE_XTENSOR + eigen3 HIGHFIVE_USE_EIGEN +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DHIGHFIVE_EXAMPLES=OFF + -DHIGHFIVE_BUILD_DOCS=OFF +) + +vcpkg_cmake_install() + +if("tests" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES + tests_high_five_base + tests_high_five_easy + tests_high_five_multi_dims + SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/tests/unit" # Tools are not installed so release version tools are manually copied + ) +endif() + +# Use PACKAGE_NAME to avoid folder HighFive and highfive are exist at same time +vcpkg_cmake_config_fixup(PACKAGE_NAME HighFive CONFIG_PATH share/HighFive/CMake) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/highfive/vcpkg.json b/externals/vcpkg/ports/highfive/vcpkg.json new file mode 100755 index 000000000..c30c52860 --- /dev/null +++ b/externals/vcpkg/ports/highfive/vcpkg.json @@ -0,0 +1,54 @@ +{ + "name": "highfive", + "version": "2.3", + "port-version": 2, + "description": "HighFive is a modern header-only C++/C++11 friendly interface for libhdf5", + "homepage": "https://github.com/BlueBrain/HighFive", + "license": "BSL-1.0", + "dependencies": [ + "hdf5", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "boost": { + "description": "Enables Boost support", + "dependencies": [ + "boost-multi-array", + "boost-serialization", + "boost-system", + "boost-ublas" + ] + }, + "eigen3": { + "description": "Enable Eigen testing", + "dependencies": [ + "eigen3" + ] + }, + "tests": { + "description": "Build unit tests", + "dependencies": [ + "boost-test", + { + "name": "highfive", + "features": [ + "boost" + ] + } + ] + }, + "xtensor": { + "description": "Enable xtensor testing", + "dependencies": [ + "xtensor" + ] + } + } +} diff --git a/externals/vcpkg/ports/highway/portfile.cmake b/externals/vcpkg/ports/highway/portfile.cmake new file mode 100755 index 000000000..8a7b9c50b --- /dev/null +++ b/externals/vcpkg/ports/highway/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/highway + REF 0.14.2 + SHA512 fc1a35463c95c45b646c53f91a9996112726de1d588dcd4d25a7d366840f704ad9a4c0bb6e0a001e929409f04aad6922cbffcf93774a0c360aff875956c7cc8d + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +# remove test-related pkg-config files that break vcpkg_fixup_pkgconfig +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libhwy-test.pc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libhwy-test.pc") + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/highway/vcpkg.json b/externals/vcpkg/ports/highway/vcpkg.json new file mode 100755 index 000000000..90cfe5de9 --- /dev/null +++ b/externals/vcpkg/ports/highway/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "highway", + "version-semver": "0.14.2", + "description": "Performance-portable, length-agnostic SIMD with runtime dispatch", + "homepage": "https://github.com/google/highway", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/hiredis/fix-feature-example.patch b/externals/vcpkg/ports/hiredis/fix-feature-example.patch new file mode 100755 index 000000000..eecca4086 --- /dev/null +++ b/externals/vcpkg/ports/hiredis/fix-feature-example.patch @@ -0,0 +1,61 @@ +diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt +index dd3a313..8c69d3a 100644 +--- a/examples/CMakeLists.txt ++++ b/examples/CMakeLists.txt +@@ -19,16 +19,25 @@ if (LIBEV) + TARGET_LINK_LIBRARIES(example-libev hiredis ev) + ENDIF() + +-FIND_PATH(LIBEVENT event.h) +-if (LIBEVENT) ++FIND_PACKAGE(Libevent CONFIG REQUIRED) ++FIND_PATH(LIBEVENT_INCLUDES evutil.h) ++if (UNIX) + ADD_EXECUTABLE(example-libevent example-libevent) +- TARGET_LINK_LIBRARIES(example-libevent hiredis event) ++ TARGET_LINK_LIBRARIES(example-libevent hiredis ${LIBEVENT_LIBRARIES}) ++ TARGET_INCLUDE_DIRECTORIES(example-libevent PRIVATE ${LIBEVENT_INCLUDES}) + ENDIF() + ++FIND_LIBRARY(UV_LIBRARY libuv) + FIND_PATH(LIBUV uv.h) + IF (LIBUV) + ADD_EXECUTABLE(example-libuv example-libuv.c) +- TARGET_LINK_LIBRARIES(example-libuv hiredis uv) ++ if(WIN32) ++ set(LIB_LISTS Iphlpapi.lib Psapi.lib Userenv.lib) ++ else() ++ set(LIB_LISTS) ++ endif() ++ TARGET_LINK_LIBRARIES(example-libuv hiredis ${UV_LIBRARY} ${LIB_LISTS}) ++ TARGET_INCLUDE_DIRECTORIES(example-libuv PRIVATE ${LIBUV}) + ENDIF() + + IF (APPLE) +@@ -38,12 +52,24 @@ IF (APPLE) + ENDIF() + + IF (ENABLE_SSL) ++ FIND_PACKAGE(OpenSSL REQUIRED) ++ IF (WIN32) ++ FIND_PACKAGE(pthreads REQUIRED) ++ SET(THREADS_LIBS PThreads4W::PThreads4W) ++ ELSE() ++ FIND_PACKAGE(Threads) ++ SET(THREADS_LIBS ${CMAKE_THREAD_LIBS_INIT}) ++ ENDIF() + ADD_EXECUTABLE(example-ssl example-ssl.c) +- TARGET_LINK_LIBRARIES(example-ssl hiredis hiredis_ssl) ++ if(WIN32) ++ TARGET_LINK_LIBRARIES(example-ssl hiredis hiredis_ssl OpenSSL::SSL OpenSSL::Crypto ${THREADS_LIBS} crypt32.lib) ++ else() ++ TARGET_LINK_LIBRARIES(example-ssl hiredis hiredis_ssl OpenSSL::SSL OpenSSL::Crypto ${THREADS_LIBS}) ++ endif() + ENDIF() + + ADD_EXECUTABLE(example example.c) +-TARGET_LINK_LIBRARIES(example hiredis) ++TARGET_LINK_LIBRARIES(example hiredis ${LIBEVENT_LIBRARIES}) + + ADD_EXECUTABLE(example-push example-push.c) + TARGET_LINK_LIBRARIES(example-push hiredis) diff --git a/externals/vcpkg/ports/hiredis/fix-include-path.patch b/externals/vcpkg/ports/hiredis/fix-include-path.patch new file mode 100755 index 000000000..8bfeae09d --- /dev/null +++ b/externals/vcpkg/ports/hiredis/fix-include-path.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7eafeb8..623c586 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -49,7 +49,7 @@ IF(WIN32 OR MINGW) + TARGET_LINK_LIBRARIES(hiredis PRIVATE ws2_32) + ENDIF() + +-TARGET_INCLUDE_DIRECTORIES(hiredis PUBLIC $ $) ++TARGET_INCLUDE_DIRECTORIES(hiredis PUBLIC $ $) + + CONFIGURE_FILE(hiredis.pc.in hiredis.pc @ONLY) + diff --git a/externals/vcpkg/ports/hiredis/fix-ssize_t.patch b/externals/vcpkg/ports/hiredis/fix-ssize_t.patch new file mode 100755 index 000000000..521313a68 --- /dev/null +++ b/externals/vcpkg/ports/hiredis/fix-ssize_t.patch @@ -0,0 +1,11 @@ +diff --git a/hiredis.h b/hiredis.h +--- a/hiredis.h ++++ b/hiredis.h +@@ -40,6 +40,7 @@ + #else + struct timeval; /* forward declaration */ + typedef long long ssize_t; ++#define _SSIZE_T_ /* for compatibility with libuv */ + #endif + #include /* uintXX_t, etc */ + #include "sds.h" /* for sds */ diff --git a/externals/vcpkg/ports/hiredis/fix-timeval.patch b/externals/vcpkg/ports/hiredis/fix-timeval.patch new file mode 100755 index 000000000..f389de504 --- /dev/null +++ b/externals/vcpkg/ports/hiredis/fix-timeval.patch @@ -0,0 +1,16 @@ +diff --git a/async_private.h b/async_private.h +index d0133ae..7760b60 100644 +--- a/async_private.h ++++ b/async_private.h +@@ -32,6 +32,11 @@ + #ifndef __HIREDIS_ASYNC_PRIVATE_H + #define __HIREDIS_ASYNC_PRIVATE_H + ++#ifdef _WIN32 ++#include ++#include ++#endif ++ + #define _EL_ADD_READ(ctx) \ + do { \ + refreshTimeout(ctx); \ diff --git a/externals/vcpkg/ports/hiredis/portfile.cmake b/externals/vcpkg/ports/hiredis/portfile.cmake new file mode 100755 index 000000000..6e7e0937d --- /dev/null +++ b/externals/vcpkg/ports/hiredis/portfile.cmake @@ -0,0 +1,43 @@ +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(HIREDIS_PATCHES support-static.patch) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO redis/hiredis + REF v1.0.2 + SHA512 86497a1c21869bbe535378885eee6dbd594ef96325966511a3513f81e501af0f5ac7fed864f3230372f3ac7a23c05bad477fa5aa90b9747c9fb1408028174f9b + HEAD_REF master + PATCHES + fix-feature-example.patch + fix-timeval.patch + fix-include-path.patch + fix-ssize_t.patch + ${HIREDIS_PATCHES} +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + ssl ENABLE_SSL + example ENABLE_EXAMPLES +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup() +if("ssl" IN_LIST FEATURES) + vcpkg_cmake_config_fixup(PACKAGE_NAME hiredis_ssl CONFIG_PATH share/hiredis_ssl) +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/hiredis/support-static.patch b/externals/vcpkg/ports/hiredis/support-static.patch new file mode 100755 index 000000000..47ea4bef6 --- /dev/null +++ b/externals/vcpkg/ports/hiredis/support-static.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9e78894..87aba5b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,4 +22,4 @@ PROJECT(hiredis VERSION "${VERSION}") + ENDIF() + +-ADD_LIBRARY(hiredis SHARED ${hiredis_sources}) ++ADD_LIBRARY(hiredis ${hiredis_sources}) + +@@ -60,5 +60,5 @@ IF(ENABLE_SSL) + SET(hiredis_ssl_sources + ssl.c) +- ADD_LIBRARY(hiredis_ssl SHARED ++ ADD_LIBRARY(hiredis_ssl + ${hiredis_ssl_sources}) + diff --git a/externals/vcpkg/ports/hiredis/vcpkg.json b/externals/vcpkg/ports/hiredis/vcpkg.json new file mode 100755 index 000000000..48379f488 --- /dev/null +++ b/externals/vcpkg/ports/hiredis/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "hiredis", + "version": "1.0.2", + "port-version": 3, + "description": "Hiredis is a minimalistic C client library for the Redis database.", + "homepage": "https://github.com/redis/hiredis", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "example": { + "description": "Build example", + "dependencies": [ + "libevent", + "libuv", + "pthread" + ] + }, + "ssl": { + "description": "Build hiredis_ssl for SSL support", + "dependencies": [ + "openssl" + ] + } + } +} diff --git a/externals/vcpkg/ports/hps/portfile.cmake b/externals/vcpkg/ports/hps/portfile.cmake new file mode 100755 index 000000000..2104177fe --- /dev/null +++ b/externals/vcpkg/ports/hps/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jl2922/hps + REF 8d1403697a2fad6ddf02c7afb190596ca68b2105 + SHA512 e0c22de8a684891a5b6faa968c72782ffb44c5359ce53a4cbd74abf5e1b6d5d1ff30ce96a4fc4c38fc7a0222d6874eab47b76c5a87fce1c43285a915d0f55814 + HEAD_REF master +) + +# Install header files +file(INSTALL + DIRECTORY + "${SOURCE_PATH}/src/" + DESTINATION + "${CURRENT_PACKAGES_DIR}/include/${PORT}" + FILES_MATCHING PATTERN "*.h" ) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/${PORT}/benchmark") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/hps/usage b/externals/vcpkg/ports/hps/usage new file mode 100755 index 000000000..198508212 --- /dev/null +++ b/externals/vcpkg/ports/hps/usage @@ -0,0 +1,4 @@ +The package hps is header only and can be used from CMake via: + + find_path(HPS_INCLUDE_DIRS "hps/hps.h") + target_include_directories(main PRIVATE ${HPS_INCLUDE_DIRS}) diff --git a/externals/vcpkg/ports/hps/vcpkg.json b/externals/vcpkg/ports/hps/vcpkg.json new file mode 100755 index 000000000..2e57b3269 --- /dev/null +++ b/externals/vcpkg/ports/hps/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "hps", + "version-date": "2022-01-18", + "description": "A C++11 High Performance Serialization Library.", + "homepage": "https://github.com/jl2922/hps", + "license": "MIT" +} diff --git a/externals/vcpkg/ports/hpx/fix-dependency-hwloc.patch b/externals/vcpkg/ports/hpx/fix-dependency-hwloc.patch new file mode 100755 index 000000000..b829acd0c --- /dev/null +++ b/externals/vcpkg/ports/hpx/fix-dependency-hwloc.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/FindHwloc.cmake b/cmake/FindHwloc.cmake +index cdede78..6967abf 100644 +--- a/cmake/FindHwloc.cmake ++++ b/cmake/FindHwloc.cmake +@@ -71,6 +71,9 @@ if(NOT TARGET Hwloc::hwloc) + add_library(Hwloc::hwloc INTERFACE IMPORTED) + target_include_directories(Hwloc::hwloc SYSTEM INTERFACE ${HWLOC_INCLUDE_DIR}) + target_link_libraries(Hwloc::hwloc INTERFACE ${HWLOC_LIBRARIES}) +- ++ if(APPLE) ++ target_link_libraries(Hwloc::hwloc INTERFACE "-framework CoreFoundation" "-framework IOKit") ++ endif() ++ + mark_as_advanced(HWLOC_ROOT HWLOC_LIBRARY HWLOC_INCLUDE_DIR) + endif() diff --git a/externals/vcpkg/ports/hpx/portfile.cmake b/externals/vcpkg/ports/hpx/portfile.cmake new file mode 100755 index 000000000..37b181386 --- /dev/null +++ b/externals/vcpkg/ports/hpx/portfile.cmake @@ -0,0 +1,99 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO STEllAR-GROUP/hpx + REF f48c81865800ae72618b40b4e79d4168cfb0bd56 + SHA512 06d1384615b327194d871145c1899317bd350c43a072be2cbfdc773f7869b71aafce3e9cabf835a8fe902a13d7050d5e0400a76f74023985575347a645196b1d + HEAD_REF stable + PATCHES + fix-dependency-hwloc.patch +) + +set(HPX_WITH_MALLOC system) +if(VCPKG_TARGET_IS_LINUX) + # This is done at the request of the hpx maintainers; see + # https://github.com/microsoft/vcpkg/pull/21673#issuecomment-979904882 + # It must match when gperftools is treated as a dependency of this port. + set(HPX_WITH_MALLOC tcmalloc) +endif() + + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DHPX_WITH_VCPKG=ON + -DHPX_WITH_TESTS=OFF + -DHPX_WITH_EXAMPLES=OFF + -DHPX_WITH_TOOLS=OFF + -DHPX_WITH_RUNTIME=OFF + -DHPX_USE_CMAKE_CXX_STANDARD=ON + "-DHPX_WITH_MALLOC=${HPX_WITH_MALLOC}" +) + +vcpkg_cmake_install() + +# post build cleanup +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/HPX) + +file(GLOB_RECURSE CMAKE_FILES "${CURRENT_PACKAGES_DIR}/share/hpx/*.cmake") +foreach(CMAKE_FILE IN LISTS CMAKE_FILES) + file(READ ${CMAKE_FILE} _contents) + string(REGEX REPLACE + "lib/([A-Za-z0-9_.-]+\\.dll)" + "bin/\\1" + _contents "${_contents}") + string(REGEX REPLACE + "lib/hpx/([A-Za-z0-9_.-]+\\.dll)" + "bin/hpx/\\1" + _contents "${_contents}") + file(WRITE ${CMAKE_FILE} "${_contents}") +endforeach() + +vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/share/${PORT}/HPXConfig.cmake" + "set(HPX_BUILD_TYPE \"Release\")" + "set(HPX_BUILD_TYPE \"\${CMAKE_BUILD_TYPE}\")") + +vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/share/${PORT}/HPXMacros.cmake" + "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH}" + "list(APPEND CMAKE_MODULE_PATH") + +file(INSTALL + "${SOURCE_PATH}/LICENSE_1_0.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll") +if(DLLS) + file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE ${DLLS}) +endif() + +file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/hpx/*.dll") +if(DLLS) + file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin/hpx") + file(REMOVE ${DLLS}) +endif() + +file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll") +if(DLLS) + file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE ${DLLS}) +endif() + +file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/hpx/*.dll") +if(DLLS) + file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/hpx") + file(REMOVE ${DLLS}) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/hpxcxx" "\"${CURRENT_PACKAGES_DIR}\"" "os.path.dirname(os.path.dirname(os.path.realpath(__file__)))") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/hpxcxx" "\"${CURRENT_PACKAGES_DIR}/debug\"" "os.path.dirname(os.path.dirname(os.path.realpath(__file__)))") + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/hpx/vcpkg.json b/externals/vcpkg/ports/hpx/vcpkg.json new file mode 100755 index 000000000..3c49969c1 --- /dev/null +++ b/externals/vcpkg/ports/hpx/vcpkg.json @@ -0,0 +1,40 @@ +{ + "name": "hpx", + "version": "1.8.0", + "description": [ + "The C++ Standards Library for Concurrency and Parallelism", + "HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case." + ], + "homepage": "https://github.com/STEllAR-GROUP/hpx", + "license": "BSL-1.0", + "dependencies": [ + "asio", + "boost-accumulators", + "boost-config", + "boost-context", + "boost-dynamic-bitset", + "boost-exception", + "boost-filesystem", + "boost-iostreams", + "boost-lockfree", + "boost-range", + "boost-spirit", + "boost-system", + "boost-throw-exception", + "boost-variant", + "boost-winapi", + { + "name": "gperftools", + "platform": "linux" + }, + "hwloc", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/http-parser/CMakeLists.txt b/externals/vcpkg/ports/http-parser/CMakeLists.txt new file mode 100755 index 000000000..cf3961cb7 --- /dev/null +++ b/externals/vcpkg/ports/http-parser/CMakeLists.txt @@ -0,0 +1,27 @@ +cmake_minimum_required(VERSION 3.4) +project(http-parser C) + +if(CMAKE_BUILD_TYPE MATCHES "Release") + add_definitions(-DHTTP_PARSER_STRICT=0) +endif() + +add_library(http_parser http_parser.c http_parser.h) + +target_include_directories(http_parser PUBLIC $) + +install( + TARGETS http_parser + EXPORT NODEJS_HTTP_PARSER_ALL_TARGETS + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin +) + +install( + EXPORT NODEJS_HTTP_PARSER_ALL_TARGETS + NAMESPACE unofficial::http_parser:: + FILE unofficial-http-parser-config.cmake + DESTINATION share/unofficial-http-parser +) + +install(FILES http_parser.h DESTINATION include) diff --git a/externals/vcpkg/ports/http-parser/portfile.cmake b/externals/vcpkg/ports/http-parser/portfile.cmake new file mode 100755 index 000000000..9aa591773 --- /dev/null +++ b/externals/vcpkg/ports/http-parser/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nodejs/http-parser + REF 2343fd6b5214b2ded2cdcf76de2bf60903bb90cd # v2.9.4 + SHA512 9fb95794d2c278c933e9bff0284befd1a8c8cf8ddda8e9929669f3134246d7fe81b54293359164d947f9278e2dd28b87d29a8ad8f523ed659d62713d782c7e46 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-http-parser TARGET_PATH share/unofficial-http-parser) + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE-MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/http-parser) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/http-parser/LICENSE-MIT ${CURRENT_PACKAGES_DIR}/share/http-parser/copyright) diff --git a/externals/vcpkg/ports/http-parser/vcpkg.json b/externals/vcpkg/ports/http-parser/vcpkg.json new file mode 100755 index 000000000..bd316b2a2 --- /dev/null +++ b/externals/vcpkg/ports/http-parser/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "http-parser", + "version-string": "2.9.4", + "port-version": 1, + "description": "HTTP Parser.", + "homepage": "https://github.com/nodejs/http-parser" +} diff --git a/externals/vcpkg/ports/hungarian/CMakeLists.txt b/externals/vcpkg/ports/hungarian/CMakeLists.txt new file mode 100755 index 000000000..dc0098ca7 --- /dev/null +++ b/externals/vcpkg/ports/hungarian/CMakeLists.txt @@ -0,0 +1,29 @@ +cmake_minimum_required (VERSION 3.8) +project (hungarian C) + +add_library(hungarian + ${CMAKE_CURRENT_LIST_DIR}/libhungarian/hungarian.h + ${CMAKE_CURRENT_LIST_DIR}/libhungarian/hungarian.c +) + +target_include_directories(hungarian PUBLIC + $ + $ +) + +set_target_properties(hungarian PROPERTIES PUBLIC_HEADER ${CMAKE_CURRENT_LIST_DIR}/libhungarian/hungarian.h) + +install( + TARGETS hungarian + EXPORT hungarian + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + PUBLIC_HEADER DESTINATION include +) + +install(EXPORT hungarian + DESTINATION "share/hungarian" + FILE hungarianConfig.cmake + NAMESPACE hungarian:: +) diff --git a/externals/vcpkg/ports/hungarian/LICENSE.txt b/externals/vcpkg/ports/hungarian/LICENSE.txt new file mode 100755 index 000000000..9255ea6bf --- /dev/null +++ b/externals/vcpkg/ports/hungarian/LICENSE.txt @@ -0,0 +1,24 @@ +/******************************************************************** + ******************************************************************** + ** + ** libhungarian by Cyrill Stachniss, 2004 + ** + ** + ** Solving the Minimum Assignment Problem using the + ** Hungarian Method. + ** + ** ** This file may be freely copied and distributed! ** + ** + ** Parts of the used code was originally provided by the + ** "Stanford GraphGase", but I made changes to this code. + ** As asked by the copyright node of the "Stanford GraphGase", + ** I hereby proclaim that this file are *NOT* part of the + ** "Stanford GraphGase" distrubition! + ** + ** This file is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied + ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + ** PURPOSE. + ** + ******************************************************************** + ********************************************************************/ diff --git a/externals/vcpkg/ports/hungarian/portfile.cmake b/externals/vcpkg/ports/hungarian/portfile.cmake new file mode 100755 index 000000000..dc02cdb2e --- /dev/null +++ b/externals/vcpkg/ports/hungarian/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_download_distfile(ARCHIVE + URLS "http://www2.informatik.uni-freiburg.de/~stachnis/misc/libhungarian-v0.1.3.tgz" + FILENAME "libhungarian-v0.1.3.tgz" + SHA512 1fa105e351c307c07bb96892c9d4c44b167d92cbed80962a8653ac35b8afe00fcf5dcc2d920b95671d6c3cd86745362a64dd8dc173623a8179006e2c7b2cbc69 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/hungarian RENAME copyright) diff --git a/externals/vcpkg/ports/hungarian/vcpkg.json b/externals/vcpkg/ports/hungarian/vcpkg.json new file mode 100755 index 000000000..3d74f6cde --- /dev/null +++ b/externals/vcpkg/ports/hungarian/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "hungarian", + "version-string": "v0.1.3", + "port-version": 1, + "description": "C-implementation of the Hungarian Method: finding the optimal assignment (assigning a set of jobs to a set of machines) in O(n^3), where n=max{#jobs, #machines}. The implementation is a sligntly enhanced version of the implementation provided by the Stanford GraphBase" +} diff --git a/externals/vcpkg/ports/hunspell/0001_fix_unistd.patch b/externals/vcpkg/ports/hunspell/0001_fix_unistd.patch new file mode 100755 index 000000000..79a48d824 --- /dev/null +++ b/externals/vcpkg/ports/hunspell/0001_fix_unistd.patch @@ -0,0 +1,78 @@ +From 9f33c841afe51be517eaea318d46985c596c94ff Mon Sep 17 00:00:00 2001 +From: Mikhail Paulyshka +Date: Tue, 25 Jul 2017 01:58:39 +0300 +Subject: [PATCH] tools/hzip: fix build with MSVC + +--- + src/tools/hzip.cxx | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/tools/hzip.cxx b/src/tools/hzip.cxx +index ef1864f..d284c64 100644 +--- a/src/tools/hzip.cxx ++++ b/src/tools/hzip.cxx +@@ -41,7 +41,9 @@ + #include + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif /* HAVE_UNISTD_H */ + #include + #include + +-- +2.12.2.windows.2 + +From 840f920bcd370668b9e788b3c8272eca1f20ce3a Mon Sep 17 00:00:00 2001 +From: Mikhail Paulyshka +Date: Tue, 25 Jul 2017 01:55:13 +0300 +Subject: [PATCH] tools/unmunch: fix build with MSVC + +--- + src/tools/unmunch.cxx | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/tools/unmunch.cxx b/src/tools/unmunch.cxx +index 44b4cb1..2144370 100644 +--- a/src/tools/unmunch.cxx ++++ b/src/tools/unmunch.cxx +@@ -42,7 +42,9 @@ + #include + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif /* HAVE_UNISTD_H */ + #include + #include + #include +-- +2.12.2.windows.2 + +From 1c231aa84624082a0fa52d59be8c449bfe1fadd1 Mon Sep 17 00:00:00 2001 +From: Mikhail Paulyshka +Date: Tue, 25 Jul 2017 01:50:21 +0300 +Subject: [PATCH] tools/munch: fix build with MSVC + +Include only if exists +--- + src/tools/munch.cxx | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/tools/munch.cxx b/src/tools/munch.cxx +index 17fc6fd..8503abe 100644 +--- a/src/tools/munch.cxx ++++ b/src/tools/munch.cxx +@@ -40,7 +40,9 @@ + #include + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif /* HAVE_UNISTD_H */ + #include + #include + #include +-- +2.12.2.windows.2 diff --git a/externals/vcpkg/ports/hunspell/0002-disable-test.patch b/externals/vcpkg/ports/hunspell/0002-disable-test.patch new file mode 100755 index 000000000..e475cba85 --- /dev/null +++ b/externals/vcpkg/ports/hunspell/0002-disable-test.patch @@ -0,0 +1,36 @@ +diff --git a/msvc/Hunspell.sln b/msvc/Hunspell.sln +index 5607c8d..dabd755 100644 +--- a/msvc/Hunspell.sln ++++ b/msvc/Hunspell.sln +@@ -5,8 +5,6 @@ VisualStudioVersion = 14.0.25420.1 + MinimumVisualStudioVersion = 10.0.40219.1 + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libhunspell", "libhunspell.vcxproj", "{53609BB3-D874-465C-AF7B-DF626DB0D89B}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testparser", "testparser.vcxproj", "{611BF6C7-332A-49BB-B2A3-80AFD5B785D9}" +-EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hunspell", "hunspell.vcxproj", "{6A0453F4-B12A-4810-B9A2-8AB059316ED7}" + EndProject + Global +@@ -37,22 +35,6 @@ Global + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release|Win32.Build.0 = Release|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release|x64.ActiveCfg = Release|x64 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release|x64.Build.0 = Release|x64 +- {611BF6C7-332A-49BB-B2A3-80AFD5B785D9}.Debug_dll|Win32.ActiveCfg = Debug|Win32 +- {611BF6C7-332A-49BB-B2A3-80AFD5B785D9}.Debug_dll|Win32.Build.0 = Debug|Win32 +- {611BF6C7-332A-49BB-B2A3-80AFD5B785D9}.Debug_dll|x64.ActiveCfg = Debug|x64 +- {611BF6C7-332A-49BB-B2A3-80AFD5B785D9}.Debug_dll|x64.Build.0 = Debug|x64 +- {611BF6C7-332A-49BB-B2A3-80AFD5B785D9}.Debug|Win32.ActiveCfg = Debug|Win32 +- {611BF6C7-332A-49BB-B2A3-80AFD5B785D9}.Debug|Win32.Build.0 = Debug|Win32 +- {611BF6C7-332A-49BB-B2A3-80AFD5B785D9}.Debug|x64.ActiveCfg = Debug|x64 +- {611BF6C7-332A-49BB-B2A3-80AFD5B785D9}.Debug|x64.Build.0 = Debug|x64 +- {611BF6C7-332A-49BB-B2A3-80AFD5B785D9}.Release_dll|Win32.ActiveCfg = Release|Win32 +- {611BF6C7-332A-49BB-B2A3-80AFD5B785D9}.Release_dll|Win32.Build.0 = Release|Win32 +- {611BF6C7-332A-49BB-B2A3-80AFD5B785D9}.Release_dll|x64.ActiveCfg = Release|x64 +- {611BF6C7-332A-49BB-B2A3-80AFD5B785D9}.Release_dll|x64.Build.0 = Release|x64 +- {611BF6C7-332A-49BB-B2A3-80AFD5B785D9}.Release|Win32.ActiveCfg = Release|Win32 +- {611BF6C7-332A-49BB-B2A3-80AFD5B785D9}.Release|Win32.Build.0 = Release|Win32 +- {611BF6C7-332A-49BB-B2A3-80AFD5B785D9}.Release|x64.ActiveCfg = Release|x64 +- {611BF6C7-332A-49BB-B2A3-80AFD5B785D9}.Release|x64.Build.0 = Release|x64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug_dll|Win32.ActiveCfg = Debug|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug_dll|Win32.Build.0 = Debug|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug_dll|x64.ActiveCfg = Debug|x64 diff --git a/externals/vcpkg/ports/hunspell/0003-fix-win-build.patch b/externals/vcpkg/ports/hunspell/0003-fix-win-build.patch new file mode 100755 index 000000000..a8fe442db --- /dev/null +++ b/externals/vcpkg/ports/hunspell/0003-fix-win-build.patch @@ -0,0 +1,80 @@ +diff --git a/msvc/hunspell.vcxproj b/msvc/hunspell.vcxproj +index ca39388..d4817a5 100644 +--- a/msvc/hunspell.vcxproj ++++ b/msvc/hunspell.vcxproj +@@ -91,7 +91,7 @@ + W32;WIN32;_DEBUG;_CONSOLE;HUNSPELL_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks +- MultiThreadedDebugDLL ++ MultiThreadedDebug + + $(IntDir)$(ProjectName).pdb + Level4 +@@ -112,7 +112,7 @@ + ..\src\hunspell;..\src\parsers;.;%(AdditionalIncludeDirectories) + W32;WIN32;_DEBUG;_CONSOLE;HUNSPELL_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + EnableFastChecks +- MultiThreadedDebugDLL ++ MultiThreadedDebug + + + Level4 +@@ -134,7 +134,7 @@ + AnySuitable + ..\src\hunspell;..\src\parsers;.;%(AdditionalIncludeDirectories) + W32;WIN32;NDEBUG;_CONSOLE;HUNSPELL_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) +- MultiThreadedDLL ++ MultiThreaded + + $(IntDir)$(ProjectName).pdb + Level4 +@@ -157,7 +157,7 @@ + AnySuitable + ..\src\hunspell;..\src\parsers;.;%(AdditionalIncludeDirectories) + W32;WIN32;NDEBUG;_CONSOLE;HUNSPELL_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) +- MultiThreadedDLL ++ MultiThreaded + + + $(IntDir)$(ProjectName).pdb +diff --git a/msvc/libhunspell.vcxproj b/msvc/libhunspell.vcxproj +index a0772da..9a875ca 100644 +--- a/msvc/libhunspell.vcxproj ++++ b/msvc/libhunspell.vcxproj +@@ -166,7 +166,7 @@ + WIN32;_DEBUG;_WINDOWS;_USRDLL;HUNSPELL_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + EnableFastChecks +- MultiThreadedDebugDLL ++ MultiThreadedDebug + + $(IntDir)$(ProjectName).pdb + Level4 +@@ -187,7 +187,7 @@ + WIN32;_DEBUG;_WINDOWS;_USRDLL;HUNSPELL_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + EnableFastChecks +- MultiThreadedDebugDLL ++ MultiThreadedDebug + + + Level4 +@@ -206,7 +206,7 @@ + ..\src\hunspell;.;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;HUNSPELL_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true +- MultiThreadedDLL ++ MultiThreaded + true + + $(IntDir)$(ProjectName).pdb +@@ -232,7 +232,7 @@ + ..\src\hunspell;.;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;HUNSPELL_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true +- MultiThreadedDLL ++ MultiThreaded + true + + diff --git a/externals/vcpkg/ports/hunspell/0004-add-win-arm64.patch b/externals/vcpkg/ports/hunspell/0004-add-win-arm64.patch new file mode 100755 index 000000000..271bc7888 --- /dev/null +++ b/externals/vcpkg/ports/hunspell/0004-add-win-arm64.patch @@ -0,0 +1,529 @@ +diff --git a/msvc/Hunspell.sln b/msvc/Hunspell.sln +index dabd755..9b0d996 100644 +--- a/msvc/Hunspell.sln ++++ b/msvc/Hunspell.sln +@@ -11,46 +11,66 @@ Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_dll|Win32 = Debug_dll|Win32 + Debug_dll|x64 = Debug_dll|x64 ++ Debug_dll|ARM64 = Debug_dll|ARM64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 ++ Debug|ARM64 = Debug|ARM64 + Release_dll|Win32 = Release_dll|Win32 + Release_dll|x64 = Release_dll|x64 ++ Release_dll|ARM64 = Release_dll|ARM64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 ++ Release|ARM64 = Release|ARM64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug_dll|Win32.ActiveCfg = Debug_dll|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug_dll|Win32.Build.0 = Debug_dll|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug_dll|x64.ActiveCfg = Debug_dll|x64 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug_dll|x64.Build.0 = Debug_dll|x64 ++ {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug_dll|ARM64.ActiveCfg = Debug_dll|ARM64 ++ {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug_dll|ARM64.Build.0 = Debug_dll|ARM64 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug|Win32.ActiveCfg = Debug|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug|Win32.Build.0 = Debug|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug|x64.ActiveCfg = Debug|x64 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug|x64.Build.0 = Debug|x64 ++ {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug|ARM64.ActiveCfg = Debug|ARM64 ++ {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug|ARM64.Build.0 = Debug|ARM64 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release_dll|Win32.ActiveCfg = Release_dll|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release_dll|Win32.Build.0 = Release_dll|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release_dll|x64.ActiveCfg = Release_dll|x64 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release_dll|x64.Build.0 = Release_dll|x64 ++ {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release_dll|ARM64.ActiveCfg = Release_dll|ARM64 ++ {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release_dll|ARM64.Build.0 = Release_dll|ARM64 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release|Win32.ActiveCfg = Release|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release|Win32.Build.0 = Release|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release|x64.ActiveCfg = Release|x64 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release|x64.Build.0 = Release|x64 ++ {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release|ARM64.ActiveCfg = Release|ARM64 ++ {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release|ARM64.Build.0 = Release|ARM64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug_dll|Win32.ActiveCfg = Debug|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug_dll|Win32.Build.0 = Debug|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug_dll|x64.ActiveCfg = Debug|x64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug_dll|x64.Build.0 = Debug|x64 ++ {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug_dll|ARM64.ActiveCfg = Debug|ARM64 ++ {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug_dll|ARM64.Build.0 = Debug|ARM64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug|Win32.ActiveCfg = Debug|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug|Win32.Build.0 = Debug|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug|x64.ActiveCfg = Debug|x64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug|x64.Build.0 = Debug|x64 ++ {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug|ARM64.ActiveCfg = Debug|ARM64 ++ {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug|ARM64.Build.0 = Debug|ARM64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release_dll|Win32.ActiveCfg = Release|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release_dll|Win32.Build.0 = Release|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release_dll|x64.ActiveCfg = Release|x64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release_dll|x64.Build.0 = Release|x64 ++ {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release_dll|ARM64.ActiveCfg = Release|ARM64 ++ {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release_dll|ARM64.Build.0 = Release|ARM64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release|Win32.ActiveCfg = Release|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release|Win32.Build.0 = Release|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release|x64.ActiveCfg = Release|x64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release|x64.Build.0 = Release|x64 ++ {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release|ARM64.ActiveCfg = Release|ARM64 ++ {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release|ARM64.Build.0 = Release|ARM64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE +diff --git a/msvc/hunspell.vcxproj b/msvc/hunspell.vcxproj +index d4817a5..b8afa73 100644 +--- a/msvc/hunspell.vcxproj ++++ b/msvc/hunspell.vcxproj +@@ -9,6 +9,10 @@ + Debug + x64 + ++ ++ Debug ++ ARM64 ++ + + Release + Win32 +@@ -17,6 +21,10 @@ + Release + x64 + ++ ++ Release ++ ARM64 ++ + + + {6A0453F4-B12A-4810-B9A2-8AB059316ED7} +@@ -37,6 +45,12 @@ + MultiByte + true + ++ ++ Application ++ v141 ++ MultiByte ++ true ++ + + Application + v140_xp +@@ -47,6 +61,11 @@ + v140_xp + MultiByte + ++ ++ Application ++ v141 ++ MultiByte ++ + + + +@@ -56,12 +75,18 @@ + + + ++ ++ ++ + + + + + + ++ ++ ++ + + + <_ProjectFileVersion>14.0.25420.1 +@@ -75,6 +100,10 @@ + true + $(Platform)\$(Configuration)\$(ProjectName)\ + ++ ++ true ++ $(Platform)\$(Configuration)\$(ProjectName)\ ++ + + $(SolutionDir)$(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ +@@ -84,6 +113,10 @@ + false + $(Platform)\$(Configuration)\$(ProjectName)\ + ++ ++ false ++ $(Platform)\$(Configuration)\$(ProjectName)\ ++ + + + Disabled +@@ -128,6 +161,27 @@ + + + ++ ++ ++ Disabled ++ ..\src\hunspell;..\src\parsers;.;%(AdditionalIncludeDirectories) ++ W32;WIN32;_DEBUG;_CONSOLE;HUNSPELL_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ EnableFastChecks ++ MultiThreadedDebug ++ ++ ++ Level4 ++ ProgramDatabase ++ $(IntDir)$(ProjectName).pdb ++ 4127;4267;4706 ++ ++ ++ true ++ Console ++ ++ ++ ++ + + + Full +@@ -176,6 +230,30 @@ + + + ++ ++ ++ Full ++ AnySuitable ++ ..\src\hunspell;..\src\parsers;.;%(AdditionalIncludeDirectories) ++ W32;WIN32;NDEBUG;_CONSOLE;HUNSPELL_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ MultiThreaded ++ ++ ++ $(IntDir)$(ProjectName).pdb ++ Level4 ++ ++ ++ 4127;4267;4706 ++ ++ ++ true ++ Console ++ true ++ true ++ ++ ++ ++ + + + +diff --git a/msvc/libhunspell.vcxproj b/msvc/libhunspell.vcxproj +index 9a875ca..b7ed6b2 100644 +--- a/msvc/libhunspell.vcxproj ++++ b/msvc/libhunspell.vcxproj +@@ -9,6 +9,10 @@ + Debug_dll + x64 + ++ ++ Debug_dll ++ x64 ++ + + Debug + Win32 +@@ -17,6 +21,10 @@ + Debug + x64 + ++ ++ Debug ++ ARM64 ++ + + Release_dll + Win32 +@@ -24,6 +32,10 @@ + + Release_dll + x64 ++ ++ ++ Release_dll ++ ARM64 + + + Release +@@ -33,6 +45,10 @@ + Release + x64 + ++ ++ Release ++ ARM64 ++ + + + {53609BB3-D874-465C-AF7B-DF626DB0D89B} +@@ -53,6 +69,12 @@ + false + MultiByte + ++ ++ DynamicLibrary ++ v141 ++ false ++ MultiByte ++ + + DynamicLibrary + v140_xp +@@ -67,6 +89,13 @@ + MultiByte + true + ++ ++ DynamicLibrary ++ v141 ++ false ++ MultiByte ++ true ++ + + StaticLibrary + v140_xp +@@ -80,6 +109,13 @@ + false + MultiByte + true ++ ++ ++ StaticLibrary ++ v141 ++ false ++ MultiByte ++ true + + + StaticLibrary +@@ -93,6 +129,12 @@ + false + MultiByte + ++ ++ StaticLibrary ++ v140_xp ++ false ++ MultiByte ++ + + + +@@ -102,24 +144,36 @@ + + + ++ ++ ++ + + + + + + ++ ++ ++ + + + + + + ++ ++ ++ + + + + + + ++ ++ ++ + + + <_ProjectFileVersion>14.0.25420.1 +@@ -141,6 +195,10 @@ + + $(Platform)\$(Configuration)\$(ProjectName)\ + ++ ++ ++ $(Platform)\$(Configuration)\$(ProjectName)\ ++ + + $(SolutionDir)$(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ +@@ -150,12 +208,23 @@ + true + $(Platform)\$(Configuration)\$(ProjectName)\ + ++ ++ true ++ $(Platform)\$(Configuration)\$(ProjectName)\ ++ + + $(Platform)\$(Configuration)\$(ProjectName)\ + ++ ++ $(Platform)\$(Configuration)\$(ProjectName)\ ++ + + $(Platform)\$(Configuration)\$(ProjectName)\ + ++ ++ $(Platform)\$(Configuration)\$(ProjectName)\ ++ ++ + + + echo N | copy /-Y ..\src\hunspell\hunvisapi.h.in ..\src\hunspell\hunvisapi.h +@@ -196,6 +265,25 @@ + + + ++ ++ ++ echo N | copy /-Y ..\src\hunspell\hunvisapi.h.in ..\src\hunspell\hunvisapi.h ++ ++ ++ Disabled ++ ..\src\hunspell;.;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_WINDOWS;_USRDLL;HUNSPELL_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ false ++ EnableFastChecks ++ MultiThreadedDebug ++ ++ ++ Level4 ++ ProgramDatabase ++ 4706;4251;4267 ++ ++ ++ + + + echo N | copy /-Y ..\src\hunspell\hunvisapi.h.in ..\src\hunspell\hunvisapi.h +@@ -250,6 +338,34 @@ + false + + ++ ++ ++ echo N | copy /-Y ..\src\hunspell\hunvisapi.h.in ..\src\hunspell\hunvisapi.h ++ ++ ++ Full ++ AnySuitable ++ ..\src\hunspell;.;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_WINDOWS;_USRDLL;HUNSPELL_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ true ++ MultiThreaded ++ true ++ ++ ++ $(IntDir)$(ProjectName).pdb ++ Level4 ++ ++ ++ 4706;4251;4267 ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ false ++ ++ + + + echo N | copy /-Y ..\src\hunspell\hunvisapi.h.in ..\src\hunspell\hunvisapi.h +@@ -315,6 +431,39 @@ + Windows + + ++ ++ ++ echo N | copy /-Y ..\src\hunspell\hunvisapi.h.in ..\src\hunspell\hunvisapi.h ++ ++ ++ Full ++ AnySuitable ++ ..\src\hunspell;.;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBHUNSPELL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ ++ ++ $(IntDir)$(ProjectName).pdb ++ Level4 ++ ++ ++ 4706;4251;4267 ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ false ++ true ++ true ++ ++ ++ Windows ++ ++ + + + echo N | copy /-Y ..\src\hunspell\hunvisapi.h.in ..\src\hunspell\hunvisapi.h +@@ -366,6 +515,31 @@ + + + ++ ++ ++ echo N | copy /-Y ..\src\hunspell\hunvisapi.h.in ..\src\hunspell\hunvisapi.h ++ ++ ++ Disabled ++ ..\src\hunspell;.;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;BUILDING_LIBHUNSPELL;%(PreprocessorDefinitions) ++ false ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ $(IntDir)$(ProjectName).pdb ++ Level4 ++ ProgramDatabase ++ 4706;4251;4267 ++ ++ ++ true ++ Windows ++ ++ ++ ++ + + + diff --git a/externals/vcpkg/ports/hunspell/portfile.cmake b/externals/vcpkg/ports/hunspell/portfile.cmake new file mode 100755 index 000000000..6c82edd18 --- /dev/null +++ b/externals/vcpkg/ports/hunspell/portfile.cmake @@ -0,0 +1,99 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO hunspell/hunspell + REF v1.7.0 + SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903 + HEAD_REF master + PATCHES + 0001_fix_unistd.patch + 0002-disable-test.patch + 0003-fix-win-build.patch + 0004-add-win-arm64.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS +) + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + file(REMOVE "${SOURCE_PATH}/README") #README is a symlink + + #architecture detection + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(HUNSPELL_ARCH Win32) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(HUNSPELL_ARCH x64) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(HUNSPELL_ARCH ARM64) + else() + message(FATAL_ERROR "unsupported architecture") + endif() + + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(HUNSPELL_CONFIGURATION _dll) + else() + set(HUNSPELL_CONFIGURATION ) + endif() + + if("tools" IN_LIST FEATURES) + set(HSP_TARGET hunspell) + else() + set(HSP_TARGET libhunspell) + endif() + + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "msvc/Hunspell.sln" + INCLUDES_SUBPATH src/hunspell + PLATFORM ${HUNSPELL_ARCH} + RELEASE_CONFIGURATION Release${HUNSPELL_CONFIGURATION} + DEBUG_CONFIGURATION Debug${HUNSPELL_CONFIGURATION} + ALLOW_ROOT_INCLUDES + ) +else() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(ENV{CFLAGS} "$ENV{CFLAGS} -DHUNSPELL_STATIC") + set(ENV{CXXFLAGS} "$ENV{CXXFLAGS} -DHUNSPELL_STATIC") + endif() + if(NOT "tools" IN_LIST FEATURES) # Building the tools is not possible on windows! + file(READ "${SOURCE_PATH}/src/Makefile.am" _contents) + string(REPLACE " parsers tools" "" _contents "${_contents}") + file(WRITE "${SOURCE_PATH}/src/Makefile.am" "${_contents}") + endif() + vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin") + vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + AUTOCONFIG + ADDITIONAL_MSYS_PACKAGES gzip + ) + #install-pkgconfDATA: + vcpkg_build_make(BUILD_TARGET dist LOGFILE_ROOT build-dist) + vcpkg_install_make() + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") + vcpkg_fixup_pkgconfig() +endif() +vcpkg_copy_pdbs() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if (VCPKG_TARGET_IS_WINDOWS) + set(HUNSPELL_EXPORT_HDR "${CURRENT_PACKAGES_DIR}/include/hunvisapi.h") + else() + set(HUNSPELL_EXPORT_HDR "${CURRENT_PACKAGES_DIR}/include/hunspell/hunvisapi.h") + endif() + vcpkg_replace_string( + ${HUNSPELL_EXPORT_HDR} + "#if defined(HUNSPELL_STATIC)" + "#if 1" + ) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright-lgpl) +file(INSTALL "${SOURCE_PATH}/COPYING.MPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright-mpl) diff --git a/externals/vcpkg/ports/hunspell/vcpkg.json b/externals/vcpkg/ports/hunspell/vcpkg.json new file mode 100755 index 000000000..ae1c6d393 --- /dev/null +++ b/externals/vcpkg/ports/hunspell/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "hunspell", + "version": "1.7.0", + "port-version": 8, + "description": "The most popular spellchecking library.", + "homepage": "https://github.com/hunspell/hunspell", + "supports": "!uwp", + "dependencies": [ + "libiconv" + ], + "features": { + "tools": { + "description": "Build hunspell tools", + "dependencies": [ + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/hwloc/fix_shared_win_build.patch b/externals/vcpkg/ports/hwloc/fix_shared_win_build.patch new file mode 100755 index 000000000..dcfadbd48 --- /dev/null +++ b/externals/vcpkg/ports/hwloc/fix_shared_win_build.patch @@ -0,0 +1,30 @@ +diff --git a/configure.ac b/configure.ac +index 8af26ec..0d52b00 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -127,6 +127,8 @@ AS_IF([test "$enable_embedded_mode" != "yes"], + #################################################################### + + AC_SUBST([libhwloc_so_version]) ++libhwloc_so_version_current_minus_age=`expr [[ $libhwloc_so_version=~ ([[:digit:]]+):[[:digit:]]+:([[:digit:]]+) ]] && real_so_ver=$(expr ${BASH_REMATCH[1]} - ${BASH_REMATCH[2]})` ++AC_SUBST(libhwloc_so_version_current_minus_age) + AC_SUBST([libhwloc_so_name]) + + # Setup the hwloc core +diff --git a/hwloc/Makefile.am b/hwloc/Makefile.am +index 4b3800a..f96473c 100644 +--- a/hwloc/Makefile.am ++++ b/hwloc/Makefile.am +@@ -189,11 +189,10 @@ if HWLOC_HAVE_WINDOWS + + LC_MESSAGES=C + export LC_MESSAGES +-ldflags += -Xlinker --output-def -Xlinker .libs/libhwloc.def + + if HWLOC_HAVE_MS_LIB + .libs/libhwloc.lib: libhwloc.la +- [ ! -r .libs/libhwloc.def ] || "$(HWLOC_MS_LIB)" -machine:$(HWLOC_MS_LIB_ARCH) -def:.libs/libhwloc.def -name:libhwloc-$(libhwloc_so_name) -out:.libs/libhwloc.lib ++# [ ! -r .libs/libhwloc.def ] || "$(HWLOC_MS_LIB)" -machine:$(HWLOC_MS_LIB_ARCH) -def:.libs/libhwloc.def -name:libhwloc-$(libhwloc_so_name) -out:.libs/libhwloc.lib + all-local: .libs/libhwloc.lib + endif HWLOC_HAVE_MS_LIB + diff --git a/externals/vcpkg/ports/hwloc/fix_wrong_ifdef.patch b/externals/vcpkg/ports/hwloc/fix_wrong_ifdef.patch new file mode 100755 index 000000000..490715c81 --- /dev/null +++ b/externals/vcpkg/ports/hwloc/fix_wrong_ifdef.patch @@ -0,0 +1,13 @@ +diff --git a/hwloc/topology.c b/hwloc/topology.c +index 01e5a863c..211f2cbd1 100644 +--- a/hwloc/topology.c ++++ b/hwloc/topology.c +@@ -69,7 +69,7 @@ + * it will break in cygwin, we'll have to use both putenv() and SetEnvironmentVariable(). + * Hopefully L0 will be provide a way to enable Sysman without env vars before it happens. + */ +-#ifdef HWLOC_HAVE_ATTRIBUTE_CONSTRUCTOR ++#if HWLOC_HAVE_ATTRIBUTE_CONSTRUCTOR + static void hwloc_constructor(void) __attribute__((constructor)); + static void hwloc_constructor(void) + { diff --git a/externals/vcpkg/ports/hwloc/portfile.cmake b/externals/vcpkg/ports/hwloc/portfile.cmake new file mode 100755 index 000000000..8c328031d --- /dev/null +++ b/externals/vcpkg/ports/hwloc/portfile.cmake @@ -0,0 +1,69 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO open-mpi/hwloc + REF 3cf146011de099c53efee163ea7d3a059fd7bd60 # hwloc-2.7.1 + SHA512 c6c4fbd3a1bea2bd1df65b7512748cd10944a255b145effe6f75d5fa2c5b1da32d344f2cbff3062391d47230e84361620c69f87500113b45992282a512be90b4 + PATCHES + fix_shared_win_build.patch +) + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(OPTIONS ac_cv_prog_cc_c99= # To avoid the compiler check for C99 which will fail for MSVC + --disable-plugin-dlopen) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + list(APPEND OPTIONS "HWLOC_LDFLAGS=-no-undefined") +elseif(VCPKG_TARGET_IS_OSX) + list(APPEND OPTIONS "HWLOC_LDFLAGS=-framework CoreFoundation") +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + ${OPTIONS} + --disable-libxml2 + --disable-opencl + --disable-cairo + --disable-cuda + --disable-libudev + --disable-levelzero + --disable-nvml + --disable-rsmi + --disable-pci + #--disable-cpuid + #--disable-picky +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/hwloc/bin/hwloc-compress-dir") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/hwloc/bin/hwloc-compress-dir" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/hwloc/debug/bin/hwloc-compress-dir") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/hwloc/debug/bin/hwloc-compress-dir" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") +endif() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/hwloc/bin/hwloc-gather-topology") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/hwloc/bin/hwloc-gather-topology" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/hwloc/debug/bin/hwloc-gather-topology") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/hwloc/debug/bin/hwloc-gather-topology" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/COPYING.txt" + "${CURRENT_PACKAGES_DIR}/debug/README.txt" + "${CURRENT_PACKAGES_DIR}/debug/NEWS.txt" + "${CURRENT_PACKAGES_DIR}/COPYING.txt" + "${CURRENT_PACKAGES_DIR}/README.txt" + "${CURRENT_PACKAGES_DIR}/NEWS.txt" + ) diff --git a/externals/vcpkg/ports/hwloc/vcpkg.json b/externals/vcpkg/ports/hwloc/vcpkg.json new file mode 100755 index 000000000..3ede66263 --- /dev/null +++ b/externals/vcpkg/ports/hwloc/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "hwloc", + "version": "2.7.1", + "maintainers": "bgoglin", + "description": [ + "Portable Hardware Locality (hwloc)", + "The Portable Hardware Locality (hwloc) software package provides a portable abstraction (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various system attributes such as cache and memory information as well as the locality of I/O devices such as network interfaces, InfiniBand HCAs or GPUs." + ], + "homepage": "https://github.com/open-mpi/hwloc", + "license": "BSD-2-Clause", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/hyperscan/0001-remove-Werror.patch b/externals/vcpkg/ports/hyperscan/0001-remove-Werror.patch new file mode 100755 index 000000000..0b3f53177 --- /dev/null +++ b/externals/vcpkg/ports/hyperscan/0001-remove-Werror.patch @@ -0,0 +1,27 @@ +From e2c0779de8096623be874c5fa0d275113b9d1204 Mon Sep 17 00:00:00 2001 +From: Nicole Mazzuca +Date: Tue, 22 Sep 2020 14:44:36 -0700 +Subject: [PATCH] remove Werror + +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 83197af..d27eb76 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -235,8 +235,8 @@ else() + if (NOT RELEASE_BUILD) + # -Werror is most useful during development, don't potentially break + # release builds +- set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Werror") +- set(EXTRA_CXX_FLAGS "${EXTRA_CXX_FLAGS} -Werror") ++ #set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Werror") ++ #set(EXTRA_CXX_FLAGS "${EXTRA_CXX_FLAGS} -Werror") + endif() + + if (DISABLE_ASSERTS) +-- +2.24.3 (Apple Git-128) + diff --git a/externals/vcpkg/ports/hyperscan/portfile.cmake b/externals/vcpkg/ports/hyperscan/portfile.cmake new file mode 100755 index 000000000..665a2873f --- /dev/null +++ b/externals/vcpkg/ports/hyperscan/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +set(HYPERSCAN_VERSION 5.4.0) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO intel/hyperscan + REF v${HYPERSCAN_VERSION} + SHA512 cfec3f43b9e8b3fbb2e761927f3a173c1230f2688da710ec7708f2941ce6f550a1d3cb48b0b0e2ccf709807390117a7e40047cb99190bcc341f37eb3da13ae62 + HEAD_REF master + PATCHES + 0001-remove-Werror.patch +) + +vcpkg_find_acquire_program(PYTHON3) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS "-DPYTHON_EXECUTABLE=${PYTHON3}" +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/hyperscan/vcpkg.json b/externals/vcpkg/ports/hyperscan/vcpkg.json new file mode 100755 index 000000000..767c6b810 --- /dev/null +++ b/externals/vcpkg/ports/hyperscan/vcpkg.json @@ -0,0 +1,35 @@ +{ + "name": "hyperscan", + "version": "5.4.0", + "description": "A regular expression library with O(length of input) match times that takes advantage of Intel hardware to provide blazing speed.", + "homepage": "https://www.hyperscan.io", + "license": "BSD-3-Clause", + "supports": "!arm", + "dependencies": [ + "boost-array", + "boost-chrono", + "boost-config", + "boost-core", + "boost-crc", + "boost-detail", + "boost-dynamic-bitset", + "boost-functional", + "boost-graph", + "boost-icl", + "boost-multi-array", + "boost-ptr-container", + "boost-random", + "boost-regex", + "boost-system", + "boost-thread", + "boost-type-traits", + "boost-unordered", + "boost-utility", + "pcre", + "ragel", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/hypodermic/disable_hypodermic_tests.patch b/externals/vcpkg/ports/hypodermic/disable_hypodermic_tests.patch new file mode 100755 index 000000000..2f06ff945 --- /dev/null +++ b/externals/vcpkg/ports/hypodermic/disable_hypodermic_tests.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9b6358a..5f55bc2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -76,7 +76,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMPILER_FLAGS} ${WARNING_FLAGS}") + + + add_subdirectory(Hypodermic) +-add_subdirectory(Hypodermic.Tests) ++#add_subdirectory(Hypodermic.Tests) + + + # uninstall target diff --git a/externals/vcpkg/ports/hypodermic/portfile.cmake b/externals/vcpkg/ports/hypodermic/portfile.cmake new file mode 100755 index 000000000..ec58f3c49 --- /dev/null +++ b/externals/vcpkg/ports/hypodermic/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ybainier/Hypodermic + REF 0e0d85d70aa2f2391dfd84f8af4a3863d4fb1611 # v2.5.3 + SHA512 6fc3f9eca034a4de3f7086bd51e9ba11ee31c8ec000a3e0bdfc06db1f3c12a89b66793adf5d219441e680541e26acaef72d21f9dd0acf3f5fee3aa12d3fb7b4d + HEAD_REF master + PATCHES + "disable_hypodermic_tests.patch" +) + +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/lib" + "${CURRENT_PACKAGES_DIR}/debug" +) + + +# Put the license file where vcpkg expects it +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/hypodermic/vcpkg.json b/externals/vcpkg/ports/hypodermic/vcpkg.json new file mode 100755 index 000000000..6bef7aa6b --- /dev/null +++ b/externals/vcpkg/ports/hypodermic/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "hypodermic", + "version": "2.5.3", + "description": "Hypodermic is a non-intrusive header only IoC container for C++", + "homepage": "https://github.com/ybainier/Hypodermic", + "license": "MIT", + "dependencies": [ + "boost-algorithm", + "boost-config", + "boost-format", + "boost-range", + "boost-signals2", + "boost-system", + "boost-test", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/hypre/fix-dll-install-destination.patch b/externals/vcpkg/ports/hypre/fix-dll-install-destination.patch new file mode 100755 index 000000000..68d335ccf --- /dev/null +++ b/externals/vcpkg/ports/hypre/fix-dll-install-destination.patch @@ -0,0 +1,12 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -459,7 +459,7 @@ install(TARGETS ${PROJECT_NAME} + EXPORT HYPRETargets + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" +- RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + install(FILES ${HYPRE_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + diff --git a/externals/vcpkg/ports/hypre/portfile.cmake b/externals/vcpkg/ports/hypre/portfile.cmake new file mode 100755 index 000000000..8645eaef1 --- /dev/null +++ b/externals/vcpkg/ports/hypre/portfile.cmake @@ -0,0 +1,39 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO hypre-space/hypre + REF v2.23.0 + SHA512 bed8426d093e2290ab443f49deffad96a64e1b3844a4236bc59af19523b16ea8bf2318db21e42ab2b8a4dd529246ba1d9a4eb0cb3bd943633569d03e6311f67f + HEAD_REF master + PATCHES + fix-dll-install-destination.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" HYPRE_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/src" + OPTIONS + -DHYPRE_SHARED=${HYPRE_SHARED} + -DHYPRE_ENABLE_HYPRE_BLAS=OFF + -DHYPRE_ENABLE_HYPRE_LAPACK=OFF + OPTIONS_RELEASE + -DHYPRE_BUILD_TYPE=Release + "-DHYPRE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}" + OPTIONS_DEBUG + -DHYPRE_BUILD_TYPE=Debug + "-DHYPRE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/HYPRE) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/hypre/vcpkg.json b/externals/vcpkg/ports/hypre/vcpkg.json new file mode 100755 index 000000000..bcdb97323 --- /dev/null +++ b/externals/vcpkg/ports/hypre/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "hypre", + "version": "2.23.0", + "description": "Parallel solvers for sparse linear systems featuring multigrid methods", + "homepage": "https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods", + "dependencies": [ + "blas", + "lapack", + "mpi", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/icu/check-autoconf-archive.patch b/externals/vcpkg/ports/icu/check-autoconf-archive.patch new file mode 100755 index 000000000..4da4be13a --- /dev/null +++ b/externals/vcpkg/ports/icu/check-autoconf-archive.patch @@ -0,0 +1,14 @@ +diff --git a/source/configure.ac b/source/configure.ac +index d194c6d..33fcb2f 100644 +--- a/source/configure.ac ++++ b/source/configure.ac +@@ -208,6 +208,8 @@ fi + #AC_CHECK_PROG(AUTOCONF, autoconf, autoconf, true) + #AC_CHECK_PROG(STRIP, strip, strip, true) + ++m4_ifndef([AX_CHECK_COMPILE_FLAG], [AC_MSG_ERROR(['autoconf-archive' is missing])]) ++ + # TODO(ICU-20301): Remove fallback to Python 2. + AC_CHECK_PROGS(PYTHON, python3 "py -3" python "py") + AC_SUBST(PYTHON) + diff --git a/externals/vcpkg/ports/icu/disable-escapestr-tool.patch b/externals/vcpkg/ports/icu/disable-escapestr-tool.patch new file mode 100755 index 000000000..5c42e56e7 --- /dev/null +++ b/externals/vcpkg/ports/icu/disable-escapestr-tool.patch @@ -0,0 +1,17 @@ +diff --git a/source/tools/Makefile.in b/source/tools/Makefile.in +index e0896f1..5ead980 100644 +--- a/source/tools/Makefile.in ++++ b/source/tools/Makefile.in +@@ -19,9 +19,9 @@ SUBDIRS = toolutil ctestfw makeconv genrb genbrk \ + gencnval gensprep icuinfo genccode gencmn icupkg pkgdata \ + gentest gennorm2 gencfu gendict icuexportdata + +-ifneq (@platform_make_fragment_name@,mh-cygwin-msvc) +-SUBDIRS += escapesrc +-endif ++#ifneq (@platform_make_fragment_name@,mh-cygwin-msvc) ++#SUBDIRS += escapesrc ++#endif + + ## List of phony targets + .PHONY : all all-local all-recursive install install-local \ diff --git a/externals/vcpkg/ports/icu/disable-static-prefix.patch b/externals/vcpkg/ports/icu/disable-static-prefix.patch new file mode 100755 index 000000000..4e63e3375 --- /dev/null +++ b/externals/vcpkg/ports/icu/disable-static-prefix.patch @@ -0,0 +1,20 @@ +diff --git a/source/icudefs.mk.in b/source/icudefs.mk.in +index 24bd97a..33169de 100644 +--- a/source/icudefs.mk.in ++++ b/source/icudefs.mk.in +@@ -213,13 +213,13 @@ LIBICU = $(LIBPREFIX)$(ICUPREFIX) + + ## If we can't use the shared libraries, use the static libraries + ifneq ($(ENABLE_SHARED),YES) +-STATIC_PREFIX_WHEN_USED = s ++STATIC_PREFIX_WHEN_USED = + else + STATIC_PREFIX_WHEN_USED = + endif + + # Static library prefix and file extension +-STATIC_PREFIX = s ++STATIC_PREFIX = + LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) + A = a + SOBJ = $(SO) diff --git a/externals/vcpkg/ports/icu/fix-extra.patch b/externals/vcpkg/ports/icu/fix-extra.patch new file mode 100755 index 000000000..935dfd775 --- /dev/null +++ b/externals/vcpkg/ports/icu/fix-extra.patch @@ -0,0 +1,13 @@ +diff --urN a/source/extra/Makefile.in b/source/extra/Makefile.in +--- a/source/extra/Makefile.in ++++ b/source/extra/Makefile.in +@@ -23,7 +23,7 @@ + ## Files to remove for 'make clean' + CLEANFILES = *~ + +-SUBDIRS = scrptrun uconv ++SUBDIRS = uconv + + ## List of phony targets + .PHONY : all all-local all-recursive install install-local \ + diff --git a/externals/vcpkg/ports/icu/fix-win-build.patch b/externals/vcpkg/ports/icu/fix-win-build.patch new file mode 100755 index 000000000..0c2e46cfb --- /dev/null +++ b/externals/vcpkg/ports/icu/fix-win-build.patch @@ -0,0 +1,35 @@ +diff --git a/source/configure.ac b/source/configure.ac +index 425fdc7..97210f8 100644 +--- a/source/configure.ac ++++ b/source/configure.ac +@@ -114,6 +114,15 @@ AC_ARG_ENABLE([icu-config], + esac], [enable_icu_config=true]) + AC_SUBST(INSTALL_ICU_CONFIG, [$enable_icu_config]) + ++AC_ARG_ENABLE([icu-build-win], ++ AS_HELP_STRING([--enable-icu-build-win], [install icu-build-win]), ++ [case "${enableval}" in ++ yes) enable_icu_build_win=true ;; ++ no) enable_icu_build_win=false ;; ++ *) AC_MSG_ERROR([bad value '${enableval}' for --enable-icu-build-win]) ;; ++ esac], [enable_icu_build_win=true]) ++AC_SUBST(INSTALL_ICU_BUILD_WIN, [$enable_icu_build_win]) ++ + # Check whether to build debug libraries + AC_MSG_CHECKING([whether to build debug libraries]) + enabled=no +@@ -263,12 +272,14 @@ ICU_CHECK_MH_FRAG + # Checks for libraries and other host specific stuff + # On HP/UX, don't link to -lm from a shared lib because it isn't + # PIC (at least on 10.2) ++if test "$enable_icu_build_win" = no; then + case "${host}" in + *-*-hpux*) AC_CHECK_LIB(m, floor, LIB_M="-lm") ;; + + *) AC_CHECK_LIB(m, floor) + LIB_M="" ;; + esac ++fi + AC_SUBST(LIB_M) + + # Check whether to build shared libraries diff --git a/externals/vcpkg/ports/icu/fix_parallel_build_on_windows.patch b/externals/vcpkg/ports/icu/fix_parallel_build_on_windows.patch new file mode 100755 index 000000000..6bd91094a --- /dev/null +++ b/externals/vcpkg/ports/icu/fix_parallel_build_on_windows.patch @@ -0,0 +1,25 @@ +diff --urN a/source/data/Makefile.in b/source/data/Makefile.in +--- a/source/data/Makefile.in ++++ b/source/data/Makefile.in +@@ -236,11 +236,12 @@ + ## Include the main build rules for data files + include $(top_builddir)/$(subdir)/rules.mk + ++PKGDATA_LIST = $(TMP_DIR)/icudata.lst + + ifeq ($(ENABLE_SO_VERSION_DATA),1) + ifeq ($(PKGDATA_MODE),dll) + SO_VERSION_DATA = $(OUTTMPDIR)/icudata.res +-$(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc | $(TMP_DIR)/dirs.timestamp ++$(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc $(PKGDATA_LIST) + ifeq ($(MSYS_RC_MODE),1) + rc.exe -i$(srcdir)/../common -i$(top_builddir)/common -fo$@ $(CPPFLAGS) $< + else +@@ -249,7 +250,6 @@ + endif + endif + +-PKGDATA_LIST = $(TMP_DIR)/icudata.lst + + + ##################################################### diff --git a/externals/vcpkg/ports/icu/mingw-dll-install.patch b/externals/vcpkg/ports/icu/mingw-dll-install.patch new file mode 100755 index 000000000..26c778365 --- /dev/null +++ b/externals/vcpkg/ports/icu/mingw-dll-install.patch @@ -0,0 +1,13 @@ +diff --git a/source/config/mh-mingw64 b/source/config/mh-mingw64 +index fb64c56..a43cc4d 100644 +--- a/source/config/mh-mingw64 ++++ b/source/config/mh-mingw64 +@@ -10,7 +10,7 @@ + # On Windows we generally have the DLLs in the bin directory rather than the lib directory. + # This setting moves the ICU DLLs into the bin folder for MinGW/MSYS2 when "make install" is run. + # If you prefer to have the DLLs in the lib folder, then set this to NO instead. +-MINGW_MOVEDLLSTOBINDIR = YES ++MINGW_MOVEDLLSTOBINDIR = NO + + # This file is similar to mh-mingw + # Any changes made here may also need to be made in mh-mingw diff --git a/externals/vcpkg/ports/icu/portfile.cmake b/externals/vcpkg/ports/icu/portfile.cmake new file mode 100755 index 000000000..8aff183cc --- /dev/null +++ b/externals/vcpkg/ports/icu/portfile.cmake @@ -0,0 +1,202 @@ +set(ICU_VERSION_MAJOR 71) +set(ICU_VERSION_MINOR 1) +set(VERSION "${ICU_VERSION_MAJOR}.${ICU_VERSION_MINOR}") +set(VERSION2 "${ICU_VERSION_MAJOR}_${ICU_VERSION_MINOR}") +set(VERSION3 "${ICU_VERSION_MAJOR}-${ICU_VERSION_MINOR}") + +vcpkg_download_distfile( + ARCHIVE + URLS "https://github.com/unicode-org/icu/releases/download/release-${VERSION3}/icu4c-${VERSION2}-src.tgz" + FILENAME "icu4c-${VERSION2}-src.tgz" + SHA512 1fd2a20aef48369d1f06e2bb74584877b8ad0eb529320b976264ec2db87420bae242715795f372dbc513ea80047bc49077a064e78205cd5e8b33d746fd2a2912 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + disable-escapestr-tool.patch + remove-MD-from-configure.patch + fix_parallel_build_on_windows.patch + fix-extra.patch + mingw-dll-install.patch + disable-static-prefix.patch # https://gitlab.kitware.com/cmake/cmake/-/issues/16617; also mingw. + fix-win-build.patch + check-autoconf-archive.patch +) + +vcpkg_find_acquire_program(PYTHON3) +set(ENV{PYTHON} "${PYTHON3}") + +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND CONFIGURE_OPTIONS --enable-icu-build-win) +endif() + +list(APPEND CONFIGURE_OPTIONS --disable-samples --disable-tests --disable-layoutex) + +list(APPEND CONFIGURE_OPTIONS_RELEASE --disable-debug --enable-release) +list(APPEND CONFIGURE_OPTIONS_DEBUG --enable-debug --disable-release) + +set(RELEASE_TRIPLET ${TARGET_TRIPLET}-rel) +set(DEBUG_TRIPLET ${TARGET_TRIPLET}-dbg) + +if(CMAKE_HOST_WIN32 AND VCPKG_TARGET_IS_MINGW AND NOT HOST_TRIPLET MATCHES "mingw") + # Assuming no cross compiling because the host (windows) pkgdata tool doesn't + # use the '/' path separator when creating compiler commands for mingw bash. +elseif(VCPKG_CROSSCOMPILING) + set(TOOL_PATH "${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}") + # convert to unix path + string(REGEX REPLACE "^([a-zA-Z]):/" "/\\1/" _VCPKG_TOOL_PATH "${TOOL_PATH}") + list(APPEND CONFIGURE_OPTIONS "--with-cross-build=${_VCPKG_TOOL_PATH}") +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + PROJECT_SUBPATH source + ADDITIONAL_MSYS_PACKAGES autoconf-archive + OPTIONS ${CONFIGURE_OPTIONS} + OPTIONS_RELEASE ${CONFIGURE_OPTIONS_RELEASE} + OPTIONS_DEBUG ${CONFIGURE_OPTIONS_DEBUG} + DETERMINE_BUILD_TRIPLET +) + +if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")) + + vcpkg_build_make() + # remove this block if https://unicode-org.atlassian.net/browse/ICU-21458 + # is resolved and use the configure script instead + if(DEFINED CMAKE_INSTALL_NAME_DIR) + set(ID_PREFIX "${CMAKE_INSTALL_NAME_DIR}") + else() + set(ID_PREFIX "@rpath") + endif() + + # install_name_tool may be missing if cross-compiling + find_program( + INSTALL_NAME_TOOL + install_name_tool + HINTS /usr/bin /Library/Developer/CommandLineTools/usr/bin/ + DOC "Absolute path of install_name_tool" + REQUIRED + ) + + message(STATUS "setting rpath prefix for macOS dynamic libraries") + + # add ID_PREFIX to libicudata libicui18n libicuio libicutu libicuuc + foreach(LIB_NAME libicudata libicui18n libicuio libicutu libicuuc) + vcpkg_execute_build_process( + COMMAND ${INSTALL_NAME_TOOL} -id "${ID_PREFIX}/${LIB_NAME}.${ICU_VERSION_MAJOR}.dylib" + "${LIB_NAME}.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" + LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" + ) + endforeach() + + # add ID_PREFIX to libicui18n libicuio libicutu dependencies + foreach(LIB_NAME libicui18n libicuio) + vcpkg_execute_build_process( + COMMAND ${INSTALL_NAME_TOOL} -change "libicuuc.${ICU_VERSION_MAJOR}.dylib" + "${ID_PREFIX}/libicuuc.${ICU_VERSION_MAJOR}.dylib" + "${LIB_NAME}.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" + LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" + ) + vcpkg_execute_build_process( + COMMAND ${INSTALL_NAME_TOOL} -change "libicudata.${ICU_VERSION_MAJOR}.dylib" + "${ID_PREFIX}/libicudata.${ICU_VERSION_MAJOR}.dylib" + "${LIB_NAME}.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" + LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" + ) + endforeach() + + # add ID_PREFIX to remaining libicuio libicutu dependencies + foreach(LIB_NAME libicuio libicutu) + vcpkg_execute_build_process( + COMMAND ${INSTALL_NAME_TOOL} -change "libicui18n.${ICU_VERSION_MAJOR}.dylib" + "${ID_PREFIX}/libicui18n.${ICU_VERSION_MAJOR}.dylib" + "${LIB_NAME}.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" + LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" + ) + endforeach() + + # add ID_PREFIX to libicuuc dependencies + vcpkg_execute_build_process( + COMMAND ${INSTALL_NAME_TOOL} -change "libicudata.${ICU_VERSION_MAJOR}.dylib" + "${ID_PREFIX}/libicudata.${ICU_VERSION_MAJOR}.dylib" + "libicuuc.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" + LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" + ) +endif() + +vcpkg_install_make() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/share" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/lib/icu" + "${CURRENT_PACKAGES_DIR}/debug/lib/icu" + "${CURRENT_PACKAGES_DIR}/debug/lib/icud") + +file(GLOB TEST_LIBS + "${CURRENT_PACKAGES_DIR}/lib/*test*" + "${CURRENT_PACKAGES_DIR}/debug/lib/*test*") +if(TEST_LIBS) + file(REMOVE ${TEST_LIBS}) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # force U_STATIC_IMPLEMENTATION macro + foreach(HEADER utypes.h utf_old.h platform.h) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unicode/${HEADER}" "defined(U_STATIC_IMPLEMENTATION)" "1") + endforeach() +endif() + +# Install executables from /tools/icu/sbin to /tools/icu/bin on unix (/bin because icu require this for cross compiling) +if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) + vcpkg_copy_tools( + TOOL_NAMES icupkg gennorm2 gencmn genccode gensprep + SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools/icu/sbin" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin" + ) +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/tools/icu/sbin" + "${CURRENT_PACKAGES_DIR}/tools/icu/debug") + +# To cross compile, we need some files at specific positions. So lets copy them +file(GLOB CROSS_COMPILE_DEFS "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/config/icucross.*") +file(INSTALL ${CROSS_COMPILE_DEFS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/config") + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(GLOB RELEASE_DLLS "${CURRENT_PACKAGES_DIR}/lib/*icu*${ICU_VERSION_MAJOR}.dll") + file(COPY ${RELEASE_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") +endif() + +# copy dlls +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(GLOB RELEASE_DLLS "${CURRENT_PACKAGES_DIR}/lib/*icu*${ICU_VERSION_MAJOR}.dll") + file(COPY ${RELEASE_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(GLOB DEBUG_DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/*icu*${ICU_VERSION_MAJOR}.dll") + file(COPY ${DEBUG_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# remove any remaining dlls in /lib +file(GLOB DUMMY_DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll" "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll") +if(DUMMY_DLLS) + file(REMOVE ${DUMMY_DLLS}) +endif() + +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread m) + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/icu/bin/icu-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../") + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/icu/remove-MD-from-configure.patch b/externals/vcpkg/ports/icu/remove-MD-from-configure.patch new file mode 100755 index 000000000..fe4782b34 --- /dev/null +++ b/externals/vcpkg/ports/icu/remove-MD-from-configure.patch @@ -0,0 +1,18 @@ +diff -urN a/source/runConfigureICU b/source/runConfigureICU +--- a/source/runConfigureICU 2018-03-26 21:38:44.000000000 +0800 ++++ b/source/runConfigureICU 2018-08-26 09:04:53.197454400 +0800 +@@ -322,10 +322,10 @@ + THE_COMP="Microsoft Visual C++" + CC=cl; export CC + CXX=cl; export CXX +- RELEASE_CFLAGS='-Gy -MD' +- RELEASE_CXXFLAGS='-Gy -MD' +- DEBUG_CFLAGS='-FS -Zi -MDd' +- DEBUG_CXXFLAGS='-FS -Zi -MDd' ++ RELEASE_CFLAGS='-Gy' ++ RELEASE_CXXFLAGS='-Gy' ++ DEBUG_CFLAGS='-FS -Zi' ++ DEBUG_CXXFLAGS='-FS -Zi' + DEBUG_LDFLAGS='-DEBUG' + ;; + *BSD) diff --git a/externals/vcpkg/ports/icu/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/icu/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..cb9d60157 --- /dev/null +++ b/externals/vcpkg/ports/icu/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,6 @@ +list(FIND ARGS "COMPONENTS" COMPONENTS_IDX) +if(COMPONENTS_IDX EQUAL -1) + _find_package(${ARGS} COMPONENTS data) +else() + _find_package(${ARGS}) +endif() \ No newline at end of file diff --git a/externals/vcpkg/ports/icu/vcpkg.json b/externals/vcpkg/ports/icu/vcpkg.json new file mode 100755 index 000000000..9f40f50dd --- /dev/null +++ b/externals/vcpkg/ports/icu/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "icu", + "version": "71.1", + "description": "Mature and widely used Unicode and localization library.", + "homepage": "https://icu.unicode.org/home", + "license": "ICU", + "supports": "!uwp", + "dependencies": [ + { + "name": "icu", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ideviceinstaller/portfile.cmake b/externals/vcpkg/ports/ideviceinstaller/portfile.cmake new file mode 100755 index 000000000..869ada8d5 --- /dev/null +++ b/externals/vcpkg/ports/ideviceinstaller/portfile.cmake @@ -0,0 +1,16 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libimobiledevice-win32/ideviceinstaller + REF 1.1.2.23 + SHA512 d0801b3a38eb02206a6f06e05cc19b794c69a87c06895165f64522c61e07030046499c5f0e436981682f9e17f91eae87913cca091e2e039a74ee35a5136100d4 + HEAD_REF msvc-master +) + +vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH ideviceinstaller.vcxproj + LICENSE_SUBPATH COPYING + USE_VCPKG_INTEGRATION +) + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/externals/vcpkg/ports/ideviceinstaller/vcpkg.json b/externals/vcpkg/ports/ideviceinstaller/vcpkg.json new file mode 100755 index 000000000..0d10509af --- /dev/null +++ b/externals/vcpkg/ports/ideviceinstaller/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "ideviceinstaller", + "version-string": "1.1.2.23", + "port-version": 3, + "description": "Manage apps of iOS devices", + "supports": "!(windows & arm64)", + "dependencies": [ + "libimobiledevice", + "libzip" + ] +} diff --git a/externals/vcpkg/ports/idevicerestore/fix-libgen.h-cannot-be-found.patch b/externals/vcpkg/ports/idevicerestore/fix-libgen.h-cannot-be-found.patch new file mode 100755 index 000000000..db7450eb2 --- /dev/null +++ b/externals/vcpkg/ports/idevicerestore/fix-libgen.h-cannot-be-found.patch @@ -0,0 +1,32 @@ +diff --git a/src/common.c b/src/common.c +index afe1bc0..9219a8f 100644 +--- a/src/common.c ++++ b/src/common.c +@@ -29,7 +29,9 @@ + #include + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include + + #include "common.h" +diff --git a/src/idevicerestore.c b/src/idevicerestore.c +index efa13c3..c17a2ba 100644 +--- a/src/idevicerestore.c ++++ b/src/idevicerestore.c +@@ -38,12 +38,12 @@ + #include + #ifndef _MSC_VER + #include ++#include + #endif + #include + #include + #include + #include +-#include + + #include + diff --git a/externals/vcpkg/ports/idevicerestore/fix-vcxproj.patch b/externals/vcpkg/ports/idevicerestore/fix-vcxproj.patch new file mode 100755 index 000000000..79ff322b3 --- /dev/null +++ b/externals/vcpkg/ports/idevicerestore/fix-vcxproj.patch @@ -0,0 +1,44 @@ +diff --git a/idevicerestore.vcxproj b/idevicerestore.vcxproj +index fa209fa..6afa088 100644 +--- a/idevicerestore.vcxproj ++++ b/idevicerestore.vcxproj +@@ -92,9 +92,10 @@ + Disabled + true + _MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS ++ 4996 + + +- kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies) ++ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl-d.lib;%(AdditionalDependencies) + + + +@@ -103,9 +104,10 @@ + Disabled + true + _MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS ++ 4996 + + +- kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies) ++ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl-d.lib;%(AdditionalDependencies) + + + +@@ -116,6 +118,7 @@ + true + true + _MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS ++ 4996 + + + true +@@ -131,6 +134,7 @@ + true + true + _MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS ++ 4996 + + + true diff --git a/externals/vcpkg/ports/idevicerestore/portfile.cmake b/externals/vcpkg/ports/idevicerestore/portfile.cmake new file mode 100755 index 000000000..0bc503cea --- /dev/null +++ b/externals/vcpkg/ports/idevicerestore/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libimobiledevice-win32/idevicerestore + REF 1.0.12 + SHA512 ba623be56c2f37853516d7d4c32e16f1ec72f33d512f18aa812ce6830af4b9e389f7af5321888dd0ddd168e282b652e379b60f90970680e213eabf489f406915 + HEAD_REF msvc-master + PATCHES + fix-vcxproj.patch + fix-libgen.h-cannot-be-found.patch +) + +vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH idevicerestore.vcxproj + LICENSE_SUBPATH COPYING + USE_VCPKG_INTEGRATION +) + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/externals/vcpkg/ports/idevicerestore/vcpkg.json b/externals/vcpkg/ports/idevicerestore/vcpkg.json new file mode 100755 index 000000000..056ccaf12 --- /dev/null +++ b/externals/vcpkg/ports/idevicerestore/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "idevicerestore", + "version": "1.0.12", + "port-version": 7, + "description": "Restore/upgrade firmware of iOS devices", + "supports": "windows", + "dependencies": [ + "curl", + "libimobiledevice", + "libirecovery", + "libzip" + ] +} diff --git a/externals/vcpkg/ports/if97/portfile.cmake b/externals/vcpkg/ports/if97/portfile.cmake new file mode 100755 index 000000000..57c2b5c55 --- /dev/null +++ b/externals/vcpkg/ports/if97/portfile.cmake @@ -0,0 +1,16 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO CoolProp/IF97 + REF v2.1.2 + SHA512 a7625fcc1ca0763df5b4cf5be741babbaefc09022940b4fc5ee1c05121751282c18ebd87ae58e1eee9bdb46dab5ae6fb4ed9a31fc2c53dc6de5cbd243fa4c8e9 + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/IF97.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +file( + INSTALL ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/if97 + RENAME copyright +) diff --git a/externals/vcpkg/ports/if97/vcpkg.json b/externals/vcpkg/ports/if97/vcpkg.json new file mode 100755 index 000000000..56f733bde --- /dev/null +++ b/externals/vcpkg/ports/if97/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "if97", + "version-string": "2.1.2", + "port-version": 1, + "description": "This repository implements the IF97 formulation for the properties of pure water substance.", + "homepage": "https://github.com/CoolProp/IF97" +} diff --git a/externals/vcpkg/ports/igloo/portfile.cmake b/externals/vcpkg/ports/igloo/portfile.cmake new file mode 100755 index 000000000..6a9ce3881 --- /dev/null +++ b/externals/vcpkg/ports/igloo/portfile.cmake @@ -0,0 +1,14 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO joakimkarlsson/igloo + REF igloo.1.1.1 + SHA512 69d8edb840aa1e2c1df4529a39b94e2d33dbc9fb5869ae91a0f062d29b7fbb73d4e2180080e7696cb69fbf5126c7c53c98dddb003e0e5e796812330e1a4ba32e + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/igloo DESTINATION ${CURRENT_PACKAGES_DIR}/include/ FILES_MATCHING PATTERN *.h) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/igloo/external/snowhouse) +file(WRITE "${CURRENT_PACKAGES_DIR}/include/igloo/external/snowhouse/snowhouse/snowhouse.h" "#include ") + +file(COPY ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/igloo) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/igloo/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/igloo/copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/igloo/vcpkg.json b/externals/vcpkg/ports/igloo/vcpkg.json new file mode 100755 index 000000000..58c0a3c1e --- /dev/null +++ b/externals/vcpkg/ports/igloo/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "igloo", + "version-string": "1.1.1", + "port-version": 1, + "description": "A framework for unit testing in C++" +} diff --git a/externals/vcpkg/ports/ignition-cmake0/do-not-compile-gtest.patch b/externals/vcpkg/ports/ignition-cmake0/do-not-compile-gtest.patch new file mode 100755 index 000000000..7c20a0dbe --- /dev/null +++ b/externals/vcpkg/ports/ignition-cmake0/do-not-compile-gtest.patch @@ -0,0 +1,14 @@ +diff --git a/cmake/IgnConfigureBuild.cmake b/cmake/IgnConfigureBuild.cmake +--- a/cmake/IgnConfigureBuild.cmake ++++ b/cmake/IgnConfigureBuild.cmake +@@ -109,7 +109,9 @@ + # Add all the source code directories + add_subdirectory(src) + add_subdirectory(include) +- add_subdirectory(test) ++ if(BUILD_TESTING) ++ add_subdirectory(test) ++ endif() + + + #-------------------------------------- diff --git a/externals/vcpkg/ports/ignition-cmake0/fix-find-ign-curl.patch b/externals/vcpkg/ports/ignition-cmake0/fix-find-ign-curl.patch new file mode 100755 index 000000000..9189712d2 --- /dev/null +++ b/externals/vcpkg/ports/ignition-cmake0/fix-find-ign-curl.patch @@ -0,0 +1,16 @@ +diff -r 3276aecbcbb4 -r 33b5d95affd2 cmake/FindIgnCURL.cmake +--- a/cmake/FindIgnCURL.cmake ++++ b/cmake/FindIgnCURL.cmake +@@ -46,6 +46,12 @@ + + # Older versions of curl don't create imported targets, so we will create + # them here if they have not been provided. ++ if(TARGET CURL::libcurl AND NOT TARGET curl::curl) ++ add_library(curl::curl INTERFACE IMPORTED) ++ set_target_properties(curl::curl PROPERTIES ++ INTERFACE_LINK_LIBRARIES CURL::libcurl) ++ endif() ++ + include(IgnImportTarget) + + if(NOT TARGET curl::curl) diff --git a/externals/vcpkg/ports/ignition-cmake0/portfile.cmake b/externals/vcpkg/ports/ignition-cmake0/portfile.cmake new file mode 100755 index 000000000..4e2d7dbaa --- /dev/null +++ b/externals/vcpkg/ports/ignition-cmake0/portfile.cmake @@ -0,0 +1,24 @@ +set(PACKAGE_VERSION "0.6.1") + +ignition_modular_library(NAME cmake + VERSION ${PACKAGE_VERSION} + REF "ignition-cmake_${PACKAGE_VERSION}" + SHA512 9414db04ef6ce0206aba4eb1c8192524249761976b82654da89222e0931d1e2bbd63dcc7f4e6c6fddbc71e54911e9bf9fcbd159f51862e89419e0686bfb035e9 + # Ensure that gtest is not compiled (backport of https://bitbucket.org/ignitionrobotics/ign-cmake/pull-requests/163) + PATCHES do-not-compile-gtest.patch + # Support for ARM64 (backport of https://bitbucket.org/ignitionrobotics/ign-cmake/pull-requests/168) + support-arm64.patch + # Do not depend on pkg-config installed to find uuid + uuid-do-not-require-pkg-config.patch + # Fix FindIgnCURL.cmake (backport of https://bitbucket.org/ignitionrobotics/ign-cmake/pull-requests/175) + fix-find-ign-curl.patch + ) + +# Permit empty include folder +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +# Remove unneccessary directory, as ignition-cmake is a pure CMake package +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug") + +# Install custom usage +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/externals/vcpkg/ports/ignition-cmake0/support-arm64.patch b/externals/vcpkg/ports/ignition-cmake0/support-arm64.patch new file mode 100755 index 000000000..aba99ba35 --- /dev/null +++ b/externals/vcpkg/ports/ignition-cmake0/support-arm64.patch @@ -0,0 +1,17 @@ +diff -r 8a976a308d77 -r 1bea7874cfec cmake/IgnSetCompilerFlags.cmake +--- a/cmake/IgnSetCompilerFlags.cmake ++++ b/cmake/IgnSetCompilerFlags.cmake +@@ -279,13 +279,6 @@ + # Don't pull in the Windows min/max macros + add_definitions(-DNOMINMAX) + +- if (MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8) +- # Not needed if a proper cmake generator (-G "...Win64") is passed +- # to cmake. Enable as a second measure to work around bug +- # http://www.cmake.org/Bug/print_bug_page.php?bug_id=11240 +- set(CMAKE_SHARED_LINKER_FLAGS "/machine:x64") +- endif() +- + if(USE_IGN_RECOMMENDED_FLAGS) + + # Gy: Prevent errors caused by multiply-defined symbols diff --git a/externals/vcpkg/ports/ignition-cmake0/usage b/externals/vcpkg/ports/ignition-cmake0/usage new file mode 100755 index 000000000..66da98102 --- /dev/null +++ b/externals/vcpkg/ports/ignition-cmake0/usage @@ -0,0 +1,3 @@ +The package ignition-cmake0 provides CMake integration: + + find_package(ignition-cmake0 CONFIG REQUIRED) diff --git a/externals/vcpkg/ports/ignition-cmake0/uuid-do-not-require-pkg-config.patch b/externals/vcpkg/ports/ignition-cmake0/uuid-do-not-require-pkg-config.patch new file mode 100755 index 000000000..6953391fa --- /dev/null +++ b/externals/vcpkg/ports/ignition-cmake0/uuid-do-not-require-pkg-config.patch @@ -0,0 +1,30 @@ +diff --git a/cmake/FindUUID.cmake b/cmake/FindUUID.cmake +index bf055d4..15be822 100644 +--- a/cmake/FindUUID.cmake ++++ b/cmake/FindUUID.cmake +@@ -18,4 +18,25 @@ + if (UNIX) + include(IgnPkgConfig) + ign_pkg_check_modules(UUID uuid) ++ ++ # If pkg-config is not available in the system, ++ # it is neccessary to manually find uuid ++ if(NOT TARGET UUID::UUID) ++ find_path(UUID_INCLUDE_DIRS NAMES uuid.h PATH_SUFFIXES uuid) ++ mark_as_advanced(UUID_INCLUDE_DIRS) ++ ++ find_library(UUID_LIBRARIES NAMES uuid libuuid) ++ mark_as_advanced(UUID_LIBRARIES) ++ ++ if(NOT UUID_INCLUDE_DIRS OR NOT UUID_LIBRARIES) ++ set(UUID_FOUND false) ++ else() ++ set(UUID_FOUND true) ++ endif() ++ ++ if(UUID_FOUND) ++ include(IgnImportTarget) ++ ign_import_target(UUID) ++ endif() ++ endif() + endif() diff --git a/externals/vcpkg/ports/ignition-cmake0/vcpkg.json b/externals/vcpkg/ports/ignition-cmake0/vcpkg.json new file mode 100755 index 000000000..6d97e8a6e --- /dev/null +++ b/externals/vcpkg/ports/ignition-cmake0/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "ignition-cmake0", + "version": "0.6.2", + "port-version": 4, + "description": "CMake helper functions for building robotic applications", + "homepage": "https://ignitionrobotics.org/libs/cmake", + "license": null, + "dependencies": [ + { + "name": "ignition-modularscripts", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ignition-cmake2/FindGTS.patch b/externals/vcpkg/ports/ignition-cmake2/FindGTS.patch new file mode 100755 index 000000000..47bb145e0 --- /dev/null +++ b/externals/vcpkg/ports/ignition-cmake2/FindGTS.patch @@ -0,0 +1,31 @@ +diff --git a/cmake/FindGTS.cmake b/cmake/FindGTS.cmake +index ad00a9715..a83d8af40 100644 +--- a/cmake/FindGTS.cmake ++++ b/cmake/FindGTS.cmake +@@ -67,6 +67,26 @@ else() + # 2.1 Need glib library + find_library(GLIB_LIBRARY glib-2.0) + list(APPEND GTS_LIBRARIES "${GLIB_LIBRARY}") ++ find_path(GLIB_INCLUDE_DIRS glib.h ++ HINTS ++ ${CMAKE_FIND_ROOT_PATH} ++ PATH ++ ${CMAKE_FIND_ROOT_PATH} ++ PATH_SUFFIXES ++ include ++ include/glib-2.0 ++ DOC "glib header include dir" ++ ) ++ find_path(GLIB_CONFIG_INCLUDE_DIRS glibconfig.h ++ HINTS ++ ${CMAKE_FIND_ROOT_PATH} ++ PATHS ++ ${CMAKE_FIND_ROOT_PATH} ++ PATH_SUFFIXES ++ lib/glib-2.0/include ++ doc "glib header include dir" ++ ) ++ list(APPEND GTS_INCLUDE_DIRS ${GLIB_INCLUDE_DIRS} ${GLIB_CONFIG_INCLUDE_DIRS}) + + if (GTS_FOUND) + # We need to manually specify the pkgconfig entry (and type of entry), diff --git a/externals/vcpkg/ports/ignition-cmake2/portfile.cmake b/externals/vcpkg/ports/ignition-cmake2/portfile.cmake new file mode 100755 index 000000000..cdf98d511 --- /dev/null +++ b/externals/vcpkg/ports/ignition-cmake2/portfile.cmake @@ -0,0 +1,9 @@ +set(PACKAGE_VERSION "2.5.0") + +ignition_modular_library(NAME cmake + VERSION ${PACKAGE_VERSION} + SHA512 e39ed44ae6f7ccc338412f466f1257f88989e0818bee801ddbe09350e906cd9ce709be24356310fdbfde22d1b5b5846fed0aa794c06dcf7caf82748a07b428d6 + PATCHES FindGTS.patch) + +# Install custom usage +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/externals/vcpkg/ports/ignition-cmake2/usage b/externals/vcpkg/ports/ignition-cmake2/usage new file mode 100755 index 000000000..b62ba0c76 --- /dev/null +++ b/externals/vcpkg/ports/ignition-cmake2/usage @@ -0,0 +1,3 @@ +The package ignition-cmake2 provides CMake integration: + + find_package(ignition-cmake2 CONFIG REQUIRED) diff --git a/externals/vcpkg/ports/ignition-cmake2/vcpkg.json b/externals/vcpkg/ports/ignition-cmake2/vcpkg.json new file mode 100755 index 000000000..8f00a65bc --- /dev/null +++ b/externals/vcpkg/ports/ignition-cmake2/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "ignition-cmake2", + "version": "2.5.0", + "port-version": 2, + "description": "CMake helper functions for building robotic applications", + "homepage": "https://ignitionrobotics.org/libs/cmake", + "license": null, + "dependencies": [ + { + "name": "ignition-modularscripts", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ignition-common1/portfile.cmake b/externals/vcpkg/ports/ignition-common1/portfile.cmake new file mode 100755 index 000000000..6bea5e2e2 --- /dev/null +++ b/externals/vcpkg/ports/ignition-common1/portfile.cmake @@ -0,0 +1,4 @@ +ignition_modular_library(NAME common + VERSION "1.1.1" + REF ignition-common_1.1.1 + SHA512 3311a07fad8fdf809ff3f865de2493ec17c3dd157ee3297f283cf872090fb9e9f05b163416dca32f1bdf2bde02c9b4a9a7defc308344b747a8d113594f65f309) diff --git a/externals/vcpkg/ports/ignition-common1/vcpkg.json b/externals/vcpkg/ports/ignition-common1/vcpkg.json new file mode 100755 index 000000000..bb85740f1 --- /dev/null +++ b/externals/vcpkg/ports/ignition-common1/vcpkg.json @@ -0,0 +1,35 @@ +{ + "name": "ignition-common1", + "version": "1.1.1", + "port-version": 3, + "description": "Common libraries for robotics applications", + "license": null, + "dependencies": [ + { + "name": "dlfcn-win32", + "platform": "windows | uwp" + }, + { + "name": "ffmpeg", + "platform": "!windows & !uwp" + }, + { + "name": "freeimage", + "platform": "!windows & !uwp" + }, + { + "name": "gts", + "platform": "!windows & !uwp" + }, + "ignition-cmake0", + "ignition-math4", + { + "name": "ignition-modularscripts", + "host": true + }, + { + "name": "tinyxml2", + "platform": "!windows & !uwp" + } + ] +} diff --git a/externals/vcpkg/ports/ignition-common3/portfile.cmake b/externals/vcpkg/ports/ignition-common3/portfile.cmake new file mode 100755 index 000000000..1f460f1c5 --- /dev/null +++ b/externals/vcpkg/ports/ignition-common3/portfile.cmake @@ -0,0 +1,10 @@ +ignition_modular_library(NAME common + VERSION "3.9.0" + SHA512 1bae86efd7da10ac517d67a75ad1b612ea2046128eb75e0f0a134ffff7cc76431e850a9b46fdb7dc6603e2acb044f4204fdedaf38fc7bff82883db3f36830fb9) + +# Remove non-relocatable helper scripts (see https://github.com/ignitionrobotics/ign-common/issues/82) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/ign_remotery_vis" "${CURRENT_PACKAGES_DIR}/debug/bin/ign_remotery_vis") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() diff --git a/externals/vcpkg/ports/ignition-common3/vcpkg.json b/externals/vcpkg/ports/ignition-common3/vcpkg.json new file mode 100755 index 000000000..341296b84 --- /dev/null +++ b/externals/vcpkg/ports/ignition-common3/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "ignition-common3", + "version": "3.9.0", + "port-version": 3, + "description": "Common libraries for robotics applications", + "homepage": "https://ignitionrobotics.org/libs/common", + "license": null, + "dependencies": [ + { + "name": "dlfcn-win32", + "platform": "windows | uwp" + }, + "ffmpeg", + "freeimage", + "gts", + "ignition-cmake2", + "ignition-math6", + { + "name": "ignition-modularscripts", + "host": true + }, + { + "name": "libuuid", + "platform": "!windows & !uwp & !osx" + }, + "tinyxml2" + ] +} diff --git a/externals/vcpkg/ports/ignition-fuel-tools1/link-correct-yaml-target.patch b/externals/vcpkg/ports/ignition-fuel-tools1/link-correct-yaml-target.patch new file mode 100755 index 000000000..0ceab3406 --- /dev/null +++ b/externals/vcpkg/ports/ignition-fuel-tools1/link-correct-yaml-target.patch @@ -0,0 +1,24 @@ +diff -r 29939b8a25be -r 8a0a85e63950 CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,7 +9,7 @@ + # Find ignition-cmake + #============================================================================ + # If you get an error at this line, you need to install ignition-cmake +-find_package(ignition-cmake0 REQUIRED) ++find_package(ignition-cmake0 0.4.1 REQUIRED) + + #============================================================================ + # Configure the project +diff -r 29939b8a25be -r 8a0a85e63950 src/CMakeLists.txt +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -52,7 +52,7 @@ + curl::curl + ignition-common${IGN_COMMON_MAJOR_VER}::ignition-common${IGN_COMMON_MAJOR_VER} + ${JSONCPP_TARGET} +- YAML::YAML ++ ${YAML_TARGET} + ZIP::ZIP + ) + diff --git a/externals/vcpkg/ports/ignition-fuel-tools1/portfile.cmake b/externals/vcpkg/ports/ignition-fuel-tools1/portfile.cmake new file mode 100755 index 000000000..3911029ed --- /dev/null +++ b/externals/vcpkg/ports/ignition-fuel-tools1/portfile.cmake @@ -0,0 +1,9 @@ +ignition_modular_library(NAME fuel-tools + VERSION "1.2.0" + CMAKE_PACKAGE_NAME ignition-fuel_tools1 + SHA512 44ce9215231981f393cf1f6f83071e3f1c5d29bef4fab8d6483eb136b6e2a2e4273e85845f8b2336c4d50ac5fdcc6eb028a972baa0950083c8fa700f85cc7078 + # Ensure yaml is correctly linked (backport of https://bitbucket.org/ignitionrobotics/ign-fuel-tools/pull-requests/103/use-yaml_target-instead-of-yaml-yaml/diff) + PATCHES link-correct-yaml-target.patch + # This can be removed when the pc file of curl is fixed + DISABLE_PKGCONFIG_INSTALL + ) diff --git a/externals/vcpkg/ports/ignition-fuel-tools1/vcpkg.json b/externals/vcpkg/ports/ignition-fuel-tools1/vcpkg.json new file mode 100755 index 000000000..1f4b69293 --- /dev/null +++ b/externals/vcpkg/ports/ignition-fuel-tools1/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "ignition-fuel-tools1", + "version": "1.2.0", + "port-version": 4, + "description": "Tools for using fuel API to download robot models", + "license": null, + "dependencies": [ + "curl", + "ignition-cmake0", + "ignition-common1", + { + "name": "ignition-modularscripts", + "host": true + }, + "jsoncpp", + "libyaml", + "libzip" + ] +} diff --git a/externals/vcpkg/ports/ignition-fuel-tools4/portfile.cmake b/externals/vcpkg/ports/ignition-fuel-tools4/portfile.cmake new file mode 100755 index 000000000..f542987ff --- /dev/null +++ b/externals/vcpkg/ports/ignition-fuel-tools4/portfile.cmake @@ -0,0 +1,5 @@ +ignition_modular_library(NAME fuel-tools + VERSION "4.3.0" + CMAKE_PACKAGE_NAME ignition-fuel_tools4 + SHA512 1996e487bf8dcb29798064b1a12fe972931e84bcb19a4df2398d34cda9963bc9eef6dd14446c22c18f0de894dcdf35852669ce62b57562b1609045248f41ea0f + ) diff --git a/externals/vcpkg/ports/ignition-fuel-tools4/vcpkg.json b/externals/vcpkg/ports/ignition-fuel-tools4/vcpkg.json new file mode 100755 index 000000000..3b5b17a11 --- /dev/null +++ b/externals/vcpkg/ports/ignition-fuel-tools4/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "ignition-fuel-tools4", + "version": "4.3.0", + "port-version": 2, + "description": "Tools for using fuel API to download robot models", + "homepage": "https://ignitionrobotics.org/libs/fuel_tools", + "license": null, + "dependencies": [ + "curl", + "ignition-cmake2", + "ignition-common3", + { + "name": "ignition-modularscripts", + "host": true + }, + "ignition-msgs5", + "jsoncpp", + "libyaml", + "libzip", + "tinyxml2" + ] +} diff --git a/externals/vcpkg/ports/ignition-math4/portfile.cmake b/externals/vcpkg/ports/ignition-math4/portfile.cmake new file mode 100755 index 000000000..352330d67 --- /dev/null +++ b/externals/vcpkg/ports/ignition-math4/portfile.cmake @@ -0,0 +1,3 @@ +ignition_modular_library(NAME math + VERSION "4.0.0" + SHA512 b0559c691335d43e4cbb986ff13cdee9c65ce59d8e3a15808d9b052fc064263560fece71d670d5417b4b713fcd7ac32f5b808703ff472979a7226e0c1b2089aa) diff --git a/externals/vcpkg/ports/ignition-math4/vcpkg.json b/externals/vcpkg/ports/ignition-math4/vcpkg.json new file mode 100755 index 000000000..33466e290 --- /dev/null +++ b/externals/vcpkg/ports/ignition-math4/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "ignition-math4", + "version": "4.0.0", + "port-version": 3, + "description": "Math API for robotic applications", + "homepage": "https://ignitionrobotics.org/libs/math", + "license": null, + "dependencies": [ + "ignition-cmake0", + { + "name": "ignition-modularscripts", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ignition-math6/fix-isspace.patch b/externals/vcpkg/ports/ignition-math6/fix-isspace.patch new file mode 100755 index 000000000..70d593229 --- /dev/null +++ b/externals/vcpkg/ports/ignition-math6/fix-isspace.patch @@ -0,0 +1,12 @@ +diff --git a/include/ignition/math/Color.hh b/include/ignition/math/Color.hh +index faf7a08..16758c5 100644 +--- a/include/ignition/math/Color.hh ++++ b/include/ignition/math/Color.hh +@@ -18,6 +18,7 @@ + #define IGNITION_MATH_COLOR_HH_ + + #include ++#include + + #include + #include diff --git a/externals/vcpkg/ports/ignition-math6/portfile.cmake b/externals/vcpkg/ports/ignition-math6/portfile.cmake new file mode 100755 index 000000000..fc9ac4469 --- /dev/null +++ b/externals/vcpkg/ports/ignition-math6/portfile.cmake @@ -0,0 +1,4 @@ +ignition_modular_library(NAME math + VERSION "6.6.0" + SHA512 6c0a6e7098f31b3dc9abbcd8714808669eca10e385748d4c1b44aa06dcfa5701906bea0277a99c3132fdd1a8c9a8e9c593099ac0eedfe5dec370018b2b63bfec + PATCHES fix-isspace.patch) diff --git a/externals/vcpkg/ports/ignition-math6/vcpkg.json b/externals/vcpkg/ports/ignition-math6/vcpkg.json new file mode 100755 index 000000000..dc47d8753 --- /dev/null +++ b/externals/vcpkg/ports/ignition-math6/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "ignition-math6", + "version": "6.6.0", + "port-version": 3, + "description": "Math API for robotic applications", + "homepage": "https://ignitionrobotics.org/libs/math", + "license": null, + "dependencies": [ + "eigen3", + "ignition-cmake2", + { + "name": "ignition-modularscripts", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ignition-modularscripts/portfile.cmake b/externals/vcpkg/ports/ignition-modularscripts/portfile.cmake new file mode 100755 index 000000000..cabf97adc --- /dev/null +++ b/externals/vcpkg/ports/ignition-modularscripts/portfile.cmake @@ -0,0 +1,7 @@ +file(INSTALL + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "") + +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/ignition-modularscripts/vcpkg-port-config.cmake b/externals/vcpkg/ports/ignition-modularscripts/vcpkg-port-config.cmake new file mode 100755 index 000000000..8a1729d50 --- /dev/null +++ b/externals/vcpkg/ports/ignition-modularscripts/vcpkg-port-config.cmake @@ -0,0 +1,149 @@ + +function(ignition_modular_build_library NAME MAJOR_VERSION SOURCE_PATH CMAKE_PACKAGE_NAME DEFAULT_CMAKE_PACKAGE_NAME IML_DISABLE_PKGCONFIG_INSTALL) + vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE + OPTIONS -DBUILD_TESTING=OFF + ) + + vcpkg_install_cmake(ADD_BIN_TO_PATH) + + # If necessary, move the CMake config files + if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake") + # Some ignition libraries install library subcomponents, that are effectively additional cmake packages + # with name ${CMAKE_PACKAGE_NAME}-${COMPONENT_NAME}, so it is needed to call vcpkg_fixup_cmake_targets for them as well + file(GLOB COMPONENTS_CMAKE_PACKAGE_NAMES + LIST_DIRECTORIES TRUE + RELATIVE "${CURRENT_PACKAGES_DIR}/lib/cmake/" + "${CURRENT_PACKAGES_DIR}/lib/cmake/*") + + foreach(COMPONENT_CMAKE_PACKAGE_NAME IN LISTS COMPONENTS_CMAKE_PACKAGE_NAMES) + vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/${COMPONENT_CMAKE_PACKAGE_NAME}" + TARGET_PATH "share/${COMPONENT_CMAKE_PACKAGE_NAME}" + DO_NOT_DELETE_PARENT_CONFIG_PATH) + endforeach() + + file(GLOB_RECURSE CMAKE_RELEASE_FILES + "${CURRENT_PACKAGES_DIR}/lib/cmake/${CMAKE_PACKAGE_NAME}/*") + + file(COPY ${CMAKE_RELEASE_FILES} DESTINATION + "${CURRENT_PACKAGES_DIR}/share/${CMAKE_PACKAGE_NAME}/") + endif() + + # Remove unused files files + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/lib/cmake + ${CURRENT_PACKAGES_DIR}/debug/share) + + # Make pkg-config files relocatable + if(NOT IML_DISABLE_PKGCONFIG_INSTALL) + if(VCPKG_TARGET_IS_LINUX) + set(SYSTEM_LIBRARIES SYSTEM_LIBRARIES pthread) + endif() + vcpkg_fixup_pkgconfig(${SYSTEM_LIBRARIES}) + else() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig + ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) + endif() + + # Find the relevant license file and install it + if(EXISTS "${SOURCE_PATH}/LICENSE") + set(LICENSE_PATH "${SOURCE_PATH}/LICENSE") + elseif(EXISTS "${SOURCE_PATH}/README.md") + set(LICENSE_PATH "${SOURCE_PATH}/README.md") + endif() + file(INSTALL ${LICENSE_PATH} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +endfunction() + +## # ignition_modular_library +## +## Download and build a library from the Ignition Robotics project ( https://ignitionrobotics.org/ ). +## +## ## Usage: +## ```cmake +## ignition_modular_library(NAME +## VERSION +## SHA512 +## [REF ] +## [HEAD_REF ] +## [PATCHES ] +## [CMAKE_PACKAGE_NAME ] +## [DISABLE_PKGCONFIG_INSTALL]) +## ``` +## +## ## Parameters: +## ### NAME +## The name of the specific ignition library, i.e. `cmake` for `ignition-cmake0`, `math` for `ignition-math4`. +## +## ### VERSION +## The complete version number. +## +## ### SHA512 +## The SHA512 hash that should match the downloaded archive. This is forwarded to the `vcpkg_from_github` command. +## +## ### REF +## Reference to the tag of the desired release. This is forwarded to the `vcpkg_from_github` command. +## If not specified, defaults to `ignition-${NAME}${MAJOR_VERSION}_${VERSION}`. +## +## ### HEAD_REF +## Reference (tag) to the desired release. This is forwarded to the `vcpkg_from_github` command. +## If not specified, defaults to `ign-${NAME}${MAJOR_VERSION}`. +## +## ### PATCHES +## A list of patches to be applied to the extracted sources. +## This is forwarded to the `vcpkg_from_github` command. +## +## ### CMAKE_PACKAGE_NAME +## The name of the CMake package for the port. +## If not specified, defaults to `ignition-${NAME}${MAJOR_VERSION}`. +## +## ### DISABLE_PKGCONFIG_INSTALL +## If present, disable installation of .pc pkg-config configuration files. +## +## +## ## Examples: +## +## * [ignition-cmake0](https://github.com/Microsoft/vcpkg/blob/master/ports/ignition-cmake0/portfile.cmake) +## * [ignition-math4](https://github.com/Microsoft/vcpkg/blob/master/ports/ignition-math4/portfile.cmake) +## * [ignition-fuel-tools1](https://github.com/Microsoft/vcpkg/blob/master/ports/ignition-fuel-tools1/portfile.cmake) +function(ignition_modular_library) + set(options DISABLE_PKGCONFIG_INSTALL) + set(oneValueArgs NAME VERSION SHA512 REF HEAD_REF CMAKE_PACKAGE_NAME) + set(multiValueArgs PATCHES) + cmake_parse_arguments(IML "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + + string(REPLACE "." ";" IML_VERSION_LIST ${IML_VERSION}) + list(GET IML_VERSION_LIST 0 IML_MAJOR_VERSION) + + # If the REF option is omitted, use the canonical one + if(NOT DEFINED IML_REF) + set(IML_REF "ignition-${IML_NAME}${IML_MAJOR_VERSION}_${IML_VERSION}") + endif() + + # If the HEAD_REF option is omitted, use the canonical one + if(NOT DEFINED IML_HEAD_REF) + set(IML_HEAD_REF "ign-${IML_NAME}${IML_MAJOR_VERSION}") + endif() + + # If the CMAKE_PACKAGE_NAME option is omitted, use the canonical one + set(DEFAULT_CMAKE_PACKAGE_NAME "ignition-${IML_NAME}${IML_MAJOR_VERSION}") + if(NOT DEFINED IML_CMAKE_PACKAGE_NAME) + set(IML_CMAKE_PACKAGE_NAME ${DEFAULT_CMAKE_PACKAGE_NAME}) + endif() + + # Download library from github, to support also the --head option + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ignitionrobotics/ign-${IML_NAME} + REF ${IML_REF} + SHA512 ${IML_SHA512} + HEAD_REF ${IML_HEAD_REF} + PATCHES ${IML_PATCHES} + FILE_DISAMBIGUATOR 1 + ) + + # Build library + ignition_modular_build_library(${IML_NAME} ${IML_MAJOR_VERSION} ${SOURCE_PATH} ${IML_CMAKE_PACKAGE_NAME} ${DEFAULT_CMAKE_PACKAGE_NAME} ${IML_DISABLE_PKGCONFIG_INSTALL}) +endfunction() diff --git a/externals/vcpkg/ports/ignition-modularscripts/vcpkg.json b/externals/vcpkg/ports/ignition-modularscripts/vcpkg.json new file mode 100755 index 000000000..9384dc5b6 --- /dev/null +++ b/externals/vcpkg/ports/ignition-modularscripts/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "ignition-modularscripts", + "version-date": "2022-05-11", + "description": "Vcpkg helpers to package ignition libraries", + "license": null +} diff --git a/externals/vcpkg/ports/ignition-msgs1/fix-protobuf-static-link-order.patch b/externals/vcpkg/ports/ignition-msgs1/fix-protobuf-static-link-order.patch new file mode 100755 index 000000000..9f3e67466 --- /dev/null +++ b/externals/vcpkg/ports/ignition-msgs1/fix-protobuf-static-link-order.patch @@ -0,0 +1,14 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -2,8 +2,8 @@ + # Build a custom protoc plugin + ign_add_executable(ign_msgs_gen Generator.cc generator_main.cc) + target_link_libraries(ign_msgs_gen +- protobuf::libprotobuf +- protobuf::libprotoc) ++ protobuf::libprotoc ++ protobuf::libprotobuf) + target_include_directories(ign_msgs_gen PRIVATE ${PROTOBUF_INCLUDE_DIR}) + target_compile_features(ign_msgs_gen PRIVATE ${IGN_CXX_11_FEATURES}) + diff --git a/externals/vcpkg/ports/ignition-msgs1/portfile.cmake b/externals/vcpkg/ports/ignition-msgs1/portfile.cmake new file mode 100755 index 000000000..fd8d1a227 --- /dev/null +++ b/externals/vcpkg/ports/ignition-msgs1/portfile.cmake @@ -0,0 +1,21 @@ +# Explicitly disable cross-compilation until the upstream discussion +# https://bitbucket.org/ignitionrobotics/ign-msgs/issues/34/add-support-for-cross-compilation is solved +if(CMAKE_HOST_WIN32 AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x86") + set(ignition_msgs_CROSSCOMPILING ON) +elseif(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME) + set(ignition_msgs_CROSSCOMPILING ON) +else() + set(ignition_msgs_CROSSCOMPILING OFF) +endif() + +if(ignition_msgs_CROSSCOMPILING) + message(FATAL_ERROR "This port does not currently support triplets that require cross-compilation.") +endif() + +ignition_modular_library(NAME msgs + VERSION "1.0.0" + # See https://bitbucket.org/ignitionrobotics/ign-msgs/issues/33/the-ignition-msgs1_100-tag-does-not-match + REF ignition-msgs_1.0.0 + SHA512 18475cc76cc3b58e451faf7a57a0145a9b419cf3e4312627202d96982b066df48cbabcc9991b79a176c5180b90f019dc30114286ad5562c483759052cf63d945 + # Fix linking order of protobuf libraries (backport of https://bitbucket.org/ignitionrobotics/ign-msgs/pull-requests/151) + PATCHES fix-protobuf-static-link-order.patch) diff --git a/externals/vcpkg/ports/ignition-msgs1/vcpkg.json b/externals/vcpkg/ports/ignition-msgs1/vcpkg.json new file mode 100755 index 000000000..cdbb4a9dc --- /dev/null +++ b/externals/vcpkg/ports/ignition-msgs1/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "ignition-msgs1", + "version": "1.0.0", + "port-version": 5, + "description": "Middleware protobuf messages for robotics", + "license": null, + "dependencies": [ + "ignition-cmake0", + "ignition-math4", + { + "name": "ignition-modularscripts", + "host": true + }, + "protobuf" + ] +} diff --git a/externals/vcpkg/ports/ignition-msgs5/01-protobuf.patch b/externals/vcpkg/ports/ignition-msgs5/01-protobuf.patch new file mode 100755 index 000000000..71ea936b1 --- /dev/null +++ b/externals/vcpkg/ports/ignition-msgs5/01-protobuf.patch @@ -0,0 +1,13 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index f68bf3d..d4d1372 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -135,6 +135,8 @@ if(MSVC) + # warning is not important since those members do not need to be interfaced + # with. + set_source_files_properties(${gen_sources} COMPILE_FLAGS "/wd4251 /wd4146") ++ # Fix for protobuf 3.12 - allow big object files ++ add_definitions(/bigobj) + endif() + + set_source_files_properties(${gen_headers} ${gen_sources} ${gen_ruby_scripts} diff --git a/externals/vcpkg/ports/ignition-msgs5/portfile.cmake b/externals/vcpkg/ports/ignition-msgs5/portfile.cmake new file mode 100755 index 000000000..0a5dd2430 --- /dev/null +++ b/externals/vcpkg/ports/ignition-msgs5/portfile.cmake @@ -0,0 +1,8 @@ +# Cross-compilation is disabled until the upstream discussion +# https://github.com/ignitionrobotics/ign-msgs/issues/34 is solved + +ignition_modular_library(NAME msgs + VERSION "5.3.0" + SHA512 645ae5317fb4c3c1b452e98c3581363fc939b5b963dae8a2097bcee97584819bd80357397d88728c5917142dd4ac9beecc335862df44fc06a46d8aa62c54e389 + PATCHES + "01-protobuf.patch") diff --git a/externals/vcpkg/ports/ignition-msgs5/vcpkg.json b/externals/vcpkg/ports/ignition-msgs5/vcpkg.json new file mode 100755 index 000000000..0614ee322 --- /dev/null +++ b/externals/vcpkg/ports/ignition-msgs5/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ignition-msgs5", + "version": "5.3.0", + "port-version": 5, + "description": "Middleware protobuf messages for robotics", + "license": null, + "supports": "!(arm | uwp)", + "dependencies": [ + "ignition-cmake2", + "ignition-math6", + { + "name": "ignition-modularscripts", + "host": true + }, + "protobuf", + "tinyxml2" + ] +} diff --git a/externals/vcpkg/ports/ignition-msgs6/portfile.cmake b/externals/vcpkg/ports/ignition-msgs6/portfile.cmake new file mode 100755 index 000000000..c7b696706 --- /dev/null +++ b/externals/vcpkg/ports/ignition-msgs6/portfile.cmake @@ -0,0 +1,6 @@ +# Cross-compilation is explicitly disabled until the upstream discussion +# https://github.com/ignitionrobotics/ign-msgs/issues/34 is solved + +ignition_modular_library(NAME msgs + VERSION "6.0.0" + SHA512 d7b76b61d37bc4bb2fd1319e2e2d8313fbcc52f51253b7c487bcdb7dabffcf50653fc5c709eb356d8b6ae20500c1fd32ffabc1fcfb28dd14346a10030fb6cd46) diff --git a/externals/vcpkg/ports/ignition-msgs6/vcpkg.json b/externals/vcpkg/ports/ignition-msgs6/vcpkg.json new file mode 100755 index 000000000..9e8b193ec --- /dev/null +++ b/externals/vcpkg/ports/ignition-msgs6/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ignition-msgs6", + "version": "6.0.0", + "port-version": 4, + "description": "Middleware protobuf messages for robotics", + "license": null, + "supports": "!(arm | uwp)", + "dependencies": [ + "ignition-cmake2", + "ignition-math6", + { + "name": "ignition-modularscripts", + "host": true + }, + "protobuf", + "tinyxml2" + ] +} diff --git a/externals/vcpkg/ports/ignition-plugin1/portfile.cmake b/externals/vcpkg/ports/ignition-plugin1/portfile.cmake new file mode 100755 index 000000000..106c8e797 --- /dev/null +++ b/externals/vcpkg/ports/ignition-plugin1/portfile.cmake @@ -0,0 +1,5 @@ +set(PACKAGE_VERSION "1.1.0") +ignition_modular_library(NAME plugin + VERSION ${PACKAGE_VERSION} + REF "ignition-plugin_${PACKAGE_VERSION}" + SHA512 e932dd7e7b042e9fb4c0569cb8b4028e54c394228aadf6523fa60ab1b9f7f9a17d14c79886a76365e2c47423c221aaef9ca77df638d87e2b6edb82eea10c0a3d) diff --git a/externals/vcpkg/ports/ignition-plugin1/vcpkg.json b/externals/vcpkg/ports/ignition-plugin1/vcpkg.json new file mode 100755 index 000000000..8a59e3a2d --- /dev/null +++ b/externals/vcpkg/ports/ignition-plugin1/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "ignition-plugin1", + "version": "1.1.0", + "port-version": 2, + "description": "Library for registering plugin libraries and dynamically loading them at runtime", + "homepage": "https://ignitionrobotics.org/libs/plugin", + "license": null, + "dependencies": [ + { + "name": "dlfcn-win32", + "platform": "windows | uwp" + }, + "ignition-cmake2", + { + "name": "ignition-modularscripts", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ignition-transport4/portfile.cmake b/externals/vcpkg/ports/ignition-transport4/portfile.cmake new file mode 100755 index 000000000..0f70168c9 --- /dev/null +++ b/externals/vcpkg/ports/ignition-transport4/portfile.cmake @@ -0,0 +1,8 @@ +ignition_modular_library(NAME transport + VERSION "4.0.0" + SHA512 581dd4700aebc455f6d7c01d8be17c6c4c802fd74b1504b2bd6544a0246b161231305fd318352904e230c986dfe072fa0608fccea9066b076e7216dc507a8510 + # This can be removed when the pc file of libuuid on Windows is fixed + DISABLE_PKGCONFIG_INSTALL + PATCHES + uuid-osx.patch + ) diff --git a/externals/vcpkg/ports/ignition-transport4/uuid-osx.patch b/externals/vcpkg/ports/ignition-transport4/uuid-osx.patch new file mode 100755 index 000000000..c18d8caea --- /dev/null +++ b/externals/vcpkg/ports/ignition-transport4/uuid-osx.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5453cd0..10c2ad4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -58,6 +58,8 @@ ign_find_package(CPPZMQ REQUIRED PRIVATE + # Find uuid + if (MSVC) + message (STATUS "UUID: Using Windows RPC UuidCreate function\n") ++elseif (APPLE) ++ message (STATUS "Use system uuid header") + else() + ign_find_package(UUID REQUIRED) + endif() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 6683e64..33669ab 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -18,7 +18,7 @@ target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} + ) + + # Windows system library provides UUID +-if (NOT MSVC) ++if (NOT MSVC AND NOT APPLE) + target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} + PUBLIC + UUID::UUID diff --git a/externals/vcpkg/ports/ignition-transport4/vcpkg.json b/externals/vcpkg/ports/ignition-transport4/vcpkg.json new file mode 100755 index 000000000..2658f13ee --- /dev/null +++ b/externals/vcpkg/ports/ignition-transport4/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "ignition-transport4", + "version": "4.0.0", + "port-version": 6, + "description": "Transport middleware for robotics", + "license": null, + "dependencies": [ + "cppzmq", + "ignition-cmake0", + { + "name": "ignition-modularscripts", + "host": true + }, + "ignition-msgs1", + { + "name": "libuuid", + "platform": "!windows & !uwp & !osx" + }, + "protobuf", + "zeromq" + ] +} diff --git a/externals/vcpkg/ports/ignition-transport8/portfile.cmake b/externals/vcpkg/ports/ignition-transport8/portfile.cmake new file mode 100755 index 000000000..7ca8513e7 --- /dev/null +++ b/externals/vcpkg/ports/ignition-transport8/portfile.cmake @@ -0,0 +1,3 @@ +ignition_modular_library(NAME transport + VERSION "8.1.0" + SHA512 04b4cd954453505398da35b284e7db4b4691d9a705924c41e0082fd20e94176a3eaeae7329fd9992aaa50f90b2d8973c71daf763ccff58aa30d06be1da15189a) diff --git a/externals/vcpkg/ports/ignition-transport8/vcpkg.json b/externals/vcpkg/ports/ignition-transport8/vcpkg.json new file mode 100755 index 000000000..52bcedab1 --- /dev/null +++ b/externals/vcpkg/ports/ignition-transport8/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "ignition-transport8", + "version": "8.1.0", + "port-version": 4, + "description": "Transport middleware for robotics", + "license": null, + "dependencies": [ + "cppzmq", + "ignition-cmake2", + { + "name": "ignition-modularscripts", + "host": true + }, + "ignition-msgs5", + { + "name": "libuuid", + "platform": "!windows & !uwp & !osx" + }, + "protobuf", + "sqlite3", + "zeromq" + ] +} diff --git a/externals/vcpkg/ports/ignition-transport9/portfile.cmake b/externals/vcpkg/ports/ignition-transport9/portfile.cmake new file mode 100755 index 000000000..039681566 --- /dev/null +++ b/externals/vcpkg/ports/ignition-transport9/portfile.cmake @@ -0,0 +1,8 @@ +ignition_modular_library(NAME transport + VERSION "9.0.0" + SHA512 9add7a8d3a43a17b1b71e7d7d9320909057c1f79880bd969baa99949709cdbb63f00f0735990891358bb29efd9c0ab8b6725b7c340c324b9266dcc9b73d767d4 + # This can be removed when the pc file of sqlite3 is available ( https://github.com/microsoft/vcpkg/issues/14327 ) + DISABLE_PKGCONFIG_INSTALL + PATCHES + uuid-osx.patch + ) diff --git a/externals/vcpkg/ports/ignition-transport9/uuid-osx.patch b/externals/vcpkg/ports/ignition-transport9/uuid-osx.patch new file mode 100755 index 000000000..350a0b43d --- /dev/null +++ b/externals/vcpkg/ports/ignition-transport9/uuid-osx.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 084b6da..6fd212d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -70,6 +70,8 @@ ign_find_package(CPPZMQ REQUIRED PRIVATE + # Find uuid + if (MSVC) + message (STATUS "UUID: Using Windows RPC UuidCreate function\n") ++elseif (APPLE) ++ message (STATUS "Use system uuid header") + else() + ign_find_package(UUID REQUIRED) + endif() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9777240..9e860a9 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -31,7 +31,7 @@ target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} + ) + + # Windows system library provides UUID +-if (NOT MSVC) ++if (NOT MSVC AND NOT APPLE) + target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} + PUBLIC + UUID::UUID diff --git a/externals/vcpkg/ports/ignition-transport9/vcpkg.json b/externals/vcpkg/ports/ignition-transport9/vcpkg.json new file mode 100755 index 000000000..59e5483f4 --- /dev/null +++ b/externals/vcpkg/ports/ignition-transport9/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "ignition-transport9", + "version": "9.0.0", + "port-version": 4, + "description": "Transport middleware for robotics", + "license": null, + "dependencies": [ + "cppzmq", + "ignition-cmake2", + { + "name": "ignition-modularscripts", + "host": true + }, + "ignition-msgs6", + { + "name": "libuuid", + "platform": "!windows & !uwp & !osx" + }, + "protobuf", + "sqlite3", + "zeromq" + ] +} diff --git a/externals/vcpkg/ports/igraph/arith_osx.h b/externals/vcpkg/ports/igraph/arith_osx.h new file mode 100755 index 000000000..2baafd68a --- /dev/null +++ b/externals/vcpkg/ports/igraph/arith_osx.h @@ -0,0 +1,12 @@ +/* Suitable for macOS on x86_64 and arm64 */ +/* Not suitable for 32-bit macOS */ + +#define IEEE_8087 +#define Arith_Kind_ASL 1 +#define Long int +#define Intcast (int)(long) +#define Double_Align +#define X64_bit_pointers +#define NANCHECK +#define QNaN0 0x0 +#define QNaN1 0x7ff80000 diff --git a/externals/vcpkg/ports/igraph/arith_win32.h b/externals/vcpkg/ports/igraph/arith_win32.h new file mode 100755 index 000000000..ecb90c8dc --- /dev/null +++ b/externals/vcpkg/ports/igraph/arith_win32.h @@ -0,0 +1,8 @@ +/* Windows 32-bit */ + +#define IEEE_8087 +#define Arith_Kind_ASL 1 +#define Double_Align +#define NANCHECK +#define QNaN0 0x0 +#define QNaN1 0x7ff80000 diff --git a/externals/vcpkg/ports/igraph/arith_win64.h b/externals/vcpkg/ports/igraph/arith_win64.h new file mode 100755 index 000000000..e619583b7 --- /dev/null +++ b/externals/vcpkg/ports/igraph/arith_win64.h @@ -0,0 +1,9 @@ +/* Windows 64-bit */ + +#define IEEE_8087 +#define Arith_Kind_ASL 1 +#define Double_Align +#define X64_bit_pointers +#define NANCHECK +#define QNaN0 0x0 +#define QNaN1 0x7ff80000 diff --git a/externals/vcpkg/ports/igraph/glpk-uwp.patch b/externals/vcpkg/ports/igraph/glpk-uwp.patch new file mode 100755 index 000000000..7bee3aed0 --- /dev/null +++ b/externals/vcpkg/ports/igraph/glpk-uwp.patch @@ -0,0 +1,13 @@ +diff --git a/vendor/glpk/env/dlsup.c b/vendor/glpk/env/dlsup.c +index 741354475..968a794b7 100644 +--- a/vendor/glpk/env/dlsup.c ++++ b/vendor/glpk/env/dlsup.c +@@ -25,6 +25,8 @@ + + #include "env.h" + ++#undef __WOE__ ++ + /* GNU version ********************************************************/ + + #if defined(HAVE_LTDL) diff --git a/externals/vcpkg/ports/igraph/portfile.cmake b/externals/vcpkg/ports/igraph/portfile.cmake new file mode 100755 index 000000000..6fc961907 --- /dev/null +++ b/externals/vcpkg/ports/igraph/portfile.cmake @@ -0,0 +1,67 @@ + +# We use the release tarball from GitHub instead of the sources in the repo because: +# - igraph will not compile from the git sources unless there is an actual git repository to back it. This is because it detects the version from git tags. The release tarball has the version hard-coded. +# - The release tarball contains pre-generated parser sources, which eliminates the dependency on bison/flex. + +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/igraph/igraph/releases/download/0.9.9/igraph-0.9.9.tar.gz" + FILENAME "igraph-0.9.9.tar.gz" + SHA512 bbfe8b76e7806ba4c70cbf0dc5ce6724f1805383c1fb6ac05c5cd1bfc829682ff2184e4f836886a562851d1af1384fd7cccb5027c4aa0deadd0e35d50aabb451 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + "glpk-uwp.patch" # patch GLPK for UWP compatibility +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + graphml IGRAPH_GRAPHML_SUPPORT + openmp IGRAPH_OPENMP_SUPPORT +) + +# Allow cross-compilation. See https://igraph.org/c/html/latest/igraph-Installation.html#igraph-Installation-cross-compiling +set(ARITH_H "") +if (VCPKG_TARGET_IS_OSX) + set(ARITH_H ${CURRENT_PORT_DIR}/arith_osx.h) +elseif (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(ARITH_H ${CURRENT_PORT_DIR}/arith_win32.h) + elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(ARITH_H ${CURRENT_PORT_DIR}/arith_win64.h) + endif() +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DIGRAPH_ENABLE_LTO=AUTO + # ARPACK not yet available in vcpkg. + -DIGRAPH_USE_INTERNAL_ARPACK=ON + -DIGRAPH_USE_INTERNAL_CXSPARSE=OFF + # GLPK is not yet available in vcpkg. + -DIGRAPH_USE_INTERNAL_GLPK=ON + # Currently, external GMP provides no performance or functionality benefits. + -DIGRAPH_USE_INTERNAL_GMP=ON + # PLFIT is not yet available in vcpkg. + -DIGRAPH_USE_INTERNAL_PLFIT=ON + # Use BLAS and LAPACK from vcpkg + -DIGRAPH_USE_INTERNAL_BLAS=OFF + -DIGRAPH_USE_INTERNAL_LAPACK=OFF + -DF2C_EXTERNAL_ARITH_HEADER=${ARITH_H} + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/igraph) + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/igraph/vcpkg.json b/externals/vcpkg/ports/igraph/vcpkg.json new file mode 100755 index 000000000..f7c08f369 --- /dev/null +++ b/externals/vcpkg/ports/igraph/vcpkg.json @@ -0,0 +1,34 @@ +{ + "name": "igraph", + "version": "0.9.9", + "description": "igraph is a C library for network analysis and graph theory, with an emphasis on efficiency portability and ease of use.", + "homepage": "https://igraph.org/", + "license": "GPL-2.0-or-later", + "dependencies": [ + "blas", + "lapack", + "suitesparse", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "graphml" + ], + "features": { + "graphml": { + "description": "Support for reading GraphML files", + "dependencies": [ + "libxml2" + ] + }, + "openmp": { + "description": "Use OpenMP parallelization in some functions" + } + } +} diff --git a/externals/vcpkg/ports/iir1/fix-shared-static.patch b/externals/vcpkg/ports/iir1/fix-shared-static.patch new file mode 100755 index 000000000..cfa29a122 --- /dev/null +++ b/externals/vcpkg/ports/iir1/fix-shared-static.patch @@ -0,0 +1,42 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,9 +12,11 @@ cmake_policy(SET CMP0048 NEW) # set VERSION in project() + cmake_policy(SET CMP0042 NEW) # enable MACOSX_RPATH by default + + include(GNUInstallDirs) ++if(BUILD_TESTING) + add_subdirectory(test) + add_subdirectory(demo) + enable_testing () ++endif() + + if (MSVC) + add_compile_options(/W4) +@@ -47,6 +49,8 @@ set(LIBINCLUDE + iir/State.h + iir/Types.h) + ++if(BUILD_SHARED_LIBS) ++ + add_library(iir SHARED ${LIBSRC}) + add_library(iir::iir ALIAS iir) + +@@ -73,6 +77,8 @@ install(TARGETS iir EXPORT iir-targets + + configure_file(iir.pc.in iir.pc @ONLY) + ++else(BUILD_SHARED_LIBS) ++ + add_library(iir_static STATIC ${LIBSRC}) + add_library(iir::iir_static ALIAS iir_static) + +@@ -97,6 +103,8 @@ install(TARGETS iir_static EXPORT iir-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + PRIVATE_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/iir) + ++endif(BUILD_SHARED_LIBS) ++ + install(EXPORT iir-targets + DESTINATION lib/cmake/iir + NAMESPACE iir:: diff --git a/externals/vcpkg/ports/iir1/portfile.cmake b/externals/vcpkg/ports/iir1/portfile.cmake new file mode 100755 index 000000000..0a4d87c2b --- /dev/null +++ b/externals/vcpkg/ports/iir1/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO berndporr/iir1 + REF 1.9.1 + SHA512 115692fb82637d21c2cbff974d931ef12a5c7fd8502560e2b807ceed69b1a6a4e05898aff37b089ccda7c4aa32e97e71f7e6007998ec52f6122da33eb222112e + HEAD_REF master + PATCHES + fix-shared-static.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME iir CONFIG_PATH lib/cmake/iir) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/iir1/vcpkg.json b/externals/vcpkg/ports/iir1/vcpkg.json new file mode 100755 index 000000000..781d68b2d --- /dev/null +++ b/externals/vcpkg/ports/iir1/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "iir1", + "version": "1.9.1", + "description": "Realtime C++ filter library", + "homepage": "https://github.com/berndporr/iir1", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ijg-libjpeg/CMakeLists.txt b/externals/vcpkg/ports/ijg-libjpeg/CMakeLists.txt new file mode 100755 index 000000000..b65477d9c --- /dev/null +++ b/externals/vcpkg/ports/ijg-libjpeg/CMakeLists.txt @@ -0,0 +1,65 @@ +cmake_minimum_required(VERSION 3.13) +project(libjpeg LANGUAGES C) + +option(BUILD_EXECUTABLES OFF) + +# +# jconfig.h is a public header, so it must be genrated. Please reference the install.txt in jpegsr9d.zip +# +# jconfig.txt should contain #cmakedefine which is modified by porfile.cmake of ijg-libjpeg port in VcPkg +# By doing this we can skip 'configure' step. Visit https://github.com/LuaDist/libjpeg +# +include(CheckIncludeFile) +check_include_file(stddef.h HAVE_STDDEF_H) +check_include_file(stdlib.h HAVE_STDLIB_H) +configure_file(jconfig.txt ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h) + +list(APPEND PUBLIC_HEADERS jpeglib.h jerror.h jmorecfg.h ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h) + +add_library(jpeg + ${PUBLIC_HEADERS} jinclude.h jpegint.h jversion.h + transupp.h jidctflt.c jidctfst.c jidctint.c jquant1.c jquant2.c jutils.c jmemnobs.c jaricom.c jerror.c jdatadst.c jdatasrc.c + jmemsys.h + jmemmgr.c + cdjpeg.h cderror.h + jcmaster.c jcmarker.c jcmainct.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolor.c jcdctmgr.c jchuff.c jcsample.c jctrans.c jcinit.c jcomapi.c jcparam.c jcprepct.c + jdmaster.c jdmarker.c jdmainct.c jdapimin.c jdapistd.c jdarith.c jdcoefct.c jdcolor.c jddctmgr.c jdhuff.c jdsample.c jdtrans.c jdinput.c jdmerge.c jdpostct.c + jdct.h + jfdctflt.c jfdctfst.c jfdctint.c +) + +if(WIN32) + target_compile_definitions(jpeg + PRIVATE + _CRT_SECURE_NO_WARNINGS + ) +endif() + +target_include_directories(jpeg PRIVATE include ${CMAKE_CURRENT_BINARY_DIR}) + +install(FILES ${PUBLIC_HEADERS} + DESTINATION ${CMAKE_INSTALL_PREFIX}/include +) +install(TARGETS jpeg + RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib + ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib +) + +if(BUILD_EXECUTABLES) + add_executable(cjpeg cdjpeg.c cjpeg.c rdbmp.c rdgif.c rdppm.c rdrle.c rdtarga.c rdswitch.c) + target_link_libraries(cjpeg PRIVATE jpeg) + + add_executable(djpeg cdjpeg.c djpeg.c wrbmp.c wrgif.c wrppm.c wrrle.c wrtarga.c rdcolmap.c) + target_link_libraries(djpeg PRIVATE jpeg) + + add_executable(jpegtran jpegtran.c cdjpeg.c rdswitch.c transupp.c) + target_link_libraries(jpegtran PRIVATE jpeg) + + add_executable(rdjpgcom rdjpgcom.c) + add_executable(wrjpgcom wrjpgcom.c) + + install(TARGETS cjpeg djpeg jpegtran rdjpgcom wrjpgcom + DESTINATION ${CMAKE_INSTALL_PREFIX}/tools + ) +endif() diff --git a/externals/vcpkg/ports/ijg-libjpeg/portfile.cmake b/externals/vcpkg/ports/ijg-libjpeg/portfile.cmake new file mode 100755 index 000000000..f9771764e --- /dev/null +++ b/externals/vcpkg/ports/ijg-libjpeg/portfile.cmake @@ -0,0 +1,50 @@ +if(EXISTS ${CURRENT_INSTALLED_DIR}/share/libturbo-jpeg/copyright) + message(FATAL_ERROR "'${PORT}' conflicts with 'libturbo-jpeg'. Please remove libturbo-jpeg:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.") +endif() +if(EXISTS ${CURRENT_INSTALLED_DIR}/share/mozjpeg/copyright) + message(FATAL_ERROR "'${PORT}' conflicts with 'mozjpeg'. Please remove mozjpeg:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.") +endif() + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_download_distfile(ARCHIVE + URLS "http://www.ijg.org/files/jpegsr9e.zip" + FILENAME "jpegsr9e.zip" + SHA512 db7a2fb44e5cc20d61956c46334948af034c07cdcc0d6e41d9bd4f6611c0fbed8943d0a05029ba1bfb9d993f4acd0df5e95d0bc1cfb5a889b86a55b6b75fdf64 +) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +# Replace some #define in jconfig.txt to #cmakedefine so the CMakeLists.txt can run `configure_file` command. +# See https://github.com/LuaDist/libjpeg +vcpkg_replace_string("${SOURCE_PATH}/jconfig.txt" + "#define HAVE_STDDEF_H" + "#cmakedefine HAVE_STDDEF_H" +) +vcpkg_replace_string("${SOURCE_PATH}/jconfig.txt" + "#define HAVE_STDLIB_H" + "#cmakedefine HAVE_STDLIB_H" +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXECUTABLES=OFF # supports [tools] feature to enable this option? +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +# There is no LICENSE file, but README containes some legal text. +file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/externals/vcpkg/ports/ijg-libjpeg/vcpkg.json b/externals/vcpkg/ports/ijg-libjpeg/vcpkg.json new file mode 100755 index 000000000..7c4d96429 --- /dev/null +++ b/externals/vcpkg/ports/ijg-libjpeg/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ijg-libjpeg", + "version-string": "9e", + "description": "Independent JPEG Group's JPEG software", + "homepage": "http://www.ijg.org/", + "license": null, + "supports": "!emscripten & !wasm32", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ilmbase/portfile.cmake b/externals/vcpkg/ports/ilmbase/portfile.cmake new file mode 100755 index 000000000..9aefc8241 --- /dev/null +++ b/externals/vcpkg/ports/ilmbase/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/ilmbase/vcpkg.json b/externals/vcpkg/ports/ilmbase/vcpkg.json new file mode 100755 index 000000000..9b09a3c7b --- /dev/null +++ b/externals/vcpkg/ports/ilmbase/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "ilmbase", + "version-string": "2.3.0", + "port-version": 1, + "description": "empty package, linking to newer one", + "dependencies": [ + "openexr" + ] +} diff --git a/externals/vcpkg/ports/imath/portfile.cmake b/externals/vcpkg/ports/imath/portfile.cmake new file mode 100755 index 000000000..e8e38f8be --- /dev/null +++ b/externals/vcpkg/ports/imath/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO AcademySoftwareFoundation/Imath + REF v3.1.5 + SHA512 8344e42c75d8e4bb21facb837535f0c9e4a9489d9edebcc25d5d3c6063535f2bf54e4517d8fca3fedada248457aa07c9bd77d6e843a9d115278fc154de2cdc9d + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DIMATH_INSTALL_SYM_LINK=OFF + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Imath) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/imath/vcpkg.json b/externals/vcpkg/ports/imath/vcpkg.json new file mode 100755 index 000000000..01ef7a9d6 --- /dev/null +++ b/externals/vcpkg/ports/imath/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "imath", + "version": "3.1.5", + "description": "Imath is a C++ and Python library of 2D and 3D vector, matrix, and math operations for computer graphics.", + "homepage": "https://github.com/AcademySoftwareFoundation/Imath", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/imgui-sfml/0001-fix_find_package.patch b/externals/vcpkg/ports/imgui-sfml/0001-fix_find_package.patch new file mode 100755 index 000000000..0ece62b40 --- /dev/null +++ b/externals/vcpkg/ports/imgui-sfml/0001-fix_find_package.patch @@ -0,0 +1,50 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3a974c4..8a1c6cd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,34 +41,14 @@ if (IMGUI_SFML_FIND_SFML) + if (NOT BUILD_SHARED_LIBS) + set(SFML_STATIC_LIBRARIES ON) + endif() +- find_package(SFML 2.5 COMPONENTS graphics system window) ++ find_package(SFML COMPONENTS graphics system window) + + if(NOT SFML_FOUND) + message(FATAL_ERROR "SFML 2 directory not found. Set SFML_DIR to directory where SFML was built (or one which ccontains SFMLConfig.cmake)") + endif() + endif() + +-# ImGui does not provide native support for CMakeLists, workaround for now to have +-# users specify IMGUI_DIR. Waiting for this PR to get merged... +-# https://github.com/ocornut/imgui/pull/1713 +-if(NOT IMGUI_DIR) +- set(IMGUI_DIR "" CACHE PATH "imgui top-level directory") +- message(FATAL_ERROR "ImGui directory not found. Set IMGUI_DIR to imgui's top-level path (containing 'imgui.h' and other files).\n") +-endif() +- +-# This uses FindImGui.cmake provided in ImGui-SFML repo for now +-find_package(ImGui 1.80 REQUIRED) +- +-# these headers will be installed alongside ImGui-SFML +-set(IMGUI_PUBLIC_HEADERS +- ${IMGUI_INCLUDE_DIR}/imconfig.h +- ${IMGUI_INCLUDE_DIR}/imgui.h +- ${IMGUI_INCLUDE_DIR}/imgui_internal.h # not actually public, but users might need it +- ${IMGUI_INCLUDE_DIR}/imstb_rectpack.h +- ${IMGUI_INCLUDE_DIR}/imstb_textedit.h +- ${IMGUI_INCLUDE_DIR}/imstb_truetype.h +- ${IMGUI_INCLUDE_DIR}/misc/cpp/imgui_stdlib.h +-) ++find_package(imgui CONFIG REQUIRED) + + if (IMGUI_SFML_IMGUI_DEMO) + list(APPEND IMGUI_SOURCES ${IMGUI_DEMO_SOURCES}) +@@ -92,7 +72,7 @@ add_library(ImGui-SFML + add_library(ImGui-SFML::ImGui-SFML ALIAS ImGui-SFML) + + target_link_libraries(ImGui-SFML +- PUBLIC ++ imgui::imgui + sfml-graphics + sfml-system + sfml-window diff --git a/externals/vcpkg/ports/imgui-sfml/004-fix-find-sfml.patch b/externals/vcpkg/ports/imgui-sfml/004-fix-find-sfml.patch new file mode 100755 index 000000000..372f7b1d9 --- /dev/null +++ b/externals/vcpkg/ports/imgui-sfml/004-fix-find-sfml.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8a1c6cd..7156f51 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -38,9 +38,6 @@ set(IMGUI_SFML_CONFIG_INSTALL_DIR "" CACHE PATH "Path where user's config header + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") + + if (IMGUI_SFML_FIND_SFML) +- if (NOT BUILD_SHARED_LIBS) +- set(SFML_STATIC_LIBRARIES ON) +- endif() + find_package(SFML COMPONENTS graphics system window) + + if(NOT SFML_FOUND) diff --git a/externals/vcpkg/ports/imgui-sfml/portfile.cmake b/externals/vcpkg/ports/imgui-sfml/portfile.cmake new file mode 100755 index 000000000..deb2e8e42 --- /dev/null +++ b/externals/vcpkg/ports/imgui-sfml/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO eliasdaler/imgui-sfml + REF 004efd85a590343e8c9d166dc9d2524c199c9450 #v2.5 + SHA512 feb11f0a52f89eedc5af4c686b71290a48d69e7bc371f29536eb51752d00b6879d642625f494035d2ccc0500878757709afa2a3810ac17496506db754a3a4ed6 + HEAD_REF master + PATCHES + 0001-fix_find_package.patch + 004-fix-find-sfml.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME ImGui-SFML CONFIG_PATH lib/cmake/ImGui-SFML) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/imgui-sfml/usage b/externals/vcpkg/ports/imgui-sfml/usage new file mode 100755 index 000000000..ea9a5f63b --- /dev/null +++ b/externals/vcpkg/ports/imgui-sfml/usage @@ -0,0 +1,10 @@ +The package imgui-sfml provides CMake targets: + + find_package(imgui CONFIG REQUIRED) + find_package(SFML CONFIG REQUIRED COMPONENTS graphics system window) + find_package(ImGui-SFML CONFIG REQUIRED) + target_link_libraries(main PRIVATE + imgui::imgui + sfml-graphics sfml-system sfml-window + ImGui-SFML::ImGui-SFML + ) diff --git a/externals/vcpkg/ports/imgui-sfml/vcpkg.json b/externals/vcpkg/ports/imgui-sfml/vcpkg.json new file mode 100755 index 000000000..a01204e05 --- /dev/null +++ b/externals/vcpkg/ports/imgui-sfml/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "imgui-sfml", + "version": "2.5", + "description": "ImGui binding for use with SFML", + "homepage": "https://github.com/eliasdaler/imgui-sfml", + "license": "MIT", + "dependencies": [ + "imgui", + "opengl", + "sfml", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/imgui/CMakeLists.txt b/externals/vcpkg/ports/imgui/CMakeLists.txt new file mode 100755 index 000000000..41f03db1c --- /dev/null +++ b/externals/vcpkg/ports/imgui/CMakeLists.txt @@ -0,0 +1,228 @@ +cmake_minimum_required(VERSION 3.16) +project(imgui CXX) + +set(CMAKE_DEBUG_POSTFIX d) + +if(APPLE) + set(CMAKE_CXX_STANDARD 11) + enable_language(OBJCXX) +endif() + +add_library(${PROJECT_NAME} "") +add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) +target_include_directories( + ${PROJECT_NAME} + PUBLIC + $ + $ +) + +target_sources( + ${PROJECT_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/imgui.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imgui_demo.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imgui_draw.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imgui_tables.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/imgui_widgets.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/misc/cpp/imgui_stdlib.cpp +) + +if(IMGUI_BUILD_ALLEGRO5_BINDING) + find_path(ALLEGRO5_INCLUDE_DIRS allegro5/allegro.h) + target_include_directories(${PROJECT_NAME} PRIVATE ${ALLEGRO5_INCLUDE_DIRS}) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_allegro5.cpp) +endif() + +if(IMGUI_BUILD_DX9_BINDING) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx9.cpp) +endif() + +if(IMGUI_BUILD_DX10_BINDING) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx10.cpp) +endif() + +if(IMGUI_BUILD_DX11_BINDING) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx11.cpp) +endif() + +if(IMGUI_BUILD_DX12_BINDING) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx12.cpp) +endif() + +if(IMGUI_BUILD_GLFW_BINDING) + find_package(glfw3 CONFIG REQUIRED) + target_link_libraries(${PROJECT_NAME} PUBLIC glfw) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_glfw.cpp) +endif() + +if(IMGUI_BUILD_GLUT_BINDING) + find_package(GLUT REQUIRED) + target_link_libraries(${PROJECT_NAME} PUBLIC GLUT::GLUT) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_glut.cpp) +endif() + +if(IMGUI_BUILD_METAL_BINDING) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_metal.mm) + set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_metal.mm PROPERTIES COMPILE_FLAGS -fobjc-weak) +endif() + +if(IMGUI_BUILD_OPENGL2_BINDING) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl2.cpp) +endif() + +if(IMGUI_BUILD_OPENGL3_BINDING) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3.cpp) +endif() + +if(IMGUI_BUILD_OSX_BINDING) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_osx.mm) +endif() + +if(IMGUI_BUILD_SDL2_BINDING) + find_package(SDL2 CONFIG REQUIRED) + target_link_libraries(${PROJECT_NAME} PUBLIC SDL2::SDL2) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdl.cpp) +endif() + +if(IMGUI_BUILD_SDL2_RENDERER_BINDING) + find_package(SDL2 CONFIG REQUIRED) + target_link_libraries(${PROJECT_NAME} PUBLIC SDL2::SDL2) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlrenderer.cpp) +endif() + +if(IMGUI_BUILD_VULKAN_BINDING) + find_package(Vulkan REQUIRED) + target_link_libraries(${PROJECT_NAME} PUBLIC Vulkan::Vulkan) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_vulkan.cpp) +endif() + +if(IMGUI_BUILD_WIN32_BINDING) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_win32.cpp) +endif() + +if(IMGUI_FREETYPE) + find_package(freetype CONFIG REQUIRED) + target_link_libraries(${PROJECT_NAME} PUBLIC freetype) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/misc/freetype/imgui_freetype.cpp) + target_compile_definitions(${PROJECT_NAME} PUBLIC IMGUI_ENABLE_FREETYPE) +endif() + +if(IMGUI_USE_WCHAR32) + target_compile_definitions(${PROJECT_NAME} PUBLIC IMGUI_USE_WCHAR32) +endif() + +list(REMOVE_DUPLICATES BINDINGS_SOURCES) + +install( + TARGETS ${PROJECT_NAME} + EXPORT ${PROJECT_NAME}_target + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin +) + +foreach(BINDING_TARGET ${BINDING_TARGETS}) + install( + TARGETS ${BINDING_TARGET} + EXPORT ${PROJECT_NAME}_target + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin + ) +endforeach() + +if(NOT IMGUI_SKIP_HEADERS) + install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/imgui.h + ${CMAKE_CURRENT_SOURCE_DIR}/imconfig.h + ${CMAKE_CURRENT_SOURCE_DIR}/imgui_internal.h + ${CMAKE_CURRENT_SOURCE_DIR}/imstb_textedit.h + ${CMAKE_CURRENT_SOURCE_DIR}/imstb_rectpack.h + ${CMAKE_CURRENT_SOURCE_DIR}/imstb_truetype.h + ${CMAKE_CURRENT_SOURCE_DIR}/misc/cpp/imgui_stdlib.h + DESTINATION include + ) + + if(IMGUI_BUILD_ALLEGRO5_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_allegro5.h DESTINATION include) + endif() + + if(IMGUI_BUILD_DX9_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx9.h DESTINATION include) + endif() + + if(IMGUI_BUILD_DX10_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx10.h DESTINATION include) + endif() + + if(IMGUI_BUILD_DX11_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx11.h DESTINATION include) + endif() + + if(IMGUI_BUILD_DX12_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx12.h DESTINATION include) + endif() + + if(IMGUI_BUILD_GLFW_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_glfw.h DESTINATION include) + endif() + + if(IMGUI_BUILD_GLUT_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_glut.h DESTINATION include) + endif() + + if(IMGUI_BUILD_METAL_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_metal.h DESTINATION include) + endif() + + if(IMGUI_BUILD_OPENGL2_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl2.h DESTINATION include) + endif() + + if(IMGUI_BUILD_OPENGL3_BINDING) + install( + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3.h + ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3_loader.h + DESTINATION + include + ) + endif() + + if(IMGUI_BUILD_OSX_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_osx.h DESTINATION include) + endif() + + if(IMGUI_BUILD_SDL2_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdl.h DESTINATION include) + endif() + + if(IMGUI_BUILD_SDL2_RENDERER_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlrenderer.h DESTINATION include) + endif() + + if(IMGUI_BUILD_VULKAN_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_vulkan.h DESTINATION include) + endif() + + if(IMGUI_BUILD_WIN32_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_win32.h DESTINATION include) + endif() + + if(IMGUI_FREETYPE) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/misc/freetype/imgui_freetype.h DESTINATION include) + endif() +endif() + +include(CMakePackageConfigHelpers) +configure_package_config_file(imgui-config.cmake.in imgui-config.cmake INSTALL_DESTINATION share/imgui) + +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/imgui-config.cmake DESTINATION share/imgui) + +install( + EXPORT ${PROJECT_NAME}_target + NAMESPACE ${PROJECT_NAME}:: + FILE ${PROJECT_NAME}-targets.cmake + DESTINATION share/${PROJECT_NAME} +) diff --git a/externals/vcpkg/ports/imgui/imgui-config.cmake.in b/externals/vcpkg/ports/imgui/imgui-config.cmake.in new file mode 100755 index 000000000..1ea694a10 --- /dev/null +++ b/externals/vcpkg/ports/imgui/imgui-config.cmake.in @@ -0,0 +1,27 @@ +cmake_policy(SET CMP0012 NEW) + +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) + +if (@IMGUI_BUILD_GLFW_BINDING@) + find_dependency(glfw3 CONFIG) +endif() + +if (@IMGUI_BUILD_GLUT_BINDING@) + find_dependency(GLUT) +endif() + +if (@IMGUI_BUILD_SDL2_BINDING@ OR @IMGUI_BUILD_SDL2_RENDERER_BINDING@) + find_dependency(SDL2 CONFIG) +endif() + +if (@IMGUI_BUILD_VULKAN_BINDING@) + find_dependency(Vulkan) +endif() + +if (@IMGUI_FREETYPE@) + find_dependency(freetype CONFIG) +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/imgui-targets.cmake") diff --git a/externals/vcpkg/ports/imgui/portfile.cmake b/externals/vcpkg/ports/imgui/portfile.cmake new file mode 100755 index 000000000..196b93ad2 --- /dev/null +++ b/externals/vcpkg/ports/imgui/portfile.cmake @@ -0,0 +1,78 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +if ("docking-experimental" IN_LIST FEATURES) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ocornut/imgui + REF 1ee252772ae9c0a971d06257bb5c89f628fa696a + SHA512 942cd8e39f490c15d90b6feb6f919ebeab8f6f8f9aacfcbf552daef24b0f7e637ad5f630767a52fd9993d84a80b5954c7b05f7400a9f96b6b739cf5680368119 + HEAD_REF docking + ) +else() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ocornut/imgui + REF v1.87 + SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2 + HEAD_REF master + ) +endif() + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/imgui-config.cmake.in" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + allegro5-binding IMGUI_BUILD_ALLEGRO5_BINDING + dx9-binding IMGUI_BUILD_DX9_BINDING + dx10-binding IMGUI_BUILD_DX10_BINDING + dx11-binding IMGUI_BUILD_DX11_BINDING + dx12-binding IMGUI_BUILD_DX12_BINDING + glfw-binding IMGUI_BUILD_GLFW_BINDING + glut-binding IMGUI_BUILD_GLUT_BINDING + metal-binding IMGUI_BUILD_METAL_BINDING + opengl2-binding IMGUI_BUILD_OPENGL2_BINDING + opengl3-binding IMGUI_BUILD_OPENGL3_BINDING + osx-binding IMGUI_BUILD_OSX_BINDING + sdl2-binding IMGUI_BUILD_SDL2_BINDING + sdl2-renderer-binding IMGUI_BUILD_SDL2_RENDERER_BINDING + vulkan-binding IMGUI_BUILD_VULKAN_BINDING + win32-binding IMGUI_BUILD_WIN32_BINDING + freetype IMGUI_FREETYPE + wchar32 IMGUI_USE_WCHAR32 +) + +if ("libigl-imgui" IN_LIST FEATURES) + vcpkg_download_distfile( + IMGUI_FONTS_DROID_SANS_H + URLS + https://raw.githubusercontent.com/libigl/libigl-imgui/c3efb9b62780f55f9bba34561f79a3087e057fc0/imgui_fonts_droid_sans.h + FILENAME "imgui_fonts_droid_sans.h" + SHA512 + abe9250c9a5989e0a3f2285bbcc83696ff8e38c1f5657c358e6fe616ff792d3c6e5ff2fa23c2eeae7d7b307392e0dc798a95d14f6d10f8e9bfbd7768d36d8b31 + ) + + file(INSTALL "${IMGUI_FONTS_DROID_SANS_H}" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + OPTIONS_DEBUG + -DIMGUI_SKIP_HEADERS=ON +) + +vcpkg_cmake_install() + +if ("freetype" IN_LIST FEATURES) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/imconfig.h" "//#define IMGUI_ENABLE_FREETYPE" "#define IMGUI_ENABLE_FREETYPE") +endif() +if ("wchar32" IN_LIST FEATURES) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/imconfig.h" "//#define IMGUI_USE_WCHAR32" "#define IMGUI_USE_WCHAR32") +endif() + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup() + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/imgui/vcpkg.json b/externals/vcpkg/ports/imgui/vcpkg.json new file mode 100755 index 000000000..ba26c5e12 --- /dev/null +++ b/externals/vcpkg/ports/imgui/vcpkg.json @@ -0,0 +1,104 @@ +{ + "name": "imgui", + "version": "1.87", + "port-version": 1, + "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.", + "homepage": "https://github.com/ocornut/imgui", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "allegro5-binding": { + "description": "Make available Allegro5 binding", + "dependencies": [ + "allegro5" + ] + }, + "docking-experimental": { + "description": "Build with docking support" + }, + "dx10-binding": { + "description": "Make available DirectX10 binding", + "supports": "windows & !uwp" + }, + "dx11-binding": { + "description": "Make available DirectX11 binding", + "supports": "windows & !uwp" + }, + "dx12-binding": { + "description": "Make available DirectX12 binding", + "supports": "!x86 & windows & !uwp" + }, + "dx9-binding": { + "description": "Make available DirectX9 binding", + "supports": "windows & !uwp" + }, + "freetype": { + "description": "Build font atlases using FreeType instead of stb_truetype", + "dependencies": [ + "freetype" + ] + }, + "glfw-binding": { + "description": "Make available GLFW binding", + "dependencies": [ + "glfw3" + ] + }, + "glut-binding": { + "description": "Make available Glut binding", + "dependencies": [ + "freeglut" + ] + }, + "libigl-imgui": { + "description": "Install the libigl-imgui headers" + }, + "metal-binding": { + "description": "Make available Metal binding", + "supports": "osx" + }, + "opengl2-binding": { + "description": "Make available OpenGL (legacy) binding" + }, + "opengl3-binding": { + "description": "Make available OpenGL3/ES/ES2 (modern) binding" + }, + "osx-binding": { + "description": "Make available OSX binding", + "supports": "osx" + }, + "sdl2-binding": { + "description": "Make available SDL2 binding", + "dependencies": [ + "sdl2" + ] + }, + "sdl2-renderer-binding": { + "description": "Make available SDL2 Renderer binding", + "dependencies": [ + "sdl2" + ] + }, + "vulkan-binding": { + "description": "Make available Vulkan binding", + "dependencies": [ + "vulkan" + ] + }, + "wchar32": { + "description": "Use WCHAR32 instead of WCHAR16" + }, + "win32-binding": { + "description": "Make available Win32 binding" + } + } +} diff --git a/externals/vcpkg/ports/imguizmo/CMakeLists.txt b/externals/vcpkg/ports/imguizmo/CMakeLists.txt new file mode 100755 index 000000000..1b552bae2 --- /dev/null +++ b/externals/vcpkg/ports/imguizmo/CMakeLists.txt @@ -0,0 +1,59 @@ +cmake_minimum_required(VERSION 3.8) +project(imguizmo) + +find_package(imgui CONFIG REQUIRED) +get_target_property(IMGUI_INCLUDE_DIRS imgui::imgui + INTERFACE_INCLUDE_DIRECTORIES +) + +add_library(${PROJECT_NAME} "") +add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) + +target_compile_options(${PROJECT_NAME} PRIVATE "-std=c++11") + +target_include_directories( + ${PROJECT_NAME} + PUBLIC + $ + $ + PRIVATE + ${IMGUI_INCLUDE_DIRS} +) + +target_sources( + ${PROJECT_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/GraphEditor.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ImCurveEdit.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ImGradient.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ImGuizmo.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ImSequencer.cpp +) + +install( + TARGETS ${PROJECT_NAME} + EXPORT ${PROJECT_NAME}_target + ARCHIVE DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin +) + +if (NOT IMGUIZMO_SKIP_HEADERS) + install( + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/GraphEditor.h + ${CMAKE_CURRENT_SOURCE_DIR}/ImCurveEdit.h + ${CMAKE_CURRENT_SOURCE_DIR}/ImGradient.h + ${CMAKE_CURRENT_SOURCE_DIR}/ImGuizmo.h + ${CMAKE_CURRENT_SOURCE_DIR}/ImSequencer.h + ${CMAKE_CURRENT_SOURCE_DIR}/ImZoomSlider.h + DESTINATION include + ) +endif() + +install( + EXPORT ${PROJECT_NAME}_target + NAMESPACE ${PROJECT_NAME}:: + FILE ${PROJECT_NAME}-config.cmake + DESTINATION share/${PROJECT_NAME} +) \ No newline at end of file diff --git a/externals/vcpkg/ports/imguizmo/portfile.cmake b/externals/vcpkg/ports/imguizmo/portfile.cmake new file mode 100755 index 000000000..342001ea8 --- /dev/null +++ b/externals/vcpkg/ports/imguizmo/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO CedricGuillemet/ImGuizmo + REF 1.83 + SHA512 23285398688b4cdf3128ecb918b70c9a52f06c8e911da57430442b838cecf653e233d8cdfefc6acd3e4da381869ffc6fb74bcaaafc8e33657d6060a645517363 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DIMGUIZMO_SKIP_HEADERS=ON +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/imguizmo/vcpkg.json b/externals/vcpkg/ports/imguizmo/vcpkg.json new file mode 100755 index 000000000..09184a723 --- /dev/null +++ b/externals/vcpkg/ports/imguizmo/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "imguizmo", + "version": "1.83", + "description": "Immediate mode 3D gizmo for scene editing and other controls based on Dear ImGui", + "homepage": "https://github.com/CedricGuillemet/ImGuizmo", + "dependencies": [ + "imgui", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/immer/portfile.cmake b/externals/vcpkg/ports/immer/portfile.cmake new file mode 100755 index 000000000..f2cae1a90 --- /dev/null +++ b/externals/vcpkg/ports/immer/portfile.cmake @@ -0,0 +1,34 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO arximboldi/immer + REF a1271fa712342f5c6dfad876820da17e10c28214 + SHA512 7ea544c88b7a3742ebeedabe5ff7ba78178b3523c1c8564b5c0daae4044dda22340b0531e1382618557d1c118222da4a7ce06dde02e4bc05833514dde1cf2dd1 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "docs" immer_BUILD_DOCS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENABLE_PYTHON=OFF + -DENABLE_GUILE=OFF + -DENABLE_BOOST_COROUTINE=OFF + -Dimmer_BUILD_TESTS=OFF + -Dimmer_BUILD_EXAMPLES=OFF + -Dimmer_BUILD_EXTRAS=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Immer) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/immer/vcpkg.json b/externals/vcpkg/ports/immer/vcpkg.json new file mode 100755 index 000000000..df1f3ea4f --- /dev/null +++ b/externals/vcpkg/ports/immer/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "immer", + "version-date": "2022-02-12", + "description": "Postmodern immutable and persistent data structures for C++", + "homepage": "https://sinusoid.es/immer/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "docs": { + "description": "Build documentation" + } + } +} diff --git a/externals/vcpkg/ports/implot/CMakeLists.txt b/externals/vcpkg/ports/implot/CMakeLists.txt new file mode 100755 index 000000000..6807c550d --- /dev/null +++ b/externals/vcpkg/ports/implot/CMakeLists.txt @@ -0,0 +1,52 @@ +cmake_minimum_required(VERSION 3.8) +project(implot CXX) + +find_package(imgui CONFIG REQUIRED) +get_target_property(IMGUI_INCLUDE_DIRS imgui::imgui + INTERFACE_INCLUDE_DIRECTORIES +) + +set(CMAKE_DEBUG_POSTFIX d) + +add_library(${PROJECT_NAME} "") +add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) +target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11) +target_include_directories( + ${PROJECT_NAME} + PUBLIC + $ + $ + PRIVATE + ${IMGUI_INCLUDE_DIRS} +) + +target_sources( + ${PROJECT_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/implot.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/implot_items.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/implot_demo.cpp +) + +install( + TARGETS ${PROJECT_NAME} + EXPORT ${PROJECT_NAME}_target + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin +) + +if(NOT IMPLOT_SKIP_HEADERS) + install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/implot.h + ${CMAKE_CURRENT_SOURCE_DIR}/implot_internal.h + DESTINATION include + ) +endif() + +install( + EXPORT ${PROJECT_NAME}_target + NAMESPACE ${PROJECT_NAME}:: + FILE ${PROJECT_NAME}-config.cmake + DESTINATION share/${PROJECT_NAME} +) diff --git a/externals/vcpkg/ports/implot/portfile.cmake b/externals/vcpkg/ports/implot/portfile.cmake new file mode 100755 index 000000000..37d13429d --- /dev/null +++ b/externals/vcpkg/ports/implot/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO epezent/implot + REF v0.13 + SHA512 ed653a14f1174b1689c7b8e5761455644e41e75a3cdf5a76d96adf8e286893418660809c1c158fa405c1c48a82752ae9c3b8e1eb14bd0015081604cdb44d95f4 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DIMPLOT_SKIP_HEADERS=ON +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/implot/vcpkg.json b/externals/vcpkg/ports/implot/vcpkg.json new file mode 100755 index 000000000..73df80238 --- /dev/null +++ b/externals/vcpkg/ports/implot/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "implot", + "version": "0.13", + "description": "Advanced 2D Plotting for Dear ImGui", + "homepage": "https://github.com/epezent/implot", + "license": "MIT", + "dependencies": [ + "imgui", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/indicators/portfile.cmake b/externals/vcpkg/ports/indicators/portfile.cmake new file mode 100755 index 000000000..4a71032b7 --- /dev/null +++ b/externals/vcpkg/ports/indicators/portfile.cmake @@ -0,0 +1,28 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO p-ranav/indicators + REF v2.2 + SHA512 7CED2D3C320D51C7E0569104744730C8E2F952350BCAE214A9781EB43EF4002C8314937DB78461351741FC4C3AEE7A1364582B1274991E95EB30006A5F2A7EF9 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DINDICATORS_BUILD_TESTS=OFF + -DINDICATORS_SAMPLES=OFF + -DINDICATORS_DEMO=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/indicators) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.termcolor" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + + diff --git a/externals/vcpkg/ports/indicators/vcpkg.json b/externals/vcpkg/ports/indicators/vcpkg.json new file mode 100755 index 000000000..80bf1bb01 --- /dev/null +++ b/externals/vcpkg/ports/indicators/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "indicators", + "version": "2.2", + "description": "Activity indicators for modern C++", + "homepage": "https://github.com/p-ranav/indicators", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/influxdb-cxx/include-stringview.patch b/externals/vcpkg/ports/influxdb-cxx/include-stringview.patch new file mode 100755 index 000000000..a44563506 --- /dev/null +++ b/externals/vcpkg/ports/influxdb-cxx/include-stringview.patch @@ -0,0 +1,12 @@ +diff --git a/src/Point.cxx b/src/Point.cxx +index 8f7fc10..95b119e 100644 +--- a/src/Point.cxx ++++ b/src/Point.cxx +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + namespace influxdb + { diff --git a/externals/vcpkg/ports/influxdb-cxx/portfile.cmake b/externals/vcpkg/ports/influxdb-cxx/portfile.cmake new file mode 100755 index 000000000..5498788ec --- /dev/null +++ b/externals/vcpkg/ports/influxdb-cxx/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO offa/influxdb-cxx + REF v0.6.7 + SHA512 4e871c6d06c94b24b45aeedb7c74c75aed17332fbde76fc1e6c2ad06aeb41e268a95f4cab1c12c4402765c11811feb84bf48d60b138717c485327848782e402c + HEAD_REF master + PATCHES include-stringview.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + boost INFLUXCXX_WITH_BOOST +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DINFLUXCXX_TESTING=OFF + -DINFLUXCXX_SYSTEMTEST=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_cmake_config_fixup(PACKAGE_NAME InfluxDB CONFIG_PATH lib/cmake/InfluxDB) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/influxdb-cxx/vcpkg.json b/externals/vcpkg/ports/influxdb-cxx/vcpkg.json new file mode 100755 index 000000000..1666fc558 --- /dev/null +++ b/externals/vcpkg/ports/influxdb-cxx/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "influxdb-cxx", + "version": "0.6.7", + "port-version": 1, + "description": "InfluxDB C++ client library", + "homepage": "https://github.com/offa/influxdb-cxx", + "dependencies": [ + "curl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "boost": { + "description": "Enables UDP and Unix sockets as Transport Layer", + "dependencies": [ + "boost-asio", + "boost-conversion", + "boost-property-tree" + ] + } + } +} diff --git a/externals/vcpkg/ports/infoware/portfile.cmake b/externals/vcpkg/ports/infoware/portfile.cmake new file mode 100755 index 000000000..2e0d4bdab --- /dev/null +++ b/externals/vcpkg/ports/infoware/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ThePhD/infoware + REF 50cb0982aceb32c8eb57aa6bc5011aced2c379df + SHA512 fe8182998a9e9dbed3dc3985a1161da11b340562628a71da8840aa4d4c56382ddc3ddef3d094e5d9c7c06481a2076dcff7fdb561bd169dd9d1849da4b4c6a064 + HEAD_REF master +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + x11 INFOWARE_USE_X11 + d3d INFOWARE_USE_D3D + opencl INFOWARE_USE_OPENCL + opengl INFOWARE_USE_OPENGL +) + +# git must be injected, because vcpkg isolates the build +# from the environment entirely to have reproducible builds +vcpkg_find_acquire_program(GIT) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} + -DINFOWARE_EXAMPLES=OFF + -DINFOWARE_TESTS=OFF + -DGIT_EXECUTABLE=${GIT} + -DGIT_FOUND=true +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/externals/vcpkg/ports/infoware/vcpkg.json b/externals/vcpkg/ports/infoware/vcpkg.json new file mode 100755 index 000000000..1836379c9 --- /dev/null +++ b/externals/vcpkg/ports/infoware/vcpkg.json @@ -0,0 +1,33 @@ +{ + "$reason": "Note that independent usage and testing may work, but it seems to fail in CI environments for potential cross-compilation, and is thusly noted here to note break how vcpkg builds things!", + "name": "infoware", + "version-date": "2021-06-16", + "port-version": 1, + "description": "C++ Library for pulling system and hardware information, without hitting the command line.", + "homepage": "https://github.com/ThePhD/infoware", + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "d3d": { + "description": "Prefer usage of Direct3D to find graphical capabilities (typically only works on Windows systems)." + }, + "opencl": { + "description": "Prefer usage of OpenCL to find graphical capabilities of the system." + }, + "opengl": { + "description": "Prefer usage of OpenGL to find graphical capabilities (may require additional libraries to be available for linking depending on the system)." + }, + "x11": { + "description": "Prefer usage of X11 to find graphical capabilities." + } + } +} diff --git a/externals/vcpkg/ports/inih/CMakeLists.txt b/externals/vcpkg/ports/inih/CMakeLists.txt new file mode 100755 index 000000000..6601e543a --- /dev/null +++ b/externals/vcpkg/ports/inih/CMakeLists.txt @@ -0,0 +1,15 @@ +project(inih) + +set(SOURCES ini.c cpp/INIReader.cpp) +set(HEADERS ini.h cpp/INIReader.h) + +add_library(inih ${SOURCES}) + +install( + TARGETS inih + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(FILES ${HEADERS} DESTINATION include) diff --git a/externals/vcpkg/ports/inih/portfile.cmake b/externals/vcpkg/ports/inih/portfile.cmake new file mode 100755 index 000000000..471b35f86 --- /dev/null +++ b/externals/vcpkg/ports/inih/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO benhoyt/inih + REF d7f465792c0c7686b50ed45c9a435394ae418d3e # r51 + SHA512 f3b621225933d74e9b130957aab1d55a82f06fd836aace439f9192a393d82a446e9f2152bb617a73a1dc681a821fc31d217c41f38c8ef8eeef7ad64c3e274b5d + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/inih RENAME copyright) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/externals/vcpkg/ports/inih/vcpkg.json b/externals/vcpkg/ports/inih/vcpkg.json new file mode 100755 index 000000000..5b137dcba --- /dev/null +++ b/externals/vcpkg/ports/inih/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "inih", + "version-string": "51", + "port-version": 1, + "description": "Simple .INI file parser" +} diff --git a/externals/vcpkg/ports/iniparser/CMakeLists.txt b/externals/vcpkg/ports/iniparser/CMakeLists.txt new file mode 100755 index 000000000..9c4f6edf7 --- /dev/null +++ b/externals/vcpkg/ports/iniparser/CMakeLists.txt @@ -0,0 +1,54 @@ +cmake_minimum_required(VERSION 3.14) + +project(iniparser LANGUAGES C) + +include(GNUInstallDirs) + +set(CMAKE_DISABLE_SOURCE_CHANGES ON) +set(CMAKE_DISABLE_IN_SOURCE_BUILD ON) + +# iniparser.pc +set(prefix ${CMAKE_INSTALL_PREFIX}) +set(libdir ${prefix}/${CMAKE_INSTALL_LIBDIR}) +set(includedir ${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) +set(datarootdir ${prefix}/${CMAKE_INSTALL_DATAROOTDIR}) +set(datadir ${prefix}/${CMAKE_INSTALL_DATADIR}) + +configure_file(iniparser.pc ${CMAKE_CURRENT_BINARY_DIR}/iniparser.pc) + +set(iniparser_sources + src/dictionary.c + src/iniparser.c +) + +add_library(iniparser ${iniparser_sources}) + +target_include_directories(iniparser + PUBLIC + $ + $ +) + +target_compile_definitions(iniparser + PRIVATE + $<$:_CRT_SECURE_NO_WARNINGS> +) + +install(TARGETS iniparser EXPORT unofficial-iniparser-config) + +install( + EXPORT unofficial-iniparser-config + NAMESPACE unofficial::iniparser:: + DESTINATION share/unofficial-iniparser + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +) + +install( + FILES src/dictionary.h src/iniparser.h + DESTINATION include +) + +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/iniparser.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig +) diff --git a/externals/vcpkg/ports/iniparser/portfile.cmake b/externals/vcpkg/ports/iniparser/portfile.cmake new file mode 100755 index 000000000..30487f815 --- /dev/null +++ b/externals/vcpkg/ports/iniparser/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ndevilla/iniparser + REF f858275f7f307eecba84c2f5429483f9f28007f8 + SHA512 48c80b2163f86d8ca0f3253128d8528214e2f0680b4bceb686180c01b29cd2a0c3b9d6e7156a8e28649b14bc1d8a51b34c2d3d258013b35f69aaf6c3ded9ecdc + HEAD_REF master + PATCHES + win32_ssize_t.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/iniparser/vcpkg.json b/externals/vcpkg/ports/iniparser/vcpkg.json new file mode 100755 index 000000000..88ad1b9f6 --- /dev/null +++ b/externals/vcpkg/ports/iniparser/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "iniparser", + "version-string": "2020-04-06", + "port-version": 2, + "description": "C library for parsing INI-style files", + "homepage": "ndevilla.free.fr/iniparser" +} diff --git a/externals/vcpkg/ports/iniparser/win32_ssize_t.patch b/externals/vcpkg/ports/iniparser/win32_ssize_t.patch new file mode 100755 index 000000000..3fefee6c8 --- /dev/null +++ b/externals/vcpkg/ports/iniparser/win32_ssize_t.patch @@ -0,0 +1,29 @@ +diff --git a/src/dictionary.c b/src/dictionary.c +index cb7ccd4..7985ab3 100644 +--- a/src/dictionary.c ++++ b/src/dictionary.c +@@ -18,7 +18,6 @@ + #include + #include + #include +-#include + + /** Maximum value size for integers and doubles. */ + #define MAXVALSZ 1024 +diff --git a/src/dictionary.h b/src/dictionary.h +index d04b6ce..929ae17 100644 +--- a/src/dictionary.h ++++ b/src/dictionary.h +@@ -21,7 +21,12 @@ + #include + #include + #include ++#ifdef _MSC_VER ++#include ++typedef SSIZE_T ssize_t; ++#else + #include ++#endif + + #ifdef __cplusplus + extern "C" { diff --git a/externals/vcpkg/ports/inja/portfile.cmake b/externals/vcpkg/ports/inja/portfile.cmake new file mode 100755 index 000000000..7b613808c --- /dev/null +++ b/externals/vcpkg/ports/inja/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO pantor/inja + REF 2d515078c647457436556763aca8d4bf7d11d5e8 # v3.3.0 + SHA512 4e2f63297eede016772e4915cacfec57b49633f2a5fb80862bbd091d274f688ea1fbe958f97699e930fdee9f390ce0637513f4265190c171104d9eae9b12a59d + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS + -DINJA_USE_EMBEDDED_JSON=OFF + -DBUILD_TESTING=OFF + -DBUILD_BENCHMARK=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/inja) +vcpkg_copy_pdbs() + +# Inja is a header-only library +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +# Don't need built-in nlohmann-json as this package depends on nlohmann-json +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/inja/json") + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/inja/vcpkg.json b/externals/vcpkg/ports/inja/vcpkg.json new file mode 100755 index 000000000..55c71f18d --- /dev/null +++ b/externals/vcpkg/ports/inja/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "inja", + "version": "3.3.0", + "description": "Inja - A Template Engine for Modern C++", + "homepage": "https://github.com/pantor/inja", + "dependencies": [ + "nlohmann-json" + ] +} diff --git a/externals/vcpkg/ports/intel-ipsec/always-generate-pdb.patch b/externals/vcpkg/ports/intel-ipsec/always-generate-pdb.patch new file mode 100755 index 000000000..24894e4e7 --- /dev/null +++ b/externals/vcpkg/ports/intel-ipsec/always-generate-pdb.patch @@ -0,0 +1,80 @@ +From 19d3b3fca689fb87e819b0b27bc74d1f52fcd2c8 Mon Sep 17 00:00:00 2001 +From: Billy Robert O'Neal III +Date: Wed, 12 Jan 2022 12:40:30 +0000 +Subject: [PATCH] lib: generate PDB in release build on Windows + +PDBs are necessary for postmortem debugging and for teams to get reports +from Watson, so they should be built for released software too. This +change always passes /DEBUG to the MSVC linker. That switch controls +whether a PDB is generated (as in "generate debugging information") not +a statement that the resulting files are the debug specific version of +your library. + +/DEBUG changes the default values of /INCREMENTAL (to on) and /OPT:REF +and /OPT:ICF to off, so those are changed back to incremental off and +linker optimizations on in debug builds. + +This missing PDB issue was discovered in fixing intel-ipsec's port in +vcpkg to build on Windows (https://github.com/microsoft/vcpkg/pull/22269). + +intel-ipsec-mb vcpkg PR link is https://github.com/microsoft/vcpkg/pull/5586 +--- + lib/win_x64.mak | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/lib/win_x64.mak b/lib/win_x64.mak +index 89162feb..bb62b2ea 100644 +--- a/lib/win_x64.mak ++++ b/lib/win_x64.mak +@@ -12,7 +12,7 @@ + # * Neither the name of Intel Corporation nor the names of its contributors + # may be used to endorse or promote products derived from this software + # without specific prior written permission. +-# ++# + # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +@@ -71,14 +71,14 @@ LIB_DIR = .\ + + !ifdef DEBUG + OPT = $(DEBUG_OPT) +-DCFLAGS = /DDEBUG /Z7 ++DCFLAGS = /DDEBUG + DAFLAGS = -gcv8 +-DLFLAGS = /DEBUG ++DLFLAGS = /DEBUG /INCREMENTAL:NO + !else + OPT = /O2 /Oi + DCFLAGS = + DAFLAGS = +-DLFLAGS = /RELEASE ++DLFLAGS = /RELEASE /DEBUG /OPT:REF /OPT:ICF /INCREMENTAL:NO + !endif + + !if "$(SAFE_DATA)" != "n" +@@ -98,7 +98,7 @@ DAFLAGS = $(DAFLAGS) -DSAFE_LOOKUP + + CC = cl + CFLAGS_ALL = $(EXTRA_CFLAGS) /DNO_COMPAT_IMB_API_053 /I. /Iinclude /Ino-aesni \ +- /nologo /Y- /W3 /WX- /Gm- /fp:precise /EHsc ++ /nologo /Y- /W3 /WX- /Gm- /fp:precise /EHsc /Z7 + + CFLAGS = $(CFLAGS_ALL) $(OPT) $(DCFLAGS) + CFLAGS_NO_SIMD = $(CFLAGS_ALL) /Od $(DCFLAGS) +@@ -633,6 +633,7 @@ install: + -copy /Y /V /B $(LIBBASE).lib "$(INSTDIR)" + -copy /Y /V /A intel-ipsec-mb.h "$(INSTDIR)" + !if "$(SHARED)" == "y" ++ -copy /Y /V /B $(LIB_DIR)\$(LIBBASE).pdb "$(INSTDIR)" + -copy /Y /V /B $(LIB_DIR)\$(LIBBASE).dll "$(INSTDIR)" + -copy /Y /V /B $(LIB_DIR)\$(LIBBASE).dll "%windir%\system32" + !endif +@@ -641,6 +642,7 @@ uninstall: + !if "$(SHARED)" == "y" + -del /Q "%windir%\system32\$(LIBBASE).dll" + -del /Q "$(INSTDIR)\$(LIBBASE).dll" ++ -del /Q "$(INSTDIR)\$(LIBBASE).pdb" + !endif + -del /Q "$(INSTDIR)\$(LIBBASE).def" + -del /Q "$(INSTDIR)\$(LIBBASE).exp" diff --git a/externals/vcpkg/ports/intel-ipsec/intel-ipsec-targets-implib.cmake.in b/externals/vcpkg/ports/intel-ipsec/intel-ipsec-targets-implib.cmake.in new file mode 100755 index 000000000..1a907fc97 --- /dev/null +++ b/externals/vcpkg/ports/intel-ipsec/intel-ipsec-targets-implib.cmake.in @@ -0,0 +1,5 @@ +set_property(TARGET IPSEC::ipsec APPEND PROPERTY IMPORTED_CONFIGURATIONS @INTEL_IPSEC_CONFIGURATION@) +set_target_properties(IPSEC::ipsec PROPERTIES + IMPORTED_LOCATION_@INTEL_IPSEC_CONFIGURATION@ "${_IMPORT_PREFIX}/@INTEL_IPSEC_LOCATION@" + IMPORTED_IMPLIB_@INTEL_IPSEC_CONFIGURATION@ "${_IMPORT_PREFIX}/@INTEL_IPSEC_IMPLIB@" + ) diff --git a/externals/vcpkg/ports/intel-ipsec/intel-ipsec-targets.cmake.in b/externals/vcpkg/ports/intel-ipsec/intel-ipsec-targets.cmake.in new file mode 100755 index 000000000..0f5983c96 --- /dev/null +++ b/externals/vcpkg/ports/intel-ipsec/intel-ipsec-targets.cmake.in @@ -0,0 +1,4 @@ +set_property(TARGET IPSEC::ipsec APPEND PROPERTY IMPORTED_CONFIGURATIONS @INTEL_IPSEC_CONFIGURATION@) +set_target_properties(IPSEC::ipsec PROPERTIES + IMPORTED_LOCATION_@INTEL_IPSEC_CONFIGURATION@ "${_IMPORT_PREFIX}/@INTEL_IPSEC_LOCATION@" + ) diff --git a/externals/vcpkg/ports/intel-ipsec/intel-ipsecConfig.cmake.in b/externals/vcpkg/ports/intel-ipsec/intel-ipsecConfig.cmake.in new file mode 100755 index 000000000..cc722d53b --- /dev/null +++ b/externals/vcpkg/ports/intel-ipsec/intel-ipsecConfig.cmake.in @@ -0,0 +1,16 @@ +if(TARGET IPSEC::ipsec) + return() +endif() + +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) # intel-ipsec +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) # share +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) # package root +add_library(IPSEC::ipsec @INTEL_IPSEC_STATIC_OR_SHARED@ IMPORTED) +set_target_properties(IPSEC::ipsec PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include") +set(IPSEC_ipsec_FOUND 1) + +get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +file(GLOB CONFIG_FILES "${_DIR}/intel-ipsec-targets-*.cmake") +foreach(f ${CONFIG_FILES}) + include(${f}) +endforeach() diff --git a/externals/vcpkg/ports/intel-ipsec/portfile.cmake b/externals/vcpkg/ports/intel-ipsec/portfile.cmake new file mode 100755 index 000000000..eb945e1f9 --- /dev/null +++ b/externals/vcpkg/ports/intel-ipsec/portfile.cmake @@ -0,0 +1,105 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO intel/intel-ipsec-mb + REF bde82c8737edc04d80549f0a68225ede7e5cefd #v1.1 + SHA512 f41dcde88b062e8ec2327987c6d36cd4f74a5e4fea386cc1ef8364f1dc432a2db02ca7d3312c0471b443cf93e815af6d74a4819c249afd6777aa91693b2546e5 + HEAD_REF master + PATCHES + always-generate-pdb.patch # https://github.com/intel/intel-ipsec-mb/pull/93 +) + +vcpkg_find_acquire_program(NASM) +get_filename_component(NASM_DIR "${NASM}" DIRECTORY) +vcpkg_add_to_path(PREPEND "${NASM_DIR}") + +vcpkg_list(SET MAKE_OPTIONS) +set(INTEL_IPSEC_STATIC_OR_SHARED SHARED) +if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + vcpkg_list(APPEND MAKE_OPTIONS SHARED=n) + set(INTEL_IPSEC_STATIC_OR_SHARED STATIC) +endif() + +set(DEBUG_LIB "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib") +set(RELEASE_LIB "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib") + +if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_build_nmake( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH lib + PROJECT_NAME win_x64.mak + OPTIONS ${MAKE_OPTIONS} + OPTIONS_DEBUG DEBUG=y + ) + + if(NOT "${VCPKG_BUILD_TYPE}" STREQUAL "release") + file(INSTALL "${DEBUG_LIB}/libIPSec_MB.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + set(INTEL_IPSEC_CONFIGURATION "DEBUG") + if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + set(INTEL_IPSEC_LOCATION "debug/lib/libIPSec_MB.lib") + configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-debug.cmake" @ONLY) + else() + file(INSTALL "${DEBUG_LIB}/libIPSec_MB.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${DEBUG_LIB}/libIPSec_MB.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${DEBUG_LIB}/libIPSec_MB.exp" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + set(INTEL_IPSEC_LOCATION "debug/bin/libIPSec_MB.dll") + set(INTEL_IPSEC_IMPLIB "debug/lib/libIPSec_MB.lib") + configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets-implib.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-debug.cmake" @ONLY) + endif() + endif() + + file(INSTALL "${RELEASE_LIB}/libIPSec_MB.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + set(INTEL_IPSEC_CONFIGURATION "RELEASE") + if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + set(INTEL_IPSEC_LOCATION "lib/libIPSec_MB.lib") + configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-release.cmake" @ONLY) + else() + file(INSTALL "${RELEASE_LIB}/libIPSec_MB.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${RELEASE_LIB}/libIPSec_MB.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${RELEASE_LIB}/libIPSec_MB.exp" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + set(INTEL_IPSEC_LOCATION "bin/libIPSec_MB.dll") + set(INTEL_IPSEC_IMPLIB "lib/libIPSec_MB.lib") + configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets-implib.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-release.cmake" @ONLY) + endif() +else() + if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + set(LIB_SUFFIX ".a") + else() + set(LIB_SUFFIX ".so") + endif() + + find_program(MAKE make REQUIRED) + if(NOT "${VCPKG_BUILD_TYPE}" STREQUAL "release") + message(STATUS "Building ${TARGET_TRIPLET}-dbg") + set(INTEL_IPSEC_CONFIGURATION "DEBUG") + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + file(COPY "${SOURCE_PATH}/" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + vcpkg_execute_build_process( + COMMAND "${MAKE}" "-j${VCPKG_CONCURRENCY}" ${MAKE_OPTIONS} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib" + LOGNAME "build-${TARGET_TRIPLET}-dbg" + ) + + file(INSTALL "${DEBUG_LIB}/libIPSec_MB${LIB_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + set(INTEL_IPSEC_LOCATION "debug/lib/libIPSec_MB${LIB_SUFFIX}") + configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-debug.cmake" @ONLY) + endif() + + message(STATUS "Building ${TARGET_TRIPLET}-rel") + set(INTEL_IPSEC_CONFIGURATION "RELEASE") + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + file(COPY "${SOURCE_PATH}/" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + vcpkg_execute_build_process( + COMMAND "${MAKE}" -j ${MAKE_OPTIONS} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib" + LOGNAME "build-${TARGET_TRIPLET}-rel" + ) + + file(INSTALL "${RELEASE_LIB}/libIPSec_MB${LIB_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + set(INTEL_IPSEC_LOCATION "lib/libIPSec_MB${LIB_SUFFIX}") + configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-release.cmake" @ONLY) +endif() + +file(INSTALL "${SOURCE_PATH}/lib/intel-ipsec-mb.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsecConfig.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsecConfig.cmake" @ONLY) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/intel-ipsec/usage b/externals/vcpkg/ports/intel-ipsec/usage new file mode 100755 index 000000000..083bbca19 --- /dev/null +++ b/externals/vcpkg/ports/intel-ipsec/usage @@ -0,0 +1,4 @@ +The package intel-ipsec is compatible with built-in CMake targets: + + FIND_PACKAGE(intel-ipsec CONFIG REQUIRED) + TARGET_LINK_LIBRARIES(main PRIVATE IPSEC::ipsec) diff --git a/externals/vcpkg/ports/intel-ipsec/vcpkg.json b/externals/vcpkg/ports/intel-ipsec/vcpkg.json new file mode 100755 index 000000000..2083fbf77 --- /dev/null +++ b/externals/vcpkg/ports/intel-ipsec/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "intel-ipsec", + "version": "1.1", + "description": "Intel(R) Multi-Buffer Crypto for IPsec Library", + "supports": "x64 & (windows | linux) & !uwp" +} diff --git a/externals/vcpkg/ports/intel-mkl/portfile.cmake b/externals/vcpkg/ports/intel-mkl/portfile.cmake new file mode 100755 index 000000000..a885e8dcb --- /dev/null +++ b/externals/vcpkg/ports/intel-mkl/portfile.cmake @@ -0,0 +1,40 @@ +# Due to the complexity involved, this package doesn't install MKL. It instead verifies that MKL is installed. +# Other packages can depend on this package to declare a dependency on MKL. +# If this package is installed, we assume that MKL is properly installed. + +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(MKL_REQUIRED_VERSION "20200000") + +set(ProgramFilesx86 "ProgramFiles(x86)") +set(INTEL_ROOT $ENV{${ProgramFilesx86}}/IntelSWTools/compilers_and_libraries/windows) +set(ONEMKL_ROOT $ENV{${ProgramFilesx86}}/Intel/oneAPI/mkl/latest) + +find_path(MKL_ROOT include/mkl.h + PATHS + $ENV{MKLROOT} + ${INTEL_ROOT}/mkl + $ENV{ONEAPI_ROOT}/mkl/latest + ${ONEMKL_ROOT} + DOC + "Folder contains MKL") + +if (MKL_ROOT STREQUAL "MKL_ROOT-NOTFOUND") + message(FATAL_ERROR "Could not find MKL. Before continuing, please download and install MKL (${MKL_REQUIRED_VERSION} or higher) from:" + "\n https://registrationcenter.intel.com/en/products/download/3178/\n" + "\nAlso ensure vcpkg has been rebuilt with the latest version (v0.0.104 or later)") +endif() + +# file(STRINGS ${MKL_ROOT}/include/mkl_version.h MKL_VERSION_DEFINITION REGEX "__INTEL_MKL((_MINOR)|(_UPDATE))?__") +# string(REGEX MATCHALL "([0-9]+)" MKL_VERSION ${MKL_VERSION_DEFINITION}) +# list(GET MKL_VERSION 0 MKL_VERSION_MAJOR) +# list(GET MKL_VERSION 1 MKL_VERSION_MINOR) +# list(GET MKL_VERSION 2 MKL_VERSION_UPDATE) + +file(STRINGS ${MKL_ROOT}/include/mkl_version.h MKL_VERSION_DEFINITION REGEX "INTEL_MKL_VERSION") +string(REGEX MATCH "([0-9]+)" MKL_VERSION ${MKL_VERSION_DEFINITION}) + +if (MKL_VERSION LESS MKL_REQUIRED_VERSION) + message(FATAL_ERROR "MKL ${MKL_VERSION} is found but ${MKL_REQUIRED_VERSION} is required. Please download and install a more recent version of MKL from:" + "\n https://registrationcenter.intel.com/en/products/download/3178/\n") +endif() diff --git a/externals/vcpkg/ports/intel-mkl/vcpkg.json b/externals/vcpkg/ports/intel-mkl/vcpkg.json new file mode 100755 index 000000000..b767ee113 --- /dev/null +++ b/externals/vcpkg/ports/intel-mkl/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "intel-mkl", + "version": "2020.0.0", + "port-version": 2, + "description": "Intel® Math Kernel Library (Intel® MKL) accelerates math processing routines, increases application performance, and reduces development time on Intel® processors. Due to the complexity involved, this package doesn't install MKL. It instead verifies that MKL is installed. Please download and install MKL from https://registrationcenter.intel.com/en/products/download/3178/ manually before using it in vcpkg." +} diff --git a/externals/vcpkg/ports/intelrdfpmathlib/CMakeLists.txt b/externals/vcpkg/ports/intelrdfpmathlib/CMakeLists.txt new file mode 100755 index 000000000..809cd3477 --- /dev/null +++ b/externals/vcpkg/ports/intelrdfpmathlib/CMakeLists.txt @@ -0,0 +1,289 @@ +cmake_minimum_required(VERSION 3.8) +project(intelrdfpmathlib C) + +set( + intelrdfpmathlib_SOURCES + float128/dpml_exception.c + float128/dpml_four_over_pi.c + float128/dpml_ux_bessel.c + float128/dpml_ux_bid.c + float128/dpml_ux_cbrt.c + float128/dpml_ux_erf.c + float128/dpml_ux_exp.c + float128/dpml_ux_int.c + float128/dpml_ux_inv_hyper.c + float128/dpml_ux_inv_trig.c + float128/dpml_ux_lgamma.c + float128/dpml_ux_log.c + float128/dpml_ux_mod.c + float128/dpml_ux_ops.c + float128/dpml_ux_ops_64.c + float128/dpml_ux_pow.c + float128/dpml_ux_powi.c + float128/dpml_ux_sqrt.c + float128/dpml_ux_trig.c + float128/sqrt_tab_t.c + src/bid128.c + src/bid128_2_str_tables.c + src/bid128_acos.c + src/bid128_acosh.c + src/bid128_add.c + src/bid128_asin.c + src/bid128_asinh.c + src/bid128_atan.c + src/bid128_atan2.c + src/bid128_atanh.c + src/bid128_cbrt.c + src/bid128_compare.c + src/bid128_cos.c + src/bid128_cosh.c + src/bid128_div.c + src/bid128_erf.c + src/bid128_erfc.c + src/bid128_exp.c + src/bid128_exp10.c + src/bid128_exp2.c + src/bid128_expm1.c + src/bid128_fdimd.c + src/bid128_fma.c + src/bid128_fmod.c + src/bid128_frexp.c + src/bid128_hypot.c + src/bid128_ldexp.c + src/bid128_lgamma.c + src/bid128_llrintd.c + src/bid128_log.c + src/bid128_log10.c + src/bid128_log1p.c + src/bid128_log2.c + src/bid128_logb.c + src/bid128_logbd.c + src/bid128_lrintd.c + src/bid128_lround.c + src/bid128_minmax.c + src/bid128_modf.c + src/bid128_mul.c + src/bid128_nearbyintd.c + src/bid128_next.c + src/bid128_nexttowardd.c + src/bid128_noncomp.c + src/bid128_pow.c + src/bid128_quantexpd.c + src/bid128_quantize.c + src/bid128_rem.c + src/bid128_round_integral.c + src/bid128_scalb.c + src/bid128_scalbl.c + src/bid128_sin.c + src/bid128_sinh.c + src/bid128_sqrt.c + src/bid128_string.c + src/bid128_tan.c + src/bid128_tanh.c + src/bid128_tgamma.c + src/bid128_to_int16.c + src/bid128_to_int32.c + src/bid128_to_int64.c + src/bid128_to_int8.c + src/bid128_to_uint16.c + src/bid128_to_uint32.c + src/bid128_to_uint64.c + src/bid128_to_uint8.c + src/bid32_acos.c + src/bid32_acosh.c + src/bid32_add.c + src/bid32_asin.c + src/bid32_asinh.c + src/bid32_atan.c + src/bid32_atan2.c + src/bid32_atanh.c + src/bid32_cbrt.c + src/bid32_compare.c + src/bid32_cos.c + src/bid32_cosh.c + src/bid32_div.c + src/bid32_erf.c + src/bid32_erfc.c + src/bid32_exp.c + src/bid32_exp10.c + src/bid32_exp2.c + src/bid32_expm1.c + src/bid32_fdimd.c + src/bid32_fma.c + src/bid32_fmod.c + src/bid32_frexp.c + src/bid32_hypot.c + src/bid32_ldexp.c + src/bid32_lgamma.c + src/bid32_llrintd.c + src/bid32_log.c + src/bid32_log10.c + src/bid32_log1p.c + src/bid32_log2.c + src/bid32_logb.c + src/bid32_logbd.c + src/bid32_lrintd.c + src/bid32_lround.c + src/bid32_minmax.c + src/bid32_modf.c + src/bid32_mul.c + src/bid32_nearbyintd.c + src/bid32_next.c + src/bid32_nexttowardd.c + src/bid32_noncomp.c + src/bid32_pow.c + src/bid32_quantexpd.c + src/bid32_quantize.c + src/bid32_rem.c + src/bid32_round_integral.c + src/bid32_scalb.c + src/bid32_scalbl.c + src/bid32_sin.c + src/bid32_sinh.c + src/bid32_sqrt.c + src/bid32_string.c + src/bid32_sub.c + src/bid32_tan.c + src/bid32_tanh.c + src/bid32_tgamma.c + src/bid32_to_bid128.c + src/bid32_to_bid64.c + src/bid32_to_int16.c + src/bid32_to_int32.c + src/bid32_to_int64.c + src/bid32_to_int8.c + src/bid32_to_uint16.c + src/bid32_to_uint32.c + src/bid32_to_uint64.c + src/bid32_to_uint8.c + src/bid64_acos.c + src/bid64_acosh.c + src/bid64_add.c + src/bid64_asin.c + src/bid64_asinh.c + src/bid64_atan.c + src/bid64_atan2.c + src/bid64_atanh.c + src/bid64_cbrt.c + src/bid64_compare.c + src/bid64_cos.c + src/bid64_cosh.c + src/bid64_div.c + src/bid64_erf.c + src/bid64_erfc.c + src/bid64_exp.c + src/bid64_exp10.c + src/bid64_exp2.c + src/bid64_expm1.c + src/bid64_fdimd.c + src/bid64_fma.c + src/bid64_fmod.c + src/bid64_frexp.c + src/bid64_hypot.c + src/bid64_ldexp.c + src/bid64_lgamma.c + src/bid64_llrintd.c + src/bid64_log.c + src/bid64_log10.c + src/bid64_log1p.c + src/bid64_log2.c + src/bid64_logb.c + src/bid64_logbd.c + src/bid64_lrintd.c + src/bid64_lround.c + src/bid64_minmax.c + src/bid64_modf.c + src/bid64_mul.c + src/bid64_nearbyintd.c + src/bid64_next.c + src/bid64_nexttowardd.c + src/bid64_noncomp.c + src/bid64_pow.c + src/bid64_quantexpd.c + src/bid64_quantize.c + src/bid64_rem.c + src/bid64_round_integral.c + src/bid64_scalb.c + src/bid64_scalbl.c + src/bid64_sin.c + src/bid64_sinh.c + src/bid64_sqrt.c + src/bid64_string.c + src/bid64_tan.c + src/bid64_tanh.c + src/bid64_tgamma.c + src/bid64_to_bid128.c + src/bid64_to_int16.c + src/bid64_to_int32.c + src/bid64_to_int64.c + src/bid64_to_int8.c + src/bid64_to_uint16.c + src/bid64_to_uint32.c + src/bid64_to_uint64.c + src/bid64_to_uint8.c + src/bid_binarydecimal.c + src/bid_convert_data.c + src/bid_decimal_data.c + src/bid_decimal_globals.c + src/bid_dpd.c + src/bid_feclearexcept.c + src/bid_fegetexceptflag.c + src/bid_feraiseexcept.c + src/bid_fesetexceptflag.c + src/bid_fetestexcept.c + src/bid_flag_operations.c + src/bid_from_int.c + src/bid_round.c + src/strtod128.c + src/strtod32.c + src/strtod64.c + src/wcstod128.c + src/wcstod32.c + src/wcstod64.c +) + +if(MSVC) + add_compile_options(/W3 ) +else() + add_compile_options(-w) +endif() + +if(WIN32) + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + add_compile_options(-Defi2=1 -DEFI2=1) + else() + add_compile_options(-DIA32= -Dia32=1) + endif() +else() + add_compile_options(-Defi2=1 -DEFI2=1) +endif() + + +include_directories(. src float128) + +add_library(intel_decimal128 ${intelrdfpmathlib_SOURCES}) + +target_compile_definitions( + intel_decimal128 PRIVATE -DDECIMAL_CALL_BY_REFERENCE=0 -DDECIMAL_GLOBAL_ROUNDING=0 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=0 +) + +if(WIN32) + target_compile_definitions(intel_decimal128 PRIVATE -DWINDOWS=1 -DWNT=1 -Dwinnt=1) +elseif(APPLE) + target_compile_definitions(intel_decimal128 PRIVATE -DLINUX=1 -Dmach=1) +elseif(CMAKE_SYSTEM_NAME MATCHES "(FreeBSD|OpenBSD|NetBSD)") + target_compile_definitions(intel_decimal128 PRIVATE -DLINUX=1 -Dfreebsd=1) +else() + target_compile_definitions(intel_decimal128 PRIVATE -DLINUX=1 -Dlinux=1) +endif() + +install( + TARGETS intel_decimal128 + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES src/dfp754.h DESTINATION include) +endif() diff --git a/externals/vcpkg/ports/intelrdfpmathlib/portfile.cmake b/externals/vcpkg/ports/intelrdfpmathlib/portfile.cmake new file mode 100755 index 000000000..5b05fd56b --- /dev/null +++ b/externals/vcpkg/ports/intelrdfpmathlib/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_download_distfile(ARCHIVE + URLS "http://www.netlib.org/misc/intel/IntelRDFPMathLib20U2.tar.gz" + FILENAME "IntelRDFPMathLib20U2.tar.gz" + SHA512 4d445855f41b066b784f0c6b4e52f854df4129fa9d43569b1e1518f002b860f69796459c78de46a8ea24fb6e7aefe7f8bc1f253e78971a5ef202dab2a7b1b75a +) + +vcpkg_extract_source_archive_ex( + ARCHIVE ${ARCHIVE} + OUT_SOURCE_PATH SOURCE_PATH +) + +set(LIB_SOURCE_PATH "${SOURCE_PATH}/LIBRARY") + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${LIB_SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${LIB_SOURCE_PATH}" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_cmake_install() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/eula.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/intelrdfpmathlib/vcpkg.json b/externals/vcpkg/ports/intelrdfpmathlib/vcpkg.json new file mode 100755 index 000000000..87415c924 --- /dev/null +++ b/externals/vcpkg/ports/intelrdfpmathlib/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "intelrdfpmathlib", + "version-string": "20U2", + "port-version": 4, + "description": "Intel(R) Decimal Floating-Point Math Library", + "supports": "!(arm & windows)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/io2d/cmake.dep.patch b/externals/vcpkg/ports/io2d/cmake.dep.patch new file mode 100755 index 000000000..bcc7ea2a2 --- /dev/null +++ b/externals/vcpkg/ports/io2d/cmake.dep.patch @@ -0,0 +1,62 @@ +diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt +index 5ebeb6afa..702864667 100644 +--- a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt ++++ b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt +@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.8) + + project(io2d CXX) + +-find_package(Cairo REQUIRED) +-find_package(GraphicsMagick REQUIRED) ++find_package(Cairo REQUIRED) ++find_package(unofficial-GraphicsMagick REQUIRED) + + add_library(io2d_cairo + cairo_renderer-graphicsmagickinit.cpp +@@ -24,7 +24,7 @@ target_include_directories(io2d_cairo PUBLIC + + target_compile_features(io2d_cairo PUBLIC cxx_std_17) + +-target_link_libraries(io2d_cairo PUBLIC io2d_core Cairo::Cairo GraphicsMagick::GraphicsMagick) ++target_link_libraries(io2d_cairo PUBLIC io2d_core Cairo::Cairo unofficial::graphicsmagick::graphicsmagick) + + install( + TARGETS io2d_cairo EXPORT io2d_targets +diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt +index abb150113..75d8c654d 100644 +--- a/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt ++++ b/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt +@@ -27,15 +27,24 @@ if(MSVC) + target_compile_definitions(io2d_cairo_win32 PUBLIC -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_WARNINGS) + + find_library(PIXMAN_LIB pixman-1) +- find_library(FREETYPE_LIB freetype) +- find_library(FONTCONFIG_LIB fontconfig) +- find_library(BZ_LIB bz2) +- find_library(JPEG_LIB jpeg) +- find_library(TIFF_LIB tiff) +- find_library(EXPAT_LIB expat) +- find_library(LZMA_LIB lzma) +- find_library(ICONV_LIB libiconv) +- find_library(CHARSET_LIB libcharset) ++ find_package(FreeType REQUIRED) ++ set(FREETYPE_LIB ${FREETYPE_LIBRARIES}) # I dont use targets here since this means I have to correct the config.cmake too ++ find_package(Fontconfig REQUIRED) ++ set(FONTCONFIG_LIB ${Fontconfig_LIBRARIES}) ++ find_package(BZip2 REQUIRED) ++ set(BZ_LIB ${BZIP2_LIBRARIES}) ++ find_package(JPEG REQUIRED) ++ set(JPEG_LIB ${JPEG_LIBRARIES}) ++ find_package(TIFF REQUIRED) ++ set(TIFF_LIB ${TIFF_LIBRARIES}) ++ find_package(EXPAT REQUIRED) ++ set(EXPAT_LIB ${EXPAT_LIBRARIES}) ++ find_package(LibLZMA REQUIRED) ++ set(LZMA_LIB ${LIBLZMA_LIBRARIES}) ++ find_package(Iconv REQUIRED) ++ if(NOT Iconv_IS_BUILT_IN) ++ set(ICONV_LIB ${Iconv_LIBRARIES}) ++ endif() + + target_link_libraries(io2d_cairo_win32 PUBLIC ${PIXMAN_LIB} ${FREETYPE_LIB} ${FONTCONFIG_LIB} ${BZ_LIB} ${JPEG_LIB} ${TIFF_LIB} ${EXPAT_LIB} ${LZMA_LIB} ${ICONV_LIB} ${CHARSET_LIB}) + endif() diff --git a/externals/vcpkg/ports/io2d/portfile.cmake b/externals/vcpkg/ports/io2d/portfile.cmake new file mode 100755 index 000000000..d47fc97c8 --- /dev/null +++ b/externals/vcpkg/ports/io2d/portfile.cmake @@ -0,0 +1,44 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cpp-io2d/P0267_RefImpl + REF caa0ba0cb5a421a38bc26afaf3505bee206c44dd # accessed on 2020-09-14 + SHA512 f8e5a708f6cbda913a0492a843e1502b8d3cc615a6abda50e850be944e1484ec9087b787c54cc25d513172a7d5ab789be41a761c97df94266df4d1bcf14db17c + HEAD_REF master + PATCHES + cmake.dep.patch +) + +if (VCPKG_TARGET_IS_OSX) + set(IO2D_DEFAULT_OPTION "-DIO2D_DEFAULT=COREGRAPHICS_MAC") +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DIO2D_WITHOUT_SAMPLES=1 + -DIO2D_WITHOUT_TESTS=1 + -DCMAKE_INSTALL_INCLUDEDIR:STRING=include + ${IO2D_DEFAULT_OPTION} +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/io2d) + +if (NOT VCPKG_TARGET_IS_OSX) + file(RENAME ${CURRENT_PACKAGES_DIR}/share/io2d/io2dConfig.cmake ${CURRENT_PACKAGES_DIR}/share/io2d/io2dTargets.cmake) + file(WRITE ${CURRENT_PACKAGES_DIR}/share/io2d/io2dConfig.cmake " + include(CMakeFindDependencyMacro) + find_dependency(unofficial-cairo CONFIG) + find_dependency(unofficial-graphicsmagick CONFIG) + + include(\${CMAKE_CURRENT_LIST_DIR}/io2dTargets.cmake) + ") +endif() + +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/io2d/vcpkg.json b/externals/vcpkg/ports/io2d/vcpkg.json new file mode 100755 index 000000000..79570f44b --- /dev/null +++ b/externals/vcpkg/ports/io2d/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "io2d", + "version-date": "2020-09-14", + "port-version": 3, + "description": "a lightweight, cross platform drawing library", + "dependencies": [ + { + "name": "cairo", + "features": [ + "x11" + ], + "platform": "linux" + }, + { + "name": "cairo", + "platform": "!osx" + }, + { + "name": "graphicsmagick", + "platform": "!osx" + } + ] +} diff --git a/externals/vcpkg/ports/irrlicht/CMakeLists.txt b/externals/vcpkg/ports/irrlicht/CMakeLists.txt new file mode 100755 index 000000000..cc6edc785 --- /dev/null +++ b/externals/vcpkg/ports/irrlicht/CMakeLists.txt @@ -0,0 +1,250 @@ +# +# Irrlicht 3D engine +# +cmake_minimum_required(VERSION 3.16) +project(Irrlicht LANGUAGES C CXX) + +set_property(GLOBAL PROPERTY USE_FOLDERS ON) + +# Irrlicht directories +# ------------------------------------------------------------------------------------------------- +set(IRR_SRC_DIR "source/Irrlicht") +set(IRR_INC_DIR "include") +set(IRR_TOOL_DIR "tools") + +# Options +# ------------------------------------------------------------------------------------------------- +set(DXSDK "") +if(DEFINED ENV{DXSDK_DIR}) + set(DXSDK "$ENV{DXSDK_DIR}") +endif() + +set(IRR_UNICODE_PATH 0 CACHE BOOL "Whether to enable unicode path support on windows") +set(IRR_FAST_MATH 0 CACHE BOOL "Whether to enable fast maths (at the expense of precision)") +set(IRR_SHARED_LIB 1 CACHE BOOL "Whether to generate shared libraries instead of static libraries") +set(IRR_DIRECTX_SDK ${DXSDK} CACHE PATH "Path to the DirectX SDK (for DirectX 9, this folder should contain /Include, /Lib)") +set(IRR_BUILD_TOOLS 0 CACHE BOOL "Whether to generate the tools") + +# Some helper functions +# ------------------------------------------------------------------------------------------------- +function(glob_c_cpp_sources result folder) + file(GLOB res + "${folder}/*.c" + "${folder}/*.cpp" + "${folder}/*.h" + "${folder}/*.hpp" + "${folder}/*.rc") + set(${result} ${res} PARENT_SCOPE) +endfunction() + +# Source files +# ------------------------------------------------------------------------------------------------- +glob_c_cpp_sources(IRR_SRC_FILES ${IRR_SRC_DIR}) +glob_c_cpp_sources(IRR_SRC_FILES_INTERFACE ${IRR_INC_DIR}) +glob_c_cpp_sources(IRR_SRC_FILES_AESGLADMAN ${IRR_SRC_DIR}/aesGladman) +glob_c_cpp_sources(IRR_SRC_FILES_LZMA ${IRR_SRC_DIR}/lzma) + +glob_c_cpp_sources(IRR_TOOL_FILES_FILE_TO_HEADER ${IRR_TOOL_DIR}/FileToHeader/) +glob_c_cpp_sources(IRR_TOOL_FILES_GUI_EDITOR ${IRR_TOOL_DIR}/GUIEditor/) +glob_c_cpp_sources(IRR_TOOL_FILES_FONT_TOOL ${IRR_TOOL_DIR}/IrrFontTool/newFontTool/) +glob_c_cpp_sources(IRR_TOOL_FILES_MESH_CONVERTER ${IRR_TOOL_DIR}/MeshConverter/) + +if(APPLE) + file(GLOB IRR_SRC_FILES_OSX + "${IRR_SRC_DIR}/MacOSX/*.mm" + "${IRR_SRC_DIR}/MacOSX/*.h") + + set(IRR_SRC_FILES ${IRR_SRC_FILES} ${IRR_SRC_FILES_OSX}) +endif() + +# Group files +# ------------------------------------------------------------------------------------------------- +source_group(Irrlicht\\engine FILES ${IRR_SRC_FILES}) +source_group(Irrlicht\\interface FILES ${IRR_SRC_FILES_INTERFACE}) +source_group(Irrlicht\\libs\\aesGladman FILES ${IRR_SRC_FILES_AESGLADMAN}) +source_group(Irrlicht\\libs\\lzma FILES ${IRR_SRC_FILES_LZMA}) + +# Library files +# ------------------------------------------------------------------------------------------------- +find_package(ZLIB REQUIRED) +find_package(PNG REQUIRED) +find_package(JPEG REQUIRED) +find_package(BZip2 REQUIRED) +#find_package(LIBLZMA REQUIRED) # LIBLZMA does not export _LzmaDecode + +# Irrlicht target +# ------------------------------------------------------------------------------------------------- +set(IRR_ALL_SRC_FILES + ${IRR_SRC_FILES} + ${IRR_SRC_FILES_INTERFACE} + ${IRR_SRC_FILES_AESGLADMAN} + ${IRR_SRC_FILES_LZMA} + ) + +if(${IRR_SHARED_LIB}) + add_library(Irrlicht SHARED ${IRR_ALL_SRC_FILES}) +else() + add_library(Irrlicht STATIC ${IRR_ALL_SRC_FILES}) +endif() + +if(APPLE) + target_include_directories(Irrlicht PRIVATE ${IRR_SRC_DIR}/MacOSX) + + target_compile_definitions(Irrlicht PRIVATE SYSTEM=MacOSX) + + target_link_libraries(Irrlicht ${OSX_LIBRARIES}) + + target_compile_options(Irrlicht PRIVATE "-ObjC++") + + set(ADDITIONAL_LIRARIES + "-framework OpenGL" + "-framework IOKit" + "-framework Carbon" + "-framework AppKit" + "-framework Cocoa") +endif() + +target_link_libraries(Irrlicht PRIVATE + ${PNG_LIBRARY} + ${JPEG_LIBRARY} + ${ZLIB_LIBRARY} + ${BZIP2_LIBRARY} + ${ADDITIONAL_LIRARIES} + ) + +if(IRR_BUILD_TOOLS) + add_executable(FileToHeader ${IRR_TOOL_FILES_FILE_TO_HEADER}) + + add_executable(GUIEditor ${IRR_TOOL_FILES_GUI_EDITOR}) + target_link_libraries(GUIEditor Irrlicht) + + add_executable(FontTool ${IRR_TOOL_FILES_FONT_TOOL}) + target_link_libraries(FontTool Irrlicht) + + add_executable(MeshConverter ${IRR_TOOL_FILES_MESH_CONVERTER}) + target_link_libraries(MeshConverter Irrlicht) +endif() + +# Target properties (for compilation & export) +# ------------------------------------------------------------------------------------------------- +target_include_directories(Irrlicht + PRIVATE ${IRR_SRC_DIR} + PRIVATE ${IRR_SRC_DIR}/aesGladman + PRIVATE ${BZIP2_INCLUDE_DIR} + PRIVATE ${JPEG_INCLUDE_DIR} + PRIVATE ${LIBPNG_INCLUDE_DIR} + PRIVATE ${IRR_SRC_DIR}/lzma + PRIVATE ${ZLIB_INCLUDE_DIR} + ) + +# I dont realy understand why this is necesary or what it is doing, +# but it is necesarry to build and export a package. +# See: https://cmake.org/cmake/help/v3.8/command/target_include_directories.html +target_include_directories(Irrlicht PUBLIC + $ + $ # /include/irrlicht +) + +if(NOT ${IRR_DIRECTX_SDK} STREQUAL "") + target_include_directories(Irrlicht PRIVATE ${IRR_DIRECTX_SDK}/Include) + if(${CMAKE_SIZEOF_VOID_P} EQUAL 4) + set(DX_LIBS ${IRR_DIRECTX_SDK}/Lib/x86) + else() + set(DX_LIBS ${IRR_DIRECTX_SDK}/Lib/x64) + endif() + target_link_libraries(Irrlicht + PRIVATE ${DX_LIBS}/d3dx9.lib + PRIVATE ${DX_LIBS}/dinput8.lib + PRIVATE ${DX_LIBS}/dxguid.lib) +else() + target_compile_definitions(Irrlicht PRIVATE NO_IRR_COMPILE_WITH_DIRECT3D_9_) +endif() + +if(NOT ${IRR_SHARED_LIB}) + target_compile_definitions(Irrlicht PUBLIC _IRR_STATIC_LIB_) +endif() + +# Disable Irrlicht building already provided dependencies +target_compile_definitions(Irrlicht + PRIVATE NO_IRR_USE_NON_SYSTEM_ZLIB_ + PRIVATE NO_IRR_USE_NON_SYSTEM_LIB_PNG_ + PRIVATE NO_IRR_USE_NON_SYSTEM_BZLIB_ + PRIVATE NO_IRR_USE_NON_SYSTEM_JPEG_LIB_ + ) + +# Per platform config +# ------------------------------------------------------------------------------------------------- + +# Export symbols +target_compile_definitions(Irrlicht PRIVATE IRRLICHT_EXPORTS) + +if(WIN32) + # Import the symbols of bzip2 + target_compile_definitions(Irrlicht PRIVATE BZ_IMPORT) + + # Disable the ton of warnings from standard library + target_compile_definitions(Irrlicht PRIVATE _CRT_SECURE_NO_WARNINGS) + + # Multi processor compilation + target_compile_options(Irrlicht PRIVATE /MP) + + # Unicode + if(${IRR_UNICODE_PATH}) + target_compile_definitions(Irrlicht PRIVATE UNICODE _UNICODE) + target_compile_definitions(Irrlicht PUBLIC _IRR_WCHAR_FILESYSTEM) + endif() + + # Fast math options + if(${IRR_FAST_MATH}) + target_compile_options(Irrlicht PRIVATE /fp:fast) + message("Fast Math Enabled") + # SSE2 is automatically activated on x64 + if(${CMAKE_SIZEOF_VOID_P} EQUAL 4) + target_compile_options(Irrlicht PRIVATE /arch:SSE2) + endif() + endif() +elseif(UNIX) + # Standard mode + target_compile_options(Irrlicht + PRIVATE -Wall + PRIVATE -pipe + PRIVATE -fno-exceptions + PRIVATE -fno-strict-aliasing) + + # Disable RTTI on C++ files only (no sense for C files) + set_source_files_properties(${IRR_SRC_FILES} ${IRR_SRC_FILES_AESGLADMAN} + PROPERTIES COMPILE_FLAGS -fno-rtti) + + # Debug macro + target_compile_options(Irrlicht PRIVATE $<$:-D_DEBUG>) + + # X11 and OpenGL + if(NOT APPLE) + target_link_libraries(Irrlicht + PRIVATE X11 + PRIVATE GL + PRIVATE Xxf86vm) + endif() +endif() + +# Installation +# ------------------------------------------------------------------------------------------------- +install( + TARGETS Irrlicht + EXPORT Irrlicht + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(FILES ${IRR_SRC_FILES_INTERFACE} DESTINATION "include/irrlicht" CONFIGURATIONS Release) + +if(IRR_BUILD_TOOLS) + install( + TARGETS FileToHeader GUIEditor FontTool MeshConverter + RUNTIME DESTINATION tools/irrlicht/ + CONFIGURATIONS Release + ) +endif() + +install(EXPORT Irrlicht FILE irrlicht-targets.cmake DESTINATION share/irrlicht) diff --git a/externals/vcpkg/ports/irrlicht/LICENSE.txt b/externals/vcpkg/ports/irrlicht/LICENSE.txt new file mode 100755 index 000000000..17248fdb4 --- /dev/null +++ b/externals/vcpkg/ports/irrlicht/LICENSE.txt @@ -0,0 +1,20 @@ +The Irrlicht Engine License +=========================== + +Copyright (C) 2002-2015 Nikolaus Gebhardt + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgement in the product documentation would be + appreciated but is not required. +2. Altered source versions must be clearly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. \ No newline at end of file diff --git a/externals/vcpkg/ports/irrlicht/fix-encoding.patch b/externals/vcpkg/ports/irrlicht/fix-encoding.patch new file mode 100755 index 000000000..d01bfad51 --- /dev/null +++ b/externals/vcpkg/ports/irrlicht/fix-encoding.patch @@ -0,0 +1,13 @@ +diff --git a/include/Keycodes.h b/include/Keycodes.h +index e56eca1..57ab312 100644 +--- a/include/Keycodes.h ++++ b/include/Keycodes.h +@@ -89,7 +89,7 @@ namespace irr + KEY_KEY_X = 0x58, // X key + KEY_KEY_Y = 0x59, // Y key + KEY_KEY_Z = 0x5A, // Z key +- KEY_LWIN = 0x5B, // Left Windows key (Microsoft® Natural® keyboard) ++ KEY_LWIN = 0x5B, // Left Windows key (Microsoft® Natural® keyboard) + KEY_RWIN = 0x5C, // Right Windows key (Natural keyboard) + KEY_APPS = 0x5D, // Applications key (Natural keyboard) + KEY_SLEEP = 0x5F, // Computer Sleep key diff --git a/externals/vcpkg/ports/irrlicht/fix-osx-compilation.patch b/externals/vcpkg/ports/irrlicht/fix-osx-compilation.patch new file mode 100755 index 000000000..6f623db26 --- /dev/null +++ b/externals/vcpkg/ports/irrlicht/fix-osx-compilation.patch @@ -0,0 +1,28 @@ +diff --git a/source/Irrlicht/CImageLoaderJPG.cpp b/source/Irrlicht/CImageLoaderJPG.cpp +index 66144326c..4ea224c24 100644 +--- a/source/Irrlicht/CImageLoaderJPG.cpp ++++ b/source/Irrlicht/CImageLoaderJPG.cpp +@@ -68,7 +68,7 @@ void CImageLoaderJPG::init_source (j_decompress_ptr cinfo) + boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo) + { + // DO NOTHING +- return 1; ++ return TRUE; + } + + +diff --git a/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm b/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm +index 53029eb45..e75b707e1 100644 +--- a/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm ++++ b/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm +@@ -495,8 +495,8 @@ long GetDictionaryLong(CFDictionaryRef theDict, const void* key) + if(!CreationParams.WindowId) //load menus if standalone application + { + [[NSAutoreleasePool alloc] init]; +- [NSApplication sharedApplication]; +- [NSApp setDelegate:(id)[[[AppDelegate alloc] initWithDevice:this] autorelease]]; ++ [[NSApplication sharedApplication] activateIgnoringOtherApps]; ++ [NSApp setDelegate:(id)[[[AppDelegate alloc] initWithDevice:this] autorelease]]; + [NSBundle loadNibNamed:@"MainMenu" owner:[NSApp delegate]]; + [NSApp finishLaunching]; + } diff --git a/externals/vcpkg/ports/irrlicht/fix-sysctl.patch b/externals/vcpkg/ports/irrlicht/fix-sysctl.patch new file mode 100755 index 000000000..98c70273e --- /dev/null +++ b/externals/vcpkg/ports/irrlicht/fix-sysctl.patch @@ -0,0 +1,12 @@ +--- a/source/Irrlicht/COSOperator.cpp ++++ b/source/Irrlicht/COSOperator.cpp +@@ -11,8 +11,8 @@ + #else + #include + #include +-#ifndef _IRR_SOLARIS_PLATFORM_ + #include ++#ifdef _IRR_OSX_PLATFORM_ + #include + #endif + #endif diff --git a/externals/vcpkg/ports/irrlicht/portfile.cmake b/externals/vcpkg/ports/irrlicht/portfile.cmake new file mode 100755 index 000000000..37f4ee26e --- /dev/null +++ b/externals/vcpkg/ports/irrlicht/portfile.cmake @@ -0,0 +1,57 @@ +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO irrlicht/Irrlicht%20SDK + REF 1.8/1.8.4 + FILENAME "irrlicht-1.8.4.zip" + SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1 + PATCHES + fix-encoding.patch + fix-sysctl.patch + fix-osx-compilation.patch +) + +if(VCPKG_TARGET_IS_LINUX) + message( +"Irrlicht currently requires the following libraries from the system package manager: + libgl1-mesa + xf86vmode + +These can be installed on Ubuntu systems via sudo apt-get install libgl1-mesa-dev libxxf86vm-dev") +endif() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + unicode IRR_UNICODE_PATH + fast-fpu IRR_FAST_MATH + tools IRR_BUILD_TOOLS +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIB) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DIRR_SHARED_LIB=${SHARED_LIB} + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/irrlicht/") +endif() + +file(WRITE "${CURRENT_PACKAGES_DIR}/share/irrlicht/irrlicht-config.cmake" "include(\${CMAKE_CURRENT_LIST_DIR}/irrlicht-targets.cmake)") + +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/irrlicht") +endif() + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/irrlicht/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/irrlicht/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..4cfdb8a0d --- /dev/null +++ b/externals/vcpkg/ports/irrlicht/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,11 @@ +_find_package(${ARGS}) +find_package(ZLIB REQUIRED) +find_package(PNG REQUIRED) +find_package(JPEG REQUIRED) +find_package(BZip2 REQUIRED) +if(TARGET Irrlicht::Irrlicht) + set_property(TARGET Irrlicht::Irrlicht APPEND PROPERTY INTERFACE_LINK_LIBRARIES ZLIB::ZLIB PNG::PNG JPEG::JPEG BZip2::BZip2) +endif() +if(IRRLICHT_LIBRARIES) + list(APPEND IRRLICHT_LIBRARIES ${ZLIB_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${BZIP2_LIBRARIES}) +endif() diff --git a/externals/vcpkg/ports/irrlicht/vcpkg.json b/externals/vcpkg/ports/irrlicht/vcpkg.json new file mode 100755 index 000000000..1815c8040 --- /dev/null +++ b/externals/vcpkg/ports/irrlicht/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "irrlicht", + "version-string": "1.8.4", + "port-version": 13, + "description": "The Irrlicht Engine is an open source realtime 3D engine written in C++. It is cross-platform, using D3D, OpenGL and its own software renderers.", + "homepage": "http://irrlicht.sourceforge.net", + "supports": "!(arm | uwp)", + "dependencies": [ + "bzip2", + "libjpeg-turbo", + "libpng", + "vcpkg-cmake", + "vcpkg-cmake-config", + "zlib" + ], + "features": { + "fast-fpu": { + "description": "Enable fast maths (at the expense of precision)" + }, + "tools": { + "description": "Build the Tools FileToHeader, FontTool, GUIEditor and MeshConverter" + }, + "unicode": { + "description": "Support unicode path on windows" + } + } +} diff --git a/externals/vcpkg/ports/irrxml/portfile.cmake b/externals/vcpkg/ports/irrxml/portfile.cmake new file mode 100755 index 000000000..065116c27 --- /dev/null +++ b/externals/vcpkg/ports/irrxml/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/irrxml/vcpkg.json b/externals/vcpkg/ports/irrxml/vcpkg.json new file mode 100755 index 000000000..c84eba7b4 --- /dev/null +++ b/externals/vcpkg/ports/irrxml/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "irrxml", + "version-string": "0", + "description": "Alias port for irrlicht", + "dependencies": [ + "irrlicht" + ] +} diff --git a/externals/vcpkg/ports/isal/CMakeLists.txt b/externals/vcpkg/ports/isal/CMakeLists.txt new file mode 100755 index 000000000..b479e1522 --- /dev/null +++ b/externals/vcpkg/ports/isal/CMakeLists.txt @@ -0,0 +1,51 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 3.9) +PROJECT(isal C) + +IF (SOURCE_PATH) + SET(CMAKE_SOURCE_DIR ${SOURCE_PATH}) +ENDIF () + +INCLUDE(ProcessorCount) +PROCESSORCOUNT(PROCS) + +FIND_PROGRAM(NASM nasm) +IF (NOT NASM) + MESSAGE(FATAL_ERROR "NASM not found") +ENDIF () + +IF (EXEC_ENV STREQUAL "Windows") + FIND_PROGRAM(MAKE nmake) + IF (NOT MAKE) + MESSAGE(FATAL_ERROR "nmake not found") + ENDIF () +ELSEIF(EXEC_ENV STREQUAL "Linux") + FIND_PROGRAM(MAKE make) + IF (NOT MAKE) + MESSAGE(FATAL_ERROR "MAKE not found") + ENDIF () +ENDIF() + +SET(MAKE_FLAGS "-f") + +IF (EXEC_ENV STREQUAL Windows) + STRING(APPEND MAKE_FLAGS " Makefile.nmake /E CC=cl AS=nasm") +ELSEIF (EXEC_ENV STREQUAL Linux) + STRING(APPEND MAKE_FLAGS "Makefile.unx") +ENDIF () + +ADD_CUSTOM_TARGET(isal ALL + COMMAND ${MAKE} ${MAKE_FLAGS} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/ + ) + +SET(LIB_PATH ${CMAKE_SOURCE_DIR}/bin/) +IF (LIBRARY_LINKAGE STREQUAL "dynamic") + STRING(APPEND LIB_PATH isal.so) +ELSEIF (LIBRARY_LINKAGE STREQUAL "static") + STRING(APPEND LIB_PATH isa-l.a) +ELSE () + MESSAGE(FATAL_ERROR "Unknown linkage type ${LIBRARY_LINKAGE}") +ENDIF () +INSTALL(FILES ${LIB_PATH} + DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/lib/) +INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/) \ No newline at end of file diff --git a/externals/vcpkg/ports/isal/isalConfig.cmake b/externals/vcpkg/ports/isal/isalConfig.cmake new file mode 100755 index 000000000..3348ec434 --- /dev/null +++ b/externals/vcpkg/ports/isal/isalConfig.cmake @@ -0,0 +1,17 @@ + +FUNCTION(SET_LIBRARY_TARGET NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR) + ADD_LIBRARY(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED) + SET_TARGET_PROPERTIES(${NAMESPACE}::${LIB_NAME} PROPERTIES + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}" + IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}" + INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}" + ) + SET(${NAMESPACE}_${LIB_NAME}_FOUND 1) +ENDFUNCTION() + +GET_FILENAME_COMPONENT(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) +GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH) +GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH) + +SET_LIBRARY_TARGET("ISAL" "isal" "${ROOT}/debug/lib/isa-l.a" "${ROOT}/lib/isa-l.a" "${ROOT}/include/isal") diff --git a/externals/vcpkg/ports/isal/portfile.cmake b/externals/vcpkg/ports/isal/portfile.cmake new file mode 100755 index 000000000..0703b7246 --- /dev/null +++ b/externals/vcpkg/ports/isal/portfile.cmake @@ -0,0 +1,46 @@ +IF (NOT VCPKG_CMAKE_SYSTEM_NAME) + SET(EXEC_ENV "Windows") +ELSE () + SET(EXEC_ENV "${VCPKG_CMAKE_SYSTEM_NAME}") +ENDIF () + +IF (NOT EXEC_ENV STREQUAL "Linux") + MESSAGE(FATAL_ERROR "Intel(R) Intelligent Storage Acceleration Library currently only supports Linux platforms") + MESSAGE(STATUS "Well, it is not true, but I didnt manage to get it working on Windows") +ENDIF () + +IF (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + MESSAGE(FATAL_ERROR "Intel(R) Intelligent Storage Acceleration Library currently only supports x64 architecture") +ELSEIF (NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + MESSAGE(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") +ENDIF () + +VCPKG_FROM_GITHUB( + OUT_SOURCE_PATH SOURCE_PATH + REPO 01org/isa-l + REF v2.25.0 + SHA512 aa556c8ba26b4637493b3de50a23636668bcfd71249029c52fe6983d0bcf120d1b91f39aaa259cb58e59448d401366f3bfaaee24609db7e6a1cd3fdf1a953efe + HEAD_REF master +) + +VCPKG_FIND_ACQUIRE_PROGRAM(NASM) +GET_FILENAME_COMPONENT(NASM_PATH ${NASM} DIRECTORY) +SET(ENV{PATH} "$ENV{PATH};${NASM_PATH}") + +VCPKG_CONFIGURE_CMAKE( + SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR} + PREFER_NINJA + OPTIONS + -DSOURCE_PATH=${SOURCE_PATH} + -DEXEC_ENV:STRING=${EXEC_ENV} + -DLIBRARY_LINKAGE:STRING=${VCPKG_LIBRARY_LINKAGE} +) + +VCPKG_INSTALL_CMAKE() + +FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +FILE(INSTALL ${SOURCE_PATH}/Release/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) +FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/isalConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +FILE(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/isal/usage b/externals/vcpkg/ports/isal/usage new file mode 100755 index 000000000..23870b20f --- /dev/null +++ b/externals/vcpkg/ports/isal/usage @@ -0,0 +1,5 @@ +The package isal is compatible with built-in CMake targets: + + FIND_PACKAGE(isal REQUIRED) + TARGET_LINK_LIBRARIES(main PRIVATE ISAL::isa-l) for static linkage or + TARGET_LINK_LIBRARIES(main PRIVATE ISAL::isal) for dynamic linkage diff --git a/externals/vcpkg/ports/isal/vcpkg.json b/externals/vcpkg/ports/isal/vcpkg.json new file mode 100755 index 000000000..7a18c0095 --- /dev/null +++ b/externals/vcpkg/ports/isal/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "isal", + "version-string": "2.25.0", + "port-version": 1, + "description": "Intel(R) Intelligent Storage Acceleration Library" +} diff --git a/externals/vcpkg/ports/ismrmrd/fix-depends-hdf5.patch b/externals/vcpkg/ports/ismrmrd/fix-depends-hdf5.patch new file mode 100755 index 000000000..26b01de48 --- /dev/null +++ b/externals/vcpkg/ports/ismrmrd/fix-depends-hdf5.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2144fd3..68f9ca9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -108,7 +108,11 @@ endif() + if (USE_HDF5_DATASET_SUPPORT) + if (VCPKG_TARGET_TRIPLET) #VCPKG HDF5 is packaged differently. + find_package(HDF5 CONFIG COMPONENTS C shared REQUIRED) +- set(HDF5_C_LIBRARIES hdf5::hdf5-shared) ++ if (BUILD_SHARED_LIBS) ++ set(HDF5_C_LIBRARIES hdf5::hdf5-shared) ++ else() ++ set(HDF5_C_LIBRARIES hdf5::hdf5-static) ++ endif() + else () + find_package(HDF5 COMPONENTS C REQUIRED) + endif () diff --git a/externals/vcpkg/ports/ismrmrd/portfile.cmake b/externals/vcpkg/ports/ismrmrd/portfile.cmake new file mode 100755 index 000000000..36615b2f8 --- /dev/null +++ b/externals/vcpkg/ports/ismrmrd/portfile.cmake @@ -0,0 +1,51 @@ +if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") + set(WIN32_INCLUDE_STDDEF_PATCH "x86-windows-include-stddef.patch") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ismrmrd/ismrmrd + REF v1.5.0 + SHA512 96e24be75ecde8e56001d805ffaf4502d39c87e2c4fe01c84c90cb01d8bd49268c48440728de2ffb4c3efa75a029b3ffc0101b5841893685f82b4fafec9b1c73 + HEAD_REF master + PATCHES + ${WIN32_INCLUDE_STDDEF_PATCH} + fix-depends-hdf5.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DUSE_SYSTEM_PUGIXML=ON + -DUSE_HDF5_DATASET_SUPPORT=ON + -DVCPKG_TARGET_TRIPLET=ON + -DBUILD_TESTS=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_UTILITIES=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ISMRMRD/) + +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/ismrmrd.dll") + file(COPY "${CURRENT_PACKAGES_DIR}/lib/ismrmrd.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/ismrmrd.dll") +endif() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/ismrmrd.dll") + file(COPY "${CURRENT_PACKAGES_DIR}/debug/lib/ismrmrd.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/ismrmrd.dll") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/ismrmrd/cmake") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/ismrmrd/vcpkg.json b/externals/vcpkg/ports/ismrmrd/vcpkg.json new file mode 100755 index 000000000..e0f2a7c74 --- /dev/null +++ b/externals/vcpkg/ports/ismrmrd/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "ismrmrd", + "version": "1.5.0", + "port-version": 2, + "description": "ISMRM Raw Data Format", + "homepage": "https://github.com/ismrmrd/ismrmrd", + "dependencies": [ + "boost", + "fftw3", + "hdf5", + "pugixml", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ismrmrd/x86-windows-include-stddef.patch b/externals/vcpkg/ports/ismrmrd/x86-windows-include-stddef.patch new file mode 100755 index 000000000..3855f86d5 --- /dev/null +++ b/externals/vcpkg/ports/ismrmrd/x86-windows-include-stddef.patch @@ -0,0 +1,14 @@ +diff --git a/include/ismrmrd/ismrmrd.h b/include/ismrmrd/ismrmrd.h +index 40614eb..e5e3e25 100644 +--- a/include/ismrmrd/ismrmrd.h ++++ b/include/ismrmrd/ismrmrd.h +@@ -30,6 +30,9 @@ typedef unsigned __int32 uint32_t; + typedef __int64 int64_t; + typedef unsigned __int64 uint64_t; + #endif ++#if _WIN32 ++#include /* for size_t */ ++#endif + #else /* non MS C or C++ compiler */ + #include + #include /* for size_t */ diff --git a/externals/vcpkg/ports/itk/double-conversion.patch b/externals/vcpkg/ports/itk/double-conversion.patch new file mode 100755 index 000000000..636dd8c4c --- /dev/null +++ b/externals/vcpkg/ports/itk/double-conversion.patch @@ -0,0 +1,16 @@ +diff --git a/Modules/ThirdParty/DoubleConversion/CMakeLists.txt b/Modules/ThirdParty/DoubleConversion/CMakeLists.txt +index 16c611fd3..13978724c 100644 +--- a/Modules/ThirdParty/DoubleConversion/CMakeLists.txt ++++ b/Modules/ThirdParty/DoubleConversion/CMakeLists.txt +@@ -9,7 +9,10 @@ mark_as_advanced(ITK_USE_SYSTEM_DOUBLECONVERSION) + if(ITK_USE_SYSTEM_DOUBLECONVERSION) + find_package(double-conversion REQUIRED) + get_target_property(ITKDoubleConversion_INCLUDE_DIRS double-conversion::double-conversion INTERFACE_INCLUDE_DIRECTORIES) +- get_target_property(ITKDoubleConversion_LIBRARIES double-conversion::double-conversion LOCATION) ++ get_target_property(ITKDoubleConversion_LIBRARY_RELEASE double-conversion::double-conversion LOCATION_RELEASE) ++ get_target_property(ITKDoubleConversion_LIBRARY_DEBUG double-conversion::double-conversion LOCATION_DEBUG) ++ include(SelectLibraryConfigurations) ++ select_library_configurations(ITKDoubleConversion) + else() + set(ITKDoubleConversion_INCLUDE_DIRS + ${ITKDoubleConversion_SOURCE_DIR}/src diff --git a/externals/vcpkg/ports/itk/opencl.patch b/externals/vcpkg/ports/itk/opencl.patch new file mode 100755 index 000000000..f935d09d4 --- /dev/null +++ b/externals/vcpkg/ports/itk/opencl.patch @@ -0,0 +1,176 @@ +diff --git a/Modules/Core/GPUCommon/CMakeLists.txt b/Modules/Core/GPUCommon/CMakeLists.txt +index da2d66b63..6fb476680 100644 +--- a/Modules/Core/GPUCommon/CMakeLists.txt ++++ b/Modules/Core/GPUCommon/CMakeLists.txt +@@ -24,9 +24,13 @@ if(ITK_USE_GPU AND APPLE AND NOT ITK_COMPILER_HAS_BLOCKS) + endif() + + if(ITK_USE_GPU) ++ message(STATUS "OPENCL_LIBRARIES:${OPENCL_LIBRARIES}") ++ if(TARGET OpenCL::OpenCL) ++ message(STATUS "OPENCL_LIBRARIES:${OpenCL_LIBRARIES}") ++ endif() + set(ITKGPUCommon_LIBRARIES ITKGPUCommon) +- set(ITKGPUCommon_SYSTEM_INCLUDE_DIRS ${OPENCL_INCLUDE_DIRS}) +- set(ITKGPUCommon_SYSTEM_LIBRARY_DIRS ${OPENCL_LIBRARIES}) ++ set(ITKGPUCommon_SYSTEM_INCLUDE_DIRS ${OpenCL_INCLUDE_DIRS}) ++ set(ITKGPUCommon_SYSTEM_LIBRARY_DIRS ${OpenCL_LIBRARIES}) + endif() + + if(NOT ITK_SOURCE_DIR) +diff --git a/Modules/Core/GPUCommon/src/CMakeLists.txt b/Modules/Core/GPUCommon/src/CMakeLists.txt +index 0b39f2a9a..160f7a752 100644 +--- a/Modules/Core/GPUCommon/src/CMakeLists.txt ++++ b/Modules/Core/GPUCommon/src/CMakeLists.txt +@@ -14,5 +14,5 @@ if (ITK_USE_GPU) + write_gpu_kernels("${ITKGPUCommon_Kernels}" ITKGPUCommon_SRCS) + + itk_module_add_library(ITKGPUCommon ${ITKGPUCommon_SRCS}) +- target_link_libraries(ITKGPUCommon LINK_PUBLIC ${OPENCL_LIBRARIES}) ++ target_link_libraries(ITKGPUCommon LINK_PUBLIC ${OpenCL_LIBRARIES}) + endif() +diff --git a/Modules/Core/GPUFiniteDifference/CMakeLists.txt b/Modules/Core/GPUFiniteDifference/CMakeLists.txt +index c1bfde450..a642d9230 100644 +--- a/Modules/Core/GPUFiniteDifference/CMakeLists.txt ++++ b/Modules/Core/GPUFiniteDifference/CMakeLists.txt +@@ -9,8 +9,8 @@ if(NOT ITK_SOURCE_DIR) + endif() + + if (ITK_USE_GPU) +- set(ITKGPUFiniteDifference_SYSTEM_INCLUDE_DIRS ${OPENCL_INCLUDE_DIRS}) +- set(ITKGPUFiniteDifference_SYSTEM_LIBRARY_DIRS ${OPENCL_LIBRARIES}) ++ set(ITKGPUFiniteDifference_SYSTEM_INCLUDE_DIRS ${OpenCL_INCLUDE_DIRS}) ++ set(ITKGPUFiniteDifference_SYSTEM_LIBRARY_DIRS ${OpenCL_LIBRARIES}) + set(ITKGPUFiniteDifference_LIBRARIES ITKGPUFiniteDifference) + endif() + +diff --git a/Modules/Core/GPUFiniteDifference/src/CMakeLists.txt b/Modules/Core/GPUFiniteDifference/src/CMakeLists.txt +index 8425cc025..8335c69a0 100644 +--- a/Modules/Core/GPUFiniteDifference/src/CMakeLists.txt ++++ b/Modules/Core/GPUFiniteDifference/src/CMakeLists.txt +@@ -9,5 +9,5 @@ if (ITK_USE_GPU) + write_gpu_kernels("${ITKGPUFiniteDifference_Kernels}" ITKGPUFiniteDifference_SRCS) + + itk_module_add_library(ITKGPUFiniteDifference ${ITKGPUFiniteDifference_SRCS}) +- target_link_libraries(ITKGPUFiniteDifference LINK_PUBLIC ${OPENCL_LIBRARIES}) ++ target_link_libraries(ITKGPUFiniteDifference LINK_PUBLIC ${OpenCL_LIBRARIES}) + endif() +diff --git a/Modules/Filtering/GPUAnisotropicSmoothing/CMakeLists.txt b/Modules/Filtering/GPUAnisotropicSmoothing/CMakeLists.txt +index f36fd887d..310d983fa 100644 +--- a/Modules/Filtering/GPUAnisotropicSmoothing/CMakeLists.txt ++++ b/Modules/Filtering/GPUAnisotropicSmoothing/CMakeLists.txt +@@ -10,8 +10,8 @@ endif() + + if (ITK_USE_GPU) + set(ITKGPUAnisotropicSmoothing_LIBRARIES ITKGPUAnisotropicSmoothing) +- set(ITKGPUAnisotropicSmoothing_SYSTEM_INCLUDE_DIRS ${OPENCL_INCLUDE_DIRS}) +- set(ITKGPUAnisotropicSmoothing_SYSTEM_LIBRARY_DIRS ${OPENCL_LIBRARIES}) ++ set(ITKGPUAnisotropicSmoothing_SYSTEM_INCLUDE_DIRS ${OpenCL_INCLUDE_DIRS}) ++ set(ITKGPUAnisotropicSmoothing_SYSTEM_LIBRARY_DIRS ${OpenCL_LIBRARIES}) + endif() + + if(NOT ITK_SOURCE_DIR) +diff --git a/Modules/Filtering/GPUImageFilterBase/CMakeLists.txt b/Modules/Filtering/GPUImageFilterBase/CMakeLists.txt +index 078905521..67fd7b832 100644 +--- a/Modules/Filtering/GPUImageFilterBase/CMakeLists.txt ++++ b/Modules/Filtering/GPUImageFilterBase/CMakeLists.txt +@@ -10,8 +10,8 @@ endif() + + if (ITK_USE_GPU) + set(ITKGPUImageFilterBase_LIBRARIES ITKGPUImageFilterBase) +- set(ITKGPUImageFilterBase_SYSTEM_INCLUDE_DIRS ${OPENCL_INCLUDE_DIRS}) +- set(ITKGPUImageFilterBase_SYSTEM_LIBRARY_DIRS ${OPENCL_LIBRARIES}) ++ set(ITKGPUImageFilterBase_SYSTEM_INCLUDE_DIRS ${OpenCL_INCLUDE_DIRS}) ++ set(ITKGPUImageFilterBase_SYSTEM_LIBRARY_DIRS ${OpenCL_LIBRARIES}) + endif() + + if(NOT ITK_SOURCE_DIR) +diff --git a/Modules/Filtering/GPUImageFilterBase/src/CMakeLists.txt b/Modules/Filtering/GPUImageFilterBase/src/CMakeLists.txt +index 251493f5e..6d33fa964 100644 +--- a/Modules/Filtering/GPUImageFilterBase/src/CMakeLists.txt ++++ b/Modules/Filtering/GPUImageFilterBase/src/CMakeLists.txt +@@ -10,5 +10,5 @@ if (ITK_USE_GPU) + write_gpu_kernels("${ITKGPUImageFilterBase_Kernels}" ITKGPUImageFilterBase_SRCS) + + itk_module_add_library(ITKGPUImageFilterBase ${ITKGPUImageFilterBase_SRCS}) +- target_link_libraries(ITKGPUImageFilterBase LINK_PUBLIC ${OPENCL_LIBRARIES}) ++ target_link_libraries(ITKGPUImageFilterBase LINK_PUBLIC ${OpenCL_LIBRARIES}) + endif() +diff --git a/Modules/Filtering/GPUSmoothing/CMakeLists.txt b/Modules/Filtering/GPUSmoothing/CMakeLists.txt +index 9bac40921..2ed493d40 100644 +--- a/Modules/Filtering/GPUSmoothing/CMakeLists.txt ++++ b/Modules/Filtering/GPUSmoothing/CMakeLists.txt +@@ -10,8 +10,8 @@ endif() + + if (ITK_USE_GPU) + set(ITKGPUSmoothing_LIBRARIES ITKGPUSmoothing) +- set(ITKGPUSmoothing_SYSTEM_INCLUDE_DIRS ${OPENCL_INCLUDE_DIRS}) +- set(ITKGPUSmoothing_SYSTEM_LIBRARY_DIRS ${OPENCL_LIBRARIES}) ++ set(ITKGPUSmoothing_SYSTEM_INCLUDE_DIRS ${OpenCL_INCLUDE_DIRS}) ++ set(ITKGPUSmoothing_SYSTEM_LIBRARY_DIRS ${OpenCL_LIBRARIES}) + endif() + + if(NOT ITK_SOURCE_DIR) +diff --git a/Modules/Filtering/GPUSmoothing/src/CMakeLists.txt b/Modules/Filtering/GPUSmoothing/src/CMakeLists.txt +index d2120e842..2c6ca4a4a 100644 +--- a/Modules/Filtering/GPUSmoothing/src/CMakeLists.txt ++++ b/Modules/Filtering/GPUSmoothing/src/CMakeLists.txt +@@ -9,5 +9,5 @@ if (ITK_USE_GPU) + write_gpu_kernels("${ITKGPUSmoothing_Kernels}" ITKGPUSmoothing_SRCS) + + itk_module_add_library(ITKGPUSmoothing ${ITKGPUSmoothing_SRCS}) +- target_link_libraries(ITKGPUSmoothing LINK_PUBLIC ${OPENCL_LIBRARIES}) ++ target_link_libraries(ITKGPUSmoothing LINK_PUBLIC ${OpenCL_LIBRARIES}) + endif() +diff --git a/Modules/Filtering/GPUThresholding/CMakeLists.txt b/Modules/Filtering/GPUThresholding/CMakeLists.txt +index 4390785f5..61786b7a8 100644 +--- a/Modules/Filtering/GPUThresholding/CMakeLists.txt ++++ b/Modules/Filtering/GPUThresholding/CMakeLists.txt +@@ -2,8 +2,8 @@ project(ITKGPUThresholding) + + if (ITK_USE_GPU) + set(ITKGPUThresholding_LIBRARIES ITKGPUThresholding) +- set(ITKGPUThresholding_SYSTEM_INCLUDE_DIRS ${OPENCL_INCLUDE_DIRS}) +- set(ITKGPUThresholding_SYSTEM_LIBRARY_DIRS ${OPENCL_LIBRARIES}) ++ set(ITKGPUThresholding_SYSTEM_INCLUDE_DIRS ${OpenCL_INCLUDE_DIRS}) ++ set(ITKGPUThresholding_SYSTEM_LIBRARY_DIRS ${OpenCL_LIBRARIES}) + endif() + + itk_module_impl() +diff --git a/Modules/Filtering/GPUThresholding/src/CMakeLists.txt b/Modules/Filtering/GPUThresholding/src/CMakeLists.txt +index 326c86859..c07c80414 100644 +--- a/Modules/Filtering/GPUThresholding/src/CMakeLists.txt ++++ b/Modules/Filtering/GPUThresholding/src/CMakeLists.txt +@@ -9,5 +9,5 @@ if (ITK_USE_GPU) + write_gpu_kernels("${ITKGPUThresholding_Kernels}" ITKGPUThresholding_SRCS) + + itk_module_add_library(ITKGPUThresholding ${ITKGPUThresholding_SRCS}) +- target_link_libraries(ITKGPUThresholding LINK_PUBLIC ${OPENCL_LIBRARIES}) ++ target_link_libraries(ITKGPUThresholding LINK_PUBLIC ${OpenCL_LIBRARIES}) + endif() +diff --git a/Modules/Registration/GPUPDEDeformable/CMakeLists.txt b/Modules/Registration/GPUPDEDeformable/CMakeLists.txt +index c8d70a423..097c974c5 100644 +--- a/Modules/Registration/GPUPDEDeformable/CMakeLists.txt ++++ b/Modules/Registration/GPUPDEDeformable/CMakeLists.txt +@@ -2,8 +2,8 @@ project(ITKGPUPDEDeformableRegistration) + + if (ITK_USE_GPU) + set(ITKGPUPDEDeformableRegistration_LIBRARIES ITKGPUPDEDeformableRegistration) +- set(ITKGPUPDEDeformableRegistration_SYSTEM_INCLUDE_DIRS ${OPENCL_INCLUDE_DIRS}) +- set(ITKGPUPDEDeformableRegistration_SYSTEM_LIBRARY_DIRS ${OPENCL_LIBRARIES}) ++ set(ITKGPUPDEDeformableRegistration_SYSTEM_INCLUDE_DIRS ${OpenCL_INCLUDE_DIRS}) ++ set(ITKGPUPDEDeformableRegistration_SYSTEM_LIBRARY_DIRS ${OpenCL_LIBRARIES}) + endif() + + itk_module_impl() +diff --git a/Modules/Registration/GPUPDEDeformable/src/CMakeLists.txt b/Modules/Registration/GPUPDEDeformable/src/CMakeLists.txt +index 28b1d194c..1a049bdde 100644 +--- a/Modules/Registration/GPUPDEDeformable/src/CMakeLists.txt ++++ b/Modules/Registration/GPUPDEDeformable/src/CMakeLists.txt +@@ -10,5 +10,5 @@ if (ITK_USE_GPU) + write_gpu_kernels("${ITKGPUPDEDeformableRegistration_Kernels}" ITKGPUPDEDeformableRegistration_SRCS) + + itk_module_add_library(ITKGPUPDEDeformableRegistration ${ITKGPUPDEDeformableRegistration_SRCS}) +- target_link_libraries(ITKGPUPDEDeformableRegistration LINK_PUBLIC ${OPENCL_LIBRARIES}) ++ target_link_libraries(ITKGPUPDEDeformableRegistration LINK_PUBLIC ${OpenCL_LIBRARIES}) + endif() diff --git a/externals/vcpkg/ports/itk/openjpeg.patch b/externals/vcpkg/ports/itk/openjpeg.patch new file mode 100755 index 000000000..0fe1f34c9 --- /dev/null +++ b/externals/vcpkg/ports/itk/openjpeg.patch @@ -0,0 +1,548 @@ +diff --git a/Modules/IO/JPEG2000/src/itkJPEG2000ImageIO.cxx b/Modules/IO/JPEG2000/src/itkJPEG2000ImageIO.cxx +index 1b1fe9526..0da4aa0c4 100644 +--- a/Modules/IO/JPEG2000/src/itkJPEG2000ImageIO.cxx ++++ b/Modules/IO/JPEG2000/src/itkJPEG2000ImageIO.cxx +@@ -26,9 +26,9 @@ + + extern "C" + { +-#include "openjpeg.h" +-#include "j2k.h" +-#include "jp2.h" ++#include ++//#include "j2k.h" ++//##include "jp2.h" + } + + +@@ -62,8 +62,7 @@ public: + OPJ_UINT32 m_TileStartX; + OPJ_UINT32 m_TileStartY; + +- OPJ_UINT32 m_NumberOfTilesInX; +- OPJ_UINT32 m_NumberOfTilesInY; ++ OPJ_UINT32 m_NumberOfTiles; + + opj_dparameters_t m_DecompressionParameters; /* decompression parameters */ + }; +@@ -86,8 +85,7 @@ JPEG2000ImageIO::JPEG2000ImageIO() + this->m_Internal->m_TileStartX = 0; + this->m_Internal->m_TileStartY = 0; + +- this->m_Internal->m_NumberOfTilesInX = 0; +- this->m_Internal->m_NumberOfTilesInY = 0; ++ this->m_Internal->m_NumberOfTiles = 0; + + const char * extensions[] = { ".j2k", ".jp2", ".jpt" }; + +@@ -139,22 +137,16 @@ JPEG2000ImageIO::ReadImageInformation() + { + itkDebugMacro(<< "ReadImageInformation()"); + +- FILE * l_file = fopen(this->m_FileName.c_str(), "rb"); +- +- /* decompression parameters */ ++ /* set decoding parameters to default values */ ++ opj_set_default_decoder_parameters(&(this->m_Internal->m_DecompressionParameters)); + +- if (!l_file) ++ opj_stream_t * cio = opj_stream_create_default_file_stream(this->m_FileName.c_str(), true); ++ if (!cio) + { + itkExceptionMacro("JPEG2000ImageIO failed to open file for reading: " << this->GetFileName() << std::endl + << "Reason: " + << itksys::SystemTools::GetLastSystemError()); + } +- +- /* set decoding parameters to default values */ +- opj_set_default_decoder_parameters(&(this->m_Internal->m_DecompressionParameters)); +- +- opj_stream_t * cio = opj_stream_create_default_file_stream(l_file, true); +- + this->m_Internal->m_Dinfo = nullptr; /* handle to a decompressor */ + + opj_image_t * l_image = nullptr; +@@ -187,14 +179,14 @@ JPEG2000ImageIO::ReadImageInformation() + /* JPEG-2000 codestream */ + + /* get a decoder handle */ +- this->m_Internal->m_Dinfo = opj_create_decompress(CODEC_J2K); ++ this->m_Internal->m_Dinfo = opj_create_decompress(OPJ_CODEC_J2K); + if (!this->m_Internal->m_Dinfo) + { + opj_stream_destroy(cio); +- fclose(l_file); ++ // fclose(l_file); + itkExceptionMacro("JPEG2000ImageIO failed to read file: " + << this->GetFileName() << std::endl +- << "Reason: opj_create_decompress(CODEC_J2K) returns nullptr"); ++ << "Reason: opj_create_decompress(OPJ_CODEC_J2K) returns nullptr"); + } + break; + } +@@ -202,14 +194,14 @@ JPEG2000ImageIO::ReadImageInformation() + { + /* JPEG 2000 compressed image data */ + /* get a decoder handle */ +- this->m_Internal->m_Dinfo = opj_create_decompress(CODEC_JP2); ++ this->m_Internal->m_Dinfo = opj_create_decompress(OPJ_CODEC_JP2); + if (!this->m_Internal->m_Dinfo) + { + opj_stream_destroy(cio); +- fclose(l_file); ++ // fclose(l_file); + itkExceptionMacro("JPEG2000ImageIO failed to read file: " + << this->GetFileName() << std::endl +- << "Reason: opj_create_decompress(CODEC_JP2) returns nullptr"); ++ << "Reason: opj_create_decompress(OPJ_CODEC_JP2) returns nullptr"); + } + break; + } +@@ -217,20 +209,19 @@ JPEG2000ImageIO::ReadImageInformation() + { + /* JPEG 2000, JPIP */ + /* get a decoder handle */ +- this->m_Internal->m_Dinfo = opj_create_decompress(CODEC_JPT); ++ this->m_Internal->m_Dinfo = opj_create_decompress(OPJ_CODEC_JPT); + if (!this->m_Internal->m_Dinfo) + { + opj_stream_destroy(cio); +- fclose(l_file); ++ // fclose(l_file); + itkExceptionMacro("JPEG2000ImageIO failed to read file: " + << this->GetFileName() << std::endl +- << "Reason: opj_create_decompress(CODEC_JPT) returns nullptr"); ++ << "Reason: opj_create_decompress(OPJ_CODEC_JPT) returns nullptr"); + } + break; + } + default: + opj_stream_destroy(cio); +- fclose(l_file); + itkExceptionMacro("JPEG2000ImageIO failed to read file: " + << this->GetFileName() << std::endl + << "Reason: " +@@ -247,27 +238,11 @@ JPEG2000ImageIO::ReadImageInformation() + << "Reason: opj_setup_decoder returns false"); + } + +- // Image parameters - first tile +- OPJ_INT32 l_tile_x0; +- OPJ_INT32 l_tile_y0; + +- // Image parameters - tile width, height and number of tiles +- OPJ_UINT32 l_tile_width; +- OPJ_UINT32 l_tile_height; +- OPJ_UINT32 l_nb_tiles_x; +- OPJ_UINT32 l_nb_tiles_y; + + itkDebugMacro(<< "Trying to read header now..."); + +- bResult = opj_read_header(this->m_Internal->m_Dinfo, +- &l_image, +- &l_tile_x0, +- &l_tile_y0, +- &l_tile_width, +- &l_tile_height, +- &l_nb_tiles_x, +- &l_nb_tiles_y, +- cio); ++ bResult = opj_read_header(cio, this->m_Internal->m_Dinfo, &l_image); + + if (!bResult) + { +@@ -283,14 +258,22 @@ JPEG2000ImageIO::ReadImageInformation() + << "Reason: Error whle reading image header"); + } + ++ // Image parameters - first tile ++ OPJ_INT32 l_tile_x0=l_image->x0; ++ OPJ_INT32 l_tile_y0=l_image->y0; ++ ++ // Image parameters - tile width, height and number of tiles ++ OPJ_UINT32 l_tile_width=l_image->x1; ++ OPJ_UINT32 l_tile_height=l_image->y1; ++ OPJ_UINT32 l_nb_tiles=l_image->numcomps; ++ + this->m_Internal->m_TileStartX = l_tile_x0; + this->m_Internal->m_TileStartY = l_tile_y0; + + this->m_Internal->m_TileWidth = l_tile_width; + this->m_Internal->m_TileHeight = l_tile_height; + +- this->m_Internal->m_NumberOfTilesInX = l_nb_tiles_x; +- this->m_Internal->m_NumberOfTilesInY = l_nb_tiles_y; ++ this->m_Internal->m_NumberOfTiles = l_nb_tiles; + + + itkDebugMacro(<< "Number of Components = " << l_image->numcomps); +@@ -319,7 +302,7 @@ JPEG2000ImageIO::ReadImageInformation() + this->SetPixelType(IOPixelEnum::SCALAR); + break; + case 3: +- if (l_image->color_space != CLRSPC_SRGB) ++ if (l_image->color_space != OPJ_CLRSPC_SRGB) + { + itkWarningMacro(<< "file does not specify color space, assuming sRGB"); + } +@@ -335,8 +318,7 @@ JPEG2000ImageIO::ReadImageInformation() + itkDebugMacro(<< "Tile Start Y = " << this->m_Internal->m_TileStartY); + itkDebugMacro(<< "Tile Width = " << this->m_Internal->m_TileWidth); + itkDebugMacro(<< "Tile Height = " << this->m_Internal->m_TileHeight); +- itkDebugMacro(<< "Number of Tiles X = " << this->m_Internal->m_NumberOfTilesInX); +- itkDebugMacro(<< "Number of Tiles Y = " << this->m_Internal->m_NumberOfTilesInY); ++ itkDebugMacro(<< "Number of Tiles = " << this->m_Internal->m_NumberOfTiles); + + itkDebugMacro(<< "image->x1 = " << l_image->x1); + itkDebugMacro(<< "image->y1 = " << l_image->y1); +@@ -349,7 +331,6 @@ JPEG2000ImageIO::ReadImageInformation() + + /* close the byte stream */ + opj_stream_destroy(cio); +- fclose(l_file); + + if (this->m_Internal->m_Dinfo) + { +@@ -368,16 +349,7 @@ JPEG2000ImageIO::Read(void * buffer) + { + itkDebugMacro(<< "JPEG2000ImageIO::Read() Begin"); + +- FILE * l_file = fopen(this->m_FileName.c_str(), "rb"); +- +- if (!l_file) +- { +- itkExceptionMacro("JPEG2000ImageIO failed to open file for reading: " << this->GetFileName() << std::endl +- << "Reason: " +- << itksys::SystemTools::GetLastSystemError()); +- } +- +- opj_stream_t * l_stream = opj_stream_create_default_file_stream(l_file, true); ++ opj_stream_t * l_stream = opj_stream_create_default_file_stream(this->m_FileName.c_str(), true); + if (!l_stream) + { + itkExceptionMacro("JPEG2000ImageIO failed to read file: " +@@ -397,12 +369,13 @@ JPEG2000ImageIO::Read(void * buffer) + { + /* JPEG-2000 codestream */ + /* get a decoder handle */ +- this->m_Internal->m_Dinfo = opj_create_decompress(CODEC_J2K); ++ this->m_Internal->m_Dinfo = opj_create_decompress(OPJ_CODEC_J2K); + if (!this->m_Internal->m_Dinfo) + { ++ opj_stream_destroy(l_stream); + itkExceptionMacro("JPEG2000ImageIO failed to read file: " + << this->GetFileName() << std::endl +- << "Reason: opj_create_decompress(CODEC_J2K) returns nullptr"); ++ << "Reason: opj_create_decompress(OPJ_CODEC_J2K) returns nullptr"); + } + break; + } +@@ -410,12 +383,13 @@ JPEG2000ImageIO::Read(void * buffer) + { + /* JPEG 2000 compressed image data */ + /* get a decoder handle */ +- this->m_Internal->m_Dinfo = opj_create_decompress(CODEC_JP2); ++ this->m_Internal->m_Dinfo = opj_create_decompress(OPJ_CODEC_JP2); + if (!this->m_Internal->m_Dinfo) + { ++ opj_stream_destroy(l_stream); + itkExceptionMacro("JPEG2000ImageIO failed to read file: " + << this->GetFileName() << std::endl +- << "Reason: opj_create_decompress(CODEC_JP2) returns nullptr"); ++ << "Reason: opj_create_decompress(OPJ_CODEC_JP2) returns nullptr"); + } + break; + } +@@ -423,17 +397,18 @@ JPEG2000ImageIO::Read(void * buffer) + { + /* JPEG 2000, JPIP */ + /* get a decoder handle */ +- this->m_Internal->m_Dinfo = opj_create_decompress(CODEC_JPT); ++ this->m_Internal->m_Dinfo = opj_create_decompress(OPJ_CODEC_JPT); + if (!this->m_Internal->m_Dinfo) + { ++ opj_stream_destroy(l_stream); + itkExceptionMacro("JPEG2000ImageIO failed to read file: " + << this->GetFileName() << std::endl +- << "Reason: opj_create_decompress(CODEC_JPT) returns nullptr"); ++ << "Reason: opj_create_decompress(OPJ_CODEC_JPT) returns nullptr"); + } + break; + } + default: +- fclose(l_file); ++ opj_stream_destroy(l_stream); + itkExceptionMacro("JPEG2000ImageIO failed to read file: " + << this->GetFileName() << std::endl + << "Reason: " +@@ -448,29 +423,13 @@ JPEG2000ImageIO::Read(void * buffer) + << "Reason: opj_setup_decoder returns false"); + } + +- OPJ_INT32 l_tile_x0, l_tile_y0; +- +- OPJ_UINT32 l_tile_width; +- OPJ_UINT32 l_tile_height; +- OPJ_UINT32 l_nb_tiles_x; +- OPJ_UINT32 l_nb_tiles_y; +- +- bool bResult = opj_read_header(this->m_Internal->m_Dinfo, +- &l_image, +- &l_tile_x0, +- &l_tile_y0, +- &l_tile_width, +- &l_tile_height, +- &l_nb_tiles_x, +- &l_nb_tiles_y, +- l_stream); ++ bool bResult = opj_read_header(l_stream, this->m_Internal->m_Dinfo,&l_image); + + if (!bResult) + { + opj_destroy_codec(this->m_Internal->m_Dinfo); + this->m_Internal->m_Dinfo = nullptr; + opj_stream_destroy(l_stream); +- fclose(l_file); + itkExceptionMacro("JPEG2000ImageIO failed to read file: " << this->GetFileName() << std::endl + << "Reason: opj_read_header returns false"); + } +@@ -499,7 +458,7 @@ JPEG2000ImageIO::Read(void * buffer) + itkDebugMacro(<< "p_end_x = " << p_end_x); + itkDebugMacro(<< "p_end_y = " << p_end_y); + +- bResult = opj_set_decode_area(this->m_Internal->m_Dinfo, p_start_x, p_start_y, p_end_x, p_end_y); ++ bResult = opj_set_decode_area(this->m_Internal->m_Dinfo, l_image, p_start_x, p_start_y, p_end_x, p_end_y); + + itkDebugMacro(<< "opj_set_decode_area() after"); + +@@ -508,7 +467,6 @@ JPEG2000ImageIO::Read(void * buffer) + opj_destroy_codec(this->m_Internal->m_Dinfo); + this->m_Internal->m_Dinfo = nullptr; + opj_stream_destroy(l_stream); +- fclose(l_file); + itkExceptionMacro("JPEG2000ImageIO failed to read file: " << this->GetFileName() << std::endl + << "Reason: opj_set_decode_area returns false"); + } +@@ -525,13 +483,13 @@ JPEG2000ImageIO::Read(void * buffer) + + OPJ_UINT32 l_max_data_size = 1000; + +- bool l_go_on = true; ++ int l_go_on = true; // should be OBJ_BOOL + + auto * l_data = (OPJ_BYTE *)malloc(1000); + + while (l_go_on) + { +- bool tileHeaderRead = opj_read_tile_header(this->m_Internal->m_Dinfo, ++ bool tileHeaderRead = opj_read_tile_header(this->m_Internal->m_Dinfo, l_stream, + &l_tile_index, + &l_data_size, + &l_current_tile_x0, +@@ -539,14 +497,12 @@ JPEG2000ImageIO::Read(void * buffer) + &l_current_tile_x1, + &l_current_tile_y1, + &l_nb_comps, +- &l_go_on, +- l_stream); ++ &l_go_on); + + if (!tileHeaderRead) + { + free(l_data); + opj_stream_destroy(l_stream); +- fclose(l_file); + opj_destroy_codec(this->m_Internal->m_Dinfo); + opj_image_destroy(l_image); + itkExceptionMacro("JPEG2000ImageIO failed to read file: " << this->GetFileName() << std::endl +@@ -571,7 +527,6 @@ JPEG2000ImageIO::Read(void * buffer) + if (!l_data) + { + opj_stream_destroy(l_stream); +- fclose(l_file); + opj_destroy_codec(this->m_Internal->m_Dinfo); + opj_image_destroy(l_image); + itkExceptionMacro("JPEG2000ImageIO failed to read file: " << this->GetFileName() << std::endl +@@ -590,7 +545,6 @@ JPEG2000ImageIO::Read(void * buffer) + { + free(l_data); + opj_stream_destroy(l_stream); +- fclose(l_file); + opj_destroy_codec(this->m_Internal->m_Dinfo); + opj_image_destroy(l_image); + itkExceptionMacro("JPEG2000ImageIO failed to read file: " << this->GetFileName() << std::endl +@@ -654,7 +608,6 @@ JPEG2000ImageIO::Read(void * buffer) + { + free(l_data); + opj_stream_destroy(l_stream); +- fclose(l_file); + opj_destroy_codec(this->m_Internal->m_Dinfo); + opj_image_destroy(l_image); + itkExceptionMacro("JPEG2000ImageIO failed to read file: " << this->GetFileName() << std::endl +@@ -666,14 +619,12 @@ JPEG2000ImageIO::Read(void * buffer) + opj_destroy_codec(this->m_Internal->m_Dinfo); + this->m_Internal->m_Dinfo = nullptr; + opj_stream_destroy(l_stream); +- fclose(l_file); + itkExceptionMacro("JPEG2000ImageIO failed to read file: " << this->GetFileName() << std::endl + << "Reason: error whle reading image"); + } + + /* close the byte stream */ + opj_stream_destroy(l_stream); +- fclose(l_file); + + if (this->m_Internal->m_Dinfo) + { +@@ -840,13 +791,13 @@ JPEG2000ImageIO ::Write(const void * buffer) + + parameters.numresolution = numberOfResolutions; + +- OPJ_COLOR_SPACE color_space = CLRSPC_GRAY; ++ OPJ_COLOR_SPACE color_space = OPJ_CLRSPC_GRAY; + opj_image_cmptparm_t cmptparms[3]; + + if (this->GetNumberOfComponents() == 3) + { + +- color_space = (this->GetPixelType() == IOPixelEnum::RGB) ? CLRSPC_SRGB : CLRSPC_UNSPECIFIED; ++ color_space = (this->GetPixelType() == IOPixelEnum::RGB) ? OPJ_CLRSPC_SRGB : OPJ_CLRSPC_UNSPECIFIED; + + /* initialize image components */ + memset(&cmptparms[0], 0, 3 * sizeof(opj_image_cmptparm_t)); +@@ -864,7 +815,7 @@ JPEG2000ImageIO ::Write(const void * buffer) + + if (this->GetNumberOfComponents() == 1) + { +- color_space = CLRSPC_GRAY; ++ color_space = OPJ_CLRSPC_GRAY; + + /* initialize image components */ + memset(&cmptparms[0], 0, sizeof(opj_image_cmptparm_t)); +@@ -940,32 +891,32 @@ JPEG2000ImageIO ::Write(const void * buffer) + opj_codec_t * cinfo = nullptr; + if (extension == ".j2k") + { +- cinfo = opj_create_compress(CODEC_J2K); ++ cinfo = opj_create_compress(OPJ_CODEC_J2K); + if (!cinfo) + { + itkExceptionMacro("JPEG2000ImageIO failed to write file: " + << this->GetFileName() << std::endl +- << "Reason: opj_create_compress(CODEC_J2K) returns nullptr"); ++ << "Reason: opj_create_compress(OPJ_CODEC_J2K) returns nullptr"); + } + } + else if (extension == ".jp2") + { +- cinfo = opj_create_compress(CODEC_JP2); ++ cinfo = opj_create_compress(OPJ_CODEC_JP2); + if (!cinfo) + { + itkExceptionMacro("JPEG2000ImageIO failed to write file: " + << this->GetFileName() << std::endl +- << "Reason: opj_create_compress(CODEC_JP2) returns nullptr"); ++ << "Reason: opj_create_compress(OPJ_CODEC_JP2) returns nullptr"); + } + } + else if (extension == ".jpt") + { +- cinfo = opj_create_compress(CODEC_JPT); ++ cinfo = opj_create_compress(OPJ_CODEC_JPT); + if (!cinfo) + { + itkExceptionMacro("JPEG2000ImageIO failed to write file: " + << this->GetFileName() << std::endl +- << "Reason: opj_create_compress(CODEC_JPT) returns nullptr"); ++ << "Reason: opj_create_compress(OPJ_CODEC_JPT) returns nullptr"); + } + } + else +@@ -989,17 +940,9 @@ JPEG2000ImageIO ::Write(const void * buffer) + << "Reason: opj_setup_encoder returns false"); + } + +- FILE * l_file = fopen(parameters.outfile, "wb"); +- if (!l_file) +- { +- itkExceptionMacro("JPEG2000ImageIO failed to open file for writing: " << this->GetFileName() << std::endl +- << "Reason: " +- << itksys::SystemTools::GetLastSystemError()); +- } +- + /* open a byte stream for writing */ + /* allocate memory for all tiles */ +- opj_stream_t * cio = opj_stream_create_default_file_stream(l_file, false); ++ opj_stream_t * cio = opj_stream_create_default_file_stream(parameters.outfile, false); + if (!cio) + { + itkExceptionMacro("JPEG2000ImageIO failed to write file: " +@@ -1017,8 +960,7 @@ JPEG2000ImageIO ::Write(const void * buffer) + if (!bSuccess) + { + opj_stream_destroy(cio); +- fclose(l_file); +- itkExceptionMacro("JPEG2000ImageIO failed to write file: " << this->GetFileName() << std::endl ++ itkExceptionMacro("JPEG2000ImageIO failed to write file: " << this->GetFileName() << std::endl + << "Reason: opj_start_compress returns false"); + } + +@@ -1026,7 +968,6 @@ JPEG2000ImageIO ::Write(const void * buffer) + if (!bSuccess) + { + opj_stream_destroy(cio); +- fclose(l_file); + itkExceptionMacro("JPEG2000ImageIO failed to write file: " << this->GetFileName() << std::endl + << "Reason: opj_encode returns false"); + } +@@ -1035,14 +976,12 @@ JPEG2000ImageIO ::Write(const void * buffer) + if (!bSuccess) + { + opj_stream_destroy(cio); +- fclose(l_file); + itkExceptionMacro("JPEG2000ImageIO failed to write file: " << this->GetFileName() << std::endl + << "Reason: opj_end_compress returns false"); + } + + /* close and free the byte stream */ + opj_stream_destroy(cio); +- fclose(l_file); + + /* free remaining compression structures */ + opj_destroy_codec(cinfo); +diff --git a/Modules/ThirdParty/OpenJPEG/CMakeLists.txt b/Modules/ThirdParty/OpenJPEG/CMakeLists.txt +index 103eaa9dd..eb8989135 100644 +--- a/Modules/ThirdParty/OpenJPEG/CMakeLists.txt ++++ b/Modules/ThirdParty/OpenJPEG/CMakeLists.txt +@@ -1,12 +1,25 @@ + project(ITKOpenJPEG) + set(ITKOpenJPEG_THIRD_PARTY 1) + +-set(ITKOpenJPEG_INCLUDE_DIRS +- ${ITKOpenJPEG_BINARY_DIR}/src/openjpeg +- ${ITKOpenJPEG_SOURCE_DIR}/src/openjpeg +- ) +-set(ITKOpenJPEG_LIBRARIES itkopenjpeg) +-set(ITK_LIBRARY_PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS FALSE) ++if(ITK_USE_SYSTEM_OpenJPEG) ++ find_package(OpenJPEG REQUIRED) ++ if(TARGET openjp2) ++ set(ITKOpenJPEG_LIBRARIES ${OPENJPEG_LIBRARIES}) ++ else() ++ message(FATAL_ERROR "OpenJPEG target openjp2 missing!") ++ endif() ++ set(ITKOpenJPEG_INCLUDE_DIRS ++ ${ITKOpenJPEG_BINARY_DIR}/src/openjpeg ++ ${ITKOpenJPEG_SOURCE_DIR}/src/openjpeg ++ ) ++else() ++ set(ITKOpenJPEG_INCLUDE_DIRS ++ ${ITKOpenJPEG_BINARY_DIR}/src/openjpeg ++ ${ITKOpenJPEG_SOURCE_DIR}/src/openjpeg ++ ) ++ set(ITKOpenJPEG_LIBRARIES itkopenjpeg) ++ set(ITK_LIBRARY_PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS FALSE) ++endif() + + itk_module_impl() + diff --git a/externals/vcpkg/ports/itk/openjpeg2.patch b/externals/vcpkg/ports/itk/openjpeg2.patch new file mode 100755 index 000000000..86631f5f9 --- /dev/null +++ b/externals/vcpkg/ports/itk/openjpeg2.patch @@ -0,0 +1,58 @@ +diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt +index 565cc338b..c061f0721 100644 +--- a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt ++++ b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt +@@ -194,7 +194,7 @@ mark_as_advanced(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH) + # configure name mangling to allow multiple libraries to coexist + # peacefully + if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in) +-set(MANGLE_PREFIX ${OPENJPEG_LIBRARY_NAME}) ++set(MANGLE_PREFIX) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in + ${CMAKE_CURRENT_BINARY_DIR}/openjpeg_mangle.h + @ONLY) +diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/src/lib/openjp2/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/src/lib/openjp2/CMakeLists.txt +index c4adb91a2..89b731d88 100644 +--- a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/src/lib/openjp2/CMakeLists.txt ++++ b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/src/lib/openjp2/CMakeLists.txt +@@ -3,7 +3,7 @@ include_regular_expression("^.*$") + # configure name mangling to allow multiple libraries to coexist + # peacefully + if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in) +-set(MANGLE_PREFIX ${OPENJPEG_LIBRARY_NAME}) ++set(MANGLE_PREFIX) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in + ${CMAKE_CURRENT_BINARY_DIR}/openjpeg_mangle.h + @ONLY) +diff --git a/Modules/ThirdParty/OpenJPEG/CMakeLists.txt b/Modules/ThirdParty/OpenJPEG/CMakeLists.txt +index 3811e52f4..a41e9264e 100644 +--- a/Modules/ThirdParty/OpenJPEG/CMakeLists.txt ++++ b/Modules/ThirdParty/OpenJPEG/CMakeLists.txt +@@ -8,10 +8,10 @@ if(ITK_USE_SYSTEM_OpenJPEG) + else() + message(FATAL_ERROR "OpenJPEG target openjp2 missing!") + endif() +- set(ITKOpenJPEG_INCLUDE_DIRS +- ${ITKOpenJPEG_BINARY_DIR}/src/openjpeg +- ${ITKOpenJPEG_SOURCE_DIR}/src/openjpeg +- ) ++ # set(ITKOpenJPEG_INCLUDE_DIRS ++ # ${ITKOpenJPEG_BINARY_DIR}/src/openjpeg ++ # ${ITKOpenJPEG_SOURCE_DIR}/src/openjpeg ++ # ) + else() + set(ITKOpenJPEG_INCLUDE_DIRS + ${ITKOpenJPEG_BINARY_DIR}/src/openjpeg +diff --git a/Modules/ThirdParty/OpenJPEG/src/openjpeg/CMakeLists.txt b/Modules/ThirdParty/OpenJPEG/src/openjpeg/CMakeLists.txt +index e62e43eda..35dc89976 100644 +--- a/Modules/ThirdParty/OpenJPEG/src/openjpeg/CMakeLists.txt ++++ b/Modules/ThirdParty/OpenJPEG/src/openjpeg/CMakeLists.txt +@@ -68,7 +68,7 @@ CONFIGURE_FILE(${ITK3P_OpenJPEG_SOURCE_DIR}/opj_configure.h.in + # configure name mangling to allow multiple libraries to coexist + # peacefully + if(EXISTS ${ITK3P_OpenJPEG_SOURCE_DIR}/openjpeg_mangle.h.in) +-set(MANGLE_PREFIX itk) ++#set(MANGLE_PREFIX itk) + configure_file(${ITK3P_OpenJPEG_SOURCE_DIR}/openjpeg_mangle.h.in + ${ITK3P_OpenJPEG_BINARY_DIR}/openjpeg_mangle.h + @ONLY) diff --git a/externals/vcpkg/ports/itk/portfile.cmake b/externals/vcpkg/ports/itk/portfile.cmake new file mode 100755 index 000000000..b36ce928a --- /dev/null +++ b/externals/vcpkg/ports/itk/portfile.cmake @@ -0,0 +1,206 @@ +vcpkg_buildpath_length_warning(37) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO InsightSoftwareConsortium/ITK + REF 95800fd4d4b08678a6c0ebb63eb242893025b660 #5.2.1 + SHA512 fe703bc6ed681cb9983d7d6e21c8ffa7650337e470c09a7241de58a463c23e315516b1a81a18c14f682706056a0ec66932b63d2e24945bdcea03169bc1122bb2 + HEAD_REF master + PATCHES + double-conversion.patch + openjpeg.patch + openjpeg2.patch + var_libraries.patch + wrapping.patch + opencl.patch + use-the-lrintf-intrinsic.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "vtk" Module_ITKVtkGlue + "cuda" Module_ITKCudaCommon # Requires RTK? + #"cuda" CUDA_HAVE_GPU # Automatically set by FindCUDA? + "cufftw" ITK_USE_CUFFTW + "opencl" ITK_USE_GPU + "tbb" Module_ITKTBB + "rtk" Module_RTK + "tools" RTK_BUILD_APPLICATIONS + "opencv" Module_ITKVideoBridgeOpenCV + # There are a lot of more (remote) modules and options in ITK + # feel free to add those as a feature +) + +if("cufftw" IN_LIST FEATURES) + # Alternativly set CUFFT_LIB and CUFFTW_LIB + if(WIN32) + file(TO_CMAKE_PATH "$ENV{CUDA_PATH}" CUDA_PATH) + set(CUDA_LIB_PATH "${CUDA_PATH}") + + if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) + string(APPEND CUDA_LIB_PATH "/lib/x64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) + string(APPEND CUDA_LIB_PATH "/lib/Win32") + message(FATAL_ERROR "CUFFTW is not supported on architecture ${VCPKG_TARGET_ARCHITECTURE}") + else() + message(FATAL_ERROR "Architecture ${VCPKG_TARGET_ARCHITECTURE} not supported !") + endif() + + list(APPEND ADDITIONAL_OPTIONS + "-DFFTW_LIB_SEARCHPATH=${CUDA_LIB_PATH}" + "-DFFTW_INCLUDE_PATH=${CUDA_PATH}/include" + "-DCUFFTW_INCLUDE_PATH=${CUDA_PATH}/include" + ) + endif() +endif() + +if("rtk" IN_LIST FEATURES) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) + message(FATAL_ERROR "RTK is not supported on architecture ${VCPKG_TARGET_ARCHITECTURE}") + endif() + SET(BUILD_RTK ON) + list(APPEND ADDITIONAL_OPTIONS + "-DModule_RTK_GIT_TAG=8099212f715231d093f7d6a1114daecf45d871ed" # RTK latest versions (11.05.2020) + ) + if("cuda" IN_LIST FEATURES) + list(APPEND ADDITIONAL_OPTIONS "-DRTK_USE_CUDA=ON") + #RTK + CUDA + PYTHON + dynamic library linkage will fail and needs upstream fixes. + endif() +endif() +file(REMOVE_RECURSE "${SOURCE_PATH}/Modules/Remote/RTK") + +if("opencl" IN_LIST FEATURES) + list(APPEND ADDITIONAL_OPTIONS # Wrapping options required by OpenCL if build with Python Wrappers + -DITK_WRAP_unsigned_long_long=ON + -DITK_WRAP_signed_long_long=ON + ) +endif() +if("tools" IN_LIST FEATURES) + + if("rtk" IN_LIST FEATURES) + list(APPEND TOOL_NAMES rtkadmmtotalvariation rtkadmmwavelets rtkamsterdamshroud rtkbackprojections rtkbioscangeometry rtkcheckimagequality rtkconjugategradient + rtkdigisensgeometry rtkdrawgeometricphantom rtkdrawshepploganphantom rtkdualenergysimplexdecomposition rtkelektasynergygeometry rtkextractphasesignal + rtkextractshroudsignal rtkfdk rtkfdktwodweights rtkfieldofview rtkforwardprojections rtkfourdconjugategradient rtkfourdfdk rtkfourdrooster rtkfourdsart + rtkgaincorrection rtki0estimation rtkimagxgeometry rtkiterativefdk rtklagcorrection rtklastdimensionl0gradientdenoising rtklut rtkmaskcollimation rtkmcrooster + rtkmotioncompensatedfourdconjugategradient rtkorageometry rtkosem rtkoverlayphaseandshroud rtkparkershortscanweighting rtkprojectgeometricphantom + rtkprojectionmatrix rtkprojections rtkprojectshepploganphantom rtkramp rtkrayboxintersection rtkrayquadricintersection rtkregularizedconjugategradient + rtksart rtkscatterglarecorrection rtksimulatedgeometry rtkspectraldenoiseprojections rtkspectralforwardmodel rtkspectralonestep rtkspectralrooster rtkspectralsimplexdecomposition + rtksubselect rtktotalnuclearvariationdenoising rtktotalvariationdenoising rtktutorialapplication rtkvarianobigeometry rtkvarianprobeamgeometry rtkvectorconjugategradient + rtkwangdisplaceddetectorweighting rtkwarpedbackprojectsequence rtkwarpedforwardprojectsequence rtkwaveletsdenoising rtkxradgeometry) + endif() +endif() +if("vtk" IN_LIST FEATURES) + vcpkg_find_acquire_program(PYTHON3) + list(APPEND ADDITIONAL_OPTIONS + "-DPython3_EXECUTABLE:PATH=${PYTHON3}" # Required by mvtk if vtk[python] was build + ) +endif() +if("python" IN_LIST FEATURES) + message(STATUS "${PORT} builds a long time (>1h) with python wrappers enabled!") + vcpkg_find_acquire_program(PYTHON3) + vcpkg_find_acquire_program(SWIG) # Swig is only required for wrapping! + get_filename_component(SWIG_DIR "${SWIG}" DIRECTORY) + list(APPEND ADDITIONAL_OPTIONS + -DITK_WRAP_PYTHON=ON + -DPython3_FIND_REGISTRY=NEVER + "-DPython3_EXECUTABLE:PATH=${PYTHON3}" # Required by more than one feature + "-DSWIG_EXECUTABLE=${SWIG}" + "-DSWIG_DIR=${SWIG_DIR}" + ) + #ITK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages within vcpkg +endif() +if("opencv" IN_LIST FEATURES) + message(STATUS "${PORT} includes the ITKVideoBridgeOpenCV") + list(APPEND ADDITIONAL_OPTIONS + -DModule_ITKVideoBridgeOpenCV:BOOL=ON + ) +endif() + +set(USE_64BITS_IDS OFF) +if (VCPKG_TARGET_ARCHITECTURE STREQUAL x64 OR VCPKG_TARGET_ARCHITECTURE STREQUAL arm64) + set(USE_64BITS_IDS ON) +endif() + +file(REMOVE_RECURSE "${SOURCE_PATH}/CMake/FindOpenCL.cmake") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DBUILD_TESTING=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_PKGCONFIG_FILES=OFF + -DITK_DOXYGEN_HTML=OFF + -DDO_NOT_INSTALL_ITK_TEST_DRIVER=ON + -DITK_SKIP_PATH_LENGTH_CHECKS=ON + -DITK_INSTALL_DATA_DIR=share/itk/data + -DITK_INSTALL_DOC_DIR=share/itk/doc + -DITK_INSTALL_PACKAGE_DIR=share/itk + -DITK_USE_64BITS_IDS=${USE_64BITS_IDS} + -DITK_USE_CONCEPT_CHECKING=ON + #-DITK_USE_SYSTEM_LIBRARIES=ON # enables USE_SYSTEM for all third party libraries, some of which do not have vcpkg ports such as CastXML, SWIG, MINC etc + -DITK_USE_SYSTEM_DOUBLECONVERSION=ON + -DITK_USE_SYSTEM_EXPAT=ON + -DITK_USE_SYSTEM_JPEG=ON + -DITK_USE_SYSTEM_PNG=ON + -DITK_USE_SYSTEM_TIFF=ON + -DITK_USE_SYSTEM_ZLIB=ON + -DITK_USE_SYSTEM_EIGEN=ON + -DITK_USE_SYSTEM_FFTW=ON + -DITK_USE_SYSTEM_HDF5=ON # HDF5 was problematic in the past and still is. ITK still has not figured out how to do it correctly! + -DITK_USE_SYSTEM_GDCM=ON + -DITK_USE_SYSTEM_OpenJPEG=ON # Added by VCPKG + -DITK_USE_SYSTEM_DCMTK=ON + -DDCMTK_USE_ICU=ON + -DITK_USE_SYSTEM_ICU=ON + #-DITK_USE_SYSTEM_VXL=ON + #-DITK_USE_SYSTEM_CASTXML=ON # needs to be added to vcpkg_find_acquire_program https://data.kitware.com/api/v1/file/hashsum/sha512/b8b6f0aff11fe89ab2fcd1949cc75f2c2378a7bc408827a004396deb5ff5a9976bffe8a597f8db1b74c886ea39eb905e610dce8f5bd7586a4d6c196d7349da8d/download + -DITK_USE_SYSTEM_MINC=ON + -DITK_USE_SYSTEM_SWIG=ON + -DITK_FORBID_DOWNLOADS=OFF # This should be turned on some day, however for now ITK does download specific versions so it shouldn't spontaneously break. Remote Modules would probably break with this! + -DINSTALL_GTEST=OFF + -DITK_USE_SYSTEM_GOOGLETEST=ON + -DEXECUTABLE_OUTPUT_PATH=tools/${PORT} + + # TODO + #-DVXL_USE_GEOTIFF=ON + -DVXL_USE_LFS=ON + + -DITK_MINIMUM_COMPLIANCE_LEVEL:STRING=1 # To Display all remote modules within cmake-gui + #-DModule_IOSTL=ON # example how to turn on a non-default module + #-DModule_MorphologicalContourInterpolation=ON # example how to turn on a remote module + #-DModule_RLEImage=ON # example how to turn on a remote module + + # Some additional wraping options + #-DITK_WRAP_double=ON + #-DITK_WRAP_complex_double=ON + #-DITK_WRAP_covariant_vector_double=ON + #-DITK_WRAP_vector_double=ON + + ${FEATURE_OPTIONS} + ${ADDITIONAL_OPTIONS} + + OPTIONS_DEBUG ${OPTIONS_DEBUG} + OPTIONS_RELEASE ${OPTIONS_RELEASE} +) +if(BUILD_RTK) # Remote Modules are only downloaded on configure. + # TODO: In the future try to download via vcpkg_from_github and move the files. That way patching does not need this workaround + vcpkg_apply_patches(SOURCE_PATH "${SOURCE_PATH}/Modules/Remote/RTK" QUIET PATCHES rtk/already_defined.patch rtk/unresolved.patch) +endif() +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup() + +if(TOOL_NAMES) + vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/ITK-5.3/vcl_where_root_dir.h") + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ITK-5.3/itk_eigen.h" "include(${SOURCE_PATH}/CMake/UseITK.cmake)" "include(UseITK)") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ITK-5.3/itk_eigen.h" "message(STATUS \"From ITK: Eigen3_DIR: ${CURRENT_INSTALLED_DIR}/share/eigen3\")" "") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/itk/rtk/already_defined.patch b/externals/vcpkg/ports/itk/rtk/already_defined.patch new file mode 100755 index 000000000..60b75e3eb --- /dev/null +++ b/externals/vcpkg/ports/itk/rtk/already_defined.patch @@ -0,0 +1,100 @@ +diff --git a/include/rtkProjectionGeometry.h b/include/rtkProjectionGeometry.h +index e5831611f..73ed2b74f 100644 +--- a/include/rtkProjectionGeometry.h ++++ b/include/rtkProjectionGeometry.h +@@ -23,6 +23,7 @@ + + #include + ++#include "RTKExport.h" + #include "rtkMacro.h" + + namespace rtk +@@ -67,25 +68,18 @@ public: + * with the i-th matrix provides the physical coordinate on + * the i-th projection. + */ +- const std::vector & +- GetMatrices() const +- { +- return this->m_Matrices; +- } ++ itkGetConstReferenceMacro(Matrices,std::vector) + + /** Get the i-th projection matrix. */ + MatrixType +- GetMatrix(const unsigned int i) const +- { +- return this->m_Matrices[i]; +- } ++ GetMatrix(const unsigned int i) const; + + /** Empty the geometry object. */ + virtual void + Clear(); + + protected: +- ProjectionGeometry() = default; ++ ProjectionGeometry(); + ~ProjectionGeometry() override = default; + + void +@@ -93,11 +87,7 @@ protected: + + /** Add projection matrix */ + virtual void +- AddMatrix(const MatrixType & m) +- { +- this->m_Matrices.push_back(m); +- this->Modified(); +- } ++ AddMatrix(const MatrixType & m); + + private: + /** Projection matrices */ +@@ -105,6 +95,9 @@ private: + }; + } // namespace rtk + +-#include "rtkProjectionGeometry.hxx" ++#ifndef ITK_MANUAL_INSTANTIATION ++# include "rtkProjectionGeometry.hxx" ++#endif ++ + + #endif // rtkProjectionGeometry_h +diff --git a/include/rtkProjectionGeometry.hxx b/include/rtkProjectionGeometry.hxx +index 192265812..97dfe8c3a 100644 +--- a/include/rtkProjectionGeometry.hxx ++++ b/include/rtkProjectionGeometry.hxx +@@ -23,6 +23,8 @@ + + namespace rtk + { ++template ++ProjectionGeometry::ProjectionGeometry() = default; + + template + void +@@ -43,6 +45,21 @@ ProjectionGeometry::Clear() + this->Modified(); + } + ++template ++typename ProjectionGeometry::MatrixType ++ProjectionGeometry::GetMatrix(const unsigned int i) const ++{ ++ return this->m_Matrices[i]; ++} ++ ++template ++void ++ProjectionGeometry::AddMatrix(const typename ProjectionGeometry::MatrixType & m) ++{ ++ this->m_Matrices.push_back(m); ++ this->Modified(); ++} ++ + } // namespace rtk + + #endif // rtkProjectionGeometry_hxx diff --git a/externals/vcpkg/ports/itk/rtk/unresolved.patch b/externals/vcpkg/ports/itk/rtk/unresolved.patch new file mode 100755 index 000000000..e2209ec75 --- /dev/null +++ b/externals/vcpkg/ports/itk/rtk/unresolved.patch @@ -0,0 +1,213 @@ +diff --git a/include/rtkDCMImagXImageIO.h b/include/rtkDCMImagXImageIO.h +index 2a70ae046..69abb409e 100644 +--- a/include/rtkDCMImagXImageIO.h ++++ b/include/rtkDCMImagXImageIO.h +@@ -18,7 +18,7 @@ + + #ifndef rtkDCMImagXImageIO_h + #define rtkDCMImagXImageIO_h +- ++#include "RTKExport.h" + #include + + #include "rtkMacro.h" +@@ -32,7 +32,7 @@ namespace rtk + * + * \ingroup RTK + */ +-class DCMImagXImageIO : public itk::GDCMImageIO ++class RTK_EXPORT DCMImagXImageIO : public itk::GDCMImageIO + { + public: + ITK_DISALLOW_COPY_AND_ASSIGN(DCMImagXImageIO); +diff --git a/include/rtkEdfImageIO.h b/include/rtkEdfImageIO.h +index 66499c56b..7b16fbc5a 100644 +--- a/include/rtkEdfImageIO.h ++++ b/include/rtkEdfImageIO.h +@@ -18,7 +18,7 @@ + + #ifndef rtkEdfImageIO_h + #define rtkEdfImageIO_h +- ++#include "RTKExport.h" + #include + #include + #include +@@ -36,7 +36,7 @@ namespace rtk + * + * \ingroup RTK IOFilters + */ +-class EdfImageIO : public itk::ImageIOBase ++class RTK_EXPORT EdfImageIO : public itk::ImageIOBase + { + public: + ITK_DISALLOW_COPY_AND_ASSIGN(EdfImageIO); +diff --git a/include/rtkHisImageIO.h b/include/rtkHisImageIO.h +index 2ef2005dd..95449b8a6 100644 +--- a/include/rtkHisImageIO.h ++++ b/include/rtkHisImageIO.h +@@ -19,6 +19,8 @@ + #ifndef rtkHisImageIO_h + #define rtkHisImageIO_h + ++#include "RTKExport.h" ++ + // itk include + #include + #include "rtkMacro.h" +@@ -35,7 +37,7 @@ namespace rtk + * + * \ingroup RTK IOFilters + */ +-class HisImageIO : public itk::ImageIOBase ++class RTK_EXPORT HisImageIO : public itk::ImageIOBase + { + public: + /** Standard class type alias. */ +diff --git a/include/rtkHncImageIO.h b/include/rtkHncImageIO.h +index 7b9539bde..dc9dca759 100644 +--- a/include/rtkHncImageIO.h ++++ b/include/rtkHncImageIO.h +@@ -19,9 +19,11 @@ + #ifndef rtkHncImageIO_h + #define rtkHncImageIO_h + ++#include "RTKExport.h" ++ + // itk include + #include +-#include "itksys/SystemTools.hxx" ++//#include "itksys/SystemTools.hxx" + + #if defined(_MSC_VER) && (_MSC_VER < 1600) + // SR: taken from +@@ -43,7 +45,7 @@ namespace rtk + * + * \ingroup RTK IOFilters + */ +-class HncImageIO : public itk::ImageIOBase ++class RTK_EXPORT HncImageIO : public itk::ImageIOBase + { + public: + /** Standard class type alias. */ +diff --git a/include/rtkHncImageIOFactory.h b/include/rtkHncImageIOFactory.h +index 2bca8f77e..1d5a97938 100644 +--- a/include/rtkHncImageIOFactory.h ++++ b/include/rtkHncImageIOFactory.h +@@ -38,7 +38,7 @@ namespace rtk + * + * \ingroup RTK IOFilters + */ +-class HncImageIOFactory : public itk::ObjectFactoryBase ++class RTK_EXPORT HncImageIOFactory : public itk::ObjectFactoryBase + { + public: + /** Standard class type alias. */ +diff --git a/include/rtkHndImageIO.h b/include/rtkHndImageIO.h +index 5a07897cc..5f843362a 100644 +--- a/include/rtkHndImageIO.h ++++ b/include/rtkHndImageIO.h +@@ -19,6 +19,8 @@ + #ifndef rtkHndImageIO_h + #define rtkHndImageIO_h + ++#include "RTKExport.h" ++ + // itk include + #include + +@@ -43,7 +45,7 @@ namespace rtk + * + * \ingroup RTK IOFilters + */ +-class HndImageIO : public itk::ImageIOBase ++class RTK_EXPORT HndImageIO : public itk::ImageIOBase + { + public: + /** Standard class type alias. */ +diff --git a/include/rtkImagXImageIO.h b/include/rtkImagXImageIO.h +index d69e9a790..d6cc8388e 100644 +--- a/include/rtkImagXImageIO.h ++++ b/include/rtkImagXImageIO.h +@@ -18,7 +18,7 @@ + + #ifndef rtkImagXImageIO_h + #define rtkImagXImageIO_h +- ++#include "RTKExport.h" + #include + #include + #include +@@ -34,7 +34,7 @@ namespace rtk + * + * \ingroup RTK + */ +-class ImagXImageIO : public itk::ImageIOBase ++class RTK_EXPORT ImagXImageIO : public itk::ImageIOBase + { + public: + /** Standard class type alias. */ +diff --git a/include/rtkOraImageIO.h b/include/rtkOraImageIO.h +index ece525a42..2d5332872 100644 +--- a/include/rtkOraImageIO.h ++++ b/include/rtkOraImageIO.h +@@ -19,6 +19,8 @@ + #ifndef rtkOraImageIO_h + #define rtkOraImageIO_h + ++#include "RTKExport.h" ++ + // This is done to avoid any interference with zlib + #ifdef OF + # undef OF +@@ -41,7 +43,7 @@ namespace rtk + * + * \ingroup RTK IOFilters + */ +-class OraImageIO : public itk::MetaImageIO ++class RTK_EXPORT OraImageIO : public itk::MetaImageIO + { + public: + /** Standard class type alias. */ +diff --git a/include/rtkXRadImageIO.h b/include/rtkXRadImageIO.h +index a72c934e4..0a92afa22 100644 +--- a/include/rtkXRadImageIO.h ++++ b/include/rtkXRadImageIO.h +@@ -19,6 +19,7 @@ + #ifndef rtkXRadImageIO_h + #define rtkXRadImageIO_h + ++#include "RTKExport.h" + #include + #include + #include +@@ -37,7 +38,7 @@ namespace rtk + * + * \ingroup RTK IOFilters + */ +-class XRadImageIO : public itk::ImageIOBase ++class RTK_EXPORT XRadImageIO : public itk::ImageIOBase + { + public: + /** Standard class type alias. */ +diff --git a/include/rtkXimImageIO.h b/include/rtkXimImageIO.h +index ae789dbf9..741f05183 100644 +--- a/include/rtkXimImageIO.h ++++ b/include/rtkXimImageIO.h +@@ -19,6 +19,7 @@ + #ifndef rtkXimImageIO_h + #define rtkXimImageIO_h + ++#include "RTKExport.h" + #include "rtkMacro.h" + + // itk include +@@ -43,7 +44,7 @@ namespace rtk + * + * \ingroup RTK IOFilters + */ +-class XimImageIO : public itk::ImageIOBase ++class RTK_EXPORT XimImageIO : public itk::ImageIOBase + { + public: + /** Standard class type alias. */ diff --git a/externals/vcpkg/ports/itk/use-the-lrintf-intrinsic.patch b/externals/vcpkg/ports/itk/use-the-lrintf-intrinsic.patch new file mode 100755 index 000000000..27df6cd9b --- /dev/null +++ b/externals/vcpkg/ports/itk/use-the-lrintf-intrinsic.patch @@ -0,0 +1,15 @@ +diff --git a/Modules/ThirdParty/OpenJPEG/src/openjpeg/opj_includes.h b/Modules/ThirdParty/OpenJPEG/src/openjpeg/opj_includes.h +index e75a220d4d..4b13e1726a 100644 +--- a/Modules/ThirdParty/OpenJPEG/src/openjpeg/opj_includes.h ++++ b/Modules/ThirdParty/OpenJPEG/src/openjpeg/opj_includes.h +@@ -87,8 +87,8 @@ Most compilers implement their own version of this keyword ... + #endif + #endif + +-/* MSVC and Borland C do not have lrintf */ +-#if defined(_MSC_VER) || defined(__BORLANDC__) ++/* MSVC pre 16.8 and Borland C do not have lrintf */ ++#if (defined(_MSC_VER) && _MSC_VER < 1928) || defined(__BORLANDC__) + + /* MSVC 64bits doesn't support _asm */ + #if !defined(_WIN64) diff --git a/externals/vcpkg/ports/itk/var_libraries.patch b/externals/vcpkg/ports/itk/var_libraries.patch new file mode 100755 index 000000000..738fa980f --- /dev/null +++ b/externals/vcpkg/ports/itk/var_libraries.patch @@ -0,0 +1,27 @@ +diff --git a/CMake/ITKModuleMacros.cmake b/CMake/ITKModuleMacros.cmake +index da9f3a902..60420bb0a 100644 +--- a/CMake/ITKModuleMacros.cmake ++++ b/CMake/ITKModuleMacros.cmake +@@ -162,9 +162,6 @@ macro(itk_module_impl) + foreach(dep IN LISTS ITK_MODULE_${itk-module}_DEPENDS) + list(APPEND ${itk-module}_LIBRARIES "${${dep}_LIBRARIES}") + endforeach() +- if(${itk-module}_LIBRARIES) +- list(REMOVE_DUPLICATES ${itk-module}_LIBRARIES) +- endif() + endif() + + if(EXISTS ${${itk-module}_SOURCE_DIR}/include) +diff --git a/CMake/ITKModuleAPI.cmake b/CMake/ITKModuleAPI.cmake +index af64d96dc..809335e6d 100644 +--- a/CMake/ITKModuleAPI.cmake ++++ b/CMake/ITKModuleAPI.cmake +@@ -133,7 +133,7 @@ macro(itk_module_config ns) + endforeach() + unset(_${ns}_USED_MODULES) + +- foreach(v ${ns}_LIBRARIES ${ns}_INCLUDE_DIRS ${ns}_LIBRARY_DIRS ++ foreach(v ${ns}_INCLUDE_DIRS ${ns}_LIBRARY_DIRS + ${ns}_RUNTIME_LIBRARY_DIRS ${ns}_FACTORY_NAMES ${ns}_FACTORY_LIST) + if(${v}) + list(REMOVE_DUPLICATES ${v}) diff --git a/externals/vcpkg/ports/itk/vcpkg.json b/externals/vcpkg/ports/itk/vcpkg.json new file mode 100755 index 000000000..a86e3e10f --- /dev/null +++ b/externals/vcpkg/ports/itk/vcpkg.json @@ -0,0 +1,119 @@ +{ + "name": "itk", + "version": "5.2.1", + "port-version": 1, + "description": "Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.", + "homepage": "https://github.com/InsightSoftwareConsortium/ITK", + "license": "Apache-2.0", + "dependencies": [ + "double-conversion", + "eigen3", + "expat", + { + "name": "fftw3", + "default-features": false + }, + "gdcm", + "gtest", + { + "name": "hdf5", + "default-features": false, + "features": [ + "cpp" + ] + }, + "icu", + "libjpeg-turbo", + "libpng", + "minc", + { + "name": "openjpeg", + "default-features": false + }, + "tiff", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "features": { + "cuda": { + "description": "Build CUDA module", + "dependencies": [ + "cuda", + { + "name": "itk", + "default-features": false, + "features": [ + "opencl" + ] + } + ] + }, + "cufftw": { + "description": "Use CUDA FFTW", + "dependencies": [ + "cuda" + ] + }, + "opencl": { + "description": "Use OpenCL", + "dependencies": [ + "opencl" + ] + }, + "opencv": { + "description": "Build ITKVideoBridgeOpenCV module.", + "dependencies": [ + { + "name": "opencv", + "default-features": false, + "features": [ + "default-features" + ] + } + ] + }, + "python": { + "description": "Python functionality for ITK", + "dependencies": [ + "python3" + ] + }, + "rtk": { + "description": "Build RTK Module" + }, + "tbb": { + "description": "Build TBB Module", + "dependencies": [ + "tbb" + ] + }, + "tools": { + "description": "Build RTK with tools", + "dependencies": [ + { + "name": "itk", + "default-features": false, + "features": [ + "rtk" + ] + } + ] + }, + "vtk": { + "description": "Build ITKVtkGlue module.", + "dependencies": [ + { + "name": "vtk", + "default-features": false + } + ] + } + } +} diff --git a/externals/vcpkg/ports/itk/wrapping.patch b/externals/vcpkg/ports/itk/wrapping.patch new file mode 100755 index 000000000..1e2e53150 --- /dev/null +++ b/externals/vcpkg/ports/itk/wrapping.patch @@ -0,0 +1,19 @@ +diff --git a/Wrapping/TypedefMacros.cmake b/Wrapping/TypedefMacros.cmake +index e6f8d0bf3..6c000dba8 100644 +--- a/Wrapping/TypedefMacros.cmake ++++ b/Wrapping/TypedefMacros.cmake +@@ -57,13 +57,12 @@ macro(itk_wrap_module library_name) + + # WRAPPER_LIBRARY_DEPENDS. List of names of other wrapper libraries that + # define symbols used by this wrapper library. + INTERSECTION(WRAPPER_LIBRARY_DEPENDS "${ITK_MODULE_${library_name}_DEPENDS}" "${WRAP_ITK_MODULES}") + # set(WRAPPER_LIBRARY_DEPENDS ${ITK_MODULE_${library_name}_DEPENDS}) + + # WRAPPER_LIBRARY_LINK_LIBRARIES. List of other libraries that should + # be linked to the wrapper library. +- set(WRAPPER_LIBRARY_LINK_LIBRARIES ${ITK_LIBRARIES} ${${itk-module}_LIBRARIES}) +- ++ set(WRAPPER_LIBRARY_LINK_LIBRARIES ${ITK_LIBRARIES} ${${library_name}_LIBRARIES}) + # WRAPPER_SUBMODULE_ORDER. List of *.wrap submodules in the source dir + # that should be included/wrapped before the rest in the given order. + # Just the submodule group name is needed, not the full path or file name. diff --git a/externals/vcpkg/ports/itpp/fix-linux.patch b/externals/vcpkg/ports/itpp/fix-linux.patch new file mode 100755 index 000000000..18b66af5f --- /dev/null +++ b/externals/vcpkg/ports/itpp/fix-linux.patch @@ -0,0 +1,17 @@ +diff --git a/itpp/base/random_dsfmt.h b/itpp/base/random_dsfmt.h +index ccbf182..de819fb 100644 +--- a/itpp/base/random_dsfmt.h ++++ b/itpp/base/random_dsfmt.h +@@ -299,7 +299,12 @@ private: + */ + static void do_recursion(typename Context::w128_t *r, typename Context::w128_t *a, typename Context::w128_t *b, typename Context::w128_t *lung) { + #if defined(__SSE2__) ++ ++#ifdef __linux__ ++#define SSE2_SHUFF 0x1bU ++#else + const unsigned int SSE2_SHUFF = 0x1bU; ++#endif + + __m128i x = a->si; + __m128i z = _mm_slli_epi64(x, SL1); diff --git a/externals/vcpkg/ports/itpp/fix-uwp.patch b/externals/vcpkg/ports/itpp/fix-uwp.patch new file mode 100755 index 000000000..69805922a --- /dev/null +++ b/externals/vcpkg/ports/itpp/fix-uwp.patch @@ -0,0 +1,15 @@ +diff --git a/itpp/base/timing.cpp b/itpp/base/timing.cpp +index 58178e4..6b173d0 100644 +--- a/itpp/base/timing.cpp ++++ b/itpp/base/timing.cpp +@@ -52,6 +52,10 @@ + #if defined(_WIN32) && !defined(__CYGWIN__) + #include + ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) ++#include ++#endif ++ + int gettimeofday(struct timeval* p, void*) + { + union { diff --git a/externals/vcpkg/ports/itpp/msvc2013.patch b/externals/vcpkg/ports/itpp/msvc2013.patch new file mode 100755 index 000000000..9cd35e851 --- /dev/null +++ b/externals/vcpkg/ports/itpp/msvc2013.patch @@ -0,0 +1,284 @@ + CMakeLists.txt | 2 ++ + itpp/base/algebra/eigen.cpp | 1 + + itpp/base/algebra/ls_solve.cpp | 2 +- + itpp/base/algebra/qr.cpp | 1 + + itpp/base/algebra/svd.cpp | 2 +- + itpp/base/bessel/gamma.cpp | 5 +++++ + itpp/base/itcompat.cpp | 11 ++++++++++- + itpp/base/itcompat.h | 14 ++++++++++++-- + itpp/base/matfunc.h | 1 + + itpp/base/svec.h | 1 + + itpp/comm/siso_dem.cpp | 6 ++++++ + itpp/comm/siso_eq.cpp | 6 ++++++ + itpp/comm/siso_mud.cpp | 7 +++++++ + itpp/comm/siso_nsc.cpp | 6 ++++++ + itpp/comm/siso_rsc.cpp | 7 +++++++ + 15 files changed, 67 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9f6a9a6..2360f86 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -122,7 +122,9 @@ CHECK_CXX_SYMBOL_EXISTS ( isnan "cmath" HAVE_DECL_ISNAN ) + CHECK_CXX_SYMBOL_EXISTS ( signgam "cmath" HAVE_DECL_SIGNGAM ) + + #check for functions ++if( NOT MSVC ) + set(CMAKE_REQUIRED_LIBRARIES m) ++endif() + include (CheckFunctionExists) + CHECK_FUNCTION_EXISTS ( acosh HAVE_ACOSH ) + CHECK_FUNCTION_EXISTS ( asinh HAVE_ASINH ) +diff --git a/itpp/base/algebra/eigen.cpp b/itpp/base/algebra/eigen.cpp +index 8c0c36b..54ae3e1 100644 +--- a/itpp/base/algebra/eigen.cpp ++++ b/itpp/base/algebra/eigen.cpp +@@ -39,6 +39,7 @@ + #include + #include + ++#include + + namespace itpp + { +diff --git a/itpp/base/algebra/ls_solve.cpp b/itpp/base/algebra/ls_solve.cpp +index dae38fc..95abf0a 100644 +--- a/itpp/base/algebra/ls_solve.cpp ++++ b/itpp/base/algebra/ls_solve.cpp +@@ -37,7 +37,7 @@ + #endif + + #include +- ++#include + + namespace itpp + { +diff --git a/itpp/base/algebra/qr.cpp b/itpp/base/algebra/qr.cpp +index 91dfb2b..0b47294 100644 +--- a/itpp/base/algebra/qr.cpp ++++ b/itpp/base/algebra/qr.cpp +@@ -39,6 +39,7 @@ + #include + #include + ++#include + + namespace itpp + { +diff --git a/itpp/base/algebra/svd.cpp b/itpp/base/algebra/svd.cpp +index aa21e36..b2e499c 100644 +--- a/itpp/base/algebra/svd.cpp ++++ b/itpp/base/algebra/svd.cpp +@@ -37,7 +37,7 @@ + #endif + + #include +- ++#include + + namespace itpp + { +diff --git a/itpp/base/bessel/gamma.cpp b/itpp/base/bessel/gamma.cpp +index 162c4ae..9405507 100644 +--- a/itpp/base/bessel/gamma.cpp ++++ b/itpp/base/bessel/gamma.cpp +@@ -34,6 +34,11 @@ + #include + #include + ++#if _MSC_VER ++//suppress warnings regarding the use infinity in fp arithmetic ++#pragma warning(disable: 4056) ++#pragma warning(disable: 4756) ++#endif + + /* + * Gamma function +diff --git a/itpp/base/itcompat.cpp b/itpp/base/itcompat.cpp +index f99ec81..aa34b28 100644 +--- a/itpp/base/itcompat.cpp ++++ b/itpp/base/itcompat.cpp +@@ -47,12 +47,21 @@ double tgamma(double x) + } + #endif + +-#if !defined(HAVE_LGAMMA) || (HAVE_DECL_SIGNGAM != 1) ++#if !defined(HAVE_LGAMMA) && (HAVE_DECL_SIGNGAM != 1) + // The sign of the Gamma function is returned in the external integer + // signgam declared in . It is 1 when the Gamma function is positive + // or zero, -1 when it is negative. However, MinGW definition of lgamma() + // function does not use the global signgam variable. ++//May 3rd 2015 (Andy Panov): ++//Nonetheless, I guess it would be smarter not to break the ODR rule and not to provide our own definition of lgamma ++//function when HAVE_LGAMMA is defined. If we still provide the definition, two definitions ++//of the same function will exist in the program (this is undefined behaviour, as C++ standard says), ++//so we can not ensure linker will choose our definition and user's code will work as expected. ++//I guess, error message from linker regarding the unresolved symbol is much better option, ++//since it clearly points to the math library limitations. Otherwise user can get a malfunctioning program ++//with really subtle error. + int signgam; ++ + // Logarithm of an absolute value of gamma function + double lgamma(double x) + { +diff --git a/itpp/base/itcompat.h b/itpp/base/itcompat.h +index e6be223..dcf2ed7 100644 +--- a/itpp/base/itcompat.h ++++ b/itpp/base/itcompat.h +@@ -41,8 +41,12 @@ + #if defined(_MSC_VER) + # include + # define finite(x) _finite(x) ++#ifndef HAVE_STD_ISFINITE + # define isfinite(x) _finite(x) ++#endif ++#ifndef HAVE_STD_ISNAN + # define isnan(x) _isnan(x) ++#endif + # define fpclass(x) _fpclass(x) + # define FP_NINF _FPCLASS_NINF + # define FP_PINF _FPCLASS_PINF +@@ -119,13 +123,19 @@ inline bool isfinite(double x) + double tgamma(double x); + #endif + +-#if !defined(HAVE_LGAMMA) || (HAVE_DECL_SIGNGAM != 1) ++#if !defined(HAVE_LGAMMA) && (HAVE_DECL_SIGNGAM != 1) ++//Provide own definitions if both conditions are met: ++//-lgammma is not defined ++//-signgam was not found ++//See ODR desicussion in itcompat.cpp ++ + //! Lograrithm of an absolute gamma function + double lgamma(double x); + //! Global variable needed by \c lgamma function + extern int signgam; + #endif + ++ + #ifndef HAVE_CBRT + //! Cubic root + double cbrt(double x); +@@ -141,7 +151,7 @@ inline double log1p(double x) { return std::log(1.0 + x); } + //! Base-2 logarithm + inline double log2(double x) + { +- static const double one_over_log2 = 1.0 / std::log(2.0); ++ const double one_over_log2 = 1.0 / std::log(2.0); + return std::log(x) * one_over_log2; + } + #endif +diff --git a/itpp/base/matfunc.h b/itpp/base/matfunc.h +index 8ae683e..60cf95f 100644 +--- a/itpp/base/matfunc.h ++++ b/itpp/base/matfunc.h +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + namespace itpp + { +diff --git a/itpp/base/svec.h b/itpp/base/svec.h +index d105b2f..3a2c15b 100644 +--- a/itpp/base/svec.h ++++ b/itpp/base/svec.h +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + namespace itpp + { +diff --git a/itpp/comm/siso_dem.cpp b/itpp/comm/siso_dem.cpp +index 666f38c..4fa03fd 100644 +--- a/itpp/comm/siso_dem.cpp ++++ b/itpp/comm/siso_dem.cpp +@@ -32,6 +32,12 @@ + #define INFINITY std::numeric_limits::infinity() + #endif + ++#if _MSC_VER ++//suppress warnings regarding the use infinity in fp arithmetic ++#pragma warning(disable: 4056) ++#endif ++ ++ + namespace itpp + { + void SISO::find_half_const(int &select_half, itpp::vec &re_part, itpp::bmat &re_bin_part, itpp::vec &im_part, itpp::bmat &im_bin_part) +diff --git a/itpp/comm/siso_eq.cpp b/itpp/comm/siso_eq.cpp +index 856c01a..6553b33 100644 +--- a/itpp/comm/siso_eq.cpp ++++ b/itpp/comm/siso_eq.cpp +@@ -32,6 +32,12 @@ + #define INFINITY std::numeric_limits::infinity() + #endif + ++#if _MSC_VER ++//suppress warnings regarding the use infinity in fp arithmetic ++#pragma warning(disable: 4056) ++#pragma warning(disable: 4756) ++#endif ++ + namespace itpp + { + void SISO::gen_chtrellis(void) +diff --git a/itpp/comm/siso_mud.cpp b/itpp/comm/siso_mud.cpp +index 60aa6d3..a7ff735 100644 +--- a/itpp/comm/siso_mud.cpp ++++ b/itpp/comm/siso_mud.cpp +@@ -32,6 +32,13 @@ + #define INFINITY std::numeric_limits::infinity() + #endif + ++#if _MSC_VER ++//suppress warnings regarding the use infinity in fp arithmetic ++#pragma warning(disable: 4056) ++#pragma warning(disable: 4756) ++#endif ++ ++ + namespace itpp + { + void SISO::descrambler(itpp::vec &extrinsic_coded, itpp::vec &extrinsic_data, const itpp::vec &intrinsic_coded, const itpp::vec &apriori_data) +diff --git a/itpp/comm/siso_nsc.cpp b/itpp/comm/siso_nsc.cpp +index ca7d19a..12ca62a 100644 +--- a/itpp/comm/siso_nsc.cpp ++++ b/itpp/comm/siso_nsc.cpp +@@ -33,6 +33,12 @@ + #define INFINITY std::numeric_limits::infinity() + #endif + ++#if _MSC_VER ++//suppress warnings regarding the use infinity in fp arithmetic ++#pragma warning(disable: 4056) ++#pragma warning(disable: 4756) ++#endif ++ + namespace itpp + { + void SISO::gen_nsctrellis(void) +diff --git a/itpp/comm/siso_rsc.cpp b/itpp/comm/siso_rsc.cpp +index e5003c7..9e3eea1 100644 +--- a/itpp/comm/siso_rsc.cpp ++++ b/itpp/comm/siso_rsc.cpp +@@ -29,6 +29,13 @@ + #include + #include + #include ++ ++#if _MSC_VER ++//suppress warnings regarding the use infinity in fp arithmetic ++#pragma warning(disable: 4056) ++#pragma warning(disable: 4756) ++#endif ++ + #ifndef INFINITY + #define INFINITY std::numeric_limits::infinity() + #endif + + #Remove this patch if the source has fixed these issues. diff --git a/externals/vcpkg/ports/itpp/portfile.cmake b/externals/vcpkg/ports/itpp/portfile.cmake new file mode 100755 index 000000000..696f33382 --- /dev/null +++ b/externals/vcpkg/ports/itpp/portfile.cmake @@ -0,0 +1,38 @@ +set(ITPP_VERSION 4.3.1) + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO itpp/itpp + REF ${ITPP_VERSION} + FILENAME "itpp-${ITPP_VERSION}.tar.bz2" + SHA512 b46d048fa7f33e80d2291a5e38e205c159791ea200f92c70d69e8ad8447ac2f0c847fece566a99af739853a1643cb16e226b4200c8bf115417f324e6d38c66bd + PATCHES + msvc2013.patch + fix-uwp.patch + fix-linux.patch + rename-version.patch +) +file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt") + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_LAPACK=ON + -DCMAKE_DISABLE_FIND_PACKAGE_FFT=ON + -DCMAKE_DISABLE_FIND_PACKAGE_BLAS=ON +) + +vcpkg_install_cmake() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/itpp/rename-version.patch b/externals/vcpkg/ports/itpp/rename-version.patch new file mode 100755 index 000000000..0750ed4ce --- /dev/null +++ b/externals/vcpkg/ports/itpp/rename-version.patch @@ -0,0 +1,12 @@ +--- a/autogen.sh ++++ b/autogen.sh +@@ -25,6 +25,6 @@ + +-PV=$(cat VERSION | cut -d' ' -f1) +-LV=$(cat VERSION | cut -d' ' -f2) +-if test "x$(cat VERSION | cut -d' ' -f3)" = "xsvn"; then ++PV=$(cat VERSION.txt | cut -d' ' -f1) ++LV=$(cat VERSION.txt | cut -d' ' -f2) ++if test "x$(cat VERSION.txt | cut -d' ' -f3)" = "xsvn"; then + if test -d ".git/svn"; then + REV=$(LC_ALL=C git svn find-rev HEAD) diff --git a/externals/vcpkg/ports/itpp/vcpkg.json b/externals/vcpkg/ports/itpp/vcpkg.json new file mode 100755 index 000000000..972f0cd19 --- /dev/null +++ b/externals/vcpkg/ports/itpp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "itpp", + "version-semver": "4.3.1", + "port-version": 8, + "description": "IT++ is a C++ library of mathematical, signal processing and communication classes and functions. Its main use is in simulation of communication systems and for performing research in the area of communications.", + "homepage": "http://itpp.sourceforge.net" +} diff --git a/externals/vcpkg/ports/ixwebsocket/portfile.cmake b/externals/vcpkg/ports/ixwebsocket/portfile.cmake new file mode 100755 index 000000000..83ebf1bd1 --- /dev/null +++ b/externals/vcpkg/ports/ixwebsocket/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO machinezone/IXWebSocket + REF 2f560ff4c07e5446f2539505cb4f64f80b54ca8e #v11.4.2 + SHA512 afa19cc161b9e49eafacc113583bbf68a34d83a9535c5c4f1f1cd57f943a5ad91c3117c0e2b47b2975a65f0284aec1200f6f8f5768afa7d6aebcbb823934036a +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openssl USE_OPEN_SSL + mbedtls USE_MBED_TLS + sectransp USE_SECURE_TRANSPORT +) + +if("sectransp" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_OSX) + message(FATAL_ERROR "sectransp is not supported on non-Apple platforms") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DUSE_TLS=1 + MAYBE_UNUSED_VARIABLES + USE_SECURE_TRANSPORT +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ixwebsocket) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/ixwebsocket/vcpkg.json b/externals/vcpkg/ports/ixwebsocket/vcpkg.json new file mode 100755 index 000000000..870cf5ddf --- /dev/null +++ b/externals/vcpkg/ports/ixwebsocket/vcpkg.json @@ -0,0 +1,71 @@ +{ + "name": "ixwebsocket", + "version-semver": "11.4.2", + "description": "Lightweight WebSocket Client and Server + HTTP Client and Server", + "homepage": "https://github.com/machinezone/IXWebSocket", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "default-features": [ + "ssl" + ], + "features": { + "mbedtls": { + "description": "SSL support (mbedTLS)", + "dependencies": [ + "mbedtls" + ] + }, + "openssl": { + "description": "SSL support (OpenSSL)", + "dependencies": [ + "openssl" + ] + }, + "sectransp": { + "description": "SSL support (sectransp)" + }, + "ssl": { + "description": "Default SSL backend", + "dependencies": [ + { + "name": "ixwebsocket", + "features": [ + "sectransp" + ], + "platform": "osx" + }, + { + "name": "ixwebsocket", + "features": [ + "mbedtls" + ], + "platform": "windows" + }, + { + "name": "ixwebsocket", + "features": [ + "mbedtls" + ], + "platform": "windows & uwp" + }, + { + "name": "ixwebsocket", + "features": [ + "openssl" + ], + "platform": "!uwp & !windows & !osx" + } + ] + } + } +} diff --git a/externals/vcpkg/ports/jack2/CMakeLists.txt b/externals/vcpkg/ports/jack2/CMakeLists.txt new file mode 100755 index 000000000..6c46d8d91 --- /dev/null +++ b/externals/vcpkg/ports/jack2/CMakeLists.txt @@ -0,0 +1,33 @@ +cmake_minimum_required(VERSION 3.1) +project(jack VERSION 1.9 LANGUAGES C) + +include_directories(common) + +add_library(jack common/JackWeakAPI.c) +if(WIN32 AND BUILD_SHARED_LIBS) + target_sources(jack PRIVATE jack.def) +endif() +target_link_libraries(jack PRIVATE ${CMAKE_DL_LIBS}) + +include(GNUInstallDirs) +install(TARGETS jack + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" +) + +set(PREFIX "${CMAKE_INSTALL_PREFIX}") +set(LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}") +set(INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") +set(JACK_VERSION "${CMAKE_PROJECT_VERSION}") +# JackWeak dynamically loads the real JACK library which requires linking CMAKE_DL_LIBS +if(CMAKE_DL_LIBS) + set(CLIENTLIB "jack -l${CMAKE_DL_LIBS}") +else() + set(CLIENTLIB "jack") +endif() +# NOTE: the server_libs variable will be broken but this port does not build the server anyway +configure_file(jack.pc.in "${CMAKE_CURRENT_BINARY_DIR}/jack.pc" @ONLY) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/jack.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + +install(DIRECTORY "common/jack" DESTINATION "include") diff --git a/externals/vcpkg/ports/jack2/jack.def b/externals/vcpkg/ports/jack2/jack.def new file mode 100755 index 000000000..c542e5337 --- /dev/null +++ b/externals/vcpkg/ports/jack2/jack.def @@ -0,0 +1,96 @@ +LIBRARY JACK + +EXPORTS + +;FIXME these are unimplemented +;jack_port_uuid +;jack_get_cycle_times + +jack_get_version +jack_get_version_string +jack_client_open +jack_client_new +jack_client_close +jack_client_name_size +jack_get_client_name +jack_get_uuid_for_client_name +jack_get_client_name_by_uuid +jack_internal_client_new +jack_internal_client_close +jack_activate +jack_deactivate +jack_client_thread_id +jack_is_realtime +jack_thread_wait +jack_cycle_wait +jack_cycle_signal +jack_set_process_thread +jack_set_thread_init_callback +jack_on_shutdown +jack_on_info_shutdown +jack_set_process_callback +jack_set_freewheel_callback +jack_set_buffer_size_callback +jack_set_sample_rate_callback +jack_set_client_registration_callback +jack_set_port_registration_callback +jack_set_port_connect_callback +jack_set_port_rename_callback +jack_set_graph_order_callback +jack_set_xrun_callback +jack_set_latency_callback +jack_set_freewheel +jack_set_buffer_size +jack_get_sample_rate +jack_get_buffer_size +jack_engine_takeover_timebase +jack_cpu_load +jack_port_register +jack_port_unregister +jack_port_get_buffer +jack_port_name +jack_port_short_name +jack_port_flags +jack_port_type +jack_port_type_id +jack_port_is_mine +jack_port_connected +jack_port_connected_to +jack_port_get_connections +jack_port_get_all_connections +jack_port_tie +jack_port_untie +jack_port_set_name +jack_port_rename +jack_port_set_alias +jack_port_unset_alias +jack_port_get_aliases +jack_port_request_monitor +jack_port_request_monitor_by_name +jack_port_ensure_monitor +jack_port_monitoring_input +jack_connect +jack_disconnect +jack_port_disconnect +jack_port_name_size +jack_port_type_size +jack_port_type_get_buffer_size +jack_port_set_latency +jack_port_get_latency_range +jack_port_set_latency_range +jack_recompute_total_latencies +jack_port_get_latency +jack_port_get_total_latency +jack_recompute_total_latency +jack_get_ports +jack_port_by_name +jack_port_by_id +jack_frames_since_cycle_start +jack_frame_time +jack_last_frame_time +jack_frames_to_time +jack_time_to_frames +jack_get_time +jack_set_error_function +jack_set_info_function +jack_free diff --git a/externals/vcpkg/ports/jack2/portfile.cmake b/externals/vcpkg/ports/jack2/portfile.cmake new file mode 100755 index 000000000..3ab7e180e --- /dev/null +++ b/externals/vcpkg/ports/jack2/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jackaudio/jack2 + REF v1.9.21 + SHA512 0e9ce581fca3c5d9ffb1de22b45cae6d94085c6f92ff3554892e25727baf66a2269f10d338d95d991e8380c4be5e0cc1e1453b9f878c7dc2e8a990f3bd458557 + HEAD_REF master +) + +# Install headers and a shim library with JackWeakAPI.c +file(COPY + "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" + "${CMAKE_CURRENT_LIST_DIR}/jack.def" + DESTINATION "${SOURCE_PATH}" +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/jack2/vcpkg.json b/externals/vcpkg/ports/jack2/vcpkg.json new file mode 100755 index 000000000..356579f3a --- /dev/null +++ b/externals/vcpkg/ports/jack2/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "jack2", + "version-semver": "1.9.21", + "description": "Cross-platform API that enables device sharing and inter-application audio routing", + "homepage": "https://jackaudio.org/", + "license": "GPL-2.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/jaeger-client-cpp/fix-CMakeLists.patch b/externals/vcpkg/ports/jaeger-client-cpp/fix-CMakeLists.patch new file mode 100755 index 000000000..4e7db3216 --- /dev/null +++ b/externals/vcpkg/ports/jaeger-client-cpp/fix-CMakeLists.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d9bf7b5..eb2692c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,7 +60,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND + endif() + + hunter_add_package(thrift) +-find_package(thrift ${hunter_config} REQUIRED) ++find_package(Thrift CONFIG REQUIRED) + if(HUNTER_ENABLED) + list(APPEND LIBS thrift::thrift_static) + else() +@@ -273,6 +273,9 @@ if(JAEGERTRACING_PLUGIN) + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/export.map + "{ global: OpenTracingMakeTracerFactory; local: *; };") + add_library(jaegertracing_plugin MODULE ${SRC}) ++ if (WIN32) ++ target_link_libraries(jaegertracing_plugin PUBLIC Iphlpapi Ws2_32) ++ endif() + add_lib_deps(jaegertracing_plugin) + target_link_libraries(jaegertracing_plugin PUBLIC + -static-libgcc +@@ -418,7 +421,7 @@ include(GNUInstallDirs) + # * /lib*/cmake/ + # * /lib*/ + # * /include/ +-set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") ++set(config_install_dir "${CMAKE_INSTALL_DATAROOTDIR}/jaeger-client-cpp") + + set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") + diff --git a/externals/vcpkg/ports/jaeger-client-cpp/portfile.cmake b/externals/vcpkg/ports/jaeger-client-cpp/portfile.cmake new file mode 100755 index 000000000..7210d67f2 --- /dev/null +++ b/externals/vcpkg/ports/jaeger-client-cpp/portfile.cmake @@ -0,0 +1,65 @@ +# Get jaeger-idl from github +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jaegertracing/jaeger-idl + REF b9acaab7b20fd4f984225657ffe272799ebdfefb #commit on 2021-08-04 + SHA512 d136e68e54f39779a48b1c5bc61f81dc06b312120dc8d3788a9c360f89aa924ca4cc074c6515743a930982637f9fca94299000a4b2dca1f9c243d8d9d1c62de2 + HEAD_REF master +) + +# Create target directory for proxy/stub generation +file(MAKE_DIRECTORY "${SOURCE_PATH}/data") +# List of input files +set(THRIFT_SOURCE_FILES agent.thrift jaeger.thrift sampling.thrift zipkincore.thrift crossdock/tracetest.thrift baggage.thrift dependency.thrift aggregation_validator.thrift) + +# Generate proxy/stubs for the input files +foreach(THRIFT_SOURCE_FILE IN LISTS THRIFT_SOURCE_FILES) +vcpkg_execute_required_process( + COMMAND "${CURRENT_INSTALLED_DIR}/tools/thrift/thrift" --gen cpp:no_skeleton -o "${SOURCE_PATH}/data" ${THRIFT_SOURCE_FILE} + WORKING_DIRECTORY "${SOURCE_PATH}/thrift" + LOGNAME jaeger-idl-${TARGET_TRIPLET} +) +endforeach() + +# Save generated proxy/stub target directory +set(IDL_SOURCE_DIR "${SOURCE_PATH}/data/gen-cpp") + +# Get jaeger-client-cpp from github +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jaegertracing/jaeger-client-cpp + REF 277fdd75e413c914bff04d510afafc7f0811a31a #v0.7.0 + SHA512 5112bda5ec24621044bbcd5393922564de70f4d696b1d4248e889dd3d49e492155bfc88626fea214ce4e4cb50e9a49ea031ddb8efbaafc6f1753a586db534a50 + HEAD_REF master + PATCHES + fix-CMakeLists.patch +) + +# Do not use hunter, not testtools and build opentracing plugin +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DHUNTER_ENABLED=0 + -DBUILD_TESTING=0 + -DJAEGERTRACING_PLUGIN=0 + -DJAEGERTRACING_BUILD_EXAMPLES=0 +) + +# Copy generated files over to jaeger-client-cpp +file(GLOB IDL_SOURCE_FILES LIST_DIRECTORIES false "${IDL_SOURCE_DIR}/*") +file(COPY ${IDL_SOURCE_FILES} DESTINATION "${SOURCE_PATH}/src/jaegertracing/thrift-gen") + +# Generate Jaeger client +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +# Cleanup unused Debug files +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# Cleanup +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/jaegertracing/testutils") diff --git a/externals/vcpkg/ports/jaeger-client-cpp/vcpkg.json b/externals/vcpkg/ports/jaeger-client-cpp/vcpkg.json new file mode 100755 index 000000000..638d78af2 --- /dev/null +++ b/externals/vcpkg/ports/jaeger-client-cpp/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "jaeger-client-cpp", + "version-semver": "0.7.0", + "port-version": 1, + "description": "C++ OpenTracing binding for Jaeger https://jaegertracing.io/", + "homepage": "https://github.com/jaegertracing/jaeger-client-cpp", + "supports": "!arm64", + "dependencies": [ + "nlohmann-json", + "opentracing", + "thrift", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "yaml-cpp" + ] +} diff --git a/externals/vcpkg/ports/jansson/fix-linker-flags.patch b/externals/vcpkg/ports/jansson/fix-linker-flags.patch new file mode 100755 index 000000000..57d889005 --- /dev/null +++ b/externals/vcpkg/ports/jansson/fix-linker-flags.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 39b9ad3..ed33e3c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -342,7 +342,7 @@ if(JANSSON_BUILD_SHARED_LIBS) + ) + list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES "-Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym") + if (VSCRIPT_WORKS) +- set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym") ++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym") + endif() + endif() + diff --git a/externals/vcpkg/ports/jansson/portfile.cmake b/externals/vcpkg/ports/jansson/portfile.cmake new file mode 100755 index 000000000..e6c17c148 --- /dev/null +++ b/externals/vcpkg/ports/jansson/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO akheron/jansson + REF 684e18c927e89615c2d501737e90018f4930d6c5 # v2.14 + SHA512 e2cac3567bc860d10d9aa386ce370876cb21ff083a970abeb48112b6586b91cd101694a98cb05a06795fb04498e6bc2df3615fedb86635f5a998b68e5670e5b3 + HEAD_REF master + PATCHES + fix-linker-flags.patch +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" JANSSON_STATIC_CRT) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" JANSSON_BUILD_SHARED_LIBS) + +# Jansson tries to random-seed its hash table with system-provided entropy. +# This is not ported to UWP yet. +if(VCPKG_TARGET_IS_UWP) + set(USE_WINDOWS_CRYPTOAPI OFF) +else() + set(USE_WINDOWS_CRYPTOAPI ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DJANSSON_STATIC_CRT=${JANSSON_STATIC_CRT} + -DJANSSON_EXAMPLES=OFF + -DJANSSON_WITHOUT_TESTS=ON + -DJANSSON_BUILD_DOCS=OFF + -DJANSSON_BUILD_SHARED_LIBS=${JANSSON_BUILD_SHARED_LIBS} + -DUSE_WINDOWS_CRYPTOAPI=${USE_WINDOWS_CRYPTOAPI} + -DJANSSON_INSTALL_CMAKE_DIR:STRING=share/jansson +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/jansson/vcpkg.json b/externals/vcpkg/ports/jansson/vcpkg.json new file mode 100755 index 000000000..cd99df027 --- /dev/null +++ b/externals/vcpkg/ports/jansson/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "jansson", + "version": "2.14", + "port-version": 1, + "description": "Jansson is a C library for encoding, decoding and manipulating JSON data", + "homepage": "https://github.com/akheron/jansson", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/jasper/portfile.cmake b/externals/vcpkg/ports/jasper/portfile.cmake new file mode 100755 index 000000000..69efaaef3 --- /dev/null +++ b/externals/vcpkg/ports/jasper/portfile.cmake @@ -0,0 +1,42 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mdadams/jasper + REF fe00207dc10db1d7cc6f2757961c5c6bdfd10973 # version-2.0.33 + SHA512 887bb8e6096b41d5b61970d70b0e7b9cc1c31dd63467386aa35003c146d200bbae9ad46825a3313aeed403ac6fb26d504f489386cbc7ca364d95deeb5a94af46 + HEAD_REF master +) + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(VCPKG_CXX_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_CXX_FLAGS}") + set(VCPKG_C_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_C_FLAGS}") +endif() + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" JAS_ENABLE_SHARED) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + opengl JAS_ENABLE_OPENGL +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=OFF + -DJAS_ENABLE_LIBJPEG=ON + -DJAS_ENABLE_OPENGL=${JAS_ENABLE_OPENGL} + -DJAS_ENABLE_DOC=OFF + -DJAS_ENABLE_PROGRAMS=OFF + -DJAS_ENABLE_SHARED=${JAS_ENABLE_SHARED} + OPTIONS_DEBUG + -DCMAKE_DEBUG_POSTFIX=d # Due to CMakes FindJasper +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/jasper/vcpkg.json b/externals/vcpkg/ports/jasper/vcpkg.json new file mode 100755 index 000000000..7d225aadf --- /dev/null +++ b/externals/vcpkg/ports/jasper/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "jasper", + "version": "2.0.33", + "port-version": 3, + "description": "Open source implementation of the JPEG-2000 Part-1 standard", + "homepage": "https://github.com/mdadams/jasper", + "dependencies": [ + "libjpeg-turbo", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "opengl" + ], + "features": { + "opengl": { + "description": "Enable the use of the OpenGL/GLUT Library", + "dependencies": [ + { + "name": "freeglut", + "platform": "!osx" + }, + "opengl" + ] + } + } +} diff --git a/externals/vcpkg/ports/jbig2dec/CMakeLists.txt b/externals/vcpkg/ports/jbig2dec/CMakeLists.txt new file mode 100755 index 000000000..14b1be671 --- /dev/null +++ b/externals/vcpkg/ports/jbig2dec/CMakeLists.txt @@ -0,0 +1,23 @@ +cmake_minimum_required(VERSION 3.9) +project(jbig2dec C) + +set(CMAKE_DEBUG_POSTFIX d) + +file(GLOB SOURCES jbig2*.c) +list(REMOVE_ITEM SOURCES + "${CMAKE_CURRENT_SOURCE_DIR}/jbig2dec.c" + "${CMAKE_CURRENT_SOURCE_DIR}/jbig2_image_png.c" + "${CMAKE_CURRENT_SOURCE_DIR}/jbig2_image_pbm.c" +) + +add_library(jbig2dec ${SOURCES}) + +install(TARGETS jbig2dec + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES jbig2.h DESTINATION include) +endif() diff --git a/externals/vcpkg/ports/jbig2dec/portfile.cmake b/externals/vcpkg/ports/jbig2dec/portfile.cmake new file mode 100755 index 000000000..099252b20 --- /dev/null +++ b/externals/vcpkg/ports/jbig2dec/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ArtifexSoftware/jbig2dec + REF 1c336b8ab44524dc56ea837e2211ff4207704cdd # 0.19 + SHA512 e189a80cc8da18813cf6c8edc6f1a799793adcba7ea6f302a8cced349bffac68869af338d9723ee1efdc07115ae554cd5757bfda7d7ac41324fde1f9c3a8343c + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=1 +) + +vcpkg_install_cmake() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/jbig2dec RENAME copyright) diff --git a/externals/vcpkg/ports/jbig2dec/vcpkg.json b/externals/vcpkg/ports/jbig2dec/vcpkg.json new file mode 100755 index 000000000..a4f145f69 --- /dev/null +++ b/externals/vcpkg/ports/jbig2dec/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "jbig2dec", + "version-string": "0.19", + "port-version": 1, + "description": "a decoder library and example utility implementing the JBIG2 bi-level image compression spec. Also known as ITU T.88 and ISO IEC 14492, and included by reference in Adobe's PDF version 1.4 and later.", + "homepage": "https://github.com/ArtifexSoftware/jbig2dec" +} diff --git a/externals/vcpkg/ports/jbigkit/CMakeLists.txt b/externals/vcpkg/ports/jbigkit/CMakeLists.txt new file mode 100755 index 000000000..2b82410b6 --- /dev/null +++ b/externals/vcpkg/ports/jbigkit/CMakeLists.txt @@ -0,0 +1,26 @@ +cmake_minimum_required(VERSION 3.4) +project(libjbig C) + +set(SOURCES + "libjbig/jbig.c" + "libjbig/jbig_ar.c" + "libjbig/jbig85.c") + +set(HEADERS + "libjbig/jbig.h" + "libjbig/jbig_ar.h" + "libjbig/jbig85.h" +) + +add_library(libjbig ${SOURCES}) + +install( + TARGETS libjbig + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install( + FILES ${HEADERS} + DESTINATION include) diff --git a/externals/vcpkg/ports/jbigkit/portfile.cmake b/externals/vcpkg/ports/jbigkit/portfile.cmake new file mode 100755 index 000000000..ba2d6555a --- /dev/null +++ b/externals/vcpkg/ports/jbigkit/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +set(JBIGKIT_VERSION 2.1) +set(JBIGKIT_HASH c4127480470ef90db1ef3bd2caa444df10b50ed8df0bc9997db7612cb48b49278baf44965028f1807a21028eb965d677e015466306b44683c4ec75a23e1922cf) + +vcpkg_download_distfile(ARCHIVE + URLS "http://www.cl.cam.ac.uk/~mgk25/jbigkit/download/jbigkit-${JBIGKIT_VERSION}.tar.gz" + FILENAME "jbigkit-${JBIGKIT_VERSION}.tar.gz" + SHA512 ${JBIGKIT_HASH} +) + +vcpkg_extract_source_archive_ex( + ARCHIVE ${ARCHIVE} + OUT_SOURCE_PATH SOURCE_PATH +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/jbigkit) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/jbigkit/COPYING ${CURRENT_PACKAGES_DIR}/share/jbigkit/copyright) diff --git a/externals/vcpkg/ports/jbigkit/vcpkg.json b/externals/vcpkg/ports/jbigkit/vcpkg.json new file mode 100755 index 000000000..1498be4fa --- /dev/null +++ b/externals/vcpkg/ports/jbigkit/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "jbigkit", + "version-string": "2.1", + "port-version": 5, + "description": "A software implementation of the JBIG1 data compression standard (ITU-T T.82)", + "homepage": "https://www.cl.cam.ac.uk/~mgk25/jbigkit" +} diff --git a/externals/vcpkg/ports/jemalloc/fix-cmakelists.patch b/externals/vcpkg/ports/jemalloc/fix-cmakelists.patch new file mode 100755 index 000000000..3ba70544c --- /dev/null +++ b/externals/vcpkg/ports/jemalloc/fix-cmakelists.patch @@ -0,0 +1,67 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 06e83ef..229e17a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -57,6 +57,7 @@ option(enable-lazy-lock "Enable lazy locking (only lock when multi-threaded" OFF + option(force_lazy_lock "Forcing lazy-lock to avoid allocator/threading bootstrap issues" OFF) + # install_prefix - installation directory prefix + # with-xslroot= XSL stylesheet root path ++option(build-tests "Build tests" OFF) + + set (PACKAGE_NAME "jemalloc") + project (${PACKAGE_NAME} C) +@@ -711,12 +712,8 @@ endif() + + # The original library, delivery product + set(LIBJEMALLOCLIB jemalloc${install_suffix}) +-add_library(${LIBJEMALLOCLIB} STATIC ${C_SRCS}) +- +-# Now add shared library. Needed for integration tests +-# and a benchmark +-set(LIBJEMALLOCSO jemallocso${install_suffix}) +-add_library(${LIBJEMALLOCSO} SHARED ${C_SRCS}) ++set(LIBJEMALLOCSO ${LIBJEMALLOCLIB}) ++add_library(${LIBJEMALLOCLIB} ${C_SRCS}) + + if(WIN32) + # May want to replace /d2Zi+ to /Zo +@@ -745,8 +745,6 @@ if(WIN32) + # either impport or export which is both wrong for a static library + set_target_properties(${LIBJEMALLOCLIB} + PROPERTIES +- COMPILE_DEFINITIONS +- "JEMALLOC_EXPORT=" + CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_DEBUG + ${PROJECT_BINARY_DIR}/Debug + CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_RELEASE +@@ -754,6 +752,9 @@ if(WIN32) + COMPILE_PDB_NAME + ${LIBJEMALLOCLIB} + ) ++ if(NOT BUILD_SHARED_LIBS) ++ target_compile_definitions(${LIBJEMALLOCLIB} "JEMALLOC_EXPORT=") ++ endif() + + endif() + +@@ -825,6 +822,14 @@ if(C_UTIL_INTEGRATION_DEFS) + "${C_UTIL_INTEGRATION_DEFS}") + endif() + ++install(FILES include/jemalloc/jemalloc${install_suffix}.h ++ DESTINATION include/jemalloc) ++ ++install(TARGETS ${LIBJEMALLOCSO} ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) ++if (build-tests) + ################################################################## + # Common source for Unit, Integration and stress test libraries + set(C_TESTLIB_SRCS +@@ -1028,4 +1033,4 @@ foreach(sourcefile ${TESTS_INTEGRATION}) + add_test(NAME ${exename} COMMAND ${exename}) + add_dependencies(check ${exename}) + endforeach(sourcefile ${TESTS_UNIT}) +- ++endif() diff --git a/externals/vcpkg/ports/jemalloc/fix-static-build.patch b/externals/vcpkg/ports/jemalloc/fix-static-build.patch new file mode 100755 index 000000000..3ede809a8 --- /dev/null +++ b/externals/vcpkg/ports/jemalloc/fix-static-build.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0b8959a..55e6a5f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -826,10 +826,16 @@ endif() + install(FILES include/jemalloc/jemalloc${install_suffix}.h + DESTINATION include/jemalloc) + +-install(TARGETS ${LIBJEMALLOCSO} +- RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib) ++if (without-export) ++ install(TARGETS ${C_JETLIB} ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) ++else() ++ install(TARGETS ${LIBJEMALLOCSO} ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) ++endif() + if (build-tests) + ################################################################## + # Common source for Unit, Integration and stress test libraries diff --git a/externals/vcpkg/ports/jemalloc/fix-utilities.patch b/externals/vcpkg/ports/jemalloc/fix-utilities.patch new file mode 100755 index 000000000..32c39e0b3 --- /dev/null +++ b/externals/vcpkg/ports/jemalloc/fix-utilities.patch @@ -0,0 +1,30 @@ +diff --git a/Utilities.cmake b/Utilities.cmake +index 562e948..d2d3530 100644 +--- a/Utilities.cmake ++++ b/Utilities.cmake +@@ -633,9 +633,11 @@ file(TO_NATIVE_PATH "${file_path}" ntv_file_path) + # This converts #undefs into #cmakedefines so configure_file can handle it + set(PS_CMD + "Get-Content \"${ntv_file_path}\" | +-ForEach { ++ForEach { + if($_ -match '^#undef[ \t]*[^ \t]*') +- { $_ -replace '^#undef[ \t]*([^ \t]*)','#cmakedefine $1 @$1@' } else {$_}}" ++ { $_ -replace '^#undef[ \t]*([^ \t]*)','#cmakedefine $1 @$1@' } else {$_} ++} | ++Set-Content \"${ntv_file_path}.cmake\"" + ) + + if(EXISTS ${file_path}) +@@ -646,9 +648,8 @@ if(EXISTS ${file_path}) + # Convert autoconf .in into a cmake .in + execute_process(COMMAND powershell -Command "${PS_CMD}" + RESULT_VARIABLE error_level +- ERROR_VARIABLE error_output +- OUTPUT_FILE ${file_path}.cmake) +- ++ ERROR_VARIABLE error_output) ++ + if(NOT ${error_level} EQUAL 0) + message(FATAL_ERROR "Powershell completed with ${error_level} : ${error_output}") + endif() diff --git a/externals/vcpkg/ports/jemalloc/portfile.cmake b/externals/vcpkg/ports/jemalloc/portfile.cmake new file mode 100755 index 000000000..013634577 --- /dev/null +++ b/externals/vcpkg/ports/jemalloc/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jemalloc/jemalloc-cmake + REF jemalloc-cmake.4.3.1 + SHA512 e94b62ec3a53acc0ab5acb247d7646bc172108e80f592bb41c2dd50d181cbbeb33d623adf28415ffc0a0e2de3818af2dfe4c04af75ac891ef5042bc5bb186886 + HEAD_REF master + PATCHES + fix-cmakelists.patch + fix-utilities.patch + fix-static-build.patch +) + +if (VCPKG_CRT_LINKAGE STREQUAL "dynamic") + set(BUILD_STATIC_LIBRARY OFF) +else() + set(BUILD_STATIC_LIBRARY ON) +endif() +vcpkg_configure_cmake( + DISABLE_PARALLEL_CONFIGURE + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DGIT_FOUND=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON -Dwithout-export=${BUILD_STATIC_LIBRARY} +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/jemalloc) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/jemalloc/COPYING ${CURRENT_PACKAGES_DIR}/share/jemalloc/copyright) diff --git a/externals/vcpkg/ports/jemalloc/vcpkg.json b/externals/vcpkg/ports/jemalloc/vcpkg.json new file mode 100755 index 000000000..c23bdcaa8 --- /dev/null +++ b/externals/vcpkg/ports/jemalloc/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "jemalloc", + "version-string": "4.3.1", + "port-version": 5, + "description": "jemalloc is a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support", + "homepage": "https://github.com/jemalloc/jemalloc-cmake" +} diff --git a/externals/vcpkg/ports/jinja2cpplight/portfile.cmake b/externals/vcpkg/ports/jinja2cpplight/portfile.cmake new file mode 100755 index 000000000..329020de2 --- /dev/null +++ b/externals/vcpkg/ports/jinja2cpplight/portfile.cmake @@ -0,0 +1,37 @@ +if(VCPKG_TARGET_IS_UWP) + message(FATAL_ERROR "jinja2cpplight doesn't support UWP.") +endif() + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +else() + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +endif() + + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO hughperkins/Jinja2CppLight + REF 04196b080adf6edb86184824a1cf948ace310d19 #Commits on May 8, 2018 + SHA512 30415da5ebc4fb805953cc9ff7e5fcd357d6fa1818c1ff2570b795252de6215562cd0f2f0418a1fa60e9d74b88339a3fea7166b898f54cface6ab1cfe3581bb5 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + + +file(GLOB_RECURSE JINJA2CPPLIGHT_EXES ${CURRENT_PACKAGES_DIR}/bin/jinja2cpplight_unittests*) +file(COPY ${JINJA2CPPLIGHT_EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) +file(REMOVE_RECURSE ${JINJA2CPPLIGHT_EXES}) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/jinja2cpplight/vcpkg.json b/externals/vcpkg/ports/jinja2cpplight/vcpkg.json new file mode 100755 index 000000000..004282a82 --- /dev/null +++ b/externals/vcpkg/ports/jinja2cpplight/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "jinja2cpplight", + "version-string": "2018-05-08", + "port-version": 1, + "description": "(very) lightweight version of Jinja2 for C++, Lightweight templating engine for C++, based on Jinja2.", + "homepage": "https://github.com/hughperkins/Jinja2CppLight", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/josuttis-jthread/portfile.cmake b/externals/vcpkg/ports/josuttis-jthread/portfile.cmake new file mode 100755 index 000000000..9563442b1 --- /dev/null +++ b/externals/vcpkg/ports/josuttis-jthread/portfile.cmake @@ -0,0 +1,15 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO josuttis/jthread + REF 3e1908f3bbaba6d2195bb423840c23e107c9e8b2 + SHA512 b6e4df35b364848a433eb31023a8b5b5045b2445aaf9a81406a6b3ce7cfdda08bcdb486be9201f5b1e54df38884c1763fae336fdcb9ad79f11658a92c535055d + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/source/jthread.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL ${SOURCE_PATH}/source/stop_token.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL ${SOURCE_PATH}/source/condition_variable_any2.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/josuttis-jthread/vcpkg.json b/externals/vcpkg/ports/josuttis-jthread/vcpkg.json new file mode 100755 index 000000000..565f8b4e3 --- /dev/null +++ b/externals/vcpkg/ports/josuttis-jthread/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "josuttis-jthread", + "version-string": "2020-07-21", + "port-version": 2, + "description": "C++ class for a joining and cooperative interruptible thread (std::jthread) with stop_token helper", + "homepage": "https://github.com/josuttis/jthread" +} diff --git a/externals/vcpkg/ports/jsmn/portfile.cmake b/externals/vcpkg/ports/jsmn/portfile.cmake new file mode 100755 index 000000000..a8deec69e --- /dev/null +++ b/externals/vcpkg/ports/jsmn/portfile.cmake @@ -0,0 +1,14 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO zserge/jsmn + REF fdcef3ebf886fa210d14956d3c068a653e76a24e + SHA512 ec3a6b106b868238aa626e5b4477ace4414f385a35c695a583598975202b73a2a446143eb5f0ea73b0a84113c610ea36e64341fccecd1d1ddd9080e06f599575 + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/jsmn.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/jsmn/vcpkg.json b/externals/vcpkg/ports/jsmn/vcpkg.json new file mode 100755 index 000000000..96956d18d --- /dev/null +++ b/externals/vcpkg/ports/jsmn/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "jsmn", + "version-string": "2019-04-27", + "port-version": 1, + "description": "A minimalistic JSON parser in C." +} diff --git a/externals/vcpkg/ports/json-c/pkgconfig.patch b/externals/vcpkg/ports/json-c/pkgconfig.patch new file mode 100755 index 000000000..893406ed5 --- /dev/null +++ b/externals/vcpkg/ports/json-c/pkgconfig.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ffb1db3dc..a82ed8619 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -273,7 +273,7 @@ install( + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} + ) + +-if (UNIX OR MINGW OR CYGWIN) ++if (1) + SET(prefix ${CMAKE_INSTALL_PREFIX}) + # exec_prefix is prefix by default and CMake does not have the + # concept. diff --git a/externals/vcpkg/ports/json-c/portfile.cmake b/externals/vcpkg/ports/json-c/portfile.cmake new file mode 100755 index 000000000..d0893ebee --- /dev/null +++ b/externals/vcpkg/ports/json-c/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO json-c/json-c + REF eae040a84a479ccad1d1c48314345c51ecf1a4a4 + SHA512 18d8a31b341830b04676cad13fbc0608fb75a323522161ac8fd0bb5058db82c1c261d504696a1e12f4b03eb0967632885580ff81d808adf2f1dff7e32d131ba0 + HEAD_REF master + PATCHES pkgconfig.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/json-c/vcpkg.json b/externals/vcpkg/ports/json-c/vcpkg.json new file mode 100755 index 000000000..ff61b336e --- /dev/null +++ b/externals/vcpkg/ports/json-c/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "json-c", + "version-string": "2019-09-10", + "port-version": 2, + "description": "A JSON implementation in C", + "homepage": "https://github.com/json-c/json-c" +} diff --git a/externals/vcpkg/ports/json-dto/portfile.cmake b/externals/vcpkg/ports/json-dto/portfile.cmake new file mode 100755 index 000000000..133fcd706 --- /dev/null +++ b/externals/vcpkg/ports/json-dto/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO stiffstream/json_dto + REF 9a08aaab6caee28300043c96e1ad3e6700f0f8fc # v.0.3.1 + SHA512 09ca1072a3de2cc5c5ab6eeaa1b82014dcc6139992da84558e77fe4bfa42210ff9f7fa6ee7d7e6b2d4ac15fd7ae6286a6a56d8a72cce75fc73b91755bb831864 +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH}/dev + OPTIONS + -DJSON_DTO_INSTALL=ON + -DJSON_DTO_TEST=OFF + -DJSON_DTO_SAMPLE=OFF + -DJSON_DTO_INSTALL_SAMPLES=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/json-dto) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + diff --git a/externals/vcpkg/ports/json-dto/vcpkg.json b/externals/vcpkg/ports/json-dto/vcpkg.json new file mode 100755 index 000000000..6c91808bc --- /dev/null +++ b/externals/vcpkg/ports/json-dto/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "json-dto", + "version": "0.3.1", + "description": "A small header-only library for converting data between json representation and c++ structs.", + "homepage": "https://github.com/Stiffstream/json_dto", + "license": "BSD-3-Clause", + "dependencies": [ + "rapidjson", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/json-schema-validator/cmake-find-package.patch b/externals/vcpkg/ports/json-schema-validator/cmake-find-package.patch new file mode 100755 index 000000000..995ae06b0 --- /dev/null +++ b/externals/vcpkg/ports/json-schema-validator/cmake-find-package.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c4cc218..ff2b706 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,8 @@ cmake_minimum_required(VERSION 3.2) + option(BUILD_TESTS "Build tests" ON) + option(BUILD_EXAMPLES "Build examples" ON) + ++find_package(nlohmann_json CONFIG REQUIRED) ++ + # the library + add_library(nlohmann_json_schema_validator + src/json-schema-draft7.json.cpp +@@ -34,6 +36,13 @@ set_target_properties(nlohmann_json_schema_validator + # because of the dependency to nlohmann_json. + set(JSON_VALIDATOR_INSTALL ON) + ++target_link_libraries( ++ nlohmann_json_schema_validator ++ PUBLIC ++ nlohmann_json ++ nlohmann_json::nlohmann_json) ++ ++if(0) + # here we decice how nlohmann::json is found and used to build this project + + # first, check whether a nlohmann_json::nlohmann_json target exists already +@@ -92,7 +101,7 @@ else() + set(nlohmann_json_DIR ${JSON_HPP}) + endif() + endif() +- ++endif() + if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR + "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + target_compile_options(nlohmann_json_schema_validator diff --git a/externals/vcpkg/ports/json-schema-validator/fix-ambiguous-assignment.patch b/externals/vcpkg/ports/json-schema-validator/fix-ambiguous-assignment.patch new file mode 100755 index 000000000..3e655b485 --- /dev/null +++ b/externals/vcpkg/ports/json-schema-validator/fix-ambiguous-assignment.patch @@ -0,0 +1,13 @@ +diff --git a/src/json-validator.cpp b/src/json-validator.cpp +index f16f3ef..1f7b615 100644 +--- a/src/json-validator.cpp ++++ b/src/json-validator.cpp +@@ -663,7 +663,7 @@ public: + #ifndef NO_STD_REGEX + attr = sch.find("pattern"); + if (attr != sch.end()) { +- patternString_ = attr.value(); ++ patternString_ = attr.value().get(); + pattern_ = {true, REGEX_NAMESPACE::regex(attr.value().get(), + REGEX_NAMESPACE::regex::ECMAScript)}; + sch.erase(attr); diff --git a/externals/vcpkg/ports/json-schema-validator/forward-find-package.patch b/externals/vcpkg/ports/json-schema-validator/forward-find-package.patch new file mode 100755 index 000000000..e5ddde525 --- /dev/null +++ b/externals/vcpkg/ports/json-schema-validator/forward-find-package.patch @@ -0,0 +1,14 @@ +diff --git a/nlohmann_json_schema_validatorConfig.cmake.in b/nlohmann_json_schema_validatorConfig.cmake.in +index 6ee0df2..e0315fa 100644 +--- a/nlohmann_json_schema_validatorConfig.cmake.in ++++ b/nlohmann_json_schema_validatorConfig.cmake.in +@@ -7,6 +7,9 @@ + get_filename_component(NLOHMANN_JSON_SCHEMA_VALIDATOR_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) + set(NLOHMANN_JSON_SCHEMA_VALIDATOR_INCLUDE_DIRS @CONF_INCLUDE_DIRS@) + ++include(CMakeFindDependencyMacro) ++find_dependency(nlohmann_json) ++ + # Our library dependencies (contains definitions for IMPORTED targets) + if(NOT TARGET json-schema-validator) + include("${NLOHMANN_JSON_SCHEMA_VALIDATOR_CMAKE_DIR}/nlohmann_json_schema_validatorTargets.cmake") diff --git a/externals/vcpkg/ports/json-schema-validator/portfile.cmake b/externals/vcpkg/ports/json-schema-validator/portfile.cmake new file mode 100755 index 000000000..941ec5372 --- /dev/null +++ b/externals/vcpkg/ports/json-schema-validator/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO pboettch/json-schema-validator + REF 27fc1d094503623dfe39365ba82581507524545c + SHA512 4fd05087743f43871586a53d119acd1a19d0bdec8a5620f62b6eee7a926d285842e8439127eec52eeb11069c92b8d9af28558897d48e2422ecafca39d9f23cdb + HEAD_REF master + PATCHES + fix-ambiguous-assignment.patch + cmake-find-package.patch + forward-find-package.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTS=OFF + -DBUILD_EXAMPLES=OFF +) + +vcpkg_install_cmake() + +set(PKG_NAME "nlohmann_json_schema_validator") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PKG_NAME} TARGET_PATH share/${PKG_NAME}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + diff --git a/externals/vcpkg/ports/json-schema-validator/usage b/externals/vcpkg/ports/json-schema-validator/usage new file mode 100755 index 000000000..3493d3808 --- /dev/null +++ b/externals/vcpkg/ports/json-schema-validator/usage @@ -0,0 +1,4 @@ +The package json-schema-validator provides CMake integration: + + find_package(nlohmann_json_schema_validator REQUIRED) + target_link_libraries(main PRIVATE nlohmann_json_schema_validator) diff --git a/externals/vcpkg/ports/json-schema-validator/vcpkg.json b/externals/vcpkg/ports/json-schema-validator/vcpkg.json new file mode 100755 index 000000000..387afe109 --- /dev/null +++ b/externals/vcpkg/ports/json-schema-validator/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "json-schema-validator", + "version-string": "2.1.0", + "port-version": 1, + "description": "This is a C++ library for validating JSON documents based on a JSON Schema. This validator is based on nlohmann json library.", + "homepage": "https://github.com/pboettch/json-schema-validator", + "dependencies": [ + { + "name": "nlohmann-json", + "default-features": false + } + ] +} diff --git a/externals/vcpkg/ports/json-spirit/Fix-link-error-C1128.patch b/externals/vcpkg/ports/json-spirit/Fix-link-error-C1128.patch new file mode 100755 index 000000000..e676931cc --- /dev/null +++ b/externals/vcpkg/ports/json-spirit/Fix-link-error-C1128.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 24b1caf..2aac0b0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,7 +60,9 @@ endif() + + message(${CMAKE_INSTALL_INCLUDEDIR}) + +- ++if(MSVC) ++add_definitions(/bigobj) ++endif() + set(CPACK_PACKAGE_VERSION_MAJOR 4) + set(CPACK_PACKAGE_VERSION_MINOR 0) + set(CPACK_PACKAGE_VERSION_PATCH 8) diff --git a/externals/vcpkg/ports/json-spirit/dll-wins.patch b/externals/vcpkg/ports/json-spirit/dll-wins.patch new file mode 100755 index 000000000..18c60e580 --- /dev/null +++ b/externals/vcpkg/ports/json-spirit/dll-wins.patch @@ -0,0 +1,281 @@ +diff --git a/.travis.yml b/.travis.yml +index e5b56eb..87f2926 100644 +--- a/.travis.yml ++++ b/.travis.yml +@@ -14,4 +14,4 @@ script: + - cmake --build . --target all -- + + after_script: +- - ctest ++ - ctest +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fb24877..a10a49f 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,15 +60,17 @@ endif() + + message(${CMAKE_INSTALL_INCLUDEDIR}) + +- ++ + set(CPACK_PACKAGE_VERSION_MAJOR 4) + set(CPACK_PACKAGE_VERSION_MINOR 0) + set(CPACK_PACKAGE_VERSION_PATCH 8) + set(CPACK_PACKAGE_DESCRIPTION "A C++ JSON Parser/Generator Implemented with Boost Spirit") + include(CPack) +- ++ ++set(EXPORT_HEADERS ) + INSTALL( + FILES ++ json_spirit/json_spirit_global.h + json_spirit/json_spirit.h + json_spirit/json_spirit_error_position.h + json_spirit/json_spirit_reader.h +@@ -80,4 +82,4 @@ INSTALL( + json_spirit/json_spirit_writer_template.h + json_spirit/json_spirit_writer_options.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/json_spirit) +- ++ +diff --git a/json_spirit/CMakeLists.txt b/json_spirit/CMakeLists.txt +index 23da64c..10d4e2b 100755 +--- a/json_spirit/CMakeLists.txt ++++ b/json_spirit/CMakeLists.txt +@@ -15,13 +15,19 @@ SET(JSON_SPIRIT_SRCS + FIND_PACKAGE(Boost 1.34 REQUIRED) + INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR}) + +- ++ + OPTION(BUILD_STATIC_LIBS "Build static libraries" OFF) + + if(BUILD_STATIC_LIBS) + ADD_LIBRARY(json_spirit STATIC ${JSON_SPIRIT_SRCS}) +- install(TARGETS json_spirit ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ install(TARGETS json_spirit ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + else(BUILD_STATIC_LIBS) + ADD_LIBRARY(json_spirit SHARED ${JSON_SPIRIT_SRCS}) +- install(TARGETS json_spirit LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ if(WIN32) ++ install(TARGETS json_spirit RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ install(TARGETS json_spirit ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ else() ++ install(TARGETS json_spirit LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ endif() ++ + endif(BUILD_STATIC_LIBS) +diff --git a/json_spirit/json_spirit_global.h b/json_spirit/json_spirit_global.h +new file mode 100644 +index 0000000..07a7d2c +--- /dev/null ++++ b/json_spirit/json_spirit_global.h +@@ -0,0 +1,18 @@ ++#ifndef JSON_SPIRIT_GLOBAL_H ++#define JSON_SPIRIT_GLOBAL_H ++ ++#if (defined _WIN32) || (defined _WIN64) ++ #define DECL_EXPORT __declspec(dllexport) ++ #define DECL_IMPORT __declspec(dllimport) ++#else ++ #define DECL_EXPORT ++ #define DECL_IMPORT ++#endif ++ ++#if defined(json_spirit_EXPORTS) ++# define json_spirit_EXPORT DECL_EXPORT ++#else ++# define json_spirit_EXPORT DECL_IMPORT ++#endif ++ ++#endif +\ No newline at end of file +diff --git a/json_spirit/json_spirit_reader.h b/json_spirit/json_spirit_reader.h +index a6cfac7..50cc6f5 100755 +--- a/json_spirit/json_spirit_reader.h ++++ b/json_spirit/json_spirit_reader.h +@@ -11,6 +11,7 @@ + # pragma once + #endif + ++#include "json_spirit_global.h" + #include "json_spirit_value.h" + #include "json_spirit_error_position.h" + #include +@@ -20,43 +21,43 @@ namespace json_spirit + // functions to reads a JSON values + + #ifdef JSON_SPIRIT_VALUE_ENABLED +- bool read( const std::string& s, Value& value ); +- bool read( std::istream& is, Value& value ); +- bool read( std::string::const_iterator& begin, std::string::const_iterator end, Value& value ); ++ json_spirit_EXPORT bool read( const std::string& s, Value& value ); ++ json_spirit_EXPORT bool read( std::istream& is, Value& value ); ++ json_spirit_EXPORT bool read( std::string::const_iterator& begin, std::string::const_iterator end, Value& value ); + +- void read_or_throw( const std::string& s, Value& value ); +- void read_or_throw( std::istream& is, Value& value ); +- void read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, Value& value ); ++ json_spirit_EXPORT void read_or_throw( const std::string& s, Value& value ); ++ json_spirit_EXPORT void read_or_throw( std::istream& is, Value& value ); ++ json_spirit_EXPORT void read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, Value& value ); + #endif + + #if defined( JSON_SPIRIT_WVALUE_ENABLED ) && !defined( BOOST_NO_STD_WSTRING ) +- bool read( const std::wstring& s, wValue& value ); +- bool read( std::wistream& is, wValue& value ); +- bool read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value ); ++ json_spirit_EXPORT bool read( const std::wstring& s, wValue& value ); ++ json_spirit_EXPORT bool read( std::wistream& is, wValue& value ); ++ json_spirit_EXPORT bool read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value ); + +- void read_or_throw( const std::wstring& s, wValue& value ); +- void read_or_throw( std::wistream& is, wValue& value ); +- void read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value ); ++ json_spirit_EXPORT void read_or_throw( const std::wstring& s, wValue& value ); ++ json_spirit_EXPORT void read_or_throw( std::wistream& is, wValue& value ); ++ json_spirit_EXPORT void read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value ); + #endif + + #ifdef JSON_SPIRIT_MVALUE_ENABLED +- bool read( const std::string& s, mValue& value ); +- bool read( std::istream& is, mValue& value ); +- bool read( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value ); ++ json_spirit_EXPORT bool read( const std::string& s, mValue& value ); ++ json_spirit_EXPORT bool read( std::istream& is, mValue& value ); ++ json_spirit_EXPORT bool read( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value ); + +- void read_or_throw( const std::string& s, mValue& value ); +- void read_or_throw( std::istream& is, mValue& value ); +- void read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value ); ++ json_spirit_EXPORT void read_or_throw( const std::string& s, mValue& value ); ++ json_spirit_EXPORT void read_or_throw( std::istream& is, mValue& value ); ++ json_spirit_EXPORT void read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value ); + #endif + + #if defined( JSON_SPIRIT_WMVALUE_ENABLED ) && !defined( BOOST_NO_STD_WSTRING ) +- bool read( const std::wstring& s, wmValue& value ); +- bool read( std::wistream& is, wmValue& value ); +- bool read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value ); ++ json_spirit_EXPORT bool read( const std::wstring& s, wmValue& value ); ++ json_spirit_EXPORT bool read( std::wistream& is, wmValue& value ); ++ json_spirit_EXPORT bool read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value ); + +- void read_or_throw( const std::wstring& s, wmValue& value ); +- void read_or_throw( std::wistream& is, wmValue& value ); +- void read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value ); ++ json_spirit_EXPORT void read_or_throw( const std::wstring& s, wmValue& value ); ++ json_spirit_EXPORT void read_or_throw( std::wistream& is, wmValue& value ); ++ json_spirit_EXPORT void read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value ); + #endif + } + +diff --git a/json_spirit/json_spirit_writer.h b/json_spirit/json_spirit_writer.h +index 2722780..f60dc07 100755 +--- a/json_spirit/json_spirit_writer.h ++++ b/json_spirit/json_spirit_writer.h +@@ -11,6 +11,7 @@ + # pragma once + #endif + ++#include "json_spirit_global.h" + #include "json_spirit_value.h" + #include "json_spirit_writer_options.h" + #include +@@ -20,44 +21,44 @@ namespace json_spirit + // these functions to convert JSON Values to text + + #ifdef JSON_SPIRIT_VALUE_ENABLED +- void write( const Value& value, std::ostream& os, unsigned int options = 0 ); +- std::string write( const Value& value, unsigned int options = 0 ); ++ json_spirit_EXPORT void write( const Value& value, std::ostream& os, unsigned int options = 0 ); ++ json_spirit_EXPORT std::string write( const Value& value, unsigned int options = 0 ); + #endif + + #ifdef JSON_SPIRIT_MVALUE_ENABLED +- void write( const mValue& value, std::ostream& os, unsigned int options = 0 ); +- std::string write( const mValue& value, unsigned int options = 0 ); ++ json_spirit_EXPORT void write( const mValue& value, std::ostream& os, unsigned int options = 0 ); ++ json_spirit_EXPORT std::string write( const mValue& value, unsigned int options = 0 ); + #endif + + #if defined( JSON_SPIRIT_WVALUE_ENABLED ) && !defined( BOOST_NO_STD_WSTRING ) +- void write( const wValue& value, std::wostream& os, unsigned int options = 0 ); +- std::wstring write( const wValue& value, unsigned int options = 0 ); ++ json_spirit_EXPORT void write( const wValue& value, std::wostream& os, unsigned int options = 0 ); ++ json_spirit_EXPORT std::wstring write( const wValue& value, unsigned int options = 0 ); + #endif + + #if defined( JSON_SPIRIT_WMVALUE_ENABLED ) && !defined( BOOST_NO_STD_WSTRING ) +- void write( const wmValue& value, std::wostream& os, unsigned int options = 0 ); +- std::wstring write( const wmValue& value, unsigned int options = 0 ); ++ json_spirit_EXPORT void write( const wmValue& value, std::wostream& os, unsigned int options = 0 ); ++ json_spirit_EXPORT std::wstring write( const wmValue& value, unsigned int options = 0 ); + #endif + + // these "formatted" versions of the "write" functions are the equivalent of the above functions + // with option "pretty_print" + + #ifdef JSON_SPIRIT_VALUE_ENABLED +- void write_formatted( const Value& value, std::ostream& os ); +- std::string write_formatted( const Value& value ); ++ json_spirit_EXPORT void write_formatted( const Value& value, std::ostream& os ); ++ json_spirit_EXPORT std::string write_formatted( const Value& value ); + #endif + #ifdef JSON_SPIRIT_MVALUE_ENABLED +- void write_formatted( const mValue& value, std::ostream& os ); +- std::string write_formatted( const mValue& value ); ++ json_spirit_EXPORT void write_formatted( const mValue& value, std::ostream& os ); ++ json_spirit_EXPORT std::string write_formatted( const mValue& value ); + #endif + + #if defined( JSON_SPIRIT_WVALUE_ENABLED ) && !defined( BOOST_NO_STD_WSTRING ) +- void write_formatted( const wValue& value, std::wostream& os ); +- std::wstring write_formatted( const wValue& value ); ++ json_spirit_EXPORT void write_formatted( const wValue& value, std::wostream& os ); ++ json_spirit_EXPORT std::wstring write_formatted( const wValue& value ); + #endif + #if defined( JSON_SPIRIT_WMVALUE_ENABLED ) && !defined( BOOST_NO_STD_WSTRING ) +- void write_formatted( const wmValue& value, std::wostream& os ); +- std::wstring write_formatted( const wmValue& value ); ++ json_spirit_EXPORT void write_formatted( const wmValue& value, std::wostream& os ); ++ json_spirit_EXPORT std::wstring write_formatted( const wmValue& value ); + #endif + } + +diff --git a/json_test/json_spirit_value_test.cpp b/json_test/json_spirit_value_test.cpp +index e055dae..faab022 100755 +--- a/json_test/json_spirit_value_test.cpp ++++ b/json_test/json_spirit_value_test.cpp +@@ -381,9 +381,15 @@ namespace + Container_constructor_runner() + { + vector< double > vd = list_of( 1.2 )( 1.3 ); test_container_constructor( vd ); ++ #if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900) ++ vector< int > vi = { 1 }; test_container_constructor( vi ); ++ vi = { 1, 2 }; test_container_constructor( vi ); ++ vi = { 1, 2, 3 }; test_container_constructor( vi ); ++ #else + vector< int > vi = list_of( 1 ); test_container_constructor( vi ); + vi = list_of( 1 )( 2 ); test_container_constructor( vi ); + vi = list_of( 1 )( 2 )( 3 ); test_container_constructor( vi ); ++ #endif + list< double > ld = list_of( 1.2 )( 1.3 ); test_container_constructor( ld ); + list< int > li = list_of( 1 ); test_container_constructor( li ); + li = list_of( 1 )( 2 ); test_container_constructor( li ); +@@ -447,9 +453,15 @@ namespace + } + + vector< double > vd = list_of( 1.2 )( 1.3 ); test_variant_array_constructor< double > ( vd ); ++ #if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900) ++ vector< int > vi = { 1 }; test_variant_array_constructor< int >( vi ); ++ vi = { 1, 2 }; test_variant_array_constructor< int >( vi ); ++ vi = { 1, 2, 3 }; test_variant_array_constructor< int >( vi ); ++ #else + vector< int > vi = list_of( 1 ); test_variant_array_constructor< int >( vi ); + vi = list_of( 1 )( 2 ); test_variant_array_constructor< int >( vi ); + vi = list_of( 1 )( 2 )( 3 ); test_variant_array_constructor< int >( vi ); ++ #endif + list< double > ld = list_of( 1.2 )( 1.3 ); test_variant_array_constructor< double >( ld ); + list< int > li = list_of( 1 ); test_variant_array_constructor< int >( li ); + li = list_of( 1 )( 2 ); test_variant_array_constructor< int >( li ); diff --git a/externals/vcpkg/ports/json-spirit/portfile.cmake b/externals/vcpkg/ports/json-spirit/portfile.cmake new file mode 100755 index 000000000..658cb92a4 --- /dev/null +++ b/externals/vcpkg/ports/json-spirit/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO png85/json_spirit + REF 5e16cca59b31d8beda0f07e3917ce11dcd43b3db + SHA512 6ac0f15726391c9003e516213535c8d30e98b6c33bca0b03e9bf38e7085824bfc6cfaab267b1dfccbfcc567638d26f722d7e331f4e3b60d3acd5c717cb1fafcc + HEAD_REF master + PATCHES + dll-wins.patch + Fix-link-error-C1128.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DBUILD_STATIC_LIBS=off -DJSON_SPIRIT_DEMOS=off -DJSON_SPIRIT_TESTS=off) + +vcpkg_install_cmake() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/json-spirit RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/json-spirit/vcpkg.json b/externals/vcpkg/ports/json-spirit/vcpkg.json new file mode 100755 index 000000000..35517305e --- /dev/null +++ b/externals/vcpkg/ports/json-spirit/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "json-spirit", + "version-string": "4.1.0", + "port-version": 2, + "description": "json parser using boost library", + "dependencies": [ + "boost-config", + "boost-integer", + "boost-smart-ptr", + "boost-spirit", + "boost-variant" + ] +} diff --git a/externals/vcpkg/ports/json11/destination.patch b/externals/vcpkg/ports/json11/destination.patch new file mode 100755 index 000000000..6d1630329 --- /dev/null +++ b/externals/vcpkg/ports/json11/destination.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 819c36f..847489e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,6 +52,6 @@ if (JSON11_BUILD_TESTS) + target_link_libraries(json11_test json11) + endif() + +-install(TARGETS json11 DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE}) +-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/json11.hpp" DESTINATION include/${CMAKE_LIBRARY_ARCHITECTURE}) +-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/json11.pc" DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig) ++install(TARGETS json11 DESTINATION lib) ++install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/json11.hpp" DESTINATION include) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/json11.pc" DESTINATION lib/pkgconfig) diff --git a/externals/vcpkg/ports/json11/json11-config.cmake b/externals/vcpkg/ports/json11/json11-config.cmake new file mode 100755 index 000000000..0bc3bb27c --- /dev/null +++ b/externals/vcpkg/ports/json11/json11-config.cmake @@ -0,0 +1,25 @@ +get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) + +if(NOT JSON11_FIND_COMPONENTS) + set(JSON11_FIND_COMPONENTS json11 json11) + if(JSON11_FIND_REQUIRED) + set(JSON11_FIND_REQUIRED_json11 TRUE) + endif() + + set(JSON11_FOUND TRUE) +endif() + +set(JSON11_INCLUDE_DIRS ${_DIR}/../../include) +set(JSON11_LIBRARIES) +if (EXISTS ${_DIR}/../../lib/libjson11.a) + list(APPEND JSON11_LIBRARIES optimized ${_DIR}/../../lib/libjson11.a) +endif() +if (EXISTS ${_DIR}/../../debug/lib/libjson11.a) + list(APPEND JSON11_LIBRARIES debug ${_DIR}/../../debug/lib/libjson11.a) +endif() +if (EXISTS ${_DIR}/../../lib/json11.lib) + list(APPEND JSON11_LIBRARIES optimized ${_DIR}/../../lib/json11.lib) +endif() +if (EXISTS ${_DIR}/../../debug/lib/json11.lib) + list(APPEND JSON11_LIBRARIES debug ${_DIR}/../../debug/lib/json11.lib) +endif() diff --git a/externals/vcpkg/ports/json11/portfile.cmake b/externals/vcpkg/ports/json11/portfile.cmake new file mode 100755 index 000000000..3ff8b0f29 --- /dev/null +++ b/externals/vcpkg/ports/json11/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO dropbox/json11 + REF ec4e45219af1d7cde3d58b49ed762376fccf1ace + SHA512 2129e048d8dee027dc1ba789d9901e017b7d698465e15236802ef68639161e1cc7c8665d5f50079333801717fd41ffbe2cb90fa2165b9a85629e8ced8f2b3cd8 + HEAD_REF master + PATCHES destination.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DJSON11_BUILD_TESTS:BOOL=OFF +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(INSTALL ${CURRENT_PORT_DIR}/json11-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/json11) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/json11) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/json11/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/json11/copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/json11/vcpkg.json b/externals/vcpkg/ports/json11/vcpkg.json new file mode 100755 index 000000000..70fb4f209 --- /dev/null +++ b/externals/vcpkg/ports/json11/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "json11", + "version-string": "2017-06-20", + "port-version": 4, + "description": "json11 is a tiny JSON library for C++11, providing JSON parsing and serialization." +} diff --git a/externals/vcpkg/ports/json5-parser/00001-fix-build.patch b/externals/vcpkg/ports/json5-parser/00001-fix-build.patch new file mode 100755 index 000000000..b67f7c47a --- /dev/null +++ b/externals/vcpkg/ports/json5-parser/00001-fix-build.patch @@ -0,0 +1,27 @@ +diff --git a/json5_parser/CMakeLists.txt b/json5_parser/CMakeLists.txt +index e83fb38..c09cae4 100644 +--- a/json5_parser/CMakeLists.txt ++++ b/json5_parser/CMakeLists.txt +@@ -15,3 +15,22 @@ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR}) + + ADD_LIBRARY(json5_parser STATIC ${JSON_SPIRIT_SRCS}) + ++if(MSVC) ++ target_compile_options(json5_parser PRIVATE "/bigobj") ++endif() ++ ++target_include_directories(json5_parser PUBLIC $) ++ ++install(TARGETS json5_parser EXPORT json5-parser-config ++ RUNTIME DESTINATION bin ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++) ++install(EXPORT json5-parser-config DESTINATION share/cmake/json5-parser) ++ ++file(GLOB HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} json5_parser*.h) ++foreach (HEADER ${HEADERS} ) ++ get_filename_component(HEADER_DIR ${HEADER} DIRECTORY) ++ install(FILES ${HEADER} DESTINATION include/${HEADER_DIR}) ++endforeach() ++ diff --git a/externals/vcpkg/ports/json5-parser/portfile.cmake b/externals/vcpkg/ports/json5-parser/portfile.cmake new file mode 100755 index 000000000..79e4d1afc --- /dev/null +++ b/externals/vcpkg/ports/json5-parser/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Caltech-IPAC/json5_parser + REF 580bfe30c5ee5e06a0f536d7bddb75c07a29eda6 # 1.0.0 + SHA512 25cdbc02ed2e3b05f0644c3398230ab82ede093ed6f7d8f140a9810509dd05feab1187d62fc38818725a92c47029fe3dc5ecfdbe14e1e0a2ef314e925b369d59 + HEAD_REF master + PATCHES 00001-fix-build.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/json5_parser + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/json5-parser) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/json5-parser/vcpkg.json b/externals/vcpkg/ports/json5-parser/vcpkg.json new file mode 100755 index 000000000..13c1e6bb3 --- /dev/null +++ b/externals/vcpkg/ports/json5-parser/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "json5-parser", + "version-string": "1.0.0", + "port-version": 3, + "description": "An enhancement of the JSON Spirit C++ library to understand json5.", + "homepage": "https://github.com/Caltech-IPAC/json5_parser", + "dependencies": [ + "boost-spirit" + ] +} diff --git a/externals/vcpkg/ports/jsoncons/portfile.cmake b/externals/vcpkg/ports/jsoncons/portfile.cmake new file mode 100755 index 000000000..7e323e4f8 --- /dev/null +++ b/externals/vcpkg/ports/jsoncons/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO danielaparker/jsoncons + REF dff2d7d64ca03de27e79347d6473483f95c066d3 # v0.168.7 + SHA512 e388dbc5f9ee0f8fc36bda46f9a68210c2467a8e3f91ae6b57b0e0bc78b732287cb3e36ffa5ee5147f434deeabf3ea4456897a89b868befeb757df88297ec002 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DJSONCONS_BUILD_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/jsoncons/vcpkg.json b/externals/vcpkg/ports/jsoncons/vcpkg.json new file mode 100755 index 000000000..8fd4ab51d --- /dev/null +++ b/externals/vcpkg/ports/jsoncons/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "jsoncons", + "version": "0.168.7", + "description": "A C++, header-only library for constructing JSON and JSON-like text and binary data formats, with JSON Pointer, JSON Patch, JSON Schema, JSONPath, JMESPath, CSV, MessagePack, CBOR, BSON, UBJSON", + "homepage": "https://github.com/danielaparker/jsoncons", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/jsoncpp/portfile.cmake b/externals/vcpkg/ports/jsoncpp/portfile.cmake new file mode 100755 index 000000000..84c1a5461 --- /dev/null +++ b/externals/vcpkg/ports/jsoncpp/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO open-source-parsers/jsoncpp + REF 1.9.5 + SHA512 1d06e044759b1e1a4cc4960189dd7e001a0a4389d7239a6d59295af995a553518e4e0337b4b4b817e70da5d9731a4c98655af90791b6287870b5ff8d73ad8873 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" JSONCPP_STATIC) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DJSONCPP_WITH_CMAKE_PACKAGE=ON + -DBUILD_STATIC_LIBS=${JSONCPP_STATIC} + -DJSONCPP_STATIC_WINDOWS_RUNTIME=${STATIC_CRT} + -DJSONCPP_WITH_PKGCONFIG_SUPPORT=OFF + -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF + -DJSONCPP_WITH_TESTS=OFF + -DJSONCPP_WITH_EXAMPLE=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/jsoncpp) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/jsoncpp/vcpkg.json b/externals/vcpkg/ports/jsoncpp/vcpkg.json new file mode 100755 index 000000000..f9daea0f0 --- /dev/null +++ b/externals/vcpkg/ports/jsoncpp/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "jsoncpp", + "version": "1.9.5", + "description": "jsoncpp is an implementation of a JSON reader and writer in C++. JSON (JavaScript Object Notation) is a lightweight data-interchange format that it is easy to parse and redeable for human.", + "homepage": "https://github.com/open-source-parsers/jsoncpp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/jsonnet/0003-use-upstream-nlohmann-json.patch b/externals/vcpkg/ports/jsonnet/0003-use-upstream-nlohmann-json.patch new file mode 100755 index 000000000..a2e1105b7 --- /dev/null +++ b/externals/vcpkg/ports/jsonnet/0003-use-upstream-nlohmann-json.patch @@ -0,0 +1,13 @@ +diff --git a/core/vm.cpp b/core/vm.cpp +index 0cf06fa..d65a6d7 100644 +--- a/core/vm.cpp ++++ b/core/vm.cpp +@@ -23,7 +23,7 @@ limitations under the License. + + #include "desugarer.h" + #include "json.h" +-#include "json.hpp" ++#include "nlohmann/json.hpp" + #include "md5.h" + #include "parser.h" + #include "state.h" diff --git a/externals/vcpkg/ports/jsonnet/0004-incorporate-md5.patch b/externals/vcpkg/ports/jsonnet/0004-incorporate-md5.patch new file mode 100755 index 000000000..830fb8d98 --- /dev/null +++ b/externals/vcpkg/ports/jsonnet/0004-incorporate-md5.patch @@ -0,0 +1,41 @@ +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -15,7 +15,8 @@ set(LIBJSONNET_HEADERS + static_error.h + string_utils.h + unicode.h +- vm.h) ++ vm.h ++ ../third_party/md5/md5.h) + + set(LIBJSONNET_SOURCE + desugarer.cpp +@@ -26,12 +27,13 @@ set(LIBJSONNET_SOURCE + pass.cpp + static_analysis.cpp + string_utils.cpp +- vm.cpp) ++ vm.cpp ++ ../third_party/md5/md5.cpp) + + if (BUILD_SHARED_BINARIES) + add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) +-add_dependencies(libjsonnet md5 stdlib) +-target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json) ++add_dependencies(libjsonnet stdlib) ++target_link_libraries(libjsonnet nlohmann_json::nlohmann_json) + + file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/../include/libjsonnet.h JSONNET_VERSION_DEF + REGEX "[#]define[ \t]+LIB_JSONNET_VERSION[ \t]+") +@@ -54,8 +56,8 @@ endif() + if (BUILD_STATIC_LIBS) + # Static library for jsonnet command-line tool. + add_library(libjsonnet_static STATIC ${LIBJSONNET_SOURCE}) +- add_dependencies(libjsonnet_static md5 stdlib) +- target_link_libraries(libjsonnet_static md5 nlohmann_json::nlohmann_json) ++ add_dependencies(libjsonnet_static stdlib) ++ target_link_libraries(libjsonnet_static nlohmann_json::nlohmann_json) + set_target_properties(libjsonnet_static PROPERTIES OUTPUT_NAME jsonnet) + install(TARGETS libjsonnet_static DESTINATION "${CMAKE_INSTALL_LIBDIR}") + target_include_directories(libjsonnet_static INTERFACE diff --git a/externals/vcpkg/ports/jsonnet/001-enable-msvc.patch b/externals/vcpkg/ports/jsonnet/001-enable-msvc.patch new file mode 100755 index 000000000..d5ec55149 --- /dev/null +++ b/externals/vcpkg/ports/jsonnet/001-enable-msvc.patch @@ -0,0 +1,80 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 385ea82..ebd12b6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,6 +2,8 @@ + cmake_minimum_required(VERSION 2.8.7) + project(jsonnet C CXX) + ++add_definitions(-D_CRT_SECURE_NO_WARNINGS) ++ + include(ExternalProject) + include(GNUInstallDirs) + +@@ -33,6 +35,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${GLOBAL_OUTPUT_PATH}) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${GLOBAL_OUTPUT_PATH}) + + # Compiler flags. ++if (0) + if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" OR + ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") + set(OPT "-O3") +@@ -42,7 +45,7 @@ else() + # TODO: Windows support. + message(FATAL_ERROR "Compiler ${CMAKE_CXX_COMPILER_ID} not supported") + endif() +- ++endif() + set(CMAKE_CXX_STANDARD 11) + + +diff --git a/cmd/CMakeLists.txt b/cmd/CMakeLists.txt +index c032f02..d80d2a0 100644 +--- a/cmd/CMakeLists.txt ++++ b/cmd/CMakeLists.txt +@@ -13,5 +13,5 @@ if (BUILD_JSONNETFMT OR BUILD_TESTS) + add_dependencies(jsonnetfmt libjsonnet_for_binaries) + target_link_libraries(jsonnetfmt libjsonnet_for_binaries) + +- install(TARGETS jsonnetfmt DESTINATION "${CMAKE_INSTALL_BINDIR}") ++ install(TARGETS jsonnetfmt DESTINATION tools/jsonnet) + endif() +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -28,7 +28,7 @@ set(LIBJSONNET_SOURCE + string_utils.cpp + vm.cpp) + +-add_library(libjsonnet SHARED ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) ++add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) + add_dependencies(libjsonnet md5 stdlib) + target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json) + +@@ -46,7 +46,7 @@ set_target_properties(libjsonnet PROPERTIES OUTPUT_NAME jsonnet + PUBLIC_HEADER "${LIB_HEADER}") + install(TARGETS libjsonnet + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" +- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_BINDIR}" + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + target_include_directories(libjsonnet INTERFACE + $) +diff --git a/stdlib/CMakeLists.txt b/stdlib/CMakeLists.txt +index a481d9f..2f58d2f 100644 +--- a/stdlib/CMakeLists.txt ++++ b/stdlib/CMakeLists.txt +@@ -2,6 +2,7 @@ + + add_executable(to_c_array to_c_array.cpp) + ++if(0) + # Custom command that will only build stdlib when it changes. + add_custom_command( + OUTPUT ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h +@@ -13,3 +14,4 @@ add_custom_command( + # Standard library build target that libjsonnet can depend on. + add_custom_target(stdlib ALL + DEPENDS ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h) ++endif() +\ No newline at end of file diff --git a/externals/vcpkg/ports/jsonnet/002-fix-dependency-and-install.patch b/externals/vcpkg/ports/jsonnet/002-fix-dependency-and-install.patch new file mode 100755 index 000000000..51b63134b --- /dev/null +++ b/externals/vcpkg/ports/jsonnet/002-fix-dependency-and-install.patch @@ -0,0 +1,56 @@ +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -28,6 +28,7 @@ set(LIBJSONNET_SOURCE + string_utils.cpp + vm.cpp) + ++if (BUILD_SHARED_BINARIES) + add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) + add_dependencies(libjsonnet md5 stdlib) + target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json) +@@ -48,6 +49,7 @@ install(TARGETS libjsonnet + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + target_include_directories(libjsonnet INTERFACE + $) ++endif() + + if (BUILD_STATIC_LIBS) + # Static library for jsonnet command-line tool. +@@ -102,3 +104,5 @@ if (BUILD_TESTS) + add_test(jsonnet_test_snippet + ${GLOBAL_OUTPUT_PATH}/jsonnet -e ${TEST_SNIPPET}) + endif() ++ ++install(FILES ${LIB_HEADER} DESTINATION include) +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -8,9 +8,9 @@ set(LIBJSONNETPP_SOURCE + libjsonnet++.cpp + ) + ++if (BUILD_SHARED_BINARIES) + add_library(libjsonnet++ SHARED ${LIBJSONNETPP_HEADERS} ${LIBJSONNETPP_SOURCE}) +-add_dependencies(libjsonnet++ jsonnet) +-# target_link_libraries(libjsonnet libjsonnet) ++target_link_libraries(libjsonnet libjsonnet) + + # CMake prepends CMAKE_SHARED_LIBRARY_PREFIX to shared libraries, so without + # this step the output would be |liblibjsonnet|. +@@ -24,6 +24,7 @@ install(TARGETS libjsonnet++ + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + target_include_directories(libjsonnet++ INTERFACE + $) ++endif() + + if (BUILD_STATIC_LIBS) + # Static library for jsonnet command-line tool. +@@ -38,6 +39,7 @@ else() + add_library(libjsonnet++_for_binaries ALIAS libjsonnet++_static) + endif() + ++install(FILES ${LIBJSONNETPP_HEADERS} DESTINATION include) + # Tests + function(add_test_executablepp test_name) + if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/${test_name}.cpp) diff --git a/externals/vcpkg/ports/jsonnet/portfile.cmake b/externals/vcpkg/ports/jsonnet/portfile.cmake new file mode 100755 index 000000000..f7821c1b4 --- /dev/null +++ b/externals/vcpkg/ports/jsonnet/portfile.cmake @@ -0,0 +1,59 @@ +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/jsonnet + REF v0.17.0 + SHA512 D3EE6947163D8ABCED504FF37ECF365C0311164CBF243D4C635D34944F0831CA9FCE2470ACF00EB9A218F82A2E553B3F885DB9BD21BB9DCEFBD707FA0202925D + HEAD_REF master + PATCHES + 001-enable-msvc.patch + 002-fix-dependency-and-install.patch + 0003-use-upstream-nlohmann-json.patch + 0004-incorporate-md5.patch +) + +# see https://github.com/google/jsonnet/blob/v0.17.0/Makefile#L214 +if(VCPKG_TARGET_IS_WINDOWS) + find_program(PWSH_PATH pwsh) + vcpkg_execute_required_process( + COMMAND "${PWSH_PATH}" -Command "((Get-Content -AsByteStream \"${SOURCE_PATH}/stdlib/std.jsonnet\") -join ',') + ',0' | Out-File -Encoding Ascii \"${SOURCE_PATH}/core/std.jsonnet.h\"" + WORKING_DIRECTORY "${SOURCE_PATH}" + LOGNAME "std.jsonnet" + ) +else() + vcpkg_execute_required_process( + COMMAND bash -c "((od -v -Anone -t u1 \"${SOURCE_PATH}/stdlib/std.jsonnet\" | tr ' ' '\\n' | grep -v '^$' | tr '\\n' ',' ) && echo '0') > \"${SOURCE_PATH}/core/std.jsonnet.h\"" + WORKING_DIRECTORY "${SOURCE_PATH}" + LOGNAME "std.jsonnet" + ) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(BUILD_SHARED ON) + set(BUILD_STATIC OFF) +else() + set(BUILD_SHARED OFF) + set(BUILD_STATIC ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_SHARED_BINARIES=${BUILD_SHARED} + -DBUILD_STATIC_LIBS=${BUILD_STATIC} + -DBUILD_JSONNET=OFF + -DBUILD_JSONNETFMT=OFF + -DBUILD_TESTS=OFF + -DUSE_SYSTEM_JSON=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/jsonnet") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/jsonnet/vcpkg.json b/externals/vcpkg/ports/jsonnet/vcpkg.json new file mode 100755 index 000000000..92984b1dd --- /dev/null +++ b/externals/vcpkg/ports/jsonnet/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "jsonnet", + "version": "0.17.0", + "description": "Jsonnet - The data templating language", + "homepage": "https://github.com/google/jsonnet", + "supports": "!(windows & !static)", + "dependencies": [ + "nlohmann-json", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/jwt-cpp/portfile.cmake b/externals/vcpkg/ports/jwt-cpp/portfile.cmake new file mode 100755 index 000000000..904acd0d1 --- /dev/null +++ b/externals/vcpkg/ports/jwt-cpp/portfile.cmake @@ -0,0 +1,12 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Thalhammer/jwt-cpp + REF 4a537e969891dde542ad8b1a4a214955a83be29f # v0.6.0 + SHA512 eeeb6adb7f94b699a020b5622b9dbb6c677d92779b57bfb2298b331a5cf69d9112d0b123f0c2ca235ecd96df6d32fcf44e85e144fa414aeff8fd67e3b87576d2 + HEAD_REF master +) + +# Copy the header files +file(GLOB HEADER_FILES ${SOURCE_PATH}/include/jwt-cpp/*) +file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/jwt-cpp) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/jwt-cpp/vcpkg.json b/externals/vcpkg/ports/jwt-cpp/vcpkg.json new file mode 100755 index 000000000..254d8564f --- /dev/null +++ b/externals/vcpkg/ports/jwt-cpp/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "jwt-cpp", + "version-semver": "0.6.0", + "description": "A header only library for creating and validating json web tokens in c++", + "homepage": "https://github.com/Thalhammer/jwt-cpp", + "license": "MIT", + "dependencies": [ + "picojson" + ] +} diff --git a/externals/vcpkg/ports/jxrlib/CMakeLists.txt b/externals/vcpkg/ports/jxrlib/CMakeLists.txt new file mode 100755 index 000000000..7a73e3cba --- /dev/null +++ b/externals/vcpkg/ports/jxrlib/CMakeLists.txt @@ -0,0 +1,107 @@ +# Copyright Mathieu Malaterre +# BSD (Same as jxrlib) +# Based on https://jxrlib.codeplex.com/discussions/440294 +# and modified for vcpkg packaging +cmake_minimum_required(VERSION 2.8) +project(jxrlib C) + +# Need shared libs for ABI +option(BUILD_SHARED_LIBS "Build shared libraries" ON) + +# Add a debug postfix +set(CMAKE_DEBUG_POSTFIX "d") + +# helper macro to preserve original Makefile convention +macro(JXR_MAKE_OBJ SET_NAME) + foreach(src ${SRC_${SET_NAME}}) + list(APPEND OBJ_${SET_NAME} ${DIR_${SET_NAME}}/${src}) + endforeach() +endmacro() + +if(NOT MSVC) + add_definitions(-D__ANSI__) + add_compile_options(-Wno-error=implicit-function-declaration) +endif() + +include(TestBigEndian) +test_big_endian(ISBIGENDIAN) +if(ISBIGENDIAN) + set(DEF_ENDIAN _BIG__ENDIAN_) +endif() + +set(DIR_SYS image/sys) +set(DIR_DEC image/decode) +set(DIR_ENC image/encode) + +set(DIR_GLUE jxrgluelib) +set(DIR_TEST jxrtestlib) +set(DIR_EXEC jxrencoderdecoder) + +if(NOT JXRLIB_INSTALL_BIN_DIR) + set(JXRLIB_INSTALL_BIN_DIR "bin") +endif() + +if(NOT JXRLIB_INSTALL_LIB_DIR) + set(JXRLIB_INSTALL_LIB_DIR "lib") +endif() + +if(NOT JXRLIB_INSTALL_INCLUDE_DIR) + set(JXRLIB_INSTALL_INCLUDE_DIR "include/jxrlib") +endif() + +include_directories( + common/include + ${DIR_SYS} + ${DIR_GLUE} + ${DIR_TEST} +) + + +# JPEG-XR +set(SRC_SYS adapthuff.c image.c strcodec.c strPredQuant.c strTransform.c perfTimerANSI.c) +JXR_MAKE_OBJ(SYS) +set(SRC_DEC decode.c postprocess.c segdec.c strdec.c strInvTransform.c strPredQuantDec.c JXRTranscode.c) +JXR_MAKE_OBJ(DEC) +set(SRC_ENC encode.c segenc.c strenc.c strFwdTransform.c strPredQuantEnc.c) +JXR_MAKE_OBJ(ENC) + +add_library(jpegxr ${OBJ_ENC} ${OBJ_DEC} ${OBJ_SYS}) +set_property(TARGET jpegxr + PROPERTY COMPILE_DEFINITIONS DISABLE_PERF_MEASUREMENT ${DEF_ENDIAN} +) +set_property(TARGET jpegxr PROPERTY LINK_INTERFACE_LIBRARIES "") +install(TARGETS jpegxr + EXPORT JXRLibTargets + RUNTIME DESTINATION ${JXRLIB_INSTALL_BIN_DIR} + LIBRARY DESTINATION ${JXRLIB_INSTALL_LIB_DIR} + ARCHIVE DESTINATION ${JXRLIB_INSTALL_LIB_DIR} +) + +# JXR-GLUE +set(SRC_GLUE JXRGlue.c JXRMeta.c JXRGluePFC.c JXRGlueJxr.c) +JXR_MAKE_OBJ(GLUE) +set(SRC_TEST JXRTest.c JXRTestBmp.c JXRTestHdr.c JXRTestPnm.c JXRTestTif.c JXRTestYUV.c) +JXR_MAKE_OBJ(TEST) + +add_library(jxrglue ${OBJ_GLUE} ${OBJ_TEST}) +set_property(TARGET jxrglue + PROPERTY COMPILE_DEFINITIONS DISABLE_PERF_MEASUREMENT ${DEF_ENDIAN} +) +set_property(TARGET jxrglue PROPERTY LINK_INTERFACE_LIBRARIES "") +install(TARGETS jxrglue + EXPORT JXRLibTargets + RUNTIME DESTINATION ${JXRLIB_INSTALL_BIN_DIR} + LIBRARY DESTINATION ${JXRLIB_INSTALL_LIB_DIR} + ARCHIVE DESTINATION ${JXRLIB_INSTALL_LIB_DIR} +) + +target_link_libraries(jxrglue jpegxr) + +# install rules +install(FILES jxrgluelib/JXRGlue.h jxrgluelib/JXRMeta.h jxrtestlib/JXRTest.h + image/sys/windowsmediaphoto.h + DESTINATION ${JXRLIB_INSTALL_INCLUDE_DIR} COMPONENT Headers +) +install(DIRECTORY common/include/ DESTINATION ${JXRLIB_INSTALL_INCLUDE_DIR} + FILES_MATCHING PATTERN "*.h" +) diff --git a/externals/vcpkg/ports/jxrlib/FindJXR.cmake b/externals/vcpkg/ports/jxrlib/FindJXR.cmake new file mode 100755 index 000000000..79924d21d --- /dev/null +++ b/externals/vcpkg/ports/jxrlib/FindJXR.cmake @@ -0,0 +1,28 @@ +# - Find JXR +# Find the JXR library +# This module defines +# JXR_INCLUDE_DIRS, where to find jxrlib/JXRGlue.h +# JXR_LIBRARIES, the libraries needed to use JXR +# + +find_path(JXR_INCLUDE_DIRS + NAMES JXRGlue.h + PATH_SUFFIXES jxrlib +) +mark_as_advanced(JXR_INCLUDE_DIRS) + +include(SelectLibraryConfigurations) + +find_library(JPEGXR_LIBRARY_RELEASE NAMES jpegxr PATH_SUFFIXES lib) +find_library(JPEGXR_LIBRARY_DEBUG NAMES jpegxrd PATH_SUFFIXES lib) +select_library_configurations(JPEGXR) + +find_library(JXRGLUE_LIBRARY_RELEASE NAMES jxrglue PATH_SUFFIXES lib) +find_library(JXRGLUE_LIBRARY_DEBUG NAMES jxrglued PATH_SUFFIXES lib) +select_library_configurations(JXRGLUE) + +set(JXR_LIBRARIES ${JXRGLUE_LIBRARY} ${JPEGXR_LIBRARY}) +mark_as_advanced(JXR_LIBRARIES) + +include(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(JXR DEFAULT_MSG JXR_INCLUDE_DIRS JXR_LIBRARIES) diff --git a/externals/vcpkg/ports/jxrlib/portfile.cmake b/externals/vcpkg/ports/jxrlib/portfile.cmake new file mode 100755 index 000000000..a15541b99 --- /dev/null +++ b/externals/vcpkg/ports/jxrlib/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO 4creators/jxrlib + REF f7521879862b9085318e814c6157490dd9dbbdb4 + SHA512 f5617cbe73b6b905cc6bba181e6a3efedd59584f7a8c90e0f34db580cfdad4239a2ab753df4e221f26a5c0db51475b021052e3b9e3ab3673573573b1d57f3fdb + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +if(NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES Darwin AND NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES Linux) + # The file guiddef.h is part of the Windows SDK, + # we then remove the local copy shipped with jxrlib + file(REMOVE ${SOURCE_PATH}/common/include/guiddef.h) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +#install FindJXR.cmake file +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/FindJXR.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxr) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxr) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxr) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/jxrlib/usage b/externals/vcpkg/ports/jxrlib/usage new file mode 100755 index 000000000..6668ba162 --- /dev/null +++ b/externals/vcpkg/ports/jxrlib/usage @@ -0,0 +1,5 @@ +The package jxrlib provides CMake integration: + + find_package(JXR REQUIRED) + target_include_directories(main PRIVATE ${JXR_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${JXR_LIBRARIES}) diff --git a/externals/vcpkg/ports/jxrlib/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/jxrlib/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..4bee9171d --- /dev/null +++ b/externals/vcpkg/ports/jxrlib/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,6 @@ +set(JXR_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) + +_find_package(${ARGS}) + +set(CMAKE_MODULE_PATH ${JXR_PREV_MODULE_PATH}) diff --git a/externals/vcpkg/ports/jxrlib/vcpkg.json b/externals/vcpkg/ports/jxrlib/vcpkg.json new file mode 100755 index 000000000..bdd2c9eb1 --- /dev/null +++ b/externals/vcpkg/ports/jxrlib/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "jxrlib", + "version": "2019.10.9", + "port-version": 3, + "description": "Open source implementation of the jpegxr image format standard.", + "homepage": "https://github.com/4creators/jxrlib" +} diff --git a/externals/vcpkg/ports/kangaru/portfile.cmake b/externals/vcpkg/ports/kangaru/portfile.cmake new file mode 100755 index 000000000..92ab7aade --- /dev/null +++ b/externals/vcpkg/ports/kangaru/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gracicot/kangaru + REF v4.3.0 + SHA512 7763d25eed203a033e0420abc0194531082223183ed9ec28d98f871e0dc619d28ec9053ff69b5bf54bac07bd99551f2dfaad9f29d51e8ebdd72d4929f9a8fb93 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DKANGARU_EXPORT=OFF + -DKANGARU_TEST=OFF + -DKANGARU_REVERSE_DESTRUCTION=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/kangaru) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/lib" + "${CURRENT_PACKAGES_DIR}/debug" +) + +# Put the license file where vcpkg expects it +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/kangaru/vcpkg.json b/externals/vcpkg/ports/kangaru/vcpkg.json new file mode 100755 index 000000000..29b53eafc --- /dev/null +++ b/externals/vcpkg/ports/kangaru/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "kangaru", + "version": "4.3.0", + "description": "A dependency injection container for C++11, C++14 and later", + "homepage": "https://github.com/gracicot/kangaru", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kcp/portfile.cmake b/externals/vcpkg/ports/kcp/portfile.cmake new file mode 100755 index 000000000..09c28886f --- /dev/null +++ b/externals/vcpkg/ports/kcp/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO skywind3000/kcp + REF 38e0c9366e4a72c749ff0bcdf911d1fe9bdfe9f5 + SHA512 1a05a692719f7f7bfa2e20df81c68af991bd01fe7236ab637a10644abfed425b9f46fd9ad399b8edca152d7bb617c37533b183bda2cf4a0cc1c3ce47031ba37f + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/kcp/vcpkg.json b/externals/vcpkg/ports/kcp/vcpkg.json new file mode 100755 index 000000000..7fd78483a --- /dev/null +++ b/externals/vcpkg/ports/kcp/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "kcp", + "version": "1.7", + "description": "A fast and reliable ARQ protocol", + "homepage": "https://github.com/skywind3000/kcp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kd-soap/portfile.cmake b/externals/vcpkg/ports/kd-soap/portfile.cmake new file mode 100755 index 000000000..03f99fab8 --- /dev/null +++ b/externals/vcpkg/ports/kd-soap/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDAB/KDSoap + REF fb0e905e242c2044fd25683a406eb6d369db052f # kdsoap-1.9.0 + SHA512 30f78602702f2bb77f72bf0637b413d70976cf10789b18d1eb9c097f6b3821b86e75d0ae921454b2d39b7d023f479dc089cde1915533a37054f9b26893f611d3 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KDSoap_STATIC) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DKDSoap_STATIC=${KDSoap_STATIC} + -DKDSoap_EXAMPLES=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KDSoap TARGET_PATH share/KDSoap) + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX}) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/kd-soap/vcpkg.json b/externals/vcpkg/ports/kd-soap/vcpkg.json new file mode 100755 index 000000000..3cd11e0e4 --- /dev/null +++ b/externals/vcpkg/ports/kd-soap/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "kd-soap", + "version-string": "1.9.0", + "port-version": 1, + "description": "A Qt-based client-side and server-side SOAP component", + "homepage": "https://www.kdab.com/products/kd-soap", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/externals/vcpkg/ports/kdbindings/portfile.cmake b/externals/vcpkg/ports/kdbindings/portfile.cmake new file mode 100755 index 000000000..736e8efbe --- /dev/null +++ b/externals/vcpkg/ports/kdbindings/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDAB/KDBindings + REF bbf790fc94f3018781f32be53c6086aedc0f74ec + SHA512 4303f8e73b376e851d40cab99b848788ae2aff00e0e4ec0006655d8ef9373eebe5e04f734e78037e257d7a5101739b912da9dab15bf1985f204b31224d9c53c5 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DKDBindings_TESTS=OFF + -DKDBindings_EXAMPLES=OFF + -DKDBindings_DOCS=OFF +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KDBindings) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/" + "${CURRENT_PACKAGES_DIR}/lib/" +) + +file(INSTALL "${SOURCE_PATH}/LICENSES/MIT.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/kdbindings/vcpkg.json b/externals/vcpkg/ports/kdbindings/vcpkg.json new file mode 100755 index 000000000..0797c2cb1 --- /dev/null +++ b/externals/vcpkg/ports/kdbindings/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "kdbindings", + "version": "1.0.0", + "description": "Reactive programming & data binding in C++", + "homepage": "https://github.com/KDAB/KDBindings", + "license": "MIT OR BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kddockwidgets/fix_find_package.patch b/externals/vcpkg/ports/kddockwidgets/fix_find_package.patch new file mode 100755 index 000000000..01363a341 --- /dev/null +++ b/externals/vcpkg/ports/kddockwidgets/fix_find_package.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6c174b89a..b83bace53 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -127,8 +127,8 @@ endif() + if(${PROJECT_NAME}_QT6) + set(Qt_VERSION_MAJOR 6) + set(QT_MIN_VERSION "6.0.0") +- find_package(Qt6Widgets ${QT_MIN_VERSION} REQUIRED) +- find_package(Qt6Test ${QT_MIN_VERSION} REQUIRED) ++ find_package(Qt6 ${QT_MIN_VERSION} COMPONENTS Widgets REQUIRED) ++ find_package(Qt6 ${QT_MIN_VERSION} OPTIONAL_COMPONENTS Test) + set(${PROJECT_NAME}_LIBRARY_QTID "-qt6") + else() + set(Qt_VERSION_MAJOR 5) diff --git a/externals/vcpkg/ports/kddockwidgets/portfile.cmake b/externals/vcpkg/ports/kddockwidgets/portfile.cmake new file mode 100755 index 000000000..594f5fbce --- /dev/null +++ b/externals/vcpkg/ports/kddockwidgets/portfile.cmake @@ -0,0 +1,42 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDAB/KDDockWidgets + REF 9990300006854afa4b4fa796912da067e770046a + SHA512 2207b3c021957d9be8652cad24c0b5e37b07fa02ffeeeb7dab57feaeade7973b580b853d6b69db15015b62cc1397459e27d032131292baaeb17a0633e287fa3c + HEAD_REF master + PATCHES + fix_find_package.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KD_STATIC) + +if(VCPKG_CROSSCOMPILING) + list(APPEND _qarg_OPTIONS -DQT_HOST_PATH=${CURRENT_HOST_INSTALLED_DIR}) + list(APPEND _qarg_OPTIONS -DQT_HOST_PATH_CMAKE_DIR:PATH=${CURRENT_HOST_INSTALLED_DIR}/share) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 AND VCPKG_TARGET_IS_WINDOWS) # Remove if PR #16111 is merged + list(APPEND _qarg_OPTIONS -DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_PROCESSOR:STRING=ARM64 -DCMAKE_SYSTEM_NAME:STRING=Windows) + endif() +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${_qarg_OPTIONS} + -DKDDockWidgets_QT6=ON + -DKDDockWidgets_STATIC=${KD_STATIC} + -DKDDockWidgets_QTQUICK=OFF + -DKDDockWidgets_PYTHON_BINDINGS=OFF + -DKDDockWidgets_EXAMPLES=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/KDDockWidgets-qt6" PACKAGE_NAME "KDDockWidgets-qt6") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/kddockwidgets/vcpkg.json b/externals/vcpkg/ports/kddockwidgets/vcpkg.json new file mode 100755 index 000000000..86b0771b6 --- /dev/null +++ b/externals/vcpkg/ports/kddockwidgets/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "kddockwidgets", + "version": "1.5.0", + "description": "KDAB's Dock Widget Framework for Qt", + "homepage": "https://www.kdab.com/development-resources/qt-tools/kddockwidgets/", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "widgets" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kealib/hdf5_include.patch b/externals/vcpkg/ports/kealib/hdf5_include.patch new file mode 100755 index 000000000..19598c56b --- /dev/null +++ b/externals/vcpkg/ports/kealib/hdf5_include.patch @@ -0,0 +1,65 @@ +diff --git a/include/libkea/KEAAttributeTable.h b/include/libkea/KEAAttributeTable.h +index 95a5d7f..fbfebc1 100644 +--- a/include/libkea/KEAAttributeTable.h ++++ b/include/libkea/KEAAttributeTable.h +@@ -37,7 +37,7 @@ + #include + #include + +-#include "H5Cpp.h" ++#include + + #include "libkea/KEACommon.h" + #include "libkea/KEAException.h" +diff --git a/include/libkea/KEAAttributeTableFile.h b/include/libkea/KEAAttributeTableFile.h +index 9987a7c..39dbb21 100644 +--- a/include/libkea/KEAAttributeTableFile.h ++++ b/include/libkea/KEAAttributeTableFile.h +@@ -35,7 +35,7 @@ + #include + #include + +-#include "H5Cpp.h" ++#include + + #include "libkea/KEACommon.h" + #include "libkea/KEAException.h" +diff --git a/include/libkea/KEAAttributeTableInMem.h b/include/libkea/KEAAttributeTableInMem.h +index b4f7fad..6a8a8b7 100644 +--- a/include/libkea/KEAAttributeTableInMem.h ++++ b/include/libkea/KEAAttributeTableInMem.h +@@ -35,7 +35,7 @@ + #include + #include + +-#include "H5Cpp.h" ++#include + + #include "libkea/KEACommon.h" + #include "libkea/KEAException.h" +diff --git a/include/libkea/KEACommon.h b/include/libkea/KEACommon.h +index 3175c93..67b02a2 100644 +--- a/include/libkea/KEACommon.h ++++ b/include/libkea/KEACommon.h +@@ -38,7 +38,7 @@ + #include + #include + +-#include "H5Cpp.h" ++#include + + // MSVC 2008 uses different names.... + #ifdef _MSC_VER +diff --git a/include/libkea/KEAImageIO.h b/include/libkea/KEAImageIO.h +index d510cae..4c2aa97 100644 +--- a/include/libkea/KEAImageIO.h ++++ b/include/libkea/KEAImageIO.h +@@ -35,7 +35,7 @@ + #include + #include + +-#include "H5Cpp.h" ++#include + + #include "libkea/KEACommon.h" + #include "libkea/KEAException.h" diff --git a/externals/vcpkg/ports/kealib/portfile.cmake b/externals/vcpkg/ports/kealib/portfile.cmake new file mode 100755 index 000000000..eabf0c46d --- /dev/null +++ b/externals/vcpkg/ports/kealib/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ubarsc/kealib + REF 4984102cf5867105a28ae754689566217309d120 #1.4.14 + SHA512 06628996757bc9cffc5af0f03468ec32246980b6f72f7f1c88a489a8a2aed70924115df0726fcbb9851e44030c6a44ee0f3137660de43af421dec1eab81cc147 + HEAD_REF master + PATCHES hdf5_include.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DLIBKEA_WITH_GDAL=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/kealib/vcpkg.json b/externals/vcpkg/ports/kealib/vcpkg.json new file mode 100755 index 000000000..d956725b9 --- /dev/null +++ b/externals/vcpkg/ports/kealib/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "kealib", + "version": "1.4.14", + "description": "KEALib provides an implementation of the GDAL data model using HDF5.", + "homepage": "https://github.com/ubarsc/kealib", + "dependencies": [ + { + "name": "hdf5", + "features": [ + "cpp" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kenlm/fix-boost.patch b/externals/vcpkg/ports/kenlm/fix-boost.patch new file mode 100755 index 000000000..3eded1c69 --- /dev/null +++ b/externals/vcpkg/ports/kenlm/fix-boost.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bec81d4..44fd48a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,6 @@ + cmake_minimum_required(VERSION 3.1) + +-if (WIN32) ++if (WIN32 AND BUILD_SHARED_LIBS) + set(Boost_USE_STATIC_LIBS OFF) + # The auto-linking feature has problems with USE_STATIC_LIBS off, so we use + # BOOST_ALL_NO_LIB to turn it off. diff --git a/externals/vcpkg/ports/kenlm/fix-const-overloaded.patch b/externals/vcpkg/ports/kenlm/fix-const-overloaded.patch new file mode 100755 index 000000000..2a77b335f --- /dev/null +++ b/externals/vcpkg/ports/kenlm/fix-const-overloaded.patch @@ -0,0 +1,14 @@ +diff --git a/util/proxy_iterator.hh b/util/proxy_iterator.hh +index 8aa697b..9de2663 100644 +--- a/util/proxy_iterator.hh ++++ b/util/proxy_iterator.hh +@@ -77,8 +77,7 @@ template class ProxyIterator { + + std::ptrdiff_t operator-(const S &other) const { return I() - other.I(); } + +- Proxy operator*() { return p_; } +- const Proxy operator*() const { return p_; } ++ Proxy operator*() const { return p_; } + Proxy *operator->() { return &p_; } + const Proxy *operator->() const { return &p_; } + Proxy operator[](std::ptrdiff_t amount) const { return *(*this + amount); } diff --git a/externals/vcpkg/ports/kenlm/portfile.cmake b/externals/vcpkg/ports/kenlm/portfile.cmake new file mode 100755 index 000000000..ad0c5c6c9 --- /dev/null +++ b/externals/vcpkg/ports/kenlm/portfile.cmake @@ -0,0 +1,50 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kpu/kenlm + REF 1f054617eca14eae921e987b4b4eeb2b1d91de6b + SHA512 c18f9c22fbbb1f54ebe9c3b771fb2d7c09d502141d1b3645cff9db44cc51b3c976311ff0db79b60f410622579d043f185c56a4c7386e1b0ba8708e433238968b + HEAD_REF master + PATCHES + fix-boost.patch + fix-const-overloaded.patch +) + +file(REMOVE ${SOURCE_PATH}/cmake/modules/FindEigen3.cmake) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + interpolate ENABLE_INTERPOLATE +) + +if ("interpolate" IN_LIST FEATURES AND VCPKG_TARGET_IS_WINDOWS) + message(FATAL_ERROR "The interpolate feature does not support Windows.") +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + ${FEATURE_OPTIONS} + -DFORCE_STATIC=OFF #already handled by vcpkg + -DENABLE_PYTHON=OFF # kenlm.lib(bhiksha.cc.obj) : fatal error LNK1000: Internal error during IMAGE::Pass2 + -DCOMPILE_TESTS=OFF +) +vcpkg_install_cmake() + +set(KENLM_TOOLS count_ngrams filter fragment kenlm_benchmark lmplz phrase_table_vocab query build_binary) +if (NOT VCPKG_TARGET_IS_WINDOWS) + list(APPEND KENLM_TOOLS probing_hash_table_benchmark) + if ("interpolate" IN_LIST FEATURES) + list(APPEND KENLM_TOOLS interpolate) + endif() +endif() +vcpkg_copy_tools(TOOL_NAMES ${KENLM_TOOLS} AUTO_CLEAN) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Copyright and License +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME license) diff --git a/externals/vcpkg/ports/kenlm/vcpkg.json b/externals/vcpkg/ports/kenlm/vcpkg.json new file mode 100755 index 000000000..66c218ad9 --- /dev/null +++ b/externals/vcpkg/ports/kenlm/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "kenlm", + "version-string": "20200924", + "port-version": 1, + "description": "KenLM: Faster and Smaller Language Model Queries", + "supports": "!(arm64 & windows)", + "dependencies": [ + "boost-interprocess", + "boost-program-options", + "boost-ptr-container", + "boost-system", + "boost-test", + "boost-thread", + "bzip2", + { + "name": "eigen3", + "platform": "!windows" + }, + "liblzma", + "zlib" + ], + "features": { + "interpolate": { + "description": "Build interpolation program", + "dependencies": [ + { + "name": "eigen3", + "platform": "!windows" + } + ] + } + } +} diff --git a/externals/vcpkg/ports/keystone/portfile.cmake b/externals/vcpkg/ports/keystone/portfile.cmake new file mode 100755 index 000000000..a05cf1317 --- /dev/null +++ b/externals/vcpkg/ports/keystone/portfile.cmake @@ -0,0 +1,44 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO keystone-engine/keystone + REF dc7932ef2b2c4a793836caec6ecab485005139d6 # 0.9.2 + SHA512 ebcdb1cca6dfdf76e0ad2a42a667044806e5c083c07357908298c6ef23d15960f887efa05c1cb3dee90ebdcd5af819bcf8af0fa1aa068aa9a0c6703dee29514e + HEAD_REF master +) + +vcpkg_find_acquire_program(PYTHON2) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" KEYSTONE_BUILD_STATIC_RUNTIME) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DKEYSTONE_BUILD_STATIC_RUNTIME=${KEYSTONE_BUILD_STATIC_RUNTIME} + -DPYTHON_EXECUTABLE=${PYTHON2} + + # Add support for only a subset of architectures + #-DLLVM_TARGETS_TO_BUILD="AArch64;X86" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + #For windows, do not build kstool if building DLL https://github.com/keystone-engine/keystone/blob/master/CMakeLists.txt#L74 + vcpkg_copy_tools(TOOL_NAMES kstool AUTO_CLEAN) +else() + # Move DLLs + file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll") + file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE ${DLLS}) + file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll") + file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE ${DLLS}) +endif() + +vcpkg_fixup_pkgconfig() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/keystone/vcpkg.json b/externals/vcpkg/ports/keystone/vcpkg.json new file mode 100755 index 000000000..f8fcdb382 --- /dev/null +++ b/externals/vcpkg/ports/keystone/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "keystone", + "version-semver": "0.9.2", + "port-version": 2, + "description": "A Lightweight multi-platform, multi-architecture assembler framework.", + "homepage": "https://github.com/keystone-engine/keystone", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5archive/control-dependencies.patch b/externals/vcpkg/ports/kf5archive/control-dependencies.patch new file mode 100755 index 000000000..26a7d3a50 --- /dev/null +++ b/externals/vcpkg/ports/kf5archive/control-dependencies.patch @@ -0,0 +1,56 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 958e22d..00b9736 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -36,6 +36,7 @@ set_package_properties(BZip2 PROPERTIES + TYPE RECOMMENDED + PURPOSE "Support for BZip2 compressed files and data streams" + ) ++set(BZIP2_FOUND "${VCPKG_USE_BZIP2}") + + find_package(LibLZMA) + set_package_properties(LibLZMA PROPERTIES +@@ -43,6 +44,7 @@ set_package_properties(LibLZMA PROPERTIES + DESCRIPTION "Support for xz compressed files and data streams" + PURPOSE "Support for xz compressed files and data streams" + ) ++set(LIBLZMA_FOUND "${VCPKG_USE_LIBLZMA}") + + find_package(PkgConfig) + if (PkgConfig_FOUND) +@@ -51,6 +53,8 @@ endif() + add_feature_info(LibZstd LibZstd_FOUND + "Support for zstd compressed files and data streams" + ) ++find_package(zstd CONFIG) ++set(LibZstd_FOUND "${VCPKG_USE_ZSTD}") + + include(ECMSetupVersion) + include(ECMGenerateHeaders) +diff --git a/KF5ArchiveConfig.cmake.in b/KF5ArchiveConfig.cmake.in +index 0a738c2..b4d96a5 100644 +--- a/KF5ArchiveConfig.cmake.in ++++ b/KF5ArchiveConfig.cmake.in +@@ -23,8 +23,7 @@ if (NOT @BUILD_SHARED_LIBS@) + endif() + + if (@LibZstd_FOUND@) +- find_package(PkgConfig) +- pkg_check_modules(LibZstd IMPORTED_TARGET "libzstd") ++ find_dependency(zstd CONFIG) + endif() + endif() + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 675ddf4..9363637 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -24,7 +24,7 @@ endif() + + if (LibZstd_FOUND) + target_sources(KF5Archive PRIVATE kzstdfilter.cpp) +- target_link_libraries(KF5Archive PRIVATE PkgConfig::LibZstd) ++ target_link_libraries(KF5Archive PRIVATE $,zstd::libzstd_shared,zstd::libzstd_static>) + endif() + + diff --git a/externals/vcpkg/ports/kf5archive/portfile.cmake b/externals/vcpkg/ports/kf5archive/portfile.cmake new file mode 100755 index 000000000..ec0c2dd98 --- /dev/null +++ b/externals/vcpkg/ports/kf5archive/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/karchive + REF v5.89.0 + SHA512 e77d5233b6549332f180be3dcf0459688d6565c24e1af409814aab92d415ebb2b8a04ad720dfa9ed6f017f3ab86fab766b909e30a860bb83c5ddd51def7c3e5f + HEAD_REF master + PATCHES + control-dependencies.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "bzip2" VCPKG_USE_BZIP2 + "lzma" VCPKG_USE_LIBLZMA + "zstd" VCPKG_USE_ZSTD +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_PkgConfig=ON + -DBUILD_TESTING=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Archive CONFIG_PATH lib/cmake/KF5Archive) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/LGPL-2.0-or-later.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/kf5archive/vcpkg.json b/externals/vcpkg/ports/kf5archive/vcpkg.json new file mode 100755 index 000000000..a6a778d87 --- /dev/null +++ b/externals/vcpkg/ports/kf5archive/vcpkg.json @@ -0,0 +1,44 @@ +{ + "name": "kf5archive", + "version": "5.89.0", + "port-version": 1, + "description": "File compression", + "homepage": "https://api.kde.org/frameworks/karchive/html/index.html", + "license": "LGPL-2.0-or-later", + "dependencies": [ + "ecm", + "qt5-base", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "default-features": [ + "bzip2" + ], + "features": { + "bzip2": { + "description": "Support for bzip2 compressed files and data streams", + "dependencies": [ + "bzip2" + ] + }, + "lzma": { + "description": "Support for xz compressed files and data streams", + "dependencies": [ + "liblzma" + ] + }, + "zstd": { + "description": "Support for zstd compressed files and data streams", + "dependencies": [ + "zstd" + ] + } + } +} diff --git a/externals/vcpkg/ports/kf5attica/portfile.cmake b/externals/vcpkg/ports/kf5attica/portfile.cmake new file mode 100755 index 000000000..ebb31c98c --- /dev/null +++ b/externals/vcpkg/ports/kf5attica/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/attica + REF v5.89.0 + SHA512 46f4cb550a13032da2e48861916356f3dfa47de0e1c0672ffeea19bad813dfb5cdf1b45b1a25ff35adc07e622486b37d7a65ddf3d39c2b214114d916f09577bb + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Attica CONFIG_PATH lib/cmake/KF5Attica) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5attica/vcpkg.json b/externals/vcpkg/ports/kf5attica/vcpkg.json new file mode 100755 index 000000000..2f38ba3ee --- /dev/null +++ b/externals/vcpkg/ports/kf5attica/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "kf5attica", + "version": "5.89.0", + "port-version": 1, + "description": "A Qt library that implements the Open Collaboration Services API", + "homepage": "https://api.kde.org/frameworks/attica/html/index.html", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5auth/portfile.cmake b/externals/vcpkg/ports/kf5auth/portfile.cmake new file mode 100755 index 000000000..2c75a4bfc --- /dev/null +++ b/externals/vcpkg/ports/kf5auth/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kauth + REF v5.89.0 + SHA512 815672fc572b22c51761476da9c82bc128a6a66ede39b5b9e09592c415908064d2b2f0c39674b702f503eeb48f33d0d4443d200bc2830b63b5f4468db66b0d8f + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_PLUGINDIR=plugins +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Auth CONFIG_PATH lib/cmake/KF5Auth) + +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5auth/vcpkg.json b/externals/vcpkg/ports/kf5auth/vcpkg.json new file mode 100755 index 000000000..e821fee90 --- /dev/null +++ b/externals/vcpkg/ports/kf5auth/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "kf5auth", + "version": "5.89.0", + "description": "Execute actions as privileged user", + "homepage": "https://api.kde.org/frameworks/kauth/html/index.html", + "dependencies": [ + "ecm", + "kf5coreaddons", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5bookmarks/portfile.cmake b/externals/vcpkg/ports/kf5bookmarks/portfile.cmake new file mode 100755 index 000000000..159f79ffa --- /dev/null +++ b/externals/vcpkg/ports/kf5bookmarks/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kbookmarks + REF v5.89.0 + SHA512 590b95c049600745995c76c2c7b8033eb591f8b7c1a2b832068a0e0d668858e04b1ed4a1fc8d2ef3c7fe43c5f3b7b311a7d0626a1053706fd46cbc5506c222b8 + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Bookmarks CONFIG_PATH lib/cmake/KF5Bookmarks) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5bookmarks/vcpkg.json b/externals/vcpkg/ports/kf5bookmarks/vcpkg.json new file mode 100755 index 000000000..5064aa9ee --- /dev/null +++ b/externals/vcpkg/ports/kf5bookmarks/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "kf5bookmarks", + "version": "5.89.0", + "description": "Bookmarks management library", + "homepage": "https://api.kde.org/frameworks/kbookmarks/html/index.html", + "dependencies": [ + "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5codecs", + "kf5config", + "kf5configwidgets", + "kf5coreaddons", + "kf5widgetsaddons", + "kf5xmlgui", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5codecs/portfile.cmake b/externals/vcpkg/ports/kf5codecs/portfile.cmake new file mode 100755 index 000000000..26713a368 --- /dev/null +++ b/externals/vcpkg/ports/kf5codecs/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kcodecs + REF v5.89.0 + SHA512 77104ab234d0b0baf00c2d3a37d366dc36c6f831c0fa011cb5ad965310e5317bbca3b569d9202123ed23b70137fe61ffec1689f51cccf8d60cc750913d36856f + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + "-DGperf_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/gperf/gperf${VCPKG_HOST_EXECUTABLE_SUFFIX}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Codecs CONFIG_PATH lib/cmake/KF5Codecs) + +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5codecs/vcpkg.json b/externals/vcpkg/ports/kf5codecs/vcpkg.json new file mode 100755 index 000000000..7ffe07cc4 --- /dev/null +++ b/externals/vcpkg/ports/kf5codecs/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "kf5codecs", + "version": "5.89.0", + "port-version": 1, + "description": "String encoding library", + "homepage": "https://api.kde.org/frameworks/kcodecs/html/index.html", + "dependencies": [ + "ecm", + { + "name": "gperf", + "host": true + }, + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5completion/portfile.cmake b/externals/vcpkg/ports/kf5completion/portfile.cmake new file mode 100755 index 000000000..a66913e1a --- /dev/null +++ b/externals/vcpkg/ports/kf5completion/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kcompletion + REF v5.89.0 + SHA512 26211e45497bfc324503213fdc31acc062fca9c203a192b92e06cd41385df6d207c592fb84bbed1e55627418685ff99347129704f09f98302d03e9ef57c4ed78 + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DBUILD_DESIGNERPLUGIN=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Completion CONFIG_PATH lib/cmake/KF5Completion) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5completion/vcpkg.json b/externals/vcpkg/ports/kf5completion/vcpkg.json new file mode 100755 index 000000000..a5619c4b0 --- /dev/null +++ b/externals/vcpkg/ports/kf5completion/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "kf5completion", + "version": "5.89.0", + "description": "Text completion helpers and widgets", + "homepage": "https://api.kde.org/frameworks/kcompletion/html/index.html", + "dependencies": [ + "ecm", + "kf5config", + "kf5widgetsaddons", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5config/portfile.cmake b/externals/vcpkg/ports/kf5config/portfile.cmake new file mode 100755 index 000000000..3abf46595 --- /dev/null +++ b/externals/vcpkg/ports/kf5config/portfile.cmake @@ -0,0 +1,48 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kconfig + REF v5.89.0 + SHA512 5b61812cd8b1d4cbbcc97e4ae350f5e46de9e7d73e3c68e3fbea3a2bad6a6be104c111ddcab9696593b60d34f74f3d4d7f828f54ad8d1f7b3408925b4bc51640 + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_LIBEXECDIR=bin +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Config CONFIG_PATH lib/cmake/KF5Config) +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES kreadconfig5 kwriteconfig5 + AUTO_CLEAN +) + +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(LIBEXEC_SUBFOLDER "kf5/") +endif() + +vcpkg_copy_tools( + TOOL_NAMES kconf_update kconfig_compiler_kf5 + SEARCH_DIR "${CURRENT_PACKAGES_DIR}/bin/${LIBEXEC_SUBFOLDER}" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${LIBEXEC_SUBFOLDER}" + AUTO_CLEAN +) + +file(APPEND ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "Data = ../../share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5config/vcpkg.json b/externals/vcpkg/ports/kf5config/vcpkg.json new file mode 100755 index 000000000..2e3c6fe3b --- /dev/null +++ b/externals/vcpkg/ports/kf5config/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "kf5config", + "version": "5.89.0", + "description": "Configuration system", + "homepage": "https://api.kde.org/frameworks/kconfig/html/index.html", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5configwidgets/portfile.cmake b/externals/vcpkg/ports/kf5configwidgets/portfile.cmake new file mode 100755 index 000000000..e314320d7 --- /dev/null +++ b/externals/vcpkg/ports/kf5configwidgets/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kconfigwidgets + REF v5.89.0 + SHA512 4dfc69c9b6126509df95d89172da0dfaaaa38cb497a3fda34b96a9fd25503998ab8124308a11e6894aed08feab4a122af775c2d375d0cac0736f85779e4d772e + HEAD_REF master +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + designerplugin BUILD_DESIGNERPLUGIN +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON + -DKDE_INSTALL_PLUGINDIR=plugins + -DKDE_INSTALL_QTPLUGINDIR=plugins + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5ConfigWidgets CONFIG_PATH lib/cmake/KF5ConfigWidgets) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5configwidgets/vcpkg.json b/externals/vcpkg/ports/kf5configwidgets/vcpkg.json new file mode 100755 index 000000000..a844fb521 --- /dev/null +++ b/externals/vcpkg/ports/kf5configwidgets/vcpkg.json @@ -0,0 +1,37 @@ +{ + "name": "kf5configwidgets", + "version": "5.89.0", + "description": "Widgets for configuration dialogs", + "homepage": "https://api.kde.org/frameworks/kconfigwidgets/html/index.html", + "dependencies": [ + "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5auth", + "kf5codecs", + "kf5config", + "kf5guiaddons", + "kf5i18n", + "kf5widgetsaddons", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "designerplugin": { + "description": "Enables a Qt Designer plugin" + } + } +} diff --git a/externals/vcpkg/ports/kf5coreaddons/fix_cmake_config.patch b/externals/vcpkg/ports/kf5coreaddons/fix_cmake_config.patch new file mode 100755 index 000000000..059da3c70 --- /dev/null +++ b/externals/vcpkg/ports/kf5coreaddons/fix_cmake_config.patch @@ -0,0 +1,38 @@ +From 4588b0052c11189aa6872e3c3c13f05dbae0c26e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= +Date: Fri, 27 Aug 2021 02:02:08 +0200 +Subject: [PATCH] Add support for static builds + +--- + KF5CoreAddonsConfig.cmake.in | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/KF5CoreAddonsConfig.cmake.in b/KF5CoreAddonsConfig.cmake.in +index f86b69ff..f9e0d31f 100644 +--- a/KF5CoreAddonsConfig.cmake.in ++++ b/KF5CoreAddonsConfig.cmake.in +@@ -18,6 +18,21 @@ else() + set_target_properties(KF5::desktoptojson PROPERTIES IMPORTED_LOCATION ${DESKTOPTOJSON_EXECUTABLE}) + endif() + endif() ++ ++if(NOT @BUILD_SHARED_LIBS@) ++ if(NOT WIN32) ++ find_dependency(Threads) ++ endif() ++ ++ if(@Inotify_FOUND@) ++ find_package(Inotify) # https://bugs.kde.org/show_bug.cgi?id=441604 ++ endif() ++ ++ if(@Procstat_FOUND@) ++ find_dependency(Procstat) ++ endif() ++endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/KF5CoreAddonsTargets.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/KF5CoreAddonsMacros.cmake") + @PACKAGE_INCLUDE_QCHTARGETS@ +-- +GitLab + diff --git a/externals/vcpkg/ports/kf5coreaddons/portfile.cmake b/externals/vcpkg/ports/kf5coreaddons/portfile.cmake new file mode 100755 index 000000000..36cb5cc9b --- /dev/null +++ b/externals/vcpkg/ports/kf5coreaddons/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kcoreaddons + REF v5.89.0 + SHA512 60b3ffdc69ff39e9d7edf23458d5ed5d063a55cae90d63ced18dc5db16eab027aa39d14a3a8507e7330dfc768e5ab8f77c1770874ad76807ec31a9ee4e0491a4 + PATCHES + fix_cmake_config.patch # https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/129 +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5CoreAddons CONFIG_PATH lib/cmake/KF5CoreAddons) +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES desktoptojson + AUTO_CLEAN +) + +file(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "Data = ../../share") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5coreaddons/vcpkg.json b/externals/vcpkg/ports/kf5coreaddons/vcpkg.json new file mode 100755 index 000000000..7ea1f782b --- /dev/null +++ b/externals/vcpkg/ports/kf5coreaddons/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "kf5coreaddons", + "version": "5.89.0", + "description": "Addons to QtCore", + "homepage": "https://api.kde.org/frameworks/kcoreaddons/html/index.html", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5crash/portfile.cmake b/externals/vcpkg/ports/kf5crash/portfile.cmake new file mode 100755 index 000000000..8cf3567ad --- /dev/null +++ b/externals/vcpkg/ports/kf5crash/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kcrash + REF v5.89.0 + SHA512 8493f9264e7844eefadd7bfa1700fa25baec2db9fd3cc8c85069d8a3c6452982d00ec1bb8e870ff9011391866e94cf63dfc8207d27d87b1b9b76e14b6ad5943d + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Crash CONFIG_PATH lib/cmake/KF5Crash) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5crash/vcpkg.json b/externals/vcpkg/ports/kf5crash/vcpkg.json new file mode 100755 index 000000000..f4588397e --- /dev/null +++ b/externals/vcpkg/ports/kf5crash/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "kf5crash", + "version": "5.89.0", + "description": "KCrash provides support for intercepting and handling application crashes.", + "homepage": "https://api.kde.org/frameworks/kcrash/html/index.html", + "dependencies": [ + "ecm", + "kf5coreaddons", + "kf5windowsystem", + { + "name": "qt5-x11extras", + "platform": "linux" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5dbusaddons/portfile.cmake b/externals/vcpkg/ports/kf5dbusaddons/portfile.cmake new file mode 100755 index 000000000..c3e125188 --- /dev/null +++ b/externals/vcpkg/ports/kf5dbusaddons/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kdbusaddons + REF v5.89.0 + SHA512 83f748690efe8024f603057cc97ab713f82ba6fbdb4462bb6052a8e89945e4117d6b1f030e0064120ae7e34a9b06860ba77d56617d5663578f0ac11a74dba2db + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5DBusAddons CONFIG_PATH lib/cmake/KF5DBusAddons) + +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +elseif(VCPKG_TARGET_IS_WINDOWS) + # kquitapp5 is a non-dev tool allowing to quit an arbitrary, dbus-compatible app. No need to keep it. + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/kquitapp5${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/bin/kquitapp5${VCPKG_HOST_EXECUTABLE_SUFFIX}") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5dbusaddons/vcpkg.json b/externals/vcpkg/ports/kf5dbusaddons/vcpkg.json new file mode 100755 index 000000000..6249aa2e0 --- /dev/null +++ b/externals/vcpkg/ports/kf5dbusaddons/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "kf5dbusaddons", + "version": "5.89.0", + "description": "Convenience classes for D-Bus", + "homepage": "https://api.kde.org/frameworks/kdbusaddons/html/index.html", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5declarative/portfile.cmake b/externals/vcpkg/ports/kf5declarative/portfile.cmake new file mode 100755 index 000000000..07b1b54e2 --- /dev/null +++ b/externals/vcpkg/ports/kf5declarative/portfile.cmake @@ -0,0 +1,46 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kdeclarative + REF v5.89.0 + SHA512 baad15ef1288e215a269c7b69d2de3659508ce16f91e7f20ec9255ed07810b22ea7e04f7446c50715f7b4abe2809c22d9911f03a5cc0791f7b9e5298f9e2ac59 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + "opengl" CMAKE_DISABLE_FIND_PACKAGE_EPOXY +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_QTPLUGINDIR=plugins + -DBUNDLE_INSTALL_DIR=bin + -DKDE_INSTALL_QMLDIR=qml + ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_EPOXY + BUNDLE_INSTALL_DIR +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Declarative CONFIG_PATH lib/cmake/KF5Declarative) +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES kpackagelauncherqml + AUTO_CLEAN +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5declarative/vcpkg.json b/externals/vcpkg/ports/kf5declarative/vcpkg.json new file mode 100755 index 000000000..5407b3989 --- /dev/null +++ b/externals/vcpkg/ports/kf5declarative/vcpkg.json @@ -0,0 +1,44 @@ +{ + "name": "kf5declarative", + "version": "5.89.0", + "description": "Integration of QML and KDE work spaces", + "homepage": "https://api.kde.org/frameworks/kdeclarative/html/index.html", + "dependencies": [ + "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5config", + "kf5globalaccel", + "kf5guiaddons", + "kf5i18n", + "kf5iconthemes", + "kf5kio", + "kf5notifications", + "kf5package", + "kf5widgetsaddons", + "kf5windowsystem", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "opengl": { + "description": "Enables OpenGl support", + "dependencies": [ + "libepoxy" + ] + } + } +} diff --git a/externals/vcpkg/ports/kf5diagram/portfile.cmake b/externals/vcpkg/ports/kf5diagram/portfile.cmake new file mode 100755 index 000000000..06278643c --- /dev/null +++ b/externals/vcpkg/ports/kf5diagram/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kdiagram + REF v2.8.0 + SHA512 5a3b958aaf386b1cde3c840963521306ded5b1975cc293dbb36c60cacd52a62badaf64a6c5f3cd63fc65f02d0ba181d318496d665f08140299720cd022a855e7 + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KChart CONFIG_PATH lib/cmake/KChart DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME KGantt CONFIG_PATH lib/cmake/KGantt) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSE.GPL.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file diff --git a/externals/vcpkg/ports/kf5diagram/vcpkg.json b/externals/vcpkg/ports/kf5diagram/vcpkg.json new file mode 100755 index 000000000..0388001e5 --- /dev/null +++ b/externals/vcpkg/ports/kf5diagram/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "kf5diagram", + "version": "2.8.0", + "description": "Powerful libraries (KChart, KGantt) for creating business diagrams", + "homepage": "https://api.kde.org/kdiagram/index.html", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-svg", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5globalaccel/portfile.cmake b/externals/vcpkg/ports/kf5globalaccel/portfile.cmake new file mode 100755 index 000000000..3b0b1d070 --- /dev/null +++ b/externals/vcpkg/ports/kf5globalaccel/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kglobalaccel + REF v5.89.0 + SHA512 824e4d6204189290dcc542ef3004ad2e2e2f83620dbf381ab78edbef996f412996709b9b49b72aad7c23deeeb6be274906b4cbbbd49498be081330e89c5674de + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5GlobalAccel CONFIG_PATH lib/cmake/KF5GlobalAccel) +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES kglobalaccel5 + AUTO_CLEAN + ) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5globalaccel/vcpkg.json b/externals/vcpkg/ports/kf5globalaccel/vcpkg.json new file mode 100755 index 000000000..dbc60bfaa --- /dev/null +++ b/externals/vcpkg/ports/kf5globalaccel/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "kf5globalaccel", + "version": "5.89.0", + "description": "lobal desktop keyboard shortcuts", + "homepage": "https://api.kde.org/frameworks/kglobalaccel/html/index.html", + "dependencies": [ + "ecm", + "kf5config", + "kf5coreaddons", + "kf5crash", + "kf5dbusaddons", + "kf5windowsystem", + "qt5-base", + "qt5-tools", + { + "name": "qt5-x11extras", + "platform": "linux" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5guiaddons/fix_cmake.patch b/externals/vcpkg/ports/kf5guiaddons/fix_cmake.patch new file mode 100755 index 000000000..93b2bc4f5 --- /dev/null +++ b/externals/vcpkg/ports/kf5guiaddons/fix_cmake.patch @@ -0,0 +1,12 @@ +diff --git a/KF5GuiAddonsConfig.cmake.in b/KF5GuiAddonsConfig.cmake.in +index ae17f6b..34e41bd 100644 +--- a/KF5GuiAddonsConfig.cmake.in ++++ b/KF5GuiAddonsConfig.cmake.in +@@ -10,6 +10,7 @@ if (NOT @BUILD_SHARED_LIBS@) + find_dependency(Qt5X11Extras @REQUIRED_QT_VERSION@) + endif() + if (@WITH_WAYLAND@) ++ set(QtWaylandScanner_EXECUTABLE "${PACKAGE_PREFIX}/tools/qt5-wayland/bin/qtwaylandscanner" CACHE STRING "QtWaylandScanner workaround") + find_dependency(Wayland REQUIRED Client) + find_dependency(Qt5WaylandClient @REQUIRED_QT_VERSION@) + find_dependency(QtWaylandScanner) diff --git a/externals/vcpkg/ports/kf5guiaddons/portfile.cmake b/externals/vcpkg/ports/kf5guiaddons/portfile.cmake new file mode 100755 index 000000000..07048be6d --- /dev/null +++ b/externals/vcpkg/ports/kf5guiaddons/portfile.cmake @@ -0,0 +1,44 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kguiaddons + REF v5.89.0 + SHA512 062a8da3a5d3f9da3288031f8e694fd6adb5b4f404071f2d66c7f4d5b15cbf10fedff58d9db928e45a052b69abbe38d7de57349638d8bb9a229798a553e3b9ed + HEAD_REF master + PATCHES + fix_cmake.patch # https://github.com/microsoft/vcpkg/issues/17607#issuecomment-831518812 +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + wayland WITH_WAYLAND +) + +if("wayland" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_LINUX) + message(FATAL_ERROR "Feature wayland is only supported on Linux.") +endif() + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DQtWaylandScanner_EXECUTABLE=${CURRENT_INSTALLED_DIR}/tools/qt5-wayland/bin/qtwaylandscanner + ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + QtWaylandScanner_EXECUTABLE +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5GuiAddons CONFIG_PATH lib/cmake/KF5GuiAddons) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5guiaddons/vcpkg.json b/externals/vcpkg/ports/kf5guiaddons/vcpkg.json new file mode 100755 index 000000000..ca00997c9 --- /dev/null +++ b/externals/vcpkg/ports/kf5guiaddons/vcpkg.json @@ -0,0 +1,49 @@ +{ + "name": "kf5guiaddons", + "version": "5.89.0", + "description": "Addons to QtGui", + "homepage": "https://api.kde.org/frameworks/kguiaddons/html/index.html", + "dependencies": [ + "ecm", + "qt5-tools", + { + "name": "qt5-winextras", + "platform": "windows" + }, + { + "name": "qt5-x11extras", + "platform": "linux" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "defaults" + ], + "features": { + "defaults": { + "description": "Default features", + "dependencies": [ + { + "name": "kf5guiaddons", + "features": [ + "wayland" + ], + "platform": "linux" + } + ] + }, + "wayland": { + "description": "Linux-only. Build with support for KeySequenceEditor inhibiting shortcuts on Wayland", + "dependencies": [ + "qt5-wayland" + ] + } + } +} diff --git a/externals/vcpkg/ports/kf5holidays/portfile.cmake b/externals/vcpkg/ports/kf5holidays/portfile.cmake new file mode 100755 index 000000000..df9d162c8 --- /dev/null +++ b/externals/vcpkg/ports/kf5holidays/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kholidays + REF v5.89.0 + SHA512 df5a68c9faf2c05b30b161f2e9f363f252be2efd9ec89787a88952fecb91d36b0187e9c88bdedde6887086f5ead4aa5d6ff627c9ea267cd447d5d7ad938b5d65 + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_QMLDIR=qml +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Holidays CONFIG_PATH lib/cmake/KF5Holidays) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5holidays/vcpkg.json b/externals/vcpkg/ports/kf5holidays/vcpkg.json new file mode 100755 index 000000000..5055e2a83 --- /dev/null +++ b/externals/vcpkg/ports/kf5holidays/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "kf5holidays", + "version": "5.89.0", + "description": "Holiday calculation library", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5i18n/fix_static_builds.patch b/externals/vcpkg/ports/kf5i18n/fix_static_builds.patch new file mode 100755 index 000000000..517e2e376 --- /dev/null +++ b/externals/vcpkg/ports/kf5i18n/fix_static_builds.patch @@ -0,0 +1,30 @@ +diff --git a/KF5I18nConfig.cmake.in b/KF5I18nConfig.cmake.in +index 364cc43..af7cd3b 100644 +--- a/KF5I18nConfig.cmake.in ++++ b/KF5I18nConfig.cmake.in +@@ -8,3 +8,4 @@ include("${CMAKE_CURRENT_LIST_DIR}/KF5I18nTargets.cmake") + @PACKAGE_INCLUDE_QCHTARGETS@ + include("${CMAKE_CURRENT_LIST_DIR}/KF5I18nMacros.cmake") + ++find_dependency(Iconv) +diff --git a/src/i18n/CMakeLists.txt b/src/i18n/CMakeLists.txt +index c6b510c..0a25eca 100644 +--- a/src/i18n/CMakeLists.txt ++++ b/src/i18n/CMakeLists.txt +@@ -40,12 +40,16 @@ ecm_generate_export_header(KF5I18n + EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} + ) + ++find_package(Iconv REQUIRED) ++ + target_include_directories(KF5I18n INTERFACE "$") + target_include_directories(KF5I18n PRIVATE ${LibIntl_INCLUDE_DIRS}) ++target_include_directories(KF5I18n PRIVATE ${Iconv_INCLUDE_DIRS}) + + target_link_libraries(KF5I18n PUBLIC Qt5::Core) + # This is only required for platforms which don't use glibc (with glibc LibIntl_LIBRARIES will be empty) + target_link_libraries(KF5I18n PRIVATE ${LibIntl_LIBRARIES}) ++target_link_libraries(KF5I18n PRIVATE ${Iconv_LIBRARIES}) + target_compile_options(KF5I18n PRIVATE -DTRANSLATION_DOMAIN=\"ki18n5\") + + set_target_properties(KF5I18n PROPERTIES VERSION ${KI18N_VERSION} diff --git a/externals/vcpkg/ports/kf5i18n/portfile.cmake b/externals/vcpkg/ports/kf5i18n/portfile.cmake new file mode 100755 index 000000000..078c5a5ad --- /dev/null +++ b/externals/vcpkg/ports/kf5i18n/portfile.cmake @@ -0,0 +1,38 @@ +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + list(APPEND PATCHES fix_static_builds.patch) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/ki18n + REF v5.89.0 + SHA512 f83d8b9ef51cc05a2eccb175e602fd0530d0cb6bb0c21e582a82fdd2897d9f988c2d927f2dc986faaf7482ec1c81e8cea4a9e74fc557c88be9958393db71c2a9 + PATCHES ${PATCHES} +) + +vcpkg_find_acquire_program(PYTHON3) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_PLUGINDIR=plugins + -DKDE_INSTALL_QMLDIR=qml + -DPYTHON_EXECUTABLE=${PYTHON3} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5I18n CONFIG_PATH lib/cmake/KF5I18n) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5i18n/vcpkg.json b/externals/vcpkg/ports/kf5i18n/vcpkg.json new file mode 100755 index 000000000..6aeeada80 --- /dev/null +++ b/externals/vcpkg/ports/kf5i18n/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "kf5i18n", + "version": "5.89.0", + "description": "Advanced internationalization framework", + "homepage": "https://api.kde.org/frameworks/ki18n/html/index.html", + "dependencies": [ + "ecm", + "gettext", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "libiconv", + "qt5-declarative", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5iconthemes/portfile.cmake b/externals/vcpkg/ports/kf5iconthemes/portfile.cmake new file mode 100755 index 000000000..9486d26fb --- /dev/null +++ b/externals/vcpkg/ports/kf5iconthemes/portfile.cmake @@ -0,0 +1,49 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kiconthemes + REF v5.89.0 + SHA512 d876f4a67d667a881820280c51fac8ddcdb99414f8c810422dd20be370173c036abcec3168495009242d479520a379be0c8ee4bea637023584e52c9452d9b3b7 + HEAD_REF master +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + designerplugin BUILD_DESIGNERPLUGIN + ) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_PLUGINDIR=plugins + -DKDE_INSTALL_QTPLUGINDIR=plugins + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5IconThemes CONFIG_PATH lib/cmake/KF5IconThemes) +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES kiconfinder5 + AUTO_CLEAN +) + +if(VCPKG_TARGET_IS_OSX) + vcpkg_copy_tools( + TOOL_NAMES ksvg2icns + AUTO_CLEAN + ) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5iconthemes/vcpkg.json b/externals/vcpkg/ports/kf5iconthemes/vcpkg.json new file mode 100755 index 000000000..a7e496cd0 --- /dev/null +++ b/externals/vcpkg/ports/kf5iconthemes/vcpkg.json @@ -0,0 +1,40 @@ +{ + "name": "kf5iconthemes", + "version": "5.89.0", + "description": "Icon GUI utilities", + "homepage": "https://api.kde.org/frameworks/kiconthemes/html/index.html", + "dependencies": [ + "ecm", + "gettext", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5archive", + "kf5configwidgets", + "kf5coreaddons", + "kf5guiaddons", + "kf5i18n", + "kf5itemviews", + "kf5widgetsaddons", + "qt5-base", + "qt5-svg", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "designerplugin": { + "description": "Enables a Qt Designer plugin" + } + } +} diff --git a/externals/vcpkg/ports/kf5itemmodels/portfile.cmake b/externals/vcpkg/ports/kf5itemmodels/portfile.cmake new file mode 100755 index 000000000..04c74eda4 --- /dev/null +++ b/externals/vcpkg/ports/kf5itemmodels/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kitemmodels + REF v5.89.0 + SHA512 4d7730994f935bd0929e8ceacfaed945e784cebdc86642c6148ce21108c4ffe792774196613c8b3215354069db85d276a30c6608445961f67aeb1b420a579007 +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_QMLDIR=qml +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5ItemModels CONFIG_PATH lib/cmake/KF5ItemModels) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5itemmodels/vcpkg.json b/externals/vcpkg/ports/kf5itemmodels/vcpkg.json new file mode 100755 index 000000000..f289009c7 --- /dev/null +++ b/externals/vcpkg/ports/kf5itemmodels/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "kf5itemmodels", + "version": "5.89.0", + "description": "Models for Qt Model/View system", + "homepage": "https://api.kde.org/frameworks/kitemmodels/html/index.html", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5itemviews/portfile.cmake b/externals/vcpkg/ports/kf5itemviews/portfile.cmake new file mode 100755 index 000000000..f1efb9e1c --- /dev/null +++ b/externals/vcpkg/ports/kf5itemviews/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kitemviews + REF v5.89.0 + SHA512 c96cb1204d5e9d0b1206eac93f36b06c94b7fcf63c7a75938e50783af1e7d3fe48617fadd264f55f2ac31c3d316a062b9200053a582ccf2e7c927659b7e1b442 +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DBUILD_DESIGNERPLUGIN=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5ItemViews CONFIG_PATH lib/cmake/KF5ItemViews) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5itemviews/vcpkg.json b/externals/vcpkg/ports/kf5itemviews/vcpkg.json new file mode 100755 index 000000000..444aa1f79 --- /dev/null +++ b/externals/vcpkg/ports/kf5itemviews/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "kf5itemviews", + "version": "5.89.0", + "description": "Widget addons for Qt Model/View", + "homepage": "https://api.kde.org/frameworks/kitemviews/html/index.html", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5jobwidgets/portfile.cmake b/externals/vcpkg/ports/kf5jobwidgets/portfile.cmake new file mode 100755 index 000000000..e34c97193 --- /dev/null +++ b/externals/vcpkg/ports/kf5jobwidgets/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kjobwidgets + REF v5.89.0 + SHA512 6fcc1fbef4de8adde1577739a28b5a3671829b24d4d8885a6b22f7b99662f058502183ab7d4f8c47f2c69f02a1932ac94a55be93bd6245fe97d8819644b1e708 + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5JobWidgets CONFIG_PATH lib/cmake/KF5JobWidgets) + +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5jobwidgets/vcpkg.json b/externals/vcpkg/ports/kf5jobwidgets/vcpkg.json new file mode 100755 index 000000000..8a6164212 --- /dev/null +++ b/externals/vcpkg/ports/kf5jobwidgets/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "kf5jobwidgets", + "version": "5.89.0", + "description": "Widgets for showing progress of asynchronous jobs", + "homepage": "https://api.kde.org/frameworks/kjobwidgets/html/index.html", + "dependencies": [ + "ecm", + "kf5coreaddons", + "kf5widgetsaddons", + "qt5-base", + { + "name": "qt5-x11extras", + "platform": "linux" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5kcmutils/portfile.cmake b/externals/vcpkg/ports/kf5kcmutils/portfile.cmake new file mode 100755 index 000000000..da0a49637 --- /dev/null +++ b/externals/vcpkg/ports/kf5kcmutils/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kcmutils + REF v5.89.0 + SHA512 9f12e906d9bd763906d6c9a0ebbefec1b7d1e958a217de5ed7ea418c8fcda1dbaccd8df89a849019aa81303fc4540b26872d205e7215285c4f312e8bbfcb97d0 + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5KCMUtils CONFIG_PATH lib/cmake/KF5KCMUtils) + +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5kcmutils/vcpkg.json b/externals/vcpkg/ports/kf5kcmutils/vcpkg.json new file mode 100755 index 000000000..85309cd38 --- /dev/null +++ b/externals/vcpkg/ports/kf5kcmutils/vcpkg.json @@ -0,0 +1,34 @@ +{ + "name": "kf5kcmutils", + "version": "5.89.0", + "description": "Utilities for KDE System Settings modules", + "homepage": "https://api.kde.org/frameworks/kcmutils/html/index.html", + "dependencies": [ + "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5configwidgets", + "kf5coreaddons", + "kf5declarative", + "kf5guiaddons", + "kf5i18n", + "kf5itemviews", + "kf5service", + "kf5xmlgui", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5kio/fix_libiconv.patch b/externals/vcpkg/ports/kf5kio/fix_libiconv.patch new file mode 100755 index 000000000..e45e7b808 --- /dev/null +++ b/externals/vcpkg/ports/kf5kio/fix_libiconv.patch @@ -0,0 +1,201 @@ +diff --git a/src/ioslaves/file/CMakeLists.txt b/src/ioslaves/file/CMakeLists.txt +index fec216af..8595f36e 100644 +--- a/src/ioslaves/file/CMakeLists.txt ++++ b/src/ioslaves/file/CMakeLists.txt +@@ -28,7 +28,9 @@ ecm_qt_export_logging_category( + EXPORT KIO + ) + +-target_link_libraries(kio_file KF5::KIOCore KF5::I18n KF5::ConfigCore Qt5::DBus Qt5::Network) ++find_package(Iconv REQUIRED) ++include_directories(${Iconv_INCLUDE_DIRS}) ++target_link_libraries(kio_file KF5::KIOCore KF5::I18n KF5::ConfigCore Qt5::DBus Qt5::Network ${Iconv_LIBRARIES}) + + if(UNIX) + target_link_libraries(kio_file Qt5::Network KF5::AuthCore) +diff --git a/src/ioslaves/ftp/CMakeLists.txt b/src/ioslaves/ftp/CMakeLists.txt +index 44abb409..61eb3836 100644 +--- a/src/ioslaves/ftp/CMakeLists.txt ++++ b/src/ioslaves/ftp/CMakeLists.txt +@@ -16,4 +16,6 @@ ecm_qt_export_logging_category( + EXPORT KIO + ) + +-target_link_libraries(kio_ftp Qt5::Network KF5::KIOCore KF5::I18n KF5::ConfigCore) ++find_package(Iconv REQUIRED) ++include_directories(${Iconv_INCLUDE_DIRS}) ++target_link_libraries(kio_ftp Qt5::Network KF5::KIOCore KF5::I18n KF5::ConfigCore ${Iconv_LIBRARIES}) +\ No newline at end of file +diff --git a/src/ioslaves/http/CMakeLists.txt b/src/ioslaves/http/CMakeLists.txt +index e616d08b..0631edb6 100644 +--- a/src/ioslaves/http/CMakeLists.txt ++++ b/src/ioslaves/http/CMakeLists.txt +@@ -37,11 +37,15 @@ target_sources(kio_http_cache_cleaner PRIVATE + http_cache_cleaner.cpp + ) + ++find_package(Iconv REQUIRED) ++include_directories(${Iconv_INCLUDE_DIRS}) + target_link_libraries(kio_http_cache_cleaner + Qt5::DBus + Qt5::Network # QLocalSocket + KF5::KIOCore # KProtocolManager +- KF5::I18n) ++ KF5::I18n ++ ${Iconv_LIBRARIES} ++) + + install(TARGETS kio_http_cache_cleaner DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF5} ) + +@@ -91,6 +95,7 @@ target_link_libraries(kio_http + KF5::KIONTLM + KF5::Archive + KF5::I18n ++ ${Iconv_LIBRARIES} + ) + if(GSSAPI_FOUND) + target_link_libraries(kio_http ${GSSAPI_LIBS} ) +diff --git a/src/ioslaves/http/kcookiejar/CMakeLists.txt b/src/ioslaves/http/kcookiejar/CMakeLists.txt +index 0f770ae4..2600d2d2 100644 +--- a/src/ioslaves/http/kcookiejar/CMakeLists.txt ++++ b/src/ioslaves/http/kcookiejar/CMakeLists.txt +@@ -13,10 +13,13 @@ target_sources(kcookiejar5 PRIVATE + main.cpp + ) + ++find_package(Iconv REQUIRED) ++include_directories(${Iconv_INCLUDE_DIRS}) + target_link_libraries( kcookiejar5 + Qt5::DBus + KF5::I18n + KF5::WidgetsAddons ++ ${Iconv_LIBRARIES} + ) + + install(TARGETS kcookiejar5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} ) +@@ -55,6 +58,7 @@ target_link_libraries(kded_kcookiejar + KF5::DBusAddons + KF5::I18n + KF5::WidgetsAddons ++ ${Iconv_LIBRARIES} + ) + + ########### install files ############### +diff --git a/src/ioslaves/remote/CMakeLists.txt b/src/ioslaves/remote/CMakeLists.txt +index e2b576e2..526551ee 100644 +--- a/src/ioslaves/remote/CMakeLists.txt ++++ b/src/ioslaves/remote/CMakeLists.txt +@@ -19,4 +19,6 @@ ecm_qt_declare_logging_category(kio_remote + EXPORT KIO + ) + +-target_link_libraries(kio_remote KF5::KIOCore KF5::I18n KF5::ConfigCore Qt5::Network) ++find_package(Iconv REQUIRED) ++include_directories(${Iconv_INCLUDE_DIRS}) ++target_link_libraries(kio_remote KF5::KIOCore KF5::I18n KF5::ConfigCore Qt5::Network ${Iconv_LIBRARIES}) +diff --git a/src/ioslaves/remote/kdedmodule/CMakeLists.txt b/src/ioslaves/remote/kdedmodule/CMakeLists.txt +index 4e40d214..7ba0d911 100644 +--- a/src/ioslaves/remote/kdedmodule/CMakeLists.txt ++++ b/src/ioslaves/remote/kdedmodule/CMakeLists.txt +@@ -1,7 +1,9 @@ + add_library(remotedirnotify MODULE remotedirnotify.cpp remotedirnotifymodule.cpp ../debug.cpp) + kcoreaddons_desktop_to_json(remotedirnotify remotedirnotify.desktop) + +-target_link_libraries(remotedirnotify KF5::DBusAddons KF5::KIOCore) ++find_package(Iconv REQUIRED) ++include_directories(${Iconv_INCLUDE_DIRS}) ++target_link_libraries(remotedirnotify KF5::DBusAddons KF5::KIOCore ${Iconv_LIBRARIES}) + # Rename target to allow co-installability with plasma-workspace <= 5.9 + set_target_properties(remotedirnotify PROPERTIES OUTPUT_NAME "remotenotifier") + +diff --git a/src/ioslaves/telnet/CMakeLists.txt b/src/ioslaves/telnet/CMakeLists.txt +index ffee12c8..0b03c211 100644 +--- a/src/ioslaves/telnet/CMakeLists.txt ++++ b/src/ioslaves/telnet/CMakeLists.txt +@@ -2,10 +2,13 @@ + add_executable(ktelnetservice5 ktelnetservice.cpp) + ecm_mark_nongui_executable(ktelnetservice5) + ++find_package(Iconv REQUIRED) ++include_directories(${Iconv_INCLUDE_DIRS}) + target_link_libraries(ktelnetservice5 + Qt5::Widgets + KF5::I18n + KF5::KIOGui ++ ${Iconv_LIBRARIES} + ) + + install(TARGETS ktelnetservice5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) +diff --git a/src/ioslaves/trash/CMakeLists.txt b/src/ioslaves/trash/CMakeLists.txt +index 147b3f3e..0546b8ce 100644 +--- a/src/ioslaves/trash/CMakeLists.txt ++++ b/src/ioslaves/trash/CMakeLists.txt +@@ -51,6 +51,8 @@ else() + ) + endif() + ++find_package(Iconv REQUIRED) ++include_directories(${Iconv_INCLUDE_DIRS}) + target_link_libraries(kio_trash + KF5::ConfigCore + KF5::Solid +@@ -59,6 +61,7 @@ target_link_libraries(kio_trash + Qt5::Network + KF5::I18n + KF5::ConfigCore ++ ${Iconv_LIBRARIES} + ) + if(APPLE) + target_link_libraries(kio_trash "-framework DiskArbitration -framework CoreFoundation") +@@ -78,6 +81,7 @@ target_link_libraries(ktrash5 + KF5::KIOCore + KF5::I18n + KF5::ConfigCore ++ ${Iconv_LIBRARIES} + ) + + install(TARGETS ktrash5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) +diff --git a/src/kioexec/CMakeLists.txt b/src/kioexec/CMakeLists.txt +index 92eeafe7..8ae87424 100644 +--- a/src/kioexec/CMakeLists.txt ++++ b/src/kioexec/CMakeLists.txt +@@ -19,7 +19,9 @@ ecm_qt_declare_logging_category(kioexecd + EXPORT KIO + ) + +-target_link_libraries(kioexecd KF5::I18n KF5::DBusAddons KF5::WidgetsAddons KF5::KIOCore) ++find_package(Iconv REQUIRED) ++include_directories(${Iconv_INCLUDE_DIRS}) ++target_link_libraries(kioexecd KF5::I18n KF5::DBusAddons KF5::WidgetsAddons KF5::KIOCore ${Iconv_LIBRARIES}) + + kdbusaddons_generate_dbus_service_file(kiod5 org.kde.kioexecd ${KDE_INSTALL_FULL_LIBEXECDIR_KF5}) + +@@ -45,6 +47,7 @@ target_link_libraries(kioexec + KF5::WidgetsAddons # KMessageBox + KF5::WindowSystem # KStartupInfo + KF5::DBusAddons # KDBusService ++ ${Iconv_LIBRARIES} + ) + + if (HAVE_X11) +diff --git a/src/kpasswdserver/CMakeLists.txt b/src/kpasswdserver/CMakeLists.txt +index c268e039..c1a562aa 100644 +--- a/src/kpasswdserver/CMakeLists.txt ++++ b/src/kpasswdserver/CMakeLists.txt +@@ -39,6 +39,8 @@ ecm_qt_export_logging_category( + EXPORT KIO + ) + ++find_package(Iconv REQUIRED) ++include_directories(${Iconv_INCLUDE_DIRS}) + target_link_libraries(kiod_kpasswdserver + KF5::DBusAddons # KDED Module + Qt5::DBus +@@ -46,6 +48,7 @@ target_link_libraries(kiod_kpasswdserver + KF5::WidgetsAddons # KPasswordDialog + KF5::I18n + KF5::WindowSystem ++ ${Iconv_LIBRARIES} + ${WALLET_LIB} + ) + diff --git a/externals/vcpkg/ports/kf5kio/portfile.cmake b/externals/vcpkg/ports/kf5kio/portfile.cmake new file mode 100755 index 000000000..12fdb5916 --- /dev/null +++ b/externals/vcpkg/ports/kf5kio/portfile.cmake @@ -0,0 +1,65 @@ +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static) + list(APPEND PATCHES fix_libiconv.patch) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kio + REF v5.89.0-rc2 + SHA512 08df36c08b028998884983fa233aad5bfc05d4e9e5899ed85390015daa7e0703272edabc59189579957e9971435887c4486796061878ce0f252ac2259b78a799 + HEAD_REF master + PATCHES + ${PATCHES} +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + "kf5notifications" CMAKE_DISABLE_FIND_PACKAGE_KF5Notifications + "kf5wallet" CMAKE_DISABLE_FIND_PACKAGE_KF5Wallet +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON + -DCMAKE_VERBOSE_MAKEFILE=ON + -DKDE_INSTALL_QTPLUGINDIR=plugins + -DKDE_INSTALL_PLUGINDIR=plugins + -DKDE_INSTALL_LIBEXECDIR=bin + ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES CMAKE_DISABLE_FIND_PACKAGE_KF5Notifications +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5KIO CONFIG_PATH lib/cmake/KF5KIO) +vcpkg_copy_pdbs() + +set(LIBEXEC_TOOLS kio_http_cache_cleaner kiod5 kioexec kioslave5) + +if(NOT VCPKG_TARGET_IS_WINDOWS) + if(NOT VCPKG_TARGET_IS_ANDROID) + list(APPEND LIBEXEC_TOOLS kpac_dhcp_helper) + endif() + + list(TRANSFORM LIBEXEC_TOOLS PREPEND "kf5/") +endif() + +vcpkg_copy_tools( + TOOL_NAMES kcookiejar5 ktelnetservice5 ktrash5 protocoltojson ${LIBEXEC_TOOLS} + AUTO_CLEAN +) + +file(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "Data = ../../share") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5kio/vcpkg.json b/externals/vcpkg/ports/kf5kio/vcpkg.json new file mode 100755 index 000000000..3f06846fc --- /dev/null +++ b/externals/vcpkg/ports/kf5kio/vcpkg.json @@ -0,0 +1,94 @@ +{ + "name": "kf5kio", + "version": "5.89.0", + "description": "Network transparent access to files and data", + "homepage": "https://api.kde.org/frameworks/kio/html/index.html", + "dependencies": [ + "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5archive", + { + "name": "kf5auth", + "platform": "!(windows | android)" + }, + "kf5bookmarks", + "kf5completion", + "kf5config", + "kf5configwidgets", + "kf5coreaddons", + "kf5crash", + { + "name": "kf5dbusaddons", + "platform": "!android" + }, + "kf5guiaddons", + "kf5i18n", + "kf5iconthemes", + "kf5itemviews", + "kf5jobwidgets", + "kf5service", + "kf5solid", + "kf5textwidgets", + "kf5widgetsaddons", + "kf5windowsystem", + "kf5xmlgui", + { + "name": "libiconv", + "platform": "windows & static" + }, + { + "name": "libmount", + "platform": "linux" + }, + "qt5-base", + { + "name": "qt5-macextras", + "platform": "osx" + }, + { + "name": "qt5-x11extras", + "platform": "linux" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "kf5notifications": { + "description": "Required to have error notification support in kpac", + "dependencies": [ + { + "name": "kf5kio", + "default-features": false, + "features": [ + "unixkf5notifications" + ], + "platform": "!(windows | android)" + } + ] + }, + "kf5wallet": { + "description": "Required to have permanent storage of passwords for kpasswdserver", + "dependencies": [ + "kf5wallet" + ] + }, + "unixkf5notifications": { + "description": "Required to have error notification support in kpac (windows only)", + "dependencies": [ + "kf5notifications" + ] + } + } +} diff --git a/externals/vcpkg/ports/kf5newstuff/portfile.cmake b/externals/vcpkg/ports/kf5newstuff/portfile.cmake new file mode 100755 index 000000000..ddb0527c2 --- /dev/null +++ b/externals/vcpkg/ports/kf5newstuff/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/knewstuff + REF v5.89.0 + SHA512 e031fc985ad29be177b438667c624c6706a45edd7029b8144d712e04b9b3f5c8bc7aebea9e2a09afe2a2f28db078f58969cb63bf7dccd5d2e1e05dcbc456766b + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_QMLDIR=qml + -DBUNDLE_INSTALL_DIR=bin +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5NewStuff CONFIG_PATH lib/cmake/KF5NewStuff DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5NewStuffCore CONFIG_PATH lib/cmake/KF5NewStuffCore DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5NewStuffQuick CONFIG_PATH lib/cmake/KF5NewStuffQuick) +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES knewstuff-dialog + AUTO_CLEAN +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5newstuff/vcpkg.json b/externals/vcpkg/ports/kf5newstuff/vcpkg.json new file mode 100755 index 000000000..a435e8b05 --- /dev/null +++ b/externals/vcpkg/ports/kf5newstuff/vcpkg.json @@ -0,0 +1,40 @@ +{ + "name": "kf5newstuff", + "version": "5.89.0", + "description": "Framework for downloading and sharing additional application data", + "homepage": "https://api.kde.org/frameworks/knewstuff/html/index.html", + "dependencies": [ + "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5archive", + "kf5attica", + "kf5completion", + "kf5config", + "kf5coreaddons", + "kf5i18n", + "kf5iconthemes", + "kf5itemviews", + "kf5kio", + "kf5package", + "kf5service", + "kf5textwidgets", + "kf5widgetsaddons", + "kf5xmlgui", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5notifications/portfile.cmake b/externals/vcpkg/ports/kf5notifications/portfile.cmake new file mode 100755 index 000000000..e44c59b76 --- /dev/null +++ b/externals/vcpkg/ports/kf5notifications/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/knotifications + REF v5.89.0 + SHA512 58e9fe34b29e0f6d7507a3a783918bcfbc8a191ddc7bb287c793628a97a2a203347971849100ae9a98d9f8a23c27ba184b509c11caf00517d8c6422ae91ac310 + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_QMLDIR=qml +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Notifications CONFIG_PATH lib/cmake/KF5Notifications) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5notifications/vcpkg.json b/externals/vcpkg/ports/kf5notifications/vcpkg.json new file mode 100755 index 000000000..1299e13af --- /dev/null +++ b/externals/vcpkg/ports/kf5notifications/vcpkg.json @@ -0,0 +1,45 @@ +{ + "name": "kf5notifications", + "version": "5.89.0", + "description": "Desktop notifications", + "homepage": "https://api.kde.org/frameworks/knotifications/html/index.html", + "dependencies": [ + "ecm", + "kf5config", + "kf5coreaddons", + { + "name": "kf5windowsystem", + "platform": "!android" + }, + { + "name": "libcanberra", + "platform": "!(windows | uwp)" + }, + { + "name": "libsnoretoast", + "platform": "windows" + }, + { + "name": "qt5-androidextras", + "platform": "android" + }, + "qt5-base", + { + "name": "qt5-macextras", + "platform": "osx" + }, + "qt5-tools", + { + "name": "qt5-x11extras", + "platform": "linux" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5package/portfile.cmake b/externals/vcpkg/ports/kf5package/portfile.cmake new file mode 100755 index 000000000..f58344ed0 --- /dev/null +++ b/externals/vcpkg/ports/kf5package/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kpackage + REF v5.89.0 + SHA512 0f008129d2675fb8faa274bc9d1389be6a4acee0be95eb06973762933a7306749742e852a83144c54523aacdd10e5a808c8c06834ff533719a6e66ccc62f7186 + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Package CONFIG_PATH lib/cmake/KF5Package) +vcpkg_copy_pdbs() + +vcpkg_copy_tools(TOOL_NAMES kpackagetool5 AUTO_CLEAN) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5package/vcpkg.json b/externals/vcpkg/ports/kf5package/vcpkg.json new file mode 100755 index 000000000..30d6ea179 --- /dev/null +++ b/externals/vcpkg/ports/kf5package/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "kf5package", + "version": "5.89.0", + "description": "Installation and loading of additional content (ex: scripts, images...) as packages", + "homepage": "https://api.kde.org/frameworks/kpackage/html/index.html", + "dependencies": [ + "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5archive", + "kf5coreaddons", + "kf5i18n", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5plotting/portfile.cmake b/externals/vcpkg/ports/kf5plotting/portfile.cmake new file mode 100755 index 000000000..cd05b7ff5 --- /dev/null +++ b/externals/vcpkg/ports/kf5plotting/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kplotting + REF v5.89.0 + SHA512 4499f1820d2314041d78e48130f5f8ee30c677302c9a34a1f7e797d4ebd0ba4286278622c113907d9c224e753c528adc85cb55abd2d3132187553a5d7fbe382a + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Plotting CONFIG_PATH lib/cmake/KF5Plotting) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/plugins" "${CURRENT_PACKAGES_DIR}/debug/plugins") +file(RENAME "${CURRENT_PACKAGES_DIR}/lib/plugins" "${CURRENT_PACKAGES_DIR}/plugins") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5plotting/vcpkg.json b/externals/vcpkg/ports/kf5plotting/vcpkg.json new file mode 100755 index 000000000..6a085aacc --- /dev/null +++ b/externals/vcpkg/ports/kf5plotting/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "kf5plotting", + "version": "5.89.0", + "description": "Lightweight plotting framework", + "homepage": "https://api.kde.org/frameworks/kplotting/html/index.html", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5service/portfile.cmake b/externals/vcpkg/ports/kf5service/portfile.cmake new file mode 100755 index 000000000..afaebd0eb --- /dev/null +++ b/externals/vcpkg/ports/kf5service/portfile.cmake @@ -0,0 +1,59 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kservice + REF v5.89.0 + SHA512 9809b7cb05b3164575e4f92cc979b34dad63945648e054621248fd92ce1c5885a048704ed11b1292446bb55940ed2c11e982a434bb0983c25de9938514b53c6d + HEAD_REF master +) + +if(VCPKG_TARGET_IS_OSX) + # On Darwin platform, the bundled version of 'bison' may be too old (< 3.0). + vcpkg_find_acquire_program(BISON) + execute_process( + COMMAND ${BISON} --version + OUTPUT_VARIABLE BISON_OUTPUT + ) + string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" BISON_VERSION "${BISON_OUTPUT}") + set(BISON_MAJOR ${CMAKE_MATCH_1}) + set(BISON_MINOR ${CMAKE_MATCH_2}) + message(STATUS "Using bison: ${BISON_MAJOR}.${BISON_MINOR}.${CMAKE_MATCH_3}") + if(NOT (BISON_MAJOR GREATER_EQUAL 3 AND BISON_MINOR GREATER_EQUAL 0)) + message(WARNING "${PORT} requires bison version greater than one provided by macOS, please use \`brew install bison\` to install a newer bison.") + endif() +endif() + +vcpkg_find_acquire_program(BISON) +vcpkg_find_acquire_program(FLEX) + +get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY) +get_filename_component(BISON_DIR "${BISON}" DIRECTORY) + +vcpkg_add_to_path(PREPEND "${FLEX_DIR}") +vcpkg_add_to_path(PREPEND "${BISON_DIR}") + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Service CONFIG_PATH lib/cmake/KF5Service) +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES kbuildsycoca5 + AUTO_CLEAN +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5service/vcpkg.json b/externals/vcpkg/ports/kf5service/vcpkg.json new file mode 100755 index 000000000..a7f375e61 --- /dev/null +++ b/externals/vcpkg/ports/kf5service/vcpkg.json @@ -0,0 +1,34 @@ +{ + "name": "kf5service", + "version": "5.89.0", + "description": "Plugin framework for desktop services", + "homepage": "https://api.kde.org/frameworks/kservice/html/index.html", + "dependencies": [ + "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5config", + "kf5coreaddons", + { + "name": "kf5dbusaddons", + "platform": "!android" + }, + "kf5i18n", + "libiconv", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5solid/fix-libmount.patch b/externals/vcpkg/ports/kf5solid/fix-libmount.patch new file mode 100755 index 000000000..592f96ce9 --- /dev/null +++ b/externals/vcpkg/ports/kf5solid/fix-libmount.patch @@ -0,0 +1,15 @@ +diff --git a/KF5SolidConfig.cmake.in b/KF5SolidConfig.cmake.in +index 0a23f44..7020804 100644 +--- a/KF5SolidConfig.cmake.in ++++ b/KF5SolidConfig.cmake.in +@@ -23,6 +23,10 @@ if (NOT @BUILD_SHARED_LIBS@) + find_dependency(Qt5Xml @REQUIRED_QT_VERSION@) + find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) + ++ if (@HAVE_LIBMOUNT@) ++ find_dependency(LibMount) ++ endif() ++ + if (@Qt5DBus_FOUND@) + find_dependency(Qt5DBus @REQUIRED_QT_VERSION@) + endif() diff --git a/externals/vcpkg/ports/kf5solid/portfile.cmake b/externals/vcpkg/ports/kf5solid/portfile.cmake new file mode 100755 index 000000000..cc4f0358a --- /dev/null +++ b/externals/vcpkg/ports/kf5solid/portfile.cmake @@ -0,0 +1,67 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/solid + REF v5.89.0 + SHA512 18d3c709756476870b6495bd5a99d70ec291a71a2f79dae954ce434953fb6299033c2dc85c68adf81031b03b70bf2e4798b7428da99c2ac28ddd6070cc413592 + HEAD_REF master + PATCHES + fix-libmount.patch +) + +if(VCPKG_TARGET_IS_OSX) + # On Darwin platform, the bundled version of 'bison' may be too old (< 3.0). + vcpkg_find_acquire_program(BISON) + execute_process( + COMMAND ${BISON} --version + OUTPUT_VARIABLE BISON_OUTPUT + ) + string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" BISON_VERSION "${BISON_OUTPUT}") + set(BISON_MAJOR ${CMAKE_MATCH_1}) + set(BISON_MINOR ${CMAKE_MATCH_2}) + message(STATUS "Using bison: ${BISON_MAJOR}.${BISON_MINOR}.${CMAKE_MATCH_3}") + if(NOT (BISON_MAJOR GREATER_EQUAL 3 AND BISON_MINOR GREATER_EQUAL 0)) + message(WARNING "${PORT} requires bison version greater than one provided by macOS, please use \`brew install bison\` to install a newer bison.") + endif() +endif() + +vcpkg_find_acquire_program(BISON) +vcpkg_find_acquire_program(FLEX) + +get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) +get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) + +vcpkg_add_to_path(PREPEND "${FLEX_DIR}") +vcpkg_add_to_path(PREPEND "${BISON_DIR}") + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + "libmount" CMAKE_DISABLE_FIND_PACKAGE_LibMount +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_QMLDIR=qml +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Solid CONFIG_PATH lib/cmake/KF5Solid) +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES solid-hardware5 + AUTO_CLEAN + ) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5solid/vcpkg.json b/externals/vcpkg/ports/kf5solid/vcpkg.json new file mode 100755 index 000000000..ec477c5b4 --- /dev/null +++ b/externals/vcpkg/ports/kf5solid/vcpkg.json @@ -0,0 +1,43 @@ +{ + "name": "kf5solid", + "version": "5.89.0", + "description": "Desktop hardware abstraction", + "homepage": "https://api.kde.org/frameworks/solid/html/index.html", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "platform-default-features" + ], + "features": { + "libmount": { + "description": "Used by the UDisks backend on Linux", + "supports": "linux", + "dependencies": [ + "libmount" + ] + }, + "platform-default-features": { + "description": "Enable platform-dependent default features", + "dependencies": [ + { + "name": "kf5solid", + "features": [ + "libmount" + ], + "platform": "linux" + } + ] + } + } +} diff --git a/externals/vcpkg/ports/kf5sonnet/portfile.cmake b/externals/vcpkg/ports/kf5sonnet/portfile.cmake new file mode 100755 index 000000000..f981c077c --- /dev/null +++ b/externals/vcpkg/ports/kf5sonnet/portfile.cmake @@ -0,0 +1,47 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/sonnet + REF v5.89.0 + SHA512 18e2b9f9553229853952e2b0e3e6fac9c87417014f607144419bfe10b9d40cf5b542b253a43e5305d75ccef525f8cce36c112e1bad9398365847d5ec2996e8e4 + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DBUILD_EXAMPLES=OFF + -DKDE_INSTALL_PLUGINDIR=plugins + -DKDE_INSTALL_QTPLUGINDIR=plugins + -DKDE_INSTALL_QMLDIR=qml +) + +vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin") +vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin") + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Sonnet CONFIG_PATH lib/cmake/KF5Sonnet) + +vcpkg_copy_tools( + TOOL_NAMES gentrigrams parsetrigrams + AUTO_CLEAN +) + +file(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "Data = ../../share") + +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/gentrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/parsetrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5sonnet/vcpkg.json b/externals/vcpkg/ports/kf5sonnet/vcpkg.json new file mode 100755 index 000000000..194bb46b2 --- /dev/null +++ b/externals/vcpkg/ports/kf5sonnet/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "kf5sonnet", + "version": "5.89.0", + "description": "Multi-language spell checker", + "homepage": "https://api.kde.org/frameworks/sonnet/html/index.html", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5syntaxhighlighting/portfile.cmake b/externals/vcpkg/ports/kf5syntaxhighlighting/portfile.cmake new file mode 100755 index 000000000..9cb527951 --- /dev/null +++ b/externals/vcpkg/ports/kf5syntaxhighlighting/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/syntax-highlighting + REF v5.89.0 + SHA512 c92df10d236d736f3f944f25efac796636ef857049732c0359edb900a1686839c55303917ab2286935024e7e6f19a0797fc38b417a1bd60d5dfb8c9c45ca6e66 + HEAD_REF master +) + +vcpkg_find_acquire_program(PERL) +get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) +vcpkg_add_to_path("${PERL_EXE_PATH}") + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_QMLDIR=qml +) + +vcpkg_cmake_install(ADD_BIN_TO_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5SyntaxHighlighting CONFIG_PATH lib/cmake/KF5SyntaxHighlighting) +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES kate-syntax-highlighter + AUTO_CLEAN +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5syntaxhighlighting/vcpkg.json b/externals/vcpkg/ports/kf5syntaxhighlighting/vcpkg.json new file mode 100755 index 000000000..51784515b --- /dev/null +++ b/externals/vcpkg/ports/kf5syntaxhighlighting/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "kf5syntaxhighlighting", + "version": "5.89.0", + "description": "Syntax highlighting engine for Kate syntax definitions", + "homepage": "https://github.com/KDE/syntax-highlighting", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools", + "qt5-xmlpatterns", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5textwidgets/portfile.cmake b/externals/vcpkg/ports/kf5textwidgets/portfile.cmake new file mode 100755 index 000000000..bf3e1ad90 --- /dev/null +++ b/externals/vcpkg/ports/kf5textwidgets/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/ktextwidgets + REF v5.89.0 + SHA512 5f57e20bc2e865499b4ef5c701baa17f492c5cd48b89f3add4e9fec29664a87ad6e69496c4e91f3a1192fbc4d244758a753ee250731a79b464f6af63f9abbde0 + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_QTPLUGINDIR=plugins +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5TextWidgets CONFIG_PATH lib/cmake/KF5TextWidgets) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5textwidgets/vcpkg.json b/externals/vcpkg/ports/kf5textwidgets/vcpkg.json new file mode 100755 index 000000000..82b0da989 --- /dev/null +++ b/externals/vcpkg/ports/kf5textwidgets/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "kf5textwidgets", + "version": "5.89.0", + "description": "Text editing widgets", + "homepage": "https://api.kde.org/frameworks/ktextwidgets/html/index.html", + "dependencies": [ + "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5completion", + "kf5config", + "kf5configwidgets", + "kf5i18n", + "kf5sonnet", + "kf5widgetsaddons", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5wallet/portfile.cmake b/externals/vcpkg/ports/kf5wallet/portfile.cmake new file mode 100755 index 000000000..61db39fa1 --- /dev/null +++ b/externals/vcpkg/ports/kf5wallet/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kwallet + REF v5.89.0 + SHA512 83bf40e5bfa9129ecfdaecebaf16c289542867337daf29be664aeb562e7c6bc32af4c59b71fcfae3cbbf70438872426b5981844c3c275b311340e5b48deac021 + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DBUILD_KWALLETD=OFF + -DBUILD_KWALLET_QUERY=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Wallet CONFIG_PATH lib/cmake/KF5Wallet) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5wallet/vcpkg.json b/externals/vcpkg/ports/kf5wallet/vcpkg.json new file mode 100755 index 000000000..eaf4d1253 --- /dev/null +++ b/externals/vcpkg/ports/kf5wallet/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "kf5wallet", + "version": "5.89.0", + "description": "Safe desktop-wide storage for passwords", + "homepage": "https://api.kde.org/frameworks/kwallet/html/index.html", + "dependencies": [ + "ecm", + "gettext", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5config", + "kf5coreaddons", + "kf5i18n", + "kf5windowsystem", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5widgetsaddons/portfile.cmake b/externals/vcpkg/ports/kf5widgetsaddons/portfile.cmake new file mode 100755 index 000000000..dacd9aab5 --- /dev/null +++ b/externals/vcpkg/ports/kf5widgetsaddons/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kwidgetsaddons + REF v5.89.0 + SHA512 5e83ffeefe3130f3a43768cbc777a81be9e43c029598f12ee48353f787e5ab4a97d0a92f6f3c41987fe021f1e92ac01a05601c642bbd508fbbd780925dd6c03b + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DBUILD_DESIGNERPLUGIN=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5WidgetsAddons CONFIG_PATH lib/cmake/KF5WidgetsAddons) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5widgetsaddons/vcpkg.json b/externals/vcpkg/ports/kf5widgetsaddons/vcpkg.json new file mode 100755 index 000000000..7dd41877e --- /dev/null +++ b/externals/vcpkg/ports/kf5widgetsaddons/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "kf5widgetsaddons", + "version": "5.89.0", + "description": "Addons to QtWidgets", + "homepage": "https://api.kde.org/frameworks/kwidgetsaddons/html/index.html", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5windowsystem/portfile.cmake b/externals/vcpkg/ports/kf5windowsystem/portfile.cmake new file mode 100755 index 000000000..999383d7e --- /dev/null +++ b/externals/vcpkg/ports/kf5windowsystem/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kwindowsystem + REF v5.89.0 + SHA512 8cdb177b5dff487c0039f6243a8652e8e0aaae5cd55f299f8ad4cd2c66651fc0be36328998807398b53803989881b511f0ee472359c6129ff809e9b50283b66a +) + +if (VCPKG_TARGET_IS_LINUX) + message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n libxcb-res0-dev\n\nThese can be installed on Ubuntu systems via apt-get install libxcb-res0-dev") +endif() + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_PLUGINDIR=plugins +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5WindowSystem CONFIG_PATH lib/cmake/KF5WindowSystem) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/KF5/KWindowSystem/config-kwindowsystem.h" "${CURRENT_PACKAGES_DIR}/" "") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5windowsystem/vcpkg.json b/externals/vcpkg/ports/kf5windowsystem/vcpkg.json new file mode 100755 index 000000000..d16a10e55 --- /dev/null +++ b/externals/vcpkg/ports/kf5windowsystem/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "kf5windowsystem", + "version": "5.89.0", + "port-version": 1, + "description": "Access to the windowing system", + "homepage": "https://api.kde.org/frameworks/kwindowsystem/html/", + "dependencies": [ + "ecm", + "qt5-tools", + { + "name": "qt5-winextras", + "platform": "windows" + }, + { + "name": "qt5-x11extras", + "platform": "linux" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kf5xmlgui/portfile.cmake b/externals/vcpkg/ports/kf5xmlgui/portfile.cmake new file mode 100755 index 000000000..d3a9143db --- /dev/null +++ b/externals/vcpkg/ports/kf5xmlgui/portfile.cmake @@ -0,0 +1,44 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kxmlgui + REF v5.89.0 + SHA512 6180089ff84456830ceddec564014c75127be1bcb996dd5458f86e5d1dfaa3e3b0267e0605dc8a799abe9aa3d3c0f48c805e5f58e754e19a44a20637dbb95044 + HEAD_REF master +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + designerplugin BUILD_DESIGNERPLUGIN + ) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_PLUGINDIR=plugins + -DKDE_INSTALL_QTPLUGINDIR=plugins + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5XmlGui CONFIG_PATH lib/cmake/KF5XmlGui) +vcpkg_copy_pdbs() + +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_copy_tools( + TOOL_NAMES ksendbugmail + AUTO_CLEAN + ) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/kf5xmlgui/vcpkg.json b/externals/vcpkg/ports/kf5xmlgui/vcpkg.json new file mode 100755 index 000000000..72fe1dcd7 --- /dev/null +++ b/externals/vcpkg/ports/kf5xmlgui/vcpkg.json @@ -0,0 +1,50 @@ +{ + "name": "kf5xmlgui", + "version": "5.89.0", + "description": "Framework for managing menu and toolbar actions", + "homepage": "https://api.kde.org/frameworks/kxmlgui/html/index.html", + "dependencies": [ + "ecm", + "gettext", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5archive", + "kf5config", + "kf5configwidgets", + "kf5coreaddons", + { + "name": "kf5globalaccel", + "platform": "!windows & !osx & !android" + }, + "kf5guiaddons", + "kf5i18n", + "kf5iconthemes", + "kf5itemviews", + "kf5widgetsaddons", + "kf5windowsystem", + { + "name": "libiconv", + "platform": "windows & static" + }, + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "designerplugin": { + "description": "Enables a Qt Designer plugin" + } + } +} diff --git a/externals/vcpkg/ports/kfr/portfile.cmake b/externals/vcpkg/ports/kfr/portfile.cmake new file mode 100755 index 000000000..c632bb1d9 --- /dev/null +++ b/externals/vcpkg/ports/kfr/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kfrlib/kfr + REF 9fc73247f43b303617329294ae264613df4dce71 # 4.2.1 + SHA512 c7dd4b1a0be436460973fb8a48bc6f2264a0f7d8d034ce88ccfd8328135f1492eab155023103a1461c2058eb6c79a6019b62d023dc5bc390ab4d2b43eac9c2d4 + HEAD_REF master +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + capi ENABLE_CAPI_BUILD + dft ENABLE_DFT + dft-np ENABLE_DFT_NP +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENABLE_TESTS=OFF + -DENABLE_ASMTEST=OFF + -DREGENERATE_TESTS=OFF + -DKFR_EXTENDED_TESTS=OFF + -DSKIP_TESTS=ON + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/kfr/vcpkg.json b/externals/vcpkg/ports/kfr/vcpkg.json new file mode 100755 index 000000000..c60a6a11e --- /dev/null +++ b/externals/vcpkg/ports/kfr/vcpkg.json @@ -0,0 +1,35 @@ +{ + "name": "kfr", + "version-semver": "4.2.1", + "port-version": 2, + "description": "Fast, modern C++ DSP framework.", + "homepage": "https://www.kfr.dev/", + "license": "GPL-2.0", + "supports": "!(arm | linux)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "capi": { + "description": "Enable C API build.", + "dependencies": [ + { + "name": "kfr", + "default-features": false, + "features": [ + "dft" + ] + } + ] + }, + "dft": { + "description": "Enable DFT and related algorithms." + }, + "dft-np": { + "description": "Enable non-power of 2 DFT." + } + } +} diff --git a/externals/vcpkg/ports/kinectsdk1/Config.cmake.in b/externals/vcpkg/ports/kinectsdk1/Config.cmake.in new file mode 100755 index 000000000..37b7a133a --- /dev/null +++ b/externals/vcpkg/ports/kinectsdk1/Config.cmake.in @@ -0,0 +1,33 @@ + +get_filename_component(_kinectsdk1_root "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_kinectsdk1_root "${_kinectsdk1_root}" PATH) +get_filename_component(_kinectsdk1_root "${_kinectsdk1_root}" PATH) + +set(_kinectsdk1_rel_lib "${_kinectsdk1_root}/lib/Kinect10.lib") +set(_kinectsdk1_dbg_lib "${_kinectsdk1_root}/debug/lib/Kinect10.lib") +if (EXISTS "${_kinectsdk1_rel_lib}" OR EXISTS "${_kinectsdk1_dbg_lib}") + + add_library(unofficial::kinectsdk1::kinectsdk1 INTERFACE IMPORTED) + set_target_properties(unofficial::kinectsdk1::kinectsdk1 PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_kinectsdk1_root}/include") + + if (EXISTS "${_kinectsdk1_rel_lib}") + set_target_properties(unofficial::kinectsdk1::kinectsdk1 + PROPERTIES IMPORTED_LOCATION_RELEASE "${_kinectsdk1_rel_lib}") + set_property(TARGET unofficial::kinectsdk1::kinectsdk1 APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + endif() + if (EXISTS "${_kinectsdk1_dbg_lib}") + set_target_properties(unofficial::kinectsdk1::kinectsdk1 + PROPERTIES IMPORTED_LOCATION_DEBUG "${_kinectsdk1_dbg_lib}") + set_property(TARGET unofficial::kinectsdk1::kinectsdk1 APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + endif() + +else() + + set(kinectsdk1_FOUND FALSE) + +endif() + +unset(_kinectsdk1_rel_lib) +unset(_kinectsdk1_dbg_lib) + +unset(_kinectsdk1_root) diff --git a/externals/vcpkg/ports/kinectsdk1/portfile.cmake b/externals/vcpkg/ports/kinectsdk1/portfile.cmake new file mode 100755 index 000000000..59c0ddf01 --- /dev/null +++ b/externals/vcpkg/ports/kinectsdk1/portfile.cmake @@ -0,0 +1,66 @@ +set(KINECTSDK10_VERSION "v1.8") + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(ARCHITECTURE x86) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(ARCHITECTURE amd64) +else() + message(FATAL_ERROR "This port does not currently support architecture: ${VCPKG_TARGET_ARCHITECTURE}") +endif() + +vcpkg_download_distfile(KINECTSDK10_INSTALLER + URLS "https://download.microsoft.com/download/E/1/D/E1DEC243-0389-4A23-87BF-F47DE869FC1A/KinectSDK-${KINECTSDK10_VERSION}-Setup.exe" + FILENAME "KinectSDK-${KINECTSDK10_VERSION}-Setup.exe" + SHA512 d7e886d639b4310addc7c1350311f81289ffbcd653237882da7bf3d4074281ed35d217cb8be101579cac880c574dd89c62cd6a87772d60905c446d0be5fd1932 +) + +vcpkg_find_acquire_program(DARK) + +set(KINECTSDK10_WIX_INSTALLER "${KINECTSDK10_INSTALLER}") +set(KINECTSDK10_WIX_EXTRACT_DIR "${CURRENT_BUILDTREES_DIR}/src/installer/wix") +vcpkg_execute_required_process( + COMMAND "${DARK}" -x "${KINECTSDK10_WIX_EXTRACT_DIR}" "${KINECTSDK10_WIX_INSTALLER}" + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} + LOGNAME extract-wix-${TARGET_TRIPLET} +) + +file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/src/KinectSDK-${KINECTSDK10_VERSION}-${VCPKG_TARGET_ARCHITECTURE}") +set(KINECTSDK10_MSI_INSTALLER "installer\\wix\\AttachedContainer\\KinectSDK-${KINECTSDK10_VERSION}-${VCPKG_TARGET_ARCHITECTURE}.msi") +vcpkg_execute_required_process( + COMMAND + "${CURRENT_HOST_INSTALLED_DIR}/tools/vcpkg-tool-lessmsi/lessmsi.exe" + x + "${KINECTSDK10_MSI_INSTALLER}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src" + LOGNAME extract-msi-${TARGET_TRIPLET} +) +set(KINECTSDK10_DIR "${CURRENT_BUILDTREES_DIR}/src/KinectSDK-${KINECTSDK10_VERSION}-${VCPKG_TARGET_ARCHITECTURE}/SourceDir/Microsoft SDKs/Kinect/${KINECTSDK10_VERSION}") + +file( + INSTALL + "${KINECTSDK10_DIR}/inc/NuiApi.h" + "${KINECTSDK10_DIR}/inc/NuiImageCamera.h" + "${KINECTSDK10_DIR}/inc/NuiSensor.h" + "${KINECTSDK10_DIR}/inc/NuiSkeleton.h" + DESTINATION + "${CURRENT_PACKAGES_DIR}/include" +) + +file( + INSTALL + "${KINECTSDK10_DIR}/lib/${ARCHITECTURE}/Kinect10.lib" + DESTINATION + "${CURRENT_PACKAGES_DIR}/lib" +) + +file( + INSTALL + "${KINECTSDK10_DIR}/lib/${ARCHITECTURE}/Kinect10.lib" + DESTINATION + "${CURRENT_PACKAGES_DIR}/debug/lib" +) + +configure_file("${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" @ONLY) + +# Handle copyright +file(INSTALL "${KINECTSDK10_DIR}/SDKEula.rtf" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/kinectsdk1/vcpkg.json b/externals/vcpkg/ports/kinectsdk1/vcpkg.json new file mode 100755 index 000000000..7d4a3a029 --- /dev/null +++ b/externals/vcpkg/ports/kinectsdk1/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "kinectsdk1", + "version": "1.8", + "port-version": 5, + "description": "Kinect for Windows SDK for Kinect v1 sensor.", + "license": null, + "supports": "!arm & windows", + "dependencies": [ + { + "name": "vcpkg-tool-lessmsi", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kinectsdk2/Config.cmake.in b/externals/vcpkg/ports/kinectsdk2/Config.cmake.in new file mode 100755 index 000000000..04291aa09 --- /dev/null +++ b/externals/vcpkg/ports/kinectsdk2/Config.cmake.in @@ -0,0 +1,33 @@ + +get_filename_component(_kinectsdk2_root "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_kinectsdk2_root "${_kinectsdk2_root}" PATH) +get_filename_component(_kinectsdk2_root "${_kinectsdk2_root}" PATH) + +set(_kinectsdk2_rel_lib "${_kinectsdk2_root}/lib/Kinect20.lib") +set(_kinectsdk2_dbg_lib "${_kinectsdk2_root}/debug/lib/Kinect20.lib") +if (EXISTS "${_kinectsdk2_rel_lib}" OR EXISTS "${_kinectsdk2_dbg_lib}") + + add_library(unofficial::kinectsdk2::kinectsdk2 INTERFACE IMPORTED) + set_target_properties(unofficial::kinectsdk2::kinectsdk2 PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_kinectsdk2_root}/include") + + if (EXISTS "${_kinectsdk2_rel_lib}") + set_target_properties(unofficial::kinectsdk2::kinectsdk2 + PROPERTIES IMPORTED_LOCATION_RELEASE "${_kinectsdk2_rel_lib}") + set_property(TARGET unofficial::kinectsdk2::kinectsdk2 APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + endif() + if (EXISTS "${_kinectsdk2_dbg_lib}") + set_target_properties(unofficial::kinectsdk2::kinectsdk2 + PROPERTIES IMPORTED_LOCATION_DEBUG "${_kinectsdk2_dbg_lib}") + set_property(TARGET unofficial::kinectsdk2::kinectsdk2 APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + endif() + +else() + + set(kinectsdk2_FOUND FALSE) + +endif() + +unset(_kinectsdk2_rel_lib) +unset(_kinectsdk2_dbg_lib) + +unset(_kinectsdk2_root) diff --git a/externals/vcpkg/ports/kinectsdk2/portfile.cmake b/externals/vcpkg/ports/kinectsdk2/portfile.cmake new file mode 100755 index 000000000..8e8e3e5c0 --- /dev/null +++ b/externals/vcpkg/ports/kinectsdk2/portfile.cmake @@ -0,0 +1,56 @@ +vcpkg_buildpath_length_warning(37) + +set(KINECTSDK20_VERSION "v2.0_1409") +vcpkg_download_distfile(KINECTSDK20_INSTALLER + URLS "https://download.microsoft.com/download/F/2/D/F2D1012E-3BC6-49C5-B8B3-5ACFF58AF7B8/KinectSDK-${KINECTSDK20_VERSION}-Setup.exe" + FILENAME "KinectSDK-${KINECTSDK20_VERSION}-Setup.exe" + SHA512 ae3b00f45282ab2ed6ea36c09e42e1b274074f41546ecfbe00facf1fffa2e5a762ffeffb9ba2194f716e8122e0fbd9a8ef63c62be68d2b50a40e4f8c5a821f5f +) + +vcpkg_find_acquire_program(DARK) + +set(KINECTSDK20_WIX_INSTALLER "${KINECTSDK20_INSTALLER}") +set(KINECTSDK20_WIX_EXTRACT_DIR "${CURRENT_BUILDTREES_DIR}/src/installer/wix") +vcpkg_execute_required_process( + COMMAND ${DARK} -x ${KINECTSDK20_WIX_EXTRACT_DIR} ${KINECTSDK20_WIX_INSTALLER} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} + LOGNAME extract-wix-${TARGET_TRIPLET} +) + +file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/src/KinectSDK-${KINECTSDK20_VERSION}-x64") +set(KINECTSDK20_MSI_INSTALLER "installer\\wix\\AttachedContainer\\KinectSDK-${KINECTSDK20_VERSION}-x64.msi") +vcpkg_execute_required_process( + COMMAND + "${CURRENT_HOST_INSTALLED_DIR}/tools/vcpkg-tool-lessmsi/lessmsi.exe" + x + "${KINECTSDK20_MSI_INSTALLER}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src" + LOGNAME extract-msi-${TARGET_TRIPLET} +) +set(KINECTSDK20_DIR "${CURRENT_BUILDTREES_DIR}/src/KinectSDK-${KINECTSDK20_VERSION}-x64/SourceDir/Microsoft SDKs/Kinect/${KINECTSDK20_VERSION}") + +file( + INSTALL + "${KINECTSDK20_DIR}/inc/" + DESTINATION + "${CURRENT_PACKAGES_DIR}/include" +) + +file( + INSTALL + "${KINECTSDK20_DIR}/Lib/${VCPKG_TARGET_ARCHITECTURE}/Kinect20.lib" + DESTINATION + "${CURRENT_PACKAGES_DIR}/lib" +) + +file( + INSTALL + "${KINECTSDK20_DIR}/Lib/${VCPKG_TARGET_ARCHITECTURE}/Kinect20.lib" + DESTINATION + "${CURRENT_PACKAGES_DIR}/debug/lib" +) + +configure_file("${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" @ONLY) + +# Handle copyright +file(INSTALL "${KINECTSDK20_DIR}/SDKEula.rtf" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/kinectsdk2/vcpkg.json b/externals/vcpkg/ports/kinectsdk2/vcpkg.json new file mode 100755 index 000000000..def818628 --- /dev/null +++ b/externals/vcpkg/ports/kinectsdk2/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "kinectsdk2", + "version": "2.0", + "port-version": 4, + "description": "Kinect for Windows SDK for Kinect v2 sensor.", + "license": null, + "supports": "!arm & windows", + "dependencies": [ + { + "name": "vcpkg-tool-lessmsi", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kissfft/CMakeLists.txt b/externals/vcpkg/ports/kissfft/CMakeLists.txt new file mode 100755 index 000000000..d209dfbb0 --- /dev/null +++ b/externals/vcpkg/ports/kissfft/CMakeLists.txt @@ -0,0 +1,68 @@ +cmake_minimum_required(VERSION 3.14) + +project(kissfft LANGUAGES C) + +include(GNUInstallDirs) + +option(KF_USE_SIMD "Use SIMD" OFF) +option(KF_INSTALL_HEADERS "Install header files" ON) + +if (KF_USE_SIMD) + set(KF_SCALAR_TYPE "__m128" CACHE STRING "Definition of kiss_fft_scalar") +else () + set(KF_SCALAR_TYPE "float" CACHE STRING "Definition of kiss_fft_scalar") +endif () + +# TODO: FIXED_POINT +# TODO: -msse + +set(kissfft_sources kiss_fft.c kiss_fftr.c kiss_fftnd.c kiss_fftndr.c) + +if (WIN32 AND BUILD_SHARED_LIBS) + list(APPEND kissfft_sources exports.def) +endif () + +add_library(kissfft ${kissfft_sources}) + +if (BUILD_SHARED_LIBS) + set_property( + TARGET kissfft + PROPERTY POSITION_INDEPENDENT_CODE ON + ) +endif () + +target_include_directories( + kissfft + PUBLIC + $ +) + +target_compile_definitions( + kissfft + PUBLIC + $<$:USE_SIMD> + kiss_fft_scalar=${KF_SCALAR_TYPE} +) + +if (KF_INSTALL_HEADERS) + install( + FILES + _kiss_fft_guts.h + kiss_fft.h + kiss_fftr.h + kiss_fftnd.h + kiss_fftndr.h + kissfft.hh + kissfft_i32.hh + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) +endif () + +install(TARGETS kissfft EXPORT unofficial-kissfft-config) + +install( + EXPORT unofficial-kissfft-config + NAMESPACE unofficial::kissfft:: + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/unofficial-kissfft + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +) diff --git a/externals/vcpkg/ports/kissfft/exports.def b/externals/vcpkg/ports/kissfft/exports.def new file mode 100755 index 000000000..53984a6fe --- /dev/null +++ b/externals/vcpkg/ports/kissfft/exports.def @@ -0,0 +1,15 @@ +EXPORTS + kiss_fft_alloc + kiss_fft + kiss_fftr_alloc + kiss_fftr + kiss_fftri + kiss_fft + kiss_fftnd_alloc + kiss_fftnd + kiss_fftndr_alloc + kiss_fftndr + kiss_fftndri + kiss_fft_stride + kiss_fft_cleanup + kiss_fft_next_fast_size diff --git a/externals/vcpkg/ports/kissfft/portfile.cmake b/externals/vcpkg/ports/kissfft/portfile.cmake new file mode 100755 index 000000000..ccb77514b --- /dev/null +++ b/externals/vcpkg/ports/kissfft/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mborgerding/kissfft + REF 8f47a67f595a6641c566087bf5277034be64f24d + SHA512 ae39438b6d029296a440e1421f30731f371364107744fe9bad68e835e939f9a06d63016a99f5395a490ee0b1b1c33d46faafc651d91f13b8733d366e04dc861a + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/exports.def DESTINATION ${SOURCE_PATH}) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS_DEBUG + -DKF_INSTALL_HEADERS=OFF + OPTIONS_RELEASE + -DKF_INSTALL_HEADERS=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME unofficial-${PORT} + CONFIG_PATH lib/cmake/unofficial-${PORT} +) + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/kissfft/vcpkg.json b/externals/vcpkg/ports/kissfft/vcpkg.json new file mode 100755 index 000000000..48e6b5c19 --- /dev/null +++ b/externals/vcpkg/ports/kissfft/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "kissfft", + "version-date": "2021-11-14", + "description": "A Fast Fourier Transform (FFT) library that tries to Keep it Simple, Stupid", + "homepage": "https://github.com/mborgerding/kissfft", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/klein/find_simde_first.patch b/externals/vcpkg/ports/klein/find_simde_first.patch new file mode 100755 index 000000000..ab9f715c6 --- /dev/null +++ b/externals/vcpkg/ports/klein/find_simde_first.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c5d6f3f..a3ba161 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -29,16 +29,7 @@ endif() + option(KLEIN_BUILD_SYM "Enable compilation of symbolic Klein utility" ON) + option(KLEIN_BUILD_C_BINDINGS "Enable compilation of the Klein C bindings" ON) + +-include(FetchContent) +-FetchContent_Declare( +- simde +- GIT_REPOSITORY https://github.com/simd-everywhere/simde +- GIT_TAG v0.7.2 +- GIT_SHALLOW ON +-) +-FetchContent_GetProperties(simde) +-if(NOT simde_POPULATED) +- FetchContent_Populate(simde) +-endif() ++find_path(SIMDE_INCLUDE_DIR "simde/x86/sse4.1.h" REQUIRED) ++set(simde_SOURCE_DIR ${SIMDE_INCLUDE_DIR}/simde) + + # The default platform and instruction set is x86 SSE3 diff --git a/externals/vcpkg/ports/klein/portfile.cmake b/externals/vcpkg/ports/klein/portfile.cmake new file mode 100755 index 000000000..aea4b100a --- /dev/null +++ b/externals/vcpkg/ports/klein/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jeremyong/klein + REF 92023c6a946af84e716deb1488cad22048d3e08d + SHA512 5d12ae143f07173992a6f9aa90539c4cb6c895a7169e5c086a10f78a31f7b2c9d64faf5ce1db014bd3badd92d24ff612dd2d2dc2f7508baac59307e3dccb6ebe + HEAD_REF master + PATCHES + "find_simde_first.patch" +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DKLEIN_ENABLE_PERF=OFF + -DKLEIN_ENABLE_TESTS=OFF + -DKLEIN_VALIDATE=OFF + -DKLEIN_BUILD_SYM=OFF + -DKLEIN_BUILD_C_BINDINGS=OFF + -DKLEIN_INSTALL=ON +) + +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + diff --git a/externals/vcpkg/ports/klein/usage b/externals/vcpkg/ports/klein/usage new file mode 100755 index 000000000..63658e26e --- /dev/null +++ b/externals/vcpkg/ports/klein/usage @@ -0,0 +1,10 @@ +The package klein:x64-windows provides CMake targets: + + find_package(klein CONFIG REQUIRED) + target_link_libraries(main PRIVATE klein::klein) + + # Or use the C++ 11 version + target_link_libraries(main PRIVATE klein::klein_cxx11) + + # Or use the SSE4.1 version + target_link_libraries(main PRIVATE klein::klein_sse42) diff --git a/externals/vcpkg/ports/klein/vcpkg.json b/externals/vcpkg/ports/klein/vcpkg.json new file mode 100755 index 000000000..9b6393b3b --- /dev/null +++ b/externals/vcpkg/ports/klein/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "klein", + "version-date": "2021-05-09", + "description": "Klein is an implementation of P(R*_{3, 0, 1}), aka 3D Projective Geometric Algebra. It is designed for applications that demand high-throughput (animation libraries, kinematic solvers, etc).", + "dependencies": [ + "simde", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/knet/portfile.cmake b/externals/vcpkg/ports/knet/portfile.cmake new file mode 100755 index 000000000..d3330ad11 --- /dev/null +++ b/externals/vcpkg/ports/knet/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kibaamor/knet + REF v1.1.0 + SHA512 22f46c2626c60798a99d7fe3027b675d40584df141fc1131a0d737df28f3e633ec798567defd131b08c3b3ec81069648ed45c2e37eacf37dc15ead45ab24ee55 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DKNET_ENABLE_LOG=OFF + -DKNET_SOCKET_STAT=OFF + -DKNET_BUILD_EXAMPLE=OFF + -DKNET_BUILD_TEST=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/knet) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/externals/vcpkg/ports/knet/usage b/externals/vcpkg/ports/knet/usage new file mode 100755 index 000000000..2a83afe1b --- /dev/null +++ b/externals/vcpkg/ports/knet/usage @@ -0,0 +1,4 @@ +The package knet provides CMake integration: + + find_package(knet CONFIG REQUIRED) + target_link_libraries(main PRIVATE knet) diff --git a/externals/vcpkg/ports/knet/vcpkg.json b/externals/vcpkg/ports/knet/vcpkg.json new file mode 100755 index 000000000..a5a5c2411 --- /dev/null +++ b/externals/vcpkg/ports/knet/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "knet", + "version": "1.1.0", + "port-version": 1, + "description": "A cross platform lock-free and timer-supported C++11 network library.", + "homepage": "https://github.com/kibaamor/knet", + "license": "MIT", + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/krabsetw/portfile.cmake b/externals/vcpkg/ports/krabsetw/portfile.cmake new file mode 100755 index 000000000..ee321fc61 --- /dev/null +++ b/externals/vcpkg/ports/krabsetw/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/krabsetw + REF 31679cf84bc85360158672699f2f68a821e8a6d0 + SHA512 4fcc4ee1c41c6d40770a5b57111e6fd29eedf1f4a29038ab1dfb8bffb3ad0464c4ec06b90b65fabadcd419564d55172d4d9fdc3750c1898545f7c6e00fbe99c8 + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/krabs/krabs/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/krabs) +file(INSTALL ${SOURCE_PATH}/krabs/krabs.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/krabsetw/vcpkg.json b/externals/vcpkg/ports/krabsetw/vcpkg.json new file mode 100755 index 000000000..9027ddacb --- /dev/null +++ b/externals/vcpkg/ports/krabsetw/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "krabsetw", + "version": "4.1.18", + "port-version": 1, + "description": "krabsetw is a header-only C++ library that simplifies interacting with ETW.", + "homepage": "https://github.com/microsoft/krabsetw", + "supports": "windows & !uwp" +} diff --git a/externals/vcpkg/ports/ktx/0001-Use-vcpkg-zstd.patch b/externals/vcpkg/ports/ktx/0001-Use-vcpkg-zstd.patch new file mode 100755 index 000000000..47a798eab --- /dev/null +++ b/externals/vcpkg/ports/ktx/0001-Use-vcpkg-zstd.patch @@ -0,0 +1,108 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8ca40f8..84fcb18 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -174,7 +174,6 @@ set(KTX_MAIN_SRC + lib/basisu/transcoder/basisu_transcoder.cpp + lib/basisu/transcoder/basisu_transcoder.h + lib/basisu/transcoder/basisu.h +- lib/basisu/zstd/zstd.c + lib/checkheader.c + lib/dfdutils/createdfd.c + lib/dfdutils/colourspaces.c +@@ -284,7 +283,6 @@ macro(commom_lib_settings lib write) + $ + + $ +- $ + + $ + $ +@@ -361,6 +359,11 @@ macro(commom_lib_settings lib write) + endif() + + if(WIN32) ++ find_package(zstd CONFIG REQUIRED) ++ target_link_libraries( ++ ${lib} PRIVATE ++ $,zstd::libzstd_shared,zstd::libzstd_static> ++ ) + # By wrapping in generator expression we force multi configuration + # generators (like Visual Studio) to take the exact path and not + # change it. +diff --git a/lib/basisu/CMakeLists.txt b/lib/basisu/CMakeLists.txt +index 492233a..8786d16 100644 +--- a/lib/basisu/CMakeLists.txt ++++ b/lib/basisu/CMakeLists.txt +@@ -146,7 +146,7 @@ set(BASISU_SRC_LIST ${COMMON_SRC_LIST} + ) + + if (ZSTD) +- set(BASISU_SRC_LIST ${BASISU_SRC_LIST} zstd/zstd.c) ++ set(ZSTD_LIBRARIES "$,zstd::libzstd_shared,zstd::libzstd_static>") + endif() + + if (APPLE) +@@ -165,6 +165,10 @@ else() + target_compile_definitions(basisu PRIVATE BASISD_SUPPORT_KTX2_ZSTD=0) + endif() + ++if(ZSTD_LIBRARIES) ++ target_link_libraries(basisu ${ZSTD_LIBRARIES}) ++endif() ++ + if (NOT MSVC) + # For Non-Windows builds, let cmake try and find the system OpenCL headers/libs for us. + if (OPENCL_FOUND) +diff --git a/lib/basisu/webgl/encoder/CMakeLists.txt b/lib/basisu/webgl/encoder/CMakeLists.txt +index 588d91b..0b38012 100644 +--- a/lib/basisu/webgl/encoder/CMakeLists.txt ++++ b/lib/basisu/webgl/encoder/CMakeLists.txt +@@ -34,9 +34,7 @@ if (EMSCRIPTEN) + ) + + if (KTX2_ZSTANDARD) +- set(SRC_LIST ${SRC_LIST} +- ../../zstd/zstd.c +- ) ++ set(ZSTD_LIBRARIES "$,zstd::libzstd_shared,zstd::libzstd_static>") + set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=1) + else() + set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=0) +@@ -56,6 +54,10 @@ if (EMSCRIPTEN) + + target_include_directories(basis_encoder.js PRIVATE ../../transcoder) + ++ if(ZSTD_LIBRARIES) ++ target_link_libraries(basis_encoder.js ${ZSTD_LIBRARIES}) ++ endif() ++ + set_target_properties(basis_encoder.js PROPERTIES + OUTPUT_NAME "basis_encoder" + SUFFIX ".js" +diff --git a/lib/basisu/webgl/transcoder/CMakeLists.txt b/lib/basisu/webgl/transcoder/CMakeLists.txt +index 372653d..f75e3a3 100644 +--- a/lib/basisu/webgl/transcoder/CMakeLists.txt ++++ b/lib/basisu/webgl/transcoder/CMakeLists.txt +@@ -28,9 +28,7 @@ if (EMSCRIPTEN) + endif() + + if (KTX2_ZSTANDARD) +- set(SRC_LIST ${SRC_LIST} +- ../../zstd/zstddeclib.c +- ) ++ set(ZSTD_LIBRARIES "$,zstd::libzstd_shared,zstd::libzstd_static>") + set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=1) + else() + set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=0) +@@ -45,6 +43,10 @@ if (EMSCRIPTEN) + target_compile_options(basis_transcoder.js PRIVATE -O3 -fno-strict-aliasing) + target_include_directories(basis_transcoder.js PRIVATE ../../transcoder) + ++ if(ZSTD_LIBRARIES) ++ target_link_libraries(basis_transcoder.js ${ZSTD_LIBRARIES}) ++ endif() ++ + set_target_properties(basis_transcoder.js PROPERTIES + OUTPUT_NAME "basis_transcoder" + SUFFIX ".js" diff --git a/externals/vcpkg/ports/ktx/0002-Fix-versioning.patch b/externals/vcpkg/ports/ktx/0002-Fix-versioning.patch new file mode 100755 index 000000000..1e5098806 --- /dev/null +++ b/externals/vcpkg/ports/ktx/0002-Fix-versioning.patch @@ -0,0 +1,17 @@ +diff --git a/cmake/version.cmake b/cmake/version.cmake +index 4094df1a..3b2af3bb 100644 +--- a/cmake/version.cmake ++++ b/cmake/version.cmake +@@ -108,8 +108,10 @@ function(generate_version _var ) + set(${_var} "${KTX_VERSION}" PARENT_SCOPE) + endfunction() + +-# Get latest tag +-git_describe_raw(KTX_VERSION_FULL --abbrev=0 --match v[0-9]*) ++if (!KTX_VERSION_FULL) ++ # Get latest tag ++ git_describe_raw(KTX_VERSION_FULL --abbrev=0 --match v[0-9]*) ++endif() + #message("KTX full version: ${KTX_VERSION_FULL}") + + # generate_version(TOKTX_VERSION tools/toktx) diff --git a/externals/vcpkg/ports/ktx/portfile.cmake b/externals/vcpkg/ports/ktx/portfile.cmake new file mode 100755 index 000000000..92db9f258 --- /dev/null +++ b/externals/vcpkg/ports/ktx/portfile.cmake @@ -0,0 +1,77 @@ +set(PORT_VERSION 4.1.0-rc1) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KhronosGroup/KTX-Software + REF af6df0267b07bf5d4278837e5350f97bcbdcc870 #v${PORT_VERSION} + SHA512 00e5c37ec1922bae7903e3b51ac61e44d815bd606e12104c87b3c8d89e04b5d81f8d502712d8d6c9420aa21289c93c6ef01d0a4091062d03aae07b7fbfce5f74 + HEAD_REF master + FILE_DISAMBIGUATOR 1 + PATCHES + 0001-Use-vcpkg-zstd.patch + 0002-Fix-versioning.patch +) + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_acquire_msys(MSYS_ROOT + PACKAGES + bash + DIRECT_PACKAGES + # Required for "getopt" + "https://repo.msys2.org/msys/x86_64/util-linux-2.35.2-1-x86_64.pkg.tar.zst" + ff951c2cd96d0fda87bacb505c93e4aa1f9aeb35f829c52b5a7862d05e167f69605a4927a0e7197b5ee2b2fa5cb56619ad7a6ba293ede4765fdcacedf2ed35da + ) + vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") + + file(REMOVE + "${SOURCE_PATH}/other_include/zstd.h" + "${SOURCE_PATH}/other_include/zstd_errors.h") +endif() + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools KTX_FEATURE_TOOLS + vulkan KTX_FEATURE_VULKAN +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DKTX_VERSION_FULL=v${PORT_VERSION} + -DKTX_FEATURE_TESTS=OFF + -DKTX_FEATURE_LOADTEST_APPS=OFF + -DKTX_FEATURE_STATIC_LIBRARY=${ENABLE_STATIC} + ${FEATURE_OPTIONS} + DISABLE_PARALLEL_CONFIGURE +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +if(tools IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES + toktx + ktxsc + ktxinfo + ktx2ktx2 + ktx2check + AUTO_CLEAN + ) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +endif() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ktx) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +configure_file("${SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +file(COPY ${LICENSE_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSES") diff --git a/externals/vcpkg/ports/ktx/vcpkg.json b/externals/vcpkg/ports/ktx/vcpkg.json new file mode 100755 index 000000000..f307ce9f8 --- /dev/null +++ b/externals/vcpkg/ports/ktx/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "ktx", + "version-semver": "4.1.0-rc1", + "description": "A small library of functions for writing and reading KTX files, and instantiating OpenGL®, OpenGL ESâ„¢ï¸ and Vulkan® textures from them", + "homepage": "https://github.com/KhronosGroup/KTX-Software", + "license": "Apache-2.0", + "supports": "!(uwp | x86 | arm64)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zstd" + ], + "features": { + "tools": { + "description": "Build tools" + }, + "vulkan": { + "description": "Build Vulkan support" + } + } +} diff --git a/externals/vcpkg/ports/kubazip/fix_targets.patch b/externals/vcpkg/ports/kubazip/fix_targets.patch new file mode 100755 index 000000000..e5ffb8608 --- /dev/null +++ b/externals/vcpkg/ports/kubazip/fix_targets.patch @@ -0,0 +1,52 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 55dfc77..f0182f9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,6 @@ + cmake_minimum_required(VERSION 3.4) + +-project(zip ++project(kubazip + LANGUAGES C + VERSION "0.1.19") + set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) +@@ -15,7 +15,7 @@ if (MSVC) + elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR + "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR + "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -Werror -pedantic") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -pedantic") + endif (MSVC) + + # zip +@@ -37,7 +37,7 @@ endif() + + target_include_directories(${PROJECT_NAME} PUBLIC + $ +- $ ++ $ + ) + + # test +@@ -52,7 +52,7 @@ endif() + # Installation (https://github.com/forexample/package-example) { + + set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}") +-set(INCLUDE_INSTALL_DIR "include") ++set(INCLUDE_INSTALL_DIR "include/${PROJECT_NAME}") + + set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 04c2123..002cf5a 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.4) + set(test_out test.out) + + add_executable(${test_out} test.c) +-target_link_libraries(${test_out} zip) ++target_link_libraries(${test_out} kubazip) + + add_test(NAME ${test_out} COMMAND ${test_out}) + diff --git a/externals/vcpkg/ports/kubazip/portfile.cmake b/externals/vcpkg/ports/kubazip/portfile.cmake new file mode 100755 index 000000000..ba2f488e0 --- /dev/null +++ b/externals/vcpkg/ports/kubazip/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kuba--/zip + REF 96924c94dabe362bbb1588aa70209e638e6fb35c + SHA512 bc3e9ecf39d54321314d09209f356a2491893591a016b1619abcdea8c1fb1fa8ba1f9858f4e758641df083ed237a2ec9f0af13e0f1d802502257644168ae8907 + HEAD_REF master + PATCHES + fix_targets.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/kubazip) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL ${SOURCE_PATH}/UNLICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/kubazip/vcpkg.json b/externals/vcpkg/ports/kubazip/vcpkg.json new file mode 100755 index 000000000..1eecb26ba --- /dev/null +++ b/externals/vcpkg/ports/kubazip/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "kubazip", + "version-string": "0.1.19", + "port-version": 1, + "description": "A portable, simple zip library written in C", + "homepage": "https://github.com/kuba--/zip" +} diff --git a/externals/vcpkg/ports/kubernetes/001-fix-destination.patch b/externals/vcpkg/ports/kubernetes/001-fix-destination.patch new file mode 100755 index 000000000..9169ac3ee --- /dev/null +++ b/externals/vcpkg/ports/kubernetes/001-fix-destination.patch @@ -0,0 +1,12 @@ +diff --git a/kubernetes/CMakeLists.txt b/kubernetes/CMakeLists.txt +--- a/kubernetes/CMakeLists.txt (revision 80aff0a1c71c2cb8a1ab4b73e0592f0f88c59376) ++++ b/kubernetes/CMakeLists.txt (date 1642600807646) +@@ -1255,7 +1255,7 @@ + install(TARGETS ${pkgName} DESTINATION lib) + else() + include(GNUInstallDirs) +- install(TARGETS ${pkgName} DESTINATION lib EXPORT ${pkgName}Targets) ++ install(TARGETS ${pkgName} EXPORT ${pkgName}Targets) + + foreach(HDR_FILE ${HDRS}) + get_filename_component(HDR_DIRECTORY ${HDR_FILE} DIRECTORY) diff --git a/externals/vcpkg/ports/kubernetes/portfile.cmake b/externals/vcpkg/ports/kubernetes/portfile.cmake new file mode 100755 index 000000000..ff554cf66 --- /dev/null +++ b/externals/vcpkg/ports/kubernetes/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kubernetes-client/c + REF 5eab1ef0a855d1707b3ef01adb2c4b545a01f36d + SHA512 a45ff221cfdddd8add0d8a04d75906e369e84b192cb7d0611a22f28ac81e0bb0c29cb71faa2bc352100aadacd7467fc2700c25f074654b7a9d75c80d86b71296 + HEAD_REF master + PATCHES + 001-fix-destination.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH}/kubernetes +) + +vcpkg_cmake_install() + +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +endif() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/kubernetes/vcpkg.json b/externals/vcpkg/ports/kubernetes/vcpkg.json new file mode 100755 index 000000000..0a0a186fb --- /dev/null +++ b/externals/vcpkg/ports/kubernetes/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "kubernetes", + "version-date": "2022-01-19", + "port-version": 1, + "description": "Kubernetes C client", + "homepage": "https://github.com/kubernetes-client/c/", + "supports": "!uwp", + "dependencies": [ + "curl", + "libwebsockets", + "libyaml", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/kuku/portfile.cmake b/externals/vcpkg/ports/kuku/portfile.cmake new file mode 100755 index 000000000..98ff18775 --- /dev/null +++ b/externals/vcpkg/ports/kuku/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/Kuku + REF 1338c4ae2211ab4c739022ff57f48ce5a76531d5 + SHA512 6cba13b7fc8c453acbfcb4921ee3acc9c3e91d4bba0e01480ea396e17f85288d0179342090111a2e3c056b6918c7b09ec63c41116eb4021e63c54acc19631156 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Kuku-2.1) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/kuku/vcpkg.json b/externals/vcpkg/ports/kuku/vcpkg.json new file mode 100755 index 000000000..2f7b13515 --- /dev/null +++ b/externals/vcpkg/ports/kuku/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "kuku", + "version-string": "2.1", + "port-version": 1, + "description": "Kuku is a simple open-source (MIT licensed) cuckoo hashing library developed by the Cryptography and Privacy Research group at Microsoft.", + "homepage": "https://github.com/microsoft/Kuku" +} diff --git a/externals/vcpkg/ports/kvasir-mpl/portfile.cmake b/externals/vcpkg/ports/kvasir-mpl/portfile.cmake new file mode 100755 index 000000000..7208bcc8a --- /dev/null +++ b/externals/vcpkg/ports/kvasir-mpl/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kvasir-io/mpl + REF a9060b46c37c769e5517e0116b060fec923b6fdb + SHA512 bbe7267d288eda9ded81ce82e428d237cb5a9d686cd1b68a334b1ae53db4bf25e37fb86d991e7cf61542ee91ccae8db7498efde91a07332fd68594a229ff35ca + HEAD_REF development +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + test BUILD_WITH_TEST +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DBUILD_TESTING=${BUILD_WITH_TEST} +) + +vcpkg_install_cmake() + +# Move CMake config files to the right place +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/kvasir_mpl) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/kvasir-mpl/vcpkg.json b/externals/vcpkg/ports/kvasir-mpl/vcpkg.json new file mode 100755 index 000000000..4d817575a --- /dev/null +++ b/externals/vcpkg/ports/kvasir-mpl/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "kvasir-mpl", + "version-string": "2019-08-06", + "port-version": 1, + "description": "This library is part of the Kvasir project. Kvasir is a collection of zero cost statically checked libraries for resource constrained systems including microcontrollers.", + "homepage": "https://github.com/kvasir-io/mpl", + "features": { + "test": { + "description": "Build with test" + } + } +} diff --git a/externals/vcpkg/ports/kwsys/portfile.cmake b/externals/vcpkg/ports/kwsys/portfile.cmake new file mode 100755 index 000000000..6b8879d89 --- /dev/null +++ b/externals/vcpkg/ports/kwsys/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.kitware.com + OUT_SOURCE_PATH SOURCE_PATH + REPO utils/kwsys + REF dbc94f37f9821899aad441bcab525ad96a3f30dc #2021-08-06 + SHA512 98441866fd51f2d4d3974d3c37d4456ce9e50c6f6c2ab0691e55b268907611ef061562fc30b1baa42aa195caf2281aa0e1e0799abc545fe6dae70efe2050ea50 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DKWSYS_INSTALL_INCLUDE_DIR=${CURRENT_PACKAGES_DIR}/include + OPTIONS_RELEASE + -DKWSYS_INSTALL_BIN_DIR=${CURRENT_PACKAGES_DIR}/bin + -DKWSYS_INSTALL_LIB_DIR=${CURRENT_PACKAGES_DIR}/lib + OPTIONS_DEBUG + -DKWSYS_INSTALL_BIN_DIR=${CURRENT_PACKAGES_DIR}/debug/bin + -DKWSYS_INSTALL_LIB_DIR=${CURRENT_PACKAGES_DIR}/debug/lib +) + +vcpkg_cmake_install() + + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/kwsys/vcpkg.json b/externals/vcpkg/ports/kwsys/vcpkg.json new file mode 100755 index 000000000..6a6c4c3f8 --- /dev/null +++ b/externals/vcpkg/ports/kwsys/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "kwsys", + "version-date": "2021-08-06", + "port-version": 1, + "description": "Provides platform-independent APIs to many common system features", + "homepage": "https://gitlab.kitware.com/utils/kwsys", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/lager/portfile.cmake b/externals/vcpkg/ports/lager/portfile.cmake new file mode 100755 index 000000000..ed2bb6da5 --- /dev/null +++ b/externals/vcpkg/ports/lager/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO arximboldi/lager + REF c87a4c7fd0368bea346f41191b8bc0b54a3e9d80 + SHA512 788586078fdc07f0bd899148ddb0ad255fc6e18254901de65c2d1e43f9637ed8a8c121e8d0d26f043e86c7764ea1ff6ce323a791ba7d577589b4c80a329619d4 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + docs lager_BUILD_DOCS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dlager_BUILD_EXAMPLES=OFF + -Dlager_BUILD_TESTS=OFF + ${FEATURE_OPTIONS} +) + + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Lager) + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/lager/resources_path.hpp" "${CURRENT_PACKAGES_DIR}" ".") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/lager/vcpkg.json b/externals/vcpkg/ports/lager/vcpkg.json new file mode 100755 index 000000000..ee05059aa --- /dev/null +++ b/externals/vcpkg/ports/lager/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "lager", + "version-date": "2022-02-21", + "description": "C++ library for value-oriented design using the unidirectional data-flow architecture", + "homepage": "https://sinusoid.es/lager/", + "dependencies": [ + "boost-hana", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zug" + ], + "features": { + "docs": { + "description": "Build documentation" + } + } +} diff --git a/externals/vcpkg/ports/lapack-reference/FindLAPACK.cmake b/externals/vcpkg/ports/lapack-reference/FindLAPACK.cmake new file mode 100755 index 000000000..f4d25477d --- /dev/null +++ b/externals/vcpkg/ports/lapack-reference/FindLAPACK.cmake @@ -0,0 +1,559 @@ +# Distributed under the OSI-approved BSD 3-Clause License. See accompanying +# file Copyright.txt or https://cmake.org/licensing for details. + +#[=======================================================================[.rst: +FindLAPACK +---------- + +Find Linear Algebra PACKage (LAPACK) library + +This module finds an installed Fortran library that implements the +LAPACK linear-algebra interface (see http://www.netlib.org/lapack/). + +The approach follows that taken for the ``autoconf`` macro file, +``acx_lapack.m4`` (distributed at +http://ac-archive.sourceforge.net/ac-archive/acx_lapack.html). + +Input Variables +^^^^^^^^^^^^^^^ + +The following variables may be set to influence this module's behavior: + +``BLA_STATIC`` + if ``ON`` use static linkage + +``BLA_VENDOR`` + If set, checks only the specified vendor, if not set checks all the + possibilities. List of vendors valid in this module: + + * ``OpenBLAS`` + * ``FLAME`` + * ``Intel10_32`` (intel mkl v10 32 bit) + * ``Intel10_64lp`` (intel mkl v10+ 64 bit, threaded code, lp64 model) + * ``Intel10_64lp_seq`` (intel mkl v10+ 64 bit, sequential code, lp64 model) + * ``Intel10_64ilp`` (intel mkl v10+ 64 bit, threaded code, ilp64 model) + * ``Intel10_64ilp_seq`` (intel mkl v10+ 64 bit, sequential code, ilp64 model) + * ``Intel10_64_dyn`` (intel mkl v10+ 64 bit, single dynamic library) + * ``Intel`` (obsolete versions of mkl 32 and 64 bit) + * ``ACML`` + * ``Apple`` + * ``NAS`` + * ``Arm`` + * ``Arm_mp`` + * ``Arm_ilp64`` + * ``Arm_ilp64_mp`` + * ``Generic`` + +``BLA_F95`` + if ``ON`` tries to find the BLAS95/LAPACK95 interfaces + +Imported targets +^^^^^^^^^^^^^^^^ + +This module defines the following :prop_tgt:`IMPORTED` target: + +``LAPACK::LAPACK`` + The libraries to use for LAPACK, if found. + +Result Variables +^^^^^^^^^^^^^^^^ + +This module defines the following variables: + +``LAPACK_FOUND`` + library implementing the LAPACK interface is found +``LAPACK_LINKER_FLAGS`` + uncached list of required linker flags (excluding ``-l`` and ``-L``). +``LAPACK_LIBRARIES`` + uncached list of libraries (using full path name) to link against + to use LAPACK +``LAPACK95_LIBRARIES`` + uncached list of libraries (using full path name) to link against + to use LAPACK95 +``LAPACK95_FOUND`` + library implementing the LAPACK95 interface is found + +.. note:: + + C, CXX or Fortran must be enabled to detect a BLAS/LAPACK library. + C or CXX must be enabled to use Intel Math Kernel Library (MKL). + + For example, to use Intel MKL libraries and/or Intel compiler: + + .. code-block:: cmake + + set(BLA_VENDOR Intel10_64lp) + find_package(LAPACK) +#]=======================================================================] + +enable_language(C) +# Check the language being used +if(NOT (CMAKE_C_COMPILER_LOADED OR CMAKE_CXX_COMPILER_LOADED OR CMAKE_Fortran_COMPILER_LOADED)) + if(LAPACK_FIND_REQUIRED) + message(FATAL_ERROR "FindLAPACK requires Fortran, C, or C++ to be enabled.") + else() + message(STATUS "Looking for LAPACK... - NOT found (Unsupported languages)") + return() + endif() +endif() + +if(CMAKE_Fortran_COMPILER_LOADED) + include(${CMAKE_ROOT}/Modules/CheckFortranFunctionExists.cmake) +else() + include(${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake) +endif() +include(${CMAKE_ROOT}/Modules/CMakePushCheckState.cmake) + +cmake_push_check_state() +set(CMAKE_REQUIRED_QUIET ${LAPACK_FIND_QUIETLY}) + +set(LAPACK_FOUND FALSE) +set(LAPACK95_FOUND FALSE) + +# store original values for CMAKE_FIND_LIBRARY_SUFFIXES +set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") + list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES .so.3gfs .so.3 .so.4 .so.5) +endif() + +# TODO: move this stuff to a separate module + +macro(CHECK_LAPACK_LIBRARIES LIBRARIES _prefix _name _flags _list _threadlibs _addlibdir _subdirs _blas) + # This macro checks for the existence of the combination of fortran libraries + # given by _list. If the combination is found, this macro checks (using the + # Check_Fortran_Function_Exists macro) whether can link against that library + # combination using the name of a routine given by _name using the linker + # flags given by _flags. If the combination of libraries is found and passes + # the link test, LIBRARIES is set to the list of complete library paths that + # have been found. Otherwise, LIBRARIES is set to FALSE. + + # N.B. _prefix is the prefix applied to the names of all cached variables that + # are generated internally and marked advanced by this macro. + # _addlibdir is a list of additional search paths. _subdirs is a list of path + # suffixes to be used by find_library(). + + set(_libraries_work TRUE) + set(${LIBRARIES}) + set(_combined_name) + + set(_extaddlibdir "${_addlibdir}") + if(WIN32) + list(APPEND _extaddlibdir ENV LIB) + elseif(APPLE) + list(APPEND _extaddlibdir ENV DYLD_LIBRARY_PATH) + else() + list(APPEND _extaddlibdir ENV LD_LIBRARY_PATH) + endif() + list(APPEND _extaddlibdir "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}") + + foreach(_library ${_list}) + if(_library MATCHES "^-Wl,--(start|end)-group$") + # Respect linker flags like --start/end-group (required by MKL) + set(${LIBRARIES} ${${LIBRARIES}} "${_library}") + else() + set(_combined_name ${_combined_name}_${_library}) + if(_libraries_work) + find_library(${_prefix}_${_library}_LIBRARY + NAMES ${_library} + PATHS ${_extaddlibdir} + PATH_SUFFIXES ${_subdirs} + ) + #message("DEBUG: find_library(${_library}) got ${${_prefix}_${_library}_LIBRARY}") + mark_as_advanced(${_prefix}_${_library}_LIBRARY) + set(${LIBRARIES} ${${LIBRARIES}} ${${_prefix}_${_library}_LIBRARY}) + set(_libraries_work ${${_prefix}_${_library}_LIBRARY}) + endif() + endif() + endforeach() + + if(_libraries_work) + # Test this combination of libraries. + set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}} ${_blas} ${_threadlibs}) + #message("DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES}") + if(CMAKE_Fortran_COMPILER_LOADED) + check_fortran_function_exists("${_name}" ${_prefix}${_combined_name}_WORKS) + else() + check_function_exists("${_name}_" ${_prefix}${_combined_name}_WORKS) + endif() + set(CMAKE_REQUIRED_LIBRARIES) + set(_libraries_work ${${_prefix}${_combined_name}_WORKS}) + endif() + + if(_libraries_work) + if("${_list}${_blas}" STREQUAL "") + set(${LIBRARIES} "${LIBRARIES}-PLACEHOLDER-FOR-EMPTY-LIBRARIES") + else() + set(${LIBRARIES} ${${LIBRARIES}} ${_blas} ${_threadlibs}) + endif() + else() + set(${LIBRARIES} FALSE) + endif() + #message("DEBUG: ${LIBRARIES} = ${${LIBRARIES}}") +endmacro() + +set(LAPACK_LINKER_FLAGS) +set(LAPACK_LIBRARIES) +set(LAPACK95_LIBRARIES) + +include(CMakeFindDependencyMacro) +find_dependency(BLAS) + +if(BLAS_FOUND) + set(LAPACK_LINKER_FLAGS ${BLAS_LINKER_FLAGS}) + if(NOT $ENV{BLA_VENDOR} STREQUAL "") + set(BLA_VENDOR $ENV{BLA_VENDOR}) + else() + if(NOT BLA_VENDOR) + set(BLA_VENDOR "All") + endif() + endif() + + # LAPACK in the Intel MKL 10+ library? + if(BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All") + if(NOT LAPACK_LIBRARIES) + if(CMAKE_C_COMPILER_LOADED OR CMAKE_CXX_COMPILER_LOADED) + # System-specific settings + if(NOT WIN32) + set(LAPACK_mkl_LM "-lm") + set(LAPACK_mkl_LDL "-ldl") + endif() + + if(LAPACK_FIND_QUIETLY OR NOT LAPACK_FIND_REQUIRED) + find_package(Threads) + else() + find_package(Threads REQUIRED) + endif() + + if(BLA_VENDOR MATCHES "_64ilp") + set(LAPACK_mkl_ILP_MODE "ilp64") + else() + set(LAPACK_mkl_ILP_MODE "lp64") + endif() + + set(LAPACK_SEARCH_LIBS "") + + if(BLA_F95) + set(LAPACK_mkl_SEARCH_SYMBOL "cheev_f95") + set(_LIBRARIES LAPACK95_LIBRARIES) + set(_BLAS_LIBRARIES ${BLAS95_LIBRARIES}) + + # old + list(APPEND LAPACK_SEARCH_LIBS + "mkl_lapack95") + # new >= 10.3 + list(APPEND LAPACK_SEARCH_LIBS + "mkl_intel_c") + list(APPEND LAPACK_SEARCH_LIBS + "mkl_lapack95_${LAPACK_mkl_ILP_MODE}") + else() + set(LAPACK_mkl_SEARCH_SYMBOL "cheev") + set(_LIBRARIES LAPACK_LIBRARIES) + set(_BLAS_LIBRARIES ${BLAS_LIBRARIES}) + + # old and new >= 10.3 + list(APPEND LAPACK_SEARCH_LIBS + "mkl_lapack") + endif() + + # MKL uses a multitude of partially platform-specific subdirectories: + if(BLA_VENDOR STREQUAL "Intel10_32") + set(LAPACK_mkl_ARCH_NAME "ia32") + else() + set(LAPACK_mkl_ARCH_NAME "intel64") + endif() + if(WIN32) + set(LAPACK_mkl_OS_NAME "win") + elseif(APPLE) + set(LAPACK_mkl_OS_NAME "mac") + else() + set(LAPACK_mkl_OS_NAME "lin") + endif() + if(DEFINED ENV{MKLROOT}) + file(TO_CMAKE_PATH "$ENV{MKLROOT}" LAPACK_mkl_MKLROOT) + # If MKLROOT points to the subdirectory 'mkl', use the parent directory instead + # so we can better detect other relevant libraries in 'compiler' or 'tbb': + get_filename_component(LAPACK_mkl_MKLROOT_LAST_DIR "${LAPACK_mkl_MKLROOT}" NAME) + if(LAPACK_mkl_MKLROOT_LAST_DIR STREQUAL "mkl") + get_filename_component(LAPACK_mkl_MKLROOT "${LAPACK_mkl_MKLROOT}" DIRECTORY) + endif() + endif() + set(LAPACK_mkl_LIB_PATH_SUFFIXES + "compiler/lib" "compiler/lib/${LAPACK_mkl_ARCH_NAME}_${LAPACK_mkl_OS_NAME}" + "mkl/lib" "mkl/lib/${LAPACK_mkl_ARCH_NAME}_${LAPACK_mkl_OS_NAME}" + "lib/${LAPACK_mkl_ARCH_NAME}_${LAPACK_mkl_OS_NAME}") + + # First try empty lapack libs + if(NOT ${_LIBRARIES}) + check_lapack_libraries( + ${_LIBRARIES} + LAPACK + ${LAPACK_mkl_SEARCH_SYMBOL} + "" + "" + "${CMAKE_THREAD_LIBS_INIT};${LAPACK_mkl_LM};${LAPACK_mkl_LDL}" + "${LAPACK_mkl_MKLROOT}" + "${LAPACK_mkl_LIB_PATH_SUFFIXES}" + "${_BLAS_LIBRARIES}" + ) + endif() + + # Then try the search libs + foreach(IT ${LAPACK_SEARCH_LIBS}) + string(REPLACE " " ";" SEARCH_LIBS ${IT}) + if(NOT ${_LIBRARIES}) + check_lapack_libraries( + ${_LIBRARIES} + LAPACK + ${LAPACK_mkl_SEARCH_SYMBOL} + "" + "${SEARCH_LIBS}" + "${CMAKE_THREAD_LIBS_INIT};${LAPACK_mkl_LM};${LAPACK_mkl_LDL}" + "${LAPACK_mkl_MKLROOT}" + "${LAPACK_mkl_LIB_PATH_SUFFIXES}" + "${_BLAS_LIBRARIES}" + ) + endif() + endforeach() + + unset(LAPACK_mkl_ILP_MODE) + unset(LAPACK_mkl_SEARCH_SYMBOL) + unset(LAPACK_mkl_LM) + unset(LAPACK_mkl_LDL) + unset(LAPACK_mkl_MKLROOT) + unset(LAPACK_mkl_ARCH_NAME) + unset(LAPACK_mkl_OS_NAME) + unset(LAPACK_mkl_LIB_PATH_SUFFIXES) + endif() + endif() + endif() + + # gotoblas? (http://www.tacc.utexas.edu/tacc-projects/gotoblas2) + if(BLA_VENDOR STREQUAL "Goto" OR BLA_VENDOR STREQUAL "All") + if(NOT LAPACK_LIBRARIES) + check_lapack_libraries( + LAPACK_LIBRARIES + LAPACK + cheev + "" + "goto2" + "" + "" + "" + "${BLAS_LIBRARIES}" + ) + endif() + endif() + + # OpenBLAS? (http://www.openblas.net) + if(BLA_VENDOR STREQUAL "OpenBLAS" OR BLA_VENDOR STREQUAL "All") + if(NOT LAPACK_LIBRARIES) + check_lapack_libraries( + LAPACK_LIBRARIES + LAPACK + cheev + "" + "openblas" + "" + "" + "" + "${BLAS_LIBRARIES}" + ) + endif() + endif() + + # ArmPL? (https://developer.arm.com/tools-and-software/server-and-hpc/compile/arm-compiler-for-linux/arm-performance-libraries) + if(BLA_VENDOR MATCHES "Arm" OR BLA_VENDOR STREQUAL "All") + + # Check for 64bit Integer support + if(BLA_VENDOR MATCHES "_ilp64") + set(LAPACK_armpl_LIB "armpl_ilp64") + else() + set(LAPACK_armpl_LIB "armpl_lp64") + endif() + + # Check for OpenMP support, VIA BLA_VENDOR of Arm_mp or Arm_ipl64_mp + if(BLA_VENDOR MATCHES "_mp") + set(LAPACK_armpl_LIB "${LAPACK_armpl_LIB}_mp") + endif() + + if(NOT LAPACK_LIBRARIES) + check_lapack_libraries( + LAPACK_LIBRARIES + LAPACK + cheev + "" + "${LAPACK_armpl_LIB}" + "" + "" + "" + "${BLAS_LIBRARIES}" + ) + endif() + endif() + + # FLAME's blis library? (https://github.com/flame/blis) + if(BLA_VENDOR STREQUAL "FLAME" OR BLA_VENDOR STREQUAL "All") + if(NOT LAPACK_LIBRARIES) + check_lapack_libraries( + LAPACK_LIBRARIES + LAPACK + cheev + "" + "flame" + "" + "" + "" + "${BLAS_LIBRARIES}" + ) + endif() + endif() + + # BLAS in acml library? + if(BLA_VENDOR MATCHES "ACML" OR BLA_VENDOR STREQUAL "All") + if(BLAS_LIBRARIES MATCHES ".+acml.+") + set(LAPACK_LIBRARIES ${BLAS_LIBRARIES}) + endif() + endif() + + # Apple LAPACK library? + if(BLA_VENDOR STREQUAL "Apple" OR BLA_VENDOR STREQUAL "All") + if(NOT LAPACK_LIBRARIES) + check_lapack_libraries( + LAPACK_LIBRARIES + LAPACK + cheev + "" + "Accelerate" + "" + "" + "" + "${BLAS_LIBRARIES}" + ) + endif() + endif() + + # Apple NAS (vecLib) library? + if(BLA_VENDOR STREQUAL "NAS" OR BLA_VENDOR STREQUAL "All") + if(NOT LAPACK_LIBRARIES) + check_lapack_libraries( + LAPACK_LIBRARIES + LAPACK + cheev + "" + "vecLib" + "" + "" + "" + "${BLAS_LIBRARIES}" + ) + endif() + endif() + + # Generic LAPACK library? + if(BLA_VENDOR STREQUAL "Generic" OR + BLA_VENDOR STREQUAL "ATLAS" OR + BLA_VENDOR STREQUAL "All") + if(NOT LAPACK_LIBRARIES) + check_lapack_libraries( + LAPACK_LIBRARIES + LAPACK + cheev + "" + "lapack" + "" + "" + "" + "${BLAS_LIBRARIES}" + ) + endif() + if(NOT LAPACK_LIBRARIES AND NOT WIN32) + check_lapack_libraries( + LAPACK_LIBRARIES + LAPACK + cheev + "" + "lapack;m;gfortran" + "" + "" + "" + "${BLAS_LIBRARIES}" + ) + endif() + endif() +else() + message(STATUS "LAPACK requires BLAS") +endif() + +if(BLA_F95) + if(LAPACK95_LIBRARIES) + set(LAPACK95_FOUND TRUE) + else() + set(LAPACK95_FOUND FALSE) + endif() + if(NOT LAPACK_FIND_QUIETLY) + if(LAPACK95_FOUND) + message(STATUS "A library with LAPACK95 API found.") + else() + if(LAPACK_FIND_REQUIRED) + message(FATAL_ERROR + "A required library with LAPACK95 API not found. Please specify library location." + ) + else() + message(STATUS + "A library with LAPACK95 API not found. Please specify library location." + ) + endif() + endif() + endif() + set(LAPACK_FOUND "${LAPACK95_FOUND}") + set(LAPACK_LIBRARIES "${LAPACK95_LIBRARIES}") +else() + if(LAPACK_LIBRARIES) + set(LAPACK_FOUND TRUE) + else() + set(LAPACK_FOUND FALSE) + endif() + + if(NOT LAPACK_FIND_QUIETLY) + if(LAPACK_FOUND) + message(STATUS "A library with LAPACK API found.") + else() + if(LAPACK_FIND_REQUIRED) + message(FATAL_ERROR + "A required library with LAPACK API not found. Please specify library location." + ) + else() + message(STATUS + "A library with LAPACK API not found. Please specify library location." + ) + endif() + endif() + endif() +endif() + +# On compilers that implicitly link LAPACK (such as ftn, cc, and CC on Cray HPC machines) +# we used a placeholder for empty LAPACK_LIBRARIES to get through our logic above. +if(LAPACK_LIBRARIES STREQUAL "LAPACK_LIBRARIES-PLACEHOLDER-FOR-EMPTY-LIBRARIES") + set(LAPACK_LIBRARIES "") +endif() + +if(NOT TARGET LAPACK::LAPACK) + add_library(LAPACK::LAPACK INTERFACE IMPORTED) + set(_lapack_libs "${LAPACK_LIBRARIES}") + if(_lapack_libs AND TARGET BLAS::BLAS) + # remove the ${BLAS_LIBRARIES} from the interface and replace it + # with the BLAS::BLAS target + list(REMOVE_ITEM _lapack_libs "${BLAS_LIBRARIES}") + endif() + + if(_lapack_libs) + set_target_properties(LAPACK::LAPACK PROPERTIES + INTERFACE_LINK_LIBRARIES "${_lapack_libs}" + ) + endif() + unset(_lapack_libs) +endif() + +cmake_pop_check_state() +# restore original values for CMAKE_FIND_LIBRARY_SUFFIXES +set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) diff --git a/externals/vcpkg/ports/lapack-reference/lapacke.patch b/externals/vcpkg/ports/lapack-reference/lapacke.patch new file mode 100755 index 000000000..964f0e319 --- /dev/null +++ b/externals/vcpkg/ports/lapack-reference/lapacke.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1ee66f1..7cec7ca 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -392,8 +392,9 @@ endif() + set(LAPACK_INSTALL_EXPORT_NAME ${LAPACK_INSTALL_EXPORT_NAME_CACHE}) + unset(LAPACK_INSTALL_EXPORT_NAME_CACHE) + +-add_subdirectory(LAPACKE) +- ++if(LAPACKE) ++ add_subdirectory(LAPACKE) ++endif() + + #------------------------------------- + # BLAS++ / LAPACK++ diff --git a/externals/vcpkg/ports/lapack-reference/portfile.cmake b/externals/vcpkg/ports/lapack-reference/portfile.cmake new file mode 100755 index 000000000..c536f3a6b --- /dev/null +++ b/externals/vcpkg/ports/lapack-reference/portfile.cmake @@ -0,0 +1,144 @@ +#TODO: Features to add: +# USE_XBLAS??? extended precision blas. needs xblas +# LAPACKE should be its own PORT +# USE_OPTIMIZED_LAPACK (Probably not what we want. Does a find_package(LAPACK): probably for LAPACKE only builds _> own port?) +# LAPACKE Builds LAPACKE +# LAPACKE_WITH_TMG Build LAPACKE with tmglib routines +if(EXISTS "${CURRENT_INSTALLED_DIR}/share/clapack/copyright") + message(FATAL_ERROR "Can't build ${PORT} if clapack is installed. Please remove clapack:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.") +endif() + +include(vcpkg_find_fortran) +SET(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +set(lapack_ver 3.10.1) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "Reference-LAPACK/lapack" + REF "v${lapack_ver}" + SHA512 0500bbbb48483208c0a35b74972ff0059c389da6032824a2079637266a99fa980882eedf7f1fc490219ee4ff27812ac8c6afe118e25f40a9c2387e7b997762fb + HEAD_REF master + PATCHES + lapacke.patch +) + +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(ENV{FFLAGS} "$ENV{FFLAGS} -fPIC") +endif() + +set(CBLAS OFF) +if("cblas" IN_LIST FEATURES) + set(CBLAS ON) + if("noblas" IN_LIST FEATURES) + message(FATAL_ERROR "Cannot built feature 'cblas' together with feature 'noblas'. cblas requires blas!") + endif() +endif() + +set(USE_OPTIMIZED_BLAS OFF) +if("noblas" IN_LIST FEATURES) + set(USE_OPTIMIZED_BLAS ON) + set(pcfile "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/openblas.pc") + if(EXISTS "${pcfile}") + file(CREATE_LINK "${pcfile}" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc" COPY_ON_ERROR) + endif() + set(pcfile "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig/openblas.pc") + if(EXISTS "${pcfile}") + file(CREATE_LINK "${pcfile}" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc" COPY_ON_ERROR) + endif() +endif() + +set(VCPKG_CRT_LINKAGE_BACKUP ${VCPKG_CRT_LINKAGE}) +vcpkg_find_fortran(FORTRAN_CMAKE) +if(VCPKG_USE_INTERNAL_Fortran) + if(VCPKG_CRT_LINKAGE_BACKUP STREQUAL static) + # If openblas has been built with static crt linkage we cannot use it with gfortran! + set(USE_OPTIMIZED_BLAS OFF) + #Cannot use openblas from vcpkg if we are building with gfortran here. + if("noblas" IN_LIST FEATURES) + message(FATAL_ERROR "Feature 'noblas' cannot be used without supplying an external fortran compiler") + endif() + endif() +else() + set(USE_OPTIMIZED_BLAS ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DUSE_OPTIMIZED_BLAS=${USE_OPTIMIZED_BLAS}" + "-DCBLAS=${CBLAS}" + ${FORTRAN_CMAKE} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME lapack-${lapack_ver} CONFIG_PATH lib/cmake/lapack-${lapack_ver}) #Should the target path be lapack and not lapack-reference? + +set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/lapack.pc") +if(EXISTS "${pcfile}") + file(READ "${pcfile}" _contents) + set(_contents "prefix=${CURRENT_INSTALLED_DIR}\n${_contents}") + file(WRITE "${pcfile}" "${_contents}") +endif() +set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/lapack.pc") +if(EXISTS "${pcfile}") + file(READ "${pcfile}" _contents) + set(_contents "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}") + file(WRITE "${pcfile}" "${_contents}") +endif() +if(NOT USE_OPTIMIZED_BLAS AND NOT (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")) + set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc") + if(EXISTS "${pcfile}") + file(READ "${pcfile}" _contents) + set(_contents "prefix=${CURRENT_INSTALLED_DIR}\n${_contents}") + file(WRITE "${pcfile}" "${_contents}") + endif() + set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc") + if(EXISTS "${pcfile}") + file(READ "${pcfile}" _contents) + set(_contents "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}") + file(WRITE "${pcfile}" "${_contents}") + endif() +endif() +if("cblas" IN_LIST FEATURES) + set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/cblas.pc") + if(EXISTS "${pcfile}") + file(READ "${pcfile}" _contents) + set(_contents "prefix=${CURRENT_INSTALLED_DIR}\n${_contents}") + file(WRITE "${pcfile}" "${_contents}") + endif() + set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cblas.pc") + if(EXISTS "${pcfile}") + file(READ "${pcfile}" _contents) + set(_contents "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}") + file(WRITE "${pcfile}" "${_contents}") + endif() +endif() +vcpkg_fixup_pkgconfig() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# remove debug includes +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +if(VCPKG_TARGET_IS_WINDOWS) + if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/liblapack.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/liblapack.lib" "${CURRENT_PACKAGES_DIR}/lib/lapack.lib") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/liblapack.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/liblapack.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/lapack.lib") + endif() + if(NOT USE_OPTIMIZED_BLAS) + if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/libblas.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libblas.lib" "${CURRENT_PACKAGES_DIR}/lib/blas.lib") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/libblas.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libblas.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/blas.lib") + endif() + endif() +endif() + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/lapack) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/lapack) diff --git a/externals/vcpkg/ports/lapack-reference/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/lapack-reference/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..b3a7128ff --- /dev/null +++ b/externals/vcpkg/ports/lapack-reference/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,11 @@ +message(STATUS "Using VCPKG FindLAPACK from package 'lapack-reference'") +set(LAPACK_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) + +list(REMOVE_ITEM ARGS "NO_MODULE") +list(REMOVE_ITEM ARGS "CONFIG") +list(REMOVE_ITEM ARGS "MODULE") + +_find_package(${ARGS}) + +set(CMAKE_MODULE_PATH ${LAPACK_PREV_MODULE_PATH}) diff --git a/externals/vcpkg/ports/lapack-reference/vcpkg.json b/externals/vcpkg/ports/lapack-reference/vcpkg.json new file mode 100755 index 000000000..b2fe5d699 --- /dev/null +++ b/externals/vcpkg/ports/lapack-reference/vcpkg.json @@ -0,0 +1,48 @@ +{ + "name": "lapack-reference", + "version": "3.10.1", + "description": "LAPACK - Linear Algebra PACKage", + "homepage": "http://www.netlib.org/lapack/", + "license": "BSD-3-Clause-Open-MPI", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + { + "name": "vcpkg-gfortran", + "platform": "windows" + } + ], + "default-features": [ + "blas-select" + ], + "features": { + "blas-select": { + "description": "Use external optimized BLAS", + "dependencies": [ + { + "name": "lapack-reference", + "default-features": false, + "features": [ + "noblas" + ], + "platform": "!windows | !static" + } + ] + }, + "cblas": { + "description": "Builds CBLAS" + }, + "noblas": { + "description": "Use external optimized BLAS", + "dependencies": [ + "blas" + ] + } + } +} diff --git a/externals/vcpkg/ports/lapack/CMakeLists.txt b/externals/vcpkg/ports/lapack/CMakeLists.txt new file mode 100755 index 000000000..ddd7883b1 --- /dev/null +++ b/externals/vcpkg/ports/lapack/CMakeLists.txt @@ -0,0 +1,4 @@ +cmake_minimum_required(VERSION 3.17) + +project(Find_LAPACK_external) +find_package(LAPACK REQUIRED) diff --git a/externals/vcpkg/ports/lapack/portfile.cmake b/externals/vcpkg/ports/lapack/portfile.cmake new file mode 100755 index 000000000..2a59fa726 --- /dev/null +++ b/externals/vcpkg/ports/lapack/portfile.cmake @@ -0,0 +1,5 @@ +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +# Make sure LAPACK can be found +vcpkg_configure_cmake(SOURCE_PATH ${CURRENT_PORT_DIR} + OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}") diff --git a/externals/vcpkg/ports/lapack/vcpkg.json b/externals/vcpkg/ports/lapack/vcpkg.json new file mode 100755 index 000000000..70a2aabec --- /dev/null +++ b/externals/vcpkg/ports/lapack/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "lapack", + "version-date": "2022-02-22", + "description": "Metapackage for packages which provide LAPACK", + "license": null, + "dependencies": [ + { + "name": "clapack", + "platform": "(arm & windows) | uwp" + }, + { + "name": "lapack-reference", + "platform": "!((arm & windows) | uwp)" + } + ] +} diff --git a/externals/vcpkg/ports/lastools/fix_install_paths_lastools.patch b/externals/vcpkg/ports/lastools/fix_install_paths_lastools.patch new file mode 100755 index 000000000..10bb34070 --- /dev/null +++ b/externals/vcpkg/ports/lastools/fix_install_paths_lastools.patch @@ -0,0 +1,27 @@ +diff --git a/LASlib/src/CMakeLists.txt b/LASlib/src/CMakeLists.txt +index 1b170bf..b5c40cb 100644 +--- a/LASlib/src/CMakeLists.txt ++++ b/LASlib/src/CMakeLists.txt +@@ -99,17 +99,8 @@ if(MSVC) + ) + endif() + ++install(TARGETS LASlib EXPORT LASlib-targets ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES ${LAS_INCLUDES} DESTINATION include/LASlib) +- +-if (MSVC) +- foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} ) +- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../lib/${OUTPUTCONFIG} DESTINATION lib/LASlib) +- endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES ) +-else() +- install(TARGETS LASlib EXPORT laslib-targets +- ARCHIVE DESTINATION lib/LASlib +- LIBRARY DESTINATION lib/LASlib +- RUNTIME DESTINATION lib/LASlib) +- install(EXPORT laslib-targets DESTINATION lib/cmake/LASlib) +- install(FILES ${CMAKE_SOURCE_DIR}/LASlib/src/laslib-config.cmake DESTINATION lib/cmake/LASlib) +-endif(MSVC) ++install(EXPORT LASlib-targets DESTINATION share/lastools/LASlib) ++install(FILES ${CMAKE_SOURCE_DIR}/LASlib/src/laslib-config.cmake DESTINATION share/lastools/LASlib) +\ No newline at end of file diff --git a/externals/vcpkg/ports/lastools/portfile.cmake b/externals/vcpkg/ports/lastools/portfile.cmake new file mode 100755 index 000000000..c21fb939e --- /dev/null +++ b/externals/vcpkg/ports/lastools/portfile.cmake @@ -0,0 +1,33 @@ +if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "${PORT} doesn't currently support UWP.") +endif() + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LAStools/LAStools + REF 7c444a4bbae16fe43c676824a26419bb740a6ab8 + SHA512 4503b033a5319caee5570f25a05009c0d05a8c61a43ed78317899faaeba82fbc1f9a8c8433772bb36547c74e850a2e68d20a16f6f22b12b3004da7e1aa2f334b + HEAD_REF master + PATCHES + "fix_install_paths_lastools.patch" +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) + diff --git a/externals/vcpkg/ports/lastools/vcpkg.json b/externals/vcpkg/ports/lastools/vcpkg.json new file mode 100755 index 000000000..4d54c1a81 --- /dev/null +++ b/externals/vcpkg/ports/lastools/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "lastools", + "version-string": "2020-05-09", + "port-version": 1, + "description": "LAStools: award-winning software for efficient LiDAR processing (with LASzip)", + "homepage": "https://github.com/LAStools/LAStools", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/laszip/portfile.cmake b/externals/vcpkg/ports/laszip/portfile.cmake new file mode 100755 index 000000000..de6508db0 --- /dev/null +++ b/externals/vcpkg/ports/laszip/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LASzip/LASzip + REF 1ab671e42ff1f086e29d5b7e300a5026e7b8d69b # 3.4.3 + SHA512 7ec20d6999b16e6a74a64d1dc3e9f1b1b4510acd306d30ccae34a543ca0dc52e1d1d989279fafdda321616ba1e0ceb59a093d8c61ba5a586b760efa0d00a0184 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LASZIP_BUILD_STATIC) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DLASZIP_BUILD_STATIC=${LASZIP_BUILD_STATIC} +) + +vcpkg_cmake_install() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/laszip" RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +# Remove laszip_api3 dll since it doesn't export functions properly during build. +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/laszip_api3.dll") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/laszip_api3.dll") diff --git a/externals/vcpkg/ports/laszip/vcpkg.json b/externals/vcpkg/ports/laszip/vcpkg.json new file mode 100755 index 000000000..40e526817 --- /dev/null +++ b/externals/vcpkg/ports/laszip/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "laszip", + "version": "3.4.3", + "port-version": 1, + "description": "LASzip - free and lossless LiDAR compression", + "homepage": "https://laszip.org/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/launch-darkly-server/portfile.cmake b/externals/vcpkg/ports/launch-darkly-server/portfile.cmake new file mode 100755 index 000000000..f16ab0424 --- /dev/null +++ b/externals/vcpkg/ports/launch-darkly-server/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO launchdarkly/c-server-sdk + REF 0d9db81862e1b17426da9b433a19376dd6458937 # 2.4.3 + SHA512 1bbafd212b0a271909a03319954ee2c92a3dde713fe7f9e0fdd79a5f011f0775701060b66ae9b3a4efad59376241b893d4b3d6679743c41e7657c355c7e3df5c + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DBUILD_TESTING=OFF" + "-DSKIP_DATABASE_TESTS=OFF" +) + +vcpkg_cmake_install() + +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ldserverapi.dll" "${CURRENT_PACKAGES_DIR}/bin/ldserverapi.dll") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ldserverapi.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/ldserverapi.dll") + endif() +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + ) + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/launch-darkly-server/vcpkg.json b/externals/vcpkg/ports/launch-darkly-server/vcpkg.json new file mode 100755 index 000000000..680d9ce98 --- /dev/null +++ b/externals/vcpkg/ports/launch-darkly-server/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "launch-darkly-server", + "version": "2.4.3", + "description": "LaunchDarkly server-side SDK for C/C++", + "homepage": "https://github.com/launchdarkly/c-server-sdk", + "supports": "!uwp & !arm", + "dependencies": [ + "curl", + "pcre", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/lazy-importer/portfile.cmake b/externals/vcpkg/ports/lazy-importer/portfile.cmake new file mode 100755 index 000000000..808452099 --- /dev/null +++ b/externals/vcpkg/ports/lazy-importer/portfile.cmake @@ -0,0 +1,14 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO JustasMasiulis/lazy_importer + REF edac6afddb9e0df2e3affa8b2d631caafcba69ed + SHA512 45f024c34fa1c8854b8b77706934ce95449b2416a5c1dcab970d0df068c9b5bf0de12994c13ac215e629f8ae21fdab75b4ce6535f56ca7508f490a4c664e5b1a + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/include/lazy_importer.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +# Handle copyright +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/lazy-importer/vcpkg.json b/externals/vcpkg/ports/lazy-importer/vcpkg.json new file mode 100755 index 000000000..7f3073487 --- /dev/null +++ b/externals/vcpkg/ports/lazy-importer/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "lazy-importer", + "version-date": "2022-02-09", + "description": "Library for importing functions from dlls in a hidden, reverse engineer unfriendly way", + "homepage": "https://github.com/JustasMasiulis/lazy_importer" +} diff --git a/externals/vcpkg/ports/lcm/fix-build-error.patch b/externals/vcpkg/ports/lcm/fix-build-error.patch new file mode 100755 index 000000000..ffca33d79 --- /dev/null +++ b/externals/vcpkg/ports/lcm/fix-build-error.patch @@ -0,0 +1,32 @@ +diff --git a/lcm/windows/WinPorting.cpp b/lcm/windows/WinPorting.cpp +index e22acd6..b9c7e69 100644 +--- a/lcm/windows/WinPorting.cpp ++++ b/lcm/windows/WinPorting.cpp +@@ -1,8 +1,8 @@ + + #define _WIN32_WINNT 0x0501 +-#include + #include + #include ++#include + + #include "WinPorting.h" + +diff --git a/lcmgen/emit_go.c b/lcmgen/emit_go.c +index c520044..b5be56a 100644 +--- a/lcmgen/emit_go.c ++++ b/lcmgen/emit_go.c +@@ -6,8 +6,13 @@ + #include + #include + #include ++#ifdef WIN32 ++#include ++#else + #include ++#endif + #ifdef WIN32 ++#define F_OK 0 + #define __STDC_FORMAT_MACROS // Enable integer types + #endif + diff --git a/externals/vcpkg/ports/lcm/glib.link.patch b/externals/vcpkg/ports/lcm/glib.link.patch new file mode 100755 index 000000000..67f6dc0f5 --- /dev/null +++ b/externals/vcpkg/ports/lcm/glib.link.patch @@ -0,0 +1,30 @@ +diff --git a/cmake/FindGLib2.cmake b/cmake/FindGLib2.cmake +index 2f1a8be45..db823b953 100644 +--- a/cmake/FindGLib2.cmake ++++ b/cmake/FindGLib2.cmake +@@ -14,7 +14,7 @@ function(_glib2_find_include VAR HEADER) + + find_path(GLIB2_${VAR}_INCLUDE_DIR ${HEADER} + PATHS ${_paths} +- PATH_SUFFIXES glib-2.0 glib-2.0/include ++ PATH_SUFFIXES glib-2.0 glib-2.0/include lib/glib-2.0/include + ) + mark_as_advanced(GLIB2_${VAR}_INCLUDE_DIR) + endfunction() +@@ -108,6 +108,16 @@ foreach(_glib2_component ${GLib2_FIND_COMPONENTS}) + + endforeach() + ++find_library(PCRE_LIBRARY pcre) ++set_property(TARGET GLib2::glib APPEND PROPERTY ++ INTERFACE_LINK_LIBRARIES ${PCRE_LIBRARY} ++) ++set(THREADS_PREFER_PTHREAD_FLAG ON) ++find_package(Threads) ++set_property(TARGET GLib2::glib APPEND PROPERTY ++ INTERFACE_LINK_LIBRARIES Threads::Threads ++) ++ + list(APPEND GLib2_FIND_COMPONENTS glib) + set(GLib2_FIND_REQUIRED_glib TRUE) + diff --git a/externals/vcpkg/ports/lcm/only-install-one-flavor.patch b/externals/vcpkg/ports/lcm/only-install-one-flavor.patch new file mode 100755 index 000000000..d22b83c23 --- /dev/null +++ b/externals/vcpkg/ports/lcm/only-install-one-flavor.patch @@ -0,0 +1,19 @@ +diff --git a/lcm/CMakeLists.txt b/lcm/CMakeLists.txt +index a706a85..639ec12 100644 +--- a/lcm/CMakeLists.txt ++++ b/lcm/CMakeLists.txt +@@ -76,8 +76,12 @@ endif() + target_include_directories(lcm-coretypes INTERFACE + $ + ) +- +-install(TARGETS lcm-coretypes lcm-static lcm ++if(BUILD_SHARED_LIBS) ++ set(INSTALL_TARGETS lcm) ++else() ++ set(INSTALL_TARGETS lcm-static) ++endif() ++install(TARGETS lcm-coretypes ${INSTALL_TARGETS} + EXPORT lcmTargets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} diff --git a/externals/vcpkg/ports/lcm/portfile.cmake b/externals/vcpkg/ports/lcm/portfile.cmake new file mode 100755 index 000000000..74bca46d3 --- /dev/null +++ b/externals/vcpkg/ports/lcm/portfile.cmake @@ -0,0 +1,58 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lcm-proj/lcm + REF v1.4.0 + SHA512 ca036aa2c31911e0bfaeab9665188c97726201267314693a1c333c4efe13ea598b39a55a19bc1d48e65462ac9d1716adfda5af86c645d59c3247192631247cc6 + HEAD_REF master + PATCHES + only-install-one-flavor.patch + fix-build-error.patch + glib.link.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DLCM_ENABLE_JAVA=OFF + -DLCM_ENABLE_LUA=OFF + -DLCM_ENABLE_PYTHON=OFF + -DLCM_ENABLE_TESTS=OFF + -DLCM_INSTALL_M4MACROS=OFF + -DLCM_INSTALL_PKGCONFIG=OFF +) + +vcpkg_install_cmake() +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +else() + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/lcm/cmake) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/lcm" "${CURRENT_PACKAGES_DIR}/lib/lcm") +endif() + + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/aclocal") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/java") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") + +file(GLOB EXES ${CURRENT_PACKAGES_DIR}/bin/*.exe) +if(EXES) + file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/lcm) + file(REMOVE ${EXES}) +endif() +file(GLOB DEBUG_EXES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) +if(DEBUG_EXES) + file(REMOVE ${DEBUG_EXES}) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/lcm) + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/lcm/vcpkg.json b/externals/vcpkg/ports/lcm/vcpkg.json new file mode 100755 index 000000000..ec04fd87b --- /dev/null +++ b/externals/vcpkg/ports/lcm/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "lcm", + "version": "1.4.0", + "port-version": 2, + "description": [ + "Lightweight Communications and Marshalling (LCM)", + "LCM is a set of libraries and tools for message passing and data marshalling, targeted at real-time systems where high-bandwidth and low latency are critical. It provides a publish/subscribe message passing model and automatic marshalling/unmarshalling code generation with bindings for applications in a variety of programming languages." + ], + "homepage": "https://github.com/lcm-proj/lcm", + "dependencies": [ + "glib" + ] +} diff --git a/externals/vcpkg/ports/lcms/CMakeLists.txt b/externals/vcpkg/ports/lcms/CMakeLists.txt new file mode 100755 index 000000000..83a1915ba --- /dev/null +++ b/externals/vcpkg/ports/lcms/CMakeLists.txt @@ -0,0 +1,54 @@ +cmake_minimum_required(VERSION 3.5) + +project(little-cms) + +file(GLOB SRCS src/*.c) + +add_library(lcms2 ${SRCS} src/lcms2.def) + +if(BUILD_SHARED_LIBS) + target_compile_options(lcms2 PRIVATE -DCMS_DLL_BUILD) + target_compile_options(lcms2 PUBLIC -DCMS_DLL) +endif() +target_compile_options(lcms2 PRIVATE -DUNICODE -D_UNICODE) + +target_include_directories(lcms2 PUBLIC $ $) +set_target_properties(lcms2 PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_LIST_DIR}/include/lcms2.h;${CMAKE_CURRENT_LIST_DIR}/include/lcms2_plugin.h") + +# Generate pkg-config file +SET(PACKAGE "lcms2") +# Read VERSION from file configure +file(READ "${CMAKE_CURRENT_LIST_DIR}/configure" lcms2_configure) +string(REGEX MATCH "PACKAGE_VERSION='(([0-9]+)\\.([0-9]+))'" _ ${lcms2_configure}) +set(VERSION "${CMAKE_MATCH_1}") +SET(prefix "${CMAKE_INSTALL_PREFIX}") +SET(exec_prefix "\${prefix}") +SET(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") +SET(includedir "\${prefix}/include") +CONFIGURE_FILE(lcms2.pc.in "${PROJECT_BINARY_DIR}/lcms2.pc" @ONLY) + +install(TARGETS lcms2 + EXPORT lcms2Config + RUNTIME DESTINATION "bin" + LIBRARY DESTINATION "lib" + ARCHIVE DESTINATION "lib" + PUBLIC_HEADER DESTINATION "include" +) + +INSTALL(FILES ${PROJECT_BINARY_DIR}/lcms2.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + +install(EXPORT lcms2Config + DESTINATION "share/lcms2" + NAMESPACE lcms2:: +) + +# Backwards compatibility for previous vcpkg users +add_library(lcms INTERFACE) +target_link_libraries(lcms INTERFACE lcms2) + + +install(TARGETS lcms EXPORT lcms-targets) +install(EXPORT lcms-targets + DESTINATION "share/lcms" + NAMESPACE lcms:: +) diff --git a/externals/vcpkg/ports/lcms/portfile.cmake b/externals/vcpkg/ports/lcms/portfile.cmake new file mode 100755 index 000000000..78b8409ce --- /dev/null +++ b/externals/vcpkg/ports/lcms/portfile.cmake @@ -0,0 +1,33 @@ +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(ADDITIONAL_PATCH "shared.patch") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mm2/Little-CMS + REF 924a020d09bfe468c665467caf24aadeb41ff77c # 2.12 + SHA512 0c2dc069878ca38a92af4800aa3fb2660203fbcdf6dccd9db60cfacb6896185e3e9222893f39ec3e132b0f4900a2932d490dd8db5b1b431519966a64d28404d2 + HEAD_REF master + PATCHES + remove_library_directive.patch + ${ADDITIONAL_PATCH} +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME lcms2) +vcpkg_cmake_config_fixup() # provides old PACKAGE_NAME lcms +vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/lcms/lcms-config.cmake" [[ +include(CMakeFindDependencyMacro) +find_dependency(lcms2 CONFIG) +include(${CMAKE_CURRENT_LIST_DIR}/lcms-targets.cmake) +]]) + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/lcms/remove_library_directive.patch b/externals/vcpkg/ports/lcms/remove_library_directive.patch new file mode 100755 index 000000000..29d035dc2 --- /dev/null +++ b/externals/vcpkg/ports/lcms/remove_library_directive.patch @@ -0,0 +1,8 @@ +--- a/src/lcms2.def 2016-07-20 09:46:01.000000000 +0200 ++++ b/src/lcms2.def 2018-06-02 02:11:04.135781600 +0200 +@@ -1,5 +1,3 @@ +-LIBRARY LCMS2.DLL +- + EXPORTS + + _cms15Fixed16toDouble = _cms15Fixed16toDouble diff --git a/externals/vcpkg/ports/lcms/shared.patch b/externals/vcpkg/ports/lcms/shared.patch new file mode 100755 index 000000000..ac5490486 --- /dev/null +++ b/externals/vcpkg/ports/lcms/shared.patch @@ -0,0 +1,10 @@ +--- a/include/lcms2.h Wed Jul 20 08:46:01 2016 ++++ b/include/lcms2.h Mon Jan 30 15:01:12 2017 +@@ -212,6 +212,7 @@ + + #endif // CMS_USE_BIG_ENDIAN + ++#define CMS_DLL + + // Calling convention -- this is hardly platform and compiler dependent + #ifdef CMS_IS_WINDOWS_ diff --git a/externals/vcpkg/ports/lcms/usage b/externals/vcpkg/ports/lcms/usage new file mode 100755 index 000000000..1b37c7f74 --- /dev/null +++ b/externals/vcpkg/ports/lcms/usage @@ -0,0 +1,4 @@ +The package lcms provides CMake targets: + + find_package(lcms2 CONFIG REQUIRED) + target_link_libraries(main PRIVATE lcms2::lcms2) diff --git a/externals/vcpkg/ports/lcms/vcpkg.json b/externals/vcpkg/ports/lcms/vcpkg.json new file mode 100755 index 000000000..8a78ac8bb --- /dev/null +++ b/externals/vcpkg/ports/lcms/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "lcms", + "version": "2.12", + "port-version": 3, + "description": "Little CMS.", + "homepage": "https://github.com/mm2/Little-CMS", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/leaf/portfile.cmake b/externals/vcpkg/ports/leaf/portfile.cmake new file mode 100755 index 000000000..9aefc8241 --- /dev/null +++ b/externals/vcpkg/ports/leaf/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/leaf/vcpkg.json b/externals/vcpkg/ports/leaf/vcpkg.json new file mode 100755 index 000000000..88c24fca5 --- /dev/null +++ b/externals/vcpkg/ports/leaf/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "leaf", + "version-string": "0.2.2", + "port-version": 1, + "description": "Deprecated boost-leaf port.", + "dependencies": [ + "boost-leaf" + ] +} diff --git a/externals/vcpkg/ports/lemon/portfile.cmake b/externals/vcpkg/ports/lemon/portfile.cmake new file mode 100755 index 000000000..f599558f1 --- /dev/null +++ b/externals/vcpkg/ports/lemon/portfile.cmake @@ -0,0 +1,3 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +message(WARNING "The lemon port is deprecated, use liblemon instead") diff --git a/externals/vcpkg/ports/lemon/vcpkg.json b/externals/vcpkg/ports/lemon/vcpkg.json new file mode 100755 index 000000000..b75102e54 --- /dev/null +++ b/externals/vcpkg/ports/lemon/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "lemon", + "version-string": "0", + "port-version": 1, + "description": "Deprecated port, use liblemon instead", + "dependencies": [ + "liblemon" + ] +} diff --git a/externals/vcpkg/ports/leptonica/fix-CMakeDependency.patch b/externals/vcpkg/ports/leptonica/fix-CMakeDependency.patch new file mode 100755 index 000000000..9234fbfb3 --- /dev/null +++ b/externals/vcpkg/ports/leptonica/fix-CMakeDependency.patch @@ -0,0 +1,64 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6d300da..fae4ca7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -66,8 +66,28 @@ if(NOT SW_BUILD) + find_package(PNG) + find_package(TIFF) + find_package(ZLIB) +- find_package(PkgConfig) +- if (PKG_CONFIG_FOUND) ++ find_package(WEBP NAMES WebP REQUIRED) ++ find_package(JP2K NAMES OpenJPEG REQUIRED) ++ ++ set(GIF_LIBRARIES GIF::GIF) ++ set(JPEG_LIBRARIES JPEG::JPEG) ++ set(PNG_LIBRARIES PNG::PNG) ++ set(TIFF_LIBRARIES TIFF::TIFF) ++ set(ZLIB_LIBRARIES ZLIB::ZLIB) ++ ++ set(JP2K "${JP2K_FOUND}") ++ set(JP2K_INCLUDE_DIRS "") ++ set(HAVE_LIBJP2K 1) ++ set(JP2K_LIBRARIES openjp2) # imported target ++ ++ set(WEBP "${WEBP_FOUND}") ++ set(WEBP_INCLUDE_DIRS "") ++ set(WEBPMUX 1) ++ set(HAVE_LIBWEBP_ANIM 1) ++ set(WEBPMUX_FOUND TRUE) ++ set(WEBP_LIBRARIES WebP::libwebpmux WebP::webp) ++ ++ if (0) + pkg_check_modules(WEBP libwebp QUIET) + pkg_check_modules(WEBPMUX libwebpmux>=${MINIMUM_WEBPMUX_VERSION} QUIET) + pkg_check_modules(JP2K libopenjp2>=2.0 QUIET) +diff --git a/cmake/templates/LeptonicaConfig.cmake.in b/cmake/templates/LeptonicaConfig.cmake.in +index 342c37d..506fb2a 100644 +--- a/cmake/templates/LeptonicaConfig.cmake.in ++++ b/cmake/templates/LeptonicaConfig.cmake.in +@@ -19,6 +19,14 @@ + # - Leptonica_VERSION_PATCH : Patch version part of Leptonica_VERSION: "@VERSION_PATCH@" + # + # =================================================================================== ++include(CMakeFindDependencyMacro) ++find_dependency(JPEG) ++find_dependency(ZLIB) ++find_dependency(PNG) ++find_dependency(TIFF) ++find_dependency(GIF) ++find_dependency(WebP) ++find_dependency(OpenJPEG) + + include(${CMAKE_CURRENT_LIST_DIR}/LeptonicaTargets.cmake) + +@@ -36,7 +44,8 @@ SET(Leptonica_VERSION_PATCH @VERSION_PATCH@) + # ====================================================== + + # Provide the include directories to the caller +-set(Leptonica_INCLUDE_DIRS "@INCLUDE_DIR@") ++get_filename_component(Leptonica_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/../../include" ABSOLUTE) ++list(APPEND Leptonica_INCLUDE_DIRS "${Leptonica_INCLUDE_DIRS}/leptonica") + + # ==================================================================== + # Link libraries: diff --git a/externals/vcpkg/ports/leptonica/portfile.cmake b/externals/vcpkg/ports/leptonica/portfile.cmake new file mode 100755 index 000000000..94b64a6f3 --- /dev/null +++ b/externals/vcpkg/ports/leptonica/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DanBloomberg/leptonica + REF f4138265b390f1921b9891d6669674d3157887d8 # 1.82.0 + SHA512 cd8c55454fc2cb4d23c2b3f01870e154766fa5a35c07b79d25c2d85dc2675dcb224d9be8a1cdcb7e9a0bd3c17e90141aa4084f67a311a1c327d7ac2439ba196a + HEAD_REF master + PATCHES + fix-CMakeDependency.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSW_BUILD=OFF + -DCMAKE_REQUIRE_FIND_PACKAGE_GIF=TRUE + -DCMAKE_REQUIRE_FIND_PACKAGE_JPEG=TRUE + -DCMAKE_REQUIRE_FIND_PACKAGE_PNG=TRUE + -DCMAKE_REQUIRE_FIND_PACKAGE_TIFF=TRUE + -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=TRUE +) + +vcpkg_cmake_install() + +vcpkg_fixup_pkgconfig() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/leptonica) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/leptonica-license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/leptonica/vcpkg.json b/externals/vcpkg/ports/leptonica/vcpkg.json new file mode 100755 index 000000000..ba9bcaf7e --- /dev/null +++ b/externals/vcpkg/ports/leptonica/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "leptonica", + "version": "1.82.0", + "description": "An open source library containing software that is broadly useful for image processing and image analysis applications", + "homepage": "https://github.com/DanBloomberg/leptonica", + "license": null, + "dependencies": [ + "giflib", + "libjpeg-turbo", + "libpng", + "libwebp", + "openjpeg", + "tiff", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/lerc/create_package.patch b/externals/vcpkg/ports/lerc/create_package.patch new file mode 100755 index 000000000..166c3f43b --- /dev/null +++ b/externals/vcpkg/ports/lerc/create_package.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e90fcdd..17c79e8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,9 +26,16 @@ add_library(LercLib ${SOURCES}) + endif() + + install( + TARGETS Lerc ++ EXPORT LercTargets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) ++target_include_directories(Lerc PUBLIC "$") ++install(EXPORT LercTargets ++ FILE unofficial-lerc-config.cmake ++ NAMESPACE unofficial::Lerc:: ++ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-lerc" ++) diff --git a/externals/vcpkg/ports/lerc/portfile.cmake b/externals/vcpkg/ports/lerc/portfile.cmake new file mode 100755 index 000000000..2b92c7022 --- /dev/null +++ b/externals/vcpkg/ports/lerc/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Esri/lerc + REF v3.0 + SHA512 8e04d890c4d46528641b354ec3f47f2b0563e1740927ac894925a30f7de2b235cb3517ce7e477886bd3eb50ebd6c6e78f22d73d5500877e552d9e684e626293b + HEAD_REF master + PATCHES + "create_package.patch" +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-lerc) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/NOTICE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/lerc/vcpkg.json b/externals/vcpkg/ports/lerc/vcpkg.json new file mode 100755 index 000000000..22939ae2f --- /dev/null +++ b/externals/vcpkg/ports/lerc/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "lerc", + "version": "3.0", + "description": "An open-source image or raster format which supports rapid encoding and decoding for any pixel type", + "homepage": "https://github.com/Esri/lerc", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/lest/portfile.cmake b/externals/vcpkg/ports/lest/portfile.cmake new file mode 100755 index 000000000..2737d3695 --- /dev/null +++ b/externals/vcpkg/ports/lest/portfile.cmake @@ -0,0 +1,9 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO martinmoene/lest + REF v1.35.1 + SHA512 06b786cbca37cb4d20737d040176bf34398090d566310b88558b788804d8b832c682f1814f5c68ef11192243dbde5643e73b78be4fb1407b831bcde43adb002c +) + +file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/lest RENAME copyright) diff --git a/externals/vcpkg/ports/lest/vcpkg.json b/externals/vcpkg/ports/lest/vcpkg.json new file mode 100755 index 000000000..f8b68ff73 --- /dev/null +++ b/externals/vcpkg/ports/lest/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "lest", + "version-string": "1.35.1", + "port-version": 2, + "description": "A modern, C++11-native, single-file header-only, tiny framework for unit-tests, TDD and BDD (includes C++98 variant)", + "homepage": "https://github.com/martinmoene/lest" +} diff --git a/externals/vcpkg/ports/leveldb/fix-dependencies.patch b/externals/vcpkg/ports/leveldb/fix-dependencies.patch new file mode 100755 index 000000000..a0fe68651 --- /dev/null +++ b/externals/vcpkg/ports/leveldb/fix-dependencies.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 98b87dc..76d2e9b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -35,8 +35,14 @@ include(CheckIncludeFile) + check_include_file("unistd.h" HAVE_UNISTD_H) + + include(CheckLibraryExists) +-check_library_exists(crc32c crc32c_value "" HAVE_CRC32C) +-check_library_exists(snappy snappy_compress "" HAVE_SNAPPY) ++if (WITH_CRC32C) ++ find_package(Crc32c CONFIG REQUIRED) ++ set(HAVE_CRC32C 1) ++endif() ++if (WITH_SNAPPY) ++ find_package(Snappy CONFIG REQUIRED) ++ set(HAVE_SNAPPY 1) ++endif() + check_library_exists(tcmalloc malloc "" HAVE_TCMALLOC) + + include(CheckCXXSymbolExists) +@@ -246,10 +252,10 @@ if(HAVE_CLANG_THREAD_SAFETY) + endif(HAVE_CLANG_THREAD_SAFETY) + + if(HAVE_CRC32C) +- target_link_libraries(leveldb crc32c) ++ target_link_libraries(leveldb Crc32c::crc32c) + endif(HAVE_CRC32C) + if(HAVE_SNAPPY) +- target_link_libraries(leveldb snappy) ++ target_link_libraries(leveldb Snappy::snappy) + endif(HAVE_SNAPPY) + if(HAVE_TCMALLOC) + target_link_libraries(leveldb tcmalloc) diff --git a/externals/vcpkg/ports/leveldb/fix_config.patch b/externals/vcpkg/ports/leveldb/fix_config.patch new file mode 100755 index 000000000..c5a83296b --- /dev/null +++ b/externals/vcpkg/ports/leveldb/fix_config.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1409c06..98b87dc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -437,6 +437,12 @@ if(LEVELDB_INSTALL) + "${PROJECT_BINARY_DIR}/leveldbConfigVersion.cmake" + COMPATIBILITY SameMajorVersion + ) ++ configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/leveldbConfig.cmake.in ++ leveldbConfig.cmake ++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/leveldb ++ NO_CHECK_REQUIRED_COMPONENTS_MACRO ++ PATH_VARS CMAKE_INSTALL_INCLUDEDIR ++ ) + install( + EXPORT leveldbTargets + NAMESPACE leveldb:: +@@ -444,7 +450,7 @@ if(LEVELDB_INSTALL) + ) + install( + FILES +- "${PROJECT_SOURCE_DIR}/cmake/leveldbConfig.cmake" ++ "${PROJECT_BINARY_DIR}/leveldbConfig.cmake" + "${PROJECT_BINARY_DIR}/leveldbConfigVersion.cmake" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/leveldb" + ) diff --git a/externals/vcpkg/ports/leveldb/leveldbConfig.cmake.in b/externals/vcpkg/ports/leveldb/leveldbConfig.cmake.in new file mode 100755 index 000000000..65b9bac51 --- /dev/null +++ b/externals/vcpkg/ports/leveldb/leveldbConfig.cmake.in @@ -0,0 +1,14 @@ +@PACKAGE_INIT@ +include(CMakeFindDependencyMacro) + +set_and_check(leveldb_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") +find_dependency(Threads) + +if (@WITH_CRC32C@) + find_dependency(Crc32c CONFIG) +endif() +if (@WITH_SNAPPY@) + find_dependency(Snappy CONFIG) +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/leveldbTargets.cmake") diff --git a/externals/vcpkg/ports/leveldb/portfile.cmake b/externals/vcpkg/ports/leveldb/portfile.cmake new file mode 100755 index 000000000..85af613ea --- /dev/null +++ b/externals/vcpkg/ports/leveldb/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "google/leveldb" + REF 1.22 + SHA512 f9bbf5f466e7f707b94e19261762319ea9f65d41911690e84f59098551e2e69beccf756a414d705ade74ee96fd979bdb8b94c171c6f2cc83873cbd4a9380dbab + HEAD_REF master + PATCHES + fix_config.patch + fix-dependencies.patch +) + +file(COPY "${CURRENT_PORT_DIR}/leveldbConfig.cmake.in" DESTINATION "${SOURCE_PATH}/cmake") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + crc32c WITH_CRC32C + snappy WITH_SNAPPY +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} + OPTIONS_DEBUG -DINSTALL_HEADERS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/externals/vcpkg/ports/leveldb/vcpkg.json b/externals/vcpkg/ports/leveldb/vcpkg.json new file mode 100755 index 000000000..10d1f8c09 --- /dev/null +++ b/externals/vcpkg/ports/leveldb/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "leveldb", + "version": "1.22", + "port-version": 5, + "description": "LevelDB is a fast key-value storage library written at Google that provides an ordered mapping from string keys to string values.", + "homepage": "https://github.com/google/leveldb", + "license": "BSD-3-Clause", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "crc32c": { + "description": "Build with crc32c", + "dependencies": [ + "crc32c" + ] + }, + "snappy": { + "description": "Build with snappy", + "dependencies": [ + "snappy" + ] + } + } +} diff --git a/externals/vcpkg/ports/levmar/add-install.patch b/externals/vcpkg/ports/levmar/add-install.patch new file mode 100755 index 000000000..d256c77ad --- /dev/null +++ b/externals/vcpkg/ports/levmar/add-install.patch @@ -0,0 +1,11 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cc6789f..d2757f9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -95,3 +95,6 @@ IF(BUILD_DEMO) + ENDIF(BUILD_DEMO) + + #SUBDIRS(matlab) ++ ++install(TARGETS levmar LIBRARY DESTINATION "lib/") ++install(FILES "${CMAKE_SOURCE_DIR}/levmar.h" DESTINATION "include/levmar/") diff --git a/externals/vcpkg/ports/levmar/portfile.cmake b/externals/vcpkg/ports/levmar/portfile.cmake new file mode 100755 index 000000000..1ed0ad75d --- /dev/null +++ b/externals/vcpkg/ports/levmar/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_download_distfile(ARCHIVE + URLS "http://users.ics.forth.gr/~lourakis/levmar/levmar-2.6.tgz" + FILENAME "levmar-2.6.tgz" + SHA512 5b4c64b63be9b29d6ad2df435af86cd2c2e3216313378561a670ac6a392a51bbf1951e96c6b1afb77c570f23dd8e194017808e46929fec2d8d9a7fe6cf37022b +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES add-install.patch # patch just adding the install commands to original CMakeLists.txt +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DHAVE_LAPACK=OFF + -DHAVE_PLASMA=OFF + -DBUILD_DEMO=OFF +) + +vcpkg_install_cmake() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +# Handle duplicated debug includes +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/externals/vcpkg/ports/levmar/vcpkg.json b/externals/vcpkg/ports/levmar/vcpkg.json new file mode 100755 index 000000000..a72eb4b3f --- /dev/null +++ b/externals/vcpkg/ports/levmar/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "levmar", + "version": "2.6", + "port-version": 1, + "description": "Levenberg-Marquardt nonlinear least squares optimization algorithm", + "homepage": "http://users.ics.forth.gr/~lourakis/levmar/", + "supports": "windows & !uwp" +} diff --git a/externals/vcpkg/ports/libaaplus/fix-cmakelists.patch b/externals/vcpkg/ports/libaaplus/fix-cmakelists.patch new file mode 100755 index 000000000..a57e05b3b --- /dev/null +++ b/externals/vcpkg/ports/libaaplus/fix-cmakelists.patch @@ -0,0 +1,85 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9bb8ea3..c445c4b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,6 +5,7 @@ cmake_minimum_required(VERSION 3.8) + SET(CMAKE_CXX_STANDARD 17) + SET(CMAKE_CXX_STANDARD_REQUIRED ON) + ++option(BUILD_TOOLS "Build libaaplus tools" OFF) + #----------------------------------------------------------------------------- + # Output directories. + SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH +@@ -261,18 +262,66 @@ SET ( SRCS + #----------------------------------------------------------------------------- + # Executables. + #----------------------------------------------------------------------------- ++if(BUILD_TOOLS) + ADD_EXECUTABLE(AATest ${SRCS} ) +- ++endif() + #----------------------------------------------------------------------------- + # Libraries. ++if(NOT BUILD_SHARED_LIBS) + ADD_LIBRARY(aaplus-static STATIC ${SRCS_LIB} ${INCS}) + SET_TARGET_PROPERTIES(aaplus-static PROPERTIES OUTPUT_NAME "aaplus") +- ++target_include_directories(aaplus-static PUBLIC $ $) ++else() + ADD_LIBRARY(aaplus-shared SHARED ${SRCS_LIB} ${INCS}) + SET_TARGET_PROPERTIES(aaplus-shared PROPERTIES OUTPUT_NAME "aaplus") ++target_include_directories(aaplus-shared PUBLIC $ $) ++endif() ++ ++if (MSVC AND BUILD_SHARED_LIBS) ++target_compile_definitions(aaplus-shared ++ PRIVATE ++ -DAAPLUS_EXT_CLASS\=__declspec\(dllexport\) ++) ++endif (MSVC AND BUILD_SHARED_LIBS) ++ ++if(BUILD_SHARED_LIBS) ++ install( ++ TARGETS aaplus-shared ++ EXPORT aaplus ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++ RUNTIME DESTINATION bin ++ ) ++else() ++ install( ++ TARGETS aaplus-static ++ EXPORT aaplus ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++ RUNTIME DESTINATION bin ++ ) ++endif() + +-install(TARGETS aaplus-shared aaplus-static +- DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" ) ++if(BUILD_TOOLS) ++ if(BUILD_SHARED_LIBS) ++ TARGET_LINK_LIBRARIES(AATest aaplus-shared) ++ if(MSVC) ++ target_compile_definitions(AATest ++ PUBLIC ++ -DAAPLUS_EXT_CLASS\=__declspec\(dllimport\) ++ ) ++ endif() ++ ++ else() ++ TARGET_LINK_LIBRARIES(AATest aaplus-static) ++ endif() ++endif() + +-TARGET_LINK_LIBRARIES(AATest aaplus-static) ++install( ++ EXPORT aaplus ++ DESTINATION share/aaplus ++ FILE aaplusConfig.cmake ++ NAMESPACE aaplus:: ++) + ++install(FILES ${INCS} DESTINATION include/aaplus) +\ No newline at end of file diff --git a/externals/vcpkg/ports/libaaplus/portfile.cmake b/externals/vcpkg/ports/libaaplus/portfile.cmake new file mode 100755 index 000000000..f7387aa85 --- /dev/null +++ b/externals/vcpkg/ports/libaaplus/portfile.cmake @@ -0,0 +1,37 @@ +set(VERSION 2.36) + +vcpkg_download_distfile( + ARCHIVE_FILE + URLS "http://www.naughter.com/download/aaplus_v${VERSION}.zip" + FILENAME "aaplus_v${VERSION}.zip" + SHA512 a7abf20feb49df00b95be987809a3dc8df3e9ff706dd5a873ecfdd695af125f858264e092b6b856e83685e9eb46fd46520cf09dfae892c32cbb71f925ba17b86 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE_FILE} + REF ${VERSION} + NO_REMOVE_ONE_LEVEL + PATCHES + fix-cmakelists.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME aaplus CONFIG_PATH share/aaplus) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/AA+.htm" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/libaaplus/vcpkg.json b/externals/vcpkg/ports/libaaplus/vcpkg.json new file mode 100755 index 000000000..35572ec24 --- /dev/null +++ b/externals/vcpkg/ports/libaaplus/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "libaaplus", + "version": "2.36", + "description": "libaaplus is an astronomical computations library by naughter software", + "homepage": "http://www.naughter.com/aa.html", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "Build libaaplus tools" + } + } +} diff --git a/externals/vcpkg/ports/libaiff/CMakeLists.txt b/externals/vcpkg/ports/libaiff/CMakeLists.txt new file mode 100755 index 000000000..db531b5c0 --- /dev/null +++ b/externals/vcpkg/ports/libaiff/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required (VERSION 3.9) +project (libaiff) +set(SRC + iff.c aifx.c lpcm.c g711.c + float32.c libaiff.c + extended.c pascal.c +) + +if(MSVC) + add_compile_options(/W4 -D_CRT_SECURE_NO_WARNINGS -DHAVE_INTTYPES_H -DHAVE_STDINT_H -DHAVE_STRING_H -DHAVE_STDLIB_H) +endif() + +include_directories(.) + +add_library(libaiff ${SRC}) + + +install( + TARGETS libaiff + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES libaiff/libaiff.h libaiff/config.h libaiff/endian.h DESTINATION include/libaiff) +endif() diff --git a/externals/vcpkg/ports/libaiff/allow_utf_16_filename.patch b/externals/vcpkg/ports/libaiff/allow_utf_16_filename.patch new file mode 100755 index 000000000..773b492fd --- /dev/null +++ b/externals/vcpkg/ports/libaiff/allow_utf_16_filename.patch @@ -0,0 +1,214 @@ +diff --git a/libaiff.c b/libaiff.c +index d0ad40d..e266802 100644 +--- a/libaiff.c ++++ b/libaiff.c +@@ -44,6 +44,8 @@ static struct decoder* decoders[] = { + + static AIFF_Ref AIFF_ReadOpen (const char *, int); + static AIFF_Ref AIFF_WriteOpen (const char *, int); ++static AIFF_Ref AIFF_ReadOpenW (const wchar_t*, int); ++static AIFF_Ref AIFF_WriteOpenW (const wchar_t*, int); + static void AIFF_ReadClose (AIFF_Ref); + static int AIFF_WriteClose (AIFF_Ref); + static void* InitBuffer (AIFF_Ref, size_t); +@@ -53,6 +55,21 @@ static int Prepare (AIFF_Ref); + static void Unprepare (AIFF_Ref); + static struct decoder* FindDecoder (IFFType); + ++#ifdef _WIN32 ++AIFF_Ref ++AIFF_OpenFileW(const wchar_t *file, int flags) ++{ ++ AIFF_Ref ref = NULL; ++ ++ if (flags & F_RDONLY) { ++ ref = AIFF_ReadOpenW(file, flags); ++ } else if (flags & F_WRONLY) { ++ ref = AIFF_WriteOpenW(file, flags); ++ } ++ ++ return ref; ++} ++#endif + AIFF_Ref + AIFF_OpenFile(const char *file, int flags) + { +@@ -86,6 +103,76 @@ AIFF_CloseFile(AIFF_Ref ref) + return r; + } + ++#ifdef _WIN32 ++static AIFF_Ref ++AIFF_ReadOpenW(const wchar_t *file, int flags) ++{ ++ AIFF_Ref r; ++ IFFHeader hdr; ++ ++ r = malloc(kAIFFRefSize); ++ if (!r) { ++ return NULL; ++ } ++ r->fd = _wfopen(file, L"rb"); ++ if (r->fd == NULL) { ++ free(r); ++ return NULL; ++ } ++ r->flags = F_RDONLY | flags; ++ if (fread(&hdr, 1, 4, r->fd) < 4) { ++ fclose(r->fd); ++ free(r); ++ return NULL; ++ } ++ switch (hdr.hid) { ++ case AIFF_TYPE_IFF: ++ /* Continue reading the IFF header */ ++ if (fread(&(hdr.len), 1, 8, r->fd) < 8) { ++ fclose(r->fd); ++ free(r); ++ return NULL; ++ } ++ if (hdr.len == 0) { ++ fclose(r->fd); ++ free(r); ++ return NULL; ++ } ++ /* ++ * Check the format type (AIFF or AIFC) ++ */ ++ r->format = hdr.fid; ++ switch (r->format) { ++ case AIFF_TYPE_AIFF: ++ case AIFF_TYPE_AIFC: ++ break; ++ default: ++ fclose(r->fd); ++ free(r); ++ return NULL; ++ } ++ ++ if (init_aifx(r) < 1) { ++ fclose(r->fd); ++ free(r); ++ return NULL; ++ } ++ break; ++ default: ++ fclose(r->fd); ++ free(r); ++ return NULL; ++ } ++ ++ r->stat = 0; ++ r->buffer = NULL; ++ r->buflen = 0; ++ ++ return r; ++} ++ ++#endif ++ + static AIFF_Ref + AIFF_ReadOpen(const char *file, int flags) + { +@@ -450,6 +537,89 @@ AIFF_ReadClose(AIFF_Ref r) + return; + } + ++#ifdef WIN32 ++static AIFF_Ref ++AIFF_WriteOpenW(const wchar_t *file, int flags) ++{ ++ AIFF_Ref w; ++ IFFHeader hdr; ++ ASSERT(sizeof(IFFHeader) == 12); ++ ++ w = malloc(kAIFFRefSize); ++ if (!w) { ++err0: ++ return NULL; ++ } ++ ++ /* ++ * Simultaneous open for reading & writing ++ */ ++ w->fd = _wfopen(file, L"w+b"); ++ if (w->fd == NULL) { ++err1: ++ free(w); ++ goto err0; ++ } ++ hdr.hid = ARRANGE_BE32(AIFF_FORM); ++ w->len = 4; ++ hdr.len = ARRANGE_BE32(4); ++ if (flags & F_AIFC) ++ hdr.fid = ARRANGE_BE32(AIFF_AIFC); ++ else ++ hdr.fid = ARRANGE_BE32(AIFF_AIFF); ++ ++ if (fwrite(&hdr, 1, 12, w->fd) < 12) { ++err2: ++ fclose(w->fd); ++ goto err1; ++ } ++ w->stat = 0; ++ w->segmentSize = 0; ++ w->buffer = NULL; ++ w->buflen = 0; ++ w->tics = 0; ++ ++ /* ++ * If writing AIFF-C, write the required FVER chunk ++ */ ++ if (flags & F_AIFC) { ++ IFFChunk chk; ++ uint32_t vers; ++ ASSERT(sizeof(IFFChunk) == 8); ++ ++ chk.id = ARRANGE_BE32(AIFF_FVER); ++ chk.len = ARRANGE_BE32(4); ++ vers = ARRANGE_BE32(AIFC_STD_DRAFT_082691); ++ ++ if (fwrite(&chk, 1, 8, w->fd) < 8 || ++ fwrite(&vers, 1, 4, w->fd) < 4) { ++ goto err2; ++ } ++ ++ w->len += 12; ++ ++ /* ++ * If no endianness specified for AIFF-C, ++ * default to big endian ++ */ ++ if (!(flags & (LPCM_LTE_ENDIAN | LPCM_BIG_ENDIAN))) { ++ flags |= LPCM_BIG_ENDIAN; ++ } ++ } else { ++ /* ++ * If writing regular AIFF, make sure we ++ * write big-endian data ++ */ ++ flags &= ~LPCM_LTE_ENDIAN; ++ flags |= LPCM_BIG_ENDIAN; ++ } ++ ++ w->flags = F_WRONLY | flags; ++ ++ return w; ++} ++#endif ++ + static AIFF_Ref + AIFF_WriteOpen(const char *file, int flags) + { +diff --git a/libaiff/libaiff.h b/libaiff/libaiff.h +index 56fc77f..e1940a5 100644 +--- a/libaiff/libaiff.h ++++ b/libaiff/libaiff.h +@@ -165,6 +165,7 @@ typedef struct s_Instrument Instrument ; + + /* == Function prototypes == */ + AIFF_Ref AIFF_OpenFile(const char *, int) ; ++AIFF_Ref AIFF_OpenFileW(const wchar_t *, int) ; + int AIFF_CloseFile(AIFF_Ref) ; + char* AIFF_GetAttribute(AIFF_Ref,IFFType) ; + int AIFF_GetInstrumentData(AIFF_Ref,Instrument*) ; diff --git a/externals/vcpkg/ports/libaiff/buffer_uninitialized.patch b/externals/vcpkg/ports/libaiff/buffer_uninitialized.patch new file mode 100755 index 000000000..d87ab41c6 --- /dev/null +++ b/externals/vcpkg/ports/libaiff/buffer_uninitialized.patch @@ -0,0 +1,42 @@ +diff --git "a/libaiff.c" "b/libaiff.c" +index e266802..21179f9 100644 +--- "a/libaiff.c" ++++ "b/libaiff.c" +@@ -168,6 +168,9 @@ AIFF_ReadOpenW(const wchar_t *file, int flags) + r->buffer = NULL; + r->buflen = 0; + ++ r->buffer2 = NULL; ++ r->buflen2 = 0; ++ + return r; + } + +@@ -237,6 +240,9 @@ AIFF_ReadOpen(const char *file, int flags) + r->buffer = NULL; + r->buflen = 0; + ++ r->buffer2 = NULL; ++ r->buflen2 = 0; ++ + return r; + } + +@@ -577,6 +583,8 @@ err2: + w->segmentSize = 0; + w->buffer = NULL; + w->buflen = 0; ++ w->buffer2 = NULL; ++ w->buflen2 = 0; + w->tics = 0; + + /* +@@ -659,6 +667,8 @@ err2: + w->segmentSize = 0; + w->buffer = NULL; + w->buflen = 0; ++ w->buffer2 = NULL; ++ w->buflen2 = 0; + w->tics = 0; + + /* diff --git a/externals/vcpkg/ports/libaiff/config.h b/externals/vcpkg/ports/libaiff/config.h new file mode 100755 index 000000000..f7c04eebf --- /dev/null +++ b/externals/vcpkg/ports/libaiff/config.h @@ -0,0 +1,12 @@ +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "marcotrillo@gmail.com" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "LibAiff (MSVC)" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "LibAiff (MSVC) $Revision: 1.1 $" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "$Revision: 1.1 $" + diff --git a/externals/vcpkg/ports/libaiff/portfile.cmake b/externals/vcpkg/ports/libaiff/portfile.cmake new file mode 100755 index 000000000..97d8673b6 --- /dev/null +++ b/externals/vcpkg/ports/libaiff/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO aifftools/libaiff + REF LibAiff%205.0 + FILENAME "libaiff-5.0-release.tar.gz" + SHA512 7800f9a3fbd0c5a17b8cc6c9b60181131d159ab5f5fb8e7de54e8f88c151717a988231de664a635e61940267c854a9ce83d58b12e322dcdda3aa8080c7b15f66 + PATCHES + allow_utf_16_filename.patch + buffer_uninitialized.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h DESTINATION ${SOURCE_PATH}/libaiff) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_install_cmake() + +file(GLOB HEADERS "${CURRENT_PACKAGES_DIR}/include/libaiff/*.h") +foreach(HEADER ${HEADERS}) + file(READ "${HEADER}" _contents) + string(REPLACE "#ifdef HAVE_STDINT_H" "#if 1" _contents "${_contents}") + string(REPLACE "#ifdef HAVE_STRING_H" "#if 1" _contents "${_contents}") + string(REPLACE "#ifdef HAVE_STDLIB_H" "#if 1" _contents "${_contents}") + string(REPLACE "#ifdef HAVE_INTTYPES_H" "#if 1" _contents "${_contents}") + file(WRITE "${HEADER}" "${_contents}") +endforeach() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libaiff/vcpkg.json b/externals/vcpkg/ports/libaiff/vcpkg.json new file mode 100755 index 000000000..d8e0abb4c --- /dev/null +++ b/externals/vcpkg/ports/libaiff/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libaiff", + "version-string": "5.0", + "port-version": 7, + "description": "LibAiff is an open-source library, providing C applications transparent read & write operations for Audio Interchange File Format (AIFF) files, with the goal of supporting all of its features", + "homepage": "https://sourceforge.net/projects/aifftools" +} diff --git a/externals/vcpkg/ports/libalkimia/dll_names.diff b/externals/vcpkg/ports/libalkimia/dll_names.diff new file mode 100755 index 000000000..3fb5a3a36 --- /dev/null +++ b/externals/vcpkg/ports/libalkimia/dll_names.diff @@ -0,0 +1,21 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 643ffcf3d7b4ce59285343f92a1407927c111881..382d3c6ed244e24dec9f144c02e0c3459e8369a9 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -156,10 +156,12 @@ install( + + generate_export_header(alkimia BASE_NAME alk EXPORT_FILE_NAME alkimia/alk_export.h) + +-if(WIN32) +- set_target_properties(alkimia PROPERTIES SUFFIX "-${ALKIMIA_LIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") +-else() +- set_target_properties(alkimia PROPERTIES VERSION ${ALKIMIA_LIB_VERSION} SOVERSION ${ALKIMIA_LIB_SOVERSION}) ++if(BUILD_SHARED_LIBS) ++ if(WIN32) ++ set_target_properties(alkimia PROPERTIES SUFFIX "-${ALKIMIA_LIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") ++ else() ++ set_target_properties(alkimia PROPERTIES VERSION ${ALKIMIA_LIB_VERSION} SOVERSION ${ALKIMIA_LIB_SOVERSION}) ++ endif() + endif() + set_target_properties(alkimia PROPERTIES OUTPUT_NAME alkimia${ALKIMIA_LIB_SUFFIX}) + set(INCLUDE_INSTALL_DIR include/alkimia/${ALKIMIA_INCLUDE_SUFFIX}) diff --git a/externals/vcpkg/ports/libalkimia/fix_explicit_shared_lib.diff b/externals/vcpkg/ports/libalkimia/fix_explicit_shared_lib.diff new file mode 100755 index 000000000..598ee3d60 --- /dev/null +++ b/externals/vcpkg/ports/libalkimia/fix_explicit_shared_lib.diff @@ -0,0 +1,70 @@ +diff --git a/qml/CMakeLists.txt b/qml/CMakeLists.txt +index f74449b591bafd4ad0c41627139a08e29028ab21..a317307a438542e4cf26d50643057b5e9b649594 100644 +--- a/qml/CMakeLists.txt ++++ b/qml/CMakeLists.txt +@@ -22,7 +22,7 @@ else() + endif() + + configure_file(qmldir ${IMPORTS_DIR}/qmldir) +-add_library(qmlalkimia SHARED qmlalkimiaplugin.cpp) ++add_library(qmlalkimia qmlalkimiaplugin.cpp) + target_link_libraries(qmlalkimia ${LIBS} alkimia) + + install(TARGETS qmlalkimia +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e57c94adf6c3785e5c646c7c95b586392737d686..b467849c7ff25d2ce424b30591cfe9a1e9357a46 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -103,7 +103,7 @@ endforeach() + add_definitions(-DKNSRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}") + + ki18n_wrap_ui(alkimia_LIB_SRCS ${alkimia_UI} ) +-add_library(alkimia SHARED ${alkimia_LIB_SRCS} ${alkimia_INTERNAL_SRCS} ${alkimia_LIB_HEADERS} ${alkimia_LIB_PRIVATE_HEADERS}) ++add_library(alkimia ${alkimia_LIB_SRCS} ${alkimia_INTERNAL_SRCS} ${alkimia_LIB_HEADERS} ${alkimia_LIB_PRIVATE_HEADERS}) + + kde_target_enable_exceptions(alkimia PUBLIC) + if(BUILD_QT4) +@@ -164,7 +164,13 @@ endif() + set_target_properties(alkimia PROPERTIES OUTPUT_NAME alkimia${ALKIMIA_LIB_SUFFIX}) + set(INCLUDE_INSTALL_DIR include/alkimia/${ALKIMIA_INCLUDE_SUFFIX}) + +-install(TARGETS alkimia ++if(${BUILD_SHARED_LIBS}) ++ set(alkimia_export_targets alkimia) ++else() ++ set(alkimia_export_targets alkimia alkimia-internal) ++endif() ++ ++install(TARGETS ${alkimia_export_targets} + EXPORT alkimiaTargets + ${INSTALL_TARGETS_DEFAULT_ARGS} + ) +@@ -228,7 +234,7 @@ configure_package_config_file( + + ########### install files ############### + +-export(TARGETS alkimia ++export(TARGETS ${alkimia_export_targets} + FILE "${CMAKE_CURRENT_BINARY_DIR}/LibAlkimia${ALKIMIA_PATH_SUFFIX}Targets.cmake" + NAMESPACE Alkimia:: + ) +diff --git a/src/LibAlkimiaConfig.cmake.in b/src/LibAlkimiaConfig.cmake.in +index a8893c6fe347ce2d2fe1e0a2854a206e0e41901c..8dcfdf8c13f4306a349052d1c4194e65725a50b4 100644 +--- a/src/LibAlkimiaConfig.cmake.in ++++ b/src/LibAlkimiaConfig.cmake.in +@@ -12,6 +12,15 @@ else() + endif() + find_dependency(@MP_CMAKE_MODULE@) + ++if (NOT @BUILD_SHARED_LIBS@) ++ find_dependency(KF5Completion) ++ find_dependency(KF5I18n) ++ find_dependency(KF5NewStuff) ++ find_dependency(KF5IconThemes) ++ find_dependency(KF5TextWidgets) ++ find_dependency(KF5KIO) ++endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/LibAlkimia@ALKIMIA_PATH_SUFFIX@Targets.cmake") + + set_and_check(LIBALKIMIA_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") diff --git a/externals/vcpkg/ports/libalkimia/portfile.cmake b/externals/vcpkg/ports/libalkimia/portfile.cmake new file mode 100755 index 000000000..a9ba9230e --- /dev/null +++ b/externals/vcpkg/ports/libalkimia/portfile.cmake @@ -0,0 +1,52 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/alkimia + REF 595186bee8409f30e5db091fffa245fc53ad92e8 + SHA512 509082e22bc0a2ce0586e1167df14fd42ac85321315c1ee2914f60e695d1e2e8beae4fc93d16d0053edb520fc391a3dbe30777638285b295e761ad70512688ca + HEAD_REF master + PATCHES + fix_explicit_shared_lib.diff + dll_names.diff # https://invent.kde.org/office/alkimia/-/commit/0ff901025a747ab31ab7efba9f8899b06774f60a +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + webengine BUILD_WITH_WEBENGINE + tools BUILD_TOOLS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DKDE_INSTALL_QMLDIR=qml + -DBUNDLE_INSTALL_DIR=bin + -DBUILD_TESTING=OFF + -DBUILD_DOXYGEN_DOCS=OFF + -DBUILD_WITH_WEBKIT=OFF + -DBUILD_APPLETS=OFF + ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + BUNDLE_INSTALL_DIR +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME LibAlkimia5 CONFIG_PATH lib/cmake/LibAlkimia5-8.1) +vcpkg_copy_pdbs() + +if ("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES onlinequoteseditor5 AUTO_CLEAN) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libalkimia/vcpkg.json b/externals/vcpkg/ports/libalkimia/vcpkg.json new file mode 100755 index 000000000..90cd8e2e0 --- /dev/null +++ b/externals/vcpkg/ports/libalkimia/vcpkg.json @@ -0,0 +1,49 @@ +{ + "name": "libalkimia", + "version": "8.1.70", + "port-version": 1, + "description": "Common functionality for finance applications.", + "homepage": "https://community.kde.org/Alkimia/libalkimia", + "license": "LGPL-2.1-or-later", + "dependencies": [ + "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "gmp", + "kf5completion", + "kf5config", + "kf5coreaddons", + "kf5i18n", + "kf5iconthemes", + "kf5kio", + "kf5newstuff", + "kf5textwidgets", + "kf5xmlgui", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "Enables tools, including Online Quotes Editor" + }, + "webengine": { + "description": "Enables JavaScript support for parsing feature-rich websites", + "dependencies": [ + "qt5-webengine" + ] + } + } +} diff --git a/externals/vcpkg/ports/libao/0001-windows-build-patch.patch b/externals/vcpkg/ports/libao/0001-windows-build-patch.patch new file mode 100755 index 000000000..96bea6116 --- /dev/null +++ b/externals/vcpkg/ports/libao/0001-windows-build-patch.patch @@ -0,0 +1,127 @@ +From 129f8e155596199191cc005bcc257397d0d981ac Mon Sep 17 00:00:00 2001 +From: xiaoyifang +Date: Wed, 16 Feb 2022 21:58:40 +0800 +Subject: [PATCH] patch windows + +--- + include/ao/ao_private.h | 30 +++++++++++++++--------------- + src/ao_wmm.c | 1 + + src/audio_out.c | 1 - + 3 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/include/ao/ao_private.h b/include/ao/ao_private.h +index 44fa03e..c3c50aa 100644 +--- a/include/ao/ao_private.h ++++ b/include/ao/ao_private.h +@@ -138,13 +138,13 @@ struct ao_functions { + + void ao_read_config_files (ao_config *config); + +-#define adebug(format, args...) {\ ++#define adebug(format, ...) {\ + if(!device || device->verbose==2){ \ + if(strcmp(format,"\n")){ \ + if(device && device->funcs->driver_info()->short_name){ \ +- fprintf(stderr,"ao_%s debug: " format,device->funcs->driver_info()->short_name,## args); \ ++ fprintf(stderr,"ao_%s debug: " format,device->funcs->driver_info()->short_name,__VA_ARGS__); \ + }else{ \ +- fprintf(stderr,"debug: " format,## args); \ ++ fprintf(stderr,"debug: " format,__VA_ARGS__); \ + } \ + }else{ \ + fprintf(stderr,"\n"); \ +@@ -152,13 +152,13 @@ void ao_read_config_files (ao_config *config); + } \ + } + +-#define averbose(format, args...) {\ ++#define averbose(format, ...) {\ + if(!device || device->verbose>0){ \ + if(strcmp(format,"\n")){ \ + if(device && device->funcs->driver_info()->short_name){ \ +- fprintf(stderr,"ao_%s info: " format,device->funcs->driver_info()->short_name,## args); \ ++ fprintf(stderr,"ao_%s info: " format,device->funcs->driver_info()->short_name,__VA_ARGS__); \ + }else{ \ +- fprintf(stderr,"info: " format,## args); \ ++ fprintf(stderr,"info: " format,__VA_ARGS__); \ + } \ + }else{ \ + fprintf(stderr,"\n"); \ +@@ -166,13 +166,13 @@ void ao_read_config_files (ao_config *config); + } \ + } + +-#define ainfo(format, args...) {\ ++#define ainfo(format, ...) {\ + if(!device || device->verbose>=0){ \ + if(strcmp(format,"\n")){ \ + if(device && device->funcs->driver_info()->short_name){ \ +- fprintf(stderr,"ao_%s info: " format,device->funcs->driver_info()->short_name,## args); \ ++ fprintf(stderr,"ao_%s info: " format,device->funcs->driver_info()->short_name,__VA_ARGS__); \ + }else{ \ +- fprintf(stderr,"info: " format,## args); \ ++ fprintf(stderr,"info: " format,__VA_ARGS__); \ + } \ + }else{ \ + fprintf(stderr,"\n"); \ +@@ -180,13 +180,13 @@ void ao_read_config_files (ao_config *config); + } \ + } + +-#define awarn(format, args...) {\ ++#define awarn(format, ...) {\ + if(!device || device->verbose>=0){ \ + if(strcmp(format,"\n")){ \ + if(device && device->funcs->driver_info()->short_name){ \ +- fprintf(stderr,"ao_%s WARNING: " format,device->funcs->driver_info()->short_name,## args); \ ++ fprintf(stderr,"ao_%s WARNING: " format,device->funcs->driver_info()->short_name,__VA_ARGS__); \ + }else{ \ +- fprintf(stderr,"WARNING: " format,## args); \ ++ fprintf(stderr,"WARNING: " format,__VA_ARGS__); \ + } \ + }else{ \ + fprintf(stderr,"\n"); \ +@@ -194,13 +194,13 @@ void ao_read_config_files (ao_config *config); + } \ + } + +-#define aerror(format, args...) { \ ++#define aerror(format, ...) { \ + if(!device || device->verbose>=0){ \ + if(strcmp(format,"\n")){ \ + if(device && device->funcs->driver_info()->short_name){ \ +- fprintf(stderr,"ao_%s ERROR: " format,device->funcs->driver_info()->short_name,## args); \ ++ fprintf(stderr,"ao_%s ERROR: " format,device->funcs->driver_info()->short_name,__VA_ARGS__); \ + }else{ \ +- fprintf(stderr,"ERROR: " format,## args); \ ++ fprintf(stderr,"ERROR: " format,__VA_ARGS__); \ + } \ + }else{ \ + fprintf(stderr,"\n"); \ +diff --git a/src/ao_wmm.c b/src/ao_wmm.c +index eec6b83..d18d2a4 100644 +--- a/src/ao_wmm.c ++++ b/src/ao_wmm.c +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + #include + + #include +diff --git a/src/audio_out.c b/src/audio_out.c +index bd8f6fc..e3af366 100644 +--- a/src/audio_out.c ++++ b/src/audio_out.c +@@ -49,7 +49,6 @@ static int dlclose(void *handle) { return 0; } + #ifndef _MSC_VER + # include + #endif +-#include + + #include "ao/ao.h" + #include "ao_private.h" +-- +2.30.0.windows.2 + diff --git a/externals/vcpkg/ports/libao/portfile.cmake b/externals/vcpkg/ports/libao/portfile.cmake new file mode 100755 index 000000000..274beec82 --- /dev/null +++ b/externals/vcpkg/ports/libao/portfile.cmake @@ -0,0 +1,34 @@ +set(NO_DLFCN ) +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND PATCHES "0001-windows-build-patch.patch") + set(NO_DLFCN "ac_cv_header_dlfcn_h=no") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xiph/libao + REF 1.2.2 + SHA512 d2736d25b60862e7d7469611ce31b1df40a4366ab160e2ff1b46919ae91692d1596c8468e4f016303b306fc3ac1bddc7b727f535a362f403c3fe7c6532e9045a + HEAD_REF master + PATCHES ${PATCHES} +) + +if(VCPKG_TARGET_IS_WINDOWS) + set(ENV{LIBS} "-lwinmm -lksuser") +endif() + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + OPTIONS --disable-binaries + ${NO_DLFCN} +) +vcpkg_install_make() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libao/vcpkg.json b/externals/vcpkg/ports/libao/vcpkg.json new file mode 100755 index 000000000..18f7a2675 --- /dev/null +++ b/externals/vcpkg/ports/libao/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "libao", + "version": "1.2.2", + "port-version": 4, + "description": "libao - A Cross-platform Audio Library", + "homepage": "https://github.com/xiph/libao", + "license": "GPL-2.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true, + "platform": "windows" + } + ] +} diff --git a/externals/vcpkg/ports/libarchive/disable-warnings.patch b/externals/vcpkg/ports/libarchive/disable-warnings.patch new file mode 100755 index 000000000..455939479 --- /dev/null +++ b/externals/vcpkg/ports/libarchive/disable-warnings.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b2634da..d037071 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -155,9 +155,6 @@ IF (MSVC) + ################################################################# + # Set compile flags for debug build. + # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug" +- # Enable level 4 C4062: The enumerate has no associated handler in a switch +- # statement and there is no default that can catch it. +- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /w14062") + # Enable level 4 C4254: A larger bit field was assigned to a smaller bit + # field. + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /w14254") diff --git a/externals/vcpkg/ports/libarchive/fix-buildsystem.patch b/externals/vcpkg/ports/libarchive/fix-buildsystem.patch new file mode 100755 index 000000000..4aa19738a --- /dev/null +++ b/externals/vcpkg/ports/libarchive/fix-buildsystem.patch @@ -0,0 +1,157 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b2634da6..0d846877 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -148,10 +148,6 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^XL$") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qinfo=pro:use") + ENDIF(CMAKE_C_COMPILER_ID MATCHES "^XL$") + IF (MSVC) +- if (ENABLE_WERROR) +- # /WX option is the same as gcc's -Werror option. +- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") +- endif () + ################################################################# + # Set compile flags for debug build. + # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug" +@@ -382,8 +378,6 @@ IF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}") + # Maybe DLL path is "C:/Program Files/GnuWin32/bin". + # The zlib and the bzip2 Setup program have installed programs and DLLs into + # "C:/Program Files/GnuWin32" by default. +- # This is convenience setting for Windows. +- SET(CMAKE_PREFIX_PATH ${__GNUWIN32PATH} $(CMAKE_PREFIX_PATH)) + # + # If you didn't use Setup program or installed into nonstandard path, + # cmake cannot find out your zlib or bzip2 libraries and include files, +@@ -420,14 +414,7 @@ IF(ZLIB_FOUND) + INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES}) + IF(WIN32 AND NOT CYGWIN) +- # +- # Test if ZLIB_WINAPI macro is needed to use. +- # +- TRY_MACRO_FOR_LIBRARY( +- "${ZLIB_INCLUDE_DIR}" "${ZLIB_LIBRARIES}" +- RUNS +- "#include \nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }" +- ZLIB_WINAPI) ++ SET(ZLIB_WINAPI OFF) # skip following test, it crashes with weird message box + IF(ZLIB_WINAPI) + ADD_DEFINITIONS(-DZLIB_WINAPI) + ELSE(ZLIB_WINAPI) +@@ -487,8 +474,6 @@ IF(LIBLZMA_FOUND) + SET(HAVE_LIBLZMA 1) + SET(HAVE_LZMA_H 1) + CMAKE_PUSH_CHECK_STATE() +- SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIR}) +- SET(CMAKE_REQUIRED_LIBRARIES ${LIBLZMA_LIBRARIES}) + INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS}) + LIST(APPEND ADDITIONAL_LIBS ${LIBLZMA_LIBRARIES}) + # Test if a macro is needed for the library. +@@ -1356,7 +1341,7 @@ CHECK_FUNCTION_EXISTS_GLIBC(localtime_r HAVE_LOCALTIME_R) + CHECK_FUNCTION_EXISTS_GLIBC(lstat HAVE_LSTAT) + CHECK_FUNCTION_EXISTS_GLIBC(lutimes HAVE_LUTIMES) + CHECK_FUNCTION_EXISTS_GLIBC(mbrtowc HAVE_MBRTOWC) +-CHECK_FUNCTION_EXISTS_GLIBC(memmove HAVE_MEMMOVE) ++set(HAVE_MEMMOVE 1) + CHECK_FUNCTION_EXISTS_GLIBC(mkdir HAVE_MKDIR) + CHECK_FUNCTION_EXISTS_GLIBC(mkfifo HAVE_MKFIFO) + CHECK_FUNCTION_EXISTS_GLIBC(mknod HAVE_MKNOD) +@@ -1388,11 +1373,11 @@ CHECK_FUNCTION_EXISTS_GLIBC(utime HAVE_UTIME) + CHECK_FUNCTION_EXISTS_GLIBC(utimes HAVE_UTIMES) + CHECK_FUNCTION_EXISTS_GLIBC(utimensat HAVE_UTIMENSAT) + CHECK_FUNCTION_EXISTS_GLIBC(vfork HAVE_VFORK) +-CHECK_FUNCTION_EXISTS_GLIBC(wcrtomb HAVE_WCRTOMB) +-CHECK_FUNCTION_EXISTS_GLIBC(wcscmp HAVE_WCSCMP) +-CHECK_FUNCTION_EXISTS_GLIBC(wcscpy HAVE_WCSCPY) +-CHECK_FUNCTION_EXISTS_GLIBC(wcslen HAVE_WCSLEN) +-CHECK_FUNCTION_EXISTS_GLIBC(wctomb HAVE_WCTOMB) ++set(HAVE_WCRTOMB 1) ++set(HAVE_WCSCMP 1) ++set(HAVE_WCSCPY 1) ++set(HAVE_WCSLEN 1) ++set(HAVE_WCTOMB 1) + CHECK_FUNCTION_EXISTS_GLIBC(_ctime64_s HAVE__CTIME64_S) + CHECK_FUNCTION_EXISTS_GLIBC(_fseeki64 HAVE__FSEEKI64) + CHECK_FUNCTION_EXISTS_GLIBC(_get_timezone HAVE__GET_TIMEZONE) +@@ -1405,10 +1390,10 @@ CHECK_FUNCTION_EXISTS(cygwin_conv_path HAVE_CYGWIN_CONV_PATH) + CHECK_FUNCTION_EXISTS(fseeko HAVE_FSEEKO) + CHECK_FUNCTION_EXISTS(strerror_r HAVE_STRERROR_R) + CHECK_FUNCTION_EXISTS(strftime HAVE_STRFTIME) +-CHECK_FUNCTION_EXISTS(vprintf HAVE_VPRINTF) +-CHECK_FUNCTION_EXISTS(wmemcmp HAVE_WMEMCMP) +-CHECK_FUNCTION_EXISTS(wmemcpy HAVE_WMEMCPY) +-CHECK_FUNCTION_EXISTS(wmemmove HAVE_WMEMMOVE) ++set(HAVE_VPRINTF 1) ++set(HAVE_WMEMCMP 1) ++set(HAVE_WMEMCPY 1) ++set(HAVE_WMEMMOVE 1) + + CMAKE_POP_CHECK_STATE() # Restore the state of the variables + +@@ -1449,6 +1434,9 @@ CHECK_C_SOURCE_COMPILES( + "#include \nint main() { return major(256); }" + MAJOR_IN_SYSMACROS) + ++CMAKE_PUSH_CHECK_STATE() ++SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIR}) ++SET(CMAKE_REQUIRED_LIBRARIES ${LIBLZMA_LIBRARIES}) + IF(ENABLE_LZMA) + CHECK_C_SOURCE_COMPILES( + "#include \n#if LZMA_VERSION < 50020000\n#error unsupported\n#endif\nint main(void){lzma_stream_encoder_mt(0, 0); return 0;}" +@@ -1456,6 +1444,7 @@ CHECK_C_SOURCE_COMPILES( + ELSE() + SET(HAVE_LZMA_STREAM_ENCODER_MT 0) + ENDIF(ENABLE_LZMA) ++CMAKE_POP_CHECK_STATE() + + IF(HAVE_STRERROR_R) + SET(HAVE_DECL_STRERROR_R 1) +@@ -2018,7 +2007,7 @@ INCLUDE(CreatePkgConfigFile) + # + # Register installation of PDF documents. + # +-IF(WIN32 AND NOT CYGWIN) ++IF(0) + # + # On Windows platform, It's better that we install PDF documents + # on one's computer. +diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt +index 9389bbc9..c34a42b2 100644 +--- a/libarchive/CMakeLists.txt ++++ b/libarchive/CMakeLists.txt +@@ -236,28 +236,22 @@ ELSEIF(ARCHIVE_ACL_SUNOS) + ENDIF() + + # Libarchive is a shared library +-ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS}) ++ADD_LIBRARY(archive ${libarchive_SOURCES} ${include_HEADERS}) + TARGET_INCLUDE_DIRECTORIES(archive PUBLIC .) + TARGET_LINK_LIBRARIES(archive ${ADDITIONAL_LIBS}) +-SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION}) +- +-# archive_static is a static library +-ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS}) +-TARGET_LINK_LIBRARIES(archive_static ${ADDITIONAL_LIBS}) +-SET_TARGET_PROPERTIES(archive_static PROPERTIES COMPILE_DEFINITIONS ++IF(BUILD_SHARED_LIBS) ++ SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION}) ++ELSE() ++ SET_TARGET_PROPERTIES(archive PROPERTIES COMPILE_DEFINITIONS + LIBARCHIVE_STATIC) +-# On Posix systems, libarchive.so and libarchive.a can co-exist. +-IF(NOT WIN32 OR CYGWIN) +- SET_TARGET_PROPERTIES(archive_static PROPERTIES OUTPUT_NAME archive) +-ENDIF(NOT WIN32 OR CYGWIN) ++ENDIF() + + IF(ENABLE_INSTALL) + # How to install the libraries +- INSTALL(TARGETS archive archive_static ++ INSTALL(TARGETS archive + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) +- INSTALL_MAN(${libarchive_MANS}) + INSTALL(FILES ${include_HEADERS} DESTINATION include) + ENDIF() + diff --git a/externals/vcpkg/ports/libarchive/fix-cpu-set.patch b/externals/vcpkg/ports/libarchive/fix-cpu-set.patch new file mode 100755 index 000000000..8d1924dbe --- /dev/null +++ b/externals/vcpkg/ports/libarchive/fix-cpu-set.patch @@ -0,0 +1,15 @@ +diff --git a/libarchive/archive_random.c b/libarchive/archive_random.c +index 65ea691..63217ec 100644 +--- a/libarchive/archive_random.c ++++ b/libarchive/archive_random.c +@@ -48,6 +48,10 @@ __FBSDID("$FreeBSD$"); + #include + #endif + #ifdef HAVE_PTHREAD_H ++#ifdef __GNUC__ ++#define _GNU_SOURCE ++#include ++#endif + #include + #endif + diff --git a/externals/vcpkg/ports/libarchive/fix-deps.patch b/externals/vcpkg/ports/libarchive/fix-deps.patch new file mode 100755 index 000000000..0c549b44a --- /dev/null +++ b/externals/vcpkg/ports/libarchive/fix-deps.patch @@ -0,0 +1,105 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d49db1b82..cbc2b7102 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -476,6 +476,8 @@ ENDIF() + IF(LIBLZMA_FOUND) + SET(HAVE_LIBLZMA 1) + SET(HAVE_LZMA_H 1) ++ LIST(APPEND ADDITIONAL_LIBS LibLZMA::LibLZMA) ++elseif(0) + CMAKE_PUSH_CHECK_STATE() + INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS}) + LIST(APPEND ADDITIONAL_LIBS ${LIBLZMA_LIBRARIES}) +@@ -556,27 +558,15 @@ ENDIF(LIBB2_FOUND) + # Find LZ4 + # + IF(ENABLE_LZ4) +- IF (LZ4_INCLUDE_DIR) +- # Already in cache, be silent +- SET(LZ4_FIND_QUIETLY TRUE) +- ENDIF (LZ4_INCLUDE_DIR) +- +- FIND_PATH(LZ4_INCLUDE_DIR lz4.h) +- FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4) +- INCLUDE(FindPackageHandleStandardArgs) +- FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR) ++ FIND_PACKAGE(lz4 CONFIG REQUIRED) + ELSE(ENABLE_LZ4) + SET(LZ4_FOUND FALSE) # Override cached value + ENDIF(ENABLE_LZ4) + IF(LZ4_FOUND) ++ SET(HAVE_LZ4HC_H 1) + SET(HAVE_LIBLZ4 1) + SET(HAVE_LZ4_H 1) +- CMAKE_PUSH_CHECK_STATE() # Save the state of the variables +- SET(CMAKE_REQUIRED_INCLUDES ${LZ4_INCLUDE_DIR}) +- CHECK_INCLUDE_FILES("lz4hc.h" HAVE_LZ4HC_H) +- CMAKE_POP_CHECK_STATE() # Restore the state of the variables +- INCLUDE_DIRECTORIES(${LZ4_INCLUDE_DIR}) +- LIST(APPEND ADDITIONAL_LIBS ${LZ4_LIBRARY}) ++ LIST(APPEND ADDITIONAL_LIBS lz4::lz4) + # + # TODO: test for static library. + # +@@ -587,31 +577,19 @@ MARK_AS_ADVANCED(CLEAR LZ4_LIBRARY) + # Find Zstd + # + IF(ENABLE_ZSTD) +- IF (ZSTD_INCLUDE_DIR) +- # Already in cache, be silent +- SET(ZSTD_FIND_QUIETLY TRUE) +- ENDIF (ZSTD_INCLUDE_DIR) +- +- FIND_PATH(ZSTD_INCLUDE_DIR zstd.h) +- FIND_LIBRARY(ZSTD_LIBRARY NAMES zstd libzstd) +- INCLUDE(FindPackageHandleStandardArgs) +- FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZSTD DEFAULT_MSG ZSTD_LIBRARY ZSTD_INCLUDE_DIR) ++ FIND_PACKAGE(zstd CONFIG REQUIRED) + ELSE(ENABLE_ZSTD) + SET(ZSTD_FOUND FALSE) # Override cached value + ENDIF(ENABLE_ZSTD) +-IF(ZSTD_FOUND) +- SET(HAVE_ZSTD_H 1) +- INCLUDE_DIRECTORIES(${ZSTD_INCLUDE_DIR}) +- LIST(APPEND ADDITIONAL_LIBS ${ZSTD_LIBRARY}) +- CMAKE_PUSH_CHECK_STATE() +- SET(CMAKE_REQUIRED_LIBRARIES ${ZSTD_LIBRARY}) +- SET(CMAKE_REQUIRED_INCLUDES ${ZSTD_INCLUDE_DIR}) +- CHECK_FUNCTION_EXISTS(ZSTD_decompressStream HAVE_LIBZSTD) +- CHECK_FUNCTION_EXISTS(ZSTD_compressStream HAVE_LIBZSTD_COMPRESSOR) +- # +- # TODO: test for static library. +- # +- CMAKE_POP_CHECK_STATE() ++IF(zstd_FOUND) ++ SET(HAVE_LIBZSTD 1) ++ IF(TARGET zstd::libzstd_shared) ++ LIST(APPEND ADDITIONAL_LIBS zstd::libzstd_shared) ++ SET(CMAKE_REQUIRED_LIBRARIES zstd::libzstd_shared) ++ ELSE(TARGET zstd::libzstd_shared) ++ LIST(APPEND ADDITIONAL_LIBS zstd::libzstd_static) ++ SET(CMAKE_REQUIRED_LIBRARIES zstd::libzstd_static) ++ ENDIF(TARGET zstd::libzstd_shared) + ENDIF(ZSTD_FOUND) + MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR) + MARK_AS_ADVANCED(CLEAR ZSTD_LIBRARY) +@@ -783,8 +761,7 @@ IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") + FIND_PACKAGE(OpenSSL) + IF(OPENSSL_FOUND) + SET(HAVE_LIBCRYPTO 1) +- INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) +- LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_CRYPTO_LIBRARY}) ++ LIST(APPEND ADDITIONAL_LIBS OpenSSL::Crypto) + ENDIF(OPENSSL_FOUND) + ELSE() + SET(OPENSSL_FOUND FALSE) # Override cached value +@@ -903,7 +880,7 @@ main(int argc, char **argv) + IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND) + INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_LIBRARIES}) +- LIST(REMOVE_DUPLICATES ADDITIONAL_LIBS) ++ #LIST(REMOVE_DUPLICATES ADDITIONAL_LIBS) + ENDIF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND) + ENDIF (ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION}) + ENDIF(NOT ARCHIVE_CRYPTO_${ALGORITHM}) diff --git a/externals/vcpkg/ports/libarchive/pkgconfig-modules.patch b/externals/vcpkg/ports/libarchive/pkgconfig-modules.patch new file mode 100755 index 000000000..266c09419 --- /dev/null +++ b/externals/vcpkg/ports/libarchive/pkgconfig-modules.patch @@ -0,0 +1,238 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7b6f0ad..18cf15c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -397,6 +397,8 @@ IF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}") + ENDIF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}") + + SET(ADDITIONAL_LIBS "") ++SET(LIBARCHIVE_LIBS_PRIVATE "") # additional libs for which the pc module is unknown ++SET(LIBARCHIVE_REQUIRES_PRIVATE "") # pc modules for additonal libs + # + # Find ZLIB + # +@@ -410,6 +412,7 @@ IF(ZLIB_FOUND) + SET(HAVE_ZLIB_H 1) + INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES}) ++ STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " zlib") + IF(WIN32 AND NOT CYGWIN) + SET(ZLIB_WINAPI OFF) # skip following test, it crashes with weird message box + IF(ZLIB_WINAPI) +@@ -442,6 +445,7 @@ IF(BZIP2_FOUND) + SET(HAVE_BZLIB_H 1) + INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${BZIP2_LIBRARIES}) ++ STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " bzip2") + # Test if a macro is needed for the library. + TRY_MACRO_FOR_LIBRARY( + "${BZIP2_INCLUDE_DIR}" "${BZIP2_LIBRARIES}" +@@ -471,6 +475,7 @@ IF(LIBLZMA_FOUND) + SET(HAVE_LIBLZMA 1) + SET(HAVE_LZMA_H 1) + LIST(APPEND ADDITIONAL_LIBS LibLZMA::LibLZMA) ++ STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " liblzma") + elseif(0) + CMAKE_PUSH_CHECK_STATE() + INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS}) +@@ -514,6 +519,7 @@ IF(LZO2_FOUND) + SET(HAVE_LZO_LZO1X_H 1) + INCLUDE_DIRECTORIES(${LZO2_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${LZO2_LIBRARY}) ++ STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " lzo2") + # + # TODO: test for static library. + # +@@ -526,6 +532,7 @@ IF(LIBB2_FOUND) + SET(HAVE_BLAKE2_H 1) + SET(ARCHIVE_BLAKE2 FALSE) + LIST(APPEND ADDITIONAL_LIBS ${LIBB2_LIBRARY}) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE ${LIBB2_LIBRARY}) + CMAKE_PUSH_CHECK_STATE() + SET(CMAKE_REQUIRED_LIBRARIES ${LIBB2_LIBRARY}) + SET(CMAKE_REQUIRED_INCLUDES ${LIBB2_INCLUDE_DIR}) +@@ -552,6 +559,7 @@ IF(lz4_FOUND) + SET(HAVE_LIBLZ4 1) + SET(HAVE_LZ4_H 1) + LIST(APPEND ADDITIONAL_LIBS lz4::lz4) ++ STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " liblz4") + # + # TODO: test for static library. + # +@@ -581,6 +589,7 @@ IF(zstd_FOUND) + LIST(APPEND ADDITIONAL_LIBS zstd::libzstd_static) + SET(CMAKE_REQUIRED_LIBRARIES zstd::libzstd_static) + ENDIF(TARGET zstd::libzstd_shared) ++ STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " libzstd") + ENDIF(ZSTD_FOUND) + MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR) + MARK_AS_ADVANCED(CLEAR ZSTD_LIBRARY) +@@ -678,6 +687,7 @@ IF(ENABLE_CNG) + LA_CHECK_INCLUDE_FILE("Bcrypt.h" HAVE_BCRYPT_H) + IF(HAVE_BCRYPT_H) + LIST(APPEND ADDITIONAL_LIBS "Bcrypt") ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE "Bcrypt") + ENDIF(HAVE_BCRYPT_H) + ELSE(ENABLE_CNG) + UNSET(HAVE_BCRYPT_H CACHE) +@@ -709,6 +719,7 @@ IF(ENABLE_MBEDTLS) + IF(MBEDTLS_FOUND) + SET(HAVE_LIBMBEDCRYPTO 1) + LIST(APPEND ADDITIONAL_LIBS ${MBEDCRYPTO_LIBRARY}) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE ${MBEDCRYPTO_LIBRARY}) + INCLUDE_DIRECTORIES(${MBEDTLS_INCLUDE_DIRS}) + + LIST(APPEND CMAKE_REQUIRED_INCLUDES ${MBEDTLS_INCLUDE_DIRS}) +@@ -729,6 +740,7 @@ IF(ENABLE_NETTLE) + IF(NETTLE_FOUND) + SET(HAVE_LIBNETTLE 1) + LIST(APPEND ADDITIONAL_LIBS ${NETTLE_LIBRARIES}) ++ STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " nettle") + INCLUDE_DIRECTORIES(${NETTLE_INCLUDE_DIR}) + + LIST(APPEND CMAKE_REQUIRED_INCLUDES ${NETTLE_INCLUDE_DIR}) +@@ -753,5 +765,10 @@ IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") + IF(OPENSSL_FOUND) + SET(HAVE_LIBCRYPTO 1) + LIST(APPEND ADDITIONAL_LIBS OpenSSL::Crypto) ++ IF(WIN32 AND NOT MINGW) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE "libcrypto") ++ ELSE() ++ STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " libcrypto") ++ ENDIF() + ENDIF(OPENSSL_FOUND) + ELSE() +@@ -767,6 +780,7 @@ IF(NOT OPENSSL_FOUND) + SET(CMAKE_REQUIRED_LIBRARIES "md") + FIND_LIBRARY(LIBMD_LIBRARY NAMES md) + LIST(APPEND ADDITIONAL_LIBS ${LIBMD_LIBRARY}) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE ${LIBMD_LIBRARY}) + CMAKE_POP_CHECK_STATE() # Restore the state of the variables + ENDIF(LIBMD_FOUND) + ENDIF(NOT OPENSSL_FOUND) +@@ -872,7 +886,12 @@ main(int argc, char **argv) + IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND) + INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_LIBRARIES}) + #LIST(REMOVE_DUPLICATES ADDITIONAL_LIBS) ++ IF(WIN32 AND NOT MINGW) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE "libssl") ++ ELSE() ++ STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " libssl") ++ ENDIF() + ENDIF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND) + ENDIF (ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION}) + ENDIF(NOT ARCHIVE_CRYPTO_${ALGORITHM}) +@@ -1045,6 +1060,7 @@ IF(ENABLE_ICONV) + CHECK_ICONV("libiconv" "") + IF (HAVE_ICONV) + LIST(APPEND ADDITIONAL_LIBS ${LIBICONV_PATH}) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE ${LIBICONV_PATH}) + ENDIF(HAVE_ICONV) + ENDIF(NOT HAVE_ICONV AND LIBICONV_PATH) + ENDIF(ICONV_INCLUDE_DIR) +@@ -1078,6 +1094,7 @@ IF(ENABLE_ICONV) + ENDIF(WIN32 AND NOT CYGWIN) + IF(HAVE_LOCALE_CHARSET) + LIST(APPEND ADDITIONAL_LIBS ${LIBCHARSET_PATH}) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE ${LIBCHARSET_PATH}) + ENDIF(HAVE_LOCALE_CHARSET) + ENDIF(LIBCHARSET_PATH) + ENDIF(LIBICONV_PATH) +@@ -1111,6 +1128,7 @@ IF(LIBXML2_FOUND) + CMAKE_PUSH_CHECK_STATE() # Save the state of the variables + INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${LIBXML2_LIBRARIES}) ++ STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " libxml-2.0") + SET(HAVE_LIBXML2 1) + # libxml2's include files use iconv.h + SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR}) +@@ -1140,6 +1158,7 @@ ELSE(LIBXML2_FOUND) + CMAKE_PUSH_CHECK_STATE() # Save the state of the variables + INCLUDE_DIRECTORIES(${EXPAT_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${EXPAT_LIBRARIES}) ++ STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " expat") + SET(HAVE_LIBEXPAT 1) + LA_CHECK_INCLUDE_FILE("expat.h" HAVE_EXPAT_H) + CMAKE_POP_CHECK_STATE() # Restore the state of the variables +@@ -1170,6 +1189,7 @@ IF(POSIX_REGEX_LIB MATCHES "^(AUTO|LIBC|LIBREGEX)$") + CHECK_FUNCTION_EXISTS_GLIBC(regcomp HAVE_REGCOMP_LIBREGEX) + IF(HAVE_REGCOMP_LIBREGEX) + LIST(APPEND ADDITIONAL_LIBS ${REGEX_LIBRARY}) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE ${REGEX_LIBRARY}) + # + # If regex.h is not found, retry looking for regex.h at + # REGEX_INCLUDE_DIR +@@ -1218,6 +1238,7 @@ IF(NOT FOUND_POSIX_REGEX_LIB AND POSIX_REGEX_LIB MATCHES "^(AUTO|LIBPCREPOSIX)$" + IF(PCREPOSIX_FOUND) + INCLUDE_DIRECTORIES(${PCRE_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${PCREPOSIX_LIBRARIES}) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE ${PCREPOSIX_LIBRARIES}) + # Test if a macro is needed for the library. + TRY_MACRO_FOR_LIBRARY( + "${PCRE_INCLUDE_DIR}" "${PCREPOSIX_LIBRARIES}" +@@ -1229,6 +1250,7 @@ IF(NOT FOUND_POSIX_REGEX_LIB AND POSIX_REGEX_LIB MATCHES "^(AUTO|LIBPCREPOSIX)$" + ELSEIF(NOT WITHOUT_PCRE_STATIC AND NOT PCRE_STATIC AND PCRE_FOUND) + # Determine if pcre static libraries are to be used. + LIST(APPEND ADDITIONAL_LIBS ${PCRE_LIBRARIES}) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE ${PCRE_LIBRARIES}) + SET(TMP_LIBRARIES ${PCREPOSIX_LIBRARIES} ${PCRE_LIBRARIES}) + MESSAGE(STATUS "trying again with -lpcre included") + TRY_MACRO_FOR_LIBRARY( +@@ -1244,6 +1266,7 @@ IF(NOT FOUND_POSIX_REGEX_LIB AND POSIX_REGEX_LIB MATCHES "^(AUTO|LIBPCREPOSIX)$" + # ___chkstk_ms. + MESSAGE(STATUS "Visual Studio build detected, trying again with -lgcc included") + LIST(APPEND ADDITIONAL_LIBS ${LIBGCC_LIBRARIES}) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE ${LIBGCC_LIBRARIES}) + SET(TMP_LIBRARIES ${PCREPOSIX_LIBRARIES} ${PCRE_LIBRARIES} ${LIBGCC_LIBRARIES}) + TRY_MACRO_FOR_LIBRARY( + "${PCRE_INCLUDE_DIR}" "${TMP_LIBRARIES}" +@@ -1762,6 +1785,7 @@ IF(ENABLE_ACL) + SET(CMAKE_REQUIRED_LIBRARIES "acl") + FIND_LIBRARY(ACL_LIBRARY NAMES acl) + LIST(APPEND ADDITIONAL_LIBS ${ACL_LIBRARY}) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE ${ACL_LIBRARY}) + ENDIF(HAVE_LIBACL) + + CHECK_TYPE_EXISTS(acl_t "sys/types.h;sys/acl.h" HAVE_ACL_T) +@@ -1901,6 +1925,7 @@ int main(void) { return ACL_SYNCHRONIZE; }" HAVE_DECL_ACL_SYNCHRONIZE) + SET(CMAKE_REQUIRED_LIBRARIES "richacl") + FIND_LIBRARY(RICHACL_LIBRARY NAMES richacl) + LIST(APPEND ADDITIONAL_LIBS ${RICHACL_LIBRARY}) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE ${RICHACL_LIBRARY}) + ENDIF(HAVE_LIBRICHACL) + + CHECK_STRUCT_HAS_MEMBER("struct richace" e_type "sys/richacl.h" +diff --git a/build/cmake/CreatePkgConfigFile.cmake b/build/cmake/CreatePkgConfigFile.cmake +index bc5a43f..422b83b 100644 +--- a/build/cmake/CreatePkgConfigFile.cmake ++++ b/build/cmake/CreatePkgConfigFile.cmake +@@ -8,7 +8,7 @@ SET(libdir \${exec_prefix}/lib) + SET(includedir \${prefix}/include) + # Now, this is not particularly pretty, nor is it terribly accurate... + # Loop over all our additional libs +-FOREACH(mylib ${ADDITIONAL_LIBS}) ++FOREACH(mylib ${LIBARCHIVE_LIBS_PRIVATE}) + # Extract the filename from the absolute path + GET_FILENAME_COMPONENT(mylib_name ${mylib} NAME_WE) + # Strip the lib prefix +@@ -16,10 +16,6 @@ FOREACH(mylib ${ADDITIONAL_LIBS}) + # Append it to our LIBS string + SET(LIBS "${LIBS} -l${mylib_name}") + ENDFOREACH() +-# libxml2 is easier, since it's already using pkg-config +-FOREACH(mylib ${PC_LIBXML_STATIC_LDFLAGS}) +- SET(LIBS "${LIBS} ${mylib}") +-ENDFOREACH() + # FIXME: The order of the libraries doesn't take dependencies into account, + # thus there's a good chance it'll make some binutils versions unhappy... + # This only affects Libs.private (looked up for static builds) though. +diff --git a/build/pkgconfig/libarchive.pc.in b/build/pkgconfig/libarchive.pc.in +index 4b631e6..80198f1 100644 +--- a/build/pkgconfig/libarchive.pc.in ++++ b/build/pkgconfig/libarchive.pc.in +@@ -10,3 +10,4 @@ Cflags: -I${includedir} + Cflags.private: -DLIBARCHIVE_STATIC + Libs: -L${libdir} -larchive + Libs.private: @LIBS@ ++Requires.private: @LIBARCHIVE_REQUIRES_PRIVATE@ diff --git a/externals/vcpkg/ports/libarchive/portfile.cmake b/externals/vcpkg/ports/libarchive/portfile.cmake new file mode 100755 index 000000000..5e82bfd8a --- /dev/null +++ b/externals/vcpkg/ports/libarchive/portfile.cmake @@ -0,0 +1,72 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libarchive/libarchive + REF 6c3301111caa75c76e1b2acb1afb2d71341932ef #v3.6.1 + SHA512 2fd56ac20e4249807174a2ae29de1cbca55c8f8f247500845f56fd1fd9ebf48c17b8a25a93156df71df9526c0061415ec7d72a6b46bbaca776047e381a2321a7 + HEAD_REF master + PATCHES + disable-warnings.patch + fix-buildsystem.patch + fix-cpu-set.patch + fix-deps.patch + pkgconfig-modules.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + bzip2 ENABLE_BZip2 + bzip2 CMAKE_REQUIRE_FIND_PACKAGE_BZip2 + libxml2 ENABLE_LIBXML2 + libxml2 CMAKE_REQUIRE_FIND_PACKAGE_LibXml2 + lz4 ENABLE_LZ4 + lz4 CMAKE_REQUIRE_FIND_PACKAGE_lz4 + lzma ENABLE_LZMA + lzma CMAKE_REQUIRE_FIND_PACKAGE_LibLZMA + lzo ENABLE_LZO + openssl ENABLE_OPENSSL + openssl CMAKE_REQUIRE_FIND_PACKAGE_OpenSSL + zstd ENABLE_ZSTD +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DENABLE_ZLIB=ON + -DENABLE_PCREPOSIX=OFF + -DPOSIX_REGEX_LIB=NONE + -DENABLE_NETTLE=OFF + -DENABLE_EXPAT=OFF + -DENABLE_LibGCC=OFF + -DENABLE_CNG=OFF + -DENABLE_TAR=OFF + -DENABLE_CPIO=OFF + -DENABLE_CAT=OFF + -DENABLE_XATTR=OFF + -DENABLE_ACL=OFF + -DENABLE_ICONV=OFF + -DENABLE_LIBB2=OFF + -DENABLE_TEST=OFF + -DENABLE_WERROR=OFF +) + +vcpkg_cmake_install() + +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +foreach(header "${CURRENT_PACKAGES_DIR}/include/archive.h" "${CURRENT_PACKAGES_DIR}/include/archive_entry.h") + vcpkg_replace_string("${header}" "(!defined LIBARCHIVE_STATIC)" "0") +endforeach() + +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libarchive/usage b/externals/vcpkg/ports/libarchive/usage new file mode 100755 index 000000000..ff8a1fb0b --- /dev/null +++ b/externals/vcpkg/ports/libarchive/usage @@ -0,0 +1,8 @@ +The package libarchive is compatible with the CMake Find Module: + + find_package(LibArchive REQUIRED) + target_include_directories(main PRIVATE ${LibArchive_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${LibArchive_LIBRARIES}) + + find_package(LibArchive REQUIRED) + target_link_libraries(main PRIVATE LibArchive::LibArchive) # CMake >= 3.17 diff --git a/externals/vcpkg/ports/libarchive/vcpkg-cmake-wrapper.cmake.in b/externals/vcpkg/ports/libarchive/vcpkg-cmake-wrapper.cmake.in new file mode 100755 index 000000000..f3b7cf588 --- /dev/null +++ b/externals/vcpkg/ports/libarchive/vcpkg-cmake-wrapper.cmake.in @@ -0,0 +1,72 @@ +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0057 NEW) +set(z_vcpkg_libarchive_args "") +if("REQUIRED" IN_LIST ARGS) + list(APPEND z_vcpkg_libarchive_args "REQUIRED") +endif() +if("QUIET" IN_LIST ARGS) + list(APPEND z_vcpkg_libarchive_args "QUIET") +endif() + +_find_package(${ARGS}) + +if(LibArchive_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + set(z_vcpkg_libarchive_libs "") + find_package(ZLIB ${z_vcpkg_libarchive_args}) + list(APPEND z_vcpkg_libarchive_libs ZLIB::ZLIB) + if(@ENABLE_BZip2@) + find_package(BZip2 ${z_vcpkg_libarchive_args}) + list(APPEND z_vcpkg_libarchive_libs BZip2::BZip2) + endif() + if(@ENABLE_LIBXML2@) + find_package(LibXml2 ${z_vcpkg_libarchive_args}) + list(APPEND z_vcpkg_libarchive_libs LibXml2::LibXml2) + endif() + if(@ENABLE_LZ4@) + find_package(lz4 CONFIG ${z_vcpkg_libarchive_args}) + list(APPEND z_vcpkg_libarchive_libs lz4::lz4) + endif() + if(@ENABLE_LZMA@) + find_package(LibLZMA ${z_vcpkg_libarchive_args}) + list(APPEND z_vcpkg_libarchive_libs LibLZMA::LibLZMA) + endif() + if(@ENABLE_LZO@) + include(SelectLibraryConfigurations) + find_library(Z_VCPKG_LZO_LIBRARY_DEBUG NAMES lzo2d lzo2 NAMES_PER_DIR PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) + find_library(Z_VCPKG_LZO_LIBRARY_RELEASE NAMES lzo2 NAMES_PER_DIR PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) + select_library_configurations(Z_VCPKG_LZO) + if(Z_VCPKG_LZO_LIBRARY) + list(APPEND z_vcpkg_libarchive_libs ${Z_VCPKG_LZO_LIBRARY}) + else() + set(LibArchive_FOUND FALSE) + endif() + endif() + if(@ENABLE_ZSTD@) + find_package(zstd ${z_vcpkg_libarchive_args}) + if(TARGET zstd::libzstd_shared) + list(APPEND z_vcpkg_libarchive_libs zstd::libzstd_shared) + else(TARGET zstd::libzstd_shared) + list(APPEND z_vcpkg_libarchive_libs zstd::libzstd_static) + endif(TARGET zstd::libzstd_shared) + endif() + if(@ENABLE_OPENSSL@ AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") + find_package(OpenSSL ${z_vcpkg_libarchive_args}) + list(APPEND z_vcpkg_libarchive_libs OpenSSL::Crypto) + endif() + + list(APPEND LibArchive_LIBRARIES ${z_vcpkg_libarchive_libs}) + if(TARGET LibArchive::LibArchive) + if(Z_VCPKG_LZO_LIBRARY AND Z_VCPKG_LZO_LIBRARY_DEBUG) + list(REMOVE_ITEM z_vcpkg_libarchive_libs ${Z_VCPKG_LZO_LIBRARY}) + list(APPEND z_vcpkg_libarchive_libs + "\$<\$>:${Z_VCPKG_LZO_LIBRARY_RELEASE}>" + "\$<\$:${Z_VCPKG_LZO_LIBRARY_DEBUG}>" + ) + endif() + set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${z_vcpkg_libarchive_libs}) + endif() + unset(z_vcpkg_libarchive_libs) +endif() +unset(z_vcpkg_libarchive_args) +cmake_policy(POP) diff --git a/externals/vcpkg/ports/libarchive/vcpkg.json b/externals/vcpkg/ports/libarchive/vcpkg.json new file mode 100755 index 000000000..cbfd80814 --- /dev/null +++ b/externals/vcpkg/ports/libarchive/vcpkg.json @@ -0,0 +1,70 @@ +{ + "name": "libarchive", + "version": "3.6.1", + "description": "Library for reading and writing streaming archives", + "homepage": "https://github.com/libarchive/libarchive", + "license": null, + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + "zlib" + ], + "default-features": [ + "bzip2", + "libxml2", + "lz4", + "lzma", + "openssl", + "zstd" + ], + "features": { + "bzip2": { + "description": "BZip2 support", + "dependencies": [ + "bzip2" + ] + }, + "libxml2": { + "description": "Libxml2 support", + "dependencies": [ + "libxml2" + ] + }, + "lz4": { + "description": "Lz4 support", + "dependencies": [ + "lz4" + ] + }, + "lzma": { + "description": "Lzma support", + "dependencies": [ + "liblzma" + ] + }, + "lzo": { + "description": "Lzo support", + "dependencies": [ + "lzo" + ] + }, + "openssl": { + "description": "OpenSSL support (not available on macOS)", + "dependencies": [ + { + "name": "openssl", + "platform": "!osx" + } + ] + }, + "zstd": { + "description": "Zstd support", + "dependencies": [ + "zstd" + ] + } + } +} diff --git a/externals/vcpkg/ports/libass/CMakeLists.txt b/externals/vcpkg/ports/libass/CMakeLists.txt new file mode 100755 index 000000000..9fb8548cb --- /dev/null +++ b/externals/vcpkg/ports/libass/CMakeLists.txt @@ -0,0 +1,115 @@ +cmake_minimum_required(VERSION 3.9) +project(libass C CXX) + +set(LIBASS_VERSION 0.16.0) + +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h) + +include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) + +add_compile_definitions(CONFIG_FREETYPE) +add_compile_definitions(CONFIG_FRIBIDI) +add_compile_definitions(CONFIG_HARFBUZZ) + +file (GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libass/*.c) + +include(CheckCSourceCompiles) +set(PKG_REQUIRES_LIBASS "harfbuzz >= 1.2.3, fribidi >= 0.19.1, freetype2 >= 9.17.3") +set(PKG_LIBS_LIBASS) +if(WIN32) + add_compile_definitions(CONFIG_DIRECTWRITE) + list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$") + list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$") + + #dependency fribidi does not support uwp builds, link gdi32 directly + set(FONT_LIBRARY gdi32) + set(PKG_LIBS_LIBASS -lgdi32) +elseif(APPLE) + add_compile_definitions(CONFIG_CORETEXT) + list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$") + list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$") + + check_c_source_compiles( + " + #include + int main(void){ + CTFontDescriptorCopyAttribute(NULL, kCTFontURLAttribute); + return 0; + } + " + CHECK_OLD_OSX + ) + if (CHECK_OLD_OSX) + set(FONT_LIBRARY "-framework ApplicationServices -framework CoreFoundation") + set(PKG_LIBS_LIBASS "-framework ApplicationServices -framework CoreFoundation") + else() + set(FONT_LIBRARY "-framework CoreText -framework CoreFoundation") + set(PKG_LIBS_LIBASS "-framework CoreText -framework CoreFoundation") + endif() +else() + add_compile_definitions(CONFIG_FONTCONFIG) + list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$") + list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$") + + find_package(Fontconfig REQUIRED) + set(FONT_LIBRARY Fontconfig::Fontconfig) + set(PKG_REQUIRES_LIBASS "fontconfig >= 2.10.92, ${PKG_REQUIRES_LIBASS}") +endif() + +if (NOT WIN32) + set(PKG_LIBS_LIBASS "${PKG_LIBS_LIBASS} -lm") +endif() + +find_package(Freetype REQUIRED) + +find_path(FRIBIDI_INCLUDE_DIR + NAMES fribidi.h + PATH_SUFFIXES fribidi) + +find_path(HARFBUZZ_INCLUDE_DIR + NAMES hb.h + PATH_SUFFIXES harfbuzz) + +# libass use win32 api to open files on windows since https://github.com/libass/libass/commit/f664ced049394e2a5d4300ba526e206df73ec729 +# so remove dependency dirent. + +find_library(FRIBIDI_LIBRARY NAMES libfribidi fribidi) +find_library(HARFBUZZ_LIBRARY NAMES harfbuzz) + +add_library(ass ${SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/libass.def) + +target_include_directories(ass PRIVATE + ${FRIBIDI_INCLUDE_DIR} + ${HARFBUZZ_INCLUDE_DIR}) +if(DIRENT_INCLUDE_DIR) + target_include_directories(ass PRIVATE + ${DIRENT_INCLUDE_DIR}) +endif() +target_link_libraries(ass PRIVATE + Freetype::Freetype + ${FRIBIDI_LIBRARY} + ${HARFBUZZ_LIBRARY} + ${FONT_LIBRARY}) + +install(TARGETS ass + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + +# pkgconfig file +set(prefix ${CMAKE_INSTALL_PREFIX}) +set(exec_prefix ${CMAKE_INSTALL_PREFIX}) +set(libdir ${CMAKE_INSTALL_PREFIX}/lib) +set(includedir ${CMAKE_INSTALL_PREFIX}/include) +set(PACKAGE_VERSION ${LIBASS_VERSION}) +if(BUILD_SHARED_LIBS) + set(PKG_REQUIRES_PRIVATE ${PKG_REQUIRES_LIBASS}) + set(PKG_LIBS_PRIVATE ${PKG_LIBS_LIBASS}) +else() + set(PKG_REQUIRES_PUBLIC ${PKG_REQUIRES_LIBASS}) + set(PKG_LIBS_PUBLIC ${PKG_LIBS_LIBASS}) +endif() +configure_file(libass.pc.in libass.pc @ONLY) +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/libass.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/externals/vcpkg/ports/libass/config.h.in b/externals/vcpkg/ports/libass/config.h.in new file mode 100755 index 000000000..ffc4c1b49 --- /dev/null +++ b/externals/vcpkg/ports/libass/config.h.in @@ -0,0 +1 @@ +#define CONFIG_SOURCEVERSION "tarball: 0.16.0" diff --git a/externals/vcpkg/ports/libass/libass.def b/externals/vcpkg/ports/libass/libass.def new file mode 100755 index 000000000..7edbbdf63 --- /dev/null +++ b/externals/vcpkg/ports/libass/libass.def @@ -0,0 +1,47 @@ +EXPORTS +ass_library_version +ass_library_init +ass_library_done +ass_set_fonts_dir +ass_set_extract_fonts +ass_set_style_overrides +ass_process_force_style +ass_set_message_cb +ass_renderer_init +ass_renderer_done +ass_set_frame_size +ass_set_storage_size +ass_set_shaper +ass_set_margins +ass_set_use_margins +ass_set_pixel_aspect +ass_set_aspect_ratio +ass_set_font_scale +ass_set_hinting +ass_set_line_spacing +ass_set_line_position +ass_get_available_font_providers +ass_set_fonts +ass_set_selective_style_override_enabled +ass_set_selective_style_override +ass_fonts_update +ass_set_cache_limits +ass_render_frame +ass_new_track +ass_track_set_feature +ass_free_track +ass_alloc_style +ass_alloc_event +ass_free_style +ass_free_event +ass_process_data +ass_process_codec_private +ass_process_chunk +ass_set_check_readorder +ass_flush_events +ass_read_file +ass_read_memory +ass_read_styles +ass_add_font +ass_clear_fonts +ass_step_sub diff --git a/externals/vcpkg/ports/libass/portfile.cmake b/externals/vcpkg/ports/libass/portfile.cmake new file mode 100755 index 000000000..45cf6ad53 --- /dev/null +++ b/externals/vcpkg/ports/libass/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libass/libass + REF 0.16.0 + SHA512 fea93b36d05cd69a5920b603951dd63f46b2434e0dcbb12414bf6e1e584bacc2743fbfc03682d0a672bbfe9bcc057452a942f9967d95a30e535bd3694e40fc7d + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.in DESTINATION ${SOURCE_PATH}) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/libass.def DESTINATION ${SOURCE_PATH}) + +# Since libass uses automake, make and configure, we use a custom CMake file +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +file(COPY ${SOURCE_PATH}/libass/ass.h ${SOURCE_PATH}/libass/ass_types.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/ass) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libass/vcpkg.json b/externals/vcpkg/ports/libass/vcpkg.json new file mode 100755 index 000000000..31d51e293 --- /dev/null +++ b/externals/vcpkg/ports/libass/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "libass", + "version": "0.16.0", + "description": "libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format", + "homepage": "https://github.com/libass/libass", + "license": "ISC", + "dependencies": [ + { + "name": "fontconfig", + "platform": "linux" + }, + "freetype", + "fribidi", + "harfbuzz", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libassuan/fix-flags.patch b/externals/vcpkg/ports/libassuan/fix-flags.patch new file mode 100755 index 000000000..8402c2e0a --- /dev/null +++ b/externals/vcpkg/ports/libassuan/fix-flags.patch @@ -0,0 +1,13 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 089bc97..2d31b6a 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -149,7 +149,7 @@ install-exec-hook: + endif + + mkheader: mkheader.c Makefile +- $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c ++ $(CC_FOR_BUILD) -I. -I$(srcdir) $(CFLAGS) -o $@ $(srcdir)/mkheader.c + + assuan.h: assuan.h.in mkheader $(parts_of_assuan_h) + ./mkheader $(host_os) $(srcdir)/assuan.h.in \ diff --git a/externals/vcpkg/ports/libassuan/fix-pkgconfig.patch b/externals/vcpkg/ports/libassuan/fix-pkgconfig.patch new file mode 100755 index 000000000..8b8672e03 --- /dev/null +++ b/externals/vcpkg/ports/libassuan/fix-pkgconfig.patch @@ -0,0 +1,11 @@ +diff --git a/src/libassuan.pc.in b/src/libassuan.pc.in +index 4e952d7..83ba872 100644 +--- a/src/libassuan.pc.in ++++ b/src/libassuan.pc.in +@@ -10,5 +10,5 @@ Description: IPC library for the GnuPG components + Requires: gpg-error + Version: @PACKAGE_VERSION@ + Cflags: @LIBASSUAN_CONFIG_CFLAGS@ +-Libs: @LIBASSUAN_CONFIG_LIBS@ ++Libs: -L${libdir} @LIBASSUAN_CONFIG_LIBS@ + URL: https://www.gnupg.org/related_software/libassuan/index.html diff --git a/externals/vcpkg/ports/libassuan/portfile.cmake b/externals/vcpkg/ports/libassuan/portfile.cmake new file mode 100755 index 000000000..1d0451406 --- /dev/null +++ b/externals/vcpkg/ports/libassuan/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gpg/libassuan + REF libassuan-2.5.3 + SHA512 5ec896eca6d9d7bec83aa400c8e2dc6f2b09c013050efb2125e2f2a4bd00f179723254483637ca4b7bc30bba951fc985e7ba7db98081606bb106caa7a2622dbe + HEAD_REF master + PATCHES + fix-pkgconfig.patch + fix-flags.patch +) + +vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + --disable-doc + --disable-silent-rules + --with-libgpg-error-prefix=${CURRENT_INSTALLED_DIR}/tools/libgpg-error +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libassuan/bin/libassuan-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libassuan/debug/bin/libassuan-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libassuan/vcpkg.json b/externals/vcpkg/ports/libassuan/vcpkg.json new file mode 100755 index 000000000..eb2e6a2d8 --- /dev/null +++ b/externals/vcpkg/ports/libassuan/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libassuan", + "version": "2.5.3", + "port-version": 4, + "description": "A library implementing the so-called Assuan protocol", + "homepage": "https://gnupg.org/software/libassuan/index.html", + "supports": "!windows", + "dependencies": [ + "libgpg-error" + ] +} diff --git a/externals/vcpkg/ports/libatomic-ops/portfile.cmake b/externals/vcpkg/ports/libatomic-ops/portfile.cmake new file mode 100755 index 000000000..239de3c26 --- /dev/null +++ b/externals/vcpkg/ports/libatomic-ops/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ivmai/libatomic_ops + REF 7a8de3bd9c6c61c68a866b849e7b1d17d76d2d36 # v7.7.0-20211109 + SHA512 05555792a199526d8e164833f590cc57c5ee34672d81952787a09dd7008e947e4e8b6ad63fb6b8ee315294b98fdf743639622b3d9156d8a8f8363b431e875c45 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Denable_docs=OFF + OPTIONS_DEBUG + -Dinstall_headers=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME atomic_ops CONFIG_PATH lib/cmake/atomic_ops) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libatomic-ops/vcpkg.json b/externals/vcpkg/ports/libatomic-ops/vcpkg.json new file mode 100755 index 000000000..46fcf653c --- /dev/null +++ b/externals/vcpkg/ports/libatomic-ops/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libatomic-ops", + "version": "7.7.0", + "port-version": 1, + "description": "The atomic_ops project (Atomic memory update operations portable implementation)", + "homepage": "https://github.com/ivmai/libatomic_ops", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libavif/disable-source-utf8.patch b/externals/vcpkg/ports/libavif/disable-source-utf8.patch new file mode 100755 index 000000000..1e3d5d9bc --- /dev/null +++ b/externals/vcpkg/ports/libavif/disable-source-utf8.patch @@ -0,0 +1,12 @@ +diff -pruN v0.9.0-92388ab3ad.clean.o/CMakeLists.txt v0.9.0-92388ab3ad.clean/CMakeLists.txt +--- a/CMakeLists.txt 2021-02-23 04:51:41.000000000 +0300 ++++ b/CMakeLists.txt 2021-04-14 23:35:50.866487600 +0300 +@@ -165,7 +165,7 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC + # A C4556 warning will be generated on violation. + # Commonly used /utf-8 flag assumes UTF-8 for both source and console, which is usually not the case. + # Warnings can be suppressed but there will still be random characters printed to the console. +- /source-charset:utf-8 /execution-charset:us-ascii ++ #/source-charset:utf-8 /execution-charset:us-ascii + ) + else() + MESSAGE(FATAL_ERROR "libavif: Unknown compiler, bailing out") diff --git a/externals/vcpkg/ports/libavif/portfile.cmake b/externals/vcpkg/ports/libavif/portfile.cmake new file mode 100755 index 000000000..48081c53b --- /dev/null +++ b/externals/vcpkg/ports/libavif/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO AOMediaCodec/libavif + REF v0.9.2 + SHA512 04400ae76214d2f0361a14897d6ee97be675375865bb96c8d237e9a4a1152ac1a966db903c11df82da71b0bc68599a5857e038cc90d63c5d3bc77b13169a3e75 + HEAD_REF master + PATCHES + disable-source-utf8.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DAVIF_CODEC_AOM=ON + -DAVIF_BUILD_APPS=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +# Move cmake configs +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +# Fix pkg-config files +vcpkg_fixup_pkgconfig() + +# Remove duplicate files +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libavif/vcpkg.json b/externals/vcpkg/ports/libavif/vcpkg.json new file mode 100755 index 000000000..dbad25be0 --- /dev/null +++ b/externals/vcpkg/ports/libavif/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "libavif", + "version-semver": "0.9.2", + "port-version": 1, + "description": "Library for encoding and decoding AVIF files", + "homepage": "https://github.com/AOMediaCodec/libavif", + "dependencies": [ + "aom", + "libyuv", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libb2/portfile.cmake b/externals/vcpkg/ports/libb2/portfile.cmake new file mode 100755 index 000000000..452218f28 --- /dev/null +++ b/externals/vcpkg/ports/libb2/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO BLAKE2/libb2 + REF 2c5142f12a2cd52f3ee0a43e50a3a76f75badf85 + SHA512 cf29cf9391ae37a978eb6618de6f856f3defa622b8f56c2d5a519ab34fd5e4d91f3bb868601a44e9c9164a2992e80dde188ccc4d1605dffbdf93687336226f8d + HEAD_REF master +) + +set(OPTIONS) +if(CMAKE_HOST_WIN32) + set(OPTIONS --disable-native) # requires cpuid +endif() + +vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ax_cv_check_cflags___O3=no # see https://github.com/microsoft/vcpkg/pull/17912#issuecomment-840514179 + ${OPTIONS} +) +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libb2/vcpkg.json b/externals/vcpkg/ports/libb2/vcpkg.json new file mode 100755 index 000000000..e8ef8ec05 --- /dev/null +++ b/externals/vcpkg/ports/libb2/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libb2", + "version": "0.98.1", + "port-version": 6, + "description": "C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp", + "homepage": "https://github.com/BLAKE2/libb2", + "supports": "!windows" +} diff --git a/externals/vcpkg/ports/libbacktrace/portfile.cmake b/externals/vcpkg/ports/libbacktrace/portfile.cmake new file mode 100755 index 000000000..1931568fc --- /dev/null +++ b/externals/vcpkg/ports/libbacktrace/portfile.cmake @@ -0,0 +1,19 @@ +if(VCPKG_TARGET_IS_WINDOWS) + message("libbacktrace cannot be built using MSVC on Windows due to relying on the C++ unwind API https://itanium-cxx-abi.github.io/cxx-abi/abi-eh.html") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ianlancetaylor/libbacktrace + REF 4f57c999716847e45505b3df170150876b545088 + SHA512 1df2c9d3c119a2ec7b8b8940bff7ba6d28fe99587f565066ae25c216021431d3c26c8b336c38dd0490165244c66d68f9cba20dfc7836042b62f9d588946be4b5 +) + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libbacktrace/vcpkg.json b/externals/vcpkg/ports/libbacktrace/vcpkg.json new file mode 100755 index 000000000..4136d4f6b --- /dev/null +++ b/externals/vcpkg/ports/libbacktrace/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libbacktrace", + "version-date": "2021-03-14", + "port-version": 1, + "description": "The libbacktrace library may be linked into a program or library and used to produce symbolic backtraces.", + "homepage": "https://github.com/ianlancetaylor/libbacktrace", + "supports": "!windows" +} diff --git a/externals/vcpkg/ports/libbf/portfile.cmake b/externals/vcpkg/ports/libbf/portfile.cmake new file mode 100755 index 000000000..a50abed94 --- /dev/null +++ b/externals/vcpkg/ports/libbf/portfile.cmake @@ -0,0 +1,25 @@ +if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Windows" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "libbf does not support MSVC") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mavam/libbf + REF v1.0.0 + SHA512 04db7adbeb4bc6b20aed7f2676840499ed1afe499b4cab67f27d4a0ad234c1fb06eced24259f37870ec4760fe74d6d6307b5d11b3cd928b975661eb2966d4db8 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libbf) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/libbf/COPYING ${CURRENT_PACKAGES_DIR}/share/libbf/copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/libbf/vcpkg.json b/externals/vcpkg/ports/libbf/vcpkg.json new file mode 100755 index 000000000..1b184fddf --- /dev/null +++ b/externals/vcpkg/ports/libbf/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "libbf", + "version-string": "1.0.0", + "port-version": 2, + "description": "Bloom filters for C++11." +} diff --git a/externals/vcpkg/ports/libbson/disable-source-write.patch b/externals/vcpkg/ports/libbson/disable-source-write.patch new file mode 100755 index 000000000..ff2f9cab5 --- /dev/null +++ b/externals/vcpkg/ports/libbson/disable-source-write.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7ff8bbf..32c2e00 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -114,8 +114,8 @@ if (BUILD_VERSION STREQUAL "0.0.0") + file (WRITE ${PROJECT_SOURCE_DIR}/VERSION_CURRENT ${BUILD_VERSION}) + endif () + else () +- message ("storing BUILD_VERSION ${BUILD_VERSION} in file VERSION_CURRENT for later use") +- file (WRITE ${PROJECT_SOURCE_DIR}/VERSION_CURRENT ${BUILD_VERSION}) ++ #message ("storing BUILD_VERSION ${BUILD_VERSION} in file VERSION_CURRENT for later use") ++ #file (WRITE ${PROJECT_SOURCE_DIR}/VERSION_CURRENT ${BUILD_VERSION}) + endif () + + include (LoadVersion) diff --git a/externals/vcpkg/ports/libbson/fix-include-directory.patch b/externals/vcpkg/ports/libbson/fix-include-directory.patch new file mode 100755 index 000000000..64ff404ca --- /dev/null +++ b/externals/vcpkg/ports/libbson/fix-include-directory.patch @@ -0,0 +1,13 @@ +diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt +index 0197af0..422b051 100644 +--- a/src/libbson/CMakeLists.txt ++++ b/src/libbson/CMakeLists.txt +@@ -341,7 +341,7 @@ if (ENABLE_EXAMPLES) + endif () # ENABLE_EXAMPLES + + set (BSON_HEADER_INSTALL_DIR +- "${CMAKE_INSTALL_INCLUDEDIR}/libbson-${BSON_API_VERSION}" ++ "${CMAKE_INSTALL_INCLUDEDIR}" + ) + + if (MONGOC_ENABLE_STATIC_INSTALL) diff --git a/externals/vcpkg/ports/libbson/fix-static-cmake-2.patch b/externals/vcpkg/ports/libbson/fix-static-cmake-2.patch new file mode 100755 index 000000000..1a694a1bf --- /dev/null +++ b/externals/vcpkg/ports/libbson/fix-static-cmake-2.patch @@ -0,0 +1,13 @@ +diff --git a/src/libbson/build/cmake/libbson-static-1.0-config.cmake.in b/src/libbson/build/cmake/libbson-static-1.0-config.cmake.in +index 92933fe..90eb16f 100644 +--- a/src/libbson/build/cmake/libbson-static-1.0-config.cmake.in ++++ b/src/libbson/build/cmake/libbson-static-1.0-config.cmake.in +@@ -27,7 +27,7 @@ set_and_check (BSON_STATIC_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIRS@") + # directory and the base name, but not the suffix, so we use CMake's + # find_library () to pick that up. Users can override this by configuring + # BSON_STATIC_LIBRARY themselves. +-find_library (BSON_STATIC_LIBRARY bson-static-1.0 PATHS "@PACKAGE_LIBRARY_INSTALL_DIRS@" NO_DEFAULT_PATH) ++find_library (BSON_STATIC_LIBRARY bson-1.0 PATHS "@PACKAGE_LIBRARY_INSTALL_DIRS@" NO_DEFAULT_PATH) + + set (BSON_STATIC_LIBRARIES ${BSON_STATIC_LIBRARY}) + diff --git a/externals/vcpkg/ports/libbson/fix-static-cmake.patch b/externals/vcpkg/ports/libbson/fix-static-cmake.patch new file mode 100755 index 000000000..7de9c5eac --- /dev/null +++ b/externals/vcpkg/ports/libbson/fix-static-cmake.patch @@ -0,0 +1,13 @@ +diff --git a/src/libbson/build/cmake/libbson-static-1.0-config.cmake.in b/src/libbson/build/cmake/libbson-static-1.0-config.cmake.in +index 92933fe01..931a829ae 100644 +--- a/src/libbson/build/cmake/libbson-static-1.0-config.cmake.in ++++ b/src/libbson/build/cmake/libbson-static-1.0-config.cmake.in +@@ -36,3 +36,7 @@ foreach (LIB @LIBBSON_LIBRARIES@) + endforeach () + + set (BSON_STATIC_DEFINITIONS BSON_STATIC) ++ ++set (BSON_LIBRARIES ${BSON_STATIC_LIBRARIES}) ++set (BSON_INCLUDE_DIRS ${BSON_STATIC_INCLUDE_DIRS}) ++set (BSON_DEFINITIONS BSON_STATIC) +\ No newline at end of file diff --git a/externals/vcpkg/ports/libbson/fix-uwp.patch b/externals/vcpkg/ports/libbson/fix-uwp.patch new file mode 100755 index 000000000..92d7d9ae2 --- /dev/null +++ b/externals/vcpkg/ports/libbson/fix-uwp.patch @@ -0,0 +1,139 @@ +diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt +index bb8259b85..0197af068 100644 +--- a/src/libbson/CMakeLists.txt ++++ b/src/libbson/CMakeLists.txt +@@ -230,6 +230,9 @@ set (HEADERS_FORWARDING + ${PROJECT_SOURCE_DIR}/src/bson/forwarding/bson.h + ) + ++add_definitions(-D_CRT_SECURE_NO_WARNINGS) ++ ++if (NOT ENABLE_STATIC MATCHES "ON|AUTO") + add_library (bson_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) + set (CMAKE_CXX_VISIBILITY_PRESET hidden) + target_compile_definitions (bson_shared PRIVATE BSON_COMPILATION JSONSL_PARSE_NAN) +@@ -279,9 +282,13 @@ if (WIN32) + # must be handled specially since we can't resolve them + set (BSON_SYSTEM_LIBRARIES ${BSON_SYSTEM_LIBRARIES} ws2_32) + endif () ++endif () + + if (MONGOC_ENABLE_STATIC_BUILD) + add_library (bson_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) ++ set(CMAKE_CXX_VISIBILITY_PRESET hidden) ++ set(THREADS_PREFER_PTHREAD_FLAG 1) ++ find_package(Threads REQUIRED) + target_compile_definitions (bson_static + PUBLIC BSON_STATIC + PRIVATE BSON_COMPILATION JSONSL_PARSE_NAN +@@ -299,6 +306,7 @@ if (MONGOC_ENABLE_STATIC_BUILD) + if (RT_LIBRARY) + target_link_libraries (bson_static ${RT_LIBRARY}) + endif () ++ find_library(M_LIBRARY m) + if (M_LIBRARY) + target_link_libraries (bson_static ${M_LIBRARY}) + endif () +@@ -313,7 +321,7 @@ function (add_example bin src) + add_executable (${bin} ${BSON_EXAMPLE_SOURCES}) + + # Link against the shared lib like normal apps +- target_link_libraries (${bin} bson_shared) ++ target_link_libraries (${bin} bson_shared bson_static) + + set (EXAMPLES ${EXAMPLES} ${bin}) + endfunction () +@@ -337,7 +345,7 @@ set (BSON_HEADER_INSTALL_DIR + ) + + if (MONGOC_ENABLE_STATIC_INSTALL) +- set (TARGETS_TO_INSTALL bson_shared bson_static) ++ set (TARGETS_TO_INSTALL bson_static) + else () + set (TARGETS_TO_INSTALL bson_shared) + endif () +diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt +index af5a398a9..78d02bdee 100644 +--- a/src/libmongoc/CMakeLists.txt ++++ b/src/libmongoc/CMakeLists.txt +@@ -725,6 +725,7 @@ if (MONGOC_ENABLE_MONGODB_AWS_AUTH) + endif() + endif () + ++if (NOT MONGOC_ENABLE_STATIC) + add_library (mongoc_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) + set_target_properties (mongoc_shared PROPERTIES CMAKE_CXX_VISIBILITY_PRESET hidden) + target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC ${BSON_LIBRARIES}) +@@ -744,6 +745,7 @@ target_compile_definitions (mongoc_shared PRIVATE MONGOC_COMPILATION ${KMS_MSG_D + + set_target_properties (mongoc_shared PROPERTIES VERSION 0.0.0 SOVERSION 0) + set_target_properties (mongoc_shared PROPERTIES OUTPUT_NAME "${MONGOC_OUTPUT_BASENAME}-${MONGOC_API_VERSION}") ++endif () + + if (MONGOC_ENABLE_STATIC_BUILD) + add_library (mongoc_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) +@@ -778,7 +780,11 @@ if (ENABLE_APPLE_FRAMEWORK) + endif () + + add_executable (mongoc-stat ${PROJECT_SOURCE_DIR}/../../src/tools/mongoc-stat.c) ++if (MONGOC_ENABLE_STATIC) ++target_link_libraries (mongoc-stat mongoc_static) ++else () + target_link_libraries (mongoc-stat mongoc_shared ${LIBRARIES}) ++endif () + + # mongoc-stat works if shared memory performance counters are enabled. + if (ENABLE_SHM_COUNTERS STREQUAL "ON") +@@ -1040,7 +1046,7 @@ file (COPY ${PROJECT_SOURCE_DIR}/tests/x509gen DESTINATION ${PROJECT_BINARY_DIR} + file (COPY ${PROJECT_SOURCE_DIR}/tests/release_files DESTINATION ${PROJECT_BINARY_DIR}/tests) + + if (MONGOC_ENABLE_STATIC_INSTALL) +- set (TARGETS_TO_INSTALL mongoc_shared mongoc_static) ++ set (TARGETS_TO_INSTALL mongoc_static) + else () + set (TARGETS_TO_INSTALL mongoc_shared) + endif () +diff --git a/src/libmongoc/src/mongoc/mongoc-gridfs-file.c b/src/libmongoc/src/mongoc/mongoc-gridfs-file.c +index 0690b8680..98721df86 100644 +--- a/src/libmongoc/src/mongoc/mongoc-gridfs-file.c ++++ b/src/libmongoc/src/mongoc/mongoc-gridfs-file.c +@@ -765,7 +765,7 @@ _mongoc_gridfs_file_refresh_page (mongoc_gridfs_file_t *file) + bson_t query; + bson_t child; + bson_t opts; +- const bson_t *chunk; ++ const bson_t *chunk = NULL; + const char *key; + bson_iter_t iter; + int64_t existing_chunks; +diff --git a/src/libmongoc/src/mongoc/mongoc-handshake.c b/src/libmongoc/src/mongoc/mongoc-handshake.c +index 5378015b8..c8e6dd6a7 100644 +--- a/src/libmongoc/src/mongoc/mongoc-handshake.c ++++ b/src/libmongoc/src/mongoc/mongoc-handshake.c +@@ -290,7 +290,8 @@ _get_os_version (void) + char *ret = bson_malloc (HANDSHAKE_OS_VERSION_MAX); + bool found = false; + +-#ifdef _WIN32 ++#if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) ++#elif defined (_WIN32) + OSVERSIONINFO osvi; + ZeroMemory (&osvi, sizeof (OSVERSIONINFO)); + osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFO); +diff --git a/src/libmongoc/src/mongoc/mongoc-util.c b/src/libmongoc/src/mongoc/mongoc-util.c +index 0bbee03ef..6b66da741 100644 +--- a/src/libmongoc/src/mongoc/mongoc-util.c ++++ b/src/libmongoc/src/mongoc/mongoc-util.c +@@ -85,7 +85,11 @@ _mongoc_hex_md5 (const char *input) + void + _mongoc_usleep (int64_t usec) + { +-#ifdef _WIN32 ++#if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) ++ if (usec / 1000 > MAXDWORD || usec < 0) ++ __fastfail(-1); ++ Sleep((DWORD)(usec / 1000)); ++#elif defined(_WIN32) + LARGE_INTEGER ft; + HANDLE timer; + diff --git a/externals/vcpkg/ports/libbson/portfile.cmake b/externals/vcpkg/ports/libbson/portfile.cmake new file mode 100755 index 000000000..afb674f54 --- /dev/null +++ b/externals/vcpkg/ports/libbson/portfile.cmake @@ -0,0 +1,76 @@ +# This port needs to be updated at the same time as mongo-c-driver +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mongodb/mongo-c-driver + REF 00c59aa4a1f72e49e55b211f28650c66c542739e # 1.17.6 + SHA512 9191c64def45ff268cb5d2ce08782265fb8e0567237c8d3311b91e996bd938d629578a7b50e8db29c4b3aa5bc96f93361f6d918e9cfd4861e5f5c5554cf4616d + HEAD_REF master + PATCHES + fix-uwp.patch + fix-static-cmake.patch + disable-source-write.patch + fix-include-directory.patch + fix-static-cmake-2.patch +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(ENABLE_STATIC ON) +else() + set(ENABLE_STATIC OFF) +endif() + +file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents) +string(JSON BUILD_VERSION GET "${_contents}" version) +file(WRITE "${SOURCE_PATH}/VERSION_CURRENT" "${BUILD_VERSION}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENABLE_MONGOC=OFF + -DENABLE_BSON=ON + -DENABLE_TESTS=OFF + -DENABLE_EXAMPLES=OFF + -DENABLE_STATIC=${ENABLE_STATIC} + -DBUILD_VERSION=${BUILD_VERSION} + -DCMAKE_DISABLE_FIND_PACKAGE_PythonInterp=ON + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_PythonInterp +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + + +vcpkg_cmake_config_fixup(PACKAGE_NAME bson-1.0 CONFIG_PATH "lib/cmake/bson-1.0" DO_NOT_DELETE_PARENT_CONFIG_PATH) +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + vcpkg_cmake_config_fixup(PACKAGE_NAME libbson-1.0 CONFIG_PATH "lib/cmake/libbson-static-1.0") +else() + vcpkg_cmake_config_fixup(PACKAGE_NAME libbson-1.0 CONFIG_PATH "lib/cmake/libbson-1.0") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/mongo-c-driver") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + # drop the __declspec(dllimport) when building static + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/bson/bson-macros.h" + "define BSON_API __declspec(dllimport)" "define BSON_API") + + file(RENAME + "${CURRENT_PACKAGES_DIR}/share/libbson-1.0/libbson-static-1.0-config.cmake" + "${CURRENT_PACKAGES_DIR}/share/libbson-1.0/libbson-1.0-config.cmake") + file(RENAME + "${CURRENT_PACKAGES_DIR}/share/libbson-1.0/libbson-static-1.0-config-version.cmake" + "${CURRENT_PACKAGES_DIR}/share/libbson-1.0/libbson-1.0-config-version.cmake") + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") +endif() + +file(COPY "${SOURCE_PATH}/THIRD_PARTY_NOTICES" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libbson") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/libbson/usage b/externals/vcpkg/ports/libbson/usage new file mode 100755 index 000000000..a0a125327 --- /dev/null +++ b/externals/vcpkg/ports/libbson/usage @@ -0,0 +1,9 @@ +The package libbson is compatible with built-in CMake targets: + + find_package(bson-1.0 CONFIG REQUIRED) + target_link_libraries(main PRIVATE mongo::bson_static) + +or: + + find_package(bson-1.0 CONFIG REQUIRED) + target_link_libraries(main PRIVATE mongo::bson_shared) diff --git a/externals/vcpkg/ports/libbson/vcpkg.json b/externals/vcpkg/ports/libbson/vcpkg.json new file mode 100755 index 000000000..b985071bd --- /dev/null +++ b/externals/vcpkg/ports/libbson/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "libbson", + "version": "1.17.6", + "port-version": 1, + "description": "libbson is a library providing useful routines related to building, parsing, and iterating BSON documents.", + "homepage": "https://github.com/mongodb/libbson", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libcaer/libcaer-static-build.patch b/externals/vcpkg/ports/libcaer/libcaer-static-build.patch new file mode 100755 index 000000000..05a25f85d --- /dev/null +++ b/externals/vcpkg/ports/libcaer/libcaer-static-build.patch @@ -0,0 +1,55 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3b1937a..a75db2b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,6 +20,8 @@ OPTION(ENABLE_SERIALDEV "Enable support for serial port devices using libserialp + OPTION(ENABLE_OPENCV "Enable support for frame enhancements using OpenCV" OFF) + OPTION(UDEV_INSTALL "Install udev rules on Linux" ON) + OPTION(EXAMPLES_INSTALL "Build and install examples" OFF) ++OPTION(ENABLE_BINDIR_INSTALLATION "Split archive and binary installation targets [required for vcpkg installation]" OFF) ++OPTION(BUILD_SHARED_LIBS "Build libcaer as a shared library" ON) + + # Cross-compile support + IF(NOT USER_LOCAL_PREFIX) +@@ -98,7 +100,7 @@ INCLUDE(CMakePackageConfigHelpers) + WRITE_BASIC_CONFIG_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake VERSION ${PROJECT_VERSION} + COMPATIBILITY SameMajorVersion) + SET(include_dirs ${CMAKE_INSTALL_INCLUDEDIR}) +-IF(CC_MSVC) ++IF(ENABLE_BINDIR_INSTALLATION) + SET(export_destination ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}) + ELSE() + SET(export_destination ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 377a556..d9c29d7 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -19,6 +19,10 @@ IF(NOT CC_MSVC) + SET(LIBCAER_COMPILE_OPTIONS "-Wno-unused-function") + ENDIF() + ++IF(OS_MACOS) ++ LIST(APPEND LIBCAER_COMPILE_OPTIONS "-Wno-implicit-function-declaration") ++ENDIF() ++ + SET(LIBCAER_LINK_LIBRARIES_PRIVATE ${BASE_LIBS}) + + IF(OS_LINUX) +@@ -63,7 +67,7 @@ ENDIF() + # Set full RPATH + SET(CMAKE_INSTALL_RPATH ${USER_LOCAL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) + +-ADD_LIBRARY(caer SHARED ${LIBCAER_SOURCES}) ++ADD_LIBRARY(caer ${LIBCAER_SOURCES}) + IF(CC_MSVC) + # This flag needs to be propagated down to depending targets to avoid compilation errors + TARGET_COMPILE_OPTIONS(caer INTERFACE -DWIN32_LEAN_AND_MEAN=ON) +@@ -94,7 +98,7 @@ IF(ENABLE_STATIC) + + SET_TARGET_PROPERTIES(caerStatic PROPERTIES OUTPUT_NAME caer) + +- IF(OS_WINDOWS) ++ IF(ENABLE_BINDIR_INSTALLATION) + INSTALL( + TARGETS caerStatic + EXPORT libcaer-exports diff --git a/externals/vcpkg/ports/libcaer/portfile.cmake b/externals/vcpkg/ports/libcaer/portfile.cmake new file mode 100755 index 000000000..ac2335e24 --- /dev/null +++ b/externals/vcpkg/ports/libcaer/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.com/inivation/ + OUT_SOURCE_PATH SOURCE_PATH + REPO dv/libcaer + REF 3.3.14 + SHA512 6e91ebd20796b59c51ebb10be58d12577f3b6370425bbeffcf1a96ff91ad9f3ffaefb2741d0a932b241f2664c157d77158cf475b0f7e39ba208d5482f408fc8b + HEAD_REF ab9470e8900364822fb74ad3c1e99fa4088914df + PATCHES + libcaer-static-build.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DENABLE_OPENCV=ON + -DEXAMPLES_INSTALL=OFF + -DENABLE_BINDIR_INSTALLATION=ON +) +vcpkg_cmake_install() + +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(PACKAGE_NAME "libcaer" CONFIG_PATH "share/libcaer") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libcaer/vcpkg.json b/externals/vcpkg/ports/libcaer/vcpkg.json new file mode 100755 index 000000000..1de207f1e --- /dev/null +++ b/externals/vcpkg/ports/libcaer/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "libcaer", + "version": "3.3.14", + "description": "Minimal C library to access, configure and get data from neuromorphic sensors and processors.", + "homepage": "https://gitlab.com/inivation/dv/libcaer", + "license": "BSD-2-Clause", + "dependencies": [ + "libusb", + "opencv4", + "pkgconf", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libcanberra/03_onlyshowin_unity.patch b/externals/vcpkg/ports/libcanberra/03_onlyshowin_unity.patch new file mode 100755 index 000000000..6e33ee1e5 --- /dev/null +++ b/externals/vcpkg/ports/libcanberra/03_onlyshowin_unity.patch @@ -0,0 +1,19 @@ +Description: Play login sound in Unity too + if it's enabled (it's disabled by default in Ubuntu) +Author: Michael Terry +Bug-Ubuntu: https://launchpad.net/bugs/803519 +Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38883 + +Index: libcanberra/src/libcanberra-login-sound.desktop.in +=================================================================== +--- libcanberra.orig/src/libcanberra-login-sound.desktop.in 2011-07-01 15:02:59.870772598 +0100 ++++ libcanberra/src/libcanberra-login-sound.desktop.in 2011-07-01 15:03:03.554772637 +0100 +@@ -3,7 +3,7 @@ + Name=GNOME Login Sound + Comment=Plays a sound whenever you log in + Exec=@bindir@/canberra-gtk-play --id="desktop-login" --description="GNOME Login" +-OnlyShowIn=GNOME; ++OnlyShowIn=GNOME;Unity; + AutostartCondition=GSettings org.gnome.desktop.sound event-sounds + X-GNOME-Autostart-Phase=Application + X-GNOME-Provides=login-sound diff --git a/externals/vcpkg/ports/libcanberra/gtk_dont_assume_x11.patch b/externals/vcpkg/ports/libcanberra/gtk_dont_assume_x11.patch new file mode 100755 index 000000000..efbc15367 --- /dev/null +++ b/externals/vcpkg/ports/libcanberra/gtk_dont_assume_x11.patch @@ -0,0 +1,70 @@ +From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001 +From: Michael Meeks +Date: Fri, 9 Nov 2012 16:16:40 +0000 +Subject: gtk: Don't assume all GdkDisplays are GdkX11Displays: + broadway/wayland + +--- + src/canberra-gtk-module.c | 15 +++++++++++++++ + src/canberra-gtk.c | 5 +++++ + 2 files changed, 20 insertions(+) + +diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c +index 67791f0..c1532ab 100644 +--- a/src/canberra-gtk-module.c ++++ b/src/canberra-gtk-module.c +@@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) { + guchar *data = NULL; + gint ret = -1; + ++#ifdef GDK_IS_X11_DISPLAY ++ if (!GDK_IS_X11_DISPLAY(d)) ++ return 0; ++#endif ++ + if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w), + gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"), + 0, G_MAXLONG, False, XA_CARDINAL, &type_return, +@@ -335,6 +340,11 @@ static gint display_get_desktop(GdkDisplay *d) { + guchar *data = NULL; + gint ret = -1; + ++#ifdef GDK_IS_X11_DISPLAY ++ if (!GDK_IS_X11_DISPLAY(d)) ++ return 0; ++#endif ++ + if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), DefaultRootWindow(GDK_DISPLAY_XDISPLAY(d)), + gdk_x11_get_xatom_by_name_for_display(d, "_NET_CURRENT_DESKTOP"), + 0, G_MAXLONG, False, XA_CARDINAL, &type_return, +@@ -365,6 +375,11 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) { + gboolean ret = FALSE; + Atom xembed; + ++#ifdef GDK_IS_X11_DISPLAY ++ if (!GDK_IS_X11_DISPLAY(d)) ++ return FALSE; ++#endif ++ + /* Gnome Panel applets are XEMBED windows. We need to make sure we + * ignore them */ + +diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c +index 34446f5..08cb668 100644 +--- a/src/canberra-gtk.c ++++ b/src/canberra-gtk.c +@@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) { + guchar *data = NULL; + gint ret = -1; + ++#ifdef GDK_IS_X11_DISPLAY ++ if (!GDK_IS_X11_DISPLAY(d)) ++ return 0; ++#endif ++ + if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w), + gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"), + 0, G_MAXLONG, False, XA_CARDINAL, &type_return, +-- +cgit v0.12 + diff --git a/externals/vcpkg/ports/libcanberra/macos_fix.patch b/externals/vcpkg/ports/libcanberra/macos_fix.patch new file mode 100755 index 000000000..e7f9016e7 --- /dev/null +++ b/externals/vcpkg/ports/libcanberra/macos_fix.patch @@ -0,0 +1,14 @@ +diff --git a/configure.ac b/configure.ac +index f68602d..1451747 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -115,8 +115,7 @@ CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\ + AC_SUBST([WARNINGFLAGS], $with_cflags) + + CC_CHECK_FLAGS_APPEND([with_ldflags], [LDFLAGS], [\ +- -Wl,--as-needed \ +- -Wl,--gc-sections]) ++]) + AC_SUBST([GCLDFLAGS], $with_ldflags) + + #### libtool stuff #### diff --git a/externals/vcpkg/ports/libcanberra/pkgconfig.patch b/externals/vcpkg/ports/libcanberra/pkgconfig.patch new file mode 100755 index 000000000..7179e5b67 --- /dev/null +++ b/externals/vcpkg/ports/libcanberra/pkgconfig.patch @@ -0,0 +1,12 @@ +diff --git a/libcanberra.pc.in b/libcanberra.pc.in +index 0a5c7a1..91a9e39 100644 +--- a/libcanberra.pc.in ++++ b/libcanberra.pc.in +@@ -7,5 +7,7 @@ Name: libcanberra + Description: Event Sound API + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lcanberra @PTHREAD_LIBS@ ++Libs.private: @LIBS_PRIVATE@ + Cflags: -D_REENTRANT -I${includedir} ++Cflags.private: @CFLAGS_PRIVATE@ + Requires: diff --git a/externals/vcpkg/ports/libcanberra/portfile.cmake b/externals/vcpkg/ports/libcanberra/portfile.cmake new file mode 100755 index 000000000..9b862ca23 --- /dev/null +++ b/externals/vcpkg/ports/libcanberra/portfile.cmake @@ -0,0 +1,92 @@ +set(VERSION 0.30) +set(PATCHES + pkgconfig.patch + undefined_reference.diff # https://sources.debian.org/patches/libcanberra/0.30-7/ + gtk_dont_assume_x11.patch # likewise + 03_onlyshowin_unity.patch # likewise +) + +if(VCPKG_TARGET_IS_OSX) + list(APPEND PATCHES macos_fix.patch) +endif() + +if(VCPKG_TARGET_IS_OSX) + message("${PORT} currently requires the following libraries from the system package manager:\n automake\n libtool\n\nThey can be installed with brew install automake libtool") +else() + message("${PORT} currently requires the following libraries from the system package manager:\n automake\n libtool\n\nThey can be installed with apt-get install automake libtool") +endif() + +vcpkg_download_distfile(ARCHIVE + URLS "http://0pointer.de/lennart/projects/${PORT}/${PORT}-${VERSION}.tar.xz" + FILENAME "${PORT}-${VERSION}.tar.xz" + SHA512 f7543582122256826cd01d0f5673e1e58d979941a93906400182305463d6166855cb51f35c56d807a56dc20b7a64f7ce4391368d24990c1b70782a7d0b4429c2 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF ${VERSION} + PATCHES ${PATCHES} +) + +set(EXTRA_CPPFLAGS) +set(EXTRA_LDFLAGS) + +#libltdl fixes +if(VCPKG_TARGET_IS_OSX) + execute_process( + COMMAND brew --prefix libtool + OUTPUT_VARIABLE BREW_LIBTOOL_PATH + ) + string(STRIP ${BREW_LIBTOOL_PATH} BREW_LIBTOOL_PATH) + + set(LIBS_PRIVATE "-L${BREW_LIBTOOL_PATH}/lib -lltdl") + set(CFLAGS_PRIVATE "-I${BREW_LIBTOOL_PATH}/include") + set(EXTRA_LDFLAGS "LDFLAGS=${LIBS_PRIVATE}") + set(EXTRA_CPPFLAGS "CPPFLAGS=${CFLAGS_PRIVATE}") +else() + set(LIBS_PRIVATE "-lltdl") +endif() + +if (NOT "alsa" IN_LIST FEATURES) + list(APPEND FEATURES_BACKENDS "--disable-alsa") +endif() +if (NOT "gstreamer" IN_LIST FEATURES) + list(APPEND FEATURES_BACKENDS "--disable-gstreamer") +endif() +if (NOT "null" IN_LIST FEATURES) + list(APPEND FEATURES_BACKENDS "--disable-null") +endif() +if (NOT "oss" IN_LIST FEATURES) + list(APPEND FEATURES_BACKENDS "--disable-oss") +endif() +if (NOT "pulse" IN_LIST FEATURES) + list(APPEND FEATURES_BACKENDS "--disable-pulse") +endif() + + +set(ENV{GTKDOCIZE} true) +vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + --disable-gtk-doc + --disable-lynx + --disable-silent-rules + --disable-tdb + ${FEATURES_BACKENDS} + ${EXTRA_CPPFLAGS} + ${EXTRA_LDFLAGS} +) + +vcpkg_install_make() + +configure_file("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${PORT}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${PORT}.pc" @ONLY) +configure_file("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${PORT}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${PORT}.pc" @ONLY) + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools") # empty folder + +file(INSTALL "${SOURCE_PATH}/LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libcanberra/undefined_reference.diff b/externals/vcpkg/ports/libcanberra/undefined_reference.diff new file mode 100755 index 000000000..138fc19fc --- /dev/null +++ b/externals/vcpkg/ports/libcanberra/undefined_reference.diff @@ -0,0 +1,40 @@ +Description: Fix FTBFS with binutils-gold +Author: Bart Martens +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=555081 + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -341,6 +341,7 @@ libcanberra_gtk3_la_CFLAGS = \ + $(GTK3_CFLAGS) + libcanberra_gtk3_la_LIBADD = \ + $(GTK3_LIBS) \ ++ -lX11 \ + libcanberra.la + libcanberra_gtk3_la_LDFLAGS = \ + -export-dynamic -version-info $(LIBCANBERRA_GTK_VERSION_INFO) +@@ -351,6 +352,8 @@ libcanberra_gtk3_module_la_CFLAGS = \ + $(GTK3_CFLAGS) + libcanberra_gtk3_module_la_LIBADD = \ + $(GTK3_LIBS) \ ++ -lX11 \ ++ -lgmodule-2.0 \ + libcanberra.la \ + libcanberra-gtk3.la + libcanberra_gtk3_module_la_LDFLAGS = \ +@@ -379,6 +382,7 @@ libcanberra_gtk_la_CFLAGS = \ + $(GTK_CFLAGS) + libcanberra_gtk_la_LIBADD = \ + $(GTK_LIBS) \ ++ -lX11 \ + libcanberra.la + libcanberra_gtk_la_LDFLAGS = \ + -export-dynamic -version-info $(LIBCANBERRA_GTK_VERSION_INFO) +@@ -389,6 +393,8 @@ libcanberra_gtk_module_la_CFLAGS = \ + $(GTK_CFLAGS) + libcanberra_gtk_module_la_LIBADD = \ + $(GTK_LIBS) \ ++ -lX11 \ ++ -lgmodule-2.0 \ + libcanberra.la \ + libcanberra-gtk.la + libcanberra_gtk_module_la_LDFLAGS = \ diff --git a/externals/vcpkg/ports/libcanberra/vcpkg.json b/externals/vcpkg/ports/libcanberra/vcpkg.json new file mode 100755 index 000000000..44c64d07b --- /dev/null +++ b/externals/vcpkg/ports/libcanberra/vcpkg.json @@ -0,0 +1,53 @@ +{ + "name": "libcanberra", + "version": "0.30", + "port-version": 2, + "description": "An implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops", + "homepage": "http://0pointer.de/lennart/projects/libcanberra/", + "supports": "!(windows | uwp)", + "dependencies": [ + "libvorbis" + ], + "default-features": [ + "defaults" + ], + "features": { + "alsa": { + "description": "Enable optional ALSA support" + }, + "defaults": { + "description": "Default features", + "dependencies": [ + { + "name": "libcanberra", + "features": [ + "null" + ], + "platform": "osx" + }, + { + "name": "libcanberra", + "features": [ + "alsa" + ], + "platform": "linux" + } + ] + }, + "gstreamer": { + "description": "Enable optional GStreamer support", + "dependencies": [ + "gstreamer" + ] + }, + "null": { + "description": "Enable optional null output" + }, + "oss": { + "description": "Enable optional OSS support" + }, + "pulse": { + "description": "Enable optional PulseAudio support" + } + } +} diff --git a/externals/vcpkg/ports/libcbor/LibCborConfig.cmake b/externals/vcpkg/ports/libcbor/LibCborConfig.cmake new file mode 100755 index 000000000..c2fef5086 --- /dev/null +++ b/externals/vcpkg/ports/libcbor/LibCborConfig.cmake @@ -0,0 +1,13 @@ +# Distributed under the OSI-approved BSD 3-Clause License. + +find_path(LIBCBOR_INCLUDE_DIR NAMES cbor.h) + +find_library(LIBCBOR_LIBRARY cbor) + +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBCBOR DEFAULT_MSG LIBCBOR_LIBRARY LIBCBOR_INCLUDE_DIR) + +if(LIBCBOR_FOUND) + set(LIBCBOR_LIBRARIES ${LIBCBOR_LIBRARY}) +endif() + +mark_as_advanced(LIBCBOR_INCLUDE_DIR LIBCBOR_LIBRARY) diff --git a/externals/vcpkg/ports/libcbor/portfile.cmake b/externals/vcpkg/ports/libcbor/portfile.cmake new file mode 100755 index 000000000..dfdd89a84 --- /dev/null +++ b/externals/vcpkg/ports/libcbor/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO PJK/libcbor + REF v0.9.0 + SHA512 710239f69d770212a82e933e59df1aba0fb3ec516ef6666a366f30a950565a52981b0d46ca7e0eea739f5785d79cc21fc19acd857a4a0b135f4f6aa3ef5fd3b0 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DWITH_TESTS=OFF + -DWITH_EXAMPLES=OFF + -DVCPKG_VERBOSE=ON + -DSANITIZE=OFF + -DCBOR_CUSTOM_ALLOC=ON +) + +vcpkg_cmake_build() +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +# Add Cmake Packagefile +file(COPY "${CMAKE_CURRENT_LIST_DIR}/LibCborConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libcbor/vcpkg.json b/externals/vcpkg/ports/libcbor/vcpkg.json new file mode 100755 index 000000000..25d7c8c5e --- /dev/null +++ b/externals/vcpkg/ports/libcbor/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "libcbor", + "version": "0.9.0", + "description": "libcbor is a C library for parsing and generating CBOR, the general-purpose schema-less binary data format", + "homepage": "https://github.com/PJK/libcbor", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libcds/001-cmake-install.patch b/externals/vcpkg/ports/libcds/001-cmake-install.patch new file mode 100755 index 000000000..ae538706f --- /dev/null +++ b/externals/vcpkg/ports/libcds/001-cmake-install.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d97ee07..f8affbb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,6 +34,10 @@ if(APPLE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_DARWIN_C_SOURCE") + endif() + ++if(MSVC) ++ add_definitions(-DCDS_BUILD_LIB) ++endif() ++ + if(WITH_BOOST_ATOMIC) + if(TARGET boost::atomic) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCDS_USE_BOOST_ATOMIC") +@@ -186,9 +190,13 @@ target_compile_options(${CDS_STATIC_LIBRARY} PUBLIC "${LIBCDS_PUBLIC_CXX_FLAGS}" + target_compile_options(${CDS_SHARED_LIBRARY} PRIVATE "${LIBCDS_PRIVATE_CXX_FLAGS}") + target_compile_options(${CDS_STATIC_LIBRARY} PRIVATE "${LIBCDS_PRIVATE_CXX_FLAGS}") + +-install(TARGETS ${CDS_SHARED_LIBRARY} EXPORT LibCDSConfig LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT ${LIBRARIES_COMPONENT} NAMELINK_SKIP RUNTIME DESTINATION lib${LIB_SUFFIX}) +-install(TARGETS ${CDS_SHARED_LIBRARY} EXPORT LibCDSConfig LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT ${HEADERS_COMPONENT} NAMELINK_ONLY) +-install(TARGETS ${CDS_STATIC_LIBRARY} EXPORT LibCDSConfig DESTINATION lib${LIB_SUFFIX} COMPONENT ${LIBRARIES_COMPONENT}) ++if (NOT DISABLE_INSTALL_SHARED) ++ install(TARGETS ${CDS_SHARED_LIBRARY} EXPORT LibCDSConfig RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT ${LIBRARIES_COMPONENT}) ++ #install(TARGETS ${CDS_SHARED_LIBRARY} EXPORT LibCDSConfig RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT ${HEADERS_COMPONENT} NAMELINK_ONLY) ++endif() ++if (NOT DISABLE_INSTALL_STATIC) ++ install(TARGETS ${CDS_STATIC_LIBRARY} EXPORT LibCDSConfig DESTINATION lib${LIB_SUFFIX} COMPONENT ${LIBRARIES_COMPONENT}) ++endif() + install(EXPORT LibCDSConfig FILE LibCDSConfig.cmake NAMESPACE LibCDS:: DESTINATION lib/cmake/LibCDS) + install(DIRECTORY ${PROJECT_SOURCE_DIR}/cds DESTINATION include COMPONENT ${HEADERS_COMPONENT}) + diff --git a/externals/vcpkg/ports/libcds/002-lib-suffix-option.patch b/externals/vcpkg/ports/libcds/002-lib-suffix-option.patch new file mode 100755 index 000000000..9732f6359 --- /dev/null +++ b/externals/vcpkg/ports/libcds/002-lib-suffix-option.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index aa287ff8..20fe7b49 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -118,7 +118,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_C + + if(CMAKE_TARGET_ARCHITECTURE STREQUAL "x86_64") + list(APPEND LIBCDS_PUBLIC_CXX_FLAGS "-mcx16") +- set(LIB_SUFFIX "64") ++ set(LIB_SUFFIX "64" CACHE STRING "") + + # GCC-7: 128-bit atomics support is implemented via libatomic on amd64 + # see https://gcc.gnu.org/ml/gcc/2017-01/msg00167.html diff --git a/externals/vcpkg/ports/libcds/portfile.cmake b/externals/vcpkg/ports/libcds/portfile.cmake new file mode 100755 index 000000000..4cdf9f267 --- /dev/null +++ b/externals/vcpkg/ports/libcds/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO khizmax/libcds + REF v2.3.3 + SHA512 95e67da4336d622d47bdf124d76827ca3e82e65ab5f725ccf58c2d7957960e7d17ee1ebb2126eed70f7a3ca1c97f840d9f59c1ae2eb80215d10abf70b215e510 + HEAD_REF master + PATCHES + 001-cmake-install.patch + 002-lib-suffix-option.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" DISABLE_INSTALL_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DISABLE_INSTALL_SHARED) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DENABLE_UNIT_TEST=OFF + -DENABLE_STRESS_TEST=OFF + -DDISABLE_INSTALL_STATIC=${DISABLE_INSTALL_STATIC} + -DDISABLE_INSTALL_SHARED=${DISABLE_INSTALL_SHARED} + "-DLIB_SUFFIX=" +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/LibCDS) + +file(INSTALL + ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcds RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/libcds/vcpkg.json b/externals/vcpkg/ports/libcds/vcpkg.json new file mode 100755 index 000000000..ceb4e56a2 --- /dev/null +++ b/externals/vcpkg/ports/libcds/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "libcds", + "version": "2.3.3", + "port-version": 2, + "description": "a collection of concurrent containers that don't require external (manual) synchronization for shared access, and safe memory reclamation (SMR) algorithms like Hazard Pointer and user-space RCU that is used as an epoch-based SMR.", + "homepage": "https://github.com/khizmax/libcds", + "license": "BSL-1.0", + "supports": "!(arm & (osx | windows)) & !uwp", + "dependencies": [ + "boost-system", + "boost-thread" + ] +} diff --git a/externals/vcpkg/ports/libcerf/001-fix-static-build.patch b/externals/vcpkg/ports/libcerf/001-fix-static-build.patch new file mode 100755 index 000000000..ffaeaedfb --- /dev/null +++ b/externals/vcpkg/ports/libcerf/001-fix-static-build.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f79581f..4fc9457 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -56,6 +56,8 @@ if(MSVC) + # set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin/$) + if(BUILD_SHARED_LIBS) + set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) ++ else() ++ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd") + endif() + else() + add_compile_options(-O2 -Wno-sign-compare -fno-omit-frame-pointer) diff --git a/externals/vcpkg/ports/libcerf/portfile.cmake b/externals/vcpkg/ports/libcerf/portfile.cmake new file mode 100755 index 000000000..aada71bd4 --- /dev/null +++ b/externals/vcpkg/ports/libcerf/portfile.cmake @@ -0,0 +1,37 @@ +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(BUILD_SHARED_LIBS ON) +else() + set(BUILD_SHARED_LIBS OFF) +endif() + +vcpkg_download_distfile(ARCHIVE + URLS "https://jugit.fz-juelich.de/mlz/libcerf/uploads/924b8d245ad3461107ec630734dfc781/libcerf-1.13.tgz" + FILENAME "libcerf-1.13.tgz" + SHA512 4df711d3e9fd00de99959c3253a9565d1dc2c41f75a5800ced9c52f89cbd13185fbdca3ad75de788fd16c044082738ab345b7fb6a8820ac588edafe1812944aa +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES 001-fix-static-build.patch +) + +if(VCPKG_TARGET_IS_UWP) + set(configure_opts WINDOWS_USE_MSBUILD) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + ${configure_opts} + OPTIONS + -DCERF_CPP=ON + -DLIB_MAN=OFF + -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libcerf" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/libcerf/vcpkg.json b/externals/vcpkg/ports/libcerf/vcpkg.json new file mode 100755 index 000000000..2788bc96d --- /dev/null +++ b/externals/vcpkg/ports/libcerf/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "libcerf", + "version": "1.13", + "port-version": 3, + "description": "A self-contained numeric library that provides an efficient and accurate implementation of complex error functions, along with Dawson, Faddeeva, and Voigt functions.", + "homepage": "https://jugit.fz-juelich.de/mlz/libcerf", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libconfig/CMakeLists.txt b/externals/vcpkg/ports/libconfig/CMakeLists.txt new file mode 100755 index 000000000..ab6711ad9 --- /dev/null +++ b/externals/vcpkg/ports/libconfig/CMakeLists.txt @@ -0,0 +1,53 @@ +cmake_minimum_required(VERSION 3.5.1) +project(libconfig C CXX) + +if(MSVC) + add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS -DYY_NO_UNISTD_H -DYY_USE_CONST) +endif() + +set(C_SOURCES + lib/grammar.c + lib/libconfig.c + lib/scanctx.c + lib/scanner.c + lib/strbuf.c + lib/strvec.c + lib/util.c + lib/wincompat.c +) + +set(CPP_SOURCES + lib/libconfigcpp.cc +) + +set(CMAKE_C_STANDARD 99) + +include_directories(lib ${STDINT_H}) + +add_library(libconfig ${C_SOURCES}) +add_library(libconfig++ ${CPP_SOURCES}) + +if(BUILD_SHARED_LIBS) + target_compile_definitions(libconfig PRIVATE -DLIBCONFIG_EXPORTS) + target_compile_definitions(libconfig++ PRIVATE -DLIBCONFIGXX_EXPORTS) +else() + target_compile_definitions(libconfig PUBLIC -DLIBCONFIG_STATIC) + target_compile_definitions(libconfig++ PUBLIC -DLIBCONFIGXX_STATIC) +endif() + +if (WIN32) + # Linux doesn't have shlwapi + target_link_libraries(libconfig shlwapi) +endif() +target_link_libraries(libconfig++ PRIVATE libconfig) + +install( + TARGETS libconfig libconfig++ + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES lib/libconfig.h++ lib/libconfig.h DESTINATION include) +endif() diff --git a/externals/vcpkg/ports/libconfig/portfile.cmake b/externals/vcpkg/ports/libconfig/portfile.cmake new file mode 100755 index 000000000..06b462677 --- /dev/null +++ b/externals/vcpkg/ports/libconfig/portfile.cmake @@ -0,0 +1,54 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO hyperrealm/libconfig + REF v1.7.3 + SHA512 3749bf9eb29bab0f6b14f4fc759f0c419ed27a843842aaabed1ec1fbe0faa8c93322ff875ca1291d69cb28a39ece86d512aec42c2140d566c38c56dc616734f4 + HEAD_REF master +) + +if (NOT VCPKG_USE_HEAD_VERSION) + message("If you would like to use cmake with the port, use `--head` option with vcpkg install.") + file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +endif() + +if (NOT VCPKG_USE_HEAD_VERSION) + vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON + ) +else() + vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF + ) +endif() + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +if (VCPKG_USE_HEAD_VERSION) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libconfig) +endif() + +foreach(FILE ${CURRENT_PACKAGES_DIR}/include/libconfig.h++ ${CURRENT_PACKAGES_DIR}/include/libconfig.h) + file(READ ${FILE} _contents) + string(REPLACE "defined(LIBCONFIGXX_EXPORTS)" "0" _contents "${_contents}") + string(REPLACE "defined(LIBCONFIG_EXPORTS)" "0" _contents "${_contents}") + + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + string(REPLACE "defined(LIBCONFIGXX_STATIC)" "0" _contents "${_contents}") + string(REPLACE "defined(LIBCONFIG_STATIC)" "0" _contents "${_contents}") + else() + string(REPLACE "defined(LIBCONFIGXX_STATIC)" "1" _contents "${_contents}") + string(REPLACE "defined(LIBCONFIG_STATIC)" "1" _contents "${_contents}") + endif() + file(WRITE ${FILE} "${_contents}") +endforeach() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libconfig/vcpkg.json b/externals/vcpkg/ports/libconfig/vcpkg.json new file mode 100755 index 000000000..6acd72878 --- /dev/null +++ b/externals/vcpkg/ports/libconfig/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libconfig", + "version-string": "1.7.3", + "port-version": 1, + "description": "C/C++ library for processing configuration files", + "homepage": "https://github.com/hyperrealm/libconfig" +} diff --git a/externals/vcpkg/ports/libconfuse/CMakeLists.txt b/externals/vcpkg/ports/libconfuse/CMakeLists.txt new file mode 100755 index 000000000..651dab2f0 --- /dev/null +++ b/externals/vcpkg/ports/libconfuse/CMakeLists.txt @@ -0,0 +1,139 @@ +cmake_minimum_required(VERSION 3.14) + +set(ac_init_line_re "AC_INIT\\(([^,]+), ([^,]+), ([^,]+), ([^)]+)\\)") +file(STRINGS + ${CMAKE_CURRENT_LIST_DIR}/configure.ac + ac_init_line + REGEX ${ac_init_line_re} +) + +string(REGEX REPLACE "${ac_init_line_re}" "\\1" PACKAGE_NAME ${ac_init_line}) +string(REGEX REPLACE "${ac_init_line_re}" "\\2" PACKAGE_VERSION ${ac_init_line}) +string(REGEX REPLACE "${ac_init_line_re}" "\\3" PACKAGE_BUGREPORT ${ac_init_line}) +string(REGEX REPLACE "${ac_init_line_re}" "\\4" PACKAGE ${ac_init_line}) + +set(PACKAGE_TARNAME ${PACKAGE}) +set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") + +string(REGEX REPLACE "([0-9]+.[0-9]+.[0-9]+).*" "\\1" SEMANTIC_VERSION ${PACKAGE_VERSION}) + +project(libconfuse VERSION ${SEMANTIC_VERSION} LANGUAGES C) + +include(CheckFunctionExists) +include(CheckIncludeFile) +include(GNUInstallDirs) + +find_package(FLEX REQUIRED) +find_package(Gettext QUIET) +find_package(Intl QUIET) + +set(CMAKE_DISABLE_SOURCE_CHANGES ON) +set(CMAKE_DISABLE_IN_SOURCE_BUILD ON) + +if (GETTEXT_FOUND) + set(ENABLE_NLS 1) +endif () + +# libconfig.pc.in +set(prefix ${CMAKE_INSTALL_PREFIX}) +set(exec_prefix ${prefix}) +set(libdir ${prefix}/${CMAKE_INSTALL_LIBDIR}) +set(includedir ${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) +set(VERSION ${PROJECT_VERSION}) + +if (Intl_FOUND AND Intl_LIBRARIES) + set(LTLIBINTL ${Intl_LIBRARIES}) +endif () + +configure_file(libconfuse.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libconfuse.pc @ONLY) + +check_function_exists(dcgettext HAVE_DCGETTEXT) +check_function_exists(fmemopen HAVE_FMEMOPEN) +check_function_exists(funopen HAVE_FUNOPEN) +check_function_exists(gettext HAVE_GETTEXT) +check_function_exists(iconv HAVE_ICONV) +check_function_exists(strcasecmp HAVE_STRCASECMP) +check_function_exists(strdup HAVE_STRDUP) +check_function_exists(_strdup HAVE__STRDUP) +check_function_exists(strndup HAVE_STRNDUP) +check_function_exists(setenv HAVE_SETENV) +check_function_exists(unsetenv HAVE_UNSETENV) +check_function_exists(_putenv HAVE__PUTENV) + +if (MSVC) + check_function_exists(_fileno HAVE__FILENO) + check_function_exists(_isatty HAVE__ISATTY) + check_function_exists(_stricmp HAVE_STRCASECMP) +endif () + +check_include_file(stdlib.h HAVE_STDLIB_H) +check_include_file(string.h HAVE_STRING_H) + +check_include_file(strings.h HAVE_STRINGS_H) +check_include_file(sys/stat.h HAVE_SYS_STAT_H) +check_include_file(sys/types.h HAVE_SYS_TYPES_H) +check_include_file(unistd.h HAVE_UNISTD_H) +check_include_file(windows.h HAVE_WINDOWS_H) + +configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) + +flex_target( + CONFUSE + src/lexer.l + ${CMAKE_CURRENT_BINARY_DIR}/lexer.c + COMPILE_FLAGS -Pcfg_yy +) + +set(libconfuse_sources + src/confuse.c + ${FLEX_CONFUSE_OUTPUTS} +) + +if (NOT HAVE_FMEMOPEN) + list(APPEND libconfuse_sources src/fmemopen.c) +endif () + +add_library(libconfuse ${libconfuse_sources}) + +if (BUILD_SHARED_LIBS) + if (WIN32) + target_compile_definitions(libconfuse PRIVATE BUILDING_DLL) + endif () +else () + target_compile_definitions(libconfuse PUBLIC BUILDING_STATIC) +endif () + +string(COMPARE EQUAL "${CMAKE_C_COMPILER_ID}" "GNU" USING_GNUC) + +target_compile_definitions(libconfuse + PUBLIC + $ + PRIVATE + $<$:_CRT_SECURE_NO_WARNINGS> + $<$:_CRT_NONSTDC_NO_DEPRECATE> + $<$:strcasecmp=_stricmp> + $<$:_GNU_SOURCE> +) + +target_include_directories(libconfuse + PUBLIC + $ + $ + $ +) + +set_target_properties(libconfuse PROPERTIES PUBLIC_HEADER src/confuse.h) + +install(TARGETS libconfuse EXPORT unofficial-libconfuse-config) + +install( + EXPORT unofficial-libconfuse-config + NAMESPACE unofficial::libconfuse:: + DESTINATION share/unofficial-libconfuse + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +) + +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/libconfuse.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig +) diff --git a/externals/vcpkg/ports/libconfuse/config.h.in b/externals/vcpkg/ports/libconfuse/config.h.in new file mode 100755 index 000000000..3a43264bd --- /dev/null +++ b/externals/vcpkg/ports/libconfuse/config.h.in @@ -0,0 +1,99 @@ +/* Define if translation of program messages to the user's native + language is requested. */ +#cmakedefine ENABLE_NLS + +/* Define if you have the header file. */ +#cmakedefine HAVE_STDLIB_H + +/* Define if you have the header file. */ +#cmakedefine HAVE_STRING_H + +/* Define if you have the header file. */ +#cmakedefine HAVE_STRINGS_H + +/* Define if you have the header file. */ +#cmakedefine HAVE_SYS_STAT_H + +/* Define if you have the header file. */ +#cmakedefine HAVE_SYS_TYPES_H + +/* Define if you have the header file. */ +#cmakedefine HAVE_UNISTD_H + +/* Define if you have the header file. */ +#cmakedefine HAVE_WINDOWS_H + +/* Define if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define if you have the `_fileno' function. */ +#cmakedefine HAVE__FILENO + +/* Define if you have the `_isatty' function. */ +#cmakedefine HAVE__ISATTY + +/* Define if the GNU dcgettext() function is already present or preinstalled. */ +#cmakedefine HAVE_DCGETTEXT + +/* Define if you have the `fmemopen' function. */ +#cmakedefine HAVE_FMEMOPEN + +/* Define if you have the `funopen' function. */ +#cmakedefine HAVE_FUNOPEN + +/* Define if the GNU gettext() function is already present or preinstalled. */ +#cmakedefine HAVE_GETTEXT + +/* Define if you have the iconv() function. */ +#cmakedefine HAVE_ICONV + +/* Define if you have the `strcasecmp' function. */ +#cmakedefine HAVE_STRCASECMP + +/* Define if you have the `strdup' function. */ +#cmakedefine HAVE_STRDUP + +/* Define if you have the `_strdup' function. */ +#cmakedefine HAVE__STRDUP + +/* Define if you have the strndup function */ +#cmakedefine HAVE_STRNDUP + +/* Define if you have the `setenv' function. */ +#cmakedefine HAVE_SETENV + +/* Define if you have the `unsetenv' function. */ +#cmakedefine HAVE_UNSETENV + +/* Define if you have the `_putenv' function. */ +#cmakedefine HAVE__PUTENV + +/* Define if `lex' declares `yytext' as a `char *' by default, not a + `char[]'. */ +/*#undef YYTEXT_POINTER*/ + +/* Define to empty if `const' does not conform to ANSI C. */ +/*#undef const*/ + +/* Name of package */ +#define PACKAGE "@PACKAGE@" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "@PACKAGE_NAME@" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "@PACKAGE_STRING@" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "@PACKAGE_TARNAME@" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "@PACKAGE_VERSION@" + +/* Version number of package */ +#define VERSION "@PACKAGE_VERSION@" + +#define LOCALEDIR "@CMAKE_INSTALL_LOCALEDIR@" diff --git a/externals/vcpkg/ports/libconfuse/portfile.cmake b/externals/vcpkg/ports/libconfuse/portfile.cmake new file mode 100755 index 000000000..239c8dacf --- /dev/null +++ b/externals/vcpkg/ports/libconfuse/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO martinh/libconfuse + REF 67e1207c8de440525a3fdde1448a586791ebc052 + SHA512 15d4eb0640fe74cc90910820715a70b2f944d2ed9753cca3be90f0ac6840beeda6a370b0624588d81ed2def2f8463e404473721351a685af711cf1d59efb870a + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.in DESTINATION ${SOURCE_PATH}) + +vcpkg_find_acquire_program(FLEX) +get_filename_component(FLEX_DIR ${FLEX} DIRECTORY) +vcpkg_add_to_path(${FLEX_DIR}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + vcpkg_replace_string( + ${CURRENT_PACKAGES_DIR}/include/confuse.h + "ifdef BUILDING_STATIC" + "if 1 // ifdef BUILDING_STATIC" + ) +endif() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/libconfuse/vcpkg.json b/externals/vcpkg/ports/libconfuse/vcpkg.json new file mode 100755 index 000000000..dd7416c67 --- /dev/null +++ b/externals/vcpkg/ports/libconfuse/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libconfuse", + "version-string": "2019-07-14", + "port-version": 2, + "description": "Small configuration file parser library for C", + "homepage": "https://github.com/martinh/libconfuse" +} diff --git a/externals/vcpkg/ports/libcopp/fix-x86-windows.patch b/externals/vcpkg/ports/libcopp/fix-x86-windows.patch new file mode 100755 index 000000000..2e68b0879 --- /dev/null +++ b/externals/vcpkg/ports/libcopp/fix-x86-windows.patch @@ -0,0 +1,20 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,12 +11,17 @@ + libcopp + VERSION "1.4.1" + DESCRIPTION "Cross-platform coroutine library in C++ ." + HOMEPAGE_URL "https://libcopp.atframe.work" + LANGUAGES C CXX ASM) + ++# libcopp requires x86 to be called i386 ++if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86") ++ set(CMAKE_SYSTEM_PROCESSOR i386) ++endif() ++ + # ###################################################################################################################### + include("${PROJECT_SOURCE_DIR}/project/cmake/ProjectBuildOption.cmake") + + # # ############################################################################# + echowithcolor(COLOR GREEN "-- Build Type: ${CMAKE_BUILD_TYPE}") + diff --git a/externals/vcpkg/ports/libcopp/portfile.cmake b/externals/vcpkg/ports/libcopp/portfile.cmake new file mode 100755 index 000000000..1433a7f7c --- /dev/null +++ b/externals/vcpkg/ports/libcopp/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO owent/libcopp + REF 1.4.1 + SHA512 eba06bd2de7c9ee557cdd0bf79e0c53e37722b671347436322c14c99e94d955477bfc0980a4f59a5c31051e108f952ec96791024c45fa8eeaa5f7a49099dd8ae + HEAD_REF v2 + PATCHES fix-x86-windows.patch +) + +# atframework/cmake-toolset needed as a submodule for configure cmake +vcpkg_from_github( + OUT_SOURCE_PATH ATFRAMEWORK_CMAKE_TOOLSET + REPO atframework/cmake-toolset + REF v1.3.5 + SHA512 5048c204eb6358547d99712a06866836e1a6dc20dee44cc33fae77181bdf9ece5686f30062eff6a231e1ec898d5a37ebaddb243e7e3484c002bb96240aa496a5 + HEAD_REF main + ) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS "-DATFRAMEWORK_CMAKE_TOOLSET_DIR=${ATFRAMEWORK_CMAKE_TOOLSET}" +) + +vcpkg_cmake_install() + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/BOOST_LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libcopp) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/libcopp/libcopp-config.cmake" "set(\${CMAKE_FIND_PACKAGE_NAME}_SOURCE_DIR \"${SOURCE_PATH}\")" "") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/externals/vcpkg/ports/libcopp/vcpkg.json b/externals/vcpkg/ports/libcopp/vcpkg.json new file mode 100755 index 000000000..5e1d7bc73 --- /dev/null +++ b/externals/vcpkg/ports/libcopp/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "libcopp", + "version-semver": "1.4.1", + "port-version": 2, + "maintainers": "owent ", + "description": "A cross-platfrom coroutine library for C++", + "homepage": "https://github.com/owent/libcopp", + "documentation": "https://libcopp.atframe.work/", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libcpplocate/fix-install-paths.patch b/externals/vcpkg/ports/libcpplocate/fix-install-paths.patch new file mode 100755 index 000000000..62d4722c2 --- /dev/null +++ b/externals/vcpkg/ports/libcpplocate/fix-install-paths.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 854214c..9c4d98a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -124,7 +124,7 @@ if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr" OR "${CMAKE_INSTALL_PREFIX}" STREQU + endif() + + # Installation paths +-if(UNIX AND SYSTEM_DIR_INSTALL) ++if(1) + # Install into the system (/usr/bin or /usr/local/bin) + set(INSTALL_ROOT "share/${project}") # /usr/[local]/share/ + set(INSTALL_CMAKE "share/${project}/cmake") # /usr/[local]/share//cmake +diff --git a/cpplocate-config.cmake b/cpplocate-config.cmake +index 8693fa4..cdb2828 100644 +--- a/cpplocate-config.cmake ++++ b/cpplocate-config.cmake +@@ -26,7 +26,7 @@ macro(find_modules PREFIX) + if(TARGET ${module_name}) + set(MODULE_FOUND TRUE) + else() +- find_module("${CMAKE_CURRENT_LIST_DIR}/${PREFIX}/${module_name}/${module_name}-export.cmake") ++ find_module("${CMAKE_CURRENT_LIST_DIR}/${module_name}-export.cmake") + endif() + endforeach(module_name) + endmacro() +diff --git a/liblocate-config.cmake b/liblocate-config.cmake +index 3bf4823..7245353 100644 +--- a/liblocate-config.cmake ++++ b/liblocate-config.cmake +@@ -25,7 +25,7 @@ macro(find_modules PREFIX) + if(TARGET ${module_name}) + set(MODULE_FOUND TRUE) + else() +- find_module("${CMAKE_CURRENT_LIST_DIR}/${PREFIX}/${module_name}/${module_name}-export.cmake") ++ find_module("${CMAKE_CURRENT_LIST_DIR}/${module_name}-export.cmake") + endif() + endforeach(module_name) + endmacro() diff --git a/externals/vcpkg/ports/libcpplocate/portfile.cmake b/externals/vcpkg/ports/libcpplocate/portfile.cmake new file mode 100755 index 000000000..963700fcb --- /dev/null +++ b/externals/vcpkg/ports/libcpplocate/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cginternals/cpplocate + REF v2.3.0 + SHA512 4028d552d0c3c0161d5dd5aea27bb22f0c61297a4b461a067c082cfcf84e3a709c9895453e750d819433529089011c2512293b2064c42bb5ba11f957eebc2206 + HEAD_REF master + PATCHES + fix-install-paths.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DOPTION_BUILD_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME cpplocate + CONFIG_PATH share/cpplocate/cmake/cpplocate + DO_NOT_DELETE_PARENT_CONFIG_PATH +) + +vcpkg_cmake_config_fixup( + PACKAGE_NAME liblocate + CONFIG_PATH share/cpplocate/cmake/liblocate +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/cpplocate/cmake") + +# Patched liblocate config file needs moving to the correct directory +file(RENAME + "${CURRENT_PACKAGES_DIR}/share/cpplocate/liblocate-config.cmake" + "${CURRENT_PACKAGES_DIR}/share/liblocate/liblocate-config.cmake" +) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libcpplocate/vcpkg.json b/externals/vcpkg/ports/libcpplocate/vcpkg.json new file mode 100755 index 000000000..3dbe9db2e --- /dev/null +++ b/externals/vcpkg/ports/libcpplocate/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libcpplocate", + "version-semver": "2.3.0", + "description": "Cross-platform C++ library providing tools for applications to locate themselves, their data assets as well as dependent modules.", + "homepage": "https://cpplocate.org/", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libcrafter/fix-build-error.patch b/externals/vcpkg/ports/libcrafter/fix-build-error.patch new file mode 100755 index 000000000..cc97b4a63 --- /dev/null +++ b/externals/vcpkg/ports/libcrafter/fix-build-error.patch @@ -0,0 +1,20 @@ +diff --git a/libcrafter/configure.ac b/libcrafter/configure.ac +index 860d98b..b04ccce 100644 +--- a/libcrafter/configure.ac ++++ b/libcrafter/configure.ac +@@ -35,14 +35,13 @@ AC_ARG_WITH(libpcap, + PCAPINC="-I$withval -I$withval/bpf" + PCAPLIB="-L$withval -lpcap" + elif test -f $withval/include/pcap.h -a \ +- -f $withval/include/net/bpf.h -a \ + -f $withval/lib/libpcap.a; then + owd=`pwd` + if cd $withval; then withval=`pwd`; cd $owd; fi + PCAPINC="-I$withval/include" + PCAPLIB="-L$withval/lib -lpcap" + else +- AC_ERROR(pcap.h, net/bpf.h, or libpcap.a not found in $withval) ++ AC_ERROR(pcap.h, or libpcap.a not found in $withval) + fi + ;; + esac ], diff --git a/externals/vcpkg/ports/libcrafter/portfile.cmake b/externals/vcpkg/ports/libcrafter/portfile.cmake new file mode 100755 index 000000000..b72759a15 --- /dev/null +++ b/externals/vcpkg/ports/libcrafter/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO pellegre/libcrafter + REF 86f81f101b5e3051ed04563b3ad3dd7a823afb21 #version-1.0 + SHA512 bd0eac06896df63f0fff0ed3cf7ca5176e56615476c8134bd26f035692ab9e583f58f1f57daa7673771a710d6921c0c6a6473ab181982ad57727584f2cde56d0 + HEAD_REF master + PATCHES fix-build-error.patch +) + +vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH libcrafter + OPTIONS + "--with-libpcap=${CURRENT_INSTALLED_DIR}" +) + +vcpkg_install_make() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/libcrafter/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libcrafter/vcpkg.json b/externals/vcpkg/ports/libcrafter/vcpkg.json new file mode 100755 index 000000000..8f8dfd08c --- /dev/null +++ b/externals/vcpkg/ports/libcrafter/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libcrafter", + "version": "1.0", + "port-version": 2, + "description": "Libcrafter is a high level library for C++ designed to create and decode network packets.", + "homepage": "https://github.com/pellegre/libcrafter", + "supports": "!windows", + "dependencies": [ + "libpcap" + ] +} diff --git a/externals/vcpkg/ports/libcroco/CMakeLists.txt b/externals/vcpkg/ports/libcroco/CMakeLists.txt new file mode 100755 index 000000000..9e05f376d --- /dev/null +++ b/externals/vcpkg/ports/libcroco/CMakeLists.txt @@ -0,0 +1,138 @@ +cmake_minimum_required(VERSION 3.11) +project(libcroco C) + +find_package(Iconv REQUIRED) +find_package(Intl REQUIRED) +find_package(PkgConfig REQUIRED) +pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 IMPORTED_TARGET) +find_package(LibXml2 REQUIRED) +if(NOT WIN32) + find_package(Threads REQUIRED) +endif() +find_path(GLIB_INCLUDE_DIR glib.h) + +file(GLOB SOURCES + src/cr-utils.c + src/cr-utils.h + src/cr-input.c + src/cr-input.h + src/cr-enc-handler.c + src/cr-enc-handler.h + src/cr-num.c + src/cr-num.h + src/cr-rgb.c + src/cr-rgb.h + src/cr-token.c + src/cr-token.h + src/cr-tknzr.c + src/cr-tknzr.h + src/cr-term.c + src/cr-term.h + src/cr-attr-sel.c + src/cr-attr-sel.h + src/cr-pseudo.c + src/cr-pseudo.h + src/cr-additional-sel.c + src/cr-additional-sel.h + src/cr-simple-sel.c + src/cr-simple-sel.h + src/cr-selector.c + src/cr-selector.h + src/cr-doc-handler.c + src/cr-doc-handler.h + src/cr-parser.c + src/cr-parser.h + src/cr-declaration.c + src/cr-declaration.h + src/cr-statement.c + src/cr-statement.h + src/cr-stylesheet.c + src/cr-stylesheet.h + src/cr-cascade.c + src/cr-cascade.h + src/cr-om-parser.c + src/cr-om-parser.h + src/cr-style.c + src/cr-style.h + src/cr-sel-eng.c + src/cr-sel-eng.h + src/cr-fonts.c + src/cr-fonts.h + src/cr-prop-list.c + src/cr-prop-list.h + src/cr-parsing-location.c + src/cr-parsing-location.h + src/cr-string.c + src/cr-string.h + src/libcroco.def +) + +set(CMAKE_DEBUG_POSTFIX "d") + +add_library(croco-0.6 ${SOURCES}) + +target_include_directories(croco-0.6 PRIVATE ${GLIB_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR}) +target_link_libraries(croco-0.6 PRIVATE + PkgConfig::GLIB2 + ${LIBXML2_LIBRARIES} ${Intl_LIBRARIES} Iconv::Iconv +) + +install(TARGETS croco-0.6 + EXPORT libcroco-targets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(FILES + src/libcroco.h + src/cr-additional-sel.h + src/cr-attr-sel.h + src/cr-cascade.h + src/cr-declaration.h + src/cr-doc-handler.h + src/cr-enc-handler.h + src/cr-input.h + src/cr-num.h + src/cr-om-parser.h + src/cr-parser.h + src/cr-pseudo.h + src/cr-rgb.h + src/cr-selector.h + src/cr-simple-sel.h + src/cr-statement.h + src/cr-stylesheet.h + src/cr-term.h + src/cr-tknzr.h + src/cr-token.h + src/cr-utils.h + src/cr-fonts.h + src/cr-sel-eng.h + src/cr-style.h + src/cr-prop-list.h + src/cr-parsing-location.h + src/cr-string.h + src/libcroco-config.h + DESTINATION include/libcroco +) + +install( + EXPORT libcroco-targets + NAMESPACE unofficial::libcroco:: + FILE unofficial-libcroco-targets.cmake + DESTINATION share/unofficial-libcroco +) + +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-libcroco-config.cmake " +include(CMakeFindDependencyMacro) +find_dependency(Intl) +find_dependency(Iconv) +find_dependency(PkgConfig) +pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 IMPORTED_TARGET) +find_dependency(LibXml2) +if(NOT WIN32) + find_dependency(Threads) +endif() +include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-libcroco-targets.cmake) +") +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-libcroco-config.cmake DESTINATION share/unofficial-libcroco) diff --git a/externals/vcpkg/ports/libcroco/portfile.cmake b/externals/vcpkg/ports/libcroco/portfile.cmake new file mode 100755 index 000000000..de8c0fe2a --- /dev/null +++ b/externals/vcpkg/ports/libcroco/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://download.gnome.org/sources/libcroco/0.6/libcroco-0.6.13.tar.xz" + FILENAME "libcroco-0.6.13.tar.xz" + SHA512 038a3ac9d160a8cf86a8a88c34367e154ef26ede289c93349332b7bc449a5199b51ea3611cebf3a2416ae23b9e45ecf8f9c6b24ea6d16a5519b796d3c7e272d4 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +configure_file(${SOURCE_PATH}/config.h.win32 ${SOURCE_PATH}/src/config.h COPYONLY) +file(READ "${SOURCE_PATH}/src/libcroco.symbols" SYMBOLS) +string(REGEX REPLACE ";[^\n]*\n" "" DEF "EXPORTS\n${SYMBOLS}") +file(WRITE "${SOURCE_PATH}/src/libcroco.def" "${DEF}") +vcpkg_find_acquire_program(PKGCONFIG) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-libcroco TARGET_PATH share/unofficial-libcroco) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcroco RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/libcroco/vcpkg.json b/externals/vcpkg/ports/libcroco/vcpkg.json new file mode 100755 index 000000000..f6781ed63 --- /dev/null +++ b/externals/vcpkg/ports/libcroco/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libcroco", + "version": "0.6.13", + "port-version": 3, + "description": "A standalone css2 parsing and manipulation library", + "dependencies": [ + "glib", + "libxml2" + ] +} diff --git a/externals/vcpkg/ports/libcuckoo/portfile.cmake b/externals/vcpkg/ports/libcuckoo/portfile.cmake new file mode 100755 index 000000000..67c8f445e --- /dev/null +++ b/externals/vcpkg/ports/libcuckoo/portfile.cmake @@ -0,0 +1,29 @@ +# Header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO efficient/libcuckoo + REF 8785773896d74f72b6224e59d37f5f8c3c1e022a + SHA512 e47f8fd132ee2acf347ee375759f96235cd090fdb825792f994ff5eb4d8fed55b8e8bea8d293ec96c1a5f1b46d19c6648eaf2482e482b7b9c0d6dc734bc2121d + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF + -DBUILD_STRESS_TESTS=OFF + -DBUILD_UNIT_TESTS=OFF + -DBUILD_UNIVERSAL_BENCHMARK=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/libcuckoo/vcpkg.json b/externals/vcpkg/ports/libcuckoo/vcpkg.json new file mode 100755 index 000000000..49f4312ea --- /dev/null +++ b/externals/vcpkg/ports/libcuckoo/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libcuckoo", + "version-string": "0.3", + "port-version": 1, + "description": "A high-performance, concurrent hash table", + "homepage": "https://github.com/efficient/libcuckoo" +} diff --git a/externals/vcpkg/ports/libcurl-simple-https/portfile.cmake b/externals/vcpkg/ports/libcurl-simple-https/portfile.cmake new file mode 100755 index 000000000..4ea56bdd1 --- /dev/null +++ b/externals/vcpkg/ports/libcurl-simple-https/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO SamuelMarks/curl-simple-https + REF 5a115053ba4d249fc1af22c3673b4d014e56bcf5 + SHA512 6274bfeec5235d39c627850b1b6ef03c3f1982c74f937b604137cf3cf87e982f971c4681760b42926a3fb15bc8268f2fa48c197919516066d73f53425aa24545 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DBUILD_CLI=OFF" +) +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/cmake/License.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/externals/vcpkg/ports/libcurl-simple-https/vcpkg.json b/externals/vcpkg/ports/libcurl-simple-https/vcpkg.json new file mode 100755 index 000000000..beac2afdd --- /dev/null +++ b/externals/vcpkg/ports/libcurl-simple-https/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libcurl-simple-https", + "version-date": "2022-02-14", + "description": "Very simple HTTPS interface built atop libcurl", + "license": "Apache-2.0 OR MIT", + "supports": "!uwp", + "dependencies": [ + "curl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libdatachannel/0001-fix-for-vcpkg.patch b/externals/vcpkg/ports/libdatachannel/0001-fix-for-vcpkg.patch new file mode 100755 index 000000000..944f4339c --- /dev/null +++ b/externals/vcpkg/ports/libdatachannel/0001-fix-for-vcpkg.patch @@ -0,0 +1,61 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8907872..31d8836 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -28,7 +28,6 @@ endif() + + list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) + set(CMAKE_POSITION_INDEPENDENT_CODE ON) +-set(BUILD_SHARED_LIBS OFF) # to force usrsctp to be built static + + if(WIN32) + add_definitions(-DWIN32_LEAN_AND_MEAN) +@@ -201,12 +200,13 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) + set(THREADS_PREFER_PTHREAD_FLAG TRUE) + find_package(Threads REQUIRED) + +-set(CMAKE_POLICY_DEFAULT_CMP0048 NEW) +-add_subdirectory(deps/plog EXCLUDE_FROM_ALL) ++find_library(USRSCTP_LIBRARY usrsctp REQUIRED) ++find_path(PLOG_INCLUDE_DIRS "plog/Appenders/AndroidAppender.h") + + if(SCTP_DEBUG) + add_definitions(-DSCTP_DEBUG) + endif() ++if(0) + option(sctp_build_programs 0) + option(sctp_build_shared_lib 0) + set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) +@@ -218,8 +218,9 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") + target_compile_options(usrsctp PRIVATE -Wno-error=format-truncation) + endif() + add_library(Usrsctp::Usrsctp ALIAS usrsctp) ++endif() + +-add_library(datachannel SHARED ++add_library(datachannel + ${LIBDATACHANNEL_SOURCES} + ${LIBDATACHANNEL_HEADERS} + ${LIBDATACHANNEL_IMPL_SOURCES} +@@ -243,16 +244,18 @@ target_include_directories(datachannel PUBLIC + $) + target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) + target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) ++target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS}) + target_link_libraries(datachannel PRIVATE Threads::Threads) +-target_link_libraries(datachannel PRIVATE Usrsctp::Usrsctp plog::plog) ++target_link_libraries(datachannel PRIVATE ${USRSCTP_LIBRARY}) + + target_include_directories(datachannel-static PUBLIC + $ + $) + target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) + target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) ++target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS}) + target_link_libraries(datachannel-static PRIVATE Threads::Threads) +-target_link_libraries(datachannel-static PRIVATE Usrsctp::Usrsctp plog::plog) ++target_link_libraries(datachannel-static PRIVATE ${USRSCTP_LIBRARY}) + + if(WIN32) + target_link_libraries(datachannel PUBLIC ws2_32) # winsock2 + diff --git a/externals/vcpkg/ports/libdatachannel/portfile.cmake b/externals/vcpkg/ports/libdatachannel/portfile.cmake new file mode 100755 index 000000000..97eb62118 --- /dev/null +++ b/externals/vcpkg/ports/libdatachannel/portfile.cmake @@ -0,0 +1,50 @@ +set(PATCHES 0001-fix-for-vcpkg.patch) + +if(VCPKG_TARGET_IS_UWP) + list(APPEND PATCHES uwp-warnings.patch) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO paullouisageneau/libdatachannel + REF d9a9a4dcfb7445ed4f305c9aba889a162a4bad30 #v0.17.1 + SHA512 1b53f52e24ee4e01b2bd1d65c7d738e621f168b7718c1fe16e514c34e7bccc3d195c193a7363f31c6b651c7c6757260dce4b197111375800d2f6bdf0d5b06100 + HEAD_REF master + PATCHES + ${PATCHES} +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + stdcall CAPI_STDCALL + INVERTED_FEATURES + ws NO_WEBSOCKET + srtp NO_MEDIA +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DUSE_SYSTEM_SRTP=ON + -DUSE_SYSTEM_JUICE=ON + -DNO_EXAMPLES=ON + -DNO_TESTS=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME LibDataChannel CONFIG_PATH lib/cmake/LibDataChannel) +vcpkg_fixup_pkgconfig() + +file(READ "${CURRENT_PACKAGES_DIR}/share/LibDataChannel/LibDataChannelConfig.cmake" DATACHANNEL_CONFIG) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/LibDataChannel/LibDataChannelConfig.cmake" " +include(CMakeFindDependencyMacro) +find_dependency(Threads) +find_dependency(OpenSSL) +find_dependency(LibJuice) +${DATACHANNEL_CONFIG}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libdatachannel/uwp-warnings.patch b/externals/vcpkg/ports/libdatachannel/uwp-warnings.patch new file mode 100755 index 000000000..023bf888e --- /dev/null +++ b/externals/vcpkg/ports/libdatachannel/uwp-warnings.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b79b458..790bf95 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -385,6 +385,9 @@ if(WARNINGS_AS_ERRORS) + endif() + endif() + ++target_compile_options(datachannel PRIVATE /wd4996) ++target_compile_options(datachannel-static PRIVATE /wd4996) ++ + install(TARGETS datachannel EXPORT LibDataChannelTargets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib diff --git a/externals/vcpkg/ports/libdatachannel/vcpkg.json b/externals/vcpkg/ports/libdatachannel/vcpkg.json new file mode 100755 index 000000000..2cff3e4c5 --- /dev/null +++ b/externals/vcpkg/ports/libdatachannel/vcpkg.json @@ -0,0 +1,38 @@ +{ + "name": "libdatachannel", + "version-semver": "0.17.1", + "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.", + "homepage": "https://github.com/paullouisageneau/libdatachannel", + "license": "LGPL-2.1-only", + "dependencies": [ + "libjuice", + "openssl", + "plog", + "usrsctp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "ws" + ], + "features": { + "srtp": { + "description": "Use Cisco's libSRTP for media transport.", + "dependencies": [ + "libsrtp" + ] + }, + "stdcall": { + "description": "Use stdcall convention in callbacks" + }, + "ws": { + "description": "Web Socket support" + } + } +} diff --git a/externals/vcpkg/ports/libdatrie/CMakeLists.txt b/externals/vcpkg/ports/libdatrie/CMakeLists.txt new file mode 100755 index 000000000..57e7cf58e --- /dev/null +++ b/externals/vcpkg/ports/libdatrie/CMakeLists.txt @@ -0,0 +1,97 @@ +cmake_minimum_required(VERSION 3.22) +project(libdatrie LANGUAGES C) + +option(SKIP_HEADERS "Skip headers" OFF) +option(SKIP_TOOL "Skip tool" OFF) +option(BUILD_SHARED_LIBS "Build shared libs" OFF) + +set(LIB_SRCS + datrie/alpha-map.c + datrie/darray.c + datrie/dstring.c + datrie/fileutils.c + datrie/tail.c + datrie/trie.c + datrie/trie-string.c +) + +set(LIB_HDRS + datrie/alpha-map.h + datrie/trie.h + datrie/triedefs.h + datrie/typedefs.h +) + +if(WIN32) + list(APPEND LIB_SRCS datrie/libdatrie.def) +endif() + +include(CheckIncludeFile) +include(CheckFunctionExists) + +set(STDC_HEADERS 1) +check_include_file(dlfcn.h HAVE_DLFCN_H) +check_include_file(inttypes.h HAVE_INTTYPES_H) +check_include_file(limits.h HAVE_LIMITS_H) +check_include_file(memory.h HAVE_MEMORY_H) +check_include_file(stdint.h HAVE_STDINT_H) +check_include_file(stdio.h HAVE_STDIO_H) +check_include_file(stdlib.h HAVE_STDLIB_H) +check_include_file(strings.h HAVE_STRINGS_H) +check_include_file(string.h HAVE_STRING_H) +check_include_file(sys/stat.h HAVE_SYS_STAT_H) +check_include_file(sys/types.h HAVE_SYS_TYPES_H) +check_include_file(unistd.h HAVE_UNISTD_H) + +check_function_exists(nl_langinfo HAVE_LANGINFO_CODESET) +check_function_exists(locale_charset HAVE_LOCALE_CHARSET) +check_function_exists(malloc HAVE_MALLOC) + +configure_file(config.h.cmake config.h) + +include_directories( + "${CMAKE_CURRENT_SOURCE_DIR}" + "${CMAKE_CURRENT_BINARY_DIR}" +) + +add_library(libdatrie ${LIB_SRCS}) +set_target_properties(libdatrie PROPERTIES OUTPUT_NAME "datrie") + +if(MSVC) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) + add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) +endif() + +if (NOT SKIP_TOOL) + add_executable(trietool "tools/trietool.c" ) + find_package(Iconv REQUIRED) + target_link_libraries(trietool PRIVATE libdatrie Iconv::Iconv) + install( + TARGETS trietool + RUNTIME DESTINATION bin + ) +endif() + +install( + TARGETS libdatrie + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if (NOT SKIP_HEADERS) + install( + FILES ${LIB_HDRS} + DESTINATION "include/datrie" + ) +endif() + +set(prefix "${CMAKE_INSTALL_PREFIX}") +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(includedir "\${prefix}/include") +configure_file(datrie-0.2.pc.in datrie-0.2.pc) +install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/datrie-0.2.pc" + DESTINATION "lib/pkgconfig" +) \ No newline at end of file diff --git a/externals/vcpkg/ports/libdatrie/config.h.cmake b/externals/vcpkg/ports/libdatrie/config.h.cmake new file mode 100755 index 000000000..9d575d6e5 --- /dev/null +++ b/externals/vcpkg/ports/libdatrie/config.h.cmake @@ -0,0 +1,87 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_DLFCN_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_INTTYPES_H + +/* Have nl_langinfo (CODESET) */ +#cmakedefine HAVE_LANGINFO_CODESET + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_LIMITS_H + +/* Have locale_charset() */ +#cmakedefine HAVE_LOCALE_CHARSET + +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and + to 0 otherwise. */ +#cmakedefine HAVE_MALLOC + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_MEMORY_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_STDIO_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_STRING_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_UNISTD_H + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#cmakedefine LT_OBJDIR + +/* Name of package */ +#define PACKAGE "libdatrie" + +/* Define to the address where bug reports for this package should be sent. */ +#cmakedefine PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "libdatrie" + +/* Define to the full name and version of this package. */ +#cmakedefine PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#cmakedefine PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#define PACKAGE_URL "https://linux.thai.net/~thep/datrie/datrie.html" + +/* Define to the version of this package. */ +#cmakedefine PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#cmakedefine STDC_HEADERS 1 + +/* Version number of package */ +#cmakedefine VERSION "@VERSION@" + +/* Define to empty if `const' does not conform to ANSI C. */ +#cmakedefine const + +/* Define to rpl_malloc if the replacement function should be used. */ +#cmakedefine malloc + +/* Define to `unsigned int' if does not define. */ +#cmakedefine size_t diff --git a/externals/vcpkg/ports/libdatrie/fix-exports.patch b/externals/vcpkg/ports/libdatrie/fix-exports.patch new file mode 100755 index 000000000..3c407c21b --- /dev/null +++ b/externals/vcpkg/ports/libdatrie/fix-exports.patch @@ -0,0 +1,8 @@ +diff -Naur ./a/libdatrie.def ./b/libdatrie.def +--- a/datrie/libdatrie.def 2013-10-17 06:27:57.000000000 +0300 ++++ b/datrie/libdatrie.def 2017-12-21 02:42:39.873879000 +0300 +@@ -1,3 +1,4 @@ ++EXPORTS + alpha_map_new + alpha_map_clone + alpha_map_free diff --git a/externals/vcpkg/ports/libdatrie/portfile.cmake b/externals/vcpkg/ports/libdatrie/portfile.cmake new file mode 100755 index 000000000..76e880460 --- /dev/null +++ b/externals/vcpkg/ports/libdatrie/portfile.cmake @@ -0,0 +1,40 @@ +set(LIBDATRIE_VERSION 0.2.13) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tlwg/libdatrie + REF v${LIBDATRIE_VERSION} + SHA512 38f5a3ee1f3ca0f0601a5fcfeec3892cb34857d4b4720b8e018ca1beb6520c4c10af3bd2f0e4d64367cb256e8e2bca4d0a59b1c81fb36782613d2c258b64df59 + HEAD_REF master + PATCHES + fix-exports.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/config.h.cmake" DESTINATION "${SOURCE_PATH}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + tool SKIP_TOOL +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DVERSION=${LIBDATRIE_VERSION} + ${FEATURE_OPTIONS} + OPTIONS_DEBUG + -DSKIP_TOOL=ON + -DSKIP_HEADERS=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +if(NOT SKIP_TOOL) + vcpkg_copy_tools(TOOL_NAMES trietool AUTO_CLEAN) +endif() + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libdatrie/usage b/externals/vcpkg/ports/libdatrie/usage new file mode 100755 index 000000000..e63cedeed --- /dev/null +++ b/externals/vcpkg/ports/libdatrie/usage @@ -0,0 +1,13 @@ +The package libdatrie can be used via CMake: + + find_path(LIBDATRIE_INCLUDE_DIR datrie/trie.h) + find_library(LIBDATRIE_LIBRARY NAMES datrie) + target_include_directories(main PRIVATE "${LIBDATRIE_INCLUDE_DIR}") + target_link_libraries(main PRIVATE "${LIBDATRIE_LIBRARY}") + +The package libdatrie can be imported via CMake FindPkgConfig module: + + find_package(PkgConfig) + pkg_check_modules(LIBDATRIE REQUIRED IMPORTED_TARGET datrie-0.2) + + target_link_libraries(main PRIVATE PkgConfig::LIBDATRIE) diff --git a/externals/vcpkg/ports/libdatrie/vcpkg.json b/externals/vcpkg/ports/libdatrie/vcpkg.json new file mode 100755 index 000000000..e143b035f --- /dev/null +++ b/externals/vcpkg/ports/libdatrie/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "libdatrie", + "version": "0.2.13", + "port-version": 1, + "description": "Implementation of double-array structure for representing trie", + "homepage": "https://linux.thai.net/pub/ThaiLinux/software/libthai", + "license": "LGPL-2.1-or-later", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "tool": { + "description": "Build the trietool application", + "supports": "!uwp", + "dependencies": [ + "libiconv" + ] + } + } +} diff --git a/externals/vcpkg/ports/libdc1394/portfile.cmake b/externals/vcpkg/ports/libdc1394/portfile.cmake new file mode 100755 index 000000000..2cc7f3d33 --- /dev/null +++ b/externals/vcpkg/ports/libdc1394/portfile.cmake @@ -0,0 +1,22 @@ +set(LIBDC1394_VER "2.2.6") + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO libdc1394/libdc1394-2 + REF "${LIBDC1394_VER}" + FILENAME "libdc1394-${LIBDC1394_VER}.tar.gz" + SHA512 2d60ed1054da67d8518e870193b60c1d79778858f48cc6487e252de00cc57a08548515d41914a37d0227d29e158d68892c290f83930ffd95f4a483dce5aa3d25 +) + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS "--disable-examples" +) +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libdc1394/vcpkg.json b/externals/vcpkg/ports/libdc1394/vcpkg.json new file mode 100755 index 000000000..d48cd5a55 --- /dev/null +++ b/externals/vcpkg/ports/libdc1394/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libdc1394", + "version": "2.2.6", + "description": "libdc1394 is a library that provides a complete high level application programming interface (API) for developers who wish to control IEEE 1394 based cameras that conform to the 1394-based Digital Camera Specifications (also known as the IIDC or DCAM Specifications).", + "homepage": "https://damien.douxchamps.net/ieee1394/libdc1394", + "supports": "!windows", + "dependencies": [ + "sdl1" + ] +} diff --git a/externals/vcpkg/ports/libde265/fix-libde265-headers.patch b/externals/vcpkg/ports/libde265/fix-libde265-headers.patch new file mode 100755 index 000000000..fac2e35a8 --- /dev/null +++ b/externals/vcpkg/ports/libde265/fix-libde265-headers.patch @@ -0,0 +1,21 @@ +diff --git a/libde265/CMakeLists.txt b/libde265/CMakeLists.txt +index 749c7fb..45e7419 100644 +--- a/libde265/CMakeLists.txt ++++ b/libde265/CMakeLists.txt +@@ -43,7 +43,7 @@ set (libde265_headers + bitstream.h + cabac.h + configparam.h +- de265-version.h ++ ${CMAKE_CURRENT_BINARY_DIR}/de265-version.h + contextmodel.h + de265.h + deblock.h +@@ -119,7 +119,6 @@ install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config + ) + + install(FILES ${libde265_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/de265-version.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}) + + install(EXPORT ${PROJECT_NAME}Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + diff --git a/externals/vcpkg/ports/libde265/portfile.cmake b/externals/vcpkg/ports/libde265/portfile.cmake new file mode 100755 index 000000000..87418395b --- /dev/null +++ b/externals/vcpkg/ports/libde265/portfile.cmake @@ -0,0 +1,54 @@ +# Used for .pc file +set(VERSION "1.0.8") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO strukturag/libde265 + REF 8aed7472df0af25b811828fa14f2f169dc34d35a # v1.0.8 + SHA512 e2da1436e5b0d8a3841087e879fbbff5a92de4ebb69d097959972ec8c9407305bc2a17020cb46139fbacc84f91ff8cfb4d9547308074ba213e002ee36bb2e006 + HEAD_REF master + PATCHES + fix-libde265-headers.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + sse DISABLE_SSE +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_SDL=ON + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libde265) +vcpkg_copy_tools(TOOL_NAMES dec265 enc265 AUTO_CLEAN) + +set(prefix "") +set(exec_prefix [[${prefix}]]) +set(libdir [[${prefix}/lib]]) +set(includedir [[${prefix}/include]]) +set(LIBS "") +configure_file("${SOURCE_PATH}/libde265.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libde265.pc" @ONLY) +# The produced library name is `liblibde265.a` or `libde265.lib` +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libde265.pc" "-lde265" "-llibde265") +# libde265's pc file assumes libstdc++, which isn't always true. +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libde265.pc" " -lstdc++" "") +if(NOT VCPKG_BUILD_TYPE) + configure_file("${SOURCE_PATH}/libde265.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libde265.pc" @ONLY) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libde265.pc" "-lde265" "-llibde265") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libde265.pc" " -lstdc++" "") +endif() +vcpkg_fixup_pkgconfig() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libde265/de265.h" "!defined(LIBDE265_STATIC_BUILD)" "0") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libde265/de265.h" "!defined(LIBDE265_STATIC_BUILD)" "1") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libde265/vcpkg.json b/externals/vcpkg/ports/libde265/vcpkg.json new file mode 100755 index 000000000..49e6569ee --- /dev/null +++ b/externals/vcpkg/ports/libde265/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "libde265", + "version": "1.0.8", + "port-version": 5, + "description": "Open h.265 video codec implementation.", + "homepage": "https://www.libde265.org/", + "license": "LGPL-3.0-only", + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "sse": { + "description": "Enable SSE optimizations" + } + } +} diff --git a/externals/vcpkg/ports/libdisasm/CMakeLists.txt b/externals/vcpkg/ports/libdisasm/CMakeLists.txt new file mode 100755 index 000000000..4c029bdf3 --- /dev/null +++ b/externals/vcpkg/ports/libdisasm/CMakeLists.txt @@ -0,0 +1,52 @@ +cmake_minimum_required(VERSION 3.9) +project(libdisasm C) + +set(CMAKE_DEBUG_POSTFIX d) + +set(SRCS + libdisasm/ia32_implicit.c + libdisasm/ia32_implicit.h + libdisasm/ia32_insn.c + libdisasm/ia32_insn.h + libdisasm/ia32_invariant.c + libdisasm/ia32_invariant.h + libdisasm/ia32_modrm.c + libdisasm/ia32_modrm.h + libdisasm/ia32_opcode_tables.c + libdisasm/ia32_opcode_tables.h + libdisasm/ia32_operand.c + libdisasm/ia32_operand.h + libdisasm/ia32_reg.c + libdisasm/ia32_reg.h + libdisasm/ia32_settings.c + libdisasm/ia32_settings.h + libdisasm/libdis.h + libdisasm/qword.h + libdisasm/x86_disasm.c + libdisasm/x86_format.c + libdisasm/x86_imm.c + libdisasm/x86_imm.h + libdisasm/x86_insn.c + libdisasm/x86_misc.c + libdisasm/x86_operand_list.c + libdisasm/x86_operand_list.h +) + +include_directories(libdisasm) + +add_library(libdisasm ${SRCS}) + +if (MSVC) + target_compile_definitions(libdisasm PRIVATE _CRT_SECURE_NO_WARNINGS) +endif() + +install( + TARGETS libdisasm + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES libdisasm/libdis.h DESTINATION include) +endif() diff --git a/externals/vcpkg/ports/libdisasm/portfile.cmake b/externals/vcpkg/ports/libdisasm/portfile.cmake new file mode 100755 index 000000000..cb681d8bb --- /dev/null +++ b/externals/vcpkg/ports/libdisasm/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO bastard/libdisasm + REF 0.23 + FILENAME "libdisasm-0.23.tar.gz" + SHA512 29eecfbfd8168188242278a1a38f0c90770d0581a52d4600ae6343829dd0d6607b98329f12a3d7409d43dd56dca6a7d1eb25d58a001c2bfd3eb8474c0e7879e7 + PATCHES sizeofvoid.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_cmake_install() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libdisasm/sizeofvoid.patch b/externals/vcpkg/ports/libdisasm/sizeofvoid.patch new file mode 100755 index 000000000..1e4e008fc --- /dev/null +++ b/externals/vcpkg/ports/libdisasm/sizeofvoid.patch @@ -0,0 +1,27 @@ +--- a/libdisasm/x86_disasm.c ++++ b/libdisasm/x86_disasm.c +@@ -35,7 +35,7 @@ unsigned int x86_disasm( unsigned char *buf, unsigned int buf_len, + + if ( offset >= buf_len ) { + /* another caller screwup ;) */ +- x86_report_error(report_disasm_bounds, (void*)(long)buf_rva+offset); ++ x86_report_error(report_disasm_bounds, (void*)(long)(buf_rva+offset)); + return 0; + } + +@@ -53,13 +53,13 @@ unsigned int x86_disasm( unsigned char *buf, unsigned int buf_len, + + /* check and see if we had an invalid instruction */ + if (! size ) { +- x86_report_error(report_invalid_insn, (void*)(long)buf_rva+offset ); ++ x86_report_error(report_invalid_insn, (void*)(long)(buf_rva+offset)); + return 0; + } + + /* check if we overran the end of the buffer */ + if ( size > len ) { +- x86_report_error( report_insn_bounds, (void*)(long)buf_rva + offset ); ++ x86_report_error( report_insn_bounds, (void*)(long)(buf_rva + offset)); + MAKE_INVALID( insn, bytes ); + return 0; + } diff --git a/externals/vcpkg/ports/libdisasm/vcpkg.json b/externals/vcpkg/ports/libdisasm/vcpkg.json new file mode 100755 index 000000000..ce2926842 --- /dev/null +++ b/externals/vcpkg/ports/libdisasm/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "libdisasm", + "version-string": "0.23", + "port-version": 9, + "description": "x86 Disassembler Library.", + "homepage": "https://sourceforge.net/projects/bastard", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libdivide/portfile.cmake b/externals/vcpkg/ports/libdivide/portfile.cmake new file mode 100755 index 000000000..78f42e5bd --- /dev/null +++ b/externals/vcpkg/ports/libdivide/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ridiculousfish/libdivide + REF 5.0 + SHA512 89581efab63a0668405196d4d8188e03f3b87027e9014ef7238e1d79fe369d8abbca0e44b00cf02b00be29c272feb34c9b9290313596adbef9b46ae0715c29dd + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + test BUILD_TESTS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DLIBDIVIDE_SSE2=OFF + -DLIBDIVIDE_AVX2=OFF + -DLIBDIVIDE_AVX512=OFF + -DLIBDIVIDE_NEON=OFF + -DENABLE_VECTOR_EXTENSIONS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libdivide/vcpkg.json b/externals/vcpkg/ports/libdivide/vcpkg.json new file mode 100755 index 000000000..ff29d9d5d --- /dev/null +++ b/externals/vcpkg/ports/libdivide/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "libdivide", + "version": "5.0", + "description": "libdivide.h is a header-only C/C++ library for optimizing integer division.", + "homepage": "https://github.com/ridiculousfish/libdivide", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "test": { + "description": "Build test" + } + } +} diff --git a/externals/vcpkg/ports/libdjinterop/portfile.cmake b/externals/vcpkg/ports/libdjinterop/portfile.cmake new file mode 100755 index 000000000..9f5981d25 --- /dev/null +++ b/externals/vcpkg/ports/libdjinterop/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xsco/libdjinterop + REF 0.16.0 + SHA512 7653e3752b8d597a967fb5f83f8b14c0db5d9cdb05a9bb22f6d9f34a890327fafdbd81996ce9af09552b69da4b9f7f0b41d631b1704b11e46e335f205c6886bf + HEAD_REF master +) + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/DjInterop) +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libdjinterop/vcpkg.json b/externals/vcpkg/ports/libdjinterop/vcpkg.json new file mode 100755 index 000000000..7ccfa916e --- /dev/null +++ b/externals/vcpkg/ports/libdjinterop/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "libdjinterop", + "version": "0.16.0", + "description": "C++ library for access to DJ record libraries. Currently only supports Denon Engine Prime databases", + "homepage": "https://github.com/xsco/libdjinterop", + "license": "LGPL-3.0-or-later", + "dependencies": [ + "sqlite3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/libdshowcapture/portfile.cmake b/externals/vcpkg/ports/libdshowcapture/portfile.cmake new file mode 100755 index 000000000..79633e0f7 --- /dev/null +++ b/externals/vcpkg/ports/libdshowcapture/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO obsproject/libdshowcapture + REF cba07c63810f51a58f6fb7f2e3b0fb162b5a6313 + SHA512 962f5886f637f06580db9b90d238cdb76976846c5b1d49112910fda0da689788abec1d1703aa4e91ee4be57f328eb8183c04f94119662e1243269ae66f023c84 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_build(TARGET libdshowcapture) + +# Copy files +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libdshowcapture" RENAME copyright) +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libdshowcapture.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libdshowcapture.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +endif() +file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libdshowcapture.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libdshowcapture.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${SOURCE_PATH}/dshowcapture.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/libdshowcapture/vcpkg.json b/externals/vcpkg/ports/libdshowcapture/vcpkg.json new file mode 100755 index 000000000..643b10dc8 --- /dev/null +++ b/externals/vcpkg/ports/libdshowcapture/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "libdshowcapture", + "version": "0.6.0", + "port-version": 3, + "description": "Free and Open Source C++11 Library for capturing DirectShow video/audio devices on windows.", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libe57/0001_cmake.patch b/externals/vcpkg/ports/libe57/0001_cmake.patch new file mode 100755 index 000000000..e4963aeb5 --- /dev/null +++ b/externals/vcpkg/ports/libe57/0001_cmake.patch @@ -0,0 +1,107 @@ +diff -Naur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2012-04-04 13:09:12.000000000 +0800 ++++ b/CMakeLists.txt 2021-06-16 01:14:35.669163100 +0800 +@@ -31,6 +31,8 @@ + set(CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/c_flag_overrides.cmake) + set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_flag_overrides.cmake) + ++set(CMAKE_POSITION_INDEPENDENT_CODE ON) ++ + # Set a private module find path + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") + +@@ -81,17 +83,17 @@ + endif(NOT Boost_FOUND) + + set(Xerces_USE_STATIC_LIBS On) +-find_package(Xerces QUIET) +-if (NOT Xerces_FOUND) ++find_package(XercesC QUIET) ++if (NOT XercesC_FOUND) + set(XERCES_ROOT CACHE PATH "Location of the xerces library") + message(FATAL_ERROR + "Unable to find xerces library. + Please set the the XERCES_ROOT to point to the root of the xerces directory." + ) +-endif (NOT Xerces_FOUND) ++endif (NOT XercesC_FOUND) + +-set(XML_LIBRARIES ${Xerces_LIBRARY}) +-set(XML_INCLUDE_DIRS ${Xerces_INCLUDE_DIR}) ++set(XML_LIBRARIES ${XercesC_LIBRARY}) ++set(XML_INCLUDE_DIRS ${XercesC_INCLUDE_DIR}) + + if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + add_definitions(-DLINUX) +@@ -187,12 +189,18 @@ + add_executable( las2e57 + src/tools/las2e57.cpp + ) ++ ++if (MSVC) ++ set(LAS2E57_EXTRA_LINK bcrypt) ++endif(MSVC) ++ + target_link_libraries( las2e57 + E57RefImpl + LASReader + time_conversion + ${XML_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} ++ ${LAS2E57_EXTRA_LINK} + ) + add_executable( e57fields + src/tools/e57fields.cpp +@@ -270,15 +270,32 @@ + install( + FILES + include/E57Foundation.h ++ include/E57Simple.h ++ include/LASReader.h + DESTINATION include/e57 + ) ++install( ++ FILES ++ include/time_conversion/time_conversion.h ++ include/time_conversion/basictypes.h ++ include/time_conversion/constants.h ++ include/time_conversion/gnss_error.h ++ DESTINATION include/e57/time_conversion ++) + + install( + FILES + CHANGES.TXT + README.TXT + src/refimpl/E57RefImplConfig.cmake +- DESTINATION . ++ DESTINATION share/e57refimpl ++) ++ ++install( ++ FILES ++ README.TXT ++ RENAME copyright ++ DESTINATION share/libe57 + ) + + #include (InstallRequiredSystemLibraries) +--- a/src/refimpl/E57RefImplConfig.cmake 2011-10-06 16:01:00.000000000 +0800 ++++ b/src/refimpl/E57RefImplConfig.cmake 2022-03-01 16:48:29.117485600 +0800 +@@ -49,6 +49,8 @@ + # NOTE: You will also need to include the boost and xerces libraries to your + # project. + ++get_filename_component(E57RefImpl_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE) ++ + IF (NOT "${E57RefImpl_DIR}/include" EQUAL "${E57RefImpl_INCLUDE_DIR}") + SET(E57RefImpl_LIBRARY_DEBUG E57RefImpl_LIBRARY_DEBUG-NOTFOUND) + SET(E57RefImpl_LIBRARY_RELEASE E57RefImpl_LIBRARY_RELEASE-NOTFOUND) +@@ -78,6 +80,6 @@ + NAMES libE57RefImpl-d + E57RefImpl-d +- HINTS ${E57RefImpl_DIR}/lib ++ HINTS ${E57RefImpl_DIR}/debug/lib + DOC "E57 debug library" + ) + diff --git a/externals/vcpkg/ports/libe57/0002_replace_tr1_with_cpp11.patch b/externals/vcpkg/ports/libe57/0002_replace_tr1_with_cpp11.patch new file mode 100755 index 000000000..ff23c340b --- /dev/null +++ b/externals/vcpkg/ports/libe57/0002_replace_tr1_with_cpp11.patch @@ -0,0 +1,95 @@ +diff --color -Naur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2013-04-03 22:24:08.000000000 +0800 ++++ b/CMakeLists.txt 2022-03-01 17:23:01.210728200 +0800 +@@ -36,8 +36,9 @@ + # If you find any errors or have suggestion to improve the build script: + # patches are most welcome! Please send them to the development mailing list. + ++cmake_minimum_required(VERSION 3.1) + +-cmake_minimum_required(VERSION 2.8.2) ++set(CMAKE_CXX_STANDARD 11) + + # Override flags to enable prepare for linking to static runtime + set(CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/c_flag_overrides.cmake) +diff --color -Naur a/src/tools/e57fields.cpp b/src/tools/e57fields.cpp +--- a/src/tools/e57fields.cpp 2012-04-04 17:19:01.000000000 +0800 ++++ b/src/tools/e57fields.cpp 2022-03-01 17:24:17.904911600 +0800 +@@ -30,11 +30,7 @@ + #include + #include + #include +-#if defined(_MSC_VER) +-# include +-#else +-# include +-#endif ++#include + #include "E57Foundation.h" + #include "E57FoundationImpl.h" //??? for exceptions, should be in separate file + +@@ -43,7 +39,6 @@ + + using namespace e57; + using namespace std; +-using namespace std::tr1; + + //!!! prologue, file name, date, version#, total # elements + //!!! doc +@@ -446,9 +441,9 @@ + /// Only one is used, depending on the type of the E57 element. + /// One of these three should be resized to BUFFER_ELEMENT_COUNT. + /// These are smart pointers to avoid the copying (and the moving) when put on the cvElements list. +- shared_ptr > iBuffer; +- shared_ptr > dBuffer; +- shared_ptr > sBuffer; ++ std::shared_ptr > iBuffer; ++ std::shared_ptr > dBuffer; ++ std::shared_ptr > sBuffer; + + /// The precalculated parts of the element path name. + /// The only part that is missing is the record number which goes in between. +diff --color -Naur a/src/tools/e57unpack.cpp b/src/tools/e57unpack.cpp +--- a/src/tools/e57unpack.cpp 2013-04-03 22:24:08.000000000 +0800 ++++ b/src/tools/e57unpack.cpp 2022-03-01 17:25:15.206260200 +0800 +@@ -45,12 +45,8 @@ + #include + using std::runtime_error; + +-#if defined(_MSC_VER) +-# include +-#else +-# include +-#endif +-using std::tr1::shared_ptr; ++#include ++using std::shared_ptr; + + #include + using std::string; +diff --color -Naur a/src/tools/e57validate.cpp b/src/tools/e57validate.cpp +--- a/src/tools/e57validate.cpp 2011-10-06 16:01:00.000000000 +0800 ++++ b/src/tools/e57validate.cpp 2022-03-01 17:25:46.220771800 +0800 +@@ -66,11 +66,7 @@ + + + ================================================================*/ +-#if defined(_MSC_VER) +-# include +-#else +-# include +-using std::tr1::unordered_map; +-#endif ++#include ++using std::unordered_map; + #include + using std::strlen; +@@ -694,7 +691,7 @@ + void dump(int indent = 0, std::ostream& os = std::cout); + //================ + private: +- typedef std::tr1::unordered_map GroupsMap; ++ typedef std::unordered_map GroupsMap; + + bool isDefined_; + bool isByRow_; diff --git a/externals/vcpkg/ports/libe57/0003_fix_osx_support.patch b/externals/vcpkg/ports/libe57/0003_fix_osx_support.patch new file mode 100755 index 000000000..2b1f1da7f --- /dev/null +++ b/externals/vcpkg/ports/libe57/0003_fix_osx_support.patch @@ -0,0 +1,145 @@ +diff -x '.*' -Naur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2021-06-24 16:56:37.000000000 +0800 ++++ b/CMakeLists.txt 2021-06-24 17:30:28.000000000 +0800 +@@ -163,6 +163,13 @@ + include/time_conversion/gnss_error.h + ) + ++# fix dependency introduced by xerces ++if(APPLE) ++ find_library(CORE_FOUNDATION CoreFoundation REQUIRED) ++ find_library(CORE_SERVICES CoreServices REQUIRED) ++ set(EXTRA_LINK_FLAGS_OSX ${CORE_FOUNDATION} ${CORE_SERVICES}) ++endif() ++ + # + # Example programs + # +@@ -174,6 +181,7 @@ + E57RefImpl + ${XML_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} ++ ${EXTRA_LINK_FLAGS_OSX} + ) + add_executable( DemoRead01 + src/examples/DemoRead01.cpp +@@ -182,6 +190,7 @@ + E57RefImpl + ${XML_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} ++ ${EXTRA_LINK_FLAGS_OSX} + ) + + # +@@ -203,6 +212,7 @@ + ${XML_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ${LAS2E57_EXTRA_LINK} ++ ${EXTRA_LINK_FLAGS_OSX} + ) + add_executable( e57fields + src/tools/e57fields.cpp +@@ -211,6 +221,7 @@ + E57RefImpl + ${XML_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} ++ ${EXTRA_LINK_FLAGS_OSX} + ) + add_executable( e57xmldump + src/tools/e57xmldump.cpp +@@ -219,6 +230,7 @@ + E57RefImpl + ${XML_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} ++ ${EXTRA_LINK_FLAGS_OSX} + ) + add_executable( e57validate + src/tools/e57validate.cpp +@@ -227,6 +239,7 @@ + E57RefImpl + ${XML_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} ++ ${EXTRA_LINK_FLAGS_OSX} + ) + add_executable( e57unpack + src/tools/e57unpack.cpp +@@ -236,6 +249,7 @@ + ${XML_LIBRARIES} + ${Boost_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} ++ ${EXTRA_LINK_FLAGS_OSX} + ) + + # +diff -x '.*' -Naur a/src/refimpl/E57FoundationImpl.cpp b/src/refimpl/E57FoundationImpl.cpp +--- a/src/refimpl/E57FoundationImpl.cpp 2012-04-12 21:44:42.000000000 +0800 ++++ b/src/refimpl/E57FoundationImpl.cpp 2021-06-24 17:04:57.000000000 +0800 +@@ -57,6 +57,12 @@ + # include + # define O_BINARY (0) + # define _unlink unlink ++#elif defined( __APPLE__ ) ++# include ++# include ++# include ++# define O_BINARY (0) ++# define _unlink unlink + #else + # error "no supported OS platform defined" + #endif +@@ -4764,6 +4770,8 @@ + # endif + #elif defined(LINUX) + int64_t result = ::lseek64(fd_, offset, whence); ++#elif defined( __APPLE__ ) ++ int64_t result = ::lseek(fd_, offset, whence); + #else + # error "no supported OS platform defined" + #endif +diff -x '.*' -Naur a/src/refimpl/E57Simple.cpp b/src/refimpl/E57Simple.cpp +--- a/src/refimpl/E57Simple.cpp 2011-05-14 05:40:11.000000000 +0800 ++++ b/src/refimpl/E57Simple.cpp 2021-06-24 16:58:24.000000000 +0800 +@@ -799,6 +799,9 @@ + # define __LARGE64_FILES + # include + # include ++#elif defined( __APPLE__ ) ++# include ++# include + #else + # error "no supported OS platform defined" + #endif +diff -x '.*' -Naur a/src/refimpl/E57SimpleImpl.cpp b/src/refimpl/E57SimpleImpl.cpp +--- a/src/refimpl/E57SimpleImpl.cpp 2012-04-12 23:15:46.000000000 +0800 ++++ b/src/refimpl/E57SimpleImpl.cpp 2021-06-24 16:58:24.000000000 +0800 +@@ -74,6 +74,12 @@ + # include + # include + # include ++#elif defined(__APPLE__) ++# include ++# include ++# include ++# include ++# include + #else + # error "no supported OS platform defined" + #endif +diff -x '.*' -Naur a/src/tools/las2e57.cpp b/src/tools/las2e57.cpp +--- a/src/tools/las2e57.cpp 2012-04-04 19:09:11.000000000 +0800 ++++ b/src/tools/las2e57.cpp 2021-06-24 17:11:11.000000000 +0800 +@@ -404,12 +404,12 @@ + int64_t startIndex; + BoundingBox bbox; + +- GroupRecord(int64_t id); ++ GroupRecord(int64_t id = 0); + void addMember(double coords[3], int64_t recordIndex); + void dump(int indent = 0, std::ostream& os = std::cout); + }; + +-GroupRecord::GroupRecord(int64_t id_arg = 0) ++GroupRecord::GroupRecord(int64_t id_arg) + : id(id_arg), + count(0), + startIndex(0), diff --git a/externals/vcpkg/ports/libe57/portfile.cmake b/externals/vcpkg/ports/libe57/portfile.cmake new file mode 100755 index 000000000..afb1b4af4 --- /dev/null +++ b/externals/vcpkg/ports/libe57/portfile.cmake @@ -0,0 +1,33 @@ +set(VERSION 1.1.332) +set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/E57RefImpl_src-${VERSION}") + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO e57-3d-imgfmt + FILENAME "E57RefImpl_src-${VERSION}.zip" + SHA512 86adb88cff32d72905e923b1205d609a2bce2eabd78995c59a7957395b233766a5ce31481db08977117abc1a70bbed90d2ce0cdb9897704a8c63d992e91a3907 + PATCHES + "0001_cmake.patch" + "0002_replace_tr1_with_cpp11.patch" + "0003_fix_osx_support.patch" +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share/libe57") + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES e57fields e57unpack e57validate e57xmldump las2e57 + AUTO_CLEAN +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE "${CURRENT_PACKAGES_DIR}/share/e57refimpl/CHANGES.TXT") +file(REMOVE "${CURRENT_PACKAGES_DIR}/share/e57refimpl/README.TXT") diff --git a/externals/vcpkg/ports/libe57/vcpkg.json b/externals/vcpkg/ports/libe57/vcpkg.json new file mode 100755 index 000000000..03f74169f --- /dev/null +++ b/externals/vcpkg/ports/libe57/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "libe57", + "version-semver": "1.1.332", + "port-version": 2, + "description": "An open source implementation of the ASTM E2807 Standard Specification for 3D Imaging Data Exchange in the C++ language.", + "homepage": "http://www.libe57.org/", + "license": "BSL-1.0", + "dependencies": [ + "boost-crc", + "boost-filesystem", + "boost-format", + "boost-math", + "boost-program-options", + "boost-system", + "boost-thread", + "boost-uuid", + "boost-variant", + { + "name": "icu", + "platform": "linux" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "xerces-c" + ] +} diff --git a/externals/vcpkg/ports/libe57format/portfile.cmake b/externals/vcpkg/ports/libe57format/portfile.cmake new file mode 100755 index 000000000..34ddab5ce --- /dev/null +++ b/externals/vcpkg/ports/libe57format/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO asmaloney/libE57Format + REF v2.2.0 + SHA512 7b788efce2efdbfba83d4e3ab5c4884b3d85b5e44c510954f9200db26fb97c92f4e33d04209c0647fc39c3af081fc09d1ee6a79857b1980a0e1e43586f78bd0c + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/E57Format") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/libe57format RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") \ No newline at end of file diff --git a/externals/vcpkg/ports/libe57format/vcpkg.json b/externals/vcpkg/ports/libe57format/vcpkg.json new file mode 100755 index 000000000..758240454 --- /dev/null +++ b/externals/vcpkg/ports/libe57format/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "libe57format", + "version-string": "2.2.0", + "description": "A library to provide read & write support for the E57 file format.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "xerces-c" + ] +} diff --git a/externals/vcpkg/ports/libebur128/portfile.cmake b/externals/vcpkg/ports/libebur128/portfile.cmake new file mode 100755 index 000000000..c1ea6a9b9 --- /dev/null +++ b/externals/vcpkg/ports/libebur128/portfile.cmake @@ -0,0 +1,20 @@ +if((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND VCPKG_TARGET_IS_WINDOWS) + message(FATAL_ERROR "${PORT} does not support Windows ARM") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jiixyj/libebur128 + REF v1.2.6 + SHA512 ab188c6d32cd14613119258313a8a3fb1167b55501c9f5b6d3ba738d674bc58f24ac3034c23d9730ed8dc3e95a23619bfb81719e4c79807a9a16c1a5b3423582 +) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DENABLE_INTERNAL_QUEUE_H=ON +) +vcpkg_install_cmake() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libebur128/vcpkg.json b/externals/vcpkg/ports/libebur128/vcpkg.json new file mode 100755 index 000000000..57cda28d3 --- /dev/null +++ b/externals/vcpkg/ports/libebur128/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libebur128", + "version-string": "1.2.6", + "description": "A library implementing the EBU R128 audio loudness standard", + "homepage": "https://github.com/jiixyj/libebur128", + "license": "MIT", + "supports": "!(arm & windows)" +} diff --git a/externals/vcpkg/ports/libepoxy/portfile.cmake b/externals/vcpkg/ports/libepoxy/portfile.cmake new file mode 100755 index 000000000..ff72544e2 --- /dev/null +++ b/externals/vcpkg/ports/libepoxy/portfile.cmake @@ -0,0 +1,40 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +endif() + +if(VCPKG_TARGET_IS_LINUX AND NOT EXISTS "/usr/share/doc/libgles2/copyright") + message(STATUS "libgles2-mesa-dev must be installed before libepoxy can build. Install it with \"apt-get install libgles2-mesa-dev\".") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO anholt/libepoxy + REF 1.5.9 + SHA512 2b7c269063dc1c156c1a2a525e27a0a323baaa7fa4ac091536e4cc5fc4c247efe9770d7979dbddb54deb14853008bb6f4d67fddd26d87cbd264eb1e6e65bc5a8 + HEAD_REF master +) + +if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX) + set(OPTIONS -Dglx=no -Degl=no -Dx11=false) +else() + set(OPTIONS -Dglx=yes -Degl=yes -Dx11=true) +endif() +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS -Dc_std=c99) +endif() + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${OPTIONS} + -Dtests=false +) +vcpkg_install_meson() +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/pkgconfig") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libepoxy/vcpkg.json b/externals/vcpkg/ports/libepoxy/vcpkg.json new file mode 100755 index 000000000..a28f32671 --- /dev/null +++ b/externals/vcpkg/ports/libepoxy/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "libepoxy", + "version-semver": "1.5.9", + "port-version": 1, + "description": "Epoxy is a library for handling OpenGL function pointer management for you", + "homepage": "https://github.com/anholt/libepoxy", + "dependencies": [ + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libevent/fix-LibeventConfig_cmake_in_path.patch b/externals/vcpkg/ports/libevent/fix-LibeventConfig_cmake_in_path.patch new file mode 100755 index 000000000..819380bec --- /dev/null +++ b/externals/vcpkg/ports/libevent/fix-LibeventConfig_cmake_in_path.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/LibeventConfig.cmake.in b/cmake/LibeventConfig.cmake.in +index 7b808c3..9376a5a 100644 +--- a/cmake/LibeventConfig.cmake.in ++++ b/cmake/LibeventConfig.cmake.in +@@ -58,7 +58,7 @@ endif() + + # Get the path of the current file. + get_filename_component(LIBEVENT_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +-get_filename_component(_INSTALL_PREFIX "${LIBEVENT_CMAKE_DIR}/../../.." ABSOLUTE) ++get_filename_component(_INSTALL_PREFIX "${LIBEVENT_CMAKE_DIR}/../.." ABSOLUTE) + + macro(message_if_needed _flag _msg) + if (NOT ${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY) +@@ -131,7 +131,7 @@ if(CONFIG_FOR_INSTALL_TREE) + find_library(_event_lib + NAMES "event_${_comp}" + PATHS "${_INSTALL_PREFIX}/lib" +- NO_DEFAULT_PATH) ++ ) + if(_event_lib) + list(APPEND LIBEVENT_LIBRARIES "libevent::${_comp}") + set_case_insensitive_found(${_comp}) diff --git a/externals/vcpkg/ports/libevent/fix-file_path.patch b/externals/vcpkg/ports/libevent/fix-file_path.patch new file mode 100755 index 000000000..fb34080f8 --- /dev/null +++ b/externals/vcpkg/ports/libevent/fix-file_path.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/AddEventLibrary.cmake b/cmake/AddEventLibrary.cmake +index 04f5837..95d9808 100644 +--- a/cmake/AddEventLibrary.cmake ++++ b/cmake/AddEventLibrary.cmake +@@ -42,7 +42,7 @@ macro(export_install_target TYPE LIB_NAME OUTER_INCLUDES) + install(TARGETS "${LIB_NAME}_${TYPE}" + LIBRARY DESTINATION "lib" COMPONENT lib + ARCHIVE DESTINATION "lib" COMPONENT lib +- RUNTIME DESTINATION "lib" COMPONENT lib ++ RUNTIME DESTINATION "bin" COMPONENT bin + COMPONENT dev + ) + else() +@@ -69,7 +69,7 @@ macro(export_install_target TYPE LIB_NAME OUTER_INCLUDES) + EXPORT LibeventTargets-${TYPE} + LIBRARY DESTINATION "lib" COMPONENT lib + ARCHIVE DESTINATION "lib" COMPONENT lib +- RUNTIME DESTINATION "lib" COMPONENT lib ++ RUNTIME DESTINATION "bin" COMPONENT bin + COMPONENT dev + ) + endif() diff --git a/externals/vcpkg/ports/libevent/fix-usage.patch b/externals/vcpkg/ports/libevent/fix-usage.patch new file mode 100755 index 000000000..1609bd1e9 --- /dev/null +++ b/externals/vcpkg/ports/libevent/fix-usage.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 676727f..c83afae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1453,7 +1453,7 @@ endif() + # + + set(EVENT_INSTALL_CMAKE_DIR +- "${CMAKE_INSTALL_PREFIX}/lib/cmake/libevent") ++ "lib/cmake/libevent") + + export(PACKAGE libevent) + diff --git a/externals/vcpkg/ports/libevent/portfile.cmake b/externals/vcpkg/ports/libevent/portfile.cmake new file mode 100755 index 000000000..df80d0a09 --- /dev/null +++ b/externals/vcpkg/ports/libevent/portfile.cmake @@ -0,0 +1,69 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libevent/libevent + REF release-2.1.12-stable + SHA512 5d6c6f0072f69a68b190772d4c973ce8f33961912032cdc104ad0854c0950f9d7e28bc274ca9df23897937f0cd8e45d1f214543d80ec271c5a6678814a7f195e + PATCHES + fix-file_path.patch + fix-LibeventConfig_cmake_in_path.patch + fix-usage.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + openssl EVENT__DISABLE_OPENSSL + thread EVENT__DISABLE_THREAD_SUPPORT +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(LIBEVENT_LIB_TYPE SHARED) +else() + set(LIBEVENT_LIB_TYPE STATIC) +endif() + +if(VCPKG_CRT_LINKAGE STREQUAL "static") + set(LIBEVENT_STATIC_RUNTIME ON) +else() + set(LIBEVENT_STATIC_RUNTIME OFF) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} + -DEVENT__LIBRARY_TYPE=${LIBEVENT_LIB_TYPE} + -DEVENT__MSVC_STATIC_RUNTIME=${LIBEVENT_STATIC_RUNTIME} + -DEVENT__DISABLE_BENCHMARK=ON + -DEVENT__DISABLE_TESTS=ON + -DEVENT__DISABLE_REGRESS=ON + -DEVENT__DISABLE_SAMPLES=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/libevent/") +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/event_rpcgen.py" "${CURRENT_PACKAGES_DIR}/tools/libevent/event_rpcgen.py") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +set(_target_suffix) +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(_target_suffix static) +else() + set(_target_suffix shared) +endif() +vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/libevent/LibeventTargets-${_target_suffix}.cmake + "${CURRENT_PACKAGES_DIR}" + "${CURRENT_INSTALLED_DIR}" +) +vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/libevent/LibeventConfig.cmake "${SOURCE_PATH}/include;${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/include" "") +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +#Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libevent/vcpkg.json b/externals/vcpkg/ports/libevent/vcpkg.json new file mode 100755 index 000000000..41bcecaf1 --- /dev/null +++ b/externals/vcpkg/ports/libevent/vcpkg.json @@ -0,0 +1,38 @@ +{ + "name": "libevent", + "version": "2.1.12", + "port-version": 6, + "description": "An event notification library", + "homepage": "https://github.com/libevent/libevent", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "thread" + ], + "features": { + "openssl": { + "description": "Support for openssl", + "dependencies": [ + { + "name": "libevent", + "features": [ + "thread" + ] + }, + "openssl" + ] + }, + "thread": { + "description": "Support for thread" + } + } +} diff --git a/externals/vcpkg/ports/libevhtp/portfile.cmake b/externals/vcpkg/ports/libevhtp/portfile.cmake new file mode 100755 index 000000000..07d8ee937 --- /dev/null +++ b/externals/vcpkg/ports/libevhtp/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO criticalstack/libevhtp + REF e200bfa85bf253e9cfe1c1a9e705fccb176b9171 + SHA512 d77d6d12dcc2762c8311a04cd3d33c7dfde7b406dbbb544d683e6a3b8e5912ba37a196470bc5aca92b58bd9659fbb396e5a11234b98435534f535046d6dab6eb + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + openssl EVHTP_DISABLE_SSL + thread EVHTP_DISABLE_EVTHR + regex EVHTP_DISABLE_REGEX +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS ${FEATURE_OPTIONS} +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/libevhtp/vcpkg.json b/externals/vcpkg/ports/libevhtp/vcpkg.json new file mode 100755 index 000000000..db641b8fc --- /dev/null +++ b/externals/vcpkg/ports/libevhtp/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "libevhtp", + "version": "1.2.18", + "port-version": 3, + "description": "Libevhtp was created as a replacement API for Libevent's current HTTP API.", + "homepage": "https://github.com/criticalstack/libevhtp", + "supports": "!windows", + "dependencies": [ + "libevent" + ], + "features": { + "openssl": { + "description": "Support SSL for libevhtp", + "dependencies": [ + "openssl" + ] + }, + "regex": { + "description": "Support oniguruma for libevhtp", + "dependencies": [ + "oniguruma" + ] + }, + "thread": { + "description": "Support thread for libevhtp" + } + } +} diff --git a/externals/vcpkg/ports/libexif/CMakeLists.txt b/externals/vcpkg/ports/libexif/CMakeLists.txt new file mode 100755 index 000000000..ac32e82eb --- /dev/null +++ b/externals/vcpkg/ports/libexif/CMakeLists.txt @@ -0,0 +1,142 @@ +cmake_minimum_required(VERSION 3.0) +project(libexif LANGUAGES C) + +set(PACKAGE "libexif") + +option(ENABLE_NLS "Enable NLS" OFF) + +set(HEADERS + libexif/_stdint.h + libexif/exif.h + libexif/exif-byte-order.h + libexif/exif-content.h + libexif/exif-data.h + libexif/exif-data-type.h + libexif/exif-entry.h + libexif/exif-format.h + libexif/exif-ifd.h + libexif/exif-loader.h + libexif/exif-log.h + libexif/exif-mem.h + libexif/exif-mnote-data.h + libexif/exif-mnote-data-priv.h + libexif/exif-system.h + libexif/exif-tag.h + libexif/exif-utils.h +) + +set(SOURCES + libexif/exif-byte-order.c + libexif/exif-content.c + libexif/exif-data.c + libexif/exif-entry.c + libexif/exif-format.c + libexif/exif-ifd.c + libexif/exif-loader.c + libexif/exif-log.c + libexif/exif-mem.c + libexif/exif-mnote-data.c + libexif/exif-tag.c + libexif/exif-utils.c +) + +set(HEADERS_CANON + libexif/canon/exif-mnote-data-canon.h + libexif/canon/mnote-canon-entry.h + libexif/canon/mnote-canon-tag.h +) + +set(SOURCES_CANON + libexif/canon/exif-mnote-data-canon.c + libexif/canon/mnote-canon-entry.c + libexif/canon/mnote-canon-tag.c +) + +set(HEADERS_FUJI + libexif/fuji/exif-mnote-data-fuji.h + libexif/fuji/mnote-fuji-entry.h + libexif/fuji/mnote-fuji-tag.h +) + +set(SOURCES_FUJI + libexif/fuji/exif-mnote-data-fuji.c + libexif/fuji/mnote-fuji-entry.c + libexif/fuji/mnote-fuji-tag.c +) + +set(HEADERS_OLYMPUS + libexif/olympus/exif-mnote-data-olympus.h + libexif/olympus/mnote-olympus-entry.h + libexif/olympus/mnote-olympus-tag.h +) + +set(SOURCES_OLYMPUS + libexif/olympus/exif-mnote-data-olympus.c + libexif/olympus/mnote-olympus-entry.c + libexif/olympus/mnote-olympus-tag.c +) + +set(HEADERS_PENTAX + libexif/pentax/exif-mnote-data-pentax.h + libexif/pentax/mnote-pentax-entry.h + libexif/pentax/mnote-pentax-tag.h +) + +set(SOURCES_PENTAX + libexif/pentax/exif-mnote-data-pentax.c + libexif/pentax/mnote-pentax-entry.c + libexif/pentax/mnote-pentax-tag.c +) + +if(MSVC) + set(SOURCES_MSVC "libexif.def") +endif() + +add_library(libexif + ${SOURCES} + ${SOURCES_CANON} + ${SOURCES_FUJI} + ${SOURCES_OLYMPUS} + ${SOURCES_PENTAX} + ${SOURCES_MSVC} +) + +target_include_directories(libexif PRIVATE .) +target_include_directories(libexif PRIVATE ${CMAKE_BINARY_DIR}) +target_compile_definitions(libexif PRIVATE -D_CRT_SECURE_NO_WARNINGS) +target_compile_definitions(libexif PRIVATE -DGETTEXT_PACKAGE="${PACKAGE}") + +include(CheckFunctionExists) +include(CheckIncludeFile) + +check_function_exists(dcgettext HAVE_DCGETTEXT) +check_function_exists(gettext HAVE_DCGETTEXT) +check_function_exists(iconv HAVE_DCGETTEXT) +check_function_exists(localtime_r HAVE_DCGETTEXT) + +check_include_file(dlfcn.h HAVE_DLFCN_H) +check_include_file(inttypes.h HAVE_INTTYPES_H) +check_include_file(memory.h HAVE_MEMORY_H) +check_include_file(stdint.h HAVE_STDINT_H) +check_include_file(stdlib.h HAVE_STDLIB_H) +check_include_file(strings.h HAVE_STRINGS_H) +check_include_file(string.h HAVE_STRING_H) +check_include_file(sys/stat.h HAVE_SYS_STAT_H) +check_include_file(sys/stat.h HAVE_SYS_STAT_H) +check_include_file(sys/types.h HAVE_SYS_TYPES_H) +check_include_file(unistd.h HAVE_UNISTD_H) + +configure_file(config.h.cmake config.h) + +install( + TARGETS libexif + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) + +install(FILES ${HEADERS} DESTINATION include/libexif) +install(FILES ${HEADERS_CANON} DESTINATION include/libexif/canon) +install(FILES ${HEADERS_FUJI} DESTINATION include/libexif/fuji) +install(FILES ${HEADERS_OLYMPUS} DESTINATION include/libexif/olympus) +install(FILES ${HEADERS_PENTAX} DESTINATION include/libexif/pentax) diff --git a/externals/vcpkg/ports/libexif/add-missing-_stdint-h.patch b/externals/vcpkg/ports/libexif/add-missing-_stdint-h.patch new file mode 100755 index 000000000..1c4c95d1c --- /dev/null +++ b/externals/vcpkg/ports/libexif/add-missing-_stdint-h.patch @@ -0,0 +1,7 @@ +diff --git a/libexif/_stdint.h b/libexif/_stdint.h +new file mode 100644 +index 0000000..9a6118b +--- /dev/null ++++ b/libexif/_stdint.h +@@ -0,0 +1 @@ ++#include diff --git a/externals/vcpkg/ports/libexif/config.h.cmake b/externals/vcpkg/ports/libexif/config.h.cmake new file mode 100755 index 000000000..4dfbdb1b0 --- /dev/null +++ b/externals/vcpkg/ports/libexif/config.h.cmake @@ -0,0 +1,96 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +#cmakedefine ENABLE_NLS + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +#cmakedefine HAVE_DCGETTEXT + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_DLFCN_H + +/* Define if the GNU gettext() function is already present or preinstalled. */ +#cmakedefine HAVE_GETTEXT + +/* Define if you have the iconv() function. */ +#cmakedefine HAVE_ICONV + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_INTTYPES_H + +/* Define to 1 if you have the `localtime_r' function. */ +#cmakedefine HAVE_LOCALTIME_R + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_MEMORY_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_STRING_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_UNISTD_H + +/* Define as const if the declaration of iconv() needs const. */ +#cmakedefine ICONV_CONST + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#cmakedefine LT_OBJDIR + +/* Name of package */ +#cmakedefine PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#cmakedefine PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#cmakedefine PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#cmakedefine PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#cmakedefine PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#cmakedefine PACKAGE_URL + +/* Define to the version of this package. */ +#cmakedefine PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#cmakedefine STDC_HEADERS + +/* Version number of package */ +#cmakedefine VERSION + +/* Define to empty if `const' does not conform to ANSI C. */ +#cmakedefine const + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +#cmakedefine inline +#endif + +#ifdef _MSC_VER +#include +typedef SSIZE_T ssize_t; +#endif \ No newline at end of file diff --git a/externals/vcpkg/ports/libexif/libexif.def b/externals/vcpkg/ports/libexif/libexif.def new file mode 100755 index 000000000..6bd0ca424 --- /dev/null +++ b/externals/vcpkg/ports/libexif/libexif.def @@ -0,0 +1,130 @@ +EXPORTS + exif_array_set_byte_order + exif_byte_order_get_name + exif_content_add_entry + exif_content_dump + exif_content_fix + exif_content_foreach_entry + exif_content_free + exif_content_get_entry + exif_content_get_ifd + exif_content_log + exif_content_new + exif_content_new_mem + exif_content_ref + exif_content_remove_entry + exif_content_unref + exif_data_dump + exif_data_fix + exif_data_foreach_content + exif_data_free + exif_data_get_byte_order + exif_data_get_data_type + exif_data_get_log + exif_data_get_mnote_data + exif_data_load_data + exif_data_log + exif_data_new + exif_data_new_from_data + exif_data_new_from_file + exif_data_new_mem + exif_data_option_get_description + exif_data_option_get_name + exif_data_ref + exif_data_save_data + exif_data_set_byte_order + exif_data_set_data_type + exif_data_set_option + exif_data_unref + exif_data_unset_option + exif_entry_dump + exif_entry_fix + exif_entry_free + exif_entry_get_value + exif_entry_initialize + exif_entry_new + exif_entry_new_mem + exif_entry_ref + exif_entry_unref + exif_format_get_name + exif_format_get_size + exif_get_long + exif_get_rational + exif_get_short + exif_get_slong + exif_get_srational + exif_get_sshort + exif_ifd_get_name + exif_loader_get_buf + exif_loader_get_data + exif_loader_log + exif_loader_new + exif_loader_new_mem + exif_loader_ref + exif_loader_reset + exif_loader_unref + exif_loader_write + exif_loader_write_file + exif_log + exif_log_code_get_message + exif_log_code_get_title + exif_log_free + exif_log_new + exif_log_new_mem + exif_log_ref + exif_log_set_func + exif_log_unref + exif_logv + exif_mem_alloc + exif_mem_free + exif_mem_new + exif_mem_new_default + exif_mem_realloc + exif_mem_ref + exif_mem_unref + exif_mnote_data_canon_new + exif_mnote_data_construct + exif_mnote_data_count + exif_mnote_data_get_description + exif_mnote_data_get_id + exif_mnote_data_get_name + exif_mnote_data_get_title + exif_mnote_data_get_value + exif_mnote_data_load + exif_mnote_data_log + exif_mnote_data_olympus_new + exif_mnote_data_pentax_new + exif_mnote_data_ref + exif_mnote_data_save + exif_mnote_data_set_byte_order + exif_mnote_data_set_offset + exif_mnote_data_unref + exif_set_long + exif_set_rational + exif_set_short + exif_set_slong + exif_set_srational + exif_set_sshort + exif_tag_from_name + exif_tag_get_description + exif_tag_get_description_in_ifd + exif_tag_get_name + exif_tag_get_name_in_ifd + exif_tag_get_support_level_in_ifd + exif_tag_get_title + exif_tag_get_title_in_ifd + exif_tag_table_count + exif_tag_table_get_name + exif_tag_table_get_tag + mnote_canon_entry_get_value + mnote_canon_tag_get_description + mnote_canon_tag_get_name + mnote_canon_tag_get_title + mnote_olympus_entry_get_value + mnote_olympus_tag_get_description + mnote_olympus_tag_get_name + mnote_olympus_tag_get_title + mnote_pentax_entry_get_value + mnote_pentax_tag_get_description + mnote_pentax_tag_get_name + mnote_pentax_tag_get_title \ No newline at end of file diff --git a/externals/vcpkg/ports/libexif/portfile.cmake b/externals/vcpkg/ports/libexif/portfile.cmake new file mode 100755 index 000000000..a3f2abb37 --- /dev/null +++ b/externals/vcpkg/ports/libexif/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libexif/libexif + REF libexif-0_6_22-release + SHA512 6c63abe2734c9e83fb04adb00bdd77f687165007c0efd0279df26c101363b990604050c430c7dd73dfa8735dd2fd196334d321bdb114d4869998f21e7bed5b43 + HEAD_REF master + PATCHES add-missing-_stdint-h.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.cmake DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/libexif.def DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libexif/vcpkg.json b/externals/vcpkg/ports/libexif/vcpkg.json new file mode 100755 index 000000000..01b68491c --- /dev/null +++ b/externals/vcpkg/ports/libexif/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libexif", + "version": "0.6.22", + "port-version": 2, + "description": "a library for parsing, editing, and saving EXIF data", + "homepage": "https://libexif.github.io/", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/libfabric/add_additional_includes.patch b/externals/vcpkg/ports/libfabric/add_additional_includes.patch new file mode 100755 index 000000000..80c49d44d --- /dev/null +++ b/externals/vcpkg/ports/libfabric/add_additional_includes.patch @@ -0,0 +1,58 @@ +diff --git a/libfabric.vcxproj b/libfabric.vcxproj +index c1e1792..3acbc81 100644 +--- a/libfabric.vcxproj ++++ b/libfabric.vcxproj +@@ -187,7 +187,7 @@ + Disabled + WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;ENABLE_DEBUG;%(PreprocessorDefinitions) + true +- $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include; ++ $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;$(AdditionalIncludeDirectories); + CompileAsC + 4127;4200;4204;4221;4115;4201;4100 + true +@@ -215,7 +215,7 @@ + Disabled + WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;ENABLE_DEBUG;%(PreprocessorDefinitions) + true +- $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include ++ $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;$(AdditionalIncludeDirectories); + CompileAsC + 4127;4200;94;4204;4221;869 + true +@@ -239,7 +239,7 @@ + true + WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true +- $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include ++ $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;$(AdditionalIncludeDirectories); + 4127;4200;4204;4221;4115;4201;4100 + true + false +@@ -265,7 +265,7 @@ + true + WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true +- $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include; ++ $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;$(AdditionalIncludeDirectories); + 4127;4200;4204;4221;4115;4201;4100 + true + false +@@ -285,7 +285,7 @@ + true + true + WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions) +- $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include; ++ $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;$(AdditionalIncludeDirectories); + 4127;4200;4204;4221;4115;4201;4100 + true + true +@@ -307,7 +307,7 @@ + true + WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true +- $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include; ++ $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;$(AdditionalIncludeDirectories); + 4127;4200;94;4204;4221;869 + true + false diff --git a/externals/vcpkg/ports/libfabric/portfile.cmake b/externals/vcpkg/ports/libfabric/portfile.cmake new file mode 100755 index 000000000..03b2ec3fa --- /dev/null +++ b/externals/vcpkg/ports/libfabric/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ofiwg/libfabric + REF bcb41c462e1e38559c94096ac06e2f578b466882 # v1.13.2 + HEAD_REF master + SHA512 b3ea464a402aa5b470ba5478350e23682488f785a3b2cb34df02f23d1663f097285f6795ab287db40b2a544c8e3969358a23165664e1fc39542038d726212e6c + PATCHES + add_additional_includes.patch +) + +set(LIBFABRIC_RELEASE_CONFIGURATION "Release-v142") +set(LIBFABRIC_DEBUG_CONFIGURATION "Debug-v142") + +vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH libfabric.vcxproj + INCLUDES_SUBPATH include + LICENSE_SUBPATH COPYING + PLATFORM "x64" + RELEASE_CONFIGURATION ${LIBFABRIC_RELEASE_CONFIGURATION} + DEBUG_CONFIGURATION ${LIBFABRIC_RELEASE_CONFIGURATION} + USE_VCPKG_INTEGRATION + ALLOW_ROOT_INCLUDES + OPTIONS + /p:SolutionDir=${SOURCE_PATH} + /p:AdditionalIncludeDirectories="${CURRENT_INSTALLED_DIR}/include" +) + +#Move includes under subdirectory to avoid colisions with other libraries +file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/includetemp") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") +file(RENAME "${CURRENT_PACKAGES_DIR}/includetemp" "${CURRENT_PACKAGES_DIR}/include/libfabric") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libfabric/vcpkg.json b/externals/vcpkg/ports/libfabric/vcpkg.json new file mode 100755 index 000000000..547c77e3c --- /dev/null +++ b/externals/vcpkg/ports/libfabric/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libfabric", + "version-semver": "1.13.2", + "port-version": 1, + "description": "The OpenFabrics Interfaces Working Group (OFIWG) and the Libfabric open-source community are pleased to announce the release of version v1.6.2 of libfabric. See NEWS.md for the list of features and enhancements that have been added since the last release.", + "homepage": "https://github.com/ofiwg/libfabric", + "supports": "windows & !uwp & x64 & !static", + "dependencies": [ + { + "name": "networkdirect-sdk", + "platform": "windows" + } + ] +} diff --git a/externals/vcpkg/ports/libffi/CMakeLists.txt b/externals/vcpkg/ports/libffi/CMakeLists.txt new file mode 100755 index 000000000..f69edfc89 --- /dev/null +++ b/externals/vcpkg/ports/libffi/CMakeLists.txt @@ -0,0 +1,229 @@ +cmake_minimum_required(VERSION 3.9) +project(libffi C ASM) + +set(CMAKE_SHARED_LIBRARY_PREFIX) +set(CMAKE_STATIC_LIBRARY_PREFIX) + +if(NOT CMAKE_SYSTEM_PROCESSOR) + set(CMAKE_SYSTEM_PROCESSOR "${CMAKE_HOST_SYSTEM_PROCESSOR}") +endif() + +# config variables for ffi.h.in +set(VERSION 3.4.2) + +set(KNOWN_PROCESSORS x86 x86_64 amd64 arm arm64 i386 i686 armv7l armv7-a aarch64) + +string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" lower_system_processor) + +if(NOT lower_system_processor IN_LIST KNOWN_PROCESSORS) + message(FATAL_ERROR "Unknown processor: ${CMAKE_SYSTEM_PROCESSOR}") +endif() + +if(CMAKE_SYSTEM_NAME MATCHES "Windows" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(TARGET ARM_WIN32) +elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(TARGET ARM_WIN64) +elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(TARGET X86_WIN32) +elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(TARGET X86_WIN64) +elseif(lower_system_processor MATCHES "arm64|aarch64") + set(TARGET ARM64) +elseif(lower_system_processor MATCHES "arm") + set(TARGET ARM) +elseif(CMAKE_SYSTEM_NAME MATCHES "BSD" AND CMAKE_SIZEOF_VOID_P EQUAL 4) + set(TARGET X86_FREEBSD) +elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin" AND CMAKE_SIZEOF_VOID_P EQUAL 4) + set(TARGET X86_DARWIN) +elseif(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(TARGET X86_64) +elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) + set(TARGET X86) +else() + message(FATAL_ERROR "Cannot determine target. Please consult ${CMAKE_CURRENT_SOURCE_DIR}/configure.ac and add your platform to this CMake file.") +endif() + +if("${TARGET}" STREQUAL "X86_64") + set(HAVE_LONG_DOUBLE 1) +else() + set(HAVE_LONG_DOUBLE 0) +endif() +set(FFI_EXEC_TRAMPOLINE_TABLE 0) + +# mimic layout of original buildsystem +configure_file(include/ffi.h.in ${CMAKE_BINARY_DIR}/include/ffi.h) +file(COPY ${FFI_CONFIG_FILE} DESTINATION ${CMAKE_BINARY_DIR}) + +if ("${TARGET}" STREQUAL "ARM_WIN64" OR "${TARGET}" STREQUAL "ARM64") + file(COPY src/aarch64/ffitarget.h DESTINATION ${CMAKE_BINARY_DIR}/include) +elseif ("${TARGET}" STREQUAL "ARM_WIN32" OR "${TARGET}" STREQUAL "ARM") + file(COPY src/arm/ffitarget.h DESTINATION ${CMAKE_BINARY_DIR}/include) +else() + file(COPY src/x86/ffitarget.h DESTINATION ${CMAKE_BINARY_DIR}/include) +endif() + +include_directories(${CMAKE_BINARY_DIR}/include) +include_directories(${CMAKE_BINARY_DIR}) +include_directories(include) + +add_definitions(-DFFI_BUILDING) +if(BUILD_SHARED_LIBS AND WIN32) + add_definitions(-DFFI_BUILDING_DLL) +endif() + +set(FFI_SOURCES + src/closures.c + src/prep_cif.c + src/types.c + src/tramp.c) + +if ("${TARGET}" STREQUAL "ARM_WIN64" OR "${TARGET}" STREQUAL "ARM64") + set(FFI_SOURCES + ${FFI_SOURCES} + src/aarch64/ffi.c) +elseif("${TARGET}" STREQUAL "ARM_WIN32" OR "${TARGET}" STREQUAL "ARM") + set(FFI_SOURCES + ${FFI_SOURCES} + src/arm/ffi.c) +else() + set(FFI_SOURCES + ${FFI_SOURCES} + src/java_raw_api.c + src/raw_api.c) + if("${TARGET}" STREQUAL "X86_WIN32" OR "${TARGET}" STREQUAL "X86_DARWIN" OR "${TARGET}" STREQUAL "X86") + set(FFI_SOURCES + ${FFI_SOURCES} + src/x86/ffi.c) + elseif("${TARGET}" STREQUAL "X86_WIN64") + set(FFI_SOURCES + ${FFI_SOURCES} + src/x86/ffiw64.c) + elseif("${TARGET}" STREQUAL "X86_64") + set(FFI_SOURCES + ${FFI_SOURCES} + src/x86/ffi64.c + src/x86/ffiw64.c) + endif() +endif() + +macro(add_assembly ASMFILE) + get_filename_component(ASMFILE_FULL "${ASMFILE}" ABSOLUTE) + if(MSVC) + if ("${TARGET}" STREQUAL "ARM_WIN64") + set(ARCH_ASSEMBLER armasm64) + elseif ("${TARGET}" STREQUAL "ARM_WIN32") + set(ARCH_ASSEMBLER armasm) + elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) + set(ARCH_ASSEMBLER ml /safeseh /c /Zi) + else() + set(ARCH_ASSEMBLER ml64 /c /Zi) + endif() + + get_filename_component(ARCH_ASM_NAME "${ASMFILE_FULL}" NAME_WE) + + execute_process( + COMMAND ${CMAKE_C_COMPILER} /nologo /EP /I. /Iinclude /I${CMAKE_CURRENT_SOURCE_DIR}/include "${ASMFILE_FULL}" + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + OUTPUT_FILE ${ARCH_ASM_NAME}.asm + RESULT_VARIABLE retcode + ) + + if(NOT ${retcode} STREQUAL "0") + message(FATAL_ERROR "Unable to assemble, exit code: '${retcode}'.") + endif() + + # Produced *.asm file could be just added to sources. + # It works in x64 mode, but for some strange reason MASM returns error code when in x86, + # (even though it didn't report any errors and correctly generated object file) + # which in turn causes MSBUILD to stop. + execute_process( + COMMAND ${ARCH_ASSEMBLER} ${ARCH_ASM_NAME}.asm + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + RESULT_VARIABLE retcode + ) + + if(NOT ${retcode} STREQUAL "0") + message(FATAL_ERROR "Unable to compile assembly, exit code: '${retcode}'.") + endif() + + list(APPEND FFI_SOURCES ${CMAKE_BINARY_DIR}/${ARCH_ASM_NAME}.obj) + else() + list(APPEND FFI_SOURCES ${ASMFILE}) + endif() +endmacro() + +if("${TARGET}" STREQUAL "X86") + set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -m32") +endif() + +if("${TARGET}" STREQUAL "X86" OR "${TARGET}" STREQUAL "X86_DARWIN") + add_assembly(src/x86/sysv.S) +elseif("${TARGET}" STREQUAL "X86_64") + add_assembly(src/x86/unix64.S) + add_assembly(src/x86/win64.S) +elseif("${TARGET}" STREQUAL "X86_WIN32") + if(MSVC) + add_assembly(src/x86/sysv_intel.S) + else() + add_assembly(src/x86/sysv.S) + endif() +elseif("${TARGET}" STREQUAL "X86_WIN64") + if(MSVC) + add_assembly(src/x86/win64_intel.S) + else() + add_assembly(src/x86/win64.S) + endif() +elseif("${TARGET}" STREQUAL "ARM_WIN32") + if(MSVC) + add_assembly(src/arm/sysv_msvc_arm32.S) + else() + add_assembly(src/arm/sysv.S) + endif() +elseif("${TARGET}" STREQUAL "ARM") + add_assembly(src/arm/sysv.S) +elseif("${TARGET}" STREQUAL "ARM_WIN64") + if(MSVC) + add_assembly(src/aarch64/win64_armasm.S) + else() + add_assembly(src/aarch64/sysv.S) + endif() +elseif("${TARGET}" STREQUAL "ARM64") + add_assembly(src/aarch64/sysv.S) +else() + message(FATAL_ERROR "Target not implemented") +endif() + +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + list(APPEND FFI_SOURCES src/debug.c) + add_definitions(-DFFI_DEBUG) +endif() + +add_library(libffi ${FFI_SOURCES}) + +install(TARGETS libffi + EXPORT ${PROJECT_NAME}Targets + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib) + +include(CMakePackageConfigHelpers) + +configure_package_config_file(${PROJECT_NAME}Config.cmake.in + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" + INSTALL_DESTINATION share/${PROJECT_NAME}) +write_basic_package_version_file( + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake + VERSION ${VERSION} + COMPATIBILITY AnyNewerVersion) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" + DESTINATION share/${PROJECT_NAME}) +install(EXPORT ${PROJECT_NAME}Targets + DESTINATION share/${PROJECT_NAME}) + +if(NOT FFI_SKIP_HEADERS) + install(FILES + ${CMAKE_BINARY_DIR}/include/ffi.h + ${CMAKE_BINARY_DIR}/include/ffitarget.h + DESTINATION include) +endif() diff --git a/externals/vcpkg/ports/libffi/fficonfig.h b/externals/vcpkg/ports/libffi/fficonfig.h new file mode 100755 index 000000000..fc00af94a --- /dev/null +++ b/externals/vcpkg/ports/libffi/fficonfig.h @@ -0,0 +1,65 @@ +#ifdef __linux__ +#define EH_FRAME_FLAGS "a" +#endif +#define HAVE_ALLOCA 1 +#ifndef _WIN64 +#define HAVE_AS_ASCII_PSEUDO_OP 1 +#endif +#ifndef _WIN64 +#define HAVE_AS_STRING_PSEUDO_OP 1 +#endif +#ifndef _WIN64 +#define HAVE_AS_X86_PCREL 1 +#endif +#ifdef __linux__ +#define HAVE_HIDDEN_VISIBILITY_ATTRIBUTE 1 +#endif +#define HAVE_INTTYPES_H 1 +#define HAVE_MEMORY_H 1 +#define HAVE_STDINT_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STRING_H 1 +#define HAVE_SYS_STAT_H 1 +#define HAVE_SYS_TYPES_H 1 +#define LT_OBJDIR ".libs/" +#define PACKAGE "libffi" +#define PACKAGE_BUGREPORT "http://github.com/libffi/libffi/issues" +#define PACKAGE_NAME "libffi" +#define PACKAGE_STRING "libffi 3.4.2" +#define PACKAGE_TARNAME "libffi" +#define PACKAGE_URL "" +#define PACKAGE_VERSION "3.4.2" +#define SIZEOF_DOUBLE 8 +#define SIZEOF_LONG_DOUBLE 8 +#ifndef _WIN64 +#define SIZEOF_SIZE_T 4 +#else +#define SIZEOF_SIZE_T 8 +#endif +#define STDC_HEADERS 1 +#ifndef __linux__ +#ifndef _WIN64 +#define SYMBOL_UNDERSCORE 1 +#endif +#endif +#define VERSION "3.4.2" +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#endif + +#ifdef HAVE_HIDDEN_VISIBILITY_ATTRIBUTE +#ifdef LIBFFI_ASM +#define FFI_HIDDEN(name) .hidden name +#else +#define FFI_HIDDEN __attribute__ ((visibility ("hidden"))) +#endif +#else +#ifdef LIBFFI_ASM +#define FFI_HIDDEN(name) +#else +#define FFI_HIDDEN +#endif +#endif + diff --git a/externals/vcpkg/ports/libffi/libffiConfig.cmake.in b/externals/vcpkg/ports/libffi/libffiConfig.cmake.in new file mode 100755 index 000000000..ebdf1488a --- /dev/null +++ b/externals/vcpkg/ports/libffi/libffiConfig.cmake.in @@ -0,0 +1,7 @@ +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) + +if(NOT TARGET libffi) + include("${CMAKE_CURRENT_LIST_DIR}/libffiTargets.cmake") +endif() diff --git a/externals/vcpkg/ports/libffi/portfile.cmake b/externals/vcpkg/ports/libffi/portfile.cmake new file mode 100755 index 000000000..81bce85ba --- /dev/null +++ b/externals/vcpkg/ports/libffi/portfile.cmake @@ -0,0 +1,68 @@ +set(VERSION 3.4.2) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libffi/libffi + REF "v${VERSION}" + SHA512 d399319efcca375fe901b05722e25eca31d11a4261c6a5d5079480bbc552d4e4b42de2026912689d3b2f886ebb3c8bebbea47102e38a2f6acbc526b8d5bba388 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/libffiConfig.cmake.in" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DFFI_CONFIG_FILE=${CMAKE_CURRENT_LIST_DIR}/fficonfig.h" + OPTIONS_DEBUG + -DFFI_SKIP_HEADERS=ON +) + +vcpkg_cmake_install() + +# Create pkgconfig file +set(PACKAGE_VERSION ${VERSION}) +set(prefix "${CURRENT_INSTALLED_DIR}") +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(toolexeclibdir "\${libdir}") +set(includedir "\${prefix}/include") +configure_file("${SOURCE_PATH}/libffi.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc" @ONLY) + +# debug +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(prefix "${CURRENT_INSTALLED_DIR}/debug") + set(exec_prefix "\${prefix}") + set(libdir "\${prefix}/lib") + set(toolexeclibdir "\${libdir}") + set(includedir "\${prefix}/../include") + configure_file("${SOURCE_PATH}/libffi.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libffi.pc" @ONLY) +endif() + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup() + +if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc" + "-lffi" "-llibffi") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libffi.pc" + "-lffi" "-llibffi") + endif() +endif() +vcpkg_fixup_pkgconfig() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ffi.h" + " *know* they are going to link with the static library. */" + " *know* they are going to link with the static library. */ + +#define FFI_BUILDING +" + ) +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libffi/vcpkg.json b/externals/vcpkg/ports/libffi/vcpkg.json new file mode 100755 index 000000000..bebdbc62e --- /dev/null +++ b/externals/vcpkg/ports/libffi/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libffi", + "version": "3.4.2", + "port-version": 5, + "description": "Portable, high level programming interface to various calling conventions", + "homepage": "https://github.com/libffi/libffi", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libfido2/fix_cmakelists.patch b/externals/vcpkg/ports/libfido2/fix_cmakelists.patch new file mode 100755 index 000000000..23bbf6a8f --- /dev/null +++ b/externals/vcpkg/ports/libfido2/fix_cmakelists.patch @@ -0,0 +1,47 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 11a51ac..33b9313 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -156,18 +156,20 @@ if(UNIX) + endif() + + if(MSVC) +- if((NOT CBOR_INCLUDE_DIRS) OR (NOT CBOR_LIBRARY_DIRS) OR +- (NOT CBOR_BIN_DIRS) OR (NOT CRYPTO_INCLUDE_DIRS) OR +- (NOT CRYPTO_LIBRARY_DIRS) OR (NOT CRYPTO_BIN_DIRS) OR +- (NOT ZLIB_INCLUDE_DIRS) OR (NOT ZLIB_LIBRARY_DIRS) OR +- (NOT ZLIB_BIN_DIRS)) +- message(FATAL_ERROR "please define " +- "{CBOR,CRYPTO,ZLIB}_{INCLUDE,LIBRARY,BIN}_DIRS when " +- "building under msvc") +- endif() +- set(CBOR_LIBRARIES cbor) +- set(ZLIB_LIBRARIES zlib) +- set(CRYPTO_LIBRARIES crypto-47) ++ find_package(PkgConfig) ++ ++ find_package(LIBCBOR REQUIRED) ++ find_package(OpenSSL REQUIRED) ++ find_package(ZLIB REQUIRED) ++ ++ # Handling of different Packagenames in VCPKG ++ set(CBOR_INCLUDE_DIRS ${LIBCBOR_INCLUDE_DIR}) ++ set(CRYPTO_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIRS}) ++ set(CBOR_LIBRARY_DIRS ${LIBCBOR_LIBRARY_DIRS}) ++ set(CRYPTO_LIBRARY_DIRS ${OPENSSL_LIBRARY_DIRS}) ++ set(CBOR_LIBRARIES ${LIBCBOR_LIBRARIES}) ++ set(CRYPTO_LIBRARIES ${OPENSSL_LIBRARIES}) ++ add_definitions("-D_CRT_SECURE_NO_WARNINGS" "-D_CRT_NONSTDC_NO_DEPRECATE") + set(MSVC_DISABLED_WARNINGS_LIST + "C4152" # nonstandard extension used: function/data pointer + # conversion in expression; +@@ -403,6 +402,9 @@ message(STATUS "USE_HIDAPI: ${USE_HIDAPI}") + message(STATUS "USE_WINHELLO: ${USE_WINHELLO}") + message(STATUS "NFC_LINUX: ${NFC_LINUX}") + ++set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996") ++set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996") ++ + subdirs(src) + if(BUILD_EXAMPLES) + subdirs(examples) diff --git a/externals/vcpkg/ports/libfido2/portfile.cmake b/externals/vcpkg/ports/libfido2/portfile.cmake new file mode 100755 index 000000000..dcd620840 --- /dev/null +++ b/externals/vcpkg/ports/libfido2/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Yubico/libfido2 + REF 1.10.0 + SHA512 ba03e25d3f42f11cec74dee48c853ae35d03600f24ca06d2b751840408a132290fe22461372ae42ae31419061a63d9908c20a2c0cf3c0c9c8dbc46c34916784f + HEAD_REF master + PATCHES + "fix_cmakelists.patch" +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LIBFIDO2_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBFIDO2_BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_MANPAGES=OFF + -DBUILD_STATIC_LIBS=${LIBFIDO2_BUILD_STATIC} + -DBUILD_SHARED_LIBS=${LIBFIDO2_BUILD_SHARED} + -DBUILD_TOOLS=OFF + ) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/libfido2/vcpkg.json b/externals/vcpkg/ports/libfido2/vcpkg.json new file mode 100755 index 000000000..a470ecdd5 --- /dev/null +++ b/externals/vcpkg/ports/libfido2/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libfido2", + "version": "1.10.0", + "port-version": 1, + "description": "Provides library functionality to communicate with a FIDO device over USB, and to verify attestation and assertion signatures.", + "homepage": "https://developers.yubico.com/libfido2/", + "license": "BSD-2-Clause", + "supports": "!uwp & (x86 | x64) & windows", + "dependencies": [ + "libcbor", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/libflac/fix-compile-options.patch b/externals/vcpkg/ports/libflac/fix-compile-options.patch new file mode 100755 index 000000000..9d438da0e --- /dev/null +++ b/externals/vcpkg/ports/libflac/fix-compile-options.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c83dd83..2d1a7e6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -82,9 +82,11 @@ if(HAVE_WERROR_FLAG) + option(ENABLE_WERROR "Enable -Werror in all Makefiles" OFF) + endif() + ++if(MSVC AND NOT WITH_ASM) ++ add_compile_options(/wd4267 /wd4996) ++endif() ++ + add_compile_options( +- $<$:/wd4267> +- $<$:/wd4996> + $<$:-Werror> + $<$,$>:-Weffc++> + $<$,$>:-Wdeclaration-after-statement>) diff --git a/externals/vcpkg/ports/libflac/portfile.cmake b/externals/vcpkg/ports/libflac/portfile.cmake new file mode 100755 index 000000000..9af82a6d3 --- /dev/null +++ b/externals/vcpkg/ports/libflac/portfile.cmake @@ -0,0 +1,86 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xiph/flac + REF 1151c93e992bb8c7c6394e04aa880d711c531c7f #1.3.4 + SHA512 ebf8de3dbd8fc2153af2f4a05ecc04817570233c30e0ec1fbdbc99f810860801b951248ca6404152cba4038f5839985f4076bcee477c00fd23bd583a45b89b17 + HEAD_REF master + PATCHES + uwp-library-console.patch + uwp-createfile2.patch + fix-compile-options.patch +) + +if(VCPKG_TARGET_IS_MINGW) + set(WITH_STACK_PROTECTOR OFF) + string(APPEND VCPKG_C_FLAGS " -D_FORTIFY_SOURCE=0") + string(APPEND VCPKG_CXX_FLAGS " -D_FORTIFY_SOURCE=0") +else() + set(WITH_STACK_PROTECTOR ON) +endif() + +if("asm" IN_LIST FEATURES) + if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL x86) + message(FATAL_ERROR "Feature asm only supports x86 architecture.") + endif() + + VCPKG_FIND_ACQUIRE_PROGRAM(NASM) + GET_FILENAME_COMPONENT(NASM_PATH ${NASM} DIRECTORY) + vcpkg_add_to_path("${NASM_PATH}") +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + asm WITH_ASM +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} + -DBUILD_PROGRAMS=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_DOCS=OFF + -DBUILD_TESTING=OFF + -DWITH_STACK_PROTECTOR=${WITH_STACK_PROTECTOR}) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME FLAC CONFIG_PATH share/FLAC/cmake) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/FLAC/export.h" + "#if defined(FLAC__NO_DLL)" + "#if 0" + ) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/FLAC++/export.h" + "#if defined(FLAC__NO_DLL)" + "#if 0" + ) +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/FLAC/export.h" + "#if defined(FLAC__NO_DLL)" + "#if 1" + ) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/FLAC++/export.h" + "#if defined(FLAC__NO_DLL)" + "#if 1" + ) +endif() + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/flac.pc" " -lm" "") + + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/flac.pc") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/flac.pc" " -lm" "") + endif() +endif() + +vcpkg_fixup_pkgconfig() + +# This license (BSD) is relevant only for library - if someone would want to install +# FLAC cmd line tools as well additional license (GPL) should be included +file(INSTALL "${SOURCE_PATH}/COPYING.Xiph" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libflac/uwp-createfile2.patch b/externals/vcpkg/ports/libflac/uwp-createfile2.patch new file mode 100755 index 000000000..0b86e9a7f --- /dev/null +++ b/externals/vcpkg/ports/libflac/uwp-createfile2.patch @@ -0,0 +1,40 @@ +diff --git a/src/share/win_utf8_io/win_utf8_io.c b/src/share/win_utf8_io/win_utf8_io.c +index 8b20bbb7..058295fa 100644 +--- a/src/share/win_utf8_io/win_utf8_io.c ++++ b/src/share/win_utf8_io/win_utf8_io.c +@@ -156,6 +156,27 @@ int get_utf8_argv(int *argc, char ***argv) + /* similar to CreateFileW but accepts UTF-8 encoded lpFileName */ + HANDLE WINAPI CreateFile_utf8(const char *lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile) + { ++#if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) ++ HANDLE handle = INVALID_HANDLE_VALUE; ++ ++ if (!flac_internal_get_utf8_filenames()) ++ return handle; ++ ++ wchar_t *wname; ++ ++ if ((wname = wchar_from_utf8(lpFileName)) != NULL) ++ { ++ CREATEFILE2_EXTENDED_PARAMETERS cfParams = {0}; ++ cfParams.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS); ++ cfParams.dwFileAttributes = dwFlagsAndAttributes & FILE_ATTRIBUTE_NORMAL; ++ cfParams.lpSecurityAttributes = lpSecurityAttributes; ++ cfParams.hTemplateFile = hTemplateFile; ++ handle = CreateFile2(wname, dwDesiredAccess, dwShareMode, dwCreationDisposition, &cfParams); ++ free(wname); ++ } ++ ++ return handle; ++#else + if (!flac_internal_get_utf8_filenames()) { + return CreateFileA(lpFileName, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwCreationDisposition, dwFlagsAndAttributes, hTemplateFile); + } else { +@@ -169,6 +190,7 @@ HANDLE WINAPI CreateFile_utf8(const char *lpFileName, DWORD dwDesiredAccess, DWO + + return handle; + } ++#endif + } + + /* return number of characters in the UTF-8 string */ diff --git a/externals/vcpkg/ports/libflac/uwp-library-console.patch b/externals/vcpkg/ports/libflac/uwp-library-console.patch new file mode 100755 index 000000000..234758c75 --- /dev/null +++ b/externals/vcpkg/ports/libflac/uwp-library-console.patch @@ -0,0 +1,53 @@ +diff --git a/src/share/win_utf8_io/win_utf8_io.c b/src/share/win_utf8_io/win_utf8_io.c +index bbb6a74a..8b20bbb7 100644 +--- a/src/share/win_utf8_io/win_utf8_io.c ++++ b/src/share/win_utf8_io/win_utf8_io.c +@@ -110,7 +110,11 @@ int get_utf8_argv(int *argc, char ***argv) + char **utf8argv; + int ret, i; + ++#if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) ++ if ((handle = LoadPackagedLibrary("msvcrt.dll", 0)) == NULL) return 1; ++#else + if ((handle = LoadLibraryW(L"msvcrt.dll")) == NULL) return 1; ++#endif + if ((wgetmainargs = (wgetmainargs_t)GetProcAddress(handle, "__wgetmainargs")) == NULL) { + FreeLibrary(handle); + return 1; +@@ -181,6 +185,9 @@ size_t strlen_utf8(const char *str) + /* get the console width in characters */ + int win_get_console_width(void) + { ++#if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) ++ return 80; ++#else + int width = 80; + CONSOLE_SCREEN_BUFFER_INFO csbi; + HANDLE hOut = GetStdHandle(STD_OUTPUT_HANDLE); +@@ -188,6 +195,7 @@ int win_get_console_width(void) + if (GetConsoleScreenBufferInfo(hOut, &csbi) != 0) + width = csbi.dwSize.X; + return width; ++#endif + } + + /* print functions */ +@@ -197,6 +205,10 @@ static int wprint_console(FILE *stream, const wchar_t *text, size_t len) + DWORD out; + int ret; + ++#if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) ++ // disabled for UWP as there's no alternative: ++ // https://docs.microsoft.com/en-us/uwp/win32-and-com/alternatives-to-windows-apis-uwp ++#else + do { + if (stream == stdout) { + HANDLE hOut = GetStdHandle(STD_OUTPUT_HANDLE); +@@ -215,6 +227,7 @@ static int wprint_console(FILE *stream, const wchar_t *text, size_t len) + return out; + } + } while(0); ++#endif + + ret = fputws(text, stream); + if (ret < 0) diff --git a/externals/vcpkg/ports/libflac/vcpkg.json b/externals/vcpkg/ports/libflac/vcpkg.json new file mode 100755 index 000000000..7ca4b9dcc --- /dev/null +++ b/externals/vcpkg/ports/libflac/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "libflac", + "version": "1.3.4", + "description": "Library for manipulating FLAC files", + "homepage": "https://xiph.org/flac/", + "license": "GFDL-1.2-or-later", + "dependencies": [ + "libogg", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "asm": { + "description": "Use any assembly optimization routines" + } + } +} diff --git a/externals/vcpkg/ports/libfort/portfile.cmake b/externals/vcpkg/ports/libfort/portfile.cmake new file mode 100755 index 000000000..a016161cb --- /dev/null +++ b/externals/vcpkg/ports/libfort/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO seleznevae/libfort + REF b1c32b67511f4612996b287a1ef4a9df012521d2 # v0.4.2 + SHA512 56d3bd00b8a72a5f9deb9bca9a325e100319aed55e10321d04243d8a2a94c0fa513ada1b13bc59957af01b1f2c5f1655304a4a608e118cbeb65d2b4527f102d0 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DFORT_ENABLE_TESTING=OFF + -DFORT_ENABLE_ASTYLE=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libfort) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/libfort/vcpkg.json b/externals/vcpkg/ports/libfort/vcpkg.json new file mode 100755 index 000000000..a12c8b575 --- /dev/null +++ b/externals/vcpkg/ports/libfort/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libfort", + "version-semver": "0.4.2", + "port-version": 1, + "description": "A simple crossplatform library to create formatted text tables", + "homepage": "https://github.com/seleznevae/libfort", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libfreenect2/fix-dependency-libusb.patch b/externals/vcpkg/ports/libfreenect2/fix-dependency-libusb.patch new file mode 100755 index 000000000..a5de8f3be --- /dev/null +++ b/externals/vcpkg/ports/libfreenect2/fix-dependency-libusb.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1e0d192..aedc576 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -90,7 +90,7 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) + + # dependencies + FIND_PACKAGE(PkgConfig) # try find PKGConfig as it will be used if found +-FIND_PACKAGE(LibUSB REQUIRED) ++FIND_PACKAGE(libusb CONFIG REQUIRED) + + # Add includes + INCLUDE_DIRECTORIES( +@@ -98,7 +98,7 @@ INCLUDE_DIRECTORIES( + "${MY_DIR}/include/internal" + ${PROJECT_BINARY_DIR} # for generated headers + ${LIBFREENECT2_THREADING_INCLUDE_DIR} +- ${LibUSB_INCLUDE_DIRS} ++ ${LIBUSB_INCLUDE_DIRS} + ) + + SET(RESOURCES_INC_FILE "${PROJECT_BINARY_DIR}/resources.inc.h") +@@ -154,7 +154,7 @@ SET(SOURCES + ) + + SET(LIBRARIES +- ${LibUSB_LIBRARIES} ++ ${LIBUSB_LIBRARIES} + ${LIBFREENECT2_THREADING_LIBRARIES} + ) + diff --git a/externals/vcpkg/ports/libfreenect2/fix-macbuild.patch b/externals/vcpkg/ports/libfreenect2/fix-macbuild.patch new file mode 100755 index 000000000..cb675a669 --- /dev/null +++ b/externals/vcpkg/ports/libfreenect2/fix-macbuild.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index aedc576..4f16abc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -165,6 +165,8 @@ SET(LIBFREENECT2_DLLS + SET(HAVE_VideoToolbox "no (Apple only)") + IF(APPLE) + FIND_LIBRARY(VIDEOTOOLBOX_LIBRARY VideoToolbox) ++ FIND_LIBRARY(CF_LIBRARY CoreFoundation) ++ FIND_LIBRARY(IOK_LIBRARY IOKit) + + SET(HAVE_VideoToolbox no) + IF(VIDEOTOOLBOX_LIBRARY) +@@ -184,6 +186,8 @@ IF(APPLE) + ${COREFOUNDATION_LIBRARY} + ${COREMEDIA_LIBRARY} + ${COREVIDEO_LIBRARY} ++ ${CF_LIBRARY} ++ ${IOK_LIBRARY} + ) + ENDIF(VIDEOTOOLBOX_LIBRARY) + ENDIF(APPLE) diff --git a/externals/vcpkg/ports/libfreenect2/portfile.cmake b/externals/vcpkg/ports/libfreenect2/portfile.cmake new file mode 100755 index 000000000..32ea1a688 --- /dev/null +++ b/externals/vcpkg/ports/libfreenect2/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO OpenKinect/libfreenect2 + REF v0.2.0 + SHA512 3525e3f21462cecd3b198f64545786ffddc2cafdfd8146e5a46f0300b83f29f1ad0739618a07ab195c276149d7e2e909f7662e2d379a2880593cac75942b0666 + HEAD_REF master + PATCHES + fix-dependency-libusb.patch + fix-macbuild.patch +) + +file(READ "${SOURCE_PATH}/cmake_modules/FindLibUSB.cmake" FINDLIBUSB) +string(REPLACE "(WIN32)" + "(WIN32_DISABLE)" FINDLIBUSB "${FINDLIBUSB}") +file(WRITE "${SOURCE_PATH}/cmake_modules/FindLibUSB.cmake" "${FINDLIBUSB}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + opengl ENABLE_OPENGL + opencl ENABLE_OPENCL +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENABLE_CUDA=OFF + -DBUILD_EXAMPLES=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME freenect2 CONFIG_PATH lib/cmake/freenect2) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/GPL2" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/libfreenect2/vcpkg.json b/externals/vcpkg/ports/libfreenect2/vcpkg.json new file mode 100755 index 000000000..fd11f7991 --- /dev/null +++ b/externals/vcpkg/ports/libfreenect2/vcpkg.json @@ -0,0 +1,38 @@ +{ + "name": "libfreenect2", + "version": "0.2.0", + "port-version": 8, + "description": "Open source drivers for the Kinect for Windows v2 device", + "homepage": "https://github.com/OpenKinect/libfreenect2", + "license": "GPL-2.0-only", + "dependencies": [ + "libjpeg-turbo", + "libusb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "opengl" + ], + "features": { + "opencl": { + "description": "OpenCL support for libfreenect2", + "dependencies": [ + "opencl" + ] + }, + "opengl": { + "description": "OpenGL support for libfreenect2", + "dependencies": [ + "glfw3", + "opengl" + ] + } + } +} diff --git a/externals/vcpkg/ports/libftdi/dont_use_lib64.patch b/externals/vcpkg/ports/libftdi/dont_use_lib64.patch new file mode 100755 index 000000000..cebc17393 --- /dev/null +++ b/externals/vcpkg/ports/libftdi/dont_use_lib64.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b68de29..2eda29e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -44,7 +44,7 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 4) + SET(LIB_SUFFIX "") + SET(PACK_ARCH "") + ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8) +- SET(LIB_SUFFIX 64) ++ SET(LIB_SUFFIX "") + SET(PACK_ARCH .x86_64) + endif(CMAKE_SIZEOF_VOID_P EQUAL 4) + diff --git a/externals/vcpkg/ports/libftdi/exports.def b/externals/vcpkg/ports/libftdi/exports.def new file mode 100755 index 000000000..31ebd214e --- /dev/null +++ b/externals/vcpkg/ports/libftdi/exports.def @@ -0,0 +1,56 @@ +EXPORTS + ftdi_deinit + ftdi_disable_bitbang + ftdi_eeprom_build + ftdi_eeprom_decode + ftdi_eeprom_free + ftdi_eeprom_initdefaults + ftdi_eeprom_setsize + ftdi_enable_bitbang + ftdi_erase_eeprom + ftdi_free + ftdi_get_error_string + ftdi_get_latency_timer + ftdi_init + ftdi_list_free + ftdi_list_free2 + ftdi_new + ftdi_poll_modem_status + ftdi_read_chipid + ftdi_read_data + ftdi_read_data_get_chunksize + ftdi_read_data_set_chunksize + ftdi_read_eeprom + ftdi_read_eeprom_getsize + ftdi_read_eeprom_location + ftdi_read_pins + ftdi_set_baudrate + ftdi_set_bitmode + ftdi_set_error_char + ftdi_set_event_char + ftdi_set_interface + ftdi_set_latency_timer + ftdi_set_line_property + ftdi_set_line_property2 + ftdi_set_usbdev + ftdi_setdtr + ftdi_setdtr_rts + ftdi_setflowctrl + ftdi_setrts + ftdi_usb_close + ftdi_usb_find_all + ftdi_usb_get_strings + ftdi_usb_open + ftdi_usb_open_desc + ftdi_usb_open_desc_index + ftdi_usb_open_dev + ftdi_usb_open_string + ftdi_usb_purge_buffers + ftdi_usb_purge_rx_buffer + ftdi_usb_purge_tx_buffer + ftdi_usb_reset + ftdi_write_data + ftdi_write_data_get_chunksize + ftdi_write_data_set_chunksize + ftdi_write_eeprom + ftdi_write_eeprom_location diff --git a/externals/vcpkg/ports/libftdi/libusb-win32.patch b/externals/vcpkg/ports/libftdi/libusb-win32.patch new file mode 100755 index 000000000..55bc1c3f1 --- /dev/null +++ b/externals/vcpkg/ports/libftdi/libusb-win32.patch @@ -0,0 +1,43 @@ +diff --git a/FindUSB.cmake b/FindUSB.cmake +index 566cdd8..0710345 100644 +--- a/FindUSB.cmake ++++ b/FindUSB.cmake +@@ -24,10 +24,10 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) + pkg_check_modules(PC_LIBUSB libusb) + ENDIF(NOT WIN32) + +- FIND_PATH(LIBUSB_INCLUDE_DIR usb.h ++ FIND_PATH(LIBUSB_INCLUDE_DIR lusb0_usb.h + PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS}) + +- FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb ++ FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb0 libusb0 + PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS}) + + include(FindPackageHandleStandardArgs) +diff --git a/src/ftdi.c b/src/ftdi.c +index 980622d..8f6ab67 100644 +--- a/src/ftdi.c ++++ b/src/ftdi.c +@@ -28,7 +28,7 @@ + /** \addtogroup libftdi */ + /* @{ */ + +-#include ++#include + #include + #include + #include +diff --git a/src/ftdi.h b/src/ftdi.h +index 6bb7a3e..d4472c2 100644 +--- a/src/ftdi.h ++++ b/src/ftdi.h +@@ -17,7 +17,7 @@ + #ifndef __libftdi_h__ + #define __libftdi_h__ + +-#include ++#include + + #define FTDI_DEFAULT_EEPROM_SIZE 128 + diff --git a/externals/vcpkg/ports/libftdi/portfile.cmake b/externals/vcpkg/ports/libftdi/portfile.cmake new file mode 100755 index 000000000..f44801849 --- /dev/null +++ b/externals/vcpkg/ports/libftdi/portfile.cmake @@ -0,0 +1,50 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://www.intra2net.com/en/developer/libftdi/download/libftdi-0.20.tar.gz" + FILENAME "libftdi-0.20.tar.gz" + SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF 0.20 + PATCHES + libusb-win32.patch + shared-static.patch + dont_use_lib64.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/exports.def" DESTINATION "${SOURCE_PATH}/src") + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS + -DDOCUMENTATION=OFF + -DEXAMPLES=OFF + -DPYTHON_BINDINGS=OFF + -DFTDIPP=OFF + + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON + + "-DLIBUSB_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include" + + -DLIB_INSTALL_DIR=lib +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libftdi") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/libftdi/LICENSE" "${CURRENT_PACKAGES_DIR}/share/libftdi/copyright") + +vcpkg_copy_pdbs() + +# Delete pkgconfig files for ftdipp since we did -DFTDIPP=OFF above +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/ftdipp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/ftdipp.pc") diff --git a/externals/vcpkg/ports/libftdi/shared-static.patch b/externals/vcpkg/ports/libftdi/shared-static.patch new file mode 100755 index 000000000..3197fb823 --- /dev/null +++ b/externals/vcpkg/ports/libftdi/shared-static.patch @@ -0,0 +1,66 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 071ae90..f91f6f7 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -4,7 +4,7 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} + ) + + # Targets +-set(c_sources ftdi.c) ++set(c_sources ftdi.c exports.def) + set(c_headers ftdi.h) + + add_library(ftdi SHARED ${c_sources}) +@@ -14,7 +14,7 @@ set_target_properties(ftdi PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}. + + # Static library + add_library(ftdi-static STATIC ${c_sources}) +-set_target_properties(ftdi-static PROPERTIES OUTPUT_NAME "ftdi") ++set_target_properties(ftdi-static PROPERTIES OUTPUT_NAME "ftdi-static") + + # Prevent clobbering each other during the build + set_target_properties(ftdi PROPERTIES CLEAN_DIRECT_OUTPUT 1) +@@ -24,7 +24,7 @@ set_target_properties(ftdi-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) + target_link_libraries(ftdi ${LIBUSB_LIBRARIES}) + + # Install +-if(${UNIX}) ++if(UNIX AND 0) + + install( TARGETS ftdi + LIBRARY DESTINATION lib${LIB_SUFFIX} +@@ -41,23 +41,29 @@ if(${UNIX}) + COMPONENT headers + ) + +-endif(${UNIX}) ++endif() + +-if(${WIN32}) ++if(WIN32 OR 1) + ++ if(BUILD_SHARED_LIBS) + install( TARGETS ftdi +- DESTINATION bin ++ EXPORT ftdi + COMPONENT sharedlibs + ) + ++ target_include_directories(ftdi PUBLIC $) ++ else() + install( TARGETS ftdi-static +- DESTINATION bin ++ EXPORT ftdi + COMPONENT staticlibs + ) ++ target_include_directories(ftdi-static PUBLIC $) ++ endif() ++ install(EXPORT ftdi FILE libftdi-config.cmake NAMESPACE libftdi:: DESTINATION share/libftdi) + + install( FILES ${c_headers} + DESTINATION include + COMPONENT headers + ) + +-endif(${WIN32}) ++endif() diff --git a/externals/vcpkg/ports/libftdi/vcpkg.json b/externals/vcpkg/ports/libftdi/vcpkg.json new file mode 100755 index 000000000..b6300d9dd --- /dev/null +++ b/externals/vcpkg/ports/libftdi/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "libftdi", + "version-string": "0.20", + "port-version": 3, + "description": "FTDI USB driver with bitbang mode (v0.20)", + "dependencies": [ + "libusb-win32" + ] +} diff --git a/externals/vcpkg/ports/libftdi1/exports.def b/externals/vcpkg/ports/libftdi1/exports.def new file mode 100755 index 000000000..8fbbd3818 --- /dev/null +++ b/externals/vcpkg/ports/libftdi1/exports.def @@ -0,0 +1,71 @@ +EXPORTS + convert_baudrate_UT_export + ftdi_deinit + ftdi_disable_bitbang + ftdi_eeprom_build + ftdi_eeprom_decode + ftdi_eeprom_get_strings + ftdi_eeprom_initdefaults + ftdi_eeprom_set_strings + ftdi_erase_eeprom + ftdi_free + ftdi_get_eeprom_buf + ftdi_get_eeprom_value + ftdi_get_error_string + ftdi_get_latency_timer + ftdi_get_library_version + ftdi_init + ftdi_list_free + ftdi_list_free2 + ftdi_new + ftdi_poll_modem_status + ftdi_read_chipid + ftdi_read_data + ftdi_read_data_get_chunksize + ftdi_read_data_set_chunksize + ftdi_read_data_submit + ftdi_read_eeprom + ftdi_read_eeprom_location + ftdi_read_pins + ftdi_set_baudrate + ftdi_set_bitmode + ftdi_set_eeprom_buf + ftdi_set_eeprom_user_data + ftdi_set_eeprom_value + ftdi_set_error_char + ftdi_set_event_char + ftdi_set_interface + ftdi_set_latency_timer + ftdi_set_line_property + ftdi_set_line_property2 + ftdi_set_usbdev + ftdi_setdtr + ftdi_setdtr_rts + ftdi_setflowctrl + ftdi_setflowctrl_xonxoff + ftdi_setrts + ftdi_tciflush + ftdi_tcioflush + ftdi_tcoflush + ftdi_transfer_data_cancel + ftdi_transfer_data_done + ftdi_usb_close + ftdi_usb_find_all + ftdi_usb_get_strings + ftdi_usb_get_strings2 + ftdi_usb_open + ftdi_usb_open_bus_addr + ftdi_usb_open_desc + ftdi_usb_open_desc_index + ftdi_usb_open_dev + ftdi_usb_open_string + ftdi_usb_purge_buffers + ftdi_usb_purge_rx_buffer + ftdi_usb_purge_tx_buffer + ftdi_usb_reset + ftdi_write_data + ftdi_write_data_get_chunksize + ftdi_write_data_set_chunksize + ftdi_write_data_submit + ftdi_write_eeprom + ftdi_write_eeprom_location diff --git a/externals/vcpkg/ports/libftdi1/libconfuse-fix.patch b/externals/vcpkg/ports/libftdi1/libconfuse-fix.patch new file mode 100755 index 000000000..b50bb0a3c --- /dev/null +++ b/externals/vcpkg/ports/libftdi1/libconfuse-fix.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/FindConfuse.cmake b/cmake/FindConfuse.cmake +index f6af7d5..e24d72f 100755 +--- a/cmake/FindConfuse.cmake ++++ b/cmake/FindConfuse.cmake +@@ -46,7 +46,7 @@ find_path ( CONFUSE_INCLUDE_DIR + set ( CONFUSE_INCLUDE_DIRS ${CONFUSE_INCLUDE_DIR} ) + + find_library ( CONFUSE_LIBRARY +- NAMES confuse ++ NAMES libconfuse + ) + + set ( CONFUSE_LIBRARIES ${CONFUSE_LIBRARY} ) diff --git a/externals/vcpkg/ports/libftdi1/libusb-fix.patch b/externals/vcpkg/ports/libftdi1/libusb-fix.patch new file mode 100755 index 000000000..98dae3dea --- /dev/null +++ b/externals/vcpkg/ports/libftdi1/libusb-fix.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/FindUSB1.cmake b/cmake/FindUSB1.cmake +index b90e297..6cc97a0 100755 +--- a/cmake/FindUSB1.cmake ++++ b/cmake/FindUSB1.cmake +@@ -26,7 +26,7 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) + PATH_SUFFIXES libusb-1.0 + PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS}) + +- FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb-1.0 ++ FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb-1.0 libusb-1.0 + PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS}) + + include(FindPackageHandleStandardArgs) diff --git a/externals/vcpkg/ports/libftdi1/portfile.cmake b/externals/vcpkg/ports/libftdi1/portfile.cmake new file mode 100755 index 000000000..e294a804c --- /dev/null +++ b/externals/vcpkg/ports/libftdi1/portfile.cmake @@ -0,0 +1,49 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.5.tar.bz2" + FILENAME "libftdi1-1.5.tar.bz2" + SHA512 c525b2ab6aff9ef9254971ae7d57f3549a36a36875765c48f947d52532814a2a004de1232389d4fe824a8c8ab84277b08427308573476e1da9b7db83db802f6f +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF 1.5 + PATCHES + libusb-fix.patch + libconfuse-fix.patch + win32.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/exports.def" DESTINATION "${SOURCE_PATH}/src") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTS=OFF + -DDOCUMENTATION=OFF + -DEXAMPLES=OFF + -DPYTHON_BINDINGS=OFF + -DLINK_PYTHON_LIBRARY=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Libintl=ON + -DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON + -DCMAKE_DISABLE_FIND_PACKAGE_PythonInterp=ON + -DFTDI_EEPROM=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libftdi1) + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libftdi1/vcpkg.json b/externals/vcpkg/ports/libftdi1/vcpkg.json new file mode 100755 index 000000000..42d4123c2 --- /dev/null +++ b/externals/vcpkg/ports/libftdi1/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libftdi1", + "version": "1.5", + "port-version": 3, + "description": "FTDI USB driver with bitbang mode", + "dependencies": [ + "libconfuse", + "libusb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libftdi1/win32.patch b/externals/vcpkg/ports/libftdi1/win32.patch new file mode 100755 index 000000000..7cea44d4f --- /dev/null +++ b/externals/vcpkg/ports/libftdi1/win32.patch @@ -0,0 +1,28 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 17b3617..f9a8e59 100755 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -18,9 +18,14 @@ message(STATUS "Detected git snapshot version: ${SNAPSHOT_VERSION}") + configure_file(ftdi_version_i.h.in "${CMAKE_CURRENT_BINARY_DIR}/ftdi_version_i.h" @ONLY) + + # Targets ++if(WIN32) ++set(c_sources ${CMAKE_CURRENT_SOURCE_DIR}/ftdi.c ${CMAKE_CURRENT_SOURCE_DIR}/exports.def CACHE INTERNAL "List of c sources" ) ++else() + set(c_sources ${CMAKE_CURRENT_SOURCE_DIR}/ftdi.c ${CMAKE_CURRENT_SOURCE_DIR}/ftdi_stream.c CACHE INTERNAL "List of c sources" ) ++endif() + set(c_headers ${CMAKE_CURRENT_SOURCE_DIR}/ftdi.h CACHE INTERNAL "List of c headers" ) + ++if(BUILD_SHARED_LIBS) + add_library(ftdi1 SHARED ${c_sources}) + + math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1") # Compatibility with previous releases +@@ -38,7 +43,7 @@ install ( TARGETS ftdi1 + ARCHIVE DESTINATION lib${LIB_SUFFIX} + ) + +-if ( STATICLIBS ) ++else() + add_library(ftdi1-static STATIC ${c_sources}) + target_link_libraries(ftdi1-static ${LIBUSB_LIBRARIES}) + set_target_properties(ftdi1-static PROPERTIES OUTPUT_NAME "ftdi1") diff --git a/externals/vcpkg/ports/libgcrypt/portfile.cmake b/externals/vcpkg/ports/libgcrypt/portfile.cmake new file mode 100755 index 000000000..b1fe32634 --- /dev/null +++ b/externals/vcpkg/ports/libgcrypt/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH + URL git://git.gnupg.org/libgcrypt.git + FETCH_REF libgcrypt-1.10.1 + REF ae0e567820c37f9640440b3cff77d7c185aa6742 # https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=tag;h=a8a888c9d2ed8a25ff502b104860a1bac4c4f73c + HEAD_REF master +) + +vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + --disable-doc + --disable-silent-rules + --with-libgpg-error-prefix=${CURRENT_INSTALLED_DIR}/tools/libgpg-error +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgcrypt/bin/libgcrypt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") +endif() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgcrypt/debug/bin/libgcrypt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libgcrypt/vcpkg.json b/externals/vcpkg/ports/libgcrypt/vcpkg.json new file mode 100755 index 000000000..af8486011 --- /dev/null +++ b/externals/vcpkg/ports/libgcrypt/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libgcrypt", + "version": "1.10.1", + "description": "A general purpose cryptographic library", + "homepage": "https://gnupg.org/software/libgcrypt/index.html", + "supports": "linux | osx", + "dependencies": [ + "libgpg-error" + ] +} diff --git a/externals/vcpkg/ports/libgd/0001-fix-cmake.patch b/externals/vcpkg/ports/libgd/0001-fix-cmake.patch new file mode 100755 index 000000000..4446eb60d --- /dev/null +++ b/externals/vcpkg/ports/libgd/0001-fix-cmake.patch @@ -0,0 +1,82 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 57cd95d..50d5b9a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -280,8 +280,10 @@ else (USE_EXT_GD) + add_subdirectory(src) + endif (USE_EXT_GD) + +-add_subdirectory(tests) +-add_subdirectory(examples) ++if(BUILD_TEST) ++ add_subdirectory(tests) ++ add_subdirectory(examples) ++endif() + + add_custom_target(distclean ${GD_SOURCE_DIR}/cmake/distclean.sh) + +@@ -298,7 +300,7 @@ else(WIN32) + set(CPACK_GENERATOR TGZ) + endif(WIN32) + +- ++if(0) + INSTALL(FILES docs/INSTALL DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) + INSTALL(FILES docs/README.JPN DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) + INSTALL(FILES docs/README.CMAKE DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) +@@ -320,7 +322,7 @@ INSTALL(FILES examples/test_crop_threshold.png DESTINATION share/doc/gd-${GDLIB_ + INSTALL(FILES examples/tgaread.c DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) + INSTALL(FILES examples/tiffread.c DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) + INSTALL(FILES examples/windows.c DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) +- ++endif() + + set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING") + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 509c422..97a2976 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -96,7 +96,6 @@ if (BUILD_STATIC_LIBS) + if (UNIX) + set_target_properties(${GD_LIB_STATIC} PROPERTIES OUTPUT_NAME ${GD_LIB}) + endif() +-endif() + + if (NOT "${GD_PROGRAMS_LIB_SRC_FILES}" STREQUAL "") + add_library(gd_programs_lib STATIC ${GD_PROGRAMS_LIB_SRC_FILES}) +@@ -117,6 +116,7 @@ if (MINGW OR MSYS) + set_target_properties(${GD_LIB_STATIC} PROPERTIES OUTPUT_NAME ${GD_LIB}) + endif() + endif (MINGW OR MSYS) ++endif() + + INCLUDE_DIRECTORIES(BEFORE "${PROJECT_BINARY_DIR}" "${CMAKE_BINARY_DIR}" "${GD_SOURCE_DIR}/src") + +@@ -148,6 +148,7 @@ SET(LIBS_PRIVATES + ${WEBP_LIBRARIES} + ) + ++if(BUILD_PROGRAMS) + set(GD_PROGRAMS gdcmpgif) + + if (PNG_FOUND) +@@ -177,6 +178,9 @@ foreach(program ${GD_PROGRAMS}) + endif() + endforeach(program) + ++install(PROGRAMS bdftogd DESTINATION bin) ++endif() ++ + set(GD_INSTALL_TARGETS ${GD_PROGRAMS}) + if (BUILD_SHARED_LIBS) + set(GD_INSTALL_TARGETS ${GD_INSTALL_TARGETS} ${GD_LIB}) +@@ -189,7 +193,7 @@ install(TARGETS ${GD_INSTALL_TARGETS} + RUNTIME DESTINATION bin + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-install(PROGRAMS bdftogd DESTINATION bin) ++ + install(FILES + entities.h + gd.h diff --git a/externals/vcpkg/ports/libgd/fix_msvc_build.patch b/externals/vcpkg/ports/libgd/fix_msvc_build.patch new file mode 100755 index 000000000..e46a81f89 --- /dev/null +++ b/externals/vcpkg/ports/libgd/fix_msvc_build.patch @@ -0,0 +1,61 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 17ddf6b..7fe1e6b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -118,7 +118,7 @@ else (USE_EXT_GD) + endif (ENABLE_ICONV) + + IF (ENABLE_WEBP) +- FIND_PACKAGE(WEBP REQUIRED) ++ FIND_PACKAGE(WebP CONFIG REQUIRED) + ENDIF (ENABLE_WEBP) + + IF (ENABLE_HEIF) +diff --git a/src/config.h.cmake b/src/config.h.cmake +index 2b46a17..af98d23 100644 +--- a/src/config.h.cmake ++++ b/src/config.h.cmake +@@ -139,3 +139,8 @@ + + /* Version number of package */ + #cmakedefine VERSION ++ ++#ifdef _MSC_VER ++ #define ssize_t SSIZE_T ++ #define SSIZE_MAX MAXSSIZE_T ++#endif +\ No newline at end of file +diff --git a/src/gd_intern.h b/src/gd_intern.h +index f8f3b5d..380f4db 100644 +--- a/src/gd_intern.h ++++ b/src/gd_intern.h +@@ -29,6 +29,14 @@ + # endif + #endif + ++#ifdef _MSC_VER ++#define ssize_t SSIZE_T ++#define MAXSIZE_T ((SIZE_T)~ ((SIZE_T)0)) ++#define MAXSSIZE_T ((SSIZE_T) (MAXSIZE_T >> 1)) ++#define MINSSIZE_T ((SSIZE_T)~MAXSSIZE_T) ++#define SSIZE_MAX MAXSSIZE_T ++#endif ++ + #include "gd.h" + + #define MIN(a,b) ((a)<(b)?(a):(b)) +diff --git a/src/getopt.c b/src/getopt.c +index 8651b87..00bccde 100644 +--- a/src/getopt.c ++++ b/src/getopt.c +@@ -33,7 +33,10 @@ + #include + #include + #include ++ ++#ifndef _WIN32 + #include ++#endif + + int opterr = 1, /* if error message should be printed */ + optind = 1, /* index into parent argv vector */ diff --git a/externals/vcpkg/ports/libgd/intrin.patch b/externals/vcpkg/ports/libgd/intrin.patch new file mode 100755 index 000000000..b228773f0 --- /dev/null +++ b/externals/vcpkg/ports/libgd/intrin.patch @@ -0,0 +1,13 @@ +diff --git a/src/gd_interpolation.c b/src/gd_interpolation.c +index ce27220..8895072 100644 +--- a/src/gd_interpolation.c ++++ b/src/gd_interpolation.c +@@ -75,7 +75,7 @@ TODO: + + #ifdef _MSC_VER + # pragma optimize("t", on) +-# include ++# include + #endif + + static gdImagePtr gdImageScaleBilinear(gdImagePtr im, diff --git a/externals/vcpkg/ports/libgd/no-write-source-dir.patch b/externals/vcpkg/ports/libgd/no-write-source-dir.patch new file mode 100755 index 000000000..4cc17dbef --- /dev/null +++ b/externals/vcpkg/ports/libgd/no-write-source-dir.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 50d5b9a..17ddf6b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -248,7 +248,8 @@ else (USE_EXT_GD) + CHECK_INCLUDE_FILE("stdint.h" HAVE_STDINT_H) + CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H) + +- CONFIGURE_FILE(${GD_SOURCE_DIR}/src/config.h.cmake ${GD_SOURCE_DIR}/src/config.h ESCAPE_QUOTES) ++ CONFIGURE_FILE(${GD_SOURCE_DIR}/src/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/config.h ESCAPE_QUOTES) ++ include_directories(${CMAKE_CURRENT_BINARY_DIR}/src) + + option(BUILD_SHARED_LIBS "Build shared libs" ON) + option(BUILD_STATIC_LIBS "Build static libs" OFF) diff --git a/externals/vcpkg/ports/libgd/portfile.cmake b/externals/vcpkg/ports/libgd/portfile.cmake new file mode 100755 index 000000000..4477e791c --- /dev/null +++ b/externals/vcpkg/ports/libgd/portfile.cmake @@ -0,0 +1,57 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libgd/libgd + REF 2e40f55bfb460fc9d8cbcd290a0c9eb908d5af7e # gd-2.3.2 + SHA512 c3f2db40f774b44e3fd3fbc743efe70916a71ecd948bf8cb4aeb8a9b9fefd9f17e02d82a9481bac6fcc3624f057b5a308925b4196fb612b65bb7304747d33ffa + HEAD_REF master + PATCHES + 0001-fix-cmake.patch + no-write-source-dir.patch + intrin.patch + fix_msvc_build.patch +) + +#delete CMake builtins modules +file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules/CMakeParseArguments.cmake") +file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules/FindFreetype.cmake") +file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules/FindJPEG.cmake") +file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules/FindPackageHandleStandardArgs.cmake") +file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules/FindPNG.cmake") +file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules/FindWEBP.cmake") + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + png ENABLE_PNG + jpeg ENABLE_JPEG + tiff ENABLE_TIFF + freetype ENABLE_FREETYPE + webp ENABLE_WEBP + fontconfig ENABLE_FONTCONFIG +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(LIBGD_SHARED_LIBS ON) + set(LIBGD_STATIC_LIBS OFF) +else() + set(LIBGD_SHARED_LIBS OFF) + set(LIBGD_STATIC_LIBS ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DLIBGD_SHARED_LIBS=${LIBGD_SHARED_LIBS} + -DBUILD_STATIC_LIBS=${LIBGD_STATIC_LIBS} + -DBUILD_TEST=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/libgd/vcpkg.json b/externals/vcpkg/ports/libgd/vcpkg.json new file mode 100755 index 000000000..34ae61fac --- /dev/null +++ b/externals/vcpkg/ports/libgd/vcpkg.json @@ -0,0 +1,59 @@ +{ + "name": "libgd", + "version-semver": "2.3.2", + "port-version": 1, + "description": "Open source code library for the dynamic creation of images by programmers.", + "homepage": "https://github.com/libgd/libgd", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], + "default-features": [ + "fontconfig", + "freetype", + "jpeg", + "png", + "tiff", + "webp" + ], + "features": { + "fontconfig": { + "description": "Support for fontconfig", + "dependencies": [ + "fontconfig" + ] + }, + "freetype": { + "description": "Support for freetype", + "dependencies": [ + "freetype" + ] + }, + "jpeg": { + "description": "Support for jpeg", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "png": { + "description": "Support for png", + "dependencies": [ + "libpng" + ] + }, + "tiff": { + "description": "Support for tiff", + "dependencies": [ + "tiff" + ] + }, + "webp": { + "description": "Support for webp", + "dependencies": [ + "libwebp" + ] + } + } +} diff --git a/externals/vcpkg/ports/libgeotiff/cmakelists.patch b/externals/vcpkg/ports/libgeotiff/cmakelists.patch new file mode 100755 index 000000000..d2790e17d --- /dev/null +++ b/externals/vcpkg/ports/libgeotiff/cmakelists.patch @@ -0,0 +1,23 @@ +diff --git a/libgeotiff/cmake/CMakeLists.txt b/libgeotiff/cmake/CMakeLists.txt +index 47a2b00..3809ba3 100644 +--- a/libgeotiff/cmake/CMakeLists.txt ++++ b/libgeotiff/cmake/CMakeLists.txt +@@ -6,6 +6,7 @@ + # ${INSTALL_CMAKE_DIR} and @PROJECT_ROOT_DIR@ is the relative + # path to the root from there. (Note that the whole install tree can + # be relocated.) ++if (0) + if (NOT WIN32) + set (INSTALL_CMAKE_DIR "share/cmake/${PROJECT_NAME}") + set (PROJECT_ROOT_DIR "../../..") +@@ -13,6 +14,10 @@ else () + set (INSTALL_CMAKE_DIR "cmake") + set (PROJECT_ROOT_DIR "..") + endif () ++else() ++ set (INSTALL_CMAKE_DIR "share/${PROJECT_NAME}") ++ set (PROJECT_ROOT_DIR "../..") ++endif() + + configure_file (project-config.cmake.in project-config.cmake @ONLY) + configure_file (project-config-version.cmake.in diff --git a/externals/vcpkg/ports/libgeotiff/portfile.cmake b/externals/vcpkg/ports/libgeotiff/portfile.cmake new file mode 100755 index 000000000..d6cc3d755 --- /dev/null +++ b/externals/vcpkg/ports/libgeotiff/portfile.cmake @@ -0,0 +1,45 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO OSGeo/libgeotiff + REF 1.7.1 + SHA512 3c71a19f02a46a86d546777e2afe6bd715098779845967a5253ca949e0cacc0117c697cabd099611247e85e15cf1813733ae0ef445b136d7001f34667a4c8dd6 + HEAD_REF master + PATCHES + cmakelists.patch + skip-doc-install.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools WITH_JPEG + tools WITH_UTILITIES +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/libgeotiff" + OPTIONS + -DGEOTIFF_BIN_SUBDIR=bin + -DWITH_TIFF=1 + -DHAVE_TIFFOPEN=1 + -DHAVE_TIFFMERGEFIELDINFO=1 + -DCMAKE_MACOSX_BUNDLE=0 + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +if(WITH_UTILITIES) + vcpkg_copy_tools(TOOL_NAMES applygeo geotifcp listgeo makegeo AUTO_CLEAN) +endif() + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME GeoTIFF) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/GeoTIFF/geotiff-config.cmake" "if (GeoTIFF_USE_STATIC_LIBS)" "if (1)") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/libgeotiff/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libgeotiff/skip-doc-install.patch b/externals/vcpkg/ports/libgeotiff/skip-doc-install.patch new file mode 100755 index 000000000..bef3fc860 --- /dev/null +++ b/externals/vcpkg/ports/libgeotiff/skip-doc-install.patch @@ -0,0 +1,20 @@ +diff --git a/libgeotiff/CMakeLists.txt b/libgeotiff/CMakeLists.txt +index 54779a5..30ff29f 100644 +--- a/libgeotiff/CMakeLists.txt ++++ b/libgeotiff/CMakeLists.txt +@@ -262,6 +262,7 @@ SET(GEOTIFF_BIN_DIR ${GEOTIFF_BIN_SUBDIR}) + SET(GEOTIFF_LIB_DIR ${GEOTIFF_LIB_SUBDIR}) + SET(GEOTIFF_INCLUDE_DIR ${GEOTIFF_INCLUDE_SUBDIR}) + ++if(0) + # Install doc files + INSTALL(FILES + AUTHORS ChangeLog COPYING INSTALL LICENSE README README_BIN README.WIN +@@ -269,6 +270,7 @@ INSTALL(FILES + + # Install man pages + INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTINATION share/man/man1) ++endif() + + + # Install header files for development distribution diff --git a/externals/vcpkg/ports/libgeotiff/usage b/externals/vcpkg/ports/libgeotiff/usage new file mode 100755 index 000000000..df014cb55 --- /dev/null +++ b/externals/vcpkg/ports/libgeotiff/usage @@ -0,0 +1,5 @@ +The package libgeotiff provides a CMake config file: + + find_package(GeoTIFF CONFIG REQUIRED) + target_include_directories(main PRIVATE ${GEOTIFF_INCLUDE_DIR}) + target_link_libraries(main PRIVATE ${GEOTIFF_LIBRARIES}) diff --git a/externals/vcpkg/ports/libgeotiff/vcpkg.json b/externals/vcpkg/ports/libgeotiff/vcpkg.json new file mode 100755 index 000000000..fc3ed37f7 --- /dev/null +++ b/externals/vcpkg/ports/libgeotiff/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "libgeotiff", + "version": "1.7.1", + "description": "Libgeotiff is an open source library on top of libtiff for reading and writing GeoTIFF information tags.", + "homepage": "https://github.com/OSGeo/libgeotiff", + "license": "MIT", + "dependencies": [ + "proj", + { + "name": "tiff", + "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "Install libgeotiff utility programs", + "dependencies": [ + "libjpeg-turbo" + ] + } + } +} diff --git a/externals/vcpkg/ports/libgit2/fix-configcmake.patch b/externals/vcpkg/ports/libgit2/fix-configcmake.patch new file mode 100755 index 000000000..1cc67d897 --- /dev/null +++ b/externals/vcpkg/ports/libgit2/fix-configcmake.patch @@ -0,0 +1,55 @@ +diff --git a/cmake/SelectRegex.cmake b/cmake/SelectRegex.cmake +index 2a3a91b8c..cbb409350 100644 +--- a/cmake/SelectRegex.cmake ++++ b/cmake/SelectRegex.cmake +@@ -1,5 +1,4 @@ + # Specify regular expression implementation +-find_package(PCRE) + + if(REGEX_BACKEND STREQUAL "") + check_symbol_exists(regcomp_l "regex.h;xlocale.h" HAVE_REGCOMP_L) +@@ -33,8 +32,8 @@ elseif(REGEX_BACKEND STREQUAL "pcre") + add_feature_info(regex ON "using system PCRE") + set(GIT_REGEX_PCRE 1) + +- list(APPEND LIBGIT2_SYSTEM_INCLUDES ${PCRE_INCLUDE_DIRS}) +- list(APPEND LIBGIT2_SYSTEM_LIBS ${PCRE_LIBRARIES}) ++ find_package(unofficial-pcre CONFIG REQUIRED) ++ list(APPEND LIBGIT2_SYSTEM_LIBS unofficial::pcre::pcre) + list(APPEND LIBGIT2_PC_REQUIRES "libpcre") + elseif(REGEX_BACKEND STREQUAL "regcomp") + add_feature_info(regex ON "using system regcomp") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e7b54d036..6b549deef 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -298,10 +298,28 @@ if(MSVC_IDE) + endif() + + # Install +-install(TARGETS git2 ++install(TARGETS git2 EXPORT unofficial-git2Targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) ++ ++install(EXPORT unofficial-git2Targets ++ NAMESPACE unofficial::git2:: ++ DESTINATION share/unofficial-git2 ++) ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake.in" ++[[include(CMakeFindDependencyMacro) ++if(@USE_BUNDLED_ZLIB@ STREQUAL "OFF") ++ find_dependency(ZLIB) ++endif() ++if(@REGEX_BACKEND@ STREQUAL "pcre") ++ find_dependency(unofficial-pcre CONFIG) ++endif() ++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-git2Targets.cmake") ++]]) ++configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake" @ONLY) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake DESTINATION share/unofficial-git2) ++ + install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/git2 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(FILES ${PROJECT_SOURCE_DIR}/include/git2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/externals/vcpkg/ports/libgit2/portfile.cmake b/externals/vcpkg/ports/libgit2/portfile.cmake new file mode 100755 index 000000000..867d0b175 --- /dev/null +++ b/externals/vcpkg/ports/libgit2/portfile.cmake @@ -0,0 +1,84 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libgit2/libgit2 + REF v1.4.2 + SHA512 144bec7f8e66d97b20335d87d1eb68d522f5e59064b0c557505c088d3c486d45704f023d701f51de572efa8e2eb111e3136eb5d23c035e29d16698206b5ec277 + HEAD_REF maint/v1.4 + PATCHES + fix-configcmake.patch +) + +file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/FindPCRE.cmake") + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) + +set(REGEX_BACKEND OFF) +set(USE_HTTPS OFF) + +function(set_regex_backend VALUE) + if(REGEX_BACKEND) + message(FATAL_ERROR "Only one regex backend (pcre,pcre2) is allowed") + endif() + set(REGEX_BACKEND ${VALUE} PARENT_SCOPE) +endfunction() + +function(set_tls_backend VALUE) + if(USE_HTTPS) + message(FATAL_ERROR "Only one TLS backend (openssl,winhttp,sectransp,mbedtls) is allowed") + endif() + set(USE_HTTPS ${VALUE} PARENT_SCOPE) +endfunction() + +foreach(GIT2_FEATURE ${FEATURES}) + if(GIT2_FEATURE STREQUAL "pcre") + set_regex_backend("pcre") + elseif(GIT2_FEATURE STREQUAL "pcre2") + set_regex_backend("pcre2") + elseif(GIT2_FEATURE STREQUAL "openssl") + set_tls_backend("OpenSSL") + elseif(GIT2_FEATURE STREQUAL "winhttp") + if(NOT VCPKG_TARGET_IS_WINDOWS) + message(FATAL_ERROR "winhttp is not supported on non-Windows and uwp platforms") + endif() + set_tls_backend("WinHTTP") + elseif(GIT2_FEATURE STREQUAL "sectransp") + if(NOT VCPKG_TARGET_IS_OSX) + message(FATAL_ERROR "sectransp is not supported on non-Apple platforms") + endif() + set_tls_backend("SecureTransport") + elseif(GIT2_FEATURE STREQUAL "mbedtls") + if(VCPKG_TARGET_IS_WINDOWS) + message(FATAL_ERROR "mbedtls is not supported on Windows because a certificate file must be specified at compile time") + endif() + set_tls_backend("mbedTLS") + endif() +endforeach() + +if(NOT REGEX_BACKEND) + message(FATAL_ERROR "Must choose pcre or pcre2 regex backend") +endif() + +vcpkg_check_features( + OUT_FEATURE_OPTIONS GIT2_FEATURES + FEATURES + ssh USE_SSH +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTS=OFF + -DUSE_HTTP_PARSER=system + -DUSE_HTTPS=${USE_HTTPS} + -DREGEX_BACKEND=${REGEX_BACKEND} + -DSTATIC_CRT=${STATIC_CRT} + ${GIT2_FEATURES} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-git2 CONFIG_PATH share/unofficial-git2) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libgit2/vcpkg.json b/externals/vcpkg/ports/libgit2/vcpkg.json new file mode 100755 index 000000000..1614564db --- /dev/null +++ b/externals/vcpkg/ports/libgit2/vcpkg.json @@ -0,0 +1,97 @@ +{ + "name": "libgit2", + "version-semver": "1.4.2", + "description": "Git linkable library", + "homepage": "https://github.com/libgit2/libgit2", + "supports": "!uwp", + "dependencies": [ + "http-parser", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "default-features": [ + "pcre", + "ssl" + ], + "features": { + "mbedtls": { + "description": "SSL support (mbedTLS)", + "dependencies": [ + "mbedtls" + ] + }, + "openssl": { + "description": "SSL support (OpenSSL)", + "dependencies": [ + "openssl" + ] + }, + "pcre": { + "description": "Build against external libpcre", + "dependencies": [ + "pcre" + ] + }, + "pcre2": { + "description": "Build against external libpcre2", + "dependencies": [ + "pcre2" + ] + }, + "sectransp": { + "description": "SSL support (sectransp)" + }, + "ssh": { + "description": "SSH support via libssh2", + "dependencies": [ + { + "name": "libgit2", + "default-features": false, + "features": [ + "openssl" + ] + }, + "libssh2" + ] + }, + "ssl": { + "description": "Default SSL backend", + "dependencies": [ + { + "name": "libgit2", + "default-features": false, + "features": [ + "sectransp" + ], + "platform": "osx" + }, + { + "name": "libgit2", + "default-features": false, + "features": [ + "winhttp" + ], + "platform": "windows" + }, + { + "name": "libgit2", + "default-features": false, + "features": [ + "openssl" + ], + "platform": "!windows & !osx" + } + ] + }, + "winhttp": { + "description": "SSL support (WinHTTP)" + } + } +} diff --git a/externals/vcpkg/ports/libgnutls/portfile.cmake b/externals/vcpkg/ports/libgnutls/portfile.cmake new file mode 100755 index 000000000..aa83cb647 --- /dev/null +++ b/externals/vcpkg/ports/libgnutls/portfile.cmake @@ -0,0 +1,49 @@ +set(GNUTLS_BRANCH 3.6) +set(GNUTLS_VERSION ${GNUTLS_BRANCH}.15) +set(GNUTLS_HASH f757d1532198f44bcad7b73856ce6a05bab43f6fb77fcc81c59607f146202f73023d0796d3e1e7471709cf792c8ee7d436e19407e0601bc0bda2f21512b3b01c) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.gnupg.org/ftp/gcrypt/gnutls/v${GNUTLS_BRANCH}/gnutls-${GNUTLS_VERSION}.tar.xz" + FILENAME "gnutls-${GNUTLS_VERSION}.tar.xz" + SHA512 ${GNUTLS_HASH} +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF ${GNUTLS_VERSION} +) + +if(VCPKG_TARGET_IS_OSX) + set(LDFLAGS "-framework CoreFoundation") +else() + set(LDFLAGS "") +endif() + +if ("openssl" IN_LIST FEATURES) + set(OPENSSL_COMPATIBILITY "--enable-openssl-compatibility") +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + --disable-doc + --disable-silent-rules + --disable-tests + --disable-maintainer-mode + --disable-rpath + --disable-libdane + --disable-guile + --with-included-unistring + --without-p11-kit + --without-tpm + ${OPENSSL_COMPATIBILITY} + "LDFLAGS=${LDFLAGS}" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libgnutls/vcpkg.json b/externals/vcpkg/ports/libgnutls/vcpkg.json new file mode 100755 index 000000000..c09c9244e --- /dev/null +++ b/externals/vcpkg/ports/libgnutls/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "libgnutls", + "version": "3.6.15", + "port-version": 3, + "description": "A secure communications library implementing the SSL, TLS and DTLS protocols", + "homepage": "https://www.gnutls.org/", + "license": "LGPL-2.1-or-later", + "supports": "!windows", + "dependencies": [ + "gettext", + "gmp", + "libidn2", + "libtasn1", + "nettle" + ], + "features": { + "openssl": { + "description": "enables the OpenSSL compatibility library" + } + } +} diff --git a/externals/vcpkg/ports/libgo/Add-target-include-directory.patch b/externals/vcpkg/ports/libgo/Add-target-include-directory.patch new file mode 100755 index 000000000..fe4dffea1 --- /dev/null +++ b/externals/vcpkg/ports/libgo/Add-target-include-directory.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e21eee0..017cc7a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -176,6 +176,8 @@ if (WIN32) + set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/wd4819 /wd4267") + endif() + ++TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} INTERFACE $) ++ + install(TARGETS ${PROJECT_NAME} + EXPORT "${PROJECT_NAME}Config" + LIBRARY DESTINATION lib diff --git a/externals/vcpkg/ports/libgo/cmake.patch b/externals/vcpkg/ports/libgo/cmake.patch new file mode 100755 index 000000000..4f1a018d7 --- /dev/null +++ b/externals/vcpkg/ports/libgo/cmake.patch @@ -0,0 +1,114 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dfa9b72..e21eee0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,8 +1,9 @@ +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.0) + + ################################################################################### + project(libgo) + ++if(0) + enable_language(C ASM) + + if (CMAKE_BUILD_TYPE) +@@ -43,34 +44,38 @@ message("-------------- Env ---------------") + message(" CMAKE_SOURCE_DIR: ${CMAKE_SOURCE_DIR}") + message(" CMAKE_BINARY_DIR: ${CMAKE_BINARY_DIR}") + message("----------------------------------") ++endif() ++ ++enable_language(C CXX ASM) ++set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD_REQUIRED ON) ++ ++set(INSTALL_BIN_DIR "bin" CACHE PATH "Path where exe and dll will be installed") ++set(INSTALL_LIB_DIR "lib" CACHE PATH "Path where lib will be installed") ++set(INSTALL_INCLUDE_DIR "include/${PROJECT_NAME}" CACHE PATH "Path where headers will be installed") ++set(INSTALL_CMAKE_DIR "share/${PROJECT_NAME}" CACHE PATH "Path where cmake configs will be installed") ++set(RELATIVE_INSTALL_INCLUDE_DIR ${INSTALL_INCLUDE_DIR}) ++foreach(p LIB BIN INCLUDE CMAKE) ++ set(var INSTALL_${p}_DIR) ++ if(NOT IS_ABSOLUTE "${${var}}") ++ set(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}") ++ endif() ++endforeach() ++ ++set(ENABLE_DEBUGGER 0) ++set(ENABLE_HOOK 0) + + configure_file(${PROJECT_SOURCE_DIR}/libgo/common/cmake_config.h.in ${PROJECT_SOURCE_DIR}/libgo/common/cmake_config.h) + message("----------------------------------") + + if (UNIX) +- set(CMAKE_CXX_FLAGS "-std=c++11 -fPIC -Wall ${CMAKE_CXX_FLAGS}") +- set(CMAKE_CXX_FLAGS_DEBUG "-g") +- set(CMAKE_CXX_FLAGS_RELEASE "-g -O3 -DNDEBUG") +- + set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS S) +- message("--> select asm source file, please wait about 5 seconds ...") + execute_process(COMMAND "${PROJECT_SOURCE_DIR}/third_party/select_asm.sh" "${PROJECT_SOURCE_DIR}" "jump" OUTPUT_VARIABLE jump_asm_file) + execute_process(COMMAND "${PROJECT_SOURCE_DIR}/third_party/select_asm.sh" "${PROJECT_SOURCE_DIR}" "make" OUTPUT_VARIABLE make_asm_file) + elseif (WIN32) +- # windows platform + add_definitions(-D_CRT_SECURE_NO_WARNINGS) +- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd /EHsc") +- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT /EHsc") +- +- #set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS asm) +- #file(COPY ${PROJECT_SOURCE_DIR}/third_party/boost.context/libs/context/src/asm/make_x86_64_ms_pe_masm.asm DESTINATION ${PROJECT_SOURCE_DIR}/libgo/context) +- #file(COPY ${PROJECT_SOURCE_DIR}/third_party/boost.context/libs/context/src/asm/jump_x86_64_ms_pe_masm.asm DESTINATION ${PROJECT_SOURCE_DIR}/libgo/context) + endif() + +-message("------------ Cxx flags -------------") +-message(" CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}: ${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}}") +-message("------------------------------------") +- + include_directories(${PROJECT_SOURCE_DIR}) + aux_source_directory(${PROJECT_SOURCE_DIR}/libgo CO_SRC_LIST) + aux_source_directory(${PROJECT_SOURCE_DIR}/libgo/common CO_SRC_LIST) +@@ -97,6 +102,7 @@ else() + aux_source_directory(${PROJECT_SOURCE_DIR}/libgo/netio/disable_hook CO_SRC_LIST) + endif() + ++if(0) + set(TARGET "libgo") + set(STATIC_T "libgo_static") + set(STATIC_HOOK "static_hook") +@@ -136,7 +142,6 @@ if (UNIX) + ) + + set(PROFILE_FLAGS "-pg ${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}}") +- + #message("PROFILE_FLAGS: ${PROFILE_FLAGS}") + add_custom_target(profile + COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=PROFILE -DCMAKE_CXX_FLAGS_PROFILE=\\'${PROFILE_FLAGS}\\' ${CMAKE_SOURCE_DIR} +@@ -160,3 +165,27 @@ if (WIN32) + add_subdirectory(${PROJECT_SOURCE_DIR}/tutorial) + endif() + endif() ++endif() ++ ++list(APPEND CO_SRC_LIST ${jump_asm_file}) ++list(APPEND CO_SRC_LIST ${make_asm_file}) ++add_library(${PROJECT_NAME} ${CO_SRC_LIST}) ++target_link_libraries(${PROJECT_NAME} ${CMAKE_DL_LIBS}) ++if (WIN32) ++ target_link_libraries(${PROJECT_NAME} ws2_32) ++ set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/wd4819 /wd4267") ++endif() ++ ++install(TARGETS ${PROJECT_NAME} ++ EXPORT "${PROJECT_NAME}Config" ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++ RUNTIME DESTINATION bin) ++ ++install(DIRECTORY ${PROJECT_SOURCE_DIR}/libgo/ ++ DESTINATION ${INSTALL_INCLUDE_DIR} ++ FILES_MATCHING PATTERN "*.h") ++ ++install(EXPORT "${PROJECT_NAME}Config" ++ NAMESPACE libgo:: ++ DESTINATION "${INSTALL_CMAKE_DIR}") diff --git a/externals/vcpkg/ports/libgo/portfile.cmake b/externals/vcpkg/ports/libgo/portfile.cmake new file mode 100755 index 000000000..826a162b4 --- /dev/null +++ b/externals/vcpkg/ports/libgo/portfile.cmake @@ -0,0 +1,44 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO yyzybb537/libgo + REF 5d4f36508e8eb2d5aa17cf37cd951dc91da23096 #v3.1 + SHA512 0f281f58116148ba1dd3904febbc391d47190f8e148b70bed7c4b7e6cb3efa5e41e2b7be4832ceeb805996e085f4c2d89fd0cf3b0651e037b32758d6a441411b + HEAD_REF master + PATCHES + cmake.patch + Add-target-include-directory.patch +) + +vcpkg_from_github( + OUT_SOURCE_PATH XHOOK_SOURCE_PATH + REPO XBased/xhook + REF e18c450541892212ca4f11dc91fa269fabf9646f + SHA512 1bcf320f50cff13d92013a9f0ab5c818c2b6b63e9c1ac18c5dd69189e448d7a848f1678389d8b2c08c65f907afb3909e743f6c593d9cfb21e2bb67d5c294a166 + HEAD_REF master +) + +file(REMOVE_RECURSE "${SOURCE_PATH}/third_party") +file(MAKE_DIRECTORY "${SOURCE_PATH}/third_party") +file(RENAME "${XHOOK_SOURCE_PATH}" "${SOURCE_PATH}/third_party/xhook") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/libgo/netio/disable_hook") + +if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/libgo/netio/unix/static_hook") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/libgo/netio/windows") +else() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/libgo/netio/unix") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libgo/vcpkg.json b/externals/vcpkg/ports/libgo/vcpkg.json new file mode 100755 index 000000000..c8be7a4ca --- /dev/null +++ b/externals/vcpkg/ports/libgo/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "libgo", + "version": "3.1", + "port-version": 5, + "description": "The best stackful coroutine by c++11.", + "homepage": "https://github.com/yyzybb537/libgo", + "license": "MIT", + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libgpg-error/add_cflags_to_tools.patch b/externals/vcpkg/ports/libgpg-error/add_cflags_to_tools.patch new file mode 100755 index 000000000..53c86bef8 --- /dev/null +++ b/externals/vcpkg/ports/libgpg-error/add_cflags_to_tools.patch @@ -0,0 +1,30 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index fc3acc3..9a86251 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -279,14 +279,14 @@ gpg-error.def: Makefile gpg-error.def.in + # It is correct to use $(CC_FOR_BUILD) here. We want to run the + # program at build time. + mkerrcodes$(EXEEXT_FOR_BUILD): mkerrcodes.c mkerrcodes.h Makefile +- $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \ ++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CFLAGS) $(LDFLAGS_FOR_BUILD) \ + $(CPPFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkerrcodes.c + + if HAVE_W32CE_SYSTEM + # It is correct to use $(CC_FOR_BUILD) here. We want to run the + # program at build time. + mkw32errmap$(EXEEXT_FOR_BUILD): mkw32errmap.c mkw32errmap.tab.h Makefile +- $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \ ++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CFLAGS) $(LDFLAGS_FOR_BUILD) \ + $(CPPFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkw32errmap.c + endif + +@@ -300,7 +300,7 @@ errnos-sym.h: Makefile mkstrtable.awk errnos.in + + + mkheader$(EXEEXT_FOR_BUILD): mkheader.c Makefile +- $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \ ++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CFLAGS) $(LDFLAGS_FOR_BUILD) \ + $(CPPFLAGS_FOR_BUILD) -g -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c + + parts_of_gpg_error_h = \ diff --git a/externals/vcpkg/ports/libgpg-error/outdir.patch b/externals/vcpkg/ports/libgpg-error/outdir.patch new file mode 100755 index 000000000..db87bfde6 --- /dev/null +++ b/externals/vcpkg/ports/libgpg-error/outdir.patch @@ -0,0 +1,152 @@ +diff --git a/SMP/smp.props b/SMP/smp.props +index e2ed214..fc70bd8 100644 +--- a/SMP/smp.props ++++ b/SMP/smp.props +@@ -87,7 +87,7 @@ + + + lib$(RootNamespace)d +- $(ProjectDir)..\..\..\msvc\ ++ $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated + Clean +@@ -95,7 +95,7 @@ + + + lib$(RootNamespace)d +- $(ProjectDir)..\..\..\msvc\ ++ $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated + Clean +@@ -103,7 +103,7 @@ + + + $(RootNamespace)d +- $(ProjectDir)..\..\..\msvc\ ++ $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated + Clean +@@ -111,7 +111,7 @@ + + + $(RootNamespace)d +- $(ProjectDir)..\..\..\msvc\ ++ $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated + Clean +@@ -119,7 +119,7 @@ + + + lib$(RootNamespace) +- $(ProjectDir)..\..\..\msvc\ ++ $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated + Clean +@@ -127,7 +127,7 @@ + + + lib$(RootNamespace) +- $(ProjectDir)..\..\..\msvc\ ++ $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated + Clean +@@ -135,7 +135,7 @@ + + + $(RootNamespace) +- $(ProjectDir)..\..\..\msvc\ ++ $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated + Clean +@@ -143,7 +143,7 @@ + + + $(RootNamespace) +- $(ProjectDir)..\..\..\msvc\ ++ $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated + Clean +diff --git a/SMP/smp_winrt.props b/SMP/smp_winrt.props +index 9b453a5..cb5f090 100644 +--- a/SMP/smp_winrt.props ++++ b/SMP/smp_winrt.props +@@ -98,7 +98,7 @@ + + + lib$(RootNamespace)d_winrt +- $(ProjectDir)..\..\..\msvc\ ++ $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated + Clean +@@ -106,7 +106,7 @@ + + + lib$(RootNamespace)d_winrt +- $(ProjectDir)..\..\..\msvc\ ++ $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated + Clean +@@ -114,7 +114,7 @@ + + + $(RootNamespace)d_winrt +- $(ProjectDir)..\..\..\msvc\ ++ $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated + Clean +@@ -122,7 +122,7 @@ + + + $(RootNamespace)d_winrt +- $(ProjectDir)..\..\..\msvc\ ++ $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated + Clean +@@ -130,7 +130,7 @@ + + + lib$(RootNamespace)_winrt +- $(ProjectDir)..\..\..\msvc\ ++ $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated + Clean +@@ -138,7 +138,7 @@ + + + lib$(RootNamespace)_winrt +- $(ProjectDir)..\..\..\msvc\ ++ $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated + Clean +@@ -146,7 +146,7 @@ + + + $(RootNamespace)_winrt +- $(ProjectDir)..\..\..\msvc\ ++ $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated + Clean +@@ -154,7 +154,7 @@ + + + $(RootNamespace)_winrt +- $(ProjectDir)..\..\..\msvc\ ++ $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated + Clean diff --git a/externals/vcpkg/ports/libgpg-error/portfile.cmake b/externals/vcpkg/ports/libgpg-error/portfile.cmake new file mode 100755 index 000000000..cc795c59d --- /dev/null +++ b/externals/vcpkg/ports/libgpg-error/portfile.cmake @@ -0,0 +1,105 @@ +set (PACKAGE_VERSION 1.42) + +if(VCPKG_TARGET_IS_WINDOWS) + message(WARNING "libgpg-error on Windows uses a fork managed by the ShiftMediaProject: https://shiftmediaproject.github.io/") + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ShiftMediaProject/libgpg-error + REF libgpg-error-${PACKAGE_VERSION} + SHA512 2dbf41e28196f4b99d641a430e6e77566ae2d389bbe9d6f6e310d56a5ca90de9b9ae225a3eee979fe4606d36878d3db6f777162d697de717b4748151dd3525d0 + HEAD_REF master + PATCHES + outdir.patch + runtime.patch + ) + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(CONFIGURATION_RELEASE ReleaseDLL) + set(CONFIGURATION_DEBUG DebugDLL) + else() + set(CONFIGURATION_RELEASE Release) + set(CONFIGURATION_DEBUG Debug) + endif() + + if(VCPKG_TARGET_IS_UWP) + string(APPEND CONFIGURATION_RELEASE WinRT) + string(APPEND CONFIGURATION_DEBUG WinRT) + endif() + + if(VCPKG_TARGET_IS_UWP) + set(_gpg-errorproject "${SOURCE_PATH}/SMP/libgpg-error_winrt.vcxproj") + else() + set(_gpg-errorproject "${SOURCE_PATH}/SMP/libgpg-error.vcxproj") + endif() + + if(VCPKG_CRT_LINKAGE STREQUAL "static") + set(RuntimeLibraryExt "") + else() + set(RuntimeLibraryExt "DLL") + endif() + + vcpkg_install_msbuild( + USE_VCPKG_INTEGRATION + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH SMP/libgpg-error.sln + PLATFORM ${TRIPLET_SYSTEM_ARCH} + LICENSE_SUBPATH COPYING.LIB + RELEASE_CONFIGURATION ${CONFIGURATION_RELEASE} + DEBUG_CONFIGURATION ${CONFIGURATION_DEBUG} + SKIP_CLEAN + OPTIONS_DEBUG "/p:RuntimeLibrary=MultiThreadedDebug${RuntimeLibraryExt}" + OPTIONS_RELEASE "/p:RuntimeLibrary=MultiThreaded${RuntimeLibraryExt}" + ) + + get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME) + file(RENAME "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}/msvc/include" "${CURRENT_PACKAGES_DIR}/include") + + set(exec_prefix "\${prefix}") + set(libdir "\${prefix}/lib") + set(includedir "\${prefix}/include") + set(GPG_ERROR_CONFIG_LIBS "-L\${libdir} -lgpg-error") + configure_file("${SOURCE_PATH}/src/gpg-error.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gpg-error.pc" @ONLY) + + set(exec_prefix "\${prefix}") + set(libdir "\${prefix}/lib") + set(includedir "\${prefix}/../include") + set(GPG_ERROR_CONFIG_LIBS "-L\${libdir} -lgpg-errord") + configure_file("${SOURCE_PATH}/src/gpg-error.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gpg-error.pc" @ONLY) + vcpkg_fixup_pkgconfig() + vcpkg_copy_pdbs() + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/COPYING.LIB" "${CURRENT_PACKAGES_DIR}/debug/lib/COPYING.LIB") +else() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gpg/libgpg-error + REF libgpg-error-${PACKAGE_VERSION} + SHA512 f5a1c1874ac1dee36ee01504f1ab0146506aa7af810879e192eac17a31ec81945fe850953ea1c57188590c023ce3ff195c7cab62af486b731fa1534546d66ba3 + HEAD_REF master + PATCHES + add_cflags_to_tools.patch + ) + + vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + --disable-tests + --disable-doc + --disable-silent-rules + ) + + vcpkg_install_make() + vcpkg_fixup_pkgconfig() + vcpkg_copy_pdbs() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgpg-error/bin/gpg-error-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgpg-error/debug/bin/gpg-error-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") + endif() + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/locale" "${CURRENT_PACKAGES_DIR}/debug/share") + file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/externals/vcpkg/ports/libgpg-error/runtime.patch b/externals/vcpkg/ports/libgpg-error/runtime.patch new file mode 100755 index 000000000..333985081 --- /dev/null +++ b/externals/vcpkg/ports/libgpg-error/runtime.patch @@ -0,0 +1,244 @@ +diff --git a/SMP/smp.props b/SMP/smp.props +index fc70bd8..d515523 100644 +--- a/SMP/smp.props ++++ b/SMP/smp.props +@@ -86,7 +86,7 @@ + + + +- lib$(RootNamespace)d ++ $(RootNamespace)d + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated +@@ -94,7 +94,7 @@ + MSB8012 + + +- lib$(RootNamespace)d ++ $(RootNamespace)d + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated +@@ -118,7 +118,7 @@ + MSB8012 + + +- lib$(RootNamespace) ++ $(RootNamespace) + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated +@@ -126,7 +126,7 @@ + MSB8012 + + +- lib$(RootNamespace) ++ $(RootNamespace) + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated +@@ -159,6 +159,7 @@ + $(OutDir)\lib\x86\$(TargetName).pdb + false + 4113;%(TreatSpecificWarningsAsErrors) ++ $(RuntimeLibrary) + + + $(OutDir)\lib\x86\$(TargetName)$(TargetExt) +@@ -177,6 +178,7 @@ + $(OutDir)\lib\x64\$(TargetName).pdb + false + 4113;%(TreatSpecificWarningsAsErrors) ++ $(RuntimeLibrary) + + + $(OutDir)\lib\x64\$(TargetName)$(TargetExt) +@@ -196,6 +198,7 @@ + $(IntDir)$(TargetName).pdb + false + 4113;%(TreatSpecificWarningsAsErrors) ++ $(RuntimeLibrary) + + + $(OutDir)\bin\x86\$(TargetName)$(TargetExt) +@@ -219,6 +222,7 @@ + $(IntDir)$(TargetName).pdb + false + 4113;%(TreatSpecificWarningsAsErrors) ++ $(RuntimeLibrary) + + + $(OutDir)\bin\x64\$(TargetName)$(TargetExt) +@@ -248,6 +252,7 @@ + SingleFile + $(OutDir)\lib\x86\$(TargetName).pdb + 4113;%(TreatSpecificWarningsAsErrors) ++ $(RuntimeLibrary) + + + $(OutDir)\lib\x86\$(TargetName)$(TargetExt) +@@ -273,6 +278,7 @@ + SingleFile + $(OutDir)\lib\x64\$(TargetName).pdb + 4113;%(TreatSpecificWarningsAsErrors) ++ $(RuntimeLibrary) + + + $(OutDir)\lib\x64\$(TargetName)$(TargetExt) +@@ -297,6 +303,7 @@ + $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(IntDir)$(TargetName).pdb + 4113;%(TreatSpecificWarningsAsErrors) ++ $(RuntimeLibrary) + + + true +@@ -328,6 +335,7 @@ + $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) + $(IntDir)$(TargetName).pdb + 4113;%(TreatSpecificWarningsAsErrors) ++ $(RuntimeLibrary) + + + true +diff --git a/SMP/smp_winrt.props b/SMP/smp_winrt.props +index cb5f090..f7d8e23 100644 +--- a/SMP/smp_winrt.props ++++ b/SMP/smp_winrt.props +@@ -97,7 +97,7 @@ + + + +- lib$(RootNamespace)d_winrt ++ $(RootNamespace)d + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated +@@ -105,7 +105,7 @@ + MSB8012 + + +- lib$(RootNamespace)d_winrt ++ $(RootNamespace)d + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated +@@ -113,7 +113,7 @@ + MSB8012 + + +- $(RootNamespace)d_winrt ++ $(RootNamespace)d + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated +@@ -121,7 +121,7 @@ + MSB8012 + + +- $(RootNamespace)d_winrt ++ $(RootNamespace)d + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated +@@ -129,7 +129,7 @@ + MSB8012 + + +- lib$(RootNamespace)_winrt ++ $(RootNamespace) + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated +@@ -137,7 +137,7 @@ + MSB8012 + + +- lib$(RootNamespace)_winrt ++ $(RootNamespace) + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated +@@ -145,7 +145,7 @@ + MSB8012 + + +- $(RootNamespace)_winrt ++ $(RootNamespace) + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated +@@ -153,7 +153,7 @@ + MSB8012 + + +- $(RootNamespace)_winrt ++ $(RootNamespace) + $(ProjectDir)..\msvc\ + $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ + $(ProjectDir)obj\Generated +@@ -172,6 +172,7 @@ + NotUsing + false + 4113;%(TreatSpecificWarningsAsErrors) ++ $(RuntimeLibrary) + + + $(OutDir)\lib\x86\$(TargetName)$(TargetExt) +@@ -192,6 +193,7 @@ + NotUsing + false + 4113;%(TreatSpecificWarningsAsErrors) ++ $(RuntimeLibrary) + + + $(OutDir)\lib\x64\$(TargetName)$(TargetExt) +@@ -213,6 +215,7 @@ + NotUsing + false + 4113;%(TreatSpecificWarningsAsErrors) ++ $(RuntimeLibrary) + + + $(OutDir)\bin\x86\$(TargetName)$(TargetExt) +@@ -240,6 +243,7 @@ + NotUsing + false + 4113;%(TreatSpecificWarningsAsErrors) ++ $(RuntimeLibrary) + + + $(OutDir)\bin\x64\$(TargetName)$(TargetExt) +@@ -273,6 +277,7 @@ + NotUsing + false + 4113;%(TreatSpecificWarningsAsErrors) ++ $(RuntimeLibrary) + + + $(OutDir)\lib\x86\$(TargetName)$(TargetExt) +@@ -301,6 +306,7 @@ + NotUsing + false + 4113;%(TreatSpecificWarningsAsErrors) ++ $(RuntimeLibrary) + + + $(OutDir)\lib\x64\$(TargetName)$(TargetExt) +@@ -327,6 +333,7 @@ + NotUsing + false + 4113;%(TreatSpecificWarningsAsErrors) ++ $(RuntimeLibrary) + + + true +@@ -362,6 +369,7 @@ + NotUsing + false + 4113;%(TreatSpecificWarningsAsErrors) ++ $(RuntimeLibrary) + + + true diff --git a/externals/vcpkg/ports/libgpg-error/vcpkg.json b/externals/vcpkg/ports/libgpg-error/vcpkg.json new file mode 100755 index 000000000..8132e6b2d --- /dev/null +++ b/externals/vcpkg/ports/libgpg-error/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libgpg-error", + "version": "1.42", + "port-version": 3, + "description": "A common dependency of all GnuPG components", + "homepage": "https://gnupg.org/software/libgpg-error/index.html", + "supports": "!(windows & (arm | arm64))" +} diff --git a/externals/vcpkg/ports/libgpiod/portfile.cmake b/externals/vcpkg/ports/libgpiod/portfile.cmake new file mode 100755 index 000000000..68ee7eff0 --- /dev/null +++ b/externals/vcpkg/ports/libgpiod/portfile.cmake @@ -0,0 +1,42 @@ +vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH + URL git://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git + REF dfc5d361e6748d5f48b706e5c4ac949d133b5470 # v1.6.3 + PATCHES +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + list(APPEND OPTIONS --enable-shared=yes) + list(APPEND OPTIONS --enable-static=no) +else() + list(APPEND OPTIONS --enable-shared=no) + list(APPEND OPTIONS --enable-static=yes) +endif() + +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") + +if (VCPKG_DETECTED_CMAKE_CROSSCOMPILING STREQUAL "TRUE") + list(APPEND OPTIONS CC=${VCPKG_DETECTED_CMAKE_C_COMPILER}) + if (VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + list(APPEND OPTIONS ac_cv_func_malloc_0_nonnull=yes) + list(APPEND OPTIONS ac_cv_func_realloc_0_nonnull=yes) + endif() +endif() + +vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${OPTIONS} + --enable-tools=no + --enable-tests=no + --enable-bindings-cxx=no + --enable-bindings-python=no +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/libgpiod/vcpkg.json b/externals/vcpkg/ports/libgpiod/vcpkg.json new file mode 100755 index 000000000..cf31258e3 --- /dev/null +++ b/externals/vcpkg/ports/libgpiod/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "libgpiod", + "version": "1.6.3", + "port-version": 1, + "description": "C library and tools for interacting with the linux GPIO character device", + "homepage": "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git", + "license": "LGPL-2.1-or-later", + "supports": "linux & (x64 | arm64)", + "dependencies": [ + { + "name": "vcpkg-cmake-get-vars", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libgpod/configure.ac.patch b/externals/vcpkg/ports/libgpod/configure.ac.patch new file mode 100755 index 000000000..53ca42c2d --- /dev/null +++ b/externals/vcpkg/ports/libgpod/configure.ac.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index a52ac3a78..ac5cf03f4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -42,7 +42,7 @@ AC_CHECK_FUNCS([localtime_r]) + AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[#include ]) + dnl sqlite3 is needed for newer ipod models (nano5g), and libplist is needed + dnl by libgpod sqlite code +-PKG_CHECK_MODULES(LIBGPOD, glib-2.0 >= 2.8.0 gobject-2.0 sqlite3 libplist >= 1.0) ++PKG_CHECK_MODULES(LIBGPOD, glib-2.0 >= 2.8.0 gmodule-2.0 gobject-2.0 sqlite3 libplist >= 1.0) + + dnl ************************************************** + dnl we've copied gchecksum from glib 2.16. Only use the diff --git a/externals/vcpkg/ports/libgpod/portfile.cmake b/externals/vcpkg/ports/libgpod/portfile.cmake new file mode 100755 index 000000000..b5ff21b53 --- /dev/null +++ b/externals/vcpkg/ports/libgpod/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO fadingred/libgpod + REF 4a8a33ef4bc58eee1baca6793618365f75a5c3fa + SHA512 b7a120c1106c1205e8de2808de5ac4ff1cf189943017939a5ea4eded4e1ceef44557587e69a8591cc5249f8c8dbf0cbdcce1dd309d33a0e9207b0560abe3ae39 + HEAD_REF master + PATCHES configure.ac.patch +) + +vcpkg_execute_required_process( + COMMAND intltoolize --force --copy --automake + WORKING_DIRECTORY "${SOURCE_PATH}" + LOGNAME intltoolize-${TARGET_TRIPLET} +) +vcpkg_execute_required_process( + COMMAND gtkdocize --copy + WORKING_DIRECTORY "${SOURCE_PATH}" + LOGNAME gtkdocize-${TARGET_TRIPLET} +) +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + OPTIONS + --without-hal + --disable-gdk-pixbuf + --disable-pygobject + --disable-more-warnings + --disable-libxml + --disable-gtk-doc-html +) +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(COPY ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libgpod/vcpkg.json b/externals/vcpkg/ports/libgpod/vcpkg.json new file mode 100755 index 000000000..550993c57 --- /dev/null +++ b/externals/vcpkg/ports/libgpod/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "libgpod", + "version-date": "2019-08-29", + "port-version": 4, + "description": "libgpod is a library meant to abstract access to an iPod content.", + "homepage": "https://github.com/fadingred/libgpod", + "supports": "!windows & !osx", + "dependencies": [ + "glib", + "libplist", + "sqlite3" + ] +} diff --git a/externals/vcpkg/ports/libgta/portfile.cmake b/externals/vcpkg/ports/libgta/portfile.cmake new file mode 100755 index 000000000..65409dc33 --- /dev/null +++ b/externals/vcpkg/ports/libgta/portfile.cmake @@ -0,0 +1,37 @@ +set(LIBGTA_VERSION 1.0.8) +set(LIBGTA_HASH 99ec3d6317c9a12cf440a60bb989cc7a3fe35e0a1da3e65206e5cd52b69fb860850e61ea0f819511ef48ddc87c468c0ded710409990627096738886e1b358423) + +vcpkg_download_distfile(ARCHIVE + URLS "http://download.savannah.nongnu.org/releases/gta/libgta-1.0.8.tar.xz" + FILENAME "libgta-${LIBGTA_VERSION}.tar.xz" + SHA512 ${LIBGTA_HASH}) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${LIBGTA_VERSION} +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED_LIBS) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC_LIBS) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DGTA_BUILD_SHARED_LIB=${ENABLE_SHARED_LIBS} + -DGTA_BUILD_STATIC_LIB=${ENABLE_STATIC_LIBS} + -DGTA_BUILD_DOCUMENTATION=OFF +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) +endif() + +file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libgta) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/libgta/COPYING ${CURRENT_PACKAGES_DIR}/share/libgta/copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/libgta/vcpkg.json b/externals/vcpkg/ports/libgta/vcpkg.json new file mode 100755 index 000000000..40aeadb4c --- /dev/null +++ b/externals/vcpkg/ports/libgta/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libgta", + "version-string": "1.0.8", + "port-version": 3, + "description": "Libgta is a portable library that implements the Generic Tagged Array (GTA) file format.", + "homepage": "https://download.savannah.nongnu.org/releases/gta", + "dependencies": [ + "bzip2", + "liblzma", + "zlib" + ] +} diff --git a/externals/vcpkg/ports/libguarded/portfile.cmake b/externals/vcpkg/ports/libguarded/portfile.cmake new file mode 100755 index 000000000..dd6b93686 --- /dev/null +++ b/externals/vcpkg/ports/libguarded/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO copperspice/cs_libguarded + REF 1f159aa866a50f5d2952de41d8a99821b8ec37df + SHA512 91380262e65ec7b8990c500c60b8d141960be24b69e01a4661c2e8fbfdb8e315c9a4509c2c65a74bc60a8fe690d6dbc8f2b39757d13da5068c95283a19d4c6c4 + HEAD_REF master +) + +File(COPY ${SOURCE_PATH}/src/libguarded DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libguarded/vcpkg.json b/externals/vcpkg/ports/libguarded/vcpkg.json new file mode 100755 index 000000000..d6bc46396 --- /dev/null +++ b/externals/vcpkg/ports/libguarded/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libguarded", + "version-string": "2019-08-27", + "port-version": 2, + "description": "The libGuarded library is a standalone header-only library for multithreaded programming.", + "homepage": "https://github.com/copperspice/libguarded" +} diff --git a/externals/vcpkg/ports/libgwenhywfar/portfile.cmake b/externals/vcpkg/ports/libgwenhywfar/portfile.cmake new file mode 100755 index 000000000..3ea00a459 --- /dev/null +++ b/externals/vcpkg/ports/libgwenhywfar/portfile.cmake @@ -0,0 +1,71 @@ +set(VERSION_MAJOR 5) +set(VERSION_MINOR 6) +set(VERSION_PATCH 0) +set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.aquamaniac.de/rdm/attachments/download/364/gwenhywfar-${VERSION}.tar.gz" + FILENAME "gwenhywfar-${VERSION}.tar.gz" + SHA512 9875d677f49fc0a46f371fd1954d15d99c7d5994e90b16f1be7a5b8a1cbcd74ae9733e4541afd6d8251a2ba1a0a37c28e0f248952b7c917313fbf5b38b1d8d11 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${VERSION} +) + +if ("libxml2" IN_LIST FEATURES) + set(WITH_LIBXML2_CODE "--with-libxml2-code=yes") +endif() +if ("cpp" IN_LIST FEATURES) + list(APPEND FEATURES_GUI "cpp") +endif() +if ("qt5" IN_LIST FEATURES) + list(APPEND FEATURES_GUI "qt5") +endif() + +list(JOIN FEATURES_GUI " " GUIS) + +if(VCPKG_TARGET_IS_OSX) + set(LDFLAGS "-framework CoreFoundation -framework Security") +else() + set(LDFLAGS "") +endif() + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + --disable-silent-rules + --disable-binreloc + --with-guis=${GUIS} + --with-libgpg-error-prefix=${CURRENT_INSTALLED_DIR}/tools/libgpg-error + --with-libgcrypt-prefix=${CURRENT_INSTALLED_DIR}/tools/libgcrypt + --with-qt5-qmake=${CURRENT_INSTALLED_DIR}/tools/qt5/bin/qmake + --with-qt5-moc=${CURRENT_INSTALLED_DIR}/tools/qt5/bin/moc + --with-qt5-uic=${CURRENT_INSTALLED_DIR}/tools/qt5/bin/uic + ${WITH_LIBXML2_CODE} + "LDFLAGS=${LDFLAGS}" +) + +vcpkg_install_make() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +foreach(GUI IN LISTS FEATURES_GUI) + vcpkg_cmake_config_fixup(PACKAGE_NAME gwengui-cpp CONFIG_PATH lib/cmake/gwengui-${GUI}-${VERSION_MAJOR}.${VERSION_MINOR} DO_NOT_DELETE_PARENT_CONFIG_PATH) +endforeach() +vcpkg_cmake_config_fixup(PACKAGE_NAME gwenhywfar CONFIG_PATH lib/cmake/gwenhywfar-${VERSION_MAJOR}.${VERSION_MINOR}) + +if ("tools" IN_LIST FEATURES) + vcpkg_copy_tools(SEARCH_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin TOOL_NAMES gct-tool gsa mklistdoc typemaker typemaker2 xmlmerge AUTO_CLEAN) +endif() + +# the `dir` variable is not used in the script +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgwenhywfar/bin/gwenhywfar-config" "dir=\"${CURRENT_INSTALLED_DIR}\"" "") +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgwenhywfar/debug/bin/gwenhywfar-config" "dir=\"${CURRENT_INSTALLED_DIR}/debug\"" "") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libgwenhywfar/vcpkg.json b/externals/vcpkg/ports/libgwenhywfar/vcpkg.json new file mode 100755 index 000000000..6c56ae3f8 --- /dev/null +++ b/externals/vcpkg/ports/libgwenhywfar/vcpkg.json @@ -0,0 +1,45 @@ +{ + "name": "libgwenhywfar", + "version-semver": "5.6.0", + "port-version": 2, + "description": "A helper library for networking and security applications and libraries", + "homepage": "https://www.aquamaniac.de/rdm/", + "supports": "!windows", + "dependencies": [ + "libgcrypt", + { + "name": "libgnutls", + "features": [ + "openssl" + ] + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "cpp", + "libxml2" + ], + "features": { + "cpp": { + "description": "C++ bindings" + }, + "libxml2": { + "description": "Enables libXML2-depending functionality", + "dependencies": [ + "libxml2" + ] + }, + "qt5": { + "description": "Qt bindings", + "dependencies": [ + "qt5-base" + ] + }, + "tools": { + "description": "Some helper tools provided by Gwenhywfar and useful for applications using it" + } + } +} diff --git a/externals/vcpkg/ports/libgxps/libgxps-0.3.2_fix_meson_warnings.patch b/externals/vcpkg/ports/libgxps/libgxps-0.3.2_fix_meson_warnings.patch new file mode 100755 index 000000000..875f55c75 --- /dev/null +++ b/externals/vcpkg/ports/libgxps/libgxps-0.3.2_fix_meson_warnings.patch @@ -0,0 +1,55 @@ +From a18e12604d2cab13146a357c7fd3b80909b65efd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= +Date: Thu, 9 Sep 2021 17:59:13 +0200 +Subject: [PATCH] Fix meson warnings + +- Deduplicate "libraries" in pkgg.generate() + Fixes: + libgxps/meson.build:101: WARNING: Keyword argument "libraries" + defined multiple times. + WARNING: This will be an error in future Meson releases. +- Increase required meson_version from 0.43.0 to 0.50.0 due to usage + of install arg in libgxps/meson.build:63: + Fixes: + WARNING: Project targeting '>= 0.43.0' but tried to use feature + introduced in '0.50.0': install arg in configure_file. +--- + libgxps/meson.build | 5 ++--- + meson.build | 2 +- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/libgxps/meson.build b/libgxps/meson.build +index 29b044e..52d53d0 100644 +--- a/libgxps/meson.build ++++ b/libgxps/meson.build +@@ -98,12 +98,11 @@ pkgg = import('pkgconfig') + cairo_dep_str = cairo_pc_found ? ', cairo >= ' + cairo_req : '' + cairo_dep_libs = cairo_pc_found ? [] : cairo_dep + +-pkgg.generate(libraries: gxps, ++pkgg.generate(libraries: [gxps, cairo_dep_libs], + version: gxps_version, + name: 'libgxps', + description: 'XPS Documents library', +- requires: 'gobject-2.0 >= ' + glib_req + ', gio-2.0 >= ' + glib_req + ', libarchive >= ' + archive_req + cairo_dep_str, +- libraries: [gxps, cairo_dep_libs]) ++ requires: 'gobject-2.0 >= ' + glib_req + ', gio-2.0 >= ' + glib_req + ', libarchive >= ' + archive_req + cairo_dep_str) + + if build_gir + gir_extra_args = [ +diff --git a/meson.build b/meson.build +index 07c8cc2..c6780c9 100644 +--- a/meson.build ++++ b/meson.build +@@ -4,7 +4,7 @@ project('libgxps', 'c', + 'buildtype=debugoptimized' + ], + license: 'LGPL2+', +- meson_version: '>= 0.43.0') ++ meson_version: '>= 0.50.0') + + gxps_version = meson.project_version() + version_array = gxps_version.split('.') +-- +GitLab + diff --git a/externals/vcpkg/ports/libgxps/portfile.cmake b/externals/vcpkg/ports/libgxps/portfile.cmake new file mode 100755 index 000000000..d7dd89ba2 --- /dev/null +++ b/externals/vcpkg/ports/libgxps/portfile.cmake @@ -0,0 +1,34 @@ +set(LIBGXPS_VERSION 0.3.2) +string(SUBSTRING ${LIBGXPS_VERSION} 0 3 MAJOR_MINOR) # e.g. 0.3 + +vcpkg_download_distfile(ARCHIVE + URLS "https://download.gnome.org/sources/${PORT}/${MAJOR_MINOR}/${PORT}-${LIBGXPS_VERSION}.tar.xz" + FILENAME "${PORT}-${LIBGXPS_VERSION}.tar.xz" + SHA512 d3d56e4906477b68d088bf83bde666f9ea8bf383add592772aad53dd571e727f1bc0410dd020e12212ede5ff8e26cb46150a9860a6f7af29c4d195f03e946fe9 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${LIBGXPS_VERSION} + PATCHES + "${CMAKE_CURRENT_LIST_DIR}/libgxps-0.3.2_fix_meson_warnings.patch" # https://gitlab.gnome.org/GNOME/libgxps/-/commit/a18e1260 +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${OPTIONS} + -Ddisable-introspection=true + -Denable-test=false + -Dwith-libjpeg=true + -Dwith-liblcms2=true + -Dwith-libtiff=true +) + +vcpkg_install_meson() + +vcpkg_fixup_pkgconfig() + +vcpkg_copy_tools(TOOL_NAMES xpstojpeg xpstopdf xpstopng xpstops xpstosvg AUTO_CLEAN) + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libgxps/vcpkg.json b/externals/vcpkg/ports/libgxps/vcpkg.json new file mode 100755 index 000000000..e052c37d9 --- /dev/null +++ b/externals/vcpkg/ports/libgxps/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "libgxps", + "version": "0.3.2", + "port-version": 1, + "description": "libgxps is a GObject based library for handling and rendering XPS documents.", + "homepage": "https://wiki.gnome.org/Projects/libgxps", + "dependencies": [ + "cairo", + "glib", + "lcms", + "libarchive", + "libjpeg-turbo", + "libpng", + "libxslt", + "tiff", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libharu/add-boolean-typedef.patch b/externals/vcpkg/ports/libharu/add-boolean-typedef.patch new file mode 100755 index 000000000..7768ed301 --- /dev/null +++ b/externals/vcpkg/ports/libharu/add-boolean-typedef.patch @@ -0,0 +1,12 @@ +diff --git a/include/hpdf.h b/include/hpdf.h +index 1cf0dd9..cce9b59 100644 +--- a/include/hpdf.h ++++ b/include/hpdf.h +@@ -54,6 +54,7 @@ + #include "hpdf_types.h" + + typedef void *HPDF_HANDLE; ++typedef HPDF_HANDLE HPDF_Boolean; + typedef HPDF_HANDLE HPDF_Doc; + typedef HPDF_HANDLE HPDF_Page; + typedef HPDF_HANDLE HPDF_Pages; diff --git a/externals/vcpkg/ports/libharu/fix-build-fail.patch b/externals/vcpkg/ports/libharu/fix-build-fail.patch new file mode 100755 index 000000000..2f7066575 --- /dev/null +++ b/externals/vcpkg/ports/libharu/fix-build-fail.patch @@ -0,0 +1,21 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9d2a604..be8e964 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -79,11 +79,11 @@ if(LIBHPDF_STATIC) + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin + ) +- if(WIN32 AND NOT CYGWIN) +- foreach(addlib ${ADDITIONAL_LIBRARIES}) +- install(FILES ${addlib} DESTINATION lib) +- endforeach(addlib) +- endif(WIN32 AND NOT CYGWIN) ++ #if(WIN32 AND NOT CYGWIN) ++ #foreach(addlib ${ADDITIONAL_LIBRARIES}) ++ #install(FILES ${addlib} DESTINATION lib) ++ #endforeach(addlib) ++ #endif(WIN32 AND NOT CYGWIN) + endif(LIBHPDF_STATIC) + if(LIBHPDF_SHARED) + add_library(${LIBHPDF_NAME} SHARED ${LIBHPDF_SRCS}) diff --git a/externals/vcpkg/ports/libharu/portfile.cmake b/externals/vcpkg/ports/libharu/portfile.cmake new file mode 100755 index 000000000..20c595254 --- /dev/null +++ b/externals/vcpkg/ports/libharu/portfile.cmake @@ -0,0 +1,88 @@ +if("notiffsymbols" IN_LIST FEATURES) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(DISABLETIFF tiff.patch) + endif() +endif() +vcpkg_download_distfile(SHADING_PR + URLS "https://github.com/libharu/libharu/pull/157.diff" + FILENAME "libharu-shading-pr-157.patch" + SHA512 f2ddb22b54b4eccc79400b6a4b2d245a221898f75456a5a559523eab7a523a87dfc5dfd0ec5fb17a771697e03c7ea6ed4c6095eff73e0a4302cd6eb24584c957 +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libharu/libharu + REF d84867ebf9f3de6afd661d2cdaff102457fbc371 + SHA512 789579dd52c1056ae90a4ce5360c26ba92cadae5341a3901c4159afe624129a1f628fa6412952a398e048b0e5040c93f7ed5b4e4bc620a22d897098298fe2a99 + HEAD_REF master + PATCHES + fix-build-fail.patch + add-boolean-typedef.patch + # This patch adds shading support which is required for VTK. If desired, this could be moved into an on-by-default feature. + ${SHADING_PR} + ${DISABLETIFF} +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(VCPKG_BUILD_SHARED_LIBS ON) + set(VCPKG_BUILD_STATIC_LIBS OFF) +else() + set(VCPKG_BUILD_SHARED_LIBS OFF) + set(VCPKG_BUILD_STATIC_LIBS ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DLIBHPDF_STATIC=${VCPKG_BUILD_STATIC_LIBS} + -DLIBHPDF_SHARED=${VCPKG_BUILD_SHARED_LIBS} +) + +vcpkg_cmake_install() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libhpdfs.lib" "${CURRENT_PACKAGES_DIR}/lib/libhpdf.lib") + endif() + if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfsd.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfd.lib") + endif() + else() + if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libhpdfs.a" "${CURRENT_PACKAGES_DIR}/lib/libhpdf.a") + endif() + if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfs.a" "${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfd.a") + endif() + endif() +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/README" + "${CURRENT_PACKAGES_DIR}/debug/CHANGES" + "${CURRENT_PACKAGES_DIR}/debug/INSTALL" + "${CURRENT_PACKAGES_DIR}/README" + "${CURRENT_PACKAGES_DIR}/CHANGES" + "${CURRENT_PACKAGES_DIR}/INSTALL" +) + +file(READ "${CURRENT_PACKAGES_DIR}/include/hpdf.h" _contents) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + string(REPLACE "#ifdef HPDF_DLL\n" "#if 1\n" _contents "${_contents}") +else() + string(REPLACE "#ifdef HPDF_DLL\n" "#if 0\n" _contents "${_contents}") +endif() +file(WRITE "${CURRENT_PACKAGES_DIR}/include/hpdf.h" "${_contents}") + +file(READ "${CURRENT_PACKAGES_DIR}/include/hpdf_types.h" _contents) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + string(REPLACE "#ifdef HPDF_DLL\n" "#if 1\n" _contents "${_contents}") +else() + string(REPLACE "#ifdef HPDF_DLL\n" "#if 0\n" _contents "${_contents}") +endif() +file(WRITE "${CURRENT_PACKAGES_DIR}/include/hpdf_types.h" "${_contents}") + +vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/LICENCE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libharu/tiff.patch b/externals/vcpkg/ports/libharu/tiff.patch new file mode 100755 index 000000000..2aabbe32e --- /dev/null +++ b/externals/vcpkg/ports/libharu/tiff.patch @@ -0,0 +1,25 @@ +diff --git a/src/hpdf_image_ccitt.c b/src/hpdf_image_ccitt.c +index 2937fc90d..a1a35d0ed 100644 +--- a/src/hpdf_image_ccitt.c ++++ b/src/hpdf_image_ccitt.c +@@ -21,7 +21,6 @@ + #include + #include + +-#define G3CODES + #include "t4.h" + + typedef unsigned int uint32; +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 354ca7526..ee301d9af 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -99,6 +99,8 @@ if(PNG_FOUND) + set(ADDITIONAL_LIBRARIES ${ADDITIONAL_LIBRARIES} ${PNG_LIBRARIES}) + endif(PNG_FOUND) + ++find_package(TIFF REQUIRED) ++list(APPEND ADDITIONAL_LIBRARIES TIFF::TIFF) + + # ======================================================================= + # configure header files, add compiler flags diff --git a/externals/vcpkg/ports/libharu/vcpkg.json b/externals/vcpkg/ports/libharu/vcpkg.json new file mode 100755 index 000000000..76537e89f --- /dev/null +++ b/externals/vcpkg/ports/libharu/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "libharu", + "version-string": "2017-08-15", + "port-version": 10, + "description": "libharu - free PDF library", + "homepage": "https://github.com/libharu/libharu", + "dependencies": [ + "libpng", + { + "name": "vcpkg-cmake", + "host": true + }, + "zlib" + ], + "default-features": [ + "notiffsymbols" + ], + "features": { + "notiffsymbols": { + "description": "disable symbols also defined by the tiff port", + "dependencies": [ + "tiff" + ] + } + } +} diff --git a/externals/vcpkg/ports/libhdfs3/libhdfs3Config.cmake b/externals/vcpkg/ports/libhdfs3/libhdfs3Config.cmake new file mode 100755 index 000000000..ed672579e --- /dev/null +++ b/externals/vcpkg/ports/libhdfs3/libhdfs3Config.cmake @@ -0,0 +1,17 @@ + +FUNCTION(SET_LIBRARY_TARGET NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR) + ADD_LIBRARY(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED) + SET_TARGET_PROPERTIES(${NAMESPACE}::${LIB_NAME} PROPERTIES + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}" + IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}" + INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}" + ) + SET(${NAMESPACE}_${LIB_NAME}_FOUND 1) +ENDFUNCTION() + +GET_FILENAME_COMPONENT(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) +GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH) +GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH) + +SET_LIBRARY_TARGET("HDFS" "hdfs3" "${ROOT}/debug/lib/libhdfs3.a" "${ROOT}/lib/libhdfs3.a" "${ROOT}/include/hdfs") diff --git a/externals/vcpkg/ports/libhdfs3/portfile.cmake b/externals/vcpkg/ports/libhdfs3/portfile.cmake new file mode 100755 index 000000000..a656d149f --- /dev/null +++ b/externals/vcpkg/ports/libhdfs3/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO erikmuttersbach/libhdfs3 + REF 9a60d79812d6dee72455f61bff57a93c3c7d56f5 + SHA512 2b635ab979230c251243f01717105872245d7948f75832e58f50a09b0b06d1b366b3c5f3a3253fa538076e9f199003f28d10b9958293144dbc301276073a0633 + HEAD_REF apache-rpc-9 +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/libhdfs3Config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/externals/vcpkg/ports/libhdfs3/usage b/externals/vcpkg/ports/libhdfs3/usage new file mode 100755 index 000000000..780d82d25 --- /dev/null +++ b/externals/vcpkg/ports/libhdfs3/usage @@ -0,0 +1,4 @@ +The package libhdfs3 is compatible with built-in CMake targets: + + FIND_PACKAGE(libhdfs3 REQUIRED) + TARGET_LINK_LIBRARIES(main PRIVATE HDFS::hdfs3) diff --git a/externals/vcpkg/ports/libhdfs3/vcpkg.json b/externals/vcpkg/ports/libhdfs3/vcpkg.json new file mode 100755 index 000000000..050bcb5ee --- /dev/null +++ b/externals/vcpkg/ports/libhdfs3/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "libhdfs3", + "version-date": "2019-11-05", + "port-version": 3, + "description": "Native Hadoop RPC protocol and HDFS data transfer protocol implementation", + "homepage": "https://github.com/erikmuttersbach/libhdfs3", + "supports": "!windows", + "dependencies": [ + "boost", + { + "name": "libuuid", + "platform": "!windows & !osx" + }, + "libxml2", + "protobuf" + ] +} diff --git a/externals/vcpkg/ports/libheif/gdk-pixbuf.patch b/externals/vcpkg/ports/libheif/gdk-pixbuf.patch new file mode 100755 index 000000000..ad2c1e5ae --- /dev/null +++ b/externals/vcpkg/ports/libheif/gdk-pixbuf.patch @@ -0,0 +1,25 @@ +diff --git a/gdk-pixbuf/CMakeLists.txt b/gdk-pixbuf/CMakeLists.txt +index 85ad59708..d6aa4a5f9 100644 +--- a/gdk-pixbuf/CMakeLists.txt ++++ b/gdk-pixbuf/CMakeLists.txt +@@ -1,9 +1,9 @@ + if(UNIX) + find_package(PkgConfig) + find_package(Threads) +- pkg_check_modules(GDKPIXBUF2 gdk-pixbuf-2.0) ++ pkg_check_modules(GDKPIXBUF2 gdk-pixbuf-2.0 IMPORTED_TARGET) + + if(GDKPIXBUF2_FOUND) +- execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} gdk-pixbuf-2.0 --variable gdk_pixbuf_moduledir --define-variable=prefix=${CMAKE_INSTALL_PREFIX} OUTPUT_VARIABLE GDKPIXBUF2_MODULE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) ++ pkg_get_variable(GDKPIXBUF2_MODULE_DIR gdk-pixbuf-2.0 gdk_pixbuf_moduledir) + + add_library(pixbufloader-heif MODULE pixbufloader-heif.c) +@@ -13,7 +13,7 @@ if(UNIX) + ${GDKPIXBUF2_INCLUDE_DIRS} + ${libheif_BINARY_DIR} + ${libheif_SOURCE_DIR}) +- target_link_libraries(pixbufloader-heif PUBLIC ${GDKPIXBUF2_LIBRARIES} heif) ++ target_link_libraries(pixbufloader-heif PUBLIC PkgConfig::GDKPIXBUF2 heif) + + install(TARGETS pixbufloader-heif LIBRARY DESTINATION ${GDKPIXBUF2_MODULE_DIR}) + endif() diff --git a/externals/vcpkg/ports/libheif/portfile.cmake b/externals/vcpkg/ports/libheif/portfile.cmake new file mode 100755 index 000000000..bde4f5b17 --- /dev/null +++ b/externals/vcpkg/ports/libheif/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO strukturag/libheif + REF 56c8a2613370562fc330af2c70c1510aa5fd9ff6 #v1.12.0 + SHA512 11ac7f32d1f49963046b1a4479a41f39004475211563ba7f41b2398f07f7b4d90339ea663e528b3cc80deeef1fff374987208d48b447116a806564ef05487e97 + HEAD_REF master + PATCHES + gdk-pixbuf.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DWITH_EXAMPLES=OFF + -DWITH_DAV1D=OFF +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libheif/) +# libheif's pc file assumes libstdc++, which isn't always true. +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libheif.pc" " -lstdc++" "") +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libheif.pc" " -lstdc++" "") +endif() +vcpkg_fixup_pkgconfig() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libheif/heif.h" "!defined(LIBHEIF_STATIC_BUILD)" "1") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libheif/heif.h" "!defined(LIBHEIF_STATIC_BUILD)" "0") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libheif/vcpkg.json b/externals/vcpkg/ports/libheif/vcpkg.json new file mode 100755 index 000000000..957f728f4 --- /dev/null +++ b/externals/vcpkg/ports/libheif/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "libheif", + "version": "1.12.0", + "port-version": 3, + "description": "Open h.265 video codec implementation.", + "homepage": "http://www.libheif.org/", + "license": "LGPL-3.0-only", + "dependencies": [ + { + "name": "gdk-pixbuf", + "platform": "!windows" + }, + "libde265", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "x265" + ] +} diff --git a/externals/vcpkg/ports/libhsplasma/portfile.cmake b/externals/vcpkg/ports/libhsplasma/portfile.cmake new file mode 100755 index 000000000..e805e844f --- /dev/null +++ b/externals/vcpkg/ports/libhsplasma/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO H-uru/libhsplasma + REF 2327302a62b891f551b5f6daf899cf86997dce72 # 2022.05.19 + SHA512 89755e502e4a66a56013e3ff52c8d0c2350e5681be49c1b47f580591e3c3da24c587dee5af4f9524ea43f2d86f24ecef611d62d6045b293eb8d09cd5f0ac3d18 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + net ENABLE_NET +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} + -DENABLE_PHYSX=OFF + -DENABLE_PYTHON=OFF + -DENABLE_TOOLS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME HSPlasma CONFIG_PATH share/cmake/HSPlasma) + +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libhsplasma/vcpkg.json b/externals/vcpkg/ports/libhsplasma/vcpkg.json new file mode 100755 index 000000000..44639e11c --- /dev/null +++ b/externals/vcpkg/ports/libhsplasma/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "libhsplasma", + "version-date": "2022-05-19", + "description": "Cross-platform Plasma data and network library", + "homepage": "https://github.com/H-uru/libhsplasma", + "license": "GPL-3.0-or-later", + "supports": "!(arm | uwp)", + "dependencies": [ + "libjpeg-turbo", + "libpng", + "string-theory", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "features": { + "net": { + "description": "Network functionality", + "dependencies": [ + "openssl" + ] + } + } +} diff --git a/externals/vcpkg/ports/libhv/fix-export_cmake.patch b/externals/vcpkg/ports/libhv/fix-export_cmake.patch new file mode 100755 index 000000000..23f71cf65 --- /dev/null +++ b/externals/vcpkg/ports/libhv/fix-export_cmake.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f478fb4..1e3556a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -196,9 +196,10 @@ list_source_directories(LIBHV_SRCS ${LIBHV_SRCDIRS}) + if(BUILD_SHARED) + add_library(hv SHARED ${LIBHV_SRCS}) + target_compile_definitions(hv PRIVATE HV_DYNAMICLIB) +- target_include_directories(hv PRIVATE ${LIBHV_SRCDIRS}) ++ target_include_directories(hv PRIVATE ${LIBHV_SRCDIRS} INTERFACE $) + target_link_libraries(hv ${LIBS}) + install(TARGETS hv ++ EXPORT libhvConfig + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin) +@@ -208,14 +209,17 @@ endif() + if(BUILD_STATIC) + add_library(hv_static STATIC ${LIBHV_SRCS}) + target_compile_definitions(hv_static PRIVATE HV_STATICLIB) +- target_include_directories(hv_static PRIVATE ${LIBHV_SRCDIRS}) ++ target_include_directories(hv_static PRIVATE ${LIBHV_SRCDIRS} INTERFACE $) + target_link_libraries(hv_static ${LIBS}) +- install(TARGETS hv_static DESTINATION lib) ++ install(TARGETS hv_static ++ EXPORT libhvConfig ++ ARCHIVE DESTINATION lib) + add_custom_target(libhv_static DEPENDS hv_static) + endif() + + file(INSTALL ${LIBHV_HEADERS} DESTINATION include/hv) + install(FILES ${LIBHV_HEADERS} DESTINATION include/hv) ++install(EXPORT libhvConfig DESTINATION lib/cmake/libhv) + + if(BUILD_SHARED) + set(HV_LIBRARIES hv CACHE INTERNAL "link hv libraries") diff --git a/externals/vcpkg/ports/libhv/fix-find_package.patch b/externals/vcpkg/ports/libhv/fix-find_package.patch new file mode 100755 index 000000000..6ec8b7078 --- /dev/null +++ b/externals/vcpkg/ports/libhv/fix-find_package.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cd9d1c3..e707884 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -112,7 +112,10 @@ endif() + + if(WITH_OPENSSL) + add_definitions(-DWITH_OPENSSL) +- set(LIBS ${LIBS} ssl crypto) ++ find_package(OpenSSL REQUIRED) ++ if(OpenSSL_FOUND) ++ set(LIBS ${LIBS} OpenSSL::SSL OpenSSL::Crypto) ++ endif() + endif() + + if(WITH_GNUTLS) +@@ -197,6 +200,7 @@ if(BUILD_STATIC) + add_library(hv_static STATIC ${LIBHV_SRCS}) + target_compile_definitions(hv_static PRIVATE HV_STATICLIB) + target_include_directories(hv_static PRIVATE ${LIBHV_SRCDIRS}) ++ target_link_libraries(hv_static ${LIBS}) + install(TARGETS hv_static DESTINATION lib) + add_custom_target(libhv_static DEPENDS hv_static) + endif() diff --git a/externals/vcpkg/ports/libhv/portfile.cmake b/externals/vcpkg/ports/libhv/portfile.cmake new file mode 100755 index 000000000..4325455fd --- /dev/null +++ b/externals/vcpkg/ports/libhv/portfile.cmake @@ -0,0 +1,46 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ithewei/libhv + REF v1.2.4 + SHA512 5732800970180294DCEB329F25D22B1A7178739A2A5A2CE32E030F4FD38055A6298797D26E7FF5525AC662059FF0AAEDB8ABC200E0BA9E4EEBEB5846FB53F4D0 + HEAD_REF master + PATCHES + fix-find_package.patch + fix-export_cmake.patch #Sync up the upstream changes +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + ssl WITH_OPENSSL +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_UNITTEST=OFF + -DBUILD_STATIC=${BUILD_STATIC} + -DBUILD_SHARED=${BUILD_SHARED} + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libhv) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/hv.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/hv.dll" "${CURRENT_PACKAGES_DIR}/bin/hv.dll") +endif() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/hv.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/hv.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/hv.dll") +endif() diff --git a/externals/vcpkg/ports/libhv/vcpkg.json b/externals/vcpkg/ports/libhv/vcpkg.json new file mode 100755 index 000000000..ed0479840 --- /dev/null +++ b/externals/vcpkg/ports/libhv/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "libhv", + "version": "1.2.4", + "port-version": 2, + "description": "Libhv is a C/C++ network library similar to libevent/libuv.", + "homepage": "https://github.com/ithewei/libhv", + "license": "BSD-3-Clause", + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "ssl": { + "description": "with openssl library", + "dependencies": [ + "openssl" + ] + } + } +} diff --git a/externals/vcpkg/ports/libhydrogen/portfile.cmake b/externals/vcpkg/ports/libhydrogen/portfile.cmake new file mode 100755 index 000000000..2b888db86 --- /dev/null +++ b/externals/vcpkg/ports/libhydrogen/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jedisct1/libhydrogen + REF 01c32862f6f6e864c113efc3f0142e05ea3531fe #2021-12-02 + SHA512 016181db4573a1ab31547fbfb51e19fa09e4ee4e0e788434a7654921956a02547b55eda14ccfea98425f4f615fb90e0534c5e1010d5320c1958b65b0489a2931 + HEAD_REF master + PATCHES remove-tests.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/hydrogen) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/libhydrogen/remove-tests.patch b/externals/vcpkg/ports/libhydrogen/remove-tests.patch new file mode 100755 index 000000000..399e883ff --- /dev/null +++ b/externals/vcpkg/ports/libhydrogen/remove-tests.patch @@ -0,0 +1,30 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -139,12 +139,13 @@ + # Tests + + set(tests_executable "${PROJECT_NAME}-tests") + set(tests_run_target "${PROJECT_NAME}-run-tests") + set(tests_run_file "${PROJECT_BINARY_DIR}/${tests_run_target}.done") + ++if(0) + enable_testing() + add_executable("${tests_executable}" ${test_files}) + target_compile_options("${tests_executable}" PRIVATE ${compile_options}) + target_link_libraries("${tests_executable}" "${PROJECT_NAME}") + add_test(NAME "${tests_executable}" COMMAND "${tests_executable}") + +@@ -166,12 +167,13 @@ + COMMAND "${CMAKE_COMMAND}" + ARGS -E touch "${tests_run_file}" + WORKING_DIRECTORY "${PROJECT_BINARY_DIR}" + VERBATIM) + add_custom_target("${tests_run_target}" ALL DEPENDS "${tests_run_file}" VERBATIM) + endif() ++endif() + + # Generate Arduino package + + set(arduino_package_file "${PROJECT_BINARY_DIR}/hydrogen-crypto.zip") + + # Use the relative versions of the file path lists or else the full paths will end up in the diff --git a/externals/vcpkg/ports/libhydrogen/vcpkg.json b/externals/vcpkg/ports/libhydrogen/vcpkg.json new file mode 100755 index 000000000..2057f8820 --- /dev/null +++ b/externals/vcpkg/ports/libhydrogen/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "libhydrogen", + "version-date": "2021-12-02", + "port-version": 1, + "description": "A lightweight, secure, easy-to-use crypto library suitable for constrained environments", + "homepage": "https://github.com/jedisct1/libhydrogen", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libical/portfile.cmake b/externals/vcpkg/ports/libical/portfile.cmake new file mode 100755 index 000000000..6c5c25dea --- /dev/null +++ b/externals/vcpkg/ports/libical/portfile.cmake @@ -0,0 +1,42 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libical/libical + REF v3.0.11 + SHA512 cdee86c50edc2373ab2024d7d4ae26dd4b9a728dbc13083472c4923c67f61ff3cef7d43edca762c6a11979d2040fc1576a033eaa23a19e58af8f14a7d67fc139 +) + +vcpkg_find_acquire_program(PERL) +get_filename_component(PERL_PATH ${PERL} DIRECTORY) +vcpkg_add_to_path(${PERL_PATH}) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + "rscale" CMAKE_DISABLE_FIND_PACKAGE_ICU +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND FEATURE_OPTIONS -DSTATIC_ONLY=ON) +else() + list(APPEND FEATURE_OPTIONS -DSHARED_ONLY=ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_BDB=ON + -DUSE_BUILTIN_TZDATA=ON + -DICAL_GLIB=OFF + -DICAL_BUILD_DOCS=OFF + -DLIBICAL_BUILD_TESTING=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME LibIcal CONFIG_PATH CONFIG_PATH lib/cmake/LibIcal) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libical/vcpkg.json b/externals/vcpkg/ports/libical/vcpkg.json new file mode 100755 index 000000000..15687e5e6 --- /dev/null +++ b/externals/vcpkg/ports/libical/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "libical", + "version": "3.0.11", + "port-version": 1, + "description": "Reference implementation of the iCalendar data type and serialization format", + "homepage": "https://github.com/libical/libical", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "rscale": { + "description": "Support for RSCALE element", + "supports": "!static", + "dependencies": [ + "icu" + ] + } + } +} diff --git a/externals/vcpkg/ports/libiconv/0002-Config-for-MSVC.patch b/externals/vcpkg/ports/libiconv/0002-Config-for-MSVC.patch new file mode 100755 index 000000000..5c79d25c4 --- /dev/null +++ b/externals/vcpkg/ports/libiconv/0002-Config-for-MSVC.patch @@ -0,0 +1,27 @@ +diff --git "a/lib/loop_wchar.h" "b/lib/loop_wchar.h" +index 6dc011b..158ccdd 100644 +--- "a/lib/loop_wchar.h" ++++ "b/lib/loop_wchar.h" +@@ -37,7 +37,7 @@ + # include + # define BUF_SIZE 64 /* assume MB_LEN_MAX <= 64 */ + /* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ +- extern size_t mbrtowc (); ++// extern size_t mbrtowc (); + # ifdef mbstate_t + # define mbrtowc(pwc, s, n, ps) (mbrtowc)(pwc, s, n, 0) + # define mbsinit(ps) 1 +diff --git a/srclib/fcntl.c b/srclib/fcntl.c +index f9753c4..02fc8be 100644 +--- a/srclib/fcntl.c ++++ b/srclib/fcntl.c +@@ -37,6 +37,9 @@ + /* Get declarations of the native Windows API functions. */ + # define WIN32_LEAN_AND_MEAN + # include ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) ++#define HANDLE_FLAG_INHERIT 0 ++#endif + + /* Get _get_osfhandle. */ + # if GNULIB_MSVC_NOTHROW diff --git a/externals/vcpkg/ports/libiconv/0003-Add-export.patch b/externals/vcpkg/ports/libiconv/0003-Add-export.patch new file mode 100755 index 000000000..c8d131d2e --- /dev/null +++ b/externals/vcpkg/ports/libiconv/0003-Add-export.patch @@ -0,0 +1,12 @@ +diff -uNr libiconv-1.16/libcharset/include/libcharset.h.in libiconv-1.16-work/libcharset/include/libcharset.h.in +--- libiconv-1.16/libcharset/include/libcharset.h.in 2018-09-17 19:07:42.000000000 +0300 ++++ libiconv-1.16-work/libcharset/include/libcharset.h.in 2019-12-04 17:15:50.000000000 +0300 +@@ -33,7 +33,7 @@ + by the corresponding pathname with the current prefix instead. Both + prefixes should be directory names without trailing slash (i.e. use "" + instead of "/"). */ +-extern void libcharset_set_relocation_prefix (const char *orig_prefix, ++extern void LIBCHARSET_DLL_EXPORTED libcharset_set_relocation_prefix (const char *orig_prefix, + const char *curr_prefix); + + diff --git a/externals/vcpkg/ports/libiconv/0004-ModuleFileName.patch b/externals/vcpkg/ports/libiconv/0004-ModuleFileName.patch new file mode 100755 index 000000000..15ceb2a41 --- /dev/null +++ b/externals/vcpkg/ports/libiconv/0004-ModuleFileName.patch @@ -0,0 +1,13 @@ +diff --git a/lib/relocatable.c b/lib/relocatable.c +index 89b6c27..1561894 100644 +--- a/lib/relocatable.c ++++ b/lib/relocatable.c +@@ -329,7 +329,7 @@ DllMain (HINSTANCE module_handle, DWORD event, LPVOID reserved) + /* The DLL is being loaded into an application's address range. */ + static char location[MAX_PATH]; + +- if (!GetModuleFileName (module_handle, location, sizeof (location))) ++ if (!GetModuleFileNameA (module_handle, location, sizeof (location))) + /* Shouldn't happen. */ + return FALSE; + diff --git a/externals/vcpkg/ports/libiconv/portfile.cmake b/externals/vcpkg/ports/libiconv/portfile.cmake new file mode 100755 index 000000000..9794211de --- /dev/null +++ b/externals/vcpkg/ports/libiconv/portfile.cmake @@ -0,0 +1,68 @@ +if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_ANDROID) + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/iconv") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/iconv") + return() +endif() + +set(LIBICONV_VERSION 1.17) + +vcpkg_download_distfile(ARCHIVE + URLS "https://ftp.gnu.org/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz" + FILENAME "libiconv-${LIBICONV_VERSION}.tar.gz" + SHA512 18a09de2d026da4f2d8b858517b0f26d853b21179cf4fa9a41070b2d140030ad9525637dc4f34fc7f27abca8acdc84c6751dfb1d426e78bf92af4040603ced86 +) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF "${LIBICONV_VERSION}" + PATCHES + 0002-Config-for-MSVC.patch + 0003-Add-export.patch + 0004-ModuleFileName.patch +) + +if (NOT VCPKG_TARGET_IS_ANDROID) + list(APPEND OPTIONS --enable-relocatable) +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + DETERMINE_BUILD_TRIPLET + USE_WRAPPERS + OPTIONS + --enable-extra-encodings + --without-libiconv-prefix + --without-libintl-prefix + ${OPTIONS} +) +vcpkg_install_make() + +vcpkg_copy_pdbs() +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin") + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/iconv") + +set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}") # share contains unneeded doc files + +# Please keep, the default usage is broken +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(READ "${SOURCE_PATH}/COPYING.LIB" copying_lib) +file(READ "${SOURCE_PATH}/COPYING" copying_tool) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" " +The libiconv and libcharset libraries and their header files are under LGPL, +see COPYING.LIB below. + +The iconv program and the documentation are under GPL, see COPYING below. + +# COPYING.LIB + +${copying_lib} + +# COPYING + +${copying_tool} +") diff --git a/externals/vcpkg/ports/libiconv/usage b/externals/vcpkg/ports/libiconv/usage new file mode 100755 index 000000000..db47c33e8 --- /dev/null +++ b/externals/vcpkg/ports/libiconv/usage @@ -0,0 +1,4 @@ +The package libiconv provides CMake targets: + + find_package(Iconv) + target_link_libraries(main PRIVATE Iconv::Iconv) diff --git a/externals/vcpkg/ports/libiconv/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/libiconv/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..8e25449ae --- /dev/null +++ b/externals/vcpkg/ports/libiconv/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,21 @@ +include(SelectLibraryConfigurations) + +_find_package(${ARGS}) +if(Iconv_FOUND AND NOT Iconv_IS_BUILT_IN) + find_path(CHARSET_INCLUDE_DIR NAMES "libcharset.h" HINTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") + find_library(CHARSET_LIBRARY_DEBUG NAMES charsetd libcharsetd charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib HINTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug") + find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib HINTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}") + select_library_configurations(CHARSET) + if(NOT TARGET Iconv::Charset) + add_library(Iconv::Charset INTERFACE IMPORTED) + set_target_properties(Iconv::Charset PROPERTIES + INTERFACE_LINK_LIBRARIES "\$<\$>:${CHARSET_LIBRARY_RELEASE}>;\$<\$:${CHARSET_LIBRARY_DEBUG}>" + INTERFACE_INCLUDE_DIRECTORIES "${CHARSET_INCLUDE_DIRS}") + endif() + if(CHARSET_LIBRARIES) + list(APPEND Iconv_LIBRARIES ${CHARSET_LIBRARIES}) + if(TARGET Iconv::Iconv) + set_property(TARGET Iconv::Iconv APPEND PROPERTY INTERFACE_LINK_LIBRARIES Iconv::Charset) + endif() + endif() +endif() diff --git a/externals/vcpkg/ports/libiconv/vcpkg.json b/externals/vcpkg/ports/libiconv/vcpkg.json new file mode 100755 index 000000000..5314ec6cc --- /dev/null +++ b/externals/vcpkg/ports/libiconv/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libiconv", + "version": "1.17", + "description": "GNU Unicode text conversion", + "homepage": "https://www.gnu.org/software/libiconv/", + "license": null +} diff --git a/externals/vcpkg/ports/libics/portfile.cmake b/externals/vcpkg/ports/libics/portfile.cmake new file mode 100755 index 000000000..2d66f4225 --- /dev/null +++ b/externals/vcpkg/ports/libics/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO svi-opensource/libics + REF ae55128e0532d78aaea4adce21a3fa553d208b83 # 1.6.5 + SHA512 37a1e9034d7e32954840e18f3e3c19f6ed2f8c651ce0da53f678e2f04653be0fc4d9ab3dca8b6f0bfcaec2a9cc560ccfbc7d9034977faa14036281d6a3ca662a + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH cmake) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/GNU_LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libics/vcpkg.json b/externals/vcpkg/ports/libics/vcpkg.json new file mode 100755 index 000000000..09e069155 --- /dev/null +++ b/externals/vcpkg/ports/libics/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "libics", + "version": "1.6.5", + "description": "Reference library for ICS (Image Cytometry Standard), an open standard for writing images of any dimensionality and data type to file, together with associated information regarding the recording equipment or recorded subject.", + "homepage": "https://github.com/svi-opensource/libics", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libideviceactivation/CMakeLists.txt b/externals/vcpkg/ports/libideviceactivation/CMakeLists.txt new file mode 100755 index 000000000..05ab295e6 --- /dev/null +++ b/externals/vcpkg/ports/libideviceactivation/CMakeLists.txt @@ -0,0 +1,39 @@ +cmake_minimum_required(VERSION 3.0) +project(libideviceactivation C) + +# find dependencies +find_library(libplist NAMES plist plist-2.0 libplist libplist-2.0 REQUIRED) +find_path(libimobiledevice_INCLUDES endianness.h) +find_library(libimobiledevice NAMES imobiledevice imobiledevice-1.0 libimobiledevice libimobiledevice-1.0 REQUIRED) +find_package(LibXml2 REQUIRED) +find_package(CURL REQUIRED) + +# ready to create library +file(GLOB_RECURSE IDVCACTV_TOOLS_SRC common/*.c) + +file(GLOB_RECURSE IDVCACTV_PUBLIC_HDR include/*.h) +file(GLOB_RECURSE IDVCACTV_SRC src/*.c) + +add_library(libideviceactivation ${IDVCACTV_TOOLS_SRC} ${IDVCACTV_SRC} ${IDVCACTV_PUBLIC_HDR}) +target_include_directories(libideviceactivation PRIVATE ${libimobiledevice_INCLUDES} ${LIBXML2_INCLUDE_DIR} ${CURL_INCLUDE_DIRS} include) +target_compile_definitions(libideviceactivation PRIVATE -DHAVE_OPENSSL) +target_link_libraries(libideviceactivation PRIVATE ${libplist} ${libimobiledevice} ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES}) + +# install +install( + TARGETS libideviceactivation + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/src/libideviceactivation-1.0.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/libideviceactivation-1.0.pc + @ONLY +) +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/libideviceactivation-1.0.pc + DESTINATION lib/pkgconfig +) + +install(FILES ${IDVCACTV_PUBLIC_HDR} DESTINATION include) \ No newline at end of file diff --git a/externals/vcpkg/ports/libideviceactivation/portfile.cmake b/externals/vcpkg/ports/libideviceactivation/portfile.cmake new file mode 100755 index 000000000..e438cba37 --- /dev/null +++ b/externals/vcpkg/ports/libideviceactivation/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libimobiledevice-win32/libideviceactivation + REF fbe0476cfeddc2fc317ceb900eec12302c1d4c11 # v1.3.17 + SHA512 18fdf1b42744da33e0f0f037e83a72b76cc0b63a0b712e78d9736adcde113582327f3712bc2bfa7b6fdb692465700a9106286f383fd7d11f9351ca7939b20e24 + HEAD_REF msvc-master +) + +configure_file("${CURRENT_PORT_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libideviceactivation/vcpkg.json b/externals/vcpkg/ports/libideviceactivation/vcpkg.json new file mode 100755 index 000000000..7eadb89a3 --- /dev/null +++ b/externals/vcpkg/ports/libideviceactivation/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "libideviceactivation", + "version": "1.3.17", + "description": "A library to handle the activation process of iOS devices", + "dependencies": [ + "curl", + "libimobiledevice", + "libplist", + "libxml2", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libidn2/CMakeLists.txt b/externals/vcpkg/ports/libidn2/CMakeLists.txt new file mode 100755 index 000000000..9920afce2 --- /dev/null +++ b/externals/vcpkg/ports/libidn2/CMakeLists.txt @@ -0,0 +1,124 @@ +cmake_minimum_required(VERSION 3.8) + +project(libidn2 C) + +find_package(Iconv REQUIRED) + +if(MSVC) + add_definitions(-D_CRT_SECURE_NO_DEPRECATE) + add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) +endif() + +add_definitions(-DIDN2_BUILDING) + +if(NOT BUILD_SHARED_LIBS) + add_definitions(-DIDN2_STATIC) +endif() + +# List the source files +set(LIB_SRC lib/bidi.c + lib/context.c + lib/data.c + lib/decode.c + lib/error.c + lib/free.c + lib/idna.c + lib/lookup.c + lib/puny_decode.c + lib/puny_encode.c + lib/register.c + lib/tables.c + lib/tr46map.c + lib/tr46map_data.c + lib/version.c +) + +# List the libunistring source files +set(UNISTR_SRC unistring/c-ctype.c + unistring/c-strcasecmp.c + unistring/c-strncasecmp.c + unistring/free.c + unistring/striconveh.c + unistring/striconveha.c + unistring/uniconv/u8-conv-from-enc.c + unistring/uniconv/u8-strconv-from-enc.c + unistring/uniconv/u8-strconv-from-locale.c + unistring/uniconv/u8-strconv-to-enc.c + unistring/uniconv/u8-strconv-to-locale.c + unistring/unistr/u32-cmp.c + unistring/unistr/u32-cpy.c + unistring/unistr/u32-cpy-alloc.c + unistring/unistr/u32-mbtouc-unsafe.c + unistring/unistr/u32-strlen.c + unistring/unistr/u32-to-u8.c + unistring/unistr/u32-uctomb.c + unistring/unistr/u8-check.c + unistring/unistr/u8-mblen.c + unistring/unistr/u8-mbtouc.c + unistring/unistr/u8-mbtouc-aux.c + unistring/unistr/u8-mbtouc-unsafe.c + unistring/unistr/u8-mbtouc-unsafe-aux.c + unistring/unistr/u8-mbtoucr.c + unistring/unistr/u8-prev.c + unistring/unistr/u8-strlen.c + unistring/unistr/u8-to-u32.c + unistring/unistr/u8-uctomb.c + unistring/unistr/u8-uctomb-aux.c + unistring/uninorm/canonical-decomposition.c + unistring/uninorm/composition.c + unistring/uninorm/decompose-internal.c + unistring/uninorm/decomposition-table.c + unistring/uninorm/nfc.c + unistring/uninorm/nfd.c + unistring/uninorm/u32-normalize.c + unistring/unictype/bidi_of.c + unistring/unictype/categ_M.c + unistring/unictype/categ_none.c + unistring/unictype/categ_of.c + unistring/unictype/categ_test.c + unistring/unictype/combiningclass.c + unistring/unictype/joiningtype_of.c + unistring/unictype/scripts.c +) + +# List the gnulib source files +set(GL_SRC gl/rawmemchr.c + gl/strchrnul.c + gl/strverscmp.c + gl/msvc-inval.c + gl/msvc-nothrow.c + gl/malloca.c +) + +add_library(libidn2 ${LIB_SRC} ${UNISTR_SRC} ${GL_SRC}) +set_target_properties(libidn2 + PROPERTIES + OUTPUT_NAME idn2 + PREFIX lib + IMPORT_PREFIX lib +) + +target_include_directories(libidn2 PRIVATE . ./unistring ./gl) +target_link_libraries(libidn2 PRIVATE Iconv::Iconv) + +install(TARGETS libidn2 + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + +install(FILES lib/idn2.h DESTINATION include) + +# Install pc file +set(prefix "\${pcfiledir}/../..") +set(exec_prefix "\${prefix}") +set(includedir "\${prefix}/include") +set(libdir "\${prefix}/lib") +set(LTLIBICONV "-liconv -lcharset") +set(LTLIBUNISTRING "") +configure_file("libidn2.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libidn2.pc" @ONLY) +if(WIN32 AND NOT MINGW) + file(READ "${CMAKE_CURRENT_BINARY_DIR}/libidn2.pc" pc_data) + string(REPLACE " -lidn" " -llibidn" pc_data "${pc_data}") + file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/libidn2.pc" "${pc_data}") +endif() +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libidn2.pc" DESTINATION "lib/pkgconfig") diff --git a/externals/vcpkg/ports/libidn2/config.h b/externals/vcpkg/ports/libidn2/config.h new file mode 100755 index 000000000..8c8fad230 --- /dev/null +++ b/externals/vcpkg/ports/libidn2/config.h @@ -0,0 +1,1289 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to the number of bits in type 'ptrdiff_t'. */ +/* #undef BITSIZEOF_PTRDIFF_T */ + +/* Define to the number of bits in type 'sig_atomic_t'. */ +/* #undef BITSIZEOF_SIG_ATOMIC_T */ + +/* Define to the number of bits in type 'size_t'. */ +/* #undef BITSIZEOF_SIZE_T */ + +/* Define to the number of bits in type 'wchar_t'. */ +/* #undef BITSIZEOF_WCHAR_T */ + +/* Define to the number of bits in type 'wint_t'. */ +/* #undef BITSIZEOF_WINT_T */ + + +/* Define to 1 if using 'alloca.c'. */ +/* #undef C_ALLOCA */ + +/* Define to 1 if // is a file system root distinct from /. */ +/* #undef DOUBLE_SLASH_IS_DISTINCT_ROOT */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* Define this to 1 if F_DUPFD behavior does not match POSIX */ +/* #undef FCNTL_DUPFD_BUGGY */ + +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module fscanf shall be considered present. */ +#define GNULIB_FSCANF 1 + +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module msvc-nothrow shall be considered present. */ +#define GNULIB_MSVC_NOTHROW 1 + +/* Define to 1 if printf and friends should be labeled with attribute + "__gnu_printf__" instead of "__printf__" */ +#define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1 + +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module scanf shall be considered present. */ +#define GNULIB_SCANF 1 + +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module strerror shall be considered present. */ +#define GNULIB_STRERROR 1 + +/* Define to 1 when the gnulib module getdelim should be tested. */ +/* #undef GNULIB_TEST_GETDELIM */ + +/* Define to 1 when the gnulib module getline should be tested. */ +/* #undef GNULIB_TEST_GETLINE */ + +/* Define to 1 when the gnulib module malloc-posix should be tested. */ +/* #undef GNULIB_TEST_MALLOC_POSIX */ + +/* Define to 1 when the gnulib module rawmemchr should be tested. */ +/* #undef GNULIB_TEST_RAWMEMCHR */ + +/* Define to 1 when the gnulib module strchrnul should be tested. */ +/* #undef GNULIB_TEST_STRCHRNUL */ + +/* Define to 1 when the gnulib module strerror should be tested. */ +/* #undef GNULIB_TEST_STRERROR */ + +/* Define to 1 when the gnulib module strverscmp should be tested. */ +/* #undef GNULIB_TEST_STRVERSCMP */ + +/* Define to 1 when the gnulib module uninorm/u32-normalize should be tested. + */ +/* #undef GNULIB_TEST_UNINORM_U32_NORMALIZE */ + +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module unistr/u32-mbtouc-unsafe shall be considered + present. */ +#define GNULIB_UNISTR_U32_MBTOUC_UNSAFE 1 + +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module unistr/u32-uctomb shall be considered present. */ +#define GNULIB_UNISTR_U32_UCTOMB 1 + +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module unistr/u8-mbtouc shall be considered present. */ +#define GNULIB_UNISTR_U8_MBTOUC 1 + +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module unistr/u8-mbtoucr shall be considered present. */ +#define GNULIB_UNISTR_U8_MBTOUCR 1 + +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module unistr/u8-mbtouc-unsafe shall be considered + present. */ +#define GNULIB_UNISTR_U8_MBTOUC_UNSAFE 1 + +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module unistr/u8-uctomb shall be considered present. */ +#define GNULIB_UNISTR_U8_UCTOMB 1 + +/* Define to 1 if you have 'alloca' after including , a header that + may be supplied by this distribution. */ +#define HAVE_ALLOCA 1 + +/* Define to 1 if you have and it should be used (not on Ultrix). + */ +/* #undef HAVE_ALLOCA_H */ + +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYCURRENT */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +#define HAVE_DCGETTEXT 1 + +/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you + don't. */ +#define HAVE_DECL_GETC_UNLOCKED 0 + +/* Define to 1 if you have the declaration of `getdelim', and to 0 if you + don't. */ +#define HAVE_DECL_GETDELIM 0 + +/* Define to 1 if you have the declaration of `getline', and to 0 if you + don't. */ +#define HAVE_DECL_GETLINE 0 + +/* Define to 1 if you have the declaration of `program_invocation_name', and + to 0 if you don't. */ +#define HAVE_DECL_PROGRAM_INVOCATION_NAME 0 + +/* Define to 1 if you have the declaration of `program_invocation_short_name', + and to 0 if you don't. */ +#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME 0 + +/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_R 0 + +/* Define to 1 if you have the declaration of `__argv', and to 0 if you don't. + */ +#define HAVE_DECL___ARGV 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_DLFCN_H */ + +/* Define to 1 if you have the `flockfile' function. */ +/* #undef HAVE_FLOCKFILE */ + +/* Define to 1 if you have the `funlockfile' function. */ +/* #undef HAVE_FUNLOCKFILE */ + +/* Define to 1 if you have the 'getdelim' function. */ +/* #undef HAVE_GETDELIM */ + +/* Define to 1 if you have the 'getexecname' function. */ +/* #undef HAVE_GETEXECNAME */ + +/* Define to 1 if you have the 'getprogname' function. */ +/* #undef HAVE_GETPROGNAME */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +#define HAVE_GETTEXT 1 + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ICONV_H 1 + +/* Define to 1 if the compiler supports one of the keywords 'inline', + '__inline__', '__inline' and effectively inlines functions marked as such. + */ +#define HAVE_INLINE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define if you have and nl_langinfo(CODESET). */ +/* #undef HAVE_LANGINFO_CODESET */ + +/* Define if you have the libunistring library. */ +/* #undef HAVE_LIBUNISTRING */ + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if the system has the type 'long long int'. */ +#define HAVE_LONG_LONG_INT 1 + +/* Define if the 'malloc' function is POSIX compliant. */ +/* #undef HAVE_MALLOC_POSIX */ + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 on MSVC platforms that have the "invalid parameter handler" + concept. */ +#define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1 + +/* Define to 1 if you have the `rawmemchr' function. */ +/* #undef HAVE_RAWMEMCHR */ + +/* Define to 1 if atoll is declared even after undefining macros. */ +#define HAVE_RAW_DECL_ATOLL 1 + +/* Define to 1 if canonicalize_file_name is declared even after undefining + macros. */ +/* #undef HAVE_RAW_DECL_CANONICALIZE_FILE_NAME */ + +/* Define to 1 if chdir is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_CHDIR */ + +/* Define to 1 if chown is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_CHOWN */ + +/* Define to 1 if dprintf is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_DPRINTF */ + +/* Define to 1 if dup is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_DUP */ + +/* Define to 1 if dup2 is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_DUP2 */ + +/* Define to 1 if dup3 is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_DUP3 */ + +/* Define to 1 if endusershell is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_ENDUSERSHELL */ + +/* Define to 1 if environ is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_ENVIRON */ + +/* Define to 1 if euidaccess is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_EUIDACCESS */ + +/* Define to 1 if faccessat is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_FACCESSAT */ + +/* Define to 1 if fchdir is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_FCHDIR */ + +/* Define to 1 if fchownat is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_FCHOWNAT */ + +/* Define to 1 if fdatasync is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_FDATASYNC */ + +/* Define to 1 if ffsl is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_FFSL */ + +/* Define to 1 if ffsll is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_FFSLL */ + +/* Define to 1 if fpurge is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_FPURGE */ + +/* Define to 1 if fseeko is declared even after undefining macros. */ +#define HAVE_RAW_DECL_FSEEKO 1 + +/* Define to 1 if fsync is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_FSYNC */ + +/* Define to 1 if ftello is declared even after undefining macros. */ +#define HAVE_RAW_DECL_FTELLO 1 + +/* Define to 1 if ftruncate is declared even after undefining macros. */ +#define HAVE_RAW_DECL_FTRUNCATE 1 + +/* Define to 1 if getcwd is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_GETCWD */ + +/* Define to 1 if getdelim is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_GETDELIM */ + +/* Define to 1 if getdomainname is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_GETDOMAINNAME */ + +/* Define to 1 if getdtablesize is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_GETDTABLESIZE */ + +/* Define to 1 if getgroups is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_GETGROUPS */ + +/* Define to 1 if gethostname is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_GETHOSTNAME */ + +/* Define to 1 if getline is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_GETLINE */ + +/* Define to 1 if getloadavg is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_GETLOADAVG */ + +/* Define to 1 if getlogin is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_GETLOGIN */ + +/* Define to 1 if getlogin_r is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_GETLOGIN_R */ + +/* Define to 1 if getpagesize is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_GETPAGESIZE */ + +/* Define to 1 if gets is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_GETS */ + +/* Define to 1 if getsubopt is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_GETSUBOPT */ + +/* Define to 1 if getusershell is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_GETUSERSHELL */ + +/* Define to 1 if grantpt is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_GRANTPT */ + +/* Define to 1 if group_member is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_GROUP_MEMBER */ + +/* Define to 1 if initstate is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_INITSTATE */ + +/* Define to 1 if initstate_r is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_INITSTATE_R */ + +/* Define to 1 if isatty is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_ISATTY */ + +/* Define to 1 if lchown is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_LCHOWN */ + +/* Define to 1 if link is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_LINK */ + +/* Define to 1 if linkat is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_LINKAT */ + +/* Define to 1 if lseek is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_LSEEK */ + +/* Define to 1 if memmem is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_MEMMEM */ + +/* Define to 1 if mempcpy is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_MEMPCPY */ + +/* Define to 1 if memrchr is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_MEMRCHR */ + +/* Define to 1 if mkdtemp is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_MKDTEMP */ + +/* Define to 1 if mkostemp is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_MKOSTEMP */ + +/* Define to 1 if mkostemps is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_MKOSTEMPS */ + +/* Define to 1 if mkstemp is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_MKSTEMP */ + +/* Define to 1 if mkstemps is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_MKSTEMPS */ + +/* Define to 1 if pclose is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_PCLOSE */ + +/* Define to 1 if pipe is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_PIPE */ + +/* Define to 1 if pipe2 is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_PIPE2 */ + +/* Define to 1 if popen is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_POPEN */ + +/* Define to 1 if posix_openpt is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_POSIX_OPENPT */ + +/* Define to 1 if pread is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_PREAD */ + +/* Define to 1 if ptsname is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_PTSNAME */ + +/* Define to 1 if ptsname_r is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_PTSNAME_R */ + +/* Define to 1 if pwrite is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_PWRITE */ + +/* Define to 1 if qsort_r is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_QSORT_R */ + +/* Define to 1 if random is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_RANDOM */ + +/* Define to 1 if random_r is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_RANDOM_R */ + +/* Define to 1 if rawmemchr is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_RAWMEMCHR */ + +/* Define to 1 if readlink is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_READLINK */ + +/* Define to 1 if readlinkat is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_READLINKAT */ + +/* Define to 1 if realpath is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_REALPATH */ + +/* Define to 1 if renameat is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_RENAMEAT */ + +/* Define to 1 if rmdir is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_RMDIR */ + +/* Define to 1 if rpmatch is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_RPMATCH */ + +/* Define to 1 if secure_getenv is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_SECURE_GETENV */ + +/* Define to 1 if setenv is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_SETENV */ + +/* Define to 1 if sethostname is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_SETHOSTNAME */ + +/* Define to 1 if setstate is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_SETSTATE */ + +/* Define to 1 if setstate_r is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_SETSTATE_R */ + +/* Define to 1 if setusershell is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_SETUSERSHELL */ + +/* Define to 1 if sleep is declared even after undefining macros. */ +#define HAVE_RAW_DECL_SLEEP 1 + +/* Define to 1 if snprintf is declared even after undefining macros. */ +#define HAVE_RAW_DECL_SNPRINTF 1 + +/* Define to 1 if srandom is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_SRANDOM */ + +/* Define to 1 if srandom_r is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_SRANDOM_R */ + +/* Define to 1 if stpcpy is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_STPCPY */ + +/* Define to 1 if stpncpy is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_STPNCPY */ + +/* Define to 1 if strcasestr is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_STRCASESTR */ + +/* Define to 1 if strchrnul is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_STRCHRNUL */ + +/* Define to 1 if strdup is declared even after undefining macros. */ +#define HAVE_RAW_DECL_STRDUP 1 + +/* Define to 1 if strerror_r is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_STRERROR_R */ + +/* Define to 1 if strncat is declared even after undefining macros. */ +#define HAVE_RAW_DECL_STRNCAT 1 + +/* Define to 1 if strndup is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_STRNDUP */ + +/* Define to 1 if strnlen is declared even after undefining macros. */ +#define HAVE_RAW_DECL_STRNLEN 1 + +/* Define to 1 if strpbrk is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_STRPBRK */ + +/* Define to 1 if strsep is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_STRSEP */ + +/* Define to 1 if strsignal is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_STRSIGNAL */ + +/* Define to 1 if strtod is declared even after undefining macros. */ +#define HAVE_RAW_DECL_STRTOD 1 + +/* Define to 1 if strtok_r is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_STRTOK_R */ + +/* Define to 1 if strtoll is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_STRTOLL */ + +/* Define to 1 if strtoull is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_STRTOULL */ + +/* Define to 1 if strverscmp is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_STRVERSCMP */ + +/* Define to 1 if symlink is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_SYMLINK */ + +/* Define to 1 if symlinkat is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_SYMLINKAT */ + +/* Define to 1 if tmpfile is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_TMPFILE */ + +/* Define to 1 if truncate is declared even after undefining macros. */ +#define HAVE_RAW_DECL_TRUNCATE 1 + +/* Define to 1 if ttyname_r is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_TTYNAME_R */ + +/* Define to 1 if unlink is declared even after undefining macros. */ +#define HAVE_RAW_DECL_UNLINK 1 + +/* Define to 1 if unlinkat is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_UNLINKAT */ + +/* Define to 1 if unlockpt is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_UNLOCKPT */ + +/* Define to 1 if unsetenv is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_UNSETENV */ + +/* Define to 1 if usleep is declared even after undefining macros. */ +#define HAVE_RAW_DECL_USLEEP 1 + +/* Define to 1 if vdprintf is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_VDPRINTF */ + +/* Define to 1 if vsnprintf is declared even after undefining macros. */ +#define HAVE_RAW_DECL_VSNPRINTF 1 + +/* Define to 1 if _Exit is declared even after undefining macros. */ +#define HAVE_RAW_DECL__EXIT 1 + +/* Define to 1 if 'sig_atomic_t' is a signed integer type. */ +/* #undef HAVE_SIGNED_SIG_ATOMIC_T */ + +/* Define to 1 if 'wchar_t' is a signed integer type. */ +/* #undef HAVE_SIGNED_WCHAR_T */ + +/* Define to 1 if 'wint_t' is a signed integer type. */ +/* #undef HAVE_SIGNED_WINT_T */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strchrnul' function. */ +/* #undef HAVE_STRCHRNUL */ + +/* Define to 1 if you have the `strerror_r' function. */ +/* #undef HAVE_STRERROR_R */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_STRINGS_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strverscmp' function. */ +/* #undef HAVE_STRVERSCMP */ + +/* Define to 1 if you have the 'symlink' function. */ +/* #undef HAVE_SYMLINK */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_BITYPES_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_INTTYPES_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SOCKET_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_UNISTD_H */ + +/* Define to 1 if the system has the type 'unsigned long long int'. */ +#define HAVE_UNSIGNED_LONG_LONG_INT 1 + +/* Define if you have a global __progname variable */ +/* #undef HAVE_VAR___PROGNAME */ + +/* Define to 1 or 0, depending whether the compiler supports simple visibility + declarations. */ +/* #undef HAVE_VISIBILITY */ + +/* Define to 1 if you have the header file. */ +#define HAVE_WCHAR_H 1 + +/* Define if you have the 'wchar_t' type. */ +#define HAVE_WCHAR_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_WINSOCK2_H 1 + +/* Define if you have the 'wint_t' type. */ +#define HAVE_WINT_T 1 + +/* Define to 1 if O_NOATIME works. */ +#define HAVE_WORKING_O_NOATIME 0 + +/* Define to 1 if O_NOFOLLOW works. */ +#define HAVE_WORKING_O_NOFOLLOW 0 + +/* Define to 1 if the system has the type `_Bool'. */ +#define HAVE__BOOL 1 + +/* Define to 1 if you have the '_set_invalid_parameter_handler' function. */ +#define HAVE__SET_INVALID_PARAMETER_HANDLER 1 + +/* Define as const if the declaration of iconv() needs const. */ +#define ICONV_CONST + +/* Define to a symbolic name denoting the flavor of iconv_open() + implementation. */ +/* #undef ICONV_FLAVOR */ + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */ +#define MALLOC_0_IS_NONNULL 1 + +/* Use GNU style printf and scanf. */ +#ifndef __USE_MINGW_ANSI_STDIO +# define __USE_MINGW_ANSI_STDIO 1 +#endif + + +/* Name of package */ +#define PACKAGE "libidn2" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "help-libidn@gnu.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "libidn2" + +/* String identifying the packager of this software */ +/* #undef PACKAGE_PACKAGER */ + +/* Packager info for bug reports (URL/e-mail/...) */ +/* #undef PACKAGE_PACKAGER_BUG_REPORTS */ + +/* Packager-specific version information */ +/* #undef PACKAGE_PACKAGER_VERSION */ + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "libidn2 @IDN2_VERSION@" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "libidn2" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "https://www.gnu.org/software/libidn/#libidn2" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "@IDN2_VERSION@" + +/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type + 'ptrdiff_t'. */ +/* #undef PTRDIFF_T_SUFFIX */ + +/* Define to 1 if strerror(0) does not return a message implying success. */ +/* #undef REPLACE_STRERROR_0 */ + +/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type + 'sig_atomic_t'. */ +/* #undef SIG_ATOMIC_T_SUFFIX */ + +/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type + 'size_t'. */ +/* #undef SIZE_T_SUFFIX */ + +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at runtime. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +/* #undef STACK_DIRECTION */ + +/* Define to 1 if the `S_IS*' macros in do not work properly. */ +/* #undef STAT_MACROS_BROKEN */ + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to 1 if strerror_r returns char *. */ +/* #undef STRERROR_R_CHAR_P */ + +/* Define to 1 if the type of the st_atim member of a struct stat is struct + timespec. */ +/* #undef TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC */ + +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# define _ALL_SOURCE 1 +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# define _DARWIN_C_SOURCE 1 +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +/* # undef __EXTENSIONS__ */ +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +/* # undef _HPUX_ALT_XOPEN_SOCKET_API */ +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +/* # undef _MINIX */ +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +/* # undef _NETBSD_SOURCE */ +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +/* # undef _OPENBSD_SOURCE */ +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +/* # undef _POSIX_SOURCE */ +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +/* # undef _POSIX_1_SOURCE */ +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# define __STDC_WANT_IEC_60559_BFP_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# define __STDC_WANT_IEC_60559_DFP_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# define __STDC_WANT_IEC_60559_TYPES_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# define __STDC_WANT_LIB_EXT2__ 1 +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# define __STDC_WANT_MATH_SPEC_FUNCS__ 1 +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +/* # undef _XOPEN_SOURCE */ +#endif + + +/* Version number of package */ +#define VERSION "@IDN2_VERSION@" + +/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type + 'wchar_t'. */ +/* #undef WCHAR_T_SUFFIX */ + +/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type + 'wint_t'. */ +/* #undef WINT_T_SUFFIX */ + +/* Number of bits in a file offset, on hosts where this is settable. */ +/* #undef _FILE_OFFSET_BITS */ + +/* True if the compiler says it groks GNU C version MAJOR.MINOR. */ +#if defined __GNUC__ && defined __GNUC_MINOR__ +# define _GL_GNUC_PREREQ(major, minor) \ + ((major) < __GNUC__ + ((minor) <= __GNUC_MINOR__)) +#else +# define _GL_GNUC_PREREQ(major, minor) 0 +#endif + + +/* Define to enable the declarations of ISO C 11 types and functions. */ +/* #undef _ISOC11_SOURCE */ + +/* Define for large files, on AIX-style hosts. */ +/* #undef _LARGE_FILES */ + +/* The _Noreturn keyword of C11. */ +#ifndef _Noreturn +# if (defined __cplusplus \ + && ((201103 <= __cplusplus && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) \ + || (defined _MSC_VER && 1900 <= _MSC_VER)) \ + && 0) + /* [[noreturn]] is not practically usable, because with it the syntax + extern _Noreturn void func (...); + would not be valid; such a declaration would only be valid with 'extern' + and '_Noreturn' swapped, or without the 'extern' keyword. However, some + AIX system header files and several gnulib header files use precisely + this syntax with 'extern'. */ +# define _Noreturn [[noreturn]] +# elif ((!defined __cplusplus || defined __clang__) \ + && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ + || (!defined __STRICT_ANSI__ \ + && (_GL_GNUC_PREREQ (4, 7) \ + || (defined __apple_build_version__ \ + ? 6000000 <= __apple_build_version__ \ + : 3 < __clang_major__ + (5 <= __clang_minor__)))))) + /* _Noreturn works as-is. */ +# elif _GL_GNUC_PREREQ (2, 8) || defined __clang__ || 0x5110 <= __SUNPRO_C +# define _Noreturn __attribute__ ((__noreturn__)) +# elif 1200 <= (defined _MSC_VER ? _MSC_VER : 0) +# define _Noreturn __declspec (noreturn) +# else +# define _Noreturn +# endif +#endif + + +/* For standard stat data types on VMS. */ +#define _USE_STD_STAT 1 + +/* Define to rpl_ if the getopt replacement functions and variables should be + used. */ +/* #undef __GETOPT_PREFIX */ + +/* Define to 1 if the system predates C++11. */ +/* #undef __STDC_CONSTANT_MACROS */ + +/* Define to 1 if the system predates C++11. */ +/* #undef __STDC_LIMIT_MACROS */ + +/* The _GL_ASYNC_SAFE marker should be attached to functions that are + signal handlers (for signals other than SIGABRT, SIGPIPE) or can be + invoked from such signal handlers. Such functions have some restrictions: + * All functions that it calls should be marked _GL_ASYNC_SAFE as well, + or should be listed as async-signal-safe in POSIX + + section 2.4.3. Note that malloc(), sprintf(), and fwrite(), in + particular, are NOT async-signal-safe. + * All memory locations (variables and struct fields) that these functions + access must be marked 'volatile'. This holds for both read and write + accesses. Otherwise the compiler might optimize away stores to and + reads from such locations that occur in the program, depending on its + data flow analysis. For example, when the program contains a loop + that is intended to inspect a variable set from within a signal handler + while (!signal_occurred) + ; + the compiler is allowed to transform this into an endless loop if the + variable 'signal_occurred' is not declared 'volatile'. + Additionally, recall that: + * A signal handler should not modify errno (except if it is a handler + for a fatal signal and ends by raising the same signal again, thus + provoking the termination of the process). If it invokes a function + that may clobber errno, it needs to save and restore the value of + errno. */ +#define _GL_ASYNC_SAFE + + +/* Attributes. */ +#if (defined __has_attribute \ + && (!defined __clang_minor__ \ + || 3 < __clang_major__ + (5 <= __clang_minor__))) +# define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__) +#else +# define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr +# define _GL_ATTR_alloc_size _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_always_inline _GL_GNUC_PREREQ (3, 2) +# define _GL_ATTR_artificial _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_cold _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_const _GL_GNUC_PREREQ (2, 95) +# define _GL_ATTR_deprecated _GL_GNUC_PREREQ (3, 1) +# define _GL_ATTR_diagnose_if 0 +# define _GL_ATTR_error _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_externally_visible _GL_GNUC_PREREQ (4, 1) +# define _GL_ATTR_fallthrough _GL_GNUC_PREREQ (7, 0) +# define _GL_ATTR_format _GL_GNUC_PREREQ (2, 7) +# define _GL_ATTR_leaf _GL_GNUC_PREREQ (4, 6) +# ifdef _ICC +# define _GL_ATTR_may_alias 0 +# else +# define _GL_ATTR_may_alias _GL_GNUC_PREREQ (3, 3) +# endif +# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0) +# define _GL_ATTR_noinline _GL_GNUC_PREREQ (3, 1) +# define _GL_ATTR_nonnull _GL_GNUC_PREREQ (3, 3) +# define _GL_ATTR_nonstring _GL_GNUC_PREREQ (8, 0) +# define _GL_ATTR_nothrow _GL_GNUC_PREREQ (3, 3) +# define _GL_ATTR_packed _GL_GNUC_PREREQ (2, 7) +# define _GL_ATTR_pure _GL_GNUC_PREREQ (2, 96) +# define _GL_ATTR_returns_nonnull _GL_GNUC_PREREQ (4, 9) +# define _GL_ATTR_sentinel _GL_GNUC_PREREQ (4, 0) +# define _GL_ATTR_unused _GL_GNUC_PREREQ (2, 7) +# define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4) +#endif + + +#if _GL_HAS_ATTRIBUTE (alloc_size) +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) +#else +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) +#endif + +#if _GL_HAS_ATTRIBUTE (always_inline) +# define _GL_ATTRIBUTE_ALWAYS_INLINE __attribute__ ((__always_inline__)) +#else +# define _GL_ATTRIBUTE_ALWAYS_INLINE +#endif + +#if _GL_HAS_ATTRIBUTE (artificial) +# define _GL_ATTRIBUTE_ARTIFICIAL __attribute__ ((__artificial__)) +#else +# define _GL_ATTRIBUTE_ARTIFICIAL +#endif + +/* Avoid __attribute__ ((cold)) on MinGW; see thread starting at + . + Also, Oracle Studio 12.6 requires 'cold' not '__cold__'. */ +#if _GL_HAS_ATTRIBUTE (cold) && !defined __MINGW32__ +# ifndef __SUNPRO_C +# define _GL_ATTRIBUTE_COLD __attribute__ ((__cold__)) +# else +# define _GL_ATTRIBUTE_COLD __attribute__ ((cold)) +# endif +#else +# define _GL_ATTRIBUTE_COLD +#endif + +#if _GL_HAS_ATTRIBUTE (const) +# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__)) +#else +# define _GL_ATTRIBUTE_CONST +#endif + +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]] +#elif _GL_HAS_ATTRIBUTE (deprecated) +# define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) +#else +# define _GL_ATTRIBUTE_DEPRECATED +#endif + +#if _GL_HAS_ATTRIBUTE (error) +# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__error__ (msg))) +# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__warning__ (msg))) +#elif _GL_HAS_ATTRIBUTE (diagnose_if) +# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__diagnose_if__ (1, msg, "error"))) +# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__diagnose_if__ (1, msg, "warning"))) +#else +# define _GL_ATTRIBUTE_ERROR(msg) +# define _GL_ATTRIBUTE_WARNING(msg) +#endif + +#if _GL_HAS_ATTRIBUTE (externally_visible) +# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((externally_visible)) +#else +# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE +#endif + +/* FALLTHROUGH is special, because it always expands to something. */ +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_FALLTHROUGH [[__fallthrough__]] +#elif _GL_HAS_ATTRIBUTE (fallthrough) +# define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__)) +#else +# define _GL_ATTRIBUTE_FALLTHROUGH ((void) 0) +#endif + +#if _GL_HAS_ATTRIBUTE (format) +# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) +#else +# define _GL_ATTRIBUTE_FORMAT(spec) +#endif + +#if _GL_HAS_ATTRIBUTE (leaf) +# define _GL_ATTRIBUTE_LEAF __attribute__ ((__leaf__)) +#else +# define _GL_ATTRIBUTE_LEAF +#endif + +/* Oracle Studio 12.6 mishandles may_alias despite __has_attribute OK. */ +#if _GL_HAS_ATTRIBUTE (may_alias) && !defined __SUNPRO_C +# define _GL_ATTRIBUTE_MAY_ALIAS __attribute__ ((__may_alias__)) +#else +# define _GL_ATTRIBUTE_MAY_ALIAS +#endif + +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] +#elif _GL_HAS_ATTRIBUTE (unused) +# define _GL_ATTRIBUTE_MAYBE_UNUSED __attribute__ ((__unused__)) +#else +# define _GL_ATTRIBUTE_MAYBE_UNUSED +#endif +/* Earlier spellings of this macro. */ +#define _GL_UNUSED _GL_ATTRIBUTE_MAYBE_UNUSED +#define _UNUSED_PARAMETER_ _GL_ATTRIBUTE_MAYBE_UNUSED + +#if _GL_HAS_ATTRIBUTE (malloc) +# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) +#else +# define _GL_ATTRIBUTE_MALLOC +#endif + +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] +#elif _GL_HAS_ATTRIBUTE (warn_unused_result) +# define _GL_ATTRIBUTE_NODISCARD __attribute__ ((__warn_unused_result__)) +#else +# define _GL_ATTRIBUTE_NODISCARD +#endif + +#if _GL_HAS_ATTRIBUTE (noinline) +# define _GL_ATTRIBUTE_NOINLINE __attribute__ ((__noinline__)) +#else +# define _GL_ATTRIBUTE_NOINLINE +#endif + +#if _GL_HAS_ATTRIBUTE (nonnull) +# define _GL_ATTRIBUTE_NONNULL(args) __attribute__ ((__nonnull__ args)) +#else +# define _GL_ATTRIBUTE_NONNULL(args) +#endif + +#if _GL_HAS_ATTRIBUTE (nonstring) +# define _GL_ATTRIBUTE_NONSTRING __attribute__ ((__nonstring__)) +#else +# define _GL_ATTRIBUTE_NONSTRING +#endif + +/* There is no _GL_ATTRIBUTE_NORETURN; use _Noreturn instead. */ + +#if _GL_HAS_ATTRIBUTE (nothrow) && !defined __cplusplus +# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__)) +#else +# define _GL_ATTRIBUTE_NOTHROW +#endif + +#if _GL_HAS_ATTRIBUTE (packed) +# define _GL_ATTRIBUTE_PACKED __attribute__ ((__packed__)) +#else +# define _GL_ATTRIBUTE_PACKED +#endif + +#if _GL_HAS_ATTRIBUTE (pure) +# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) +#else +# define _GL_ATTRIBUTE_PURE +#endif + +#if _GL_HAS_ATTRIBUTE (returns_nonnull) +# define _GL_ATTRIBUTE_RETURNS_NONNULL __attribute__ ((__returns_nonnull__)) +#else +# define _GL_ATTRIBUTE_RETURNS_NONNULL +#endif + +#if _GL_HAS_ATTRIBUTE (sentinel) +# define _GL_ATTRIBUTE_SENTINEL(pos) __attribute__ ((__sentinel__ pos)) +#else +# define _GL_ATTRIBUTE_SENTINEL(pos) +#endif + + +/* To support C++ as well as C, use _GL_UNUSED_LABEL with trailing ';'. */ +#if !defined __cplusplus || _GL_GNUC_PREREQ (4, 5) +# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_MAYBE_UNUSED +#else +# define _GL_UNUSED_LABEL +#endif + + +/* Please see the Gnulib manual for how to use these macros. + + Suppress extern inline with HP-UX cc, as it appears to be broken; see + . + + Suppress extern inline with Sun C in standards-conformance mode, as it + mishandles inline functions that call each other. E.g., for 'inline void f + (void) { } inline void g (void) { f (); }', c99 incorrectly complains + 'reference to static identifier "f" in extern inline function'. + This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16. + + Suppress extern inline (with or without __attribute__ ((__gnu_inline__))) + on configurations that mistakenly use 'static inline' to implement + functions or macros in standard C headers like . For example, + if isdigit is mistakenly implemented via a static inline function, + a program containing an extern inline function that calls isdigit + may not work since the C standard prohibits extern inline functions + from calling static functions (ISO C 99 section 6.7.4.(3). + This bug is known to occur on: + + OS X 10.8 and earlier; see: + https://lists.gnu.org/r/bug-gnulib/2012-12/msg00023.html + + DragonFly; see + http://muscles.dragonflybsd.org/bulk/clang-master-potential/20141111_102002/logs/ah-tty-0.3.12.log + + FreeBSD; see: + https://lists.gnu.org/r/bug-gnulib/2014-07/msg00104.html + + OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and + for clang but remains for g++; see . + Assume DragonFly and FreeBSD will be similar. + + GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 + inline semantics, unless -fgnu89-inline is used. It defines a macro + __GNUC_STDC_INLINE__ to indicate this situation or a macro + __GNUC_GNU_INLINE__ to indicate the opposite situation. + GCC 4.2 with -std=c99 or -std=gnu99 implements the GNU C inline + semantics but warns, unless -fgnu89-inline is used: + warning: C99 inline functions are not supported; using GNU89 + warning: to disable this warning use -fgnu89-inline or the gnu_inline function attribute + It defines a macro __GNUC_GNU_INLINE__ to indicate this situation. + */ +#if (((defined __APPLE__ && defined __MACH__) \ + || defined __DragonFly__ || defined __FreeBSD__) \ + && (defined __header_inline \ + ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \ + && ! defined __clang__) \ + : ((! defined _DONT_USE_CTYPE_INLINE_ \ + && (defined __GNUC__ || defined __cplusplus)) \ + || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \ + && defined __GNUC__ && ! defined __cplusplus)))) +# define _GL_EXTERN_INLINE_STDHEADER_BUG +#endif +#if ((__GNUC__ \ + ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ + : (199901L <= __STDC_VERSION__ \ + && !defined __HP_cc \ + && !defined __PGI \ + && !(defined __SUNPRO_C && __STDC__))) \ + && !defined _GL_EXTERN_INLINE_STDHEADER_BUG) +# define _GL_INLINE inline +# define _GL_EXTERN_INLINE extern inline +# define _GL_EXTERN_INLINE_IN_USE +#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \ + && !defined _GL_EXTERN_INLINE_STDHEADER_BUG) +# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__ + /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ +# define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) +# else +# define _GL_INLINE extern inline +# endif +# define _GL_EXTERN_INLINE extern +# define _GL_EXTERN_INLINE_IN_USE +#else +# define _GL_INLINE static _GL_UNUSED +# define _GL_EXTERN_INLINE static _GL_UNUSED +#endif + +/* In GCC 4.6 (inclusive) to 5.1 (exclusive), + suppress bogus "no previous prototype for 'FOO'" + and "no previous declaration for 'FOO'" diagnostics, + when FOO is an inline function in the header; see + and + . */ +#if __GNUC__ == 4 && 6 <= __GNUC_MINOR__ +# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ +# define _GL_INLINE_HEADER_CONST_PRAGMA +# else +# define _GL_INLINE_HEADER_CONST_PRAGMA \ + _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"") +# endif +# define _GL_INLINE_HEADER_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \ + _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \ + _GL_INLINE_HEADER_CONST_PRAGMA +# define _GL_INLINE_HEADER_END \ + _Pragma ("GCC diagnostic pop") +#else +# define _GL_INLINE_HEADER_BEGIN +# define _GL_INLINE_HEADER_END +#endif + +/* A replacement for va_copy, if needed. */ +#define gl_va_copy(a,b) ((a) = (b)) + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif + +/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports + the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of + earlier versions), but does not display it by setting __GNUC_STDC_INLINE__. + __APPLE__ && __MACH__ test for Mac OS X. + __APPLE_CC__ tests for the Apple compiler and its version. + __STDC_VERSION__ tests for the C99 mode. */ +#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__ +# define __GNUC_STDC_INLINE__ 1 +#endif + +/* _GL_CMP (n1, n2) performs a three-valued comparison on n1 vs. n2, where + n1 and n2 are expressions without side effects, that evaluate to real + numbers (excluding NaN). + It returns + 1 if n1 > n2 + 0 if n1 == n2 + -1 if n1 < n2 + The naïve code (n1 > n2 ? 1 : n1 < n2 ? -1 : 0) produces a conditional + jump with nearly all GCC versions up to GCC 10. + This variant (n1 < n2 ? -1 : n1 > n2) produces a conditional with many + GCC versions up to GCC 9. + The better code (n1 > n2) - (n1 < n2) from Hacker's Delight § 2-9 + avoids conditional jumps in all GCC versions >= 3.4. */ +#define _GL_CMP(n1, n2) (((n1) > (n2)) - ((n1) < (n2))) + + +/* Define to `int' if does not define. */ +/* #undef mode_t */ + +/* Define to the type of st_nlink in struct stat, or a supertype. */ +/* #undef nlink_t */ + +/* Define as a signed integer type capable of holding a process identifier. */ +/* #undef pid_t */ + +/* Define to the equivalent of the C99 'restrict' keyword, or to + nothing if this is not supported. Do not define if restrict is + supported only directly. */ +#define restrict __restrict +/* Work around a bug in older versions of Sun C++, which did not + #define __restrict__ or support _Restrict or __restrict__ + even though the corresponding Sun C compiler ended up with + "#define restrict _Restrict" or "#define restrict __restrict__" + in the previous line. This workaround can be removed once + we assume Oracle Developer Studio 12.5 (2016) or later. */ +#if defined __SUNPRO_CC && !defined __RESTRICT && !defined __restrict__ +# define _Restrict +# define __restrict__ +#endif + +/* Define to `unsigned int' if does not define. */ +/* #undef size_t */ + +/* Define as a signed type of the same size as size_t. */ +#define ssize_t intptr_t + +/* Define as a macro for copying va_list variables. */ +/* #undef va_copy */ diff --git a/externals/vcpkg/ports/libidn2/portfile.cmake b/externals/vcpkg/ports/libidn2/portfile.cmake new file mode 100755 index 000000000..07ef29cbb --- /dev/null +++ b/externals/vcpkg/ports/libidn2/portfile.cmake @@ -0,0 +1,73 @@ +set(IDN2_VERSION 2.3.1) +set(IDN2_FILENAME libidn2-${IDN2_VERSION}.tar.gz) + +vcpkg_download_distfile(ARCHIVE + URLS "https://ftp.gnu.org/gnu/libidn/${IDN2_FILENAME}" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libidn/${IDN2_FILENAME}" + FILENAME "${IDN2_FILENAME}" + SHA512 4d77a4a79e08a05e46fc14827f987b9e7645ebf5d0c0869eb96f9902c2f6b73ea69fd6f9f97b80a9f07cce84f7aa299834df91485d4e7c16500d31a4b9865fe4 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF ${IDN2_VERSION} +) + +if (VCPKG_TARGET_IS_WINDOWS) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/string.h" DESTINATION "${SOURCE_PATH}/gl") + + set(HAVE_ALLOCA_H 0) + + configure_file("${CMAKE_CURRENT_LIST_DIR}/config.h" "${SOURCE_PATH}") + configure_file("${SOURCE_PATH}/gl/alloca.in.h" "${SOURCE_PATH}/gl/alloca.h") + + function(simple_copy_template_header FILE_PATH BASE_NAME) + if(NOT EXISTS "${FILE_PATH}/${BASE_NAME}.h" AND EXISTS "${FILE_PATH}/${BASE_NAME}.in.h") + configure_file("${FILE_PATH}/${BASE_NAME}.in.h" "${FILE_PATH}/${BASE_NAME}.h" @ONLY) + endif() + endfunction() + + # There seems to be no difference between source and destination files after 'configure' + # apart from auto-generated notification at the top. So why not just do a simple copy. + simple_copy_template_header("${SOURCE_PATH}/unistring" uniconv) + simple_copy_template_header("${SOURCE_PATH}/unistring" unictype) + simple_copy_template_header("${SOURCE_PATH}/unistring" uninorm) + simple_copy_template_header("${SOURCE_PATH}/unistring" unistr) + simple_copy_template_header("${SOURCE_PATH}/unistring" unitypes) + simple_copy_template_header("${SOURCE_PATH}/unistring" alloca) + + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DPACKAGE_VERSION=${IDN2_VERSION}" + ) + + vcpkg_cmake_install() + + vcpkg_copy_pdbs() + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +else() + set(ENV{GTKDOCIZE} true) + vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + COPY_SOURCE + OPTIONS + "--with-libiconv-prefix=${CURRENT_INSTALLED_DIR}" + --disable-gtk-doc + --disable-doc + ) + + vcpkg_install_make() + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +endif() + +vcpkg_fixup_pkgconfig() + +# License and man +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libidn2" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/doc/libidn2.pdf" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libidn2") diff --git a/externals/vcpkg/ports/libidn2/string.h b/externals/vcpkg/ports/libidn2/string.h new file mode 100755 index 000000000..0147d8357 --- /dev/null +++ b/externals/vcpkg/ports/libidn2/string.h @@ -0,0 +1,14 @@ +#ifndef _GL_STRING_H +#define _GL_STRING_H + +char * strchrnul (const char *s, int c_in); +int strverscmp (const char *s1, const char *s2); +void * rawmemchr (const void *s, int c_in); + +#if defined(__MINGW32__) +#include <../include/string.h> +#elif defined(_WIN32) +#include <../ucrt/string.h> +#endif + +#endif /* _GL_STRING_H */ diff --git a/externals/vcpkg/ports/libidn2/vcpkg.json b/externals/vcpkg/ports/libidn2/vcpkg.json new file mode 100755 index 000000000..767619f16 --- /dev/null +++ b/externals/vcpkg/ports/libidn2/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libidn2", + "version": "2.3.1", + "description": "GNU Libidn is an implementation of the Stringprep, Punycode and IDNA 2003 specifications. Libidn's purpose is to encode and decode internationalized domain names.", + "homepage": "https://www.gnu.org/software/libidn/", + "dependencies": [ + "libiconv", + { + "name": "libunistring", + "platform": "!windows" + }, + { + "name": "vcpkg-cmake", + "host": true, + "platform": "windows" + } + ] +} diff --git a/externals/vcpkg/ports/libigl/fix-config.patch b/externals/vcpkg/ports/libigl/fix-config.patch new file mode 100755 index 000000000..523569b05 --- /dev/null +++ b/externals/vcpkg/ports/libigl/fix-config.patch @@ -0,0 +1,28 @@ +diff --git a/cmake/libigl-config.cmake.in b/cmake/libigl-config.cmake.in +index 21aa2468..0aa6d8a0 100644 +--- a/cmake/libigl-config.cmake.in ++++ b/cmake/libigl-config.cmake.in +@@ -27,5 +27,23 @@ if (TARGET igl::common) + endif() + endif() + ++ include(CMakeFindDependencyMacro) ++if (TARGET igl::embree) ++ find_dependency(embree 3 CONFIG REQUIRED) ++endif() ++if (TARGET igl::xml) ++ find_dependency(tinyxml2 CONFIG REQUIRED) ++endif() ++if (TARGET igl::opengl) ++ find_dependency(OpenGL REQUIRED) ++ find_dependency(glad CONFIG REQUIRED) ++ if (TARGET igl::opengl_glfw) ++ find_dependency(glfw3 CONFIG REQUIRED) ++ if (TARGET igl::opengl_glfw_imgui) ++ find_dependency(imgui CONFIG REQUIRED) ++ endif() ++ endif() ++endif() ++ + check_required_components(libigl) + diff --git a/externals/vcpkg/ports/libigl/fix-dependency.patch b/externals/vcpkg/ports/libigl/fix-dependency.patch new file mode 100755 index 000000000..f7ed9f7f2 --- /dev/null +++ b/externals/vcpkg/ports/libigl/fix-dependency.patch @@ -0,0 +1,213 @@ +diff --git a/cmake/LibiglWindows.cmake b/cmake/LibiglWindows.cmake +index b98aa55..46c68a7 100644 +--- a/cmake/LibiglWindows.cmake ++++ b/cmake/LibiglWindows.cmake +@@ -1,4 +1,4 @@ +-if(MSVC) ++if(0) + option(IGL_STATIC_RUNTIME "Use libigl with the static MSVC runtime." OFF) + if(IGL_STATIC_RUNTIME) + message(STATUS "MSVC -> forcing use of statically-linked runtime.") +diff --git a/cmake/libigl.cmake b/cmake/libigl.cmake +index 6de1b41..46ecbf0 100644 +--- a/cmake/libigl.cmake ++++ b/cmake/libigl.cmake +@@ -107,7 +107,8 @@ if(HUNTER_ENABLED) + endif() + + # Eigen +-if(NOT TARGET Eigen3::Eigen) ++find_package(Eigen3 CONFIG REQUIRED) ++if(0) + igl_download_eigen() + add_library(igl_eigen INTERFACE) + target_include_directories(igl_eigen SYSTEM INTERFACE +@@ -296,9 +297,9 @@ endif() + ################################################################################ + ### Compile the embree part ### + if(LIBIGL_WITH_EMBREE) +- set(EMBREE_DIR "${LIBIGL_EXTERNAL}/embree") ++ find_package(embree 3 CONFIG REQUIRED) + +- if(NOT TARGET embree) ++ if(0) + igl_download_embree() + + # Note: On macOS, building embree as a static lib can only be done with a single ISA target. +@@ -317,8 +318,11 @@ if(LIBIGL_WITH_EMBREE) + + compile_igl_module("embree") + target_link_libraries(igl_embree ${IGL_SCOPE} embree) +- target_include_directories(igl_embree ${IGL_SCOPE} ${EMBREE_DIR}/include) +- target_compile_definitions(igl_embree ${IGL_SCOPE} -DEMBREE_STATIC_LIB) ++ if(LIBIGL_USE_STATIC_LIBRARY) ++ find_package(TBB CONFIG REQUIRED) ++ target_link_libraries(igl_embree ${IGL_SCOPE} TBB::tbb) ++ target_compile_definitions(igl_embree ${IGL_SCOPE} -DEMBREE_STATIC_LIB) ++ endif() + endif() + + ################################################################################ +@@ -359,11 +363,12 @@ if(LIBIGL_WITH_OPENGL) + endif() + + # glad module +- if(NOT TARGET glad) ++ find_package(glad CONFIG REQUIRED) ++ if(0) + igl_download_glad() + add_subdirectory(${LIBIGL_EXTERNAL}/glad glad) + endif() +- target_link_libraries(igl_opengl ${IGL_SCOPE} glad) ++ target_link_libraries(igl_opengl ${IGL_SCOPE} glad::glad) + endif() + + ################################################################################ +@@ -372,7 +377,8 @@ if(LIBIGL_WITH_OPENGL_GLFW) + if(TARGET igl::opengl) + # GLFW module + compile_igl_module("opengl/glfw") +- if(NOT TARGET glfw) ++ find_package(glfw3 CONFIG REQUIRED) ++ if(0) + igl_download_glfw() + option(GLFW_BUILD_EXAMPLES "Build the GLFW example programs" OFF) + option(GLFW_BUILD_TESTS "Build the GLFW test programs" OFF) +@@ -395,17 +401,19 @@ if(LIBIGL_WITH_OPENGL_GLFW_IMGUI) + if(TARGET igl::opengl_glfw) + # ImGui module + compile_igl_module("opengl/glfw/imgui") +- if(NOT TARGET imgui) ++ find_package(imgui CONFIG REQUIRED) ++ if(0) + igl_download_imgui() + add_subdirectory(${LIBIGL_EXTERNAL}/libigl-imgui imgui) + endif() +- if(NOT TARGET imguizmo) ++ find_package(imguizmo CONFIG REQUIRED) ++ if(0) + igl_download_imguizmo() + add_library(imguizmo ${LIBIGL_EXTERNAL}/imguizmo/ImGuizmo.cpp ${LIBIGL_EXTERNAL}/imguizmo/ImGuizmo.h) + target_compile_features(imguizmo PUBLIC cxx_std_11) + target_link_libraries(imguizmo PUBLIC imgui) + endif() +- target_link_libraries(igl_opengl_glfw_imgui ${IGL_SCOPE} igl_opengl_glfw imgui imguizmo) ++ target_link_libraries(igl_opengl_glfw_imgui ${IGL_SCOPE} igl_opengl_glfw imgui::imgui imguizmo::imguizmo) + endif() + endif() + +@@ -415,12 +423,22 @@ if(LIBIGL_WITH_PNG) + # png/ module is anomalous because it also depends on opengl it really should + # be moved into the opengl/ directory and namespace ... + if(TARGET igl_opengl) +- if(NOT TARGET stb_image) ++ find_path(stb_include_dir stb.h) ++ find_package(opengl REQUIRED) ++ find_package(libpng CONFIG REQUIRED) ++ find_package(glad CONFIG REQUIRED) ++ if (BUILD_SHARED_LIBS) ++ set(libpng_LIBRARIES png) ++ else() ++ set(libpng_LIBRARIES png_static) ++ endif() ++ if(0) + igl_download_stb() + add_subdirectory(${LIBIGL_EXTERNAL}/stb stb_image) + endif() + compile_igl_module("png" "") +- target_link_libraries(igl_png ${IGL_SCOPE} igl_stb_image igl_opengl) ++ target_include_directories(igl_png INTERFACE ${stb_include_dir}) ++ target_link_libraries(igl_png ${IGL_SCOPE} OpenGL::GL ${libpng_LIBRARIES} glad::glad) + endif() + endif() + +@@ -468,7 +486,8 @@ endif() + ### Compile the xml part ### + if(LIBIGL_WITH_XML) + set(TINYXML2_DIR "${LIBIGL_EXTERNAL}/tinyxml2") +- if(NOT TARGET tinyxml2) ++ find_package(tinyxml2 CONFIG REQUIRED) ++ if(0) + igl_download_tinyxml2() + add_library(tinyxml2 STATIC ${TINYXML2_DIR}/tinyxml2.cpp ${TINYXML2_DIR}/tinyxml2.h) + target_include_directories(tinyxml2 PUBLIC ${TINYXML2_DIR}) +@@ -478,8 +497,7 @@ if(LIBIGL_WITH_XML) + SOVERSION "3") + endif() + compile_igl_module("xml") +- target_link_libraries(igl_xml ${IGL_SCOPE} tinyxml2) +- target_include_directories(igl_xml ${IGL_SCOPE} ${TINYXML2_DIR}) ++ target_link_libraries(igl_xml ${IGL_SCOPE} tinyxml2::tinyxml2) + endif() + + ################################################################################ +diff --git a/include/igl/opengl/glfw/imgui/ImGuiHelpers.h b/include/igl/opengl/glfw/imgui/ImGuiHelpers.h +index 0663390..f35f097 100644 +--- a/include/igl/opengl/glfw/imgui/ImGuiHelpers.h ++++ b/include/igl/opengl/glfw/imgui/ImGuiHelpers.h +@@ -10,7 +10,7 @@ + + //////////////////////////////////////////////////////////////////////////////// + #include "ImGuiTraits.h" +-#include ++#include + #include + #include + #include +diff --git a/include/igl/opengl/glfw/imgui/ImGuiMenu.cpp b/include/igl/opengl/glfw/imgui/ImGuiMenu.cpp +index c91c1cc..0836142 100644 +--- a/include/igl/opengl/glfw/imgui/ImGuiMenu.cpp ++++ b/include/igl/opengl/glfw/imgui/ImGuiMenu.cpp +@@ -9,7 +9,7 @@ + #include "ImGuiMenu.h" + #include "ImGuiHelpers.h" + #include +-#include ++#include + #include + #include + #include +diff --git a/include/igl/opengl/glfw/imgui/ImGuiTraits.h b/include/igl/opengl/glfw/imgui/ImGuiTraits.h +index 7dae22a..e6911c5 100644 +--- a/include/igl/opengl/glfw/imgui/ImGuiTraits.h ++++ b/include/igl/opengl/glfw/imgui/ImGuiTraits.h +@@ -8,7 +8,7 @@ + #ifndef IGL_OPENGL_GLFW_IMGUI_IMGUITRAITS_H + #define IGL_OPENGL_GLFW_IMGUI_IMGUITRAITS_H + +-#include ++#include + + // Extend ImGui by populating its namespace directly + namespace ImGui +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 2410c19..a7659a3 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -15,12 +15,11 @@ igl_download_test_data() + set(IGL_TEST_DATA ${LIBIGL_EXTERNAL}/../tests/data) + + ### Download Catch2 unit test framework +-igl_download_catch2() ++find_package(Catch2 CONFIG REQUIRED) + list(APPEND CMAKE_MODULE_PATH ${LIBIGL_EXTERNAL}/catch2/contrib) + + + # Add catch2 +-add_subdirectory(${LIBIGL_EXTERNAL}/catch2 catch2) + + + # Create test executable +diff --git a/tutorial/106_ViewerMenu/main.cpp b/tutorial/106_ViewerMenu/main.cpp +index a8e49d6..c7946f9 100644 +--- a/tutorial/106_ViewerMenu/main.cpp ++++ b/tutorial/106_ViewerMenu/main.cpp +@@ -2,7 +2,7 @@ + #include + #include + #include +-#include ++#include + #include + #include "tutorial_shared_path.h" + diff --git a/externals/vcpkg/ports/libigl/install-extra-headers.patch b/externals/vcpkg/ports/libigl/install-extra-headers.patch new file mode 100755 index 000000000..77ee2aa2a --- /dev/null +++ b/externals/vcpkg/ports/libigl/install-extra-headers.patch @@ -0,0 +1,90 @@ +diff --git a/cmake/libigl.cmake b/cmake/libigl.cmake +index a33cefa..0014375 100644 +--- a/cmake/libigl.cmake ++++ b/cmake/libigl.cmake +@@ -560,6 +560,85 @@ export( + # Install headers for core library + install_dir_files(core) + install_dir_files(copyleft) ++ ++if (LIBIGL_WITH_EMBREE) ++ install_dir_files(embree) ++# if(NOT LIBIGL_USE_STATIC_LIBRARY) ++ install(TARGETS igl_embree EXPORT igl-export) ++ export(TARGETS igl_embree ++ APPEND FILE libigl-export.cmake EXPORT_LINK_INTERFACE_LIBRARIES ++ ) ++# endif() ++endif() ++ ++if (LIBIGL_WITH_CGAL) ++ install_dir_files(copyleft/cgal) ++endif() ++ ++if (LIBIGL_WITH_COMISO) ++ install_dir_files(copyleft/comiso) ++endif() ++ ++if (LIBIGL_WITH_CORK) ++ install_dir_files(copyleft/cork) ++endif() ++ ++if (LIBIGL_WITH_TETGEN) ++ install_dir_files(copyleft/tetgen) ++endif() ++ ++if (LIBIGL_WITH_OPENGL OR LIBIGL_WITH_OPENGL_GLFW OR LIBIGL_WITH_OPENGL_GLFW_IMGUI) ++ install_dir_files(copyleft/opengl2) ++ install_dir_files(opengl) ++# if(NOT LIBIGL_USE_STATIC_LIBRARY) ++ install(TARGETS igl_opengl EXPORT igl-export) ++ export(TARGETS igl_opengl ++ APPEND FILE libigl-export.cmake EXPORT_LINK_INTERFACE_LIBRARIES ++ ) ++# endif() ++endif() ++ ++if (LIBIGL_WITH_OPENGL_GLFW OR LIBIGL_WITH_OPENGL_GLFW_IMGUI) ++ install_dir_files(opengl/glfw) ++# if(NOT LIBIGL_USE_STATIC_LIBRARY) ++ install(TARGETS igl_opengl_glfw EXPORT igl-export) ++ export(TARGETS igl_opengl_glfw ++ APPEND FILE libigl-export.cmake EXPORT_LINK_INTERFACE_LIBRARIES ++ ) ++# endif() ++endif() ++ ++if (LIBIGL_WITH_OPENGL_GLFW_IMGUI) ++ install_dir_files(opengl/glfw/imgui) ++# if(NOT LIBIGL_USE_STATIC_LIBRARY) ++ install(TARGETS igl_opengl_glfw_imgui EXPORT igl-export) ++ export(TARGETS igl_opengl_glfw_imgui ++ APPEND FILE libigl-export.cmake EXPORT_LINK_INTERFACE_LIBRARIES ++ ) ++# endif() ++endif() ++ ++if (LIBIGL_WITH_PNG) ++ install_dir_files(png) ++endif() ++ ++if (LIBIGL_WITH_PREDICATES) ++ install_dir_files(predicates) ++endif() ++ ++if (LIBIGL_WITH_TRIANGLE) ++ install_dir_files(triangle) ++endif() ++ ++if (LIBIGL_WITH_XML) ++ install_dir_files(xml) ++# if(NOT LIBIGL_USE_STATIC_LIBRARY) ++ install(TARGETS igl_xml EXPORT igl-export) ++ export(TARGETS igl_xml ++ APPEND FILE libigl-export.cmake EXPORT_LINK_INTERFACE_LIBRARIES ++ ) ++# endif() ++endif() + + # Write package configuration file + configure_package_config_file( diff --git a/externals/vcpkg/ports/libigl/portfile.cmake b/externals/vcpkg/ports/libigl/portfile.cmake new file mode 100755 index 000000000..4c722d070 --- /dev/null +++ b/externals/vcpkg/ports/libigl/portfile.cmake @@ -0,0 +1,52 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libigl/libigl + REF e60423e28c86b6aa2a3f6eb0112e8fd881f96777 #2.3.0 + SHA512 3fecb710825e58745c1d67eab694ee365a5b86151a5a1ca3758c1000c124059d38dbc78e8c6e941be6d85a716f928ed8fea42bb6007b8e24da0123332c2c96da + HEAD_REF master + PATCHES + fix-dependency.patch + install-extra-headers.patch + fix-config.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + embree LIBIGL_WITH_EMBREE + opengl LIBIGL_WITH_OPENGL + glfw LIBIGL_WITH_OPENGL_GLFW + imgui LIBIGL_WITH_OPENGL_GLFW_IMGUI + #png LIBIGL_WITH_PNG # Disable this feature due to issue https://github.com/libigl/libigl/issues/1199 + xml LIBIGL_WITH_XML + #python LIBIGL_WITH_PYTHON # Python binding are in the process of being redone. + cgal LIBIGL_WITH_CGAL +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS ${FEATURE_OPTIONS} + -DLIBIGL_BUILD_PYTHON=OFF + -DLIBIGL_EXPORT_TARGETS=ON + -DLIBIGL_USE_STATIC_LIBRARY=OFF # Header-only mode + -DLIBIGL_WITH_COMISO=OFF + -DLIBIGL_WITH_TETGEN=OFF + -DLIBIGL_WITH_TRIANGLE=OFF + -DLIBIGL_WITH_PREDICATES=OFF + -DLIBIGL_BUILD_TUTORIALS=OFF + -DLIBIGL_WITH_PNG=OFF + -DLIBIGL_BUILD_TESTS=OFF + -DPYTHON_EXECUTABLE=${PYTHON2} + MAYBE_UNUSED_VARIABLES + PYTHON_EXECUTABLE +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/libigl/cmake) +vcpkg_copy_pdbs() + +# libigl is a header-only library. +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE.GPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libigl/vcpkg.json b/externals/vcpkg/ports/libigl/vcpkg.json new file mode 100755 index 000000000..fca500d19 --- /dev/null +++ b/externals/vcpkg/ports/libigl/vcpkg.json @@ -0,0 +1,82 @@ +{ + "name": "libigl", + "version": "2.3.0", + "port-version": 2, + "description": "libigl is a simple C++ geometry processing library. We have a wide functionality including construction of sparse discrete differential geometry operators and finite-elements matrices such as the cotangent Laplacian and diagonalized mass matrix, simple facet and edge-based topology data structures, mesh-viewing utilities for OpenGL and GLSL, and many core functions for matrix manipulation which make Eigen feel a lot more like MATLAB.", + "homepage": "https://github.com/libigl/libigl", + "license": "GPL-3.0-only", + "supports": "!(arm | uwp)", + "dependencies": [ + "eigen3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cgal": { + "description": "Build with cgal", + "dependencies": [ + "cgal" + ] + }, + "embree": { + "description": "Build with embree", + "dependencies": [ + "embree3" + ] + }, + "glfw": { + "description": "Build with glfw", + "dependencies": [ + "glfw3", + { + "name": "libigl", + "default-features": false, + "features": [ + "opengl" + ] + } + ] + }, + "imgui": { + "description": "Build with imgui", + "dependencies": [ + { + "name": "imgui", + "default-features": false, + "features": [ + "glfw-binding", + "libigl-imgui", + "opengl3-binding" + ] + }, + "imguizmo", + { + "name": "libigl", + "default-features": false, + "features": [ + "glfw" + ] + } + ] + }, + "opengl": { + "description": "Build with opengl", + "dependencies": [ + "glad", + "opengl" + ] + }, + "xml": { + "description": "Build with libxml", + "dependencies": [ + "tinyxml2" + ] + } + } +} diff --git a/externals/vcpkg/ports/libilbc/absl.patch b/externals/vcpkg/ports/libilbc/absl.patch new file mode 100755 index 000000000..3a41c222b --- /dev/null +++ b/externals/vcpkg/ports/libilbc/absl.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 016b46d37..4caa88fce 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -50,14 +50,12 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) + + set(CMAKE_CXX_STANDARD 14) + +-if((CMAKE_C_COMPILER_ID STREQUAL "GNU") OR +- (CMAKE_C_COMPILER_ID MATCHES "Clang" AND CMAKE_C_COMPILER_FRONTEND_VARIANT STREQUAL "GNU")) ++if(0) + set(CMAKE_C_FLAGS "-Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -fno-strict-aliasing") + set(CMAKE_C_FLAGS_DEBUG "-g") + set(CMAKE_C_FLAGS_RELEASE "-O2") + endif() +-if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR +- (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "GNU")) ++if(0) + set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing") + set(CMAKE_CXX_FLAGS_DEBUG "-g") + set(CMAKE_CXX_FLAGS_RELEASE "-O2") +@@ -146,7 +144,8 @@ endif() + ## Configure input files + ############################################################################# + +-include_directories(. abseil-cpp ${CMAKE_CURRENT_BINARY_DIR}) ++find_package(absl REQUIRED) ++include_directories(. ${CMAKE_CURRENT_BINARY_DIR}) + + set(ilbc_source_files + modules/audio_coding/codecs/ilbc/abs_quant.c +@@ -310,6 +310,7 @@ add_library(ilbc ${ilbc_source_files}) + generate_export_header(ilbc) + set_target_properties(ilbc PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION 3) + set_target_properties(ilbc PROPERTIES CLEAN_DIRECT_OUTPUT 1) ++target_link_libraries(ilbc PRIVATE absl::core_headers) + + add_executable(ilbc_test modules/audio_coding/codecs/ilbc/test/iLBC_test.c) + target_link_libraries(ilbc_test ilbc) diff --git a/externals/vcpkg/ports/libilbc/do-not-build-ilbc_test.patch b/externals/vcpkg/ports/libilbc/do-not-build-ilbc_test.patch new file mode 100755 index 000000000..3d67ecbb0 --- /dev/null +++ b/externals/vcpkg/ports/libilbc/do-not-build-ilbc_test.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 671ded64d1..1d01f737c2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -332,7 +332,7 @@ install(FILES ilbc.h ${CMAKE_CURRENT_BINARY_DIR}/ilbc_export.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(FILES CONTRIBUTING.md NEWS.md README.md + DESTINATION ${CMAKE_INSTALL_DOCDIR}) +-install(TARGETS ilbc ilbc_test ++install(TARGETS ilbc + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/externals/vcpkg/ports/libilbc/portfile.cmake b/externals/vcpkg/ports/libilbc/portfile.cmake new file mode 100755 index 000000000..d72ff632e --- /dev/null +++ b/externals/vcpkg/ports/libilbc/portfile.cmake @@ -0,0 +1,29 @@ +set(ILBC_VERSION 3.0.4) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO TimothyGu/libilbc + REF cd064edf2c6c104a4e1fd87b34fd24cfa6dbe401 + SHA512 323d32dbd54d5ef624940432bf19c29f5ead6f40bc84aba4261f067dfdc40cf4000e383f4dca65cd3b745a354a119a9e515949a1466af89c300cd7bf95991675 + PATCHES + do-not-build-ilbc_test.patch + absl.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCMAKE_INSTALL_DOCDIR=share/${PORT} +) + +vcpkg_cmake_install() + +vcpkg_fixup_pkgconfig() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ilbc_export.h" "#ifdef ILBC_STATIC_DEFINE" "#if 1") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libilbc/vcpkg.json b/externals/vcpkg/ports/libilbc/vcpkg.json new file mode 100755 index 000000000..b3e0347b8 --- /dev/null +++ b/externals/vcpkg/ports/libilbc/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "libilbc", + "version": "3.0.4", + "description": "Open source implementation of the Internet Low Bit Rate Codec (iLBC) / RFC 3951 codec from the WebRTC project.", + "homepage": "https://github.com/TimothyGu/libilbc", + "license": "BSD-3-Clause", + "supports": "!(arm & uwp)", + "dependencies": [ + "abseil", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libimobiledevice/CMakeLists.txt b/externals/vcpkg/ports/libimobiledevice/CMakeLists.txt new file mode 100755 index 000000000..176eb8933 --- /dev/null +++ b/externals/vcpkg/ports/libimobiledevice/CMakeLists.txt @@ -0,0 +1,59 @@ +cmake_minimum_required(VERSION 3.0) +project(libimobiledevice C) + +# find dependencies +find_library(libplist NAMES plist plist-2.0 libplist libplist-2.0 REQUIRED) +find_library(libusbmuxd libusbmuxd REQUIRED) +find_package(OpenSSL REQUIRED) +find_path(dirent_INCLUDE_DIR dirent.h) +if (WIN32) + find_library(getopt getopt REQUIRED) +endif() + +# ready to create library +file(GLOB_RECURSE IMOBDEV_COMMON_HDR common/*.h) +file(GLOB_RECURSE IMOBDEV_COMMON_SRC common/*.c) + +file(GLOB IMOBDEV_PUBLIC_HDR include/*.h) +file(GLOB IMOBDEV_PUBLIC_SUB_HDR include/libimobiledevice/*.h) +file(GLOB_RECURSE IMOBDEV_PRIVATE_HDR src/*.h) +file(GLOB_RECURSE IMOBDEV_SRC src/*.c) + +add_library(libimobiledevice ${IMOBDEV_SRC} ${IMOBDEV_PUBLIC_HDR} ${IMOBDEV_PUBLIC_SUB_HDR} ${IMOBDEV_PRIVATE_HDR} ${IMOBDEV_COMMON_HDR} ${IMOBDEV_COMMON_SRC}) +set_target_properties(libimobiledevice PROPERTIES OUTPUT_NAME libimobiledevice-1.0) +target_include_directories(libimobiledevice PRIVATE ${dirent_INCLUDE_DIR} include .) +target_compile_definitions(libimobiledevice PRIVATE -DHAVE_OPENSSL) +target_link_libraries(libimobiledevice PRIVATE ${libplist} ${libusbmuxd} ${getopt} OpenSSL::SSL OpenSSL::Crypto) +if (WIN32) + target_link_libraries(libimobiledevice PRIVATE Ws2_32) +else() +endif() + +# install +install( + TARGETS libimobiledevice + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) + +set(LIBPLIST_VERSION 2.0) +set(LIBUSBMUXD_VERSION 2.0) +set(PACKAGE_NAME libimobiledevice) +set(PACKAGE_VERSION 1.0) +set(prefix ${CMAKE_INSTALL_PREFIX}) +set(exec_prefix \${prefix}) +set(libdir \${prefix}/lib) +set(includedir \${prefix}/../include) +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/src/libimobiledevice-1.0.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/libimobiledevice-1.0.pc + @ONLY +) +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/libimobiledevice-1.0.pc + DESTINATION lib/pkgconfig +) + +install(FILES ${IMOBDEV_PUBLIC_HDR} DESTINATION include) +install(FILES ${IMOBDEV_PUBLIC_SUB_HDR} DESTINATION include/libimobiledevice) \ No newline at end of file diff --git a/externals/vcpkg/ports/libimobiledevice/portfile.cmake b/externals/vcpkg/ports/libimobiledevice/portfile.cmake new file mode 100755 index 000000000..b063154bc --- /dev/null +++ b/externals/vcpkg/ports/libimobiledevice/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libimobiledevice-win32/libimobiledevice + REF 0d4a7e905baeadafa098e629a5241fac6fbf7d24 # v1.3.7 + SHA512 db6369b2fa8e7b659948602ac8c4cd568bf37c0f73e58150f61f1af7000de95aa1a6a9ae546d6a37de4cb08a8059127fe5ed067351c4092c01a45350586f755a + HEAD_REF msvc-master +) + +configure_file("${CURRENT_PORT_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libimobiledevice/vcpkg.json b/externals/vcpkg/ports/libimobiledevice/vcpkg.json new file mode 100755 index 000000000..48e63449b --- /dev/null +++ b/externals/vcpkg/ports/libimobiledevice/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "libimobiledevice", + "version": "1.3.17", + "description": "A cross-platform protocol library to communicate with iOS devices", + "homepage": "http://www.libimobiledevice.org", + "dependencies": [ + "dirent", + "getopt", + "libplist", + "libusbmuxd", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libirecovery/portfile.cmake b/externals/vcpkg/ports/libirecovery/portfile.cmake new file mode 100755 index 000000000..5fd9c0ee8 --- /dev/null +++ b/externals/vcpkg/ports/libirecovery/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libimobiledevice-win32/libirecovery + REF 1.0.25 + SHA512 0dd91d4fe3ded2bc1bbd91aea964e31e7f59bce18be01aa096e974f37dc1be281644d6c44e3f9b49470dd961e3df2e3ff8a09bcc6b803a959073e7d7d9a8d3e7 + HEAD_REF msvc-master +) + +vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH libirecovery.sln + INCLUDES_SUBPATH include + LICENSE_SUBPATH COPYING + USE_VCPKG_INTEGRATION + ALLOW_ROOT_INCLUDES +) + +file(REMOVE ${CURRENT_PACKAGES_DIR}/include/Makefile.am) diff --git a/externals/vcpkg/ports/libirecovery/vcpkg.json b/externals/vcpkg/ports/libirecovery/vcpkg.json new file mode 100755 index 000000000..f02d8db58 --- /dev/null +++ b/externals/vcpkg/ports/libirecovery/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libirecovery", + "version-string": "1.0.25", + "port-version": 4, + "description": "Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux", + "supports": "!(windows & arm64)", + "dependencies": [ + "getopt", + "libusbmuxd", + "readline" + ] +} diff --git a/externals/vcpkg/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch b/externals/vcpkg/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch new file mode 100755 index 000000000..c8cc84d97 --- /dev/null +++ b/externals/vcpkg/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch @@ -0,0 +1,176 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 10a198f..68ac5a3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -168,6 +168,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE) + boolean_number(ENABLE_SHARED) + option(ENABLE_STATIC "Build static libraries" TRUE) + boolean_number(ENABLE_STATIC) ++option(ENABLE_EXECUTABLES "Build executables" TRUE) ++boolean_number(ENABLE_EXECUTABLES) ++option(INSTALL_DOCS "Install doc files" TRUE) ++boolean_number(INSTALL_DOCS) ++option(INSTALL_HEADERS "Install header files" TRUE) ++boolean_number(INSTALL_HEADERS) + option(REQUIRE_SIMD "Generate a fatal error if SIMD extensions are not available for this platform (default is to fall back to a non-SIMD build)" FALSE) + boolean_number(REQUIRE_SIMD) + option(WITH_12BIT "Encode/decode JPEG images with 12-bit samples (implies WITH_ARITH_DEC=0 WITH_ARITH_ENC=0 WITH_JAVA=0 WITH_SIMD=0 WITH_TURBOJPEG=0 )" FALSE) +@@ -634,6 +640,7 @@ if(WITH_TURBOJPEG) + LINK_FLAGS "${TJMAPFLAG}${TJMAPFILE}") + endif() + ++ if(ENABLE_EXECUTABLES) + add_executable(tjunittest tjunittest.c tjutil.c md5/md5.c md5/md5hl.c) + target_link_libraries(tjunittest turbojpeg) + +@@ -646,6 +653,7 @@ if(WITH_TURBOJPEG) + add_executable(tjexample tjexample.c) + target_link_libraries(tjexample turbojpeg) + endif() ++ endif() + + if(ENABLE_STATIC) + add_library(turbojpeg-static STATIC ${JPEG_SOURCES} $ +@@ -657,6 +665,7 @@ if(WITH_TURBOJPEG) + set_target_properties(turbojpeg-static PROPERTIES OUTPUT_NAME turbojpeg) + endif() + ++ if(ENABLE_EXECUTABLES) + add_executable(tjunittest-static tjunittest.c tjutil.c md5/md5.c + md5/md5hl.c) + target_link_libraries(tjunittest-static turbojpeg-static) +@@ -666,6 +675,7 @@ if(WITH_TURBOJPEG) + if(UNIX) + target_link_libraries(tjbench-static m) + endif() ++ endif() + endif() + endif() + +@@ -680,7 +690,7 @@ else() + set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c) + endif() + +-if(ENABLE_STATIC) ++if(ENABLE_STATIC AND ENABLE_EXECUTABLES) + add_executable(cjpeg-static cjpeg.c cdjpeg.c rdgif.c rdppm.c rdswitch.c + ${CJPEG_BMP_SOURCES}) + set_property(TARGET cjpeg-static PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS}) +@@ -696,10 +706,11 @@ if(ENABLE_STATIC) + set_property(TARGET jpegtran-static PROPERTY COMPILE_FLAGS "${USE_SETMODE}") + endif() + ++if(ENABLE_EXECUTABLES) + add_executable(rdjpgcom rdjpgcom.c) + + add_executable(wrjpgcom wrjpgcom.c) +- ++endif() + + ############################################################################### + # TESTS +@@ -1434,8 +1445,10 @@ if(WITH_TURBOJPEG) + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ if(ENABLE_EXECUTABLES) + install(TARGETS tjbench + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ endif() + if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND + CMAKE_C_LINKER_SUPPORTS_PDB) + install(FILES "$" +@@ -1446,7 +1459,7 @@ if(WITH_TURBOJPEG) + install(TARGETS turbojpeg-static EXPORT ${CMAKE_PROJECT_NAME}Targets + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +- if(NOT ENABLE_SHARED) ++ if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES) + if(MSVC_IDE OR XCODE) + set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}") + else() +@@ -1456,15 +1469,17 @@ if(WITH_TURBOJPEG) + DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME tjbench${EXE}) + endif() + endif() ++ if(INSTALL_HEADERS) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++ endif() + endif() + + if(ENABLE_STATIC) + install(TARGETS jpeg-static EXPORT ${CMAKE_PROJECT_NAME}Targets + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +- if(NOT ENABLE_SHARED) ++ if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES) + if(MSVC_IDE OR XCODE) + set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}") + else() +@@ -1479,8 +1494,11 @@ if(ENABLE_STATIC) + endif() + endif() + ++if(ENABLE_EXECUTABLES) + install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++endif() + ++if(INSTALL_DOCS) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg + ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt + ${CMAKE_CURRENT_SOURCE_DIR}/tjexample.c +@@ -1492,8 +1510,9 @@ if(WITH_JAVA) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java + DESTINATION ${CMAKE_INSTALL_DOCDIR}) + endif() ++endif() + +-if(UNIX OR MINGW) ++if((UNIX OR MINGW) AND INSTALL_DOCS) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cjpeg.1 + ${CMAKE_CURRENT_SOURCE_DIR}/djpeg.1 ${CMAKE_CURRENT_SOURCE_DIR}/jpegtran.1 + ${CMAKE_CURRENT_SOURCE_DIR}/rdjpgcom.1 +@@ -1511,10 +1530,12 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets + NAMESPACE ${CMAKE_PROJECT_NAME}:: + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME}) + ++if(INSTALL_HEADERS) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h + ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h + ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++endif() + + include(cmakescripts/BuildPackages.cmake) + +diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt +index 78a2f28..e653b2d 100644 +--- a/sharedlib/CMakeLists.txt ++++ b/sharedlib/CMakeLists.txt +@@ -71,6 +71,7 @@ else() + set(DJPEG_BMP_SOURCES ../wrbmp.c ../wrtarga.c) + endif() + ++if(ENABLE_EXECUTABLES) + add_executable(cjpeg ../cjpeg.c ../cdjpeg.c ../rdgif.c ../rdppm.c + ../rdswitch.c ${CJPEG_BMP_SOURCES}) + set_property(TARGET cjpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS}) +@@ -87,14 +88,17 @@ set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "${USE_SETMODE}") + + add_executable(jcstest ../jcstest.c) + target_link_libraries(jcstest jpeg) ++endif() + + install(TARGETS jpeg EXPORT ${CMAKE_PROJECT_NAME}Targets + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++if(ENABLE_EXECUTABLES) + install(TARGETS cjpeg djpeg jpegtran + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++endif() + if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND + CMAKE_C_LINKER_SUPPORTS_PDB) + install(FILES "$" diff --git a/externals/vcpkg/ports/libjpeg-turbo/portfile.cmake b/externals/vcpkg/ports/libjpeg-turbo/portfile.cmake new file mode 100755 index 000000000..6a3bd056b --- /dev/null +++ b/externals/vcpkg/ports/libjpeg-turbo/portfile.cmake @@ -0,0 +1,97 @@ +if(EXISTS "${CURRENT_INSTALLED_DIR}/share/mozjpeg/copyright") + message(FATAL_ERROR "Can't build ${PORT} if mozjpeg is installed. Please remove mozjpeg:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libjpeg-turbo/libjpeg-turbo + REF c5f269eb9665435271c05fbcaf8721fa58e9eafa # 2.1.3 + SHA512 5d1c3cbbc7628339cfedc0f81a65ceb972aba2b8ffcc72d001f87526d0ff468f83665c78165051aa95c39200d9aaa6aee76e01266a4ea9cddb678dc6ef17ec27 + HEAD_REF master + PATCHES + add-options-for-exes-docs-headers.patch + # workaround for vcpkg bug see #5697 on github for more information + workaround_cmake_system_processor.patch +) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR (VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")) + set(LIBJPEGTURBO_SIMD -DWITH_SIMD=ON -DNEON_INTRINSICS=ON) +else() + set(LIBJPEGTURBO_SIMD -DWITH_SIMD=ON) + vcpkg_find_acquire_program(NASM) + get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) + set(ENV{PATH} "$ENV{PATH};${NASM_EXE_PATH}") +endif() + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(ENV{_CL_} "-DNO_GETENV -DNO_PUTENV") +endif() + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" WITH_CRT_DLL) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + jpeg7 WITH_JPEG7 + jpeg8 WITH_JPEG8 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENABLE_STATIC=${ENABLE_STATIC} + -DENABLE_SHARED=${ENABLE_SHARED} + -DENABLE_EXECUTABLES=OFF + -DINSTALL_DOCS=OFF + -DWITH_CRT_DLL=${WITH_CRT_DLL} + ${FEATURE_OPTIONS} + ${LIBJPEGTURBO_SIMD} + OPTIONS_DEBUG + -DINSTALL_HEADERS=OFF + MAYBE_UNUSED_VARIABLES + WITH_CRT_DLL +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libjpeg-turbo) + +# Rename libraries for static builds +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/jpeg.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/turbojpeg.lib") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib") + endif() + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + + if (EXISTS "${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-debug.cmake") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-debug.cmake" + "jpeg-static${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "jpeg${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-debug.cmake" + "turbojpeg-static${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "turbojpeg${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + endif() + if (EXISTS "${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-release.cmake") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-release.cmake" + "jpeg-static${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "jpeg${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-release.cmake" + "turbojpeg-static${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "turbojpeg${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + endif() +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/share/man") + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/jpeg") + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libjpeg-turbo/usage b/externals/vcpkg/ports/libjpeg-turbo/usage new file mode 100755 index 000000000..ccd47717f --- /dev/null +++ b/externals/vcpkg/ports/libjpeg-turbo/usage @@ -0,0 +1,5 @@ +The package libjpeg-turbo is compatible with built-in CMake targets: + + find_package(JPEG REQUIRED) + target_link_libraries(main PRIVATE ${JPEG_LIBRARIES}) + target_include_directories(main PRIVATE ${JPEG_INCLUDE_DIR}) diff --git a/externals/vcpkg/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..d63c58b0a --- /dev/null +++ b/externals/vcpkg/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,38 @@ +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0054 NEW) +find_path(JPEG_INCLUDE_DIR NAMES jpeglib.h PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" NO_DEFAULT_PATH) +find_library(JPEG_LIBRARY_RELEASE NAMES jpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) +find_library(JPEG_LIBRARY_DEBUG NAMES jpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) +if(CMAKE_VERSION VERSION_LESS 3.12 AND CMAKE_BUILD_TYPE STREQUAL "Debug") + set(JPEG_LIBRARY "${JPEG_LIBRARY_DEBUG}" CACHE FILEPATH "") +endif() +_find_package(${ARGS}) +if(JPEG_FOUND AND NOT TARGET JPEG::JPEG) + # Backfill JPEG::JPEG to versions of cmake before 3.12 + add_library(JPEG::JPEG UNKNOWN IMPORTED) + if(DEFINED JPEG_INCLUDE_DIRS) + set_target_properties(JPEG::JPEG PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${JPEG_INCLUDE_DIRS}") + endif() + if(EXISTS "${JPEG_LIBRARY}") + set_target_properties(JPEG::JPEG PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_LOCATION "${JPEG_LIBRARY}") + endif() + if(EXISTS "${JPEG_LIBRARY_RELEASE}") + set_property(TARGET JPEG::JPEG APPEND PROPERTY + IMPORTED_CONFIGURATIONS RELEASE) + set_target_properties(JPEG::JPEG PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C" + IMPORTED_LOCATION_RELEASE "${JPEG_LIBRARY_RELEASE}") + endif() + if(EXISTS "${JPEG_LIBRARY_DEBUG}") + set_property(TARGET JPEG::JPEG APPEND PROPERTY + IMPORTED_CONFIGURATIONS DEBUG) + set_target_properties(JPEG::JPEG PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C" + IMPORTED_LOCATION_DEBUG "${JPEG_LIBRARY_DEBUG}") + endif() +endif() +cmake_policy(POP) diff --git a/externals/vcpkg/ports/libjpeg-turbo/vcpkg.json b/externals/vcpkg/ports/libjpeg-turbo/vcpkg.json new file mode 100755 index 000000000..564f93079 --- /dev/null +++ b/externals/vcpkg/ports/libjpeg-turbo/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "libjpeg-turbo", + "version": "2.1.3", + "port-version": 3, + "description": "libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.", + "homepage": "https://github.com/libjpeg-turbo/libjpeg-turbo", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "jpeg7": { + "description": "Emulate libjpeg v7 API/ABI (this makes libjpeg-turbo backward-incompatible with libjpeg v6b!)" + }, + "jpeg8": { + "description": "Emulate libjpeg v8 API/ABI (this makes libjpeg-turbo backward-incompatible with libjpeg v6b!)" + } + } +} diff --git a/externals/vcpkg/ports/libjpeg-turbo/workaround_cmake_system_processor.patch b/externals/vcpkg/ports/libjpeg-turbo/workaround_cmake_system_processor.patch new file mode 100755 index 000000000..c99ff57d8 --- /dev/null +++ b/externals/vcpkg/ports/libjpeg-turbo/workaround_cmake_system_processor.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6dd83d3a..5cd717f5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -54,7 +54,7 @@ message(STATUS "VERSION = ${VERSION}, BUILD = ${BUILD}") + + # Detect CPU type and whether we're building 64-bit or 32-bit code + math(EXPR BITS "${CMAKE_SIZEOF_VOID_P} * 8") +-string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} CMAKE_SYSTEM_PROCESSOR_LC) ++string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" CMAKE_SYSTEM_PROCESSOR_LC) + set(COUNT 1) + foreach(ARCH ${CMAKE_OSX_ARCHITECTURES}) + if(COUNT GREATER 1) diff --git a/externals/vcpkg/ports/libjuice/fix-for-vcpkg.patch b/externals/vcpkg/ports/libjuice/fix-for-vcpkg.patch new file mode 100755 index 000000000..97d0acf54 --- /dev/null +++ b/externals/vcpkg/ports/libjuice/fix-for-vcpkg.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3e2a2dc..011a4ca 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -66,7 +66,7 @@ set(TESTS_SOURCES + set(THREADS_PREFER_PTHREAD_FLAG ON) + find_package(Threads REQUIRED) + +-add_library(juice SHARED ${LIBJUICE_SOURCES}) ++add_library(juice ${LIBJUICE_SOURCES}) + set_target_properties(juice PROPERTIES VERSION ${PROJECT_VERSION}) + target_include_directories(juice PUBLIC + $ +@@ -96,11 +96,15 @@ if(WIN32) + endif() + + if (USE_NETTLE) +- find_package(Nettle REQUIRED) ++ find_path(NETTLE_INCLUDE_PATH "nettle/hmac.h" REQUIRED) ++ find_library(NETTLE_LIBRARY_PATH NAMES nettle libnettle REQUIRED) ++ target_include_directories(juice PRIVATE ${NETTLE_INCLUDE_PATH}) ++ target_include_directories(juice-static PRIVATE ${NETTLE_INCLUDE_PATH}) ++ + target_compile_definitions(juice PRIVATE USE_NETTLE=1) +- target_link_libraries(juice PRIVATE Nettle::Nettle) ++ target_link_libraries(juice PRIVATE ${NETTLE_LIBRARY_PATH}) + target_compile_definitions(juice-static PRIVATE USE_NETTLE=1) +- target_link_libraries(juice-static PRIVATE Nettle::Nettle) ++ target_link_libraries(juice-static PRIVATE ${NETTLE_LIBRARY_PATH}) + else() + target_compile_definitions(juice PRIVATE USE_NETTLE=0) + target_compile_definitions(juice-static PRIVATE USE_NETTLE=0) diff --git a/externals/vcpkg/ports/libjuice/portfile.cmake b/externals/vcpkg/ports/libjuice/portfile.cmake new file mode 100755 index 000000000..cba06928d --- /dev/null +++ b/externals/vcpkg/ports/libjuice/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO paullouisageneau/libjuice + REF ae954be55f17a100e99650d6c1286e80929a66bb #v1.0.0 + SHA512 1b303ddfc7b903e0ba5f35580a6ce2350e12d4ef6cbbe97dbd090e863b664ca7b2f13da24d70b20cfd30a9c1208779b9b9c8c2df9ff9a21f12f3fc1bfdc09b0e + HEAD_REF master + PATCHES + fix-for-vcpkg.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + nettle USE_NETTLE +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DNO_TESTS=ON +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_cmake_config_fixup(PACKAGE_NAME LibJuice CONFIG_PATH lib/cmake/LibJuice) +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/libjuice/vcpkg.json b/externals/vcpkg/ports/libjuice/vcpkg.json new file mode 100755 index 000000000..8be1cb3d1 --- /dev/null +++ b/externals/vcpkg/ports/libjuice/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "libjuice", + "version": "1.0.0", + "description": "The library is a simplified implementation of the Interactive Connectivity Establishment (ICE) protocol in C for POSIX platforms (including Linux and Apple macOS) and Microsoft Windows.", + "homepage": "https://github.com/paullouisageneau/libjuice", + "license": "LGPL-2.1-only", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "nettle": { + "description": "Use nettle for HMAC computation instead of the Builtin", + "dependencies": [ + "nettle" + ] + } + } +} diff --git a/externals/vcpkg/ports/libjxl/disable-jxl_extras.patch b/externals/vcpkg/ports/libjxl/disable-jxl_extras.patch new file mode 100755 index 000000000..32fbd6472 --- /dev/null +++ b/externals/vcpkg/ports/libjxl/disable-jxl_extras.patch @@ -0,0 +1,14 @@ +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index a366e51..257f87d 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -132,7 +132,9 @@ endif() #!MSVC + include(jxl.cmake) + + # Other libraries outside the core jxl library. ++if(JPEGXL_ENABLE_TOOLS) + include(jxl_extras.cmake) ++endif() + include(jxl_threads.cmake) + + # Install all the library headers from the source and the generated ones. There diff --git a/externals/vcpkg/ports/libjxl/fix-dependencies.patch b/externals/vcpkg/ports/libjxl/fix-dependencies.patch new file mode 100755 index 000000000..33e99713d --- /dev/null +++ b/externals/vcpkg/ports/libjxl/fix-dependencies.patch @@ -0,0 +1,151 @@ +diff --git a/lib/jxl.cmake b/lib/jxl.cmake +--- a/lib/jxl.cmake ++++ b/lib/jxl.cmake +@@ -3,6 +3,18 @@ + # Use of this source code is governed by a BSD-style + # license that can be found in the LICENSE file. + ++if(JPEGXL_ENABLE_TOOLS) ++find_package(lodepng CONFIG REQUIRED) ++endif() ++find_package(unofficial-brotli CONFIG REQUIRED) ++find_package(lcms2 CONFIG REQUIRED) ++ ++foreach(brlib IN ITEMS brotlienc brotlidec brotlicommon) ++ add_library(${brlib} ALIAS unofficial::brotli::${brlib}-static) ++ add_library(${brlib}-static ALIAS unofficial::brotli::${brlib}-static) ++endforeach() ++add_library(lcms2 ALIAS lcms2::lcms2) ++ + # Lists all source files for the JPEG XL decoder library. These are also used + # by the encoder: the encoder uses both dec and enc ourse files, while the + # decoder uses only dec source files. +diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt +--- a/third_party/CMakeLists.txt ++++ b/third_party/CMakeLists.txt +@@ -88,18 +88,16 @@ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/highway/CMakeLists.txt" AND + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/highway/LICENSE" + ${PROJECT_BINARY_DIR}/LICENSE.highway COPYONLY) + else() +- pkg_check_modules(HWY libhwy) +- if (NOT HWY_FOUND) ++ find_path(HWY_INCLUDE_DIRS "hwy/highway.h") ++ find_library(HWY_LINK_LIBRARIES hwy) ++ if (NOT HWY_INCLUDE_DIRS OR NOT HWY_LINK_LIBRARIES) + message(FATAL_ERROR +- "Highway library (hwy) not found. Install libhwy-dev or download it " +- "to third_party/highway from https://github.com/google/highway . " +- "Highway is required to build JPEG XL. You can run " +- "${PROJECT_SOURCE_DIR}/deps.sh to download this dependency.") ++ "Highway library (hwy) not found.") + endif() + add_library(hwy INTERFACE IMPORTED GLOBAL) + if(${CMAKE_VERSION} VERSION_LESS "3.13.5") +- set_property(TARGET hwy PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${HWY_INCLUDE_DIR}) +- target_link_libraries(hwy INTERFACE ${HWY_LDFLAGS}) ++ set_property(TARGET hwy PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${HWY_INCLUDE_DIRS}) ++ target_link_libraries(hwy INTERFACE ${HWY_LINK_LIBRARIES}) + set_property(TARGET hwy PROPERTY INTERFACE_COMPILE_OPTIONS ${HWY_CFLAGS_OTHER}) + else() + target_include_directories(hwy INTERFACE ${HWY_INCLUDE_DIRS}) +@@ -114,82 +112,12 @@ else() + endif() + + # lodepng +-if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lodepng/lodepng.h" ) +- message(FATAL_ERROR "Please run ${PROJECT_SOURCE_DIR}/deps.sh to fetch the " +- "build dependencies.") +-endif() +-include(lodepng.cmake) +-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/lodepng/LICENSE" +- ${PROJECT_BINARY_DIR}/LICENSE.lodepng COPYONLY) ++if(JPEGXL_ENABLE_TOOLS) ++find_package(lodepng CONFIG REQUIRED) ++endif() + + # brotli +-if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/brotli/c/include/brotli/decode.h" OR +- JPEGXL_FORCE_SYSTEM_BROTLI) +- # Create the libbrotli* and libbrotli*-static targets. +- foreach(brlib IN ITEMS brotlienc brotlidec brotlicommon) +- # Use uppercase like "BROTLIENC" for the cmake variables +- string(TOUPPER "${brlib}" BRPREFIX) +- pkg_check_modules(${BRPREFIX} lib${brlib}) +- if (${BRPREFIX}_FOUND) +- if(${CMAKE_VERSION} VERSION_LESS "3.13.5") +- add_library(${brlib} INTERFACE IMPORTED GLOBAL) +- set_property(TARGET ${brlib} PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${${BRPREFIX}_INCLUDE_DIR}) +- target_link_libraries(${brlib} INTERFACE ${${BRPREFIX}_LDFLAGS}) +- set_property(TARGET ${brlib} PROPERTY INTERFACE_COMPILE_OPTIONS ${${BRPREFIX}_CFLAGS_OTHER}) +- +- add_library(${brlib}-static INTERFACE IMPORTED GLOBAL) +- set_property(TARGET ${brlib}-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${${BRPREFIX}_INCLUDE_DIR}) +- target_link_libraries(${brlib}-static INTERFACE ${${BRPREFIX}_LDFLAGS}) +- set_property(TARGET ${brlib}-static PROPERTY INTERFACE_COMPILE_OPTIONS ${${BRPREFIX}_CFLAGS_OTHER}) +- else() +- add_library(${brlib} INTERFACE IMPORTED GLOBAL) +- target_include_directories(${brlib} +- INTERFACE ${${BRPREFIX}_INCLUDE_DIRS}) +- target_link_libraries(${brlib} +- INTERFACE ${${BRPREFIX}_LINK_LIBRARIES}) +- target_link_options(${brlib} +- INTERFACE ${${BRPREFIX}_LDFLAGS_OTHER}) +- target_compile_options(${brlib} +- INTERFACE ${${BRPREFIX}_CFLAGS_OTHER}) +- +- # TODO(deymo): Remove the -static library versions, this target is +- # currently needed by brunsli.cmake. When importing it this way, the +- # brotli*-static target is just an alias. +- add_library(${brlib}-static ALIAS ${brlib}) +- endif() +- endif() +- unset(BRPREFIX) +- endforeach() +- +- if (BROTLIENC_FOUND AND BROTLIDEC_FOUND AND BROTLICOMMON_FOUND) +- set(BROTLI_FOUND 1) +- else() +- set(BROTLI_FOUND 0) +- endif() +- +- if (NOT BROTLI_FOUND) +- message(FATAL_ERROR +- "Brotli not found, install brotli-dev or download brotli source code to" +- " third_party/brotli from https://github.com/google/brotli. You can use" +- " ${PROJECT_SOURCE_DIR}/deps.sh to download this dependency.") +- endif () +- if(JPEGXL_DEP_LICENSE_DIR) +- configure_file("${JPEGXL_DEP_LICENSE_DIR}/libbrotli-dev/copyright" +- ${PROJECT_BINARY_DIR}/LICENSE.brotli COPYONLY) +- endif() # JPEGXL_DEP_LICENSE_DIR +-else() +- # Compile brotli from sources. +- set(BROTLI_DISABLE_TESTS ON CACHE STRING "Disable Brotli tests") +- add_subdirectory(brotli EXCLUDE_FROM_ALL) +- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/brotli/LICENSE" +- ${PROJECT_BINARY_DIR}/LICENSE.brotli COPYONLY) +- if(BROTLI_EMSCRIPTEN) +- # Brotli only defines the -static targets when using emscripten. +- foreach(brlib IN ITEMS brotlienc brotlidec brotlicommon) +- add_library(${brlib} ALIAS ${brlib}-static) +- endforeach() +- endif() # BROTLI_EMSCRIPTEN +-endif() ++find_package(unofficial-brotli CONFIG REQUIRED) + + # *cms + if (JPEGXL_ENABLE_SKCMS OR JPEGXL_ENABLE_PLUGINS) +@@ -202,12 +128,7 @@ if (JPEGXL_ENABLE_SKCMS OR JPEGXL_ENABLE_PLUGINS) + ${PROJECT_BINARY_DIR}/LICENSE.skcms COPYONLY) + endif () + if (JPEGXL_ENABLE_VIEWERS OR NOT JPEGXL_ENABLE_SKCMS) +- if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lcms/.git" ) +- message(SEND_ERROR "Please run git submodule update --init") +- endif() +- include(lcms2.cmake) +- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/lcms/COPYING" +- ${PROJECT_BINARY_DIR}/LICENSE.lcms COPYONLY) ++ find_package(lcms2 CONFIG REQUIRED) + endif() + + # sjpeg diff --git a/externals/vcpkg/ports/libjxl/fix-install-directories.patch b/externals/vcpkg/ports/libjxl/fix-install-directories.patch new file mode 100755 index 000000000..d5bdc811d --- /dev/null +++ b/externals/vcpkg/ports/libjxl/fix-install-directories.patch @@ -0,0 +1,36 @@ +diff --git a/lib/jxl.cmake b/lib/jxl.cmake +--- a/lib/jxl.cmake ++++ b/lib/jxl.cmake +@@ -487,8 +487,8 @@ if (NOT WIN32) + set_target_properties(jxl-static PROPERTIES OUTPUT_NAME "jxl") + set_target_properties(jxl_dec-static PROPERTIES OUTPUT_NAME "jxl_dec") + endif() +-install(TARGETS jxl-static DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-install(TARGETS jxl_dec-static DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(TARGETS jxl-static) ++install(TARGETS jxl_dec-static) + + if (((NOT DEFINED "${TARGET_SUPPORTS_SHARED_LIBS}") OR + TARGET_SUPPORTS_SHARED_LIBS) AND NOT JPEGXL_STATIC) +@@ -548,8 +548,7 @@ endforeach() + # Only install libjxl shared library. The libjxl_dec is not installed since it + # contains symbols also in libjxl which would conflict if programs try to use + # both. +-install(TARGETS jxl +- DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(TARGETS jxl) + else() + add_library(jxl ALIAS jxl-static) + add_library(jxl_dec ALIAS jxl_dec-static) +diff --git a/lib/jxl_threads.cmake b/lib/jxl_threads.cmake +--- a/lib/jxl_threads.cmake ++++ b/lib/jxl_threads.cmake +@@ -43,7 +43,7 @@ set_target_properties(${_target} PROPERTIES + if (NOT WIN32) + set_target_properties(${_target} PROPERTIES OUTPUT_NAME "jxl_threads") + endif() +-install(TARGETS ${_target} DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(TARGETS ${_target}) + + endfunction() + diff --git a/externals/vcpkg/ports/libjxl/fix-link-flags.patch b/externals/vcpkg/ports/libjxl/fix-link-flags.patch new file mode 100755 index 000000000..98399189c --- /dev/null +++ b/externals/vcpkg/ports/libjxl/fix-link-flags.patch @@ -0,0 +1,15 @@ +diff --git a/lib/jxl.cmake b/lib/jxl.cmake +index 63539cc..2e1d617 100644 +--- a/lib/jxl.cmake ++++ b/lib/jxl.cmake +@@ -551,8 +551,10 @@ foreach(target IN ITEMS jxl jxl_dec) + # This hides the default visibility symbols from static libraries bundled into + # the shared library. In particular this prevents exposing symbols from hwy + # and skcms in the shared library. ++ if(NOT APPLE AND NOT MSVC) + set_property(TARGET ${target} APPEND_STRING PROPERTY + LINK_FLAGS " -Wl,--exclude-libs=ALL") ++ endif() + endforeach() + + # Only install libjxl shared library. The libjxl_dec is not installed since it diff --git a/externals/vcpkg/ports/libjxl/portfile.cmake b/externals/vcpkg/ports/libjxl/portfile.cmake new file mode 100755 index 000000000..31c68f337 --- /dev/null +++ b/externals/vcpkg/ports/libjxl/portfile.cmake @@ -0,0 +1,117 @@ +set(JPEGXL_VERSION 0.6.1) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libjxl/libjxl + REF "v${JPEGXL_VERSION}" + SHA512 302935d722160b0b288ac63301f9e95caf82eccf6ad76c4f4da6316a0314ee3562115932b1ceacb0d02708de0a07788992d3478cae73af0b90193f5769f9fb52 + HEAD_REF main + PATCHES + fix-install-directories.patch + fix-dependencies.patch + fix-link-flags.patch + disable-jxl_extras.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools JPEGXL_ENABLE_TOOLS + INVERTED_FEATURES + tools CMAKE_DISABLE_FIND_PACKAGE_GIF + tools CMAKE_DISABLE_FIND_PACKAGE_JPEG + tools CMAKE_DISABLE_FIND_PACKAGE_PNG + tools CMAKE_DISABLE_FIND_PACKAGE_ZLIB +) + +if(VCPKG_TARGET_IS_UWP) + string(APPEND VCPKG_C_FLAGS " -D_CRT_SECURE_NO_WARNINGS /wd4146") + string(APPEND VCPKG_CXX_FLAGS " -D_CRT_SECURE_NO_WARNINGS /wd4146") + + # Temporary workaround for #9390 + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + list(APPEND FEATURE_OPTIONS -DCMAKE_SYSTEM_PROCESSOR=x86) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + list(APPEND FEATURE_OPTIONS -DCMAKE_SYSTEM_PROCESSOR=AMD64) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + list(APPEND FEATURE_OPTIONS -DCMAKE_SYSTEM_PROCESSOR=ARM) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + list(APPEND FEATURE_OPTIONS -DCMAKE_SYSTEM_PROCESSOR=ARM64) + else() + message(FATAL_ERROR "Unsupported uwp VCPKG_TARGET_ARCHITECTURE \"${VCPKG_TARGET_ARCHITECTURE}\"") + endif() + # Workaround for vcpkg-cmake bug, proper fix in #21857 + set(_TARGETTING_UWP 1) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DJPEGXL_VERSION=${JPEGXL_VERSION}" + -DJPEGXL_FORCE_SYSTEM_HWY=ON + -DJPEGXL_FORCE_SYSTEM_BROTLI=ON + ${FEATURE_OPTIONS} + -DJPEGXL_ENABLE_FUZZERS=OFF + -DJPEGXL_ENABLE_MANPAGES=OFF + -DJPEGXL_ENABLE_BENCHMARK=OFF + -DJPEGXL_ENABLE_EXAMPLES=OFF + -DJPEGXL_ENABLE_JNI=OFF + -DJPEGXL_ENABLE_SJPEG=OFF + -DJPEGXL_ENABLE_OPENEXR=OFF + -DJPEGXL_ENABLE_PLUGINS=OFF + -DJPEGXL_ENABLE_SKCMS=OFF + -DJPEGXL_ENABLE_TCMALLOC=OFF + -DBUILD_TESTING=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=1 + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_GIF + CMAKE_DISABLE_FIND_PACKAGE_JPEG + CMAKE_DISABLE_FIND_PACKAGE_PNG + CMAKE_DISABLE_FIND_PACKAGE_ZLIB +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +if(JPEGXL_ENABLE_TOOLS) + vcpkg_copy_tools(TOOL_NAMES cjxl djxl AUTO_CLEAN) +endif() + +# libjxl always builds static and dynamic libraries, so we delete the variant that we don't need +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if(VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) + set(FILES_TO_REMOVE + "${CURRENT_PACKAGES_DIR}/lib/jxl.lib" + "${CURRENT_PACKAGES_DIR}/lib/jxl_threads.lib" + "${CURRENT_PACKAGES_DIR}/debug/lib/jxl.lib" + "${CURRENT_PACKAGES_DIR}/debug/lib/jxl_threads.lib" + ) + else() + file(GLOB FILES_TO_REMOVE + "${CURRENT_PACKAGES_DIR}/lib/*.so*" + "${CURRENT_PACKAGES_DIR}/lib/*.dylib*" + "${CURRENT_PACKAGES_DIR}/debug/lib/*.so*" + "${CURRENT_PACKAGES_DIR}/debug/lib/*.dylib*" + ) + endif() +else() + if(VCPKG_TARGET_IS_WINDOWS) + file(GLOB FILES_TO_REMOVE + "${CURRENT_PACKAGES_DIR}/lib/*-static.lib" + "${CURRENT_PACKAGES_DIR}/debug/lib/*-static.lib" + ) + else() + file(GLOB FILES_TO_REMOVE + "${CURRENT_PACKAGES_DIR}/lib/*.a" + "${CURRENT_PACKAGES_DIR}/debug/lib/*.a" + ) + endif() +endif() +file(REMOVE ${FILES_TO_REMOVE}) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libjxl/vcpkg.json b/externals/vcpkg/ports/libjxl/vcpkg.json new file mode 100755 index 000000000..aa0c58f7c --- /dev/null +++ b/externals/vcpkg/ports/libjxl/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "libjxl", + "version-semver": "0.6.1", + "port-version": 1, + "description": "JPEG XL image format reference implementation", + "homepage": "https://github.com/libjxl/libjxl", + "license": "BSD-3-Clause", + "dependencies": [ + "brotli", + "highway", + "lcms", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "tools": { + "description": "Build user tools: cjxl and djxl", + "dependencies": [ + "giflib", + "libjpeg-turbo", + "libpng", + "lodepng", + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/libkeyfinder/portfile.cmake b/externals/vcpkg/ports/libkeyfinder/portfile.cmake new file mode 100755 index 000000000..afd3dd1d1 --- /dev/null +++ b/externals/vcpkg/ports/libkeyfinder/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mixxxdj/libkeyfinder + REF v2.2.6 + SHA512 c1b771cebfb925db521a344e28fd1d3bc6e6e921e45dcc81f90926e5b2020fea201a4bc05a65177d3559208a45746fd7784eb6f37352bb10ab7d7b820b40c0b6 + HEAD_REF main +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + test BUILD_TESTING +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME KeyFinder CONFIG_PATH lib/cmake/KeyFinder) +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/externals/vcpkg/ports/libkeyfinder/vcpkg.json b/externals/vcpkg/ports/libkeyfinder/vcpkg.json new file mode 100755 index 000000000..f362d64cc --- /dev/null +++ b/externals/vcpkg/ports/libkeyfinder/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "libkeyfinder", + "version": "2.2.6", + "description": "Musical key detection for digital audio", + "homepage": "https://github.com/mixxxdj/libkeyfinder", + "license": "GPL-3.0-or-later", + "dependencies": [ + "fftw3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "test": { + "description": "Build tests", + "dependencies": [ + "catch2" + ] + } + } +} diff --git a/externals/vcpkg/ports/libkml/patch_empty_literal_on_vc.patch b/externals/vcpkg/ports/libkml/patch_empty_literal_on_vc.patch new file mode 100755 index 000000000..8a3581a05 --- /dev/null +++ b/externals/vcpkg/ports/libkml/patch_empty_literal_on_vc.patch @@ -0,0 +1,13 @@ +diff --git a/src/kml/base/file_win32.cc b/src/kml/base/file_win32.cc +index c46e099..28ccb36 100644 +--- a/src/kml/base/file_win32.cc ++++ b/src/kml/base/file_win32.cc +@@ -42,7 +42,7 @@ namespace kmlbase { + // Internal to the win32 file class. We need a conversion from string to + // LPCWSTR. + static std::wstring Str2Wstr(const string& str) { +- std::wstring wstr(str.length(), L''); ++ std::wstring wstr(str.length(), L' '); + std::copy(str.begin(), str.end(), wstr.begin()); + return wstr; + } diff --git a/externals/vcpkg/ports/libkml/portfile.cmake b/externals/vcpkg/ports/libkml/portfile.cmake new file mode 100755 index 000000000..ce54b1c7e --- /dev/null +++ b/externals/vcpkg/ports/libkml/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libkml/libkml + REF 1.3.0 + SHA512 aa48158103d3af764bf98c1fb4cf3e1356b9cc6c8e79d80b96850916f0a8ccb1dac3a46427735dd0bf20647daa047d10e722ac3da2a214d4c1559bf6d5d7c853 + HEAD_REF master + PATCHES + patch_empty_literal_on_vc.patch +) + +file(REMOVE ${SOURCE_PATH}/cmake/External_boost.cmake) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +elseif (VCPKG_TARGET_IS_LINUX) + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libkml) +elseif (VCPKG_TARGET_IS_OSX) + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libkml) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/libkml/vcpkg.json b/externals/vcpkg/ports/libkml/vcpkg.json new file mode 100755 index 000000000..fa70197a2 --- /dev/null +++ b/externals/vcpkg/ports/libkml/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "libkml", + "version-string": "1.3.0", + "port-version": 8, + "description": "Reference implementation of OGC KML 2.2", + "homepage": "https://github.com/libkml/libkml", + "dependencies": [ + "boost-smart-ptr", + "expat", + { + "name": "minizip", + "features": [ + "bzip2" + ] + }, + "uriparser", + "zlib" + ] +} diff --git a/externals/vcpkg/ports/liblas/fix-boost-headers.patch b/externals/vcpkg/ports/liblas/fix-boost-headers.patch new file mode 100755 index 000000000..4725a6ceb --- /dev/null +++ b/externals/vcpkg/ports/liblas/fix-boost-headers.patch @@ -0,0 +1,55 @@ +diff --git a/include/liblas/detail/binary.hpp b/include/liblas/detail/binary.hpp +index d3116a1..ab20e06 100644 +--- a/include/liblas/detail/binary.hpp ++++ b/include/liblas/detail/binary.hpp +@@ -17,6 +17,8 @@ + #ifndef LIBLAS_DETAIL_BINARY_HPP_INCLUDED + #define LIBLAS_DETAIL_BINARY_HPP_INCLUDED + ++#include ++ + #include + #include + #include +@@ -25,7 +27,6 @@ + + #include + #include +-#include + #include + + #if CHAR_BIT != 8 +@@ -43,7 +44,7 @@ namespace detail { namespace binary { + struct big_endian_tag {}; + struct little_endian_tag {}; + +-#ifdef BOOST_BIG_ENDIAN ++#ifdef LIBLAS_BIG_ENDIAN + typedef big_endian_tag native_endian_tag; + #else + typedef little_endian_tag native_endian_tag; +diff --git a/src/c_api.cpp b/src/c_api.cpp +index a70fe74..e8be785 100644 +--- a/src/c_api.cpp ++++ b/src/c_api.cpp +@@ -96,6 +96,7 @@ using namespace liblas; + #endif + + #include ++#include + + bool IsReprojectionTransform(liblas::TransformPtr const& p) + { +diff --git a/src/header.cpp b/src/header.cpp +index 9987ce1..a5c8f7d 100644 +--- a/src/header.cpp ++++ b/src/header.cpp +@@ -54,7 +54,7 @@ + // boost + #include + #include +- ++#include + //std + #include + #include diff --git a/externals/vcpkg/ports/liblas/portfile.cmake b/externals/vcpkg/ports/liblas/portfile.cmake new file mode 100755 index 000000000..a50ede2f6 --- /dev/null +++ b/externals/vcpkg/ports/liblas/portfile.cmake @@ -0,0 +1,51 @@ +set(VERSION 1.8.1) + +vcpkg_download_distfile(ARCHIVE + URLS "http://download.osgeo.org/liblas/libLAS-${VERSION}.tar.bz2" + FILENAME "libLAS-${VERSION}-src.tar.bz2" + SHA512 1cb39c557af0006c54f1100d0d409977fcc1886abd155c1b144d806c47f8675a9f2125d3a9aca16bae65d2aabba84d5e5e322b42085e7db312f3d53f92342acf + HEAD_REF master +) + +vcpkg_extract_source_archive_ex( + ARCHIVE ${ARCHIVE} + OUT_SOURCE_PATH SOURCE_PATH + PATCHES + fix-boost-headers.patch +) + +file(REMOVE ${SOURCE_PATH}/cmake/modules/FindPROJ4.cmake) +file(REMOVE ${SOURCE_PATH}/cmake/modules/FindGeoTIFF.cmake) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_OSGEO4W=OFF # Disable osgeo4w + -DWITH_TESTS=OFF + -DWITH_UTILITIES=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=${CMAKE_DISABLE_FIND_PACKAGE_ZLIB} + -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=${CMAKE_DISABLE_FIND_PACKAGE_JPEG} +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/doc) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/doc) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/share/cmake/libLAS/liblas-depends.cmake) + +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +else() + vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/libLAS) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/liblas/vcpkg.json b/externals/vcpkg/ports/liblas/vcpkg.json new file mode 100755 index 000000000..049580bde --- /dev/null +++ b/externals/vcpkg/ports/liblas/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "liblas", + "version": "1.8.1", + "port-version": 9, + "description": "A C/C++ library for reading and writing the very common LAS LiDAR format.", + "dependencies": [ + "boost-detail", + "boost-filesystem", + "boost-interprocess", + "boost-iostreams", + "boost-lambda", + "boost-multi-index", + "boost-program-options", + "boost-system", + "boost-thread", + "boost-uuid", + "libgeotiff" + ], + "features": { + "jpeg": { + "description": "Support for jpeg", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "zlib": { + "description": "Support zlib for compression", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/liblbfgs/CMakeLists.txt b/externals/vcpkg/ports/liblbfgs/CMakeLists.txt new file mode 100755 index 000000000..34220b958 --- /dev/null +++ b/externals/vcpkg/ports/liblbfgs/CMakeLists.txt @@ -0,0 +1,21 @@ +cmake_minimum_required(VERSION 3.12 FATAL_ERROR) +PROJECT(liblbfgs) + +file(GLOB SOURCE_FILE + "lib/*.c" +) +file(GLOB HEADERS_FILE + "include/*.h" + "lib/*.h" +) +include_directories("include") +add_library (lbfgs STATIC ${SOURCE_FILE} ${HEADERS_FILE}) + +install(TARGETS lbfgs + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) + + +install(FILES ${HEADERS_FILE} DESTINATION include) \ No newline at end of file diff --git a/externals/vcpkg/ports/liblbfgs/portfile.cmake b/externals/vcpkg/ports/liblbfgs/portfile.cmake new file mode 100755 index 000000000..a793a23d9 --- /dev/null +++ b/externals/vcpkg/ports/liblbfgs/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO chokkan/liblbfgs + REF v1.10 + SHA512 2b08dc5d4fdd737575f58983fa7b6c143bc12edaca47b7aeadf221afe6e573fa4a53423f323f569aa93c9dbeafb9b80a6d2f755fec6da04e6b7221f0a67816f8 + HEAD_REF master +) + +message(STATUS "source path is : ${SOURCE_PATH}") + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/liblbfgs" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/liblbfgs/vcpkg.json b/externals/vcpkg/ports/liblbfgs/vcpkg.json new file mode 100755 index 000000000..8525cd588 --- /dev/null +++ b/externals/vcpkg/ports/liblbfgs/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "liblbfgs", + "version": "1.10", + "port-version": 2, + "description": "libLBFGS: a library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS)", + "homepage": "http://www.chokkan.org/software/liblbfgs/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/liblemon/cmake.patch b/externals/vcpkg/ports/liblemon/cmake.patch new file mode 100755 index 000000000..3b08a2d98 --- /dev/null +++ b/externals/vcpkg/ports/liblemon/cmake.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 03e1cc7..fd9d737 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -280,6 +280,13 @@ ELSEIF(WIN32) + ) + ENDIF() + ++install( ++ EXPORT lemon-targets ++ FILE lemon-config.cmake ++ NAMESPACE lemon:: ++ DESTINATION share/lemon ++) ++ + CONFIGURE_FILE( + ${PROJECT_SOURCE_DIR}/cmake/version.cmake.in + ${PROJECT_BINARY_DIR}/cmake/version.cmake +diff --git a/lemon/CMakeLists.txt b/lemon/CMakeLists.txt +index 4e6567e..76f9cae 100644 +--- a/lemon/CMakeLists.txt ++++ b/lemon/CMakeLists.txt +@@ -71,6 +71,11 @@ INSTALL( + COMPONENT library + ) + ++install(TARGETS lemon EXPORT lemon-targets ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++) ++ + INSTALL( + DIRECTORY . bits concepts + DESTINATION include/lemon diff --git a/externals/vcpkg/ports/liblemon/fixup-targets.patch b/externals/vcpkg/ports/liblemon/fixup-targets.patch new file mode 100755 index 000000000..883e2a6ee --- /dev/null +++ b/externals/vcpkg/ports/liblemon/fixup-targets.patch @@ -0,0 +1,50 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9a7c918..3d6cf35 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -268,7 +268,7 @@ CONFIGURE_FILE( + ${PROJECT_BINARY_DIR}/cmake/LEMONConfig.cmake + @ONLY + ) +-IF(UNIX) ++IF(UNIX OR TRUE) + INSTALL( + FILES ${PROJECT_BINARY_DIR}/cmake/LEMONConfig.cmake + DESTINATION share/lemon/cmake +@@ -282,9 +282,9 @@ ENDIF() + + install( + EXPORT lemon-targets +- FILE lemon-config.cmake +- NAMESPACE lemon:: +- DESTINATION share/lemon ++ FILE lemon-targets.cmake ++ NAMESPACE unofficial::lemon:: ++ DESTINATION share/lemon/cmake + ) + + CONFIGURE_FILE( +diff --git a/cmake/LEMONConfig.cmake.in b/cmake/LEMONConfig.cmake.in +index b0d2d8b..ce54986 100644 +--- a/cmake/LEMONConfig.cmake.in ++++ b/cmake/LEMONConfig.cmake.in +@@ -1,4 +1,4 @@ +-SET(LEMON_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include" CACHE PATH "LEMON include directory") ++SET(LEMON_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/../../include" CACHE PATH "LEMON include directory") + SET(LEMON_INCLUDE_DIRS "${LEMON_INCLUDE_DIR}") + + IF(UNIX) +@@ -7,7 +7,12 @@ ELSEIF(WIN32) + SET(LEMON_LIB_NAME "lemon.lib") + ENDIF(UNIX) + +-SET(LEMON_LIBRARY "@CMAKE_INSTALL_PREFIX@/lib/${LEMON_LIB_NAME}" CACHE FILEPATH "LEMON library") ++SET(LEMON_LIBRARY ++ optimized "${CMAKE_CURRENT_LIST_DIR}/../../lib/${LEMON_LIB_NAME}" ++ debug "${CMAKE_CURRENT_LIST_DIR}/../../debug/lib/${LEMON_LIB_NAME}" ++ CACHE FILEPATH "LEMON library") + SET(LEMON_LIBRARIES "${LEMON_LIBRARY}") + + MARK_AS_ADVANCED(LEMON_LIBRARY LEMON_INCLUDE_DIR) ++ ++include(${CMAKE_CURRENT_LIST_DIR}/lemon-targets.cmake) diff --git a/externals/vcpkg/ports/liblemon/portfile.cmake b/externals/vcpkg/ports/liblemon/portfile.cmake new file mode 100755 index 000000000..290b7e715 --- /dev/null +++ b/externals/vcpkg/ports/liblemon/portfile.cmake @@ -0,0 +1,45 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +set(VERSION ed2c21cbd6ef) + +vcpkg_download_distfile(ARCHIVE + URLS "http://lemon.cs.elte.hu/hg/lemon/archive/${VERSION}.zip" + FILENAME "lemon-${VERSION}.zip" + SHA512 029640e4f791a18068cb2e2b4e794d09822d9d56fb957eb3e2cceae3a30065c0041a31c465637cfcadf7b2473564070b34adc88513439cdf9046831854e2aa70 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${VERSION} + PATCHES + cmake.patch + fixup-targets.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DLEMON_ENABLE_GLPK=OFF + -DLEMON_ENABLE_ILOG=OFF + -DLEMON_ENABLE_COIN=OFF + -DLEMON_ENABLE_SOPLEX=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/lemon/cmake TARGET_PATH share/lemon) + +file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*.exe) +file(COPY ${EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/liblemon/) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/liblemon) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/liblemon/vcpkg.json b/externals/vcpkg/ports/liblemon/vcpkg.json new file mode 100755 index 000000000..7cbf85eb1 --- /dev/null +++ b/externals/vcpkg/ports/liblemon/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "liblemon", + "version-string": "2019-06-13", + "port-version": 3, + "description": "Library for Efficient Modeling and Optimization in Networks", + "homepage": "https://lemon.cs.elte.hu/trac/lemon" +} diff --git a/externals/vcpkg/ports/liblinear/CMakeLists.txt b/externals/vcpkg/ports/liblinear/CMakeLists.txt new file mode 100755 index 000000000..093b0f4ea --- /dev/null +++ b/externals/vcpkg/ports/liblinear/CMakeLists.txt @@ -0,0 +1,47 @@ +cmake_minimum_required(VERSION 3.9) +project(liblinear) + +add_definitions(-D_CRT_SECURE_NO_DEPRECATE) + +add_library(blas OBJECT + blas/daxpy.c + blas/ddot.c + blas/dnrm2.c + blas/dscal.c +) + +add_library(liblinear + linear.cpp + newton.cpp + $ +) +target_include_directories(liblinear PRIVATE .) +if(BUILD_SHARED_LIBS) + target_link_libraries(liblinear PRIVATE "-DEF:${CMAKE_CURRENT_SOURCE_DIR}/linear.def") +endif() + +add_executable(train train.c $) +target_link_libraries(train liblinear) + +add_executable(predict predict.c $) +target_link_libraries(predict liblinear) + +install( + TARGETS liblinear + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_TOOLS) + install( + TARGETS train predict + RUNTIME DESTINATION tools/liblinear + ) +endif() + +if(NOT DISABLE_INSTALL_HEADERS) + install( + FILES linear.h newton.h + DESTINATION include/liblinear) +endif() \ No newline at end of file diff --git a/externals/vcpkg/ports/liblinear/portfile.cmake b/externals/vcpkg/ports/liblinear/portfile.cmake new file mode 100755 index 000000000..245e35e25 --- /dev/null +++ b/externals/vcpkg/ports/liblinear/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cjlin1/liblinear + REF 60f1adf6f35d6f3e031c334b33dfe8399d6f8a9d #v243 + SHA512 0f88f8dd768313d0a9b3bb82e7b878d7173ea43ef609e993dc79e94398897373faf2688249b17111e2b6e06e78e26a50570a1b746dc4e73fb7416ccc24936c66 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON + -DDISABLE_INSTALL_TOOLS=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +if(NOT DISABLE_INSTALL_TOOLS) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/liblinear") +endif() + +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/liblinear/vcpkg.json b/externals/vcpkg/ports/liblinear/vcpkg.json new file mode 100755 index 000000000..a7eff708c --- /dev/null +++ b/externals/vcpkg/ports/liblinear/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "liblinear", + "version": "243", + "port-version": 1, + "description": "A Library for Large Linear Classification", + "homepage": "https://github.com/cjlin1/liblinear", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/liblo/portfile.cmake b/externals/vcpkg/ports/liblo/portfile.cmake new file mode 100755 index 000000000..f43a52423 --- /dev/null +++ b/externals/vcpkg/ports/liblo/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO radarsat1/liblo + REF 840ed69b1d669a1ce587eb592746e3dff6985d76 # 0.31 + SHA512 c84ab8ac874595df29fd121fff6ddaa670bcc31e7ca4e5cc0f35092032c9f648cd890bc7eea0152af87b842f8cc7804505ac84a13bac8a5d40e43039efa4aa2d + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/cmake + PREFER_NINJA # Disable this option if project cannot be built with Ninja + OPTIONS -DTHREADING=1 +) + +vcpkg_install_cmake() + +# Install needed files into package directory +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/liblo) + +vcpkg_copy_tools(TOOL_NAMES oscsend oscdump AUTO_CLEAN) + +# Remove unnecessary files +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblo RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/liblo/vcpkg.json b/externals/vcpkg/ports/liblo/vcpkg.json new file mode 100755 index 000000000..6d060c751 --- /dev/null +++ b/externals/vcpkg/ports/liblo/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "liblo", + "version-string": "0.31", + "port-version": 2, + "description": "liblo is an implementation of the Open Sound Control protocol for POSIX systems", + "homepage": "https://github.com/radarsat1/liblo" +} diff --git a/externals/vcpkg/ports/liblsl/portfile.cmake b/externals/vcpkg/ports/liblsl/portfile.cmake new file mode 100755 index 000000000..f41ac7318 --- /dev/null +++ b/externals/vcpkg/ports/liblsl/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sccn/liblsl + REF v1.16.0 # NOTE: when updating version, also change it in the parameter to vcpkg_cmake_configure + SHA512 bfd54c6cca944ed33622da74dc1417ab75b542002c02c83bb86c917fd5968936c4b56ec734bd6d757e9fa67364f9dc85fd15ed28697ed410305df4928cf6790b + HEAD_REF master + PATCHES + use-find-package-asio.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LSL_BUILD_STATIC) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DLSL_BUILD_STATIC=${LSL_BUILD_STATIC} + -DLSL_BUNDLED_BOOST=OFF # we use the boost vcpkg packages instead + -DLSL_BUNDLED_PUGIXML=OFF # we use the pugixml vcpkg package instead + -Dlslgitrevision=v1.16.0 + -Dlslgitbranch=master +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_copy_tools(TOOL_NAMES lslver AUTO_CLEAN) +vcpkg_cmake_config_fixup(PACKAGE_NAME LSL CONFIG_PATH lib/cmake/LSL) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/liblsl/use-find-package-asio.patch b/externals/vcpkg/ports/liblsl/use-find-package-asio.patch new file mode 100755 index 000000000..be837c674 --- /dev/null +++ b/externals/vcpkg/ports/liblsl/use-find-package-asio.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b47cb7f8..bd12f519 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -203,8 +203,9 @@ target_include_directories(lslobj + target_include_directories(lslobj + SYSTEM PUBLIC + $ +- $ + ) ++find_package(asio CONFIG REQUIRED) ++target_link_libraries(lslobj PUBLIC asio::asio) + target_compile_definitions(lslobj PRIVATE + LIBLSL_EXPORTS + LOGURU_DEBUG_LOGGING=$ diff --git a/externals/vcpkg/ports/liblsl/vcpkg.json b/externals/vcpkg/ports/liblsl/vcpkg.json new file mode 100755 index 000000000..4b91b069d --- /dev/null +++ b/externals/vcpkg/ports/liblsl/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "liblsl", + "version": "1.16.0", + "description": "C++ lsl library for multi-modal time-synched data transmission over the local network", + "homepage": "https://github.com/sccn/liblsl", + "license": "MIT", + "dependencies": [ + "asio", + "boost-atomic", + "boost-bind", + "boost-chrono", + "boost-config", + "boost-endian", + "boost-functional", + "boost-integer", + "boost-lexical-cast", + "boost-math", + "boost-serialization", + "boost-smart-ptr", + "boost-thread", + "boost-uuid", + "pugixml", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/liblzma/add_support_ios.patch b/externals/vcpkg/ports/liblzma/add_support_ios.patch new file mode 100755 index 000000000..ac40c4e6d --- /dev/null +++ b/externals/vcpkg/ports/liblzma/add_support_ios.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 52439b3..0b5e371 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -526,6 +526,7 @@ if(HAVE_GETOPT_LONG) + + install(TARGETS xzdec + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT xzdec) + + if(UNIX) +@@ -653,6 +654,7 @@ if(NOT MSVC AND HAVE_GETOPT_LONG) + + install(TARGETS xz + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT xz) + + install(FILES src/xz/xz.1 +-- +2.30.1 (Apple Git-130) + diff --git a/externals/vcpkg/ports/liblzma/build-tools.patch b/externals/vcpkg/ports/liblzma/build-tools.patch new file mode 100755 index 000000000..6ccfa2ce4 --- /dev/null +++ b/externals/vcpkg/ports/liblzma/build-tools.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cddbccb..63c8f3d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -492,6 +492,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/liblzmaConfig.cmake" + COMPONENT liblzma_Development) + + ++if(BUILD_TOOLS) + ############################################################################# + # getopt_long + ############################################################################# +@@ -663,3 +664,4 @@ if(NOT MSVC AND HAVE_GETOPT_LONG) + DESTINATION "${CMAKE_INSTALL_MANDIR}/man1" + COMPONENT xz) + endif() ++endif() +\ No newline at end of file diff --git a/externals/vcpkg/ports/liblzma/enable-uwp-builds.patch b/externals/vcpkg/ports/liblzma/enable-uwp-builds.patch new file mode 100755 index 000000000..4551ce7b5 --- /dev/null +++ b/externals/vcpkg/ports/liblzma/enable-uwp-builds.patch @@ -0,0 +1,26 @@ +diff --git a/src/common/tuklib_physmem.c b/src/common/tuklib_physmem.c +index 4053ad0..c49db6d 100644 +--- a/src/common/tuklib_physmem.c ++++ b/src/common/tuklib_physmem.c +@@ -79,6 +79,13 @@ tuklib_physmem(void) + uint64_t ret = 0; + + #if defined(_WIN32) || defined(__CYGWIN__) ++#if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) ++ MEMORYSTATUSEX ms; ++ ms.dwLength = sizeof(ms); ++ if(!GlobalMemoryStatusEx(&ms)) ++ return 0; ++ return ms.ullTotalPhys; ++#else + if ((GetVersion() & 0xFF) >= 5) { + // Windows 2000 and later have GlobalMemoryStatusEx() which + // supports reporting values greater than 4 GiB. To keep the +@@ -107,6 +114,7 @@ tuklib_physmem(void) + GlobalMemoryStatus(&meminfo); + ret = meminfo.dwTotalPhys; + } ++#endif + + #elif defined(__OS2__) + unsigned long mem; diff --git a/externals/vcpkg/ports/liblzma/fix_config_include.patch b/externals/vcpkg/ports/liblzma/fix_config_include.patch new file mode 100755 index 000000000..20b32895a --- /dev/null +++ b/externals/vcpkg/ports/liblzma/fix_config_include.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 34c6aca00..7b3708ab2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -401,6 +401,7 @@ if(WIN32) + if(BUILD_SHARED_LIBS) + # Add the Windows resource file for liblzma.dll. + target_sources(liblzma PRIVATE src/liblzma/liblzma_w32res.rc) ++ target_include_directories(liblzma PRIVATE windows/vs2019) + + # Export the public API symbols with __declspec(dllexport). + target_compile_definitions(liblzma PRIVATE DLL_EXPORT) diff --git a/externals/vcpkg/ports/liblzma/portfile.cmake b/externals/vcpkg/ports/liblzma/portfile.cmake new file mode 100755 index 000000000..052281e3f --- /dev/null +++ b/externals/vcpkg/ports/liblzma/portfile.cmake @@ -0,0 +1,73 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xz-mirror/xz + REF v5.2.5 + SHA512 686f01cfe33e2194766a856c48668c661b25eee194a443524f87ce3f866e0eb54914075b4e00185921516c5211db8cd5d2658f4b91f4a3580508656f776f468e + HEAD_REF master + PATCHES + enable-uwp-builds.patch + fix_config_include.patch + win_output_name.patch # Fix output name on Windows. Autotool build does not generate lib prefixed libraries on windows. + add_support_ios.patch # add install bundle info for support ios + build-tools.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS +) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(includedir "\${prefix}/include") +set(PACKAGE_URL https://tukaani.org/xz/) +set(PACKAGE_VERSION 5.2.5) +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(PTHREAD_CFLAGS -pthread) +endif() +set(prefix "${CURRENT_INSTALLED_DIR}") +configure_file("${SOURCE_PATH}/src/liblzma/liblzma.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/liblzma.pc" @ONLY) +if (NOT VCPKG_BUILD_TYPE) + set(prefix "${CURRENT_INSTALLED_DIR}/debug") + configure_file("${SOURCE_PATH}/src/liblzma/liblzma.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/liblzma.pc" @ONLY) +endif() +vcpkg_fixup_pkgconfig() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/liblzma) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/lzma.h" "defined(LZMA_API_STATIC)" "1") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/lzma.h" "defined(LZMA_API_STATIC)" "0") +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share/man" +) + +set(TOOLS xz xzdec) +foreach(_tool IN LISTS TOOLS) + if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/bin/${_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + list(REMOVE_ITEM TOOLS ${_tool}) + endif() +endforeach() +if(TOOLS) + vcpkg_copy_tools(TOOL_NAMES ${TOOLS} AUTO_CLEAN) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/liblzma/usage b/externals/vcpkg/ports/liblzma/usage new file mode 100755 index 000000000..8d70b5804 --- /dev/null +++ b/externals/vcpkg/ports/liblzma/usage @@ -0,0 +1,9 @@ +The package liblzma provides CMake targets: + + find_package(LibLZMA REQUIRED) + target_link_libraries(main PRIVATE LibLZMA::LibLZMA) + + or + + find_package(liblzma CONFIG REQUIRED) + target_link_libraries(main PRIVATE liblzma::liblzma) diff --git a/externals/vcpkg/ports/liblzma/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/liblzma/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..826cdba06 --- /dev/null +++ b/externals/vcpkg/ports/liblzma/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,64 @@ +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0057 NEW) +set(z_vcpkg_liblzma_fixup_needed 0) +if(NOT "CONFIG" IN_LIST ARGS AND NOT "NO_MODULE" IN_LIST ARGS AND NOT CMAKE_DISABLE_FIND_PACKAGE_LibLZMA) + get_filename_component(z_vcpkg_liblzma_prefix "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) + get_filename_component(z_vcpkg_liblzma_prefix "${z_vcpkg_liblzma_prefix}" DIRECTORY) + find_path(LIBLZMA_INCLUDE_DIR NAMES lzma.h PATHS "${z_vcpkg_liblzma_prefix}/include" NO_DEFAULT_PATH) + # liblzma doesn't use a debug postfix, but FindLibLZMA.cmake expects it + find_library(LIBLZMA_LIBRARY_RELEASE NAMES lzma PATHS "${z_vcpkg_liblzma_prefix}/lib" NO_DEFAULT_PATH) + find_library(LIBLZMA_LIBRARY_DEBUG NAMES lzma PATHS "${z_vcpkg_liblzma_prefix}/debug/lib" NO_DEFAULT_PATH) + unset(z_vcpkg_liblzma_prefix) + if(CMAKE_VERSION VERSION_LESS 3.16) + # Older versions of FindLibLZMA.cmake need a single lib in LIBLZMA_LIBRARY. + set(z_vcpkg_liblzma_fixup_needed 1) + set(LIBLZMA_LIBRARY "${LIBLZMA_LIBRARY_RELEASE}" CACHE INTERNAL "") + elseif(NOT TARGET LibLZMA::LibLZMA) + set(z_vcpkg_liblzma_fixup_needed 1) + endif() + # Known values, and required. Skip expensive tests. + set(LIBLZMA_HAS_AUTO_DECODER 1 CACHE INTERNAL "") + set(LIBLZMA_HAS_EASY_ENCODER 1 CACHE INTERNAL "") + set(LIBLZMA_HAS_LZMA_PRESET 1 CACHE INTERNAL "") +endif() + +_find_package(${ARGS}) + +if(z_vcpkg_liblzma_fixup_needed) + include(SelectLibraryConfigurations) + select_library_configurations(LIBLZMA) + if(NOT TARGET LibLZMA::LibLZMA) + # Backfill LibLZMA::LibLZMA to versions of cmake before 3.14 + add_library(LibLZMA::LibLZMA UNKNOWN IMPORTED) + if(DEFINED LIBLZMA_INCLUDE_DIRS) + set_target_properties(LibLZMA::LibLZMA PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${LIBLZMA_INCLUDE_DIRS}") + endif() + set_property(TARGET LibLZMA::LibLZMA APPEND PROPERTY + IMPORTED_CONFIGURATIONS RELEASE) + set_target_properties(LibLZMA::LibLZMA PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C" + IMPORTED_LOCATION_RELEASE "${LIBLZMA_LIBRARY_RELEASE}") + if(EXISTS "${LIBLZMA_LIBRARY}") + set_target_properties(LibLZMA::LibLZMA PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_LOCATION "${LIBLZMA_LIBRARY}") + endif() + endif() + if(LIBLZMA_LIBRARY_DEBUG) + # Backfill debug variant to versions of cmake before 3.16 + set_property(TARGET LibLZMA::LibLZMA APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + set_target_properties(LibLZMA::LibLZMA PROPERTIES IMPORTED_LOCATION_DEBUG "${LIBLZMA_LIBRARY_DEBUG}") + endif() +endif() +if(LIBLZMA_LIBRARIES AND NOT "Threads::Threads" IN_LIST LIBLZMA_LIBRARIES) + set(THREADS_PREFER_PTHREAD_FLAG TRUE) + find_package(Threads) + list(APPEND LIBLZMA_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) + if(TARGET LibLZMA::LibLZMA) + set_property(TARGET LibLZMA::LibLZMA APPEND PROPERTY INTERFACE_LINK_LIBRARIES Threads::Threads) + endif() +endif() +unset(z_vcpkg_liblzma_fixup_needed) +cmake_policy(POP) diff --git a/externals/vcpkg/ports/liblzma/vcpkg.json b/externals/vcpkg/ports/liblzma/vcpkg.json new file mode 100755 index 000000000..9d37b9a05 --- /dev/null +++ b/externals/vcpkg/ports/liblzma/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "liblzma", + "version-semver": "5.2.5", + "port-version": 6, + "description": "Compression library with an API similar to that of zlib.", + "homepage": "https://github.com/xz-mirror/xz", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "Build tools", + "supports": "!windows, mingw" + } + } +} diff --git a/externals/vcpkg/ports/liblzma/win_output_name.patch b/externals/vcpkg/ports/liblzma/win_output_name.patch new file mode 100755 index 000000000..e3ce250a0 --- /dev/null +++ b/externals/vcpkg/ports/liblzma/win_output_name.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e80b524..cddbccb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -429,8 +429,11 @@ set_target_properties(liblzma PROPERTIES + + # It's liblzma.so or liblzma.dll, not libliblzma.so or lzma.dll. + # Avoid the name lzma.dll because it would conflict with LZMA SDK. +- PREFIX "" ++ OUTPUT_NAME lzma + ) ++if(WIN32 AND NOT MINGW) ++ set_target_properties(liblzma PROPERTIES RUNTIME_OUTPUT_NAME liblzma) ++endif() + + # Create liblzmaConfigVersion.cmake. + # diff --git a/externals/vcpkg/ports/libmad/0001-Fix-MSVC-ARM.patch b/externals/vcpkg/ports/libmad/0001-Fix-MSVC-ARM.patch new file mode 100755 index 000000000..9cdc57c7b --- /dev/null +++ b/externals/vcpkg/ports/libmad/0001-Fix-MSVC-ARM.patch @@ -0,0 +1,25 @@ +diff --git a/mad.h b/mad.h +index 9ef6cc8..5e3f7aa 100644 +--- a/mad.h ++++ b/mad.h +@@ -24,7 +24,11 @@ + extern "C" { + # endif + ++#ifdef _WIN64 ++# define FPM_64BIT ++#else + # define FPM_INTEL ++#endif + + + +@@ -184,7 +188,7 @@ typedef mad_fixed_t mad_sample_t; + + # elif defined(FPM_INTEL) + +-# if defined(_MSC_VER) ++# if defined(_MSC_VER) && defined(_M_IX86) + # pragma warning(push) + # pragma warning(disable: 4035) /* no return value */ + static __forceinline diff --git a/externals/vcpkg/ports/libmad/CMakeLists.txt b/externals/vcpkg/ports/libmad/CMakeLists.txt new file mode 100755 index 000000000..47db84c41 --- /dev/null +++ b/externals/vcpkg/ports/libmad/CMakeLists.txt @@ -0,0 +1,53 @@ +cmake_minimum_required(VERSION 2.8) + +project(libmad) + +set(SOURCES + bit.c + bit.h + config.h + decoder.c + decoder.h + fixed.c + fixed.h + frame.c + frame.h + global.h + huffman.c + huffman.h + layer12.c + layer12.h + layer3.c + layer3.h + mad.h + stream.c + stream.h + synth.c + synth.h + timer.c + timer.h + version.c + version.h +) + +add_library( + mad + ${SOURCES} +) + +target_compile_definitions(mad + PRIVATE _LIB _MBCS ASO_ZEROCHECK HAVE_CONFIG_H FPM_DEFAULT + PRIVATE _CRT_SECURE_NO_WARNINGS +) + +install( + TARGETS mad + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install( + FILES mad.h + DESTINATION include +) diff --git a/externals/vcpkg/ports/libmad/portfile.cmake b/externals/vcpkg/ports/libmad/portfile.cmake new file mode 100755 index 000000000..ebf84de89 --- /dev/null +++ b/externals/vcpkg/ports/libmad/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO mad/libmad + REF 0.15.1b + FILENAME "libmad-0.15.1b.tar.gz" + SHA512 2cad30347fb310dc605c46bacd9da117f447a5cabedd8fefdb24ab5de641429e5ec5ce8af7aefa6a75a3f545d3adfa255e3fa0a2d50971f76bc0c4fc0400cc45 + PATCHES 0001-Fix-MSVC-ARM.patch +) + +#The archive only contains a Visual Studio 6.0 era DSP project file, so use a custom CMakeLists.txt +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +#Use the msvc++ config.h header +file(COPY ${SOURCE_PATH}/msvc++/config.h DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmad) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/libmad/COPYING ${CURRENT_PACKAGES_DIR}/share/libmad/copyright) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/externals/vcpkg/ports/libmad/vcpkg.json b/externals/vcpkg/ports/libmad/vcpkg.json new file mode 100755 index 000000000..2e44d7571 --- /dev/null +++ b/externals/vcpkg/ports/libmad/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libmad", + "version-string": "0.15.1", + "port-version": 9, + "description": "high-quality MPEG audio decoder", + "homepage": "http://www.mars.org/home/rob/proj/mpeg/" +} diff --git a/externals/vcpkg/ports/libmagic/0001-Use-libtre.patch b/externals/vcpkg/ports/libmagic/0001-Use-libtre.patch new file mode 100755 index 000000000..a1080d5a0 --- /dev/null +++ b/externals/vcpkg/ports/libmagic/0001-Use-libtre.patch @@ -0,0 +1,53 @@ +From e6e59f41c082be94c4fef007e276b1dffe7dc240 Mon Sep 17 00:00:00 2001 +From: Long Nguyen +Date: Sat, 8 May 2021 19:28:01 +0700 +Subject: [PATCH 01/14] Use libtre + +--- + configure.ac | 2 +- + src/Makefile.am | 2 +- + src/file.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 02eac8f..b05c334 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -185,7 +185,7 @@ if test "$enable_libseccomp" != "no"; then + AC_CHECK_LIB(seccomp, seccomp_init) + fi + if test "$MINGW" = 1; then +- AC_CHECK_LIB(gnurx,regexec,,AC_MSG_ERROR([libgnurx is required to build file(1) with MinGW])) ++ AC_SEARCH_LIBS(tre_regexec,tre,,AC_MSG_ERROR([libtre is required to build file(1) with MinGW])) + fi + + dnl See if we are cross-compiling +diff --git a/src/Makefile.am b/src/Makefile.am +index 3f67f2c..34781b9 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -13,7 +13,7 @@ libmagic_la_SOURCES = buffer.c magic.c apprentice.c softmagic.c ascmagic.c \ + file_opts.h elfclass.h mygetopt.h cdf.c cdf_time.c readcdf.c cdf.h + libmagic_la_LDFLAGS = -no-undefined -version-info 1:0:0 + if MINGW +-MINGWLIBS = -lgnurx -lshlwapi ++MINGWLIBS = -lshlwapi + else + MINGWLIBS = + endif +diff --git a/src/file.h b/src/file.h +index c548e97..299ac0c 100644 +--- a/src/file.h ++++ b/src/file.h +@@ -79,7 +79,7 @@ + #include /* Include that here, to make sure __P gets defined */ + #include + #include /* For open and flags */ +-#include ++#include + #include + #include + #ifndef WIN32 +-- +2.29.2.windows.2 + diff --git a/externals/vcpkg/ports/libmagic/0002-Change-zlib-lib-name-to-match-CMake-output.patch b/externals/vcpkg/ports/libmagic/0002-Change-zlib-lib-name-to-match-CMake-output.patch new file mode 100755 index 000000000..5e070cc07 --- /dev/null +++ b/externals/vcpkg/ports/libmagic/0002-Change-zlib-lib-name-to-match-CMake-output.patch @@ -0,0 +1,39 @@ +From 2fa43ece9ec7564e1fbb9867bb5852b834643aa4 Mon Sep 17 00:00:00 2001 +From: Long Nguyen +Date: Sat, 8 May 2021 19:36:11 +0700 +Subject: [PATCH 02/14] Change zlib lib name to match CMake output + +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b05c334..dd4063c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -173,7 +173,7 @@ AC_REPLACE_FUNCS(getopt_long asprintf vasprintf strlcpy strlcat getline ctime_r + + dnl Checks for libraries + if test "$enable_zlib" != "no"; then +- AC_CHECK_LIB(z, gzopen) ++ AC_SEARCH_LIBS(gzopen, [z zlib zlibd], have_zlib = "yes", have_zlib = "no") + fi + if test "$enable_bzlib" != "no"; then + AC_CHECK_LIB(bz2, BZ2_bzCompressInit) +@@ -193,11 +193,11 @@ AM_CONDITIONAL(IS_CROSS_COMPILE, test "$cross_compiling" = yes) + + dnl Final sanity checks + if test "$enable_zlib" = "yes"; then +- if test "$ac_cv_header_zlib_h$ac_cv_lib_z_gzopen" != "yesyes"; then ++ if test "$ac_cv_header_zlib_h$have_zlib" != "yesyes"; then + AC_MSG_ERROR([zlib support requested but not found]) + fi + fi +-if test "$ac_cv_header_zlib_h$ac_cv_lib_z_gzopen" = "yesyes"; then ++if test "$ac_cv_header_zlib_h$have_zlib" = "yesyes"; then + AC_DEFINE([ZLIBSUPPORT], 1, [Enable zlib compression support]) + fi + if test "$enable_bzlib" = "yes"; then +-- +2.29.2.windows.2 + diff --git a/externals/vcpkg/ports/libmagic/0003-Fix-WIN32-macro-checks.patch b/externals/vcpkg/ports/libmagic/0003-Fix-WIN32-macro-checks.patch new file mode 100755 index 000000000..eb0f7ebda --- /dev/null +++ b/externals/vcpkg/ports/libmagic/0003-Fix-WIN32-macro-checks.patch @@ -0,0 +1,43 @@ +From 2fffeb273ea46c1e91536f3d660982de785c8d49 Mon Sep 17 00:00:00 2001 +From: Long Nguyen +Date: Sat, 8 May 2021 20:52:59 +0700 +Subject: [PATCH 03/14] Fix WIN32 macro checks + +--- + src/file.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/file.h b/src/file.h +index 299ac0c..2c365a6 100644 +--- a/src/file.h ++++ b/src/file.h +@@ -82,7 +82,7 @@ + #include + #include + #include +-#ifndef WIN32 ++#ifndef _WIN32 + #include + #endif + /* Do this here and now, because struct stat gets re-defined on solaris */ +@@ -95,7 +95,7 @@ + #define MAGIC "/etc/magic" + #endif + +-#if defined(__EMX__) || defined (WIN32) ++#if defined(__EMX__) || defined (_WIN32) + #define PATHSEP ';' + #else + #define PATHSEP ':' +@@ -103,7 +103,7 @@ + + #define private static + +-#if HAVE_VISIBILITY && !defined(WIN32) ++#if HAVE_VISIBILITY && !defined(_WIN32) + #define public __attribute__ ((__visibility__("default"))) + #ifndef protected + #define protected __attribute__ ((__visibility__("hidden"))) +-- +2.29.2.windows.2 + diff --git a/externals/vcpkg/ports/libmagic/0004-Typedef-POSIX-types-on-Windows.patch b/externals/vcpkg/ports/libmagic/0004-Typedef-POSIX-types-on-Windows.patch new file mode 100755 index 000000000..a15298432 --- /dev/null +++ b/externals/vcpkg/ports/libmagic/0004-Typedef-POSIX-types-on-Windows.patch @@ -0,0 +1,29 @@ +From eb3dde2954dacd86ec7490540eb9b7e3530b917b Mon Sep 17 00:00:00 2001 +From: Long Nguyen +Date: Sat, 8 May 2021 20:12:55 +0700 +Subject: [PATCH 04/14] Typedef POSIX types on Windows + +--- + src/file.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/file.h b/src/file.h +index 2c365a6..0332506 100644 +--- a/src/file.h ++++ b/src/file.h +@@ -425,6 +425,12 @@ struct cont { + + #define MAGIC_SETS 2 + ++#ifdef _MSC_VER ++#include ++typedef int mode_t; ++typedef SSIZE_T ssize_t; ++#endif ++ + struct magic_set { + struct mlist *mlist[MAGIC_SETS]; /* list of regular entries */ + struct cont c; +-- +2.29.2.windows.2 + diff --git a/externals/vcpkg/ports/libmagic/0005-Include-dirent.h-for-S_ISREG-and-S_ISDIR.patch b/externals/vcpkg/ports/libmagic/0005-Include-dirent.h-for-S_ISREG-and-S_ISDIR.patch new file mode 100755 index 000000000..76cbc1222 --- /dev/null +++ b/externals/vcpkg/ports/libmagic/0005-Include-dirent.h-for-S_ISREG-and-S_ISDIR.patch @@ -0,0 +1,24 @@ +From a8f8fbfc2736419c65992cbf24de963c3b1f3107 Mon Sep 17 00:00:00 2001 +From: Long Nguyen +Date: Sat, 8 May 2021 22:07:55 +0700 +Subject: [PATCH 05/14] Include dirent.h for S_ISREG and S_ISDIR + +--- + src/file.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/file.h b/src/file.h +index 0332506..4aa9f60 100644 +--- a/src/file.h ++++ b/src/file.h +@@ -88,6 +88,7 @@ + /* Do this here and now, because struct stat gets re-defined on solaris */ + #include + #include ++#include + + #define ENABLE_CONDITIONALS + +-- +2.29.2.windows.2 + diff --git a/externals/vcpkg/ports/libmagic/0006-Remove-Wrap-POSIX-headers.patch b/externals/vcpkg/ports/libmagic/0006-Remove-Wrap-POSIX-headers.patch new file mode 100755 index 000000000..56efac248 --- /dev/null +++ b/externals/vcpkg/ports/libmagic/0006-Remove-Wrap-POSIX-headers.patch @@ -0,0 +1,189 @@ +From b20c8e62851f3cb53083a3e7811518092f98dc26 Mon Sep 17 00:00:00 2001 +From: Long Nguyen +Date: Sat, 8 May 2021 22:47:32 +0700 +Subject: [PATCH 06/14] Remove/Wrap POSIX headers + +--- + src/buffer.c | 2 ++ + src/cdf.c | 2 ++ + src/dprintf.c | 2 ++ + src/file.c | 1 - + src/getline.c | 2 ++ + src/is_csv.c | 2 ++ + src/is_json.c | 2 ++ + src/magic.c | 2 ++ + src/memtest.c | 2 ++ + src/mygetopt.h | 2 ++ + src/pread.c | 2 ++ + src/readcdf.c | 2 ++ + 12 files changed, 22 insertions(+), 1 deletion(-) + +diff --git a/src/buffer.c b/src/buffer.c +index 227015a..f3d8efa 100644 +--- a/src/buffer.c ++++ b/src/buffer.c +@@ -31,7 +31,9 @@ FILE_RCSID("@(#)$File: buffer.c,v 1.8 2020/02/16 15:52:49 christos Exp $") + #endif /* lint */ + + #include "magic.h" ++#ifdef HAVE_UNISTD_H + #include ++#endif + #include + #include + #include +diff --git a/src/cdf.c b/src/cdf.c +index bb81d63..dc9ec56 100644 +--- a/src/cdf.c ++++ b/src/cdf.c +@@ -43,7 +43,9 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.116 2019/08/26 14:31:39 christos Exp $") + #include + #endif + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif + #include + #include + #include +diff --git a/src/dprintf.c b/src/dprintf.c +index 027a64f..873c547 100644 +--- a/src/dprintf.c ++++ b/src/dprintf.c +@@ -32,7 +32,9 @@ FILE_RCSID("@(#)$File: dprintf.c,v 1.2 2018/09/09 20:33:28 christos Exp $") + #endif /* lint */ + + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif + #include + #include + +diff --git a/src/file.c b/src/file.c +index 87b9ab1..2889f8a 100644 +--- a/src/file.c ++++ b/src/file.c +@@ -38,7 +38,6 @@ FILE_RCSID("@(#)$File: file.c,v 1.189 2021/02/05 21:33:49 christos Exp $") + #include "magic.h" + + #include +-#include + #include + #ifdef RESTORE_TIME + # if (__COHERENT__ >= 0x420) +diff --git a/src/getline.c b/src/getline.c +index b00de01..c2d41ca 100644 +--- a/src/getline.c ++++ b/src/getline.c +@@ -33,7 +33,9 @@ + #if !HAVE_GETLINE + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif + #include + #include + +diff --git a/src/is_csv.c b/src/is_csv.c +index 937ab5f..2f704c5 100644 +--- a/src/is_csv.c ++++ b/src/is_csv.c +@@ -166,7 +166,9 @@ file_is_csv(struct magic_set *ms, const struct buffer *b, int looks_text) + #include + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif + #include + #include + #include +diff --git a/src/is_json.c b/src/is_json.c +index 0b12438..997a276 100644 +--- a/src/is_json.c ++++ b/src/is_json.c +@@ -436,7 +436,9 @@ file_is_json(struct magic_set *ms, const struct buffer *b) + #include + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif + #include + #include + #include +diff --git a/src/magic.c b/src/magic.c +index 81a0840..e9aeafa 100644 +--- a/src/magic.c ++++ b/src/magic.c +@@ -39,7 +39,9 @@ FILE_RCSID("@(#)$File: magic.c,v 1.114 2021/02/05 21:33:49 christos Exp $") + #include "magic.h" + + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif + #include + #ifdef QUICK + #include +diff --git a/src/memtest.c b/src/memtest.c +index f9506f6..ea50242 100644 +--- a/src/memtest.c ++++ b/src/memtest.c +@@ -34,7 +34,9 @@ + #include + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif + #include + #include + +diff --git a/src/mygetopt.h b/src/mygetopt.h +index d766762..b8e044c 100644 +--- a/src/mygetopt.h ++++ b/src/mygetopt.h +@@ -39,7 +39,9 @@ + #ifndef _GETOPT_H_ + #define _GETOPT_H_ + ++#ifdef HAVE_UNISTD_H + #include ++#endif + + /* + * Gnu like getopt_long() and BSD4.4 getsubopt()/optreset extensions +diff --git a/src/pread.c b/src/pread.c +index 3ab52d1..fc48d84 100644 +--- a/src/pread.c ++++ b/src/pread.c +@@ -3,7 +3,9 @@ + FILE_RCSID("@(#)$File: pread.c,v 1.2 2013/04/02 16:23:07 christos Exp $") + #endif /* lint */ + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif + + ssize_t + pread(int fd, void *buf, size_t len, off_t off) { +diff --git a/src/readcdf.c b/src/readcdf.c +index 7622c7b..977cb75 100644 +--- a/src/readcdf.c ++++ b/src/readcdf.c +@@ -31,7 +31,9 @@ FILE_RCSID("@(#)$File: readcdf.c,v 1.74 2019/09/11 15:46:30 christos Exp $") + + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif + #include + #include + #include +-- +2.29.2.windows.2 + diff --git a/externals/vcpkg/ports/libmagic/0007-Substitute-unistd-macros-for-MSVC.patch b/externals/vcpkg/ports/libmagic/0007-Substitute-unistd-macros-for-MSVC.patch new file mode 100755 index 000000000..726fbde7e --- /dev/null +++ b/externals/vcpkg/ports/libmagic/0007-Substitute-unistd-macros-for-MSVC.patch @@ -0,0 +1,30 @@ +From 1106d1523ed44bcbcca90fc1fe9fa9400777d8fe Mon Sep 17 00:00:00 2001 +From: Long Nguyen +Date: Sun, 9 May 2021 10:28:49 +0700 +Subject: [PATCH 07/14] Substitute unistd macros for MSVC + +--- + src/file.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/file.h b/src/file.h +index 4aa9f60..5da838c 100644 +--- a/src/file.h ++++ b/src/file.h +@@ -85,6 +85,13 @@ + #ifndef _WIN32 + #include + #endif ++#ifdef _MSC_VER ++#include ++#define R_OK 4 ++#define W_OK 2 ++#define X_OK R_OK ++#define F_OK 0 ++#endif + /* Do this here and now, because struct stat gets re-defined on solaris */ + #include + #include +-- +2.29.2.windows.2 + diff --git a/externals/vcpkg/ports/libmagic/0008-Add-FILENO-defines.patch b/externals/vcpkg/ports/libmagic/0008-Add-FILENO-defines.patch new file mode 100755 index 000000000..dea508092 --- /dev/null +++ b/externals/vcpkg/ports/libmagic/0008-Add-FILENO-defines.patch @@ -0,0 +1,26 @@ +From e449e3fb47aee00f0d82782183cc7fd6b446d27b Mon Sep 17 00:00:00 2001 +From: Long Nguyen +Date: Sun, 9 May 2021 13:24:42 +0700 +Subject: [PATCH 08/14] Add FILENO defines + +--- + src/file.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/file.h b/src/file.h +index 5da838c..ccfe0da 100644 +--- a/src/file.h ++++ b/src/file.h +@@ -91,6 +91,9 @@ + #define W_OK 2 + #define X_OK R_OK + #define F_OK 0 ++#define STDIN_FILENO _fileno(stdin) ++#define STDOUT_FILENO _fileno(stdout) ++#define STDERR_FILENO _fileno(stderr) + #endif + /* Do this here and now, because struct stat gets re-defined on solaris */ + #include +-- +2.29.2.windows.2 + diff --git a/externals/vcpkg/ports/libmagic/0009-No-fcntl-in-magic.c.patch b/externals/vcpkg/ports/libmagic/0009-No-fcntl-in-magic.c.patch new file mode 100755 index 000000000..47bf16165 --- /dev/null +++ b/externals/vcpkg/ports/libmagic/0009-No-fcntl-in-magic.c.patch @@ -0,0 +1,25 @@ +From 6d10bef865b69764f6e0ddd2b0f6a84e484cdb37 Mon Sep 17 00:00:00 2001 +From: Long Nguyen +Date: Sun, 9 May 2021 13:25:14 +0700 +Subject: [PATCH 09/14] No fcntl in magic.c + +--- + src/magic.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/magic.c b/src/magic.c +index e9aeafa..382bd96 100644 +--- a/src/magic.c ++++ b/src/magic.c +@@ -462,7 +462,7 @@ file_or_fd(struct magic_set *ms, const char *inname, int fd) + rv = 0; + goto done; + } +-#if O_CLOEXEC == 0 ++#if O_CLOEXEC == 0 && !defined(_WIN32) + (void)fcntl(fd, F_SETFD, FD_CLOEXEC); + #endif + } +-- +2.29.2.windows.2 + diff --git a/externals/vcpkg/ports/libmagic/0010-Properly-check-for-the-presence-of-bitmasks.patch b/externals/vcpkg/ports/libmagic/0010-Properly-check-for-the-presence-of-bitmasks.patch new file mode 100755 index 000000000..f0d8738e4 --- /dev/null +++ b/externals/vcpkg/ports/libmagic/0010-Properly-check-for-the-presence-of-bitmasks.patch @@ -0,0 +1,118 @@ +From a6bc98ce25cd9d9dba896e93ed441ff162f6793b Mon Sep 17 00:00:00 2001 +From: Long Nguyen +Date: Sun, 9 May 2021 17:43:20 +0700 +Subject: [PATCH 10/14] Properly check for the presence of bitmasks + +--- + src/fsmagic.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/src/fsmagic.c b/src/fsmagic.c +index 5204f20..7244841 100644 +--- a/src/fsmagic.c ++++ b/src/fsmagic.c +@@ -66,7 +66,7 @@ FILE_RCSID("@(#)$File: fsmagic.c,v 1.81 2019/07/16 13:30:32 christos Exp $") + # define minor(dev) ((dev) & 0xff) + #endif + #undef HAVE_MAJOR +-#ifdef S_IFLNK ++#if S_IFLNK != 0 + private int + bad_link(struct magic_set *ms, int err, char *buf) + { +@@ -108,7 +108,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb) + int ret, did = 0; + int mime = ms->flags & MAGIC_MIME; + int silent = ms->flags & (MAGIC_APPLE|MAGIC_EXTENSION); +-#ifdef S_IFLNK ++#if S_IFLNK != 0 + char buf[BUFSIZ+4]; + ssize_t nch; + struct stat tstatbuf; +@@ -122,7 +122,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb) + * Fstat is cheaper but fails for files you don't have read perms on. + * On 4.2BSD and similar systems, use lstat() to identify symlinks. + */ +-#ifdef S_IFLNK ++#if S_IFLNK != 0 + if ((ms->flags & MAGIC_SYMLINK) == 0) + ret = lstat(fn, sb); + else +@@ -171,17 +171,17 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb) + + ret = 1; + if (!mime && !silent) { +-#ifdef S_ISUID ++#if S_ISUID != 0 + if (sb->st_mode & S_ISUID) + if (file_printf(ms, "%ssetuid", COMMA) == -1) + return -1; + #endif +-#ifdef S_ISGID ++#if S_ISGID != 0 + if (sb->st_mode & S_ISGID) + if (file_printf(ms, "%ssetgid", COMMA) == -1) + return -1; + #endif +-#ifdef S_ISVTX ++#if S_ISVTX != 0 + if (sb->st_mode & S_ISVTX) + if (file_printf(ms, "%ssticky", COMMA) == -1) + return -1; +@@ -197,7 +197,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb) + } else if (file_printf(ms, "%sdirectory", COMMA) == -1) + return -1; + break; +-#ifdef S_IFCHR ++#if S_IFCHR != 0 + case S_IFCHR: + /* + * If -s has been specified, treat character special files +@@ -232,7 +232,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb) + } + break; + #endif +-#ifdef S_IFBLK ++#if S_IFBLK != 0 + case S_IFBLK: + /* + * If -s has been specified, treat block special files +@@ -268,7 +268,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb) + break; + #endif + /* TODO add code to handle V7 MUX and Blit MUX files */ +-#ifdef S_IFIFO ++#if S_IFIFO != 0 + case S_IFIFO: + if((ms->flags & MAGIC_DEVICES) != 0) + break; +@@ -280,7 +280,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb) + return -1; + break; + #endif +-#ifdef S_IFDOOR ++#if S_IFDOOR != 0 + case S_IFDOOR: + if (mime) { + if (handle_mime(ms, mime, "door") == -1) +@@ -290,7 +290,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb) + return -1; + break; + #endif +-#ifdef S_IFLNK ++#if S_IFLNK != 0 + case S_IFLNK: + if ((nch = readlink(fn, buf, BUFSIZ-1)) <= 0) { + if (ms->flags & MAGIC_ERROR) { +@@ -378,7 +378,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb) + } + break; + #endif +-#ifdef S_IFSOCK ++#if S_IFSOCK != 0 + #ifndef __COHERENT__ + case S_IFSOCK: + if (mime) { +-- +2.29.2.windows.2 + diff --git a/externals/vcpkg/ports/libmagic/0011-Remove-pipe-related-functions-in-funcs.c.patch b/externals/vcpkg/ports/libmagic/0011-Remove-pipe-related-functions-in-funcs.c.patch new file mode 100755 index 000000000..ae2720ca3 --- /dev/null +++ b/externals/vcpkg/ports/libmagic/0011-Remove-pipe-related-functions-in-funcs.c.patch @@ -0,0 +1,32 @@ +From 15b0f505ff9eefd41b74ffdd4230355e933263ca Mon Sep 17 00:00:00 2001 +From: Long Nguyen +Date: Sun, 9 May 2021 17:45:50 +0700 +Subject: [PATCH 11/14] Remove pipe related functions in funcs.c + +--- + src/funcs.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/funcs.c b/src/funcs.c +index b926625..b585486 100644 +--- a/src/funcs.c ++++ b/src/funcs.c +@@ -809,6 +809,7 @@ file_print_guid(char *str, size_t len, const uint64_t *guid) + g->data4[6], g->data4[7]); + } + ++#ifndef _WIN32 + protected int + file_pipe_closexec(int *fds) + { +@@ -827,6 +828,7 @@ protected int + file_clear_closexec(int fd) { + return fcntl(fd, F_SETFD, 0); + } ++#endif + + protected char * + file_strtrim(char *str) +-- +2.29.2.windows.2 + diff --git a/externals/vcpkg/ports/libmagic/0012-Convert-MSYS2-paths-to-Windows-paths.patch b/externals/vcpkg/ports/libmagic/0012-Convert-MSYS2-paths-to-Windows-paths.patch new file mode 100755 index 000000000..728fe7753 --- /dev/null +++ b/externals/vcpkg/ports/libmagic/0012-Convert-MSYS2-paths-to-Windows-paths.patch @@ -0,0 +1,24 @@ +From f0139ced57c1579450f3d09b6e3ae0159aae031b Mon Sep 17 00:00:00 2001 +From: Long Nguyen +Date: Mon, 10 May 2021 08:43:28 +0700 +Subject: [PATCH 12/14] Convert MSYS2 paths to Windows paths + +--- + src/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 34781b9..26f853f 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,4 +1,7 @@ + MAGIC = $(pkgdatadir)/magic ++if MINGW ++MAGIC != cygpath -m -a -l '$(MAGIC)' ++endif + lib_LTLIBRARIES = libmagic.la + nodist_include_HEADERS = magic.h + +-- +2.29.2.windows.2 + diff --git a/externals/vcpkg/ports/libmagic/0013-Check-for-backslash-in-argv-0-on-Windows.patch b/externals/vcpkg/ports/libmagic/0013-Check-for-backslash-in-argv-0-on-Windows.patch new file mode 100755 index 000000000..77777fc61 --- /dev/null +++ b/externals/vcpkg/ports/libmagic/0013-Check-for-backslash-in-argv-0-on-Windows.patch @@ -0,0 +1,42 @@ +From 3f10c7d31627b64b068b84ba72e706991f672560 Mon Sep 17 00:00:00 2001 +From: Long Nguyen +Date: Fri, 14 May 2021 08:14:05 +0700 +Subject: [PATCH 13/14] Check for backslash in argv[0] on Windows + +--- + magic/Makefile.am | 2 +- + src/file.c | 5 +++++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/magic/Makefile.am b/magic/Makefile.am +index 0eb5865..170bbab 100644 +--- a/magic/Makefile.am ++++ b/magic/Makefile.am +@@ -353,7 +353,7 @@ ${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) + @(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \ + echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \ + else \ +- v=$$(${FILE_COMPILE} --version | sed -e s/file-// -e q); \ ++ v=$$(${FILE_COMPILE} --version | sed -e s/file${EXEEXT}-// -e q); \ + if [ "$$v" != "${PACKAGE_VERSION}" ]; then \ + echo "Cannot use the installed version of file ($$v) to"; \ + echo "cross-compile file ${PACKAGE_VERSION}"; \ +diff --git a/src/file.c b/src/file.c +index 2889f8a..12a604b 100644 +--- a/src/file.c ++++ b/src/file.c +@@ -200,6 +200,11 @@ main(int argc, char *argv[]) + _wildcard(&argc, &argv); + #endif + ++#ifdef _WIN32 ++ if ((progname = strrchr(argv[0], '\\')) != NULL) ++ progname++; ++ else ++#endif + if ((progname = strrchr(argv[0], '/')) != NULL) + progname++; + else +-- +2.29.2.windows.2 + diff --git a/externals/vcpkg/ports/libmagic/0014-Define-POSIX-macros-if-missing.patch b/externals/vcpkg/ports/libmagic/0014-Define-POSIX-macros-if-missing.patch new file mode 100755 index 000000000..09ac7a119 --- /dev/null +++ b/externals/vcpkg/ports/libmagic/0014-Define-POSIX-macros-if-missing.patch @@ -0,0 +1,38 @@ +From fa0e11f36bb0e322250e1e488ced9f2bf166874f Mon Sep 17 00:00:00 2001 +From: Long Nguyen +Date: Fri, 14 May 2021 18:11:39 +0700 +Subject: [PATCH 14/14] Define POSIX macros if missing + +--- + src/file.h | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/src/file.h b/src/file.h +index ccfe0da..98cd37b 100644 +--- a/src/file.h ++++ b/src/file.h +@@ -100,6 +100,21 @@ + #include + #include + ++#if !defined(S_IFBLK) ++#define S_IFBLK 0 ++#define S_ISBLK(mode) (((mode) & S_IFMT) == S_IFBLK) ++#endif ++ ++#if !defined(S_IFLNK) ++#define S_IFLNK 0 ++#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK) ++#endif ++ ++#if !defined(S_IFSOCK) ++#define S_IFSOCK 0 ++#define S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK) ++#endif ++ + #define ENABLE_CONDITIONALS + + #ifndef MAGIC +-- +2.29.2.windows.2 + diff --git a/externals/vcpkg/ports/libmagic/0015-MSYS2-Remove-ioctl-call.patch b/externals/vcpkg/ports/libmagic/0015-MSYS2-Remove-ioctl-call.patch new file mode 100755 index 000000000..da8ef79df --- /dev/null +++ b/externals/vcpkg/ports/libmagic/0015-MSYS2-Remove-ioctl-call.patch @@ -0,0 +1,27 @@ +# From https://github.com/msys2/MINGW-packages/commit/3a51faadb8bacf06c7b7fd84b2ea80775d1a8b0d + +# this is an advanced patch to fix building v5.38 +# see for details +# this patch should be removed with the next version +diff --git a/src/compress.c b/src/compress.c +index 33ce2bc..f172eda 100644 +--- a/src/compress.c ++++ b/src/compress.c +@@ -378,7 +378,7 @@ + sread(int fd, void *buf, size_t n, int canbepipe __attribute__((__unused__))) + { + ssize_t rv; +-#ifdef FIONREAD ++#if defined(FIONREAD) && !defined(__MINGW32__) && !defined(WIN32) + int t = 0; + #endif + size_t rn = n; +@@ -386,7 +386,7 @@ + if (fd == STDIN_FILENO) + goto nocheck; + +-#ifdef FIONREAD ++#if defined(FIONREAD) && !defined(__MINGW32__) && !defined(WIN32) + if (canbepipe && (ioctl(fd, FIONREAD, &t) == -1 || t == 0)) { + #ifdef FD_ZERO + ssize_t cnt; diff --git a/externals/vcpkg/ports/libmagic/portfile.cmake b/externals/vcpkg/ports/libmagic/portfile.cmake new file mode 100755 index 000000000..ed155792b --- /dev/null +++ b/externals/vcpkg/ports/libmagic/portfile.cmake @@ -0,0 +1,71 @@ +if(VCPKG_TARGET_IS_WINDOWS) + set(PATCHES + "0001-Use-libtre.patch" + "0002-Change-zlib-lib-name-to-match-CMake-output.patch" + "0003-Fix-WIN32-macro-checks.patch" + "0004-Typedef-POSIX-types-on-Windows.patch" + "0005-Include-dirent.h-for-S_ISREG-and-S_ISDIR.patch" + "0006-Remove-Wrap-POSIX-headers.patch" + "0007-Substitute-unistd-macros-for-MSVC.patch" + "0008-Add-FILENO-defines.patch" + "0009-No-fcntl-in-magic.c.patch" + "0010-Properly-check-for-the-presence-of-bitmasks.patch" + "0011-Remove-pipe-related-functions-in-funcs.c.patch" + "0012-Convert-MSYS2-paths-to-Windows-paths.patch" + "0013-Check-for-backslash-in-argv-0-on-Windows.patch" + "0014-Define-POSIX-macros-if-missing.patch" + "0015-MSYS2-Remove-ioctl-call.patch" + ) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO file/file + REF FILE5_40 + SHA512 d76bfe5326e1b40368e055c2e049a24b4ffdbd727371f4f3aa1dd3f53787d16b88550b3cc71ecf02151e2fb3e567eb2598e4707badab8c391eb71113c2dcc319 + HEAD_REF master + PATCHES ${PATCHES} +) + +if(VCPKG_TARGET_IS_WINDOWS) + set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS") + set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS") +endif() + +vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH "${SOURCE_PATH}" +) + +if(VCPKG_CROSSCOMPILING) + vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/libmagic/bin") +elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(EXTRA_ARGS "ADD_BIN_TO_PATH") +endif() + +vcpkg_install_make(${EXTRA_ARGS}) +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin") +vcpkg_fixup_pkgconfig() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +if(VCPKG_TARGET_IS_WINDOWS) + if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/share/misc") + file(COPY "${CURRENT_PACKAGES_DIR}/share/${PORT}/misc/magic.mgc" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/share/misc") + endif() + if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/share/misc") + file(COPY "${CURRENT_PACKAGES_DIR}/share/${PORT}/misc/magic.mgc" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/share/misc") + endif() +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/man5") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libmagic/vcpkg.json b/externals/vcpkg/ports/libmagic/vcpkg.json new file mode 100755 index 000000000..9f63ac322 --- /dev/null +++ b/externals/vcpkg/ports/libmagic/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "libmagic", + "version-string": "5.40", + "port-version": 1, + "description": "This library can be used to classify files according to magic number tests.", + "homepage": "https://github.com/file/file", + "dependencies": [ + { + "name": "dirent", + "platform": "windows" + }, + { + "name": "getopt", + "platform": "windows" + }, + { + "name": "libmagic", + "host": true + }, + { + "name": "tre", + "platform": "windows | mingw" + } + ] +} diff --git a/externals/vcpkg/ports/libmariadb/arm64.patch b/externals/vcpkg/ports/libmariadb/arm64.patch new file mode 100755 index 000000000..4d8e9ac8d --- /dev/null +++ b/externals/vcpkg/ports/libmariadb/arm64.patch @@ -0,0 +1,15 @@ +diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt +index 640a35bea..6c8d93250 100755 +--- a/libmariadb/CMakeLists.txt ++++ b/libmariadb/CMakeLists.txt +@@ -410,10 +410,6 @@ TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS}) + + SIGN_TARGET(libmariadb) + +-IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) +- SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") +-ENDIF() +- + IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR + CMAKE_SYSTEM_NAME MATCHES "kFreeBSD" OR + CMAKE_SYSTEM_NAME MATCHES "GNU") diff --git a/externals/vcpkg/ports/libmariadb/disable-test-build.patch b/externals/vcpkg/ports/libmariadb/disable-test-build.patch new file mode 100755 index 000000000..6ee60ba93 --- /dev/null +++ b/externals/vcpkg/ports/libmariadb/disable-test-build.patch @@ -0,0 +1,18 @@ +diff --git a/unittest/libmariadb/CMakeLists.txt b/unittest/libmariadb/CMakeLists.txt +index e3ba18b..48c4f1d 100644 +--- a/unittest/libmariadb/CMakeLists.txt ++++ b/unittest/libmariadb/CMakeLists.txt +@@ -48,6 +48,7 @@ ENDIF() + + ADD_LIBRARY(ma_getopt ma_getopt.c) + ++if(0) + FOREACH(API_TEST ${API_TESTS}) + IF (NOT TARGET ${API_TEST}) + ADD_EXECUTABLE(${API_TEST} ${API_TEST}.c) +@@ -65,3 +66,4 @@ FOREACH(API_TEST ${MANUAL_TESTS}) + ADD_EXECUTABLE(${API_TEST} ${API_TEST}.c) + TARGET_LINK_LIBRARIES(${API_TEST} cctap ma_getopt mariadbclient) + ENDFOREACH() ++endif() +\ No newline at end of file diff --git a/externals/vcpkg/ports/libmariadb/export-cmake-targets.patch b/externals/vcpkg/ports/libmariadb/export-cmake-targets.patch new file mode 100755 index 000000000..13c6c1a61 --- /dev/null +++ b/externals/vcpkg/ports/libmariadb/export-cmake-targets.patch @@ -0,0 +1,43 @@ +diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt +index c109a20..e1fa3f1 100644 +--- a/libmariadb/CMakeLists.txt ++++ b/libmariadb/CMakeLists.txt +@@ -405,6 +405,7 @@ ELSE() + ADD_LIBRARY(libmariadb ${libmariadb_RC} ${MARIADB_OBJECTS} mariadbclient.def) + SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINKER_LANGUAGE C) + ENDIF() ++TARGET_INCLUDE_DIRECTORIES(libmariadb PUBLIC $) + + TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS}) + +@@ -453,13 +454,30 @@ ENDIF() + + INSTALL(TARGETS mariadbclient + COMPONENT Development ++ EXPORT unofficial-libmariadb-targets + LIBRARY DESTINATION lib) + INSTALL(TARGETS libmariadb + COMPONENT SharedLibraries ++ EXPORT unofficial-libmariadb-targets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + ++install(EXPORT unofficial-libmariadb-targets ++ NAMESPACE unofficial:: ++ DESTINATION share/unofficial-libmariadb ++) ++ ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake.in" ++[[include(CMakeFindDependencyMacro) ++find_dependency(ZLIB) ++if("@WITH_SSL@" STREQUAL "OPENSSL") ++ find_dependency(OpenSSL) ++endif() ++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-libmariadb-targets.cmake") ++]]) ++configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake" @ONLY) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake DESTINATION share/unofficial-libmariadb) + + IF(0) + # On Windows, install PDB diff --git a/externals/vcpkg/ports/libmariadb/fix-InstallPath.patch b/externals/vcpkg/ports/libmariadb/fix-InstallPath.patch new file mode 100755 index 000000000..c9794fc58 --- /dev/null +++ b/externals/vcpkg/ports/libmariadb/fix-InstallPath.patch @@ -0,0 +1,62 @@ +diff --git a/include/mariadb_version.h.in b/include/mariadb_version.h.in +index a82dbb7..e9005fa 100644 +--- a/include/mariadb_version.h.in ++++ b/include/mariadb_version.h.in +@@ -30,7 +30,7 @@ + #define MARIADB_PACKAGE_VERSION_ID @MARIADB_PACKAGE_VERSION_ID@ + #define MARIADB_SYSTEM_TYPE "@CMAKE_SYSTEM_NAME@" + #define MARIADB_MACHINE_TYPE "@CMAKE_SYSTEM_PROCESSOR@" +-#define MARIADB_PLUGINDIR "@CMAKE_INSTALL_PREFIX@/@INSTALL_PLUGINDIR@" ++#define MARIADB_PLUGINDIR "../@INSTALL_PLUGINDIR@" + + /* mysqld compile time options */ + #ifndef MYSQL_CHARSET +diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt +index bcfd4de..c109a20 100644 +--- a/libmariadb/CMakeLists.txt ++++ b/libmariadb/CMakeLists.txt +@@ -398,10 +398,10 @@ ADD_LIBRARY(mariadbclient STATIC ${MARIADB_OBJECTS} ${EMPTY_FILE}) + TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS}) + + IF(UNIX) +- ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE}) ++ ADD_LIBRARY(libmariadb ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE}) + SET_TARGET_PROPERTIES(libmariadb PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}") + ELSE() +- ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} mariadbclient.def) ++ ADD_LIBRARY(libmariadb ${libmariadb_RC} ${MARIADB_OBJECTS} mariadbclient.def) + SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINKER_LANGUAGE C) + ENDIF() + +@@ -453,13 +453,15 @@ ENDIF() + + INSTALL(TARGETS mariadbclient + COMPONENT Development +- DESTINATION ${INSTALL_LIBDIR}) ++ LIBRARY DESTINATION lib) + INSTALL(TARGETS libmariadb + COMPONENT SharedLibraries +- DESTINATION ${INSTALL_LIBDIR}) ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + + +-IF(MSVC) ++IF(0) + # On Windows, install PDB + INSTALL(FILES $ DESTINATION "${INSTALL_LIBDIR}" + CONFIGURATIONS Debug RelWithDebInfo +diff --git a/mariadb_config/mariadb_config.c.in b/mariadb_config/mariadb_config.c.in +index 5574943..fc1ca7c 100644 +--- a/mariadb_config/mariadb_config.c.in ++++ b/mariadb_config/mariadb_config.c.in +@@ -210,7 +210,7 @@ end: + } + if (!p || !p[0]) + { +- strncpy(installation_dir, "@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@", PATH_MAX - 1); ++ strncpy(installation_dir, "../@CMAKE_INSTALL_PREFIX@", PATH_MAX - 1); + return; + } + } diff --git a/externals/vcpkg/ports/libmariadb/fix-iconv.patch b/externals/vcpkg/ports/libmariadb/fix-iconv.patch new file mode 100755 index 000000000..a3b428421 --- /dev/null +++ b/externals/vcpkg/ports/libmariadb/fix-iconv.patch @@ -0,0 +1,40 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 203fca7..65cc350 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -342,7 +342,8 @@ ENDIF() + + IF(WITH_ICONV) + IF(NOT WIN32) +- INCLUDE(${CC_SOURCE_DIR}/cmake/FindIconv.cmake) ++ find_package(Iconv REQUIRED) ++ include_directories(${Iconv_INCLUDE_DIRS}) + ENDIF() + ENDIF() + +@@ -359,8 +360,8 @@ IF(WIN32) + SET(SYSTEM_LIBS ws2_32 advapi32 kernel32 shlwapi crypt32 ${LIBZ}) + ELSE() + SET(SYSTEM_LIBS ${SYSTEM_LIBS} ${LIBPTHREAD} ${CMAKE_DL_LIBS} ${LIBM}) +- IF(ICONV_EXTERNAL) +- SET(SYSTEM_LIBS ${SYSTEM_LIBS} ${ICONV_LIBRARIES}) ++ IF(WITH_ICONV) ++ SET(SYSTEM_LIBS ${SYSTEM_LIBS} ${Iconv_LIBRARIES}) + ENDIF() + ENDIF() + IF(WITH_SSL) +diff --git a/mariadb_config/CMakeLists.txt b/mariadb_config/CMakeLists.txt +index 5bbf36b..70e619b 100644 +--- a/mariadb_config/CMakeLists.txt ++++ b/mariadb_config/CMakeLists.txt +@@ -38,8 +38,8 @@ STRING(STRIP "${extra_dynamic_LDFLAGS}" extra_dynamic_LDFLAGS) + LIST(REMOVE_DUPLICATES extra_dynamic_LDFLAGS) + + IF(UNIX AND NOT APPLE) +- IF(ICONV_EXTERNAL) +- GET_LIB_NAME(${ICONV_LIBRARIES} LIB_OUT) ++ IF(WITH_ICONV) ++ GET_LIB_NAME(${Iconv_LIBRARIES} LIB_OUT) + SET(extra_dynamic_LDFLAGS "${extra_dynamic_LDFLAGS} ${LIB_OUT}") + ENDIF() + ENDIF() diff --git a/externals/vcpkg/ports/libmariadb/fix-openssl.patch b/externals/vcpkg/ports/libmariadb/fix-openssl.patch new file mode 100755 index 000000000..01b3b5e01 --- /dev/null +++ b/externals/vcpkg/ports/libmariadb/fix-openssl.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 33565f5..d83176d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -280,7 +280,7 @@ IF(NOT WITH_SSL STREQUAL "OFF") + IF(OPENSSL_FOUND) + ADD_DEFINITIONS(-DHAVE_OPENSSL -DHAVE_TLS) + SET(SSL_SOURCES "${CC_SOURCE_DIR}/libmariadb/secure/openssl.c") +- SET(SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY}) ++ SET(SSL_LIBRARIES OpenSSL::SSL) + IF(WIN32) + CHECK_INCLUDE_FILES (${OPENSSL_INCLUDE_DIR}/openssl/applink.c HAVE_OPENSSL_APPLINK_C) + ENDIF() diff --git a/externals/vcpkg/ports/libmariadb/md.patch b/externals/vcpkg/ports/libmariadb/md.patch new file mode 100755 index 000000000..9d1c4d7b1 --- /dev/null +++ b/externals/vcpkg/ports/libmariadb/md.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cd716e3..a1f2ada 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -98,7 +98,7 @@ IF(MSVC) + # Speedup system tests + INCLUDE(${CC_SOURCE_DIR}/cmake/WindowsCache.cmake) + ADD_DEFINITIONS(-DWIN32_LEAN_AND_MEAN) +- IF (MSVC) ++ IF (MSVC AND 0) + SET(CONFIG_TYPES "DEBUG" "RELEASE" "RELWITHDEBINFO") + FOREACH(BUILD_TYPE ${CONFIG_TYPES}) + FOREACH(COMPILER CXX C) diff --git a/externals/vcpkg/ports/libmariadb/no-extra-static-lib.patch b/externals/vcpkg/ports/libmariadb/no-extra-static-lib.patch new file mode 100755 index 000000000..333be1249 --- /dev/null +++ b/externals/vcpkg/ports/libmariadb/no-extra-static-lib.patch @@ -0,0 +1,19 @@ +diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt +index 39fa709..a726a6d 100644 +--- a/libmariadb/CMakeLists.txt ++++ b/libmariadb/CMakeLists.txt +@@ -455,10 +455,14 @@ IF(NOT WIN32) + SET_TARGET_PROPERTIES(mariadbclient PROPERTIES OUTPUT_NAME "${LIBMARIADB_STATIC_NAME}") + ENDIF() + ++if(VCPKG_MARIADBCLIENT) + INSTALL(TARGETS mariadbclient + COMPONENT Development + EXPORT unofficial-libmariadb-targets + LIBRARY DESTINATION lib) ++else() ++ set_target_properties(mariadbclient PROPERTIES EXCLUDE_FROM_ALL 1) ++endif() + INSTALL(TARGETS libmariadb + COMPONENT SharedLibraries + EXPORT unofficial-libmariadb-targets diff --git a/externals/vcpkg/ports/libmariadb/pkgconfig.patch b/externals/vcpkg/ports/libmariadb/pkgconfig.patch new file mode 100755 index 000000000..a0cc1c18d --- /dev/null +++ b/externals/vcpkg/ports/libmariadb/pkgconfig.patch @@ -0,0 +1,60 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0be0fb1..33565f5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -393,7 +393,7 @@ ENDIF() + INCLUDE(${CC_SOURCE_DIR}/plugins/CMakeLists.txt) + ADD_SUBDIRECTORY(include) + ADD_SUBDIRECTORY(libmariadb) +-IF(NOT WIN32) ++IF(1) + ADD_SUBDIRECTORY(mariadb_config) + ENDIF() + +diff --git a/mariadb_config/CMakeLists.txt b/mariadb_config/CMakeLists.txt +index 70e619b..7a22fa1 100644 +--- a/mariadb_config/CMakeLists.txt ++++ b/mariadb_config/CMakeLists.txt +@@ -30,6 +30,15 @@ IF(${rllength} GREATER 0) + LIST(REMOVE_DUPLICATES SYSTEM_LIBS) + ENDIF() + ++set(REQUIRES_PRIVATE "" CACHE STRING "") ++if(WITH_SSL STREQUAL "OPENSSL") ++ list(REMOVE_ITEM SYSTEM_LIBS ${SSL_LIBRARIES}) ++ string(APPEND REQUIRES_PRIVATE " openssl") ++endif() ++if(WITH_EXTERNAL_ZLIB) ++ string(APPEND REQUIRES_PRIVATE " zlib") ++endif() ++ + FOREACH (LIB_NAME ${SYSTEM_LIBS}) + GET_LIB_NAME(${LIB_NAME} LIB_OUT) + SET(extra_dynamic_LDFLAGS "${extra_dynamic_LDFLAGS} ${LIB_OUT}") +@@ -50,6 +59,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mariadb_config.c.in + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmariadb.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc @ONLY) + ++if(0) + ADD_EXECUTABLE(mariadb_config ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c) + + IF(CMAKE_SYSTEM_NAME MATCHES AIX) +@@ -61,6 +71,7 @@ ENDIF() + INSTALL(TARGETS mariadb_config + DESTINATION "bin" + COMPONENT Development) ++endif() + + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc + DESTINATION "${INSTALL_PCDIR}" +diff --git a/mariadb_config/libmariadb.pc.in b/mariadb_config/libmariadb.pc.in +index 968181a..3f0410d 100644 +--- a/mariadb_config/libmariadb.pc.in ++++ b/mariadb_config/libmariadb.pc.in +@@ -16,5 +16,6 @@ Description: MariaDB Connector/C dynamic library + Cflags: -I${includedir} + Libs: -L${libdir} -lmariadb + Libs.private: @extra_dynamic_LDFLAGS@ ++Requires.private: @REQUIRES_PRIVATE@ + + diff --git a/externals/vcpkg/ports/libmariadb/portfile.cmake b/externals/vcpkg/ports/libmariadb/portfile.cmake new file mode 100755 index 000000000..5ec772680 --- /dev/null +++ b/externals/vcpkg/ports/libmariadb/portfile.cmake @@ -0,0 +1,77 @@ +if (EXISTS "${CURRENT_INSTALLED_DIR}/share/libmysql") + message(FATAL_ERROR "FATAL ERROR: libmysql and libmariadb are incompatible.") +endif() + +if("openssl" IN_LIST FEATURES AND "schannel" IN_LIST FEATURES) + message(FATAL_ERROR "Only one SSL backend must be selected.") +endif() + +if("schannel" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(FATAL_ERROR "Feature schannel not supported on non-Windows platforms.") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mariadb-corporation/mariadb-connector-c + REF b2bb1b213c79169b7c994a99f21f47f11be465d4 # v3.1.15 + SHA512 51ebd2e9fd505eebc7691c60fe0b86cfc5368f8b370fba6c3ec8f5514319ef1e0de4910ad5e093cd7d5e5c7782120e22e8c85c94af9389fa4e240cedf012d755 + HEAD_REF 3.1 + PATCHES + arm64.patch + md.patch + disable-test-build.patch + fix-InstallPath.patch + fix-iconv.patch + export-cmake-targets.patch + pkgconfig.patch + no-extra-static-lib.patch + fix-openssl.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + iconv WITH_ICONV + mariadbclient VCPKG_MARIADBCLIENT +) + +if("openssl" IN_LIST FEATURES) + set(WITH_SSL OPENSSL) +elseif("schannel" IN_LIST FEATURES) + set(WITH_SSL ON) +else() + set(WITH_SSL OFF) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DINSTALL_INCLUDEDIR=include/mysql # legacy port decisiong + -DINSTALL_LIBDIR=lib + -DINSTALL_PLUGINDIR=plugins/${PORT} + -DWITH_UNIT_TESTS=OFF + -DWITH_CURL=OFF + -DWITH_EXTERNAL_ZLIB=ON + -DWITH_SSL=${WITH_SSL} + -DREMOTEIO_PLUGIN_TYPE=OFF + -DAUTH_GSSAPI_PLUGIN_TYPE=OFF + MAYBE_UNUSED_VARIABLES + AUTH_GSSAPI_PLUGIN_TYPE +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libmariadb) + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libmariadb.pc" " -lmariadb" " -llibmariadb") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libmariadb.pc" " -lmariadb" " -llibmariadb") + endif() +endif() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# copy license file +file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libmariadb/vcpkg.json b/externals/vcpkg/ports/libmariadb/vcpkg.json new file mode 100755 index 000000000..6d0742e7f --- /dev/null +++ b/externals/vcpkg/ports/libmariadb/vcpkg.json @@ -0,0 +1,65 @@ +{ + "name": "libmariadb", + "version-semver": "3.1.15", + "description": "MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases", + "homepage": "https://github.com/MariaDB/mariadb-connector-c", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "default-features": [ + "ssl" + ], + "features": { + "iconv": { + "description": "Enables character set conversion", + "dependencies": [ + "libiconv" + ] + }, + "mariadbclient": { + "description": "Build the static mariadbclient library" + }, + "openssl": { + "description": "SSL support (OpenSSL)", + "dependencies": [ + "openssl" + ] + }, + "schannel": { + "description": "SSL support (Secure Channel)" + }, + "ssl": { + "description": "Default SSL backend", + "dependencies": [ + { + "name": "libmariadb", + "default-features": false, + "features": [ + "schannel" + ], + "platform": "windows | mingw" + }, + { + "name": "libmariadb", + "default-features": false, + "features": [ + "openssl" + ], + "platform": "!windows & !mingw" + } + ] + }, + "zlib": { + "description": "Obsolete. zlib is always used. This feature is left for compatibility." + } + } +} diff --git a/externals/vcpkg/ports/libmaxminddb/CMakeLists.txt b/externals/vcpkg/ports/libmaxminddb/CMakeLists.txt new file mode 100755 index 000000000..c46c6319b --- /dev/null +++ b/externals/vcpkg/ports/libmaxminddb/CMakeLists.txt @@ -0,0 +1,34 @@ +cmake_minimum_required (VERSION 3.9) +project(maxminddb C) + +set(CMAKE_DEBUG_POSTFIX d) +set(CMAKE_SHARED_LIBRARY_PREFIX lib) +set(CMAKE_STATIC_LIBRARY_PREFIX lib) + +if(MSVC) + add_compile_options(-D_CRT_SECURE_NO_WARNINGS) +endif() + +set(SRCS + src/maxminddb.c + src/data-pool.c +) + +include_directories(. src include projects/VS12) + +add_library(maxminddb ${SRCS}) + +if(WIN32) + target_link_libraries(maxminddb ws2_32) +endif() + +install( + TARGETS maxminddb + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES include/maxminddb.h projects/VS12/maxminddb_config.h DESTINATION include/maxminddb) +endif() diff --git a/externals/vcpkg/ports/libmaxminddb/fix-linux-build.patch b/externals/vcpkg/ports/libmaxminddb/fix-linux-build.patch new file mode 100755 index 000000000..bdf9b7780 --- /dev/null +++ b/externals/vcpkg/ports/libmaxminddb/fix-linux-build.patch @@ -0,0 +1,19 @@ +diff --git a/include/maxminddb.h b/include/maxminddb.h +index 13b276f..6c70e49 100644 +--- a/include/maxminddb.h ++++ b/include/maxminddb.h +@@ -24,11 +24,12 @@ extern "C" { + #include + #include + ++/* libmaxminddb package version from configure */ ++#define PACKAGE_VERSION "1.4.3" ++ + #ifdef _WIN32 + #include + #include +-/* libmaxminddb package version from configure */ +-#define PACKAGE_VERSION "1.4.3" + + typedef ADDRESS_FAMILY sa_family_t; + diff --git a/externals/vcpkg/ports/libmaxminddb/portfile.cmake b/externals/vcpkg/ports/libmaxminddb/portfile.cmake new file mode 100755 index 000000000..db280fad8 --- /dev/null +++ b/externals/vcpkg/ports/libmaxminddb/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO maxmind/libmaxminddb + REF 07797e9dfb6771190f9fa41a33babe19425ef552 #1.4.3 + SHA512 94f7fbd46a7846c804edad9759ceedf2f7c4b2085430322f74bea5c89f6c3fa0824f154f551119a8c69becec5120650efef89c6d7f5a2ef3df476086070c8c7e + HEAD_REF master + PATCHES fix-linux-build.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/libmaxminddb/vcpkg.json b/externals/vcpkg/ports/libmaxminddb/vcpkg.json new file mode 100755 index 000000000..c24cb9c92 --- /dev/null +++ b/externals/vcpkg/ports/libmaxminddb/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libmaxminddb", + "version-string": "1.4.3", + "port-version": 1, + "description": "C library for the MaxMind DB file format", + "homepage": "https://github.com/maxmind/libmaxminddb" +} diff --git a/externals/vcpkg/ports/libmediainfo/portfile.cmake b/externals/vcpkg/ports/libmediainfo/portfile.cmake new file mode 100755 index 000000000..40229288c --- /dev/null +++ b/externals/vcpkg/ports/libmediainfo/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO MediaArea/MediaInfoLib + REF v21.03 + SHA512 1317b27dc3ac1ad224ef9b7ca7c08a8f55983ac6984b5e8daf6309fa33094fbad8a0a5fbe0cff086b7a5c9233b3e24e26995b037d16adf83f63877f2c753f811 + HEAD_REF master + PATCHES vcpkg_support_in_cmakelists.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/Project/CMake" + OPTIONS + -DBUILD_ZENLIB=0 + -DBUILD_ZLIB=0 +) + +vcpkg_cmake_install() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/share/mediainfolib") + file(RENAME "${CURRENT_PACKAGES_DIR}/share/mediainfolib" "${CURRENT_PACKAGES_DIR}/share/MediaInfoLib") +endif() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share/mediainfolib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/mediainfolib" "${CURRENT_PACKAGES_DIR}/debug/share/MediaInfoLib") +endif() +vcpkg_cmake_config_fixup(PACKAGE_NAME MediaInfoLib CONFIG_PATH share/MediaInfoLib) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libmediainfo/vcpkg.json b/externals/vcpkg/ports/libmediainfo/vcpkg.json new file mode 100755 index 000000000..f6832d265 --- /dev/null +++ b/externals/vcpkg/ports/libmediainfo/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "libmediainfo", + "version-string": "21.03", + "port-version": 2, + "description": "Get most relevant technical and tag data from video and audio files", + "homepage": "https://github.com/MediaArea/MediaInfoLib", + "dependencies": [ + "curl", + "libzen", + "tinyxml2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/libmediainfo/vcpkg_support_in_cmakelists.patch b/externals/vcpkg/ports/libmediainfo/vcpkg_support_in_cmakelists.patch new file mode 100755 index 000000000..c38c919c8 --- /dev/null +++ b/externals/vcpkg/ports/libmediainfo/vcpkg_support_in_cmakelists.patch @@ -0,0 +1,55 @@ +diff --git a/Project/CMake/CMakeLists.txt b/Project/CMake/CMakeLists.txt +index f983343..c6ba5ea 100644 +--- a/Project/CMake/CMakeLists.txt ++++ b/Project/CMake/CMakeLists.txt +@@ -88,7 +88,7 @@ endif() + find_package(TinyXML) + + # use system curl if is present +-find_package(CURL) ++find_package(CURL CONFIG REQUIRED) + + include_directories(${MediaInfoLib_SOURCES_PATH}) + include_directories(${MediaInfoLib_SOURCES_PATH}/ThirdParty/md5/) +@@ -400,13 +400,7 @@ endif() + target_link_libraries(mediainfo ${ZenLib_LIBRARY} ${ZLIB_LIBRARIES}) + + if(MSVC AND BUILD_SHARED_LIBS) +- get_target_property(LOCATION mediainfo LOCATION_DEBUG) +- string(REGEX REPLACE "\\.[^.]*$" ".pdb" LOCATION "${LOCATION}") +- install(FILES ${LOCATION} DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug) +- +- get_target_property(LOCATION mediainfo LOCATION_RELWITHDEBINFO) +- string(REGEX REPLACE "\\.[^.]*$" ".pdb" LOCATION "${LOCATION}") +- install(FILES ${LOCATION} DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo) ++ install(FILES $ DESTINATION ${BIN_INSTALL_DIR} OPTIONAL) + endif() + + if (APPLE) +diff --git a/Source/ThirdParty/aes-gladman/aesopt.h b/Source/ThirdParty/aes-gladman/aesopt.h +index d3ac0f9..eeefa40 100644 +--- a/Source/ThirdParty/aes-gladman/aesopt.h ++++ b/Source/ThirdParty/aes-gladman/aesopt.h +@@ -183,7 +183,7 @@ Issue Date: 20/12/2007 + AES_REV_DKS must NOT be defined when such assembler files are + built + */ +-#if 1 && defined( _WIN64 ) && defined( _MSC_VER ) ++#if 1 && defined( _WIN64 ) && defined( _MSC_VER ) && defined( _M_AMD64 ) + # define INTEL_AES_POSSIBLE + #endif + +diff --git a/Source/ThirdParty/aes-gladman/brg_endian.h b/Source/ThirdParty/aes-gladman/brg_endian.h +index b44c5cb..8c34364 100644 +--- a/Source/ThirdParty/aes-gladman/brg_endian.h ++++ b/Source/ThirdParty/aes-gladman/brg_endian.h +@@ -110,7 +110,8 @@ Issue Date: 20/12/2007 + defined( __MRC__ ) || defined( __MVS__ ) || defined( __MWERKS__ ) || \ + defined( sparc ) || defined( __sparc) || defined( SYMANTEC_C ) || \ + defined( __VOS__ ) || defined( __TIGCC__ ) || defined( __TANDEM ) || \ +- defined( THINK_C ) || defined( __VMCMS__ ) || defined( _AIX ) ++ defined( THINK_C ) || defined( __VMCMS__ ) || defined( _AIX ) || \ ++ defined( _M_ARM64 ) || defined ( _M_ARM ) + # define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN + + #elif 0 /* **** EDIT HERE IF NECESSARY **** */ diff --git a/externals/vcpkg/ports/libmesh/copyright b/externals/vcpkg/ports/libmesh/copyright new file mode 100755 index 000000000..a91215677 --- /dev/null +++ b/externals/vcpkg/ports/libmesh/copyright @@ -0,0 +1,169 @@ +GNU LESSER GENERAL PUBLIC LICENSE +Version 2.1, February 1999 + +Copyright (C) 1991, 1999 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] +Preamble +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. + +This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. + +When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. + +To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. + +For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. + +We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. + +To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. + +Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. + +Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. + +When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. + +We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. + +For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. + +In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. + +Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. + +The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION +0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". + +A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. + +The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) + +"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. + +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. + +1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + +a) The modified work must itself be a software library. +b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. +c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. +d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. +(For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + +3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. + +Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. + +This option is useful when you wish to copy part of the code of the Library into a program that is not a library. + +4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. + +If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. + +5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. + +However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. + +When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. + +If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) + +Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. + +6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. + +You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: + +a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) +b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. +c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. +d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. +e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. +For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + +It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. + +7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: + +a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. +b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. +8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + +9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. + +10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. + +11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + +12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + +13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. + +14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS +How to Apply These Terms to Your New Libraries +If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting redistribution under these terms (or, alternatively, under the terms of the ordinary General Public License). + +To apply these terms, attach the following notices to the library. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. + +one line to give the library's name and an idea of what it does. +Copyright (C) year name of author + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the library, if necessary. Here is a sample; alter the names: + +Yoyodyne, Inc., hereby disclaims all copyright interest in +the library `Frob' (a library for tweaking knobs) written +by James Random Hacker. + +signature of Ty Coon, 1 April 1990 +Ty Coon, President of Vice +That's all there is to it! \ No newline at end of file diff --git a/externals/vcpkg/ports/libmesh/portfile.cmake b/externals/vcpkg/ports/libmesh/portfile.cmake new file mode 100755 index 000000000..c4810b560 --- /dev/null +++ b/externals/vcpkg/ports/libmesh/portfile.cmake @@ -0,0 +1,53 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libMesh/libmesh + REF 21f623c837b3865ed65ec9608b357bdb1935d428 #1.5.0 + SHA512 53ad41ed0cd99cb5096ff338a3ff5d8a8ecbfb17dc1d7ee0d2b0cbffecbede7f7c11b7c3c2233cec9dde0988c8828ba0199247effd3442befc72230e641a185e + HEAD_REF master +) + +if(VCPKG_TARGET_IS_WINDOWS) + set(OPTIONS --disable-qhull ) +endif() +# There a lot of configure options in this port which are not yet correctly handled by VCPKG +# To only mention two: +# --enable-vtk-required Error if VTK is not detected by configure +# --enable-capnp-required Error if Cap'n Proto support is not detected by +# but there are a lot more which need to be checked/fixed +# So this port can only be considered a Work In Progress +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS ${OPTIONS} + OPTIONS_DEBUG --with-methods=dbg + OPTIONS_RELEASE --with-methods=opt +) + +vcpkg_install_make() + +if (EXISTS ${CURRENT_PACKAGES_DIR}/contrib/bin/libtool) + file(COPY ${CURRENT_PACKAGES_DIR}/contrib/bin/libtool DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + file(REMOVE ${CURRENT_PACKAGES_DIR}/contrib/bin/libtool) +endif() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/contrib) + +file(GLOB LIBMESH_EXAMPLES ${CURRENT_PACKAGES_DIR}/examples/*) +foreach (LIBMESH_EXAMPLE ${LIBMESH_EXAMPLES}) + file(COPY ${LIBMESH_EXAMPLE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) +endforeach() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/examples) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +# Remove tools and debug include directories +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/contrib ${CURRENT_PACKAGES_DIR}/debug/etc + ${CURRENT_PACKAGES_DIR}/debug/examples ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/tools/libmesh/debug + ${CURRENT_PACKAGES_DIR}/Make.common ${CURRENT_PACKAGES_DIR}/debug/Make.common) + +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(INSTALL ${CURRENT_PORT_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + diff --git a/externals/vcpkg/ports/libmesh/vcpkg.json b/externals/vcpkg/ports/libmesh/vcpkg.json new file mode 100755 index 000000000..d7240de55 --- /dev/null +++ b/externals/vcpkg/ports/libmesh/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libmesh", + "version": "1.5.0", + "port-version": 4, + "description": "The libMesh library provides a framework for the numerical simulation of partial differential equations using arbitrary unstructured discretizations on serial and parallel platforms. A major goal of the library is to provide support for adaptive mesh refinement (AMR) computations in parallel while allowing a research scientist to focus on the physics they are modeling.", + "homepage": "https://github.com/libMesh/libmesh", + "license": "LGPL-2.1-only" +} diff --git a/externals/vcpkg/ports/libmicrohttpd/portfile.cmake b/externals/vcpkg/ports/libmicrohttpd/portfile.cmake new file mode 100755 index 000000000..4fcca42aa --- /dev/null +++ b/externals/vcpkg/ports/libmicrohttpd/portfile.cmake @@ -0,0 +1,52 @@ +set(MICROHTTPD_VERSION 0.9.75) + +vcpkg_download_distfile(ARCHIVE + URLS + "https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${MICROHTTPD_VERSION}.tar.gz" + "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${MICROHTTPD_VERSION}.tar.gz" + FILENAME "libmicrohttpd-${MICROHTTPD_VERSION}.tar.gz" + SHA512 4dc62ed191342a61cc2767171bb1ff4050f390db14ef7100299888237b52ea0b04b939c843878fe7f5daec2b35a47b3c1b7e7c11fb32d458184fe6b19986a37c +) + +vcpkg_extract_source_archive_ex( + ARCHIVE "${ARCHIVE}" + OUT_SOURCE_PATH SOURCE_PATH +) + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(CFG_SUFFIX "dll") + else() + set(CFG_SUFFIX "static") + endif() + + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH w32/VS2015/libmicrohttpd.vcxproj + RELEASE_CONFIGURATION "Release-${CFG_SUFFIX}" + DEBUG_CONFIGURATION "Debug-${CFG_SUFFIX}" + ) + + file(GLOB MICROHTTPD_HEADERS "${SOURCE_PATH}/src/include/microhttpd*.h") + file(COPY ${MICROHTTPD_HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include") +else() + if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(ENV{LIBS} "$ENV{LIBS} -framework Foundation -framework AppKit") # TODO: Get this from the extracted cmake vars somehow + endif() + vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + --disable-doc + --disable-examples + --disable-curl + --disable-https + --with-gnutls=no + ) + + vcpkg_install_make() + vcpkg_fixup_pkgconfig() + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libmicrohttpd/vcpkg.json b/externals/vcpkg/ports/libmicrohttpd/vcpkg.json new file mode 100755 index 000000000..1418a7ff4 --- /dev/null +++ b/externals/vcpkg/ports/libmicrohttpd/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "libmicrohttpd", + "version": "0.9.75", + "description": "GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application", + "homepage": "https://www.gnu.org/software/libmicrohttpd/", + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "gettext", + "platform": "!windows" + } + ] +} diff --git a/externals/vcpkg/ports/libmikmod/fix-missing-dll.patch b/externals/vcpkg/ports/libmikmod/fix-missing-dll.patch new file mode 100755 index 000000000..a15c2400c --- /dev/null +++ b/externals/vcpkg/ports/libmikmod/fix-missing-dll.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 53a174e..b4d31d3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -856,11 +856,19 @@ INSTALL( + ARCHIVE DESTINATION "lib${LIB_SUFFIX}" + ) + +-INSTALL( +- FILES "${CMAKE_BINARY_DIR}/libmikmod-config" +- PERMISSIONS GROUP_EXECUTE GROUP_READ OWNER_EXECUTE OWNER_READ OWNER_WRITE WORLD_EXECUTE WORLD_READ +- DESTINATION "bin" +-) ++IF(WIN32) ++ SET(LIB_SUFFIX_USED ".dll") ++ELSEIF(UNIX) ++ SET(LIB_SUFFIX_USED ".so") ++ELSEIF(APPLE) ++ SET(LIB_SUFFIX_USED ".dylib") ++ELSE() ++ SET(LIB_SUFFIX_USED) ++ENDIF() ++ ++IF(NOT ENABLE_STATIC) ++ INSTALL(FILES "${CMAKE_BINARY_DIR}/mikmod${LIB_SUFFIX_USED}" DESTINATION "bin") ++ENDIF() + + INSTALL( + FILES diff --git a/externals/vcpkg/ports/libmikmod/name_conflict.patch b/externals/vcpkg/ports/libmikmod/name_conflict.patch new file mode 100755 index 000000000..be0ba1d28 --- /dev/null +++ b/externals/vcpkg/ports/libmikmod/name_conflict.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 53a174e..5983882 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -404,7 +404,7 @@ IF (ENABLE_STATIC) + + SET_TARGET_PROPERTIES( + mikmod-static +- PROPERTIES OUTPUT_NAME "mikmod" ++ PROPERTIES OUTPUT_NAME "mikmod-static" + ) + SET_TARGET_PROPERTIES( + ${LIBMIKMOD_LIBS} diff --git a/externals/vcpkg/ports/libmikmod/portfile.cmake b/externals/vcpkg/ports/libmikmod/portfile.cmake new file mode 100755 index 000000000..17d19c755 --- /dev/null +++ b/externals/vcpkg/ports/libmikmod/portfile.cmake @@ -0,0 +1,49 @@ +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO mikmod/libmikmod + REF 3.3.11.1 + FILENAME "libmikmod-3.3.11.1.tar.gz" + SHA512 f2439e2b691613847cd0787dd4e050116683ce7b05c215b8afecde5c6add819ea6c18e678e258c0a80786bef463f406072de15127f64368f694287a5e8e1a9de + PATCHES + fix-missing-dll.patch + name_conflict.patch +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(ENABLE_STATIC ON) +else() + set(ENABLE_STATIC OFF) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA # Disable this option if project cannot be built with Ninja + OPTIONS + -DENABLE_DOC=OFF + -DENABLE_THREADS=ON + -DDISABLE_HQMIXER=OFF + -DENABLE_AF=ON + -DENABLE_AIFF=ON + -DENABLE_NAS=ON + -DENABLE_OPENAL=ON + -DENABLE_PIPE=ON + -DENABLE_RAW=ON + -DENABLE_STDOUT=ON + -DENABLE_WAV=ON + -DOPENAL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include + -DENABLE_STATIC=${ENABLE_STATIC} + OPTIONS_RELEASE -DENABLE_SIMD=ON + OPTIONS_DEBUG -DENABLE_SIMD=OFF +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +file(INSTALL ${SOURCE_PATH}/COPYING.LESSER DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/libmikmod/vcpkg.json b/externals/vcpkg/ports/libmikmod/vcpkg.json new file mode 100755 index 000000000..797bcbc03 --- /dev/null +++ b/externals/vcpkg/ports/libmikmod/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libmikmod", + "version-string": "3.3.11.1", + "port-version": 10, + "description": "Mikmod is a module player and library supporting many formats, including mod, s3m, it, and xm.", + "homepage": "https://sourceforge.net/projects/mikmod/", + "dependencies": [ + "openal-soft" + ] +} diff --git a/externals/vcpkg/ports/libmodbus/CMakeLists.txt b/externals/vcpkg/ports/libmodbus/CMakeLists.txt new file mode 100755 index 000000000..618ba5f6c --- /dev/null +++ b/externals/vcpkg/ports/libmodbus/CMakeLists.txt @@ -0,0 +1,114 @@ +cmake_minimum_required(VERSION 3.0) +project(libmodbus VERSION 3.1.6) + +set(LIBMODBUS_VERSION ${PROJECT_VERSION}) +set(LIBMODBUS_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) +set(LIBMODBUS_VERSION_MINOR ${PROJECT_VERSION_MINOR}) +set(LIBMODBUS_VERSION_MICRO ${PROJECT_VERSION_PATCH}) +configure_file(src/modbus-version.h.in ${CMAKE_CURRENT_BINARY_DIR}/modbus-version.h) + +if(WIN32) + set(HAVE_ERRNO_H 1) + set(HAVE_FCNTL_H 1) + set(HAVE_LIMITS_H 1) + set(HAVE_SYS_TYPES_H 1) + set(HAVE_TIME_H 1) + set(HAVE_MALLOC 1) + set(HAVE_MEMSET 1) + set(HAVE_STRERROR 1) +else() + include(CheckIncludeFile) + check_include_file(arpa/inet.h HAVE_ARPA_INET_H) + check_include_file(byteswap.h HAVE_BYTESWAP_H) + check_include_file(errno.h HAVE_ERRNO_H) + check_include_file(fcntl.h HAVE_FCNTL_H) + check_include_file(limits.h HAVE_LIMITS_H) + check_include_file(linux/serial.h HAVE_LINUX_SERIAL_H) + check_include_file(netdb.h HAVE_NETDB_H) + check_include_file(netinet/in.h HAVE_NETINET_IN_H) + check_include_file(netinet/tcp.h HAVE_NETINET_TCP_H) + check_include_file(sys/ioctl.h HAVE_SYS_IOCTL_H) + check_include_file(sys/params.h HAVE_SYS_PARAMS_H) + check_include_file(sys/socket.h HAVE_SYS_SOCKET_H) + check_include_file(sys/time.h HAVE_SYS_TIME_H) + check_include_file(sys/types.h HAVE_SYS_TYPES_H) + check_include_file(termios.h HAVE_TERMIOS_H) + check_include_file(time.h HAVE_TIME_H) + check_include_file(unistd.h HAVE_UNISTD_H) + + include(CheckFunctionExists) + check_function_exists(accept4 HAVE_ACCEPT4) + check_function_exists(fork HAVE_FORK) + check_function_exists(getaddrinfo HAVE_GETADDRINFO) + check_function_exists(gettimeofday HAVE_GETTIMEOFDAY) + check_function_exists(inet_ntoa HAVE_INET_NTOA) + check_function_exists(malloc HAVE_MALLOC) + check_function_exists(memset HAVE_MEMSET) + check_function_exists(select HAVE_SELECT) + check_function_exists(socket HAVE_SOCKET) + check_function_exists(strerror HAVE_STRERROR) + check_function_exists(strlcpy HAVE_STRLCPY) + + include(CheckSymbolExists) + check_symbol_exists(TIOCSRS485 sys/ioctl.h HAVE_TIOCRS485) + check_symbol_exists(TIOCM_RTS sys/ioctl.h HAVE_TIOCM_RTS) +endif() + +configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) + + +if(BUILD_SHARED_LIBS) + add_compile_options(-DDLLBUILD=ON) +else() + add_compile_options(-DLIBBUILD=ON) +endif() + +set(MODBUS_PUBLIC_HEADERS + src/modbus-rtu.h + src/modbus-tcp.h + src/modbus.h + ${CMAKE_CURRENT_BINARY_DIR}/modbus-version.h +) + +add_library(modbus + src/modbus-data.c + src/modbus-rtu.c + src/modbus-tcp.c +src/modbus.c) + +target_include_directories(modbus PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(modbus INTERFACE + $ +) +set_target_properties(modbus PROPERTIES PUBLIC_HEADER "${MODBUS_PUBLIC_HEADERS}") + +if(CMAKE_COMPILER_IS_GNUCC) + target_compile_options(modbus PRIVATE -D_GNU_SOURCE) +endif() + +if(WIN32) + target_link_libraries(modbus wsock32 ws2_32) +endif() + +set(LIBMODBUS_SOVERSION_VERSION 5.1.0) +set(LIBMODBUS_SOVERSION_SOVERSION 5) + + +set_target_properties(modbus PROPERTIES + VERSION ${LIBMODBUS_SOVERSION_VERSION} +SOVERSION ${LIBMODBUS_SOVERSION_SOVERSION}) + + +install( + TARGETS modbus + EXPORT libmodbusConfig + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) +install(EXPORT libmodbusConfig DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) + + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES ${MODBUS_PUBLIC_HEADERS} DESTINATION include/) +endif() diff --git a/externals/vcpkg/ports/libmodbus/config.h.cmake b/externals/vcpkg/ports/libmodbus/config.h.cmake new file mode 100755 index 000000000..b8f7585be --- /dev/null +++ b/externals/vcpkg/ports/libmodbus/config.h.cmake @@ -0,0 +1,49 @@ +#ifndef CONFIG_H +#define CONFIG_H + +#cmakedefine HAVE_ARPA_INET_H +#cmakedefine HAVE_BYTESWAP_H +#cmakedefine HAVE_ERRNO_H +#cmakedefine HAVE_FCNTL_H +#cmakedefine HAVE_LIMITS_H +#cmakedefine HAVE_LINUX_SERIAL_H +#cmakedefine HAVE_NETDB_H +#cmakedefine HAVE_NETINET_IN_H +#cmakedefine HAVE_NETINET_TCP_H +#cmakedefine HAVE_SYS_IOCTL_H +#cmakedefine HAVE_SYS_PARAMS_H +#cmakedefine HAVE_SYS_SOCKET_H +#cmakedefine HAVE_SYS_TIME_H +#cmakedefine HAVE_SYS_TYPES_H +#cmakedefine HAVE_TERMIOS_H +#cmakedefine HAVE_TIME_H +#cmakedefine HAVE_UNISTD_H + +#cmakedefine HAVE_ACCEPT4 +#cmakedefine HAVE_FORK +#cmakedefine HAVE_GETADDRINFO +#cmakedefine HAVE_GETTIMEOFDAY +#cmakedefine HAVE_INET_NTOA +#cmakedefine HAVE_MALLOC +#cmakedefine HAVE_MEMSET +#cmakedefine HAVE_SELECT +#cmakedefine HAVE_SOCKET +#cmakedefine HAVE_STRERROR +#cmakedefine HAVE_STRLCPY + +#cmakedefine HAVE_TIOCRS485 +#cmakedefine HAVE_TIOCM_RTS + +#ifdef HAVE_TIOCM_RTS +#define HAVE_DECL_TIOCM_RTS 1 +#else +#define HAVE_DECL_TIOCM_RTS 0 +#endif + +#ifdef HAVE_TIOCRS485 +#define HAVE_DECL_TIOCSRS485 1 +#else +#define HAVE_DECL_TIOCSRS485 0 +#endif + +#endif \ No newline at end of file diff --git a/externals/vcpkg/ports/libmodbus/fix-static-linkage.patch b/externals/vcpkg/ports/libmodbus/fix-static-linkage.patch new file mode 100755 index 000000000..7d7ae79f5 --- /dev/null +++ b/externals/vcpkg/ports/libmodbus/fix-static-linkage.patch @@ -0,0 +1,13 @@ +diff --git a/src/modbus.h b/src/modbus.h +index fbe20bc..895d05d 100644 +--- a/src/modbus.h ++++ b/src/modbus.h +@@ -24,6 +24,8 @@ + # if defined(DLLBUILD) + /* define DLLBUILD when building the DLL */ + # define MODBUS_API __declspec(dllexport) ++# elif defined(LIBBUILD) ++# define MODBUS_API + # else + # define MODBUS_API __declspec(dllimport) + # endif diff --git a/externals/vcpkg/ports/libmodbus/portfile.cmake b/externals/vcpkg/ports/libmodbus/portfile.cmake new file mode 100755 index 000000000..24b6bdfa1 --- /dev/null +++ b/externals/vcpkg/ports/libmodbus/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO stephane/libmodbus + REF v3.1.6 + SHA512 9eaa395c75e1170e703e01f8c52c6e6e87efe4eaa22adfc3b51153fd5535d545aea35cf68e1aba29720a6c1dd13d9c60b6b08a5c8098dccd13ccfdc6944420a9 + HEAD_REF master + PATCHES fix-static-linkage.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${CMAKE_CURRENT_LIST_DIR}/config.h.cmake DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/modbus.h "elif defined(LIBBUILD)" "elif 1") +endif() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING.LESSER DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/externals/vcpkg/ports/libmodbus/vcpkg.json b/externals/vcpkg/ports/libmodbus/vcpkg.json new file mode 100755 index 000000000..08d6a1cda --- /dev/null +++ b/externals/vcpkg/ports/libmodbus/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libmodbus", + "version": "3.1.6", + "port-version": 2, + "description": "libmodbus is a free software library to send/receive data with a device which respects the Modbus protocol", + "homepage": "https://github.com/stephane/libmodbus", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/libmodman/fix-install-path.patch b/externals/vcpkg/ports/libmodman/fix-install-path.patch new file mode 100755 index 000000000..066813b40 --- /dev/null +++ b/externals/vcpkg/ports/libmodman/fix-install-path.patch @@ -0,0 +1,39 @@ +diff --git a/libmodman/CMakeLists.txt b/libmodman/CMakeLists.txt +index 0aff593..9e419ce 100644 +--- a/libmodman/CMakeLists.txt ++++ b/libmodman/CMakeLists.txt +@@ -30,15 +30,15 @@ if(NOT WIN32 AND NOT APPLE) + configure_file(libmodman-2.0.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/libmodman-2.0.pc @ONLY) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmodman-2.0.pc +- DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) ++ DESTINATION lib/pkgconfig) + endif() + + # CMake Find helper +-if (NOT WIN32 AND NOT APPLE) ++if (1) + configure_file(Findlibmodman.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/Findlibmodman.cmake @ONLY) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Findlibmodman.cmake +- DESTINATION ${SHARE_INSTALL_DIR}/cmake/Modules) ++ DESTINATION share/${PROJECT_NAME}) + endif() + + # Define the library itself +@@ -50,8 +50,13 @@ if(NOT WIN32) + target_link_libraries(modman dl) + endif() + set_target_properties(modman PROPERTIES PREFIX "lib" VERSION 1.0.0 SOVERSION 1) +-install(TARGETS modman DESTINATION ${LIB_INSTALL_DIR}) +-install(FILES module_manager.hpp module.hpp DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}) ++install( ++ TARGETS modman ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++) ++install(FILES module_manager.hpp module.hpp DESTINATION include/${PROJECT_NAME}) + + ### Tests + add_testdirectory(test) diff --git a/externals/vcpkg/ports/libmodman/fix-undefined-typeid.patch b/externals/vcpkg/ports/libmodman/fix-undefined-typeid.patch new file mode 100755 index 000000000..93db67587 --- /dev/null +++ b/externals/vcpkg/ports/libmodman/fix-undefined-typeid.patch @@ -0,0 +1,12 @@ +diff --git a/libmodman/test/main.hpp b/libmodman/test/main.hpp +index 90ca87f..f4f8844 100644 +--- a/libmodman/test/main.hpp ++++ b/libmodman/test/main.hpp +@@ -20,6 +20,7 @@ + #ifndef MAIN_HPP_ + #define MAIN_HPP_ + ++#include + #include "../module_manager.hpp" + + using namespace std; diff --git a/externals/vcpkg/ports/libmodman/portfile.cmake b/externals/vcpkg/ports/libmodman/portfile.cmake new file mode 100755 index 000000000..816160f30 --- /dev/null +++ b/externals/vcpkg/ports/libmodman/portfile.cmake @@ -0,0 +1,42 @@ +# Enable static build in UNIX +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +endif() + +set(LIBMODMAN_VER 2.0.1) + +vcpkg_download_distfile(ARCHIVE + URLS "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libmodman/libmodman-${LIBMODMAN_VER}.zip" + FILENAME "libmodman-${LIBMODMAN_VER}.zip" + SHA512 1fecc0fa3637c4aa86d114f5bc991605172d39183fa0f39d8c7858ef5d0d894152025bd426de4dd017a41372d800bf73f53b2328c57b77352a508e12792729fa +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + tests BUILD_TESTING +) + +vcpkg_extract_source_archive_ex( + ARCHIVE ${ARCHIVE} + OUT_SOURCE_PATH SOURCE_PATH + PATCHES + fix-install-path.patch + fix-undefined-typeid.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/libmodman) +vcpkg_copy_pdbs() + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + "${CMAKE_CURRENT_LIST_DIR}/usage" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libmodman/usage b/externals/vcpkg/ports/libmodman/usage new file mode 100755 index 000000000..220de42e0 --- /dev/null +++ b/externals/vcpkg/ports/libmodman/usage @@ -0,0 +1,5 @@ +The package libmodman provides CMake targets: + + find_package(libmodman CONFIG REQUIRED) + target_include_directories(main PRIVATE ${LIBMODMAN_INCLUDE_DIR}) + target_link_libraries(main PRIVATE ${LIBMODMAN_LIBRARIES}) diff --git a/externals/vcpkg/ports/libmodman/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/libmodman/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..f37225774 --- /dev/null +++ b/externals/vcpkg/ports/libmodman/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,6 @@ +set(LIBMODMAN_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) + +_find_package(${ARGS}) + +set(CMAKE_MODULE_PATH ${LIBMODMAN_PREV_MODULE_PATH}) diff --git a/externals/vcpkg/ports/libmodman/vcpkg.json b/externals/vcpkg/ports/libmodman/vcpkg.json new file mode 100755 index 000000000..4b00d5851 --- /dev/null +++ b/externals/vcpkg/ports/libmodman/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "libmodman", + "version-string": "2.0.1", + "port-version": 4, + "description": "a simple library for managing modules", + "homepage": "https://code.google.com/p/libmodman", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tests": { + "description": "Build libmodman tests", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/libmodplug/001-automagically-define-modplug-static.patch b/externals/vcpkg/ports/libmodplug/001-automagically-define-modplug-static.patch new file mode 100755 index 000000000..d0df45473 --- /dev/null +++ b/externals/vcpkg/ports/libmodplug/001-automagically-define-modplug-static.patch @@ -0,0 +1,13 @@ +diff --git a/src/modplug.h b/src/modplug.h +index 3ffbf9d..fd19ae5 100644 +--- a/src/modplug.h ++++ b/src/modplug.h +@@ -11,6 +11,8 @@ + extern "C" { + #endif + ++#define MODPLUG_STATIC ++ + #if defined(_WIN32) || defined(__CYGWIN__) + # if defined(MODPLUG_BUILD) && defined(DLL_EXPORT) /* building libmodplug as a dll for windows */ + # define MODPLUG_EXPORT __declspec(dllexport) diff --git a/externals/vcpkg/ports/libmodplug/002-detect_sinf.patch b/externals/vcpkg/ports/libmodplug/002-detect_sinf.patch new file mode 100755 index 000000000..784e2e663 --- /dev/null +++ b/externals/vcpkg/ports/libmodplug/002-detect_sinf.patch @@ -0,0 +1,35 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2ada51b..468f1a3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,6 +4,7 @@ project(libmodplug) + add_definitions(-DMODPLUG_BUILD) + + include (CheckFunctionExists) ++include (CheckIncludeFile) + + include_directories(AFTER + src +@@ -11,6 +12,10 @@ include_directories(AFTER + ${PROJECT_BINARY_DIR} + ) + ++if (UNIX) ++ set (CMAKE_REQUIRED_LIBRARIES m) ++endif() ++ + if (WIN32) + add_definitions(-D_USE_MATH_DEFINES) + add_definitions(-DNOMINMAX) +@@ -44,6 +49,11 @@ if (WIN32 AND NOT (MINGW OR MSYS)) + "Compilation may fail if inttypes.h is not natively supported by the compiler." + "You can get inttypes.h from http://code.google.com/p/msinttypes/") + endif() ++else() ++ check_include_file("stdint.h" HAVE_STDINT) ++ if (HAVE_STDINT) ++ add_definitions(-DHAVE_STDINT_H) ++ endif() + endif() + + check_function_exists("setenv" HAVE_SETENV) diff --git a/externals/vcpkg/ports/libmodplug/003-use-static-cast-for-ctype.patch b/externals/vcpkg/ports/libmodplug/003-use-static-cast-for-ctype.patch new file mode 100755 index 000000000..2054e8a44 --- /dev/null +++ b/externals/vcpkg/ports/libmodplug/003-use-static-cast-for-ctype.patch @@ -0,0 +1,14 @@ +diff --git a/src/load_abc.cpp b/src/load_abc.cpp +index ee79f39..874ab8f 100644 +--- a/src/load_abc.cpp ++++ b/src/load_abc.cpp +@@ -268,7 +268,8 @@ static void setenv(const char *name, const char *value, int overwrite) + #endif + + static int abc_isvalidchar(char c) { +- return(isalpha(c) || isdigit(c) || isspace(c) || c == '%' || c == ':'); ++ unsigned char u = static_cast(c); ++ return(isalpha(u) || isdigit(u) || isspace(u) || c == '%' || c == ':'); + } + #if 0 + static const char *abc_skipspace(const char *p) diff --git a/externals/vcpkg/ports/libmodplug/004-export-pkgconfig.patch b/externals/vcpkg/ports/libmodplug/004-export-pkgconfig.patch new file mode 100755 index 000000000..eb59ca111 --- /dev/null +++ b/externals/vcpkg/ports/libmodplug/004-export-pkgconfig.patch @@ -0,0 +1,46 @@ +From 6a3e539ea26eec1bfc2a6e722e923bd5221f8d26 Mon Sep 17 00:00:00 2001 +From: "Matthias C. M. Troffaes" +Date: Thu, 8 Jul 2021 10:47:30 +0100 +Subject: [PATCH] Fix Libs.private in .pc file. + +--- + CMakeLists.txt | 7 +++++-- + libmodplug.pc.in | 2 +- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 468f1a3..3164fc6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -141,7 +141,11 @@ if(HAVE_SINF) + add_definitions(-DHAVE_SINF) + endif(HAVE_SINF) + +-if (NOT WIN32) ++if(WIN32) ++ set(LIBS_PRIVATE "-luser32") ++else(WIN32) ++ set(LIBS_PRIVATE "-lstdc++ -lm") ++endif(WIN32) + set(prefix "${CMAKE_INSTALL_PREFIX}") + set(exec_prefix "${CMAKE_INSTALL_PREFIX}") + set(libdir "${CMAKE_INSTALL_PREFIX}/lib") +@@ -152,4 +156,3 @@ if (NOT WIN32) + install(FILES "${PROJECT_BINARY_DIR}/libmodplug.pc" + DESTINATION lib/pkgconfig + ) +-endif (NOT WIN32) +diff --git a/libmodplug.pc.in b/libmodplug.pc.in +index bbf05f9..e4a43cc 100644 +--- a/libmodplug.pc.in ++++ b/libmodplug.pc.in +@@ -8,5 +8,5 @@ Description: The ModPlug mod file playing library. + Version: @VERSION@ + Requires: + Libs: -L${libdir} -lmodplug +-Libs.private: -lstdc++ -lm ++Libs.private: @LIBS_PRIVATE@ + Cflags: -I${includedir} +-- +2.21.0.windows.1 + diff --git a/externals/vcpkg/ports/libmodplug/005-fix-install-paths.patch b/externals/vcpkg/ports/libmodplug/005-fix-install-paths.patch new file mode 100755 index 000000000..a41acf0b5 --- /dev/null +++ b/externals/vcpkg/ports/libmodplug/005-fix-install-paths.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 468f1a3..b58b11e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -119,7 +119,10 @@ add_library(modplug ${LIB_TYPE} + ) + + # install the library: +-install(TARGETS modplug DESTINATION lib) ++install(TARGETS modplug ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + + # incstall the headers: + install(FILES diff --git a/externals/vcpkg/ports/libmodplug/portfile.cmake b/externals/vcpkg/ports/libmodplug/portfile.cmake new file mode 100755 index 000000000..cbc4e4407 --- /dev/null +++ b/externals/vcpkg/ports/libmodplug/portfile.cmake @@ -0,0 +1,30 @@ +set(MODPLUG_HASH 5a39f5913d07ba3e61d8d5afdba00b70165da81d) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(STATIC_PATCH "001-automagically-define-modplug-static.patch") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Konstanty/libmodplug + REF ${MODPLUG_HASH} + SHA512 c43bb3190b62c3a4e3636bba121b5593bbf8e6577ca9f2aa04d90b03730ea7fb590e640cdadeb565758b92e81187bc456e693fe37f1f4deace9b9f37556e3ba1 + PATCHES + ${STATIC_PATCH} + 002-detect_sinf.patch + 003-use-static-cast-for-ctype.patch + 004-export-pkgconfig.patch # https://github.com/Konstanty/libmodplug/pull/59 + 005-fix-install-paths.patch # https://github.com/Konstanty/libmodplug/pull/61 +) + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libmodplug/vcpkg.json b/externals/vcpkg/ports/libmodplug/vcpkg.json new file mode 100755 index 000000000..d9a4feaa5 --- /dev/null +++ b/externals/vcpkg/ports/libmodplug/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "libmodplug", + "version": "0.8.9.0", + "port-version": 10, + "description": "The ModPlug mod file playing library.", + "homepage": "https://github.com/Konstanty/libmodplug", + "license": null, + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libmorton/portfile.cmake b/externals/vcpkg/ports/libmorton/portfile.cmake new file mode 100755 index 000000000..b86573121 --- /dev/null +++ b/externals/vcpkg/ports/libmorton/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Forceflow/libmorton + REF v0.2.8 + SHA512 7497203573965337F1216DB729D3F6806278B8DDFF539E8D01EF83FB3EAB50D5FF90C965CF5EA3A76464CF6F279C000434D2111B37D3D368834F7EF20959E790 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/libmorton) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/libmorton/vcpkg.json b/externals/vcpkg/ports/libmorton/vcpkg.json new file mode 100755 index 000000000..6ce97b430 --- /dev/null +++ b/externals/vcpkg/ports/libmorton/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "libmorton", + "version": "0.2.8", + "description": "Header-only library for encoding/decoding Morton codes in/from 2D/3D coordinates", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libmount/portfile.cmake b/externals/vcpkg/ports/libmount/portfile.cmake new file mode 100755 index 000000000..3feac3d30 --- /dev/null +++ b/externals/vcpkg/ports/libmount/portfile.cmake @@ -0,0 +1,40 @@ +set(VERSION_MAJOR 2) +set(VERSION_MINOR 37) +set(VERSION_PATCH 2) +set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) + +vcpkg_download_distfile(ARCHIVE + URLS "https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v${VERSION_MAJOR}.${VERSION_MINOR}/util-linux-${VERSION}.tar.xz" + FILENAME "util-linux-${VERSION}.tar.xz" + SHA512 38f0fe820445e3bfa79550e6581c230f98c7661566ccc4daa51c7208a5f972c61b4e57dfc86bed074fdbc7c40bc79f856be8f6a05a8860c1c0cecc4208e8b81d +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF ${VERSION} +) + +vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + --disable-asciidoc + --disable-all-programs + --enable-libmount + --enable-libblkid +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/sbin" "${CURRENT_PACKAGES_DIR}/debug/sbin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools") # empty folder + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libmount/vcpkg.json b/externals/vcpkg/ports/libmount/vcpkg.json new file mode 100755 index 000000000..7b5383c89 --- /dev/null +++ b/externals/vcpkg/ports/libmount/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libmount", + "version": "2.37.2", + "description": "Block device identification library from util-linux", + "homepage": "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/about/", + "supports": "linux" +} diff --git a/externals/vcpkg/ports/libmpeg2/0001-Add-naive-MSVC-support-to-sources.patch b/externals/vcpkg/ports/libmpeg2/0001-Add-naive-MSVC-support-to-sources.patch new file mode 100755 index 000000000..1bbebffc0 --- /dev/null +++ b/externals/vcpkg/ports/libmpeg2/0001-Add-naive-MSVC-support-to-sources.patch @@ -0,0 +1,146 @@ +From ed3b6e4bca1fe5211e3d7ca06bbbf9b161c8bc19 Mon Sep 17 00:00:00 2001 +From: Michal Janiszewski +Date: Sat, 2 Nov 2019 14:50:53 -0700 +Subject: [PATCH] Add naive MSVC support to sources + +--- + libmpeg2/convert/rgb.c | 2 +- + libmpeg2/cpu_accel.c | 4 ++-- + libmpeg2/cpu_state.c | 4 ++-- + libmpeg2/idct.c | 2 +- + libmpeg2/motion_comp.c | 2 +- + libvo/video_out_dx.c | 6 +++--- + vc++/config.h | 2 ++ + 7 files changed, 12 insertions(+), 10 deletions(-) + +diff --git a/libmpeg2/convert/rgb.c b/libmpeg2/convert/rgb.c +index 8863b0b..db6f4e3 100644 +--- a/libmpeg2/convert/rgb.c ++++ b/libmpeg2/convert/rgb.c +@@ -499,7 +499,7 @@ static int rgb_internal (mpeg2convert_rgb_order_t order, unsigned int bpp, + int convert420 = 0; + int rgb_stride_min = ((bpp + 7) >> 3) * seq->width; + +-#ifdef ARCH_X86 ++#if !defined(_MSC_VER) && defined(ARCH_X86) + if (!copy && (accel & MPEG2_ACCEL_X86_MMXEXT)) { + convert420 = 0; + copy = mpeg2convert_rgb_mmxext (order, bpp, seq); +diff --git a/libmpeg2/cpu_accel.c b/libmpeg2/cpu_accel.c +index 9b24610..a922df1 100644 +--- a/libmpeg2/cpu_accel.c ++++ b/libmpeg2/cpu_accel.c +@@ -29,7 +29,7 @@ + #include "attributes.h" + #include "mpeg2_internal.h" + +-#if defined(ARCH_X86) || defined(ARCH_X86_64) ++#if !defined(_MSC_VER) && (defined(ARCH_X86) || defined(ARCH_X86_64)) + static inline uint32_t arch_accel (uint32_t accel) + { + if (accel & (MPEG2_ACCEL_X86_3DNOW | MPEG2_ACCEL_X86_MMXEXT)) +@@ -253,7 +253,7 @@ static inline uint32_t arch_accel (uint32_t accel) + + uint32_t mpeg2_detect_accel (uint32_t accel) + { +-#if defined (ARCH_X86) || defined (ARCH_X86_64) || defined (ARCH_PPC) || defined (ARCH_ALPHA) || defined (ARCH_SPARC) ++#if !defined(_MSC_VER) && (defined (ARCH_X86) || defined (ARCH_X86_64) || defined (ARCH_PPC) || defined (ARCH_ALPHA) || defined (ARCH_SPARC)) + accel = arch_accel (accel); + #endif + return accel; +diff --git a/libmpeg2/cpu_state.c b/libmpeg2/cpu_state.c +index 2f2f64a..f4966c1 100644 +--- a/libmpeg2/cpu_state.c ++++ b/libmpeg2/cpu_state.c +@@ -36,7 +36,7 @@ + void (* mpeg2_cpu_state_save) (cpu_state_t * state) = NULL; + void (* mpeg2_cpu_state_restore) (cpu_state_t * state) = NULL; + +-#if defined(ARCH_X86) || defined(ARCH_X86_64) ++#if !defined(_MSC_VER) && (defined(ARCH_X86) || defined(ARCH_X86_64)) + static void state_restore_mmx (cpu_state_t * state) + { + emms (); +@@ -115,7 +115,7 @@ static void state_restore_altivec (cpu_state_t * state) + + void mpeg2_cpu_state_init (uint32_t accel) + { +-#if defined(ARCH_X86) || defined(ARCH_X86_64) ++#if !defined(_MSC_VER) && (defined(ARCH_X86) || defined(ARCH_X86_64)) + if (accel & MPEG2_ACCEL_X86_MMX) { + mpeg2_cpu_state_restore = state_restore_mmx; + } +diff --git a/libmpeg2/idct.c b/libmpeg2/idct.c +index 81c57e0..a057bf7 100644 +--- a/libmpeg2/idct.c ++++ b/libmpeg2/idct.c +@@ -235,7 +235,7 @@ static void mpeg2_idct_add_c (const int last, int16_t * block, + + void mpeg2_idct_init (uint32_t accel) + { +-#ifdef ARCH_X86 ++#if !defined(_MSC_VER) && defined(ARCH_X86) + if (accel & MPEG2_ACCEL_X86_SSE2) { + mpeg2_idct_copy = mpeg2_idct_copy_sse2; + mpeg2_idct_add = mpeg2_idct_add_sse2; +diff --git a/libmpeg2/motion_comp.c b/libmpeg2/motion_comp.c +index 7aed113..b00a32d 100644 +--- a/libmpeg2/motion_comp.c ++++ b/libmpeg2/motion_comp.c +@@ -33,7 +33,7 @@ mpeg2_mc_t mpeg2_mc; + + void mpeg2_mc_init (uint32_t accel) + { +-#ifdef ARCH_X86 ++#if !defined(_MSC_VER) && defined(ARCH_X86) + if (accel & MPEG2_ACCEL_X86_MMXEXT) + mpeg2_mc = mpeg2_mc_mmxext; + else if (accel & MPEG2_ACCEL_X86_3DNOW) +diff --git a/libvo/video_out_dx.c b/libvo/video_out_dx.c +index 36de68a..0797cdc 100644 +--- a/libvo/video_out_dx.c ++++ b/libvo/video_out_dx.c +@@ -82,7 +82,7 @@ static void update_overlay (dx_instance_t * instance) + dwFlags, &ddofx); + } + +-static long FAR PASCAL event_procedure (HWND hwnd, UINT message, ++static LRESULT FAR PASCAL event_procedure (HWND hwnd, UINT message, + WPARAM wParam, LPARAM lParam) + { + RECT rect_window; +@@ -92,7 +92,7 @@ static long FAR PASCAL event_procedure (HWND hwnd, UINT message, + switch (message) { + + case WM_WINDOWPOSCHANGED: +- instance = (dx_instance_t *) GetWindowLong (hwnd, GWL_USERDATA); ++ instance = (dx_instance_t *) GetWindowLongPtr (hwnd, GWLP_USERDATA); + + /* update the window position and size */ + point_window.x = 0; +@@ -173,7 +173,7 @@ static int create_window (dx_instance_t * instance) + /* store a directx_instance pointer into the window local storage + * (for later use in event_handler). + * We need to use SetWindowLongPtr when it is available in mingw */ +- SetWindowLong (instance->window, GWL_USERDATA, (LONG) instance); ++ SetWindowLongPtr (instance->window, GWLP_USERDATA, (LONG_PTR) instance); + + ShowWindow (instance->window, SW_SHOW); + +diff --git a/vc++/config.h b/vc++/config.h +index 93719f0..a03cce6 100644 +--- a/vc++/config.h ++++ b/vc++/config.h +@@ -16,7 +16,9 @@ + /* #undef ARCH_SPARC */ + + /* x86 architecture */ ++#if defined(_M_AMD64) || defined(_M_IX86) + #define ARCH_X86 ++#endif + + /* maximum supported data alignment */ + /* #undef ATTRIBUTE_ALIGNED_MAX */ +-- +2.25.0 + diff --git a/externals/vcpkg/ports/libmpeg2/CMakeLists.txt b/externals/vcpkg/ports/libmpeg2/CMakeLists.txt new file mode 100755 index 000000000..88c0c8712 --- /dev/null +++ b/externals/vcpkg/ports/libmpeg2/CMakeLists.txt @@ -0,0 +1,108 @@ +cmake_minimum_required(VERSION 3.2) +project(libmpeg2) + +option(TOOLS "Build libmpeg2 tools" OFF) + +set(MPEG2_SOURCE_FILES + libmpeg2/alloc.c + libmpeg2/cpu_accel.c + libmpeg2/cpu_state.c + libmpeg2/decode.c + libmpeg2/header.c + libmpeg2/idct.c + libmpeg2/idct_alpha.c + libmpeg2/idct_altivec.c + #libmpeg2/idct_mmx.c + libmpeg2/motion_comp.c + libmpeg2/motion_comp_alpha.c + libmpeg2/motion_comp_altivec.c + libmpeg2/motion_comp_arm.c + #libmpeg2/motion_comp_mmx.c + libmpeg2/motion_comp_vis.c + libmpeg2/slice.c + ) +set(VO_SOURCE_FILES + libvo/video_out.c + libvo/video_out_dx.c + libvo/video_out_null.c + libvo/video_out_pgm.c + libvo/video_out_sdl.c + libvo/video_out_x11.c + ) +set(MPEG2_CONVERT_SOURCES + libmpeg2/convert/rgb.c + #libmpeg2/convert/rgb_mmx.c + libmpeg2/convert/rgb_vis.c + libmpeg2/convert/uyvy.c + ) +set(GETOPT_FILES + src/getopt.c + ) +set(HEADERS + include/mpeg2.h + include/mpeg2convert.h + ) + +add_library(mpeg2 ${MPEG2_SOURCE_FILES}) +add_library(mpeg2convert ${MPEG2_CONVERT_SOURCES}) +add_library(getopt STATIC ${GETOPT_FILES}) +add_library(vo STATIC ${VO_SOURCE_FILES}) + +target_include_directories(mpeg2convert PUBLIC + "${CMAKE_SOURCE_DIR}/vc++" + "${CMAKE_SOURCE_DIR}/include" + ) +target_include_directories(getopt PUBLIC + "${CMAKE_SOURCE_DIR}/vc++" + "${CMAKE_SOURCE_DIR}/include" + ) +target_include_directories(vo PUBLIC + "${CMAKE_SOURCE_DIR}/vc++" + "${CMAKE_SOURCE_DIR}/include" + ) +target_include_directories(mpeg2 PUBLIC + "${CMAKE_SOURCE_DIR}/vc++" + "${CMAKE_SOURCE_DIR}/include" + ) +target_include_directories(mpeg2 INTERFACE + "${CMAKE_SOURCE_DIR}/include" + ) + +target_compile_definitions(getopt PUBLIC HAVE_CONFIG_H) +target_link_libraries(vo mpeg2convert) + +if (TOOLS) + add_executable(mpeg2dec src/mpeg2dec.c src/dump_state.c src/gettimeofday.c) + add_executable(extract_mpeg2 src/extract_mpeg2.c) + add_executable(corrupt_mpeg2 src/corrupt_mpeg2.c) + + target_compile_definitions(extract_mpeg2 PUBLIC HAVE_CONFIG_H) + target_compile_definitions(corrupt_mpeg2 PUBLIC HAVE_CONFIG_H) + + target_link_libraries(mpeg2dec PRIVATE getopt vo mpeg2convert mpeg2 gdi32) + target_link_libraries(extract_mpeg2 PRIVATE getopt) + target_link_libraries(corrupt_mpeg2 PRIVATE getopt) + + target_include_directories(mpeg2dec PUBLIC + "${CMAKE_SOURCE_DIR}/vc++" + "${CMAKE_SOURCE_DIR}/include" + "${CMAKE_SOURCE_DIR}/src" + ) + target_include_directories(extract_mpeg2 PUBLIC + "${CMAKE_SOURCE_DIR}/vc++" + "${CMAKE_SOURCE_DIR}/include" + "${CMAKE_SOURCE_DIR}/src" + ) + target_include_directories(corrupt_mpeg2 PUBLIC + "${CMAKE_SOURCE_DIR}/vc++" + "${CMAKE_SOURCE_DIR}/include" + "${CMAKE_SOURCE_DIR}/src" + ) +endif (TOOLS) + +install(TARGETS mpeg2 + EXPORT libmpeg2 + LIBRARY DESTINATION lib +) + +install(FILES ${HEADERS} DESTINATION "include/mpeg2dec") diff --git a/externals/vcpkg/ports/libmpeg2/portfile.cmake b/externals/vcpkg/ports/libmpeg2/portfile.cmake new file mode 100755 index 000000000..181ff2d5e --- /dev/null +++ b/externals/vcpkg/ports/libmpeg2/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +# There is archived version of releases available at https://github.com/janisozaur/libmpeg2 +vcpkg_download_distfile(ARCHIVE + URLS "http://libmpeg2.sourceforge.net/files/libmpeg2-0.5.1.tar.gz" + FILENAME "libmpeg2-0.5.1.tar.gz" + SHA512 3648a2b3d7e2056d5adb328acd2fb983a1fa9a05ccb6f9388cc686c819445421811f42e8439418a0491a13080977f074a0d8bf8fa6bc101ff245ddea65a46fbc +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + 0001-Add-naive-MSVC-support-to-sources.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools TOOLS +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS ${FEATURE_OPTIONS} +) + +vcpkg_install_cmake() + +# # Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmpeg2 RENAME copyright) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/libmpeg2/vcpkg.json b/externals/vcpkg/ports/libmpeg2/vcpkg.json new file mode 100755 index 000000000..7942b3427 --- /dev/null +++ b/externals/vcpkg/ports/libmpeg2/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "libmpeg2", + "version": "0.5.1", + "port-version": 2, + "description": "a free MPEG-2 video stream decoder", + "homepage": "http://libmpeg2.sourceforge.net/", + "supports": "!(linux | osx | uwp)", + "features": { + "tools": { + "description": "Build tools provided with libmpeg2" + } + } +} diff --git a/externals/vcpkg/ports/libmspack/CMakeLists.txt b/externals/vcpkg/ports/libmspack/CMakeLists.txt new file mode 100755 index 000000000..fdff7959d --- /dev/null +++ b/externals/vcpkg/ports/libmspack/CMakeLists.txt @@ -0,0 +1,50 @@ +cmake_minimum_required(VERSION 3.8) + +project(libmspack C) + +add_definitions(-DHAVE_CONFIG_H) + +if(MSVC) + add_definitions(-D_CRT_SECURE_NO_DEPRECATE) + add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) +endif() + +# List the source files +set(LIB_SRC mspack/cabc.c + mspack/cabd.c + mspack/chmc.c + mspack/chmd.c + mspack/crc32.c + mspack/hlpc.c + mspack/hlpd.c + mspack/kwajc.c + mspack/kwajd.c + mspack/litc.c + mspack/litd.c + mspack/lzssd.c + mspack/lzxc.c + mspack/lzxd.c + mspack/mszipc.c + mspack/mszipd.c + mspack/oabc.c + mspack/oabd.c + mspack/qtmd.c + mspack/system.c + mspack/szddc.c + mspack/szddd.c +) + +if(BUILD_SHARED_LIBS) + set(LIB_DEF libmspack.def) +endif() + +add_library(libmspack ${LIB_SRC} ${LIB_DEF}) + +target_include_directories(libmspack PRIVATE . ./mspack) + +install(TARGETS libmspack + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + +install(FILES mspack/mspack.h DESTINATION include) diff --git a/externals/vcpkg/ports/libmspack/config.h b/externals/vcpkg/ports/libmspack/config.h new file mode 100755 index 000000000..54c05ae1e --- /dev/null +++ b/externals/vcpkg/ports/libmspack/config.h @@ -0,0 +1,4 @@ +#define HAVE_LIMITS_H 1 +#define HAVE_INTTYPES_H 1 + +#define HAVE_TOWLOWER 1 diff --git a/externals/vcpkg/ports/libmspack/libmspack.def b/externals/vcpkg/ports/libmspack/libmspack.def new file mode 100755 index 000000000..129637fd2 --- /dev/null +++ b/externals/vcpkg/ports/libmspack/libmspack.def @@ -0,0 +1,35 @@ +EXPORTS + +mspack_create_cab_compressor +mspack_create_chm_compressor +mspack_create_lit_compressor +mspack_create_hlp_compressor +mspack_create_szdd_compressor +mspack_create_kwaj_compressor +mspack_create_oab_compressor + +mspack_create_cab_decompressor +mspack_create_chm_decompressor +mspack_create_lit_decompressor +mspack_create_hlp_decompressor +mspack_create_szdd_decompressor +mspack_create_kwaj_decompressor +mspack_create_oab_decompressor + +mspack_destroy_cab_compressor +mspack_destroy_cab_decompressor +mspack_destroy_chm_compressor +mspack_destroy_chm_decompressor +mspack_destroy_lit_compressor +mspack_destroy_lit_decompressor +mspack_destroy_hlp_compressor +mspack_destroy_hlp_decompressor +mspack_destroy_szdd_compressor +mspack_destroy_szdd_decompressor +mspack_destroy_kwaj_compressor +mspack_destroy_kwaj_decompressor +mspack_destroy_oab_compressor +mspack_destroy_oab_decompressor + +mspack_sys_selftest_internal +mspack_version diff --git a/externals/vcpkg/ports/libmspack/portfile.cmake b/externals/vcpkg/ports/libmspack/portfile.cmake new file mode 100755 index 000000000..f4f19e7c3 --- /dev/null +++ b/externals/vcpkg/ports/libmspack/portfile.cmake @@ -0,0 +1,32 @@ +set(LIB_NAME libmspack) +set(LIB_VERSION 0.10.1alpha) +set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.gz) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.cabextract.org.uk/libmspack/${LIB_FILENAME}" + FILENAME "${LIB_FILENAME}" + SHA512 a7b5f7caa49190c5021f3e768b92f2e51cc0ce685c9ab6ed6fb36de885c73231b58d47a8a3b5c5aa5c9ac56c25c500eb683d84dbf11f09f97f6cb4fff5adc245 +) + +vcpkg_extract_source_archive_ex( + ARCHIVE ${ARCHIVE} + OUT_SOURCE_PATH SOURCE_PATH +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/libmspack.def DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# License and man +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${LIB_NAME} RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/libmspack/vcpkg.json b/externals/vcpkg/ports/libmspack/vcpkg.json new file mode 100755 index 000000000..41ed734e0 --- /dev/null +++ b/externals/vcpkg/ports/libmspack/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libmspack", + "version-string": "0.10.1", + "port-version": 4, + "description": "libmspack is a portable library for some loosely related Microsoft compression formats.", + "homepage": "https://www.cabextract.org.uk/libmspack" +} diff --git a/externals/vcpkg/ports/libmt32emu/portfile.cmake b/externals/vcpkg/ports/libmt32emu/portfile.cmake new file mode 100755 index 000000000..9eea719a5 --- /dev/null +++ b/externals/vcpkg/ports/libmt32emu/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO munt/munt + REF 004800c20b1edaab921e08f69133fc2a4bd3b8e8 #vlibmt32emu_2_6_2 + SHA512 3a47c269d285f3930eefda4cae6f1c7e157fc4e88d7d64ad029542586b6592b32d5f9bf0e22344e27a21869aea2191051505f3727e52dff268cf2be4d52f15c3 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/mt32emu" + OPTIONS + -Dlibmt32emu_SHARED:BOOL=${BUILD_SHARED} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME MT32Emu CONFIG_PATH lib/cmake/MT32Emu) + +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") + + +file(INSTALL "${SOURCE_PATH}/mt32emu/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libmt32emu/vcpkg.json b/externals/vcpkg/ports/libmt32emu/vcpkg.json new file mode 100755 index 000000000..115c3206e --- /dev/null +++ b/externals/vcpkg/ports/libmt32emu/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "libmt32emu", + "version": "2.6.2", + "description": "A MT-32 emulator", + "homepage": "https://github.com/munt/munt/tree/master/mt32emu", + "license": "GPL-2.0-or-later", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libmupdf/CMakeLists.txt b/externals/vcpkg/ports/libmupdf/CMakeLists.txt new file mode 100755 index 000000000..95ec646f8 --- /dev/null +++ b/externals/vcpkg/ports/libmupdf/CMakeLists.txt @@ -0,0 +1,66 @@ +cmake_minimum_required(VERSION 3.9) +project(libmupdf C) + +set(CMAKE_DEBUG_POSTFIX d) + +if(WIN32) + execute_process( + COMMAND "cmd.exe" "/c" "platform\\win32\\generate.bat" + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + ) +else() + find_program(MAKE_EXE NAMES make REQUIRED) + execute_process( + COMMAND ${MAKE_EXE} "generate" + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + ) +endif() + + +find_package(freetype NO_MODULE REQUIRED) +find_package(JPEG REQUIRED) +find_path(HARFBUZZ_INCLUDE hb.h PATH_SUFFIXES harfbuzz) +find_library(HARFBUZZ_LIBRARIES harfbuzz) +find_package(ZLIB REQUIRED) +find_package(OpenJPEG CONFIG REQUIRED) +find_library(JBIG2DEC_LIB NAMES jbig2decd jbig2dec) + +file(GLOB_RECURSE SOURCES "source/*.c" "generated/*.c") +list(FILTER SOURCES EXCLUDE REGEX "source/tools/[a-z]*\\.c$") +list(FILTER SOURCES EXCLUDE REGEX "source/tests/.*.c$") +list(FILTER SOURCES EXCLUDE REGEX "source/fitz/output-docx.c") + +add_library(libmupdf ${SOURCES}) + +if(WIN32) + target_compile_definitions(libmupdf PRIVATE -DSHARE_JPEG -DFZ_ENABLE_JS=0 -DFZ_ENABLE_ICC=0 -DMEMENTO_MUPDF_HACKS -DFZ_ENABLE_DOCX_OUTPUT=0 -DFZ_ENABLE_ODT_OUTPUT=0) +else() + target_compile_definitions(libmupdf PRIVATE -DHAVE_PTHREAD=1 -DSHARE_JPEG -DFZ_ENABLE_JS=0 -DFZ_ENABLE_ICC=0 -DMEMENTO_MUPDF_HACKS -DFZ_ENABLE_DOCX_OUTPUT=0 -DFZ_ENABLE_ODT_OUTPUT=0) +endif() +target_include_directories(libmupdf + PUBLIC + include + PRIVATE + generated + ${JPEG_INCLUDE_DIR} + ${HARFBUZZ_INCLUDE} +) +target_link_libraries(libmupdf PRIVATE + openjp2 + freetype + ${JPEG_LIBRARIES} + ${HARFBUZZ_LIBRARIES} + ${JBIG2DEC_LIB} + ZLIB::ZLIB +) + +install(TARGETS libmupdf + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(BUILD_EXAMPLES) + add_executable(mu-office-test source/tests/mu-office-test.c) + target_link_libraries(mu-office-test PRIVATE libmupdf) +endif() diff --git a/externals/vcpkg/ports/libmupdf/dont-generate-extract-3rd-party-things.patch b/externals/vcpkg/ports/libmupdf/dont-generate-extract-3rd-party-things.patch new file mode 100755 index 000000000..ec3cb4f89 --- /dev/null +++ b/externals/vcpkg/ports/libmupdf/dont-generate-extract-3rd-party-things.patch @@ -0,0 +1,16 @@ +--- a/Makethird ++++ b/Makethird +@@ -238,6 +238,7 @@ endif + + # --- EXTRACT --- + ++ifeq (0, 1) + THIRD_CFLAGS += $(EXTRACT_CFLAGS) + THIRD_LIBS += $(EXTRACT_LIBS) + THIRD_SRC += $(EXTRACT_SRC) +@@ -268,3 +269,4 @@ thirdparty/extract/src/odt_template.c: thirdparty/extract/src/template.odt third + @touch $@ + + generate: thirdparty/extract/src/docx_template.c ++endif + diff --git a/externals/vcpkg/ports/libmupdf/portfile.cmake b/externals/vcpkg/ports/libmupdf/portfile.cmake new file mode 100755 index 000000000..3ef0146ba --- /dev/null +++ b/externals/vcpkg/ports/libmupdf/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ArtifexSoftware/mupdf + REF 61b63d734a7b9df618f6b45dda2466aed442f7f0 # 1.19.0-rc2 + SHA512 16661c012e18ac72b24c46caf5c02515c29a05e0a8dcf95076eff3a1f2e87c225245037480ed37068858fe6e04ff4a404f69877599b208ab9265d054ec117820 + HEAD_REF master + PATCHES + dont-generate-extract-3rd-party-things.patch + use-if-instead-of-ifdef-in-writer.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DBUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install() + +file(COPY "${SOURCE_PATH}/include/mupdf" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libmupdf/use-if-instead-of-ifdef-in-writer.patch b/externals/vcpkg/ports/libmupdf/use-if-instead-of-ifdef-in-writer.patch new file mode 100755 index 000000000..25dff5960 --- /dev/null +++ b/externals/vcpkg/ports/libmupdf/use-if-instead-of-ifdef-in-writer.patch @@ -0,0 +1,39 @@ +--- a/source/fitz/writer.c ++++ b/source/fitz/writer.c +@@ -169,7 +169,7 @@ fz_new_document_writer(fz_context *ctx, const char *path, const char *explicit_f + format = strrchr(path, '.'); + while (format) + { +-#ifdef FZ_ENABLE_OCR_OUTPUT ++#if FZ_ENABLE_OCR_OUTPUT + if (is_extension(format, "ocr")) + return fz_new_pdfocr_writer(ctx, path, options); + #endif +@@ -219,11 +219,11 @@ fz_new_document_writer(fz_context *ctx, const char *path, const char *explicit_f + if (is_extension(format, "stext.json")) + return fz_new_text_writer(ctx, "stext.json", path, options); + +-#ifdef FZ_ENABLE_ODT_OUTPUT ++#if FZ_ENABLE_ODT_OUTPUT + if (is_extension(format, "odt")) + return fz_new_odt_writer(ctx, path, options); + #endif +-#ifdef FZ_ENABLE_DOCX_OUTPUT ++#if FZ_ENABLE_DOCX_OUTPUT + if (is_extension(format, "docx")) + return fz_new_docx_writer(ctx, path, options); + #endif +@@ -267,11 +267,11 @@ fz_new_document_writer_with_output(fz_context *ctx, fz_output *out, const char * + if (is_extension(format, "stext.json")) + return fz_new_text_writer_with_output(ctx, "stext.json", out, options); + +-#ifdef FZ_ENABLE_ODT_OUTPUT ++#if FZ_ENABLE_ODT_OUTPUT + if (is_extension(format, "odt")) + return fz_new_odt_writer_with_output(ctx, out, options); + #endif +-#ifdef FZ_ENABLE_DOCX_OUTPUT ++#if FZ_ENABLE_DOCX_OUTPUT + if (is_extension(format, "docx")) + return fz_new_docx_writer_with_output(ctx, out, options); + #endif diff --git a/externals/vcpkg/ports/libmupdf/vcpkg.json b/externals/vcpkg/ports/libmupdf/vcpkg.json new file mode 100755 index 000000000..d6c2cd491 --- /dev/null +++ b/externals/vcpkg/ports/libmupdf/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "libmupdf", + "version": "1.19.0-rc2", + "port-version": 1, + "description": "a lightweight PDF, XPS, and E-book library", + "homepage": "https://github.com/ArtifexSoftware/mupdf", + "supports": "!osx", + "dependencies": [ + "curl", + "freetype", + "glfw3", + "gumbo", + "harfbuzz", + "jbig2dec", + "libjpeg-turbo", + "openjpeg", + { + "name": "vcpkg-cmake", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/libmysql/004-added-limits-include.patch b/externals/vcpkg/ports/libmysql/004-added-limits-include.patch new file mode 100755 index 000000000..d02641ad7 --- /dev/null +++ b/externals/vcpkg/ports/libmysql/004-added-limits-include.patch @@ -0,0 +1,12 @@ +diff --git a/sql-common/sql_string.cc b/sql-common/sql_string.cc +index 40435729..8b6ee827 100644 +--- a/sql-common/sql_string.cc ++++ b/sql-common/sql_string.cc +@@ -23,6 +23,7 @@ + #include "sql_string.h" + + #include ++#include + + #include "my_dbug.h" + #include "my_macros.h" diff --git a/externals/vcpkg/ports/libmysql/export-cmake-targets.patch b/externals/vcpkg/ports/libmysql/export-cmake-targets.patch new file mode 100755 index 000000000..e52dbb24d --- /dev/null +++ b/externals/vcpkg/ports/libmysql/export-cmake-targets.patch @@ -0,0 +1,123 @@ +diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake +index c3a05ec..0d44ef2 100644 +--- a/cmake/install_macros.cmake ++++ b/cmake/install_macros.cmake +@@ -100,7 +100,7 @@ ENDFUNCTION() + + FUNCTION(MYSQL_INSTALL_TARGETS) + MYSQL_PARSE_ARGUMENTS(ARG +- "DESTINATION;COMPONENT" ++ "DESTINATION;COMPONENT;EXPORT" + "" + ${ARGN} + ) +@@ -115,7 +115,20 @@ FUNCTION(MYSQL_INSTALL_TARGETS) + IF(ARG_COMPONENT) + SET(COMP COMPONENT ${ARG_COMPONENT}) + ENDIF() +- INSTALL(TARGETS ${TARGETS} DESTINATION ${ARG_DESTINATION} ${COMP}) ++ IF (ARG_EXPORT) ++ FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/${ARG_EXPORT}-config.cmake" ++"include(CMakeFindDependencyMacro) ++find_dependency(ZLIB) ++find_dependency(OpenSSL) ++include(\"\${CMAKE_CURRENT_LIST_DIR}/${ARG_EXPORT}-targets.cmake\") ++") ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ARG_EXPORT}-config.cmake DESTINATION share/${ARG_EXPORT}) ++ set(EXPORT_ARGS EXPORT ${ARG_EXPORT}-targets) ++ ENDIF() ++ INSTALL(TARGETS ${TARGETS} ${EXPORT_ARGS} RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ${COMP}) ++ IF (ARG_EXPORT) ++ INSTALL(${EXPORT_ARGS} DESTINATION share/${ARG_EXPORT}) ++ ENDIF() + SET(INSTALL_LOCATION ${ARG_DESTINATION} ) + INSTALL_DEBUG_SYMBOLS("${TARGETS}") + SET(INSTALL_LOCATION) +diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake +index 5481fae..3fa58da 100644 +--- a/cmake/libutils.cmake ++++ b/cmake/libutils.cmake +@@ -237,7 +237,7 @@ MACRO(MERGE_LIBRARIES_SHARED) + IF(ARG_COMPONENT) + SET(COMP COMPONENT ${ARG_COMPONENT}) + ENDIF() +- MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP}) ++ MYSQL_INSTALL_TARGETS(${TARGET} EXPORT unofficial-libmysql DESTINATION "${INSTALL_LIBDIR}" ${COMP}) + ENDIF() + ENDMACRO() + +@@ -372,7 +372,7 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES) + SET(COMP COMPONENT ${ARG_COMPONENT}) + ENDIF() + IF(INSTALL_STATIC_LIBRARIES) +- MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP}) ++ MYSQL_INSTALL_TARGETS(${TARGET} EXPORT unofficial-libmysql DESTINATION "${INSTALL_LIBDIR}" ${COMP}) + ENDIF() + ENDIF() + ENDMACRO() +diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt +index 605288d..c5d0f5d 100644 +--- a/libmysql/CMakeLists.txt ++++ b/libmysql/CMakeLists.txt +@@ -245,8 +245,16 @@ ENDIF() + # LDAP authentication SASL client plugin + ADD_SUBDIRECTORY(authentication_ldap) + ++IF (BUILD_SHARED_LIBS) ++ set(INSTALL_SHARED ) ++ set(INSTALL_STATIC SKIP_INSTALL) ++ELSE() ++ set(INSTALL_SHARED SKIP_INSTALL) ++ set(INSTALL_STATIC ) ++ENDIF() ++ + # Merge several convenience libraries into one big mysqlclient +-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development) ++MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} ${INSTALL_STATIC} COMPONENT Development) + TARGET_LINK_LIBRARIES(mysqlclient PRIVATE ${LIBS_TO_LINK}) + + # Visual Studio users need debug static library for debug projects +@@ -283,6 +291,7 @@ ENDIF() + # Merge several convenience libraries into one big mysqlclient + # and link them together into shared library. + MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE} ++ ${INSTALL_SHARED} + EXPORTS + ${CLIENT_API_FUNCTIONS} + ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} +@@ -370,6 +379,7 @@ CONFIGURE_FILE(api_test.c.in ${CMAKE_CURRENT_BINARY_DIR}/api_test.c) + # from @CLIENT_API_FUNCTIONS@ are declared by . It will fail + # to run if not all of these symbols are exported by the library. + # ++IF (ENABLE_TESTING) + MYSQL_ADD_EXECUTABLE(libmysql_api_test + ${CMAKE_CURRENT_BINARY_DIR}/api_test.c + LINK_LIBRARIES libmysql ${LIBRT} +@@ -398,3 +408,4 @@ ADD_CUSTOM_COMMAND(TARGET libmysql_api_test POST_BUILD + COMMAND libmysql_api_test + > ${CMAKE_CURRENT_BINARY_DIR}/libmysql_api_test.out + ) ++ENDIF() +\ No newline at end of file +diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +index a5fa18e..0f2e15c 100644 +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -329,13 +329,13 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) + STRING(REGEX REPLACE "^[ ]+" "" ${var} "${${var}}") + STRING(REGEX REPLACE "[ ]+$" "" ${var} "${${var}}") + ENDMACRO() +- ++IF (NOT BUILD_SHARED_LIBS) + EXTRACT_LINK_LIBRARIES(mysqlclient CLIENT_LIBS) +- +-IF(MSVC) ++ENDIF() ++IF(MSVC AND NOT BUILD_SHARED_LIBS) + GET_TARGET_PROPERTY(LIBMYSQL_OS_SHLIB_VERSION mysqlclient VERSION) + GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME mysqlclient OUTPUT_NAME) +-ELSE() ++ELSEIF(BUILD_SHARED_LIBS) + GET_TARGET_PROPERTY(LIBMYSQL_OS_SHLIB_VERSION libmysql VERSION) + GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME libmysql OUTPUT_NAME) + ENDIF() diff --git a/externals/vcpkg/ports/libmysql/ignore-boost-version.patch b/externals/vcpkg/ports/libmysql/ignore-boost-version.patch new file mode 100755 index 000000000..99cee2450 --- /dev/null +++ b/externals/vcpkg/ports/libmysql/ignore-boost-version.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/boost.cmake b/cmake/boost.cmake +index 592a67f..202a770 100644 +--- a/cmake/boost.cmake ++++ b/cmake/boost.cmake +@@ -297,7 +297,7 @@ IF(NOT BOOST_MAJOR_VERSION EQUAL 10) + COULD_NOT_FIND_BOOST() + ENDIF() + +-IF(NOT BOOST_MINOR_VERSION EQUAL 70) ++IF(NOT BOOST_MINOR_VERSION EQUAL 70 AND NOT IGNORE_BOOST_VERSION) + MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} " + "we need 70" + ) diff --git a/externals/vcpkg/ports/libmysql/openssl.patch b/externals/vcpkg/ports/libmysql/openssl.patch new file mode 100755 index 000000000..3abbcf98f --- /dev/null +++ b/externals/vcpkg/ports/libmysql/openssl.patch @@ -0,0 +1,125 @@ +diff --git a/mysys/my_md5.cc b/mysys/my_md5.cc +index dea997b252c..81484f0652b 100644 +--- a/mysys/my_md5.cc ++++ b/mysys/my_md5.cc +@@ -35,6 +35,10 @@ + #include + #include + ++#if OPENSSL_VERSION_NUMBER >= 0x30000000L ++#include ++#endif ++ + static void my_md5_hash(unsigned char *digest, unsigned const char *buf, + int len) { + MD5_CTX ctx; +@@ -56,7 +60,11 @@ static void my_md5_hash(unsigned char *digest, unsigned const char *buf, + int compute_md5_hash(char *digest, const char *buf, int len) { + int retval = 0; + int fips_mode = 0; ++ #if OPENSSL_VERSION_NUMBER < 0x30000000L + fips_mode = FIPS_mode(); ++ #else ++ fips_mode = EVP_default_properties_is_fips_enabled(NULL); ++ #endif + /* If fips mode is ON/STRICT restricted method calls will result into abort, + * skipping call. */ + if (fips_mode == 0) { +diff --git a/plugin/x/client/xconnection_impl.cc b/plugin/x/client/xconnection_impl.cc +index 13bc6794ea5..8752bcea9bf 100644 +--- a/plugin/x/client/xconnection_impl.cc ++++ b/plugin/x/client/xconnection_impl.cc +@@ -51,6 +51,10 @@ + #include "plugin/x/src/config/config.h" + #include "sql-common/net_ns.h" + ++#if OPENSSL_VERSION_NUMBER >= 0x30000000L ++#include ++#endif ++ + #ifndef WIN32 + #include + #include +@@ -524,12 +528,20 @@ int set_fips_mode(const uint32_t fips_mode, + if (fips_mode > 2) { + goto EXIT; + } ++ #if OPENSSL_VERSION_NUMBER < 0x30000000L + fips_mode_old = FIPS_mode(); ++ #else ++ fips_mode_old = EVP_default_properties_is_fips_enabled(NULL); ++ #endif + if (fips_mode_old == fips_mode) { + rc = 1; + goto EXIT; + } ++ #if OPENSSL_VERSION_NUMBER < 0x30000000L + if (!(rc = FIPS_mode_set(fips_mode))) { ++ #else ++ if (!(rc = EVP_default_properties_enable_fips(fips_mode))) { ++ #endif + err_library = ERR_get_error(); + ERR_error_string_n(err_library, err_string, OPENSSL_ERROR_LENGTH - 1); + err_string[OPENSSL_ERROR_LENGTH - 1] = '\0'; +diff --git a/vio/viosslfactories.cc b/vio/viosslfactories.cc +index 6c04029ccb0..164b727e3dc 100644 +--- a/vio/viosslfactories.cc ++++ b/vio/viosslfactories.cc +@@ -40,6 +40,10 @@ + + #include + ++#if OPENSSL_VERSION_NUMBER >= 0x30000000L ++#include ++#endif ++ + #if OPENSSL_VERSION_NUMBER < 0x10002000L + #include + #endif /* OPENSSL_VERSION_NUMBER < 0x10002000L */ +@@ -498,12 +502,20 @@ int set_fips_mode(const uint fips_mode, char err_string[OPENSSL_ERROR_LENGTH]) { + if (fips_mode > 2) { + goto EXIT; + } ++ #if OPENSSL_VERSION_NUMBER < 0x30000000L + fips_mode_old = FIPS_mode(); ++ #else ++ fips_mode_old = EVP_default_properties_is_fips_enabled(NULL); ++ #endif + if (fips_mode_old == fips_mode) { + rc = 1; + goto EXIT; + } ++ #if OPENSSL_VERSION_NUMBER < 0x30000000L + if (!(rc = FIPS_mode_set(fips_mode))) { ++ #else ++ if (!(rc = EVP_default_properties_enable_fips(NULL, fips_mode))) { ++ #endif + /* + If OS doesn't have FIPS enabled openssl library and user sets FIPS mode + ON, It fails with proper error. But in the same time it doesn't allow to +@@ -511,7 +523,11 @@ int set_fips_mode(const uint fips_mode, char err_string[OPENSSL_ERROR_LENGTH]) { + error, setting old working FIPS mode value in the OpenSSL library. It will + allow successful cryptographic operation and will not abort the server. + */ ++ #if OPENSSL_VERSION_NUMBER < 0x30000000L + FIPS_mode_set(fips_mode_old); ++ #else ++ EVP_default_properties_enable_fips(NULL, fips_mode_old); ++ #endif + err_library = ERR_get_error(); + ERR_error_string_n(err_library, err_string, OPENSSL_ERROR_LENGTH - 1); + err_string[OPENSSL_ERROR_LENGTH - 1] = '\0'; +@@ -525,7 +541,13 @@ EXIT: + + @returns openssl current fips mode + */ ++#if OPENSSL_VERSION_NUMBER < 0x30000000L + uint get_fips_mode() { return FIPS_mode(); } ++#else ++uint get_fips_mode() { ++ return EVP_default_properties_is_fips_enabled(NULL); ++} ++#endif + + long process_tls_version(const char *tls_version) { + const char *separator = ","; diff --git a/externals/vcpkg/ports/libmysql/portfile.cmake b/externals/vcpkg/ports/libmysql/portfile.cmake new file mode 100755 index 000000000..5e3311131 --- /dev/null +++ b/externals/vcpkg/ports/libmysql/portfile.cmake @@ -0,0 +1,145 @@ +if (EXISTS "${CURRENT_INSTALLED_DIR}/include/mysql/mysql.h") + message(FATAL_ERROR "FATAL ERROR: ${PORT} and libmariadb are incompatible.") +endif() + +if (VCPKG_TARGET_IS_LINUX) + message(WARNING "${PORT} needs ncurses on LINUX, please install ncurses first.\nOn Debian/Ubuntu, package name is libncurses5-dev, on Redhat and derivates it is ncurses-devel.") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mysql/mysql-server + REF 7d10c82196c8e45554f27c00681474a9fb86d137 # 8.0.20 + SHA512 9f5e8cc254ea2a4cf76313287c7bb6fc693400810464dd2901e67d51ecb27f8916009464fd8aed8365c3038314b845b3d517db6e82ae5c7908612f0b3b72335f + HEAD_REF master + PATCHES + ignore-boost-version.patch + system-libs.patch + rename-version.patch + export-cmake-targets.patch + 004-added-limits-include.patch + openssl.patch +) + +file(REMOVE_RECURSE "${SOURCE_PATH}/include/boost_1_70_0") + +set(STACK_DIRECTION) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(STACK_DIRECTION -DSTACK_DIRECTION=-1) +endif() + +#Skip the version check for Visual Studio +if(VCPKG_TARGET_IS_WINDOWS) + set(FORCE_UNSUPPORTED_COMPILER 1) +endif() + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT_LINKAGE) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DWITHOUT_SERVER=ON + -DWITH_UNIT_TESTS=OFF + -DENABLED_PROFILING=OFF + -DENABLE_TESTING=OFF + -DWIX_DIR=OFF + ${STACK_DIRECTION} + -DIGNORE_BOOST_VERSION=ON + -DWITH_SYSTEMD=OFF + -DWITH_TEST_TRACE_PLUGIN=OFF + -DMYSQL_MAINTAINER_MODE=OFF + -DBUNDLE_RUNTIME_LIBRARIES=OFF + -DDOWNLOAD_BOOST=OFF + -DENABLE_DOWNLOADS=OFF + -DWITH_NDB_TEST=OFF + -DWITH_NDB_NODEJS_DEFAULT=OFF + -DWITH_NDBAPI_EXAMPLES=OFF + -DMYSQLX_ADDITIONAL_TESTS_ENABLE=OFF + -DWITH_SSL=system + -DWITH_ICU=system + -DWITH_LIBEVENT=system + -DWITH_LZ4=system + -DWITH_ZLIB=system + -DFORCE_UNSUPPORTED_COMPILER=${FORCE_UNSUPPORTED_COMPILER} + -DINSTALL_STATIC_LIBRARIES=${BUILD_STATIC_LIBS} + -DLINK_STATIC_RUNTIME_LIBRARIES=${STATIC_CRT_LINKAGE} +) + +vcpkg_cmake_install(ADD_BIN_TO_PATH) + +list(APPEND MYSQL_TOOLS + comp_err + my_print_defaults + mysql + mysql_config_editor + mysql_secure_installation + mysql_ssl_rsa_setup + mysqladmin + mysqlbinlog + mysqlcheck + mysqldump + mysqlimport + mysqlpump + mysqlshow + mysqlslap + mysqltest + perror + zlib_decompress +) + +if (VCPKG_TARGET_IS_WINDOWS) + list(APPEND MYSQL_TOOLS + echo + ) +else() + list(APPEND MYSQL_TOOLS + mysql_config + ) +endif() + +vcpkg_copy_tools(TOOL_NAMES ${MYSQL_TOOLS} AUTO_CLEAN) + +file(RENAME "${CURRENT_PACKAGES_DIR}/share" "${CURRENT_PACKAGES_DIR}/${PORT}") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/${PORT}") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share") +file(RENAME "${CURRENT_PACKAGES_DIR}/${PORT}" "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/${PORT}" "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}") + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libmysql CONFIG_PATH share/${PORT}/unofficial-libmysql) + +# switch mysql into /mysql +file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include2") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") +file(RENAME "${CURRENT_PACKAGES_DIR}/include2" "${CURRENT_PACKAGES_DIR}/include/mysql") + +## delete useless vcruntime/scripts/bin/msg file +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/docs" + "${CURRENT_PACKAGES_DIR}/debug/docs" + "${CURRENT_PACKAGES_DIR}/lib/debug" + "${CURRENT_PACKAGES_DIR}/lib/plugin" + "${CURRENT_PACKAGES_DIR}/lib/plugin/debug" +) + +## remove misc files +file(REMOVE + "${CURRENT_PACKAGES_DIR}/LICENSE" + "${CURRENT_PACKAGES_DIR}/README" + "${CURRENT_PACKAGES_DIR}/debug/LICENSE" + "${CURRENT_PACKAGES_DIR}/debug/README" +) + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mysql/mysql_com.h" "#include " "#include \"mysql/udf_registration_types.h\"") +if (NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libmysql/mysql_config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") +endif() + +file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +# copy license +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libmysql/rename-version.patch b/externals/vcpkg/ports/libmysql/rename-version.patch new file mode 100755 index 000000000..155983825 --- /dev/null +++ b/externals/vcpkg/ports/libmysql/rename-version.patch @@ -0,0 +1,26 @@ +diff --git a/VERSION b/VERSION.txt +similarity index 100% +rename from VERSION +rename to VERSION.txt +diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake +index bed6e9f02e2..a924ef09bac 100644 +--- a/cmake/mysql_version.cmake ++++ b/cmake/mysql_version.cmake +@@ -30,7 +30,7 @@ SET(PROTOCOL_VERSION "10") + + # Generate "something" to trigger cmake rerun when VERSION changes + CONFIGURE_FILE( +- ${CMAKE_SOURCE_DIR}/VERSION ++ ${CMAKE_SOURCE_DIR}/VERSION.txt + ${CMAKE_BINARY_DIR}/VERSION.dep + ) + +@@ -38,7 +38,7 @@ CONFIGURE_FILE( + + MACRO(MYSQL_GET_CONFIG_VALUE keyword var) + IF(NOT ${var}) +- FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION str REGEX "^[ ]*${keyword}=") ++ FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION.txt str REGEX "^[ ]*${keyword}=") + IF(str) + STRING(REPLACE "${keyword}=" "" str ${str}) + STRING(REGEX REPLACE "[ ].*" "" str "${str}") diff --git a/externals/vcpkg/ports/libmysql/system-libs.patch b/externals/vcpkg/ports/libmysql/system-libs.patch new file mode 100755 index 000000000..547573fc5 --- /dev/null +++ b/externals/vcpkg/ports/libmysql/system-libs.patch @@ -0,0 +1,149 @@ +diff --git a/cmake/icu.cmake b/cmake/icu.cmake +index fde3a75..9f694b9 100644 +--- a/cmake/icu.cmake ++++ b/cmake/icu.cmake +@@ -38,49 +38,11 @@ + # install_root is either 'system' or is assumed to be a path. + # + MACRO (FIND_ICU install_root) +- IF("${install_root}" STREQUAL "system") +- SET(EXTRA_FIND_LIB_ARGS) +- SET(EXTRA_FIND_INC_ARGS) +- ELSE() +- SET(EXTRA_FIND_LIB_ARGS HINTS "${install_root}" +- PATH_SUFFIXES "lib" "lib64" NO_DEFAULT_PATH) +- SET(EXTRA_FIND_INC_ARGS HINTS "${install_root}" +- PATH_SUFFIXES "include" NO_DEFAULT_PATH) +- ENDIF() +- +- FIND_PATH(ICU_INCLUDE_DIR NAMES unicode/regex.h ${EXTRA_FIND_INC_ARGS}) +- IF (NOT ICU_INCLUDE_DIR) +- MESSAGE(FATAL_ERROR "Cannot find ICU regular expression headers") +- ENDIF() +- +- IF(WIN32) +- SET(ICU_LIBS icuuc icuio icudt icuin) +- ELSE() +- SET(ICU_LIBS icuuc icuio icudata icui18n) +- ENDIF() +- +- SET(ICU_SYSTEM_LIBRARIES) +- FOREACH(ICU_LIB ${ICU_LIBS}) +- UNSET(ICU_LIB_PATH CACHE) +- FIND_LIBRARY(ICU_LIB_PATH NAMES ${ICU_LIB} ${EXTRA_FIND_LIB_ARGS}) +- IF(NOT ICU_LIB_PATH) +- MESSAGE(FATAL_ERROR "Cannot find the ICU library ${ICU_LIB}") +- ENDIF() +- LIST(APPEND ICU_SYSTEM_LIBRARIES ${ICU_LIB_PATH}) +- ENDFOREACH() +- +- # To do: If we include the path in ICU_INCLUDE_DIR, it leads to GUnit +- # picking up the wrong regex.h header. And it looks like we don't need it; +- # at least on Linux, the header gets installed in an OS path anyway. +- IF(NOT "${install_root}" STREQUAL "system") +- SET(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR}) +- ENDIF() +- +- SET(ICU_LIBRARIES ${ICU_SYSTEM_LIBRARIES}) +- +- # Needed for version information. +- SET(ICU_COMMON_DIR ${ICU_INCLUDE_DIR}) + ++ find_package(ICU REQUIRED COMPONENTS uc io dt in) ++ set(ICU_SYSTEM_LIBRARIES ICU::uc ICU::io ICU::dt ICU::in) ++ set(ICU_COMMON_DIR ${ICU_INCLUDE_DIR}) ++ SET(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR}) + ENDMACRO() + + MACRO (MYSQL_USE_BUNDLED_ICU) +diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake +index 3fa58da..88b53e7 100644 +--- a/cmake/libutils.cmake ++++ b/cmake/libutils.cmake +@@ -350,12 +350,7 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES) + # On Windows, ssleay32.lib/libeay32.lib or libssl.lib/libcrypto.lib + # must be merged into mysqlclient.lib + IF(WIN32 AND ${TARGET} STREQUAL "mysqlclient") +- SET(LINKER_EXTRA_FLAGS "") +- FOREACH(LIB ${SSL_LIBRARIES}) +- STRING_APPEND(LINKER_EXTRA_FLAGS " ${LIB}") +- ENDFOREACH() +- SET_TARGET_PROPERTIES(${TARGET} +- PROPERTIES STATIC_LIBRARY_FLAGS "${LINKER_EXTRA_FLAGS}") ++ TARGET_LINK_LIBRARIES(${TARGET} PRIVATE ${SSL_LIBRARIES}) + ENDIF() + + IF(OSLIBS) +diff --git a/cmake/lz4.cmake b/cmake/lz4.cmake +index 9aad130..68cbaba 100644 +--- a/cmake/lz4.cmake ++++ b/cmake/lz4.cmake +@@ -25,7 +25,7 @@ + + MACRO (FIND_SYSTEM_LZ4) + FIND_PATH(PATH_TO_LZ4 NAMES lz4frame.h) +- FIND_LIBRARY(LZ4_SYSTEM_LIBRARY NAMES lz4) ++ FIND_LIBRARY(LZ4_SYSTEM_LIBRARY NAMES lz4d lz4) + IF (PATH_TO_LZ4 AND LZ4_SYSTEM_LIBRARY) + SET(SYSTEM_LZ4_FOUND 1) + INCLUDE_DIRECTORIES(SYSTEM ${PATH_TO_LZ4}) +diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake +index 52feade..1e71bd7 100644 +--- a/cmake/ssl.cmake ++++ b/cmake/ssl.cmake +@@ -93,7 +93,20 @@ ENDMACRO() + # Provides the following configure options: + # WITH_SSL=[yes|system|] + MACRO (MYSQL_CHECK_SSL) ++ find_package(OpenSSL REQUIRED) ++ set(OPENSSL_LIBRARY OpenSSL::SSL CACHE STRING "") ++ set(CRYPTO_LIBRARY OpenSSL::Crypto CACHE STRING "") ++ FIND_PROGRAM(OPENSSL_EXECUTABLE openssl ++ DOC "path to the openssl executable") ++ SET(SSL_DEFINES "-DHAVE_OPENSSL") ++ set(SSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto) ++ if(NOT WIN32) ++ find_package(Threads REQUIRED) ++ list(APPEND SSL_LIBRARIES Threads::Threads) ++ endif() ++ENDMACRO() + ++MACRO (MYSQL_CHECK_SSL_OLD) + IF(NOT WITH_SSL) + SET(WITH_SSL "system" CACHE STRING ${WITH_SSL_DOC_STRING} FORCE) + ENDIF() +diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake +index 26c56fe..65bebb4 100644 +--- a/cmake/zlib.cmake ++++ b/cmake/zlib.cmake +@@ -51,28 +51,7 @@ MACRO (MYSQL_CHECK_ZLIB_WITH_COMPRESS) + IF(WITH_ZLIB STREQUAL "bundled") + MYSQL_USE_BUNDLED_ZLIB() + ELSE() +- SET(ZLIB_FIND_QUIETLY TRUE) +- INCLUDE(FindZLIB) +- IF(ZLIB_FOUND) +- INCLUDE(CheckFunctionExists) +- SET(SAVE_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}) +- SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} z) +- CHECK_FUNCTION_EXISTS(crc32 HAVE_CRC32) +- CHECK_FUNCTION_EXISTS(compressBound HAVE_COMPRESSBOUND) +- CHECK_FUNCTION_EXISTS(deflateBound HAVE_DEFLATEBOUND) +- SET(CMAKE_REQUIRED_LIBRARIES ${SAVE_CMAKE_REQUIRED_LIBRARIES}) +- IF(HAVE_CRC32 AND HAVE_COMPRESSBOUND AND HAVE_DEFLATEBOUND) +- SET(ZLIB_LIBRARY ${ZLIB_LIBRARIES} CACHE INTERNAL "System zlib library") +- SET(WITH_ZLIB "system" CACHE STRING +- "Which zlib to use (possible values are 'bundled' or 'system')") +- SET(ZLIB_SOURCES "") +- ELSE() +- SET(ZLIB_FOUND FALSE CACHE INTERNAL "Zlib found but not usable") +- MESSAGE(STATUS "system zlib found but not usable") +- ENDIF() +- ENDIF() +- IF(NOT ZLIB_FOUND) +- MYSQL_USE_BUNDLED_ZLIB() +- ENDIF() ++ find_package(ZLIB REQUIRED) ++ SET(ZLIB_LIBRARY ZLIB::ZLIB CACHE INTERNAL "System zlib library") + ENDIF() + ENDMACRO() diff --git a/externals/vcpkg/ports/libmysql/usage b/externals/vcpkg/ports/libmysql/usage new file mode 100755 index 000000000..8c2b814d2 --- /dev/null +++ b/externals/vcpkg/ports/libmysql/usage @@ -0,0 +1,4 @@ +The package libmysql provides CMake targets: + + find_package(libmysql REQUIRED) + target_link_libraries(main PRIVATE ${MYSQL_LIBRARIES}) diff --git a/externals/vcpkg/ports/libmysql/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/libmysql/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..d7f0e7560 --- /dev/null +++ b/externals/vcpkg/ports/libmysql/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,9 @@ +find_package(unofficial-libmysql CONFIG REQUIRED) +if (TARGET mysqlclient) + set(MYSQL_LIBRARY mysqlclient) +elseif (TARGET libmysql) + set(MYSQL_LIBRARY libmysql) +endif() + +set(libmysql_FOUND 1) +set(MYSQL_LIBRARIES ${MYSQL_LIBRARY}) diff --git a/externals/vcpkg/ports/libmysql/vcpkg.json b/externals/vcpkg/ports/libmysql/vcpkg.json new file mode 100755 index 000000000..56880427e --- /dev/null +++ b/externals/vcpkg/ports/libmysql/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "libmysql", + "version": "8.0.20", + "port-version": 6, + "description": "A MySQL client library for C development", + "homepage": "https://github.com/mysql/mysql-server", + "supports": "!(windows & x86) & !uwp", + "dependencies": [ + "boost-algorithm", + "boost-functional", + "boost-geometry", + "boost-graph", + "boost-optional", + "icu", + "libevent", + "lz4", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/libnice/portfile.cmake b/externals/vcpkg/ports/libnice/portfile.cmake new file mode 100755 index 000000000..1f8596647 --- /dev/null +++ b/externals/vcpkg/ports/libnice/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH SOURCE_PATH + REPO libnice/libnice + REF 55b71d47f2b427b3baa8812818ed3f059acc748d # 0.1.18 + SHA512 78575c487d74734d2dff1c04103fd55c76cf5e78edde03ffd68050348881a3efc985513cfd30553bfce0568c8edfcd61be7dea8991731efc749ee4fee2f503d6 + HEAD_REF master +) + +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -Dgtk_doc=disabled #Enable generating the API reference (depends on GTK-Doc) + -Dintrospection=disabled #Enable GObject Introspection (depends on GObject)' + -Dtests=disabled + -Dexamples=disabled + -Dgstreamer=disabled + -Dcrypto-library=openssl + ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' + ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' +) + +# Could be features: +# option('gupnp', type: 'feature', value: 'auto', + # description: 'Enable or disable GUPnP IGD support') +# option('ignored-network-interface-prefix', type: 'array', value: ['docker', 'veth', 'virbr', 'vnet'], + # description: 'Ignore network interfaces whose name starts with a string from this list in the ICE connection check algorithm. For example, "virbr" to ignore virtual bridge interfaces added by virtd, which do not help in finding connectivity.') +# option('crypto-library', type: 'combo', choices : ['auto', 'gnutls', 'openssl'], value : 'auto') + +vcpkg_install_meson() + +vcpkg_copy_pdbs() +vcpkg_copy_tools(TOOL_NAMES stunbdc stund AUTO_CLEAN) +vcpkg_fixup_pkgconfig() + +file(COPY "${SOURCE_PATH}/COPYING.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(COPY "${SOURCE_PATH}/COPYING.MPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libnice/vcpkg.json b/externals/vcpkg/ports/libnice/vcpkg.json new file mode 100755 index 000000000..59acb444c --- /dev/null +++ b/externals/vcpkg/ports/libnice/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "libnice", + "version": "0.1.18", + "description": "Libnice is an implementation of the IETF's Interactive Connectivity Establishment (ICE) standard (RFC 5245) and the Session Traversal Utilities for NAT (STUN) standard (RFC 5389).", + "homepage": "https://nice.freedesktop.org", + "license": "LGPL-2.1-only", + "dependencies": [ + "glib", + { + "name": "glib", + "host": true, + "default-features": false + }, + "openssl" + ] +} diff --git a/externals/vcpkg/ports/libnoise/fix-build.patch b/externals/vcpkg/ports/libnoise/fix-build.patch new file mode 100755 index 000000000..e4b07413d --- /dev/null +++ b/externals/vcpkg/ports/libnoise/fix-build.patch @@ -0,0 +1,100 @@ +diff --git a/noiseutils/CMakeLists.txt b/noiseutils/CMakeLists.txt +index 07747de..68db2a2 100644 +--- a/noiseutils/CMakeLists.txt ++++ b/noiseutils/CMakeLists.txt +@@ -19,11 +19,14 @@ if(BUILD_SHARED_LIBS) + + set_target_properties(${TARGET_NAME} PROPERTIES VERSION ${LIBNOISE_VERSION}) + target_link_libraries(${TARGET_NAME} noise) +- target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src) ++ target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src PUBLIC $ $) + + # install dynamic libraries (.dll or .so) into /bin +- install(TARGETS ${TARGET_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") +-endif() ++ install(TARGETS ${TARGET_NAME} EXPORT unofficial-noiseutilsTargets ++ RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") ++else() + + #---------------------------------------- + # build static lib (it's good practice to include a lib file for the dll) +@@ -31,11 +34,22 @@ set(TARGET_NAME "${LIB_NAME}-static") + add_library(${TARGET_NAME} STATIC ${libSrcs}) + set_target_properties(${TARGET_NAME} PROPERTIES VERSION ${LIBNOISE_VERSION}) + target_link_libraries(${TARGET_NAME} noise-static) +-target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src) ++target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src PUBLIC $ $) + # install static libraries (.lib) into /lib +-install(TARGETS ${TARGET_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") ++install(TARGETS ${TARGET_NAME} EXPORT unofficial-noiseutilsTargets DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") + #---------------------------------------- +- ++endif() + # install include files into /include + install( FILES "${PROJECT_SOURCE_DIR}/noiseutils/noiseutils.h" +- DESTINATION "${CMAKE_INSTALL_PREFIX}/include/noise" ) +\ No newline at end of file ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/include/noise" ) ++ ++install(EXPORT unofficial-noiseutilsTargets ++ NAMESPACE unofficial::noiseutils:: ++ DESTINATION share/unofficial-noiseutils ++) ++ ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-noiseutils-config.cmake.in" ++[[include("${CMAKE_CURRENT_LIST_DIR}/unofficial-noiseutilsTargets.cmake")]]) ++configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-noiseutils-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-noiseutils-config.cmake" @ONLY) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-noiseutils-config.cmake DESTINATION share/unofficial-noiseutils) ++ +\ No newline at end of file +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2757f30..47dcc51 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -60,10 +60,13 @@ if(BUILD_SHARED_LIBS) + add_library(${TARGET_NAME} SHARED ${libSrcs}) + endif() + set_target_properties(${TARGET_NAME} PROPERTIES VERSION ${LIBNOISE_VERSION}) +- target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src) ++ target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src PUBLIC $ $) + target_compile_definitions(${TARGET_NAME} PRIVATE NOISE_BUILD_DLL) +- install(TARGETS ${TARGET_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") +-endif() ++ install(TARGETS ${TARGET_NAME} EXPORT unofficial-noiseTargets ++ RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") ++else() + + #---------------------------------------- + # build static lib (it's good practice to include a lib file for the dll) +@@ -71,12 +74,22 @@ set(TARGET_NAME "${LIB_NAME}-static") + message(STATUS "build ${TARGET_NAME}") + add_library(${TARGET_NAME} STATIC ${libSrcs}) + set_target_properties(${TARGET_NAME} PROPERTIES VERSION ${LIBNOISE_VERSION}) +-target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src) ++target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src PUBLIC $ $) + target_compile_definitions(${TARGET_NAME} PUBLIC NOISE_STATIC) + # install static libraries (.lib) into /lib +-install(TARGETS ${TARGET_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") ++install(TARGETS ${TARGET_NAME} EXPORT unofficial-noiseTargets DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") + #---------------------------------------- +- ++endif() + # install include files into /include + install( DIRECTORY "${PROJECT_SOURCE_DIR}/src/noise" +- DESTINATION "${CMAKE_INSTALL_PREFIX}/include" ) +\ No newline at end of file ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/include" ) ++ ++install(EXPORT unofficial-noiseTargets ++ NAMESPACE unofficial::noise:: ++ DESTINATION share/unofficial-noise ++) ++ ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-noise-config.cmake.in" ++[[include("${CMAKE_CURRENT_LIST_DIR}/unofficial-noiseTargets.cmake")]]) ++configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-noise-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-noise-config.cmake" @ONLY) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-noise-config.cmake DESTINATION share/unofficial-noise) diff --git a/externals/vcpkg/ports/libnoise/portfile.cmake b/externals/vcpkg/ports/libnoise/portfile.cmake new file mode 100755 index 000000000..a929f37c6 --- /dev/null +++ b/externals/vcpkg/ports/libnoise/portfile.cmake @@ -0,0 +1,34 @@ +set( LIBNOISE_VERSION "1.0.0" ) +set( LIBNOISE_COMMIT "d7e68784a2b24c632868506780eba336ede74ecd" ) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO RobertHue/libnoise + REF ${LIBNOISE_COMMIT} + SHA512 8c4d654acb4ae3d90ee62ebdf0447f876022dcb887ebfad88f39b09d29183a58e6fc1b1f1d03edff804975c8befcc6eda33c44797495285aae338c2e869a14d7 + HEAD_REF master + PATCHES fix-build.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_WALL=ON + -DBUILD_SPEED_OPTIMIZED=ON + -DBUILD_LIBNOISE_DOCUMENTATION=OFF + -DBUILD_LIBNOISE_UTILS=ON + -DBUILD_LIBNOISE_EXAMPLES=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-noise CONFIG_PATH share/unofficial-noise) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-noiseutils CONFIG_PATH share/unofficial-noiseutils) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/noise/module/modulebase.h + "if NOISE_STATIC" "if 1" ) +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/libnoise/vcpkg.json b/externals/vcpkg/ports/libnoise/vcpkg.json new file mode 100755 index 000000000..640e503be --- /dev/null +++ b/externals/vcpkg/ports/libnoise/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libnoise", + "version": "1.0.0", + "port-version": 3, + "description": "A general-purpose library that generates three-dimensional coherent noise. Useful for terrain generation and procedural texture generation. Uses a broad number of techniques (Perlin noise, ridged multifractal, etc.) and combinations of those techniques.", + "homepage": "https://github.com/RobertHue/libnoise", + "license": "LGPL-2.1", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libnop/portfile.cmake b/externals/vcpkg/ports/libnop/portfile.cmake new file mode 100755 index 000000000..5c10f5e60 --- /dev/null +++ b/externals/vcpkg/ports/libnop/portfile.cmake @@ -0,0 +1,8 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/libnop + REF 910b55815be16109f04f4180e9adee14fb4ce281 + SHA512 74c5324eaa1b6b2ac8dfef94c835b5c5b044625f8e5efe3522470b1ecc4798ff43d344a013cee2f6901e83267c6167072947b754e63f1552ae7044cffe234c36 +) +file(INSTALL ${SOURCE_PATH}/include/nop DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/libnop/vcpkg.json b/externals/vcpkg/ports/libnop/vcpkg.json new file mode 100755 index 000000000..be09bef23 --- /dev/null +++ b/externals/vcpkg/ports/libnop/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "libnop", + "version-date": "2021-03-01", + "description": "libnop is a header-only library for serializing and deserializing C++ data types without external code generators or runtime support libraries", + "homepage": "https://github.com/google/libnop" +} diff --git a/externals/vcpkg/ports/libodb-boost/CMakeLists.txt b/externals/vcpkg/ports/libodb-boost/CMakeLists.txt new file mode 100755 index 000000000..5dd0eb9b8 --- /dev/null +++ b/externals/vcpkg/ports/libodb-boost/CMakeLists.txt @@ -0,0 +1,47 @@ +cmake_minimum_required(VERSION 3.0) +project(libodb-boost VERSION 2.4.0 LANGUAGES CXX) +find_package(odb 2.4.0 REQUIRED COMPONENTS libodb) +configure_file(config.unix.h.in + ${CMAKE_CURRENT_SOURCE_DIR}/odb/boost/details/config.h COPYONLY) + +# FIXME: should we require boost? which packages? +# find_package(PostgreSQL REQUIRED) +set(LIBODB_INSTALL_HEADERS ON CACHE BOOL "Install the header files (a debug install)") +file(GLOB_RECURSE libodb_src LIST_DIRECTORIES False + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.cxx) +add_library(libodb-boost ${libodb_src}) +target_include_directories(libodb-boost + PUBLIC + $ + $ + +) + +target_link_libraries(libodb-boost PRIVATE odb::libodb) +if(BUILD_SHARED_LIBS) + target_compile_definitions(libodb-boost PRIVATE + -DLIBODB_BOOST_DYNAMIC_LIB) +else() + target_compile_definitions(libodb-boost PRIVATE + -DLIBODB_BOOST_STATIC_LIB) +endif() +install(TARGETS libodb-boost EXPORT odb_boostConfig + COMPONENT boost + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin +) +if(LIBODB_INSTALL_HEADERS) +install(DIRECTORY odb DESTINATION include/ + COMPONENT sqlite + FILES_MATCHING + PATTERN "*.h" + PATTERN "*.hxx" + PATTERN "*.ixx" + PATTERN "*.txx" + PATTERN "*.options" +) +endif() +install(EXPORT odb_boostConfig NAMESPACE odb:: COMPONENT boost DESTINATION share/odb) +export(TARGETS libodb-boost NAMESPACE odb:: FILE odb_boostConfig.cmake) diff --git a/externals/vcpkg/ports/libodb-boost/config.unix.h.in b/externals/vcpkg/ports/libodb-boost/config.unix.h.in new file mode 100755 index 000000000..b049efd09 --- /dev/null +++ b/externals/vcpkg/ports/libodb-boost/config.unix.h.in @@ -0,0 +1,14 @@ +/* odb/boost/details/config.h. Generated from config.h.in by configure. */ +/* file : odb/boost/details/config.h.in + * copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* This file is automatically processed by configure. */ + +#ifndef ODB_BOOST_DETAILS_CONFIG_H +#define ODB_BOOST_DETAILS_CONFIG_H + +/* #undef LIBODB_BOOST_STATIC_LIB */ + +#endif /* ODB_BOOST_DETAILS_CONFIG_H */ diff --git a/externals/vcpkg/ports/libodb-boost/portfile.cmake b/externals/vcpkg/ports/libodb-boost/portfile.cmake new file mode 100755 index 000000000..adf571bea --- /dev/null +++ b/externals/vcpkg/ports/libodb-boost/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_download_distfile(ARCHIVE + URLS "http://www.codesynthesis.com/download/odb/2.4/libodb-boost-2.4.0.tar.gz" + FILENAME "libodb-boost-2.4.0.tar.gz" + SHA512 af716b0385cf4ea18b20dcd5880c69c43cfc195eec4ff196a8e438833306489c39ab06a494e5d60cd08ba0d94caa05bd07e5f3fa836d835bad15c8a2ad7de306 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) +file(REMOVE "${SOURCE_PATH}/version") + +file(COPY + ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in + DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DLIBODB_INSTALL_HEADERS=OFF +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_boostConfig-debug.cmake LIBODB_DEBUG_TARGETS) +string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/odb/odb_boostConfig-debug.cmake "${LIBODB_DEBUG_TARGETS}") + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libodb-boost/vcpkg.json b/externals/vcpkg/ports/libodb-boost/vcpkg.json new file mode 100755 index 000000000..0294b5004 --- /dev/null +++ b/externals/vcpkg/ports/libodb-boost/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "libodb-boost", + "version-string": "2.4.0", + "port-version": 5, + "description": "Description: Boost support for the ODB ORM library", + "dependencies": [ + "libodb" + ] +} diff --git a/externals/vcpkg/ports/libodb-mysql/CMakeLists.txt b/externals/vcpkg/ports/libodb-mysql/CMakeLists.txt new file mode 100755 index 000000000..fe02585b1 --- /dev/null +++ b/externals/vcpkg/ports/libodb-mysql/CMakeLists.txt @@ -0,0 +1,47 @@ +cmake_minimum_required(VERSION 3.0) +project(libodb-mysql VERSION 2.4.0 LANGUAGES CXX) +find_package(odb 2.4.0 REQUIRED COMPONENTS libodb) +configure_file(config.unix.h.in + ${CMAKE_CURRENT_SOURCE_DIR}/odb/mysql/details/config.h COPYONLY) + +INCLUDE_DIRECTORIES(${MYSQL_INCLUDE_DIR}) +set(LIBODB_INSTALL_HEADERS ON CACHE BOOL "Install the header files (a debug install)") +file(GLOB_RECURSE libodb_src + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.cxx) +add_library(libodb-mysql ${libodb_src}) +target_include_directories(libodb-mysql + PUBLIC + $ + $ + +) + +target_link_libraries(libodb-mysql PRIVATE odb::libodb ${MYSQL_LIB}) +if(BUILD_SHARED_LIBS) + target_compile_definitions(libodb-mysql PRIVATE + -DLIBODB_MYSQL_DYNAMIC_LIB + -DLIBODB_MYSQL_HAVE_UNLOCK_NOTIFY) +else() + target_compile_definitions(libodb-mysql PRIVATE + -DLIBODB_MYSQL_STATIC_LIB + -DLIBODB_MYSQL_HAVE_UNLOCK_NOTIFY) +endif() +install(TARGETS libodb-mysql EXPORT odb_mysqlConfig + COMPONENT mysql + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin +) +if(LIBODB_INSTALL_HEADERS) +install(DIRECTORY odb DESTINATION include/ + COMPONENT mysql + FILES_MATCHING + PATTERN "*.h" + PATTERN "*.hxx" + PATTERN "*.ixx" + PATTERN "*.txx" +) +endif() +install(EXPORT odb_mysqlConfig NAMESPACE odb:: COMPONENT mysql DESTINATION share/odb) +export(TARGETS libodb-mysql NAMESPACE odb:: FILE odb_mysqlConfig.cmake) \ No newline at end of file diff --git a/externals/vcpkg/ports/libodb-mysql/adapter_mysql_8.0.patch b/externals/vcpkg/ports/libodb-mysql/adapter_mysql_8.0.patch new file mode 100755 index 000000000..9e2f23745 --- /dev/null +++ b/externals/vcpkg/ports/libodb-mysql/adapter_mysql_8.0.patch @@ -0,0 +1,13 @@ +diff --git a/odb/mysql/mysql-types.hxx b/odb/mysql/mysql-types.hxx +index 1254ccd..5396791 100644 +--- a/odb/mysql/mysql-types.hxx ++++ b/odb/mysql/mysql-types.hxx +@@ -7,7 +7,7 @@ + + #include + +-typedef char my_bool; ++typedef bool my_bool; + typedef struct st_mysql_bind MYSQL_BIND; + + #ifdef LIBODB_MYSQL_INCLUDE_SHORT diff --git a/externals/vcpkg/ports/libodb-mysql/config.unix.h.in b/externals/vcpkg/ports/libodb-mysql/config.unix.h.in new file mode 100755 index 000000000..b1270e20e --- /dev/null +++ b/externals/vcpkg/ports/libodb-mysql/config.unix.h.in @@ -0,0 +1,19 @@ +/* odb/mysql/details/config.h. Generated from config.h.in by configure. */ +/* file : odb/mysql/details/config.h.in + * copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* This file is automatically processed by configure. */ + +#ifndef ODB_MYSQL_DETAILS_CONFIG_H +#define ODB_MYSQL_DETAILS_CONFIG_H + +/* #undef LIBODB_MYSQL_STATIC_LIB */ + +/* #undef LIBODB_MYSQL_INCLUDE_SHORT */ +#define LIBODB_MYSQL_INCLUDE_LONG 1 + +/* #undef LIBODB_MYSQL_THR_KEY_VISIBLE */ + +#endif /* ODB_MYSQL_DETAILS_CONFIG_H */ diff --git a/externals/vcpkg/ports/libodb-mysql/fix-redefinttion.patch b/externals/vcpkg/ports/libodb-mysql/fix-redefinttion.patch new file mode 100755 index 000000000..ec6dab459 --- /dev/null +++ b/externals/vcpkg/ports/libodb-mysql/fix-redefinttion.patch @@ -0,0 +1,32 @@ +diff --git a/odb/mysql/mysql-types.hxx b/odb/mysql/mysql-types.hxx +index 5396791..32a2a03 100644 +--- a/odb/mysql/mysql-types.hxx ++++ b/odb/mysql/mysql-types.hxx +@@ -7,13 +7,24 @@ + + #include + ++#include ++ + typedef bool my_bool; ++ ++#if !defined(LIBODB_MYSQL_MARIADB) && MYSQL_VERSION_ID >= 80011 ++struct MYSQL_BIND; ++#else + typedef struct st_mysql_bind MYSQL_BIND; ++#endif + +-#ifdef LIBODB_MYSQL_INCLUDE_SHORT +-# include ++#ifdef LIBODB_MYSQL_MARIADB ++# include + #else +-# include ++# ifdef LIBODB_MYSQL_INCLUDE_SHORT ++# include ++# else ++# include ++# endif + #endif + + #endif // ODB_MYSQL_MYSQL_TYPES_HXX diff --git a/externals/vcpkg/ports/libodb-mysql/portfile.cmake b/externals/vcpkg/ports/libodb-mysql/portfile.cmake new file mode 100755 index 000000000..ac78846dd --- /dev/null +++ b/externals/vcpkg/ports/libodb-mysql/portfile.cmake @@ -0,0 +1,45 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://www.codesynthesis.com/download/odb/2.4/libodb-mysql-2.4.0.tar.gz" + FILENAME "libodb-mysql-2.4.0.tar.gz" + SHA512 c27b73c3f61dccdd149c11c122185f645a00d5bc346b366ee65b738f8719c39d03fad07a0d55b62b3db9e3ad2507679c24ddda331e5d110f367ad32f7cf8b910 +) + +vcpkg_extract_source_archive_ex( + ARCHIVE ${ARCHIVE} + OUT_SOURCE_PATH SOURCE_PATH + PATCHES + adapter_mysql_8.0.patch + fix-redefinttion.patch +) +file(REMOVE "${SOURCE_PATH}/version") + +file(COPY + ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in + DESTINATION ${SOURCE_PATH}) + +set(MYSQL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include/mysql") +find_library(MYSQL_LIB NAMES libmysql mysqlclient PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}" NO_DEFAULT_PATH REQUIRED) +find_library(MYSQL_LIB_DEBUG NAMES libmysql mysqlclient PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}/debug" NO_DEFAULT_PATH REQUIRED) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE + PREFER_NINJA + OPTIONS + -DMYSQL_INCLUDE_DIR=${MYSQL_INCLUDE_DIR} + OPTIONS_RELEASE + -DMYSQL_LIB=${MYSQL_LIB} + OPTIONS_DEBUG + -DLIBODB_INSTALL_HEADERS=OFF + -DMYSQL_LIB=${MYSQL_LIB_DEBUG} +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/odb TARGET_PATH share/odb) + +vcpkg_copy_pdbs() + +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libodb-mysql/usage b/externals/vcpkg/ports/libodb-mysql/usage new file mode 100755 index 000000000..2ddd4550a --- /dev/null +++ b/externals/vcpkg/ports/libodb-mysql/usage @@ -0,0 +1,4 @@ +The package libodb-mysql provides CMake integration: + + find_package(odb CONFIG COMPONENTS libodb mysql REQUIRED) + target_link_libraries(main PRIVATE odb::libodb-mysql) diff --git a/externals/vcpkg/ports/libodb-mysql/vcpkg.json b/externals/vcpkg/ports/libodb-mysql/vcpkg.json new file mode 100755 index 000000000..c0fa1b01d --- /dev/null +++ b/externals/vcpkg/ports/libodb-mysql/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libodb-mysql", + "version": "2.4.0", + "port-version": 9, + "description": "MySQL support for the ODB ORM library", + "homepage": "https://www.codesynthesis.com/products/odb/", + "dependencies": [ + "libmysql", + "libodb" + ] +} diff --git a/externals/vcpkg/ports/libodb-pgsql/CMakeLists.txt b/externals/vcpkg/ports/libodb-pgsql/CMakeLists.txt new file mode 100755 index 000000000..46137ab57 --- /dev/null +++ b/externals/vcpkg/ports/libodb-pgsql/CMakeLists.txt @@ -0,0 +1,46 @@ +cmake_minimum_required(VERSION 3.0) +project(libodb-pgsql VERSION 2.4.0 LANGUAGES CXX) +find_package(odb 2.4.0 REQUIRED COMPONENTS libodb) +find_package(PostgreSQL REQUIRED) +configure_file(config.unix.h.in + ${CMAKE_CURRENT_SOURCE_DIR}/odb/pgsql/details/config.h COPYONLY) + +set(LIBODB_INSTALL_HEADERS ON CACHE BOOL "Install the header files (a debug install)") +file(GLOB_RECURSE libodb_src LIST_DIRECTORIES False + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.cxx) +list(FILTER libodb_src EXCLUDE REGEX /posix/.*) +add_library(libodb-pgsql ${libodb_src}) +target_include_directories(libodb-pgsql + PUBLIC + $ + $ + +) + +target_link_libraries(libodb-pgsql PRIVATE odb::libodb ${PostgreSQL_LIBRARY}) +if(BUILD_SHARED_LIBS) + target_compile_definitions(libodb-pgsql PRIVATE + -DLIBODB_PGSQL_DYNAMIC_LIB) +else() + target_compile_definitions(libodb-pgsql PRIVATE + -DLIBODB_PGSQL_STATIC_LIB) +endif() +install(TARGETS libodb-pgsql EXPORT odb_pgsqlConfig + COMPONENT pgsql + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin +) +if(LIBODB_INSTALL_HEADERS) +install(DIRECTORY odb DESTINATION include/ + COMPONENT sqlite + FILES_MATCHING + PATTERN "*.h" + PATTERN "*.hxx" + PATTERN "*.ixx" + PATTERN "*.txx" +) +endif() +install(EXPORT odb_pgsqlConfig NAMESPACE odb:: COMPONENT pgsql DESTINATION share/odb) +export(TARGETS libodb-pgsql NAMESPACE odb:: FILE odb_pgsqlConfig.cmake) \ No newline at end of file diff --git a/externals/vcpkg/ports/libodb-pgsql/config.unix.h.in b/externals/vcpkg/ports/libodb-pgsql/config.unix.h.in new file mode 100755 index 000000000..cdced9eb0 --- /dev/null +++ b/externals/vcpkg/ports/libodb-pgsql/config.unix.h.in @@ -0,0 +1,14 @@ +/* odb/pgsql/details/config.h. Generated from config.h.in by configure. */ +/* file : odb/pgsql/details/config.h.in + * copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* This file is automatically processed by configure. */ + +#ifndef ODB_PGSQL_DETAILS_CONFIG_H +#define ODB_PGSQL_DETAILS_CONFIG_H + +/* #undef LIBODB_PGSQL_STATIC_LIB */ + +#endif /* ODB_PGSQL_DETAILS_CONFIG_H */ diff --git a/externals/vcpkg/ports/libodb-pgsql/portfile.cmake b/externals/vcpkg/ports/libodb-pgsql/portfile.cmake new file mode 100755 index 000000000..53cf5db23 --- /dev/null +++ b/externals/vcpkg/ports/libodb-pgsql/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_download_distfile(ARCHIVE + URLS "http://www.codesynthesis.com/download/odb/2.4/libodb-pgsql-2.4.0.tar.gz" + FILENAME "libodb-pgsql-2.4.0.tar.gz" + SHA512 535515356233b815f144c0098940174f7a530e7fa4e930c0a9ebdc255fdb8bac8cdcceac31f25be4864105323e00bfe50808efa648e7c8ffb5a944e52f514b69 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" +) +file(REMOVE "${SOURCE_PATH}/version") + +file(COPY + "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" + "${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in" + DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS_DEBUG + -DLIBODB_INSTALL_HEADERS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME odb) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libodb-pgsql/vcpkg.json b/externals/vcpkg/ports/libodb-pgsql/vcpkg.json new file mode 100755 index 000000000..10a86d94b --- /dev/null +++ b/externals/vcpkg/ports/libodb-pgsql/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "libodb-pgsql", + "version": "2.4.0", + "port-version": 6, + "description": "Description: PostgreSQL support for the ODB ORM library", + "homepage": "https://www.codesynthesis.com/products/odb/", + "dependencies": [ + "libodb", + "libpq", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libodb-sqlite/CMakeLists.txt b/externals/vcpkg/ports/libodb-sqlite/CMakeLists.txt new file mode 100755 index 000000000..e0689fa91 --- /dev/null +++ b/externals/vcpkg/ports/libodb-sqlite/CMakeLists.txt @@ -0,0 +1,55 @@ +cmake_minimum_required(VERSION 3.0) +project(libodb-sqlite VERSION 2.4.0 LANGUAGES CXX) +find_package(odb 2.4.0 REQUIRED COMPONENTS libodb) +find_package(unofficial-sqlite3 CONFIG) +configure_file(config.unix.h.in odb/sqlite/details/config.h COPYONLY) + +set(LIBODB_INSTALL_HEADERS ON CACHE BOOL "Install the header files (a debug install)") +file(GLOB_RECURSE libodb_src LIST_DIRECTORIES False + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.cxx) +list(FILTER libodb_src EXCLUDE REGEX /posix/.*) +add_library(libodb-sqlite ${libodb_src}) +target_include_directories(libodb-sqlite + PUBLIC + $ + $ + $ +) + +target_link_libraries(libodb-sqlite PRIVATE odb::libodb unofficial::sqlite3::sqlite3) +if(BUILD_SHARED_LIBS) + target_compile_definitions(libodb-sqlite PRIVATE + -DLIBODB_SQLITE_DYNAMIC_LIB + -DLIBODB_SQLITE_HAVE_UNLOCK_NOTIFY) +else() + target_compile_definitions(libodb-sqlite PRIVATE + -DLIBODB_SQLITE_STATIC_LIB + -DLIBODB_SQLITE_HAVE_UNLOCK_NOTIFY) +endif() +install(TARGETS libodb-sqlite EXPORT odb_sqliteConfig + COMPONENT sqlite + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin +) +if(LIBODB_INSTALL_HEADERS) + install( + DIRECTORY odb + DESTINATION include/ + COMPONENT sqlite + FILES_MATCHING + PATTERN "*.h" + PATTERN "*.hxx" + PATTERN "*.ixx" + PATTERN "*.txx" + ) + install( + FILES config.unix.h.in + DESTINATION include/odb/sqlite/detail + COMPONENT sqlite + RENAME config.h + ) +endif() +install(EXPORT odb_sqliteConfig NAMESPACE odb:: COMPONENT sqlite DESTINATION share/odb) +export(TARGETS libodb-sqlite NAMESPACE odb:: FILE odb_sqliteConfig.cmake) \ No newline at end of file diff --git a/externals/vcpkg/ports/libodb-sqlite/config.unix.h.in b/externals/vcpkg/ports/libodb-sqlite/config.unix.h.in new file mode 100755 index 000000000..f5af346a1 --- /dev/null +++ b/externals/vcpkg/ports/libodb-sqlite/config.unix.h.in @@ -0,0 +1,15 @@ +/* odb/sqlite/details/config.h. Generated from config.h.in by configure. */ +/* file : odb/sqlite/details/config.h.in + * copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* This file is automatically processed by configure. */ + +#ifndef ODB_SQLITE_DETAILS_CONFIG_H +#define ODB_SQLITE_DETAILS_CONFIG_H + +/* #undef LIBODB_SQLITE_STATIC_LIB */ +#define LIBODB_SQLITE_HAVE_UNLOCK_NOTIFY 1 + +#endif /* ODB_SQLITE_DETAILS_CONFIG_H */ diff --git a/externals/vcpkg/ports/libodb-sqlite/portfile.cmake b/externals/vcpkg/ports/libodb-sqlite/portfile.cmake new file mode 100755 index 000000000..58fbb3a37 --- /dev/null +++ b/externals/vcpkg/ports/libodb-sqlite/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_download_distfile(ARCHIVE + URLS "http://www.codesynthesis.com/download/odb/2.4/libodb-sqlite-2.4.0.tar.gz" + FILENAME "libodb-sqlite-2.4.0.tar.gz" + SHA512 af16da7c82cf8845ca3b393fbd8957a92b05ebc925a5191f20d414ab558345850073cd9c46457d0ef0edfb12ebcb27f267b934c9c69ef598380242fe920c8577 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) +file(REMOVE "${SOURCE_PATH}/version") + +file(COPY + ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in + DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DLIBODB_INSTALL_HEADERS=OFF +) + +vcpkg_install_cmake() + +file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_sqliteConfig-debug.cmake LIBODB_DEBUG_TARGETS) +string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/odb/odb_sqliteConfig-debug.cmake "${LIBODB_DEBUG_TARGETS}") +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libodb-sqlite/vcpkg.json b/externals/vcpkg/ports/libodb-sqlite/vcpkg.json new file mode 100755 index 000000000..466dc4da3 --- /dev/null +++ b/externals/vcpkg/ports/libodb-sqlite/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libodb-sqlite", + "version-string": "2.4.0", + "port-version": 9, + "description": "Sqlite support for the ODB ORM library", + "homepage": "https://www.codesynthesis.com/products/odb/", + "dependencies": [ + "libodb", + "sqlite3" + ] +} diff --git a/externals/vcpkg/ports/libodb/CMakeLists.txt b/externals/vcpkg/ports/libodb/CMakeLists.txt new file mode 100755 index 000000000..a49175a8a --- /dev/null +++ b/externals/vcpkg/ports/libodb/CMakeLists.txt @@ -0,0 +1,47 @@ +cmake_minimum_required(VERSION 3.0) +project(libodb VERSION 2.4.0 LANGUAGES CXX) +set(LIBODB_INSTALL_HEADERS ON CACHE BOOL "Install the header files (a debug install)") +configure_file(config.unix.h.in + ${CMAKE_CURRENT_SOURCE_DIR}/odb/details/config.h COPYONLY) + +file(GLOB_RECURSE libodb_src LIST_DIRECTORIES False + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.cxx) +if (WIN32) + list(FILTER libodb_src EXCLUDE REGEX /posix/.*) +elseif (UNIX) + list(FILTER libodb_src EXCLUDE REGEX /win32/.*) +endif() + +add_library(libodb ${libodb_src}) +target_include_directories(libodb + PUBLIC + $ + $ + +) +if(BUILD_SHARED_LIBS) + target_compile_definitions(libodb PRIVATE + -DLIBODB_DYNAMIC_LIB) +else() + target_compile_definitions(libodb PRIVATE + -DLIBODB_STATIC_LIB) +endif() +install(TARGETS libodb EXPORT odb_libodbConfig + COMPONENT libodb + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin +) +if(LIBODB_INSTALL_HEADERS) +install(DIRECTORY odb DESTINATION include/ + COMPONENT libodb + FILES_MATCHING + PATTERN "*.h" + PATTERN "*.hxx" + PATTERN "*.ixx" + PATTERN "*.txx" +) +endif() +install(EXPORT odb_libodbConfig NAMESPACE odb:: COMPONENT libodb DESTINATION share/odb) +export(TARGETS libodb NAMESPACE odb:: FILE odb_libodbConfig.cmake) diff --git a/externals/vcpkg/ports/libodb/config.unix.h.in b/externals/vcpkg/ports/libodb/config.unix.h.in new file mode 100755 index 000000000..4df77c5c7 --- /dev/null +++ b/externals/vcpkg/ports/libodb/config.unix.h.in @@ -0,0 +1,20 @@ +/* odb/details/config.h. Generated from config.h.in by configure. */ +/* file : odb/details/config.h.in + * copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC + * license : GNU GPL v2; see accompanying LICENSE file + */ + +/* This file is automatically processed by configure. */ + +#ifndef ODB_DETAILS_CONFIG_H +#define ODB_DETAILS_CONFIG_H + +/* #undef ODB_THREADS_NONE */ +#define ODB_THREADS_POSIX 1 +/* #undef ODB_THREADS_WIN32 */ +#define ODB_THREADS_TLS_KEYWORD 1 +/* #undef ODB_THREADS_TLS_DECLSPEC */ + +/* #undef LIBODB_STATIC_LIB */ + +#endif /* ODB_DETAILS_CONFIG_H */ diff --git a/externals/vcpkg/ports/libodb/odbConfig.cmake b/externals/vcpkg/ports/libodb/odbConfig.cmake new file mode 100755 index 000000000..f3037bde1 --- /dev/null +++ b/externals/vcpkg/ports/libodb/odbConfig.cmake @@ -0,0 +1,10 @@ +set(_supported_components libodb sqlite mysql pgsql) + +foreach(_comp ${odb_FIND_COMPONENTS}) + if(NOT ";${_supported_components};" MATCHES _comp) + set(odb_FOUND False) + set(odb_NOTFOUND_MESSAGE "Unsupported component: ${_comp}") + endif() + include("${CMAKE_CURRENT_LIST_DIR}/odb_${_comp}Config.cmake") +endforeach() +set(odb_FOUND True) \ No newline at end of file diff --git a/externals/vcpkg/ports/libodb/portfile.cmake b/externals/vcpkg/ports/libodb/portfile.cmake new file mode 100755 index 000000000..c7046bc82 --- /dev/null +++ b/externals/vcpkg/ports/libodb/portfile.cmake @@ -0,0 +1,50 @@ +include(CMakePackageConfigHelpers) + +vcpkg_download_distfile(ARCHIVE + URLS "http://www.codesynthesis.com/download/odb/2.4/libodb-2.4.0.tar.gz" + FILENAME "libodb-2.4.0.tar.gz" + SHA512 f1311458634695eb6ba307ebfd492e3b260e7beb06db1c5c46df58c339756be4006322cdc4e42d055bf5b2ad14ce4656ddcafcc4e16c282034db8a77d255c3eb +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) +file(REMOVE "${SOURCE_PATH}/version") + +file(COPY + ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in + DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE + OPTIONS_DEBUG + -DLIBODB_INSTALL_HEADERS=OFF +) + +vcpkg_install_cmake() +file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_libodbConfig-debug.cmake LIBODB_DEBUG_TARGETS) +string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/odb/odb_libodbConfig-debug.cmake "${LIBODB_DEBUG_TARGETS}") +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/odbConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/odb) +write_basic_package_version_file(${CURRENT_PACKAGES_DIR}/share/odb/odbConfigVersion.cmake + VERSION 2.4.0 + COMPATIBILITY SameMajorVersion +) + +set(LIBODB_HEADER_PATH ${CURRENT_PACKAGES_DIR}/include/odb/details/export.hxx) +file(READ ${LIBODB_HEADER_PATH} LIBODB_HEADER) +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + string(REPLACE "#ifdef LIBODB_STATIC_LIB" "#if 1" LIBODB_HEADER ${LIBODB_HEADER}) +else() + string(REPLACE "#ifdef LIBODB_STATIC_LIB" "#if 0" LIBODB_HEADER ${LIBODB_HEADER}) +endif() +file(WRITE ${LIBODB_HEADER_PATH} "${LIBODB_HEADER}") + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libodb/vcpkg.json b/externals/vcpkg/ports/libodb/vcpkg.json new file mode 100755 index 000000000..5c3fe94c2 --- /dev/null +++ b/externals/vcpkg/ports/libodb/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libodb", + "version": "2.4.0", + "port-version": 8, + "description": "ODB library, base runtime for the ODB ORM solution", + "homepage": "https://www.codesynthesis.com/products/odb/" +} diff --git a/externals/vcpkg/ports/libogg/portfile.cmake b/externals/vcpkg/ports/libogg/portfile.cmake new file mode 100755 index 000000000..cd0cfc092 --- /dev/null +++ b/externals/vcpkg/ports/libogg/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.xiph.org + OUT_SOURCE_PATH SOURCE_PATH + REPO xiph/ogg + REF v1.3.5 + SHA512 72bfad534a459bfca534eae9b209fa630ac20364a82e82f2707b210a40deaf9a7dc9031532a8b27120a9dd66f804655ddce79875758ef14b109bf869e57fb747 + HEAD_REF master +) + +if(VCPKG_TARGET_IS_MINGW) + vcpkg_replace_string(${SOURCE_PATH}/win32/ogg.def "LIBRARY ogg" "LIBRARY libogg") +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DINSTALL_DOCS=0 -DINSTALL_PKG_CONFIG_MODULE=1 +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Ogg TARGET_PATH share/ogg) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + diff --git a/externals/vcpkg/ports/libogg/vcpkg.json b/externals/vcpkg/ports/libogg/vcpkg.json new file mode 100755 index 000000000..0c0979eb1 --- /dev/null +++ b/externals/vcpkg/ports/libogg/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "libogg", + "version": "1.3.5", + "description": "Ogg is a multimedia container format, and the native file and stream format for the Xiph.org multimedia codecs.", + "homepage": "https://www.xiph.org/ogg" +} diff --git a/externals/vcpkg/ports/libopenmpt/CMakeLists.txt b/externals/vcpkg/ports/libopenmpt/CMakeLists.txt new file mode 100755 index 000000000..35094e8f4 --- /dev/null +++ b/externals/vcpkg/ports/libopenmpt/CMakeLists.txt @@ -0,0 +1,95 @@ +cmake_minimum_required(VERSION 3.9) +project(libopenmpt) + +if(MSVC) + add_compile_options( + /W3 /wd4005 /wd4267 /wd4244 /wd4996 /wd4100 /wd4018 + -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE + -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS + ) +endif() + +find_package(ZLIB REQUIRED) +find_package(mpg123 CONFIG REQUIRED) +find_package(Vorbis REQUIRED) + +file(GLOB HEADERS libopenmpt/*.h libopenmpt/*.hpp) +list(FILTER HEADERS EXCLUDE REGEX "_impl\\.hpp$|_internal\\.h$") + +include_directories( + . + build/svn_version + libopenmpt + common + soundbase + sounddsp + soundlib + openmpt123 +) + +file(GLOB_RECURSE SOURCES + common/*.cpp + soundbase/*.cpp + sounddsp/*.cpp + # Because this is a GLOB_RECURSE, soundlib/plugins/*.cpp will be included + soundlib/*.cpp + libopenmpt/libopenmpt_c.cpp + libopenmpt/libopenmpt_cxx.cpp + libopenmpt/libopenmpt_ext_impl.cpp + libopenmpt/libopenmpt_impl.cpp +) + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +add_library(libopenmpt ${SOURCES}) + +target_compile_definitions(libopenmpt PRIVATE + -DMPT_WITH_MPG123 -DMPT_WITH_OGG + -DMPT_WITH_VORBIS -DMPT_WITH_VORBISFILE + -DMPT_WITH_ZLIB -DMPT_BUILD_VCPKG + -DLIBOPENMPT_BUILD +) + +if(BUILD_SHARED_LIBS) + target_compile_definitions( + libopenmpt + PRIVATE -DLIBOPENMPT_BUILD_DLL + ) +endif() + +target_include_directories( + libopenmpt + PUBLIC + $ +) + +target_link_libraries( + libopenmpt + PRIVATE + MPG123::libmpg123 + Vorbis::vorbisfile + Vorbis::vorbis + ZLIB::ZLIB +) + +set(LIBOPENMPT_REQUIRES_PRIVATE "zlib vorbis vorbisfile libmpg123") +set(LIBOPENMPT_LIBS_PRIVATE "") +set(prefix "${CMAKE_INSTALL_PREFIX}") +set(exec_prefix [[${prefix}]]) +set(includedir [[${prefix}/include]]) +set(libdir [[${prefix}/lib]]) +configure_file(libopenmpt/libopenmpt.pc.in libopenmpt.pc) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenmpt.pc DESTINATION lib/pkgconfig) + +install(TARGETS libopenmpt EXPORT libopenmpt-targets) +install(EXPORT libopenmpt-targets DESTINATION share/libopenmpt NAMESPACE libopenmpt::) +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libopenmpt-config.cmake [[ +include(CMakeFindDependencyMacro) +find_dependency(ZLIB) +find_dependency(mpg123 CONFIG) +find_dependency(Vorbis) +include(${CMAKE_CURRENT_LIST_DIR}/libopenmpt-targets.cmake) +]]) +install(FILES ${HEADERS} DESTINATION include/libopenmpt) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenmpt-config.cmake DESTINATION share/libopenmpt) diff --git a/externals/vcpkg/ports/libopenmpt/portfile.cmake b/externals/vcpkg/ports/libopenmpt/portfile.cmake new file mode 100755 index 000000000..77e2a823f --- /dev/null +++ b/externals/vcpkg/ports/libopenmpt/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO OpenMPT/openmpt + REF 7da598b28acdb8ee8ea0ed93bcb57d680424f5cc # libopenmpt-0.5.12 + SHA512 0f5441518dbbbbae194c724c47238a3cad876d8eb81e6a89fed3801724a6ae023d6d8806f792dc2f44082f3849cd4e1130081db3668f9974170171227f70e879 + HEAD_REF master +) + +file(READ ${CMAKE_CURRENT_LIST_DIR}/vcpkg.json vcpkg_json) +string(JSON version GET "${vcpkg_json}" "version") + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DVERSION=${version} +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/libopenmpt/libopenmpt_config.h "defined(LIBOPENMPT_USE_DLL)" "0") +else() + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/libopenmpt/libopenmpt_config.h "defined(LIBOPENMPT_USE_DLL)" "1") +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/libopenmpt/vcpkg.json b/externals/vcpkg/ports/libopenmpt/vcpkg.json new file mode 100755 index 000000000..d050598a1 --- /dev/null +++ b/externals/vcpkg/ports/libopenmpt/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "libopenmpt", + "version": "0.5.12", + "description": "a library to render tracker music", + "homepage": "https://openmpt.org/", + "dependencies": [ + "libogg", + "libvorbis", + "mpg123", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/libopensp/opensp_1.5.2-13.diff b/externals/vcpkg/ports/libopensp/opensp_1.5.2-13.diff new file mode 100755 index 000000000..92781232f --- /dev/null +++ b/externals/vcpkg/ports/libopensp/opensp_1.5.2-13.diff @@ -0,0 +1,37 @@ +--- opensp-1.5.2.orig/sx/XmlOutputEventHandler.cxx ++++ opensp-1.5.2/sx/XmlOutputEventHandler.cxx +@@ -1199,12 +1199,22 @@ + // Check to make sure we haven't passed outside of the + // output directory + char *dirs = strdup (filePath); ++#ifdef MAXPATHLEN + char realDirs[MAXPATHLEN]; + char realOutputDir[MAXPATHLEN]; ++#else ++ char *realDirs; ++ char *realOutputDir; ++#endif + char *outputDir = strdup(outputDir_); + ++#ifdef MAXPATHLEN + realpath((const char *)dirname(dirs), realDirs); + realpath((const char *)dirname(outputDir), realOutputDir); ++#else ++ realDirs = realpath((const char *)dirname(dirs), NULL); ++ realOutputDir = realpath((const char *)dirname(outputDir), NULL); ++#endif + + if (strncmp(realDirs, realOutputDir, strlen (realOutputDir)) != 0) { + app_->message(XmlOutputMessages::pathOutsideOutputDirectory, +@@ -1214,6 +1224,11 @@ + } + } + ++#ifndef MAXPATHLEN ++ free(realDirs); ++ free(realOutputDir); ++#endif ++ + // Make the necessary directories + maybeCreateDirectories(dirname(dirs)); + diff --git a/externals/vcpkg/ports/libopensp/portfile.cmake b/externals/vcpkg/ports/libopensp/portfile.cmake new file mode 100755 index 000000000..aa7fdadff --- /dev/null +++ b/externals/vcpkg/ports/libopensp/portfile.cmake @@ -0,0 +1,56 @@ +set(OPENSP_VERSION 1.5.2) + +set(PATCHES opensp_1.5.2-13.diff) # http://deb.debian.org/debian/pool/main/o/opensp/opensp_1.5.2-13.diff.gz +if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) + list(APPEND PATCHES windows_cmake_build.diff) # https://invent.kde.org/packaging/craft-blueprints-kde/-/tree/master/libs/libopensp +endif() +if (VCPKG_TARGET_IS_UWP) + list(APPEND PATCHES uwp_getenv_fix.diff) +endif() + +vcpkg_download_distfile(ARCHIVE + URLS "https://downloads.sourceforge.net/project/openjade/opensp/${OPENSP_VERSION}/OpenSP-${OPENSP_VERSION}.tar.gz" + FILENAME "OpenSP-${OPENSP_VERSION}.tar.gz" + SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF ${OPENSP_VERSION} + PATCHES ${PATCHES} +) + +if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + ) + + vcpkg_cmake_install() +else() + set(EXTRA_OPTS "") + if(VCPKG_TARGET_IS_OSX) + list(APPEND EXTRA_OPTS "LDFLAGS=-framework CoreFoundation \$LDFLAGS") # libintl links to it + endif() + + vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + --disable-doc-build + ${EXTRA_OPTS} + ) + + vcpkg_install_make() +endif() + +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libopensp/uwp_getenv_fix.diff b/externals/vcpkg/ports/libopensp/uwp_getenv_fix.diff new file mode 100755 index 000000000..806ac1ba8 --- /dev/null +++ b/externals/vcpkg/ports/libopensp/uwp_getenv_fix.diff @@ -0,0 +1,13 @@ +diff --git a/config.h b/config.h +index 6a2b097..7db8a93 100644 +--- a/config.h ++++ b/config.h +@@ -64,6 +64,8 @@ + #pragma warning ( disable : 4251 ) // __declspec(dllexport) + #pragma warning ( disable : 4275 ) + #pragma warning ( disable : 4237 ) // future reserved keyword ++#pragma warning ( disable : 4996 ) // 'getenv': This function or variable may be unsafe (on UWP) ++#pragma warning ( disable : 4703 ) // potentially uninitialized local pointer variable 'declaredValue' + #define huge verybig + #if _MSC_VER == 900 + #define SP_DECLARE_PLACEMENT_OPERATOR_NEW diff --git a/externals/vcpkg/ports/libopensp/vcpkg.json b/externals/vcpkg/ports/libopensp/vcpkg.json new file mode 100755 index 000000000..b61ba7152 --- /dev/null +++ b/externals/vcpkg/ports/libopensp/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "libopensp", + "version": "1.5.2", + "description": "SGML parser algorithm", + "homepage": "http://openjade.sourceforge.net", + "dependencies": [ + { + "name": "gettext", + "platform": "!(windows | uwp)" + }, + { + "name": "vcpkg-cmake", + "host": true, + "platform": "windows" + }, + { + "name": "vcpkg-cmake-config", + "host": true, + "platform": "windows" + } + ] +} diff --git a/externals/vcpkg/ports/libopensp/windows_cmake_build.diff b/externals/vcpkg/ports/libopensp/windows_cmake_build.diff new file mode 100755 index 000000000..2c9e82537 --- /dev/null +++ b/externals/vcpkg/ports/libopensp/windows_cmake_build.diff @@ -0,0 +1,142 @@ +diff -Nru -x '*~' OpenSP-1.5.2.orig/CMakeLists.txt OpenSP-1.5.2/CMakeLists.txt +--- OpenSP-1.5.2.orig/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200 ++++ OpenSP-1.5.2/CMakeLists.txt 2014-08-24 17:23:19.941495700 +0300 +@@ -0,0 +1,24 @@ ++project(opensp) ++ ++set (VERSION_MAJOR 1) ++set (VERSION_MINOR 5) ++set (VERSION_PATH 2) ++ ++cmake_minimum_required(VERSION 2.6) ++ ++include_directories( ++ . ++ include ++ generic ++) ++ ++file(GLOB SRC_SOURCES lib/*.cxx) ++file(GLOB libopensp_HEADERS config.h generic/*.h include/*.h) ++ ++add_library(opensp ${SRC_SOURCES}) ++set_target_properties(opensp PROPERTIES OUTPUT_NAME "osp") ++target_link_libraries(opensp) ++ ++install(TARGETS opensp RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) ++install(FILES ${libopensp_HEADERS} DESTINATION include/opensp) ++ +diff -Nru -x '*~' OpenSP-1.5.2.orig/config.h OpenSP-1.5.2/config.h +--- OpenSP-1.5.2.orig/config.h 2005-12-23 16:16:30.000000000 +0200 ++++ OpenSP-1.5.2/config.h 2014-08-24 17:26:33.724698900 +0300 +@@ -26,6 +26,12 @@ + #endif + #endif /* __GNUG__ */ + ++#ifdef __MINGW32__ ++#define SP_HAVE_BOOL ++#define SP_HAVE_TYPENAME ++#define SP_DEFINE_TEMPLATES ++#endif /* __MINGW32__ */ ++ + #if defined(sun) || defined(__sun) + // struct stat has st_blksize member + #define SP_STAT_BLKSIZE +@@ -80,6 +86,11 @@ + #define SP_HAVE_TYPENAME + #endif + ++#if _MSC_VER >=1800 ++// Visual Studio 2013 ++#define SP_ANSI_FOR_SCOPE ++#endif ++ + #define SP_HAVE_SETMODE + #define SP_DLLEXPORT __declspec(dllexport) + #define SP_DLLIMPORT __declspec(dllimport) +@@ -301,15 +312,8 @@ + #define PATH_SEPARATOR ':' + #endif + +- +-/* new stuff */ +- +-#ifndef HAVE_MUTABLE +-#define mutable +-#endif +- + // NOTE: This is processed as a Makefile, not as a header by autoconf. +-#define SP_PACKAGE "OpenSP" +-#define SP_VERSION "1.5.2" ++#define SP_PACKAGE "@PACKAGE@" ++#define SP_VERSION "@VERSION@" + + #endif /* not config_INCLUDED */ +diff -Nru -x '*~' OpenSP-1.5.2.orig/generic/SGMLApplication.h OpenSP-1.5.2/generic/SGMLApplication.h +--- OpenSP-1.5.2.orig/generic/SGMLApplication.h 2005-05-14 12:17:41.000000000 +0300 ++++ OpenSP-1.5.2/generic/SGMLApplication.h 2014-08-24 17:23:19.957120700 +0300 +@@ -269,6 +269,7 @@ + unsigned count_; + friend class OpenEntityPtr; + }; ++ SGMLApplication(); + virtual ~SGMLApplication(); + virtual void appinfo(const AppinfoEvent &); + virtual void startDtd(const StartDtdEvent &); +diff -Nru -x '*~' OpenSP-1.5.2.orig/include/OutputCharStream.h OpenSP-1.5.2/include/OutputCharStream.h +--- OpenSP-1.5.2.orig/include/OutputCharStream.h 2005-07-21 17:04:39.000000000 +0300 ++++ OpenSP-1.5.2/include/OutputCharStream.h 2014-08-24 17:23:19.957120700 +0300 +@@ -31,6 +31,7 @@ + OutputCharStream &operator<<(const char *); + OutputCharStream &operator<<(const StringC &); + OutputCharStream &operator<<(unsigned long); ++ OutputCharStream &operator<<(unsigned long long); + OutputCharStream &operator<<(int); + OutputCharStream &operator<<(Newline); + private: +diff -Nru -x '*~' OpenSP-1.5.2.orig/lib/MessageReporter.cxx OpenSP-1.5.2/lib/MessageReporter.cxx +--- OpenSP-1.5.2.orig/lib/MessageReporter.cxx 2005-07-21 17:05:17.000000000 +0300 ++++ OpenSP-1.5.2/lib/MessageReporter.cxx 2014-08-24 17:23:19.957120700 +0300 +@@ -123,7 +123,11 @@ + os() << ':'; + } + if (options_ & messageNumbers) ++#ifdef _WIN64 ++ os() << (unsigned long long)message.type->module() << "." ++#else + os() << (unsigned long)message.type->module() << "." ++#endif + << (unsigned long)message.type->number() << ":"; + switch (message.type->severity()) { + case MessageType::info: +diff -Nru -x '*~' OpenSP-1.5.2.orig/lib/OutputCharStream.cxx OpenSP-1.5.2/lib/OutputCharStream.cxx +--- OpenSP-1.5.2.orig/lib/OutputCharStream.cxx 2005-07-21 17:05:17.000000000 +0300 ++++ OpenSP-1.5.2/lib/OutputCharStream.cxx 2014-08-24 17:23:19.957120700 +0300 +@@ -61,6 +61,13 @@ + return *this << buf; + } + ++OutputCharStream &OutputCharStream::operator<<(unsigned long long n) ++{ ++ char buf[sizeof(unsigned long long)*3 + 1]; ++ sprintf(buf, "%I64u", n); ++ return *this << buf; ++} ++ + OutputCharStream &OutputCharStream::operator<<(int n) + { + char buf[sizeof(int)*3 + 2]; +diff -Nru -x '*~' OpenSP-1.5.2.orig/lib/SGMLApplication.cxx OpenSP-1.5.2/lib/SGMLApplication.cxx +--- OpenSP-1.5.2.orig/lib/SGMLApplication.cxx 2005-07-21 17:05:18.000000000 +0300 ++++ OpenSP-1.5.2/lib/SGMLApplication.cxx 2014-08-24 17:23:19.972745700 +0300 +@@ -9,6 +9,10 @@ + #include "Boolean.h" + #include "SGMLApplication.h" + ++SGMLApplication::SGMLApplication() ++{ ++} ++ + SGMLApplication::~SGMLApplication() + { + } diff --git a/externals/vcpkg/ports/libopusenc/CMakeLists.txt b/externals/vcpkg/ports/libopusenc/CMakeLists.txt new file mode 100755 index 000000000..442d19a6d --- /dev/null +++ b/externals/vcpkg/ports/libopusenc/CMakeLists.txt @@ -0,0 +1,41 @@ +cmake_minimum_required(VERSION 3.4) +project(libopusenc C) + +if(MSVC) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4267 /wd4244 /wd4996 /wd4101 /wd4018") +endif() + +find_path(OPUS_INCLUDE_DIR opus.h PATH_SUFFIXES opus) +find_library(OPUS_LIBRARY opus) + +add_library(opusenc + src/ogg_packer.c + src/opus_header.c + src/opusenc.c + src/picture.c + src/resample.c + src/unicode_support.c) + +get_filename_component(FOLDER ${CMAKE_CURRENT_SOURCE_DIR} NAME) +string(REPLACE "libopusenc-" "" VERSION ${FOLDER}) + +target_compile_definitions(opusenc PRIVATE + RANDOM_PREFIX=libopusenc + OUTSIDE_SPEEX + FLOATING_POINT + PACKAGE_VERSION="${VERSION}" + PACKAGE_NAME="libopusenc" + OPE_BUILD) +set_target_properties(opusenc PROPERTIES DEFINE_SYMBOL DLL_EXPORT) +target_include_directories(opusenc PRIVATE include ${OPUS_INCLUDE_DIR}) +target_link_libraries(opusenc PRIVATE ${OPUS_LIBRARY}) + +install(TARGETS opusenc + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + +if(NOT OPUSENC_SKIP_HEADERS) + install(FILES include/opusenc.h + DESTINATION include/opus) +endif() diff --git a/externals/vcpkg/ports/libopusenc/portfile.cmake b/externals/vcpkg/ports/libopusenc/portfile.cmake new file mode 100755 index 000000000..7a4eacee4 --- /dev/null +++ b/externals/vcpkg/ports/libopusenc/portfile.cmake @@ -0,0 +1,28 @@ +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) + message(FATAL_ERROR "UWP builds not supported") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xiph/libopusenc + REF v0.2.1 + SHA512 9681421a967b93770796dd3503c00e1418de86438d2bfe77011dc68f6db5d666508d33c0df7308db3b7ea18f5e1b14a3115fd63837987e16347ec801c3771d26 + HEAD_REF master) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DOPUSENC_SKIP_HEADERS=ON) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +# make includes work with MSBuild integration +file(READ ${CURRENT_PACKAGES_DIR}/include/opus/opusenc.h OPUSENC_H) + string(REPLACE "#include " "#include \"opus.h\"" OPUSENC_H "${OPUSENC_H}") +file(WRITE ${CURRENT_PACKAGES_DIR}/include/opus/opusenc.h "${OPUSENC_H}") + +file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libopusenc) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/libopusenc/COPYING ${CURRENT_PACKAGES_DIR}/share/libopusenc/copyright) diff --git a/externals/vcpkg/ports/libopusenc/vcpkg.json b/externals/vcpkg/ports/libopusenc/vcpkg.json new file mode 100755 index 000000000..0ce806c81 --- /dev/null +++ b/externals/vcpkg/ports/libopusenc/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libopusenc", + "version-string": "0.2.1", + "port-version": 1, + "description": "Library for encoding .opus audio files and live streams.", + "homepage": "https://github.com/xiph/libopusenc", + "supports": "!uwp", + "dependencies": [ + "opus" + ] +} diff --git a/externals/vcpkg/ports/libosip2/fix-path-in-project.patch b/externals/vcpkg/ports/libosip2/fix-path-in-project.patch new file mode 100755 index 000000000..807a0b975 --- /dev/null +++ b/externals/vcpkg/ports/libosip2/fix-path-in-project.patch @@ -0,0 +1,304 @@ +diff --git a/platform/vsnet/osip2.vcxproj b/platform/vsnet/osip2.vcxproj +index b13cbe9..40b8e23 100644 +--- a/platform/vsnet/osip2.vcxproj ++++ b/platform/vsnet/osip2.vcxproj +@@ -79,7 +79,7 @@ + + + Disabled +- ..\..\..\osip\include;%(AdditionalIncludeDirectories) ++ ..\..\include;%(AdditionalIncludeDirectories) + ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks +@@ -97,7 +97,7 @@ + + + Disabled +- ..\..\..\osip\include;%(AdditionalIncludeDirectories) ++ ..\..\include;%(AdditionalIncludeDirectories) + ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +@@ -113,7 +113,7 @@ + + + +- ..\..\..\osip\include;%(AdditionalIncludeDirectories) ++ ..\..\include;%(AdditionalIncludeDirectories) + ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + +@@ -129,7 +129,7 @@ + + + +- ..\..\..\osip\include;%(AdditionalIncludeDirectories) ++ ..\..\include;%(AdditionalIncludeDirectories) + ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + +@@ -144,37 +144,37 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ + + +- ++ + {44f46b7e-0e51-4304-9735-330dfbab41e5} + false + +diff --git a/platform/vsnet/osipparser2.vcxproj b/platform/vsnet/osipparser2.vcxproj +index 6c73222..bda0fe5 100644 +--- a/platform/vsnet/osipparser2.vcxproj ++++ b/platform/vsnet/osipparser2.vcxproj +@@ -79,7 +79,7 @@ + + + Disabled +- ..\..\..\osip\include;%(AdditionalIncludeDirectories) ++ ..\..\include;%(AdditionalIncludeDirectories) + ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks +@@ -97,7 +97,7 @@ + + + Disabled +- ..\..\..\osip\include;%(AdditionalIncludeDirectories) ++ ..\..\include;%(AdditionalIncludeDirectories) + ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +@@ -113,7 +113,7 @@ + + + +- ..\..\..\osip\include;%(AdditionalIncludeDirectories) ++ ..\..\include;%(AdditionalIncludeDirectories) + ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + +@@ -129,7 +129,7 @@ + + + +- ..\..\..\osip\include;%(AdditionalIncludeDirectories) ++ ..\..\include;%(AdditionalIncludeDirectories) + ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + +@@ -144,83 +144,83 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + diff --git a/externals/vcpkg/ports/libosip2/portfile.cmake b/externals/vcpkg/ports/libosip2/portfile.cmake new file mode 100755 index 000000000..e289d493b --- /dev/null +++ b/externals/vcpkg/ports/libosip2/portfile.cmake @@ -0,0 +1,57 @@ +set(LIBOSIP2_VER "5.2.0") + +vcpkg_download_distfile(ARCHIVE + URLS "https://ftp.gnu.org/gnu/osip/libosip2-${LIBOSIP2_VER}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/osip/libosip2-${LIBOSIP2_VER}.tar.gz" + FILENAME "libosip2-${LIBOSIP2_VER}.tar.gz" + SHA512 cc714ab5669c466ee8f0de78cf74a8b7633f3089bf104c9c1474326840db3d791270159456f9deb877af2df346b04493e8f796b2bb7d2be134f6c08b25a29f83 +) + +set(PATCHES) +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND PATCHES fix-path-in-project.patch) +endif() + +vcpkg_extract_source_archive_ex( + ARCHIVE "${ARCHIVE}" + OUT_SOURCE_PATH SOURCE_PATH + PATCHES ${PATCHES} +) + +if(VCPKG_TARGET_IS_WINDOWS) + # Use /Z7 rather than /Zi to avoid "fatal error C1090: PDB API call failed, error code '23': (0x00000006)" + foreach(VCXPROJ IN ITEMS + "${SOURCE_PATH}/platform/vsnet/osip2.vcxproj" + "${SOURCE_PATH}/platform/vsnet/osipparser2.vcxproj") + vcpkg_replace_string( + "${VCXPROJ}" + "ProgramDatabase" + "OldStyle" + ) + endforeach() + + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "platform/vsnet/osip2.vcxproj" + INCLUDES_SUBPATH include + USE_VCPKG_INTEGRATION + REMOVE_ROOT_INCLUDES + ) + + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "platform/vsnet/osipparser2.vcxproj" + USE_VCPKG_INTEGRATION + ) + +elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) + vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}") + vcpkg_install_make() + vcpkg_fixup_pkgconfig() + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libosip2/vcpkg.json b/externals/vcpkg/ports/libosip2/vcpkg.json new file mode 100755 index 000000000..a524d3460 --- /dev/null +++ b/externals/vcpkg/ports/libosip2/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libosip2", + "version": "5.2.0", + "port-version": 2, + "description": "oSIP is an LGPL implementation of SIP. It's stable, portable, flexible and compliant! -may be more-! It is used mostly with eXosip2 stack (GPL) which provides simpler API for User-Agent implementation.", + "homepage": "https://www.gnu.org/software/osip/", + "supports": "!(windows & arm)", + "dependencies": [ + "pthread" + ] +} diff --git a/externals/vcpkg/ports/libosmium/portfile.cmake b/externals/vcpkg/ports/libosmium/portfile.cmake new file mode 100755 index 000000000..f764134df --- /dev/null +++ b/externals/vcpkg/ports/libosmium/portfile.cmake @@ -0,0 +1,22 @@ +# header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO osmcode/libosmium + REF v2.17.1 + SHA512 08d1eb272b82364118b97213310e5d62fdbb071cfad74989bdc5bb25f9e14b067d53016d19bfed3972d3385343fc74edf86407860be83c59e74902cd1f26bb33 +) +set(BOOST_ROOT "${CURRENT_INSTALLED_DIR}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DBUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") \ No newline at end of file diff --git a/externals/vcpkg/ports/libosmium/vcpkg.json b/externals/vcpkg/ports/libosmium/vcpkg.json new file mode 100755 index 000000000..ffd7c5861 --- /dev/null +++ b/externals/vcpkg/ports/libosmium/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "libosmium", + "version-semver": "2.17.1", + "port-version": 1, + "description": "A fast and flexible C++ library for working with OpenStreetMap data", + "homepage": "https://osmcode.org/libosmium/", + "license": "BSL-1.0", + "dependencies": [ + "boost", + "bzip2", + "expat", + "proj", + "protozero", + "utfcpp", + { + "name": "vcpkg-cmake", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/libosmscout/portfile.cmake b/externals/vcpkg/ports/libosmscout/portfile.cmake new file mode 100755 index 000000000..20125753c --- /dev/null +++ b/externals/vcpkg/ports/libosmscout/portfile.cmake @@ -0,0 +1,49 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Framstag/libosmscout + REF c81e1d9a0f69cc5b93588dbe330b2af587162c5f + SHA512 d6ddbc49dd40b1f938ae2cd1ea9342cab0a52db46bf7ed6716111a91d0a38acba12ff2e273d457db51fc240d578a5b849af77b53e600482cf52c3b22306f8c45 + HEAD_REF master +) + +if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + cairo OSMDCOUT_BUILD_MAP_CAIRO + directx OSMDCOUT_BUILD_MAP_DIRECTX + gdi OSMDCOUT_BUILD_MAP_GDI + svg OSMDCOUT_BUILD_MAP_SVG + ) +else() + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + cairo OSMDCOUT_BUILD_MAP_CAIRO + svg OSMDCOUT_BUILD_MAP_SVG + ) + list(APPEND FEATURE_OPTIONS -DOSMDCOUT_BUILD_MAP_DIRECTX=OFF -DOSMDCOUT_BUILD_MAP_GDI=OFF) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DOSMSCOUT_BUILD_DEMOS=OFF + -DOSMSCOUT_BUILD_TOOL_DUMPDATA=OFF + -DOSMSCOUT_BUILD_TOOL_IMPORT=ON + -DOSMSCOUT_BUILD_TOOL_OSMSCOUT2=OFF + -DOSMSCOUT_BUILD_TOOL_OSMSCOUTOPENGL=OFF + -DOSMSCOUT_BUILD_TOOL_PUBLICTRANSPORTMAP=OFF + -DOSMSCOUT_BUILD_TOOL_STYLEEDITOR=OFF + -DOSMSCOUT_BUILD_EXTERN_MATLAB=OFF + -DOSMSCOUT_BUILD_TESTS=OFF + -DOSMDCOUT_BUILD_MAP_QT=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_install_cmake() +vcpkg_copy_tools(TOOL_NAMES Import AUTO_CLEAN) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/libosmscout) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/BasemapImport.exe") +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/BasemapImport.exe") diff --git a/externals/vcpkg/ports/libosmscout/vcpkg.json b/externals/vcpkg/ports/libosmscout/vcpkg.json new file mode 100755 index 000000000..7a80efed0 --- /dev/null +++ b/externals/vcpkg/ports/libosmscout/vcpkg.json @@ -0,0 +1,41 @@ +{ + "name": "libosmscout", + "version-string": "1.1.1", + "description": "libosmscout offers applications simple, high-level interfaces for offline location and POI lokup, rendering and routing functionalities based on OpenStreetMap (OSM) data.", + "homepage": "http://libosmscout.sourceforge.net/", + "documentation": "http://libosmscout.sourceforge.net/documentation/", + "supports": "!uwp & !arm & !arm64 & !static & !wasm32 & !emscripten", + "dependencies": [ + "libiconv", + "liblzma", + "libxml2", + "protobuf", + "zlib" + ], + "features": { + "cairo": { + "description": "Cairo backend renderer", + "dependencies": [ + "cairo", + "freetype", + "harfbuzz", + "libpng", + "pango" + ] + }, + "directx": { + "description": "Direct2D backend renderer" + }, + "gdi": { + "description": "GDI+ backend renderer" + }, + "svg": { + "description": "SVG backend renderer", + "dependencies": [ + "freetype", + "harfbuzz", + "pango" + ] + } + } +} diff --git a/externals/vcpkg/ports/libp7-baical/portfile.cmake b/externals/vcpkg/ports/libp7-baical/portfile.cmake new file mode 100755 index 000000000..6320a2825 --- /dev/null +++ b/externals/vcpkg/ports/libp7-baical/portfile.cmake @@ -0,0 +1,2 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +message(WARNING "libp7-baical has been replaced by libp7client.") diff --git a/externals/vcpkg/ports/libp7-baical/vcpkg.json b/externals/vcpkg/ports/libp7-baical/vcpkg.json new file mode 100755 index 000000000..b599fd070 --- /dev/null +++ b/externals/vcpkg/ports/libp7-baical/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "libp7-baical", + "version-string": "replaced", + "port-version": 1, + "description": "An old name for the port libp7client; please install libp7client instead.", + "dependencies": [ + "libp7client" + ] +} diff --git a/externals/vcpkg/ports/libp7client/CMakeLists.txt b/externals/vcpkg/ports/libp7client/CMakeLists.txt new file mode 100755 index 000000000..f2eb53af3 --- /dev/null +++ b/externals/vcpkg/ports/libp7client/CMakeLists.txt @@ -0,0 +1,46 @@ +project(P7) +cmake_minimum_required(VERSION 3.18) + +add_library(P7 + "Sources/ClBaical.cpp" + "Sources/ClFile.cpp" + "Sources/Client.cpp" + "Sources/ClNull.cpp" + "Sources/ClText.cpp" + "Sources/CRC32.cpp" + "Sources/Proxy.cpp" + "Sources/Telemetry.cpp" + "Sources/Trace.cpp") + +target_include_directories(P7 PRIVATE "Headers/") +target_include_directories(P7 PRIVATE "Shared/") +if(WIN32) + target_include_directories(P7 PRIVATE "Shared/Platforms/Windows_x86/") + target_link_libraries(P7 "ws2_32") +else() + target_include_directories(P7 PRIVATE "Shared/Platforms/Linux_x86/") +endif() + +if(WIN32) + set_target_properties(P7 PROPERTIES PREFIX "") + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set_target_properties(P7 PROPERTIES DEBUG_POSTFIX "x64d") + set_target_properties(P7 PROPERTIES RELEASE_POSTFIX "x64") + else() + set_target_properties(P7 PROPERTIES DEBUG_POSTFIX "x32d") + set_target_properties(P7 PROPERTIES RELEASE_POSTFIX "x32") + endif() +else() + set_target_properties(P7 PROPERTIES PREFIX "lib") + set_target_properties(P7 PROPERTIES POSTFIX "") + set_target_properties(P7 PROPERTIES DEBUG_POSTFIX "d") +endif() + +install(TARGETS P7 + RUNTIME DESTINATION "bin" + ARCHIVE DESTINATION "lib" + LIBRARY DESTINATION "lib") + +install(DIRECTORY Headers/ + DESTINATION include/P7 + FILES_MATCHING PATTERN "*.h") diff --git a/externals/vcpkg/ports/libp7client/portfile.cmake b/externals/vcpkg/ports/libp7client/portfile.cmake new file mode 100755 index 000000000..95809babf --- /dev/null +++ b/externals/vcpkg/ports/libp7client/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_download_distfile(ARCHIVE + URLS http://baical.net/files/libP7Client_v5.6.zip + FILENAME libP7Client_v5.6.zip + SHA512 992256854b717a45ae9e11ed16aa27b8b054de97718f027664634597d756aa26fe10dcad765cde7695802c90def46461abbcbfde81923fdd40ea2b659e1a8240 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + NO_REMOVE_ONE_LEVEL +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libp7client/vcpkg.json b/externals/vcpkg/ports/libp7client/vcpkg.json new file mode 100755 index 000000000..d5a77d32f --- /dev/null +++ b/externals/vcpkg/ports/libp7client/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libp7client", + "version-string": "5.6", + "port-version": 2, + "description": "Open source, cross-platform, fastest library for sending logs, telemetry & trace data from your application.", + "homepage": "https://baical.net/", + "supports": "!(arm | uwp | osx)" +} diff --git a/externals/vcpkg/ports/libpcap/add-disable-packet-option.patch b/externals/vcpkg/ports/libpcap/add-disable-packet-option.patch new file mode 100755 index 000000000..9d89a5505 --- /dev/null +++ b/externals/vcpkg/ports/libpcap/add-disable-packet-option.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2f675d1..e9d6d96 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -244,6 +244,7 @@ set(SEPTEL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../septel" CACHE PATH "Path to dire + option(DISABLE_SNF "Disable Myricom SNF support" OFF) + + option(DISABLE_TC "Disable Riverbed TurboCap support" OFF) ++option(DISABLE_PACKET "Disable Packet support" OFF) + + # + # Debugging options. +@@ -302,7 +303,7 @@ if(WIN32) + if(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/../../Common) + include_directories(${CMAKE_HOME_DIRECTORY}/../../Common) + endif(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/../../Common) +- ++ if(NOT DISABLE_PACKET) + find_package(Packet) + if(PACKET_FOUND) + set(HAVE_PACKET32 TRUE) +@@ -317,7 +318,8 @@ if(WIN32) + check_function_exists(PacketGetTimestampModes HAVE_PACKET_GET_TIMESTAMP_MODES) + cmake_pop_check_state() + endif(PACKET_FOUND) +- ++ endif() ++ + message(STATUS "checking for Npcap's version.h") + check_symbol_exists(WINPCAP_PRODUCT_NAME "${CMAKE_SOURCE_DIR}/../../version.h" HAVE_VERSION_H) + if(HAVE_VERSION_H) diff --git a/externals/vcpkg/ports/libpcap/install-pc-on-msvc.patch b/externals/vcpkg/ports/libpcap/install-pc-on-msvc.patch new file mode 100755 index 000000000..6dd18f202 --- /dev/null +++ b/externals/vcpkg/ports/libpcap/install-pc-on-msvc.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b83fbbd..2f675d1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2678,9 +2678,12 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap.h DESTINATION include) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap-bpf.h DESTINATION include) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap-namedb.h DESTINATION include) + +-# On UN*X, and on Windows when not using MSVC, generate libpcap.pc and +-# pcap-config and process man pages and arrange that they be installed. +-if(NOT MSVC) ++# Generate libpcap.pc ++if(BUILD_SHARED_LIBS) ++ set(PACKAGE_NAME ${LIBRARY_NAME}) ++else() ++ set(PACKAGE_NAME pcap) ++endif() + set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix "\${prefix}") + set(includedir "\${prefix}/include") +@@ -2715,10 +2718,14 @@ if(NOT MSVC) + foreach(LIB ${PCAP_LINK_LIBRARIES}) + set(LIBS "${LIBS} -l${LIB}") + endforeach(LIB) +- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pcap-config.in ${CMAKE_CURRENT_BINARY_DIR}/pcap-config @ONLY) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpcap.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc @ONLY) +- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pcap-config DESTINATION bin) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc DESTINATION lib/pkgconfig) ++ ++# On UN*X, and on Windows when not using MSVC, generate libpcap.pc and ++# pcap-config and process man pages and arrange that they be installed. ++if(NOT MSVC) ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pcap-config.in ${CMAKE_CURRENT_BINARY_DIR}/pcap-config @ONLY) ++ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pcap-config DESTINATION bin) + + # + # Man pages. diff --git a/externals/vcpkg/ports/libpcap/portfile.cmake b/externals/vcpkg/ports/libpcap/portfile.cmake new file mode 100755 index 000000000..4d1823bcb --- /dev/null +++ b/externals/vcpkg/ports/libpcap/portfile.cmake @@ -0,0 +1,80 @@ +if(EXISTS "${CURRENT_INSTALLED_DIR}/share/winpcap") + message(FATAL_ERROR "FATAL ERROR: winpcap and libpcap are incompatible.") +endif() + +if(VCPKG_TARGET_IS_LINUX) + message( +"libpcap currently requires the following libraries from the system package manager: + flex + libbison-dev +These can be installed on Ubuntu systems via sudo apt install flex libbison-dev" + ) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO the-tcpdump-group/libpcap + REF c7642e2cc0c5bd65754685b160d25dc23c76c6bd #1.10.1 + SHA512 ed46095863aaee79ca2833d26438f6c837cc3e64acb73efd5a388a11ff7d0d1245d23e5404070a9f2c2c77840c93c09328746761e4481e9a530593a5cbf2ad6f + HEAD_REF master + PATCHES + install-pc-on-msvc.patch + add-disable-packet-option.patch +) + +vcpkg_find_acquire_program(BISON) +get_filename_component(BISON_PATH ${BISON} DIRECTORY) +vcpkg_add_to_path(${BISON_PATH}) +vcpkg_find_acquire_program(FLEX) +get_filename_component(FLEX_PATH ${FLEX} DIRECTORY) +vcpkg_add_to_path(${FLEX_PATH}) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RT) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DDISABLE_NETMAP=ON + -DDISABLE_BLUETOOTH=ON + -DDISABLE_DBUS=ON + -DDISABLE_RDMA=ON + -DDISABLE_DAG=ON + -DDISABLE_SEPTEL=ON + -DDISABLE_SNF=ON + -DDISABLE_TC=ON + -DDISABLE_PACKET=ON + -DENABLE_REMOTE=OFF + -DUSE_STATIC_RT=${USE_STATIC_RT} +) + +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# On Windows 64-bit, libpcap 1.10.1 installs the libraries in a x64 subdirectory of the usual directories +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(libsubdir "x64") + file(GLOB_RECURSE FILES_TO_MOVE "${CURRENT_PACKAGES_DIR}/lib/${libsubdir}/*") + file(COPY ${FILES_TO_MOVE} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(GLOB_RECURSE FILES_TO_MOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${libsubdir}/*") + file(COPY ${FILES_TO_MOVE} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(GLOB_RECURSE FILES_TO_MOVE "${CURRENT_PACKAGES_DIR}/bin/${libsubdir}/*") + file(COPY ${FILES_TO_MOVE} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(GLOB_RECURSE FILES_TO_MOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${libsubdir}/*") + file(COPY ${FILES_TO_MOVE} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/${libsubdir}" + "${CURRENT_PACKAGES_DIR}/debug/lib/${libsubdir}" + "${CURRENT_PACKAGES_DIR}/bin/${libsubdir}" + "${CURRENT_PACKAGES_DIR}/debug/bin/${libsubdir}") +endif() + +# Even if compiled with BUILD_SHARED_LIBS=ON, pcap also install a pcap_static library +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pcap_static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/pcap_static.lib") +endif() + +vcpkg_fixup_pkgconfig() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/man") diff --git a/externals/vcpkg/ports/libpcap/vcpkg.json b/externals/vcpkg/ports/libpcap/vcpkg.json new file mode 100755 index 000000000..166a8ce90 --- /dev/null +++ b/externals/vcpkg/ports/libpcap/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libpcap", + "version-semver": "1.10.1", + "port-version": 1, + "description": "A portable C/C++ library for network traffic capture", + "homepage": "https://www.tcpdump.org/", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libpff/CMakeLists.txt b/externals/vcpkg/ports/libpff/CMakeLists.txt new file mode 100755 index 000000000..44317432d --- /dev/null +++ b/externals/vcpkg/ports/libpff/CMakeLists.txt @@ -0,0 +1,81 @@ +cmake_minimum_required(VERSION 3.12) + +project(libpff C) + +find_package(ZLIB REQUIRED) + +if(MSVC) + add_compile_definitions(_CRT_SECURE_NO_DEPRECATE) + add_compile_definitions(_CRT_NONSTDC_NO_DEPRECATE) +endif() + +add_compile_definitions(HAVE_LOCAL_LIBCERROR) +add_compile_definitions(HAVE_LOCAL_LIBCTHREADS) +add_compile_definitions(HAVE_LOCAL_LIBCDATA) +add_compile_definitions(HAVE_LOCAL_LIBCLOCALE) +add_compile_definitions(HAVE_LOCAL_LIBCNOTIFY) +add_compile_definitions(HAVE_LOCAL_LIBCSPLIT) +add_compile_definitions(HAVE_LOCAL_LIBCFILE) +add_compile_definitions(HAVE_LOCAL_LIBCPATH) +add_compile_definitions(HAVE_LOCAL_LIBUNA) +add_compile_definitions(HAVE_LOCAL_LIBBFIO) +add_compile_definitions(HAVE_LOCAL_LIBFCACHE) +add_compile_definitions(HAVE_LOCAL_LIBFDATA) +add_compile_definitions(HAVE_LOCAL_LIBFDATETIME) +add_compile_definitions(HAVE_LOCAL_LIBFGUID) +add_compile_definitions(HAVE_LOCAL_LIBFWNT) +add_compile_definitions(HAVE_LOCAL_LIBFMAPI) +add_compile_definitions(HAVE_LOCAL_LIBFVALUE) +add_compile_definitions(ZLIB_DLL) + +add_compile_definitions(LIBPFF_DLL_EXPORT) + +if(MSVC) + set(LIB_RC libpff/libpff.rc) +endif() + + +include(GNUInstallDirs) +include(CMakePackageConfigHelpers) + +# Add CMake find_package() integration +set(PROJECT_TARGET_NAME "unofficial-${PROJECT_NAME}") +set(CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") +set(PROJECT_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/generated/${PROJECT_TARGET_NAME}Config.cmake") +set(TARGETS_EXPORT_NAME "${PROJECT_TARGET_NAME}Targets") +set(NAMESPACE "unofficial-libpff::") + +# Source files +file(GLOB LIB_SRC lib*/*.c) + +# Headers +file(GLOB LIB_INST_HEADERS include/libpff/*.h) + +add_library(${PROJECT_NAME} ${LIB_SRC} ${LIB_RC}) + +target_include_directories(${PROJECT_NAME} PRIVATE ./include ./common) +target_include_directories(${PROJECT_NAME} PRIVATE ./libbfio ./libcdata ./libcerror ./libcfile ./libclocale ./libcnotify) +target_include_directories(${PROJECT_NAME} PRIVATE ./libcpath ./libcsplit ./libcthreads ./libfcache ./libfdata ./libfdatetime) +target_include_directories(${PROJECT_NAME} PRIVATE ./libfguid ./libfmapi ./libfvalue ./libfwnt ./libuna) + +target_link_libraries(${PROJECT_NAME} PRIVATE ZLIB::ZLIB) + +install(TARGETS ${PROJECT_NAME} + EXPORT ${TARGETS_EXPORT_NAME} + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + INCLUDES DESTINATION include) + +install(FILES ${LIB_INST_HEADERS} DESTINATION include/libpff) +install(FILES include/libpff.h DESTINATION include) + + +# Generate and install unofficial-libpffConfig.cmake +configure_package_config_file("Config.cmake.in" "${PROJECT_CONFIG}" INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}") +install(FILES "${PROJECT_CONFIG}" DESTINATION "${CONFIG_INSTALL_DIR}") + +# Generate and install unofficial-libpffTargets*.cmake +install(EXPORT ${TARGETS_EXPORT_NAME} + NAMESPACE ${NAMESPACE} + DESTINATION "${CONFIG_INSTALL_DIR}") diff --git a/externals/vcpkg/ports/libpff/Config.cmake.in b/externals/vcpkg/ports/libpff/Config.cmake.in new file mode 100755 index 000000000..bd6bd4532 --- /dev/null +++ b/externals/vcpkg/ports/libpff/Config.cmake.in @@ -0,0 +1,4 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") +check_required_components("@PROJECT_NAME@") diff --git a/externals/vcpkg/ports/libpff/portfile.cmake b/externals/vcpkg/ports/libpff/portfile.cmake new file mode 100755 index 000000000..00be14f66 --- /dev/null +++ b/externals/vcpkg/ports/libpff/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +set(LIB_VERSION 20180714) +set(LIB_FILENAME libpff-experimental-${LIB_VERSION}.tar.gz) + +# Release distribution file contains configured sources, while the source code in the repository does not. +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/libyal/libpff/releases/download/${LIB_VERSION}/${LIB_FILENAME}" + FILENAME "${LIB_FILENAME}" + SHA512 7207ba87607ea2fd4609a081c2f4b061344a783e188605e88df99fd473f2a8da1269b065e57b054f4622888d40aa8f2b8272dc4748334ddfe358b28d443d6ad1 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${LIB_VERSION} +) + + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libpff PACKAGE_NAME unofficial-libpff) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libpff/vcpkg.json b/externals/vcpkg/ports/libpff/vcpkg.json new file mode 100755 index 000000000..b8eaba407 --- /dev/null +++ b/externals/vcpkg/ports/libpff/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "libpff", + "version-date": "2018-07-14", + "port-version": 3, + "description": "Library and tools to access the Personal Folder File (PFF) and the Offline Folder File (OFF) format.", + "homepage": "https://github.com/libyal/libpff", + "license": "LGPL-3.0", + "supports": "windows & !(static & windows) & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/libplist/CMakeLists.txt b/externals/vcpkg/ports/libplist/CMakeLists.txt new file mode 100755 index 000000000..9feb69746 --- /dev/null +++ b/externals/vcpkg/ports/libplist/CMakeLists.txt @@ -0,0 +1,75 @@ +cmake_minimum_required(VERSION 3.8) +project(plist C CXX) + +file(GLOB_RECURSE PLIST_HEADER include/plist/*.h) + +set(PLIST_SRC + src/base64.c + src/bytearray.c + src/hashtable.c + src/ptrarray.c + src/time64.c + src/xplist.c + src/bplist.c + src/plist.c +) + +set(PLISTPP_SRC + src/Node.cpp + src/Structure.cpp + src/Array.cpp + src/Boolean.cpp + src/Data.cpp + src/Date.cpp + src/Dictionary.cpp + src/Integer.cpp + src/Key.cpp + src/Real.cpp + src/String.cpp + src/Uid.cpp +) + +file(GLOB_RECURSE LIBCNARY_HEADER libcnary/include/*.h) +file(GLOB_RECURSE LIBCNARY_SRC libcnary/*c) + +add_library(plist ${PLIST_SRC} ${PLIST_HEADER} ${LIBCNARY_SRC} ${LIBCNARY_HEADER}) +target_include_directories(plist PRIVATE src include libcnary/include) +set_target_properties(plist PROPERTIES OUTPUT_NAME plist-2.0) + +add_library(plist++ STATIC ${PLISTPP_SRC} ${PLIST_HEADER} ${LIBCNARY_SRC} ${LIBCNARY_HEADER}) +set_target_properties(plist++ PROPERTIES OUTPUT_NAME plist++-2.0) +target_include_directories(plist++ PRIVATE src include libcnary/include) + +if(WIN32 AND BUILD_SHARED_LIBS) + target_compile_options(plist PRIVATE -W3 -WX- -sdl-) + target_compile_definitions(plist PRIVATE -DLIBPLIST_EXPORTS) + target_compile_options(plist++ PRIVATE -W3 -WX- -sdl-) + target_compile_definitions(plist++ PRIVATE -DLIBPLIST_EXPORTS) +endif() +target_link_libraries(plist++ PRIVATE plist) + +install( + TARGETS plist plist++ + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) + +set(PACKAGE_NAME libplist) +set(PACKAGE_VERSION 2.0) +set(prefix ${CMAKE_INSTALL_PREFIX}) +set(exec_prefix \${prefix}) +set(libdir \${prefix}/lib) +set(includedir \${prefix}/../include) +foreach (PLIST_PKGCONFIG libplist-2.0.pc libplist++-2.0.pc) +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/src/${PLIST_PKGCONFIG}.in + ${CMAKE_CURRENT_BINARY_DIR}/${PLIST_PKGCONFIG} + @ONLY +) +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLIST_PKGCONFIG} + DESTINATION lib/pkgconfig) +endforeach() + +install(FILES ${PLIST_HEADER} DESTINATION include/plist) diff --git a/externals/vcpkg/ports/libplist/dllexport.patch b/externals/vcpkg/ports/libplist/dllexport.patch new file mode 100755 index 000000000..f5e006210 --- /dev/null +++ b/externals/vcpkg/ports/libplist/dllexport.patch @@ -0,0 +1,37 @@ +diff --git a/include/plist/plist.h b/include/plist/plist.h +index 2863c74..9cdb219 100644 +--- a/include/plist/plist.h ++++ b/include/plist/plist.h +@@ -42,7 +42,7 @@ extern "C" + #include + #endif + +-#ifdef _MSC_VER ++#if defined(_MSC_VER) && defined(LIBPLIST_EXPORTS) + #define PLIST_API_MSC __declspec( dllexport ) + #else + #define PLIST_API_MSC +diff --git a/src/plist.h b/src/plist.h +index 1e5d0d1..6690343 100644 +--- a/src/plist.h ++++ b/src/plist.h +@@ -39,10 +39,7 @@ + #include + #endif + +-#ifdef _MSC_VER +- #define PLIST_API __declspec( dllexport ) +-#else +-#ifdef WIN32 ++#if (defined(_MSC_VER) || defined(WIN32)) && defined(LIBPLIST_EXPORTS) + #define PLIST_API __declspec( dllexport ) + #else + #ifdef HAVE_FVISIBILITY +@@ -51,7 +48,6 @@ + #define PLIST_API + #endif + #endif +-#endif + + struct plist_data_s + { diff --git a/externals/vcpkg/ports/libplist/portfile.cmake b/externals/vcpkg/ports/libplist/portfile.cmake new file mode 100755 index 000000000..2cad077a6 --- /dev/null +++ b/externals/vcpkg/ports/libplist/portfile.cmake @@ -0,0 +1,47 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_CRT ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libimobiledevice-win32/libplist + REF bbba7cabb78aad180a7a982ada5e1f21ff0ba873 # v1.3.6 + SHA512 4cd59ed87c647259d0da99a20a05e01aa880f01f6b5cecd29e4247029a3d29f0f68b4552571eb3fd3c5549b4cb357801ffe43338b8ff34d44d6be5393d2e6b9d + HEAD_REF msvc-master + PATCHES dllexport.patch +) + +configure_file(${CURRENT_PORT_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +set(pcfile "libplist-2.0.pc") +set(pcfiletarget "libplist.pc") +set(basepath "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/") +if(EXISTS "${basepath}${pcfile}") + file(CREATE_LINK "${basepath}${pcfile}" "${basepath}${pcfiletarget}" COPY_ON_ERROR) +endif() +set(basepath "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/") +if(EXISTS "${basepath}${pcfile}") + file(CREATE_LINK "${basepath}${pcfile}" "${basepath}${pcfiletarget}" COPY_ON_ERROR) +endif() + +set(pcfile "libplist++-2.0.pc") +set(pcfiletarget "libplist++.pc") +set(basepath "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/") +if(EXISTS "${basepath}${pcfile}") + file(CREATE_LINK "${basepath}${pcfile}" "${basepath}${pcfiletarget}" COPY_ON_ERROR) +endif() +set(basepath "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/") +if(EXISTS "${basepath}${pcfile}") + file(CREATE_LINK "${basepath}${pcfile}" "${basepath}${pcfiletarget}" COPY_ON_ERROR) +endif() diff --git a/externals/vcpkg/ports/libplist/vcpkg.json b/externals/vcpkg/ports/libplist/vcpkg.json new file mode 100755 index 000000000..752fd8b26 --- /dev/null +++ b/externals/vcpkg/ports/libplist/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libplist", + "version": "1.3.6", + "port-version": 1, + "description": "A library to handle Apple Property List format in binary or XML", + "homepage": "https://libimobiledevice.org/" +} diff --git a/externals/vcpkg/ports/libpmemobj-cpp/fixlibpmemobj-cpp.patch b/externals/vcpkg/ports/libpmemobj-cpp/fixlibpmemobj-cpp.patch new file mode 100755 index 000000000..a589eae79 --- /dev/null +++ b/externals/vcpkg/ports/libpmemobj-cpp/fixlibpmemobj-cpp.patch @@ -0,0 +1,17 @@ +diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt +index bb29b8d..839a77f 100644 +--- a/benchmarks/CMakeLists.txt ++++ b/benchmarks/CMakeLists.txt +@@ -27,6 +27,12 @@ function(add_benchmark name) + prepend(srcs ${CMAKE_CURRENT_SOURCE_DIR} ${srcs}) + add_executable(benchmark-${name} ${srcs}) + target_link_libraries(benchmark-${name} ${LIBPMEMOBJ_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) ++ install( ++ TARGETS benchmark-${name} ++ RUNTIME DESTINATION tools ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++ ) + endfunction() + + add_check_whitespace(benchmarks-cmake ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt) diff --git a/externals/vcpkg/ports/libpmemobj-cpp/portfile.cmake b/externals/vcpkg/ports/libpmemobj-cpp/portfile.cmake new file mode 100755 index 000000000..35cfe1eb1 --- /dev/null +++ b/externals/vcpkg/ports/libpmemobj-cpp/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO pmem/libpmemobj-cpp + REF 9599f724d4edc3a3d973bac14eeebdc1bc31d327 #v1.13.0 + SHA512 ae1f8ed8aecdc35e9e78c957fcd154e43c7bcb5bf5cf3e5b23be3e95d21de754dbbd9b6549bd6c7991fad24492b08421df338c3706ab0157c31ebc88b65fa4fe + HEAD_REF master + PATCHES + fixlibpmemobj-cpp.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + benchmark BUILD_BENCHMARKS +) + +vcpkg_find_acquire_program(PERL) +get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) +vcpkg_add_to_path(${PERL_EXE_PATH}) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS ${FEATURE_OPTIONS} + -DBUILD_TESTS=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_DOC=OFF + -DTESTS_USE_VALGRIND=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/libpmemobj++/cmake) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib/libpmemobj++") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libpmemobj-cpp/vcpkg.json b/externals/vcpkg/ports/libpmemobj-cpp/vcpkg.json new file mode 100755 index 000000000..9b0f93669 --- /dev/null +++ b/externals/vcpkg/ports/libpmemobj-cpp/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "libpmemobj-cpp", + "version-semver": "1.13.0", + "port-version": 1, + "description": "C++ bindings for libpmemobj (https://github.com/pmem/pmdk)", + "homepage": "https://github.com/pmem/libpmemobj-cpp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "benchmark": { + "description": "build benchmarks", + "dependencies": [ + "pmdk" + ] + } + } +} diff --git a/externals/vcpkg/ports/libpng/cmake.patch b/externals/vcpkg/ports/libpng/cmake.patch new file mode 100755 index 000000000..f8cd527f5 --- /dev/null +++ b/externals/vcpkg/ports/libpng/cmake.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a8e5100..0ccac52 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -40,11 +40,11 @@ option(PNG_BUILD_ZLIB "Custom zlib Location, else find_package is used" OFF) + + if(NOT PNG_BUILD_ZLIB) + find_package(ZLIB REQUIRED) +- include_directories(${ZLIB_INCLUDE_DIR}) ++ set(ZLIB_LIBRARY ZLIB::ZLIB) + endif() + + if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) +- find_library(M_LIBRARY m) ++ set(M_LIBRARY m) + else() + # libm is not needed and/or not available + set(M_LIBRARY "") +@@ -557,7 +557,7 @@ if(PNG_STATIC) + # MSVC doesn't use a different file extension for shared vs. static + # libs. We are able to change OUTPUT_NAME to remove the _static + # for all other platforms. +- if(NOT MSVC) ++ if(1) + set_target_properties(png_static PROPERTIES + OUTPUT_NAME "${PNG_LIB_NAME}" + CLEAN_DIRECT_OUTPUT 1) diff --git a/externals/vcpkg/ports/libpng/fix-export-targets.patch b/externals/vcpkg/ports/libpng/fix-export-targets.patch new file mode 100755 index 000000000..23812c265 --- /dev/null +++ b/externals/vcpkg/ports/libpng/fix-export-targets.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3931f12..b570fa8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -909,6 +909,12 @@ endif() + # Create an export file that CMake users can include() to import our targets. + if(NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL) + install(EXPORT libpng DESTINATION lib/libpng FILE lib${PNG_LIB_NAME}.cmake) ++ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/libpng-config.cmake" " ++include(CMakeFindDependencyMacro) ++find_dependency(ZLIB) ++include(\"\${CMAKE_CURRENT_LIST_DIR}/lib${PNG_LIB_NAME}.cmake\") ++") ++ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libpng-config.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/libpng") + endif() + + # what's with libpng-manual.txt and all the extra files? diff --git a/externals/vcpkg/ports/libpng/macos-arch-fix.patch b/externals/vcpkg/ports/libpng/macos-arch-fix.patch new file mode 100755 index 000000000..5dd637695 --- /dev/null +++ b/externals/vcpkg/ports/libpng/macos-arch-fix.patch @@ -0,0 +1,62 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6451fcf1b..dbd5016ca 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -63,11 +63,22 @@ option(PNG_HARDWARE_OPTIMIZATIONS "Enable hardware optimizations" ON) + set(PNG_PREFIX "" CACHE STRING "Prefix to add to the API function names") + set(DFA_XTRA "" CACHE FILEPATH "File containing extra configuration settings") + ++# CMake currently sets CMAKE_SYSTEM_PROCESSOR to one of x86_64 or arm64 on macOS, ++# based upon the OS architecture, not the target architecture. As such, we need ++# to check CMAKE_OSX_ARCHITECTURES to identify which hardware-specific flags to ++# enable. Note that this will fail if you attempt to build a universal binary in ++# a single cmake invokation. ++if (APPLE AND CMAKE_OSX_ARCHITECTURES) ++ set(TARGET_ARCH ${CMAKE_OSX_ARCHITECTURES}) ++else() ++ set(TARGET_ARCH ${CMAKE_SYSTEM_PROCESSOR}) ++endif() ++ + if(PNG_HARDWARE_OPTIMIZATIONS) + + # set definitions and sources for arm +-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" OR +- CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") ++if(TARGET_ARCH MATCHES "^arm" OR ++ TARGET_ARCH MATCHES "^aarch64") + set(PNG_ARM_NEON_POSSIBLE_VALUES check on off) + set(PNG_ARM_NEON "check" CACHE STRING "Enable ARM NEON optimizations: + check: (default) use internal checking code; +@@ -121,8 +132,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^powerpc*" OR + endif() + + # set definitions and sources for intel +-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^i?86" OR +- CMAKE_SYSTEM_PROCESSOR MATCHES "^x86_64*") ++if(TARGET_ARCH MATCHES "^i?86" OR ++ TARGET_ARCH MATCHES "^x86_64*") + set(PNG_INTEL_SSE_POSSIBLE_VALUES on off) + set(PNG_INTEL_SSE "on" CACHE STRING "Enable INTEL_SSE optimizations: + off: disable the optimizations") +@@ -171,8 +182,8 @@ endif() + else(PNG_HARDWARE_OPTIMIZATIONS) + + # set definitions and sources for arm +-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" OR +- CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") ++if(TARGET_ARCH MATCHES "^arm" OR ++ TARGET_ARCH MATCHES "^aarch64") + add_definitions(-DPNG_ARM_NEON_OPT=0) + endif() + +@@ -183,8 +194,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^powerpc*" OR + endif() + + # set definitions and sources for intel +-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^i?86" OR +- CMAKE_SYSTEM_PROCESSOR MATCHES "^x86_64*") ++if(TARGET_ARCH MATCHES "^i?86" OR ++ TARGET_ARCH MATCHES "^x86_64") + add_definitions(-DPNG_INTEL_SSE_OPT=0) + endif() + diff --git a/externals/vcpkg/ports/libpng/pkgconfig.patch b/externals/vcpkg/ports/libpng/pkgconfig.patch new file mode 100755 index 000000000..437c86836 --- /dev/null +++ b/externals/vcpkg/ports/libpng/pkgconfig.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0ccac52..218747a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -820,12 +820,15 @@ endif() + # We use the same files like ./configure, so we have to set its vars. + # Only do this on Windows for Cygwin - the files don't make much sense outside + # of a UNIX look-alike. +-if(NOT WIN32 OR CYGWIN OR MINGW) ++if(1) + set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix ${CMAKE_INSTALL_PREFIX}) + set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) + set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) +- set(LIBS "-lz -lm") ++ set(LIBS "") ++ if(M_LIBRARY) ++ string(APPEND LIBS "-lm") ++ endif() + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY) + create_symlink(libpng.pc FILE ${PNGLIB_NAME}.pc) +@@ -894,6 +897,9 @@ if(NOT SKIP_INSTALL_PROGRAMS AND NOT SKIP_INSTALL_ALL) + endif() + + if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ++elseif(0) + # Install man pages + if(NOT PNG_MAN_DIR) + set(PNG_MAN_DIR "share/man") diff --git a/externals/vcpkg/ports/libpng/portfile.cmake b/externals/vcpkg/ports/libpng/portfile.cmake new file mode 100755 index 000000000..f9bf9f4b2 --- /dev/null +++ b/externals/vcpkg/ports/libpng/portfile.cmake @@ -0,0 +1,102 @@ +set(LIBPNG_VER 1.6.37) + +# Download the apng patch +set(LIBPNG_APNG_PATCH_PATH "") +set(LIBPNG_APNG_OPTION "") +if ("apng" IN_LIST FEATURES) + if(VCPKG_HOST_IS_WINDOWS) + # Get (g)awk and gzip installed + vcpkg_acquire_msys(MSYS_ROOT PACKAGES gawk gzip) + set(AWK_EXE_PATH "${MSYS_ROOT}/usr/bin") + vcpkg_add_to_path("${AWK_EXE_PATH}") + endif() + + set(LIBPNG_APNG_PATCH_NAME "libpng-${LIBPNG_VER}-apng.patch") + vcpkg_download_distfile(LIBPNG_APNG_PATCH_ARCHIVE + URLS "https://downloads.sourceforge.net/project/libpng-apng/libpng16/${LIBPNG_VER}/${LIBPNG_APNG_PATCH_NAME}.gz" + FILENAME "${LIBPNG_APNG_PATCH_NAME}.gz" + SHA512 226adcb3a8c60f2267fe2976ab531329ae43c2603dab4d0cf8f16217d64069936b879f3d6516b75d259c47d6f5c5b1f24f887602206c8e46abde0fb7f5c7946b + ) + set(LIBPNG_APNG_PATCH_PATH "${CURRENT_BUILDTREES_DIR}/src/${LIBPNG_APNG_PATCH_NAME}") + if (NOT EXISTS "${LIBPNG_APNG_PATCH_PATH}") + file(INSTALL "${LIBPNG_APNG_PATCH_ARCHIVE}" DESTINATION "${CURRENT_BUILDTREES_DIR}/src") + vcpkg_execute_required_process( + COMMAND gzip -d "${LIBPNG_APNG_PATCH_NAME}.gz" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src" + ALLOW_IN_DOWNLOAD_MODE + LOGNAME extract-patch.log + ) + endif() + set(LIBPNG_APNG_OPTION "-DPNG_PREFIX=a") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO glennrp/libpng + REF v${LIBPNG_VER} + SHA512 ccb3705c23b2724e86d072e2ac8cfc380f41fadfd6977a248d588a8ad57b6abe0e4155e525243011f245e98d9b7afbe2e8cc7fd4ff7d82fcefb40c0f48f88918 + HEAD_REF master + PATCHES + "${LIBPNG_APNG_PATCH_PATH}" + use_abort.patch + cmake.patch + fix-export-targets.patch + pkgconfig.patch + macos-arch-fix.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PNG_SHARED) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PNG_STATIC) + +vcpkg_list(SET LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION) +if(VCPKG_TARGET_IS_IOS) + vcpkg_list(APPEND LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_HARDWARE_OPTIMIZATIONS=OFF") +endif() + +vcpkg_list(SET LD_VERSION_SCRIPT_OPTION) +if(VCPKG_TARGET_IS_ANDROID) + vcpkg_list(APPEND LD_VERSION_SCRIPT_OPTION "-Dld-version-script=OFF") + # for armeabi-v7a, check whether NEON is available + vcpkg_list(APPEND LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_ARM_NEON=check") +else() + vcpkg_list(APPEND LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_ARM_NEON=on") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${LIBPNG_APNG_OPTION} + ${LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION} + ${LD_VERSION_SCRIPT_OPTION} + -DPNG_STATIC=${PNG_STATIC} + -DPNG_SHARED=${PNG_SHARED} + -DPNG_TESTS=OFF + -DSKIP_INSTALL_PROGRAMS=ON + -DSKIP_INSTALL_EXECUTABLES=ON + -DSKIP_INSTALL_FILES=OFF + OPTIONS_DEBUG + -DSKIP_INSTALL_HEADERS=ON + MAYBE_UNUSED_VARIABLES + PNG_ARM_NEON +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/libpng) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/png") + +vcpkg_fixup_pkgconfig() +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng16.pc" "-lpng16" "-llibpng16d") + file(INSTALL "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng16.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" RENAME "libpng.pc") + endif() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpng16.pc" "-lpng16" "-llibpng16") +elseif(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng16.pc" "-lpng16" "-lpng16d") + file(INSTALL "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng16.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" RENAME "libpng.pc") +endif() +file(INSTALL "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpng16.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" RENAME "libpng.pc") + +vcpkg_copy_pdbs() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libpng/usage b/externals/vcpkg/ports/libpng/usage new file mode 100755 index 000000000..19203399c --- /dev/null +++ b/externals/vcpkg/ports/libpng/usage @@ -0,0 +1,4 @@ +The package libpng is compatible with built-in CMake targets: + + find_package(PNG REQUIRED) + target_link_libraries(main PRIVATE PNG::PNG) diff --git a/externals/vcpkg/ports/libpng/use_abort.patch b/externals/vcpkg/ports/libpng/use_abort.patch new file mode 100755 index 000000000..c52df5c2b --- /dev/null +++ b/externals/vcpkg/ports/libpng/use_abort.patch @@ -0,0 +1,17 @@ +diff --git a/pngpriv.h b/pngpriv.h +index 583c26f..135651c 100644 +--- a/pngpriv.h ++++ b/pngpriv.h +@@ -556,11 +556,7 @@ + + /* Memory model/platform independent fns */ + #ifndef PNG_ABORT +-# ifdef _WINDOWS_ +-# define PNG_ABORT() ExitProcess(0) +-# else +-# define PNG_ABORT() abort() +-# endif ++# define PNG_ABORT() abort() + #endif + + /* These macros may need to be architecture dependent. */ diff --git a/externals/vcpkg/ports/libpng/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/libpng/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..de1e087fc --- /dev/null +++ b/externals/vcpkg/ports/libpng/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,3 @@ +find_library(PNG_LIBRARY_RELEASE NAMES png16 libpng16 NAMES_PER_DIR PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) +find_library(PNG_LIBRARY_DEBUG NAMES png16d libpng16d NAMES_PER_DIR PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) +_find_package(${ARGS}) diff --git a/externals/vcpkg/ports/libpng/vcpkg.json b/externals/vcpkg/ports/libpng/vcpkg.json new file mode 100755 index 000000000..8ff590153 --- /dev/null +++ b/externals/vcpkg/ports/libpng/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "libpng", + "version": "1.6.37", + "port-version": 18, + "description": "libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files", + "homepage": "https://github.com/glennrp/libpng", + "license": "libpng-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "features": { + "apng": { + "description": "This is backward compatible with the regular libpng, both in library usage and format" + } + } +} diff --git a/externals/vcpkg/ports/libpopt/0004-vcpkg-fixmsvc.patch b/externals/vcpkg/ports/libpopt/0004-vcpkg-fixmsvc.patch new file mode 100755 index 000000000..d9bc082f3 --- /dev/null +++ b/externals/vcpkg/ports/libpopt/0004-vcpkg-fixmsvc.patch @@ -0,0 +1,62 @@ +diff -Naur a/poptconfig.c b/poptconfig.c +--- a/poptconfig.c 2009-05-20 16:18:07.000000000 +0300 ++++ b/poptconfig.c 2017-01-21 03:10:17.116120500 +0300 +@@ -141,17 +141,23 @@ + int poptSaneFile(const char * fn) + { + struct stat sb; +- uid_t uid = getuid(); ++#ifndef _MSC_VER ++ uid_t uid = getuid(); ++#endif // ! _MSC_VER + + if (stat(fn, &sb) == -1) + return 1; ++#ifndef _MSC_VER + if ((uid_t)sb.st_uid != uid) + return 0; ++#endif // ! _MSC_VER + if (!S_ISREG(sb.st_mode)) + return 0; + /*@-bitwisesigned@*/ +- if (sb.st_mode & (S_IWGRP|S_IWOTH)) +- return 0; ++#ifndef _MSC_VER ++ if (sb.st_mode & (S_IWGRP | S_IWOTH)) ++ return 0; ++#endif // ! _MSC_VER + /*@=bitwisesigned@*/ + return 1; + } +diff -Naur a/popthelp.c b/popthelp.c +--- a/popthelp.c 2009-08-28 03:06:33.000000000 +0300 ++++ b/popthelp.c 2017-01-21 02:59:26.665695800 +0300 +@@ -10,7 +10,10 @@ + + #include "system.h" + +-#define POPT_USE_TIOCGWINSZ ++#ifndef _MSC_VER ++#define POPT_USE_TIOCGWINSZ ++#endif ++ + #ifdef POPT_USE_TIOCGWINSZ + #include + #endif +diff -Naur a/system.h b/system.h +--- a/system.h 2008-12-18 19:09:49.000000000 +0200 ++++ b/system.h 2017-01-21 03:10:59.195367500 +0300 +@@ -100,4 +100,13 @@ + #endif + #define UNUSED(x) x __attribute__((__unused__)) + ++#if defined(_MSC_VER) ++#define X_OK 0 ++ ++#include ++typedef SSIZE_T ssize_t; ++ ++#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) ++#endif ++ + #include "popt.h" diff --git a/externals/vcpkg/ports/libpopt/CMakeLists.txt b/externals/vcpkg/ports/libpopt/CMakeLists.txt new file mode 100755 index 000000000..5348757b4 --- /dev/null +++ b/externals/vcpkg/ports/libpopt/CMakeLists.txt @@ -0,0 +1,59 @@ +cmake_minimum_required(VERSION 3.0) +project(popt VERSION 1.16 LANGUAGES C) + +set(PACKAGE "popt") +set(POPT_SYSCONFDIR "C:\\\\") +set(CMAKE_DEBUG_POSTFIX "d") + +file(GLOB SOURCES "popt.c" + "poptconfig.c" + "popthelp.c" + "poptint.c" + "poptparse.c" + "popt.def" +) + +option(POPT_USE_CONFIG "Use configuration file" OFF) + +if(POPT_USE_CONFIG) + include(CheckIncludeFile) + include(CheckFunctionExists) + + check_include_file(float.h HAVE_FLOAT_H) + check_include_file(fnmatch.h HAVE_FNMATCH_H) + check_include_file(glob.h HAVE_GLOB_H) + check_include_file(langinfo.h HAVE_LANGINFO_H) + check_include_file(libintl.h HAVE_LIBINTL_H) + check_include_file(mcheck.h HAVE_MCHECK_H) + check_include_file(unistd.h HAVE_UNISTD_H) + + + check_function_exists(gettext HAVE_GETTEXT) + check_function_exists(iconv HAVE_ICONV) + check_function_exists(mtrace HAVE_MTRACE) + check_function_exists(srandom HAVE_SRANDOM) + check_function_exists(stpcpy HAVE_STPCPY) + check_function_exists(strerror HAVE_STRERROR) + check_function_exists(vasprintf HAVE_VASPRINTF) + check_function_exists(__secure_getenv HAVE___SECURE_GETENV) + + configure_file(config.h.cmake config.h @ONLY) + add_definitions(-DHAVE_CONFIG_H) +endif() + +add_definitions(-D_CRT_SECURE_NO_WARNINGS) + +include_directories(${CMAKE_BINARY_DIR}) + +add_library(popt ${SOURCES}) +if (MSVC) + target_compile_options(popt PRIVATE /wd4996) +endif() + +install(TARGETS popt + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(FILES "popt.h" DESTINATION "include") \ No newline at end of file diff --git a/externals/vcpkg/ports/libpopt/config.h.cmake b/externals/vcpkg/ports/libpopt/config.h.cmake new file mode 100755 index 000000000..f641fc73c --- /dev/null +++ b/externals/vcpkg/ports/libpopt/config.h.cmake @@ -0,0 +1,61 @@ +#ifndef CONFIG_H +#define CONFIG_H + +/* Define to 1 if translation of program messages to the user's native language is requested. */ +#cmakedefine ENABLE_NLS 1 + +/* Define if the GNU dcgettext() function is already present or preinstalled. */ +#cmakedefine HAVE_DCGETTEXT 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_FLOAT_H 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_FNMATCH_H 1 + +/* Define if the GNU gettext() function is already present or preinstalled. */ +#cmakedefine HAVE_GETTEXT 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_GLOB_H 1 + +/* Define if you have the iconv() function and it works. */ +#cmakedefine HAVE_ICONV 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_LANGINFO_H 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_LIBINTL_H 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_MCHECK_H 1 + +/* Define to 1 if you have the `mtrace' function. */ +#cmakedefine HAVE_MTRACE 1 + +/* Define to 1 if you have the `srandom' function. */ +#cmakedefine HAVE_SRANDOM 1 + +/* Define to 1 if you have the `stpcpy' function. */ +#cmakedefine HAVE_STPCPY 1 + +/* Define to 1 if you have the `strerror' function. */ +#cmakedefine HAVE_STRERROR 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `vasprintf' function. */ +#cmakedefine HAVE_VASPRINTF 1 + +/* Define to 1 if you have the `__secure_getenv' function. */ +#cmakedefine HAVE___SECURE_GETENV 1 + +/* Name of package */ +#cmakedefine PACKAGE "@PACKAGE@" + +/* Full path to default POPT configuration directory */ +#cmakedefine POPT_SYSCONFDIR "@POPT_SYSCONFDIR@" + +#endif \ No newline at end of file diff --git a/externals/vcpkg/ports/libpopt/popt.def b/externals/vcpkg/ports/libpopt/popt.def new file mode 100755 index 000000000..20bb70a18 --- /dev/null +++ b/externals/vcpkg/ports/libpopt/popt.def @@ -0,0 +1,50 @@ +EXPORTS + _poptArgMask + _poptBitsK + _poptBitsM + _poptBitsN + _poptGroupMask + poptAddAlias + poptAddItem + poptAliasOptions + poptBadOption + poptBitsAdd + poptBitsArgs + poptBitsChk + poptBitsClr + poptBitsDel + poptBitsIntersect + poptBitsUnion + poptConfigFileToString + poptDupArgv + poptFini + poptFreeContext + poptGetArg + poptGetArgs + poptGetContext + poptGetInvocationName + poptGetNextOpt + poptGetOptArg + poptHelpOptions + poptInit + poptParseArgvString + poptPeekArg + poptPrintHelp + poptPrintUsage + poptReadConfigFile + poptReadConfigFiles + poptReadDefaultConfig + poptReadFile + poptResetContext + poptSaneFile + poptSaveBits + poptSaveInt + poptSaveLong + poptSaveLongLong + poptSaveShort + poptSaveString + poptSetExecPath + poptSetOtherOptionHelp + poptStrerror + poptStrippedArgv + poptStuffArgs \ No newline at end of file diff --git a/externals/vcpkg/ports/libpopt/portfile.cmake b/externals/vcpkg/ports/libpopt/portfile.cmake new file mode 100755 index 000000000..a4ead066c --- /dev/null +++ b/externals/vcpkg/ports/libpopt/portfile.cmake @@ -0,0 +1,33 @@ +set(LIBPOPT_VERSION 1.16) +set(LIBPOPT_HASH bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694) + +vcpkg_download_distfile(ARCHIVE + URLS + "https://ftp.openbsd.org/pub/OpenBSD/distfiles/popt-${LIBPOPT_VERSION}.tar.gz" + FILENAME "popt-${LIBPOPT_VERSION}.tar.gz" + SHA512 ${LIBPOPT_HASH} +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + 0004-vcpkg-fixmsvc.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.cmake DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/popt.def DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DPOPT_USE_CONFIG=1 +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libpopt/vcpkg.json b/externals/vcpkg/ports/libpopt/vcpkg.json new file mode 100755 index 000000000..cbb2f8254 --- /dev/null +++ b/externals/vcpkg/ports/libpopt/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "libpopt", + "version-string": "1.16", + "port-version": 14, + "description": "Library for parsing command line parameters" +} diff --git a/externals/vcpkg/ports/libpq/Makefile b/externals/vcpkg/ports/libpq/Makefile new file mode 100755 index 000000000..ee2ffcaf1 --- /dev/null +++ b/externals/vcpkg/ports/libpq/Makefile @@ -0,0 +1,37 @@ +subdir = . +top_builddir = . +include src/Makefile.global + +.NOTPARALLEL: + +ifeq ($(LIBPQ_LIBRARY_TYPE), static) +LIBPQ_INSTALL_LIBS = install-stlib +endif + +ifeq ($(LIBPQ_LIBRARY_TYPE), shared) +ifeq ($(USING_MINGW), yes) +# The import library name is the same as the static library name +EXTRA_TARGET = install-lib-static +endif +endif + +.PHONY: all +all: + $(MAKE) -C src/include MAKELEVEL=0 + $(MAKE) -C src/common MAKELEVEL=0 + $(MAKE) -C src/port MAKELEVEL=0 + $(MAKE) -C src/interfaces/libpq MAKELEVEL=0 all-$(LIBPQ_LIBRARY_TYPE)-lib + $(MAKE) -C src/bin/pg_config MAKELEVEL=0 + +.PHONY: install-stlib +install-stlib: + $(MAKE) -C src/common MAKELEVEL=0 install -o all + rm -f '$(DESTDIR)$(libdir)/libpgcommon_shlib.a' + $(MAKE) -C src/port MAKELEVEL=0 install -o all + rm -f '$(DESTDIR)$(libdir)/libpgport_shlib.a' + +.PHONY: install +install: $(LIBPQ_INSTALL_LIBS) + $(MAKE) -C src/include MAKELEVEL=0 install + $(MAKE) -C src/interfaces/libpq MAKELEVEL=0 $(EXTRA_TARGET) install-lib-$(LIBPQ_LIBRARY_TYPE) install-lib-pc install -o all -o install-lib + $(MAKE) -C src/bin/pg_config MAKELEVEL=0 install diff --git a/externals/vcpkg/ports/libpq/config.pl b/externals/vcpkg/ports/libpq/config.pl new file mode 100755 index 000000000..5538aae22 --- /dev/null +++ b/externals/vcpkg/ports/libpq/config.pl @@ -0,0 +1,28 @@ +our $config = { + asserts => 0, # --enable-cassert + # float4byval=>1, # --disable-float4-byval, on by default + + # float8byval=> $platformbits == 64, # --disable-float8-byval, + # off by default on 32 bit platforms, on by default on 64 bit platforms + + # blocksize => 8, # --with-blocksize, 8kB by default + # wal_blocksize => 8, # --with-wal-blocksize, 8kB by default + ldap => undef, # --with-ldap + extraver => undef, # --with-extra-version= + gss => undef, # --with-gssapi= + icu => undef, # --with-icu= + lz4 => undef, # --with-lz4= + nls => undef, # --enable-nls= + tap_tests => undef, # --enable-tap-tests + tcl => undef, # --with-tcl= + perl => undef, # --with-perl + python => undef, # --with-python= + openssl => undef, # --with-openssl= + uuid => undef, # --with-ossp-uuid + xml => undef, # --with-libxml= + xslt => undef, # --with-libxslt= + iconv => undef, # (not in configure, path to iconv) + zlib => undef # --with-zlib= +}; + +1; diff --git a/externals/vcpkg/ports/libpq/patches/fix-configure.patch b/externals/vcpkg/ports/libpq/patches/fix-configure.patch new file mode 100755 index 000000000..bf7c606e7 --- /dev/null +++ b/externals/vcpkg/ports/libpq/patches/fix-configure.patch @@ -0,0 +1,72 @@ +diff --git a/configure.ac b/configure.ac +index fba79ee..4fadb94 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -19,7 +19,7 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros + + AC_INIT([PostgreSQL], [14.1], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) + +-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. ++m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_warn([unsupported],[Autoconf version 2.69 is required. + Untested combinations of 'autoconf' and PostgreSQL versions are not + recommended. You can remove the check from 'configure.ac' but it is then + your responsibility whether the result works or not.])]) +@@ -1184,7 +1184,8 @@ if test "$enable_thread_safety" = yes; then + fi + + if test "$with_readline" = yes; then +- PGAC_CHECK_READLINE ++ PKG_CHECK_MODULES([READLINE], [readline], [HAVE_LIBREADLINE=1], [pgac_cv_check_readline=no]) ++ LIBS="$READLINE_LIBS $LIBS" + if test x"$pgac_cv_check_readline" = x"no"; then + AC_MSG_ERROR([readline library not found + If you have readline already installed, see config.log for details on the +@@ -1194,7 +1195,7 @@ Use --without-readline to disable readline support.]) + fi + + if test "$with_zlib" = yes; then +- AC_CHECK_LIB(z, inflate, [], ++ PKG_CHECK_MODULES([ZLIB], [zlib], [LIBS="$ZLIB_LIBS $LIBS"], + [AC_MSG_ERROR([zlib library not found + If you have zlib already installed, see config.log for details on the + failure. It is possible the compiler isn't looking in the proper directory. +@@ -1243,6 +1244,9 @@ if test "$with_ssl" = openssl ; then + # Minimum required OpenSSL version is 1.0.1 + AC_DEFINE(OPENSSL_API_COMPAT, [0x10001000L], + [Define to the OpenSSL API version in use. This avoids deprecation warnings from newer OpenSSL versions.]) ++ PKG_CHECK_MODULES([CRYPTO_new_ex_data], [libcrypto], [LIBS="$CRYPTO_new_ex_data_LIBS $LIBS"], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]) ++ PKG_CHECK_MODULES([SSL_new], [libssl], [LIBS="$SSL_new_LIBS $LIBS"], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) ++ if false ; then + if test "$PORTNAME" != "win32"; then + AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]) + AC_CHECK_LIB(ssl, SSL_new, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) +@@ -1250,6 +1254,7 @@ if test "$with_ssl" = openssl ; then + AC_SEARCH_LIBS(CRYPTO_new_ex_data, [eay32 crypto], [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])]) + AC_SEARCH_LIBS(SSL_new, [ssleay32 ssl], [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])]) + fi ++ fi + # Function introduced in OpenSSL 1.0.2. + AC_CHECK_FUNCS([X509_get_signature_nid]) + # Functions introduced in OpenSSL 1.1.0. We used to check for +@@ -1273,15 +1278,18 @@ if test "$with_pam" = yes ; then + fi + + if test "$with_libxml" = yes ; then +- AC_CHECK_LIB(xml2, xmlSaveToBuffer, [], [AC_MSG_ERROR([library 'xml2' (version >= 2.6.23) is required for XML support])]) ++ PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6.23], [AC_DEFINE(HAVE_LIBXML2,1,[Define to 1 if with xml2])], [AC_MSG_ERROR([library 'xml2' (version >= 2.6.23) is required for XML support])]) ++ LIBS="$LIBXML2_LIBS $LIBS" + fi + + if test "$with_libxslt" = yes ; then +- AC_CHECK_LIB(xslt, xsltCleanupGlobals, [], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])]) ++ PKG_CHECK_MODULES([LIBXSLT], [libxslt], [AC_DEFINE(HAVE_LIBXSLT,1,[Define to 1 if with xslt])], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])]) ++ LIBS="$LIBXSLT_LIBS $LIBS" + fi + + if test "$with_lz4" = yes ; then +- AC_CHECK_LIB(lz4, LZ4_compress_default, [], [AC_MSG_ERROR([library 'lz4' is required for LZ4 support])]) ++ PKG_CHECK_MODULES([LZ4], [liblz4], [AC_DEFINE(HAVE_LIBLZ4,1,[Define to 1 if with lz4])], [AC_MSG_ERROR([library 'lz4' is required for LZ4 support])]) ++ LIBS="$LZ4_LIBS $LIBS" + fi + + # Note: We can test for libldap_r only after we know PTHREAD_LIBS; diff --git a/externals/vcpkg/ports/libpq/patches/windows/MSBuildProject-static-crt.patch b/externals/vcpkg/ports/libpq/patches/windows/MSBuildProject-static-crt.patch new file mode 100755 index 000000000..03bd832f8 --- /dev/null +++ b/externals/vcpkg/ports/libpq/patches/windows/MSBuildProject-static-crt.patch @@ -0,0 +1,23 @@ +diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm +index 823357c02..faa3e336f 100644 +--- a/src/tools/msvc/MSBuildProject.pm ++++ b/src/tools/msvc/MSBuildProject.pm +@@ -84,16 +84,16 @@ EOF + defs => "_DEBUG;DEBUG=1", + opt => 'Disabled', + strpool => 'false', +- runtime => 'MultiThreadedDebugDLL' ++ runtime => 'MultiThreadedDebug' + }); + $self->WriteItemDefinitionGroup( + $f, + 'Release', + { + defs => "", + opt => 'Full', + strpool => 'true', +- runtime => 'MultiThreadedDLL' ++ runtime => 'MultiThreaded' + }); + return; + } diff --git a/externals/vcpkg/ports/libpq/patches/windows/MSBuildProject-static-lib.patch b/externals/vcpkg/ports/libpq/patches/windows/MSBuildProject-static-lib.patch new file mode 100755 index 000000000..70cd22d60 --- /dev/null +++ b/externals/vcpkg/ports/libpq/patches/windows/MSBuildProject-static-lib.patch @@ -0,0 +1,13 @@ +diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm +index 823357c02..e1dc59aa7 100644 +--- a/src/tools/msvc/MSBuildProject.pm ++++ b/src/tools/msvc/MSBuildProject.pm +@@ -265,7 +265,7 @@ sub WriteConfigurationPropertyGroup + my $cfgtype = + ($self->{type} eq "exe") + ? 'Application' +- : ($self->{type} eq "dll" ? 'DynamicLibrary' : 'StaticLibrary'); ++ : ($self->{type} eq "dll" ? 'StaticLibrary' : 'StaticLibrary'); + + print $f < diff --git a/externals/vcpkg/ports/libpq/patches/windows/MSBuildProject_fix_gendef_perl.patch b/externals/vcpkg/ports/libpq/patches/windows/MSBuildProject_fix_gendef_perl.patch new file mode 100755 index 000000000..10955c3f9 --- /dev/null +++ b/externals/vcpkg/ports/libpq/patches/windows/MSBuildProject_fix_gendef_perl.patch @@ -0,0 +1,13 @@ +diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm +index 823357c02..b93992f22 100644 +--- a/src/tools/msvc/MSBuildProject.pm ++++ b/src/tools/msvc/MSBuildProject.pm +@@ -384,7 +384,7 @@ EOF + print $f < + Generate DEF file +- perl src\\tools\\msvc\\gendef.pl $cfgname\\$self->{name} $self->{platform} ++ perl "src\\tools\\msvc\\gendef.pl" $cfgname\\$self->{name} $self->{platform} + + EOF + } diff --git a/externals/vcpkg/ports/libpq/patches/windows/Mkvcbuild-static-lib.patch b/externals/vcpkg/ports/libpq/patches/windows/Mkvcbuild-static-lib.patch new file mode 100755 index 000000000..554d8527a --- /dev/null +++ b/externals/vcpkg/ports/libpq/patches/windows/Mkvcbuild-static-lib.patch @@ -0,0 +1,13 @@ +diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm +index 99f39caa5..4f51c12f2 100644 +--- a/src/tools/msvc/Mkvcbuild.pm ++++ b/src/tools/msvc/Mkvcbuild.pm +@@ -199,7 +199,7 @@ sub mkvcbuild + 'syncrep_gram.y'); + $postgres->AddFiles('src/backend/utils/adt', 'jsonpath_scan.l', + 'jsonpath_gram.y'); +- $postgres->AddDefine('BUILDING_DLL'); ++ # $postgres->AddDefine('BUILDING_DLL'); + $postgres->AddLibrary('secur32.lib'); + $postgres->AddLibrary('ws2_32.lib'); + $postgres->AddLibrary('wldap32.lib') if ($solution->{options}->{ldap}); diff --git a/externals/vcpkg/ports/libpq/patches/windows/Solution.patch b/externals/vcpkg/ports/libpq/patches/windows/Solution.patch new file mode 100755 index 000000000..4647fe104 --- /dev/null +++ b/externals/vcpkg/ports/libpq/patches/windows/Solution.patch @@ -0,0 +1,45 @@ +diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm +index 51711c2bf..d33fdc3b0 100644 +--- a/src/tools/msvc/Solution.pm ++++ b/src/tools/msvc/Solution.pm +@@ -63,17 +63,21 @@ sub DeterminePlatform + my $self = shift; + + if ($^O eq "MSWin32") + { + # Examine CL help output to determine if we are in 32 or 64-bit mode. + my $output = `cl /help 2>&1`; + $? >> 8 == 0 or die "cl command not found"; +- $self->{platform} = +- ($output =~ /^\/favor:<.+AMD64/m) ? 'x64' : 'Win32'; ++ if ($output =~ m/x64\n/) { $self->{platform} = 'x64'; ++ } elsif ($output =~ m/x86\n/) { $self->{platform} = 'Win32'; ++ } elsif ($output =~ m/ARM64\n/) { $self->{platform} = 'ARM64'; ++ } elsif ($output =~ m/ARM\n/) { $self->{platform} = 'ARM'; ++ } else { $self->{platform} = 'Unknown' ++ } + } + else + { + $self->{platform} = 'FAKE'; + } + print "Detected hardware platform: $self->{platform}\n"; + return; + } +@@ -757,14 +757,14 @@ EOF + || confess "Could not open pg_config_paths.h"; + print $o <{options}->{zlib}) + { + $proj->AddIncludeDir($self->{options}->{zlib} . '\include'); +- $proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib'); ++ $proj->AddLibrary($self->{options}->{zlib} . '\debug\lib\zlibd.lib'); + } + if ($self->{options}->{openssl}) + { +@@ -989,8 +989,11 @@ sub AddProject + # On both Win32 and Win64 the same library + # names are used without a debugging context. + $dbgsuffix = 0; +- $libsslpath = '\lib\libssl.lib'; +- $libcryptopath = '\lib\libcrypto.lib'; ++ $libsslpath = '\debug\lib\libssl.lib'; # ++ $libcryptopath = '\debug\lib\libcrypto.lib'; # ++ $proj->AddLibrary('crypt32.lib'); ++ $proj->AddLibrary('ws2_32.lib'); ++ $proj->AddLibrary('secur32.lib'); + } + + $proj->AddLibrary($self->{options}->{openssl} . $libsslpath, +@@ -1024,7 +1024,7 @@ sub AddProject + if ($self->{options}->{nls}) + { + $proj->AddIncludeDir($self->{options}->{nls} . '\include'); +- $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib'); ++ $proj->AddLibrary($self->{options}->{nls} . '\debug\lib\intl.lib'); # + } + if ($self->{options}->{gss}) + { +@@ -1051,21 +1051,21 @@ sub AddProject + } + if ($self->{options}->{iconv}) + { + $proj->AddIncludeDir($self->{options}->{iconv} . '\include'); +- $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); ++ $proj->AddLibrary($self->{options}->{iconv} . '\debug\lib\iconv.lib'); # + } + if ($self->{options}->{icu}) + { + $proj->AddIncludeDir($self->{options}->{icu} . '\include'); + if ($self->{platform} eq 'Win32') + { +- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); +- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); +- $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); ++ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); # ++ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); # ++ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); # + } + else + { +- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib'); +- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib'); +- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib'); ++ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); # ++ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); # ++ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); # + } +@@ -1074,22 +1074,22 @@ sub AddProject + { + $proj->AddIncludeDir($self->{options}->{xml} . '\include'); + $proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2'); +- $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); ++ $proj->AddLibrary($self->{options}->{xml} . '\debug\lib\libxml2.lib'); # + } + if ($self->{options}->{xslt}) + { + $proj->AddIncludeDir($self->{options}->{xslt} . '\include'); +- $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); ++ $proj->AddLibrary($self->{options}->{xslt} . '\debug\lib\libxslt.lib'); # + } + if ($self->{options}->{lz4}) + { + $proj->AddIncludeDir($self->{options}->{lz4} . '\include'); +- $proj->AddLibrary($self->{options}->{lz4} . '\lib\liblz4.lib'); ++ $proj->AddLibrary($self->{options}->{lz4} . '\debug\lib\lz4d.lib'); # + } + if ($self->{options}->{uuid}) + { + $proj->AddIncludeDir($self->{options}->{uuid} . '\include'); +- $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); ++ $proj->AddLibrary($self->{options}->{uuid} . '\debug\lib\uuid.lib'); # + } + return $proj; + } diff --git a/externals/vcpkg/ports/libpq/patches/windows/Solution_RELEASE.patch b/externals/vcpkg/ports/libpq/patches/windows/Solution_RELEASE.patch new file mode 100755 index 000000000..8270645ef --- /dev/null +++ b/externals/vcpkg/ports/libpq/patches/windows/Solution_RELEASE.patch @@ -0,0 +1,92 @@ +diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm +index 2820ace22..7fddbf0fb 100644 +--- a/src/tools/msvc/Solution.pm ++++ b/src/tools/msvc/Solution.pm +@@ -948,7 +948,7 @@ sub AddProject + if ($self->{options}->{zlib}) + { + $proj->AddIncludeDir($self->{options}->{zlib} . '\include'); +- $proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib'); ++ $proj->AddLibrary($self->{options}->{zlib} . '\lib\zlib.lib'); + } + if ($self->{options}->{openssl}) + { +@@ -989,8 +989,11 @@ sub AddProject + # On both Win32 and Win64 the same library + # names are used without a debugging context. + $dbgsuffix = 0; +- $libsslpath = '\lib\libssl.lib'; +- $libcryptopath = '\lib\libcrypto.lib'; ++ $libsslpath = '\lib\libssl.lib'; # ++ $libcryptopath = '\lib\libcrypto.lib'; # ++ $proj->AddLibrary('crypt32.lib'); ++ $proj->AddLibrary('ws2_32.lib'); ++ $proj->AddLibrary('secur32.lib'); + } + + $proj->AddLibrary($self->{options}->{openssl} . $libsslpath, +@@ -1024,7 +1024,7 @@ sub AddProject + if ($self->{options}->{nls}) + { + $proj->AddIncludeDir($self->{options}->{nls} . '\include'); +- $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib'); ++ $proj->AddLibrary($self->{options}->{nls} . '\lib\intl.lib'); # + } + if ($self->{options}->{gss}) + { +@@ -1051,21 +1051,21 @@ sub AddProject + } + if ($self->{options}->{iconv}) + { + $proj->AddIncludeDir($self->{options}->{iconv} . '\include'); +- $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); ++ $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); # + } + if ($self->{options}->{icu}) + { + $proj->AddIncludeDir($self->{options}->{icu} . '\include'); + if ($self->{platform} eq 'Win32') + { +- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); +- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); +- $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); ++ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); # ++ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); # ++ $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # + } + else + { +- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib'); +- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib'); +- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib'); ++ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); # ++ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); # ++ $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # + } +@@ -1074,22 +1074,22 @@ sub AddProject + { + $proj->AddIncludeDir($self->{options}->{xml} . '\include'); + $proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2'); +- $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); ++ $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); # + } + if ($self->{options}->{xslt}) + { + $proj->AddIncludeDir($self->{options}->{xslt} . '\include'); +- $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); ++ $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); # + } + if ($self->{options}->{lz4}) + { + $proj->AddIncludeDir($self->{options}->{lz4} . '\include'); +- $proj->AddLibrary($self->{options}->{lz4} . '\lib\liblz4.lib'); ++ $proj->AddLibrary($self->{options}->{lz4} . '\lib\lz4.lib'); # + } + if ($self->{options}->{uuid}) + { + $proj->AddIncludeDir($self->{options}->{uuid} . '\include'); +- $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); ++ $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); # + } + return $proj; + } diff --git a/externals/vcpkg/ports/libpq/patches/windows/arm.patch b/externals/vcpkg/ports/libpq/patches/windows/arm.patch new file mode 100755 index 000000000..0e47c34b9 --- /dev/null +++ b/externals/vcpkg/ports/libpq/patches/windows/arm.patch @@ -0,0 +1,39 @@ +diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm +index 99f39caa5..4f51c12f2 100644 +--- a/src/tools/msvc/Mkvcbuild.pm ++++ b/src/tools/msvc/Mkvcbuild.pm +@@ -110,8 +110,8 @@ sub mkvcbuild + + if ($vsVersion >= '9.00') + { +- push(@pgportfiles, 'pg_crc32c_sse42_choose.c'); +- push(@pgportfiles, 'pg_crc32c_sse42.c'); ++ #push(@pgportfiles, 'pg_crc32c_sse42_choose.c'); ++ #push(@pgportfiles, 'pg_crc32c_sse42.c'); + push(@pgportfiles, 'pg_crc32c_sb8.c'); + } + else +diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm +index 823357c02..625f32bf8 100644 +--- a/src/tools/msvc/MSBuildProject.pm ++++ b/src/tools/msvc/MSBuildProject.pm +@@ -307,9 +307,8 @@ sub WriteItemDefinitionGroup + : ($self->{type} eq "dll" ? 'DynamicLibrary' : 'StaticLibrary'); + my $libs = $self->GetAdditionalLinkerDependencies($cfgname, ';'); + +- my $targetmachine = +- $self->{platform} eq 'Win32' ? 'MachineX86' : 'MachineX64'; +- ++ my $targetmachine = $self->{platform} eq 'ARM64' ? 'MachineARM64' : 'MachineARM'; ++ + my $includes = $self->{includes}; + unless ($includes eq '' or $includes =~ /;$/) + { +@@ -347,7 +349,6 @@ sub WriteItemDefinitionGroup + .\\$cfgname\\$self->{name}\\$self->{name}.pdb + false + .\\$cfgname\\$self->{name}\\$self->{name}.map +- false + + + Console diff --git a/externals/vcpkg/ports/libpq/patches/windows/fix-compile-flag-Zi.patch b/externals/vcpkg/ports/libpq/patches/windows/fix-compile-flag-Zi.patch new file mode 100755 index 000000000..b5e3b6cdb --- /dev/null +++ b/externals/vcpkg/ports/libpq/patches/windows/fix-compile-flag-Zi.patch @@ -0,0 +1,33 @@ +diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm +index b93992f..2397511 100644 +--- a/src/tools/msvc/MSBuildProject.pm ++++ b/src/tools/msvc/MSBuildProject.pm +@@ -336,7 +336,7 @@ sub WriteItemDefinitionGroup + false + Level3 + true +- ProgramDatabase ++ OldStyle + Default + + +diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm +index e0c9a88..98f9e67 100644 +--- a/src/tools/msvc/Install.pm ++++ b/src/tools/msvc/Install.pm +@@ -352,9 +352,12 @@ sub CopySolutionOutput + || croak "Could not copy $pf.$ext\n"; + } + } +- lcopy("$conf\\$pf\\$pf.pdb", "$target\\bin\\$pf.pdb") +- || croak "Could not copy $pf.pdb\n"; +- print "."; ++ if ($1 eq 'DynamicLibrary') ++ { ++ lcopy("$conf\\$pf\\$pf.pdb", "$target\\bin\\$pf.pdb") ++ || croak "Could not copy $pf.pdb\n"; ++ print "."; ++ } + } + print "\n"; + return; diff --git a/externals/vcpkg/ports/libpq/patches/windows/host_skip_openssl.patch b/externals/vcpkg/ports/libpq/patches/windows/host_skip_openssl.patch new file mode 100755 index 000000000..e18e17884 --- /dev/null +++ b/externals/vcpkg/ports/libpq/patches/windows/host_skip_openssl.patch @@ -0,0 +1,38 @@ +diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm +index 25a549015..9018270ab 100644 +--- a/src/tools/msvc/Solution.pm ++++ b/src/tools/msvc/Solution.pm +@@ -132,21 +132,21 @@ sub GetOpenSSLVersion + # Attempt to get OpenSSL version and location. This assumes that + # openssl.exe is in the specified directory. + # Quote the .exe name in case it has spaces +- my $opensslcmd = +- qq("openssl.exe" version 2>&1); +- my $sslout = `$opensslcmd`; ++ #my $opensslcmd = ++ # qq("openssl.exe" version 2>&1); ++ #my $sslout = `$opensslcmd`; + +- $? >> 8 == 0 +- or croak +- "Unable to determine OpenSSL version: The openssl.exe command wasn't found."; ++ #$? >> 8 == 0 ++ # or croak ++ # "Unable to determine OpenSSL version: The openssl.exe command wasn't found."; + +- if ($sslout =~ /(\d+)\.(\d+)\.(\d+)(\D)/m) +- { +- return ($1, $2, $3); +- } ++ #if ($sslout =~ /(\d+)\.(\d+)\.(\d+)(\D)/m) ++ #{ ++ return (1, 1, 1); ++ #} + +- croak +- "Unable to determine OpenSSL version: The openssl.exe version could not be determined."; ++ #croak ++ # "Unable to determine OpenSSL version: The openssl.exe version could not be determined."; + } + + sub GenerateFiles diff --git a/externals/vcpkg/ports/libpq/patches/windows/install.patch b/externals/vcpkg/ports/libpq/patches/windows/install.patch new file mode 100755 index 000000000..0d7a6d69a --- /dev/null +++ b/externals/vcpkg/ports/libpq/patches/windows/install.patch @@ -0,0 +1,223 @@ +diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm +index d109b2c90..75c7446e6 100644 +--- a/src/tools/msvc/Install.pm ++++ b/src/tools/msvc/Install.pm +@@ -89,10 +89,10 @@ sub Install + my $majorver = DetermineMajorVersion(); + print "Installing version $majorver for $conf in $target\n"; + +- my @client_dirs = ('bin', 'lib', 'share', 'symbols'); ++ my @client_dirs = ('bin', 'lib', 'share', 'tools', 'share/libpq', 'tools/libpq'); + my @all_dirs = ( +- @client_dirs, 'doc', 'doc/contrib', 'doc/extension', 'share/contrib', +- 'share/extension', 'share/timezonesets', 'share/tsearch_data'); ++ @client_dirs, 'doc', 'doc/libpq', 'doc/libpq/contrib', 'doc/libpq/extension', 'share/libpq/contrib', ++ 'share/libpq/extension', 'share/libpq/timezonesets', 'share/libpq/tsearch_data'); + if ($insttype eq "client") + { + EnsureDirectories($target, @client_dirs); +@@ -117,7 +117,7 @@ sub Install + } + }, + @top_dir); +- CopySetOfFiles('config files', $sample_files, $target . '/share/'); ++ CopySetOfFiles('config files', $sample_files, $target . '/share/libpq/'); + CopyFiles( + 'Import libraries', + $target . '/lib/', +@@ -131,35 +131,35 @@ sub Install + CopySetOfFiles( + 'timezone names', + [ glob('src\timezone\tznames\*.txt') ], +- $target . '/share/timezonesets/'); ++ $target . '/share/libpq/timezonesets/'); + CopyFiles( + 'timezone sets', +- $target . '/share/timezonesets/', ++ $target . '/share/libpq/timezonesets/', + 'src/timezone/tznames/', 'Default', 'Australia', 'India'); + CopySetOfFiles( + 'BKI files', + [ glob("src\\backend\\catalog\\postgres.*") ], +- $target . '/share/'); ++ $target . '/share/libpq/'); + CopySetOfFiles( + 'SQL files', + [ glob("src\\backend\\catalog\\*.sql") ], +- $target . '/share/'); ++ $target . '/share/libpq/'); + CopyFiles( +- 'Information schema data', $target . '/share/', ++ 'Information schema data', $target . '/share/libpq/', + 'src/backend/catalog/', 'sql_features.txt'); + CopyFiles( +- 'Error code data', $target . '/share/', ++ 'Error code data', $target . '/share/libpq/', + 'src/backend/utils/', 'errcodes.txt'); + GenerateTimezoneFiles($target, $conf); + GenerateTsearchFiles($target); + CopySetOfFiles( + 'Stopword files', + [ glob("src\\backend\\snowball\\stopwords\\*.stop") ], +- $target . '/share/tsearch_data/'); ++ $target . '/share/libpq/tsearch_data/'); + CopySetOfFiles( + 'Dictionaries sample files', + [ glob("src\\backend\\tsearch\\dicts\\*_sample*") ], +- $target . '/share/tsearch_data/'); ++ $target . '/share/libpq/tsearch_data/'); + + my $pl_extension_files = []; + my @pldirs = ('src/pl/plpgsql/src'); +@@ -178,7 +178,7 @@ sub Install + }, + @pldirs); + CopySetOfFiles('PL Extension files', +- $pl_extension_files, $target . '/share/extension/'); ++ $pl_extension_files, $target . '/share/libpq/extension/'); + } + + GenerateNLSFiles($target, $config->{nls}, $majorver) if ($config->{nls}); +@@ -293,23 +293,26 @@ sub CopySolutionOutput + { + if ($1 == 1) + { +- push(@{ $install_list{'bin'} }, "exe"); ++ push(@{ $install_list{'tools\\libpq'} }, "exe"); + } + elsif ($1 == 2) + { +- push(@{ $install_list{'lib'} }, "dll"); ++ push(@{ $install_list{'bin'} }, "dll"); + if ($is_sharedlib) + { + push(@{ $install_list{'bin'} }, "dll"); + push(@{ $install_list{'lib'} }, "lib"); + } ++ else ++ { ++ push(@{ $install_list{'lib'} }, "lib"); ++ } + } + else + { +- ++ push(@{ $install_list{'lib'} }, "lib"); + # Static libraries, such as libpgport, only used internally + # during build, don't install. +- next; + } + } + elsif ($vcproj eq 'vcxproj' +@@ -320,11 +320,11 @@ sub CopySolutionOutput + { + if ($1 eq 'Application') + { +- push(@{ $install_list{'bin'} }, "exe"); ++ push(@{ $install_list{'tools\\libpq'} }, "exe"); + } + elsif ($1 eq 'DynamicLibrary') + { +- push(@{ $install_list{'lib'} }, "dll"); ++ push(@{ $install_list{'bin'} }, "dll"); + if ($is_sharedlib) + { + push(@{ $install_list{'bin'} }, "dll"); +@@ -333,10 +333,9 @@ sub CopySolutionOutput + } + else # 'StaticLibrary' + { +- ++ push(@{ $install_list{'lib'} }, "lib"); + # Static lib, such as libpgport, only used internally + # during build, don't install. +- next; + } + } + else +@@ -352,7 +352,7 @@ sub CopySolutionOutput + || croak "Could not copy $pf.$ext\n"; + } + } +- lcopy("$conf\\$pf\\$pf.pdb", "$target\\symbols\\$pf.pdb") ++ lcopy("$conf\\$pf\\$pf.pdb", "$target\\bin\\$pf.pdb") + || croak "Could not copy $pf.pdb\n"; + print "."; + } +@@ -374,5 +374,5 @@ sub GenerateTimezoneFiles + print "Generating timezone files..."; + +- my @args = ("$conf/zic/zic", '-d', "$target/share/timezone"); ++ my @args = ("$conf/zic/zic", '-d', "$target/share/libpq/timezone"); + foreach (@tzfiles) + { +@@ -398,7 +398,7 @@ sub GenerateTsearchFiles + $mf =~ /^LANGUAGES\s*=\s*(.*)$/m + || die "Could not find LANGUAGES line in snowball Makefile\n"; + my @pieces = split /\s+/, $1; +- open($F, '>', "$target/share/snowball_create.sql") ++ open($F, '>', "$target/share/libpq/snowball_create.sql") + || die "Could not write snowball_create.sql"; + print $F read_file('src/backend/snowball/snowball_func.sql.in'); + +@@ -483,7 +483,7 @@ sub CopySubdirFiles + foreach my $f (split /\s+/, $flist) + { + lcopy("$subdir/$module/$f.control", +- "$target/share/extension/$f.control") ++ "$target/share/libpq/extension/$f.control") + || croak("Could not copy file $f.control in contrib $module"); + print '.'; + } +@@ -501,7 +501,7 @@ sub CopySubdirFiles + foreach my $f (split /\s+/, $flist) + { + lcopy("$subdir/$module/$f", +- "$target/share/$moduledir/" . basename($f)) ++ "$target/share/libpq/$moduledir/" . basename($f)) + || croak("Could not copy file $f in contrib $module"); + print '.'; + } +@@ -516,7 +516,7 @@ sub CopySubdirFiles + foreach my $f (split /\s+/, $flist) + { + lcopy("$subdir/$module/$f", +- "$target/share/tsearch_data/" . basename($f)) ++ "$target/share/libpq/tsearch_data/" . basename($f)) + || croak("Could not copy file $f in $subdir $module"); + print '.'; + } +@@ -579,7 +579,7 @@ sub CopySubdirFiles + if ($module eq 'spi'); + foreach my $f (split /\s+/, $flist) + { +- lcopy("$subdir/$module/$f", "$target/doc/$moduledir/$f") ++ lcopy("$subdir/$module/$f", "$target/doc/libpq/$moduledir/$f") + || croak("Could not copy file $f in contrib $module"); + print '.'; + } +@@ -708,7 +708,7 @@ sub GenerateNLSFiles + my $majorver = shift; + + print "Installing NLS files..."; +- EnsureDirectories($target, "share/locale"); ++ EnsureDirectories($target, "share/libpq/locale"); + my @flist; + File::Find::find( + { +@@ -730,12 +730,12 @@ sub GenerateNLSFiles + next unless /([^\/]+)\.po/; + $lang = $1; + +- EnsureDirectories($target, "share/locale/$lang", +- "share/locale/$lang/LC_MESSAGES"); ++ EnsureDirectories($target, "share/libpq/locale/$lang", ++ "share/libpq/locale/$lang/LC_MESSAGES"); + my @args = ( + "$nlspath\\bin\\msgfmt", + '-o', +- "$target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo", ++ "$target\\share\\libpq\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo", + $_); + system(@args) && croak("Could not run msgfmt on $dir\\$_"); + print "."; diff --git a/externals/vcpkg/ports/libpq/patches/windows/minimize_install.patch b/externals/vcpkg/ports/libpq/patches/windows/minimize_install.patch new file mode 100755 index 000000000..1a57c275f --- /dev/null +++ b/externals/vcpkg/ports/libpq/patches/windows/minimize_install.patch @@ -0,0 +1,35 @@ +diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm +index d109b2c90..75c7446e6 100644 +--- a/src/tools/msvc/Install.pm ++++ b/src/tools/msvc/Install.pm +@@ -22,13 +22,13 @@ our (@ISA, @EXPORT_OK); + + my $insttype; + my @client_contribs = ('oid2name', 'pgbench', 'vacuumlo'); +-my @client_program_files = ( +- 'clusterdb', 'createdb', 'createuser', 'dropdb', +- 'dropuser', 'ecpg', 'libecpg', 'libecpg_compat', +- 'libpgtypes', 'libpq', 'pg_amcheck', 'pg_basebackup', +- 'pg_config', 'pg_dump', 'pg_dumpall', 'pg_isready', +- 'pg_receivewal', 'pg_recvlogical', 'pg_restore', 'psql', +- 'reindexdb', 'vacuumdb', @client_contribs); ++my @client_program_files = ( 'libecpg','libecpg_compat', 'libpgtypes', 'libpq' ); ++ #'clusterdb', 'createdb', 'createuser', 'dropdb', ++ #'dropuser', 'ecpg', 'libecpg', 'libecpg_compat', ++ #'libpgtypes', 'libpq', 'pg_amcheck', 'pg_basebackup', ++ #'pg_config', 'pg_dump', 'pg_dumpall', 'pg_isready', ++ #'pg_receivewal', 'pg_recvlogical', 'pg_restore', 'psql', ++ #'reindexdb', 'vacuumdb', @client_contribs); + + sub lcopy + { +@@ -121,7 +121,7 @@ sub Install + CopyFiles( + 'Import libraries', + $target . '/lib/', +- "$conf\\", "postgres\\postgres.lib", "libpgcommon\\libpgcommon.lib", ++ "$conf\\", "libpgcommon\\libpgcommon.lib", + "libpgport\\libpgport.lib"); + CopyContribFiles($config, $target); + CopyIncludeFiles($target); + diff --git a/externals/vcpkg/ports/libpq/patches/windows/msgfmt.patch b/externals/vcpkg/ports/libpq/patches/windows/msgfmt.patch new file mode 100755 index 000000000..98be285bc --- /dev/null +++ b/externals/vcpkg/ports/libpq/patches/windows/msgfmt.patch @@ -0,0 +1,13 @@ +diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm +index 66c0c3483..2154c6cf6 100644 +--- a/src/tools/msvc/Install.pm ++++ b/src/tools/msvc/Install.pm +@@ -733,7 +733,7 @@ sub GenerateNLSFiles + EnsureDirectories($target, "share/libpq/locale/$lang", + "share/libpq/locale/$lang/LC_MESSAGES"); + my @args = ( +- "$nlspath\\bin\\msgfmt", ++ "msgfmt.exe", + '-o', + "$target\\share\\libpq\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo", + $_); diff --git a/externals/vcpkg/ports/libpq/patches/windows/openssl_exe_path.patch b/externals/vcpkg/ports/libpq/patches/windows/openssl_exe_path.patch new file mode 100755 index 000000000..813ea58b1 --- /dev/null +++ b/externals/vcpkg/ports/libpq/patches/windows/openssl_exe_path.patch @@ -0,0 +1,13 @@ +diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm +index 51711c2bf..d33fdc3b0 100644 +--- a/src/tools/msvc/Solution.pm ++++ b/src/tools/msvc/Solution.pm +@@ -129,7 +129,7 @@ sub GetOpenSSLVersion + # openssl.exe is in the specified directory. + # Quote the .exe name in case it has spaces + my $opensslcmd = +- qq("$self->{options}->{openssl}\\bin\\openssl.exe" version 2>&1); ++ qq("openssl.exe" version 2>&1); + my $sslout = `$opensslcmd`; + + $? >> 8 == 0 diff --git a/externals/vcpkg/ports/libpq/patches/windows/python3_build_DEBUG.patch b/externals/vcpkg/ports/libpq/patches/windows/python3_build_DEBUG.patch new file mode 100755 index 000000000..f6124d8ec --- /dev/null +++ b/externals/vcpkg/ports/libpq/patches/windows/python3_build_DEBUG.patch @@ -0,0 +1,40 @@ +diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm +index 99f39caa5..21b5559d6 100644 +--- a/src/tools/msvc/Mkvcbuild.pm ++++ b/src/tools/msvc/Mkvcbuild.pm +@@ -494,14 +494,15 @@ sub mkvcbuild + + # Attempt to get python version and location. + # Assume python.exe in specified dir. +- my $pythonprog = "import sys;print(sys.prefix);" +- . "print(str(sys.version_info[0])+str(sys.version_info[1]))"; +- my $prefixcmd = +- qq("$solution->{options}->{python}\\python" -c "$pythonprog"); +- my $pyout = `$prefixcmd`; +- die "Could not query for python version!\n" if $?; +- my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); +- ++ #my $pythonprog = "import sys;print(sys.prefix);" ++ # . "print(str(sys.version_info[0])+str(sys.version_info[1]))"; ++ #my $prefixcmd = ++ # qq("$solution->{options}->{python}\\python" -c "$pythonprog"); ++ #my $pyout = `$prefixcmd`; ++ #die "Could not query for python version!\n" if $?; ++ #my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); ++ my $pyprefix = $solution->{options}->{python}; ++ my $pyver = 310; + # Sometimes (always?) if python is not present, the execution + # appears to work, but gives no data... + die "Failed to query python for version information\n" +@@ -510,8 +511,9 @@ sub mkvcbuild + my $pymajorver = substr($pyver, 0, 1); + my $plpython = $solution->AddProject('plpython' . $pymajorver, + 'dll', 'PLs', 'src/pl/plpython'); +- $plpython->AddIncludeDir($pyprefix . '/include'); +- $plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib"); ++ $plpython->AddIncludeDir($pyprefix . '/include/python3.10'); ++ $plpython->AddDefine('_DEBUG'); # required for python autolink linking correctly! ++ $plpython->AddLibrary($pyprefix . "/debug/lib/python$pyver" . "_d.lib"); + $plpython->AddReference($postgres); + + # Add transform modules dependent on plpython diff --git a/externals/vcpkg/ports/libpq/patches/windows/python3_build_RELEASE.patch b/externals/vcpkg/ports/libpq/patches/windows/python3_build_RELEASE.patch new file mode 100755 index 000000000..f559e9af4 --- /dev/null +++ b/externals/vcpkg/ports/libpq/patches/windows/python3_build_RELEASE.patch @@ -0,0 +1,39 @@ +diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm +index 99f39caa5..21b5559d6 100644 +--- a/src/tools/msvc/Mkvcbuild.pm ++++ b/src/tools/msvc/Mkvcbuild.pm +@@ -494,14 +494,15 @@ sub mkvcbuild + + # Attempt to get python version and location. + # Assume python.exe in specified dir. +- my $pythonprog = "import sys;print(sys.prefix);" +- . "print(str(sys.version_info[0])+str(sys.version_info[1]))"; +- my $prefixcmd = +- qq("$solution->{options}->{python}\\python" -c "$pythonprog"); +- my $pyout = `$prefixcmd`; +- die "Could not query for python version!\n" if $?; +- my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); +- ++ #my $pythonprog = "import sys;print(sys.prefix);" ++ # . "print(str(sys.version_info[0])+str(sys.version_info[1]))"; ++ #my $prefixcmd = ++ # qq("$solution->{options}->{python}\\python" -c "$pythonprog"); ++ #my $pyout = `$prefixcmd`; ++ #die "Could not query for python version!\n" if $?; ++ #my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); ++ my $pyprefix = $solution->{options}->{python}; ++ my $pyver = 310; + # Sometimes (always?) if python is not present, the execution + # appears to work, but gives no data... + die "Failed to query python for version information\n" +@@ -510,8 +511,8 @@ sub mkvcbuild + my $pymajorver = substr($pyver, 0, 1); + my $plpython = $solution->AddProject('plpython' . $pymajorver, + 'dll', 'PLs', 'src/pl/plpython'); +- $plpython->AddIncludeDir($pyprefix . '/include'); +- $plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib"); ++ $plpython->AddIncludeDir($pyprefix . '/include/python3.10'); ++ $plpython->AddLibrary($pyprefix . "/lib/python$pyver.lib"); + $plpython->AddReference($postgres); + + # Add transform modules dependent on plpython diff --git a/externals/vcpkg/ports/libpq/patches/windows/python_lib.patch b/externals/vcpkg/ports/libpq/patches/windows/python_lib.patch new file mode 100755 index 000000000..cd012329f --- /dev/null +++ b/externals/vcpkg/ports/libpq/patches/windows/python_lib.patch @@ -0,0 +1,17 @@ +diff --git a/src/pl/plpython/plpython.h b/src/pl/plpython/plpython.h +index 3a1f0d56d..6a8a09a20 100644 +--- a/src/pl/plpython/plpython.h ++++ b/src/pl/plpython/plpython.h +@@ -45,12 +45,10 @@ + #if defined(_MSC_VER) && defined(_DEBUG) + /* Python uses #pragma to bring in a non-default libpython on VC++ if + * _DEBUG is defined */ +-#undef _DEBUG + /* Also hide away errcode, since we load Python.h before postgres.h */ + #define errcode __msvc_errcode + #include + #undef errcode +-#define _DEBUG + #elif defined (_MSC_VER) + #define errcode __msvc_errcode + #include diff --git a/externals/vcpkg/ports/libpq/patches/windows/tcl_version.patch b/externals/vcpkg/ports/libpq/patches/windows/tcl_version.patch new file mode 100755 index 000000000..5518949a3 --- /dev/null +++ b/externals/vcpkg/ports/libpq/patches/windows/tcl_version.patch @@ -0,0 +1,13 @@ +diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm +index e2fbe95..8c4f279 100644 +--- a/src/tools/msvc/Mkvcbuild.pm ++++ b/src/tools/msvc/Mkvcbuild.pm +@@ -226,7 +226,7 @@ sub mkvcbuild + $pltcl->AddIncludeDir($solution->{options}->{tcl} . '/include'); + $pltcl->AddReference($postgres); + +- for my $tclver (qw(86t 86 85 84)) ++ for my $tclver (qw(90 90g 90s 90sg)) + { + my $tcllib = $solution->{options}->{tcl} . "/lib/tcl$tclver.lib"; + if (-e $tcllib) diff --git a/externals/vcpkg/ports/libpq/patches/windows/win_bison_flex.patch b/externals/vcpkg/ports/libpq/patches/windows/win_bison_flex.patch new file mode 100755 index 000000000..645d53af2 --- /dev/null +++ b/externals/vcpkg/ports/libpq/patches/windows/win_bison_flex.patch @@ -0,0 +1,43 @@ +diff --git a/src/tools/msvc/pgflex.pl b/src/tools/msvc/pgflex.pl +index aceed5ffd..f6ed215e8 100644 +--- a/src/tools/msvc/pgflex.pl ++++ b/src/tools/msvc/pgflex.pl +@@ -16,7 +16,7 @@ $ENV{CYGWIN} = 'nodosfilewarning'; + + do './src/tools/msvc/buildenv.pl' if -e 'src/tools/msvc/buildenv.pl'; + +-my ($flexver) = `flex -V`; # grab first line ++my ($flexver) = `win_flex -V`; # grab first line + $flexver = (split(/\s+/, $flexver))[1]; + $flexver =~ s/[^0-9.]//g; + my @verparts = split(/\./, $flexver); +@@ -52,7 +52,7 @@ close($mf); + my $basetarg = basename($output); + my $flexflags = ($make =~ /^$basetarg:\s*FLEXFLAGS\s*=\s*(\S.*)/m ? $1 : ''); + +-system("flex $flexflags -o$output $input"); ++system("win_flex $flexflags -o$output $input"); + if ($? == 0) + { + +diff --git a/src/tools/msvc/pgbison.pl b/src/tools/msvc/pgbison.pl +index 895e398c0..f5b524a5d 100644 +--- a/src/tools/msvc/pgbison.pl ++++ b/src/tools/msvc/pgbison.pl +@@ -13,7 +13,7 @@ use File::Basename; + + do './src/tools/msvc/buildenv.pl' if -e 'src/tools/msvc/buildenv.pl'; + +-my ($bisonver) = `bison -V`; # grab first line ++my ($bisonver) = `win_bison -V`; # grab first line + $bisonver = (split(/\s+/, $bisonver))[3]; # grab version number + + unless ($bisonver eq '1.875' || $bisonver ge '2.2') +@@ -51,5 +51,5 @@ close($mf); + + my $nodep = $bisonver ge '3.0' ? "-Wno-deprecated" : ""; + +-system("bison $nodep $headerflag $input -o $output"); ++system("win_bison $nodep $headerflag $input -o $output"); + exit $? >> 8; + diff --git a/externals/vcpkg/ports/libpq/portfile.cmake b/externals/vcpkg/ports/libpq/portfile.cmake new file mode 100755 index 000000000..09b36591d --- /dev/null +++ b/externals/vcpkg/ports/libpq/portfile.cmake @@ -0,0 +1,343 @@ +set(PORT_VERSION 14.1) +# NOTE: the python patches must be regenerated on version update + +## Download and extract sources +vcpkg_download_distfile(ARCHIVE + URLS "https://ftp.postgresql.org/pub/source/v${PORT_VERSION}/postgresql-${PORT_VERSION}.tar.bz2" + FILENAME "postgresql-${PORT_VERSION}.tar.bz2" + SHA512 4a0bec157d5464bb9e5f5c0eb0efdede55526e03f6f4d660b87d161a47705eb152fa0878960b1581bce42a5ed28a1f457825ea54e8d22e34b5b8eb36473ceefd +) + +set(PATCHES + patches/windows/install.patch + patches/windows/win_bison_flex.patch + patches/windows/openssl_exe_path.patch + patches/windows/Solution.patch + patches/windows/MSBuildProject_fix_gendef_perl.patch + patches/windows/msgfmt.patch + patches/windows/python_lib.patch + patches/windows/fix-compile-flag-Zi.patch + patches/windows/tcl_version.patch + patches/fix-configure.patch + ) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND PATCHES patches/windows/MSBuildProject-static-lib.patch) + list(APPEND PATCHES patches/windows/Mkvcbuild-static-lib.patch) +endif() +if(VCPKG_CRT_LINKAGE STREQUAL "static") + list(APPEND PATCHES patches/windows/MSBuildProject-static-crt.patch) +endif() +if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm") + list(APPEND PATCHES patches/windows/arm.patch) + list(APPEND PATCHES patches/windows/host_skip_openssl.patch) # Skip openssl.exe version check since it cannot be executed by the host +endif() +if(NOT "${FEATURES}" MATCHES "client") + list(APPEND PATCHES patches/windows/minimize_install.patch) +else() + set(HAS_TOOLS TRUE) +endif() +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES ${PATCHES} +) +unset(buildenv_contents) +# Get paths to required programs +set(REQUIRED_PROGRAMS PERL) +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND REQUIRED_PROGRAMS BISON FLEX) +endif() +foreach(program_name ${REQUIRED_PROGRAMS}) + # Need to rename win_bison and win_flex to just bison and flex + vcpkg_find_acquire_program(${program_name}) + get_filename_component(${program_name}_EXE_PATH ${${program_name}} DIRECTORY) + vcpkg_add_to_path(PREPEND "${${program_name}_EXE_PATH}") + set(buildenv_contents "${buildenv_contents}\n\$ENV{'PATH'}=\$ENV{'PATH'} . ';${${program_name}_EXE_PATH}';") +endforeach() + +## Setup build types +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE MATCHES "[Rr][Ee][Ll][Ee][Aa][Ss][Ee]") + set(_buildtype RELEASE) + set(_short rel) + list(APPEND port_config_list ${_buildtype}) + set(INSTALL_PATH_SUFFIX_${_buildtype} "") + set(BUILDPATH_${_buildtype} "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${_short}") + file(REMOVE_RECURSE "${BUILDPATH_${_buildtype}}") #Clean old builds + set(PACKAGE_DIR_${_buildtype} ${CURRENT_PACKAGES_DIR}) + unset(_short) + unset(_buildtype) +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg]") + set(_buildtype DEBUG) + set(_short dbg) + list(APPEND port_config_list ${_buildtype}) + set(INSTALL_PATH_SUFFIX_${_buildtype} "/debug") + set(BUILDPATH_${_buildtype} "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${_short}") + file(REMOVE_RECURSE "${BUILDPATH_${_buildtype}}") #Clean old builds + set(PACKAGE_DIR_${_buildtype} "${CURRENT_PACKAGES_DIR}${INSTALL_PATH_SUFFIX_${_buildtype}}") + unset(_short) + unset(_buildtype) +endif() + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +## Do the build +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + file(GLOB SOURCE_FILES ${SOURCE_PATH}/*) + foreach(_buildtype ${port_config_list}) + # Copy libpq sources. + message(STATUS "Copying libpq source files to ${BUILDPATH_${_buildtype}}...") + foreach(SOURCE_FILE ${SOURCE_FILES}) + file(COPY ${SOURCE_FILE} DESTINATION "${BUILDPATH_${_buildtype}}") + endforeach() + message(STATUS "Copying libpq source files... done") + + vcpkg_apply_patches( + SOURCE_PATH "${BUILDPATH_${_buildtype}}" + PATCHES patches/windows/Solution_${_buildtype}.patch + patches/windows/python3_build_${_buildtype}.patch + ) + message(STATUS "Patches applied!") + file(COPY "${CURRENT_PORT_DIR}/config.pl" DESTINATION "${BUILDPATH_${_buildtype}}/src/tools/msvc") + + set(MSPROJ_PERL "${BUILDPATH_${_buildtype}}/src/tools/msvc/MSBuildProject.pm") + file(READ "${MSPROJ_PERL}" _contents) + string(REPLACE "perl" "\"${PERL}\"" _contents "${_contents}") + file(WRITE "${MSPROJ_PERL}" "${_contents}") + + set(CONFIG_FILE "${BUILDPATH_${_buildtype}}/src/tools/msvc/config.pl") + file(READ "${CONFIG_FILE}" _contents) + + ## ldap => undef, # --with-ldap + ## extraver => undef, # --with-extra-version= + ## gss => undef, # --with-gssapi= + ## icu => undef, # --with-icu= ##done + ## nls => undef, # --enable-nls= ##done + ## tap_tests => undef, # --enable-tap-tests + ## tcl => undef, # --with-tcl= #done + ## perl => undef, # --with-perl + ## python => undef, # --with-python= ##done + ## openssl => undef, # --with-openssl= ##done + ## uuid => undef, # --with-ossp-uuid + ## xml => undef, # --with-libxml= ##done + ## xslt => undef, # --with-libxslt= ##done + ## iconv => undef, # (not in configure, path to iconv) ##done (needed by xml) + ## zlib => undef # --with-zlib= ##done + + ## Setup external dependencies + ##"-DFEATURES=core;openssl;zlib" "-DALL_FEATURES=openssl;zlib;readline;libedit;python;tcl;nls;systemd;llvm;icu;bonjour;uuid;xml;xslt;" + if("${FEATURES}" MATCHES "icu") + string(REPLACE "icu => undef" "icu => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") + endif() + if("${FEATURES}" MATCHES "nls") + string(REPLACE "nls => undef" "nls => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") + vcpkg_acquire_msys(MSYS_ROOT PACKAGES gettext) + vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") + endif() + if("${FEATURES}" MATCHES "openssl") + set(buildenv_contents "${buildenv_contents}\n\$ENV{'PATH'}=\$ENV{'PATH'} . ';${CURRENT_INSTALLED_DIR}/tools/openssl';") + #set(_contents "${_contents}\n\$ENV{PATH}=\$ENV{PATH} . ';${CURRENT_INSTALLED_DIR}/tools/openssl';") + string(REPLACE "openssl => undef" "openssl => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") + endif() + if("${FEATURES}" MATCHES "python") + #vcpkg_find_acquire_program(PYTHON3) + #get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) + #vcpkg_add_to_path("${PYTHON3_EXE_PATH}") + string(REPLACE "python => undef" "python => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") + endif() + if("${FEATURES}" MATCHES "tcl") + string(REPLACE "tcl => undef" "tcl => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") + endif() + if("${FEATURES}" MATCHES "xml") + string(REPLACE "xml => undef" "xml => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") + string(REPLACE "iconv => undef" "iconv => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") + endif() + if("${FEATURES}" MATCHES "xslt") + string(REPLACE "xslt => undef" "xslt => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") + endif() + if("${FEATURES}" MATCHES "zlib") + string(REPLACE "zlib => undef" "zlib => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") + endif() + if("${FEATURES}" MATCHES "lz4") + string(REPLACE "lz4 => undef" "lz4 => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") + endif() + + file(WRITE "${CONFIG_FILE}" "${_contents}") + file(WRITE "${BUILDPATH_${_buildtype}}/src/tools/msvc/buildenv.pl" "${buildenv_contents}") + vcpkg_get_windows_sdk(VCPKG_TARGET_PLATFORM_VERSION) + set(ENV{MSBFLAGS} "/p:PlatformToolset=${VCPKG_PLATFORM_TOOLSET} + /p:VCPkgLocalAppDataDisabled=true + /p:UseIntelMKL=No + /p:WindowsTargetPlatformVersion=${VCPKG_TARGET_PLATFORM_VERSION} + /m + /p:ForceImportBeforeCppTargets=\"${SCRIPTS}/buildsystems/msbuild/vcpkg.targets\" + /p:VcpkgTriplet=${TARGET_TRIPLET} + /p:VcpkgCurrentInstalledDir=\"${CURRENT_INSTALLED_DIR}\"" + ) + if(HAS_TOOLS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) + set(ENV{MSBFLAGS} "$ENV{MSBFLAGS} /p:Platform=Win32") + endif() + message(STATUS "Building libpq ${TARGET_TRIPLET}-${_buildtype}...") + vcpkg_execute_required_process( + COMMAND ${PERL} build.pl ${_buildtype} + WORKING_DIRECTORY "${BUILDPATH_${_buildtype}}/src/tools/msvc" + LOGNAME "build-${TARGET_TRIPLET}-${_buildtype}" + ) + message(STATUS "Building libpq ${TARGET_TRIPLET}-${_buildtype}... done") + else() + set(build_libs libpq libecpg_compat) + foreach(build_lib ${build_libs}) + message(STATUS "Building ${build_lib} ${TARGET_TRIPLET}-${_buildtype}...") + vcpkg_execute_required_process( + COMMAND ${PERL} build.pl ${_buildtype} ${build_lib} + WORKING_DIRECTORY "${BUILDPATH_${_buildtype}}/src/tools/msvc" + LOGNAME "build-${build_lib}-${TARGET_TRIPLET}-${_buildtype}" + ) + message(STATUS "Building ${build_lib} ${TARGET_TRIPLET}-${_buildtype}... done") + endforeach() + endif() + + message(STATUS "Installing libpq ${TARGET_TRIPLET}-${_buildtype}...") + vcpkg_execute_required_process( + COMMAND ${PERL} install.pl "${CURRENT_PACKAGES_DIR}${INSTALL_PATH_SUFFIX_${_buildtype}}" client + WORKING_DIRECTORY "${BUILDPATH_${_buildtype}}/src/tools/msvc" + LOGNAME "install-${TARGET_TRIPLET}-${_buildtype}" + ) + message(STATUS "Installing libpq ${TARGET_TRIPLET}-${_buildtype}... done") + endforeach() + + + message(STATUS "Cleanup libpq ${TARGET_TRIPLET}...") + #Cleanup + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/doc") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/symbols") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/symbols") + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() + + if(NOT HAS_TOOLS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools") + else() + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") + endif() + + message(STATUS "Cleanup libpq ${TARGET_TRIPLET}... - done") + set(USE_DL OFF) +else() + file(COPY "${CMAKE_CURRENT_LIST_DIR}/Makefile" DESTINATION "${SOURCE_PATH}") + + if("nls" IN_LIST FEATURES) + list(APPEND BUILD_OPTS --enable-nls) + set(ENV{MSGFMT} "${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin/msgfmt${VCPKG_HOST_EXECUTABLE_SUFFIX}") + else() + list(APPEND BUILD_OPTS --disable-nls) + endif() + if("openssl" IN_LIST FEATURES) + list(APPEND BUILD_OPTS --with-openssl) + else() + list(APPEND BUILD_OPTS --without-openssl) + endif() + if("zlib" IN_LIST FEATURES) + list(APPEND BUILD_OPTS --with-zlib) + else() + list(APPEND BUILD_OPTS --without-zlib) + endif() + if("icu" IN_LIST FEATURES) + list(APPEND BUILD_OPTS --with-icu) + else() + list(APPEND BUILD_OPTS --without-icu) + endif() + if("lz4" IN_LIST FEATURES) + list(APPEND BUILD_OPTS --with-lz4) + else() + list(APPEND BUILD_OPTS --without-lz4) + endif() + if("readline" IN_LIST FEATURES) + list(APPEND BUILD_OPTS --with-readline) + else() + list(APPEND BUILD_OPTS --without-readline) + endif() + if("xml" IN_LIST FEATURES) + list(APPEND BUILD_OPTS --with-libxml) + else() + list(APPEND BUILD_OPTS --without-libxml) + endif() + if("xslt" IN_LIST FEATURES) + list(APPEND BUILD_OPTS --with-libxslt) + else() + list(APPEND BUILD_OPTS --without-libxslt) + endif() + if("python" IN_LIST FEATURES) + list(APPEND BUILD_OPTS --with-python) + else() + list(APPEND BUILD_OPTS --without-python) + endif() + if(VCPKG_TARGET_IS_ANDROID) # AND CMAKE_SYSTEM_VERSION LESS 26) + list(APPEND BUILD_OPTS ac_cv_header_langinfo_h=no) + endif() + if(VCPKG_OSX_SYSROOT) + list(APPEND BUILD_OPTS "PG_SYSROOT=${VCPKG_OSX_SYSROOT}") + endif() + vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH "${SOURCE_PATH}" + COPY_SOURCE + DETERMINE_BUILD_TRIPLET + OPTIONS + ${BUILD_OPTS} + OPTIONS_DEBUG + --enable-debug + ) + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(ENV{LIBPQ_LIBRARY_TYPE} shared) + else() + set(ENV{LIBPQ_LIBRARY_TYPE} static) + endif() + if(VCPKG_TARGET_IS_MINGW) + set(ENV{USING_MINGW} yes) + endif() + vcpkg_install_make() + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + if(NOT HAS_TOOLS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + else() + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") + endif() + if(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libpq.a" "${CURRENT_PACKAGES_DIR}/lib/libpq.dll.a") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libpq.dll" "${CURRENT_PACKAGES_DIR}/bin/libpq.dll") + endif() + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libpq.a" "${CURRENT_PACKAGES_DIR}/debug/lib/libpq.dll.a") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libpq.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/libpq.dll") + endif() + endif() + if(VCPKG_TARGET_IS_MINGW) + set(USE_DL OFF) + else() + set(USE_DL ON) + endif() + + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/postgresql/server/pg_config.h" "#define CONFIGURE_ARGS" "// #define CONFIGURE_ARGS") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pg_config.h" "#define CONFIGURE_ARGS" "// #define CONFIGURE_ARGS") +endif() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/postgresql/vcpkg-cmake-wrapper.cmake" @ONLY) +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/libpq/usage b/externals/vcpkg/ports/libpq/usage new file mode 100755 index 000000000..8dfcd2754 --- /dev/null +++ b/externals/vcpkg/ports/libpq/usage @@ -0,0 +1,4 @@ +The package libpq provides CMake integration: + + find_package(PostgreSQL REQUIRED) + target_link_libraries(main PRIVATE PostgreSQL::PostgreSQL) diff --git a/externals/vcpkg/ports/libpq/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/libpq/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..200b10d48 --- /dev/null +++ b/externals/vcpkg/ports/libpq/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,66 @@ +# Give the CMake module a little bit of help to find the debug libraries +find_library(PostgreSQL_LIBRARY_DEBUG +NAMES pq +PATHS + "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" +NO_DEFAULT_PATH +) +_find_package(${ARGS}) +if(PostgreSQL_FOUND AND @USE_DL@) + find_library(PostgreSQL_DL_LIBRARY NAMES dl) + if(PostgreSQL_DL_LIBRARY) + list(APPEND PostgreSQL_LIBRARIES "dl") + if(TARGET PostgreSQL::PostgreSQL) + set_property(TARGET PostgreSQL::PostgreSQL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "dl") + endif() + endif() +endif() +if(PostgreSQL_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + include(SelectLibraryConfigurations) + foreach(LIB_ITEM libpgport libpgcommon pgport pgcommon) + find_library(PostgreSQL_${LIB_ITEM}_LIBRARY_RELEASE + NAMES ${LIB_ITEM} + PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH + ) + if(TARGET PostgreSQL::PostgreSQL AND PostgreSQL_${LIB_ITEM}_LIBRARY_RELEASE) + set_property( + TARGET PostgreSQL::PostgreSQL + APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<\$>:${PostgreSQL_${LIB_ITEM}_LIBRARY_RELEASE}>" + ) + endif() + + find_library(PostgreSQL_${LIB_ITEM}_LIBRARY_DEBUG + NAMES ${LIB_ITEM} + PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH + ) + if(TARGET PostgreSQL::PostgreSQL AND PostgreSQL_${LIB_ITEM}_LIBRARY_DEBUG) + set_property( + TARGET PostgreSQL::PostgreSQL + APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<\$:${PostgreSQL_${LIB_ITEM}_LIBRARY_DEBUG}>" + ) + endif() + + if (PostgreSQL_${LIB_ITEM}_LIBRARY_RELEASE OR PostgreSQL_${LIB_ITEM}_LIBRARY_DEBUG) + select_library_configurations(PostgreSQL_${LIB_ITEM}) + list(APPEND PostgreSQL_LIBRARIES ${PostgreSQL_${LIB_ITEM}_LIBRARY}) + endif() + endforeach() + if(WIN32) + if(TARGET PostgreSQL::PostgreSQL) + set_property(TARGET PostgreSQL::PostgreSQL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Secur32.lib") + endif() + list(APPEND PostgreSQL_LIBRARIES Secur32.lib) + endif() + cmake_policy(PUSH) + cmake_policy(SET CMP0057 NEW) + set(Z_VCPKG_PORT_FEATURES "@FEATURES@") + if("openssl" IN_LIST Z_VCPKG_PORT_FEATURES) + find_package(OpenSSL REQUIRED) + if(TARGET PostgreSQL::PostgreSQL) + set_property(TARGET PostgreSQL::PostgreSQL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "OpenSSL::SSL") + endif() + list(APPEND PostgreSQL_LIBRARIES OpenSSL::SSL) + endif() + unset(Z_VCPKG_PORT_FEATURES) + cmake_policy(POP) +endif() diff --git a/externals/vcpkg/ports/libpq/vcpkg.json b/externals/vcpkg/ports/libpq/vcpkg.json new file mode 100755 index 000000000..3e2532f4b --- /dev/null +++ b/externals/vcpkg/ports/libpq/vcpkg.json @@ -0,0 +1,125 @@ +{ + "name": "libpq", + "version": "14.1", + "port-version": 2, + "description": "The official database access API of postgresql", + "homepage": "https://www.postgresql.org/", + "license": "PostgreSQL", + "supports": "!uwp", + "dependencies": [ + { + "name": "libpq", + "default-features": false, + "features": [ + "bonjour" + ], + "platform": "osx" + } + ], + "default-features": [ + "lz4", + "openssl", + "zlib" + ], + "features": { + "bonjour": { + "description": "Build with Bonjour support (--with-bonjour)", + "supports": "osx" + }, + "client": { + "description": "Build all client tools and libraries (dynamic only?)", + "supports": "!(windows & !mingw & static)" + }, + "icu": { + "description": "Build with support for the ICU library (--with-icu)", + "dependencies": [ + "icu" + ] + }, + "lz4": { + "description": "Use lz4 (else --without-lz4)", + "dependencies": [ + "lz4" + ] + }, + "nls": { + "description": "Native Language Support (--enable-nls[=LANGUAGES])", + "dependencies": [ + "gettext", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + } + ] + }, + "openssl": { + "description": "support for encrypted client connections and random number generation on platforms that do not have \"/dev/urandom\" (except windows) (--with-openssl)", + "dependencies": [ + "openssl" + ] + }, + "python": { + "description": "build the PL/Python server programming language (dynamic only?) (--with-python)", + "supports": "!(windows & (static | mingw))", + "dependencies": [ + { + "name": "libpq", + "default-features": false, + "features": [ + "client" + ] + }, + "python3" + ] + }, + "readline": { + "description": "Use readline (else --without-readline)", + "supports": "!windows, mingw", + "dependencies": [ + "readline" + ] + }, + "tcl": { + "description": "build the PL/Tcl procedural language(dynamic only?) (--with-tcl)", + "supports": "!(windows & (static | mingw))", + "dependencies": [ + { + "name": "libpq", + "default-features": false, + "features": [ + "client" + ] + }, + "tcl" + ] + }, + "xml": { + "description": "Build with libxml (--with-libxml)", + "dependencies": [ + "libxml2" + ] + }, + "xslt": { + "description": "Build with libxslt (--with-libxslt)", + "dependencies": [ + { + "name": "libpq", + "default-features": false, + "features": [ + "xml" + ] + }, + "libxslt" + ] + }, + "zlib": { + "description": "Use zlib (else --without-zlib)", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/libpqxx/config-internal-compiler.h.in b/externals/vcpkg/ports/libpqxx/config-internal-compiler.h.in new file mode 100755 index 000000000..6a5f07fbe --- /dev/null +++ b/externals/vcpkg/ports/libpqxx/config-internal-compiler.h.in @@ -0,0 +1,14 @@ +/* System supports poll(). */ +#cmakedefine HAVE_POLL 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_SYS_SELECT_H 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_UNISTD_H 1 diff --git a/externals/vcpkg/ports/libpqxx/config-public-compiler.h.in b/externals/vcpkg/ports/libpqxx/config-public-compiler.h.in new file mode 100755 index 000000000..24479707a --- /dev/null +++ b/externals/vcpkg/ports/libpqxx/config-public-compiler.h.in @@ -0,0 +1,8 @@ +/* Define if compiler supports [[deprecated]] attribute */ +#cmakedefine PQXX_HAVE_DEPRECATED 1 + +/* Define if the compiler supports std::experimental::optional. */ +#cmakedefine PQXX_HAVE_EXP_OPTIONAL 1 + +/* Define if the compiler supports std::optional. */ +#cmakedefine PQXX_HAVE_OPTIONAL 1 diff --git a/externals/vcpkg/ports/libpqxx/fix_build_with_vs2017.patch b/externals/vcpkg/ports/libpqxx/fix_build_with_vs2017.patch new file mode 100755 index 000000000..9892415b0 --- /dev/null +++ b/externals/vcpkg/ports/libpqxx/fix_build_with_vs2017.patch @@ -0,0 +1,104 @@ +diff --git a/include/pqxx/internal/header-pre.hxx b/include/pqxx/internal/header-pre.hxx +index abc1a39..cba0242 100644 +--- a/include/pqxx/internal/header-pre.hxx ++++ b/include/pqxx/internal/header-pre.hxx +@@ -90,6 +90,12 @@ + // Workarounds for Microsoft Visual C++ + # ifdef _MSC_VER + ++ ++// Workarounds for deprecated attribute syntax error in Visual Studio 2017. ++# if _MSC_VER < 1920 ++# define PQXX_DEPRECATED(MESSAGE) __declspec(deprecated( #MESSAGE )) ++# endif ++ + // Suppress vtables on abstract classes. + # define PQXX_NOVTABLE __declspec(novtable) + +@@ -159,6 +165,10 @@ + # define PQXX_NOVTABLE /* novtable */ + #endif + ++#ifndef PQXX_DEPRECATED ++# define PQXX_DEPRECATED(MESSAGE) [[deprecated( #MESSAGE )]] ++#endif ++ + // C++20: Assume support. + #if defined(PQXX_HAVE_LIKELY) + # define PQXX_LIKELY [[likely]] +diff --git a/include/pqxx/stream_from.hxx b/include/pqxx/stream_from.hxx +index ff4a93d..5b300d6 100644 +--- a/include/pqxx/stream_from.hxx ++++ b/include/pqxx/stream_from.hxx +@@ -153,7 +153,7 @@ public: + /** @deprecated Use factories @ref table or @ref raw_table instead. + */ + template +- [[deprecated("Use table() or raw_table() factory instead.")]] stream_from( ++ PQXX_DEPRECATED("Use table() or raw_table() factory instead.") stream_from( + transaction_base &, from_table_t, std::string_view table, + Iter columns_begin, Iter columns_end); + +@@ -161,13 +161,13 @@ public: + /** @deprecated Use factory function @ref query instead. + */ + template +- [[deprecated("Use table() or raw_table() factory instead.")]] stream_from( ++ PQXX_DEPRECATED("Use table() or raw_table() factory instead.") stream_from( + transaction_base &tx, from_table_t, std::string_view table, + Columns const &columns); + + #include "pqxx/internal/ignore-deprecated-pre.hxx" + /// @deprecated Use factories @ref table or @ref raw_table instead. +- [[deprecated("Use the from_table_t overload instead.")]] stream_from( ++ PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from( + transaction_base &tx, std::string_view table) : + stream_from{tx, from_table, table} + {} +@@ -175,14 +175,14 @@ public: + + /// @deprecated Use factories @ref table or @ref raw_table instead. + template +- [[deprecated("Use the from_table_t overload instead.")]] stream_from( ++ PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from( + transaction_base &tx, std::string_view table, Columns const &columns) : + stream_from{tx, from_table, table, columns} + {} + + /// @deprecated Use factories @ref table or @ref raw_table instead. + template +- [[deprecated("Use the from_table_t overload instead.")]] stream_from( ++ PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from( + transaction_base &, std::string_view table, Iter columns_begin, + Iter columns_end); + +diff --git a/include/pqxx/stream_to.hxx b/include/pqxx/stream_to.hxx +index 2a49d8f..06e602e 100644 +--- a/include/pqxx/stream_to.hxx ++++ b/include/pqxx/stream_to.hxx +@@ -169,7 +169,7 @@ public: + * your data fields and the table is explicit in your code, and not hidden + * in an "implicit contract" between your code and your schema. + */ +- [[deprecated("Use table() or raw_table() factory.")]] stream_to( ++ PQXX_DEPRECATED("Use table() or raw_table() factory.") stream_to( + transaction_base &tx, std::string_view table_name) : + stream_to{tx, table_name, ""sv} + {} +@@ -178,14 +178,14 @@ public: + /** @deprecated Use @ref table or @ref raw_table as a factory. + */ + template +- [[deprecated("Use table() or raw_table() factory.")]] stream_to( ++ PQXX_DEPRECATED("Use table() or raw_table() factory.") stream_to( + transaction_base &, std::string_view table_name, Columns const &columns); + + /// Create a stream, specifying column names as a sequence of strings. + /** @deprecated Use @ref table or @ref raw_table as a factory. + */ + template +- [[deprecated("Use table() or raw_table() factory.")]] stream_to( ++ PQXX_DEPRECATED("Use table() or raw_table() factory.") stream_to( + transaction_base &, std::string_view table_name, Iter columns_begin, + Iter columns_end); + diff --git a/externals/vcpkg/ports/libpqxx/portfile.cmake b/externals/vcpkg/ports/libpqxx/portfile.cmake new file mode 100755 index 000000000..84df95397 --- /dev/null +++ b/externals/vcpkg/ports/libpqxx/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jtv/libpqxx + REF 90768b07f7feb55a9bd70cfaacb5543bfd074022 # 7.7.3 + SHA512 cbb21b148135d9426acd8006bfab872997bae65cfaa7af414083a8d219f099edcc83de7bde5e36016c1f8333f1e4d03fc401a4e741dfd0881afda3e1a20009ff + HEAD_REF master + PATCHES + fix_build_with_vs2017.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/config-public-compiler.h.in" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/config-internal-compiler.h.in" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSKIP_BUILD_TEST=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libpqxx) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/libpqxx/vcpkg.json b/externals/vcpkg/ports/libpqxx/vcpkg.json new file mode 100755 index 000000000..56d171359 --- /dev/null +++ b/externals/vcpkg/ports/libpqxx/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libpqxx", + "version": "7.7.3", + "description": "The official C++ client API for PostgreSQL", + "homepage": "https://www.postgresql.org/", + "license": "BSD-3-Clause", + "dependencies": [ + "libpq", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libprotobuf-mutator/portfile.cmake b/externals/vcpkg/ports/libprotobuf-mutator/portfile.cmake new file mode 100755 index 000000000..9ce795f25 --- /dev/null +++ b/externals/vcpkg/ports/libprotobuf-mutator/portfile.cmake @@ -0,0 +1,29 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/libprotobuf-mutator + REF v1.0 + SHA512 75e423289f938d4332d98033062cd9608b71141b7ca1df4e8f28c927c51a16e7ff2f5bf08867308d2a291fc2422e4456f8928ab2c11d545eeb982ea732baf2e9 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_RUNTIME) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DLIB_PROTO_MUTATOR_TESTING=OFF + -DLIB_PROTO_MUTATOR_MSVC_STATIC_RUNTIME=${STATIC_RUNTIME} + -DPKG_CONFIG_PATH=lib/pkgconfig +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libprotobuf-mutator/vcpkg.json b/externals/vcpkg/ports/libprotobuf-mutator/vcpkg.json new file mode 100755 index 000000000..e41bf2652 --- /dev/null +++ b/externals/vcpkg/ports/libprotobuf-mutator/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libprotobuf-mutator", + "version-string": "1.0", + "description": "Library for structured fuzzing with protobuffers.", + "dependencies": [ + "protobuf" + ] +} diff --git a/externals/vcpkg/ports/libproxy/fix-arm-build.patch b/externals/vcpkg/ports/libproxy/fix-arm-build.patch new file mode 100755 index 000000000..c334b8b99 --- /dev/null +++ b/externals/vcpkg/ports/libproxy/fix-arm-build.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1c68939..9ef6895 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -42,6 +42,9 @@ else() + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + endif() + ++if (WIN32) ++ link_libraries(Advapi32) ++endif() + # Conditionally build bindings + if(NOT WIN32) + add_subdirectory(bindings) diff --git a/externals/vcpkg/ports/libproxy/fix-dependency-libmodman.patch b/externals/vcpkg/ports/libproxy/fix-dependency-libmodman.patch new file mode 100755 index 000000000..84a17411b --- /dev/null +++ b/externals/vcpkg/ports/libproxy/fix-dependency-libmodman.patch @@ -0,0 +1,52 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4f51e38..32a0319 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -31,11 +31,15 @@ include(cmake/ctest.cmk) + include(cmake/paths.cmk) + + option(WITH_WEBKIT3 "Build against gtk-3 version of webkitgtk" OFF) +- +-### Subdirectories +- +-add_subdirectory(libmodman) +-include_directories(${CMAKE_CURRENT_SOURCE_DIR}) ++find_package(libmodman REQUIRED) ++if(LIBMODMAN_FOUND) ++ include_directories(${LIBMODMAN_INCLUDE_DIR}) ++ link_libraries(${LIBMODMAN_LIBRARIES}) ++else() ++ ### Subdirectories ++ add_subdirectory(libmodman) ++ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) ++endif() + + # Conditionally build bindings + if(NOT WIN32) +diff --git a/libproxy/cmake/libproxy.cmk b/libproxy/cmake/libproxy.cmk +index 9356486..f9eed2c 100644 +--- a/libproxy/cmake/libproxy.cmk ++++ b/libproxy/cmake/libproxy.cmk +@@ -1,8 +1,8 @@ + add_library(libproxy SHARED extension_config.cpp extension_pacrunner.cpp extension_wpad.cpp proxy.cpp url.cpp ${LIBPROXY_SOURCES}) + if(WIN32) +- target_link_libraries(libproxy modman;ws2_32;${LIBPROXY_LIBRARIES}) ++ target_link_libraries(libproxy ${LIBMODMAN_LIBRARIES};ws2_32;${LIBPROXY_LIBRARIES}) + else() +- target_link_libraries(libproxy modman;m;pthread;${CMAKE_DL_LIBS};${LIBPROXY_LIBRARIES}) ++ target_link_libraries(libproxy ${LIBMODMAN_LIBRARIES};m;pthread;${CMAKE_DL_LIBS};${LIBPROXY_LIBRARIES}) + endif() + file(TO_NATIVE_PATH ${MODULE_INSTALL_DIR} MODULE_INSTALL_DIR) + if(WIN32) +@@ -21,8 +21,8 @@ set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp + set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1) + set_target_properties(libproxy PROPERTIES INTERFACE_LINK_LIBRARIES "") + set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "") +-if(NOT APPLE) +- set_target_properties(libproxy PROPERTIES LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/libproxy.map") +-endif() ++#if(NOT APPLE) ++# set_target_properties(libproxy PROPERTIES LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/libproxy.map") ++#endif() + install(TARGETS libproxy RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) + install(FILES proxy.h DESTINATION ${INCLUDE_INSTALL_DIR}) diff --git a/externals/vcpkg/ports/libproxy/fix-install-py.patch b/externals/vcpkg/ports/libproxy/fix-install-py.patch new file mode 100755 index 000000000..c429be74b --- /dev/null +++ b/externals/vcpkg/ports/libproxy/fix-install-py.patch @@ -0,0 +1,36 @@ +diff --git a/bindings/python/python3/CMakeLists.txt b/bindings/python/python3/CMakeLists.txt +index bf87dfc..9f94c2d 100644 +--- a/bindings/python/python3/CMakeLists.txt ++++ b/bindings/python/python3/CMakeLists.txt +@@ -21,5 +21,4 @@ if(PYTHON3INTERP_FOUND) + + message(STATUS "Using PYTHON3_SITEPKG_DIR=${PYTHON3_SITEPKG_DIR}") + +- install(FILES ../libproxy.py DESTINATION ${PYTHON3_SITEPKG_DIR}) + endif() +diff --git a/bindings/python/python2/CMakeLists.txt b/bindings/python/python2/CMakeLists.txt +index 00df551..15d78f9 100644 +--- a/bindings/python/python2/CMakeLists.txt ++++ b/bindings/python/python2/CMakeLists.txt +@@ -21,5 +21,4 @@ if(PYTHON2INTERP_FOUND) + + message(STATUS "Using PYTHON2_SITEPKG_DIR=${PYTHON2_SITEPKG_DIR}") + +- install(FILES ../libproxy.py DESTINATION ${PYTHON2_SITEPKG_DIR}) + endif() +diff --git a/bindings/perl/lib/CMakeLists.txt b/bindings/perl/lib/CMakeLists.txt +index 9856627..f54c138 100644 +--- a/bindings/perl/lib/CMakeLists.txt ++++ b/bindings/perl/lib/CMakeLists.txt +@@ -1,2 +1 @@ + add_custom_target(PMlibproxy ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Libproxy.pm ${CMAKE_BINARY_DIR}/perl/blib/lib/Libproxy.pm) +-install( FILES Libproxy.pm DESTINATION ${PX_PERL_ARCH}/Net ) +diff --git a/bindings/perl/src/CMakeLists.txt b/bindings/perl/src/CMakeLists.txt +index 05176c4..9ca532f 100644 +--- a/bindings/perl/src/CMakeLists.txt ++++ b/bindings/perl/src/CMakeLists.txt +@@ -21,4 +21,3 @@ target_link_libraries(PLlibproxy ${PLlibproxy_LIB_DEPENDENCIES}) + set_target_properties(PLlibproxy PROPERTIES OUTPUT_NAME "Libproxy") + set_target_properties(PLlibproxy PROPERTIES PREFIX "") + +-install( TARGETS PLlibproxy DESTINATION ${PX_PERL_ARCH}/auto/Net/Libproxy ) diff --git a/externals/vcpkg/ports/libproxy/fix-module-lib-name.patch b/externals/vcpkg/ports/libproxy/fix-module-lib-name.patch new file mode 100755 index 000000000..2a8790afe --- /dev/null +++ b/externals/vcpkg/ports/libproxy/fix-module-lib-name.patch @@ -0,0 +1,13 @@ +diff --git a/libproxy/Findlibproxy.cmake.in b/libproxy/Findlibproxy.cmake.in +index ef44489..c0bd2ae 100644 +--- a/libproxy/Findlibproxy.cmake.in ++++ b/libproxy/Findlibproxy.cmake.in +@@ -12,7 +12,7 @@ + + # Find proxy.h and the corresponding library (libproxy.so) + FIND_PATH(LIBPROXY_INCLUDE_DIR proxy.h ) +-FIND_LIBRARY(LIBPROXY_LIBRARIES NAMES proxy ) ++FIND_LIBRARY(LIBPROXY_LIBRARIES NAMES proxy libproxy) + + # Set library version + SET(LIBPROXY_VERSION @PROJECT_VERSION@) diff --git a/externals/vcpkg/ports/libproxy/fix-tools-path.patch b/externals/vcpkg/ports/libproxy/fix-tools-path.patch new file mode 100755 index 000000000..ba5061170 --- /dev/null +++ b/externals/vcpkg/ports/libproxy/fix-tools-path.patch @@ -0,0 +1,27 @@ +diff --git a/libproxy/cmake/pxmodule.cmk b/libproxy/cmake/pxmodule.cmk +index bbbd989..956948a 100644 +--- a/libproxy/cmake/pxmodule.cmk ++++ b/libproxy/cmake/pxmodule.cmk +@@ -20,7 +20,7 @@ function(px_module name build builtin) + add_library(${name} MODULE modules/${name}.cpp) + target_link_libraries(${name} libproxy) + set_target_properties(${name} PROPERTIES PREFIX "") +- install(TARGETS ${name} LIBRARY DESTINATION ${MODULE_INSTALL_DIR}) ++ install(TARGETS ${name} LIBRARY DESTINATION tools) + if(${ARGC} GREATER 3) + target_link_libraries(${name} ${ARGN}) + endif() +diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt +index 52010c6..0a3f4b5 100644 +--- a/utils/CMakeLists.txt ++++ b/utils/CMakeLists.txt +@@ -1,5 +1,7 @@ + include_directories("../libproxy") + ++if (BUILD_TOOLS) + add_executable(proxy proxy.c) + target_link_libraries(proxy libproxy) +-install(TARGETS proxy RUNTIME DESTINATION ${BIN_INSTALL_DIR}) ++install(TARGETS proxy RUNTIME DESTINATION tools) ++endif() +\ No newline at end of file diff --git a/externals/vcpkg/ports/libproxy/portfile.cmake b/externals/vcpkg/ports/libproxy/portfile.cmake new file mode 100755 index 000000000..6df28f418 --- /dev/null +++ b/externals/vcpkg/ports/libproxy/portfile.cmake @@ -0,0 +1,54 @@ +# Enable static build in UNIX +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libproxy/libproxy + REF e78a5ccfe0a2340f2c73e419767f8492ffc2787a #0.4.17 + SHA512 b22251f73f7a94dade5dcdcd9d5510170038b0d101ee98ab427106c20a3d9979c2b16c57d6cf8d8ae59c3a28ccffcecafc0bed399926dc2416a27837fd2f043c + HEAD_REF master + PATCHES + fix-tools-path.patch + support-windows.patch + fix-dependency-libmodman.patch + fix-install-py.patch + fix-arm-build.patch + fix-module-lib-name.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + bindings-csharp WITH_DOTNET + bindings-python WITH_PYTHON2 + bindings-python WITH_PYTHON3 + bindings-perl WITH_PERL + bindings-vala WITH_VALA + tools BUILD_TOOLS + tests BUILD_TESTING +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} + -DWITH_WEBKIT3=OFF + MAYBE_UNUSED_VARIABLES + WITH_DOTNET + WITH_PERL + WITH_PYTHON2 + WITH_PYTHON3 + WITH_VALA +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/Modules) +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + "${CMAKE_CURRENT_LIST_DIR}/usage" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libproxy/support-windows.patch b/externals/vcpkg/ports/libproxy/support-windows.patch new file mode 100755 index 000000000..1cad01ff4 --- /dev/null +++ b/externals/vcpkg/ports/libproxy/support-windows.patch @@ -0,0 +1,31 @@ +diff --git a/cmake/paths.cmk b/cmake/paths.cmk +index 593ebc1..bbf8754 100644 +--- a/cmake/paths.cmk ++++ b/cmake/paths.cmk +@@ -1,4 +1,4 @@ +-if(WIN32 AND NOT MINGW) ++if(0) + set(CMAKE_INSTALL_PREFIX "" CACHE PATH "Install prefix") + set(BIN_INSTALL_DIR . CACHE PATH "Binary install dir") + set(LIB_INSTALL_DIR . CACHE PATH "Library install dir") +diff --git a/libproxy/cmake/devfiles.cmk b/libproxy/cmake/devfiles.cmk +index 0301dce..0eb5f83 100644 +--- a/libproxy/cmake/devfiles.cmk ++++ b/libproxy/cmake/devfiles.cmk +@@ -1,4 +1,4 @@ +-if(NOT WIN32 OR MINGW) ++if(1) + # PkgConfig file + set (PKGCONFIG_PREFIX ${CMAKE_INSTALL_PREFIX}) + +diff --git a/libproxy/cmake/libproxy.cmk b/libproxy/cmake/libproxy.cmk +index de68e5c..9356486 100644 +--- a/libproxy/cmake/libproxy.cmk ++++ b/libproxy/cmake/libproxy.cmk +@@ -24,5 +24,5 @@ set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "") + if(NOT APPLE) + set_target_properties(libproxy PROPERTIES LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/libproxy.map") + endif() +-install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR}) ++install(TARGETS libproxy RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) + install(FILES proxy.h DESTINATION ${INCLUDE_INSTALL_DIR}) diff --git a/externals/vcpkg/ports/libproxy/usage b/externals/vcpkg/ports/libproxy/usage new file mode 100755 index 000000000..a37b13c5a --- /dev/null +++ b/externals/vcpkg/ports/libproxy/usage @@ -0,0 +1,5 @@ +The package libproxy provides CMake targets: + + find_package(libproxy CONFIG REQUIRED) + target_include_directories(main PRIVATE ${LIBPROXY_INCLUDE_DIR}) + target_link_libraries(main PRIVATE ${LIBPROXY_LIBRARIES}) diff --git a/externals/vcpkg/ports/libproxy/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/libproxy/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..63158432b --- /dev/null +++ b/externals/vcpkg/ports/libproxy/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,6 @@ +set(LIBPROXY_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) + +_find_package(${ARGS}) + +set(CMAKE_MODULE_PATH ${LIBPROXY_PREV_MODULE_PATH}) diff --git a/externals/vcpkg/ports/libproxy/vcpkg.json b/externals/vcpkg/ports/libproxy/vcpkg.json new file mode 100755 index 000000000..8979bbdbf --- /dev/null +++ b/externals/vcpkg/ports/libproxy/vcpkg.json @@ -0,0 +1,43 @@ +{ + "name": "libproxy", + "version": "0.4.17", + "port-version": 3, + "description": "libproxy is a library that provides automatic proxy configuration management.", + "homepage": "https://github.com/libproxy/libproxy", + "license": "LGPL-2.1-only", + "supports": "!uwp", + "dependencies": [ + "libmodman", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "bindings-csharp": { + "description": "Install C# bindings" + }, + "bindings-perl": { + "description": "Install PERL bindings" + }, + "bindings-python": { + "description": "Install Python bindings" + }, + "bindings-ruby": { + "description": "Install Ruby bindings" + }, + "bindings-vala": { + "description": "Install Vala bindings" + }, + "tests": { + "description": "Build libproxy tests" + }, + "tools": { + "description": "build tools" + } + } +} diff --git a/externals/vcpkg/ports/libqcow/CMakeLists.txt b/externals/vcpkg/ports/libqcow/CMakeLists.txt new file mode 100755 index 000000000..ac199f48f --- /dev/null +++ b/externals/vcpkg/ports/libqcow/CMakeLists.txt @@ -0,0 +1,83 @@ +cmake_minimum_required(VERSION 3.12) + +project(libqcow C) + +find_package(OpenSSL) +find_package(ZLIB REQUIRED) + +if(MSVC) + add_compile_definitions(_CRT_SECURE_NO_DEPRECATE) + add_compile_definitions(_CRT_NONSTDC_NO_DEPRECATE) +endif() + +add_compile_definitions(HAVE_LOCAL_LIBCAES) +add_compile_definitions(HAVE_LOCAL_LIBCERROR) +add_compile_definitions(HAVE_LOCAL_LIBCTHREADS) +add_compile_definitions(HAVE_LOCAL_LIBCDATA) +add_compile_definitions(HAVE_LOCAL_LIBCLOCALE) +add_compile_definitions(HAVE_LOCAL_LIBCNOTIFY) +add_compile_definitions(HAVE_LOCAL_LIBCSPLIT) +add_compile_definitions(HAVE_LOCAL_LIBCFILE) +add_compile_definitions(HAVE_LOCAL_LIBCPATH) +add_compile_definitions(HAVE_LOCAL_LIBUNA) +add_compile_definitions(HAVE_LOCAL_LIBBFIO) +add_compile_definitions(HAVE_LOCAL_LIBFCACHE) +add_compile_definitions(HAVE_LOCAL_LIBFDATA) +add_compile_definitions(ZLIB_DLL) + +if(UNIX) + configure_file(common/config.h.in common/config.h) + add_compile_definitions(HAVE_CONFIG_H) + add_compile_definitions(LOCALEDIR="/usr/share/locale") +endif() + +if(MSVC) + add_compile_definitions(LIBQCOW_DLL_EXPORT) + set(LIB_RC libqcow/libqcow.rc) +endif() + + +include(GNUInstallDirs) +include(CMakePackageConfigHelpers) + +# Add CMake find_package() integration +set(PROJECT_TARGET_NAME "${PROJECT_NAME}") +set(CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") +set(PROJECT_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/generated/${PROJECT_TARGET_NAME}Config.cmake") +set(TARGETS_EXPORT_NAME "${PROJECT_TARGET_NAME}Targets") +set(NAMESPACE "libqcow::") + +# Source files +file(GLOB LIB_SRC lib*/*.c) + +# Headers +file(GLOB LIB_INST_HEADERS include/libqcow/*.h) + +add_library(${PROJECT_NAME} ${LIB_SRC} ${LIB_RC}) + +target_include_directories(${PROJECT_NAME} PRIVATE ./include ./common) +target_include_directories(${PROJECT_NAME} PRIVATE ./libbfio ./libcaes ./libcdata ./libcerror ./libcfile ./libclocale) +target_include_directories(${PROJECT_NAME} PRIVATE ./libcnotify ./libcpath ./libcsplit ./libcthreads) +target_include_directories(${PROJECT_NAME} PRIVATE ./libfcache ./libfdata ./libuna) + +target_link_libraries(${PROJECT_NAME} PRIVATE ZLIB::ZLIB OpenSSL::Crypto) + +install(TARGETS ${PROJECT_NAME} + EXPORT ${TARGETS_EXPORT_NAME} + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + INCLUDES DESTINATION include) + +install(FILES ${LIB_INST_HEADERS} DESTINATION include/libqcow) +install(FILES include/libqcow.h DESTINATION include) + + +# Generate and install libqcowConfig.cmake +configure_package_config_file("Config.cmake.in" "${PROJECT_CONFIG}" INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}") +install(FILES "${PROJECT_CONFIG}" DESTINATION "${CONFIG_INSTALL_DIR}") + +# Generate and install libqcowTargets*.cmake +install(EXPORT ${TARGETS_EXPORT_NAME} + NAMESPACE ${NAMESPACE} + DESTINATION "${CONFIG_INSTALL_DIR}") diff --git a/externals/vcpkg/ports/libqcow/Config.cmake.in b/externals/vcpkg/ports/libqcow/Config.cmake.in new file mode 100755 index 000000000..bd6bd4532 --- /dev/null +++ b/externals/vcpkg/ports/libqcow/Config.cmake.in @@ -0,0 +1,4 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") +check_required_components("@PROJECT_NAME@") diff --git a/externals/vcpkg/ports/libqcow/macos_fixes.patch b/externals/vcpkg/ports/libqcow/macos_fixes.patch new file mode 100755 index 000000000..4e3061c22 --- /dev/null +++ b/externals/vcpkg/ports/libqcow/macos_fixes.patch @@ -0,0 +1,38 @@ +diff --git a/libcfile/libcfile_file.c b/libcfile/libcfile_file.c +index a618083..5299c77 100644 +--- a/libcfile/libcfile_file.c ++++ b/libcfile/libcfile_file.c +@@ -56,7 +56,7 @@ + #elif defined( HAVE_CYGWIN_FS_H ) + #include + +-#elif defined( HAVE_LINUX_FS_H ) ++#elif defined( __linux__ ) && defined( HAVE_LINUX_FS_H ) + /* Required for Linux platforms that use a sizeof( u64 ) + * in linux/fs.h but have no typedef of it + */ +@@ -4128,6 +4128,11 @@ ssize_t libcfile_internal_file_io_control_read_with_error_code( + #error Missing file IO control with data function + #endif + ++// Force disable on Darwin, it can be erroneously defined ++#if defined ( __APPLE__ ) ++#undef HAVE_POSIX_FADVISE ++#endif ++ + /* Read data from a device file using IO control + * Returns the number of bytes read if successful or -1 on error + */ +diff --git a/libqcow/libqcow_i18n.c b/libqcow/libqcow_i18n.c +index 96d1a31..621e748 100644 +--- a/libqcow/libqcow_i18n.c ++++ b/libqcow/libqcow_i18n.c +@@ -40,7 +40,7 @@ int libqcow_i18n_initialize( + + if( libqcow_i18n_initialized == 0 ) + { +-#if defined( HAVE_BINDTEXTDOMAIN ) ++#if !defined( __APPLE__ ) && defined( HAVE_BINDTEXTDOMAIN ) + if( bindtextdomain( + "libqcow", + LOCALEDIR ) == NULL ) diff --git a/externals/vcpkg/ports/libqcow/portfile.cmake b/externals/vcpkg/ports/libqcow/portfile.cmake new file mode 100755 index 000000000..f43d28890 --- /dev/null +++ b/externals/vcpkg/ports/libqcow/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +set(LIB_VERSION 20210419) +set(LIB_FILENAME libqcow-alpha-${LIB_VERSION}.tar.gz) + +# Release distribution file contains configured sources, while the source code in the repository does not. +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/libyal/libqcow/releases/download/${LIB_VERSION}/${LIB_FILENAME}" + FILENAME "${LIB_FILENAME}" + SHA512 911d29bd880df95288e552356d128d18c924fcd0d61d166fbeaf09936f11bf27b984d8ffd4cdc4bc285e7df295a1fe64ff595b0dfdd10b6fcfbdc6586d6bd3b0 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${LIB_VERSION} + PATCHES macos_fixes.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" DESTINATION "${SOURCE_PATH}") + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA +) +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/libqcow") + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# License and man +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libqcow/vcpkg.json b/externals/vcpkg/ports/libqcow/vcpkg.json new file mode 100755 index 000000000..2436924ce --- /dev/null +++ b/externals/vcpkg/ports/libqcow/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "libqcow", + "version-string": "20210419", + "port-version": 2, + "description": "Library and tools to access the QEMU Copy-On-Write (QCOW) image format.", + "homepage": "https://github.com/libyal/libqcow", + "supports": "!uwp", + "dependencies": [ + "gettext", + "openssl", + "zlib" + ] +} diff --git a/externals/vcpkg/ports/libqglviewer/destdir.patch b/externals/vcpkg/ports/libqglviewer/destdir.patch new file mode 100755 index 000000000..d1cd4f3cc --- /dev/null +++ b/externals/vcpkg/ports/libqglviewer/destdir.patch @@ -0,0 +1,21 @@ +diff --git a/QGLViewer/QGLViewer.pro b/QGLViewer/QGLViewer.pro +index 263a141..51e3359 100644 +--- a/QGLViewer/QGLViewer.pro ++++ b/QGLViewer/QGLViewer.pro +@@ -38,7 +38,6 @@ SOURCES = \ + + HEADERS *= $${QGL_HEADERS} + DISTFILES *= qglviewer-icon.xpm +-DESTDIR = $${PWD} + + TRANSLATIONS = qglviewer_fr.ts + +@@ -273,7 +272,7 @@ win32 { + QMAKE_CXXFLAGS *= -TP -GR + DEFINES += NOMINMAX + win32-msvc { +- QMAKE_CXXFLAGS *= -EHs -FS ++ QMAKE_CXXFLAGS *= -EHs -FS + } else { + QMAKE_CXXFLAGS *= -EHs + } diff --git a/externals/vcpkg/ports/libqglviewer/portfile.cmake b/externals/vcpkg/ports/libqglviewer/portfile.cmake new file mode 100755 index 000000000..0c46c11c2 --- /dev/null +++ b/externals/vcpkg/ports/libqglviewer/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO GillesDebunne/libQGLViewer + REF fee0916f2af3d0993df51956d2e5a51bbaf0c1f0 #v2.7.2 + SHA512 449bf4ccadaf50d4333bd91050e9b50f440a64229391827aaf4a80ade2c3f5fc60501d2baee885cf1214f7e2a8a04615bafe9ac7da9f866ffa4ebe33b9b999d8 + HEAD_REF master + PATCHES + use-default-config-on-all-platforms.patch + destdir.patch +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(OPTIONS CONFIG*=staticlib) +endif() + +vcpkg_configure_qmake( + SOURCE_PATH ${SOURCE_PATH}/QGLViewer/QGLViewer.pro + OPTIONS ${OPTIONS} +) + +vcpkg_install_qmake() + +file(INSTALL ${SOURCE_PATH}/QGLViewer DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.h") +file(INSTALL ${SOURCE_PATH}/LICENCE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libqglviewer RENAME copyright) diff --git a/externals/vcpkg/ports/libqglviewer/use-default-config-on-all-platforms.patch b/externals/vcpkg/ports/libqglviewer/use-default-config-on-all-platforms.patch new file mode 100755 index 000000000..bd8281f22 --- /dev/null +++ b/externals/vcpkg/ports/libqglviewer/use-default-config-on-all-platforms.patch @@ -0,0 +1,33 @@ +diff --git a/QGLViewer/QGLViewer.pro b/QGLViewer/QGLViewer.pro +index e0205e5..6db4c81 100644 +--- a/QGLViewer/QGLViewer.pro ++++ b/QGLViewer/QGLViewer.pro +@@ -108,9 +108,6 @@ contains( DEFINES, NO_VECTORIAL_RENDER ) { + # -- U n i x -- + # --------------- + unix { +- CONFIG -= debug debug_and_release +- CONFIG *= release +- + # INCLUDE_DIR and LIB_DIR specify where to install the include files and the library. + # Use qmake INCLUDE_DIR=... LIB_DIR=... , or qmake PREFIX=... to customize your installation. + isEmpty( PREFIX ) { +@@ -250,9 +247,6 @@ macx|darwin-g++ { + # -- W i n d o w s -- + # --------------------- + win32 { +- # Windows requires a debug lib version to link against debug applications +- CONFIG *= debug_and_release build_all +- + # Needed by Intel C++, (icl.exe) so that WINGDIAPI is a defined symbol in gl.h. + DEFINES *= WIN32 + +@@ -279,7 +273,7 @@ win32 { + QMAKE_CXXFLAGS *= -TP -GR + DEFINES += NOMINMAX + win32-msvc { +- QMAKE_CXXFLAGS *= -EH -FS ++ QMAKE_CXXFLAGS *= -EHs -FS + } else { + QMAKE_CXXFLAGS *= -EHs + } diff --git a/externals/vcpkg/ports/libqglviewer/vcpkg.json b/externals/vcpkg/ports/libqglviewer/vcpkg.json new file mode 100755 index 000000000..048875292 --- /dev/null +++ b/externals/vcpkg/ports/libqglviewer/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libqglviewer", + "version-string": "2.7.2", + "port-version": 4, + "description": "libQGLViewer is an open source C++ library based on Qt that eases the creation of OpenGL 3D viewers.", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/externals/vcpkg/ports/libqrencode/portfile.cmake b/externals/vcpkg/ports/libqrencode/portfile.cmake new file mode 100755 index 000000000..b65c1db51 --- /dev/null +++ b/externals/vcpkg/ports/libqrencode/portfile.cmake @@ -0,0 +1,56 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO fukuchi/libqrencode + REF 715e29fd4cd71b6e452ae0f4e36d917b43122ce8 # v4.1.1 + SHA512 78a5464c6fd37d2b4ed6d81c5faf8d95f6f1c95bfdb55dfe89fc227cd487c1685e8080694b1c93128364337959562ea133b3bb332ae1c5a4094614b493611e9f + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tool WITH_TOOLS +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} + -DWITH_TEST=NO + -DSKIP_INSTALL_PROGRAMS=ON + -DSKIP_INSTALL_EXECUTABLES=ON + -DSKIP_INSTALL_FILES=ON + OPTIONS_DEBUG + -DSKIP_INSTALL_HEADERS=ON + -DWITH_TOOLS=NO +) + +vcpkg_cmake_install() + +if(VCPKG_TARGET_IS_WINDOWS) # Windows + set(EXECUTABLE_SUFFIX ".exe") +else() + set(EXECUTABLE_SUFFIX "") +endif() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/qrencode.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/qrencode.dll" "${CURRENT_PACKAGES_DIR}/bin/qrencode.dll") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/qrencoded.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/qrencoded.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/qrencoded.dll") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/qrencode${EXECUTABLE_SUFFIX}") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/qrencode") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/qrencode${EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/qrencode/qrencode${EXECUTABLE_SUFFIX}") + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/qrencode") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_copy_pdbs() + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/libqrencode/usage b/externals/vcpkg/ports/libqrencode/usage new file mode 100755 index 000000000..f6003f4e3 --- /dev/null +++ b/externals/vcpkg/ports/libqrencode/usage @@ -0,0 +1,10 @@ +To use libqrencode library in CMakeLists.txt: + + find_path(QRENCODE_INCLUDE_DIR NAMES qrencode.h) + find_library(QRENCODE_LIBRARY_RELEASE qrencode) + find_library(QRENCODE_LIBRARY_DEBUG qrencoded) + set(QRENCODE_LIBRARIES optimized ${QRENCODE_LIBRARY_RELEASE} debug ${QRENCODE_LIBRARY_DEBUG}) + + add_executable(main main.cpp) + target_include_directories(main PRIVATE ${QRENCODE_INCLUDE_DIR}) + target_link_libraries(main PRIVATE ${QRENCODE_LIBRARIES}) diff --git a/externals/vcpkg/ports/libqrencode/vcpkg.json b/externals/vcpkg/ports/libqrencode/vcpkg.json new file mode 100755 index 000000000..a32d95184 --- /dev/null +++ b/externals/vcpkg/ports/libqrencode/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "libqrencode", + "version-semver": "4.1.1", + "port-version": 1, + "description": "libqrencode - a fast and compact QR Code encoding library", + "homepage": "https://github.com/fukuchi/libqrencode", + "dependencies": [ + "libiconv", + "libpng", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "tool": { + "description": "Build qrencode tool", + "dependencies": [ + { + "name": "getopt", + "platform": "windows" + } + ] + } + } +} diff --git a/externals/vcpkg/ports/librabbitmq/fix-uwpwarning.patch b/externals/vcpkg/ports/librabbitmq/fix-uwpwarning.patch new file mode 100755 index 000000000..97b1a3de4 --- /dev/null +++ b/externals/vcpkg/ports/librabbitmq/fix-uwpwarning.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b353be6..419e983 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -150,6 +150,10 @@ else() + endif() + endif() + ++if(MSVC) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996") ++endif() ++ + option(REGENERATE_AMQP_FRAMING "Regenerate amqp_framing.h/amqp_framing.c sources (for developer use)" OFF) + mark_as_advanced(REGENERATE_AMQP_FRAMING) + +diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt +index d8dcd26..671840b 100644 +--- a/librabbitmq/CMakeLists.txt ++++ b/librabbitmq/CMakeLists.txt +@@ -108,7 +108,7 @@ set(RABBITMQ_SOURCES + ${AMQP_SSL_SRCS} + ) + +-add_definitions(-DAMQP_BUILD) ++add_definitions(-DAMQP_BUILD -D_CRT_SECURE_NO_WARNINGS) + + set(RMQ_LIBRARIES ${AMQP_SSL_LIBS} ${SOCKET_LIBRARIES} ${LIBRT} ${CMAKE_THREAD_LIBS_INIT}) + diff --git a/externals/vcpkg/ports/librabbitmq/portfile.cmake b/externals/vcpkg/ports/librabbitmq/portfile.cmake new file mode 100755 index 000000000..ac8e6f5cb --- /dev/null +++ b/externals/vcpkg/ports/librabbitmq/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO alanxz/rabbitmq-c + REF v0.11.0 + SHA512 0c3dbb6e2b862e9f25e3f76df798ea272bbd81de2865950b95adf1f1e5791eb20d7c9d5a76cb7d2fda54bad5f12bdf69cbfa7e9fd1afdede6f9ec729ca2287de + HEAD_REF master + PATCHES + fix-uwpwarning.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF + -DBUILD_TOOLS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME rabbitmq-c CONFIG_PATH lib/cmake/rabbitmq-c) + +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE-MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/librabbitmq/vcpkg.json b/externals/vcpkg/ports/librabbitmq/vcpkg.json new file mode 100755 index 000000000..9e8a33321 --- /dev/null +++ b/externals/vcpkg/ports/librabbitmq/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "librabbitmq", + "version": "0.11.0", + "port-version": 1, + "description": "A C-language AMQP client library for use with v2.0+ of the RabbitMQ broker.", + "homepage": "https://github.com/alanxz/rabbitmq-c", + "dependencies": [ + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libraqm/CMakeLists.txt b/externals/vcpkg/ports/libraqm/CMakeLists.txt new file mode 100755 index 000000000..9ad1db64a --- /dev/null +++ b/externals/vcpkg/ports/libraqm/CMakeLists.txt @@ -0,0 +1,38 @@ +cmake_minimum_required(VERSION 3.11) + +project(raqm) + +set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_MODULE_PATH}") + +find_package(Freetype REQUIRED) +find_package(Fribidi REQUIRED) +find_package(harfbuzz CONFIG REQUIRED) + +find_path(HARFBUZZ_INCLUDE_DIRS + NAMES hb.h + PATH_SUFFIXES harfbuzz) +find_path(FREETYPE_ADDITIONAL_INCLUDE_DIRS NAMES ft2build.h PATH_SUFFIXES freetype2) + +configure_file(src/raqm-version.h.in src/raqm-version.h) + +add_library(raqm src/raqm.c src/raqm.h src/raqm-version.h) + +target_include_directories(raqm PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/src) +target_include_directories(raqm SYSTEM PUBLIC ${FREETYPE_ADDITIONAL_INCLUDE_DIRS}) +target_include_directories(raqm SYSTEM PUBLIC ${FREETYPE_INCLUDE_DIRS}) +target_include_directories(raqm SYSTEM PUBLIC ${HARFBUZZ_INCLUDE_DIRS}) +target_include_directories(raqm SYSTEM PUBLIC ${FRIBIDI_INCLUDE_DIR}) + +target_link_libraries(raqm PRIVATE Freetype::Freetype) +target_link_libraries(raqm PRIVATE harfbuzz::harfbuzz ${FRIBIDI_LIBRARY}) + +install(TARGETS raqm + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) + +set(RAQM_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src") +set(RAQM_LIBRARY raqm) +set(RAQM_LIBRARIES ${HARFBUZZ_LIBRARY} ${FRIBIDI_LIBRARY} ${RAQM_LIBRARY}) +file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.h ${CMAKE_CURRENT_BINARY_DIR}/src/raqm-version.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) diff --git a/externals/vcpkg/ports/libraqm/FindFribidi.cmake b/externals/vcpkg/ports/libraqm/FindFribidi.cmake new file mode 100755 index 000000000..a12bdb60e --- /dev/null +++ b/externals/vcpkg/ports/libraqm/FindFribidi.cmake @@ -0,0 +1,12 @@ +find_path(FRIBIDI_INCLUDE_DIR + NAMES fribidi/fribidi.h) + +set(FRIBIDI_INCLUDE_DIR "${FRIBIDI_INCLUDE_DIR}/fribidi") +find_library(FRIBIDI_LIBRARY NAMES fribidi) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(FriBidi + FOUND_VAR FRIBIDI_FOUND + REQUIRED_VARS FRIBIDI_LIBRARY FRIBIDI_INCLUDE_DIR + VERSION_VAR FRIBIDI_VERSION_STRING +) \ No newline at end of file diff --git a/externals/vcpkg/ports/libraqm/portfile.cmake b/externals/vcpkg/ports/libraqm/portfile.cmake new file mode 100755 index 000000000..f871328e0 --- /dev/null +++ b/externals/vcpkg/ports/libraqm/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +set(RAQM_VERSION_MAJOR 0) +set(RAQM_VERSION_MINOR 9) +set(RAQM_VERSION_MICRO 0) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO HOST-Oman/libraqm + REF v${RAQM_VERSION_MAJOR}.${RAQM_VERSION_MINOR}.${RAQM_VERSION_MICRO} + SHA512 a45c442a087c806143e5a96878e1d84a31afb7b682d71931fcb014c8d56b974d5a0d6186b163067d44a15952b3c549763f84354ed799f20473795f15d719f060 + HEAD_REF master +) + +file(COPY ${CURRENT_PORT_DIR}/FindFribidi.cmake DESTINATION ${SOURCE_PATH}) +file(COPY ${CURRENT_PORT_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DCURRENT_PACKAGES_DIR=${CURRENT_PACKAGES_DIR} + -DRAQM_VERSION_MAJOR=${RAQM_VERSION_MAJOR} + -DRAQM_VERSION_MINOR=${RAQM_VERSION_MINOR} + -DRAQM_VERSION_MICRO=${RAQM_VERSION_MICRO} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libraqm RENAME copyright) diff --git a/externals/vcpkg/ports/libraqm/vcpkg.json b/externals/vcpkg/ports/libraqm/vcpkg.json new file mode 100755 index 000000000..34fd9966b --- /dev/null +++ b/externals/vcpkg/ports/libraqm/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libraqm", + "version-string": "0.9.0", + "description": "A library for complex text layout", + "dependencies": [ + "freetype", + "fribidi", + "harfbuzz", + "vcpkg-cmake" + ] +} diff --git a/externals/vcpkg/ports/libraw/findlibraw_debug_fix.patch b/externals/vcpkg/ports/libraw/findlibraw_debug_fix.patch new file mode 100755 index 000000000..294963eb6 --- /dev/null +++ b/externals/vcpkg/ports/libraw/findlibraw_debug_fix.patch @@ -0,0 +1,41 @@ +--- a/cmake/modules/FindLibRaw.cmake 2016-11-02 07:09:50.000000000 +0100 ++++ b/cmake/modules/FindLibRaw.cmake 2019-06-03 22:05:28.759307500 +0200 +@@ -31,18 +31,36 @@ + PATH_SUFFIXES libraw + ) + +-FIND_LIBRARY(LibRaw_LIBRARIES NAMES raw ++FIND_LIBRARY(LibRaw_LIBRARY_RELEASE NAMES raw + HINTS + ${PC_LIBRAW_LIBDIR} + ${PC_LIBRAW_LIBRARY_DIRS} + ) + +-FIND_LIBRARY(LibRaw_r_LIBRARIES NAMES raw_r ++FIND_LIBRARY(LibRaw_LIBRARY_DEBUG NAMES rawd ++ HINTS ++ ${PC_LIBRAW_LIBDIR} ++ ${PC_LIBRAW_LIBRARY_DIRS} ++ ) ++ ++INCLUDE(SelectLibraryConfigurations) ++ ++select_library_configurations(LibRaw) ++ ++FIND_LIBRARY(LibRaw_r_LIBRARY_RELEASE NAMES raw_r + HINTS + ${PC_LIBRAW_R_LIBDIR} + ${PC_LIBRAW_R_LIBRARY_DIRS} + ) + ++FIND_LIBRARY(LibRaw_r_LIBRARY_DEBUG NAMES raw_rd ++ HINTS ++ ${PC_LIBRAW_R_LIBDIR} ++ ${PC_LIBRAW_R_LIBRARY_DIRS} ++ ) ++ ++select_library_configurations(LibRaw_r) ++ + IF(LibRaw_INCLUDE_DIR) + FILE(READ ${LibRaw_INCLUDE_DIR}/libraw_version.h _libraw_version_content) + diff --git a/externals/vcpkg/ports/libraw/fix-install.patch b/externals/vcpkg/ports/libraw/fix-install.patch new file mode 100755 index 000000000..9c10ae4ca --- /dev/null +++ b/externals/vcpkg/ports/libraw/fix-install.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 47f3869..136549b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -544,7 +544,7 @@ SET_TARGET_PROPERTIES(raw_r PROPERTIES OUTPUT_NAME "raw_r") + # -- Files to install ------------------------------------------------------------------------------------- + + # Configure and install data file for packaging. +-IF(NOT WIN32) ++IF(1) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/data/libraw.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libraw.pc @ONLY) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libraw.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) + +@@ -570,8 +570,8 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libraw/libraw.h + # Install Shared binary files. + INSTALL(TARGETS raw + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib${LIB_SUFFIX} +- ARCHIVE DESTINATION lib${LIB_SUFFIX} ++ LIBRARY DESTINATION lib${LIB_SUFFIX}/manual-link ++ ARCHIVE DESTINATION lib${LIB_SUFFIX}/manual-link + ) + + INSTALL(TARGETS raw_r +diff --git a/cmake/data/libraw.pc.cmake b/cmake/data/libraw.pc.cmake +index aede5f2..ffeefc2 100644 +--- a/cmake/data/libraw.pc.cmake ++++ b/cmake/data/libraw.pc.cmake +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/lib@LIB_SUFFIX@ ++libdir=${prefix}/lib@LIB_SUFFIX@/manual-link + includedir=${prefix}/include/libraw + + Name: @PROJECT_NAME@ diff --git a/externals/vcpkg/ports/libraw/lcms2_debug_fix.patch b/externals/vcpkg/ports/libraw/lcms2_debug_fix.patch new file mode 100755 index 000000000..b0d48edca --- /dev/null +++ b/externals/vcpkg/ports/libraw/lcms2_debug_fix.patch @@ -0,0 +1,66 @@ +--- a/cmake/modules/FindLCMS2.cmake 2016-11-02 07:09:50.000000000 +0100 ++++ b/cmake/modules/FindLCMS2.cmake 2018-06-02 00:43:27.309100600 +0200 +@@ -13,7 +13,6 @@ + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying LICENSE file. + +- + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + if(NOT WIN32) +@@ -29,18 +28,30 @@ + PATH_SUFFIXES lcms2 liblcms2 + ) + +-find_library(LCMS2_LIBRARIES NAMES lcms2 liblcms2 lcms-2 liblcms-2 ++include(SelectLibraryConfigurations) ++ ++find_library(LCMS2_LIBRARY_RELEASE NAMES lcms2 liblcms2 lcms-2 liblcms-2 ++ PATHS ++ ${PC_LCMS2_LIBDIR} ++ ${PC_LCMS2_LIBRARY_DIRS} ++ PATH_SUFFIXES lcms2 ++) ++ ++find_library(LCMS2_LIBRARY_DEBUG NAMES lcms2d liblcms2d lcms-2d liblcms-2d + PATHS + ${PC_LCMS2_LIBDIR} + ${PC_LCMS2_LIBRARY_DIRS} + PATH_SUFFIXES lcms2 + ) + +-if(LCMS2_INCLUDE_DIR AND LCMS2_LIBRARIES) ++select_library_configurations(LCMS2) ++ ++ ++if(LCMS2_INCLUDE_DIR AND LCMS2_LIBRARY) + set(LCMS2_FOUND TRUE) +-else(LCMS2_INCLUDE_DIR AND LCMS2_LIBRARIES) ++else(LCMS2_INCLUDE_DIR AND LCMS2_LIBRARY) + set(LCMS2_FOUND FALSE) +-endif(LCMS2_INCLUDE_DIR AND LCMS2_LIBRARIES) ++endif(LCMS2_INCLUDE_DIR AND LCMS2_LIBRARY) + + if(LCMS2_FOUND) + file(READ ${LCMS2_INCLUDE_DIR}/lcms2.h LCMS2_VERSION_CONTENT) +@@ -50,11 +61,11 @@ + if(NOT LCMS2_FIND_QUIETLY) + string(SUBSTRING ${LCMS2_VERSION} 0 1 LCMS2_MAJOR_VERSION) + string(SUBSTRING ${LCMS2_VERSION} 1 2 LCMS2_MINOR_VERSION) +- message(STATUS "Found lcms version ${LCMS2_MAJOR_VERSION}.${LCMS2_MINOR_VERSION}, ${LCMS2_LIBRARIES}") ++ message(STATUS "Found lcms version ${LCMS2_MAJOR_VERSION}.${LCMS2_MINOR_VERSION}, ${LCMS2_LIBRARY}") + endif(NOT LCMS2_FIND_QUIETLY) + else(LCMS2_VERSION_MATCH) + if(NOT LCMS2_FIND_QUIETLY) +- message(STATUS "Found lcms2 but failed to find version ${LCMS2_LIBRARIES}") ++ message(STATUS "Found lcms2 but failed to find version ${LCMS2_LIBRARY}") + endif(NOT LCMS2_FIND_QUIETLY) + set(LCMS2_VERSION NOTFOUND) + endif(LCMS2_VERSION_MATCH) +@@ -68,5 +79,5 @@ + endif(NOT LCMS2_FIND_QUIETLY) + endif(LCMS2_FOUND) + +-mark_as_advanced(LCMS2_INCLUDE_DIR LCMS2_LIBRARIES LCMS2_VERSION) ++mark_as_advanced(LCMS2_INCLUDE_DIR LCMS2_LIBRARY LCMS2_VERSION) + diff --git a/externals/vcpkg/ports/libraw/portfile.cmake b/externals/vcpkg/ports/libraw/portfile.cmake new file mode 100755 index 000000000..ecdcf1da0 --- /dev/null +++ b/externals/vcpkg/ports/libraw/portfile.cmake @@ -0,0 +1,62 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LibRaw/LibRaw + REF d4f05dd1b9b2d44c8f7e82043cbad3c724db2416 + SHA512 5794521f535163afd7815ad005295301c5e0e2f8b2f34ef0a911d9dd1572c1f456b292777548203f9767957a55782b5bc9041c033190d25d1e9b4240d7df32b9 + HEAD_REF master +) + +vcpkg_from_github( + OUT_SOURCE_PATH LIBRAW_CMAKE_SOURCE_PATH + REPO LibRaw/LibRaw-cmake + REF a71f3b83ee3dccd7be32f9a2f410df4d9bdbde0a + SHA512 607e6f76bcb57534da4f0c864b7a421f1ed49244468b1b52abe77f65aa599cae80715520b3a951294321b812deffd4f163757c9949f337571aa54f414ccc58a5 + HEAD_REF master + PATCHES + findlibraw_debug_fix.patch + lcms2_debug_fix.patch + # Move the non-thread-safe library to manual-link. This is unfortunately needed + # because otherwise libraries that build on top of libraw have to choose. + fix-install.patch +) + +file(COPY "${LIBRAW_CMAKE_SOURCE_PATH}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${LIBRAW_CMAKE_SOURCE_PATH}/cmake" DESTINATION "${SOURCE_PATH}") + + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openmp ENABLE_OPENMP +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DINSTALL_CMAKE_MODULE_PATH=share/${PORT} + -DENABLE_EXAMPLES=OFF + -DCMAKE_DEBUG_POSTFIX=d +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libraw/libraw_types.h" + "#ifdef LIBRAW_NODLL" "#if 1" + ) +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libraw/libraw_types.h" + "#ifdef LIBRAW_NODLL" "#if 0" + ) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/externals/vcpkg/ports/libraw/usage b/externals/vcpkg/ports/libraw/usage new file mode 100755 index 000000000..6c68aadf3 --- /dev/null +++ b/externals/vcpkg/ports/libraw/usage @@ -0,0 +1,11 @@ +The package libraw is compatible with built-in CMake targets: + + find_package(LibRaw REQUIRED) + # For non-thread-safe version + target_compile_definitions(main PRIVATE ${LibRaw_DEFINITIONS}) + target_include_directories(main PRIVATE ${LibRaw_INCLUDE_DIR}) + target_link_libraries(main PRIVATE ${LibRaw_LIBRARIES}) + # For thread-safe version + target_compile_definitions(main PRIVATE ${LibRaw_r_DEFINITIONS}) + target_include_directories(main PRIVATE ${LibRaw_INCLUDE_DIR}) + target_link_libraries(main PRIVATE ${LibRaw_r_LIBRARIES}) diff --git a/externals/vcpkg/ports/libraw/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/libraw/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..dcd9826e2 --- /dev/null +++ b/externals/vcpkg/ports/libraw/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,25 @@ +set(LIBRAW_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) +_find_package(${ARGS}) +set(CMAKE_MODULE_PATH ${LIBRAW_PREV_MODULE_PATH}) + +if (@ENABLE_OPENMP@) + find_package(OpenMP REQUIRED) + if (OpenMP_FOUND) + list(APPEND LibRaw_LIBRARIES gomp) + list(APPEND LibRaw_r_LIBRARIES gomp) + endif() +endif() + +if (@VCPKG_LIBRARY_LINKAGE@ STREQUAL "static") + find_package(Jasper REQUIRED) + if (Jasper_FOUND) + list(APPEND LibRaw_LIBRARIES ${JASPER_LIBRARIES}) + list(APPEND LibRaw_r_LIBRARIES ${JASPER_LIBRARIES}) + endif () + find_package(lcms2 CONFIG REQUIRED) + if (lcms2_FOUND) + list(APPEND LibRaw_LIBRARIES lcms2::lcms2) + list(APPEND LibRaw_r_LIBRARIES lcms2::lcms2) + endif () +endif() diff --git a/externals/vcpkg/ports/libraw/vcpkg.json b/externals/vcpkg/ports/libraw/vcpkg.json new file mode 100755 index 000000000..af3d6c63c --- /dev/null +++ b/externals/vcpkg/ports/libraw/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "libraw", + "version-string": "201903", + "port-version": 7, + "description": "raw image decoder library", + "homepage": "https://www.libraw.org", + "dependencies": [ + "jasper", + "lcms", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "openmp": { + "description": "Build library with OpenMP support" + } + } +} diff --git a/externals/vcpkg/ports/librdkafka/lz4.patch b/externals/vcpkg/ports/librdkafka/lz4.patch new file mode 100755 index 000000000..a4cd7a93d --- /dev/null +++ b/externals/vcpkg/ports/librdkafka/lz4.patch @@ -0,0 +1,28 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -152,7 +152,7 @@ # LZ4 { + option(ENABLE_LZ4_EXT "Enable external LZ4 library support" ON) + set(WITH_LZ4_EXT OFF) +-if(ENABLE_LZ4_EXT) +- find_package(LZ4) +- if(LZ4_FOUND) ++if(1) ++ find_package(lz4 CONFIG REQUIRED) ++ if(1) + set(WITH_LZ4_EXT ON) + list(APPEND BUILT_WITH "LZ4_EXT") +@@ -248,4 +248,4 @@ # LZ4 { + install( +- FILES "${project_config}" "${project_version}" "packaging/cmake/Modules/FindLZ4.cmake" ++ FILES "${project_config}" "${project_version}" + DESTINATION "${config_install_dir}" + ) + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -241,4 +241,3 @@ + if(WITH_LZ4_EXT) +- target_include_directories(rdkafka PRIVATE ${LZ4_INCLUDE_DIRS}) +- target_link_libraries(rdkafka PUBLIC LZ4::LZ4) ++ target_link_libraries(rdkafka PUBLIC lz4::lz4) + endif() diff --git a/externals/vcpkg/ports/librdkafka/portfile.cmake b/externals/vcpkg/ports/librdkafka/portfile.cmake new file mode 100755 index 000000000..27dee9a27 --- /dev/null +++ b/externals/vcpkg/ports/librdkafka/portfile.cmake @@ -0,0 +1,72 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO edenhill/librdkafka + REF v1.8.2 + SHA512 8c8ae291129b78e3b8367307ad1b1715af1438cd76d7160d64d13a58adf84c7c9f51efeba4656f55e101c25e4cb744db0d8bb5c01a2decb229e4567d16bdcb22 + HEAD_REF master + PATCHES lz4.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RDKAFKA_BUILD_STATIC) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + ssl WITH_SSL + zlib WITH_ZLIB + zstd WITH_ZSTD + snappy WITH_SNAPPY +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DRDKAFKA_BUILD_STATIC=${RDKAFKA_BUILD_STATIC} + -DRDKAFKA_BUILD_EXAMPLES=OFF + -DRDKAFKA_BUILD_TESTS=OFF + -DWITH_BUNDLED_SSL=OFF + ${FEATURE_OPTIONS} + OPTIONS_DEBUG + -DENABLE_SHAREDPTR_DEBUG=ON + -DENABLE_DEVEL=ON + -DENABLE_REFCNT_DEBUG=OFF + -DENABLE_SHAREDPTR_DEBUG=ON + -DWITHOUT_OPTIMIZATION=ON + OPTIONS_RELEASE + -DENABLE_SHAREDPTR_DEBUG=OFF + -DENABLE_DEVEL=OFF + -DENABLE_REFCNT_DEBUG=OFF + -DENABLE_SHAREDPTR_DEBUG=OFF + -DWITHOUT_OPTIMIZATION=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME RdKafka + CONFIG_PATH lib/cmake/RdKafka +) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + foreach(hdr rdkafka.h rdkafkacpp.h) + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/librdkafka/${hdr}" + "#ifdef LIBRDKAFKA_STATICLIB" + "#if 1 // #ifdef LIBRDKAFKA_STATICLIB" + ) + endforeach() +endif() + +# Handle copyright +configure_file("${SOURCE_PATH}/LICENSES.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) + +# Install usage +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/librdkafka/usage b/externals/vcpkg/ports/librdkafka/usage new file mode 100755 index 000000000..4f00a6a73 --- /dev/null +++ b/externals/vcpkg/ports/librdkafka/usage @@ -0,0 +1,4 @@ +The package @PORT@:@TARGET_TRIPLET@ provides CMake targets: + + find_package(RdKafka CONFIG REQUIRED) + target_link_libraries(main PRIVATE RdKafka::rdkafka RdKafka::rdkafka++) diff --git a/externals/vcpkg/ports/librdkafka/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/librdkafka/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..6f32a4521 --- /dev/null +++ b/externals/vcpkg/ports/librdkafka/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,45 @@ +include(SelectLibraryConfigurations) + +list(REMOVE_ITEM ARGS "NO_MODULE") +list(REMOVE_ITEM ARGS "CONFIG") +list(REMOVE_ITEM ARGS "MODULE") + +_find_package(${ARGS} CONFIG) + +if(RdKafka_FOUND) + if(TARGET RdKafka::rdkafka) + set(TARGET_NAME RdKafka::rdkafka) + else(TARGET RdKafka::rdkafka++) + set(TARGET_NAME RdKafka::rdkafka++) + endif() + + if(TARGET ${TARGET_NAME} AND NOT DEFINED RdKafka_INCLUDE_DIRS) + get_target_property(_RdKafka_INCLUDE_DIRS ${TARGET_NAME} INTERFACE_INCLUDE_DIRECTORIES) + get_target_property(_RdKafka_LINK_LIBRARIES ${TARGET_NAME} INTERFACE_LINK_LIBRARIES) + + if (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + get_target_property(_RdKafka_LIBRARY_DEBUG ${TARGET_NAME} IMPORTED_IMPLIB_DEBUG) + get_target_property(_RdKafka_LIBRARY_RELEASE ${TARGET_NAME} IMPORTED_IMPLIB_RELEASE) + endif() + + if(NOT _RdKafka_LIBRARY_DEBUG AND NOT _RdKafka_LIBRARY_RELEASE) + get_target_property(_RdKafka_LIBRARY_DEBUG ${TARGET_NAME} IMPORTED_LOCATION_DEBUG) + get_target_property(_RdKafka_LIBRARY_RELEASE ${TARGET_NAME} IMPORTED_LOCATION_RELEASE) + endif() + + set(RdKafka_INCLUDE_DIR "${_RdKafka_INCLUDE_DIRS}") + set(RdKafka_LIBRARY_DEBUG "${_RdKafka_LIBRARY_DEBUG}") + set(RdKafka_LIBRARY_RELEASE "${_RdKafka_LIBRARY_RELEASE}") + + select_library_configurations(RdKafka) + + list(APPEND RdKafka_LIBRARIES ${_RdKafka_LINK_LIBRARIES}) + list(APPEND RdKafka_LIBRARY ${_RdKafka_LINK_LIBRARIES}) + + unset(_RdKafka_INCLUDE_DIRS) + unset(_RdKafka_LINK_LIBRARIES) + unset(_RdKafka_LIBRARY_DEBUG) + unset(_RdKafka_LIBRARY_DEBUG) + unset(TARGET_NAME) + endif() +endif() \ No newline at end of file diff --git a/externals/vcpkg/ports/librdkafka/vcpkg.json b/externals/vcpkg/ports/librdkafka/vcpkg.json new file mode 100755 index 000000000..8ab425445 --- /dev/null +++ b/externals/vcpkg/ports/librdkafka/vcpkg.json @@ -0,0 +1,43 @@ +{ + "name": "librdkafka", + "version": "1.8.2", + "port-version": 2, + "description": "The Apache Kafka C/C++ library", + "homepage": "https://github.com/edenhill/librdkafka", + "license": null, + "supports": "!uwp", + "dependencies": [ + "lz4", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "snappy": { + "description": "Build with snappy" + }, + "ssl": { + "description": "Build with OpenSSL", + "dependencies": [ + "openssl" + ] + }, + "zlib": { + "description": "Build with zlib", + "dependencies": [ + "zlib" + ] + }, + "zstd": { + "description": "Build with zstd", + "dependencies": [ + "zstd" + ] + } + } +} diff --git a/externals/vcpkg/ports/libressl/0001-enable-ocspcheck-on-msvc.patch b/externals/vcpkg/ports/libressl/0001-enable-ocspcheck-on-msvc.patch new file mode 100755 index 000000000..53083d314 --- /dev/null +++ b/externals/vcpkg/ports/libressl/0001-enable-ocspcheck-on-msvc.patch @@ -0,0 +1,254 @@ +diff --git a/apps/ocspcheck/CMakeLists.txt b/apps/ocspcheck/CMakeLists.txt +index 3c80458..e8d3bf5 100644 +--- a/apps/ocspcheck/CMakeLists.txt ++++ b/apps/ocspcheck/CMakeLists.txt +@@ -1,5 +1,3 @@ +-if(NOT MSVC) +- + set( + OCSPCHECK_SRC + http.c +@@ -13,13 +11,27 @@ else() + set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/strtonum.c) + endif() + ++check_function_exists(getopt HAVE_GETOPT) ++if(HAVE_GETOPT) ++ add_definitions(-DHAVE_GETOPT) ++else() ++ set(GETOPT_SRC compat/getopt.c) ++endif() ++ ++check_function_exists(ftruncate HAVE_FTRUNCATE) ++if(HAVE_FTRUNCATE) ++ add_definitions(-DHAVE_FTRUNCATE) ++else() ++ set(FTRUNCATE_SRC compat/ftruncate.c) ++endif() ++ + if(NOT "${OPENSSLDIR}" STREQUAL "") + add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\") + else() + add_definitions(-DDEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\") + endif() + +-add_executable(ocspcheck ${OCSPCHECK_SRC}) ++add_executable(ocspcheck ${OCSPCHECK_SRC} ${GETOPT_SRC} ${FTRUNCATE_SRC}) + target_include_directories(ocspcheck PRIVATE . ./compat ../../include/compat) + target_link_libraries(ocspcheck tls ${OPENSSL_LIBS}) + +@@ -28,5 +40,3 @@ if(ENABLE_LIBRESSL_INSTALL) + install(FILES ocspcheck.8 DESTINATION ${CMAKE_INSTALL_MANDIR}/man8) + + endif(ENABLE_LIBRESSL_INSTALL) +- +-endif() +diff --git a/apps/ocspcheck/compat/ftruncate.c b/apps/ocspcheck/compat/ftruncate.c +new file mode 100644 +index 0000000..e825e50 +--- /dev/null ++++ b/apps/ocspcheck/compat/ftruncate.c +@@ -0,0 +1,17 @@ ++/* ++ * Public domain ++ * ++ * Kinichiro Inoguchi ++ */ ++ ++#ifdef _WIN32 ++ ++#include ++ ++int ++ftruncate(int fd, off_t length) ++{ ++ return _chsize(fd, length); ++} ++ ++#endif +diff --git a/apps/ocspcheck/compat/getopt.c b/apps/ocspcheck/compat/getopt.c +new file mode 100644 +index 0000000..ff05743 +--- /dev/null ++++ b/apps/ocspcheck/compat/getopt.c +@@ -0,0 +1,131 @@ ++/* ++ * Public domain ++ * ++ * EternalPhane ++ */ ++ ++#include ++#include ++ ++#include "getopt.h" ++ ++char *optarg = NULL; ++int optind = 0, optopt = '?'; ++ ++typedef int bool; ++#define true 1 ++#define false 0 ++ ++static int nonopt_begin = 0, nonopt_end = 0; ++ ++void clear_buf(); ++ ++void permute(char *const argv[]) ++{ ++ static char* buf = NULL; ++ if (!argv && buf) ++ return free(buf); ++ if (!buf) ++ atexit(clear_buf); ++ if (nonopt_begin == nonopt_end) ++ { ++ nonopt_begin = nonopt_end = optind; ++ return; ++ } ++ int nonopt_size = nonopt_end - nonopt_begin, ++ opt_size = optind - nonopt_end; ++ if (nonopt_size <= opt_size) ++ { ++ if (!realloc(buf, nonopt_size)) ++ free(buf), buf = malloc(nonopt_size); ++ memcpy(buf, nonopt_begin, nonopt_size); ++ memmove(nonopt_begin, nonopt_end, opt_size); ++ memcpy(nonopt_begin + opt_size, buf, nonopt_size); ++ } ++ else ++ { ++ if (!realloc(buf, opt_size)) ++ free(buf), buf = malloc(opt_size); ++ memcpy(buf, nonopt_end, opt_size); ++ memmove(nonopt_begin + opt_size, nonopt_begin, nonopt_size); ++ memcpy(nonopt_begin, buf, opt_size); ++ } ++ nonopt_begin += opt_size; ++ nonopt_end = optind; ++} ++ ++void clear_buf() ++{ ++ permute(NULL); ++} ++ ++int getopt(int argc, char *const argv[], const char *optstring) ++{ ++ static char *nextchar = NULL; ++ static bool posixly_correct = false, always_return_nonopt = false; ++ if (optind >= argc) ++ return -1; ++ if (!optind) ++ { ++ nonopt_begin = nonopt_end = 0; ++ posixly_correct = '+' == optstring[0] || getenv("POSIXLY_CORRECT"); ++ always_return_nonopt = '-' == optstring[0]; ++ if (posixly_correct || always_return_nonopt) ++ optstring++; ++ } ++ if (!nextchar || !*nextchar) ++ { ++ if (!posixly_correct && !always_return_nonopt) ++ { ++ int temp = optind++; ++ for (;;) ++ { ++ if (++temp >= argc || !strcmp("--", argv[temp])) ++ { ++ permute(argv); ++ if (temp < argc) ++ { ++ optind = temp + 1; ++ permute(argv); ++ } ++ optind = nonopt_begin; ++ return -1; ++ } ++ if ('-' == argv[temp][0] && argv[temp][1]) ++ break; ++ } ++ if (temp > optind) ++ { ++ permute(argv); ++ nonopt_end = optind = temp; ++ } ++ nextchar = argv[optind] + 1; ++ } ++ else ++ { ++ if (++optind >= argc || !strcmp("--", argv[optind])) ++ return -1; ++ if ('-' != argv[optind][0] || !argv[optind][1]) ++ return posixly_correct ? -1 : (optarg = argv[optind++], 1); ++ } ++ } ++ const char *temp = strchr(optstring, *nextchar++); ++ if (!temp) ++ return optopt = *(nextchar - 1), '?'; ++ if (':' == temp[1]) ++ { ++ bool err = false; ++ if (':' == temp[2]) ++ optarg = *nextchar ? nextchar : NULL; ++ else if (*nextchar) ++ optarg = nextchar; ++ else if ('-' != argv[++optind][0]) ++ optarg = argv[optind]; ++ else ++ return nextchar = argv[optind] + 1, ++ optopt = *temp, ++ ':' == optstring[0] ? ':' : '?'; ++ nextchar += strlen(nextchar); ++ } ++ return *temp; ++} +diff --git a/apps/ocspcheck/compat/getopt.h b/apps/ocspcheck/compat/getopt.h +new file mode 100644 +index 0000000..ada142e +--- /dev/null ++++ b/apps/ocspcheck/compat/getopt.h +@@ -0,0 +1,15 @@ ++/* ++ * Public domain ++ * ++ * EternalPhane ++ */ ++ ++#ifndef GETOPT_H__ ++#define GETOPT_H__ ++ ++extern char *optarg; ++extern int optind, opterr, optopt; ++ ++int getopt(int argc, char *const argv[], const char *optstring); ++ ++#endif +\ No newline at end of file +diff --git a/apps/ocspcheck/ocspcheck.c b/apps/ocspcheck/ocspcheck.c +index 551a8fa..c608578 100644 +--- a/apps/ocspcheck/ocspcheck.c ++++ b/apps/ocspcheck/ocspcheck.c +@@ -519,6 +519,10 @@ main(int argc, char **argv) + ssize_t written, w; + short port; + ++#ifndef HAVE_GETOPT ++#include "getopt.h" ++#endif ++ + while ((ch = getopt(argc, argv, "C:i:No:v")) != -1) { + switch (ch) { + case 'C': +diff --git a/include/compat/unistd.h b/include/compat/unistd.h +index f521b94..f11db44 100644 +--- a/include/compat/unistd.h ++++ b/include/compat/unistd.h +@@ -23,6 +23,7 @@ ssize_t pwrite(int d, const void *buf, size_t nbytes, off_t offset); + #include + #include + ++#define STDIN_FILENO 0 + #define STDOUT_FILENO 1 + #define STDERR_FILENO 2 + diff --git a/externals/vcpkg/ports/libressl/0002-suppress-msvc-warnings.patch b/externals/vcpkg/ports/libressl/0002-suppress-msvc-warnings.patch new file mode 100755 index 000000000..79d756622 --- /dev/null +++ b/externals/vcpkg/ports/libressl/0002-suppress-msvc-warnings.patch @@ -0,0 +1,47 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a6a7554..b20fd4b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -111,6 +111,11 @@ if(WIN32) + set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32 bcrypt) + endif() + ++if(MSVC AND MSVC_VERSION GREATER_EQUAL 1912) ++ message(STATUS "Setting /Qspectre switch") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Qspectre") ++endif() ++ + if(MSVC) + add_definitions(-Dinline=__inline) + message(STATUS "Using [${CMAKE_C_COMPILER_ID}] compiler") +@@ -123,16 +128,29 @@ if(MSVC) + "C4127" # conditional expression is constant + "C4146" # unary minus operator applied to unsigned type, + # result still unsigned ++ "C4242" # 'identifier' : conversion from 'type1' to 'type2', ++ # possible loss of data + "C4244" # 'argument' : conversion from 'type1' to 'type2', + # possible loss of data + "C4245" # 'conversion' : conversion from 'type1' to 'type2', + # signed/unsigned mismatch ++ "C4255" # 'function' : no function prototype given: ++ # converting '()' to '(void)' + "C4267" # 'var' : conversion from 'size_t' to 'type', + # possible loss of data ++ "C4388" # 'expression': signed/unsigned mismatch + "C4389" # 'operator' : signed/unsigned mismatch ++ "C4464" # relative include path contains '..' ++ "C4668" # 'symbol' is not defined as a preprocessor macro, ++ # replacing with '0' for 'directives' + "C4706" # assignment within conditional expression ++ "C4710" # 'function' : function not inlined ++ "C4711" # function 'function' selected for inline expansion ++ "C4820" # 'bytes' bytes padding added after construct 'member_name' + "C4996" # The POSIX name for this item is deprecated. + # Instead, use the ISO C and C++ conformant name ++ "C5045" # Compiler will insert Spectre mitigation for memory load ++ # if /Qspectre switch specified + ) + elseif(CMAKE_C_COMPILER_ID MATCHES "Intel") + add_definitions(-D_CRT_SUPPRESS_RESTRICT) + diff --git a/externals/vcpkg/ports/libressl/portfile.cmake b/externals/vcpkg/ports/libressl/portfile.cmake new file mode 100755 index 000000000..b8604ebfd --- /dev/null +++ b/externals/vcpkg/ports/libressl/portfile.cmake @@ -0,0 +1,70 @@ +if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h") + message(WARNING "Can't build libressl if openssl is installed. Please remove openssl, and try install libressl again if you need it. Build will continue since libressl is a subset of openssl") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + return() +endif() + +set(LIBRESSL_VERSION 3.4.2) +set(LIBRESSL_HASH ae91a840b29330681dc2a4f55a9bd760e6fe1bdfb3399017aae3a16bd21b413e97cbb8ba504400f0a1f42757f6128b3fa763d06bae4fc9f2b9dbeea867a57ad2) + +vcpkg_download_distfile( + LIBRESSL_SOURCE_ARCHIVE + URLS "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${PORT}-${LIBRESSL_VERSION}.tar.gz" "https://ftp.fau.de/openbsd/LibreSSL/${PORT}-${LIBRESSL_VERSION}.tar.gz" + FILENAME "${PORT}-${LIBRESSL_VERSION}.tar.gz" + SHA512 "${LIBRESSL_HASH}" +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${LIBRESSL_SOURCE_ARCHIVE}" + REF "${LIBRESSL_VERSION}" + PATCHES + 0001-enable-ocspcheck-on-msvc.patch + 0002-suppress-msvc-warnings.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "tools" LIBRESSL_APPS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DLIBRESSL_TESTS=OFF + OPTIONS_DEBUG + -DLIBRESSL_APPS=OFF +) + +vcpkg_cmake_install() + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES ocspcheck openssl DESTINATION "${CURRENT_PACKAGES_DIR}/tools/openssl" AUTO_CLEAN) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) +endif() +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/etc/ssl/certs" + "${CURRENT_PACKAGES_DIR}/debug/etc/ssl/certs" + "${CURRENT_PACKAGES_DIR}/share/man" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) + file(GLOB_RECURSE LIBS "${CURRENT_PACKAGES_DIR}/*.lib") + foreach(LIB ${LIBS}) + string(REGEX REPLACE "(.+)-[0-9]+\\.lib" "\\1.lib" LINK "${LIB}") + file(CREATE_LINK "${LIB}" "${LINK}") + endforeach() +endif() diff --git a/externals/vcpkg/ports/libressl/vcpkg.json b/externals/vcpkg/ports/libressl/vcpkg.json new file mode 100755 index 000000000..3b784e025 --- /dev/null +++ b/externals/vcpkg/ports/libressl/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "libressl", + "version": "3.4.2", + "description": "LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, improving security, and applying best practice development processes.", + "supports": "!(uwp | arm)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "Build openssl and ocspcheck executables" + } + } +} diff --git a/externals/vcpkg/ports/librsvg/CMakeLists.txt b/externals/vcpkg/ports/librsvg/CMakeLists.txt new file mode 100755 index 000000000..13c319486 --- /dev/null +++ b/externals/vcpkg/ports/librsvg/CMakeLists.txt @@ -0,0 +1,149 @@ +cmake_minimum_required(VERSION 3.11) +project(librsvg C) + +find_package(unofficial-libcroco CONFIG REQUIRED) +find_package(PkgConfig REQUIRED) +pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2 gio-2 IMPORTED_TARGET) +pkg_check_modules(CAIRO cairo IMPORTED_TARGET) +pkg_check_modules(GDK_PIXBUF gdk-pixbuf-2.0 IMPORTED_TARGET) +pkg_check_modules(PANGO pango pangocairo IMPORTED_TARGET) +find_package(LibXml2 REQUIRED) +if(CMAKE_SYSTEM_NAME MATCHES "Windows") +elseif(CMAKE_SYSTEM_NAME MATCHES "Linux") +else() + pkg_check_modules(PANGO2 pangoft2 pangofc IMPORTED_TARGET) + set(PANGO_FT2_LIB PkgConfig::PANGO2) +endif() + +# Add include directories +include_directories(${CAIRO_INCLUDE_DIRS} ${GDK_PIXBUF_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS} ${PANGO2_INCLUDE_DIRS}) + +set(LIBRSVG_SOURCES + librsvg-features.c + rsvg-css.c + rsvg-css.h + rsvg-compat.h + rsvg-defs.c + rsvg-defs.h + rsvg-image.c + rsvg-image.h + rsvg-io.c + rsvg-io.h + rsvg-paint-server.c + rsvg-paint-server.h + rsvg-path.c + rsvg-path.h + rsvg-private.h + rsvg-base-file-util.c + rsvg-filter.c + rsvg-filter.h + rsvg-marker.c + rsvg-marker.h + rsvg-mask.c + rsvg-mask.h + rsvg-shapes.c + rsvg-shapes.h + rsvg-structure.c + rsvg-structure.h + rsvg-styles.c + rsvg-styles.h + rsvg-text.c + rsvg-text.h + rsvg-cond.c + rsvg-base.c + librsvg-enum-types.c + rsvg-cairo-draw.c + rsvg-cairo-draw.h + rsvg-cairo-render.c + rsvg-cairo-render.h + rsvg-cairo-clip.h + rsvg-cairo-clip.c + rsvg.c + rsvg-gobject.c + rsvg-file-util.c + rsvg-size-callback.c + rsvg-size-callback.h + rsvg-xml.c + rsvg-xml.h + rsvg.h + rsvg-cairo.h + librsvg-features.h + librsvg-enum-types.h +) + +set(PIXBUFLOADERSVG_SOURCES + gdk-pixbuf-loader/io-svg.c +) + +if(WIN32) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.win32 ${CMAKE_CURRENT_SOURCE_DIR}/config.h COPYONLY) + add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/rsvg.def + COMMAND echo "EXPORTS" > ${CMAKE_CURRENT_SOURCE_DIR}/rsvg.def + COMMAND ${CMAKE_C_COMPILER} /EP ${CMAKE_CURRENT_SOURCE_DIR}/rsvg.symbols >> ${CMAKE_CURRENT_SOURCE_DIR}/rsvg.def) + list(APPEND LIBRSVG_SOURCES rsvg.def) +else() + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.linux ${CMAKE_CURRENT_SOURCE_DIR}/config.h COPYONLY) + list(APPEND LIBRSVG_SOURCES rsvg.symbols) +endif() + +add_library(rsvg-2.40 ${LIBRSVG_SOURCES}) +add_library(pixbufloader-svg ${PIXBUFLOADERSVG_SOURCES}) + +target_compile_definitions(rsvg-2.40 PRIVATE -DRSVG_COMPILATION -D_CRT_SECURE_NO_WARNINGS -DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}") + +target_include_directories(pixbufloader-svg PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) +target_compile_definitions(pixbufloader-svg PRIVATE + -DRSVG_COMPILATION + -D_CRT_SECURE_NO_WARNINGS + -DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" + -DGDK_PIXBUF_ENABLE_BACKEND + -DG_LOG_DOMAIN="libpixbufloader-svg") + +target_link_libraries(rsvg-2.40 PRIVATE + PkgConfig::GLIB2 + ${LIBXML2_LIBRARIES} + PkgConfig::PANGO + PkgConfig::GDK_PIXBUF + ${PANGO_FT2_LIB} + unofficial::libcroco::croco-0.6 +) +target_link_libraries(pixbufloader-svg PRIVATE + rsvg-2.40 + PkgConfig::GLIB2 + PkgConfig::GDK_PIXBUF +) + +install(TARGETS rsvg-2.40 pixbufloader-svg + EXPORT librsvg-targets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install( + EXPORT librsvg-targets + NAMESPACE unofficial::librsvg:: + FILE unofficial-librsvg-targets.cmake + DESTINATION share/unofficial-librsvg +) + +install(FILES + rsvg.h + rsvg-cairo.h + librsvg-features.h + librsvg-enum-types.h + DESTINATION include/librsvg +) + +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-librsvg-config.cmake " +include(CMakeFindDependencyMacro) +find_dependency(PkgConfig) +pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2 gio-2 IMPORTED_TARGET) +pkg_check_modules(CAIRO cairo IMPORTED_TARGET) +pkg_check_modules(GDK_PIXBUF gdk-pixbuf IMPORTED_TARGET) +pkg_check_modules(PANGO pango pangocairo IMPORTED_TARGET) +find_dependency(unofficial-libcroco CONFIG) + +include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-librsvg-targets.cmake) +") +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-librsvg-config.cmake DESTINATION share/unofficial-librsvg) diff --git a/externals/vcpkg/ports/librsvg/config.h.linux b/externals/vcpkg/ports/librsvg/config.h.linux new file mode 100755 index 000000000..c3881b8c9 --- /dev/null +++ b/externals/vcpkg/ports/librsvg/config.h.linux @@ -0,0 +1,89 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define if your file defines LC_MESSAGES. */ +#define HAVE_LC_MESSAGES 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LOCALE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Have the pangoft2 library */ +#define HAVE_PANGOFT2 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strtok_r' function. */ +#define HAVE_STRTOK_R 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* Name of package */ +#define PACKAGE "librsvg" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugzilla.gnome.org/enter_bug.cgi?product=librsvg" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "RSVG" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "RSVG 2.40.20" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "librsvg" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "2.40.20" + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION "2.40.20" + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +/* # undef WORDS_BIGENDIAN */ +# endif +#endif diff --git a/externals/vcpkg/ports/librsvg/portfile.cmake b/externals/vcpkg/ports/librsvg/portfile.cmake new file mode 100755 index 000000000..8e47fada4 --- /dev/null +++ b/externals/vcpkg/ports/librsvg/portfile.cmake @@ -0,0 +1,33 @@ +# port update requires rust/cargo + +vcpkg_download_distfile(ARCHIVE + URLS "https://download.gnome.org/sources/librsvg/2.40/librsvg-2.40.20.tar.xz" + FILENAME "librsvg-2.40.20.tar.xz" + SHA512 cdd8224deb4c3786e29f48ed02c32ed9dff5cb15aba574a5ef845801ad3669cfcc3eedb9d359c22213dc7a29de24c363248825adad5877c40abf73b3688ff12f +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +configure_file("${CMAKE_CURRENT_LIST_DIR}/config.h.linux" "${SOURCE_PATH}/config.h.linux" COPYONLY) + +vcpkg_find_acquire_program(PKGCONFIG) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-librsvg CONFIG_PATH share/unofficial-librsvg) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/librsvg/vcpkg.json b/externals/vcpkg/ports/librsvg/vcpkg.json new file mode 100755 index 000000000..eea2a5efd --- /dev/null +++ b/externals/vcpkg/ports/librsvg/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "librsvg", + "version": "2.40.20", + "port-version": 5, + "description": "A small library to render Scalable Vector Graphics (SVG)", + "homepage": "https://gitlab.gnome.org/GNOME/librsvg", + "dependencies": [ + "cairo", + "gdk-pixbuf", + "libcroco", + "pango", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/librsync/portfile.cmake b/externals/vcpkg/ports/librsync/portfile.cmake new file mode 100755 index 000000000..a0a07bad3 --- /dev/null +++ b/externals/vcpkg/ports/librsync/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO librsync/librsync + REF 42b636d2a65ab6914ea7cac50886da28192aaf9b # V2.3.2 + SHA512 4903a64e327a7d49ae5f741b7b9fe3a76018010147249e2bc53917b06d31ee0f9b917f6c3e36a2d241ae66c19fa881113b59911d777742a859922486d9fe9c4c + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_RDIFF:BOOL=OFF + -DENABLE_COMPRESSION:BOOL=OFF + -DENABLE_TRACE:BOOL=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/rsync.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/rsync.dll" "${CURRENT_PACKAGES_DIR}/bin/rsync.dll") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/rsync.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/rsync.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/rsync.dll") +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/librsync_export.h" + "# ifdef LIBRSYNC_STATIC_DEFINE" + "# if 1 /* LIBRSYNC_STATIC_DEFINE */" + ) +endif() + +vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/librsync/vcpkg.json b/externals/vcpkg/ports/librsync/vcpkg.json new file mode 100755 index 000000000..7fda0a64d --- /dev/null +++ b/externals/vcpkg/ports/librsync/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "librsync", + "version-semver": "2.3.2", + "port-version": 1, + "description": "librsync is a library for calculating and applying network deltas, with an interface designed to ease integration into diverse network applications.", + "homepage": "http://librsync.sourcefrog.net/", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/librtmp/CMakeLists.txt b/externals/vcpkg/ports/librtmp/CMakeLists.txt new file mode 100755 index 000000000..c9f77f16b --- /dev/null +++ b/externals/vcpkg/ports/librtmp/CMakeLists.txt @@ -0,0 +1,57 @@ +cmake_minimum_required(VERSION 3.8) + +project(librtmp C) + +find_package(ZLIB REQUIRED) +find_package(OpenSSL REQUIRED) + +include_directories(${ZLIB_INCLUDE_DIRS}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + +set(CMAKE_DEBUG_POSTFIX "d") + +if(MSVC) + add_definitions(-D_CRT_SECURE_NO_DEPRECATE) + add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) + add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS) +endif() + +add_definitions(-DLIBRTMP_ONLY) + +# List the header files +set(HEADERS librtmp/amf.h + librtmp/bytes.h + librtmp/dh.h + librtmp/dhgroups.h + librtmp/handshake.h + librtmp/http.h + librtmp/log.h + librtmp/rtmp.h + librtmp/rtmp_sys.h +) + +# List the source files +set(SRCS librtmp/amf.c + librtmp/hashswf.c + librtmp/log.c + librtmp/parseurl.c + librtmp/rtmp.c +) + +if(MSVC) + set(SRCS_MSVC "librtmp/librtmp.def") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996") +endif() + +add_library(librtmp ${SRCS} ${HEADERS} ${SRCS_MSVC}) + +target_include_directories(librtmp PRIVATE ./librtmp) +target_link_libraries(librtmp PRIVATE ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES}) +target_link_libraries(librtmp PRIVATE Ws2_32.lib Winmm.lib) + +install(TARGETS librtmp + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + +install(DIRECTORY ${PROJECT_SOURCE_DIR}/librtmp DESTINATION include FILES_MATCHING PATTERN "*.h") diff --git a/externals/vcpkg/ports/librtmp/dh.patch b/externals/vcpkg/ports/librtmp/dh.patch new file mode 100755 index 000000000..4b0345354 --- /dev/null +++ b/externals/vcpkg/ports/librtmp/dh.patch @@ -0,0 +1,136 @@ +diff --git a/librtmp/dh.h b/librtmp/dh.h +index 8e285a60c..ea562d200 100644 +--- a/librtmp/dh.h ++++ b/librtmp/dh.h +@@ -139,11 +139,14 @@ typedef BIGNUM * MP_t; + #define MP_setbin(u,buf,len) BN_bn2bin(u,buf) + #define MP_getbin(u,buf,len) u = BN_bin2bn(buf,len,0) + ++ + #define MDH DH + #define MDH_new() DH_new() + #define MDH_free(dh) DH_free(dh) + #define MDH_generate_key(dh) DH_generate_key(dh) + #define MDH_compute_key(secret, seclen, pub, dh) DH_compute_key(secret, pub, dh) ++#define MPH_set_pqg(dh, p, q, g, res) res = DH_set0_pqg(dh, p, q, g) ++#define MPH_set_length(dh, len, res) res = DH_set_length(dh,len) + + #endif + +@@ -152,7 +155,7 @@ typedef BIGNUM * MP_t; + + /* RFC 2631, Section 2.1.5, http://www.ietf.org/rfc/rfc2631.txt */ + static int +-isValidPublicKey(MP_t y, MP_t p, MP_t q) ++isValidPublicKey(const MP_t y,const MP_t p, MP_t q) + { + int ret = TRUE; + MP_t bn; +@@ -211,20 +214,33 @@ DHInit(int nKeyBits) + if (!dh) + goto failed; + +- MP_new(dh->g); ++ MP_t g,p; ++ MP_new(g); + +- if (!dh->g) ++ if (!g) ++ { + goto failed; ++ } + +- MP_gethex(dh->p, P1024, res); /* prime P1024, see dhgroups.h */ ++ DH_get0_pqg(dh, (BIGNUM const**)&p, NULL, NULL); ++ MP_gethex(p, P1024, res); /* prime P1024, see dhgroups.h */ + if (!res) + { + goto failed; + } + +- MP_set_w(dh->g, 2); /* base 2 */ +- +- dh->length = nKeyBits; ++ MP_set_w(g, 2); /* base 2 */ ++ MPH_set_pqg(dh,p,NULL,g, res); ++ if (!res) ++ { ++ MP_free(g); ++ goto failed; ++ } ++ MPH_set_length(dh,nKeyBits, res); ++ if (!res) ++ { ++ goto failed; ++ } + return dh; + + failed: +@@ -250,14 +267,11 @@ DHGenerateKey(MDH *dh) + + MP_gethex(q1, Q1024, res); + assert(res); +- +- res = isValidPublicKey(dh->pub_key, dh->p, q1); ++ res = isValidPublicKey(DH_get0_pub_key(dh), DH_get0_p(dh), q1); + if (!res) +- { +- MP_free(dh->pub_key); +- MP_free(dh->priv_key); +- dh->pub_key = dh->priv_key = 0; +- } ++ { ++ MDH_free(dh); // Cannot set priv_key to nullptr so there is no way to generate a new pub/priv key pair in openssl 1.1.1. ++ } + + MP_free(q1); + } +@@ -272,15 +286,16 @@ static int + DHGetPublicKey(MDH *dh, uint8_t *pubkey, size_t nPubkeyLen) + { + int len; +- if (!dh || !dh->pub_key) ++ MP_t pub = DH_get0_pub_key(dh); ++ if (!dh || !pub) + return 0; + +- len = MP_bytes(dh->pub_key); ++ len = MP_bytes(pub); + if (len <= 0 || len > (int) nPubkeyLen) + return 0; + + memset(pubkey, 0, nPubkeyLen); +- MP_setbin(dh->pub_key, pubkey + (nPubkeyLen - len), len); ++ MP_setbin(pub, pubkey + (nPubkeyLen - len), len); + return 1; + } + +@@ -288,15 +303,16 @@ DHGetPublicKey(MDH *dh, uint8_t *pubkey, size_t nPubkeyLen) + static int + DHGetPrivateKey(MDH *dh, uint8_t *privkey, size_t nPrivkeyLen) + { +- if (!dh || !dh->priv_key) ++ MP_t priv = DH_get0_priv_key(dh); ++ if (!dh || !priv) + return 0; + +- int len = MP_bytes(dh->priv_key); ++ int len = MP_bytes(priv); + if (len <= 0 || len > (int) nPrivkeyLen) + return 0; + + memset(privkey, 0, nPrivkeyLen); +- MP_setbin(dh->priv_key, privkey + (nPrivkeyLen - len), len); ++ MP_setbin(priv, privkey + (nPrivkeyLen - len), len); + return 1; + } + #endif +@@ -322,7 +338,7 @@ DHComputeSharedSecretKey(MDH *dh, uint8_t *pubkey, size_t nPubkeyLen, + MP_gethex(q1, Q1024, len); + assert(len); + +- if (isValidPublicKey(pubkeyBn, dh->p, q1)) ++ if (isValidPublicKey(pubkeyBn, DH_get0_p(dh), q1)) + res = MDH_compute_key(secret, nPubkeyLen, pubkeyBn, dh); + else + res = -1; diff --git a/externals/vcpkg/ports/librtmp/fix_strncasecmp.patch b/externals/vcpkg/ports/librtmp/fix_strncasecmp.patch new file mode 100755 index 000000000..3e0c7ea96 --- /dev/null +++ b/externals/vcpkg/ports/librtmp/fix_strncasecmp.patch @@ -0,0 +1,20 @@ +diff --git a/librtmp/rtmp_sys.h b/librtmp/rtmp_sys.h +index 6a3f215..1b5ac2a 100644 +--- a/librtmp/rtmp_sys.h ++++ b/librtmp/rtmp_sys.h +@@ -28,11 +28,13 @@ + #include + + #ifdef _MSC_VER /* MSVC */ ++#if _MSC_VER < 1900 + #define snprintf _snprintf +-#define strcasecmp stricmp +-#define strncasecmp strnicmp + #define vsnprintf _vsnprintf + #endif ++#define strcasecmp _stricmp ++#define strncasecmp _strnicmp ++#endif + + #define GetSockError() WSAGetLastError() + #define SetSockError(e) WSASetLastError(e) diff --git a/externals/vcpkg/ports/librtmp/handshake.patch b/externals/vcpkg/ports/librtmp/handshake.patch new file mode 100755 index 000000000..88f5d2458 --- /dev/null +++ b/externals/vcpkg/ports/librtmp/handshake.patch @@ -0,0 +1,35 @@ +diff --git a/librtmp/handshake.h b/librtmp/handshake.h +index 98bf3c877..0819152bd 100644 +--- a/librtmp/handshake.h ++++ b/librtmp/handshake.h +@@ -66,9 +66,9 @@ typedef gcry_cipher_hd_t RC4_handle; + #if OPENSSL_VERSION_NUMBER < 0x0090800 || !defined(SHA256_DIGEST_LENGTH) + #error Your OpenSSL is too old, need 0.9.8 or newer with SHA256 + #endif +-#define HMAC_setup(ctx, key, len) HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, key, len, EVP_sha256(), 0) +-#define HMAC_crunch(ctx, buf, len) HMAC_Update(&ctx, buf, len) +-#define HMAC_finish(ctx, dig, dlen) HMAC_Final(&ctx, dig, &dlen); HMAC_CTX_cleanup(&ctx) ++#define HMAC_setup(ctx, key, len) ctx = HMAC_CTX_new(); HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0) ++#define HMAC_crunch(ctx, buf, len) HMAC_Update(ctx, buf, len) ++#define HMAC_finish(ctx, dig, dlen) HMAC_Final(ctx, dig, &dlen); HMAC_CTX_free(ctx) + + typedef RC4_KEY * RC4_handle; + #define RC4_alloc(h) *h = malloc(sizeof(RC4_KEY)) +@@ -114,7 +114,7 @@ static void InitRC4Encryption + { + uint8_t digest[SHA256_DIGEST_LENGTH]; + unsigned int digestLen = 0; +- HMAC_CTX ctx; ++ HMAC_CTX *ctx; + + RC4_alloc(rc4keyIn); + RC4_alloc(rc4keyOut); +@@ -263,7 +263,7 @@ HMACsha256(const uint8_t *message, size_t messageLen, const uint8_t *key, + size_t keylen, uint8_t *digest) + { + unsigned int digestLen; +- HMAC_CTX ctx; ++ HMAC_CTX *ctx; + + HMAC_setup(ctx, key, keylen); + HMAC_crunch(ctx, message, messageLen); diff --git a/externals/vcpkg/ports/librtmp/hashswf.patch b/externals/vcpkg/ports/librtmp/hashswf.patch new file mode 100755 index 000000000..fb29549f3 --- /dev/null +++ b/externals/vcpkg/ports/librtmp/hashswf.patch @@ -0,0 +1,28 @@ +diff --git a/librtmp/hashswf.c b/librtmp/hashswf.c +index 3c56b6922..964a64d01 100644 +--- a/librtmp/hashswf.c ++++ b/librtmp/hashswf.c +@@ -57,10 +57,10 @@ + #include + #include + #include +-#define HMAC_setup(ctx, key, len) HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, (unsigned char *)key, len, EVP_sha256(), 0) +-#define HMAC_crunch(ctx, buf, len) HMAC_Update(&ctx, (unsigned char *)buf, len) +-#define HMAC_finish(ctx, dig, dlen) HMAC_Final(&ctx, (unsigned char *)dig, &dlen); +-#define HMAC_close(ctx) HMAC_CTX_cleanup(&ctx) ++#define HMAC_setup(ctx, key, len) ctx = HMAC_CTX_new(); HMAC_Init_ex(ctx, (unsigned char *)key, len, EVP_sha256(), 0) ++#define HMAC_crunch(ctx, buf, len) HMAC_Update(ctx, (unsigned char *)buf, len) ++#define HMAC_finish(ctx, dig, dlen) HMAC_Final(ctx, (unsigned char *)dig, &dlen); ++#define HMAC_close(ctx) HMAC_CTX_free(ctx) + #endif + + extern void RTMP_TLS_Init(); +@@ -289,7 +289,7 @@ leave: + struct info + { + z_stream *zs; +- HMAC_CTX ctx; ++ HMAC_CTX *ctx; + int first; + int zlib; + int size; diff --git a/externals/vcpkg/ports/librtmp/hide_netstackdump.patch b/externals/vcpkg/ports/librtmp/hide_netstackdump.patch new file mode 100755 index 000000000..1cc7c8c5a --- /dev/null +++ b/externals/vcpkg/ports/librtmp/hide_netstackdump.patch @@ -0,0 +1,58 @@ +diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c +index 0865689..b00710e 100644 +--- a/librtmp/rtmp.c ++++ b/librtmp/rtmp.c +@@ -155,7 +155,7 @@ static int clk_tck; + uint32_t + RTMP_GetTime() + { +-#ifdef _DEBUG ++#if defined(_DEBUG) && !defined(LIBRTMP_ONLY) + return 0; + #elif defined(_WIN32) + return timeGetTime(); +@@ -1381,7 +1381,7 @@ RTMP_ClientPacket(RTMP *r, RTMPPacket *packet) + return bHasMediaPacket; + } + +-#ifdef _DEBUG ++#if defined(_DEBUG) && !defined(LIBRTMP_ONLY) + extern FILE *netstackdump; + extern FILE *netstackdump_read; + #endif +@@ -1469,7 +1469,7 @@ ReadN(RTMP *r, char *buffer, int n) + return FALSE; + } + /*RTMP_Log(RTMP_LOGDEBUG, "%s: %d bytes\n", __FUNCTION__, nBytes); */ +-#ifdef _DEBUG ++#if defined(_DEBUG) && !defined(LIBRTMP_ONLY) + fwrite(ptr, 1, nBytes, netstackdump_read); + #endif + +@@ -3757,7 +3757,7 @@ HandShake(RTMP *r, int FP9HandShake) + + memset(&clientsig[4], 0, 4); + +-#ifdef _DEBUG ++#if defined(_DEBUG) && !defined(LIBRTMP_ONLY) + for (i = 8; i < RTMP_SIG_SIZE; i++) + clientsig[i] = 0xff; + #else +@@ -3829,7 +3829,7 @@ SHandShake(RTMP *r) + memcpy(serversig, &uptime, 4); + + memset(&serversig[4], 0, 4); +-#ifdef _DEBUG ++#if defined(_DEBUG) && !defined(LIBRTMP_ONLY) + for (i = 8; i < RTMP_SIG_SIZE; i++) + serversig[i] = 0xff; + #else +@@ -4298,7 +4298,7 @@ RTMPSockBuf_Send(RTMPSockBuf *sb, const char *buf, int len) + { + int rc; + +-#ifdef _DEBUG ++#if defined(_DEBUG) && !defined(LIBRTMP_ONLY) + fwrite(buf, 1, len, netstackdump); + #endif + diff --git a/externals/vcpkg/ports/librtmp/librtmp.def b/externals/vcpkg/ports/librtmp/librtmp.def new file mode 100755 index 000000000..837e6a355 --- /dev/null +++ b/externals/vcpkg/ports/librtmp/librtmp.def @@ -0,0 +1,109 @@ +EXPORTS + AMF3_Decode + AMF3CD_AddProp + AMF3CD_GetProp + AMF3Prop_Decode + AMF3ReadInteger + AMF3ReadString + + AMF_AddProp + AMF_CountProp + AMF_Decode + AMF_DecodeArray + AMF_DecodeBoolean + AMF_DecodeInt16 + AMF_DecodeInt24 + AMF_DecodeInt32 + AMF_DecodeLongString + AMF_DecodeNumber + AMF_DecodeString + AMF_Dump + AMF_Encode + AMF_EncodeBoolean + AMF_EncodeInt16 + AMF_EncodeInt24 + AMF_EncodeInt32 + AMF_EncodeNamedBoolean + AMF_EncodeNamedNumber + AMF_EncodeNamedString + AMF_EncodeNumber + AMF_EncodeString + AMF_GetProp + AMF_Reset + + AMFProp_Decode + AMFProp_Dump + AMFProp_Encode + AMFProp_GetBoolean + AMFProp_GetName + AMFProp_GetNumber + AMFProp_GetObject + AMFProp_GetString + AMFProp_GetType + AMFProp_IsValid + AMFProp_Reset + AMFProp_SetName + + RTMP_Alloc + RTMP_ClientPacket + RTMP_Close + RTMP_Connect + RTMP_Connect0 + RTMP_Connect1 + RTMP_ConnectStream + RTMP_debuglevel + RTMP_DeleteStream + RTMP_DropRequest + RTMP_EnableWrite + RTMP_FindFirstMatchingProperty + RTMP_FindPrefixProperty + RTMP_Free + RTMP_GetDuration + RTMP_GetNextMediaPacket + RTMP_GetTime + RTMP_HashSWF + RTMP_Init + RTMP_IsConnected + RTMP_IsTimedout + RTMP_LibVersion + RTMP_Log + RTMP_LogGetLevel + RTMP_LogHex + RTMP_LogHexString + RTMP_LogPrintf + RTMP_LogSetCallback + RTMP_LogSetLevel + RTMP_LogSetOutput + RTMP_LogStatus + RTMP_ParsePlaypath + RTMP_ParseURL + RTMP_Pause + RTMP_Read + RTMP_ReadPacket + RTMP_ReconnectStream + RTMP_SendChunk + RTMP_SendClientBW + RTMP_SendCreateStream + RTMP_SendCtrl + RTMP_SendPacket + RTMP_SendPause + RTMP_SendSeek + RTMP_SendServerBW + RTMP_Serve + RTMP_SetBufferMS + RTMP_SetOpt + RTMP_SetupStream + RTMP_SetupURL + RTMP_Socket + RTMP_TLS_Init + RTMP_ToggleStream + RTMP_UpdateBufferMS + RTMP_UserInterrupt + RTMP_Write + RTMPPacket_Alloc + RTMPPacket_Dump + RTMPPacket_Free + RTMPPacket_Reset + RTMPSockBuf_Close + RTMPSockBuf_Fill + RTMPSockBuf_Send diff --git a/externals/vcpkg/ports/librtmp/portfile.cmake b/externals/vcpkg/ports/librtmp/portfile.cmake new file mode 100755 index 000000000..05a59fe34 --- /dev/null +++ b/externals/vcpkg/ports/librtmp/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mirror/rtmpdump + REF c5f04a58fc2aeea6296ca7c44ee4734c18401aa3 + SHA512 d97ac38672898a96412baa5f03d1e64d512ccefe15ead0a055ca039dc6057e2e620e046c28f4d7468e132b0b5a9eb9bd171250c1afa14da53760a0d7aae3c9e9 + PATCHES + dh.patch #Openssl 1.1.1 patch + handshake.patch #Openssl 1.1.1 patch + hashswf.patch #Openssl 1.1.1 patch + fix_strncasecmp.patch + hide_netstackdump.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/librtmp.def DESTINATION ${SOURCE_PATH}/librtmp) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# License and man +file(INSTALL ${SOURCE_PATH}/librtmp/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/librtmp RENAME copyright) +file(INSTALL ${SOURCE_PATH}/librtmp/librtmp.3.html DESTINATION ${CURRENT_PACKAGES_DIR}/share/librtmp) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/librtmp/vcpkg.json b/externals/vcpkg/ports/librtmp/vcpkg.json new file mode 100755 index 000000000..90a297315 --- /dev/null +++ b/externals/vcpkg/ports/librtmp/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "librtmp", + "version-date": "2019-11-11", + "port-version": 3, + "description": "RTMPDump Real-Time Messaging Protocol API", + "homepage": "https://rtmpdump.mplayerhq.hu", + "dependencies": [ + "openssl", + "zlib" + ] +} diff --git a/externals/vcpkg/ports/librttopo/fix-makefiles.patch b/externals/vcpkg/ports/librttopo/fix-makefiles.patch new file mode 100755 index 000000000..f86d35dd7 --- /dev/null +++ b/externals/vcpkg/ports/librttopo/fix-makefiles.patch @@ -0,0 +1,13 @@ +diff --git a/makefile.vc b/makefile.vc +index 1f790f0..f78d0c9 100644 +--- a/makefile.vc ++++ b/makefile.vc +@@ -17,7 +17,7 @@ LIBOBJ = src\box2d.obj src\bytebuffer.obj src\g_box.obj \ + src\rtout_kml.obj src\rtout_svg.obj src\rtout_twkb.obj src\rtout_wkb.obj \ + src\rtout_wkt.obj src\rtout_x3d.obj src\rtpoint.obj src\rtpoly.obj src\rtprint.obj \ + src\rtpsurface.obj src\rtspheroid.obj src\rtstroke.obj src\rttin.obj src\rttree.obj \ +- src\rttriangle.obj src\rtutil.obj src\stringbuffer.obj src\varint.obj ++ src\rttriangle.obj src\rtutil.obj src\stringbuffer.obj src\varint.obj src\rtt_tpsnap.obj + + LIBRTTOPO_DLL = librttopo$(VERSION).dll + diff --git a/externals/vcpkg/ports/librttopo/fix-pc-file.patch b/externals/vcpkg/ports/librttopo/fix-pc-file.patch new file mode 100755 index 000000000..12483781b --- /dev/null +++ b/externals/vcpkg/ports/librttopo/fix-pc-file.patch @@ -0,0 +1,9 @@ +diff --git a/rttopo.pc.in b/rttopo.pc.in +index 86c71dc..4064506 100644 +--- a/rttopo.pc.in ++++ b/rttopo.pc.in +@@ -10,3 +10,4 @@ Description: the RT Topology library + Version: @VERSION@ + Libs: -L${libdir} -lrttopo -lm + Cflags: -I${includedir} ++Requires.private: geos diff --git a/externals/vcpkg/ports/librttopo/geos-config.patch b/externals/vcpkg/ports/librttopo/geos-config.patch new file mode 100755 index 000000000..eb6b90506 --- /dev/null +++ b/externals/vcpkg/ports/librttopo/geos-config.patch @@ -0,0 +1,25 @@ +diff --git a/configure.ac b/configure.ac +index a956106..739ee88 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -110,7 +110,7 @@ else + fi + fi + # Extract the linker and include flags +-GEOS_LDFLAGS=`$GEOSCONFIG --ldflags` ++GEOS_LDFLAGS=`$GEOSCONFIG --clibs` + GEOS_CFLAGS=-I`$GEOSCONFIG --includes` + AC_SUBST([GEOS_LDFLAGS]) + AC_SUBST([GEOS_CFLAGS]) +@@ -122,9 +122,9 @@ CPPFLAGS="$CPPFLAGS_SAVE" + # Ensure we can link against libgeos_c + LIBS_SAVE="$LIBS" + LIBS="$GEOS_LDFLAGS" +-AC_SEARCH_LIBS(GEOSContext_setErrorMessageHandler_r,geos_c,,AC_MSG_ERROR([could not find libgeos_c (or obsolete 'libgeos_c' < v.3.5.0 found) - you may need to specify the directory of a geos-config file using --with-geosconfig])) ++AC_SEARCH_LIBS(GEOSContext_setErrorMessageHandler_r,,,AC_MSG_ERROR([could not find libgeos_c (or obsolete 'libgeos_c' < v.3.5.0 found) - you may need to specify the directory of a geos-config file using --with-geosconfig])) + LIBS="$LIBS_SAVE" +-LIBS="$LIBS $GEOS_LDFLAGS -lgeos_c" ++LIBS="$LIBS $GEOS_LDFLAGS" + GEOS_MAJOR_VERSION=`$GEOSCONFIG --version | cut -d. -f1 | sed 's/[[^0-9]]//g'` + GEOS_MINOR_VERSION=`$GEOSCONFIG --version | cut -d. -f2 | sed 's/[[^0-9]]//g'` + RTGEOM_GEOS_VERSION="$GEOS_MAJOR_VERSION$GEOS_MINOR_VERSION" diff --git a/externals/vcpkg/ports/librttopo/portfile.cmake b/externals/vcpkg/ports/librttopo/portfile.cmake new file mode 100755 index 000000000..1024f3af5 --- /dev/null +++ b/externals/vcpkg/ports/librttopo/portfile.cmake @@ -0,0 +1,76 @@ +# NOTE: update the version and checksum for new LIBRTTOPO release +set(LIBRTTOPO_VERSION_STR "1.1.0") +set(LIBRTTOPO_PACKAGE_SUM "d9c2f4db1261cc942152d348abb7f03e6053a63b6966e081c5381d40bbebd3c7ca1963224487355f384d7562a90287fb24d7af9e7eda4a1e230ee6441cef5de9") + +vcpkg_download_distfile(ARCHIVE + URLS "https://download.osgeo.org/librttopo/src/librttopo-${LIBRTTOPO_VERSION_STR}.tar.gz" + FILENAME "librttopo-${LIBRTTOPO_VERSION_STR}.tar.gz" + SHA512 ${LIBRTTOPO_PACKAGE_SUM} +) + +vcpkg_extract_source_archive_ex( + ARCHIVE "${ARCHIVE}" + OUT_SOURCE_PATH SOURCE_PATH + PATCHES + fix-makefiles.patch + geos-config.patch + fix-pc-file.patch +) + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + + file(REMOVE "${SOURCE_PATH}/src/rttopo_config.h") + configure_file("${CMAKE_CURRENT_LIST_DIR}/rttopo_config.h.in" "${SOURCE_PATH}/src/rttopo_config.h" @ONLY) + + set(OPTFLAGS "/nologo /fp:precise /W4 /D_CRT_SECURE_NO_WARNINGS /DDLL_EXPORT") + vcpkg_build_nmake( + SOURCE_PATH "${SOURCE_PATH}" + TARGET librttopo.lib + OPTIONS + "OPTFLAGS=${OPTFLAGS}" + "CFLAGS=-I. -Iheaders ${OPTFLAGS}" + ) + + file(GLOB LIBRTTOPO_INCLUDE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/headers/*.h") + file(COPY ${LIBRTTOPO_INCLUDE} DESTINATION "${CURRENT_PACKAGES_DIR}/include") + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/librttopo.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/librttopo.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + endif() + + set(VERSION "${LIBRTTOPO_VERSION_STR}") + set(libdir [[${prefix}/lib]]) + set(exec_prefix [[${prefix}]]) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(includedir [[${prefix}/include]]) + set(outfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/rttopo.pc") + configure_file("${SOURCE_PATH}/rttopo.pc.in" "${outfile}" @ONLY) + vcpkg_replace_string("${outfile}" " -lrttopo -lm" " -llibrttopo") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(includedir [[${prefix}/../include]]) + set(outfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/rttopo.pc") + configure_file("${SOURCE_PATH}/rttopo.pc.in" "${outfile}" @ONLY) + vcpkg_replace_string("${outfile}" " -lrttopo -lm" " -llibrttopo") + endif() +else() + vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS_DEBUG + "--with-geosconfig=${CURRENT_INSTALLED_DIR}/tools/geos/debug/bin/geos-config" + OPTIONS_RELEASE + "--with-geosconfig=${CURRENT_INSTALLED_DIR}/tools/geos/bin/geos-config" + ) + vcpkg_install_make() +endif() +vcpkg_fixup_pkgconfig() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/librttopo/rttopo_config.h.in b/externals/vcpkg/ports/librttopo/rttopo_config.h.in new file mode 100755 index 000000000..b4b1a3929 --- /dev/null +++ b/externals/vcpkg/ports/librttopo/rttopo_config.h.in @@ -0,0 +1,168 @@ +/* src/rttopo_config.h. Generated from rttopo_config.h.in by configure. */ +/* src/rttopo_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ASSERT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_CTYPE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the `fdatasync' function. */ +#define HAVE_FDATASYNC 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FLOAT_H 1 + +/* Define to 1 if you have the `ftruncate' function. */ +#define HAVE_FTRUNCATE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_GEOS_C_H 1 + +/* Define to 1 if you have the `getcwd' function. */ +#define HAVE_GETCWD 1 + +/* Define to 1 if you have the `gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `localtime_r' function. */ +#define HAVE_LOCALTIME_R 1 + +/* Define to 1 if `lstat' has the bug that it succeeds when given the + zero-length file name argument. */ +/* #undef HAVE_LSTAT_EMPTY_STRING_BUG */ + +/* Define to 1 if you have the header file. */ +#define HAVE_MATH_H 1 + +/* Define to 1 if you have the `memmove' function. */ +#define HAVE_MEMMOVE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `memset' function. */ +#define HAVE_MEMSET 1 + +/* Define to 1 if you have the `sqrt' function. */ +/* #undef HAVE_SQRT */ + +/* Define to 1 if `stat' has the bug that it succeeds when given the + zero-length file name argument. */ +/* #undef HAVE_STAT_EMPTY_STRING_BUG */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDARG_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strcasecmp' function. */ +#define HAVE_STRCASECMP 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the `strftime' function. */ +#define HAVE_STRFTIME 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strncasecmp' function. */ +#define HAVE_STRNCASECMP 1 + +/* Define to 1 if you have the `strstr' function. */ +#define HAVE_STRSTR 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* rtgeom version */ +#define LIBRTGEOM_VERSION "1.1.0" + +/* Define to 1 if `lstat' dereferences a symlink specified with a trailing + slash. */ +#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* Must be defined in order to disable debug mode. */ +#undef NDEBUG + +/* Name of package */ +#define PACKAGE "librttopo" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "strk@kbt.io" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "librttopo" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "librttopo 1.1.0" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "librttopo" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "1.1.0" + +/* RTGEOM Debug level */ +#define RTGEOM_DEBUG_LEVEL 0 + +/* GEOS library version */ +#define RTGEOM_GEOS_VERSION 38 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to 1 if you can safely include both and . */ +#define TIME_WITH_SYS_TIME 1 + +/* Define to 1 if your declares `struct tm'. */ +/* #undef TM_IN_SYS_TIME */ + +/* Version number of package */ +#define VERSION "1.1.0" + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `long int' if does not define. */ +/* #undef off_t */ + +/* Define to `unsigned int' if does not define. */ +/* #undef size_t */ + +/* Define to empty if the keyword `volatile' does not work. Warning: valid + code using `volatile' can become incorrect without. Disable with care. */ +/* #undef volatile */ diff --git a/externals/vcpkg/ports/librttopo/vcpkg.json b/externals/vcpkg/ports/librttopo/vcpkg.json new file mode 100755 index 000000000..73e72959b --- /dev/null +++ b/externals/vcpkg/ports/librttopo/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "librttopo", + "version": "1.1.0", + "port-version": 5, + "description": "The RT Topology Library exposes an API to create and manage standard (ISO 13249 aka SQL/MM) topologies using user-provided data stores.", + "homepage": "https://git.osgeo.org/gitea/rttopo/librttopo", + "dependencies": [ + "geos" + ] +} diff --git a/externals/vcpkg/ports/libsamplerate/portfile.cmake b/externals/vcpkg/ports/libsamplerate/portfile.cmake new file mode 100755 index 000000000..a6a76490f --- /dev/null +++ b/externals/vcpkg/ports/libsamplerate/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libsndfile/libsamplerate + REF 0.2.2 + SHA512 37e0fd604907caf978659466289315befd66eec16c21a94e0b6106de18ffe803fbf2e7f3a8fb0430b33c0b784ecd6d4eaf3b9a862ed2670104647decbee913d6 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTING=OFF + -DLIBSAMPLERATE_EXAMPLES=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/SampleRate TARGET_PATH share/SampleRate) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/libsamplerate/vcpkg.json b/externals/vcpkg/ports/libsamplerate/vcpkg.json new file mode 100755 index 000000000..aec150fb9 --- /dev/null +++ b/externals/vcpkg/ports/libsamplerate/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "libsamplerate", + "version-string": "0.2.2", + "description": "Sample Rate Converter for audio", + "homepage": "http://libsndfile.github.io/libsamplerate/" +} diff --git a/externals/vcpkg/ports/libsass/portfile.cmake b/externals/vcpkg/ports/libsass/portfile.cmake new file mode 100755 index 000000000..6428e9c07 --- /dev/null +++ b/externals/vcpkg/ports/libsass/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sass/libsass + REF 3.6.5 + SHA512 98CC7E12FDF74CD9E92D8D4A62B821956D3AD186FCEE9A8D77B677A621342AA161B73D9ADAD4C1849678A3BAC890443120CC8FEBE1B7429AAB374321D635B8F7 + HEAD_REF master + PATCHES remove_compiler_flags.patch +) + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) +vcpkg_install_make(MAKEFILE GNUmakefile) +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libsass/remove_compiler_flags.patch b/externals/vcpkg/ports/libsass/remove_compiler_flags.patch new file mode 100755 index 000000000..8a697ee4b --- /dev/null +++ b/externals/vcpkg/ports/libsass/remove_compiler_flags.patch @@ -0,0 +1,24 @@ +diff --git a/GNUmakefile.am b/GNUmakefile.am +index 06a1d0c1e..6e7a15485 100644 +--- a/GNUmakefile.am ++++ b/GNUmakefile.am +@@ -1,6 +1,6 @@ + ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 -I script + +-AM_COPT = -Wall -O2 ++AM_COPT = + AM_COVLDFLAGS = + + if ENABLE_COVERAGE +diff --git a/src/GNUmakefile.am b/src/GNUmakefile.am +index 9b0e6a99b..00404a017 100644 +--- a/src/GNUmakefile.am ++++ b/src/GNUmakefile.am +@@ -1,6 +1,6 @@ + ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 -I script + +-AM_COPT = -Wall -O2 ++AM_COPT = + AM_COVLDFLAGS = + + if ENABLE_COVERAGE diff --git a/externals/vcpkg/ports/libsass/vcpkg.json b/externals/vcpkg/ports/libsass/vcpkg.json new file mode 100755 index 000000000..3d2fa450c --- /dev/null +++ b/externals/vcpkg/ports/libsass/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libsass", + "version": "3.6.5", + "port-version": 1, + "description": "LibSass - Sass compiler written in C++", + "homepage": "https://github.com/sass/libsass", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/libsbml/portfile.cmake b/externals/vcpkg/ports/libsbml/portfile.cmake new file mode 100755 index 000000000..e4961abb2 --- /dev/null +++ b/externals/vcpkg/ports/libsbml/portfile.cmake @@ -0,0 +1,88 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sbmlteam/libsbml + REF 118ffbf11f1a5245cc544c1eac71019d979ecb20 #libSBML-5.19.0 + SHA512 7fe8b4d594876c6408e01c646187cb1587d0b4e12707a43286150d4e4646841e547bde971de917de1cdfbbb9365172aeac43c8e02f7d354400f9166f0f1c2c3d + HEAD_REF development +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_RUNTIME) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC_LIBRARY) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + comp ENABLE_COMP + fbc ENABLE_FBC + groups ENABLE_GROUPS + layout ENABLE_LAYOUT + multi ENABLE_MULTI + qual ENABLE_QUAL + render ENABLE_RENDER + render ENABLE_LAYOUT + bzip2 WITH_BZIP2 + zlib WITH_ZLIB + test WITH_CHECK + namespace WITH_CPP_NAMESPACE +) + +# Handle conflict features +set(WITH_EXPAT OFF) +if ("expat" IN_LIST FEATURES) + set(WITH_EXPAT ON) +endif() + +set(WITH_LIBXML OFF) +if ("libxml2" IN_LIST FEATURES) + set(WITH_LIBXML ON) +endif() + +if (WITH_EXPAT AND WITH_LIBXML) + message("Feature expat conflict with feature libxml2, currently using libxml2...") + set(WITH_EXPAT OFF) +endif() + +if ("test" IN_LIST FEATURES AND WIN32) + message(FATAL_ERROR "Feature test only support UNIX.") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} + -DWITH_EXPAT=${WITH_EXPAT} + -DWITH_LIBXML=${WITH_LIBXML} + -DENABLE_L3V2EXTENDEDMATH:BOOL=ON + -DWITH_STATIC_RUNTIME=${STATIC_RUNTIME} + -DLIBSBML_SKIP_SHARED_LIBRARY=${STATIC_LIBRARY} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(GLOB TXT_FILES "${CURRENT_PACKAGES_DIR}/debug/*.txt") +if (TXT_FILES) + file(REMOVE ${TXT_FILES}) +endif() +file(GLOB TXT_FILES "${CURRENT_PACKAGES_DIR}/*.txt") +if (TXT_FILES) + file(REMOVE ${TXT_FILES}) +endif() + +if (EXISTS "${CURRENT_PACKAGES_DIR}/debug/share") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +endif() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/README.md") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/README.md") +endif() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/README.md") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/README.md") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/libsbml/vcpkg.json b/externals/vcpkg/ports/libsbml/vcpkg.json new file mode 100755 index 000000000..4d6373023 --- /dev/null +++ b/externals/vcpkg/ports/libsbml/vcpkg.json @@ -0,0 +1,82 @@ +{ + "name": "libsbml", + "version": "5.19.0", + "port-version": 2, + "description": "A library for reading / writing SBML files", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "comp", + "expat", + "fbc", + "groups", + "layout", + "libxml2", + "render" + ], + "features": { + "bzip2": { + "description": "bz2 compression support for libsbml", + "dependencies": [ + "bzip2" + ] + }, + "comp": { + "description": "support for Hierarchical Model Composition" + }, + "expat": { + "description": "libsbml using expat parser", + "dependencies": [ + "expat" + ] + }, + "fbc": { + "description": "support for Flux Balance Constrant Modeling" + }, + "groups": { + "description": "support for Groups" + }, + "layout": { + "description": "support for Pathway Layouts" + }, + "libxml2": { + "description": "libsbml using libxml2 parser", + "dependencies": [ + "libxml2" + ] + }, + "multi": { + "description": "support for Multistate Modeling" + }, + "namespace": { + "description": "Build with the WITH_CPP_NAMESPACE option set to on" + }, + "qual": { + "description": "support for Qualitative Modeling" + }, + "render": { + "description": "support for Rendering information" + }, + "test": { + "description": "Unit testing of libSBMLs implementation", + "dependencies": [ + "check" + ] + }, + "zlib": { + "description": "gzip compression support for libsbml", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/libsbsms/portfile.cmake b/externals/vcpkg/ports/libsbsms/portfile.cmake new file mode 100755 index 000000000..20dcda6f2 --- /dev/null +++ b/externals/vcpkg/ports/libsbsms/portfile.cmake @@ -0,0 +1,17 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO claytonotey/libsbsms + REF 2.3.0 + SHA512 e5b544c2bdbaa2169236987c7a043838c8d1761b25280c476d7a32656d482c6485cb33f579ea9d1ce586ec7b2913ed8fdcf1abe5c7cc8b9e4eef9ce87de54627 + HEAD_REF main +) + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/sbsms" PACKAGE_NAME sbsms) +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/externals/vcpkg/ports/libsbsms/vcpkg.json b/externals/vcpkg/ports/libsbsms/vcpkg.json new file mode 100755 index 000000000..360bef009 --- /dev/null +++ b/externals/vcpkg/ports/libsbsms/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "libsbsms", + "version-semver": "2.3.0", + "description": "libsbsms is a library for high quality time and pitch scale modification of digital audio. It uses octave subband sinusoidal modeling.", + "homepage": "https://github.com/claytonotey/libsbsms", + "license": "GPL-2.0-or-later", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libsecret/portfile.cmake b/externals/vcpkg/ports/libsecret/portfile.cmake new file mode 100755 index 000000000..900762ce3 --- /dev/null +++ b/externals/vcpkg/ports/libsecret/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_gitlab( + OUT_SOURCE_PATH SOURCE_PATH + GITLAB_URL https://gitlab.gnome.org + REPO GNOME/libsecret + REF 0.20.4 + SHA512 b7357329e531ace536ac3c46ef51d022de9308181af227d2ff45c1ff6fe781a29fa93fe02e78f28c84eca8881c2cb90c92c675bcf9fd21b3d326dd84c5692ed5 + HEAD_REF master +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dintrospection=false + -Dgtk_doc=false + -Dmanpage=false + -Dvapi=false + ADDITIONAL_NATIVE_BINARIES + gdbus-codegen='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gdbus-codegen' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' +) +vcpkg_install_meson() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +# There is no option to disable building secret-tool, so remove the executable. +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libsecret/vcpkg.json b/externals/vcpkg/ports/libsecret/vcpkg.json new file mode 100755 index 000000000..3c57811cc --- /dev/null +++ b/externals/vcpkg/ports/libsecret/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "libsecret", + "version": "0.20.4", + "port-version": 1, + "description": "libsecret is a GObject-based library for accessing the Secret Service API of the freedesktop.org project, a cross-desktop effort to access passwords, tokens and other types of secrets. libsecret provides a convenient wrapper for these methods so consumers do not have to call the low-level DBus methods.", + "homepage": "https://gitlab.gnome.org/GNOME/libsecret/", + "license": "LGPL-2.1-or-later", + "supports": "!(windows | uwp | osx)", + "dependencies": [ + "glib", + { + "name": "glib", + "host": true + }, + "libgcrypt", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libsercomm/portfile.cmake b/externals/vcpkg/ports/libsercomm/portfile.cmake new file mode 100755 index 000000000..937ad7c7b --- /dev/null +++ b/externals/vcpkg/ports/libsercomm/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ingeniamc/sercomm + REF 1.3.2 + SHA512 f1581f2dfa262ffb1b3aec5a1e6d32493c322c94541fbacc98efff23b3b42b14c9abdcfb063a78b7c54fb1f9d8dbf59d8064099601de2175af6c6d830708324c + HEAD_REF master +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + errdesc WITH_ERRDESC + devmon WITH_DEVMON +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +# Fix CMake files +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sercomm) + +vcpkg_fixup_pkgconfig() + +# Remove includes in debug +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# Copy pdb files +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/libsercomm/vcpkg.json b/externals/vcpkg/ports/libsercomm/vcpkg.json new file mode 100755 index 000000000..81202670d --- /dev/null +++ b/externals/vcpkg/ports/libsercomm/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "libsercomm", + "version": "1.3.2", + "description": "Multiplatform serial communications library", + "homepage": "https://github.com/ingeniamc/sercomm", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "devmon", + "errdesc" + ], + "features": { + "devmon": { + "description": "When enabled, device listing and monitoring will be supported" + }, + "errdesc": { + "description": "When enabled, error details description can be obtained" + } + } +} diff --git a/externals/vcpkg/ports/libsigcpp-3/portfile.cmake b/externals/vcpkg/ports/libsigcpp-3/portfile.cmake new file mode 100755 index 000000000..0015715fb --- /dev/null +++ b/externals/vcpkg/ports/libsigcpp-3/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/externals/vcpkg/ports/libsigcpp-3/vcpkg.json b/externals/vcpkg/ports/libsigcpp-3/vcpkg.json new file mode 100755 index 000000000..a52d20dc9 --- /dev/null +++ b/externals/vcpkg/ports/libsigcpp-3/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libsigcpp-3", + "version": "3.0.3", + "port-version": 1, + "description": "Typesafe callback framework for C++", + "homepage": "https://libsigcplusplus.github.io/libsigcplusplus/", + "dependencies": [ + "libsigcpp" + ] +} diff --git a/externals/vcpkg/ports/libsigcpp/disable_tests_enable_static_build.patch b/externals/vcpkg/ports/libsigcpp/disable_tests_enable_static_build.patch new file mode 100755 index 000000000..017a0ac1b --- /dev/null +++ b/externals/vcpkg/ports/libsigcpp/disable_tests_enable_static_build.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e1b28fe..b9a9d40 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -84,13 +84,13 @@ install (FILES + DESTINATION + "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") + +-enable_testing() ++#enable_testing() + + + + add_subdirectory (sigc++) +-add_subdirectory (examples) +-add_subdirectory (tests) ++#add_subdirectory (examples) ++#add_subdirectory (tests) + + + set (PROJECT_CMAKE_NAME "${PROJECT_NAME}-3") +diff --git a/sigc++/CMakeLists.txt b/sigc++/CMakeLists.txt +index fa5a91a..86f1be7 100644 +--- a/sigc++/CMakeLists.txt ++++ b/sigc++/CMakeLists.txt +@@ -23,7 +23,7 @@ set (SOURCE_FILES + + set (SIGCPP_LIB_NAME sigc-${SIGCXX_API_VERSION}) + +-add_library(${SIGCPP_LIB_NAME} SHARED ${SOURCE_FILES}) ++add_library(${SIGCPP_LIB_NAME} ${SOURCE_FILES}) + + set_property (TARGET ${SIGCPP_LIB_NAME} PROPERTY VERSION ${PACKAGE_VERSION}) + set_property(TARGET ${SIGCPP_LIB_NAME} PROPERTY SOVERSION ${LIBSIGCPP_SOVERSION}) diff --git a/externals/vcpkg/ports/libsigcpp/fix-shared-windows-build.patch b/externals/vcpkg/ports/libsigcpp/fix-shared-windows-build.patch new file mode 100755 index 000000000..83cd2b9dc --- /dev/null +++ b/externals/vcpkg/ports/libsigcpp/fix-shared-windows-build.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e1b28fe..73990c4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -53,6 +53,13 @@ set (PROJECT_SOURCE_DIR "${sigc++_SOURCE_DIR}/sigc++") + include_directories (${sigc++_SOURCE_DIR}) + include_directories (${sigc++_BINARY_DIR}) + ++if (BUILD_SHARED_LIBS) ++ add_compile_options (-DBUILD_SHARED) ++ if (MSVC) ++ add_compile_options (-D_WINDLL) ++ endif() ++endif() ++ + configure_file (sigc++config.h.cmake sigc++config.h) + + set (prefix ${CMAKE_INSTALL_PREFIX}) +diff --git a/sigc++config.h.cmake b/sigc++config.h.cmake +index 74d348a..43a99c5 100644 +--- a/sigc++config.h.cmake ++++ b/sigc++config.h.cmake +@@ -16,7 +16,9 @@ + # if defined(_MSC_VER) + # define SIGC_MSC 1 + # define SIGC_WIN32 1 ++# ifdef BUILD_SHARED + # define SIGC_DLL 1 ++# endif + # elif defined(__CYGWIN__) + # define SIGC_CONFIGURE 1 + # elif defined(__MINGW32__) diff --git a/externals/vcpkg/ports/libsigcpp/portfile.cmake b/externals/vcpkg/ports/libsigcpp/portfile.cmake new file mode 100755 index 000000000..b060ebe20 --- /dev/null +++ b/externals/vcpkg/ports/libsigcpp/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libsigcplusplus/libsigcplusplus + REF 3.2.0 + SHA512 95ab0acfc2c5a151335e73bdc9b0e058af67d9706d0697bfd938e38c51e853fdb29d7a26484f192abe150640c60d5e30075a23deaa043a8deed70616bc9f508a + HEAD_REF master + PATCHES + disable_tests_enable_static_build.patch + fix-shared-windows-build.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(PACKAGE_NAME sigc++-3 CONFIG_PATH lib/cmake/sigc++-3) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/sigc++-3.0/include/sigc++config.h" "ifdef BUILD_SHARED" "if 1") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libsigcpp/vcpkg.json b/externals/vcpkg/ports/libsigcpp/vcpkg.json new file mode 100755 index 000000000..31ec34fbe --- /dev/null +++ b/externals/vcpkg/ports/libsigcpp/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "libsigcpp", + "version": "3.2.0", + "description": "Typesafe callback framework for C++", + "homepage": "https://libsigcplusplus.github.io/libsigcplusplus/", + "license": "LGPL-3.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libslirp/portfile.cmake b/externals/vcpkg/ports/libslirp/portfile.cmake new file mode 100755 index 000000000..0bd6e252c --- /dev/null +++ b/externals/vcpkg/ports/libslirp/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/ + OUT_SOURCE_PATH SOURCE_PATH + REPO slirp/libslirp + REF v4.7.0 + SHA512 387f4a6dad240ce633df2640bb49c6cb0041c8b3afc8d0ef38186d385f00dd9e4ef4443e93e1b71dbf05e22892b6f2771a87a202e815d8ec899ab5c147a1f09f + HEAD_REF master +) + +if(VCPKG_HOST_IS_WINDOWS) + vcpkg_acquire_msys(MSYS_ROOT) + vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") +endif() + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${OPTIONS} +) + +vcpkg_install_meson(ADD_BIN_TO_PATH) + +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libslirp" RENAME copyright) diff --git a/externals/vcpkg/ports/libslirp/vcpkg.json b/externals/vcpkg/ports/libslirp/vcpkg.json new file mode 100755 index 000000000..032e5cc5d --- /dev/null +++ b/externals/vcpkg/ports/libslirp/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "libslirp", + "version-semver": "4.7.0", + "description": "libslirp is a user-mode networking library used by virtual machines, containers or various tools.", + "homepage": "https://gitlab.freedesktop.org/slirp/libslirp", + "license": "BSD-3-Clause", + "supports": "!windows | mingw", + "dependencies": [ + "glib", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libsmb2/portfile.cmake b/externals/vcpkg/ports/libsmb2/portfile.cmake new file mode 100755 index 000000000..bce687a71 --- /dev/null +++ b/externals/vcpkg/ports/libsmb2/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sahlberg/libsmb2 + REF d8c85a3119a0bd769590e448216130b368cd1099 + SHA512 d15a040ed6314ad6f7984cfa7b52d9ede9934b2a7ec9827e833f574c25c9f694b5372b3e0950e258a6244b7aaf32b9e59987a75a88681d8031d9837ba94629d5 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +#the debug/share folder is generated empty by the provided cmake system +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libsmb2/vcpkg.json b/externals/vcpkg/ports/libsmb2/vcpkg.json new file mode 100755 index 000000000..8bed89ce6 --- /dev/null +++ b/externals/vcpkg/ports/libsmb2/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "libsmb2", + "version-date": "2021-04-29", + "port-version": 1, + "description": "SMB2/3 Userspace Client", + "homepage": "https://github.com/sahlberg/libsmb2", + "supports": "!osx", + "dependencies": [ + "openssl", + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libsndfile/fix-mp3lame.patch b/externals/vcpkg/ports/libsndfile/fix-mp3lame.patch new file mode 100755 index 000000000..9b7d2162e --- /dev/null +++ b/externals/vcpkg/ports/libsndfile/fix-mp3lame.patch @@ -0,0 +1,73 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b1b49e9..ae8ebec 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -174,7 +174,7 @@ set_package_properties (FLAC PROPERTIES + DESCRIPTION "Free Lossless Audio Codec Library" + PURPOSE "Enables FLAC support" + ) +-set_package_properties (Lame PROPERTIES ++set_package_properties (mp3lame PROPERTIES + TYPE RECOMMENDED + URL "https://lame.sourceforge.io/" + DESCRIPTION "High quality MPEG Audio Layer III (MP3) encoder" +@@ -237,20 +237,7 @@ if (INSTALL_PKGCONFIG_MODULE) + endif () + if (ENABLE_MPEG) + set (EXTERNAL_MPEG_REQUIRE "libmpg123") +- get_filename_component(LAME_WE ${LAME_LIBRARY} NAME_WE) +- if (LAME_HIP_LIBRARY) +- get_filename_component(LAME_HIP_WE ${LAME_HIP_LIBRARY} NAME_WE) +- endif () +- if (CMAKE_IMPORT_LIBRARY_PREFIX) +- string (REGEX REPLACE "^${CMAKE_IMPORT_LIBRARY_PREFIX}" "" LAME_WE_NO_PREFIX ${LAME_WE}) +- if (LAME_HIP_LIBRARY) +- string (REGEX REPLACE "^${CMAKE_IMPORT_LIBRARY_PREFIX}" "" LAME_HIP_WE_NO_PREFIX ${LAME_HIP_WE}) +- endif () +- endif () +- set (EXTERNAL_MPEG_LIBS "-l${LAME_WE_NO_PREFIX}") +- if (LAME_HIP_LIBRARY) +- set (EXTERNAL_MPEG_LIBS "${MPEG_LIBS} -l${LAME_HIP_WE}") +- endif () ++ set (EXTERNAL_MPEG_LIBS "-lmp3lame") + endif () + + configure_file (sndfile.pc.in sndfile.pc @ONLY) +@@ -411,7 +398,7 @@ target_link_libraries (sndfile + $<$,$,$>:Speex::Speex> + $<$:Opus::opus> + $<$:MPG123::libmpg123> +- $<$:Lame::Lame> ++ $<$:mp3lame::mp3lame> + ) + set_target_properties (sndfile PROPERTIES + PUBLIC_HEADER "${sndfile_HDRS}" +diff --git a/cmake/SndFileChecks.cmake b/cmake/SndFileChecks.cmake +index f5d5994..2e09ba6 100644 +--- a/cmake/SndFileChecks.cmake ++++ b/cmake/SndFileChecks.cmake +@@ -56,9 +56,9 @@ else () + set (HAVE_EXTERNAL_XIPH_LIBS 0) + endif () + +-find_package (Lame) ++find_package (mp3lame) + find_package (Mpg123 1.25.10) +-if (LAME_FOUND AND (TARGET MPG123::libmpg123)) ++if (TARGET mp3lame::mp3lame AND (TARGET MPG123::libmpg123)) + set (HAVE_MPEG_LIBS 1) + else () + set (HAVE_MPEG_LIBS 0) +diff --git a/cmake/SndFileConfig.cmake.in b/cmake/SndFileConfig.cmake.in +index 1d5463a..0c98e7e 100644 +--- a/cmake/SndFileConfig.cmake.in ++++ b/cmake/SndFileConfig.cmake.in +@@ -18,7 +18,7 @@ if (SndFile_WITH_EXTERNAL_LIBS AND NOT @BUILD_SHARED_LIBS@) + endif () + + if (SndFile_WITH_MPEG AND NOT @BUILD_SHARED_LIBS@) +- find_dependency (Lame) ++ find_dependency (mp3lame) + find_dependency (MPG123) + endif () + diff --git a/externals/vcpkg/ports/libsndfile/fix-uwp.patch b/externals/vcpkg/ports/libsndfile/fix-uwp.patch new file mode 100755 index 000000000..92f0a3037 --- /dev/null +++ b/externals/vcpkg/ports/libsndfile/fix-uwp.patch @@ -0,0 +1,14 @@ +diff --git a/src/file_io.c b/src/file_io.c +index 334ba2a..90c9608 100644 +--- a/src/file_io.c ++++ b/src/file_io.c +@@ -827,9 +827,6 @@ psf_open_handle (PSF_FILE * pfile) + } ; + + #if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) +- if (!pfile->use_wchar) +- return INVALID_HANDLE_VALUE ; +- + CREATEFILE2_EXTENDED_PARAMETERS cfParams = { 0 } ; + cfParams.dwSize = sizeof (CREATEFILE2_EXTENDED_PARAMETERS) ; + cfParams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL ; diff --git a/externals/vcpkg/ports/libsndfile/portfile.cmake b/externals/vcpkg/ports/libsndfile/portfile.cmake new file mode 100755 index 000000000..7c31e3468 --- /dev/null +++ b/externals/vcpkg/ports/libsndfile/portfile.cmake @@ -0,0 +1,58 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libsndfile/libsndfile + REF 1.1.0 + SHA512 5e530c33165a2d2be1c22d3a4bd96f0f1817dded3a45d24bad0e3f2c7908ccc1f19327a91d5040c3ea4d591845876019180747a125bf2a6f8bd49a6f67eadacd + HEAD_REF master + PATCHES + fix-mp3lame.patch + fix-uwp.patch +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + vcpkg_find_acquire_program(PYTHON3) +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + external-libs ENABLE_EXTERNAL_LIBS + mpeg ENABLE_MPEG + regtest BUILD_REGTEST +) + +if(VCPKG_TARGET_IS_UWP) + set(VCPKG_C_FLAGS "/sdl- ${VCPKG_C_FLAGS}") + set(VCPKG_CXX_FLAGS "/sdl- ${VCPKG_CXX_FLAGS}") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTING=OFF + -DENABLE_BOW_DOCS=OFF + -DBUILD_PROGRAMS=OFF + -DBUILD_REGTEST=OFF + -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON + -DPYTHON_EXECUTABLE=${PYTHON3} + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +if(WIN32 AND (NOT MINGW) AND (NOT CYGWIN)) + set(CONFIG_PATH cmake) +else() + set(CONFIG_PATH lib/cmake/SndFile) +endif() + +vcpkg_cmake_config_fixup(PACKAGE_NAME SndFile CONFIG_PATH ${CONFIG_PATH}) +vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libsndfile/vcpkg.json b/externals/vcpkg/ports/libsndfile/vcpkg.json new file mode 100755 index 000000000..20c29ae2a --- /dev/null +++ b/externals/vcpkg/ports/libsndfile/vcpkg.json @@ -0,0 +1,50 @@ +{ + "name": "libsndfile", + "version-semver": "1.1.0", + "description": "A library for reading and writing audio files", + "homepage": "https://github.com/erikd/libsndfile", + "license": "LGPL-2.1", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "external-libs", + "mpeg" + ], + "features": { + "experimental": { + "description": "Enable experimental code", + "dependencies": [ + "speex" + ] + }, + "external-libs": { + "description": "Enable FLAC, Vorbis, and Opus codecs", + "dependencies": [ + "libflac", + "libvorbis", + "opus" + ] + }, + "mpeg": { + "description": "Enable MPEG codecs", + "dependencies": [ + "mp3lame", + "mpg123" + ] + }, + "regtest": { + "description": "Build regtest", + "dependencies": [ + "sqlite3" + ] + } + } +} diff --git a/externals/vcpkg/ports/libsnoretoast/include_fix.patch b/externals/vcpkg/ports/libsnoretoast/include_fix.patch new file mode 100755 index 000000000..e18860368 --- /dev/null +++ b/externals/vcpkg/ports/libsnoretoast/include_fix.patch @@ -0,0 +1,28 @@ +From 7564823f8f0bc4d647bf3470ab7a2d8612418f32 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= +Date: Fri, 17 Sep 2021 12:30:41 +0000 +Subject: [PATCH] Use relative INTERFACE_INCLUDE location + +Using ${CMAKE_INSTALL_PREFIX} hardcodes the installation location, +instead of having CMake +use ${_IMPORT_PREFIX} +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index eef57f7..6c35b71 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,7 +1,7 @@ + add_library(SnoreToastActions INTERFACE) + target_include_directories(SnoreToastActions INTERFACE + $ +- $ ++ $ + ) + add_library(SnoreToast::SnoreToastActions ALIAS SnoreToastActions) + +-- +GitLab + diff --git a/externals/vcpkg/ports/libsnoretoast/portfile.cmake b/externals/vcpkg/ports/libsnoretoast/portfile.cmake new file mode 100755 index 000000000..295eb96ea --- /dev/null +++ b/externals/vcpkg/ports/libsnoretoast/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/snoretoast + REF v0.8.0 + SHA512 233751b6cc3f8099c742e4412a3c9ba8707a2f3c69b57bab93dd83b028aa0c0656cade8de1ece563843ace576fd0d8e5f3a29c254a07ed939d0a69cd2d4f6c2a + HEAD_REF master + PATCHES + include_fix.patch # https://invent.kde.org/libraries/snoretoast/-/merge_requests/1 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_STATIC_RUNTIME=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME LibSnoreToast CONFIG_PATH "lib/cmake/libsnoretoast") +vcpkg_copy_tools( + TOOL_NAMES "snoretoast" + AUTO_CLEAN +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/etc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${SOURCE_PATH}/COPYING.LGPL-3" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libsnoretoast/vcpkg.json b/externals/vcpkg/ports/libsnoretoast/vcpkg.json new file mode 100755 index 000000000..d9263bbd8 --- /dev/null +++ b/externals/vcpkg/ports/libsnoretoast/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libsnoretoast", + "version": "0.8.0", + "port-version": 2, + "description": "A tool to create Windows Toast notifications and parse them on Windows 8 or later.", + "homepage": "https://invent.kde.org/libraries/snoretoast", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libsodium/CMakeLists.txt b/externals/vcpkg/ports/libsodium/CMakeLists.txt new file mode 100755 index 000000000..bedd2e507 --- /dev/null +++ b/externals/vcpkg/ports/libsodium/CMakeLists.txt @@ -0,0 +1,1152 @@ +cmake_minimum_required(VERSION 3.9) + +include(CheckCSourceRuns) + +file(STRINGS ${CMAKE_CURRENT_LIST_DIR}/configure.ac config_ac_contents) + +foreach (line ${config_ac_contents}) + if (line MATCHES "AC_INIT\\(\\[libsodium\\],\\[([0-9.]+)\\],") + set(VERSION ${CMAKE_MATCH_1}) + elseif (line MATCHES "SODIUM_LIBRARY_VERSION_(MAJOR|MINOR)=([0-9]+)") + set(SODIUM_LIBRARY_VERSION_${CMAKE_MATCH_1} ${CMAKE_MATCH_2}) + endif () +endforeach () + +message("VERSION: ${VERSION}") +message("SODIUM_LIBRARY_VERSION_MAJOR: ${SODIUM_LIBRARY_VERSION_MAJOR}") +message("SODIUM_LIBRARY_VERSION_MINOR: ${SODIUM_LIBRARY_VERSION_MINOR}") + +project(sodium VERSION ${VERSION} LANGUAGES C ASM) + +include(CheckCSourceCompiles) +include(CheckFunctionExists) +include(CheckIncludeFile) +include(CMakePackageConfigHelpers) +include(CTest) +include(GNUInstallDirs) +include(TestBigEndian) + +set(CMAKE_C_STANDARD 99) +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +set(CMAKE_DISABLE_SOURCE_CHANGES ON) +set(CMAKE_DISABLE_IN_SOURCE_BUILD ON) + +option(BUILD_SHARED_LIBS "Build shared library" ${BUILD_SHARED_LIBS}) +option(ENABLE_SSP "Compile with -fstack-protector" ON) +option(ENABLE_PIE "Compile with -fPIE" ON) +option(ENABLE_BLOCKING_RANDOM "Enable blocking random" OFF) +option(ENABLE_MINIMAL "Only compile the minimum set of functions required for the high-level API" OFF) +option(ENABLE_PTHREADS "Use pthreads library" ON) +option(ENABLE_RETPOLINE "Use return trampolines for indirect calls" OFF) +option(ENABLE_NATIVE_OPTIMIZATIONS "Optimize for the native CPU - The resulting library will be faster but not portable" OFF) + +if (ENABLE_MINIMAL) + set(SODIUM_LIBRARY_MINIMAL_DEF "#define SODIUM_LIBRARY_MINIMAL 1") +endif () + +configure_file( + src/libsodium/include/sodium/version.h.in + ${CMAKE_BINARY_DIR}/sodium/version.h +) + +add_library(${PROJECT_NAME}) + +set_target_properties(${PROJECT_NAME} + PROPERTIES + PREFIX "" + OUTPUT_NAME "lib${PROJECT_NAME}" +) + +if (MSVC) + + target_include_directories(${PROJECT_NAME} + PRIVATE + $ + $ + ) + + enable_language(RC) + + # see libsodium.vcxproj for reference + # - omitted "" in favour of "${CMAKE_BINARY_DIR}/sodium/version.h" + file(GLOB_RECURSE sodium_headers + ${CMAKE_BINARY_DIR}/sodium/version.h + ${PROJECT_SOURCE_DIR}/builds/msvc/resource.h + ${PROJECT_SOURCE_DIR}/src/libsodium/*.h + ) + + file(GLOB_RECURSE sodium_sources + ${PROJECT_SOURCE_DIR}/builds/msvc/resource.rc + ${PROJECT_SOURCE_DIR}/src/libsodium/*.c + ) + + target_sources(${PROJECT_NAME} + PRIVATE + ${sodium_headers} + ${sodium_sources} + ) + + target_compile_options(${PROJECT_NAME} + PRIVATE + /D_CONSOLE + /D_CRT_SECURE_NO_WARNINGS + /DCPU_UNALIGNED_ACCESS=1 + /MP + /Dinline=__inline + /wd4068 # Unknown pragma + /wd4197 + /wd4244 # Macro redefinition + ) + + target_link_libraries(${PROJECT_NAME} + PUBLIC + advapi32 + ) + +else () + + # use interface libs to track common flags and definitions across all targets + add_library(${PROJECT_NAME}_config_private INTERFACE) + add_library(${PROJECT_NAME}_config_public INTERFACE) + + # use interface libs to track special flags only required for certain objects + add_library(${PROJECT_NAME}_aesni_config INTERFACE) + add_library(${PROJECT_NAME}_avx_config INTERFACE) + add_library(${PROJECT_NAME}_avx2_config INTERFACE) + add_library(${PROJECT_NAME}_avx512f_config INTERFACE) + add_library(${PROJECT_NAME}_mmx_config INTERFACE) + add_library(${PROJECT_NAME}_pclmul_config INTERFACE) + add_library(${PROJECT_NAME}_rdrand_config INTERFACE) + add_library(${PROJECT_NAME}_sse2_config INTERFACE) + add_library(${PROJECT_NAME}_sse3_config INTERFACE) + add_library(${PROJECT_NAME}_sse41_config INTERFACE) + add_library(${PROJECT_NAME}_ssse3_config INTERFACE) + + target_include_directories(${PROJECT_NAME}_config_private + INTERFACE + $ + $ + ) + + target_compile_options(${PROJECT_NAME}_config_private + INTERFACE + -flax-vector-conversions + -fvisibility=hidden + -fwrapv + -Wall + -Wextra + -Wbad-function-cast + -Wcast-qual + #-Wdiv-by-zero + #-Wduplicated-branches + #-Wduplicated-cond + -Wfloat-equal + -Wformat=2 + -Wlogical-op + -Wmaybe-uninitialized + #-Wmisleading-indentation + -Wmissing-declarations + -Wmissing-prototypes + -Wnested-externs + #-Wno-type-limits + #-Wno-unknown-pragmas + -Wnormalized=id + #-Wnull-dereference + -Wold-style-declaration + -Wpointer-arith + -Wredundant-decls + #-Wrestrict + #-Wsometimes-uninitialized + -Wstrict-prototypes + -Wswitch-enum + #-Wvariable-decl + -Wwrite-strings + ) + + if (NOT MINGW) + target_compile_options(${PROJECT_NAME}_config_private + INTERFACE + -fPIC + -Wl,-z,relro + -Wl,-z,now + -Wl,-z,noexecstack + ) + endif() + + if (MINGW) + target_compile_options(${PROJECT_NAME}_config_private + INTERFACE + -fno-asynchronous-unwind-tables + ) + target_link_options(${PROJECT_NAME}_config_private + INTERFACE + -Wl,--dynamicbase + -Wl,--high-entropy-va + -Wl,--nxcompat + ) + endif() + + if (CMAKE_C_COMPILER_ID STREQUAL "Clang" OR + CMAKE_C_COMPILER_ID STREQUAL "AppleClang") + target_compile_options(${PROJECT_NAME}_config_private + INTERFACE + -Wno-unknown-warning-option + -Wshorten-64-to-32 + ) + endif () + + # see configure.ac for reference + if (ENABLE_BLOCKING_RANDOM) + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE USE_BLOCKING_RANDOM) + endif () + + if (ENABLE_PTHREADS) + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_PTHREAD) + target_compile_options(${PROJECT_NAME}_config_private INTERFACE -ftls-model=local-dynamic) + target_compile_options(${PROJECT_NAME}_config_public INTERFACE -pthread) + endif () + + if (ENABLE_SSP AND NOT MINGW) + target_compile_options(${PROJECT_NAME}_config_private INTERFACE -fstack-protector-all) + endif () + + if (ENABLE_PIE AND NOT MINGW) + target_compile_options(${PROJECT_NAME}_config_private INTERFACE -fPIE) + endif () + + if (ENABLE_RETPOLINE) + target_compile_options(${PROJECT_NAME}_config_private + INTERFACE + -mindirect-branch=thunk-inline + -mindirect-branch-register + ) + endif () + + if (ENABLE_NATIVE_OPTIMIZATIONS) + target_compile_options(${PROJECT_NAME}_config_private + INTERFACE + -ftree-vectorize + -ftree-slp-vectorize + -fomit-frame-pointer + -march=native + ) + endif () + + check_include_file(sys/mman.h HAVE_SYS_MMAN_H) + if (HAVE_SYS_MMAN_H) + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_SYS_MMAN_H) + endif () + + macro (sodium_check_func func var) + check_function_exists(${func} ${var}) + if (${var}) + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE ${var}=1) + endif () + endmacro () + + sodium_check_func(arc4random HAVE_SAFE_ARC4RANDOM) + sodium_check_func(mmap HAVE_MMAP) + sodium_check_func(mlock HAVE_MLOCK) + sodium_check_func(madvise HAVE_MADVISE) + sodium_check_func(mprotect HAVE_MPROTECT) + sodium_check_func(memset_s HAVE_MEMSET_S) + sodium_check_func(explicit_bzero HAVE_EXPLICIT_BZERO) + sodium_check_func(explicit_memset HAVE_EXPLICIT_MEMSET) + sodium_check_func(nanosleep HAVE_NANOSLEEP) + sodium_check_func(posix_memalign HAVE_POSIX_MEMALIGN) + sodium_check_func(getpid HAVE_GETPID) + + if (VCPKG_TARGET_ARCHITECTURE STREQUAL x64) + check_c_source_compiles( + " + #pragma GCC target(\"mmx\") + #include + int main(void) + { + __m64 x = _mm_setzero_si64(); + } + " + HAVE_MMINTRIN_H + ) + + if (HAVE_MMINTRIN_H) + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_MMINTRIN_H=1) + target_compile_options(${PROJECT_NAME}_mmx_config INTERFACE -mmmx) + endif () + + check_c_source_compiles( + " + #pragma GCC target(\"sse2\") + #ifndef __SSE2__ + # define __SSE2__ + #endif + + #include + int main(void) { + __m128d x = _mm_setzero_pd(); + __m128i z = _mm_srli_epi64(_mm_setzero_si128(), 26); + } + " + HAVE_EMMINTRIN_H + ) + + if (HAVE_EMMINTRIN_H) + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_EMMINTRIN_H=1) + target_compile_options(${PROJECT_NAME}_sse2_config INTERFACE -msse2) + endif () + + check_c_source_compiles( + " + #pragma GCC target(\"sse3\") + #include + int main(void) { + __m128 x = _mm_addsub_ps(_mm_cvtpd_ps(_mm_setzero_pd()), _mm_cvtpd_ps(_mm_setzero_pd())); + } + " + HAVE_PMMINTRIN_H + ) + + if (HAVE_PMMINTRIN_H) + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_PMMINTRIN_H=1) + target_compile_options(${PROJECT_NAME}_sse3_config INTERFACE -msse3) + endif () + + check_c_source_compiles( + " + #pragma GCC target(\"ssse3\") + #include + int main(void) { + __m64 x = _mm_abs_pi32(_m_from_int(0)); + } + " + HAVE_TMMINTRIN_H + ) + + if (HAVE_TMMINTRIN_H) + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_TMMINTRIN_H=1) + target_compile_options(${PROJECT_NAME}_ssse3_config INTERFACE -mssse3) + endif () + + check_c_source_compiles( + " + #pragma GCC target(\"sse4.1\") + #include + int main(void) { + __m128i x = _mm_minpos_epu16(_mm_setzero_si128()); + } + " + HAVE_SMMINTRIN_H + ) + + if (HAVE_SMMINTRIN_H) + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_SMMINTRIN_H=1) + target_compile_options(${PROJECT_NAME}_sse41_config INTERFACE -msse4.1) + endif () + + check_c_source_compiles( + " + #ifdef __native_client__ + # error NativeClient detected - Avoiding AVX opcodes + #endif + #pragma GCC target(\"avx\") + #include + int main(void) { + _mm256_zeroall(); + } + " + HAVE_AVXINTRIN_H + ) + + if (HAVE_AVXINTRIN_H) + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_AVXINTRIN_H=1) + target_compile_options(${PROJECT_NAME}_avx_config INTERFACE -mavx) + endif () + + check_c_source_compiles( + " + #ifdef __native_client__ + # error NativeClient detected - Avoiding AVX2 opcodes + #endif + #pragma GCC target(\"avx2\") + #include + int main(void) { + __m256 x = _mm256_set1_ps(3.14); + __m256 y = _mm256_permutevar8x32_ps(x, _mm256_set1_epi32(42)); + return _mm256_movemask_ps(_mm256_cmp_ps(x, y, _CMP_NEQ_OQ)); + } + " + HAVE_AVX2INTRIN_H + ) + + if (HAVE_AVX2INTRIN_H) + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_AVX2INTRIN_H=1) + target_compile_options(${PROJECT_NAME}_avx2_config INTERFACE -mavx2) + + check_c_source_compiles( + " + #ifdef __native_client__ + # error NativeClient detected - Avoiding AVX2 opcodes + #endif + #pragma GCC target(\"avx2\") + #include + int main(void) { + __m256i y = _mm256_broadcastsi128_si256(_mm_setzero_si128()); + } + " + _mm256_broadcastsi128_si256_DEFINED + ) + + if (NOT _mm256_broadcastsi128_si256_DEFINED) + target_compile_definitions(${PROJECT_NAME}_config_private + INTERFACE + _mm256_broadcastsi128_si256=_mm_broadcastsi128_si256 + ) + endif () + endif () + + check_c_source_compiles( + " + #ifdef __native_client__ + # error NativeClient detected - Avoiding AVX512F opcodes + #endif + #pragma GCC target(\"avx512f\") + #include + + #ifndef __AVX512F__ + # error No AVX512 support + #elif defined(__clang__) + # if __clang_major__ < 4 + # error Compiler AVX512 support may be broken + # endif + #elif defined(__GNUC__) + # if __GNUC__ < 6 + # error Compiler AVX512 support may be broken + # endif + #endif + + int main(void) { + __m512i x = _mm512_setzero_epi32(); + __m512i y = _mm512_permutexvar_epi64(_mm512_setr_epi64(0, 1, 4, 5, 2, 3, 6, 7), x); + } + " + HAVE_AVX512FINTRIN_H + ) + + if (HAVE_AVX512FINTRIN_H) + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_AVX512FINTRIN_H=1) + target_compile_options(${PROJECT_NAME}_avx512f_config INTERFACE -mavx512f) + endif () + + check_c_source_compiles( + " + #ifdef __native_client__ + # error NativeClient detected - Avoiding AESNI opcodes + #endif + #pragma GCC target(\"aes\") + #pragma GCC target(\"pclmul\") + #include + + int main(void) { + __m128i x = _mm_aesimc_si128(_mm_setzero_si128()); + __m128i y = _mm_clmulepi64_si128(_mm_setzero_si128(), _mm_setzero_si128(), 0); + } + " + HAVE_WMMINTRIN_H + ) + + if (HAVE_WMMINTRIN_H) + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_WMMINTRIN_H=1) + target_compile_options(${PROJECT_NAME}_aesni_config INTERFACE -maes) + target_compile_options(${PROJECT_NAME}_pclmul_config INTERFACE -mpclmul) + endif () + + check_c_source_compiles( + " + #ifdef __native_client__ + # error NativeClient detected - Avoiding RDRAND opcodes + #endif + #pragma GCC target(\"rdrnd\") + #include + + int main(void) { + unsigned long long x; + _rdrand64_step(&x); + } + " + HAVE_RDRAND + ) + + if (HAVE_RDRAND) + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_RDRAND=1) + target_compile_options(${PROJECT_NAME}_rdrand_config INTERFACE -mrdrnd) + endif () + + check_c_source_compiles( + " + #include + + int main(void) { + (void) _xgetbv(0); + } + " + HAVE__XGETBV + ) + + if (HAVE__XGETBV) + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE__XGETBV=1) + endif () + + check_c_source_compiles( + " + int main(void) { + int a = 42; + int *pnt = &a; + __asm__ __volatile__ (\"\" : : \"r\"(pnt) : \"memory\"); + } + " + HAVE_INLINE_ASM + ) + + if (HAVE_INLINE_ASM) + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_INLINE_ASM=1) + endif () + + check_c_source_compiles( + " + int main(void) { + #if defined(__amd64) || defined(__amd64__) || defined(__x86_64__) + # if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(_WIN32) || defined(_WIN64) + # error Windows x86_64 calling conventions are not supported yet + # endif + /* neat */ + #else + # error !x86_64 + #endif + unsigned char i = 0, o = 0, t; + __asm__ __volatile__ (\"pxor %%xmm12, %%xmm6 \n\" + \"movb (%[i]), %[t] \n\" + \"addb %[t], (%[o]) \n\" + : [t] \"=&r\"(t) + : [o] \"D\"(&o), [i] \"S\"(&i) + : \"memory\", \"flags\", \"cc\"); + } + " + HAVE_AMD64_ASM + ) + + if (HAVE_AMD64_ASM) + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_AMD64_ASM=1) + endif () + + check_c_source_compiles( + " + int main(void) { + #if defined(__amd64) || defined(__amd64__) || defined(__x86_64__) + # if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(_WIN32) || defined(_WIN64) + # error Windows x86_64 calling conventions are not supported yet + # endif + /* neat */ + #else + # error !x86_64 + #endif + __asm__ __volatile__ (\"vpunpcklqdq %xmm0,%xmm13,%xmm0\"); + } + " + HAVE_AVX_ASM + ) + + if (HAVE_AVX_ASM) + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_AVX_ASM=1) + endif () + + check_c_source_compiles( + " + #if !defined(__clang__) && !defined(__GNUC__) && !defined(__SIZEOF_INT128__) + # error mode(TI) is a gcc extension, and __int128 is not available + #endif + #if defined(__clang__) && !defined(__x86_64__) && !defined(__aarch64__) + # error clang does not properly handle the 128-bit type on 32-bit systems + #endif + #ifndef NATIVE_LITTLE_ENDIAN + # error libsodium currently expects a little endian CPU for the 128-bit type + #endif + #ifdef __EMSCRIPTEN__ + # error emscripten currently doesn't support some operations on integers larger than 64 bits + #endif + #include + #include + #if defined(__SIZEOF_INT128__) + typedef unsigned __int128 uint128_t; + #else + typedef unsigned uint128_t __attribute__((mode(TI))); + #endif + void fcontract(uint128_t *t) { + *t += 0x8000000000000 - 1; + *t *= *t; + *t >>= 84; + } + + int main(void) { + (void) fcontract; + } + " + HAVE_TI_MODE + ) + + if (HAVE_TI_MODE) + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_TI_MODE=1) + endif () + + check_c_source_compiles( + " + int main(void) { + unsigned int cpu_info[4]; + __asm__ __volatile__ (\"xchgl %%ebx, %k1; cpuid; xchgl %%ebx, %k1\" : + \"=a\" (cpu_info[0]), \"=&r\" (cpu_info[1]), + \"=c\" (cpu_info[2]), \"=d\" (cpu_info[3]) : + \"0\" (0U), \"2\" (0U)); + } + " + HAVE_CPUID + ) + + if (HAVE_CPUID) + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_CPUID=1) + endif () + endif () + + check_c_source_compiles( + " + #if !defined(__ELF__) && !defined(__APPLE_CC__) + # error Support for weak symbols may not be available + #endif + __attribute__((weak)) void __dummy(void *x) { } + void f(void *x) { __dummy(x); } + int main(void) {} + " + HAVE_WEAK_SYMBOLS + ) + + if (HAVE_WEAK_SYMBOLS) + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_WEAK_SYMBOLS=1) + endif () + + check_c_source_compiles( + " + int main(void) { + static volatile int _sodium_lock; + __sync_lock_test_and_set(&_sodium_lock, 1); + __sync_lock_release(&_sodium_lock); + } + " + HAVE_ATOMIC_OPS + ) + + if (HAVE_ATOMIC_OPS) + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE HAVE_ATOMIC_OPS=1) + endif () + + check_c_source_compiles( + " + #include + #include + int main(void) { + (void) SIZE_MAX; + (void) UINT64_MAX; + } + " + STDC_LIMIT_MACROS_REQUIRED + ) + + if (STDC_LIMIT_MACROS_REQUIRED) + target_compile_definitions(${PROJECT_NAME}_config_private + INTERFACE + __STDC_LIMIT_MACROS + __STDC_CONSTANT_MACROS + ) + endif () + + # include/sodium/private/common.h + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE CONFIGURED=1) + + test_big_endian(IS_BIG_ENDIAN) + + if (IS_BIG_ENDIAN) + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE NATIVE_BIG_ENDIAN) + else () + target_compile_definitions(${PROJECT_NAME}_config_private INTERFACE NATIVE_LITTLE_ENDIAN) + endif () + + # see src/libsodium/Makefile.am for reference + target_sources(${PROJECT_NAME} + PRIVATE + ${CMAKE_BINARY_DIR}/sodium/version.h + + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_auth/crypto_auth.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_auth/hmacsha256/auth_hmacsha256.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_auth/hmacsha512/auth_hmacsha512.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_auth/hmacsha512256/auth_hmacsha512256.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_box/crypto_box.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_box/crypto_box_easy.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_box/crypto_box_seal.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_box/curve25519xsalsa20poly1305/box_curve25519xsalsa20poly1305.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_core/hchacha20/core_hchacha20.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20_ref2.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_core/hsalsa20/core_hsalsa20.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_core/salsa/ref/core_salsa_ref.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_generichash/crypto_generichash.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_generichash/blake2b/generichash_blake2.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_generichash/blake2b/ref/blake2.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-ref.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_generichash/blake2b/ref/blake2b-load-sse2.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_generichash/blake2b/ref/blake2b-load-sse41.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_generichash/blake2b/ref/blake2b-load-avx2.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_generichash/blake2b/ref/blake2b-ref.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_generichash/blake2b/ref/generichash_blake2b.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_hash/crypto_hash.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_hash/sha256/hash_sha256.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_hash/sha256/cp/hash_sha256_cp.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_hash/sha512/hash_sha512.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_hash/sha512/cp/hash_sha512_cp.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_kdf/blake2b/kdf_blake2b.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_kdf/crypto_kdf.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_kx/crypto_kx.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_onetimeauth/crypto_onetimeauth.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna32.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna64.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/argon2/argon2-core.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/argon2/argon2-core.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/argon2/argon2-encoding.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/argon2/argon2-encoding.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ref.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/argon2/argon2.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/argon2/argon2.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/argon2/blake2b-long.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/argon2/blake2b-long.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/argon2/blamka-round-ref.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/argon2/pwhash_argon2i.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/argon2/pwhash_argon2id.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/crypto_pwhash.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/crypto_scalarmult.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_secretbox/crypto_secretbox.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_secretbox/crypto_secretbox_easy.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_secretbox/xsalsa20poly1305/secretbox_xsalsa20poly1305.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_secretstream/xchacha20poly1305/secretstream_xchacha20poly1305.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_shorthash/crypto_shorthash.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_shorthash/siphash24/shorthash_siphash24.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash24_ref.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash_ref.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_sign/crypto_sign.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_sign/ed25519/sign_ed25519.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_sign/ed25519/ref10/keypair.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_sign/ed25519/ref10/open.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_sign/ed25519/ref10/sign.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_sign/ed25519/ref10/sign_ed25519_ref10.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/chacha20/stream_chacha20.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/chacha20/stream_chacha20.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/chacha20/ref/chacha20_ref.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/chacha20/ref/chacha20_ref.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/crypto_stream.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa20/stream_salsa20.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa20/stream_salsa20.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/xsalsa20/stream_xsalsa20.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_verify/sodium/verify.c + ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/private/chacha20_ietf_ext.h + ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/private/common.h + ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/private/ed25519_ref10.h + ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/private/implementations.h + ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/private/mutex.h + ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/private/sse2_64_32.h + ${PROJECT_SOURCE_DIR}/src/libsodium/randombytes/randombytes.c + ${PROJECT_SOURCE_DIR}/src/libsodium/sodium/codecs.c + ${PROJECT_SOURCE_DIR}/src/libsodium/sodium/core.c + ${PROJECT_SOURCE_DIR}/src/libsodium/sodium/runtime.c + ${PROJECT_SOURCE_DIR}/src/libsodium/sodium/utils.c + ${PROJECT_SOURCE_DIR}/src/libsodium/sodium/version.c + ) + + if (HAVE_TI_MODE) + target_sources(${PROJECT_NAME} + PRIVATE + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_core/ed25519/ref10/fe_51/base.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_core/ed25519/ref10/fe_51/base2.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_core/ed25519/ref10/fe_51/constants.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_core/ed25519/ref10/fe_51/fe.h + ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/private/ed25519_ref10_fe_51.h + ) + else () + target_sources(${PROJECT_NAME} + PRIVATE + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_core/ed25519/ref10/fe_25_5/base.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_core/ed25519/ref10/fe_25_5/base2.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_core/ed25519/ref10/fe_25_5/constants.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_core/ed25519/ref10/fe_25_5/fe.h + ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/private/ed25519_ref10_fe_25_5.h + ) + endif () + + if (HAVE_AMD64_ASM) + target_sources(${PROJECT_NAME} + PRIVATE + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa20/xmm6/salsa20_xmm6-asm.S + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa20/xmm6/salsa20_xmm6.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa20/xmm6/salsa20_xmm6.h + ) + else () + target_sources(${PROJECT_NAME} + PRIVATE + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa20/ref/salsa20_ref.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa20/ref/salsa20_ref.h + ) + endif () + + target_sources(${PROJECT_NAME} + PRIVATE + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/consts.S + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_mul.S + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_nsquare.S + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_pack.S + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder.S + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder_base.S + ) + + if (HAVE_AVX_ASM) + target_sources(${PROJECT_NAME} + PRIVATE + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/consts_namespace.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/curve25519_sandy2x.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/curve25519_sandy2x.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_invert.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_namespace.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe_frombytes_sandy2x.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder_namespace.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/sandy2x.S + ) + endif () + + if (NOT ENABLE_MINIMAL) + target_sources(${PROJECT_NAME} + PRIVATE + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_box/curve25519xchacha20poly1305/box_curve25519xchacha20poly1305.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_box/curve25519xchacha20poly1305/box_seal_curve25519xchacha20poly1305.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_core/ed25519/core_ed25519.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_core/ed25519/core_ristretto255.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/scryptsalsa208sha256/scrypt_platform.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/ed25519/ref10/scalarmult_ed25519_ref10.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/ristretto255/ref10/scalarmult_ristretto255_ref10.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_secretbox/xchacha20poly1305/secretbox_xchacha20poly1305.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_shorthash/siphash24/shorthash_siphashx24.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphashx24_ref.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_sign/ed25519/ref10/obsolete.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa2012/ref/stream_salsa2012_ref.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa2012/stream_salsa2012.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa208/ref/stream_salsa208_ref.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa208/stream_salsa208.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/xchacha20/stream_xchacha20.c + ) + endif () + + add_library(${PROJECT_NAME}_rdrand + OBJECT + ${PROJECT_SOURCE_DIR}/src/libsodium/randombytes/internal/randombytes_internal_random.c + ${PROJECT_SOURCE_DIR}/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c + ) + + target_link_libraries(${PROJECT_NAME}_rdrand + PRIVATE + ${PROJECT_NAME}_rdrand_config + ${PROJECT_NAME}_config_public + ${PROJECT_NAME}_config_private + ) + + add_library(${PROJECT_NAME}_aesni + OBJECT + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c + ) + + target_link_libraries(${PROJECT_NAME}_aesni + PRIVATE + ${PROJECT_NAME}_config_public + ${PROJECT_NAME}_config_private + ${PROJECT_NAME}_sse2_config + ${PROJECT_NAME}_ssse3_config + ${PROJECT_NAME}_aesni_config + ${PROJECT_NAME}_pclmul_config + ) + + add_library(${PROJECT_NAME}_sse2 + OBJECT + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_onetimeauth/poly1305/sse2/poly1305_sse2.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_onetimeauth/poly1305/sse2/poly1305_sse2.h + ) + + if (NOT ENABLE_MINIMAL) + target_sources(${PROJECT_NAME}_sse2 + PRIVATE + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c + ) + endif () + + if (NOT HAVE_AMD64_ASM) + target_sources(${PROJECT_NAME}_sse2 + PRIVATE + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa20/xmm6int/salsa20_xmm6int-sse2.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa20/xmm6int/salsa20_xmm6int-sse2.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa20/xmm6int/u0.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa20/xmm6int/u1.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa20/xmm6int/u4.h + ) + endif () + + target_link_libraries(${PROJECT_NAME}_sse2 + PRIVATE + ${PROJECT_NAME}_config_public + ${PROJECT_NAME}_config_private + ${PROJECT_NAME}_sse2_config + ) + + add_library(${PROJECT_NAME}_ssse3 + OBJECT + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-ssse3.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-ssse3.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ssse3.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/argon2/blamka-round-ssse3.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/chacha20/dolbeau/chacha20_dolbeau-ssse3.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/chacha20/dolbeau/chacha20_dolbeau-ssse3.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/chacha20/dolbeau/u0.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/chacha20/dolbeau/u1.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/chacha20/dolbeau/u4.h + ) + + target_link_libraries(${PROJECT_NAME}_ssse3 + PRIVATE + ${PROJECT_NAME}_config_public + ${PROJECT_NAME}_config_private + ${PROJECT_NAME}_sse2_config + ${PROJECT_NAME}_ssse3_config + ) + + add_library(${PROJECT_NAME}_sse41 + OBJECT + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-sse41.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-sse41.h + ) + + target_link_libraries(${PROJECT_NAME}_sse41 + PRIVATE + ${PROJECT_NAME}_config_public + ${PROJECT_NAME}_config_private + ${PROJECT_NAME}_sse2_config + ${PROJECT_NAME}_ssse3_config + ${PROJECT_NAME}_sse41_config + ) + + add_library(${PROJECT_NAME}_avx2 + OBJECT + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-avx2.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-avx2.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-avx2.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/argon2/blamka-round-avx2.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/chacha20/dolbeau/chacha20_dolbeau-avx2.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/chacha20/dolbeau/chacha20_dolbeau-avx2.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/chacha20/dolbeau/u8.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa20/xmm6int/salsa20_xmm6int-avx2.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa20/xmm6int/salsa20_xmm6int-avx2.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa20/xmm6int/u0.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa20/xmm6int/u1.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa20/xmm6int/u4.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa20/xmm6int/u8.h + ) + + target_link_libraries(${PROJECT_NAME}_avx2 + PRIVATE + ${PROJECT_NAME}_config_public + ${PROJECT_NAME}_config_private + ${PROJECT_NAME}_sse2_config + ${PROJECT_NAME}_ssse3_config + ${PROJECT_NAME}_sse41_config + ${PROJECT_NAME}_avx_config + ${PROJECT_NAME}_avx2_config + ) + + add_library(${PROJECT_NAME}_avx512f + OBJECT + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-avx512f.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_pwhash/argon2/blamka-round-avx512f.h + ) + + target_link_libraries(${PROJECT_NAME}_avx512f + PRIVATE + ${PROJECT_NAME}_config_public + ${PROJECT_NAME}_config_private + ${PROJECT_NAME}_sse2_config + ${PROJECT_NAME}_ssse3_config + ${PROJECT_NAME}_sse41_config + ${PROJECT_NAME}_avx_config + ${PROJECT_NAME}_avx2_config + ${PROJECT_NAME}_avx512f_config + ) + + target_link_libraries(${PROJECT_NAME} + PRIVATE + "$" + "$" + "$" + "$" + "$" + "$" + "$" + "$" + PUBLIC + ${PROJECT_NAME}_config_public + ) + +endif () + +if (BUILD_SHARED_LIBS) + if (MSVC) + target_compile_definitions(${PROJECT_NAME} + PRIVATE + SODIUM_DLL_EXPORT + ) + endif () +else () + if (MSVC) + target_compile_definitions(${PROJECT_NAME} + PUBLIC + SODIUM_STATIC + ) + else () + target_compile_definitions(${PROJECT_NAME}_config_public + INTERFACE + SODIUM_STATIC + ) + endif( ) +endif () + +if (BUILD_TESTING) + enable_testing() + + file(GLOB sodium_test_sources ${PROJECT_SOURCE_DIR}/test/default/*.c) + + foreach (test_src ${sodium_test_sources}) + get_filename_component(test_name ${test_src} NAME_WE) + + add_executable(${test_name} ${test_src}) + + if (MSVC) + target_compile_definitions(${test_name} PRIVATE _CRT_SECURE_NO_WARNINGS) + endif () + + target_include_directories(${test_name} + PRIVATE + $ + $ + $ + $ + ) + + target_link_libraries(${test_name} PRIVATE ${PROJECT_NAME}) + + add_custom_command(TARGET ${test_name} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${CMAKE_CURRENT_LIST_DIR}/test/default/${test_name}.exp" + $) + + add_test( + NAME ${test_name} + COMMAND ${test_name} + WORKING_DIRECTORY $ + ) + endforeach () +endif () + +install(DIRECTORY src/libsodium/include/ + DESTINATION include/ + USE_SOURCE_PERMISSIONS + PATTERN "*.h" + PATTERN "*.h.in" EXCLUDE + REGEX "private($|/)" EXCLUDE +) + +install(FILES ${CMAKE_BINARY_DIR}/sodium/version.h + DESTINATION include/sodium +) + +if (MSVC) + install(TARGETS ${PROJECT_NAME} + EXPORT ${PROJECT_NAME}-targets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) +else () + install( + TARGETS + ${PROJECT_NAME} + ${PROJECT_NAME}_config_public + EXPORT ${PROJECT_NAME}-targets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) +endif () + +install(EXPORT ${PROJECT_NAME}-targets + FILE unofficial-${PROJECT_NAME}Targets.cmake + NAMESPACE unofficial-${PROJECT_NAME}:: + DESTINATION share/unofficial-${PROJECT_NAME} +) + +write_basic_package_version_file( + ${CMAKE_CURRENT_BINARY_DIR}/unofficial-${PROJECT_NAME}ConfigVersion.cmake + VERSION ${VERSION} + COMPATIBILITY AnyNewerVersion +) + +install( + FILES + ${CMAKE_CURRENT_BINARY_DIR}/unofficial-${PROJECT_NAME}ConfigVersion.cmake + DESTINATION share/unofficial-${PROJECT_NAME} +) + +# References: +# https://github.com/boost-cmake/bcm/wiki/Cmake-best-practices-and-guidelines +# https://github.com/jedisct1/libsodium/pull/74/files +# https://github.com/jedisct1/libsodium/pull/156/files +# https://github.com/jedisct1/libsodium/pull/181/files +# https://github.com/jedisct1/libsodium/issues/378 +# https://github.com/jedisct1/libsodium/issues/636 +# https://github.com/jedisct1/libsodium/issues/771 +# https://github.com/jedisct1/libsodium/blob/gyp/sodium.gyp +# https://github.com/imefisto/cmake-libsodium +# https://github.com/Cyberunner23/libsodium-CMake +# https://stackoverflow.com/questions/29901352/appending-to-cmake-c-flags +# https://stackoverflow.com/questions/986426/what-do-stdc-limit-macros-and-stdc-constant-macros-mean +# https://gcc.gnu.org/onlinedocs/gcc/Option-Summary.html +# https://stackoverflow.com/questions/15132185/mixing-c-and-assembly-sources-and-build-with-cmake +# https://stackoverflow.com/questions/647892/how-to-check-header-files-and-library-functions-in-cmake-like-it-is-done-in-auto +# https://stackoverflow.com/questions/31038963/how-do-you-rename-a-library-filename-in-cmake +# https://gitlab.kitware.com/cmake/cmake/-/issues/15415 diff --git a/externals/vcpkg/ports/libsodium/portfile.cmake b/externals/vcpkg/ports/libsodium/portfile.cmake new file mode 100755 index 000000000..6fd98241f --- /dev/null +++ b/externals/vcpkg/ports/libsodium/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jedisct1/libsodium + REF 1.0.18 + SHA512 727fe50a5fb1df86ec5d807770f408a52609cbeb8510b4f4183b2a35a537905719bdb6348afcb103ff00ce946a8094ac9559b6e3e5b2ccc2a2d0c08f75577eeb + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME unofficial-sodium +) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/Makefile.am") + +configure_file( + "${CMAKE_CURRENT_LIST_DIR}/sodiumConfig.cmake.in" + "${CURRENT_PACKAGES_DIR}/share/unofficial-sodium/unofficial-sodiumConfig.cmake" + @ONLY +) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libsodium/sodiumConfig.cmake.in b/externals/vcpkg/ports/libsodium/sodiumConfig.cmake.in new file mode 100755 index 000000000..a3ec1ba8f --- /dev/null +++ b/externals/vcpkg/ports/libsodium/sodiumConfig.cmake.in @@ -0,0 +1,7 @@ + +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32) + include(CMakeFindDependencyMacro) + find_dependency(Threads) +endif() + +include(${CMAKE_CURRENT_LIST_DIR}/unofficial-sodiumTargets.cmake) diff --git a/externals/vcpkg/ports/libsodium/vcpkg.json b/externals/vcpkg/ports/libsodium/vcpkg.json new file mode 100755 index 000000000..d2b01af14 --- /dev/null +++ b/externals/vcpkg/ports/libsodium/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libsodium", + "version": "1.0.18", + "port-version": 7, + "description": "A modern and easy-to-use crypto library", + "homepage": "https://github.com/jedisct1/libsodium", + "license": "ISC", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libsoundio/fix_cmakelists.patch b/externals/vcpkg/ports/libsoundio/fix_cmakelists.patch new file mode 100755 index 000000000..b25f58824 --- /dev/null +++ b/externals/vcpkg/ports/libsoundio/fix_cmakelists.patch @@ -0,0 +1,58 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6541f1b..e81bdce 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,5 @@ +-cmake_minimum_required(VERSION 2.8.5) ++cmake_minimum_required(VERSION 3.14) ++cmake_policy(SET CMP0022 NEW) + project(libsoundio C) + set(CMAKE_MODULE_PATH ${libsoundio_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) + +@@ -233,7 +234,8 @@ if(BUILD_DYNAMIC_LIBS) + LINKER_LANGUAGE C + ) + target_link_libraries(libsoundio_shared LINK_PUBLIC ${LIBSOUNDIO_LIBS}) +- install(TARGETS libsoundio_shared DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ target_include_directories(libsoundio_shared PUBLIC $) ++ install(TARGETS libsoundio_shared EXPORT libsoundio-export) + endif() + + if(BUILD_STATIC_LIBS) +@@ -204,8 +206,7 @@ if(MSVC) + set(EXAMPLE_CFLAGS "/W4") + set(TEST_CFLAGS "${LIB_CFLAGS}") + set(TEST_LDFLAGS " ") + set(LIBM " ") + else() +- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror -pedantic") + set(LIB_CFLAGS "-std=c11 -fvisibility=hidden -Wall -Werror=strict-prototypes -Werror=old-style-definition -Werror=missing-prototypes -D_REENTRANT -D_POSIX_C_SOURCE=200809L -Wno-missing-braces") + set(EXAMPLE_CFLAGS "-std=c99 -Wall") +@@ -243,9 +244,26 @@ if(BUILD_STATIC_LIBS) + COMPILE_FLAGS ${LIB_CFLAGS} + LINKER_LANGUAGE C + ) +- install(TARGETS libsoundio_static DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ target_link_libraries(libsoundio_static PUBLIC ${LIBSOUNDIO_LIBS}) ++ target_include_directories(libsoundio_static PUBLIC $) ++ install(TARGETS libsoundio_static EXPORT libsoundio-export) + endif() + ++add_library(libsoundio INTERFACE) ++if(BUILD_DYNAMIC_LIBS) ++ target_link_libraries(libsoundio INTERFACE libsoundio_shared) ++else() ++ target_link_libraries(libsoundio INTERFACE libsoundio_static) ++endif() ++install(TARGETS libsoundio EXPORT libsoundio-export) ++install( ++ EXPORT libsoundio-export ++ FILE libsoundio-config.cmake ++ DESTINATION share/libsoundio/ ++ NAMESPACE ${PROJECT_NAME}:: ++ EXPORT_LINK_INTERFACE_LIBRARIES ++) ++ + install(FILES + ${LIBSOUNDIO_HEADERS} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/soundio") diff --git a/externals/vcpkg/ports/libsoundio/portfile.cmake b/externals/vcpkg/ports/libsoundio/portfile.cmake new file mode 100755 index 000000000..1e5946189 --- /dev/null +++ b/externals/vcpkg/ports/libsoundio/portfile.cmake @@ -0,0 +1,43 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO andrewrk/libsoundio + REF 2.0.0 + SHA512 347a9be1789a41e778ea8d0efa1d00e03e725a4ab65e3aaf6c71e49138643f08a50a81bd60087d86a3b4d63beaeec617e47ba6b81f829ece8a3ac17418eb5309 + HEAD_REF master + PATCHES + fix_cmakelists.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_DYNAMIC_LIBS) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + alsa ENABLE_ALSA + jack ENABLE_JACK + pulseaudio ENABLE_PULSEAUDIO +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_DYNAMIC_LIBS=${BUILD_DYNAMIC_LIBS} + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DBUILD_EXAMPLE_PROGRAMS=OFF + -DBUILD_TESTS=OFF + ${FEATURE_OPTIONS} + -DENABLE_COREAUDIO=${VCPKG_TARGET_IS_OSX} + -DENABLE_WASAPI=${VCPKG_TARGET_IS_WINDOWS} +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets() +vcpkg_copy_pdbs() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +endif() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libsoundio RENAME copyright) diff --git a/externals/vcpkg/ports/libsoundio/vcpkg.json b/externals/vcpkg/ports/libsoundio/vcpkg.json new file mode 100755 index 000000000..52ca059cd --- /dev/null +++ b/externals/vcpkg/ports/libsoundio/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "libsoundio", + "version": "2.0.0", + "port-version": 6, + "description": "libsoundio is C library providing cross-platform audio input and output.", + "homepage": "http://libsound.io/", + "supports": "!uwp", + "features": { + "alsa": { + "description": "ALSA backend for libsoundio" + }, + "jack": { + "description": "JACK backend for libsoundio", + "dependencies": [ + "jack2" + ] + }, + "pulseaudio": { + "description": "PulseAudio backend for libsoundio" + } + } +} diff --git a/externals/vcpkg/ports/libspatialindex/portfile.cmake b/externals/vcpkg/ports/libspatialindex/portfile.cmake new file mode 100755 index 000000000..17d89d36c --- /dev/null +++ b/externals/vcpkg/ports/libspatialindex/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libspatialindex/libspatialindex + REF 1.9.3 + SHA512 d4c608abbd631dc163b7b4fb6bf09dee3e85ce692a5f8875d51f05a26e09c75cd17dff1ed9d2c232a071f0f5864d21d877b4cbc252f3416896db24dfa3fa18cb + HEAD_REF master + PATCHES + static.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DCMAKE_DEBUG_POSTFIX=d + -DSIDX_BUILD_TESTS:BOOL=OFF +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +#Debug +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libspatialindex/static.patch b/externals/vcpkg/ports/libspatialindex/static.patch new file mode 100755 index 000000000..1ce2b9d6a --- /dev/null +++ b/externals/vcpkg/ports/libspatialindex/static.patch @@ -0,0 +1,77 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c34ee8d71..84e4a9247 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -43,7 +43,7 @@ SET(SIDX_VERSION_MINOR "9") + SET(SIDX_VERSION_PATCH "3") + SET(SIDX_LIB_VERSION "6.1.1") + SET(SIDX_LIB_SOVERSION "6") +-SET(BUILD_SHARED_LIBS ON) ++option(BUILD_SHARED_LIBS "Build shared libs" ON) + + + set(SIDX_VERSION_STRING "${SIDX_VERSION_MAJOR}.${SIDX_VERSION_MINOR}.${SIDX_VERSION_PATCH}") + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 90f4501bc..aad327181 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -188,9 +188,13 @@ set(SIDX_SOURCES + #endif() + + +-add_library(${SIDX_LIB_NAME} ${SIDX_SOURCES}) +- +-add_library(${SIDX_C_LIB_NAME} ${SIDX_CAPI_CPP}) ++if(BUILD_SHARED_LIBS) ++ add_library(${SIDX_LIB_NAME} SHARED ${SIDX_SOURCES}) ++ add_library(${SIDX_C_LIB_NAME} SHARED ${SIDX_CAPI_CPP}) ++else(BUILD_SHARED_LIBS) ++ add_library(${SIDX_LIB_NAME} STATIC ${SIDX_SOURCES}) ++ add_library(${SIDX_C_LIB_NAME} STATIC ${SIDX_CAPI_CPP}) ++endif(BUILD_SHARED_LIBS) + + target_link_libraries(${SIDX_C_LIB_NAME} + ${SIDX_LIB_NAME} +@@ -208,9 +212,10 @@ if(WIN32) + target_compile_options(${SIDX_LIB_NAME} PRIVATE "/wd4068") + target_compile_options(${SIDX_C_LIB_NAME} PRIVATE "/wd4068") + +- target_compile_definitions(${SIDX_C_LIB_NAME} PRIVATE "-DSIDX_DLL_EXPORT=1") +- target_compile_definitions(${SIDX_LIB_NAME} PRIVATE "-DSIDX_DLL_EXPORT=1") +- if (NOT WITH_STATIC_SIDX) ++ if (BUILD_SHARED_LIBS) ++ target_compile_definitions(${SIDX_C_LIB_NAME} PRIVATE "-DSIDX_DLL_EXPORT=1") ++ target_compile_definitions(${SIDX_LIB_NAME} PRIVATE "-DSIDX_DLL_EXPORT=1") ++ else() + target_compile_definitions(${SIDX_LIB_NAME} PRIVATE "-DSIDX_DLL_IMPORT=1") + target_compile_definitions(${SIDX_C_LIB_NAME} PRIVATE "-DSIDX_DLL_IMPORT=1") + endif() + +diff --git a/include/spatialindex/capi/sidx_export.h b/include/spatialindex/capi/sidx_export.h +index b6c84f1ef..7b0a39364 100644 +--- a/include/spatialindex/capi/sidx_export.h ++++ b/include/spatialindex/capi/sidx_export.h +@@ -29,7 +29,7 @@ + #pragma once + + #ifndef SIDX_C_DLL +-#if defined(_MSC_VER) ++#if defined(_MSC_VER) && defined(SIDX_DLL_EXPORT) + # define SIDX_C_DLL __declspec(dllexport) + # define SIDX_DLL __declspec(dllexport) + #else + +diff --git a/include/spatialindex/tools/Tools.h b/include/spatialindex/tools/Tools.h +index 322bc819e..46b62fa00 100644 +--- a/include/spatialindex/tools/Tools.h ++++ b/include/spatialindex/tools/Tools.h +@@ -46,7 +46,7 @@ + #ifdef SIDX_DLL_EXPORT + #define SIDX_DLL __declspec(dllexport) + #else +- #define SIDX_DLL __declspec(dllimport) ++ #define SIDX_DLL + #endif + + // Nuke this annoying warning. See http://www.unknownroad.com/rtfm/VisualStudio/warningC4251.html diff --git a/externals/vcpkg/ports/libspatialindex/vcpkg.json b/externals/vcpkg/ports/libspatialindex/vcpkg.json new file mode 100755 index 000000000..9caadda04 --- /dev/null +++ b/externals/vcpkg/ports/libspatialindex/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "libspatialindex", + "version": "1.9.3", + "description": "C++ implementation of R*-tree, an MVR-tree and a TPR-tree with C API.", + "homepage": "http://libspatialindex.github.com", + "dependencies": [ + "zlib" + ] +} diff --git a/externals/vcpkg/ports/libspatialite/fix-linux-configure.patch b/externals/vcpkg/ports/libspatialite/fix-linux-configure.patch new file mode 100755 index 000000000..39883193d --- /dev/null +++ b/externals/vcpkg/ports/libspatialite/fix-linux-configure.patch @@ -0,0 +1,34 @@ +diff --git a/configure.ac b/configure.ac +index ead87caff..47abb90f0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -302,6 +302,7 @@ if test x"$enable_geos" != "xno"; then + #----------------------------------------------------------------------- + # --with-geosconfig + # ++ if 0; then + AC_ARG_WITH([geosconfig], + [AS_HELP_STRING([--with-geosconfig=FILE], [specify an alternative geos-config file])], + [GEOSCONFIG="$withval"], [GEOSCONFIG=""]) +@@ -327,6 +328,7 @@ if test x"$enable_geos" != "xno"; then + # Extract the linker and include flags + GEOS_LDFLAGS=`$GEOSCONFIG --ldflags` + GEOS_CFLAGS=-I`$GEOSCONFIG --includes` ++ fi + AC_SUBST([GEOS_LDFLAGS]) + AC_SUBST([GEOS_CFLAGS]) + # Ensure that we can parse geos_c.h +@@ -335,11 +337,13 @@ if test x"$enable_geos" != "xno"; then + AC_CHECK_HEADERS([geos_c.h],, [AC_MSG_ERROR([could not find geos_c.h - you may need to specify the directory of a geos-config file using --with-geosconfig])]) + CPPFLAGS="$CPPFLAGS_SAVE" + # Ensure we can link against libgeos_c ++ if 0; then + LIBS_SAVE="$LIBS" + LIBS="$GEOS_LDFLAGS" + AC_SEARCH_LIBS(GEOSCoveredBy,geos_c,,AC_MSG_ERROR([could not find libgeos_c (or obsolete 'libgeos_c' < v.3.3.0 found) - you may need to specify the directory of a geos-config file using --with-geosconfig])) + LIBS="$LIBS_SAVE" + LIBS="$LIBS $GEOS_LDFLAGS -lgeos_c" ++ fi + + #----------------------------------------------------------------------- + # --enable-controlpoints diff --git a/externals/vcpkg/ports/libspatialite/fix-makefiles.patch b/externals/vcpkg/ports/libspatialite/fix-makefiles.patch new file mode 100755 index 000000000..6466020bc --- /dev/null +++ b/externals/vcpkg/ports/libspatialite/fix-makefiles.patch @@ -0,0 +1,44 @@ +diff --git a/makefile.vc b/makefile.vc +index 120090eba..049c0d0b0 100644 +--- a/makefile.vc ++++ b/makefile.vc +@@ -93,7 +93,7 @@ LIBOBJ = src\gaiaaux\gg_sqlaux.obj src\gaiaaux\gg_utf8.obj \ + SPATIALITE_DLL = spatialite$(VERSION).dll + + CFLAGS = /nologo -I.\src\headers -I.\src\topology \ +- -I. -IC:\OSGeo4W\include $(OPTFLAGS) ++ -I. $(OPTFLAGS) + + default: all + +@@ -107,12 +107,9 @@ spatialite.lib: $(LIBOBJ) + $(SPATIALITE_DLL): spatialite_i.lib + + spatialite_i.lib: $(LIBOBJ) +- link /dll /out:$(SPATIALITE_DLL) \ ++ link $(LINK_FLAGS) /dll /out:$(SPATIALITE_DLL) \ + /implib:spatialite_i.lib $(LIBOBJ) \ +- C:\OSGeo4W\lib\proj_i.lib C:\OSGeo4W\lib\geos_c.lib \ +- C:\OSGeo4w\lib\freexl_i.lib C:\OSGeo4w\lib\iconv.lib \ +- C:\OSGeo4W\lib\sqlite3_i.lib C:\OSGeo4W\lib\zlib.lib \ +- C:\OSGeo4W\lib\libxml2.lib C:\OSGeo4W\lib\librttopo.lib ++ $(LIBS_ALL) + if exist $(SPATIALITE_DLL).manifest mt -manifest \ + $(SPATIALITE_DLL).manifest -outputresource:$(SPATIALITE_DLL);2 + + +diff --git a/nmake.opt b/nmake.opt +index c048aa758..be68e21cd 100644 +--- a/nmake.opt ++++ b/nmake.opt +@@ -1,8 +1,8 @@ + # Directory tree where SpatiaLite will be installed. +-INSTDIR=C:\OSGeo4W ++INSTDIR=$(INST_DIR) + + # Uncomment the first for an optimized build, or the second for debug. +-OPTFLAGS= /nologo /Ox /fp:precise /W4 /MD /D_CRT_SECURE_NO_WARNINGS \ ++OPTFLAGS= /nologo /fp:precise /W4 $(CL_FLAGS) /D_CRT_SECURE_NO_WARNINGS \ + /DDLL_EXPORT /DYY_NO_UNISTD_H + #OPTFLAGS= /nologo /Zi /MD /Fdspatialite.pdb /DDLL_EXPORT + diff --git a/externals/vcpkg/ports/libspatialite/gaiaconfig-msvc.patch b/externals/vcpkg/ports/libspatialite/gaiaconfig-msvc.patch new file mode 100755 index 000000000..3bf276d70 --- /dev/null +++ b/externals/vcpkg/ports/libspatialite/gaiaconfig-msvc.patch @@ -0,0 +1,31 @@ +diff --git a/src/headers/spatialite/gaiaconfig-msvc.h b/src/headers/spatialite/gaiaconfig-msvc.h +index 37f0bd1..0053258 100644 +--- a/src/headers/spatialite/gaiaconfig-msvc.h ++++ b/src/headers/spatialite/gaiaconfig-msvc.h +@@ -2,7 +2,7 @@ + /* ./src/headers/spatialite/gaiaconfig-msvc.h.in - manually maintained */ + + /* Should be defined in order to enable GCP support. */ +-#define ENABLE_GCP 1 ++// #define ENABLE_GCP 1 + + /* Should be defined in order to enable GeoPackage support. */ + #define ENABLE_GEOPACKAGE 1 +@@ -11,7 +11,7 @@ + #define ENABLE_LIBXML2 1 + + /* Should be defined in order to enable RTTOPO support. */ +-#define ENABLE_RTTOPO 1 ++// #define ENABLE_RTTOPO 1 + + /* Should be defined in order to enable GEOS_370 support. */ + #define GEOS_370 1 +@@ -32,7 +32,7 @@ + /* #undef OMIT_FREEXL */ + + /* Should be defined in order to disable GEOCALLBACKS support. */ +-#define OMIT_GEOCALLBACKS 1 ++// #define OMIT_GEOCALLBACKS 1 + + /* Should be defined in order to disable GEOS support. */ + /* #undef OMIT_GEOS */ diff --git a/externals/vcpkg/ports/libspatialite/portfile.cmake b/externals/vcpkg/ports/libspatialite/portfile.cmake new file mode 100755 index 000000000..6d97e062a --- /dev/null +++ b/externals/vcpkg/ports/libspatialite/portfile.cmake @@ -0,0 +1,243 @@ +set(LIBSPATIALITE_VERSION_STR "5.0.1") +vcpkg_download_distfile(ARCHIVE + URLS "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${LIBSPATIALITE_VERSION_STR}.tar.gz" + FILENAME "libspatialite-${LIBSPATIALITE_VERSION_STR}.tar.gz" + SHA512 c2552994bc30d69d1e80aa274760f048cd384f71e8350a1e48a47cb8222ba71a1554a69c6534eedde9a09dc582c39c089967bcc1c57bf158cc91a3e7b1840ddf +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES + fix-makefiles.patch + fix-linux-configure.patch + gaiaconfig-msvc.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS unused + FEATURES + freexl ENABLE_FREEXL + gcp ENABLE_GCP + geocallbacks ENABLE_GEOCALLBACKS + rttopo ENABLE_RTTOPO +) + +set(pkg_config_modules geos libxml-2.0 proj sqlite3 zlib) +if(ENABLE_FREEXL) + list(APPEND pkg_config_modules freexl) +endif() +if(ENABLE_RTTOPO) + list(APPEND pkg_config_modules rttopo) +endif() + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(CL_FLAGS "") + if(NOT ENABLE_FREEXL) + string(APPEND CL_FLAGS " /DOMIT_FREEXL") + endif() + if(ENABLE_GCP) + string(APPEND CL_FLAGS " /DENABLE_GCP") + endif() + if(NOT ENABLE_GEOCALLBACKS) + string(APPEND CL_FLAGS " /DOMIT_GEOCALLBACKS") + endif() + if(ENABLE_RTTOPO) + string(APPEND CL_FLAGS " /DENABLE_RTTOPO") + endif() + + x_vcpkg_pkgconfig_get_modules( + PREFIX PKGCONFIG + MODULES --msvc-syntax ${pkg_config_modules} + LIBS + CFLAGS + ) + + set(CL_FLAGS_RELEASE "${CL_FLAGS} ${PKGCONFIG_CFLAGS_RELEASE}") + set(CL_FLAGS_DEBUG "${CL_FLAGS} ${PKGCONFIG_CFLAGS_DEBUG}") + + # vcpkg_build_nmake doesn't supply cmake's implicit link libraries + if(PKGCONFIG_LIBS_DEBUG MATCHES "libcrypto") + string(APPEND PKGCONFIG_LIBS_DEBUG " user32.lib") + endif() + if(PKGCONFIG_LIBS_RELEASE MATCHES "libcrypto") + string(APPEND PKGCONFIG_LIBS_RELEASE " user32.lib") + endif() + + string(JOIN " " LIBS_ALL_DEBUG + "/LIBPATH:${CURRENT_INSTALLED_DIR}/debug/lib" + "${PKGCONFIG_LIBS_DEBUG}" + iconv.lib charset.lib + ) + string(JOIN " " LIBS_ALL_RELEASE + "/LIBPATH:${CURRENT_INSTALLED_DIR}/lib" + "${PKGCONFIG_LIBS_RELEASE}" + iconv.lib charset.lib + ) + + string(REPLACE "/" "\\\\" INST_DIR "${CURRENT_PACKAGES_DIR}") + + if(ENABLE_RTTOPO) + list(APPEND pkg_config_modules rttopo) + endif() + vcpkg_install_nmake( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_RELEASE + "CL_FLAGS=${CL_FLAGS_RELEASE}" + "INST_DIR=${INST_DIR}" + "LIBS_ALL=${LIBS_ALL_RELEASE}" + OPTIONS_DEBUG + "CL_FLAGS=${CL_FLAGS_DEBUG}" + "INST_DIR=${INST_DIR}\\debug" + "LIBS_ALL=${LIBS_ALL_DEBUG}" + "LINK_FLAGS=/debug" + ) + + vcpkg_copy_pdbs() + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/spatialite_i.lib") + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite_i.lib") + endif() + else() + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/spatialite.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/spatialite_i.lib" "${CURRENT_PACKAGES_DIR}/lib/spatialite.lib") + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite_i.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite.lib") + endif() + endif() + + set(infile "${SOURCE_PATH}/spatialite.pc.in") + set(VERSION "${LIBSPATIALITE_VERSION_STR}") + set(libdir [[${prefix}/lib]]) + set(exec_prefix [[${prefix}]]) + list(JOIN pkg_config_modules " " requires_private) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(includedir [[${prefix}/include]]) + set(outfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/spatialite.pc") + configure_file("${infile}" "${outfile}" @ONLY) + vcpkg_replace_string("${outfile}" "Libs:" "Requires.private: ${requires_private}\nLibs.private: -liconv -lcharset\nLibs:") + vcpkg_replace_string("${outfile}" " -lm" " ") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(includedir [[${prefix}/../include]]) + set(outfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/spatialite.pc") + configure_file("${infile}" "${outfile}" @ONLY) + vcpkg_replace_string("${outfile}" "Libs:" "Requires.private: ${requires_private}\nLibs.private: -liconv -lcharset\nLibs:") + vcpkg_replace_string("${outfile}" " -lm" " ") + endif() +else() + if(ENABLE_FREEXL) + set(FREEXL_OPTION "--enable-freexl") + else() + set(FREEXL_OPTION "--disable-freexl") + endif() + if(ENABLE_GCP) + set(GCP_OPTION "--enable-gcp") + else() + set(GCP_OPTION "--disable-gcp") + endif() + if(ENABLE_GEOCALLBACKS) + set(GEOCALLBACKS_OPTION "--enable-geocallbacks") + else() + set(GEOCALLBACKS_OPTION "--disable-geocallbacks") + endif() + if(ENABLE_RTTOPO) + set(RTTOPO_OPTION "--enable-rttopo") + else() + set(RTTOPO_OPTION "--disable-rttopo") + endif() + list(REMOVE_ITEM pkg_config_modules libxml2) # handled properly by configure + x_vcpkg_pkgconfig_get_modules( + PREFIX PKGCONFIG + MODULES ${pkg_config_modules} + LIBS + ) + if(VCPKG_TARGET_IS_MINGW) + # Avoid system libs (as detected by cmake) in exported pc files + set(SYSTEM_LIBS "") + else() + set(SYSTEM_LIBS "\$LIBS") + endif() + # libspatialite needs some targets literally + if(VCPKG_TARGET_IS_ANDROID) + set(TARGET_ALIAS "--target=android") + elseif(VCPKG_TARGET_IS_MINGW) + set(TARGET_ALIAS "--target=mingw32") + elseif(VCPKG_TARGET_IS_OSX) + set(TARGET_ALIAS "--target=macosx") + else() + set(TARGET_ALIAS "") + endif() + vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + ${TARGET_ALIAS} + ${FREEXL_OPTION} + ${GCP_OPTION} + ${GEOCALLBACKS_OPTION} + ${RTTOPO_OPTION} + "--disable-examples" + "--disable-minizip" + OPTIONS_DEBUG + "LIBS=${PKGCONFIG_LIBS_DEBUG} ${SYSTEM_LIBS}" + OPTIONS_RELEASE + "LIBS=${PKGCONFIG_LIBS_RELEASE} ${SYSTEM_LIBS}" + ) + + # automake adds the basedir of the generated config to `DEFAULT_INCLUDES`, + # but libspatialite uses `#include `. + file(GLOB_RECURSE makefiles + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Makefile" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Makefile" + ) + foreach(makefile IN LISTS makefiles) + vcpkg_replace_string("${makefile}" " -I$(top_builddir)/./src/headers/spatialite" " -I$(top_builddir)/./src/headers") + endforeach() + + vcpkg_install_make() + + if(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/plugins/${PORT}") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/mod_spatialite.dll" "${CURRENT_PACKAGES_DIR}/plugins/${PORT}/mod_spatialite.dll") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/plugins/${PORT}") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/mod_spatialite.dll" "${CURRENT_PACKAGES_DIR}/debug/plugins/${PORT}/mod_spatialite.dll") + endif() + endif() +endif() + +vcpkg_fixup_pkgconfig() + +# Handle copyright +set(outfile "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +if(NOT ENABLE_GCP AND NOT ENABLE_RTTOPO) + file(READ "${SOURCE_PATH}/COPYING" mpl) + file(WRITE "${outfile}" + "SpatiaLite[${FEATURES}] is licensed under the MPL tri-license terms;\n" + "you are free to choose the best-fit license between:\n" + "- the MPL 1.1\n" + "- the GPL v2.0 or any subsequent version\n" + "- the LGPL v2.1 or any subsequent version.\n\n" + "# MPL 1.1 (from COPYING)\n\n" + "${mpl}\n" + ) +else() + file(WRITE "${outfile}" + "SpatiaLite[${FEATURES}] is licensed under:\n" + "the GPL v2.0 or any subsequent version.\n\n" + ) +endif() +file(READ "${SOURCE_PATH}/src/control_points/COPYING" gpl) +file(APPEND "${outfile}" + "# GPL v2.0 (from src/control_points/COPYING)\n\n" + "${gpl}\n" +) diff --git a/externals/vcpkg/ports/libspatialite/vcpkg.json b/externals/vcpkg/ports/libspatialite/vcpkg.json new file mode 100755 index 000000000..9de45472b --- /dev/null +++ b/externals/vcpkg/ports/libspatialite/vcpkg.json @@ -0,0 +1,47 @@ +{ + "name": "libspatialite", + "version": "5.0.1", + "port-version": 5, + "description": "SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities.", + "homepage": "https://www.gaia-gis.it/gaia-sins/libspatialite-sources", + "license": "MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later", + "dependencies": [ + "geos", + "libiconv", + "libxml2", + "proj", + { + "name": "sqlite3", + "default-features": false, + "features": [ + "rtree" + ] + }, + "vcpkg-pkgconfig-get-modules", + "zlib" + ], + "default-features": [ + "freexl", + "geocallbacks" + ], + "features": { + "freexl": { + "description": "FreeXL spreadsheet file support.", + "dependencies": [ + "freexl" + ] + }, + "gcp": { + "description": "Ground control points support. This feature reduces the license options to GPLv2+." + }, + "geocallbacks": { + "description": "Geometry callbacks support." + }, + "rttopo": { + "description": "RTTOPO support. This feature reduces the license options to GPLv2+.", + "dependencies": [ + "librttopo" + ] + } + } +} diff --git a/externals/vcpkg/ports/libspnav/portfile.cmake b/externals/vcpkg/ports/libspnav/portfile.cmake new file mode 100755 index 000000000..89bf76c44 --- /dev/null +++ b/externals/vcpkg/ports/libspnav/portfile.cmake @@ -0,0 +1,43 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO FreeSpacenav/libspnav + REF libspnav-0.2.3 # v0.2.3 seems to be outdated. libspnav-0.2.3 is the same as 0.2.3 on their sourceforge + SHA512 6c06344813ddf7e2bc7981932b4a901334de2b91d8c3abb23828869070dc73ed1c19c5bf7ff9338cc673c8f0dc7394608652afd0cdae093149c0a24460f0a8fb + HEAD_REF master +) + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS_DEBUG "--enable-debug" + OPTIONS_RELEASE "--disable-debug" +) + +vcpkg_install_make() + +macro(CLEANUP WHERE) + set(WORKDIR ${CURRENT_PACKAGES_DIR}/${WHERE}) + if ("${WHERE}" STREQUAL "debug") + file(REMOVE_RECURSE ${WORKDIR}/include) + endif () + file(REMOVE ${WORKDIR}/lib/libspnav.so) + file(REMOVE ${WORKDIR}/lib/libspnav.so.0) + file(RENAME ${WORKDIR}/lib/libspnav.so.0.1 ${WORKDIR}/lib/libspnav.so) + if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE ${WORKDIR}/lib/libspnav.so) + else () + file(REMOVE ${WORKDIR}/lib/libspnav.a) + endif () +endmacro() + +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + cleanup("") +endif () + +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + cleanup("debug") +endif () + +file(INSTALL ${SOURCE_PATH}/README + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright +) diff --git a/externals/vcpkg/ports/libspnav/vcpkg.json b/externals/vcpkg/ports/libspnav/vcpkg.json new file mode 100755 index 000000000..1c9557d3e --- /dev/null +++ b/externals/vcpkg/ports/libspnav/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libspnav", + "version": "0.2.3", + "port-version": 2, + "description": "Library for communicating with spacenavd or 3dxsrv to get input from 6-dof devices.", + "homepage": "https://github.com/FreeSpacenav/libspnav", + "supports": "linux" +} diff --git a/externals/vcpkg/ports/libsquish/export-target.patch b/externals/vcpkg/ports/libsquish/export-target.patch new file mode 100755 index 000000000..78f5f30f5 --- /dev/null +++ b/externals/vcpkg/ports/libsquish/export-target.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a3ecdde..94c7b3d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -120,8 +120,14 @@ INCLUDE(GNUInstallDirs) + + INSTALL( + TARGETS squish ++ EXPORT unofficial-libsquishConfig + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) ++ ++INSTALL(EXPORT unofficial-libsquishConfig ++ NAMESPACE unofficial::libsquish:: ++ DESTINATION share/unofficial-libsquish ++) diff --git a/externals/vcpkg/ports/libsquish/fix-export-symbols.patch b/externals/vcpkg/ports/libsquish/fix-export-symbols.patch new file mode 100755 index 000000000..a777eea23 --- /dev/null +++ b/externals/vcpkg/ports/libsquish/fix-export-symbols.patch @@ -0,0 +1,105 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a36e574..a3ecdde 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -75,6 +75,13 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) + + ADD_LIBRARY(squish ${SQUISH_SRCS} ${SQUISH_HDRS}) + ++INCLUDE(GenerateExportHeader) ++GENERATE_EXPORT_HEADER(squish ++ EXPORT_FILE_NAME ${CMAKE_CURRENT_SOURCE_DIR}/squish_export.h ++ ) ++ ++list(APPEND SQUISH_HDRS "squish_export.h") ++ + SET_TARGET_PROPERTIES( + squish PROPERTIES + PUBLIC_HEADER "${SQUISH_HDRS}" +@@ -109,9 +116,12 @@ IF (BUILD_SQUISH_EXTRA) + ENDIF (PNG_FOUND) + ENDIF (BUILD_SQUISH_EXTRA) + ++INCLUDE(GNUInstallDirs) ++ + INSTALL( + TARGETS squish +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib +- PUBLIC_HEADER DESTINATION include ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) +diff --git a/squish.h b/squish.h +index 14c9bb5..aaffbb2 100644 +--- a/squish.h ++++ b/squish.h +@@ -26,6 +26,8 @@ + #ifndef SQUISH_H + #define SQUISH_H + ++#include "squish_export.h" ++ + //! All squish API functions live in this namespace. + namespace squish { + +@@ -115,5 +117,5 @@ + */ +-void CompressMasked( u8 const* rgba, int mask, void* block, int flags, float* metric = 0 ); ++SQUISH_EXPORT void CompressMasked( u8 const* rgba, int mask, void* block, int flags, float* metric = 0 ); + + // ----------------------------------------------------------------------------- + +@@ -176,7 +178,7 @@ inline void Compress( u8 const* rgba, void* block, int flags, float* metric = 0 + however, DXT1 will be used by default if none is specified. All other flags + are ignored. + */ +-void Decompress( u8* rgba, void const* block, int flags ); ++SQUISH_EXPORT void Decompress( u8* rgba, void const* block, int flags ); + + // ----------------------------------------------------------------------------- + +@@ -194,7 +196,7 @@ void Decompress( u8* rgba, void const* block, int flags ); + function supports arbitrary size images by allowing the outer blocks to + be only partially used. + */ +-int GetStorageRequirements( int width, int height, int flags ); ++SQUISH_EXPORT int GetStorageRequirements( int width, int height, int flags ); + + // ----------------------------------------------------------------------------- + +@@ -249,8 +251,8 @@ int GetStorageRequirements( int width, int height, int flags ); + Windows platform but for other platforms like MacOS X a different + gamma value may be more suitable. + */ +-void CompressImage( u8 const* rgba, int width, int height, int pitch, void* blocks, int flags, float* metric = 0 ); +-void CompressImage( u8 const* rgba, int width, int height, void* blocks, int flags, float* metric = 0 ); ++SQUISH_EXPORT void CompressImage( u8 const* rgba, int width, int height, int pitch, void* blocks, int flags, float* metric = 0 ); ++SQUISH_EXPORT void CompressImage( u8 const* rgba, int width, int height, void* blocks, int flags, float* metric = 0 ); + + // ----------------------------------------------------------------------------- + +@@ -274,8 +276,8 @@ void CompressImage( u8 const* rgba, int width, int height, void* blocks, int fla + + Internally this function calls squish::Decompress for each block. + */ +-void DecompressImage( u8* rgba, int width, int height, int pitch, void const* blocks, int flags ); +-void DecompressImage( u8* rgba, int width, int height, void const* blocks, int flags ); ++SQUISH_EXPORT void DecompressImage( u8* rgba, int width, int height, int pitch, void const* blocks, int flags ); ++SQUISH_EXPORT void DecompressImage( u8* rgba, int width, int height, void const* blocks, int flags ); + + // ----------------------------------------------------------------------------- + +@@ -299,8 +301,8 @@ void DecompressImage( u8* rgba, int width, int height, void const* blocks, int f + + Internally this function calls squish::Decompress for each block. + */ +-void ComputeMSE(u8 const *rgba, int width, int height, int pitch, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE); +-void ComputeMSE(u8 const *rgba, int width, int height, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE); ++SQUISH_EXPORT void ComputeMSE(u8 const *rgba, int width, int height, int pitch, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE); ++SQUISH_EXPORT void ComputeMSE(u8 const *rgba, int width, int height, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE); + + // ----------------------------------------------------------------------------- + diff --git a/externals/vcpkg/ports/libsquish/portfile.cmake b/externals/vcpkg/ports/libsquish/portfile.cmake new file mode 100755 index 000000000..e9cb26e3f --- /dev/null +++ b/externals/vcpkg/ports/libsquish/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO libsquish + FILENAME "libsquish-1.15.tgz" + NO_REMOVE_ONE_LEVEL + SHA512 5b569b7023874c7a43063107e2e428ea19e6eb00de045a4a13fafe852ed5402093db4b65d540b5971ec2be0d21cb97dfad9161ebfe6cf6e5376174ff6c6c3e7a + PATCHES + fix-export-symbols.patch + export-target.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + sse2 BUILD_SQUISH_WITH_SSE2 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libsquish CONFIG_PATH share/unofficial-libsquish) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libsquish/vcpkg.json b/externals/vcpkg/ports/libsquish/vcpkg.json new file mode 100755 index 000000000..3af7e3b13 --- /dev/null +++ b/externals/vcpkg/ports/libsquish/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "libsquish", + "version": "1.15", + "port-version": 10, + "description": "Open source DXT compression library.", + "homepage": "https://sourceforge.net/projects/libsquish", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "sse2": { + "description": "Build with SSE2", + "supports": "osx" + } + } +} diff --git a/externals/vcpkg/ports/libsrt/fix-dependency-install.patch b/externals/vcpkg/ports/libsrt/fix-dependency-install.patch new file mode 100755 index 000000000..a81ae4561 --- /dev/null +++ b/externals/vcpkg/ports/libsrt/fix-dependency-install.patch @@ -0,0 +1,38 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1008,6 +1008,7 @@ set (INSTALL_SHARED_DIR ${CMAKE_INSTALL_LIBDIR}) + if (CYGWIN) + set (INSTALL_SHARED_DIR ${CMAKE_INSTALL_BINDIR}) + endif() ++set(CMAKE_INSTALL_INCLUDEDIR include) + + message(STATUS "INSTALL DIRS: bin=${CMAKE_INSTALL_BINDIR} lib=${CMAKE_INSTALL_LIBDIR} shlib=${INSTALL_SHARED_DIR} include=${CMAKE_INSTALL_INCLUDEDIR}") + +@@ -1085,7 +1085,7 @@ + + macro(srt_add_program name) + srt_add_program_dont_install(${name} ${ARGN}) +- install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ install(TARGETS ${name} RUNTIME DESTINATION tools) + endmacro() + + macro(srt_make_application name) +@@ -1124,7 +1124,7 @@ endmacro() + macro(srt_add_application name) # ARGN=sources... + srt_add_program(${name} apps/${name}.cpp ${ARGN}) + srt_make_application(${name}) +- install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ install(TARGETS ${name} RUNTIME DESTINATION tools) + endmacro() + + ## FIXME: transmitmedia.cpp does not build on OpenBSD +@@ -1324,7 +1324,7 @@ if (ENABLE_UNITTESTS AND ENABLE_CXX11) + endif() + + +-install(PROGRAMS scripts/srt-ffplay DESTINATION ${CMAKE_INSTALL_BINDIR}) ++install(PROGRAMS scripts/srt-ffplay DESTINATION tools) + + + if (DEFINED SRT_EXTRA_APPS_INC) diff --git a/externals/vcpkg/ports/libsrt/portfile.cmake b/externals/vcpkg/ports/libsrt/portfile.cmake new file mode 100755 index 000000000..35ebd0654 --- /dev/null +++ b/externals/vcpkg/ports/libsrt/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Haivision/srt + REF v1.4.4 + SHA512 0D51E0EF73F4AA7EB284288CDBBD75B1C161969C2C2FED3A6D4E13A931341CA41DFCF2D6C1B9728F72B43454A9FDE3764DA67A27AF9F0C99A6818682E4F4D4BA + HEAD_REF master + PATCHES fix-dependency-install.patch +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(BUILD_DYNAMIC ON) + set(BUILD_STATIC OFF) +else() + set(BUILD_DYNAMIC OFF) + set(BUILD_STATIC ON) +endif() + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tool ENABLE_APPS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} + -DENABLE_SHARED=${BUILD_DYNAMIC} + -DENABLE_STATIC=${BUILD_STATIC} + -DENABLE_UNITTESTS=OFF + -DUSE_OPENSSL_PC=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libsrt/vcpkg.json b/externals/vcpkg/ports/libsrt/vcpkg.json new file mode 100755 index 000000000..02de23beb --- /dev/null +++ b/externals/vcpkg/ports/libsrt/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "libsrt", + "version": "1.4.4", + "port-version": 2, + "description": "Secure Reliable Transport (SRT) is an open source transport technology that optimizes streaming performance across unpredictable networks, such as the Internet.", + "homepage": "https://github.com/Haivision/srt", + "supports": "!uwp", + "dependencies": [ + "openssl", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "tool": { + "description": "Builds libsrt executable" + } + } +} diff --git a/externals/vcpkg/ports/libsrtp/portfile.cmake b/externals/vcpkg/ports/libsrtp/portfile.cmake new file mode 100755 index 000000000..4651baecc --- /dev/null +++ b/externals/vcpkg/ports/libsrtp/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_download_distfile(CMAKE_PR_PATCH + URLS https://patch-diff.githubusercontent.com/raw/cisco/libsrtp/pull/573.diff + FILENAME libsrtp-pr-573.patch + SHA512 58c07977ccbd3dce114f59583a5e10813bbee907af5ef23ec1961b4cfd0791c14326845a376470430978e878c78fb1f598851898a9e9031225628739fb248176 +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cisco/libsrtp + REF v2.4.2 + SHA512 6E4805E6D34B2050A6F68F629B0B42356B1D27F2CBAA6CC6166E56957609C3D9AA6B723DCC674E5C74180D122D27BADD2F9496639CCB1E0C210B9E1F7949D0E2 + PATCHES ${CMAKE_PR_PATCH} +) + +if (VCPKG_TARGET_IS_WINDOWS) + set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /wd4703") + set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /wd4703") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + CONFIG_PATH lib/cmake/libSRTP +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/srtp2.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/srtp2.dll" "${CURRENT_PACKAGES_DIR}/bin/srtp2.dll") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/srtp2.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/srtp2.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/srtp2.dll") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libsrtp" RENAME copyright) diff --git a/externals/vcpkg/ports/libsrtp/vcpkg.json b/externals/vcpkg/ports/libsrtp/vcpkg.json new file mode 100755 index 000000000..9131a77f8 --- /dev/null +++ b/externals/vcpkg/ports/libsrtp/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "libsrtp", + "version": "2.4.2", + "port-version": 2, + "description": "This package provides an implementation of the Secure Real-time Transport Protocol (SRTP), the Universal Security Transform (UST), and a supporting cryptographic kernel.", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libssh/0001-export-pkgconfig-file.patch b/externals/vcpkg/ports/libssh/0001-export-pkgconfig-file.patch new file mode 100755 index 000000000..c84510ce5 --- /dev/null +++ b/externals/vcpkg/ports/libssh/0001-export-pkgconfig-file.patch @@ -0,0 +1,43 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1f5b0bf5..c51fb0d3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -111,8 +111,28 @@ add_subdirectory(include) + add_subdirectory(src) + + # pkg-config file +-if (UNIX) + configure_file(libssh.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc) ++ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc "Requires:") ++ if (WITH_ZLIB) ++ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc " zlib") ++ endif () ++ if (WITH_GCRYPT) ++ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc "\nLibs.private: -lgcrypt") ++ elseif (WITH_MBEDTLS) ++ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc "\nLibs.private: -lmbedcrypto -lpthread") ++ else () ++ if (WIN32) ++ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc "\nLibs.private: -llibcrypto -lUser32 -lCrypt32") ++ else () ++ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc " libcrypto\nLibs.private:") ++ endif () ++ endif () ++ if (CMAKE_USE_PTHREADS_INIT) ++ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc " -lpthread") ++ endif () ++ if (WIN32) ++ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc " -lws2_32 -lShell32 -lAdvapi32") ++ endif () + install( + FILES + ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc +@@ -121,7 +141,6 @@ install( + COMPONENT + pkgconfig + ) +-endif (UNIX) + + # CMake config files + include(CMakePackageConfigHelpers) + diff --git a/externals/vcpkg/ports/libssh/0002-mingw_for_Android.patch b/externals/vcpkg/ports/libssh/0002-mingw_for_Android.patch new file mode 100755 index 000000000..963eb6f61 --- /dev/null +++ b/externals/vcpkg/ports/libssh/0002-mingw_for_Android.patch @@ -0,0 +1,13 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index a576cf7..1f6a048 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -359,7 +359,7 @@ if (WITH_VISIBILITY_HIDDEN) + set_target_properties(ssh PROPERTIES C_VISIBILITY_PRESET hidden) + endif (WITH_VISIBILITY_HIDDEN) + +-if (MINGW) ++if (MINGW AND NOT ANDROID) + target_link_libraries(ssh PRIVATE "-Wl,--enable-stdcall-fixup") + target_compile_definitions(ssh PRIVATE "_POSIX_SOURCE") + endif () diff --git a/externals/vcpkg/ports/libssh/0003-create_symlink_unix_only.patch b/externals/vcpkg/ports/libssh/0003-create_symlink_unix_only.patch new file mode 100755 index 000000000..20b2b6462 --- /dev/null +++ b/externals/vcpkg/ports/libssh/0003-create_symlink_unix_only.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 53e6bd5..51d76c5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -231,10 +231,11 @@ endif (WITH_SYMBOL_VERSIONING AND ABIMAP_FOUND) + add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source DEPENDS ${_SYMBOL_TARGET} VERBATIM) + + # Link compile database for clangd ++if(UNIX) + execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink + "${CMAKE_BINARY_DIR}/compile_commands.json" + "${CMAKE_SOURCE_DIR}/compile_commands.json") +- ++endif() + message(STATUS "********************************************") + message(STATUS "********** ${PROJECT_NAME} build options : **********") + diff --git a/externals/vcpkg/ports/libssh/portfile.cmake b/externals/vcpkg/ports/libssh/portfile.cmake new file mode 100755 index 000000000..77724f1db --- /dev/null +++ b/externals/vcpkg/ports/libssh/portfile.cmake @@ -0,0 +1,67 @@ +vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH + URL https://git.libssh.org/projects/libssh.git + REF 47fd6e56c1058dca54afee1638c11fb6ec41911d # REFERENCE VERSION 0.9.6 + PATCHES + 0001-export-pkgconfig-file.patch + 0002-mingw_for_Android.patch + 0003-create_symlink_unix_only.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + mbedtls WITH_MBEDTLS + zlib WITH_ZLIB +) + +if (VCPKG_TARGET_IS_ANDROID) + set(EXTRA_ARGS "-DWITH_SERVER=FALSE" + "-DWITH_PCAP=FALSE" + ) +endif () + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${EXTRA_ARGS} + ${FEATURE_OPTIONS} + -DWITH_EXAMPLES=OFF + -DUNIT_TESTING=OFF + -DCLIENT_TESTING=OFF + -DSERVER_TESTING=OFF + -DWITH_NACL=OFF + -DWITH_GSSAPI=OFF + -DWITH_SYMBOL_VERSIONING=OFF) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_copy_pdbs() +#Fixup pthread naming +if(NOT VCPKG_TARGET_IS_MINGW AND VCPKG_TARGET_IS_WINDOWS) + if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libssh.pc" "-lpthread" "-lpthreadVC3d") + endif() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libssh.pc" "-lpthread" "-lpthreadVC3") +endif() +vcpkg_fixup_pkgconfig() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/libssh/libssh.h" + "#ifdef LIBSSH_STATIC" + "#if 1" + ) +endif() + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/share/libssh/libssh-config.cmake" + ".dll" + ".lib" + ) +endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/libssh/usage b/externals/vcpkg/ports/libssh/usage new file mode 100755 index 000000000..39cb551c3 --- /dev/null +++ b/externals/vcpkg/ports/libssh/usage @@ -0,0 +1,4 @@ +The package libssh is compatible with built-in CMake targets: + + find_package(libssh CONFIG REQUIRED) + target_link_libraries(main PRIVATE ssh) diff --git a/externals/vcpkg/ports/libssh/vcpkg.json b/externals/vcpkg/ports/libssh/vcpkg.json new file mode 100755 index 000000000..d1f22ec07 --- /dev/null +++ b/externals/vcpkg/ports/libssh/vcpkg.json @@ -0,0 +1,70 @@ +{ + "name": "libssh", + "version": "0.9.6", + "port-version": 2, + "description": "libssh is a multiplatform C library implementing the SSHv2 protocol on client and server side", + "homepage": "https://www.libssh.org/", + "supports": "!(uwp | arm)", + "dependencies": [ + { + "name": "libssh", + "default-features": false, + "features": [ + "mbedtls" + ], + "platform": "android" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "crypto" + ], + "features": { + "crypto": { + "description": "Default crypto backend", + "dependencies": [ + { + "name": "libssh", + "features": [ + "mbedtls" + ] + } + ] + }, + "mbedtls": { + "description": "Crypto support (mbedTLS)", + "dependencies": [ + { + "name": "mbedtls", + "default-features": false + }, + { + "name": "mbedtls", + "features": [ + "pthreads" + ], + "platform": "!android" + } + ] + }, + "openssl": { + "description": "Crypto support (OpenSSL)", + "dependencies": [ + "openssl" + ] + }, + "zlib": { + "description": "libssh with zlib", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/libssh2/0001-Fix-UWP.patch b/externals/vcpkg/ports/libssh2/0001-Fix-UWP.patch new file mode 100755 index 000000000..8a7190f89 --- /dev/null +++ b/externals/vcpkg/ports/libssh2/0001-Fix-UWP.patch @@ -0,0 +1,64 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 6401acf..64de3e9 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -349,7 +349,7 @@ target_include_directories(libssh2 PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + # Check for the OS. + # Daniel's note: this should not be necessary and we need to work to + # get this removed. +-if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") ++if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows" OR ${CMAKE_SYSTEM_NAME} STREQUAL "WindowsStore") + target_compile_definitions(libssh2 PRIVATE LIBSSH2_WIN32) + elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + target_compile_definitions(libssh2 PRIVATE LIBSSH2_DARWIN) +diff --git a/src/agent.c b/src/agent.c +index c2ba422..f1799f8 100644 +--- a/src/agent.c ++++ b/src/agent.c +@@ -55,6 +55,10 @@ + #include + #endif + ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) ++#define IS_UWP 1 ++#endif /* #if defined(WINAPI_FAMILY) */ ++ + /* Requests from client to agent for protocol 1 key operations */ + #define SSH_AGENTC_REQUEST_RSA_IDENTITIES 1 + #define SSH_AGENTC_RSA_CHALLENGE 3 +@@ -254,7 +258,7 @@ struct agent_ops agent_ops_unix = { + }; + #endif /* PF_UNIX */ + +-#ifdef WIN32 ++#if defined(WIN32) && !defined(IS_UWP) + /* Code to talk to Pageant was taken from PuTTY. + * + * Portions copyright Robert de Bath, Joris van Rantwijk, Delian +@@ -362,8 +366,8 @@ static struct { + const char *name; + struct agent_ops *ops; + } supported_backends[] = { +-#ifdef WIN32 +- {"Pageant", &agent_ops_pageant}, ++#if defined(WIN32) && !defined(IS_UWP) ++ {"Pageant", &agent_ops_pageant}, + {"OpenSSH", &agent_ops_openssh}, + #endif /* WIN32 */ + #ifdef PF_UNIX +diff --git a/src/agent_win.c b/src/agent_win.c +--- a/src/agent_win.c ++++ b/src/agent_win.c +@@ -55,7 +55,11 @@ + #include + #endif + +-#ifdef WIN32 ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) ++#define IS_UWP 1 ++#endif /* #if defined(WINAPI_FAMILY) */ ++ ++#if defined(WIN32) && !defined(IS_UWP) + /* Code to talk to OpenSSH was taken and modified from the Win32 port of + * Portable OpenSSH by the PowerShell team. Commit + * 8ab565c53f3619d6a1f5ac229e212cad8a52852c of diff --git a/externals/vcpkg/ports/libssh2/0002-fix-macros.patch b/externals/vcpkg/ports/libssh2/0002-fix-macros.patch new file mode 100755 index 000000000..dc0f71933 --- /dev/null +++ b/externals/vcpkg/ports/libssh2/0002-fix-macros.patch @@ -0,0 +1,19 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2539607..eceb5a0 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -355,9 +355,12 @@ target_include_directories(libssh2 PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + # Daniel's note: this should not be necessary and we need to work to + # get this removed. + if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows" OR ${CMAKE_SYSTEM_NAME} STREQUAL "WindowsStore") +- target_compile_definitions(libssh2 PRIVATE LIBSSH2_WIN32) ++ target_compile_definitions(libssh2 PUBLIC LIBSSH2_WIN32) ++ if (BUILD_SHARED_LIBS) ++ target_compile_definitions(libssh2 PUBLIC _WINDLL PRIVATE LIBSSH2_LIBRARY) ++ endif() + elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") +- target_compile_definitions(libssh2 PRIVATE LIBSSH2_DARWIN) ++ target_compile_definitions(libssh2 PUBLIC LIBSSH2_DARWIN) + endif() + + if(MSVC) diff --git a/externals/vcpkg/ports/libssh2/0003-fix-openssl3.patch b/externals/vcpkg/ports/libssh2/0003-fix-openssl3.patch new file mode 100755 index 000000000..71aa61827 --- /dev/null +++ b/externals/vcpkg/ports/libssh2/0003-fix-openssl3.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/max_warnings.cmake b/cmake/max_warnings.cmake +index b176d30..e986461 100644 +--- a/cmake/max_warnings.cmake ++++ b/cmake/max_warnings.cmake +@@ -13,6 +13,8 @@ if(MSVC) + + # Disable broken warnings + add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996") + elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) + if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") diff --git a/externals/vcpkg/ports/libssh2/portfile.cmake b/externals/vcpkg/ports/libssh2/portfile.cmake new file mode 100755 index 000000000..d81f25812 --- /dev/null +++ b/externals/vcpkg/ports/libssh2/portfile.cmake @@ -0,0 +1,50 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libssh2/libssh2 + REF libssh2-1.10.0 + SHA512 615E28880695911F5700CC7AC3DDA6B894384C0B1D8B02B53C2EB58F1839F47211934A292F490AD7DDEF7E63F332E0EBF44F8E6334F64BE8D143C72032356C1F + HEAD_REF master + PATCHES + 0001-Fix-UWP.patch + 0002-fix-macros.patch + 0003-fix-openssl3.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + zlib ENABLE_ZLIB_COMPRESSION +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTING=OFF + ${FEATURE_OPTIONS} + OPTIONS_DEBUG + -DENABLE_DEBUG_LOGGING=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libssh2) + +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libssh2.h" "ifdef LIBSSH2_WIN32" "if 1") + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libssh2.h" "ifdef _WINDLL" "if 1") + else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libssh2.h" "ifdef _WINDLL" "if 0") + endif() +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +# Do not delete the entire share directory as it contains the *-config.cmake files +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libssh2/vcpkg.json b/externals/vcpkg/ports/libssh2/vcpkg.json new file mode 100755 index 000000000..157bf7243 --- /dev/null +++ b/externals/vcpkg/ports/libssh2/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "libssh2", + "version": "1.10.0", + "port-version": 4, + "description": "libssh2 is a client-side C library implementing the SSH2 protocol.", + "homepage": "https://www.libssh2.org", + "license": "BSD-3-Clause", + "dependencies": [ + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "zlib" + ], + "features": { + "zlib": { + "description": "Use compressing via zlib", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/libstemmer/CMakeLists.txt b/externals/vcpkg/ports/libstemmer/CMakeLists.txt new file mode 100755 index 000000000..787bb26ec --- /dev/null +++ b/externals/vcpkg/ports/libstemmer/CMakeLists.txt @@ -0,0 +1,22 @@ +cmake_minimum_required(VERSION 3.8.0) + +project(libstemmer) + +file(GLOB SNOWBALL_SOURCES + src_c/*.c + runtime/api.c + runtime/utilities.c + libstemmer/libstemmer.c +) + +add_library(stemmer ${SNOWBALL_SOURCES}) + +install( + TARGETS stemmer + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES include/libstemmer.h DESTINATION include) +endif() diff --git a/externals/vcpkg/ports/libstemmer/LICENSE b/externals/vcpkg/ports/libstemmer/LICENSE new file mode 100755 index 000000000..0c9e7c008 --- /dev/null +++ b/externals/vcpkg/ports/libstemmer/LICENSE @@ -0,0 +1,19 @@ +Snowball - License +Except where explicitly noted, all the software given out on this Snowball site is covered by the 3-clause BSD License: + +Copyright (c) 2001, Dr Martin Porter, +Copyright (c) 2002, Richard Boulton. +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +Essentially, all this means is that you can do what you like with the code, except claim another Copyright for it, or claim that it is issued under a different license. The software is also issued without warranties, which means that if anyone suffers through its use, they cannot come back and sue you. You also have to alert anyone to whom you give the Snowball software to the fact that it is covered by the BSD license. + +We have not bothered to insert the licensing arrangement into the text of the Snowball software. diff --git a/externals/vcpkg/ports/libstemmer/portfile.cmake b/externals/vcpkg/ports/libstemmer/portfile.cmake new file mode 100755 index 000000000..e28f90cc5 --- /dev/null +++ b/externals/vcpkg/ports/libstemmer/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_download_distfile(ARCHIVE + URLS "http://snowball.tartarus.org/dist/libstemmer_c.tgz" + FILENAME "libstemmer_c.tgz" + SHA512 9ab5b8bfd5b4071dbbd63d769e09fae3971b49ee441ad970aa95d90b3297f5ffc9deed1613d99974d1485bf3b69292663591957f52bbeddcadbf9d9a4af432f2 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_install_cmake() + +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libstemmer RENAME copyright) diff --git a/externals/vcpkg/ports/libstemmer/vcpkg.json b/externals/vcpkg/ports/libstemmer/vcpkg.json new file mode 100755 index 000000000..8dee5abc5 --- /dev/null +++ b/externals/vcpkg/ports/libstemmer/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libstemmer", + "version-string": "2017-9", + "port-version": 6, + "description": "Snowball is a small string processing language designed for creating stemming algorithms for use in Information Retrieval", + "homepage": "https://snowball.tartarus.org/" +} diff --git a/externals/vcpkg/ports/libstk/CMakeLists.txt b/externals/vcpkg/ports/libstk/CMakeLists.txt new file mode 100755 index 000000000..7d92632dc --- /dev/null +++ b/externals/vcpkg/ports/libstk/CMakeLists.txt @@ -0,0 +1,215 @@ +cmake_minimum_required(VERSION 3.0) +project(libstk) + +set(LIBSTK_SOURCES + src/ADSR.cpp + src/Asymp.cpp + src/BandedWG.cpp + src/BeeThree.cpp + src/BiQuad.cpp + src/Blit.cpp + src/BlitSaw.cpp + src/BlitSquare.cpp + src/BlowBotl.cpp + src/BlowHole.cpp + src/Bowed.cpp + src/Brass.cpp + src/Chorus.cpp + src/Clarinet.cpp + src/Delay.cpp + src/DelayA.cpp + src/DelayL.cpp + src/Drummer.cpp + src/Echo.cpp + src/Envelope.cpp + src/FileLoop.cpp + src/FileRead.cpp + src/FileWrite.cpp + src/FileWvIn.cpp + src/FileWvOut.cpp + src/Fir.cpp + src/Flute.cpp + src/FM.cpp + src/FMVoices.cpp + src/FormSwep.cpp + src/FreeVerb.cpp + src/Granulate.cpp + src/Guitar.cpp + src/HevyMetl.cpp + src/Iir.cpp + src/JCRev.cpp + src/LentPitShift.cpp + src/Makefile.in + src/Mandolin.cpp + src/Mesh2D.cpp + src/Messager.cpp + src/MidiFileIn.cpp + src/Modal.cpp + src/ModalBar.cpp + src/Modulate.cpp + src/Moog.cpp + src/Noise.cpp + src/NRev.cpp + src/OnePole.cpp + src/OneZero.cpp + src/PercFlut.cpp + src/Phonemes.cpp + src/PitShift.cpp + src/Plucked.cpp + src/PoleZero.cpp + src/PRCRev.cpp + src/Resonate.cpp + src/Rhodey.cpp + src/Sampler.cpp + src/Saxofony.cpp + src/Shakers.cpp + src/Simple.cpp + src/SineWave.cpp + src/SingWave.cpp + src/Sitar.cpp + src/Skini.cpp + src/Sphere.cpp + src/StifKarp.cpp + src/Stk.cpp + src/TapDelay.cpp + src/TubeBell.cpp + src/Twang.cpp + src/TwoPole.cpp + src/TwoZero.cpp + src/Voicer.cpp + src/VoicForm.cpp + src/Whistle.cpp + src/Wurley.cpp) + +set(LIBSTK_REALTIME_SOURCES + src/InetWvIn.cpp + src/InetWvOut.cpp + src/Mutex.cpp + src/RtAudio.cpp + src/RtMidi.cpp + src/RtWvIn.cpp + src/RtWvOut.cpp + src/Socket.cpp + src/TcpClient.cpp + src/TcpServer.cpp + src/Thread.cpp + src/UdpSocket.cpp +) + +set(LIBSTK_HEADERS + include/ADSR.h + include/Asymp.h + include/BandedWG.h + include/BeeThree.h + include/BiQuad.h + include/Blit.h + include/BlitSaw.h + include/BlitSquare.h + include/BlowBotl.h + include/BlowHole.h + include/Bowed.h + include/BowTable.h + include/Brass.h + include/Chorus.h + include/Clarinet.h + include/Cubic.h + include/Delay.h + include/DelayA.h + include/DelayL.h + include/Drummer.h + include/Echo.h + include/Effect.h + include/Envelope.h + include/FileLoop.h + include/FileRead.h + include/FileWrite.h + include/FileWvIn.h + include/FileWvOut.h + include/Filter.h + include/Fir.h + include/Flute.h + include/FM.h + include/FMVoices.h + include/FormSwep.h + include/FreeVerb.h + include/Function.h + include/Generator.h + include/Granulate.h + include/Guitar.h + include/HevyMetl.h + include/Iir.h + include/InetWvIn.h + include/InetWvOut.h + include/Instrmnt.h + include/JCRev.h + include/JetTable.h + include/LentPitShift.h + include/Mandolin.h + include/Mesh2D.h + include/Messager.h + include/MidiFileIn.h + include/Modal.h + include/ModalBar.h + include/Modulate.h + include/Moog.h + include/Mutex.h + include/Noise.h + include/NRev.h + include/OnePole.h + include/OneZero.h + include/PercFlut.h + include/Phonemes.h + include/PitShift.h + include/Plucked.h + include/PoleZero.h + include/PRCRev.h + include/ReedTable.h + include/Resonate.h + include/Rhodey.h + include/RtAudio.h + include/RtMidi.h + include/RtWvIn.h + include/RtWvOut.h + include/Sampler.h + include/Saxofony.h + include/Shakers.h + include/Simple.h + include/SineWave.h + include/SingWave.h + include/Sitar.h + include/Skini.h + include/SKINImsg.h + include/SKINItbl.h + include/Socket.h + include/Sphere.h + include/StifKarp.h + include/Stk.h + include/TapDelay.h + include/TcpClient.h + include/TcpServer.h + include/Thread.h + include/TubeBell.h + include/Twang.h + include/TwoPole.h + include/TwoZero.h + include/UdpSocket.h + include/Vector3D.h + include/Voicer.h + include/VoicForm.h + include/Whistle.h + include/Wurley.h + include/WvIn.h + include/WvOut.h +) + +add_library(libstk ${LIBSTK_SOURCES}) +target_include_directories(libstk PRIVATE include PUBLIC $) +set_target_properties(libstk PROPERTIES PUBLIC_HEADER "${LIBSTK_HEADERS}") +target_compile_definitions(libstk PRIVATE __LITTLE_ENDIAN__) + +install(TARGETS libstk EXPORT unofficial-libstk-config + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin + PUBLIC_HEADER DESTINATION include/stk) +install(EXPORT unofficial-libstk-config NAMESPACE unofficial::libstk:: DESTINATION share/unofficial-libstk) diff --git a/externals/vcpkg/ports/libstk/portfile.cmake b/externals/vcpkg/ports/libstk/portfile.cmake new file mode 100755 index 000000000..ffb9eeb8b --- /dev/null +++ b/externals/vcpkg/ports/libstk/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO thestk/stk + REF 4.6.1 + SHA512 61d4db7b4a45446e231dedc13e139cb488e2ce805278f0b20aa95e69ddb1fa9be549ab5f1fe24c69aa865ebc2940d5fba6e3819a1a7fb1d68e236131fcfb4cac + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-libstk TARGET_PATH share/unofficial-libstk) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libstk RENAME copyright) + +file(GLOB RAWFILES ${SOURCE_PATH}/rawwaves/*.raw) +file(COPY ${RAWFILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/libstk/rawwaves) diff --git a/externals/vcpkg/ports/libstk/vcpkg.json b/externals/vcpkg/ports/libstk/vcpkg.json new file mode 100755 index 000000000..0c4d30731 --- /dev/null +++ b/externals/vcpkg/ports/libstk/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "libstk", + "version-string": "4.6.1", + "port-version": 1, + "description": "The Synthesis ToolKit in C++ (STK) is a set of open source audio signal processing and algorithmic synthesis classes written in the C++ programming language." +} diff --git a/externals/vcpkg/ports/libsvm/CMakeLists.txt b/externals/vcpkg/ports/libsvm/CMakeLists.txt new file mode 100755 index 000000000..560b05350 --- /dev/null +++ b/externals/vcpkg/ports/libsvm/CMakeLists.txt @@ -0,0 +1,62 @@ +cmake_minimum_required(VERSION 3.14) + +project(libsvm LANGUAGES C CXX) + +include(GNUInstallDirs) + +option(SVM_BUILD_TOOLS "Build SVM tools" OFF) + +set(libsvm_sources svm.cpp) +if (WIN32) + list(APPEND libsvm_sources svm.def) +endif () + +add_library(libsvm ${libsvm_sources}) + +target_compile_definitions( + libsvm + PRIVATE + $<$: + _CRT_SECURE_NO_WARNINGS + strdup=_strdup + > +) + +target_include_directories( + libsvm + PUBLIC + $ + $ +) + +set_target_properties(libsvm PROPERTIES PUBLIC_HEADER svm.h) + +install(TARGETS libsvm EXPORT unofficial-libsvm-config) + +install( + EXPORT unofficial-libsvm-config + NAMESPACE unofficial::libsvm:: + DESTINATION share/unofficial-libsvm + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +) + +if (SVM_BUILD_TOOLS) + add_executable(svm-predict svm-predict.c) + target_link_libraries(svm-predict PRIVATE libsvm) + + add_executable(svm-scale svm-scale.c) + target_link_libraries(svm-scale PRIVATE libsvm) + + add_executable(svm-train svm-train.c) + target_link_libraries(svm-train PRIVATE libsvm) + + install(TARGETS svm-predict svm-scale svm-train) + + if (WIN32) + add_executable(svm-toy svm-toy/windows/svm-toy.cpp) + target_link_libraries(svm-toy PRIVATE libsvm) + set_target_properties(svm-toy PROPERTIES WIN32_EXECUTABLE ON) + + install(TARGETS svm-toy) + endif () +endif () diff --git a/externals/vcpkg/ports/libsvm/portfile.cmake b/externals/vcpkg/ports/libsvm/portfile.cmake new file mode 100755 index 000000000..674014c0f --- /dev/null +++ b/externals/vcpkg/ports/libsvm/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cjlin1/libsvm + REF v325 + SHA512 D5323B128DFCDC7F64B2161E70FA7999C0A93D47C90B366BE066AA01EA92B5817F04812DEF2E05469DEE1F26C6A83DA5E50EEAE3F50B4062D9B24AC0944C6203 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools SVM_BUILD_TOOLS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DSVM_BUILD_TOOLS=OFF + OPTIONS_RELEASE + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME "unofficial-${PORT}" CONFIG_PATH "share/unofficial-${PORT}") + +if("tools" IN_LIST FEATURES) + if(WIN32) + vcpkg_copy_tools(TOOL_NAMES svm-predict svm-scale svm-toy svm-train AUTO_CLEAN) + else() + vcpkg_copy_tools(TOOL_NAMES svm-predict svm-scale svm-train AUTO_CLEAN) + endif() +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libsvm/vcpkg.json b/externals/vcpkg/ports/libsvm/vcpkg.json new file mode 100755 index 000000000..d99a9112d --- /dev/null +++ b/externals/vcpkg/ports/libsvm/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "libsvm", + "version": "3.25", + "description": "A library for Support Vector Machines.", + "homepage": "https://www.csie.ntu.edu.tw/~cjlin/libsvm/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "build libsvm CLI tools." + } + } +} diff --git a/externals/vcpkg/ports/libtasn1/msvc_fixes.patch b/externals/vcpkg/ports/libtasn1/msvc_fixes.patch new file mode 100755 index 000000000..0554ff60a --- /dev/null +++ b/externals/vcpkg/ports/libtasn1/msvc_fixes.patch @@ -0,0 +1,86 @@ +diff --git a/src/asn1Coding.c b/src/asn1Coding.c +index 86c1d07..6fcfc4d 100644 +--- a/src/asn1Coding.c ++++ b/src/asn1Coding.c +@@ -23,7 +23,12 @@ + #include + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif ++#ifdef _MSC_VER ++#include ++#endif + #include + #include + +diff --git a/src/asn1Decoding.c b/src/asn1Decoding.c +index c6f192e..3e4e21d 100644 +--- a/src/asn1Decoding.c ++++ b/src/asn1Decoding.c +@@ -23,7 +23,12 @@ + #include + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif ++#ifdef _MSC_VER ++#include ++#endif + #include + #include + #include +diff --git a/src/asn1Parser.c b/src/asn1Parser.c +index b6844a8..445c716 100644 +--- a/src/asn1Parser.c ++++ b/src/asn1Parser.c +@@ -23,7 +23,12 @@ + #include + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif ++#ifdef _MSC_VER ++#include ++#endif + #include + #include + +diff --git a/src/benchmark.c b/src/benchmark.c +index 010d58e..6c613df 100644 +--- a/src/benchmark.c ++++ b/src/benchmark.c +@@ -21,9 +21,16 @@ + #include + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif ++#ifdef _MSC_VER ++#include ++#endif + #include "benchmark.h" + + int benchmark_must_finish = 0; +diff --git a/src/benchmark.h b/src/benchmark.h +index 3272649..6b6bf32 100644 +--- a/src/benchmark.h ++++ b/src/benchmark.h +@@ -21,7 +21,9 @@ + # define BENCHMARK_H + + #include ++#ifndef _MSC_VER + #include ++#endif + #include + #include + #if defined _WIN32 diff --git a/externals/vcpkg/ports/libtasn1/portfile.cmake b/externals/vcpkg/ports/libtasn1/portfile.cmake new file mode 100755 index 000000000..902dff196 --- /dev/null +++ b/externals/vcpkg/ports/libtasn1/portfile.cmake @@ -0,0 +1,52 @@ +set(VERSION 4.17.0) + +if(VCPKG_TARGET_IS_WINDOWS) + set(PATCHES msvc_fixes.patch) +endif() + +vcpkg_download_distfile(ARCHIVE + URLS "https://ftp.gnu.org/gnu/libtasn1/libtasn1-${VERSION}.tar.gz" + FILENAME "libtasn1-${VERSION}.tar.gz" + SHA512 9cbd920196d1e4c8f5aa613259cded2510d40edb583ce20cc2702e2dee9bf32bee85a159c74600ffbebc2af2787e28ed0fe0adf15fc46839283747f4fe166d3d +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${VERSION} + PATCHES + ${PATCHES} +) + +set(EXTRA_OPTS "") +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + # $LIBS is an environment variable that vcpkg already pre-populated with some libraries. + # We need to re-purpose it when passing LIBS option to make to avoid overriding the vcpkg's own list. + list(APPEND EXTRA_OPTS "LIBS=-lgettimeofday -lgetopt \$LIBS") +else() + # restore the default ac_cv_prog_cc_g flags, otherwise it fails to compile + set(VCPKG_C_FLAGS "-g -O2") + set(VCPKG_CXX_FLAGS "-g -O2") +endif() + +# The upstream doesn't add this macro to the configure +if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND EXTRA_OPTS "CFLAGS=\$CFLAGS -DASN1_STATIC") +endif() + +set(ENV{GTKDOCIZE} true) +vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + --disable-doc + --disable-gtk-doc + --disable-gcc-warnings + ${EXTRA_OPTS} +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools" "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libtasn1/vcpkg.json b/externals/vcpkg/ports/libtasn1/vcpkg.json new file mode 100755 index 000000000..fd021c21c --- /dev/null +++ b/externals/vcpkg/ports/libtasn1/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libtasn1", + "version": "4.17.0", + "port-version": 3, + "description": "A secure communications library implementing the SSL, TLS and DTLS protocols", + "homepage": "https://www.gnutls.org/", + "supports": "!uwp", + "dependencies": [ + { + "name": "getopt", + "platform": "windows & !mingw" + }, + { + "name": "gettimeofday", + "platform": "windows & !mingw" + } + ] +} diff --git a/externals/vcpkg/ports/libtcod/portfile.cmake b/externals/vcpkg/ports/libtcod/portfile.cmake new file mode 100755 index 000000000..d185df19f --- /dev/null +++ b/externals/vcpkg/ports/libtcod/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libtcod/libtcod + REF 1.20.1 + SHA512 bef3751dd1b190769163ff7c188479fe100d425fa98d3f0f97a3a81045fe0f0c24690b64bcde29f7af1eb7fd34915371223146598b1f0cab173e69a78c1dfc76 + HEAD_REF develop + PATCHES + stb-headers.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} + -DCMAKE_INSTALL_INCLUDEDIR=${CURRENT_PACKAGES_DIR}/include + -DLIBTCOD_SDL2=find_package + -DLIBTCOD_ZLIB=find_package + -DLIBTCOD_GLAD=find_package + -DLIBTCOD_LODEPNG=find_package + -DLIBTCOD_UTF8PROC=vcpkg + -DLIBTCOD_STB=vcpkg +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/externals/vcpkg/ports/libtcod/stb-headers.patch b/externals/vcpkg/ports/libtcod/stb-headers.patch new file mode 100755 index 000000000..742ae773a --- /dev/null +++ b/externals/vcpkg/ports/libtcod/stb-headers.patch @@ -0,0 +1,11 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -91,7 +91,7 @@ + message("Will be vendored: stb") + target_include_directories(${PROJECT_NAME} PRIVATE "vendor/") + elseif(LIBTCOD_STB STREQUAL "vcpkg") +- find_path(STB_INCLUDE_DIRS "stb.h") ++ find_path(STB_INCLUDE_DIRS stb_ds.h) + target_include_directories(${PROJECT_NAME} PRIVATE ${STB_INCLUDE_DIRS}) + else() + message(FATAL_ERROR "Unknown option for LIBTCOD_STB: '${LIBTCOD_STB}'") diff --git a/externals/vcpkg/ports/libtcod/vcpkg.json b/externals/vcpkg/ports/libtcod/vcpkg.json new file mode 100755 index 000000000..29c5e4036 --- /dev/null +++ b/externals/vcpkg/ports/libtcod/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "libtcod", + "version": "1.20.1", + "port-version": 1, + "maintainers": "Kyle Benesch <4b796c65+github@gmail.com>", + "description": "Common algorithms and tools for roguelikes.", + "homepage": "https://github.com/libtcod/libtcod", + "documentation": "https://libtcod.readthedocs.io/en/latest/", + "license": "BSD-3-Clause", + "dependencies": [ + "glad", + "lodepng-c", + "sdl2", + "stb", + "utf8proc", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/libtess2/CMakeLists.txt b/externals/vcpkg/ports/libtess2/CMakeLists.txt new file mode 100755 index 000000000..7924eea10 --- /dev/null +++ b/externals/vcpkg/ports/libtess2/CMakeLists.txt @@ -0,0 +1,35 @@ +cmake_minimum_required(VERSION 3.21) + +project(libtess2) + +# Tesselator +add_library(libtess2 STATIC) + +target_sources(libtess2 PRIVATE + "${CMAKE_CURRENT_SOURCE_DIR}/Source/bucketalloc.c" + "${CMAKE_CURRENT_SOURCE_DIR}/Source/dict.c" + "${CMAKE_CURRENT_SOURCE_DIR}/Source/geom.c" + "${CMAKE_CURRENT_SOURCE_DIR}/Source/mesh.c" + "${CMAKE_CURRENT_SOURCE_DIR}/Source/priorityq.c" + "${CMAKE_CURRENT_SOURCE_DIR}/Source/sweep.c" + "${CMAKE_CURRENT_SOURCE_DIR}/Source/tess.c") + +target_include_directories(libtess2 PUBLIC + "$" + "$" +) +set_target_properties(libtess2 PROPERTIES LINKER_LANGUAGE CXX) + +install(TARGETS libtess2 EXPORT unofficial-libtess2-config) + +install( + FILES "${CMAKE_CURRENT_SOURCE_DIR}/Include/tesselator.h" + TYPE INCLUDE +) + +install( + EXPORT unofficial-libtess2-config + NAMESPACE unofficial::libtess2:: + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/unofficial-libtess2" + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +) diff --git a/externals/vcpkg/ports/libtess2/portfile.cmake b/externals/vcpkg/ports/libtess2/portfile.cmake new file mode 100755 index 000000000..7566e0946 --- /dev/null +++ b/externals/vcpkg/ports/libtess2/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO memononen/libtess2 + REF fc52516467dfa124bdd967c15c7cf9faf02a34ca + SHA512 2b3efb8934d1da8c1b3f0a79139275e89d9187e1e881c699f8623993165eae04068ce5927fe2a5e21e1298b79ffc57eb3e9bbc4bc07872d757a91189bc5f1cce + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME "unofficial-${PORT}" + CONFIG_PATH "lib/cmake/unofficial-${PORT}" +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/externals/vcpkg/ports/libtess2/usage b/externals/vcpkg/ports/libtess2/usage new file mode 100755 index 000000000..34d5ddea2 --- /dev/null +++ b/externals/vcpkg/ports/libtess2/usage @@ -0,0 +1,4 @@ +The package libtess2 provides CMake targets: + +find_package(unofficial-libtess2 CONFIG REQUIRED) +target_link_libraries(main PUBLIC unofficial::libtess2::libtess2) diff --git a/externals/vcpkg/ports/libtess2/vcpkg.json b/externals/vcpkg/ports/libtess2/vcpkg.json new file mode 100755 index 000000000..ce54d7815 --- /dev/null +++ b/externals/vcpkg/ports/libtess2/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "libtess2", + "version-date": "2021-12-27", + "description": "Game and tools oriented refactored version of GLU tesselator.", + "homepage": "https://github.com/memononen/libtess2", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libtheora/0001-fix-uwp.patch b/externals/vcpkg/ports/libtheora/0001-fix-uwp.patch new file mode 100755 index 000000000..b6dc8779d --- /dev/null +++ b/externals/vcpkg/ports/libtheora/0001-fix-uwp.patch @@ -0,0 +1,53 @@ +From 47eb8d07a8caaa6cc1e6e906a7cd5b44ee0fb624 Mon Sep 17 00:00:00 2001 +From: Mikhail Paulyshka +Date: Thu, 27 Jul 2017 04:24:36 +0300 +Subject: [PATCH] remove redundant assignments + +--- + lib/tokenize.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/lib/tokenize.c b/lib/tokenize.c +index 57b7aa8..3f53fb5 100644 +--- a/lib/tokenize.c ++++ b/lib/tokenize.c +@@ -487,11 +487,11 @@ int oc_enc_tokenize_ac(oc_enc_ctx *_enc,int _pli,ptrdiff_t _fragi, + zzj=64; + for(zzi=OC_MINI(_zzi,63);zzi>0;zzi--){ + ogg_uint32_t best_cost; +- int best_bits=best_bits; +- int best_next=best_next; +- int best_token=best_token; +- int best_eb=best_eb; +- int best_qc=best_qc; ++ int best_bits; ++ int best_next; ++ int best_token; ++ int best_eb; ++ int best_qc; + ogg_uint32_t d2; + int dq; + int qc_m; +@@ -1091,8 +1091,8 @@ void oc_enc_tokenize_dc_frag_list(oc_enc_ctx *_enc,int _pli, + int neobs1; + int token; + int eb; +- int token1=token1; +- int eb1=eb1; ++ int token1; ++ int eb1; + /*Return immediately if there are no coded fragments; otherwise we'd flush + any trailing EOB run into the AC 1 list and never read it back out.*/ + if(_ncoded_fragis<=0)return; +@@ -1328,7 +1328,7 @@ void oc_enc_tokenize_finish(oc_enc_ctx *_enc){ + int new_eb; + int zzj; + int plj; +- ptrdiff_t ti=ti; ++ ptrdiff_t ti; + int run_count; + /*Make sure this coefficient has tokens at all.*/ + if(_enc->ndct_tokens[pli][zzi]<=0)continue; +-- +2.12.2.windows.2 + diff --git a/externals/vcpkg/ports/libtheora/CMakeLists.txt b/externals/vcpkg/ports/libtheora/CMakeLists.txt new file mode 100755 index 000000000..0d4aed76e --- /dev/null +++ b/externals/vcpkg/ports/libtheora/CMakeLists.txt @@ -0,0 +1,114 @@ +cmake_minimum_required(VERSION 3.0) +project(theora LANGUAGES C) + +set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}") +FIND_PACKAGE(Ogg REQUIRED) + +file(GLOB HEADERS + "include/theora/codec.h" + "include/theora/theora.h" + "include/theora/theoradec.h" + "include/theora/theoraenc.h" +) + +set(LIBTHEORA_COMMON + "lib/apiwrapper.c" + "lib/bitpack.c" + "lib/dequant.c" + "lib/fragment.c" + "lib/idct.c" + "lib/info.c" + "lib/internal.c" + "lib/state.c" + "lib/quant.c" + + "lib/x86_vc/mmxfrag.c" + "lib/x86_vc/mmxidct.c" + "lib/x86_vc/mmxstate.c" + "lib/x86_vc/x86cpu.c" + "lib/x86_vc/x86state.c" +) + +set(LIBTHEORA_ENC + "lib/analyze.c" + "lib/encapiwrapper.c" + "lib/encfrag.c" + "lib/encinfo.c" + "lib/encode.c" + "lib/enquant.c" + "lib/fdct.c" + "lib/huffenc.c" + "lib/mathops.c" + "lib/mcenc.c" + "lib/rate.c" + "lib/tokenize.c" + + "lib/x86_vc/mmxencfrag.c" + "lib/x86_vc/mmxfdct.c" + "lib/x86_vc/x86enc.c" +) + +set(LIBTHEORA_DEC + "lib/decapiwrapper.c" + "lib/decinfo.c" + "lib/decode.c" + "lib/huffdec.c" +) + +add_definitions(-D_CRT_SECURE_NO_DEPRECATE) +add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) + +option(USE_X86 "Use x86 optimization" OFF) +if(USE_X86) + add_definitions(-DOC_X86_ASM) +endif() + +if (BUILD_SHARED_LIBS) + add_definitions(-DLIBTHEORA_EXPORTS) +endif() + +add_library(theora-common OBJECT ${LIBTHEORA_COMMON} ${HEADERS}) +target_link_libraries(theora-common PUBLIC Ogg::ogg) +target_include_directories(theora-common PUBLIC $ $) +add_library(theora-enc OBJECT ${LIBTHEORA_ENC} ${HEADERS}) +target_link_libraries(theora-enc PUBLIC Ogg::ogg) +target_include_directories(theora-enc PUBLIC $ $) +add_library(theora-dec OBJECT ${LIBTHEORA_DEC} ${HEADERS}) +target_link_libraries(theora-dec PUBLIC Ogg::ogg) +target_include_directories(theora-dec PUBLIC $ $) + +add_library(theora $ $ $ "libtheora.def") +target_link_libraries(theora PUBLIC Ogg::ogg) +target_include_directories(theora PUBLIC $ $) + +add_library(theoraenc $ $ "win32/xmingw32/libtheoraenc-all.def") +target_link_libraries(theoraenc PUBLIC Ogg::ogg) +target_include_directories(theoraenc PUBLIC $ $) + +add_library(theoradec $ $ "win32/xmingw32/libtheoradec-all.def") +target_link_libraries(theoradec PUBLIC Ogg::ogg) +target_include_directories(theoradec PUBLIC $ $) + +include(CMakePackageConfigHelpers) + +configure_package_config_file(unofficial-theora-config.cmake.in unofficial-theora-config.cmake + INSTALL_DESTINATION "lib/unofficial-theora") + +install(FILES ${HEADERS} DESTINATION include/theora) + +install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-theora-config.cmake" + DESTINATION "lib/unofficial-theora" +) + +install(TARGETS theora theoraenc theoradec + EXPORT unofficial-theora-targets + RUNTIME DESTINATION bin + LIBRARY DESTINATION bin + ARCHIVE DESTINATION lib +) + +install(EXPORT unofficial-theora-targets + NAMESPACE unofficial::theora:: + DESTINATION "lib/unofficial-theora" +) diff --git a/externals/vcpkg/ports/libtheora/libtheora.def b/externals/vcpkg/ports/libtheora/libtheora.def new file mode 100755 index 000000000..9755b81e7 --- /dev/null +++ b/externals/vcpkg/ports/libtheora/libtheora.def @@ -0,0 +1,61 @@ +EXPORTS +; Old alpha API + theora_version_string + theora_version_number + theora_decode_header + theora_decode_init + theora_decode_packetin + theora_decode_YUVout + theora_control + theora_packet_isheader + theora_packet_iskeyframe + theora_granule_shift + theora_granule_frame + theora_granule_time + theora_info_init + theora_info_clear + theora_clear + theora_comment_init + theora_comment_add + theora_comment_add_tag + theora_comment_query + theora_comment_query_count + theora_comment_clear +; New theora-exp API + th_version_string + th_version_number + th_decode_headerin + th_decode_alloc + th_setup_free + th_decode_ctl + th_decode_packetin + th_decode_ycbcr_out + th_decode_free + th_packet_isheader + th_packet_iskeyframe + th_granule_frame + th_granule_time + th_info_init + th_info_clear + th_comment_init + th_comment_add + th_comment_add_tag + th_comment_query + th_comment_query_count + th_comment_clear +; Old alpha API + theora_encode_init + theora_encode_YUVin + theora_encode_packetout + theora_encode_header + theora_encode_comment + theora_encode_tables +; New theora-exp API + th_encode_alloc + th_encode_ctl + th_encode_flushheader + th_encode_ycbcr_in + th_encode_packetout + th_encode_free + TH_VP31_QUANT_INFO + TH_VP31_HUFF_CODES diff --git a/externals/vcpkg/ports/libtheora/portfile.cmake b/externals/vcpkg/ports/libtheora/portfile.cmake new file mode 100755 index 000000000..8c88e261b --- /dev/null +++ b/externals/vcpkg/ports/libtheora/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xiph/theora + REF fa5707d68c2a4338d58aa8b6afc95539ba89fecb + SHA512 e33da23a17e93709dfe4421b512cedbd9aab0d706f5650e0436f9c8e1cde76b902c3338d46750bb86d83e1bceb111ee84e90df36fb59b5c2e7f7aee1610752b2 + HEAD_REF master + PATCHES + 0001-fix-uwp.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/libtheora.def DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/unofficial-theora-config.cmake.in DESTINATION ${SOURCE_PATH}) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(THEORA_X86_OPT ON) +else() + set(THEORA_X86_OPT OFF) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DUSE_X86=${THEORA_X86_OPT} +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/unofficial-theora TARGET_PATH share/unofficial-theora) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libtheora) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/libtheora/LICENSE ${CURRENT_PACKAGES_DIR}/share/libtheora/copyright) diff --git a/externals/vcpkg/ports/libtheora/unofficial-theora-config.cmake.in b/externals/vcpkg/ports/libtheora/unofficial-theora-config.cmake.in new file mode 100755 index 000000000..af1974f46 --- /dev/null +++ b/externals/vcpkg/ports/libtheora/unofficial-theora-config.cmake.in @@ -0,0 +1,3 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-theora-targets.cmake") diff --git a/externals/vcpkg/ports/libtheora/vcpkg.json b/externals/vcpkg/ports/libtheora/vcpkg.json new file mode 100755 index 000000000..58167e7d1 --- /dev/null +++ b/externals/vcpkg/ports/libtheora/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libtheora", + "version-string": "1.2.0alpha1-20170719", + "port-version": 3, + "description": "Theora is a free and open video compression format from the Xiph.org Foundation.", + "homepage": "https://github.com/xiph/theora", + "dependencies": [ + "libogg" + ] +} diff --git a/externals/vcpkg/ports/libtins/find-pcap_static.patch b/externals/vcpkg/ports/libtins/find-pcap_static.patch new file mode 100755 index 000000000..7134b0c2b --- /dev/null +++ b/externals/vcpkg/ports/libtins/find-pcap_static.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/Modules/FindPCAP.cmake b/cmake/Modules/FindPCAP.cmake +index 388b30b..f5264c3 100644 +--- a/cmake/Modules/FindPCAP.cmake ++++ b/cmake/Modules/FindPCAP.cmake +@@ -38,7 +38,7 @@ if (${CMAKE_SIZEOF_VOID_P} EQUAL 8 AND WIN32) + endif () + + find_library(PCAP_LIBRARY +- NAMES pcap wpcap ++ NAMES pcap wpcap pcap_static NAMES_PER_DIR + HINTS ${HINT_DIR} + ) + diff --git a/externals/vcpkg/ports/libtins/fix-source-writes.patch b/externals/vcpkg/ports/libtins/fix-source-writes.patch new file mode 100755 index 000000000..251b4f2f7 --- /dev/null +++ b/externals/vcpkg/ports/libtins/fix-source-writes.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1e13def..eda8d68 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -228,8 +228,9 @@ ENDIF(DOXYGEN_FOUND) + # Configuration file + CONFIGURE_FILE( + "${PROJECT_SOURCE_DIR}/include/tins/config.h.in" +- "${PROJECT_SOURCE_DIR}/include/tins/config.h" ++ "${PROJECT_BINARY_DIR}/include/tins/config.h" + ) ++INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/include") + + IF (NOT CMAKE_INSTALL_LIBDIR) + SET(CMAKE_INSTALL_LIBDIR lib) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e07772e..94bc8bf 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -82,7 +82,7 @@ set(HEADERS + ${LIBTINS_INCLUDE_DIR}/tins/handshake_capturer.h + ${LIBTINS_INCLUDE_DIR}/tins/stp.h + ${LIBTINS_INCLUDE_DIR}/tins/pppoe.h +- ${LIBTINS_INCLUDE_DIR}/tins/config.h ++ ${PROJECT_BINARY_DIR}/include/tins/config.h + ${LIBTINS_INCLUDE_DIR}/tins/constants.h + ${LIBTINS_INCLUDE_DIR}/tins/crypto.h + ${LIBTINS_INCLUDE_DIR}/tins/cxxstd.h +@@ -229,6 +229,7 @@ MACRO(INSTALL_HEADERS_WITH_DIRECTORY HEADER_LIST) + FOREACH(HEADER ${HEADERS}) + # Extract directory name and remove leading '../' + get_filename_component(DIR ${HEADER} PATH) ++ string(REPLACE "${PROJECT_BINARY_DIR}/" "" DIR ${DIR}) + STRING(REGEX REPLACE "^\\.\\.\\/" "" DIR ${DIR}) + INSTALL(FILES ${HEADER} DESTINATION ${DIR}) + ENDFOREACH(HEADER) diff --git a/externals/vcpkg/ports/libtins/portfile.cmake b/externals/vcpkg/ports/libtins/portfile.cmake new file mode 100755 index 000000000..62cbde451 --- /dev/null +++ b/externals/vcpkg/ports/libtins/portfile.cmake @@ -0,0 +1,48 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mfontanini/libtins + REF v4.3 + SHA512 29d606004fe9a440c9a53eede42fd5c6dbd049677d2cca2c5cfd26311ee2ca4c64ca3e665fbc81efd5bfab5577a5181ed0754c617e139317d9ae0cabba05aff7 + HEAD_REF master + PATCHES + fix-source-writes.patch + find-pcap_static.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBTINS_BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DLIBTINS_BUILD_SHARED=${LIBTINS_BUILD_SHARED} + -DLIBTINS_ENABLE_CXX11=1 + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=1 +) + +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) +else() + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libtins) +endif() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/libtins/libtinsConfig.cmake" "set(LIBTINS_INCLUDE_DIRS \"${SOURCE_PATH}/include\")" [[ +get_filename_component(LIBTINS_CMAKE_DIR "${LIBTINS_CMAKE_DIR}" PATH) +get_filename_component(LIBTINS_CMAKE_DIR "${LIBTINS_CMAKE_DIR}" PATH) +set(LIBTINS_INCLUDE_DIRS "${LIBTINS_CMAKE_DIR}/include") +]]) + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/libtins/libtinsConfig.cmake" "\${LIBTINS_CMAKE_DIR}/libtinsTargets.cmake" "\${CMAKE_CURRENT_LIST_DIR}/libtinsTargets.cmake") + +if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/tins/macros.h" "!defined(TINS_STATIC)" "1") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/tins/macros.h" "!defined(TINS_STATIC)" "0") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libtins" RENAME copyright) diff --git a/externals/vcpkg/ports/libtins/vcpkg.json b/externals/vcpkg/ports/libtins/vcpkg.json new file mode 100755 index 000000000..c9a7daa96 --- /dev/null +++ b/externals/vcpkg/ports/libtins/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "libtins", + "version": "4.3", + "port-version": 6, + "description": "High-level, multiplatform C++ network packet sniffing and crafting library", + "license": "BSD-2-Clause", + "supports": "!uwp", + "dependencies": [ + "boost-any", + "boost-icl", + "libpcap", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libtomcrypt/portfile.cmake b/externals/vcpkg/ports/libtomcrypt/portfile.cmake new file mode 100755 index 000000000..e547d8375 --- /dev/null +++ b/externals/vcpkg/ports/libtomcrypt/portfile.cmake @@ -0,0 +1,95 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libtom/libtomcrypt + REF v1.18.2 + SHA512 53accb4f92077ff1c52102bece270e77c497e599c392aa0bf4dbc173b6789e7e4f1012d8b5f257c438764197cb7bac8ba409a9d4e3a70e69bec5863b9495329e + HEAD_REF develop +) + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + + if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + set(CRTFLAG "/MD") + else() + set(CRTFLAG "/MT") + endif() + + # Make sure we start from a clean slate + vcpkg_execute_build_process( + COMMAND nmake -f ${SOURCE_PATH}/makefile.msvc clean + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME clean-${TARGET_TRIPLET}-dbg + ) + + #Debug Build + vcpkg_execute_build_process( + COMMAND nmake -f ${SOURCE_PATH}/makefile.msvc "CFLAGS=${CRTFLAG}d /DUSE_LTM /DLTM_DESC \"/I${CURRENT_INSTALLED_DIR}/include\"" + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME build-${TARGET_TRIPLET}-dbg + ) + + file(INSTALL + ${SOURCE_PATH}/tomcrypt.lib + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + ) + + # Clean up necessary to rebuild without debug symbols + vcpkg_execute_build_process( + COMMAND nmake -f ${SOURCE_PATH}/makefile.msvc clean + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME clean-${TARGET_TRIPLET}-rel + ) + + #Release Build + vcpkg_execute_build_process( + COMMAND nmake -f ${SOURCE_PATH}/makefile.msvc "CFLAGS=${CRTFLAG} /Ox /DNDEBUG /DUSE_LTM /DLTM_DESC \"/I${CURRENT_INSTALLED_DIR}/include\"" + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME build-${TARGET_TRIPLET}-rel + ) + + file(INSTALL + ${SOURCE_PATH}/tomcrypt.lib + DESTINATION ${CURRENT_PACKAGES_DIR}/lib + ) + + file(INSTALL + ${SOURCE_PATH}/src/headers/ + DESTINATION ${CURRENT_PACKAGES_DIR}/include + ) +else() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(MAKE_FILE "makefile.shared") + else() + set(MAKE_FILE "makefile") + endif() + + set(ENV{CFLAGS} "-fPIC -DUSE_LTM -DLTM_DESC -I${CURRENT_INSTALLED_DIR}/include") + + vcpkg_execute_build_process( + COMMAND make -f ${MAKE_FILE} clean + WORKING_DIRECTORY ${SOURCE_PATH} + ) + vcpkg_execute_build_process( + COMMAND make -j${VCPKG_CONCURRENCY} -f ${MAKE_FILE} PREFIX=${CURRENT_PACKAGES_DIR}/debug LTC_DEBUG=1 install + WORKING_DIRECTORY ${SOURCE_PATH} + ) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + + vcpkg_execute_build_process( + COMMAND make -f ${MAKE_FILE} clean + WORKING_DIRECTORY ${SOURCE_PATH} + ) + vcpkg_execute_build_process( + COMMAND make -j${VCPKG_CONCURRENCY} -f ${MAKE_FILE} PREFIX=${CURRENT_PACKAGES_DIR} install + WORKING_DIRECTORY ${SOURCE_PATH} + ) + +endif() + +#Copy license +file( + INSTALL + ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright +) \ No newline at end of file diff --git a/externals/vcpkg/ports/libtomcrypt/vcpkg.json b/externals/vcpkg/ports/libtomcrypt/vcpkg.json new file mode 100755 index 000000000..4607ff076 --- /dev/null +++ b/externals/vcpkg/ports/libtomcrypt/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libtomcrypt", + "version-string": "1.18.2", + "port-version": 2, + "description": "LibTomCrypt is a fairly comprehensive, modular and portable cryptographic toolkit that provides developers with a vast array of well known published block ciphers, one-way hash functions, chaining modes, pseudo-random number generators, public key cryptography and a plethora of other routines.", + "homepage": "https://www.libtom.net/LibTomCrypt/", + "dependencies": [ + "libtommath" + ] +} diff --git a/externals/vcpkg/ports/libtommath/portfile.cmake b/externals/vcpkg/ports/libtommath/portfile.cmake new file mode 100755 index 000000000..746ead449 --- /dev/null +++ b/externals/vcpkg/ports/libtommath/portfile.cmake @@ -0,0 +1,91 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libtom/libtommath + REF v1.2.0 + SHA512 500bce4467d6cdb0b014e6c66d3b994a8d63b51475db6c3cd77c15c8368fbab4e3b5c458fcd5b35838b74c457a33c15b42d2356964f5ef2a0bd31fd544735c9a + HEAD_REF develop +) + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + + if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + set(CRTFLAG "/MD") + else() + set(CRTFLAG "/MT") + endif() + + # Make sure we start from a clean slate + vcpkg_execute_build_process( + COMMAND nmake -f ${SOURCE_PATH}/makefile.msvc clean + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME clean-${TARGET_TRIPLET}-dbg + ) + + #Debug Build + vcpkg_execute_build_process( + COMMAND nmake -f ${SOURCE_PATH}/makefile.msvc CFLAGS="${CRTFLAG}d" + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME build-${TARGET_TRIPLET}-dbg + ) + + file(INSTALL + ${SOURCE_PATH}/tommath.lib + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + ) + + # Clean up necessary to rebuild without debug symbols + vcpkg_execute_build_process( + COMMAND nmake -f ${SOURCE_PATH}/makefile.msvc clean + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME clean-${TARGET_TRIPLET}-rel + ) + + vcpkg_execute_build_process( + COMMAND nmake -f ${SOURCE_PATH}/makefile.msvc CFLAGS="${CRTFLAG}" + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME build-${TARGET_TRIPLET}-rel + ) + + file(INSTALL + ${SOURCE_PATH}/tommath.lib + DESTINATION ${CURRENT_PACKAGES_DIR}/lib + ) + + file(INSTALL + ${SOURCE_PATH}/tommath.h + DESTINATION ${CURRENT_PACKAGES_DIR}/include + ) +else() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(MAKE_FILE "makefile.shared") + else() + set(MAKE_FILE "makefile") + endif() + + vcpkg_execute_build_process( + COMMAND make -f ${MAKE_FILE} clean + WORKING_DIRECTORY ${SOURCE_PATH} + ) + + vcpkg_execute_build_process( + COMMAND make -j${VCPKG_CONCURRENCY} -f ${MAKE_FILE} PREFIX=${CURRENT_PACKAGES_DIR}/debug COMPILE_DEBUG=1 install + WORKING_DIRECTORY ${SOURCE_PATH} + ) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + + vcpkg_execute_build_process( + COMMAND make -f ${MAKE_FILE} clean + WORKING_DIRECTORY ${SOURCE_PATH} + ) + + vcpkg_execute_build_process( + COMMAND make -j${VCPKG_CONCURRENCY} -f ${MAKE_FILE} PREFIX=${CURRENT_PACKAGES_DIR} install + WORKING_DIRECTORY ${SOURCE_PATH} + ) +endif() + +file(INSTALL + ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright +) \ No newline at end of file diff --git a/externals/vcpkg/ports/libtommath/vcpkg.json b/externals/vcpkg/ports/libtommath/vcpkg.json new file mode 100755 index 000000000..e6472aa8f --- /dev/null +++ b/externals/vcpkg/ports/libtommath/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libtommath", + "version-string": "1.2.0", + "port-version": 2, + "description": "LibTomMath is a free open source portable number theoretic multiple-precision integer library written entirely in C.", + "homepage": "https://www.libtom.net/LibTomMath/" +} diff --git a/externals/vcpkg/ports/libtorrent/portfile.cmake b/externals/vcpkg/ports/libtorrent/portfile.cmake new file mode 100755 index 000000000..645fca72b --- /dev/null +++ b/externals/vcpkg/ports/libtorrent/portfile.cmake @@ -0,0 +1,90 @@ +if(VCPKG_TARGET_IS_WINDOWS) + # Building python bindings is currently broken on Windows + if("python" IN_LIST FEATURES) + message(FATAL_ERROR "The python feature is currently broken on Windows") + endif() + if(VCPKG_CRT_LINKAGE STREQUAL "static") + set(_static_runtime ON) + endif() +endif() + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + deprfun deprecated-functions + examples build_examples + iconv iconv + python python-bindings + test build_tests + tools build_tools +) + +if("python" IN_LIST FEATURES) + vcpkg_find_acquire_program(PYTHON3) + get_filename_component(PYTHON3_PATH ${PYTHON3} DIRECTORY) + vcpkg_add_to_path(${PYTHON3_PATH}) + file(GLOB BOOST_PYTHON_LIB "${CURRENT_INSTALLED_DIR}/lib/*boost_python*") + string(REGEX REPLACE ".*(python)([0-9])([0-9]+).*" "\\1\\2\\3" _boost-python-module-name "${BOOST_PYTHON_LIB}") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO arvidn/libtorrent + REF e9bbf16bdd899f42aef0f0c2b1f214de2c15ac92 # v2.0.6 + SHA512 5bc93be6b1bf5208f1bfc10ffe515e20face41ebf0f9cf7afc8f1c03addc42a88f92ec79a2c2a1d1a4fd0a3014b752d68e7e62cd86349694636b79da31ed8e08 + HEAD_REF RC_2_0 +) + +vcpkg_from_github( + OUT_SOURCE_PATH TRYSIGNAL_SOURCE_PATH + REPO arvidn/try_signal + REF 751a7e5a5be14892bcfdff1e63c653bcbf71cf39 + SHA512 4ccea4f67a79acf49a9943d8aec3999475357d7ad3cfc7b37f0e1c4527f8f4536993c6f6241bb3eb166a1dc939133a4f3b35197f9e47fb2ac9c713b64f8cb96d + HEAD_REF master +) + +vcpkg_from_github( + OUT_SOURCE_PATH ASIO_GNUTLS_SOURCE_PATH + REPO paullouisageneau/boost-asio-gnutls + REF a57d4d36923c5fafa9698e14be16b8bc2913700a + SHA512 1e093dd4e999cce9c6d74f1d4c2d20f73512258b83505c307c7d53b8c7ed15626a8e90c8e6a6280827aafa069bc233c0c6f4c9276f1c332e4b141c7c350c47c0 + HEAD_REF master +) + +vcpkg_from_github( + OUT_SOURCE_PATH LIB_SIMULATOR_SOURCE_PATH + REPO arvidn/libsimulator + REF 64fb5b4fde1879abc09c018604d57e485a12e999 + SHA512 20b57eb436127028339528f34a9db7e7149d2c5d86149114444205370482d3f5284e76493f2fbc1c6904175e6482671bfcaeb98d0bee7d399e546abef02f32f3 + HEAD_REF master +) + +file(COPY ${TRYSIGNAL_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/deps/try_signal) +file(COPY ${ASIO_GNUTLS_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/deps/asio-gnutls) +file(COPY ${LIB_SIMULATOR_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/simulation/libsimulator) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -Dboost-python-module-name=${_boost-python-module-name} + -Dstatic_runtime=${_static_runtime} + -DPython3_USE_STATIC_LIBS=ON +) + + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME LibtorrentRasterbar CONFIG_PATH lib/cmake/LibtorrentRasterbar) + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# Do not duplicate include files +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/cmake") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +vcpkg_fixup_pkgconfig() \ No newline at end of file diff --git a/externals/vcpkg/ports/libtorrent/vcpkg.json b/externals/vcpkg/ports/libtorrent/vcpkg.json new file mode 100755 index 000000000..faf336141 --- /dev/null +++ b/externals/vcpkg/ports/libtorrent/vcpkg.json @@ -0,0 +1,64 @@ +{ + "name": "libtorrent", + "version": "2.0.6", + "maintainers": "Arvid Norberg ", + "description": "An efficient feature complete C++ BitTorrent implementation", + "homepage": "https://libtorrent.org", + "documentation": "https://libtorrent.org/reference.html", + "license": "BSD-2-Clause", + "supports": "!uwp & !(windows & arm)", + "dependencies": [ + "boost-asio", + "boost-chrono", + "boost-config", + "boost-crc", + "boost-date-time", + "boost-iterator", + "boost-logic", + "boost-multi-index", + "boost-multiprecision", + "boost-pool", + "boost-random", + "boost-scope-exit", + "boost-system", + "boost-variant", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "iconv" + ], + "features": { + "deprfun": { + "description": "build with deprecated functions enabled" + }, + "examples": { + "description": "build the examples in the examples directory" + }, + "iconv": { + "description": "build with libiconv", + "dependencies": [ + "libiconv" + ] + }, + "python": { + "description": "build the python bindings in bindings/python directory", + "dependencies": [ + "boost-python" + ] + }, + "test": { + "description": "build the libtorrent tests" + }, + "tools": { + "description": "build the tools in the tools directory" + } + } +} diff --git a/externals/vcpkg/ports/libu2f-server/CMakeLists.txt b/externals/vcpkg/ports/libu2f-server/CMakeLists.txt new file mode 100755 index 000000000..8bff87243 --- /dev/null +++ b/externals/vcpkg/ports/libu2f-server/CMakeLists.txt @@ -0,0 +1,31 @@ +cmake_minimum_required(VERSION 3.5) + +project(libu2f-server C) + +file(GLOB_RECURSE LIBU2F_SERVER_HEADERS u2f-server/*.h) +file(GLOB_RECURSE LIBU2F_SERVER_SOURCE u2f-server/*.c) + +add_library(libu2f-server ${LIBU2F_SERVER_SOURCE}) + +target_include_directories(libu2f-server PUBLIC $ $) +target_compile_definitions(libu2f-server PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE) +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996") + +find_package(json-c CONFIG REQUIRED) +find_package(OpenSSL REQUIRED) +target_link_libraries(libu2f-server PRIVATE OpenSSL::SSL OpenSSL::Crypto json-c::json-c) + +install(TARGETS libu2f-server + EXPORT libu2f-serverConfig + RUNTIME DESTINATION "bin" + ARCHIVE DESTINATION "lib" + LIBRARY DESTINATION "lib" +) + +INSTALL(FILES ${LIBU2F_SERVER_HEADERS} DESTINATION "include/libu2f-server") + +install(EXPORT libu2f-serverConfig + FILE libu2f-serverConfig.cmake + NAMESPACE libu2f-server:: + DESTINATION "share/libu2f-server" +) \ No newline at end of file diff --git a/externals/vcpkg/ports/libu2f-server/portfile.cmake b/externals/vcpkg/ports/libu2f-server/portfile.cmake new file mode 100755 index 000000000..6893718db --- /dev/null +++ b/externals/vcpkg/ports/libu2f-server/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Yubico/libu2f-server + REF libu2f-server-1.1.0 + SHA512 085f8e7d74c1efb347747b8930386f18ba870f668f82e9bd479c9f8431585c5dc7f95b2f6b82bdd3a6de0c06f8cb2fbf51c363ced54255a936ab96536158ee59 + HEAD_REF master + PATCHES + windows.patch + strndup-fix.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/u2f-server-version.h DESTINATION ${SOURCE_PATH}/u2f-server) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + ) + +vcpkg_install_cmake() + +# The include file must be patched after the build has completed, because the source files use the wrong subdirectory name! +vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/libu2f-server/u2f-server.h + "#include " + "#include " +) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_copy_pdbs() + +# Handle copyright +configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/libu2f-server/strndup-fix.patch b/externals/vcpkg/ports/libu2f-server/strndup-fix.patch new file mode 100755 index 000000000..f5b7ffd8a --- /dev/null +++ b/externals/vcpkg/ports/libu2f-server/strndup-fix.patch @@ -0,0 +1,31 @@ +diff --git a/u2f-server/core.c b/u2f-server/core.c +index 294c94b..746932b 100644 +--- a/u2f-server/core.c ++++ b/u2f-server/core.c +@@ -211,7 +211,7 @@ u2fs_rc u2fs_set_keyHandle(u2fs_ctx_t * ctx, const char *keyHandle) + ctx->keyHandle = NULL; + } + +- ctx->keyHandle = strndup(keyHandle, strlen(keyHandle)); ++ ctx->keyHandle = strdup(keyHandle); + + if (ctx->keyHandle == NULL) + return U2FS_MEMORY_ERROR; +@@ -726,7 +726,7 @@ static u2fs_rc decode_clientData(const char *clientData, char **output) + fprintf(stderr, "clientData: %s\n", data); + } + +- *output = strndup(data, strlen(data)); ++ *output = strdup(data); + + free(data); + data = NULL; +@@ -870,7 +870,7 @@ u2fs_rc u2fs_registration_verify(u2fs_ctx_t * ctx, const char *response, + goto failure; + + u2fs_EC_KEY_t *key_ptr; +- (*output)->keyHandle = strndup(buf, strlen(buf)); ++ (*output)->keyHandle = strdup(buf); + + rc = decode_user_key(user_public_key, &key_ptr); + if (rc != U2FS_OK) diff --git a/externals/vcpkg/ports/libu2f-server/u2f-server-version.h b/externals/vcpkg/ports/libu2f-server/u2f-server-version.h new file mode 100755 index 000000000..b38ccac81 --- /dev/null +++ b/externals/vcpkg/ports/libu2f-server/u2f-server-version.h @@ -0,0 +1,94 @@ +/* +* Copyright (c) 2014 Yubico AB +* All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are +* met: +* +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* +* * Redistributions in binary form must reproduce the above +* copyright notice, this list of conditions and the following +* disclaimer in the documentation and/or other materials provided +* with the distribution. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef U2F_SERVER_VERSION_H +#define U2F_SERVER_VERSION_H + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * U2FS_VERSION_STRING + * + * Pre-processor symbol with a string that describe the header file + * version number. Used together with u2fs_check_version() to verify + * header file and run-time library consistency. + */ +#define U2FS_VERSION_STRING "1.1.0" + +/** + * U2FS_VERSION_NUMBER + * + * Pre-processor symbol with a hexadecimal value describing the header + * file version number. For example, when the header version is 1.2.3 + * this symbol will have the value 0x01020300. The last two digits + * are only used between public releases, and will otherwise be 00. + */ +#define U2FS_VERSION_NUMBER 0x01010000 + +/** + * U2FS_VERSION_MAJOR + * + * Pre-processor symbol with a decimal value that describe the major + * level of the header file version number. For example, when the + * header version is 1.2.3 this symbol will be 1. + */ +#define U2FS_VERSION_MAJOR 1 + +/** + * U2FS_VERSION_MINOR + * + * Pre-processor symbol with a decimal value that describe the minor + * level of the header file version number. For example, when the + * header version is 1.2.3 this symbol will be 2. + */ +#define U2FS_VERSION_MINOR 1 + +/** + * U2FS_VERSION_PATCH + * + * Pre-processor symbol with a decimal value that describe the patch + * level of the header file version number. For example, when the + * header version is 1.2.3 this symbol will be 3. + */ +#define U2FS_VERSION_PATCH 0 + +#ifndef TRUE +#define TRUE 1 +#endif + +#ifndef FALSE +#define FALSE 0 +#endif + +#ifdef __cplusplus +} +#endif +#endif diff --git a/externals/vcpkg/ports/libu2f-server/vcpkg.json b/externals/vcpkg/ports/libu2f-server/vcpkg.json new file mode 100755 index 000000000..aade166cb --- /dev/null +++ b/externals/vcpkg/ports/libu2f-server/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libu2f-server", + "version": "1.1.0", + "port-version": 4, + "description": "Yubico Universal 2nd Factor (U2F) Server C Library", + "homepage": "https://developers.yubico.com/libu2f-server/", + "supports": "(x86 | x64) & windows", + "dependencies": [ + "json-c", + "openssl" + ] +} diff --git a/externals/vcpkg/ports/libu2f-server/windows.patch b/externals/vcpkg/ports/libu2f-server/windows.patch new file mode 100755 index 000000000..2cc68ec9b --- /dev/null +++ b/externals/vcpkg/ports/libu2f-server/windows.patch @@ -0,0 +1,41 @@ +diff --git a/u2f-server/cdecode.c b/u2f-server/cdecode.c +index 6fff114..dc05ca5 100644 +--- a/u2f-server/cdecode.c ++++ b/u2f-server/cdecode.c +@@ -5,7 +5,7 @@ This is part of the libb64 project, and has been placed in the public domain. + For details, see http://sourceforge.net/projects/libb64 + */ + +-#include ++#include "b64/cdecode.h" + + int base64_decode_value(char value_in) + { +diff --git a/u2f-server/cencode.c b/u2f-server/cencode.c +index eebb24a..f3b7fa4 100644 +--- a/u2f-server/cencode.c ++++ b/u2f-server/cencode.c +@@ -5,7 +5,7 @@ This is part of the libb64 project, and has been placed in the public domain. + For details, see http://sourceforge.net/projects/libb64 + */ + +-#include ++#include "b64/cencode.h" + + const int CHARS_PER_LINE = 72; + +diff --git a/u2f-server/core.c b/u2f-server/core.c +index da440ec..294c94b 100644 +--- a/u2f-server/core.c ++++ b/u2f-server/core.c +@@ -30,8 +30,7 @@ + #include "internal.h" + + #include +-#include +-#include ++#include + #include "crypto.h" + #include "b64/cencode.h" + #include "b64/cdecode.h" + \ No newline at end of file diff --git a/externals/vcpkg/ports/libudis86/CMakeLists.txt b/externals/vcpkg/ports/libudis86/CMakeLists.txt new file mode 100755 index 000000000..fb47dd7f9 --- /dev/null +++ b/externals/vcpkg/ports/libudis86/CMakeLists.txt @@ -0,0 +1,59 @@ +cmake_minimum_required (VERSION 3.9) + +project (udis86) + +if (MSVC) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) +endif() + +set( + lib_sources + libudis86/decode.c + libudis86/itab.c + libudis86/syn-att.c + libudis86/syn-intel.c + libudis86/syn.c + libudis86/udis86.c +) + +set(lib_headers + libudis86/decode.h + libudis86/itab.h + libudis86/extern.h + libudis86/syn.h + libudis86/types.h + libudis86/udint.h +) + +set(cli_srcs udcli/udcli.c) + +include_directories(.) + +add_library(libudis86 ${lib_sources}) + +if(BUILD_SHARED_LIBS) + target_compile_definitions(libudis86 PRIVATE -D_USRDLL) +endif() + +add_executable(udcli ${cli_srcs}) +target_link_libraries(udcli libudis86) + + +install( + TARGETS libudis86 + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_TOOLS) + install ( + TARGETS udcli + RUNTIME DESTINATION tools/libudis86 + ) +endif() + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES ${lib_headers} DESTINATION include/libudis86) + install(FILES udis86.h DESTINATION include) +endif() diff --git a/externals/vcpkg/ports/libudis86/fix-macbuild.patch b/externals/vcpkg/ports/libudis86/fix-macbuild.patch new file mode 100755 index 000000000..c9bf1a932 --- /dev/null +++ b/externals/vcpkg/ports/libudis86/fix-macbuild.patch @@ -0,0 +1,37 @@ +diff --git a/libudis86/udis86.c b/libudis86/udis86.c +index e039c4e..8459012 100644 +--- a/libudis86/udis86.c ++++ b/libudis86/udis86.c +@@ -34,6 +34,10 @@ + # endif + #endif /* !__UD_STANDALONE__ */ + ++#if defined(__APPLE__) ++# include ++#endif ++ + static void ud_inp_init(struct ud *u); + + /* ============================================================================= +diff --git a/udcli/udcli.c b/udcli/udcli.c +index 9b044ca..ad1e4ab 100644 +--- a/udcli/udcli.c ++++ b/udcli/udcli.c +@@ -27,13 +27,11 @@ + #include + #include + #include +-#ifdef _MSC_VER +-#include "..\udis86.h" +-#define PACKAGE_STRING "udis86 pre-1.8" +-#else + #include +-#include +-#endif ++#define PACKAGE_STRING "udis86 pre-1.8" ++#ifdef HAVE_CONFIG_H ++# include ++#endif /* HAVE_CONFIG_H */ + + #if defined(__APPLE__) + # define FMT64 "ll" diff --git a/externals/vcpkg/ports/libudis86/portfile.cmake b/externals/vcpkg/ports/libudis86/portfile.cmake new file mode 100755 index 000000000..991b8039c --- /dev/null +++ b/externals/vcpkg/ports/libudis86/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO vmt/udis86 + REF 56ff6c87c11de0ffa725b14339004820556e343d + SHA512 7a98333f9310f5f0466294bd980f03f9269c118a7557832015c59a7b6349a0eeab5642e0e6598d0be76d71f5d2d566d8b8af0ec75c26bdcff45646d60ff18e3a + HEAD_REF master + PATCHES fix-macbuild.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_find_acquire_program(PYTHON2) + +vcpkg_execute_required_process( + COMMAND "${PYTHON2}" "${SOURCE_PATH}/scripts/ud_itab.py" "${SOURCE_PATH}/docs/x86/optable.xml" "${SOURCE_PATH}/libudis86/" + WORKING_DIRECTORY "${SOURCE_PATH}" + LOGNAME python-${TARGET_TRIPLET}-generate-sources +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON + -DDISABLE_INSTALL_TOOLS=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libudis86/vcpkg.json b/externals/vcpkg/ports/libudis86/vcpkg.json new file mode 100755 index 000000000..c642dfaf4 --- /dev/null +++ b/externals/vcpkg/ports/libudis86/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "libudis86", + "version-string": "2018-01-28-56ff6c87", + "port-version": 2, + "description": "Disassembler Library for x86 and x86-64", + "homepage": "https://github.com/vmt/udis86", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libudns/ignore_unknown_options.patch b/externals/vcpkg/ports/libudns/ignore_unknown_options.patch new file mode 100755 index 000000000..4adbcf28c --- /dev/null +++ b/externals/vcpkg/ports/libudns/ignore_unknown_options.patch @@ -0,0 +1,26 @@ +diff --git a/configure b/configure +index dda98b3ab..6f5f8a3c8 100644 +--- a/configure ++++ b/configure +@@ -25,10 +25,9 @@ fi + enable() { + opt=`echo "$1" | sed 's/^--[^-]*-//'` + case "$opt" in +- ipv6) ;; +- *) echo "configure: unrecognized option \`$1'" >&2; exit 1;; ++ ipv6) eval enable_$opt=$2 ;; ++ *) echo "configure: unrecognized option \`$1'" >&2;; + esac +- eval enable_$opt=$2 + } + + while [ $# -gt 0 ]; do +@@ -50,7 +49,7 @@ Optional features (all enabled by default if system supports a feature): + EOF + exit 0 + ;; +- *) echo "configure: unknown option \`$1'" >&2; exit 1 ;; ++ *) echo "configure: unknown option \`$1'" >&2;; + esac + shift + done diff --git a/externals/vcpkg/ports/libudns/portfile.cmake b/externals/vcpkg/ports/libudns/portfile.cmake new file mode 100755 index 000000000..a1169d438 --- /dev/null +++ b/externals/vcpkg/ports/libudns/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ortclib/udns + REF udns_0_4 + SHA512 4df8def718c75872536d42a757237d6c8e0afce8a53aedd7fea73814dc5cf8b5d6c9ae8f01a8cfc76864aa8293c172f08953a6750a66749ba19a3721bb4cf2ec + HEAD_REF master + PATCHES ignore_unknown_options.patch +) + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + COPY_SOURCE +) + +vcpkg_build_make() +vcpkg_fixup_pkgconfig() +# Install +if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) + file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libudns.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +endif() +if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) + file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libudns.a DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +endif() + +file(INSTALL ${SOURCE_PATH}/udns.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libudns/vcpkg.json b/externals/vcpkg/ports/libudns/vcpkg.json new file mode 100755 index 000000000..f1b9679a3 --- /dev/null +++ b/externals/vcpkg/ports/libudns/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libudns", + "version-string": "0.4", + "port-version": 4, + "description": "The DNS library, udns, implements thread-safe stub DNS resolver functionality, which may be used both traditional, syncronous way and asyncronously, with application-supplied event loop.", + "homepage": "https://github.com/ortclib/udns", + "supports": "!windows & !osx" +} diff --git a/externals/vcpkg/ports/libui/001-fix-cmake.patch b/externals/vcpkg/ports/libui/001-fix-cmake.patch new file mode 100755 index 000000000..3d206584b --- /dev/null +++ b/externals/vcpkg/ports/libui/001-fix-cmake.patch @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c7193fbb..50c997f8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -152,8 +152,7 @@ add_subdirectory("common") + add_subdirectory("${_OSNAME}") + add_library(libui ${_LIBUI_SOURCES}) + target_include_directories(libui +- PUBLIC . +- PRIVATE ${_LIBUI_INCLUEDIRS}) ++ PUBLIC $) + target_compile_definitions(libui + PRIVATE ${_LIBUI_DEFS}) + # cmake produces this for us by default but only for shared libraries +@@ -229,10 +228,30 @@ macro(_add_exec _name) + # TODOfor some reason these don't propagate + if(NOT WIN32) + target_include_directories(${_name} +- PUBLIC .) ++ PUBLIC $) + target_compile_options(${_name} + PUBLIC ${_COMMON_CFLAGS}) + endif() + endmacro() + add_subdirectory("test") + add_subdirectory("examples") ++ ++if(BUILD_SHARED_LIBS) ++ install(TARGETS ${PROJECT_NAME} ++ EXPORT ${PROJECT_NAME}-config ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++else() ++ install(TARGETS ${PROJECT_NAME} ++ EXPORT ${PROJECT_NAME}-config ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++endif() ++ ++install(EXPORT ${PROJECT_NAME}-config ++ FILE unofficial-${PROJECT_NAME}-config.cmake ++ NAMESPACE unofficial::libui:: ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++) ++ ++install(FILES ui.h DESTINATION include) diff --git a/externals/vcpkg/ports/libui/002-fix-macosx-build.patch b/externals/vcpkg/ports/libui/002-fix-macosx-build.patch new file mode 100755 index 000000000..a5b91c7a2 --- /dev/null +++ b/externals/vcpkg/ports/libui/002-fix-macosx-build.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 50c997f..a23b84d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -16,7 +16,13 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) + # TODO figure out what other variables must be set with CACHE + # TODO figure out if FORCE is needed here + # TODO figure out whether STRING "" is best or if something else is better; also what FORCE does because I forget and later I say it's needed +-set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8" CACHE STRING "" FORCE) ++ ++# VCPKG PATCH NOTE: Fix build on MacOS ++# Due to a bug in CMake (https://gitlab.kitware.com/cmake/cmake/issues/18396) we change CMAKE_OSX_DEPLOYMENT_TARGET to "10.9". ++# See the discussion here: ++# * https://github.com/andlabs/libui/issues/422 ++# * https://github.com/andlabs/libui/issues/457 ++set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "" FORCE) + + # we want to disable incremental linking + # see also: diff --git a/externals/vcpkg/ports/libui/003-fix-system-link.patch b/externals/vcpkg/ports/libui/003-fix-system-link.patch new file mode 100755 index 000000000..42dd23c0d --- /dev/null +++ b/externals/vcpkg/ports/libui/003-fix-system-link.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a23b84d..9892dfc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -172,6 +172,12 @@ if(BUILD_SHARED_LIBS) + target_link_libraries(libui + PRIVATE ${_LIBUI_LIBS}) + endif() ++ ++if (APPLE) ++ find_library(Foundation Foundation) ++ find_library(AppKit AppKit) ++ target_link_libraries(libui PUBLIC $<$:${Foundation};${AppKit}>) ++endif() + # TODO INTERFACE libs don't inherit to grandhcildren? + # on Windows the linker for static libraries is different; don't give it the flags + if(BUILD_SHARED_LIBS) diff --git a/externals/vcpkg/ports/libui/portfile.cmake b/externals/vcpkg/ports/libui/portfile.cmake new file mode 100755 index 000000000..d975cdfe8 --- /dev/null +++ b/externals/vcpkg/ports/libui/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO andlabs/libui + REF 7138276ccfbde94873cb6e2db65642adcbd2ee19 + SHA512 3a9fb27d0c376479f58ba2fc5be3579efa5f462776a7e725313b92413ce78f3ca60897e63b580c419eeaee2cd2101de2be1ee5af80a547ef433c6284a3053d45 + HEAD_REF master + PATCHES + "001-fix-cmake.patch" + "002-fix-macosx-build.patch" + "003-fix-system-link.patch" +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libui TARGET_PATH share/unofficial-libui) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/libui/vcpkg.json b/externals/vcpkg/ports/libui/vcpkg.json new file mode 100755 index 000000000..5d7ff38eb --- /dev/null +++ b/externals/vcpkg/ports/libui/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libui", + "version-date": "2018-11-03", + "port-version": 2, + "description": "Simple and portable (but not inflexible) native GUI library in C.", + "homepage": "https://github.com/andlabs/libui" +} diff --git a/externals/vcpkg/ports/libunibreak/CMakeLists.txt b/externals/vcpkg/ports/libunibreak/CMakeLists.txt new file mode 100755 index 000000000..f1924c278 --- /dev/null +++ b/externals/vcpkg/ports/libunibreak/CMakeLists.txt @@ -0,0 +1,44 @@ +cmake_minimum_required(VERSION 3.8.0) + +project(libunibreak) + +set(libunibreak_srcs + src/linebreak.c + src/linebreakdata.c + src/linebreakdef.c + src/wordbreak.c + src/wordbreakdata.c + src/graphemebreak.c + src/graphemebreakdata.c + src/emojidef.c + src/unibreakbase.c + src/unibreakdef.c +) + +include_directories(src) + +add_library(unibreak ${libunibreak_srcs}) + +install( + TARGETS unibreak + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_HEADERS) + install( + FILES + src/emojidef.h + src/graphemebreak.h + src/graphemebreakdef.h + src/linebreak.h + src/linebreakdef.h + src/test_skips.h + src/unibreakbase.h + src/unibreakdef.h + src/wordbreak.h + src/wordbreakdef.h + DESTINATION include + ) +endif() diff --git a/externals/vcpkg/ports/libunibreak/libunibreak-config.cmake.in b/externals/vcpkg/ports/libunibreak/libunibreak-config.cmake.in new file mode 100755 index 000000000..0a4746360 --- /dev/null +++ b/externals/vcpkg/ports/libunibreak/libunibreak-config.cmake.in @@ -0,0 +1,32 @@ +# For old projects where the minimum CMake version is lower than 3.3. +cmake_policy(SET CMP0057 NEW) +include(CMakeFindDependencyMacro) + +if(TARGET libunibreak) + return() +endif() + +# Compute the installation prefix relative to this file. +get_filename_component(_INSTALL_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_INSTALL_DIR "${_INSTALL_DIR}" PATH) +get_filename_component(_INSTALL_DIR "${_INSTALL_DIR}" PATH) +if(_INSTALL_DIR STREQUAL "/") + set(_INSTALL_DIR "") +endif() + +add_library(unibreak INTERFACE IMPORTED GLOBAL) +add_library(libunibreak::libunibreak ALIAS unibreak) + +find_library(LIBUNIBREAK_LIBRARY_DEBUG NAMES unibreak PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) +if(LIBUNIBREAK_LIBRARY_DEBUG) + target_link_libraries(unibreak INTERFACE $<$:${LIBUNIBREAK_LIBRARY_DEBUG}>) +endif() + +find_library(LIBUNIBREAK_LIBRARY_RELEASE NAMES unibreak PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) +target_link_libraries(unibreak INTERFACE $<$>:${LIBUNIBREAK_LIBRARY_RELEASE}>) + +set(LIBUNIBREAK_LIBRARY libunibreak::libunibreak PARENT_SCOPE) +set(LIBUNIBREAK_LIBRARIES libunibreak::libunibreak PARENT_SCOPE) +set(LIBUNIBREAK_INCLUDE_DIR "${_INSTALL_DIR}/include" PARENT_SCOPE) + +target_include_directories(unibreak INTERFACE ${_INSTALL_DIR}/include) \ No newline at end of file diff --git a/externals/vcpkg/ports/libunibreak/portfile.cmake b/externals/vcpkg/ports/libunibreak/portfile.cmake new file mode 100755 index 000000000..c73851614 --- /dev/null +++ b/externals/vcpkg/ports/libunibreak/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO adah1972/libunibreak + REF libunibreak_5_0 # libunibreak_5_0 + SHA512 909c12cf5df92f0374050fc7a0ef9e91bc1efe6a5dc5a80f4e2c81a507f1228ecaba417c3ee001e11b2422024bea68cc14eb66e08360ae69f830cdaa18764484 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_cmake_install() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/libunibreak-config.cmake.in" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/libunibreak-config.cmake" @ONLY) + +file(INSTALL ${SOURCE_PATH}/LICENCE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libunibreak RENAME copyright) diff --git a/externals/vcpkg/ports/libunibreak/vcpkg.json b/externals/vcpkg/ports/libunibreak/vcpkg.json new file mode 100755 index 000000000..3c4a6f438 --- /dev/null +++ b/externals/vcpkg/ports/libunibreak/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libunibreak", + "version": "5.0", + "port-version": 1, + "description": "an implementation of the line breaking and word breaking algorithms as described in [Unicode Standard Annex 14] 1 and [Unicode Standard Annex 29] 2. Check the project's [home page] 3 for up-to-date information.", + "homepage": "https://github.com/adah1972/libunibreak", + "license": "zlib-acknowledgement", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libunifex/fix-compile-error.patch b/externals/vcpkg/ports/libunifex/fix-compile-error.patch new file mode 100755 index 000000000..10d578fee --- /dev/null +++ b/externals/vcpkg/ports/libunifex/fix-compile-error.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/unifex_env.cmake b/cmake/unifex_env.cmake +index cb99ae4..9825532 100644 +--- a/cmake/unifex_env.cmake ++++ b/cmake/unifex_env.cmake +@@ -21,8 +21,8 @@ endif() + + if (MSVC) + # warning level 3 and all warnings as errors +- add_compile_options(/W3 /WX) ++ add_compile_options(/W3 /WX /Zc:externConstexpr /EHsc) + else() + # lots of warnings and all warnings as errors +- add_compile_options(-Wall -Wextra -pedantic -Werror) ++ add_compile_options(-Wall -Wextra -pedantic) + endif() diff --git a/externals/vcpkg/ports/libunifex/portfile.cmake b/externals/vcpkg/ports/libunifex/portfile.cmake new file mode 100755 index 000000000..9ea2fcec6 --- /dev/null +++ b/externals/vcpkg/ports/libunifex/portfile.cmake @@ -0,0 +1,42 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO facebookexperimental/libunifex + REF 9df21c58d34ce8a1cd3b15c3a7347495e29417a0 + SHA512 2a1c6dbe0e66893be888c301e53b5d2813049047a817e9e1562acf2dec4ae79dec7db90409cd415c59238f2f3e2738e52f86a424041459390c720568ee52d860 + HEAD_REF master + PATCHES + fix-compile-error.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + test BUILD_TESTING + test UNIFEX_BUILD_EXAMPLES +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} + -DCMAKE_CXX_STANDARD:STRING=20 +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unifex CONFIG_PATH lib/cmake/unifex) +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/include/unifex/config.hpp.in" +) +if(VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/unifex/linux") +elseif(VCPKG_TARGET_IS_LINUX) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/unifex/win32") +endif() diff --git a/externals/vcpkg/ports/libunifex/vcpkg.json b/externals/vcpkg/ports/libunifex/vcpkg.json new file mode 100755 index 000000000..3553e8964 --- /dev/null +++ b/externals/vcpkg/ports/libunifex/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "libunifex", + "version-date": "2021-12-07", + "port-version": 1, + "description": "Unified Executors", + "homepage": "https://github.com/facebookexperimental/libunifex", + "dependencies": [ + { + "name": "liburing", + "platform": "linux" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "test": { + "description": "Build test/example programs", + "dependencies": [ + "gtest" + ] + } + } +} diff --git a/externals/vcpkg/ports/libunistring/copyright b/externals/vcpkg/ports/libunistring/copyright new file mode 100755 index 000000000..6bab2feda --- /dev/null +++ b/externals/vcpkg/ports/libunistring/copyright @@ -0,0 +1,18 @@ +The libunistring library and its header files are dual-licensed under +"the GNU LGPLv3+ or the GNU GPLv2". This means, you can use it under either + - the terms of the GNU Lesser General Public License (LGPL) version 3 or + (at your option) any later version, or + - the terms of the GNU General Public License (GPL) version 2, or + - the same dual license "the GNU LGPLv3+ or the GNU GPLv2". + +You find the GNU LGPL version 3 in the file COPYING.LIB. This license is +based on the GNU GPL version 3, see file COPYING. + +You can find the GNU GPL version 2 at +. + +Note: This dual license makes it possible for the libunistring library +to be used by packages under GPLv2 or GPLv2+ licenses, in particular. See +the table in . + +The documentation is under another license; see in the documentation. diff --git a/externals/vcpkg/ports/libunistring/libunistring-msys-msvc-build.patch b/externals/vcpkg/ports/libunistring/libunistring-msys-msvc-build.patch new file mode 100755 index 000000000..98d6d562d --- /dev/null +++ b/externals/vcpkg/ports/libunistring/libunistring-msys-msvc-build.patch @@ -0,0 +1,53 @@ +--- /dev/null ++++ b/build-aux/dumpbin-to-nm.awk +@@ -0,0 +1,14 @@ ++{last_section=section; section=$ 3}; ++/^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]}; ++/Section length .*#relocs.*(pick any)/{hide[last_section]=1}; ++/^ *Symbol name *: /{split($ 0,sn,":"); si=substr(sn[2],2)}; ++/^ *Type *: code/{print "T",si,substr(si,length(prfx))}; ++/^ *Type *: data/{print "I",si,substr(si,length(prfx))}; ++$ 0!~/External *\|/{next}; ++$ 0~/__local_stdio_printf_options/{next}; ++/ 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next}; ++{if(hide[section]) next}; ++{f="D"}; $ 0~/\(\).*\|/{f="T"}; ++{split($ 0,a,/\||\r/); split(a[2],s)}; ++s[1]~/^[@?]/{print f,s[1],s[1]; next}; ++s[1]~prfx {split(s[1],t,"@"); print f,t[1],substr(t[1],length(prfx))} +--- a/configure ++++ b/configure +@@ -10274,21 +10274,7 @@ + # D for any global variable and I for any imported variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. +- lt_cv_sys_global_symbol_pipe="$AWK '"\ +-" {last_section=section; section=\$ 3};"\ +-" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ +-" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +-" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +-" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +-" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ +-" \$ 0!~/External *\|/{next};"\ +-" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +-" {if(hide[section]) next};"\ +-" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +-" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +-" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +-" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ +-" ' prfx=^$ac_symprfx" ++ lt_cv_sys_global_symbol_pipe="$AWK -f '$(realpath "$(dirname $0)")/build-aux/dumpbin-to-nm.awk' prfx=^$ac_symprfx" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi +--- a/lib/Makefile.in ++++ b/lib/Makefile.in +@@ -5934,7 +5938,7 @@ + test -f $$sf || sf=$(srcdir)/$$sf; \ + of=`echo "$$f" | sed -e 's,^.*/,,' -e 's,\\.[^.]*$$,,'`.$(OBJEXT); \ + echo "$(COMPILE) -c $$sf" 1>&6; \ +- $(COMPILE) -c $$sf || { rm -f config.h; exit 1; }; \ ++ $(COMPILE) -c $$sf 1>&6 || { rm -f config.h; exit 1; }; \ + sh ./exported.sh $$of 1>&5; \ + rm -f $$of `echo "$$of" | sed -e 's,\\.$(OBJEXT)$$,.lo,'`; \ + ;; \ diff --git a/externals/vcpkg/ports/libunistring/portfile.cmake b/externals/vcpkg/ports/libunistring/portfile.cmake new file mode 100755 index 000000000..9e4e55ff0 --- /dev/null +++ b/externals/vcpkg/ports/libunistring/portfile.cmake @@ -0,0 +1,34 @@ +set(LIBUNISTRING_VERSION 0.9.10) +set(LIBUNISTRING_FILENAME libunistring-${LIBUNISTRING_VERSION}.tar.gz) + +vcpkg_download_distfile(ARCHIVE + URLS + "https://ftp.gnu.org/gnu/libunistring/${LIBUNISTRING_FILENAME}" + "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libunistring/${LIBUNISTRING_FILENAME}" + FILENAME "${LIBUNISTRING_FILENAME}" + SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF ${LIBUNISTRING_VERSION} + PATCHES libunistring-msys-msvc-build.patch +) + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + COPY_SOURCE + USE_WRAPPERS + OPTIONS + "--with-libiconv-prefix=${CURRENT_INSTALLED_DIR}" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# copyright excerpt from README, to cover dual license under "LGPLv3+ or GPLv2". +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/libunistring/vcpkg.json b/externals/vcpkg/ports/libunistring/vcpkg.json new file mode 100755 index 000000000..dfb16c1f8 --- /dev/null +++ b/externals/vcpkg/ports/libunistring/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libunistring", + "version": "0.9.10", + "port-version": 3, + "description": "GNU libunistring provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard.", + "homepage": "https://www.gnu.org/software/libunistring/", + "supports": "!uwp", + "dependencies": [ + "libiconv" + ] +} diff --git a/externals/vcpkg/ports/liburing/fix-configure.patch b/externals/vcpkg/ports/liburing/fix-configure.patch new file mode 100755 index 000000000..92ebf2826 --- /dev/null +++ b/externals/vcpkg/ports/liburing/fix-configure.patch @@ -0,0 +1,35 @@ +diff --git a/configure b/configure +index 3b96cde..56d5cb0 100755 +--- a/configure ++++ b/configure +@@ -18,16 +18,18 @@ for opt do + ;; + --mandir=*) mandir="$optarg" + ;; +- --datadir=*) datadir="$optarg" ++ --datarootdir=*) datadir="$optarg" + ;; + --cc=*) cc="$optarg" + ;; + --cxx=*) cxx="$optarg" + ;; ++ --enable-shared) ENABLE_SHARED=1 ++ ;; ++ --enable-static) ENABLE_SHARED=0 ++ ;; + *) +- echo "ERROR: unknown option $opt" +- echo "Try '$0 --help' for more information" +- exit 1 ++ echo "WARNING: unknown option $opt" + ;; + esac + done +@@ -119,6 +121,7 @@ echo "# Automatically generated by configure - do not modify" > $config_host_mak + printf "# Configured with:" >> $config_host_mak + printf " '%s'" "$0" "$@" >> $config_host_mak + echo >> $config_host_mak ++echo "ENABLE_SHARED=${ENABLE_SHARED}" >> $config_host_mak + + do_cxx() { + # Run the compiler, capturing its output to the log. diff --git a/externals/vcpkg/ports/liburing/fix-spec-version.patch b/externals/vcpkg/ports/liburing/fix-spec-version.patch new file mode 100755 index 000000000..cb495f856 --- /dev/null +++ b/externals/vcpkg/ports/liburing/fix-spec-version.patch @@ -0,0 +1,11 @@ +diff --git a/liburing.spec b/liburing.spec +index fa4d970..8607074 100644 +--- a/liburing.spec ++++ b/liburing.spec +@@ -1,5 +1,5 @@ + Name: liburing +-Version: 2.0 ++Version: 2.1 + Release: 1%{?dist} + Summary: Linux-native io_uring I/O access library + License: (GPLv2 with exceptions and LGPLv2+) or MIT diff --git a/externals/vcpkg/ports/liburing/portfile.cmake b/externals/vcpkg/ports/liburing/portfile.cmake new file mode 100755 index 000000000..72f6d07eb --- /dev/null +++ b/externals/vcpkg/ports/liburing/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO axboe/liburing + REF 41a61c97c2e3df4475c93fdf5026d575ce3f1377 #liburing-2.1 + SHA512 adbfee9a775ff0977c192b52f5cc2c52b2b40bf5e7c0c1153d88b7767889c7c8a39863da0bce3ebed0f396a453e879633ecf1c79f4f2c4f89407ff896d8b6222 + HEAD_REF master + PATCHES + fix-spec-version.patch # update version value for pkgconfig(.pc) files + fix-configure.patch # ignore unsupported options, handle ENABLE_SHARED +) + +# note: check ${SOURCE_PATH}/liburing.spec before updating configure options +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + COPY_SOURCE +) +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CURRENT_PORT_DIR}/usage" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +# note: {SOURCE_PATH}/src/Makefile makes liburing.so from liburing.a. +# For dynamic, remove intermediate file liburing.a when install is finished. +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/liburing.a" + "${CURRENT_PACKAGES_DIR}/lib/liburing.a" + ) +endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/man") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/man2") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/man3") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/man7") diff --git a/externals/vcpkg/ports/liburing/usage b/externals/vcpkg/ports/liburing/usage new file mode 100755 index 000000000..bbfbaafbf --- /dev/null +++ b/externals/vcpkg/ports/liburing/usage @@ -0,0 +1,6 @@ +The package liburing can be imported via CMake FindPkgConfig module: + + find_package(PkgConfig) + pkg_check_modules(liburing REQUIRED IMPORTED_TARGET GLOBAL liburing>=2.0) + + target_link_libraries(main PRIVATE PkgConfig::liburing) diff --git a/externals/vcpkg/ports/liburing/vcpkg.json b/externals/vcpkg/ports/liburing/vcpkg.json new file mode 100755 index 000000000..d2fb6d7f1 --- /dev/null +++ b/externals/vcpkg/ports/liburing/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "liburing", + "version": "2.1", + "description": "Linux-native io_uring I/O access library", + "homepage": "https://github.com/axboe/liburing", + "license": null, + "supports": "linux" +} diff --git a/externals/vcpkg/ports/libusb-win32/CMakeLists.txt b/externals/vcpkg/ports/libusb-win32/CMakeLists.txt new file mode 100755 index 000000000..57004fac6 --- /dev/null +++ b/externals/vcpkg/ports/libusb-win32/CMakeLists.txt @@ -0,0 +1,27 @@ +cmake_minimum_required(VERSION 3.0) +project(libusb-win32) + +set(lib_headers src/lusb0_usb.h) + +set(lib_srcs src/descriptors.c + src/error.c + src/install.c + src/registry.c + src/usb.c + src/windows.c + libusb0.def) + +add_library(libusb0 ${lib_srcs}) +target_include_directories(libusb0 PRIVATE "src/driver") +target_link_libraries(libusb0 Setupapi) +target_compile_definitions(libusb0 PRIVATE "-D_CRT_SECURE_NO_WARNINGS") + +install( + TARGETS libusb0 + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib) + +install( + FILES ${lib_headers} + DESTINATION include) \ No newline at end of file diff --git a/externals/vcpkg/ports/libusb-win32/portfile.cmake b/externals/vcpkg/ports/libusb-win32/portfile.cmake new file mode 100755 index 000000000..cbfe2b1eb --- /dev/null +++ b/externals/vcpkg/ports/libusb-win32/portfile.cmake @@ -0,0 +1,24 @@ +set(LIBUSB_VERSION 1.2.6.0) +set(LIBUSB_HASH 972438b7465a22882bc91a1238291240ee3cdb09f374454a027d003b150656d4c262553104f74418bb49b4a7ca2f1a4f72d20e689fa3a7728881bafc876267f4) + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO libusb-win32/libusb-win32-releases + REF ${LIBUSB_VERSION} + FILENAME "libusb-win32-src-${LIBUSB_VERSION}.zip" + SHA512 ${LIBUSB_HASH} +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(COPY ${SOURCE_PATH}/COPYING_LGPL.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/libusb-win32) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/libusb-win32/COPYING_LGPL.txt ${CURRENT_PACKAGES_DIR}/share/libusb-win32/copyright) diff --git a/externals/vcpkg/ports/libusb-win32/vcpkg.json b/externals/vcpkg/ports/libusb-win32/vcpkg.json new file mode 100755 index 000000000..9cbe7bc35 --- /dev/null +++ b/externals/vcpkg/ports/libusb-win32/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libusb-win32", + "version-string": "1.2.6.0", + "port-version": 8, + "description": "Allows user space applications to access many USB device on Windows.", + "homepage": "https://sourceforge.net/projects/libusb-win32", + "supports": "windows" +} diff --git a/externals/vcpkg/ports/libusb/portfile.cmake b/externals/vcpkg/ports/libusb/portfile.cmake new file mode 100755 index 000000000..34f6664da --- /dev/null +++ b/externals/vcpkg/ports/libusb/portfile.cmake @@ -0,0 +1,72 @@ +if(VCPKG_TARGET_IS_LINUX) + message("${PORT} currently requires the following tools and libraries from the system package manager:\n autoreconf\n libudev\n\nThese can be installed on Ubuntu systems via apt-get install autoreconf libudev-dev") +endif() + +set(VERSION 1.0.26) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libusb/libusb + REF 4239bc3a50014b8e6a5a2a59df1fff3b7469543b # v1.0.26 + SHA512 f07ec9ef4df555733dab9388595cd10bc87195da54f4c646478d4a0496ee7b8933de03e957c7466291c120102d8801e8b26846cb27b201bb9cbca5df03f3a6ef + HEAD_REF master +) + +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_PLATFORM_TOOLSET MATCHES "v142") + set(MSVS_VERSION 2019) + elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141") + set(MSVS_VERSION 2017) + else() + set(MSVS_VERSION 2015) + endif() + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(LIBUSB_PROJECT_TYPE dll) + if (VCPKG_CRT_LINKAGE STREQUAL static) + file(READ "${SOURCE_PATH}/msvc/libusb_${LIBUSB_PROJECT_TYPE}_${MSVS_VERSION}.vcxproj" PROJ_FILE) + string(REPLACE "MultiThreadedDLL" "MultiThreaded" PROJ_FILE "${PROJ_FILE}") + string(REPLACE "MultiThreadedDebugDLL" "MultiThreadedDebug" PROJ_FILE "${PROJ_FILE}") + file(WRITE "${SOURCE_PATH}/msvc/libusb_${LIBUSB_PROJECT_TYPE}_${MSVS_VERSION}.vcxproj" "${PROJ_FILE}") + endif() + else() + set(LIBUSB_PROJECT_TYPE static) + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + file(READ "${SOURCE_PATH}/msvc/libusb_${LIBUSB_PROJECT_TYPE}_${MSVS_VERSION}.vcxproj" PROJ_FILE) + string(REPLACE "MultiThreaded" "MultiThreadedDLL" PROJ_FILE "${PROJ_FILE}") + string(REPLACE "MultiThreadedDebug" "MultiThreadedDebugDLL" PROJ_FILE "${PROJ_FILE}") + file(WRITE "${SOURCE_PATH}/msvc/libusb_${LIBUSB_PROJECT_TYPE}_${MSVS_VERSION}.vcxproj" "${PROJ_FILE}") + endif() + endif() + + # The README.md file in the archive is a symlink to README + # which causes issues with the windows MSBUILD process + file(REMOVE "${SOURCE_PATH}/README.md") + + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH msvc/libusb_${LIBUSB_PROJECT_TYPE}_${MSVS_VERSION}.vcxproj + LICENSE_SUBPATH COPYING + ) + file(INSTALL "${SOURCE_PATH}/libusb/libusb.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/libusb-1.0") + set(prefix "") + set(exec_prefix [[${prefix}]]) + set(libdir [[${prefix}/lib]]) + set(includedir [[${prefix}/include]]) + configure_file("${SOURCE_PATH}/libusb-1.0.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libusb-1.0.pc" @ONLY) + if(NOT VCPKG_BUILD_TYPE) + set(includedir [[${prefix}/../include]]) + configure_file("${SOURCE_PATH}/libusb-1.0.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libusb-1.0.pc" @ONLY) + endif() +else() + vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + ) + vcpkg_install_make() +endif() + +vcpkg_fixup_pkgconfig() + +configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) +configure_file("${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libusb/usage b/externals/vcpkg/ports/libusb/usage new file mode 100755 index 000000000..de236d46a --- /dev/null +++ b/externals/vcpkg/ports/libusb/usage @@ -0,0 +1,5 @@ +The package @PORT@:@TARGET_TRIPLET@ provides CMake targets: + + find_package(@PORT@ CONFIG REQUIRED) + target_include_directories(main PRIVATE ${LIBUSB_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${LIBUSB_LIBRARIES}) diff --git a/externals/vcpkg/ports/libusb/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/libusb/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..61f9d54ba --- /dev/null +++ b/externals/vcpkg/ports/libusb/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,14 @@ +include(SelectLibraryConfigurations) + +find_path(LIBUSB_INCLUDE_DIR libusb.h PATH_SUFFIXES libusb-1.0) +find_library(LIBUSB_LIBRARY_DEBUG NAMES libusb-1.0 usb-1.0 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED) +find_library(LIBUSB_LIBRARY_RELEASE NAMES libusb-1.0 usb-1.0 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED) + +select_library_configurations(LIBUSB) + +set(LIBUSB_INCLUDE_DIRS ${LIBUSB_INCLUDE_DIR}) +set(LIBUSB_LIBRARIES ${LIBUSB_LIBRARY}) + +if (@VCPKG_TARGET_IS_LINUX@) + list(APPEND LIBUSB_LIBRARIES udev) +endif() diff --git a/externals/vcpkg/ports/libusb/vcpkg.json b/externals/vcpkg/ports/libusb/vcpkg.json new file mode 100755 index 000000000..d89566f0c --- /dev/null +++ b/externals/vcpkg/ports/libusb/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libusb", + "version": "1.0.26", + "description": "a cross-platform library to access USB devices", + "homepage": "https://github.com/libusb/libusb", + "license": "LGPL-2.1", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/libusbmuxd/CMakeLists.txt b/externals/vcpkg/ports/libusbmuxd/CMakeLists.txt new file mode 100755 index 000000000..254a70d7e --- /dev/null +++ b/externals/vcpkg/ports/libusbmuxd/CMakeLists.txt @@ -0,0 +1,50 @@ +cmake_minimum_required(VERSION 3.0) +project(libusbmuxd C) + +# find dependencies +find_path(libplist_INCLUDES plist.h PATH_SUFFIXES plist) +set(libplist_INCLUDES ${libplist_INCLUDES}/../) +find_library(libplist NAMES plist libplist plist-2.0 libplist-2.0 REQUIRED) + +# ready to create library +file(GLOB_RECURSE IDVCACTV_TOOLS_HDR common/*.h) +file(GLOB_RECURSE IDVCACTV_TOOLS_SRC common/*.c) + +file(GLOB_RECURSE IDVCACTV_PUBLIC_HDR include/*.h) +file(GLOB_RECURSE IDVCACTV_SRC src/*.c) + +add_library(libusbmuxd ${IDVCACTV_TOOLS_HDR} ${IDVCACTV_TOOLS_SRC} ${IDVCACTV_SRC} ${IDVCACTV_PUBLIC_HDR}) +target_include_directories(libusbmuxd PRIVATE ${libplist_INCLUDES} include common) +target_compile_definitions(libusbmuxd PRIVATE -DPACKAGE_STRING="1.2.77") +if (WIN32) + target_compile_definitions(libusbmuxd PRIVATE -DWIN32) + target_link_libraries(libusbmuxd PRIVATE Ws2_32) +endif() +target_link_libraries(libusbmuxd PRIVATE ${libplist}) + +# install +install( + TARGETS libusbmuxd + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) + +set(LIBPLIST_VERSION 2.0) +set(PACKAGE_NAME libusbmuxd) +set(PACKAGE_VERSION 2.0) +set(prefix ${CMAKE_INSTALL_PREFIX}) +set(exec_prefix \${prefix}) +set(libdir \${prefix}/lib) +set(includedir \${prefix}/../include) +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/src/libusbmuxd-2.0.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/libusbmuxd-2.0.pc + @ONLY +) +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/libusbmuxd-2.0.pc + DESTINATION lib/pkgconfig +) + +install(FILES ${IDVCACTV_PUBLIC_HDR} DESTINATION include) \ No newline at end of file diff --git a/externals/vcpkg/ports/libusbmuxd/fix-win-build.patch b/externals/vcpkg/ports/libusbmuxd/fix-win-build.patch new file mode 100755 index 000000000..a1b7f2ef2 --- /dev/null +++ b/externals/vcpkg/ports/libusbmuxd/fix-win-build.patch @@ -0,0 +1,20 @@ +diff --git a/src/libusbmuxd.c b/src/libusbmuxd.c +index e85cf4a..35ed1b5 100644 +--- a/src/libusbmuxd.c ++++ b/src/libusbmuxd.c +@@ -86,6 +86,15 @@ static char* stpncpy(char *dst, const char *src, size_t len) + } + #endif + ++#ifdef WIN32 ++int strcasecmp(char *s1, char *s2) ++{ ++ while (toupper((unsigned char)*s1) == toupper((unsigned char)*s2++)) ++ if (*s1++ == '\0') return 0; ++ return(toupper((unsigned char)*s1) - toupper((unsigned char)*--s2)); ++} ++#endif ++ + #include + #define PLIST_CLIENT_VERSION_STRING PACKAGE_STRING + #define PLIST_LIBUSBMUX_VERSION 3 diff --git a/externals/vcpkg/ports/libusbmuxd/portfile.cmake b/externals/vcpkg/ports/libusbmuxd/portfile.cmake new file mode 100755 index 000000000..92a82472d --- /dev/null +++ b/externals/vcpkg/ports/libusbmuxd/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libimobiledevice-win32/libusbmuxd + REF ac86b23f57879b8b702f3712ba66729008d059a3 # v1.2.219 + SHA512 ced85088bc6ebb416ccb635d6b4e79662fb34f427d869b64b61847e5fde7b4ae094cebb1f7916d9387c314aeb84106a618fbd7497dc4b36151b236dcb55bd0e4 + HEAD_REF msvc-master + PATCHES fix-win-build.patch +) + +configure_file(${CURRENT_PORT_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libusbmuxd/vcpkg.json b/externals/vcpkg/ports/libusbmuxd/vcpkg.json new file mode 100755 index 000000000..894b846af --- /dev/null +++ b/externals/vcpkg/ports/libusbmuxd/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libusbmuxd", + "version": "1.2.219", + "port-version": 2, + "description": "A client library to multiplex connections from and to iOS devices", + "supports": "!(uwp | linux | osx)", + "dependencies": [ + "libplist" + ] +} diff --git a/externals/vcpkg/ports/libuuid/CMakeLists.txt b/externals/vcpkg/ports/libuuid/CMakeLists.txt new file mode 100755 index 000000000..9f4bb0605 --- /dev/null +++ b/externals/vcpkg/ports/libuuid/CMakeLists.txt @@ -0,0 +1,63 @@ +cmake_minimum_required(VERSION 3.0) +project(libuuid C) + +configure_file(config.linux.h config.h COPYONLY) + +include_directories(${CMAKE_CURRENT_BINARY_DIR}) + +add_library(uuid STATIC + clear.c + compare.c + copy.c + gen_uuid.c + isnull.c + pack.c + parse.c + randutils.c + unpack.c + unparse.c + uuid_time.c +) +target_compile_options(uuid PRIVATE -include "${CMAKE_CURRENT_BINARY_DIR}/config.h") + +add_executable(test_uuid test_uuid.c) +target_link_libraries(test_uuid uuid) + +if(CMAKE_BUILD_TYPE STREQUAL "Release") + install(FILES uuid.h DESTINATION include/uuid) +endif() + +install( + TARGETS uuid + EXPORT uuid_targets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +include(CMakePackageConfigHelpers) +set(PACKAGE_CONFIG_FILE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libuuid-config.cmake") +set(INSTALL_CONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/unofficial-libuuid") + +configure_package_config_file(unofficial-libuuid-config.cmake.in + "${PACKAGE_CONFIG_FILE}" + INSTALL_DESTINATION "${INSTALL_CONFIG_DIR}" +) + +export(EXPORT uuid_targets + NAMESPACE unofficial::UUID:: + FILE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libuuid-targets.cmake" +) + +install(EXPORT uuid_targets + NAMESPACE unofficial::UUID:: + FILE unofficial-libuuid-targets.cmake + DESTINATION "${INSTALL_CONFIG_DIR}" +) + +install( + FILES + "${PACKAGE_CONFIG_FILE}" + DESTINATION + "${INSTALL_CONFIG_DIR}" +) diff --git a/externals/vcpkg/ports/libuuid/config.linux.h b/externals/vcpkg/ports/libuuid/config.linux.h new file mode 100755 index 000000000..38b53cac1 --- /dev/null +++ b/externals/vcpkg/ports/libuuid/config.linux.h @@ -0,0 +1,13 @@ +#define HAVE_DECL__SC_HOST_NAME_MAX 1 +#define HAVE_INTTYPES_H 1 +#define HAVE_NETINET_IN_H 1 +#define HAVE_SRANDOM 1 +#define HAVE_STDINT_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_SYS_FILE_H 1 +#define HAVE_SYS_IOCTL_H 1 +#define HAVE_SYS_SOCKET_H 1 +#define HAVE_SYS_TIME_H 1 +#define HAVE_UNISTD_H 1 +#define HAVE_USLEEP 1 +#define PACKAGE_STRING "libuuid 1.0.3" diff --git a/externals/vcpkg/ports/libuuid/portfile.cmake b/externals/vcpkg/ports/libuuid/portfile.cmake new file mode 100755 index 000000000..7ed5400c2 --- /dev/null +++ b/externals/vcpkg/ports/libuuid/portfile.cmake @@ -0,0 +1,43 @@ +set(LIBUUID_VERSION 1.0.3) + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO libuuid + FILENAME "libuuid-${LIBUUID_VERSION}.tar.gz" + SHA512 77488caccc66503f6f2ded7bdfc4d3bc2c20b24a8dc95b2051633c695e99ec27876ffbafe38269b939826e1fdb06eea328f07b796c9e0aaca12331a787175507 +) + +file(COPY + ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_LIST_DIR}/config.linux.h + ${CMAKE_CURRENT_LIST_DIR}/unofficial-libuuid-config.cmake.in + DESTINATION ${SOURCE_PATH} +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +set(prefix ${CURRENT_INSTALLED_DIR}) +set(exec_prefix \$\{prefix\}) +set(libdir \$\{exec_prefix\}/lib) +set(includedir \$\{prefix\}/include) +configure_file(${SOURCE_PATH}/uuid.pc.in ${SOURCE_PATH}/uuid.pc @ONLY) +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(INSTALL ${SOURCE_PATH}/uuid.pc DESTINATION ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(INSTALL ${SOURCE_PATH}/uuid.pc DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) +endif() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/unofficial-libuuid TARGET_PATH share/unofficial-libuuid) +vcpkg_fixup_pkgconfig() + +file(INSTALL + ${SOURCE_PATH}/COPYING + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/libuuid/unofficial-libuuid-config.cmake.in b/externals/vcpkg/ports/libuuid/unofficial-libuuid-config.cmake.in new file mode 100755 index 000000000..ed4900cea --- /dev/null +++ b/externals/vcpkg/ports/libuuid/unofficial-libuuid-config.cmake.in @@ -0,0 +1,3 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-libuuid-targets.cmake") diff --git a/externals/vcpkg/ports/libuuid/vcpkg.json b/externals/vcpkg/ports/libuuid/vcpkg.json new file mode 100755 index 000000000..0abea1e93 --- /dev/null +++ b/externals/vcpkg/ports/libuuid/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libuuid", + "version": "1.0.3", + "port-version": 11, + "description": "Universally unique id library", + "homepage": "https://sourceforge.net/projects/libuuid", + "supports": "!osx & !windows" +} diff --git a/externals/vcpkg/ports/libuv/CMakeLists.txt b/externals/vcpkg/ports/libuv/CMakeLists.txt new file mode 100755 index 000000000..7d2c38bdb --- /dev/null +++ b/externals/vcpkg/ports/libuv/CMakeLists.txt @@ -0,0 +1,83 @@ +cmake_minimum_required(VERSION 3.5) +project(libuv C) + +find_package(Threads REQUIRED) + +file(GLOB UV_SOURCES_COMMON src/*.c) + +file(GLOB UV_SOURCES_UNIX + src/unix/async.c + src/unix/core.c + src/unix/dl.c + src/unix/fs.c + src/unix/getaddrinfo.c + src/unix/getnameinfo.c + src/unix/loop.c + src/unix/loop-watcher.c + src/unix/pipe.c + src/unix/poll.c + src/unix/process.c + src/unix/signal.c + src/unix/stream.c + src/unix/tcp.c + src/unix/thread.c + src/unix/tty.c + src/unix/udp.c +) +file(GLOB UV_SOURCES_LINUX + src/unix/proctitle.c + src/unix/linux-core.c + src/unix/linux-inotify.c + src/unix/linux-syscalls.c + src/unix/procfs-exepath.c + src/unix/sysinfo-loadavg.c + src/unix/sysinfo-memory.c + src/unix/epoll.c +) +file(GLOB UV_SOURCES_DARWIN + src/unix/proctitle.c + src/unix/darwin.c + src/unix/fsevents.c + src/unix/darwin-proctitle.c + src/unix/bsd-ifaddrs.c + src/unix/kqueue.c +) +file(GLOB UV_SOURCES_FREEBSD + src/unix/freebsd.c + src/unix/posix-hrtime.c + src/unix/bsd-proctitle.c + src/unix/bsd-ifaddrs.c + src/unix/kqueue.c +) +file(GLOB UV_SOURCES_WIN src/win/*.c) + +if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_WIN}) + target_compile_definitions(libuv PRIVATE WIN32_LEAN_AND_MEAN "_WIN32_WINNT=0x0600") + target_link_libraries(libuv PRIVATE iphlpapi psapi shell32 userenv ws2_32) +elseif(APPLE) + add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_DARWIN}) +elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_FREEBSD}) +else() # Assume some Linux variant + add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_LINUX}) +endif() + +target_link_libraries(libuv PRIVATE Threads::Threads) +target_include_directories(libuv PUBLIC $ $ $) +set_target_properties(libuv PROPERTIES DEFINE_SYMBOL BUILDING_UV_SHARED) + +if(NOT UV_SKIP_HEADERS) + install( + DIRECTORY include/ + DESTINATION include + ) +endif() + +install(TARGETS libuv + EXPORT libuv + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) +install(EXPORT libuv FILE unofficial-libuv-targets.cmake NAMESPACE unofficial::libuv:: DESTINATION share/unofficial-libuv) diff --git a/externals/vcpkg/ports/libuv/portfile.cmake b/externals/vcpkg/ports/libuv/portfile.cmake new file mode 100755 index 000000000..8b927ae80 --- /dev/null +++ b/externals/vcpkg/ports/libuv/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libuv/libuv + REF v1.43.0 + SHA512 66ee11f8f6fc1313c432858572789cf67acd6364b29a06c73323ab20626e2d6e3d3dcea748cf5d9d4368b40ad7fe0d5fd35e9369c22e531db523703f005248d3 + HEAD_REF v1.x +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DUV_SKIP_HEADERS=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libuv CONFIG_PATH share/unofficial-libuv) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +configure_file( + "${CMAKE_CURRENT_LIST_DIR}/unofficial-libuv-config.in.cmake" + "${CURRENT_PACKAGES_DIR}/share/unofficial-libuv/unofficial-libuv-config.cmake" + @ONLY +) + +file(READ "${CURRENT_PACKAGES_DIR}/include/uv.h" UV_H) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + string(REPLACE "defined(USING_UV_SHARED)" "1" UV_H "${UV_H}") +else() + string(REPLACE "defined(USING_UV_SHARED)" "0" UV_H "${UV_H}") + configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) +endif() +file(WRITE "${CURRENT_PACKAGES_DIR}/include/uv.h" "${UV_H}") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/externals/vcpkg/ports/libuv/unofficial-libuv-config.in.cmake b/externals/vcpkg/ports/libuv/unofficial-libuv-config.in.cmake new file mode 100755 index 000000000..a591d4cdf --- /dev/null +++ b/externals/vcpkg/ports/libuv/unofficial-libuv-config.in.cmake @@ -0,0 +1,7 @@ + +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + include(CMakeFindDependencyMacro) + find_dependency(Threads) +endif() + +include(${CMAKE_CURRENT_LIST_DIR}/unofficial-libuv-targets.cmake) diff --git a/externals/vcpkg/ports/libuv/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/libuv/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..d95350a6d --- /dev/null +++ b/externals/vcpkg/ports/libuv/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,16 @@ +_find_package(${ARGS}) + +if(WIN32) + list(APPEND LibUV_LIBRARIES iphlpapi psapi shell32 userenv ws2_32) + if(TARGET LibUV::LibUV) + set_property(TARGET LibUV::LibUV APPEND PROPERTY INTERFACE_LINK_LIBRARIES iphlpapi psapi shell32 userenv ws2_32) + endif() +endif() +include(CMakeFindDependencyMacro) +find_dependency(Threads) +list(APPEND LibUV_LIBRARIES Threads::Threads) +if(TARGET LibUV::LibUV) + set_property(TARGET LibUV::LibUV APPEND PROPERTY INTERFACE_LINK_LIBRARIES Threads::Threads) +endif() + + diff --git a/externals/vcpkg/ports/libuv/vcpkg.json b/externals/vcpkg/ports/libuv/vcpkg.json new file mode 100755 index 000000000..5b11cc1fd --- /dev/null +++ b/externals/vcpkg/ports/libuv/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "libuv", + "version-semver": "1.43.0", + "description": "libuv is a multi-platform support library with a focus on asynchronous I/O.", + "homepage": "https://github.com/libuv/libuv", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libuvc/build_fix.patch b/externals/vcpkg/ports/libuvc/build_fix.patch new file mode 100755 index 000000000..3c5bfcd44 --- /dev/null +++ b/externals/vcpkg/ports/libuvc/build_fix.patch @@ -0,0 +1,44 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f3c8116..b9a6d38 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,10 +39,10 @@ set(SOURCES + src/misc.c + ) + +-find_package(LibUSB) ++find_package(libusb CONFIG REQUIRED) + + # JpegPkg name to differ from shipped with CMake +-find_package(JpegPkg QUIET) ++find_package(JPEG REQUIRED) + if(JPEG_FOUND) + message(STATUS "Building libuvc with JPEG support.") + set(LIBUVC_HAS_JPEG TRUE) +@@ -107,9 +107,10 @@ foreach(target_name IN LISTS UVC_TARGETS) + $ + $ + ) ++ target_include_directories(${target_name} PRIVATE ${LIBUSB_INCLUDE_DIRS}) + target_link_libraries(${target_name} + # libusb-1.0 used internally so we link to it privately. +- PRIVATE LibUSB::LibUSB ++ PRIVATE ${LIBUSB_LIBRARIES} + ) + if(JPEG_FOUND) + target_link_libraries(${target_name} +diff --git a/libuvcConfig.cmake b/libuvcConfig.cmake +index b9887ea..e8f09dc 100644 +--- a/libuvcConfig.cmake ++++ b/libuvcConfig.cmake +@@ -10,8 +10,8 @@ if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED) + list(APPEND extraArgs REQUIRED) + endif() + +-find_package(JpegPkg ${extraArgs}) +-find_package(LibUSB ${extraArgs}) ++include(CMakeFindDependencyMacro) ++find_dependency(JPEG ${extraArgs}) + include("${CMAKE_CURRENT_LIST_DIR}/libuvcTargets.cmake") + + set(libuvc_FOUND TRUE) diff --git a/externals/vcpkg/ports/libuvc/portfile.cmake b/externals/vcpkg/ports/libuvc/portfile.cmake new file mode 100755 index 000000000..6f68f14b7 --- /dev/null +++ b/externals/vcpkg/ports/libuvc/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libuvc/libuvc + REF c612d4509eb0ff19ce414abc3dca18d0f6263a84 + SHA512 df3f23463728e8ffd69dc52e251ea2610ea8df32b02f6d26dd2a6910cf217650245bb1a11e67be61df875c6992d592c9cb17675d914997bd72c9fe7eb5b65c32 + HEAD_REF master + PATCHES build_fix.patch +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(BUILD_TARGET "Shared") +else() + set(BUILD_TARGET "Static") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DCMAKE_BUILD_TARGET=${BUILD_TARGET} + -DBUILD_EXAMPLE=OFF +) +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME libuvc CONFIG_PATH lib/cmake/libuvc) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libuvc/vcpkg.json b/externals/vcpkg/ports/libuvc/vcpkg.json new file mode 100755 index 000000000..ff8763108 --- /dev/null +++ b/externals/vcpkg/ports/libuvc/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "libuvc", + "version-date": "2020-11-24", + "port-version": 3, + "description": "a cross-platform library for USB video devices", + "homepage": "https://github.com/libuvc/libuvc", + "supports": "linux", + "dependencies": [ + "libjpeg-turbo", + "libusb", + "libusb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libvmdk/CMakeLists.txt b/externals/vcpkg/ports/libvmdk/CMakeLists.txt new file mode 100755 index 000000000..1fb043d90 --- /dev/null +++ b/externals/vcpkg/ports/libvmdk/CMakeLists.txt @@ -0,0 +1,84 @@ +cmake_minimum_required(VERSION 3.12) + +project(libvmdk C) + +find_package(ZLIB REQUIRED) + +if(MSVC) + add_compile_definitions(_CRT_SECURE_NO_DEPRECATE) + add_compile_definitions(_CRT_NONSTDC_NO_DEPRECATE) +endif() + +add_compile_definitions(HAVE_LOCAL_LIBCAES) +add_compile_definitions(HAVE_LOCAL_LIBCERROR) +add_compile_definitions(HAVE_LOCAL_LIBCTHREADS) +add_compile_definitions(HAVE_LOCAL_LIBCDATA) +add_compile_definitions(HAVE_LOCAL_LIBCLOCALE) +add_compile_definitions(HAVE_LOCAL_LIBCNOTIFY) +add_compile_definitions(HAVE_LOCAL_LIBCSPLIT) +add_compile_definitions(HAVE_LOCAL_LIBCFILE) +add_compile_definitions(HAVE_LOCAL_LIBCPATH) +add_compile_definitions(HAVE_LOCAL_LIBUNA) +add_compile_definitions(HAVE_LOCAL_LIBBFIO) +add_compile_definitions(HAVE_LOCAL_LIBFCACHE) +add_compile_definitions(HAVE_LOCAL_LIBFDATA) +add_compile_definitions(HAVE_LOCAL_LIBFVALUE) +add_compile_definitions(ZLIB_DLL) + +if(UNIX) + configure_file(common/config.h.in common/config.h) + add_compile_definitions(HAVE_CONFIG_H) + add_compile_definitions(LOCALEDIR="/usr/share/locale") +endif() + +if(MSVC) + add_compile_definitions(LIBVMDK_DLL_EXPORT) + set(LIB_RC libvmdk/libvmdk.rc) +endif() + + +include(GNUInstallDirs) +include(CMakePackageConfigHelpers) + +# Add CMake find_package() integration +set(PROJECT_TARGET_NAME "${PROJECT_NAME}") +set(CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") +set(PROJECT_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/generated/${PROJECT_TARGET_NAME}Config.cmake") +set(TARGETS_EXPORT_NAME "${PROJECT_TARGET_NAME}Targets") +set(NAMESPACE "libvmdk::") + +# Source files +file(GLOB LIB_SRC lib*/*.c) + +# Headers +file(GLOB LIB_INST_HEADERS include/libvmdk/*.h) + +add_library(${PROJECT_NAME} ${LIB_SRC} ${LIB_RC}) + +target_include_directories(${PROJECT_NAME} PRIVATE ./include ./common) +target_include_directories(${PROJECT_NAME} PRIVATE ./libbfio ./libcdata ./libcerror ./libcfile ./libclocale) +target_include_directories(${PROJECT_NAME} PRIVATE ./libcnotify ./libcpath ./libcsplit ./libcthreads) +target_include_directories(${PROJECT_NAME} PRIVATE ./libfcache ./libfdata ./libfvalue ./libuna) + +target_link_libraries(${PROJECT_NAME} PRIVATE ZLIB::ZLIB) + +install(TARGETS ${PROJECT_NAME} + EXPORT ${TARGETS_EXPORT_NAME} + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + INCLUDES DESTINATION include) + +install(FILES ${LIB_INST_HEADERS} DESTINATION include/libvmdk) +install(FILES include/libvmdk.h DESTINATION include) + + +# Generate and install libvmdkConfig.cmake +configure_package_config_file("Config.cmake.in" "${PROJECT_CONFIG}" INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}") +install(FILES "${PROJECT_CONFIG}" DESTINATION "${CONFIG_INSTALL_DIR}") + +# Generate and install libvmdkTargets*.cmake +install(EXPORT ${TARGETS_EXPORT_NAME} + NAMESPACE ${NAMESPACE} + DESTINATION "${CONFIG_INSTALL_DIR}") + diff --git a/externals/vcpkg/ports/libvmdk/Config.cmake.in b/externals/vcpkg/ports/libvmdk/Config.cmake.in new file mode 100755 index 000000000..bd6bd4532 --- /dev/null +++ b/externals/vcpkg/ports/libvmdk/Config.cmake.in @@ -0,0 +1,4 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") +check_required_components("@PROJECT_NAME@") diff --git a/externals/vcpkg/ports/libvmdk/portfile.cmake b/externals/vcpkg/ports/libvmdk/portfile.cmake new file mode 100755 index 000000000..1aac7f717 --- /dev/null +++ b/externals/vcpkg/ports/libvmdk/portfile.cmake @@ -0,0 +1,32 @@ +set(LIB_VERSION 20200926) +set(LIB_FILENAME libvmdk-alpha-${LIB_VERSION}.tar.gz) + +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/libyal/libvmdk/releases/download/${LIB_VERSION}/${LIB_FILENAME}" + FILENAME "${LIB_FILENAME}" + SHA512 e70c42580dc58ad0a6459fe461504a8ef128f8d5df9d500f84f316e627232606f22eb4906fc1debc3e75e71daa6a07951af80822695de13d5e466adda4cfd5e0 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${LIB_VERSION} +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" DESTINATION "${SOURCE_PATH}") + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/libvmdk" TARGET_PATH "share/libvmdk") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/libvmdk/vcpkg.json b/externals/vcpkg/ports/libvmdk/vcpkg.json new file mode 100755 index 000000000..9a9f7f705 --- /dev/null +++ b/externals/vcpkg/ports/libvmdk/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libvmdk", + "version-string": "20200926", + "port-version": 2, + "description": "Library and tools to access the VMware Virtual Disk (VMDK) format", + "homepage": "https://github.com/libyal/libvmdk", + "supports": "!uwp", + "dependencies": [ + "gettext", + "zlib" + ] +} diff --git a/externals/vcpkg/ports/libvorbis/0001-Dont-export-vorbisenc-functions.patch b/externals/vcpkg/ports/libvorbis/0001-Dont-export-vorbisenc-functions.patch new file mode 100755 index 000000000..f2bab5c6f --- /dev/null +++ b/externals/vcpkg/ports/libvorbis/0001-Dont-export-vorbisenc-functions.patch @@ -0,0 +1,16 @@ +diff --git a/win32/vorbis.def b/win32/vorbis.def +index 9cca64d..a80fff7 100644 +--- a/win32/vorbis.def ++++ b/win32/vorbis.def +@@ -49,11 +49,4 @@ vorbis_synthesis_idheader + ; + vorbis_window + ;_analysis_output_always +-vorbis_encode_init +-vorbis_encode_setup_managed +-vorbis_encode_setup_vbr +-vorbis_encode_init_vbr +-vorbis_encode_setup_init +-vorbis_encode_ctl +-; + vorbis_version_string diff --git a/externals/vcpkg/ports/libvorbis/0002-Fixup-pkgconfig-libs.patch b/externals/vcpkg/ports/libvorbis/0002-Fixup-pkgconfig-libs.patch new file mode 100755 index 000000000..85508f16f --- /dev/null +++ b/externals/vcpkg/ports/libvorbis/0002-Fixup-pkgconfig-libs.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f377c428..07530304 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,6 +60,9 @@ message(STATUS "Configuring ${PROJECT_NAME} ${PROJECT_VERSION}") + # Find math library + + check_library_exists(m floor "" HAVE_LIBM) ++if(HAVE_LIBM) ++ set(VORBIS_LIBS "-lm") ++endif() + + # Find ogg dependency + find_package(Ogg REQUIRED) + diff --git a/externals/vcpkg/ports/libvorbis/0003-def-mingw-compat.patch b/externals/vcpkg/ports/libvorbis/0003-def-mingw-compat.patch new file mode 100755 index 000000000..f1622d982 --- /dev/null +++ b/externals/vcpkg/ports/libvorbis/0003-def-mingw-compat.patch @@ -0,0 +1,33 @@ +diff --git a/win32/vorbis.def b/win32/vorbis.def +index 1310b6c..de14385 100644 +--- a/win32/vorbis.def ++++ b/win32/vorbis.def +@@ -1,6 +1,5 @@ + ; vorbis.def + ; +-LIBRARY + EXPORTS + _floor_P + _mapping_P +diff --git a/win32/vorbisenc.def b/win32/vorbisenc.def +index 79af064..40a3e39 100644 +--- a/win32/vorbisenc.def ++++ b/win32/vorbisenc.def +@@ -1,6 +1,5 @@ + ; vorbisenc.def + ; +-LIBRARY + + EXPORTS + vorbis_encode_init +diff --git a/win32/vorbisfile.def b/win32/vorbisfile.def +index 4dc5549..243795d 100644 +--- a/win32/vorbisfile.def ++++ b/win32/vorbisfile.def +@@ -1,6 +1,5 @@ + ; vorbisfile.def + ; +-LIBRARY + EXPORTS + ov_clear + ov_open diff --git a/externals/vcpkg/ports/libvorbis/portfile.cmake b/externals/vcpkg/ports/libvorbis/portfile.cmake new file mode 100755 index 000000000..95f2825b7 --- /dev/null +++ b/externals/vcpkg/ports/libvorbis/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xiph/vorbis + REF v1.3.7 + SHA512 bfb6f5dbfd49ed38b2b08b3667c06d02e68f649068a050f21a3cc7e1e56b27afd546aaa3199c4f6448f03f6e66a82f9a9dc2241c826d3d1d4acbd38339b9e9fb + HEAD_REF master + PATCHES + 0001-Dont-export-vorbisenc-functions.patch + 0002-Fixup-pkgconfig-libs.patch + 0003-def-mingw-compat.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME Vorbis CONFIG_PATH "lib/cmake/Vorbis") +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libvorbis/usage b/externals/vcpkg/ports/libvorbis/usage new file mode 100755 index 000000000..c20766a90 --- /dev/null +++ b/externals/vcpkg/ports/libvorbis/usage @@ -0,0 +1,13 @@ +The package libvorbis provides CMake targets: + + # Vorbis reference encoder and decoder, low-level API + find_package(Vorbis CONFIG REQUIRED) + target_link_libraries(main PRIVATE Vorbis::vorbis) + + # Audio stream decoding and basic manipulation, high-level API + find_package(Vorbis CONFIG REQUIRED) + target_link_libraries(main PRIVATE Vorbis::vorbisfile) + + # Convenience API for setting up an encoding environment + find_package(Vorbis CONFIG REQUIRED) + target_link_libraries(main PRIVATE Vorbis::vorbisenc) diff --git a/externals/vcpkg/ports/libvorbis/vcpkg.json b/externals/vcpkg/ports/libvorbis/vcpkg.json new file mode 100755 index 000000000..65c5edd85 --- /dev/null +++ b/externals/vcpkg/ports/libvorbis/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "libvorbis", + "version": "1.3.7", + "port-version": 2, + "description": "Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free, general-purpose compressed audio format", + "homepage": "https://github.com/xiph/vorbis", + "license": "BSD-3-Clause", + "dependencies": [ + "libogg", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch b/externals/vcpkg/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch new file mode 100755 index 000000000..5f4749ae0 --- /dev/null +++ b/externals/vcpkg/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch @@ -0,0 +1,21 @@ +diff --git a/build/make/configure.sh b/build/make/configure.sh +index 81d30a1..325017e 100644 +--- a/build/make/configure.sh ++++ b/build/make/configure.sh +@@ -1370,12 +1370,14 @@ EOF + case ${tgt_os} in + win32) + add_asflags -f win32 +- enabled debug && add_asflags -g cv8 ++ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8 ++ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8 + EXE_SFX=.exe + ;; + win64) + add_asflags -f win64 +- enabled debug && add_asflags -g cv8 ++ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8 ++ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8 + EXE_SFX=.exe + ;; + linux*|solaris*|android*) diff --git a/externals/vcpkg/ports/libvpx/0003-add-uwp-v142-and-v143-support.patch b/externals/vcpkg/ports/libvpx/0003-add-uwp-v142-and-v143-support.patch new file mode 100755 index 000000000..fd82486c1 --- /dev/null +++ b/externals/vcpkg/ports/libvpx/0003-add-uwp-v142-and-v143-support.patch @@ -0,0 +1,201 @@ +diff --git a/build/make/configure.sh b/build/make/configure.sh +index 325017e..5ab54e4 100644 +--- a/build/make/configure.sh ++++ b/build/make/configure.sh +@@ -1016,7 +1016,7 @@ EOF + # A number of ARM-based Windows platforms are constrained by their + # respective SDKs' limitations. Fortunately, these are all 32-bit ABIs + # and so can be selected as 'win32'. +- if [ ${tgt_os} = "win32" ]; then ++ if [ ${tgt_os} = "win32" ] || [ ${tgt_isa} = "armv7" ]; then + asm_conversion_cmd="${source_path_mk}/build/make/ads2armasm_ms.pl" + AS_SFX=.S + msvs_arch_dir=arm-msvs +@@ -1250,6 +1250,9 @@ EOF + android) + soft_enable realtime_only + ;; ++ uwp) ++ enabled gcc && add_cflags -fno-common ++ ;; + win*) + enabled gcc && add_cflags -fno-common + ;; +@@ -1368,6 +1371,16 @@ EOF + fi + AS_SFX=.asm + case ${tgt_os} in ++ uwp) ++ if [ {$tgt_isa} = "x86" ] || [ {$tgt_isa} = "armv7" ]; then ++ add_asflags -f win32 ++ else ++ add_asflags -f win64 ++ fi ++ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8 ++ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8 ++ EXE_SFX=.exe ++ ;; + win32) + add_asflags -f win32 + enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8 +@@ -1488,6 +1501,8 @@ EOF + # Almost every platform uses pthreads. + if enabled multithread; then + case ${toolchain} in ++ *-uwp-vs*) ++ ;; + *-win*-vs*) + ;; + *-android-gcc) +diff --git a/build/make/gen_msvs_sln.sh b/build/make/gen_msvs_sln.sh +index d1adfd7..a03ea59 100644 +--- a/build/make/gen_msvs_sln.sh ++++ b/build/make/gen_msvs_sln.sh +@@ -219,6 +219,7 @@ for opt in "$@"; do + 14) vs_year=2015 ;; + 15) vs_year=2017 ;; + 16) vs_year=2019 ;; ++ 17) vs_year=2022 ;; + *) die Unrecognized Visual Studio Version in $opt ;; + esac + ;; +diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh +index 6f91ad4..b4cad6c 100644 +--- a/build/make/gen_msvs_vcxproj.sh ++++ b/build/make/gen_msvs_vcxproj.sh +@@ -170,7 +170,7 @@ for opt in "$@"; do + --ver=*) + vs_ver="$optval" + case "$optval" in +- 1[4-6]) ++ 1[4-7]) + ;; + *) die Unrecognized Visual Studio Version in $opt + ;; +@@ -296,7 +296,22 @@ generate_vcxproj() { + tag_content ProjectGuid "{${guid}}" + tag_content RootNamespace ${name} + tag_content Keyword ManagedCProj +- if [ $vs_ver -ge 12 ] && [ "${platforms[0]}" = "ARM" ]; then ++ if [ $vs_ver -ge 16 ]; then ++ if [[ $target =~ [^-]*-uwp-.* ]]; then ++ # Universal Windows Applications ++ tag_content AppContainerApplication true ++ tag_content ApplicationType "Windows Store" ++ tag_content ApplicationTypeRevision 10.0 ++ fi ++ if [[ $target =~ [^-]*-uwp-.* ]] || [ "${platforms[0]}" = "ARM" ] || [ "${platforms[0]}" = "ARM64" ]; then ++ # Default to the latest Windows 10 SDK ++ tag_content WindowsTargetPlatformVersion 10.0 ++ else ++ # Minimum supported version of Windows for the desktop ++ tag_content WindowsTargetPlatformVersion 8.1 ++ fi ++ tag_content MinimumVisualStudioVersion 16.0 ++ elif [ $vs_ver -ge 12 ] && [ "${platforms[0]}" = "ARM" ]; then + tag_content AppContainerApplication true + # The application type can be one of "Windows Store", + # "Windows Phone" or "Windows Phone Silverlight". The +@@ -344,6 +359,9 @@ generate_vcxproj() { + if [ "$vs_ver" = "16" ]; then + tag_content PlatformToolset v142 + fi ++ if [ "$vs_ver" = "17" ]; then ++ tag_content PlatformToolset v143 ++ fi + tag_content CharacterSet Unicode + if [ "$config" = "Release" ]; then + tag_content WholeProgramOptimization true +@@ -391,7 +409,7 @@ generate_vcxproj() { + Condition="'\$(Configuration)|\$(Platform)'=='$config|$plat'" + if [ "$name" == "vpx" ]; then + hostplat=$plat +- if [ "$hostplat" == "ARM" ]; then ++ if [ "$hostplat" == "ARM" ] && [ $vs_ver -le 15 ]; then + hostplat=Win32 + fi + fi +diff --git a/configure b/configure +index da631a4..2804678 100644 +--- a/configure ++++ b/configure +@@ -101,16 +101,24 @@ all_platforms="${all_platforms} arm64-android-gcc" + all_platforms="${all_platforms} arm64-darwin-gcc" + all_platforms="${all_platforms} arm64-darwin20-gcc" + all_platforms="${all_platforms} arm64-linux-gcc" ++all_platforms="${all_platforms} arm64-uwp-vs16" ++all_platforms="${all_platforms} arm64-uwp-vs17" + all_platforms="${all_platforms} arm64-win64-gcc" + all_platforms="${all_platforms} arm64-win64-vs15" ++all_platforms="${all_platforms} arm64-win64-vs16" ++all_platforms="${all_platforms} arm64-win64-vs17" + all_platforms="${all_platforms} armv7-android-gcc" #neon Cortex-A8 + all_platforms="${all_platforms} armv7-darwin-gcc" #neon Cortex-A8 + all_platforms="${all_platforms} armv7-linux-rvct" #neon Cortex-A8 + all_platforms="${all_platforms} armv7-linux-gcc" #neon Cortex-A8 + all_platforms="${all_platforms} armv7-none-rvct" #neon Cortex-A8 ++all_platforms="${all_platforms} armv7-uwp-vs16" ++all_platforms="${all_platforms} armv7-uwp-vs17" + all_platforms="${all_platforms} armv7-win32-gcc" + all_platforms="${all_platforms} armv7-win32-vs14" + all_platforms="${all_platforms} armv7-win32-vs15" ++all_platforms="${all_platforms} armv7-win32-vs16" ++all_platforms="${all_platforms} armv7-win32-vs17" + all_platforms="${all_platforms} armv7s-darwin-gcc" + all_platforms="${all_platforms} armv8-linux-gcc" + all_platforms="${all_platforms} mips32-linux-gcc" +@@ -135,10 +143,13 @@ all_platforms="${all_platforms} x86-linux-gcc" + all_platforms="${all_platforms} x86-linux-icc" + all_platforms="${all_platforms} x86-os2-gcc" + all_platforms="${all_platforms} x86-solaris-gcc" ++all_platforms="${all_platforms} x86-uwp-vs16" ++all_platforms="${all_platforms} x86-uwp-vs17" + all_platforms="${all_platforms} x86-win32-gcc" + all_platforms="${all_platforms} x86-win32-vs14" + all_platforms="${all_platforms} x86-win32-vs15" + all_platforms="${all_platforms} x86-win32-vs16" ++all_platforms="${all_platforms} x86-win32-vs17" + all_platforms="${all_platforms} x86_64-android-gcc" + all_platforms="${all_platforms} x86_64-darwin9-gcc" + all_platforms="${all_platforms} x86_64-darwin10-gcc" +@@ -156,10 +167,13 @@ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc" + all_platforms="${all_platforms} x86_64-linux-gcc" + all_platforms="${all_platforms} x86_64-linux-icc" + all_platforms="${all_platforms} x86_64-solaris-gcc" ++all_platforms="${all_platforms} x86_64-uwp-vs16" ++all_platforms="${all_platforms} x86_64-uwp-vs17" + all_platforms="${all_platforms} x86_64-win64-gcc" + all_platforms="${all_platforms} x86_64-win64-vs14" + all_platforms="${all_platforms} x86_64-win64-vs15" + all_platforms="${all_platforms} x86_64-win64-vs16" ++all_platforms="${all_platforms} x86_64-win64-vs17" + all_platforms="${all_platforms} generic-gnu" + + # all_targets is a list of all targets that can be configured +@@ -476,11 +490,10 @@ process_targets() { + ! enabled multithread && DIST_DIR="${DIST_DIR}-nomt" + ! enabled install_docs && DIST_DIR="${DIST_DIR}-nodocs" + DIST_DIR="${DIST_DIR}-${tgt_isa}-${tgt_os}" +- case "${tgt_os}" in +- win*) enabled static_msvcrt && DIST_DIR="${DIST_DIR}mt" || DIST_DIR="${DIST_DIR}md" +- DIST_DIR="${DIST_DIR}-${tgt_cc}" +- ;; +- esac ++ if [[ ${tgt_os} =~ win.* ]] || [ "${tgt_os}" = "uwp" ]; then ++ enabled static_msvcrt && DIST_DIR="${DIST_DIR}mt" || DIST_DIR="${DIST_DIR}md" ++ DIST_DIR="${DIST_DIR}-${tgt_cc}" ++ fi + if [ -f "${source_path}/build/make/version.sh" ]; then + ver=`"$source_path/build/make/version.sh" --bare "$source_path"` + DIST_DIR="${DIST_DIR}-${ver}" +@@ -569,6 +582,10 @@ process_detect() { + + # Specialize windows and POSIX environments. + case $toolchain in ++ *-uwp-*) ++ # Don't check for any headers in UWP builds. ++ false ++ ;; + *-win*-*) + # Don't check for any headers in Windows builds. + false diff --git a/externals/vcpkg/ports/libvpx/0004-remove-library-suffixes.patch b/externals/vcpkg/ports/libvpx/0004-remove-library-suffixes.patch new file mode 100755 index 000000000..e7f827d7b --- /dev/null +++ b/externals/vcpkg/ports/libvpx/0004-remove-library-suffixes.patch @@ -0,0 +1,13 @@ +diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh +index 916851662..e60405bc9 100755 +--- a/build/make/gen_msvs_vcxproj.sh ++++ b/build/make/gen_msvs_vcxproj.sh +@@ -394,7 +394,7 @@ generate_vcxproj() { + else + config_suffix="" + fi +- tag_content TargetName "${name}${lib_sfx}${config_suffix}" ++ tag_content TargetName "${name}" + fi + close_tag PropertyGroup + done diff --git a/externals/vcpkg/ports/libvpx/portfile.cmake b/externals/vcpkg/ports/libvpx/portfile.cmake new file mode 100755 index 000000000..8126ad722 --- /dev/null +++ b/externals/vcpkg/ports/libvpx/portfile.cmake @@ -0,0 +1,283 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +set(LIBVPX_VERSION 1.11.0) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO webmproject/libvpx + REF v${LIBVPX_VERSION} + SHA512 7aa5d30afa956dccda60917fd82f6f9992944ca893437c8cd53a04d1b7a94e0210431954aa136594dc400340123cc166dcc855753e493c8d929667f4c42b65a5 + HEAD_REF master + PATCHES + 0002-Fix-nasm-debug-format-flag.patch + 0003-add-uwp-v142-and-v143-support.patch + 0004-remove-library-suffixes.patch +) + +vcpkg_find_acquire_program(PERL) + +get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) + +if(CMAKE_HOST_WIN32) + vcpkg_acquire_msys(MSYS_ROOT PACKAGES make) + set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) + set(ENV{PATH} "${MSYS_ROOT}/usr/bin;$ENV{PATH};${PERL_EXE_PATH}") +else() + set(BASH /bin/bash) + set(ENV{PATH} "${MSYS_ROOT}/usr/bin:$ENV{PATH}:${PERL_EXE_PATH}") +endif() + +vcpkg_find_acquire_program(NASM) +get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) +vcpkg_add_to_path(${NASM_EXE_PATH}) + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") + + if(VCPKG_CRT_LINKAGE STREQUAL static) + set(LIBVPX_CRT_LINKAGE --enable-static-msvcrt) + set(LIBVPX_CRT_SUFFIX mt) + else() + set(LIBVPX_CRT_SUFFIX md) + endif() + + if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore AND (VCPKG_PLATFORM_TOOLSET STREQUAL v142 OR VCPKG_PLATFORM_TOOLSET STREQUAL v143)) + set(LIBVPX_TARGET_OS "uwp") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x86 OR VCPKG_TARGET_ARCHITECTURE STREQUAL arm) + set(LIBVPX_TARGET_OS "win32") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64 OR VCPKG_TARGET_ARCHITECTURE STREQUAL arm64) + set(LIBVPX_TARGET_OS "win64") + endif() + + if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) + set(LIBVPX_TARGET_ARCH "x86-${LIBVPX_TARGET_OS}") + set(LIBVPX_ARCH_DIR "Win32") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) + set(LIBVPX_TARGET_ARCH "x86_64-${LIBVPX_TARGET_OS}") + set(LIBVPX_ARCH_DIR "x64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64) + set(LIBVPX_TARGET_ARCH "arm64-${LIBVPX_TARGET_OS}") + set(LIBVPX_ARCH_DIR "ARM64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm) + set(LIBVPX_TARGET_ARCH "armv7-${LIBVPX_TARGET_OS}") + set(LIBVPX_ARCH_DIR "ARM") + endif() + + if(VCPKG_PLATFORM_TOOLSET STREQUAL v143) + set(LIBVPX_TARGET_VS "vs17") + elseif(VCPKG_PLATFORM_TOOLSET STREQUAL v142) + set(LIBVPX_TARGET_VS "vs16") + else() + set(LIBVPX_TARGET_VS "vs15") + endif() + + set(OPTIONS "--disable-examples --disable-tools --disable-docs --enable-pic") + + if("realtime" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-realtime-only") + endif() + + if("highbitdepth" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-vp9-highbitdepth") + endif() + + message(STATUS "Generating makefile") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") + vcpkg_execute_required_process( + COMMAND + ${BASH} --noprofile --norc + "${SOURCE_PATH}/configure" + --target=${LIBVPX_TARGET_ARCH}-${LIBVPX_TARGET_VS} + ${LIBVPX_CRT_LINKAGE} + ${OPTIONS} + --as=nasm + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}" + LOGNAME configure-${TARGET_TRIPLET}) + + message(STATUS "Generating MSBuild projects") + vcpkg_execute_required_process( + COMMAND + ${BASH} --noprofile --norc -c "make dist" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}" + LOGNAME generate-${TARGET_TRIPLET}) + + vcpkg_build_msbuild( + PROJECT_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vpx.vcxproj" + OPTIONS /p:UseEnv=True + ) + + # note: pdb file names are hardcoded in the lib file, cannot rename + set(LIBVPX_OUTPUT_PREFIX "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(INSTALL "${LIBVPX_OUTPUT_PREFIX}/Release/vpx.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + if (EXISTS "${LIBVPX_OUTPUT_PREFIX}/Release/vpx.pdb") + file(INSTALL "${LIBVPX_OUTPUT_PREFIX}/Release/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + else() + file(INSTALL "${LIBVPX_OUTPUT_PREFIX}/Release/vpx/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + endif() + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(INSTALL "${LIBVPX_OUTPUT_PREFIX}/Debug/vpx.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + if (EXISTS "${LIBVPX_OUTPUT_PREFIX}/Debug/vpx.pdb") + file(INSTALL "${LIBVPX_OUTPUT_PREFIX}/Debug/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + else() + file(INSTALL "${LIBVPX_OUTPUT_PREFIX}/Debug/vpx/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + endif() + endif() + + if (VCPKG_TARGET_ARCHITECTURE STREQUAL arm64) + set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vpx-vp8-vp9-nopost-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${LIBVPX_VERSION}/include/vpx") + elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL arm) + set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vpx-vp8-vp9-nopost-nomt-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${LIBVPX_VERSION}/include/vpx") + else() + set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vpx-vp8-vp9-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${LIBVPX_VERSION}/include/vpx") + endif() + file( + INSTALL + "${LIBVPX_INCLUDE_DIR}" + DESTINATION + "${CURRENT_PACKAGES_DIR}/include" + RENAME + "vpx") + if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(LIBVPX_PREFIX "${CURRENT_INSTALLED_DIR}") + configure_file("${CMAKE_CURRENT_LIST_DIR}/vpx.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/vpx.pc" @ONLY) + endif() + + if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(LIBVPX_PREFIX "${CURRENT_INSTALLED_DIR}/debug") + configure_file("${CMAKE_CURRENT_LIST_DIR}/vpx.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/vpx.pc" @ONLY) + endif() + +else() + + set(OPTIONS "--disable-examples --disable-tools --disable-docs --disable-unit-tests --enable-pic") + + set(OPTIONS_DEBUG "--enable-debug-libs --enable-debug --prefix=${CURRENT_PACKAGES_DIR}/debug") + set(OPTIONS_RELEASE "--prefix=${CURRENT_PACKAGES_DIR}") + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(OPTIONS "${OPTIONS} --disable-static --enable-shared") + else() + set(OPTIONS "${OPTIONS} --enable-static --disable-shared") + endif() + + if("realtime" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-realtime-only") + endif() + + if("highbitdepth" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-vp9-highbitdepth") + endif() + + if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) + set(LIBVPX_TARGET_ARCH "x86") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) + set(LIBVPX_TARGET_ARCH "x86_64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64) + set(LIBVPX_TARGET_ARCH "arm64") + else() + message(FATAL_ERROR "libvpx does not support architecture ${VCPKG_TARGET_ARCHITECTURE}") + endif() + + if(VCPKG_TARGET_IS_MINGW) + if(LIBVPX_TARGET_ARCH STREQUAL "x86") + set(LIBVPX_TARGET "x86-win32-gcc") + else() + set(LIBVPX_TARGET "x86_64-win64-gcc") + endif() + elseif(VCPKG_TARGET_IS_LINUX) + set(LIBVPX_TARGET "${LIBVPX_TARGET_ARCH}-linux-gcc") + elseif(VCPKG_TARGET_IS_OSX) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(LIBVPX_TARGET "arm64-darwin20-gcc") + else() + set(LIBVPX_TARGET "${LIBVPX_TARGET_ARCH}-darwin17-gcc") # enable latest CPU instructions for best performance and less CPU usage on MacOS + endif() + else() + set(LIBVPX_TARGET "generic-gnu") # use default target + endif() + + message(STATUS "Build info. Target: ${LIBVPX_TARGET}; Options: ${OPTIONS}") + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + message(STATUS "Configuring libvpx for Release") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + vcpkg_execute_required_process( + COMMAND + ${BASH} --noprofile --norc + "${SOURCE_PATH}/configure" + --target=${LIBVPX_TARGET} + ${OPTIONS} + ${OPTIONS_RELEASE} + --as=nasm + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + LOGNAME configure-${TARGET_TRIPLET}-rel) + + message(STATUS "Building libvpx for Release") + vcpkg_execute_required_process( + COMMAND + ${BASH} --noprofile --norc -c "make -j8" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + LOGNAME build-${TARGET_TRIPLET}-rel + ) + + message(STATUS "Installing libvpx for Release") + vcpkg_execute_required_process( + COMMAND + ${BASH} --noprofile --norc -c "make install" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + LOGNAME install-${TARGET_TRIPLET}-rel + ) + endif() + + # --- --- --- + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + message(STATUS "Configuring libvpx for Debug") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + vcpkg_execute_required_process( + COMMAND + ${BASH} --noprofile --norc + "${SOURCE_PATH}/configure" + --target=${LIBVPX_TARGET} + ${OPTIONS} + ${OPTIONS_DEBUG} + --as=nasm + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + LOGNAME configure-${TARGET_TRIPLET}-dbg) + + message(STATUS "Building libvpx for Debug") + vcpkg_execute_required_process( + COMMAND + ${BASH} --noprofile --norc -c "make -j8" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + LOGNAME build-${TARGET_TRIPLET}-dbg + ) + + message(STATUS "Installing libvpx for Debug") + vcpkg_execute_required_process( + COMMAND + ${BASH} --noprofile --norc -c "make install" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + LOGNAME install-${TARGET_TRIPLET}-dbg + ) + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libvpx_g.a") + endif() +endif() + +vcpkg_fixup_pkgconfig() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(LIBVPX_CONFIG_DEBUG ON) +else() + set(LIBVPX_CONFIG_DEBUG OFF) +endif() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-libvpx-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-libvpx/unofficial-libvpx-config.cmake" @ONLY) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libvpx/unofficial-libvpx-config.cmake.in b/externals/vcpkg/ports/libvpx/unofficial-libvpx-config.cmake.in new file mode 100755 index 000000000..c335d91a3 --- /dev/null +++ b/externals/vcpkg/ports/libvpx/unofficial-libvpx-config.cmake.in @@ -0,0 +1,49 @@ +if(NOT TARGET unofficial::libvpx::libvpx) + # Compute the installation prefix relative to this file. + get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) + get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + + # Add library target (note: vpx always has a static build in vcpkg). + add_library(unofficial::libvpx::libvpx STATIC IMPORTED) + + # Add interface include directories and link interface languages (applies to all configurations). + set_target_properties(unofficial::libvpx::libvpx PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + ) + list(APPEND _IMPORT_CHECK_FILES "${_IMPORT_PREFIX}/include/vpx/vpx_codec.h") + + # Add release configuration properties. + find_library(_LIBFILE_RELEASE NAMES vpx PATHS "${_IMPORT_PREFIX}/lib/" NO_DEFAULT_PATH) + set_property(TARGET unofficial::libvpx::libvpx + APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + set_target_properties(unofficial::libvpx::libvpx PROPERTIES + IMPORTED_LOCATION_RELEASE ${_LIBFILE_RELEASE}) + list(APPEND _IMPORT_CHECK_FILES ${_LIBFILE_RELEASE}) + unset(_LIBFILE_RELEASE CACHE) + + # Add debug configuration properties. + if(@LIBVPX_CONFIG_DEBUG@) + find_library(_LIBFILE_DEBUG NAMES vpx PATHS "${_IMPORT_PREFIX}/debug/lib/" NO_DEFAULT_PATH) + set_property(TARGET unofficial::libvpx::libvpx + APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + set_target_properties(unofficial::libvpx::libvpx PROPERTIES + IMPORTED_LOCATION_DEBUG ${_LIBFILE_DEBUG}) + list(APPEND _IMPORT_CHECK_FILES ${_LIBFILE_DEBUG}) + unset(_LIBFILE_DEBUG CACHE) + endif() + + # Check header and library files are present. + foreach(file ${_IMPORT_CHECK_FILES} ) + if(NOT EXISTS "${file}" ) + message(FATAL_ERROR "unofficial::libvpx::libvpx references the file + \"${file}\" +but this file does not exist. Possible reasons include: +* The file was deleted, renamed, or moved to another location. +* An install or uninstall procedure did not complete successfully. +") + endif() + endforeach() + unset(_IMPORT_CHECK_FILES) +endif() diff --git a/externals/vcpkg/ports/libvpx/vcpkg.json b/externals/vcpkg/ports/libvpx/vcpkg.json new file mode 100755 index 000000000..05d404362 --- /dev/null +++ b/externals/vcpkg/ports/libvpx/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "libvpx", + "version": "1.11.0", + "port-version": 1, + "description": "The reference software implementation for the video coding formats VP8 and VP9.", + "homepage": "https://github.com/webmproject/libvpx", + "license": "BSD-3-Clause", + "features": { + "highbitdepth": { + "description": "use VP9 high bit depth (10/12) profiles" + }, + "realtime": { + "description": "enable this option while building for real-time encoding" + } + } +} diff --git a/externals/vcpkg/ports/libvpx/vpx.pc.in b/externals/vcpkg/ports/libvpx/vpx.pc.in new file mode 100755 index 000000000..c01bb2e9b --- /dev/null +++ b/externals/vcpkg/ports/libvpx/vpx.pc.in @@ -0,0 +1,13 @@ +prefix=@LIBVPX_PREFIX@ +# pkg-config file from libvpx v1.10.0 +exec_prefix=${prefix} +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: vpx +Description: WebM Project VPx codec implementation +Version: @LIBVPX_VERSION@ +Requires: +Conflicts: +Libs: -L"${libdir}" -lvpx +Cflags: -I"${includedir}" diff --git a/externals/vcpkg/ports/libwandio/configure.lib.patch b/externals/vcpkg/ports/libwandio/configure.lib.patch new file mode 100755 index 000000000..7c0d1651b --- /dev/null +++ b/externals/vcpkg/ports/libwandio/configure.lib.patch @@ -0,0 +1,105 @@ +diff --git a/configure.ac b/configure.ac +index 4579fbb3d..f6be008c8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -112,10 +112,11 @@ AC_HEADER_STDC + AC_CHECK_HEADERS(stddef.h inttypes.h sys/prctl.h) + + # Checks for various "optional" libraries +-AC_CHECK_LIB(pthread, pthread_create, have_pthread=1, have_pthread=0) ++# AC_CHECK_LIB(pthread, pthread_create, have_pthread=1, have_pthread=0) ++AC_SEARCH_LIBS(pthread_create, [pthreadGC pthreadVC pthread], have_pthread=1, have_pthread=0) + + if test "$have_pthread" = 1; then +- LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lpthread" ++ LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_pthread_create" + AC_DEFINE(HAVE_LIBPTHREAD, 1, [Set to 1 if pthreads are supported]) + fi + +@@ -128,12 +129,13 @@ AC_ARG_WITH([bzip2], + + AS_IF([test "x$with_bzip2" != "xno"], + [ +- AC_CHECK_LIB(bz2, BZ2_bzDecompressInit, have_bzip=yes, have_bzip=no) ++ AC_SEARCH_LIBS(BZ2_bzDecompressInit, [bz2 bz2d bzip2 bzip2d], have_bzip=yes, have_bzip=no) ++ # AC_CHECK_LIB(bz2, BZ2_bzDecompressInit, have_bzip=yes, have_bzip=no) + ], [have_bzip=no]) + + AS_IF([test "x$have_bzip" = "xyes"], [ +- if test "$ac_cv_lib_bz2_BZ2_bzDecompressInit" != "none required"; then +- LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lbz2" ++ if test "$ac_cv_search_BZ2_bzDecompressInit" != "none required"; then ++ LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_BZ2_bzDecompressInit" + fi + with_bzip2=yes + AC_DEFINE(HAVE_LIBBZ2, 1, "Compiled with bzip2 support")], +@@ -149,12 +151,13 @@ AC_ARG_WITH([zlib], + + AS_IF([test "x$with_zlib" != "xno"], + [ +- AC_CHECK_LIB(z, deflate, have_zlib=yes, have_zlib=no) ++ AC_SEARCH_LIBS(deflate, [z zlib zlibd zd], have_zlib=yes, have_zlib=no) ++ # AC_CHECK_LIB(z, deflate, have_zlib=yes, have_zlib=no) + ], [have_zlib=no]) + + AS_IF([test "x$have_zlib" = "xyes"], [ +- if test "$ac_cv_lib_z_deflate" != "none required"; then +- LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lz" ++ if test "$ac_cv_search_deflate" != "none required"; then ++ LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_deflate" + fi + AC_DEFINE(HAVE_LIBZ, 1, "Compiled with zlib support") + with_zlib=yes], +@@ -193,12 +196,13 @@ AC_ARG_WITH([lzma], + + AS_IF([test "x$with_lzma" != "xno"], + [ +- AC_CHECK_HEADER(lzma.h, have_lzma=yes, have_lzma=no) ++ # AC_CHECK_HEADER(lzma.h, have_lzma=yes, have_lzma=no) ++ AC_SEARCH_LIBS(lzma_free, [lzma], have_lzma=yes, have_lzma=no) + ], [have_lzma=no]) + + AS_IF([test "x$have_lzma" = "xyes"], [ +- if test "$ac_cv_lib_lzma_code" != "none required"; then +- LIBWANDIO_LIBS="$LIBWANDIO_LIBS -llzma" ++ if test "$ac_cv_search_lzma_free" != "none required"; then ++ LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_lzma_free" + fi + AC_DEFINE(HAVE_LIBLZMA, 1, "Compiled with lzma support") + with_lzma=yes], +@@ -259,25 +264,28 @@ AC_ARG_WITH([lz4], + + AS_IF([test "x$with_lz4" != "xno"], + [ +- AC_CHECK_LIB(lz4, LZ4F_createDecompressionContext, have_lz4f=yes, have_lz4f=no) ++ AC_SEARCH_LIBS(LZ4F_createDecompressionContext, [lz4 lz4d], have_lz4f=yes, have_lz4f=no) ++ # AC_CHECK_LIB(lz4, LZ4F_createDecompressionContext, have_lz4f=yes, have_lz4f=no) + ], [have_zstd=no]) + + AS_IF([test "x$have_lz4f" = "xyes"], [ +- if test "$ac_cv_lib_lz4_code" != "none required"; then +- LIBWANDIO_LIBS="$LIBWANDIO_LIBS -llz4" ++ if test "$ac_cv_search_LZ4F_createDecompressionContext" != "none required"; then ++ LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_LZ4F_createDecompressionContext" + fi + AC_DEFINE(HAVE_LIBLZ4F, 1, "Compiled with lz4 frame support") +- AC_CHECK_LIB(lz4, LZ4F_getVersion, have_lz4_173=yes, have_lz4_173=no) ++ AC_SEARCH_LIBS(LZ4F_getVersion, [lz4 lz4d], have_lz4_173=yes, have_lz4_173=no) ++ # AC_CHECK_LIB(lz4, LZ4F_getVersion, have_lz4_173=yes, have_lz4_173=no) + if test "x$have_lz4_173" = "xyes"; then + AC_DEFINE(HAVE_LIBLZ4_MOVABLE, 1, "If defined then liblz4 does NOT have the ERROR_srcPtr_wrong bug") + fi + with_lz4=frameapi], + [ + AC_DEFINE(HAVE_LIBLZ4F, 0, "Compiled with lz4 frame support") +- AC_CHECK_LIB(lz4, LZ4_decompress_safe_continue, have_lz4s=yes, have_lz4s=no) ++ AC_SEARCH_LIBS(LZ4_decompress_safe_continue, [lz4 lz4d], have_lz4s=yes, have_lz4s=no) ++ # AC_CHECK_LIB(lz4, LZ4_decompress_safe_continue, have_lz4s=yes, have_lz4s=no) + AS_IF([test "x$have_lz4s" = "xyes"], [ +- if test "$ac_cv_lib_lz4_code" != "none required"; then +- LIBWANDIO_LIBS="$LIBWANDIO_LIBS -llz4" ++ if test "$ac_cv_search_LZ4_decompress_safe_continue" != "none required"; then ++ LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_LZ4_decompress_safe_continue" + fi + AC_DEFINE(HAVE_LIBLZ4S, 1, "Compiled with lz4 stream support") + with_lz4=streamapi diff --git a/externals/vcpkg/ports/libwandio/configure.patch b/externals/vcpkg/ports/libwandio/configure.patch new file mode 100755 index 000000000..929662d67 --- /dev/null +++ b/externals/vcpkg/ports/libwandio/configure.patch @@ -0,0 +1,14 @@ +diff --git a/configure.ac b/configure.ac +index e250c0c31..0465120ba 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -83,7 +83,7 @@ ADD_INCLS="" + ADD_LDFLAGS="$ADD_LDFLAGS -L\$(abs_top_srcdir)/lib" + LIBWANDIO_LIBS="" + +-CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wextra -DLT_BUILDING_DLL=1" ++CFLAGS="$CFLAGS -Wall -DLT_BUILDING_DLL=1 -DNOMINMAX" +-CXXFLAGS="$CXXFLAGS -Wall -DLT_BUILDING_DLL=1" ++CXXFLAGS="$CXXFLAGS -Wall -DLT_BUILDING_DLL=1 -DNOMINMAX" + + # Check for -fvisibility diff --git a/externals/vcpkg/ports/libwandio/curl.patch b/externals/vcpkg/ports/libwandio/curl.patch new file mode 100755 index 000000000..326700ed0 --- /dev/null +++ b/externals/vcpkg/ports/libwandio/curl.patch @@ -0,0 +1,22 @@ +diff --git a/configure.ac b/configure.ac +index 4579fbb3d..f6be008c8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -296,12 +304,14 @@ AC_ARG_WITH([http], + AS_IF([test "x$with_http" != "xno"], + [ + # we need curl_easy_pause which was added in 7.18.0 +- AC_CHECK_LIB(curl, curl_easy_pause, have_curl=yes, have_curl=no) ++ AC_SEARCH_LIBS(curl_easy_pause, [curl curl-d libcurl libcurl-d], have_curl=yes, have_curl=no, [-lCrypt32 -lWldap32 -lWs2_32 -ladvapi32]) ++ # AC_CHECK_LIB(curl, curl_easy_pause, have_curl=yes, have_curl=no) + ], [have_curl=no]) + + AS_IF([test "x$have_curl" = "xyes"], [ +- if test "$ac_cv_lib_curl_curl_easy_pause" != "none required"; then +- LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lcurl" ++ if test "$ac_cv_search_curl_easy_pause" != "none required"; then ++ LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lCrypt32 -lWldap32 -lWs2_32 -ladvapi32 $ac_cv_search_curl_easy_pause" ++ LIBS="$LIBS" + fi + AC_DEFINE(HAVE_HTTP, 1, "Compiled with http support") + with_http=yes], diff --git a/externals/vcpkg/ports/libwandio/openssl.patch b/externals/vcpkg/ports/libwandio/openssl.patch new file mode 100755 index 000000000..586cdfab5 --- /dev/null +++ b/externals/vcpkg/ports/libwandio/openssl.patch @@ -0,0 +1,22 @@ +diff --git a/configure.ac b/configure.ac +index 4579fbb3d..f6be008c8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -296,12 +304,14 @@ AC_ARG_WITH([http], + AS_IF([test "x$with_http" != "xno"], + [ + # we need curl_easy_pause which was added in 7.18.0 +- AC_CHECK_LIB(curl, curl_easy_pause, have_curl=yes, have_curl=no) ++ AC_SEARCH_LIBS(curl_easy_pause, [curl curl-d], have_curl=yes, have_curl=no, [-lssl -lcrypto $ac_cv_search_pthread_create -ldl]) ++ # AC_CHECK_LIB(curl, curl_easy_pause, have_curl=yes, have_curl=no) + ], [have_curl=no]) + + AS_IF([test "x$have_curl" = "xyes"], [ +- if test "$ac_cv_lib_curl_curl_easy_pause" != "none required"; then +- LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lcurl" ++ if test "$ac_cv_search_curl_easy_pause" != "none required"; then ++ LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_curl_easy_pause -lssl -lcrypto $ac_cv_search_pthread_create -ldl" ++ LIBS="$LIBS -lssl -lcrypto $ac_cv_search_pthread_create -ldl" + fi + AC_DEFINE(HAVE_HTTP, 1, "Compiled with http support") + with_http=yes], diff --git a/externals/vcpkg/ports/libwandio/portfile.cmake b/externals/vcpkg/ports/libwandio/portfile.cmake new file mode 100755 index 000000000..a03d5c79f --- /dev/null +++ b/externals/vcpkg/ports/libwandio/portfile.cmake @@ -0,0 +1,36 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + set(PATCHES curl.patch) + #TODO: Still does not work. Requires proper "signal" support and "unistd" +else() + set(PATCHES openssl.patch) # needed if curl is using openssl +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wanduow/wandio + REF 012b646e7ba7ab191a5a2206488adfac493fcdc6 + SHA512 e94a82038902c34933c4256f8bd4d7ef3f2cf32fea46f8e31a25df34cc90d3a275ff56d3bc9892aca0c85e6d875e696f96a836cc1444fe165db8364331e6e77d + HEAD_REF master + PATCHES configure.lib.patch # This is how configure.ac files with dependencies get fixed. + configure.patch + ${PATCHES} +) + +vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH ${SOURCE_PATH} + COPY_SOURCE +) +vcpkg_install_make() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libwandio/vcpkg.json b/externals/vcpkg/ports/libwandio/vcpkg.json new file mode 100755 index 000000000..6c682a7c3 --- /dev/null +++ b/externals/vcpkg/ports/libwandio/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "libwandio", + "version": "4.2.1", + "port-version": 6, + "description": "C library for simple and efficient file IO.", + "homepage": "https://github.com/wanduow/wandio", + "license": "LGPL-3.0-only", + "supports": "!windows", + "dependencies": [ + "bzip2", + "curl", + "liblzma", + "lz4", + "lzo", + "pthread", + "zlib", + "zstd" + ] +} diff --git a/externals/vcpkg/ports/libwebm/Fix-cmake.patch b/externals/vcpkg/ports/libwebm/Fix-cmake.patch new file mode 100755 index 000000000..79751e620 --- /dev/null +++ b/externals/vcpkg/ports/libwebm/Fix-cmake.patch @@ -0,0 +1,96 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a83d23b..c5abf83 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,8 @@ + cmake_minimum_required(VERSION 3.2) + project(LIBWEBM CXX) + ++set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) ++ + include(GNUInstallDirs) + include("${CMAKE_CURRENT_SOURCE_DIR}/build/cxx_flags.cmake") + +@@ -330,6 +332,50 @@ add_library(webm ${libwebm_common_sources} + $ + $) + ++install( ++ TARGETS webm ++ RUNTIME DESTINATION bin ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++) ++ ++install( ++ FILES ++ mkvmuxer.hpp ++ mkvmuxertypes.hpp ++ mkvmuxerutil.hpp ++ mkvparser.hpp ++ mkvreader.hpp ++ mkvwriter.hpp ++ webmids.hpp ++ DESTINATION ++ include/libwebm ++) ++ ++install( ++ DIRECTORY mkvmuxer/ ++ DESTINATION include/libwebm/mkvmuxer ++ FILES_MATCHING PATTERN "*.h" ++) ++ ++install( ++ DIRECTORY mkvparser/ ++ DESTINATION include/libwebm/mkvparser ++ FILES_MATCHING PATTERN "*.h" ++) ++ ++install( ++ DIRECTORY webvtt/ ++ DESTINATION include/libwebm/webvtt ++ FILES_MATCHING PATTERN "*.h" ++) ++ ++install( ++ DIRECTORY common/ ++ DESTINATION include/libwebm/common ++ FILES_MATCHING PATTERN "*.h" ++) ++ + if (WIN32) + # Use libwebm and libwebm.lib for project and library name on Windows (instead + # webm and webm.lib). +@@ -337,18 +383,22 @@ if (WIN32) + set_target_properties(webm PROPERTIES PREFIX lib) + endif () + +-add_executable(mkvparser_sample ${mkvparser_sample_sources}) +-target_link_libraries(mkvparser_sample LINK_PUBLIC webm) ++if (ENABLE_SAMPLES) ++ add_executable(mkvparser_sample ${mkvparser_sample_sources}) ++ target_link_libraries(mkvparser_sample LINK_PUBLIC webm) + +-add_executable(mkvmuxer_sample ${mkvmuxer_sample_sources} +- $) +-target_link_libraries(mkvmuxer_sample LINK_PUBLIC webm) ++ add_executable(mkvmuxer_sample ${mkvmuxer_sample_sources} ++ $) ++ target_link_libraries(mkvmuxer_sample LINK_PUBLIC webm) ++endif() + +-add_executable(dumpvtt ${dumpvtt_sources} $) +-target_link_libraries(dumpvtt LINK_PUBLIC webm) ++if (ENABLE_TOOLS) ++ add_executable(dumpvtt ${dumpvtt_sources} $) ++ target_link_libraries(dumpvtt LINK_PUBLIC webm) + +-add_executable(vttdemux ${vttdemux_sources}) +-target_link_libraries(vttdemux LINK_PUBLIC webm) ++ add_executable(vttdemux ${vttdemux_sources}) ++ target_link_libraries(vttdemux LINK_PUBLIC webm) ++endif() + + if (ENABLE_WEBMINFO) + add_executable(webm_info ${webm_info_sources}) diff --git a/externals/vcpkg/ports/libwebm/portfile.cmake b/externals/vcpkg/ports/libwebm/portfile.cmake new file mode 100755 index 000000000..8b9c44012 --- /dev/null +++ b/externals/vcpkg/ports/libwebm/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO webmproject/libwebm + REF 82a1d2330e113a14e545d806eb5419f09374255f #1.0.0.28 + SHA512 7baf6f702f0e4498c9b0affebeba3ff28192c5f3dadfa5a17db2306816b3a9e31ce7a474e4d344ba136e5acf097c32d4ff61ce99861d427cdfb2f20e317d7e15 + HEAD_REF master + PATCHES + Fix-cmake.patch +) + +if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + set(LIBWEBM_CRT_LINKAGE -DMSVC_RUNTIME=dll) +else() + set(LIBWEBM_CRT_LINKAGE -DMSVC_RUNTIME=static) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${LIBWEBM_CRT_LINKAGE} + -DENABLE_SAMPLES=OFF + -DENABLE_TOOLS=OFF + -DENABLE_WEBMTS=OFF + -DENABLE_WEBMINFO=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/libwebm/vcpkg.json b/externals/vcpkg/ports/libwebm/vcpkg.json new file mode 100755 index 000000000..0f9862436 --- /dev/null +++ b/externals/vcpkg/ports/libwebm/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "libwebm", + "version": "1.0.0.28", + "port-version": 1, + "description": "WebM File Parser", + "homepage": "https://github.com/webmproject/libwebm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libwebp/0001-build.patch b/externals/vcpkg/ports/libwebp/0001-build.patch new file mode 100755 index 000000000..8a7cd7f37 --- /dev/null +++ b/externals/vcpkg/ports/libwebp/0001-build.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bd1bebb..4ce801d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -214,6 +214,9 @@ endfunction() + if(MSVC) + # avoid security warnings for e.g., fopen() used in the examples. + add_definitions(-D_CRT_SECURE_NO_WARNINGS) ++ if(BUILD_SHARED_LIBS) ++ add_definitions("-DWEBP_EXTERN=__declspec(dllexport)" "-DWEBP_DLL") ++ endif() + else() + add_definitions(-Wall) + endif() +@@ -586,8 +589,12 @@ if(WEBP_BUILD_EXTRAS) + # webp_quality + add_executable(webp_quality ${WEBP_QUALITY_SRCS} ${WEBP_EXTRAS_SRCS}) + target_link_libraries(webp_quality exampleutil imagedec) ++ if(BUILD_SHARED_LIBS) ++ target_link_libraries(webp_quality webpdspdecode) ++ endif() + target_include_directories(webp_quality + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ++ ${CMAKE_CURRENT_SOURCE_DIR}/src + ${CMAKE_CURRENT_BINARY_DIR}) + + # vwebp_sdl +@@ -620,7 +627,7 @@ if(WEBP_BUILD_WEBP_JS) + -s EXPORTED_FUNCTIONS='[\"_WebpToSDL\"]' -s INVOKE_RUN=0 \ + -s EXPORTED_RUNTIME_METHODS='[\"cwrap\"]'") + set_target_properties(webp_js PROPERTIES OUTPUT_NAME webp) +- target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_SDL) ++ target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_SDL WEBP_HAVE_JUST_SDL_H) + endif() + + # WASM version diff --git a/externals/vcpkg/ports/libwebp/0002-cmake-config.patch b/externals/vcpkg/ports/libwebp/0002-cmake-config.patch new file mode 100755 index 000000000..ae36fb681 --- /dev/null +++ b/externals/vcpkg/ports/libwebp/0002-cmake-config.patch @@ -0,0 +1,24 @@ +diff --git a/cmake/WebPConfig.cmake.in b/cmake/WebPConfig.cmake.in +index 822fc59..fb31829 100644 +--- a/cmake/WebPConfig.cmake.in ++++ b/cmake/WebPConfig.cmake.in +@@ -5,7 +5,17 @@ set(WEBP_VERSION ${WebP_VERSION}) + + include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") + +-set(WebP_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@") ++get_filename_component(_vcpkg_libwebp_root "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE) ++set(WebP_INCLUDE_DIRS "${_vcpkg_libwebp_root}/include") + set(WEBP_INCLUDE_DIRS ${WebP_INCLUDE_DIRS}) +-set(WebP_LIBRARIES "@INSTALLED_LIBRARIES@") ++set(WebP_LIBRARIES "") ++include(SelectLibraryConfigurations) ++foreach(_vcpkg_libwebp_lib IN ITEMS @INSTALLED_LIBRARIES@) ++ string(REPLACE "libwebpmux" "webpmux" _vcpkg_libwebp_lib "${_vcpkg_libwebp_lib}") # offical OUTPUT_NAME ++ find_library(_vcpkg_${_vcpkg_libwebp_lib}_LIBRARY_RELEASE NAMES ${_vcpkg_libwebp_lib} NAMES_PER_DIR PATHS "${_vcpkg_libwebp_root}/lib" NO_DEFAULT_PATH) ++ find_library(_vcpkg_${_vcpkg_libwebp_lib}_LIBRARY_DEBUG NAMES ${_vcpkg_libwebp_lib}d ${_vcpkg_libwebp_lib} NAMES_PER_DIR PATHS "${_vcpkg_libwebp_root}/debug/lib" NO_DEFAULT_PATH) ++ select_library_configurations(_vcpkg_${_vcpkg_libwebp_lib}) ++ list(APPEND WebP_LIBRARIES ${_vcpkg_${_vcpkg_libwebp_lib}_LIBRARIES}) ++endforeach() + set(WEBP_LIBRARIES "${WebP_LIBRARIES}") ++unset(_vcpkg_libwebp_root) diff --git a/externals/vcpkg/ports/libwebp/0003-fix-tool-dependencies.patch b/externals/vcpkg/ports/libwebp/0003-fix-tool-dependencies.patch new file mode 100755 index 000000000..63fb5afde --- /dev/null +++ b/externals/vcpkg/ports/libwebp/0003-fix-tool-dependencies.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 77a0f85..4a84ed1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -410,6 +410,8 @@ endif() + + # Build the executables if asked for. + if(WEBP_BUILD_ANIM_UTILS ++ OR WEBP_BUILD_WEBPINFO ++ OR WEBP_BUILD_WEBPMUX + OR WEBP_BUILD_CWEBP + OR WEBP_BUILD_DWEBP + OR WEBP_BUILD_GIF2WEBP diff --git a/externals/vcpkg/ports/libwebp/0006-fix-dependecies-platform.patch b/externals/vcpkg/ports/libwebp/0006-fix-dependecies-platform.patch new file mode 100755 index 000000000..a5849a7ac --- /dev/null +++ b/externals/vcpkg/ports/libwebp/0006-fix-dependecies-platform.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 83edb3a..f634094 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -540,7 +540,11 @@ if(WEBP_BUILD_EXTRAS) + find_package(SDL) + if(SDL_FOUND) + add_executable(vwebp_sdl ${VWEBP_SDL_SRCS}) +- target_link_libraries(vwebp_sdl ${SDL_LIBRARY} imageioutil webp) ++ target_link_libraries(vwebp_sdl ${SDL_LIBRARY} imageioutil webp) ++ if (MSVC) ++ target_link_libraries(vwebp_sdl dxguid winmm) ++ endif() ++ target_compile_definitions(vwebp_sdl PRIVATE WEBP_HAVE_JUST_SDL_H) + target_include_directories(vwebp_sdl + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} diff --git a/externals/vcpkg/ports/libwebp/0007-fix-arm-build.patch b/externals/vcpkg/ports/libwebp/0007-fix-arm-build.patch new file mode 100755 index 000000000..909b7c293 --- /dev/null +++ b/externals/vcpkg/ports/libwebp/0007-fix-arm-build.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/cpu.cmake b/cmake/cpu.cmake +index bc0dbc9..381f64a 100644 +--- a/cmake/cpu.cmake ++++ b/cmake/cpu.cmake +@@ -97,7 +97,7 @@ foreach(I_SIMD RANGE ${WEBP_SIMD_FLAGS_RANGE}) + set(CMAKE_REQUIRED_FLAGS ${SIMD_COMPILE_FLAG}) + webp_check_compiler_flag(${WEBP_SIMD_FLAG} ${WEBP_ENABLE_SIMD}) + else() +- if(MSVC AND SIMD_ENABLE_FLAGS) ++ if(MSVC AND SIMD_ENABLE_FLAGS AND NOT (CMAKE_GENERATOR_PLATFORM MATCHES "^ARM")) + # The detection for SSE2/SSE4 support under MSVC is based on the compiler + # version so e.g., clang-cl will require flags to enable the assembly. + list(GET SIMD_ENABLE_FLAGS ${I_SIMD} SIMD_COMPILE_FLAG) diff --git a/externals/vcpkg/ports/libwebp/0008-sdl.patch b/externals/vcpkg/ports/libwebp/0008-sdl.patch new file mode 100755 index 000000000..b922ef172 --- /dev/null +++ b/externals/vcpkg/ports/libwebp/0008-sdl.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 91a4ba8..10a3f4d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -624,11 +624,12 @@ endif() + + if(WEBP_BUILD_WEBP_JS) + # wasm2js does not support SIMD. ++ find_package(SDL REQUIRED) + if(NOT WEBP_ENABLE_SIMD) + # JavaScript version + add_executable(webp_js ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c) +- target_link_libraries(webp_js webpdecoder SDL) +- target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) ++ target_link_libraries(webp_js webpdecoder ${SDL_LIBRARY}) ++ target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${SDL_INCLUDE_DIR}) + set(WEBP_HAVE_SDL 1) + set_target_properties( + webp_js +@@ -641,14 +642,14 @@ if(WEBP_BUILD_WEBP_JS) + + # WASM version + add_executable(webp_wasm ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c) +- target_link_libraries(webp_wasm webpdecoder SDL) +- target_include_directories(webp_wasm PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) ++ target_link_libraries(webp_wasm webpdecoder ${SDL_LIBRARY}) ++ target_include_directories(webp_wasm PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${SDL_INCLUDE_DIR}) + set_target_properties( + webp_wasm + PROPERTIES LINK_FLAGS "-s WASM=1 \ + -s EXPORTED_FUNCTIONS='[\"_WebpToSDL\"]' -s INVOKE_RUN=0 \ + -s EXPORTED_RUNTIME_METHODS='[\"cwrap\"]'") +- target_compile_definitions(webp_wasm PUBLIC EMSCRIPTEN WEBP_HAVE_SDL) ++ target_compile_definitions(webp_wasm PUBLIC EMSCRIPTEN WEBP_HAVE_SDL WEBP_HAVE_JUST_SDL_H) + + target_compile_definitions(webpdspdecode PUBLIC EMSCRIPTEN) + endif() diff --git a/externals/vcpkg/ports/libwebp/0009-glut.patch b/externals/vcpkg/ports/libwebp/0009-glut.patch new file mode 100755 index 000000000..914a935e1 --- /dev/null +++ b/externals/vcpkg/ports/libwebp/0009-glut.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0799269..45b3306 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -532,7 +532,7 @@ if(WEBP_BUILD_VWEBP) + target_link_libraries(vwebp + ${OPENGL_LIBRARIES} + exampleutil +- ${GLUT_glut_LIBRARY} ++ GLUT::GLUT + imageioutil + webp + webpdemux) diff --git a/externals/vcpkg/ports/libwebp/portfile.cmake b/externals/vcpkg/ports/libwebp/portfile.cmake new file mode 100755 index 000000000..ae0881b1f --- /dev/null +++ b/externals/vcpkg/ports/libwebp/portfile.cmake @@ -0,0 +1,82 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO webmproject/libwebp + REF v1.2.2 + SHA512 04a036b705316ea04add50c9ec2d6d7a8316c710556b97413015d7b8548fe31a8f7f5bf0632e76262ada504dcc35ead20189ee7fcb3cebbe568eb15736ad9a94 + HEAD_REF master + PATCHES + 0001-build.patch + 0002-cmake-config.patch + 0003-fix-tool-dependencies.patch + 0006-fix-dependecies-platform.patch + 0007-fix-arm-build.patch + 0008-sdl.patch + 0009-glut.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + anim WEBP_BUILD_ANIM_UTILS + gif2webp WEBP_BUILD_GIF2WEBP + img2webp WEBP_BUILD_IMG2WEBP + vwebp WEBP_BUILD_VWEBP + vwebp-sdl WEBP_HAVE_SDL + info WEBP_BUILD_WEBPINFO + mux WEBP_BUILD_WEBPMUX + extras WEBP_BUILD_EXTRAS + nearlossless WEBP_NEAR_LOSSLESS + simd WEBP_ENABLE_SIMD + cwebp WEBP_BUILD_CWEBP + dwebp WEBP_BUILD_DWEBP + swap16bitcsp WEBP_ENABLE_SWAP_16BIT_CSP + unicode WEBP_UNICODE + libwebpmux WEBP_BUILD_LIBWEBPMUX +) + +if(VCPKG_TARGET_IS_OSX) + if("vwebp" IN_LIST FEATURES OR "extras" IN_LIST FEATURES) + message(FATAL_ERROR "Due to GLUT Framework problems with CMake, at the moment it's not possible to build VWebP or extras on Mac!") + endif() +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME WebP CONFIG_PATH share/WebP/cmake) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() + +set(BIN_NAMES get_disto gif2webp img2webp vwebp vwebp_sdl webpinfo webpmux webp_quality cwebp dwebp) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/webp/") +foreach(tool ${BIN_NAMES}) + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + endif() + + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/webp/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + endif() +endforeach() +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/webp") + +#No tools +file(GLOB_RECURSE RESULT "${CURRENT_PACKAGES_DIR}/tools/") +list(LENGTH RESULT RES_LEN) +if(RES_LEN EQUAL 0) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/") +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libwebp/vcpkg.json b/externals/vcpkg/ports/libwebp/vcpkg.json new file mode 100755 index 000000000..0b7b25c9e --- /dev/null +++ b/externals/vcpkg/ports/libwebp/vcpkg.json @@ -0,0 +1,196 @@ +{ + "name": "libwebp", + "version": "1.2.2", + "description": "WebP codec: library to encode and decode images in WebP format", + "homepage": "https://github.com/webmproject/libwebp", + "dependencies": [ + { + "name": "libwebp", + "default-features": false, + "features": [ + "unicode" + ], + "platform": "windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "libwebpmux", + "nearlossless", + "simd" + ], + "features": { + "all": { + "description": "enable all features except for swap16bitcsp", + "dependencies": [ + { + "name": "libwebp", + "features": [ + "anim", + "cwebp", + "dwebp", + "gif2webp", + "img2webp", + "info", + "libwebpmux", + "mux", + "nearlossless", + "simd" + ] + }, + { + "name": "libwebp", + "features": [ + "extras" + ], + "platform": "!osx" + }, + { + "name": "libwebp", + "features": [ + "vwebp-sdl" + ], + "platform": "!osx" + } + ] + }, + "anim": { + "description": "Build animation utilities.", + "dependencies": [ + { + "name": "libwebp", + "default-features": false, + "features": [ + "img2webp", + "mux" + ] + } + ] + }, + "cwebp": { + "description": "Build the cwebp command line tool." + }, + "dwebp": { + "description": "Build the dwebp command line tool." + }, + "extras": { + "description": "Build extras.", + "dependencies": [ + { + "name": "libwebp", + "default-features": false, + "features": [ + "vwebp" + ] + }, + { + "name": "sdl1", + "platform": "windows" + } + ] + }, + "gif2webp": { + "description": "Build the gif2webp conversion tool.", + "dependencies": [ + "giflib", + { + "name": "libwebp", + "default-features": false, + "features": [ + "libwebpmux" + ] + } + ] + }, + "img2webp": { + "description": "Build the img2webp animation tool.", + "dependencies": [ + "libjpeg-turbo", + "libpng", + { + "name": "libwebp", + "default-features": false, + "features": [ + "libwebpmux" + ] + }, + "tiff" + ] + }, + "info": { + "description": "Build the webpinfo command line tool." + }, + "libbwebpmux": { + "description": "Obsolete, use feature libwebpmux instead.", + "dependencies": [ + { + "name": "libwebp", + "default-features": false, + "features": [ + "libwebpmux" + ] + } + ] + }, + "libwebpmux": { + "description": "Build the libwebpmux library" + }, + "mux": { + "description": "Build the webpmux command line tool.", + "dependencies": [ + { + "name": "libwebp", + "default-features": false, + "features": [ + "libwebpmux" + ] + } + ] + }, + "nearlossless": { + "description": "Enable near-lossless encoding" + }, + "simd": { + "description": "Enable any SIMD optimization." + }, + "swap16bitcsp": { + "description": "Enable byte swap for 16 bit colorspaces." + }, + "unicode": { + "description": "Build Unicode executables. (Adds definition UNICODE and _UNICODE)" + }, + "vwebp": { + "description": "Build the vwebp viewer tool.", + "dependencies": [ + { + "name": "freeglut", + "platform": "!osx" + }, + "opengl" + ] + }, + "vwebp-sdl": { + "description": "Build the vwebp viewer tool.", + "dependencies": [ + { + "name": "libwebp", + "default-features": false, + "features": [ + "vwebp" + ] + }, + { + "name": "sdl1", + "platform": "windows" + } + ] + } + } +} diff --git a/externals/vcpkg/ports/libwebsockets/export-include-path.patch b/externals/vcpkg/ports/libwebsockets/export-include-path.patch new file mode 100755 index 000000000..fe589ca3c --- /dev/null +++ b/externals/vcpkg/ports/libwebsockets/export-include-path.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f9b5557..ebc624b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1045,8 +1045,8 @@ file(RELATIVE_PATH + "${LWS_ABSOLUTE_INSTALL_CMAKE_DIR}" + "${LWS_ABSOLUTE_INSTALL_INCLUDE_DIR}") # Calculate the relative directory from the cmake dir. + +-if (DEFINED REL_INCLUDE_DIR) +- set(LWS__INCLUDE_DIRS "\${LWS_CMAKE_DIR}/${REL_INCLUDE_DIR}") ++if (1) ++ set(LWS__INCLUDE_DIRS "\${CMAKE_CURRENT_LIST_DIR}/../include") + endif() + + configure_file(${PROJECT_SOURCE_DIR}/cmake/libwebsockets-config.cmake.in +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 85b43d5..724f0b7 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -164,7 +164,7 @@ if (LWS_WITH_STATIC) + $ + $ + ) +- target_include_directories(websockets PRIVATE ${LWS_LIB_BUILD_INC_PATHS}) ++ target_include_directories(websockets PRIVATE $ PUBLIC $) + target_compile_definitions(websockets PRIVATE LWS_BUILDING_STATIC) + + if (WIN32) +@@ -190,7 +190,7 @@ if (LWS_WITH_SHARED) + $ + $ + ) +- target_include_directories(websockets_shared PRIVATE ${LWS_LIB_BUILD_INC_PATHS}) ++ target_include_directories(websockets_shared PRIVATE $ PUBLIC $) + target_compile_definitions(websockets_shared PRIVATE LWS_BUILDING_SHARED) + + # We want the shared lib to be named "libwebsockets" diff --git a/externals/vcpkg/ports/libwebsockets/fix-build-error.patch b/externals/vcpkg/ports/libwebsockets/fix-build-error.patch new file mode 100755 index 000000000..b8590d212 --- /dev/null +++ b/externals/vcpkg/ports/libwebsockets/fix-build-error.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1e737e5..75534c1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -422,6 +422,11 @@ set(LWS_LIBMOUNT_LIBRARIES CACHE PATH "Path to the libmount library") + set(LWS_EXT_PTHREAD_INCLUDE_DIR CACHE PATH "Path to an external pthreads include directory") + set(LWS_EXT_PTHREAD_LIBRARIES CACHE PATH "Path to an external pthreads library") + ++if(WIN32) ++ find_package(pthreads_windows REQUIRED) ++ set(LWS_EXT_PTHREAD_INCLUDE_DIR ${PThreads4W_INCLUDE_DIR}) ++ set(LWS_EXT_PTHREAD_LIBRARIES ${PThreads4W_LIBRARY}) ++endif() + + if (LWS_WITH_HTTP_STREAM_COMPRESSION) + set(LWS_WITH_ZLIB 1) +@@ -728,7 +733,7 @@ if (MSVC) + # Turn off pointless microsoft security warnings. + add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE) + # Fail the build if any warnings +- add_compile_options(/W3 /WX) ++ add_compile_options(/W3 /WX /wd4142 /wd4267 /wd4996) + endif(MSVC) + + if (MINGW) diff --git a/externals/vcpkg/ports/libwebsockets/fix-dependency-libuv.patch b/externals/vcpkg/ports/libwebsockets/fix-dependency-libuv.patch new file mode 100755 index 000000000..1c63d2587 --- /dev/null +++ b/externals/vcpkg/ports/libwebsockets/fix-dependency-libuv.patch @@ -0,0 +1,13 @@ +diff --git a/lib/event-libs/libuv/CMakeLists.txt b/lib/event-libs/libuv/CMakeLists.txt +index fb810a8..2258ade 100644 +--- a/lib/event-libs/libuv/CMakeLists.txt ++++ b/lib/event-libs/libuv/CMakeLists.txt +@@ -36,7 +36,7 @@ set(LWS_LIBUV_INCLUDE_DIRS CACHE PATH "Path to the libuv include directory") + if ("${LWS_LIBUV_LIBRARIES}" STREQUAL "" OR "${LWS_LIBUV_INCLUDE_DIRS}" STREQUAL "") + if (NOT LIBUV_FOUND) + find_path(LIBUV_INCLUDE_DIRS NAMES uv.h) +- find_library(LIBUV_LIBRARIES NAMES uv) ++ find_library(LIBUV_LIBRARIES NAMES uv libuv) + endif() + else() + set(LIBUV_LIBRARIES ${LWS_LIBUV_LIBRARIES}) diff --git a/externals/vcpkg/ports/libwebsockets/fix-find-openssl.patch b/externals/vcpkg/ports/libwebsockets/fix-find-openssl.patch new file mode 100755 index 000000000..4bd45af3b --- /dev/null +++ b/externals/vcpkg/ports/libwebsockets/fix-find-openssl.patch @@ -0,0 +1,11 @@ +diff --git a/lib/tls/CMakeLists.txt b/lib/tls/CMakeLists.txt +--- a/lib/tls/CMakeLists.txt (revision a5aae049b2a386712e1be3b417915c0d44c7e675) ++++ b/lib/tls/CMakeLists.txt (date 1642427956730) +@@ -257,7 +257,6 @@ + find_package(PkgConfig QUIET) + pkg_check_modules(PC_OPENSSL openssl QUIET) + find_package(OpenSSL REQUIRED) +- list(APPEND OPENSSL_LIBRARIES ${PC_OPENSSL_LIBRARIES}) + set(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} PARENT_SCOPE) + endif() + set(OPENSSL_INCLUDE_DIRS "${OPENSSL_INCLUDE_DIR}") diff --git a/externals/vcpkg/ports/libwebsockets/portfile.cmake b/externals/vcpkg/ports/libwebsockets/portfile.cmake new file mode 100755 index 000000000..6307aa306 --- /dev/null +++ b/externals/vcpkg/ports/libwebsockets/portfile.cmake @@ -0,0 +1,191 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO warmcat/libwebsockets + REF a5aae049b2a386712e1be3b417915c0d44c7e675 # v4.3.0 + SHA512 ab72201880360a3b0136497c1c1729656c3c07043f38cceec136f5671be15ab55c80136ec7480841175d3add711593ddde23cefd39ea9cb729ec0842950602dd + HEAD_REF master + PATCHES + fix-dependency-libuv.patch + fix-build-error.patch + export-include-path.patch + fix-find-openssl.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LWS_WITH_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LWS_WITH_SHARED) + +## All LWS options could be possible features: +# # +# # Major individual features +# # +# option(LWS_WITH_NETWORK "Compile with network-related code" ON) +# option(LWS_ROLE_H1 "Compile with support for http/1 (needed for ws)" ON) +# option(LWS_ROLE_WS "Compile with support for websockets" ON) +# option(LWS_ROLE_DBUS "Compile with support for DBUS" OFF) +# option(LWS_ROLE_RAW_PROXY "Raw packet proxy" OFF) +# option(LWS_WITH_HTTP2 "Compile with server support for HTTP/2" ON) +# option(LWS_WITH_LWSWS "Libwebsockets Webserver" OFF) +# option(LWS_WITH_CGI "Include CGI (spawn process with network-connected stdin/out/err) APIs" OFF) +# option(LWS_IPV6 "Compile with support for ipv6" OFF) +# option(LWS_UNIX_SOCK "Compile with support for UNIX domain socket" OFF) +# option(LWS_WITH_PLUGINS "Support plugins for protocols and extensions" OFF) +# option(LWS_WITH_HTTP_PROXY "Support for HTTP proxying" OFF) +# option(LWS_WITH_ZIP_FOPS "Support serving pre-zipped files" OFF) +# option(LWS_WITH_SOCKS5 "Allow use of SOCKS5 proxy on client connections" OFF) +# option(LWS_WITH_GENERIC_SESSIONS "With the Generic Sessions plugin" OFF) +# option(LWS_WITH_PEER_LIMITS "Track peers and restrict resources a single peer can allocate" OFF) +# option(LWS_WITH_ACCESS_LOG "Support generating Apache-compatible access logs" OFF) +# option(LWS_WITH_RANGES "Support http ranges (RFC7233)" OFF) +# option(LWS_WITH_SERVER_STATUS "Support json + jscript server monitoring" OFF) +# option(LWS_WITH_THREADPOOL "Managed worker thread pool support (relies on pthreads)" OFF) +# option(LWS_WITH_HTTP_STREAM_COMPRESSION "Support HTTP stream compression" OFF) +# option(LWS_WITH_HTTP_BROTLI "Also offer brotli http stream compression (requires LWS_WITH_HTTP_STREAM_COMPRESSION)" OFF) +# option(LWS_WITH_ACME "Enable support for ACME automatic cert acquisition + maintenance (letsencrypt etc)" OFF) +# option(LWS_WITH_HUBBUB "Enable libhubbub rewriting support" OFF) +# option(LWS_WITH_FTS "Full Text Search support" OFF) +# # +# # TLS library options... all except mbedTLS are basically OpenSSL variants. +# # +# option(LWS_WITH_SSL "Include SSL support (defaults to OpenSSL or similar, mbedTLS if LWS_WITH_MBEDTLS is set)" ON) +# option(LWS_WITH_MBEDTLS "Use mbedTLS (>=2.0) replacement for OpenSSL. When setting this, you also may need to specify LWS_MBEDTLS_LIBRARIES and LWS_MBEDTLS_INCLUDE_DIRS" OFF) +# option(LWS_WITH_BORINGSSL "Use BoringSSL replacement for OpenSSL" OFF) +# option(LWS_WITH_CYASSL "Use CyaSSL replacement for OpenSSL. When setting this, you also need to specify LWS_CYASSL_LIBRARIES and LWS_CYASSL_INCLUDE_DIRS" OFF) +# option(LWS_WITH_WOLFSSL "Use wolfSSL replacement for OpenSSL. When setting this, you also need to specify LWS_WOLFSSL_LIBRARIES and LWS_WOLFSSL_INCLUDE_DIRS" OFF) +# option(LWS_SSL_CLIENT_USE_OS_CA_CERTS "SSL support should make use of the OS-installed CA root certs" ON) +# # +# # Event library options (may select multiple, or none for default poll() +# # +# option(LWS_WITH_LIBEV "Compile with support for libev" OFF) +# option(LWS_WITH_LIBUV "Compile with support for libuv" OFF) +# option(LWS_WITH_LIBEVENT "Compile with support for libevent" OFF) +# # +# # Static / Dynamic build options +# # +# option(LWS_WITH_STATIC "Build the static version of the library" ON) +# option(LWS_WITH_SHARED "Build the shared version of the library" ON) +# option(LWS_LINK_TESTAPPS_DYNAMIC "Link the test apps to the shared version of the library. Default is to link statically" OFF) +# option(LWS_STATIC_PIC "Build the static version of the library with position-independent code" OFF) +# # +# # Specific platforms +# # +# option(LWS_WITH_ESP32 "Build for ESP32" OFF) +# option(LWS_WITH_ESP32_HELPER "Build ESP32 helper" OFF) +# option(LWS_PLAT_OPTEE "Build for OPTEE" OFF) +# # +# # Client / Server / Test Apps build control +# # +# option(LWS_WITHOUT_CLIENT "Don't build the client part of the library" OFF) +# option(LWS_WITHOUT_SERVER "Don't build the server part of the library" OFF) +# option(LWS_WITHOUT_TESTAPPS "Don't build the libwebsocket-test-apps" OFF) +# option(LWS_WITHOUT_TEST_SERVER "Don't build the test server" OFF) +# option(LWS_WITHOUT_TEST_SERVER_EXTPOLL "Don't build the test server version that uses external poll" OFF) +# option(LWS_WITHOUT_TEST_PING "Don't build the ping test application" OFF) +# option(LWS_WITHOUT_TEST_CLIENT "Don't build the client test application" OFF) +# # +# # Extensions (permessage-deflate) +# # +# option(LWS_WITHOUT_EXTENSIONS "Don't compile with extensions" ON) +# # +# # Helpers + misc +# # +# option(LWS_WITHOUT_BUILTIN_GETIFADDRS "Don't use the BSD getifaddrs implementation from libwebsockets if it is missing (this will result in a compilation error) ... The default is to assume that your libc provides it. On some systems such as uclibc it doesn't exist." OFF) +# option(LWS_FALLBACK_GETHOSTBYNAME "Also try to do dns resolution using gethostbyname if getaddrinfo fails" OFF) +# option(LWS_WITHOUT_BUILTIN_SHA1 "Don't build the lws sha-1 (eg, because openssl will provide it" OFF) +# option(LWS_WITH_LATENCY "Build latency measuring code into the library" OFF) +# option(LWS_WITHOUT_DAEMONIZE "Don't build the daemonization api" ON) +# option(LWS_SSL_SERVER_WITH_ECDH_CERT "Include SSL server use ECDH certificate" OFF) +# option(LWS_WITH_LEJP "With the Lightweight JSON Parser" ON) +# option(LWS_WITH_SQLITE3 "Require SQLITE3 support" OFF) +# option(LWS_WITH_STRUCT_JSON "Generic struct serialization to and from JSON" ON) +# option(LWS_WITH_STRUCT_SQLITE3 "Generic struct serialization to and from SQLITE3" OFF) +# option(LWS_WITH_SMTP "Provide SMTP support" OFF) +# if (WIN32 OR LWS_WITH_ESP32) +# option(LWS_WITH_DIR "Directory scanning api support" OFF) +# option(LWS_WITH_LEJP_CONF "With LEJP configuration parser as used by lwsws" OFF) +# else() +# option(LWS_WITH_DIR "Directory scanning api support" ON) +# option(LWS_WITH_LEJP_CONF "With LEJP configuration parser as used by lwsws" ON) +# endif() +# option(LWS_WITH_NO_LOGS "Disable all logging from being compiled in" OFF) +# option(LWS_AVOID_SIGPIPE_IGN "Android 7+ reportedly needs this" OFF) +# option(LWS_WITH_STATS "Keep statistics of lws internal operations" OFF) +# option(LWS_WITH_JOSE "JSON Web Signature / Encryption / Keys (RFC7515/6/) API" OFF) +# option(LWS_WITH_GENCRYPTO "Enable support for Generic Crypto apis independent of TLS backend" OFF) +# option(LWS_WITH_SELFTESTS "Selftests run at context creation" OFF) +# option(LWS_WITH_GCOV "Build with gcc gcov coverage instrumentation" OFF) +# option(LWS_WITH_EXPORT_LWSTARGETS "Export libwebsockets CMake targets. Disable if they conflict with an outer cmake project." ON) +# option(LWS_REPRODUCIBLE "Build libwebsockets reproducible. It removes the build user and hostname from the build" ON) +# option(LWS_WITH_MINIMAL_EXAMPLES "Also build the normally standalone minimal examples, for QA" OFF) +# option(LWS_WITH_LWSAC "lwsac Chunk Allocation api" ON) +# option(LWS_WITH_CUSTOM_HEADERS "Store and allow querying custom HTTP headers (H1 only)" ON) +# option(LWS_WITH_DISKCACHE "Hashed cache directory with lazy LRU deletion to size limit" OFF) +# option(LWS_WITH_ASAN "Build with gcc runtime sanitizer options enabled (needs libasan)" OFF) +# option(LWS_WITH_DIR "Directory scanning api support" OFF) +# option(LWS_WITH_LEJP_CONF "With LEJP configuration parser as used by lwsws" OFF) +# option(LWS_WITH_ZLIB "Include zlib support (required for extensions)" OFF) +# option(LWS_WITH_BUNDLED_ZLIB "Use bundled zlib version (Windows only)" ${LWS_WITH_BUNDLED_ZLIB_DEFAULT}) +# option(LWS_WITH_MINIZ "Use miniz instead of zlib" OFF) +# option(LWS_WITH_DEPRECATED_LWS_DLL "Migrate to lws_dll2 instead ASAP" OFF) +# option(LWS_WITH_SEQUENCER "lws_seq_t support" ON) +# option(LWS_WITH_EXTERNAL_POLL "Support external POLL integration using callback messages (not recommended)" OFF) +# option(LWS_WITH_LWS_DSH "Support lws_dsh_t Disordered Shared Heap" OFF) +## + +set(EXTRA_ARGS) +if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32") + set(EXTRA_ARGS "-DLWS_WITH_LIBUV=ON") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${EXTRA_ARGS} + -DLWS_WITH_STATIC=${LWS_WITH_STATIC} + -DLWS_WITH_SHARED=${LWS_WITH_SHARED} + -DLWS_WITH_GENCRYPTO=ON + -DLWS_WITH_TLS=ON + -DLWS_WITH_BUNDLED_ZLIB=OFF + -DLWS_WITHOUT_TESTAPPS=ON + -DLWS_IPV6=ON + -DLWS_WITH_HTTP2=ON + -DLWS_WITH_HTTP_STREAM_COMPRESSION=ON # Since zlib is already a dependency + -DLWS_WITH_EXTERNAL_POLL=ON + # OPTIONS_RELEASE -DOPTIMIZE=1 + # OPTIONS_DEBUG -DDEBUGGABLE=1 +) + +vcpkg_cmake_install() + +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +else() + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libwebsockets) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/libwebsockets-test-server") +file(READ "${CURRENT_PACKAGES_DIR}/share/libwebsockets/libwebsockets-config.cmake" LIBWEBSOCKETSCONFIG_CMAKE) +string(REPLACE "/../include" "/../../include" LIBWEBSOCKETSCONFIG_CMAKE "${LIBWEBSOCKETSCONFIG_CMAKE}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/libwebsockets/libwebsockets-config.cmake" "${LIBWEBSOCKETSCONFIG_CMAKE}") + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string( "${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-debug.cmake" "websockets_static.lib" "websockets.lib") +endif() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_replace_string( "${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-release.cmake" "websockets_static.lib" "websockets.lib") +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + if (VCPKG_TARGET_IS_WINDOWS) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/websockets_static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/websockets.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/websockets_static.lib" "${CURRENT_PACKAGES_DIR}/lib/websockets.lib") + endif() +endif () + +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/lws_config.h" "${CURRENT_PACKAGES_DIR}" "") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libwebsockets/vcpkg.json b/externals/vcpkg/ports/libwebsockets/vcpkg.json new file mode 100755 index 000000000..2e4b95825 --- /dev/null +++ b/externals/vcpkg/ports/libwebsockets/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "libwebsockets", + "version-semver": "4.3.0", + "port-version": 3, + "description": "Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions as client or server.", + "homepage": "https://github.com/warmcat/libwebsockets", + "supports": "!uwp", + "dependencies": [ + { + "name": "libuv", + "platform": "!emscripten" + }, + "openssl", + "pthreads", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/libxdiff/portfile.cmake b/externals/vcpkg/ports/libxdiff/portfile.cmake new file mode 100755 index 000000000..e0813a120 --- /dev/null +++ b/externals/vcpkg/ports/libxdiff/portfile.cmake @@ -0,0 +1,43 @@ +set(LIBXDIFF_REF 77e30f3190685efd87cce2c9c5d688cbaa1b0134) +set(LIBXDIFF_SHA512 c559b575e6d6f06f3b3064f3e077a15d8f57422340199215a4cbd7beab527bc250347c8779a8d6f8c4e41799a032431e83c7336f86569527ab754444455b8c87) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" KEYSTONE_BUILD_SHARED) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Drako/libxdiff + REF ${LIBXDIFF_REF} + SHA512 ${LIBXDIFF_SHA512} + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DBUILD_SHARED=${KEYSTONE_BUILD_SHARED} +) + +vcpkg_install_cmake() + +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/xdiff.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/xdiff.dll") + endif() +endif() + + +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/xdiff.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/xdiff.dll") + endif() +endif() + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/XDiff TARGET_PATH share/XDiff) diff --git a/externals/vcpkg/ports/libxdiff/vcpkg.json b/externals/vcpkg/ports/libxdiff/vcpkg.json new file mode 100755 index 000000000..40e9f6d3e --- /dev/null +++ b/externals/vcpkg/ports/libxdiff/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libxdiff", + "version": "0.23", + "port-version": 2, + "description": "The LibXDiff library implements basic and yet complete functionalities to create file differences/patches to both binary and text files. The library uses memory files as file abstraction to achieve both performance and portability.", + "homepage": "https://github.com/Drako/libxdiff", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/libxlsxwriter/portfile.cmake b/externals/vcpkg/ports/libxlsxwriter/portfile.cmake new file mode 100755 index 000000000..b95032196 --- /dev/null +++ b/externals/vcpkg/ports/libxlsxwriter/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jmcnamara/libxlsxwriter + REF RELEASE_1.1.4 + SHA512 fad36f7882fcb21b87e13cf603022cfad3f14e6f955a06e2771712facd0fe12f83f4d1655dc1a744724bda1ac83af7e7bf1393457c5507d8983f63002ab294b5 + HEAD_REF master +) + +if (VCPKG_TARGET_IS_UWP) + set(USE_WINDOWSSTORE ON) +else() + set(USE_WINDOWSSTORE OFF) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DWINDOWSSTORE=${USE_WINDOWSSTORE} +) + +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/externals/vcpkg/ports/libxlsxwriter/vcpkg.json b/externals/vcpkg/ports/libxlsxwriter/vcpkg.json new file mode 100755 index 000000000..f72992f78 --- /dev/null +++ b/externals/vcpkg/ports/libxlsxwriter/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "libxlsxwriter", + "version-semver": "1.1.4", + "description": "Libxlsxwriter is a C library that can be used to write text, numbers, formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file.", + "homepage": "https://github.com/jmcnamara/libxlsxwriter", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/libxml2/disable-docs.patch b/externals/vcpkg/ports/libxml2/disable-docs.patch new file mode 100755 index 000000000..b00bafacf --- /dev/null +++ b/externals/vcpkg/ports/libxml2/disable-docs.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f922d5ab..70466bc7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -647,11 +647,6 @@ if(LIBXML2_WITH_PYTHON) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2.py DESTINATION ${LIBXML2_PYTHON_INSTALL_DIR} COMPONENT runtime) + endif() + +-install(FILES libxml.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 COMPONENT documentation) +-install(FILES doc/xmlcatalog.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation) +-install(FILES doc/xmllint.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation) +-install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxml2 COMPONENT documentation PATTERN Makefile.* EXCLUDE) +- + configure_package_config_file( + libxml2-config.cmake.cmake.in libxml2-config.cmake + INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION} diff --git a/externals/vcpkg/ports/libxml2/fix-uwp.patch b/externals/vcpkg/ports/libxml2/fix-uwp.patch new file mode 100755 index 000000000..98a5bff44 --- /dev/null +++ b/externals/vcpkg/ports/libxml2/fix-uwp.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f922d5ab..6eb0a7fb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -134,6 +134,7 @@ endif() + + if(MSVC) + configure_file(include/win32config.h config.h COPYONLY) ++ add_compile_options(/wd4996) + else() + check_c_source_compiles(" + void __attribute__((destructor)) diff --git a/externals/vcpkg/ports/libxml2/fix_cmakelist.patch b/externals/vcpkg/ports/libxml2/fix_cmakelist.patch new file mode 100755 index 000000000..494bb8a71 --- /dev/null +++ b/externals/vcpkg/ports/libxml2/fix_cmakelist.patch @@ -0,0 +1,108 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f922d5ab..685964b3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -459,15 +459,15 @@ endif() + if(LIBXML2_WITH_ICU) + target_link_libraries(LibXml2 PRIVATE ICU::data ICU::i18n ICU::uc) + if(WIN32) +- set(ICU_LIBS "-licudt -licuin -licuuc") ++ set(ICU_LIBS "icu-i18n") + else() +- set(ICU_LIBS "-licudata -licui18n -licuuc") ++ set(ICU_LIBS "icu-i18n") + endif() + endif() + + if(LIBXML2_WITH_LZMA) + target_link_libraries(LibXml2 PRIVATE LibLZMA::LibLZMA) +- set(LZMA_LIBS "-llzma") ++ set(LZMA_LIBS "liblzma") + endif() + + if(LIBXML2_WITH_THREADS) +@@ -477,7 +477,7 @@ endif() + + if(LIBXML2_WITH_ZLIB) + target_link_libraries(LibXml2 PRIVATE ZLIB::ZLIB) +- set(Z_LIBS "-lz") ++ set(Z_LIBS "zlib") + endif() + + set_target_properties( +@@ -490,23 +490,9 @@ set_target_properties( + VERSION ${PROJECT_VERSION} + ) + ++set(XML_LIB_NAME xml2) + if(MSVC) +- if(BUILD_SHARED_LIBS) +- set_target_properties( +- LibXml2 +- PROPERTIES +- DEBUG_POSTFIX d +- ) +- else() +- set_target_properties( +- LibXml2 +- PROPERTIES +- DEBUG_POSTFIX sd +- MINSIZEREL_POSTFIX s +- RELEASE_POSTFIX s +- RELWITHDEBINFO_POSTFIX s +- ) +- endif() ++ set(XML_LIB_NAME libxml2) + endif() + + install(FILES ${LIBXML2_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libxml2/libxml COMPONENT development) +@@ -654,30 +640,30 @@ install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxml2 COMPONEN + + configure_package_config_file( + libxml2-config.cmake.cmake.in libxml2-config.cmake +- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION} ++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2 + ) + + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2 + COMPONENT development + ) + + write_basic_package_version_file( + ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-version.cmake + VERSION ${PROJECT_VERSION} +- COMPATIBILITY ExactVersion ++ COMPATIBILITY SameMinorVersion + ) + + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-version.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2 + COMPONENT development + ) + + install( + EXPORT LibXml2 +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2 + NAMESPACE LibXml2:: + FILE libxml2-export.cmake + COMPONENT development +diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in +index 2653a7c5..2eb2f362 100644 +--- a/libxml-2.0.pc.in ++++ b/libxml-2.0.pc.in +@@ -8,6 +8,7 @@ Name: libXML + Version: @VERSION@ + Description: libXML library version2. + Requires: +-Libs: -L${libdir} -lxml2 +-Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ ++Requires.private: @ICU_LIBS@ @Z_LIBS@ @LZMA_LIBS@ ++Libs: -L${libdir} -l@XML_LIB_NAME@ ++Libs.private: @THREAD_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ + Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ diff --git a/externals/vcpkg/ports/libxml2/portfile.cmake b/externals/vcpkg/ports/libxml2/portfile.cmake new file mode 100755 index 000000000..a9e869bd9 --- /dev/null +++ b/externals/vcpkg/ports/libxml2/portfile.cmake @@ -0,0 +1,95 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.gnome.org/ + OUT_SOURCE_PATH SOURCE_PATH + REPO GNOME/libxml2 + REF 7846b0a677f8d3ce72486125fa281e92ac9970e8 + SHA512 3b960e410cf812a94938cd31c317f9a8d4b2d5b3e148efb108f6dad86ce8c9553c0fe3b32dd68d15e3d5ada9db07b39f9e0b13906edf6ed1bb1cec4f137bca71 + HEAD_REF master + PATCHES + disable-docs.patch + fix_cmakelist.patch + fix-uwp.patch +) + +if (VCPKG_TARGET_IS_UWP) + message(WARNING "Feature network couldn't be enabled on UWP, disable http and ftp automatically.") + set(ENABLE_NETWORK 0) +else() + set(ENABLE_NETWORK 1) +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "tools" LIBXML2_WITH_PROGRAMS +) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DLIBXML2_WITH_TESTS=OFF + -DLIBXML2_WITH_HTTP=${ENABLE_NETWORK} + -DLIBXML2_WITH_FTP=${ENABLE_NETWORK} + -DLIBXML2_WITH_HTML=ON + -DLIBXML2_WITH_C14N=ON + -DLIBXML2_WITH_CATALOG=ON + -DLIBXML2_WITH_DEBUG=ON + -DLIBXML2_WITH_DOCB=ON + -DLIBXML2_WITH_ICONV=ON + -DLIBXML2_WITH_ISO8859X=ON + -DLIBXML2_WITH_ZLIB=ON + -DLIBXML2_WITH_ICU=OFF # Culprit of linkage issues? Solving this is probably another PR + -DLIBXML2_WITH_LZMA=ON + -DLIBXML2_WITH_LEGACY=ON + -DLIBXML2_WITH_MEM_DEBUG=OFF + -DLIBXML2_WITH_MODULES=ON + -DLIBXML2_WITH_OUTPUT=ON + -DLIBXML2_WITH_PATTERN=ON + -DLIBXML2_WITH_PUSH=ON + -DLIBXML2_WITH_PYTHON=OFF + -DLIBXML2_WITH_READER=ON + -DLIBXML2_WITH_REGEXPS=ON + -DLIBXML2_WITH_RUN_DEBUG=OFF + -DLIBXML2_WITH_SAX1=ON + -DLIBXML2_WITH_SCHEMAS=ON + -DLIBXML2_WITH_SCHEMATRON=ON + -DLIBXML2_WITH_THREADS=ON + -DLIBXML2_WITH_THREAD_ALLOC=OFF + -DLIBXML2_WITH_TREE=ON + -DLIBXML2_WITH_VALID=ON + -DLIBXML2_WITH_WRITER=ON + -DLIBXML2_WITH_XINCLUDE=ON + -DLIBXML2_WITH_XPATH=ON + -DLIBXML2_WITH_XPTR=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libxml2) +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES xmllint xmlcatalog AUTO_CLEAN) +endif() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(_file "${CURRENT_PACKAGES_DIR}/include/libxml2/libxml/xmlexports.h") + file(READ "${_file}" _contents) + string(REPLACE "#ifdef LIBXML_STATIC" "#undef LIBXML_STATIC\n#define LIBXML_STATIC\n#ifdef LIBXML_STATIC" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") +endif() + +file(COPY "${CURRENT_PACKAGES_DIR}/include/libxml2/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") # TODO: Fix usage in all dependent ports hardcoding the wrong include path. + +#Cleanup +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/xml2Conf.sh" "${CURRENT_PACKAGES_DIR}/debug/lib/xml2Conf.sh") + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/Copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libxml2/usage b/externals/vcpkg/ports/libxml2/usage new file mode 100755 index 000000000..c77cdbce5 --- /dev/null +++ b/externals/vcpkg/ports/libxml2/usage @@ -0,0 +1,4 @@ +The package libxml2 is compatible with built-in CMake targets: + + find_package(LibXml2 CONFIG REQUIRED) + target_link_libraries(main PRIVATE LibXml2::LibXml2) diff --git a/externals/vcpkg/ports/libxml2/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/libxml2/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..dede4c831 --- /dev/null +++ b/externals/vcpkg/ports/libxml2/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,49 @@ +_find_package(${ARGS}) +if(LibXml2_FOUND) + list(APPEND LIBXML2_INCLUDE_DIRS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") + list(APPEND LIBXML2_INCLUDE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") # This is wrong but downstream doesn't correctly use _DIR vs _DIRS variables + if(TARGET LibXml2::LibXml2) + target_include_directories(LibXml2::LibXml2 INTERFACE "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") + endif() +endif() +if(LibXml2_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT ${ARGV0}_CONFIG) + find_package(LibLZMA) + find_package(ZLIB) + find_package(Iconv) + include(SelectLibraryConfigurations) + find_library(LIBXML2_LIBRARY_DEBUG NAMES xml2 libxml2 xml2s libxml2s xml2d libxml2d xml2sd libxml2sd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_INSTALLED_DIR}/debug" NO_DEFAULT_PATH) + find_library(LIBXML2_LIBRARY_RELEASE NAMES xml2 libxml2 xml2s libxml2s NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) + unset(LIBXML2_LIBRARIES) + unset(LIBXML2_LIBRARY CACHE) + select_library_configurations(LIBXML2) + list(APPEND LIBXML2_LIBRARIES ${LIBLZMA_LIBRARIES} ${ZLIB_LIBRARIES}) + if(Iconv_LIBRARIES) + list(APPEND LIBXML2_LIBRARIES ${Iconv_LIBRARIES}) + endif() + if(TARGET LibXml2::LibXml2 AND LIBXML2_LIBRARY_RELEASE) + set_target_properties(LibXml2::LibXml2 PROPERTIES IMPORTED_LOCATION_RELEASE "${LIBXML2_LIBRARY_RELEASE}") + endif() + if(TARGET LibXml2::LibXml2 AND LIBXML2_LIBRARY_DEBUG) + set_target_properties(LibXml2::LibXml2 PROPERTIES IMPORTED_LOCATION_DEBUG "${LIBXML2_LIBRARY_DEBUG}") + endif() + cmake_policy(PUSH) + cmake_policy(SET CMP0079 NEW) + if(CMAKE_SYSTEM_NAME STREQUAL "Linux") + list(APPEND LIBXML2_LIBRARIES m) + if(TARGET LibXml2::LibXml2) + set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "m") + endif() + elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") + list(APPEND LIBXML2_LIBRARIES ws2_32) + if(TARGET LibXml2::LibXml2) + set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "ws2_32") + endif() + endif() + if(TARGET LibXml2::LibXml2) + set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "LibLZMA::LibLZMA" "ZLIB::ZLIB") + if(TARGET Iconv::Iconv) + set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Iconv::Iconv") + endif() + endif() + cmake_policy(POP) +endif() diff --git a/externals/vcpkg/ports/libxml2/vcpkg.json b/externals/vcpkg/ports/libxml2/vcpkg.json new file mode 100755 index 000000000..117810665 --- /dev/null +++ b/externals/vcpkg/ports/libxml2/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "libxml2", + "version": "2.9.14", + "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).", + "homepage": "https://xmlsoft.org/", + "license": "MIT", + "dependencies": [ + "libiconv", + "liblzma", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "features": { + "tools": { + "description": "Build tools" + } + } +} diff --git a/externals/vcpkg/ports/libxmlmm/CMakeLists.txt b/externals/vcpkg/ports/libxmlmm/CMakeLists.txt new file mode 100755 index 000000000..721641a64 --- /dev/null +++ b/externals/vcpkg/ports/libxmlmm/CMakeLists.txt @@ -0,0 +1,59 @@ +cmake_minimum_required(VERSION 3.8) +project(libxmlmm CXX) + +set(CMAKE_SHARED_LIBRARY_PREFIX) +set(CMAKE_STATIC_LIBRARY_PREFIX) + +find_package(LibXml2 REQUIRED) + +set(HEADERS_LIBXMLMM + libxmlmm/Attribute.h + libxmlmm/CData.h + libxmlmm/Comment.h + libxmlmm/Content.h + libxmlmm/defines.h + libxmlmm/Document.h + libxmlmm/Element.h + libxmlmm/exceptions.h + libxmlmm/libxmlmm.h + libxmlmm/LibXmlSentry.h + libxmlmm/Node.h + libxmlmm/ProcessingInstruction.h + libxmlmm/Text.h + libxmlmm/utils.h +) + +set(SOURCES_LIBXMLMM + libxmlmm/Attribute.cpp + libxmlmm/CData.cpp + libxmlmm/Comment.cpp + libxmlmm/Content.cpp + libxmlmm/Document.cpp + libxmlmm/Element.cpp + libxmlmm/LibXmlSentry.cpp + libxmlmm/Node.cpp + libxmlmm/ProcessingInstruction.cpp + libxmlmm/Text.cpp + libxmlmm/utils.cpp +) + +add_library(libxmlmm ${SOURCES_LIBXMLMM}) +include_directories(${LIBXML2_INCLUDE_DIR}) +target_link_libraries (libxmlmm ${LIBXML2_LIBRARIES}) + +set_target_properties(libxmlmm PROPERTIES + CXX_STANDARD 17 + PUBLIC_HEADER "${HEADERS_LIBXMLMM}" +) + +target_include_directories(libxmlmm PUBLIC + $ + $) + +install(TARGETS ${PROJECT_NAME} + EXPORT litehtmlTargets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + PUBLIC_HEADER DESTINATION include/libxmlmm +) diff --git a/externals/vcpkg/ports/libxmlmm/portfile.cmake b/externals/vcpkg/ports/libxmlmm/portfile.cmake new file mode 100755 index 000000000..24ff58d0e --- /dev/null +++ b/externals/vcpkg/ports/libxmlmm/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rioki/libxmlmm + REF r0.6 + SHA512 4f619e730de2f88b891ef31dd7ced2e6be75fff7f3852ec178843bf8d099d2e1ea84e0fcde35ff7fefc201b026f63e4b5d55f88e48334c49a0333be0327894df + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libxmlmm/vcpkg.json b/externals/vcpkg/ports/libxmlmm/vcpkg.json new file mode 100755 index 000000000..b4469246a --- /dev/null +++ b/externals/vcpkg/ports/libxmlmm/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libxmlmm", + "version": "0.6.0", + "port-version": 2, + "description": "Libxmlmm is a C++ wrapper for libxml 2.0 that only relies on standard C++ and libxml2.", + "homepage": "https://github.com/rioki/libxmlmm", + "dependencies": [ + "libxml2", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libxmlpp/portfile.cmake b/externals/vcpkg/ports/libxmlpp/portfile.cmake new file mode 100755 index 000000000..1620e79b3 --- /dev/null +++ b/externals/vcpkg/ports/libxmlpp/portfile.cmake @@ -0,0 +1,31 @@ +#..\src\libxml++-5-7c4d4a4cea.clean\meson.build:278:4: ERROR: Problem encountered: Static builds are not supported by MSVC-style builds +set(LIBXMLPP_VERSION 5.0.0) + +vcpkg_download_distfile(ARCHIVE + URLS "https://ftp.gnome.org/pub/GNOME/sources/libxml++/5.0/libxml++-${LIBXMLPP_VERSION}.tar.xz" + FILENAME "libxml++-${LIBXMLPP_VERSION}.tar.xz" + SHA512 ae8d7a178e7a3b48a9f0e1ea303e8a4e4d879d0d9367124ede3783d0c31e31c862b98e5d28d72edc4c0b19c6b457ead2d25664efd33d65e44fd52c5783ec3091 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dbuild-documentation=false + -Dvalidation=false # Validate the tutorial XML file + -Dbuild-examples=false + -Dbuild-tests=false + -Dmsvc14x-parallel-installable=false # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019 + -Dbuild-deprecated-api=true # Build deprecated API and include it in the library +) +vcpkg_install_meson() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +# Handle copyright and readme +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libxmlpp RENAME copyright) +file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/libxmlpp) diff --git a/externals/vcpkg/ports/libxmlpp/vcpkg.json b/externals/vcpkg/ports/libxmlpp/vcpkg.json new file mode 100755 index 000000000..ff1b69a48 --- /dev/null +++ b/externals/vcpkg/ports/libxmlpp/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "libxmlpp", + "version": "5.0.0", + "port-version": 2, + "description": "a C++ wrapper for the libxml XML parser library.", + "supports": "!(windows & static)", + "dependencies": [ + "glibmm", + "libxml2", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libxmp-lite/0001-msvc-buildfix.patch b/externals/vcpkg/ports/libxmp-lite/0001-msvc-buildfix.patch new file mode 100755 index 000000000..dfd548186 --- /dev/null +++ b/externals/vcpkg/ports/libxmp-lite/0001-msvc-buildfix.patch @@ -0,0 +1,23 @@ +diff -Naur .\libxmp-lite-4.4.1/src/common.h .\libxmp-lite-4.4.1-orig/src/common.h +--- a/src/common.h 2016-07-16 13:37:36 +0200 ++++ b/src/common.h 2017-05-23 00:52:17 +0200 +@@ -77,19 +77,12 @@ + #ifndef CLIB_DECL + #define CLIB_DECL + #endif +-#ifdef DEBUG +-#ifndef ATTR_PRINTF +-#define ATTR_PRINTF(x,y) +-#endif +-void CLIB_DECL D_(const char *text, ...) ATTR_PRINTF(1,2); +-#else + // VS prior to VC7.1 does not support variadic macros. VC8.0 does not optimize unused parameters passing + #if _MSC_VER < 1400 + void __inline CLIB_DECL D_(const char *text, ...) { do {} while (0); } + #else + #define D_(args, ...) do {} while (0) + #endif +-#endif + + #elif defined __ANDROID__ + diff --git a/externals/vcpkg/ports/libxmp-lite/0002-fix-symbols.patch b/externals/vcpkg/ports/libxmp-lite/0002-fix-symbols.patch new file mode 100755 index 000000000..f765a7bf0 --- /dev/null +++ b/externals/vcpkg/ports/libxmp-lite/0002-fix-symbols.patch @@ -0,0 +1,44 @@ +diff --git a/lite/src/format.c b/lite/src/format.c +--- a/src/format.c ++++ b/src/format.c +@@ -27,20 +27,20 @@ + #endif + #include "format.h" + +-extern const struct format_loader xm_loader; +-extern const struct format_loader mod_loader; +-extern const struct format_loader it_loader; +-extern const struct format_loader s3m_loader; ++extern const struct format_loader libxmp_loader_xm; ++extern const struct format_loader libxmp_loader_mod; ++extern const struct format_loader libxmp_loader_it; ++extern const struct format_loader libxmp_loader_s3m; + + extern const struct pw_format *const pw_format[]; + + const struct format_loader *const format_loader[5] = { +- &xm_loader, +- &mod_loader, ++ &libxmp_loader_xm, ++ &libxmp_loader_mod, + #ifndef LIBXMP_CORE_DISABLE_IT +- &it_loader, ++ &libxmp_loader_it, + #endif +- &s3m_loader, ++ &libxmp_loader_s3m, + NULL + }; + +diff --git a/lite/src/loaders/mod_load.c b/lite/src/loaders/mod_load.c +--- a/src/loaders/mod_load.c ++++ b/src/loaders/mod_load.c +@@ -36,7 +36,7 @@ + static int mod_test (HIO_HANDLE *, char *, const int); + static int mod_load (struct module_data *, HIO_HANDLE *, const int); + +-const struct format_loader mod_loader = { ++const struct format_loader libxmp_loader_mod = { + "Protracker", + mod_test, + mod_load diff --git a/externals/vcpkg/ports/libxmp-lite/CMakeLists.txt b/externals/vcpkg/ports/libxmp-lite/CMakeLists.txt new file mode 100755 index 000000000..e1f14f377 --- /dev/null +++ b/externals/vcpkg/ports/libxmp-lite/CMakeLists.txt @@ -0,0 +1,63 @@ +cmake_minimum_required(VERSION 3.4) +project(libxmp-lite) + +set(HEADERS "include/libxmp-lite/xmp.h") + +set(SOURCES src/virtual.c + src/format.c + src/period.c + src/player.c + src/read_event.c + src/dataio.c + src/lfo.c + src/scan.c + src/control.c + src/filter.c + src/effects.c + src/mixer.c + src/mix_all.c + src/load_helpers.c + src/load.c + src/hio.c + src/smix.c + src/memio.c + src/loaders/common.c + src/loaders/itsex.c + src/loaders/sample.c + src/loaders/xm_load.c + src/loaders/mod_load.c + src/loaders/s3m_load.c + src/loaders/it_load.c +) + +include_directories(include/libxmp-lite src) + +option(BUILD_SHARED_LIBS "Build shared libs" OFF) +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + option(INSTALL_HEADERS "Install header files" OFF) +else() + option(INSTALL_HEADERS "Install header files" ON) +endif() + +add_library(libxmp-lite ${SOURCES}) +target_compile_definitions(libxmp-lite PRIVATE + LIBXMP_CORE_PLAYER=1 + inline=__inline + _USE_MATH_DEFINES=1 +) + +# Fix UWP /sdl compile errors +# Disable C4703: Not initialized +# Disable C4996: Deprecated +set_target_properties(libxmp-lite PROPERTIES COMPILE_FLAGS "/wd4703 /wd4996") + +install( + TARGETS libxmp-lite + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin +) + +if(INSTALL_HEADERS) + install(FILES ${HEADERS} DESTINATION include) +endif() diff --git a/externals/vcpkg/ports/libxmp-lite/portfile.cmake b/externals/vcpkg/ports/libxmp-lite/portfile.cmake new file mode 100755 index 000000000..abcad6008 --- /dev/null +++ b/externals/vcpkg/ports/libxmp-lite/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO xmp/libxmp + REF 4.4.1 + FILENAME "libxmp-lite-4.4.1.tar.gz" + SHA512 f27e3f9fb79ff15ce90b51fb29641c01cadf7455150da57cde6860c2ba075ed497650eb44ec9143bdd3538288228c609f7db6d862c9d73f007f686eccb05543e + PATCHES + 0001-msvc-buildfix.patch + 0002-fix-symbols.patch +) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libxmp-lite/vcpkg.json b/externals/vcpkg/ports/libxmp-lite/vcpkg.json new file mode 100755 index 000000000..3e0d85044 --- /dev/null +++ b/externals/vcpkg/ports/libxmp-lite/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libxmp-lite", + "version": "4.4.1", + "port-version": 8, + "description": "Lightweight version of libxmp that supports MOD, S3M, XM and IT modules.", + "homepage": "https://sourceforge.net/projects/xmp/", + "supports": "windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libxslt/cmake.patch b/externals/vcpkg/ports/libxslt/cmake.patch new file mode 100755 index 000000000..71655e166 --- /dev/null +++ b/externals/vcpkg/ports/libxslt/cmake.patch @@ -0,0 +1,50 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d8679fb7f..ca21a7a3d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -36,10 +36,10 @@ if(LIBXSLT_WITH_PYTHON) + if(HAVE_UNISTD_H AND HAVE_F_GETFL) + find_package(Python COMPONENTS Interpreter Development REQUIRED) + else() +- find_package(Python2 COMPONENTS Interpreter Development REQUIRED) +- add_library(Python::Python ALIAS Python2::Python) +- set(Python_EXECUTABLE ${Python2_EXECUTABLE}) +- set(Python_SITEARCH ${Python2_SITEARCH}) ++ find_package(Python3 COMPONENTS Interpreter Development REQUIRED) ++ add_library(Python::Python ALIAS Python3::Python) ++ set(Python_EXECUTABLE ${Python3_EXECUTABLE}) ++ set(Python_SITEARCH ${Python3_SITEARCH}) + endif() + set(LIBXSLT_PYTHON_INSTALL_DIR ${Python_SITEARCH} CACHE PATH "Python bindings install directory") + endif() +@@ -244,7 +244,7 @@ set_target_properties( + VERSION ${PROJECT_VERSION} + ) + +-if(MSVC) ++if(0) # Never add suffixes which are not added by the autotools build or the nmake makefiles + if(BUILD_SHARED_LIBS) + set_target_properties( + LibXslt +@@ -327,7 +327,7 @@ set_target_properties( + VERSION ${LIBEXSLT_VERSION} + ) + +-if(MSVC) ++if(0) # same reason as above + if(BUILD_SHARED_LIBS) + set_target_properties( + LibExslt +diff --git a/libexslt.pc.in b/libexslt.pc.in +index 1d605639a..c3a1edb00 100644 +--- a/libexslt.pc.in ++++ b/libexslt.pc.in +@@ -7,7 +7,7 @@ includedir=@includedir@ + Name: libexslt + Version: @LIBEXSLT_VERSION@ + Description: EXSLT Extension library +-Requires: libxml-2.0, libxslt ++Requires: libxml-2.0 libxslt + Cflags: @EXSLT_INCLUDEDIR@ + Libs: @EXSLT_LIBDIR@ -lexslt + Libs.private: @EXSLT_PRIVATE_LIBS@ diff --git a/externals/vcpkg/ports/libxslt/portfile.cmake b/externals/vcpkg/ports/libxslt/portfile.cmake new file mode 100755 index 000000000..7b94c792b --- /dev/null +++ b/externals/vcpkg/ports/libxslt/portfile.cmake @@ -0,0 +1,83 @@ +# Get this value from configure.ac:21 +set(LIBEXSLT_VERSION 0.8.20) +set(VERSION 1.1.35) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO GNOME/libxslt + REF v${VERSION} + SHA512 1ab264a8d3996d74a89a22e4062950ef968b9252736e0b5f975e6f45d63a6484993fe383b85831cef0e4b9c9c90f9b2b3d5432c15ee9381dbaeb2fa681ab9b46 + HEAD_REF master + PATCHES + cmake.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "python" LIBXSLT_WITH_PYTHON + "crypto" LIBXSLT_WITH_CRYPTO +) +if("python" IN_LIST FEATURES) + vcpkg_find_acquire_program(PYTHON3) + list(APPEND FEATURE_OPTIONS "-DPYTHON_EXECUTABLE=${PYTHON3}") + list(APPEND FEATURE_OPTIONS_RELEASE "-DLIBXSLT_PYTHON_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/lib/site-packages") + list(APPEND FEATURE_OPTIONS_DEBUG "-DLIBXSLT_PYTHON_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/debug/lib/site-packages") +endif() +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DLIBXSLT_WITH_TESTS:BOOL=OFF + -DLIBXSLT_WITH_THREADS:BOOL=ON + OPTIONS_RELEASE + ${FEATURE_OPTIONS_RELEASE} + -DLIBXSLT_WITH_XSLT_DEBUG:BOOL=OFF + -DLIBXSLT_WITH_MEM_DEBUG:BOOL=OFF + -DLIBXSLT_WITH_DEBUGGER:BOOL=OFF + OPTIONS_DEBUG + ${FEATURE_OPTIONS_DEBUG} + -DLIBXSLT_WITH_XSLT_DEBUG:BOOL=ON + -DLIBXSLT_WITH_MEM_DEBUG:BOOL=ON + -DLIBXSLT_WITH_DEBUGGER:BOOL=ON + ) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}-${VERSION}") + +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/xsltConf.sh" "${CURRENT_PACKAGES_DIR}/debug/lib/xsltConf.sh") + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/libxslt/bin") +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/xslt-config" "${CURRENT_PACKAGES_DIR}/tools/libxslt/bin/xslt-config") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/bin/xslt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../") +if(NOT VCPKG_BUILD_TYPE) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/xslt-config" "${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/bin/xslt-config") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/bin/xslt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../../") +endif() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libxslt/xsltconfig.h" "#define LIBXSLT_DEFAULT_PLUGINS_PATH() \"${CURRENT_INSTALLED_DIR}/lib/libxslt-plugins\"" "") +vcpkg_copy_tools(TOOL_NAMES xsltproc AUTO_CLEAN) + +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +# You have to define LIB(E)XSLT_STATIC or not, depending on how you link +file(READ "${CURRENT_PACKAGES_DIR}/include/libxslt/xsltexports.h" XSLTEXPORTS_H) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + string(REPLACE "!defined(LIBXSLT_STATIC)" "0" XSLTEXPORTS_H "${XSLTEXPORTS_H}") +else() + string(REPLACE "!defined(LIBXSLT_STATIC)" "1" XSLTEXPORTS_H "${XSLTEXPORTS_H}") +endif() +file(WRITE "${CURRENT_PACKAGES_DIR}/include/libxslt/xsltexports.h" "${XSLTEXPORTS_H}") + +file(READ "${CURRENT_PACKAGES_DIR}/include/libexslt/exsltexports.h" EXSLTEXPORTS_H) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + string(REPLACE "!defined(LIBEXSLT_STATIC)" "0" EXSLTEXPORTS_H "${EXSLTEXPORTS_H}") +else() + string(REPLACE "!defined(LIBEXSLT_STATIC)" "1" EXSLTEXPORTS_H "${EXSLTEXPORTS_H}") +endif() +file(WRITE "${CURRENT_PACKAGES_DIR}/include/libexslt/exsltexports.h" "${EXSLTEXPORTS_H}") + +# Remove tools and debug include directories +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/Copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libxslt") diff --git a/externals/vcpkg/ports/libxslt/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/libxslt/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..b7e5ecdfa --- /dev/null +++ b/externals/vcpkg/ports/libxslt/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,5 @@ +list(REMOVE_ITEM ARGS "NO_MODULE") +list(REMOVE_ITEM ARGS "CONFIG") +list(REMOVE_ITEM ARGS "MODULE") + +_find_package(${ARGS} CONFIG) diff --git a/externals/vcpkg/ports/libxslt/vcpkg.json b/externals/vcpkg/ports/libxslt/vcpkg.json new file mode 100755 index 000000000..d40c69282 --- /dev/null +++ b/externals/vcpkg/ports/libxslt/vcpkg.json @@ -0,0 +1,56 @@ +{ + "name": "libxslt", + "version": "1.1.35", + "description": "Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT", + "homepage": "https://github.com/GNOME/libxslt", + "license": null, + "supports": "!uwp", + "dependencies": [ + "liblzma", + "libxml2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "default-features" + ], + "features": { + "crypto": { + "description": "Build with crypto support", + "supports": "mingw | !windows", + "dependencies": [ + { + "name": "libgcrypt", + "platform": "!mingw" + } + ] + }, + "default-features": { + "description": "default features for the current platform", + "dependencies": [ + { + "name": "libxslt", + "default-features": false, + "features": [ + "crypto" + ], + "platform": "mingw | !windows" + } + ] + }, + "plugins": { + "description": "(deprecated)", + "supports": "!static" + }, + "python": { + "description": "Builds with python support", + "supports": "mingw | !windows" + } + } +} diff --git a/externals/vcpkg/ports/libyaml/export-pkgconfig.patch b/externals/vcpkg/ports/libyaml/export-pkgconfig.patch new file mode 100755 index 000000000..5e0d5a3b7 --- /dev/null +++ b/externals/vcpkg/ports/libyaml/export-pkgconfig.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4f81148..8006536 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -158,3 +158,11 @@ install( + FILES ${config_version_file} + DESTINATION ${INSTALL_CMAKE_DIR} COMPONENT Development + ) ++ ++set(prefix ${CMAKE_INSTALL_PREFIX}) ++set(exec_prefix ${CMAKE_INSTALL_PREFIX}) ++set(includedir ${CMAKE_INSTALL_PREFIX}/include) ++set(libdir ${CMAKE_INSTALL_PREFIX}/lib) ++set(PACKAGE_VERSION 0.1) ++configure_file(yaml-0.1.pc.in ${PROJECT_BINARY_DIR}/yaml-0.1.pc @ONLY) ++install(FILES ${PROJECT_BINARY_DIR}/yaml-0.1.pc DESTINATION lib/pkgconfig) diff --git a/externals/vcpkg/ports/libyaml/fix-POSIX_name.patch b/externals/vcpkg/ports/libyaml/fix-POSIX_name.patch new file mode 100755 index 000000000..0aa6d211c --- /dev/null +++ b/externals/vcpkg/ports/libyaml/fix-POSIX_name.patch @@ -0,0 +1,13 @@ +diff --git a/src/api.c b/src/api.c +index e793b08..6f16fc5 100644 +--- a/src/api.c ++++ b/src/api.c +@@ -63,7 +63,7 @@ yaml_strdup(const yaml_char_t *str) + if (!str) + return NULL; + +- return (yaml_char_t *)strdup((char *)str); ++ return (yaml_char_t *)_strdup((char *)str); + } + + /* diff --git a/externals/vcpkg/ports/libyaml/portfile.cmake b/externals/vcpkg/ports/libyaml/portfile.cmake new file mode 100755 index 000000000..577b42675 --- /dev/null +++ b/externals/vcpkg/ports/libyaml/portfile.cmake @@ -0,0 +1,33 @@ +if (WIN32) + set(PATCHES fix-POSIX_name.patch) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO yaml/libyaml + REF 2c891fc7a770e8ba2fec34fc6b545c672beb37e6 # 0.2.5 + SHA512 7cdde7b48c937777b851747f7e0b9a74cb7da30173e09305dad931ef83c3fcee3e125e721166690fe6a0987ba897564500530e5518e4b66b1c9b1db8900bf320 + HEAD_REF master + PATCHES + ${PATCHES} + export-pkgconfig.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DINSTALL_CMAKE_DIR=share/yaml +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME yaml CONFIG_PATH share/yaml) + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/include/config.h" "${CURRENT_PACKAGES_DIR}/debug/share") + +configure_file("${SOURCE_PATH}/License" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/libyaml/vcpkg.json b/externals/vcpkg/ports/libyaml/vcpkg.json new file mode 100755 index 000000000..06a3e7600 --- /dev/null +++ b/externals/vcpkg/ports/libyaml/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "libyaml", + "version-string": "0.2.5", + "port-version": 3, + "description": "A C library for parsing and emitting YAML.", + "homepage": "https://github.com/yaml/libyaml", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libyuv/deprecated-warning.patch b/externals/vcpkg/ports/libyuv/deprecated-warning.patch new file mode 100755 index 000000000..d6bfb7030 --- /dev/null +++ b/externals/vcpkg/ports/libyuv/deprecated-warning.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cc49726..25d6ff1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,6 +10,11 @@ OPTION( TEST "Built unit tests" OFF ) + + SET( CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON ) + ++if (MSVC) ++ # Allow deprecated functions ++ add_compile_definitions(_CRT_SECURE_NO_WARNINGS) ++endif() ++ + SET ( ly_base_dir ${PROJECT_SOURCE_DIR} ) + SET ( ly_src_dir ${ly_base_dir}/source ) + SET ( ly_inc_dir ${ly_base_dir}/include ) diff --git a/externals/vcpkg/ports/libyuv/fix-build-type.patch b/externals/vcpkg/ports/libyuv/fix-build-type.patch new file mode 100755 index 000000000..179a7f7ea --- /dev/null +++ b/externals/vcpkg/ports/libyuv/fix-build-type.patch @@ -0,0 +1,62 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 50442cd..fdc82f2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -28,24 +28,32 @@ LIST ( SORT ly_unittest_sources ) + INCLUDE_DIRECTORIES( BEFORE ${ly_inc_dir} ) + + # this creates the static library (.a) ++if (NOT BUILD_SHARED_LIBS) + ADD_LIBRARY ( ${ly_lib_static} STATIC ${ly_source_files} ) + SET_TARGET_PROPERTIES( ${ly_lib_static} PROPERTIES PUBLIC_HEADER include/libyuv.h ) +- ++else() + # this creates the shared library (.so) + ADD_LIBRARY ( ${ly_lib_shared} SHARED ${ly_source_files} ) + SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES OUTPUT_NAME "${ly_lib_name}" ) + SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES PREFIX "lib" ) +- ++endif() + # this creates the conversion tool + ADD_EXECUTABLE ( yuvconvert ${ly_base_dir}/util/yuvconvert.cc ) +-TARGET_LINK_LIBRARIES ( yuvconvert ${ly_lib_static} ) +- ++if (BUILD_SHARED_LIBS) ++ TARGET_LINK_LIBRARIES ( yuvconvert ${ly_lib_shared} ) ++else() ++ TARGET_LINK_LIBRARIES ( yuvconvert ${ly_lib_static} ) ++endif() + + INCLUDE ( FindJPEG ) + if (JPEG_FOUND) +- include_directories( ${JPEG_INCLUDE_DIR} ) +- target_link_libraries( ${ly_lib_shared} PUBLIC ${JPEG_LIBRARY} ) +- target_link_libraries( yuvconvert ${JPEG_LIBRARY} ) ++ include_directories( ${JPEG_INCLUDE_DIR}) ++ if( BUILD_SHARED_LIBS) ++ target_link_libraries(${ly_lib_shared} PUBLIC ${JPEG_LIBRARY}) ++ else() ++ target_link_libraries(${ly_lib_static} PUBLIC ${JPEG_LIBRARY}) ++ endif() ++ target_link_libraries(yuvconvert ${JPEG_LIBRARY}) + add_definitions( -DHAVE_JPEG ) + endif() + +@@ -88,11 +96,13 @@ endif() + + + # install the conversion tool, .so, .a, and all the header files +-INSTALL ( TARGETS yuvconvert DESTINATION bin ) ++INSTALL ( TARGETS yuvconvert DESTINATION tools ) + INSTALL ( FILES ${ly_include_files} DESTINATION include/libyuv ) +-INSTALL ( TARGETS ${ly_lib_static} EXPORT libyuv-targets DESTINATION lib INCLUDES DESTINATION include PUBLIC_HEADER DESTINATION include ) +-INSTALL ( TARGETS ${ly_lib_shared} EXPORT libyuv-targets LIBRARY DESTINATION lib RUNTIME DESTINATION bin ) +- ++if (NOT BUILD_SHARED_LIBS) ++ INSTALL ( TARGETS ${ly_lib_static} EXPORT libyuv-targets DESTINATION lib INCLUDES DESTINATION include PUBLIC_HEADER DESTINATION include ) ++else() ++ INSTALL ( TARGETS ${ly_lib_shared} EXPORT libyuv-targets LIBRARY DESTINATION lib RUNTIME DESTINATION bin ) ++endif() + INSTALL( EXPORT libyuv-targets DESTINATION share/cmake/libyuv/ EXPORT_LINK_INTERFACE_LIBRARIES ) + + # create the .deb and .rpm packages using cpack diff --git a/externals/vcpkg/ports/libyuv/fix_cmakelists.patch b/externals/vcpkg/ports/libyuv/fix_cmakelists.patch new file mode 100755 index 000000000..00cc50599 --- /dev/null +++ b/externals/vcpkg/ports/libyuv/fix_cmakelists.patch @@ -0,0 +1,61 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ed4948f..5b4e112 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,10 +2,14 @@ + # Originally created for "roxlu build system" to compile libyuv on windows + # Run with -DTEST=ON to build unit tests + +-PROJECT ( YUV C CXX ) # "C" is required even for C++ projects + CMAKE_MINIMUM_REQUIRED( VERSION 2.8 ) ++CMAKE_POLICY( SET CMP0022 NEW ) ++ ++PROJECT ( YUV C CXX ) # "C" is required even for C++ projects + OPTION( TEST "Built unit tests" OFF ) + ++SET( CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON ) ++ + SET ( ly_base_dir ${PROJECT_SOURCE_DIR} ) + SET ( ly_src_dir ${ly_base_dir}/source ) + SET ( ly_inc_dir ${ly_base_dir}/include ) +@@ -14,6 +18,7 @@ SET ( ly_lib_name yuv ) + SET ( ly_lib_static ${ly_lib_name} ) + SET ( ly_lib_shared ${ly_lib_name}_shared ) + ++FILE ( GLOB_RECURSE ly_include_files ${ly_inc_dir}/libyuv/*.h ) + FILE ( GLOB_RECURSE ly_source_files ${ly_src_dir}/*.cc ) + LIST ( SORT ly_source_files ) + +@@ -24,6 +29,7 @@ INCLUDE_DIRECTORIES( BEFORE ${ly_inc_dir} ) + + # this creates the static library (.a) + ADD_LIBRARY ( ${ly_lib_static} STATIC ${ly_source_files} ) ++SET_TARGET_PROPERTIES( ${ly_lib_static} PROPERTIES PUBLIC_HEADER include/libyuv.h ) + + # this creates the shared library (.so) + ADD_LIBRARY ( ${ly_lib_shared} SHARED ${ly_source_files} ) +@@ -38,6 +44,7 @@ TARGET_LINK_LIBRARIES ( yuvconvert ${ly_lib_static} ) + INCLUDE ( FindJPEG ) + if (JPEG_FOUND) + include_directories( ${JPEG_INCLUDE_DIR} ) ++ target_link_libraries( ${ly_lib_shared} PUBLIC ${JPEG_LIBRARY} ) + target_link_libraries( yuvconvert ${JPEG_LIBRARY} ) + add_definitions( -DHAVE_JPEG ) + endif() +@@ -81,10 +88,12 @@ endif() + + + # install the conversion tool, .so, .a, and all the header files +-INSTALL ( PROGRAMS ${CMAKE_BINARY_DIR}/yuvconvert DESTINATION bin ) +-INSTALL ( TARGETS ${ly_lib_static} DESTINATION lib ) +-INSTALL ( TARGETS ${ly_lib_shared} LIBRARY DESTINATION lib RUNTIME DESTINATION bin ) +-INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include ) ++INSTALL ( TARGETS yuvconvert DESTINATION bin ) ++INSTALL ( FILES ${ly_include_files} DESTINATION include/libyuv ) ++INSTALL ( TARGETS ${ly_lib_static} EXPORT libyuv-targets DESTINATION lib INCLUDES DESTINATION include PUBLIC_HEADER DESTINATION include ) ++INSTALL ( TARGETS ${ly_lib_shared} EXPORT libyuv-targets LIBRARY DESTINATION lib RUNTIME DESTINATION bin ) ++ ++INSTALL( EXPORT libyuv-targets DESTINATION share/cmake/libyuv/ EXPORT_LINK_INTERFACE_LIBRARIES ) + + # create the .deb and .rpm packages using cpack + INCLUDE ( CM_linux_packages.cmake ) diff --git a/externals/vcpkg/ports/libyuv/libyuv-config.cmake b/externals/vcpkg/ports/libyuv/libyuv-config.cmake new file mode 100755 index 000000000..7031eddca --- /dev/null +++ b/externals/vcpkg/ports/libyuv/libyuv-config.cmake @@ -0,0 +1,5 @@ +include(CMakeFindDependencyMacro) +find_dependency(JPEG) + +set(libyuv_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/../../include") +include("${CMAKE_CURRENT_LIST_DIR}/libyuv-targets.cmake") diff --git a/externals/vcpkg/ports/libyuv/portfile.cmake b/externals/vcpkg/ports/libyuv/portfile.cmake new file mode 100755 index 000000000..fc2cfaf50 --- /dev/null +++ b/externals/vcpkg/ports/libyuv/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH + URL https://chromium.googlesource.com/libyuv/libyuv + REF 287158925b0e03ea4499a18b4e08478c5781541b #2021-4-15 + PATCHES + fix_cmakelists.patch + fix-build-type.patch + deprecated-warning.patch +) + +set(POSTFIX d) +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS_DEBUG + -DCMAKE_DEBUG_POSTFIX=${POSTFIX} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/libyuv) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/libyuv/convert.h "#ifdef HAVE_JPEG" "#if 1") +vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/libyuv/convert_argb.h "#ifdef HAVE_JPEG" "#if 1") + +configure_file(${CMAKE_CURRENT_LIST_DIR}/libyuv-config.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT} COPYONLY) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libyuv/vcpkg.json b/externals/vcpkg/ports/libyuv/vcpkg.json new file mode 100755 index 000000000..178ea03e3 --- /dev/null +++ b/externals/vcpkg/ports/libyuv/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libyuv", + "version-date": "2021-04-15", + "port-version": 1, + "description": "libyuv is an open source project that includes YUV scaling and conversion functionality", + "homepage": "https://chromium.googlesource.com/libyuv/libyuv", + "dependencies": [ + "libjpeg-turbo", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libzen/portfile.cmake b/externals/vcpkg/ports/libzen/portfile.cmake new file mode 100755 index 000000000..7f49cb722 --- /dev/null +++ b/externals/vcpkg/ports/libzen/portfile.cmake @@ -0,0 +1,23 @@ +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO MediaArea/ZenLib + REF 13b9d3dbd2088390fbdccab32ae4560526389fbc # v0.4.39 + SHA512 ec63af7ea60be2548d45702518a9b638b4f424044ecaebfbca97d9872b3ecafddc9c59aed4a5bae7bd5bbdffbd543c4ed9e106e5c406ec576a9c0970f0aadcac + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/Project/CMake" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME zenlib CONFIG_PATH share/zenlib) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libzen/vcpkg.json b/externals/vcpkg/ports/libzen/vcpkg.json new file mode 100755 index 000000000..6b53cd483 --- /dev/null +++ b/externals/vcpkg/ports/libzen/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "libzen", + "version": "0.4.39", + "port-version": 1, + "description": "ZenLib is a C++ utility library for easiest cross-platform development", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/libzip/fix-dependency.patch b/externals/vcpkg/ports/libzip/fix-dependency.patch new file mode 100755 index 000000000..c3d0ec294 --- /dev/null +++ b/externals/vcpkg/ports/libzip/fix-dependency.patch @@ -0,0 +1,27 @@ +diff --git a/libzip-config.cmake.in b/libzip-config.cmake.in +index 5b9aa55..0723f3c 100644 +--- a/libzip-config.cmake.in ++++ b/libzip-config.cmake.in +@@ -1,8 +1,20 @@ + @PACKAGE_INIT@ + + # only needed for static library, and doesn't work as-is +-#include(CMakeFindDependencyMacro) +-#find_dependency(ZLIB::ZLIB) ++include(CMakeFindDependencyMacro) ++if(@ENABLE_BZIP2@) ++ find_dependency(BZip2) ++endif() ++if(@ENABLE_LZMA@) ++ find_dependency(LibLZMA) ++endif() ++if(@ENABLE_ZSTD@) ++ find_dependency(Zstd) ++endif() ++if(@ENABLE_OPENSSL@) ++ find_dependency(OpenSSL) ++endif() ++find_dependency(ZLIB) + # how to handle the optional dependencies? + # Provide all our library targets to users. + include("${CMAKE_CURRENT_LIST_DIR}/libzip-targets.cmake") diff --git a/externals/vcpkg/ports/libzip/portfile.cmake b/externals/vcpkg/ports/libzip/portfile.cmake new file mode 100755 index 000000000..9670853e7 --- /dev/null +++ b/externals/vcpkg/ports/libzip/portfile.cmake @@ -0,0 +1,48 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nih-at/libzip + REF v1.8.0 + SHA512 f7a78ff6d964a485b8fe3dfb7a61afae69984e67367e6de78c3cb10f15a0904800a1aeca9d33b63bc24ca926fff98638914343a35e7c3a4c3ec8b7594fc25fc1 + HEAD_REF master + PATCHES + fix-dependency.patch +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + bzip2 ENABLE_BZIP2 + liblzma ENABLE_LZMA + zstd ENABLE_ZSTD + openssl ENABLE_OPENSSL + wincrypto ENABLE_WINDOWS_CRYPTO + commoncrypto ENABLE_COMMONCRYPTO + mbedtls ENABLE_MBEDTLS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DBUILD_DOC=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_REGRESS=OFF + -DBUILD_TOOLS=OFF + -DENABLE_GNUTLS=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libzip) +vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Remove include directories from lib +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/libzip" "${CURRENT_PACKAGES_DIR}/debug/lib/libzip") + +# Remove debug include +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Copy copright information +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/libzip/vcpkg.json b/externals/vcpkg/ports/libzip/vcpkg.json new file mode 100755 index 000000000..4468266c7 --- /dev/null +++ b/externals/vcpkg/ports/libzip/vcpkg.json @@ -0,0 +1,88 @@ +{ + "name": "libzip", + "version-semver": "1.8.0", + "description": "A library for reading, creating, and modifying zip archives.", + "homepage": "https://github.com/nih-at/libzip", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "default-features": [ + "bzip2", + "default-aes" + ], + "features": { + "bzip2": { + "description": "Support bzip2-compressed zip archives", + "dependencies": [ + "bzip2" + ] + }, + "commoncrypto": { + "description": "AES (encryption) support using Apple's Common Crypto API" + }, + "default-aes": { + "description": "Use default AES", + "dependencies": [ + { + "name": "libzip", + "default-features": false, + "features": [ + "commoncrypto" + ], + "platform": "osx" + }, + { + "name": "libzip", + "default-features": false, + "features": [ + "wincrypto" + ], + "platform": "windows" + }, + { + "name": "libzip", + "default-features": false, + "features": [ + "openssl" + ], + "platform": "!(windows | osx)" + } + ] + }, + "liblzma": { + "description": "Support XZ compressed zip archives using liblzma", + "dependencies": [ + "liblzma" + ] + }, + "mbedtls": { + "description": "AES (encryption) support using mbedtls", + "dependencies": [ + "mbedtls" + ] + }, + "openssl": { + "description": "AES (encryption) support using OpenSSL", + "dependencies": [ + "openssl" + ] + }, + "wincrypto": { + "description": "AES (encryption) support using Windows Crypto API" + }, + "zstd": { + "description": "Support Zstandard-compressed zip archives", + "dependencies": [ + "zstd" + ] + } + } +} diff --git a/externals/vcpkg/ports/libzippp/fix-find-lzma.patch b/externals/vcpkg/ports/libzippp/fix-find-lzma.patch new file mode 100755 index 000000000..bc52cbd8f --- /dev/null +++ b/externals/vcpkg/ports/libzippp/fix-find-lzma.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/FindLIBZIP.cmake b/cmake/FindLIBZIP.cmake +index c51c09a..a32bb13 100644 +--- a/cmake/FindLIBZIP.cmake ++++ b/cmake/FindLIBZIP.cmake +@@ -50,7 +50,7 @@ if (LIBZIP_FOUND) + set_property(TARGET libzip::zip APPEND PROPERTY INTERFACE_LINK_LIBRARIES Nettle::Nettle) + endif() + if(_have_extra_libs MATCHES "-llzma") +- find_package(LibLZMA::LibLZMA REQUIRED) ++ find_package(LibLZMA REQUIRED) + set_property(TARGET libzip::zip APPEND PROPERTY INTERFACE_LINK_LIBRARIES LibLZMA::LibLZMA) + endif() + if(_have_extra_libs MATCHES "-lz") diff --git a/externals/vcpkg/ports/libzippp/portfile.cmake b/externals/vcpkg/ports/libzippp/portfile.cmake new file mode 100755 index 000000000..9eaac5827 --- /dev/null +++ b/externals/vcpkg/ports/libzippp/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ctabin/libzippp + REF 4248d7bf200e00b637cbd394c2b2369891de4e30 #v5.1-1.8.0 with CXX std version c++11 + SHA512 171010da61ab4893648ceef80009925e7b79294008de220fe132c42843cb939e454812c0e70de29dfb0318e6bf11c7924a31da52f7703c523ab95c68ba61051a + HEAD_REF master + PATCHES fix-find-lzma.patch +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + encryption LIBZIPPP_ENABLE_ENCRYPTION) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DLIBZIPPP_BUILD_TESTS=OFF + OPTIONS_DEBUG + -DLIBZIPPP_INSTALL_HEADERS=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(CONFIG_PATH "cmake/libzippp") +else() + vcpkg_cmake_config_fixup(CONFIG_PATH "share/libzippp") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENCE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/libzippp/vcpkg.json b/externals/vcpkg/ports/libzippp/vcpkg.json new file mode 100755 index 000000000..096b27bac --- /dev/null +++ b/externals/vcpkg/ports/libzippp/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "libzippp", + "version": "5.1-1.8.0", + "description": "Simple basic C++ wrapper around the libzip library. It is meant to be a portable and easy-to-use library for ZIP handling", + "homepage": "https://github.com/ctabin/libzippp", + "dependencies": [ + { + "name": "libzip", + "default-features": false, + "features": [ + "bzip2" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "features": { + "encryption": { + "description": "Support encryption" + } + } +} diff --git a/externals/vcpkg/ports/licensepp/0001-use-old-pem-pack.patch b/externals/vcpkg/ports/licensepp/0001-use-old-pem-pack.patch new file mode 100755 index 000000000..37656f613 --- /dev/null +++ b/externals/vcpkg/ports/licensepp/0001-use-old-pem-pack.patch @@ -0,0 +1,29 @@ +From d1b446c7a69344cb53be6692cd76186960a1428d Mon Sep 17 00:00:00 2001 +From: Nicole Mazzuca +Date: Wed, 23 Sep 2020 09:40:32 -0700 +Subject: [PATCH 1/2] use old pem pack + +In this commit: https://github.com/noloader/cryptopp-pem/commit/0cfa60820ec1d5e8ac4d77a0a8786ee43e9a2400 +the parameter orders have been changed. +But we cannot update pem-pack to this version or newer because it +wont compile with the current version of cryptopp in vcpkg. +--- + src/external/Ripe.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/external/Ripe.cc b/src/external/Ripe.cc +index 6ff9561..a1d1eec 100644 +--- a/src/external/Ripe.cc ++++ b/src/external/Ripe.cc +@@ -227,7 +227,7 @@ Ripe::KeyPair Ripe::generateRSAKeyPair(unsigned int length, const std::string& s + if (secret.empty()) { + PEM_Save(snk, privateKey); + } else { +- PEM_Save(snk, privateKey, rng, PRIVATE_RSA_ALGORITHM, secret.data(), secret.size()); ++ PEM_Save(snk, rng, privateKey, PRIVATE_RSA_ALGORITHM, secret.data(), secret.size()); + } + snk.MessageEnd(); + } +-- +2.24.3 (Apple Git-128) + diff --git a/externals/vcpkg/ports/licensepp/0002-fix-cmake.patch b/externals/vcpkg/ports/licensepp/0002-fix-cmake.patch new file mode 100755 index 000000000..5f13d03e1 --- /dev/null +++ b/externals/vcpkg/ports/licensepp/0002-fix-cmake.patch @@ -0,0 +1,38 @@ +From 5a7cbbe8423ee3daf533bcc1fefa7d1f1315634c Mon Sep 17 00:00:00 2001 +From: Nicole Mazzuca +Date: Wed, 23 Sep 2020 09:43:37 -0700 +Subject: [PATCH 2/2] fix cmake + +Remove this patch if https://github.com/amrayn/licensepp/pull/33 is merged +--- + CMakeLists.txt | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b2c39d1..0d49632 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -35,10 +35,8 @@ if (APPLE) + endif() + endif() + +-if(MSVC) +- list (APPEND CMAKE_CXX_FLAGS " -std=c++11 -O3 ") +-else() +- list (APPEND CMAKE_CXX_FLAGS " -std=c++11 -O3 -Wall -Werror ") ++if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3 -Wall") + endif() + + # Check for cryptopp (static) +@@ -73,6 +71,7 @@ endif() + set_target_properties (licensepp-lib PROPERTIES + VERSION ${LICENSEPP_SOVERSION} + ) ++target_include_directories(licensepp-lib PUBLIC $) + target_link_libraries (licensepp-lib + ${CRYPTOPP_LIBRARIES} + ) +-- +2.24.3 (Apple Git-128) + diff --git a/externals/vcpkg/ports/licensepp/FindCryptoPP.cmake b/externals/vcpkg/ports/licensepp/FindCryptoPP.cmake new file mode 100755 index 000000000..c7e0f709c --- /dev/null +++ b/externals/vcpkg/ports/licensepp/FindCryptoPP.cmake @@ -0,0 +1,27 @@ +find_path(CRYPTOPP_INCLUDE_DIRS NAMES cryptopp/cryptlib.h) + +get_filename_component(_prefix_path ${CRYPTOPP_INCLUDE_DIRS} PATH) + +find_library( + CRYPTOPP_LIBRARY_DEBUG + NAMES cryptopp-static cryptopp + PATHS ${_prefix_path}/debug/lib + NO_DEFAULT_PATH +) +find_library( + CRYPTOPP_LIBRARY_RELEASE + NAMES cryptopp-static cryptopp + PATHS ${_prefix_path}/lib + NO_DEFAULT_PATH +) + +unset(_prefix_path) + +include(SelectLibraryConfigurations) +select_library_configurations(CRYPTOPP) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args( + CryptoPP + REQUIRED_VARS CRYPTOPP_LIBRARIES CRYPTOPP_INCLUDE_DIRS +) diff --git a/externals/vcpkg/ports/licensepp/portfile.cmake b/externals/vcpkg/ports/licensepp/portfile.cmake new file mode 100755 index 000000000..c7e3fe3da --- /dev/null +++ b/externals/vcpkg/ports/licensepp/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO amrayn/licensepp + REF 0b6d669c0b323be004f73d8c811d38158ce8c0c7 + SHA512 2161575815d8ff49110d7c2823662ba30d9f1ca2eb6be6dad1ee0807fb3fa9f28483839a133c9d380035254df7c452f8d6fa7f17fd4f29acd8b9bfbbda059291 + HEAD_REF master + PATCHES + 0001-use-old-pem-pack.patch + 0002-fix-cmake.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindCryptoPP.cmake DESTINATION ${SOURCE_PATH}/cmake) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -Dtest=OFF + -Dtravis=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT}/cmake) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/licensepp/vcpkg.json b/externals/vcpkg/ports/licensepp/vcpkg.json new file mode 100755 index 000000000..6365f1567 --- /dev/null +++ b/externals/vcpkg/ports/licensepp/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "licensepp", + "version-date": "2020-05-19", + "port-version": 3, + "description": "Cross platform software licensing library", + "homepage": "https://github.com/zuhd-org/licensepp", + "supports": "!uwp", + "dependencies": [ + { + "name": "cryptopp", + "features": [ + "pem-pack" + ] + } + ] +} diff --git a/externals/vcpkg/ports/lilv/CMakeLists.txt b/externals/vcpkg/ports/lilv/CMakeLists.txt new file mode 100755 index 000000000..7dd5cbeba --- /dev/null +++ b/externals/vcpkg/ports/lilv/CMakeLists.txt @@ -0,0 +1,96 @@ +cmake_minimum_required(VERSION 3.17) +project(lilv C) + +find_package(lv2 CONFIG REQUIRED) +find_package(serd CONFIG REQUIRED) +find_package(sord CONFIG REQUIRED) +find_package(sratom CONFIG REQUIRED) + +add_library(lilv + src/collections.c + src/filesystem.c + src/instance.c + src/lib.c + src/node.c + src/plugin.c + src/pluginclass.c + src/port.c + src/query.c + src/scalepoint.c + src/state.c + src/ui.c + src/util.c + src/world.c + src/zix/tree.c +) + +if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "MinGW") + set(LILV_PATH_SEP [[;]]) + set(LILV_DIR_SEP [[\\]]) + set(LV2_PATH [[%APPDATA%\\LV2;%COMMONPROGRAMFILES%\\LV2]]) +elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(LILV_PATH_SEP ":") + set(LILV_DIR_SEP "/") + set(LV2_PATH "~/Library/Audio/Plug-Ins/LV2:~/.lv2:/usr/local/lib/lv2:/usr/lib/lv2:/Library/Audio/Plug-Ins/LV2") +else() + set(LILV_PATH_SEP ":") + set(LILV_DIR_SEP "/") + set(LV2_PATH "~/.lv2:/usr/lib/lv2:/usr/local/lib/lv2") +endif() + +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/lilv_config.h.in" [[ +#define LILV_PATH_SEP "@LILV_PATH_SEP@" +#define LILV_DIR_SEP "@LILV_DIR_SEP@" +#define LILV_DEFAULT_LV2_PATH "@LV2_PATH@" +]]) +configure_file("${CMAKE_CURRENT_BINARY_DIR}/lilv_config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/lilv_config.h") + +target_include_directories(lilv + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/src" "${CMAKE_CURRENT_BINARY_DIR}" +) + +target_link_libraries(lilv + PUBLIC lv2::lv2 + PRIVATE serd::serd sord::sord sratom::sratom +) + +set_target_properties(lilv PROPERTIES + C_STANDARD 99 + C_STANDARD_REQUIRED ON +) + +target_compile_definitions(lilv PRIVATE LILV_INTERNAL _CRT_SECURE_NO_WARNINGS) + +if(BUILD_SHARED_LIBS) + target_compile_definitions(lilv PUBLIC LILV_SHARED) +endif() + +install( + TARGETS lilv + EXPORT lilv-targets + INCLUDES DESTINATION include +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(DIRECTORY lilv DESTINATION include) +endif() + +install( + EXPORT lilv-targets + NAMESPACE lilv:: + DESTINATION "${CMAKE_INSTALL_PREFIX}/share/lilv" +) + +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/lilv-config.cmake" [[ +include(CMakeFindDependencyMacro) +find_dependency(lv2 CONFIG) +find_dependency(serd CONFIG) +find_dependency(sord CONFIG) +find_dependency(sratom CONFIG) +include("${CMAKE_CURRENT_LIST_DIR}/lilv-targets.cmake") +]]) + +install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/lilv-config.cmake" + DESTINATION "${CMAKE_INSTALL_PREFIX}/share/lilv" +) diff --git a/externals/vcpkg/ports/lilv/portfile.cmake b/externals/vcpkg/ports/lilv/portfile.cmake new file mode 100755 index 000000000..2bb18d898 --- /dev/null +++ b/externals/vcpkg/ports/lilv/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.com + OUT_SOURCE_PATH SOURCE_PATH + REPO lv2/lilv + REF v0.24.10 + SHA512 be47b72f2671f3bbab219944519b990156547e26aa432c2618273683c86dc23ae3b071d1de586f45dfda3ea8dbbc095429ad318fda60efcf715ae917a7caa34b + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1 +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() +file( + INSTALL "${SOURCE_PATH}/COPYING" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/externals/vcpkg/ports/lilv/vcpkg.json b/externals/vcpkg/ports/lilv/vcpkg.json new file mode 100755 index 000000000..aab088cc0 --- /dev/null +++ b/externals/vcpkg/ports/lilv/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "lilv", + "version": "0.24.10", + "port-version": 1, + "description": "Lilv is a C library for simple use of LV2 plugins in applications.", + "homepage": "https://drobilla.net/software/lilv", + "license": "ISC", + "supports": "!uwp", + "dependencies": [ + "lv2", + "serd", + "sord", + "sratom" + ] +} diff --git a/externals/vcpkg/ports/linalg/portfile.cmake b/externals/vcpkg/ports/linalg/portfile.cmake new file mode 100755 index 000000000..23ae4c83c --- /dev/null +++ b/externals/vcpkg/ports/linalg/portfile.cmake @@ -0,0 +1,11 @@ +#header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sgorsten/linalg + REF v2.1 + SHA512 48d8248ea1bca3d4fe35d038690f496cd0c8c9469d76eca684668ce6fef5df0eb9556f9b49e4da90e2c2e8ef475791877aa815c3f9437c097fbfc303134d02d7 + HEAD_REF master +) + +configure_file(${SOURCE_PATH}/UNLICENSE ${CURRENT_PACKAGES_DIR}/share/linalg/copyright COPYONLY) +configure_file(${SOURCE_PATH}/linalg.h ${CURRENT_PACKAGES_DIR}/include/linalg.h COPYONLY) \ No newline at end of file diff --git a/externals/vcpkg/ports/linalg/vcpkg.json b/externals/vcpkg/ports/linalg/vcpkg.json new file mode 100755 index 000000000..07871bcfd --- /dev/null +++ b/externals/vcpkg/ports/linalg/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "linalg", + "version-string": "2.1", + "port-version": 1, + "description": "linalg.h is a single header public domain linear algebra library for C++11" +} diff --git a/externals/vcpkg/ports/linenoise-ng/portfile.cmake b/externals/vcpkg/ports/linenoise-ng/portfile.cmake new file mode 100755 index 000000000..e0d1db928 --- /dev/null +++ b/externals/vcpkg/ports/linenoise-ng/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO arangodb/linenoise-ng + REF 4754bee2d8eb3c4511e6ac87cac62255b2011e2f + SHA512 080c6b4cde911a162885a2e6fc95143ab481b4dcc0f8b871a55a071ccb4ab868b19201ec17475a3c3ceef1b82325d757913383b3c46da6946ddc8bfc0d82d9ca + HEAD_REF master +) + + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/linenoise-ng RENAME copyright) diff --git a/externals/vcpkg/ports/linenoise-ng/vcpkg.json b/externals/vcpkg/ports/linenoise-ng/vcpkg.json new file mode 100755 index 000000000..01e6e121e --- /dev/null +++ b/externals/vcpkg/ports/linenoise-ng/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "linenoise-ng", + "version-string": "4754bee2d8eb3", + "port-version": 2, + "description": "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters." +} diff --git a/externals/vcpkg/ports/lionkor-commandline/add-install.patch b/externals/vcpkg/ports/lionkor-commandline/add-install.patch new file mode 100755 index 000000000..5b7947373 --- /dev/null +++ b/externals/vcpkg/ports/lionkor-commandline/add-install.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b4db57c..7ace55c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,3 +22,5 @@ if(BUILD_EXAMPLES) + target_link_libraries(test commandline) + endif() + ++set_target_properties(commandline PROPERTIES PUBLIC_HEADER "commandline.h") ++install(TARGETS commandline RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include) diff --git a/externals/vcpkg/ports/lionkor-commandline/portfile.cmake b/externals/vcpkg/ports/lionkor-commandline/portfile.cmake new file mode 100755 index 000000000..51232f1b4 --- /dev/null +++ b/externals/vcpkg/ports/lionkor-commandline/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lionkor/commandline + REF 01434c11aaf82d37a126dc70f5aa02cc523dbbb4 + SHA512 fb9554c07d13aa4c5d84f8288ad39e67ab302da4b286172e0f8fbc22b351234a83fb60f1c085a238d10477a379fded32302338cbddbe7ee0fdda54c6c4a75593 + HEAD_REF master + PATCHES + add-install.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/lionkor-commandline/vcpkg.json b/externals/vcpkg/ports/lionkor-commandline/vcpkg.json new file mode 100755 index 000000000..f9256896c --- /dev/null +++ b/externals/vcpkg/ports/lionkor-commandline/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "lionkor-commandline", + "version-semver": "2.0.0", + "description": "A C++ commandline for use in servers and chat software. Provides very simple asynchronous input/output.", + "homepage": "https://github.com/lionkor/commandline/", + "license": "MIT", + "supports": "!osx & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/live555/CMakeLists.txt b/externals/vcpkg/ports/live555/CMakeLists.txt new file mode 100755 index 000000000..097102b5d --- /dev/null +++ b/externals/vcpkg/ports/live555/CMakeLists.txt @@ -0,0 +1,37 @@ +cmake_minimum_required(VERSION 3.5) +project(live555 C CXX) + +include_directories( + BasicUsageEnvironment/include + groupsock/include + liveMedia/include + UsageEnvironment/include +) + +if (WIN32) + add_definitions(-DNO_GETIFADDRS) +endif(WIN32) + +if (NOT MSVC) + add_compile_options(-DSOCKLEN_T=socklen_t) +endif() + +file(GLOB BASIC_USAGE_ENVIRONMENT_SRCS BasicUsageEnvironment/*.c BasicUsageEnvironment/*.cpp) +add_library(BasicUsageEnvironment ${BASIC_USAGE_ENVIRONMENT_SRCS}) + +file(GLOB GROUPSOCK_SRCS groupsock/*.c groupsock/*.cpp) +add_library(groupsock ${GROUPSOCK_SRCS}) + +file(GLOB LIVEMEDIA_SRCS liveMedia/*.c liveMedia/*.cpp) +add_library(liveMedia ${LIVEMEDIA_SRCS}) +find_package(OpenSSL REQUIRED) +target_include_directories(liveMedia PRIVATE "${OPENSSL_INCLUDE_DIR}") + +file(GLOB USAGE_ENVIRONMENT_SRCS UsageEnvironment/*.c UsageEnvironment/*.cpp) +add_library(UsageEnvironment ${USAGE_ENVIRONMENT_SRCS}) + +install(TARGETS groupsock BasicUsageEnvironment liveMedia UsageEnvironment + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) diff --git a/externals/vcpkg/ports/live555/fix-RTSPClient.patch b/externals/vcpkg/ports/live555/fix-RTSPClient.patch new file mode 100755 index 000000000..66863963d --- /dev/null +++ b/externals/vcpkg/ports/live555/fix-RTSPClient.patch @@ -0,0 +1,13 @@ +diff --git a/liveMedia/RTSPClient.cpp b/liveMedia/RTSPClient.cpp +index 02c46c7..6127698 100644 +--- a/liveMedia/RTSPClient.cpp ++++ b/liveMedia/RTSPClient.cpp +@@ -1939,7 +1939,7 @@ int RTSPClient::write(const u_int8_t* data, unsigned count) { + if (fTLS.isNeeded) { + return fTLS.write(data, count); + } else { +- return send(fOutputSocketNum, data, count, 0); ++ return send(fOutputSocketNum, (const char *)data, count, 0); + } + } + diff --git a/externals/vcpkg/ports/live555/portfile.cmake b/externals/vcpkg/ports/live555/portfile.cmake new file mode 100755 index 000000000..b11e4d076 --- /dev/null +++ b/externals/vcpkg/ports/live555/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_download_distfile(ARCHIVE + URLS "http://www.live555.com/liveMedia/public/live.2022.04.26.tar.gz" + FILENAME "live.2022.04.26.tar.gz" + SHA512 0226a451129df1d47d10bc96ef2a9ab8ffb0116fd0daac8b16a1dd57b319b9058b587955a01bc4a939c3f64659915815fe182c8c7b02cb286313ff132dcbe144 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + fix-RTSPClient.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +file(GLOB HEADERS + "${SOURCE_PATH}/BasicUsageEnvironment/include/*.h*" + "${SOURCE_PATH}/groupsock/include/*.h*" + "${SOURCE_PATH}/liveMedia/include/*.h*" + "${SOURCE_PATH}/UsageEnvironment/include/*.h*" +) + +file(COPY ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/live555/vcpkg.json b/externals/vcpkg/ports/live555/vcpkg.json new file mode 100755 index 000000000..cff251838 --- /dev/null +++ b/externals/vcpkg/ports/live555/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "live555", + "version-date": "2022-05-05", + "description": "A complete RTSP server application", + "homepage": "https://www.live555.com/liveMedia", + "license": "GPL-3.0-or-later", + "dependencies": [ + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/llfio/issue-83-fix-backport.patch b/externals/vcpkg/ports/llfio/issue-83-fix-backport.patch new file mode 100755 index 000000000..dbf4c53a9 --- /dev/null +++ b/externals/vcpkg/ports/llfio/issue-83-fix-backport.patch @@ -0,0 +1,35 @@ +diff --git a/include/llfio/v2.0/map_handle.hpp b/include/llfio/v2.0/map_handle.hpp +index 55cefa8f..3962be16 100644 +--- a/include/llfio/v2.0/map_handle.hpp ++++ b/include/llfio/v2.0/map_handle.hpp +@@ -294,8 +294,8 @@ support this operation). You may find the `is_nvram()` observer of particular us + */ + inline io_handle::const_buffer_type nvram_barrier(io_handle::const_buffer_type req, bool evict = false) noexcept + { +- auto *tp = (io_handle::const_buffer_type::pointer)(((uintptr_t) req.data()) & ~63); +- io_handle::const_buffer_type ret{tp, (size_t)(req.data() + 63 + req.size() - tp) & ~63}; ++ auto *tp = (io_handle::const_buffer_type::pointer) (((uintptr_t) req.data()) & ~63); ++ io_handle::const_buffer_type ret{tp, (size_t) (req.data() + 63 + req.size() - tp) & ~63}; + if(memory_flush_none == mem_flush_stores(ret.data(), ret.size(), evict ? memory_flush_evict : memory_flush_retain)) + { + ret = {tp, 0}; +@@ -954,7 +954,8 @@ namespace detail + { + try + { +- auto make_shared = [](map_handle h) { ++ auto make_shared = [](map_handle h) -> io_handle::registered_buffer_type ++ { + struct registered_buffer_type_indirect : io_multiplexer::_registered_buffer_type + { + map_handle h; +@@ -964,8 +965,7 @@ namespace detail + { + } + }; +- auto ptr = std::make_shared(std::move(h)); +- return ptr; ++ return io_handle::registered_buffer_type(std::make_shared(std::move(h))); + }; + const auto &page_sizes = utils::page_sizes(true); + size_t idx = 0; diff --git a/externals/vcpkg/ports/llfio/portfile.cmake b/externals/vcpkg/ports/llfio/portfile.cmake new file mode 100755 index 000000000..6f133d71c --- /dev/null +++ b/externals/vcpkg/ports/llfio/portfile.cmake @@ -0,0 +1,90 @@ +if (NOT "cxx20" IN_LIST FEATURES) + message(WARNING [=[ + LLFIO depends on Outcome which depends on QuickCppLib which uses the vcpkg versions of gsl-lite and byte-lite, rather than the versions tested by QuickCppLib's, Outcome's and LLFIO's CI. It is not guaranteed to work with other versions, with failures experienced in the past up-to-and-including runtime crashes. See the warning message from QuickCppLib for how you can pin the versions of those dependencies in your manifest file to those with which QuickCppLib was tested. Do not report issues to upstream without first pinning the versions as QuickCppLib was tested against. + ]=]) +endif() + + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ned14/llfio + REF 4a117d683b82a2e3e456c2ecc47a99c8406280fa + SHA512 7880356dbff10664a146a09558ba15f95cf6883ebe8e0af3d392fbd6f86f3455b9b5c8b6c5c1281c8fca93c358fcafd3468ab575eee0b483ec5b136ca59eef04 + HEAD_REF develop + PATCHES + # https://github.com/ned14/llfio/issues/83 + # To be removed on next update + issue-83-fix-backport.patch +) + +vcpkg_from_github( + OUT_SOURCE_PATH NTKEC_SOURCE_PATH + REPO ned14/ntkernel-error-category + REF bbd44623594142155d49bd3ce8820d3cf9da1e1e + SHA512 589d3bc7bca98ca8d05ce9f5cf009dd98b8884bdf3739582f2f6cbf5a324ce95007ea041450ed935baa4a401b4a0242c181fb6d2dcf7ad91587d75f05491f50e + HEAD_REF master +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS LLFIO_FEATURE_OPTIONS + FEATURES + status-code LLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE +) + +# LLFIO expects ntkernel-error-category to live inside its include directory +file(REMOVE_RECURSE "${SOURCE_PATH}/include/llfio/ntkernel-error-category") +file(RENAME "${NTKEC_SOURCE_PATH}" "${SOURCE_PATH}/include/llfio/ntkernel-error-category") + +set(extra_config) +# cmake does not correctly set CMAKE_SYSTEM_PROCESSOR when targeting ARM on Windows +if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")) + list(APPEND extra_config -DLLFIO_ASSUME_CROSS_COMPILING=On) +endif() +# setting CMAKE_CXX_STANDARD here to prevent llfio from messing with compiler flags +# the cmake package config requires said C++ standard target transitively via quickcpplib +if ("cxx20" IN_LIST FEATURES) + list(APPEND extra_config -DCMAKE_CXX_STANDARD=20) +elseif("cxx17" IN_LIST FEATURES) + list(APPEND extra_config -DCMAKE_CXX_STANDARD=17) +endif() + +# quickcpplib parses CMAKE_MSVC_RUNTIME_LIBRARY and cannot support the default crt linkage generator expression from vcpkg +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + list(APPEND extra_config -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$$<$$:Debug>DLL) + else() + list(APPEND extra_config -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$$<$$:Debug>) + endif() +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DPROJECT_IS_DEPENDENCY=On + -Dquickcpplib_DIR=${CURRENT_INSTALLED_DIR}/share/quickcpplib + ${LLFIO_FEATURE_OPTIONS} + -DLLFIO_ENABLE_DEPENDENCY_SMOKE_TEST=ON # Leave this always on to test everything compiles + -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON + ${extra_config} +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_cmake_build(TARGET install.dl) +else(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_cmake_build(TARGET install.sl) +endif() + +if("run-tests" IN_LIST FEATURES) + vcpkg_cmake_build(TARGET test) +endif() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/llfio) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +if("status-code" IN_LIST FEATURES) + file(INSTALL "${CURRENT_PORT_DIR}/usage-status-code-${VCPKG_LIBRARY_LINKAGE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +else() + file(INSTALL "${CURRENT_PORT_DIR}/usage-error-code-${VCPKG_LIBRARY_LINKAGE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +endif() +file(INSTALL "${SOURCE_PATH}/Licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/llfio/usage-error-code-dynamic b/externals/vcpkg/ports/llfio/usage-error-code-dynamic new file mode 100755 index 000000000..21b2aff44 --- /dev/null +++ b/externals/vcpkg/ports/llfio/usage-error-code-dynamic @@ -0,0 +1,10 @@ +The package llfio provides two CMake targets: + + find_package(llfio CONFIG REQUIRED) + +- If you want the header-only form of LLFIO: + find_package(Threads REQUIRED) + target_link_libraries(main PUBLIC llfio::hl) + +- If you want the shared library form of LLFIO with shared NT kernel error code category: + target_link_libraries(main PUBLIC llfio::dl llfio::ntkernel-error-category::dl) diff --git a/externals/vcpkg/ports/llfio/usage-error-code-static b/externals/vcpkg/ports/llfio/usage-error-code-static new file mode 100755 index 000000000..935e91039 --- /dev/null +++ b/externals/vcpkg/ports/llfio/usage-error-code-static @@ -0,0 +1,10 @@ +The package llfio provides two CMake targets: + + find_package(llfio CONFIG REQUIRED) + +- If you want the header-only form of LLFIO: + find_package(Threads REQUIRED) + target_link_libraries(main PUBLIC llfio::hl) + +- If you want the static library form of LLFIO with static NT kernel error code category: + target_link_libraries(main PUBLIC llfio::sl llfio::ntkernel-error-category::sl) diff --git a/externals/vcpkg/ports/llfio/usage-status-code-dynamic b/externals/vcpkg/ports/llfio/usage-status-code-dynamic new file mode 100755 index 000000000..7d1b8fb0c --- /dev/null +++ b/externals/vcpkg/ports/llfio/usage-status-code-dynamic @@ -0,0 +1,10 @@ +The package llfio provides two CMake targets: + + find_package(llfio CONFIG REQUIRED) + +- If you want the header-only form of LLFIO: + find_package(Threads REQUIRED) + target_link_libraries(main PUBLIC llfio::hl) + +- If you want the shared library form of LLFIO: + target_link_libraries(main PUBLIC llfio::dl) diff --git a/externals/vcpkg/ports/llfio/usage-status-code-static b/externals/vcpkg/ports/llfio/usage-status-code-static new file mode 100755 index 000000000..b987f6f6e --- /dev/null +++ b/externals/vcpkg/ports/llfio/usage-status-code-static @@ -0,0 +1,10 @@ +The package llfio provides two CMake targets: + + find_package(llfio CONFIG REQUIRED) + +- If you want the header-only form of LLFIO: + find_package(Threads REQUIRED) + target_link_libraries(main PUBLIC llfio::hl) + +- If you want the static library form of LLFIO: + target_link_libraries(main PUBLIC llfio::sl) diff --git a/externals/vcpkg/ports/llfio/vcpkg.json b/externals/vcpkg/ports/llfio/vcpkg.json new file mode 100755 index 000000000..52457a800 --- /dev/null +++ b/externals/vcpkg/ports/llfio/vcpkg.json @@ -0,0 +1,59 @@ +{ + "name": "llfio", + "version": "2.0-20220112", + "port-version": 1, + "description": "P1031 low level file i/o and filesystem library for the C++ standard", + "homepage": "https://github.com/ned14/llfio", + "license": "Apache-2.0 OR BSL-1.0", + "supports": "!uwp", + "dependencies": [ + "outcome", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cxx17": { + "description": "Do not polyfill C++17 entities", + "dependencies": [ + { + "name": "ned14-internal-quickcpplib", + "default-features": false, + "features": [ + "cxx17" + ] + } + ] + }, + "cxx20": { + "description": "Do not polyfill C++20 entities", + "dependencies": [ + { + "name": "llfio", + "default-features": false, + "features": [ + "cxx17" + ] + }, + { + "name": "ned14-internal-quickcpplib", + "default-features": false, + "features": [ + "cxx20" + ] + } + ] + }, + "run-tests": { + "description": "Build and run the dependency validation tests" + }, + "status-code": { + "description": "Have LLFIO use SG14 `status_code` (proposed `std::error`) instead of `std::error_code`." + } + } +} diff --git a/externals/vcpkg/ports/llgl/fix-arm64-build-error.patch b/externals/vcpkg/ports/llgl/fix-arm64-build-error.patch new file mode 100755 index 000000000..d80061c16 --- /dev/null +++ b/externals/vcpkg/ports/llgl/fix-arm64-build-error.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f440884..f1a9190 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -559,6 +559,8 @@ if(APPLE) + endif() + elseif(UNIX) + target_link_libraries(LLGL X11 pthread Xxf86vm Xrandr) ++elseif(WIN32) ++ target_link_libraries(LLGL gdi32 shell32) + endif() + + set_target_properties(LLGL PROPERTIES LINKER_LANGUAGE CXX DEBUG_POSTFIX "D") diff --git a/externals/vcpkg/ports/llgl/fix-install-error.patch b/externals/vcpkg/ports/llgl/fix-install-error.patch new file mode 100755 index 000000000..872d01bfc --- /dev/null +++ b/externals/vcpkg/ports/llgl/fix-install-error.patch @@ -0,0 +1,44 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f440884..d1b0c2f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -614,6 +614,12 @@ if(LLGL_BUILD_RENDERER_OPENGL) + target_link_libraries(LLGL_OpenGL LLGL ${OPENGL_LIBRARIES}) + + ADD_DEFINE(LLGL_BUILD_RENDERER_OPENGL) ++ ++ install(TARGETS LLGL_OpenGL ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++ ) + else() + message("Missing OpenGL -> LLGL_OpenGL renderer will be excluded from project") + endif() +@@ -681,6 +687,12 @@ if(WIN32) + target_link_libraries(LLGL_Direct3D11 LLGL d3d11 dxgi D3DCompiler) + + ADD_DEFINE(LLGL_BUILD_RENDERER_DIRECT3D11) ++ ++ install(TARGETS LLGL_Direct3D11 ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++ ) + endif() + + if(LLGL_BUILD_RENDERER_DIRECT3D12) +@@ -821,4 +833,13 @@ if(LLGL_ENABLE_SPIRV_REFLECT) + message("Including Submodule: SPIRV") + endif() + ++# Install targets ++install(TARGETS ${PROJECT_NAME} ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++) ++# Install headers ++install(DIRECTORY ${PROJECT_INCLUDE_DIR} DESTINATION .) ++ + diff --git a/externals/vcpkg/ports/llgl/portfile.cmake b/externals/vcpkg/ports/llgl/portfile.cmake new file mode 100755 index 000000000..6ee4bed6b --- /dev/null +++ b/externals/vcpkg/ports/llgl/portfile.cmake @@ -0,0 +1,38 @@ +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "${PORT} currently doesn't supports UWP.") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LukasBanana/LLGL + REF 8f28437960ed60622e94f4f97b24e842b5a0e9e6 + SHA512 8a6bd4109e977f9def0f04a3d31f7bd4beebbe162c52eaa08a54daf8335871615215ece166e5a9d5b5475b834fd53a26ff9638ff270a2f00c88bab21ed156760 + HEAD_REF master + PATCHES + fix-install-error.patch + fix-arm64-build-error.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + opengl LLGL_BUILD_RENDERER_OPENGL + direct3d11 LLGL_BUILD_RENDERER_DIRECT3D11 +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS ${FEATURE_OPTIONS} +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/llgl/vcpkg.json b/externals/vcpkg/ports/llgl/vcpkg.json new file mode 100755 index 000000000..f653d01f5 --- /dev/null +++ b/externals/vcpkg/ports/llgl/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "llgl", + "version-string": "2019-08-15", + "port-version": 2, + "description": "Low Level Graphics Library (LLGL) is a thin abstraction layer for the modern graphics APIs OpenGL, Direct3D, Vulkan, and Metal.", + "homepage": "https://github.com/LukasBanana/LLGL", + "supports": "!uwp", + "features": { + "direct3d11": { + "description": "Support for direct3d11" + }, + "opengl": { + "description": "Support for opengl" + } + } +} diff --git a/externals/vcpkg/ports/llvm/0002-fix-install-paths.patch b/externals/vcpkg/ports/llvm/0002-fix-install-paths.patch new file mode 100755 index 000000000..c5a2885f4 --- /dev/null +++ b/externals/vcpkg/ports/llvm/0002-fix-install-paths.patch @@ -0,0 +1,161 @@ + clang/cmake/modules/CMakeLists.txt | 4 ++-- + compiler-rt/cmake/Modules/CompilerRTUtils.cmake | 2 +- + flang/cmake/modules/CMakeLists.txt | 4 ++-- + lld/cmake/modules/CMakeLists.txt | 4 ++-- + llvm/cmake/modules/AddLLVM.cmake | 2 +- + llvm/cmake/modules/CMakeLists.txt | 2 +- + mlir/cmake/modules/CMakeLists.txt | 4 ++-- + mlir/test/CMakeLists.txt | 2 +- + openmp/tools/Modules/CMakeLists.txt | 2 +- + polly/cmake/CMakeLists.txt | 4 ++-- + 10 files changed, 15 insertions(+), 15 deletions(-) + +diff --git a/clang/cmake/modules/CMakeLists.txt b/clang/cmake/modules/CMakeLists.txt +index c6f6ce9fe5d6..fc886b23a1a8 100644 +--- a/clang/cmake/modules/CMakeLists.txt ++++ b/clang/cmake/modules/CMakeLists.txt +@@ -5,11 +5,11 @@ include(FindPrefixFromConfig) + # Generate a list of CMake library targets so that other CMake projects can + # link against them. LLVM calls its version of this file LLVMExports.cmake, but + # the usual CMake convention seems to be ${Project}Targets.cmake. +-set(CLANG_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/clang) ++set(CLANG_INSTALL_PACKAGE_DIR share/clang) + set(clang_cmake_builddir "${CMAKE_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}") + + # Keep this in sync with llvm/cmake/CMakeLists.txt! +-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) ++set(LLVM_INSTALL_PACKAGE_DIR share/llvm) + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") + + get_property(CLANG_EXPORTS GLOBAL PROPERTY CLANG_EXPORTS) +diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake +index 052095801aae..f3402793b60c 100644 +--- a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake ++++ b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake +@@ -376,7 +376,7 @@ macro(load_llvm_config) + file(TO_CMAKE_PATH ${LLVM_CMAKE_DIR_FROM_LLVM_CONFIG} LLVM_CMAKE_DIR) + else() + file(TO_CMAKE_PATH ${LLVM_BINARY_DIR} LLVM_BINARY_DIR_CMAKE_STYLE) +- set(LLVM_CMAKE_DIR "${LLVM_BINARY_DIR_CMAKE_STYLE}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") ++ set(LLVM_CMAKE_DIR "${LLVM_BINARY_DIR_CMAKE_STYLE}/share/llvm") + endif() + + set(LLVM_CMAKE_INCLUDE_FILE "${LLVM_CMAKE_DIR}/LLVMConfig.cmake") +diff --git a/flang/cmake/modules/CMakeLists.txt b/flang/cmake/modules/CMakeLists.txt +index 170568c80dde..1bf6d6a829e2 100644 +--- a/flang/cmake/modules/CMakeLists.txt ++++ b/flang/cmake/modules/CMakeLists.txt +@@ -4,11 +4,11 @@ include(FindPrefixFromConfig) + # Generate a list of CMake library targets so that other CMake projects can + # link against them. LLVM calls its version of this file LLVMExports.cmake, but + # the usual CMake convention seems to be ${Project}Targets.cmake. +-set(FLANG_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/flang) ++set(FLANG_INSTALL_PACKAGE_DIR share/flang) + set(flang_cmake_builddir "${CMAKE_BINARY_DIR}/${FLANG_INSTALL_PACKAGE_DIR}") + + # Keep this in sync with llvm/cmake/CMakeLists.txt! +-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) ++set(LLVM_INSTALL_PACKAGE_DIR share/llvm) + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") + + get_property(FLANG_EXPORTS GLOBAL PROPERTY FLANG_EXPORTS) +diff --git a/lld/cmake/modules/CMakeLists.txt b/lld/cmake/modules/CMakeLists.txt +index 760c9d5f8d87..acd8a65808f5 100644 +--- a/lld/cmake/modules/CMakeLists.txt ++++ b/lld/cmake/modules/CMakeLists.txt +@@ -4,11 +4,11 @@ include(FindPrefixFromConfig) + # Generate a list of CMake library targets so that other CMake projects can + # link against them. LLVM calls its version of this file LLVMExports.cmake, but + # the usual CMake convention seems to be ${Project}Targets.cmake. +-set(LLD_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/lld) ++set(LLD_INSTALL_PACKAGE_DIR share/lld) + set(lld_cmake_builddir "${CMAKE_BINARY_DIR}/${LLD_INSTALL_PACKAGE_DIR}") + + # Keep this in sync with llvm/cmake/CMakeLists.txt! +-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) ++set(LLVM_INSTALL_PACKAGE_DIR share/llvm) + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") + + get_property(LLD_EXPORTS GLOBAL PROPERTY LLD_EXPORTS) +diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake +index 37bc98f9e021..7cbfa2a9a577 100644 +--- a/llvm/cmake/modules/AddLLVM.cmake ++++ b/llvm/cmake/modules/AddLLVM.cmake +@@ -1049,7 +1049,7 @@ function(process_llvm_pass_plugins) + + ## Part 1: Extension header to be included whenever we need extension + # processing. +- set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) ++ set(LLVM_INSTALL_PACKAGE_DIR share/llvm) + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") + file(WRITE + "${llvm_cmake_builddir}/LLVMConfigExtensions.cmake" +diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt +index cea0c1df0a14..639c5422b04a 100644 +--- a/llvm/cmake/modules/CMakeLists.txt ++++ b/llvm/cmake/modules/CMakeLists.txt +@@ -2,7 +2,7 @@ include(ExtendPath) + include(LLVMDistributionSupport) + include(FindPrefixFromConfig) + +-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) ++set(LLVM_INSTALL_PACKAGE_DIR share/llvm) + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") + + # First for users who use an installed LLVM, create the LLVMExports.cmake file. +diff --git a/mlir/cmake/modules/CMakeLists.txt b/mlir/cmake/modules/CMakeLists.txt +index d6703993bd74..e2f6cd3ea8cb 100644 +--- a/mlir/cmake/modules/CMakeLists.txt ++++ b/mlir/cmake/modules/CMakeLists.txt +@@ -5,11 +5,11 @@ include(FindPrefixFromConfig) + # Generate a list of CMake library targets so that other CMake projects can + # link against them. LLVM calls its version of this file LLVMExports.cmake, but + # the usual CMake convention seems to be ${Project}Targets.cmake. +-set(MLIR_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/mlir) ++set(MLIR_INSTALL_PACKAGE_DIR share/mlir) + set(mlir_cmake_builddir "${CMAKE_BINARY_DIR}/${MLIR_INSTALL_PACKAGE_DIR}") + + # Keep this in sync with llvm/cmake/CMakeLists.txt! +-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) ++set(LLVM_INSTALL_PACKAGE_DIR share/llvm) + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") + + get_property(MLIR_EXPORTS GLOBAL PROPERTY MLIR_EXPORTS) +diff --git a/mlir/test/CMakeLists.txt b/mlir/test/CMakeLists.txt +index 8e44a9c37cf1..f6edc7d77ffd 100644 +--- a/mlir/test/CMakeLists.txt ++++ b/mlir/test/CMakeLists.txt +@@ -8,7 +8,7 @@ endif() + # Passed to lit.site.cfg.py.so that the out of tree Standalone dialect test + # can find MLIR's CMake configuration + set(MLIR_CMAKE_DIR +- "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/mlir") ++ "${CMAKE_BINARY_DIR}/share/mlir") + + # Passed to lit.site.cfg.py.in to set up the path where to find the libraries + # for linalg integration tests. +diff --git a/openmp/tools/Modules/CMakeLists.txt b/openmp/tools/Modules/CMakeLists.txt +index 22d818eea72d..75aacc4468d4 100644 +--- a/openmp/tools/Modules/CMakeLists.txt ++++ b/openmp/tools/Modules/CMakeLists.txt +@@ -12,4 +12,4 @@ + + + install(FILES "FindOpenMPTarget.cmake" +- DESTINATION "${OPENMP_INSTALL_LIBDIR}/cmake/openmp") ++ DESTINATION "share/openmp") +diff --git a/polly/cmake/CMakeLists.txt b/polly/cmake/CMakeLists.txt +index 7a0190b69df6..cdd3b4f126bb 100644 +--- a/polly/cmake/CMakeLists.txt ++++ b/polly/cmake/CMakeLists.txt +@@ -3,8 +3,8 @@ + include(ExtendPath) + include(FindPrefixFromConfig) + +-set(LLVM_INSTALL_PACKAGE_DIR "lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") +-set(POLLY_INSTALL_PACKAGE_DIR "lib${LLVM_LIBDIR_SUFFIX}/cmake/polly") ++set(LLVM_INSTALL_PACKAGE_DIR "share/llvm") ++set(POLLY_INSTALL_PACKAGE_DIR "share/polly") + if (CMAKE_CONFIGURATION_TYPES) + set(POLLY_EXPORTS_FILE_NAME "PollyExports-$>.cmake") + else() diff --git a/externals/vcpkg/ports/llvm/0004-fix-dr-1734.patch b/externals/vcpkg/ports/llvm/0004-fix-dr-1734.patch new file mode 100755 index 000000000..3a2f4a28e --- /dev/null +++ b/externals/vcpkg/ports/llvm/0004-fix-dr-1734.patch @@ -0,0 +1,17 @@ + llvm/include/llvm/Support/type_traits.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/llvm/include/llvm/Support/type_traits.h b/llvm/include/llvm/Support/type_traits.h +index 7b7d5d991f3f..469b681deea3 100644 +--- a/llvm/include/llvm/Support/type_traits.h ++++ b/llvm/include/llvm/Support/type_traits.h +@@ -176,7 +176,8 @@ class is_trivially_copyable { + (has_deleted_copy_assign || has_trivial_copy_assign) && + (has_deleted_copy_constructor || has_trivial_copy_constructor); + +-#ifdef HAVE_STD_IS_TRIVIALLY_COPYABLE ++// due to DR 1734, a type can be std::is_trivially_copyable but not llvm::is_trivially_copyable ++#if 0 + static_assert(value == std::is_trivially_copyable::value, + "inconsistent behavior between llvm:: and std:: implementation of is_trivially_copyable"); + #endif diff --git a/externals/vcpkg/ports/llvm/0005-fix-tools-path.patch b/externals/vcpkg/ports/llvm/0005-fix-tools-path.patch new file mode 100755 index 000000000..1b1142ec9 --- /dev/null +++ b/externals/vcpkg/ports/llvm/0005-fix-tools-path.patch @@ -0,0 +1,16 @@ + llvm/tools/llvm-config/llvm-config.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp +index 8ed88f33ead4..3f2d1b98adcc 100644 +--- a/llvm/tools/llvm-config/llvm-config.cpp ++++ b/llvm/tools/llvm-config/llvm-config.cpp +@@ -305,7 +305,7 @@ int main(int argc, char **argv) { + // bin dir). + sys::fs::make_absolute(CurrentPath); + CurrentExecPrefix = +- sys::path::parent_path(sys::path::parent_path(CurrentPath)).str(); ++ sys::path::parent_path(sys::path::parent_path(sys::path::parent_path(CurrentPath))).str(); + + // Check to see if we are inside a development tree by comparing to possible + // locations (prefix style or CMake style). diff --git a/externals/vcpkg/ports/llvm/0007-fix-compiler-rt-install-path.patch b/externals/vcpkg/ports/llvm/0007-fix-compiler-rt-install-path.patch new file mode 100755 index 000000000..c33dd9963 --- /dev/null +++ b/externals/vcpkg/ports/llvm/0007-fix-compiler-rt-install-path.patch @@ -0,0 +1,44 @@ + clang/lib/Headers/CMakeLists.txt | 2 +- + clang/runtime/CMakeLists.txt | 2 +- + compiler-rt/cmake/base-config-ix.cmake | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt +index 078988980c52..795f495b32d6 100644 +--- a/clang/lib/Headers/CMakeLists.txt ++++ b/clang/lib/Headers/CMakeLists.txt +@@ -234,7 +234,7 @@ set_target_properties(clang-resource-headers PROPERTIES + FOLDER "Misc" + RUNTIME_OUTPUT_DIRECTORY "${output_dir}") + +-set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) ++set(header_install_dir tools/llvm/lib/clang/${CLANG_VERSION}/include) + + install( + FILES ${files} ${generated_files} +diff --git a/clang/runtime/CMakeLists.txt b/clang/runtime/CMakeLists.txt +index ca7e17927ee1..87d4282b36ad 100644 +--- a/clang/runtime/CMakeLists.txt ++++ b/clang/runtime/CMakeLists.txt +@@ -84,7 +84,7 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/) + -DLLVM_LIT_ARGS=${LLVM_LIT_ARGS} + -DCOMPILER_RT_OUTPUT_DIR=${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION} + -DCOMPILER_RT_EXEC_OUTPUT_DIR=${LLVM_RUNTIME_OUTPUT_INTDIR} +- -DCOMPILER_RT_INSTALL_PATH:PATH=lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION} ++ -DCOMPILER_RT_INSTALL_PATH:PATH=tools/llvm/lib/clang/${CLANG_VERSION} + -DCOMPILER_RT_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS} + -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} + -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} +diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake +index d7b0124f3546..55e515cb1c7a 100644 +--- a/compiler-rt/cmake/base-config-ix.cmake ++++ b/compiler-rt/cmake/base-config-ix.cmake +@@ -44,7 +44,7 @@ if (LLVM_TREE_AVAILABLE) + # Setup the paths where compiler-rt runtimes and headers should be stored. + set(COMPILER_RT_OUTPUT_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}) + set(COMPILER_RT_EXEC_OUTPUT_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) +- set(COMPILER_RT_INSTALL_PATH lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}) ++ set(COMPILER_RT_INSTALL_PATH tools/llvm/lib/clang/${CLANG_VERSION}) + option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." + ${LLVM_INCLUDE_TESTS}) + option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" diff --git a/externals/vcpkg/ports/llvm/0009-fix-tools-install-path.patch b/externals/vcpkg/ports/llvm/0009-fix-tools-install-path.patch new file mode 100755 index 000000000..294de6fda --- /dev/null +++ b/externals/vcpkg/ports/llvm/0009-fix-tools-install-path.patch @@ -0,0 +1,233 @@ + clang-tools-extra/clang-tidy/tool/CMakeLists.txt | 2 +- + clang-tools-extra/modularize/CMakeLists.txt | 2 +- + clang/cmake/modules/AddClang.cmake | 2 +- + clang/tools/c-index-test/CMakeLists.txt | 2 +- + clang/tools/clang-format/CMakeLists.txt | 2 +- + clang/tools/clang-linker-wrapper/CMakeLists.txt | 2 +- + clang/tools/clang-nvlink-wrapper/CMakeLists.txt | 2 +- + clang/tools/scan-build-py/CMakeLists.txt | 4 ++-- + clang/tools/scan-build/CMakeLists.txt | 2 +- + clang/tools/scan-view/CMakeLists.txt | 2 +- + clang/utils/hmaptool/CMakeLists.txt | 2 +- + flang/cmake/modules/AddFlang.cmake | 2 +- + flang/tools/f18/CMakeLists.txt | 2 +- + flang/tools/flang-driver/CMakeLists.txt | 2 +- + lld/cmake/modules/AddLLD.cmake | 2 +- + lld/tools/lld/CMakeLists.txt | 2 +- + lldb/cmake/modules/AddLLDB.cmake | 2 +- + 17 files changed, 18 insertions(+), 18 deletions(-) + +diff --git a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt +index 3ce552872015..e09b917ae5f8 100644 +--- a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt ++++ b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt +@@ -64,6 +64,6 @@ install(PROGRAMS clang-tidy-diff.py + DESTINATION "${CMAKE_INSTALL_DATADIR}/clang" + COMPONENT clang-tidy) + install(PROGRAMS run-clang-tidy.py +- DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" + COMPONENT clang-tidy + RENAME run-clang-tidy) +diff --git a/clang-tools-extra/modularize/CMakeLists.txt b/clang-tools-extra/modularize/CMakeLists.txt +index fb17e353c39f..4b409e47446a 100644 +--- a/clang-tools-extra/modularize/CMakeLists.txt ++++ b/clang-tools-extra/modularize/CMakeLists.txt +@@ -23,5 +23,5 @@ clang_target_link_libraries(modularize + ) + + install(TARGETS modularize +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" + COMPONENT clang-extras) +diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake +index 9bbbfc032b7d..bd238ff249cd 100644 +--- a/clang/cmake/modules/AddClang.cmake ++++ b/clang/cmake/modules/AddClang.cmake +@@ -160,7 +160,7 @@ macro(add_clang_tool name) + get_target_export_arg(${name} Clang export_to_clangtargets) + install(TARGETS ${name} + ${export_to_clangtargets} +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" + COMPONENT ${name}) + + if(NOT LLVM_ENABLE_IDE) +diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt +index 0ae1b4e55244..e8a34e136194 100644 +--- a/clang/tools/c-index-test/CMakeLists.txt ++++ b/clang/tools/c-index-test/CMakeLists.txt +@@ -49,7 +49,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH + "@executable_path/../../lib") + else() +- set(INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}") ++ set(INSTALL_DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") + endif() + + install(TARGETS c-index-test +diff --git a/clang/tools/clang-format/CMakeLists.txt b/clang/tools/clang-format/CMakeLists.txt +index bbdef93b576b..8744e414da0a 100644 +--- a/clang/tools/clang-format/CMakeLists.txt ++++ b/clang/tools/clang-format/CMakeLists.txt +@@ -36,5 +36,5 @@ install(PROGRAMS clang-format.py + DESTINATION "${CMAKE_INSTALL_DATADIR}/clang" + COMPONENT clang-format) + install(PROGRAMS git-clang-format +- DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" + COMPONENT clang-format) +diff --git a/clang/tools/clang-linker-wrapper/CMakeLists.txt b/clang/tools/clang-linker-wrapper/CMakeLists.txt +index 1614f40fb60e..0e78982310c7 100644 +--- a/clang/tools/clang-linker-wrapper/CMakeLists.txt ++++ b/clang/tools/clang-linker-wrapper/CMakeLists.txt +@@ -37,4 +37,4 @@ target_link_libraries(clang-linker-wrapper + ${CLANG_LINKER_WRAPPER_LIB_DEPS} + ) + +-install(TARGETS clang-linker-wrapper RUNTIME DESTINATION bin) ++install(TARGETS clang-linker-wrapper RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") +diff --git a/clang/tools/clang-nvlink-wrapper/CMakeLists.txt b/clang/tools/clang-nvlink-wrapper/CMakeLists.txt +index 2c979e509795..f22b801fe19a 100644 +--- a/clang/tools/clang-nvlink-wrapper/CMakeLists.txt ++++ b/clang/tools/clang-nvlink-wrapper/CMakeLists.txt +@@ -22,4 +22,4 @@ target_link_libraries(clang-nvlink-wrapper + ${CLANG_NVLINK_WRAPPER_LIB_DEPS} + ) + +-install(TARGETS clang-nvlink-wrapper RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") ++install(TARGETS clang-nvlink-wrapper RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") +diff --git a/clang/tools/scan-build-py/CMakeLists.txt b/clang/tools/scan-build-py/CMakeLists.txt +index 061dc7ef4dd9..91499600693b 100644 +--- a/clang/tools/scan-build-py/CMakeLists.txt ++++ b/clang/tools/scan-build-py/CMakeLists.txt +@@ -43,7 +43,7 @@ foreach(BinFile ${BinFiles}) + ${CMAKE_BINARY_DIR}/bin/scan-build-py + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/scan-build) + install (PROGRAMS "bin/scan-build" +- DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" + RENAME scan-build-py + COMPONENT scan-build-py) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/scan-build-py) +@@ -56,7 +56,7 @@ foreach(BinFile ${BinFiles}) + ${CMAKE_BINARY_DIR}/bin/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) + install(PROGRAMS bin/${BinFile} +- DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" + COMPONENT scan-build-py) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) + endif() +diff --git a/clang/tools/scan-build/CMakeLists.txt b/clang/tools/scan-build/CMakeLists.txt +index 4a578b4c6f3e..05574a4919f6 100644 +--- a/clang/tools/scan-build/CMakeLists.txt ++++ b/clang/tools/scan-build/CMakeLists.txt +@@ -47,7 +47,7 @@ if(CLANG_INSTALL_SCANBUILD) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) + install(PROGRAMS bin/${BinFile} +- DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" + COMPONENT scan-build) + endforeach() + +diff --git a/clang/tools/scan-view/CMakeLists.txt b/clang/tools/scan-view/CMakeLists.txt +index 07aec76ee66f..ca6a3380ad0c 100644 +--- a/clang/tools/scan-view/CMakeLists.txt ++++ b/clang/tools/scan-view/CMakeLists.txt +@@ -20,7 +20,7 @@ if(CLANG_INSTALL_SCANVIEW) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) + install(PROGRAMS bin/${BinFile} +- DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" + COMPONENT scan-view) + endforeach() + +diff --git a/clang/utils/hmaptool/CMakeLists.txt b/clang/utils/hmaptool/CMakeLists.txt +index f0d9866782b8..5fcdfc04425f 100644 +--- a/clang/utils/hmaptool/CMakeLists.txt ++++ b/clang/utils/hmaptool/CMakeLists.txt +@@ -10,7 +10,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HM + + list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL}) + install(PROGRAMS ${CLANG_HMAPTOOL} +- DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" + COMPONENT hmaptool) + + add_custom_target(hmaptool ALL DEPENDS ${Depends}) +diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake +index 369e303e148a..3c3697c07406 100644 +--- a/flang/cmake/modules/AddFlang.cmake ++++ b/flang/cmake/modules/AddFlang.cmake +@@ -109,7 +109,7 @@ macro(add_flang_tool name) + get_target_export_arg(${name} Flang export_to_flangtargets) + install(TARGETS ${name} + ${export_to_flangtargets} +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" + COMPONENT ${name}) + + if(NOT LLVM_ENABLE_IDE) +diff --git a/flang/tools/f18/CMakeLists.txt b/flang/tools/f18/CMakeLists.txt +index aa77676c6229..dd15b0b7727b 100644 +--- a/flang/tools/f18/CMakeLists.txt ++++ b/flang/tools/f18/CMakeLists.txt +@@ -50,5 +50,5 @@ if (NOT WIN32) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/flang + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/flang ${CMAKE_BINARY_DIR}/bin) + add_custom_target(flang ALL DEPENDS ${CMAKE_BINARY_DIR}/bin/flang) +- install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION "${CMAKE_INSTALL_BINDIR}") ++ install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") + endif() +diff --git a/flang/tools/flang-driver/CMakeLists.txt b/flang/tools/flang-driver/CMakeLists.txt +index b3e90746e786..b327e69aaeaa 100644 +--- a/flang/tools/flang-driver/CMakeLists.txt ++++ b/flang/tools/flang-driver/CMakeLists.txt +@@ -34,4 +34,4 @@ if(FLANG_PLUGIN_SUPPORT) + export_executable_symbols_for_plugins(flang-new) + endif() + +-install(TARGETS flang-new DESTINATION "${CMAKE_INSTALL_BINDIR}") ++install(TARGETS flang-new DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") +diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake +index dd2898ce6236..86560bddd5e4 100644 +--- a/lld/cmake/modules/AddLLD.cmake ++++ b/lld/cmake/modules/AddLLD.cmake +@@ -47,7 +47,7 @@ macro(add_lld_tool name) + get_target_export_arg(${name} LLD export_to_lldtargets) + install(TARGETS ${name} + ${export_to_lldtargets} +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" + COMPONENT ${name}) + + if(NOT CMAKE_CONFIGURATION_TYPES) +diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt +index df48cc0d6c51..1363144fd8e1 100644 +--- a/lld/tools/lld/CMakeLists.txt ++++ b/lld/tools/lld/CMakeLists.txt +@@ -20,7 +20,7 @@ target_link_libraries(lld + ) + + install(TARGETS lld +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") ++ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") + + if(NOT LLD_SYMLINKS_TO_CREATE) + set(LLD_SYMLINKS_TO_CREATE +diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake +index 3291a7c808e1..9fe9b9a7940d 100644 +--- a/lldb/cmake/modules/AddLLDB.cmake ++++ b/lldb/cmake/modules/AddLLDB.cmake +@@ -189,7 +189,7 @@ function(add_lldb_executable name) + endif() + + if(ARG_GENERATE_INSTALL) +- set(install_dest bin) ++ set(install_dest "${LLVM_TOOLS_INSTALL_DIR}") + if(ARG_INSTALL_PREFIX) + set(install_dest ${ARG_INSTALL_PREFIX}) + endif() diff --git a/externals/vcpkg/ports/llvm/0010-fix-libffi.patch b/externals/vcpkg/ports/llvm/0010-fix-libffi.patch new file mode 100755 index 000000000..3859b81fe --- /dev/null +++ b/externals/vcpkg/ports/llvm/0010-fix-libffi.patch @@ -0,0 +1,16 @@ + llvm/cmake/modules/FindFFI.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/llvm/cmake/modules/FindFFI.cmake b/llvm/cmake/modules/FindFFI.cmake +index b0d859af8959..a756d0c8fdb0 100644 +--- a/llvm/cmake/modules/FindFFI.cmake ++++ b/llvm/cmake/modules/FindFFI.cmake +@@ -34,7 +34,7 @@ else() + endif() + endif() + +-find_library(FFI_LIBRARIES ffi PATHS ${FFI_LIBRARY_DIR}) ++find_library(FFI_LIBRARIES ffi libffi PATHS ${FFI_LIBRARY_DIR}) + + if(FFI_LIBRARIES) + include(CMakePushCheckState) diff --git a/externals/vcpkg/ports/llvm/0011-fix-install-bolt.patch b/externals/vcpkg/ports/llvm/0011-fix-install-bolt.patch new file mode 100755 index 000000000..1e2660fa9 --- /dev/null +++ b/externals/vcpkg/ports/llvm/0011-fix-install-bolt.patch @@ -0,0 +1,22 @@ + bolt/tools/driver/CMakeLists.txt | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/bolt/tools/driver/CMakeLists.txt b/bolt/tools/driver/CMakeLists.txt +index d50781615663..df06604c724c 100644 +--- a/bolt/tools/driver/CMakeLists.txt ++++ b/bolt/tools/driver/CMakeLists.txt +@@ -33,14 +33,6 @@ set(BOLT_DEPENDS + ) + + add_custom_target(bolt DEPENDS ${BOLT_DEPENDS}) +-install(PROGRAMS +- ${CMAKE_BINARY_DIR}/bin/llvm-bolt +- ${CMAKE_BINARY_DIR}/bin/perf2bolt +- ${CMAKE_BINARY_DIR}/bin/llvm-boltdiff +- ${CMAKE_BINARY_DIR}/bin/llvm-bolt-heatmap +- DESTINATION ${CMAKE_INSTALL_BINDIR} +- COMPONENT bolt +- ) + add_llvm_install_targets(install-bolt DEPENDS bolt COMPONENT bolt) + set_target_properties(bolt PROPERTIES FOLDER "BOLT") + set_target_properties(install-bolt PROPERTIES FOLDER "BOLT") diff --git a/externals/vcpkg/ports/llvm/clang_usage b/externals/vcpkg/ports/llvm/clang_usage new file mode 100755 index 000000000..f239721f4 --- /dev/null +++ b/externals/vcpkg/ports/llvm/clang_usage @@ -0,0 +1,5 @@ +The package clang provides CMake targets: + + find_package(Clang CONFIG REQUIRED) + target_include_directories(main PRIVATE ${CLANG_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE clangBasic clangLex clangParse clangAST ...) diff --git a/externals/vcpkg/ports/llvm/flang_usage b/externals/vcpkg/ports/llvm/flang_usage new file mode 100755 index 000000000..b3cb08592 --- /dev/null +++ b/externals/vcpkg/ports/llvm/flang_usage @@ -0,0 +1,5 @@ +The package flang provides CMake targets: + + find_package(Flang CONFIG REQUIRED) + target_include_directories(main PRIVATE ${FLANG_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE flangFrontend flangFrontendTool ...) diff --git a/externals/vcpkg/ports/llvm/lld_usage b/externals/vcpkg/ports/llvm/lld_usage new file mode 100755 index 000000000..92c8d10a0 --- /dev/null +++ b/externals/vcpkg/ports/llvm/lld_usage @@ -0,0 +1,5 @@ +The package lld provides CMake targets: + + find_package(LLD CONFIG REQUIRED) + target_include_directories(main PRIVATE ${LLD_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE lldCommon lldCore lldDriver ...) diff --git a/externals/vcpkg/ports/llvm/llvm_usage b/externals/vcpkg/ports/llvm/llvm_usage new file mode 100755 index 000000000..72d57dbfa --- /dev/null +++ b/externals/vcpkg/ports/llvm/llvm_usage @@ -0,0 +1,15 @@ +The package llvm provides CMake targets: + + find_package(LLVM CONFIG REQUIRED) + + list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}") + include(HandleLLVMOptions) + add_definitions(${LLVM_DEFINITIONS}) + + target_include_directories(main PRIVATE ${LLVM_INCLUDE_DIRS}) + + # Find the libraries that correspond to the LLVM components that we wish to use + llvm_map_components_to_libnames(llvm_libs Support Core IRReader ...) + + # Link against LLVM libraries + target_link_libraries(main PRIVATE ${llvm_libs}) diff --git a/externals/vcpkg/ports/llvm/mlir_usage b/externals/vcpkg/ports/llvm/mlir_usage new file mode 100755 index 000000000..da45a1612 --- /dev/null +++ b/externals/vcpkg/ports/llvm/mlir_usage @@ -0,0 +1,5 @@ +The package lld provides CMake targets: + + find_package(MLIR CONFIG REQUIRED) + target_include_directories(main PRIVATE ${MLIR_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE MLIRIR MLIRParser MLIRPass MLIRSupport ...) diff --git a/externals/vcpkg/ports/llvm/portfile.cmake b/externals/vcpkg/ports/llvm/portfile.cmake new file mode 100755 index 000000000..d8162fa63 --- /dev/null +++ b/externals/vcpkg/ports/llvm/portfile.cmake @@ -0,0 +1,332 @@ +set(LLVM_VERSION "14.0.4") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO llvm/llvm-project + REF llvmorg-${LLVM_VERSION} + SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959 + HEAD_REF main + PATCHES + 0002-fix-install-paths.patch # This patch fixes paths in ClangConfig.cmake, LLVMConfig.cmake, LLDConfig.cmake etc. + 0004-fix-dr-1734.patch + 0005-fix-tools-path.patch + 0007-fix-compiler-rt-install-path.patch + 0009-fix-tools-install-path.patch + 0010-fix-libffi.patch + 0011-fix-install-bolt.patch +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools LLVM_BUILD_TOOLS + tools LLVM_INCLUDE_TOOLS + utils LLVM_BUILD_UTILS + utils LLVM_INCLUDE_UTILS + utils LLVM_INSTALL_UTILS + enable-rtti LLVM_ENABLE_RTTI + enable-ffi LLVM_ENABLE_FFI + enable-terminfo LLVM_ENABLE_TERMINFO + enable-threads LLVM_ENABLE_THREADS + enable-eh LLVM_ENABLE_EH + enable-bindings LLVM_ENABLE_BINDINGS +) + +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") + +# LLVM generates CMake error due to Visual Studio version 16.4 is known to miscompile part of LLVM. +# LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON disables this error. +# See https://developercommunity.visualstudio.com/content/problem/845933/miscompile-boolean-condition-deduced-to-be-always.html +# and thread "[llvm-dev] Longstanding failing tests - clang-tidy, MachO, Polly" on llvm-dev Jan 21-23 2020. +list(APPEND FEATURE_OPTIONS + -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON +) + +# Force enable or disable external libraries +set(llvm_external_libraries + zlib + libxml2 +) +foreach(external_library IN LISTS llvm_external_libraries) + string(TOLOWER "enable-${external_library}" feature_name) + string(TOUPPER "LLVM_ENABLE_${external_library}" define_name) + if(feature_name IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS + -D${define_name}=FORCE_ON + ) + else() + list(APPEND FEATURE_OPTIONS + -D${define_name}=OFF + ) + endif() +endforeach() + +# By default assertions are enabled for Debug configuration only. +if("enable-assertions" IN_LIST FEATURES) + # Force enable assertions for all configurations. + list(APPEND FEATURE_OPTIONS + -DLLVM_ENABLE_ASSERTIONS=ON + ) +elseif("disable-assertions" IN_LIST FEATURES) + # Force disable assertions for all configurations. + list(APPEND FEATURE_OPTIONS + -DLLVM_ENABLE_ASSERTIONS=OFF + ) +endif() + +# LLVM_ABI_BREAKING_CHECKS can be WITH_ASSERTS (default), FORCE_ON or FORCE_OFF. +# By default in LLVM, abi-breaking checks are enabled if assertions are enabled. +# however, this breaks linking with the debug versions, since the option is +# baked into the header files; thus, we always turn off LLVM_ABI_BREAKING_CHECKS +# unless the user asks for it +if("enable-abi-breaking-checks" IN_LIST FEATURES) + # Force enable abi-breaking checks. + list(APPEND FEATURE_OPTIONS + -DLLVM_ABI_BREAKING_CHECKS=FORCE_ON + ) +else() + # Force disable abi-breaking checks. + list(APPEND FEATURE_OPTIONS + -DLLVM_ABI_BREAKING_CHECKS=FORCE_OFF + ) +endif() + +set(LLVM_ENABLE_PROJECTS) +if("bolt" IN_LIST FEATURES) + list(APPEND LLVM_ENABLE_PROJECTS "bolt") +endif() +if("clang" IN_LIST FEATURES OR "clang-tools-extra" IN_LIST FEATURES) + list(APPEND LLVM_ENABLE_PROJECTS "clang") + if("disable-clang-static-analyzer" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS + # Disable ARCMT + -DCLANG_ENABLE_ARCMT=OFF + # Disable static analyzer + -DCLANG_ENABLE_STATIC_ANALYZER=OFF + ) + endif() + # 1) LLVM/Clang tools are relocated from ./bin/ to ./tools/llvm/ (LLVM_TOOLS_INSTALL_DIR=tools/llvm) + # 2) Clang resource files are relocated from ./lib/clang/ to ./tools/llvm/lib/clang/ (see patch 0007-fix-compiler-rt-install-path.patch) + # So, the relative path should be changed from ../lib/clang/ to ./lib/clang/ + list(APPEND FEATURE_OPTIONS -DCLANG_RESOURCE_DIR=lib/clang/${LLVM_VERSION}) +endif() +if("clang-tools-extra" IN_LIST FEATURES) + list(APPEND LLVM_ENABLE_PROJECTS "clang-tools-extra") +endif() +if("compiler-rt" IN_LIST FEATURES) + list(APPEND LLVM_ENABLE_PROJECTS "compiler-rt") +endif() +if("flang" IN_LIST FEATURES) + if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + message(FATAL_ERROR "Building Flang with MSVC is not supported on x86. Disable it until issues are fixed.") + endif() + list(APPEND LLVM_ENABLE_PROJECTS "flang") + list(APPEND FEATURE_OPTIONS + # Flang requires C++17 + -DCMAKE_CXX_STANDARD=17 + ) +endif() +if("libclc" IN_LIST FEATURES) + list(APPEND LLVM_ENABLE_PROJECTS "libclc") +endif() +if("lld" IN_LIST FEATURES) + list(APPEND LLVM_ENABLE_PROJECTS "lld") +endif() +if("lldb" IN_LIST FEATURES) + list(APPEND LLVM_ENABLE_PROJECTS "lldb") + list(APPEND FEATURE_OPTIONS + -DLLDB_ENABLE_CURSES=OFF + ) +endif() +if("mlir" IN_LIST FEATURES) + list(APPEND LLVM_ENABLE_PROJECTS "mlir") +endif() +if("openmp" IN_LIST FEATURES) + list(APPEND LLVM_ENABLE_PROJECTS "openmp") + # Perl is required for the OpenMP run-time + vcpkg_find_acquire_program(PERL) + get_filename_component(PERL_PATH ${PERL} DIRECTORY) + vcpkg_add_to_path(${PERL_PATH}) + # Skip post-build check + set(VCPKG_POLICY_SKIP_DUMPBIN_CHECKS enabled) +endif() +if("polly" IN_LIST FEATURES) + list(APPEND LLVM_ENABLE_PROJECTS "polly") +endif() +if("pstl" IN_LIST FEATURES) + if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + message(FATAL_ERROR "Building pstl with MSVC is not supported. Disable it until issues are fixed.") + endif() + list(APPEND LLVM_ENABLE_PROJECTS "pstl") +endif() + +set(LLVM_ENABLE_RUNTIMES) +if("libcxx" IN_LIST FEATURES) + if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + message(FATAL_ERROR "Building libcxx with MSVC is not supported, as cl doesn't support the #include_next extension.") + endif() + list(APPEND LLVM_ENABLE_RUNTIMES "libcxx") +endif() +if("libcxxabi" IN_LIST FEATURES) + if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + message(FATAL_ERROR "Building libcxxabi with MSVC is not supported. Disable it until issues are fixed.") + endif() + list(APPEND LLVM_ENABLE_RUNTIMES "libcxxabi") +endif() +if("libunwind" IN_LIST FEATURES) + list(APPEND LLVM_ENABLE_RUNTIMES "libunwind") +endif() + +# this is for normal targets +set(known_llvm_targets + AArch64 + AMDGPU + ARM + AVR + BPF + Hexagon + Lanai + Mips + MSP430 + NVPTX + PowerPC + RISCV + Sparc + SystemZ + VE + WebAssembly + X86 + XCore +) + +set(LLVM_TARGETS_TO_BUILD "") +foreach(llvm_target IN LISTS known_llvm_targets) + string(TOLOWER "target-${llvm_target}" feature_name) + if(feature_name IN_LIST FEATURES) + list(APPEND LLVM_TARGETS_TO_BUILD "${llvm_target}") + endif() +endforeach() + +# this is for experimental targets +set(known_llvm_experimental_targets + SPRIV +) + +set(LLVM_EXPERIMENTAL_TARGETS_TO_BUILD "") +foreach(llvm_target IN LISTS known_llvm_experimental_targets) + string(TOLOWER "target-${llvm_target}" feature_name) + if(feature_name IN_LIST FEATURES) + list(APPEND LLVM_EXPERIMENTAL_TARGETS_TO_BUILD "${llvm_target}") + endif() +endforeach() + +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR ${PYTHON3} DIRECTORY) +vcpkg_add_to_path(${PYTHON3_DIR}) + +set(LLVM_LINK_JOBS 1) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH}/llvm + OPTIONS + ${FEATURE_OPTIONS} + -DLLVM_INCLUDE_EXAMPLES=OFF + -DLLVM_BUILD_EXAMPLES=OFF + -DLLVM_INCLUDE_TESTS=OFF + -DLLVM_BUILD_TESTS=OFF + -DLLVM_INCLUDE_BENCHMARKS=OFF + -DLLVM_BUILD_BENCHMARKS=OFF + # Force TableGen to be built with optimization. This will significantly improve build time. + -DLLVM_OPTIMIZED_TABLEGEN=ON + "-DLLVM_ENABLE_PROJECTS=${LLVM_ENABLE_PROJECTS}" + "-DLLVM_ENABLE_RUNTIMES=${LLVM_ENABLE_RUNTIMES}" + "-DLLVM_TARGETS_TO_BUILD=${LLVM_TARGETS_TO_BUILD}" + "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD}" + -DPACKAGE_VERSION=${LLVM_VERSION} + # Limit the maximum number of concurrent link jobs to 1. This should fix low amount of memory issue for link. + "-DLLVM_PARALLEL_LINK_JOBS=${LLVM_LINK_JOBS}" + -DLLVM_TOOLS_INSTALL_DIR=tools/llvm +) + +vcpkg_cmake_install(ADD_BIN_TO_PATH) + +function(llvm_cmake_package_config_fixup package_name) + cmake_parse_arguments("arg" "DO_NOT_DELETE_PARENT_CONFIG_PATH" "FEATURE_NAME" "" ${ARGN}) + if(NOT DEFINED arg_FEATURE_NAME) + set(arg_FEATURE_NAME ${package_name}) + endif() + if("${arg_FEATURE_NAME}" STREQUAL "${PORT}" OR "${arg_FEATURE_NAME}" IN_LIST FEATURES) + set(args) + list(APPEND args PACKAGE_NAME "${package_name}") + if(arg_DO_NOT_DELETE_PARENT_CONFIG_PATH) + list(APPEND args "DO_NOT_DELETE_PARENT_CONFIG_PATH") + endif() + vcpkg_cmake_config_fixup(${args}) + file(INSTALL "${SOURCE_PATH}/${package_name}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${package_name}" RENAME copyright) + if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/${package_name}_usage") + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/${package_name}_usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${package_name}" RENAME usage) + endif() + endif() +endfunction() + +llvm_cmake_package_config_fixup("clang" DO_NOT_DELETE_PARENT_CONFIG_PATH) +llvm_cmake_package_config_fixup("flang" DO_NOT_DELETE_PARENT_CONFIG_PATH) +llvm_cmake_package_config_fixup("lld" DO_NOT_DELETE_PARENT_CONFIG_PATH) +llvm_cmake_package_config_fixup("mlir" DO_NOT_DELETE_PARENT_CONFIG_PATH) +llvm_cmake_package_config_fixup("polly" DO_NOT_DELETE_PARENT_CONFIG_PATH) +llvm_cmake_package_config_fixup("ParallelSTL" FEATURE_NAME "pstl" DO_NOT_DELETE_PARENT_CONFIG_PATH) +llvm_cmake_package_config_fixup("llvm") + +set(empty_dirs) + +if("clang-tools-extra" IN_LIST FEATURES) + list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/clang-tidy/plugin") +endif() + +if("flang" IN_LIST FEATURES) + list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Config") + list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/CMakeFiles") + list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Optimizer/CMakeFiles") + list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Optimizer/CodeGen/CMakeFiles") + list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Optimizer/Dialect/CMakeFiles") + list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Optimizer/Transforms/CMakeFiles") +endif() + +if(empty_dirs) + foreach(empty_dir IN LISTS empty_dirs) + if(NOT EXISTS "${empty_dir}") + message(SEND_ERROR "Directory '${empty_dir}' is not exist. Please remove it from the checking.") + else() + file(GLOB_RECURSE files_in_dir "${empty_dir}/*") + if(files_in_dir) + message(SEND_ERROR "Directory '${empty_dir}' is not empty. Please remove it from the checking.") + else() + file(REMOVE_RECURSE "${empty_dir}") + endif() + endif() + endforeach() +endif() + +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/tools" + ) +endif() + +if("mlir" IN_LIST FEATURES) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mlir/MLIRConfig.cmake" "set(MLIR_MAIN_SRC_DIR \"${SOURCE_PATH}/mlir\")" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mlir/MLIRConfig.cmake" "${CURRENT_BUILDTREES_DIR}" "\${MLIR_INCLUDE_DIRS}") +endif() + +# LLVM still generates a few DLLs in the static build: +# * LLVM-C.dll +# * libclang.dll +# * LTO.dll +# * Remarks.dll +set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) diff --git a/externals/vcpkg/ports/llvm/vcpkg.json b/externals/vcpkg/ports/llvm/vcpkg.json new file mode 100755 index 000000000..94b4f8cf4 --- /dev/null +++ b/externals/vcpkg/ports/llvm/vcpkg.json @@ -0,0 +1,378 @@ +{ + "name": "llvm", + "version": "14.0.4", + "description": "The LLVM Compiler Infrastructure.", + "homepage": "https://llvm.org", + "license": "Apache-2.0", + "supports": "!uwp & !(arm & windows)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + { + "name": "vcpkg-cmake-get-vars", + "host": true + } + ], + "default-features": [ + "clang", + "default-options", + "default-targets", + "lld", + "tools" + ], + "features": { + "bolt": { + "description": "BOLT is a post-link optimizer developed to speed up large applications.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "tools" + ] + } + ] + }, + "clang": { + "description": "Include C Language Family Front-end.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "compiler-rt", + "tools" + ] + } + ] + }, + "clang-tools-extra": { + "description": "Include Clang tools." + }, + "compiler-rt": { + "description": "Include compiler's runtime libraries." + }, + "default-options": { + "description": "Build with default options.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "disable-assertions", + "disable-clang-static-analyzer", + "enable-bindings", + "enable-terminfo", + "enable-threads", + "enable-zlib" + ] + } + ] + }, + "default-targets": { + "description": "Build with platform-specific default targets.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-spirv" + ] + }, + { + "name": "llvm", + "default-features": false, + "features": [ + "target-aarch64" + ], + "platform": "arm64" + }, + { + "name": "llvm", + "default-features": false, + "features": [ + "target-x86" + ], + "platform": "x86 | x64" + }, + { + "name": "llvm", + "default-features": false, + "features": [ + "target-arm" + ], + "platform": "arm & !arm64" + }, + { + "name": "llvm", + "default-features": false, + "features": [ + "target-all" + ], + "platform": "!x86 & !x64 & !arm & !arm64" + } + ] + }, + "disable-assertions": { + "description": "Build LLVM without assertions." + }, + "disable-clang-static-analyzer": { + "description": "Build without static analyzer." + }, + "enable-abi-breaking-checks": { + "description": "Build LLVM with LLVM_ABI_BREAKING_CHECKS=FORCE_ON." + }, + "enable-assertions": { + "description": "Build LLVM with assertions." + }, + "enable-bindings": { + "description": "Build bindings." + }, + "enable-eh": { + "description": "Build LLVM with exception handler.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "enable-rtti" + ] + } + ] + }, + "enable-ffi": { + "description": "Build LLVM with FFI.", + "dependencies": [ + "libffi" + ] + }, + "enable-libxml2": { + "description": "Build with LibXml2.", + "dependencies": [ + "libxml2" + ] + }, + "enable-rtti": { + "description": "Build LLVM with run-time type information." + }, + "enable-terminfo": { + "description": "Use terminfo database if available." + }, + "enable-threads": { + "description": "Use threads if available." + }, + "enable-zlib": { + "description": "Build with ZLib.", + "dependencies": [ + "zlib" + ] + }, + "flang": { + "description": "Include Fortran front end.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "clang", + "mlir", + "tools" + ] + } + ] + }, + "libclc": { + "description": "Include OpenCL library." + }, + "libcxx": { + "description": "Include libcxx library.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "libcxxabi" + ] + } + ] + }, + "libcxxabi": { + "description": "Include libcxxabi library." + }, + "libunwind": { + "description": "Include libunwind library." + }, + "lld": { + "description": "Include LLVM linker.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "tools" + ] + } + ] + }, + "lldb": { + "description": "Include LLVM debugger.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "tools" + ] + } + ] + }, + "mlir": { + "description": "Include MLIR (Multi-Level IR Compiler Framework) project.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "tools" + ] + } + ] + }, + "openmp": { + "description": "Include LLVM OpenMP libraries.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "utils" + ] + } + ] + }, + "polly": { + "description": "Include Polly (Polyhedral optimizations for LLVM) project.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "tools", + "utils" + ] + } + ] + }, + "pstl": { + "description": "Include pstl (Parallel STL) library." + }, + "target-aarch64": { + "description": "Build with AArch64 backend." + }, + "target-all": { + "description": "Build with all backends.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-aarch64", + "target-amdgpu", + "target-arm", + "target-avr", + "target-bpf", + "target-hexagon", + "target-lanai", + "target-mips", + "target-msp430", + "target-nvptx", + "target-powerpc", + "target-riscv", + "target-sparc", + "target-spirv", + "target-systemz", + "target-ve", + "target-webassembly", + "target-x86", + "target-xcore" + ] + } + ] + }, + "target-amdgpu": { + "description": "Build with AMDGPU backend." + }, + "target-arm": { + "description": "Build with ARM backend." + }, + "target-avr": { + "description": "Build with AVR backend." + }, + "target-bpf": { + "description": "Build with BPF backend." + }, + "target-hexagon": { + "description": "Build with Hexagon backend." + }, + "target-lanai": { + "description": "Build with Lanai backend." + }, + "target-mips": { + "description": "Build with Mips backend." + }, + "target-msp430": { + "description": "Build with MSP430 backend." + }, + "target-nvptx": { + "description": "Build with NVPTX backend." + }, + "target-powerpc": { + "description": "Build with PowerPC backend." + }, + "target-riscv": { + "description": "Build with RISC-V backend." + }, + "target-sparc": { + "description": "Build with Sparc backend." + }, + "target-spirv": { + "description": "Build with Spriv backend." + }, + "target-systemz": { + "description": "Build with SystemZ backend." + }, + "target-ve": { + "description": "Build with VE backend." + }, + "target-webassembly": { + "description": "Build with WebAssembly backend." + }, + "target-x86": { + "description": "Build with X86 backend." + }, + "target-xcore": { + "description": "Build with XCore backend." + }, + "tools": { + "description": "Build LLVM tools.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "enable-threads" + ] + } + ] + }, + "utils": { + "description": "Build LLVM utils." + } + } +} diff --git a/externals/vcpkg/ports/lmdb/cmake/CMakeLists.txt b/externals/vcpkg/ports/lmdb/cmake/CMakeLists.txt new file mode 100755 index 000000000..babddef00 --- /dev/null +++ b/externals/vcpkg/ports/lmdb/cmake/CMakeLists.txt @@ -0,0 +1,81 @@ +cmake_minimum_required(VERSION 2.8) + +file(READ "${CMAKE_CURRENT_SOURCE_DIR}/lmdb.h" VERSION_HEADER) +string(REGEX MATCH ".*MDB_VERSION_MAJOR[ \t]+([0-9])" MAJOR_VERSION_MATCH "${VERSION_HEADER}") +set(LMDB_MAJOR_VERSION ${CMAKE_MATCH_1}) +string(REGEX MATCH ".*MDB_VERSION_MINOR[ \t]+([0-9])" MINOR_VERSION_MATCH "${VERSION_HEADER}") +set(LMDB_MINOR_VERSION ${CMAKE_MATCH_1}) +string(REGEX MATCH ".*MDB_VERSION_PATCH[ \t]+([0-9]+)" PATCH_VERSION_MATCH "${VERSION_HEADER}") +set(LMDB_PATCH_VERSION ${CMAKE_MATCH_1}) + +set(LMDB_VERSION "${LMDB_MAJOR_VERSION}.${LMDB_MINOR_VERSION}.${LMDB_PATCH_VERSION}") + +project(lmdb) + +option(LMDB_BUILD_TOOLS "Build lmdb tools" OFF) +option(LMDB_BUILD_TESTS "Build lmdb tests" OFF) +option(LMDB_INSTALL_HEADERS "Install LMDB header files" ON) +set(LMDB_INCLUDE_INSTALL_DIR include CACHE PATH "Install directory for headers") +set(LMDB_LIBRARY_INSTALL_DIR lib CACHE PATH "Install directory for library") +set(LMDB_RUNTIME_INSTALL_DIR bin CACHE PATH "Install directory for binaries/dlls") +set(LMDB_CONFIG_INSTALL_DIR share/lmdb CACHE PATH "Install directory for cmake config files") + +if(MSVC AND BUILD_SHARED_LIBS) +set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /DEF:\"${CMAKE_CURRENT_SOURCE_DIR}/lmdbd.def\"") +set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /DEF:\"${CMAKE_CURRENT_SOURCE_DIR}/lmdb.def\"") +endif() + +set(SRCS lmdb mdb.c lmdb.h midl.c midl.h ) +add_library(lmdb ${SRCS}) + +if (WIN32) + target_link_libraries(lmdb PRIVATE ntdll.lib) +endif() + +install(TARGETS lmdb DESTINATION lib + EXPORT lmdb-targets + RUNTIME DESTINATION ${LMDB_RUNTIME_INSTALL_DIR} + LIBRARY DESTINATION ${LMDB_LIBRARY_INSTALL_DIR} + ARCHIVE DESTINATION ${LMDB_LIBRARY_INSTALL_DIR} + ) + +if(LMDB_INSTALL_HEADERS) + install(FILES lmdb.h midl.h DESTINATION ${LMDB_INCLUDE_INSTALL_DIR}) +endif() + +include(CMakePackageConfigHelpers) + +set(INSTALL_INCLUDE_DIR ${LMDB_INCLUDE_INSTALL_DIR}) +configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/package-config.cmakein ${CMAKE_CURRENT_BINARY_DIR}/lmdb-config.cmake + INSTALL_DESTINATION ${LMDB_CONFIG_INSTALL_DIR} + PATH_VARS INSTALL_INCLUDE_DIR + ) + +write_basic_package_version_file( ${CMAKE_CURRENT_BINARY_DIR}/lmdb-config-version.cmake VERSION ${LMDB_VERSION} COMPATIBILITY SameMajorVersion ) + +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lmdb-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/lmdb-config-version.cmake + DESTINATION ${LMDB_CONFIG_INSTALL_DIR} ) + + +install(EXPORT lmdb-targets DESTINATION ${LMDB_CONFIG_INSTALL_DIR}) + +if(LMDB_BUILD_TOOLS) + # don't build mdb_dump/load/stat since they will + # not build on windows + foreach(_tool mdb_copy) + add_executable(${_tool} ${_tool}.c) + target_link_libraries(${_tool} lmdb) + endforeach() +endif() + +if(LMDB_BUILD_TESTS) + enable_testing() + # don't use mtest6 since it will only build in static + # build + foreach(_test mtest mtest2 mtest3 mtest4 mtest5) + add_executable(${_test} ${_test}.c) + target_link_libraries(${_test} lmdb) + add_test(NAME ${_test} + COMMAND ${CMAKE_COMMAND} -DTEST=$ +) + +file(WRITE "${CMAKE_BINARY_DIR}/lodepng-config.cmake" "include(\"\${CMAKE_CURRENT_LIST_DIR}/lodepng-targets.cmake\")") +install(FILES "${CMAKE_BINARY_DIR}/lodepng-config.cmake" DESTINATION "share/lodepng/") + +install(TARGETS lodepng EXPORT lodepng-targets) + +install(EXPORT lodepng-targets DESTINATION share/lodepng/) + +add_library(lodepng-c lodepng.c) +target_include_directories(lodepng-c PUBLIC + $ +) + +file(WRITE "${CMAKE_BINARY_DIR}/lodepng-c-config.cmake" "include(\"\${CMAKE_CURRENT_LIST_DIR}/lodepng-c-targets.cmake\")") +install(FILES "${CMAKE_BINARY_DIR}/lodepng-c-config.cmake" DESTINATION "share/lodepng-c/") + +install(TARGETS lodepng-c EXPORT lodepng-c-targets) + +install(EXPORT lodepng-c-targets DESTINATION share/lodepng-c/) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES lodepng.h DESTINATION include) +endif() diff --git a/externals/vcpkg/ports/lodepng/portfile.cmake b/externals/vcpkg/ports/lodepng/portfile.cmake new file mode 100755 index 000000000..6a3e0e901 --- /dev/null +++ b/externals/vcpkg/ports/lodepng/portfile.cmake @@ -0,0 +1,31 @@ +if (EXISTS ${CURRENT_INSTALLED_DIR}/share/lodepng-c/copyright) + message(FATAL_ERROR "${PORT} conflict with lodepng-c, please remove lodepng-c before install ${PORT}.") +endif() + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lvandeve/lodepng + REF 8c6a9e30576f07bf470ad6f09458a2dcd7a6a84a + SHA512 2e0abc063be45dc04a070656260e9a2b9fa1172433cdd7d4988f0afc11751ad28aa802350598ef0e2b27c2c011fd9d9f7ab7f267b0bfcdf28f9f708b888c4411 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +configure_file("${SOURCE_PATH}/lodepng.cpp" "${SOURCE_PATH}/lodepng.c" COPYONLY) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup() +vcpkg_cmake_config_fixup(PACKAGE_NAME lodepng-c) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/lodepng/usage b/externals/vcpkg/ports/lodepng/usage new file mode 100755 index 000000000..6eeeb738f --- /dev/null +++ b/externals/vcpkg/ports/lodepng/usage @@ -0,0 +1,9 @@ +The package lodepng provides CMake targets: + + # C API + find_package(lodepng-c CONFIG REQUIRED) + target_link_libraries(main PRIVATE lodepng-c) + + # C++ API + find_package(lodepng CONFIG REQUIRED) + target_link_libraries(main PRIVATE lodepng) diff --git a/externals/vcpkg/ports/lodepng/vcpkg.json b/externals/vcpkg/ports/lodepng/vcpkg.json new file mode 100755 index 000000000..651f85f87 --- /dev/null +++ b/externals/vcpkg/ports/lodepng/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "lodepng", + "version-date": "2021-12-04", + "port-version": 1, + "description": "PNG encoder and decoder in C++", + "homepage": "https://github.com/lvandeve/lodepng", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/log4cplus/portfile.cmake b/externals/vcpkg/ports/log4cplus/portfile.cmake new file mode 100755 index 000000000..3b26122e2 --- /dev/null +++ b/externals/vcpkg/ports/log4cplus/portfile.cmake @@ -0,0 +1,52 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO log4cplus/log4cplus + REF REL_2_0_7 + SHA512 FE5FCEB346AC19A6D953661A20E8AA02AB48E872F427D958EA99C62F534DDF1FA4511FFD67A662605B1F225E3A6C06B0EE2C1B0EB62DE3AA0316F47F778DF06D + HEAD_REF master +) + +vcpkg_from_github( + OUT_SOURCE_PATH THREADPOOL_SOURCE_PATH + REPO log4cplus/ThreadPool + REF 3507796e172d36555b47d6191f170823d9f6b12c + SHA512 6b46ce287d68fd0cda0c69fda739eaeda89e1ed4f086e28a591f4e50aaf80ee2defc28ee14a5bf65be005c1a6ec4f2848d5723740726c54d5cc1d20f8e98aa0c + HEAD_REF master +) + +file( + COPY + "${THREADPOOL_SOURCE_PATH}/COPYING" + "${THREADPOOL_SOURCE_PATH}/example.cpp" + "${THREADPOOL_SOURCE_PATH}/README.md" + "${THREADPOOL_SOURCE_PATH}/ThreadPool.h" + DESTINATION "${SOURCE_PATH}/threadpool" +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + unicode UNICODE +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DLOG4CPLUS_BUILD_TESTING=OFF + -DLOG4CPLUS_BUILD_LOGGINGSERVER=OFF + -DWITH_UNIT_TESTS=OFF + -DLOG4CPLUS_ENABLE_DECORATED_LIBRARY_NAME=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/log4cplus) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/log4cplus/vcpkg.json b/externals/vcpkg/ports/log4cplus/vcpkg.json new file mode 100755 index 000000000..a70adf299 --- /dev/null +++ b/externals/vcpkg/ports/log4cplus/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "log4cplus", + "version": "2.0.7", + "port-version": 1, + "description": "A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration", + "homepage": "https://github.com/log4cplus/log4cplus", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "unicode": { + "description": "Unicode logger" + } + } +} diff --git a/externals/vcpkg/ports/log4cpp/Fix-StaticSupport.patch b/externals/vcpkg/ports/log4cpp/Fix-StaticSupport.patch new file mode 100755 index 000000000..8053b4ce5 --- /dev/null +++ b/externals/vcpkg/ports/log4cpp/Fix-StaticSupport.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 529c18e..beace9e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,7 +21,11 @@ SET(LOG4CPP_LIBS) + + IF (WIN32) + SET (CMAKE_DEBUG_POSTFIX "d") +- LIST(APPEND LOG4CPP_CFLAGS -D_CRT_SECURE_NO_WARNINGS -DLOG4CPP_HAS_DLL -DLOG4CPP_BUILD_DLL ) ++ IF (BUILD_SHARED_LIBS) ++ LIST(APPEND LOG4CPP_CFLAGS -D_CRT_SECURE_NO_WARNINGS -DLOG4CPP_HAS_DLL -DLOG4CPP_BUILD_DLL ) ++ ELSE () ++ LIST(APPEND LOG4CPP_CFLAGS -D_CRT_SECURE_NO_WARNINGS ) ++ ENDIF () + ELSE (WIN32) + IF (APPLE) + # LIST(APPEND LOG4CPP_CFLAGS -DLOG4CPP_HAVE_SSTREAM) +@@ -32,7 +36,7 @@ ENDIF (WIN32) + + SET ( LOG4CPP_LIBRARY_NAME "orocos-log4cpp" ) + +-ADD_LIBRARY ( ${LOG4CPP_LIBRARY_NAME} SHARED ++ADD_LIBRARY ( ${LOG4CPP_LIBRARY_NAME} + src/Appender.cpp + src/AppenderSkeleton.cpp + src/AppendersFactory.cpp diff --git a/externals/vcpkg/ports/log4cpp/fix-export-targets.patch b/externals/vcpkg/ports/log4cpp/fix-export-targets.patch new file mode 100755 index 000000000..30b5320cd --- /dev/null +++ b/externals/vcpkg/ports/log4cpp/fix-export-targets.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 19767a0..59dbf6c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -161,11 +161,13 @@ INSTALL ( + ) + + INSTALL(TARGETS ${LOG4CPP_LIBRARY_NAME} ++ EXPORT log4cpp-targets + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin) + + INSTALL(FILES package.xml DESTINATION share/log4cpp) ++INSTALL(EXPORT log4cpp-targets NAMESPACE log4cpp:: DESTINATION share/log4cpp) + + ########################################################### + # DOCUMENTATION diff --git a/externals/vcpkg/ports/log4cpp/fix-includepath.patch b/externals/vcpkg/ports/log4cpp/fix-includepath.patch new file mode 100755 index 000000000..2fdac90fe --- /dev/null +++ b/externals/vcpkg/ports/log4cpp/fix-includepath.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index beace9e..c8264ec 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -136,7 +136,7 @@ SET(prefix "${CMAKE_INSTALL_PREFIX}") + SET(exec_prefix "\${prefix}") + SET(log4cpp_cflags "") + SET(log4cpp_libs "${LOG4CPP_LIBS}") +-SET(includedir "\${prefix}/include/orocos") ++SET(includedir "\${prefix}/include") + SET(libdir "\${prefix}/lib") + CONFIGURE_FILE(log4cpp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/orocos-log4cpp.pc @ONLY) + +@@ -147,7 +147,7 @@ INSTALL( + + INSTALL ( + DIRECTORY include/log4cpp +- DESTINATION include/orocos ++ DESTINATION include + PATTERN "config.h.in" EXCLUDE + PATTERN ".svn" EXCLUDE + PATTERN "*.am" EXCLUDE +@@ -157,7 +157,7 @@ INSTALL ( + + INSTALL ( + FILES ${CMAKE_CURRENT_BINARY_DIR}/include/log4cpp/config.h +- DESTINATION include/orocos/log4cpp ++ DESTINATION include/log4cpp + ) + + INSTALL(TARGETS ${LOG4CPP_LIBRARY_NAME} diff --git a/externals/vcpkg/ports/log4cpp/fix-install-targets.patch b/externals/vcpkg/ports/log4cpp/fix-install-targets.patch new file mode 100755 index 000000000..49cdedf1d --- /dev/null +++ b/externals/vcpkg/ports/log4cpp/fix-install-targets.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8db2287..529c18e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -159,7 +159,7 @@ INSTALL ( + INSTALL(TARGETS ${LOG4CPP_LIBRARY_NAME} + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +- RUNTIME DESTINATION lib) ++ RUNTIME DESTINATION bin) + + INSTALL(FILES package.xml DESTINATION share/log4cpp) + diff --git a/externals/vcpkg/ports/log4cpp/log4cpp-config.in.cmake b/externals/vcpkg/ports/log4cpp/log4cpp-config.in.cmake new file mode 100755 index 000000000..cdecd4b70 --- /dev/null +++ b/externals/vcpkg/ports/log4cpp/log4cpp-config.in.cmake @@ -0,0 +1,7 @@ + +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32) + include(CMakeFindDependencyMacro) + find_dependency(Threads) +endif() + +include(${CMAKE_CURRENT_LIST_DIR}/log4cpp-targets.cmake) diff --git a/externals/vcpkg/ports/log4cpp/portfile.cmake b/externals/vcpkg/ports/log4cpp/portfile.cmake new file mode 100755 index 000000000..2548807f7 --- /dev/null +++ b/externals/vcpkg/ports/log4cpp/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO orocos-toolchain/log4cpp + REF v2.9.1 + SHA512 5bd222c820a15c5d96587ac9fe864c3e2dc0fbce8389692be8dd41553ac0308002ad8d6f4ef3ef10af1d796f8ded410788d1a5d22f15505fac639da3f73e3518 + HEAD_REF master + PATCHES + fix-install-targets.patch + Fix-StaticSupport.patch + fix-includepath.patch + fix-export-targets.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT}) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +vcpkg_copy_pdbs() + +configure_file( + ${CMAKE_CURRENT_LIST_DIR}/log4cpp-config.in.cmake + ${CURRENT_PACKAGES_DIR}/share/${PORT}/log4cpp-config.cmake + @ONLY +) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/log4cpp/vcpkg.json b/externals/vcpkg/ports/log4cpp/vcpkg.json new file mode 100755 index 000000000..a7729f41e --- /dev/null +++ b/externals/vcpkg/ports/log4cpp/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "log4cpp", + "version": "2.9.1", + "port-version": 7, + "description": "Log4cpp is library of C++ classes for flexible logging to files, syslog, IDSA and other destinations. It is modeled after the Log4j Java library, staying as close to their API as is reasonable.", + "homepage": "https://github.com/orocos-toolchain/log4cpp", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/log4cxx/expat.patch b/externals/vcpkg/ports/log4cxx/expat.patch new file mode 100755 index 000000000..7dfb0f009 --- /dev/null +++ b/externals/vcpkg/ports/log4cxx/expat.patch @@ -0,0 +1,49 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e5b44ef..e84e497 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -33,7 +33,7 @@ find_package(APR-Util REQUIRED) + find_package( Threads REQUIRED ) + + # Find expat for XML parsing +-find_package(EXPAT REQUIRED) ++find_package(expat CONFIG REQUIRED) + + # Request C++17, if available + # This *should* fallback to an older standard if it is not available +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index b60e54f..b6138b3 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -3,7 +3,7 @@ cmake_policy(SET CMP0079 NEW) + add_subdirectory(main) + target_compile_definitions(log4cxx PRIVATE ${LOG4CXX_COMPILE_DEFINITIONS} ${APR_COMPILE_DEFINITIONS} ${APR_UTIL_COMPILE_DEFINITIONS} ) + target_include_directories(log4cxx INTERFACE $ PRIVATE ${APR_INCLUDE_DIR} ${APR_UTIL_INCLUDE_DIR}) +-target_link_libraries(log4cxx PRIVATE ${APR_UTIL_LIBRARIES} EXPAT::EXPAT ${APR_LIBRARIES} ${APR_SYSTEM_LIBS}) ++target_link_libraries(log4cxx PRIVATE ${APR_UTIL_LIBRARIES} expat::expat ${APR_LIBRARIES} ${APR_SYSTEM_LIBS}) + if(WIN32) + # The ODBC appender is always enabled in the Windows configuration + target_link_libraries(log4cxx PRIVATE odbc32.lib) +diff --git a/src/cmake/FindAPR-Util.cmake b/src/cmake/FindAPR-Util.cmake +index d9cf4df..17a2457 100644 +--- a/src/cmake/FindAPR-Util.cmake ++++ b/src/cmake/FindAPR-Util.cmake +@@ -38,7 +38,6 @@ if(EXISTS ${APR_UTIL_CONFIG_EXECUTABLE}) + _apu_invoke(_apu_util_link_args --link-ld) + string(REGEX MATCH "-L([^ ]+)" _apu_util_L_flag ${_apu_util_link_args}) + find_library(APR_UTIL_LIBRARIES NAMES libaprutil-1.a PATHS "${CMAKE_MATCH_1}") +- _apu_invoke(XMLLIB_LIBRARIES --libs) + set(APR_UTIL_COMPILE_DEFINITIONS APU_DECLARE_STATIC) + else() + _apu_invoke(APR_UTIL_LIBRARIES --link-ld) +diff --git a/src/test/cpp/xml/CMakeLists.txt b/src/test/cpp/xml/CMakeLists.txt +index 138c489..7b62f3e 100644 +--- a/src/test/cpp/xml/CMakeLists.txt ++++ b/src/test/cpp/xml/CMakeLists.txt +@@ -4,5 +4,5 @@ add_executable(xmltests + xmllayouttestcase + ) + +-target_link_libraries(xmltests PRIVATE ${APR_UTIL_LIBRARIES} EXPAT::EXPAT) ++target_link_libraries(xmltests PRIVATE ${APR_UTIL_LIBRARIES} expat::expat) + set(ALL_LOG4CXX_TESTS ${ALL_LOG4CXX_TESTS} xmltests PARENT_SCOPE) diff --git a/externals/vcpkg/ports/log4cxx/linux.patch b/externals/vcpkg/ports/log4cxx/linux.patch new file mode 100755 index 000000000..01c51c218 --- /dev/null +++ b/externals/vcpkg/ports/log4cxx/linux.patch @@ -0,0 +1,17 @@ +diff --git a/src/cmake/FindAPR.cmake b/src/cmake/FindAPR.cmake +index a204ece..4d2b48d 100644 +--- a/src/cmake/FindAPR.cmake ++++ b/src/cmake/FindAPR.cmake +@@ -45,7 +45,11 @@ if(EXISTS ${APR_CONFIG_EXECUTABLE}) + else() + find_path(APR_INCLUDE_DIR apr.h PATH_SUFFIXES apr-1) + if (APR_STATIC OR NOT BUILD_SHARED_LIBS) +- set(APR_SYSTEM_LIBS ws2_32 mswsock rpcrt4) ++ if(WIN32) ++ set(APR_SYSTEM_LIBS ws2_32 mswsock rpcrt4) ++ else() ++ set(APR_SYSTEM_LIBS pthread) ++ endif() + set(APR_COMPILE_DEFINITIONS APR_DECLARE_STATIC) + find_library(APR_LIBRARIES NAMES apr-1) + else() diff --git a/externals/vcpkg/ports/log4cxx/pkgconfig.patch b/externals/vcpkg/ports/log4cxx/pkgconfig.patch new file mode 100755 index 000000000..ee109775c --- /dev/null +++ b/externals/vcpkg/ports/log4cxx/pkgconfig.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e84e497..ff8b920 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -94,7 +94,7 @@ if(UNIX) + ) + + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/liblog4cxx.pc" +- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + if(LOG4CXX_QT_SUPPORT) + set(prefix "${CMAKE_INSTALL_PREFIX}") +@@ -107,7 +107,7 @@ if(UNIX) + ) + + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/liblog4cxx-qt.pc" +- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif(LOG4CXX_QT_SUPPORT) + endif(UNIX) + diff --git a/externals/vcpkg/ports/log4cxx/portfile.cmake b/externals/vcpkg/ports/log4cxx/portfile.cmake new file mode 100755 index 000000000..13ac8ce5b --- /dev/null +++ b/externals/vcpkg/ports/log4cxx/portfile.cmake @@ -0,0 +1,44 @@ +set(VERSION 0.12.1) +vcpkg_download_distfile(ARCHIVE + URLS "https://archive.apache.org/dist/logging/log4cxx/${VERSION}/apache-log4cxx-${VERSION}.tar.gz" + FILENAME "apache-log4cxx-${VERSION}.tar.gz" + SHA512 807058734cebf7c92e99484313becbc6be63e48bd930889c733318bb78dfec498b66aaa12255ed30879abb005b32e2b965f9dd87ec50d0421ca067f3f66280d9 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${VERSION} + PATCHES + expat.patch + linux.patch + pkgconfig.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DLOG4CXX_INSTALL_PDB=OFF # Installing pdbs failed on debug static. So, disable it and let vcpkg_copy_pdbs() do it + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/log4cxx) + +if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) + vcpkg_fixup_pkgconfig() +endif() + +file(READ "${CURRENT_PACKAGES_DIR}/share/${PORT}/log4cxxConfig.cmake" _contents) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/log4cxxConfig.cmake" +"include(CMakeFindDependencyMacro) +find_dependency(expat CONFIG) +${_contents}" +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/log4cxx/vcpkg.json b/externals/vcpkg/ports/log4cxx/vcpkg.json new file mode 100755 index 000000000..55d257ad7 --- /dev/null +++ b/externals/vcpkg/ports/log4cxx/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "log4cxx", + "version": "0.12.1", + "description": "Apache log4cxx is a logging framework for C++ patterned after Apache log4j, which uses Apache Portable Runtime for most platform-specific code and should be usable on any platform supported by APR", + "homepage": "https://logging.apache.org/log4cxx", + "supports": "!uwp", + "dependencies": [ + "apr", + "apr-util", + "expat", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/loguru/CMakeLists.txt b/externals/vcpkg/ports/loguru/CMakeLists.txt new file mode 100755 index 000000000..473392aa8 --- /dev/null +++ b/externals/vcpkg/ports/loguru/CMakeLists.txt @@ -0,0 +1,55 @@ +cmake_minimum_required(VERSION 3.12) + +project(loguru CXX) +set(CMAKE_CXX_STANDARD 11) + +option(INSTALL_HEADERS "Install header files" ON) +option(BUILD_WITH_FMT "Build with fmt support" OFF) + +set(loguru_headers + loguru.hpp +) +set(loguru_sources + loguru.cpp +) + +add_library(loguru ${loguru_sources}) +target_include_directories(loguru PUBLIC + $ + $) + +if(BUILD_WITH_FMT) + target_compile_definitions(loguru PRIVATE LOGURU_USE_FMTLIB=1) + find_package(fmt CONFIG REQUIRED) + target_link_libraries(loguru PUBLIC fmt::fmt) +endif() + +if(UNIX) + set(THREADS_PREFER_PTHREAD_FLAG ON) + find_package(Threads REQUIRED) + target_link_libraries(loguru PUBLIC Threads::Threads ${CMAKE_DL_LIBS}) +endif() + +set(LOGURU_INCLUDE_INSTALL_DIR include/loguru CACHE PATH "Install directory for headers") +if(INSTALL_HEADERS) + install(FILES ${loguru_headers} DESTINATION ${LOGURU_INCLUDE_INSTALL_DIR}) +endif() + +set(INCLUDE_INSTALL_DIR ${LOGURU_INCLUDE_INSTALL_DIR}) + +include(CMakePackageConfigHelpers) +configure_package_config_file(loguruConfig.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/loguruConfig.cmake + INSTALL_DESTINATION share/loguru + NO_CHECK_REQUIRED_COMPONENTS_MACRO + PATH_VARS INCLUDE_INSTALL_DIR) + +install(TARGETS loguru + EXPORT loguruTargets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/loguruConfig.cmake DESTINATION share/loguru) +install(EXPORT loguruTargets DESTINATION share/loguru) diff --git a/externals/vcpkg/ports/loguru/copyright b/externals/vcpkg/ports/loguru/copyright new file mode 100755 index 000000000..334edabf8 --- /dev/null +++ b/externals/vcpkg/ports/loguru/copyright @@ -0,0 +1,3 @@ +This software is in the public domain. Where that dedication is not recognized, you are granted a perpetual, irrevocable license to copy, modify and distribute it as you see fit. + +That being said, I would appreciate credit! If you find Loguru useful, tweet me at @ernerfeldt mail me at emil.ernerfeldt@gmail.com. \ No newline at end of file diff --git a/externals/vcpkg/ports/loguru/loguruConfig.cmake.in b/externals/vcpkg/ports/loguru/loguruConfig.cmake.in new file mode 100755 index 000000000..b75b189e0 --- /dev/null +++ b/externals/vcpkg/ports/loguru/loguruConfig.cmake.in @@ -0,0 +1,9 @@ +@PACKAGE_INIT@ + +if(UNIX) + include(CMakeFindDependencyMacro) + find_dependency(Threads) +endif() + +set_and_check(loguru_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") +include("${CMAKE_CURRENT_LIST_DIR}/loguruTargets.cmake") diff --git a/externals/vcpkg/ports/loguru/portfile.cmake b/externals/vcpkg/ports/loguru/portfile.cmake new file mode 100755 index 000000000..a581eab88 --- /dev/null +++ b/externals/vcpkg/ports/loguru/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO emilk/loguru + REF 9c2fea0d4530657f23259be4132f8101c98b579e #v2.1.0 + SHA512 49eebf8648f9d29273af76dca0a4e49155daa3664e98979df005e64eb0fa9f4eeb4228245327d469772c51076571acbe39a644eba531444d8676d9709a7e3914 + HEAD_REF master +) + +if(VCPKG_TARGET_IS_WINDOWS) + file(INSTALL ${SOURCE_PATH}/loguru.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include/loguru) + file(INSTALL ${SOURCE_PATH}/loguru.cpp DESTINATION ${CURRENT_PACKAGES_DIR}/include/loguru) +endif() + +if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) + configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) + configure_file(${CMAKE_CURRENT_LIST_DIR}/loguruConfig.cmake.in ${SOURCE_PATH}/loguruConfig.cmake.in COPYONLY) + + vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + fmt BUILD_WITH_FMT + ) + + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DINSTALL_HEADERS=OFF + OPTIONS + ${FEATURE_OPTIONS} + ) + + vcpkg_cmake_install() + vcpkg_cmake_config_fixup() + vcpkg_copy_pdbs() +endif() + +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/externals/vcpkg/ports/loguru/vcpkg.json b/externals/vcpkg/ports/loguru/vcpkg.json new file mode 100755 index 000000000..d6705d6fa --- /dev/null +++ b/externals/vcpkg/ports/loguru/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "loguru", + "version": "2.1.0", + "port-version": 3, + "description": "A lightweight and flexible C++ logging library", + "homepage": "https://github.com/emilk/loguru", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "fmt": { + "description": "Build with fmt support in non-header-only mode", + "dependencies": [ + "fmt" + ] + } + } +} diff --git a/externals/vcpkg/ports/lpeg/CMakeLists.txt b/externals/vcpkg/ports/lpeg/CMakeLists.txt new file mode 100755 index 000000000..993e570d7 --- /dev/null +++ b/externals/vcpkg/ports/lpeg/CMakeLists.txt @@ -0,0 +1,24 @@ +cmake_minimum_required(VERSION 3.0) +project(lpeg) + +find_path(LUA_INCLUDE_DIR lua.h PATH_SUFFIXES lua) +find_library(LUA_LIBRARY lua) +set(LPEG_INCLUDES ${LUA_INCLUDE_DIR}) +set(LPEG_LIBRARIES ${LUA_LIBRARY}) + +add_library(lpeg + lpvm.c + lptree.c + lpprint.c + lpcap.c + lpcode.c + lpeg.def) + +target_include_directories(lpeg PRIVATE ${LPEG_INCLUDES}) +target_link_libraries(lpeg PRIVATE ${LPEG_LIBRARIES}) + +install(TARGETS lpeg + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) +install(FILES re.lua DESTINATION share/lua) diff --git a/externals/vcpkg/ports/lpeg/lpeg.def b/externals/vcpkg/ports/lpeg/lpeg.def new file mode 100755 index 000000000..c4c1285b7 --- /dev/null +++ b/externals/vcpkg/ports/lpeg/lpeg.def @@ -0,0 +1,3 @@ +LIBRARY lpeg +EXPORTS + luaopen_lpeg diff --git a/externals/vcpkg/ports/lpeg/portfile.cmake b/externals/vcpkg/ports/lpeg/portfile.cmake new file mode 100755 index 000000000..24d77f00b --- /dev/null +++ b/externals/vcpkg/ports/lpeg/portfile.cmake @@ -0,0 +1,31 @@ +set(LPEG_VER 1.0.2) + +vcpkg_download_distfile(ARCHIVE + URLS "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-${LPEG_VER}.tar.gz" + FILENAME "lpeg-${LPEG_VER}.tar.gz" + SHA512 110527ddf9f8e5e8a80ef0ae8847c8ba8cd2597dba3bfe2865cba9af60daafbb885f21e74231952f5ab793d021e050b482066a821c6954d52090a5eae77e9814 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/lpeg.def DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +# Remove debug share +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/lpeg.html DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +# Allow empty include directory +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/externals/vcpkg/ports/lpeg/vcpkg.json b/externals/vcpkg/ports/lpeg/vcpkg.json new file mode 100755 index 000000000..7e4c8b303 --- /dev/null +++ b/externals/vcpkg/ports/lpeg/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "lpeg", + "version-string": "1.0.2", + "port-version": 2, + "description": "LPeg is a pattern-matching library for Lua, based on Parsing Expression Grammars (PEGs).", + "homepage": "https://www.inf.puc-rio.br/~roberto/lpeg", + "dependencies": [ + "lua" + ] +} diff --git a/externals/vcpkg/ports/lua/CMakeLists-cpp.txt b/externals/vcpkg/ports/lua/CMakeLists-cpp.txt new file mode 100755 index 000000000..88e128fff --- /dev/null +++ b/externals/vcpkg/ports/lua/CMakeLists-cpp.txt @@ -0,0 +1,28 @@ +SET(SRC_LIBLUACPP ${SRC_LIBLUA}) +ADD_LIBRARY ( lua-cpp ${SRC_LIBLUACPP} ${HDR_LIBLUACPP} ) +SET_TARGET_PROPERTIES(lua-cpp PROPERTIES OUTPUT_NAME "lua-c++") +SET_SOURCE_FILES_PROPERTIES(${SRC_LIBLUACPP} PROPERTIES LANGUAGE CXX) +TARGET_INCLUDE_DIRECTORIES(lua-cpp PRIVATE $ PUBLIC $) +IF (BUILD_SHARED_LIBS AND WIN32) + TARGET_COMPILE_DEFINITIONS (lua-cpp PUBLIC -DLUA_BUILD_AS_DLL ) +ENDIF () +IF (UNIX) + IF (APPLE) + TARGET_COMPILE_DEFINITIONS (lua-cpp PUBLIC -DLUA_USE_DLOPEN) + ELSE () + FIND_LIBRARY (LIB_DLOPEN NAMES dl) + IF (LIB_DLOPEN) + TARGET_COMPILE_DEFINITIONS (lua-cpp PUBLIC -DLUA_USE_DLOPEN) + TARGET_LINK_LIBRARIES (lua-cpp ${LIB_DLOPEN}) + ENDIF () + ENDIF () +ENDIF () + +INSTALL ( TARGETS lua-cpp + EXPORT unofficial-lua-cpp-config + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +INSTALL(EXPORT unofficial-lua-cpp-config DESTINATION share/unofficial-lua-cpp) diff --git a/externals/vcpkg/ports/lua/CMakeLists.txt b/externals/vcpkg/ports/lua/CMakeLists.txt new file mode 100755 index 000000000..ac52d7e80 --- /dev/null +++ b/externals/vcpkg/ports/lua/CMakeLists.txt @@ -0,0 +1,114 @@ +# Lua can be compiled as either C or C++. +# Default configuration is C, set COMPILE_AS_CPP to ON to use C++. +# See http://stackoverflow.com/questions/13560945/c-and-c-library-using-longjmp for why would you want to do that. +# Primary differences: +# - Exceptions will be used instead of setjmp/longjmp +# - The name mangling for functions will be C++ instead of C. +# - This is a source-incompatible change because extern "C" is chosen by the including application. +# - The lua.hpp header will not be available. + +PROJECT ( lua ) + + +CMAKE_MINIMUM_REQUIRED(VERSION 3.18) + +# Build Libraries +FILE(GLOB HDR_LIBLUA "${CMAKE_SOURCE_DIR}/src/*.h") +# For luac.c +LIST(REMOVE_ITEM HDR_LIBLUA "${CMAKE_SOURCE_DIR}/src/lopnames.h") + +FILE(GLOB SRC_LIBLUA "${CMAKE_SOURCE_DIR}/src/*.c") +# Executables luac and luai +LIST(REMOVE_ITEM SRC_LIBLUA "${CMAKE_SOURCE_DIR}/src/luac.c" "${CMAKE_SOURCE_DIR}/src/lua.c") + +IF (WIN32) + # remove warnings + ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS ) +ENDIF () + +IF (UNIX) + ADD_DEFINITIONS (-DLUA_USE_POSIX) + FIND_LIBRARY (LIB_MATH NAMES m) + IF (LIB_MATH) + LINK_LIBRARIES (${LIB_MATH}) + ENDIF () +ENDIF () + +# C library +SET (CMAKE_C_STANDARD 99) +SET(SRC_LIBLUAC ${SRC_LIBLUA}) +ADD_LIBRARY ( lua ${SRC_LIBLUAC} ${HDR_LIBLUA} ) +TARGET_INCLUDE_DIRECTORIES(lua PRIVATE $ PUBLIC $) +SET_PROPERTY (TARGET lua PROPERTY POSITION_INDEPENDENT_CODE ON) +SET_SOURCE_FILES_PROPERTIES(${SRC_LIBLUAC} PROPERTIES LANGUAGE C) + +IF (BUILD_SHARED_LIBS AND WIN32) + TARGET_COMPILE_DEFINITIONS (lua PUBLIC -DLUA_BUILD_AS_DLL ) +ENDIF () + +IF (UNIX) + IF (APPLE) + TARGET_COMPILE_DEFINITIONS (lua PUBLIC -DLUA_USE_DLOPEN) + ELSE () + FIND_LIBRARY (LIB_DLOPEN NAMES dl) + IF (LIB_DLOPEN) + TARGET_COMPILE_DEFINITIONS (lua PUBLIC -DLUA_USE_DLOPEN) + TARGET_LINK_LIBRARIES (lua ${LIB_DLOPEN}) + ENDIF () + ENDIF () +ENDIF () + +INSTALL ( TARGETS lua + EXPORT unofficial-lua-config + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(EXPORT unofficial-lua-config DESTINATION share/unofficial-lua) + +# CXX library +IF (COMPILE_AS_CPP) + ADD_SUBDIRECTORY(cpp) +ENDIF() + +IF (INSTALL_TOOLS) + # compiler uses non-exported APIs, so must include sources directly. + ADD_EXECUTABLE ( luac ${CMAKE_SOURCE_DIR}/src/luac.c ${SRC_LIBLUA} ${CMAKE_SOURCE_DIR}/src/lopnames.h ) + ADD_EXECUTABLE ( luai ${CMAKE_SOURCE_DIR}/src/lua.c ) # interpreter + + TARGET_INCLUDE_DIRECTORIES(luac PRIVATE ${CMAKE_CURRENT_LIST_DIR}/src) + TARGET_LINK_LIBRARIES ( luai PRIVATE lua ) + SET_TARGET_PROPERTIES ( luai PROPERTIES OUTPUT_NAME lua PDB_NAME luai ) + IF (UNIX) + IF (CMAKE_SYSTEM_NAME STREQUAL FreeBSD) + SET (_LIB_READLINE_NAME edit) + ELSE () + SET (_LIB_READLINE_NAME readline) + ENDIF () + FIND_LIBRARY (LIB_READLINE NAMES ${_LIB_READLINE_NAME}) + IF (LIB_READLINE) + TARGET_COMPILE_DEFINITIONS (luai PUBLIC -DLUA_USE_READLINE) + TARGET_LINK_LIBRARIES(luai ${LIB_READLINE}) + IF (_LIB_READLINE_NAME STREQUAL edit) + TARGET_INCLUDE_DIRECTORIES (luai PUBLIC /usr/include/edit) + ENDIF () + ENDIF () + ENDIF () + INSTALL ( TARGETS luai luac RUNTIME DESTINATION tools/lua ) +ENDIF () + +IF (NOT SKIP_INSTALL_HEADERS) + INSTALL( + FILES + src/lualib.h + src/lua.h + src/luaconf.h + src/lauxlib.h + DESTINATION include + ) + # If using C++, don't install extern "C" wrapper. + IF (NOT COMPILE_AS_CPP) + INSTALL(FILES src/lua.hpp DESTINATION include) + ENDIF () +ENDIF () diff --git a/externals/vcpkg/ports/lua/COPYRIGHT b/externals/vcpkg/ports/lua/COPYRIGHT new file mode 100755 index 000000000..729a2ccd5 --- /dev/null +++ b/externals/vcpkg/ports/lua/COPYRIGHT @@ -0,0 +1,6 @@ +Copyright © 1994–2016 Lua.org, PUC-Rio. +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/externals/vcpkg/ports/lua/fix-ios-system.patch b/externals/vcpkg/ports/lua/fix-ios-system.patch new file mode 100755 index 000000000..3e98ce228 --- /dev/null +++ b/externals/vcpkg/ports/lua/fix-ios-system.patch @@ -0,0 +1,29 @@ +diff --git a/src/loslib.c b/src/loslib.c +index e65e188..3595601 100644 +--- a/src/loslib.c ++++ b/src/loslib.c +@@ -3,7 +3,9 @@ + ** Standard Operating System library + ** See Copyright Notice in lua.h + */ +- ++#if defined(__APPLE__) ++#include ++#endif + #define loslib_c + #define LUA_LIB + +@@ -143,7 +145,12 @@ static int os_execute (lua_State *L) { + const char *cmd = luaL_optstring(L, 1, NULL); + int stat; + errno = 0; +- stat = system(cmd); ++#if defined(__APPLE__) && !TARGET_OS_OSX ++ // system() is __IOS_PROHIBITED, __WATCHOS_PROHIBITED, and __TVOS_PROHIBITED. ++ stat = 127; // error: shell execution failed ++#else ++ stat = system(cmd); ++#endif + if (cmd != NULL) + return luaL_execresult(L, stat); + else { diff --git a/externals/vcpkg/ports/lua/portfile.cmake b/externals/vcpkg/ports/lua/portfile.cmake new file mode 100755 index 000000000..e607a6f61 --- /dev/null +++ b/externals/vcpkg/ports/lua/portfile.cmake @@ -0,0 +1,54 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://www.lua.org/ftp/lua-5.4.4.tar.gz" + FILENAME "lua-5.4.4.tar.gz" + SHA512 af0c35d5ba00fecbb2dd617bd7b825edf7418a16a73076e04f2a0df58cdbf098dc3ff4402e974afd789eb5d86d2e12ec6df9c84b99b23656ea694a85f83bcd21 +) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES + vs2015-impl-c99.patch + fix-ios-system.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/CMakeLists-cpp.txt" DESTINATION "${SOURCE_PATH}/cpp" RENAME "CMakeLists.txt") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cpp COMPILE_AS_CPP # Also used in cmake wrapper + tools INSTALL_TOOLS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + OPTIONS_DEBUG + -DSKIP_INSTALL_HEADERS=ON +) +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-lua CONFIG_PATH share/unofficial-lua) + +if("cpp" IN_LIST FEATURES) + vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-lua-cpp CONFIG_PATH "share/unofficial-lua-cpp") +endif() + +if ("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES lua luac SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/luaconf.h" "defined(LUA_BUILD_AS_DLL)" "1") + endif() +endif() + +# Suitable for old version +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/lua/usage b/externals/vcpkg/ports/lua/usage new file mode 100755 index 000000000..01aa81ed3 --- /dev/null +++ b/externals/vcpkg/ports/lua/usage @@ -0,0 +1,5 @@ +Use this package via the module FindLua that comes with CMake. To use in your CMakeLists.txt: + + find_package(Lua REQUIRED) + target_include_directories(main PRIVATE ${LUA_INCLUDE_DIR}) + target_link_libraries(main PRIVATE ${LUA_LIBRARIES}) diff --git a/externals/vcpkg/ports/lua/vcpkg-cmake-wrapper.cmake.in b/externals/vcpkg/ports/lua/vcpkg-cmake-wrapper.cmake.in new file mode 100755 index 000000000..eec21fdb3 --- /dev/null +++ b/externals/vcpkg/ports/lua/vcpkg-cmake-wrapper.cmake.in @@ -0,0 +1,23 @@ +set(REQUIRES ) +foreach(ARG IN_LISTS ${ARGS}) + if (ARG STREQUAL "REQUIRED") + set(REQUIRES "REQUIRED") + endif() +endforeach() + +_find_package(unofficial-lua CONFIG ${REQUIRES}) + +if (@COMPILE_AS_CPP@) + _find_package(unofficial-lua-cpp CONFIG ${REQUIRES}) +endif() + +get_filename_component(LUA_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}" PATH) +get_filename_component(LUA_INCLUDE_DIR "${LUA_INCLUDE_DIR}" PATH) +set(LUA_INCLUDE_DIR ${LUA_INCLUDE_DIR}/include) + +list(APPEND LUA_LIBRARIES lua) +if (TARGET lua-cpp) + list(APPEND LUA_LIBRARIES lua-cpp) +endif() + +set(LUA_FOUND 1) diff --git a/externals/vcpkg/ports/lua/vcpkg.json b/externals/vcpkg/ports/lua/vcpkg.json new file mode 100755 index 000000000..d7c7d2d57 --- /dev/null +++ b/externals/vcpkg/ports/lua/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "lua", + "version": "5.4.4", + "port-version": 2, + "description": "A powerful, fast, lightweight, embeddable scripting language", + "homepage": "https://www.lua.org", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cpp": { + "description": "Builds Lua for C++ linkage", + "supports": "!uwp" + }, + "tools": { + "description": "Builds Lua compiler and interpreter", + "supports": "!ios" + } + } +} diff --git a/externals/vcpkg/ports/lua/vs2015-impl-c99.patch b/externals/vcpkg/ports/lua/vs2015-impl-c99.patch new file mode 100755 index 000000000..e281e83cf --- /dev/null +++ b/externals/vcpkg/ports/lua/vs2015-impl-c99.patch @@ -0,0 +1,11 @@ +--- a/src/luaconf.h ++++ b/src/luaconf.h +@@ -54,7 +54,7 @@ + + #if defined(LUA_USE_WINDOWS) + #define LUA_DL_DLL /* enable support for DLL */ +-#define LUA_USE_C89 /* broadly, Windows is C89 */ ++//#define LUA_USE_C89 /* broadly, Windows is C89 */ + #endif + + diff --git a/externals/vcpkg/ports/luabridge/portfile.cmake b/externals/vcpkg/ports/luabridge/portfile.cmake new file mode 100755 index 000000000..6f4cbeb2a --- /dev/null +++ b/externals/vcpkg/ports/luabridge/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO vinniefalco/LuaBridge + REF 12d51bdd992a22b43adb9cc5fb83ebf8b1f2be7f # 2.6 + SHA512 18593b2fda5be0b7cd9701feed53820002f93bba883cfa9fcdfa3e25ead02fb9b2f16f30d1603ae5d43ee3b199925071260723d4ebb79eb581888496d422f42d + HEAD_REF master +) + +file( + COPY ${SOURCE_PATH}/Source/LuaBridge + DESTINATION ${CURRENT_PACKAGES_DIR}/include +) + +# Handle copyright +configure_file( + ${SOURCE_PATH}/README.md + ${CURRENT_PACKAGES_DIR}/share/luabridge/copyright + COPYONLY +) diff --git a/externals/vcpkg/ports/luabridge/vcpkg.json b/externals/vcpkg/ports/luabridge/vcpkg.json new file mode 100755 index 000000000..e26ef4339 --- /dev/null +++ b/externals/vcpkg/ports/luabridge/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "luabridge", + "version-string": "2.6", + "port-version": 1, + "description": "A lightweight, dependency-free library for binding Lua to C++" +} diff --git a/externals/vcpkg/ports/luafilesystem/CMakeLists.txt b/externals/vcpkg/ports/luafilesystem/CMakeLists.txt new file mode 100755 index 000000000..79dd424f4 --- /dev/null +++ b/externals/vcpkg/ports/luafilesystem/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 3.0) +project(luafilesystem) + +find_path(LUA_INCLUDE_DIR lua.h PATH_SUFFIXES lua) +find_library(LUA_LIBRARY lua) +set(LFS_INCLUDES ${LUA_INCLUDE_DIR}) +set(LFS_LIBRARIES ${LUA_LIBRARY}) + +add_library( lfs src/lfs.h src/lfs.c src/lfs.def) + +target_include_directories(lfs PRIVATE ${LFS_INCLUDES}) +target_link_libraries(lfs PRIVATE ${LFS_LIBRARIES}) + +install(TARGETS lfs + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) diff --git a/externals/vcpkg/ports/luafilesystem/portfile.cmake b/externals/vcpkg/ports/luafilesystem/portfile.cmake new file mode 100755 index 000000000..bd6f1ebd4 --- /dev/null +++ b/externals/vcpkg/ports/luafilesystem/portfile.cmake @@ -0,0 +1,27 @@ +set(LUAFILESYSTEM_VERSION 1.8.0) +set(LUAFILESYSTEM_REVISION v1_8_0) +set(LUAFILESYSTEM_HASH 79d964f13ae43716281dc8521d2f128b22f2261234c443e242b857cfdf621e208bdf4512f8ba710baa113e9b3b71e2544609de65e2c483f569c243a5cf058247) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO keplerproject/luafilesystem + REF ${LUAFILESYSTEM_REVISION} + SHA512 ${LUAFILESYSTEM_HASH} + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +# Allow empty include directory +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/externals/vcpkg/ports/luafilesystem/vcpkg.json b/externals/vcpkg/ports/luafilesystem/vcpkg.json new file mode 100755 index 000000000..bdc33582d --- /dev/null +++ b/externals/vcpkg/ports/luafilesystem/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "luafilesystem", + "version-string": "1.8.0", + "port-version": 2, + "description": "LuaFileSystem is a Lua library developed to complement the set of functions related to file systems offered by the standard Lua distribution.", + "homepage": "https://github.com/keplerproject/luafilesystem", + "dependencies": [ + "lua" + ] +} diff --git a/externals/vcpkg/ports/luajit/001-fix-build-path.patch b/externals/vcpkg/ports/luajit/001-fix-build-path.patch new file mode 100755 index 000000000..bd14d7089 --- /dev/null +++ b/externals/vcpkg/ports/luajit/001-fix-build-path.patch @@ -0,0 +1,119 @@ +diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat +index 42e3652..6a889e1 100644 +--- a/src/msvcbuild.bat ++++ b/src/msvcbuild.bat +@@ -14,17 +14,18 @@ + @if not defined INCLUDE goto :FAIL + + @setlocal +-@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline ++@set SOURCEDIR=%1 ++@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline /I%SOURCEDIR% + @set LJLINK=link /nologo + @set LJMT=mt /nologo + @set LJLIB=lib /nologo /nodefaultlib +-@set DASMDIR=..\dynasm ++@set DASMDIR=%SOURCEDIR%\..\dynasm + @set DASM=%DASMDIR%\dynasm.lua + @set LJDLLNAME=lua51.dll + @set LJLIBNAME=lua51.lib +-@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c ++@set ALL_LIB=%SOURCEDIR%\lib_base.c %SOURCEDIR%\lib_math.c %SOURCEDIR%\lib_bit.c %SOURCEDIR%\lib_string.c %SOURCEDIR%\lib_table.c %SOURCEDIR%\lib_io.c %SOURCEDIR%\lib_os.c %SOURCEDIR%\lib_package.c %SOURCEDIR%\lib_debug.c %SOURCEDIR%\lib_jit.c %SOURCEDIR%\lib_ffi.c + +-%LJCOMPILE% host\minilua.c ++%LJCOMPILE% %SOURCEDIR%\host\minilua.c /Fdminilua.pdb + @if errorlevel 1 goto :BAD + %LJLINK% /out:minilua.exe minilua.obj + @if errorlevel 1 goto :BAD +@@ -38,10 +39,10 @@ if exist minilua.exe.manifest^ + @set DASMFLAGS=-D WIN -D JIT -D FFI + @set LJARCH=x86 + :X64 +-minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_x86.dasc ++minilua %DASM% -LN %DASMFLAGS% -o %SOURCEDIR%\host\buildvm_arch.h %SOURCEDIR%\vm_x86.dasc + @if errorlevel 1 goto :BAD + +-%LJCOMPILE% /I "." /I %DASMDIR% host\buildvm*.c ++%LJCOMPILE% /I "." /I %DASMDIR% %SOURCEDIR%\host\buildvm*.c /Fdbuildvm.pdb + @if errorlevel 1 goto :BAD + %LJLINK% /out:buildvm.exe buildvm*.obj + @if errorlevel 1 goto :BAD +@@ -50,39 +51,39 @@ if exist buildvm.exe.manifest^ + + buildvm -m peobj -o lj_vm.obj + @if errorlevel 1 goto :BAD +-buildvm -m bcdef -o lj_bcdef.h %ALL_LIB% ++buildvm -m bcdef -o %SOURCEDIR%\lj_bcdef.h %ALL_LIB% + @if errorlevel 1 goto :BAD +-buildvm -m ffdef -o lj_ffdef.h %ALL_LIB% ++buildvm -m ffdef -o %SOURCEDIR%\lj_ffdef.h %ALL_LIB% + @if errorlevel 1 goto :BAD +-buildvm -m libdef -o lj_libdef.h %ALL_LIB% ++buildvm -m libdef -o %SOURCEDIR%\lj_libdef.h %ALL_LIB% + @if errorlevel 1 goto :BAD +-buildvm -m recdef -o lj_recdef.h %ALL_LIB% ++buildvm -m recdef -o %SOURCEDIR%\lj_recdef.h %ALL_LIB% + @if errorlevel 1 goto :BAD +-buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB% ++buildvm -m vmdef -o %SOURCEDIR%\jit\vmdef.lua %ALL_LIB% + @if errorlevel 1 goto :BAD +-buildvm -m folddef -o lj_folddef.h lj_opt_fold.c ++buildvm -m folddef -o %SOURCEDIR%\lj_folddef.h %SOURCEDIR%\lj_opt_fold.c + @if errorlevel 1 goto :BAD + +-@if "%1" neq "debug" goto :NODEBUG ++@set LJLINK=%LJLINK% /debug ++@if "%2" neq "debug" goto :NODEBUG + @shift + @set LJCOMPILE=%LJCOMPILE% /Zi +-@set LJLINK=%LJLINK% /debug + :NODEBUG +-@if "%1"=="amalg" goto :AMALGDLL +-@if "%1"=="static" goto :STATIC +-%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL lj_*.c lib_*.c ++@if "%2"=="amalg" goto :AMALGDLL ++@if "%2"=="static" goto :STATIC ++%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb + @if errorlevel 1 goto :BAD + %LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj + @if errorlevel 1 goto :BAD + @goto :MTDLL + :STATIC +-%LJCOMPILE% lj_*.c lib_*.c ++%LJCOMPILE% %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb + @if errorlevel 1 goto :BAD + %LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj + @if errorlevel 1 goto :BAD + @goto :MTDLL + :AMALGDLL +-%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL ljamalg.c ++%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL %SOURCEDIR%\ljamalg.c + @if errorlevel 1 goto :BAD + %LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj + @if errorlevel 1 goto :BAD +@@ -90,7 +91,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c + if exist %LJDLLNAME%.manifest^ + %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2 + +-%LJCOMPILE% luajit.c ++%LJCOMPILE% %SOURCEDIR%\luajit.c /Fdluajit.pdb + @if errorlevel 1 goto :BAD + %LJLINK% /out:luajit.exe luajit.obj %LJLIBNAME% + @if errorlevel 1 goto :BAD +@@ -98,8 +99,8 @@ if exist luajit.exe.manifest^ + %LJMT% -manifest luajit.exe.manifest -outputresource:luajit.exe + + @del *.obj *.manifest minilua.exe buildvm.exe +-@del host\buildvm_arch.h +-@del lj_bcdef.h lj_ffdef.h lj_libdef.h lj_recdef.h lj_folddef.h ++@del %SOURCEDIR%\host\buildvm_arch.h ++@del %SOURCEDIR%\lj_bcdef.h %SOURCEDIR%\lj_ffdef.h %SOURCEDIR%\lj_libdef.h %SOURCEDIR%\lj_recdef.h %SOURCEDIR%\lj_folddef.h + @echo. + @echo === Successfully built LuaJIT for Windows/%LJARCH% === + +@@ -112,4 +113,5 @@ if exist luajit.exe.manifest^ + @goto :END + :FAIL + @echo You must open a "Visual Studio .NET Command Prompt" to run this script ++exit 1 + :END diff --git a/externals/vcpkg/ports/luajit/002-fix-crt-linkage.patch b/externals/vcpkg/ports/luajit/002-fix-crt-linkage.patch new file mode 100755 index 000000000..cbc273efc --- /dev/null +++ b/externals/vcpkg/ports/luajit/002-fix-crt-linkage.patch @@ -0,0 +1,42 @@ +diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat +index 6a889e1..08c4e3c 100644 +--- a/src/msvcbuild.bat ++++ b/src/msvcbuild.bat +@@ -64,20 +64,23 @@ buildvm -m vmdef -o %SOURCEDIR%\jit\vmdef.lua %ALL_LIB% + buildvm -m folddef -o %SOURCEDIR%\lj_folddef.h %SOURCEDIR%\lj_opt_fold.c + @if errorlevel 1 goto :BAD + ++@if "%2"=="static" set CRT_LINKAGE=/MT ++@if "%2"=="dynamic" set CRT_LINKAGE=/MD + @set LJLINK=%LJLINK% /debug +-@if "%2" neq "debug" goto :NODEBUG ++@if "%3" neq "debug" goto :NODEBUG + @shift + @set LJCOMPILE=%LJCOMPILE% /Zi ++@set CRT_LINKAGE=%CRT_LINKAGE%d + :NODEBUG +-@if "%2"=="amalg" goto :AMALGDLL ++@if "%3"=="amalg" goto :AMALGDLL +-@if "%2"=="static" goto :STATIC ++@if "%3"=="static" goto :STATIC +-%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb ++%LJCOMPILE% %CRT_LINKAGE% /DLUA_BUILD_AS_DLL %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb + @if errorlevel 1 goto :BAD + %LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj + @if errorlevel 1 goto :BAD + @goto :MTDLL + :STATIC +-%LJCOMPILE% %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb ++%LJCOMPILE% %CRT_LINKAGE% %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb + @if errorlevel 1 goto :BAD + %LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj + @if errorlevel 1 goto :BAD +@@ -94,7 +94,7 @@ + if exist %LJDLLNAME%.manifest^ + %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2 + +-%LJCOMPILE% %SOURCEDIR%\luajit.c /Fdluajit.pdb ++%LJCOMPILE% %CRT_LINKAGE% %SOURCEDIR%\luajit.c /Fdluajit.pdb + @if errorlevel 1 goto :BAD + %LJLINK% /out:luajit.exe luajit.obj %LJLIBNAME% + @if errorlevel 1 goto :BAD diff --git a/externals/vcpkg/ports/luajit/003-do-not-set-macosx-deployment-target.patch b/externals/vcpkg/ports/luajit/003-do-not-set-macosx-deployment-target.patch new file mode 100755 index 000000000..0db44b4c3 --- /dev/null +++ b/externals/vcpkg/ports/luajit/003-do-not-set-macosx-deployment-target.patch @@ -0,0 +1,14 @@ +diff --git a/src/Makefile b/src/Makefile +index f7f81a4..e6140c4 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -297,9 +297,6 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector + TARGET_XCFLAGS+= -fno-stack-protector + endif + ifeq (Darwin,$(TARGET_SYS)) +- ifeq (,$(MACOSX_DEPLOYMENT_TARGET)) +- export MACOSX_DEPLOYMENT_TARGET=10.4 +- endif + TARGET_STRIP+= -x + TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC + TARGET_DYNXLDOPTS= diff --git a/externals/vcpkg/ports/luajit/portfile.cmake b/externals/vcpkg/ports/luajit/portfile.cmake new file mode 100755 index 000000000..c96c311fc --- /dev/null +++ b/externals/vcpkg/ports/luajit/portfile.cmake @@ -0,0 +1,107 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LuaJIT/LuaJIT + REF v2.0.5 + SHA512 65d982d7fe532a61335613f414f3b8fa5333747bdf7aefc2c2d52022d227594ade827639049b97e3c4ffae9f38f32cb15f1a17b1780fb0a943e1a3af05e2b576 + HEAD_REF master + PATCHES + 001-fix-build-path.patch + 002-fix-crt-linkage.patch + 003-do-not-set-macosx-deployment-target.patch +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set (LJIT_STATIC "") +else() + set (LJIT_STATIC "static") +endif() + +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) + message(STATUS "Building ${TARGET_TRIPLET}-dbg") + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + + if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_execute_required_process_repeat( + COUNT 1 + COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src ${VCPKG_CRT_LINKAGE} debug ${LJIT_STATIC} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + LOGNAME build-${TARGET_TRIPLET}-dbg + ) + + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/luajit.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${CURRENT_PACKAGES_DIR}/debug/bin/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools") + endif() + vcpkg_copy_pdbs() + else() + vcpkg_execute_build_process( + COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile clean + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME clean-${TARGET_TRIPLET}-debug + ) + vcpkg_execute_build_process( + COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile PREFIX=${CURRENT_PACKAGES_DIR}/debug CCDEBUG=-g3 CFLAGS=-O0 BUILDMODE=${VCPKG_LIBRARY_LINKAGE} install + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME build-${TARGET_TRIPLET}-debug + ) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/lua") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() +endif() + +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) + message(STATUS "Building ${TARGET_TRIPLET}-rel") + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + + if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_execute_required_process_repeat( + COUNT 1 + COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src ${VCPKG_CRT_LINKAGE} ${LJIT_STATIC} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + LOGNAME build-${TARGET_TRIPLET}-rel + ) + + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/luajit.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/tools") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools) + endif() + vcpkg_copy_pdbs() + else() + vcpkg_execute_build_process( + COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile clean + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME clean-${TARGET_TRIPLET}-rel + ) + vcpkg_execute_build_process( + COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile PREFIX=${CURRENT_PACKAGES_DIR} CCDEBUG= BUILDMODE=${VCPKG_LIBRARY_LINKAGE} install + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME build-${TARGET_TRIPLET}-rel + ) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/lua" "${CURRENT_PACKAGES_DIR}/lib/lua") + endif() +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/src/lua.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(INSTALL "${SOURCE_PATH}/src/luajit.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(INSTALL "${SOURCE_PATH}/src/luaconf.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(INSTALL "${SOURCE_PATH}/src/lualib.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(INSTALL "${SOURCE_PATH}/src/lauxlib.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(INSTALL "${SOURCE_PATH}/src/lua.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/luajit/vcpkg.json b/externals/vcpkg/ports/luajit/vcpkg.json new file mode 100755 index 000000000..126729a08 --- /dev/null +++ b/externals/vcpkg/ports/luajit/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "luajit", + "version": "2.0.5", + "port-version": 8, + "description": "LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.", + "homepage": "https://github.com/LuaJIT/LuaJIT", + "license": "MIT", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/luasec/CMakeLists.txt b/externals/vcpkg/ports/luasec/CMakeLists.txt new file mode 100755 index 000000000..386af1440 --- /dev/null +++ b/externals/vcpkg/ports/luasec/CMakeLists.txt @@ -0,0 +1,38 @@ +cmake_minimum_required(VERSION 3.20.0) +project(luasec) + +find_path(LUA_INCLUDE_DIR lua.h PATH_SUFFIXES lua) +find_library(LUA_LIBRARY lua) +find_package(OpenSSL) + +set(LUASEC_INCLUDES ${LUA_INCLUDE_DIR} src) +set(LUASEC_LIBRARIES + ${LUA_LIBRARY} + OpenSSL::SSL + OpenSSL::Crypto + OpenSSL::applink + ws2_32) + +add_library(lua-ssl + src/config.c + src/ssl.c + src/context.c + src/x509.c + src/ec.c + src/options.c + src/luasocket/buffer.c + src/luasocket/io.c + src/luasocket/timeout.c + src/luasocket/wsocket.c) + +target_include_directories(lua-ssl PRIVATE ${LUASEC_INCLUDES}) +target_link_libraries(lua-ssl PRIVATE ${LUASEC_LIBRARIES}) +set_target_properties(lua-ssl PROPERTIES PREFIX "") + +install(TARGETS lua-ssl + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + +install(FILES src/ssl.lua DESTINATION share/lua) +install(FILES src/https.lua DESTINATION share/lua/ssl) diff --git a/externals/vcpkg/ports/luasec/portfile.cmake b/externals/vcpkg/ports/luasec/portfile.cmake new file mode 100755 index 000000000..ee2fff5a6 --- /dev/null +++ b/externals/vcpkg/ports/luasec/portfile.cmake @@ -0,0 +1,32 @@ +set(LUASEC_REVISION v1.1.0) +set(LUASEC_HASH ce08be2c62e97ebfab30e867790874030d404d195ce336b149d9501d652e9b8efe201cc2d0bcbb3be16214d7e4763b5871e45cbc22db758724baab9f7cd78568) + +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO brunoos/luasec + REF ${LUASEC_REVISION} + SHA512 ${LUASEC_HASH} + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +# Remove debug share +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +# Allow empty include directory +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/externals/vcpkg/ports/luasec/vcpkg.json b/externals/vcpkg/ports/luasec/vcpkg.json new file mode 100755 index 000000000..98f86d809 --- /dev/null +++ b/externals/vcpkg/ports/luasec/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "luasec", + "version": "1.1.0", + "maintainers": "Stephen Baker ", + "description": "LuaSec depends on OpenSSL, and integrates with LuaSocket to make it easy to add secure connections to any Lua applications or scripts.", + "homepage": "https://github.com/brunoos/luasec", + "license": "MIT", + "supports": "!(windows & static)", + "dependencies": [ + "lua", + "luasocket", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/luasocket/CMakeLists.txt b/externals/vcpkg/ports/luasocket/CMakeLists.txt new file mode 100755 index 000000000..3ab763deb --- /dev/null +++ b/externals/vcpkg/ports/luasocket/CMakeLists.txt @@ -0,0 +1,65 @@ +cmake_minimum_required(VERSION 3.0.2) +project(luasocket) + +if(NOT WIN32) + message(FATAL_ERROR "Written for windows only") +endif() + +find_path(LUA_INCLUDE_DIR lua.h PATH_SUFFIXES lua) +find_library(LUA_LIBRARY lua) +set(LUASOCKET_INCLUDES ${LUA_INCLUDE_DIR} src) +set(LUASOCKET_LIBRARIES ${LUA_LIBRARY} ws2_32) + +add_library(socket.core + src/luasocket.c + src/timeout.c + src/buffer.c + src/io.c + src/auxiliar.c + src/options.c + src/inet.c + src/except.c + src/select.c + src/tcp.c + src/udp.c + src/compat.c + src/wsocket.c) + +add_library(mime.core + src/mime.c + src/compat.c) + +target_include_directories(socket.core PRIVATE ${LUASOCKET_INCLUDES}) +target_link_libraries(socket.core PRIVATE ${LUASOCKET_LIBRARIES}) + +target_include_directories(mime.core PRIVATE ${LUASOCKET_INCLUDES}) +target_link_libraries(mime.core PRIVATE ${LUASOCKET_LIBRARIES}) + +add_definitions( + "-DLUASOCKET_API=__declspec(dllexport)" + "-DMIME_API=__declspec(dllexport)") + +install(TARGETS socket.core + RUNTIME DESTINATION bin/socket + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + +install(TARGETS mime.core + RUNTIME DESTINATION bin/mime + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + +install(FILES + src/ltn12.lua + src/socket.lua + src/mime.lua + DESTINATION share/lua) + +install(FILES + src/http.lua + src/url.lua + src/tp.lua + src/ftp.lua + src/headers.lua + src/smtp.lua + DESTINATION share/lua/socket) diff --git a/externals/vcpkg/ports/luasocket/portfile.cmake b/externals/vcpkg/ports/luasocket/portfile.cmake new file mode 100755 index 000000000..a951dcdad --- /dev/null +++ b/externals/vcpkg/ports/luasocket/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lunarmodules/luasocket + REF v3.0.0 + SHA512 4f93d6c0b602333df50ee4f939cd0419243f6de333472ffebf99334e301143e8cdee3bc1655c29f81608622d6e7850a9bcf6929a6d4748210a70cdb8218a1ec6 + HEAD_REF master) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +# Remove debug share +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/luasocket") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/luasocket/LICENSE" "${CURRENT_PACKAGES_DIR}/share/luasocket/copyright") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") +# Handle socket dll name + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.dll" "${CURRENT_PACKAGES_DIR}/bin/socket/core.dll") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/socket/core.pdb") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.dll") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.pdb") + +# Handle mime dll name + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.dll" "${CURRENT_PACKAGES_DIR}/bin/mime/core.dll") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/mime/core.pdb") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.dll") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.pdb") +endif() + +# Allow empty include directory +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/externals/vcpkg/ports/luasocket/vcpkg.json b/externals/vcpkg/ports/luasocket/vcpkg.json new file mode 100755 index 000000000..269310c79 --- /dev/null +++ b/externals/vcpkg/ports/luasocket/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "luasocket", + "version": "3.0.0", + "description": "LuaSocket is a Lua extension library that is composed by two parts: a C core that provides support for the TCP and UDP transport layers, and a set of Lua modules that add support for functionality commonly needed by applications that deal with the Internet.", + "homepage": "https://lunarmodules.github.io/luasocket/", + "license": "MIT", + "supports": "windows", + "dependencies": [ + "lua", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/lunasvg/fix-install.patch b/externals/vcpkg/ports/lunasvg/fix-install.patch new file mode 100755 index 000000000..73b634875 --- /dev/null +++ b/externals/vcpkg/ports/lunasvg/fix-install.patch @@ -0,0 +1,26 @@ + CMakeLists.txt | 15 ++------------- + 1 file changed, 2 insertions(+), 13 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9916c67..159f3a6 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,16 +24,5 @@ if(LUNASVG_BUILD_EXAMPLES) + add_subdirectory(example) + endif() + +-set(LUNASVG_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib) +-set(LUNASVG_INCDIR ${CMAKE_INSTALL_PREFIX}/include) +- +-install(FILES +- include/lunasvg.h +- DESTINATION ${LUNASVG_INCDIR} +-) +- +-install(TARGETS lunasvg +- LIBRARY DESTINATION ${LUNASVG_LIBDIR} +- ARCHIVE DESTINATION ${LUNASVG_LIBDIR} +- INCLUDES DESTINATION ${LUNASVG_INCDIR} +-) ++set_target_properties(lunasvg PROPERTIES PUBLIC_HEADER "include/lunasvg.h") ++install(TARGETS lunasvg RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include) diff --git a/externals/vcpkg/ports/lunasvg/portfile.cmake b/externals/vcpkg/ports/lunasvg/portfile.cmake new file mode 100755 index 000000000..9b40c5842 --- /dev/null +++ b/externals/vcpkg/ports/lunasvg/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sammycage/lunasvg + REF e612abda858b53160041381a23422cd2b4f42fbd #2.3.1 + SHA512 44f5d013d918cb5af90114a12857bdd2c204caff761516ef98b12b08d8b6215e91f6d963c281500c386f287b9d0ecd5b3d986d4c8c33423c0c34d539d744e09d + HEAD_REF master + PATCHES + fix-install.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DLUNASVG_BUILD_EXAMPLES=OFF + -DBUILD_SHARED_LIBS=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/lunasvg/vcpkg.json b/externals/vcpkg/ports/lunasvg/vcpkg.json new file mode 100755 index 000000000..df3d8aaa0 --- /dev/null +++ b/externals/vcpkg/ports/lunasvg/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "lunasvg", + "version": "2.3.1", + "description": "lunasvg is a standalone SVG rendering library in C++", + "homepage": "https://github.com/sammycage/lunasvg", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/lv2/CMakeLists.txt b/externals/vcpkg/ports/lv2/CMakeLists.txt new file mode 100755 index 000000000..a1d3d13cc --- /dev/null +++ b/externals/vcpkg/ports/lv2/CMakeLists.txt @@ -0,0 +1,35 @@ +cmake_minimum_required(VERSION 3.17) +project(lv2 NONE) + +add_library(lv2 INTERFACE) + +install( + TARGETS lv2 + EXPORT lv2-config + INCLUDES DESTINATION include +) + +install( + DIRECTORY lv2 + DESTINATION include + FILES_MATCHING PATTERN "*.h" +) +install(FILES lv2/core/lv2.h DESTINATION include) + +# Install headers to old URI-style paths, using mapping from wscript +file(READ wscript WSCRIPT) +string(REGEX MATCHALL "'[^']+' *: *'lv2/[^']+'" SPEC_MAP "${WSCRIPT}") +foreach(PAIR ${SPEC_MAP}) + string(REGEX MATCH "'([^']+)' *: *'([^']+)'" _ "${PAIR}") + install( + DIRECTORY "lv2/${CMAKE_MATCH_1}/" + DESTINATION "include/${CMAKE_MATCH_2}" + FILES_MATCHING PATTERN "*.h" + ) +endforeach() + +install( + EXPORT lv2-config + NAMESPACE lv2:: + DESTINATION share/lv2 +) diff --git a/externals/vcpkg/ports/lv2/portfile.cmake b/externals/vcpkg/ports/lv2/portfile.cmake new file mode 100755 index 000000000..1c4e8640d --- /dev/null +++ b/externals/vcpkg/ports/lv2/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lv2/lv2 + REF cd152104c84bcee9fec22ef780cec2af7ba85d0c #v1.18.2 + SHA512 77220524481e97222b12782a89efdcfcb73ee6ac9b9aac88741475c60a2c21049153297860a24b77c0ebd4de32d38a38232ba4fc64d12b8558a56ef50b316801 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file( + INSTALL "${SOURCE_PATH}/COPYING" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/externals/vcpkg/ports/lv2/vcpkg.json b/externals/vcpkg/ports/lv2/vcpkg.json new file mode 100755 index 000000000..8d0b0cda3 --- /dev/null +++ b/externals/vcpkg/ports/lv2/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "lv2", + "version-semver": "1.18.2", + "port-version": 1, + "description": "LV2 is a plugin standard for audio systems. It defines a minimal yet extensible C API for plugin code and a format for plugin \"bundles\".", + "homepage": "https://lv2plug.in", + "license": "ISC", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/lz4/CMakeLists.txt b/externals/vcpkg/ports/lz4/CMakeLists.txt new file mode 100755 index 000000000..142a22900 --- /dev/null +++ b/externals/vcpkg/ports/lz4/CMakeLists.txt @@ -0,0 +1,57 @@ +cmake_minimum_required(VERSION 3.0) +project(lz4 C) + +if(MSVC AND BUILD_SHARED_LIBS) + add_definitions(-DLZ4_DLL_EXPORT) +endif() +add_definitions(-DXXH_NAMESPACE=LZ4_) + +set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "Install prefix") +set(INSTALL_BIN_DIR "bin" CACHE PATH "Path where exe and dll will be installed") +set(INSTALL_LIB_DIR "lib" CACHE PATH "Path where lib will be installed") +set(INSTALL_INCLUDE_DIR "include" CACHE PATH "Path where headers will be installed") +set(INSTALL_CMAKE_DIR "share/lz4" CACHE PATH "Path where cmake configs will be installed") + +file(GLOB LZ4_HEADERS lib/*.h) + +add_library(lz4 + ${LZ4_HEADERS} + lib/lz4.c + lib/lz4frame.c + lib/lz4hc.c + lib/xxhash.c +) + +target_include_directories(lz4 PUBLIC $ $) +set_target_properties(lz4 PROPERTIES PUBLIC_HEADER ${LZ4_HEADERS}) + +install(TARGETS lz4 + EXPORT lz4Config + RUNTIME DESTINATION "${INSTALL_BIN_DIR}" + ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" + LIBRARY DESTINATION "${INSTALL_LIB_DIR}" + PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}" + PRIVATE_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}" + COMPONENT dev +) + +FILE(GLOB lz4h "${CMAKE_CURRENT_LIST_DIR}/lib/*.h") +list(REMOVE_ITEM lz4h "${CMAKE_CURRENT_LIST_DIR}/lib/xxhash.h") +INSTALL(FILES ${lz4h} DESTINATION "${INSTALL_INCLUDE_DIR}") + +install(EXPORT lz4Config + FILE lz4-config.cmake + NAMESPACE lz4:: + DESTINATION "${INSTALL_CMAKE_DIR}" +) + +# Export the package for use from the build-tree (this registers the build-tree with a global CMake-registry) +export(PACKAGE lz4) + +# Create pkgconfig module file +file(STRINGS "lib/lz4.h" LZ4_H REGEX "^#define LZ4_VERSION_(MAJOR|MINOR|RELEASE) ") +string(REGEX REPLACE "^.*MAJOR +([0-9]+).*MINOR +([0-9]+).*RELEASE +([0-9]+).*$" "\\1.\\2.\\3" VERSION "${LZ4_H}") +set(INCLUDEDIR [[${prefix}/include]]) +set(LIBDIR [[${prefix}/lib]]) +configure_file(lib/liblz4.pc.in lib/liblz4.pc) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lib/liblz4.pc" DESTINATION "lib/pkgconfig") diff --git a/externals/vcpkg/ports/lz4/portfile.cmake b/externals/vcpkg/ports/lz4/portfile.cmake new file mode 100755 index 000000000..80bcecc38 --- /dev/null +++ b/externals/vcpkg/ports/lz4/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lz4/lz4 + REF v1.9.3 + SHA512 c246b0bda881ee9399fa1be490fa39f43b291bb1d9db72dba8a85db1a50aad416a97e9b300eee3d2a4203c2bd88bda2762e81bc229c3aa409ad217eb306a454c + HEAD_REF dev +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DCMAKE_DEBUG_POSTFIX=d +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(DLL_IMPORT "1 && defined(_MSC_VER)") +else() + set(DLL_IMPORT "0") +endif() +foreach(FILE lz4.h lz4frame.h) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/${FILE}" + "defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT==1)" + "${DLL_IMPORT}" + ) +endforeach() + +vcpkg_cmake_config_fixup() +vcpkg_fixup_pkgconfig() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/liblz4.pc" " -llz4" " -llz4d") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/lib/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/lz4/vcpkg.json b/externals/vcpkg/ports/lz4/vcpkg.json new file mode 100755 index 000000000..5167b44ad --- /dev/null +++ b/externals/vcpkg/ports/lz4/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "lz4", + "version": "1.9.3", + "port-version": 3, + "description": "Lossless compression algorithm, providing compression speed at 400 MB/s per core.", + "homepage": "https://github.com/lz4/lz4", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/lzfse/disable-cli-option.patch b/externals/vcpkg/ports/lzfse/disable-cli-option.patch new file mode 100755 index 000000000..260b7a2be --- /dev/null +++ b/externals/vcpkg/ports/lzfse/disable-cli-option.patch @@ -0,0 +1,51 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 336a68d..96a2a74 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -67,18 +67,20 @@ add_library(lzfse + src/lzvn_encode_base.c) + lzfse_add_compiler_flags(lzfse -Wall -Wno-unknown-pragmas -Wno-unused-variable) + +-add_executable(lzfse_cli +- src/lzfse_main.c) +-target_link_libraries(lzfse_cli lzfse) +-set_target_properties(lzfse_cli PROPERTIES OUTPUT_NAME lzfse) +-lzfse_add_compiler_flags(lzfse_cli -Wall -Wno-unknown-pragmas -Wno-unused-variable) +- +-if(CMAKE_VERSION VERSION_LESS 3.1 OR CMAKE_C_COMPLIER_ID STREQUAL "Intel") +- lzfse_add_compiler_flags(lzfse -std=c99) +- lzfse_add_compiler_flags(lzfse_cli -std=c99) +-else() +- set_property(TARGET lzfse PROPERTY C_STANDARD 99) +- set_property(TARGET lzfse_cli PROPERTY C_STANDARD 99) ++if(NOT LZFSE_DISABLE_CLI) ++ add_executable(lzfse_cli ++ src/lzfse_main.c) ++ target_link_libraries(lzfse_cli lzfse) ++ set_target_properties(lzfse_cli PROPERTIES OUTPUT_NAME lzfse) ++ lzfse_add_compiler_flags(lzfse_cli -Wall -Wno-unknown-pragmas -Wno-unused-variable) ++ ++ if(CMAKE_VERSION VERSION_LESS 3.1 OR CMAKE_C_COMPLIER_ID STREQUAL "Intel") ++ lzfse_add_compiler_flags(lzfse -std=c99) ++ lzfse_add_compiler_flags(lzfse_cli -std=c99) ++ else() ++ set_property(TARGET lzfse PROPERTY C_STANDARD 99) ++ set_property(TARGET lzfse_cli PROPERTY C_STANDARD 99) ++ endif() + endif() + + set_target_properties(lzfse PROPERTIES +@@ -95,7 +97,12 @@ endif() + if(NOT LZFSE_BUNDLE_MODE) + include(GNUInstallDirs) + +- install(TARGETS lzfse lzfse_cli ++ if(NOT LZFSE_DISABLE_CLI) ++ install(TARGETS lzfse_cli ++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") ++ endif() ++ ++ install(TARGETS lzfse + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") diff --git a/externals/vcpkg/ports/lzfse/portfile.cmake b/externals/vcpkg/ports/lzfse/portfile.cmake new file mode 100755 index 000000000..9ce60eeeb --- /dev/null +++ b/externals/vcpkg/ports/lzfse/portfile.cmake @@ -0,0 +1,36 @@ +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + message(FATAL_ERROR "ARM build not supported") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lzfse/lzfse + REF lzfse-1.0 + SHA512 9d7ca44e6d3d2bdf4b82b0eb66c14922369b8b6fe2cf891187a77c6708b8d26c2c1b2ccddec6059e85dbbbb37c497419549f02812b5f34d06238ac246a8cf912 + HEAD_REF master + PATCHES + disable-cli-option.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DLZFSE_DISABLE_TESTS=ON + -DLZFSE_DISABLE_CLI=ON) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(READ ${CURRENT_PACKAGES_DIR}/include/lzfse.h LZFSE_H) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + string(REPLACE "defined(LZFSE_DLL)" "1" LZFSE_H "${LZFSE_H}") +else() + string(REPLACE "defined(LZFSE_DLL)" "0" LZFSE_H "${LZFSE_H}") +endif() +file(WRITE ${CURRENT_PACKAGES_DIR}/include/lzfse.h "${LZFSE_H}") + +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/lzfse) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/lzfse/LICENSE ${CURRENT_PACKAGES_DIR}/share/lzfse/copyright) diff --git a/externals/vcpkg/ports/lzfse/vcpkg.json b/externals/vcpkg/ports/lzfse/vcpkg.json new file mode 100755 index 000000000..774da1302 --- /dev/null +++ b/externals/vcpkg/ports/lzfse/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "lzfse", + "version-string": "1.0", + "port-version": 3, + "description": "Lempel-Ziv style data compressor using Finite State Entropy coding.", + "homepage": "https://github.com/lzfse/lzfse", + "supports": "!arm" +} diff --git a/externals/vcpkg/ports/lzo/always_install_pc.patch b/externals/vcpkg/ports/lzo/always_install_pc.patch new file mode 100755 index 000000000..6750eb681 --- /dev/null +++ b/externals/vcpkg/ports/lzo/always_install_pc.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 98c0a1ad0..85690209c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -290,7 +290,7 @@ if(1) + install(TARGETS ${f} DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/lzo/examples") + endif() + +-if(PKG_CONFIG_FOUND) ++if(1) + configure_file(lzo2.pc.cmakein lzo2.pc @ONLY) + #if(EXISTS "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lzo2.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") diff --git a/externals/vcpkg/ports/lzo/portfile.cmake b/externals/vcpkg/ports/lzo/portfile.cmake new file mode 100755 index 000000000..514c8555a --- /dev/null +++ b/externals/vcpkg/ports/lzo/portfile.cmake @@ -0,0 +1,46 @@ +vcpkg_download_distfile(ARCHIVE + URLS "http://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz" + FILENAME "lzo-2.10.tar.gz" + SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES always_install_pc.patch +) + +set(LZO_STATIC OFF) +set(LZO_SHARED OFF) +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(LZO_STATIC ON) +else() + set(LZO_SHARED ON) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DENABLE_STATIC=${LZO_STATIC} + -DENABLE_SHARED=${LZO_SHARED} +) + +vcpkg_install_cmake() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/libexec) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/libexec) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(READ ${CURRENT_PACKAGES_DIR}/include/lzo/lzoconf.h LZO_CONFIG) + string(REPLACE "# define __LZO_EXPORT1 /*empty*/" + "# define __LZO_EXPORT1 __declspec(dllimport)" LZO_CONFIG "${LZO_CONFIG}") + file(WRITE ${CURRENT_PACKAGES_DIR}/include/lzo/lzoconf.h "${LZO_CONFIG}") +endif() + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/lzo/vcpkg.json b/externals/vcpkg/ports/lzo/vcpkg.json new file mode 100755 index 000000000..0e238c825 --- /dev/null +++ b/externals/vcpkg/ports/lzo/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "lzo", + "version-string": "2.10", + "port-version": 7, + "description": "Lossless data compression library", + "homepage": "https://www.oberhumer.com/opensource/lzo/" +} diff --git a/externals/vcpkg/ports/lzokay/portfile.cmake b/externals/vcpkg/ports/lzokay/portfile.cmake new file mode 100755 index 000000000..719c63d97 --- /dev/null +++ b/externals/vcpkg/ports/lzokay/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jackoalan/lzokay + REF 546a9695271e8a8b4711383f828172754fd825f2 + SHA512 b4e96183ea52dc5ba0d88b4b9b27baa2c3e2c540b1bfd50cf7a3c2569337fbe9d73dd9939cb456d5f7459df8e10d84677d40ee33f7d524f0f5f8a723d7a70583 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/lzokay/vcpkg.json b/externals/vcpkg/ports/lzokay/vcpkg.json new file mode 100755 index 000000000..fb2b0787a --- /dev/null +++ b/externals/vcpkg/ports/lzokay/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "lzokay", + "version-string": "2020-07-30", + "description": "lzokay – MIT licensed C++ implementation of LZO compression/decompression algorithm", + "homepage": "https://github.com/jackoalan/lzokay" +} diff --git a/externals/vcpkg/ports/magic-enum/portfile.cmake b/externals/vcpkg/ports/magic-enum/portfile.cmake new file mode 100755 index 000000000..271089074 --- /dev/null +++ b/externals/vcpkg/ports/magic-enum/portfile.cmake @@ -0,0 +1,27 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Neargye/magic_enum + REF v0.8.0 + SHA512 097260c234a1b716d26b537cd80a8d3eca255422e8dce46183708a27b1d4ad1d81c6be05f1b7d300db3362eafa243cccc39c9d12f1bcbfdb0d7755701a222808 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DMAGIC_ENUM_OPT_ENABLE_NONASCII=OFF + -DMAGIC_ENUM_OPT_BUILD_EXAMPLES=OFF + -DMAGIC_ENUM_OPT_BUILD_TESTS=OFF + -DMAGIC_ENUM_OPT_INSTALL=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/magic_enum PACKAGE_NAME magic_enum) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +# Handle copyright +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/magic-enum/vcpkg.json b/externals/vcpkg/ports/magic-enum/vcpkg.json new file mode 100755 index 000000000..642141ff7 --- /dev/null +++ b/externals/vcpkg/ports/magic-enum/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "magic-enum", + "version": "0.8.0", + "description": "Header-only C++17 library provides static reflection for enums, work with any enum type without any macro or boilerplate code.", + "homepage": "https://github.com/Neargye/magic_enum", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/magic-get/portfile.cmake b/externals/vcpkg/ports/magic-get/portfile.cmake new file mode 100755 index 000000000..065116c27 --- /dev/null +++ b/externals/vcpkg/ports/magic-get/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/magic-get/vcpkg.json b/externals/vcpkg/ports/magic-get/vcpkg.json new file mode 100755 index 000000000..bb803ad76 --- /dev/null +++ b/externals/vcpkg/ports/magic-get/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "magic-get", + "version-string": "2019-09-02", + "port-version": 2, + "description": "Deprecated boost-pfr port.", + "homepage": "https://github.com/apolukhin/magic_get", + "dependencies": [ + "boost-pfr" + ] +} diff --git a/externals/vcpkg/ports/magnum-extras/portfile.cmake b/externals/vcpkg/ports/magnum-extras/portfile.cmake new file mode 100755 index 000000000..eda78782e --- /dev/null +++ b/externals/vcpkg/ports/magnum-extras/portfile.cmake @@ -0,0 +1,73 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mosra/magnum-extras + REF v2020.06 + SHA512 7419af84a6de72f666a9bd12a325c4b40f9e2a25fec3d0b22c348faab0a402b62fa782231b9b12180d84f4ab2508b02df25a97713948bdd2f21c9e8cb831fa25 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) + +# Handle features +set(_COMPONENT_FLAGS "") +foreach(_feature IN LISTS ALL_FEATURES) + # Uppercase the feature name and replace "-" with "_" + string(TOUPPER "${_feature}" _FEATURE) + string(REPLACE "-" "_" _FEATURE "${_FEATURE}") + + # Turn "-DWITH_*=" ON or OFF depending on whether the feature + # is in the list. + if(_feature IN_LIST FEATURES) + list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=ON") + else() + list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=OFF") + endif() +endforeach() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA # Disable this option if project cannot be built with Ninja + OPTIONS + ${_COMPONENT_FLAGS} + -DBUILD_STATIC=${BUILD_STATIC} + -DMAGNUM_PLUGINS_DEBUG_DIR=${CURRENT_INSTALLED_DIR}/debug/bin/magnum-d + -DMAGNUM_PLUGINS_RELEASE_DIR=${CURRENT_INSTALLED_DIR}/bin/magnum +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/MagnumExtras TARGET_PATH share/magnumextras) + +# Messages to the user +if("ui" IN_LIST FEATURES) + message(WARNING "It is recommended to install one of magnum-plugins[freetypefont,harfbuzzfont,stbtruetypefont] to have the UI library working out of the box") +endif() + +# Debug includes and share are the same as release +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share +) + +# Clean up empty directories +if("${FEATURES}" STREQUAL "core") + file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/bin + ${CURRENT_PACKAGES_DIR}/lib + ${CURRENT_PACKAGES_DIR}/debug + ) + set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright) + + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/magnum-extras/vcpkg.json b/externals/vcpkg/ports/magnum-extras/vcpkg.json new file mode 100755 index 000000000..8ed9aa296 --- /dev/null +++ b/externals/vcpkg/ports/magnum-extras/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "magnum-extras", + "version-string": "2020.06", + "port-version": 1, + "description": "Extras for magnum, C++11/C++14 graphics middleware for games and data visualization", + "homepage": "https://magnum.graphics/", + "dependencies": [ + { + "name": "magnum", + "default-features": false + } + ], + "features": { + "ui": { + "description": "Ui library", + "dependencies": [ + { + "name": "corrade", + "features": [ + "interconnect" + ] + }, + { + "name": "magnum", + "features": [ + "text" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/magnum-integration/portfile.cmake b/externals/vcpkg/ports/magnum-integration/portfile.cmake new file mode 100755 index 000000000..66295137f --- /dev/null +++ b/externals/vcpkg/ports/magnum-integration/portfile.cmake @@ -0,0 +1,65 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mosra/magnum-integration + REF v2020.06 + SHA512 0b615acdb49ed55bd678a5fb019b1a8ccf522084f3114b2b8dd7e121c27d39ae2aab2879a2e2fa8b083163be711a86f64202fcf380413dec0c705fffd7d649c5 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) + +# Handle features +set(_COMPONENT_FLAGS "") +foreach(_feature IN LISTS ALL_FEATURES) + # Uppercase the feature name and replace "-" with "_" + string(TOUPPER "${_feature}" _FEATURE) + string(REPLACE "-" "_" _FEATURE "${_FEATURE}") + + # Turn "-DWITH_*=" ON or OFF depending on whether the feature + # is in the list. + if(_feature IN_LIST FEATURES) + list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=ON") + else() + list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=OFF") + endif() +endforeach() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA # Disable this option if project cannot be built with Ninja + OPTIONS + ${_COMPONENT_FLAGS} + -DBUILD_STATIC=${BUILD_STATIC} + -DMAGNUM_PLUGINS_DEBUG_DIR=${CURRENT_INSTALLED_DIR}/debug/bin/magnum-d + -DMAGNUM_PLUGINS_RELEASE_DIR=${CURRENT_INSTALLED_DIR}/bin/magnum +) + +vcpkg_install_cmake() + +# Debug includes and share are the same as release +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share +) + +# Clean up empty directories +if("${FEATURES}" STREQUAL "core") + file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/bin + ${CURRENT_PACKAGES_DIR}/lib + ${CURRENT_PACKAGES_DIR}/debug + ) + set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/magnum-integration/vcpkg.json b/externals/vcpkg/ports/magnum-integration/vcpkg.json new file mode 100755 index 000000000..9d50cd69d --- /dev/null +++ b/externals/vcpkg/ports/magnum-integration/vcpkg.json @@ -0,0 +1,39 @@ +{ + "name": "magnum-integration", + "version-string": "2020.06", + "port-version": 1, + "description": "Integrations for magnum, C++11/C++14 graphics middleware for games and data visualization", + "homepage": "https://magnum.graphics/", + "dependencies": [ + { + "name": "magnum", + "default-features": false + } + ], + "features": { + "bullet": { + "description": "BulletIntegration library", + "dependencies": [ + "bullet3" + ] + }, + "eigen": { + "description": "EigenIntegration library", + "dependencies": [ + "eigen3" + ] + }, + "glm": { + "description": "GlmIntegration library", + "dependencies": [ + "glm" + ] + }, + "imgui": { + "description": "ImGuiIntegration library", + "dependencies": [ + "imgui" + ] + } + } +} diff --git a/externals/vcpkg/ports/magnum-plugins/002-fix-stb-conflict.patch b/externals/vcpkg/ports/magnum-plugins/002-fix-stb-conflict.patch new file mode 100755 index 000000000..13d535b32 --- /dev/null +++ b/externals/vcpkg/ports/magnum-plugins/002-fix-stb-conflict.patch @@ -0,0 +1,13 @@ +diff --git a/src/MagnumPlugins/StbImageImporter/StbImageImporter.cpp b/src/MagnumPlugins/StbImageImporter/StbImageImporter.cpp +index c24a968..1a38162 100644 +--- a/src/MagnumPlugins/StbImageImporter/StbImageImporter.cpp ++++ b/src/MagnumPlugins/StbImageImporter/StbImageImporter.cpp +@@ -45,7 +45,7 @@ + #endif + + /* Not defining malloc/free, because there's no equivalent for realloc in C++ */ +-#include "stb_image.h" ++#include "external/stb/stb_image.h" + + namespace Magnum { namespace Trade { + diff --git a/externals/vcpkg/ports/magnum-plugins/portfile.cmake b/externals/vcpkg/ports/magnum-plugins/portfile.cmake new file mode 100755 index 000000000..6f784552b --- /dev/null +++ b/externals/vcpkg/ports/magnum-plugins/portfile.cmake @@ -0,0 +1,134 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mosra/magnum-plugins + REF v2020.06 + SHA512 3c11c2928bfc9d04c1ad64f72b6ffac6cf80a1ef3aacc5d0486b9ad955cf4f6ea6d5dcb3846dc5d73f64ec522a015eafb997f62c79ad7ff91169702341f23af0 + HEAD_REF master + PATCHES + 002-fix-stb-conflict.patch +) + +if("basisimporter" IN_LIST FEATURES OR "basisimageconverter" IN_LIST FEATURES) + # Bundle Basis Universal. The repo has big unrequired files in its + # history, so we're downloading just a snapshot instead of a git clone. + if(VCPKG_USE_HEAD_VERSION) + # v1_15_update2 + set(_BASIS_VERSION "v1_15_update2") + set(_BASIS_SHA512 "a898a057b57ac64f6c0bf5fce0b599e23421ccdd015ea7bb668bce8b9292ef55b098f3d05854a2fb5363959932b75cd0a842664ae7d4f71f3537dc11301c1b32") + else() + # A commit that's before the UASTC support (which is not implemented yet) + vcpkg_download_distfile( + _BASIS_UNIVERSAL_PATCHES + URLS "https://github.com/BinomialLLC/basis_universal/commit/e9c55faac7745ebf38d08cd3b4f71aaf542f8191.diff" + FILENAME "e9c55faac7745ebf38d08cd3b4f71aaf542f8191.patch" + SHA512 e5dda11de2ba8cfd39728e69c74a7656bb522e509786fe5673c94b26be9bd4bee897510096479ee6323f5276d34cba1c44c60804a515c0b35ff7b6ac9d625b88 + ) + set(_BASIS_VERSION "8565af680d1bd2ad56ab227ca7d96c56dfbe93ed") + set(_BASIS_SHA512 "65062ab3ba675c46760f56475a7528189ed4097fb9bab8316e25d9e23ffec2a9560eb9a6897468baf2a6ab2bd698b5907283e96deaeaef178085a47f9d371bb2") + endif() + vcpkg_download_distfile( + _BASIS_UNIVERSAL_ARCHIVE + URLS "https://github.com/BinomialLLC/basis_universal/archive/${_BASIS_VERSION}.tar.gz" + FILENAME "basis-universal-${_BASIS_VERSION}.tar.gz" + SHA512 ${_BASIS_SHA512} + ) + vcpkg_extract_source_archive( + _BASIS_UNIVERSAL_SOURCE + ARCHIVE ${_BASIS_UNIVERSAL_ARCHIVE} + WORKING_DIRECTORY "${SOURCE_PATH}/src/external" + PATCHES + ${_BASIS_UNIVERSAL_PATCHES}) + # Remove potentially cached directory which would cause renaming to fail + file(REMOVE_RECURSE "${SOURCE_PATH}/src/external/basis-universal") + # Rename the output folder so that magnum auto-detects it + file(RENAME ${_BASIS_UNIVERSAL_SOURCE} "${SOURCE_PATH}/src/external/basis-universal") +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(BUILD_PLUGINS_STATIC 1) +else() + set(BUILD_PLUGINS_STATIC 0) +endif() + +# Head only features +set(ALL_SUPPORTED_FEATURES ${ALL_FEATURES}) +if(NOT VCPKG_USE_HEAD_VERSION) + list(REMOVE_ITEM ALL_SUPPORTED_FEATURES cgltfimporter glslangshaderconverter + ktximageconverter ktximporter openexrimageconverter openexrimporter + spirvtoolsshaderconverter stbdxtimageconverter) + message(WARNING "Features cgltfimporter, glslangshaderconverter, ktximageconverter, ktximporter, openexrimageconverter, openexrimporter, spirvtoolsshaderconverter and stbdxtimageconverter are not available when building non-head version.") +endif() + +set(_COMPONENTS "") +# Generate cmake parameters from feature names +foreach(_feature IN LISTS ALL_SUPPORTED_FEATURES) + # Uppercase the feature name and replace "-" with "_" + string(TOUPPER "${_feature}" _FEATURE) + string(REPLACE "-" "_" _FEATURE "${_FEATURE}") + + # Final feature is empty, ignore it + if(_feature) + list(APPEND _COMPONENTS ${_feature} WITH_${_FEATURE}) + endif() +endforeach() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS}) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} + -DBUILD_STATIC=${BUILD_PLUGINS_STATIC} + -DBUILD_PLUGINS_STATIC=${BUILD_PLUGINS_STATIC} + -DMAGNUM_PLUGINS_DEBUG_DIR=${CURRENT_INSTALLED_DIR}/debug/bin/magnum-d + -DMAGNUM_PLUGINS_RELEASE_DIR=${CURRENT_INSTALLED_DIR}/bin/magnum +) + +vcpkg_cmake_install() + +# Debug includes and share are the same as release +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share) + +# Clean up empty directories, if not building anything. +# FEATURES may only contain "core", but that does not build anything. +if(NOT FEATURES OR FEATURES STREQUAL "core") + file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/bin + ${CURRENT_PACKAGES_DIR}/lib + ${CURRENT_PACKAGES_DIR}/debug) + set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) + # move plugin libs to conventional place + file(GLOB_RECURSE LIB_TO_MOVE ${CURRENT_PACKAGES_DIR}/lib/magnum/*) + file(COPY ${LIB_TO_MOVE} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/magnum) + file(GLOB_RECURSE LIB_TO_MOVE_DBG ${CURRENT_PACKAGES_DIR}/debug/lib/magnum/*) + file(COPY ${LIB_TO_MOVE_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/magnum) +else() + set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + # On windows, plugins are "Modules" that cannot be linked as shared + # libraries, but are meant to be loaded at runtime. + # While this is handled adequately through the CMake project, the auto-magic + # linking with visual studio might try to link the import libs anyway. + # + # We delete the import libraries here to avoid the auto-magic linking + # for plugins which are loaded at runtime. + if(WIN32) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/magnum) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d) + endif() +endif() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/magnum-plugins/vcpkg.json b/externals/vcpkg/ports/magnum-plugins/vcpkg.json new file mode 100755 index 000000000..d6ba4d9ae --- /dev/null +++ b/externals/vcpkg/ports/magnum-plugins/vcpkg.json @@ -0,0 +1,494 @@ +{ + "name": "magnum-plugins", + "version-string": "2020.06", + "port-version": 8, + "description": "Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization", + "homepage": "https://magnum.graphics/", + "dependencies": [ + { + "name": "magnum", + "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + } + ], + "default-features": [ + "cgltfimporter", + "ddsimporter", + "icoimporter", + "ktximageconverter", + "ktximporter", + "miniexrimageconverter", + "opengeximporter", + "stanfordimporter", + "stanfordsceneconverter", + "stbimageconverter", + "stbimageimporter", + "stlimporter" + ], + "features": { + "assimpimporter": { + "description": "AssimpImporter plugin", + "dependencies": [ + "assimp", + { + "name": "magnum", + "default-features": false, + "features": [ + "anyimageimporter" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "basisimageconverter": { + "description": "BasisImageConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + }, + "zstd" + ] + }, + "basisimporter": { + "description": "BasisImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + }, + "zstd" + ] + }, + "cgltfimporter": { + "description": "CgltfImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "anyimageimporter" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "ddsimporter": { + "description": "DdsImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "devilimageimporter": { + "description": "DevIlImageImporter plugin", + "dependencies": [ + "devil", + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "drflacaudioimporter": { + "description": "DrFlacAudioImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "audio" + ] + } + ] + }, + "drmp3audioimporter": { + "description": "DrMp3AudioImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "audio" + ] + } + ] + }, + "drwavaudioimporter": { + "description": "DrWavAudioImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "audio" + ] + } + ] + }, + "freetypefont": { + "description": "FreeTypeFont plugin", + "dependencies": [ + "freetype", + { + "name": "magnum", + "default-features": false, + "features": [ + "text" + ] + } + ] + }, + "glslangshaderconverter": { + "description": "GlslangShaderConverter plugin", + "dependencies": [ + "glslang", + { + "name": "magnum", + "default-features": false, + "features": [ + "shadertools" + ] + } + ] + }, + "harfbuzzfont": { + "description": "HarfBuzzFont plugin", + "dependencies": [ + "harfbuzz", + { + "name": "magnum-plugins", + "default-features": false, + "features": [ + "freetypefont" + ] + } + ] + }, + "icoimporter": { + "description": "IcoImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "jpegimageconverter": { + "description": "JpegImageConverter plugin", + "dependencies": [ + "libjpeg-turbo", + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "jpegimporter": { + "description": "JpegImporter plugin", + "dependencies": [ + "libjpeg-turbo", + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "ktximageconverter": { + "description": "KtxImageConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "ktximporter": { + "description": "KtxImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "meshoptimizersceneconverter": { + "description": "MeshOptimizerSceneConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + }, + "meshoptimizer" + ] + }, + "miniexrimageconverter": { + "description": "MiniExrImageConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "openddl": { + "description": "OpenDdl library" + }, + "openexrimageconverter": { + "description": "OpenExrImageConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + }, + "openexr" + ] + }, + "openexrimporter": { + "description": "OpenExrImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + }, + "openexr" + ] + }, + "opengeximporter": { + "description": "OpenGexImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "anyimageimporter" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + }, + { + "name": "magnum-plugins", + "default-features": false, + "features": [ + "openddl" + ] + } + ] + }, + "pngimageconverter": { + "description": "PngImageConverter plugin", + "dependencies": [ + "libpng", + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "pngimporter": { + "description": "PngImporter plugin", + "dependencies": [ + "libpng", + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "spirvtoolsshaderconverter": { + "description": "SpirvToolsShaderConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "shadertools" + ] + }, + "spirv-tools" + ] + }, + "stanfordimporter": { + "description": "StanfordImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "stanfordsceneconverter": { + "description": "StanfordSceneConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "stbdxtimageconverter": { + "description": "StbDxtImageConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "stbimageconverter": { + "description": "StbImageConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "stbimageimporter": { + "description": "StbImageImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "stbtruetypefont": { + "description": "StbTrueTypeFont plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "text" + ] + } + ] + }, + "stbvorbisaudioimporter": { + "description": "StbVorbisAudioImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "audio" + ] + } + ] + }, + "stlimporter": { + "description": "StlImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "tinygltfimporter": { + "description": "TinyGltfImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "anyimageimporter" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/magnum/002-sdl-includes.patch b/externals/vcpkg/ports/magnum/002-sdl-includes.patch new file mode 100755 index 000000000..fb2ffed8d --- /dev/null +++ b/externals/vcpkg/ports/magnum/002-sdl-includes.patch @@ -0,0 +1,43 @@ +diff --git a/src/Magnum/Platform/Sdl2Application.cpp b/src/Magnum/Platform/Sdl2Application.cpp +index 276c7ee55..90c52f3cb 100644 +--- a/src/Magnum/Platform/Sdl2Application.cpp ++++ b/src/Magnum/Platform/Sdl2Application.cpp +@@ -34,7 +34,7 @@ + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wpragma-pack" + #endif +-#include ++#include + #ifdef CORRADE_TARGET_CLANG_CL + #pragma clang diagnostic pop + #endif +diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h +index b2426d513..176729fdb 100644 +--- a/src/Magnum/Platform/Sdl2Application.h ++++ b/src/Magnum/Platform/Sdl2Application.h +@@ -57,11 +57,11 @@ + #pragma clang diagnostic ignored "-Wpragma-pack" + #endif + /* SDL.h includes the world, adding 50k LOC. We don't want that either. */ +-#include +-#include +-#include /* huh, why is this not pulled in implicitly?! */ +-#include +-#include ++#include ++#include ++#include /* huh, why is this not pulled in implicitly?! */ ++#include ++#include + + #ifdef CORRADE_TARGET_IOS + /* Including SDL_main.h unconditionally would mean it'd override Corrade::Main +@@ -74,7 +74,7 @@ + #endif + + #ifdef CORRADE_TARGET_WINDOWS_RT +-#include /* For SDL_WinRTRunApp */ ++#include /* For SDL_WinRTRunApp */ + #include /* For the WinMain entrypoint */ + #endif + #ifdef CORRADE_TARGET_CLANG_CL diff --git a/externals/vcpkg/ports/magnum/003-fix-FindGLFW.patch b/externals/vcpkg/ports/magnum/003-fix-FindGLFW.patch new file mode 100755 index 000000000..a6b9cdfb7 --- /dev/null +++ b/externals/vcpkg/ports/magnum/003-fix-FindGLFW.patch @@ -0,0 +1,16 @@ +diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake +index 8761448..17321af 100644 +--- a/modules/FindMagnum.cmake ++++ b/modules/FindMagnum.cmake +@@ -647,9 +647,9 @@ foreach(_component ${Magnum_FIND_COMPONENTS}) + + # GLFW application dependencies + elseif(_component STREQUAL GlfwApplication) +- find_package(GLFW) ++ find_package(glfw3 CONFIG REQUIRED) + set_property(TARGET Magnum::${_component} APPEND PROPERTY +- INTERFACE_LINK_LIBRARIES GLFW::GLFW) ++ INTERFACE_LINK_LIBRARIES glfw) + # Use the Foundation framework on Apple to query the DPI awareness + if(CORRADE_TARGET_APPLE) + find_library(_MAGNUM_APPLE_FOUNDATION_FRAMEWORK_LIBRARY Foundation) diff --git a/externals/vcpkg/ports/magnum/magnumdeploy.ps1 b/externals/vcpkg/ports/magnum/magnumdeploy.ps1 new file mode 100755 index 000000000..c32ed032b --- /dev/null +++ b/externals/vcpkg/ports/magnum/magnumdeploy.ps1 @@ -0,0 +1,40 @@ +# Magnum's plugin deployment strategy is that each Magnum module has a hardcoded +# set of plugin directories. Each of these directories is deployed in +# full if that Module is referenced. +# +# Note: this function signature and behavior is depended upon by applocal.ps1 +function deployPluginsIfMagnum([string]$targetBinaryDir, [string]$MagnumPluginsDir, [string]$targetBinaryName) { + Write-Verbose "Deploying magnum plugins" + + $baseDir = Split-Path $MagnumPluginsDir -parent + $pluginsBase = Split-Path $MagnumPluginsDir -Leaf + $binDir = "$baseDir\bin" + + function deployPlugins([string]$pluginSubdirName) { + if (Test-Path "$MagnumPluginsDir\$pluginSubdirName") { + Write-Verbose " Deploying plugins directory '$pluginSubdirName'" + New-Item "$targetBinaryDir\$pluginsBase\$pluginSubdirName" -ItemType Directory -ErrorAction SilentlyContinue | Out-Null + Get-ChildItem -Path "$MagnumPluginsDir\$pluginSubdirName\*" -Include "*.dll", "*.conf", "*.pdb" | % { + deployBinary "$targetBinaryDir\$pluginsBase\$pluginSubdirName" "$MagnumPluginsDir\$pluginSubdirName" $_.Name + resolve $_ + } + } else { + Write-Verbose " Skipping plugins directory '$pluginSubdirName': doesn't exist" + } + } + + # We detect Magnum modules in use via the DLLs that contain their + # plugin interfaces. + if ($targetBinaryName -like "MagnumAudio.dll" -or $targetBinaryName -like "MagnumAudio-d.dll") { + deployPlugins "audioimporters" + } elseif ($targetBinaryName -like "MagnumText.dll" -or $targetBinaryName -like "MagnumText-d.dll") { + deployPlugins "fonts" + deployPlugins "fontconverters" + } elseif ($targetBinaryName -like "MagnumTrade.dll" -or $targetBinaryName -like "MagnumTrade-d.dll") { + deployPlugins "importers" + deployPlugins "imageconverters" + deployPlugins "sceneconverters" + } elseif ($targetBinaryName -like "MagnumShaderTools.dll" -or $targetBinaryName -like "MagnumShaderTools-d.dll") { + deployPlugins "shaderconverters" + } +} diff --git a/externals/vcpkg/ports/magnum/portfile.cmake b/externals/vcpkg/ports/magnum/portfile.cmake new file mode 100755 index 000000000..e1dcd30e8 --- /dev/null +++ b/externals/vcpkg/ports/magnum/portfile.cmake @@ -0,0 +1,173 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mosra/magnum + REF v2020.06 + SHA512 65b0c8a4520d1d282420c30ecd7c8525525d4dbb6e562e1e2e93d110f4eb686af43f098bf02460727fab1e1f9446dd00a99051e150c05ea40b1486a44fea1042 + HEAD_REF master + PATCHES + 002-sdl-includes.patch + 003-fix-FindGLFW.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_PLUGINS_STATIC) + +# Remove platform-specific feature that are not available +# on current target platform from all features. + +# For documentation on VCPKG_CMAKE_SYSTEM_NAME see +# https://github.com/microsoft/vcpkg/blob/master/docs/users/triplets.md#vcpkg_cmake_system_name + +set(ALL_SUPPORTED_FEATURES ${ALL_FEATURES}) +# Windows Desktop +if(NOT "${VCPKG_CMAKE_SYSTEM_NAME}" STREQUAL "") + list(REMOVE_ITEM ALL_SUPPORTED_FEATURES wglcontext windowlesswglapplication) +endif() + +# Universal Windows Platform +if(NOT "${VCPKG_CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore") + # No UWP specific features +endif() + +# Mac OSX +if(NOT "${VCPKG_CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") + list(REMOVE_ITEM ALL_SUPPORTED_FEATURES cglcontext windowlesscglapplication) +endif() + +# Linux +if(NOT "${VCPKG_CMAKE_SYSTEM_NAME}" STREQUAL "Linux") + list(REMOVE_ITEM ALL_SUPPORTED_FEATURES glxcontext windowlessglxapplication) +endif() + +# WebAssembly / Linux +if(NOT "${VCPKG_CMAKE_SYSTEM_NAME}" MATCHES "(Emscripten|Linux)") + list(REMOVE_ITEM ALL_SUPPORTED_FEATURES eglcontext windowlesseglapplication) +endif() + +# Head only features +if(NOT VCPKG_USE_HEAD_VERSION) + list(REMOVE_ITEM ALL_SUPPORTED_FEATURES anyshaderconverter shadertools shaderconverter + vk-info) + message(WARNING "Features anyshaderconverter, shadertools, shaderconverter and vk-info are not avaliable when building non-head version.") +endif() + +set(_COMPONENTS "") +# Generate cmake parameters from feature names +foreach(_feature IN LISTS ALL_SUPPORTED_FEATURES) + # Uppercase the feature name and replace "-" with "_" + string(TOUPPER "${_feature}" _FEATURE) + string(REPLACE "-" "_" _FEATURE "${_FEATURE}") + + # Final feature is empty, ignore it + if(_feature) + list(APPEND _COMPONENTS ${_feature} WITH_${_FEATURE}) + endif() +endforeach() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS}) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DBUILD_STATIC=${BUILD_STATIC} + -DBUILD_PLUGINS_STATIC=${BUILD_PLUGINS_STATIC} + -DMAGNUM_PLUGINS_DEBUG_DIR=${CURRENT_INSTALLED_DIR}/debug/bin/magnum-d + -DMAGNUM_PLUGINS_RELEASE_DIR=${CURRENT_INSTALLED_DIR}/bin/magnum +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +# Copy tools into vcpkg's tools directory +set(_TOOL_EXEC_NAMES "") +set(_TOOLS + al-info + distancefieldconverter + fontconverter + gl-info + imageconverter + sceneconverter) +if(VCPKG_USE_HEAD_VERSION) +list(APPEND _TOOLS + shaderconverter + vk-info) +endif() +foreach(_tool IN LISTS _TOOLS) + if("${_tool}" IN_LIST FEATURES) + list(APPEND _TOOL_EXEC_NAMES magnum-${_tool}) + endif() +endforeach() +message(STATUS ${_TOOL_EXEC_NAMES}) +if(_TOOL_EXEC_NAMES) + vcpkg_copy_tools(TOOL_NAMES ${_TOOL_EXEC_NAMES} AUTO_CLEAN) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Special handling for plugins. +# +# For static plugins, in order to make MSBuild auto-linking magic work, where +# the linker implicitly takes everything from the root lib/ folder, the +# static libraries have to be moved out of lib/magnum/blah/ directly to lib/. +# Possibly would be enough to do this just for Windows, doing it also on other +# platforms for consistency. +# +# For dynamic plugins, auto-linking is not desirable as those are meant to be +# loaded dynamically at runtime instead. In order to prevent that, on Windows +# the *.lib files corresponding to the plugin *.dlls are removed. However, we +# cannot remove the *.lib files entirely here, as plugins from magnum-plugins +# are linked to them on Windows (e.g. AssimpImporter depends on +# AnyImageImporter). Thus the Any* plugin lib files are kept, but also not +# moved to the root lib/ folder, to prevent autolinking. A consequence of the +# *.lib file removal is that downstream projects can't implement Magnum plugins +# that would depend on (and thus link to) these, but that's considered a very +# rare use case and so it's fine. +# +# See https://github.com/microsoft/vcpkg/pull/1235#issuecomment-308805989 for +# futher info. +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + # move plugin libs to conventional place + file(GLOB_RECURSE LIB_TO_MOVE "${CURRENT_PACKAGES_DIR}/lib/magnum/*") + file(COPY ${LIB_TO_MOVE} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum") + + file(GLOB_RECURSE LIB_TO_MOVE_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/magnum/*") + file(COPY ${LIB_TO_MOVE_DBG} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/magnum") +else() + if(WIN32) + file(GLOB_RECURSE LIB_TO_REMOVE "${CURRENT_PACKAGES_DIR}/lib/magnum/*") + file(GLOB_RECURSE LIB_TO_KEEP "${CURRENT_PACKAGES_DIR}/lib/magnum/*Any*") + if(LIB_TO_KEEP) + list(REMOVE_ITEM LIB_TO_REMOVE ${LIB_TO_KEEP}) + endif() + if(LIB_TO_REMOVE) + file(REMOVE ${LIB_TO_REMOVE}) + endif() + + file(GLOB_RECURSE LIB_TO_REMOVE_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/*") + file(GLOB_RECURSE LIB_TO_KEEP_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/*Any*") + if(LIB_TO_KEEP_DBG) + list(REMOVE_ITEM LIB_TO_REMOVE_DBG ${LIB_TO_KEEP_DBG}) + endif() + if(LIB_TO_REMOVE_DBG) + file(REMOVE ${LIB_TO_REMOVE_DBG}) + endif() + + # fonts and fontconverters don't have Any* plugins + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum/fonts") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum/fontconverters") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/fonts") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/fontconverters") + endif() + + file(COPY "${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/bin/magnum") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/magnum-d") +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/magnum/vcpkg.json b/externals/vcpkg/ports/magnum/vcpkg.json new file mode 100755 index 000000000..43d3b8224 --- /dev/null +++ b/externals/vcpkg/ports/magnum/vcpkg.json @@ -0,0 +1,533 @@ +{ + "name": "magnum", + "version-string": "2020.06", + "port-version": 9, + "description": "C++11/C++14 graphics middleware for games and data visualization", + "homepage": "https://magnum.graphics/", + "dependencies": [ + { + "name": "corrade", + "features": [ + "utility" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + } + ], + "default-features": [ + "anyaudioimporter", + "anyimageconverter", + "anyimageimporter", + "anysceneconverter", + "anysceneimporter", + "anyshaderconverter", + "debugtools", + "gl", + "meshtools", + "primitives", + "scenegraph", + "sdl2application", + "shaders", + "shadertools", + "text", + "texturetools", + "trade" + ], + "features": { + "al-info": { + "description": "magnum-al-info utility", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "audio" + ] + } + ] + }, + "anyaudioimporter": { + "description": "AnyAudioImporter plugin", + "dependencies": [ + { + "name": "corrade", + "features": [ + "pluginmanager" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "audio" + ] + } + ] + }, + "anyimageconverter": { + "description": "AnyImageConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "anyimageimporter": { + "description": "AnyImageImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "anysceneconverter": { + "description": "AnySceneConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "anysceneimporter": { + "description": "AnySceneImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "anyshaderconverter": { + "description": "AnyShaderConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "shadertools" + ] + } + ] + }, + "audio": { + "description": "Audio library", + "dependencies": [ + "openal-soft" + ] + }, + "cglcontext": { + "description": "CglContext library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "debugtools": { + "description": "DebugTools library" + }, + "distancefieldconverter": { + "description": "magnum-distancefieldconverter utility", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "texturetools" + ] + } + ] + }, + "eglcontext": { + "description": "EglContext library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "fontconverter": { + "description": "magnum-fontconverter utility", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "text" + ] + } + ] + }, + "gl": { + "description": "GL library" + }, + "gl-info": { + "description": "gl-info utility", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "glfwapplication": { + "description": "GlfwApplication library", + "dependencies": [ + "glfw3" + ] + }, + "glxcontext": { + "description": "GlxContext library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "imageconverter": { + "description": "magnum-imageconverter utility", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "magnumfont": { + "description": "MagnumFont plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "text" + ] + } + ] + }, + "magnumfontconverter": { + "description": "MagnumFontConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "text" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "tgaimageconverter" + ] + } + ] + }, + "meshtools": { + "description": "MeshTools library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "objimporter": { + "description": "ObjImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "opengltester": { + "description": "OpenGLTester library", + "dependencies": [ + { + "name": "corrade", + "features": [ + "testsuite" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "primitives": { + "description": "Primitives library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "sceneconverter": { + "description": "magnum-sceneconverter utility", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "anysceneconverter" + ] + } + ] + }, + "scenegraph": { + "description": "SceneGraph library" + }, + "sdl2application": { + "description": "Sdl2Application library", + "dependencies": [ + "sdl2" + ] + }, + "shaderconverter": { + "description": "magnum-shaderconverter utility", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "anyshaderconverter", + "shadertools" + ] + } + ] + }, + "shaders": { + "description": "Shaders library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "shadertools": { + "description": "ShaderTools library" + }, + "text": { + "description": "Text library", + "dependencies": [ + { + "name": "corrade", + "features": [ + "pluginmanager" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "texturetools" + ] + } + ] + }, + "texturetools": { + "description": "TextureTools library" + }, + "tgaimageconverter": { + "description": "TgaImageConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "tgaimporter": { + "description": "TgaImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "trade": { + "description": "Trade library", + "dependencies": [ + { + "name": "corrade", + "features": [ + "pluginmanager" + ] + } + ] + }, + "vk": { + "description": "Vk library", + "dependencies": [ + "vulkan" + ] + }, + "vk-info": { + "description": "vk-info utility", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "vk" + ] + } + ] + }, + "wavaudioimporter": { + "description": "WavAudioImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "audio" + ] + } + ] + }, + "wglcontext": { + "description": "WglContext library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "windowlesscglapplication": { + "description": "WindowlessCglApplication library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "windowlesseglapplication": { + "description": "WindowlessEglApplication library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "windowlessglxapplication": { + "description": "WindowlessGlxApplication library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "windowlesswglapplication": { + "description": "WindowlessWglApplication library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/mailio/portfile.cmake b/externals/vcpkg/ports/mailio/portfile.cmake new file mode 100755 index 000000000..9171b35ea --- /dev/null +++ b/externals/vcpkg/ports/mailio/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO karastojko/mailio + REF cc887a7808d9c55e07c8a7503c7ae2e2d7485120 # version_0-21-0 + SHA512 7125bfe4274e1e126e335b2e4b5743ef54d5dc0b6fd83f0c10e7578b57924d3e398af6b3865fdee3de587e2e2d7c33d95dbe017b1966649e68cf52f2dd268ee5 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DMAILIO_BUILD_DOCUMENTATION=OFF + -DMAILIO_BUILD_EXAMPLES=OFF +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + CONFIG_PATH share/mailio/cmake +) + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/mailio/vcpkg.json b/externals/vcpkg/ports/mailio/vcpkg.json new file mode 100755 index 000000000..c2f639f9e --- /dev/null +++ b/externals/vcpkg/ports/mailio/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "mailio", + "version": "0.21.0", + "port-version": 2, + "maintainers": "Tomislav Karastojković ", + "description": "mailio is a cross platform C++ library for MIME format and SMTP, POP3 and IMAP protocols. It is based on the standard C++ 17 and Boost library.", + "homepage": "https://github.com/karastojko/mailio", + "license": "BSD-2-Clause", + "supports": "!uwp", + "dependencies": [ + "boost-asio", + "boost-date-time", + "boost-regex", + "boost-system", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/mapbox-geojson-cpp/portfile.cmake b/externals/vcpkg/ports/mapbox-geojson-cpp/portfile.cmake new file mode 100755 index 000000000..7bef00f68 --- /dev/null +++ b/externals/vcpkg/ports/mapbox-geojson-cpp/portfile.cmake @@ -0,0 +1,15 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mapbox/geojson-cpp + REF v0.5.1 + SHA512 1282bd4a21773c8b300149abc95c4baea7c36facf283d05d18db246a40614625fab1a71e51190c1cdfc80852ea60b2727af9a679661bfede860d822306467037 + HEAD_REF master +) + +# Copy header files +file(COPY ${SOURCE_PATH}/include/mapbox/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/mapbox FILES_MATCHING PATTERN "*.hpp") + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/mapbox-geojson-cpp/vcpkg.json b/externals/vcpkg/ports/mapbox-geojson-cpp/vcpkg.json new file mode 100755 index 000000000..c9024a360 --- /dev/null +++ b/externals/vcpkg/ports/mapbox-geojson-cpp/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "mapbox-geojson-cpp", + "version-semver": "0.5.1", + "port-version": 1, + "description": "A C++14 library for converting GeoJSON into geometry.hpp representation", + "homepage": "https://github.com/mapbox/geojson-cpp", + "dependencies": [ + "mapbox-geometry", + "mapbox-variant" + ] +} diff --git a/externals/vcpkg/ports/mapbox-geojson-vt-cpp/portfile.cmake b/externals/vcpkg/ports/mapbox-geojson-vt-cpp/portfile.cmake new file mode 100755 index 000000000..7c8567301 --- /dev/null +++ b/externals/vcpkg/ports/mapbox-geojson-vt-cpp/portfile.cmake @@ -0,0 +1,15 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mapbox/geojson-vt-cpp + REF v6.6.5 + SHA512 4989522c19f35ba13096958ad1041ec09745020955fad99ee02116393885a9d0a835911a42167a76d5efb2a5dd167077bcd451c9a77444f2eaa26893a1bff062 + HEAD_REF master +) + +# Copy header files +file(COPY "${SOURCE_PATH}/include/mapbox/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/mapbox" FILES_MATCHING PATTERN "*.hpp") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/mapbox-geojson-vt-cpp/vcpkg.json b/externals/vcpkg/ports/mapbox-geojson-vt-cpp/vcpkg.json new file mode 100755 index 000000000..29876c2d4 --- /dev/null +++ b/externals/vcpkg/ports/mapbox-geojson-vt-cpp/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "mapbox-geojson-vt-cpp", + "version-semver": "6.6.5", + "description": "Port to C++ of JS GeoJSON-VT for slicing GeoJSON into vector tiles on the fly", + "homepage": "https://github.com/mapbox/geojson-vt-cpp", + "dependencies": [ + "mapbox-geometry" + ] +} diff --git a/externals/vcpkg/ports/mapbox-geometry/portfile.cmake b/externals/vcpkg/ports/mapbox-geometry/portfile.cmake new file mode 100755 index 000000000..9ee4065e9 --- /dev/null +++ b/externals/vcpkg/ports/mapbox-geometry/portfile.cmake @@ -0,0 +1,15 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mapbox/geometry.hpp + REF v2.0.3 + SHA512 76c10578e1fba44430786fb5e043dbc063aa251f62396701a509f7fa1e2e5c351fa0fe041d16be84bda9816ec5df3342cd9890da6fe99d78d6fb26e0a3b2485b + HEAD_REF master +) + +# Copy header files +file(COPY ${SOURCE_PATH}/include/mapbox/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/mapbox FILES_MATCHING PATTERN "*.hpp") + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/mapbox-geometry/vcpkg.json b/externals/vcpkg/ports/mapbox-geometry/vcpkg.json new file mode 100755 index 000000000..bcde9b38a --- /dev/null +++ b/externals/vcpkg/ports/mapbox-geometry/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "mapbox-geometry", + "version-semver": "2.0.3", + "description": "C++ geometry types", + "homepage": "https://github.com/mapbox/geometry.hpp" +} diff --git a/externals/vcpkg/ports/mapbox-polylabel/portfile.cmake b/externals/vcpkg/ports/mapbox-polylabel/portfile.cmake new file mode 100755 index 000000000..a0c711699 --- /dev/null +++ b/externals/vcpkg/ports/mapbox-polylabel/portfile.cmake @@ -0,0 +1,15 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mapbox/polylabel + REF v1.0.4 + SHA512 c337577545e072dbc43b5fc822e7a4fc9585051e24f6af76a3525faee7ab5c332915c43401629ad2e8f1f142f9e920f65347609607aec9394fd6bbc5d4936564 + HEAD_REF master +) + +# Copy header files +file(COPY ${SOURCE_PATH}/include/mapbox/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/mapbox FILES_MATCHING PATTERN "*.hpp") + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/mapbox-polylabel/vcpkg.json b/externals/vcpkg/ports/mapbox-polylabel/vcpkg.json new file mode 100755 index 000000000..bb26bf642 --- /dev/null +++ b/externals/vcpkg/ports/mapbox-polylabel/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "mapbox-polylabel", + "version-semver": "1.0.4", + "description": "A fast algorithm for finding the pole of inaccessibility of a polygon (in JavaScript and C++)", + "homepage": "https://github.com/mapbox/polylabel", + "dependencies": [ + "mapbox-geometry", + "mapbox-variant" + ] +} diff --git a/externals/vcpkg/ports/mapbox-variant/portfile.cmake b/externals/vcpkg/ports/mapbox-variant/portfile.cmake new file mode 100755 index 000000000..dc696454e --- /dev/null +++ b/externals/vcpkg/ports/mapbox-variant/portfile.cmake @@ -0,0 +1,15 @@ +# header-only +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mapbox/variant + REF a2a4858345423a760eca300ec42acad1ad123aa3 # v1.2.0 + SHA512 6d1ad2f37e137c42592dbd618a3871008d4f83b3cb0d6f05a9c469a6a987ed3fc7f0416ae341646d73e69426903a5a4f64b9f41ae739fd940bbd304dfcae289e + HEAD_REF master +) + +# Copy header files +file(COPY ${SOURCE_PATH}/include/mapbox/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/mapbox FILES_MATCHING PATTERN "*.hpp") + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/mapbox-variant) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/mapbox-variant/LICENSE ${CURRENT_PACKAGES_DIR}/share/mapbox-variant/copyright) diff --git a/externals/vcpkg/ports/mapbox-variant/vcpkg.json b/externals/vcpkg/ports/mapbox-variant/vcpkg.json new file mode 100755 index 000000000..91f0b61ec --- /dev/null +++ b/externals/vcpkg/ports/mapbox-variant/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "mapbox-variant", + "version-string": "1.2.0", + "port-version": 1, + "description": "C++11/C++14 Variant" +} diff --git a/externals/vcpkg/ports/mapbox-wagyu/portfile.cmake b/externals/vcpkg/ports/mapbox-wagyu/portfile.cmake new file mode 100755 index 000000000..b43c60ce2 --- /dev/null +++ b/externals/vcpkg/ports/mapbox-wagyu/portfile.cmake @@ -0,0 +1,15 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mapbox/wagyu + REF 0.5.0 + SHA512 d2ef6c056b25e60677da4f53154790558ddb43c56aa117a4d5108f8c7686cceff9e5d54d71138e2eb504f053315d28f7cb8190ff45833c5606d511b685acf40d + HEAD_REF master +) + +# Copy header files +file(COPY ${SOURCE_PATH}/include/mapbox/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/mapbox FILES_MATCHING PATTERN "*.hpp") + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/mapbox-wagyu/vcpkg.json b/externals/vcpkg/ports/mapbox-wagyu/vcpkg.json new file mode 100755 index 000000000..8da0b6444 --- /dev/null +++ b/externals/vcpkg/ports/mapbox-wagyu/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "mapbox-wagyu", + "version-semver": "0.5.0", + "description": "A general library for geometry operations of union, intersections, difference, and xor", + "homepage": "https://github.com/mapbox/wagyu" +} diff --git a/externals/vcpkg/ports/mapnik/portfile.cmake b/externals/vcpkg/ports/mapnik/portfile.cmake new file mode 100755 index 000000000..015000a41 --- /dev/null +++ b/externals/vcpkg/ports/mapnik/portfile.cmake @@ -0,0 +1,112 @@ +# test application for this port: https://github.com/mathisloge/mapnik-vcpkg-test + +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mapnik/mapnik + REF d7b83c0f7d11397aff5b5d8e0bb294ef6ea4354d + SHA512 62b47cb753e9698e55fe88593009016676b6c0c0a90c3f29be6f44a45f9f783ec5beca6916e549f9adbdc750e2e0334a9e927fc0dcb6a88431e40c2e920ff962 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "jpeg" USE_JPEG + "png" USE_PNG + "tiff" USE_TIFF + "webp" USE_WEBP + "libxml2" USE_LIBXML2 + "cairo" USE_CAIRO + "proj" USE_PROJ + "grid-renderer" USE_GRID_RENDERER + "svg-renderer" USE_SVG_RENDERER + "input-csv" USE_PLUGIN_INPUT_CSV + "input-gdal" USE_PLUGIN_INPUT_GDAL + "input-geobuf" USE_PLUGIN_INPUT_GEOBUF + "input-geojson" USE_PLUGIN_INPUT_GEOJSON + "input-ogr" USE_PLUGIN_INPUT_OGR + "input-pgraster" USE_PLUGIN_INPUT_PGRASTER + "input-postgis" USE_PLUGIN_INPUT_POSTGIS + "input-raster" USE_PLUGIN_INPUT_RASTER + "input-shape" USE_PLUGIN_INPUT_SHAPE + "input-sqlite" USE_PLUGIN_INPUT_SQLITE + "input-topojson" USE_PLUGIN_INPUT_TOPOJSON + "viewer" BUILD_DEMO_VIEWER + "utility-geometry-to-wkb" BUILD_UTILITY_GEOMETRY_TO_WKB + "utility-mapnik-index" BUILD_UTILITY_MAPNIK_INDEX + "utility-mapnik-render" BUILD_UTILITY_MAPNIK_RENDER + "utility-ogrindex" BUILD_UTILITY_OGRINDEX + "utility-pgsql2sqlite" BUILD_UTILITY_PGSQL2SQLITE + "utility-shapeindex" BUILD_UTILITY_SHAPEINDEX + "utility-svg2png" BUILD_UTILITY_SVG2PNG +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DINSTALL_DEPENDENCIES=OFF + -DBUILD_TESTING=OFF + -DBUILD_BENCHMARK=OFF + -DBUILD_DEMO_CPP=OFF + -DUSE_EXTERNAL_MAPBOX_GEOMETRY=ON + -DUSE_EXTERNAL_MAPBOX_POLYLABEL=ON + -DUSE_EXTERNAL_MAPBOX_PROTOZERO=ON + -DUSE_EXTERNAL_MAPBOX_VARIANT=ON + -DBOOST_REGEX_HAS_ICU=ON + -DMAPNIK_CMAKE_DIR=share/mapnik/cmake + -DFONTS_INSTALL_DIR=share/mapnik/fonts + -DMAPNIK_PKGCONF_DIR=lib/pkgconfig +) + +vcpkg_cmake_install() +# copy plugins into tool path, if any plugin is installed +if(IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin/plugins") + file(COPY "${CURRENT_PACKAGES_DIR}/bin/plugins" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +endif() +vcpkg_copy_pdbs() + +set(_tool_names "") +if("viewer" IN_LIST FEATURES) + # copy the ini file to reference the plugins correctly + file(COPY "${CURRENT_PACKAGES_DIR}/bin/viewer.ini" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + list(APPEND _tool_names mapnik-viewer) +endif() + +if("utility-geometry-to-wkb" IN_LIST FEATURES) + list(APPEND _tool_names geometry_to_wkb) +endif() + +if("utility-mapnik-index" IN_LIST FEATURES) + list(APPEND _tool_names mapnik-index) +endif() +if("utility-mapnik-render" IN_LIST FEATURES) + list(APPEND _tool_names mapnik-render) +endif() +if("utility-ogrindex" IN_LIST FEATURES) + # build is currently not supported + # vcpkg_copy_tools(TOOL_NAMES ogrindex AUTO_CLEAN) +endif() +if("utility-pgsql2sqlite" IN_LIST FEATURES) + list(APPEND _tool_names pgsql2sqlite) +endif() +if("utility-shapeindex" IN_LIST FEATURES) + list(APPEND _tool_names shapeindex) +endif() +if("utility-svg2png" IN_LIST FEATURES) + list(APPEND _tool_names svg2png) +endif() +if(_tool_names) + vcpkg_copy_tools(TOOL_NAMES ${_tool_names} AUTO_CLEAN) +endif() +vcpkg_cmake_config_fixup(CONFIG_PATH share/mapnik/cmake) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(WRITE "${CURRENT_PACKAGES_DIR}/share/mapnik/mapnikPlugins-debug.cmake" "set(MAPNIK_PLUGINS_DIR_DEBUG \"\${PACKAGE_PREFIX_DIR}/debug/bin/mapnik/input\" CACHE STRING \"\")") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/fonts/unifont_license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME fonts_copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/mapnik/usage b/externals/vcpkg/ports/mapnik/usage new file mode 100755 index 000000000..405830460 --- /dev/null +++ b/externals/vcpkg/ports/mapnik/usage @@ -0,0 +1,7 @@ +The package mapnik provides CMake targets: + + find_package(mapnik CONFIG REQUIRED) + target_link_libraries(main PRIVATE mapnik::mapnik mapnik::json mapnik::wkt) + +If you only need the compile definitions without any sources, use target mapnik::core. +If any plugins were installed, call the function `mapnik_find_plugin_dir(MAPNIK_PLUGIN_DIR)` to get the plugin installation folder for the currently used configuration. See the docs for more information. diff --git a/externals/vcpkg/ports/mapnik/vcpkg.json b/externals/vcpkg/ports/mapnik/vcpkg.json new file mode 100755 index 000000000..40a796611 --- /dev/null +++ b/externals/vcpkg/ports/mapnik/vcpkg.json @@ -0,0 +1,228 @@ +{ + "name": "mapnik", + "version-date": "2022-01-28", + "port-version": 2, + "description": "Mapnik is an open source toolkit for developing mapping applications.", + "homepage": "https://github.com/mapnik/mapnik", + "license": "LGPL-2.1-only", + "supports": "!(static & windows)", + "dependencies": [ + "boost-assign", + "boost-bimap", + "boost-filesystem", + "boost-geometry", + "boost-gil", + "boost-interprocess", + { + "name": "boost-locale", + "features": [ + "icu" + ] + }, + "boost-msm", + "boost-property-tree", + { + "name": "boost-regex", + "features": [ + "icu" + ] + }, + "boost-spirit", + "boost-system", + { + "name": "freetype", + "features": [ + "bzip2", + "png" + ] + }, + { + "name": "harfbuzz", + "features": [ + "icu" + ] + }, + { + "name": "harfbuzz", + "features": [ + "coretext" + ], + "platform": "osx" + }, + "icu", + "mapbox-geometry", + "mapbox-polylabel", + "mapbox-variant", + "protozero", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "default-features": [ + "grid-renderer", + "jpeg", + "png", + "proj", + "svg-renderer", + "tiff", + "webp" + ], + "features": { + "cairo": { + "description": "Cairo renderer", + "dependencies": [ + "cairo", + "cairomm" + ] + }, + "grid-renderer": { + "description": "Grid renderer" + }, + "input-csv": { + "description": "CSV input plugin" + }, + "input-gdal": { + "description": "GDAL input plugin", + "dependencies": [ + "gdal" + ] + }, + "input-geobuf": { + "description": "GEOBUF input plugin", + "dependencies": [ + "protozero" + ] + }, + "input-geojson": { + "description": "GEOJSON input plugin" + }, + "input-ogr": { + "description": "OGR input plugin", + "dependencies": [ + "gdal" + ] + }, + "input-pgraster": { + "description": "PGRASTER input plugin", + "dependencies": [ + "libodb-pgsql", + "libpq" + ] + }, + "input-postgis": { + "description": "POSTGIS input plugin", + "dependencies": [ + "libodb-pgsql", + "libpq" + ] + }, + "input-raster": { + "description": "RASTER input plugin" + }, + "input-shape": { + "description": "SHAPE input plugin" + }, + "input-sqlite": { + "description": "SQLITE input plugin", + "dependencies": [ + "sqlite3" + ] + }, + "input-topojson": { + "description": "TOPOJSON input plugin" + }, + "jpeg": { + "description": "add jpeg support", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "libxml2": { + "description": "use libxml2 instead of rapidxml", + "dependencies": [ + "libxml2" + ] + }, + "png": { + "description": "add png support", + "dependencies": [ + "libpng" + ] + }, + "proj": { + "description": "PROJ Functionalities", + "dependencies": [ + "proj" + ] + }, + "svg-renderer": { + "description": "SVG renderer" + }, + "tiff": { + "description": "add tiff support", + "dependencies": [ + "tiff" + ] + }, + "utility-geometry-to-wkb": { + "description": "utility application geometry-to-wkb", + "dependencies": [ + "boost-program-options" + ] + }, + "utility-mapnik-index": { + "description": "utility application mapnik-index", + "dependencies": [ + "boost-program-options" + ] + }, + "utility-mapnik-render": { + "description": "utility application mapnik-render", + "dependencies": [ + "boost-program-options" + ] + }, + "utility-ogrindex": { + "description": "utility application ogrindex" + }, + "utility-pgsql2sqlite": { + "description": "utility application pgsql2sqlite", + "dependencies": [ + "boost-program-options", + "libodb-pgsql", + "libpq", + "sqlite3" + ] + }, + "utility-shapeindex": { + "description": "utility application shapeindex", + "dependencies": [ + "boost-program-options" + ] + }, + "utility-svg2png": { + "description": "utility application svg2png", + "dependencies": [ + "boost-program-options" + ] + }, + "viewer": { + "description": "Make demo viewer application", + "dependencies": [ + "qt5-base" + ] + }, + "webp": { + "description": "add webp support", + "dependencies": [ + "libwebp" + ] + } + } +} diff --git a/externals/vcpkg/ports/marble/portfile.cmake b/externals/vcpkg/ports/marble/portfile.cmake new file mode 100755 index 000000000..d24c4c603 --- /dev/null +++ b/externals/vcpkg/ports/marble/portfile.cmake @@ -0,0 +1,59 @@ + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/marble + REF 7def3b68fd5de9b7f0734410a9f955bd1082097b #v22.04.0 + SHA512 2977a051a7f91603dea5960ddf0fed2fd5a991d554bce899ce4d8a0d3648546ff2c4c75bebcd3704d07d875b656ab7dc64c567b1bc9f6975745be327375faa90 + HEAD_REF master + PATCHES + qtfix.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_I18n=ON + -DWITH_KF5=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) + +# Install plugins and data files +file(GLOB_RECURSE PLUGINS "${CURRENT_PACKAGES_DIR}/plugins/*") +file(GLOB_RECURSE PLUGINS_DESIGNER "${CURRENT_PACKAGES_DIR}/lib/plugins/*") +file(GLOB_RECURSE PLUGINS_DEBUG "${CURRENT_PACKAGES_DIR}/debug/lib/plugins/*") +file(GLOB_RECURSE MKSPECS "${CURRENT_PACKAGES_DIR}/mkspecs/*") + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +file(COPY ${PLUGINS} ${PLUGINS_DESIGNER} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/plugins") +file(COPY ${PLUGINS_DEBUG} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}/plugins") +file(COPY "${CURRENT_PACKAGES_DIR}/data" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") # have to keep folder structure here +file(COPY ${MKSPECS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/mkspecs") + +# remove plugin folder +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/plugins" "${CURRENT_PACKAGES_DIR}/debug/plugins" + "${CURRENT_PACKAGES_DIR}/data" "${CURRENT_PACKAGES_DIR}/debug/data" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/mkspecs" "${CURRENT_PACKAGES_DIR}/debug/mkspecs" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/lib/plugins" "${CURRENT_PACKAGES_DIR}/lib/plugins" + "${CURRENT_PACKAGES_DIR}/debug/marble-qt.exe" +) + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") +file(RENAME "${CURRENT_PACKAGES_DIR}/astro.dll" "${CURRENT_PACKAGES_DIR}/bin/astro.dll") +file(RENAME "${CURRENT_PACKAGES_DIR}/marbledeclarative.dll" "${CURRENT_PACKAGES_DIR}/bin/marbledeclarative.dll") +file(RENAME "${CURRENT_PACKAGES_DIR}/marblewidget-qt5.dll" "${CURRENT_PACKAGES_DIR}/bin/marblewidget-qt5.dll") +file(RENAME "${CURRENT_PACKAGES_DIR}/marble-qt.exe" "${CURRENT_PACKAGES_DIR}/tools/marble/marble-qt.exe") + +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/astrod.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/astrod.dll") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/marbledeclaratived.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/marbledeclaratived.dll") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/marblewidget-qt5d.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/marblewidget-qt5d.dll") + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/marble/qtfix.patch b/externals/vcpkg/ports/marble/qtfix.patch new file mode 100755 index 000000000..8c923ff2c --- /dev/null +++ b/externals/vcpkg/ports/marble/qtfix.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 65b58c4..a8f024c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -184,7 +184,7 @@ set (PEDANTIC FALSE CACHE BOOL "Determines if we should compile with -Wall -Werr + set (WITH_DESIGNER_PLUGIN TRUE CACHE BOOL "Build plugins for Qt Designer") + add_feature_info("Qt Designer plugins" WITH_DESIGNER_PLUGIN "Marble widget support in Qt Designer. Toggle with WITH_DESIGNER_PLUGIN=YES/NO") + +-set(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Base directory for executables and libraries" FORCE) ++set(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "Base directory for executables and libraries" FORCE) + if (NOT QT_PLUGINS_DIR) + set(QT_PLUGINS_DIR ${CMAKE_INSTALL_LIBDIR}/plugins) + endif() +diff --git a/src/plugins/positionprovider/CMakeLists.txt b/src/plugins/positionprovider/CMakeLists.txt +index ec2ba1a..cc8e52e 100644 +--- a/src/plugins/positionprovider/CMakeLists.txt ++++ b/src/plugins/positionprovider/CMakeLists.txt +@@ -12,12 +12,12 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} + OPTIONAL_COMPONENTS + Positioning + ) +-marble_set_package_properties( Qt5Positioning PROPERTIES DESCRIPTION "a collection of APIs and frameworks" ) +-marble_set_package_properties( Qt5Positioning PROPERTIES URL "https://www.qt.io/developers/" ) +-marble_set_package_properties( Qt5Positioning PROPERTIES TYPE OPTIONAL PURPOSE "position information via Qt5Positioning" ) +-if(Qt5Positioning_FOUND) +- ADD_SUBDIRECTORY( qtpositioning ) +-endif() ++#marble_set_package_properties( Qt5Positioning PROPERTIES DESCRIPTION "a collection of APIs and frameworks" ) ++#marble_set_package_properties( Qt5Positioning PROPERTIES URL "https://www.qt.io/developers/" ) ++#marble_set_package_properties( Qt5Positioning PROPERTIES TYPE OPTIONAL PURPOSE "position information via Qt5Positioning" ) ++#if(Qt5Positioning_FOUND) ++# ADD_SUBDIRECTORY( qtpositioning ) ++#endif() + + + macro_optional_find_package(libwlocate) diff --git a/externals/vcpkg/ports/marble/vcpkg.json b/externals/vcpkg/ports/marble/vcpkg.json new file mode 100755 index 000000000..5486e7af7 --- /dev/null +++ b/externals/vcpkg/ports/marble/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "marble", + "version-string": "22.04.0", + "description": "Marble KDE library", + "homepage": "https://marble.kde.org", + "license": "LGPL-2.1-or-later", + "supports": "windows & x64 & !static", + "dependencies": [ + "qt5-base", + "qt5-quickcontrols", + "qt5-svg", + "qt5-webchannel", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/marl/portfile.cmake b/externals/vcpkg/ports/marl/portfile.cmake new file mode 100755 index 000000000..53cb52f85 --- /dev/null +++ b/externals/vcpkg/ports/marl/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/marl + REF 9929747c9ba6354691dbacaf14f9b35433871e5b #2022-03-02 + SHA512 454399485d292526333417474a312302aaff90cf63bc06a95c2e8b87cb92eaea547457ba3c06413e079ca29f9ea64990b9da467aeaec6ec2aa3233efddab2407 + HEAD_REF main +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" MARL_BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DMARL_BUILD_SHARED=${MARL_BUILD_SHARED} + -DMARL_INSTALL=ON +) + +vcpkg_cmake_install() + +if(MARL_BUILD_SHARED) + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/marl/export.h" + "#ifdef MARL_DLL" + "#if 1 // #ifdef MARL_DLL" + ) +endif() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/marl/vcpkg.json b/externals/vcpkg/ports/marl/vcpkg.json new file mode 100755 index 000000000..c641ba3e6 --- /dev/null +++ b/externals/vcpkg/ports/marl/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "marl", + "version-date": "2022-03-02", + "description": "A hybrid thread/fiber task scheduler written in modern C++", + "homepage": "https://github.com/google/marl", + "license": "Apache-2.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/materialx/portfile.cmake b/externals/vcpkg/ports/materialx/portfile.cmake new file mode 100755 index 000000000..da56e07be --- /dev/null +++ b/externals/vcpkg/ports/materialx/portfile.cmake @@ -0,0 +1,49 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO AcademySoftwareFoundation/MaterialX + REF b1ba83b312576fc58f02a6a7db40b18ddbe4f87f # 1.38.4 + SHA512 3988c42d487e391f9f0f3ab5f34eaa26c7f450079695d96954b871e078eecfe692daa9917279560ba3f10bf771685df3da6e26273d575a23a11c3d17fb897c62 + HEAD_REF main +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" OPTION_BUILD_SHARED_LIB) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DMATERIALX_BUILD_SHARED_LIBS:BOOL=${OPTION_BUILD_SHARED_LIB}" + "-DMATERIALX_BUILD_JS:BOOL=NO" + "-DMATERIALX_BUILD_PYTHON:BOOL=NO" + "-DMATERIALX_BUILD_VIEWER:BOOL=NO" + "-DMATERIALX_BUILD_DOCS:BOOL=NO" + "-DMATERIALX_BUILD_GEN_GLSL:BOOL=NO" + "-DMATERIALX_BUILD_GEN_OSL:BOOL=NO" + "-DMATERIALX_BUILD_GEN_MDL:BOOL=NO" + "-DMATERIALX_BUILD_RENDER:BOOL=NO" + "-DMATERIALX_BUILD_OIIO:BOOL=NO" + "-DMATERIALX_BUILD_TESTS:BOOL=NO" + "-DMATERIALX_PYTHON_LTO:BOOL=NO" + "-DMATERIALX_INSTALL_PYTHON:BOOL=NO" + "-DMATERIALX_TEST_RENDER:BOOL=NO" + "-DMATERIALX_WARNINGS_AS_ERRORS:BOOL=NO" + MAYBE_UNUSED_VARIABLES + MATERIALX_PYTHON_LTO # Used when MATERIALX_BUILD_PYTHON=ON +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME MaterialX CONFIG_PATH lib/cmake/MaterialX) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/CHANGELOG.md" + "${CURRENT_PACKAGES_DIR}/LICENSE" + "${CURRENT_PACKAGES_DIR}/README.md" + "${CURRENT_PACKAGES_DIR}/THIRD-PARTY.md" + "${CURRENT_PACKAGES_DIR}/debug/CHANGELOG.md" + "${CURRENT_PACKAGES_DIR}/debug/LICENSE" + "${CURRENT_PACKAGES_DIR}/debug/README.md" + "${CURRENT_PACKAGES_DIR}/debug/THIRD-PARTY.md" + "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/materialx/vcpkg.json b/externals/vcpkg/ports/materialx/vcpkg.json new file mode 100755 index 000000000..60fc20236 --- /dev/null +++ b/externals/vcpkg/ports/materialx/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "materialx", + "version": "1.38.4", + "description": "MaterialX is an open standard for the exchange of rich material and look-development content across applications and renderers.", + "homepage": "https://www.materialx.org/", + "license": "Apache-2.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/mathc/CMakeLists.txt b/externals/vcpkg/ports/mathc/CMakeLists.txt new file mode 100755 index 000000000..7c221bec1 --- /dev/null +++ b/externals/vcpkg/ports/mathc/CMakeLists.txt @@ -0,0 +1,24 @@ +cmake_minimum_required(VERSION 3.14) + +project(mathc LANGUAGES C) + +include(GNUInstallDirs) + +add_library(mathc mathc.c) + +target_include_directories( + mathc + PUBLIC + $ +) + +set_target_properties(mathc PROPERTIES PUBLIC_HEADER mathc.h) + +install(TARGETS mathc EXPORT unofficial-mathc-config) + +install( + EXPORT unofficial-mathc-config + NAMESPACE unofficial::mathc:: + DESTINATION share/unofficial-mathc + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +) diff --git a/externals/vcpkg/ports/mathc/portfile.cmake b/externals/vcpkg/ports/mathc/portfile.cmake new file mode 100755 index 000000000..fde284632 --- /dev/null +++ b/externals/vcpkg/ports/mathc/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO felselva/mathc + REF d672725203fc80f6f79fba64533b87d51c32d714 + SHA512 6db96b7ca9b26745b6ead774b547f6cccdecaef0b55cb766d4f26ae7149bbb72e2bd877cb7994455bd19cae129d014efaf40b50395b1114b7ac95dc6ed53bf34 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/mathc/vcpkg.json b/externals/vcpkg/ports/mathc/vcpkg.json new file mode 100755 index 000000000..1cabd8c53 --- /dev/null +++ b/externals/vcpkg/ports/mathc/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "mathc", + "version-string": "2019-09-29", + "port-version": 1, + "description": "Pure C math library for 2D and 3D programming", + "homepage": "https://github.com/felselva/mathc" +} diff --git a/externals/vcpkg/ports/mathgl/fix_arma_sprintf.patch b/externals/vcpkg/ports/mathgl/fix_arma_sprintf.patch new file mode 100755 index 000000000..25223455f --- /dev/null +++ b/externals/vcpkg/ports/mathgl/fix_arma_sprintf.patch @@ -0,0 +1,14 @@ +diff --git "a/include/mgl2/define.h" "b/include/mgl2/define.h" +index e23ec04..8e79086 100644 +--- "a/include/mgl2/define.h" ++++ "b/include/mgl2/define.h" +@@ -141,7 +140,9 @@ typedef long msize; + #define getcwd _getcwd + #define chdir _chdir // BORLAND has chdir + #endif ++#if (_MSC_VER<1500) + #define snprintf _snprintf ++#endif + #if (_MSC_VER<1600) // based on https://hg.python.org/cpython/rev/9aedb876c2d7 + #define hypot _hypot + #endif diff --git a/externals/vcpkg/ports/mathgl/fix_attribute.patch b/externals/vcpkg/ports/mathgl/fix_attribute.patch new file mode 100755 index 000000000..11a5acdfb --- /dev/null +++ b/externals/vcpkg/ports/mathgl/fix_attribute.patch @@ -0,0 +1,11 @@ +--- a/include/mgl2/define.h 2021-12-08 13:59:55.000000000 +0800 ++++ a/include/mgl2/define.h 2021-12-15 10:39:09.701079400 +0800 +@@ -66,6 +66,8 @@ + #else + #define MGL_FUNC_CONST + #define MGL_FUNC_PURE ++#define MGL_FUNC_INIT ++#define MGL_FUNC_FINI + #endif + #define MGL_EXPORT_CONST MGL_EXPORT MGL_FUNC_CONST + #define MGL_EXPORT_PURE MGL_EXPORT MGL_FUNC_PURE diff --git a/externals/vcpkg/ports/mathgl/fix_cmakelists_and_cpp.patch b/externals/vcpkg/ports/mathgl/fix_cmakelists_and_cpp.patch new file mode 100755 index 000000000..2b88746dd --- /dev/null +++ b/externals/vcpkg/ports/mathgl/fix_cmakelists_and_cpp.patch @@ -0,0 +1,38 @@ +diff --git a/mgllab/CMakeLists.txt b/mgllab/CMakeLists.txt +index 1649104..eeec1c1 100644 +--- a/mgllab/CMakeLists.txt ++++ b/mgllab/CMakeLists.txt +@@ -38,7 +38,11 @@ if(MGL_HAVE_FLTK) + set(mgllab_src ${mgllab_src} mgllab.rc) + endif(WIN32) + add_executable(mgllab ${mgllab_src} ${mgllab_hdr}) +- target_link_libraries(mgllab mgl mgl-fltk ${FLTK_LIBRARIES}) ++ if(WIN32) ++ target_link_libraries(mgllab mgl mgl-fltk mgl-fltk-static mgl-static getopt-static ${FLTK_LIBRARIES}) ++ else(WIN32) ++ target_link_libraries(mgllab mgl mgl-fltk ${FLTK_LIBRARIES}) ++ endif(WIN32) + install( + TARGETS mgllab + RUNTIME DESTINATION bin ) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d0c779d..acd9d7f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -579,10 +579,15 @@ if(enable-glut) + if(NOT MGL_HAVE_OPENGL) + message(SEND_ERROR "You have to enable OpenGL if you plan to use GLUT.") + endif(NOT MGL_HAVE_OPENGL) +- include(FindGLUT) ++ find_path(GLUT_INCLUDE_DIR freeglut.h PATH_SUFFIXES GL) ++ include(SelectLibraryConfigurations) ++ find_library(GLUT_LIBRARY_RELEASE NAMES freeglut) ++ find_library(GLUT_LIBRARY_DEBUG NAMES freeglutd) ++ select_library_configurations(GLUT) + if(NOT GLUT_FOUND) + message(SEND_ERROR "Couldn't find GLUT library.") + endif(NOT GLUT_FOUND) ++ include_directories(${GLUT_INCLUDE_DIR}/GL) + else(enable-glut) + set(MGL_HAVE_GLUT 0) + endif(enable-glut) diff --git a/externals/vcpkg/ports/mathgl/fix_default_graph_init.patch b/externals/vcpkg/ports/mathgl/fix_default_graph_init.patch new file mode 100755 index 000000000..700273b17 --- /dev/null +++ b/externals/vcpkg/ports/mathgl/fix_default_graph_init.patch @@ -0,0 +1,21 @@ +diff --git "a/src/canvas_cf.cpp" "b/src/canvas_cf.cpp" +index 5e1443a..26a0a8e 100644 +--- "a/src/canvas_cf.cpp" ++++ "b/src/canvas_cf.cpp" +@@ -50,7 +50,6 @@ void MGL_EXPORT MGL_FUNC_INIT mgl_init() // TODO try to add ld option: "-init mg + #endif + for(long i=0;i<360;i++) mgl_cos[i] = cos(i*M_PI/180.); + if(!mglDefFont) mglDefFont = new mglFont(MGL_DEF_FONT_NAME); +- if(!mglDefaultGr) mglDefaultGr = new mglCanvas(600,400); + } + } + void MGL_EXPORT MGL_FUNC_FINI mgl_fini() // TODO try to add ld option: "-fini mgl_fini" +@@ -434,7 +433,7 @@ void MGL_EXPORT mgl_set_legend_marks(HMGL gr, int num) + uintptr_t MGL_EXPORT mgl_create_graph_(int *width, int *height) + { return uintptr_t(new mglCanvas(*width,*height)); } + void MGL_EXPORT mgl_delete_graph_(uintptr_t *gr) { delete _GR_; } +-uintptr_t MGL_EXPORT mgl_default_graph_() { return uintptr_t(&mglDefaultGr); } ++uintptr_t MGL_EXPORT mgl_default_graph_() { return uintptr_t(mgl_default_graph()); } + void MGL_EXPORT mgl_set_size_scl_(double *scl) { mgl_set_size_scl(*scl); } + void MGL_EXPORT mgl_set_size_(uintptr_t *gr, int *width, int *height) + { mgl_set_size(_GR_,*width,*height); } diff --git a/externals/vcpkg/ports/mathgl/fix_mglDataList.patch b/externals/vcpkg/ports/mathgl/fix_mglDataList.patch new file mode 100755 index 000000000..9856ea364 --- /dev/null +++ b/externals/vcpkg/ports/mathgl/fix_mglDataList.patch @@ -0,0 +1,28 @@ +diff --git a/include/mgl2/abstract.h b/include/mgl2/abstract.h +index c8c53b8..245333b 100644 +--- a/include/mgl2/abstract.h ++++ b/include/mgl2/abstract.h +@@ -235,7 +235,11 @@ struct MGL_EXPORT mglNum + }; + //----------------------------------------------------------------------------- + /// List of user-defined data arrays ++#ifndef MGL_WIDGETS_DLL + MGL_EXPORT extern std::vector mglDataList; ++#else ++__declspec(dllimport) extern std::vector mglDataList; ++#endif + //----------------------------------------------------------------------------- + /// Abstract class for data array + class MGL_EXPORT mglDataA +diff --git a/widgets/CMakeLists.txt b/widgets/CMakeLists.txt +index a9e1269..4c1d0d4 100644 +--- a/widgets/CMakeLists.txt ++++ b/widgets/CMakeLists.txt +@@ -2,6 +2,7 @@ include(GenerateExportHeader) + + if(MSVC) + add_definitions(-DMGL_LIB_MSVC) ++ add_definitions(-DMGL_WIDGETS_DLL) + endif(MSVC) + + if(MGL_HAVE_FLTK) diff --git a/externals/vcpkg/ports/mathgl/portfile.cmake b/externals/vcpkg/ports/mathgl/portfile.cmake new file mode 100755 index 000000000..65c1abe18 --- /dev/null +++ b/externals/vcpkg/ports/mathgl/portfile.cmake @@ -0,0 +1,85 @@ +set(MATHGL_VERSION "2.5") + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO mathgl/mathgl + REF mathgl%20${MATHGL_VERSION} + FILENAME "mathgl-${MATHGL_VERSION}.tar.gz" + SHA512 1fe27962ffef8d7127c4e1294d735e5da4dd2d647397f09705c3ca860f90bd06fd447ff614e584f3d2b874a02262c5518be37d59e9e0a838dd5b8b64fd77ef9d + PATCHES + fix_cmakelists_and_cpp.patch + fix_attribute.patch + fix_default_graph_init.patch + fix_mglDataList.patch + fix_arma_sprintf.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + hdf5 enable-hdf5 + fltk enable-fltk + gif enable-gif + arma enable-arma + png enable-png + zlib enable-zlib + jpeg enable-jpeg + gsl enable-gsl + opengl enable-opengl + glut enable-glut + wx enable-wx + qt5 enable-qt5 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) + file(REMOVE "${CURRENT_PACKAGES_DIR}/mathgl2-config.cmake") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/mathgl2-config.cmake") +else() + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mathgl2) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +#somehow the native CMAKE_EXECUTABLE_SUFFIX does not work, so here we emulate it +if(CMAKE_HOST_WIN32) + set(EXECUTABLE_SUFFIX ".exe") +else() + set(EXECUTABLE_SUFFIX "") +endif() + +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/mgllab${EXECUTABLE_SUFFIX}") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/mglview${EXECUTABLE_SUFFIX}") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/mglconv${EXECUTABLE_SUFFIX}") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/mgltask${EXECUTABLE_SUFFIX}") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/udav${EXECUTABLE_SUFFIX}") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/mathgl/") +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mglconv${EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/mathgl/mglconv${EXECUTABLE_SUFFIX}") +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mgltask${EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/mathgl/mgltask${EXECUTABLE_SUFFIX}") +if (EXISTS "${CURRENT_PACKAGES_DIR}/bin/mgllab${EXECUTABLE_SUFFIX}") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mgllab${EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/mathgl/mgllab${EXECUTABLE_SUFFIX}") +endif() +if ("EXISTS ${CURRENT_PACKAGES_DIR}/bin/mglview${EXECUTABLE_SUFFIX}") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mglview${EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/mathgl/mglview${EXECUTABLE_SUFFIX}") +endif() +if (EXISTS "${CURRENT_PACKAGES_DIR}/bin/udav${EXECUTABLE_SUFFIX}") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/udav${EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/mathgl/udav${EXECUTABLE_SUFFIX}") +endif() + +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/mathgl") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mgl2/config.h" "#define MGL_INSTALL_DIR \"${CURRENT_PACKAGES_DIR}\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mgl2/config.h" "#define MGL_FONT_PATH \"${CURRENT_PACKAGES_DIR}/fonts\"" "") # there is no fonts folder + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/mathgl" RENAME copyright) diff --git a/externals/vcpkg/ports/mathgl/vcpkg.json b/externals/vcpkg/ports/mathgl/vcpkg.json new file mode 100755 index 000000000..54661f76b --- /dev/null +++ b/externals/vcpkg/ports/mathgl/vcpkg.json @@ -0,0 +1,95 @@ +{ + "name": "mathgl", + "version": "2.5", + "description": "MathGL is a free library of fast C++ routines for the plotting of the data varied in one or more dimensions", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "jpeg", + "opengl", + "png", + "zlib" + ], + "features": { + "arma": { + "description": "Armadillo support", + "dependencies": [ + "armadillo" + ] + }, + "fltk": { + "description": "fltk module", + "dependencies": [ + "fltk" + ] + }, + "gif": { + "description": "gif module", + "dependencies": [ + "giflib" + ] + }, + "glut": { + "description": "glut module", + "dependencies": [ + "freeglut" + ] + }, + "gsl": { + "description": "gsl module", + "dependencies": [ + "gsl" + ] + }, + "hdf5": { + "description": "hdf5 module", + "dependencies": [ + "hdf5" + ] + }, + "jpeg": { + "description": "jpeg module", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "opengl": { + "description": "opengl module", + "dependencies": [ + "opengl" + ] + }, + "png": { + "description": "png module", + "dependencies": [ + "libpng" + ] + }, + "qt5": { + "description": "qt5 module", + "dependencies": [ + "qt5" + ] + }, + "wx": { + "description": "wx module", + "dependencies": [ + "wxwidgets" + ] + }, + "zlib": { + "description": "zlib module", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/matio/fix-dependencies.patch b/externals/vcpkg/ports/matio/fix-dependencies.patch new file mode 100755 index 000000000..03304d083 --- /dev/null +++ b/externals/vcpkg/ports/matio/fix-dependencies.patch @@ -0,0 +1,28 @@ +diff --git a/cmake/thirdParties.cmake b/cmake/thirdParties.cmake +index 41d8529..392d455 100644 +--- a/cmake/thirdParties.cmake ++++ b/cmake/thirdParties.cmake +@@ -19,7 +19,7 @@ if(MATIO_WITH_HDF5) + endif() + set(HDF5_FOUND TRUE) + else() +- find_package(HDF5) ++ find_package(HDF5 CONFIG REQUIRED) + if(HDF5_FOUND) + set(HDF_MIN_VER 1.8) + if(HDF5_VERSION VERSION_LESS ${HDF_MIN_VER}) +@@ -44,9 +44,12 @@ if(HDF5_FOUND) + elseif(TARGET hdf5) + # target from hdf5 1.8 config + target_link_libraries(MATIO::HDF5 INTERFACE hdf5) +- elseif(TARGET HDF5::HDF5) ++ elseif(TARGET hdf5::hdf5-shared) + # target defined in CMake FindHDF5 (since 3.19) +- target_link_libraries(MATIO::HDF5 INTERFACE HDF5::HDF5) ++ target_link_libraries(MATIO::HDF5 INTERFACE hdf5::hdf5-shared) ++ elseif(TARGET hdf5::hdf5-static) ++ # target defined in CMake FindHDF5 (since 3.19) ++ target_link_libraries(MATIO::HDF5 INTERFACE hdf5-static) + else() + # results from CMake FindHDF5 + set_target_properties(MATIO::HDF5 PROPERTIES diff --git a/externals/vcpkg/ports/matio/portfile.cmake b/externals/vcpkg/ports/matio/portfile.cmake new file mode 100755 index 000000000..924b302ca --- /dev/null +++ b/externals/vcpkg/ports/matio/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tbeu/matio + REF e9e063e08ef2a27fcc22b1e526258fea5a5de329 # v1.5.23 + SHA512 78b13f4796870158f5cf2b8234c0ab6dc8b449cba49608ce40c51a3f91994c33c29b8a6de1ceed94a81fc7faa798d8c3a45a275f3a3abba70a0cd7be731e1d9c + HEAD_REF master + PATCHES fix-dependencies.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + hdf5 MATIO_WITH_HDF5 + zlib MATIO_WITH_ZLIB + extended-sparse MATIO_EXTENDED_SPARSE + mat73 MATIO_MAT73 + pic MATIO_PIC +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} + -DMATIO_SHARED=${BUILD_SHARED} + -DMATIO_USE_CONAN=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_copy_tools(TOOL_NAMES matdump AUTO_CLEAN) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/matio/vcpkg.json b/externals/vcpkg/ports/matio/vcpkg.json new file mode 100755 index 000000000..c325999aa --- /dev/null +++ b/externals/vcpkg/ports/matio/vcpkg.json @@ -0,0 +1,40 @@ +{ + "name": "matio", + "version-semver": "1.5.23", + "description": "MATLAB MAT File I/O Library", + "homepage": "https://github.com/tbeu/matio", + "license": "BSD-2-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], + "default-features": [ + "hdf5", + "zlib" + ], + "features": { + "extended-sparse": { + "description": "Enable extended sparse matrix data types not supported in MATLAB" + }, + "hdf5": { + "description": "Check for HDF5 library", + "dependencies": [ + "hdf5" + ] + }, + "mat73": { + "description": "Enable support for version 7.3 MAT files" + }, + "pic": { + "description": "Enable position-independent code (PIC), i.e., compilation with the -fPIC flag" + }, + "zlib": { + "description": "Check for zlib library", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/matplotlib-cpp/portfile.cmake b/externals/vcpkg/ports/matplotlib-cpp/portfile.cmake new file mode 100755 index 000000000..e3b61c237 --- /dev/null +++ b/externals/vcpkg/ports/matplotlib-cpp/portfile.cmake @@ -0,0 +1,14 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lava/matplotlib-cpp + REF 70d508fcb7febc66535ba923eac1b1a4e571e4d1 + SHA512 4da452fc38b6c349a1b08b97775ef2d90354fabd3c8c3a0383f08609b22dea222b7f3e091efc1b833755f6b5c1e8564e675d2ed54cdc21f8b07b1b7bb44a82f4 + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/matplotlibcpp.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/matplotlib-cpp/vcpkg.json b/externals/vcpkg/ports/matplotlib-cpp/vcpkg.json new file mode 100755 index 000000000..83944db18 --- /dev/null +++ b/externals/vcpkg/ports/matplotlib-cpp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "matplotlib-cpp", + "version-string": "2020-08-27", + "port-version": 1, + "description": "Extremely simple yet powerful header-only C++ plotting library built on the popular matplotlib", + "homepage": "https://github.com/lava/matplotlib-cpp" +} diff --git a/externals/vcpkg/ports/matplotplusplus/fix-dependencies.patch b/externals/vcpkg/ports/matplotplusplus/fix-dependencies.patch new file mode 100755 index 000000000..89ef9fba8 --- /dev/null +++ b/externals/vcpkg/ports/matplotplusplus/fix-dependencies.patch @@ -0,0 +1,96 @@ +diff --git a/source/3rd_party/CMakeLists.txt b/source/3rd_party/CMakeLists.txt +index ab58bbd..f9fed7e 100644 +--- a/source/3rd_party/CMakeLists.txt ++++ b/source/3rd_party/CMakeLists.txt +@@ -67,57 +67,69 @@ find_package(PkgConfig) + # Lots of optional packages are not a good idea in general. + # It makes the library much less "packagable" (https://youtu.be/sBP17HQAQjk) + # and much more difficult to make sure it works on multiple OSs +-find_package(JPEG) +-if(JPEG_FOUND) ++ ++if (WITH_JPEG) ++find_package(JPEG REQUIRED) ++if(1) + target_compile_definitions(cimg INTERFACE cimg_use_jpeg) + target_link_libraries(cimg INTERFACE ${JPEG_LIBRARIES}) + target_include_directories(cimg INTERFACE ${JPEG_INCLUDE_DIRS}) + endif() ++endif() + +-find_package(TIFF) +-if(TIFF_FOUND) ++if (WITH_TIFF) ++find_package(TIFF REQUIRED) ++if(1) + target_compile_definitions(cimg INTERFACE cimg_use_tiff) + target_link_libraries(cimg INTERFACE ${TIFF_LIBRARIES}) + target_include_directories(cimg INTERFACE ${TIFF_INCLUDE_DIRS}) + endif() ++endif() + +-find_package(ZLIB) +-if(ZLIB_FOUND) +- find_package(PNG) +- if (PNG_FOUND) ++if (WITH_ZLIB) ++find_package(ZLIB REQUIRED) ++if(1) ++ find_package(libpng CONFIG REQUIRED) ++ if (1) + target_compile_definitions(cimg INTERFACE cimg_use_zlib cimg_use_png) +- target_include_directories(cimg INTERFACE ${ZLIB_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS}) +- target_link_libraries(cimg INTERFACE ${ZLIB_LIBRARIES} ${PNG_LIBRARIES}) ++ target_link_libraries(cimg INTERFACE ZLIB::ZLIB png) + endif () + endif() ++endif() + +-find_package(LAPACK) +-if(LAPACK_FOUND) ++if (WITH_LAPACK) ++find_package(LAPACK REQUIRED) ++if(1) + target_compile_definitions(cimg INTERFACE cimg_use_lapack) + target_link_libraries(cimg INTERFACE ${LAPACK_LIBRARIES}) + target_include_directories(cimg INTERFACE ${LAPACK_INCLUDE_DIRS}) + endif() ++endif() + +-find_package(BLAS) +-if(BLAS_FOUND) ++if (WITH_BLAS) ++find_package(BLAS REQUIRED) ++if(1) + target_compile_definitions(cimg INTERFACE cimg_use_blas) + target_link_libraries(cimg INTERFACE ${BLAS_LIBRARIES}) + target_include_directories(cimg INTERFACE ${BLAS_INCLUDE_DIRS}) + endif() ++endif() + +-find_package(FFTW) +-if(FFTW_FOUND) ++if (WITH_FFTW3) ++find_package(FFTW3 CONFIG REQUIRED) ++if(1) + target_compile_definitions(cimg INTERFACE cimg_use_fftw3) +- target_link_libraries(cimg INTERFACE ${FFTW_LIBRARIES}) +- target_include_directories(cimg INTERFACE ${FFTW_INCLUDE_DIRS}) ++ target_link_libraries(cimg INTERFACE FFTW3::fftw3) ++endif() + endif() + + if (CMAKE_MODULE_PATH) +- find_package(OpenCV QUIET) +- if (OpenCV_FOUND) ++ if (WITH_OPENCV) ++ find_package(OpenCV CONFIG REQUIRED) ++ if (1) + target_compile_definitions(cimg INTERFACE cimg_use_opencv) +- target_link_libraries(cimg INTERFACE ${OpenCV_LIBRARIES}) +- target_include_directories(cimg INTERFACE ${OpenCV_INCLUDE_DIRS}) ++ target_link_libraries(cimg INTERFACE opencv_core) ++ endif() + endif() + else() + message("No CMAKE_MODULE_PATH path for OpenCV configured") diff --git a/externals/vcpkg/ports/matplotplusplus/install-3rd-libraries.patch b/externals/vcpkg/ports/matplotplusplus/install-3rd-libraries.patch new file mode 100755 index 000000000..d4b139b58 --- /dev/null +++ b/externals/vcpkg/ports/matplotplusplus/install-3rd-libraries.patch @@ -0,0 +1,15 @@ +diff --git a/source/3rd_party/CMakeLists.txt b/source/3rd_party/CMakeLists.txt +index bef0c08..e7521a7 100644 +--- a/source/3rd_party/CMakeLists.txt ++++ b/source/3rd_party/CMakeLists.txt +@@ -41,7 +41,9 @@ endif() + if(MASTER_PROJECT AND NOT BUILD_SHARED_LIBS) + install(TARGETS nodesoup + EXPORT Matplot++Targets +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/Matplot++) ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + endif() + + diff --git a/externals/vcpkg/ports/matplotplusplus/portfile.cmake b/externals/vcpkg/ports/matplotplusplus/portfile.cmake new file mode 100755 index 000000000..155d07384 --- /dev/null +++ b/externals/vcpkg/ports/matplotplusplus/portfile.cmake @@ -0,0 +1,54 @@ +message(STATUS " ${PORT}'s gnuplot backend currently requires Gnuplot 5.2.6+. + Windows users may get a pre-built binary installer from http://www.gnuplot.info/download.html. + Linux and MacOS users may install it from the system package manager. + Please visit https://alandefreitas.github.io/matplotplusplus/ for more information." +) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO alandefreitas/matplotplusplus + REF 36d8dc6c3b94b7a71c4f129763f2c6ad8fc0b54a + SHA512 ac8902e953a2a9f6bd62e14e2eb0bd42e407bae6c0b2921ad16ce547e4921ba2c8d8a9cc68e75831676dce3cd89cdf8294862710e838510b68e20f8a6cdf806f + HEAD_REF master + PATCHES + install-3rd-libraries.patch # Remove this patch when nodesoup is added in vcpkg + fix-dependencies.patch +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + opengl BUILD_EXPERIMENTAL_OPENGL_BACKEND + jpeg WITH_JPEG + tiff WITH_TIFF + zlib WITH_ZLIB + lapack WITH_LAPACK + blas WITH_BLAS + fftw3 WITH_FFTW3 + opencv WITH_OPENCV +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} + -DCPM_USE_LOCAL_PACKAGES=ON + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF + -DBUILD_INSTALLER=ON + -DBUILD_PACKAGE=OFF + -DBUILD_WITH_PEDANTIC_WARNINGS=OFF + -DWITH_SYSTEM_CIMG=ON + -DBUILD_HIGH_RESOLUTION_WORLD_MAP=${BUILD_WORLD_MAP} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME matplot++ CONFIG_PATH lib/cmake/Matplot++) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/matplotplusplus/vcpkg.json b/externals/vcpkg/ports/matplotplusplus/vcpkg.json new file mode 100755 index 000000000..dce9fa30f --- /dev/null +++ b/externals/vcpkg/ports/matplotplusplus/vcpkg.json @@ -0,0 +1,67 @@ +{ + "name": "matplotplusplus", + "version-date": "2021-04-11", + "port-version": 6, + "description": "A C++ graphics library for data visualization", + "homepage": "https://alandefreitas.github.io/matplotplusplus/", + "license": "MIT", + "supports": "!uwp & !(windows & arm)", + "dependencies": [ + "cimg", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "blas": { + "description": "BLAS support for Matplot++", + "dependencies": [ + "blas" + ] + }, + "fftw": { + "description": "fftw3 support for Matplot++", + "dependencies": [ + "fftw3" + ] + }, + "jpeg": { + "description": "JPEG support for Matplot++", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "lapack": { + "description": "LAPACK support for Matplot++", + "dependencies": [ + "lapack" + ] + }, + "opencv": { + "description": "opencv support for Matplot++", + "dependencies": [ + "opencv" + ] + }, + "opengl": { + "description": "OpenGL backend for Matplot++", + "dependencies": [ + "glad", + "glfw3", + "opengl" + ] + }, + "zlib": { + "description": "ZLIB and libpng support for Matplot++", + "dependencies": [ + "libpng", + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/matroska/portfile.cmake b/externals/vcpkg/ports/matroska/portfile.cmake new file mode 100755 index 000000000..eac14d7b7 --- /dev/null +++ b/externals/vcpkg/ports/matroska/portfile.cmake @@ -0,0 +1,26 @@ +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "matroska does not currently support UWP") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Matroska-Org/libmatroska + REF release-1.6.3 + SHA512 f4b4cd5b5e76c452fb559ead28c4bcb5ec4e28d74898f13c1709a6ab75d95cf82b319118445d7a7f895708bb0d5d1f3c09040d3e3263c6a2f2a27ffc92d35c2f + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DDISABLE_PKGCONFIG=1 +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Matroska) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/matroska/vcpkg.json b/externals/vcpkg/ports/matroska/vcpkg.json new file mode 100755 index 000000000..2987f36de --- /dev/null +++ b/externals/vcpkg/ports/matroska/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "matroska", + "version": "1.6.3", + "description": "a C++ library to parse Matroska files (.mkv and .mka)", + "homepage": "https://github.com/Matroska-Org/libmatroska", + "supports": "!uwp", + "dependencies": [ + "ebml", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/mbedtls/enable-pthread.patch b/externals/vcpkg/ports/mbedtls/enable-pthread.patch new file mode 100755 index 000000000..635310376 --- /dev/null +++ b/externals/vcpkg/ports/mbedtls/enable-pthread.patch @@ -0,0 +1,102 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8833246..f68ab02 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -28,6 +28,7 @@ set(MBEDTLS_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + + option(USE_PKCS11_HELPER_LIBRARY "Build mbed TLS with the pkcs11-helper library." OFF) + option(ENABLE_ZLIB_SUPPORT "Build mbed TLS with zlib library." OFF) ++option(ENABLE_PTHREAD "Build mbed TLS with pthread" OFF) + + option(ENABLE_PROGRAMS "Build mbed TLS programs." ON) + +@@ -231,6 +232,8 @@ else() + set(LIB_INSTALL_DIR lib) + endif() + ++include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/) ++ + if(ENABLE_ZLIB_SUPPORT) + find_package(ZLIB) + +@@ -239,6 +242,17 @@ if(ENABLE_ZLIB_SUPPORT) + endif(ZLIB_FOUND) + endif(ENABLE_ZLIB_SUPPORT) + ++if(ENABLE_PTHREAD) ++ if(WIN32) ++ find_package(pthreads_windows REQUIRED) ++ include_directories(${PThreads4W_INCLUDE_DIR}) ++ else() ++ set(CMAKE_THREAD_PREFER_PTHREAD ON) ++ find_package(Threads REQUIRED) ++ endif() ++ set(LINK_WITH_PTHREAD ON) ++endif() ++ + add_subdirectory(include) + + add_subdirectory(3rdparty) +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index 62c0f62..7923202 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -1,10 +1,14 @@ + option(INSTALL_MBEDTLS_HEADERS "Install mbed TLS headers." ON) + ++configure_file(mbedtls/config_threading.h.in mbedtls/config_threading.h) ++ + if(INSTALL_MBEDTLS_HEADERS) + + file(GLOB headers "mbedtls/*.h") + file(GLOB psa_headers "psa/*.h") +- ++ ++ set(headers ${headers} ${CMAKE_CURRENT_BINARY_DIR}/mbedtls/config_threading.h) ++ + install(FILES ${headers} + DESTINATION include/mbedtls + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) +diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h +index 1e6e052..51c20da 100644 +--- a/include/mbedtls/config.h ++++ b/include/mbedtls/config.h +@@ -24,6 +24,8 @@ + * limitations under the License. + */ + ++#include "mbedtls/config_threading.h" ++ + #ifndef MBEDTLS_CONFIG_H + #define MBEDTLS_CONFIG_H + +diff --git a/include/mbedtls/config_threading.h.in b/include/mbedtls/config_threading.h.in +new file mode 100644 +index 0000000..9d5d42e +--- /dev/null ++++ b/include/mbedtls/config_threading.h.in +@@ -0,0 +1,6 @@ ++#cmakedefine ENABLE_PTHREAD ++ ++#ifdef ENABLE_PTHREAD ++#define MBEDTLS_THREADING_C ++#define MBEDTLS_THREADING_PTHREAD ++#endif +\ No newline at end of file +diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt +index 33e2cfc..4b99331 100644 +--- a/library/CMakeLists.txt ++++ b/library/CMakeLists.txt +@@ -137,7 +137,11 @@ if(ENABLE_ZLIB_SUPPORT) + endif(ENABLE_ZLIB_SUPPORT) + + if(LINK_WITH_PTHREAD) +- set(libs ${libs} pthread) ++ if(WIN32) ++ set(libs ${libs} ${PThreads4W_LIBRARY}) ++ else() ++ set(libs ${libs} pthread) ++ endif() + endif() + + if(LINK_WITH_TRUSTED_STORAGE) diff --git a/externals/vcpkg/ports/mbedtls/portfile.cmake b/externals/vcpkg/ports/mbedtls/portfile.cmake new file mode 100755 index 000000000..1f65fff5b --- /dev/null +++ b/externals/vcpkg/ports/mbedtls/portfile.cmake @@ -0,0 +1,38 @@ +set(VCPKG_LIBRARY_LINKAGE static) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ARMmbed/mbedtls + REF 8b3f26a5ac38d4fdccbc5c5366229f3e01dafcc0 # mbedtls-2.28.0 + SHA512 a5d2694ae87347be7ebf5c32b86d7bb809cc696b549947efb3d12d41d5f726d4f7caed3cc6ee3f3c9b9e46b3c42c4ce8a5f9741b1b0a3c644b6ae615d2f4c55a + HEAD_REF mbedtls-2.28 + PATCHES + enable-pthread.patch +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + pthreads ENABLE_PTHREAD +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} + -DENABLE_TESTING=OFF + -DENABLE_PROGRAMS=OFF + -DMBEDTLS_FATAL_WARNINGS=FALSE +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +if (VCPKG_TARGET_IS_WINDOWS AND pthreads IN_LIST FEATURES) + file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +endif () + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/mbedtls/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/mbedtls/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..40a0bccb4 --- /dev/null +++ b/externals/vcpkg/ports/mbedtls/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,29 @@ +include(FindPackageHandleStandardArgs) + +find_path(MBEDTLS_INCLUDE_DIR mbedtls/ssl.h) + +find_library(MBEDTLS_CRYPTO_LIBRARY mbedcrypto) +find_package(pthreads_windows QUIET) +set(MBEDTLS_CRYPTO_LIBRARY ${MBEDTLS_CRYPTO_LIBRARY} ${PThreads4W_LIBRARY}) +find_library(MBEDTLS_X509_LIBRARY mbedx509) +find_library(MBEDTLS_TLS_LIBRARY mbedtls) +set(MBEDTLS_LIBRARIES ${MBEDTLS_CRYPTO_LIBRARY} ${MBEDTLS_X509_LIBRARY} ${MBEDTLS_TLS_LIBRARY}) + +if (MBEDTLS_INCLUDE_DIR AND EXISTS "${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h") + file( + STRINGS ${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h _MBEDTLS_VERLINE + REGEX "^#define[ \t]+MBEDTLS_VERSION_STRING[\t ].*" + ) + string(REGEX REPLACE ".*MBEDTLS_VERSION_STRING[\t ]+\"(.*)\"" "\\1" MBEDTLS_VERSION ${_MBEDTLS_VERLINE}) +endif() + +find_package_handle_standard_args( + mbedTLS + REQUIRED_VARS + MBEDTLS_INCLUDE_DIR + MBEDTLS_CRYPTO_LIBRARY + MBEDTLS_X509_LIBRARY + MBEDTLS_TLS_LIBRARY + PThreads4W_FOUND + VERSION_VAR MBEDTLS_VERSION +) diff --git a/externals/vcpkg/ports/mbedtls/vcpkg.json b/externals/vcpkg/ports/mbedtls/vcpkg.json new file mode 100755 index 000000000..93c0e9b22 --- /dev/null +++ b/externals/vcpkg/ports/mbedtls/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "mbedtls", + "version": "2.28.0", + "description": "An open source, portable, easy to use, readable and flexible SSL library", + "homepage": "https://github.com/ARMmbed/mbedtls", + "license": "Apache-2.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "pthreads": { + "description": "Multi-threading support", + "dependencies": [ + { + "name": "pthreads", + "platform": "windows" + } + ] + } + } +} diff --git a/externals/vcpkg/ports/mcpp/0001-fix-_POSIX_C_SOURCE.patch b/externals/vcpkg/ports/mcpp/0001-fix-_POSIX_C_SOURCE.patch new file mode 100755 index 000000000..37f625ba5 --- /dev/null +++ b/externals/vcpkg/ports/mcpp/0001-fix-_POSIX_C_SOURCE.patch @@ -0,0 +1,38 @@ +From d2625f80e08ff811a173ca3dbe76a0e004c26c65 Mon Sep 17 00:00:00 2001 +From: Nicole Mazzuca +Date: Tue, 22 Sep 2020 16:21:43 -0700 +Subject: [PATCH] fix _POSIX_C_SOURCE + +set it to correctly ask for 200112L, for readlink +--- + configed.H | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/configed.H b/configed.H +index 2e01c15..250f441 100644 +--- a/configed.H ++++ b/configed.H +@@ -189,19 +189,13 @@ + #define _POSIX_ 1 + #define _POSIX_SOURCE 1 + #ifndef _POSIX_C_SOURCE +-#define _POSIX_C_SOURCE 1 ++#define _POSIX_C_SOURCE 200112L + #define _POSIX_C_SOURCE_defined 1 + #endif + #include "limits.h" + #ifdef _AIX + #include "sys/stat.h" + #endif +-#undef _POSIX_ +-#undef _POSIX_SOURCE +-#ifdef _POSIX_C_SOURCE_defined +-#undef _POSIX_C_SOURCE +-#undef _POSIX_C_SOURCE_defined +-#endif + #define CHARBIT CHAR_BIT + #define UCHARMAX UCHAR_MAX + #define USHRTMAX USHRT_MAX +-- +2.24.3 (Apple Git-128) + diff --git a/externals/vcpkg/ports/mcpp/portfile.cmake b/externals/vcpkg/ports/mcpp/portfile.cmake new file mode 100755 index 000000000..8e2928ea1 --- /dev/null +++ b/externals/vcpkg/ports/mcpp/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO zeroc-ice/mcpp + REF e6abf9a561294b667bb931b80cf749c9be2d1a2f + SHA512 131b68401683bcfb947ac4969a59aa4c1683412c30f76c50e9e9c5c952a881b9950127db2ef22c96968d8c90d26bcdb5a90fb1b77d4dda7dee67bfe4a2676b35 + HEAD_REF master + PATCHES + 0001-fix-_POSIX_C_SOURCE.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file( + INSTALL + ${SOURCE_PATH}/mcpp_lib.h + ${SOURCE_PATH}/mcpp_out.h + DESTINATION + ${CURRENT_PACKAGES_DIR}/include +) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/mcpp/vcpkg.json b/externals/vcpkg/ports/mcpp/vcpkg.json new file mode 100755 index 000000000..4be6e6f68 --- /dev/null +++ b/externals/vcpkg/ports/mcpp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "mcpp", + "version-string": "2.7.2.14", + "port-version": 3, + "description": "Fork of mcpp, a C/C++ preprocessor", + "homepage": "https://github.com/zeroc-ice/mcpp" +} diff --git a/externals/vcpkg/ports/mdns/portfile.cmake b/externals/vcpkg/ports/mdns/portfile.cmake new file mode 100755 index 000000000..272ef3b93 --- /dev/null +++ b/externals/vcpkg/ports/mdns/portfile.cmake @@ -0,0 +1,20 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mjansson/mdns + REF 1.4.2 + SHA512 fa3fcf130721ee6f7012225c1e7952bd41703c2488b1d0ffe2b8c73ed06744d1cd9f03b6ab19aa0b8074fbfaafe46f8e102d6a648756725a60dc076e896cfbf6 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DMDNS_BUILD_EXAMPLE=OFF +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/mdns/vcpkg.json b/externals/vcpkg/ports/mdns/vcpkg.json new file mode 100755 index 000000000..c0dade8e7 --- /dev/null +++ b/externals/vcpkg/ports/mdns/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "mdns", + "version": "1.4.2", + "description": "Public domain mDNS/DNS-SD library in C", + "homepage": "https://github.com/mjansson/mdns", + "license": "Unlicense", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/mdnsresponder/portfile.cmake b/externals/vcpkg/ports/mdnsresponder/portfile.cmake new file mode 100755 index 000000000..5a391a45a --- /dev/null +++ b/externals/vcpkg/ports/mdnsresponder/portfile.cmake @@ -0,0 +1,93 @@ +vcpkg_download_distfile(ARCHIVE + URLS https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-878.270.2.tar.gz + FILENAME mDNSResponder-878.270.2.tar.gz + SHA512 dbc1805c757fceb2b37165ad2575e4084447c10f47ddc871f5476e25affd91f5f759662c17843e30857a9ea1ffd25132bc8012737cf22700ac329713e6a3ac0a +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +IF (TRIPLET_SYSTEM_ARCH MATCHES "x86") + SET(BUILD_ARCH "Win32") +ELSE() + SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH}) +ENDIF() + +function(FIX_VCXPROJ VCXPROJ_PATH) + file(READ ${VCXPROJ_PATH} ORIG) + if(${VCPKG_CRT_LINKAGE} STREQUAL "dynamic") + string(REGEX REPLACE + "MultiThreadedDebug" + "MultiThreadedDebugDLL" + ORIG "${ORIG}") + string(REGEX REPLACE + "MultiThreaded" + "MultiThreadedDLL" + ORIG "${ORIG}") + else() + string(REGEX REPLACE + "MultiThreadedDebugDLL" + "MultiThreadedDebug" + ORIG "${ORIG}") + string(REGEX REPLACE + "MultiThreadedDLL" + "MultiThreaded" + ORIG "${ORIG}") + endif() + if(${VCPKG_LIBRARY_LINKAGE} STREQUAL "dynamic") + string(REPLACE + "StaticLibrary" + "DynamicLibrary" + ORIG "${ORIG}") + else() + string(REPLACE + "DynamicLibrary" + "StaticLibrary" + ORIG "${ORIG}") + endif() + + string(REPLACE + "ProgramDatabase" + "OldStyle" + ORIG "${ORIG}") + file(WRITE ${VCXPROJ_PATH} "${ORIG}") +endfunction() + +FIX_VCXPROJ("${SOURCE_PATH}/mDNSWindows/DLL/dnssd.vcxproj") +FIX_VCXPROJ("${SOURCE_PATH}/Clients/DNS-SD.VisualStudio/dns-sd.vcxproj") + +vcpkg_build_msbuild( + PROJECT_PATH "${SOURCE_PATH}/mDNSResponder.sln" + PLATFORM ${BUILD_ARCH} + TARGET dns-sd +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(INSTALL + "${SOURCE_PATH}/mDNSWindows/DLL/${BUILD_ARCH}/Release/dnssd.dll" + DESTINATION "${CURRENT_PACKAGES_DIR}/bin" + ) + file(INSTALL + "${SOURCE_PATH}/mDNSWindows/DLL/${BUILD_ARCH}/Debug/dnssd.dll" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" + ) +endif() +file(INSTALL + "${SOURCE_PATH}/mDNSWindows/DLL/${BUILD_ARCH}/Release/dnssd.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib" +) +file(INSTALL + "${SOURCE_PATH}/mDNSWindows/DLL/${BUILD_ARCH}/Debug/dnssd.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" +) +file(INSTALL + "${SOURCE_PATH}/mDNSShared/dns_sd.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" +) +file(INSTALL + "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" +) +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/mdnsresponder/vcpkg.json b/externals/vcpkg/ports/mdnsresponder/vcpkg.json new file mode 100755 index 000000000..920ce4c4a --- /dev/null +++ b/externals/vcpkg/ports/mdnsresponder/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "mdnsresponder", + "version": "878.270.2", + "port-version": 1, + "description": "The mDNSResponder project is a component of Bonjour, Apple's ease-of-use IP networking initiative.", + "homepage": "https://developer.apple.com/bonjour/", + "supports": "windows & !uwp & !arm" +} diff --git a/externals/vcpkg/ports/mdspan/portfile.cmake b/externals/vcpkg/ports/mdspan/portfile.cmake new file mode 100755 index 000000000..af3df0890 --- /dev/null +++ b/externals/vcpkg/ports/mdspan/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kokkos/mdspan + REF aced2cebd362a1e15830da030bd16748131d28bd # stable as of 2021-11-03 + SHA512 a1950430be537497fb84c4a8c5e681cacead93512775098f38ea6c1a20b95d0f7110d9d0802fbdcf8ce3c40ade766cc697773f6ea6fcf8c363b3ebee55620f7c + HEAD_REF stable +) + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mdspan) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug") + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/mdspan/vcpkg.json b/externals/vcpkg/ports/mdspan/vcpkg.json new file mode 100755 index 000000000..8bfe7b88d --- /dev/null +++ b/externals/vcpkg/ports/mdspan/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "mdspan", + "version-date": "2021-11-03", + "description": "A non-owning multi-dimensional array reference type.", + "homepage": "https://github.com/kokkos/mdspan", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/mecab/CMakeLists.txt b/externals/vcpkg/ports/mecab/CMakeLists.txt new file mode 100755 index 000000000..9ebf42ee1 --- /dev/null +++ b/externals/vcpkg/ports/mecab/CMakeLists.txt @@ -0,0 +1,67 @@ +cmake_minimum_required(VERSION 3.12 FATAL_ERROR) + +PROJECT(mecab VERSION 1.0) + +file(GLOB SOURCE_FILE + "*.cpp" + "*.c" +) +file(GLOB HEADERS_FILE + "*.h" +) + +message(STATUS "current cmake path: ${CMAKE_CURRENT_SOURCE_DIR}") +list(REMOVE_ITEM SOURCE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/mecab-cost-train.cpp) +list(REMOVE_ITEM SOURCE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/mecab-dict-gen.cpp) +list(REMOVE_ITEM SOURCE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/mecab-dict-index.cpp) +list(REMOVE_ITEM SOURCE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/mecab-system-eval.cpp) +list(REMOVE_ITEM SOURCE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/mecab-test-gen.cpp) +#list(REMOVE_ITEM SOURCE_FILE "mecab-cost-train.cpp" "mecab-dict-gen.cpp" "mecab-dict-index.cpp" "mecab-system-eval.cpp" "mecab-test-gen.cpp") + +add_library (mecab ${SOURCE_FILE}) +target_include_directories(mecab PUBLIC + $ + $) + +if(UNIX) + target_compile_definitions(mecab PUBLIC -DHAVE_UNISTD_H -DHAVE_FCNTL_H -DHAVE_STDINT_H -DHAVE_SYS_TYPES_H -DHAVE_SYS_STAT_H -DHAVE_DIRENT_H -DDIC_VERSION=102 -DVERSION="@VERSION@" -DPACKAGE="mecab" -DMECAB_DEFAULT_RC="./mecabrc") +endif(UNIX) +if(WIN32) + target_compile_definitions(mecab PUBLIC -D_CRT_SECURE_NO_DEPRECATE -DMECAB_USE_THREAD -DDLL_EXPORT -DHAVE_GETENV -DHAVE_WINDOWS_H -DDIC_VERSION=102 -DVERSION="@VERSION@" -DPACKAGE="mecab" -DUNICODE -D_UNICODE -DMECAB_DEFAULT_RC="mecabrc") +endif(WIN32) + + +include (GNUInstallDirs) +include(CMakePackageConfigHelpers) + +set (mecab_CMAKE_DIR share/mecab CACHE STRING "Installation dir") +set (targets_export_name mecabTargets CACHE INTERNAL "") + +install(TARGETS mecab + EXPORT ${targets_export_name} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +install(FILES ${HEADERS_FILE} DESTINATION include/mecab CONFIGURATIONS Release) + +install(EXPORT ${targets_export_name} + NAMESPACE mecab:: + DESTINATION ${mecab_CMAKE_DIR}) + +configure_package_config_file( + "${PROJECT_SOURCE_DIR}/Config.cmake.in" + "${PROJECT_BINARY_DIR}/mecabConfig.cmake" + INSTALL_DESTINATION ${mecab_CMAKE_DIR}) + + +write_basic_package_version_file( + ${PROJECT_BINARY_DIR}/mecabConfigVersion.cmake + VERSION ${PROJECT_VERSION} + COMPATIBILITY SameMajorVersion ) + +install(FILES + ${PROJECT_BINARY_DIR}/mecabConfig.cmake + ${PROJECT_BINARY_DIR}/mecabConfigVersion.cmake + DESTINATION ${mecab_CMAKE_DIR}) diff --git a/externals/vcpkg/ports/mecab/Config.cmake.in b/externals/vcpkg/ports/mecab/Config.cmake.in new file mode 100755 index 000000000..927b3637b --- /dev/null +++ b/externals/vcpkg/ports/mecab/Config.cmake.in @@ -0,0 +1,4 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake") +check_required_components(mecab) \ No newline at end of file diff --git a/externals/vcpkg/ports/mecab/fix_wpath_unsigned.patch b/externals/vcpkg/ports/mecab/fix_wpath_unsigned.patch new file mode 100755 index 000000000..d8dcf1509 --- /dev/null +++ b/externals/vcpkg/ports/mecab/fix_wpath_unsigned.patch @@ -0,0 +1,40 @@ +diff --git a/mecab/src/common.h b/mecab/src/common.h +index d1fc459..2951d5a 100644 +--- a/mecab/src/common.h ++++ b/mecab/src/common.h +@@ -86,7 +86,8 @@ + #define WPATH_FORCE(path) (MeCab::Utf8ToWide(path).c_str()) + #define WPATH(path) (path) + #else +-#define WPATH(path) WPATH_FORCE(path) ++#define WPATH_FORCE(path) (MeCab::Utf8ToWide(path).c_str()) ++#define WPATH(path) (path) + #endif + #else + #define WPATH_FORCE(path) (path) +diff --git a/mecab/src/feature_index.cpp b/mecab/src/feature_index.cpp +index 051bdf8..fdd0145 100644 +--- a/mecab/src/feature_index.cpp ++++ b/mecab/src/feature_index.cpp +@@ -353,7 +353,7 @@ bool FeatureIndex::buildUnigramFeature(LearnerPath *path, + if (!r) goto NEXT; + os_ << r; + } break; +- case 't': os_ << (size_t)path->rnode->char_type; break; ++ case 't': os_ << (int)(size_t)path->rnode->char_type; break; + case 'u': os_ << ufeature; break; + case 'w': + if (path->rnode->stat == MECAB_NOR_NODE) { +diff --git a/mecab/src/writer.cpp b/mecab/src/writer.cpp +index 0ef6975..f068fa3 100644 +--- a/mecab/src/writer.cpp ++++ b/mecab/src/writer.cpp +@@ -257,7 +257,7 @@ bool Writer::writeNode(Lattice *lattice, + // input sentence + case 'S': os->write(lattice->sentence(), lattice->size()); break; + // sentence length +- case 'L': *os << lattice->size(); break; ++ case 'L': *os << (int)lattice->size(); break; + // morph + case 'm': os->write(node->surface, node->length); break; + case 'M': os->write(reinterpret_cast diff --git a/externals/vcpkg/ports/mecab/portfile.cmake b/externals/vcpkg/ports/mecab/portfile.cmake new file mode 100755 index 000000000..6bf020945 --- /dev/null +++ b/externals/vcpkg/ports/mecab/portfile.cmake @@ -0,0 +1,28 @@ +if (VCPKG_TARGET_TRIPLET STREQUAL "x64-uwp" OR VCPKG_TARGET_TRIPLET STREQUAL "arm64-windows" OR VCPKG_TARGET_TRIPLET STREQUAL "arm-uwp") + message(FATAL_ERROR "mecab does not support on this platform") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO taku910/mecab + REF 3a07c4eefaffb4e7a0690a7f4e5e0263d3ddb8a3 + SHA512 d3288cca7207daf66df4349819b64fc9cc069c775512cf0607ca855e9e5512509c36b0e2bb0e955478acae13ff0c35df7442f18a8458fab0ed664d62854c0b25 + HEAD_REF master + PATCHES + fix_wpath_unsigned.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/mecab/src) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH}/mecab/src) +file(COPY ${SOURCE_PATH}/mecab/COPYING DESTINATION ${SOURCE_PATH}/mecab/src) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/mecab/src +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets() +vcpkg_copy_pdbs() + +file(COPY ${SOURCE_PATH}/mecab/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/mecab) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/mecab/COPYING ${CURRENT_PACKAGES_DIR}/share/mecab/copyright) diff --git a/externals/vcpkg/ports/mecab/vcpkg.json b/externals/vcpkg/ports/mecab/vcpkg.json new file mode 100755 index 000000000..7475acf4a --- /dev/null +++ b/externals/vcpkg/ports/mecab/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "mecab", + "version-string": "2019-09-25", + "port-version": 2, + "description": "A morphological analysis engine based on CRF", + "supports": "!(uwp | arm | arm64)" +} diff --git a/externals/vcpkg/ports/memorymodule/portfile.cmake b/externals/vcpkg/ports/memorymodule/portfile.cmake new file mode 100755 index 000000000..af5fade33 --- /dev/null +++ b/externals/vcpkg/ports/memorymodule/portfile.cmake @@ -0,0 +1,43 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO fancycode/MemoryModule + REF 5f83e41c3a3e7c6e8284a5c1afa5a38790809461 + SHA512 6d42bd80dfeaf7bc662adafe7d6a7d7301eff5ea53bb59fce7e9c1a6ee22d31d2ab5696afc0a92c1501aa4161a60366418bfc3bed7ed2dcb6cae24243f4fa6d4 + HEAD_REF master +) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + unicode UNICODE +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DTESTSUITE=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_build(TARGET MemoryModule) + +file(INSTALL "${SOURCE_PATH}/MemoryModule.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/MemoryModule.lib") + file(INSTALL + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/MemoryModule.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" + ) +endif() + +if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/MemoryModule.lib") + file(INSTALL + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/MemoryModule.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib" + ) +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/memorymodule/vcpkg.json b/externals/vcpkg/ports/memorymodule/vcpkg.json new file mode 100755 index 000000000..49b5726ad --- /dev/null +++ b/externals/vcpkg/ports/memorymodule/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "memorymodule", + "version-string": "2019-12-31", + "port-version": 2, + "description": "Library to load a DLL from memory", + "homepage": "https://github.com/fancycode/MemoryModule", + "supports": "!linux & !osx & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], + "default-features": [ + "unicode" + ], + "features": { + "unicode": { + "description": "Compile with UNICODE support" + } + } +} diff --git a/externals/vcpkg/ports/mesa/clang.patch b/externals/vcpkg/ports/mesa/clang.patch new file mode 100755 index 000000000..b8c7b547a --- /dev/null +++ b/externals/vcpkg/ports/mesa/clang.patch @@ -0,0 +1,52 @@ +diff --git a/meson.build b/meson.build +index 53ec2c2ef95e65447dd0f0eb65c0f92a5906590d..c124b5fb0d2b28424f33aac54cd4f87c4249dc40 100644 +--- a/meson.build ++++ b/meson.build +@@ -1087,7 +1087,18 @@ elif host_machine.system() == 'windows' + '-DNOMINMAX', + ] + else +- pre_args += ['-D__MSVCRT_VERSION__=0x0700'] ++ # When the target is not mingw/ucrt ++ # NOTE: clang's stddef.h are conflict with mingw/ucrt's stddef.h ++ # So do not include headers that defined in clang for detecting ++ # _UCRT ++ if cc.compiles(''' ++ #include ++ #if defined(__MINGW32__) && defined(_UCRT) ++ #error ++ #endif ++ int main(void) { return 0; }''') ++ pre_args += ['-D__MSVCRT_VERSION__=0x0700'] ++ endif + endif + elif host_machine.system() == 'openbsd' + pre_args += '-D_ISOC11_SOURCE' +diff --git a/src/compiler/nir/nir_lower_atomics_to_ssbo.c b/src/compiler/nir/nir_lower_atomics_to_ssbo.c +index c1799d0b9d0af70148928a4b224172c188c64194..448f63bdc7cc3b9cae123e3c0abe79b4b5af380b 100644 +--- a/src/compiler/nir/nir_lower_atomics_to_ssbo.c ++++ b/src/compiler/nir/nir_lower_atomics_to_ssbo.c +@@ -27,10 +27,6 @@ + #include "nir.h" + #include "nir_builder.h" + +-#if defined(_WIN32) && !defined(snprintf) +-#define snprintf _snprintf +-#endif +- + /* + * Remap atomic counters to SSBOs, starting from the shader's next SSBO slot + * (info.num_ssbos). +diff --git a/src/compiler/spirv/vtn_private.h b/src/compiler/spirv/vtn_private.h +index b1b40c8ee992eaeea985c58f4e8923724c1d385b..6053c2544a2628300cc8dc3311c8e4f0f69d36d5 100644 +--- a/src/compiler/spirv/vtn_private.h ++++ b/src/compiler/spirv/vtn_private.h +@@ -41,7 +41,7 @@ struct vtn_builder; + struct vtn_decoration; + + /* setjmp/longjmp is broken on MinGW: https://sourceforge.net/p/mingw-w64/bugs/406/ */ +-#ifdef __MINGW32__ ++#if defined(__MINGW32__) && !defined(_UCRT) + #define vtn_setjmp __builtin_setjmp + #define vtn_longjmp __builtin_longjmp + #else diff --git a/externals/vcpkg/ports/mesa/clover.patch b/externals/vcpkg/ports/mesa/clover.patch new file mode 100755 index 000000000..6e39e180f --- /dev/null +++ b/externals/vcpkg/ports/mesa/clover.patch @@ -0,0 +1,63 @@ +From b7c465dc43693cb1ad7e073cc7d8f89f5cfbd0ac Mon Sep 17 00:00:00 2001 +From: pal1000 +Date: Sat, 13 Nov 2021 11:39:58 +0200 +Subject: [PATCH] clover: Use static pipe loader on Windows + +Currently this only supports linking in swrast, but more Windows-supporting +drivers can be added pretty easily. +--- + src/gallium/targets/opencl/meson.build | 18 +++++++++++++++--- + src/gallium/targets/opencl/target.c | 2 ++ + 2 files changed, 17 insertions(+), 3 deletions(-) + create mode 100644 src/gallium/targets/opencl/target.c + +diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build +index ec65fcbe18e..f6ca4a28f20 100644 +--- a/src/gallium/targets/opencl/meson.build ++++ b/src/gallium/targets/opencl/meson.build +@@ -85,19 +85,31 @@ if not (dep_clang.found() and dep_clang_usable) + endif + endif + ++if host_machine.system() == 'windows' ++ libpipe_loader = libpipe_loader_static ++ target_files = ['target.c'] ++else ++ libpipe_loader = libpipe_loader_dynamic ++ target_files = [] ++endif ++ + ocldef = files(opencl_libname + '.def')[0] + + libopencl = shared_library( + opencl_libname, +- [], ++ target_files, ++ include_directories : [ ++ inc_include, inc_util, inc_src, inc_gallium, inc_gallium_winsys, inc_gallium_drivers, inc_gallium_aux ++ ], + vs_module_defs : ocldef, + link_args : [ld_args_gc_sections, opencl_link_args], + link_depends : opencl_link_deps, + link_whole : libclover, +- link_with : [libpipe_loader_dynamic, libgallium], ++ link_with : [libpipe_loader, libgallium, libws_null, libwsw], + dependencies : [ + idep_mesautil, +- dep_clock, dep_dl, dep_unwind, dep_elf, dep_clang, dep_version ++ dep_clock, dep_dl, dep_unwind, dep_elf, dep_clang, dep_version, ++ driver_swrast + ], + version : '@0@.0.0'.format(opencl_version), + install : true, +diff --git a/src/gallium/targets/opencl/target.c b/src/gallium/targets/opencl/target.c +new file mode 100644 +index 00000000000..308e23bb4a0 +--- /dev/null ++++ b/src/gallium/targets/opencl/target.c +@@ -0,0 +1,2 @@ ++#include "target-helpers/drm_helper.h" ++#include "target-helpers/sw_helper.h" +-- +2.33.1.windows.1 + diff --git a/externals/vcpkg/ports/mesa/def-fixes.patch b/externals/vcpkg/ports/mesa/def-fixes.patch new file mode 100755 index 000000000..650187273 --- /dev/null +++ b/externals/vcpkg/ports/mesa/def-fixes.patch @@ -0,0 +1,3571 @@ +diff --git a/bin/gen_vs_module_defs.py b/bin/gen_vs_module_defs.py +new file mode 100644 +index 0000000000000000000000000000000000000000..dff8ab36f92ffbc18dbb2779563c25df567bb7b0 +--- /dev/null ++++ b/bin/gen_vs_module_defs.py +@@ -0,0 +1,98 @@ ++#!/usr/bin/env python3 ++# Copyright © 2021-2021 Yonggang Luo ++ ++# Permission is hereby granted, free of charge, to any person obtaining a copy ++# of this software and associated documentation files (the "Software"), to deal ++# in the Software without restriction, including without limitation the rights ++# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++# copies of the Software, and to permit persons to whom the Software is ++# furnished to do so, subject to the following conditions: ++ ++# The above copyright notice and this permission notice shall be included in ++# all copies or substantial portions of the Software. ++ ++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++# SOFTWARE. ++ ++gen_help = """Generates visual studio module definition file.""" ++ ++import argparse ++ ++""" ++For input template definition file ++For gcc/x64,gcc/arm64,visual studio ++`wglMakeCurrent@8 @357` => `wglMakeCurrent @357` ++`DrvCopyContext@12` => `DrvCopyContext` ++`stw_get_device` => `stw_get_device` ++For gcc/x86,gcc/arm ++`wglMakeCurrent@8 @357` => `wglMakeCurrent@8 @357 == wglMakeCurrent` ++`DrvCopyContext@12` => `DrvCopyContext@12 == DrvCopyContext` ++`stw_get_device` => `stw_get_device` ++ ++""" ++def gen_vs_module_def(in_file: str, out_file: str, compiler_id: str, cpu_family: str) -> None: ++ out_file_lines = ['EXPORTS'] ++ with open(in_file, 'r', encoding='utf-8') as f: ++ lines = f.readlines() ++ for line in lines: ++ line = line.strip() ++ tokens = line.split(';') ++ if not tokens: ++ continue ++ def_infos = [x for x in tokens[0].split(' ') if len(x) > 0] ++ if not def_infos: ++ if line: ++ out_file_lines.append('\t' + line) ++ else: ++ out_file_lines.append('') ++ continue ++ name_infos = def_infos[0].split('@') ++ if not name_infos: ++ out_file_lines.append('\t;' + line) ++ continue ++ order_info = '' if len(def_infos) <= 1 else def_infos[1] ++ if def_infos[0] != name_infos[0] and \ ++ (compiler_id == 'gcc') and (cpu_family not in {'x86_64', 'aarch64'}): ++ if order_info: ++ out_file_lines.append('\t' + def_infos[0] + ' ' + order_info + ' == ' + name_infos[0]) ++ else: ++ out_file_lines.append('\t' + def_infos[0] + ' == ' + name_infos[0]) ++ else: ++ if order_info: ++ out_file_lines.append('\t' + name_infos[0] + ' ' + order_info) ++ else: ++ out_file_lines.append('\t' + name_infos[0]) ++ with open(out_file, 'wb') as f: ++ out_file_content = '\n'.join(out_file_lines) + '\n' ++ f.write(out_file_content.encode('utf-8')) ++''' ++python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/libgl-gdi/opengl32.def.in --out_file src/gallium/targets/libgl-gdi/opengl32.def --compiler_id gcc --cpu_family x86_64 ++python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/libgl-gdi/opengl32.def.in --out_file src/gallium/targets/libgl-gdi/opengl32.mingw.def --compiler_id gcc --cpu_family x86 ++ ++python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/osmesa/osmesa.def.in --out_file src/gallium/targets/osmesa/osmesa.def --compiler_id gcc --cpu_family x86_64 ++python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/osmesa/osmesa.def.in --out_file src/gallium/targets/osmesa/osmesa.mingw.def --compiler_id gcc --cpu_family x86 ++ ++python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/wgl/gallium_wgl.def.in --out_file src/gallium/targets/wgl/gallium_wgl.def --compiler_id gcc --cpu_family x86_64 ++python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/wgl/gallium_wgl.def.in --out_file src/gallium/targets/wgl/gallium_wgl.mingw.def --compiler_id gcc --cpu_family x86 ++ ++python ./bin/gen_vs_module_defs.py --in_file src/egl/main/egl.def.in --out_file src/egl/main/egl.def --compiler_id gcc --cpu_family x86_64 ++python ./bin/gen_vs_module_defs.py --in_file src/egl/main/egl.def.in --out_file src/egl/main/egl.mingw.def --compiler_id gcc --cpu_family x86 ++ ++python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/lavapipe/vulkan_lvp.def.in --out_file src/gallium/targets/lavapipe/vulkan_lvp.def --compiler_id gcc --cpu_family x86_64 ++python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/lavapipe/vulkan_lvp.def.in --out_file src/gallium/targets/lavapipe/vulkan_lvp.mingw.def --compiler_id gcc --cpu_family x86 ++ ++''' ++if __name__ == "__main__": ++ parser = argparse.ArgumentParser(description=gen_help) ++ parser.add_argument('--in_file', help='input template moudle definition file') ++ parser.add_argument('--out_file', help='output moudle definition file') ++ parser.add_argument('--compiler_id', help='compiler id') ++ parser.add_argument('--cpu_family', help='cpu family') ++ args = parser.parse_args() ++ # print(args) ++ gen_vs_module_def(args.in_file, args.out_file, args.compiler_id, args.cpu_family) +diff --git a/bin/meson.build b/bin/meson.build +index 000abef770966c4baecd0b47922f42c532a8c2cf..1b7301585f9e4b0f0556ce2ae11b03b128ab4677 100644 +--- a/bin/meson.build ++++ b/bin/meson.build +@@ -19,5 +19,6 @@ + # SOFTWARE. + + git_sha1_gen_py = files('git_sha1_gen.py') ++gen_vs_module_defs_py = files('gen_vs_module_defs.py') + symbols_check = find_program('symbols-check.py') + install_megadrivers_py = find_program('install_megadrivers.py') +diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build +index 523782f281f650d0558af64a0c0a2bf77c217e1e..b6ecd999e71ab3ecb780af4fa2146c617e3c8e41 100644 +--- a/src/amd/vulkan/meson.build ++++ b/src/amd/vulkan/meson.build +@@ -149,12 +149,10 @@ if with_ld_version_script + libvulkan_radeon_link_depends += files('vulkan.sym') + endif + +-vulkan_radv_def = 'vulkan_radv.def' +- + libvulkan_radeon = shared_library( + 'vulkan_radeon', + [libradv_files, radv_entrypoints, sha1_h], +- vs_module_defs : vulkan_radv_def, ++ vs_module_defs : vulkan_api_def, + include_directories : [ + inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_amd, inc_amd_common, inc_amd_common_llvm, inc_compiler, inc_util, + ], +diff --git a/src/amd/vulkan/vulkan_radv.def b/src/amd/vulkan/vulkan_radv.def +deleted file mode 100644 +index 64a9caae59398a4768f663f18f8598476991f85c..0000000000000000000000000000000000000000 +--- a/src/amd/vulkan/vulkan_radv.def ++++ /dev/null +@@ -1,4 +0,0 @@ +-EXPORTS +-vk_icdNegotiateLoaderICDInterfaceVersion +-vk_icdGetInstanceProcAddr +-vk_icdGetPhysicalDeviceProcAddr +diff --git a/src/egl/main/egl.def b/src/egl/main/egl.def +deleted file mode 100644 +index 54ae76b330929db865dc4ef0fd1723a88dc47979..0000000000000000000000000000000000000000 +--- a/src/egl/main/egl.def ++++ /dev/null +@@ -1,47 +0,0 @@ +-EXPORTS +- eglBindAPI +- eglBindTexImage +- eglChooseConfig +- eglClientWaitSync +- eglCopyBuffers +- eglCreateContext +- eglCreateImage +- eglCreatePbufferFromClientBuffer +- eglCreatePbufferSurface +- eglCreatePixmapSurface +- eglCreatePlatformPixmapSurface +- eglCreatePlatformWindowSurface +- eglCreateSync +- eglCreateWindowSurface +- eglDestroyContext +- eglDestroyImage +- eglDestroySurface +- eglDestroySync +- eglGetConfigAttrib +- eglGetConfigs +- eglGetCurrentContext +- eglGetCurrentDisplay +- eglGetCurrentSurface +- eglGetDisplay +- eglGetError +- eglGetPlatformDisplay +- eglGetProcAddress +- eglGetSyncAttrib +- eglInitialize +- eglMakeCurrent +- eglQueryAPI +- eglQueryContext +- eglQueryString +- eglQuerySurface +- eglReleaseTexImage +- eglReleaseThread +- eglSurfaceAttrib +- eglSwapBuffers +- eglSwapInterval +- eglTerminate +- eglWaitClient +- eglWaitGL +- eglWaitNative +- eglWaitSync +- MesaGLInteropEGLQueryDeviceInfo +- MesaGLInteropEGLExportObject +diff --git a/src/egl/main/egl.def.in b/src/egl/main/egl.def.in +new file mode 100644 +index 0000000000000000000000000000000000000000..b2439d9a2caaef26b48e737c8f6cd8314398ddeb +--- /dev/null ++++ b/src/egl/main/egl.def.in +@@ -0,0 +1,49 @@ ++; stdcall calling convention have @number suffix on 32 bits architecture for gcc ++eglBindAPI@4 ++eglBindTexImage@12 ++eglChooseConfig@20 ++eglClientWaitSync@20 ++eglCopyBuffers@12 ++eglCreateContext@16 ++eglCreateImage@20 ++eglCreatePbufferFromClientBuffer@20 ++eglCreatePbufferSurface@12 ++eglCreatePixmapSurface@16 ++eglCreatePlatformPixmapSurface@16 ++eglCreatePlatformWindowSurface@16 ++eglCreateSync@12 ++eglCreateWindowSurface@16 ++eglDestroyContext@8 ++eglDestroyImage@8 ++eglDestroySurface@8 ++eglDestroySync@8 ++eglGetConfigAttrib@16 ++eglGetConfigs@16 ++eglGetCurrentContext@0 ++eglGetCurrentDisplay@0 ++eglGetCurrentSurface@4 ++eglGetDisplay@4 ++eglGetError@0 ++eglGetPlatformDisplay@12 ++eglGetProcAddress@4 ++eglGetSyncAttrib@16 ++eglInitialize@12 ++eglMakeCurrent@16 ++eglQueryAPI@0 ++eglQueryContext@16 ++eglQueryString@8 ++eglQuerySurface@16 ++eglReleaseTexImage@12 ++eglReleaseThread@0 ++eglSurfaceAttrib@16 ++eglSwapBuffers@8 ++eglSwapInterval@8 ++eglTerminate@4 ++eglWaitClient@0 ++eglWaitGL@0 ++eglWaitNative@4 ++eglWaitSync@12 ++ ++; __cdecl calling convention have no @number suffix ++MesaGLInteropEGLQueryDeviceInfo ++MesaGLInteropEGLExportObject +diff --git a/src/egl/meson.build b/src/egl/meson.build +index 315a95013f39b76a47067073f106eda518dc6b71..53044297322ad6ea3137bd1fe48b778a61608f5e 100644 +--- a/src/egl/meson.build ++++ b/src/egl/meson.build +@@ -177,6 +177,15 @@ else + ) + endif + ++egl_def = custom_target( ++ 'egl.def', ++ input: 'main/egl.def.in', ++ output : 'egl.def', ++ command : [prog_python, gen_vs_module_defs_py, ++ '--in_file', '@INPUT@', '--out_file', '@OUTPUT@', ++ '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()] ++) ++ + libegl = shared_library( + egl_lib_name, + files_egl, +@@ -194,7 +203,7 @@ libegl = shared_library( + version : egl_lib_version, + soversion : egl_lib_soversion, + name_prefix : 'lib', # even on windows +- vs_module_defs : 'main/egl.def' ++ vs_module_defs : egl_def + ) + + if not with_glvnd +diff --git a/src/gallium/frontends/d3d10umd/d3d10_sw.def b/src/gallium/frontends/d3d10umd/d3d10_sw.def +deleted file mode 100644 +index 5b76bfccefaabc9c09e000ffab579d1487a3a31c..0000000000000000000000000000000000000000 +--- a/src/gallium/frontends/d3d10umd/d3d10_sw.def ++++ /dev/null +@@ -1,53 +0,0 @@ +-EXPORTS +- OpenAdapter10 +- OpenAdapter10_2 +- D3DKMTAcquireKeyedMutex +- D3DKMTCloseAdapter +- D3DKMTConfigureSharedResource +- D3DKMTCreateAllocation +- D3DKMTCreateAllocation2 +- D3DKMTCreateContext +- D3DKMTCreateDevice +- D3DKMTCreateKeyedMutex +- D3DKMTCreateSynchronizationObject +- D3DKMTCreateSynchronizationObject2 +- D3DKMTDestroyAllocation +- D3DKMTDestroyContext +- D3DKMTDestroyDevice +- D3DKMTDestroyKeyedMutex +- D3DKMTDestroySynchronizationObject +- D3DKMTEscape +- D3DKMTGetContextSchedulingPriority +- ;D3DKMTGetDeviceSchedulingPriority +- D3DKMTGetDeviceState +- D3DKMTGetDisplayModeList +- D3DKMTGetMultisampleMethodList +- D3DKMTGetRuntimeData +- D3DKMTGetSharedPrimaryHandle +- D3DKMTLock +- D3DKMTOpenAdapterFromDeviceName +- D3DKMTOpenAdapterFromGdiDisplayName +- D3DKMTOpenKeyedMutex +- D3DKMTOpenResource +- D3DKMTOpenResource2 +- D3DKMTOpenSynchronizationObject +- D3DKMTPresent +- D3DKMTQueryAdapterInfo +- D3DKMTQueryAllocationResidency +- D3DKMTQueryResourceInfo +- D3DKMTReleaseKeyedMutex +- D3DKMTRender +- D3DKMTSetAllocationPriority +- D3DKMTSetContextSchedulingPriority +- ;D3DKMTSetDeviceSchedulingPriority +- D3DKMTSetDisplayMode +- D3DKMTSetDisplayPrivateDriverFormat +- D3DKMTSetGammaRamp +- D3DKMTSetVidPnSourceOwner +- D3DKMTSetVidPnSourceOwner1 +- D3DKMTSignalSynchronizationObject +- D3DKMTSignalSynchronizationObject2 +- D3DKMTUnlock +- D3DKMTWaitForSynchronizationObject +- D3DKMTWaitForSynchronizationObject2 +- D3DKMTWaitForVerticalBlankEvent +diff --git a/src/gallium/frontends/osmesa/meson.build b/src/gallium/frontends/osmesa/meson.build +index e5848fd9934afc22119a14122e6c2d095ab8f350..fe78a4daa31bb01bf8535ff4498172241e554610 100644 +--- a/src/gallium/frontends/osmesa/meson.build ++++ b/src/gallium/frontends/osmesa/meson.build +@@ -20,7 +20,7 @@ + + osmesa_st_c_args = [] + if with_platform_windows +- osmesa_st_c_args += ['-DBUILD_GL32', '-DWIN32_LEAN_AND_MEAN'] ++ osmesa_st_c_args += ['-DWIN32_LEAN_AND_MEAN'] + if not with_shared_glapi + osmesa_st_c_args += ['-D_GLAPI_NO_EXPORTS'] + endif +diff --git a/src/gallium/targets/d3d10sw/d3d10_sw.def.in b/src/gallium/targets/d3d10sw/d3d10_sw.def.in +new file mode 100644 +index 0000000000000000000000000000000000000000..a81de54c4d285c67b1dd9a6da855a65446239831 +--- /dev/null ++++ b/src/gallium/targets/d3d10sw/d3d10_sw.def.in +@@ -0,0 +1,76 @@ ++; stdcall calling convention have @number suffix on 32 bits architecture for gcc ++OpenAdapter10@4 ++OpenAdapter10_2@4 ++D3DKMTAcquireKeyedMutex@4 ++;D3DKMTCheckExclusiveOwnership@0 ++;D3DKMTCheckMonitorPowerState@4 ++;D3DKMTCheckOcclusion@4 ++;D3DKMTCheckSharedResourceAccess@4 ++;D3DKMTCheckVidPnExclusiveOwnership@4 ++D3DKMTCloseAdapter@4 ++D3DKMTConfigureSharedResource@4 ++D3DKMTCreateAllocation2@4 ++D3DKMTCreateAllocation@4 ++D3DKMTCreateContext@4 ++;D3DKMTCreateDCFromMemory@4 ++D3DKMTCreateDevice@4 ++D3DKMTCreateKeyedMutex@4 ++;D3DKMTCreateOverlay@4 ++D3DKMTCreateSynchronizationObject2@4 ++D3DKMTCreateSynchronizationObject@4 ++D3DKMTDestroyAllocation@4 ++D3DKMTDestroyContext@4 ++;D3DKMTDestroyDCFromMemory@4 ++D3DKMTDestroyDevice@4 ++D3DKMTDestroyKeyedMutex@4 ++;D3DKMTDestroyOverlay@4 ++D3DKMTDestroySynchronizationObject@4 ++D3DKMTEscape@4 ++;D3DKMTFlipOverlay@4 ++D3DKMTGetContextSchedulingPriority@4 ++D3DKMTGetDeviceState@4 ++D3DKMTGetDisplayModeList@4 ++D3DKMTGetMultisampleMethodList@4 ++;D3DKMTGetOverlayState@4 ++;D3DKMTGetPresentHistory@4 ++;D3DKMTGetPresentQueueEvent@8 ++;D3DKMTGetProcessSchedulingPriorityClass@8 ++D3DKMTGetRuntimeData@4 ++;D3DKMTGetScanLine@4 ++D3DKMTGetSharedPrimaryHandle@4 ++;D3DKMTInvalidateActiveVidPn@4 ++D3DKMTLock@4 ++D3DKMTOpenAdapterFromDeviceName@4 ++D3DKMTOpenAdapterFromGdiDisplayName@4 ++;D3DKMTOpenAdapterFromHdc@4 ++D3DKMTOpenKeyedMutex@4 ++D3DKMTOpenResource2@4 ++D3DKMTOpenResource@4 ++D3DKMTOpenSynchronizationObject@4 ++;D3DKMTPollDisplayChildren@4 ++D3DKMTPresent@4 ++D3DKMTQueryAdapterInfo@4 ++D3DKMTQueryAllocationResidency@4 ++D3DKMTQueryResourceInfo@4 ++;D3DKMTQueryStatistics@4 ++D3DKMTReleaseKeyedMutex@4 ++;D3DKMTReleaseProcessVidPnSourceOwners@4 ++D3DKMTRender@4 ++D3DKMTSetAllocationPriority@4 ++D3DKMTSetContextSchedulingPriority@4 ++D3DKMTSetDisplayMode@4 ++D3DKMTSetDisplayPrivateDriverFormat@4 ++D3DKMTSetGammaRamp@4 ++;D3DKMTSetProcessSchedulingPriorityClass@8 ++;D3DKMTSetQueuedLimit@4 ++D3DKMTSetVidPnSourceOwner@4 ++;D3DKMTSharedPrimaryLockNotification@4 ++;D3DKMTSharedPrimaryUnLockNotification@4 ++D3DKMTSignalSynchronizationObject2@4 ++D3DKMTSignalSynchronizationObject@4 ++D3DKMTUnlock@4 ++;D3DKMTUpdateOverlay@4 ++;D3DKMTWaitForIdle@4 ++D3DKMTWaitForSynchronizationObject2@4 ++D3DKMTWaitForSynchronizationObject@4 ++D3DKMTWaitForVerticalBlankEvent@4 +diff --git a/src/gallium/targets/d3d10sw/meson.build b/src/gallium/targets/d3d10sw/meson.build +index fe8632d3c7ff3f1a61a20f6bd88f25e697316e10..8b90c561152f96be787f838467d0e3407a1bd134 100644 +--- a/src/gallium/targets/d3d10sw/meson.build ++++ b/src/gallium/targets/d3d10sw/meson.build +@@ -19,20 +19,22 @@ + # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + # SOFTWARE. + +-d3d10sw_def = files('../../frontends/d3d10umd/d3d10_sw.def')[0] +-_link_args_d3d10sw = [] +-if cc.get_id() == 'gcc' +- _link_args_d3d10sw += '-Wl,--enable-stdcall-fixup' +-endif ++d3d10_sw_def = custom_target( ++ 'd3d10_sw.def', ++ input: 'd3d10_sw.def.in', ++ output : 'd3d10_sw.def', ++ command : [prog_python, gen_vs_module_defs_py, ++ '--in_file', '@INPUT@', '--out_file', '@OUTPUT@', ++ '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()] ++) + + libd3d10sw = shared_library( + 'd3d10sw', + ['d3d10_gdi.c'], +- vs_module_defs : d3d10sw_def, ++ vs_module_defs : d3d10_sw_def, + include_directories : [ + inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_d3d10umd, inc_gallium_winsys, inc_gallium_winsys_sw, inc_gallium_drivers, + ], +- link_args : _link_args_d3d10sw, + link_whole : [libd3d10umd], + link_with : [ + libgallium, libwsgdi +diff --git a/src/gallium/targets/lavapipe/meson.build b/src/gallium/targets/lavapipe/meson.build +index f2b363099ae154b71efd7c217598e0eb48ff3a0c..bda4fbc574d7f5d7ca2b903ff928c72951022132 100644 +--- a/src/gallium/targets/lavapipe/meson.build ++++ b/src/gallium/targets/lavapipe/meson.build +@@ -1,14 +1,9 @@ + +-if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64' +- vulkan_lvp_def = 'vulkan_lvp.mingw.def' +-else +- vulkan_lvp_def = 'vulkan_lvp.def' +-endif + + libvulkan_lvp = shared_library( + 'vulkan_lvp', + [ 'target.c' ], +- vs_module_defs : vulkan_lvp_def, ++ vs_module_defs : vulkan_api_def, + include_directories : [ inc_src, inc_util, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_winsys, inc_gallium_drivers ], + link_whole : [ liblavapipe_st ], + link_with : [libpipe_loader_static, libgallium, libwsw, libswdri, libws_null, libswkmsdri ], +diff --git a/src/gallium/targets/lavapipe/vulkan_lvp.def b/src/gallium/targets/lavapipe/vulkan_lvp.def +deleted file mode 100644 +index 64a9caae59398a4768f663f18f8598476991f85c..0000000000000000000000000000000000000000 +--- a/src/gallium/targets/lavapipe/vulkan_lvp.def ++++ /dev/null +@@ -1,4 +0,0 @@ +-EXPORTS +-vk_icdNegotiateLoaderICDInterfaceVersion +-vk_icdGetInstanceProcAddr +-vk_icdGetPhysicalDeviceProcAddr +diff --git a/src/gallium/targets/lavapipe/vulkan_lvp.mingw.def b/src/gallium/targets/lavapipe/vulkan_lvp.mingw.def +deleted file mode 100644 +index c9638323ab044f072ad30f5089074909f769b8d4..0000000000000000000000000000000000000000 +--- a/src/gallium/targets/lavapipe/vulkan_lvp.mingw.def ++++ /dev/null +@@ -1,4 +0,0 @@ +-EXPORTS +-vk_icdNegotiateLoaderICDInterfaceVersion@4 +-vk_icdGetInstanceProcAddr = vk_icdGetInstanceProcAddr@8 +-vk_icdGetPhysicalDeviceProcAddr = vk_icdGetPhysicalDeviceProcAddr@8 +diff --git a/src/gallium/targets/libgl-gdi/meson.build b/src/gallium/targets/libgl-gdi/meson.build +index 25300000221d44c7d669ec49df1fb88396f5c968..b333eae0f34227b0dfd1abc08006680ea5359224 100644 +--- a/src/gallium/targets/libgl-gdi/meson.build ++++ b/src/gallium/targets/libgl-gdi/meson.build +@@ -20,20 +20,20 @@ + + + opengl32_link_args = [] +-if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64' +- opengl32_link_args += ['-Wl,--enable-stdcall-fixup'] +-endif + +-if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64' +- ogl_def = 'opengl32.mingw.def' +-else +- ogl_def = 'opengl32.def' +-endif ++opengl32_def = custom_target( ++ 'opengl32.def', ++ input: 'opengl32.def.in', ++ output : 'opengl32.def', ++ command : [prog_python, gen_vs_module_defs_py, ++ '--in_file', '@INPUT@', '--out_file', '@OUTPUT@', ++ '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()] ++) + + libopengl32 = shared_library( + 'opengl32', + ['stw_wgl.c'], +- vs_module_defs : ogl_def, ++ vs_module_defs : opengl32_def, + include_directories : [ + inc_include, inc_wgl, inc_src, + ], +diff --git a/src/gallium/targets/libgl-gdi/opengl32.def b/src/gallium/targets/libgl-gdi/opengl32.def +deleted file mode 100644 +index d89f0bdb52ab65dc8c1ebb8b9ff79eaf5da41fd8..0000000000000000000000000000000000000000 +--- a/src/gallium/targets/libgl-gdi/opengl32.def ++++ /dev/null +@@ -1,388 +0,0 @@ +-EXPORTS +-; GlmfBeginGlsBlock @1 +-; GlmfCloseMetaFile @2 +-; GlmfEndGlsBlock @3 +-; GlmfEndPlayback @4 +-; GlmfInitPlayback @5 +-; GlmfPlayGlsRecord @6 +- glAccum @7 +- glAlphaFunc @8 +- glAreTexturesResident @9 +- glArrayElement @10 +- glBegin @11 +- glBindTexture @12 +- glBitmap @13 +- glBlendFunc @14 +- glCallList @15 +- glCallLists @16 +- glClear @17 +- glClearAccum @18 +- glClearColor @19 +- glClearDepth @20 +- glClearIndex @21 +- glClearStencil @22 +- glClipPlane @23 +- glColor3b @24 +- glColor3bv @25 +- glColor3d @26 +- glColor3dv @27 +- glColor3f @28 +- glColor3fv @29 +- glColor3i @30 +- glColor3iv @31 +- glColor3s @32 +- glColor3sv @33 +- glColor3ub @34 +- glColor3ubv @35 +- glColor3ui @36 +- glColor3uiv @37 +- glColor3us @38 +- glColor3usv @39 +- glColor4b @40 +- glColor4bv @41 +- glColor4d @42 +- glColor4dv @43 +- glColor4f @44 +- glColor4fv @45 +- glColor4i @46 +- glColor4iv @47 +- glColor4s @48 +- glColor4sv @49 +- glColor4ub @50 +- glColor4ubv @51 +- glColor4ui @52 +- glColor4uiv @53 +- glColor4us @54 +- glColor4usv @55 +- glColorMask @56 +- glColorMaterial @57 +- glColorPointer @58 +- glCopyPixels @59 +- glCopyTexImage1D @60 +- glCopyTexImage2D @61 +- glCopyTexSubImage1D @62 +- glCopyTexSubImage2D @63 +- glCullFace @64 +-; glDebugEntry @65 +- glDeleteLists @66 +- glDeleteTextures @67 +- glDepthFunc @68 +- glDepthMask @69 +- glDepthRange @70 +- glDisable @71 +- glDisableClientState @72 +- glDrawArrays @73 +- glDrawBuffer @74 +- glDrawElements @75 +- glDrawPixels @76 +- glEdgeFlag @77 +- glEdgeFlagPointer @78 +- glEdgeFlagv @79 +- glEnable @80 +- glEnableClientState @81 +- glEnd @82 +- glEndList @83 +- glEvalCoord1d @84 +- glEvalCoord1dv @85 +- glEvalCoord1f @86 +- glEvalCoord1fv @87 +- glEvalCoord2d @88 +- glEvalCoord2dv @89 +- glEvalCoord2f @90 +- glEvalCoord2fv @91 +- glEvalMesh1 @92 +- glEvalMesh2 @93 +- glEvalPoint1 @94 +- glEvalPoint2 @95 +- glFeedbackBuffer @96 +- glFinish @97 +- glFlush @98 +- glFogf @99 +- glFogfv @100 +- glFogi @101 +- glFogiv @102 +- glFrontFace @103 +- glFrustum @104 +- glGenLists @105 +- glGenTextures @106 +- glGetBooleanv @107 +- glGetClipPlane @108 +- glGetDoublev @109 +- glGetError @110 +- glGetFloatv @111 +- glGetIntegerv @112 +- glGetLightfv @113 +- glGetLightiv @114 +- glGetMapdv @115 +- glGetMapfv @116 +- glGetMapiv @117 +- glGetMaterialfv @118 +- glGetMaterialiv @119 +- glGetPixelMapfv @120 +- glGetPixelMapuiv @121 +- glGetPixelMapusv @122 +- glGetPointerv @123 +- glGetPolygonStipple @124 +- glGetString @125 +- glGetTexEnvfv @126 +- glGetTexEnviv @127 +- glGetTexGendv @128 +- glGetTexGenfv @129 +- glGetTexGeniv @130 +- glGetTexImage @131 +- glGetTexLevelParameterfv @132 +- glGetTexLevelParameteriv @133 +- glGetTexParameterfv @134 +- glGetTexParameteriv @135 +- glHint @136 +- glIndexMask @137 +- glIndexPointer @138 +- glIndexd @139 +- glIndexdv @140 +- glIndexf @141 +- glIndexfv @142 +- glIndexi @143 +- glIndexiv @144 +- glIndexs @145 +- glIndexsv @146 +- glIndexub @147 +- glIndexubv @148 +- glInitNames @149 +- glInterleavedArrays @150 +- glIsEnabled @151 +- glIsList @152 +- glIsTexture @153 +- glLightModelf @154 +- glLightModelfv @155 +- glLightModeli @156 +- glLightModeliv @157 +- glLightf @158 +- glLightfv @159 +- glLighti @160 +- glLightiv @161 +- glLineStipple @162 +- glLineWidth @163 +- glListBase @164 +- glLoadIdentity @165 +- glLoadMatrixd @166 +- glLoadMatrixf @167 +- glLoadName @168 +- glLogicOp @169 +- glMap1d @170 +- glMap1f @171 +- glMap2d @172 +- glMap2f @173 +- glMapGrid1d @174 +- glMapGrid1f @175 +- glMapGrid2d @176 +- glMapGrid2f @177 +- glMaterialf @178 +- glMaterialfv @179 +- glMateriali @180 +- glMaterialiv @181 +- glMatrixMode @182 +- glMultMatrixd @183 +- glMultMatrixf @184 +- glNewList @185 +- glNormal3b @186 +- glNormal3bv @187 +- glNormal3d @188 +- glNormal3dv @189 +- glNormal3f @190 +- glNormal3fv @191 +- glNormal3i @192 +- glNormal3iv @193 +- glNormal3s @194 +- glNormal3sv @195 +- glNormalPointer @196 +- glOrtho @197 +- glPassThrough @198 +- glPixelMapfv @199 +- glPixelMapuiv @200 +- glPixelMapusv @201 +- glPixelStoref @202 +- glPixelStorei @203 +- glPixelTransferf @204 +- glPixelTransferi @205 +- glPixelZoom @206 +- glPointSize @207 +- glPolygonMode @208 +- glPolygonOffset @209 +- glPolygonStipple @210 +- glPopAttrib @211 +- glPopClientAttrib @212 +- glPopMatrix @213 +- glPopName @214 +- glPrioritizeTextures @215 +- glPushAttrib @216 +- glPushClientAttrib @217 +- glPushMatrix @218 +- glPushName @219 +- glRasterPos2d @220 +- glRasterPos2dv @221 +- glRasterPos2f @222 +- glRasterPos2fv @223 +- glRasterPos2i @224 +- glRasterPos2iv @225 +- glRasterPos2s @226 +- glRasterPos2sv @227 +- glRasterPos3d @228 +- glRasterPos3dv @229 +- glRasterPos3f @230 +- glRasterPos3fv @231 +- glRasterPos3i @232 +- glRasterPos3iv @233 +- glRasterPos3s @234 +- glRasterPos3sv @235 +- glRasterPos4d @236 +- glRasterPos4dv @237 +- glRasterPos4f @238 +- glRasterPos4fv @239 +- glRasterPos4i @240 +- glRasterPos4iv @241 +- glRasterPos4s @242 +- glRasterPos4sv @243 +- glReadBuffer @244 +- glReadPixels @245 +- glRectd @246 +- glRectdv @247 +- glRectf @248 +- glRectfv @249 +- glRecti @250 +- glRectiv @251 +- glRects @252 +- glRectsv @253 +- glRenderMode @254 +- glRotated @255 +- glRotatef @256 +- glScaled @257 +- glScalef @258 +- glScissor @259 +- glSelectBuffer @260 +- glShadeModel @261 +- glStencilFunc @262 +- glStencilMask @263 +- glStencilOp @264 +- glTexCoord1d @265 +- glTexCoord1dv @266 +- glTexCoord1f @267 +- glTexCoord1fv @268 +- glTexCoord1i @269 +- glTexCoord1iv @270 +- glTexCoord1s @271 +- glTexCoord1sv @272 +- glTexCoord2d @273 +- glTexCoord2dv @274 +- glTexCoord2f @275 +- glTexCoord2fv @276 +- glTexCoord2i @277 +- glTexCoord2iv @278 +- glTexCoord2s @279 +- glTexCoord2sv @280 +- glTexCoord3d @281 +- glTexCoord3dv @282 +- glTexCoord3f @283 +- glTexCoord3fv @284 +- glTexCoord3i @285 +- glTexCoord3iv @286 +- glTexCoord3s @287 +- glTexCoord3sv @288 +- glTexCoord4d @289 +- glTexCoord4dv @290 +- glTexCoord4f @291 +- glTexCoord4fv @292 +- glTexCoord4i @293 +- glTexCoord4iv @294 +- glTexCoord4s @295 +- glTexCoord4sv @296 +- glTexCoordPointer @297 +- glTexEnvf @298 +- glTexEnvfv @299 +- glTexEnvi @300 +- glTexEnviv @301 +- glTexGend @302 +- glTexGendv @303 +- glTexGenf @304 +- glTexGenfv @305 +- glTexGeni @306 +- glTexGeniv @307 +- glTexImage1D @308 +- glTexImage2D @309 +- glTexParameterf @310 +- glTexParameterfv @311 +- glTexParameteri @312 +- glTexParameteriv @313 +- glTexSubImage1D @314 +- glTexSubImage2D @315 +- glTranslated @316 +- glTranslatef @317 +- glVertex2d @318 +- glVertex2dv @319 +- glVertex2f @320 +- glVertex2fv @321 +- glVertex2i @322 +- glVertex2iv @323 +- glVertex2s @324 +- glVertex2sv @325 +- glVertex3d @326 +- glVertex3dv @327 +- glVertex3f @328 +- glVertex3fv @329 +- glVertex3i @330 +- glVertex3iv @331 +- glVertex3s @332 +- glVertex3sv @333 +- glVertex4d @334 +- glVertex4dv @335 +- glVertex4f @336 +- glVertex4fv @337 +- glVertex4i @338 +- glVertex4iv @339 +- glVertex4s @340 +- glVertex4sv @341 +- glVertexPointer @342 +- glViewport @343 +- wglChoosePixelFormat @344 +- wglCopyContext @345 +- wglCreateContext @346 +- wglCreateLayerContext @347 +- wglDeleteContext @348 +- wglDescribeLayerPlane @349 +- wglDescribePixelFormat @350 +- wglGetCurrentContext @351 +- wglGetCurrentDC @352 +-; wglGetDefaultProcAddress @353 +- wglGetLayerPaletteEntries @354 +- wglGetPixelFormat @355 +- wglGetProcAddress @356 +- wglMakeCurrent @357 +- wglRealizeLayerPalette @358 +- wglSetLayerPaletteEntries @359 +- wglSetPixelFormat @360 +- wglShareLists @361 +- wglSwapBuffers @362 +- wglSwapLayerBuffers @363 +- wglSwapMultipleBuffers @364 +- wglUseFontBitmapsA @365 +- wglUseFontBitmapsW @366 +- wglUseFontOutlinesA @367 +- wglUseFontOutlinesW @368 +- DrvCopyContext +- DrvCreateContext +- DrvCreateLayerContext +- DrvDeleteContext +- DrvDescribeLayerPlane +- DrvDescribePixelFormat +- DrvGetLayerPaletteEntries +- DrvGetProcAddress +- DrvPresentBuffers +- DrvRealizeLayerPalette +- DrvReleaseContext +- DrvSetCallbackProcs +- DrvSetContext +- DrvSetLayerPaletteEntries +- DrvSetPixelFormat +- DrvShareLists +- DrvSwapBuffers +- DrvSwapLayerBuffers +- DrvValidateVersion +diff --git a/src/gallium/targets/libgl-gdi/opengl32.def.in b/src/gallium/targets/libgl-gdi/opengl32.def.in +new file mode 100644 +index 0000000000000000000000000000000000000000..ceffdf09936f95506090d79a99ef95ef89cc7ddc +--- /dev/null ++++ b/src/gallium/targets/libgl-gdi/opengl32.def.in +@@ -0,0 +1,389 @@ ++; stdcall calling convention have @number suffix on 32 bits architecture for gcc ++;GlmfBeginGlsBlock@4 @1 ++;GlmfCloseMetaFile@4 @2 ++;GlmfEndGlsBlock@4 @3 ++;GlmfEndPlayback@4 @4 ++;GlmfInitPlayback@12 @5 ++;GlmfPlayGlsRecord@16 @6 ++glAccum@8 @7 ++glAlphaFunc@8 @8 ++glAreTexturesResident@12 @9 ++glArrayElement@4 @10 ++glBegin@4 @11 ++glBindTexture@8 @12 ++glBitmap@28 @13 ++glBlendFunc@8 @14 ++glCallList@4 @15 ++glCallLists@12 @16 ++glClear@4 @17 ++glClearAccum@16 @18 ++glClearColor@16 @19 ++glClearDepth@8 @20 ++glClearIndex@4 @21 ++glClearStencil@4 @22 ++glClipPlane@8 @23 ++glColor3b@12 @24 ++glColor3bv@4 @25 ++glColor3d@24 @26 ++glColor3dv@4 @27 ++glColor3f@12 @28 ++glColor3fv@4 @29 ++glColor3i@12 @30 ++glColor3iv@4 @31 ++glColor3s@12 @32 ++glColor3sv@4 @33 ++glColor3ub@12 @34 ++glColor3ubv@4 @35 ++glColor3ui@12 @36 ++glColor3uiv@4 @37 ++glColor3us@12 @38 ++glColor3usv@4 @39 ++glColor4b@16 @40 ++glColor4bv@4 @41 ++glColor4d@32 @42 ++glColor4dv@4 @43 ++glColor4f@16 @44 ++glColor4fv@4 @45 ++glColor4i@16 @46 ++glColor4iv@4 @47 ++glColor4s@16 @48 ++glColor4sv@4 @49 ++glColor4ub@16 @50 ++glColor4ubv@4 @51 ++glColor4ui@16 @52 ++glColor4uiv@4 @53 ++glColor4us@16 @54 ++glColor4usv@4 @55 ++glColorMask@16 @56 ++glColorMaterial@8 @57 ++glColorPointer@16 @58 ++glCopyPixels@20 @59 ++glCopyTexImage1D@28 @60 ++glCopyTexImage2D@32 @61 ++glCopyTexSubImage1D@24 @62 ++glCopyTexSubImage2D@32 @63 ++glCullFace@4 @64 ++;glDebugEntry@8 @65 ++glDeleteLists@8 @66 ++glDeleteTextures@8 @67 ++glDepthFunc@4 @68 ++glDepthMask@4 @69 ++glDepthRange@16 @70 ++glDisable@4 @71 ++glDisableClientState@4 @72 ++glDrawArrays@12 @73 ++glDrawBuffer@4 @74 ++glDrawElements@16 @75 ++glDrawPixels@20 @76 ++glEdgeFlag@4 @77 ++glEdgeFlagPointer@8 @78 ++glEdgeFlagv@4 @79 ++glEnable@4 @80 ++glEnableClientState@4 @81 ++glEnd@0 @82 ++glEndList@0 @83 ++glEvalCoord1d@8 @84 ++glEvalCoord1dv@4 @85 ++glEvalCoord1f@4 @86 ++glEvalCoord1fv@4 @87 ++glEvalCoord2d@16 @88 ++glEvalCoord2dv@4 @89 ++glEvalCoord2f@8 @90 ++glEvalCoord2fv@4 @91 ++glEvalMesh1@12 @92 ++glEvalMesh2@20 @93 ++glEvalPoint1@4 @94 ++glEvalPoint2@8 @95 ++glFeedbackBuffer@12 @96 ++glFinish@0 @97 ++glFlush@0 @98 ++glFogf@8 @99 ++glFogfv@8 @100 ++glFogi@8 @101 ++glFogiv@8 @102 ++glFrontFace@4 @103 ++glFrustum@48 @104 ++glGenLists@4 @105 ++glGenTextures@8 @106 ++glGetBooleanv@8 @107 ++glGetClipPlane@8 @108 ++glGetDoublev@8 @109 ++glGetError@0 @110 ++glGetFloatv@8 @111 ++glGetIntegerv@8 @112 ++glGetLightfv@12 @113 ++glGetLightiv@12 @114 ++glGetMapdv@12 @115 ++glGetMapfv@12 @116 ++glGetMapiv@12 @117 ++glGetMaterialfv@12 @118 ++glGetMaterialiv@12 @119 ++glGetPixelMapfv@8 @120 ++glGetPixelMapuiv@8 @121 ++glGetPixelMapusv@8 @122 ++glGetPointerv@8 @123 ++glGetPolygonStipple@4 @124 ++glGetString@4 @125 ++glGetTexEnvfv@12 @126 ++glGetTexEnviv@12 @127 ++glGetTexGendv@12 @128 ++glGetTexGenfv@12 @129 ++glGetTexGeniv@12 @130 ++glGetTexImage@20 @131 ++glGetTexLevelParameterfv@16 @132 ++glGetTexLevelParameteriv@16 @133 ++glGetTexParameterfv@12 @134 ++glGetTexParameteriv@12 @135 ++glHint@8 @136 ++glIndexMask@4 @137 ++glIndexPointer@12 @138 ++glIndexd@8 @139 ++glIndexdv@4 @140 ++glIndexf@4 @141 ++glIndexfv@4 @142 ++glIndexi@4 @143 ++glIndexiv@4 @144 ++glIndexs@4 @145 ++glIndexsv@4 @146 ++glIndexub@4 @147 ++glIndexubv@4 @148 ++glInitNames@0 @149 ++glInterleavedArrays@12 @150 ++glIsEnabled@4 @151 ++glIsList@4 @152 ++glIsTexture@4 @153 ++glLightModelf@8 @154 ++glLightModelfv@8 @155 ++glLightModeli@8 @156 ++glLightModeliv@8 @157 ++glLightf@12 @158 ++glLightfv@12 @159 ++glLighti@12 @160 ++glLightiv@12 @161 ++glLineStipple@8 @162 ++glLineWidth@4 @163 ++glListBase@4 @164 ++glLoadIdentity@0 @165 ++glLoadMatrixd@4 @166 ++glLoadMatrixf@4 @167 ++glLoadName@4 @168 ++glLogicOp@4 @169 ++glMap1d@32 @170 ++glMap1f@24 @171 ++glMap2d@56 @172 ++glMap2f@40 @173 ++glMapGrid1d@20 @174 ++glMapGrid1f@12 @175 ++glMapGrid2d@40 @176 ++glMapGrid2f@24 @177 ++glMaterialf@12 @178 ++glMaterialfv@12 @179 ++glMateriali@12 @180 ++glMaterialiv@12 @181 ++glMatrixMode@4 @182 ++glMultMatrixd@4 @183 ++glMultMatrixf@4 @184 ++glNewList@8 @185 ++glNormal3b@12 @186 ++glNormal3bv@4 @187 ++glNormal3d@24 @188 ++glNormal3dv@4 @189 ++glNormal3f@12 @190 ++glNormal3fv@4 @191 ++glNormal3i@12 @192 ++glNormal3iv@4 @193 ++glNormal3s@12 @194 ++glNormal3sv@4 @195 ++glNormalPointer@12 @196 ++glOrtho@48 @197 ++glPassThrough@4 @198 ++glPixelMapfv@12 @199 ++glPixelMapuiv@12 @200 ++glPixelMapusv@12 @201 ++glPixelStoref@8 @202 ++glPixelStorei@8 @203 ++glPixelTransferf@8 @204 ++glPixelTransferi@8 @205 ++glPixelZoom@8 @206 ++glPointSize@4 @207 ++glPolygonMode@8 @208 ++glPolygonOffset@8 @209 ++glPolygonStipple@4 @210 ++glPopAttrib@0 @211 ++glPopClientAttrib@0 @212 ++glPopMatrix@0 @213 ++glPopName@0 @214 ++glPrioritizeTextures@12 @215 ++glPushAttrib@4 @216 ++glPushClientAttrib@4 @217 ++glPushMatrix@0 @218 ++glPushName@4 @219 ++glRasterPos2d@16 @220 ++glRasterPos2dv@4 @221 ++glRasterPos2f@8 @222 ++glRasterPos2fv@4 @223 ++glRasterPos2i@8 @224 ++glRasterPos2iv@4 @225 ++glRasterPos2s@8 @226 ++glRasterPos2sv@4 @227 ++glRasterPos3d@24 @228 ++glRasterPos3dv@4 @229 ++glRasterPos3f@12 @230 ++glRasterPos3fv@4 @231 ++glRasterPos3i@12 @232 ++glRasterPos3iv@4 @233 ++glRasterPos3s@12 @234 ++glRasterPos3sv@4 @235 ++glRasterPos4d@32 @236 ++glRasterPos4dv@4 @237 ++glRasterPos4f@16 @238 ++glRasterPos4fv@4 @239 ++glRasterPos4i@16 @240 ++glRasterPos4iv@4 @241 ++glRasterPos4s@16 @242 ++glRasterPos4sv@4 @243 ++glReadBuffer@4 @244 ++glReadPixels@28 @245 ++glRectd@32 @246 ++glRectdv@8 @247 ++glRectf@16 @248 ++glRectfv@8 @249 ++glRecti@16 @250 ++glRectiv@8 @251 ++glRects@16 @252 ++glRectsv@8 @253 ++glRenderMode@4 @254 ++glRotated@32 @255 ++glRotatef@16 @256 ++glScaled@24 @257 ++glScalef@12 @258 ++glScissor@16 @259 ++glSelectBuffer@8 @260 ++glShadeModel@4 @261 ++glStencilFunc@12 @262 ++glStencilMask@4 @263 ++glStencilOp@12 @264 ++glTexCoord1d@8 @265 ++glTexCoord1dv@4 @266 ++glTexCoord1f@4 @267 ++glTexCoord1fv@4 @268 ++glTexCoord1i@4 @269 ++glTexCoord1iv@4 @270 ++glTexCoord1s@4 @271 ++glTexCoord1sv@4 @272 ++glTexCoord2d@16 @273 ++glTexCoord2dv@4 @274 ++glTexCoord2f@8 @275 ++glTexCoord2fv@4 @276 ++glTexCoord2i@8 @277 ++glTexCoord2iv@4 @278 ++glTexCoord2s@8 @279 ++glTexCoord2sv@4 @280 ++glTexCoord3d@24 @281 ++glTexCoord3dv@4 @282 ++glTexCoord3f@12 @283 ++glTexCoord3fv@4 @284 ++glTexCoord3i@12 @285 ++glTexCoord3iv@4 @286 ++glTexCoord3s@12 @287 ++glTexCoord3sv@4 @288 ++glTexCoord4d@32 @289 ++glTexCoord4dv@4 @290 ++glTexCoord4f@16 @291 ++glTexCoord4fv@4 @292 ++glTexCoord4i@16 @293 ++glTexCoord4iv@4 @294 ++glTexCoord4s@16 @295 ++glTexCoord4sv@4 @296 ++glTexCoordPointer@16 @297 ++glTexEnvf@12 @298 ++glTexEnvfv@12 @299 ++glTexEnvi@12 @300 ++glTexEnviv@12 @301 ++glTexGend@16 @302 ++glTexGendv@12 @303 ++glTexGenf@12 @304 ++glTexGenfv@12 @305 ++glTexGeni@12 @306 ++glTexGeniv@12 @307 ++glTexImage1D@32 @308 ++glTexImage2D@36 @309 ++glTexParameterf@12 @310 ++glTexParameterfv@12 @311 ++glTexParameteri@12 @312 ++glTexParameteriv@12 @313 ++glTexSubImage1D@28 @314 ++glTexSubImage2D@36 @315 ++glTranslated@24 @316 ++glTranslatef@12 @317 ++glVertex2d@16 @318 ++glVertex2dv@4 @319 ++glVertex2f@8 @320 ++glVertex2fv@4 @321 ++glVertex2i@8 @322 ++glVertex2iv@4 @323 ++glVertex2s@8 @324 ++glVertex2sv@4 @325 ++glVertex3d@24 @326 ++glVertex3dv@4 @327 ++glVertex3f@12 @328 ++glVertex3fv@4 @329 ++glVertex3i@12 @330 ++glVertex3iv@4 @331 ++glVertex3s@12 @332 ++glVertex3sv@4 @333 ++glVertex4d@32 @334 ++glVertex4dv@4 @335 ++glVertex4f@16 @336 ++glVertex4fv@4 @337 ++glVertex4i@16 @338 ++glVertex4iv@4 @339 ++glVertex4s@16 @340 ++glVertex4sv@4 @341 ++glVertexPointer@16 @342 ++glViewport@16 @343 ++wglChoosePixelFormat@8 @344 ++wglCopyContext@12 @345 ++wglCreateContext@4 @346 ++wglCreateLayerContext@8 @347 ++wglDeleteContext@4 @348 ++wglDescribeLayerPlane@20 @349 ++wglDescribePixelFormat@16 @350 ++wglGetCurrentContext@0 @351 ++wglGetCurrentDC@0 @352 ++;wglGetDefaultProcAddress@4 @353 ++wglGetLayerPaletteEntries@20 @354 ++wglGetPixelFormat@4 @355 ++wglGetProcAddress@4 @356 ++wglMakeCurrent@8 @357 ++wglRealizeLayerPalette@12 @358 ++wglSetLayerPaletteEntries@20 @359 ++wglSetPixelFormat@12 @360 ++wglShareLists@8 @361 ++wglSwapBuffers@4 @362 ++wglSwapLayerBuffers@8 @363 ++wglSwapMultipleBuffers@8 @364 ++wglUseFontBitmapsA@16 @365 ++wglUseFontBitmapsW@16 @366 ++wglUseFontOutlinesA@32 @367 ++wglUseFontOutlinesW@32 @368 ++ ++DrvCopyContext@12 ++DrvCreateContext@4 ++DrvCreateLayerContext@8 ++DrvDeleteContext@4 ++DrvDescribeLayerPlane@20 ++DrvDescribePixelFormat@16 ++DrvGetLayerPaletteEntries@20 ++DrvGetProcAddress@4 ++DrvPresentBuffers@8 ++DrvRealizeLayerPalette@12 ++DrvReleaseContext@4 ++DrvSetCallbackProcs@8 ++DrvSetContext@12 ++DrvSetLayerPaletteEntries@20 ++DrvSetPixelFormat@8 ++DrvShareLists@8 ++DrvSwapBuffers@4 ++DrvSwapLayerBuffers@8 ++DrvValidateVersion@4 +diff --git a/src/gallium/targets/libgl-gdi/opengl32.mingw.def b/src/gallium/targets/libgl-gdi/opengl32.mingw.def +deleted file mode 100644 +index 485c9d44a877e59827d48cb967f30710f6f5749d..0000000000000000000000000000000000000000 +--- a/src/gallium/targets/libgl-gdi/opengl32.mingw.def ++++ /dev/null +@@ -1,357 +0,0 @@ +-EXPORTS +- glAccum = glAccum@8 +- glAlphaFunc = glAlphaFunc@8 +- glAreTexturesResident = glAreTexturesResident@12 +- glArrayElement = glArrayElement@4 +- glBegin = glBegin@4 +- glBindTexture = glBindTexture@8 +- glBitmap = glBitmap@28 +- glBlendFunc = glBlendFunc@8 +- glCallList = glCallList@4 +- glCallLists = glCallLists@12 +- glClear = glClear@4 +- glClearAccum = glClearAccum@16 +- glClearColor = glClearColor@16 +- glClearDepth = glClearDepth@8 +- glClearIndex = glClearIndex@4 +- glClearStencil = glClearStencil@4 +- glClipPlane = glClipPlane@8 +- glColor3b = glColor3b@12 +- glColor3bv = glColor3bv@4 +- glColor3d = glColor3d@24 +- glColor3dv = glColor3dv@4 +- glColor3f = glColor3f@12 +- glColor3fv = glColor3fv@4 +- glColor3i = glColor3i@12 +- glColor3iv = glColor3iv@4 +- glColor3s = glColor3s@12 +- glColor3sv = glColor3sv@4 +- glColor3ub = glColor3ub@12 +- glColor3ubv = glColor3ubv@4 +- glColor3ui = glColor3ui@12 +- glColor3uiv = glColor3uiv@4 +- glColor3us = glColor3us@12 +- glColor3usv = glColor3usv@4 +- glColor4b = glColor4b@16 +- glColor4bv = glColor4bv@4 +- glColor4d = glColor4d@32 +- glColor4dv = glColor4dv@4 +- glColor4f = glColor4f@16 +- glColor4fv = glColor4fv@4 +- glColor4i = glColor4i@16 +- glColor4iv = glColor4iv@4 +- glColor4s = glColor4s@16 +- glColor4sv = glColor4sv@4 +- glColor4ub = glColor4ub@16 +- glColor4ubv = glColor4ubv@4 +- glColor4ui = glColor4ui@16 +- glColor4uiv = glColor4uiv@4 +- glColor4us = glColor4us@16 +- glColor4usv = glColor4usv@4 +- glColorMask = glColorMask@16 +- glColorMaterial = glColorMaterial@8 +- glColorPointer = glColorPointer@16 +- glCopyPixels = glCopyPixels@20 +- glCopyTexImage1D = glCopyTexImage1D@28 +- glCopyTexImage2D = glCopyTexImage2D@32 +- glCopyTexSubImage1D = glCopyTexSubImage1D@24 +- glCopyTexSubImage2D = glCopyTexSubImage2D@32 +- glCullFace = glCullFace@4 +-; glDebugEntry = glDebugEntry@8 +- glDeleteLists = glDeleteLists@8 +- glDeleteTextures = glDeleteTextures@8 +- glDepthFunc = glDepthFunc@4 +- glDepthMask = glDepthMask@4 +- glDepthRange = glDepthRange@16 +- glDisable = glDisable@4 +- glDisableClientState = glDisableClientState@4 +- glDrawArrays = glDrawArrays@12 +- glDrawBuffer = glDrawBuffer@4 +- glDrawElements = glDrawElements@16 +- glDrawPixels = glDrawPixels@20 +- glEdgeFlag = glEdgeFlag@4 +- glEdgeFlagPointer = glEdgeFlagPointer@8 +- glEdgeFlagv = glEdgeFlagv@4 +- glEnable = glEnable@4 +- glEnableClientState = glEnableClientState@4 +- glEnd = glEnd@0 +- glEndList = glEndList@0 +- glEvalCoord1d = glEvalCoord1d@8 +- glEvalCoord1dv = glEvalCoord1dv@4 +- glEvalCoord1f = glEvalCoord1f@4 +- glEvalCoord1fv = glEvalCoord1fv@4 +- glEvalCoord2d = glEvalCoord2d@16 +- glEvalCoord2dv = glEvalCoord2dv@4 +- glEvalCoord2f = glEvalCoord2f@8 +- glEvalCoord2fv = glEvalCoord2fv@4 +- glEvalMesh1 = glEvalMesh1@12 +- glEvalMesh2 = glEvalMesh2@20 +- glEvalPoint1 = glEvalPoint1@4 +- glEvalPoint2 = glEvalPoint2@8 +- glFeedbackBuffer = glFeedbackBuffer@12 +- glFinish = glFinish@0 +- glFlush = glFlush@0 +- glFogf = glFogf@8 +- glFogfv = glFogfv@8 +- glFogi = glFogi@8 +- glFogiv = glFogiv@8 +- glFrontFace = glFrontFace@4 +- glFrustum = glFrustum@48 +- glGenLists = glGenLists@4 +- glGenTextures = glGenTextures@8 +- glGetBooleanv = glGetBooleanv@8 +- glGetClipPlane = glGetClipPlane@8 +- glGetDoublev = glGetDoublev@8 +- glGetError = glGetError@0 +- glGetFloatv = glGetFloatv@8 +- glGetIntegerv = glGetIntegerv@8 +- glGetLightfv = glGetLightfv@12 +- glGetLightiv = glGetLightiv@12 +- glGetMapdv = glGetMapdv@12 +- glGetMapfv = glGetMapfv@12 +- glGetMapiv = glGetMapiv@12 +- glGetMaterialfv = glGetMaterialfv@12 +- glGetMaterialiv = glGetMaterialiv@12 +- glGetPixelMapfv = glGetPixelMapfv@8 +- glGetPixelMapuiv = glGetPixelMapuiv@8 +- glGetPixelMapusv = glGetPixelMapusv@8 +- glGetPointerv = glGetPointerv@8 +- glGetPolygonStipple = glGetPolygonStipple@4 +- glGetString = glGetString@4 +- glGetTexEnvfv = glGetTexEnvfv@12 +- glGetTexEnviv = glGetTexEnviv@12 +- glGetTexGendv = glGetTexGendv@12 +- glGetTexGenfv = glGetTexGenfv@12 +- glGetTexGeniv = glGetTexGeniv@12 +- glGetTexImage = glGetTexImage@20 +- glGetTexLevelParameterfv = glGetTexLevelParameterfv@16 +- glGetTexLevelParameteriv = glGetTexLevelParameteriv@16 +- glGetTexParameterfv = glGetTexParameterfv@12 +- glGetTexParameteriv = glGetTexParameteriv@12 +- glHint = glHint@8 +- glIndexMask = glIndexMask@4 +- glIndexPointer = glIndexPointer@12 +- glIndexd = glIndexd@8 +- glIndexdv = glIndexdv@4 +- glIndexf = glIndexf@4 +- glIndexfv = glIndexfv@4 +- glIndexi = glIndexi@4 +- glIndexiv = glIndexiv@4 +- glIndexs = glIndexs@4 +- glIndexsv = glIndexsv@4 +- glIndexub = glIndexub@4 +- glIndexubv = glIndexubv@4 +- glInitNames = glInitNames@0 +- glInterleavedArrays = glInterleavedArrays@12 +- glIsEnabled = glIsEnabled@4 +- glIsList = glIsList@4 +- glIsTexture = glIsTexture@4 +- glLightModelf = glLightModelf@8 +- glLightModelfv = glLightModelfv@8 +- glLightModeli = glLightModeli@8 +- glLightModeliv = glLightModeliv@8 +- glLightf = glLightf@12 +- glLightfv = glLightfv@12 +- glLighti = glLighti@12 +- glLightiv = glLightiv@12 +- glLineStipple = glLineStipple@8 +- glLineWidth = glLineWidth@4 +- glListBase = glListBase@4 +- glLoadIdentity = glLoadIdentity@0 +- glLoadMatrixd = glLoadMatrixd@4 +- glLoadMatrixf = glLoadMatrixf@4 +- glLoadName = glLoadName@4 +- glLogicOp = glLogicOp@4 +- glMap1d = glMap1d@32 +- glMap1f = glMap1f@24 +- glMap2d = glMap2d@56 +- glMap2f = glMap2f@40 +- glMapGrid1d = glMapGrid1d@20 +- glMapGrid1f = glMapGrid1f@12 +- glMapGrid2d = glMapGrid2d@40 +- glMapGrid2f = glMapGrid2f@24 +- glMaterialf = glMaterialf@12 +- glMaterialfv = glMaterialfv@12 +- glMateriali = glMateriali@12 +- glMaterialiv = glMaterialiv@12 +- glMatrixMode = glMatrixMode@4 +- glMultMatrixd = glMultMatrixd@4 +- glMultMatrixf = glMultMatrixf@4 +- glNewList = glNewList@8 +- glNormal3b = glNormal3b@12 +- glNormal3bv = glNormal3bv@4 +- glNormal3d = glNormal3d@24 +- glNormal3dv = glNormal3dv@4 +- glNormal3f = glNormal3f@12 +- glNormal3fv = glNormal3fv@4 +- glNormal3i = glNormal3i@12 +- glNormal3iv = glNormal3iv@4 +- glNormal3s = glNormal3s@12 +- glNormal3sv = glNormal3sv@4 +- glNormalPointer = glNormalPointer@12 +- glOrtho = glOrtho@48 +- glPassThrough = glPassThrough@4 +- glPixelMapfv = glPixelMapfv@12 +- glPixelMapuiv = glPixelMapuiv@12 +- glPixelMapusv = glPixelMapusv@12 +- glPixelStoref = glPixelStoref@8 +- glPixelStorei = glPixelStorei@8 +- glPixelTransferf = glPixelTransferf@8 +- glPixelTransferi = glPixelTransferi@8 +- glPixelZoom = glPixelZoom@8 +- glPointSize = glPointSize@4 +- glPolygonMode = glPolygonMode@8 +- glPolygonOffset = glPolygonOffset@8 +- glPolygonStipple = glPolygonStipple@4 +- glPopAttrib = glPopAttrib@0 +- glPopClientAttrib = glPopClientAttrib@0 +- glPopMatrix = glPopMatrix@0 +- glPopName = glPopName@0 +- glPrioritizeTextures = glPrioritizeTextures@12 +- glPushAttrib = glPushAttrib@4 +- glPushClientAttrib = glPushClientAttrib@4 +- glPushMatrix = glPushMatrix@0 +- glPushName = glPushName@4 +- glRasterPos2d = glRasterPos2d@16 +- glRasterPos2dv = glRasterPos2dv@4 +- glRasterPos2f = glRasterPos2f@8 +- glRasterPos2fv = glRasterPos2fv@4 +- glRasterPos2i = glRasterPos2i@8 +- glRasterPos2iv = glRasterPos2iv@4 +- glRasterPos2s = glRasterPos2s@8 +- glRasterPos2sv = glRasterPos2sv@4 +- glRasterPos3d = glRasterPos3d@24 +- glRasterPos3dv = glRasterPos3dv@4 +- glRasterPos3f = glRasterPos3f@12 +- glRasterPos3fv = glRasterPos3fv@4 +- glRasterPos3i = glRasterPos3i@12 +- glRasterPos3iv = glRasterPos3iv@4 +- glRasterPos3s = glRasterPos3s@12 +- glRasterPos3sv = glRasterPos3sv@4 +- glRasterPos4d = glRasterPos4d@32 +- glRasterPos4dv = glRasterPos4dv@4 +- glRasterPos4f = glRasterPos4f@16 +- glRasterPos4fv = glRasterPos4fv@4 +- glRasterPos4i = glRasterPos4i@16 +- glRasterPos4iv = glRasterPos4iv@4 +- glRasterPos4s = glRasterPos4s@16 +- glRasterPos4sv = glRasterPos4sv@4 +- glReadBuffer = glReadBuffer@4 +- glReadPixels = glReadPixels@28 +- glRectd = glRectd@32 +- glRectdv = glRectdv@8 +- glRectf = glRectf@16 +- glRectfv = glRectfv@8 +- glRecti = glRecti@16 +- glRectiv = glRectiv@8 +- glRects = glRects@16 +- glRectsv = glRectsv@8 +- glRenderMode = glRenderMode@4 +- glRotated = glRotated@32 +- glRotatef = glRotatef@16 +- glScaled = glScaled@24 +- glScalef = glScalef@12 +- glScissor = glScissor@16 +- glSelectBuffer = glSelectBuffer@8 +- glShadeModel = glShadeModel@4 +- glStencilFunc = glStencilFunc@12 +- glStencilMask = glStencilMask@4 +- glStencilOp = glStencilOp@12 +- glTexCoord1d = glTexCoord1d@8 +- glTexCoord1dv = glTexCoord1dv@4 +- glTexCoord1f = glTexCoord1f@4 +- glTexCoord1fv = glTexCoord1fv@4 +- glTexCoord1i = glTexCoord1i@4 +- glTexCoord1iv = glTexCoord1iv@4 +- glTexCoord1s = glTexCoord1s@4 +- glTexCoord1sv = glTexCoord1sv@4 +- glTexCoord2d = glTexCoord2d@16 +- glTexCoord2dv = glTexCoord2dv@4 +- glTexCoord2f = glTexCoord2f@8 +- glTexCoord2fv = glTexCoord2fv@4 +- glTexCoord2i = glTexCoord2i@8 +- glTexCoord2iv = glTexCoord2iv@4 +- glTexCoord2s = glTexCoord2s@8 +- glTexCoord2sv = glTexCoord2sv@4 +- glTexCoord3d = glTexCoord3d@24 +- glTexCoord3dv = glTexCoord3dv@4 +- glTexCoord3f = glTexCoord3f@12 +- glTexCoord3fv = glTexCoord3fv@4 +- glTexCoord3i = glTexCoord3i@12 +- glTexCoord3iv = glTexCoord3iv@4 +- glTexCoord3s = glTexCoord3s@12 +- glTexCoord3sv = glTexCoord3sv@4 +- glTexCoord4d = glTexCoord4d@32 +- glTexCoord4dv = glTexCoord4dv@4 +- glTexCoord4f = glTexCoord4f@16 +- glTexCoord4fv = glTexCoord4fv@4 +- glTexCoord4i = glTexCoord4i@16 +- glTexCoord4iv = glTexCoord4iv@4 +- glTexCoord4s = glTexCoord4s@16 +- glTexCoord4sv = glTexCoord4sv@4 +- glTexCoordPointer = glTexCoordPointer@16 +- glTexEnvf = glTexEnvf@12 +- glTexEnvfv = glTexEnvfv@12 +- glTexEnvi = glTexEnvi@12 +- glTexEnviv = glTexEnviv@12 +- glTexGend = glTexGend@16 +- glTexGendv = glTexGendv@12 +- glTexGenf = glTexGenf@12 +- glTexGenfv = glTexGenfv@12 +- glTexGeni = glTexGeni@12 +- glTexGeniv = glTexGeniv@12 +- glTexImage1D = glTexImage1D@32 +- glTexImage2D = glTexImage2D@36 +- glTexParameterf = glTexParameterf@12 +- glTexParameterfv = glTexParameterfv@12 +- glTexParameteri = glTexParameteri@12 +- glTexParameteriv = glTexParameteriv@12 +- glTexSubImage1D = glTexSubImage1D@28 +- glTexSubImage2D = glTexSubImage2D@36 +- glTranslated = glTranslated@24 +- glTranslatef = glTranslatef@12 +- glVertex2d = glVertex2d@16 +- glVertex2dv = glVertex2dv@4 +- glVertex2f = glVertex2f@8 +- glVertex2fv = glVertex2fv@4 +- glVertex2i = glVertex2i@8 +- glVertex2iv = glVertex2iv@4 +- glVertex2s = glVertex2s@8 +- glVertex2sv = glVertex2sv@4 +- glVertex3d = glVertex3d@24 +- glVertex3dv = glVertex3dv@4 +- glVertex3f = glVertex3f@12 +- glVertex3fv = glVertex3fv@4 +- glVertex3i = glVertex3i@12 +- glVertex3iv = glVertex3iv@4 +- glVertex3s = glVertex3s@12 +- glVertex3sv = glVertex3sv@4 +- glVertex4d = glVertex4d@32 +- glVertex4dv = glVertex4dv@4 +- glVertex4f = glVertex4f@16 +- glVertex4fv = glVertex4fv@4 +- glVertex4i = glVertex4i@16 +- glVertex4iv = glVertex4iv@4 +- glVertex4s = glVertex4s@16 +- glVertex4sv = glVertex4sv@4 +- glVertexPointer = glVertexPointer@16 +- glViewport = glViewport@16 +- DrvCopyContext +- DrvCreateContext +- DrvCreateLayerContext +- DrvDeleteContext +- DrvDescribeLayerPlane +- DrvDescribePixelFormat +- DrvGetLayerPaletteEntries +- DrvGetProcAddress +- DrvPresentBuffers +- DrvRealizeLayerPalette +- DrvReleaseContext +- DrvSetCallbackProcs +- DrvSetContext +- DrvSetLayerPaletteEntries +- DrvSetPixelFormat +- DrvShareLists +- DrvSwapBuffers +- DrvSwapLayerBuffers +- DrvValidateVersion +diff --git a/src/gallium/targets/osmesa/meson.build b/src/gallium/targets/osmesa/meson.build +index 38fcaca13b9513d7d69122f3f3734330697695f4..97a9fd954ac61fb6945217e193eb9f1eaab5c590 100644 +--- a/src/gallium/targets/osmesa/meson.build ++++ b/src/gallium/targets/osmesa/meson.build +@@ -32,11 +32,14 @@ if with_ld_version_script + osmesa_link_deps += files('osmesa.sym') + endif + +-if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64' +- osmesa_def = 'osmesa.mingw.def' +-else +- osmesa_def = 'osmesa.def' +-endif ++osmesa_def = custom_target( ++ 'osmesa.def', ++ input: 'osmesa.def.in', ++ output : 'osmesa.def', ++ command : [prog_python, gen_vs_module_defs_py, ++ '--in_file', '@INPUT@', '--out_file', '@OUTPUT@', ++ '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()] ++) + + libosmesa = shared_library( + osmesa_lib_name, +diff --git a/src/gallium/targets/osmesa/osmesa.def b/src/gallium/targets/osmesa/osmesa.def +deleted file mode 100644 +index f6d09b81ef8c42463f8b3a67ac0ced2525b0599a..0000000000000000000000000000000000000000 +--- a/src/gallium/targets/osmesa/osmesa.def ++++ /dev/null +@@ -1,354 +0,0 @@ +-;DESCRIPTION 'Mesa OSMesa lib for Win32' +-VERSION 4.1 +- +-EXPORTS +- OSMesaCreateContext +- OSMesaCreateContextAttribs +- OSMesaCreateContextExt +- OSMesaDestroyContext +- OSMesaMakeCurrent +- OSMesaGetCurrentContext +- OSMesaPixelStore +- OSMesaGetIntegerv +- OSMesaGetDepthBuffer +- OSMesaGetColorBuffer +- OSMesaGetProcAddress +- OSMesaColorClamp +- OSMesaPostprocess +- glAccum +- glAlphaFunc +- glAreTexturesResident +- glArrayElement +- glBegin +- glBindTexture +- glBitmap +- glBlendFunc +- glCallList +- glCallLists +- glClear +- glClearAccum +- glClearColor +- glClearDepth +- glClearIndex +- glClearStencil +- glClipPlane +- glColor3b +- glColor3bv +- glColor3d +- glColor3dv +- glColor3f +- glColor3fv +- glColor3i +- glColor3iv +- glColor3s +- glColor3sv +- glColor3ub +- glColor3ubv +- glColor3ui +- glColor3uiv +- glColor3us +- glColor3usv +- glColor4b +- glColor4bv +- glColor4d +- glColor4dv +- glColor4f +- glColor4fv +- glColor4i +- glColor4iv +- glColor4s +- glColor4sv +- glColor4ub +- glColor4ubv +- glColor4ui +- glColor4uiv +- glColor4us +- glColor4usv +- glColorMask +- glColorMaterial +- glColorPointer +- glCopyPixels +- glCopyTexImage1D +- glCopyTexImage2D +- glCopyTexSubImage1D +- glCopyTexSubImage2D +- glCullFace +-; glDebugEntry +- glDeleteLists +- glDeleteTextures +- glDepthFunc +- glDepthMask +- glDepthRange +- glDisable +- glDisableClientState +- glDrawArrays +- glDrawBuffer +- glDrawElements +- glDrawPixels +- glEdgeFlag +- glEdgeFlagPointer +- glEdgeFlagv +- glEnable +- glEnableClientState +- glEnd +- glEndList +- glEvalCoord1d +- glEvalCoord1dv +- glEvalCoord1f +- glEvalCoord1fv +- glEvalCoord2d +- glEvalCoord2dv +- glEvalCoord2f +- glEvalCoord2fv +- glEvalMesh1 +- glEvalMesh2 +- glEvalPoint1 +- glEvalPoint2 +- glFeedbackBuffer +- glFinish +- glFlush +- glFogf +- glFogfv +- glFogi +- glFogiv +- glFrontFace +- glFrustum +- glGenLists +- glGenTextures +- glGetBooleanv +- glGetClipPlane +- glGetDoublev +- glGetError +- glGetFloatv +- glGetIntegerv +- glGetLightfv +- glGetLightiv +- glGetMapdv +- glGetMapfv +- glGetMapiv +- glGetMaterialfv +- glGetMaterialiv +- glGetPixelMapfv +- glGetPixelMapuiv +- glGetPixelMapusv +- glGetPointerv +- glGetPolygonStipple +- glGetString +- glGetTexEnvfv +- glGetTexEnviv +- glGetTexGendv +- glGetTexGenfv +- glGetTexGeniv +- glGetTexImage +- glGetTexLevelParameterfv +- glGetTexLevelParameteriv +- glGetTexParameterfv +- glGetTexParameteriv +- glHint +- glIndexMask +- glIndexPointer +- glIndexd +- glIndexdv +- glIndexf +- glIndexfv +- glIndexi +- glIndexiv +- glIndexs +- glIndexsv +- glIndexub +- glIndexubv +- glInitNames +- glInterleavedArrays +- glIsEnabled +- glIsList +- glIsTexture +- glLightModelf +- glLightModelfv +- glLightModeli +- glLightModeliv +- glLightf +- glLightfv +- glLighti +- glLightiv +- glLineStipple +- glLineWidth +- glListBase +- glLoadIdentity +- glLoadMatrixd +- glLoadMatrixf +- glLoadName +- glLogicOp +- glMap1d +- glMap1f +- glMap2d +- glMap2f +- glMapGrid1d +- glMapGrid1f +- glMapGrid2d +- glMapGrid2f +- glMaterialf +- glMaterialfv +- glMateriali +- glMaterialiv +- glMatrixMode +- glMultMatrixd +- glMultMatrixf +- glNewList +- glNormal3b +- glNormal3bv +- glNormal3d +- glNormal3dv +- glNormal3f +- glNormal3fv +- glNormal3i +- glNormal3iv +- glNormal3s +- glNormal3sv +- glNormalPointer +- glOrtho +- glPassThrough +- glPixelMapfv +- glPixelMapuiv +- glPixelMapusv +- glPixelStoref +- glPixelStorei +- glPixelTransferf +- glPixelTransferi +- glPixelZoom +- glPointSize +- glPolygonMode +- glPolygonOffset +- glPolygonStipple +- glPopAttrib +- glPopClientAttrib +- glPopMatrix +- glPopName +- glPrioritizeTextures +- glPushAttrib +- glPushClientAttrib +- glPushMatrix +- glPushName +- glRasterPos2d +- glRasterPos2dv +- glRasterPos2f +- glRasterPos2fv +- glRasterPos2i +- glRasterPos2iv +- glRasterPos2s +- glRasterPos2sv +- glRasterPos3d +- glRasterPos3dv +- glRasterPos3f +- glRasterPos3fv +- glRasterPos3i +- glRasterPos3iv +- glRasterPos3s +- glRasterPos3sv +- glRasterPos4d +- glRasterPos4dv +- glRasterPos4f +- glRasterPos4fv +- glRasterPos4i +- glRasterPos4iv +- glRasterPos4s +- glRasterPos4sv +- glReadBuffer +- glReadPixels +- glRectd +- glRectdv +- glRectf +- glRectfv +- glRecti +- glRectiv +- glRects +- glRectsv +- glRenderMode +- glRotated +- glRotatef +- glScaled +- glScalef +- glScissor +- glSelectBuffer +- glShadeModel +- glStencilFunc +- glStencilMask +- glStencilOp +- glTexCoord1d +- glTexCoord1dv +- glTexCoord1f +- glTexCoord1fv +- glTexCoord1i +- glTexCoord1iv +- glTexCoord1s +- glTexCoord1sv +- glTexCoord2d +- glTexCoord2dv +- glTexCoord2f +- glTexCoord2fv +- glTexCoord2i +- glTexCoord2iv +- glTexCoord2s +- glTexCoord2sv +- glTexCoord3d +- glTexCoord3dv +- glTexCoord3f +- glTexCoord3fv +- glTexCoord3i +- glTexCoord3iv +- glTexCoord3s +- glTexCoord3sv +- glTexCoord4d +- glTexCoord4dv +- glTexCoord4f +- glTexCoord4fv +- glTexCoord4i +- glTexCoord4iv +- glTexCoord4s +- glTexCoord4sv +- glTexCoordPointer +- glTexEnvf +- glTexEnvfv +- glTexEnvi +- glTexEnviv +- glTexGend +- glTexGendv +- glTexGenf +- glTexGenfv +- glTexGeni +- glTexGeniv +- glTexImage1D +- glTexImage2D +- glTexParameterf +- glTexParameterfv +- glTexParameteri +- glTexParameteriv +- glTexSubImage1D +- glTexSubImage2D +- glTranslated +- glTranslatef +- glVertex2d +- glVertex2dv +- glVertex2f +- glVertex2fv +- glVertex2i +- glVertex2iv +- glVertex2s +- glVertex2sv +- glVertex3d +- glVertex3dv +- glVertex3f +- glVertex3fv +- glVertex3i +- glVertex3iv +- glVertex3s +- glVertex3sv +- glVertex4d +- glVertex4dv +- glVertex4f +- glVertex4fv +- glVertex4i +- glVertex4iv +- glVertex4s +- glVertex4sv +- glVertexPointer +- glViewport +diff --git a/src/gallium/targets/osmesa/osmesa.def.in b/src/gallium/targets/osmesa/osmesa.def.in +new file mode 100644 +index 0000000000000000000000000000000000000000..d60457797963451ff3fd4f13690d1bab971bc5b3 +--- /dev/null ++++ b/src/gallium/targets/osmesa/osmesa.def.in +@@ -0,0 +1,353 @@ ++; Mesa OSMesa lib for Win32 ++ ++; stdcall calling convention have @number suffix on 32 bits architecture for gcc ++OSMesaCreateContext@8 ++OSMesaCreateContextAttribs@8 ++OSMesaCreateContextExt@20 ++OSMesaDestroyContext@4 ++OSMesaMakeCurrent@20 ++OSMesaGetCurrentContext@0 ++OSMesaPixelStore@8 ++OSMesaGetIntegerv@8 ++OSMesaGetDepthBuffer@20 ++OSMesaGetColorBuffer@20 ++OSMesaGetProcAddress@4 ++OSMesaColorClamp@4 ++OSMesaPostprocess@12 ++glAccum@8 ++glAlphaFunc@8 ++glAreTexturesResident@12 ++glArrayElement@4 ++glBegin@4 ++glBindTexture@8 ++glBitmap@28 ++glBlendFunc@8 ++glCallList@4 ++glCallLists@12 ++glClear@4 ++glClearAccum@16 ++glClearColor@16 ++glClearDepth@8 ++glClearIndex@4 ++glClearStencil@4 ++glClipPlane@8 ++glColor3b@12 ++glColor3bv@4 ++glColor3d@24 ++glColor3dv@4 ++glColor3f@12 ++glColor3fv@4 ++glColor3i@12 ++glColor3iv@4 ++glColor3s@12 ++glColor3sv@4 ++glColor3ub@12 ++glColor3ubv@4 ++glColor3ui@12 ++glColor3uiv@4 ++glColor3us@12 ++glColor3usv@4 ++glColor4b@16 ++glColor4bv@4 ++glColor4d@32 ++glColor4dv@4 ++glColor4f@16 ++glColor4fv@4 ++glColor4i@16 ++glColor4iv@4 ++glColor4s@16 ++glColor4sv@4 ++glColor4ub@16 ++glColor4ubv@4 ++glColor4ui@16 ++glColor4uiv@4 ++glColor4us@16 ++glColor4usv@4 ++glColorMask@16 ++glColorMaterial@8 ++glColorPointer@16 ++glCopyPixels@20 ++glCopyTexImage1D@28 ++glCopyTexImage2D@32 ++glCopyTexSubImage1D@24 ++glCopyTexSubImage2D@32 ++glCullFace@4 ++;glDebugEntry@8 ++glDeleteLists@8 ++glDeleteTextures@8 ++glDepthFunc@4 ++glDepthMask@4 ++glDepthRange@16 ++glDisable@4 ++glDisableClientState@4 ++glDrawArrays@12 ++glDrawBuffer@4 ++glDrawElements@16 ++glDrawPixels@20 ++glEdgeFlag@4 ++glEdgeFlagPointer@8 ++glEdgeFlagv@4 ++glEnable@4 ++glEnableClientState@4 ++glEnd@0 ++glEndList@0 ++glEvalCoord1d@8 ++glEvalCoord1dv@4 ++glEvalCoord1f@4 ++glEvalCoord1fv@4 ++glEvalCoord2d@16 ++glEvalCoord2dv@4 ++glEvalCoord2f@8 ++glEvalCoord2fv@4 ++glEvalMesh1@12 ++glEvalMesh2@20 ++glEvalPoint1@4 ++glEvalPoint2@8 ++glFeedbackBuffer@12 ++glFinish@0 ++glFlush@0 ++glFogf@8 ++glFogfv@8 ++glFogi@8 ++glFogiv@8 ++glFrontFace@4 ++glFrustum@48 ++glGenLists@4 ++glGenTextures@8 ++glGetBooleanv@8 ++glGetClipPlane@8 ++glGetDoublev@8 ++glGetError@0 ++glGetFloatv@8 ++glGetIntegerv@8 ++glGetLightfv@12 ++glGetLightiv@12 ++glGetMapdv@12 ++glGetMapfv@12 ++glGetMapiv@12 ++glGetMaterialfv@12 ++glGetMaterialiv@12 ++glGetPixelMapfv@8 ++glGetPixelMapuiv@8 ++glGetPixelMapusv@8 ++glGetPointerv@8 ++glGetPolygonStipple@4 ++glGetString@4 ++glGetTexEnvfv@12 ++glGetTexEnviv@12 ++glGetTexGendv@12 ++glGetTexGenfv@12 ++glGetTexGeniv@12 ++glGetTexImage@20 ++glGetTexLevelParameterfv@16 ++glGetTexLevelParameteriv@16 ++glGetTexParameterfv@12 ++glGetTexParameteriv@12 ++glHint@8 ++glIndexMask@4 ++glIndexPointer@12 ++glIndexd@8 ++glIndexdv@4 ++glIndexf@4 ++glIndexfv@4 ++glIndexi@4 ++glIndexiv@4 ++glIndexs@4 ++glIndexsv@4 ++glIndexub@4 ++glIndexubv@4 ++glInitNames@0 ++glInterleavedArrays@12 ++glIsEnabled@4 ++glIsList@4 ++glIsTexture@4 ++glLightModelf@8 ++glLightModelfv@8 ++glLightModeli@8 ++glLightModeliv@8 ++glLightf@12 ++glLightfv@12 ++glLighti@12 ++glLightiv@12 ++glLineStipple@8 ++glLineWidth@4 ++glListBase@4 ++glLoadIdentity@0 ++glLoadMatrixd@4 ++glLoadMatrixf@4 ++glLoadName@4 ++glLogicOp@4 ++glMap1d@32 ++glMap1f@24 ++glMap2d@56 ++glMap2f@40 ++glMapGrid1d@20 ++glMapGrid1f@12 ++glMapGrid2d@40 ++glMapGrid2f@24 ++glMaterialf@12 ++glMaterialfv@12 ++glMateriali@12 ++glMaterialiv@12 ++glMatrixMode@4 ++glMultMatrixd@4 ++glMultMatrixf@4 ++glNewList@8 ++glNormal3b@12 ++glNormal3bv@4 ++glNormal3d@24 ++glNormal3dv@4 ++glNormal3f@12 ++glNormal3fv@4 ++glNormal3i@12 ++glNormal3iv@4 ++glNormal3s@12 ++glNormal3sv@4 ++glNormalPointer@12 ++glOrtho@48 ++glPassThrough@4 ++glPixelMapfv@12 ++glPixelMapuiv@12 ++glPixelMapusv@12 ++glPixelStoref@8 ++glPixelStorei@8 ++glPixelTransferf@8 ++glPixelTransferi@8 ++glPixelZoom@8 ++glPointSize@4 ++glPolygonMode@8 ++glPolygonOffset@8 ++glPolygonStipple@4 ++glPopAttrib@0 ++glPopClientAttrib@0 ++glPopMatrix@0 ++glPopName@0 ++glPrioritizeTextures@12 ++glPushAttrib@4 ++glPushClientAttrib@4 ++glPushMatrix@0 ++glPushName@4 ++glRasterPos2d@16 ++glRasterPos2dv@4 ++glRasterPos2f@8 ++glRasterPos2fv@4 ++glRasterPos2i@8 ++glRasterPos2iv@4 ++glRasterPos2s@8 ++glRasterPos2sv@4 ++glRasterPos3d@24 ++glRasterPos3dv@4 ++glRasterPos3f@12 ++glRasterPos3fv@4 ++glRasterPos3i@12 ++glRasterPos3iv@4 ++glRasterPos3s@12 ++glRasterPos3sv@4 ++glRasterPos4d@32 ++glRasterPos4dv@4 ++glRasterPos4f@16 ++glRasterPos4fv@4 ++glRasterPos4i@16 ++glRasterPos4iv@4 ++glRasterPos4s@16 ++glRasterPos4sv@4 ++glReadBuffer@4 ++glReadPixels@28 ++glRectd@32 ++glRectdv@8 ++glRectf@16 ++glRectfv@8 ++glRecti@16 ++glRectiv@8 ++glRects@16 ++glRectsv@8 ++glRenderMode@4 ++glRotated@32 ++glRotatef@16 ++glScaled@24 ++glScalef@12 ++glScissor@16 ++glSelectBuffer@8 ++glShadeModel@4 ++glStencilFunc@12 ++glStencilMask@4 ++glStencilOp@12 ++glTexCoord1d@8 ++glTexCoord1dv@4 ++glTexCoord1f@4 ++glTexCoord1fv@4 ++glTexCoord1i@4 ++glTexCoord1iv@4 ++glTexCoord1s@4 ++glTexCoord1sv@4 ++glTexCoord2d@16 ++glTexCoord2dv@4 ++glTexCoord2f@8 ++glTexCoord2fv@4 ++glTexCoord2i@8 ++glTexCoord2iv@4 ++glTexCoord2s@8 ++glTexCoord2sv@4 ++glTexCoord3d@24 ++glTexCoord3dv@4 ++glTexCoord3f@12 ++glTexCoord3fv@4 ++glTexCoord3i@12 ++glTexCoord3iv@4 ++glTexCoord3s@12 ++glTexCoord3sv@4 ++glTexCoord4d@32 ++glTexCoord4dv@4 ++glTexCoord4f@16 ++glTexCoord4fv@4 ++glTexCoord4i@16 ++glTexCoord4iv@4 ++glTexCoord4s@16 ++glTexCoord4sv@4 ++glTexCoordPointer@16 ++glTexEnvf@12 ++glTexEnvfv@12 ++glTexEnvi@12 ++glTexEnviv@12 ++glTexGend@16 ++glTexGendv@12 ++glTexGenf@12 ++glTexGenfv@12 ++glTexGeni@12 ++glTexGeniv@12 ++glTexImage1D@32 ++glTexImage2D@36 ++glTexParameterf@12 ++glTexParameterfv@12 ++glTexParameteri@12 ++glTexParameteriv@12 ++glTexSubImage1D@28 ++glTexSubImage2D@36 ++glTranslated@24 ++glTranslatef@12 ++glVertex2d@16 ++glVertex2dv@4 ++glVertex2f@8 ++glVertex2fv@4 ++glVertex2i@8 ++glVertex2iv@4 ++glVertex2s@8 ++glVertex2sv@4 ++glVertex3d@24 ++glVertex3dv@4 ++glVertex3f@12 ++glVertex3fv@4 ++glVertex3i@12 ++glVertex3iv@4 ++glVertex3s@12 ++glVertex3sv@4 ++glVertex4d@32 ++glVertex4dv@4 ++glVertex4f@16 ++glVertex4fv@4 ++glVertex4i@16 ++glVertex4iv@4 ++glVertex4s@16 ++glVertex4sv@4 ++glVertexPointer@16 ++glViewport@16 +diff --git a/src/gallium/targets/osmesa/osmesa.mingw.def b/src/gallium/targets/osmesa/osmesa.mingw.def +deleted file mode 100644 +index b77af60a93f2fcf9c73262993d6d204563e3eeae..0000000000000000000000000000000000000000 +--- a/src/gallium/targets/osmesa/osmesa.mingw.def ++++ /dev/null +@@ -1,351 +0,0 @@ +-EXPORTS +- OSMesaCreateContext = OSMesaCreateContext@8 +- OSMesaCreateContextAttribs = OSMesaCreateContextAttribs@8 +- OSMesaCreateContextExt = OSMesaCreateContextExt@20 +- OSMesaDestroyContext = OSMesaDestroyContext@4 +- OSMesaMakeCurrent = OSMesaMakeCurrent@20 +- OSMesaGetCurrentContext = OSMesaGetCurrentContext@0 +- OSMesaPixelStore = OSMesaPixelStore@8 +- OSMesaGetIntegerv = OSMesaGetIntegerv@8 +- OSMesaGetDepthBuffer = OSMesaGetDepthBuffer@20 +- OSMesaGetColorBuffer = OSMesaGetColorBuffer@20 +- OSMesaGetProcAddress = OSMesaGetProcAddress@4 +- OSMesaColorClamp = OSMesaColorClamp@4 +- OSMesaPostprocess = OSMesaPostprocess@12 +- glAccum = glAccum@8 +- glAlphaFunc = glAlphaFunc@8 +- glAreTexturesResident = glAreTexturesResident@12 +- glArrayElement = glArrayElement@4 +- glBegin = glBegin@4 +- glBindTexture = glBindTexture@8 +- glBitmap = glBitmap@28 +- glBlendFunc = glBlendFunc@8 +- glCallList = glCallList@4 +- glCallLists = glCallLists@12 +- glClear = glClear@4 +- glClearAccum = glClearAccum@16 +- glClearColor = glClearColor@16 +- glClearDepth = glClearDepth@8 +- glClearIndex = glClearIndex@4 +- glClearStencil = glClearStencil@4 +- glClipPlane = glClipPlane@8 +- glColor3b = glColor3b@12 +- glColor3bv = glColor3bv@4 +- glColor3d = glColor3d@24 +- glColor3dv = glColor3dv@4 +- glColor3f = glColor3f@12 +- glColor3fv = glColor3fv@4 +- glColor3i = glColor3i@12 +- glColor3iv = glColor3iv@4 +- glColor3s = glColor3s@12 +- glColor3sv = glColor3sv@4 +- glColor3ub = glColor3ub@12 +- glColor3ubv = glColor3ubv@4 +- glColor3ui = glColor3ui@12 +- glColor3uiv = glColor3uiv@4 +- glColor3us = glColor3us@12 +- glColor3usv = glColor3usv@4 +- glColor4b = glColor4b@16 +- glColor4bv = glColor4bv@4 +- glColor4d = glColor4d@32 +- glColor4dv = glColor4dv@4 +- glColor4f = glColor4f@16 +- glColor4fv = glColor4fv@4 +- glColor4i = glColor4i@16 +- glColor4iv = glColor4iv@4 +- glColor4s = glColor4s@16 +- glColor4sv = glColor4sv@4 +- glColor4ub = glColor4ub@16 +- glColor4ubv = glColor4ubv@4 +- glColor4ui = glColor4ui@16 +- glColor4uiv = glColor4uiv@4 +- glColor4us = glColor4us@16 +- glColor4usv = glColor4usv@4 +- glColorMask = glColorMask@16 +- glColorMaterial = glColorMaterial@8 +- glColorPointer = glColorPointer@16 +- glCopyPixels = glCopyPixels@20 +- glCopyTexImage1D = glCopyTexImage1D@28 +- glCopyTexImage2D = glCopyTexImage2D@32 +- glCopyTexSubImage1D = glCopyTexSubImage1D@24 +- glCopyTexSubImage2D = glCopyTexSubImage2D@32 +- glCullFace = glCullFace@4 +-; glDebugEntry = glDebugEntry@8 +- glDeleteLists = glDeleteLists@8 +- glDeleteTextures = glDeleteTextures@8 +- glDepthFunc = glDepthFunc@4 +- glDepthMask = glDepthMask@4 +- glDepthRange = glDepthRange@16 +- glDisable = glDisable@4 +- glDisableClientState = glDisableClientState@4 +- glDrawArrays = glDrawArrays@12 +- glDrawBuffer = glDrawBuffer@4 +- glDrawElements = glDrawElements@16 +- glDrawPixels = glDrawPixels@20 +- glEdgeFlag = glEdgeFlag@4 +- glEdgeFlagPointer = glEdgeFlagPointer@8 +- glEdgeFlagv = glEdgeFlagv@4 +- glEnable = glEnable@4 +- glEnableClientState = glEnableClientState@4 +- glEnd = glEnd@0 +- glEndList = glEndList@0 +- glEvalCoord1d = glEvalCoord1d@8 +- glEvalCoord1dv = glEvalCoord1dv@4 +- glEvalCoord1f = glEvalCoord1f@4 +- glEvalCoord1fv = glEvalCoord1fv@4 +- glEvalCoord2d = glEvalCoord2d@16 +- glEvalCoord2dv = glEvalCoord2dv@4 +- glEvalCoord2f = glEvalCoord2f@8 +- glEvalCoord2fv = glEvalCoord2fv@4 +- glEvalMesh1 = glEvalMesh1@12 +- glEvalMesh2 = glEvalMesh2@20 +- glEvalPoint1 = glEvalPoint1@4 +- glEvalPoint2 = glEvalPoint2@8 +- glFeedbackBuffer = glFeedbackBuffer@12 +- glFinish = glFinish@0 +- glFlush = glFlush@0 +- glFogf = glFogf@8 +- glFogfv = glFogfv@8 +- glFogi = glFogi@8 +- glFogiv = glFogiv@8 +- glFrontFace = glFrontFace@4 +- glFrustum = glFrustum@48 +- glGenLists = glGenLists@4 +- glGenTextures = glGenTextures@8 +- glGetBooleanv = glGetBooleanv@8 +- glGetClipPlane = glGetClipPlane@8 +- glGetDoublev = glGetDoublev@8 +- glGetError = glGetError@0 +- glGetFloatv = glGetFloatv@8 +- glGetIntegerv = glGetIntegerv@8 +- glGetLightfv = glGetLightfv@12 +- glGetLightiv = glGetLightiv@12 +- glGetMapdv = glGetMapdv@12 +- glGetMapfv = glGetMapfv@12 +- glGetMapiv = glGetMapiv@12 +- glGetMaterialfv = glGetMaterialfv@12 +- glGetMaterialiv = glGetMaterialiv@12 +- glGetPixelMapfv = glGetPixelMapfv@8 +- glGetPixelMapuiv = glGetPixelMapuiv@8 +- glGetPixelMapusv = glGetPixelMapusv@8 +- glGetPointerv = glGetPointerv@8 +- glGetPolygonStipple = glGetPolygonStipple@4 +- glGetString = glGetString@4 +- glGetTexEnvfv = glGetTexEnvfv@12 +- glGetTexEnviv = glGetTexEnviv@12 +- glGetTexGendv = glGetTexGendv@12 +- glGetTexGenfv = glGetTexGenfv@12 +- glGetTexGeniv = glGetTexGeniv@12 +- glGetTexImage = glGetTexImage@20 +- glGetTexLevelParameterfv = glGetTexLevelParameterfv@16 +- glGetTexLevelParameteriv = glGetTexLevelParameteriv@16 +- glGetTexParameterfv = glGetTexParameterfv@12 +- glGetTexParameteriv = glGetTexParameteriv@12 +- glHint = glHint@8 +- glIndexMask = glIndexMask@4 +- glIndexPointer = glIndexPointer@12 +- glIndexd = glIndexd@8 +- glIndexdv = glIndexdv@4 +- glIndexf = glIndexf@4 +- glIndexfv = glIndexfv@4 +- glIndexi = glIndexi@4 +- glIndexiv = glIndexiv@4 +- glIndexs = glIndexs@4 +- glIndexsv = glIndexsv@4 +- glIndexub = glIndexub@4 +- glIndexubv = glIndexubv@4 +- glInitNames = glInitNames@0 +- glInterleavedArrays = glInterleavedArrays@12 +- glIsEnabled = glIsEnabled@4 +- glIsList = glIsList@4 +- glIsTexture = glIsTexture@4 +- glLightModelf = glLightModelf@8 +- glLightModelfv = glLightModelfv@8 +- glLightModeli = glLightModeli@8 +- glLightModeliv = glLightModeliv@8 +- glLightf = glLightf@12 +- glLightfv = glLightfv@12 +- glLighti = glLighti@12 +- glLightiv = glLightiv@12 +- glLineStipple = glLineStipple@8 +- glLineWidth = glLineWidth@4 +- glListBase = glListBase@4 +- glLoadIdentity = glLoadIdentity@0 +- glLoadMatrixd = glLoadMatrixd@4 +- glLoadMatrixf = glLoadMatrixf@4 +- glLoadName = glLoadName@4 +- glLogicOp = glLogicOp@4 +- glMap1d = glMap1d@32 +- glMap1f = glMap1f@24 +- glMap2d = glMap2d@56 +- glMap2f = glMap2f@40 +- glMapGrid1d = glMapGrid1d@20 +- glMapGrid1f = glMapGrid1f@12 +- glMapGrid2d = glMapGrid2d@40 +- glMapGrid2f = glMapGrid2f@24 +- glMaterialf = glMaterialf@12 +- glMaterialfv = glMaterialfv@12 +- glMateriali = glMateriali@12 +- glMaterialiv = glMaterialiv@12 +- glMatrixMode = glMatrixMode@4 +- glMultMatrixd = glMultMatrixd@4 +- glMultMatrixf = glMultMatrixf@4 +- glNewList = glNewList@8 +- glNormal3b = glNormal3b@12 +- glNormal3bv = glNormal3bv@4 +- glNormal3d = glNormal3d@24 +- glNormal3dv = glNormal3dv@4 +- glNormal3f = glNormal3f@12 +- glNormal3fv = glNormal3fv@4 +- glNormal3i = glNormal3i@12 +- glNormal3iv = glNormal3iv@4 +- glNormal3s = glNormal3s@12 +- glNormal3sv = glNormal3sv@4 +- glNormalPointer = glNormalPointer@12 +- glOrtho = glOrtho@48 +- glPassThrough = glPassThrough@4 +- glPixelMapfv = glPixelMapfv@12 +- glPixelMapuiv = glPixelMapuiv@12 +- glPixelMapusv = glPixelMapusv@12 +- glPixelStoref = glPixelStoref@8 +- glPixelStorei = glPixelStorei@8 +- glPixelTransferf = glPixelTransferf@8 +- glPixelTransferi = glPixelTransferi@8 +- glPixelZoom = glPixelZoom@8 +- glPointSize = glPointSize@4 +- glPolygonMode = glPolygonMode@8 +- glPolygonOffset = glPolygonOffset@8 +- glPolygonStipple = glPolygonStipple@4 +- glPopAttrib = glPopAttrib@0 +- glPopClientAttrib = glPopClientAttrib@0 +- glPopMatrix = glPopMatrix@0 +- glPopName = glPopName@0 +- glPrioritizeTextures = glPrioritizeTextures@12 +- glPushAttrib = glPushAttrib@4 +- glPushClientAttrib = glPushClientAttrib@4 +- glPushMatrix = glPushMatrix@0 +- glPushName = glPushName@4 +- glRasterPos2d = glRasterPos2d@16 +- glRasterPos2dv = glRasterPos2dv@4 +- glRasterPos2f = glRasterPos2f@8 +- glRasterPos2fv = glRasterPos2fv@4 +- glRasterPos2i = glRasterPos2i@8 +- glRasterPos2iv = glRasterPos2iv@4 +- glRasterPos2s = glRasterPos2s@8 +- glRasterPos2sv = glRasterPos2sv@4 +- glRasterPos3d = glRasterPos3d@24 +- glRasterPos3dv = glRasterPos3dv@4 +- glRasterPos3f = glRasterPos3f@12 +- glRasterPos3fv = glRasterPos3fv@4 +- glRasterPos3i = glRasterPos3i@12 +- glRasterPos3iv = glRasterPos3iv@4 +- glRasterPos3s = glRasterPos3s@12 +- glRasterPos3sv = glRasterPos3sv@4 +- glRasterPos4d = glRasterPos4d@32 +- glRasterPos4dv = glRasterPos4dv@4 +- glRasterPos4f = glRasterPos4f@16 +- glRasterPos4fv = glRasterPos4fv@4 +- glRasterPos4i = glRasterPos4i@16 +- glRasterPos4iv = glRasterPos4iv@4 +- glRasterPos4s = glRasterPos4s@16 +- glRasterPos4sv = glRasterPos4sv@4 +- glReadBuffer = glReadBuffer@4 +- glReadPixels = glReadPixels@28 +- glRectd = glRectd@32 +- glRectdv = glRectdv@8 +- glRectf = glRectf@16 +- glRectfv = glRectfv@8 +- glRecti = glRecti@16 +- glRectiv = glRectiv@8 +- glRects = glRects@16 +- glRectsv = glRectsv@8 +- glRenderMode = glRenderMode@4 +- glRotated = glRotated@32 +- glRotatef = glRotatef@16 +- glScaled = glScaled@24 +- glScalef = glScalef@12 +- glScissor = glScissor@16 +- glSelectBuffer = glSelectBuffer@8 +- glShadeModel = glShadeModel@4 +- glStencilFunc = glStencilFunc@12 +- glStencilMask = glStencilMask@4 +- glStencilOp = glStencilOp@12 +- glTexCoord1d = glTexCoord1d@8 +- glTexCoord1dv = glTexCoord1dv@4 +- glTexCoord1f = glTexCoord1f@4 +- glTexCoord1fv = glTexCoord1fv@4 +- glTexCoord1i = glTexCoord1i@4 +- glTexCoord1iv = glTexCoord1iv@4 +- glTexCoord1s = glTexCoord1s@4 +- glTexCoord1sv = glTexCoord1sv@4 +- glTexCoord2d = glTexCoord2d@16 +- glTexCoord2dv = glTexCoord2dv@4 +- glTexCoord2f = glTexCoord2f@8 +- glTexCoord2fv = glTexCoord2fv@4 +- glTexCoord2i = glTexCoord2i@8 +- glTexCoord2iv = glTexCoord2iv@4 +- glTexCoord2s = glTexCoord2s@8 +- glTexCoord2sv = glTexCoord2sv@4 +- glTexCoord3d = glTexCoord3d@24 +- glTexCoord3dv = glTexCoord3dv@4 +- glTexCoord3f = glTexCoord3f@12 +- glTexCoord3fv = glTexCoord3fv@4 +- glTexCoord3i = glTexCoord3i@12 +- glTexCoord3iv = glTexCoord3iv@4 +- glTexCoord3s = glTexCoord3s@12 +- glTexCoord3sv = glTexCoord3sv@4 +- glTexCoord4d = glTexCoord4d@32 +- glTexCoord4dv = glTexCoord4dv@4 +- glTexCoord4f = glTexCoord4f@16 +- glTexCoord4fv = glTexCoord4fv@4 +- glTexCoord4i = glTexCoord4i@16 +- glTexCoord4iv = glTexCoord4iv@4 +- glTexCoord4s = glTexCoord4s@16 +- glTexCoord4sv = glTexCoord4sv@4 +- glTexCoordPointer = glTexCoordPointer@16 +- glTexEnvf = glTexEnvf@12 +- glTexEnvfv = glTexEnvfv@12 +- glTexEnvi = glTexEnvi@12 +- glTexEnviv = glTexEnviv@12 +- glTexGend = glTexGend@16 +- glTexGendv = glTexGendv@12 +- glTexGenf = glTexGenf@12 +- glTexGenfv = glTexGenfv@12 +- glTexGeni = glTexGeni@12 +- glTexGeniv = glTexGeniv@12 +- glTexImage1D = glTexImage1D@32 +- glTexImage2D = glTexImage2D@36 +- glTexParameterf = glTexParameterf@12 +- glTexParameterfv = glTexParameterfv@12 +- glTexParameteri = glTexParameteri@12 +- glTexParameteriv = glTexParameteriv@12 +- glTexSubImage1D = glTexSubImage1D@28 +- glTexSubImage2D = glTexSubImage2D@36 +- glTranslated = glTranslated@24 +- glTranslatef = glTranslatef@12 +- glVertex2d = glVertex2d@16 +- glVertex2dv = glVertex2dv@4 +- glVertex2f = glVertex2f@8 +- glVertex2fv = glVertex2fv@4 +- glVertex2i = glVertex2i@8 +- glVertex2iv = glVertex2iv@4 +- glVertex2s = glVertex2s@8 +- glVertex2sv = glVertex2sv@4 +- glVertex3d = glVertex3d@24 +- glVertex3dv = glVertex3dv@4 +- glVertex3f = glVertex3f@12 +- glVertex3fv = glVertex3fv@4 +- glVertex3i = glVertex3i@12 +- glVertex3iv = glVertex3iv@4 +- glVertex3s = glVertex3s@12 +- glVertex3sv = glVertex3sv@4 +- glVertex4d = glVertex4d@32 +- glVertex4dv = glVertex4dv@4 +- glVertex4f = glVertex4f@16 +- glVertex4fv = glVertex4fv@4 +- glVertex4i = glVertex4i@16 +- glVertex4iv = glVertex4iv@4 +- glVertex4s = glVertex4s@16 +- glVertex4sv = glVertex4sv@4 +- glVertexPointer = glVertexPointer@16 +- glViewport = glViewport@16 +diff --git a/src/gallium/targets/wgl/gallium_wgl.def b/src/gallium/targets/wgl/gallium_wgl.def +deleted file mode 100644 +index 6d39d2eadc9bb2e941f3399efcc54f4b1c2c79da..0000000000000000000000000000000000000000 +--- a/src/gallium/targets/wgl/gallium_wgl.def ++++ /dev/null +@@ -1,38 +0,0 @@ +-EXPORTS +- DrvCopyContext +- DrvCreateContext +- DrvCreateLayerContext +- DrvDeleteContext +- DrvDescribeLayerPlane +- DrvDescribePixelFormat +- DrvGetLayerPaletteEntries +- DrvGetProcAddress +- DrvPresentBuffers +- DrvRealizeLayerPalette +- DrvReleaseContext +- DrvSetCallbackProcs +- DrvSetContext +- DrvSetLayerPaletteEntries +- DrvSetPixelFormat +- DrvShareLists +- DrvSwapBuffers +- DrvSwapLayerBuffers +- DrvValidateVersion +- +- stw_get_device +- stw_init_screen +- stw_get_current_context +- stw_get_current_dc +- stw_pixelformat_choose +- stw_pixelformat_get +- stw_pixelformat_get_info +- stw_override_opengl32_entry_points +- stw_create_context_attribs +- stw_destroy_context +- stw_unbind_context +- stw_current_context +- stw_make_current +- stw_framebuffer_create +- stw_framebuffer_release_locked +- stw_framebuffer_unlock +- stw_framebuffer_swap_locked +diff --git a/src/gallium/targets/wgl/gallium_wgl.def.in b/src/gallium/targets/wgl/gallium_wgl.def.in +new file mode 100644 +index 0000000000000000000000000000000000000000..860389d48cc44bd61c4a3df6d1405c2ccf06f099 +--- /dev/null ++++ b/src/gallium/targets/wgl/gallium_wgl.def.in +@@ -0,0 +1,39 @@ ++; stdcall calling convention have @number suffix on 32 bits architecture for gcc ++DrvCopyContext@12 ++DrvCreateContext@4 ++DrvCreateLayerContext@8 ++DrvDeleteContext@4 ++DrvDescribeLayerPlane@20 ++DrvDescribePixelFormat@16 ++DrvGetLayerPaletteEntries@20 ++DrvGetProcAddress@4 ++DrvPresentBuffers@8 ++DrvRealizeLayerPalette@12 ++DrvReleaseContext@4 ++DrvSetCallbackProcs@8 ++DrvSetContext@12 ++DrvSetLayerPaletteEntries@20 ++DrvSetPixelFormat@8 ++DrvShareLists@8 ++DrvSwapBuffers@4 ++DrvSwapLayerBuffers@8 ++DrvValidateVersion@4 ++ ++; __cdecl calling convention have no @number suffix ++stw_get_device ++stw_init_screen ++stw_get_current_context ++stw_get_current_dc ++stw_pixelformat_choose ++stw_pixelformat_get ++stw_pixelformat_get_info ++stw_override_opengl32_entry_points ++stw_create_context_attribs ++stw_destroy_context ++stw_unbind_context ++stw_current_context ++stw_make_current ++stw_framebuffer_create ++stw_framebuffer_release_locked ++stw_framebuffer_unlock ++stw_framebuffer_swap_locked +diff --git a/src/gallium/targets/wgl/gallium_wgl.mingw.def b/src/gallium/targets/wgl/gallium_wgl.mingw.def +deleted file mode 100644 +index ee23392d95ec26ca1d774f57b5979a153eab76a0..0000000000000000000000000000000000000000 +--- a/src/gallium/targets/wgl/gallium_wgl.mingw.def ++++ /dev/null +@@ -1,26 +0,0 @@ +-EXPORTS +- DrvCopyContext = DrvCopyContext@12 +- DrvCreateContext = DrvCreateContext@4 +- DrvCreateLayerContext = DrvCreateLayerContext@8 +- DrvDeleteContext = DrvDeleteContext@4 +- DrvDescribeLayerPlane = DrvDescribeLayerPlane@20 +- DrvDescribePixelFormat = DrvDescribePixelFormat@16 +- DrvGetLayerPaletteEntries = DrvGetLayerPaletteEntries@20 +- DrvGetProcAddress = DrvGetProcAddress@4 +- DrvPresentBuffers = DrvPresentBuffers@8 +- DrvRealizeLayerPalette = DrvRealizeLayerPalette@12 +- DrvReleaseContext = DrvReleaseContext@4 +- DrvSetCallbackProcs = DrvSetCallbackProcs@8 +- DrvSetContext = DrvSetContext@12 +- DrvSetLayerPaletteEntries = DrvSetLayerPaletteEntries@20 +- DrvSetPixelFormat = DrvSetPixelFormat@8 +- DrvShareLists = DrvShareLists@8 +- DrvSwapBuffers = DrvSwapBuffers@4 +- DrvSwapLayerBuffers = DrvSwapLayerBuffers@8 +- DrvValidateVersion = DrvValidateVersion@4 +- +- stw_get_current_context = stw_get_current_context@0 +- stw_get_current_dc = stw_get_current_dc@0 +- stw_pixelformat_choose = stw_pixelformat_choose@8 +- stw_pixelformat_get = stw_pixelformat_get@4 +- stw_override_opengl32_entry_points = stw_override_opengl32_entry_points@8 +diff --git a/src/gallium/targets/wgl/meson.build b/src/gallium/targets/wgl/meson.build +index 92571a7c8f7bcf6847360bcd725732bd144f35c9..ace7c33eb9499a8058598570890d3e408918e7ff 100644 +--- a/src/gallium/targets/wgl/meson.build ++++ b/src/gallium/targets/wgl/meson.build +@@ -20,15 +20,15 @@ + + + gallium_wgl_link_args = [] +-if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64' +- gallium_wgl_link_args += ['-Wl,--enable-stdcall-fixup'] +-endif + +-if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64' +- wgl_def = 'gallium_wgl.mingw.def' +-else +- wgl_def = 'gallium_wgl.def' +-endif ++wgl_def = custom_target( ++ 'gallium_wgl.def', ++ input: 'gallium_wgl.def.in', ++ output : 'gallium_wgl.def', ++ command : [prog_python, gen_vs_module_defs_py, ++ '--in_file', '@INPUT@', '--out_file', '@OUTPUT@', ++ '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()] ++) + + libgallium_wgl = shared_library( + 'gallium_wgl', +diff --git a/src/mapi/es1api/gles1.def.in b/src/mapi/es1api/gles1.def.in +new file mode 100644 +index 0000000000000000000000000000000000000000..b09aff6a8739e1ce197f8abe481f4b79a94d3adb +--- /dev/null ++++ b/src/mapi/es1api/gles1.def.in +@@ -0,0 +1,146 @@ ++; stdcall calling convention have @number suffix on 32 bits architecture for gcc ++glActiveTexture@4 ++glAlphaFunc@8 ++glAlphaFuncx@8 ++glBindBuffer@8 ++glBindTexture@8 ++glBlendFunc@8 ++glBufferData@16 ++glBufferSubData@16 ++glClear@4 ++glClearColor@16 ++glClearColorx@16 ++glClearDepthf@4 ++glClearDepthx@4 ++glClearStencil@4 ++glClientActiveTexture@4 ++glClipPlanef@8 ++glClipPlanex@8 ++glColor4f@16 ++glColor4ub@16 ++glColor4x@16 ++glColorMask@16 ++glColorPointer@16 ++glCompressedTexImage2D@32 ++glCompressedTexSubImage2D@36 ++glCopyTexImage2D@32 ++glCopyTexSubImage2D@32 ++glCullFace@4 ++glDeleteBuffers@8 ++glDeleteTextures@8 ++glDepthFunc@4 ++glDepthMask@4 ++glDepthRangef@8 ++glDepthRangex@8 ++glDisable@4 ++glDisableClientState@4 ++glDrawArrays@12 ++glDrawElements@16 ++glEnable@4 ++glEnableClientState@4 ++glFinish@0 ++glFlush@0 ++glFogf@8 ++glFogfv@8 ++glFogx@8 ++glFogxv@8 ++glFrontFace@4 ++glFrustumf@24 ++glFrustumx@24 ++glGenBuffers@8 ++glGenTextures@8 ++glGetBooleanv@8 ++glGetBufferParameteriv@12 ++glGetClipPlanef@8 ++glGetClipPlanex@8 ++glGetError@0 ++glGetFixedv@8 ++glGetFloatv@8 ++glGetIntegerv@8 ++glGetLightfv@12 ++glGetLightxv@12 ++glGetMaterialfv@12 ++glGetMaterialxv@12 ++glGetPointerv@8 ++glGetString@4 ++glGetTexEnvfv@12 ++glGetTexEnviv@12 ++glGetTexEnvxv@12 ++glGetTexParameterfv@12 ++glGetTexParameteriv@12 ++glGetTexParameterxv@12 ++glHint@8 ++glIsBuffer@4 ++glIsEnabled@4 ++glIsTexture@4 ++glLightModelf@8 ++glLightModelfv@8 ++glLightModelx@8 ++glLightModelxv@8 ++glLightf@12 ++glLightfv@12 ++glLightx@12 ++glLightxv@12 ++glLineWidth@4 ++glLineWidthx@4 ++glLoadIdentity@0 ++glLoadMatrixf@4 ++glLoadMatrixx@4 ++glLogicOp@4 ++glMaterialf@12 ++glMaterialfv@12 ++glMaterialx@12 ++glMaterialxv@12 ++glMatrixMode@4 ++glMultMatrixf@4 ++glMultMatrixx@4 ++glMultiTexCoord4f@20 ++glMultiTexCoord4x@20 ++glNormal3f@12 ++glNormal3x@12 ++glNormalPointer@12 ++glOrthof@24 ++glOrthox@24 ++glPixelStorei@8 ++glPointParameterf@8 ++glPointParameterfv@8 ++glPointParameterx@8 ++glPointParameterxv@8 ++glPointSize@4 ++glPointSizePointerOES@12 ++glPointSizex@4 ++glPolygonOffset@8 ++glPolygonOffsetx@8 ++glPopMatrix@0 ++glPushMatrix@0 ++glReadPixels@28 ++glRotatef@16 ++glRotatex@16 ++glSampleCoverage@8 ++glSampleCoveragex@8 ++glScalef@12 ++glScalex@12 ++glScissor@16 ++glShadeModel@4 ++glStencilFunc@12 ++glStencilMask@4 ++glStencilOp@12 ++glTexCoordPointer@16 ++glTexEnvf@12 ++glTexEnvfv@12 ++glTexEnvi@12 ++glTexEnviv@12 ++glTexEnvx@12 ++glTexEnvxv@12 ++glTexImage2D@36 ++glTexParameterf@12 ++glTexParameterfv@12 ++glTexParameteri@12 ++glTexParameteriv@12 ++glTexParameterx@12 ++glTexParameterxv@12 ++glTexSubImage2D@36 ++glTranslatef@12 ++glTranslatex@12 ++glVertexPointer@16 ++glViewport@16 +diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build +index 8b749b1a3324be96f0d69816e638f1131ec8c307..4bca37b5e32f77d55655c49ca0580b75707edc6b 100644 +--- a/src/mapi/es1api/meson.build ++++ b/src/mapi/es1api/meson.build +@@ -29,12 +29,22 @@ es1_glapi_mapi_tmp_h = custom_target( + + _es1_c_args = [] + if with_platform_windows +- _es1_c_args += ['-D_GDI32_', '-DBUILD_GL32'] ++ _es1_c_args += ['-D_GDI32_'] + endif + ++gles1_def = custom_target( ++ 'gles1.def', ++ input: 'gles1.def.in', ++ output : 'gles1.def', ++ command : [prog_python, gen_vs_module_defs_py, ++ '--in_file', '@INPUT@', '--out_file', '@OUTPUT@', ++ '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()] ++) ++ + libglesv1_cm = shared_library( + 'GLESv1_CM' + get_option('gles-lib-suffix'), + ['../entry.c', es1_glapi_mapi_tmp_h], ++ vs_module_defs : gles1_def, + c_args : [ + c_msvc_compat_args, + _es1_c_args, +diff --git a/src/mapi/es2api/gles2.def.in b/src/mapi/es2api/gles2.def.in +new file mode 100644 +index 0000000000000000000000000000000000000000..4517ea8b739e72d950930ee94b51dc71829dea8e +--- /dev/null ++++ b/src/mapi/es2api/gles2.def.in +@@ -0,0 +1,359 @@ ++; stdcall calling convention have @number suffix on 32 bits architecture for gcc ++glActiveShaderProgram@8 ++glActiveTexture@4 ++glAttachShader@8 ++glBeginQuery@8 ++glBeginTransformFeedback@4 ++glBindAttribLocation@12 ++glBindBuffer@8 ++glBindBufferBase@12 ++glBindBufferRange@20 ++glBindFramebuffer@8 ++glBindImageTexture@28 ++glBindProgramPipeline@4 ++glBindRenderbuffer@8 ++glBindSampler@8 ++glBindTexture@8 ++glBindTransformFeedback@8 ++glBindVertexArray@4 ++glBindVertexBuffer@16 ++glBlendBarrier@0 ++glBlendColor@16 ++glBlendEquation@4 ++glBlendEquationSeparate@8 ++glBlendEquationSeparatei@12 ++glBlendEquationi@8 ++glBlendFunc@8 ++glBlendFuncSeparate@16 ++glBlendFuncSeparatei@20 ++glBlendFunci@12 ++glBlitFramebuffer@40 ++glBufferData@16 ++glBufferSubData@16 ++glCheckFramebufferStatus@4 ++glClear@4 ++glClearBufferfi@16 ++glClearBufferfv@12 ++glClearBufferiv@12 ++glClearBufferuiv@12 ++glClearColor@16 ++glClearDepthf@4 ++glClearStencil@4 ++glClientWaitSync@16 ++glColorMask@16 ++glColorMaski@20 ++glCompileShader@4 ++glCompressedTexImage2D@32 ++glCompressedTexImage3D@36 ++glCompressedTexSubImage2D@36 ++glCompressedTexSubImage3D@44 ++glCopyBufferSubData@20 ++glCopyImageSubData@60 ++glCopyTexImage2D@32 ++glCopyTexSubImage2D@32 ++glCopyTexSubImage3D@36 ++glCreateProgram@0 ++glCreateShader@4 ++glCreateShaderProgramv@12 ++glCullFace@4 ++glDebugMessageCallback@8 ++glDebugMessageControl@24 ++glDebugMessageInsert@24 ++glDeleteBuffers@8 ++glDeleteFramebuffers@8 ++glDeleteProgram@4 ++glDeleteProgramPipelines@8 ++glDeleteQueries@8 ++glDeleteRenderbuffers@8 ++glDeleteSamplers@8 ++glDeleteShader@4 ++glDeleteSync@4 ++glDeleteTextures@8 ++glDeleteTransformFeedbacks@8 ++glDeleteVertexArrays@8 ++glDepthFunc@4 ++glDepthMask@4 ++glDepthRangef@8 ++glDetachShader@8 ++glDisable@4 ++glDisableVertexAttribArray@4 ++glDisablei@8 ++glDispatchCompute@12 ++glDispatchComputeIndirect@4 ++glDrawArrays@12 ++glDrawArraysIndirect@8 ++glDrawArraysInstanced@16 ++glDrawBuffers@8 ++glDrawElements@16 ++glDrawElementsBaseVertex@20 ++glDrawElementsIndirect@12 ++glDrawElementsInstanced@20 ++glDrawElementsInstancedBaseVertex@24 ++glDrawRangeElements@24 ++glDrawRangeElementsBaseVertex@28 ++glEnable@4 ++glEnableVertexAttribArray@4 ++glEnablei@8 ++glEndQuery@4 ++glEndTransformFeedback@0 ++glFenceSync@8 ++glFinish@0 ++glFlush@0 ++glFlushMappedBufferRange@12 ++glFramebufferParameteri@12 ++glFramebufferRenderbuffer@16 ++glFramebufferTexture2D@20 ++glFramebufferTexture@16 ++glFramebufferTextureLayer@20 ++glFrontFace@4 ++glGenBuffers@8 ++glGenFramebuffers@8 ++glGenProgramPipelines@8 ++glGenQueries@8 ++glGenRenderbuffers@8 ++glGenSamplers@8 ++glGenTextures@8 ++glGenTransformFeedbacks@8 ++glGenVertexArrays@8 ++glGenerateMipmap@4 ++glGetActiveAttrib@28 ++glGetActiveUniform@28 ++glGetActiveUniformBlockName@20 ++glGetActiveUniformBlockiv@16 ++glGetActiveUniformsiv@20 ++glGetAttachedShaders@16 ++glGetAttribLocation@8 ++glGetBooleani_v@12 ++glGetBooleanv@8 ++glGetBufferParameteri64v@12 ++glGetBufferParameteriv@12 ++glGetBufferPointerv@12 ++glGetDebugMessageLog@32 ++glGetError@0 ++glGetFloatv@8 ++glGetFragDataLocation@8 ++glGetFramebufferAttachmentParameteriv@16 ++glGetFramebufferParameteriv@12 ++glGetGraphicsResetStatus@0 ++glGetInteger64i_v@12 ++glGetInteger64v@8 ++glGetIntegeri_v@12 ++glGetIntegerv@8 ++glGetInternalformativ@20 ++glGetMultisamplefv@12 ++glGetObjectLabel@20 ++glGetObjectPtrLabel@16 ++glGetPointerv@8 ++glGetProgramBinary@20 ++glGetProgramInfoLog@16 ++glGetProgramInterfaceiv@16 ++glGetProgramPipelineInfoLog@16 ++glGetProgramPipelineiv@12 ++glGetProgramResourceIndex@12 ++glGetProgramResourceLocation@12 ++glGetProgramResourceName@24 ++glGetProgramResourceiv@32 ++glGetProgramiv@12 ++glGetQueryObjectuiv@12 ++glGetQueryiv@12 ++glGetRenderbufferParameteriv@12 ++glGetSamplerParameterIiv@12 ++glGetSamplerParameterIuiv@12 ++glGetSamplerParameterfv@12 ++glGetSamplerParameteriv@12 ++glGetShaderInfoLog@16 ++glGetShaderPrecisionFormat@16 ++glGetShaderSource@16 ++glGetShaderiv@12 ++glGetString@4 ++glGetStringi@8 ++glGetSynciv@20 ++glGetTexLevelParameterfv@16 ++glGetTexLevelParameteriv@16 ++glGetTexParameterIiv@12 ++glGetTexParameterIuiv@12 ++glGetTexParameterfv@12 ++glGetTexParameteriv@12 ++glGetTransformFeedbackVarying@28 ++glGetUniformBlockIndex@8 ++glGetUniformIndices@16 ++glGetUniformLocation@8 ++glGetUniformfv@12 ++glGetUniformiv@12 ++glGetUniformuiv@12 ++glGetVertexAttribIiv@12 ++glGetVertexAttribIuiv@12 ++glGetVertexAttribPointerv@12 ++glGetVertexAttribfv@12 ++glGetVertexAttribiv@12 ++glGetnUniformfv@16 ++glGetnUniformiv@16 ++glGetnUniformuiv@16 ++glHint@8 ++glInvalidateFramebuffer@12 ++glInvalidateSubFramebuffer@28 ++glIsBuffer@4 ++glIsEnabled@4 ++glIsEnabledi@8 ++glIsFramebuffer@4 ++glIsProgram@4 ++glIsProgramPipeline@4 ++glIsQuery@4 ++glIsRenderbuffer@4 ++glIsSampler@4 ++glIsShader@4 ++glIsSync@4 ++glIsTexture@4 ++glIsTransformFeedback@4 ++glIsVertexArray@4 ++glLineWidth@4 ++glLinkProgram@4 ++glMapBufferRange@16 ++glMemoryBarrier@4 ++glMemoryBarrierByRegion@4 ++glMinSampleShading@4 ++glObjectLabel@16 ++glObjectPtrLabel@12 ++glPatchParameteri@8 ++glPauseTransformFeedback@0 ++glPixelStorei@8 ++glPolygonOffset@8 ++glPopDebugGroup@0 ++glPrimitiveBoundingBox@32 ++glProgramBinary@16 ++glProgramParameteri@12 ++glProgramUniform1f@12 ++glProgramUniform1fv@16 ++glProgramUniform1i@12 ++glProgramUniform1iv@16 ++glProgramUniform1ui@12 ++glProgramUniform1uiv@16 ++glProgramUniform2f@16 ++glProgramUniform2fv@16 ++glProgramUniform2i@16 ++glProgramUniform2iv@16 ++glProgramUniform2ui@16 ++glProgramUniform2uiv@16 ++glProgramUniform3f@20 ++glProgramUniform3fv@16 ++glProgramUniform3i@20 ++glProgramUniform3iv@16 ++glProgramUniform3ui@20 ++glProgramUniform3uiv@16 ++glProgramUniform4f@24 ++glProgramUniform4fv@16 ++glProgramUniform4i@24 ++glProgramUniform4iv@16 ++glProgramUniform4ui@24 ++glProgramUniform4uiv@16 ++glProgramUniformMatrix2fv@20 ++glProgramUniformMatrix2x3fv@20 ++glProgramUniformMatrix2x4fv@20 ++glProgramUniformMatrix3fv@20 ++glProgramUniformMatrix3x2fv@20 ++glProgramUniformMatrix3x4fv@20 ++glProgramUniformMatrix4fv@20 ++glProgramUniformMatrix4x2fv@20 ++glProgramUniformMatrix4x3fv@20 ++glPushDebugGroup@16 ++glReadBuffer@4 ++glReadPixels@28 ++glReadnPixels@32 ++glReleaseShaderCompiler@0 ++glRenderbufferStorage@16 ++glRenderbufferStorageMultisample@20 ++glResumeTransformFeedback@0 ++glSampleCoverage@8 ++glSampleMaski@8 ++glSamplerParameterIiv@12 ++glSamplerParameterIuiv@12 ++glSamplerParameterf@12 ++glSamplerParameterfv@12 ++glSamplerParameteri@12 ++glSamplerParameteriv@12 ++glScissor@16 ++glShaderBinary@20 ++glShaderSource@16 ++glStencilFunc@12 ++glStencilFuncSeparate@16 ++glStencilMask@4 ++glStencilMaskSeparate@8 ++glStencilOp@12 ++glStencilOpSeparate@16 ++glTexBuffer@12 ++glTexBufferRange@20 ++glTexImage2D@36 ++glTexImage3D@40 ++glTexParameterIiv@12 ++glTexParameterIuiv@12 ++glTexParameterf@12 ++glTexParameterfv@12 ++glTexParameteri@12 ++glTexParameteriv@12 ++glTexStorage2D@20 ++glTexStorage2DMultisample@24 ++glTexStorage3D@24 ++glTexStorage3DMultisample@28 ++glTexSubImage2D@36 ++glTexSubImage3D@44 ++glTransformFeedbackVaryings@16 ++glUniform1f@8 ++glUniform1fv@12 ++glUniform1i@8 ++glUniform1iv@12 ++glUniform1ui@8 ++glUniform1uiv@12 ++glUniform2f@12 ++glUniform2fv@12 ++glUniform2i@12 ++glUniform2iv@12 ++glUniform2ui@12 ++glUniform2uiv@12 ++glUniform3f@16 ++glUniform3fv@12 ++glUniform3i@16 ++glUniform3iv@12 ++glUniform3ui@16 ++glUniform3uiv@12 ++glUniform4f@20 ++glUniform4fv@12 ++glUniform4i@20 ++glUniform4iv@12 ++glUniform4ui@20 ++glUniform4uiv@12 ++glUniformBlockBinding@12 ++glUniformMatrix2fv@16 ++glUniformMatrix2x3fv@16 ++glUniformMatrix2x4fv@16 ++glUniformMatrix3fv@16 ++glUniformMatrix3x2fv@16 ++glUniformMatrix3x4fv@16 ++glUniformMatrix4fv@16 ++glUniformMatrix4x2fv@16 ++glUniformMatrix4x3fv@16 ++glUnmapBuffer@4 ++glUseProgram@4 ++glUseProgramStages@12 ++glValidateProgram@4 ++glValidateProgramPipeline@4 ++glVertexAttrib1f@8 ++glVertexAttrib1fv@8 ++glVertexAttrib2f@12 ++glVertexAttrib2fv@8 ++glVertexAttrib3f@16 ++glVertexAttrib3fv@8 ++glVertexAttrib4f@20 ++glVertexAttrib4fv@8 ++glVertexAttribBinding@8 ++glVertexAttribDivisor@8 ++glVertexAttribFormat@20 ++glVertexAttribI4i@20 ++glVertexAttribI4iv@8 ++glVertexAttribI4ui@20 ++glVertexAttribI4uiv@8 ++glVertexAttribIFormat@16 ++glVertexAttribIPointer@20 ++glVertexAttribPointer@24 ++glVertexBindingDivisor@8 ++glViewport@16 ++glWaitSync@16 +diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build +index 356c5760c495e5b8a52abc2c841741f9b2b47222..8b133daa131276025072b4a85318e423206981cc 100644 +--- a/src/mapi/es2api/meson.build ++++ b/src/mapi/es2api/meson.build +@@ -29,12 +29,22 @@ es2_glapi_mapi_tmp_h = custom_target( + + _es2_c_args = [] + if with_platform_windows +- _es2_c_args += ['-D_GDI32_', '-DBUILD_GL32'] ++ _es2_c_args += ['-D_GDI32_'] + endif + ++gles2_def = custom_target( ++ 'gles2.def', ++ input: 'gles2.def.in', ++ output : 'gles2.def', ++ command : [prog_python, gen_vs_module_defs_py, ++ '--in_file', '@INPUT@', '--out_file', '@OUTPUT@', ++ '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()] ++) ++ + libgles2 = shared_library( + 'GLESv2' + get_option('gles-lib-suffix'), + ['../entry.c', es2_glapi_mapi_tmp_h], ++ vs_module_defs : gles2_def, + c_args : [ + c_msvc_compat_args, + _es2_c_args, +diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build +index 270b9870b400803d5cc8c484242c65b96ba99b9d..9f06207fe0a24e123b542ddf886ce2b325b0e105 100644 +--- a/src/mapi/glapi/meson.build ++++ b/src/mapi/glapi/meson.build +@@ -52,7 +52,7 @@ if with_shared_glapi + else + static_glapi_args += '-DMAPI_MODE_UTIL' + if with_platform_windows +- static_glapi_args += ['-D_GDI32_', '-DBUILD_GL32', '-DKHRONOS_DLL_EXPORTS', '-D_GLAPI_NO_EXPORTS'] ++ static_glapi_args += ['-D_GDI32_', '-DKHRONOS_DLL_EXPORTS', '-D_GLAPI_NO_EXPORTS'] + endif + static_glapi_files += files( + 'glapi_dispatch.c', +diff --git a/src/mesa/meson.build b/src/mesa/meson.build +index bc7963413ff46781ae4a58a7762a58a73e67a23a..08b0cac497490fa40230861bd24bdba6e83016ad 100644 +--- a/src/mesa/meson.build ++++ b/src/mesa/meson.build +@@ -489,7 +489,6 @@ _mesa_windows_args = [] + if with_platform_windows + _mesa_windows_args += [ + '-D_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers +- '-DBUILD_GL32' # declare gl* as __declspec(dllexport) in Mesa headers + ] + if not with_shared_glapi + # prevent _glapi_* from being declared __declspec(dllimport) +diff --git a/src/vulkan/meson.build b/src/vulkan/meson.build +index 6384af782976e3f8300cf5e69d11e98fa6ac5e83..8c2f0dd08632116eebbd982516e1004e9db01e09 100644 +--- a/src/vulkan/meson.build ++++ b/src/vulkan/meson.build +@@ -27,6 +27,15 @@ vulkan_wsi_args = [] + vulkan_wsi_deps = [] + vulkan_wsi_list = [] + ++vulkan_api_def = custom_target( ++ 'vulkan_api.def', ++ input: 'vulkan_api.def.in', ++ output : 'vulkan_api.def', ++ command : [prog_python, gen_vs_module_defs_py, ++ '--in_file', '@INPUT@', '--out_file', '@OUTPUT@', ++ '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()] ++) ++ + if with_platform_x11 + vulkan_wsi_deps += [ + dep_xcb, +diff --git a/src/vulkan/vulkan_api.def.in b/src/vulkan/vulkan_api.def.in +new file mode 100644 +index 0000000000000000000000000000000000000000..678e4d99278b96d0ef1ee15c51e5febf8fcea58e +--- /dev/null ++++ b/src/vulkan/vulkan_api.def.in +@@ -0,0 +1,4 @@ ++; stdcall calling convention have @number suffix on 32 bits architecture for gcc ++vk_icdNegotiateLoaderICDInterfaceVersion@4 ++vk_icdGetInstanceProcAddr@8 ++vk_icdGetPhysicalDeviceProcAddr@8 diff --git a/externals/vcpkg/ports/mesa/portfile.cmake b/externals/vcpkg/ports/mesa/portfile.cmake new file mode 100755 index 000000000..03ee3c3d9 --- /dev/null +++ b/externals/vcpkg/ports/mesa/portfile.cmake @@ -0,0 +1,137 @@ +# Build-Depends: From X Window PR: zstd, drm (!windows), elfutils (!windows), wayland (!windows), wayland-protocols (!windows), xdamage, xshmfence (!windows), x11, xcb, xfixes, xext, xxf86vm, xrandr, xv, xvmc (!windows), egl-registry, opengl-registry, tool-meson +# Required LLVM modules: LLVM (modules: bitwriter, core, coroutines, engine, executionengine, instcombine, mcdisassembler, mcjit, scalaropts, transformutils) found: YES + +# Patches are from https://github.com/pal1000/mesa-dist-win/tree/master/patches +set(PATCHES + # Fix symbols exporting for MinGW GCC x86 + def-fixes.patch + # Fix MinGW clang build + clang.patch + # Clover build on Windows + clover.patch +) + +vcpkg_check_linkage(ONLY_DYNAMIC_CRT) +if(VCPKG_TARGET_IS_WINDOWS) + set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) # some parts of this port can only build as a shared library. +endif() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH SOURCE_PATH + REPO mesa/mesa + REF mesa-22.0.2 + SHA512 1139bae1fa9f9b49727c5aaddad9b2908c7643d7c6c435544e8322c84d17c012f04aa73876bef8cab9b517e36957eb2a678b3001da2d69a32497ef4569f6172e + FILE_DISAMBIGUATOR 1 + HEAD_REF master + PATCHES ${PATCHES} +) + + +x_vcpkg_get_python_packages(PYTHON_VERSION "3" OUT_PYTHON_VAR "PYTHON3" PACKAGES setuptools mako ) + +vcpkg_find_acquire_program(FLEX) +get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) +vcpkg_add_to_path(PREPEND "${FLEX_DIR}") +vcpkg_find_acquire_program(BISON) +get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) +vcpkg_add_to_path(PREPEND "${BISON_DIR}") + +if(WIN32) # WIN32 HOST probably has win_flex and win_bison! + if(NOT EXISTS "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") + if(FLEX_DIR MATCHES "${DOWNLOADS}") + file(CREATE_LINK "${FLEX}" "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") + else() + message(FATAL_ERROR "${PORT} requires flex being named flex on windows and not win_flex!\n(Can be solved by creating a simple link from win_flex to flex)") + endif() + endif() + if(NOT EXISTS "${BISON_DIR}/BISON${VCPKG_HOST_EXECUTABLE_SUFFIX}") + if(BISON_DIR MATCHES "${DOWNLOADS}") + file(CREATE_LINK "${BISON}" "${BISON_DIR}/bison${VCPKG_HOST_EXECUTABLE_SUFFIX}") + else() + message(FATAL_ERROR "${PORT} requires bison being named bison on windows and not win_bison!\n(Can be solved by creating a simple link from win_bison to bison)") + endif() + endif() +endif() + +# For features https://github.com/pal1000/mesa-dist-win should be probably studied a bit more. +list(APPEND MESA_OPTIONS -Dzstd=enabled) +list(APPEND MESA_OPTIONS -Dshared-llvm=auto) +list(APPEND MESA_OPTIONS -Dlibunwind=disabled) +list(APPEND MESA_OPTIONS -Dlmsensors=disabled) +list(APPEND MESA_OPTIONS -Dvalgrind=disabled) +list(APPEND MESA_OPTIONS -Dglvnd=false) +list(APPEND MESA_OPTIONS -Dglx=disabled) +list(APPEND MESA_OPTIONS -Dgbm=disabled) +list(APPEND MESA_OPTIONS -Dosmesa=true) + +if("llvm" IN_LIST FEATURES) + list(APPEND MESA_OPTIONS -Dllvm=enabled) +else() + list(APPEND MESA_OPTIONS -Dllvm=disabled) +endif() + +if("gles1" IN_LIST FEATURES) + list(APPEND MESA_OPTIONS -Dgles1=enabled) +else() + list(APPEND MESA_OPTIONS -Dgles1=disabled) +endif() +if("gles2" IN_LIST FEATURES) + list(APPEND MESA_OPTIONS -Dgles2=enabled) +else() + list(APPEND MESA_OPTIONS -Dgles2=disabled) +endif() +if("opengl" IN_LIST FEATURES) + list(APPEND MESA_OPTIONS -Dopengl=true) +else() + list(APPEND MESA_OPTIONS -Dopengl=false) +endif() +if("egl" IN_LIST FEATURES) # EGL feature only works on Linux + list(APPEND MESA_OPTIONS -Degl=enabled) +else() + list(APPEND MESA_OPTIONS -Degl=disabled) +endif() + +list(APPEND MESA_OPTIONS -Dshared-glapi=enabled) #shared GLAPI required when building two or more of the following APIs - opengl, gles1 gles2 + +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND MESA_OPTIONS -Dplatforms=['windows']) + list(APPEND MESA_OPTIONS -Dmicrosoft-clc=disabled) + if(NOT VCPKG_TARGET_IS_MINGW) + set(VCPKG_CXX_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_CXX_FLAGS}") + set(VCPKG_C_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_C_FLAGS}") + endif() +endif() + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dgles-lib-suffix=_mesa + #-D egl-lib-suffix=_mesa + -Dbuild-tests=false + ${MESA_OPTIONS} + ) +vcpkg_install_meson() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +#installed by egl-registry +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/KHR") +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/EGL/egl.h") +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/EGL/eglext.h") +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/EGL/eglplatform.h") +#installed by opengl-registry +set(_double_files include/GL/glcorearb.h include/GL/glext.h include/GL/glxext.h + include/GLES/egl.h include/GLES/gl.h include/GLES/glext.h include/GLES/glplatform.h + include/GLES2/gl2.h include/GLES2/gl2ext.h include/GLES2/gl2platform.h + include/GLES3/gl3.h include/GLES3/gl31.h include/GLES3/gl32.h include/GLES3/gl3platform.h) +list(TRANSFORM _double_files PREPEND "${CURRENT_PACKAGES_DIR}/") +file(REMOVE ${_double_files}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/GLES") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/GLES2") +# Handle copyright +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/mesa/vcpkg.json b/externals/vcpkg/ports/mesa/vcpkg.json new file mode 100755 index 000000000..6218984c0 --- /dev/null +++ b/externals/vcpkg/ports/mesa/vcpkg.json @@ -0,0 +1,107 @@ +{ + "name": "mesa", + "version": "22.0.2", + "description": "Mesa - The 3D Graphics Library", + "homepage": "https://www.mesa3d.org/", + "license": "MIT AND BSL-1.0 AND SGI-B-2.0", + "supports": "!(windows & arm)", + "dependencies": [ + { + "name": "vcpkg-get-python-packages", + "host": true + }, + { + "name": "vcpkg-tool-meson", + "host": true + }, + "zlib", + "zstd" + ], + "default-features": [ + "default-features" + ], + "features": { + "default-features": { + "description": "Platform dependent default features", + "dependencies": [ + { + "name": "mesa", + "default-features": false, + "features": [ + "gles1" + ] + }, + { + "name": "mesa", + "default-features": false, + "features": [ + "gles2" + ] + }, + { + "name": "mesa", + "default-features": false, + "features": [ + "opengl" + ] + }, + { + "name": "mesa", + "default-features": false, + "features": [ + "llvm" + ], + "platform": "x64" + } + ] + }, + "egl": { + "description": "Build support for EGL platform", + "dependencies": [ + { + "name": "mesa", + "default-features": false + } + ] + }, + "gles1": { + "description": "Build support for OpenGL ES 1.x", + "dependencies": [ + { + "name": "mesa", + "default-features": false + } + ] + }, + "gles2": { + "description": "Build support for OpenGL ES 2.x and 3.x", + "dependencies": [ + { + "name": "mesa", + "default-features": false + } + ] + }, + "llvm": { + "description": "Build with llvmpipe", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "libclc" + ] + } + ] + }, + "opengl": { + "description": "Build support for OpenGL (all versions)", + "dependencies": [ + { + "name": "mesa", + "default-features": false + } + ] + } + } +} diff --git a/externals/vcpkg/ports/meschach/CMakeLists.txt b/externals/vcpkg/ports/meschach/CMakeLists.txt new file mode 100755 index 000000000..e60d29097 --- /dev/null +++ b/externals/vcpkg/ports/meschach/CMakeLists.txt @@ -0,0 +1,85 @@ +cmake_minimum_required(VERSION 3.8.0) +project(meschach) + +if(MSVC) + add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS) +endif() + +set(meschach_srcs + bdfactor.c + bkpfacto.c + chfactor.c + copy.c + err.c + extras.c + fft.c + givens.c + hessen.c + hsehldr.c + init.c + iter0.c + iternsym.c + itersym.c + ivecop.c + lufactor.c + machine.c + matlab.c + matop.c + matrixio.c + meminfo.c + memory.c + memstat.c + mfunc.c + norm.c + otherio.c + pxop.c + qrfactor.c + schur.c + solve.c + sparse.c + sparseio.c + spbkp.c + spchfctr.c + splufctr.c + sprow.c + spswap.c + submat.c + svd.c + symmeig.c + update.c + vecop.c + version.c + zcopy.c + zfunc.c + zgivens.c + zhessen.c + zhsehldr.c + zlufctr.c + zmachine.c + zmatio.c + zmatlab.c + zmatop.c + zmemory.c + znorm.c + zqrfctr.c + zschur.c + zsolve.c + ztorture.c + zvecop.c +) +file(GLOB meschach_headers "*.h") + +include_directories(".") + +add_library(meschach ${meschach_srcs}) +target_compile_definitions(meschach PRIVATE -DHAVE_MEMORY_H -DHAVE_COMPLEX_H) + +install( + TARGETS meschach + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES ${meschach_headers} DESTINATION include/meschach) +endif() diff --git a/externals/vcpkg/ports/meschach/portfile.cmake b/externals/vcpkg/ports/meschach/portfile.cmake new file mode 100755 index 000000000..5bbcff8fa --- /dev/null +++ b/externals/vcpkg/ports/meschach/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_download_distfile(ARCHIVE + URLS "http://homepage.math.uiowa.edu/~dstewart/meschach/mesch12b.tar.gz" + FILENAME "mesch12b.tar.gz" + SHA512 9051e1502b8c9741400c61fd6038e514887f305f267ba4e97d747423de3da1270f835f65b2d1f538f8938677060bc0fcfd7a94022d74fbfd31a0450116e9d79e +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/meschach) diff --git a/externals/vcpkg/ports/meschach/vcpkg.json b/externals/vcpkg/ports/meschach/vcpkg.json new file mode 100755 index 000000000..2cd52bfb1 --- /dev/null +++ b/externals/vcpkg/ports/meschach/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "meschach", + "version-string": "1.2b", + "port-version": 5, + "description": "Matrix computations in C", + "homepage": "https://homepage.math.uiowa.edu/~dstewart/meschach", + "supports": "windows & !uwp" +} diff --git a/externals/vcpkg/ports/meshoptimizer/portfile.cmake b/externals/vcpkg/ports/meshoptimizer/portfile.cmake new file mode 100755 index 000000000..f72d3e493 --- /dev/null +++ b/externals/vcpkg/ports/meshoptimizer/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO zeux/meshoptimizer + REF v0.16 + SHA512 CC6D28359FB99A615E1046A4AF1B247CBC6EA0266D9E7F41EA0516C1FC09FA1E67376071DAF138A126C77BCA3BAF9D565636ED0E3ADF045F1A08498C38B7A7E7 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBS) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DMESHOPT_BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/meshoptimizer) + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_copy_pdbs() \ No newline at end of file diff --git a/externals/vcpkg/ports/meshoptimizer/vcpkg.json b/externals/vcpkg/ports/meshoptimizer/vcpkg.json new file mode 100755 index 000000000..7124de078 --- /dev/null +++ b/externals/vcpkg/ports/meshoptimizer/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "meshoptimizer", + "version": "0.16", + "description": "Mesh optimization library that makes meshes smaller and faster to render", + "homepage": "https://github.com/zeux/meshoptimizer", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/metis/disable-programs.patch b/externals/vcpkg/ports/metis/disable-programs.patch new file mode 100755 index 000000000..0c23be553 --- /dev/null +++ b/externals/vcpkg/ports/metis/disable-programs.patch @@ -0,0 +1,8 @@ +--- a/CMakeLists.txt Wed Dec 21 18:24:22 2016 ++++ b/CMakeLists.txt Wed Dec 21 18:24:26 2016 +@@ -20,4 +20,4 @@ + # Recursively look for CMakeLists.txt in subdirs. + add_subdirectory("include") + add_subdirectory("libmetis") +-add_subdirectory("programs") ++# add_subdirectory("programs") diff --git a/externals/vcpkg/ports/metis/enable-install.patch b/externals/vcpkg/ports/metis/enable-install.patch new file mode 100755 index 000000000..9f36623ad --- /dev/null +++ b/externals/vcpkg/ports/metis/enable-install.patch @@ -0,0 +1,15 @@ +--- a/CMakeLists.txt Sat Mar 30 17:24:45 2013 ++++ b/CMakeLists.txt Wed Dec 21 18:23:43 2016 +@@ -4,11 +4,7 @@ + set(GKLIB_PATH "GKlib" CACHE PATH "path to GKlib") + set(SHARED FALSE CACHE BOOL "build a shared library") + +-if(MSVC) +- set(METIS_INSTALL FALSE) +-else() +- set(METIS_INSTALL TRUE) +-endif() ++set(METIS_INSTALL TRUE) + + # Configure libmetis library. + if(SHARED) diff --git a/externals/vcpkg/ports/metis/fix-INT_MIN_define.patch b/externals/vcpkg/ports/metis/fix-INT_MIN_define.patch new file mode 100755 index 000000000..97d7881f5 --- /dev/null +++ b/externals/vcpkg/ports/metis/fix-INT_MIN_define.patch @@ -0,0 +1,34 @@ +diff --git a/include/metis.h b/include/metis.h +index dc5406a..7732437 100644 +--- a/include/metis.h ++++ b/include/metis.h +@@ -72,10 +72,14 @@ typedef __int64 int64_t; + #define PRId64 "I64d" + #define SCNd32 "ld" + #define SCNd64 "I64d" ++#ifdef _WIN32 ++#include ++#else + #define INT32_MIN ((int32_t)_I32_MIN) + #define INT32_MAX _I32_MAX + #define INT64_MIN ((int64_t)_I64_MIN) + #define INT64_MAX _I64_MAX ++#endif + #else + #include + #endif +diff --git a/GKlib/gk_arch.h b/GKlib/gk_arch.h +index 78b1431..7258763 100644 +--- a/GKlib/gk_arch.h ++++ b/GKlib/gk_arch.h +@@ -32,8 +32,8 @@ + + + #ifdef __MSC__ +- #include "ms_stdint.h" +- #include "ms_inttypes.h" ++ #include ++ #include + #include "ms_stat.h" + #else + #ifndef SUNOS diff --git a/externals/vcpkg/ports/metis/fix-gklib-vs14-math.patch b/externals/vcpkg/ports/metis/fix-gklib-vs14-math.patch new file mode 100755 index 000000000..e83a68230 --- /dev/null +++ b/externals/vcpkg/ports/metis/fix-gklib-vs14-math.patch @@ -0,0 +1,11 @@ +--- a/GKlib/gk_arch.h Wed Dec 21 18:34:18 2016 ++++ b/GKlib/gk_arch.h Wed Dec 21 18:30:49 2016 +@@ -58,7 +58,7 @@ + #define PTRDIFF_MAX INT64_MAX + #endif + +-#ifdef __MSC__ ++#if defined(__MSC__) && (_MSC_VER < 1900) + /* MSC does not have rint() function */ + #define rint(x) ((int)((x)+0.5)) + diff --git a/externals/vcpkg/ports/metis/fix-linux-build-error.patch b/externals/vcpkg/ports/metis/fix-linux-build-error.patch new file mode 100755 index 000000000..b3563a881 --- /dev/null +++ b/externals/vcpkg/ports/metis/fix-linux-build-error.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e94f050..b9613a7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,7 +1,8 @@ + cmake_minimum_required(VERSION 2.8) + project(METIS) + +-set(GKLIB_PATH "GKlib" CACHE PATH "path to GKlib") ++set(GKLIB_PATH "${CMAKE_SOURCE_DIR}/GKlib" CACHE PATH "path to GKlib") ++ + set(SHARED FALSE CACHE BOOL "build a shared library") + + set(METIS_INSTALL TRUE) diff --git a/externals/vcpkg/ports/metis/fix-metis-vs14-math.patch b/externals/vcpkg/ports/metis/fix-metis-vs14-math.patch new file mode 100755 index 000000000..a296213e8 --- /dev/null +++ b/externals/vcpkg/ports/metis/fix-metis-vs14-math.patch @@ -0,0 +1,11 @@ +--- a/libmetis/metislib.h Sat Mar 30 17:24:45 2013 ++++ b/libmetis/metislib.h Wed Dec 21 18:30:59 2016 +@@ -31,7 +31,7 @@ + #include + + +-#if defined(COMPILER_MSC) ++#if defined(COMPILER_MSC) && (_MSC_VER < 1900) + #if defined(rint) + #undef rint + #endif diff --git a/externals/vcpkg/ports/metis/fix-runtime-install-destination.patch b/externals/vcpkg/ports/metis/fix-runtime-install-destination.patch new file mode 100755 index 000000000..8d9147e5f --- /dev/null +++ b/externals/vcpkg/ports/metis/fix-runtime-install-destination.patch @@ -0,0 +1,10 @@ +--- a/libmetis/CMakeLists.txt Sat Mar 30 17:24:45 2013 ++++ b/libmetis/CMakeLists.txt Wed Dec 21 17:41:37 2016 +@@ -11,6 +11,6 @@ + if(METIS_INSTALL) + install(TARGETS metis + LIBRARY DESTINATION lib +- RUNTIME DESTINATION lib ++ RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib) + endif() diff --git a/externals/vcpkg/ports/metis/install-metisConfig.patch b/externals/vcpkg/ports/metis/install-metisConfig.patch new file mode 100755 index 000000000..c07600a85 --- /dev/null +++ b/externals/vcpkg/ports/metis/install-metisConfig.patch @@ -0,0 +1,44 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b9613a7..e43ffee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,3 +22,23 @@ include_directories(include) + add_subdirectory("include") + add_subdirectory("libmetis") + # add_subdirectory("programs") ++ ++if(METIS_INSTALL) ++ set(PRJ_NAME metis) ++ set(PRJ_VER 5.1.0) ++ install(EXPORT metisTargets ++ FILE ${PRJ_NAME}Targets.cmake ++ DESTINATION lib/cmake/${PRJ_NAME}) ++ include(CMakePackageConfigHelpers) ++ write_basic_package_version_file( ++ ${CMAKE_CURRENT_BINARY_DIR}/${PRJ_NAME}ConfigVersion.cmake ++ VERSION ${PRJ_VER} ++ COMPATIBILITY SameMajorVersion) ++ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${PRJ_NAME}Config.cmake ++ "include(\${CMAKE_CURRENT_LIST_DIR}/${PRJ_NAME}Targets.cmake)") ++ install(FILES ++ ${CMAKE_CURRENT_BINARY_DIR}/${PRJ_NAME}ConfigVersion.cmake ++ ${CMAKE_CURRENT_BINARY_DIR}/${PRJ_NAME}Config.cmake ++ DESTINATION lib/cmake/${PRJ_NAME}) ++endif() ++ +diff --git a/libmetis/CMakeLists.txt b/libmetis/CMakeLists.txt +index 7a5fc74..5a68cf0 100644 +--- a/libmetis/CMakeLists.txt ++++ b/libmetis/CMakeLists.txt +@@ -9,8 +9,9 @@ if(UNIX) + endif() + + if(METIS_INSTALL) +- install(TARGETS metis ++ install(TARGETS metis EXPORT metisTargets + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin +- ARCHIVE DESTINATION lib) ++ ARCHIVE DESTINATION lib ++ INCLUDES DESTINATION include) + endif() diff --git a/externals/vcpkg/ports/metis/portfile.cmake b/externals/vcpkg/ports/metis/portfile.cmake new file mode 100755 index 000000000..07f5d0257 --- /dev/null +++ b/externals/vcpkg/ports/metis/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +set(OPTIONS -DSHARED=OFF) + +set(METIS_VERSION 5.1.0) + +vcpkg_download_distfile(ARCHIVE + URLS "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-${METIS_VERSION}.tar.gz" + FILENAME "metis-${METIS_VERSION}.tar.gz" + SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${METIS_VERSION} + PATCHES + enable-install.patch + disable-programs.patch + fix-runtime-install-destination.patch + fix-metis-vs14-math.patch + fix-gklib-vs14-math.patch + fix-linux-build-error.patch + install-metisConfig.patch + fix-INT_MIN_define.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS ${OPTIONS} +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/metis) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/metis) +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/metis/vcpkg.json b/externals/vcpkg/ports/metis/vcpkg.json new file mode 100755 index 000000000..82baa5438 --- /dev/null +++ b/externals/vcpkg/ports/metis/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "metis", + "version-string": "5.1.0", + "port-version": 8, + "description": "Serial Graph Partitioning and Fill-reducing Matrix Ordering", + "homepage": "https://glaros.dtc.umn.edu/gkhome/metis/metis/overview" +} diff --git a/externals/vcpkg/ports/metrohash/CMakeLists.txt b/externals/vcpkg/ports/metrohash/CMakeLists.txt new file mode 100755 index 000000000..d63a71345 --- /dev/null +++ b/externals/vcpkg/ports/metrohash/CMakeLists.txt @@ -0,0 +1,69 @@ +cmake_minimum_required(VERSION 3.5) +project(metrohash LANGUAGES CXX) +set(CMAKE_CXX_STANDARD 11) + +add_library(metrohash + src/metrohash64.cpp + src/metrohash128.cpp + ) +list(APPEND metro_headers src/metrohash.h src/metrohash64.h src/metrohash128.h) + +include(CheckCXXSourceCompiles) +include(CheckCXXCompilerFlag) + +if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + check_cxx_compiler_flag("-msse4.2" HAS_MSSE42) + if(HAS_MSSE42) + target_compile_options(metrohash PRIVATE -msse4.2) + string(APPEND CMAKE_REQUIRED_FLAGS " -msse4.2") + endif() +endif() + +check_cxx_source_compiles( +"#include +int main() { + _mm_crc32_u64(0, 0); + return 0; +}" +HAS_mm_crc32_u64) + +if(HAS_mm_crc32_u64) + list(APPEND metro_headers src/metrohash128crc.h) + target_sources(metrohash PRIVATE src/metrohash128crc.cpp) +endif() +if(CMAKE_CXX_COMPILER_ID MATCHES GNU) + target_compile_options(metrohash PRIVATE -march=native) +endif() + +set_target_properties(metrohash PROPERTIES + PUBLIC_HEADER "${metro_headers}" + ) + +include(CMakePackageConfigHelpers) + +set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") +set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake") +set(config_install_dir "lib/cmake/${PROJECT_NAME}") +set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") +set(namespace "${PROJECT_NAME}::") + +configure_package_config_file( + "${CMAKE_SOURCE_DIR}/cmake/Config.cmake.in" + "${project_config}" + INSTALL_DESTINATION "${config_install_dir}" +) +#Installation +install(TARGETS metrohash + EXPORT "${TARGETS_EXPORT_NAME}" + LIBRARY DESTINATION "lib" + ARCHIVE DESTINATION "lib" + PUBLIC_HEADER DESTINATION "include") + +install( + FILES "${project_config}" + DESTINATION "${config_install_dir}" +) +install(EXPORT "${TARGETS_EXPORT_NAME}" + NAMESPACE "${namespace}" + DESTINATION "${config_install_dir}" + ) diff --git a/externals/vcpkg/ports/metrohash/Config.cmake.in b/externals/vcpkg/ports/metrohash/Config.cmake.in new file mode 100755 index 000000000..38bbde7b3 --- /dev/null +++ b/externals/vcpkg/ports/metrohash/Config.cmake.in @@ -0,0 +1,4 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") +check_required_components("@PROJECT_NAME@") diff --git a/externals/vcpkg/ports/metrohash/portfile.cmake b/externals/vcpkg/ports/metrohash/portfile.cmake new file mode 100755 index 000000000..d62741a2a --- /dev/null +++ b/externals/vcpkg/ports/metrohash/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jandrewrogers/MetroHash + REF v1.1.3 + SHA512 02b6316e5ebf3d81465eea8a068565452be642394ddf5a53350affbbc9b9bfe1c3d182f7e8f7d49895351c48e11929e465777535e4354e01b6d0ba459e583ac5 + HEAD_REF master +) + +file(COPY ${CURRENT_PORT_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +configure_file(${CURRENT_PORT_DIR}/Config.cmake.in ${SOURCE_PATH}/cmake/Config.cmake.in COPYONLY) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_copy_pdbs() + +if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/include/metrohash128crc.h") + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/metrohash.h + "#include \"metrohash128crc.h\"" + "//#include \"metrohash128crc.h\" // The target platform does not support _mm_crc32_u64") +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/metrohash/vcpkg.json b/externals/vcpkg/ports/metrohash/vcpkg.json new file mode 100755 index 000000000..2f61a8670 --- /dev/null +++ b/externals/vcpkg/ports/metrohash/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "metrohash", + "version": "1.1.3", + "port-version": 4, + "description": "MetroHash is a set of state-of-the-art hash functions for non-cryptographic use cases", + "homepage": "https://github.com/jandrewrogers/MetroHash" +} diff --git a/externals/vcpkg/ports/mfl/portfile.cmake b/externals/vcpkg/ports/mfl/portfile.cmake new file mode 100755 index 000000000..3bb9cbceb --- /dev/null +++ b/externals/vcpkg/ports/mfl/portfile.cmake @@ -0,0 +1,24 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +message(WARNING "${PORT} is a C++20 library and requires a corresponding compiler. GCC 10, Clang 10 and MSVC 2019 16.8 are known to work.") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cpp-niel/mfl + REF v0.0.1 + SHA512 a609b4ff23a01e9f9d9bf60bfa6e0b2346b054cf0c27e74e6da574dcfd2a6ead30dcb8464cf03cae2bb9995f15f01ffda5f862c0ec2744a9ad38b856ff27f073 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/mfl) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/mfl/vcpkg.json b/externals/vcpkg/ports/mfl/vcpkg.json new file mode 100755 index 000000000..88dc46f3c --- /dev/null +++ b/externals/vcpkg/ports/mfl/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "mfl", + "version": "0.0.1", + "description": "Computes the layout information for mathematical formulas provided in TeX-like syntax.", + "homepage": "https://github.com/cpp-niel/mfl", + "license": "MIT", + "supports": "static", + "dependencies": [ + "cairo", + "doctest", + "fmt", + "freetype", + "harfbuzz", + "range-v3" + ] +} diff --git a/externals/vcpkg/ports/mgnlibs/portfile.cmake b/externals/vcpkg/ports/mgnlibs/portfile.cmake new file mode 100755 index 000000000..cd5ee8d21 --- /dev/null +++ b/externals/vcpkg/ports/mgnlibs/portfile.cmake @@ -0,0 +1,16 @@ +#header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mattiasgustavsson/libs + REF 9a6e7205caecbe336e41aebdc9c79a5c47daa5ec + SHA512 87493f883f0752a334bbcec69228e325d9e1f36a99d313be9243f4e6e14876bcd5a976682d3fd7e3e285e426ac69587d35ba3378b2124450b9a8ed6127f110a5 + HEAD_REF master +) + +# Put the licence file where vcpkg expects it +file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/mgnlibs/README.md) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/mgnlibs/README.md ${CURRENT_PACKAGES_DIR}/share/mgnlibs/copyright) + +# Copy the header files +file(GLOB HEADER_FILES ${SOURCE_PATH}/*.h) +file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/mgnlibs) diff --git a/externals/vcpkg/ports/mgnlibs/vcpkg.json b/externals/vcpkg/ports/mgnlibs/vcpkg.json new file mode 100755 index 000000000..e6b852258 --- /dev/null +++ b/externals/vcpkg/ports/mgnlibs/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "mgnlibs", + "version-string": "2019-09-29", + "port-version": 1, + "description": "Single-file public domain libraries for C/C++", + "homepage": "https://github.com/mattiasgustavsson/libs" +} diff --git a/externals/vcpkg/ports/mhook/fix-windows-packing-mismatch.patch b/externals/vcpkg/ports/mhook/fix-windows-packing-mismatch.patch new file mode 100755 index 000000000..847cd4ba3 --- /dev/null +++ b/externals/vcpkg/ports/mhook/fix-windows-packing-mismatch.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6e1df9f..e1e6ced 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,7 +4,7 @@ project(mhook) + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMake") + +-add_definitions(-DNO_SANITY_CHECKS -DUNICODE -D_UNICODE -DWIN32_LEAN_AND_MEAN) ++add_definitions(-DNO_SANITY_CHECKS -DUNICODE -D_UNICODE -DWIN32_LEAN_AND_MEAN -DWINDOWS_IGNORE_PACKING_MISMATCH) + + file(GLOB DisasmSrc disasm-lib/*.c disasm-lib/*.h) + file(GLOB MhookSrc mhook-lib/*.cpp mhook-lib/*.h) diff --git a/externals/vcpkg/ports/mhook/portfile.cmake b/externals/vcpkg/ports/mhook/portfile.cmake new file mode 100755 index 000000000..f89536f73 --- /dev/null +++ b/externals/vcpkg/ports/mhook/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO apriorit/mhook + REF 2.5.1 + SHA512 914f198417b1e30301a42463af5cfbf9269dc64bcf1be87d3d6d2943fd72b3536f48eb4bfb25a51dd0bbe0f8f099777b2d49c9d58cb2e2eeb517d998917ae976 + HEAD_REF master + PATCHES fix-windows-packing-mismatch.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/mhook" RENAME copyright) + diff --git a/externals/vcpkg/ports/mhook/vcpkg.json b/externals/vcpkg/ports/mhook/vcpkg.json new file mode 100755 index 000000000..13dc895dd --- /dev/null +++ b/externals/vcpkg/ports/mhook/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "mhook", + "version": "2.5.1", + "port-version": 3, + "description": "A Windows API hooking library.", + "supports": "windows & !uwp & !arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/microsoft-signalr/portfile.cmake b/externals/vcpkg/ports/microsoft-signalr/portfile.cmake new file mode 100755 index 000000000..d5b8266ef --- /dev/null +++ b/externals/vcpkg/ports/microsoft-signalr/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO aspnet/SignalR-Client-Cpp + REF v0.1.0-alpha3 + SHA512 7dbd75748535c7b7fef36afe246b132b243b8b4932c218a63aa18c7a44d6691c002144c6d2f5603ad63c03d018907436ad259fdfcc0d7749917931bdebef670b + HEAD_REF main +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cpprestsdk USE_CPPRESTSDK + messagepack USE_MSGPACK +) + +if("cpprestsdk" IN_LIST FEATURES AND VCPKG_TARGET_IS_UWP) + message(FATAL_ERROR "microsoft-signalr[cpprestsdk] is not supported on UWP, use microsoft-signalr[core] instead") +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTING=OFF + ${FEATURE_OPTIONS} + -DWALL=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/share/microsoft-signalr) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/share ${CURRENT_PACKAGES_DIR}/lib/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(COPY ${SOURCE_PATH}/third-party-notices.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +vcpkg_copy_pdbs() \ No newline at end of file diff --git a/externals/vcpkg/ports/microsoft-signalr/vcpkg.json b/externals/vcpkg/ports/microsoft-signalr/vcpkg.json new file mode 100755 index 000000000..12e555add --- /dev/null +++ b/externals/vcpkg/ports/microsoft-signalr/vcpkg.json @@ -0,0 +1,42 @@ +{ + "name": "microsoft-signalr", + "version-string": "0.1.0-alpha3", + "port-version": 1, + "description": "C++ Client for ASP.NET Core SignalR.", + "homepage": "https://github.com/aspnet/SignalR-Client-Cpp", + "default-features": [ + "default-features" + ], + "features": { + "cpprestsdk": { + "description": "Add default Http and WebSocket implementations using CppRestSDK", + "dependencies": [ + { + "name": "cpprestsdk", + "features": [ + "default-features", + "websockets" + ] + } + ] + }, + "default-features": { + "description": "Features installed by default", + "dependencies": [ + { + "name": "microsoft-signalr", + "features": [ + "cpprestsdk" + ], + "platform": "!uwp" + } + ] + }, + "messagepack": { + "description": "Add support for the messagepack hub protocol, must enable in code still", + "dependencies": [ + "msgpack" + ] + } + } +} diff --git a/externals/vcpkg/ports/mikktspace/CMakeLists.txt b/externals/vcpkg/ports/mikktspace/CMakeLists.txt new file mode 100755 index 000000000..34c2ef2a3 --- /dev/null +++ b/externals/vcpkg/ports/mikktspace/CMakeLists.txt @@ -0,0 +1,41 @@ +cmake_minimum_required(VERSION 3.8) +project(mikktspace C) + +set(CMAKE_DEBUG_POSTFIX d) + +add_library(${PROJECT_NAME} "") +add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) +target_include_directories( + ${PROJECT_NAME} + PUBLIC + $ + $ +) + +target_sources( + ${PROJECT_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/mikktspace.c +) + +install( + TARGETS ${PROJECT_NAME} + EXPORT ${PROJECT_NAME}_target + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin +) + +if(NOT MIKKTSPACE_SKIP_HEADERS) + install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/mikktspace.h + DESTINATION include + ) +endif() + +install( + EXPORT ${PROJECT_NAME}_target + NAMESPACE ${PROJECT_NAME}:: + FILE ${PROJECT_NAME}-config.cmake + DESTINATION share/${PROJECT_NAME} +) diff --git a/externals/vcpkg/ports/mikktspace/portfile.cmake b/externals/vcpkg/ports/mikktspace/portfile.cmake new file mode 100755 index 000000000..28493897f --- /dev/null +++ b/externals/vcpkg/ports/mikktspace/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mmikk/MikkTSpace + REF 3e895b49d05ea07e4c2133156cfa94369e19e409 + SHA512 3ca433bd4efd0e048138f9efc5ba9021e4f3f78a535ea48733088ba5f43e60aad7f840f00e0597a0c053cda4776177bf6deb14cecf4d172b9b68acf00d5a1ca7 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DMIKKTSPACE_SKIP_HEADERS=ON +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets() + +file(INSTALL ${SOURCE_PATH}/mikktspace.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/mikktspace/vcpkg.json b/externals/vcpkg/ports/mikktspace/vcpkg.json new file mode 100755 index 000000000..c26b3e360 --- /dev/null +++ b/externals/vcpkg/ports/mikktspace/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "mikktspace", + "version-string": "2020-10-06", + "port-version": 1, + "description": "A common standard for tangent space used in baking tools to produce normal maps", + "homepage": "https://github.com/mmikk/MikkTSpace" +} diff --git a/externals/vcpkg/ports/milerius-sfml-imgui/FixFindPackageIssue.patch b/externals/vcpkg/ports/milerius-sfml-imgui/FixFindPackageIssue.patch new file mode 100755 index 000000000..a3d8053dd --- /dev/null +++ b/externals/vcpkg/ports/milerius-sfml-imgui/FixFindPackageIssue.patch @@ -0,0 +1,53 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 27b8bd8..33fe623 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,7 +2,7 @@ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) + message(FATAL_ERROR "Prevented in-tree built. Please create a build directory outside of the source code and call cmake from there") + endif () + +-project(sfml-imgui) ++project(milerius-sfml-imgui) + cmake_minimum_required(VERSION 3.9) + set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + +@@ -26,7 +26,7 @@ include(CMakePackageConfigHelpers) + + install(TARGETS + ${PROJECT_NAME} +- EXPORT sfml-imgui-targets ++ EXPORT milerius-sfml-imgui-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +@@ -39,7 +39,7 @@ install(EXPORT ${PROJECT_NAME}-targets + ) + + configure_package_config_file( +- "${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}-config.cmake.in" ++ "${PROJECT_SOURCE_DIR}/cmake/sfml-imgui-config.cmake.in" + "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake" + INSTALL_DESTINATION lib/cmake/${PROJECT_NAME} + ) +@@ -51,6 +51,6 @@ install(FILES + install(DIRECTORY + ${CMAKE_CURRENT_SOURCE_DIR}/sfml-imgui + DESTINATION +- ${CMAKE_INSTALL_INCLUDEDIR}/sfml-imgui ++ ${CMAKE_INSTALL_INCLUDEDIR}/ + FILES_MATCHING PATTERN "*.h*" + ) +diff --git a/cmake/sfml-imgui-config.cmake.in b/cmake/sfml-imgui-config.cmake.in +index cd790be..e1bdd77 100644 +--- a/cmake/sfml-imgui-config.cmake.in ++++ b/cmake/sfml-imgui-config.cmake.in +@@ -2,5 +2,5 @@ + find_package(SFML CONFIG REQUIRED graphics) + find_package(imgui CONFIG REQUIRED) + find_package(OpenGL REQUIRED) +-include("${CMAKE_CURRENT_LIST_DIR}/sfml-imgui-targets.cmake") +-check_required_components("sfml-imgui") +\ No newline at end of file ++include("${CMAKE_CURRENT_LIST_DIR}/milerius-sfml-imgui-targets.cmake") ++check_required_components("milerius-sfml-imgui") +\ No newline at end of file diff --git a/externals/vcpkg/ports/milerius-sfml-imgui/cpp11.patch b/externals/vcpkg/ports/milerius-sfml-imgui/cpp11.patch new file mode 100755 index 000000000..61dd830d5 --- /dev/null +++ b/externals/vcpkg/ports/milerius-sfml-imgui/cpp11.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 27b8bd8..ac65300 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,6 +14,7 @@ find_package(OpenGL REQUIRED) + ##! Library + add_library(${PROJECT_NAME} SHARED sfml-imgui/imgui-SFML.cpp) + target_link_libraries(${PROJECT_NAME} PUBLIC imgui::imgui sfml-graphics OpenGL::GL) ++target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11) + + target_include_directories(${PROJECT_NAME} PUBLIC + $ diff --git a/externals/vcpkg/ports/milerius-sfml-imgui/portfile.cmake b/externals/vcpkg/ports/milerius-sfml-imgui/portfile.cmake new file mode 100755 index 000000000..011993885 --- /dev/null +++ b/externals/vcpkg/ports/milerius-sfml-imgui/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Milerius/imgui-sfml-shared + REF 1.1 + SHA512 191184f7b302f643bd7c241b69d9f9edc0d03c6f5a0b3a49f57ac84f3828202f8065291fb17993073a2c07f1237ba491de677c47e2f8160dc70ea77f20eb1946 + HEAD_REF master + PATCHES + FixFindPackageIssue.patch + cpp11.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/milerius-sfml-imgui) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/milerius-sfml-imgui/vcpkg.json b/externals/vcpkg/ports/milerius-sfml-imgui/vcpkg.json new file mode 100755 index 000000000..62abc101b --- /dev/null +++ b/externals/vcpkg/ports/milerius-sfml-imgui/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "milerius-sfml-imgui", + "version": "1.1", + "port-version": 4, + "description": "imgui dll for sfml usage", + "dependencies": [ + "imgui", + "sfml", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/mimalloc/fix-cmake.patch b/externals/vcpkg/ports/mimalloc/fix-cmake.patch new file mode 100755 index 000000000..dc8740a0a --- /dev/null +++ b/externals/vcpkg/ports/mimalloc/fix-cmake.patch @@ -0,0 +1,16 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -315,11 +315,11 @@ target_link_libraries(mimalloc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.lib) + add_custom_command(TARGET mimalloc POST_BUILD + COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" $ + COMMENT "Copy mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll to output directory") +- install(FILES "$/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" DESTINATION ${mi_install_libdir}) ++ install(FILES "$/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + +- install(TARGETS mimalloc EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY) ++ install(TARGETS mimalloc EXPORT mimalloc ARCHIVE DESTINATION ${mi_install_libdir} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${mi_install_libdir} NAMELINK_SKIP) + install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) + endif() + + # static library diff --git a/externals/vcpkg/ports/mimalloc/portfile.cmake b/externals/vcpkg/ports/mimalloc/portfile.cmake new file mode 100755 index 000000000..17645a6a0 --- /dev/null +++ b/externals/vcpkg/ports/mimalloc/portfile.cmake @@ -0,0 +1,56 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/mimalloc + REF v2.0.6 + SHA512 f2fc0fbfb6384e85959897f129e5d5d9acc51bda536d5cabcd7d4177dbda9fb735b8a8c239b961f8bea31d37c9ae10f66da23aa91d497f95393253d4ac792bb3 + HEAD_REF master + PATCHES + fix-cmake.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + asm MI_SEE_ASM + secure MI_SECURE + override MI_OVERRIDE +) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" MI_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" MI_BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DMI_DEBUG_FULL=ON + OPTIONS_RELEASE + -DMI_DEBUG_FULL=OFF + OPTIONS + -DMI_USE_CXX=ON + -DMI_BUILD_TESTS=OFF + -DMI_BUILD_OBJECT=OFF + ${FEATURE_OPTIONS} + -DMI_BUILD_STATIC=${MI_BUILD_STATIC} + -DMI_BUILD_SHARED=${MI_BUILD_SHARED} + -DMI_INSTALL_TOPLEVEL=ON +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +file(COPY + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" +) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mimalloc) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/mimalloc.h" + "!defined(MI_SHARED_LIB)" + "0 // !defined(MI_SHARED_LIB)" + ) +endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/mimalloc/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/mimalloc/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..4e2a70c4b --- /dev/null +++ b/externals/vcpkg/ports/mimalloc/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,9 @@ +_find_package(${ARGS}) + +if(TARGET mimalloc AND NOT TARGET mimalloc-static) + add_library(mimalloc-static INTERFACE IMPORTED) + set_target_properties(mimalloc-static PROPERTIES INTERFACE_LINK_LIBRARIES mimalloc) +elseif(TARGET mimalloc-static AND NOT TARGET mimalloc) + add_library(mimalloc INTERFACE IMPORTED) + set_target_properties(mimalloc PROPERTIES INTERFACE_LINK_LIBRARIES mimalloc-static) +endif() diff --git a/externals/vcpkg/ports/mimalloc/vcpkg.json b/externals/vcpkg/ports/mimalloc/vcpkg.json new file mode 100755 index 000000000..60508c3b5 --- /dev/null +++ b/externals/vcpkg/ports/mimalloc/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "mimalloc", + "version": "2.0.6", + "description": "Compact general purpose allocator with excellent performance", + "homepage": "https://github.com/microsoft/mimalloc", + "license": "MIT", + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "asm": { + "description": "Generate assembly files" + }, + "override": { + "description": "Override the standard malloc interface" + }, + "secure": { + "description": "Use security mitigations (like guard pages and randomization)" + } + } +} diff --git a/externals/vcpkg/ports/minc/build.patch b/externals/vcpkg/ports/minc/build.patch new file mode 100755 index 000000000..d0275c20d --- /dev/null +++ b/externals/vcpkg/ports/minc/build.patch @@ -0,0 +1,67 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 52cc81ace..d7a1f63f8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -403,9 +404,11 @@ ENDIF(LIBMINC_MINC1_SUPPORT) + # Keep this variable for compatibility + SET(VOLUME_IO_LIBRARY ${LIBMINC_EXTERNAL_LIB_PREFIX}minc2) + SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) + + ADD_LIBRARY(${LIBMINC_LIBRARY} ${LIBRARY_TYPE} ${minc_LIB_SRCS} ${minc_HEADERS} ${volume_io_LIB_SRCS} ${volume_io_HEADERS} ) +- ++if(WIN32) ++ target_link_libraries(${LIBMINC_LIBRARY} ws2_32) ++endif() + IF(NIFTI_FOUND AND NOT LIBMINC_USE_SYSTEM_NIFTI) + ADD_DEPENDENCIES(${LIBMINC_LIBRARY} NIFTI) + ENDIF() +@@ -453,7 +456,7 @@ IF( LIBMINC_INSTALL_LIB_DIR ) + ${LIBMINC_EXPORTED_TARGETS} + LIBRARY DESTINATION ${LIBMINC_INSTALL_LIB_DIR} COMPONENT libraries + ARCHIVE DESTINATION ${LIBMINC_INSTALL_LIB_DIR} COMPONENT libraries +- RUNTIME DESTINATION ${LIBMINC_INSTALL_LIB_DIR} COMPONENT libraries ++ RUNTIME DESTINATION ${LIBMINC_INSTALL_BIN_DIR} COMPONENT libraries + ) + ENDIF( LIBMINC_INSTALL_LIB_DIR ) + +@@ -538,7 +541,7 @@ IF(LIBMINC_INSTALL_LIB_DIR AND NOT LIBMINC_INSTALL_NO_DEVELOPMENT) + ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/Use${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINC.cmake + ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINCConfig.cmake + DESTINATION +- ${LIBMINC_INSTALL_LIB_DIR} ++ ${LIBMINC_INSTALL_LIB_DIR}/cmake + COMPONENT Development) + + ENDIF(LIBMINC_INSTALL_LIB_DIR AND NOT LIBMINC_INSTALL_NO_DEVELOPMENT) +diff --git a/config.h.cmake b/config.h.cmake +index 9ceffa8fc..21c2f3baf 100644 +--- a/config.h.cmake ++++ b/config.h.cmake +@@ -1,4 +1,8 @@ + /* various defines */ ++#ifdef _MSC_VER ++#define strcasecmp _stricmp ++#define strncasecmp _strnicmp ++#endif + + #ifndef MINC2 + #define MINC2 @MINC2@ +diff --git a/libcommon/minc_config.c b/libcommon/minc_config.c +index 531ef108e..5472d9274 100644 +--- a/libcommon/minc_config.c ++++ b/libcommon/minc_config.c +@@ -20,14 +20,6 @@ + + #include "minc_config.h" + +-#ifdef _MSC_VER +-#define snprintf _snprintf +-#define vsnprintf _vsnprintf +-#define strcasecmp _stricmp +-#define strncasecmp _strnicmp +-#endif +- +- + static const char *_CONFIG_VAR[]= + { + "MINC_FORCE_V2", diff --git a/externals/vcpkg/ports/minc/config.patch b/externals/vcpkg/ports/minc/config.patch new file mode 100755 index 000000000..a726b9a57 --- /dev/null +++ b/externals/vcpkg/ports/minc/config.patch @@ -0,0 +1,15 @@ +diff --git a/LIBMINCConfig.cmake.in b/LIBMINCConfig.cmake.in +index 7790597b2..c041b685a 100644 +--- a/LIBMINCConfig.cmake.in ++++ b/LIBMINCConfig.cmake.in +@@ -1,3 +1,4 @@ ++set(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_DIR}/../../") + # LIBMINC CMake configuration file + + get_filename_component(LIBMINC_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH ) +@@ -37,3 +38,4 @@ set( LIBMINC_FOUND 1 ) + # set( LIBMINC_TARGETS_IMPORTED 1 ) + # include( "${LIBMINC_CMAKE_DIR}/@LIBMINC_EXPORTED_TARGETS@.cmake" ) + #endif() ++unset(_IMPORT_PREFIX) +\ No newline at end of file diff --git a/externals/vcpkg/ports/minc/fix-dependency-hdf5.patch b/externals/vcpkg/ports/minc/fix-dependency-hdf5.patch new file mode 100755 index 000000000..40943411c --- /dev/null +++ b/externals/vcpkg/ports/minc/fix-dependency-hdf5.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a6830b4..da3d635 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,7 +65,12 @@ IF(NOT LIBMINC_EXTERNALLY_CONFIGURED) + # external packages + FIND_PACKAGE(ZLIB REQUIRED) + SET(HDF5_NO_FIND_PACKAGE_CONFIG_FILE ON) +- FIND_PACKAGE(HDF5 REQUIRED COMPONENTS C ) ++ FIND_PACKAGE(hdf5 CONFIG REQUIRED) ++ if (TARGET hdf5::hdf5-shared) ++ SET(HDF5_LIBRARIES hdf5::hdf5-shared) ++ elseif (TARGET hdf5::hdf5-static) ++ SET(HDF5_LIBRARIES hdf5::hdf5-static) ++ endif() + + IF (LIBMINC_USE_SYSTEM_NIFTI) + FIND_PACKAGE(NIFTI) +@@ -515,12 +520,8 @@ IF(SUPERBUILD_STAGING_PREFIX) + STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" LIBMINC_LIBRARIES_CONFIG "${LIBMINC_LIBRARIES_CONFIG}") + STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" EZMINC_LIBRARIES "${EZMINC_LIBRARIES}") + STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" NETCDF_INCLUDE_DIR "${NETCDF_INCLUDE_DIR}") +- STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIR}") +- STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" HDF5_INCLUDE_DIRS "${HDF5_INCLUDE_DIRS}") + STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" NIFTI_INCLUDE_DIR "${NIFTI_INCLUDE_DIR}") + STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" NETCDF_LIBRARY "${NETCDF_LIBRARY}") +- STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" HDF5_LIBRARY "${HDF5_LIBRARY}") +- STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" HDF5_LIBRARIES "${HDF5_LIBRARIES}") + STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" NIFTI_LIBRARY "${NIFTI_LIBRARY}") + STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" ZNZ_LIBRARY "${ZNZ_LIBRARY}") + STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" ZLIB_LIBRARY "${ZLIB_LIBRARY}") diff --git a/externals/vcpkg/ports/minc/portfile.cmake b/externals/vcpkg/ports/minc/portfile.cmake new file mode 100755 index 000000000..6fbec9627 --- /dev/null +++ b/externals/vcpkg/ports/minc/portfile.cmake @@ -0,0 +1,49 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO BIC-MNI/libminc + REF e75a936c12a305b596d743c26a5437196ebce2a4 + SHA512 744f879ac8f0594c310d1c1b7fe67543c5feeb3e5a0979035918dbb2bf1d0973fbd389e5357a75631e618cc614b648c21179f7467576bd68e3522e63f21451b0 + HEAD_REF master + PATCHES + build.patch + config.patch + fix-dependency-hdf5.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + "minc1" LIBMINC_MINC1_SUPPORT +) + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) # Symbols are not properly exported +endif() + +set(OPTIONS) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + list(APPEND OPTIONS "-DLIBMINC_BUILD_SHARED_LIBS=ON") +else() + list(APPEND OPTIONS "-DLIBMINC_BUILD_SHARED_LIBS=OFF") +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE + OPTIONS + "-DBUILD_TESTING=OFF" + "-DLIBMINC_USE_SYSTEM_NIFTI=ON" + ${OPTIONS} + ${FEATURE_OPTIONS} +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share/libminc) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/minc/vcpkg.json b/externals/vcpkg/ports/minc/vcpkg.json new file mode 100755 index 000000000..0fd609d67 --- /dev/null +++ b/externals/vcpkg/ports/minc/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "minc", + "version-string": "2.4.03", + "port-version": 2, + "description": "MINC - Medical Image NetCDF or MINC isn't netCDF", + "homepage": "https://github.com/BIC-MNI/libminc", + "dependencies": [ + { + "name": "hdf5", + "default-features": false + }, + "nifticlib", + "zlib" + ], + "features": { + "minc1": { + "description": "Support minc1 file format, requires NETCDF", + "dependencies": [ + { + "name": "netcdf", + "default-features": false + } + ] + } + } +} diff --git a/externals/vcpkg/ports/minhook/fix-usage.patch b/externals/vcpkg/ports/minhook/fix-usage.patch new file mode 100755 index 000000000..198b8795d --- /dev/null +++ b/externals/vcpkg/ports/minhook/fix-usage.patch @@ -0,0 +1,10 @@ +diff --git a/cmake/minhook-config.cmake.in b/cmake/minhook-config.cmake.in +index 14e6463..28fa17c 100644 +--- a/cmake/minhook-config.cmake.in ++++ b/cmake/minhook-config.cmake.in +@@ -36,4 +36,4 @@ set(MINHOOK_FOUND ON) + set_and_check(MINHOOK_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include/") + set_and_check(MINHOOK_LIBRARY_DIRS "${PACKAGE_PREFIX_DIR}/lib") + +-include("${PACKAGE_PREFIX_DIR}/lib/minhook/minhook-targets.cmake") ++include("${CMAKE_CURRENT_LIST_DIR}/minhook-targets.cmake") diff --git a/externals/vcpkg/ports/minhook/portfile.cmake b/externals/vcpkg/ports/minhook/portfile.cmake new file mode 100755 index 000000000..8c95a4dcd --- /dev/null +++ b/externals/vcpkg/ports/minhook/portfile.cmake @@ -0,0 +1,40 @@ +if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") + set(BUILD_ARCH "Win32") + set(OUTPUT_DIR "Win32") +elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "x64") + set(BUILD_ARCH "x64") + set(OUTPUT_DIR "Win64") +else() + message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") +endif() + +# Download files to enable CMake support for minhook - Adds CMakeLists.txt and minhook-config.cmake.in +vcpkg_download_distfile( + CMAKE_SUPPORT_PATCH + URLS https://github.com/TsudaKageyu/minhook/commit/3f2e34976c1685ee372a09f54c0c8c8f4240ef90.patch + FILENAME minhook-cmake-support.patch + SHA512 5f353b167e2c31e5e06258420c78fbae0095368cf687ff06a350d6b69b30476824785dde5dbcea3e30ff827e7cdb293727a73e6b1e6875f00aa891b2980c3877 +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO TsudaKageyu/minhook + REF v1.3.3 + SHA512 9f10c92a926a06cde1e4092b664a3aab00477e8b9f20cee54e1d2b3747fad91043d199a2753f7e083497816bbefc5d75d9162d2098dd044420dbca555e80b060 + HEAD_REF master + PATCHES + "${CMAKE_SUPPORT_PATCH}" + fix-usage.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/minhook) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/minhook/vcpkg.json b/externals/vcpkg/ports/minhook/vcpkg.json new file mode 100755 index 000000000..e2a0b7b77 --- /dev/null +++ b/externals/vcpkg/ports/minhook/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "minhook", + "version": "1.3.3", + "port-version": 3, + "description": "The Minimalistic x86/x64 API Hooking Library for Windows.", + "supports": "windows & !uwp & !arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/minifb/fix-arm-build-error.patch b/externals/vcpkg/ports/minifb/fix-arm-build-error.patch new file mode 100755 index 000000000..66579d449 --- /dev/null +++ b/externals/vcpkg/ports/minifb/fix-arm-build-error.patch @@ -0,0 +1,40 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 06ba472..0f5874c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -54,6 +54,27 @@ add_library(minifb STATIC + ${SrcLib} + ) + ++if (WIN32) ++add_executable(noise ++ tests/noise.c ++) ++target_link_libraries(noise minifb Gdi32.lib) ++ ++add_executable(input_events ++ tests/input_events.c ++) ++target_link_libraries(input_events minifb Gdi32.lib) ++ ++add_executable(input_events_cpp ++ tests/input_events_cpp.cpp ++) ++target_link_libraries(input_events_cpp minifb Gdi32.lib) ++ ++add_executable(multiple_windows ++ tests/multiple_windows.c ++) ++target_link_libraries(multiple_windows minifb Gdi32.lib) ++else() + add_executable(noise + tests/noise.c + ) +@@ -73,6 +94,7 @@ add_executable(multiple_windows + tests/multiple_windows.c + ) + target_link_libraries(multiple_windows minifb) ++endif() + + if (MSVC) + elseif (MINGW) diff --git a/externals/vcpkg/ports/minifb/fix-build-error.patch b/externals/vcpkg/ports/minifb/fix-build-error.patch new file mode 100755 index 000000000..e1a4c0775 --- /dev/null +++ b/externals/vcpkg/ports/minifb/fix-build-error.patch @@ -0,0 +1,25 @@ +diff --git a/src/windows/WinMiniFB.c b/src/windows/WinMiniFB.c +index 84ed0cb..b33f252 100644 +--- a/src/windows/WinMiniFB.c ++++ b/src/windows/WinMiniFB.c +@@ -19,7 +19,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) + { + LRESULT res = 0; + +- SWindowData *window_data = (SWindowData *) GetWindowLongPtr(hWnd, GWL_USERDATA); ++ SWindowData *window_data = (SWindowData *) GetWindowLongPtr(hWnd, GWLP_USERDATA); + SWindowData_Win *window_data_win = 0x0; + if(window_data != 0x0) { + window_data_win = (SWindowData_Win *) window_data->specific; +diff --git a/tests/multiple_windows.c b/tests/multiple_windows.c +index 4b301c0..29276be 100644 +--- a/tests/multiple_windows.c ++++ b/tests/multiple_windows.c +@@ -1,6 +1,7 @@ + #include + #include + #include ++#define _USE_MATH_DEFINES + #include + + #define kUnused(var) (void) var; diff --git a/externals/vcpkg/ports/minifb/fix-install-error.patch b/externals/vcpkg/ports/minifb/fix-install-error.patch new file mode 100755 index 000000000..64f5af046 --- /dev/null +++ b/externals/vcpkg/ports/minifb/fix-install-error.patch @@ -0,0 +1,54 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 06ba472..6dc7988 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,6 +17,12 @@ file(GLOB SrcMacOSX "src/macosx/*.c" + file(GLOB SrcWayland "src/wayland/*.c") + file(GLOB SrcX11 "src/x11/*.c") + ++file(GLOB HEADERS "include/*.h") ++file(GLOB HeaderWindows "src/windows/*.h") ++file(GLOB HeaderMacOSX "src/macosx/*.h") ++file(GLOB HeaderWayland "src/wayland/*.h") ++file(GLOB HeaderX11 "src/x11/*.h") ++ + if (NOT MSVC) + set (CMAKE_C_FLAGS "-g -Wall -Wextra -pedantic -Wno-switch -Wno-unused-function") + set (CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -std=c++11") +@@ -34,19 +40,24 @@ if (MSVC) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) + add_definitions(-D_WIN32_WINNT=0x0600) + list (APPEND SrcLib ${SrcWindows}) ++ list (APPEND HEADERS ${HeaderWindows}) + elseif (MINGW) + add_definitions(-D_WIN32_WINNT=0x0600) + list(APPEND SrcLib ${SrcWindows}) ++ list (APPEND HEADERS ${HeaderWindows}) + elseif (APPLE) + if(USE_METAL_API) + add_definitions(-DUSE_METAL_API) + endif() + list(APPEND SrcLib ${SrcMacOSX}) ++ list (APPEND HEADERS ${HeaderMacOSX}) + elseif (UNIX) + if(USE_WAYLAND_API) + list(APPEND SrcLib ${SrcWayland}) ++ list (APPEND HEADERS ${HeaderWayland}) + else() + list(APPEND SrcLib ${SrcX11}) ++ list (APPEND HEADERS ${HeaderX11}) + endif() + endif() + +@@ -112,3 +123,11 @@ elseif (UNIX) + target_link_libraries(multiple_windows -lX11) + endif() + endif() ++ ++install(TARGETS minifb ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++ ) ++ ++install(FILES ${HEADERS} DESTINATION include) diff --git a/externals/vcpkg/ports/minifb/portfile.cmake b/externals/vcpkg/ports/minifb/portfile.cmake new file mode 100755 index 000000000..26b813889 --- /dev/null +++ b/externals/vcpkg/ports/minifb/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "${PORT} currently doesn't supports UWP.") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO emoon/minifb + REF 25a440f8226f12b8014d24288ad0587724005afc + SHA512 e54d86e43193d22263003a9539b11cc61cfd4a1b7093c982165cdd6e6f150b431a44e7d4dc8512b62b9853a7605e29cee19f85b8d25a34b3b530f9aa41a2f4a9 + HEAD_REF master + PATCHES + fix-install-error.patch + fix-build-error.patch + fix-arm-build-error.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/minifb/vcpkg.json b/externals/vcpkg/ports/minifb/vcpkg.json new file mode 100755 index 000000000..760b9d2aa --- /dev/null +++ b/externals/vcpkg/ports/minifb/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "minifb", + "version-string": "2019-08-20", + "port-version": 2, + "description": "MiniFB (Mini FrameBuffer) is a small cross platform library that makes it easy to render (32-bit) pixels in a window.", + "homepage": "https://github.com/emoon/minifb", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/minimp3/portfile.cmake b/externals/vcpkg/ports/minimp3/portfile.cmake new file mode 100755 index 000000000..dc795aadb --- /dev/null +++ b/externals/vcpkg/ports/minimp3/portfile.cmake @@ -0,0 +1,13 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lieff/minimp3 + REF afb604c06bc8beb145fecd42c0ceb5bda8795144 # committed on 2021-11-30 + SHA512 633da0b20982f6f22c87d872c69626b2939ffb4519339cd0c090d7538308007cf633c07af57020cd2332a75c6e7b9bf3ebd5bda1af59dc96a4f0e85ce1b3f751 + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/minimp3.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(COPY "${SOURCE_PATH}/minimp3_ex.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/minimp3/vcpkg.json b/externals/vcpkg/ports/minimp3/vcpkg.json new file mode 100755 index 000000000..e21253915 --- /dev/null +++ b/externals/vcpkg/ports/minimp3/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "minimp3", + "version-date": "2021-11-30", + "description": "Minimalistic, single-header library for decoding MP3. minimp3 is designed to be small, fast (with SSE and NEON support), and accurate (ISO conformant).", + "homepage": "https://github.com/lieff/minimp3", + "license": "CC0-1.0" +} diff --git a/externals/vcpkg/ports/minio-cpp/fix_cmake_file.patch b/externals/vcpkg/ports/minio-cpp/fix_cmake_file.patch new file mode 100755 index 000000000..f4f6d95b4 --- /dev/null +++ b/externals/vcpkg/ports/minio-cpp/fix_cmake_file.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6df202c..98eeeb0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -114,6 +114,6 @@ else (DOXYGEN_FOUND) + message("Doxygen need to be installed to generate the doxygen documentation") + endif (DOXYGEN_FOUND) + + configure_file(miniocpp.pc.in miniocpp.pc @ONLY) +-install(FILES ${CMAKE_BINARY_DIR}/miniocpp.pc DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig) ++install(FILES ${CMAKE_BINARY_DIR}/miniocpp.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + diff --git a/externals/vcpkg/ports/minio-cpp/portfile.cmake b/externals/vcpkg/ports/minio-cpp/portfile.cmake new file mode 100755 index 000000000..1fe139457 --- /dev/null +++ b/externals/vcpkg/ports/minio-cpp/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO minio/minio-cpp + REF 0847e56f31e13d32c924029d5ffaa865f8396462 + SHA512 47817c8acc92060afca5ebd7c9bc7c9a9e09a50046180d7d3d67993f207d295c90e491417702ebb1ab2b0a6e85a5fcc334054ce4f6d542cb42c3675b5aed1c3f + HEAD_REF main + PATCHES + fix_cmake_file.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/minio-cpp/vcpkg.json b/externals/vcpkg/ports/minio-cpp/vcpkg.json new file mode 100755 index 000000000..ce2726824 --- /dev/null +++ b/externals/vcpkg/ports/minio-cpp/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "minio-cpp", + "version-date": "2022-01-03", + "description": "MinIO C++ Client SDK for Amazon S3 Compatible Cloud Storage", + "supports": "!uwp", + "dependencies": [ + "curlpp", + "openssl", + "pugixml", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/minisat-master-keying/portfile.cmake b/externals/vcpkg/ports/minisat-master-keying/portfile.cmake new file mode 100755 index 000000000..3b487e3c0 --- /dev/null +++ b/externals/vcpkg/ports/minisat-master-keying/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO master-keying/minisat + REF v2.3.6 + SHA512 48E7AC1C97EA58070EAB9310F977404295E881B1403D527A33E059A0BB5A16CAA9AF2FA9E5230AD7E53E008B83077E300B3BAEEB0C220BE4E52B6B85887A05E1 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME MiniSat CONFIG_PATH lib/cmake/MiniSat) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/minisat-master-keying/vcpkg.json b/externals/vcpkg/ports/minisat-master-keying/vcpkg.json new file mode 100755 index 000000000..c2a89562e --- /dev/null +++ b/externals/vcpkg/ports/minisat-master-keying/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "minisat-master-keying", + "version": "2.3.6", + "description": [ + "A minimalistic high-performance SAT solver", + "This is a modernized, cross-platform, CMake-enabled fork of the original MiniSat." + ], + "homepage": "https://github.com/master-keying/minisat", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/minitrace/CMakeLists.txt b/externals/vcpkg/ports/minitrace/CMakeLists.txt new file mode 100755 index 000000000..fcae7841e --- /dev/null +++ b/externals/vcpkg/ports/minitrace/CMakeLists.txt @@ -0,0 +1,32 @@ +cmake_minimum_required(VERSION 3.8) +project(minitrace C) + +set(minitrace_HEADERS minitrace.h) +set(minitrace_SOURCES minitrace.c) + +add_library(minitrace ${minitrace_SOURCES}) + +# Install headers +install(FILES ${minitrace_HEADERS} DESTINATION include/minitrace) + +# Install minitrace +install( + TARGETS minitrace EXPORT minitraceConfig + RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib + ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib +) + +# Export config file for minitrace +export( + TARGETS minitrace + NAMESPACE minitrace:: + FILE "${CMAKE_CURRENT_BINARY_DIR}/minitrace-config.cmake" +) + +# Install config file +install( + EXPORT minitraceConfig + DESTINATION "${CMAKE_INSTALL_PREFIX}/share/minitrace" + NAMESPACE minitrace:: +) diff --git a/externals/vcpkg/ports/minitrace/portfile.cmake b/externals/vcpkg/ports/minitrace/portfile.cmake new file mode 100755 index 000000000..06b43396e --- /dev/null +++ b/externals/vcpkg/ports/minitrace/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO hrydgard/minitrace + REF a48215c409dd848fa0a76c5eb4dfaba4ca3bca39 + SHA512 591fa52132b6bbe8e7e121526a43d07056deff8fe026227c1a4c26bebf95536e5d68750fa8551d23afebf048fe8b8503017b9a93650e18a992cf2e5678d46135 + HEAD_REF master +) + +file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/minitrace" RENAME copyright) diff --git a/externals/vcpkg/ports/minitrace/vcpkg.json b/externals/vcpkg/ports/minitrace/vcpkg.json new file mode 100755 index 000000000..cb27c98a2 --- /dev/null +++ b/externals/vcpkg/ports/minitrace/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "minitrace", + "version-string": "2019.02.06", + "port-version": 2, + "description": "Simple C/C++ library for producing JSON traces suitable for Chrome's built-in trace viewer.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/miniupnpc/cmakelists.diff b/externals/vcpkg/ports/miniupnpc/cmakelists.diff new file mode 100755 index 000000000..4df7ef74d --- /dev/null +++ b/externals/vcpkg/ports/miniupnpc/cmakelists.diff @@ -0,0 +1,11 @@ +--- a/miniupnpc/CMakeLists.txt 2018-05-07 13:12:58.000000000 +0200 ++++ b/miniupnpc/CMakeLists.txt 2018-11-13 11:51:57.897598000 +0100 +@@ -124,7 +124,7 @@ + target_link_libraries (libminiupnpc-shared PRIVATE miniupnpc-private) + target_compile_definitions(libminiupnpc-shared PRIVATE MINIUPNP_EXPORTS) + +- target_include_directories(libminiupnpc-static INTERFACE ../${CMAKE_CURRENT_SOURCE_DIR}) ++ target_include_directories(libminiupnpc-shared INTERFACE ../${CMAKE_CURRENT_SOURCE_DIR}) + if (WIN32) + target_link_libraries(libminiupnpc-shared INTERFACE ws2_32 iphlpapi) + endif() diff --git a/externals/vcpkg/ports/miniupnpc/portfile.cmake b/externals/vcpkg/ports/miniupnpc/portfile.cmake new file mode 100755 index 000000000..b8c3ab7b9 --- /dev/null +++ b/externals/vcpkg/ports/miniupnpc/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO miniupnp/miniupnp + REF miniupnpc_2_1 + SHA512 f2ab5116c094982f7838ccab460d3db07a99de1094448277fc45841e0e64ea1b4216d75a7e5dd471c79ff9b0132b89e4d801c3ad1b60d55631c12c916df658f5 + HEAD_REF master + PATCHES + cmakelists.diff +) + +string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "dynamic" MINIUPNPC_BUILD_SHARED) +string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" MINIUPNPC_BUILD_STATIC) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/miniupnpc + PREFER_NINJA # Disable this option if project cannot be built with Ninja + OPTIONS + -DUPNPC_BUILD_STATIC=${MINIUPNPC_BUILD_STATIC} + -DUPNPC_BUILD_SHARED=${MINIUPNPC_BUILD_SHARED} + -DUPNPC_BUILD_TESTS=OFF + -DUPNPC_BUILD_SAMPLE=OFF +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/miniupnpc RENAME copyright) diff --git a/externals/vcpkg/ports/miniupnpc/vcpkg.json b/externals/vcpkg/ports/miniupnpc/vcpkg.json new file mode 100755 index 000000000..8621794bd --- /dev/null +++ b/externals/vcpkg/ports/miniupnpc/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "miniupnpc", + "version-string": "2.1", + "port-version": 2, + "description": "UPnP client library/tool to access Internet Gateway Devices" +} diff --git a/externals/vcpkg/ports/miniz/fix-pkgconfig-location.patch b/externals/vcpkg/ports/miniz/fix-pkgconfig-location.patch new file mode 100755 index 000000000..7bc5999b7 --- /dev/null +++ b/externals/vcpkg/ports/miniz/fix-pkgconfig-location.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f12435b..edee1f4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -163,7 +163,7 @@ if(NOT BUILD_HEADER_ONLY) + if(INSTALL_PROJECT) + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/miniz.pc +- DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif() + endif() + diff --git a/externals/vcpkg/ports/miniz/portfile.cmake b/externals/vcpkg/ports/miniz/portfile.cmake new file mode 100755 index 000000000..acf5a7e99 --- /dev/null +++ b/externals/vcpkg/ports/miniz/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO richgel999/miniz + REF 2.2.0 + SHA512 0bb2b0ac627715b90ff9fd69ca8958a0bea387bd7ddf5c200daba953b98ef788092e3009842f4f123234e85570159250c8897a30c1c1f2d4dea9bca9837f6111 + HEAD_REF master + PATCHES + fix-pkgconfig-location.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF + -DINSTALL_PROJECT=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs(BUILD_PATHS "${CURRENT_PACKAGES_DIR}/bin/*.dll") + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/miniz) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/miniz/vcpkg.json b/externals/vcpkg/ports/miniz/vcpkg.json new file mode 100755 index 000000000..cb24f9b7f --- /dev/null +++ b/externals/vcpkg/ports/miniz/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "miniz", + "version": "2.2.0", + "port-version": 1, + "description": "Single C source file zlib-replacement library", + "homepage": "https://github.com/richgel999/miniz", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/minizip-ng/Modify-header-file-path.patch b/externals/vcpkg/ports/minizip-ng/Modify-header-file-path.patch new file mode 100755 index 000000000..ac1c6fee8 --- /dev/null +++ b/externals/vcpkg/ports/minizip-ng/Modify-header-file-path.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9ef8023..ec1ee55 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -81,7 +81,7 @@ include(FeatureSummary) + + set(INSTALL_BIN_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Installation directory for executables") + set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries") +-set(INSTALL_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Installation directory for headers") ++set(INSTALL_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR}/minizip-ng CACHE PATH "Installation directory for headers") + set(INSTALL_MAN_DIR ${CMAKE_INSTALL_MANDIR} CACHE PATH "Installation directory for manual pages") + + set(STDLIB_DEF) diff --git a/externals/vcpkg/ports/minizip-ng/portfile.cmake b/externals/vcpkg/ports/minizip-ng/portfile.cmake new file mode 100755 index 000000000..8dac2781f --- /dev/null +++ b/externals/vcpkg/ports/minizip-ng/portfile.cmake @@ -0,0 +1,46 @@ +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO zlib-ng/minizip-ng + REF 3.0.5 + SHA512 da0c230951caafd986331300b840d09a4c27a677183174f8b1782c2515209b51cf00133dd5fc5f9fc88a349134db7f93d3daa7c05b7d0270be99b9cf85a6c133 + HEAD_REF master + PATCHES + Modify-header-file-path.patch +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + pkcrypt MZ_PKCRYPT + signing MZ_SIGNING + wzaes MZ_WZAES + openssl MZ_OPENSSL + bzip2 MZ_BZIP2 + lzma MZ_LZMA + zlib MZ_ZLIB + zstd MZ_ZSTD +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + ${FEATURE_OPTIONS} + -DMZ_FETCH_LIBS=OFF + -DMZ_PROJECT_SUFFIX:STRING=-ng +) + +vcpkg_cmake_install() + +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/minizip-ng/vcpkg.json b/externals/vcpkg/ports/minizip-ng/vcpkg.json new file mode 100755 index 000000000..a8e680134 --- /dev/null +++ b/externals/vcpkg/ports/minizip-ng/vcpkg.json @@ -0,0 +1,87 @@ +{ + "name": "minizip-ng", + "version": "3.0.5", + "description": "minizip-ng is a zip manipulation library written in C that is supported on Windows, macOS, and Linux.", + "homepage": "https://github.com/zlib-ng/minizip-ng", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "bzip2", + "lzma", + "pkcrypt", + "signing", + "wzaes", + "zlib", + "zstd" + ], + "features": { + "bzip2": { + "description": "Enables BZIP2 compression", + "dependencies": [ + "bzip2" + ] + }, + "lzma": { + "description": "Enables LZMA compression", + "dependencies": [ + "liblzma" + ] + }, + "openssl": { + "description": "Enables OpenSSL for encryption", + "dependencies": [ + "openssl" + ] + }, + "pkcrypt": { + "description": "Enables PKWARE traditional encryption" + }, + "signing": { + "description": "Enables zip signing support", + "dependencies": [ + { + "name": "minizip-ng", + "default-features": false, + "features": [ + "openssl" + ], + "platform": "!windows & !osx" + } + ] + }, + "wzaes": { + "description": "Enables WinZIP AES encryption", + "dependencies": [ + { + "name": "minizip-ng", + "default-features": false, + "features": [ + "openssl" + ], + "platform": "!windows & !osx" + } + ] + }, + "zlib": { + "description": "Enables ZLIB compression", + "dependencies": [ + "zlib" + ] + }, + "zstd": { + "description": "Enables ZSTD compression", + "dependencies": [ + "zstd" + ] + } + } +} diff --git a/externals/vcpkg/ports/minizip/0001-remove-ifndef-NOUNCRYPT.patch b/externals/vcpkg/ports/minizip/0001-remove-ifndef-NOUNCRYPT.patch new file mode 100755 index 000000000..d9c051d28 --- /dev/null +++ b/externals/vcpkg/ports/minizip/0001-remove-ifndef-NOUNCRYPT.patch @@ -0,0 +1,29 @@ +From a6fd3992d44053a523a67aa16f5ae88fecfb20e1 Mon Sep 17 00:00:00 2001 +From: Nicole Mazzuca +Date: Tue, 22 Sep 2020 14:09:53 -0700 +Subject: [PATCH 1/2] remove `#ifndef NOUNCRYPT` + +enable decrypt support for password-encrypted ZIP files + +--- + contrib/minizip/unzip.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c +index bcfb941..1895a0f 100644 +--- a/contrib/minizip/unzip.c ++++ b/contrib/minizip/unzip.c +@@ -68,10 +68,6 @@ + #include + #include + +-#ifndef NOUNCRYPT +- #define NOUNCRYPT +-#endif +- + #include "zlib.h" + #include "unzip.h" + +-- +2.24.3 (Apple Git-128) + diff --git a/externals/vcpkg/ports/minizip/0002-add-declaration-for-mkdir.patch b/externals/vcpkg/ports/minizip/0002-add-declaration-for-mkdir.patch new file mode 100755 index 000000000..8786a840b --- /dev/null +++ b/externals/vcpkg/ports/minizip/0002-add-declaration-for-mkdir.patch @@ -0,0 +1,29 @@ +From 6c38b6f544b55f9fc554f0fe22e2cbaddfaed7f8 Mon Sep 17 00:00:00 2001 +From: Nicole Mazzuca +Date: Tue, 22 Sep 2020 14:15:04 -0700 +Subject: [PATCH 2/2] add declaration for mkdir + +It's invalid in C99 to implicitly declare mkdir + +--- + contrib/minizip/miniunz.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/contrib/minizip/miniunz.c b/contrib/minizip/miniunz.c +index 3d65401..5341af2 100644 +--- a/contrib/minizip/miniunz.c ++++ b/contrib/minizip/miniunz.c +@@ -12,6 +12,10 @@ + Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) + */ + ++#if !defined(_WIN32) ++#include ++#endif ++ + #if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) + #ifndef __USE_FILE_OFFSET64 + #define __USE_FILE_OFFSET64 +-- +2.24.3 (Apple Git-128) + diff --git a/externals/vcpkg/ports/minizip/0003-no-io64.patch b/externals/vcpkg/ports/minizip/0003-no-io64.patch new file mode 100755 index 000000000..6e72e3c91 --- /dev/null +++ b/externals/vcpkg/ports/minizip/0003-no-io64.patch @@ -0,0 +1,49 @@ +diff --git a/contrib/minizip/ioapi.c b/contrib/minizip/ioapi.c +index 7f5c191..d42e050 100644 +--- a/contrib/minizip/ioapi.c ++++ b/contrib/minizip/ioapi.c +@@ -17,8 +17,8 @@ + #if defined(__APPLE__) || defined(IOAPI_NO_64) + // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions + #define FOPEN_FUNC(filename, mode) fopen(filename, mode) +-#define FTELLO_FUNC(stream) ftello(stream) +-#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin) ++#define FTELLO_FUNC(stream) ftell(stream) ++#define FSEEKO_FUNC(stream, offset, origin) fseek(stream, offset, origin) + #else + #define FOPEN_FUNC(filename, mode) fopen64(filename, mode) + #define FTELLO_FUNC(stream) ftello64(stream) +diff --git a/contrib/minizip/miniunz.c b/contrib/minizip/miniunz.c +index 3d65401..a1269ea 100644 +--- a/contrib/minizip/miniunz.c ++++ b/contrib/minizip/miniunz.c +@@ -33,9 +33,9 @@ + #define FTELLO_FUNC(stream) ftello(stream) + #define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin) + #else +-#define FOPEN_FUNC(filename, mode) fopen64(filename, mode) +-#define FTELLO_FUNC(stream) ftello64(stream) +-#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin) ++#define FOPEN_FUNC(filename, mode) fopen(filename, mode) ++#define FTELLO_FUNC(stream) ftell(stream) ++#define FSEEKO_FUNC(stream, offset, origin) fseek(stream, offset, origin) + #endif + + +diff --git a/contrib/minizip/minizip.c b/contrib/minizip/minizip.c +index 4288962..02267fb 100644 +--- a/contrib/minizip/minizip.c ++++ b/contrib/minizip/minizip.c +@@ -34,9 +34,9 @@ + #define FTELLO_FUNC(stream) ftello(stream) + #define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin) + #else +-#define FOPEN_FUNC(filename, mode) fopen64(filename, mode) +-#define FTELLO_FUNC(stream) ftello64(stream) +-#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin) ++#define FOPEN_FUNC(filename, mode) fopen(filename, mode) ++#define FTELLO_FUNC(stream) ftell(stream) ++#define FSEEKO_FUNC(stream, offset, origin) fseek(stream, offset, origin) + #endif + + diff --git a/externals/vcpkg/ports/minizip/CMakeLists.txt b/externals/vcpkg/ports/minizip/CMakeLists.txt new file mode 100755 index 000000000..c17ab8974 --- /dev/null +++ b/externals/vcpkg/ports/minizip/CMakeLists.txt @@ -0,0 +1,109 @@ +cmake_minimum_required(VERSION 3.8) +project(minizip C) + +set(PROJECT_VERSION 1.2.11) +set(PROJECT_VERSION_MAJOR 1) +set(PROJECT_VERSION_MINOR 2) +set(PROJECT_VERSION_PATCH 11) + +if(MSVC) + add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS) +endif() + +find_package(ZLIB REQUIRED) +set(MIN_SRC contrib/minizip) + +include_directories(${MIN_SRC} ${ZLIB_INCLUDE_DIRS}) + +set(MINIZIP_LIBRARIES ZLIB::ZLIB) +if(ENABLE_BZIP2) + message(STATUS "Building with bzip2 support") + find_package(BZip2) + + include_directories(${BZIP2_INCLUDE_DIR}) + set(MINIZIP_LIBRARIES ${MINIZIP_LIBRARIES} ${BZIP2_LIBRARIES}) +else() + message(STATUS "Building without bzip2 support") +endif() + +set(SRC + ${MIN_SRC}/ioapi.c + ${MIN_SRC}/unzip.c + ${MIN_SRC}/zip.c + ${MIN_SRC}/mztools.c +) +if(WIN32) + list(APPEND SRC ${MIN_SRC}/iowin32.c) +endif() + +set(HEADERS + ${MIN_SRC}/crypt.h + ${MIN_SRC}/ioapi.h + ${MIN_SRC}/unzip.h + ${MIN_SRC}/zip.h + ${MIN_SRC}/mztools.h +) +if(WIN32) + list(APPEND HEADERS ${MIN_SRC}/iowin32.h) +endif() + +add_library(minizip ${SRC}) + +target_link_libraries(minizip PRIVATE ZLIB::ZLIB) +target_compile_definitions(minizip PRIVATE -D_ZLIB_H) + +if(ENABLE_BZIP2) + target_link_libraries(minizip PUBLIC ${BZIP2_LIBRARIES}) + target_compile_definitions(minizip PRIVATE -DHAVE_BZIP2=1) +endif() +if(ANDROID) + target_compile_definitions(minizip PRIVATE IOAPI_NO_64) +endif() +if(NOT DISABLE_INSTALL_TOOLS) + add_executable(minizip_bin ${MIN_SRC}/minizip.c) + add_executable(miniunz_bin ${MIN_SRC}/miniunz.c) + + target_link_libraries(minizip_bin minizip ${MINIZIP_LIBRARIES}) + target_link_libraries(miniunz_bin minizip ${MINIZIP_LIBRARIES}) + + set_target_properties(minizip_bin PROPERTIES OUTPUT_NAME minizip) + set_target_properties(miniunz_bin PROPERTIES OUTPUT_NAME miniunz) +endif() + +install( + TARGETS minizip + EXPORT minizipTargets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +include(CMakePackageConfigHelpers) +write_basic_package_version_file("${PROJECT_BINARY_DIR}/minizipConfigVersion.cmake" + COMPATIBILITY SameMajorVersion) + +configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/minizipConfig.cmake.in + minizipConfig.cmake + INSTALL_DESTINATION share/minizip) + +install(FILES + "${PROJECT_BINARY_DIR}/minizipConfig.cmake" + "${PROJECT_BINARY_DIR}/minizipConfigVersion.cmake" + DESTINATION share/minizip +) + +install(EXPORT minizipTargets + NAMESPACE minizip:: + DESTINATION share/minizip +) + +if(NOT DISABLE_INSTALL_TOOLS) + install ( + TARGETS minizip_bin miniunz_bin + RUNTIME DESTINATION tools/minizip + ) +endif() + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES ${HEADERS} DESTINATION include/minizip) +endif() diff --git a/externals/vcpkg/ports/minizip/minizipConfig.cmake.in b/externals/vcpkg/ports/minizip/minizipConfig.cmake.in new file mode 100755 index 000000000..17fc694e7 --- /dev/null +++ b/externals/vcpkg/ports/minizip/minizipConfig.cmake.in @@ -0,0 +1,12 @@ +#@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) + +find_dependency(ZLIB) + +if (@ENABLE_BZIP2@) + find_dependency(BZip2) +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") +check_required_components("@PROJECT_NAME@") \ No newline at end of file diff --git a/externals/vcpkg/ports/minizip/portfile.cmake b/externals/vcpkg/ports/minizip/portfile.cmake new file mode 100755 index 000000000..5e5a56e38 --- /dev/null +++ b/externals/vcpkg/ports/minizip/portfile.cmake @@ -0,0 +1,46 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO madler/zlib + REF v1.2.11 + SHA512 104c62ed1228b5f1199bc037081861576900eb0697a226cafa62a35c4c890b5cb46622e399f9aad82ee5dfb475bae26ae75e2bd6da3d261361b1c8b996970faf + HEAD_REF master + PATCHES + 0001-remove-ifndef-NOUNCRYPT.patch + 0002-add-declaration-for-mkdir.patch + 0003-no-io64.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + bzip2 ENABLE_BZIP2 +) + +configure_file(${CMAKE_CURRENT_LIST_DIR}/minizipConfig.cmake.in ${SOURCE_PATH}/cmake/minizipConfig.cmake.in COPYONLY) +configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + ${FEATURE_OPTIONS} + -DDISABLE_INSTALL_TOOLS=${VCPKG_TARGET_IS_IOS} + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/minizip) + +if ("bzip2" IN_LIST FEATURES) + file(GLOB HEADERS "${CURRENT_PACKAGES_DIR}/include/minizip/*.h") + foreach(HEADER ${HEADERS}) + file(READ "${HEADER}" _contents) + string(REPLACE "#ifdef HAVE_BZIP2" "#if 1" _contents "${_contents}") + file(WRITE "${HEADER}" "${_contents}") + endforeach() +endif() + +file(INSTALL ${SOURCE_PATH}/contrib/minizip/MiniZip64_info.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/minizip/vcpkg.json b/externals/vcpkg/ports/minizip/vcpkg.json new file mode 100755 index 000000000..c8bc8dbb6 --- /dev/null +++ b/externals/vcpkg/ports/minizip/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "minizip", + "version-semver": "1.2.11", + "port-version": 10, + "description": "Zip compression library", + "homepage": "https://github.com/madler/zlib", + "supports": "!uwp", + "dependencies": [ + "zlib" + ], + "features": { + "bzip2": { + "description": "Support compression using bzip2 library", + "dependencies": [ + "bzip2" + ] + } + } +} diff --git a/externals/vcpkg/ports/mio/portfile.cmake b/externals/vcpkg/ports/mio/portfile.cmake new file mode 100755 index 000000000..4ec8b8963 --- /dev/null +++ b/externals/vcpkg/ports/mio/portfile.cmake @@ -0,0 +1,24 @@ +# header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mandreyel/mio + REF cafa31360fee8866be89b4c602d8b9a7a18dbf5e + SHA512 21a5e6c6b90b9ac39bfe7fef59b6dc9c6dc3516b850de5897df63672e81e22abea7bdd7e363e8206dcb72697af797af2501b1c14480bbb8a9284f28c70ca9d67 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -Dmio.tests=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/mio) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/mio RENAME copyright) diff --git a/externals/vcpkg/ports/mio/vcpkg.json b/externals/vcpkg/ports/mio/vcpkg.json new file mode 100755 index 000000000..6cf4b5445 --- /dev/null +++ b/externals/vcpkg/ports/mio/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "mio", + "version-string": "2019-02-10", + "port-version": 1, + "description": "Cross-platform header-only C++11 library for memory mapped file IO." +} diff --git a/externals/vcpkg/ports/mlpack/cmakelists.patch b/externals/vcpkg/ports/mlpack/cmakelists.patch new file mode 100755 index 000000000..278d80f96 --- /dev/null +++ b/externals/vcpkg/ports/mlpack/cmakelists.patch @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6fe6d81..b59555c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -291,7 +291,7 @@ endif() + # ENSMALLEN_INCLUDE_DIR - include directory for ensmallen + # STB_IMAGE_INCLUDE_DIR - include directory for STB image library + # MATHJAX_ROOT - root of MathJax installation +-find_package(Armadillo "${ARMADILLO_VERSION}" REQUIRED) ++find_package(Armadillo CONFIG "${ARMADILLO_VERSION}" REQUIRED) + + # Include directories for the previous dependencies. + set(MLPACK_INCLUDE_DIRS ${MLPACK_INCLUDE_DIRS} ${ARMADILLO_INCLUDE_DIRS}) +@@ -388,8 +388,8 @@ if (NOT ENSMALLEN_FOUND) + "Successfully downloaded ensmallen into ${CMAKE_BINARY_DIR}/deps/${ENSMALLEN_INCLUDE_DIR}/") + + # Now we have to also ensure these header files get installed. +- install(DIRECTORY "${CMAKE_BINARY_DIR}/deps/${ENSMALLEN_INCLUDE_DIR}/include/ensmallen_bits/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/ensmallen_bits") +- install(FILES "${CMAKE_BINARY_DIR}/deps/${ENSMALLEN_INCLUDE_DIR}/include/ensmallen.hpp" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") ++ #install(DIRECTORY "${CMAKE_BINARY_DIR}/deps/${ENSMALLEN_INCLUDE_DIR}/include/ensmallen_bits/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/ensmallen_bits") ++ #install(FILES "${CMAKE_BINARY_DIR}/deps/${ENSMALLEN_INCLUDE_DIR}/include/ensmallen.hpp" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + else () + message(FATAL_ERROR "Problem unpacking ensmallen! Expected only one directory ensmallen-x.y.z/; found ${ENS_DIRECTORIES}. Try removing the directory ${CMAKE_BINARY_DIR}/deps and reconfiguring.") + endif () +@@ -446,6 +446,7 @@ find_package(Boost "${BOOST_VERSION}" + REQUIRED + ) + ++if(0) + link_directories(${Boost_LIBRARY_DIRS}) + + # In Visual Studio, automatic linking is performed, so we don't need to worry +@@ -457,10 +458,12 @@ if (MSVC) + message("boost lib dirs ${Boost_LIBRARY_DIRS}") + set(Boost_LIBRARIES "") + endif () ++endif() + ++link_directories(${Boost_LIBRARIES}) + set(MLPACK_INCLUDE_DIRS ${MLPACK_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}) + set(MLPACK_LIBRARIES ${MLPACK_LIBRARIES} ${Boost_LIBRARIES}) +-set(MLPACK_LIBRARY_DIRS ${MLPACK_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS}) ++set(MLPACK_LIBRARY_DIRS ${MLPACK_LIBRARY_DIRS} ${Boost_LIBRARIES}) + + # For Boost testing framework (will have no effect on non-testing executables). + # This specifies to Boost that we are dynamically linking to the Boost test diff --git a/externals/vcpkg/ports/mlpack/fix-configure-error.patch b/externals/vcpkg/ports/mlpack/fix-configure-error.patch new file mode 100755 index 000000000..03a27077a --- /dev/null +++ b/externals/vcpkg/ports/mlpack/fix-configure-error.patch @@ -0,0 +1,15 @@ +diff --git a/CMake/go/AppendModel.cmake b/CMake/go/AppendModel.cmake +index eeb28f7..ec50f15 100644 +--- a/CMake/go/AppendModel.cmake ++++ b/CMake/go/AppendModel.cmake +@@ -44,8 +44,8 @@ function(append_model SERIALIZATION_FILE PROGRAM_MAIN_FILE) + else () + string(APPEND GOMODEL_SAFE_TYPE ${MODEL_CHAR}) + endif() +- endif() +- endforeach() ++ endforeach() ++ endif() + + # See if the model type already exists. + file(READ "${SERIALIZATION_FILE}" SERIALIZATION_FILE_CONTENTS) diff --git a/externals/vcpkg/ports/mlpack/fix-dependencies.patch b/externals/vcpkg/ports/mlpack/fix-dependencies.patch new file mode 100755 index 000000000..2de2682ac --- /dev/null +++ b/externals/vcpkg/ports/mlpack/fix-dependencies.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4dd92f0..bfa697d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -488,7 +488,7 @@ add_definitions(-DBOOST_TEST_DYN_LINK) + # } + # #endif + if (USE_OPENMP) +- find_package(OpenMP) ++ find_package(OpenMP REQUIRED) + endif () + + if (OPENMP_FOUND) diff --git a/externals/vcpkg/ports/mlpack/fix-test-dependency.patch b/externals/vcpkg/ports/mlpack/fix-test-dependency.patch new file mode 100755 index 000000000..1dbb5088d --- /dev/null +++ b/externals/vcpkg/ports/mlpack/fix-test-dependency.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b59555c..4dd92f0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -441,11 +441,18 @@ set(Boost_ADDITIONAL_VERSIONS + set(Boost_NO_BOOST_CMAKE 1) + find_package(Boost "${BOOST_VERSION}" + COMPONENTS +- unit_test_framework + serialization + REQUIRED + ) + ++if (BUILD_TESTS) ++ find_package(Boost "${BOOST_VERSION}" ++ COMPONENTS ++ unit_test_framework ++ REQUIRED ++ ) ++endif() ++ + if(0) + link_directories(${Boost_LIBRARY_DIRS}) + diff --git a/externals/vcpkg/ports/mlpack/portfile.cmake b/externals/vcpkg/ports/mlpack/portfile.cmake new file mode 100755 index 000000000..33df7e972 --- /dev/null +++ b/externals/vcpkg/ports/mlpack/portfile.cmake @@ -0,0 +1,106 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mlpack/mlpack + REF 7ae9ddda86c1751b6509ceb48b27d182feaae439 # 3.4.1 + SHA512 db68c16b80af7037ac562f93775b6262f1552fbc89daa0c621075e2ff70a8306523da8eb74e33ac15ba34c9ccef8f2746bd1e4efa7c280a5be77b53c69d3f9a1 + HEAD_REF master + PATCHES + cmakelists.patch + fix-configure-error.patch + fix-test-dependency.patch + fix-dependencies.patch +) + +file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindACML.cmake") +file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindACMLMP.cmake") +file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindARPACK.cmake") +file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindBLAS.cmake") +file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindCBLAS.cmake") +file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindCLAPACK.cmake") +file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindLAPACK.cmake") +file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindMKL.cmake") +file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindOpenBLAS.cmake") +file(REMOVE "${SOURCE_PATH}/CMake/FindArmadillo.cmake") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_CLI_EXECUTABLES + openmp USE_OPENMP +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DBUILD_TESTS=OFF + -DDOWNLOAD_STB_IMAGE=OFF + -DDOWNLOAD_ENSMALLEN=OFF + -DBUILD_PYTHON_BINDINGS=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON + ${FEATURE_OPTIONS} +) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mlpack) + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(AUTO_CLEAN TOOL_NAMES + mlpack_adaboost + mlpack_approx_kfn + mlpack_cf + mlpack_dbscan + mlpack_decision_stump + mlpack_decision_tree + mlpack_det + mlpack_emst + mlpack_fastmks + mlpack_gmm_generate + mlpack_gmm_probability + mlpack_gmm_train + mlpack_hmm_generate + mlpack_hmm_loglik + mlpack_hmm_train + mlpack_hmm_viterbi + mlpack_hoeffding_tree + mlpack_kde + mlpack_kernel_pca + mlpack_kfn + mlpack_kmeans + mlpack_knn + mlpack_krann + mlpack_lars + mlpack_linear_regression + mlpack_linear_svm + mlpack_lmnn + mlpack_local_coordinate_coding + mlpack_logistic_regression + mlpack_lsh + mlpack_mean_shift + mlpack_nbc + mlpack_nca + mlpack_nmf + mlpack_pca + mlpack_perceptron + mlpack_preprocess_binarize + mlpack_preprocess_describe + mlpack_preprocess_imputer + mlpack_preprocess_scale + mlpack_preprocess_split + mlpack_radical + mlpack_random_forest + mlpack_range_search + mlpack_softmax_regression + mlpack_sparse_coding + mlpack_image_converter + mlpack_bayesian_linear_regression + mlpack_preprocess_one_hot_encoding + ) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/COPYRIGHT.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/mlpack/vcpkg.json b/externals/vcpkg/ports/mlpack/vcpkg.json new file mode 100755 index 000000000..382e885d3 --- /dev/null +++ b/externals/vcpkg/ports/mlpack/vcpkg.json @@ -0,0 +1,38 @@ +{ + "name": "mlpack", + "version": "3.4.1", + "port-version": 5, + "description": "mlpack is a fast, flexible machine learning library, written in C++, that aims to provide fast, extensible implementations of cutting-edge machine learning algorithms.", + "homepage": "https://github.com/mlpack/mlpack", + "supports": "!uwp", + "dependencies": [ + "armadillo", + "boost-heap", + "boost-math", + "boost-program-options", + "boost-random", + "boost-serialization", + "boost-serialization", + "ensmallen", + "stb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "openmp": { + "description": "use OpenMP for parallelization." + }, + "tools": { + "description": "Build command-line executables.", + "dependencies": [ + "boost-format" + ] + } + } +} diff --git a/externals/vcpkg/ports/mman/mman-static.patch b/externals/vcpkg/ports/mman/mman-static.patch new file mode 100755 index 000000000..ce7be4976 --- /dev/null +++ b/externals/vcpkg/ports/mman/mman-static.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4696ad4..a72bbce 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,10 @@ option (BUILD_TESTS "tests?" OFF) + set (headers mman.h) + set (sources mman.c) + ++if(NOT BUILD_SHARED_LIBS) ++ add_definitions(-DMMANSHARED_EXPORT=) ++endif() ++ + add_library (mman ${sources}) + + install (TARGETS mman RUNTIME DESTINATION bin +diff --git a/mman.h b/mman.h +index 4065bc6..435ea26 100644 +--- a/mman.h ++++ b/mman.h +@@ -15,11 +15,13 @@ + #include <_mingw.h> + #endif + ++#if !defined(MMANSHARED_EXPORT) + #if defined(MMAN_LIBRARY) + #define MMANSHARED_EXPORT __declspec(dllexport) + #else + #define MMANSHARED_EXPORT __declspec(dllimport) + #endif ++#endif + + /* Determine offset type */ + #include diff --git a/externals/vcpkg/ports/mman/portfile.cmake b/externals/vcpkg/ports/mman/portfile.cmake new file mode 100755 index 000000000..4e57ba973 --- /dev/null +++ b/externals/vcpkg/ports/mman/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO witwall/mman-win32 + REF f5ff813c53935c3078f48e1f03a6944c4e7b459c + SHA512 49c9a63a0a3c6fa585a76e65425f6fb1fdaa23cc87e53d5afb7a1298bcd4956298c076ee78f24dd5df5f5a0c5f6244c6abb63b40818e4d2546185fa37a73bf0d + HEAD_REF master + PATCHES + mman-static.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include/mman) +file(RENAME ${CURRENT_PACKAGES_DIR}/include/sys ${CURRENT_PACKAGES_DIR}/include/mman/sys) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/mman) +file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/mman RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mman/sys/mman.h" "__declspec(dllimport)" "") +endif() + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/mman/usage b/externals/vcpkg/ports/mman/usage new file mode 100755 index 000000000..25d00d4c0 --- /dev/null +++ b/externals/vcpkg/ports/mman/usage @@ -0,0 +1,4 @@ +The mman.h header deployed by mman is placed in mman/sys/mman.h to avoid accidental inclusion. + + find_path(MMAN_DIR NAMES sys/mman.h PATH_SUFFIXES mman) + target_include_directories(main PRIVATE ${MMAN_DIR}) diff --git a/externals/vcpkg/ports/mman/vcpkg.json b/externals/vcpkg/ports/mman/vcpkg.json new file mode 100755 index 000000000..2554140e8 --- /dev/null +++ b/externals/vcpkg/ports/mman/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "mman", + "version-string": "git-f5ff813", + "port-version": 5, + "description": "A light implementation of the mmap functions for MinGW.", + "homepage": "https://github.com/witwall/mman-win32", + "supports": "windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/mmloader/portfile.cmake b/externals/vcpkg/ports/mmloader/portfile.cmake new file mode 100755 index 000000000..1250881fa --- /dev/null +++ b/externals/vcpkg/ports/mmloader/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tishion/mmLoader + REF 1.0.1 + SHA512 a41749e1b62d5549b821429a03e456a0cb41fbc1ea3fe5e8067f80994fb4645c3145dd1e2a3ccaed13b091ec24338d4e542849628d346f26d2275b0cbff8f4c6 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + shellcode BUILD_SHELLCODE_GEN +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install(DISABLE_PARALLEL) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/License" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/mmloader/vcpkg.json b/externals/vcpkg/ports/mmloader/vcpkg.json new file mode 100755 index 000000000..e436ab111 --- /dev/null +++ b/externals/vcpkg/ports/mmloader/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "mmloader", + "version": "1.0.1", + "port-version": 2, + "description": "A library for loading dll module bypassing windows PE loader from memory (x86/x64)", + "homepage": "http://tishion.github.io/mmLoader/", + "license": "MIT", + "supports": "(x86 | x64) & windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "shellcode": { + "description": "Generate mmLoader shell code headers" + } + } +} diff --git a/externals/vcpkg/ports/mmx/copyright b/externals/vcpkg/ports/mmx/copyright new file mode 100755 index 000000000..f02e1bae7 --- /dev/null +++ b/externals/vcpkg/ports/mmx/copyright @@ -0,0 +1,52 @@ +Licenses are stated in each header file + +json.h - public domain - Micha Mettke + +lexer.h - zlib LICENSE +LICENSE: (zlib) +Copyright (c) 2016 Micha Mettke + +sched.h - zlib LICENSE +LICENSE: (zlib) +Copyright (c) 2016 Doug Binks + +vec.h - zlib LICENSE +LICENSE: (zlib) +Copyright (c) 2015 Micha Mettke + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. + + +web.h - BSD LICENSE - Andreas Fredriksson +LICENSE: (BSD) +Copyright (c) 2016, Andreas Fredriksson, Micha Mettke +All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/externals/vcpkg/ports/mmx/portfile.cmake b/externals/vcpkg/ports/mmx/portfile.cmake new file mode 100755 index 000000000..78f7d9efb --- /dev/null +++ b/externals/vcpkg/ports/mmx/portfile.cmake @@ -0,0 +1,12 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO vurtun/mmx + REF b99867658dadcaed2fbfb95ad0e0c461a7a80a0c + SHA512 3ad01562f439fac364c45d9e4091d136c7cec36adeab219773c2df0d32b09f4e258bdb11884cbeed7dc2835381d2b409c55fe80e0913e995e54a1b7ebbe0f2bc + HEAD_REF master +) + +file(GLOB_RECURSE MMX_HEADERS "${SOURCE_PATH}/*.h") +file(INSTALL ${MMX_HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/externals/vcpkg/ports/mmx/vcpkg.json b/externals/vcpkg/ports/mmx/vcpkg.json new file mode 100755 index 000000000..9a7fe081d --- /dev/null +++ b/externals/vcpkg/ports/mmx/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "mmx", + "version-string": "2019-09-29", + "port-version": 1, + "description": "Single header libraries for C/C++", + "homepage": "https://github.com/vurtun/mmx" +} diff --git a/externals/vcpkg/ports/mnn/portfile.cmake b/externals/vcpkg/ports/mnn/portfile.cmake new file mode 100755 index 000000000..b3a7dc3fc --- /dev/null +++ b/externals/vcpkg/ports/mnn/portfile.cmake @@ -0,0 +1,126 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO alibaba/MNN + REF 1.1.0 + SHA512 3e31eec9a876be571cb2d29e0a2bcdb8209a43a43a5eeae19b295fadfb1252dd5bd4ed5b7c584706171e1b531710248193bc04520a796963e2b21546acbedae0 + HEAD_REF master + PATCHES + use-package-and-install.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + test MNN_BUILD_TEST + test MNN_BUILD_BENCHMARK + cuda MNN_CUDA + cuda MNN_GPU_TRACE + vulkan MNN_VULKAN + vulkan MNN_GPU_TRACE + vulkan MNN_USE_SYSTEM_LIB + opencl MNN_OPENCL + opencl MNN_USE_SYSTEM_LIB + metal MNN_METAL + metal MNN_GPU_TRACE + tools MNN_BUILD_TOOLS + tools MNN_BUILD_QUANTOOLS + tools MNN_BUILD_TRAIN + tools MNN_EVALUATION + tools MNN_BUILD_CONVERTER +) + +# 'cuda' feature in Windows failes with Ninja because of parallel PDB access. Make it optional +set(NINJA_OPTION PREFER_NINJA) +if("cuda" IN_LIST FEATURES) + unset(NINJA_OPTION) +endif() + +set(FLATC_EXEC ${CURRENT_HOST_INSTALLED_DIR}/tools/flatbuffers/flatc${VCPKG_HOST_EXECUTABLE_SUFFIX}) +if (NOT EXISTS "${FLATC_EXEC}") + message(FATAL_ERROR "Expected ${FLATC_EXEC} to exist.") +endif() + +# regenerate some code files by schemes and flatbuffers +vcpkg_execute_build_process( + COMMAND "${FLATC_EXEC}" "-c" "-b" "--gen-object-api" "--reflect-names" + "../default/BasicOptimizer.fbs" + "../default/CaffeOp.fbs" + "../default/GpuLibrary.fbs" + "../default/MNN.fbs" + "../default/Tensor.fbs" + "../default/TensorflowOp.fbs" + "../default/TFQuantizeOp.fbs" + "../default/Type.fbs" + "../default/UserDefine.fbs" + WORKING_DIRECTORY "${SOURCE_PATH}/schema/current/" + LOGNAME flatc-${TARGET_TRIPLET} + ) + +if(VCPKG_TARGET_IS_WINDOWS) + string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_RUNTIME_MT) + list(APPEND PLATFORM_OPTIONS -DMNN_WIN_RUNTIME_MT=${USE_RUNTIME_MT}) +endif() + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + ${NINJA_OPTION} + OPTIONS + ${FEATURE_OPTIONS} ${PLATFORM_OPTIONS} + -DMNN_BUILD_SHARED_LIBS=${BUILD_SHARED} + # 1.1.0.0-${commit} + -DMNN_VERSION_MAJOR=1 -DMNN_VERSION_MINOR=1 -DMNN_VERSION_PATCH=0 -DMNN_VERSION_BUILD=0 -DMNN_VERSION_SUFFIX=-d6795ad + OPTIONS_DEBUG + -DMNN_DEBUG_MEMORY=ON -DMNN_DEBUG_TENSOR_SIZE=ON +) +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +vcpkg_download_distfile(COPYRIGHT_PATH + URLS "https://apache.org/licenses/LICENSE-2.0.txt" + FILENAME 98f6b79b778f7b0a1541.txt + SHA512 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 +) + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(RENAME ${COPYRIGHT_PATH} ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) + +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) + if("metal" IN_LIST FEATURES) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/mnn.metallib + ${CURRENT_PACKAGES_DIR}/share/${PORT}/mnn.metallib) + endif() +else() + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/${PORT}) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +if("test" IN_LIST FEATURES) + # no install(TARGETS) for the following binaries. check the buildtrees... + # vcpkg_copy_tools( + # TOOL_NAMES run_test.out benchmark.out benchmarkExprModels.out # test/ + # AUTO_CLEAN + # ) +endif() +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES MNNV2Basic.out mobilenetTest.out backendTest.out testModel.out testModelWithDescrisbe.out getPerformance.out checkInvalidValue.out timeProfile.out # tools/cpp + quantized.out # tools/quantization + classficationTopkEval.out # tools/evaluation + MNNDump2Json MNNConvert # tools/converter + transformer.out train.out dataTransformer.out runTrainDemo.out # tools/train + AUTO_CLEAN + ) + if(BUILD_SHARED) + vcpkg_copy_tools(TOOL_NAMES TestConvertResult AUTO_CLEAN) # tools/converter + endif() +endif() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # remove the others. ex) mnn.metallib + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin + ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() diff --git a/externals/vcpkg/ports/mnn/use-package-and-install.patch b/externals/vcpkg/ports/mnn/use-package-and-install.patch new file mode 100755 index 000000000..be5329111 --- /dev/null +++ b/externals/vcpkg/ports/mnn/use-package-and-install.patch @@ -0,0 +1,192 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -270,18 +270,24 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "^Linux") + include_directories(${aarch64_linux_include}) + endif() + endif() ++ ++if(MNN_OPENCL) ++ find_package(OpenCL REQUIRED) ++endif() ++find_package(RapidJSON CONFIG REQUIRED) ++find_path(STB_INCLUDE_DIRS stb_image.h) ++find_package(Flatbuffers CONFIG REQUIRED) + include_directories(${CMAKE_CURRENT_LIST_DIR}/include/ + ${CMAKE_CURRENT_LIST_DIR}/source/ + ${CMAKE_CURRENT_LIST_DIR}/express/ + ${CMAKE_CURRENT_LIST_DIR}/tools/ + ${CMAKE_CURRENT_LIST_DIR}/schema/current/ +- ${CMAKE_CURRENT_LIST_DIR}/3rd_party/ +- ${CMAKE_CURRENT_LIST_DIR}/3rd_party/flatbuffers/include + ${CMAKE_CURRENT_LIST_DIR}/3rd_party/half +- ${CMAKE_CURRENT_LIST_DIR}/3rd_party/imageHelper +- ${CMAKE_CURRENT_LIST_DIR}/3rd_party/OpenCLHeaders/ ++ ${RAPIDJSON_INCLUDE_DIRS} ++ ${STB_INCLUDE_DIRS} ++ ${OpenCL_INCLUDE_DIRS} + ) +- ++link_libraries(flatbuffers::flatbuffers ${OpenCL_LIBRARIES}) + + set(MNN_OBJECTS_TO_LINK "") + set(MNN_TARGETS "") +@@ -631,10 +637,14 @@ ELSEIF(NOT APPLE) + INSTALL(FILES ${MNN_PUB_HDRS} DESTINATION include/MNN/) + INSTALL(FILES ${MNN_EXPR_PUB_HDRS} DESTINATION include/MNN/expr/) + install(TARGETS MNN ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + ) ++ + ELSE() ++ INSTALL(FILES ${MNN_PUB_HDRS} DESTINATION include/MNN/) ++ INSTALL(FILES ${MNN_EXPR_PUB_HDRS} DESTINATION include/MNN/expr/) + install(TARGETS MNN + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +@@ -648,5 +658,6 @@ ELSE() + ENDFOREACH() + IF(MNN_METAL) + SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/mnn.metallib PROPERTIES MACOSX_PACKAGE_LOCATION Resources/) ++ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mnn.metallib DESTINATION bin) + ENDIF() + ENDIF() +diff --git a/source/backend/cuda/CMakeLists.txt b/source/backend/cuda/CMakeLists.txt +index f9a24cc..8b1f96f 100644 +--- a/source/backend/cuda/CMakeLists.txt ++++ b/source/backend/cuda/CMakeLists.txt +@@ -16,9 +16,26 @@ endif() + file(GLOB_RECURSE MNN_CUDA_SRC ${CMAKE_CURRENT_LIST_DIR}/core/* ${CMAKE_CURRENT_SOURCE_DIR}/execution/*) + message(STATUS "message ${CUDA_NVCC_FLAGS} !!!!!!!!!!!") + ++# see https://github.com/microsoft/vcpkg/blob/master/ports/cudnn/FindCUDNN.cmake ++find_package(CUDNN REQUIRED) ++message(STATUS "using cudnn: ${CUDNN_LIBRARIES}") ++ ++if(WIN32) ++ find_library(CUBLAS_LIB NAMES cublas PATHS $ENV{CUDA_PATH}/lib/x64) ++else() ++ find_library(CUBLAS_LIB cublas) ++endif() ++if(NOT CUBLAS_LIB) ++ message(FATAL_ERROR "cublas not found") ++else() ++ message(STATUS "using cublas: ${CUBLAS_LIB}") ++endif() ++ + # add_library(MNN_Cuda SHARED ${MNN_CUDA_SRC} ) +-cuda_add_library(MNN_Cuda_Main SHARED ${MNN_CUDA_SRC} ) +-set(MNN_CUDA_LIBS MNN_Cuda_Main cudnn cublas PARENT_SCOPE) ++cuda_add_library(MNN_Cuda_Main STATIC ${MNN_CUDA_SRC} ) ++target_link_libraries(MNN_Cuda_Main CuDNN::CuDNN ${CUBLAS_LIB}) ++ ++set(MNN_CUDA_LIBS MNN_Cuda_Main ${CUDNN_LIB} PARENT_SCOPE) + add_library(MNN_CUDA OBJECT Register.cpp) + + include_directories( +diff --git a/source/backend/tensorrt/CMakeLists.txt b/source/backend/tensorrt/CMakeLists.txt +index aadabd6..3a0d81e 100644 +--- a/source/backend/tensorrt/CMakeLists.txt ++++ b/source/backend/tensorrt/CMakeLists.txt +@@ -7,7 +7,7 @@ FIND_PACKAGE(CUDA REQUIRED) + + add_library( MNN_TRT OBJECT ${MNN_TRT_SRCS}) + +-include_directories(/usr/local/cuda/include/) ++include_directories(${CUDA_INCLUDE_DIRS}) + include_directories(${CMAKE_CURRENT_LIST_DIR}/backend/) + include_directories(${CMAKE_CURRENT_LIST_DIR}/execution/) + include_directories(${CMAKE_CURRENT_LIST_DIR}/execution/plugin/) +diff --git a/tools/converter/CMakeLists.txt b/tools/converter/CMakeLists.txt +index 2d5133a..d39977a 100644 +--- a/tools/converter/CMakeLists.txt ++++ b/tools/converter/CMakeLists.txt +@@ -38,11 +38,12 @@ IF(MNN_BUILD_CONVERTER) + ${CMAKE_CURRENT_LIST_DIR}/source/cli.cpp + ${CMAKE_CURRENT_LIST_DIR}/source/config.cpp + ) +- IF(MNN_BUILD_SHARED_LIBS) +- add_library(MNNConvertDeps SHARED ${COMMON_SRC} ${MNN_CONVERTER_BACKENDS_OBJECTS} ${CMAKE_CURRENT_LIST_DIR}/../../3rd_party/flatbuffers/src/util.cpp $) ++ # if Windows, meld MNNConvertDeps(lib) into MNNConvert(exe) ++ IF(MNN_BUILD_SHARED_LIBS AND NOT WIN32) ++ add_library(MNNConvertDeps SHARED ${COMMON_SRC} ${MNN_CONVERTER_BACKENDS_OBJECTS} $) + add_dependencies(MNNConvertDeps MNN) + ELSE() +- add_library(MNNConvertDeps STATIC ${COMMON_SRC} ${MNN_CONVERTER_BACKENDS_OBJECTS} ${CMAKE_CURRENT_LIST_DIR}/../../3rd_party/flatbuffers/src/util.cpp) ++ add_library(MNNConvertDeps STATIC ${COMMON_SRC} ${MNN_CONVERTER_BACKENDS_OBJECTS}) + ENDIF() + + +@@ -68,5 +69,7 @@ IF(MNN_BUILD_CONVERTER) + add_executable(TestConvertResult ${CMAKE_CURRENT_LIST_DIR}/source/TestConvertResult.cpp) + target_link_libraries(TestConvertResult MNNConvertDeps) + target_link_libraries(MNNConvert MNNConvertDeps) ++ install(TARGETS TestConvertResult RUNTIME DESTINATION bin) + ENDIF() ++ install(TARGETS MNNDump2Json MNNConvert RUNTIME DESTINATION bin) + ENDIF() +diff --git a/tools/cpp/CMakeLists.txt b/tools/cpp/CMakeLists.txt +index def574c..f4e48c6 100644 +--- a/tools/cpp/CMakeLists.txt ++++ b/tools/cpp/CMakeLists.txt +@@ -53,3 +53,5 @@ if (MSVC) + endif() + endforeach() + endif() ++ ++install(TARGETS ${MNN_CPP_TOOLS} RUNTIME DESTINATION bin) +diff --git a/tools/evaluation/CMakeLists.txt b/tools/evaluation/CMakeLists.txt +index 8773372..e40b66d 100644 +--- a/tools/evaluation/CMakeLists.txt ++++ b/tools/evaluation/CMakeLists.txt +@@ -7,4 +7,5 @@ IF(MNN_EVALUATION) + target_link_options(classficationTopkEval.out PRIVATE /WHOLEARCHIVE:$) + endforeach () + endif() ++ install(TARGETS classficationTopkEval.out RUNTIME DESTINATION bin) + ENDIF() +diff --git a/tools/quantization/CMakeLists.txt b/tools/quantization/CMakeLists.txt +index 1e84ee0..86f3cbc 100644 +--- a/tools/quantization/CMakeLists.txt ++++ b/tools/quantization/CMakeLists.txt +@@ -1,3 +1,5 @@ + file(GLOB QUANFILES ${CMAKE_CURRENT_LIST_DIR}/*.cpp) + add_executable(quantized.out ${QUANFILES}) + target_link_libraries(quantized.out ${MNN_DEPS}) ++ ++install(TARGETS quantized.out RUNTIME DESTINATION bin) +diff --git a/tools/train/CMakeLists.txt b/tools/train/CMakeLists.txt +index 48f355b..026dc24 100644 +--- a/tools/train/CMakeLists.txt ++++ b/tools/train/CMakeLists.txt +@@ -27,6 +27,10 @@ if (MNN_BUILD_TRAIN_MINI) + else() + add_library(MNNTrain ${MNN_LIBARY_TYPE} ${GRAD} ${BASIC_INCLUDE} ${OPTIMIZER} ${DATALOADER} ${TRANSFORMER} ${MODELS} ${DATASETS}) + endif() ++IF(MNN_BUILD_SHARED_LIBS) ++ target_compile_definitions(MNNTrain PRIVATE BUILDING_MNN_DLL) ++ENDIF() ++ + target_link_libraries(MNNTrain ${MNN_DEPS}) + + add_executable(transformer.out ${CMAKE_CURRENT_LIST_DIR}/source/exec/transformerExecution.cpp) +@@ -38,7 +42,7 @@ target_link_libraries(train.out MNN) + + add_executable(rawDataTransform.out ${CMAKE_CURRENT_LIST_DIR}/source/exec/rawDataTransform.cpp ${SCHEMA} ${BASIC_INCLUDE}) + +-include_directories(../../3rd_party/imageHelper/) ++# include_directories(../../3rd_party/imageHelper/) + add_executable(dataTransformer.out ${CMAKE_CURRENT_LIST_DIR}/source/exec/dataTransformer.cpp ${SCHEMA} ${BASIC_INCLUDE}) + target_link_libraries(dataTransformer.out MNN) + +@@ -59,3 +63,9 @@ if (MNN_USE_OPENCV) + add_definitions(-D MNN_USE_OPENCV) + target_link_libraries(runTrainDemo.out ${OpenCV_LIBS}) + endif() ++ ++install(TARGETS MNNTrain transformer.out train.out dataTransformer.out runTrainDemo.out ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++) diff --git a/externals/vcpkg/ports/mnn/vcpkg.json b/externals/vcpkg/ports/mnn/vcpkg.json new file mode 100755 index 000000000..d23de738e --- /dev/null +++ b/externals/vcpkg/ports/mnn/vcpkg.json @@ -0,0 +1,51 @@ +{ + "name": "mnn", + "version": "1.1.0", + "port-version": 3, + "description": "MNN is a blazing fast, lightweight deep learning framework, battle-tested by business-critical use cases in Alibaba", + "homepage": "https://www.mnn.zone/", + "license": "Apache-2.0", + "supports": "!(arm | uwp | ios | android)", + "dependencies": [ + "flatbuffers", + { + "name": "flatbuffers", + "host": true + }, + "rapidjson", + "stb" + ], + "features": { + "cuda": { + "description": "Enable CUDA API backend", + "dependencies": [ + "cuda", + "cudnn" + ] + }, + "metal": { + "description": "Enable Metal API backend for Apple platforms" + }, + "opencl": { + "description": "Enable OpenCL API backend", + "dependencies": [ + "opencl" + ] + }, + "test": { + "description": "Build MNN test programs" + }, + "tools": { + "description": "Build MNN tools", + "dependencies": [ + "protobuf" + ] + }, + "vulkan": { + "description": "Enable Vulkan API backend", + "dependencies": [ + "vulkan" + ] + } + } +} diff --git a/externals/vcpkg/ports/modp-base64/CMakeLists.txt b/externals/vcpkg/ports/modp-base64/CMakeLists.txt new file mode 100755 index 000000000..5a2dffe24 --- /dev/null +++ b/externals/vcpkg/ports/modp-base64/CMakeLists.txt @@ -0,0 +1,26 @@ +cmake_minimum_required(VERSION 3.8) +project(libmodpbase64 C) + +if(MSVC) + add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS) +endif() + +configure_file(config.h.cmake config.h @ONLY) + +include_directories(. ${SOURCE_PATH}/src ${CMAKE_CURRENT_BINARY_DIR}) + +add_library(libmodpbase64 ${SOURCE_PATH}/src/modp_b64.c libmodpbase64.def) + +install( + TARGETS libmodpbase64 + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_HEADERS) + install( + FILES ${SOURCE_PATH}/src/modp_b64.h + DESTINATION include + ) +endif() diff --git a/externals/vcpkg/ports/modp-base64/config.h.cmake b/externals/vcpkg/ports/modp-base64/config.h.cmake new file mode 100755 index 000000000..da32c2481 --- /dev/null +++ b/externals/vcpkg/ports/modp-base64/config.h.cmake @@ -0,0 +1,4 @@ +#ifndef MODP_CONFIG_H +#define MODP_CONFIG_H + +#endif diff --git a/externals/vcpkg/ports/modp-base64/libmodpbase64.def b/externals/vcpkg/ports/modp-base64/libmodpbase64.def new file mode 100755 index 000000000..defd83b15 --- /dev/null +++ b/externals/vcpkg/ports/modp-base64/libmodpbase64.def @@ -0,0 +1,4 @@ +LIBRARY libmodpbase64 +EXPORTS + modp_b64_encode @1 + modp_b64_decode @2 diff --git a/externals/vcpkg/ports/modp-base64/modp_b64_data.h b/externals/vcpkg/ports/modp-base64/modp_b64_data.h new file mode 100755 index 000000000..e3c54b4bc --- /dev/null +++ b/externals/vcpkg/ports/modp-base64/modp_b64_data.h @@ -0,0 +1,480 @@ +#include +#define CHAR62 '+' +#define CHAR63 '/' +#define CHARPAD '=' +static const char e0[256] = { + 'A', 'A', 'A', 'A', 'B', 'B', 'B', 'B', 'C', 'C', + 'C', 'C', 'D', 'D', 'D', 'D', 'E', 'E', 'E', 'E', + 'F', 'F', 'F', 'F', 'G', 'G', 'G', 'G', 'H', 'H', + 'H', 'H', 'I', 'I', 'I', 'I', 'J', 'J', 'J', 'J', + 'K', 'K', 'K', 'K', 'L', 'L', 'L', 'L', 'M', 'M', + 'M', 'M', 'N', 'N', 'N', 'N', 'O', 'O', 'O', 'O', + 'P', 'P', 'P', 'P', 'Q', 'Q', 'Q', 'Q', 'R', 'R', + 'R', 'R', 'S', 'S', 'S', 'S', 'T', 'T', 'T', 'T', + 'U', 'U', 'U', 'U', 'V', 'V', 'V', 'V', 'W', 'W', + 'W', 'W', 'X', 'X', 'X', 'X', 'Y', 'Y', 'Y', 'Y', + 'Z', 'Z', 'Z', 'Z', 'a', 'a', 'a', 'a', 'b', 'b', + 'b', 'b', 'c', 'c', 'c', 'c', 'd', 'd', 'd', 'd', + 'e', 'e', 'e', 'e', 'f', 'f', 'f', 'f', 'g', 'g', + 'g', 'g', 'h', 'h', 'h', 'h', 'i', 'i', 'i', 'i', + 'j', 'j', 'j', 'j', 'k', 'k', 'k', 'k', 'l', 'l', + 'l', 'l', 'm', 'm', 'm', 'm', 'n', 'n', 'n', 'n', + 'o', 'o', 'o', 'o', 'p', 'p', 'p', 'p', 'q', 'q', + 'q', 'q', 'r', 'r', 'r', 'r', 's', 's', 's', 's', + 't', 't', 't', 't', 'u', 'u', 'u', 'u', 'v', 'v', + 'v', 'v', 'w', 'w', 'w', 'w', 'x', 'x', 'x', 'x', + 'y', 'y', 'y', 'y', 'z', 'z', 'z', 'z', '0', '0', + '0', '0', '1', '1', '1', '1', '2', '2', '2', '2', + '3', '3', '3', '3', '4', '4', '4', '4', '5', '5', + '5', '5', '6', '6', '6', '6', '7', '7', '7', '7', + '8', '8', '8', '8', '9', '9', '9', '9', '+', '+', + '+', '+', '/', '/', '/', '/' +}; + +static const char e1[256] = { + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', + 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', + 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', + 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', + 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', + 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', + '8', '9', '+', '/', 'A', 'B', 'C', 'D', 'E', 'F', + 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', + 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', + 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', + 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', + 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', + '4', '5', '6', '7', '8', '9', '+', '/', 'A', 'B', + 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', + 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', + 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', + 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', + 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', + '+', '/', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', + 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', + 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', + 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', + 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', + 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', + '6', '7', '8', '9', '+', '/' +}; + +static const char e2[256] = { + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', + 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', + 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', + 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', + 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', + 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', + '8', '9', '+', '/', 'A', 'B', 'C', 'D', 'E', 'F', + 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', + 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', + 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', + 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', + 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', + '4', '5', '6', '7', '8', '9', '+', '/', 'A', 'B', + 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', + 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', + 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', + 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', + 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', + '+', '/', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', + 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', + 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', + 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', + 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', + 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', + '6', '7', '8', '9', '+', '/' +}; + + + +#ifdef WORDS_BIGENDIAN + + +/* SPECIAL DECODE TABLES FOR BIG ENDIAN (IBM/MOTOROLA/SUN) CPUS */ + +static const uint32_t d0[256] = { +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x00f80000, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x00fc0000, +0x00d00000, 0x00d40000, 0x00d80000, 0x00dc0000, 0x00e00000, 0x00e40000, +0x00e80000, 0x00ec0000, 0x00f00000, 0x00f40000, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x00000000, +0x00040000, 0x00080000, 0x000c0000, 0x00100000, 0x00140000, 0x00180000, +0x001c0000, 0x00200000, 0x00240000, 0x00280000, 0x002c0000, 0x00300000, +0x00340000, 0x00380000, 0x003c0000, 0x00400000, 0x00440000, 0x00480000, +0x004c0000, 0x00500000, 0x00540000, 0x00580000, 0x005c0000, 0x00600000, +0x00640000, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x00680000, 0x006c0000, 0x00700000, 0x00740000, 0x00780000, +0x007c0000, 0x00800000, 0x00840000, 0x00880000, 0x008c0000, 0x00900000, +0x00940000, 0x00980000, 0x009c0000, 0x00a00000, 0x00a40000, 0x00a80000, +0x00ac0000, 0x00b00000, 0x00b40000, 0x00b80000, 0x00bc0000, 0x00c00000, +0x00c40000, 0x00c80000, 0x00cc0000, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff +}; + + +static const uint32_t d1[256] = { +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x0003e000, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x0003f000, +0x00034000, 0x00035000, 0x00036000, 0x00037000, 0x00038000, 0x00039000, +0x0003a000, 0x0003b000, 0x0003c000, 0x0003d000, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x00000000, +0x00001000, 0x00002000, 0x00003000, 0x00004000, 0x00005000, 0x00006000, +0x00007000, 0x00008000, 0x00009000, 0x0000a000, 0x0000b000, 0x0000c000, +0x0000d000, 0x0000e000, 0x0000f000, 0x00010000, 0x00011000, 0x00012000, +0x00013000, 0x00014000, 0x00015000, 0x00016000, 0x00017000, 0x00018000, +0x00019000, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x0001a000, 0x0001b000, 0x0001c000, 0x0001d000, 0x0001e000, +0x0001f000, 0x00020000, 0x00021000, 0x00022000, 0x00023000, 0x00024000, +0x00025000, 0x00026000, 0x00027000, 0x00028000, 0x00029000, 0x0002a000, +0x0002b000, 0x0002c000, 0x0002d000, 0x0002e000, 0x0002f000, 0x00030000, +0x00031000, 0x00032000, 0x00033000, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff +}; + + +static const uint32_t d2[256] = { +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x00000f80, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x00000fc0, +0x00000d00, 0x00000d40, 0x00000d80, 0x00000dc0, 0x00000e00, 0x00000e40, +0x00000e80, 0x00000ec0, 0x00000f00, 0x00000f40, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x00000000, +0x00000040, 0x00000080, 0x000000c0, 0x00000100, 0x00000140, 0x00000180, +0x000001c0, 0x00000200, 0x00000240, 0x00000280, 0x000002c0, 0x00000300, +0x00000340, 0x00000380, 0x000003c0, 0x00000400, 0x00000440, 0x00000480, +0x000004c0, 0x00000500, 0x00000540, 0x00000580, 0x000005c0, 0x00000600, +0x00000640, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x00000680, 0x000006c0, 0x00000700, 0x00000740, 0x00000780, +0x000007c0, 0x00000800, 0x00000840, 0x00000880, 0x000008c0, 0x00000900, +0x00000940, 0x00000980, 0x000009c0, 0x00000a00, 0x00000a40, 0x00000a80, +0x00000ac0, 0x00000b00, 0x00000b40, 0x00000b80, 0x00000bc0, 0x00000c00, +0x00000c40, 0x00000c80, 0x00000cc0, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff +}; + + +static const uint32_t d3[256] = { +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x0000003e, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x0000003f, +0x00000034, 0x00000035, 0x00000036, 0x00000037, 0x00000038, 0x00000039, +0x0000003a, 0x0000003b, 0x0000003c, 0x0000003d, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x00000000, +0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000006, +0x00000007, 0x00000008, 0x00000009, 0x0000000a, 0x0000000b, 0x0000000c, +0x0000000d, 0x0000000e, 0x0000000f, 0x00000010, 0x00000011, 0x00000012, +0x00000013, 0x00000014, 0x00000015, 0x00000016, 0x00000017, 0x00000018, +0x00000019, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x0000001a, 0x0000001b, 0x0000001c, 0x0000001d, 0x0000001e, +0x0000001f, 0x00000020, 0x00000021, 0x00000022, 0x00000023, 0x00000024, +0x00000025, 0x00000026, 0x00000027, 0x00000028, 0x00000029, 0x0000002a, +0x0000002b, 0x0000002c, 0x0000002d, 0x0000002e, 0x0000002f, 0x00000030, +0x00000031, 0x00000032, 0x00000033, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff +}; + + +#else + + +/* SPECIAL DECODE TABLES FOR LITTLE ENDIAN (INTEL) CPUS */ + +static const uint32_t d0[256] = { +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x000000f8, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x000000fc, +0x000000d0, 0x000000d4, 0x000000d8, 0x000000dc, 0x000000e0, 0x000000e4, +0x000000e8, 0x000000ec, 0x000000f0, 0x000000f4, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x00000000, +0x00000004, 0x00000008, 0x0000000c, 0x00000010, 0x00000014, 0x00000018, +0x0000001c, 0x00000020, 0x00000024, 0x00000028, 0x0000002c, 0x00000030, +0x00000034, 0x00000038, 0x0000003c, 0x00000040, 0x00000044, 0x00000048, +0x0000004c, 0x00000050, 0x00000054, 0x00000058, 0x0000005c, 0x00000060, +0x00000064, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x00000068, 0x0000006c, 0x00000070, 0x00000074, 0x00000078, +0x0000007c, 0x00000080, 0x00000084, 0x00000088, 0x0000008c, 0x00000090, +0x00000094, 0x00000098, 0x0000009c, 0x000000a0, 0x000000a4, 0x000000a8, +0x000000ac, 0x000000b0, 0x000000b4, 0x000000b8, 0x000000bc, 0x000000c0, +0x000000c4, 0x000000c8, 0x000000cc, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff +}; + + +static const uint32_t d1[256] = { +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x0000e003, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x0000f003, +0x00004003, 0x00005003, 0x00006003, 0x00007003, 0x00008003, 0x00009003, +0x0000a003, 0x0000b003, 0x0000c003, 0x0000d003, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x00000000, +0x00001000, 0x00002000, 0x00003000, 0x00004000, 0x00005000, 0x00006000, +0x00007000, 0x00008000, 0x00009000, 0x0000a000, 0x0000b000, 0x0000c000, +0x0000d000, 0x0000e000, 0x0000f000, 0x00000001, 0x00001001, 0x00002001, +0x00003001, 0x00004001, 0x00005001, 0x00006001, 0x00007001, 0x00008001, +0x00009001, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x0000a001, 0x0000b001, 0x0000c001, 0x0000d001, 0x0000e001, +0x0000f001, 0x00000002, 0x00001002, 0x00002002, 0x00003002, 0x00004002, +0x00005002, 0x00006002, 0x00007002, 0x00008002, 0x00009002, 0x0000a002, +0x0000b002, 0x0000c002, 0x0000d002, 0x0000e002, 0x0000f002, 0x00000003, +0x00001003, 0x00002003, 0x00003003, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff +}; + + +static const uint32_t d2[256] = { +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x00800f00, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x00c00f00, +0x00000d00, 0x00400d00, 0x00800d00, 0x00c00d00, 0x00000e00, 0x00400e00, +0x00800e00, 0x00c00e00, 0x00000f00, 0x00400f00, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x00000000, +0x00400000, 0x00800000, 0x00c00000, 0x00000100, 0x00400100, 0x00800100, +0x00c00100, 0x00000200, 0x00400200, 0x00800200, 0x00c00200, 0x00000300, +0x00400300, 0x00800300, 0x00c00300, 0x00000400, 0x00400400, 0x00800400, +0x00c00400, 0x00000500, 0x00400500, 0x00800500, 0x00c00500, 0x00000600, +0x00400600, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x00800600, 0x00c00600, 0x00000700, 0x00400700, 0x00800700, +0x00c00700, 0x00000800, 0x00400800, 0x00800800, 0x00c00800, 0x00000900, +0x00400900, 0x00800900, 0x00c00900, 0x00000a00, 0x00400a00, 0x00800a00, +0x00c00a00, 0x00000b00, 0x00400b00, 0x00800b00, 0x00c00b00, 0x00000c00, +0x00400c00, 0x00800c00, 0x00c00c00, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff +}; + + +static const uint32_t d3[256] = { +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x003e0000, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x003f0000, +0x00340000, 0x00350000, 0x00360000, 0x00370000, 0x00380000, 0x00390000, +0x003a0000, 0x003b0000, 0x003c0000, 0x003d0000, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x00000000, +0x00010000, 0x00020000, 0x00030000, 0x00040000, 0x00050000, 0x00060000, +0x00070000, 0x00080000, 0x00090000, 0x000a0000, 0x000b0000, 0x000c0000, +0x000d0000, 0x000e0000, 0x000f0000, 0x00100000, 0x00110000, 0x00120000, +0x00130000, 0x00140000, 0x00150000, 0x00160000, 0x00170000, 0x00180000, +0x00190000, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x001a0000, 0x001b0000, 0x001c0000, 0x001d0000, 0x001e0000, +0x001f0000, 0x00200000, 0x00210000, 0x00220000, 0x00230000, 0x00240000, +0x00250000, 0x00260000, 0x00270000, 0x00280000, 0x00290000, 0x002a0000, +0x002b0000, 0x002c0000, 0x002d0000, 0x002e0000, 0x002f0000, 0x00300000, +0x00310000, 0x00320000, 0x00330000, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, +0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff +}; + + +#endif diff --git a/externals/vcpkg/ports/modp-base64/portfile.cmake b/externals/vcpkg/ports/modp-base64/portfile.cmake new file mode 100755 index 000000000..2508b54fd --- /dev/null +++ b/externals/vcpkg/ports/modp-base64/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO client9/stringencoders + REF e1448a9415f4ebf6f559c86718193ba067cbb99d + SHA512 68c9b9a9eb09075c792cfc0a8ce1959c60a86e5256de8568b0cb6934f748fd9e95c5f1801a8982fecac65850a8f2d633a64dc98e4505ee8e6914bd0b0fb996cf + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR} + PREFER_NINJA + OPTIONS -DSOURCE_PATH=${SOURCE_PATH} + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_install_cmake() + +# Handle copyright +configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/modp-base64/vcpkg.json b/externals/vcpkg/ports/modp-base64/vcpkg.json new file mode 100755 index 000000000..2f222a982 --- /dev/null +++ b/externals/vcpkg/ports/modp-base64/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "modp-base64", + "version-string": "2020-09-26", + "port-version": 1, + "description": "High performance base64 encoder/decoder" +} diff --git a/externals/vcpkg/ports/mongo-c-driver/disable-source-write.patch b/externals/vcpkg/ports/mongo-c-driver/disable-source-write.patch new file mode 100755 index 000000000..ff2f9cab5 --- /dev/null +++ b/externals/vcpkg/ports/mongo-c-driver/disable-source-write.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7ff8bbf..32c2e00 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -114,8 +114,8 @@ if (BUILD_VERSION STREQUAL "0.0.0") + file (WRITE ${PROJECT_SOURCE_DIR}/VERSION_CURRENT ${BUILD_VERSION}) + endif () + else () +- message ("storing BUILD_VERSION ${BUILD_VERSION} in file VERSION_CURRENT for later use") +- file (WRITE ${PROJECT_SOURCE_DIR}/VERSION_CURRENT ${BUILD_VERSION}) ++ #message ("storing BUILD_VERSION ${BUILD_VERSION} in file VERSION_CURRENT for later use") ++ #file (WRITE ${PROJECT_SOURCE_DIR}/VERSION_CURRENT ${BUILD_VERSION}) + endif () + + include (LoadVersion) diff --git a/externals/vcpkg/ports/mongo-c-driver/disable-static-when-dynamic-build.patch b/externals/vcpkg/ports/mongo-c-driver/disable-static-when-dynamic-build.patch new file mode 100755 index 000000000..c2da5a93b --- /dev/null +++ b/externals/vcpkg/ports/mongo-c-driver/disable-static-when-dynamic-build.patch @@ -0,0 +1,42 @@ +diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt +index de96ab864..5b7f448f2 100644 +--- a/src/libmongoc/CMakeLists.txt ++++ b/src/libmongoc/CMakeLists.txt +@@ -725,6 +725,7 @@ if (MONGOC_ENABLE_MONGODB_AWS_AUTH) + endif() + endif () + ++if (NOT MONGOC_ENABLE_STATIC_BUILD) + add_library (mongoc_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) + set_target_properties (mongoc_shared PROPERTIES CMAKE_CXX_VISIBILITY_PRESET hidden) + target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC mongo::bson_shared) +@@ -745,7 +746,7 @@ target_compile_definitions (mongoc_shared PRIVATE MONGOC_COMPILATION ${KMS_MSG_D + set_target_properties (mongoc_shared PROPERTIES VERSION 0.0.0 SOVERSION 0) + set_target_properties (mongoc_shared PROPERTIES OUTPUT_NAME "${MONGOC_OUTPUT_BASENAME}-${MONGOC_API_VERSION}") + +-if (MONGOC_ENABLE_STATIC_BUILD) ++else () + add_library (mongoc_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) + target_link_libraries (mongoc_static ${STATIC_LIBRARIES} mongo::bson_static) + if (NOT WIN32 AND ENABLE_PIC) +@@ -778,7 +779,11 @@ if (ENABLE_APPLE_FRAMEWORK) + endif () + + add_executable (mongoc-stat ${PROJECT_SOURCE_DIR}/../../src/tools/mongoc-stat.c) ++if (NOT MONGOC_ENABLE_STATIC_BUILD) + target_link_libraries (mongoc-stat mongoc_shared ${LIBRARIES}) ++else() ++target_link_libraries (mongoc-stat mongoc_static ${LIBRARIES}) ++endif() + + # mongoc-stat works if shared memory performance counters are enabled. + if (ENABLE_SHM_COUNTERS STREQUAL "ON") +@@ -1040,7 +1045,7 @@ file (COPY ${PROJECT_SOURCE_DIR}/tests/x509gen DESTINATION ${PROJECT_BINARY_DIR} + file (COPY ${PROJECT_SOURCE_DIR}/tests/release_files DESTINATION ${PROJECT_BINARY_DIR}/tests) + + if (MONGOC_ENABLE_STATIC_INSTALL) +- set (TARGETS_TO_INSTALL mongoc_shared mongoc_static) ++ set (TARGETS_TO_INSTALL mongoc_static) + else () + set (TARGETS_TO_INSTALL mongoc_shared) + endif () diff --git a/externals/vcpkg/ports/mongo-c-driver/fix-arm-build.patch b/externals/vcpkg/ports/mongo-c-driver/fix-arm-build.patch new file mode 100755 index 000000000..5e997498a --- /dev/null +++ b/externals/vcpkg/ports/mongo-c-driver/fix-arm-build.patch @@ -0,0 +1,24 @@ +diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt +index 5b7f448f2..8881f5194 100644 +--- a/src/libmongoc/CMakeLists.txt ++++ b/src/libmongoc/CMakeLists.txt +@@ -729,6 +729,9 @@ if (NOT MONGOC_ENABLE_STATIC_BUILD) + add_library (mongoc_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) + set_target_properties (mongoc_shared PROPERTIES CMAKE_CXX_VISIBILITY_PRESET hidden) + target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC mongo::bson_shared) ++if (WIN32) ++ target_link_libraries (mongoc_shared PRIVATE Advapi32) ++endif() + target_include_directories (mongoc_shared BEFORE PUBLIC ${MONGOC_INTERNAL_INCLUDE_DIRS}) + target_include_directories (mongoc_shared PRIVATE ${ZLIB_INCLUDE_DIRS}) + target_include_directories (mongoc_shared PRIVATE ${LIBMONGOCRYPT_INCLUDE_DIRECTORIES}) +@@ -749,6 +752,9 @@ set_target_properties (mongoc_shared PROPERTIES OUTPUT_NAME "${MONGOC_OUTPUT_BAS + else () + add_library (mongoc_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) + target_link_libraries (mongoc_static ${STATIC_LIBRARIES} mongo::bson_static) ++ if (WIN32) ++ target_link_libraries (mongoc_static Advapi32) ++ endif() + if (NOT WIN32 AND ENABLE_PIC) + target_compile_options (mongoc_static PUBLIC -fPIC) + message ("Adding -fPIC to compilation of mongoc_static components") diff --git a/externals/vcpkg/ports/mongo-c-driver/fix-dependencies.patch b/externals/vcpkg/ports/mongo-c-driver/fix-dependencies.patch new file mode 100755 index 000000000..a03e870c6 --- /dev/null +++ b/externals/vcpkg/ports/mongo-c-driver/fix-dependencies.patch @@ -0,0 +1,176 @@ +diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt +index 8881f5194..c366f160a 100644 +--- a/src/libmongoc/CMakeLists.txt ++++ b/src/libmongoc/CMakeLists.txt +@@ -58,8 +58,9 @@ configure_file ( + set (ZLIB_INCLUDE_DIRS "") + if (ENABLE_ZLIB MATCHES "SYSTEM|AUTO") + message (STATUS "Searching for zlib CMake packages") +- include (FindZLIB) ++ find_package(ZLIB REQUIRED) + if (ZLIB_FOUND) ++ set(VCPKG_ZLIB_LIBRARIES "ZLIB::ZLIB") + message ("-- zlib found version \"${ZLIB_VERSION_STRING}\"") + message ("-- zlib include path \"${ZLIB_INCLUDE_DIRS}\"") + message ("-- zlib libraries \"${ZLIB_LIBRARIES}\"") +@@ -100,32 +101,31 @@ endif () + + if (NOT ENABLE_ZSTD STREQUAL OFF) + message (STATUS "Searching for compression library zstd") +- find_package(PkgConfig) +- pkg_check_modules (ZSTD libzstd) ++ find_package(zstd CONFIG REQUIRED) + +- if (NOT ZSTD_FOUND) ++ if (NOT zstd_FOUND) + if (ENABLE_ZSTD MATCHES "ON") + message (FATAL_ERROR " Not found") + else () + message (STATUS " Not found") + endif () + # The compression format below this version isn't supported. See SERVER-43070 +- elseif (${ZSTD_VERSION} VERSION_LESS "0.8.0") ++ elseif (${zstd_VERSION} VERSION_LESS "0.8.0") + if (ENABLE_ZSTD MATCHES "ON") +- message (FATAL_ERROR "Detected zstd version ${ZSTD_VERSION} but version 0.8.0 required") ++ message (FATAL_ERROR "Detected zstd version ${zstd_VERSION} but version 0.8.0 required") + else () +- message (STATUS "Detected zstd version ${ZSTD_VERSION} but version 0.8.0 required") ++ message (STATUS "Detected zstd version ${zstd_VERSION} but version 0.8.0 required") + endif () + else () +- message (STATUS " Found zstd version ${ZSTD_VERSION} in ${ZSTD_INCLUDE_DIRS}") ++ message (STATUS " Found zstd version ${zstd_VERSION} in ${ZSTD_INCLUDE_DIRS}") + set (MONGOC_ENABLE_COMPRESSION 1) + set (MONGOC_ENABLE_COMPRESSION_ZSTD 1) + + include_directories (${ZSTD_INCLUDE_DIRS}) +- if (${CMAKE_VERSION} VERSION_LESS "3.12.0") +- set (MONGOC_ZSTD_LIBRARIES ${ZSTD_LIBRARIES}) ++ if (MONGOC_ENABLE_STATIC_BUILD) ++ set (MONGOC_ZSTD_LIBRARIES "zstd::libzstd_static") + else () +- set (MONGOC_ZSTD_LIBRARIES ${ZSTD_LINK_LIBRARIES}) ++ set (MONGOC_ZSTD_LIBRARIES "zstd::libzstd_shared") + endif () + endif() + endif() +@@ -134,8 +134,8 @@ if (NOT ENABLE_SSL STREQUAL OFF) + # Try OpenSSL automatically everywhere but Mac and Windows. + if (ENABLE_SSL STREQUAL "OPENSSL" + OR (NOT APPLE AND NOT WIN32 AND ENABLE_SSL STREQUAL "AUTO")) +- # Sets OPENSSL_FOUND on success. +- include (FindOpenSSL) ++ # Sets OpenSSL_FOUND on success. ++ find_package(OpenSSL REQUIRED) + endif () + + if (ENABLE_SSL STREQUAL LIBRESSL) +@@ -171,7 +171,7 @@ if (NOT ENABLE_SSL STREQUAL OFF) + endif () + endif () + +- if (NOT OPENSSL_FOUND AND NOT SECURE_TRANSPORT AND NOT SECURE_CHANNEL AND NOT LIBRESSL) ++ if (NOT OpenSSL_FOUND AND NOT SECURE_TRANSPORT AND NOT SECURE_CHANNEL AND NOT LIBRESSL) + if (ENABLE_SSL STREQUAL AUTO) + set (ENABLE_SSL OFF) + else () +@@ -180,8 +180,8 @@ if (NOT ENABLE_SSL STREQUAL OFF) + endif () + endif () + +-if (OPENSSL_FOUND) +- if (WIN32 AND OPENSSL_VERSION GREATER 1.1 AND NOT ++if (OpenSSL_FOUND) ++ if (WIN32 AND OpenSSL_VERSION GREATER 1.1 AND NOT + ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.7) + message (FATAL_ERROR "Building against OpenSSL 1.1.0 and later requires CMake 3.7 or later (hint:" + " You can also compile against Windows Secure Transport with -DENABLE_SSL=WINDOWS") +@@ -220,7 +220,7 @@ elseif (LIBRESSL) + endif () + + if (ENABLE_CRYPTO_SYSTEM_PROFILE) +- if (OPENSSL_FOUND) ++ if (OpenSSL_FOUND) + set (MONGOC_ENABLE_CRYPTO_SYSTEM_PROFILE 1) + else () + message (FATAL_ERROR "ENABLE_CRYPTO_SYSTEM_PROFILE only available with OpenSSL") +@@ -349,10 +349,10 @@ if (ENABLE_TRACING) + endif () + + # Sets SNAPPY_LIBRARIES and SNAPPY_INCLUDE_DIRS. +-include (FindSnappy) +-if (SNAPPY_INCLUDE_DIRS) ++if (ENABLE_SNAPPY) ++ find_package(Snappy CONFIG REQUIRED) + set (MONGOC_ENABLE_COMPRESSION 1) +- include_directories ("${SNAPPY_INCLUDE_DIRS}") ++ set (VCPKG_SNAPPY_LIBRARIES "Snappy::snappy") + endif () + + set (MONGOC_ENABLE_SHM_COUNTERS 0) +@@ -393,6 +393,7 @@ if (NOT ENABLE_ICU STREQUAL OFF) + endif() + if (ICU_FOUND) + set (MONGOC_ENABLE_ICU 1) ++ set(VCPKG_ICU_LIBRARIES "ICU::uc") + include_directories ("${ICU_INCLUDE_DIR}") + elseif (ENABLE_ICU STREQUAL ON) + message (FATAL_ERROR "No ICU library found. If ICU is installed in a non-standard directory, define ICU_ROOT as the ICU installation path.") +@@ -623,7 +624,7 @@ if (NOT ENABLE_SSL STREQUAL OFF) + ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-ssl.c + ) + +- if (OPENSSL_FOUND) ++ if (OpenSSL_FOUND) + message (STATUS "Compiling against OpenSSL") + set (SOURCES ${SOURCES} + ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-crypto-openssl.c +@@ -633,7 +634,7 @@ if (NOT ENABLE_SSL STREQUAL OFF) + ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-openssl.c + ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-ocsp-cache.c + ) +- set (SSL_LIBRARIES ${OPENSSL_LIBRARIES}) ++ set (SSL_LIBRARIES "OpenSSL::SSL") + include_directories (${OPENSSL_INCLUDE_DIR}) + if (WIN32) + set (SSL_LIBRARIES ${SSL_LIBRARIES} crypt32.lib) +@@ -696,11 +697,11 @@ endif () + + set (LIBRARIES + ${SASL_LIBRARIES} ${SSL_LIBRARIES} ${SHM_LIBRARIES} ${RESOLV_LIBRARIES} +- ${SNAPPY_LIBRARIES} ${ZLIB_LIBRARIES} ${MONGOC_ZSTD_LIBRARIES} Threads::Threads ${ICU_LIBRARIES} ${LIBMONGOCRYPT_LIBRARY} ++ ${VCPKG_SNAPPY_LIBRARIES} ${VCPKG_ZLIB_LIBRARIES} ${MONGOC_ZSTD_LIBRARIES} Threads::Threads ${VCPKG_ICU_LIBRARIES} ${LIBMONGOCRYPT_LIBRARY} + ) + set (STATIC_LIBRARIES + ${SASL_LIBRARIES} ${SSL_LIBRARIES} ${SHM_LIBRARIES} ${RESOLV_LIBRARIES} +- ${SNAPPY_LIBRARIES} ${ZLIB_LIBRARIES} ${MONGOC_ZSTD_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${ICU_LIBRARIES} ${LIBMONGOCRYPT_LIBRARY} ++ ${VCPKG_SNAPPY_LIBRARIES} ${VCPKG_ZLIB_LIBRARIES} ${MONGOC_ZSTD_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${VCPKG_ICU_LIBRARIES} ${LIBMONGOCRYPT_LIBRARY} + ) + + if (WIN32) +diff --git a/src/libmongoc/src/mongoc-config.cmake b/src/libmongoc/src/mongoc-config.cmake +index 9224178e6..6e449c109 100644 +--- a/src/libmongoc/src/mongoc-config.cmake ++++ b/src/libmongoc/src/mongoc-config.cmake +@@ -1,3 +1,20 @@ + include(CMakeFindDependencyMacro) + find_dependency(bson-1.0 @MONGOC_MAJOR_VERSION@.@MONGOC_MINOR_VERSION@.@MONGOC_MICRO_VERSION@ CONFIG REQUIRED) ++ ++if("@Threads_FOUND@") ++ find_dependency(Threads REQUIRED) ++endif() ++if("@ZLIB_FOUND@") ++ find_dependency(ZLIB REQUIRED) ++endif() ++if("@zstd_FOUND@") ++ find_dependency(zstd CONFIG REQUIRED) ++endif() ++if("@OpenSSL_FOUND@") ++ find_dependency(OpenSSL REQUIRED) ++endif() ++if("@Snappy_FOUND@") ++ find_dependency(Snappy CONFIG REQUIRED) ++endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/mongoc-targets.cmake") diff --git a/externals/vcpkg/ports/mongo-c-driver/fix-dependency-libbson.patch b/externals/vcpkg/ports/mongo-c-driver/fix-dependency-libbson.patch new file mode 100755 index 000000000..65c05ca68 --- /dev/null +++ b/externals/vcpkg/ports/mongo-c-driver/fix-dependency-libbson.patch @@ -0,0 +1,72 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 91fd663da..fc9565770 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -179,14 +179,6 @@ if (ENABLE_BSON STREQUAL SYSTEM) + SET (ENABLE_TESTS OFF) + + set (USING_SYSTEM_BSON TRUE) +- if (NOT TARGET mongo::bson_shared) +- message (FATAL_ERROR "System libbson built without shared library target") +- endif () +- set (BSON_LIBRARIES mongo::bson_shared) +- if (NOT TARGET mongo::bson_static) +- message (FATAL_ERROR "System libbson built without static library target") +- endif () +- set (BSON_STATIC_LIBRARIES mongo::bson_static) + endif () + + unset (dist_generated CACHE) +diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt +index af5a398a9..de96ab864 100644 +--- a/src/libmongoc/CMakeLists.txt ++++ b/src/libmongoc/CMakeLists.txt +@@ -727,7 +727,7 @@ endif () + + add_library (mongoc_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) + set_target_properties (mongoc_shared PROPERTIES CMAKE_CXX_VISIBILITY_PRESET hidden) +-target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC ${BSON_LIBRARIES}) ++target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC mongo::bson_shared) + target_include_directories (mongoc_shared BEFORE PUBLIC ${MONGOC_INTERNAL_INCLUDE_DIRS}) + target_include_directories (mongoc_shared PRIVATE ${ZLIB_INCLUDE_DIRS}) + target_include_directories (mongoc_shared PRIVATE ${LIBMONGOCRYPT_INCLUDE_DIRECTORIES}) +@@ -747,7 +747,7 @@ set_target_properties (mongoc_shared PROPERTIES OUTPUT_NAME "${MONGOC_OUTPUT_BAS + + if (MONGOC_ENABLE_STATIC_BUILD) + add_library (mongoc_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) +- target_link_libraries (mongoc_static ${STATIC_LIBRARIES} ${BSON_STATIC_LIBRARIES}) ++ target_link_libraries (mongoc_static ${STATIC_LIBRARIES} mongo::bson_static) + if (NOT WIN32 AND ENABLE_PIC) + target_compile_options (mongoc_static PUBLIC -fPIC) + message ("Adding -fPIC to compilation of mongoc_static components") +diff --git a/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in b/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in +index 6f05b0c18..c23da9f61 100644 +--- a/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in ++++ b/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in +@@ -19,7 +19,7 @@ set (MONGOC_STATIC_MINOR_VERSION @MONGOC_MINOR_VERSION@) + set (MONGOC_STATIC_MICRO_VERSION @MONGOC_MICRO_VERSION@) + set (MONGOC_STATIC_VERSION @MONGOC_VERSION@) + +-find_package (libbson-static-1.0 "@MONGOC_MAJOR_VERSION@.@MONGOC_MINOR_VERSION@" REQUIRED) ++find_package (libbson-1.0 "@MONGOC_MAJOR_VERSION@.@MONGOC_MINOR_VERSION@" REQUIRED) + + @PACKAGE_INIT@ + +@@ -57,3 +57,7 @@ foreach (LIB @SASL_LIBRARIES@ @SSL_LIBRARIES@ @SHM_LIBRARIES@ @ZLIB_LIBRARIES@ + endforeach () + + set (MONGOC_STATIC_DEFINITIONS MONGOC_STATIC ${BSON_STATIC_DEFINITIONS}) ++ ++set (MONGOC_INCLUDE_DIRS ${MONGOC_STATIC_INCLUDE_DIRS}) ++set (MONGOC_LIBRARIES ${MONGOC_STATIC_LIBRARIES}) ++set (MONGOC_DEFINITIONS ${MONGOC_STATIC_DEFINITIONS}) +\ No newline at end of file +diff --git a/src/libmongoc/src/mongoc-config.cmake b/src/libmongoc/src/mongoc-config.cmake +index 7fe7cf42d..9224178e6 100644 +--- a/src/libmongoc/src/mongoc-config.cmake ++++ b/src/libmongoc/src/mongoc-config.cmake +@@ -1,3 +1,3 @@ + include(CMakeFindDependencyMacro) +-find_dependency(bson-1.0 @MONGOC_MAJOR_VERSION@.@MONGOC_MINOR_VERSION@.@MONGOC_MICRO_VERSION@) ++find_dependency(bson-1.0 @MONGOC_MAJOR_VERSION@.@MONGOC_MINOR_VERSION@.@MONGOC_MICRO_VERSION@ CONFIG REQUIRED) + include("${CMAKE_CURRENT_LIST_DIR}/mongoc-targets.cmake") diff --git a/externals/vcpkg/ports/mongo-c-driver/fix-include-directory.patch b/externals/vcpkg/ports/mongo-c-driver/fix-include-directory.patch new file mode 100755 index 000000000..8fdf45334 --- /dev/null +++ b/externals/vcpkg/ports/mongo-c-driver/fix-include-directory.patch @@ -0,0 +1,13 @@ +diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt +index a5767ac..3656efa 100644 +--- a/src/libmongoc/CMakeLists.txt ++++ b/src/libmongoc/CMakeLists.txt +@@ -998,7 +998,7 @@ else () + endif () + + set (MONGOC_HEADER_INSTALL_DIR +- "${CMAKE_INSTALL_INCLUDEDIR}/libmongoc-${MONGOC_API_VERSION}" ++ "${CMAKE_INSTALL_INCLUDEDIR}" + ) + + install ( diff --git a/externals/vcpkg/ports/mongo-c-driver/fix-static-cmake.patch b/externals/vcpkg/ports/mongo-c-driver/fix-static-cmake.patch new file mode 100755 index 000000000..bb3e018e7 --- /dev/null +++ b/externals/vcpkg/ports/mongo-c-driver/fix-static-cmake.patch @@ -0,0 +1,13 @@ +diff --git a/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in b/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in +index c23da9f..05c03e8 100644 +--- a/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in ++++ b/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in +@@ -30,7 +30,7 @@ list (APPEND MONGOC_STATIC_INCLUDE_DIRS ${BSON_STATIC_INCLUDE_DIRS}) + # directory and the base name, but not the suffix, so we use CMake's + # find_library () to pick that up. Users can override this by configuring + # MONGOC_STATIC_LIBRARY themselves. +-find_library (MONGOC_STATIC_LIBRARY mongoc-static-1.0 PATHS "@PACKAGE_LIBRARY_INSTALL_DIRS@" NO_DEFAULT_PATH) ++find_library (MONGOC_STATIC_LIBRARY mongoc-1.0 PATHS "@PACKAGE_LIBRARY_INSTALL_DIRS@" NO_DEFAULT_PATH) + if (MSVC) + set (MONGOC_STATIC_LIB_EXT "lib") + else () diff --git a/externals/vcpkg/ports/mongo-c-driver/portfile.cmake b/externals/vcpkg/ports/mongo-c-driver/portfile.cmake new file mode 100755 index 000000000..1b4967349 --- /dev/null +++ b/externals/vcpkg/ports/mongo-c-driver/portfile.cmake @@ -0,0 +1,124 @@ +# This port needs to be updated at the same time as libbson +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mongodb/mongo-c-driver + REF 00c59aa4a1f72e49e55b211f28650c66c542739e # 1.17.6 + SHA512 9191c64def45ff268cb5d2ce08782265fb8e0567237c8d3311b91e996bd938d629578a7b50e8db29c4b3aa5bc96f93361f6d918e9cfd4861e5f5c5554cf4616d + HEAD_REF master + PATCHES + fix-dependency-libbson.patch + disable-static-when-dynamic-build.patch + fix-arm-build.patch + fix-dependencies.patch + disable-source-write.patch + fix-include-directory.patch + fix-static-cmake.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "snappy" ENABLE_SNAPPY + "icu" ENABLE_ICU + "zstd" ENABLE_ZSTD +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(ENABLE_STATIC ON) +else() + set(ENABLE_STATIC OFF) +endif() + +if(VCPKG_TARGET_IS_WINDOWS) + set(ENABLE_SSL "WINDOWS") +else() + set(ENABLE_SSL "OPENSSL") +endif() + +if(VCPKG_TARGET_IS_ANDROID) + set(ENABLE_SRV OFF) + set(ENABLE_SHM_COUNTERS OFF) +else() + set(ENABLE_SRV AUTO) + set(ENABLE_SHM_COUNTERS AUTO) +endif() + +file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents) +string(JSON BUILD_VERSION GET "${_contents}" version) +file(WRITE "${SOURCE_PATH}/VERSION_CURRENT" "${BUILD_VERSION}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBSON_ROOT_DIR=${CURRENT_INSTALLED_DIR} + -DENABLE_MONGOC=ON + -DENABLE_BSON=SYSTEM + -DENABLE_TESTS=OFF + -DENABLE_EXAMPLES=OFF + -DENABLE_SRV=${ENABLE_SRV} + -DENABLE_SHM_COUNTERS=${ENABLE_SHM_COUNTERS} + -DENABLE_SSL=${ENABLE_SSL} + -DENABLE_ZLIB=SYSTEM + -DENABLE_STATIC=${ENABLE_STATIC} + -DBUILD_VERSION=${BUILD_VERSION} + -DCMAKE_DISABLE_FIND_PACKAGE_PythonInterp=ON + ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_PythonInterp +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME mongoc-1.0 CONFIG_PATH "lib/cmake/mongoc-1.0" DO_NOT_DELETE_PARENT_CONFIG_PATH) +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + vcpkg_cmake_config_fixup(PACKAGE_NAME libmongoc-1.0 CONFIG_PATH "lib/cmake/libmongoc-static-1.0") +else() + vcpkg_cmake_config_fixup(PACKAGE_NAME libmongoc-1.0 CONFIG_PATH "lib/cmake/libmongoc-1.0") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + # drop the __declspec(dllimport) when building static + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mongoc/mongoc-macros.h" + "define MONGOC_API __declspec(dllimport)" "define MONGOC_API") + + file(RENAME + "${CURRENT_PACKAGES_DIR}/share/libmongoc-1.0/libmongoc-static-1.0-config.cmake" + "${CURRENT_PACKAGES_DIR}/share/libmongoc-1.0/libmongoc-1.0-config.cmake") + file(RENAME + "${CURRENT_PACKAGES_DIR}/share/libmongoc-1.0/libmongoc-static-1.0-config-version.cmake" + "${CURRENT_PACKAGES_DIR}/share/libmongoc-1.0/libmongoc-1.0-config-version.cmake") + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") +endif() + +# Create cmake files for _both_ find_package(mongo-c-driver) and find_package(libmongoc-static-1.0)/find_package(libmongoc-1.0) +file(READ "${CURRENT_PACKAGES_DIR}/share/libmongoc-1.0/libmongoc-1.0-config.cmake" LIBMONGOC_CONFIG_CMAKE) + +# Patch: Set _IMPORT_PREFIX and replace PACKAGE_PREFIX_DIR +string(REPLACE +[[ +get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE) +]] +[[ +# VCPKG PATCH SET IMPORT_PREFIX +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +if(_IMPORT_PREFIX STREQUAL "/") + set(_IMPORT_PREFIX "") +endif() +]] + LIBMONGOC_CONFIG_CMAKE "${LIBMONGOC_CONFIG_CMAKE}") +string(REPLACE [[PACKAGE_PREFIX_DIR]] [[_IMPORT_PREFIX]] LIBMONGOC_CONFIG_CMAKE "${LIBMONGOC_CONFIG_CMAKE}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/libmongoc-1.0/libmongoc-1.0-config.cmake" "${LIBMONGOC_CONFIG_CMAKE}") + +file(COPY "${SOURCE_PATH}/THIRD_PARTY_NOTICES" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +vcpkg_fixup_pkgconfig() +file(REMOVE "${CURRENT_PACKAGES_DIR}/share/mongo-c-driver/uninstall.sh") \ No newline at end of file diff --git a/externals/vcpkg/ports/mongo-c-driver/usage b/externals/vcpkg/ports/mongo-c-driver/usage new file mode 100755 index 000000000..7176a8f4d --- /dev/null +++ b/externals/vcpkg/ports/mongo-c-driver/usage @@ -0,0 +1,9 @@ +The package mongo-c-driver is compatible with built-in CMake targets: + + find_package(mongoc-1.0 CONFIG REQUIRED) + target_link_libraries(main PRIVATE mongo::mongoc_shared) + +or: + + find_package(mongoc-1.0 CONFIG REQUIRED) + target_link_libraries(main PRIVATE mongo::mongoc_static) diff --git a/externals/vcpkg/ports/mongo-c-driver/vcpkg.json b/externals/vcpkg/ports/mongo-c-driver/vcpkg.json new file mode 100755 index 000000000..1de4c7a9f --- /dev/null +++ b/externals/vcpkg/ports/mongo-c-driver/vcpkg.json @@ -0,0 +1,43 @@ +{ + "name": "mongo-c-driver", + "version": "1.17.6", + "port-version": 2, + "description": "Client library written in C for MongoDB.", + "homepage": "https://github.com/mongodb/mongo-c-driver", + "dependencies": [ + "libbson", + { + "name": "openssl", + "platform": "!windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "features": { + "icu": { + "description": "Enable ICU support, necessary to use non-ASCII usernames or passwords", + "dependencies": [ + "icu" + ] + }, + "snappy": { + "description": "Enables snappy compressor support", + "dependencies": [ + "snappy" + ] + }, + "zstd": { + "description": "Enables zstd compressor support", + "dependencies": [ + "zstd" + ] + } + } +} diff --git a/externals/vcpkg/ports/mongo-cxx-driver/disable-c2338-mongo-cxx-driver.patch b/externals/vcpkg/ports/mongo-cxx-driver/disable-c2338-mongo-cxx-driver.patch new file mode 100755 index 000000000..eb4245c4b --- /dev/null +++ b/externals/vcpkg/ports/mongo-cxx-driver/disable-c2338-mongo-cxx-driver.patch @@ -0,0 +1,12 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2f7a16aa1..326edd332 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -14,6 +14,7 @@ + + add_definitions(-DMONGO_CXX_DRIVER_COMPILING) + add_definitions(-D_SCL_SECURE_NO_WARNINGS) ++add_definitions(-D_DISABLE_EXTENDED_ALIGNED_STORAGE) + add_subdirectory(bsoncxx) + add_subdirectory(mongocxx) + diff --git a/externals/vcpkg/ports/mongo-cxx-driver/disable_test_and_example.patch b/externals/vcpkg/ports/mongo-cxx-driver/disable_test_and_example.patch new file mode 100755 index 000000000..dde496df4 --- /dev/null +++ b/externals/vcpkg/ports/mongo-cxx-driver/disable_test_and_example.patch @@ -0,0 +1,47 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b2bc2a17c..347faa5ca 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -190,6 +190,7 @@ set (BUILD_SOURCE_DIR ${CMAKE_BINARY_DIR}) + + include (MakeDistFiles) + ++if(0) + add_custom_target(hugo_dir + COMMAND ${CMAKE_COMMAND} -E make_directory hugo + ) +@@ -248,6 +249,8 @@ add_custom_target(docs + + set(THIRD_PARTY_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/third_party) + ++endif() ++ + enable_testing() + + add_subdirectory(src) +diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt +index 480b7cd32..b890c36b6 100644 +--- a/src/bsoncxx/CMakeLists.txt ++++ b/src/bsoncxx/CMakeLists.txt +@@ -204,7 +204,7 @@ if(BSONCXX_BUILD_STATIC) + endif() + bsoncxx_install("${bsoncxx_target_list}" "${bsoncxx_pkg_dep}") + +-add_subdirectory(test) ++# add_subdirectory(test) + + set_local_dist (src_bsoncxx_DIST_local + CMakeLists.txt +diff --git a/src/mongocxx/CMakeLists.txt b/src/mongocxx/CMakeLists.txt +index f67ae35f7..b783a4716 100644 +--- a/src/mongocxx/CMakeLists.txt ++++ b/src/mongocxx/CMakeLists.txt +@@ -231,7 +231,7 @@ if(MONGOCXX_BUILD_STATIC) + endif() + mongocxx_install("${mongocxx_target_list}" "${mongocxx_pkg_dep}") + +-add_subdirectory(test) ++# add_subdirectory(test) + + set_local_dist (src_mongocxx_DIST_local + CMakeLists.txt diff --git a/externals/vcpkg/ports/mongo-cxx-driver/fix-dependencies.patch b/externals/vcpkg/ports/mongo-cxx-driver/fix-dependencies.patch new file mode 100755 index 000000000..09d9f06e7 --- /dev/null +++ b/externals/vcpkg/ports/mongo-cxx-driver/fix-dependencies.patch @@ -0,0 +1,11 @@ +diff --git a/src/bsoncxx/cmake/bsoncxx-config.cmake.in b/src/bsoncxx/cmake/bsoncxx-config.cmake.in +index 768f3dde6..6dc7f064b 100644 +--- a/src/bsoncxx/cmake/bsoncxx-config.cmake.in ++++ b/src/bsoncxx/cmake/bsoncxx-config.cmake.in +@@ -1,3 +1,6 @@ + include(CMakeFindDependencyMacro) + @BSONCXX_PKG_DEP@ ++if("@Boost_FOUND@") ++ find_dependency(Boost 1.56.0 REQUIRED) ++endif() + include("${CMAKE_CURRENT_LIST_DIR}/bsoncxx_targets.cmake") diff --git a/externals/vcpkg/ports/mongo-cxx-driver/fix-uwp.patch b/externals/vcpkg/ports/mongo-cxx-driver/fix-uwp.patch new file mode 100755 index 000000000..84a1d6ae3 --- /dev/null +++ b/externals/vcpkg/ports/mongo-cxx-driver/fix-uwp.patch @@ -0,0 +1,12 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index d1bf5e944..2f7a16aa1 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -13,6 +13,7 @@ + # limitations under the License. + + add_definitions(-DMONGO_CXX_DRIVER_COMPILING) ++add_definitions(-D_SCL_SECURE_NO_WARNINGS) + add_subdirectory(bsoncxx) + add_subdirectory(mongocxx) + diff --git a/externals/vcpkg/ports/mongo-cxx-driver/github-654.patch b/externals/vcpkg/ports/mongo-cxx-driver/github-654.patch new file mode 100755 index 000000000..61ce426e0 --- /dev/null +++ b/externals/vcpkg/ports/mongo-cxx-driver/github-654.patch @@ -0,0 +1,16 @@ +diff --git a/src/mongocxx/instance.cpp b/src/mongocxx/instance.cpp +index f12bd84a8..acc570fa9 100644 +--- a/src/mongocxx/instance.cpp ++++ b/src/mongocxx/instance.cpp +@@ -75,9 +75,10 @@ typename std::aligned_storage::type sentine + std::atomic current_instance{nullptr}; + static_assert(std::is_standard_layout::value, + "Must be standard layout"); ++#if (!defined(_MSVC_STL_VERSION)) + static_assert(std::is_trivially_destructible::value, + "Must be trivially destructible"); +- ++#endif + } // namespace + + class instance::impl { diff --git a/externals/vcpkg/ports/mongo-cxx-driver/portfile.cmake b/externals/vcpkg/ports/mongo-cxx-driver/portfile.cmake new file mode 100755 index 000000000..4b03c74d3 --- /dev/null +++ b/externals/vcpkg/ports/mongo-cxx-driver/portfile.cmake @@ -0,0 +1,111 @@ +set(VERSION_MAJOR 3) +set(VERSION_MINOR 6) +set(VERSION_PATCH 5) +set(VERSION_FULL ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) +set(BSONCXX_STANDARD 11) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mongodb/mongo-cxx-driver + REF r${VERSION_FULL} + SHA512 fe304d2f406f65d79a030dcfd1509543a9ab3057e46328d5ca1fc58da04758b9a2c6666a6194d574f9b42022324972d41c37d00d6fba87dfba63fbfb99e821de + HEAD_REF master + PATCHES + fix-uwp.patch + disable-c2338-mongo-cxx-driver.patch + disable_test_and_example.patch + github-654.patch + fix-dependencies.patch +) + +if ("mnmlstc" IN_LIST FEATURES) + if (VCPKG_TARGET_IS_WINDOWS) + message(FATAL_ERROR "Feature mnmlstc only supports UNIX") + endif() + set(BSONCXX_POLY MNMLSTC) +elseif ("system-mnmlstc" IN_LIST FEATURES) + message("Please make sure you have mnmlstc installed via the package manager") + set(BSONCXX_POLY SYSTEM_MNMLSTC) +elseif ("boost" IN_LIST FEATURES) + set(BSONCXX_POLY BOOST) +elseif("std-experimental" IN_LIST FEATURES) + set(BSONCXX_POLY STD_EXPERIMENTAL) + set(BSONCXX_STANDARD 17) +else() + if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(BSONCXX_POLY BOOST) + else() + set(BSONCXX_POLY MNMLSTC) + endif() +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DMONGOCXX_HEADER_INSTALL_DIR=include + -DBSONCXX_HEADER_INSTALL_DIR=include + -DBSONCXX_POLY_USE_${BSONCXX_POLY}=1 + -DCMAKE_CXX_STANDARD=${BSONCXX_STANDARD} + -DBUILD_VERSION=${VERSION_FULL} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME bsoncxx CONFIG_PATH "lib/cmake/bsoncxx-${VERSION_FULL}" DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME mongocxx CONFIG_PATH "lib/cmake/mongocxx-${VERSION_FULL}") + +file(WRITE "${CURRENT_PACKAGES_DIR}/share/libbsoncxx/libbsoncxx-config.cmake" +" +message(WARNING \"This CMake target is deprecated. Use mongo::bsoncxx instead.\") + +set(LIBBSONCXX_VERSION_MAJOR ${VERSION_MAJOR}) +set(LIBBSONCXX_VERSION_MINOR ${VERSION_MINOR}) +set(LIBBSONCXX_VERSION_PATCH ${VERSION_PATCH}) +set(LIBBSONCXX_PACKAGE_VERSION ${VERSION_FULL}) + +include(CMakeFindDependencyMacro) +find_dependency(bsoncxx CONFIG REQUIRED) +get_filename_component(LIBBSONCXX_INCLUDE_DIRS \"\${CMAKE_CURRENT_LIST_DIR}/../../include\" ABSOLUTE) +if (TARGET mongo::bsoncxx_shared) + set(LIBBSONCXX_LIBRARIES mongo::bsoncxx_shared) +else() + set(LIBBSONCXX_LIBRARIES mongo::bsoncxx_static) +endif() +" +) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/libmongocxx/libmongocxx-config.cmake +" +message(WARNING \"This CMake target is deprecated. Use mongo::mongocxx instead.\") + +set(LIBMONGOCXX_VERSION_MAJOR ${VERSION_MAJOR}) +set(LIBMONGOCXX_VERSION_MINOR ${VERSION_MINOR}) +set(LIBMONGOCXX_VERSION_PATCH ${VERSION_PATCH}) +set(LIBMONGOCXX_PACKAGE_VERSION ${VERSION_FULL}) + +include(CMakeFindDependencyMacro) +find_dependency(mongocxx CONFIG REQUIRED) +get_filename_component(LIBMONGOCXX_INCLUDE_DIRS \"\${CMAKE_CURRENT_LIST_DIR}/../../include\" ABSOLUTE) +if (TARGET mongo::bsoncxx_shared) + set(LIBMONGOCXX_LIBRARIES mongo::mongocxx_shared) +else() + set(LIBMONGOCXX_LIBRARIES mongo::mongocxx_static) +endif() +" +) + +vcpkg_fixup_pkgconfig() + +if (NOT BSONCXX_POLY STREQUAL MNMLSTC) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/bsoncxx/third_party") +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include" +) +file(REMOVE "${CURRENT_PACKAGES_DIR}/share/${PORT}/uninstall.sh") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(COPY "${SOURCE_PATH}/THIRD-PARTY-NOTICES" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/mongo-cxx-driver/vcpkg.json b/externals/vcpkg/ports/mongo-cxx-driver/vcpkg.json new file mode 100755 index 000000000..c76a2a49a --- /dev/null +++ b/externals/vcpkg/ports/mongo-cxx-driver/vcpkg.json @@ -0,0 +1,37 @@ +{ + "name": "mongo-cxx-driver", + "version": "3.6.5", + "port-version": 3, + "description": "MongoDB C++ Driver.", + "homepage": "https://github.com/mongodb/mongo-cxx-driver", + "license": "Apache-2.0", + "dependencies": [ + "boost-optional", + "boost-smart-ptr", + "boost-utility", + "libbson", + "mongo-c-driver", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "boost": { + "description": "Use Boost C++17 polyfill. The only option under MSVC." + }, + "mnmlstc": { + "description": "Use MNMLSTC/core C++17 polyfill." + }, + "std-experimental": { + "description": "Use optional and string_view from std::experimental." + }, + "system-mnmlstc": { + "description": "Use an available version of MNMLSTC on your system as C++17 polyfill." + } + } +} diff --git a/externals/vcpkg/ports/mongoose/CMakeLists.txt b/externals/vcpkg/ports/mongoose/CMakeLists.txt new file mode 100755 index 000000000..ae2cce34c --- /dev/null +++ b/externals/vcpkg/ports/mongoose/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.14) + +project(mongoose C) + +include(GNUInstallDirs) + +option(ENABLE_SSL "Build with openssl support" OFF) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +add_library(mongoose mongoose.c) +target_include_directories(mongoose PUBLIC $) +set_target_properties(mongoose PROPERTIES PUBLIC_HEADER mongoose.h) + +if (ENABLE_SSL) + find_package(OpenSSL REQUIRED) + target_compile_options(mongoose PRIVATE -DMG_ENABLE_SSL) + target_link_libraries(mongoose PRIVATE OpenSSL::SSL OpenSSL::Crypto) +endif() + +install(TARGETS mongoose EXPORT unofficial-mongoose-config) + +install( + EXPORT unofficial-mongoose-config + NAMESPACE unofficial::mongoose:: + DESTINATION share/unofficial-mongoose + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +) diff --git a/externals/vcpkg/ports/mongoose/portfile.cmake b/externals/vcpkg/ports/mongoose/portfile.cmake new file mode 100755 index 000000000..e9c0f9903 --- /dev/null +++ b/externals/vcpkg/ports/mongoose/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cesanta/mongoose + REF 1b82aa02aa3d6fecfc23ed0a94c6917f139de1ad #v7.6 + SHA512 50f13a2cc5dca6ccbc30e9686166b8615faad0ea010966d215d583c04338396a5d2613fe065cc17d8f918673b20004596ca8f73f1b636679db82dbb063698a80 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + ssl ENABLE_SSL +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unofficial-${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/mongoose/vcpkg.json b/externals/vcpkg/ports/mongoose/vcpkg.json new file mode 100755 index 000000000..b8f4f4e1a --- /dev/null +++ b/externals/vcpkg/ports/mongoose/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "mongoose", + "version": "7.6", + "description": "Embedded web server / embedded networking library", + "homepage": "https://cesanta.com/", + "license": null, + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "ssl": { + "description": "Build with openssl", + "dependencies": [ + "openssl" + ] + } + } +} diff --git a/externals/vcpkg/ports/monkeys-audio/fix-project-config.patch b/externals/vcpkg/ports/monkeys-audio/fix-project-config.patch new file mode 100755 index 000000000..549f9bd64 --- /dev/null +++ b/externals/vcpkg/ports/monkeys-audio/fix-project-config.patch @@ -0,0 +1,16 @@ +--- a/Source/Projects/VS2019/MACDll/MACDll.vcxproj 2020-12-23 21:42:15.830541000 +0100 ++++ b/Source/Projects/VS2019/MACDll/MACDll.vcxproj 2020-12-29 06:07:36.101967600 +0100 +@@ -74,11 +74,9 @@ + <_ProjectFileVersion>11.0.50727.1 + + +- C:\Applications\Cool Edit Pro\ ++ $(Configuration)\ + $(Configuration)\ +- true +- APE +- .flt ++ false + + + $(Configuration)\ diff --git a/externals/vcpkg/ports/monkeys-audio/license b/externals/vcpkg/ports/monkeys-audio/license new file mode 100755 index 000000000..a4ab2f09a --- /dev/null +++ b/externals/vcpkg/ports/monkeys-audio/license @@ -0,0 +1,42 @@ +Monkey's Audio Program License Agreement +======================================== + +1. Monkey's Audio is completely free for personal, educational, or commercial use. + +2. Although the software has been tested thoroughly, the author is in no way responsible for + damages due to bugs or misuse. + +3. The redistribution of Monkey's Audio is only allowed in cases where the original installer and + components therein have not been modified. + +4. The use of Monkey's Audio or any component thereof from another program requires + compliance with the 'Monkey's Audio SDK and Source Code License Agreement'. + +5. Installing and using Monkey's Audio signifies the acceptance of these terms. If you do not + agree with any of the above terms, you must cease using Monkey's Audio and remove it from + your storage device. + + +Monkey's Audio SDK and Source Code License Agreement +==================================================== + +1. The Monkey's Audio SDK and source code can be freely used to add APE format playback, + encoding, or tagging support to any product, free or commercial. + +2. Monkey's Audio source can be included in GPL and open-source software, although Monkey's + Audio itself will not be subjected to external licensing requirements or other viral source + restrictions. + +3. Code changes and improvements must be contributed back to the Monkey's Audio project or + made freely available, unless exempted by written consent of the author. + +4. Any source code, ideas, or libraries used must be plainly acknowledged in the software using + the code. + +5. Although the software has been tested thoroughly, the author is in no way responsible for + damages due to bugs or misuse. + +6. If you do not completely agree with all of the previous stipulations, you must cease using this + source code and remove it from your storage device. + +All materials and programs copyrighted ©2000-2018 by Matt Ashland diff --git a/externals/vcpkg/ports/monkeys-audio/portfile.cmake b/externals/vcpkg/ports/monkeys-audio/portfile.cmake new file mode 100755 index 000000000..39cc57853 --- /dev/null +++ b/externals/vcpkg/ports/monkeys-audio/portfile.cmake @@ -0,0 +1,71 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) + +set(MA_VERSION 570) + +vcpkg_download_distfile(ARCHIVE + URLS "https://monkeysaudio.com/files/MAC_SDK_${MA_VERSION}.zip" + "https://web.archive.org/web/20201229182615if_/https://monkeysaudio.com/files/MAC_SDK_570.zip" + FILENAME "MAC_SDK_${MA_VERSION}.zip" + SHA512 d3b5a10574dde1ea90578959378b87f8a8c94b3cc7198bc51b86f7128d66117d706c191d56a699dce0c2a53b7722e0893cb614f96f9ad725a266a871da587fd4 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL + PATCHES + fix-project-config.patch + remove-certificate-step.patch +) + +file(REMOVE_RECURSE + ${SOURCE_PATH}/Shared/32 + ${SOURCE_PATH}/Shared/64 +) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(PLATFORM Win32) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(PLATFORM x64) +else() + message(FATAL_ERROR "Unsupported architecture") +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH Source/Projects/VS2019/MACDll/MACDll.vcxproj + PLATFORM ${PLATFORM} + ) +else() + vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH Source/Projects/VS2019/MACLib/MACLib.vcxproj + PLATFORM ${PLATFORM} + ) +endif() + +if ("tools" IN_LIST FEATURES) + vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH Source/Projects/VS2019/Console/Console.vcxproj + PLATFORM ${PLATFORM} + ) + + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/Console.lib ${CURRENT_PACKAGES_DIR}/debug/lib/Console.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/monkeys-audio/Console.exe ${CURRENT_PACKAGES_DIR}/tools/monkeys-audio/mac.exe) + + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/MACLib.lib ${CURRENT_PACKAGES_DIR}/debug/lib/MACLib.lib) +endif() + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${SOURCE_PATH}/Shared/ + DESTINATION ${CURRENT_PACKAGES_DIR}/include/monkeys-audio + FILES_MATCHING PATTERN "*.h") +file(REMOVE ${CURRENT_PACKAGES_DIR}/include/monkeys-audio/MACDll.h) + +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/license DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/monkeys-audio/remove-certificate-step.patch b/externals/vcpkg/ports/monkeys-audio/remove-certificate-step.patch new file mode 100755 index 000000000..16fb24d2a --- /dev/null +++ b/externals/vcpkg/ports/monkeys-audio/remove-certificate-step.patch @@ -0,0 +1,24 @@ +--- a/Source/Projects/VS2019/Console/Console.vcxproj 2020-12-23 21:42:15.672211100 +0100 ++++ b/Source/Projects/VS2019/Console/Console.vcxproj 2020-12-29 05:29:53.916306700 +0100 +@@ -180,10 +180,6 @@ + + MachineX86 + +- +- C:\MAC\Current\Source\Certificate\signtool.exe sign /t http://timestamp.digicert.com /f C:\MAC\Current\Source\Certificate\MAC3.pfx /p password /v "$(TargetPath)" +-C:\MAC\Current\Source\Certificate\signtool.exe sign /f C:\MAC\Current\Source\Certificate\MAC3.pfx /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td sha256 /fd sha256 /a /as /p password "$(TargetPath)" +- + + + +@@ -273,10 +269,6 @@ + + MachineX64 + +- +- C:\MAC\Current\Source\Certificate\signtool.exe sign /t http://timestamp.digicert.com /f C:\MAC\Current\Source\Certificate\MAC3.pfx /p password /v "$(TargetPath)" +-C:\MAC\Current\Source\Certificate\signtool.exe sign /f C:\MAC\Current\Source\Certificate\MAC3.pfx /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td sha256 /fd sha256 /a /as /p password "$(TargetPath)" +- + + + diff --git a/externals/vcpkg/ports/monkeys-audio/vcpkg.json b/externals/vcpkg/ports/monkeys-audio/vcpkg.json new file mode 100755 index 000000000..208a85119 --- /dev/null +++ b/externals/vcpkg/ports/monkeys-audio/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "monkeys-audio", + "version": "5.70", + "port-version": 2, + "description": [ + "Monkey's Audio is an excellent audio compression tool which has multiple advantages over traditional methods.", + "Audio files compressed with it end with .ape extension." + ], + "homepage": "https://monkeysaudio.com", + "supports": "!(uwp | osx | linux)", + "features": { + "tools": { + "description": "Build monkeys-audio tools" + } + } +} diff --git a/externals/vcpkg/ports/moos-core/cmake_fix.patch b/externals/vcpkg/ports/moos-core/cmake_fix.patch new file mode 100755 index 000000000..96c569c2c --- /dev/null +++ b/externals/vcpkg/ports/moos-core/cmake_fix.patch @@ -0,0 +1,48 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 75f367f..6ef3dc2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -190,7 +190,7 @@ add_subdirectory(Core) + export( + TARGETS MOOS + NAMESPACE MOOS:: +- FILE UseMOOS.cmake ++ FILE UseMOOSTargets.cmake + ) + + # Support existing projects that expect to find MOOS_LIBRARIES and +@@ -222,7 +222,7 @@ set(PROJECT_CONFIG_PATH "lib/cmake/MOOS") + install( + EXPORT MOOS + NAMESPACE MOOS:: +- FILE UseMOOS.cmake ++ FILE UseMOOSTargets.cmake + DESTINATION ${PROJECT_CONFIG_PATH} + ) + +diff --git a/Core/libMOOS/CMakeLists.txt b/Core/libMOOS/CMakeLists.txt +index b74a30f..492df50 100644 +--- a/Core/libMOOS/CMakeLists.txt ++++ b/Core/libMOOS/CMakeLists.txt +@@ -196,7 +196,7 @@ mark_as_advanced(TIME_WARP_AGGLOMERATION_CONSTANT) + install( + DIRECTORY ${INCLUDE_ROOTS} + DESTINATION . +- FILES_MATCHING PATTERN "*.h" PATTERN "*.hxx" ++ FILES_MATCHING PATTERN "*.h" PATTERN "*.hxx" PATTERN "*.hpp" + ) + + # install libraries +diff --git a/MOOSConfig.cmake.in b/MOOSConfig.cmake.in +index 10af599..dff769a 100644 +--- a/MOOSConfig.cmake.in ++++ b/MOOSConfig.cmake.in +@@ -2,7 +2,7 @@ + + # Pick up the auto-generated file which knows how to add the imported library + # targets for the libraries that MOOS exports. +-set(exports_file "${CMAKE_CURRENT_LIST_DIR}/UseMOOS.cmake") ++set(exports_file "${CMAKE_CURRENT_LIST_DIR}/UseMOOSTargets.cmake") + include(${exports_file}) + + include(FindPackageHandleStandardArgs) diff --git a/externals/vcpkg/ports/moos-core/portfile.cmake b/externals/vcpkg/ports/moos-core/portfile.cmake new file mode 100755 index 000000000..197467428 --- /dev/null +++ b/externals/vcpkg/ports/moos-core/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO themoos/core-moos + REF v10.4.0 + SHA512 8a82074bd219bbedbe56c2187afe74a55a252b0654a675c64d1f75e62353b0874e7b405d9f677fadb297e955d11aea50a07e8f5f3546be3c4ddab76fe356a51e + HEAD_REF master + PATCHES + cmake_fix.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DCMAKE_ENABLE_EXPORT=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/MOOS) + +# Stage tools +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/${PORT}) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/debug/include) + +# Put the licence file where vcpkg expects it +file(COPY ${SOURCE_PATH}/Core/GPLCore.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) diff --git a/externals/vcpkg/ports/moos-core/vcpkg.json b/externals/vcpkg/ports/moos-core/vcpkg.json new file mode 100755 index 000000000..43a01cf25 --- /dev/null +++ b/externals/vcpkg/ports/moos-core/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "moos-core", + "version-string": "10.4.0", + "port-version": 6, + "description": "A very light weight, easy to use middleware.", + "homepage": "https://sites.google.com/site/moossoftware/" +} diff --git a/externals/vcpkg/ports/moos-essential/fix.patch b/externals/vcpkg/ports/moos-essential/fix.patch new file mode 100755 index 000000000..0020c6a71 --- /dev/null +++ b/externals/vcpkg/ports/moos-essential/fix.patch @@ -0,0 +1,23 @@ +diff --git a/Essentials/pShare/CMakeLists.txt b/Essentials/pShare/CMakeLists.txt +index 5128a50..7fee919 100644 +--- a/Essentials/pShare/CMakeLists.txt ++++ b/Essentials/pShare/CMakeLists.txt +@@ -20,4 +20,4 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/pshare_test_scripts DESTINATION ${CMAKE_RU + + add_custom_command(TARGET pShare POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory +- ${CMAKE_SOURCE_DIR}/pshare_test_scripts ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) ++ ${CMAKE_SOURCE_DIR}/Essentials/pShare/pshare_test_scripts ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +diff --git a/Essentials/pShare/Share.cpp b/Essentials/pShare/Share.cpp +index 7825e00..756a760 100644 +--- a/Essentials/pShare/Share.cpp ++++ b/Essentials/pShare/Share.cpp +@@ -17,7 +17,7 @@ + + #include "MOOS/libMOOS/Utils/MOOSUtilityFunctions.h" + #include "MOOS/libMOOS/Utils/IPV4Address.h" +-#include "MOOS/libMOOS/Thirdparty/getpot/GetPot" ++#include "MOOS/libMOOS/Thirdparty/getpot/GetPot.hpp" + #include "MOOS/libMOOS/Utils/SafeList.h" + #include "MOOS/libMOOS/Utils/ConsoleColours.h" + #include "MOOS/libMOOS/Utils/KeyboardCapture.h" diff --git a/externals/vcpkg/ports/moos-essential/portfile.cmake b/externals/vcpkg/ports/moos-essential/portfile.cmake new file mode 100755 index 000000000..daebe0f04 --- /dev/null +++ b/externals/vcpkg/ports/moos-essential/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO themoos/essential-moos + REF b897ea86dba8b61412dc48ac0cfb5ff34cdaf5f6 + SHA512 7284744d211dcdcb0cd321eec96f3632ccda690e8894261f4f09a06bc8faefb2de68f4f2f755f4eeef5bb586044e98ac65cdd18c15193a1a4632bd2f4208c52f + HEAD_REF master + PATCHES + fix.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/MOOS) +if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/pAntler") + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/pAntler ${CURRENT_PACKAGES_DIR}/tools/MOOS/pAntler) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/pLogger ${CURRENT_PACKAGES_DIR}/tools/MOOS/pLoggers) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/pMOOSBridge ${CURRENT_PACKAGES_DIR}/tools/MOOS/pMOOSBridge) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/pScheduler ${CURRENT_PACKAGES_DIR}/tools/MOOS/pScheduler) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/pShare ${CURRENT_PACKAGES_DIR}/tools/MOOS/pShare) +endif() + + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug) +endif() + +file(WRITE ${CURRENT_PACKAGES_DIR}/include/fake_header.h "// fake header to pass vcpkg post install check \n") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "see moos-core for copyright\n" ) diff --git a/externals/vcpkg/ports/moos-essential/vcpkg.json b/externals/vcpkg/ports/moos-essential/vcpkg.json new file mode 100755 index 000000000..48da1769f --- /dev/null +++ b/externals/vcpkg/ports/moos-essential/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "moos-essential", + "version-string": "10.0.1", + "port-version": 3, + "description": "a set of useful applications that leverage the core-moos communications layer.", + "homepage": "https://sites.google.com/site/moossoftware/", + "dependencies": [ + "moos-core" + ] +} diff --git a/externals/vcpkg/ports/moos-ui/portfile.cmake b/externals/vcpkg/ports/moos-ui/portfile.cmake new file mode 100755 index 000000000..e3f0dd4ee --- /dev/null +++ b/externals/vcpkg/ports/moos-ui/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO themoos/ui-moos + REF ba7dd1db7db1848acb3e68b9e54d3da9d7014684 + SHA512 96225216973656a9029d4e8ac8a8b69df15db5c160bcbd02755cd291bfe5817dbde3a6a5f46b71a138ddf4a389c3c702d4d502ade91ad88554042d7b9d75f843 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_CONSOLE_TOOLS=ON + -DBUILD_GRAPHICAL_TOOLS=OFF #${BUILD_GRAPHICAL_TOOLS} +) + +vcpkg_install_cmake() + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/MOOS) +if (VCPKG_TARGET_IS_WINDOWS) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/uPoke.exe ${CURRENT_PACKAGES_DIR}/tools/MOOS/uPoke.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/iRemoteLite.exe ${CURRENT_PACKAGES_DIR}/tools/MOOS/iRemoteLite.exe) +else() + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/uPoke ${CURRENT_PACKAGES_DIR}/tools/MOOS/uPoke) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/iRemoteLite ${CURRENT_PACKAGES_DIR}/tools/MOOS/iRemoteLite) +endif() +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/MOOS) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug) + +file(WRITE ${CURRENT_PACKAGES_DIR}/include/fake_header_ui.h "// fake header to pass vcpkg post install check \n") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "see moos-core for copyright\n" ) diff --git a/externals/vcpkg/ports/moos-ui/vcpkg.json b/externals/vcpkg/ports/moos-ui/vcpkg.json new file mode 100755 index 000000000..8dfc9307b --- /dev/null +++ b/externals/vcpkg/ports/moos-ui/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "moos-ui", + "version-string": "10.0.1", + "port-version": 3, + "description": "set of user interface tools to use and leverage the MOOS project.", + "homepage": "https://sites.google.com/site/moossoftware/", + "dependencies": [ + "moos-core" + ] +} diff --git a/externals/vcpkg/ports/morton-nd/portfile.cmake b/externals/vcpkg/ports/morton-nd/portfile.cmake new file mode 100755 index 000000000..bd2d6dd00 --- /dev/null +++ b/externals/vcpkg/ports/morton-nd/portfile.cmake @@ -0,0 +1,30 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kevinhartman/morton-nd + REF v4.0.0 + SHA512 19dc51ae5d7fc868625a9c9f0dddec95a77fdeac714300033008f096bc3a83f146738e525e8a0ec541903263355a7fec84b1873d8eacfca4b93d3cd8945653da + HEAD_REF main +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE + PREFER_NINJA + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/morton-nd/cmake TARGET_PATH) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug + ${CURRENT_PACKAGES_DIR}/share/doc +) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(COPY ${SOURCE_PATH}/NOTICE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/externals/vcpkg/ports/morton-nd/vcpkg.json b/externals/vcpkg/ports/morton-nd/vcpkg.json new file mode 100755 index 000000000..c1cc4907c --- /dev/null +++ b/externals/vcpkg/ports/morton-nd/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "morton-nd", + "version-string": "4.0.0", + "port-version": 1, + "description": "header-only constexpr library for fast Morton encoding/decoding in N dimensions.", + "homepage": "https://github.com/kevinhartman/morton-nd" +} diff --git a/externals/vcpkg/ports/mosquitto/0002-win64-support.patch b/externals/vcpkg/ports/mosquitto/0002-win64-support.patch new file mode 100755 index 000000000..c140a7873 --- /dev/null +++ b/externals/vcpkg/ports/mosquitto/0002-win64-support.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2775a3da..ddd81b04 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -67,12 +67,7 @@ option(WITH_THREADING "Include client library threading support?" ON) + if (WITH_THREADING) + add_definitions("-DWITH_THREADING") + if (WIN32) +- if (CMAKE_CL_64) +- set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x64\\pthreadVC2.lib) +- else (CMAKE_CL_64) +- set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x86\\pthreadVC2.lib) +- endif (CMAKE_CL_64) +- set (PTHREAD_INCLUDE_DIR C:\\pthreads\\Pre-built.2\\include) ++ find_package(pthread REQUIRED) + elseif (ANDROID) + set (PTHREAD_LIBRARIES "") + set (PTHREAD_INCLUDE_DIR "") diff --git a/externals/vcpkg/ports/mosquitto/0003-add-find_package-libwebsockets.patch b/externals/vcpkg/ports/mosquitto/0003-add-find_package-libwebsockets.patch new file mode 100755 index 000000000..fc61ddfd5 --- /dev/null +++ b/externals/vcpkg/ports/mosquitto/0003-add-find_package-libwebsockets.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2775a3da..ef7ce14a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -55,6 +55,7 @@ endif (WITH_UNIX_SOCKETS AND NOT WIN32) + + option(WITH_SOCKS "Include SOCKS5 support?" ON) + if (WITH_SOCKS) ++ find_package(Libwebsockets CONFIG REQUIRED) + add_definitions("-DWITH_SOCKS") + endif (WITH_SOCKS) + diff --git a/externals/vcpkg/ports/mosquitto/0004-support-static-build.patch b/externals/vcpkg/ports/mosquitto/0004-support-static-build.patch new file mode 100755 index 000000000..858357303 --- /dev/null +++ b/externals/vcpkg/ports/mosquitto/0004-support-static-build.patch @@ -0,0 +1,42 @@ +diff --git a/apps/mosquitto_passwd/CMakeLists.txt b/apps/mosquitto_passwd/CMakeLists.txt +index 13a7d826..5e96f49c 100644 +--- a/apps/mosquitto_passwd/CMakeLists.txt ++++ b/apps/mosquitto_passwd/CMakeLists.txt +@@ -13,6 +13,10 @@ if (WITH_TLS) + ) + + +- target_link_libraries(mosquitto_passwd ${OPENSSL_LIBRARIES}) ++ if(WIN32) ++ target_link_libraries(mosquitto_passwd ${OPENSSL_LIBRARIES} ws2_32 crypt32) ++ else() ++ target_link_libraries(mosquitto_passwd ${OPENSSL_LIBRARIES}) ++ endif() + install(TARGETS mosquitto_passwd RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + endif (WITH_TLS) +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 31cc35e3..a1a3e01a 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -69,7 +69,7 @@ if (UNIX AND NOT APPLE AND NOT ANDROID) + endif (UNIX AND NOT APPLE AND NOT ANDROID) + + if (WIN32) +- set (LIBRARIES ${LIBRARIES} ws2_32) ++ set (LIBRARIES ${LIBRARIES} ws2_32 crypt32) + endif (WIN32) + + if (WITH_SRV) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9380a046..62ce99e5 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -189,7 +189,7 @@ if (UNIX) + endif (UNIX) + + if (WIN32) +- set (MOSQ_LIBS ${MOSQ_LIBS} ws2_32) ++ set (MOSQ_LIBS ${MOSQ_LIBS} ws2_32 crypt32) + endif (WIN32) + + if (WITH_WEBSOCKETS) diff --git a/externals/vcpkg/ports/mosquitto/0005-websocket-shared-lib-name.patch b/externals/vcpkg/ports/mosquitto/0005-websocket-shared-lib-name.patch new file mode 100755 index 000000000..4ce8a8267 --- /dev/null +++ b/externals/vcpkg/ports/mosquitto/0005-websocket-shared-lib-name.patch @@ -0,0 +1,20 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9380a046..f2929e19 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -194,13 +194,13 @@ endif (WIN32) + + if (WITH_WEBSOCKETS) + if (STATIC_WEBSOCKETS) +- set (MOSQ_LIBS ${MOSQ_LIBS} websockets_static) ++ set (MOSQ_LIBS ${MOSQ_LIBS} websockets) + if (WIN32) + set (MOSQ_LIBS ${MOSQ_LIBS} iphlpapi) + link_directories(${mosquitto_SOURCE_DIR}) + endif (WIN32) + else (STATIC_WEBSOCKETS) +- set (MOSQ_LIBS ${MOSQ_LIBS} websockets) ++ set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared) + endif (STATIC_WEBSOCKETS) + endif (WITH_WEBSOCKETS) + diff --git a/externals/vcpkg/ports/mosquitto/portfile.cmake b/externals/vcpkg/ports/mosquitto/portfile.cmake new file mode 100755 index 000000000..ab11f068f --- /dev/null +++ b/externals/vcpkg/ports/mosquitto/portfile.cmake @@ -0,0 +1,76 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO eclipse/mosquitto + HEAD_REF master + REF v2.0.14 + SHA512 4b7066acd7d8ecb05fef6089997632381c34ce6631b7106afedf95b7f72d7280e45c9b2f8cce49349bf599520770ebbebb68ff71930bc44b615d177b4056a945 + PATCHES + 0002-win64-support.patch + 0003-add-find_package-libwebsockets.patch + 0004-support-static-build.patch + 0005-websocket-shared-lib-name.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC_LINKAGE) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DWITH_STATIC_LIBRARIES=${STATIC_LINKAGE} + -DWITH_SRV=OFF + -DWITH_WEBSOCKETS=ON + -DSTATIC_WEBSOCKETS=${STATIC_LINKAGE} + -DWITH_TLS=ON + -DWITH_TLS_PSK=ON + -DWITH_THREADING=ON + -DDOCUMENTATION=OFF + -DWITH_PLUGINS=OFF + -DWITH_CJSON=OFF + -DWITH_CLIENTS=OFF + -DWITH_APPS=OFF + -DWITH_BROKER=OFF + -DWITH_BUNDLED_DEPS=OFF + MAYBE_UNUSED_VARIABLES + WITH_WEBSOCKETS + STATIC_WEBSOCKETS +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") + + file(GLOB VERSIONED_LIBRARIES LIST_DIRECTORIES FALSE + "${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.*" + "${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.*" + "${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.*" + "${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.*" + ) + + if(NOT "x${VERSIONED_LIBRARIES}x" STREQUAL "xx") + file(REMOVE ${VERSIONED_LIBRARIES}) + endif() + + if(NOT "x${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}x" STREQUAL "xx") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}") + endif() +endif() + +configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/mosquitto/usage b/externals/vcpkg/ports/mosquitto/usage new file mode 100755 index 000000000..1f4e6735c --- /dev/null +++ b/externals/vcpkg/ports/mosquitto/usage @@ -0,0 +1,5 @@ +The package mosquitto provides CMake targets: + + find_package(mosquitto REQUIRED) + target_include_directories(main PRIVATE ${MOSQUITTO_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${MOSQUITTO_LIBRARIES}) diff --git a/externals/vcpkg/ports/mosquitto/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/mosquitto/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..fb7f71dc0 --- /dev/null +++ b/externals/vcpkg/ports/mosquitto/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,15 @@ +include(FindPackageHandleStandardArgs) +include(SelectLibraryConfigurations) + +find_path(MOSQUITTO_INCLUDE_DIR mosquitto.h) + +find_library(MOSQUITTO_LIBRARY_DEBUG NAMES mosquitto libmosquitto mosquitto_static libmosquitto_static NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED) +find_library(MOSQUITTO_LIBRARY_RELEASE NAMES mosquitto libmosquitto mosquitto_static libmosquitto_static NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED) +find_library(MOSQUITTOPP_LIBRARY_DEBUG NAMES mosquittopp libmosquittopp mosquittopp_static libmosquittopp_static NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED) +find_library(MOSQUITTOPP_LIBRARY_RELEASE NAMES mosquittopp libmosquittopp mosquittopp_static libmosquittopp_static NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED) + +select_library_configurations(MOSQUITTO) +select_library_configurations(MOSQUITTOPP) + +set(MOSQUITTO_INCLUDE_DIRS ${MOSQUITTO_INCLUDE_DIR}) +set(MOSQUITTO_LIBRARIES ${MOSQUITTO_LIBRARY} ${MOSQUITTOPP_LIBRARY}) diff --git a/externals/vcpkg/ports/mosquitto/vcpkg.json b/externals/vcpkg/ports/mosquitto/vcpkg.json new file mode 100755 index 000000000..db3138070 --- /dev/null +++ b/externals/vcpkg/ports/mosquitto/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "mosquitto", + "version": "2.0.14", + "description": "Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1, MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model, This makes it suitable for machine to machine messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino", + "homepage": "https://mosquitto.org/", + "license": "EPL-2.0", + "dependencies": [ + "c-ares", + "libwebsockets", + "openssl", + "pthreads", + "uthash", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/mozjpeg/fix-install-error.patch b/externals/vcpkg/ports/mozjpeg/fix-install-error.patch new file mode 100755 index 000000000..da8ecce9f --- /dev/null +++ b/externals/vcpkg/ports/mozjpeg/fix-install-error.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ae07280..54dc4f3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1487,7 +1487,7 @@ if(ENABLE_STATIC) + endif() + endif() + +-install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++#install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg + ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt diff --git a/externals/vcpkg/ports/mozjpeg/portfile.cmake b/externals/vcpkg/ports/mozjpeg/portfile.cmake new file mode 100755 index 000000000..2cd6bbdf7 --- /dev/null +++ b/externals/vcpkg/ports/mozjpeg/portfile.cmake @@ -0,0 +1,60 @@ +if(EXISTS "${CURRENT_INSTALLED_DIR}/share/libjpeg-turbo/copyright") + message(FATAL_ERROR "Can't build ${PORT} if libjpeg-turbo is installed. Please remove libjpeg-turbo:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mozilla/mozjpeg + REF 512a7c3a51071981e4b314c9bc029f1daa3fb72b #2021-09-27 + SHA512 bdada9757bec5e02533d976a988210e59e37a07aa9dd321d29f18161d4143a1398c004b210d05748aa61a9005411b46e9e0bfa37af2b45570e45020fbc28f551 + HEAD_REF master + PATCHES + fix-install-error.patch +) + +vcpkg_find_acquire_program(NASM) +get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) +vcpkg_add_to_path(${NASM_EXE_PATH}) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" WITH_CRT_DLL) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENABLE_SHARED=${ENABLE_SHARED} + -DENABLE_STATIC=${ENABLE_STATIC} + -DWITH_CRT_DLL=${WITH_CRT_DLL} +) + +vcpkg_cmake_install() + +# Rename libraries for static builds +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/jpeg.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/turbojpeg.lib") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib") + endif() +endif() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mozjpeg) +# Remove extra debug files +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_copy_tools(TOOL_NAMES cjpeg djpeg jpegtran tjbench AUTO_CLEAN) +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +# Remove empty folders after static build +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/mozjpeg/vcpkg.json b/externals/vcpkg/ports/mozjpeg/vcpkg.json new file mode 100755 index 000000000..cf7e96cf2 --- /dev/null +++ b/externals/vcpkg/ports/mozjpeg/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "mozjpeg", + "version-date": "2021-09-27", + "description": "MozJPEG reduces file sizes of JPEG images while retaining quality and compatibility with the vast majority of the world's deployed decoders. It's compatible with libjpeg API and ABI, and can be used as a drop-in replacement for libjpeg.", + "homepage": "https://github.com/mozilla/mozjpeg", + "dependencies": [ + "libpng", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/mp-units/cmake.patch b/externals/vcpkg/ports/mp-units/cmake.patch new file mode 100755 index 000000000..d2d4a1a54 --- /dev/null +++ b/externals/vcpkg/ports/mp-units/cmake.patch @@ -0,0 +1,30 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b18a30a96..d89248aa1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -66,11 +66,21 @@ conan_init(cmake) + add_subdirectory(src) + + # add usage example +-add_subdirectory(example) ++option(BUILD_EXAMPLES "Build usage examples" OFF) ++if(BUILD_EXAMPLES) ++ add_subdirectory(example) ++endif() + + # generate project documentation +-add_subdirectory(docs) ++option(BUILD_DOCS "Generate docs" OFF) ++if(BUILD_DOCS) ++ add_subdirectory(docs) ++endif() + + # add unit tests +-enable_testing() +-add_subdirectory(test) ++option(BUILD_TESTING "Build tests" OFF) ++if(BUILD_TESTING) ++ set_warnings(mp-units) ++ enable_testing() ++ add_subdirectory(test) ++endif() diff --git a/externals/vcpkg/ports/mp-units/config.patch b/externals/vcpkg/ports/mp-units/config.patch new file mode 100755 index 000000000..b5f6bd6d2 --- /dev/null +++ b/externals/vcpkg/ports/mp-units/config.patch @@ -0,0 +1,14 @@ +diff --git a/src/mp-unitsConfig.cmake b/src/mp-unitsConfig.cmake +--- a/src/mp-unitsConfig.cmake ++++ b/src/mp-unitsConfig.cmake +@@ -39,8 +39,8 @@ function(__check_libcxx_in_use variable) + endfunction() + + include(CMakeFindDependencyMacro) +-find_dependency(fmt) +-find_dependency(gsl-lite) ++find_dependency(fmt CONFIG) ++find_dependency(gsl-lite CONFIG) + + # add range-v3 dependency only for clang + libc++ + if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") diff --git a/externals/vcpkg/ports/mp-units/portfile.cmake b/externals/vcpkg/ports/mp-units/portfile.cmake new file mode 100755 index 000000000..f608f1af1 --- /dev/null +++ b/externals/vcpkg/ports/mp-units/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mpusz/units + REF v0.7.0 + SHA512 72175f34f358d0741650ce9c8a7b28fced90cc45ddd3f1662ae1cb9ff7d31403ff742ee07ab4c96bd2d95af714d9111a888cf6acccb91e568e12d1ef663b2f64 + PATCHES + cmake.patch + config.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + +# Handle copyright/readme/package files +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib") # Header only \ No newline at end of file diff --git a/externals/vcpkg/ports/mp-units/vcpkg.json b/externals/vcpkg/ports/mp-units/vcpkg.json new file mode 100755 index 000000000..e4cc95da2 --- /dev/null +++ b/externals/vcpkg/ports/mp-units/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "mp-units", + "version-semver": "0.7.0", + "description": "mp-units - A Units Library for C++", + "homepage": "https://github.com/mpusz/units", + "dependencies": [ + "fmt", + "gsl-lite", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/mp3lame/00001-msvc-upgrade-solution-up-to-vc11.patch b/externals/vcpkg/ports/mp3lame/00001-msvc-upgrade-solution-up-to-vc11.patch new file mode 100755 index 000000000..07778093b --- /dev/null +++ b/externals/vcpkg/ports/mp3lame/00001-msvc-upgrade-solution-up-to-vc11.patch @@ -0,0 +1,1018 @@ +diff --git a/vc_solution/arch_nasm.props b/vc_solution/arch_nasm.props +new file mode 100644 +index 0000000..13174c9 +--- /dev/null ++++ b/vc_solution/arch_nasm.props +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>11.0.61030.0 ++ ++ ++ ++ TAKEHIRO_IEEE754_HACK;HAVE_NASM;MMX_choose_table;%(PreprocessorDefinitions) ++ ++ ++ ++ +\ No newline at end of file +diff --git a/vc_solution/arch_sse2.props b/vc_solution/arch_sse2.props +new file mode 100644 +index 0000000..1f97d57 +--- /dev/null ++++ b/vc_solution/arch_sse2.props +@@ -0,0 +1,17 @@ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>11.0.61030.0 ++ ++ ++ ++ HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions) ++ StreamingSIMDExtensions2 ++ Fast ++ ++ ++ ++ +\ No newline at end of file +diff --git a/vc_solution/arch_x87.props b/vc_solution/arch_x87.props +new file mode 100644 +index 0000000..3268c6b +--- /dev/null ++++ b/vc_solution/arch_x87.props +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>11.0.61030.0 ++ ++ ++ ++ TAKEHIRO_IEEE754_HACK;%(PreprocessorDefinitions) ++ ++ ++ ++ +\ No newline at end of file +diff --git a/vc_solution/vc11_lame.sln b/vc_solution/vc11_lame.sln +new file mode 100644 +index 0000000..9453bb0 +--- /dev/null ++++ b/vc_solution/vc11_lame.sln +@@ -0,0 +1,41 @@ ++ ++Microsoft Visual Studio Solution File, Format Version 12.00 ++# Visual Studio 2012 ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lame", "vc11_lame_lame.vcxproj", "{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}" ++ ProjectSection(ProjectDependencies) = postProject ++ {92BD50AA-04D6-4FBF-ACE1-468FAF6778F2} = {92BD50AA-04D6-4FBF-ACE1-468FAF6778F2} ++ EndProjectSection ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmp3lame-static", "vc11_libmp3lame.vcxproj", "{20536101-3B0E-43EF-94F9-080D595DAC57}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmp3lame", "vc11_libmp3lame_dll.vcxproj", "{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmpghip-static", "vc11_mpglib.vcxproj", "{E2DAB91A-8248-4625-8A85-2C2C2A390DD8}" ++EndProject ++Global ++ GlobalSection(SolutionConfigurationPlatforms) = preSolution ++ Debug|Win32 = Debug|Win32 ++ Release|Win32 = Release|Win32 ++ EndGlobalSection ++ GlobalSection(ProjectConfigurationPlatforms) = postSolution ++ {EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.Debug|Win32.Build.0 = Debug|Win32 ++ {EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.Release|Win32.ActiveCfg = Release|Win32 ++ {EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.Release|Win32.Build.0 = Release|Win32 ++ {20536101-3B0E-43EF-94F9-080D595DAC57}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {20536101-3B0E-43EF-94F9-080D595DAC57}.Debug|Win32.Build.0 = Debug|Win32 ++ {20536101-3B0E-43EF-94F9-080D595DAC57}.Release|Win32.ActiveCfg = Release|Win32 ++ {20536101-3B0E-43EF-94F9-080D595DAC57}.Release|Win32.Build.0 = Release|Win32 ++ {92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.Debug|Win32.Build.0 = Debug|Win32 ++ {92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.Release|Win32.ActiveCfg = Release|Win32 ++ {92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.Release|Win32.Build.0 = Release|Win32 ++ {E2DAB91A-8248-4625-8A85-2C2C2A390DD8}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {E2DAB91A-8248-4625-8A85-2C2C2A390DD8}.Debug|Win32.Build.0 = Debug|Win32 ++ {E2DAB91A-8248-4625-8A85-2C2C2A390DD8}.Release|Win32.ActiveCfg = Release|Win32 ++ {E2DAB91A-8248-4625-8A85-2C2C2A390DD8}.Release|Win32.Build.0 = Release|Win32 ++ EndGlobalSection ++ GlobalSection(SolutionProperties) = preSolution ++ HideSolutionNode = FALSE ++ EndGlobalSection ++EndGlobal +diff --git a/vc_solution/vc11_lame_config.props b/vc_solution/vc11_lame_config.props +new file mode 100644 +index 0000000..fd60017 +--- /dev/null ++++ b/vc_solution/vc11_lame_config.props +@@ -0,0 +1,32 @@ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>11.0.61030.0 ++ $(SolutionDir)..\output\$(Configuration)\ ++ $(SolutionDir)..\obj\$(Configuration)\$(ProjectName)\ ++ false ++ ++ ++ ++ $(IntDir)$(ProjectName).bsc ++ ++ ++ _CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATED;%(PreprocessorDefinitions) ++ true ++ true ++ $(IntDir) ++ true ++ Level4 ++ 4995;4996;%(DisableSpecificWarnings) ++ ++ ++ $(OutDir);%(AdditionalLibraryDirectories) ++ $(OutDir)$(TargetName).pdb ++ true ++ ++ ++ ++ +\ No newline at end of file +diff --git a/vc_solution/vc11_lame_lame.vcxproj b/vc_solution/vc11_lame_lame.vcxproj +new file mode 100644 +index 0000000..faf101a +--- /dev/null ++++ b/vc_solution/vc11_lame_lame.vcxproj +@@ -0,0 +1,128 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Release ++ Win32 ++ ++ ++ ++ lame ++ {EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38} ++ lame ++ ++ ++ ++ Application ++ v110 ++ false ++ ++ ++ Application ++ v110 ++ false ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>11.0.61030.0 ++ ++ ++ ++ ..\output\Debug/lame.tlb ++ ++ ++ ++ Disabled ++ ../;../mpglib;../libmp3lame;../include;%(AdditionalIncludeDirectories) ++ _DEBUG;WIN32;_WIN32;_CONSOLE;_WINDOWS;HAVE_MPGLIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) ++ MultiThreadedDebugDLL ++ ProgramDatabase ++ ++ ++ _DEBUG;_APP=$(TargetFileName);%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)lame.exe ++ true ++ Console ++ false ++ /APPCONTAINER /machine:x86 %(AdditionalOptions) ++ NotSet ++ ++ ++ ++ ++ ..\output\Release/lame.tlb ++ ++ ++ ++ Full ++ AnySuitable ++ true ++ Speed ++ ..;../mpglib;../libmp3lame;../include;../;%(AdditionalIncludeDirectories) ++ NDEBUG;WIN32;_WIN32;_CONSOLE;_WINDOWS;HAVE_MPGLIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ NDEBUG;_APP=$(TargetFileName);%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)lame.exe ++ Console ++ false ++ /APPCONTAINER /machine:x86 %(AdditionalOptions) ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ {20536101-3b0e-43ef-94f9-080d595dac57} ++ false ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff --git a/vc_solution/vc11_libmp3lame.vcxproj b/vc_solution/vc11_libmp3lame.vcxproj +new file mode 100644 +index 0000000..d4636b0 +--- /dev/null ++++ b/vc_solution/vc11_libmp3lame.vcxproj +@@ -0,0 +1,188 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Release ++ Win32 ++ ++ ++ ++ libmp3lame-static ++ {20536101-3B0E-43EF-94F9-080D595DAC57} ++ libmp3lame ++ ++ ++ ++ StaticLibrary ++ v110 ++ false ++ ++ ++ StaticLibrary ++ v110 ++ false ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>11.0.61030.0 ++ ++ ++ ++ Full ++ AnySuitable ++ true ++ Speed ++ ../mpglib;../include;..;%(AdditionalIncludeDirectories) ++ NDEBUG;_WINDOWS;HAVE_MPGLIB;WIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ 0x0409 ++ ++ ++ $(OutDir)libmp3lame-static.lib ++ ++ ++ ++ ++ Disabled ++ ../mpglib;../include;..;%(AdditionalIncludeDirectories) ++ _DEBUG;_WINDOWS;HAVE_MPGLIB;WIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions) ++ MultiThreadedDebugDLL ++ $(OutDir)$(TargetName).pdb ++ OldStyle ++ ++ ++ 0x0409 ++ ++ ++ $(OutDir)libmp3lame-static.lib ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Level1 ++ Level1 ++ ++ ++ ++ ++ ++ ++ ++ ../libmp3lame;%(AdditionalIncludeDirectories) ++ ../libmp3lame;%(AdditionalIncludeDirectories) ++ ++ ++ ++ ++ ++ Performing Custom Build Step on %(Filename) ++ copy ..\configMS.h ..\config.h ++ ++ ..\config.h;%(Outputs) ++ Performing Custom Build Step on %(Filename) ++ copy ..\configMS.h ..\config.h ++ ++ ..\config.h;%(Outputs) ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ true ++ true ++ ++ ++ true ++ true ++ ++ ++ true ++ true ++ ++ ++ true ++ true ++ ++ ++ true ++ true ++ ++ ++ true ++ true ++ ++ ++ true ++ true ++ ++ ++ true ++ true ++ ++ ++ ++ ++ {e2dab91a-8248-4625-8a85-2c2c2a390dd8} ++ false ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff --git a/vc_solution/vc11_libmp3lame_dll.vcxproj b/vc_solution/vc11_libmp3lame_dll.vcxproj +new file mode 100644 +index 0000000..9dad9d5 +--- /dev/null ++++ b/vc_solution/vc11_libmp3lame_dll.vcxproj +@@ -0,0 +1,125 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Release ++ Win32 ++ ++ ++ ++ libmp3lame ++ {92BD50AA-04D6-4FBF-ACE1-468FAF6778F2} ++ libmp3lameDLL ++ ++ ++ ++ DynamicLibrary ++ v110 ++ false ++ ++ ++ DynamicLibrary ++ v110 ++ false ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>11.0.61030.0 ++ ++ ++ ++ ..\output\Release/libmp3lame_dll.tlb ++ ++ ++ ++ Full ++ AnySuitable ++ true ++ Speed ++ ../libmp3lame;../;../mpglib;../include;..;%(AdditionalIncludeDirectories) ++ NDEBUG;_WINDOWS;HAVE_MPGLIB;WIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ _VC80_UPGRADE=0x0600;_DLL=$(TargetFileName);%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ false ++ ++ ++ $(OutDir)libmp3lame.dll ++ ..\include\lame.def ++ $(OutDir)libmp3lame.lib ++ /APPCONTAINER /machine:x86 %(AdditionalOptions) ++ false ++ NotSet ++ ++ ++ ++ ++ ..\output\Debug/libmp3lame_dll.tlb ++ ++ ++ ++ Disabled ++ ../libmp3lame;../;../mpglib;../include;..;%(AdditionalIncludeDirectories) ++ _DEBUG;_WINDOWS;HAVE_MPGLIB;WIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions) ++ MultiThreadedDebugDLL ++ ProgramDatabase ++ ++ ++ _VC80_UPGRADE=0x0600;_DLL=$(TargetFileName);_DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ false ++ ++ ++ $(OutDir)libmp3lame.dll ++ ..\include\lame.def ++ true ++ $(OutDir)libmp3lame.lib ++ /APPCONTAINER /machine:x86 %(AdditionalOptions) ++ false ++ NotSet ++ ++ ++ ++ ++ true ++ true ++ ++ ++ ++ ++ ++ ++ ++ {20536101-3b0e-43ef-94f9-080d595dac57} ++ false ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff --git a/vc_solution/vc11_mpglib.vcxproj b/vc_solution/vc11_mpglib.vcxproj +new file mode 100644 +index 0000000..a455bca +--- /dev/null ++++ b/vc_solution/vc11_mpglib.vcxproj +@@ -0,0 +1,116 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Release ++ Win32 ++ ++ ++ ++ libmpghip-static ++ {E2DAB91A-8248-4625-8A85-2C2C2A390DD8} ++ libmpghip ++ ++ ++ ++ StaticLibrary ++ v110 ++ false ++ ++ ++ StaticLibrary ++ v110 ++ false ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>11.0.61030.0 ++ ++ ++ ++ Full ++ AnySuitable ++ true ++ Speed ++ ../libmp3lame;../include;..;%(AdditionalIncludeDirectories) ++ NDEBUG;HAVE_MPGLIB;_WINDOWS;USE_LAYER_2;WIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ 0x0409 ++ ++ ++ $(OutDir)libmpghip-static.lib ++ ++ ++ ++ ++ Disabled ++ ../libmp3lame;../include;..;%(AdditionalIncludeDirectories) ++ _DEBUG;_WINDOWS;USE_LAYER_2;HAVE_MPGLIB;WIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions) ++ MultiThreadedDebugDLL ++ $(OutDir)$(TargetName).pdb ++ OldStyle ++ ++ ++ 0x0409 ++ ++ ++ $(OutDir)libmpghip-static.lib ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Performing Custom Build Step on %(Filename) ++ copy ..\configMS.h ..\config.h ++ ++ ..\config.h;%(Outputs) ++ Performing Custom Build Step on %(Filename) ++ copy ..\configMS.h ..\config.h ++ ++ ..\config.h;%(Outputs) ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff --git a/vc_solution/vc11_nasm.props b/vc_solution/vc11_nasm.props +new file mode 100644 +index 0000000..0f8542f +--- /dev/null ++++ b/vc_solution/vc11_nasm.props +@@ -0,0 +1,24 @@ ++ ++ ++ ++ Midl ++ CustomBuild ++ ++ ++ _SelectedFiles;$(NASMDependsOn) ++ ++ ++ ++ $(IntDir)%(Filename).obj ++ win32 ++ %(RootDir)%(Directory) ++ WIN32 ++ nasmw [BinFormat] [IncludeDir] [Defines] -o [OutFile] %(FullPath) ++ [OutFile] ++ Assembling %(Filename)... ++ false ++ ++ ++ +\ No newline at end of file +diff --git a/vc_solution/vc11_nasm.targets b/vc_solution/vc11_nasm.targets +new file mode 100644 +index 0000000..3158d8d +--- /dev/null ++++ b/vc_solution/vc11_nasm.targets +@@ -0,0 +1,85 @@ ++ ++ ++ ++ ++ ++ _NASM ++ ++ ++ ++ $(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml ++ ++ ++ ++ ++ ++ ++ ++ @(NASM, '|') ++ ++ ++ ++ ++ ++ ++ ++ ++ $(ComputeLinkInputsTargets); ++ ComputeNASMOutput; ++ ++ ++ $(ComputeLibInputsTargets); ++ ComputeNASMOutput; ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff --git a/vc_solution/vc11_nasm.xml b/vc_solution/vc11_nasm.xml +new file mode 100644 +index 0000000..390d570 +--- /dev/null ++++ b/vc_solution/vc11_nasm.xml +@@ -0,0 +1,149 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ General ++ ++ ++ ++ ++ Command Line ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Execute Before ++ ++ ++ Specifies the targets for the build customization to run before. ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Execute After ++ ++ ++ Specifies the targets for the build customization to run after. ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Additional Options ++ ++ ++ Additional Options ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file diff --git a/externals/vcpkg/ports/mp3lame/Config.cmake.in b/externals/vcpkg/ports/mp3lame/Config.cmake.in new file mode 100755 index 000000000..9630b9ea1 --- /dev/null +++ b/externals/vcpkg/ports/mp3lame/Config.cmake.in @@ -0,0 +1,60 @@ + +get_filename_component(_mp3lame_root "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_mp3lame_root "${_mp3lame_root}" PATH) +get_filename_component(_mp3lame_root "${_mp3lame_root}" PATH) + +set(_mp3lame_rel_lib "${_mp3lame_root}/lib/@MP3LAME_LIB@") +set(_mp3lame_dbg_lib "${_mp3lame_root}/debug/lib/@MP3LAME_LIB@") + +if (EXISTS "${_mp3lame_rel_lib}" OR EXISTS "${_mp3lame_dbg_lib}") + + add_library(mp3lame::mp3lame UNKNOWN IMPORTED) + set_target_properties(mp3lame::mp3lame + PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_mp3lame_root}/include") + + if (EXISTS "${_mp3lame_rel_lib}") + set_target_properties(mp3lame::mp3lame + PROPERTIES IMPORTED_LOCATION_RELEASE "${_mp3lame_rel_lib}") + set_property(TARGET mp3lame::mp3lame APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + endif() + if (EXISTS "${_mp3lame_dbg_lib}") + set_target_properties(mp3lame::mp3lame + PROPERTIES IMPORTED_LOCATION_DEBUG "${_mp3lame_dbg_lib}") + set_property(TARGET mp3lame::mp3lame APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + endif() + + set(_mp3lame_mpghip_rel_lib "${_mp3lame_root}/lib/libmpghip-static.lib") + set(_mp3lame_mpghip_dbg_lib "${_mp3lame_root}/debug/lib/libmpghip-static.lib") + + if (EXISTS "${_mp3lame_mpghip_rel_lib}" OR EXISTS "${_mp3lame_mpghip_dbg_lib}") + + add_library(mp3lame::mpghip UNKNOWN IMPORTED) + + if (EXISTS "${_mp3lame_rel_lib}") + set_target_properties(mp3lame::mpghip + PROPERTIES IMPORTED_LOCATION_RELEASE "${_mp3lame_mpghip_rel_lib}") + set_property(TARGET mp3lame::mpghip APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + endif() + if (EXISTS "${_mp3lame_dbg_lib}") + set_target_properties(mp3lame::mpghip + PROPERTIES IMPORTED_LOCATION_DEBUG "${_mp3lame_mpghip_dbg_lib}") + set_property(TARGET mp3lame::mpghip APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + endif() + + set_target_properties(mp3lame::mp3lame PROPERTIES INTERFACE_LINK_LIBRARIES mp3lame::mpghip) + + endif() + + unset(_mp3lame_mpghip_rel_lib) + unset(_mp3lame_mpghip_dbg_lib) + +else() + + set(mp3lame_FOUND FALSE) + +endif() + +unset(_mp3lame_rel_lib) +unset(_mp3lame_dbg_lib) + +unset(_mp3lame_root) diff --git a/externals/vcpkg/ports/mp3lame/portfile.cmake b/externals/vcpkg/ports/mp3lame/portfile.cmake new file mode 100755 index 000000000..f30f9e2cb --- /dev/null +++ b/externals/vcpkg/ports/mp3lame/portfile.cmake @@ -0,0 +1,120 @@ +set(VERSION 3.100) + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO lame/lame + REF ${VERSION} + FILENAME "lame-${VERSION}.tar.gz" + SHA512 0844b9eadb4aacf8000444621451277de365041cc1d97b7f7a589da0b7a23899310afd4e4d81114b9912aa97832621d20588034715573d417b2923948c08634b + PATCHES + 00001-msvc-upgrade-solution-up-to-vc11.patch + remove_lame_init_old_from_symbol_list.patch # deprecated https://github.com/zlargon/lame/blob/master/include/lame.h#L169 +) + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(platform "ARM64") + set(machine "ARM64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(platform "ARM") + set(machine "ARM") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(platform "x64") + set(machine "x64") + else() + set(platform "Win32") + set(machine "x86") + endif() + + file(READ "${SOURCE_PATH}/vc_solution/vc11_lame.sln" sln_con) + string(REPLACE "|Win32" "|${platform}" sln_con "${sln_con}") + string(REPLACE "\"vc11_" "\"${machine}_vc11_" sln_con "${sln_con}") + file(WRITE "${SOURCE_PATH}/vc_solution/${machine}_vc11_lame.sln" "${sln_con}") + + + file(GLOB vcxprojs RELATIVE "${SOURCE_PATH}/vc_solution" "${SOURCE_PATH}/vc_solution/vc11_*.vcxproj") + foreach(vcxproj ${vcxprojs}) + file(READ "${SOURCE_PATH}/vc_solution/${vcxproj}" vcxproj_con) + + if(NOT VCPKG_CRT_LINKAGE STREQUAL dynamic) + string(REPLACE "DLL" "" vcxproj_con "${vcxproj_con}") + endif() + + string(REPLACE "/machine:x86" "/machine:${machine}" vcxproj_con "${vcxproj_con}") + string(REPLACE "Win32" "${platform}" vcxproj_con "${vcxproj_con}") + string(REPLACE "|Win32" "|${platform}" vcxproj_con "${vcxproj_con}") + string(REPLACE "Include=\"vc11_" "Include=\"${machine}_vc11_" vcxproj_con "${vcxproj_con}") + + if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + string(REPLACE "/APPCONTAINER" "" vcxproj_con "${vcxproj_con}") + endif() + + file(WRITE "${SOURCE_PATH}/vc_solution/${machine}_${vcxproj}" "${vcxproj_con}") + endforeach() + + vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH "vc_solution/${machine}_vc11_lame.sln" + TARGET "lame" + PLATFORM "${platform}" + ) + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libmp3lame.lib) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libmp3lame.lib) + endif() + set(MP3LAME_LIB "libmp3lame-static.lib") + else() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libmp3lame-static.lib) + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libmpghip-static.lib) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libmp3lame-static.lib) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libmpghip-static.lib) + endif() + set(MP3LAME_LIB "libmp3lame.lib") + endif() + +else() + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(OPTIONS --enable-static=yes --enable-shared=no) + set(MP3LAME_LIB "libmp3lame${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + else() + set(OPTIONS --enable-shared=yes --enable-static=no) + if(VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX) + set(MP3LAME_LIB "libmp3lame${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}") + else() + set(MP3LAME_LIB "libmp3lame${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") + endif() + endif() + + if(NOT VCPKG_TARGET_IS_MINGW) + string(APPEND OPTIONS --with-pic=yes) + endif() + + vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + DETERMINE_BUILD_TRIPLET + OPTIONS ${OPTIONS} + ) + + vcpkg_install_make() + file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share + ) + +endif() + +file(COPY ${SOURCE_PATH}/include/lame.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/lame) +configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file(${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in ${CURRENT_PACKAGES_DIR}/share/${PORT}/mp3lame-config.cmake @ONLY) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/externals/vcpkg/ports/mp3lame/remove_lame_init_old_from_symbol_list.patch b/externals/vcpkg/ports/mp3lame/remove_lame_init_old_from_symbol_list.patch new file mode 100755 index 000000000..11d29b2eb --- /dev/null +++ b/externals/vcpkg/ports/mp3lame/remove_lame_init_old_from_symbol_list.patch @@ -0,0 +1,9 @@ +diff --color -Naur src_old/include/libmp3lame.sym src/include/libmp3lame.sym +--- src_old/include/libmp3lame.sym 2017-09-07 02:33:35.000000000 +0700 ++++ src/include/libmp3lame.sym 2020-11-12 17:45:59.946448300 +0700 +@@ -1,5 +1,4 @@ + lame_init +-lame_init_old + lame_set_num_samples + lame_get_num_samples + lame_set_in_samplerate diff --git a/externals/vcpkg/ports/mp3lame/usage b/externals/vcpkg/ports/mp3lame/usage new file mode 100755 index 000000000..6efb86c53 --- /dev/null +++ b/externals/vcpkg/ports/mp3lame/usage @@ -0,0 +1,4 @@ +The package mp3lame provides CMake targets: + + find_package(mp3lame CONFIG REQUIRED) + target_link_libraries(main PRIVATE mp3lame::mp3lame) diff --git a/externals/vcpkg/ports/mp3lame/vcpkg.json b/externals/vcpkg/ports/mp3lame/vcpkg.json new file mode 100755 index 000000000..f0c7cfca9 --- /dev/null +++ b/externals/vcpkg/ports/mp3lame/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "mp3lame", + "version-string": "3.100", + "port-version": 7, + "description": "LAME is a high quality MPEG Audio Layer III (MP3) encoder licensed under the LGPL.", + "homepage": "http://lame.sourceforge.net/" +} diff --git a/externals/vcpkg/ports/mpark-variant/portfile.cmake b/externals/vcpkg/ports/mpark-variant/portfile.cmake new file mode 100755 index 000000000..2041e6f07 --- /dev/null +++ b/externals/vcpkg/ports/mpark-variant/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mpark/variant + REF v1.4.0 + SHA512 598ef21824f9cd7586f88de5a51bfe24dde4c492e8e6b8288d2912920812c48fd01c54d9683e1620cb034563c4eac737a382620e6b4af473808a2e77017a89e3 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/mpark_variant TARGET_PATH share/mpark_variant) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +file(INSTALL + ${SOURCE_PATH}/LICENSE.md + DESTINATION ${CURRENT_PACKAGES_DIR}/share/mpark-variant RENAME copyright) diff --git a/externals/vcpkg/ports/mpark-variant/vcpkg.json b/externals/vcpkg/ports/mpark-variant/vcpkg.json new file mode 100755 index 000000000..a3c03ffaa --- /dev/null +++ b/externals/vcpkg/ports/mpark-variant/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "mpark-variant", + "version-string": "1.4.0", + "port-version": 1, + "description": "an implementation of C++17 std::variant for C++11/14/17." +} diff --git a/externals/vcpkg/ports/mpc/portfile.cmake b/externals/vcpkg/ports/mpc/portfile.cmake new file mode 100755 index 000000000..7ecd9b325 --- /dev/null +++ b/externals/vcpkg/ports/mpc/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://ftp.gnu.org/gnu/mpc/mpc-1.2.0.tar.gz" + FILENAME "mpc-1.2.0.tar.gz" + SHA512 84fa3338f51d369111456a63ad040256a1beb70699e21e2a932c779aa1c3bd08b201412c1659ecbb58403ea0548faacc35996d94f88f0639549269b7563c61b7 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/externals/vcpkg/ports/mpc/vcpkg.json b/externals/vcpkg/ports/mpc/vcpkg.json new file mode 100755 index 000000000..9f79c44a8 --- /dev/null +++ b/externals/vcpkg/ports/mpc/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "mpc", + "version": "1.2.0", + "port-version": 2, + "description": "GNU MPC is a C library for the arithmetic of complex numbers with arbitrarily high precision and correct rounding of the result.", + "homepage": "http://www.multiprecision.org/mpc/", + "dependencies": [ + "gmp", + "mpfr" + ] +} diff --git a/externals/vcpkg/ports/mpfr/dll.patch b/externals/vcpkg/ports/mpfr/dll.patch new file mode 100755 index 000000000..3b6eff519 --- /dev/null +++ b/externals/vcpkg/ports/mpfr/dll.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index fdee5978d..0791b2528 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -593,7 +593,7 @@ case $host in + AC_MSG_CHECKING(for DLL/static GMP) + if test "$enable_shared" = yes; then + MPFR_LDFLAGS="$MPFR_LDFLAGS -no-undefined" +- LIBMPFR_LDFLAGS="$LIBMPFR_LDFLAGS -Wl,--output-def,.libs/libmpfr-6.dll.def" ++ LIBMPFR_LDFLAGS="$LIBMPFR_LDFLAGS -W1,--no-undefined" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include "gmp.h" + #if !__GMP_LIBGMP_DLL diff --git a/externals/vcpkg/ports/mpfr/portfile.cmake b/externals/vcpkg/ports/mpfr/portfile.cmake new file mode 100755 index 000000000..83354d7d9 --- /dev/null +++ b/externals/vcpkg/ports/mpfr/portfile.cmake @@ -0,0 +1,35 @@ +if (VCPKG_TARGET_IS_LINUX) + message(WARNING "${PORT} currently requires the following packages:\n autoconf-archive\nThese can be installed on Ubuntu systems via\n sudo apt-get update -y\n sudo apt-get install -y autoconf-archive\n") +endif() + +set(VERSION 4.1.0) +vcpkg_download_distfile(ARCHIVE + URLS "http://www.mpfr.org/mpfr-${VERSION}/mpfr-${VERSION}.tar.xz" "https://ftp.gnu.org/gnu/mpfr/mpfr-${VERSION}.tar.xz" + FILENAME "mpfr-${VERSION}.tar.xz" + SHA512 1bd1c349741a6529dfa53af4f0da8d49254b164ece8a46928cdb13a99460285622d57fe6f68cef19c6727b3f9daa25ddb3d7d65c201c8f387e421c7f7bee6273 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES + dll.patch + src-only.patch +) +file(REMOVE_RECURSE "${SOURCE_PATH}/m4") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + ADDITIONAL_MSYS_PACKAGES autoconf-archive +) + +vcpkg_install_make() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/mpfr/src-only.patch b/externals/vcpkg/ports/mpfr/src-only.patch new file mode 100755 index 000000000..505570986 --- /dev/null +++ b/externals/vcpkg/ports/mpfr/src-only.patch @@ -0,0 +1,20 @@ +diff --git a/Makefile.am b/Makefile.am +index 89242c6..662ce24 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -24,12 +24,14 @@ AUTOMAKE_OPTIONS = gnu + # old Automake version. + ACLOCAL_AMFLAGS = -I m4 + +-SUBDIRS = doc src tests tune tools/bench ++SUBDIRS = src # Skipping: doc tests tune tools/bench + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = mpfr.pc + + nobase_dist_doc_DATA = AUTHORS BUGS COPYING COPYING.LESSER NEWS TODO \ ++ # BREAK ++VCPKG_SKIP_EXAMPLES = \ + examples/ReadMe examples/can_round.c examples/divworst.c \ + examples/rndo-add.c examples/sample.c examples/threads.c \ + examples/version.c diff --git a/externals/vcpkg/ports/mpfr/vcpkg.json b/externals/vcpkg/ports/mpfr/vcpkg.json new file mode 100755 index 000000000..195d7efbe --- /dev/null +++ b/externals/vcpkg/ports/mpfr/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "mpfr", + "version": "4.1.0", + "port-version": 4, + "description": "The MPFR library is a C library for multiple-precision floating-point computations with correct rounding", + "homepage": "https://www.mpfr.org", + "license": "LGPL-3.0-or-later", + "dependencies": [ + "gmp" + ] +} diff --git a/externals/vcpkg/ports/mpg123/fix-m1-build.patch b/externals/vcpkg/ports/mpg123/fix-m1-build.patch new file mode 100755 index 000000000..d198d953b --- /dev/null +++ b/externals/vcpkg/ports/mpg123/fix-m1-build.patch @@ -0,0 +1,13 @@ +diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt +index ee9a1ba..81d23f8 100644 +--- a/ports/cmake/src/CMakeLists.txt ++++ b/ports/cmake/src/CMakeLists.txt +@@ -185,7 +185,7 @@ if(NO_MESSAGES) + set(NO_ERETURN ON) + endif() + +-if(WIN32) ++if(WIN32 OR APPLE) + set(HAVE_FPU 1) + else() + cmake_host_system_information(RESULT HAVE_FPU QUERY HAS_FPU) diff --git a/externals/vcpkg/ports/mpg123/fix-modulejack.patch b/externals/vcpkg/ports/mpg123/fix-modulejack.patch new file mode 100755 index 000000000..fd4113270 --- /dev/null +++ b/externals/vcpkg/ports/mpg123/fix-modulejack.patch @@ -0,0 +1,13 @@ +diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt +index 7147174..76e1743 100644 +--- a/ports/cmake/src/CMakeLists.txt ++++ b/ports/cmake/src/CMakeLists.txt +@@ -238,7 +238,7 @@ if(BUILD_LIBOUT123) + endif() + endif() + +- if(NOT CHECK_MODULES OR NOT JACK_REQUIRED EQUAL -1) ++ if(0) + pkg_search_module(JACK jack) + if(JACK_FOUND) + list(APPEND OUTPUT_MODULES jack) diff --git a/externals/vcpkg/ports/mpg123/portfile.cmake b/externals/vcpkg/ports/mpg123/portfile.cmake new file mode 100755 index 000000000..4efadfc92 --- /dev/null +++ b/externals/vcpkg/ports/mpg123/portfile.cmake @@ -0,0 +1,37 @@ +set(MPG123_VERSION 1.29.3) + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO mpg123/mpg123 + REF ${MPG123_VERSION} + FILENAME "mpg123-${MPG123_VERSION}.tar.bz2" + SHA512 0d8db63f9bae1507887bc5241a56abccfeb767b7ba8362eb0fce9de2f63369e57fdd6f25a953f8ef5f9ead4f400237db51914816e278566fdf8e6f205ebca5d6 + PATCHES + fix-modulejack.patch + fix-m1-build.patch +) + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + include("${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake") + yasm_tool_helper(APPEND_TO_PATH) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/ports/cmake" + OPTIONS + -DUSE_MODULES=OFF + -DBUILD_PROGRAMS=OFF +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_TARGET_IS_OSX) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/mpg123/vcpkg.json b/externals/vcpkg/ports/mpg123/vcpkg.json new file mode 100755 index 000000000..018bac57e --- /dev/null +++ b/externals/vcpkg/ports/mpg123/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "mpg123", + "version": "1.29.3", + "description": "mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).", + "homepage": "https://sourceforge.net/projects/mpg123/", + "license": "LGPL-2.1-or-later", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + { + "name": "yasm-tool-helper", + "platform": "windows" + } + ] +} diff --git a/externals/vcpkg/ports/mpi/portfile.cmake b/externals/vcpkg/ports/mpi/portfile.cmake new file mode 100755 index 000000000..89bec5e34 --- /dev/null +++ b/externals/vcpkg/ports/mpi/portfile.cmake @@ -0,0 +1,5 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +if (VCPKG_TARGET_IS_WINDOWS) + file(INSTALL "${CURRENT_INSTALLED_DIR}/share/msmpi/mpi-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME vcpkg-cmake-wrapper.cmake) +endif() diff --git a/externals/vcpkg/ports/mpi/vcpkg.json b/externals/vcpkg/ports/mpi/vcpkg.json new file mode 100755 index 000000000..2d5bbaddf --- /dev/null +++ b/externals/vcpkg/ports/mpi/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "mpi", + "version-string": "1", + "port-version": 3, + "description": "Message Passing Interface (MPI) is a standardized and portable message-passing standard designed by a group of researchers from academia and industry to function on a wide variety of parallel computing architectures. The standard defines the syntax and semantics of a core of library routines useful to a wide range of users writing portable message-passing programs in C, C++, and Fortran. There are several well-tested and efficient implementations of MPI, many of which are open-source or in the public domain.", + "license": null, + "supports": "!uwp", + "dependencies": [ + { + "name": "msmpi", + "platform": "windows" + }, + { + "name": "openmpi", + "platform": "!windows" + } + ] +} diff --git a/externals/vcpkg/ports/mpir/enable-runtimelibrary-toggle.patch b/externals/vcpkg/ports/mpir/enable-runtimelibrary-toggle.patch new file mode 100755 index 000000000..391d4e103 --- /dev/null +++ b/externals/vcpkg/ports/mpir/enable-runtimelibrary-toggle.patch @@ -0,0 +1,27 @@ +diff --git a/build.vc/mpir_debug_lib.props b/build.vc/mpir_debug_lib.props +index b2fd57b..3937570 100644 +--- a/build.vc/mpir_debug_lib.props ++++ b/build.vc/mpir_debug_lib.props +@@ -9,7 +9,8 @@ + + + $(IntDir)dum\my\%(RelativeDir) +- MultiThreadedDebug ++ $(RuntimeLibrary) ++ OldStyle + $(TargetDir)$(TargetName).pdb + + +diff --git a/build.vc/mpir_release_lib.props b/build.vc/mpir_release_lib.props +index 6cdff3e..3937570 100644 +--- a/build.vc/mpir_release_lib.props ++++ b/build.vc/mpir_release_lib.props +@@ -9,7 +9,7 @@ + + + $(IntDir)dum\my\%(RelativeDir) +- MultiThreaded ++ $(RuntimeLibrary) + $(TargetDir)$(TargetName).pdb + + diff --git a/externals/vcpkg/ports/mpir/portfile.cmake b/externals/vcpkg/ports/mpir/portfile.cmake new file mode 100755 index 000000000..db2e2163e --- /dev/null +++ b/externals/vcpkg/ports/mpir/portfile.cmake @@ -0,0 +1,134 @@ +if(EXISTS "${CURRENT_INSTALLED_DIR}/include/gmp.h" OR "${CURRENT_INSTALLED_DIR}/include/gmpxx.h") + message(FATAL_ERROR "Can't build ${PORT} if gmp is installed. Please remove gmp, and try to install ${PORT} again if you need it.") +endif() + +if(VCPKG_CRT_LINKAGE STREQUAL "static" AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + message(FATAL_ERROR "${PORT} currently can only be built using the dynamic CRT when building DLLs") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wbhart/mpir + REF cdd444aedfcbb190f00328526ef278428702d56e # 3.0.0 + SHA512 f46e45bdba27c9f89953ba23186b694486fd3010bd370ea2de71a4649a2816e716a6520c9baa96936f1884437ef03f92b21c0b1fb5b757beba5a05fed30b2bfc + HEAD_REF master + PATCHES enable-runtimelibrary-toggle.patch +) + +if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) + vcpkg_find_acquire_program(YASM) + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(SHARED_STATIC --enable-static --disable-shared --with-pic) + else() + set(SHARED_STATIC --disable-static --enable-shared) + endif() + + set(OPTIONS --disable-silent-rules --enable-gmpcompat --enable-cxx ${SHARED_STATIC}) + + string(APPEND VCPKG_C_FLAGS " -Wno-implicit-function-declaration") + string(APPEND VCPKG_CXX_FLAGS " -Wno-implicit-function-declaration") + + # on Linux, autoconf is required; on macOS, it isn't + if(VCPKG_TARGET_IS_LINUX) + set(AUTOCONFIG "AUTOCONFIG") + endif() + + vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + ${AUTOCONFIG} + OPTIONS ${OPTIONS} + ) + + vcpkg_install_make() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + endif() + +elseif(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_PLATFORM_TOOLSET MATCHES "v141") + set(MSVC_VERSION 15) + else() + set(MSVC_VERSION 14) + endif() + + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(DLL_OR_LIB dll) + else() + set(DLL_OR_LIB lib) + endif() + + if(VCPKG_CRT_LINKAGE STREQUAL "static") + set(RuntimeLibraryExt "") + else() + set(RuntimeLibraryExt "DLL") + endif() + + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") + file(GLOB FILES "${SOURCE_PATH}/*") + file(COPY ${FILES} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") + + vcpkg_build_msbuild( + PROJECT_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/build.vc${MSVC_VERSION}/${DLL_OR_LIB}_mpir_gc/${DLL_OR_LIB}_mpir_gc.vcxproj" + OPTIONS_DEBUG "/p:RuntimeLibrary=MultiThreadedDebug${RuntimeLibraryExt}" + OPTIONS_RELEASE "/p:RuntimeLibrary=MultiThreaded${RuntimeLibraryExt}" + ) + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_build_msbuild( + PROJECT_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/build.vc${MSVC_VERSION}/${DLL_OR_LIB}_mpir_cxx/${DLL_OR_LIB}_mpir_cxx.vcxproj" + OPTIONS_DEBUG "/p:RuntimeLibrary=MultiThreadedDebug${RuntimeLibraryExt}" + OPTIONS_RELEASE "/p:RuntimeLibrary=MultiThreaded${RuntimeLibraryExt}" + ) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(GLOB REL_LIBS_CXX "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpirxx.lib") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(GLOB DBG_LIBS_CXX "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpirxx.lib") + endif() + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(GLOB HEADERS + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/gmp.h" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/gmpxx.h" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpir.h" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpirxx.h" + ) + file(INSTALL ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include") + + file(GLOB REL_DLLS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpir.dll") + file(GLOB REL_LIBS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpir.lib") + list(APPEND REL_LIBS ${REL_LIBS_CXX}) + + file(INSTALL ${REL_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL ${REL_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(GLOB HEADERS + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/gmp.h" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/gmpxx.h" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpir.h" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpirxx.h" + ) + file(INSTALL ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include") + + file(GLOB DBG_DLLS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpir.dll") + file(GLOB DBG_LIBS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpir.lib") + list(APPEND DBG_LIBS ${DBG_LIBS_CXX}) + + file(INSTALL ${DBG_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL ${DBG_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + + if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() + endif() + + vcpkg_copy_pdbs() +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/mpir/vcpkg.json b/externals/vcpkg/ports/mpir/vcpkg.json new file mode 100755 index 000000000..5a9c0cc9f --- /dev/null +++ b/externals/vcpkg/ports/mpir/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "mpir", + "version-date": "2022-03-02", + "port-version": 1, + "description": "Multiple Precision Integers and Rationals", + "homepage": "https://github.com/wbhart/mpir", + "license": "GPL-3.0-only", + "supports": "!(uwp | arm)" +} diff --git a/externals/vcpkg/ports/mpmcqueue/portfile.cmake b/externals/vcpkg/ports/mpmcqueue/portfile.cmake new file mode 100755 index 000000000..5ea35ba3f --- /dev/null +++ b/externals/vcpkg/ports/mpmcqueue/portfile.cmake @@ -0,0 +1,18 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rigtorp/MPMCQueue + REF 28d05c021d68fc5280b593329d1982ed02f9d7b3 + SHA512 e3305ecac05d48814d75adcb85fa165eec3a439a17dd99f8b0d2c095e40b2f98bd4bcf167cf8268f84d09aa172ab66b30573d9d3ad4908c10dc5bec632529b8a + HEAD_REF master +) + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/MPMCQueue) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +# Handle copyright +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/mpmcqueue/vcpkg.json b/externals/vcpkg/ports/mpmcqueue/vcpkg.json new file mode 100755 index 000000000..f01f42881 --- /dev/null +++ b/externals/vcpkg/ports/mpmcqueue/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "mpmcqueue", + "version-date": "2021-12-01", + "description": "A bounded multi-producer multi-consumer lock-free queue written in C++11", + "homepage": "https://github.com/rigtorp/MPMCQueue", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/mqtt-cpp/portfile.cmake b/externals/vcpkg/ports/mqtt-cpp/portfile.cmake new file mode 100755 index 000000000..1fb0d6361 --- /dev/null +++ b/externals/vcpkg/ports/mqtt-cpp/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO redboltz/mqtt_cpp + REF v13.0.0 + SHA512 +2f0c85ac813cc6c99cc5b1ca02514ee6643abc39750bce541a362d1fcd281b8b9011cc39ddeaf4394fd3772904eed15e8ecbe6b3839caad13cae2b04201e682b + HEAD_REF master + ) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DMQTT_BUILD_EXAMPLES=OFF + -DMQTT_BUILD_TESTS=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON + ) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME mqtt_cpp_iface CONFIG_PATH lib/cmake/mqtt_cpp_iface) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file( + INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) diff --git a/externals/vcpkg/ports/mqtt-cpp/vcpkg.json b/externals/vcpkg/ports/mqtt-cpp/vcpkg.json new file mode 100755 index 000000000..791485f17 --- /dev/null +++ b/externals/vcpkg/ports/mqtt-cpp/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "mqtt-cpp", + "version-semver": "13.0.0", + "description": "Header-only MQTT client/server for C++14 based on Boost.Asio.", + "homepage": "https://github.com/redboltz/mqtt_cpp", + "license": "BSL-1.0", + "dependencies": [ + "boost-any", + "boost-asio", + "boost-multi-index", + "boost-program-options", + "boost-type-erasure", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ms-angle/portfile.cmake b/externals/vcpkg/ports/ms-angle/portfile.cmake new file mode 100755 index 000000000..0015715fb --- /dev/null +++ b/externals/vcpkg/ports/ms-angle/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/externals/vcpkg/ports/ms-angle/vcpkg.json b/externals/vcpkg/ports/ms-angle/vcpkg.json new file mode 100755 index 000000000..22c7a3386 --- /dev/null +++ b/externals/vcpkg/ports/ms-angle/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "ms-angle", + "version-string": "alias", + "port-version": 1, + "description": "Deprecated alias for ms-angle", + "dependencies": [ + "angle" + ] +} diff --git a/externals/vcpkg/ports/ms-gltf/fix-apple-filesystem.patch b/externals/vcpkg/ports/ms-gltf/fix-apple-filesystem.patch new file mode 100755 index 000000000..d2d1a504b --- /dev/null +++ b/externals/vcpkg/ports/ms-gltf/fix-apple-filesystem.patch @@ -0,0 +1,66 @@ +diff --git a/GLTFSDK.Samples/CMakeLists.txt b/GLTFSDK.Samples/CMakeLists.txt +index a66ed93..d948ee2 100644 +--- a/GLTFSDK.Samples/CMakeLists.txt ++++ b/GLTFSDK.Samples/CMakeLists.txt +@@ -1,4 +1,6 @@ + cmake_minimum_required(VERSION 3.5) +- ++if(APPLE) ++ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15") ++endif() + add_subdirectory(Deserialize) + add_subdirectory(Serialize) +diff --git a/GLTFSDK.Samples/Deserialize/CMakeLists.txt b/GLTFSDK.Samples/Deserialize/CMakeLists.txt +index 791898c..6474aee 100644 +--- a/GLTFSDK.Samples/Deserialize/CMakeLists.txt ++++ b/GLTFSDK.Samples/Deserialize/CMakeLists.txt +@@ -17,6 +17,8 @@ if (MSVC) + + # Make sure that all PDB files on Windows are installed to the output folder. By default, only the debug build does this. + set_target_properties(Deserialize PROPERTIES COMPILE_PDB_NAME "Deserialize" COMPILE_PDB_OUTPUT_DIRECTORY "${RUNTIME_OUTPUT_DIRECTORY}") ++elseif(APPLE) ++ set_target_properties(Deserialize PROPERTIES CXX_STANDARD 17) + endif() + + if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") +diff --git a/GLTFSDK.Samples/Deserialize/Source/main.cpp b/GLTFSDK.Samples/Deserialize/Source/main.cpp +index 80198fa..fb560e0 100644 +--- a/GLTFSDK.Samples/Deserialize/Source/main.cpp ++++ b/GLTFSDK.Samples/Deserialize/Source/main.cpp +@@ -8,6 +8,9 @@ + + // Replace this with (and use std::filesystem rather than + // std::experimental::filesystem) if your toolchain fully supports C++17 ++#if defined(__APPLE__) ++#define _LIBCPP_NO_EXPERIMENTAL_DEPRECATION_WARNING_FILESYSTEM ++#endif + #include + + #include +diff --git a/GLTFSDK.Samples/Serialize/CMakeLists.txt b/GLTFSDK.Samples/Serialize/CMakeLists.txt +index 5269da8..1129ea0 100644 +--- a/GLTFSDK.Samples/Serialize/CMakeLists.txt ++++ b/GLTFSDK.Samples/Serialize/CMakeLists.txt +@@ -17,6 +17,8 @@ if (MSVC) + + # Make sure that all PDB files on Windows are installed to the output folder. By default, only the debug build does this. + set_target_properties(Serialize PROPERTIES COMPILE_PDB_NAME "Serialize" COMPILE_PDB_OUTPUT_DIRECTORY "${RUNTIME_OUTPUT_DIRECTORY}") ++elseif(APPLE) ++ set_target_properties(Serialize PROPERTIES CXX_STANDARD 17) + endif() + + if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") +diff --git a/GLTFSDK.Samples/Serialize/Source/main.cpp b/GLTFSDK.Samples/Serialize/Source/main.cpp +index ac87c10..f5c6e0b 100644 +--- a/GLTFSDK.Samples/Serialize/Source/main.cpp ++++ b/GLTFSDK.Samples/Serialize/Source/main.cpp +@@ -10,6 +10,9 @@ + + // Replace this with (and use std::filesystem rather than + // std::experimental::filesystem) if your toolchain fully supports C++17 ++#if defined(__APPLE__) ++#define _LIBCPP_NO_EXPERIMENTAL_DEPRECATION_WARNING_FILESYSTEM ++#endif + #include + + #include diff --git a/externals/vcpkg/ports/ms-gltf/fix-install.patch b/externals/vcpkg/ports/ms-gltf/fix-install.patch new file mode 100755 index 000000000..59b5eebbc --- /dev/null +++ b/externals/vcpkg/ports/ms-gltf/fix-install.patch @@ -0,0 +1,44 @@ +diff --git a/Build/CMake/Modules/GLTFPlatform.cmake b/Build/CMake/Modules/GLTFPlatform.cmake +index 3d940f5..322f029 100644 +--- a/Build/CMake/Modules/GLTFPlatform.cmake ++++ b/Build/CMake/Modules/GLTFPlatform.cmake +@@ -55,14 +55,14 @@ endfunction(GetGLTFPlatform) + function(CreateGLTFInstallTargets target platform) + + install(TARGETS ${target} +- ARCHIVE DESTINATION ${CMAKE_SOURCE_DIR}/Built/Out/${platform}/$/${PROJECT_NAME} +- LIBRARY DESTINATION ${CMAKE_SOURCE_DIR}/Built/Out/${platform}/$/${PROJECT_NAME} +- RUNTIME DESTINATION ${CMAKE_SOURCE_DIR}/Built/Out/${platform}/$/${PROJECT_NAME} +- BUNDLE DESTINATION ${CMAKE_SOURCE_DIR}/Built/Out/${platform}/$/${PROJECT_NAME} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib ++ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib ++ RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ++ BUNDLE DESTINATION ${CMAKE_INSTALL_PREFIX}/bin + ) + + if (MSVC) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/$/${PROJECT_NAME}.pdb DESTINATION ${CMAKE_SOURCE_DIR}/Built/Out/${platform}/$/${PROJECT_NAME}) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/$/${PROJECT_NAME}.pdb DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) + endif() + + endfunction(CreateGLTFInstallTargets) +diff --git a/GLTFSDK.Test/CMakeLists.txt b/GLTFSDK.Test/CMakeLists.txt +index 5c8eca7..a0752a3 100644 +--- a/GLTFSDK.Test/CMakeLists.txt ++++ b/GLTFSDK.Test/CMakeLists.txt +@@ -46,4 +46,4 @@ add_custom_command(TARGET GLTFSDK.Test + AddGLTFIOSAppProperties(GLTFSDK.Test) + CreateGLTFInstallTargets(GLTFSDK.Test ${Platform}) + +-install(FILES ${PROJECT_BINARY_DIR}/$/Resources/ DESTINATION ${CMAKE_SOURCE_DIR}/Built/Out/${Platform}/$/${PROJECT_NAME}/Resources) ++install(FILES ${PROJECT_BINARY_DIR}/$/Resources/ DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) +diff --git a/GLTFSDK/CMakeLists.txt b/GLTFSDK/CMakeLists.txt +index 3c53c74..1e8d223 100644 +--- a/GLTFSDK/CMakeLists.txt ++++ b/GLTFSDK/CMakeLists.txt +@@ -46,4 +46,5 @@ target_include_directories(GLTFSDK + PRIVATE "${CMAKE_BINARY_DIR}/GeneratedFiles" + ) + ++install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Inc/GLTFSDK DESTINATION ${CMAKE_INSTALL_PREFIX}/include) + CreateGLTFInstallTargets(GLTFSDK ${Platform}) diff --git a/externals/vcpkg/ports/ms-gltf/portfile.cmake b/externals/vcpkg/ports/ms-gltf/portfile.cmake new file mode 100755 index 000000000..c59b61bbe --- /dev/null +++ b/externals/vcpkg/ports/ms-gltf/portfile.cmake @@ -0,0 +1,45 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/glTF-SDK + REF ac3e70392feb6aef18a07314669f6af2ebc72787 # r1.9.5.4 + SHA512 389b801ddc6f0b29269bcd1215fa9e63fe46a1f1a8778125c6439e34fe0925d5534b1cdbea30824a4a8aa008015124dc7cc4558daa9522fc6d85e00e8e41e4a9 + HEAD_REF master + PATCHES + fix-install.patch + fix-apple-filesystem.patch +) + +# note: Test/Sample executables won't be installed +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + test ENABLE_UNIT_TESTS + samples ENABLE_SAMPLES +) + +# note: Platform-native buildsystem will be more helpful to launch/debug the tests/samples. +# note: The PDB file path is making Ninja fails to install. +# For Windows, we rely on /MP. The other platforms should be able to build with PREFER_NINJA. +set(WINDOWS_USE_MSBUILD) +if(VCPKG_TARGET_IS_WINDOWS) + set(WINDOWS_USE_MSBUILD "WINDOWS_USE_MSBUILD") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + ${WINDOWS_USE_MSBUILD} + OPTIONS + ${FEATURE_OPTIONS} +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/ms-gltf/vcpkg.json b/externals/vcpkg/ports/ms-gltf/vcpkg.json new file mode 100755 index 000000000..34728d11b --- /dev/null +++ b/externals/vcpkg/ports/ms-gltf/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "ms-gltf", + "version-string": "r1.9.5.4", + "port-version": 1, + "description": "glTF-SDK is a C++ Software Development Kit for glTF", + "homepage": "https://github.com/microsoft/glTF-SDK", + "supports": "!linux", + "dependencies": [ + "rapidjson", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "default-features": [ + "test" + ], + "features": { + "samples": { + "description": "Build with GLTF samples" + }, + "test": { + "description": "Build test programs", + "dependencies": [ + "gtest" + ] + } + } +} diff --git a/externals/vcpkg/ports/ms-gsl/portfile.cmake b/externals/vcpkg/ports/ms-gsl/portfile.cmake new file mode 100755 index 000000000..5713e346a --- /dev/null +++ b/externals/vcpkg/ports/ms-gsl/portfile.cmake @@ -0,0 +1,26 @@ +#header-only library with an install target +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Microsoft/GSL + REF a3534567187d2edc428efd3f13466ff75fe5805c + SHA512 5bd6aad37fee3b56a2ee2fed10d6ef02fdcf37a1f40b3fb1bbec8146a573e235169b315405d010ab75175674ed82658c8202f40b128a849c5250b4a1b8b0a1b3 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DGSL_TEST=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME Microsoft.GSL + CONFIG_PATH share/cmake/Microsoft.GSL +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/ms-gsl/vcpkg.json b/externals/vcpkg/ports/ms-gsl/vcpkg.json new file mode 100755 index 000000000..ace0f12e7 --- /dev/null +++ b/externals/vcpkg/ports/ms-gsl/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "ms-gsl", + "version": "4.0.0", + "description": "Microsoft implementation of the Guidelines Support Library", + "homepage": "https://github.com/Microsoft/GSL", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ms-quic/fix-install.patch b/externals/vcpkg/ports/ms-quic/fix-install.patch new file mode 100755 index 000000000..4df691077 --- /dev/null +++ b/externals/vcpkg/ports/ms-quic/fix-install.patch @@ -0,0 +1,67 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 96ea265..87eaed5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -647,6 +647,8 @@ if(QUIC_CODE_CHECK) + endif() + endif() + ++include(GNUInstallDirs) ++ + add_subdirectory(src/inc) + + # Product code +@@ -657,6 +659,8 @@ add_subdirectory(src/bin) + # Tool code + if(QUIC_BUILD_TOOLS) + add_subdirectory(src/tools) ++ install(TARGETS quicattack quicinterop quicinteropserver quicipclient quicipserver ++ quicpcp quicping quicpost quicreach quicsample spinquic) + endif() + + # Performance code +diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt +index 4dda469..2797670 100644 +--- a/src/bin/CMakeLists.txt ++++ b/src/bin/CMakeLists.txt +@@ -29,7 +29,7 @@ endif() + + target_include_directories(msquic PUBLIC + $ +- $) ++ $) + + set(PUBLIC_HEADERS + ../inc/msquic.h +@@ -37,14 +37,17 @@ set(PUBLIC_HEADERS + ../inc/msquic_posix.h + ../inc/quic_sal_stub.h) + +-install(TARGETS msquic EXPORT msquic DESTINATION "${main_lib_dest}") +-install(FILES ${PUBLIC_HEADERS} DESTINATION "${include_dest}") ++install(TARGETS msquic EXPORT msquic-targets ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + + configure_file(msquic-config.cmake.in ${CMAKE_BINARY_DIR}/msquic-config.cmake) + +-install(FILES ${CMAKE_BINARY_DIR}/msquic-config.cmake DESTINATION ${msquic_dest}) ++install(FILES ${CMAKE_BINARY_DIR}/msquic-config.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/msquic) + +-install(EXPORT msquic DESTINATION ${msquic_dest}) ++install(EXPORT msquic-targets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/msquic) + + if(WIN32) + add_library(msquic.lttng INTERFACE) +diff --git a/src/bin/msquic-config.cmake.in b/src/bin/msquic-config.cmake.in +index dd67624..c561361 100644 +--- a/src/bin/msquic-config.cmake.in ++++ b/src/bin/msquic-config.cmake.in +@@ -1,4 +1,4 @@ + include(CMakeFindDependencyMacro) + @FILENAME_DEP_REPLACE@ + +-include(${SELF_DIR}/msquic.cmake) ++include(${SELF_DIR}/msquic-targets.cmake) diff --git a/externals/vcpkg/ports/ms-quic/fix-platform.patch b/externals/vcpkg/ports/ms-quic/fix-platform.patch new file mode 100755 index 000000000..7041c30d0 --- /dev/null +++ b/externals/vcpkg/ports/ms-quic/fix-platform.patch @@ -0,0 +1,56 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0b670cf..f94f4c6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -309,7 +309,7 @@ if(WIN32) + endif() + else() + # Just doing a normal build. Use the PGD file if present. +- if(EXISTS "${QUIC_PGO_FILE}") ++ if(FALSE) + message(STATUS "Using profile-guided optimization") + configure_file("${QUIC_PGO_FILE}" "${QUIC_OUTPUT_DIR}/msquic.pgd" COPYONLY) + set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /USEPROFILE:PGD=${QUIC_OUTPUT_DIR}/msquic.pgd") +@@ -387,21 +387,29 @@ endif() + if(QUIC_TLS STREQUAL "openssl") + if (WIN32) + if (QUIC_UWP_BUILD) +- message(FATAL_ERROR "UWP is not supported with OpenSSL") +- endif() +- +- if (${CMAKE_GENERATOR_PLATFORM} STREQUAL "arm64") +- set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64-ARM") +- elseif (${CMAKE_GENERATOR_PLATFORM} STREQUAL "arm") +- set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32-ARM") +- elseif (${CMAKE_GENERATOR_PLATFORM} STREQUAL "Win32") +- set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32") +- elseif (${CMAKE_GENERATOR_PLATFORM} STREQUAL "x64") +- set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64A") ++ if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") ++ set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64-ARM") ++ elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") ++ set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32-ARM") ++ elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") ++ set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32-ONECORE") ++ elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") ++ set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64A-ONECORE") ++ endif() + else() +- message(FATAL_ERROR "Unknown Generator Platform ${CMAKE_GENERATOR_PLATFORM}") ++ if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") ++ set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64-ARM") ++ elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") ++ set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32-ARM") ++ elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") ++ set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32") ++ elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") ++ set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64A") ++ endif() ++ endif() ++ if(NOT DEFINED QUIC_OPENSSL_WIN_ARCH) ++ message(FATAL_ERROR "Unknown Platform ${VCPKG_TARGET_ARCHITECTURE}") + endif() +- + set(OPENSSL_DIR ${QUIC_BUILD_DIR}/openssl) + + add_library(OpenSSL_Crypto STATIC IMPORTED) diff --git a/externals/vcpkg/ports/ms-quic/fix-warnings.patch b/externals/vcpkg/ports/ms-quic/fix-warnings.patch new file mode 100755 index 000000000..bf99b8863 --- /dev/null +++ b/externals/vcpkg/ports/ms-quic/fix-warnings.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0f5abcb..aeae310 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -184,7 +184,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${QUIC_OUTPUT_DIR}) + set(QUIC_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/inc) + + if (WIN32) +- set(QUIC_WARNING_FLAGS /WX /W4 /sdl CACHE INTERNAL "") ++ set(QUIC_WARNING_FLAGS /W4 /sdl CACHE INTERNAL "") + set(QUIC_COMMON_FLAGS "") + if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") + list(APPEND QUIC_COMMON_FLAGS /MP) +@@ -193,7 +193,7 @@ if (WIN32) + else() + set(QUIC_COMMON_FLAGS "") + set(QUIC_COMMON_DEFINES _GNU_SOURCE) +- set(QUIC_WARNING_FLAGS -Werror -Wall -Wextra -Wformat=2 -Wno-type-limits ++ set(QUIC_WARNING_FLAGS -Wall -Wextra -Wformat=2 -Wno-type-limits + -Wno-unknown-pragmas -Wno-multichar -Wno-missing-field-initializers + CACHE INTERNAL "") + if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0) diff --git a/externals/vcpkg/ports/ms-quic/portfile.cmake b/externals/vcpkg/ports/ms-quic/portfile.cmake new file mode 100755 index 000000000..e4e44d673 --- /dev/null +++ b/externals/vcpkg/ports/ms-quic/portfile.cmake @@ -0,0 +1,80 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH QUIC_SOURCE_PATH + REPO microsoft/msquic + REF v1.2.0 + SHA512 6f63d42d950cbba88764332b31818a8627e7d3ecf7393cdef77daedd35a7bb04ac39c642991afb7cca502a346999233023e3b36011916c67e348179838aa7042 + HEAD_REF master + PATCHES + fix-warnings.patch # Remove /WX, -Werror + fix-platform.patch # Make OpenSSL build use VCPKG_TARGET_ARCHITECTURE + fix-install.patch # Adjust install path of build outputs +) + +vcpkg_from_github( + OUT_SOURCE_PATH OPENSSL_SOURCE_PATH + REPO quictls/openssl + REF a6e9d76db343605dae9b59d71d2811b195ae7434 + SHA512 23510a11203b96476c194a1987c7d4e758375adef0f6dfe319cd8ec4b8dd9b12ea64c4099cf3ba35722b992dad75afb1cfc5126489a5fa59f5ee4d46bdfbeaf6 + HEAD_REF OpenSSL_1_1_1k+quic +) +file(REMOVE_RECURSE ${QUIC_SOURCE_PATH}/submodules) +file(MAKE_DIRECTORY ${QUIC_SOURCE_PATH}/submodules) +file(RENAME ${OPENSSL_SOURCE_PATH} ${QUIC_SOURCE_PATH}/submodules/openssl) + +vcpkg_find_acquire_program(PERL) +get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) +vcpkg_add_to_path(${PERL_EXE_PATH}) + +if(NOT VCPKG_HOST_IS_WINDOWS) + find_program(MAKE make) + get_filename_component(MAKE_EXE_PATH ${MAKE} DIRECTORY) + vcpkg_add_to_path(PREPEND ${MAKE_EXE_PATH}) +endif() + + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_find_acquire_program(NASM) + get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) + vcpkg_add_to_path(PREPEND ${NASM_EXE_PATH}) + endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools QUIC_BUILD_TOOLS +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) + +vcpkg_cmake_configure( + SOURCE_PATH ${QUIC_SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} + -DQUIC_SOURCE_LINK=OFF + -DQUIC_TLS=openssl + -DQUIC_TLS_SECRETS_SUPPORT=ON + -DQUIC_USE_SYSTEM_LIBCRYPTO=OFF + -DQUIC_BUILD_PERF=OFF + -DQUIC_BUILD_TEST=OFF + -DQUIC_STATIC_LINK_CRT=${STATIC_CRT} + -DQUIC_UWP_BUILD=${VCPKG_TARGET_IS_UWP} +) + +vcpkg_cmake_build(TARGET OpenSSL_Build) # separate build log for quictls/openssl +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME msquic CONFIG_PATH lib/cmake/msquic) + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES quicattack quicinterop quicinteropserver quicipclient quicipserver + quicpcp quicping quicpost quicreach quicsample spinquic + AUTO_CLEAN + ) +endif() + +file(INSTALL ${QUIC_SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright +) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share + ${CURRENT_PACKAGES_DIR}/debug/include +) diff --git a/externals/vcpkg/ports/ms-quic/vcpkg.json b/externals/vcpkg/ports/ms-quic/vcpkg.json new file mode 100755 index 000000000..d337a8452 --- /dev/null +++ b/externals/vcpkg/ports/ms-quic/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "ms-quic", + "version": "1.2.0", + "description": "Cross-platform, C implementation of the IETF QUIC protocol", + "homepage": "https://github.com/microsoft/msquic", + "license": "MIT", + "supports": "!(static & staticcrt)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "Install the tools after build" + } + } +} diff --git a/externals/vcpkg/ports/msdfgen/portfile.cmake b/externals/vcpkg/ports/msdfgen/portfile.cmake new file mode 100755 index 000000000..fd187b8e5 --- /dev/null +++ b/externals/vcpkg/ports/msdfgen/portfile.cmake @@ -0,0 +1,42 @@ +# No symbols are exported in msdfgen source +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +if ("tools" IN_LIST FEATURES AND VCPKG_TARGET_IS_UWP) + message(FATAL_ERROR "Tools cannot be built on UWP.") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Chlumsky/msdfgen + REF v1.9.2 + SHA512 5080a640c353fde86883946a04581a072b39d0d2111b5f3217344510d78324cea69df4e5046a380e84cf7da247d96efd4407c041991fae69e128ba435774e30f + HEAD_REF master +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools MSDFGEN_BUILD_STANDALONE + openmp MSDFGEN_USE_OPENMP +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/msdfgen) + +# move exe to tools +if("tools" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_copy_tools(TOOL_NAMES msdfgen AUTO_CLEAN) +endif() + +# cleanup +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# license +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/msdfgen/vcpkg.json b/externals/vcpkg/ports/msdfgen/vcpkg.json new file mode 100755 index 000000000..7ecbe554f --- /dev/null +++ b/externals/vcpkg/ports/msdfgen/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "msdfgen", + "version": "1.9.2", + "description": "Multi-channel signed distance field generator", + "homepage": "https://github.com/Chlumsky/msdfgen", + "license": "MIT", + "dependencies": [ + "freetype", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "openmp": { + "description": "Build with OpenMP support for multi-threaded code." + }, + "tools": { + "description": "Generates an executable inside the tools folder. Not supported on UWP." + } + } +} diff --git a/externals/vcpkg/ports/msgpack/portfile.cmake b/externals/vcpkg/ports/msgpack/portfile.cmake new file mode 100755 index 000000000..13a626304 --- /dev/null +++ b/externals/vcpkg/ports/msgpack/portfile.cmake @@ -0,0 +1,39 @@ +if (EXISTS ${CURRENT_INSTALLED_DIR}/include/msgpack/pack.h) + message(FATAL_ERROR "Cannot install ${PORT} when rest-rpc is already installed, please remove rest-rpc using \"./vcpkg remove rest-rpc:${TARGET_TRIPLET}\"") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO msgpack/msgpack-c + REF cpp-3.3.0 + SHA512 33ed87b23d776cadcc230666e6435088e402c5813e7e4dce5ce79c8c3aceba5a36db8f395278042c6ac44c474b33018ff1635889d8b20bc41c5f6f1d1c963cae + HEAD_REF master +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(MSGPACK_ENABLE_SHARED OFF) + set(MSGPACK_ENABLE_STATIC ON) +else() + set(MSGPACK_ENABLE_SHARED ON) + set(MSGPACK_ENABLE_STATIC OFF) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DMSGPACK_ENABLE_SHARED=${MSGPACK_ENABLE_SHARED} + -DMSGPACK_ENABLE_STATIC=${MSGPACK_ENABLE_STATIC} + -DMSGPACK_BUILD_EXAMPLES=OFF + -DMSGPACK_BUILD_TESTS=OFF) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/msgpack) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/msgpack) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/msgpack/COPYING ${CURRENT_PACKAGES_DIR}/share/msgpack/copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/msgpack/vcpkg.json b/externals/vcpkg/ports/msgpack/vcpkg.json new file mode 100755 index 000000000..a76f2c6fd --- /dev/null +++ b/externals/vcpkg/ports/msgpack/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "msgpack", + "version-string": "3.3.0", + "port-version": 2, + "description": "MessagePack is an efficient binary serialization format, which lets you exchange data among multiple languages like JSON, except that it's faster and smaller.", + "homepage": "https://github.com/msgpack/msgpack-c" +} diff --git a/externals/vcpkg/ports/msgpack11/disable-werror.patch b/externals/vcpkg/ports/msgpack11/disable-werror.patch new file mode 100755 index 000000000..eb4a17e08 --- /dev/null +++ b/externals/vcpkg/ports/msgpack11/disable-werror.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 080cefa..b73072a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,9 +9,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) + add_library(msgpack11 STATIC msgpack11.cpp) + target_include_directories(msgpack11 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + target_compile_options(msgpack11 PRIVATE -fno-rtti) +-if(NOT MSVC) +- target_compile_options(msgpack11 PRIVATE -Wall -Wextra -Werror) +-endif() + configure_file("msgpack11.pc.in" "msgpack11.pc" @ONLY) + + if (MSGPACK11_BUILD_TESTS) diff --git a/externals/vcpkg/ports/msgpack11/fix-additerator.patch b/externals/vcpkg/ports/msgpack11/fix-additerator.patch new file mode 100755 index 000000000..5a6b23227 --- /dev/null +++ b/externals/vcpkg/ports/msgpack11/fix-additerator.patch @@ -0,0 +1,12 @@ +diff --git a/msgpack11.cpp b/msgpack11.cpp +index fa572fa..640ba9a 100644 +--- a/msgpack11.cpp ++++ b/msgpack11.cpp +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + + namespace msgpack11 { + diff --git a/externals/vcpkg/ports/msgpack11/msvc.patch b/externals/vcpkg/ports/msgpack11/msvc.patch new file mode 100755 index 000000000..b7e02937a --- /dev/null +++ b/externals/vcpkg/ports/msgpack11/msvc.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9424838..080cefa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,9 +6,12 @@ option(MSGPACK11_BUILD_TESTS "Build unit tests" ON) + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + +-add_library(msgpack11 msgpack11.cpp) ++add_library(msgpack11 STATIC msgpack11.cpp) + target_include_directories(msgpack11 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +-target_compile_options(msgpack11 PRIVATE -fno-rtti -Wall -Wextra -Werror) ++target_compile_options(msgpack11 PRIVATE -fno-rtti) ++if(NOT MSVC) ++ target_compile_options(msgpack11 PRIVATE -Wall -Wextra -Werror) ++endif() + configure_file("msgpack11.pc.in" "msgpack11.pc" @ONLY) + + if (MSGPACK11_BUILD_TESTS) diff --git a/externals/vcpkg/ports/msgpack11/portfile.cmake b/externals/vcpkg/ports/msgpack11/portfile.cmake new file mode 100755 index 000000000..d0783dece --- /dev/null +++ b/externals/vcpkg/ports/msgpack11/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ar90n/msgpack11 + REF v0.0.10 + SHA512 7b90893f9cdec529789f6e75703f5945c6fc5c946b8708a7a2cb295faf4af111c8cc61265b636f385641031b85181929205be9c5d155f405909445dce85b4ce8 + HEAD_REF master + PATCHES + msvc.patch + fix-additerator.patch + disable-werror.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DMSGPACK11_BUILD_TESTS=OFF + -DMSGPACK11_BUILD_EXAMPLES=OFF +) + + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/msgpack11/vcpkg.json b/externals/vcpkg/ports/msgpack11/vcpkg.json new file mode 100755 index 000000000..f76e0a28a --- /dev/null +++ b/externals/vcpkg/ports/msgpack11/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "msgpack11", + "version": "0.0.10", + "port-version": 3, + "description": "msgpack11 is a tiny MsgPack library for C++11, providing MsgPack parsing and serialization.This library is inspired by json11.The API of msgpack11 is designed to be similar with json11.", + "homepage": "https://msgpack.org", + "dependencies": [ + "gtest" + ] +} diff --git a/externals/vcpkg/ports/msinttypes/portfile.cmake b/externals/vcpkg/ports/msinttypes/portfile.cmake new file mode 100755 index 000000000..beb6ea711 --- /dev/null +++ b/externals/vcpkg/ports/msinttypes/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO chemeris/msinttypes + REF f9e7c5758ed9e3b9f4b2394de1881c704dd79de0 + SHA512 943ccb1245e41ad554908fd7664725f2aac929222bd823b375fbd2e8a4c4ffc42c268543c43a817b65dca047c3253d04527378ec3902e5e7df7f6ba5a736d6f3 + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/inttypes.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/msinttypes) +file(INSTALL ${SOURCE_PATH}/stdint.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/msinttypes) +file(INSTALL ${SOURCE_PATH}/stdint.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/msinttypes RENAME copyright) diff --git a/externals/vcpkg/ports/msinttypes/vcpkg.json b/externals/vcpkg/ports/msinttypes/vcpkg.json new file mode 100755 index 000000000..46bc22f18 --- /dev/null +++ b/externals/vcpkg/ports/msinttypes/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "msinttypes", + "version-string": "2018-02-25", + "port-version": 1, + "description": "msinttypes is a package to provide missing ISO C9x compliant headers for Microsoft Visual Studio", + "homepage": "https://github.com/chemeris/msinttypes" +} diff --git a/externals/vcpkg/ports/msix/CMakeLists.txt b/externals/vcpkg/ports/msix/CMakeLists.txt new file mode 100755 index 000000000..166d9042b --- /dev/null +++ b/externals/vcpkg/ports/msix/CMakeLists.txt @@ -0,0 +1,15 @@ +cmake_minimum_required(VERSION 3.14) + +add_custom_target(LIBS) + +find_package(XercesC CONFIG REQUIRED) +add_library(xerces-c INTERFACE IMPORTED GLOBAL) +target_link_libraries(xerces-c INTERFACE XercesC::XercesC) + +find_package(ZLIB REQUIRED) + +add_library(zlib INTERFACE IMPORTED GLOBAL) +add_library(zlibstatic INTERFACE IMPORTED GLOBAL) + +target_link_libraries(zlib INTERFACE ZLIB::ZLIB) +target_link_libraries(zlibstatic INTERFACE ZLIB::ZLIB) diff --git a/externals/vcpkg/ports/msix/fix-dependency-catch2.patch b/externals/vcpkg/ports/msix/fix-dependency-catch2.patch new file mode 100755 index 000000000..4b2030566 --- /dev/null +++ b/externals/vcpkg/ports/msix/fix-dependency-catch2.patch @@ -0,0 +1,22 @@ +diff --git a/src/test/msixtest/CMakeLists.txt b/src/test/msixtest/CMakeLists.txt +index e991231..e5c43ed 100644 +--- a/src/test/msixtest/CMakeLists.txt ++++ b/src/test/msixtest/CMakeLists.txt +@@ -5,6 +5,8 @@ + cmake_minimum_required(VERSION 3.8.0 FATAL_ERROR) + project (msixtest) + ++find_package(Catch2 CONFIG REQUIRED) ++ + if(WIN32) + set(DESCRIPTION "msixtest manifest") + configure_file(${MSIX_PROJECT_ROOT}/manifest.cmakein ${MSIX_TEST_OUTPUT_DIRECTORY}/${PROJECT_NAME}.exe.manifest CRLF) +@@ -91,7 +93,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES + ) + + add_dependencies(${PROJECT_NAME} msix) +-target_link_libraries(${PROJECT_NAME} msix) ++target_link_libraries(${PROJECT_NAME} msix Catch2::Catch2) + + # For windows copy the library + if(WIN32) diff --git a/externals/vcpkg/ports/msix/install-cmake.patch b/externals/vcpkg/ports/msix/install-cmake.patch new file mode 100755 index 000000000..e8f930f61 --- /dev/null +++ b/externals/vcpkg/ports/msix/install-cmake.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 20098bf..38c3c95 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -190,3 +190,5 @@ message(STATUS "src processed") + add_subdirectory(sample) + message(STATUS "sample processed") + message(STATUS "DONE!") ++ ++install(TARGETS msix) +\ No newline at end of file +diff --git a/src/msix/CMakeLists.txt b/src/msix/CMakeLists.txt +index 296eda4..cf87993 100644 +--- a/src/msix/CMakeLists.txt ++++ b/src/msix/CMakeLists.txt +@@ -87,9 +87,9 @@ endif() + include(msix_resources) # Handles all the certificates and schemas we are going to use. + + set(LIB_PUBLIC_HEADERS +- ../inc/AppxPackaging.hpp +- ../inc/MSIXWindows.hpp +- ../inc/MsixErrors.hpp ++ ${CMAKE_CURRENT_SOURCE_DIR}/../inc/AppxPackaging.hpp ++ ${CMAKE_CURRENT_SOURCE_DIR}/../inc/MSIXWindows.hpp ++ ${CMAKE_CURRENT_SOURCE_DIR}/../inc/MsixErrors.hpp + ) + + set(MsixSrc) # list with all the files we are going to use +@@ -260,7 +260,7 @@ if(WIN32) + "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll") + string(REPLACE ";" " " DELAYFLAGS "${DELAYFLAGS}") + set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS "${DELAYFLAGS} /LTCG") +- set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS " /DEF:windowsexports.def") ++ set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS " /DEF:${CMAKE_CURRENT_BINARY_DIR}/windowsexports.def") + if(USE_STATIC_MSVC) + if(CMAKE_BUILD_TYPE MATCHES Debug) + set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS " /NODEFAULTLIB:MSVCRTD") diff --git a/externals/vcpkg/ports/msix/portfile.cmake b/externals/vcpkg/ports/msix/portfile.cmake new file mode 100755 index 000000000..2dbd06fe8 --- /dev/null +++ b/externals/vcpkg/ports/msix/portfile.cmake @@ -0,0 +1,51 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/msix-packaging + REF ab322965d64baf1448548cbe18139e8872d686f2 # v1.7 + SHA512 d64767c84d5933bf3d1e0e62e9dc21fa13e02b8cf31776ccbe2e7066e514798d8ff758dc2b6fd64f6eabcf3deb83ef0eaa03e1a7d407307f347a045e8a75d3dd + HEAD_REF master + PATCHES + install-cmake.patch + fix-dependency-catch2.patch +) + +file(REMOVE_RECURSE ${SOURCE_PATH}/lib) +file(MAKE_DIRECTORY ${SOURCE_PATH}/lib) +configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${SOURCE_PATH}/lib/CMakeLists.txt) + +if(VCPKG_TARGET_IS_WINDOWS) + set(PLATFORM WIN32) + set(CRYPTO_LIB crypt32) +elseif(VCPKG_TARGET_IS_LINUX) + set(PLATFORM LINUX) + set(CRYPTO_LIB openssl) +elseif(VCPKG_TARGET_IS_OSX) + set(PLATFORM MACOS) + set(CRYPTO_LIB openssl) +else() + message(FATAL_ERROR "Unknown system: ${VCPKG_CMAKE_SYSTEM_NAME}") +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + NO_CHARSET_FLAG + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON + -DINSTALL_LIBMSIX=ON + -DUSE_SHARED_ZLIB=ON + -D${PLATFORM}=ON + -DXML_PARSER=xerces + -DCRYPTO_LIB=${CRYPTO_LIB} +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/msix/vcpkg.json b/externals/vcpkg/ports/msix/vcpkg.json new file mode 100755 index 000000000..589d03298 --- /dev/null +++ b/externals/vcpkg/ports/msix/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "msix", + "version": "1.7", + "port-version": 4, + "description": "The MSIX Packaging SDK project is an effort to enable developers on a variety of platforms to pack and unpack packages for the purposes of distribution from either the Microsoft Store, or their own content distribution networks.The MSIX Packaging APIs that a client app would use to interact with .msix/.appx packages are a subset of those documented here. See sample/ExtractContentsSample/ExtractContentsSample.cpp for additional details.", + "homepage": "https://github.com/microsoft/msix-packaging", + "license": "MIT", + "supports": "!static", + "dependencies": [ + "catch2", + { + "name": "openssl", + "platform": "!uwp & !windows" + }, + "xerces-c", + "zlib" + ] +} diff --git a/externals/vcpkg/ports/msmpi/mpi-wrapper.cmake b/externals/vcpkg/ports/msmpi/mpi-wrapper.cmake new file mode 100755 index 000000000..03fc46c4f --- /dev/null +++ b/externals/vcpkg/ports/msmpi/mpi-wrapper.cmake @@ -0,0 +1,9 @@ +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + +# Suitable for FindMPI.cmake line 937 +set(ENV{MSMPI_INC} "${_IMPORT_PREFIX}/include") +unset(_IMPORT_PREFIX) + +_find_package(${ARGS}) diff --git a/externals/vcpkg/ports/msmpi/portfile.cmake b/externals/vcpkg/ports/msmpi/portfile.cmake new file mode 100755 index 000000000..75dd39052 --- /dev/null +++ b/externals/vcpkg/ports/msmpi/portfile.cmake @@ -0,0 +1,128 @@ +set(MSMPI_VERSION "10.1.12498") +set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/msmpi-${MSMPI_VERSION}") + +vcpkg_download_distfile(SDK_ARCHIVE + URLS "https://download.microsoft.com/download/a/5/2/a5207ca5-1203-491a-8fb8-906fd68ae623/msmpisdk.msi" + FILENAME "msmpisdk-${MSMPI_VERSION}-b0087dfd.msi" + SHA512 b0087dfd21423bf87b94b17d7cb03576838585371bbf8b03cca95c3ad73670108c7bc6517b0de852ef595072cc4143be2011636e7242bcb080394d94294848a7 +) + + +#to enable CI, you should modify the following URL also in ${VCPKG_ROOT}/scripts/azure-pipelines/windows/provision-image.ps1 +macro(download_msmpi_redistributable_package) + vcpkg_download_distfile(REDIST_ARCHIVE + URLS "https://download.microsoft.com/download/a/5/2/a5207ca5-1203-491a-8fb8-906fd68ae623/msmpisetup.exe" + FILENAME "msmpisetup-${MSMPI_VERSION}.exe" + SHA512 1ee463e7dfc3e55a7ac048fdfde13fef09a5eea4b74d8fd7c22a7aad667a025b467ce939e5de308e25bbc186c3fe66e0e24ac03a3741656fc7558f2af2fa132a + ) +endmacro() + +### Check for correct version of installed redistributable package + +# We always want the ProgramFiles folder even on a 64-bit machine (not the ProgramFilesx86 folder) +vcpkg_get_program_files_platform_bitness(PROGRAM_FILES_PLATFORM_BITNESS) +set(SYSTEM_MPIEXEC_FILEPATH "${PROGRAM_FILES_PLATFORM_BITNESS}/Microsoft MPI/Bin/mpiexec.exe") + +if(EXISTS "${SYSTEM_MPIEXEC_FILEPATH}") + set(MPIEXEC_VERSION_LOGNAME "mpiexec-version") + vcpkg_execute_required_process( + COMMAND ${SYSTEM_MPIEXEC_FILEPATH} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME ${MPIEXEC_VERSION_LOGNAME} + ) + file(READ "${CURRENT_BUILDTREES_DIR}/${MPIEXEC_VERSION_LOGNAME}-out.log" MPIEXEC_OUTPUT) + + if(MPIEXEC_OUTPUT MATCHES "\\[Version ([0-9]+\\.[0-9]+\\.[0-9]+)\\.[0-9]+\\]") + if(NOT CMAKE_MATCH_1 STREQUAL MSMPI_VERSION) + download_msmpi_redistributable_package() + + message(FATAL_ERROR + " The version of the installed MSMPI redistributable packages does not match the version to be installed\n" + " Expected version: ${MSMPI_VERSION}\n" + " Found version: ${CMAKE_MATCH_1}\n" + " Please upgrade the installed version on your system.\n" + " The appropriate installer for the expected version has been downloaded to:\n" + " ${REDIST_ARCHIVE}\n") + endif() + else() + message(FATAL_ERROR + " Could not determine installed MSMPI redistributable package version.\n" + " See logs for more information:\n" + " ${CURRENT_BUILDTREES_DIR}\\${MPIEXEC_VERSION_LOGNAME}-out.log\n" + " ${CURRENT_BUILDTREES_DIR}\\${MPIEXEC_VERSION_LOGNAME}-err.log\n") + endif() +else() + download_msmpi_redistributable_package() + + message(FATAL_ERROR + " Could not find:\n" + " ${SYSTEM_MPIEXEC_FILEPATH}\n" + " Please install the MSMPI redistributable package before trying to install this port.\n" + " The appropriate installer has been downloaded to:\n" + " ${REDIST_ARCHIVE}\n") +endif() + +file(TO_NATIVE_PATH "${SDK_ARCHIVE}" SDK_ARCHIVE) +file(TO_NATIVE_PATH "${SOURCE_PATH}/sdk" SDK_SOURCE_DIR) +file(TO_NATIVE_PATH "${CURRENT_BUILDTREES_DIR}/msiexec-${TARGET_TRIPLET}.log" MSIEXEC_LOG_PATH) + +set(PARAM_MSI "/a \"${SDK_ARCHIVE}\"") +set(PARAM_LOG "/log \"${MSIEXEC_LOG_PATH}\"") +set(PARAM_TARGET_DIR "TARGETDIR=\"${SDK_SOURCE_DIR}\"") +set(SCRIPT_FILE "${CURRENT_BUILDTREES_DIR}/msiextract-msmpi.bat") +# Write the command out to a script file and run that to avoid weird escaping behavior when spaces are present +file(WRITE ${SCRIPT_FILE} "msiexec ${PARAM_MSI} /qn ${PARAM_LOG} ${PARAM_TARGET_DIR}") + +vcpkg_execute_required_process( + COMMAND ${SCRIPT_FILE} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME extract-sdk +) + +set(SOURCE_INCLUDE_PATH "${SOURCE_PATH}/sdk/PFiles/Microsoft SDKs/MPI/Include") +set(SOURCE_LIB_PATH "${SOURCE_PATH}/sdk/PFiles/Microsoft SDKs/MPI/Lib") + +# Install include files +file(INSTALL + "${SOURCE_INCLUDE_PATH}/mpi.h" + "${SOURCE_INCLUDE_PATH}/mpif.h" + "${SOURCE_INCLUDE_PATH}/mpi.f90" + "${SOURCE_INCLUDE_PATH}/mpio.h" + "${SOURCE_INCLUDE_PATH}/mspms.h" + "${SOURCE_INCLUDE_PATH}/pmidbg.h" + "${SOURCE_INCLUDE_PATH}/${TRIPLET_SYSTEM_ARCH}/mpifptr.h" + DESTINATION + "${CURRENT_PACKAGES_DIR}/include" +) + +# NOTE: since the binary distribution does not include any debug libraries we always install the release libraries +SET(VCPKG_POLICY_ONLY_RELEASE_CRT enabled) + +file(GLOB STATIC_LIBS + "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifec.lib" + "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifmc.lib" + "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifes.lib" + "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifms.lib" +) + +file(INSTALL + "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpi.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib" +) +file(INSTALL + "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpi.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" +) + +if(VCPKG_CRT_LINKAGE STREQUAL "static") + file(INSTALL ${STATIC_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL ${STATIC_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +endif() + + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/mpi-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +# Handle copyright +file(COPY "${SOURCE_PATH}/sdk/PFiles/Microsoft SDKs/MPI/License/MicrosoftMPI-SDK-EULA.rtf" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(COPY "${SOURCE_PATH}/sdk/PFiles/Microsoft SDKs/MPI/License/MPI-SDK-TPN.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "See the accompanying MicrosoftMPI-SDK-EULA.rtf and MPI-SDK-TPN.txt") diff --git a/externals/vcpkg/ports/msmpi/vcpkg.json b/externals/vcpkg/ports/msmpi/vcpkg.json new file mode 100755 index 000000000..972571482 --- /dev/null +++ b/externals/vcpkg/ports/msmpi/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "msmpi", + "version": "10.1.12498", + "port-version": 4, + "description": "Microsoft MPI (MS-MPI) is a Microsoft implementation of the Message Passing Interface standard for developing and running parallel applications on the Windows platform.", + "homepage": "https://docs.microsoft.com/en-us/message-passing-interface/microsoft-mpi", + "license": "MIT", + "supports": "windows & !uwp" +} diff --git a/externals/vcpkg/ports/mstch/do-not-force-release.patch b/externals/vcpkg/ports/mstch/do-not-force-release.patch new file mode 100755 index 000000000..63916f5f4 --- /dev/null +++ b/externals/vcpkg/ports/mstch/do-not-force-release.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8d8e0c7..4304ad7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,17 +5,17 @@ option(WITH_UNIT_TESTS "enable building unit test executable" OFF) + option(WITH_BENCHMARK "enable building benchmark executable" OFF) + + set(CMAKE_INCLUDE_CURRENT_DIR ON) +-set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) +-set(CMAKE_BUILD_TYPE Release) + + set(mstch_VERSION 1.0.1) + + if(NOT MSVC) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -O3") ++ set(CMAKE_CXX_STANDARD 11) + endif() + + add_subdirectory(src) + ++target_include_directories(mstch PUBLIC $) ++ + if(WITH_UNIT_TESTS) + enable_testing() + add_subdirectory(vendor/headerize) diff --git a/externals/vcpkg/ports/mstch/portfile.cmake b/externals/vcpkg/ports/mstch/portfile.cmake new file mode 100755 index 000000000..e742273af --- /dev/null +++ b/externals/vcpkg/ports/mstch/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO no1msd/mstch + REF ff459067bd02e80dc399006bb610238223d41c50 #1.0.2 + SHA512 b01f4c3e39a40fc9a6accc81ecbfac4b8a9ce1c2ec3df441a16039f4bf126dfeef83f87d3a5e9ec03dc133a1c5f54f5bc931479915e8a92bbfc8ebbc87c8e4dd + HEAD_REF master + PATCHES do-not-force-release.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/mstch) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/mstch/vcpkg.json b/externals/vcpkg/ports/mstch/vcpkg.json new file mode 100755 index 000000000..489584814 --- /dev/null +++ b/externals/vcpkg/ports/mstch/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "mstch", + "version-string": "1.0.2", + "port-version": 3, + "description": "Mstch is a complete implementation of {{mustache}} templates using modern C++", + "homepage": "https://github.com/no1msd/mstch", + "dependencies": [ + "boost-variant" + ] +} diff --git a/externals/vcpkg/ports/mujs/CMakeLists.txt b/externals/vcpkg/ports/mujs/CMakeLists.txt new file mode 100755 index 000000000..639d2a965 --- /dev/null +++ b/externals/vcpkg/ports/mujs/CMakeLists.txt @@ -0,0 +1,24 @@ +cmake_minimum_required(VERSION 3.9) +project(mujs) + +if(MSVC) + add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS) +endif() + +file(GLOB libmujs_sources js*.c utf*.c regexp.c) + +include_directories(.) + + +add_library(libmujs ${libmujs_sources}) + +install( + TARGETS libmujs + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES mujs.h DESTINATION include) +endif() diff --git a/externals/vcpkg/ports/mujs/portfile.cmake b/externals/vcpkg/ports/mujs/portfile.cmake new file mode 100755 index 000000000..3475307dc --- /dev/null +++ b/externals/vcpkg/ports/mujs/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ccxvii/mujs + REF c86267d8b2b5f9a6ae318dc69886109eee0c7b61 + SHA512 927b000cd6a28b785d510917445a5a39a4dbaf0e13eab920cf83c7838b111b8a0542cfab0110f8493dc65b88a48261deb6ba7a871cbe77fb46119b536a69d470 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/mujs RENAME copyright) diff --git a/externals/vcpkg/ports/mujs/vcpkg.json b/externals/vcpkg/ports/mujs/vcpkg.json new file mode 100755 index 000000000..689ad0d5b --- /dev/null +++ b/externals/vcpkg/ports/mujs/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "mujs", + "version-string": "2018-07-30", + "port-version": 2, + "description": "An embeddable Javascript interpreter in C", + "homepage": "https://github.com/ccxvii/mujs" +} diff --git a/externals/vcpkg/ports/munit/fix-install.patch b/externals/vcpkg/ports/munit/fix-install.patch new file mode 100755 index 000000000..6ba7461ad --- /dev/null +++ b/externals/vcpkg/ports/munit/fix-install.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index c15b405..44ee737 100644 +--- a/meson.build ++++ b/meson.build +@@ -11,7 +11,7 @@ root_include = include_directories('.') + + munit = library('munit', + ['munit.c'], +- install: meson.is_subproject()) ++ install: not meson.is_subproject()) + + if meson.is_subproject() + munit_dep = declare_dependency( diff --git a/externals/vcpkg/ports/munit/portfile.cmake b/externals/vcpkg/ports/munit/portfile.cmake new file mode 100755 index 000000000..37802974d --- /dev/null +++ b/externals/vcpkg/ports/munit/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nemequ/munit + REF da8f73412998e4f1adf1100dc187533a51af77fd + SHA512 cd08c1291a73487f15fdba7bf8675fea9177f0ec9766900f65efb5f00c662532a16499447e9087d304de34ff9138f47d04ebf18713f5aa8aacede22c5e23b98b + HEAD_REF master + PATCHES + fix-install.patch +) + +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_install_meson() + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/munit/vcpkg.json b/externals/vcpkg/ports/munit/vcpkg.json new file mode 100755 index 000000000..4f5cfb85c --- /dev/null +++ b/externals/vcpkg/ports/munit/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "munit", + "version-date": "2019-04-06", + "port-version": 5, + "description": "A small but full-featured unit testing framework for C", + "homepage": "https://github.com/nemequ/munit", + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/muparser/portfile.cmake b/externals/vcpkg/ports/muparser/portfile.cmake new file mode 100755 index 000000000..57efea012 --- /dev/null +++ b/externals/vcpkg/ports/muparser/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO beltoforion/muparser + REF 6d65387be8f4ef329829c6d6ace779b26942e075 # v2.3.3-1 + SHA512 cda1133b534b1c77d80b15d50d71f372a423fab2bc7b9204d106589350b3cfc955dbfdcfe8c17890e3cfd747b559f4d3c4f0ea6c9c3c73e6aa159afc82bcc6c0 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENABLE_SAMPLES=OFF + -DENABLE_OPENMP=OFF + -DENABLE_WIDE_CHAR=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/muparser") +vcpkg_fixup_pkgconfig() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/muParserDef.h" "#if defined(_UNICODE)" "#if 0") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/muParserDLL.h" "#ifndef _UNICODE" "#if 1") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/muParserFixes.h" "#ifndef MUPARSER_STATIC" "#if 0") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/muParserFixes.h" "#ifndef MUPARSER_STATIC" "#if 1") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/muparser/vcpkg.json b/externals/vcpkg/ports/muparser/vcpkg.json new file mode 100755 index 000000000..87f52f1dc --- /dev/null +++ b/externals/vcpkg/ports/muparser/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "muparser", + "version": "2.3.3", + "port-version": 2, + "description": "Fast math parser library", + "homepage": "https://github.com/beltoforion/muparser", + "license": "BSD-2-Clause", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/murmurhash/CMakeLists.txt b/externals/vcpkg/ports/murmurhash/CMakeLists.txt new file mode 100755 index 000000000..83ffe8154 --- /dev/null +++ b/externals/vcpkg/ports/murmurhash/CMakeLists.txt @@ -0,0 +1,53 @@ +cmake_minimum_required(VERSION 3.14) + +set(VERSION "1.0.0") +project(murmurhash LANGUAGES CXX VERSION ${VERSION}) + +set(CMAKE_CXX_STANDARD 17) + +add_library(murmurhash + src/MurmurHash2.cpp + src/MurmurHash3.cpp + ) + +set(MURMUR_HEADERS + src/MurmurHash2.h + src/MurmurHash3.h + ) +set_target_properties(murmurhash PROPERTIES + PUBLIC_HEADER "${MURMUR_HEADERS}" + ) + +#Configuration +set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") +set(config_install_dir "lib/cmake/${PROJECT_NAME}") +set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake") +set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake") +set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") +set(namespace "${PROJECT_NAME}::") + +include(CMakePackageConfigHelpers) + +write_basic_package_version_file( + "${version_config}" COMPATIBILITY SameMajorVersion +) + +configure_package_config_file( + "${CMAKE_SOURCE_DIR}/Config.cmake.in" + "${project_config}" + INSTALL_DESTINATION "${config_install_dir}" +) +#Installation +install(TARGETS murmurhash + EXPORT "${TARGETS_EXPORT_NAME}" + LIBRARY DESTINATION "lib" + ARCHIVE DESTINATION "lib" + PUBLIC_HEADER DESTINATION "include") + +install(FILES "${project_config}" "${version_config}" + DESTINATION "${config_install_dir}" + ) +install(EXPORT "${TARGETS_EXPORT_NAME}" + NAMESPACE "${namespace}" + DESTINATION "${config_install_dir}" + ) \ No newline at end of file diff --git a/externals/vcpkg/ports/murmurhash/Config.cmake.in b/externals/vcpkg/ports/murmurhash/Config.cmake.in new file mode 100755 index 000000000..38bbde7b3 --- /dev/null +++ b/externals/vcpkg/ports/murmurhash/Config.cmake.in @@ -0,0 +1,4 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") +check_required_components("@PROJECT_NAME@") diff --git a/externals/vcpkg/ports/murmurhash/portfile.cmake b/externals/vcpkg/ports/murmurhash/portfile.cmake new file mode 100755 index 000000000..c83ebe084 --- /dev/null +++ b/externals/vcpkg/ports/murmurhash/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO aappleby/smhasher + REF 61a0530f28277f2e850bfc39600ce61d02b518de + SHA512 36877b53386153c20421ccd32d544c28ee72f6f13ea37c14ab1a1db378f6463db28339b2149671c12611384497bf595b798e99c34ea0ebceb6f9ef2f8908a2b6 + HEAD_REF master +) + +configure_file(${CURRENT_PORT_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) +configure_file(${CURRENT_PORT_DIR}/Config.cmake.in ${SOURCE_PATH}/Config.cmake.in COPYONLY) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "MurmurHash3 was written by Austin Appleby, and is placed in the public domain. The author hereby disclaims copyright to this source code.") diff --git a/externals/vcpkg/ports/murmurhash/vcpkg.json b/externals/vcpkg/ports/murmurhash/vcpkg.json new file mode 100755 index 000000000..34166cf24 --- /dev/null +++ b/externals/vcpkg/ports/murmurhash/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "murmurhash", + "version-date": "2016-01-09", + "port-version": 5, + "description": "MurmurHash a family of hash functions.", + "homepage": "https://github.com/aappleby/smhasher", + "supports": "!uwp & !arm" +} diff --git a/externals/vcpkg/ports/mvfst/portfile.cmake b/externals/vcpkg/ports/mvfst/portfile.cmake new file mode 100755 index 000000000..79dbbeba3 --- /dev/null +++ b/externals/vcpkg/ports/mvfst/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO facebookincubator/mvfst + REF 7c52380a5c445fe478096d7ca10e92797747ae87 + SHA512 5ccebec9652e7a481b599b20a07b0d6585d300cdde3e6b62985c5ce448c0890d537bced6c9dbd77009f89c16311c56fde1f2131064ff5cc3fcb34bf69cb11f06 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTS=OFF + -DBUILD_EXAMPLES=OFF +) + +# Prefer installed config files +file(REMOVE + ${SOURCE_PATH}/fizz/cmake/FindGMock.cmake + ${SOURCE_PATH}/fizz/cmake/FindGflags.cmake + ${SOURCE_PATH}/fizz/cmake/FindGlog.cmake + ${SOURCE_PATH}/fizz/cmake/FindLibevent.cmake +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mvfst) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/mvfst/vcpkg.json b/externals/vcpkg/ports/mvfst/vcpkg.json new file mode 100755 index 000000000..4e3df9f61 --- /dev/null +++ b/externals/vcpkg/ports/mvfst/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "mvfst", + "version-date": "2022-03-27", + "description": "mvfst (Pronounced move fast) is a client and server implementation of IETF QUIC protocol in C++ by Facebook.", + "homepage": "https://github.com/facebookincubator/mvfst", + "supports": "!windows", + "dependencies": [ + "boost", + "fizz", + "fmt", + "folly", + "glog", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/mygui/fix-generation.patch b/externals/vcpkg/ports/mygui/fix-generation.patch new file mode 100755 index 000000000..80d69009e --- /dev/null +++ b/externals/vcpkg/ports/mygui/fix-generation.patch @@ -0,0 +1,30 @@ +diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt +index a0ef573..b77566e 100644 +--- a/CMake/CMakeLists.txt ++++ b/CMake/CMakeLists.txt +@@ -5,7 +5,7 @@ + ############################################################# + + if(WIN32) +- set(MYGUI_CMAKE_DIR "CMake") ++ set(MYGUI_CMAKE_DIR "share") + else(WIN32) + set(MYGUI_CMAKE_DIR "lib/MYGUI/cmake") + endif(WIN32) +diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake +index 8fb1ce4..6483339 100644 +--- a/CMake/Utils/MyGUIConfigTargets.cmake ++++ b/CMake/Utils/MyGUIConfigTargets.cmake +@@ -7,10 +7,10 @@ if (WIN32) + set(MYGUI_RELWDBG_PATH "/RelWithDebInfo") + set(MYGUI_MINSIZE_PATH "/MinSizeRel") + set(MYGUI_DEBUG_PATH "/Debug") +- set(MYGUI_LIB_RELEASE_PATH "/Release") ++ set(MYGUI_LIB_RELEASE_PATH "") + set(MYGUI_LIB_RELWDBG_PATH "/RelWithDebInfo") + set(MYGUI_LIB_MINSIZE_PATH "/MinSizeRel") +- set(MYGUI_LIB_DEBUG_PATH "/Debug") ++ set(MYGUI_LIB_DEBUG_PATH "") + set(MYGUI_PLUGIN_PATH "/opt") + elseif (UNIX) + set(MYGUI_RELEASE_PATH "") diff --git a/externals/vcpkg/ports/mygui/portfile.cmake b/externals/vcpkg/ports/mygui/portfile.cmake new file mode 100755 index 000000000..c728aefec --- /dev/null +++ b/externals/vcpkg/ports/mygui/portfile.cmake @@ -0,0 +1,45 @@ +# MyGUI supports compiling itself as a DLL, +# but it seems platform-related stuff doesn't support dynamic linkage +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO MyGUI/mygui + REF 81e5c67e92920607d16bc2aee1ac32f6fd7d446b #v3.4.1 + SHA512 b13e0a08559b3ddfe42ffcc6cf017fb20d50168785fb551e16f613c60b9ea28a65056a9bc42bdab876368f40dcba1772bc704ad0928c45d8b32e909abc0f1916 + HEAD_REF master + PATCHES + fix-generation.patch +) + +if("opengl" IN_LIST FEATURES) + set(MYGUI_RENDERSYSTEM 4) +else() + set(MYGUI_RENDERSYSTEM 1) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DMYGUI_STATIC=TRUE + -DMYGUI_BUILD_DEMOS=FALSE + -DMYGUI_BUILD_PLUGINS=TRUE + -DMYGUI_BUILD_TOOLS=FALSE + -DMYGUI_BUILD_UNITTESTS=FALSE + -DMYGUI_BUILD_TEST_APP=FALSE + -DMYGUI_BUILD_WRAPPER=FALSE + -DMYGUI_BUILD_DOCS=FALSE + -DMYGUI_RENDERSYSTEM=${MYGUI_RENDERSYSTEM} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +vcpkg_fixup_pkgconfig() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING.MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/mygui/vcpkg.json b/externals/vcpkg/ports/mygui/vcpkg.json new file mode 100755 index 000000000..aabd5655a --- /dev/null +++ b/externals/vcpkg/ports/mygui/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "mygui", + "version": "3.4.1", + "port-version": 2, + "description": "Fast, flexible and simple GUI", + "homepage": "http://mygui.info", + "supports": "!uwp", + "dependencies": [ + "freetype", + "sdl2-image", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "opengl": { + "description": "Use OpenGL render system.", + "dependencies": [ + "opengl" + ] + } + } +} diff --git a/externals/vcpkg/ports/nameof/portfile.cmake b/externals/vcpkg/ports/nameof/portfile.cmake new file mode 100755 index 000000000..52230b407 --- /dev/null +++ b/externals/vcpkg/ports/nameof/portfile.cmake @@ -0,0 +1,27 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Neargye/nameof + REF v0.10.1 + SHA512 9b3ed7a3f5dcf1ad309341102d2aaa07fc8e9d6db7e08e42c2d9b5453c822ec16d6c6910adf7c4af8879c4084cac362f4fb4c07559cc49594b72b4917816ef5d + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DNAMEOF_OPT_BUILD_EXAMPLES=OFF + -DNAMEOF_OPT_BUILD_TESTS=OFF + -DNAMEOF_OPT_INSTALL=ON +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/nameof TARGET_PATH share/nameof) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/nameof/vcpkg.json b/externals/vcpkg/ports/nameof/vcpkg.json new file mode 100755 index 000000000..78bce0d8e --- /dev/null +++ b/externals/vcpkg/ports/nameof/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "nameof", + "version-string": "0.10.1", + "port-version": 1, + "description": "Nameof operator for modern C++, simply obtain the name of a variable, type, function, macro, and enum.", + "homepage": "https://github.com/Neargye/nameof" +} diff --git a/externals/vcpkg/ports/nana/CMakeLists.txt b/externals/vcpkg/ports/nana/CMakeLists.txt new file mode 100755 index 000000000..c66ce66b5 --- /dev/null +++ b/externals/vcpkg/ports/nana/CMakeLists.txt @@ -0,0 +1,86 @@ +cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) +project(nana VERSION 1.7.4 LANGUAGES CXX) + +option(NANA_ENABLE_PNG "Enable PNG support" OFF) +option(NANA_ENABLE_JPEG "Enable JPEG support" OFF) +option(NANA_INSTALL_HEADERS "Install headers" ON) + +if(APPLE) + add_definitions(-DAPPLE) +elseif(UNIX) + add_definitions(-Dlinux) +endif() + +file(GLOB_RECURSE headers include/*.hpp) +source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/include PREFIX "include" FILES ${headers}) + +file(GLOB sources source/*.hpp source/*.cpp) +foreach(subdir detail filesystem gui paint system threads) + file(GLOB_RECURSE sources_subdir source/${subdir}/*.hpp source/${subdir}/*.cpp) + list(APPEND sources ${sources_subdir}) +endforeach() +source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/source PREFIX "source" FILES ${sources}) + +add_library(nana ${headers} ${sources}) +target_include_directories(nana PUBLIC + $ + $) + +target_compile_features(nana PUBLIC cxx_std_17) + +if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + target_link_libraries(nana PUBLIC c++experimental) +endif() + +if(CMAKE_CXX_COMPILER_ID MATCHES "GCC") + target_link_libraries(nana PUBLIC stdc++fs) +endif() + +if(UNIX) + find_package(Threads REQUIRED) + target_link_libraries(nana PUBLIC Threads::Threads) + + find_package(Freetype REQUIRED) + target_link_libraries(nana PUBLIC Freetype::Freetype) + + find_package(X11 REQUIRED) + target_include_directories(nana PUBLIC ${X11_INCLUDE_DIR}) + target_link_libraries(nana PUBLIC ${X11_LIBRARIES} ${X11_Xft_LIB}) + + find_package(Fontconfig REQUIRED) + target_link_libraries(nana PUBLIC Fontconfig::Fontconfig) +endif() + +if(NANA_ENABLE_PNG) + find_package(PNG REQUIRED) + target_link_libraries(nana PUBLIC PNG::PNG) + target_compile_definitions(nana PUBLIC NANA_ENABLE_PNG=1 USE_LIBPNG_FROM_OS=1) +endif() + +if(NANA_ENABLE_JPEG) + find_package(JPEG REQUIRED) + target_include_directories(nana PUBLIC ${JPEG_INCLUDE_DIR}) + target_link_libraries(nana PUBLIC $) + target_compile_definitions(nana PUBLIC NANA_ENABLE_JPEG=1 USE_LIBJPEG_FROM_OS=1) +endif() + +install(TARGETS nana EXPORT nana + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + +if(NANA_INSTALL_HEADERS) + install(DIRECTORY include/nana DESTINATION include) +endif() + +include(CMakePackageConfigHelpers) + +configure_package_config_file(config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/unofficial-nana-config.cmake + INSTALL_DESTINATION share/unofficial-nana) + +write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/unofficial-nana-config-version.cmake + VERSION ${PROJECT_VERSION} COMPATIBILITY SameMajorVersion) + +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-nana-config.cmake DESTINATION share/unofficial-nana) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-nana-config-version.cmake DESTINATION share/unofficial-nana) +install(EXPORT nana FILE unofficial-nana-targets.cmake NAMESPACE unofficial::nana:: DESTINATION share/unofficial-nana) diff --git a/externals/vcpkg/ports/nana/config.cmake.in b/externals/vcpkg/ports/nana/config.cmake.in new file mode 100755 index 000000000..86d70cc69 --- /dev/null +++ b/externals/vcpkg/ports/nana/config.cmake.in @@ -0,0 +1,30 @@ +@PACKAGE_INIT@ +include(CMakeFindDependencyMacro) + +if(UNIX) + find_dependency(Threads) + find_dependency(Freetype) + find_dependency(X11) + find_dependency(Fontconfig) +endif() + +option(NANA_ENABLE_PNG "Enable PNG support" @NANA_ENABLE_PNG@) +option(NANA_ENABLE_JPEG "Enable JPEG support" @NANA_ENABLE_JPEG@) + +if(NANA_ENABLE_PNG) + find_dependency(PNG) +endif() + +if(NANA_ENABLE_JPEG) + find_dependency(JPEG) +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-nana-targets.cmake") + +if(UNIX) + target_link_libraries(unofficial::nana::nana INTERFACE Fontconfig::Fontconfig ${X11_LIBRARIES} ${X11_Xft_LIB}) +endif() + +if(NANA_ENABLE_JPEG) + target_link_libraries(unofficial::nana::nana INTERFACE ${JPEG_LIBRARIES}) +endif() diff --git a/externals/vcpkg/ports/nana/fix-build-error.patch b/externals/vcpkg/ports/nana/fix-build-error.patch new file mode 100755 index 000000000..d007143dc --- /dev/null +++ b/externals/vcpkg/ports/nana/fix-build-error.patch @@ -0,0 +1,13 @@ +diff --git a/source/system/split_string.cpp b/source/system/split_string.cpp +index 8269db6..c40016b 100644 +--- a/source/system/split_string.cpp ++++ b/source/system/split_string.cpp +@@ -18,7 +18,7 @@ std::vector split_string (const split_string_type& text, char + sep_pos = text.find(sep, sep_pos); + sep_pos = (text.npos == sep_pos ? text.size() : sep_pos); + const std::size_t end = sep_pos; +- while (sep_pos < text.size() and sep == text[sep_pos]) { ++ while (sep_pos < text.size() && sep == text[sep_pos]) { + ++sep_pos; + } + diff --git a/externals/vcpkg/ports/nana/portfile.cmake b/externals/vcpkg/ports/nana/portfile.cmake new file mode 100755 index 000000000..8aa0cbe26 --- /dev/null +++ b/externals/vcpkg/ports/nana/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +if(NOT VCPKG_TARGET_IS_WINDOWS) + message(WARNING "You will need to install Xorg dependencies to use nana:\napt install libx11-dev libxft-dev libxcursor-dev\n") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cnjinhao/nana + REF 554c4fe87fc31b8ee104228e9117d545d34855b5 # v1.7.4 + SHA512 d9db8ea1bd47fe663b8e2443a1a3e279760dbd11ef6bc78d9dc8f6fd12f9736b8c8315dfc84d21325e02ad6b2dc3a429593ac80e7610097ddc7253668c383178 + HEAD_REF develop + PATCHES + fix-build-error.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.cmake.in DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DNANA_ENABLE_PNG=ON + -DNANA_ENABLE_JPEG=ON + OPTIONS_DEBUG + -DNANA_INSTALL_HEADERS=OFF) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-nana TARGET_PATH share/unofficial-nana) + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/nana/vcpkg.json b/externals/vcpkg/ports/nana/vcpkg.json new file mode 100755 index 000000000..c82984e87 --- /dev/null +++ b/externals/vcpkg/ports/nana/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "nana", + "version-string": "1.7.4", + "port-version": 2, + "description": "Cross-platform library for GUI programming in modern C++ style.", + "homepage": "https://github.com/cnjinhao/nana", + "dependencies": [ + { + "name": "fontconfig", + "platform": "!uwp & !windows & !mingw" + }, + { + "name": "freetype", + "platform": "!uwp & !windows & !mingw" + }, + "libjpeg-turbo", + "libpng" + ] +} diff --git a/externals/vcpkg/ports/nano-signal-slot/portfile.cmake b/externals/vcpkg/ports/nano-signal-slot/portfile.cmake new file mode 100755 index 000000000..ea4f9366d --- /dev/null +++ b/externals/vcpkg/ports/nano-signal-slot/portfile.cmake @@ -0,0 +1,12 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO NoAvailableAlias/nano-signal-slot + REF 7e237d75e72501109d1276d7c0c97b33e9d7caf1 + SHA512 a998e59bfded36d9fe2c88d8f3c5229db4fa3c02062f218267f070f4809f63d0bad07300d3cf1f60141ab84bb1802402ac11de06159df6af460f0be4c47f8b9a + HEAD_REF master +) + +file(GLOB INCLUDES ${SOURCE_PATH}/*.hpp) +file(INSTALL ${INCLUDES} DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/nano-signal-slot/vcpkg.json b/externals/vcpkg/ports/nano-signal-slot/vcpkg.json new file mode 100755 index 000000000..55e087106 --- /dev/null +++ b/externals/vcpkg/ports/nano-signal-slot/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "nano-signal-slot", + "version-string": "2.0.1", + "port-version": 1, + "description": "Pure C++17 Signals and Slots", + "homepage": "https://github.com/NoAvailableAlias/nano-signal-slot", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/nanobench/fix-cmakefile.patch b/externals/vcpkg/ports/nanobench/fix-cmakefile.patch new file mode 100755 index 000000000..9dbbf94fd --- /dev/null +++ b/externals/vcpkg/ports/nanobench/fix-cmakefile.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b2f6089..d997097 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,9 +3,6 @@ project(nanobench LANGUAGES CXX) + + # determine whether this is a standalone project or included by other projects + set(NANOBENCH_STANDALONE_PROJECT OFF) +-if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) +- set(NANOBENCH_STANDALONE_PROJECT ON) +-endif() + + if (NANOBENCH_STANDALONE_PROJECT) + set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # generate compile_commands.json +@@ -131,4 +128,6 @@ else() + add_library(nanobench::nanobench ALIAS nanobench) + set_property(TARGET nanobench PROPERTY CXX_STANDARD 17) + target_include_directories(nanobench PUBLIC ${PROJECT_SOURCE_DIR}/src/include) ++ install(TARGETS nanobench LIBRARY DESTINATION lib) ++ install(FILES src/include/nanobench.h DESTINATION include) + endif() diff --git a/externals/vcpkg/ports/nanobench/portfile.cmake b/externals/vcpkg/ports/nanobench/portfile.cmake new file mode 100755 index 000000000..e683949b2 --- /dev/null +++ b/externals/vcpkg/ports/nanobench/portfile.cmake @@ -0,0 +1,21 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO martinus/nanobench + REF v4.3.7 + SHA512 2f5b9573e220b507586c8586903489bd7dc2a8a09da07bd2454842a4c33c0323b0911ebeb902d5098c7dd9c96925d9bc3d4ca62fc5798f630b4b4d3e75d117a7 + HEAD_REF master + PATCHES + fix-cmakefile.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/nanobench/vcpkg.json b/externals/vcpkg/ports/nanobench/vcpkg.json new file mode 100755 index 000000000..11967bc56 --- /dev/null +++ b/externals/vcpkg/ports/nanobench/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "nanobench", + "version": "4.3.7", + "description": "Simple, fast, accurate single-header microbenchmarking functionality for C++11/14/17/20", + "homepage": "https://nanobench.ankerl.com", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + "fmt", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/nanodbc/add-missing-include.patch b/externals/vcpkg/ports/nanodbc/add-missing-include.patch new file mode 100755 index 000000000..2841c7d96 --- /dev/null +++ b/externals/vcpkg/ports/nanodbc/add-missing-include.patch @@ -0,0 +1,12 @@ +diff --git a/nanodbc/nanodbc.cpp b/nanodbc/nanodbc.cpp +index e6ca73f..3ad724a 100644 +--- a/nanodbc/nanodbc.cpp ++++ b/nanodbc/nanodbc.cpp +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + #include + diff --git a/externals/vcpkg/ports/nanodbc/find-unixodbc.patch b/externals/vcpkg/ports/nanodbc/find-unixodbc.patch new file mode 100755 index 000000000..071bb62d8 --- /dev/null +++ b/externals/vcpkg/ports/nanodbc/find-unixodbc.patch @@ -0,0 +1,24 @@ +--- "a/CMakeLists.txt" ++++ "b/CMakeLists.txt" +@@ -110,6 +110,13 @@ message(STATUS "nanodbc feature: Enable SQL_NO_DATA bug workaround - ${NANODBC_E + ## find unixODBC or iODBC config binary + ######################################## + if(UNIX) ++ # Try to find unixodbc package first ++ find_package(unixodbc) ++ if(unixodbc_FOUND) ++ message(STATUS "nanodbc build: unixODBC package found") ++ set(ODBCLIB UNIX::odbc) ++ set(ODBC_CONFIG true) ++ else() + # Try to find unixODBC first via odbc_config program. + find_program(ODBC_CONFIG odbc_config + PATHS $ENV{ODBC_PATH}/bin /usr/bin /usr/local/bin) +@@ -158,6 +165,7 @@ if(UNIX) + endif() + endif() + endif() ++ endif() + + if(NOT ODBC_CONFIG) + message(FATAL_ERROR "can not find a suitable odbc driver manager") diff --git a/externals/vcpkg/ports/nanodbc/portfile.cmake b/externals/vcpkg/ports/nanodbc/portfile.cmake new file mode 100755 index 000000000..60da9c251 --- /dev/null +++ b/externals/vcpkg/ports/nanodbc/portfile.cmake @@ -0,0 +1,40 @@ +# Only static libraries are supported. +# See https://github.com/nanodbc/nanodbc/issues/13 +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nanodbc/nanodbc + REF 7404a4dd7697e188df5724ab95a7553d2fc404eb # v2.13.0 + SHA512 35ca098e783d771f3df611bce84e9b8207a6a5b72c492d2f3909977bc91a7c22bb262c34768b0d97ebfbdf12eeda0214064a8ea171e7bdda7b759f93ff346f45 + HEAD_REF master + PATCHES + rename-version.patch + add-missing-include.patch + find-unixodbc.patch +) +file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt") + +if(DEFINED NANODBC_ODBC_VERSION) + set(NANODBC_ODBC_VERSION -DNANODBC_ODBC_VERSION=${NANODBC_ODBC_VERSION}) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DNANODBC_DISABLE_EXAMPLES=ON + -DNANODBC_DISABLE_TESTS=ON + -DNANODBC_ENABLE_UNICODE=OFF + ${NANODBC_ODBC_VERSION} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +else() + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/nanodbc/rename-version.patch b/externals/vcpkg/ports/nanodbc/rename-version.patch new file mode 100755 index 000000000..a236cf896 --- /dev/null +++ b/externals/vcpkg/ports/nanodbc/rename-version.patch @@ -0,0 +1,13 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,8 +20,8 @@ + ######################################## + ## nanodbc version + ######################################## +-file(STRINGS VERSION NANODBC_VERSION REGEX "[0-9]+\\.[0-9]+\\.[0-9]+") ++file(STRINGS "VERSION.txt" NANODBC_VERSION REGEX "[0-9]+\\.[0-9]+\\.[0-9]+") + string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" NANODBC_VERSION_MAJOR "${NANODBC_VERSION}") + string(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" NANODBC_VERSION_MINOR "${NANODBC_VERSION}") + string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" NANODBC_VERSION_PATCH "${NANODBC_VERSION}") + message(STATUS "nanodbc version: ${NANODBC_VERSION}") + diff --git a/externals/vcpkg/ports/nanodbc/vcpkg.json b/externals/vcpkg/ports/nanodbc/vcpkg.json new file mode 100755 index 000000000..35fd067a3 --- /dev/null +++ b/externals/vcpkg/ports/nanodbc/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "nanodbc", + "version": "2.13.0", + "port-version": 6, + "description": "A small C++ wrapper for the native C ODBC API.", + "homepage": "https://github.com/nanodbc/nanodbc", + "dependencies": [ + { + "name": "unixodbc", + "platform": "!windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/nanoflann/portfile.cmake b/externals/vcpkg/ports/nanoflann/portfile.cmake new file mode 100755 index 000000000..81a9fd112 --- /dev/null +++ b/externals/vcpkg/ports/nanoflann/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jlblancoc/nanoflann + REF v1.4.2 + SHA512 2a400725940868473d376635f67aac4402046d771ecceec547442dd653f0a00e38e340e4ac0a98620ddf3927845df18b6cfd644982f073d26c7864bed2de96ca + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DNANOFLANN_BUILD_EXAMPLES=OFF + -DNANOFLANN_BUILD_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "share/${PORT}/cmake") +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/nanoflann/vcpkg.json b/externals/vcpkg/ports/nanoflann/vcpkg.json new file mode 100755 index 000000000..c24954f21 --- /dev/null +++ b/externals/vcpkg/ports/nanoflann/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "nanoflann", + "version": "1.4.2", + "description": "nanoflann is a C++11 header-only library for building KD-Trees of datasets with different topologies: R2, R3 (point clouds), SO(2) and SO(3) (2D and 3D rotation groups).", + "homepage": "https://github.com/jlblancoc/nanoflann", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/nanogui/fix-cmakelists.patch b/externals/vcpkg/ports/nanogui/fix-cmakelists.patch new file mode 100755 index 000000000..cc4aa05af --- /dev/null +++ b/externals/vcpkg/ports/nanogui/fix-cmakelists.patch @@ -0,0 +1,72 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8c59277..3fe6f5d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,11 +11,7 @@ if (POLICY CMP0058) + cmake_policy(SET CMP0058 NEW) + endif() + +-if (NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/ext/glfw/src") +- message(FATAL_ERROR "The NanoGUI dependency repositories (GLFW, etc.) are missing! " +- "You probably did not clone the project with --recursive. It is possible to recover " +- "by calling \"git submodule update --init --recursive\"") +-endif() ++ + + if (WIN32) + set(NANOGUI_USE_GLAD_DEFAULT ON) +@@ -78,13 +74,11 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations") + endif() + +-add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/ext/glfw" "ext_build/glfw") + # Two targets have now been defined: `glfw_objects`, which will be merged into + # NanoGUI at the end, and `glfw`. The `glfw` target is the library itself + # (e.g., libglfw.so), but can be skipped as we do not need to link against it + # (because we merge `glfw_objects` into NanoGUI). Skipping is required for + # XCode, but preferable for all build systems (reduces build artifacts). +-set_target_properties(glfw PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1) + + # Python support: add NANOGUI_PYTHON flag to all targets + if (NANOGUI_BUILD_PYTHON) +@@ -310,7 +304,6 @@ add_definitions(${NANOGUI_EXTRA_DEFS}) + # Compile main NanoGUI library + add_library(nanogui-obj OBJECT + # Merge NanoVG into the NanoGUI library +- ext/nanovg/src/nanovg.c + # Merge GLAD into the NanoGUI library (only if needed) + ${LIBNANOGUI_EXTRA_SOURCE} + # Fonts etc. +@@ -352,6 +345,11 @@ add_library(nanogui-obj OBJECT + src/serializer.cpp + ) + ++find_path(EIGEN_INCLUDE_DIR Eigen/Core) ++target_include_directories(nanogui-obj PRIVATE ${EIGEN_INCLUDE_DIR}) ++find_path(STB_INCLUDE_DIR stb_image.h) ++target_include_directories(nanogui-obj PRIVATE ${STB_INCLUDE_DIR}) ++ + # XCode has a serious bug where the XCode project produces an invalid target + # that will not get linked if it consists only of objects from object libraries, + # it will not generate any products (executables, libraries). The only work +@@ -363,15 +361,18 @@ if (CMAKE_GENERATOR STREQUAL Xcode) + add_library(nanogui ${NANOGUI_LIBRARY_TYPE} + ${XCODE_DUMMY} + $ +- $ + ) + else() + add_library(nanogui ${NANOGUI_LIBRARY_TYPE} + $ +- $ + ) + endif() + ++find_package(nanovg CONFIG REQUIRED) ++find_package(Eigen3 CONFIG REQUIRED) ++find_package(glfw3 CONFIG REQUIRED) ++target_link_libraries(nanogui glfw nanovg::nanovg Eigen3::Eigen) ++ + if (NANOGUI_BUILD_SHARED) + set_property(TARGET nanogui-obj PROPERTY POSITION_INDEPENDENT_CODE ON) + endif() diff --git a/externals/vcpkg/ports/nanogui/portfile.cmake b/externals/vcpkg/ports/nanogui/portfile.cmake new file mode 100755 index 000000000..937c2c0a0 --- /dev/null +++ b/externals/vcpkg/ports/nanogui/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wjakob/nanogui + REF e9ec8a1a9861cf578d9c6e85a6420080aa715c03 #Commits on Sep 23, 2019 + SHA512 36c93bf977862ced2df4030211e2b83625e60a11fc9fdb6c1f2996bb234758331d3f41a7fbafd25a5bca0239ed9bac9c93446a4a7fac4c5e6d7943af2be3e14a + HEAD_REF master + PATCHES + fix-cmakelists.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DNANOGUI_EIGEN_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/eigen3 + -DEIGEN_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/eigen3 +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/nanogui/vcpkg.json b/externals/vcpkg/ports/nanogui/vcpkg.json new file mode 100755 index 000000000..f075b3dc6 --- /dev/null +++ b/externals/vcpkg/ports/nanogui/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "nanogui", + "version-date": "2019-09-23", + "port-version": 3, + "description": "NanoGUI is a minimalistic cross-platform widget library for OpenGL 3.x or higher.", + "homepage": "https://github.com/wjakob/nanogui", + "supports": "!uwp", + "dependencies": [ + "eigen3", + "glfw3", + "nanovg" + ] +} diff --git a/externals/vcpkg/ports/nanomsg/portfile.cmake b/externals/vcpkg/ports/nanomsg/portfile.cmake new file mode 100755 index 000000000..5561f2bbb --- /dev/null +++ b/externals/vcpkg/ports/nanomsg/portfile.cmake @@ -0,0 +1,65 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nanomsg/nanomsg + REF 1.1.5 + SHA512 773b8e169a7accac21414c63972423a249164f5b843c6c65c1b03a2eb90d21da788a98debdeb396dab795e52d30605696bc2cf65e5e05687bf115438d5b22717 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" NN_STATIC_LIB) + +if("tool" IN_LIST FEATURES) + set(NN_ENABLE_NANOCAT ON) +else() + set(NN_ENABLE_NANOCAT OFF) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE + -DNN_STATIC_LIB=${NN_STATIC_LIB} + -DNN_TESTS=OFF + -DNN_TOOLS=OFF + -DNN_ENABLE_DOC=OFF + -DNN_ENABLE_NANOCAT=${NN_ENABLE_NANOCAT} +) + +vcpkg_install_cmake() + +file(STRINGS ${SOURCE_PATH}/.version NN_PACKAGE_VERSION) + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/nanomsg-${NN_PACKAGE_VERSION}) + +vcpkg_replace_string( + ${CURRENT_PACKAGES_DIR}/share/${PORT}/nanomsg-config.cmake + "lib/cmake/nanomsg-${NN_PACKAGE_VERSION}" + "share/nanomsg" +) + +if(NN_ENABLE_NANOCAT) + vcpkg_copy_tools(TOOL_NAMES nanocat AUTO_CLEAN) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string( + ${CURRENT_PACKAGES_DIR}/include/nanomsg/nn.h + "defined(NN_STATIC_LIB)" + "1 // defined(NN_STATIC_LIB)" + ) + + vcpkg_replace_string( + ${CURRENT_PACKAGES_DIR}/share/${PORT}/nanomsg-config.cmake + "set_and_check(nanomsg_BINDIR \${PACKAGE_PREFIX_DIR}/bin)" + "" + ) +endif() + +configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/nanomsg/vcpkg.json b/externals/vcpkg/ports/nanomsg/vcpkg.json new file mode 100755 index 000000000..fb0644ceb --- /dev/null +++ b/externals/vcpkg/ports/nanomsg/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "nanomsg", + "version-string": "1.1.5", + "port-version": 4, + "description": [ + "a simple high-performance implementation of several \"scalability protocols\".", + "These scalability protocols are light-weight messaging protocols which can be used to solve a number of very common messaging patterns, such as request/reply, publish/subscribe, surveyor/respondent, and so forth. These protocols can run over a variety of transports such as TCP, UNIX sockets, and even WebSocket." + ], + "features": { + "tool": { + "description": "nanomsg tool (nanocat)" + } + } +} diff --git a/externals/vcpkg/ports/nanopb/fix-python.patch b/externals/vcpkg/ports/nanopb/fix-python.patch new file mode 100755 index 000000000..f82293099 --- /dev/null +++ b/externals/vcpkg/ports/nanopb/fix-python.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d9c5e5e..4e94bb7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,7 +41,6 @@ endif() + if(nanopb_BUILD_GENERATOR) + set(generator_protos nanopb) + +- find_package(Python REQUIRED) + execute_process( + COMMAND ${Python_EXECUTABLE} -c + "from distutils import sysconfig; print(sysconfig.get_python_lib(prefix=''))" +@@ -64,10 +63,10 @@ if(nanopb_BUILD_GENERATOR) + DESTINATION ${PYTHON_INSTDIR}/proto/ + ) + endforeach() ++ install( FILES generator/proto/_utils.py ++ DESTINATION ${PYTHON_INSTDIR}/proto/ ) + endif() + +-install( FILES generator/proto/_utils.py +- DESTINATION ${PYTHON_INSTDIR}/proto/ ) + + if( WIN32 ) + install( diff --git a/externals/vcpkg/ports/nanopb/portfile.cmake b/externals/vcpkg/ports/nanopb/portfile.cmake new file mode 100755 index 000000000..cd79b8775 --- /dev/null +++ b/externals/vcpkg/ports/nanopb/portfile.cmake @@ -0,0 +1,57 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nanopb/nanopb + REF 0.4.5 + SHA512 2f24308440bd961a94449e253627fbe38f6c5217cd70c57e9b3ab702da3c2df03b087ccdd62518940acf6b480a1dbb440ca5681f1766a17b199010d3df7b17a1 + HEAD_REF master + PATCHES + fix-python.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" nanopb_BUILD_STATIC_LIBS) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" nanopb_STATIC_LINKING) + + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + generator nanopb_BUILD_GENERATOR +) + +vcpkg_find_acquire_program(PYTHON3) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DPython_EXECUTABLE=${PYTHON3} + -Dnanopb_BUILD_RUNTIME=ON + -DBUILD_STATIC_LIBS=${nanopb_BUILD_STATIC_LIBS} + -Dnanopb_MSVC_STATIC_RUNTIME=${nanopb_STATIC_LINKING} + -Dnanopb_PROTOC_PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX} + ${FEATURE_OPTIONS} +) +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +if(nanopb_BUILD_GENERATOR) + file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/nanopb_generator.py" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + if(WIN32) + file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/protoc-gen-nanopb.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(INSTALL "${CURRENT_PACKAGES_DIR}/Lib/site-packages/" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/site-packages") + else() + file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/protoc-gen-nanopb" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + endif() +endif() + +if(nanopb_BUILD_STATIC_LIBS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/nanopb/vcpkg.json b/externals/vcpkg/ports/nanopb/vcpkg.json new file mode 100755 index 000000000..dad0eff55 --- /dev/null +++ b/externals/vcpkg/ports/nanopb/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "nanopb", + "version-semver": "0.4.5", + "description": "A small code-size Protocol Buffers implementation in ANSI C.", + "homepage": "https://jpa.kapsi.fi/nanopb/", + "features": { + "generator": { + "description": "build the generator", + "dependencies": [ + { + "name": "protobuf", + "host": true + } + ] + } + } +} diff --git a/externals/vcpkg/ports/nanoprintf/portfile.cmake b/externals/vcpkg/ports/nanoprintf/portfile.cmake new file mode 100755 index 000000000..7587949e1 --- /dev/null +++ b/externals/vcpkg/ports/nanoprintf/portfile.cmake @@ -0,0 +1,12 @@ +# header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO charlesnicholson/nanoprintf + REF b210b50a2b8608e2f0226b47a8f82c3476177a4f + SHA512 8340bf3785a8609568188e28e3fb905007d6da052f860df02fe0b8b2fdef3ca1ac87b91f7ac203fbd7235bcd50c8a63f33b2fca2854cad1351899c59cd8d7646 + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/nanoprintf.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/nanoprintf/vcpkg.json b/externals/vcpkg/ports/nanoprintf/vcpkg.json new file mode 100755 index 000000000..9828d6baa --- /dev/null +++ b/externals/vcpkg/ports/nanoprintf/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "nanoprintf", + "version-string": "2020-05-27", + "port-version": 1, + "description": "A tiny embeddable printf replacement written in C99", + "homepage": "https://github.com/charlesnicholson/nanoprintf" +} diff --git a/externals/vcpkg/ports/nanorange/portfile.cmake b/externals/vcpkg/ports/nanorange/portfile.cmake new file mode 100755 index 000000000..1b22c4868 --- /dev/null +++ b/externals/vcpkg/ports/nanorange/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tcbrindle/NanoRange + REF bf32251d65673fe170d602777c087786c529ead8 + SHA512 74dc8497fd20f56de39e54a104007840450466648f7b216f83265294e24582b486392ad6bf0cc85ca9877655640f08f833bc5d82ebee991b8a57d4fa44f0934f + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}" FILES_MATCHING PATTERN "*.hpp") + +file(INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/nanorange/vcpkg.json b/externals/vcpkg/ports/nanorange/vcpkg.json new file mode 100755 index 000000000..3aed5b7a9 --- /dev/null +++ b/externals/vcpkg/ports/nanorange/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "nanorange", + "version-date": "2020-07-06", + "description": "NanoRange is a C++14 implementation of the C++20 Ranges proposals.", + "homepage": "https://github.com/tcbrindle/NanoRange", + "license": "BSL-1.0" +} diff --git a/externals/vcpkg/ports/nanort/portfile.cmake b/externals/vcpkg/ports/nanort/portfile.cmake new file mode 100755 index 000000000..d6e774a52 --- /dev/null +++ b/externals/vcpkg/ports/nanort/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lighttransport/nanort + REF c85fe7a10be5baf8242c81288718c244f25d0183 + SHA512 0917ffdc51db9d5f936fc79d5b3d1886c5163470e650a2613200417a9e7a344b75c76c115f64160877d6a3480f7eda7884f3097927eb371267cc6d3c30afed37 + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/nanort.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/nanort/vcpkg.json b/externals/vcpkg/ports/nanort/vcpkg.json new file mode 100755 index 000000000..c91db27ae --- /dev/null +++ b/externals/vcpkg/ports/nanort/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "nanort", + "version-string": "2019-08-20", + "port-version": 2, + "description": "Single header only modern ray tracing kernel", + "homepage": "https://github.com/lighttransport/nanort" +} diff --git a/externals/vcpkg/ports/nanosvg/CMakeLists.txt b/externals/vcpkg/ports/nanosvg/CMakeLists.txt new file mode 100755 index 000000000..6af85e675 --- /dev/null +++ b/externals/vcpkg/ports/nanosvg/CMakeLists.txt @@ -0,0 +1,16 @@ +cmake_minimum_required(VERSION 3.11) +project(nanosvg NONE) + +set(NANOSVG_HEADERS src/nanosvg.h src/nanosvgrast.h) +add_library(nanosvg INTERFACE) + +set_target_properties(nanosvg PROPERTIES PUBLIC_HEADER "${NANOSVG_HEADERS}") + +install(TARGETS nanosvg + EXPORT nanosvgTargets + PUBLIC_HEADER DESTINATION include) + +install(EXPORT nanosvgTargets + FILE unofficial-nanosvg-config.cmake + NAMESPACE unofficial::nanosvg:: + DESTINATION share/unofficial-nanosvg) diff --git a/externals/vcpkg/ports/nanosvg/portfile.cmake b/externals/vcpkg/ports/nanosvg/portfile.cmake new file mode 100755 index 000000000..b10bcb3c9 --- /dev/null +++ b/externals/vcpkg/ports/nanosvg/portfile.cmake @@ -0,0 +1,15 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO memononen/nanosvg + REF 03042a6297399379198f98eb625ff8902bd84784 + SHA512 163f205e81e830e8b2512ec1faa15ebaf82138fc8bd881ccfc5f19896df75e8cf77ccd20892fccd0fd3e5d6358438e6f3075fd4e6a4c4b064107451265c9f874 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +set(VCPKG_BUILD_TYPE "release") # header-only +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/nanosvg/vcpkg.json b/externals/vcpkg/ports/nanosvg/vcpkg.json new file mode 100755 index 000000000..42d383193 --- /dev/null +++ b/externals/vcpkg/ports/nanosvg/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "nanosvg", + "version-date": "2022-04-29", + "description": "NanoSVG is a simple stupid single-header-file SVG parse. The output of the parser is a list of cubic bezier shapes..", + "homepage": "https://github.com/memononen/nanosvg", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/nanovg/CMakeLists.txt b/externals/vcpkg/ports/nanovg/CMakeLists.txt new file mode 100755 index 000000000..8caf73238 --- /dev/null +++ b/externals/vcpkg/ports/nanovg/CMakeLists.txt @@ -0,0 +1,32 @@ +cmake_minimum_required(VERSION 3.11) +project(nanovg C) + +find_path(STB_INCLUDES stb_image.h include) + +set(NANOVG_SOURCES src/nanovg.c) +set(NANOVG_HEADERS src/nanovg.h src/nanovg_gl.h src/nanovg_gl_utils.h) +add_library(nanovg STATIC ${NANOVG_SOURCES} ${NANOVG_HEADERS}) +set_target_properties(nanovg PROPERTIES PUBLIC_HEADER "${NANOVG_HEADERS}") +target_include_directories(nanovg PRIVATE ${STB_INCLUDES}) + +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + target_compile_definitions(nanovg PRIVATE DEBUG) +else() + target_compile_definitions(nanovg PRIVATE NDEBUG) +endif() + +install(TARGETS nanovg + EXPORT nanovgTargets + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + PUBLIC_HEADER DESTINATION include) + +install(EXPORT nanovgTargets + FILE nanovgTargets.cmake + NAMESPACE nanovg:: + DESTINATION share/nanovg) + +install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/nanovgConfig.cmake + DESTINATION share/nanovg) diff --git a/externals/vcpkg/ports/nanovg/nanovgConfig.cmake b/externals/vcpkg/ports/nanovg/nanovgConfig.cmake new file mode 100755 index 000000000..e849dff11 --- /dev/null +++ b/externals/vcpkg/ports/nanovg/nanovgConfig.cmake @@ -0,0 +1 @@ +include(${CMAKE_CURRENT_LIST_DIR}/nanovgTargets.cmake) diff --git a/externals/vcpkg/ports/nanovg/portfile.cmake b/externals/vcpkg/ports/nanovg/portfile.cmake new file mode 100755 index 000000000..5df6def4e --- /dev/null +++ b/externals/vcpkg/ports/nanovg/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO memononen/nanovg + REF 1f9c8864fc556a1be4d4bf1d6bfe20cde25734b4 + SHA512 99a44f01114ee653a966d4695596886240752f5a06d540c408b5aeaebdcc5360fc2043276515695580d048649a20dc50409107f89c4ce506d2ccb83a0635d29f + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/nanovgConfig.cmake DESTINATION ${SOURCE_PATH}) + +file(GLOB STB_SRCS ${SOURCE_PATH}/src/stb_*) +if(STB_SRCS) + file(REMOVE_RECURSE ${STB_SRCS}) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share) + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/nanovg/vcpkg.json b/externals/vcpkg/ports/nanovg/vcpkg.json new file mode 100755 index 000000000..b5f854527 --- /dev/null +++ b/externals/vcpkg/ports/nanovg/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "nanovg", + "version-date": "2019-08-30", + "port-version": 5, + "description": "NanoVG is small antialiased vector graphics rendering library for OpenGL.", + "homepage": "https://github.com/memononen/nanovg", + "supports": "!uwp", + "dependencies": [ + "stb" + ] +} diff --git a/externals/vcpkg/ports/nativefiledialog/CMakeLists.txt b/externals/vcpkg/ports/nativefiledialog/CMakeLists.txt new file mode 100755 index 000000000..30c9814b1 --- /dev/null +++ b/externals/vcpkg/ports/nativefiledialog/CMakeLists.txt @@ -0,0 +1,69 @@ +cmake_minimum_required(VERSION 3.14) + +project(nfd LANGUAGES C) + +include(GNUInstallDirs) + +option(NFD_GTK_BACKEND "Using GTK backend" ON) + +file(GLOB nfd_sources + "${PROJECT_SOURCE_DIR}/src/*.h" + "${PROJECT_SOURCE_DIR}/src/include/*.h" + "${PROJECT_SOURCE_DIR}/src/nfd_common.c" +) + +if (WIN32) + enable_language(CXX) + list(APPEND nfd_sources "${PROJECT_SOURCE_DIR}/src/nfd_win.cpp") +elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") + if (NFD_GTK_BACKEND) + find_package(GTK3 QUIET) + if (GTK3_FOUND) + list(APPEND nfd_sources "${PROJECT_SOURCE_DIR}/src/nfd_gtk.c") + else () + list(APPEND nfd_sources "${PROJECT_SOURCE_DIR}/src/nfd_zenity.c") + endif () + else () + list(APPEND nfd_sources "${PROJECT_SOURCE_DIR}/src/nfd_zenity.c") + endif () +elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + list(APPEND nfd_sources "${PROJECT_SOURCE_DIR}/src/nfd_cocoa.m") +endif () + +add_library(nfd ${nfd_sources}) + +set_target_properties( + nfd + PROPERTIES + DEBUG_POSTFIX "_d" + PUBLIC_HEADER ${CMAKE_CURRENT_LIST_DIR}/src/include/nfd.h +) + +target_compile_definitions( + nfd + PRIVATE + $<$:_CRT_SECURE_NO_WARNINGS> +) + +target_include_directories(nfd PRIVATE + $) + +target_include_directories(nfd INTERFACE + $) + +if (GTK3_FOUND) + target_include_directories(nfd PUBLIC ${GTK3_INCLUDE_DIRS}) + target_link_libraries(nfd PUBLIC ${GTK3_LIBRARIES}) +endif () + +install(TARGETS nfd EXPORT unofficial-nativefiledialog-config) + +install( + EXPORT unofficial-nativefiledialog-config + NAMESPACE unofficial::nativefiledialog:: + DESTINATION share/unofficial-nativefiledialog + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +) diff --git a/externals/vcpkg/ports/nativefiledialog/portfile.cmake b/externals/vcpkg/ports/nativefiledialog/portfile.cmake new file mode 100755 index 000000000..5b4bf0e18 --- /dev/null +++ b/externals/vcpkg/ports/nativefiledialog/portfile.cmake @@ -0,0 +1,37 @@ +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "${PORT} does not currently support UWP") +endif() + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mlabbe/nativefiledialog + REF 67345b80ebb429ecc2aeda94c478b3bcc5f7888e + SHA512 55edb3730b718b18d4fee7ec9bb479794d0e193ff13f05f26cbcf9ff44c43adb93e228ed7fd708e30c08476366f098bf69139031a84f5e4d6a85eba096fe4654 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES "zenity" NFD_GTK_BACKEND +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unofficial-${PORT}) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/nativefiledialog/vcpkg.json b/externals/vcpkg/ports/nativefiledialog/vcpkg.json new file mode 100755 index 000000000..e78d27349 --- /dev/null +++ b/externals/vcpkg/ports/nativefiledialog/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "nativefiledialog", + "version-date": "2022-01-20", + "description": "A tiny, neat C library that portably invokes native file open and save dialogs", + "homepage": "https://github.com/mlabbe/nativefiledialog", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "zenity": { + "description": "Using Zenity backend on Linux" + } + } +} diff --git a/externals/vcpkg/ports/nayuki-qr-code-generator/CMakeLists.txt b/externals/vcpkg/ports/nayuki-qr-code-generator/CMakeLists.txt new file mode 100755 index 000000000..8ef0f2dd6 --- /dev/null +++ b/externals/vcpkg/ports/nayuki-qr-code-generator/CMakeLists.txt @@ -0,0 +1,24 @@ +cmake_minimum_required(VERSION 3.14) + +project(nayuki-qr-code-generator LANGUAGES CXX) + +include(GNUInstallDirs) + +add_library(nayuki-qr-code-generator qrcodegen.cpp) +target_compile_features(nayuki-qr-code-generator PUBLIC cxx_std_11) +target_include_directories( + nayuki-qr-code-generator + PUBLIC + $ +) + +install(FILES qrcodegen.hpp DESTINATION include) + +install(TARGETS nayuki-qr-code-generator EXPORT unofficial-nayuki-qr-code-generator-config) + +install( + EXPORT unofficial-nayuki-qr-code-generator-config + NAMESPACE unofficial::nayuki-qr-code-generator:: + DESTINATION share/nayuki-qr-code-generator + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +) diff --git a/externals/vcpkg/ports/nayuki-qr-code-generator/portfile.cmake b/externals/vcpkg/ports/nayuki-qr-code-generator/portfile.cmake new file mode 100755 index 000000000..cd09aff5f --- /dev/null +++ b/externals/vcpkg/ports/nayuki-qr-code-generator/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nayuki/QR-Code-generator + REF v1.7.0 + SHA512 34efa40c382b6e7d060a764936c4e2faa4fbbecd5ea4730492a2cb1960656ed67242d84e20a42400ffdee063ed6bcf3b860fef309d09ee71303f44abaafe9328 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/cpp") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/cpp" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +configure_file("${SOURCE_PATH}/Readme.markdown" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/nayuki-qr-code-generator/vcpkg.json b/externals/vcpkg/ports/nayuki-qr-code-generator/vcpkg.json new file mode 100755 index 000000000..cce8d1dc6 --- /dev/null +++ b/externals/vcpkg/ports/nayuki-qr-code-generator/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "nayuki-qr-code-generator", + "version": "1.7.0", + "description": "High-quality QR Code generator library in C++", + "homepage": "https://github.com/nayuki/QR-Code-generator", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/nccl/FindNCCL.cmake b/externals/vcpkg/ports/nccl/FindNCCL.cmake new file mode 100755 index 000000000..771cd65cd --- /dev/null +++ b/externals/vcpkg/ports/nccl/FindNCCL.cmake @@ -0,0 +1,97 @@ +# Find the nccl libraries +# +# The following variables are optionally searched for defaults +# NCCL_ROOT: Base directory where all NCCL components are found +# NCCL_INCLUDE_DIR: Directory where NCCL header is found +# NCCL_LIB_DIR: Directory where NCCL library is found +# +# The following are set after configuration is done: +# NCCL_FOUND +# NCCL_INCLUDE_DIRS +# NCCL_LIBRARIES +# +# Adapted from https://github.com/pytorch/pytorch/blob/master/cmake/Modules/FindNCCL.cmake + +set(NCCL_INCLUDE_DIR $ENV{NCCL_INCLUDE_DIR} CACHE PATH "Folder contains NVIDIA NCCL headers") +set(NCCL_LIB_DIR $ENV{NCCL_LIB_DIR} CACHE PATH "Folder contains NVIDIA NCCL libraries") +set(_NCCL_VERSION $ENV{NCCL_VERSION} CACHE STRING "Version of NCCL to build with") + +list(APPEND NCCL_ROOT $ENV{NCCL_ROOT_DIR} ${CUDA_TOOLKIT_ROOT_DIR}) +# Compatible layer for CMake <3.12. NCCL_ROOT will be accounted in for searching paths and libraries for CMake >=3.12. +list(APPEND CMAKE_PREFIX_PATH ${NCCL_ROOT}) + +find_path(NCCL_INCLUDE_DIRS + NAMES nccl.h + HINTS + ${NCCL_INCLUDE_DIR} + $ENV{CUDNN_ROOT_DIR} + $ENV{CUDA_PATH} + $ENV{CUDNN_ROOT_DIR} + $ENV{CUDA_TOOLKIT_ROOT_DIR} + $ENV{NCCL} + /usr/include + PATH_SUFFIXES + include +) + +if (USE_STATIC_NCCL) + MESSAGE(STATUS "USE_STATIC_NCCL is set. Linking with static NCCL library.") + SET(NCCL_LIBNAME "nccl_static") + if (_NCCL_VERSION) # Prefer the versioned library if a specific NCCL version is specified + set(CMAKE_FIND_LIBRARY_SUFFIXES ".a.${_NCCL_VERSION}" ${CMAKE_FIND_LIBRARY_SUFFIXES}) + endif() +else() + SET(NCCL_LIBNAME "nccl") + if (_NCCL_VERSION) # Prefer the versioned library if a specific NCCL version is specified + set(CMAKE_FIND_LIBRARY_SUFFIXES ".so.${_NCCL_VERSION}" ${CMAKE_FIND_LIBRARY_SUFFIXES}) + endif() +endif() + +# Read version from header +if(EXISTS "${NCCL_INCLUDE_DIRS}/nccl.h") + file(READ ${NCCL_INCLUDE_DIRS}/nccl.h NCCL_HEADER_CONTENTS) +endif() +if(NCCL_HEADER_CONTENTS) + string(REGEX MATCH "define NCCL_MAJOR * +([0-9]+)" + _NCCL_VERSION_MAJOR "${NCCL_HEADER_CONTENTS}") + string(REGEX REPLACE "define NCCL_MAJOR * +([0-9]+)" "\\1" + _NCCL_VERSION_MAJOR "${_NCCL_VERSION_MAJOR}") + string(REGEX MATCH "define NCCL_MINOR * +([0-9]+)" + _NCCL_VERSION_MINOR "${NCCL_HEADER_CONTENTS}") + string(REGEX REPLACE "define NCCL_MINOR * +([0-9]+)" "\\1" + _NCCL_VERSION_MINOR "${_NCCL_VERSION_MINOR}") + string(REGEX MATCH "define NCCL_PATCH * +([0-9]+)" + _NCCL_VERSION_PATCH "${NCCL_HEADER_CONTENTS}") + string(REGEX REPLACE "define NCCL_PATCH * +([0-9]+)" "\\1" + _NCCL_VERSION_PATCH "${_NCCL_VERSION_PATCH}") + if(NOT _NCCL_VERSION_MAJOR) + set(_NCCL_VERSION "?") + else() + set(_NCCL_VERSION "${_NCCL_VERSION_MAJOR}.${_NCCL_VERSION_MINOR}.${_NCCL_VERSION_PATCH}") + endif() +endif() + +find_library(NCCL_LIBRARIES + NAMES ${NCCL_LIBNAME} + HINTS + ${NCCL_LIB_DIR} + ${CUDA_TOOLKIT_ROOT} + $ENV{CUDA_PATH} + $ENV{CUDNN_ROOT_DIR} + $ENV{CUDA_TOOLKIT_ROOT_DIR} + $ENV{NCCL} + /usr/lib/x86_64-linux-gnu/ + PATH_SUFFIXES + lib + lib64 +) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(NCCL + REQUIRED_VARS NCCL_INCLUDE_DIRS NCCL_LIBRARIES + VERSION_VAR _NCCL_VERSION) + +if(NCCL_FOUND) # obtaining NCCL version and some sanity checks + message(STATUS "Found NCCL ${_NCCL_VERSION} (include: ${NCCL_INCLUDE_DIRS}, library: ${NCCL_LIBRARIES})") + mark_as_advanced(NCCL_ROOT_DIR NCCL_INCLUDE_DIRS NCCL_LIBRARIES NCCL_VERSION) +endif() diff --git a/externals/vcpkg/ports/nccl/portfile.cmake b/externals/vcpkg/ports/nccl/portfile.cmake new file mode 100755 index 000000000..5909c49d5 --- /dev/null +++ b/externals/vcpkg/ports/nccl/portfile.cmake @@ -0,0 +1,20 @@ + +# Find NCCL. We can use FindNCCL directly since it doesn't call any functions +# that are disallowed in CMake script mode +set(MINIMUM_NCCL_VERSION "2.4.6.1") +set(NCCL_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) +find_package(NCCL ${MINIMUM_NCCL_VERSION}) +set(CMAKE_MODULE_PATH ${NCCL_PREV_MODULE_PATH}) + +# Download or return +if(NCCL_FOUND) + message(STATUS "Using NCCL ${_NCCL_VERSION} located on system.") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + message(FATAL_ERROR "Please install NCCL using your system package manager (the same way you installed CUDA). For example: apt install libnccl2 libnccl-dev.") +endif() + +file(INSTALL "${CURRENT_PORT_DIR}/FindNCCL.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +configure_file("${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/externals/vcpkg/ports/nccl/usage b/externals/vcpkg/ports/nccl/usage new file mode 100755 index 000000000..62ebd7bab --- /dev/null +++ b/externals/vcpkg/ports/nccl/usage @@ -0,0 +1,5 @@ +The package nccl provides CMake variables: + + find_package(NCCL REQUIRED) + target_link_libraries(main PRIVATE ${NCCL_LIBRARIES}) + target_include_directories(main PRIVATE ${NCCL_INCLUDE_DIRS}) diff --git a/externals/vcpkg/ports/nccl/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/nccl/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..27893ec4f --- /dev/null +++ b/externals/vcpkg/ports/nccl/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,6 @@ +set(NCCL_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) + +_find_package(${ARGS}) + +set(CMAKE_MODULE_PATH ${NCCL_PREV_MODULE_PATH}) diff --git a/externals/vcpkg/ports/nccl/vcpkg.json b/externals/vcpkg/ports/nccl/vcpkg.json new file mode 100755 index 000000000..47aeef6a6 --- /dev/null +++ b/externals/vcpkg/ports/nccl/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "nccl", + "version": "2.4.6", + "port-version": 2, + "description": "Optimized primitives for collective multi-GPU communication.", + "supports": "linux & x64", + "dependencies": [ + "cuda" + ] +} diff --git a/externals/vcpkg/ports/ncurses/portfile.cmake b/externals/vcpkg/ports/ncurses/portfile.cmake new file mode 100755 index 000000000..f93d4d9c3 --- /dev/null +++ b/externals/vcpkg/ports/ncurses/portfile.cmake @@ -0,0 +1,69 @@ +set(NCURSES_VERSION_STR 6.3) +vcpkg_download_distfile( + ARCHIVE_PATH + URLS + "https://invisible-mirror.net/archives/ncurses/ncurses-${NCURSES_VERSION_STR}.tar.gz" + "ftp://ftp.invisible-island.net/ncurses/ncurses-${NCURSES_VERSION_STR}.tar.gz" + "https://ftp.gnu.org/gnu/ncurses/ncurses-${NCURSES_VERSION_STR}.tar.gz" + FILENAME "ncurses-${NCURSES_VERSION_STR}.tgz" + SHA512 5373f228cba6b7869210384a607a2d7faecfcbfef6dbfcd7c513f4e84fbd8bcad53ac7db2e7e84b95582248c1039dcfc7c4db205a618f7da22a166db482f0105 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE_PATH}" +) + +set(OPTIONS + --disable-db-install + --enable-pc-files + --without-ada + --without-manpages + --without-progs + --without-tack + --without-tests +) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + list(APPEND OPTIONS + --with-shared + --with-cxx-shared + --without-normal + ) +endif() +if(VCPKG_TARGET_IS_MINGW) + list(APPEND OPTIONS + --disable-home-terminfo + --enable-term-driver + --disable-termcap + ) +endif() + +set(OPTIONS_DEBUG + "--with-pkg-config-libdir=${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" + --with-debug + --without-normal +) +set(OPTIONS_RELEASE + "--with-pkg-config-libdir=${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + --without-debug + --with-normal +) + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS ${OPTIONS} + OPTIONS_DEBUG ${OPTIONS_DEBUG} + OPTIONS_RELEASE ${OPTIONS_RELEASE} + NO_ADDITIONAL_PATHS +) +vcpkg_install_make() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/ncurses/usage b/externals/vcpkg/ports/ncurses/usage new file mode 100755 index 000000000..e82f43558 --- /dev/null +++ b/externals/vcpkg/ports/ncurses/usage @@ -0,0 +1,7 @@ +The package ncurses is compatible with built-in CMake variables: + + set(CURSES_NEED_NCURSES TRUE) + find_package(Curses REQUIRED) + target_include_directories(main ${CURSES_INCLUDE_DIRS}) + target_compile_options(main ${CURSES_CFLAGS}) + target_link_libraries(main PRIVATE ${CURSES_LIBRARIES}) diff --git a/externals/vcpkg/ports/ncurses/vcpkg.json b/externals/vcpkg/ports/ncurses/vcpkg.json new file mode 100755 index 000000000..465e15d47 --- /dev/null +++ b/externals/vcpkg/ports/ncurses/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "ncurses", + "version": "6.3", + "port-version": 1, + "description": "free software emulation of curses in System V Release 4.0", + "homepage": "https://invisible-island.net/ncurses/announce.html", + "license": "MIT", + "supports": "!windows | mingw" +} diff --git a/externals/vcpkg/ports/neargye-semver/portfile.cmake b/externals/vcpkg/ports/neargye-semver/portfile.cmake new file mode 100755 index 000000000..adb905b93 --- /dev/null +++ b/externals/vcpkg/ports/neargye-semver/portfile.cmake @@ -0,0 +1,13 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Neargye/semver + REF v0.3.0 + SHA512 b620a27d31ca2361e243e4def890ddfc4dfb65a507187c918fabc332d48c420fb10b0e6fb38c83c4c3998a047201e81b70a164c66675351cf4ff9475defc6287 + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/include/semver.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/neargye") + +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/neargye-semver/vcpkg.json b/externals/vcpkg/ports/neargye-semver/vcpkg.json new file mode 100755 index 000000000..e27641bd4 --- /dev/null +++ b/externals/vcpkg/ports/neargye-semver/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "neargye-semver", + "version": "0.3.0", + "description": "C++17 header-only dependency-free versioning library complying with Semantic Versioning 2.0.0", + "homepage": "https://github.com/Neargye/semver" +} diff --git a/externals/vcpkg/ports/ned14-internal-quickcpplib/portfile.cmake b/externals/vcpkg/ports/ned14-internal-quickcpplib/portfile.cmake new file mode 100755 index 000000000..8f78243a0 --- /dev/null +++ b/externals/vcpkg/ports/ned14-internal-quickcpplib/portfile.cmake @@ -0,0 +1,89 @@ +# QuickCppLib is composed of other third party libraries: +# <= quickcpplib +# <= byte-lite +# <= gsl-lite +# <= Optional +# +# byte-lite and gsl-lite are in vcpkg, but may not be versions +# known to be compatible with QuickCppLib. It has occurred in the +# past that newer versions were severely broken with QuickCppLib. + +include("${CURRENT_PORT_DIR}/sha_manifest.cmake") + +if (NOT "cxx20" IN_LIST FEATURES) + message(WARNING [=[ + QuickCppLib and its downstream dependencies Outcome and LLFIO were tested against gsl-lite version 0.38.1 and byte-lite version 0.3.0. They are not guaranteed to work with newer versions, with failures experienced in the past up-to-and-including runtime crashes. You can pin the versions as verified to work in QuickCppLib's CI in your manifest file by adding: + "overrides": [ + { "name": "gsl-lite", "version": "0.38.1" }, + { "name": "byte-lite", "version": "0.3.0" } + ] + Do not report issues to upstream without first pinning these previous versions. + ]=]) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ned14/quickcpplib + REF ${QUICKCPPLIB_REF} + SHA512 ${QUICKCPPLIB_SHA512} + HEAD_REF master + PATCHES + quicklib-depheaders.patch +) + +# Quickcpplib deploys subsets of the dependency headers into a private subdirectory +if (NOT "cxx17" IN_LIST FEATURES) + file(COPY "${CURRENT_INSTALLED_DIR}/include/nonstd/byte.hpp" + DESTINATION "${SOURCE_PATH}/include/quickcpplib/byte/include/nonstd") +endif() +if (NOT "cxx20" IN_LIST FEATURES) + file(COPY "${CURRENT_INSTALLED_DIR}/include/gsl/gsl-lite.hpp" + DESTINATION "${SOURCE_PATH}/include/quickcpplib/gsl-lite/include/gsl") + file(COPY "${CURRENT_INSTALLED_DIR}/include/gsl-lite/gsl-lite.hpp" + DESTINATION "${SOURCE_PATH}/include/quickcpplib/gsl-lite/include/gsl-lite") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH OPT_SOURCE_PATH + REPO akrzemi1/Optional + REF ${OPTIONAL_REF} + SHA512 ${OPTIONAL_SHA512} + HEAD_REF master +) + +file(COPY "${OPT_SOURCE_PATH}/." DESTINATION "${SOURCE_PATH}/include/quickcpplib/optional") + +# Because quickcpplib's deployed files are header-only, the debug build it not necessary +set(VCPKG_BUILD_TYPE release) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cxx17 QUICKCPPLIB_REQUIRE_CXX17 + cxx20 QUICKCPPLIB_REQUIRE_CXX20 +) + +# Use QuickCppLib's own build process, skipping examples and tests. +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DPROJECT_IS_DEPENDENCY=On + -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON + -DCMAKE_INSTALL_DATADIR=${CURRENT_PACKAGES_DIR}/share/ned14-internal-quickcpplib + ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_Doxygen +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME quickcpplib + CONFIG_PATH lib/cmake/quickcpplib +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/Licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/ned14-internal-quickcpplib/quicklib-depheaders.patch b/externals/vcpkg/ports/ned14-internal-quickcpplib/quicklib-depheaders.patch new file mode 100755 index 000000000..7ad3c3b9a --- /dev/null +++ b/externals/vcpkg/ports/ned14-internal-quickcpplib/quicklib-depheaders.patch @@ -0,0 +1,29 @@ +diff --git a/cmake/headers.cmake b/cmake/headers.cmake +index 1aad359..e5053ed 100644 +--- a/cmake/headers.cmake ++++ b/cmake/headers.cmake +@@ -15,8 +15,6 @@ set(quickcpplib_HEADERS + "include/quickcpplib/boost/test/unit_test.hpp" + "include/quickcpplib/byte.hpp" + "include/quickcpplib/byte/include/nonstd/byte.hpp" +- "include/quickcpplib/byte/test/byte-main.t.hpp" +- "include/quickcpplib/byte/test/lest/lest_cpp03.hpp" + "include/quickcpplib/config.hpp" + "include/quickcpplib/console_colours.hpp" + "include/quickcpplib/cpp_feature.h" +@@ -27,15 +25,8 @@ set(quickcpplib_HEADERS + "include/quickcpplib/erasure_cast.hpp" + "include/quickcpplib/execinfo_win64.h" + "include/quickcpplib/function_ptr.hpp" +- "include/quickcpplib/gsl-lite/gsl-lite.natvis" + "include/quickcpplib/gsl-lite/include/gsl-lite/gsl-lite.hpp" +- "include/quickcpplib/gsl-lite/include/gsl.h" +- "include/quickcpplib/gsl-lite/include/gsl.hpp" +- "include/quickcpplib/gsl-lite/include/gsl/gsl-lite-vc6.hpp" +- "include/quickcpplib/gsl-lite/include/gsl/gsl-lite.h" + "include/quickcpplib/gsl-lite/include/gsl/gsl-lite.hpp" +- "include/quickcpplib/gsl-lite/test/gsl-lite.t.hpp" +- "include/quickcpplib/gsl-lite/test/lest_cpp03.hpp" + "include/quickcpplib/import.h" + "include/quickcpplib/in_place_detach_attach.hpp" + "include/quickcpplib/mem_flush_loads_stores.hpp" diff --git a/externals/vcpkg/ports/ned14-internal-quickcpplib/sha_manifest.cmake b/externals/vcpkg/ports/ned14-internal-quickcpplib/sha_manifest.cmake new file mode 100755 index 000000000..2ac6943a6 --- /dev/null +++ b/externals/vcpkg/ports/ned14-internal-quickcpplib/sha_manifest.cmake @@ -0,0 +1,5 @@ +set(QUICKCPPLIB_REF cad832c8083c8eb984c26ee995609817f27f9847) +set(QUICKCPPLIB_SHA512 4a2cd3d3e90317a201088291781d13bbc66f4beadfead61ed894f6f5fa38001fb94b68f0965ae77efd9e43c274583e74c00a0781018cd1714ec99e00c9b17824) + +set(OPTIONAL_REF 2b43315458a99fc5de1da6e7bc0ddd364b26d643) +set(OPTIONAL_SHA512 1952386cd3c7b963861f9634055e1baa4181d398d6f1b068a8a3f411368432bdcd42e47aadfa856584ed9a7c724a1c83369243ccb653e650af5c9155b42a84f4) diff --git a/externals/vcpkg/ports/ned14-internal-quickcpplib/usage b/externals/vcpkg/ports/ned14-internal-quickcpplib/usage new file mode 100755 index 000000000..91f1dff7e --- /dev/null +++ b/externals/vcpkg/ports/ned14-internal-quickcpplib/usage @@ -0,0 +1,2 @@ +You should NOT DIRECTLY USE quickcpplib in your own libraries! +It is intended for internal use by ned14's vcpkg libraries only. diff --git a/externals/vcpkg/ports/ned14-internal-quickcpplib/vcpkg.json b/externals/vcpkg/ports/ned14-internal-quickcpplib/vcpkg.json new file mode 100755 index 000000000..2bd11b31e --- /dev/null +++ b/externals/vcpkg/ports/ned14-internal-quickcpplib/vcpkg.json @@ -0,0 +1,37 @@ +{ + "name": "ned14-internal-quickcpplib", + "version": "0.0.0-cad832c8", + "port-version": 1, + "description": "NOT FOR EXTERNAL CONSUMPTION, a set of internal scripts used by ned14's libraries.", + "homepage": "https://github.com/ned14/quickcpplib", + "license": "Apache-2.0", + "dependencies": [ + "byte-lite", + "gsl-lite", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cxx17": { + "description": "Do not polyfill C++17 entities" + }, + "cxx20": { + "description": "Do not polyfill C++20 entities", + "dependencies": [ + { + "name": "ned14-internal-quickcpplib", + "default-features": false, + "features": [ + "cxx17" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/neon2sse/portfile.cmake b/externals/vcpkg/ports/neon2sse/portfile.cmake new file mode 100755 index 000000000..477e109a0 --- /dev/null +++ b/externals/vcpkg/ports/neon2sse/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO intel/ARM_NEON_2_x86_SSE + REF a1652fd5253afbf3e39357b012974f93511f6108 + SHA512 9f8aa283e48eb3b615da3d89ec4165d1ec9599e8e181059c2b9acb2921ce753ce0f29b8c321d7d6661f10eb67e234c629df75853b87c4139a9bb137dbb3f4fc1 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME NEON_2_SSE CONFIG_PATH lib/cmake/NEON_2_SSE) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" +) diff --git a/externals/vcpkg/ports/neon2sse/vcpkg.json b/externals/vcpkg/ports/neon2sse/vcpkg.json new file mode 100755 index 000000000..c705b9ede --- /dev/null +++ b/externals/vcpkg/ports/neon2sse/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "neon2sse", + "version-date": "2021-09-16", + "description": "Open standard for machine learning interoperability", + "homepage": "https://github.com/intel/ARM_NEON_2_x86_SSE", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/netcdf-c/fix-dependency-libmath.patch b/externals/vcpkg/ports/netcdf-c/fix-dependency-libmath.patch new file mode 100755 index 000000000..7b9f6a541 --- /dev/null +++ b/externals/vcpkg/ports/netcdf-c/fix-dependency-libmath.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c36908b..390ac0a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -944,7 +944,7 @@ OPTION(ENABLE_BYTERANGE "Enable byte-range access to remote datasets.." OFF) + + # Check for the math library so it can be explicitly linked. + IF(NOT WIN32) +- FIND_LIBRARY(HAVE_LIBM NAMES math m libm) ++ FIND_LIBRARY(HAVE_LIBM NAMES m libm math) + MESSAGE(STATUS "Found Math library: ${HAVE_LIBM}") + IF(NOT HAVE_LIBM) + MESSAGE(FATAL_ERROR "Unable to find the math library.") diff --git a/externals/vcpkg/ports/netcdf-c/fix-dependency-libzip.patch b/externals/vcpkg/ports/netcdf-c/fix-dependency-libzip.patch new file mode 100755 index 000000000..9422198a2 --- /dev/null +++ b/externals/vcpkg/ports/netcdf-c/fix-dependency-libzip.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b93a141..c3763a7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -957,7 +957,14 @@ OPTION(ENABLE_DAP_REMOTE_TESTS "Enable DAP remote tests." ON) + SET(REMOTETESTSERVERS "remotetest.unidata.ucar.edu" CACHE STRING "test servers to use for remote test") + + # See if we have libzip +-FIND_PACKAGE(Zip) ++if(ENABLE_NCZARR_ZIP) ++ find_package(libzip CONFIG REQUIRED) ++ set(Zip_LIBRARIES libzip::zip) ++ set(Zip_FOUND TRUE) ++else() ++ set(Zip_LIBRARIES "") ++ set(Zip_FOUND FALSE) ++endif() + + # Define a test flag for have curl library + IF(Zip_FOUND) +diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in +index b3be259..72b4b25 100644 +--- a/netCDFConfig.cmake.in ++++ b/netCDFConfig.cmake.in +@@ -15,6 +15,9 @@ set(netCDF_LIBRARIES netCDF::netcdf) + include(CMakeFindDependencyMacro) + find_dependency(HDF5 CONFIG) + find_dependency(CURL CONFIG) ++if(@ENABLE_NCZARR_ZIP@) ++ find_dependency(libzip CONFIG) ++endif() + include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake") + + # Compiling Options diff --git a/externals/vcpkg/ports/netcdf-c/fix-dependency-mpi.patch b/externals/vcpkg/ports/netcdf-c/fix-dependency-mpi.patch new file mode 100755 index 000000000..91eb2434b --- /dev/null +++ b/externals/vcpkg/ports/netcdf-c/fix-dependency-mpi.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1207,7 +1207,8 @@ + IF(NOT HDF5_PARALLEL) + SET(USE_PARALLEL OFF CACHE BOOL "") + MESSAGE(STATUS "Cannot find HDF5 library built with parallel support. Disabling parallel build.") + ELSE() + FIND_PACKAGE(MPI REQUIRED) ++ list(REMOVE_ITEM MPI_C_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}") + SET(HDF5_PARALLEL ON CACHE BOOL "") + SET(USE_PARALLEL ON CACHE BOOL "") diff --git a/externals/vcpkg/ports/netcdf-c/fix-dependency-zlib.patch b/externals/vcpkg/ports/netcdf-c/fix-dependency-zlib.patch new file mode 100755 index 000000000..a7ec3a91a --- /dev/null +++ b/externals/vcpkg/ports/netcdf-c/fix-dependency-zlib.patch @@ -0,0 +1,13 @@ +diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt +index be72612..5e1692f 100644 +--- a/liblib/CMakeLists.txt ++++ b/liblib/CMakeLists.txt +@@ -67,7 +67,7 @@ ENDIF() + + SET(TLL_LIBS "") + +-SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ${ZLIB_LIBRARY}) ++SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM}) + + # Add extra dependencies specified via NC_EXTRA_DEPS + SET(TLL_LIBS ${TLL_LIBS} ${EXTRA_DEPS}) diff --git a/externals/vcpkg/ports/netcdf-c/fix-linkage-error.patch b/externals/vcpkg/ports/netcdf-c/fix-linkage-error.patch new file mode 100755 index 000000000..df2539aba --- /dev/null +++ b/externals/vcpkg/ports/netcdf-c/fix-linkage-error.patch @@ -0,0 +1,19 @@ +diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt +index 9e126ec..1363d35 100644 +--- a/liblib/CMakeLists.txt ++++ b/liblib/CMakeLists.txt +@@ -79,8 +79,14 @@ ENDIF() + IF(USE_HDF5) + if(TARGET hdf5::hdf5-shared) + SET(TLL_LIBS ${TLL_LIBS} hdf5::hdf5-shared hdf5::hdf5_hl-shared) ++ if(USE_PARALLEL) ++ list(APPEND TLL_LIBS ${MPI_C_LIBRARIES}) ++ endif() + else() + SET(TLL_LIBS ${TLL_LIBS} hdf5::hdf5-static hdf5::hdf5_hl-static) ++ if(USE_PARALLEL) ++ list(APPEND TLL_LIBS ${MPI_C_LIBRARIES}) ++ endif() + endif() + elseif(0) + IF(NOT MSVC) diff --git a/externals/vcpkg/ports/netcdf-c/fix-manpage-msys.patch b/externals/vcpkg/ports/netcdf-c/fix-manpage-msys.patch new file mode 100755 index 000000000..ec087dc4f --- /dev/null +++ b/externals/vcpkg/ports/netcdf-c/fix-manpage-msys.patch @@ -0,0 +1,13 @@ +diff --git a/libsrc/CMakeLists.txt b/libsrc/CMakeLists.txt +index 4583733..20ce3bf 100644 +--- a/libsrc/CMakeLists.txt ++++ b/libsrc/CMakeLists.txt +@@ -64,7 +64,7 @@ IF(HAVE_M4) + IF(NOT MSVC) + ADD_CUSTOM_TARGET(manpage ALL + +- COMMAND ${NC_M4} ${ARGS_MANPAGE} '${CMAKE_CURRENT_BINARY_DIR}/netcdf.m4' > '${CMAKE_CURRENT_BINARY_DIR}/netcdf.3' ++ COMMAND ${NC_M4} ${ARGS_MANPAGE} "${CMAKE_CURRENT_BINARY_DIR}/netcdf.m4" > "${CMAKE_CURRENT_BINARY_DIR}/netcdf.3" VERBATIM + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + ) + diff --git a/externals/vcpkg/ports/netcdf-c/fix-pkgconfig.patch b/externals/vcpkg/ports/netcdf-c/fix-pkgconfig.patch new file mode 100755 index 000000000..6fff98ac2 --- /dev/null +++ b/externals/vcpkg/ports/netcdf-c/fix-pkgconfig.patch @@ -0,0 +1,38 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 390ac0a..4bcd909 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2100,6 +2100,21 @@ STRING(REPLACE ";" " " LINKFLAGS "${LINKFLAGS}") + SET(LIBS ${NC_LIBS}) + SET(NC_LIBS "-lnetcdf") + ++set(NC_LIBS_PRIVATE " ${LIBS} ") ++set(NC_REQUIRES_PRIVATE "") ++macro(replace_pkgconfig_module PATTERN MODULE) ++ if(NC_LIBS_PRIVATE MATCHES " ${PATTERN} ") ++ string(REPLACE "${CMAKE_MATCH_0}" " " NC_LIBS_PRIVATE "${NC_LIBS_PRIVATE}") ++ string(APPEND NC_REQUIRES_PRIVATE " ${MODULE}") ++ endif() ++endmacro() ++replace_pkgconfig_module("-lhdf5_hl" "hdf5_hl") ++replace_pkgconfig_module("-lhdf5" "hdf5") ++replace_pkgconfig_module("-lmpi" "ompi-c") ++replace_pkgconfig_module("-lzip" "libzip") ++replace_pkgconfig_module("-lCURL[^ ]*" "libcurl") ++replace_pkgconfig_module("-lZLIB[^ ]*" "zlib") ++ + configure_file( + ${netCDF_SOURCE_DIR}/netcdf.pc.in + ${netCDF_BINARY_DIR}/netcdf.pc @ONLY) +diff --git a/netcdf.pc.in b/netcdf.pc.in +index 22b5594..a48b7c2 100644 +--- a/netcdf.pc.in ++++ b/netcdf.pc.in +@@ -9,5 +9,6 @@ Description: NetCDF Client Library for C + URL: http://www.unidata.ucar.edu/netcdf + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} @NC_LIBS@ +-Libs.private: @LIBS@ ++Libs.private: @NC_LIBS_PRIVATE@ + Cflags: -I${includedir} ++Requires.private: @NC_REQUIRES_PRIVATE@ diff --git a/externals/vcpkg/ports/netcdf-c/no-install-deps.patch b/externals/vcpkg/ports/netcdf-c/no-install-deps.patch new file mode 100755 index 000000000..63feba873 --- /dev/null +++ b/externals/vcpkg/ports/netcdf-c/no-install-deps.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6b39f0e..507eb4c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2028,7 +2028,7 @@ ADD_SUBDIRECTORY(docs) + # install them in the binary dir. Grab all of the .libs, put them + # in the libdir. + ## +-IF(MSVC) ++IF(MSVC AND NOT DISABLE_INSTALL_DEPENDENCIES) + FILE(GLOB COPY_FILES ${CMAKE_PREFIX_PATH}/lib/*.lib) + INSTALL(FILES ${COPY_FILES} + DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/externals/vcpkg/ports/netcdf-c/portfile.cmake b/externals/vcpkg/ports/netcdf-c/portfile.cmake new file mode 100755 index 000000000..441d422cc --- /dev/null +++ b/externals/vcpkg/ports/netcdf-c/portfile.cmake @@ -0,0 +1,95 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Unidata/netcdf-c + REF cd6173f472b778fa0e558982c59f7183aa5b8e47 # v4.8.1 + SHA512 e965b9c865f31abcd0ae045cb709a41710e72bcf5bd237972cd62688f0f099f1b12be316a448d22315b1c73eb99fae3ea38072e9a3646a4f70ba42507d82f537 + HEAD_REF master + PATCHES + no-install-deps.patch + fix-dependency-zlib.patch + use_targets.patch + fix-dependency-libmath.patch + fix-linkage-error.patch + fix-pkgconfig.patch + fix-manpage-msys.patch + fix-dependency-libzip.patch + fix-dependency-mpi.patch +) + +#Remove outdated find modules +file(REMOVE "${SOURCE_PATH}/cmake/modules/FindSZIP.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/modules/FindZLIB.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/modules/windows/FindHDF5.cmake") + +if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) + set(CRT_OPTION "") +elseif(VCPKG_CRT_LINKAGE STREQUAL "static") + set(CRT_OPTION -DNC_USE_STATIC_CRT=ON) +else() + set(CRT_OPTION -DNC_USE_STATIC_CRT=OFF) +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + dap ENABLE_DAP + netcdf-4 ENABLE_NETCDF_4 + hdf5 ENABLE_HDF5 + nczarr ENABLE_NCZARR + nczarr-zip ENABLE_NCZARR_ZIP + tools BUILD_UTILITIES + ) + +if(NOT ENABLE_DAP AND NOT ENABLE_NCZARR) + list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_CURL=ON") +endif() + +if(ENABLE_HDF5) + # Fix hdf5 szip support detection for static linkage. + x_vcpkg_pkgconfig_get_modules( + PREFIX HDF5 + MODULES hdf5 + LIBRARIES + ) + if(HDF5_LIBRARIES_RELEASE MATCHES "szip") + list(APPEND FEATURE_OPTIONS "-DUSE_SZIP=ON") + endif() +endif() + +if(VCPKG_TARGET_IS_UWP) + string(APPEND VCPKG_C_FLAGS " /wd4996 /wd4703") + string(APPEND VCPKG_CXX_FLAGS " /wd4996 /wd4703") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE # netcdf-c configures in the source! + OPTIONS + -DBUILD_TESTING=OFF + -DENABLE_EXAMPLES=OFF + -DENABLE_TESTS=OFF + -DENABLE_FILTER_TESTING=OFF + -DENABLE_DAP_REMOTE_TESTS=OFF + -DDISABLE_INSTALL_DEPENDENCIES=ON + ${CRT_OPTION} + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME "netcdf" CONFIG_PATH "lib/cmake/netCDF") +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/nc-config" "${CURRENT_PACKAGES_DIR}/bin/nc-config") # invalid +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES nccopy ncdump ncgen ncgen3 + AUTO_CLEAN + ) +elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) + # delete bin under non-windows because the dynamic libraries get put in lib + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/netcdf-c/use_targets.patch b/externals/vcpkg/ports/netcdf-c/use_targets.patch new file mode 100755 index 000000000..541be65b5 --- /dev/null +++ b/externals/vcpkg/ports/netcdf-c/use_targets.patch @@ -0,0 +1,137 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 507eb4c..c36908b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -433,7 +433,6 @@ IF(NC_EXTRA_DEPS) + SET(EXTRA_DEPS ${EXTRA_DEPS} "${${_LIB}_DEP}") + ENDFOREACH() + MESSAGE("Extra deps: ${EXTRA_DEPS}") +- LIST(REMOVE_DUPLICATES EXTRA_DEPS) + SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${EXTRA_DEPS}) + ENDIF() + ### +@@ -628,15 +627,6 @@ IF(USE_HDF5) + # we will use a static library. This can be toggled + # by explicitly modifying NC_FIND_SHARED_LIBS. + ## +- IF(NC_FIND_SHARED_LIBS) +- SET(NC_HDF5_LINK_TYPE "shared") +- SET(NC_HDF5_LINK_TYPE_UPPER "SHARED") +- ADD_DEFINITIONS(-DH5_BUILT_AS_DYNAMIC_LIB) +- ELSE(NC_FIND_SHARED_LIBS) +- SET(NC_HDF5_LINK_TYPE "static") +- SET(NC_HDF5_LINK_TYPE_UPPER "STATIC") +- ADD_DEFINITIONS(-DH5_BUILT_AS_STATIC_LIB) +- ENDIF(NC_FIND_SHARED_LIBS) + + ##### + # First, find the C and HL libraries. +@@ -649,7 +639,7 @@ IF(USE_HDF5) + SET(SEARCH_PACKAGE_NAME ${HDF5_PACKAGE_NAME}) + FIND_PACKAGE(HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS C HL CONFIG REQUIRED ${NC_HDF5_LINK_TYPE}) + ELSE(MSVC) +- FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED) ++ FIND_PACKAGE(HDF5 COMPONENTS C HL CONFIG REQUIRED) + ENDIF(MSVC) + + ## +@@ -726,6 +716,19 @@ IF(USE_HDF5) + SET(HDF5_C_LIBRARY hdf5) + ENDIF() + ENDIF(HDF5_C_LIBRARY AND HDF5_HL_LIBRARY AND HDF5_INCLUDE_DIR) ++ ++ if(TARGET hdf5::hdf5-shared) ++ set(HDF5_C_LIBRARY hdf5::hdf5-shared) ++ set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-shared) ++ set(HDF5_HL_LIBRARIES hdf5::hdf5_hl-shared) ++ ADD_DEFINITIONS(-DH5_BUILT_AS_DYNAMIC_LIB) ++ else() ++ set(HDF5_C_LIBRARY hdf5::hdf5-static) ++ set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-static) ++ set(HDF5_HL_LIBRARIES hdf5::hdf5_hl-static) ++ ADD_DEFINITIONS(-DH5_BUILT_AS_STATIC_LIB) ++ endif() ++ list(APPEND CMAKE_REQUIRED_LIBRARIES ${HDF5_C_LIBRARY}) + + FIND_PACKAGE(Threads) + +@@ -745,6 +748,8 @@ IF(USE_HDF5) + IF(USE_SZIP) + # If user has specified the `SZIP_LIBRARY`, use it; otherwise try to find... + IF(NOT SZIP_LIBRARY) ++ set(SZIP_LIBRARY "") ++ ELSEIF(0) + FIND_LIBRARY(SZIP PATH NAMES szip sz) + SET(SZIP_LIBRARY ${SZIP}) + IF(NOT SZIP) +@@ -847,8 +852,7 @@ IF(USE_HDF5) + ENDIF(USE_HDF5) + + # See if we have libcurl +-FIND_PACKAGE(CURL) +-ADD_DEFINITIONS(-DCURL_STATICLIB=1) ++FIND_PACKAGE(CURL CONFIG) + INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS}) + + # Define a test flag for have curl library +@@ -2089,10 +2093,9 @@ IF(NC_LIBS) + STRING(REPLACE "-lhdf5::hdf5_hl-static" "-lhdf5_hl" NC_LIBS ${NC_LIBS}) + ENDIF() + +-STRING(REPLACE ";" " " LINKFLAGS "${LINKFLAGS}") +- +-LIST(REMOVE_DUPLICATES NC_LIBS) ++LIST(REMOVE_ITEM LINKFLAGS "-L") + LIST(REMOVE_DUPLICATES LINKFLAGS) ++STRING(REPLACE ";" " " LINKFLAGS "${LINKFLAGS}") + + SET(LIBS ${NC_LIBS}) + SET(NC_LIBS "-lnetcdf") +diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt +index 5e1692f..9e126ec 100644 +--- a/liblib/CMakeLists.txt ++++ b/liblib/CMakeLists.txt +@@ -77,6 +77,12 @@ IF(HAVE_LIBDL) + ENDIF() + + IF(USE_HDF5) ++ if(TARGET hdf5::hdf5-shared) ++ SET(TLL_LIBS ${TLL_LIBS} hdf5::hdf5-shared hdf5::hdf5_hl-shared) ++ else() ++ SET(TLL_LIBS ${TLL_LIBS} hdf5::hdf5-static hdf5::hdf5_hl-static) ++ endif() ++elseif(0) + IF(NOT MSVC) + # Some version of cmake define HDF5_hdf5_LIBRARY instead of + # HDF5_LIBRARY. Same with HDF5_HL_LIBRARIES +@@ -97,7 +103,7 @@ IF(USE_HDF5) + ENDIF() + + IF(FOUND_CURL) +- SET(TLL_LIBS ${TLL_LIBS} ${CURL_LIBRARY}) ++ SET(TLL_LIBS ${TLL_LIBS} CURL::libcurl) + ENDIF() + + IF(USE_HDF4) +@@ -118,7 +124,6 @@ IF(ENABLE_S3_SDK) + ENDIF() + + IF(TLL_LIBS) +- LIST(REMOVE_DUPLICATES TLL_LIBS) + ENDIF() + + TARGET_LINK_LIBRARIES(netcdf ${TLL_LIBS}) +diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in +index 9d68eec..b3be259 100644 +--- a/netCDFConfig.cmake.in ++++ b/netCDFConfig.cmake.in +@@ -12,6 +12,9 @@ set_and_check(netCDF_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@") + set(netCDF_LIBRARIES netCDF::netcdf) + + # include target information ++include(CMakeFindDependencyMacro) ++find_dependency(HDF5 CONFIG) ++find_dependency(CURL CONFIG) + include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake") + + # Compiling Options diff --git a/externals/vcpkg/ports/netcdf-c/vcpkg.json b/externals/vcpkg/ports/netcdf-c/vcpkg.json new file mode 100755 index 000000000..77df76e4d --- /dev/null +++ b/externals/vcpkg/ports/netcdf-c/vcpkg.json @@ -0,0 +1,105 @@ +{ + "name": "netcdf-c", + "version": "4.8.1", + "port-version": 2, + "description": "A set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.", + "homepage": "https://github.com/Unidata/netcdf-c", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "dap", + "nczarr", + "netcdf-4", + "platform-default-features" + ], + "features": { + "dap": { + "description": "Build with DAP remote access client support", + "dependencies": [ + { + "name": "curl", + "default-features": false + } + ] + }, + "hdf5": { + "description": "Build with HDF5 support", + "dependencies": [ + { + "name": "hdf5", + "default-features": false, + "features": [ + "zlib" + ] + }, + { + "name": "netcdf-c", + "default-features": false, + "features": [ + "netcdf-4" + ] + }, + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true + } + ] + }, + "nczarr": { + "description": "Build with NCZarr cloud storage access support", + "dependencies": [ + { + "name": "netcdf-c", + "default-features": false, + "features": [ + "netcdf-4" + ] + } + ] + }, + "nczarr-zip": { + "description": "Build with NCZarr ZIP support", + "dependencies": [ + { + "name": "libzip", + "default-features": false + }, + { + "name": "netcdf-c", + "default-features": false, + "features": [ + "nczarr" + ] + } + ] + }, + "netcdf-4": { + "description": "Build with netCDF-4 support" + }, + "platform-default-features": { + "$comment": "Break vcpkg CI cascade.", + "description": "Enable platform-dependent default features", + "dependencies": [ + { + "name": "netcdf-c", + "default-features": false, + "features": [ + "hdf5" + ], + "platform": "!uwp & !(arm64 & windows)" + } + ] + }, + "tools": { + "description": "Build utilities" + } + } +} diff --git a/externals/vcpkg/ports/netcdf-cxx4/export-cmake-targets.patch b/externals/vcpkg/ports/netcdf-cxx4/export-cmake-targets.patch new file mode 100755 index 000000000..b46ef3947 --- /dev/null +++ b/externals/vcpkg/ports/netcdf-cxx4/export-cmake-targets.patch @@ -0,0 +1,49 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f06fcc0..a19ab28 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -622,9 +622,23 @@ write_basic_package_version_file( + VERSION ${NCXX_VERSION} + COMPATIBILITY SameMajorVersion + ) ++ ++install( ++ EXPORT netcdf-cxx4Targets ++ FILE netcdf-cxx4Targets.cmake ++ NAMESPACE netCDF:: ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/netCDFCxx ++ ) + ++configure_package_config_file( ++ "${CMAKE_CURRENT_SOURCE_DIR}/netCDFCxxConfig.cmake.in" ++ "${CMAKE_CURRENT_BINARY_DIR}/netCDFCxxConfig.cmake" ++ INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/netCDFCxx" ++ ) ++ + install( + FILES ++ "${CMAKE_CURRENT_BINARY_DIR}/netCDFCxxConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/netCDF/netCDFCxxConfigVersion.cmake" + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/netCDFCxx + COMPONENT headers +diff --git a/cxx4/CMakeLists.txt b/cxx4/CMakeLists.txt +index b433786..5ef4bed 100644 +--- a/cxx4/CMakeLists.txt ++++ b/cxx4/CMakeLists.txt +@@ -32,7 +32,7 @@ SET(ALL_TLL_LIBS ${ALL_TLL_LIBS} ${HDF5_C_LIBRARY_hdf5}) + SET(ALL_TLL_LIBS ${ALL_TLL_LIBS} ${EXTRA_DEPS} PARENT_SCOPE) + + ADD_LIBRARY(netcdf-cxx4 ${CXX_SOURCES}) +-TARGET_INCLUDE_DIRECTORIES(netcdf-cxx4 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") ++TARGET_INCLUDE_DIRECTORIES(netcdf-cxx4 PUBLIC $ $) + TARGET_LINK_LIBRARIES(netcdf-cxx4 ${ALL_TLL_LIBS}) + SET_TARGET_PROPERTIES(netcdf-cxx4 PROPERTIES + VERSION ${NCXX_LIB_VERSION} +@@ -49,6 +49,7 @@ INSTALL( + ) + INSTALL( + TARGETS netcdf-cxx4 ++ EXPORT netcdf-cxx4Targets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} diff --git a/externals/vcpkg/ports/netcdf-cxx4/fix-dependecy-hdf5.patch b/externals/vcpkg/ports/netcdf-cxx4/fix-dependecy-hdf5.patch new file mode 100755 index 000000000..73b9a0d01 --- /dev/null +++ b/externals/vcpkg/ports/netcdf-cxx4/fix-dependecy-hdf5.patch @@ -0,0 +1,41 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 60c699d..f06fcc0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -395,14 +395,20 @@ ENDIF(NC_HAS_DEF_VAR_FILTER) + ### + # Find HDF5 + ### +-IF(MSVC) ++IF(0) + SET(SEARCH_PACKAGE_NAME ${HDF5_PACKAGE_NAME}) + FIND_PACKAGE(HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS C HL NO_MODULES REQUIRED ${NC_HDF5_LINK_TYPE}) + ELSE(MSVC) +- FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED) ++ FIND_PACKAGE(hdf5 CONFIG REQUIRED) ++ set(HDF5_FOUND ${hdf5_FOUND}) ++ if (NOT HDF5_USE_STATIC_LIBRARIES) ++ set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-shared hdf5::hdf5_hl-shared) ++ else() ++ set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-static hdf5::hdf5_hl-static) ++ endif() + ENDIF(MSVC) + +-CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5free_memory "" HAVE_H5FREE_MEMORY) ++set(HAVE_H5FREE_MEMORY ON) + IF(NOT HAVE_H5FREE_MEMORY) + MESSAGE(STATUS "Plugin support requires libhdf5 with H5Free support. Your libhdf5 install does not provide H5Free. Please install a newer version of libhdf5 if you require plugin compression support.") + SET(NC_HAS_DEF_VAR_FILTER "") +diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt +index 30a4a96..1809d29 100644 +--- a/plugins/CMakeLists.txt ++++ b/plugins/CMakeLists.txt +@@ -23,7 +23,7 @@ SET_TARGET_PROPERTIES(test_bzip2 PROPERTIES OUTPUT_NAME "bzip2") + SET_TARGET_PROPERTIES(test_bzip2 PROPERTIES LIBRARY_OUTPUT_NAME "h5bzip2") + SET_TARGET_PROPERTIES(test_bzip2 PROPERTIES ARCHIVE_OUTPUT_NAME "h5bzip2") + SET_TARGET_PROPERTIES(test_bzip2 PROPERTIES RUNTIME_OUTPUT_NAME "h5bzip2") +-TARGET_LINK_LIBRARIES(test_bzip2 ${ALL_TLL_LIBS}) ++TARGET_LINK_LIBRARIES(test_bzip2 ${ALL_TLL_LIBS} ${HDF5_C_LIBRARY_hdf5}) + + ADD_LIBRARY(misc MODULE ${libmisc_SOURCES}) + SET_TARGET_PROPERTIES(misc PROPERTIES LIBRARY_OUTPUT_NAME "misc") diff --git a/externals/vcpkg/ports/netcdf-cxx4/netCDFCxxConfig.cmake.in b/externals/vcpkg/ports/netcdf-cxx4/netCDFCxxConfig.cmake.in new file mode 100755 index 000000000..430d3d911 --- /dev/null +++ b/externals/vcpkg/ports/netcdf-cxx4/netCDFCxxConfig.cmake.in @@ -0,0 +1,29 @@ +# NetCDF CXX Configuration Summary +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) + +if (@netCDF_FOUND@) + if(EXISTS "@netCDF_ROOT@") + set(netCDF_ROOT "@netCDF_ROOT@") + endif() + if(EXISTS "@netCDF_DIR@") + set(netCDF_DIR "@netCDF_DIR@") + endif() + find_dependency(netCDF) + set(NETCDF_C_LIBRARY ${netCDF_LIBRARIES}) + set(NETCDF_C_INCLUDE_DIR ${netCDF_INCLUDE_DIR}) +else() + set(NETCDF_C_LIBRARY "@NETCDF_C_LIBRARY@") + set(NETCDF_C_INCLUDE_DIR "@NETCDF_C_INCLUDE_DIR@") +endif() + +if (NOT TARGET netCDF::netcdf) + add_library(netCDF::netcdf UNKNOWN IMPORTED) + set_target_properties(netCDF::netcdf PROPERTIES + IMPORTED_LOCATION "${NETCDF_C_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${NETCDF_C_INCLUDE_DIR}" + ) +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/netcdf-cxx4Targets.cmake") \ No newline at end of file diff --git a/externals/vcpkg/ports/netcdf-cxx4/portfile.cmake b/externals/vcpkg/ports/netcdf-cxx4/portfile.cmake new file mode 100755 index 000000000..f01412804 --- /dev/null +++ b/externals/vcpkg/ports/netcdf-cxx4/portfile.cmake @@ -0,0 +1,42 @@ +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" HDF5_USE_STATIC_LIBRARIES) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Unidata/netcdf-cxx4 + REF f8882188267488ef801691e69ad072e3eb217ad8 # v4.3.1 + SHA512 9816acf221d196e21af19d4c3d85484934916e7c018e9b2c96aab9f5660b2f08c5db9cd8254ba3fa5f0aa5f5c5ad7bd3a3aaba559e5e640c5349d44e07a20ed3 + HEAD_REF master + PATCHES + fix-dependecy-hdf5.patch + export-cmake-targets.patch +) + +#Provided by upstream https://github.com/Unidata/netcdf-cxx4/blob/master/netCDFCxxConfig.cmake.in +file(COPY ${CMAKE_CURRENT_LIST_DIR}/netCDFCxxConfig.cmake.in DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DNCXX_ENABLE_TESTS=OFF + -DCMAKE_INSTALL_CMAKECONFIGDIR=share/netCDFCxx + -DHDF5_USE_STATIC_LIBRARIES=${HDF5_USE_STATIC_LIBRARIES} + # OPTIONS_RELEASE -DOPTIMIZE=1 + # OPTIONS_DEBUG -DDEBUGGABLE=1 +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/netCDFCxx TARGET_PATH share/netCDFCxx) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/netcdf-cxx4/vcpkg.json b/externals/vcpkg/ports/netcdf-cxx4/vcpkg.json new file mode 100755 index 000000000..58fcf7625 --- /dev/null +++ b/externals/vcpkg/ports/netcdf-cxx4/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "netcdf-cxx4", + "version-string": "4.3.1", + "port-version": 3, + "description": "a set of machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.", + "homepage": "https://github.com/Unidata/netcdf-cxx4", + "dependencies": [ + "hdf5", + "netcdf-c" + ] +} diff --git a/externals/vcpkg/ports/nethost/0001-nethost-cmakelists.patch b/externals/vcpkg/ports/nethost/0001-nethost-cmakelists.patch new file mode 100755 index 000000000..c45f3b474 --- /dev/null +++ b/externals/vcpkg/ports/nethost/0001-nethost-cmakelists.patch @@ -0,0 +1,73 @@ +diff --git a/src/native/corehost/nethost/CMakeLists.txt b/src/native/corehost/nethost/CMakeLists.txt +index a9f44e720..0f24d4458 100644 +--- a/src/native/corehost/nethost/CMakeLists.txt ++++ b/src/native/corehost/nethost/CMakeLists.txt +@@ -1,11 +1,14 @@ + # Licensed to the .NET Foundation under one or more agreements. + # The .NET Foundation licenses this file to you under the MIT license. + ++cmake_minimum_required (VERSION 3.14.5) + project(nethost) + + set(DOTNET_PROJECT_NAME "nethost") + + # Include directories ++include(../../../../eng/native/configurepaths.cmake) ++include("${CLR_ENG_NATIVE_DIR}/configurecompiler.cmake") + include_directories(../fxr) + + # CMake does not recommend using globbing since it messes with the freshness checks +@@ -19,12 +22,23 @@ if(CLR_CMAKE_TARGET_WIN32) + Exports.def) + endif() + ++if(BUILD_SHARED_LIBS) + include(../lib.cmake) ++set(targets nethost) ++else() ++include(../hostmisc/hostmisc.cmake) + include(../lib_static.cmake) ++add_library(nethost INTERFACE) ++target_link_libraries(nethost INTERFACE libnethost) ++set(targets libnethost nethost) ++target_include_directories(libnethost INTERFACE $) ++endif() ++target_include_directories(nethost INTERFACE $) + + add_definitions(-DFEATURE_LIBHOST=1) + add_definitions(-DNETHOST_EXPORT) + ++if(NOT BUILD_SHARED_LIBS) + # Copy static lib PDB to the project output directory + if (WIN32) + set_target_properties(libnethost PROPERTIES +@@ -32,15 +46,18 @@ if (WIN32) + COMPILE_PDB_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}" + ) + endif(WIN32) ++endif() + +-install(FILES ../coreclr_delegates.h DESTINATION corehost) +-install(FILES ../hostfxr.h DESTINATION corehost) +-install(FILES nethost.h DESTINATION corehost) +-install_with_stripped_symbols(nethost TARGETS corehost) ++set(NETHOST_HEADERS nethost.h ../coreclr_delegates.h ../hostfxr.h) ++install(FILES ${NETHOST_HEADERS} DESTINATION include) ++install(TARGETS ${targets} EXPORT unofficial-nethost-config ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++ RUNTIME DESTINATION bin ++) + +-# Only Windows creates a symbols file for static libs. +-if (WIN32) +- install_with_stripped_symbols(libnethost TARGETS corehost) +-else() +- install(TARGETS libnethost DESTINATION corehost) +-endif(WIN32) +\ No newline at end of file ++install(EXPORT unofficial-nethost-config ++ DESTINATION share/unofficial-nethost ++ FILE unofficial-nethost-config.cmake ++ NAMESPACE unofficial::nethost:: ++) diff --git a/externals/vcpkg/ports/nethost/portfile.cmake b/externals/vcpkg/ports/nethost/portfile.cmake new file mode 100755 index 000000000..79c4ed49f --- /dev/null +++ b/externals/vcpkg/ports/nethost/portfile.cmake @@ -0,0 +1,77 @@ +set(COMMIT_HASH v6.0.5) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO dotnet/runtime + REF ${COMMIT_HASH} + SHA512 ccf4865bd9ea63c525fc11b0008774052d51f9247427fc28a91e3836e8e8d157569565bdac17326fe44a446d98a3e4b74a55779d01bede596f2458f4ec86f3aa + HEAD_REF master + PATCHES + 0001-nethost-cmakelists.patch +) + +set(PRODUCT_VERSION "6.0.5") + +if(VCPKG_TARGET_IS_WINDOWS) + set(RID_PLAT "win") +elseif(VCPKG_TARGET_IS_OSX) + set(RID_PLAT "osx") +elseif(VCPKG_TARGET_IS_LINUX) + set(RID_PLAT "linux") +else() + message(FATAL_ERROR "Unsupported platform") +endif() + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(RID_ARCH "x86") + set(ARCH_NAME "I386") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(RID_ARCH "x64") + set(ARCH_NAME "AMD64") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(RID_ARCH "arm") + set(ARCH_NAME "ARM") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(RID_ARCH "arm64") + set(ARCH_NAME "ARM64") +else() + message(FATAL_ERROR "Unsupported architecture") +endif() + +set(BASE_RID "${RID_PLAT}-${RID_ARCH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/src/native/corehost/nethost/" + # vcpkg's /utf-8 is incompatible with dotnet's own /source-charset:utf-8 + NO_CHARSET_FLAG + OPTIONS + "-DSKIP_VERSIONING=1" + "-DCLI_CMAKE_HOST_POLICY_VER:STRING=${PRODUCT_VERSION}" + "-DCLI_CMAKE_HOST_FXR_VER:STRING=${PRODUCT_VERSION}" + "-DCLI_CMAKE_HOST_VER:STRING=${PRODUCT_VERSION}" + "-DCLI_CMAKE_COMMON_HOST_VER:STRING=${PRODUCT_VERSION}" + "-DCLI_CMAKE_PKG_RID:STRING=${BASE_RID}" + "-DCLI_CMAKE_COMMIT_HASH:STRING=${COMMIT_HASH}" + "-DCLR_CMAKE_TARGET_ARCH_${ARCH_NAME}=1" + "-DCLR_CMAKE_TARGET_ARCH=${RID_ARCH}" + "-DCLR_CMAKE_HOST_ARCH=${RID_ARCH}" + MAYBE_UNUSED_VARIABLES + SKIP_VERSIONING # only used on WIN32 +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-nethost) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/nethost.h" "#ifdef NETHOST_USE_AS_STATIC" "#if 1") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/nethost.h" "#ifdef NETHOST_USE_AS_STATIC" "#if 0") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/nethost/usage b/externals/vcpkg/ports/nethost/usage new file mode 100755 index 000000000..26a41d92f --- /dev/null +++ b/externals/vcpkg/ports/nethost/usage @@ -0,0 +1,4 @@ +The package nethost can be used via CMake: + + find_package(unofficial-nethost CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::nethost::nethost) diff --git a/externals/vcpkg/ports/nethost/vcpkg.json b/externals/vcpkg/ports/nethost/vcpkg.json new file mode 100755 index 000000000..b5cf09989 --- /dev/null +++ b/externals/vcpkg/ports/nethost/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "nethost", + "version": "6.0.5", + "description": "Provides a set of APIs that can be used to host .NET Core (dotnet)", + "homepage": "https://github.com/dotnet/runtime/tree/master/src/installer/corehost/cli/nethost", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/nettle/compile.patch b/externals/vcpkg/ports/nettle/compile.patch new file mode 100755 index 000000000..2aa1891c8 --- /dev/null +++ b/externals/vcpkg/ports/nettle/compile.patch @@ -0,0 +1,39 @@ +diff --git a/examples/Makefile.in b/examples/Makefile.in +index eb6a81790..1d927079c 100644 +--- a/examples/Makefile.in ++++ b/examples/Makefile.in +@@ -11,7 +11,7 @@ PRE_CPPFLAGS = -I.. -I$(top_srcdir) + PRE_LDFLAGS = -L.. + + OPENSSL_LIBFLAGS = @OPENSSL_LIBFLAGS@ +-BENCH_LIBS = @BENCH_LIBS@ -lm ++BENCH_LIBS = @BENCH_LIBS@ + + HOGWEED_TARGETS = rsa-keygen$(EXEEXT) rsa-sign$(EXEEXT) \ + rsa-verify$(EXEEXT) rsa-encrypt$(EXEEXT) rsa-decrypt$(EXEEXT) \ +diff --git a/streebog.c b/streebog.c +index 7ad619d5e..85609a473 100644 +--- a/streebog.c ++++ b/streebog.c +@@ -1233,7 +1233,7 @@ streebog512_compress (struct streebog512_ctx *ctx, const uint8_t *input, uint64_ + static void + streebog_final (struct streebog512_ctx *ctx) + { +- uint64_t Z[8] = {}; ++ uint64_t Z[8] = {0,0,0,0,0,0,0,0}; + unsigned int i; + + /* PAD. It does not count towards message length */ +diff --git a/Makefile.in b/Makefile.in +index b65ff4960..3887d0c8f 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -322,7 +322,7 @@ $(LIBHOGWEED_FORLINK): $(hogweed_OBJS) $(LIBNETTLE_FORLINK) + + # For building the various *data.c programs. -lm needed for shadata. + %$(EXEEXT_FOR_BUILD): %.c +- $(CC_FOR_BUILD) $< $(CFLAGS) -lm -o $@ ++ $(CC_FOR_BUILD) $< $(CFLAGS) -o $@ + + # Explicit dependency. + eccdata$(EXEEXT_FOR_BUILD): mini-gmp.c mini-gmp.h diff --git a/externals/vcpkg/ports/nettle/fix-InstallLibPath.patch b/externals/vcpkg/ports/nettle/fix-InstallLibPath.patch new file mode 100755 index 000000000..d42a28067 --- /dev/null +++ b/externals/vcpkg/ports/nettle/fix-InstallLibPath.patch @@ -0,0 +1,36 @@ +diff --git a/configure.ac b/configure.ac +index 90ea1ea..58cfe88 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -354,25 +354,25 @@ if test "x$ABI" != xstandard ; then + else + # The dash builtin pwd tries to be "helpful" and remember + # symlink names. Use -P option, and hope it's portable enough. +- test -d /usr/lib${ABI} \ +- && (cd /usr/lib${ABI} && pwd -P | grep >/dev/null "/lib${ABI}"'$') \ +- && libdir='${exec_prefix}/'"lib${ABI}" ++ test -d /usr/lib \ ++ && (cd /usr/lib && pwd -P | grep >/dev/null "/lib"'$') \ ++ && libdir='${exec_prefix}/'"lib" + fi + ;; + # On freebsd, it seems 32-bit libraries are in lib32, + # and 64-bit in lib. Don't know about "kfreebsd", does + # it follow the Linux fhs conventions? + *:freebsd*:32) +- libdir='${exec_prefix}/lib32' ++ libdir='${exec_prefix}/lib' + ;; + *:freebsd*:64) + libdir='${exec_prefix}/lib' + ;; + *:irix*:32) +- libdir='${exec_prefix}/lib32' ++ libdir='${exec_prefix}/lib' + ;; + *:irix*:64) +- libdir='${exec_prefix}/lib64' ++ libdir='${exec_prefix}/lib' + ;; + *) + AC_MSG_WARN([Don't know where to install $ABI-bit libraries on this system.]); dnl ' diff --git a/externals/vcpkg/ports/nettle/flags.patch b/externals/vcpkg/ports/nettle/flags.patch new file mode 100755 index 000000000..990bd6d3e --- /dev/null +++ b/externals/vcpkg/ports/nettle/flags.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index e5ccfc7..922aa0c 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -309,7 +309,7 @@ $(LIBHOGWEED_FORLINK): $(hogweed_OBJS) $(LIBNETTLE_FORLINK) + + # For building the various *data.c programs. -lm needed for shadata. + %$(EXEEXT_FOR_BUILD): %.c +- $(CC_FOR_BUILD) $< -lm -o $@ ++ $(CC_FOR_BUILD) $< $(CFLAGS) -lm -o $@ + + # Explicit dependency. + eccdata$(EXEEXT_FOR_BUILD): mini-gmp.c mini-gmp.h diff --git a/externals/vcpkg/ports/nettle/hogweed-x64.def b/externals/vcpkg/ports/nettle/hogweed-x64.def new file mode 100755 index 000000000..14a8bcad7 --- /dev/null +++ b/externals/vcpkg/ports/nettle/hogweed-x64.def @@ -0,0 +1,288 @@ +EXPORTS + _nettle_ecc_curve448_modp + _nettle_ecc_curve25519_modp + _nettle_ecc_secp521r1_modp + _nettle_ecc_secp384r1_modp + _nettle_ecc_secp256r1_redc + _nettle_ecc_secp224r1_modp + _nettle_ecc_secp192r1_modp + nettle_ed448_shake256_verify + nettle_ed448_shake256_sign + nettle_ed448_shake256_public_key + _nettle_ed448_shake256 + nettle_ed25519_sha512_verify + nettle_ed25519_sha512_sign + nettle_ed25519_sha512_public_key + _nettle_ed25519_sha512 + _nettle_eddsa_verify + _nettle_eddsa_verify_itch + _nettle_eddsa_sign + _nettle_eddsa_sign_itch + _nettle_eddsa_public_key + _nettle_eddsa_public_key_itch + _nettle_eddsa_hash + _nettle_eddsa_expand_key + _nettle_eddsa_decompress + _nettle_eddsa_decompress_itch + _nettle_eddsa_compress + _nettle_eddsa_compress_itch + _nettle_curve448_eh_to_x + nettle_curve448_mul + nettle_curve448_mul_g + _nettle_curve25519_eh_to_x + nettle_curve25519_mul + nettle_curve25519_mul_g + nettle_gostdsa_vko + nettle_gostdsa_verify + nettle_ecc_gostdsa_verify + nettle_ecc_gostdsa_verify_itch + nettle_gostdsa_sign + nettle_ecc_gostdsa_sign + nettle_ecc_gostdsa_sign_itch + nettle_ecdsa_generate_keypair + nettle_ecdsa_verify + nettle_ecc_ecdsa_verify + nettle_ecc_ecdsa_verify_itch + nettle_ecdsa_sign + nettle_ecc_ecdsa_sign + nettle_ecc_ecdsa_sign_itch + nettle_ecc_point_mul_g + nettle_ecc_point_mul + nettle_ecc_scalar_clear + nettle_ecc_scalar_get + nettle_ecc_scalar_init + nettle_ecc_scalar_set + nettle_ecc_point_clear + nettle_ecc_point_get + nettle_ecc_point_init + nettle_ecc_point_set + _nettle_ecc_mod_random + nettle_ecc_scalar_random + _nettle_ecc_hash + _nettle_gost_hash + _nettle_ecc_mul_a + _nettle_ecc_mul_g + _nettle_ecc_mul_m + _nettle_ecc_mul_a_eh + _nettle_ecc_mul_g_eh + _nettle_ecc_add_thh + _nettle_ecc_add_th + _nettle_ecc_dup_th + _nettle_ecc_add_ehh + _nettle_ecc_add_eh + _nettle_ecc_dup_eh + _nettle_ecc_eh_to_a + _nettle_ecc_add_jjj + _nettle_ecc_add_jja + _nettle_ecc_dup_jj + _nettle_ecc_a_to_j + _nettle_ecc_j_to_a + nettle_ecc_bit_size + nettle_ecc_size + nettle_ecc_size_a + nettle_ecc_size_j + _nettle_secp_521r1 + nettle_get_secp_521r1 + _nettle_secp_384r1 + nettle_get_secp_384r1 + _nettle_secp_256r1 + nettle_get_secp_256r1 + _nettle_secp_224r1 + nettle_get_secp_224r1 + _nettle_secp_192r1 + nettle_get_secp_192r1 + _nettle_gost_gc512a + nettle_get_gost_gc512a + _nettle_gost_gc256b + nettle_get_gost_gc256b + _nettle_curve448 + _nettle_curve25519 + _nettle_ecc_pm1_redc + _nettle_ecc_pp1_redc + _nettle_ecc_mod_add + _nettle_ecc_mod_addmul_1 + _nettle_ecc_mod_mul + _nettle_ecc_mod_mul_1 + _nettle_ecc_mod_mul_canonical + _nettle_ecc_mod_pow_2k + _nettle_ecc_mod_pow_2k_mul + _nettle_ecc_mod_sqr + _nettle_ecc_mod_sqr_canonical + _nettle_ecc_mod_sub + _nettle_ecc_mod_submul_1 + _nettle_ecc_mod_inv + _nettle_ecc_mod + _nettle_cnd_copy + _nettle_gmp_alloc + _nettle_gmp_alloc_limbs + _nettle_gmp_free + _nettle_gmp_free_limbs + _nettle_mpn_get_base256 + _nettle_mpn_get_base256_le + _nettle_mpn_set_base256 + _nettle_mpn_set_base256_le + _nettle_mpz_limbs_cmp + _nettle_mpz_limbs_copy + _nettle_mpz_limbs_read_n + _nettle_mpz_set_n + _nettle_sec_tabselect + _nettle_sec_sub_1 + _nettle_sec_add_1 + nettle_dsa_openssl_private_key_from_der_iterator + nettle_dsa_params_from_der_iterator + nettle_dsa_public_key_from_der_iterator + nettle_openssl_provate_key_from_der + nettle_rsa_keypair_from_der + nettle_rsa_private_key_from_der_iterator + nettle_rsa_public_key_from_der_iterator + nettle_asn1_der_decode_bitstring + nettle_asn1_der_decode_bitstring_last + nettle_asn1_der_decode_constructed + nettle_asn1_der_decode_constructed_last + nettle_asn1_der_get_bignum + nettle_asn1_der_get_uint32 + nettle_asn1_der_iterator_first + nettle_asn1_der_iterator_next + nettle_rsa_keypair_to_openpgp + nettle_pgp_armor + nettle_pgp_crc24 + nettle_pgp_put_header + nettle_pgp_put_header_length + nettle_pgp_put_length + nettle_pgp_put_mpi + nettle_pgp_put_public_rsa_key + nettle_pgp_put_rsa_sha1_signature + nettle_pgp_put_string + nettle_pgp_put_sub_packet + nettle_pgp_put_uint16 + nettle_pgp_put_uint32 + nettle_pgp_put_userid + nettle_pgp_sub_packet_end + nettle_pgp_sub_packet_start + nettle_dsa_keypair_from_sexp_alist + nettle_dsa_sha1_keypair_from_sexp + nettle_dsa_sha256_keypair_from_sexp + nettle_dsa_signature_from_sexp + nettle_dsa_keypair_to_sexp + nettle_dsa_sha256_verify + nettle_dsa_sha256_verify_digest + nettle_dsa_sha256_sign + nettle_dsa_sha256_sign_digest + nettle_dsa_sha1_verify + nettle_dsa_sha1_verify_digest + nettle_dsa_sha1_sign + nettle_dsa_sha1_sign_digest + _nettle_dsa_hash + nettle_dsa_generate_keypair + nettle_dsa_verify + nettle_dsa_sign + nettle_dsa_generate_params + nettle_dsa_compat_generate_keypair + nettle_dsa_private_key_clear + nettle_dsa_private_key_init + nettle_dsa_public_key_clear + nettle_dsa_public_key_init + nettle_dsa_params_clear + nettle_dsa_params_init + nettle_dsa_signature_clear + nettle_dsa_signature_init + nettle_rsa_keypair_from_sexp + nettle_rsa_keypair_from_sexp_alist + nettle_rsa_keypair_to_sexp + _nettle_rsa_blind + _nettle_rsa_unblind + nettle_rsa_generate_keypair + nettle_rsa_decrypt_tr + nettle_rsa_sec_decrypt + nettle_rsa_decrypt + nettle_rsa_encrypt + nettle_rsa_pss_sha384_verify_digest + nettle_rsa_pss_sha512_verify_digest + nettle_rsa_pss_sha384_sign_digest_tr + nettle_rsa_pss_sha512_sign_digest_tr + nettle_rsa_pss_sha256_verify_digest + nettle_rsa_pss_sha256_sign_digest_tr + nettle_rsa_sha512_verify + nettle_rsa_sha512_verify_digest + nettle_rsa_sha512_sign_digest_tr + nettle_rsa_sha512_sign_tr + nettle_rsa_sha512_sign + nettle_rsa_sha512_sign_digest + nettle_rsa_sha256_verify + nettle_rsa_sha256_verify_digest + nettle_rsa_sha256_sign_digest_tr + nettle_rsa_sha256_sign_tr + nettle_rsa_sha256_sign + nettle_rsa_sha256_sign_digest + nettle_rsa_sha1_verify + nettle_rsa_sha1_verify_digest + nettle_rsa_sha1_sign_digest_tr + nettle_rsa_sha1_sign_tr + nettle_rsa_sha1_sign + nettle_rsa_sha1_sign_digest + nettle_rsa_md5_verify + nettle_rsa_md5_verify_digest + nettle_rsa_md5_sign_digest_tr + nettle_rsa_md5_sign_tr + nettle_rsa_md5_sign + nettle_rsa_md5_sign_digest + nettle_rsa_pkcs1_verify + nettle_rsa_pkcs1_sign_tr + nettle_rsa_pkcs1_sign + _nettle_rsa_sec_compute_root + _nettle_rsa_sec_compute_root_itch + _nettle_rsa_verify + _nettle_rsa_verify_recover + _nettle_rsa_sec_compute_root_tr + nettle_rsa_compute_root_tr + nettle_rsa_compute_root + nettle_rsa_private_key_clear + nettle_rsa_private_key_init + nettle_rsa_private_key_prepare + _nettle_rsa_check_size + nettle_rsa_public_key_clear + nettle_rsa_public_key_init + nettle_rsa_public_key_prepare + nettle_pss_mgf1 + nettle_pss_encode_mgf1 + nettle_pss_verify_mgf1 + nettle_pkcs1_rsa_sha512_encode + nettle_pkcs1_rsa_sha512_encode_digest + nettle_pkcs1_rsa_sha256_encode + nettle_pkcs1_rsa_sha256_encode_digest + nettle_pkcs1_rsa_sha1_encode + nettle_pkcs1_rsa_sha1_encode_digest + nettle_pkcs1_rsa_md5_encode + nettle_pkcs1_rsa_md5_encode_digest + nettle_pkcs1_rsa_digest_encode + _nettle_pkcs1_sec_decrypt + _nettle_pkcs1_sec_decrypt_variable + nettle_pkcs1_decrypt + nettle_pkcs1_encrypt + _nettle_pkcs1_signature_prefix + nettle_mpz_set_sexp + _nettle_generate_pocklington_prime + nettle_random_prime + nettle_mpz_random + nettle_mpz_random_size + nettle_mpz_get_str_256 + nettle_mpz_init_set_str_256_s + nettle_mpz_init_set_str_256_u + nettle_mpz_set_str_256_s + nettle_mpz_set_str_256_u + nettle_mpz_sizeinbase_256_s + nettle_mpz_sizeinbase_256_u + nettle_sexp_transport_format + nettle_sexp_transport_vformat + nettle_sexp_transport_iterator_first + nettle_sexp_format + nettle_sexp_vformat + nettle_sexp_iterator_assoc + nettle_sexp_iterator_check_type + nettle_sexp_iterator_check_types + nettle_sexp_iterator_enter_list + nettle_sexp_iterator_exit_list + nettle_sexp_iterator_first + nettle_sexp_iterator_get_uint32 + nettle_sexp_iterator_next + nettle_sexp_iterator_subexpr diff --git a/externals/vcpkg/ports/nettle/hogweed-x86.def b/externals/vcpkg/ports/nettle/hogweed-x86.def new file mode 100755 index 000000000..8824a537c --- /dev/null +++ b/externals/vcpkg/ports/nettle/hogweed-x86.def @@ -0,0 +1,281 @@ +EXPORTS + nettle_ed448_shake256_verify + nettle_ed448_shake256_sign + nettle_ed448_shake256_public_key + _nettle_ed448_shake256 + nettle_ed25519_sha512_verify + nettle_ed25519_sha512_sign + nettle_ed25519_sha512_public_key + _nettle_ed25519_sha512 + _nettle_eddsa_verify + _nettle_eddsa_verify_itch + _nettle_eddsa_sign + _nettle_eddsa_sign_itch + _nettle_eddsa_public_key + _nettle_eddsa_public_key_itch + _nettle_eddsa_hash + _nettle_eddsa_expand_key + _nettle_eddsa_decompress + _nettle_eddsa_decompress_itch + _nettle_eddsa_compress + _nettle_eddsa_compress_itch + _nettle_curve448_eh_to_x + nettle_curve448_mul + nettle_curve448_mul_g + _nettle_curve25519_eh_to_x + nettle_curve25519_mul + nettle_curve25519_mul_g + nettle_gostdsa_vko + nettle_gostdsa_verify + nettle_ecc_gostdsa_verify + nettle_ecc_gostdsa_verify_itch + nettle_gostdsa_sign + nettle_ecc_gostdsa_sign + nettle_ecc_gostdsa_sign_itch + nettle_ecdsa_generate_keypair + nettle_ecdsa_verify + nettle_ecc_ecdsa_verify + nettle_ecc_ecdsa_verify_itch + nettle_ecdsa_sign + nettle_ecc_ecdsa_sign + nettle_ecc_ecdsa_sign_itch + nettle_ecc_point_mul_g + nettle_ecc_point_mul + nettle_ecc_scalar_clear + nettle_ecc_scalar_get + nettle_ecc_scalar_init + nettle_ecc_scalar_set + nettle_ecc_point_clear + nettle_ecc_point_get + nettle_ecc_point_init + nettle_ecc_point_set + _nettle_ecc_mod_random + nettle_ecc_scalar_random + _nettle_ecc_hash + _nettle_gost_hash + _nettle_ecc_mul_a + _nettle_ecc_mul_g + _nettle_ecc_mul_m + _nettle_ecc_mul_a_eh + _nettle_ecc_mul_g_eh + _nettle_ecc_add_thh + _nettle_ecc_add_th + _nettle_ecc_dup_th + _nettle_ecc_add_ehh + _nettle_ecc_add_eh + _nettle_ecc_dup_eh + _nettle_ecc_eh_to_a + _nettle_ecc_add_jjj + _nettle_ecc_add_jja + _nettle_ecc_dup_jj + _nettle_ecc_a_to_j + _nettle_ecc_j_to_a + nettle_ecc_bit_size + nettle_ecc_size + nettle_ecc_size_a + nettle_ecc_size_j + _nettle_secp_521r1 + nettle_get_secp_521r1 + _nettle_secp_384r1 + nettle_get_secp_384r1 + _nettle_secp_256r1 + nettle_get_secp_256r1 + _nettle_secp_224r1 + nettle_get_secp_224r1 + _nettle_secp_192r1 + nettle_get_secp_192r1 + _nettle_gost_gc512a + nettle_get_gost_gc512a + _nettle_gost_gc256b + nettle_get_gost_gc256b + _nettle_curve448 + _nettle_curve25519 + _nettle_ecc_pm1_redc + _nettle_ecc_pp1_redc + _nettle_ecc_mod_add + _nettle_ecc_mod_addmul_1 + _nettle_ecc_mod_mul + _nettle_ecc_mod_mul_1 + _nettle_ecc_mod_mul_canonical + _nettle_ecc_mod_pow_2k + _nettle_ecc_mod_pow_2k_mul + _nettle_ecc_mod_sqr + _nettle_ecc_mod_sqr_canonical + _nettle_ecc_mod_sub + _nettle_ecc_mod_submul_1 + _nettle_ecc_mod_inv + _nettle_ecc_mod + _nettle_cnd_copy + _nettle_gmp_alloc + _nettle_gmp_alloc_limbs + _nettle_gmp_free + _nettle_gmp_free_limbs + _nettle_mpn_get_base256 + _nettle_mpn_get_base256_le + _nettle_mpn_set_base256 + _nettle_mpn_set_base256_le + _nettle_mpz_limbs_cmp + _nettle_mpz_limbs_copy + _nettle_mpz_limbs_read_n + _nettle_mpz_set_n + _nettle_sec_tabselect + _nettle_sec_sub_1 + _nettle_sec_add_1 + nettle_dsa_openssl_private_key_from_der_iterator + nettle_dsa_params_from_der_iterator + nettle_dsa_public_key_from_der_iterator + nettle_openssl_provate_key_from_der + nettle_rsa_keypair_from_der + nettle_rsa_private_key_from_der_iterator + nettle_rsa_public_key_from_der_iterator + nettle_asn1_der_decode_bitstring + nettle_asn1_der_decode_bitstring_last + nettle_asn1_der_decode_constructed + nettle_asn1_der_decode_constructed_last + nettle_asn1_der_get_bignum + nettle_asn1_der_get_uint32 + nettle_asn1_der_iterator_first + nettle_asn1_der_iterator_next + nettle_rsa_keypair_to_openpgp + nettle_pgp_armor + nettle_pgp_crc24 + nettle_pgp_put_header + nettle_pgp_put_header_length + nettle_pgp_put_length + nettle_pgp_put_mpi + nettle_pgp_put_public_rsa_key + nettle_pgp_put_rsa_sha1_signature + nettle_pgp_put_string + nettle_pgp_put_sub_packet + nettle_pgp_put_uint16 + nettle_pgp_put_uint32 + nettle_pgp_put_userid + nettle_pgp_sub_packet_end + nettle_pgp_sub_packet_start + nettle_dsa_keypair_from_sexp_alist + nettle_dsa_sha1_keypair_from_sexp + nettle_dsa_sha256_keypair_from_sexp + nettle_dsa_signature_from_sexp + nettle_dsa_keypair_to_sexp + nettle_dsa_sha256_verify + nettle_dsa_sha256_verify_digest + nettle_dsa_sha256_sign + nettle_dsa_sha256_sign_digest + nettle_dsa_sha1_verify + nettle_dsa_sha1_verify_digest + nettle_dsa_sha1_sign + nettle_dsa_sha1_sign_digest + _nettle_dsa_hash + nettle_dsa_generate_keypair + nettle_dsa_verify + nettle_dsa_sign + nettle_dsa_generate_params + nettle_dsa_compat_generate_keypair + nettle_dsa_private_key_clear + nettle_dsa_private_key_init + nettle_dsa_public_key_clear + nettle_dsa_public_key_init + nettle_dsa_params_clear + nettle_dsa_params_init + nettle_dsa_signature_clear + nettle_dsa_signature_init + nettle_rsa_keypair_from_sexp + nettle_rsa_keypair_from_sexp_alist + nettle_rsa_keypair_to_sexp + _nettle_rsa_blind + _nettle_rsa_unblind + nettle_rsa_generate_keypair + nettle_rsa_decrypt_tr + nettle_rsa_sec_decrypt + nettle_rsa_decrypt + nettle_rsa_encrypt + nettle_rsa_pss_sha384_verify_digest + nettle_rsa_pss_sha512_verify_digest + nettle_rsa_pss_sha384_sign_digest_tr + nettle_rsa_pss_sha512_sign_digest_tr + nettle_rsa_pss_sha256_verify_digest + nettle_rsa_pss_sha256_sign_digest_tr + nettle_rsa_sha512_verify + nettle_rsa_sha512_verify_digest + nettle_rsa_sha512_sign_digest_tr + nettle_rsa_sha512_sign_tr + nettle_rsa_sha512_sign + nettle_rsa_sha512_sign_digest + nettle_rsa_sha256_verify + nettle_rsa_sha256_verify_digest + nettle_rsa_sha256_sign_digest_tr + nettle_rsa_sha256_sign_tr + nettle_rsa_sha256_sign + nettle_rsa_sha256_sign_digest + nettle_rsa_sha1_verify + nettle_rsa_sha1_verify_digest + nettle_rsa_sha1_sign_digest_tr + nettle_rsa_sha1_sign_tr + nettle_rsa_sha1_sign + nettle_rsa_sha1_sign_digest + nettle_rsa_md5_verify + nettle_rsa_md5_verify_digest + nettle_rsa_md5_sign_digest_tr + nettle_rsa_md5_sign_tr + nettle_rsa_md5_sign + nettle_rsa_md5_sign_digest + nettle_rsa_pkcs1_verify + nettle_rsa_pkcs1_sign_tr + nettle_rsa_pkcs1_sign + _nettle_rsa_sec_compute_root + _nettle_rsa_sec_compute_root_itch + _nettle_rsa_verify + _nettle_rsa_verify_recover + _nettle_rsa_sec_compute_root_tr + nettle_rsa_compute_root_tr + nettle_rsa_compute_root + nettle_rsa_private_key_clear + nettle_rsa_private_key_init + nettle_rsa_private_key_prepare + _nettle_rsa_check_size + nettle_rsa_public_key_clear + nettle_rsa_public_key_init + nettle_rsa_public_key_prepare + nettle_pss_mgf1 + nettle_pss_encode_mgf1 + nettle_pss_verify_mgf1 + nettle_pkcs1_rsa_sha512_encode + nettle_pkcs1_rsa_sha512_encode_digest + nettle_pkcs1_rsa_sha256_encode + nettle_pkcs1_rsa_sha256_encode_digest + nettle_pkcs1_rsa_sha1_encode + nettle_pkcs1_rsa_sha1_encode_digest + nettle_pkcs1_rsa_md5_encode + nettle_pkcs1_rsa_md5_encode_digest + nettle_pkcs1_rsa_digest_encode + _nettle_pkcs1_sec_decrypt + _nettle_pkcs1_sec_decrypt_variable + nettle_pkcs1_decrypt + nettle_pkcs1_encrypt + _nettle_pkcs1_signature_prefix + nettle_mpz_set_sexp + _nettle_generate_pocklington_prime + nettle_random_prime + nettle_mpz_random + nettle_mpz_random_size + nettle_mpz_get_str_256 + nettle_mpz_init_set_str_256_s + nettle_mpz_init_set_str_256_u + nettle_mpz_set_str_256_s + nettle_mpz_set_str_256_u + nettle_mpz_sizeinbase_256_s + nettle_mpz_sizeinbase_256_u + nettle_sexp_transport_format + nettle_sexp_transport_vformat + nettle_sexp_transport_iterator_first + nettle_sexp_format + nettle_sexp_vformat + nettle_sexp_iterator_assoc + nettle_sexp_iterator_check_type + nettle_sexp_iterator_check_types + nettle_sexp_iterator_enter_list + nettle_sexp_iterator_exit_list + nettle_sexp_iterator_first + nettle_sexp_iterator_get_uint32 + nettle_sexp_iterator_next + nettle_sexp_iterator_subexpr diff --git a/externals/vcpkg/ports/nettle/libname-windows.patch b/externals/vcpkg/ports/nettle/libname-windows.patch new file mode 100755 index 000000000..6a4e38cf4 --- /dev/null +++ b/externals/vcpkg/ports/nettle/libname-windows.patch @@ -0,0 +1,67 @@ +diff --git a/Makefile.in b/Makefile.in +index b65ff4960..3887d0c8f 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -27,7 +27,7 @@ PRE_CPPFLAGS = -I. + EXTRA_CFLAGS = $(CCPIC) + + # FIXME: Add configuration of LIBEXT? +-LIBTARGETS = @IF_STATIC@ libnettle.a @IF_HOGWEED@ libhogweed.a ++LIBTARGETS = @IF_STATIC@ $(LIBNETTLE_FILE) @IF_HOGWEED@ $(LIBHOGWEED_FILE) + SHLIBTARGETS = @IF_SHARED@ $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK) + + getopt_SOURCES = getopt.c getopt1.c +@@ -277,13 +277,13 @@ nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJEXT)) \ + hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) \ + $(OPT_HOGWEED_OBJS) @IF_MINI_GMP@ mini-gmp.$(OBJEXT) + +-libnettle.a: $(nettle_OBJS) ++$(LIBNETTLE_FILE): $(nettle_OBJS) + -rm -f $@ + $(AR) $(ARFLAGS) $@ $(nettle_OBJS) + $(RANLIB) $@ + echo nettle > libnettle.stamp + +-libhogweed.a: $(hogweed_OBJS) ++$(LIBHOGWEED_FILE): $(hogweed_OBJS) + -rm -f $@ + $(AR) $(ARFLAGS) $@ $(hogweed_OBJS) + $(RANLIB) $@ +diff --git a/configure.ac b/configure.ac +index e95f1c825..1d7ef36bb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -662,8 +665,8 @@ case "$host_os" in + # linking to the DLL, is installed into the lib dir. + case "$host_os" in + mingw32*) +- LIBNETTLE_FORLINK='libnettle-$(LIBNETTLE_MAJOR).dll' +- LIBHOGWEED_FORLINK='libhogweed-$(LIBHOGWEED_MAJOR).dll' ++ LIBNETTLE_FORLINK='nettle-$(LIBNETTLE_MAJOR).dll' ++ LIBHOGWEED_FORLINK='hogweed-$(LIBHOGWEED_MAJOR).dll' + ;; + cygwin*) + LIBNETTLE_FORLINK='cygnettle-$(LIBNETTLE_MAJOR).dll' +@@ -684,16 +687,16 @@ case "$host_os" in + W64_ABI=yes + fi + LIBNETTLE_SONAME='' +- LIBNETTLE_FILE='libnettle.dll.a' ++ LIBNETTLE_FILE='nettle.lib' + LIBNETTLE_FILE_SRC='$(LIBNETTLE_FILE)' +- LIBNETTLE_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,--out-implib=$(LIBNETTLE_FILE) -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--whole-archive' ++ LIBNETTLE_LINK='$(CC) $(CPPFLAGS) -Wl,$(LDFLAGS) -Wl,-DLL -Wl,-IMPLIB:$(LIBNETTLE_FILE) -Wl,-DEF:nettle.def' +- LIBNETTLE_LIBS='-Wl,--no-whole-archive $(LIBS)' ++ LIBNETTLE_LIBS='$(LIBS)' + + LIBHOGWEED_SONAME='' +- LIBHOGWEED_FILE='libhogweed.dll.a' ++ LIBHOGWEED_FILE='hogweed.lib' + LIBHOGWEED_FILE_SRC='$(LIBHOGWEED_FILE)' +- LIBHOGWEED_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,--out-implib=$(LIBHOGWEED_FILE) -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--whole-archive' ++ LIBHOGWEED_LINK='$(CC) $(CPPFLAGS) -Wl,$(LDFLAGS) -Wl,-DLL -Wl,-IMPLIB:$(LIBHOGWEED_FILE) -Wl,-DEF:hogweed.def' +- LIBHOGWEED_LIBS='-Wl,--no-whole-archive $(LIBS) libnettle.dll.a' ++ LIBHOGWEED_LIBS='$(LIBS) $(LIBNETTLE_FILE)' + IF_DLL='' + ;; + darwin*) diff --git a/externals/vcpkg/ports/nettle/nettle-x64.def b/externals/vcpkg/ports/nettle/nettle-x64.def new file mode 100755 index 000000000..e202f46fb --- /dev/null +++ b/externals/vcpkg/ports/nettle/nettle-x64.def @@ -0,0 +1,509 @@ +EXPORTS + _nettle_sha256_compress_sha_ni + _nettle_sha1_compress_sha_ni + _nettle_salsa20_2core + _nettle_memxor_sse2 + _nettle_aes_decrypt_aesni + _nettle_aes_encrypt_aesni + _nettle_cpuid + _nettle_gcm_hash8 + _nettle_aes_decrypt + _nettle_aes_encrypt + _nettle_sha256_compress + nettle_memxor + nettle_sha1_compress + nettle_xts_aes256_decrypt_message + nettle_xts_aes256_encrypt_message + nettle_xts_aes256_set_decrypt_key + nettle_xts_aes256_set_encrypt_key + nettle_xts_aes128_decrypt_message + nettle_xts_aes128_encrypt_message + nettle_xts_aes128_set_decrypt_key + nettle_xts_aes128_set_encrypt_key + nettle_xts_decrypt_message + nettle_xts_encrypt_message + nettle_yarrow_key_event_estimate + nettle_yarrow_key_event_init + nettle_yarrow256_fast_reseed + nettle_yarrow256_init + nettle_yarrow256_is_seeded + nettle_yarrow256_needed_sources + nettle_yarrow256_random + nettle_yarrow256_seed + nettle_yarrow256_slow_reseed + nettle_yarrow256_update + _nettle_write_le64 + _nettle_write_le32 + _nettle_write_be32 + nettle_version_major + nettle_version_minor + nettle_umac128_digest + nettle_umac128_set_key + nettle_umac128_set_nonce + nettle_umac128_update + nettle_umac96_digest + nettle_umac96_set_key + nettle_umac96_set_nonce + nettle_umac96_update + nettle_umac64_digest + nettle_umac64_set_key + nettle_umac64_set_nonce + nettle_umac64_update + nettle_umac32_digest + nettle_umac32_set_key + nettle_umac32_set_nonce + nettle_umac32_update + _nettle_umac_set_key + _nettle_umac_poly128 + _nettle_umac_poly64 + _nettle_umac_l3 + _nettle_umac_l3_init + _nettle_umac_l2 + _nettle_umac_l2_final + _nettle_umac_l2_init + _nettle_umac_nh_n + _nettle_umac_nh + nettle_twofish128 + nettle_twofish192 + nettle_twofish256 + nettle_twofish128_set_key + nettle_twofish192_set_key + nettle_twofish256_set_key + nettle_twofish_decrypt + nettle_twofish_encrypt + nettle_twofish_set_key + nettle_streebog256 + nettle_streebog512 + nettle_streebog256_digest + nettle_streebog256_init + nettle_streebog512_digest + nettle_streebog512_init + nettle_streebog512_update + nettle_serpent128 + nettle_serpent192 + nettle_serpent256 + nettle_serpent_decrypt + nettle_serpent_encrypt + nettle_serpent128_set_key + nettle_serpent192_set_key + nettle_serpent256_set_key + nettle_serpent_set_key + nettle_sha3_256_shake + nettle_sha3_512 + nettle_sha3_512_digest + nettle_sha3_512_init + nettle_sha3_512_update + nettle_sha3_384 + nettle_sha3_384_digest + nettle_sha3_384_init + nettle_sha3_384_update + nettle_sha3_256 + nettle_sha3_256_digest + nettle_sha3_256_init + nettle_sha3_256_update + nettle_sha3_224 + nettle_sha3_224_digest + nettle_sha3_224_init + nettle_sha3_224_update + nettle_sha3_permute + _nettle_sha3_pad + _nettle_sha3_update + nettle_sha512_256 + nettle_sha512_224 + nettle_sha512 + nettle_sha384 + _nettle_sha512_compress + nettle_sha384_digest + nettle_sha384_init + nettle_sha512_224_digest + nettle_sha512_224_init + nettle_sha512_256_digest + nettle_sha512_256_init + nettle_sha512_digest + nettle_sha512_init + nettle_sha512_update + nettle_sha256 + nettle_sha224 + _nettle_sha256_compress_x86_64 + nettle_sha224_digest + nettle_sha224_init + nettle_sha256_digest + nettle_sha256_init + nettle_sha256_update + nettle_sha1 + _nettle_sha1_compress_x86_64 + nettle_sha1_digest + nettle_sha1_init + nettle_sha1_update + nettle_salsa20_256_set_key + nettle_salsa20_128_set_key + nettle_salsa20_set_nonce + nettle_salsa20_set_key + nettle_salsa20r12_crypt + nettle_salsa20_crypt + _nettle_salsa20_crypt + _nettle_salsa20_core + nettle_ripemd160 + _nettle_ripemd160_compress + nettle_ripemd160_digest + nettle_ripemd160_init + nettle_ripemd160_update + nettle_realloc + nettle_xrealloc + _nettle_poly1305_block + _nettle_poly1305_digest + _nettle_poly1305_set_key + nettle_poly1305_aes_digest + nettle_poly1305_aes_set_key + nettle_poly1305_aes_set_nonce + nettle_poly1305_aes_update + nettle_pbkdf2_hmac_sha512 + nettle_pbkdf2_hmac_sha384 + nettle_pbkdf2_hmac_sha256 + nettle_pbkdf2_hmac_sha1 + nettle_pbkdf2_hmac_gosthash94cp + nettle_pbkdf2 + _nettle_macs + nettle_get_macs + _nettle_hashes + nettle_get_hashes + _nettle_ciphers + nettle_get_ciphers + _nettle_armors + nettle_get_armors + _nettle_aeads + nettle_get_aeads + nettle_lookup_hash + nettle_memxor3 + _nettle_memxor_x86_64 + nettle_memeql_sec + nettle_md5 + nettle_MD5Final + nettle_MD5Init + nettle_MD5Update + nettle_md5_compress + nettle_md5_digest + nettle_md5_init + nettle_md5_update + nettle_md4 + nettle_md4_digest + nettle_md4_init + nettle_md4_update + nettle_md2 + nettle_md2_digest + nettle_md2_init + nettle_md2_update + nettle_hkdf_expand + nettle_hkdf_extract + nettle_knuth_lfib_get + nettle_knuth_lfib_get_array + nettle_knuth_lfib_init + nettle_knuth_lfib_random + nettle_hmac_streebog256 + nettle_hmac_streebog512 + nettle_hmac_sha512 + nettle_hmac_sha384 + nettle_hmac_sha256 + nettle_hmac_sha224 + nettle_hmac_sha1 + nettle_hmac_ripemd160 + nettle_hmac_md5 + nettle_hmac_streebog256_digest + nettle_hmac_streebog256_set_key + nettle_hmac_streebog512_digest + nettle_hmac_streebog512_set_key + nettle_hmac_streebog512_update + nettle_hmac_sha512_digest + nettle_hmac_sha512_set_key + nettle_hmac_sha512_update + nettle_hmac_sha384_digest + nettle_hmac_sha384_set_key + nettle_hmac_sha256_digest + nettle_hmac_sha256_set_key + nettle_hmac_sha256_update + nettle_hmac_sha224_digest + nettle_hmac_sha224_set_key + nettle_hmac_sha1_digest + nettle_hmac_sha1_set_key + nettle_hmac_sha1_update + nettle_hmac_ripemd160_digest + nettle_hmac_ripemd160_set_key + nettle_hmac_ripemd160_update + nettle_hmac_md5_digest + nettle_hmac_md5_set_key + nettle_hmac_md5_update + nettle_hmac_gosthash94_digest + nettle_hmac_gosthash94_set_key + nettle_hmac_gosthash94_update + nettle_hmac_gosthash94cp_digest + nettle_hmac_gosthash94cp_set_key + nettle_hmac_gosthash94cp_update + nettle_hmac_digest + nettle_hmac_set_key + nettle_hmac_update + nettle_gosthash94 + nettle_gosthash94cp + nettle_gosthash94_digest + nettle_gosthash94_init + nettle_gosthash94_update + nettle_gosthash94cp_digest + nettle_gosthash94cp_update + _nettle_gost28147_encrypt_block + _nettle_gost28147_param_CryptoPro_3411 + _nettle_gost28147_param_test_3411 + nettle_cmac_des3 + nettle_cmac_aes256 + nettle_cmac_aes128 + nettle_cmac_des3_digest + nettle_cmac_des3_set_key + nettle_cmac_des3_update + nettle_cmac_aes256_digest + nettle_cmac_aes256_set_key + nettle_cmac_aes256_update + nettle_cmac_aes128_digest + nettle_cmac_aes128_set_key + nettle_cmac_aes128_update + nettle_cmac64_digest + nettle_cmac64_init + nettle_cmac64_set_key + nettle_cmac64_update + nettle_cmac128_digest + nettle_cmac128_init + nettle_cmac128_set_key + nettle_cmac128_update + nettle_gcm_camellia256 + nettle_gcm_camellia256_decrypt + nettle_gcm_camellia256_digest + nettle_gcm_camellia256_encrypt + nettle_gcm_camellia256_set_iv + nettle_gcm_camellia256_set_key + nettle_gcm_camellia256_update + nettle_gcm_camellia128 + nettle_gcm_camellia128_decrypt + nettle_gcm_camellia128_digest + nettle_gcm_camellia128_encrypt + nettle_gcm_camellia128_set_iv + nettle_gcm_camellia128_set_key + nettle_gcm_camellia128_update + nettle_gcm_aes256 + nettle_gcm_aes256_decrypt + nettle_gcm_aes256_digest + nettle_gcm_aes256_encrypt + nettle_gcm_aes256_set_iv + nettle_gcm_aes256_set_key + nettle_gcm_aes256_update + nettle_gcm_aes192 + nettle_gcm_aes192_decrypt + nettle_gcm_aes192_digest + nettle_gcm_aes192_encrypt + nettle_gcm_aes192_set_iv + nettle_gcm_aes192_set_key + nettle_gcm_aes192_update + nettle_gcm_aes128 + nettle_gcm_aes128_decrypt + nettle_gcm_aes128_digest + nettle_gcm_aes128_encrypt + nettle_gcm_aes128_set_iv + nettle_gcm_aes128_set_key + nettle_gcm_aes128_update + nettle_gcm_aes_decrypt + nettle_gcm_aes_digest + nettle_gcm_aes_encrypt + nettle_gcm_aes_set_iv + nettle_gcm_aes_set_key + nettle_gcm_aes_update + nettle_gcm_decrypt + nettle_gcm_digest + nettle_gcm_encrypt + nettle_gcm_set_iv + nettle_gcm_set_key + nettle_gcm_update + nettle_eax_aes128 + nettle_eax_aes128_decrypt + nettle_eax_aes128_digest + nettle_eax_aes128_encrypt + nettle_eax_aes128_set_key + nettle_eax_aes128_set_nonce + nettle_eax_aes128_update + nettle_eax_decrypt + nettle_eax_digest + nettle_eax_encrypt + nettle_eax_set_key + nettle_eax_set_nonce + nettle_eax_update + nettle_des3_decrypt + nettle_des3_encrypt + nettle_des3_set_key + nettle_des_check_parity + nettle_des_decrypt + nettle_des_encrypt + nettle_des_fix_parity + nettle_des_set_key + _nettle_ctr_crypt16 + nettle_ctr_crypt + nettle_chacha_set_counter + nettle_chacha_set_counter32 + nettle_chacha_set_nonce + nettle_chacha_set_nonce96 + nettle_chacha_set_key + nettle_chacha_poly1305 + nettle_chacha_poly1305_decrypt + nettle_chacha_poly1305_digest + nettle_chacha_poly1305_encrypt + nettle_chacha_poly1305_set_key + nettle_chacha_poly1305_set_nonce + nettle_chacha_poly1305_update + _nettle_chacha_core + nettle_chacha_crypt + nettle_chacha_crypt32 + nettle_cnd_memcpy + nettle_siv_cmac_aes256_decrypt_message + nettle_siv_cmac_aes256_encrypt_message + nettle_siv_cmac_aes256_set_key + nettle_siv_cmac_aes128_decrypt_message + nettle_siv_cmac_aes128_encrypt_message + nettle_siv_cmac_aes128_set_key + nettle_siv_cmac_decrypt_message + nettle_siv_cmac_encrypt_message + nettle_siv_cmac_set_key + nettle_cfb8_decrypt + nettle_cfb8_encrypt + nettle_cfb_decrypt + nettle_cfb_encrypt + nettle_ccm_aes256_decrypt + nettle_ccm_aes256_decrypt_message + nettle_ccm_aes256_digest + nettle_ccm_aes256_encrypt + nettle_ccm_aes256_encrypt_message + nettle_ccm_aes256_set_key + nettle_ccm_aes256_set_nonce + nettle_ccm_aes256_update + nettle_ccm_aes192_decrypt + nettle_ccm_aes192_decrypt_message + nettle_ccm_aes192_digest + nettle_ccm_aes192_encrypt + nettle_ccm_aes192_encrypt_message + nettle_ccm_aes192_set_key + nettle_ccm_aes192_set_nonce + nettle_ccm_aes192_update + nettle_ccm_aes128_decrypt + nettle_ccm_aes128_decrypt_message + nettle_ccm_aes128_digest + nettle_ccm_aes128_encrypt + nettle_ccm_aes128_encrypt_message + nettle_ccm_aes128_set_key + nettle_ccm_aes128_set_nonce + nettle_ccm_aes128_update + nettle_ccm_decrypt + nettle_ccm_decrypt_message + nettle_ccm_digest + nettle_ccm_encrypt + nettle_ccm_encrypt_message + nettle_ccm_set_nonce + nettle_ccm_update + nettle_cbc_decrypt + nettle_cbc_encrypt + nettle_cast128 + nettle_cast128_decrypt + nettle_cast128_encrypt + nettle_cast128_set_key + nettle_cast5_set_key + nettle_camellia256 + nettle_camellia192_set_decrypt_key + nettle_camellia256_invert_key + nettle_camellia256_set_decrypt_key + nettle_camellia256_crypt + nettle_camellia192_set_encrypt_key + nettle_camellia256_set_encrypt_key + nettle_camellia192 + nettle_camellia128 + nettle_camellia128_invert_key + nettle_camellia_set_decrypt_key + nettle_camellia128_crypt + nettle_camellia128_set_encrypt_key + _nettle_camellia_invert_key + _nettle_camellia_absorb + _nettle_camellia_table + _nettle_camellia_crypt + nettle_buffer_init + nettle_buffer_clear + nettle_buffer_copy + nettle_buffer_grow + nettle_buffer_init_realloc + nettle_buffer_init_size + nettle_buffer_reset + nettle_buffer_space + nettle_buffer_write + nettle_base64url + nettle_base64url_decode_init + nettle_base64url_encode_init + nettle_base64 + nettle_base64_decode_final + nettle_base64_decode_init + nettle_base64_decode_single + nettle_base64_decode_update + nettle_base64_encode_final + nettle_base64_encode_group + nettle_base64_encode_init + nettle_base64_encode_raw + nettle_base64_encode_single + nettle_base64_encode_update + nettle_base16 + nettle_base16_decode_final + nettle_base16_decode_init + nettle_base16_decode_single + nettle_base16_decode_update + nettle_base16_encode_single + nettle_base16_encode_update + nettle_blowfish_bcrypt_hash + nettle_blowfish_bcrypt_verify + _nettle_blowfish_encround + _nettle_blowfish_initial_ctx + nettle_blowfish128_set_key + nettle_blowfish_decrypt + nettle_blowfish_encrypt + nettle_blowfish_set_key + nettle_arctwo128 + nettle_arctwo40 + nettle_arctwo64 + nettle_arctwo_gutmann128 + nettle_arctwo128_set_key + nettle_arctwo128_set_key_gutmann + nettle_arctwo40_set_key + nettle_arctwo64_set_key + nettle_arctwo_decrypt + nettle_arctwo_encrypt + nettle_arctwo_set_key + nettle_arctwo_set_key_ekb + nettle_arctwo_set_key_gutmann + nettle_arcfour_crypt + nettle_arcfour128_set_key + nettle_arcfour_set_key + nettle_aes256 + nettle_aes256_invert_key + nettle_aes256_set_decrypt_key + nettle_aes256_set_encrypt_key + nettle_aes192 + nettle_aes192_invert_key + nettle_aes192_set_decrypt_key + nettle_aes192_set_encrypt_key + nettle_aes128 + nettle_aes128_invert_key + nettle_aes128_set_decrypt_key + nettle_aes128_set_encrypt_key + nettle_aes_invert_key + nettle_aes_set_decrypt_key + nettle_aes_set_encrypt_key + _nettle_aes_set_key + _nettle_aes_invert + _nettle_aes_encrypt_table + nettle_aes128_encrypt + nettle_aes192_encrypt + nettle_aes256_encrypt + nettle_aes_encrypt + _nettle_aes_encrypt_x86_64 + nettle_aes128_decrypt + nettle_aes192_decrypt + nettle_aes256_decrypt + nettle_aes_decrypt + _nettle_aes_decrypt_x86_64 diff --git a/externals/vcpkg/ports/nettle/nettle-x86.def b/externals/vcpkg/ports/nettle/nettle-x86.def new file mode 100755 index 000000000..213449531 --- /dev/null +++ b/externals/vcpkg/ports/nettle/nettle-x86.def @@ -0,0 +1,496 @@ +EXPORTS + nettle_xts_aes256_decrypt_message + nettle_xts_aes256_encrypt_message + nettle_xts_aes256_set_decrypt_key + nettle_xts_aes256_set_encrypt_key + nettle_xts_aes128_decrypt_message + nettle_xts_aes128_encrypt_message + nettle_xts_aes128_set_decrypt_key + nettle_xts_aes128_set_encrypt_key + nettle_xts_decrypt_message + nettle_xts_encrypt_message + nettle_yarrow_key_event_estimate + nettle_yarrow_key_event_init + nettle_yarrow256_fast_reseed + nettle_yarrow256_init + nettle_yarrow256_is_seeded + nettle_yarrow256_needed_sources + nettle_yarrow256_random + nettle_yarrow256_seed + nettle_yarrow256_slow_reseed + nettle_yarrow256_update + _nettle_write_le64 + _nettle_write_le32 + _nettle_write_be32 + nettle_version_major + nettle_version_minor + nettle_umac128_digest + nettle_umac128_set_key + nettle_umac128_set_nonce + nettle_umac128_update + nettle_umac96_digest + nettle_umac96_set_key + nettle_umac96_set_nonce + nettle_umac96_update + nettle_umac64_digest + nettle_umac64_set_key + nettle_umac64_set_nonce + nettle_umac64_update + nettle_umac32_digest + nettle_umac32_set_key + nettle_umac32_set_nonce + nettle_umac32_update + _nettle_umac_set_key + _nettle_umac_poly128 + _nettle_umac_poly64 + _nettle_umac_l3 + _nettle_umac_l3_init + _nettle_umac_l2 + _nettle_umac_l2_final + _nettle_umac_l2_init + _nettle_umac_nh_n + _nettle_umac_nh + nettle_twofish128 + nettle_twofish192 + nettle_twofish256 + nettle_twofish128_set_key + nettle_twofish192_set_key + nettle_twofish256_set_key + nettle_twofish_decrypt + nettle_twofish_encrypt + nettle_twofish_set_key + nettle_streebog256 + nettle_streebog512 + nettle_streebog256_digest + nettle_streebog256_init + nettle_streebog512_digest + nettle_streebog512_init + nettle_streebog512_update + nettle_serpent128 + nettle_serpent192 + nettle_serpent256 + nettle_serpent_decrypt + nettle_serpent_encrypt + nettle_serpent128_set_key + nettle_serpent192_set_key + nettle_serpent256_set_key + nettle_serpent_set_key + nettle_sha3_256_shake + nettle_sha3_512 + nettle_sha3_512_digest + nettle_sha3_512_init + nettle_sha3_512_update + nettle_sha3_384 + nettle_sha3_384_digest + nettle_sha3_384_init + nettle_sha3_384_update + nettle_sha3_256 + nettle_sha3_256_digest + nettle_sha3_256_init + nettle_sha3_256_update + nettle_sha3_224 + nettle_sha3_224_digest + nettle_sha3_224_init + nettle_sha3_224_update + nettle_sha3_permute + _nettle_sha3_pad + _nettle_sha3_update + nettle_sha512_256 + nettle_sha512_224 + nettle_sha512 + nettle_sha384 + _nettle_sha512_compress + nettle_sha384_digest + nettle_sha384_init + nettle_sha512_224_digest + nettle_sha512_224_init + nettle_sha512_256_digest + nettle_sha512_256_init + nettle_sha512_digest + nettle_sha512_init + nettle_sha512_update + nettle_sha256 + nettle_sha224 + _nettle_sha256_compress + nettle_sha224_digest + nettle_sha224_init + nettle_sha256_digest + nettle_sha256_init + nettle_sha256_update + nettle_sha1 + nettle_sha1_compress + nettle_sha1_digest + nettle_sha1_init + nettle_sha1_update + nettle_salsa20_256_set_key + nettle_salsa20_128_set_key + nettle_salsa20_set_nonce + nettle_salsa20_set_key + nettle_salsa20r12_crypt + nettle_salsa20_crypt + _nettle_salsa20_crypt + _nettle_salsa20_core + nettle_ripemd160 + _nettle_ripemd160_compress + nettle_ripemd160_digest + nettle_ripemd160_init + nettle_ripemd160_update + nettle_realloc + nettle_xrealloc + _nettle_poly1305_block + _nettle_poly1305_digest + _nettle_poly1305_set_key + nettle_poly1305_aes_digest + nettle_poly1305_aes_set_key + nettle_poly1305_aes_set_nonce + nettle_poly1305_aes_update + nettle_pbkdf2_hmac_sha512 + nettle_pbkdf2_hmac_sha384 + nettle_pbkdf2_hmac_sha256 + nettle_pbkdf2_hmac_sha1 + nettle_pbkdf2_hmac_gosthash94cp + nettle_pbkdf2 + _nettle_macs + nettle_get_macs + _nettle_hashes + nettle_get_hashes + _nettle_ciphers + nettle_get_ciphers + _nettle_armors + nettle_get_armors + _nettle_aeads + nettle_get_aeads + nettle_lookup_hash + nettle_memxor3 + nettle_memxor + nettle_memeql_sec + nettle_md5 + nettle_MD5Final + nettle_MD5Init + nettle_MD5Update + nettle_md5_compress + nettle_md5_digest + nettle_md5_init + nettle_md5_update + nettle_md4 + nettle_md4_digest + nettle_md4_init + nettle_md4_update + nettle_md2 + nettle_md2_digest + nettle_md2_init + nettle_md2_update + nettle_hkdf_expand + nettle_hkdf_extract + nettle_knuth_lfib_get + nettle_knuth_lfib_get_array + nettle_knuth_lfib_init + nettle_knuth_lfib_random + nettle_hmac_streebog256 + nettle_hmac_streebog512 + nettle_hmac_sha512 + nettle_hmac_sha384 + nettle_hmac_sha256 + nettle_hmac_sha224 + nettle_hmac_sha1 + nettle_hmac_ripemd160 + nettle_hmac_md5 + nettle_hmac_streebog256_digest + nettle_hmac_streebog256_set_key + nettle_hmac_streebog512_digest + nettle_hmac_streebog512_set_key + nettle_hmac_streebog512_update + nettle_hmac_sha512_digest + nettle_hmac_sha512_set_key + nettle_hmac_sha512_update + nettle_hmac_sha384_digest + nettle_hmac_sha384_set_key + nettle_hmac_sha256_digest + nettle_hmac_sha256_set_key + nettle_hmac_sha256_update + nettle_hmac_sha224_digest + nettle_hmac_sha224_set_key + nettle_hmac_sha1_digest + nettle_hmac_sha1_set_key + nettle_hmac_sha1_update + nettle_hmac_ripemd160_digest + nettle_hmac_ripemd160_set_key + nettle_hmac_ripemd160_update + nettle_hmac_md5_digest + nettle_hmac_md5_set_key + nettle_hmac_md5_update + nettle_hmac_gosthash94_digest + nettle_hmac_gosthash94_set_key + nettle_hmac_gosthash94_update + nettle_hmac_gosthash94cp_digest + nettle_hmac_gosthash94cp_set_key + nettle_hmac_gosthash94cp_update + nettle_hmac_digest + nettle_hmac_set_key + nettle_hmac_update + nettle_gosthash94 + nettle_gosthash94cp + nettle_gosthash94_digest + nettle_gosthash94_init + nettle_gosthash94_update + nettle_gosthash94cp_digest + nettle_gosthash94cp_update + _nettle_gost28147_encrypt_block + _nettle_gost28147_param_CryptoPro_3411 + _nettle_gost28147_param_test_3411 + nettle_cmac_des3 + nettle_cmac_aes256 + nettle_cmac_aes128 + nettle_cmac_des3_digest + nettle_cmac_des3_set_key + nettle_cmac_des3_update + nettle_cmac_aes256_digest + nettle_cmac_aes256_set_key + nettle_cmac_aes256_update + nettle_cmac_aes128_digest + nettle_cmac_aes128_set_key + nettle_cmac_aes128_update + nettle_cmac64_digest + nettle_cmac64_init + nettle_cmac64_set_key + nettle_cmac64_update + nettle_cmac128_digest + nettle_cmac128_init + nettle_cmac128_set_key + nettle_cmac128_update + nettle_gcm_camellia256 + nettle_gcm_camellia256_decrypt + nettle_gcm_camellia256_digest + nettle_gcm_camellia256_encrypt + nettle_gcm_camellia256_set_iv + nettle_gcm_camellia256_set_key + nettle_gcm_camellia256_update + nettle_gcm_camellia128 + nettle_gcm_camellia128_decrypt + nettle_gcm_camellia128_digest + nettle_gcm_camellia128_encrypt + nettle_gcm_camellia128_set_iv + nettle_gcm_camellia128_set_key + nettle_gcm_camellia128_update + nettle_gcm_aes256 + nettle_gcm_aes256_decrypt + nettle_gcm_aes256_digest + nettle_gcm_aes256_encrypt + nettle_gcm_aes256_set_iv + nettle_gcm_aes256_set_key + nettle_gcm_aes256_update + nettle_gcm_aes192 + nettle_gcm_aes192_decrypt + nettle_gcm_aes192_digest + nettle_gcm_aes192_encrypt + nettle_gcm_aes192_set_iv + nettle_gcm_aes192_set_key + nettle_gcm_aes192_update + nettle_gcm_aes128 + nettle_gcm_aes128_decrypt + nettle_gcm_aes128_digest + nettle_gcm_aes128_encrypt + nettle_gcm_aes128_set_iv + nettle_gcm_aes128_set_key + nettle_gcm_aes128_update + nettle_gcm_aes_decrypt + nettle_gcm_aes_digest + nettle_gcm_aes_encrypt + nettle_gcm_aes_set_iv + nettle_gcm_aes_set_key + nettle_gcm_aes_update + nettle_gcm_decrypt + nettle_gcm_digest + nettle_gcm_encrypt + nettle_gcm_set_iv + nettle_gcm_set_key + nettle_gcm_update + nettle_eax_aes128 + nettle_eax_aes128_decrypt + nettle_eax_aes128_digest + nettle_eax_aes128_encrypt + nettle_eax_aes128_set_key + nettle_eax_aes128_set_nonce + nettle_eax_aes128_update + nettle_eax_decrypt + nettle_eax_digest + nettle_eax_encrypt + nettle_eax_set_key + nettle_eax_set_nonce + nettle_eax_update + nettle_des3_decrypt + nettle_des3_encrypt + nettle_des3_set_key + nettle_des_check_parity + nettle_des_decrypt + nettle_des_encrypt + nettle_des_fix_parity + nettle_des_set_key + _nettle_ctr_crypt16 + nettle_ctr_crypt + nettle_chacha_set_counter + nettle_chacha_set_counter32 + nettle_chacha_set_nonce + nettle_chacha_set_nonce96 + nettle_chacha_set_key + nettle_chacha_poly1305 + nettle_chacha_poly1305_decrypt + nettle_chacha_poly1305_digest + nettle_chacha_poly1305_encrypt + nettle_chacha_poly1305_set_key + nettle_chacha_poly1305_set_nonce + nettle_chacha_poly1305_update + _nettle_chacha_core + nettle_chacha_crypt + nettle_chacha_crypt32 + nettle_cnd_memcpy + nettle_siv_cmac_aes256_decrypt_message + nettle_siv_cmac_aes256_encrypt_message + nettle_siv_cmac_aes256_set_key + nettle_siv_cmac_aes128_decrypt_message + nettle_siv_cmac_aes128_encrypt_message + nettle_siv_cmac_aes128_set_key + nettle_siv_cmac_decrypt_message + nettle_siv_cmac_encrypt_message + nettle_siv_cmac_set_key + nettle_cfb8_decrypt + nettle_cfb8_encrypt + nettle_cfb_decrypt + nettle_cfb_encrypt + nettle_ccm_aes256_decrypt + nettle_ccm_aes256_decrypt_message + nettle_ccm_aes256_digest + nettle_ccm_aes256_encrypt + nettle_ccm_aes256_encrypt_message + nettle_ccm_aes256_set_key + nettle_ccm_aes256_set_nonce + nettle_ccm_aes256_update + nettle_ccm_aes192_decrypt + nettle_ccm_aes192_decrypt_message + nettle_ccm_aes192_digest + nettle_ccm_aes192_encrypt + nettle_ccm_aes192_encrypt_message + nettle_ccm_aes192_set_key + nettle_ccm_aes192_set_nonce + nettle_ccm_aes192_update + nettle_ccm_aes128_decrypt + nettle_ccm_aes128_decrypt_message + nettle_ccm_aes128_digest + nettle_ccm_aes128_encrypt + nettle_ccm_aes128_encrypt_message + nettle_ccm_aes128_set_key + nettle_ccm_aes128_set_nonce + nettle_ccm_aes128_update + nettle_ccm_decrypt + nettle_ccm_decrypt_message + nettle_ccm_digest + nettle_ccm_encrypt + nettle_ccm_encrypt_message + nettle_ccm_set_nonce + nettle_ccm_update + nettle_cbc_decrypt + nettle_cbc_encrypt + nettle_cast128 + nettle_cast128_decrypt + nettle_cast128_encrypt + nettle_cast128_set_key + nettle_cast5_set_key + nettle_camellia256 + nettle_camellia192_set_decrypt_key + nettle_camellia256_invert_key + nettle_camellia256_set_decrypt_key + nettle_camellia256_crypt + nettle_camellia192_set_encrypt_key + nettle_camellia256_set_encrypt_key + nettle_camellia192 + nettle_camellia128 + nettle_camellia128_invert_key + nettle_camellia_set_decrypt_key + nettle_camellia128_crypt + nettle_camellia128_set_encrypt_key + _nettle_camellia_invert_key + _nettle_camellia_absorb + _nettle_camellia_table + _nettle_camellia_crypt + nettle_buffer_init + nettle_buffer_clear + nettle_buffer_copy + nettle_buffer_grow + nettle_buffer_init_realloc + nettle_buffer_init_size + nettle_buffer_reset + nettle_buffer_space + nettle_buffer_write + nettle_base64url + nettle_base64url_decode_init + nettle_base64url_encode_init + nettle_base64 + nettle_base64_decode_final + nettle_base64_decode_init + nettle_base64_decode_single + nettle_base64_decode_update + nettle_base64_encode_final + nettle_base64_encode_group + nettle_base64_encode_init + nettle_base64_encode_raw + nettle_base64_encode_single + nettle_base64_encode_update + nettle_base16 + nettle_base16_decode_final + nettle_base16_decode_init + nettle_base16_decode_single + nettle_base16_decode_update + nettle_base16_encode_single + nettle_base16_encode_update + nettle_blowfish_bcrypt_hash + nettle_blowfish_bcrypt_verify + _nettle_blowfish_encround + _nettle_blowfish_initial_ctx + nettle_blowfish128_set_key + nettle_blowfish_decrypt + nettle_blowfish_encrypt + nettle_blowfish_set_key + nettle_arctwo128 + nettle_arctwo40 + nettle_arctwo64 + nettle_arctwo_gutmann128 + nettle_arctwo128_set_key + nettle_arctwo128_set_key_gutmann + nettle_arctwo40_set_key + nettle_arctwo64_set_key + nettle_arctwo_decrypt + nettle_arctwo_encrypt + nettle_arctwo_set_key + nettle_arctwo_set_key_ekb + nettle_arctwo_set_key_gutmann + nettle_arcfour_crypt + nettle_arcfour128_set_key + nettle_arcfour_set_key + nettle_aes256 + nettle_aes256_invert_key + nettle_aes256_set_decrypt_key + nettle_aes256_set_encrypt_key + nettle_aes192 + nettle_aes192_invert_key + nettle_aes192_set_decrypt_key + nettle_aes192_set_encrypt_key + nettle_aes128 + nettle_aes128_invert_key + nettle_aes128_set_decrypt_key + nettle_aes128_set_encrypt_key + nettle_aes_invert_key + nettle_aes_set_decrypt_key + nettle_aes_set_encrypt_key + _nettle_aes_set_key + _nettle_aes_invert + _nettle_aes_encrypt_table + nettle_aes128_encrypt + nettle_aes192_encrypt + nettle_aes256_encrypt + nettle_aes_encrypt + _nettle_aes_encrypt + nettle_aes128_decrypt + nettle_aes192_decrypt + nettle_aes256_decrypt + nettle_aes_decrypt + _nettle_aes_decrypt diff --git a/externals/vcpkg/ports/nettle/portfile.cmake b/externals/vcpkg/ports/nettle/portfile.cmake new file mode 100755 index 000000000..329cbddc1 --- /dev/null +++ b/externals/vcpkg/ports/nettle/portfile.cmake @@ -0,0 +1,116 @@ +vcpkg_list(SET patches) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_list(SET patches + yasm.patch # the asm changes are a downgrade to an older version + compile.patch + libname-windows.patch # Apply common libtool rules for lib naming. + ) +endif() + +vcpkg_from_gitlab( + GITLAB_URL https://git.lysator.liu.se/ + OUT_SOURCE_PATH SOURCE_PATH + REPO nettle/nettle + REF 52bacacaf4339fd78289f58919732f1f35bea1c1 #v3.7.3 + SHA512 0130d14195274eeec11e8299793e3037f4b84d8fb4b5c5c9392b63ee693ed5713434070744b1a44e14a6a5090d655917c1dd296e2011cd99e3c316ef5d8ee395 + HEAD_REF master + PATCHES + fix-InstallLibPath.patch + flags.patch + ${patches} +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_list(SET OPTIONS --disable-static) +else() + vcpkg_list(SET OPTIONS --disable-shared) +endif() + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(ENV{CCAS} "${CURRENT_HOST_INSTALLED_DIR}/tools/yasm/yasm${VCPKG_HOST_EXECUTABLE_SUFFIX}") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(asmflag win64) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(asmflag win32) + endif() + set(ENV{ASMFLAGS} "-Xvc -f ${asmflag} -pgas -rraw") + vcpkg_list(APPEND OPTIONS + ac_cv_func_memset=yes + nettle_cv_asm_type_percent_function=no + nettle_cv_asm_align_log=no + ) +endif() + +if(VCPKG_CROSSCOMPILING) + # Silly trick to make configure accept CC_FOR_BUILD but in reallity CC_FOR_BUILD is deactivated. + set(ENV{CC_FOR_BUILD} "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") +endif() + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + OPTIONS + --disable-documentation + --disable-openssl + ${OPTIONS} +) + +set(tool_names des ecc) # aes gcm sha twofish? +list(TRANSFORM tool_names APPEND "data") +list(TRANSFORM tool_names APPEND "${VCPKG_HOST_EXECUTABLE_SUFFIX}") + +if(VCPKG_CROSSCOMPILING) + list(TRANSFORM tool_names PREPEND "${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}/") + file(COPY ${tool_names} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/") + if(NOT VCPKG_BUILD_TYPE) + file(COPY ${tool_names} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/") + endif() +endif() +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + # def files are created by running 'llvm-nm | findstr /R /C:"[RT] _*nettle_"' on the static build and replacing '00[0-9abcdef]+ [RT]' with spaces + # please update the defs if the version is bumped + set(build_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/") + configure_file( + "${CURRENT_PORT_DIR}/nettle-${VCPKG_TARGET_ARCHITECTURE}.def" + "${build_dir}/nettle.def" + COPYONLY + ) + configure_file( + "${CURRENT_PORT_DIR}/hogweed-${VCPKG_TARGET_ARCHITECTURE}.def" + "${build_dir}/hogweed.def" + COPYONLY + ) + if(NOT VCPKG_BUILD_TYPE) + set(build_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/") + configure_file( + "${CURRENT_PORT_DIR}/nettle-${VCPKG_TARGET_ARCHITECTURE}.def" + "${build_dir}/nettle.def" + COPYONLY + ) + configure_file("${CURRENT_PORT_DIR}/hogweed-${VCPKG_TARGET_ARCHITECTURE}.def" + "${build_dir}/hogweed.def" + COPYONLY + ) + endif() + endif() +endif() +vcpkg_install_make() + +if(NOT VCPKG_CROSSCOMPILING) + list(TRANSFORM tool_names PREPEND "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/") + file(COPY ${tool_names} DESTINATION "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}") +endif() + +vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/COPYINGv3" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_IS_LINUX) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() diff --git a/externals/vcpkg/ports/nettle/remove_gmpd.patch b/externals/vcpkg/ports/nettle/remove_gmpd.patch new file mode 100755 index 000000000..a248d81e2 --- /dev/null +++ b/externals/vcpkg/ports/nettle/remove_gmpd.patch @@ -0,0 +1,44 @@ +diff --git a/SMP/libnettle.vcxproj b/SMP/libnettle.vcxproj +index 51fa24113..5d418b53e 100644 +--- a/SMP/libnettle.vcxproj ++++ b/SMP/libnettle.vcxproj +@@ -245,7 +245,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libnettle.def +- gmpd.lib;%(AdditionalDependencies) ++ gmp.lib;%(AdditionalDependencies) + + + mkdir "$(OutDir)"\include +@@ -359,7 +359,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libnettle.def +- gmpd.lib;%(AdditionalDependencies) ++ gmp.lib;%(AdditionalDependencies) + + + mkdir "$(OutDir)"\include +diff --git a/SMP/libhogweed.vcxproj b/SMP/libhogweed.vcxproj +index 8f2f433bc..dae3458d8 100644 +--- a/SMP/libhogweed.vcxproj ++++ b/SMP/libhogweed.vcxproj +@@ -247,7 +247,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libhogweed.def +- nettled.lib;gmpd.lib;%(AdditionalDependencies) ++ nettled.lib;gmp.lib;%(AdditionalDependencies) + /IGNORE:4006,4221,4078 %(AdditionalOptions) + + +@@ -362,7 +362,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libhogweed.def +- nettled.lib;gmpd.lib;%(AdditionalDependencies) ++ nettled.lib;gmp.lib;%(AdditionalDependencies) + /IGNORE:4006,4221,4078 %(AdditionalOptions) + + diff --git a/externals/vcpkg/ports/nettle/vcpkg.json b/externals/vcpkg/ports/nettle/vcpkg.json new file mode 100755 index 000000000..e9f7830bd --- /dev/null +++ b/externals/vcpkg/ports/nettle/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "nettle", + "version": "3.7.3", + "description": "Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space.", + "homepage": "https://git.lysator.liu.se/nettle/nettle", + "license": null, + "dependencies": [ + "gmp", + { + "name": "nettle", + "host": true + }, + { + "name": "yasm", + "host": true, + "features": [ + "tools" + ], + "platform": "windows" + } + ] +} diff --git a/externals/vcpkg/ports/nettle/yasm.patch b/externals/vcpkg/ports/nettle/yasm.patch new file mode 100755 index 000000000..4fa449f32 --- /dev/null +++ b/externals/vcpkg/ports/nettle/yasm.patch @@ -0,0 +1,96 @@ +diff --git a/Makefile.in b/Makefile.in +index b65ff4960..3887d0c8f 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -291,7 +291,7 @@ libhogweed.a: $(hogweed_OBJS) + + %.$(OBJEXT): %.asm $(srcdir)/m4-utils.m4 $(srcdir)/asm.m4 config.m4 machine.m4 + $(M4) $(srcdir)/m4-utils.m4 $(srcdir)/asm.m4 config.m4 machine.m4 $< >$*.s +- $(COMPILE) -c $*.s ++ $(COMPILE_AS) -o $*.$(OBJEXT) $*.s + + %.$(OBJEXT): %.c + $(COMPILE) -c $< \ +diff --git a/config.make.in b/config.make.in +index f8e1f74ef..3ae593385 100644 +--- a/config.make.in ++++ b/config.make.in +@@ -73,6 +73,7 @@ TEST_SHLIB_DIR = ${abs_top_builddir}/.lib + # flags before CPPFLAGS and LDFLAGS. While EXTRA_CFLAGS are added at the end. + + COMPILE = $(CC) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(DEP_FLAGS) ++COMPILE_AS = $(CCAS) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(ASMFLAGS) $(DEP_FLAGS) + COMPILE_CXX = $(CXX) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(DEP_FLAGS) + LINK = $(CC) $(CFLAGS) $(PRE_LDFLAGS) $(LDFLAGS) + LINK_CXX = $(CXX) $(CXXFLAGS) $(PRE_LDFLAGS) $(LDFLAGS) +diff --git a/configure.ac b/configure.ac +index e95f1c825..1d7ef36bb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -118,6 +118,9 @@ LSH_RPATH_INIT([`echo $with_lib_path | sed 's/:/ /g'` \ + + # Checks for programs. + AC_PROG_CC ++# Copied from gmp ++test -n "$CCAS" || CCAS="$CC -c" ++AC_SUBST(CCAS) + + NETTLE_CHECK_IFUNC + +@@ -302,7 +305,7 @@ ABI=standard + case "$host_cpu" in + [x86_64 | amd64]) + AC_TRY_COMPILE([ +-#if defined(__x86_64__) || defined(__arch64__) ++#if defined(__x86_64__) || defined(__arch64__) || defined(_M_AMD64) + #error 64-bit x86 + #endif + ], [], [ +diff --git a/x86_64/aes.m4 b/x86_64/aes.m4 +index 3bec9eae2..85cafc046 100644 +--- a/x86_64/aes.m4 ++++ b/x86_64/aes.m4 +@@ -77,9 +77,9 @@ define(`AES_STORE', ` + dnl AES_ROUND(table,a,b,c,d,out,ptr) + dnl Computes one word of the AES round. Leaves result in $6. + define(`AES_ROUND', ` +- movzb LREG($2), $7 ++ movzbq LREG($2), $7 + movl AES_TABLE0 ($1, $7, 4),$6 +- movzb HREG($3), XREG($7) ++ movzbq HREG($3), XREG($7) + xorl AES_TABLE1 ($1, $7, 4),$6 + movl $4,XREG($7) + shr `$'16,$7 +@@ -94,7 +94,7 @@ dnl Computes one word of the final round. Leaves result in $6. Also + dnl performs the first substitution step, on the least significant + dnl byte, and rotates 8 bits. + define(`AES_FINAL_ROUND', ` +- movzb LREG($1),$7 ++ movzbq LREG($1),$7 + movzbl ($5, $7), $6 + movl $2,XREG($7) + andl `$'0x0000ff00,XREG($7) +@@ -113,18 +113,18 @@ dnl each of eax, ebx, ecx and edx, and also rotates + dnl the words one byte to the left. + dnl Uses that AES_SBOX == 0 + define(`AES_SUBST_BYTE', ` +- movzb LREG($1),$6 ++ movzbq LREG($1),$6 + movb ($5, $6),LREG($1) + roll `$'8,$1 + +- movzb LREG($2),$6 ++ movzbq LREG($2),$6 + movb ($5, $6),LREG($2) + roll `$'8,$2 + +- movzb LREG($3),$6 ++ movzbq LREG($3),$6 + movb ($5, $6),LREG($3) + roll `$'8,$3 + +- movzb LREG($4),$6 ++ movzbq LREG($4),$6 + movb ($5, $6),LREG($4) + roll `$'8,$4')dnl diff --git a/externals/vcpkg/ports/networkdirect-sdk/portfile.cmake b/externals/vcpkg/ports/networkdirect-sdk/portfile.cmake new file mode 100755 index 000000000..bd378607f --- /dev/null +++ b/externals/vcpkg/ports/networkdirect-sdk/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.nuget.org/api/v2/package/NetworkDirect/2.0.1" + FILENAME "networkDirect-2.0.1.zip" + SHA512 97e48ab293c164a80a3ed9e51f1f9f5ae85c07ee91c49950a76b486567d2e50346a2379b8284ffcb9d7d2fe70f76eff9455dce740cf9d3e0c1b83100e25168a8 +) + +vcpkg_download_distfile(LICENSE + URLS "https://raw.githubusercontent.com/microsoft/NetworkDirect/master/LICENSE.txt" + FILENAME "networkingDirect_license.txt" + SHA512 7d79aae4c9beb85811a3e122a2b12aad231f519dd12a461ac49d52864a735a6b05a263d433c11ede1406d2e49b6dc62dd38487eb7bd8c079d7198a20cf85fc4d +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL +) + +file(COPY ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR}/ ) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + file(COPY ${SOURCE_PATH}/lib/x64/ndutil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) + file(COPY ${SOURCE_PATH}/lib/x64/ndutil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + file(COPY ${SOURCE_PATH}/lib/Win32/ndutil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) + file(COPY ${SOURCE_PATH}/lib/Win32/ndutil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) +endif() + +file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/networkdirect-sdk/vcpkg.json b/externals/vcpkg/ports/networkdirect-sdk/vcpkg.json new file mode 100755 index 000000000..8313f8f60 --- /dev/null +++ b/externals/vcpkg/ports/networkdirect-sdk/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "networkdirect-sdk", + "version": "2.0.1", + "port-version": 3, + "description": "The Network Direct architecture allows hardware vendors to expose the advanced capabilities of their networking devices.", + "homepage": "https://www.nuget.org/packages/NetworkDirect", + "supports": "windows & (x64 | x86) & !uwp" +} diff --git a/externals/vcpkg/ports/nghttp2/portfile.cmake b/externals/vcpkg/ports/nghttp2/portfile.cmake new file mode 100755 index 000000000..ef14b80ad --- /dev/null +++ b/externals/vcpkg/ports/nghttp2/portfile.cmake @@ -0,0 +1,45 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nghttp2/nghttp2 + REF 7af0c508be9cbec407268e2f546f597d268c104e # v1.46.0 + SHA512 e25e8a43d0f9523f654d9136c2b9db30cfa5e8086da3fe3e9bcf68ff8c034383550ca17d89d31cd14e23b5886a0a948d777b4e182d0a042ccfe9a8083410de93 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" ENABLE_STATIC_CRT) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC_LIB) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED_LIB) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENABLE_LIB_ONLY=ON + -DENABLE_ASIO_LIB=OFF + "-DENABLE_STATIC_CRT=${ENABLE_STATIC_CRT}" + "-DENABLE_STATIC_LIB=${ENABLE_STATIC_LIB}" + "-DENABLE_SHARED_LIB=${ENABLE_SHARED_LIB}" +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share/man" + "${CURRENT_PACKAGES_DIR}/share/doc" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) + file(APPEND "${CURRENT_PACKAGES_DIR}/include/nghttp2/nghttp2ver.h" [[ +#ifndef NGHTTP2_STATICLIB +# define NGHTTP2_STATICLIB +#endif +]]) +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/nghttp2/vcpkg.json b/externals/vcpkg/ports/nghttp2/vcpkg.json new file mode 100755 index 000000000..9b5ce8969 --- /dev/null +++ b/externals/vcpkg/ports/nghttp2/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "nghttp2", + "version": "1.46.0", + "description": "Implementation of the Hypertext Transfer Protocol version 2 in C", + "homepage": "https://github.com/nghttp2/nghttp2", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ngspice/Fix-C2065.patch b/externals/vcpkg/ports/ngspice/Fix-C2065.patch new file mode 100755 index 000000000..527b2bf44 --- /dev/null +++ b/externals/vcpkg/ports/ngspice/Fix-C2065.patch @@ -0,0 +1,170 @@ +diff --git a/visualc/sharedspice.vcxproj b/visualc/sharedspice.vcxproj +index 51a5725..6f41ea1 100644 +--- a/visualc/sharedspice.vcxproj ++++ b/visualc/sharedspice.vcxproj +@@ -113,7 +113,7 @@ + + Disabled + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions) + false + false + false +@@ -157,7 +157,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions) + false + + MultiThreaded +@@ -199,7 +199,7 @@ + + Disabled + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions) + false + false + false +@@ -248,7 +248,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions) + false + + +@@ -292,7 +292,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions) + false + + MultiThreaded +@@ -337,7 +337,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions) + false + + +diff --git a/visualc/vngspice.vcxproj b/visualc/vngspice.vcxproj +index a9d916e..393a128 100644 +--- a/visualc/vngspice.vcxproj ++++ b/visualc/vngspice.vcxproj +@@ -212,7 +212,7 @@ + + Disabled + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions) + false + + +@@ -259,7 +259,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions) + false + + +@@ -310,7 +310,7 @@ + + Disabled + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONFIG64;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONFIG64;%(PreprocessorDefinitions) + false + + +@@ -361,7 +361,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONFIG64;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONFIG64;%(PreprocessorDefinitions) + false + + +@@ -411,7 +411,7 @@ + + Disabled + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONSOLE;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONSOLE;%(PreprocessorDefinitions) + false + + +@@ -458,7 +458,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;%(PreprocessorDefinitions) + false + + +@@ -508,7 +508,7 @@ + + Disabled + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONSOLE;CONFIG64;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONSOLE;CONFIG64;%(PreprocessorDefinitions) + false + + +@@ -559,7 +559,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;CONFIG64;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;CONFIG64;%(PreprocessorDefinitions) + false + + +@@ -610,7 +610,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions) + false + + +@@ -664,7 +664,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;CONFIG64;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;CONFIG64;%(PreprocessorDefinitions) + false + + +@@ -718,7 +718,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;USE_OMP;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;USE_OMP;%(PreprocessorDefinitions) + false + + +@@ -772,7 +772,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;CONFIG64;USE_OMP;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;CONFIG64;USE_OMP;%(PreprocessorDefinitions) + false + + diff --git a/externals/vcpkg/ports/ngspice/portfile.cmake b/externals/vcpkg/ports/ngspice/portfile.cmake new file mode 100755 index 000000000..ecf9cf967 --- /dev/null +++ b/externals/vcpkg/ports/ngspice/portfile.cmake @@ -0,0 +1,92 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +# ngspice produces self-contained DLLs +set(VCPKG_CRT_LINKAGE static) + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO ngspice/ng-spice-rework + REF 35 + FILENAME "ngspice-35.tar.gz" + SHA512 2f9b0f951e3ca8d52692beadb895b352311f67b8760f99d0e2f4718fce4b497dd68e2b933029eeacb4ed57551e959bc6e3747e64feb4722a4f841e734f5a664b + PATCHES + use-winbison-sharedspice.patch + use-winbison-vngspice.patch + remove-post-build.patch + remove-64-in-codemodel-name.patch + Fix-C2065.patch +) + +vcpkg_find_acquire_program(BISON) + +get_filename_component(BISON_DIR "${BISON}" DIRECTORY) +vcpkg_add_to_path(PREPEND "${BISON_DIR}") + +# Sadly, vcpkg globs .libs inside install_msbuild and whines that the 47 year old SPICE format isn't a MSVC lib ;) +# We need to kill them off first before the source tree is copied to a tmp location by install_msbuild + +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib") +file(REMOVE_RECURSE "${SOURCE_PATH}/examples") +file(REMOVE_RECURSE "${SOURCE_PATH}/man") +file(REMOVE_RECURSE "${SOURCE_PATH}/tests") + +# this builds the main dll +vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + INCLUDES_SUBPATH /src/include + LICENSE_SUBPATH COPYING + # install_msbuild swaps x86 for win32(bad) if we dont force our own setting + PLATFORM ${TRIPLET_SYSTEM_ARCH} + PROJECT_SUBPATH visualc/sharedspice.sln + TARGET Build +) + +if("codemodels" IN_LIST FEATURES) + # vngspice generates "codemodels" to enhance simulation capabilities + # we cannot use install_msbuild as they output with ".cm" extensions on purpose + set(BUILDTREE_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") + file(REMOVE_RECURSE "${BUILDTREE_PATH}") + file(COPY "${SOURCE_PATH}/" DESTINATION "${BUILDTREE_PATH}") + + vcpkg_build_msbuild( + PROJECT_PATH "${BUILDTREE_PATH}/visualc/vngspice.sln" + # build_msbuild swaps x86 for win32(bad) if we dont force our own setting + PLATFORM ${TRIPLET_SYSTEM_ARCH} + TARGET Build + ) + + # ngspice oddly has solution configs of x64 and x86 but + # output folders of x64 and win32 + if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) + set(OUT_ARCH x64) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) + set(OUT_ARCH Win32) + else() + message(FATAL_ERROR "Unsupported target architecture") + endif() + + #put the code models in the intended location + file(GLOB NGSPICE_CODEMODELS_DEBUG + "${BUILDTREE_PATH}/visualc/codemodels/${OUT_ARCH}/Debug/*.cm" + ) + file(COPY ${NGSPICE_CODEMODELS_DEBUG} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/ngspice") + + file(GLOB NGSPICE_CODEMODELS_RELEASE + "${BUILDTREE_PATH}/visualc/codemodels/${OUT_ARCH}/Release/*.cm" + ) + file(COPY ${NGSPICE_CODEMODELS_RELEASE} DESTINATION "${CURRENT_PACKAGES_DIR}/lib/ngspice") + + + # copy over spinit (spice init) + file(RENAME "${BUILDTREE_PATH}/visualc/spinit_all" "${BUILDTREE_PATH}/visualc/spinit") + file(COPY "${BUILDTREE_PATH}/visualc/spinit" DESTINATION "${CURRENT_PACKAGES_DIR}/share/ngspice") +endif() + +vcpkg_copy_pdbs() + +# Unforunately install_msbuild isn't able to dual include directories that effectively layer +file(GLOB NGSPICE_INCLUDES "${SOURCE_PATH}/visualc/src/include/ngspice/*") +file(COPY ${NGSPICE_INCLUDES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/ngspice") + +# This gets copied by install_msbuild but should not be shared +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/cppduals") diff --git a/externals/vcpkg/ports/ngspice/remove-64-in-codemodel-name.patch b/externals/vcpkg/ports/ngspice/remove-64-in-codemodel-name.patch new file mode 100755 index 000000000..eb5e774b6 --- /dev/null +++ b/externals/vcpkg/ports/ngspice/remove-64-in-codemodel-name.patch @@ -0,0 +1,131 @@ +From dc6b6c0aa4205047e9fd052c401f3f357d83ef57 Mon Sep 17 00:00:00 2001 +From: Marek Roszko +Date: Thu, 12 Aug 2021 22:26:43 -0400 +Subject: [PATCH] Remove 64 in filename output of codemodels + +--- + visualc/xspice/analog.vcxproj | 4 ++-- + visualc/xspice/digital.vcxproj | 4 ++-- + visualc/xspice/spice2poly.vcxproj | 4 ++-- + visualc/xspice/table.vcxproj | 4 ++-- + visualc/xspice/xtradev.vcxproj | 4 ++-- + visualc/xspice/xtraevt.vcxproj | 4 ++-- + 6 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/visualc/xspice/analog.vcxproj b/visualc/xspice/analog.vcxproj +index cf65a37..8b320ce 100644 +--- a/visualc/xspice/analog.vcxproj ++++ b/visualc/xspice/analog.vcxproj +@@ -77,12 +77,12 @@ + false + + +- $(ProjectName)64 ++ $(ProjectName) + true + false + + +- $(ProjectName)64 ++ $(ProjectName) + false + + +diff --git a/visualc/xspice/digital.vcxproj b/visualc/xspice/digital.vcxproj +index 87f4802..7722ce6 100644 +--- a/visualc/xspice/digital.vcxproj ++++ b/visualc/xspice/digital.vcxproj +@@ -77,12 +77,12 @@ + false + + +- $(ProjectName)64 ++ $(ProjectName) + true + false + + +- $(ProjectName)64 ++ $(ProjectName) + false + + +diff --git a/visualc/xspice/spice2poly.vcxproj b/visualc/xspice/spice2poly.vcxproj +index c92471b..786ff7e 100644 +--- a/visualc/xspice/spice2poly.vcxproj ++++ b/visualc/xspice/spice2poly.vcxproj +@@ -77,12 +77,12 @@ + false + + +- $(ProjectName)64 ++ $(ProjectName) + true + false + + +- $(ProjectName)64 ++ $(ProjectName) + false + + +diff --git a/visualc/xspice/table.vcxproj b/visualc/xspice/table.vcxproj +index fb4791c..ad3ee03 100644 +--- a/visualc/xspice/table.vcxproj ++++ b/visualc/xspice/table.vcxproj +@@ -77,12 +77,12 @@ + false + + +- $(ProjectName)64 ++ $(ProjectName) + true + false + + +- $(ProjectName)64 ++ $(ProjectName) + false + + +diff --git a/visualc/xspice/xtradev.vcxproj b/visualc/xspice/xtradev.vcxproj +index 6f0197f..53975b0 100644 +--- a/visualc/xspice/xtradev.vcxproj ++++ b/visualc/xspice/xtradev.vcxproj +@@ -77,12 +77,12 @@ + false + + +- $(ProjectName)64 ++ $(ProjectName) + true + false + + +- $(ProjectName)64 ++ $(ProjectName) + false + + +diff --git a/visualc/xspice/xtraevt.vcxproj b/visualc/xspice/xtraevt.vcxproj +index d5741e7..3177a91 100644 +--- a/visualc/xspice/xtraevt.vcxproj ++++ b/visualc/xspice/xtraevt.vcxproj +@@ -77,12 +77,12 @@ + false + + +- $(ProjectName)64 ++ $(ProjectName) + true + false + + +- $(ProjectName)64 ++ $(ProjectName) + false + + +-- +2.32.0.windows.2 + diff --git a/externals/vcpkg/ports/ngspice/remove-post-build.patch b/externals/vcpkg/ports/ngspice/remove-post-build.patch new file mode 100755 index 000000000..2a9d40b94 --- /dev/null +++ b/externals/vcpkg/ports/ngspice/remove-post-build.patch @@ -0,0 +1,230 @@ +From 363737b9e0e5c2f9de85a0caf641204e638115e3 Mon Sep 17 00:00:00 2001 +From: Marek Roszko +Date: Thu, 12 Aug 2021 22:09:34 -0400 +Subject: [PATCH] Remove post build events that copy files out of the tree + +--- + visualc/vngspice-fftw.vcxproj | 24 ------------------------ + visualc/vngspice.vcxproj | 17 +++++------------ + 2 files changed, 5 insertions(+), 36 deletions(-) + +diff --git a/visualc/vngspice-fftw.vcxproj b/visualc/vngspice-fftw.vcxproj +index 14773c8..178aa73 100644 +--- a/visualc/vngspice-fftw.vcxproj ++++ b/visualc/vngspice-fftw.vcxproj +@@ -238,8 +238,6 @@ lib /machine:x86 /def:..\..\fftw-3.3-dll32\libfftw3-3.def /out:$(IntDir)libfftw3 + + + +- copy /y "..\..\fftw-3.3-dll32\libfftw3-3.dll" "$(OutDir)" +- make-install-vngspiced.bat $(OutDir) fftw + + + +@@ -289,8 +287,6 @@ lib /machine:x86 /def:..\..\fftw-3.3-dll32\libfftw3-3.def /out:$(IntDir)libfftw3 + + + +- copy /y "..\..\fftw-3.3-dll32\libfftw3-3.dll" "$(OutDir)" +- make-install-vngspice.bat $(OutDir) fftw + + + +@@ -337,8 +333,6 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 + + + +- copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)" +- make-install-vngspiced.bat $(OutDir) fftw 64 + + + +@@ -393,8 +387,6 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 + + + +- copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)" +- make-install-vngspice.bat $(OutDir) fftw 64 + + + +@@ -438,8 +430,6 @@ lib /machine:x86 /def:..\..\fftw-3.3-dll32\libfftw3-3.def /out:$(IntDir)libfftw3 + + + +- copy /y "..\..\fftw-3.3-dll32\libfftw3-3.dll" "$(OutDir)" +- make-install-vngspiced.bat $(OutDir) fftw + + + +@@ -489,8 +479,6 @@ lib /machine:x86 /def:..\..\fftw-3.3-dll32\libfftw3-3.def /out:$(IntDir)libfftw3 + + + +- copy /y "..\..\fftw-3.3-dll32\libfftw3-3.dll" "$(OutDir)" +- make-install-vngspice.bat $(OutDir) fftw + + + +@@ -537,8 +525,6 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 + + + +- copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)" +- make-install-vngspiced.bat $(OutDir) fftw 64 + + + +@@ -591,8 +577,6 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 + + + +- copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)" +- make-install-vngspice.bat $(OutDir) fftw 64 + + + +@@ -643,8 +627,6 @@ lib /machine:x86 /def:..\..\fftw-3.3-dll32\libfftw3-3.def /out:$(IntDir)libfftw3 + + + +- copy /y "..\..\fftw-3.3-dll32\libfftw3-3.dll" "$(OutDir)" +- make-install-vngspice.bat $(OutDir) fftw + + + +@@ -700,8 +682,6 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 + + + +- copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)" +- make-install-vngspice.bat $(OutDir) fftw 64 + + + +@@ -752,8 +732,6 @@ lib /machine:x86 /def:..\..\fftw-3.3-dll32\libfftw3-3.def /out:$(IntDir)libfftw3 + + + +- copy /y "..\..\fftw-3.3-dll32\libfftw3-3.dll" "$(OutDir)" +- make-install-vngspice.bat $(OutDir) fftw + + + +@@ -807,8 +785,6 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 + + + +- copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)" +- make-install-vngspice.bat $(OutDir) fftw 64 + + + +diff --git a/visualc/vngspice.vcxproj b/visualc/vngspice.vcxproj +index 7b6ac0b..7190c1e 100644 +--- a/visualc/vngspice.vcxproj ++++ b/visualc/vngspice.vcxproj +@@ -242,7 +242,7 @@ + true + + +- make-install-vngspiced.bat $(OutDir) ++ + + + $(ProjectDir)ngspice-x86.exe.manifest +@@ -293,7 +293,6 @@ + + + +- make-install-vngspice.bat $(OutDir) + + + +@@ -342,7 +341,6 @@ + + + +- make-install-vngspiced.bat $(OutDir) 64 + + + +@@ -399,7 +397,6 @@ + + + +- make-install-vngspice.bat $(OutDir) 64 + + + +@@ -444,7 +441,7 @@ + true + + +- make-install-vngspiced.bat $(OutDir) ++ + + + $(ProjectDir)ngspice-x86.exe.manifest +@@ -494,7 +491,7 @@ + true + + +- make-install-vngspice.bat $(OutDir) ++ + + + $(ProjectDir)ngspice-x86.exe.manifest +@@ -542,7 +539,6 @@ + + + +- make-install-vngspiced.bat $(OutDir) 64 + + + +@@ -597,7 +593,6 @@ + + + +- make-install-vngspice.bat $(OutDir) 64 + + + +@@ -649,7 +644,7 @@ + true + + +- make-install-vngspice.bat $(OutDir) ++ + + + $(ProjectDir)ngspice-x86.exe.manifest +@@ -706,7 +701,6 @@ + + + +- make-install-vngspice.bat $(OutDir) 64 + + + +@@ -758,7 +752,7 @@ + true + + +- make-install-vngspice.bat $(OutDir) ++ + + + $(ProjectDir)ngspice-x86.exe.manifest +@@ -813,7 +807,6 @@ + + + +- make-install-vngspice.bat $(OutDir) 64 + + + +-- +2.32.0.windows.2 + diff --git a/externals/vcpkg/ports/ngspice/use-winbison-sharedspice.patch b/externals/vcpkg/ports/ngspice/use-winbison-sharedspice.patch new file mode 100755 index 000000000..c345e9839 --- /dev/null +++ b/externals/vcpkg/ports/ngspice/use-winbison-sharedspice.patch @@ -0,0 +1,19 @@ +diff --git a/visualc/sharedspice.vcxproj b/visualc/sharedspice.vcxproj +index 4ff0dfc..57b0c35 100644 +--- a/visualc/sharedspice.vcxproj ++++ b/visualc/sharedspice.vcxproj +@@ -2223,12 +2223,12 @@ + + + invoke win_bison.exe for %(Identity) +- ..\..\flex-bison\win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 ++ win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 + .\tmp-bison\%(Filename).c;.\tmp-bison\%(Filename).h + + + invoke win_bison.exe for %(Identity) +- ..\..\flex-bison\win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 ++ win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 + .\tmp-bison\%(Filename).c;.\tmp-bison\%(Filename).h + + diff --git a/externals/vcpkg/ports/ngspice/use-winbison-vngspice.patch b/externals/vcpkg/ports/ngspice/use-winbison-vngspice.patch new file mode 100755 index 000000000..008bc686d --- /dev/null +++ b/externals/vcpkg/ports/ngspice/use-winbison-vngspice.patch @@ -0,0 +1,50 @@ +diff --git a/visualc/vngspice.vcxproj b/visualc/vngspice.vcxproj +index 2d1aa81..cf0f0c7 100644 +--- a/visualc/vngspice.vcxproj ++++ b/visualc/vngspice.vcxproj +@@ -2681,12 +2681,12 @@ + + + invoke win_bison.exe for %(Identity) +- ..\..\flex-bison\win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 ++ win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 + .\tmp-bison\%(Filename).c;.\tmp-bison\%(Filename).h + + + invoke win_bison.exe for %(Identity) +- ..\..\flex-bison\win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 ++ win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 + .\tmp-bison\%(Filename).c;.\tmp-bison\%(Filename).h + + +diff --git a/visualc/xspice/cmpp/cmpp.vcxproj b/visualc/xspice/cmpp/cmpp.vcxproj +index 78607a3..7bcc1a4 100644 +--- a/visualc/xspice/cmpp/cmpp.vcxproj ++++ b/visualc/xspice/cmpp/cmpp.vcxproj +@@ -157,22 +157,22 @@ + + + invoke win_flex.exe for %(Identity) +- ..\..\..\..\flex-bison\win_flex.exe --outfile=.\tmp-bison\%(Filename).c --header-file=.\tmp-bison\%(Filename).h %(Identity) || exit 1 ++ win_flex.exe --outfile=.\tmp-bison\%(Filename).c --header-file=.\tmp-bison\%(Filename).h %(Identity) || exit 1 + .\tmp-bison\%(Filename).c;.\tmp-bison\%(Filename).h + + + invoke win_bison.exe for %(Identity) +- ..\..\..\..\flex-bison\win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 ++ win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 + .\tmp-bison\%(Filename).c;.\tmp-bison\%(Filename).h + + + invoke win_flex.exe for %(Identity) +- ..\..\..\..\flex-bison\win_flex.exe --outfile=.\tmp-bison\%(Filename).c --header-file=.\tmp-bison\%(Filename).h %(Identity) || exit 1 ++ win_flex.exe --outfile=.\tmp-bison\%(Filename).c --header-file=.\tmp-bison\%(Filename).h %(Identity) || exit 1 + .\tmp-bison\%(Filename).c;.\tmp-bison\%(Filename).h + + + invoke win_bison.exe for %(Identity) +- ..\..\..\..\flex-bison\win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 ++ win_bison.exe --output=.\tmp-bison\%(Filename).c --defines=.\tmp-bison\%(Filename).h %(Identity) || exit 1 + .\tmp-bison\%(Filename).c;.\tmp-bison\%(Filename).h + + diff --git a/externals/vcpkg/ports/ngspice/vcpkg.json b/externals/vcpkg/ports/ngspice/vcpkg.json new file mode 100755 index 000000000..11517e0c1 --- /dev/null +++ b/externals/vcpkg/ports/ngspice/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "ngspice", + "version": "35", + "port-version": 2, + "description": "Ngspice is a mixed-level/mixed-signal electronic circuit simulator. It is a successor of the latest stable release of Berkeley SPICE", + "homepage": "http://ngspice.sourceforge.net/", + "license": "CC-BY-SA-4.0", + "supports": "!(linux | osx | arm | uwp)", + "default-features": [ + "codemodels" + ], + "features": { + "codemodels": { + "description": "Adds optional code models for XSPICE, ADMS (verilog integration) and B-/E-/G- sources." + } + } +} diff --git a/externals/vcpkg/ports/nifly/portfile.cmake b/externals/vcpkg/ports/nifly/portfile.cmake new file mode 100755 index 000000000..4c2383be4 --- /dev/null +++ b/externals/vcpkg/ports/nifly/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ousnius/nifly + REF 680a3c0435ff78f8189c46de410d0c8aa9c18a06 + SHA512 b1bb4a194f95e7bcd66280e1b796d0813cd0b4dc292dae5b168092c2d529f89c966a0f11b364787dfa906556181326b30517b7f734fe85246cde4016e3a1d55b + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "cmake/") + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/nifly/vcpkg.json b/externals/vcpkg/ports/nifly/vcpkg.json new file mode 100755 index 000000000..ab3585677 --- /dev/null +++ b/externals/vcpkg/ports/nifly/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "nifly", + "version": "1.0.0", + "description": "A C++ library for working with the NIF file format", + "homepage": "https://github.com/ousnius/nifly", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/nifticlib/portfile.cmake b/externals/vcpkg/ports/nifticlib/portfile.cmake new file mode 100755 index 000000000..c9d74a49e --- /dev/null +++ b/externals/vcpkg/ports/nifticlib/portfile.cmake @@ -0,0 +1,48 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO NIFTI-Imaging/nifti_clib + REF 65f801b9c2f1f15f4de4a19d45e6595c25765632 + SHA512 be03cdc6cf17fd9ff74c5ecc1f6b2132121bb4b7973a731da334af2a8428d1f0dbbf7b94b2511d1ff7e515b8cc4cf3316d62b189566fb6ffc88c6146eebd48ff + HEAD_REF master + PATCHES zlib_include.patch +) + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + "cifti" USE_CIFTI_CODE + "fsl" USE_FSL_CODE + "nifti2" USE_NIFTI2_CODE + "nifticdf" USE_NIFTICDF_CODE + "tools" NIFTI_BUILD_APPLICATIONS + "tests" BUILD_TESTING +) +set(TOOL_NAMES) +if("tools" IN_LIST FEATURES) + list(APPEND TOOL_NAMES nifti_stats nifti_tool nifti1_tool) +endif() +if("tests" IN_LIST FEATURES) + list(APPEND TOOL_NAMES nifit_test) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + ${FEATURE_OPTIONS} +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake TARGET_PATH share) + +if(TOOL_NAMES) + vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/nifticlib/vcpkg.json b/externals/vcpkg/ports/nifticlib/vcpkg.json new file mode 100755 index 000000000..8a35da5a0 --- /dev/null +++ b/externals/vcpkg/ports/nifticlib/vcpkg.json @@ -0,0 +1,35 @@ +{ + "name": "nifticlib", + "version-string": "2020-04-30", + "port-version": 1, + "description": "Nifticlib is a C I/O library for reading and writing files in the nifti-1 data format.", + "homepage": "NIFTI-Imaging/nifti_clib", + "supports": "!uwp", + "dependencies": [ + "zlib" + ], + "default-features": [ + "nifti2", + "nifticdf" + ], + "features": { + "cifti": { + "description": "Build cifti libraries and tools" + }, + "fsl": { + "description": "Build fsl libraries and tools" + }, + "nifti2": { + "description": "Build nifti2 libraries and tools" + }, + "nifticdf": { + "description": "Build nifticdf libraries and tools" + }, + "tests": { + "description": "Build tests" + }, + "tools": { + "description": "Build tools" + } + } +} diff --git a/externals/vcpkg/ports/nifticlib/zlib_include.patch b/externals/vcpkg/ports/nifticlib/zlib_include.patch new file mode 100755 index 000000000..1ef462b7f --- /dev/null +++ b/externals/vcpkg/ports/nifticlib/zlib_include.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 54150d739..c3ca8fe50 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -77,6 +77,7 @@ set_if_not_defined(ZNZ_COMPILE_DEF "") + if(NOT NIFTI_ZLIB_LIBRARIES) # If using a custom zlib library, skip the find package + ### USE AS STAND ALONE PACKAGE + find_package(ZLIB REQUIRED) ++ include_directories(${ZLIB_INCLUDE_DIRS}) + set(NIFTI_ZLIB_LIBRARIES ${ZLIB_LIBRARIES}) + endif() + #message(STATUS "---------------------ZLIB -${NIFTI_ZLIB_LIBRARIES}--") diff --git a/externals/vcpkg/ports/nlohmann-fifo-map/CMakeLists.txt b/externals/vcpkg/ports/nlohmann-fifo-map/CMakeLists.txt new file mode 100755 index 000000000..3450e5100 --- /dev/null +++ b/externals/vcpkg/ports/nlohmann-fifo-map/CMakeLists.txt @@ -0,0 +1,30 @@ +cmake_minimum_required(VERSION 3.1) +project(nlohmann-fifo-map LANGUAGES CXX) + +include(GNUInstallDirs) + +set(NLOHMANN_FIFO_MAP_TARGET_NAME ${PROJECT_NAME}) +set(NLOHMANN_FIFO_MAP_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/nlohmann") +set(NLOHMANN_FIFO_MAP_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/nlohmann-fifo-map") +set(NLOHMANN_FIFO_MAP_CONFIG_EXPORT_NAME "${PROJECT_NAME}-config") +set(NLOHMANN_FIFO_MAP_INCLUDE_BUILD_DIR "${CMAKE_SOURCE_DIR}/src/") + +add_library(${NLOHMANN_FIFO_MAP_TARGET_NAME} INTERFACE) +add_library(${PROJECT_NAME}::${NLOHMANN_FIFO_MAP_TARGET_NAME} ALIAS ${NLOHMANN_FIFO_MAP_TARGET_NAME}) + +install( + DIRECTORY ${NLOHMANN_FIFO_MAP_INCLUDE_BUILD_DIR} + DESTINATION ${NLOHMANN_FIFO_MAP_INCLUDE_INSTALL_DIR} +) + +install( + TARGETS ${NLOHMANN_FIFO_MAP_TARGET_NAME} EXPORT ${NLOHMANN_FIFO_MAP_CONFIG_EXPORT_NAME} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} +) + +install( + EXPORT ${NLOHMANN_FIFO_MAP_CONFIG_EXPORT_NAME} + DESTINATION ${NLOHMANN_FIFO_MAP_CONFIG_INSTALL_DIR} + NAMESPACE ${PROJECT_NAME}:: +) + diff --git a/externals/vcpkg/ports/nlohmann-fifo-map/portfile.cmake b/externals/vcpkg/ports/nlohmann-fifo-map/portfile.cmake new file mode 100755 index 000000000..3079e964e --- /dev/null +++ b/externals/vcpkg/ports/nlohmann-fifo-map/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nlohmann/fifo_map + REF 0dfbf5dacbb15a32c43f912a7e66a54aae39d0f9 + SHA512 1e515d02ff49684dc8439ee1f3b9fbece3c727b6f669ee9a251eae8d8bf33eff0a36ab58829956a698cd9bfb757f9c6ade227d601197aa7b824c0584f48e181d + HEAD_REF master +) + +#make sure we don't use any integrated pre-built library nor any unnecessary CMake module +file(REMOVE_RECURSE ${SOURCE_PATH}/test) +file(REMOVE ${SOURCE_PATH}/CMakeLists.txt) + +file(COPY ${CURRENT_PORT_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE.MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/nlohmann-fifo-map/vcpkg.json b/externals/vcpkg/ports/nlohmann-fifo-map/vcpkg.json new file mode 100755 index 000000000..e18734a35 --- /dev/null +++ b/externals/vcpkg/ports/nlohmann-fifo-map/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "nlohmann-fifo-map", + "version-string": "2018.05.07", + "port-version": 2, + "description": "a FIFO-ordered associative container for C++", + "homepage": "https://github.com/nlohmann/fifo_map" +} diff --git a/externals/vcpkg/ports/nlohmann-json/portfile.cmake b/externals/vcpkg/ports/nlohmann-json/portfile.cmake new file mode 100755 index 000000000..81e434b0d --- /dev/null +++ b/externals/vcpkg/ports/nlohmann-json/portfile.cmake @@ -0,0 +1,50 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nlohmann/json + REF v3.10.5 + SHA512 4a9d6416f383e76bf95425fc02a4e12c605fcbcae910b704e354396a493454cf8a1ffbecba11f231e020ffd2842908df7e67dbc09f62d1202d40b6815c24cfd2 + HEAD_REF master +) + +if(NOT DEFINED nlohmann-json_IMPLICIT_CONVERSIONS) + set(nlohmann-json_IMPLICIT_CONVERSIONS ON) +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "diagnostics" JSON_Diagnostics +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} + -DJSON_Install=ON + -DJSON_MultipleHeaders=ON + -DJSON_BuildTests=OFF + -DJSON_ImplicitConversions=${nlohmann-json_IMPLICIT_CONVERSIONS} +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME "nlohmann_json" CONFIG_PATH "lib/cmake/nlohmann_json") +vcpkg_fixup_pkgconfig() + +vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/share/nlohmann_json/nlohmann_jsonTargets.cmake" + "{_IMPORT_PREFIX}/nlohmann_json.natvis" + "{_IMPORT_PREFIX}/share/nlohmann_json/nlohmann_json.natvis" +) +if(EXISTS "${CURRENT_PACKAGES_DIR}/nlohmann_json.natvis") + file(RENAME + "${CURRENT_PACKAGES_DIR}/nlohmann_json.natvis" + "${CURRENT_PACKAGES_DIR}/share/nlohmann_json/nlohmann_json.natvis" + ) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/nlohmann_json.natvis") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# Handle usage +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/nlohmann-json/usage b/externals/vcpkg/ports/nlohmann-json/usage new file mode 100755 index 000000000..a078bbd38 --- /dev/null +++ b/externals/vcpkg/ports/nlohmann-json/usage @@ -0,0 +1,12 @@ +The package nlohmann-json provides CMake targets: + + find_package(nlohmann_json CONFIG REQUIRED) + target_link_libraries(main PRIVATE nlohmann_json::nlohmann_json) + +The package nlohmann-json can be configured to not provide implicit conversions via a custom triplet file: + + set(nlohmann-json_IMPLICIT_CONVERSIONS OFF) + +For more information, see the docs here: + + https://json.nlohmann.me/features/macros/#json_use_implicit_conversions diff --git a/externals/vcpkg/ports/nlohmann-json/vcpkg.json b/externals/vcpkg/ports/nlohmann-json/vcpkg.json new file mode 100755 index 000000000..ac382db2f --- /dev/null +++ b/externals/vcpkg/ports/nlohmann-json/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "nlohmann-json", + "version-semver": "3.10.5", + "port-version": 3, + "description": "JSON for Modern C++", + "homepage": "https://github.com/nlohmann/json", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "diagnostics": { + "description": "Build json_diagnostics" + } + } +} diff --git a/externals/vcpkg/ports/nlopt/portfile.cmake b/externals/vcpkg/ports/nlopt/portfile.cmake new file mode 100755 index 000000000..7d232cbc8 --- /dev/null +++ b/externals/vcpkg/ports/nlopt/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO stevengj/nlopt + REF v2.7.1 + SHA512 e23cb522fc696010574c14b72be85acc0f8ccf0bf208bf2b8789c57d6c5a6e6d419ee10330581518b1c1567018ae909b626ce7761d4fbd5bf112916871e420e2 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DNLOPT_FORTRAN=OFF + -DNLOPT_PYTHON=OFF + -DNLOPT_OCTAVE=OFF + -DNLOPT_MATLAB=OFF + -DNLOPT_GUILE=OFF + -DNLOPT_SWIG=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/nlopt) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/nlopt/vcpkg.json b/externals/vcpkg/ports/nlopt/vcpkg.json new file mode 100755 index 000000000..bcc20e45c --- /dev/null +++ b/externals/vcpkg/ports/nlopt/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "nlopt", + "version": "2.7.1", + "description": "Library for nonlinear local and global optimization, for functions with and without gradient information.", + "homepage": "https://github.com/stevengj/nlopt", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/nmap/fix-msvc-prj.patch b/externals/vcpkg/ports/nmap/fix-msvc-prj.patch new file mode 100755 index 000000000..25893f137 --- /dev/null +++ b/externals/vcpkg/ports/nmap/fix-msvc-prj.patch @@ -0,0 +1,1986 @@ +diff --git a/libdnet-stripped/libdnet-stripped.vcxproj b/libdnet-stripped/libdnet-stripped.vcxproj +index 1f2b760..1756c5c 100644 +--- a/libdnet-stripped/libdnet-stripped.vcxproj ++++ b/libdnet-stripped/libdnet-stripped.vcxproj +@@ -5,10 +5,18 @@ + Debug + Win32 + ++ ++ Debug ++ x64 ++ + + Release + Win32 + ++ ++ Release ++ x64 ++ + + + libdnet-stripped +@@ -22,11 +30,21 @@ + MultiByte + v120 + ++ ++ StaticLibrary ++ MultiByte ++ v120 ++ + + StaticLibrary + MultiByte + v120 + ++ ++ StaticLibrary ++ MultiByte ++ v120 ++ + + + +@@ -34,10 +52,18 @@ + + + ++ ++ ++ ++ + + + + ++ ++ ++ ++ + + + <_ProjectFileVersion>10.0.30319.1 +@@ -64,6 +90,23 @@ + $(OutDir)libdnet-stripped.lib + + ++ ++ ++ /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) ++ Disabled ++ include;..\mswin32\pcap-include;%(AdditionalIncludeDirectories) ++ WIN32;_LIB;BPF_MAJOR_VERSION;%(PreprocessorDefinitions) ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ $(OutDir)libdnet-stripped.lib ++ ++ + + + /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) +@@ -78,6 +121,20 @@ + $(OutDir)libdnet-stripped.lib + + ++ ++ ++ /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) ++ include;..\mswin32\pcap-include;%(AdditionalIncludeDirectories) ++ WIN32;_LIB;BPF_MAJOR_VERSION;%(PreprocessorDefinitions) ++ ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ $(OutDir)libdnet-stripped.lib ++ ++ + + + +diff --git a/liblinear/liblinear.vcxproj b/liblinear/liblinear.vcxproj +index cf99e3d..ac5ff7c 100644 +--- a/liblinear/liblinear.vcxproj ++++ b/liblinear/liblinear.vcxproj +@@ -5,10 +5,18 @@ + Debug + Win32 + ++ ++ Debug ++ x64 ++ + + Release + Win32 + ++ ++ Release ++ x64 ++ + + + +@@ -36,6 +44,12 @@ + Unicode + v120 + ++ ++ StaticLibrary ++ true ++ Unicode ++ v120 ++ + + StaticLibrary + false +@@ -43,19 +57,33 @@ + Unicode + v120 + ++ ++ StaticLibrary ++ false ++ true ++ Unicode ++ v120 ++ + + + + + + ++ ++ ++ + + + ++ ++ ++ + + + .\ + ++ + + .\ + +@@ -75,6 +103,21 @@ + true + + ++ ++ ++ ++ ++ Level3 ++ Disabled ++ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) ++ MultiThreadedDebugDLL ++ /D_CRT_SECURE_NO_WARNINGS=1 %(AdditionalOptions) ++ ++ ++ Windows ++ true ++ ++ + + + Level3 +@@ -93,6 +136,24 @@ + true + + ++ ++ ++ Level3 ++ ++ ++ MaxSpeed ++ true ++ true ++ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) ++ /D_CRT_SECURE_NO_WARNINGS=1 %(AdditionalOptions) ++ ++ ++ Windows ++ true ++ true ++ true ++ ++ + + + +diff --git a/liblua/liblua.vcxproj b/liblua/liblua.vcxproj +index 8e80221..db6b1ea 100644 +--- a/liblua/liblua.vcxproj ++++ b/liblua/liblua.vcxproj +@@ -5,10 +5,18 @@ + Debug + Win32 + ++ ++ Debug ++ x64 ++ + + Release + Win32 + ++ ++ Release ++ x64 ++ + + + {31FB0767-A71F-4575-8379-002D72B8AF86} +@@ -22,20 +30,37 @@ + true + v120 + ++ ++ StaticLibrary ++ NotSet ++ true ++ v120 ++ + + StaticLibrary + NotSet + v120 + ++ ++ StaticLibrary ++ NotSet ++ v120 ++ + + + + + + ++ ++ ++ + + + ++ ++ ++ + + + <_ProjectFileVersion>10.0.30319.1 +@@ -68,6 +93,29 @@ + $(OutDir)liblua.lib + + ++ ++ ++ /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) ++ Disabled ++ WIN32;_LIB;%(PreprocessorDefinitions) ++ ++ ++ Default ++ MultiThreadedDebugDLL ++ false ++ false ++ false ++ ++ ++ Level3 ++ ProgramDatabase ++ Cdecl ++ CompileAsC ++ ++ ++ $(OutDir)liblua.lib ++ ++ + + + /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) +@@ -91,6 +139,29 @@ + $(OutDir)liblua.lib + + ++ ++ ++ /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) ++ false ++ WIN32;_LIB;%(PreprocessorDefinitions) ++ false ++ ++ ++ Default ++ false ++ false ++ false ++ ++ ++ Level3 ++ ++ ++ CompileAsC ++ ++ ++ $(OutDir)liblua.lib ++ ++ + + + +diff --git a/libnetutil/libnetutil.vcxproj b/libnetutil/libnetutil.vcxproj +index 8f4fbb5..00cc7c2 100644 +--- a/libnetutil/libnetutil.vcxproj ++++ b/libnetutil/libnetutil.vcxproj +@@ -5,10 +5,18 @@ + Debug + Win32 + ++ ++ Debug ++ x64 ++ + + Release + Win32 + ++ ++ Release ++ x64 ++ + + + {99157C3F-39F6-4663-99D7-1D9C1484494E} +@@ -22,20 +30,37 @@ + true + v120 + ++ ++ StaticLibrary ++ Unicode ++ true ++ v120 ++ + + StaticLibrary + Unicode + v120 + ++ ++ StaticLibrary ++ Unicode ++ v120 ++ + + + + + + ++ ++ ++ + + + ++ ++ ++ + + + <_ProjectFileVersion>10.0.30319.1 +@@ -61,6 +86,22 @@ + $(OutDir)libnetutil.lib + + ++ ++ ++ Disabled ++ ..;../mswin32;../nbase;../mswin32/pcap-include;../libdnet-stripped/include;%(AdditionalIncludeDirectories) ++ WIN32;BPF_MAJOR_VERSION;_DEBUG;_LIB;%(PreprocessorDefinitions) ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ $(OutDir)libnetutil.lib ++ ++ + + + MaxSpeed +@@ -74,6 +115,19 @@ + ProgramDatabase + + ++ ++ ++ MaxSpeed ++ true ++ ..;../mswin32;../nbase;../mswin32/pcap-include;../libdnet-stripped/include;%(AdditionalIncludeDirectories) ++ WIN32;BPF_MAJOR_VERSION;NDEBUG;_LIB;%(PreprocessorDefinitions) ++ true ++ ++ ++ Level3 ++ ProgramDatabase ++ ++ + + + +diff --git a/mswin32/nmap.sln b/mswin32/nmap.sln +index 3f9fa22..4484bbd 100644 +--- a/mswin32/nmap.sln ++++ b/mswin32/nmap.sln +@@ -5,14 +5,11 @@ MinimumVisualStudioVersion = 10.0.40219.1 + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nmap", "nmap.vcxproj", "{361719F0-AB42-4C93-9DE8-7D2144B96625}" + ProjectSection(ProjectDependencies) = postProject + {99157C3F-39F6-4663-99D7-1D9C1484494E} = {99157C3F-39F6-4663-99D7-1D9C1484494E} +- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8} = {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8} + {A7BE3D76-F20C-40C5-8986-DE4028B3B57D} = {A7BE3D76-F20C-40C5-8986-DE4028B3B57D} + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nsock", "..\nsock\nsock.vcxproj", "{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpcre", "..\libpcre\libpcre.vcxproj", "{5DE86C7A-DE72-4265-8807-4CA38F94F22A}" +-EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nbase", "..\nbase\nbase.vcxproj", "{B630C8F7-3138-43E8-89ED-78742FA2AC5F}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdnet-stripped", "..\libdnet-stripped\libdnet-stripped.vcxproj", "{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}" +@@ -27,14 +24,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnetutil", "..\libnetutil + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblinear", "..\liblinear\liblinear.vcxproj", "{A7BE3D76-F20C-40C5-8986-DE4028B3B57D}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nmap-update", "..\nmap-update\nmap-update.vcxproj", "{BBF27339-C7B6-4F52-B742-897796C1F13B}" +-EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libz", "..\libz\contrib\vstudio\vc11\zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}" +-EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libssh2", "..\libssh2\win32\libssh2.vcxproj", "{ED957342-E43B-496E-92D9-4C76B525BDF5}" +-EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "..\libz\contrib\vstudio\vc11\zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}" +-EndProject + Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 +@@ -49,176 +38,148 @@ Global + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {361719F0-AB42-4C93-9DE8-7D2144B96625}.Debug|Win32.ActiveCfg = Debug|Win32 + {361719F0-AB42-4C93-9DE8-7D2144B96625}.Debug|Win32.Build.0 = Debug|Win32 +- {361719F0-AB42-4C93-9DE8-7D2144B96625}.Debug|x64.ActiveCfg = Debug|Win32 ++ {361719F0-AB42-4C93-9DE8-7D2144B96625}.Debug|x64.ActiveCfg = Debug|x64 ++ {361719F0-AB42-4C93-9DE8-7D2144B96625}.Debug|x64.Build.0 = Debug|x64 + {361719F0-AB42-4C93-9DE8-7D2144B96625}.Ncat Static|Win32.ActiveCfg = Release|Win32 +- {361719F0-AB42-4C93-9DE8-7D2144B96625}.Ncat Static|x64.ActiveCfg = Release|Win32 ++ {361719F0-AB42-4C93-9DE8-7D2144B96625}.Ncat Static|x64.ActiveCfg = Release|x64 ++ {361719F0-AB42-4C93-9DE8-7D2144B96625}.Ncat Static|x64.Build.0 = Release|x64 + {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release|Win32.ActiveCfg = Release|Win32 + {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release|Win32.Build.0 = Release|Win32 +- {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release|x64.ActiveCfg = Release|Win32 ++ {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release|x64.ActiveCfg = Release|x64 ++ {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release|x64.Build.0 = Release|x64 + {361719F0-AB42-4C93-9DE8-7D2144B96625}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 + {361719F0-AB42-4C93-9DE8-7D2144B96625}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 +- {361719F0-AB42-4C93-9DE8-7D2144B96625}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 ++ {361719F0-AB42-4C93-9DE8-7D2144B96625}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 ++ {361719F0-AB42-4C93-9DE8-7D2144B96625}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 + {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug|Win32.ActiveCfg = Debug|Win32 + {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug|Win32.Build.0 = Debug|Win32 +- {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug|x64.ActiveCfg = Debug|Win32 ++ {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug|x64.ActiveCfg = Debug|x64 ++ {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug|x64.Build.0 = Debug|x64 + {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Ncat Static|Win32.ActiveCfg = Static|Win32 + {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Ncat Static|Win32.Build.0 = Static|Win32 +- {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Ncat Static|x64.ActiveCfg = Static|Win32 ++ {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Ncat Static|x64.ActiveCfg = Static|x64 ++ {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Ncat Static|x64.Build.0 = Static|x64 + {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release|Win32.ActiveCfg = Release|Win32 + {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release|Win32.Build.0 = Release|Win32 +- {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release|x64.ActiveCfg = Release|Win32 ++ {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release|x64.ActiveCfg = Release|x64 ++ {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release|x64.Build.0 = Release|x64 + {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseNoPcap|Win32 + {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseNoPcap|Win32 +- {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseNoPcap|Win32 +- {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Debug|Win32.ActiveCfg = Debug|Win32 +- {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Debug|Win32.Build.0 = Debug|Win32 +- {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Debug|x64.ActiveCfg = Debug|Win32 +- {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Ncat Static|Win32.ActiveCfg = Release|Win32 +- {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Ncat Static|x64.ActiveCfg = Release|Win32 +- {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release|Win32.ActiveCfg = Release|Win32 +- {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release|Win32.Build.0 = Release|Win32 +- {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release|x64.ActiveCfg = Release|Win32 +- {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 +- {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 +- {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 ++ {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseNoPcap|x64 ++ {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.ReleaseWithoutAsm|x64.Build.0 = ReleaseNoPcap|x64 + {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug|Win32.ActiveCfg = Debug|Win32 + {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug|Win32.Build.0 = Debug|Win32 +- {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug|x64.ActiveCfg = Debug|Win32 ++ {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug|x64.ActiveCfg = Debug|x64 ++ {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug|x64.Build.0 = Debug|x64 + {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Ncat Static|Win32.ActiveCfg = Static|Win32 + {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Ncat Static|Win32.Build.0 = Static|Win32 +- {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Ncat Static|x64.ActiveCfg = Static|Win32 ++ {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Ncat Static|x64.ActiveCfg = Static|x64 ++ {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Ncat Static|x64.Build.0 = Static|x64 + {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release|Win32.ActiveCfg = Release|Win32 + {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release|Win32.Build.0 = Release|Win32 +- {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release|x64.ActiveCfg = Release|Win32 ++ {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release|x64.ActiveCfg = Release|x64 ++ {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release|x64.Build.0 = Release|x64 + {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 + {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 +- {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 ++ {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 ++ {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 + {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug|Win32.ActiveCfg = Debug|Win32 + {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug|Win32.Build.0 = Debug|Win32 +- {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug|x64.ActiveCfg = Debug|Win32 ++ {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug|x64.ActiveCfg = Debug|x64 ++ {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug|x64.Build.0 = Debug|x64 + {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Ncat Static|Win32.ActiveCfg = Release|Win32 +- {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Ncat Static|x64.ActiveCfg = Release|Win32 ++ {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Ncat Static|x64.ActiveCfg = Release|x64 ++ {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Ncat Static|x64.Build.0 = Release|x64 + {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release|Win32.ActiveCfg = Release|Win32 + {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release|Win32.Build.0 = Release|Win32 +- {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release|x64.ActiveCfg = Release|Win32 ++ {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release|x64.ActiveCfg = Release|x64 ++ {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release|x64.Build.0 = Release|x64 + {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 + {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 +- {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 ++ {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 ++ {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 + {31FB0767-A71F-4575-8379-002D72B8AF86}.Debug|Win32.ActiveCfg = Debug|Win32 + {31FB0767-A71F-4575-8379-002D72B8AF86}.Debug|Win32.Build.0 = Debug|Win32 +- {31FB0767-A71F-4575-8379-002D72B8AF86}.Debug|x64.ActiveCfg = Debug|Win32 ++ {31FB0767-A71F-4575-8379-002D72B8AF86}.Debug|x64.ActiveCfg = Debug|x64 ++ {31FB0767-A71F-4575-8379-002D72B8AF86}.Debug|x64.Build.0 = Debug|x64 + {31FB0767-A71F-4575-8379-002D72B8AF86}.Ncat Static|Win32.ActiveCfg = Release|Win32 +- {31FB0767-A71F-4575-8379-002D72B8AF86}.Ncat Static|x64.ActiveCfg = Release|Win32 ++ {31FB0767-A71F-4575-8379-002D72B8AF86}.Ncat Static|x64.ActiveCfg = Release|x64 ++ {31FB0767-A71F-4575-8379-002D72B8AF86}.Ncat Static|x64.Build.0 = Release|x64 + {31FB0767-A71F-4575-8379-002D72B8AF86}.Release|Win32.ActiveCfg = Release|Win32 + {31FB0767-A71F-4575-8379-002D72B8AF86}.Release|Win32.Build.0 = Release|Win32 +- {31FB0767-A71F-4575-8379-002D72B8AF86}.Release|x64.ActiveCfg = Release|Win32 ++ {31FB0767-A71F-4575-8379-002D72B8AF86}.Release|x64.ActiveCfg = Release|x64 ++ {31FB0767-A71F-4575-8379-002D72B8AF86}.Release|x64.Build.0 = Release|x64 + {31FB0767-A71F-4575-8379-002D72B8AF86}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 + {31FB0767-A71F-4575-8379-002D72B8AF86}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 +- {31FB0767-A71F-4575-8379-002D72B8AF86}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 ++ {31FB0767-A71F-4575-8379-002D72B8AF86}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 ++ {31FB0767-A71F-4575-8379-002D72B8AF86}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 + {C1E04411-E021-468B-83F1-CB624BBA7589}.Debug|Win32.ActiveCfg = Debug|Win32 + {C1E04411-E021-468B-83F1-CB624BBA7589}.Debug|Win32.Build.0 = Debug|Win32 +- {C1E04411-E021-468B-83F1-CB624BBA7589}.Debug|x64.ActiveCfg = Debug|Win32 ++ {C1E04411-E021-468B-83F1-CB624BBA7589}.Debug|x64.ActiveCfg = Debug|x64 ++ {C1E04411-E021-468B-83F1-CB624BBA7589}.Debug|x64.Build.0 = Debug|x64 + {C1E04411-E021-468B-83F1-CB624BBA7589}.Ncat Static|Win32.ActiveCfg = Static|Win32 + {C1E04411-E021-468B-83F1-CB624BBA7589}.Ncat Static|Win32.Build.0 = Static|Win32 +- {C1E04411-E021-468B-83F1-CB624BBA7589}.Ncat Static|x64.ActiveCfg = Static|Win32 ++ {C1E04411-E021-468B-83F1-CB624BBA7589}.Ncat Static|x64.ActiveCfg = Static|x64 ++ {C1E04411-E021-468B-83F1-CB624BBA7589}.Ncat Static|x64.Build.0 = Static|x64 + {C1E04411-E021-468B-83F1-CB624BBA7589}.Release|Win32.ActiveCfg = Release|Win32 + {C1E04411-E021-468B-83F1-CB624BBA7589}.Release|Win32.Build.0 = Release|Win32 +- {C1E04411-E021-468B-83F1-CB624BBA7589}.Release|x64.ActiveCfg = Release|Win32 ++ {C1E04411-E021-468B-83F1-CB624BBA7589}.Release|x64.ActiveCfg = Release|x64 ++ {C1E04411-E021-468B-83F1-CB624BBA7589}.Release|x64.Build.0 = Release|x64 + {C1E04411-E021-468B-83F1-CB624BBA7589}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 + {C1E04411-E021-468B-83F1-CB624BBA7589}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 +- {C1E04411-E021-468B-83F1-CB624BBA7589}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 ++ {C1E04411-E021-468B-83F1-CB624BBA7589}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 ++ {C1E04411-E021-468B-83F1-CB624BBA7589}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 + {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Debug|Win32.ActiveCfg = Debug|Win32 + {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Debug|Win32.Build.0 = Debug|Win32 +- {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Debug|x64.ActiveCfg = Debug|Win32 ++ {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Debug|x64.ActiveCfg = Debug|x64 ++ {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Debug|x64.Build.0 = Debug|x64 + {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Ncat Static|Win32.ActiveCfg = Release|Win32 +- {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Ncat Static|x64.ActiveCfg = Release|Win32 ++ {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Ncat Static|x64.ActiveCfg = Release|x64 ++ {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Ncat Static|x64.Build.0 = Release|x64 + {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Release|Win32.ActiveCfg = Release|Win32 + {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Release|Win32.Build.0 = Release|Win32 +- {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Release|x64.ActiveCfg = Release|Win32 ++ {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Release|x64.ActiveCfg = Release|x64 ++ {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Release|x64.Build.0 = Release|x64 + {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 + {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 +- {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 ++ {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 ++ {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 + {99157C3F-39F6-4663-99D7-1D9C1484494E}.Debug|Win32.ActiveCfg = Debug|Win32 + {99157C3F-39F6-4663-99D7-1D9C1484494E}.Debug|Win32.Build.0 = Debug|Win32 +- {99157C3F-39F6-4663-99D7-1D9C1484494E}.Debug|x64.ActiveCfg = Debug|Win32 ++ {99157C3F-39F6-4663-99D7-1D9C1484494E}.Debug|x64.ActiveCfg = Debug|x64 ++ {99157C3F-39F6-4663-99D7-1D9C1484494E}.Debug|x64.Build.0 = Debug|x64 + {99157C3F-39F6-4663-99D7-1D9C1484494E}.Ncat Static|Win32.ActiveCfg = Release|Win32 +- {99157C3F-39F6-4663-99D7-1D9C1484494E}.Ncat Static|x64.ActiveCfg = Release|Win32 ++ {99157C3F-39F6-4663-99D7-1D9C1484494E}.Ncat Static|x64.ActiveCfg = Release|x64 ++ {99157C3F-39F6-4663-99D7-1D9C1484494E}.Ncat Static|x64.Build.0 = Release|x64 + {99157C3F-39F6-4663-99D7-1D9C1484494E}.Release|Win32.ActiveCfg = Release|Win32 + {99157C3F-39F6-4663-99D7-1D9C1484494E}.Release|Win32.Build.0 = Release|Win32 +- {99157C3F-39F6-4663-99D7-1D9C1484494E}.Release|x64.ActiveCfg = Release|Win32 ++ {99157C3F-39F6-4663-99D7-1D9C1484494E}.Release|x64.ActiveCfg = Release|x64 ++ {99157C3F-39F6-4663-99D7-1D9C1484494E}.Release|x64.Build.0 = Release|x64 + {99157C3F-39F6-4663-99D7-1D9C1484494E}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 + {99157C3F-39F6-4663-99D7-1D9C1484494E}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 +- {99157C3F-39F6-4663-99D7-1D9C1484494E}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 ++ {99157C3F-39F6-4663-99D7-1D9C1484494E}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 ++ {99157C3F-39F6-4663-99D7-1D9C1484494E}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 + {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Debug|Win32.ActiveCfg = Debug|Win32 + {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Debug|Win32.Build.0 = Debug|Win32 +- {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Debug|x64.ActiveCfg = Debug|Win32 ++ {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Debug|x64.ActiveCfg = Debug|x64 ++ {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Debug|x64.Build.0 = Debug|x64 + {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Ncat Static|Win32.ActiveCfg = Release|Win32 + {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Ncat Static|Win32.Build.0 = Release|Win32 +- {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Ncat Static|x64.ActiveCfg = Release|Win32 ++ {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Ncat Static|x64.ActiveCfg = Release|x64 ++ {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Ncat Static|x64.Build.0 = Release|x64 + {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Release|Win32.ActiveCfg = Release|Win32 + {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Release|Win32.Build.0 = Release|Win32 +- {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Release|x64.ActiveCfg = Release|Win32 ++ {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Release|x64.ActiveCfg = Release|x64 ++ {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Release|x64.Build.0 = Release|x64 + {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 + {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 +- {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 +- {BBF27339-C7B6-4F52-B742-897796C1F13B}.Debug|Win32.ActiveCfg = Debug|Win32 +- {BBF27339-C7B6-4F52-B742-897796C1F13B}.Debug|Win32.Build.0 = Debug|Win32 +- {BBF27339-C7B6-4F52-B742-897796C1F13B}.Debug|x64.ActiveCfg = Debug|Win32 +- {BBF27339-C7B6-4F52-B742-897796C1F13B}.Ncat Static|Win32.ActiveCfg = Release|Win32 +- {BBF27339-C7B6-4F52-B742-897796C1F13B}.Ncat Static|Win32.Build.0 = Release|Win32 +- {BBF27339-C7B6-4F52-B742-897796C1F13B}.Ncat Static|x64.ActiveCfg = Release|Win32 +- {BBF27339-C7B6-4F52-B742-897796C1F13B}.Release|Win32.ActiveCfg = Release|Win32 +- {BBF27339-C7B6-4F52-B742-897796C1F13B}.Release|Win32.Build.0 = Release|Win32 +- {BBF27339-C7B6-4F52-B742-897796C1F13B}.Release|x64.ActiveCfg = Release|Win32 +- {BBF27339-C7B6-4F52-B742-897796C1F13B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 +- {BBF27339-C7B6-4F52-B742-897796C1F13B}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 +- {BBF27339-C7B6-4F52-B742-897796C1F13B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 +- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32 +- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32 +- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64 +- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64 +- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Ncat Static|Win32.ActiveCfg = Release|Win32 +- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Ncat Static|Win32.Build.0 = Release|Win32 +- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Ncat Static|x64.ActiveCfg = Release|x64 +- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Ncat Static|x64.Build.0 = Release|x64 +- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32 +- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32 +- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64 +- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64 +- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32 +- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32 +- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64 +- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64 +- {ED957342-E43B-496E-92D9-4C76B525BDF5}.Debug|Win32.ActiveCfg = Debug|Win32 +- {ED957342-E43B-496E-92D9-4C76B525BDF5}.Debug|Win32.Build.0 = Debug|Win32 +- {ED957342-E43B-496E-92D9-4C76B525BDF5}.Debug|x64.ActiveCfg = Debug|Win32 +- {ED957342-E43B-496E-92D9-4C76B525BDF5}.Ncat Static|Win32.ActiveCfg = Debug|Win32 +- {ED957342-E43B-496E-92D9-4C76B525BDF5}.Ncat Static|Win32.Build.0 = Debug|Win32 +- {ED957342-E43B-496E-92D9-4C76B525BDF5}.Ncat Static|x64.ActiveCfg = Release|Win32 +- {ED957342-E43B-496E-92D9-4C76B525BDF5}.Release|Win32.ActiveCfg = Release|Win32 +- {ED957342-E43B-496E-92D9-4C76B525BDF5}.Release|Win32.Build.0 = Release|Win32 +- {ED957342-E43B-496E-92D9-4C76B525BDF5}.Release|x64.ActiveCfg = Release|Win32 +- {ED957342-E43B-496E-92D9-4C76B525BDF5}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 +- {ED957342-E43B-496E-92D9-4C76B525BDF5}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 +- {ED957342-E43B-496E-92D9-4C76B525BDF5}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 +- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32 +- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32 +- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64 +- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64 +- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Ncat Static|Win32.ActiveCfg = Release|Win32 +- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Ncat Static|Win32.Build.0 = Release|Win32 +- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Ncat Static|x64.ActiveCfg = Release|x64 +- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Ncat Static|x64.Build.0 = Release|x64 +- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32 +- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32 +- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64 +- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64 +- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32 +- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32 +- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64 +- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64 ++ {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 ++ {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection ++ GlobalSection(ExtensibilityGlobals) = postSolution ++ SolutionGuid = {DAA6BF7B-6F78-4BE7-A3FC-3B1BD73676C3} ++ EndGlobalSection + EndGlobal +diff --git a/mswin32/nmap.vcxproj b/mswin32/nmap.vcxproj +index a3abbc6..d5e1977 100644 +--- a/mswin32/nmap.vcxproj ++++ b/mswin32/nmap.vcxproj +@@ -5,10 +5,18 @@ + Debug + Win32 + ++ ++ Debug ++ x64 ++ + + Release + Win32 + ++ ++ Release ++ x64 ++ + + + {361719F0-AB42-4C93-9DE8-7D2144B96625} +@@ -21,12 +29,24 @@ + MultiByte + v120 + ++ ++ Application ++ false ++ MultiByte ++ v120 ++ + + Application + false + MultiByte + v120 + ++ ++ Application ++ false ++ MultiByte ++ v120 ++ + + + +@@ -34,10 +54,18 @@ + + + ++ ++ ++ ++ + + + + ++ ++ ++ ++ + + + <_ProjectFileVersion>10.0.30319.1 +@@ -76,7 +104,7 @@ + false + + +- liblua.lib;nsock.lib;libpcre.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibstat.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libeay32.lib;ssleay32.lib;shell32.lib;libnetutil.lib ++ liblua.lib;nsock.lib;pcred.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibd.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libssl.lib;libcrypto.lib;shell32.lib;libnetutil.lib + .\Debug\nmap.exe + true + ..\libssh2\win32\Release_dll;lib;..\liblua;..\libpcre;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc11\x86\ZlibStatRelease;%(AdditionalLibraryDirectories) +@@ -91,8 +119,57 @@ + MachineX86 + + +- xcopy "$(SolutionDir)..\scripts" ".\$(Configuration)\scripts\" /e /y && xcopy "$(SolutionDir)..\nselib\*.lua" "$(SolutionDir)\$(Configuration)\nselib\" /y && xcopy /s /e "$(SolutionDir)..\nselib\data\*.*" "$(SolutionDir)\$(Configuration)\nselib\data\" /y && xcopy "$(SolutionDir)\..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(SolutionDir)\$(Configuration)\" /y && xcopy "$(SolutionDir)..\nse_main.lua" "$(SolutionDir)\$(Configuration)\" /y +-xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(ProjectDir)$(OutDir)" ++ xcopy "$(SolutionDir)..\scripts" ".\$(Configuration)\scripts\" /e /y && xcopy "$(SolutionDir)..\nselib\*.lua" "$(SolutionDir)\$(Configuration)\nselib\" /y && xcopy /s /e "$(SolutionDir)..\nselib\data\*.*" "$(SolutionDir)\$(Configuration)\nselib\data\" /y && xcopy "$(SolutionDir)..\nse_main.lua" "$(SolutionDir)\$(Configuration)\" /y ++ ++ ++ $(IntDir)%(Filename).res ++ ++ ++ ++ ++ .\Debug/nmap.tlb ++ ++ ++ ++ ++ Disabled ++ .;..;..\liblua;..\nbase;..\libpcre;..\nsock\include;pcap-include;..\libdnet-stripped\include;..\..\nmap-mswin32-aux\OpenSSL\include;..\liblinear;..\libssh2\include;..\libz;%(AdditionalIncludeDirectories) ++ WIN32;_CONSOLE;%(PreprocessorDefinitions) ++ ..\libssh2\include;.;..;..\liblua;..\nbase;..\libpcre;..\nsock\include;pcap-include;..\libdnet-stripped\include;..\..\nmap-mswin32-aux\OpenSSL\include;..\liblinear;%(AdditionalIncludeDirectories) ++ WIN32;_CONSOLE;BPF_MAJOR_VERSION;%(PreprocessorDefinitions) ++ false ++ false ++ false ++ EnableFastChecks ++ ++ ++ .\Debug/nmap.pch ++ .\Debug/ ++ .\Debug/ ++ .\Debug/ ++ Level2 ++ true ++ ProgramDatabase ++ CompileAsCpp ++ MultiThreadedDebugDLL ++ false ++ ++ ++ liblua.lib;nsock.lib;pcred.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibd.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libssl.lib;libcrypto.lib;shell32.lib;libnetutil.lib ++ .\Debug\nmap.exe ++ true ++ ..\libssh2\win32\Release_dll;lib;..\liblua\x64\Debug;..\libpcre\x64\Debug;..\nsock\x64\Debug;..\nbase\x64\Debug;..\libdnet-stripped\x64\Debug;..\libnetutil\x64\Debug;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear\x64\Debug;..\libz\contrib\vstudio\vc11\x86\ZlibStatRelease;%(AdditionalLibraryDirectories) ++ %(IgnoreSpecificDefaultLibraries) ++ packet.dll;wpcap.dll;iphlpapi.dll;%(DelayLoadDLLs) ++ true ++ .\Debug/nmap.pdb ++ Console ++ false ++ ++ ++ ++ ++ xcopy "$(SolutionDir)..\scripts" ".\$(Configuration)\scripts\" /e /y && xcopy "$(SolutionDir)..\nselib\*.lua" "$(SolutionDir)\$(Configuration)\nselib\" /y && xcopy /s /e "$(SolutionDir)..\nselib\data\*.*" "$(SolutionDir)\$(Configuration)\nselib\data\" /y && xcopy "$(SolutionDir)..\nse_main.lua" "$(SolutionDir)\$(Configuration)\" /y + + + $(IntDir)%(Filename).res +@@ -121,7 +198,7 @@ xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(Proje + CompileAsCpp + + +- liblua.lib;nsock.lib;libpcre.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibstat.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libeay32.lib;ssleay32.lib;shell32.lib;libnetutil.lib ++ liblua.lib;nsock.lib;pcre.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlib.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libssl.lib;libcrypto.lib;shell32.lib;libnetutil.lib + .\Release/nmap.exe + true + ..\libssh2\win32\Release_dll;lib;..\liblua;..\libpcre;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc11\x86\ZlibStatRelease;%(AdditionalLibraryDirectories) +@@ -135,8 +212,46 @@ xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(Proje + /LTCG %(AdditionalOptions) + + +- xcopy "$(SolutionDir)..\scripts" ".\$(Configuration)\scripts\" /e /y && xcopy "$(SolutionDir)..\nselib\*.lua" "$(SolutionDir)\$(Configuration)\nselib\" /y && xcopy /s /e "$(SolutionDir)..\nselib\data\*.*" "$(SolutionDir)\$(Configuration)\nselib\data\" /y && xcopy "$(SolutionDir)\..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(SolutionDir)\$(Configuration)\" /y && xcopy "$(SolutionDir)..\nse_main.lua" "$(SolutionDir)\$(Configuration)\" /y +-xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(ProjectDir)$(OutDir)" ++ xcopy "$(SolutionDir)..\scripts" ".\$(Configuration)\scripts\" /e /y && xcopy "$(SolutionDir)..\nselib\*.lua" "$(SolutionDir)\$(Configuration)\nselib\" /y && xcopy /s /e "$(SolutionDir)..\nselib\data\*.*" "$(SolutionDir)\$(Configuration)\nselib\data\" /y && xcopy "$(SolutionDir)..\nse_main.lua" "$(SolutionDir)\$(Configuration)\" /y ++ ++ ++ ++ ++ .\Release/nmap.tlb ++ ++ ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ .;..;..\liblua;..\nbase;..\libpcre;..\nsock\include;pcap-include;..\libdnet-stripped\include;..\..\nmap-mswin32-aux\OpenSSL\include;..\liblinear;..\libssh2\include;..\libz;%(AdditionalIncludeDirectories) ++ WIN32;_CONSOLE;BPF_MAJOR_VERSION;%(PreprocessorDefinitions) ++ true ++ true ++ ++ ++ .\Release/nmap.pch ++ .\Release/ ++ .\Release/ ++ .\Release/ ++ true ++ CompileAsCpp ++ ++ ++ liblua.lib;nsock.lib;pcre.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlib.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libssl.lib;libcrypto.lib;shell32.lib;libnetutil.lib ++ .\Release/nmap.exe ++ true ++ ..\libssh2\win32\Release_dll;lib;..\liblua\x64\Release;..\libpcre;..\nsock\x64\Release;..\nbase\x64\Release;..\libdnet-stripped\x64\Release;..\libnetutil\x64\Release;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear\x64\Release;..\libz\contrib\vstudio\vc11\x86\ZlibStatRelease;%(AdditionalLibraryDirectories) ++ %(IgnoreSpecificDefaultLibraries) ++ packet.dll;wpcap.dll;iphlpapi.dll;%(DelayLoadDLLs) ++ .\Release/nmap.pdb ++ Console ++ true ++ true ++ /LTCG %(AdditionalOptions) ++ ++ ++ xcopy "$(SolutionDir)..\scripts" ".\$(Configuration)\scripts\" /e /y && xcopy "$(SolutionDir)..\nselib\*.lua" "$(SolutionDir)\$(Configuration)\nselib\" /y && xcopy /s /e "$(SolutionDir)..\nselib\data\*.*" "$(SolutionDir)\$(Configuration)\nselib\data\" /y && xcopy "$(SolutionDir)..\nse_main.lua" "$(SolutionDir)\$(Configuration)\" /y + + + +@@ -191,7 +306,9 @@ xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(Proje + + + Sync ++ Sync + Sync ++ Sync + + + +@@ -251,83 +368,147 @@ xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(Proje + + + Copying %(Filename) to output directory... ++ Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul ++ ++ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) ++ $(TargetDir)%(Filename);%(Outputs) + Copying %(Filename) to output directory... ++ Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul ++ ++ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) ++ $(TargetDir)%(Filename);%(Outputs) + + + Copying %(Filename) to output directory... ++ Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul ++ ++ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) ++ $(TargetDir)%(Filename);%(Outputs) + Copying %(Filename) to output directory... ++ Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul ++ ++ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) ++ $(TargetDir)%(Filename);%(Outputs) + + + Copying %(Filename) to output directory... ++ Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul ++ ++ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) ++ $(TargetDir)%(Filename);%(Outputs) + Copying %(Filename) to output directory... ++ Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul ++ ++ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) ++ $(TargetDir)%(Filename);%(Outputs) + + + Copying %(Filename) to output directory... ++ Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul ++ ++ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) ++ $(TargetDir)%(Filename);%(Outputs) + Copying %(Filename) to output directory... ++ Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul ++ ++ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) ++ $(TargetDir)%(Filename);%(Outputs) + + + Copying %(Filename) to output directory... ++ Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul ++ ++ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) ++ $(TargetDir)%(Filename);%(Outputs) + Copying %(Filename) to output directory... ++ Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul ++ ++ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) ++ $(TargetDir)%(Filename);%(Outputs) + + + Copying %(Filename) to output directory... ++ Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul ++ ++ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) ++ $(TargetDir)%(Filename);%(Outputs) + Copying %(Filename) to output directory... ++ Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul ++ ++ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) ++ $(TargetDir)%(Filename);%(Outputs) + + + Copying %(Filename) to output directory... ++ Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul ++ ++ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) ++ $(TargetDir)%(Filename);%(Outputs) + Copying %(Filename) to output directory... ++ Copying %(Filename) to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul ++ ++ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + + $(TargetDir)%(Filename);%(Outputs) ++ $(TargetDir)%(Filename);%(Outputs) + + + Copying %(Filename).xsl to output directory... ++ Copying %(Filename).xsl to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename).xsl" > nul ++ ++ copy /y "%(FullPath)" "$(TargetDir)%(Filename).xsl" > nul + + $(TargetDir)%(Filename).xsl;%(Outputs) ++ $(TargetDir)%(Filename).xsl;%(Outputs) + Copying %(Filename).xsl to output directory... ++ Copying %(Filename).xsl to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename).xsl" > nul ++ ++ copy /y "%(FullPath)" "$(TargetDir)%(Filename).xsl" > nul + + $(TargetDir)%(Filename).xsl;%(Outputs) ++ $(TargetDir)%(Filename).xsl;%(Outputs) + + + +@@ -339,18 +520,6 @@ xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(Proje + {31fb0767-a71f-4575-8379-002d72b8af86} + false + +- +- {5de86c7a-de72-4265-8807-4ca38f94f22a} +- false +- +- +- {ed957342-e43b-496e-92d9-4c76b525bdf5} +- false +- false +- false +- true +- false +- + + {b630c8f7-3138-43e8-89ed-78742fa2ac5f} + false +diff --git a/nbase/nbase.vcxproj b/nbase/nbase.vcxproj +index 948d7c8..b600c7b 100644 +--- a/nbase/nbase.vcxproj ++++ b/nbase/nbase.vcxproj +@@ -5,14 +5,26 @@ + Debug + Win32 + ++ ++ Debug ++ x64 ++ + + Release + Win32 + ++ ++ Release ++ x64 ++ + + Static + Win32 + ++ ++ Static ++ x64 ++ + + + {B630C8F7-3138-43E8-89ED-78742FA2AC5F} +@@ -25,16 +37,31 @@ + MultiByte + v120 + ++ ++ StaticLibrary ++ MultiByte ++ v120 ++ + + StaticLibrary + MultiByte + v120 + ++ ++ StaticLibrary ++ MultiByte ++ v120 ++ + + StaticLibrary + MultiByte + v120 + ++ ++ StaticLibrary ++ MultiByte ++ v120 ++ + + + +@@ -42,14 +69,26 @@ + + + ++ ++ ++ ++ + + + + ++ ++ ++ ++ + + + + ++ ++ ++ ++ + + + <_ProjectFileVersion>10.0.30319.1 +@@ -76,6 +115,21 @@ + $(OutDir)nbase.lib + + ++ ++ ++ Disabled ++ WIN32;_LIB;%(PreprocessorDefinitions) ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ $(OutDir)nbase.lib ++ ++ + + + /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) +@@ -89,6 +143,19 @@ + $(OutDir)nbase.lib + + ++ ++ ++ /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) ++ WIN32;_LIB;%(PreprocessorDefinitions) ++ ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ $(OutDir)nbase.lib ++ ++ + + + /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) +@@ -103,6 +170,20 @@ + $(OutDir)nbase.lib + + ++ ++ ++ /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) ++ WIN32;_LIB;%(PreprocessorDefinitions) ++ MultiThreaded ++ ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ $(OutDir)nbase.lib ++ ++ + + + +diff --git a/ncat/ncat.vcxproj b/ncat/ncat.vcxproj +index fc44dfa..e066b29 100644 +--- a/ncat/ncat.vcxproj ++++ b/ncat/ncat.vcxproj +@@ -5,14 +5,26 @@ + Debug + Win32 + ++ ++ Debug ++ x64 ++ + + Release + Win32 + ++ ++ Release ++ x64 ++ + + Static + Win32 + ++ ++ Static ++ x64 ++ + + + {C1E04411-E021-468B-83F1-CB624BBA7589} +@@ -25,18 +37,36 @@ + MultiByte + v120 + ++ ++ Application ++ false ++ MultiByte ++ v120 ++ + + Application + false + MultiByte + v120 + ++ ++ Application ++ false ++ MultiByte ++ v120 ++ + + Application + false + MultiByte + v120 + ++ ++ Application ++ false ++ MultiByte ++ v120 ++ + + + +@@ -44,26 +74,41 @@ + + + ++ ++ ++ ++ + + + + ++ ++ ++ ++ + + + + ++ ++ ++ ++ + + + <_ProjectFileVersion>10.0.30319.1 + .\$(Configuration)\ + .\$(Configuration)\ + true ++ true + .\Release\ + .\Release\ + .\Release\ + .\Release\ + true ++ true + true ++ true + + + +@@ -111,6 +156,51 @@ + xcopy "..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(Configuration)\" /y + + ++ ++ ++ .\Debug/ncat.tlb ++ ++ ++ ++ ++ Disabled ++ .;..;../nbase;..\nsock\include;..\mswin32\pcap-include;..\..\nmap-mswin32-aux\OpenSSL\include;..\liblua;%(AdditionalIncludeDirectories) ++ WIN32;_CONSOLE;%(PreprocessorDefinitions) ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ .\Debug/ncat.pch ++ .\Debug/ ++ .\Debug/ ++ .\Debug/ ++ Level2 ++ true ++ ProgramDatabase ++ CompileAsCpp ++ ++ ++ ++ ++ ++ ++ nbase.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;nsock.lib;advapi32.lib;libcrypto.lib;libssl.lib;liblua.lib ++ .\Debug\ncat.exe ++ true ++ ..\mswin32\lib;..\nsock;..\nbase;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblua;%(AdditionalLibraryDirectories) ++ %(IgnoreSpecificDefaultLibraries) ++ wpcap.dll;%(DelayLoadDLLs) ++ true ++ .\Debug/ncat.pdb ++ Console ++ false ++ ++ ++ ++ ++ xcopy "..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(Configuration)\" /y ++ ++ + + + .\Release/ncat.tlb +@@ -151,6 +241,45 @@ + xcopy "..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(Configuration)\" /y + + ++ ++ ++ .\Release/ncat.tlb ++ ++ ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ .;..;../nbase;..\nsock\include;..\mswin32\pcap-include;..\..\nmap-mswin32-aux\OpenSSL\include;..\liblua;%(AdditionalIncludeDirectories) ++ WIN32;_CONSOLE;%(PreprocessorDefinitions) ++ true ++ true ++ ++ ++ .\Release/ncat.pch ++ .\Release/ ++ .\Release/ ++ .\Release/ ++ Level2 ++ true ++ CompileAsCpp ++ ++ ++ nsock.lib;nbase.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;advapi32.lib;libcrypto.lib;libssl.lib ++ .\Release/ncat.exe ++ true ++ ..\mswin32\lib;..\nsock;..\nbase;..\..\nmap-mswin32-aux\OpenSSL\lib;%(AdditionalLibraryDirectories) ++ %(IgnoreSpecificDefaultLibraries) ++ wpcap.dll;%(DelayLoadDLLs) ++ .\Release/ncat.pdb ++ Console ++ true ++ true ++ ++ ++ xcopy "..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(Configuration)\" /y ++ ++ + + + .\Release/ncat.tlb +@@ -193,6 +322,47 @@ + + + ++ ++ ++ .\Release/ncat.tlb ++ ++ ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ .;..;../nbase;..\nsock\include;..\mswin32\pcap-include;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories) ++ WIN32;_CONSOLE;%(PreprocessorDefinitions) ++ true ++ MultiThreaded ++ true ++ ++ ++ .\Release/ncat.pch ++ .\Release/ ++ .\Release/ ++ .\Release/ ++ Level2 ++ true ++ CompileAsCpp ++ ++ ++ nsock.lib;nbase.lib;ws2_32.lib;IPHlpAPI.Lib;advapi32.lib;libssl.lib;libcrypto.lib;user32.lib;gdi32.lib ++ .\Release/ncat.exe ++ true ++ ..\mswin32\lib;..\nsock;..\nbase;..\..\nmap-mswin32-aux\OpenSSL\lib;%(AdditionalLibraryDirectories) ++ %(IgnoreSpecificDefaultLibraries) ++ %(DelayLoadDLLs) ++ .\Release/ncat.pdb ++ Console ++ true ++ true ++ ++ ++ ++ ++ ++ + + + +@@ -230,17 +400,29 @@ + + + Copying %(Filename).crt to output directory... ++ Copying %(Filename).crt to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename).crt" > nul ++ ++ copy /y "%(FullPath)" "$(TargetDir)%(Filename).crt" > nul + + $(TargetDir)%(Filename).crt;%(Outputs) ++ $(TargetDir)%(Filename).crt;%(Outputs) + Copying %(Filename).crt to output directory... ++ Copying %(Filename).crt to output directory... + Copying %(Filename).crt to output directory... ++ Copying %(Filename).crt to output directory... + copy /y "%(FullPath)" "$(TargetDir)%(Filename).crt" > nul ++ ++ copy /y "%(FullPath)" "$(TargetDir)%(Filename).crt" > nul + + copy /y "%(FullPath)" "$(TargetDir)%(Filename).crt" > nul ++ ++ copy /y "%(FullPath)" "$(TargetDir)%(Filename).crt" > nul + + $(TargetDir)%(Filename).crt;%(Outputs) ++ $(TargetDir)%(Filename).crt;%(Outputs) + $(TargetDir)%(Filename).crt;%(Outputs) ++ $(TargetDir)%(Filename).crt;%(Outputs) + + + +diff --git a/nping/nping.vcxproj b/nping/nping.vcxproj +index 57bd4ed..fa7a604 100644 +--- a/nping/nping.vcxproj ++++ b/nping/nping.vcxproj +@@ -5,10 +5,18 @@ + Debug + Win32 + ++ ++ Debug ++ x64 ++ + + Release + Win32 + ++ ++ Release ++ x64 ++ + + + {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36} +@@ -21,12 +29,24 @@ + MultiByte + v120 + ++ ++ Application ++ false ++ MultiByte ++ v120 ++ + + Application + false + MultiByte + v120 + ++ ++ Application ++ false ++ MultiByte ++ v120 ++ + + + +@@ -34,19 +54,29 @@ + + + ++ ++ ++ ++ + + + + ++ ++ ++ ++ + + + <_ProjectFileVersion>10.0.30319.1 + .\$(Configuration)\ + .\$(Configuration)\ + true ++ true + .\Release\ + .\Release\ + true ++ true + + + +@@ -93,6 +123,50 @@ + xcopy "..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(SolutionDir)\$(Configuration)\" /y + + ++ ++ ++ .\Debug/nmap.tlb ++ ++ ++ ++ ++ Disabled ++ .;..;..\mswin32;../nbase;..\nsock\include;..\mswin32\pcap-include;..\libdnet-stripped\include;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories) ++ WIN32;_CONSOLE;BPF_MAJOR_VERSION;%(PreprocessorDefinitions) ++ false ++ false ++ false ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ .\Debug/nmap.pch ++ .\Debug/ ++ .\Debug/ ++ .\Debug/ ++ Level2 ++ true ++ ProgramDatabase ++ CompileAsCpp ++ ++ ++ nsock.lib;nbase.lib;libdnet-stripped.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libssl.lib;libcrypto.lib;shell32.lib;libnetutil.lib ++ .\Debug\nping.exe ++ true ++ ..\mswin32\lib;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;%(AdditionalLibraryDirectories) ++ %(IgnoreSpecificDefaultLibraries) ++ packet.dll;wpcap.dll;iphlpapi.dll;%(DelayLoadDLLs) ++ true ++ .\Debug/nmap.pdb ++ Console ++ false ++ ++ ++ ++ ++ xcopy "..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(SolutionDir)\$(Configuration)\" /y ++ ++ + + + .\Release/nmap.tlb +@@ -132,6 +206,44 @@ + xcopy "..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(SolutionDir)\$(Configuration)\" /y + + ++ ++ ++ .\Release/nmap.tlb ++ ++ ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ .;..;..\mswin32;../nbase;..\nsock\include;..\mswin32\pcap-include;..\libdnet-stripped\include;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories) ++ WIN32;_CONSOLE;BPF_MAJOR_VERSION;%(PreprocessorDefinitions) ++ true ++ true ++ ++ ++ .\Release/nping.pch ++ .\Release/ ++ .\Release/ ++ .\Release/ ++ true ++ CompileAsCpp ++ ++ ++ nsock.lib;nbase.lib;libdnet-stripped.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libssl.lib;libcrypto.lib;shell32.lib;libnetutil.lib ++ .\Release/nping.exe ++ true ++ ..\mswin32\lib;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;%(AdditionalLibraryDirectories) ++ %(IgnoreSpecificDefaultLibraries) ++ packet.dll;wpcap.dll;iphlpapi.dll;%(DelayLoadDLLs) ++ .\Release/nping.pdb ++ Console ++ true ++ true ++ ++ ++ xcopy "..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(SolutionDir)\$(Configuration)\" /y ++ ++ + + + +diff --git a/nsock/nsock.vcxproj b/nsock/nsock.vcxproj +index 36feb48..f720258 100644 +--- a/nsock/nsock.vcxproj ++++ b/nsock/nsock.vcxproj +@@ -5,22 +5,42 @@ + DebugNoPcap + Win32 + ++ ++ DebugNoPcap ++ x64 ++ + + Debug + Win32 + ++ ++ Debug ++ x64 ++ + + ReleaseNoPcap + Win32 + ++ ++ ReleaseNoPcap ++ x64 ++ + + Release + Win32 + ++ ++ Release ++ x64 ++ + + Static + Win32 + ++ ++ Static ++ x64 ++ + + + {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4} +@@ -33,26 +53,51 @@ + MultiByte + v120 + ++ ++ StaticLibrary ++ MultiByte ++ v120 ++ + + StaticLibrary + MultiByte + v120 + ++ ++ StaticLibrary ++ MultiByte ++ v120 ++ + + StaticLibrary + MultiByte + v120 + ++ ++ StaticLibrary ++ MultiByte ++ v120 ++ + + StaticLibrary + MultiByte + v120 + ++ ++ StaticLibrary ++ MultiByte ++ v120 ++ + + StaticLibrary + MultiByte + v120 + ++ ++ StaticLibrary ++ MultiByte ++ v120 ++ + + + +@@ -60,22 +105,42 @@ + + + ++ ++ ++ ++ + + + + ++ ++ ++ ++ + + + + ++ ++ ++ ++ + + + + ++ ++ ++ ++ + + + + ++ ++ ++ ++ + + + <_ProjectFileVersion>10.0.30319.1 +@@ -110,6 +175,25 @@ + $(OutDir)nsock.lib + + ++ ++ ++ Disabled ++ ..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories) ++ WIN32;_LIB;%(PreprocessorDefinitions) ++ ++ ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsCpp ++ ++ ++ $(OutDir)nsock.lib ++ ++ + + + /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) +@@ -127,6 +211,23 @@ + $(OutDir)nsock.lib + + ++ ++ ++ /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) ++ ..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories) ++ WIN32;_LIB;%(PreprocessorDefinitions) ++ ++ ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsCpp ++ ++ ++ $(OutDir)nsock.lib ++ ++ + + + /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) +@@ -145,6 +246,24 @@ + $(OutDir)nsock.lib + + ++ ++ ++ /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) ++ ..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories) ++ WIN32;_LIB;%(PreprocessorDefinitions);DISABLE_NSOCK_PCAP ++ ++ ++ MultiThreaded ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsCpp ++ ++ ++ $(OutDir)nsock.lib ++ ++ + + + /D "DISABLE_NSOCK_PCAP" %(AdditionalOptions) +@@ -166,9 +285,47 @@ + $(OutDir)nsock.lib + + ++ ++ ++ /D "DISABLE_NSOCK_PCAP" %(AdditionalOptions) ++ Disabled ++ ..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories) ++ WIN32;_LIB;%(PreprocessorDefinitions) ++ ++ ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsCpp ++ ++ ++ $(OutDir)nsock.lib ++ ++ + + + /D "_CRT_SECURE_NO_DEPRECATE" ++/D "DISABLE_NSOCK_PCAP" %(AdditionalOptions) ++ ..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories) ++ WIN32;_LIB;%(PreprocessorDefinitions) ++ ++ ++ ++ ++ Level3 ++ ProgramDatabase ++ CompileAsCpp ++ ++ ++ $(OutDir)nsock.lib ++ ++ ++ ++ ++ /D "_CRT_SECURE_NO_DEPRECATE" + /D "DISABLE_NSOCK_PCAP" %(AdditionalOptions) + ..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories) + WIN32;_LIB;%(PreprocessorDefinitions) diff --git a/externals/vcpkg/ports/nmap/fix-snprintf.patch b/externals/vcpkg/ports/nmap/fix-snprintf.patch new file mode 100755 index 000000000..aafd1cfe9 --- /dev/null +++ b/externals/vcpkg/ports/nmap/fix-snprintf.patch @@ -0,0 +1,39 @@ +diff --git a/libdnet-stripped/include/dnet_winconfig.h b/libdnet-stripped/include/dnet_winconfig.h +index e41907c..82bc595 100644 +--- a/libdnet-stripped/include/dnet_winconfig.h ++++ b/libdnet-stripped/include/dnet_winconfig.h +@@ -277,7 +277,7 @@ int strlcpy(char *, const char *, int); + char *strsep(char **, const char *); + #endif + +-#define snprintf _snprintf ++//#define snprintf _snprintf + + /* Without this, Windows will give us all sorts of crap about using functions + like strcpy() even if they are done safely */ +diff --git a/nbase/nbase.h b/nbase/nbase.h +index 0ecd9bc..c0eb395 100644 +--- a/nbase/nbase.h ++++ b/nbase/nbase.h +@@ -359,7 +359,7 @@ extern "C" int vsnprintf (char *, size_t, const char *, va_list); + #define putenv _putenv + + #if !defined(__GNUC__) +-#define snprintf _snprintf ++//#define snprintf _snprintf + #endif + + #define strcasecmp _stricmp +diff --git a/nse_libssh2.cc b/nse_libssh2.cc +index bf721b6..1fafe7f 100644 +--- a/nse_libssh2.cc ++++ b/nse_libssh2.cc +@@ -58,7 +58,7 @@ struct ssh_userdata { + + + #if defined(_MSC_VER) && _MSC_VER < 1900 +-#define snprintf c99_snprintf ++//#define snprintf c99_snprintf + #define vsnprintf c99_vsnprintf + + __inline int c99_vsnprintf(char *outBuf, size_t size, const char *format, va_list ap) { diff --git a/externals/vcpkg/ports/nmap/fix-ssize_t.patch b/externals/vcpkg/ports/nmap/fix-ssize_t.patch new file mode 100755 index 000000000..36103a8c2 --- /dev/null +++ b/externals/vcpkg/ports/nmap/fix-ssize_t.patch @@ -0,0 +1,16 @@ +diff --git a/libdnet-stripped/include/dnet/os.h b/libdnet-stripped/include/dnet/os.h +index 55a21b9..544ebd8 100644 +--- a/libdnet-stripped/include/dnet/os.h ++++ b/libdnet-stripped/include/dnet/os.h +@@ -23,7 +23,11 @@ + typedef u_short uint16_t; + typedef u_int uint32_t; + # ifndef __CYGWIN__ ++#ifdef _WIN64 ++ typedef __int64 ssize_t; ++#else + typedef long ssize_t; ++#endif + # endif + #else + # include diff --git a/externals/vcpkg/ports/nmap/portfile.cmake b/externals/vcpkg/ports/nmap/portfile.cmake new file mode 100755 index 000000000..c0252af8d --- /dev/null +++ b/externals/vcpkg/ports/nmap/portfile.cmake @@ -0,0 +1,120 @@ +# nmap is a tools, so ignor POST_CHECK +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_download_distfile(ARCHIVE + URLS "https://nmap.org/dist/nmap-7.70.tar.bz2" + FILENAME "nmap-7.70.tar.bz2" + SHA512 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5 +) + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + fix-snprintf.patch + fix-ssize_t.patch + fix-msvc-prj.patch + ) + list(APPEND DEL_PROJS "libpcap" "libpcre" "libssh2" "libz") + foreach (DEL_PROJ ${DEL_PROJS}) + file(REMOVE_RECURSE ${SOURCE_PATH}/${DEL_PROJ}) + endforeach() + + # Clear + vcpkg_execute_required_process( + COMMAND "devenv.exe" + "nmap.sln" + /Clean + WORKING_DIRECTORY ${SOURCE_PATH}/mswin32 + ) + + # Uprade + message(STATUS "Upgrade solution...") + vcpkg_execute_required_process( + COMMAND "devenv.exe" + "nmap.sln" + /Upgrade + WORKING_DIRECTORY ${SOURCE_PATH}/mswin32 + LOGNAME upgrade-Packet-${TARGET_TRIPLET} + ) + # Build + vcpkg_build_msbuild( + PROJECT_PATH ${SOURCE_PATH}/mswin32/nmap.vcxproj + PLATFORM ${MSBUILD_PLATFORM} + USE_VCPKG_INTEGRATION + ) + + # Install + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL Release) + file(INSTALL ${SOURCE_PATH}/mswin32/Release/nmap.exe + ${SOURCE_PATH}/mswin32/Release/nmap.pdb + DESTINATION ${CURRENT_PACKAGES_DIR}/tools) + endif() + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL Debug) + file(INSTALL ${SOURCE_PATH}/mswin32/Debug/nmap.exe + ${SOURCE_PATH}/mswin32/Debug/nmap.pdb + DESTINATION ${CURRENT_PACKAGES_DIR}/tools) + endif() +else() + set(ENV{LDFLAGS} "$ENV{LDFLAGS} -pthread") + set(OPTIONS --without-nmap-update --with-openssl=${CURRENT_INSTALLED_DIR} --with-libssh2=${CURRENT_INSTALLED_DIR} --with-libz=${CURRENT_INSTALLED_DIR} --with-libpcre=${CURRENT_INSTALLED_DIR}) + message(STATUS "Building Options: ${OPTIONS}") + + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL Release) + # Since nmap makefile has strong relationshop with codes, copy codes to obj path + message(STATUS "Configuring ${TARGET_TRIPLET}-rel") + vcpkg_extract_source_archive(source_path_release + ARCHIVE "${ARCHIVE}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + ) + + vcpkg_execute_required_process( + COMMAND "./configure" ${OPTIONS} + WORKING_DIRECTORY "${source_path_release}" + LOGNAME config-${TARGET_TRIPLET}-rel + ) + + message(STATUS "Building ${TARGET_TRIPLET}-rel") + vcpkg_execute_required_process( + COMMAND make + WORKING_DIRECTORY "${source_path_release}" + LOGNAME build-${TARGET_TRIPLET}-rel + ) + + message(STATUS "Installing ${TARGET_TRIPLET}-rel") + file(INSTALL ${source_path_release}/nmap DESTINATION ${CURRENT_PACKAGES_DIR}/tools) + endif() + + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL Debug) + # Since nmap makefile has strong relationshop with codes, copy codes to obj path + message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") + vcpkg_extract_source_archive(source_path_debug + ARCHIVE "${ARCHIVE}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + ) + + vcpkg_execute_required_process( + COMMAND "./configure" ${OPTIONS} + WORKING_DIRECTORY ${source_path_debug} + LOGNAME config-${TARGET_TRIPLET}-dbg + ) + + message(STATUS "Building ${TARGET_TRIPLET}-dbg") + vcpkg_execute_required_process( + COMMAND make + WORKING_DIRECTORY ${source_path_debug} + LOGNAME build-${TARGET_TRIPLET}-dbg + ) + + message(STATUS "Installing ${TARGET_TRIPLET}-dbg") + file(INSTALL ${source_path_release}/nmap DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools) + endif() + + set(SOURCE_PATH "${source_path_release}") +endif() + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/nmap/usage b/externals/vcpkg/ports/nmap/usage new file mode 100755 index 000000000..d910c7d2e --- /dev/null +++ b/externals/vcpkg/ports/nmap/usage @@ -0,0 +1,5 @@ +The package curl is compatible with built-in CMake targets: + + find_package(NMAP REQUIRED) + target_link_libraries(main PRIVATE ${NMAP_LIBRARIES}) + target_include_directories(main PRIVATE ${NMAP_INCLUDE_DIRS}) diff --git a/externals/vcpkg/ports/nmap/vcpkg.json b/externals/vcpkg/ports/nmap/vcpkg.json new file mode 100755 index 000000000..6aba23611 --- /dev/null +++ b/externals/vcpkg/ports/nmap/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "nmap", + "version": "7.70", + "port-version": 5, + "description": "A library for scanning network ports.", + "dependencies": [ + { + "name": "libpcap", + "platform": "!windows" + }, + "libssh2", + "lua", + "openssl", + "pcre", + { + "name": "python2", + "platform": "windows" + }, + { + "name": "winpcap", + "platform": "windows" + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/nmslib/portfile.cmake b/externals/vcpkg/ports/nmslib/portfile.cmake new file mode 100755 index 000000000..a6f6a0bd4 --- /dev/null +++ b/externals/vcpkg/ports/nmslib/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nmslib/nmslib + REF v2.1.1 + SHA512 62BBB965EA4BF1D416ED78231B1BA4B41C0F46327D7BE16D1F98095DB63EF0E0D893B70040009711BC9C68555B1B8C4038F5032ABD66B759E955E2CBB0553EC3 + HEAD_REF master +) + +# TODO: check SSE and AVX availability and set corresponding tags +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/similarity_search" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +# Move headers into separate folder +set(SUBFOLDERS factory method space) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include/nmslib") +foreach(SUBFOLDER ${SUBFOLDERS}) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include/nmslib/${SUBFOLDER}") +endforeach() + +file(GLOB HEADERS "${CURRENT_PACKAGES_DIR}/include/*.h" "${CURRENT_PACKAGES_DIR}/include/*/*.h") +foreach(HEADER ${HEADERS}) + string(REPLACE "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include/nmslib" MOVED_HEADER "${HEADER}") + file(RENAME "${HEADER}" "${MOVED_HEADER}") +endforeach(HEADER ${HEADERS}) + +foreach(SUBFOLDER ${SUBFOLDERS}) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/${SUBFOLDER}/") +endforeach() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Put the license file where vcpkg expects it +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/nmslib/vcpkg.json b/externals/vcpkg/ports/nmslib/vcpkg.json new file mode 100755 index 000000000..eb475f07d --- /dev/null +++ b/externals/vcpkg/ports/nmslib/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "nmslib", + "version": "2.1.1", + "port-version": 1, + "description": "Non-Metric Space Library (NMSLIB) is an efficient similarity search library and a toolkit for evaluation of k-NN methods for generic non-metric spaces.", + "homepage": "https://github.com/searchivarius/nmslib", + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/nng/portfile.cmake b/externals/vcpkg/ports/nng/portfile.cmake new file mode 100755 index 000000000..3dd2b2974 --- /dev/null +++ b/externals/vcpkg/ports/nng/portfile.cmake @@ -0,0 +1,55 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nanomsg/nng + REF v1.5.2 + SHA512 33cda9e0422c6e8cb56e48bd812f381bf07a92a0aa2fbadddbca7cfde585c66299142186a3a76a97163e5570042452a62c1e53180ebfbf016a44eee998b16286 + HEAD_REF master +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + mbedtls NNG_ENABLE_TLS + tools NNG_ENABLE_NNGCAT +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DNNG_TESTS=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/nng) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/nng/nng.h" + "defined(NNG_SHARED_LIB)" + "0 /* defined(NNG_SHARED_LIB) */" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/nng/nng.h" + "!defined(NNG_STATIC_LIB)" + "1 /* !defined(NNG_STATIC_LIB) */" + ) +else() + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/nng/nng.h" + "!defined(NNG_STATIC_LIB)" + "0 /* !defined(NNG_STATIC_LIB) */" + ) +endif() + +if ("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES nngcat AUTO_CLEAN) +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/nng/vcpkg.json b/externals/vcpkg/ports/nng/vcpkg.json new file mode 100755 index 000000000..cdb6da7df --- /dev/null +++ b/externals/vcpkg/ports/nng/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "nng", + "version-semver": "1.5.2", + "description": "nanomsg-next-gen, lightweight messaging library", + "homepage": "https://nng.nanomsg.org", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "mbedtls": { + "description": "nng TLS support", + "dependencies": [ + "mbedtls" + ] + }, + "tools": { + "description": "nng tools (nngcat, for example)" + } + } +} diff --git a/externals/vcpkg/ports/nngpp/portfile.cmake b/externals/vcpkg/ports/nngpp/portfile.cmake new file mode 100755 index 000000000..5da246e55 --- /dev/null +++ b/externals/vcpkg/ports/nngpp/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cwzx/nngpp + REF cc5d2641babab165d8a9943817c46d36c6dc17c2 #v1.3.0 + SHA512 76b78f5b39b24fae3820924abb5c2f8f51f1683c08211366668745196b184ee4b4c9b1fd2fc68e8f234a56b802a4a79249d173d1562af46046d19a4498222405 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DNNGPP_BUILD_DEMOS=OFF + -DNNGPP_BUILD_TESTS=OFF +) + +vcpkg_install_cmake() + +# Move CMake config files to the right place +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + diff --git a/externals/vcpkg/ports/nngpp/vcpkg.json b/externals/vcpkg/ports/nngpp/vcpkg.json new file mode 100755 index 000000000..d7e62a2ea --- /dev/null +++ b/externals/vcpkg/ports/nngpp/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "nngpp", + "version-string": "1.3.0", + "port-version": 1, + "description": "C++ wrapper around the nanomsg NNG API.", + "homepage": "https://github.com/cwzx/nngpp", + "dependencies": [ + "nng" + ] +} diff --git a/externals/vcpkg/ports/nnpack/fix-cmakelists.patch b/externals/vcpkg/ports/nnpack/fix-cmakelists.patch new file mode 100755 index 000000000..bd80f1000 --- /dev/null +++ b/externals/vcpkg/ports/nnpack/fix-cmakelists.patch @@ -0,0 +1,98 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5ecd2df..8565044 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,8 +12,6 @@ SET_PROPERTY(CACHE NNPACK_BACKEND PROPERTY STRINGS auto psimd scalar) + OPTION(NNPACK_CONVOLUTION_ONLY "Build only NNPACK functions for convolutional layer" OFF) + OPTION(NNPACK_INFERENCE_ONLY "Build only NNPACK functions for inference" OFF) + OPTION(NNPACK_CUSTOM_THREADPOOL "Build NNPACK for custom thread pool" OFF) +-SET(NNPACK_LIBRARY_TYPE "default" CACHE STRING "Type of library (shared, static, or default) to build") +-SET_PROPERTY(CACHE NNPACK_LIBRARY_TYPE PROPERTY STRINGS default static shared) + OPTION(NNPACK_BUILD_TESTS "Build NNPACK unit tests" ON) + + # ---[ CMake options +@@ -442,15 +440,7 @@ ELSE() + SET(NNPACK_BACKEND_C_SRCS ${NNPACK_BACKEND_SRCS}) + ENDIF() + +-IF(NNPACK_LIBRARY_TYPE STREQUAL "default") +- ADD_LIBRARY(nnpack ${NNPACK_INIT_SRCS} ${NNPACK_LAYER_SRCS} ${NNPACK_BACKEND_C_SRCS} ${NNPACK_BACKEND_PEACHPY_OBJS}) +-ELSEIF(NNPACK_LIBRARY_TYPE STREQUAL "shared") +- ADD_LIBRARY(nnpack SHARED ${NNPACK_INIT_SRCS} ${NNPACK_LAYER_SRCS} ${NNPACK_BACKEND_C_SRCS} ${NNPACK_BACKEND_PEACHPY_OBJS}) +-ELSEIF(NNPACK_LIBRARY_TYPE STREQUAL "static") +- ADD_LIBRARY(nnpack STATIC ${NNPACK_INIT_SRCS} ${NNPACK_LAYER_SRCS} ${NNPACK_BACKEND_C_SRCS} ${NNPACK_BACKEND_PEACHPY_OBJS}) +-ELSE() +- MESSAGE(FATAL_ERROR "Unsupported NNPACK library type \"${NNPACK_LIBRARY_TYPE}\". Must be \"static\", \"shared\", or \"default\"") +-ENDIF() ++ADD_LIBRARY(nnpack ${NNPACK_INIT_SRCS} ${NNPACK_LAYER_SRCS} ${NNPACK_BACKEND_C_SRCS} ${NNPACK_BACKEND_PEACHPY_OBJS}) + NNPACK_TARGET_ENABLE_C99(nnpack) + IF(IOS OR CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv5te|armv7-a|armv7l)$") + IF(IOS AND NNPACK_BACKEND STREQUAL "neon") +@@ -496,7 +486,7 @@ NNPACK_TARGET_ENABLE_C99(nnpack_reference_layers) + TARGET_INCLUDE_DIRECTORIES(nnpack_reference_layers PUBLIC include) + + # ---[ Configure cpuinfo +-IF(NOT TARGET cpuinfo) ++IF(FALSE) + SET(CPUINFO_BUILD_TOOLS OFF CACHE BOOL "") + SET(CPUINFO_BUILD_UNIT_TESTS OFF CACHE BOOL "") + SET(CPUINFO_BUILD_MOCK_TESTS OFF CACHE BOOL "") +@@ -505,10 +495,11 @@ IF(NOT TARGET cpuinfo) + "${CPUINFO_SOURCE_DIR}" + "${CONFU_DEPENDENCIES_BINARY_DIR}/cpuinfo") + ENDIF() +-TARGET_LINK_LIBRARIES(nnpack PRIVATE cpuinfo) ++find_package(cpuinfo CONFIG REQUIRED) ++target_link_libraries(nnpack PUBLIC cpuinfo::cpuinfo) + + # ---[ Configure pthreadpool +-IF(NOT TARGET pthreadpool) ++IF(FALSE) + SET(PTHREADPOOL_BUILD_TESTS OFF CACHE BOOL "") + SET(PTHREADPOOL_BUILD_BENCHMARKS OFF CACHE BOOL "") + ADD_SUBDIRECTORY( +@@ -525,33 +516,37 @@ ENDIF() + TARGET_LINK_LIBRARIES(nnpack_reference_layers PUBLIC pthreadpool) + + # ---[ Configure FXdiv +-IF(NOT TARGET fxdiv) ++IF(FALSE) + SET(FXDIV_BUILD_TESTS OFF CACHE BOOL "") + SET(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "") + ADD_SUBDIRECTORY( + "${FXDIV_SOURCE_DIR}" + "${CONFU_DEPENDENCIES_BINARY_DIR}/fxdiv") + ENDIF() +-TARGET_LINK_LIBRARIES(nnpack PRIVATE fxdiv) ++find_path(FXDIV_INCLUDE_DIRS "fxdiv.h") ++target_include_directories(nnpack PRIVATE ${FXDIV_INCLUDE_DIRS}) ++ + + # ---[ Configure psimd +-IF(NOT TARGET psimd) ++IF(FALSE) + ADD_SUBDIRECTORY( + "${PSIMD_SOURCE_DIR}" + "${CONFU_DEPENDENCIES_BINARY_DIR}/psimd") + ENDIF() +-TARGET_LINK_LIBRARIES(nnpack PRIVATE psimd) ++find_path(PSIMD_INCLUDE_DIRS "psimd.h") ++target_include_directories(nnpack PRIVATE ${PSIMD_INCLUDE_DIRS}) + + # ---[ Configure FP16 +-IF(NOT TARGET fp16) ++IF(FALSE) + SET(FP16_BUILD_TESTS OFF CACHE BOOL "") + SET(FP16_BUILD_BENCHMARKS OFF CACHE BOOL "") + ADD_SUBDIRECTORY( + "${FP16_SOURCE_DIR}" + "${CONFU_DEPENDENCIES_BINARY_DIR}/fp16") + ENDIF() +-TARGET_LINK_LIBRARIES(nnpack PRIVATE fp16) +-TARGET_LINK_LIBRARIES(nnpack_reference_layers PUBLIC fp16) ++find_path(FP16_INCLUDE_DIRS "fp16.h") ++target_include_directories(nnpack PRIVATE ${FP16_INCLUDE_DIRS}) ++target_include_directories(nnpack_reference_layers PUBLIC ${FP16_INCLUDE_DIRS}) + + INSTALL(TARGETS nnpack + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/externals/vcpkg/ports/nnpack/portfile.cmake b/externals/vcpkg/ports/nnpack/portfile.cmake new file mode 100755 index 000000000..7e3203223 --- /dev/null +++ b/externals/vcpkg/ports/nnpack/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Maratyszcza/nnpack + REF c07e3a0400713d546e0dea2d5466dd22ea389c73 + SHA512 f0b261e8698b412d12dd739e5d0cf71c284965ae28da735ae22814a004358ba3ecaea6cd26fa17b594c0245966b7dd2561c1e05c6cbf0592fd7b85ea0f21eb37 + PATCHES + fix-cmakelists.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DNNPACK_BACKEND=psimd + -DNNPACK_BUILD_TESTS=OFF + -DNNPACK_BUILD_BENCHMARKS=OFF + -DNNPACK_CUSTOM_THREADPOOL=OFF +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/externals/vcpkg/ports/nnpack/vcpkg.json b/externals/vcpkg/ports/nnpack/vcpkg.json new file mode 100755 index 000000000..fe1878175 --- /dev/null +++ b/externals/vcpkg/ports/nnpack/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "nnpack", + "version-date": "2021-02-21", + "port-version": 3, + "description": "Acceleration package for neural networks on multi-core CPUs", + "homepage": "https://github.com/Maratyszcza/NNPACK", + "license": "BSD-2-Clause", + "supports": "linux | osx", + "dependencies": [ + "cpuinfo", + "fp16", + "fxdiv", + "psimd", + "pthreadpool", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/nonius/CMakeLists.txt b/externals/vcpkg/ports/nonius/CMakeLists.txt new file mode 100755 index 000000000..38f213d16 --- /dev/null +++ b/externals/vcpkg/ports/nonius/CMakeLists.txt @@ -0,0 +1,30 @@ +cmake_minimum_required(VERSION 3.9) +cmake_policy(VERSION ${CMAKE_VERSION}) # use default policies of current cmake version + +project(nonius) + +add_library(nonius INTERFACE) +target_include_directories(nonius INTERFACE + $ + $ +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ + DESTINATION include + ) +endif() + +install(TARGETS nonius + EXPORT noniusExport + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install( + EXPORT noniusExport + FILE noniusConfig.cmake + NAMESPACE Nonius:: + DESTINATION share/nonius +) diff --git a/externals/vcpkg/ports/nonius/portfile.cmake b/externals/vcpkg/ports/nonius/portfile.cmake new file mode 100755 index 000000000..9b55dc1a8 --- /dev/null +++ b/externals/vcpkg/ports/nonius/portfile.cmake @@ -0,0 +1,26 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libnonius/nonius + REF 6396b7ad6685843eea63754ffa567dd66353c1a8 + SHA512 3b824a6011f1dbe116271dd76e8214ed98d73dfc215d7c9242bf298eb0e7ee3a3e3198f477b49fdbe098ac6e3e4edd8ca7bd2e03cc2036189bf3630ef3fcdca2 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +# Handle copyright +configure_file(${SOURCE_PATH}/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/nonius/vcpkg.json b/externals/vcpkg/ports/nonius/vcpkg.json new file mode 100755 index 000000000..71fef7a08 --- /dev/null +++ b/externals/vcpkg/ports/nonius/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "nonius", + "version-string": "2019-04-20", + "port-version": 2, + "description": "A C++ micro-benchmarking framework", + "dependencies": [ + "boost-algorithm", + "boost-lexical-cast", + "boost-math" + ] +} diff --git a/externals/vcpkg/ports/nowide/portfile.cmake b/externals/vcpkg/ports/nowide/portfile.cmake new file mode 100755 index 000000000..159486f1c --- /dev/null +++ b/externals/vcpkg/ports/nowide/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/boostorg/nowide/releases/download/v11.1.3/nowide_standalone_v11.1.3.tar.gz" + FILENAME "nowide_standalone_v11.1.3.tar.gz" + SHA512 8e493b9ee7f3f218dcc1a0c2f040c040f8f3d10ec7c204caee92986a2cc54d4fc06f530b13e7b14cfdbbd42fd106e151916e2f8fae524a051688d6785d7c2993 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/nowide) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/nowide/vcpkg.json b/externals/vcpkg/ports/nowide/vcpkg.json new file mode 100755 index 000000000..82269b056 --- /dev/null +++ b/externals/vcpkg/ports/nowide/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "nowide", + "version": "11.1.3", + "description": "Boost nowide module (standalone)", + "homepage": "https://github.com/boostorg/nowide", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/nrf-ble-driver/001-arm64-support.patch b/externals/vcpkg/ports/nrf-ble-driver/001-arm64-support.patch new file mode 100755 index 000000000..2c9705399 --- /dev/null +++ b/externals/vcpkg/ports/nrf-ble-driver/001-arm64-support.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 99daa24..9a18ee5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -259,6 +259,9 @@ endforeach(SD_API_VER) + # Additional special linkage libraries + foreach(SD_API_VER ${SD_API_VERS}) + if(WIN32) ++ # arm64-windows support ++ target_link_libraries(${NRF_BLE_DRIVER_${SD_API_VER}_STATIC_LIB} PRIVATE "advapi32") ++ target_link_libraries(${NRF_BLE_DRIVER_${SD_API_VER}_SHARED_LIB} PRIVATE "advapi32") + elseif(APPLE) + target_link_libraries(${NRF_BLE_DRIVER_${SD_API_VER}_STATIC_LIB} PRIVATE "-framework CoreFoundation" "-framework IOKit") + target_link_libraries(${NRF_BLE_DRIVER_${SD_API_VER}_SHARED_LIB} PRIVATE "-framework CoreFoundation" "-framework IOKit") diff --git a/externals/vcpkg/ports/nrf-ble-driver/portfile.cmake b/externals/vcpkg/ports/nrf-ble-driver/portfile.cmake new file mode 100755 index 000000000..22ae9c4af --- /dev/null +++ b/externals/vcpkg/ports/nrf-ble-driver/portfile.cmake @@ -0,0 +1,52 @@ +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + message( +"${PORT} currently requires the following libraries from the system package manager: + libudev-dev +These can be installed on Ubuntu systems via sudo apt install libudev-dev" + ) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO NordicSemiconductor/pc-ble-driver + REF v4.1.2 + SHA512 625a52151f2c78421e48e90ff60292c6106e8504b55a26c7df716df75e051a40d2ee4a26c57b5daaa370e53a79002fe965aee8a0d8749f7dce380e8e4a617c95 + HEAD_REF master + PATCHES + 001-arm64-support.patch +) + +# Ensure that git is found within CMakeLists.txt by appending vcpkg's git executable dirpath to $PATH. +# Git should always be available as it is downloaded during the bootstrap phase. +# Append instead of prepend to $PATH to honor the user's git executable as a general rule. +find_program(GIT NAMES git git.cmd) +get_filename_component(GIT_EXE_DIRPATH "${GIT}" DIRECTORY) +set(ENV{PATH} "$ENV{PATH};${GIT_EXE_DIRPATH}") + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DDISABLE_EXAMPLES= -DDISABLE_TESTS= -DNRF_BLE_DRIVER_VERSION=4.1.2 -DCONNECTIVITY_VERSION=4.1.2 +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() + +# Copy hex files into shared folder for package +foreach(HEX_DIR IN ITEMS "sd_api_v2" "sd_api_v3" "sd_api_v5" "sd_api_v6") + set(TARGET_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/hex/${HEX_DIR}") + file(MAKE_DIRECTORY ${TARGET_DIRECTORY}) + file(INSTALL "${SOURCE_PATH}/hex/${HEX_DIR}" DESTINATION ${TARGET_DIRECTORY}/..) +endforeach() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/LICENSE) +file(REMOVE ${CURRENT_PACKAGES_DIR}/LICENSE) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/nrf-ble-driver/vcpkg.json b/externals/vcpkg/ports/nrf-ble-driver/vcpkg.json new file mode 100755 index 000000000..07176c466 --- /dev/null +++ b/externals/vcpkg/ports/nrf-ble-driver/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "nrf-ble-driver", + "version-string": "4.1.2", + "port-version": 1, + "description": "BLE driver is a library for Bluetooth Low Energy communication using Nordic Semiconductor development kits.", + "dependencies": [ + "asio", + "catch2", + "cli11", + "spdlog" + ] +} diff --git a/externals/vcpkg/ports/nspr/portfile.cmake b/externals/vcpkg/ports/nspr/portfile.cmake new file mode 100755 index 000000000..80eaa0341 --- /dev/null +++ b/externals/vcpkg/ports/nspr/portfile.cmake @@ -0,0 +1,100 @@ +set(NSPR_VERSION "4.33") + +vcpkg_download_distfile(ARCHIVE + URLS "https://releases.mozilla.org/pub/nspr/releases/v${NSPR_VERSION}/src/nspr-${NSPR_VERSION}.tar.gz" + FILENAME "nspr-${NSPR_VERSION}.tar.gz" + SHA512 8064f826c977f1302a341ca7a7aaf7977b5d10102062c030b1d42b856638e3408ab262447e8c7cfd5a98879b9b1043d17ceae66fbb1e5ed86d6bc3531f26667e +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF "${NSPR_VERSION}" +) + +set(MOZBUILD_ROOT "${CURRENT_HOST_INSTALLED_DIR}/tools/mozbuild") + +set(MOZBUILD_BINDIR "${MOZBUILD_ROOT}/bin") +vcpkg_add_to_path("${MOZBUILD_BINDIR}") + +set(MOZBUILD_MSYS_ROOT "${MOZBUILD_ROOT}/msys") +vcpkg_add_to_path(PREPEND "${MOZBUILD_MSYS_ROOT}") + +set(OPTIONS "") +if (VCPKG_CRT_LINKAGE STREQUAL "dynamic") + list(APPEND OPTIONS "--disable-static-rtl") +else() + list(APPEND OPTIONS "--enable-static-rtl") +endif() + +list(APPEND OPTIONS "--enable-win32-target=win95") + +if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + list(APPEND OPTIONS "--enable-64bit") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + list(APPEND OPTIONS "--disable-64bit") +else() + message(FATAL_ERROR "Unsupported arch: ${VCPKG_TARGET_ARCHITECTURE}") +endif() + +set(OPTIONS_DEBUG + "--enable-debug-rtl" +) + +set(OPTIONS_RELEASE + "--disable-debug-rtl" +) + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + CONFIGURE_ENVIRONMENT_VARIABLES CC CXX LD + PROJECT_SUBPATH "nspr" + OPTIONS ${OPTIONS} + OPTIONS_DEBUG ${OPTIONS_DEBUG} + OPTIONS_RELEASE ${OPTIONS_RELEASE} + DISABLE_VERBOSE_FLAGS +) +vcpkg_install_make() +vcpkg_copy_pdbs() + +# +# VCPKG FHS adjustments +# + +# Release +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(GLOB BIN_RELEASE "${CURRENT_PACKAGES_DIR}/lib/*.dll" "${CURRENT_PACKAGES_DIR}/lib/*.pdb") + list(LENGTH BIN_RELEASE BIN_RELEASE_SIZE) + if (BIN_RELEASE_SIZE GREATER 0) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + + foreach(path ${BIN_RELEASE}) + get_filename_component(name "${path}" NAME) + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/${name}" "${CURRENT_PACKAGES_DIR}/bin/${name}") + endforeach() + endif() +endif() + +# Debug +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + file(GLOB BIN_DEBUG "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll" "${CURRENT_PACKAGES_DIR}/debug/lib/*.pdb") + list(LENGTH BIN_DEBUG BIN_DEBUG_SIZE) + if (BIN_DEBUG_SIZE GREATER 0) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + + foreach(path IN LISTS BIN_DEBUG) + get_filename_component(name "${path}" NAME) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/${name}" "${CURRENT_PACKAGES_DIR}/debug/bin/${name}") + endforeach() + endif() +endif() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/nspr-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") + +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/nspr-config" "${CURRENT_INSTALLED_DIR}/debug" "`dirname $0`/../../../..") +endif() + +# Copy license +file(INSTALL "${SOURCE_PATH}/nspr/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/nspr/vcpkg.json b/externals/vcpkg/ports/nspr/vcpkg.json new file mode 100755 index 000000000..f1420b447 --- /dev/null +++ b/externals/vcpkg/ports/nspr/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "nspr", + "version": "4.33", + "port-version": 2, + "description": "Netscape portable runtime", + "homepage": "https://releases.mozilla.org/pub/nspr/", + "license": "MPL-2.0", + "supports": "windows & !(arm | uwp | static)", + "dependencies": [ + { + "name": "vcpkg-tool-mozbuild", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/nss/01-nspr-no-lib-prefix.patch b/externals/vcpkg/ports/nss/01-nspr-no-lib-prefix.patch new file mode 100755 index 000000000..0351c0db6 --- /dev/null +++ b/externals/vcpkg/ports/nss/01-nspr-no-lib-prefix.patch @@ -0,0 +1,12 @@ +diff -ur x64-windows-rel/nss/coreconf/config.gypi src/3.66-485ec2a7fc.clean/nss/coreconf/config.gypi +--- a/nss/coreconf/config.gypi 2021-05-28 02:50:43.000000000 -0700 ++++ b/nss/coreconf/config.gypi 2021-11-09 07:51:35.884650900 -0800 +@@ -44,7 +44,7 @@ + }], + ['OS=="win"', { + 'use_system_zlib%': 0, +- 'nspr_libs%': ['libnspr4.lib', 'libplc4.lib', 'libplds4.lib'], ++ 'nspr_libs%': ['nspr4.lib', 'plc4.lib', 'plds4.lib'], + 'zlib_libs%': [], + #TODO + 'moz_debug_flags%': '', diff --git a/externals/vcpkg/ports/nss/02-gen-debug-info-for-release.patch b/externals/vcpkg/ports/nss/02-gen-debug-info-for-release.patch new file mode 100755 index 000000000..435abea2d --- /dev/null +++ b/externals/vcpkg/ports/nss/02-gen-debug-info-for-release.patch @@ -0,0 +1,15 @@ +diff -ur +--- a/nss/coreconf/config.gypi 2021-11-09 22:46:52.555246500 -0800 ++++ b/nss/coreconf/config.gypi 2021-11-10 00:49:48.044560100 -0800 +@@ -638,9 +638,11 @@ + 'VCCLCompilerTool': { + 'Optimization': '<(release_optimization_level)', + 'RuntimeLibrary': '2', # /MD ++ 'DebugInformationFormat': '3', + }, + 'VCLinkerTool': { + 'LinkIncremental': '1', ++ 'GenerateDebugInformation' : 'true', + }, + }, + }, diff --git a/externals/vcpkg/ports/nss/portfile.cmake b/externals/vcpkg/ports/nss/portfile.cmake new file mode 100755 index 000000000..523a3d7ca --- /dev/null +++ b/externals/vcpkg/ports/nss/portfile.cmake @@ -0,0 +1,208 @@ +set(NSS_VERSION "3.78") +string(REPLACE "." "_" V_URL ${NSS_VERSION}) + +vcpkg_download_distfile(ARCHIVE + URLS "https://ftp.mozilla.org/pub/security/nss/releases/NSS_${V_URL}_RTM/src/nss-${NSS_VERSION}.tar.gz" + FILENAME "nss-${NSS_VERSION}.tar.gz" + SHA512 ab54d838f41f963fdd4b87477b1e769186ae1f138f7c5d764cd6873be4791146d14dcc85697a2ca92e08f3bfcbeb61d64e26e7b5398095272c18a8196d43ac6c +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF "${NSS_VERSION}" + PATCHES "01-nspr-no-lib-prefix.patch" +) + +# setup ninja +vcpkg_find_acquire_program(NINJA) +get_filename_component(NINJA_ROOT "${NINJA}" DIRECTORY) +list(APPEND CMAKE_PROGRAM_PATH "${NINJA_ROOT}") +vcpkg_add_to_path(APPEND "${NINJA_ROOT}") + +# setup mozbuild for windows +if (VCPKG_TARGET_IS_WINDOWS) + set(MOZBUILD_ROOT "${CURRENT_HOST_INSTALLED_DIR}/tools/mozbuild") + + set(MOZBUILD_BINDIR "${MOZBUILD_ROOT}/bin") + vcpkg_add_to_path(PREPEND "${MOZBUILD_BINDIR}") + + set(MOZBUILD_MSYS_ROOT "${MOZBUILD_ROOT}/msys") + vcpkg_add_to_path(PREPEND "${MOZBUILD_MSYS_ROOT}/bin") + + find_program(MOZBUILD_MAKE_COMMAND make PATHS "${MOZBUILD_MSYS_ROOT}/bin" NO_DEFAULT_PATH REQUIRED) + message(STATUS "Found make: ${MOZBUILD_MAKE_COMMAND}") + + find_program(MOZBUILD_BASH bash PATHS "${MOZBUILD_MSYS_ROOT}/bin" NO_DEFAULT_PATH REQUIRED) + message(STATUS "Found bash: ${MOZBUILD_BASH}") + + set(MOZBUILD_PYTHON_ROOT "${MOZBUILD_ROOT}/python") + find_program(MOZBUILD_PYTHON python PATHS "${MOZBUILD_ROOT}/python" NO_DEFAULT_PATH REQUIRED) + message(STATUS "Found python: ${MOZBUILD_PYTHON}") + vcpkg_add_to_path(PREPEND "${MOZBUILD_PYTHON_ROOT}") + +else() + # TODO: setup non-windows build environment + +endif() + +set(GYP_NSS_ROOT "${CURRENT_HOST_INSTALLED_DIR}/tools/gyp-nss") +if (VCPKG_HOST_IS_WINDOWS) + find_file(GYP_NSS NAMES gyp.bat PATHS "${GYP_NSS_ROOT}" NO_DEFAULT_PATH REQUIRED) +else() + find_program(GYP_NSS NAMES gyp PATHS "${GYP_NSS_ROOT}" NO_DEFAULT_PATH REQUIRED) +endif() +vcpkg_add_to_path(PREPEND "${GYP_NSS_ROOT}") +message(STATUS "Found gyp: ${GYP_NSS}") + +# setup paths +execute_process( + COMMAND ${MOZBUILD_BASH} -c pwd + WORKING_DIRECTORY ${CURRENT_INSTALLED_DIR}/include + OUTPUT_VARIABLE VCPKG_INCLUDEDIR + OUTPUT_STRIP_TRAILING_WHITESPACE +) +message(STATUS "Using headers from: ${VCPKG_INCLUDEDIR} arch: ${VCPKG_TARGET_ARCHITECTURE}") + +execute_process( + COMMAND ${MOZBUILD_BASH} -c pwd + WORKING_DIRECTORY ${CURRENT_INSTALLED_DIR}/lib + OUTPUT_VARIABLE VCPKG_LIBDIR + OUTPUT_STRIP_TRAILING_WHITESPACE +) +message(STATUS "Using libraries from: ${VCPKG_LIBDIR} arch: ${VCPKG_TARGET_ARCHITECTURE}") + +# +# get to work +# + +# see help.txt in nss root +set(OPTIONS + "-v" "-g" + "--disable-tests" + "--with-nspr=${VCPKG_INCLUDEDIR}/nspr:${VCPKG_LIBDIR}" + "--system-sqlite" + "-Dsign_libs=0" +) + +if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + list(APPEND OPTIONS "--target=x64") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + list(APPEND OPTIONS "--target=ia32") +else() + message(FATAL_ERROR "Unsupported arch: ${VCPKG_TARGET_ARCHITECTURE}") +endif() + +if (VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS + "--msvc" + ) +endif() + +set(VCPKG_BINARY_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") + +# build debug +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + message(STATUS "Copying sources to debug build dir ...") + file(COPY "${SOURCE_PATH}/nss" DESTINATION "${VCPKG_BINARY_DIR}-dbg") + message(STATUS "Building debug ...") + vcpkg_execute_required_process( + COMMAND ${MOZBUILD_BASH} ./build.sh ${OPTIONS} + WORKING_DIRECTORY ${VCPKG_BINARY_DIR}-dbg/nss + LOGNAME build-${TARGET_TRIPLET}${short_buildtype} + ) +endif() + +# build release +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + message(STATUS "Copying sources to release build dir ...") + file(COPY "${SOURCE_PATH}/nss" DESTINATION "${VCPKG_BINARY_DIR}-rel") + message(STATUS "Building release ...") + vcpkg_execute_required_process( + COMMAND ${MOZBUILD_BASH} ./build.sh ${OPTIONS} "--opt" + WORKING_DIRECTORY ${VCPKG_BINARY_DIR}-rel/nss + LOGNAME build-${TARGET_TRIPLET}${short_buildtype} + ) +endif() + +# +# VCPKG FHS adjustments +# + +# Headers + +file( + COPY "${VCPKG_BINARY_DIR}-rel/dist/public/nss" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" +) + +file( + COPY "${VCPKG_BINARY_DIR}-rel/dist/private/nss/" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/nss/private" +) + +# Release libraries + +file(GLOB LIB_RELEASE + "${VCPKG_BINARY_DIR}-rel/dist/Release/lib/*.dll" + "${VCPKG_BINARY_DIR}-rel/dist/Release/lib/*.pdb" +) +list(LENGTH LIB_RELEASE LIB_RELEASE_SIZE) + +if (LIB_RELEASE_SIZE GREATER 0) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + + foreach(path ${LIB_RELEASE}) + get_filename_component(name "${path}" NAME) + file(RENAME "${path}" "${CURRENT_PACKAGES_DIR}/bin/${name}") + endforeach() + + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib") + file(COPY "${VCPKG_BINARY_DIR}-rel/dist/Release/lib" DESTINATION "${CURRENT_PACKAGES_DIR}") +endif() + +# Release tools + +vcpkg_copy_tools( + TOOL_NAMES + "certutil" + "cmsutil" + "crlutil" + "hw-support" + "modutil" + "nss" + "pk12util" + "pwdecrypt" + "shlibsign" + "signtool" + "signver" + "ssltap" + "symkeyutil" + "validation" + SEARCH_DIR "${VCPKG_BINARY_DIR}-rel/dist/Release/bin/" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}" +) + +# Debug libraries +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(GLOB LIB_DEBUG + "${VCPKG_BINARY_DIR}-dbg/dist/Debug/lib/*.dll" + "${VCPKG_BINARY_DIR}-dbg/dist/Debug/lib/*.pdb" + ) + list(LENGTH LIB_DEBUG LIB_DEBUG_SIZE) + + if (LIB_DEBUG_SIZE GREATER 0) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + + foreach(path ${LIB_DEBUG}) + get_filename_component(name "${path}" NAME) + file(RENAME "${path}" "${CURRENT_PACKAGES_DIR}/debug/bin/${name}") + endforeach() + + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") + file(COPY "${VCPKG_BINARY_DIR}-dbg/dist/Debug/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") + endif() +endif() + +# Copy license +file(INSTALL "${SOURCE_PATH}/nss/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/nss" RENAME copyright) diff --git a/externals/vcpkg/ports/nss/vcpkg.json b/externals/vcpkg/ports/nss/vcpkg.json new file mode 100755 index 000000000..f885c9482 --- /dev/null +++ b/externals/vcpkg/ports/nss/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "nss", + "version": "3.78", + "description": "Network Security Services from Mozilla", + "homepage": "https://ftp.mozilla.org/pub/security/nss/releases/", + "license": "MPL-2.0", + "supports": "windows & !arm", + "dependencies": [ + "nspr", + "sqlite3", + { + "name": "vcpkg-tool-gyp-nss", + "host": true + }, + { + "name": "vcpkg-tool-mozbuild", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/nsync/export-targets.patch b/externals/vcpkg/ports/nsync/export-targets.patch new file mode 100755 index 000000000..cbae3d366 --- /dev/null +++ b/externals/vcpkg/ports/nsync/export-targets.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 328f9b6..6a71b5b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,6 +41,9 @@ function (set_cpp_target tgtname files) + "${PROJECT_SOURCE_DIR}/platform/c++11.futex" + ) + endif () ++ ++ target_include_directories("${tgtname}" PUBLIC $) ++ + + target_compile_definitions ("${tgtname}" PRIVATE "${NSYNC_CPP_DEFINITIONS}") + +@@ -399,14 +402,19 @@ endif () + # By default, install nsync always + # set (CMAKE_SKIP_INSTALL_ALL_DEPENDENCY ON) + +-install (TARGETS nsync ++install (TARGETS nsync EXPORT unofficial-nsyncConfig + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development) + +-install (TARGETS nsync_cpp OPTIONAL ++install (TARGETS nsync_cpp OPTIONAL EXPORT unofficial-nsyncConfig + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development) + ++install(EXPORT unofficial-nsyncConfig ++ NAMESPACE unofficial::nsync:: ++ DESTINATION share/unofficial-nsync ++) ++ + set (NSYNC_INCLUDES + "public/nsync.h" + "public/nsync_atomic.h" diff --git a/externals/vcpkg/ports/nsync/fix-install.patch b/externals/vcpkg/ports/nsync/fix-install.patch new file mode 100755 index 000000000..efe560d15 --- /dev/null +++ b/externals/vcpkg/ports/nsync/fix-install.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6b1f1dc..328f9b6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -80,7 +80,7 @@ set (NSYNC_OS_CPP_SRC + # https://cmake.org/cmake/help/v3.1/policy/CMP0054.html + + # Pick the include directory for the operating system. +-if ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX") ++if ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX" OR "${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsStoreX") + include_directories ("${PROJECT_SOURCE_DIR}/platform/win32") + set (NSYNC_CPP_FLAGS "/TP") + +@@ -230,7 +230,7 @@ elseif (("${CMAKE_SYSTEM_PROCESSOR}X" STREQUAL "ppc64X")) + endif () + + # Windows uses some include files from the posix directory also. +-if ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX") ++if ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX" OR "${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsStoreX") + include_directories ("${PROJECT_SOURCE_DIR}/platform/posix") + endif () + +@@ -396,7 +396,8 @@ if (NSYNC_ENABLE_TESTS) + endforeach (t) + endif () + +-set (CMAKE_SKIP_INSTALL_ALL_DEPENDENCY ON) ++# By default, install nsync always ++# set (CMAKE_SKIP_INSTALL_ALL_DEPENDENCY ON) + + install (TARGETS nsync + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries diff --git a/externals/vcpkg/ports/nsync/portfile.cmake b/externals/vcpkg/ports/nsync/portfile.cmake new file mode 100755 index 000000000..fe2ff4d51 --- /dev/null +++ b/externals/vcpkg/ports/nsync/portfile.cmake @@ -0,0 +1,27 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/nsync + REF 1.24.0 + SHA512 14dd582488072123a353c967664ed9a3f636865bb35e64d7256dcc809539129fa47c7979a4009fd45c9341cac537a4ca6b4b617ba2cae1d3995a7c251376339f + HEAD_REF master + PATCHES + fix-install.patch + export-targets.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DNSYNC_ENABLE_TESTS=OFF +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-nsync CONFIG_PATH share/unofficial-nsync) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/nsync/vcpkg.json b/externals/vcpkg/ports/nsync/vcpkg.json new file mode 100755 index 000000000..54c24f43f --- /dev/null +++ b/externals/vcpkg/ports/nsync/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "nsync", + "version": "1.24.0", + "port-version": 1, + "description": "nsync is a C library that exports various synchronization primitives, such as mutexes", + "homepage": "https://github.com/google/nsync", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/nt-wrapper/portfile.cmake b/externals/vcpkg/ports/nt-wrapper/portfile.cmake new file mode 100755 index 000000000..78c84358d --- /dev/null +++ b/externals/vcpkg/ports/nt-wrapper/portfile.cmake @@ -0,0 +1,23 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO JustasMasiulis/nt_wrapper + REF 6a150292a43f6aea35918a5c5e93a66c334ea301 + SHA512 fb8a1c4c934d3cb48a76a935ba69fd51ec2e6b66f5c265a8da9456691f933c6080057fec9a714f252c39d02525603b993cecd905452598058254ac9318655c4f + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/nt-wrapper/vcpkg.json b/externals/vcpkg/ports/nt-wrapper/vcpkg.json new file mode 100755 index 000000000..7504ae190 --- /dev/null +++ b/externals/vcpkg/ports/nt-wrapper/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "nt-wrapper", + "version-string": "2019-08-10", + "port-version": 1, + "description": "A header only wrapper library around native windows system APIs", + "homepage": "https://github.com/JustasMasiulis/nt_wrapper" +} diff --git a/externals/vcpkg/ports/nu-book-zxing-cpp/ignore-pdb-install-symbols-in-lib.patch b/externals/vcpkg/ports/nu-book-zxing-cpp/ignore-pdb-install-symbols-in-lib.patch new file mode 100755 index 000000000..6a69fc0b6 --- /dev/null +++ b/externals/vcpkg/ports/nu-book-zxing-cpp/ignore-pdb-install-symbols-in-lib.patch @@ -0,0 +1,12 @@ +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index 7a2db60..17e0a52 100644 +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -474,7 +474,4 @@ if(MSVC) + set_target_properties(ZXing PROPERTIES + COMPILE_PDB_NAME ZXing + COMPILE_PDB_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ZXing.pdb +- DESTINATION ${CMAKE_INSTALL_LIBDIR} +- CONFIGURATIONS Debug RelWithDebInfo) + endif() diff --git a/externals/vcpkg/ports/nu-book-zxing-cpp/portfile.cmake b/externals/vcpkg/ports/nu-book-zxing-cpp/portfile.cmake new file mode 100755 index 000000000..2facb6b5d --- /dev/null +++ b/externals/vcpkg/ports/nu-book-zxing-cpp/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nu-book/zxing-cpp + REF v1.2.0 + SHA512 e61b4e44ccaf0871b5d8badf9ce0a81576f55e5d6a9458907b9b599a66227adceabb8d51a0c47b32319d8aeff93e758b4785d3bd0440375247471d95999de487 + HEAD_REF master + PATCHES ignore-pdb-install-symbols-in-lib.patch +) + +if (VCPKG_TARGET_IS_UWP) + set(ENV{CL} "$ENV{CL} -wd4996") +endif() +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_BLACKBOX_TESTS=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_SYSTEM_DEPS=ALWAYS + MAYBE_UNUSED_VARIABLES + # Currently no dependencies, but this defends against future additions + BUILD_SYSTEM_DEPS +) + +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup( + CONFIG_PATH lib/cmake/ZXing + PACKAGE_NAME ZXing +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/nu-book-zxing-cpp" RENAME copyright) diff --git a/externals/vcpkg/ports/nu-book-zxing-cpp/vcpkg.json b/externals/vcpkg/ports/nu-book-zxing-cpp/vcpkg.json new file mode 100755 index 000000000..1dae685b1 --- /dev/null +++ b/externals/vcpkg/ports/nu-book-zxing-cpp/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "nu-book-zxing-cpp", + "version": "1.2.0", + "description": "Barcode detection and decoding library.", + "homepage": "https://github.com/nu-book/zxing-cpp", + "license": "Apache-2.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/nuklear/CMakeLists.txt b/externals/vcpkg/ports/nuklear/CMakeLists.txt new file mode 100755 index 000000000..28009f466 --- /dev/null +++ b/externals/vcpkg/ports/nuklear/CMakeLists.txt @@ -0,0 +1,34 @@ +cmake_minimum_required(VERSION 3.16) +project(Nuklear LANGUAGES C CXX) + +option(INSTALL_EXAMPLE "Install the example code" OFF) +option(INSTALL_DEMO "Install the demo code" OFF) + +add_library(nuklear INTERFACE) + +target_include_directories(nuklear INTERFACE $) +target_compile_definitions(nuklear INTERFACE NK_IMPLEMENTATION) + +# Installation +install( + TARGETS nuklear + EXPORT unofficial-nuklear + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(FILES "${CMAKE_CURRENT_LIST_DIR}/nuklear.h" DESTINATION "include/nuklear") + + +install(EXPORT unofficial-nuklear FILE unofficial-nuklear-config.cmake DESTINATION share/unofficial-nuklear) + +if (INSTALL_EXAMPLE) + install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/example" DESTINATION share/nuklear) + +endif() + +if (INSTALL_DEMO) + install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/demo" DESTINATION share/nuklear) + +endif() diff --git a/externals/vcpkg/ports/nuklear/portfile.cmake b/externals/vcpkg/ports/nuklear/portfile.cmake new file mode 100755 index 000000000..e13332986 --- /dev/null +++ b/externals/vcpkg/ports/nuklear/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Immediate-Mode-UI/Nuklear + REF 6e80e2a646f35be4afc157a932f2936392ec8f74 # accessed on 2021-04-04 + SHA512 ce064dff721111749d4056717879f42d3e24bb94655dd2b04c137eb7391d2c90d0b1b95155912c100b537f74fd150aedc48e0ac85eb72963c66e35ac81048323 + HEAD_REF master +) + +file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + example INSTALL_EXAMPLE + demo INSTALL_DEMO +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-nuklear) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/Readme.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/nuklear/vcpkg.json b/externals/vcpkg/ports/nuklear/vcpkg.json new file mode 100755 index 000000000..1e48043bf --- /dev/null +++ b/externals/vcpkg/ports/nuklear/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "nuklear", + "version-date": "2021-03-18", + "port-version": 1, + "description": "This is a minimal state immediate mode graphical user interface toolkit written in ANSI C and licensed under public domain", + "homepage": "https://github.com/Immediate-Mode-UI/Nuklear", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "demo": { + "description": "Install demo files" + }, + "example": { + "description": "Install example files" + } + } +} diff --git a/externals/vcpkg/ports/numactl/portfile.cmake b/externals/vcpkg/ports/numactl/portfile.cmake new file mode 100755 index 000000000..17a058022 --- /dev/null +++ b/externals/vcpkg/ports/numactl/portfile.cmake @@ -0,0 +1,69 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO numactl/numactl + REF v2.0.14 + SHA512 ADAF405F092FD9653F26D00F8C80CB83852C56EBD5D00E714E20D505008E74AA7105B0FB7AA55A605DEAC0D1491CEFF57DE931037D33E7944FCA105BC6510ED4 + HEAD_REF master +) + +message( +"numactl currently requires the following libraries from the system package manager: + autoconf libtool +These can be installed on Ubuntu systems via sudo apt install autoconf libtool" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(SHARED_STATIC --enable-static --disable-shared) +else() + set(SHARED_STATIC --disable-static --enable-shared) +endif() + +set(OPTIONS ${SHARED_STATIC}) +vcpkg_execute_required_process( + COMMAND ${SOURCE_PATH}/autogen.sh + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME setup-${TARGET_TRIPLET} +) + +file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) +file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) +message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") +set(CFLAGS "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG} -fPIC -O0 -g -I${SOURCE_PATH}/include") +set(LDFLAGS "${VCPKG_LINKER_FLAGS}") +vcpkg_execute_required_process( + COMMAND ${SOURCE_PATH}/configure --prefix=${CURRENT_PACKAGES_DIR}/debug ${OPTIONS} --with-sysroot=${CURRENT_INSTALLED_DIR}/debug + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg + LOGNAME configure-${TARGET_TRIPLET}-dbg +) +message(STATUS "Building ${TARGET_TRIPLET}-dbg") +vcpkg_execute_required_process( + COMMAND make -j install "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}" + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg + LOGNAME install-${TARGET_TRIPLET}-dbg +) + +file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) +file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) +message(STATUS "Configuring ${TARGET_TRIPLET}-rel") +set(CFLAGS "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE} -fPIC -O3 -I${SOURCE_PATH}/include") +set(LDFLAGS "${VCPKG_LINKER_FLAGS}") +vcpkg_execute_required_process( + COMMAND ${SOURCE_PATH}/configure --prefix=${CURRENT_PACKAGES_DIR} ${OPTIONS} --with-sysroot=${CURRENT_INSTALLED_DIR} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel + LOGNAME configure-${TARGET_TRIPLET}-rel +) +message(STATUS "Building ${TARGET_TRIPLET}-rel") +vcpkg_execute_required_process( + COMMAND make -j install "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}" + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel + LOGNAME install-${TARGET_TRIPLET}-rel +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +configure_file(${SOURCE_PATH}/README.md ${CURRENT_PACKAGES_DIR}/share/numactl/copyright COPYONLY) diff --git a/externals/vcpkg/ports/numactl/vcpkg.json b/externals/vcpkg/ports/numactl/vcpkg.json new file mode 100755 index 000000000..267e8300d --- /dev/null +++ b/externals/vcpkg/ports/numactl/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "numactl", + "version": "2.0.14", + "port-version": 1, + "description": "NUMA support for Linux", + "homepage": "https://github.com/numactl/numactl", + "supports": "linux" +} diff --git a/externals/vcpkg/ports/numcpp/portfile.cmake b/externals/vcpkg/ports/numcpp/portfile.cmake new file mode 100755 index 000000000..e2dce207f --- /dev/null +++ b/externals/vcpkg/ports/numcpp/portfile.cmake @@ -0,0 +1,20 @@ +# header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO dpilger26/NumCpp + REF Version_2.6.0 + SHA512 4D057941F4CB541CFAA56E4188C865DFC1804CA1B2203422B9EB7D7E8EE43CCB15DC5109DA5C932234E6055B6A5554D877347FA7CAEC5EA619A2975A56D2B16C + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME NumCpp CONFIG_PATH share/NumCpp/cmake) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/numcpp/vcpkg.json b/externals/vcpkg/ports/numcpp/vcpkg.json new file mode 100755 index 000000000..d93591882 --- /dev/null +++ b/externals/vcpkg/ports/numcpp/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "numcpp", + "version": "2.6.0", + "description": "C++ implementation of the Python Numpy library", + "homepage": "https://dpilger26.github.io/NumCpp", + "license": "MIT", + "dependencies": [ + "boost-algorithm", + "boost-endian", + "boost-integer", + "boost-math", + "boost-predef", + "boost-random", + "boost-type-traits", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "python": { + "description": "Interacting with Python with pybind11 interface", + "dependencies": [ + "boost-python", + "pybind11" + ] + } + } +} diff --git a/externals/vcpkg/ports/nuspell/fix-tools.patch b/externals/vcpkg/ports/nuspell/fix-tools.patch new file mode 100755 index 000000000..18dc5c528 --- /dev/null +++ b/externals/vcpkg/ports/nuspell/fix-tools.patch @@ -0,0 +1,30 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7b54c54..7c6f3a3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,7 +12,10 @@ find_package(ICU 60 REQUIRED COMPONENTS uc data) + get_directory_property(subproject PARENT_DIRECTORY) + + add_subdirectory(src/nuspell) ++option(BUILD_TOOLS "Build the tools." OFF) ++if (BUILD_TOOLS) + add_subdirectory(src/tools) ++endif() + + if (subproject) + # if added as subproject just build Nuspell +diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt +index 3e63610..7597a6d 100644 +--- a/src/tools/CMakeLists.txt ++++ b/src/tools/CMakeLists.txt +@@ -3,6 +3,10 @@ set_target_properties(nuspell-exe PROPERTIES RUNTIME_OUTPUT_NAME nuspell) + target_compile_definitions(nuspell-exe PRIVATE + PROJECT_VERSION=\"${PROJECT_VERSION}\") + target_link_libraries(nuspell-exe Nuspell::nuspell) ++if (WIN32 AND NOT MINGW) ++ find_library(GETOPT_WIN32_LIBRARY getopt) ++ target_link_libraries(nuspell-exe ${GETOPT_WIN32_LIBRARY}) ++endif() + if (BUILD_SHARED_LIBS AND WIN32) + # This should be PRE_LINK (or PRE_BUILD), so Vcpkg's POST_BUILD + # step (see VCPKG_APPLOCAL_DEPS) that copies dll can pick up nuspell.dll diff --git a/externals/vcpkg/ports/nuspell/portfile.cmake b/externals/vcpkg/ports/nuspell/portfile.cmake new file mode 100755 index 000000000..8f7ec6857 --- /dev/null +++ b/externals/vcpkg/ports/nuspell/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nuspell/nuspell + REF v5.1.0 + SHA512 08ce776d224c66ba4bdd8cb22943741f30e8e5ba03396bfef1db598321c9b0f8814dacffcb52287b3b669426c7b08e2c1a40323341a9ff9768a7187002e1d77a + HEAD_REF master + PATCHES fix-tools.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DBUILD_TESTING=OFF +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/nuspell) +vcpkg_fixup_pkgconfig( + # nuspell.pc depends on icu-uc.pc which has -lm specified as private + # library. Ignore this -lm, otherwise this function shows error + # because it can't find this. -lm is part of glibc on Linux. + SYSTEM_LIBRARIES m +) + +if (BUILD_TOOLS) + vcpkg_copy_tools(TOOL_NAMES nuspell AUTO_CLEAN) +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/nuspell/vcpkg.json b/externals/vcpkg/ports/nuspell/vcpkg.json new file mode 100755 index 000000000..9ae7f8eb6 --- /dev/null +++ b/externals/vcpkg/ports/nuspell/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "nuspell", + "version-semver": "5.1.0", + "port-version": 2, + "description": [ + "Nuspell is a fast and safe spelling checker software program.", + "It is designed for languages with rich morphology and complex word compounding.", + "Nuspell is written in modern C++ and it supports Hunspell dictionaries." + ], + "homepage": "https://nuspell.github.io/", + "license": "LGPL-3.0-or-later", + "dependencies": [ + "icu", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "Build tools", + "dependencies": [ + "getopt" + ] + } + } +} diff --git a/externals/vcpkg/ports/nvtt/001-define-value-for-HAVE_UNISTD_H-in-mac-os.patch b/externals/vcpkg/ports/nvtt/001-define-value-for-HAVE_UNISTD_H-in-mac-os.patch new file mode 100755 index 000000000..366cff84f --- /dev/null +++ b/externals/vcpkg/ports/nvtt/001-define-value-for-HAVE_UNISTD_H-in-mac-os.patch @@ -0,0 +1,16 @@ +diff --git a/src/nvconfig.h.in b/src/nvconfig.h.in +index 16da646..ada6be0 100644 +--- a/src/nvconfig.h.in ++++ b/src/nvconfig.h.in +@@ -1,7 +1,11 @@ + #ifndef NV_CONFIG + #define NV_CONFIG + ++#if NV_OS_DARWIN & !NV_OS_IOS ++#cmakedefine01 HAVE_UNISTD_H ++#else + #cmakedefine HAVE_UNISTD_H ++#endif + #cmakedefine HAVE_STDARG_H + #cmakedefine HAVE_SIGNAL_H + #cmakedefine HAVE_EXECINFO_H diff --git a/externals/vcpkg/ports/nvtt/add-compile-options-for-osx.patch b/externals/vcpkg/ports/nvtt/add-compile-options-for-osx.patch new file mode 100755 index 000000000..6b7d94559 --- /dev/null +++ b/externals/vcpkg/ports/nvtt/add-compile-options-for-osx.patch @@ -0,0 +1,15 @@ +diff --git a/src/nvtt/CMakeLists.txt b/src/nvtt/CMakeLists.txt +index 9688c9c..42942c0 100644 +--- a/src/nvtt/CMakeLists.txt ++++ b/src/nvtt/CMakeLists.txt +@@ -47,6 +47,10 @@ ADD_DEFINITIONS(-DNVTT_EXPORTS) + #ADD_DEFINITIONS(-DHAVE_RGETC) + #ADD_DEFINITIONS(-DHAVE_ETCPACK) + ++if(APPLE) ++ add_compile_options(-mbmi2 -mfma) ++endif() ++ + IF(NVTT_SHARED) + ADD_LIBRARY(nvtt SHARED ${NVTT_SRCS}) + ELSE(NVTT_SHARED) diff --git a/externals/vcpkg/ports/nvtt/bc6h.patch b/externals/vcpkg/ports/nvtt/bc6h.patch new file mode 100755 index 000000000..8d3339eb2 --- /dev/null +++ b/externals/vcpkg/ports/nvtt/bc6h.patch @@ -0,0 +1,13 @@ +diff --git a/src/bc6h/CMakeLists.txt b/src/bc6h/CMakeLists.txt +index fd75e74..b392d90 100644 +--- a/src/bc6h/CMakeLists.txt ++++ b/src/bc6h/CMakeLists.txt +@@ -15,3 +15,8 @@ SET(BC6H_SRCS + + ADD_LIBRARY(bc6h STATIC ${BC6H_SRCS}) + TARGET_LINK_LIBRARIES(bc6h nvcore nvmath) ++ ++INSTALL(TARGETS bc6h ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib/static) diff --git a/externals/vcpkg/ports/nvtt/bc7.patch b/externals/vcpkg/ports/nvtt/bc7.patch new file mode 100755 index 000000000..5c644fece --- /dev/null +++ b/externals/vcpkg/ports/nvtt/bc7.patch @@ -0,0 +1,14 @@ +diff --git a/src/bc7/CMakeLists.txt b/src/bc7/CMakeLists.txt +index 566fe1f..d0d4e8a 100644 +--- a/src/bc7/CMakeLists.txt ++++ b/src/bc7/CMakeLists.txt +@@ -23,3 +23,8 @@ SET(BC7_SRCS + + ADD_LIBRARY(bc7 STATIC ${BC7_SRCS}) + TARGET_LINK_LIBRARIES(bc7 nvcore nvmath) ++ ++INSTALL(TARGETS bc7 ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib/static) +\ No newline at end of file diff --git a/externals/vcpkg/ports/nvtt/fix-build-error.patch b/externals/vcpkg/ports/nvtt/fix-build-error.patch new file mode 100755 index 000000000..5274efa31 --- /dev/null +++ b/externals/vcpkg/ports/nvtt/fix-build-error.patch @@ -0,0 +1,47 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 668cd7e..72d6e61 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,9 +7,17 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${NV_CMAKE_DIR}") + + # Compiler check (needs -std:c++11 flag) + include(CheckCXXCompilerFlag) ++if(MSVC) ++CHECK_CXX_COMPILER_FLAG("/std:c++14" COMPILER_SUPPORTS_CXX14) ++else() + CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) +-if(COMPILER_SUPPORTS_CXX11) ++endif() ++if(COMPILER_SUPPORTS_CXX11 OR COMPILER_SUPPORTS_CXX14) ++ if(COMPILER_SUPPORTS_CXX11) + set(CMAKE_CXX_STANDARD 11) ++ else() ++ set(CMAKE_CXX_STANDARD 14) ++ endif() + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) + else() +diff --git a/extern/CMP_Core/source/cmp_math_func.h b/extern/CMP_Core/source/cmp_math_func.h +index c2f8908..b652497 100644 +--- a/extern/CMP_Core/source/cmp_math_func.h ++++ b/extern/CMP_Core/source/cmp_math_func.h +@@ -32,6 +32,7 @@ + // Core API which have have GPU equivalents, defined here for HPC_CPU usage + //============================================================================ + ++#include + #include + using namespace std; + +diff --git a/src/nvtt/CMakeLists.txt b/src/nvtt/CMakeLists.txt +index 8285f99..9688c9c 100644 +--- a/src/nvtt/CMakeLists.txt ++++ b/src/nvtt/CMakeLists.txt +@@ -63,5 +63,5 @@ INSTALL(TARGETS nvtt + INSTALL(FILES nvtt.h nvtt_wrapper.h DESTINATION include/nvtt) + + +-ADD_SUBDIRECTORY(tools) +-ADD_SUBDIRECTORY(tests) ++#ADD_SUBDIRECTORY(tools) ++#ADD_SUBDIRECTORY(tests) diff --git a/externals/vcpkg/ports/nvtt/fix-intrinsic-function.patch b/externals/vcpkg/ports/nvtt/fix-intrinsic-function.patch new file mode 100755 index 000000000..397e81681 --- /dev/null +++ b/externals/vcpkg/ports/nvtt/fix-intrinsic-function.patch @@ -0,0 +1,19 @@ +diff --git a/src/nvmath/nvmath.h b/src/nvmath/nvmath.h +index 38532eb..e68d8f8 100644 +--- a/src/nvmath/nvmath.h ++++ b/src/nvmath/nvmath.h +@@ -118,12 +118,12 @@ inline float asinf_assert(const float f) + #endif + + #if NV_CC_MSVC +-NV_FORCEINLINE float log2f(float x) ++NV_FORCEINLINE float nv_log2f(float x) + { + nvCheck(x >= 0); + return logf(x) / logf(2.0f); + } +-NV_FORCEINLINE float exp2f(float x) ++NV_FORCEINLINE float nv_exp2f(float x) + { + return powf(2.0f, x); + } diff --git a/externals/vcpkg/ports/nvtt/fix-release-flags.patch b/externals/vcpkg/ports/nvtt/fix-release-flags.patch new file mode 100755 index 000000000..04263e0c6 --- /dev/null +++ b/externals/vcpkg/ports/nvtt/fix-release-flags.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/OptimalOptions.cmake b/cmake/OptimalOptions.cmake +index e4d5c56..eba8624 100644 +--- a/cmake/OptimalOptions.cmake ++++ b/cmake/OptimalOptions.cmake +@@ -11,8 +11,8 @@ IF(MSVC) + # SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2 /fp:fast") + + # Optimization flags. +- SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} /O2 /Ob2 /Oi /Ot /Oy /GL") +- SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} /O2 /Ob2 /Oi /Ot /Oy /GL") ++ SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /Oy /GL") ++ SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /Oy /GL") + SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG") + SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG") + SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /LTCG") diff --git a/externals/vcpkg/ports/nvtt/portfile.cmake b/externals/vcpkg/ports/nvtt/portfile.cmake new file mode 100755 index 000000000..34b7d0a8a --- /dev/null +++ b/externals/vcpkg/ports/nvtt/portfile.cmake @@ -0,0 +1,51 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO castano/nvidia-texture-tools + REF b1a90f36013522b9e5a3a2197859b72188752e3f # 2.1.2 + SHA512 13cf04a9856f150f7569c8c256c42fc6a5bc40586c9ca2b3ae553edf5bfcbccbba5b8538924079ed35effdd07b9e3ef4bfdb9733a2ec51f5a95f958885cc6cca + HEAD_REF master + PATCHES + 001-define-value-for-HAVE_UNISTD_H-in-mac-os.patch + bc6h.patch + bc7.patch + squish.patch + fix-build-error.patch + add-compile-options-for-osx.patch + skip-building-libsquish.patch + fix-intrinsic-function.patch + fix-release-flags.patch +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cuda CMAKE_REQUIRE_FIND_PACKAGE_CUDA + INVERTED_FEATURES + cuda CMAKE_DISABLE_FIND_PACKAGE_CUDA +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DNVTT_SHARED=0 + ${FEATURE_OPTIONS} + OPTIONS_DEBUG + -DCMAKE_DEBUG_POSTFIX=_d # required by OSG +) + +vcpkg_cmake_install() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(REMOVE "${CURRENT_PACKAGES_DIR}/share/doc/nvtt/LICENSE") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/nvtt/skip-building-libsquish.patch b/externals/vcpkg/ports/nvtt/skip-building-libsquish.patch new file mode 100755 index 000000000..dba065d1f --- /dev/null +++ b/externals/vcpkg/ports/nvtt/skip-building-libsquish.patch @@ -0,0 +1,13 @@ +diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt +index 911c19e..6f13de4 100644 +--- a/extern/CMakeLists.txt ++++ b/extern/CMakeLists.txt +@@ -5,7 +5,6 @@ ADD_SUBDIRECTORY(EtcLib) + ADD_SUBDIRECTORY(rg_etc1_v104) + #ADD_SUBDIRECTORY(etcpack) + +-ADD_SUBDIRECTORY(libsquish-1.15) ++#ADD_SUBDIRECTORY(libsquish-1.15) + + ADD_SUBDIRECTORY(CMP_Core) +- diff --git a/externals/vcpkg/ports/nvtt/squish.patch b/externals/vcpkg/ports/nvtt/squish.patch new file mode 100755 index 000000000..5f971a762 --- /dev/null +++ b/externals/vcpkg/ports/nvtt/squish.patch @@ -0,0 +1,14 @@ +diff --git a/src/nvtt/squish/CMakeLists.txt b/src/nvtt/squish/CMakeLists.txt +index 65a5dd3..d093ce5 100644 +--- a/src/nvtt/squish/CMakeLists.txt ++++ b/src/nvtt/squish/CMakeLists.txt +@@ -21,3 +21,8 @@ SET(SQUISH_SRCS + simd_ve.h) + + ADD_LIBRARY(nvsquish STATIC ${SQUISH_SRCS}) ++ ++INSTALL(TARGETS nvsquish ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib/static) +\ No newline at end of file diff --git a/externals/vcpkg/ports/nvtt/vcpkg.json b/externals/vcpkg/ports/nvtt/vcpkg.json new file mode 100755 index 000000000..0dddd028a --- /dev/null +++ b/externals/vcpkg/ports/nvtt/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "nvtt", + "version": "2.1.2", + "port-version": 5, + "description": "Texture processing tools with support for Direct3D 10 and 11 formats.", + "homepage": "https://github.com/castano/nvidia-texture-tools", + "license": "MIT", + "supports": "!x86", + "dependencies": [ + "libsquish", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "cuda": { + "description": "Enable CUDA support", + "dependencies": [ + "cuda" + ] + } + } +} diff --git a/externals/vcpkg/ports/oatpp-consul/portfile.cmake b/externals/vcpkg/ports/oatpp-consul/portfile.cmake new file mode 100755 index 000000000..bb7e363e0 --- /dev/null +++ b/externals/vcpkg/ports/oatpp-consul/portfile.cmake @@ -0,0 +1,25 @@ +set(OATPP_VERSION "1.3.0") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO oatpp/oatpp-consul + REF ${OATPP_VERSION} + SHA512 b7bfff564e70fe94f99e959e8bc095b6cda704764c54e3837fc5f808b610c9197fbd0d601cb481a9cbf0d17fc1dece8d7cce6881a604fccbe63bd9b1c2b871f0 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DOATPP_BUILD_TESTS:BOOL=OFF" + "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-consul CONFIG_PATH lib/cmake/oatpp-consul-${OATPP_VERSION}) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/oatpp-consul/vcpkg.json b/externals/vcpkg/ports/oatpp-consul/vcpkg.json new file mode 100755 index 000000000..e606a276c --- /dev/null +++ b/externals/vcpkg/ports/oatpp-consul/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "oatpp-consul", + "version": "1.3.0", + "description": "OAT++ Modern web framework consul module.", + "homepage": "https://github.com/oatpp/oatpp-consul", + "dependencies": [ + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/oatpp-curl/fix-find-curl.patch b/externals/vcpkg/ports/oatpp-curl/fix-find-curl.patch new file mode 100755 index 000000000..bd1762955 --- /dev/null +++ b/externals/vcpkg/ports/oatpp-curl/fix-find-curl.patch @@ -0,0 +1,51 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 85edfe7..a8aa02b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -94,7 +94,7 @@ message("## ${OATPP_THIS_MODULE_NAME} module. Resolving dependencies...\n") + + ############################## + ## Find libcurl dependency +- ++if(0) + include(FindPkgConfig) + pkg_check_modules(PKG_CURL REQUIRED libcurl) + +@@ -103,9 +103,10 @@ message("[libcurl] LIBRARIES=${PKG_CURL_LIBRARIES}") + message("[libcurl] LIBRARY_DIRS=${PKG_CURL_LIBRARY_DIRS}") + message("[libcurl] INCLUDE_DIRS=${PKG_CURL_INCLUDE_DIRS}") + message("[libcurl] VERSION=${PKG_CURL_VERSION}\n") +- ++endif() ++find_package(CURL CONFIG REQUIRED) + link_directories( +- ${PKG_CURL_LIBRARY_DIRS} ++ CURL::libcurl + ) + + message("\n############################################################################\n") +diff --git a/cmake/module-config.cmake.in b/cmake/module-config.cmake.in +index 5cc12b0..4ff34bc 100644 +--- a/cmake/module-config.cmake.in ++++ b/cmake/module-config.cmake.in +@@ -1,5 +1,6 @@ + @PACKAGE_INIT@ +- ++include(CMakeFindDependencyMacro) ++find_dependency(CURL) + if(NOT TARGET oatpp::@OATPP_MODULE_NAME@) + include("${CMAKE_CURRENT_LIST_DIR}/@OATPP_MODULE_NAME@Targets.cmake") + endif() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 8c2087f..1da41c6 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -43,7 +43,7 @@ target_include_directories(${OATPP_THIS_MODULE_NAME} + #) + + target_link_libraries(${OATPP_THIS_MODULE_NAME} +- PRIVATE ${PKG_CURL_LIBRARIES} ++ PRIVATE CURL::libcurl + ) + + ####################################################################################################### diff --git a/externals/vcpkg/ports/oatpp-curl/portfile.cmake b/externals/vcpkg/ports/oatpp-curl/portfile.cmake new file mode 100755 index 000000000..f80968ec8 --- /dev/null +++ b/externals/vcpkg/ports/oatpp-curl/portfile.cmake @@ -0,0 +1,26 @@ +set(OATPP_VERSION "1.3.0") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO oatpp/oatpp-curl + REF ${OATPP_VERSION} + SHA512 d9437a6b3a214bf0f17561e905709d741cd7d5fcad30ec0cdddeaacb3a72142bf8b24034d13201cd416898ffd0ab07ca50ec66d4025406acee1518ae65dac45e + HEAD_REF master + PATCHES "fix-find-curl.patch" +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DOATPP_BUILD_TESTS:BOOL=OFF" + "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-curl CONFIG_PATH lib/cmake/oatpp-curl-${OATPP_VERSION}) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/oatpp-curl/vcpkg.json b/externals/vcpkg/ports/oatpp-curl/vcpkg.json new file mode 100755 index 000000000..5980921c1 --- /dev/null +++ b/externals/vcpkg/ports/oatpp-curl/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "oatpp-curl", + "version": "1.3.0", + "description": "Oat++ Modern web framework curl module to use libcurl as a RequestExecutor on the oatpp's ApiClient.", + "homepage": "https://github.com/oatpp/oatpp-curl", + "dependencies": [ + "curl", + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/oatpp-libressl/libress-submodule-downgrade-required-libressl-version.patch b/externals/vcpkg/ports/oatpp-libressl/libress-submodule-downgrade-required-libressl-version.patch new file mode 100755 index 000000000..62644beda --- /dev/null +++ b/externals/vcpkg/ports/oatpp-libressl/libress-submodule-downgrade-required-libressl-version.patch @@ -0,0 +1,63 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4663a65..b91077a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -95,19 +95,25 @@ message("## ${OATPP_THIS_MODULE_NAME} module. Resolving dependencies...\n") + ############################## + ## Find Libressl dependency + +-include(FindPkgConfig) +-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/module") +- +-find_package(LibreSSL 3.0.0 REQUIRED) +- +-message("LIBRESSL_INCLUDE_DIR=${LIBRESSL_INCLUDE_DIR}") +-message("LIBRESSL_TLS_LIBRARY=${LIBRESSL_TLS_LIBRARY}") +-message("LIBRESSL_SSL_LIBRARY=${LIBRESSL_SSL_LIBRARY}") +-message("LIBRESSL_CRYPTO_LIBRARY=${LIBRESSL_CRYPTO_LIBRARY}") +-message("LIBRESSL_LIBRARIES=${LIBRESSL_LIBRARIES}") +-message("LIBRESSL_VERSION=${LIBRESSL_VERSION}") +- +-message("\n############################################################################\n") ++find_file(LIBRESSL_INCLUDE_DIR tls.h) ++if (NOT LIBRESSL_INCLUDE_DIR) ++ find_file(_OPENSSL_SSL_INCLUDE_FILE openssl/ssl.h) ++ if (NOT _OPENSSL_SSL_INCLUDE_FILE) ++ message(FATAL_ERROR "LibreSSL and OpenSSL not found. LibreSSL must be installed.") ++ else() ++ message(FATAL_ERROR "OpenSSL installed instead of LibreSSL. oatpp-libressl requires LibreSSL.") ++ endif() ++endif() ++get_filename_component(LIBRESSL_INCLUDE_DIR ${LIBRESSL_INCLUDE_DIR} DIRECTORY) ++find_library(LIBRESSL_TLS_LIBRARY NAMES tls tls-21 tls-20 tls-19) ++find_library(LIBRESSL_SSL_LIBRARY NAMES ssl ssl-49 ssl-48 ssl-47) ++find_library(LIBRESSL_CRYPTO_LIBRARY NAMES crypto crypto-47 crypto-46 crypto-45) ++find_library(LIBRESSL_LIBRARIES "${LIBRESSL_CRYPTO_LIBRARY};${LIBRESSL_SSL_LIBRARY};${LIBRESSL_TLS_LIBRARY}") ++message(STATUS "LIBRESSL_INCLUDE_DIR=${LIBRESSL_INCLUDE_DIR}") ++message(STATUS "LIBRESSL_TLS_LIBRARY=${LIBRESSL_TLS_LIBRARY}") ++message(STATUS "LIBRESSL_SSL_LIBRARY=${LIBRESSL_SSL_LIBRARY}") ++message(STATUS "LIBRESSL_CRYPTO_LIBRARY=${LIBRESSL_CRYPTO_LIBRARY}") ++message(STATUS "LIBRESSL_LIBRARIES=${LIBRESSL_LIBRARIES}") + + ################################################################################################### + ## define targets +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index ace3b13..489fbb1 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -30,10 +30,12 @@ target_include_directories(${OATPP_THIS_MODULE_NAME} + PUBLIC $ + ) + ++target_include_directories(${OATPP_THIS_MODULE_NAME} ++ SYSTEM PRIVATE "${LIBRESSL_INCLUDE_DIR}" ++) ++ + target_link_libraries(${OATPP_THIS_MODULE_NAME} +- PUBLIC LibreSSL::TLS +- PUBLIC LibreSSL::SSL +- PUBLIC LibreSSL::Crypto ++ PUBLIC "${LIBRESSL_TLS_LIBRARY}" "${LIBRESSL_SSL_LIBRARY}" "${LIBRESSL_CRYPTO_LIBRARY}" + ) + + ####################################################################################################### diff --git a/externals/vcpkg/ports/oatpp-libressl/portfile.cmake b/externals/vcpkg/ports/oatpp-libressl/portfile.cmake new file mode 100755 index 000000000..b21fb9af2 --- /dev/null +++ b/externals/vcpkg/ports/oatpp-libressl/portfile.cmake @@ -0,0 +1,28 @@ +set(OATPP_VERSION "1.3.0") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +# get the source +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO oatpp/oatpp-libressl + REF ${OATPP_VERSION} + SHA512 8f16c4e0341dc20e4a8a5fcdcf8e58bac1cfbef51b8cac6f5ca4894acf296333fcc2b8f34c6353cbd31a1f2f2be021550ce859489a45f388f4b5ccec4c67eee9 + HEAD_REF master + PATCHES "libress-submodule-downgrade-required-libressl-version.patch" +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DOATPP_BUILD_TESTS:BOOL=OFF" + "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" + "-DLIBRESSL_ROOT_DIR=${CURRENT_INSTALLED_DIR}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-libressl CONFIG_PATH lib/cmake/oatpp-libressl-${OATPP_VERSION}) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/oatpp-libressl/vcpkg.json b/externals/vcpkg/ports/oatpp-libressl/vcpkg.json new file mode 100755 index 000000000..96d4cc938 --- /dev/null +++ b/externals/vcpkg/ports/oatpp-libressl/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "oatpp-libressl", + "version": "1.3.0", + "description": "Oat++ libressl module providing secure server and client connection providers.", + "homepage": "https://github.com/oatpp/oatpp-libressl", + "dependencies": [ + "libressl", + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/oatpp-mbedtls/find-mbedtls.patch b/externals/vcpkg/ports/oatpp-mbedtls/find-mbedtls.patch new file mode 100755 index 000000000..533fd26d7 --- /dev/null +++ b/externals/vcpkg/ports/oatpp-mbedtls/find-mbedtls.patch @@ -0,0 +1,135 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6b1e8c0f2..b0ef5518d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -97,7 +97,7 @@ message("## ${OATPP_THIS_MODULE_NAME} module. Resolving dependencies...\n") + include(FindPkgConfig) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/module") + +-find_package(mbedtls 2.16.0 REQUIRED) ++find_package(mbedtls 2.16.3 REQUIRED) + + message("MBEDTLS_INCLUDE_DIR=${MBEDTLS_INCLUDE_DIR}") + message("MBEDTLS_TLS_LIBRARY=${MBEDTLS_TLS_LIBRARY}") +diff --git a/cmake/module/Findmbedtls.cmake b/cmake/module/Findmbedtls.cmake +index 8c76d0a73..5c223a615 100644 +--- a/cmake/module/Findmbedtls.cmake ++++ b/cmake/module/Findmbedtls.cmake +@@ -14,10 +14,10 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +-FindmbedTLS ++Findmbedtls + ------------ + +-Find the mbedTLS encryption library. ++Find the mbedtls encryption library. + + Optional Components + ^^^^^^^^^^^^^^^^^^^ +@@ -31,16 +31,16 @@ Imported Targets + This module defines the following imported targets: + + mbedtls::Crypto +- The mbedTLS crypto library, if found. ++ The mbedtls crypto library, if found. + + mbedtls::X509 +- The mbedTLS x509 library, if found. ++ The mbedtls x509 library, if found. + + mbedtls::SSL +- The mbedTLS ssl library, if found. Requires and includes mbedtls::Crypto automatically. ++ The mbedtls ssl library, if found. Requires and includes mbedtls::Crypto automatically. + + mbedtls::TLS +- The mbedTLS tls library, if found. Requires and includes mbedtls::SSL and mbedtls::Crypto automatically. ++ The mbedtls tls library, if found. Requires and includes mbedtls::SSL and mbedtls::Crypto automatically. + + Result Variables + ^^^^^^^^^^^^^^^^ +@@ -48,26 +48,26 @@ Result Variables + This module will set the following variables in your project: + + MBEDTLS_FOUND +- System has the mbedTLS library. If no components are requested it only requires the crypto library. ++ System has the mbedtls library. If no components are requested it only requires the crypto library. + MBEDTLS_INCLUDE_DIR +- The mbedTLS include directory. ++ The mbedtls include directory. + MBEDTLS_X509_LIBRARY +- The mbedTLS crypto library. ++ The mbedtls crypto library. + MBEDTLS_CRYPTO_LIBRARY +- The mbedTLS crypto library. ++ The mbedtls crypto library. + MBEDTLS_SSL_LIBRARY +- The mbedTLS SSL library. ++ The mbedtls SSL library. + MBEDTLS_TLS_LIBRARY +- The mbedTLS TLS library. ++ The mbedtls TLS library. + MBEDTLS_LIBRARIES +- All mbedTLS libraries. ++ All mbedtls libraries. + MBEDTLS_VERSION + This is set to $major.$minor.$revision (e.g. 2.6.8). + + Hints + ^^^^^ + +-Set MBEDTLS_ROOT_DIR to the root directory of an mbedTLS installation. ++Set MBEDTLS_ROOT_DIR to the root directory of an mbedtls installation. + + ]=======================================================================] + +@@ -175,7 +175,7 @@ if(MBEDTLS_INCLUDE_DIR AND EXISTS "${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h") + endif() + + # Set Find Package Arguments +-find_package_handle_standard_args(mbedTLS ++find_package_handle_standard_args(mbedtls + REQUIRED_VARS + MBEDTLS_X509_LIBRARY + MBEDTLS_TLS_LIBRARY +@@ -185,12 +185,12 @@ find_package_handle_standard_args(mbedTLS + MBEDTLS_VERSION + HANDLE_COMPONENTS + FAIL_MESSAGE +- "Could NOT find mbedTLS, try setting the path to mbedTLS using the MBEDTLS_ROOT_DIR environment variable" ++ "Could NOT find mbedtls, try setting the path to mbedtls using the MBEDTLS_ROOT_DIR environment variable" + ) + +-# mbedTLS Found +-if(MBEDTLS_FOUND) +- ++# mbedtls Found ++if(mbedtls_FOUND) ++ set(MBEDTLS_FOUND ${mbedtls_FOUND}) + # Set mbedtls::Crypto + if(NOT TARGET mbedtls::Crypto AND EXISTS "${MBEDTLS_CRYPTO_LIBRARY}") + +@@ -257,4 +257,4 @@ if(MBEDTLS_FOUND) + + endif() # mbedtls::TLS + +-endif(MBEDTLS_FOUND) ++endif(mbedtls_FOUND) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 6811f05ea..d80430c3e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -31,9 +31,9 @@ target_include_directories(${OATPP_THIS_MODULE_NAME} + ) + + target_link_libraries(${OATPP_THIS_MODULE_NAME} +- PRIVATE mbedtls::TLS +- PRIVATE mbedtls::X509 +- PRIVATE mbedtls::Crypto ++ PRIVATE ${MBEDTLS_TLS_LIBRARY} ++ PRIVATE ${MBEDTLS_X509_LIBRARY} ++ PRIVATE ${MBEDTLS_CRYPTO_LIBRARY} + ) + + if(${OATPP_MBEDTLS_DEBUG} GREATER 0) diff --git a/externals/vcpkg/ports/oatpp-mbedtls/portfile.cmake b/externals/vcpkg/ports/oatpp-mbedtls/portfile.cmake new file mode 100755 index 000000000..581d19049 --- /dev/null +++ b/externals/vcpkg/ports/oatpp-mbedtls/portfile.cmake @@ -0,0 +1,25 @@ +set(OATPP_VERSION "1.3.0") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO oatpp/oatpp-mbedtls + REF ${OATPP_VERSION} + SHA512 3eea805f2a02110daec25b7455543c59d8e72acd37d412fa98cb1c90f58e4edcd9cc62c16331efcca36a524834fa0f314f2f69a7a4d0d1108a758f811a68e021 + HEAD_REF master + PATCHES find-mbedtls.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DOATPP_BUILD_TESTS:BOOL=OFF" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-mbedtls CONFIG_PATH lib/cmake/oatpp-mbedtls-${OATPP_VERSION}) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/oatpp-mbedtls/vcpkg.json b/externals/vcpkg/ports/oatpp-mbedtls/vcpkg.json new file mode 100755 index 000000000..035f841b8 --- /dev/null +++ b/externals/vcpkg/ports/oatpp-mbedtls/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "oatpp-mbedtls", + "version": "1.3.0", + "description": "Oat++ Mbed TLS submodule providing secure server and client connection providers.", + "homepage": "https://github.com/oatpp/oatpp-mbedtls", + "dependencies": [ + "mbedtls", + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/oatpp-mongo/portfile.cmake b/externals/vcpkg/ports/oatpp-mongo/portfile.cmake new file mode 100755 index 000000000..e4cccfcd3 --- /dev/null +++ b/externals/vcpkg/ports/oatpp-mongo/portfile.cmake @@ -0,0 +1,27 @@ +set(OATPP_VERSION "1.3.0") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO oatpp/oatpp-mongo + REF ${OATPP_VERSION} + SHA512 11f4164948feb63ed3f5e8554a54348e29cd4d90333761f98c37f4eb49f129c6589955755e8e052c5c29e6b2980f1bb899657415d6480c3ae7a50fc2445afbfe + HEAD_REF master +) + +set(VCPKG_C_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") +set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DOATPP_BUILD_TESTS:BOOL=OFF" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-mongo CONFIG_PATH lib/cmake/oatpp-mongo-${OATPP_VERSION}) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/oatpp-mongo/vcpkg.json b/externals/vcpkg/ports/oatpp-mongo/vcpkg.json new file mode 100755 index 000000000..6441e67d1 --- /dev/null +++ b/externals/vcpkg/ports/oatpp-mongo/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "oatpp-mongo", + "version": "1.3.0", + "description": "Oat++ MongoDB adapter for Oat++ ORM (native client). It contains DTO to BSON mapper plus database driver.", + "homepage": "https://github.com/oatpp/oatpp-mongo", + "dependencies": [ + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/oatpp-openssl/portfile.cmake b/externals/vcpkg/ports/oatpp-openssl/portfile.cmake new file mode 100755 index 000000000..feada9b69 --- /dev/null +++ b/externals/vcpkg/ports/oatpp-openssl/portfile.cmake @@ -0,0 +1,25 @@ +set(OATPP_VERSION "1.3.0") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +# get the source +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO oatpp/oatpp-openssl + REF ${OATPP_VERSION} + SHA512 a358a98e4c7e779c4c799e55667af67530fea537103500bf07b62ee434e87241c8ce3899bd19945a942b81ae9df86e318f0a725a56f4cb7cfceb0f98e3c0378b + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DOATPP_BUILD_TESTS:BOOL=OFF" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-openssl CONFIG_PATH "lib/cmake/oatpp-openssl-${OATPP_VERSION}") +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/oatpp-openssl/vcpkg.json b/externals/vcpkg/ports/oatpp-openssl/vcpkg.json new file mode 100755 index 000000000..daa2c1850 --- /dev/null +++ b/externals/vcpkg/ports/oatpp-openssl/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "oatpp-openssl", + "version-semver": "1.3.0", + "description": "Oat++ openssl module providing secure server and client connection providers.", + "homepage": "https://github.com/oatpp/oatpp-openssl", + "dependencies": [ + "oatpp", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/oatpp-postgresql/portfile.cmake b/externals/vcpkg/ports/oatpp-postgresql/portfile.cmake new file mode 100755 index 000000000..3a080846f --- /dev/null +++ b/externals/vcpkg/ports/oatpp-postgresql/portfile.cmake @@ -0,0 +1,27 @@ +set(OATPP_VERSION "1.3.0") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO oatpp/oatpp-postgresql + REF ${OATPP_VERSION} + SHA512 6926194ae7d77db2a071fcb805ce048954908cf18d59f3095e1bf779748d9e5b9ceb657d97b1fc8a6ebfcf71936b211e2b10e68a62983e847c68ab58e1f3f2ba + HEAD_REF master +) + +set(VCPKG_C_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") +set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DOATPP_BUILD_TESTS:BOOL=OFF" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-postgresql CONFIG_PATH lib/cmake/oatpp-postgresql-${OATPP_VERSION}) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/oatpp-postgresql/vcpkg.json b/externals/vcpkg/ports/oatpp-postgresql/vcpkg.json new file mode 100755 index 000000000..ebc8584c5 --- /dev/null +++ b/externals/vcpkg/ports/oatpp-postgresql/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "oatpp-postgresql", + "version": "1.3.0", + "description": "Oat++ PostgreSQL adapter for Oat++ ORM (alpha - not all datatypes are supported).", + "homepage": "https://github.com/oatpp/oatpp-postgresql", + "dependencies": [ + "libpq", + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/oatpp-sqlite/portfile.cmake b/externals/vcpkg/ports/oatpp-sqlite/portfile.cmake new file mode 100755 index 000000000..68ce88266 --- /dev/null +++ b/externals/vcpkg/ports/oatpp-sqlite/portfile.cmake @@ -0,0 +1,25 @@ +set(OATPP_VERSION "1.3.0") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO oatpp/oatpp-sqlite + REF ${OATPP_VERSION} + SHA512 8a208145ee10ed858767b4b56c220b6befd83e6858759128103ce679b889e6218a95ed6627af5098e4d26367be8add82de26e1f1f8ef581b1913b8386f9d56de + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DOATPP_BUILD_TESTS:BOOL=OFF" + "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" + "-DOATPP_SQLITE_AMALGAMATION:BOOL=OFF" +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-sqlite CONFIG_PATH lib/cmake/oatpp-sqlite-${OATPP_VERSION}) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/oatpp-sqlite/vcpkg.json b/externals/vcpkg/ports/oatpp-sqlite/vcpkg.json new file mode 100755 index 000000000..cb307cc1a --- /dev/null +++ b/externals/vcpkg/ports/oatpp-sqlite/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "oatpp-sqlite", + "version": "1.3.0", + "description": "Oat++ SQLite adapter for Oat++ ORM.", + "homepage": "https://github.com/oatpp/oatpp-sqlite", + "dependencies": [ + "oatpp", + "sqlite3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/oatpp-ssdp/fix_String_to_string.patch b/externals/vcpkg/ports/oatpp-ssdp/fix_String_to_string.patch new file mode 100755 index 000000000..28c506a31 --- /dev/null +++ b/externals/vcpkg/ports/oatpp-ssdp/fix_String_to_string.patch @@ -0,0 +1,20 @@ +diff --git i/src/oatpp-ssdp/SimpleUdpStreamProvider.cpp w/src/oatpp-ssdp/SimpleUdpStreamProvider.cpp +index d351c1e..7c430e9 100644 +--- i/src/oatpp-ssdp/SimpleUdpStreamProvider.cpp ++++ w/src/oatpp-ssdp/SimpleUdpStreamProvider.cpp +@@ -106,7 +106,7 @@ v_io_handle SimpleUdpStreamProvider::instantiateServer() { + hints.ai_flags = AI_PASSIVE; + auto portStr = oatpp::utils::conversion::int32ToStr(m_port); + +- ret = getaddrinfo(NULL, (const char*)portStr->getData(), &hints, &result); ++ ret = getaddrinfo(NULL, (const char*)portStr->c_str(), &hints, &result); + if (ret != 0) { + OATPP_LOGE("[oatpp::ssdp::SimpleUdpStreamProvider::instantiateServer()]", "Error. Call to getaddrinfo() failed with result=%d: %s", ret, strerror(errno)); + throw std::runtime_error("[oatpp::ssdp::SimpleUdpStreamProvider::instantiateServer()]: Error. Call to getaddrinfo() failed."); +@@ -233,4 +233,4 @@ provider::ResourceHandle SimpleUdpStreamProvider::get() + ); + } + +-}} +\ No newline at end of file ++}} diff --git a/externals/vcpkg/ports/oatpp-ssdp/fix_win_close.patch b/externals/vcpkg/ports/oatpp-ssdp/fix_win_close.patch new file mode 100755 index 000000000..c64101879 --- /dev/null +++ b/externals/vcpkg/ports/oatpp-ssdp/fix_win_close.patch @@ -0,0 +1,20 @@ +diff --git i/src/oatpp-ssdp/SimpleUdpStreamProvider.cpp w/src/oatpp-ssdp/SimpleUdpStreamProvider.cpp +index d351c1e..f5774bd 100644 +--- i/src/oatpp-ssdp/SimpleUdpStreamProvider.cpp ++++ w/src/oatpp-ssdp/SimpleUdpStreamProvider.cpp +@@ -129,7 +129,7 @@ v_io_handle SimpleUdpStreamProvider::instantiateServer() { + + ret = bind(serverHandle, result->ai_addr, (int)result->ai_addrlen); + if (ret != 0) { +- ::close(serverHandle); ++ ::_close(serverHandle); + OATPP_LOGE("[oatpp::ssdp::SimpleUdpStreamProvider::instantiateServer()]", "Error. Failed to bind port %d: %s", m_port, strerror(errno)); + throw std::runtime_error("[oatpp::ssdp::SimpleUdpStreamProvider::instantiateServer()]: Error. Can't bind to address: %s"); + } +@@ -233,4 +233,4 @@ provider::ResourceHandle SimpleUdpStreamProvider::get() + ); + } + +-}} +\ No newline at end of file ++}} diff --git a/externals/vcpkg/ports/oatpp-ssdp/portfile.cmake b/externals/vcpkg/ports/oatpp-ssdp/portfile.cmake new file mode 100755 index 000000000..05381b317 --- /dev/null +++ b/externals/vcpkg/ports/oatpp-ssdp/portfile.cmake @@ -0,0 +1,28 @@ +set(OATPP_VERSION "1.3.0") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO oatpp/oatpp-ssdp + REF ${OATPP_VERSION} + SHA512 ab6f10bb79cb058eb7ce4115327e2f2d85133753d02dc2b4339505cc2ed4ef8b6284b5e832d0e190de17b8ae70e0b9a99b1b074d0691ca9a613873e8d4e1ace8 + HEAD_REF master + PATCHES + fix_String_to_string.patch + fix_win_close.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DOATPP_BUILD_TESTS:BOOL=OFF" + "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-ssdp CONFIG_PATH lib/cmake/oatpp-ssdp-${OATPP_VERSION}) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/oatpp-ssdp/vcpkg.json b/externals/vcpkg/ports/oatpp-ssdp/vcpkg.json new file mode 100755 index 000000000..fc169d634 --- /dev/null +++ b/externals/vcpkg/ports/oatpp-ssdp/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "oatpp-ssdp", + "version": "1.3.0", + "description": "Oat++ SSDP (Simple Service Discovery Protocol) submodule.", + "homepage": "https://github.com/oatpp/oatpp-ssdp", + "dependencies": [ + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/oatpp-swagger/portfile.cmake b/externals/vcpkg/ports/oatpp-swagger/portfile.cmake new file mode 100755 index 000000000..2e24c320a --- /dev/null +++ b/externals/vcpkg/ports/oatpp-swagger/portfile.cmake @@ -0,0 +1,32 @@ +set(OATPP_VERSION "1.3.0") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO oatpp/oatpp-swagger + REF ${OATPP_VERSION} + SHA512 5b4ced90690f484ebe15c3a0be47b1b851fb7b650e70c99fddc20430724aac8eff89d8c6187df750bd2ceff0e1144336f258d740fc10cdfa67a65a2f3b00d80b + HEAD_REF master +) + +if (VCPKG_CRT_LINKAGE STREQUAL "static") + set(OATPP_MSVC_LINK_STATIC_RUNTIME TRUE) +else() + set(OATPP_MSVC_LINK_STATIC_RUNTIME FALSE) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DOATPP_BUILD_TESTS:BOOL=OFF" + "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" + "-DOATPP_MSVC_LINK_STATIC_RUNTIME=${OATPP_MSVC_LINK_STATIC_RUNTIME}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-swagger CONFIG_PATH lib/cmake/oatpp-swagger-${OATPP_VERSION}) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/oatpp-swagger/vcpkg.json b/externals/vcpkg/ports/oatpp-swagger/vcpkg.json new file mode 100755 index 000000000..65dba327e --- /dev/null +++ b/externals/vcpkg/ports/oatpp-swagger/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "oatpp-swagger", + "version": "1.3.0", + "description": "Oat++ OpenApi (Swagger) UI submodule.", + "homepage": "https://github.com/oatpp/oatpp-swagger", + "dependencies": [ + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/oatpp-websocket/portfile.cmake b/externals/vcpkg/ports/oatpp-websocket/portfile.cmake new file mode 100755 index 000000000..1c6e99128 --- /dev/null +++ b/externals/vcpkg/ports/oatpp-websocket/portfile.cmake @@ -0,0 +1,31 @@ +set(OATPP_VERSION "1.3.0") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO oatpp/oatpp-websocket + REF ${OATPP_VERSION} + SHA512 e5d5f974da4fd95599352d04d18422c74b274be50a803cdb0b65674ebde8dfe8587c44ddb8b376ad866de06841935687be4294ac5954f33f0a087b009da23177 + HEAD_REF master +) + +if (VCPKG_CRT_LINKAGE STREQUAL "static") + set(OATPP_MSVC_LINK_STATIC_RUNTIME TRUE) +else() + set(OATPP_MSVC_LINK_STATIC_RUNTIME FALSE) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DOATPP_BUILD_TESTS:BOOL=OFF" + "-DOATPP_MSVC_LINK_STATIC_RUNTIME=${OATPP_MSVC_LINK_STATIC_RUNTIME}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-websocket CONFIG_PATH lib/cmake/oatpp-websocket-${OATPP_VERSION}) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/oatpp-websocket/vcpkg.json b/externals/vcpkg/ports/oatpp-websocket/vcpkg.json new file mode 100755 index 000000000..5a28f2bdd --- /dev/null +++ b/externals/vcpkg/ports/oatpp-websocket/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "oatpp-websocket", + "version": "1.3.0", + "description": "Oat++ websocket module.", + "homepage": "https://github.com/oatpp/oatpp-websocket", + "dependencies": [ + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/oatpp-zlib/portfile.cmake b/externals/vcpkg/ports/oatpp-zlib/portfile.cmake new file mode 100755 index 000000000..3759757ef --- /dev/null +++ b/externals/vcpkg/ports/oatpp-zlib/portfile.cmake @@ -0,0 +1,27 @@ +set(OATPP_VERSION "1.3.0") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO oatpp/oatpp-zlib + REF ${OATPP_VERSION} + SHA512 574f0440cbb2cd2bc14ad89e33538a1a300ad23ecc941629b74aa8ccb9aeae5158b1b57e2f1af09d7a6b9b97430a5685354677002dab2261120afa9c6ea74381 + HEAD_REF master +) + +set(VCPKG_C_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") +set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DOATPP_BUILD_TESTS:BOOL=OFF" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-zlib CONFIG_PATH lib/cmake/oatpp-zlib-${OATPP_VERSION}) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/oatpp-zlib/vcpkg.json b/externals/vcpkg/ports/oatpp-zlib/vcpkg.json new file mode 100755 index 000000000..5b0feb184 --- /dev/null +++ b/externals/vcpkg/ports/oatpp-zlib/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "oatpp-zlib", + "version": "1.3.0", + "description": "Oat++ functionality for automatically compressing/decompressing content with deflate and gzip.", + "homepage": "https://github.com/oatpp/oatpp-zlib", + "dependencies": [ + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/oatpp/portfile.cmake b/externals/vcpkg/ports/oatpp/portfile.cmake new file mode 100755 index 000000000..cf8513449 --- /dev/null +++ b/externals/vcpkg/ports/oatpp/portfile.cmake @@ -0,0 +1,32 @@ +set(OATPP_VERSION "1.3.0") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO oatpp/oatpp + REF ${OATPP_VERSION} + SHA512 4fe8587efe1b4ecae14554ec8edb209e5558a3e4a4e6ff49bbfaaf06d2cc12f2cc306c5edc43b8dafc465aff53098ad4bebb9971694761b91a553730d5acb59a + HEAD_REF master +) + +if (VCPKG_CRT_LINKAGE STREQUAL "static") + set(OATPP_MSVC_LINK_STATIC_RUNTIME TRUE) +else() + set(OATPP_MSVC_LINK_STATIC_RUNTIME FALSE) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DOATPP_BUILD_TESTS:BOOL=OFF" + "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" + "-DOATPP_MSVC_LINK_STATIC_RUNTIME=${OATPP_MSVC_LINK_STATIC_RUNTIME}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp CONFIG_PATH lib/cmake/oatpp-${OATPP_VERSION}) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/oatpp/vcpkg.json b/externals/vcpkg/ports/oatpp/vcpkg.json new file mode 100755 index 000000000..8e7a81840 --- /dev/null +++ b/externals/vcpkg/ports/oatpp/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "oatpp", + "version": "1.3.0", + "description": "Modern web framework.", + "homepage": "https://github.com/oatpp/oatpp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/observer-ptr-lite/portfile.cmake b/externals/vcpkg/ports/observer-ptr-lite/portfile.cmake new file mode 100755 index 000000000..60b42bcab --- /dev/null +++ b/externals/vcpkg/ports/observer-ptr-lite/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO martinmoene/observer-ptr-lite + REF v0.4.0 + SHA512 4e53d8e0ce595604880bda423440071e7c207dd63e7b6bfa09cc7a870a010f09c51c31e640142c565ce261c4911acab13c6e9f5970853ad8fc2da3e4034ab7d7 +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DNSOP_OPT_BUILD_TESTS=OFF + -DNSOP_OPT_BUILD_EXAMPLES=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets( + CONFIG_PATH lib/cmake/${PORT} +) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug + ${CURRENT_PACKAGES_DIR}/lib +) + +file(INSTALL + ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright +) diff --git a/externals/vcpkg/ports/observer-ptr-lite/vcpkg.json b/externals/vcpkg/ports/observer-ptr-lite/vcpkg.json new file mode 100755 index 000000000..e2d705465 --- /dev/null +++ b/externals/vcpkg/ports/observer-ptr-lite/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "observer-ptr-lite", + "version-string": "0.4.0", + "port-version": 1, + "description": "A C++17-like observer_ptr for C++98 and later in a single-file header-only library" +} diff --git a/externals/vcpkg/ports/ocilib/fix-DisableWC4191.patch b/externals/vcpkg/ports/ocilib/fix-DisableWC4191.patch new file mode 100755 index 000000000..2e835bf07 --- /dev/null +++ b/externals/vcpkg/ports/ocilib/fix-DisableWC4191.patch @@ -0,0 +1,40 @@ +diff --git a/proj/dll/ocilib_dll_vs2019.vcxproj b/proj/dll/ocilib_dll_vs2019.vcxproj +index 2d5b3bf..35e4684 100644 +--- a/proj/dll/ocilib_dll_vs2019.vcxproj ++++ b/proj/dll/ocilib_dll_vs2019.vcxproj +@@ -116,7 +116,7 @@ + + + EnableAllWarnings +- true ++ false + + + CompileAsC +@@ -173,7 +173,7 @@ + + CompileAsC + 4255;4668;4996;4710;4711;4738;4774;4820;5045 +- true ++ false + + + OCI_CHARSET_ANSI;%(PreprocessorDefinitions) +@@ -223,7 +223,7 @@ + + CompileAsC + 4255;4668;4996;4710;4711;4738;4774;4820;5045 +- true ++ false + + + OCI_CHARSET_WIDE;%(PreprocessorDefinitions) +@@ -276,7 +276,7 @@ + + CompileAsC + 4255;4668;4996;4710;4711;4738;4774;4820;5045 +- true ++ false + + + OCI_CHARSET_WIDE;%(PreprocessorDefinitions) diff --git a/externals/vcpkg/ports/ocilib/portfile.cmake b/externals/vcpkg/ports/ocilib/portfile.cmake new file mode 100755 index 000000000..2c53be8c9 --- /dev/null +++ b/externals/vcpkg/ports/ocilib/portfile.cmake @@ -0,0 +1,51 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO vrogier/ocilib + REF v4.7.3 + SHA512 80cf1f76420b506789b1f7edd9af826801236499dd0757be3438e3cdf286b95ddd7dd35909622b3862244f6b535a8744f0b25989fb3740a4a0fd984410fb420b + HEAD_REF master + PATCHES fix-DisableWC4191.patch +) + +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(PLATFORM x86) + else() + set(PLATFORM x64) + endif() + + # There is no debug configuration + # As it is a C library, build the release configuration and copy its output to the debug folder + set(VCPKG_BUILD_TYPE release) + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH proj/dll/ocilib_dll_vs2019.sln + INCLUDES_SUBPATH include + LICENSE_SUBPATH LICENSE + RELEASE_CONFIGURATION "Release - ANSI" + PLATFORM ${PLATFORM} + USE_VCPKG_INTEGRATION + ALLOW_ROOT_INCLUDES) + + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug") + file(COPY "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + endif() +else() + vcpkg_configure_make( + COPY_SOURCE + AUTOCONFIG + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + --with-oracle-import=runtime + ) + + vcpkg_install_make() + vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + file(RENAME "${CURRENT_PACKAGES_DIR}/share/doc/${PORT}" "${CURRENT_PACKAGES_DIR}/share/${PORT}") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") + file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/externals/vcpkg/ports/ocilib/vcpkg.json b/externals/vcpkg/ports/ocilib/vcpkg.json new file mode 100755 index 000000000..741304b0a --- /dev/null +++ b/externals/vcpkg/ports/ocilib/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "ocilib", + "version": "4.7.3", + "port-version": 2, + "description": "OCILIB is an open source and cross platform Oracle Driver that delivers efficient access to Oracle databases.", + "homepage": "https://vrogier.github.io/ocilib/", + "license": "Apache-2.0", + "supports": "!(arm | uwp)" +} diff --git a/externals/vcpkg/ports/octomap/001-fix-exported-targets.patch b/externals/vcpkg/ports/octomap/001-fix-exported-targets.patch new file mode 100755 index 000000000..c2b8e04dd --- /dev/null +++ b/externals/vcpkg/ports/octomap/001-fix-exported-targets.patch @@ -0,0 +1,78 @@ +diff --git a/octomap/src/CMakeLists.txt b/octomap/src/CMakeLists.txt +index 45b384f..ab1b6b1 100644 +--- a/octomap/src/CMakeLists.txt ++++ b/octomap/src/CMakeLists.txt +@@ -8,17 +8,16 @@ SET (octomap_SRCS + OcTreeNode.cpp + OcTreeStamped.cpp + ColorOcTree.cpp +- ) ++) ++ + +-# dynamic and static libs, see CMake FAQ: +-ADD_LIBRARY( octomap SHARED ${octomap_SRCS}) +-set_target_properties( octomap PROPERTIES ++ADD_LIBRARY(octomap ${octomap_SRCS}) ++set_target_properties(octomap PROPERTIES + VERSION ${OCTOMAP_VERSION} + SOVERSION ${OCTOMAP_SOVERSION} ++ OUTPUT_NAME "octomap" + ) +-ADD_LIBRARY( octomap-static STATIC ${octomap_SRCS}) +-SET_TARGET_PROPERTIES(octomap-static PROPERTIES OUTPUT_NAME "octomap") +-add_dependencies(octomap-static octomath-static) ++ + + TARGET_LINK_LIBRARIES(octomap octomath) + +@@ -26,7 +25,7 @@ if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap") + file(MAKE_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap") + endif() + +-export(TARGETS octomap octomap-static ++export(TARGETS octomap + APPEND FILE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap/octomap-targets.cmake") + + ADD_SUBDIRECTORY( testing ) +@@ -67,7 +66,7 @@ TARGET_LINK_LIBRARIES(intersection_example octomap) + ADD_EXECUTABLE(octree2pointcloud octree2pointcloud.cpp) + TARGET_LINK_LIBRARIES(octree2pointcloud octomap) + +-install(TARGETS octomap octomap-static ++install(TARGETS octomap + EXPORT octomap-targets + INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + ${INSTALL_TARGETS_DEFAULT_ARGS} +diff --git a/octomap/src/math/CMakeLists.txt b/octomap/src/math/CMakeLists.txt +index 3b47ec4..6a75170 100644 +--- a/octomap/src/math/CMakeLists.txt ++++ b/octomap/src/math/CMakeLists.txt +@@ -5,24 +5,22 @@ SET (octomath_SRCS + ) + + +-ADD_LIBRARY( octomath SHARED ${octomath_SRCS}) ++ADD_LIBRARY(octomath ${octomath_SRCS}) + + SET_TARGET_PROPERTIES( octomath PROPERTIES + VERSION ${OCTOMAP_VERSION} + SOVERSION ${OCTOMAP_SOVERSION} + ) + +-ADD_LIBRARY( octomath-static STATIC ${octomath_SRCS}) +-SET_TARGET_PROPERTIES(octomath-static PROPERTIES OUTPUT_NAME "octomath") + + if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap") + file(MAKE_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap") + endif() + +-export(TARGETS octomath octomath-static ++export(TARGETS octomath + APPEND FILE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap/octomap-targets.cmake") + +-install(TARGETS octomath octomath-static ++install(TARGETS octomath + EXPORT octomap-targets + INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + ${INSTALL_TARGETS_DEFAULT_ARGS} diff --git a/externals/vcpkg/ports/octomap/portfile.cmake b/externals/vcpkg/ports/octomap/portfile.cmake new file mode 100755 index 000000000..0730461b6 --- /dev/null +++ b/externals/vcpkg/ports/octomap/portfile.cmake @@ -0,0 +1,46 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO OctoMap/octomap + REF v1.9.5 + SHA512 e58c6d33c351b14e9596e18a8702715d167c136fd029b1078ddd13a5926fe451d3b619231b5a8ccfb64b6e5fc6db8b57e6ef329099828d2f5195c0988700b581 + HEAD_REF master + PATCHES + "001-fix-exported-targets.patch" +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DBUILD_TESTING=OFF + -DBUILD_OCTOVIS_SUBPROJECT=OFF + -DBUILD_DYNAMICETD3D_SUBPROJECT=OFF +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_copy_tools( + TOOL_NAMES binvox2bt bt2vrml compare_octrees convert_octree edit_octree eval_octree_accuracy graph2tree log2graph + AUTO_CLEAN) + +vcpkg_fixup_cmake_targets() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/octomap") + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/octomap/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/octomap/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/octomap/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..2dd237e71 --- /dev/null +++ b/externals/vcpkg/ports/octomap/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,15 @@ +_find_package(${ARGS}) + +if(TARGET octomap AND NOT TARGET octomap-static) + add_library(octomap-static INTERFACE IMPORTED) + set_target_properties(octomap-static PROPERTIES INTERFACE_LINK_LIBRARIES "octomap") + + add_library(octomath-static INTERFACE IMPORTED) + set_target_properties(octomath-static PROPERTIES INTERFACE_LINK_LIBRARIES "octomath") +elseif(TARGET octomap-static AND NOT TARGET octomap) + add_library(octomap INTERFACE IMPORTED) + set_target_properties(octomap PROPERTIES INTERFACE_LINK_LIBRARIES "octomap-static") + + add_library(octomath INTERFACE IMPORTED) + set_target_properties(octomath PROPERTIES INTERFACE_LINK_LIBRARIES "octomath-static") +endif() diff --git a/externals/vcpkg/ports/octomap/vcpkg.json b/externals/vcpkg/ports/octomap/vcpkg.json new file mode 100755 index 000000000..a68ad430a --- /dev/null +++ b/externals/vcpkg/ports/octomap/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "octomap", + "version-string": "1.9.5", + "port-version": 2, + "description": "An Efficient Probabilistic 3D Mapping Framework Based on Octrees", + "homepage": "https://octomap.github.io/" +} diff --git a/externals/vcpkg/ports/ode/portfile.cmake b/externals/vcpkg/ports/ode/portfile.cmake new file mode 100755 index 000000000..9b68b29f7 --- /dev/null +++ b/externals/vcpkg/ports/ode/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_bitbucket( + OUT_SOURCE_PATH SOURCE_PATH + REPO odedevs/ode + REF 0.16.1 + SHA512 04429cae1b8fc703e53880c5de78293cee46fe4855c96ca7006bd5848255a0df004b75716a6b30ff5176df004e2bec29b2a31d4af8e7ac59da18f0af2eed8396 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -DODE_WITH_DEMOS=0 -DODE_WITH_TESTS=0 +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ode-0.16.1) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/ode-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/ode-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") +endif() +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake") + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/ode/vcpkg.json b/externals/vcpkg/ports/ode/vcpkg.json new file mode 100755 index 000000000..32f3365c6 --- /dev/null +++ b/externals/vcpkg/ports/ode/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "ode", + "version": "0.16.1", + "port-version": 3, + "description": "Open Dynamics Engine", + "homepage": "https://bitbucket.org/odedevs/ode/src/default/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/offscale-libetcd-cpp/fix-dependency-grpc.patch b/externals/vcpkg/ports/offscale-libetcd-cpp/fix-dependency-grpc.patch new file mode 100755 index 000000000..652720333 --- /dev/null +++ b/externals/vcpkg/ports/offscale-libetcd-cpp/fix-dependency-grpc.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0d9aad9..d68c5f7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -70,7 +70,7 @@ endif() + target_include_directories(etcdcpp PRIVATE "generated/") + target_include_directories(etcdcpp INTERFACE "${CMAKE_INSTALL_PREFIX}/include") + +-target_link_libraries(etcdcpp PRIVATE gRPC::gpr gRPC::grpc gRPC::grpc++ gRPC::grpc_cronet) ++target_link_libraries(etcdcpp PRIVATE gRPC::gpr gRPC::grpc gRPC::grpc++ gRPC::grpc++_alts) + target_link_libraries(etcdcpp PRIVATE protobuf::libprotoc protobuf::libprotobuf) + + install(TARGETS etcdcpp EXPORT etcdcpp DESTINATION lib) diff --git a/externals/vcpkg/ports/offscale-libetcd-cpp/install-debug.patch b/externals/vcpkg/ports/offscale-libetcd-cpp/install-debug.patch new file mode 100755 index 000000000..ee63620f0 --- /dev/null +++ b/externals/vcpkg/ports/offscale-libetcd-cpp/install-debug.patch @@ -0,0 +1,11 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0d9aad9..7bdde1b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -77,5 +77,5 @@ install(TARGETS etcdcpp EXPORT etcdcpp DESTINATION lib) + + if (${CMAKE_BUILD_TYPE} STREQUAL "Release") + install(FILES ${proto_hs} DESTINATION include/libetcd/) +- install(EXPORT etcdcpp DESTINATION share/etcdcpp/ FILE etcdcppConfig.cmake) + endif() ++install(EXPORT etcdcpp DESTINATION share/etcdcpp/ FILE etcdcppConfig.cmake) diff --git a/externals/vcpkg/ports/offscale-libetcd-cpp/portfile.cmake b/externals/vcpkg/ports/offscale-libetcd-cpp/portfile.cmake new file mode 100755 index 000000000..a299682f5 --- /dev/null +++ b/externals/vcpkg/ports/offscale-libetcd-cpp/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO offscale/libetcd-cpp + REF 8607d8d7080c6eb447bc41b799a24bfdb87cf638 + SHA512 9bf4bf14fd52f4f6bbf8cf68de61e6a19eeffbdc501f05c8f614b5f13f206410884afd7fe226a077448e58e02990c65a6b27ee895ed34ba5ee701abe0500b875 + HEAD_REF master + PATCHES + fix-dependency-grpc.patch + install-debug.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE # see https://github.com/microsoft/vcpkg/pull/21168#issuecomment-961588989 why +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME etcdcpp) +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE-MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/offscale-libetcd-cpp/vcpkg.json b/externals/vcpkg/ports/offscale-libetcd-cpp/vcpkg.json new file mode 100755 index 000000000..f2f2ec16c --- /dev/null +++ b/externals/vcpkg/ports/offscale-libetcd-cpp/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "offscale-libetcd-cpp", + "version-date": "2019-07-10", + "port-version": 3, + "description": "A C++ client library for etcd. etcd is a distributed, reliable key-value store.", + "homepage": "https://github.com/offscale/libetcd-cpp", + "dependencies": [ + "grpc", + "protobuf", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ogdf/fix-c4723.patch b/externals/vcpkg/ports/ogdf/fix-c4723.patch new file mode 100755 index 000000000..14401c7a9 --- /dev/null +++ b/externals/vcpkg/ports/ogdf/fix-c4723.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/compiler-specifics.cmake b/cmake/compiler-specifics.cmake +index 2446f32..45b00ac 100644 +--- a/cmake/compiler-specifics.cmake ++++ b/cmake/compiler-specifics.cmake +@@ -40,7 +40,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") + set(available_default_warning_flags_release "${available_default_warning_flags_release} -Wno-error=unused-variable") + set(warnings_as_errors_flag "-Werror") + elseif(MSVC) +- set(available_default_warning_flags "/W3 /wd4018 /wd4068 /wd4101 /wd4244 /wd4250 /wd4267 /wd4373 /wd4800 /wd4996") ++ set(available_default_warning_flags "/W3 /wd4018 /wd4068 /wd4101 /wd4244 /wd4250 /wd4267 /wd4373 /wd4800 /wd4996 /wd4723") + # this has to be explained because MSVC is so cryptic: + # /W3 sets the warning level of MSVC to 3 (all warnings except informational warnings), + # /wd disables the warning with the specific code, diff --git a/externals/vcpkg/ports/ogdf/portfile.cmake b/externals/vcpkg/ports/ogdf/portfile.cmake new file mode 100755 index 000000000..45951698a --- /dev/null +++ b/externals/vcpkg/ports/ogdf/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ogdf/ogdf + REF 8a103cf3a7dfff87fe8b7534575604bc53c0870c + SHA512 264e8586be7a18640f253eb7b289dd99f1f2fc42c4d2304ab12f7c6aa9c5754b710642e7296038aea0cd9368d732d0106501fefed800743b403adafff7e3f0b2 + HEAD_REF master + PATCHES fix-c4723.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCOIN_INSTALL_LIBRARY_DIR:STRING=lib + -DCOIN_INSTALL_CMAKE_DIR:STRING=lib/cmake/OGDF + -DOGDF_INSTALL_LIBRARY_DIR:STRING=lib + -DOGDF_INSTALL_CMAKE_DIR:STRING=lib/cmake/OGDF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/OGDF) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/minisat/doc ${CURRENT_PACKAGES_DIR}/include/ogdf/lib/minisat/doc) diff --git a/externals/vcpkg/ports/ogdf/vcpkg.json b/externals/vcpkg/ports/ogdf/vcpkg.json new file mode 100755 index 000000000..dc21d5e43 --- /dev/null +++ b/externals/vcpkg/ports/ogdf/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "ogdf", + "version-string": "2019-08-23", + "port-version": 2, + "description": "Open Graph Drawing Framework", + "homepage": "https://github.com/ogdf/ogdf" +} diff --git a/externals/vcpkg/ports/ogre-next/environment-overrides.cmake b/externals/vcpkg/ports/ogre-next/environment-overrides.cmake new file mode 100755 index 000000000..4957cdcd5 --- /dev/null +++ b/externals/vcpkg/ports/ogre-next/environment-overrides.cmake @@ -0,0 +1,16 @@ +#[[ + +Building steps for ogre-next[d3d9]: + +1. Download and install "Microsoft DirectX SDK" +https://www.microsoft.com/en-us/download/confirmation.aspx?id=6812 + +2. Set env variable +set DXSDK_DIR=C:/Program Files (x86)/Microsoft DirectX SDK (June 2010) + +3. Install port +.\vcpkg.exe install ogre-next[d3d9] --triplet x64-windows + +]] + +set(VCPKG_ENV_PASSTHROUGH DXSDK_DIR) diff --git a/externals/vcpkg/ports/ogre-next/fix_find_package_sdl2.patch b/externals/vcpkg/ports/ogre-next/fix_find_package_sdl2.patch new file mode 100755 index 000000000..47aa01afb --- /dev/null +++ b/externals/vcpkg/ports/ogre-next/fix_find_package_sdl2.patch @@ -0,0 +1,77 @@ +diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake +index 3f3e2d7..0cc9606 100644 +--- a/CMake/Dependencies.cmake ++++ b/CMake/Dependencies.cmake +@@ -267,7 +267,7 @@ endif() + ####################################################################### + + # Find sdl2 +-find_package(SDL2) ++find_package(SDL2 CONFIG REQUIRED) + macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library" "https://www.libsdl.org/" FALSE "" "") + + ####################################################################### +diff --git a/CMake/InstallDependencies.cmake b/CMake/InstallDependencies.cmake +index f98b358..e5eb9ed 100644 +--- a/CMake/InstallDependencies.cmake ++++ b/CMake/InstallDependencies.cmake +@@ -100,8 +100,6 @@ if (OGRE_INSTALL_DEPENDENCIES) + endif () + + if( OGRE_BUILD_SAMPLES2 ) +- install_debug(SDL2.dll) +- install_release(SDL2.dll) + install_debug(openvr_api.dll) + install_release(openvr_api.dll) + install_debug(openvr_api.pdb) +diff --git a/CMake/Packages/FindSDL2.cmake b/CMake/Packages/FindSDL2.cmake +index 4b42a51..793eb71 100644 +--- a/CMake/Packages/FindSDL2.cmake ++++ b/CMake/Packages/FindSDL2.cmake +@@ -182,7 +182,7 @@ ENDIF(SDL2_LIBRARY_TEMP) + INCLUDE(FindPackageHandleStandardArgs) + + FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 +- REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR) ++ REQUIRED_VARS SDL2::SDL2 SDL2_INCLUDE_DIR) + + if (WIN32) + set(SDL2_BIN_SEARCH_PATH ${OGRE_DEPENDENCIES_DIR}/bin ${CMAKE_SOURCE_DIR}/Dependencies/bin ${SDL2_HOME}/dll +@@ -201,6 +201,6 @@ IF(SDL2_STATIC) + if (UNIX AND NOT APPLE) + EXECUTE_PROCESS(COMMAND sdl2-config --static-libs OUTPUT_VARIABLE SDL2_LINK_FLAGS) + STRING(REGEX REPLACE "(\r?\n)+$" "" SDL2_LINK_FLAGS "${SDL2_LINK_FLAGS}") +- SET(SDL2_LIBRARY ${SDL2_LINK_FLAGS}) ++ SET(SDL2::SDL2 ${SDL2_LINK_FLAGS}) + ENDIF() + ENDIF(SDL2_STATIC) +diff --git a/Samples/2.0/Common/CMakeLists.txt b/Samples/2.0/Common/CMakeLists.txt +index b21601e..4ef90bd 100644 +--- a/Samples/2.0/Common/CMakeLists.txt ++++ b/Samples/2.0/Common/CMakeLists.txt +@@ -49,4 +49,4 @@ add_library(${OGRE_SAMPLES_COMMON_LIBRARY} STATIC ${SOURCE_FILES} ${HEADER_FILES + + link_directories(${CMAKE_CURRENT_BINARY_DIR}) + +-target_link_libraries(${OGRE_SAMPLES_COMMON_LIBRARY} ${SDL2_LIBRARY} OgreHlmsPbs OgreHlmsUnlit) ++target_link_libraries(${OGRE_SAMPLES_COMMON_LIBRARY} SDL2::SDL2 OgreHlmsPbs OgreHlmsUnlit) +diff --git a/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake b/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake +index 5e80709..3ba9b5a 100644 +--- a/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake ++++ b/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake +@@ -224,13 +224,13 @@ endif() + + if( NOT IOS ) + set( CMAKE_PREFIX_PATH "${OGRE_SOURCE}/Dependencies ${CMAKE_PREFIX_PATH}" ) +- find_package( SDL2 ) ++ find_package(SDL2 CONFIG REQUIRED) + if( NOT SDL2_FOUND ) + message( "Could not find SDL2. https://www.libsdl.org/" ) + else() + message( STATUS "Found SDL2" ) + include_directories( ${SDL2_INCLUDE_DIR} ) +- set( OGRE_DEPENDENCY_LIBS ${OGRE_DEPENDENCY_LIBS} ${SDL2_LIBRARY} ) ++ set( OGRE_DEPENDENCY_LIBS ${OGRE_DEPENDENCY_LIBS} SDL2::SDL2 ) + endif() + endif() + diff --git a/externals/vcpkg/ports/ogre-next/portfile.cmake b/externals/vcpkg/ports/ogre-next/portfile.cmake new file mode 100755 index 000000000..5766b5d9c --- /dev/null +++ b/externals/vcpkg/ports/ogre-next/portfile.cmake @@ -0,0 +1,119 @@ +# This portfile is based (shamelessly copied and adapted a bit) on 'ogre' portfile. +if (EXISTS "${CURRENT_INSTALLED_DIR}/Media/HLMS/Blendfunctions_piece_fs.glslt") + message(FATAL_ERROR "FATAL ERROR: ogre-next and ogre are incompatible.") +endif() + +if(NOT VCPKG_TARGET_IS_WINDOWS) + message("${PORT} currently requires the following library from the system package manager:\n Xaw\n\nIt can be installed on Ubuntu systems via apt-get install libxaw7-dev") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO OGRECave/ogre-next + REF 10b56694f33fd6ead1c501eb90379bcac671d841 #v2.3.0 + SHA512 b2f1c55655582b2844b7c10cce965cc5268829a0702b09abcfe04fba8db00ad032f605d683c88811f77f9b7b4fb8a1095079f1a1c96bbe9fd022621f4ff4cf81 + HEAD_REF master + PATCHES + toolchain_fixes.patch + fix_find_package_sdl2.patch +) + +file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake") + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(OGRE_STATIC ON) +else() + set(OGRE_STATIC OFF) +endif() + + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9 + java OGRE_BUILD_COMPONENT_JAVA + python OGRE_BUILD_COMPONENT_PYTHON + csharp OGRE_BUILD_COMPONENT_CSHARP +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DOGRE_BUILD_DEPENDENCIES=OFF + -DOGRE_COPY_DEPENDENCIES=OFF + -DOGRE_BUILD_SAMPLES=OFF + -DOGRE_BUILD_TESTS=OFF + -DOGRE_BUILD_TOOLS=OFF + -DOGRE_BUILD_MSVC_MP=ON + -DOGRE_BUILD_MSVC_ZM=ON + -DOGRE_INSTALL_DEPENDENCIES=OFF + -DOGRE_INSTALL_DOCS=OFF + -DOGRE_INSTALL_PDB=OFF + -DOGRE_INSTALL_SAMPLES=OFF + -DOGRE_INSTALL_TOOLS=OFF + -DOGRE_INSTALL_VSPROPS=OFF + -DOGRE_STATIC=${OGRE_STATIC} + -DOGRE_CONFIG_THREAD_PROVIDER=std + -DOGRE_BUILD_RENDERSYSTEM_D3D11=ON + -DOGRE_BUILD_RENDERSYSTEM_GL=ON + -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=ON + -DOGRE_BUILD_RENDERSYSTEM_GLES=OFF + -DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF + -DOGRE_CMAKE_DIR=share/ogre-next +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup() + + + +file(GLOB REL_CFGS "${CURRENT_PACKAGES_DIR}/bin/*.cfg") +if(REL_CFGS) + file(COPY ${REL_CFGS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(REMOVE ${REL_CFGS}) +endif() + +file(GLOB DBG_CFGS "${CURRENT_PACKAGES_DIR}/debug/bin/*.cfg") +if(DBG_CFGS) + file(COPY ${DBG_CFGS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(REMOVE ${DBG_CFGS}) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +#Remove OgreMain*.lib from lib/ folder, because autolink would complain, since it defines a main symbol +#manual-link subfolder is here to the rescue! +if(VCPKG_TARGET_IS_WINDOWS) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/release/OgreMain.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMain.lib") + else() + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/release/OgreMainStatic.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib") + endif() + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/debug/OgreMain_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMain_d.lib") + else() + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/debug/OgreMainStatic_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMainStatic_d.lib") + endif() + endif() + + file(GLOB SHARE_FILES "${CURRENT_PACKAGES_DIR}/share/ogre-next/*.cmake") + foreach(SHARE_FILE ${SHARE_FILES}) + file(READ "${SHARE_FILE}" _contents) + string(REPLACE "lib/OgreMain" "lib/manual-link/OgreMain" _contents "${_contents}") + file(WRITE "${SHARE_FILE}" "${_contents}") + endforeach() +endif() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/externals/vcpkg/ports/ogre-next/toolchain_fixes.patch b/externals/vcpkg/ports/ogre-next/toolchain_fixes.patch new file mode 100755 index 000000000..ff5eb4850 --- /dev/null +++ b/externals/vcpkg/ports/ogre-next/toolchain_fixes.patch @@ -0,0 +1,231 @@ +diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt +index f3a62f2..b53df6f 100644 +--- a/CMake/CMakeLists.txt ++++ b/CMake/CMakeLists.txt +@@ -13,10 +13,12 @@ + # directory, but can also be used for custom projects. + ############################################################# + +-if(WIN32 OR APPLE) +- set(OGRE_CMAKE_DIR "CMake") +-else() +- set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake") ++if(NOT DEFINED OGRE_CMAKE_DIR) ++ if(WIN32 OR APPLE) ++ set(OGRE_CMAKE_DIR "CMake") ++ else() ++ set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake") ++ endif() + endif() + + set(INST_FILES +diff --git a/CMake/Packages/FindFreeImage.cmake b/CMake/Packages/FindFreeImage.cmake +index 7c89ec5..d8314f0 100644 +--- a/CMake/Packages/FindFreeImage.cmake ++++ b/CMake/Packages/FindFreeImage.cmake +@@ -43,7 +43,7 @@ find_path(FreeImage_INCLUDE_DIR NAMES FreeImage.h HINTS ${FreeImage_INC_SEARCH_P + find_library(FreeImage_LIBRARY_REL NAMES ${FreeImage_LIBRARY_NAMES} HINTS ${FreeImage_LIB_SEARCH_PATH} ${FreeImage_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) + find_library(FreeImage_LIBRARY_DBG NAMES ${FreeImage_LIBRARY_NAMES_DBG} HINTS ${FreeImage_LIB_SEARCH_PATH} ${FreeImage_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug) + +-make_library_set(FreeImage_LIBRARY) ++make_library_set(FreeImage) + + findpkg_finish(FreeImage) + +diff --git a/CMake/Packages/FindGLSLOptimizer.cmake b/CMake/Packages/FindGLSLOptimizer.cmake +index dd4b179..6f158fc 100644 +--- a/CMake/Packages/FindGLSLOptimizer.cmake ++++ b/CMake/Packages/FindGLSLOptimizer.cmake +@@ -38,7 +38,7 @@ findpkg_framework(GLSL_Optimizer) + find_path(GLSL_Optimizer_INCLUDE_DIR NAMES glsl_optimizer.h HINTS ${GLSL_Optimizer_INC_SEARCH_PATH} ${GLSL_Optimizer_PKGC_INCLUDE_DIRS} PATH_SUFFIXES GLSL_Optimizer) + find_library(GLSL_Optimizer_LIBRARY_REL NAMES ${GLSL_Optimizer_LIBRARY_NAMES} HINTS ${GLSL_Optimizer_LIB_SEARCH_PATH} ${GLSL_Optimizer_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) + find_library(GLSL_Optimizer_LIBRARY_DBG NAMES ${GLSL_Optimizer_LIBRARY_NAMES_DBG} HINTS ${GLSL_Optimizer_LIB_SEARCH_PATH} ${GLSL_Optimizer_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug) +-make_library_set(GLSL_Optimizer_LIBRARY) ++make_library_set(GLSL_Optimizer) + + findpkg_finish(GLSL_Optimizer) + add_parent_dir(GLSL_Optimizer_INCLUDE_DIRS GLSL_Optimizer_INCLUDE_DIR) +diff --git a/CMake/Packages/FindHLSL2GLSL.cmake b/CMake/Packages/FindHLSL2GLSL.cmake +index 7125895..13a306f 100644 +--- a/CMake/Packages/FindHLSL2GLSL.cmake ++++ b/CMake/Packages/FindHLSL2GLSL.cmake +@@ -38,7 +38,7 @@ findpkg_framework(HLSL2GLSL) + find_path(HLSL2GLSL_INCLUDE_DIR NAMES hlsl2glsl.h HINTS ${HLSL2GLSL_INC_SEARCH_PATH} ${HLSL2GLSL_PKGC_INCLUDE_DIRS} PATH_SUFFIXES HLSL2GLSL) + find_library(HLSL2GLSL_LIBRARY_REL NAMES ${HLSL2GLSL_LIBRARY_NAMES} HINTS ${HLSL2GLSL_LIB_SEARCH_PATH} ${HLSL2GLSL_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) + find_library(HLSL2GLSL_LIBRARY_DBG NAMES ${HLSL2GLSL_LIBRARY_NAMES_DBG} HINTS ${HLSL2GLSL_LIB_SEARCH_PATH} ${HLSL2GLSL_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug) +-make_library_set(HLSL2GLSL_LIBRARY) ++make_library_set(HLSL2GLSL) + + findpkg_finish(HLSL2GLSL) + add_parent_dir(HLSL2GLSL_INCLUDE_DIRS HLSL2GLSL_INCLUDE_DIR) +diff --git a/CMake/Packages/FindNVAPI.cmake b/CMake/Packages/FindNVAPI.cmake +index 95c70cd..893ce01 100644 +--- a/CMake/Packages/FindNVAPI.cmake ++++ b/CMake/Packages/FindNVAPI.cmake +@@ -44,7 +44,7 @@ findpkg_framework(NVAPI) + find_path(NVAPI_INCLUDE_DIR NAMES nvapi.h HINTS ${NVAPI_FRAMEWORK_INCLUDES} ${NVAPI_INC_SEARCH_PATH} ${NVAPI_PKGC_INCLUDE_DIRS} PATH_SUFFIXES NVAPI) + find_library(NVAPI_LIBRARY_REL NAMES ${NVAPI_LIBRARY_NAMES} HINTS ${NVAPI_LIB_SEARCH_PATH} ${NVAPI_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" release relwithdebinfo minsizerel) + find_library(NVAPI_LIBRARY_DBG NAMES ${NVAPI_LIBRARY_NAMES_DBG} HINTS ${NVAPI_LIB_SEARCH_PATH} ${NVAPI_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" debug) +-make_library_set(NVAPI_LIBRARY) ++make_library_set(NVAPI) + + findpkg_finish(NVAPI) + add_parent_dir(NVAPI_INCLUDE_DIRS NVAPI_INCLUDE_DIR) +\ No newline at end of file +diff --git a/CMake/Packages/FindPOCO.cmake b/CMake/Packages/FindPOCO.cmake +index 6b6d7fa..3667b8b 100644 +--- a/CMake/Packages/FindPOCO.cmake ++++ b/CMake/Packages/FindPOCO.cmake +@@ -50,7 +50,7 @@ findpkg_framework(POCO) + find_path(POCO_INCLUDE_DIR NAMES Poco/Foundation.h HINTS ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Foundation/include) + find_library(POCO_LIBRARY_REL NAMES ${POCO_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) + find_library(POCO_LIBRARY_DBG NAMES ${POCO_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) +-make_library_set(POCO_LIBRARY) ++make_library_set(POCO) + + findpkg_finish(POCO) + +@@ -66,7 +66,7 @@ get_debug_names(POCO_Util_LIBRARY_NAMES) + find_path(POCO_Util_INCLUDE_DIR NAMES Poco/Util/Util.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Util/include) + find_library(POCO_Util_LIBRARY_REL NAMES ${POCO_Util_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) + find_library(POCO_Util_LIBRARY_DBG NAMES ${POCO_Util_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) +-make_library_set(POCO_Util_LIBRARY) ++make_library_set(POCO_Util) + findpkg_finish(POCO_Util) + + # Look for Poco's Net package +@@ -76,7 +76,7 @@ get_debug_names(POCO_Net_LIBRARY_NAMES) + find_path(POCO_Net_INCLUDE_DIR NAMES Poco/Net/Net.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Net/include) + find_library(POCO_Net_LIBRARY_REL NAMES ${POCO_Net_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) + find_library(POCO_Net_LIBRARY_DBG NAMES ${POCO_Net_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) +-make_library_set(POCO_Net_LIBRARY) ++make_library_set(POCO_Net) + findpkg_finish(POCO_Net) + + # Look for Poco's NetSSL package +@@ -86,7 +86,7 @@ get_debug_names(POCO_NetSSL_LIBRARY_NAMES) + find_path(POCO_NetSSL_INCLUDE_DIR NAMES Poco/Net/NetSSL.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES NetSSL/include) + find_library(POCO_NetSSL_LIBRARY_REL NAMES ${POCO_NetSSL_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) + find_library(POCO_NetSSL_LIBRARY_DBG NAMES ${POCO_NetSSL_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) +-make_library_set(POCO_NetSSL_LIBRARY) ++make_library_set(POCO_NetSSL) + findpkg_finish(POCO_NetSSL) + + # Look for Poco's XML package +@@ -96,6 +96,6 @@ get_debug_names(POCO_XML_LIBRARY_NAMES) + find_path(POCO_XML_INCLUDE_DIR NAMES Poco/XML/XML.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES XML/include) + find_library(POCO_XML_LIBRARY_REL NAMES ${POCO_XML_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) + find_library(POCO_XML_LIBRARY_DBG NAMES ${POCO_XML_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) +-make_library_set(POCO_XML_LIBRARY) ++make_library_set(POCO_XML) + findpkg_finish(POCO_XML) + +diff --git a/CMake/Packages/FindTBB.cmake b/CMake/Packages/FindTBB.cmake +index 4200aa0..35e4ea3 100644 +--- a/CMake/Packages/FindTBB.cmake ++++ b/CMake/Packages/FindTBB.cmake +@@ -104,7 +104,7 @@ findpkg_framework(TBB) + find_path(TBB_INCLUDE_DIR NAMES tbb/tbb.h HINTS ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS}) + find_library(TBB_LIBRARY_REL NAMES ${TBB_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS}) + find_library(TBB_LIBRARY_DBG NAMES ${TBB_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS}) +-make_library_set(TBB_LIBRARY) ++make_library_set(TBB) + + findpkg_finish(TBB) + +@@ -120,7 +120,7 @@ get_debug_names(TBB_MALLOC_LIBRARY_NAMES) + find_path(TBB_MALLOC_INCLUDE_DIR NAMES tbb/tbb.h HINTS ${TBB_INCLUDE_DIR} ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS} ) + find_library(TBB_MALLOC_LIBRARY_REL NAMES ${TBB_MALLOC_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS} ) + find_library(TBB_MALLOC_LIBRARY_DBG NAMES ${TBB_MALLOC_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS} ) +-make_library_set(TBB_MALLOC_LIBRARY) ++make_library_set(TBB_MALLOC) + findpkg_finish(TBB_MALLOC) + + # Look for TBB's malloc proxy package +@@ -130,5 +130,5 @@ get_debug_names(TBB_MALLOC_PROXY_LIBRARY_NAMES) + find_path(TBB_MALLOC_PROXY_INCLUDE_DIR NAMES tbb/tbbmalloc_proxy.h HINTS ${TBB_INCLUDE_DIR} ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS}) + find_library(TBB_MALLOC_PROXY_LIBRARY_REL NAMES ${TBB_MALLOC_PROXY_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS}) + find_library(TBB_MALLOC_PROXY_LIBRARY_DBG NAMES ${TBB_MALLOC_PROXY_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS}) +-make_library_set(TBB_MALLOC_PROXY_LIBRARY) ++make_library_set(TBB_MALLOC_PROXY) + findpkg_finish(TBB_MALLOC_PROXY) +diff --git a/CMake/Packages/FindZZip.cmake b/CMake/Packages/FindZZip.cmake +index c112071..214d9e5 100644 +--- a/CMake/Packages/FindZZip.cmake ++++ b/CMake/Packages/FindZZip.cmake +@@ -39,12 +39,12 @@ use_pkgconfig(ZZip_PKGC zziplib) + + findpkg_framework(ZZip) + +-find_path(ZZip_INCLUDE_DIR NAMES zzip/zzip.h HINTS ${ZZip_INC_SEARCH_PATH} ${ZZip_PKGC_INCLUDE_DIRS}) ++find_path(ZZip_INCLUDE_DIRS NAMES zzip/zzip.h HINTS ${ZZip_INC_SEARCH_PATH} ${ZZip_PKGC_INCLUDE_DIRS}) + + find_library(ZZip_LIBRARY_REL NAMES ${ZZip_LIBRARY_NAMES} HINTS ${ZZip_LIB_SEARCH_PATH} ${ZZip_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) + find_library(ZZip_LIBRARY_DBG NAMES ${ZZip_LIBRARY_NAMES_DBG} HINTS ${ZZip_LIB_SEARCH_PATH} ${ZZip_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug) + +-make_library_set(ZZip_LIBRARY) ++make_library_set(ZZip) + + findpkg_finish(ZZip) + +diff --git a/CMake/Utils/FindPkgMacros.cmake b/CMake/Utils/FindPkgMacros.cmake +index 53111e0..8dffbbc 100644 +--- a/CMake/Utils/FindPkgMacros.cmake ++++ b/CMake/Utils/FindPkgMacros.cmake +@@ -79,15 +79,21 @@ endmacro (use_pkgconfig) + + # Couple a set of release AND debug libraries (or frameworks) + macro(make_library_set PREFIX) +- if (${PREFIX}_FWK) +- set(${PREFIX} ${${PREFIX}_FWK}) +- elseif (${PREFIX}_REL AND ${PREFIX}_DBG) +- set(${PREFIX} optimized ${${PREFIX}_REL} debug ${${PREFIX}_DBG}) +- elseif (${PREFIX}_REL) +- set(${PREFIX} ${${PREFIX}_REL}) +- elseif (${PREFIX}_DBG) +- set(${PREFIX} ${${PREFIX}_DBG}) +- endif () ++ include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) ++ set(PREFIX_LIB "${PREFIX}_LIBRARY") ++ if (${PREFIX_LIB}_FWK) ++ set(${PREFIX_LIB} ${${PREFIX_LIB}_FWK}) ++ elseif (${PREFIX_LIB}_REL AND ${PREFIX_LIB}_DBG) ++ set(${PREFIX_LIB}_RELEASE ${${PREFIX_LIB}_REL} CACHE STRING "") ++ set(${PREFIX_LIB}_DEBUG ${${PREFIX_LIB}_DBG} CACHE STRING "") ++ select_library_configurations(${PREFIX}) ++ elseif (${PREFIX_LIB}_REL) ++ set(${PREFIX_LIB} ${${PREFIX_LIB}_REL}) ++ set(${PREFIX_LIB}_RELEASE ${${PREFIX_LIB}_REL}) ++ elseif (${PREFIX_LIB}_DBG) ++ set(${PREFIX_LIB} ${${PREFIX_LIB}_DBG}) ++ set(${PREFIX_LIB}_DEBUG ${${PREFIX_LIB}_DBG}) ++ endif() + endmacro(make_library_set) + + # Generate debug names from given release names +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 48af55b..b18ac57 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -282,7 +282,7 @@ if (OGRE_BUILD_PLATFORM_APPLE_IOS) + + # Set build variables + set(XCODE_ATTRIBUTE_SDKROOT iphoneos) +- if(CMAKE_GENERATOR STREQUAL "Unix Makefiles") ++ if(1) + execute_process(COMMAND xcodebuild -version -sdk "${XCODE_ATTRIBUTE_SDKROOT}" Path | head -n 1 OUTPUT_VARIABLE CMAKE_OSX_SYSROOT) + string(REGEX REPLACE "(\r?\n)+$" "" CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}") + else() +diff --git a/OgreMain/CMakeLists.txt b/OgreMain/CMakeLists.txt +index 0424ebb..b019269 100644 +--- a/OgreMain/CMakeLists.txt ++++ b/OgreMain/CMakeLists.txt +@@ -434,8 +434,6 @@ if (APPLE) + set_target_properties(OgreMain PROPERTIES + LINK_FLAGS "-framework IOKit -framework Cocoa -framework Carbon -framework OpenGL -framework CoreVideo" + ) +- +- set(OGRE_OSX_BUILD_CONFIGURATION "$(PLATFORM_NAME)/$(CONFIGURATION)") + + add_custom_command(TARGET OgreMain POST_BUILD + COMMAND mkdir ARGS -p ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/Threading diff --git a/externals/vcpkg/ports/ogre-next/vcpkg.json b/externals/vcpkg/ports/ogre-next/vcpkg.json new file mode 100755 index 000000000..7a6a81bd9 --- /dev/null +++ b/externals/vcpkg/ports/ogre-next/vcpkg.json @@ -0,0 +1,46 @@ +{ + "name": "ogre-next", + "version": "2.3.0", + "description": "Ogre 2.1 & 2.2 - scene-oriented, flexible 3D engine written in C++", + "homepage": "https://github.com/OGRECave/ogre-next", + "license": "MIT", + "dependencies": [ + "boost-date-time", + "boost-thread", + "freeimage", + "freetype", + "openvr", + "poco", + "rapidjson", + "sdl2", + "tbb", + "tinyxml", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib", + "zziplib" + ], + "features": { + "csharp": { + "description": "Build csharp bindings" + }, + "d3d9": { + "description": "Build Direct3D9 RenderSystem" + }, + "java": { + "description": "Build Java (JNI) bindings" + }, + "python": { + "description": "Build Python bindings", + "dependencies": [ + "python3" + ] + } + } +} diff --git a/externals/vcpkg/ports/ogre/disable-dependency-qt.patch b/externals/vcpkg/ports/ogre/disable-dependency-qt.patch new file mode 100755 index 000000000..f97bd256b --- /dev/null +++ b/externals/vcpkg/ports/ogre/disable-dependency-qt.patch @@ -0,0 +1,14 @@ +diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake +index 068dd27..721121b 100644 +--- a/CMake/Dependencies.cmake ++++ b/CMake/Dependencies.cmake +@@ -346,7 +346,9 @@ if(NOT ANDROID AND NOT EMSCRIPTEN) + ) + endif() + ++ if (0) + find_package(Qt5 COMPONENTS Core Gui QUIET) ++ endif() + macro_log_feature(Qt5_FOUND "Qt" "optional integration with the Qt Library for window creation and input" "http://www.qt.io/" FALSE "" "") + endif() + diff --git a/externals/vcpkg/ports/ogre/fix-dependency.patch b/externals/vcpkg/ports/ogre/fix-dependency.patch new file mode 100755 index 000000000..fd7076dd8 --- /dev/null +++ b/externals/vcpkg/ports/ogre/fix-dependency.patch @@ -0,0 +1,36 @@ +diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake +index 2ae0b66..e6c55cd 100644 +--- a/CMake/Dependencies.cmake ++++ b/CMake/Dependencies.cmake +@@ -242,7 +242,7 @@ find_package(FreeImage) + macro_log_feature(FreeImage_FOUND "freeimage" "Support for commonly used graphics image formats" "http://freeimage.sourceforge.net" FALSE "" "") + + # Find FreeType +-find_package(Freetype) ++find_package(freetype CONFIG REQUIRED) + macro_log_feature(FREETYPE_FOUND "freetype" "Portable font engine" "http://www.freetype.org" FALSE "" "") + + # Find X11 +@@ -310,11 +310,11 @@ find_package(SWIG 3.0.8 QUIET) + macro_log_feature(SWIG_FOUND "SWIG" "Language bindings (Python, Java, C#) for OGRE" "http://www.swig.org/" FALSE "" "") + + # pugixml +-find_package(pugixml QUIET) ++find_package(pugixml CONFIG REQUIRED) + macro_log_feature(pugixml_FOUND "pugixml" "Needed for XMLConverter and DotScene Plugin" "https://pugixml.org/" FALSE "" "") + + # Assimp +-find_package(ASSIMP QUIET) ++find_package(assimp CONFIG REQUIRED) + macro_log_feature(ASSIMP_FOUND "Assimp" "Needed for the AssimpLoader Plugin" "https://www.assimp.org/" FALSE "" "") + + if(ASSIMP_FOUND) +@@ -336,7 +336,7 @@ endif() + # Find sdl2 + if(NOT ANDROID AND NOT EMSCRIPTEN) + # find script does not work in cross compilation environment +- find_package(SDL2 QUIET) ++ find_package(SDL2 CONFIG REQUIRED) + macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library needed for input handling in samples" "https://www.libsdl.org/" FALSE "" "") + if(SDL2_FOUND AND NOT TARGET SDL2::SDL2) + add_library(SDL2::SDL2 INTERFACE IMPORTED) diff --git a/externals/vcpkg/ports/ogre/fix-findimgui.patch b/externals/vcpkg/ports/ogre/fix-findimgui.patch new file mode 100755 index 000000000..8e812d926 --- /dev/null +++ b/externals/vcpkg/ports/ogre/fix-findimgui.patch @@ -0,0 +1,65 @@ +diff --git a/Components/Overlay/CMakeLists.txt b/Components/Overlay/CMakeLists.txt +index df8f32af4..42be1e8f2 100644 +--- a/Components/Overlay/CMakeLists.txt ++++ b/Components/Overlay/CMakeLists.txt +@@ -19,21 +19,8 @@ list(APPEND HEADER_FILES + file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") + + if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) +- set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.77" CACHE PATH "") +- if(NOT EXISTS ${IMGUI_DIR}) +- message(STATUS "Dowloading imgui") +- file(DOWNLOAD +- https://github.com/ocornut/imgui/archive/v1.77.tar.gz +- ${PROJECT_BINARY_DIR}/imgui.tar.gz) +- execute_process(COMMAND ${CMAKE_COMMAND} +- -E tar xf imgui.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) +- endif() +- list(APPEND SOURCE_FILES +- ${IMGUI_DIR}/imgui.cpp +- ${IMGUI_DIR}/imgui_draw.cpp +- ${IMGUI_DIR}/imgui_widgets.cpp +- ${IMGUI_DIR}/imgui_demo.cpp +- ${IMGUI_DIR}/misc/freetype/imgui_freetype.cpp) ++ find_package(imgui CONFIG REQUIRED) ++ find_path(IMGUI_INCLUDE_DIR imgui.h) + else() + list(REMOVE_ITEM SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/OgreImGuiOverlay.cpp") + endif() +@@ -41,13 +28,17 @@ endif() + # setup target + add_library(OgreOverlay ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) + set_target_properties(OgreOverlay PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION}) +-target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE ${FREETYPE_LIBRARIES} ZLIB::ZLIB) ++if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) ++ target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE freetype ZLIB::ZLIB imgui::imgui) ++else() ++ target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE freetype ZLIB::ZLIB) ++endif() + target_include_directories(OgreOverlay PUBLIC + "$" + $ + PRIVATE ${FREETYPE_INCLUDE_DIRS}) + +-if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) ++if(0) + target_include_directories(OgreOverlay PUBLIC + PUBLIC "$" + PRIVATE "$") +diff --git "a/Components/Bites/CMakeLists.txt" "b/Components/Bites/CMakeLists.txt" +index 5d58a8d74..fe41e4a28 100644 +--- "a/Components/Bites/CMakeLists.txt" ++++ "b/Components/Bites/CMakeLists.txt" +@@ -152,6 +152,11 @@ elseif(NOT EMSCRIPTEN) + message(WARNING "SDL2 not found - no input handling and reduced window creation capabilites") + endif() + ++if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) ++ find_package(imgui CONFIG REQUIRED) ++ target_link_libraries(OgreBites PRIVATE imgui::imgui) ++endif() ++ + generate_export_header(OgreBites + EXPORT_MACRO_NAME _OgreBitesExport + EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/include/OgreBitesPrerequisites.h) + diff --git a/externals/vcpkg/ports/ogre/portfile.cmake b/externals/vcpkg/ports/ogre/portfile.cmake new file mode 100755 index 000000000..89d49b28d --- /dev/null +++ b/externals/vcpkg/ports/ogre/portfile.cmake @@ -0,0 +1,132 @@ +if (EXISTS "${CURRENT_INSTALLED_DIR}/Media/HLMS/Blendfunctions_piece_fs.glslt") + message(FATAL_ERROR "FATAL ERROR: ogre-next and ogre are incompatible.") +endif() + +if(NOT VCPKG_TARGET_IS_WINDOWS) + message("${PORT} currently requires the following library from the system package manager:\n Xaw\n\nIt can be installed on Ubuntu systems via apt-get install libxaw7-dev") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO OGRECave/ogre + REF 7d0c8181ac43ad20bdba326abbd3deeddf310f0b #v1.12.9 + SHA512 f223075f49a2465cd5070f5efa796aa715f3ea2fefd578e4ec0a11be2fd3330922849ed804e1df004209abafaa7b24ff42432dd79f336a56063e3cf38ae0e8c9 + HEAD_REF master + PATCHES + toolchain_fixes.patch + fix-dependency.patch + fix-findimgui.patch + disable-dependency-qt.patch +) + +file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake") + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(OGRE_STATIC ON) +else() + set(OGRE_STATIC OFF) +endif() + +# Configure features + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9 + java OGRE_BUILD_COMPONENT_JAVA + python OGRE_BUILD_COMPONENT_PYTHON + csharp OGRE_BUILD_COMPONENT_CSHARP + overlay OGRE_BUILD_COMPONENT_OVERLAY + zziplib OGRE_CONFIG_ENABLE_ZIP + strict OGRE_RESOURCEMANAGER_STRICT +) + +# OGRE_RESOURCEMANAGER_STRICT need to be 0 for OFF and 1 for ON, because it is used 'as is' in sources +string(REPLACE "OGRE_RESOURCEMANAGER_STRICT=ON" "OGRE_RESOURCEMANAGER_STRICT=1" FEATURE_OPTIONS "${FEATURE_OPTIONS}") +string(REPLACE "OGRE_RESOURCEMANAGER_STRICT=OFF" "OGRE_RESOURCEMANAGER_STRICT=0" FEATURE_OPTIONS "${FEATURE_OPTIONS}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DOGRE_BUILD_DEPENDENCIES=OFF + -DOGRE_BUILD_SAMPLES=OFF + -DOGRE_BUILD_TESTS=OFF + -DOGRE_BUILD_TOOLS=OFF + -DOGRE_BUILD_MSVC_MP=ON + -DOGRE_BUILD_MSVC_ZM=ON + -DOGRE_INSTALL_DEPENDENCIES=OFF + -DOGRE_INSTALL_DOCS=OFF + -DOGRE_INSTALL_PDB=OFF + -DOGRE_INSTALL_SAMPLES=OFF + -DOGRE_INSTALL_TOOLS=OFF + -DOGRE_INSTALL_CMAKE=ON + -DOGRE_INSTALL_VSPROPS=OFF + -DOGRE_STATIC=${OGRE_STATIC} + -DOGRE_CONFIG_THREAD_PROVIDER=std + -DOGRE_BUILD_RENDERSYSTEM_D3D11=ON + -DOGRE_BUILD_RENDERSYSTEM_GL=ON + -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=ON + -DOGRE_BUILD_RENDERSYSTEM_GLES=OFF + -DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF + -DFREETYPE_FOUND=ON + -DOGRE_CMAKE_DIR=share/ogre +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(GLOB REL_CFGS ${CURRENT_PACKAGES_DIR}/bin/*.cfg) +if(REL_CFGS) + file(COPY ${REL_CFGS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(REMOVE ${REL_CFGS}) +endif() + +file(GLOB DBG_CFGS ${CURRENT_PACKAGES_DIR}/debug/bin/*.cfg) +if(DBG_CFGS) + file(COPY ${DBG_CFGS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(REMOVE ${DBG_CFGS}) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +#Remove OgreMain*.lib from lib/ folder, because autolink would complain, since it defines a main symbol +#manual-link subfolder is here to the rescue! +if(VCPKG_TARGET_IS_WINDOWS) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMain.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMain.lib) + else() + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMainStatic.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib) + endif() + if(NOT VCPKG_BUILD_TYPE) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/OgreMain_d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMain_d.lib) + else() + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/OgreMainStatic_d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMainStatic_d.lib) + endif() + endif() + + file(GLOB SHARE_FILES ${CURRENT_PACKAGES_DIR}/share/ogre/*.cmake) + foreach(SHARE_FILE ${SHARE_FILES}) + file(READ "${SHARE_FILE}" _contents) + string(REPLACE "lib/OgreMain" "lib/manual-link/OgreMain" _contents "${_contents}") + file(WRITE "${SHARE_FILE}" "${_contents}") + endforeach() +endif() + +file(GLOB share_cfgs ${CURRENT_PACKAGES_DIR}/share/OGRE/*.cfg) +foreach(file ${share_cfgs}) + vcpkg_replace_string("${file}" "${CURRENT_PACKAGES_DIR}" "../..") +endforeach() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/ogre/toolchain_fixes.patch b/externals/vcpkg/ports/ogre/toolchain_fixes.patch new file mode 100755 index 000000000..c363a34d7 --- /dev/null +++ b/externals/vcpkg/ports/ogre/toolchain_fixes.patch @@ -0,0 +1,265 @@ +diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt +index a7a3796..2e21403 100644 +--- a/CMake/CMakeLists.txt ++++ b/CMake/CMakeLists.txt +@@ -13,10 +13,12 @@ + # directory, but can also be used for custom projects. + ############################################################# + +-if(WIN32 OR APPLE) +- set(OGRE_CMAKE_DIR "CMake") +-else() +- set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake") ++if(NOT DEFINED OGRE_CMAKE_DIR) ++ if(WIN32 OR APPLE) ++ set(OGRE_CMAKE_DIR "CMake") ++ else() ++ set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake") ++ endif() + endif() + + set(INST_FILES Utils/FindPkgMacros.cmake) +diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake +index 06a055b..09d10bd 100644 +--- a/CMake/InstallResources.cmake ++++ b/CMake/InstallResources.cmake +@@ -204,10 +204,12 @@ endif () + # Create the CMake package files + include(CMakePackageConfigHelpers) + +-if(WIN32 OR APPLE) +- set(OGRE_CMAKE_DIR "CMake") +-else() +- set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake") ++if(NOT DEFINED OGRE_CMAKE_DIR) ++ if(WIN32 OR APPLE) ++ set(OGRE_CMAKE_DIR "CMake") ++ else() ++ set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake") ++ endif() + endif() + if(WIN32) + set(OGRE_PLUGIN_DIR_CMAKE "bin") +diff --git a/CMake/Packages/FindCg.cmake b/CMake/Packages/FindCg.cmake +index 4501cf9..7eb57c3 100644 +--- a/CMake/Packages/FindCg.cmake ++++ b/CMake/Packages/FindCg.cmake +@@ -56,7 +56,7 @@ endif() + + find_library(Cg_LIBRARY_REL NAMES ${Cg_LIBRARY_NAMES} HINTS ${Cg_LIB_SEARCH_PATH} ${Cg_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) + find_library(Cg_LIBRARY_DBG NAMES ${Cg_LIBRARY_NAMES_DBG} HINTS ${Cg_LIB_SEARCH_PATH} ${Cg_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug) +-make_library_set(Cg_LIBRARY) ++make_library_set(Cg) + + if (WIN32) + if (CMAKE_CL_64) +diff --git a/CMake/Packages/FindFreeImage.cmake b/CMake/Packages/FindFreeImage.cmake +index 7c89ec5..d8314f0 100644 +--- a/CMake/Packages/FindFreeImage.cmake ++++ b/CMake/Packages/FindFreeImage.cmake +@@ -43,7 +43,7 @@ find_path(FreeImage_INCLUDE_DIR NAMES FreeImage.h HINTS ${FreeImage_INC_SEARCH_P + find_library(FreeImage_LIBRARY_REL NAMES ${FreeImage_LIBRARY_NAMES} HINTS ${FreeImage_LIB_SEARCH_PATH} ${FreeImage_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) + find_library(FreeImage_LIBRARY_DBG NAMES ${FreeImage_LIBRARY_NAMES_DBG} HINTS ${FreeImage_LIB_SEARCH_PATH} ${FreeImage_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug) + +-make_library_set(FreeImage_LIBRARY) ++make_library_set(FreeImage) + + findpkg_finish(FreeImage) + +diff --git a/CMake/Packages/FindGLSLOptimizer.cmake b/CMake/Packages/FindGLSLOptimizer.cmake +index dd4b179..6f158fc 100644 +--- a/CMake/Packages/FindGLSLOptimizer.cmake ++++ b/CMake/Packages/FindGLSLOptimizer.cmake +@@ -38,7 +38,7 @@ findpkg_framework(GLSL_Optimizer) + find_path(GLSL_Optimizer_INCLUDE_DIR NAMES glsl_optimizer.h HINTS ${GLSL_Optimizer_INC_SEARCH_PATH} ${GLSL_Optimizer_PKGC_INCLUDE_DIRS} PATH_SUFFIXES GLSL_Optimizer) + find_library(GLSL_Optimizer_LIBRARY_REL NAMES ${GLSL_Optimizer_LIBRARY_NAMES} HINTS ${GLSL_Optimizer_LIB_SEARCH_PATH} ${GLSL_Optimizer_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) + find_library(GLSL_Optimizer_LIBRARY_DBG NAMES ${GLSL_Optimizer_LIBRARY_NAMES_DBG} HINTS ${GLSL_Optimizer_LIB_SEARCH_PATH} ${GLSL_Optimizer_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug) +-make_library_set(GLSL_Optimizer_LIBRARY) ++make_library_set(GLSL_Optimizer) + + findpkg_finish(GLSL_Optimizer) + add_parent_dir(GLSL_Optimizer_INCLUDE_DIRS GLSL_Optimizer_INCLUDE_DIR) +diff --git a/CMake/Packages/FindHLSL2GLSL.cmake b/CMake/Packages/FindHLSL2GLSL.cmake +index 7125895..13a306f 100644 +--- a/CMake/Packages/FindHLSL2GLSL.cmake ++++ b/CMake/Packages/FindHLSL2GLSL.cmake +@@ -38,7 +38,7 @@ findpkg_framework(HLSL2GLSL) + find_path(HLSL2GLSL_INCLUDE_DIR NAMES hlsl2glsl.h HINTS ${HLSL2GLSL_INC_SEARCH_PATH} ${HLSL2GLSL_PKGC_INCLUDE_DIRS} PATH_SUFFIXES HLSL2GLSL) + find_library(HLSL2GLSL_LIBRARY_REL NAMES ${HLSL2GLSL_LIBRARY_NAMES} HINTS ${HLSL2GLSL_LIB_SEARCH_PATH} ${HLSL2GLSL_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) + find_library(HLSL2GLSL_LIBRARY_DBG NAMES ${HLSL2GLSL_LIBRARY_NAMES_DBG} HINTS ${HLSL2GLSL_LIB_SEARCH_PATH} ${HLSL2GLSL_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug) +-make_library_set(HLSL2GLSL_LIBRARY) ++make_library_set(HLSL2GLSL) + + findpkg_finish(HLSL2GLSL) + add_parent_dir(HLSL2GLSL_INCLUDE_DIRS HLSL2GLSL_INCLUDE_DIR) +diff --git a/CMake/Packages/FindNVAPI.cmake b/CMake/Packages/FindNVAPI.cmake +index 95c70cd..893ce01 100644 +--- a/CMake/Packages/FindNVAPI.cmake ++++ b/CMake/Packages/FindNVAPI.cmake +@@ -44,7 +44,7 @@ findpkg_framework(NVAPI) + find_path(NVAPI_INCLUDE_DIR NAMES nvapi.h HINTS ${NVAPI_FRAMEWORK_INCLUDES} ${NVAPI_INC_SEARCH_PATH} ${NVAPI_PKGC_INCLUDE_DIRS} PATH_SUFFIXES NVAPI) + find_library(NVAPI_LIBRARY_REL NAMES ${NVAPI_LIBRARY_NAMES} HINTS ${NVAPI_LIB_SEARCH_PATH} ${NVAPI_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" release relwithdebinfo minsizerel) + find_library(NVAPI_LIBRARY_DBG NAMES ${NVAPI_LIBRARY_NAMES_DBG} HINTS ${NVAPI_LIB_SEARCH_PATH} ${NVAPI_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" debug) +-make_library_set(NVAPI_LIBRARY) ++make_library_set(NVAPI) + + findpkg_finish(NVAPI) + add_parent_dir(NVAPI_INCLUDE_DIRS NVAPI_INCLUDE_DIR) +\ No newline at end of file +diff --git a/CMake/Packages/FindPOCO.cmake b/CMake/Packages/FindPOCO.cmake +index 6b6d7fa..3667b8b 100644 +--- a/CMake/Packages/FindPOCO.cmake ++++ b/CMake/Packages/FindPOCO.cmake +@@ -50,7 +50,7 @@ findpkg_framework(POCO) + find_path(POCO_INCLUDE_DIR NAMES Poco/Foundation.h HINTS ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Foundation/include) + find_library(POCO_LIBRARY_REL NAMES ${POCO_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) + find_library(POCO_LIBRARY_DBG NAMES ${POCO_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) +-make_library_set(POCO_LIBRARY) ++make_library_set(POCO) + + findpkg_finish(POCO) + +@@ -66,7 +66,7 @@ get_debug_names(POCO_Util_LIBRARY_NAMES) + find_path(POCO_Util_INCLUDE_DIR NAMES Poco/Util/Util.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Util/include) + find_library(POCO_Util_LIBRARY_REL NAMES ${POCO_Util_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) + find_library(POCO_Util_LIBRARY_DBG NAMES ${POCO_Util_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) +-make_library_set(POCO_Util_LIBRARY) ++make_library_set(POCO_Util) + findpkg_finish(POCO_Util) + + # Look for Poco's Net package +@@ -76,7 +76,7 @@ get_debug_names(POCO_Net_LIBRARY_NAMES) + find_path(POCO_Net_INCLUDE_DIR NAMES Poco/Net/Net.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Net/include) + find_library(POCO_Net_LIBRARY_REL NAMES ${POCO_Net_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) + find_library(POCO_Net_LIBRARY_DBG NAMES ${POCO_Net_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) +-make_library_set(POCO_Net_LIBRARY) ++make_library_set(POCO_Net) + findpkg_finish(POCO_Net) + + # Look for Poco's NetSSL package +@@ -86,7 +86,7 @@ get_debug_names(POCO_NetSSL_LIBRARY_NAMES) + find_path(POCO_NetSSL_INCLUDE_DIR NAMES Poco/Net/NetSSL.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES NetSSL/include) + find_library(POCO_NetSSL_LIBRARY_REL NAMES ${POCO_NetSSL_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) + find_library(POCO_NetSSL_LIBRARY_DBG NAMES ${POCO_NetSSL_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) +-make_library_set(POCO_NetSSL_LIBRARY) ++make_library_set(POCO_NetSSL) + findpkg_finish(POCO_NetSSL) + + # Look for Poco's XML package +@@ -96,6 +96,6 @@ get_debug_names(POCO_XML_LIBRARY_NAMES) + find_path(POCO_XML_INCLUDE_DIR NAMES Poco/XML/XML.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES XML/include) + find_library(POCO_XML_LIBRARY_REL NAMES ${POCO_XML_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) + find_library(POCO_XML_LIBRARY_DBG NAMES ${POCO_XML_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) +-make_library_set(POCO_XML_LIBRARY) ++make_library_set(POCO_XML) + findpkg_finish(POCO_XML) + +diff --git a/CMake/Packages/FindTBB.cmake b/CMake/Packages/FindTBB.cmake +index 0c48510..c121966 100644 +--- a/CMake/Packages/FindTBB.cmake ++++ b/CMake/Packages/FindTBB.cmake +@@ -104,7 +104,7 @@ findpkg_framework(TBB) + find_path(TBB_INCLUDE_DIR NAMES tbb/tbb.h HINTS ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS}) + find_library(TBB_LIBRARY_REL NAMES ${TBB_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS}) + find_library(TBB_LIBRARY_DBG NAMES ${TBB_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS}) +-make_library_set(TBB_LIBRARY) ++make_library_set(TBB) + + findpkg_finish(TBB) + +@@ -120,7 +120,7 @@ get_debug_names(TBB_MALLOC_LIBRARY_NAMES) + find_path(TBB_MALLOC_INCLUDE_DIR NAMES tbb/tbb.h HINTS ${TBB_INCLUDE_DIR} ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS} ) + find_library(TBB_MALLOC_LIBRARY_REL NAMES ${TBB_MALLOC_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS} ) + find_library(TBB_MALLOC_LIBRARY_DBG NAMES ${TBB_MALLOC_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS} ) +-make_library_set(TBB_MALLOC_LIBRARY) ++make_library_set(TBB_MALLOC) + findpkg_finish(TBB_MALLOC) + + # Look for TBB's malloc proxy package +@@ -130,5 +130,5 @@ get_debug_names(TBB_MALLOC_PROXY_LIBRARY_NAMES) + find_path(TBB_MALLOC_PROXY_INCLUDE_DIR NAMES tbb/tbbmalloc_proxy.h HINTS ${TBB_INCLUDE_DIR} ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS}) + find_library(TBB_MALLOC_PROXY_LIBRARY_REL NAMES ${TBB_MALLOC_PROXY_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS}) + find_library(TBB_MALLOC_PROXY_LIBRARY_DBG NAMES ${TBB_MALLOC_PROXY_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS}) +-make_library_set(TBB_MALLOC_PROXY_LIBRARY) ++make_library_set(TBB_MALLOC_PROXY) + findpkg_finish(TBB_MALLOC_PROXY) +diff --git a/CMake/Packages/FindZZip.cmake b/CMake/Packages/FindZZip.cmake +index e97951e..54c2567 100644 +--- a/CMake/Packages/FindZZip.cmake ++++ b/CMake/Packages/FindZZip.cmake +@@ -39,12 +39,12 @@ use_pkgconfig(ZZip_PKGC zziplib) + + findpkg_framework(ZZip) + +-find_path(ZZip_INCLUDE_DIR NAMES zzip/zzip.h HINTS ${ZZip_INC_SEARCH_PATH} ${ZZip_PKGC_INCLUDE_DIRS}) ++find_path(ZZip_INCLUDE_DIRS NAMES zzip/zzip.h HINTS ${ZZip_INC_SEARCH_PATH} ${ZZip_PKGC_INCLUDE_DIRS}) + + find_library(ZZip_LIBRARY_REL NAMES ${ZZip_LIBRARY_NAMES} HINTS ${ZZip_LIB_SEARCH_PATH} ${ZZip_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) + find_library(ZZip_LIBRARY_DBG NAMES ${ZZip_LIBRARY_NAMES_DBG} HINTS ${ZZip_LIB_SEARCH_PATH} ${ZZip_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug) + +-make_library_set(ZZip_LIBRARY) ++make_library_set(ZZip) + + findpkg_finish(ZZip) + +diff --git a/CMake/Utils/FindPkgMacros.cmake b/CMake/Utils/FindPkgMacros.cmake +index 374f84b..dc7066d 100644 +--- a/CMake/Utils/FindPkgMacros.cmake ++++ b/CMake/Utils/FindPkgMacros.cmake +@@ -79,15 +79,21 @@ endmacro (use_pkgconfig) + + # Couple a set of release AND debug libraries (or frameworks) + macro(make_library_set PREFIX) +- if (${PREFIX}_FWK) +- set(${PREFIX} ${${PREFIX}_FWK}) +- elseif (${PREFIX}_REL AND ${PREFIX}_DBG) +- set(${PREFIX} optimized ${${PREFIX}_REL} debug ${${PREFIX}_DBG}) +- elseif (${PREFIX}_REL) +- set(${PREFIX} ${${PREFIX}_REL}) +- elseif (${PREFIX}_DBG) +- set(${PREFIX} ${${PREFIX}_DBG}) +- endif () ++ include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) ++ set(PREFIX_LIB "${PREFIX}_LIBRARY") ++ if (${PREFIX_LIB}_FWK) ++ set(${PREFIX_LIB} ${${PREFIX_LIB}_FWK}) ++ elseif (${PREFIX_LIB}_REL AND ${PREFIX_LIB}_DBG) ++ set(${PREFIX_LIB}_RELEASE ${${PREFIX_LIB}_REL} CACHE STRING "") ++ set(${PREFIX_LIB}_DEBUG ${${PREFIX_LIB}_DBG} CACHE STRING "") ++ select_library_configurations(${PREFIX}) ++ elseif (${PREFIX_LIB}_REL) ++ set(${PREFIX_LIB} ${${PREFIX_LIB}_REL}) ++ set(${PREFIX_LIB}_RELEASE ${${PREFIX_LIB}_REL}) ++ elseif (${PREFIX_LIB}_DBG) ++ set(${PREFIX_LIB} ${${PREFIX_LIB}_DBG}) ++ set(${PREFIX_LIB}_DEBUG ${${PREFIX_LIB}_DBG}) ++ endif() + endmacro(make_library_set) + + # Generate debug names from given release names +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1602572..9fddbe7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -271,7 +271,7 @@ elseif(EMSCRIPTEN) + elseif (APPLE AND NOT APPLE_IOS) + + set(XCODE_ATTRIBUTE_SDKROOT macosx) +- if(CMAKE_GENERATOR STREQUAL "Unix Makefiles") ++ if(1) + execute_process(COMMAND xcodebuild -version -sdk "${XCODE_ATTRIBUTE_SDKROOT}" Path | head -n 1 OUTPUT_VARIABLE CMAKE_OSX_SYSROOT) + string(REGEX REPLACE "(\r?\n)+$" "" CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}") + else() +diff --git a/PlugIns/EXRCodec/CMakeLists.txt b/PlugIns/EXRCodec/CMakeLists.txt +index e9c936a..bb8747e 100644 +--- a/PlugIns/EXRCodec/CMakeLists.txt ++++ b/PlugIns/EXRCodec/CMakeLists.txt +@@ -16,7 +16,7 @@ target_link_libraries(Codec_EXR OgreMain ${OPENEXR_LIBRARIES}) + target_include_directories(Codec_EXR PUBLIC + "$" + $) +-target_include_directories(Codec_EXR SYSTEM PRIVATE "${OPENEXR_INCLUDE_DIR}/OpenEXR") ++target_include_directories(Codec_EXR SYSTEM PRIVATE "${OPENEXR_INCLUDE_DIR}") + + ogre_config_framework(Codec_EXR) + ogre_config_plugin(Codec_EXR) diff --git a/externals/vcpkg/ports/ogre/vcpkg.json b/externals/vcpkg/ports/ogre/vcpkg.json new file mode 100755 index 000000000..1abf6edac --- /dev/null +++ b/externals/vcpkg/ports/ogre/vcpkg.json @@ -0,0 +1,77 @@ +{ + "name": "ogre", + "version": "1.12.9", + "port-version": 7, + "description": "3D Object-Oriented Graphics Rendering Engine", + "homepage": "https://github.com/OGRECave/ogre", + "license": "MIT", + "dependencies": [ + "pugixml", + "sdl2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "default-features": [ + "assimp", + "freeimage", + "overlay", + "zziplib" + ], + "features": { + "assimp": { + "description": "Use assimp", + "dependencies": [ + "assimp" + ] + }, + "csharp": { + "description": "Build csharp bindings" + }, + "d3d9": { + "description": "Build Direct3D9 RenderSystem" + }, + "freeimage": { + "description": "Build with FreeImage support", + "dependencies": [ + "freeimage" + ] + }, + "java": { + "description": "Build Java (JNI) bindings" + }, + "overlay": { + "description": "Build overlay component", + "dependencies": [ + "freetype", + { + "name": "imgui", + "features": [ + "freetype" + ] + } + ] + }, + "python": { + "description": "Build Python bindings", + "dependencies": [ + "python3" + ] + }, + "strict": { + "description": "Force Ogre resource manager to be strict with group names and resource names" + }, + "zziplib": { + "description": "Build with zziplib support (GPL)", + "dependencies": [ + "zziplib" + ] + } + } +} diff --git a/externals/vcpkg/ports/ois/0001_install_pkgconfig_win32.patch b/externals/vcpkg/ports/ois/0001_install_pkgconfig_win32.patch new file mode 100755 index 000000000..2568e3f7c --- /dev/null +++ b/externals/vcpkg/ports/ois/0001_install_pkgconfig_win32.patch @@ -0,0 +1,29 @@ +diff -Naur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2021-05-14 03:09:42.000000000 +0800 ++++ b/CMakeLists.txt 2022-03-08 12:48:17.012589000 +0800 +@@ -255,7 +255,12 @@ + install(FILES $ DESTINATION bin OPTIONAL) + endif(MSVC AND BUILD_SHARED_LIBS) + +-if(UNIX) +- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/OIS.pc.in ${CMAKE_BINARY_DIR}/OIS.pc @ONLY) +- install(FILES ${CMAKE_BINARY_DIR}/OIS.pc DESTINATION ${OIS_LIB_DIRECTORY}/pkgconfig) ++if (CMAKE_DEBUG_POSTFIX AND CMAKE_BUILD_TYPE STREQUAL "Debug") ++ set(OIS_POSTFIX ${CMAKE_DEBUG_POSTFIX}) ++else() ++ set(OIS_POSTFIX "") + endif() ++ ++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/OIS.pc.in ${CMAKE_BINARY_DIR}/OIS.pc @ONLY) ++install(FILES ${CMAKE_BINARY_DIR}/OIS.pc DESTINATION ${OIS_LIB_DIRECTORY}/pkgconfig) ++ +diff -Naur a/OIS.pc.in b/OIS.pc.in +--- a/OIS.pc.in 2021-05-14 03:09:42.000000000 +0800 ++++ b/OIS.pc.in 2022-03-08 12:48:33.599696300 +0800 +@@ -6,5 +6,5 @@ + Name: OIS + Description: Cross platform C++ Input Framework + Version: @OIS_VERSION@ +-Libs: -L${libdir} -lOIS ++Libs: -L${libdir} -lOIS@OIS_POSTFIX@ + Cflags: -I${includedir} -I${includedir}/ois diff --git a/externals/vcpkg/ports/ois/portfile.cmake b/externals/vcpkg/ports/ois/portfile.cmake new file mode 100755 index 000000000..e7b5d2bce --- /dev/null +++ b/externals/vcpkg/ports/ois/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wgois/OIS + REF v1.5.1 + SHA512 20598aef999a70900cb7f75ffaf62059acf8e811822971cb21986b5d25d28dacb79e4b4cf4770c70e00d3c55cdd01ef3e68a77c2dd148677784fc4df38891340 + HEAD_REF master + PATCHES + 0001_install_pkgconfig_win32.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE +) + +vcpkg_cmake_install() + +vcpkg_fixup_pkgconfig() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# Include files should not be duplicated into the /debug/include directory +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/ois/vcpkg.json b/externals/vcpkg/ports/ois/vcpkg.json new file mode 100755 index 000000000..c73ac9131 --- /dev/null +++ b/externals/vcpkg/ports/ois/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "ois", + "version": "1.5.1", + "port-version": 1, + "description": "Cross Platform Object Oriented Input Lib System. Meant to be very robust and compatible with many systems and operating systems.", + "homepage": "https://wgois.github.io/OIS/", + "license": "Zlib", + "supports": "!(arm | arm64 | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ompl/0001_Export_targets.patch b/externals/vcpkg/ports/ompl/0001_Export_targets.patch new file mode 100755 index 000000000..6d599aec3 --- /dev/null +++ b/externals/vcpkg/ports/ompl/0001_Export_targets.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a9bb05f..31fab8c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -215,6 +215,10 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/omplConfig.cmake + ${CMAKE_CURRENT_BINARY_DIR}/omplConfigVersion.cmake + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/ompl/cmake + COMPONENT ompl) ++install(EXPORT ompl ++ DESTINATION "share/ompl" ++ FILE ompl-targets.cmake ++) + + # script to install ompl on Ubuntu + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/install-ompl-ubuntu.sh.in" +diff --git a/src/ompl/CMakeLists.txt b/src/ompl/CMakeLists.txt +index 9ea130e..6dda4df 100644 +--- a/src/ompl/CMakeLists.txt ++++ b/src/ompl/CMakeLists.txt +@@ -83,6 +83,7 @@ endif (MSVC) + + # install the library + install(TARGETS ompl ++ EXPORT ompl + DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT ompl) + if (NOT MSVC) diff --git a/externals/vcpkg/ports/ompl/0002_Fix_config.patch b/externals/vcpkg/ports/ompl/0002_Fix_config.patch new file mode 100755 index 000000000..ec82b556b --- /dev/null +++ b/externals/vcpkg/ports/ompl/0002_Fix_config.patch @@ -0,0 +1,40 @@ +diff --git a/omplConfig.cmake.in b/omplConfig.cmake.in +index 465de25d..d1e91929 100644 +--- a/omplConfig.cmake.in ++++ b/omplConfig.cmake.in +@@ -18,8 +18,11 @@ set(OMPL_MAJOR_VERSION @PROJECT_VERSION_MAJOR@) + set(OMPL_MINOR_VERSION @PROJECT_VERSION_MINOR@) + set(OMPL_PATCH_VERSION @PROJECT_VERSION_PATCH@) + ++include(CMakeFindDependencyMacro) ++find_dependency(Boost 1.58 COMPONENTS serialization filesystem system program_options) ++find_dependency(Eigen3) + set_and_check(OMPL_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") +-set(OMPL_INCLUDE_DIRS "${OMPL_INCLUDE_DIR};@Boost_INCLUDE_DIR@;@EIGEN3_INCLUDE_DIR@") ++set(OMPL_INCLUDE_DIRS "${OMPL_INCLUDE_DIR};${Boost_INCLUDE_DIR};${EIGEN3_INCLUDE_DIR}") + foreach(_dir @FLANN_INCLUDE_DIRS@;@ODE_INCLUDE_DIRS@;@SPOT_INCLUDE_DIRS@;@TRIANGLE_INCLUDE_DIR@;@FCL_INCLUDE_DIRS@;@PQP_INCLUDE_DIR@;@ASSIMP_INCLUDE_DIRS@;@OPENGL_INCLUDE_DIR@) + if(_dir) + list(APPEND OMPL_INCLUDE_DIRS "${_dir}") +@@ -29,7 +32,7 @@ list(REMOVE_DUPLICATES OMPL_INCLUDE_DIRS) + set(OMPL_INCLUDE_DIRS "${OMPL_INCLUDE_DIRS}" CACHE STRING "Include path for OMPL and its dependencies") + + set_and_check(OMPL_LIBRARY_DIR @PACKAGE_LIB_INSTALL_DIR@) +-set(OMPL_LIBRARY_DIRS "${OMPL_LIBRARY_DIR};@Boost_LIBRARY_DIRS@") ++set(OMPL_LIBRARY_DIRS "${OMPL_LIBRARY_DIR};${Boost_LIBRARY_DIRS}") + foreach(_dir @FLANN_LIBRARY_DIRS@;@ODE_LIBRARY_DIRS@;@SPOT_LIBRARY_DIRS@;@FCL_LIBRARY_DIRS@;@ASSIMP_LIBRARY_DIRS@) + if(_dir) + list(APPEND OMPL_LIBRARY_DIRS "${_dir}") +@@ -40,7 +43,7 @@ set(OMPL_LIBRARY_DIRS "${OMPL_LIBRARY_DIRS}" CACHE STRING "Library path for OMPL + + find_library(OMPL_LIBRARIES NAMES ompl.${OMPL_VERSION} ompl + PATHS ${OMPL_LIBRARY_DIR} NO_DEFAULT_PATH) +-foreach(_lib @Boost_SERIALIZATION_LIBRARY@;@Boost_FILESYSTEM_LIBRARY@;@Boost_SYSTEM_LIBRARY@;@ODE_LIBRARIES@;@SPOT_LIBRARIES@) ++foreach(_lib ${Boost_SERIALIZATION_LIBRARY};${Boost_FILESYSTEM_LIBRARY};${Boost_SYSTEM_LIBRARY};@ODE_LIBRARIES@;@SPOT_LIBRARIES@) + if(_lib) + list(APPEND OMPL_LIBRARIES "${_lib}") + endif() +@@ -61,3 +64,4 @@ endif() + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(ompl DEFAULT_MSG OMPL_INCLUDE_DIRS OMPL_LIBRARY_DIRS OMPL_LIBRARIES) ++include(${CMAKE_CURRENT_LIST_DIR}/ompl-targets.cmake) diff --git a/externals/vcpkg/ports/ompl/portfile.cmake b/externals/vcpkg/ports/ompl/portfile.cmake new file mode 100755 index 000000000..5f32ad499 --- /dev/null +++ b/externals/vcpkg/ports/ompl/portfile.cmake @@ -0,0 +1,59 @@ +vcpkg_buildpath_length_warning(37) + +# See https://github.com/ompl/ompl/blob/main/src/ompl/CMakeLists.txt#L49-L54 +if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +else() + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +endif() + +set(OMPL_VERSION 1.5.1) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ompl/ompl + REF 1.5.1 + SHA512 2f28d29f32f3bb03e67b29ce251e4786364847a25e3c4cf66d7663ed38dca4da71d4e03cf9ce647710d9524a3907c76c09795e77f041cb8822f695d28f5ca570 + HEAD_REF master + PATCHES + 0001_Export_targets.patch + 0002_Fix_config.patch +) + +# Based on selected features different files get downloaded, so use the following command instead of patch. +vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "find_package(Eigen3 REQUIRED)" "find_package(Eigen3 REQUIRED CONFIG)") +vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "find_package(ccd REQUIRED)" "find_package(ccd REQUIRED CONFIG)") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DOMPL_VERSIONED_INSTALL=OFF + -DOMPL_REGISTRATION=OFF + -DOMPL_BUILD_DEMOS=OFF + -DOMPL_BUILD_TESTS=OFF + -DOMPL_BUILD_PYBINDINGS=OFF + -DOMPL_BUILD_PYTESTS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/ompl/cmake) +vcpkg_fixup_pkgconfig() + +# Remove debug distribution and other, move ompl_benchmark to tools/ dir +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share/man" + "${CURRENT_PACKAGES_DIR}/share/ompl/demos" + "${CURRENT_PACKAGES_DIR}/share/ompl/ompl.conf" + "${CURRENT_PACKAGES_DIR}/share/ompl/plannerarena" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/ompl/vcpkg.json b/externals/vcpkg/ports/ompl/vcpkg.json new file mode 100755 index 000000000..5b8be4e38 --- /dev/null +++ b/externals/vcpkg/ports/ompl/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "ompl", + "version": "1.5.1", + "port-version": 5, + "description": "The Open Motion Planning Library, consists of many state-of-the-art sampling-based motion planning algorithms", + "homepage": "https://ompl.kavrakilab.org/", + "dependencies": [ + "boost-dynamic-bitset", + "boost-filesystem", + "boost-graph", + "boost-odeint", + "boost-program-options", + "boost-serialization", + "boost-system", + "boost-test", + "boost-timer", + "boost-ublas", + "eigen3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/omplapp/fix_boost_static_link.patch b/externals/vcpkg/ports/omplapp/fix_boost_static_link.patch new file mode 100755 index 000000000..af7c3f43e --- /dev/null +++ b/externals/vcpkg/ports/omplapp/fix_boost_static_link.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4b391b5..24d2c66 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -36,10 +36,10 @@ set(OMPL_DEMO_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/ompl/demos" + set(OMPL_CMAKE_UTIL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ompl/CMakeModules" + CACHE FILEPATH "Path to directory with auxiliary CMake scripts for OMPL") + +-if(MSVC) ++if(false) + add_definitions(-DBOOST_ALL_NO_LIB) + add_definitions(-DBOOST_PROGRAM_OPTIONS_DYN_LINK) +-endif(MSVC) ++endif(false) + # Ensure dynamic linking with boost unit_test_framework + add_definitions(-DBOOST_TEST_DYN_LINK) + # Avoid valgrind error due to overflow error, cf. https://bitbucket.org/ompl/ompl/issues/543 diff --git a/externals/vcpkg/ports/omplapp/fix_dependency.patch b/externals/vcpkg/ports/omplapp/fix_dependency.patch new file mode 100755 index 000000000..08b1fcacf --- /dev/null +++ b/externals/vcpkg/ports/omplapp/fix_dependency.patch @@ -0,0 +1,128 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4c7e690..4b391b5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -73,12 +73,15 @@ set_package_properties(OpenGL PROPERTIES + URL "http://opengl.org" + PURPOSE "Used to render graphics in ompl_app.") + set(OpenGL_GL_PREFERENCE GLVND) +-find_package(OpenGL) ++if (OMPLAPP_WITH_OPENGL) ++find_package(OpenGL REQUIRED) ++endif() + set_package_properties(Python PROPERTIES + URL "http://python.org" + PURPOSE "Used for python bindings.") + # This includes our own FindPython.cmake in ompl/CMakeModules. It defines, + # among other things, the find_python_module() function used below. ++if (OMPLAPP_WITH_PYTHON) + find_package(Python) + find_boost_python() + +@@ -105,55 +108,76 @@ find_python_module(OpenGL) + if (NOT OPENGL_FOUND OR NOT PY_OPENGL) + message(WARNING "Both OpenGL and the Python OpenGL module need to be installed to use the GUI") + endif() ++endif() + set_package_properties(Eigen3 PROPERTIES + URL "http://eigen.tuxfamily.org" + PURPOSE "A linear algebra library used throughout OMPL.") +-find_package(Eigen3 REQUIRED) ++find_package(Eigen3 CONFIG REQUIRED) + set_package_properties(Triangle PROPERTIES + URL "http://www.cs.cmu.edu/~quake/triangle.html" + PURPOSE "Used to create triangular decompositions of polygonal 2D environments.") ++if (OMPLAPP_WITH_TRIANGLE) + find_package(Triangle QUIET) ++endif() + set_package_properties(flann PROPERTIES + URL "https://github.com/mariusmuja/flann" + PURPOSE "If detetected, FLANN can be used for nearest neighbor queries by OMPL.") ++if (OMPLAPP_WITH_FLANN) + find_package(flann 1.8.3 QUIET) ++endif() + set_package_properties(spot PROPERTIES + URL "http://spot.lrde.epita.fr" + PURPOSE "Used for constructing finite automata from LTL formulae.") ++if (OMPLAPP_WITH_SPOT) + find_package(spot) ++endif() + set_package_properties(MORSE PROPERTIES + URL "https://www.openrobots.org/wiki/morse" + PURPOSE "OMPL includes a plugin for the MORSE Robot Simulation engine.") ++if (OMPLAPP_WITH_MORSE) + find_package(MORSE QUIET) ++endif() + set_package_properties(ODE PROPERTIES + URL "http://ode.org" + PURPOSE "The Open Dynamics Engine can be used as a \"black box\" for kinodynamic planning.") +-find_package(ODE QUIET) ++if (OMPLAPP_WITH_ODE) ++find_package(ODE CONFIG REQUIRED) ++set(ODE_LIBRARIES ODE::ODE) ++endif() + set_package_properties(Drawstuff PROPERTIES + URL "http://ode.org" + PURPOSE "Part of the ODE source distribution, used in one demo program.") ++if (OMPLAPP_WITH_DRAWSTUFF) + find_package(Drawstuff QUIET) ++endif() + set_package_properties(assimp PROPERTIES + URL "http://assimp.org" + PURPOSE "Used in ompl_app for reading meshes representing robots and environments.") +-find_package(assimp REQUIRED) ++find_package(assimp CONFIG REQUIRED) ++set(ASSIMP_LIBRARIES assimp::assimp) + set_package_properties(ccd PROPERTIES + URL "https://github.com/danfis/libccd" + PURPOSE "Collision detection library used by fcl.") +-find_package(ccd REQUIRED) ++find_package(ccd CONFIG REQUIRED) + set_package_properties(fcl PROPERTIES + URL "https://github.com/flexible-collision-library/fcl" + PURPOSE "The default collision checking library.") ++if (OMPLAPP_WITH_OCTOMAP) + find_package(octomap QUIET) ++endif() + find_package(fcl REQUIRED) + set_package_properties(Threads PROPERTIES + URL "https://en.wikipedia.org/wiki/POSIX_Threads" + PURPOSE "Pthreads is sometimes needed, depending on OS / compiler.") ++if (OMPLAPP_WITH_THREADS) + find_package(Threads QUIET) ++endif() + set_package_properties(Doxygen PROPERTIES + URL "http://doxygen.org" + PURPOSE "Used to create the OMPL documentation (i.e., http://ompl.kavrakilab.org).") ++if (OMPLAPP_WITH_DOXYGEN) + find_package(Doxygen) ++endif() + + enable_testing() + +@@ -177,9 +201,7 @@ include_directories(SYSTEM "${Boost_INCLUDE_DIR}") + include_directories( + "${OMPLAPP_INCLUDE_DIRS}" + "${OMPL_INCLUDE_DIRS}" +- "${EIGEN3_INCLUDE_DIR}" +- "${FCL_INCLUDE_DIRS}" +- "${ASSIMP_INCLUDE_DIRS}") ++ "${FCL_INCLUDE_DIRS}") + + # ROS installs fcl in /usr. In /usr/include/fcl/config.h it says octomap was + # enabled. Octomap is installed in /opt/ros/${ROS_DISTRO}/include (most +@@ -242,12 +264,14 @@ endif() + set_package_properties(PQP PROPERTIES + URL "http://gamma.cs.unc.edu/SSV/" + PURPOSE "Used as an alternative, additional collision checking library (the default is FCL).") ++IF (OMPLAPP_WITH_PQP) + find_package(PQP QUIET) + if(PQP_FOUND) + include_directories("${PQP_INCLUDE_DIR}") + set(OMPLAPP_MODULE_LIBRARIES ${OMPLAPP_MODULE_LIBRARIES} ${PQP_LIBRARY}) + set(OMPLAPP_LIBRARIES ${OMPLAPP_LIBRARIES} ${PQP_LIBRARY}) + endif() ++endif() + + add_subdirectory(ompl/doc) + add_subdirectory(ompl/src) diff --git a/externals/vcpkg/ports/omplapp/portfile.cmake b/externals/vcpkg/ports/omplapp/portfile.cmake new file mode 100755 index 000000000..8b14bd147 --- /dev/null +++ b/externals/vcpkg/ports/omplapp/portfile.cmake @@ -0,0 +1,89 @@ +vcpkg_buildpath_length_warning(37) + +set(OMPL_VERSION 1.5.1) + +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/ompl/omplapp/releases/download/1.5.1/omplapp-1.5.1-Source.tar.gz" + FILENAME "omplapp-${OMPL_VERSION}.tar.gz" + SHA512 83b1b09d6be776f7e15a748402f0c2f072459921de61a92731daf5171bd1f91a829fbeb6e10a489b92fba0297f6272e7bb6b8f07830c387bb29ccdbc7b3731f3 +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(STATIC_PATCH fix_boost_static_link.patch) +endif() + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${OMPL_VERSION} + PATCHES + fix_dependency.patch + ${STATIC_PATCH} +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + ode OMPLAPP_WITH_ODE + opengl OMPLAPP_WITH_OPENGL + threads OMPLAPP_WITH_THREADS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + ${FEATURE_OPTIONS} + -DOMPL_VERSIONED_INSTALL=OFF + -DOMPL_REGISTRATION=OFF + -DOMPL_BUILD_DEMOS=OFF + -DOMPL_BUILD_TESTS=OFF + -DOMPL_BUILD_PYBINDINGS=OFF + -DOMPL_BUILD_PYTESTS=OFF + # Not implement + -DOMPLAPP_WITH_PYTHON=OFF + -DOMPLAPP_WITH_TRIANGLE=OFF + -DOMPLAPP_WITH_OCTOMAP=OFF + -DOMPLAPP_WITH_FLANN=OFF # Requires 1.8.3 + # Missing dependencies in vcpkg + -DOMPLAPP_WITH_SPOT=OFF + -DOMPLAPP_WITH_MORSE=OFF + -DOMPLAPP_WITH_DRAWSTUFF=OFF + -DOMPLAPP_WITH_PQP=OFF + -DOMPLAPP_WITH_DOXYGEN=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/ompl/cmake) + +# Remove debug distribution and other, move ompl_benchmark to tools/ dir +vcpkg_copy_tools(TOOL_NAMES ompl_benchmark AUTO_CLEAN) +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/include/ompl" + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/include/omplapp/CMakeFiles" + "${CURRENT_PACKAGES_DIR}/lib/ompl.lib" + "${CURRENT_PACKAGES_DIR}/share/ompl" + "${CURRENT_PACKAGES_DIR}/share/man" + "${CURRENT_PACKAGES_DIR}/debug/bin" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/ompl.lib" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/omplapp/config.h" "#define OMPLAPP_RESOURCE_DIR \"${CURRENT_PACKAGES_DIR}/share/ompl/resources\"" "") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +if(NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/ompl.pc" "assimp::assimp" "assimp") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/ompl.pc" "assimp::assimp" "assimp") + endif() + vcpkg_fixup_pkgconfig() +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/omplapp/vcpkg.json b/externals/vcpkg/ports/omplapp/vcpkg.json new file mode 100755 index 000000000..6b1493f44 --- /dev/null +++ b/externals/vcpkg/ports/omplapp/vcpkg.json @@ -0,0 +1,46 @@ +{ + "name": "omplapp", + "version": "1.5.1", + "port-version": 3, + "description": "Use OMPL for reading meshes and performing collision checking", + "homepage": "https://ompl.kavrakilab.org/", + "dependencies": [ + "assimp", + "boost-filesystem", + "boost-program-options", + "boost-serialization", + "boost-system", + "ccd", + "eigen3", + "fcl", + "ompl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "ode": { + "description": "Build with Open Dynamics Engine support", + "dependencies": [ + "ode" + ] + }, + "opengl": { + "description": "Build with OpenGL support", + "dependencies": [ + "opengl" + ] + }, + "threads": { + "description": "Build with Threads support", + "dependencies": [ + "pthreads" + ] + } + } +} diff --git a/externals/vcpkg/ports/onednn/portfile.cmake b/externals/vcpkg/ports/onednn/portfile.cmake new file mode 100755 index 000000000..f254c4e37 --- /dev/null +++ b/externals/vcpkg/ports/onednn/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO oneapi-src/oneDNN + REF v2.4.3 + SHA512 6a597be1b6b50d252e346a96d3c9b4771e9d8e8fc495a09b638ea296d53e71d51ea2e2be04cc20de1bca17215a7a7e5f22a1808628bcdf98180def2d91b2c9e3 + HEAD_REF master +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(DNNL_OPTIONS "-DDNNL_LIBRARY_TYPE=STATIC") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${DNNL_OPTIONS} +) +vcpkg_cmake_install() + +# The port name and the find_package() name are different (onednn versus dnnl) +vcpkg_cmake_config_fixup(PACKAGE_NAME dnnl CONFIG_PATH lib/cmake/dnnl) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Copyright and license +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/onednn/vcpkg.json b/externals/vcpkg/ports/onednn/vcpkg.json new file mode 100755 index 000000000..b06a95264 --- /dev/null +++ b/externals/vcpkg/ports/onednn/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "onednn", + "version-semver": "2.4.3", + "port-version": 1, + "description": "oneAPI Deep Neural Network Library (oneDNN)", + "homepage": "https://github.com/oneapi-src/oneDNN", + "supports": "x64 & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/oniguruma/fix-uwp.patch b/externals/vcpkg/ports/oniguruma/fix-uwp.patch new file mode 100755 index 000000000..5a2f801d1 --- /dev/null +++ b/externals/vcpkg/ports/oniguruma/fix-uwp.patch @@ -0,0 +1,25 @@ +diff --git a/src/regcomp.c b/src/regcomp.c +--- a/src/regcomp.c ++++ b/src/regcomp.c +@@ -3880,7 +3880,7 @@ reduce_string_list(Node* node) + { + Node* prev; + Node* curr; +- Node* prev_node; ++ Node* prev_node = NULL; + Node* next_node; + + prev = NULL_NODE; +diff --git a/src/regexec.c b/src/regexec.c +index ce498c6..6848c0f 100644 +--- a/src/regexec.c ++++ b/src/regexec.c +@@ -4216,7 +4216,7 @@ regset_search_body_position_lead(OnigRegSet* set, + { + int r, n, i; + UChar *s; +- UChar *low, *high; ++ UChar *low, *high = NULL; + UChar* sch_range; + regex_t* reg; + OnigEncoding enc; diff --git a/externals/vcpkg/ports/oniguruma/portfile.cmake b/externals/vcpkg/ports/oniguruma/portfile.cmake new file mode 100755 index 000000000..86e9f97c7 --- /dev/null +++ b/externals/vcpkg/ports/oniguruma/portfile.cmake @@ -0,0 +1,54 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kkos/oniguruma + REF v6.9.7.1 + SHA512 CE22050E04E51843E894D2D534D062FDD23CC2BAAC9BA43DA1843EC928F6CE5ED3D4407FE945F4D34ADADF3167DFD943CD81AE4556F7C5EC51E7331C35EAD479 + HEAD_REF master + PATCHES fix-uwp.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + "non-posix" ENABLE_POSIX_API +) + +if(VCPKG_CRT_LINKAGE STREQUAL "static") + set(MSVC_STATIC_RUNTIME ON) +else() + set(MSVC_STATIC_RUNTIME OFF) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DMSVC_STATIC_RUNTIME=${MSVC_STATIC_RUNTIME} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/oniguruma.h" + "#if defined(ONIGURUMA_EXPORT)" + "#if 0 // defined(ONIGURUMA_EXPORT)" + ) +else() + # oniguruma.h uses `\n` as line break. + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/oniguruma.h" + "#ifndef ONIG_EXTERN\n#if defined(_WIN32) && !defined(__GNUC__)" + "#if 0\n#if defined(_WIN32) && !defined(__GNUC__)" + ) +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/oniguruma/vcpkg.json b/externals/vcpkg/ports/oniguruma/vcpkg.json new file mode 100755 index 000000000..7247d3036 --- /dev/null +++ b/externals/vcpkg/ports/oniguruma/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "oniguruma", + "version": "6.9.7.1", + "port-version": 1, + "description": "Modern and flexible regular expressions library", + "homepage": "https://github.com/kkos/oniguruma", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "non-posix": { + "description": "Disable POSIX API" + } + } +} diff --git a/externals/vcpkg/ports/onnx-optimizer/fix-cmakelists.patch b/externals/vcpkg/ports/onnx-optimizer/fix-cmakelists.patch new file mode 100755 index 000000000..4c54d77e0 --- /dev/null +++ b/externals/vcpkg/ports/onnx-optimizer/fix-cmakelists.patch @@ -0,0 +1,56 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c2e48b3..5716fbb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,10 +7,18 @@ if(NOT MSVC) + set(CMAKE_CXX_STANDARD 11) + endif(NOT MSVC) + ++# Add MSVC RunTime Flag ++function(add_msvc_runtime_flag lib) ++ if(${ONNX_USE_MSVC_STATIC_RUNTIME}) ++ target_compile_options(${lib} PRIVATE $<$>:/MT> $<$:/MTd>) ++ else() ++ target_compile_options(${lib} PRIVATE $<$>:/MD> $<$:/MDd>) ++ endif() ++endfunction() + set(CMAKE_POSITION_INDEPENDENT_CODE ON) + +-set(ONNX_ROOT ${PROJECT_SOURCE_DIR}/third_party/onnx) +-add_subdirectory(${ONNX_ROOT}) ++find_package(protobuf CONFIG REQUIRED) ++find_package(ONNX CONFIG REQUIRED) + + file(READ "${PROJECT_SOURCE_DIR}/VERSION_NUMBER" ONNX_OPTIMIZER_VERSION) + string(STRIP "${ONNX_OPTIMIZER_VERSION}" ONNX_OPTIMIZER_VERSION) +@@ -31,6 +39,7 @@ add_executable(onnx_optimizer_exec examples/onnx_optimizer_exec.cpp) + target_link_libraries(onnx_optimizer_exec onnx_optimizer) + + if(BUILD_ONNX_PYTHON) ++ find_package(Python3 COMPONENTS Development REQUIRED) + if("${PY_EXT_SUFFIX}" STREQUAL "") + if(MSVC) + set(PY_EXT_SUFFIX ".pyd") +@@ -51,7 +60,7 @@ if(BUILD_ONNX_PYTHON) + $ + ${PYTHON_INCLUDE_DIR}) + # pybind11 is a header only lib +- find_package(pybind11 2.2) ++ find_package(pybind11 2.2 CONFIG REQUIRED) + if(pybind11_FOUND) + target_include_directories(onnx_opt_cpp2py_export PUBLIC + ${pybind11_INCLUDE_DIRS}) +@@ -87,11 +96,9 @@ if(BUILD_ONNX_PYTHON) + endif() + + target_link_libraries(onnx_opt_cpp2py_export PRIVATE onnx_optimizer) +- ++ target_link_directories(onnx_opt_cpp2py_export PRIVATE ${Python3_LIBRARY_DIRS}) ++ target_link_libraries(onnx_opt_cpp2py_export PRIVATE ${Python3_LIBRARIES}) + if(MSVC) +- find_package(PythonInterp ${PY_VERSION} REQUIRED) +- find_package(PythonLibs ${PY_VERSION} REQUIRED) +- target_link_libraries(onnx_opt_cpp2py_export PRIVATE ${PYTHON_LIBRARIES}) + target_compile_options(onnx_opt_cpp2py_export + PRIVATE /MP + /WX diff --git a/externals/vcpkg/ports/onnx-optimizer/portfile.cmake b/externals/vcpkg/ports/onnx-optimizer/portfile.cmake new file mode 100755 index 000000000..fe62f0304 --- /dev/null +++ b/externals/vcpkg/ports/onnx-optimizer/portfile.cmake @@ -0,0 +1,43 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO onnx/optimizer + REF v0.2.6 + SHA512 cc6373781f04bc6fafd3282d248e26eaf93556b86acbb0dee44b4aa7a5d59c634905c1a05d035e31a50fc0f06cfc686fa483b79a324dd973faa421747d4a681b + HEAD_REF master + PATCHES + fix-cmakelists.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + pybind11 BUILD_ONNX_PYTHON +) +if("pybind11" IN_LIST FEATURES) + vcpkg_find_acquire_program(PYTHON3) + list(APPEND FEATURE_OPTIONS + -DPython3_EXECUTABLE=${PYTHON3} + -DONNX_USE_PROTOBUF_SHARED_LIBS=ON # /wd4251 + ) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} +) +if("pybind11" IN_LIST FEATURES) + # This target is not in install/export + vcpkg_cmake_build(TARGET onnx_opt_cpp2py_export) +endif() +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME ONNXOptimizer CONFIG_PATH lib/cmake/ONNXOptimizer) + +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/include/onnxoptimizer/test" +) diff --git a/externals/vcpkg/ports/onnx-optimizer/vcpkg.json b/externals/vcpkg/ports/onnx-optimizer/vcpkg.json new file mode 100755 index 000000000..f38496eb0 --- /dev/null +++ b/externals/vcpkg/ports/onnx-optimizer/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "onnx-optimizer", + "version-semver": "0.2.6", + "description": "Actively maintained ONNX Optimizer", + "homepage": "https://github.com/onnx/optimizer", + "license": "Apache-2.0", + "dependencies": [ + "onnx", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "pybind11": { + "description": "Build Python binaries", + "dependencies": [ + { + "name": "onnx", + "features": [ + "pybind11" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/onnx/fix-cmakelists.patch b/externals/vcpkg/ports/onnx/fix-cmakelists.patch new file mode 100755 index 000000000..c5863deaf --- /dev/null +++ b/externals/vcpkg/ports/onnx/fix-cmakelists.patch @@ -0,0 +1,86 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 628dcaa..300e4ea 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -111,8 +111,8 @@ endif() + # find_package Python has replaced PythonInterp and PythonLibs since cmake 3.12 + # Use the following command in the future; now this is only compatible with the latest pybind11 + # find_package(Python ${PY_VERSION} COMPONENTS Interpreter Development REQUIRED) +-find_package(PythonInterp ${PY_VERSION} REQUIRED) +-find_package(PythonLibs ${PY_VERSION}) ++find_package(Python3 ${PY_VERSION} COMPONENTS Interpreter REQUIRED) ++set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE}) + + if(CMAKE_SYSTEM_NAME STREQUAL "AIX") + set(CMAKE_NO_SYSTEM_FROM_IMPORTED 1) +@@ -422,6 +422,7 @@ target_link_libraries(onnx PUBLIC onnx_proto) + add_onnx_global_defines(onnx) + + if(BUILD_ONNX_PYTHON) ++ find_package(Python3 ${PY_VERSION} COMPONENTS Development REQUIRED) + if("${PY_EXT_SUFFIX}" STREQUAL "") + if(MSVC) + set(PY_EXT_SUFFIX ".pyd") +@@ -441,10 +442,13 @@ if(BUILD_ONNX_PYTHON) + $ + $ + $ +- ${PYTHON_INCLUDE_DIR}) +- ++ ${Python3_INCLUDE_DIRS}) ++ target_link_directories(onnx_cpp2py_export PRIVATE ++ ${Python3_LIBRARY_DIRS}) ++ target_link_libraries(onnx_cpp2py_export PRIVATE ++ ${Python3_LIBRARIES}) + # pybind11 is a header only lib +- find_package(pybind11 2.2) ++ find_package(pybind11 2.2 CONFIG REQUIRED) + if(pybind11_FOUND) + target_include_directories(onnx_cpp2py_export PUBLIC + ${pybind11_INCLUDE_DIRS}) +@@ -687,6 +691,27 @@ endif() + + include(GNUInstallDirs) + ++# install protobuf files ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx-data.proto ++ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx-data.proto3 ++ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx-ml.proto ++ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx-ml.proto3 ++ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx-operators-ml.proto ++ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx-operators-ml.proto3 ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/onnx ++) ++# install python files ++if(BUILD_ONNX_PYTHON) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx_data_pb.py ++ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx_data_pb2.py ++ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx_ml_pb2.py ++ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx_operators_ml_pb2.py ++ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx_operators_pb.py ++ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx_pb.py ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/onnx ++ ) ++endif() ++ + install(DIRECTORY ${ONNX_ROOT}/onnx + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING +@@ -639,7 +639,7 @@ endif() + + if (NOT ANDROID AND NOT IOS) + # ---[ ONNXIFI wrapper +- add_library(onnxifi_wrapper MODULE onnx/onnxifi_wrapper.c) ++ add_library(onnxifi_wrapper onnx/onnxifi_wrapper.c) + if(MSVC) + add_msvc_runtime_flag(onnxifi_wrapper) + endif() +@@ -669,7 +669,7 @@ if (NOT ANDROID AND NOT IOS) + endif() + + # ---[ ONNXIFI dummy backend +-add_library(onnxifi_dummy SHARED onnx/onnxifi_dummy.c) ++add_library(onnxifi_dummy onnx/onnxifi_dummy.c) + + if(ONNXIFI_ENABLE_EXT) + add_definitions(-DONNXIFI_ENABLE_EXT=ON) diff --git a/externals/vcpkg/ports/onnx/fix-dependency-protobuf.patch b/externals/vcpkg/ports/onnx/fix-dependency-protobuf.patch new file mode 100755 index 000000000..6ccdac665 --- /dev/null +++ b/externals/vcpkg/ports/onnx/fix-dependency-protobuf.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1295eab..0fb9f17 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -126,6 +126,7 @@ if(ONNX_BUILD_TESTS) + include(googletest) + endif() + ++find_package(protobuf CONFIG REQUIRED) + if((ONNX_USE_LITE_PROTO AND TARGET protobuf::libprotobuf-lite) OR ((NOT ONNX_USE_LITE_PROTO) AND TARGET protobuf::libprotobuf)) + # Sometimes we need to use protoc compiled for host architecture while linking + # libprotobuf against target architecture. See https://github.com/caffe2/caffe diff --git a/externals/vcpkg/ports/onnx/portfile.cmake b/externals/vcpkg/ports/onnx/portfile.cmake new file mode 100755 index 000000000..8070f6dd9 --- /dev/null +++ b/externals/vcpkg/ports/onnx/portfile.cmake @@ -0,0 +1,95 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO onnx/onnx + REF v1.10.2 + SHA512 7519d326cd2b2b13a269ec0d01af07c32115d183dae6e1eaae55f5b23b6c92b2aadbb2b1e555557f4201bbcf921fa563d09d45d7f1d3bd2399c1a94a6ef63303 + PATCHES + fix-cmakelists.patch + fix-dependency-protobuf.patch +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RUNTIME) + +# ONNX_USE_PROTOBUF_SHARED_LIBS: find the library and check its file extension +find_library(PROTOBUF_LIBPATH NAMES protobuf PATHS "${CURRENT_INSTALLED_DIR}/bin" "${CURRENT_INSTALLED_DIR}/lib" REQUIRED) +get_filename_component(PROTOBUF_LIBNAME "${PROTOBUF_LIBPATH}" NAME) +if(PROTOBUF_LIBNAME MATCHES "${CMAKE_SHARED_LIBRARY_SUFFIX}") + set(USE_PROTOBUF_SHARED ON) +else() + set(USE_PROTOBUF_SHARED OFF) +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + pybind11 BUILD_ONNX_PYTHON +) + +# Like protoc, python is required for codegen. +vcpkg_find_acquire_program(PYTHON3) + +# PATH for .bat scripts so it can find 'python' +get_filename_component(PYTHON_DIR "${PYTHON3}" PATH) +vcpkg_add_to_path(PREPEND "${PYTHON_DIR}") + +if("pybind11" IN_LIST FEATURES) + # When BUILD_ONNX_PYTHON, we need Development component. Give a hint for FindPython3 + list(APPEND FEATURE_OPTIONS + "-DPython3_ROOT_DIR=${CURRENT_INSTALLED_DIR}" + ) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DPython3_EXECUTABLE=${PYTHON3} + -DONNX_ML=ON + -DONNX_GEN_PB_TYPE_STUBS=ON + -DONNX_USE_PROTOBUF_SHARED_LIBS=${USE_PROTOBUF_SHARED} + -DONNX_USE_LITE_PROTO=OFF + -DONNX_USE_MSVC_STATIC_RUNTIME=${USE_STATIC_RUNTIME} + -DONNX_BUILD_TESTS=OFF + -DONNX_BUILD_BENCHMARKS=OFF + MAYBE_UNUSED_VARIABLES + ONNX_USE_MSVC_STATIC_RUNTIME +) + +if("pybind11" IN_LIST FEATURES) + # This target is not in install/export + vcpkg_cmake_build(TARGET onnx_cpp2py_export) +endif() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ONNX) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + # the others are empty + "${CURRENT_PACKAGES_DIR}/include/onnx/backend" + "${CURRENT_PACKAGES_DIR}/include/onnx/bin" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/controlflow" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/generator" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/logical" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/math" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/nn" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/object_detection" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/optional" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/quantization" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/reduction" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/rnn" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/sequence" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/traditionalml" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/training" + "${CURRENT_PACKAGES_DIR}/include/onnx/examples" + "${CURRENT_PACKAGES_DIR}/include/onnx/frontend" + "${CURRENT_PACKAGES_DIR}/include/onnx/onnx_cpp2py_export" + "${CURRENT_PACKAGES_DIR}/include/onnx/test" + "${CURRENT_PACKAGES_DIR}/include/onnx/tools" + "${CURRENT_PACKAGES_DIR}/include/onnx/onnx_ml" + "${CURRENT_PACKAGES_DIR}/include/onnx/onnx_data" + "${CURRENT_PACKAGES_DIR}/include/onnx/onnx_operators_ml" +) diff --git a/externals/vcpkg/ports/onnx/vcpkg.json b/externals/vcpkg/ports/onnx/vcpkg.json new file mode 100755 index 000000000..2eaace7ce --- /dev/null +++ b/externals/vcpkg/ports/onnx/vcpkg.json @@ -0,0 +1,36 @@ +{ + "name": "onnx", + "version-semver": "1.10.2", + "port-version": 1, + "description": "Open standard for machine learning interoperability", + "homepage": "https://onnx.ai", + "license": "Apache-2.0", + "supports": "!uwp", + "dependencies": [ + "protobuf", + { + "name": "protobuf", + "host": true + }, + { + "name": "python3", + "host": true + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "pybind11": { + "description": "Build Python binaries", + "dependencies": [ + "pybind11" + ] + } + } +} diff --git a/externals/vcpkg/ports/onnxruntime-gpu/portfile.cmake b/externals/vcpkg/ports/onnxruntime-gpu/portfile.cmake new file mode 100755 index 000000000..bce266e94 --- /dev/null +++ b/externals/vcpkg/ports/onnxruntime-gpu/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +set(VERSION 1.5.1) + +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/microsoft/onnxruntime/releases/download/v1.5.1/onnxruntime-win-x64-gpu-1.5.1.zip" + FILENAME "onnxruntime-win-x64-gpu-1.5.1.zip" + SHA512 893dbed1196b5c9730744dc5566cd3ad8ec677cbea04dd0572efc9a8b3563d3f1cbf40d0dea3d624d9451dc33272c0ae44d53d6deee6f249fa2520e60718ee52 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL + REF ${VERSION} +) + +file(MAKE_DIRECTORY + ${CURRENT_PACKAGES_DIR}/include + ${CURRENT_PACKAGES_DIR}/lib + ${CURRENT_PACKAGES_DIR}/bin + ${CURRENT_PACKAGES_DIR}/debug/lib + ${CURRENT_PACKAGES_DIR}/debug/bin + ) + +file(COPY + ${SOURCE_PATH}/onnxruntime-win-x64-gpu-1.5.1/include + DESTINATION ${CURRENT_PACKAGES_DIR} + ) + +file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-1.5.1/lib/onnxruntime.lib + DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-1.5.1/lib/onnxruntime.lib + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-1.5.1/lib/onnxruntime.dll + DESTINATION ${CURRENT_PACKAGES_DIR}/bin) +file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-1.5.1/lib/onnxruntime.dll + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + +# # Handle copyright +file(INSTALL ${SOURCE_PATH}/onnxruntime-win-x64-gpu-1.5.1/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/onnxruntime-gpu/vcpkg.json b/externals/vcpkg/ports/onnxruntime-gpu/vcpkg.json new file mode 100755 index 000000000..53723298a --- /dev/null +++ b/externals/vcpkg/ports/onnxruntime-gpu/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "onnxruntime-gpu", + "version": "1.5.1", + "port-version": 1, + "description": "onnxruntime (GPU)", + "homepage": "https://github.com/microsoft/onnxruntime", + "supports": "windows & !x86 & !uwp & !static & !arm" +} diff --git a/externals/vcpkg/ports/oof/portfile.cmake b/externals/vcpkg/ports/oof/portfile.cmake new file mode 100755 index 000000000..49b3abbc7 --- /dev/null +++ b/externals/vcpkg/ports/oof/portfile.cmake @@ -0,0 +1,11 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO s9w/oof + REF a0c3e8e0dceec391bd38861ab108b932a2513bcb + SHA512 4d5650c8fa1e21e7fe71dbe615a6e3bdbe3781be28811e895ac335261de24b3ed26c4842cdd133df897cdb7181c3ea11c051607fbda5a7a1b9a4d8580323181d + HEAD_REF master +) + +file(INSTALL "${SOURCE_PATH}/oof.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/oof/vcpkg.json b/externals/vcpkg/ports/oof/vcpkg.json new file mode 100755 index 000000000..45a899d61 --- /dev/null +++ b/externals/vcpkg/ports/oof/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "oof", + "version-date": "2021-11-23", + "description": "Convenient, high-performance RGB color and position control for console output.", + "homepage": "https://github.com/s9w/oof", + "license": "MIT" +} diff --git a/externals/vcpkg/ports/open62541/openssl.patch b/externals/vcpkg/ports/open62541/openssl.patch new file mode 100755 index 000000000..cc68eb570 --- /dev/null +++ b/externals/vcpkg/ports/open62541/openssl.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9184b943..bd9203f7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -526,7 +526,7 @@ if(NOT UA_FORCE_CPP AND (CMAKE_COMPILER_IS_GNUCC OR "x${CMAKE_C_COMPILER_ID}" ST + check_add_cc_flag("-Wall") # Warnings + check_add_cc_flag("-Wextra") # More warnings + check_add_cc_flag("-Wpedantic") # Standard compliance +- check_add_cc_flag("-Werror") # All warnings are errors ++ #check_add_cc_flag("-Werror") # All warnings are errors + + check_add_cc_flag("-Wno-static-in-inline") # Clang doesn't like the use of static inline methods inside static inline methods + check_add_cc_flag("-Wno-overlength-strings") # May happen in the nodeset compiler when complex values are directly encoded +@@ -659,7 +659,7 @@ if(APPLE) + endif() + + if(MSVC) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3 /WX /w44996") # Compiler warnings, error on warning ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3 /WX /w44996 /wd4090") # Compiler warnings, error on warning + + if(UA_MSVC_FORCE_STATIC_CRT AND NOT BUILD_SHARED_LIBS) + set(CompilerFlags CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_C_FLAGS diff --git a/externals/vcpkg/ports/open62541/portfile.cmake b/externals/vcpkg/ports/open62541/portfile.cmake new file mode 100755 index 000000000..a7536e758 --- /dev/null +++ b/externals/vcpkg/ports/open62541/portfile.cmake @@ -0,0 +1,44 @@ +set(VERSION v1.2.3) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO open62541/open62541 + REF "${VERSION}" + SHA512 ffcc697901ec978fb9d1f8996f8a4c5114c98a0ec19206cac95d1a84f8d0fcbe38bf73e88f1df59d53bc6be481102aa2f2a6a0efa29797e7ce11123bd23131c2 + HEAD_REF master + PATCHES + openssl.patch +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openssl UA_ENABLE_ENCRYPTION_OPENSSL + mbedtls UA_ENABLE_ENCRYPTION_MBEDTLS + amalgamation UA_ENABLE_AMALGAMATION + historizing UA_ENABLE_HISTORIZING +) + +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DOPEN62541_VERSION=${VERSION} + OPTIONS_DEBUG + -DCMAKE_DEBUG_POSTFIX=d +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/open62541/tools") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/open62541/vcpkg.json b/externals/vcpkg/ports/open62541/vcpkg.json new file mode 100755 index 000000000..59c666d5f --- /dev/null +++ b/externals/vcpkg/ports/open62541/vcpkg.json @@ -0,0 +1,41 @@ +{ + "name": "open62541", + "version": "1.2.3", + "port-version": 1, + "description": "open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0.", + "homepage": "https://open62541.org", + "license": "MPL-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "openssl" + ], + "features": { + "amalgamation": { + "description": "Concatenate the library to a single file open62541.h/.c" + }, + "historizing": { + "description": "Enable basic support for historical access (client and server)" + }, + "mbedtls": { + "description": "Enable encryption support (uses MbedTLS)", + "dependencies": [ + "mbedtls" + ] + }, + "openssl": { + "description": "Enable encryption support (uses OpenSSL)", + "dependencies": [ + "openssl" + ] + } + } +} diff --git a/externals/vcpkg/ports/openal-soft/dont-export-symbols-in-static-build.patch b/externals/vcpkg/ports/openal-soft/dont-export-symbols-in-static-build.patch new file mode 100755 index 000000000..3ff82b0b8 --- /dev/null +++ b/externals/vcpkg/ports/openal-soft/dont-export-symbols-in-static-build.patch @@ -0,0 +1,13 @@ +diff --git a/config.h.in b/config.h.in +--- a/config.h.in ++++ b/config.h.in +@@ -1,6 +1,8 @@ + /* API declaration export attribute */ ++#ifndef AL_LIBTYPE_STATIC + #define AL_API ${EXPORT_DECL} + #define ALC_API ${EXPORT_DECL} ++#endif + + /* Define if HRTF data is embedded in the library */ + #cmakedefine ALSOFT_EMBED_HRTF_DATA + \ No newline at end of file diff --git a/externals/vcpkg/ports/openal-soft/portfile.cmake b/externals/vcpkg/ports/openal-soft/portfile.cmake new file mode 100755 index 000000000..4194a4747 --- /dev/null +++ b/externals/vcpkg/ports/openal-soft/portfile.cmake @@ -0,0 +1,96 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kcat/openal-soft + REF ae4eacf147e2c2340cc4e02a790df04c793ed0a9 # openal-soft-1.21.1 + SHA512 6ba006d3dad6efe002f285ff509a59f02b499ec3f6065df12a89c52355464117b4dbabcd04ee9cbf22cc3b4125c8e456769b172f8c3e9ee215e760b2c51a0a8f + HEAD_REF master + PATCHES + dont-export-symbols-in-static-build.patch +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(OPENAL_LIBTYPE "SHARED") +else() + set(OPENAL_LIBTYPE "STATIC") +endif() + +set(ALSOFT_REQUIRE_LINUX OFF) +set(ALSOFT_REQUIRE_WINDOWS OFF) +set(ALSOFT_REQUIRE_APPLE OFF) + +if(VCPKG_TARGET_IS_LINUX) + set(ALSOFT_REQUIRE_LINUX ON) +endif() +if(VCPKG_TARGET_IS_WINDOWS) + set(ALSOFT_REQUIRE_WINDOWS ON) +endif() +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) + set(ALSOFT_REQUIRE_APPLE ON) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DLIBTYPE=${OPENAL_LIBTYPE} + -DALSOFT_UTILS=OFF + -DALSOFT_NO_CONFIG_UTIL=ON + -DALSOFT_EXAMPLES=OFF + -DALSOFT_CONFIG=OFF + -DALSOFT_HRTF_DEFS=OFF + -DALSOFT_AMBDEC_PRESETS=OFF + -DALSOFT_BACKEND_ALSA=${ALSOFT_REQUIRE_LINUX} + -DALSOFT_BACKEND_OSS=OFF + -DALSOFT_BACKEND_SOLARIS=OFF + -DALSOFT_BACKEND_SNDIO=OFF + -DALSOFT_BACKEND_PORTAUDIO=OFF + -DALSOFT_BACKEND_PULSEAUDIO=OFF + -DALSOFT_BACKEND_COREAUDIO=${ALSOFT_REQUIRE_APPLE} + -DALSOFT_BACKEND_JACK=OFF + -DALSOFT_BACKEND_OPENSL=${VCPKG_TARGET_IS_ANDROID} + -DALSOFT_BACKEND_WAVE=ON + -DALSOFT_BACKEND_WINMM=OFF + -DALSOFT_BACKEND_DSOUND=OFF + -DALSOFT_REQUIRE_WASAPI=${ALSOFT_REQUIRE_WINDOWS} + -DALSOFT_CPUEXT_NEON=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_WindowsSDK=ON + MAYBE_UNUSED_VARIABLES + ALSOFT_AMBDEC_PRESETS + ALSOFT_BACKEND_ALSA + ALSOFT_BACKEND_COREAUDIO + ALSOFT_BACKEND_JACK + ALSOFT_BACKEND_OPENSL + ALSOFT_BACKEND_OSS + ALSOFT_BACKEND_PORTAUDIO + ALSOFT_BACKEND_PULSEAUDIO + ALSOFT_BACKEND_SNDIO + ALSOFT_BACKEND_SOLARIS + ALSOFT_CONFIG + ALSOFT_CPUEXT_NEON + ALSOFT_HRTF_DEFS + CMAKE_DISABLE_FIND_PACKAGE_WindowsSDK +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/OpenAL") + +foreach(HEADER al.h alc.h) + file(READ "${CURRENT_PACKAGES_DIR}/include/AL/${HEADER}" AL_H) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + string(REPLACE "defined(AL_LIBTYPE_STATIC)" "1" AL_H "${AL_H}") + else() + # Normally we would say: + # string(REPLACE "defined(AL_LIBTYPE_STATIC)" "0" AL_H "${AL_H}") + # but we are leaving these undefined macros alone in support of + # https://github.com/microsoft/vcpkg/issues/18098 + endif() + file(WRITE "${CURRENT_PACKAGES_DIR}/include/AL/${HEADER}" "${AL_H}") +endforeach() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/openal-soft/usage b/externals/vcpkg/ports/openal-soft/usage new file mode 100755 index 000000000..1807fb982 --- /dev/null +++ b/externals/vcpkg/ports/openal-soft/usage @@ -0,0 +1,4 @@ +The package openal-soft provides CMake targets: + + find_package(OpenAL CONFIG REQUIRED) + target_link_libraries(main PRIVATE OpenAL::OpenAL) diff --git a/externals/vcpkg/ports/openal-soft/vcpkg.json b/externals/vcpkg/ports/openal-soft/vcpkg.json new file mode 100755 index 000000000..abf53a63b --- /dev/null +++ b/externals/vcpkg/ports/openal-soft/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "openal-soft", + "version-semver": "1.21.1", + "port-version": 5, + "description": "OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API.", + "homepage": "https://github.com/kcat/openal-soft", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/openblas/fix-redefinition-function.patch b/externals/vcpkg/ports/openblas/fix-redefinition-function.patch new file mode 100755 index 000000000..176a29ff3 --- /dev/null +++ b/externals/vcpkg/ports/openblas/fix-redefinition-function.patch @@ -0,0 +1,28 @@ +diff --git a/openblas_config_template.h b/openblas_config_template.h +index 52dd49d..239219d 100644 +--- a/openblas_config_template.h ++++ b/openblas_config_template.h +@@ -64,6 +64,7 @@ typedef int blasint; + #ifndef __cplusplus + #include + #endif ++ #ifndef OPENBLAS_COMPLEX_STRUCT + typedef float _Complex openblas_complex_float; + typedef double _Complex openblas_complex_double; + typedef xdouble _Complex openblas_complex_xdouble; +@@ -76,7 +77,9 @@ typedef int blasint; + #define openblas_complex_double_imag(z) (cimag(z)) + #define openblas_complex_xdouble_real(z) (creal(z)) + #define openblas_complex_xdouble_imag(z) (cimag(z)) ++ #endif + #else ++ #ifndef OPENBLAS_COMPLEX_STRUCT + #define OPENBLAS_COMPLEX_STRUCT + typedef struct { float real, imag; } openblas_complex_float; + typedef struct { double real, imag; } openblas_complex_double; +@@ -90,4 +93,5 @@ typedef int blasint; + #define openblas_complex_double_imag(z) ((z).imag) + #define openblas_complex_xdouble_real(z) ((z).real) + #define openblas_complex_xdouble_imag(z) ((z).imag) ++ #endif + #endif diff --git a/externals/vcpkg/ports/openblas/fix-space-path.patch b/externals/vcpkg/ports/openblas/fix-space-path.patch new file mode 100755 index 000000000..b782a994f --- /dev/null +++ b/externals/vcpkg/ports/openblas/fix-space-path.patch @@ -0,0 +1,43 @@ +diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake +index 58ca1eb..e2f2134 100644 +--- a/cmake/prebuild.cmake ++++ b/cmake/prebuild.cmake +@@ -490,14 +490,14 @@ else(NOT CMAKE_CROSSCOMPILING) + + set(GETARCH_DIR "${PROJECT_BINARY_DIR}/getarch_build") + set(GETARCH_BIN "getarch${CMAKE_EXECUTABLE_SUFFIX}") +- file(MAKE_DIRECTORY ${GETARCH_DIR}) +- configure_file(${TARGET_CONF_TEMP} ${GETARCH_DIR}/${TARGET_CONF} COPYONLY) ++ file(MAKE_DIRECTORY "${GETARCH_DIR}") ++ configure_file(${TARGET_CONF_TEMP} "${GETARCH_DIR}/${TARGET_CONF}" COPYONLY) + if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore") +- try_compile(GETARCH_RESULT ${GETARCH_DIR} ++ try_compile(GETARCH_RESULT "${GETARCH_DIR}" + SOURCES ${GETARCH_SRC} + COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} -I"${GETARCH_DIR}" -I"${PROJECT_SOURCE_DIR}" -I"${PROJECT_BINARY_DIR}" + OUTPUT_VARIABLE GETARCH_LOG +- COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH_BIN} ++ COPY_FILE "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" + ) + + if (NOT ${GETARCH_RESULT}) +@@ -518,14 +518,14 @@ execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIA + + set(GETARCH2_DIR "${PROJECT_BINARY_DIR}/getarch2_build") + set(GETARCH2_BIN "getarch_2nd${CMAKE_EXECUTABLE_SUFFIX}") +- file(MAKE_DIRECTORY ${GETARCH2_DIR}) +- configure_file(${TARGET_CONF_TEMP} ${GETARCH2_DIR}/${TARGET_CONF} COPYONLY) ++ file(MAKE_DIRECTORY "${GETARCH2_DIR}") ++ configure_file(${TARGET_CONF_TEMP} "${GETARCH2_DIR}/${TARGET_CONF}" COPYONLY) + if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore") +- try_compile(GETARCH2_RESULT ${GETARCH2_DIR} +- SOURCES ${PROJECT_SOURCE_DIR}/getarch_2nd.c ++ try_compile(GETARCH2_RESULT "${GETARCH2_DIR}" ++ SOURCES "${PROJECT_SOURCE_DIR}/getarch_2nd.c" + COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} ${GETARCH2_FLAGS} -I"${GETARCH2_DIR}" -I"${PROJECT_SOURCE_DIR}" -I"${PROJECT_BINARY_DIR}" + OUTPUT_VARIABLE GETARCH2_LOG +- COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH2_BIN} ++ COPY_FILE "${PROJECT_BINARY_DIR}/${GETARCH2_BIN}" + ) + + if (NOT ${GETARCH2_RESULT}) diff --git a/externals/vcpkg/ports/openblas/fix-uwp-build.patch b/externals/vcpkg/ports/openblas/fix-uwp-build.patch new file mode 100755 index 000000000..7604cf736 --- /dev/null +++ b/externals/vcpkg/ports/openblas/fix-uwp-build.patch @@ -0,0 +1,35 @@ +diff --git a/common_stackalloc.h b/common_stackalloc.h +index d3d5466..cd157fc 100644 +--- a/common_stackalloc.h ++++ b/common_stackalloc.h +@@ -36,7 +36,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #define STACK_ALLOC_PROTECT_CHECK + #endif + +-#if defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 ++#if defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)) + + /* + * Allocate a buffer on the stack if the size is smaller than MAX_STACK_ALLOC. +@@ -63,7 +63,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #endif + + +-#if defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 ++#if defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)) + #define STACK_FREE(BUFFER) \ + STACK_ALLOC_PROTECT_CHECK \ + if(!stack_alloc_size) \ +diff --git a/interface/zgemv.c b/interface/zgemv.c +index 3e98dba..ee597f7 100644 +--- a/interface/zgemv.c ++++ b/interface/zgemv.c +@@ -244,7 +244,7 @@ void CNAME(enum CBLAS_ORDER order, + buffer_size = (buffer_size + 3) & ~3; + STACK_ALLOC(buffer_size, FLOAT, buffer); + +-#if defined(ARCH_X86_64) && defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 ++#if defined(ARCH_X86_64) && defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)) + // cgemv_t.S return NaN if there are NaN or Inf in the buffer (see bug #746) + if(trans && stack_alloc_size) + memset(buffer, 0, MIN(BUFFER_SIZE, sizeof(FLOAT) * buffer_size)); diff --git a/externals/vcpkg/ports/openblas/install-tools.patch b/externals/vcpkg/ports/openblas/install-tools.patch new file mode 100755 index 000000000..5d9e4061b --- /dev/null +++ b/externals/vcpkg/ports/openblas/install-tools.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake +index 0c126e3..bb0124b 100644 +--- a/cmake/prebuild.cmake ++++ b/cmake/prebuild.cmake +@@ -558,6 +558,8 @@ else(NOT CMAKE_CROSSCOMPILING) + if (NOT ${GETARCH_RESULT}) + MESSAGE(FATAL_ERROR "Compiling getarch failed ${GETARCH_LOG}") + endif () ++ ++ install(FILES "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" DESTINATION bin) + endif () + unset (HAVE_AVX2) + unset (HAVE_AVX) +@@ -601,6 +603,8 @@ execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIA + if (NOT ${GETARCH2_RESULT}) + MESSAGE(FATAL_ERROR "Compiling getarch_2nd failed ${GETARCH2_LOG}") + endif () ++ ++ install(FILES "${PROJECT_BINARY_DIR}/${GETARCH2_BIN}" DESTINATION bin) + endif () + + # use the cmake binary w/ the -E param to run a shell command in a cross-platform way diff --git a/externals/vcpkg/ports/openblas/openblas_common.h b/externals/vcpkg/ports/openblas/openblas_common.h new file mode 100755 index 000000000..9b798e577 --- /dev/null +++ b/externals/vcpkg/ports/openblas/openblas_common.h @@ -0,0 +1,60 @@ +#pragma once +#include "openblas/openblas_config.h" + +#if defined(OPENBLAS_OS_WINNT) || defined(OPENBLAS_OS_CYGWIN_NT) || defined(OPENBLAS_OS_INTERIX) +#define OPENBLAS_WINDOWS_ABI +#define OPENBLAS_OS_WINDOWS + +#ifdef DOUBLE +#define DOUBLE_DEFINED DOUBLE +#undef DOUBLE +#endif +#endif + +#ifdef NEEDBUNDERSCORE +#define BLASFUNC(FUNC) FUNC##_ + +#else +#define BLASFUNC(FUNC) FUNC +#endif + + +#ifdef OPENBLAS_QUAD_PRECISION +typedef struct { + unsigned long x[2]; +} xdouble; +#elif defined OPENBLAS_EXPRECISION +#define xdouble long double +#else +#define xdouble double +#endif + +#if defined(OS_WINNT) && defined(__64BIT__) +typedef long long BLASLONG; +typedef unsigned long long BLASULONG; +#else +typedef long BLASLONG; +typedef unsigned long BLASULONG; +#endif + +#ifdef OPENBLAS_USE64BITINT +typedef BLASLONG blasint; +#else +typedef int blasint; +#endif + +#if defined(XDOUBLE) || defined(DOUBLE) +#define FLOATRET FLOAT +#else +#ifdef NEED_F2CCONV +#define FLOATRET double +#else +#define FLOATRET float +#endif +#endif + + +/* Inclusion of a standard header file is needed for definition of __STDC_* + predefined macros with some compilers (e.g. GCC 4.7 on Linux). This occurs + as a side effect of including either or . */ +#include diff --git a/externals/vcpkg/ports/openblas/portfile.cmake b/externals/vcpkg/ports/openblas/portfile.cmake new file mode 100755 index 000000000..39a5dc946 --- /dev/null +++ b/externals/vcpkg/ports/openblas/portfile.cmake @@ -0,0 +1,111 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xianyi/OpenBLAS + REF 0b678b19dc03f2a999d6e038814c4c50b9640a4e # v0.3.20 + SHA512 6e32f7dfc5dde46570873810c1da09d102f76ccfce41a5adbaeef2fccada54f9ab07e1ee541a6d55e138e6500392a6f55236f4f3a7766803358e5a6205334946 + HEAD_REF develop + PATCHES + uwp.patch + fix-space-path.patch + fix-redefinition-function.patch + fix-uwp-build.patch + install-tools.patch +) + +find_program(GIT NAMES git git.cmd) + +# sed and awk are installed with git but in a different directory +get_filename_component(GIT_EXE_PATH "${GIT}" DIRECTORY) +set(SED_EXE_PATH "${GIT_EXE_PATH}/../usr/bin") + +# openblas require perl to generate .def for exports +vcpkg_find_acquire_program(PERL) +get_filename_component(PERL_EXE_PATH "${PERL}" DIRECTORY) +set(PATH_BACKUP "$ENV{PATH}") +vcpkg_add_to_path("${PERL_EXE_PATH}") +vcpkg_add_to_path("${SED_EXE_PATH}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + threads USE_THREAD + simplethread USE_SIMPLE_THREADED_LEVEL3 + "dynamic-arch" DYNAMIC_ARCH +) + +set(COMMON_OPTIONS -DBUILD_WITHOUT_LAPACK=ON) + +if(VCPKG_TARGET_IS_OSX) + if("dynamic-arch" IN_LIST FEATURES) + set(conf_opts GENERATOR "Unix Makefiles") + endif() +endif() + +set(OPENBLAS_EXTRA_OPTIONS) +# for UWP version, must build non uwp first for helper +# binaries. +if(VCPKG_TARGET_IS_UWP) + list(APPEND OPENBLAS_EXTRA_OPTIONS -DCMAKE_SYSTEM_PROCESSOR=AMD64 + "-DBLASHELPER_BINARY_DIR=${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}") +elseif(NOT (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)) + string(APPEND VCPKG_C_FLAGS " -DNEEDBUNDERSCORE") # Required to get common BLASFUNC to append extra _ + string(APPEND VCPKG_CXX_FLAGS " -DNEEDBUNDERSCORE") + list(APPEND OPENBLAS_EXTRA_OPTIONS + -DNOFORTRAN=ON + -DBU=_ #required for all blas functions to append extra _ using NAME + ) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + ${conf_opts} + OPTIONS + ${FEATURE_OPTIONS} + ${COMMON_OPTIONS} + ${OPENBLAS_EXTRA_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/OpenBLAS) + +if (EXISTS "${CURRENT_PACKAGES_DIR}/bin/getarch${VCPKG_HOST_EXECUTABLE_SUFFIX}") + vcpkg_copy_tools(TOOL_NAMES getarch AUTO_CLEAN) +endif() +if (EXISTS "${CURRENT_PACKAGES_DIR}/bin/getarch_2nd${VCPKG_HOST_EXECUTABLE_SUFFIX}") + vcpkg_copy_tools(TOOL_NAMES getarch_2nd AUTO_CLEAN) +endif() + +set(ENV{PATH} "${PATH_BACKUP}") + +set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/openblas.pc") +if(EXISTS "${pcfile}") + file(READ "${pcfile}" _contents) + set(_contents "prefix=${CURRENT_INSTALLED_DIR}\n${_contents}") + file(WRITE "${pcfile}" "${_contents}") + #file(CREATE_LINK "${pcfile}" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc" COPY_ON_ERROR) +endif() +set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/openblas.pc") +if(EXISTS "${pcfile}") + file(READ "${pcfile}" _contents) + set(_contents "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}") + file(WRITE "${pcfile}" "${_contents}") + #file(CREATE_LINK "${pcfile}" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc" COPY_ON_ERROR) +endif() +vcpkg_fixup_pkgconfig() +#maybe we need also to write a wrapper inside share/blas to search implicitly for openblas, whenever we feel it's ready for its own -config.cmake file + +# openblas do not make the config file , so I manually made this +# but I think in most case, libraries will not include these files, they define their own used function prototypes +# this is only to quite vcpkg +file(COPY "${CMAKE_CURRENT_LIST_DIR}/openblas_common.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +vcpkg_replace_string( + "${SOURCE_PATH}/cblas.h" + "#include \"common.h\"" + "#include \"openblas_common.h\"" +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/openblas/uwp.patch b/externals/vcpkg/ports/openblas/uwp.patch new file mode 100755 index 000000000..50a8e9b29 --- /dev/null +++ b/externals/vcpkg/ports/openblas/uwp.patch @@ -0,0 +1,50 @@ +diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake +--- a/cmake/prebuild.cmake 2019-01-28 03:05:58.422245700 -0600 ++++ b/cmake/prebuild.cmake 2019-01-28 03:07:02.885495800 -0600 +@@ -37,6 +37,9 @@ + + # CPUIDEMU = ../../cpuid/table.o + ++if (NOT DEFINED BLASHELPER_BINARY_DIR) ++ set(BLASHELPER_BINARY_DIR "${PROJECT_BINARY_DIR}") ++endif () + + if (DEFINED CPUIDEMU) + set(EXFLAGS "-DCPUIDEMU -DVENDOR=99") +@@ -310,8 +313,8 @@ else(NOT CMAKE_CROSSCOMPILING) + message(STATUS "Running getarch") + + # use the cmake binary w/ the -E param to run a shell command in a cross-platform way +-execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" 0 OUTPUT_VARIABLE GETARCH_MAKE_OUT) +-execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIABLE GETARCH_CONF_OUT) ++execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH_BIN}" 0 OUTPUT_VARIABLE GETARCH_MAKE_OUT) ++execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIABLE GETARCH_CONF_OUT) + + message(STATUS "GETARCH results:\n${GETARCH_MAKE_OUT}") + +@@ -337,8 +340,8 @@ execute_process(COMMAND "${PROJECT_BINAR + endif () + + # use the cmake binary w/ the -E param to run a shell command in a cross-platform way +-execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH2_BIN}" 0 OUTPUT_VARIABLE GETARCH2_MAKE_OUT) +-execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH2_BIN}" 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT) ++execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH2_BIN}" 0 OUTPUT_VARIABLE GETARCH2_MAKE_OUT) ++execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH2_BIN}" 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT) + + # append config data from getarch_2nd to the TARGET file and read in CMake vars + file(APPEND ${TARGET_CONF_TEMP} ${GETARCH2_CONF_OUT}) + +diff --git a/cmake/system.cmake b/cmake/system.cmake +index a060d98..52ffa5a 100644 +--- a/cmake/system.cmake ++++ b/cmake/system.cmake +@@ -13,6 +13,9 @@ if(CMAKE_CROSSCOMPILING AND NOT DEFINED TARGET) + set(TARGET "ARMV8") + elseif(ARM) + set(TARGET "ARMV7") # TODO: Ask compiler which arch this is ++ elseif(${HOST_OS} STREQUAL "WINDOWSSTORE") ++ set(CMAKE_CROSSCOMPILING 0) ++ add_definitions(-D_CRT_SECURE_NO_WARNINGS=1) + else() + message(FATAL_ERROR "When cross compiling, a TARGET is required.") + endif() diff --git a/externals/vcpkg/ports/openblas/vcpkg.json b/externals/vcpkg/ports/openblas/vcpkg.json new file mode 100755 index 000000000..1bc43d573 --- /dev/null +++ b/externals/vcpkg/ports/openblas/vcpkg.json @@ -0,0 +1,51 @@ +{ + "name": "openblas", + "version": "0.3.20", + "description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.", + "homepage": "https://github.com/xianyi/OpenBLAS", + "license": "BSD-3-Clause", + "supports": "!(windows & arm)", + "dependencies": [ + { + "name": "openblas", + "host": true + }, + { + "name": "pthread", + "platform": "!windows & !uwp" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "dynamic-arch": { + "description": "Support for multiple targets in a single library" + }, + "simplethread": { + "description": "Use simple thread", + "dependencies": [ + { + "name": "openblas", + "features": [ + "threads" + ] + } + ] + }, + "threads": { + "description": "Use a threading backend", + "dependencies": [ + { + "name": "pthread", + "platform": "!windows & !uwp" + } + ] + } + } +} diff --git a/externals/vcpkg/ports/opencascade/fix-depend-freetype.patch b/externals/vcpkg/ports/opencascade/fix-depend-freetype.patch new file mode 100755 index 000000000..b37b7ee4e --- /dev/null +++ b/externals/vcpkg/ports/opencascade/fix-depend-freetype.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fbcede5..66b127d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -563,7 +563,9 @@ if (CAN_USE_FREETYPE) + if (USE_FREETYPE) + message (STATUS "Info: FreeType is used by OCCT") + add_definitions (-DHAVE_FREETYPE) +- OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freetype") ++ find_package(freetype CONFIG REQUIRED) ++ get_target_property(FREETYPE_INCLUDE_DIR freetype INTERFACE_INCLUDE_DIRECTORIES) ++ list (APPEND 3RDPARTY_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR}") + else() + OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREETYPE") + OCCT_CHECK_AND_UNSET ("3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2") diff --git a/externals/vcpkg/ports/opencascade/fix-install-prefix-path.patch b/externals/vcpkg/ports/opencascade/fix-install-prefix-path.patch new file mode 100755 index 000000000..f523280ac --- /dev/null +++ b/externals/vcpkg/ports/opencascade/fix-install-prefix-path.patch @@ -0,0 +1,15 @@ +diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in +index e391ddf..c926c49 100644 +--- a/adm/templates/OpenCASCADEConfig.cmake.in ++++ b/adm/templates/OpenCASCADEConfig.cmake.in +@@ -24,6 +24,7 @@ set (OpenCASCADE_DEVELOPMENT_VERSION "@OCC_VERSION_DEVELOPMENT@") + # - in Android style: $INSTALL_DIR/libs/$CMAKE_ANDROID_ARCH_ABI/cmake/opencascade- + get_filename_component (OpenCASCADE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) + get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) ++get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) + if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$") + get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) + endif() +-- +2.14.3.windows.1 + diff --git a/externals/vcpkg/ports/opencascade/fix-pdb-find.patch b/externals/vcpkg/ports/opencascade/fix-pdb-find.patch new file mode 100755 index 000000000..c74aba04f --- /dev/null +++ b/externals/vcpkg/ports/opencascade/fix-pdb-find.patch @@ -0,0 +1,33 @@ +diff --git a/adm/cmake/cotire.cmake b/adm/cmake/cotire.cmake +index a63f3ce..aa77c20 100644 +--- a/adm/cmake/cotire.cmake ++++ b/adm/cmake/cotire.cmake +@@ -3114,6 +3114,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target) + OSX_ARCHITECTURES OSX_ARCHITECTURES_ PRIVATE_HEADER PUBLIC_HEADER RESOURCE XCTEST + IOS_INSTALL_COMBINED) + # copy Windows platform specific stuff ++ if (BUILD_SHARED_LIBS) + cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} + GNUtoMS + COMPILE_PDB_NAME COMPILE_PDB_NAME_ +@@ -3129,6 +3130,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target) + WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS + DEPLOYMENT_REMOTE_DIRECTORY VS_CONFIGURATION_TYPE + VS_SDK_REFERENCES) ++ endif() + # copy Android platform specific stuff + cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} + ANDROID_API ANDROID_API_MIN ANDROID_GUI +diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake +index 2f96c6f..78f15f0 100644 +--- a/adm/cmake/occt_toolkit.cmake ++++ b/adm/cmake/occt_toolkit.cmake +@@ -235,7 +235,7 @@ if (EXECUTABLE_PROJECT) + else() + add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES}) + +- if (MSVC) ++ if (MSVC AND BUILD_SHARED_LIBS) + if (BUILD_FORCE_RelWithDebInfo) + set (aReleasePdbConf "Release") + else() diff --git a/externals/vcpkg/ports/opencascade/install-include-dir.patch b/externals/vcpkg/ports/opencascade/install-include-dir.patch new file mode 100755 index 000000000..85ab582bd --- /dev/null +++ b/externals/vcpkg/ports/opencascade/install-include-dir.patch @@ -0,0 +1,31 @@ +From 32c4bdd88555309752215c53842d438cb51bcb62 Mon Sep 17 00:00:00 2001 +From: bloess +Date: Mon, 15 Feb 2021 16:26:36 +0100 +Subject: [PATCH] install include-dir + +--- + CMakeLists.txt | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 100d613..464f95a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1171,6 +1171,14 @@ foreach (OCCT_MODULE ${OCCT_MODULES}) + endforeach() + set (OCCT_MODULES_ENABLED ${OCCT_MODULES_ENABLED_SORTED}) + ++foreach (OCCT_LIBRARY ${OCCT_LIBRARIES}) ++ target_include_directories( ++ ${OCCT_LIBRARY} ++ INTERFACE ++ $) ++ ++endforeach() ++ + # Add all targets to the build-tree export set + export (TARGETS ${OCCT_LIBRARIES} FILE "${CMAKE_BINARY_DIR}/OpenCASCADETargets.cmake") + +-- +2.14.3.windows.1 + diff --git a/externals/vcpkg/ports/opencascade/portfile.cmake b/externals/vcpkg/ports/opencascade/portfile.cmake new file mode 100755 index 000000000..3d5de5f12 --- /dev/null +++ b/externals/vcpkg/ports/opencascade/portfile.cmake @@ -0,0 +1,109 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Open-Cascade-SAS/OCCT + REF bb368e271e24f63078129283148ce83db6b9670a #V7.6.2 + SHA512 500c7ff804eb6b202bef48e1be904fe43a3c0137e9a402affe128b3b75a1adbb20bfe383cee82503b13efc083a95eb97425f1afb1f66bae38543d29f871a91f9 + HEAD_REF master + PATCHES + fix-pdb-find.patch + fix-install-prefix-path.patch + install-include-dir.patch + fix-depend-freetype.patch +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(BUILD_TYPE "Shared") +else() + set(BUILD_TYPE "Static") +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "freeimage" USE_FREEIMAGE + "tbb" USE_TBB + "rapidjson" USE_RAPIDJSON +) + +# VTK option in opencascade not currently supported because only 6.1.0 is supported but vcpkg has >= 9.0 + +# We turn off BUILD_MODULE_Draw as it requires TCL 8.6 and TK 8.6 specifically which conflicts with vcpkg only having TCL 9.0 +# And pre-built ActiveTCL binaries are behind a marketing wall :( +# We use the Unix install layout for Windows as it matches vcpkg +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DBUILD_LIBRARY_TYPE=${BUILD_TYPE} + -DBUILD_MODULE_Draw=OFF + -DINSTALL_DIR_LAYOUT=Unix + -DBUILD_SAMPLES_MFC=OFF + -DBUILD_SAMPLES_QT=OFF + -DBUILD_DOC_Overview=OFF + -DINSTALL_TEST_CASES=OFF + -DINSTALL_SAMPLES=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/opencascade) + +#make occt includes relative to source_file +list(APPEND ADDITIONAL_HEADERS + "ExprIntrp.tab.h" + "FlexLexer.h" + "glext.h" + "igesread.h" + "NCollection_Haft.h" + "OSD_PerfMeter.h" + "Standard_values.h" + ) + +file(GLOB files "${CURRENT_PACKAGES_DIR}/include/opencascade/[a-zA-Z0-9_]*\.[hgl]xx") +foreach(file_name IN LISTS files) + file(READ "${file_name}" filedata) + string(REGEX REPLACE "# *include \<([a-zA-Z0-9_]*\.[hgl]xx)\>" "#include \"\\1\"" filedata "${filedata}") + foreach(extra_header IN LISTS ADDITIONAL_HEADERS) + string(REGEX REPLACE "# *include \<${extra_header}\>" "#include \"${extra_header}\"" filedata "${filedata}") + endforeach() + file(WRITE "${file_name}" "${filedata}") +endforeach() + +# Remove libd to lib, libd just has cmake files we dont want too +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/libd" "${CURRENT_PACKAGES_DIR}/debug/lib") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + # debug creates libd and bind directories that need moving + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bind" "${CURRENT_PACKAGES_DIR}/debug/bin") + + # fix paths in target files + list(APPEND TARGET_FILES + "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEApplicationFrameworkTargets-debug.cmake" + "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADECompileDefinitionsAndFlags-debug.cmake" + "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEDataExchangeTargets-debug.cmake" + "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEFoundationClassesTargets-debug.cmake" + "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEModelingAlgorithmsTargets-debug.cmake" + "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEModelingDataTargets-debug.cmake" + "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEVisualizationTargets-debug.cmake" + ) + + foreach(TARGET_FILE IN LISTS TARGET_FILES) + file(READ "${TARGET_FILE}" filedata) + string(REGEX REPLACE "libd" "lib" filedata "${filedata}") + string(REGEX REPLACE "bind" "bin" filedata "${filedata}") + file(WRITE "${TARGET_FILE}" "${filedata}") + endforeach() + + # the bin directory ends up with bat files that are noise, let's clean that up + file(GLOB BATS "${CURRENT_PACKAGES_DIR}/bin/*.bat") + file(REMOVE_RECURSE ${BATS}) +else() + # remove scripts in bin dir + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/OCCT_LGPL_EXCEPTION.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/opencascade/vcpkg.json b/externals/vcpkg/ports/opencascade/vcpkg.json new file mode 100755 index 000000000..0ae0f5260 --- /dev/null +++ b/externals/vcpkg/ports/opencascade/vcpkg.json @@ -0,0 +1,39 @@ +{ + "name": "opencascade", + "version": "7.6.2", + "description": "Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE.", + "homepage": "https://github.com/Open-Cascade-SAS/OCCT", + "license": "LGPL-2.1", + "supports": "!(uwp | osx | linux | arm)", + "dependencies": [ + "freetype", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "freeimage": { + "description": "Enable optional usage of freeimage", + "dependencies": [ + "freeimage" + ] + }, + "rapidjson": { + "description": "Enable optional usage of rapidjson", + "dependencies": [ + "rapidjson" + ] + }, + "tbb": { + "description": "Enable optional usage of tbb", + "dependencies": [ + "tbb" + ] + } + } +} diff --git a/externals/vcpkg/ports/opencc/portfile.cmake b/externals/vcpkg/ports/opencc/portfile.cmake new file mode 100755 index 000000000..f9d4a97fe --- /dev/null +++ b/externals/vcpkg/ports/opencc/portfile.cmake @@ -0,0 +1,51 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO BYVoid/OpenCC + REF e8ec6d59f264a4a42e310148a9534a8cc0123928 + SHA512 e6b3f6d681223b299795c324a48e82609abd1f411d3cbd5f9d8607284ec04717fa9878953d037c25a931a0857f50a5c0e883e0d44ddbea18c50830ad49514c59 + HEAD_REF master +) + +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR ${PYTHON3} DIRECTORY) +vcpkg_add_to_path(${PYTHON3_DIR}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DBUILD_DOCUMENTATION=OFF + -DENABLE_GTEST=OFF +) + +vcpkg_install_cmake( + DISABLE_PARALLEL +) + +vcpkg_copy_pdbs() + +if(tools IN_LIST FEATURES) + foreach(opencc_tool opencc opencc_dict opencc_phrase_extract) + file(COPY + ${CURRENT_PACKAGES_DIR}/bin/${opencc_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX} + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT} + ) + endforeach() + + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +else() + foreach(opencc_tool opencc opencc_dict opencc_phrase_extract) + file(REMOVE + ${CURRENT_PACKAGES_DIR}/bin/${opencc_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/${opencc_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX} + ) + endforeach() +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/opencc/vcpkg.json b/externals/vcpkg/ports/opencc/vcpkg.json new file mode 100755 index 000000000..ef89e10e7 --- /dev/null +++ b/externals/vcpkg/ports/opencc/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "opencc", + "version-date": "2020-04-26", + "port-version": 10, + "description": "A project for conversion between Traditional and Simplified Chinese", + "homepage": "https://github.com/BYVoid/OpenCC", + "supports": "!(arm | uwp)", + "features": { + "tools": { + "description": "Build OpenCC command-line tools" + } + } +} diff --git a/externals/vcpkg/ports/opencensus-cpp/fix-install.patch b/externals/vcpkg/ports/opencensus-cpp/fix-install.patch new file mode 100755 index 000000000..a8c76248a --- /dev/null +++ b/externals/vcpkg/ports/opencensus-cpp/fix-install.patch @@ -0,0 +1,204 @@ +diff --git a/cmake/OpenCensusHelpers.cmake b/cmake/OpenCensusHelpers.cmake +index 8fdfe96..53bc877 100644 +--- a/cmake/OpenCensusHelpers.cmake ++++ b/cmake/OpenCensusHelpers.cmake +@@ -37,6 +37,13 @@ function(opencensus_test NAME SRC) + prepend_opencensus(DEPS "${ARGN}") + target_link_libraries(${_NAME} "${DEPS}" gmock gtest_main) + add_test(NAME ${_NAME} COMMAND ${_NAME}) ++ ++ install( ++ TARGETS ${_NAME} ++ RUNTIME DESTINATION tools ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++ ) + endif() + endfunction() + +@@ -50,6 +57,13 @@ function(opencensus_benchmark NAME SRC) + add_executable(${_NAME} ${SRC}) + prepend_opencensus(DEPS "${ARGN}") + target_link_libraries(${_NAME} "${DEPS}" benchmark) ++ ++ install( ++ TARGETS ${_NAME} ++ RUNTIME DESTINATION tools ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++ ) + endif() + endfunction() + +@@ -71,6 +85,12 @@ function(opencensus_lib NAME) + if(ARG_PUBLIC) + add_library(${PROJECT_NAME}::${NAME} ALIAS ${_NAME}) + endif() ++ install( ++ TARGETS ${_NAME} ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++ ) + endfunction() + + # Helper function for fuzzing. Usage: +@@ -83,5 +103,12 @@ function(opencensus_fuzzer NAME SRC) + prepend_opencensus(DEPS "${ARGN}") + target_link_libraries(${_NAME} "${DEPS}" ${FUZZER}) + target_compile_options(${_NAME} PRIVATE ${FUZZER}) ++ ++ install( ++ TARGETS ${_NAME} ++ RUNTIME DESTINATION tools ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++ ) + endif() + endfunction() +diff --git a/examples/helloworld/CMakeLists.txt b/examples/helloworld/CMakeLists.txt +index 86cc1f4..cbbcb29 100644 +--- a/examples/helloworld/CMakeLists.txt ++++ b/examples/helloworld/CMakeLists.txt +@@ -23,3 +23,10 @@ target_link_libraries( + opencensus-cpp::stats + opencensus-cpp::trace + Threads::Threads) ++ ++install( ++ TARGETS opencensus_examples_helloworld ++ RUNTIME DESTINATION tools ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++) +diff --git a/opencensus/common/internal/CMakeLists.txt b/opencensus/common/internal/CMakeLists.txt +index a9dbd87..810a8c8 100644 +--- a/opencensus/common/internal/CMakeLists.txt ++++ b/opencensus/common/internal/CMakeLists.txt +@@ -23,6 +23,12 @@ opencensus_lib( + absl::synchronization + absl::time) + ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/common/internal) ++ ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/grpc/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/common/internal/grpc) ++ + opencensus_lib(common_stats_object DEPS absl::time) + + # Define NOMINMAX to fix build errors when compiling with MSVC. +diff --git a/opencensus/context/CMakeLists.txt b/opencensus/context/CMakeLists.txt +index 149958c..2474a66 100644 +--- a/opencensus/context/CMakeLists.txt ++++ b/opencensus/context/CMakeLists.txt +@@ -22,6 +22,9 @@ opencensus_lib( + tags + trace) + ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/context) ++ + opencensus_test( + context_context_test + internal/context_test.cc +diff --git a/opencensus/exporters/stats/prometheus/CMakeLists.txt b/opencensus/exporters/stats/prometheus/CMakeLists.txt +index 01038cc..0ad712b 100644 +--- a/opencensus/exporters/stats/prometheus/CMakeLists.txt ++++ b/opencensus/exporters/stats/prometheus/CMakeLists.txt +@@ -21,6 +21,12 @@ opencensus_lib( + exporters_stats_prometheus_utils + stats) + ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/exporters/stats/prometheus) ++ ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/internal/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/exporters/stats/prometheus/internal) ++ + opencensus_lib( + exporters_stats_prometheus_utils + SRCS +diff --git a/opencensus/exporters/stats/stdout/CMakeLists.txt b/opencensus/exporters/stats/stdout/CMakeLists.txt +index 5278e65..2930817 100644 +--- a/opencensus/exporters/stats/stdout/CMakeLists.txt ++++ b/opencensus/exporters/stats/stdout/CMakeLists.txt +@@ -23,5 +23,8 @@ opencensus_lib( + absl::strings + absl::time) + ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/exporters/stats/stdout) ++ + opencensus_test(exporters_stats_stdout_test internal/stdout_exporter_test.cc + exporters_stats_stdout stats stats_test_utils absl::time) +diff --git a/opencensus/exporters/trace/stdout/CMakeLists.txt b/opencensus/exporters/trace/stdout/CMakeLists.txt +index c7c580f..d9befa1 100644 +--- a/opencensus/exporters/trace/stdout/CMakeLists.txt ++++ b/opencensus/exporters/trace/stdout/CMakeLists.txt +@@ -22,5 +22,8 @@ opencensus_lib( + absl::base + absl::memory) + ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/exporters/trace/stdout) ++ + opencensus_test(exporters_trace_stdout_test internal/stdout_exporter_test.cc + exporters_trace_stdout trace absl::time) +diff --git a/opencensus/stats/CMakeLists.txt b/opencensus/stats/CMakeLists.txt +index 9b0d7af..a8a9d50 100644 +--- a/opencensus/stats/CMakeLists.txt ++++ b/opencensus/stats/CMakeLists.txt +@@ -71,6 +71,12 @@ opencensus_lib( + absl::strings + absl::time) + ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/stats) ++ ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/internal/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/stats/internal) ++ + # ---------------------------------------------------------------------- + # Tests + # ---------------------------------------------------------------------- +diff --git a/opencensus/tags/CMakeLists.txt b/opencensus/tags/CMakeLists.txt +index 7219a2a..97a0de1 100644 +--- a/opencensus/tags/CMakeLists.txt ++++ b/opencensus/tags/CMakeLists.txt +@@ -53,6 +53,12 @@ opencensus_lib( + context + absl::strings) + ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/tags) ++ ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/propagation/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/tags/propagation) ++ + opencensus_test(tags_context_util_test internal/context_util_test.cc tags + tags_context_util tags_with_tag_map context) + +diff --git a/opencensus/trace/CMakeLists.txt b/opencensus/trace/CMakeLists.txt +index 2c4e656..25d7241 100644 +--- a/opencensus/trace/CMakeLists.txt ++++ b/opencensus/trace/CMakeLists.txt +@@ -122,6 +122,18 @@ opencensus_lib( + trace + context) + ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/trace) ++ ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/exporter/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/trace/exporter) ++ ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/internal/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/trace/internal) ++ ++file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/propagation/*.h) ++install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/trace/propagation) ++ + # ---------------------------------------------------------------------- + # Tests + # ---------------------------------------------------------------------- diff --git a/externals/vcpkg/ports/opencensus-cpp/portfile.cmake b/externals/vcpkg/ports/opencensus-cpp/portfile.cmake new file mode 100755 index 000000000..c914bc38d --- /dev/null +++ b/externals/vcpkg/ports/opencensus-cpp/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO census-instrumentation/opencensus-cpp + REF 62d8281899a1cfd1084793f64295329a6b5d22b3 # 2021-08-26 + SHA512 35df40d7e5ce933384fe6ba4ac2d704e0801ac47765fca97ea3f8d787886abe5c588855c3aac5745f047c1c8f2047e1f69b62340dd702042a61c3dc430ca36b4 + HEAD_REF master + PATCHES fix-install.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + test BUILD_TESTING +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/opencensus-cpp/vcpkg.json b/externals/vcpkg/ports/opencensus-cpp/vcpkg.json new file mode 100755 index 000000000..4481e60fd --- /dev/null +++ b/externals/vcpkg/ports/opencensus-cpp/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "opencensus-cpp", + "version-date": "2021-08-26", + "description": "OpenCensus is a toolkit for collecting application performance and behavior data. It currently includes an API for tracing and stats.", + "homepage": "https://github.com/census-instrumentation/opencensus-cpp", + "supports": "!windows", + "dependencies": [ + "abseil", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "test": { + "description": "Build test" + } + } +} diff --git a/externals/vcpkg/ports/opencl/0001-include-unistd-for-gete-ug-id.patch b/externals/vcpkg/ports/opencl/0001-include-unistd-for-gete-ug-id.patch new file mode 100755 index 000000000..4674aff79 --- /dev/null +++ b/externals/vcpkg/ports/opencl/0001-include-unistd-for-gete-ug-id.patch @@ -0,0 +1,27 @@ +From 0f783f1a8eac7a78bc92198e140d4a5c745382ca Mon Sep 17 00:00:00 2001 +From: Nicole Mazzuca +Date: Wed, 23 Sep 2020 11:50:21 -0700 +Subject: [PATCH] include unistd for gete?[ug]id + +--- + loader/linux/icd_linux_envvars.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/loader/linux/icd_linux_envvars.c b/loader/linux/icd_linux_envvars.c +index 4af5a08..92b0698 100644 +--- a/loader/linux/icd_linux_envvars.c ++++ b/loader/linux/icd_linux_envvars.c +@@ -25,6 +25,10 @@ + + #include + ++#if defined(__APPLE__) ++#include ++#endif ++ + char *khrIcd_getenv(const char *name) { + // No allocation of memory necessary for Linux. + return getenv(name); +-- +2.24.3 (Apple Git-128) + diff --git a/externals/vcpkg/ports/opencl/portfile.cmake b/externals/vcpkg/ports/opencl/portfile.cmake new file mode 100755 index 000000000..ad9c5c599 --- /dev/null +++ b/externals/vcpkg/ports/opencl/portfile.cmake @@ -0,0 +1,105 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KhronosGroup/OpenCL-Headers + REF 0d5f18c6e7196863bc1557a693f1509adfcee056 + SHA512 7e8fa6c8e73c660d8e9e31ddea3bfef887ed827fc21a1da559bde9dd4af6c52a91f609401bb718528b5c96d21e4c01aee7b8027bdf3dec4b0aa326270788a4b0 + HEAD_REF master +) + +file(INSTALL "${SOURCE_PATH}/CL" DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# OpenCL C++ headers +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KhronosGroup/OpenCL-CLHPP + REF d62a02090625655e5b2d791d6a58618b043c989c + SHA512 837bbe914931d2f18a468f21634dbd4d088eda0a2f22eea23304c0323b9ee064c3ee76db7ebf28ba67fbe07c44129241f8dca62512d89bc7a6b35c2b4b316ed7 + HEAD_REF master +) + +vcpkg_find_acquire_program(PYTHON3) + +vcpkg_execute_required_process( + COMMAND "${PYTHON3}" "${SOURCE_PATH}/gen_cl_hpp.py" + -i ${SOURCE_PATH}/input_cl.hpp + -o ${CURRENT_PACKAGES_DIR}/include/CL/cl.hpp + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME generate_clhpp-${TARGET_TRIPLET} +) + +vcpkg_execute_required_process( + COMMAND "${PYTHON3}" "${SOURCE_PATH}/gen_cl_hpp.py" + -i ${SOURCE_PATH}/input_cl2.hpp + -o ${CURRENT_PACKAGES_DIR}/include/CL/cl2.hpp + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME generate_cl2hpp-${TARGET_TRIPLET} +) +message(STATUS "Generating OpenCL C++ headers done") + +# OpenCL ICD loader +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KhronosGroup/OpenCL-ICD-Loader + REF e6e30ab9c7a61c171cf68d2e7f5c0ce28e2a4eae + SHA512 f3563c0a4c094d3795d8386ec0db41189d350ab8136d80ae5de611ee3db87fbb0ab851bad2b33e111eddf135add5dbfef77d96979473ca5a23c036608d443378 + HEAD_REF master + PATCHES + 0001-include-unistd-for-gete-ug-id.patch +) + +string(COMPARE EQUAL ${VCPKG_CRT_LINKAGE} dynamic USE_DYNAMIC_VCXX_RUNTIME) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DOPENCL_ICD_LOADER_HEADERS_DIR=${CURRENT_PACKAGES_DIR}/include + -DOPENCL_ICD_LOADER_REQUIRE_WDK=OFF + -DUSE_DYNAMIC_VCXX_RUNTIME=${USE_DYNAMIC_VCXX_RUNTIME} +) + +vcpkg_build_cmake(TARGET OpenCL) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${VCPKG_TARGET_STATIC_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + endif() + if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${VCPKG_TARGET_STATIC_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + endif() +else() + if(VCPKG_TARGET_IS_WINDOWS) + if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + endif() + if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + endif() + elseif(VCPKG_TARGET_IS_LINUX) + if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.1" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.1.2" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + endif() + if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.1" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.1.2" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + endif() + elseif(VCPKG_TARGET_IS_OSX) + if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + endif() + if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + endif() + endif() +endif() + +vcpkg_copy_pdbs() + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/externals/vcpkg/ports/opencl/usage b/externals/vcpkg/ports/opencl/usage new file mode 100755 index 000000000..adcd2232f --- /dev/null +++ b/externals/vcpkg/ports/opencl/usage @@ -0,0 +1,16 @@ +The package opencl is compatible with built-in CMake targets via CMake v3.6 and prior syntax + + find_package(OpenCL REQUIRED) + target_link_libraries(main PRIVATE ${OpenCL_LIBRARIES}) + target_include_directories(main PRIVATE ${OpenCL_INCLUDE_DIRS}) + +and the CMake v3.7 and beyond imported target syntax + + find_package(OpenCL REQUIRED) + target_link_libraries(main PRIVATE OpenCL::OpenCL) + +This package is only an OpenCL SDK. To actually run OpenCL code you also need to install an implementation. + + WINDOWS: implementations typically ship with the drivers of you CPU/GPU vendors. + LINUX: implementations may be installed from your distro's repo or manually. There are too many to count. + APPLE: consult your distribution vendor on the state of OpenCL support: https://support.apple.com/en-us/HT202823 diff --git a/externals/vcpkg/ports/opencl/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/opencl/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..0893710ff --- /dev/null +++ b/externals/vcpkg/ports/opencl/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,18 @@ +_find_package(${ARGS}) +if(NOT BUILD_SHARED_LIBS AND (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")) + find_package(Threads REQUIRED) + set(OpenCL_Extra_Libs ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}) + if(CMAKE_SYSTEM_NAME MATCHES "Windows") + list(APPEND OpenCL_Extra_Libs cfgmgr32) + if($ENV{WindowsSDKVersion} MATCHES "^10") + list(APPEND OpenCL_Extra_Libs OneCoreUAP) + endif() + endif(CMAKE_SYSTEM_NAME MATCHES "Windows") + + if(TARGET OpenCL::OpenCL) + set_property(TARGET OpenCL::OpenCL APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${OpenCL_Extra_Libs}) + endif() + if(OpenCL_LIBRARIES) + list(APPEND OpenCL_LIBRARIES ${OpenCL_Extra_Libs}) + endif() +endif() \ No newline at end of file diff --git a/externals/vcpkg/ports/opencl/vcpkg.json b/externals/vcpkg/ports/opencl/vcpkg.json new file mode 100755 index 000000000..633a0ab8c --- /dev/null +++ b/externals/vcpkg/ports/opencl/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "opencl", + "version-string": "2.2", + "port-version": 8, + "description": "C/C++ headers and ICD loader (Installable Client Driver) for OpenCL", + "homepage": "https://github.com/KhronosGroup/OpenCL-Headers", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/opencolorio/fix-buildTools.patch b/externals/vcpkg/ports/opencolorio/fix-buildTools.patch new file mode 100755 index 000000000..24b1c3fd8 --- /dev/null +++ b/externals/vcpkg/ports/opencolorio/fix-buildTools.patch @@ -0,0 +1,13 @@ +diff --git a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt +index b992bbc..804d3c5 100644 +--- a/src/OpenColorIO/CMakeLists.txt ++++ b/src/OpenColorIO/CMakeLists.txt +@@ -248,7 +248,7 @@ if(NOT BUILD_SHARED_LIBS) + else() + # Only exports selected symbols. + target_compile_definitions(OpenColorIO +- PUBLIC ++ PRIVATE + OpenColorIO_EXPORTS + ) + endif() diff --git a/externals/vcpkg/ports/opencolorio/fix-dependency.patch b/externals/vcpkg/ports/opencolorio/fix-dependency.patch new file mode 100755 index 000000000..1ddda42ec --- /dev/null +++ b/externals/vcpkg/ports/opencolorio/fix-dependency.patch @@ -0,0 +1,117 @@ +diff --git a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake +index 8787b87..f953ceb 100644 +--- a/share/cmake/modules/FindExtPackages.cmake ++++ b/share/cmake/modules/FindExtPackages.cmake +@@ -26,15 +26,15 @@ set(CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY ON CACHE BOOL + + # expat + # https://github.com/libexpat/libexpat +-find_package(expat 2.2.8 REQUIRED) ++find_package(expat CONFIG REQUIRED) + + # yaml-cpp + # https://github.com/jbeder/yaml-cpp +-find_package(yaml-cpp 0.6.3 REQUIRED) ++find_package(yaml-cpp CONFIG REQUIRED) + + # pystring + # https://github.com/imageworks/pystring +-find_package(pystring 1.1.3 REQUIRED) ++find_package(pystring CONFIG REQUIRED) + + # Half + # NOTE: OCIO_USE_IMATH_HALF needs to be an integer for use in utils/Half.h.in +@@ -42,7 +42,7 @@ if(NOT OCIO_USE_OPENEXR_HALF) + + # Imath (>=3.0) + # https://github.com/AcademySoftwareFoundation/Imath +- find_package(Imath 3.1.2 REQUIRED) ++ find_package(Imath CONFIG REQUIRED) + + set(OCIO_HALF_LIB Imath::Imath CACHE STRING "Half library target" FORCE) + set(OCIO_USE_IMATH_HALF "1" CACHE STRING "Whether 'half' type will be sourced from the Imath library (>=v3.0)" FORCE) +@@ -50,7 +50,7 @@ else() + + # OpenEXR/IlmBase (<=2.5) + # https://github.com/AcademySoftwareFoundation/openexr +- find_package(Half 2.4.0 REQUIRED) ++ find_package(Half CONFIG REQUIRED) + + set(OCIO_HALF_LIB IlmBase::Half CACHE STRING "Half library target" FORCE) + set(OCIO_USE_IMATH_HALF "0" CACHE STRING "Whether 'half' type will be sourced from the Imath library (>=v3.0)" FORCE) +@@ -65,13 +65,13 @@ if(OCIO_BUILD_APPS) + + # lcms2 + # https://github.com/mm2/Little-CMS +- find_package(lcms2 2.2 REQUIRED) ++ find_package(lcms2 CONFIG REQUIRED) + endif() + + if(OCIO_BUILD_OPENFX) + # openfx + # https://github.com/ofxa/openfx +- find_package(openfx 1.4 REQUIRED) ++ find_package(openfx CONFIG REQUIRED) + endif() + + if (OCIO_PYTHON_VERSION AND NOT OCIO_BUILD_PYTHON) +@@ -100,6 +100,6 @@ if(OCIO_BUILD_PYTHON OR OCIO_BUILD_DOCS) + if(OCIO_BUILD_PYTHON) + # pybind11 + # https://github.com/pybind/pybind11 +- find_package(pybind11 2.6.1 REQUIRED) ++ find_package(pybind11 CONFIG REQUIRED) + endif() + endif() +diff --git a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt +index 034185d..b992bbc 100755 +--- a/src/OpenColorIO/CMakeLists.txt ++++ b/src/OpenColorIO/CMakeLists.txt +@@ -226,9 +226,9 @@ target_link_libraries(OpenColorIO + expat::expat + ${OCIO_HALF_LIB} + pystring::pystring +- sampleicc::sampleicc +- utils::from_chars +- utils::strings ++ "$" ++ "$" ++ "$" + yaml-cpp + ) + +@@ -242,13 +242,13 @@ endif() + + if(NOT BUILD_SHARED_LIBS) + target_compile_definitions(OpenColorIO +- PRIVATE ++ PUBLIC + OpenColorIO_SKIP_IMPORTS + ) + else() + # Only exports selected symbols. + target_compile_definitions(OpenColorIO +- PRIVATE ++ PUBLIC + OpenColorIO_EXPORTS + ) + endif() +diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in +index eebb2c1..7147dc3 100644 +--- a/src/cmake/Config.cmake.in ++++ b/src/cmake/Config.cmake.in +@@ -2,4 +2,14 @@ + + include(CMakeFindDependencyMacro) + ++find_dependency(expat CONFIG REQUIRED) ++find_dependency(imath CONFIG REQUIRED) ++find_dependency(pystring CONFIG REQUIRED) ++find_dependency(yaml-cpp CONFIG REQUIRED) ++ ++if(@OCIO_BUILD_APPS@) ++ find_dependency(lcms2 CONFIG REQUIRED) ++ find_dependency(GLEW) ++endif() ++ + include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake) diff --git a/externals/vcpkg/ports/opencolorio/portfile.cmake b/externals/vcpkg/ports/opencolorio/portfile.cmake new file mode 100755 index 000000000..9465e4978 --- /dev/null +++ b/externals/vcpkg/ports/opencolorio/portfile.cmake @@ -0,0 +1,64 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO AcademySoftwareFoundation/OpenColorIO + REF v2.1.1 + SHA512 86585ec860d460b158f24efb82f202deced7ce96a6bfefd42f39cad9c112add68cca6935f383f5d718c07fe1c121d8ed8b0d2069321f1dafb8ce68b49bc75194 + HEAD_REF master + PATCHES + fix-dependency.patch + fix-buildTools.patch +) + +file(REMOVE "${SOURCE_PATH}/share/cmake/modules/Findexpat.cmake") +file(REMOVE "${SOURCE_PATH}/share/cmake/modules/FindImath.cmake") +file(REMOVE "${SOURCE_PATH}/share/cmake/modules/Findpystring.cmake") +file(REMOVE "${SOURCE_PATH}/share/cmake/modules/Findyaml-cpp.cmake") +file(REMOVE "${SOURCE_PATH}/share/cmake/modules/Findlcms2.cmake") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools OCIO_BUILD_APPS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DOCIO_BUILD_NUKE:BOOL=OFF + -DOCIO_BUILD_DOCS:BOOL=OFF + -DOCIO_BUILD_TESTS:BOOL=OFF + -DOCIO_BUILD_GPU_TESTS:BOOL=OFF + -DOCIO_BUILD_PYTHON:BOOL=OFF + -DOCIO_BUILD_OPENFX:BOOL=OFF + -DOCIO_BUILD_JAVA:BOOL=OFF + -DOCIO_USE_OPENEXR_HALF:BOOL=OFF + -DOCIO_INSTALL_EXT_PACKAGES=NONE + -DCMAKE_DISABLE_FIND_PACKAGE_OpenImageIO=On + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME OpenColorIO CONFIG_PATH "lib/cmake/OpenColorIO") + +vcpkg_copy_pdbs() + +# Clean redundant files +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/OpenColorIOConfig.cmake" + "${CURRENT_PACKAGES_DIR}/OpenColorIOConfig.cmake" +) +if(OCIO_BUILD_APPS) + vcpkg_copy_tools( + TOOL_NAMES ociowrite ociomakeclf ociochecklut ociocheck ociobakelut + AUTO_CLEAN + ) +endif() + +vcpkg_fixup_pkgconfig() +if(NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ocio/setup_ocio.sh" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../../") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/opencolorio/vcpkg.json b/externals/vcpkg/ports/opencolorio/vcpkg.json new file mode 100755 index 000000000..751770137 --- /dev/null +++ b/externals/vcpkg/ports/opencolorio/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "opencolorio", + "version-semver": "2.1.1", + "port-version": 2, + "description": "OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation. OCIO provides a straightforward and consistent user experience across all supporting applications while allowing for sophisticated back-end configuration options suitable for high-end production usage. OCIO is compatible with the Academy Color Encoding Specification (ACES) and is LUT-format agnostic, supporting many popular formats.", + "homepage": "https://opencolorio.org/", + "license": "BSD-3-Clause", + "supports": "!uwp", + "dependencies": [ + "expat", + "imath", + "pystring", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "yaml-cpp" + ], + "features": { + "tools": { + "description": "Installs tools", + "dependencies": [ + "glew", + "lcms" + ] + } + } +} diff --git a/externals/vcpkg/ports/opencsg/CMakeLists.txt b/externals/vcpkg/ports/opencsg/CMakeLists.txt new file mode 100755 index 000000000..683529ddc --- /dev/null +++ b/externals/vcpkg/ports/opencsg/CMakeLists.txt @@ -0,0 +1,46 @@ +cmake_minimum_required (VERSION 3.4) +project (opencsg) + +set(HEADERS + include/opencsg.h +) + +set(SRCS + src/area.cpp + src/batch.cpp + src/context.cpp + src/channelManager.cpp + src/frameBufferObject.cpp + src/frameBufferObjectExt.cpp + src/occlusionQuery.cpp + src/opencsgRender.cpp + src/openglHelper.cpp + src/primitive.cpp + src/primitiveHelper.cpp + src/renderGoldfeather.cpp + src/renderSCS.cpp + src/scissorMemo.cpp + src/settings.cpp + src/stencilManager.cpp + src/pBufferTexture.cpp + RenderTexture/RenderTexture.cpp +) + + +add_library(opencsg ${SRCS} ${HEADERS}) + +include_directories(src include RenderTexture ".") +find_package(GLEW REQUIRED) +include_directories(${GLEW_INCLUDE_DIRS}) +target_link_libraries(opencsg PRIVATE GLEW::GLEW) + +install( + TARGETS opencsg + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES ${HEADERS} DESTINATION include/opencsg) +endif() diff --git a/externals/vcpkg/ports/opencsg/illegal_char.patch b/externals/vcpkg/ports/opencsg/illegal_char.patch new file mode 100755 index 000000000..5c700fd19 --- /dev/null +++ b/externals/vcpkg/ports/opencsg/illegal_char.patch @@ -0,0 +1,13 @@ +diff --git a/include/opencsg.h b/include/opencsg.h +index d753a0e..b482c40 100644 +--- a/include/opencsg.h ++++ b/include/opencsg.h +@@ -156,7 +156,7 @@ namespace OpenCSG { + /// The DepthComplexityAlgorithm specifies the strategy for profiting + /// from depth complexity when performing the CSG rendering. + /// - NoDepthComplexitySampling: Does not employ the depth complexity. +- /// This essentially makes the algorithm O(n²), but with ++ /// This essentially makes the algorithm O(n²), but with + /// low constant costs. + /// - DepthComplexitySampling: Calculates the depth complexity k using + /// the stencil buffer. This makes algorithm O(n*k), but diff --git a/externals/vcpkg/ports/opencsg/portfile.cmake b/externals/vcpkg/ports/opencsg/portfile.cmake new file mode 100755 index 000000000..939b873cb --- /dev/null +++ b/externals/vcpkg/ports/opencsg/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO floriankirsch/OpenCSG + REF "opencsg-1-4-2-release" + SHA512 df117a1b7153a95332d236918d1547b0afe6f3ead46af2733c5feee6e25cec984b21affc41fd8320a45be9292bd3b32e21ed8bb3d08371ddd657f659b9bb932a + HEAD_REF master + PATCHES illegal_char.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DUNICODE=1 -D_UNICODE=1 + # OPTIONS_RELEASE -DOPTIMIZE=1 + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_install_cmake() + +file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/opencsg/vcpkg.json b/externals/vcpkg/ports/opencsg/vcpkg.json new file mode 100755 index 000000000..829a0f63a --- /dev/null +++ b/externals/vcpkg/ports/opencsg/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "opencsg", + "version-string": "1.4.2", + "port-version": 2, + "description": "OpenCSG is a library that does image-based CSG rendering using OpenGL. OpenCSG is written in C++ and supports most modern graphics hardware using Microsoft Windows or the Linux operating system.", + "dependencies": [ + "glew" + ] +} diff --git a/externals/vcpkg/ports/openctm/CMakeLists.txt b/externals/vcpkg/ports/openctm/CMakeLists.txt new file mode 100755 index 000000000..2d1de6a45 --- /dev/null +++ b/externals/vcpkg/ports/openctm/CMakeLists.txt @@ -0,0 +1,60 @@ +cmake_minimum_required(VERSION 3.19...3.23) +project( + openctm + VERSION 1.0.3 + LANGUAGES C) + +set(PUBLIC_HEADERS lib/openctm.h lib/openctmpp.h) + +add_library( + openctm + lib/compressMG1.c + lib/compressMG2.c + lib/compressRAW.c + lib/openctm.c + lib/stream.c + lib/liblzma/Alloc.c + lib/liblzma/LzFind.c + lib/liblzma/LzmaDec.c + lib/liblzma/LzmaEnc.c + lib/liblzma/LzmaLib.c) + +target_include_directories( + openctm + PUBLIC $ + $ + $) +target_compile_definitions(openctm PRIVATE OPENCTM_BUILD LZMA_PREFIX_CTM) +if(NOT BUILD_SHARED_LIBS) + target_compile_definitions(openctm PUBLIC OPENCTM_STATIC) +endif() +target_compile_features(openctm PRIVATE c_std_99) +set_target_properties(openctm PROPERTIES C_VISIBILITY_PRESET hidden + PUBLIC_HEADER "${PUBLIC_HEADERS}") + +include(GNUInstallDirs) +install( + TARGETS openctm + EXPORT unofficial-openctmConfig + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" COMPONENT dev) + +include(CMakePackageConfigHelpers) +set(VERSION_FILE_PATH "${CMAKE_CURRENT_BINARY_DIR}/unofficial-openctmConfigVersion.cmake") +write_basic_package_version_file( + "${VERSION_FILE_PATH}" + VERSION ${PROJECT_VERSION} + COMPATIBILITY SameMajorVersion) +install(FILES "${VERSION_FILE_PATH}" DESTINATION share/unofficial-openctm) + +install(FILES ${PUBLIC_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + +install( + EXPORT unofficial-openctmConfig + FILE unofficial-openctmConfig.cmake + NAMESPACE unofficial::openctm:: + DESTINATION share/unofficial-openctm) + +export(PACKAGE openctm) diff --git a/externals/vcpkg/ports/openctm/portfile.cmake b/externals/vcpkg/ports/openctm/portfile.cmake new file mode 100755 index 000000000..5be1b1d06 --- /dev/null +++ b/externals/vcpkg/ports/openctm/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO openctm + REF OpenCTM-1.0.3 + SHA512 fdfa08d19ecbfea99ba01aa2032e941ed6313394a96bd69f8984c2d2d079d836c616471d2bdf6f40175e75659f3ad0ba41502bc3d8224091472f40893ea8746e + FILENAME "OpenCTM-1.0.3-src.tar.bz2" +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-openctm) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/openctm/vcpkg.json b/externals/vcpkg/ports/openctm/vcpkg.json new file mode 100755 index 000000000..fd0586f74 --- /dev/null +++ b/externals/vcpkg/ports/openctm/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "openctm", + "version": "1.0.3", + "description": "OpenCTM — the Open Compressed Triangle Mesh file format — is a file format, a software library and a tool set for compression of 3D triangle meshes.", + "homepage": "http://openctm.sourceforge.net/", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/opencv/portfile.cmake b/externals/vcpkg/ports/opencv/portfile.cmake new file mode 100755 index 000000000..cc6e26fcb --- /dev/null +++ b/externals/vcpkg/ports/opencv/portfile.cmake @@ -0,0 +1 @@ +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/opencv/vcpkg.json b/externals/vcpkg/ports/opencv/vcpkg.json new file mode 100755 index 000000000..5e24959bd --- /dev/null +++ b/externals/vcpkg/ports/opencv/vcpkg.json @@ -0,0 +1,427 @@ +{ + "name": "opencv", + "version": "4.5.5", + "port-version": 1, + "description": "Computer vision library", + "homepage": "https://github.com/opencv/opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false + } + ], + "default-features": [ + "default-features" + ], + "features": { + "ade": { + "description": "graph api", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "ade" + ] + } + ] + }, + "contrib": { + "description": "opencv_contrib module", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "contrib" + ] + } + ] + }, + "cuda": { + "description": "CUDA support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "cuda" + ] + } + ] + }, + "cudnn": { + "description": "cuDNN support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "cudnn" + ] + } + ] + }, + "dc1394": { + "description": "Dc1394 support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "dc1394" + ] + } + ] + }, + "default-features": { + "description": "Platform-dependent default features", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "dnn", + "jpeg", + "png", + "quirc", + "tiff", + "webp" + ] + }, + { + "name": "opencv4", + "default-features": false, + "features": [ + "gtk" + ], + "platform": "linux" + } + ] + }, + "dnn": { + "description": "Enable dnn module", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "dnn" + ] + } + ] + }, + "eigen": { + "description": "Eigen support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "eigen" + ] + } + ] + }, + "ffmpeg": { + "description": "ffmpeg support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "ffmpeg" + ] + } + ] + }, + "freetype": { + "description": "freetype support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "freetype" + ] + } + ] + }, + "gdcm": { + "description": "GDCM support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "gdcm" + ] + } + ] + }, + "gstreamer": { + "description": "gstreamer support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "gstreamer" + ] + } + ] + }, + "gtk": { + "description": "GTK support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "gtk" + ] + } + ] + }, + "halide": { + "description": "Halide support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "halide" + ] + } + ] + }, + "ipp": { + "description": "Enable Intel Integrated Performance Primitives", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "ipp" + ] + } + ] + }, + "jasper": { + "description": "JPEG 2000 support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "jasper" + ] + } + ] + }, + "jpeg": { + "description": "JPEG support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "jpeg" + ] + } + ] + }, + "lapack": { + "description": "LAPACK support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "lapack" + ] + } + ] + }, + "nonfree": { + "description": "opencv nonfree module", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "nonfree" + ] + } + ] + }, + "openexr": { + "description": "OpenEXR support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "openexr" + ] + } + ] + }, + "opengl": { + "description": "opengl support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "opengl" + ] + } + ] + }, + "openmp": { + "description": "Enable openmp support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "openmp" + ] + } + ] + }, + "ovis": { + "description": "opencv_ovis module", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "ovis" + ] + } + ] + }, + "png": { + "description": "PNG support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "png" + ] + } + ] + }, + "python": { + "description": "Python wrapper support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "python" + ] + } + ] + }, + "qt": { + "description": "Qt GUI support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "qt" + ] + } + ] + }, + "quirc": { + "description": "Enable QR code module", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "quirc" + ] + } + ] + }, + "sfm": { + "description": "opencv_sfm module", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "sfm" + ] + } + ] + }, + "tbb": { + "description": "Enable Intel Threading Building Blocks", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "tbb" + ] + } + ] + }, + "tiff": { + "description": "TIFF support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "tiff" + ] + } + ] + }, + "vtk": { + "description": "vtk support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "vtk" + ] + } + ] + }, + "webp": { + "description": "WebP support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "webp" + ] + } + ] + }, + "world": { + "description": "Compile to a single package support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "world" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/opencv2/0002-install-options.patch b/externals/vcpkg/ports/opencv2/0002-install-options.patch new file mode 100755 index 000000000..73d941a30 --- /dev/null +++ b/externals/vcpkg/ports/opencv2/0002-install-options.patch @@ -0,0 +1,344 @@ +--- a/3rdparty/libtiff/CMakeLists.txt ++++ b/3rdparty/libtiff/CMakeLists.txt +@@ -102,7 +102,7 @@ if(UNIX AND (CMAKE_COMPILER_IS_GNUCXX OR CV_ICC)) + endif() + + add_library(${TIFF_LIBRARY} STATIC ${lib_srcs}) +-target_link_libraries(${TIFF_LIBRARY} ${ZLIB_LIBRARIES}) ++target_link_libraries(${TIFF_LIBRARY} ZLIB::ZLIB) + + set_target_properties(${TIFF_LIBRARY} + PROPERTIES +--- a/3rdparty/openexr/CMakeLists.txt ++++ b/3rdparty/openexr/CMakeLists.txt +@@ -55,7 +55,7 @@ if(MSVC AND CV_ICC) + endif() + + add_library(IlmImf STATIC ${lib_hdrs} ${lib_srcs}) +-target_link_libraries(IlmImf ${ZLIB_LIBRARIES}) ++target_link_libraries(IlmImf ZLIB::ZLIB) + + set_target_properties(IlmImf + PROPERTIES +--- a/3rdparty/tbb/CMakeLists.txt ++++ b/3rdparty/tbb/CMakeLists.txt +@@ -116,7 +116,7 @@ endif() + + if(NOT EXISTS "${tbb_tarball}") + message(STATUS "Downloading ${tbb_ver}_src.tgz") +- file(DOWNLOAD "${tbb_url}" "${tbb_tarball}" TIMEOUT 600 STATUS __statvar) ++ message(FATAL_ERROR " Downloads are not permitted during configure. Please pre-download the file \"${CACHE_CANDIDATE}\":\n \n vcpkg_download_distfile(OCV_DOWNLOAD\n URLS \"${tbb_url}\"\n FILENAME \"${tbb_tarball}\"\n SHA512 0\n )") + if(NOT __statvar EQUAL 0) + message(FATAL_ERROR "Failed to download TBB sources (${__statvar}): ${tbb_url}") + endif() +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -275,23 +275,10 @@ if (ANDROID) + endif() + + if(NOT DEFINED OPENCV_DOC_INSTALL_PATH) +- if(ANDROID OR WIN32) +- set(OPENCV_DOC_INSTALL_PATH doc) +- elseif(INSTALL_TO_MANGLED_PATHS) +- set(OPENCV_DOC_INSTALL_PATH share/OpenCV-${OPENCV_VERSION}/doc) +- else() +- set(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc) +- endif() ++ set(OPENCV_DOC_INSTALL_PATH share/opencv/doc) + endif() + +-if(WIN32) +- if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH) +- set(OpenCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/") +- else() +- message(STATUS "Can't detect runtime and/or arch") +- set(OpenCV_INSTALL_BINARIES_PREFIX "") +- endif() +-elseif(ANDROID) ++if(ANDROID) + set(OpenCV_INSTALL_BINARIES_PREFIX "sdk/native/") + else() + set(OpenCV_INSTALL_BINARIES_PREFIX "") +@@ -322,29 +309,13 @@ if(ANDROID) + set(OPENCV_INCLUDE_INSTALL_PATH sdk/native/jni/include) + set(OPENCV_SAMPLES_SRC_INSTALL_PATH samples/native) + else() +- set(LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/lib") +- set(3P_LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/3rdparty/lib${LIB_SUFFIX}") +- if(WIN32) +- if(OpenCV_STATIC) +- set(OPENCV_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib${LIB_SUFFIX}") +- else() +- set(OPENCV_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}lib${LIB_SUFFIX}") +- endif() +- set(OPENCV_3P_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib${LIB_SUFFIX}") +- set(OPENCV_SAMPLES_SRC_INSTALL_PATH samples/native) +- else() +- set(OPENCV_LIB_INSTALL_PATH lib${LIB_SUFFIX}) +- set(OPENCV_3P_LIB_INSTALL_PATH share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}) +- set(OPENCV_SAMPLES_SRC_INSTALL_PATH share/OpenCV/samples) +- endif() +- set(OPENCV_INCLUDE_INSTALL_PATH "include") +- +- math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}") +- if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX) +- set(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/opencv) +- else() +- set(OPENCV_CONFIG_INSTALL_PATH share/OpenCV) +- endif() ++ set(LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/lib") ++ set(3P_LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH}") ++ set(OPENCV_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}lib") ++ set(OPENCV_3P_LIB_INSTALL_PATH "${OPENCV_LIB_INSTALL_PATH}") ++ set(OPENCV_SAMPLES_SRC_INSTALL_PATH "share/opencv/samples") ++ set(OPENCV_INCLUDE_INSTALL_PATH "include") ++ set(OPENCV_CONFIG_INSTALL_PATH "share/opencv") + endif() + + set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${OPENCV_LIB_INSTALL_PATH}") +@@ -356,7 +327,7 @@ endif() + + if(WIN32) + # Postfix of DLLs: +- set(OPENCV_DLLVERSION "${OPENCV_VERSION_MAJOR}${OPENCV_VERSION_MINOR}${OPENCV_VERSION_PATCH}") ++ set(OPENCV_DLLVERSION "") + set(OPENCV_DEBUG_POSTFIX d) + else() + # Postfix of so's: +@@ -397,8 +368,6 @@ if(CMAKE_HOST_WIN32) + endif() + endif() + +-find_host_program(GIT_EXECUTABLE NAMES ${git_names} PATH_SUFFIXES Git/cmd Git/bin DOC "git command line client") +-mark_as_advanced(GIT_EXECUTABLE) + + if(GIT_EXECUTABLE) + execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty --match "2.[0-9].[0-9]*" +@@ -501,7 +470,9 @@ if(BUILD_DOCS) + endif(BUILD_DOCS) + + # --- Python Support --- +-include(cmake/OpenCVDetectPython.cmake) ++if(WITH_PYTHON) ++ include(cmake/OpenCVDetectPython.cmake) ++endif() + + # --- Java Support --- + include(cmake/OpenCVDetectApacheAnt.cmake) +@@ -885,11 +853,7 @@ if(ANDROID) + endif() + + if(DEFINED WITH_FFMPEG OR HAVE_FFMPEG) +- if(WIN32) +- status(" FFMPEG:" WITH_FFMPEG THEN "YES (prebuilt binaries)" ELSE NO) +- else() + status(" FFMPEG:" HAVE_FFMPEG THEN YES ELSE NO) +- endif() + status(" avcodec:" FFMPEG_libavcodec_FOUND THEN "YES (ver ${FFMPEG_libavcodec_VERSION})" ELSE NO) + status(" avformat:" FFMPEG_libavformat_FOUND THEN "YES (ver ${FFMPEG_libavformat_VERSION})" ELSE NO) + status(" avutil:" FFMPEG_libavutil_FOUND THEN "YES (ver ${FFMPEG_libavutil_VERSION})" ELSE NO) +diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake +index e61059a..ec6f34f 100644 +--- a/cmake/OpenCVCompilerOptions.cmake ++++ b/cmake/OpenCVCompilerOptions.cmake +@@ -269,7 +269,6 @@ if(MSVC) + set(OPENCV_EXTRA_FLAGS "${OPENCV_EXTRA_FLAGS} /bigobj") + endif() + if(BUILD_WITH_DEBUG_INFO) +- set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} /Zi") + endif() + + if(ENABLE_SSE4_1 AND CV_ICC AND NOT OPENCV_EXTRA_FLAGS MATCHES "/arch:") +diff --git a/cmake/OpenCVFindLibsVideo.cmake b/cmake/OpenCVFindLibsVideo.cmake +index 146043f..1202225 100644 +--- a/cmake/OpenCVFindLibsVideo.cmake ++++ b/cmake/OpenCVFindLibsVideo.cmake +@@ -185,12 +185,8 @@ endif(WITH_XIMEA) + # --- FFMPEG --- + ocv_clear_vars(HAVE_FFMPEG) + if(WITH_FFMPEG) +- if(WIN32 AND NOT ARM) +- include("${OpenCV_SOURCE_DIR}/3rdparty/ffmpeg/ffmpeg_version.cmake") ++ find_package(FFMPEG REQUIRED) + set(HAVE_FFMPEG TRUE) +- elseif(PKG_CONFIG_FOUND) +- ocv_check_modules(FFMPEG libavcodec libavformat libavutil libswscale) +- ocv_check_modules(FFMPEG_libavresample libavresample) + if(FFMPEG_libavresample_FOUND) + ocv_append_build_options(FFMPEG FFMPEG_libavresample) + endif() +@@ -211,9 +207,6 @@ if(WITH_FFMPEG) + ocv_append_build_options(HIGHGUI FFMPEG) + endif() + endif() +- else() +- message(STATUS "Can't find ffmpeg - 'pkg-config' utility is missing") +- endif() + endif(WITH_FFMPEG) + + # --- VideoInput/DirectShow --- +--- a/cmake/OpenCVGenConfig.cmake ++++ b/cmake/OpenCVGenConfig.cmake +@@ -101,7 +101,7 @@ endif() + configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" @ONLY) + configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig-version.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake" @ONLY) + +-if(UNIX) # ANDROID configuration is created here also ++if(1) # ANDROID configuration is created here also + #http://www.vtk.org/Wiki/CMake/Tutorials/Packaging reference + # For a command "find_package( [major[.minor]] [EXACT] [REQUIRED|QUIET])" + # cmake will look in the following dir on unix: +@@ -126,7 +126,7 @@ endif() + # -------------------------------------------------------------------------------------------- + # Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake -> For use within binary installers/packages + # -------------------------------------------------------------------------------------------- +-if(WIN32) ++if(0) + set(OpenCV_INCLUDE_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/include\" \"\${OpenCV_CONFIG_PATH}/include/opencv\"") + set(OpenCV2_INCLUDE_DIRS_CONFIGCMAKE "\"\"") + +--- a/cmake/OpenCVModule.cmake ++++ b/cmake/OpenCVModule.cmake +@@ -86,10 +86,10 @@ macro(ocv_add_dependencies full_modname) + endforeach() + unset(__depsvar) + +- ocv_list_unique(OPENCV_MODULE_${full_modname}_REQ_DEPS) +- ocv_list_unique(OPENCV_MODULE_${full_modname}_OPT_DEPS) +- ocv_list_unique(OPENCV_MODULE_${full_modname}_PRIVATE_REQ_DEPS) +- ocv_list_unique(OPENCV_MODULE_${full_modname}_PRIVATE_OPT_DEPS) ++ #ocv_list_unique(OPENCV_MODULE_${full_modname}_REQ_DEPS) ++ #ocv_list_unique(OPENCV_MODULE_${full_modname}_OPT_DEPS) ++ #ocv_list_unique(OPENCV_MODULE_${full_modname}_PRIVATE_REQ_DEPS) ++ #ocv_list_unique(OPENCV_MODULE_${full_modname}_PRIVATE_OPT_DEPS) + + set(OPENCV_MODULE_${full_modname}_REQ_DEPS ${OPENCV_MODULE_${full_modname}_REQ_DEPS} + CACHE INTERNAL "Required dependencies of ${full_modname} module") +@@ -277,7 +277,7 @@ endfunction() + + # sort modules by dependencies + function(__ocv_sort_modules_by_deps __lst) +- ocv_list_sort(${__lst}) ++ #ocv_list_sort(${__lst}) + set(${__lst}_ORDERED ${${__lst}} CACHE INTERNAL "") + set(__result "") + foreach (m ${${__lst}}) +@@ -382,7 +382,7 @@ function(__ocv_resolve_dependencies) + endforeach() + endforeach() + +- ocv_list_sort(OPENCV_MODULES_BUILD) ++ #ocv_list_sort(OPENCV_MODULES_BUILD) + + foreach(m ${OPENCV_MODULES_BUILD}) + # message(STATUS "FULL deps of ${m}: ${deps_${m}}") +@@ -397,7 +397,7 @@ function(__ocv_resolve_dependencies) + # reorder dependencies + foreach(m ${OPENCV_MODULES_BUILD}) + __ocv_sort_modules_by_deps(OPENCV_MODULE_${m}_DEPS) +- ocv_list_sort(OPENCV_MODULE_${m}_DEPS_EXT) ++ #ocv_list_sort(OPENCV_MODULE_${m}_DEPS_EXT) + + set(OPENCV_MODULE_${m}_DEPS ${OPENCV_MODULE_${m}_DEPS} CACHE INTERNAL "Flattened dependencies of ${m} module") + set(OPENCV_MODULE_${m}_DEPS_EXT ${OPENCV_MODULE_${m}_DEPS_EXT} CACHE INTERNAL "Extra dependencies of ${m} module") +--- a/data/CMakeLists.txt ++++ b/data/CMakeLists.txt +@@ -5,8 +5,6 @@ if(ANDROID) + install(FILES ${HAAR_CASCADES} DESTINATION sdk/etc/haarcascades COMPONENT libs) + install(FILES ${LBP_CASCADES} DESTINATION sdk/etc/lbpcascades COMPONENT libs) + else() +- install(FILES ${HAAR_CASCADES} DESTINATION share/OpenCV/haarcascades COMPONENT libs) +- install(FILES ${LBP_CASCADES} DESTINATION share/OpenCV/lbpcascades COMPONENT libs) + endif() + + if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH) +@@ -51,4 +49,4 @@ if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH) + install(FILES ${DATAFILES_CASCADES} DESTINATION share/OpenCV/testdata/data/haarcascades COMPONENT tests) + endif() + endif() +-endif() +\ No newline at end of file ++endif() +--- a/modules/core/CMakeLists.txt ++++ b/modules/core/CMakeLists.txt +@@ -1,9 +1,9 @@ + set(the_description "The Core Functionality") + + if (NOT HAVE_CUDA OR ENABLE_DYNAMIC_CUDA) +- ocv_add_module(core PRIVATE_REQUIRED ${ZLIB_LIBRARIES}) ++ ocv_add_module(core PRIVATE_REQUIRED ZLIB::ZLIB) + else() +- ocv_add_module(core PRIVATE_REQUIRED ${ZLIB_LIBRARIES} ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY}) ++ ocv_add_module(core PRIVATE_REQUIRED ZLIB::ZLIB ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY}) + endif() + + ocv_module_include_directories("${OpenCV_SOURCE_DIR}/modules/dynamicuda/include/" ${ZLIB_INCLUDE_DIR}) +--- a/modules/highgui/CMakeLists.txt ++++ b/modules/highgui/CMakeLists.txt +@@ -15,23 +15,23 @@ endif() + + if(HAVE_PNG OR HAVE_TIFF OR HAVE_OPENEXR) + ocv_include_directories(${ZLIB_INCLUDE_DIR}) +- list(APPEND GRFMT_LIBS ${ZLIB_LIBRARIES}) ++ list(APPEND GRFMT_LIBS ZLIB::ZLIB) + endif() + + if(HAVE_JPEG) + ocv_include_directories(${JPEG_INCLUDE_DIR}) +- list(APPEND GRFMT_LIBS ${JPEG_LIBRARIES}) ++ list(APPEND GRFMT_LIBS JPEG::JPEG) + endif() + + if(HAVE_PNG) + add_definitions(${PNG_DEFINITIONS}) + ocv_include_directories(${PNG_INCLUDE_DIR}) +- list(APPEND GRFMT_LIBS ${PNG_LIBRARIES}) ++ list(APPEND GRFMT_LIBS PNG::PNG) + endif() + + if(HAVE_TIFF) + ocv_include_directories(${TIFF_INCLUDE_DIR}) +- list(APPEND GRFMT_LIBS ${TIFF_LIBRARIES}) ++ list(APPEND GRFMT_LIBS TIFF::TIFF) + endif() + + if(HAVE_JASPER) +@@ -296,38 +296,5 @@ endif() + ocv_add_precompiled_headers(${the_module}) + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-deprecated-declarations -Wno-clobbered) + +-if(WIN32 AND WITH_FFMPEG) +- #copy ffmpeg dll to the output folder +- if(MSVC64 OR MINGW64) +- set(FFMPEG_SUFFIX _64) +- endif() +- +- set(ffmpeg_bare_name "opencv_ffmpeg${FFMPEG_SUFFIX}.dll") +- set(ffmpeg_bare_name_ver "opencv_ffmpeg${OPENCV_DLLVERSION}${FFMPEG_SUFFIX}.dll") +- set(ffmpeg_path "${OpenCV_SOURCE_DIR}/3rdparty/ffmpeg/${ffmpeg_bare_name}") +- +- #if(MSVC AND CMAKE_VERSION VERSION_GREATER "2.8.2") +- # add_custom_command(TARGET ${the_module} POST_BUILD +- # COMMAND ${CMAKE_COMMAND} -E copy "${ffmpeg_path}" "${EXECUTABLE_OUTPUT_PATH}/$/${ffmpeg_bare_name_ver}" +- # COMMENT "Copying ${ffmpeg_path} to the output directory") +- #else +- if(MSVC_IDE) +- add_custom_command(TARGET ${the_module} POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E copy "${ffmpeg_path}" "${EXECUTABLE_OUTPUT_PATH}/Release/${ffmpeg_bare_name_ver}" +- COMMAND ${CMAKE_COMMAND} -E copy "${ffmpeg_path}" "${EXECUTABLE_OUTPUT_PATH}/Debug/${ffmpeg_bare_name_ver}" +- COMMENT "Copying ${ffmpeg_path} to the output directory") +- elseif(MSVC AND (CMAKE_GENERATOR MATCHES "Visual")) +- add_custom_command(TARGET ${the_module} POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E copy "${ffmpeg_path}" "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/${ffmpeg_bare_name_ver}" +- COMMENT "Copying ${ffmpeg_path} to the output directory") +- else() +- add_custom_command(TARGET ${the_module} POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E copy "${ffmpeg_path}" "${EXECUTABLE_OUTPUT_PATH}/${ffmpeg_bare_name_ver}" +- COMMENT "Copying ${ffmpeg_path} to the output directory") +- endif() +- +- install(FILES "${ffmpeg_path}" DESTINATION ${OPENCV_BIN_INSTALL_PATH} COMPONENT libs RENAME "${ffmpeg_bare_name_ver}") +-endif() +- + ocv_add_accuracy_tests() + ocv_add_perf_tests() diff --git a/externals/vcpkg/ports/opencv2/0003-force-package-requirements.patch b/externals/vcpkg/ports/opencv2/0003-force-package-requirements.patch new file mode 100755 index 000000000..8345cd7fb --- /dev/null +++ b/externals/vcpkg/ports/opencv2/0003-force-package-requirements.patch @@ -0,0 +1,56 @@ +--- a/cmake/OpenCVFindLibsGrfmt.cmake ++++ b/cmake/OpenCVFindLibsGrfmt.cmake +@@ -6,7 +6,7 @@ + if(BUILD_ZLIB) + ocv_clear_vars(ZLIB_FOUND) + else() +- include(FindZLIB) ++ find_package(ZLIB REQUIRED) + if(ZLIB_FOUND AND ANDROID) + if(ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib/libz.so" OR + ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib64/libz.so") +@@ -32,7 +32,7 @@ if(WITH_TIFF) + if(BUILD_TIFF) + ocv_clear_vars(TIFF_FOUND) + else() +- include(FindTIFF) ++ find_package(TIFF REQUIRED) + if(TIFF_FOUND) + ocv_parse_header("${TIFF_INCLUDE_DIR}/tiff.h" TIFF_VERSION_LINES TIFF_VERSION_CLASSIC TIFF_VERSION_BIG TIFF_VERSION TIFF_BIGTIFF_VERSION) + endif() +@@ -74,7 +74,7 @@ if(WITH_JPEG) + if(BUILD_JPEG) + ocv_clear_vars(JPEG_FOUND) + else() +- include(FindJPEG) ++ find_package(JPEG REQUIRED) + endif() + + if(NOT JPEG_FOUND) +@@ -95,7 +95,7 @@ if(WITH_JASPER) + if(BUILD_JASPER) + ocv_clear_vars(JASPER_FOUND) + else() +- include(FindJasper) ++ find_package(Jasper REQUIRED) + endif() + + if(NOT JASPER_FOUND) +@@ -119,7 +119,7 @@ if(WITH_PNG) + if(BUILD_PNG) + ocv_clear_vars(PNG_FOUND) + else() +- include(FindPNG) ++ find_package(PNG REQUIRED) + if(PNG_FOUND) + include(CheckIncludeFile) + check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H) +@@ -151,7 +151,7 @@ if(WITH_OPENEXR) + if(BUILD_OPENEXR) + ocv_clear_vars(OPENEXR_FOUND) + else() +- include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake") ++ find_package(OpenEXR REQUIRED) + endif() + + if(NOT OPENEXR_FOUND) diff --git a/externals/vcpkg/ports/opencv2/0004-add-ffmpeg-missing-defines.patch b/externals/vcpkg/ports/opencv2/0004-add-ffmpeg-missing-defines.patch new file mode 100755 index 000000000..638581d01 --- /dev/null +++ b/externals/vcpkg/ports/opencv2/0004-add-ffmpeg-missing-defines.patch @@ -0,0 +1,12 @@ +--- a/modules/highgui/src/cap_ffmpeg_impl.hpp ++++ b/modules/highgui/src/cap_ffmpeg_impl.hpp +@@ -42,6 +42,9 @@ + + #define HAVE_FFMPEG_SWSCALE + #define HAVE_GENTOO_FFMPEG ++#define AV_CODEC_FLAG_GLOBAL_HEADER (1 << 22) ++#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER ++#define AVFMT_RAWPICTURE 0x0020 + + #include "cap_ffmpeg_api.hpp" + #include diff --git a/externals/vcpkg/ports/opencv2/0005-fix-cuda.patch b/externals/vcpkg/ports/opencv2/0005-fix-cuda.patch new file mode 100755 index 000000000..7ce62966d --- /dev/null +++ b/externals/vcpkg/ports/opencv2/0005-fix-cuda.patch @@ -0,0 +1,140 @@ +--- a/cmake/OpenCVDetectCUDA.cmake ++++ b/cmake/OpenCVDetectCUDA.cmake +@@ -51,7 +51,6 @@ if(CUDA_FOUND) + + message(STATUS "CUDA detected: " ${CUDA_VERSION}) + +- set(_generations "Fermi" "Kepler") + if(NOT CMAKE_CROSSCOMPILING) + list(APPEND _generations "Auto") + endif() +@@ -69,48 +68,8 @@ if(CUDA_FOUND) + unset(CUDA_ARCH_PTX CACHE) + endif() + +- set(__cuda_arch_ptx "") +- if(CUDA_GENERATION STREQUAL "Fermi") +- set(__cuda_arch_bin "2.0 2.1(2.0)") +- elseif(CUDA_GENERATION STREQUAL "Kepler") +- if(${CUDA_VERSION} VERSION_LESS "5.0") +- set(__cuda_arch_bin "3.0") +- else() +- set(__cuda_arch_bin "3.0 3.5") +- endif() +- elseif(CUDA_GENERATION STREQUAL "Auto") +- execute_process( COMMAND "${CUDA_NVCC_EXECUTABLE}" "${OpenCV_SOURCE_DIR}/cmake/checks/OpenCVDetectCudaArch.cu" "--run" +- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/" +- RESULT_VARIABLE _nvcc_res OUTPUT_VARIABLE _nvcc_out +- ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) +- if(NOT _nvcc_res EQUAL 0) +- message(STATUS "Automatic detection of CUDA generation failed. Going to build for all known architectures.") +- else() +- set(__cuda_arch_bin "${_nvcc_out}") +- string(REPLACE "2.1" "2.1(2.0)" __cuda_arch_bin "${__cuda_arch_bin}") +- endif() +- endif() +- +- if(NOT DEFINED __cuda_arch_bin) +- if(ANDROID) +- if (ARM) +- set(__cuda_arch_bin "3.2") +- set(__cuda_arch_ptx "") +- elseif(AARCH64) +- set(__cuda_arch_bin "5.3") +- set(__cuda_arch_ptx "") +- endif() +- else() +- if(${CUDA_VERSION} VERSION_LESS "5.0") +- set(__cuda_arch_bin "1.1 1.2 1.3 2.0 2.1(2.0) 3.0") +- elseif(${CUDA_VERSION} VERSION_GREATER "6.5") +- set(__cuda_arch_bin "2.0 2.1(2.0) 3.0 3.5") +- else() +- set(__cuda_arch_bin "1.1 1.2 1.3 2.0 2.1(2.0) 3.0 3.5") +- endif() +- set(__cuda_arch_ptx "3.0") +- endif() +- endif() ++ set(__cuda_arch_ptx "5.0") ++ set(__cuda_arch_bin "5.0") + + set(CUDA_ARCH_BIN ${__cuda_arch_bin} CACHE STRING "Specify 'real' GPU architectures to build binaries for, BIN(PTX) format is supported") + set(CUDA_ARCH_PTX ${__cuda_arch_ptx} CACHE STRING "Specify 'virtual' PTX architectures to build PTX intermediate code for") +@@ -229,18 +188,40 @@ else() + endif() + + if(HAVE_CUDA) ++ set(CUDA_LIBS_PATH "") ++ foreach(p ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY}) ++ get_filename_component(_tmp ${p} PATH) ++ list(APPEND CUDA_LIBS_PATH ${_tmp}) ++ endforeach() ++ ++ if(HAVE_CUBLAS) ++ foreach(p ${CUDA_cublas_LIBRARY}) ++ get_filename_component(_tmp ${p} PATH) ++ list(APPEND CUDA_LIBS_PATH ${_tmp}) ++ endforeach() ++ endif() ++ ++ if(HAVE_CUFFT) ++ foreach(p ${CUDA_cufft_LIBRARY}) ++ get_filename_component(_tmp ${p} PATH) ++ list(APPEND CUDA_LIBS_PATH ${_tmp}) ++ endforeach() ++ endif() ++ ++ list(REMOVE_DUPLICATES CUDA_LIBS_PATH) ++ link_directories(${CUDA_LIBS_PATH}) ++ + set(CUDA_LIBRARIES_ABS ${CUDA_LIBRARIES}) +- ocv_create_imported_targets(CUDA_LIBRARIES ${CUDA_LIBRARIES}) ++ ocv_convert_to_lib_name(CUDA_LIBRARIES ${CUDA_LIBRARIES}) + set(CUDA_npp_LIBRARY_ABS ${CUDA_npp_LIBRARY}) +- ocv_create_imported_targets(CUDA_npp_LIBRARY ${CUDA_npp_LIBRARY}) +- ++ ocv_convert_to_lib_name(CUDA_npp_LIBRARY ${CUDA_npp_LIBRARY}) + if(HAVE_CUBLAS) + set(CUDA_cublas_LIBRARY_ABS ${CUDA_cublas_LIBRARY}) +- ocv_create_imported_targets(CUDA_cublas_LIBRARY ${CUDA_cublas_LIBRARY}) ++ ocv_convert_to_lib_name(CUDA_cublas_LIBRARY ${CUDA_cublas_LIBRARY}) + endif() + + if(HAVE_CUFFT) + set(CUDA_cufft_LIBRARY_ABS ${CUDA_cufft_LIBRARY}) +- ocv_create_imported_targets(CUDA_cufft_LIBRARY ${CUDA_cufft_LIBRARY}) ++ ocv_convert_to_lib_name(CUDA_cufft_LIBRARY ${CUDA_cufft_LIBRARY}) + endif() + endif() +--- a/cmake/templates/OpenCVConfig.cmake.in ++++ b/cmake/templates/OpenCVConfig.cmake.in +@@ -256,7 +256,7 @@ if(OpenCV_CUDA_VERSION) + + set(OpenCV_CUDA_LIBS_ABSPATH ${CUDA_LIBRARIES}) + +- if(${CUDA_VERSION} VERSION_LESS "5.5") ++ if(CUDA_VERSION VERSION_LESS "5.5") + list(APPEND OpenCV_CUDA_LIBS_ABSPATH ${CUDA_npp_LIBRARY}) + else() + find_cuda_helper_libs(nppc) +@@ -281,14 +281,16 @@ if(OpenCV_CUDA_VERSION) + list(APPEND OpenCV_CUDA_LIBS_ABSPATH ${CUDA_nvcuvenc_LIBRARIES}) + endif() + ++ set(OpenCV_CUDA_LIBS_RELPATH "") + foreach(l ${OpenCV_CUDA_LIBS_ABSPATH}) +- get_filename_component(_tmp "${l}" NAME_WE) +- string(REGEX REPLACE "^lib" "" _tmp "${_tmp}") +- if(NOT TARGET "opencv_dep_${_tmp}") # protect against repeated inclusions +- add_library("opencv_dep_${_tmp}" UNKNOWN IMPORTED) +- set_target_properties("opencv_dep_${_tmp}" PROPERTIES IMPORTED_LOCATION "${l}") ++ get_filename_component(_tmp ${l} PATH) ++ if(NOT ${_tmp} MATCHES "-Wl.*") ++ list(APPEND OpenCV_CUDA_LIBS_RELPATH ${_tmp}) + endif() + endforeach() ++ ++ list(REMOVE_DUPLICATES OpenCV_CUDA_LIBS_RELPATH) ++ link_directories(${OpenCV_CUDA_LIBS_RELPATH}) + endif() + + # ============================================================== diff --git a/externals/vcpkg/ports/opencv2/fix-path-contains-++-error.patch b/externals/vcpkg/ports/opencv2/fix-path-contains-++-error.patch new file mode 100755 index 000000000..bb2a2a7fe --- /dev/null +++ b/externals/vcpkg/ports/opencv2/fix-path-contains-++-error.patch @@ -0,0 +1,49 @@ +diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake +index 72df4d4..7d45974 100644 +--- a/cmake/OpenCVUtils.cmake ++++ b/cmake/OpenCVUtils.cmake +@@ -82,12 +82,42 @@ macro(ocv_check_environment_variables) + endforeach() + endmacro() + ++# check if "sub" (file or dir) is below "dir" ++function(is_subdir res dir sub ) ++ get_filename_component(dir "${dir}" ABSOLUTE) ++ get_filename_component(sub "${sub}" ABSOLUTE) ++ file(TO_CMAKE_PATH "${dir}" dir) ++ file(TO_CMAKE_PATH "${sub}" sub) ++ set(dir "${dir}/") ++ string(LENGTH "${dir}" len) ++ string(LENGTH "${sub}" len_sub) ++ if(NOT len GREATER len_sub) ++ string(SUBSTRING "${sub}" 0 ${len} prefix) ++ endif() ++ if(prefix AND prefix STREQUAL dir) ++ set(${res} TRUE PARENT_SCOPE) ++ else() ++ set(${res} FALSE PARENT_SCOPE) ++ endif() ++endfunction() ++ ++function(ocv_is_opencv_directory result_var dir) ++ set(result FALSE) ++ foreach(parent ${OpenCV_SOURCE_DIR} ${OpenCV_BINARY_DIR} ${OPENCV_EXTRA_MODULES_PATH}) ++ is_subdir(result "${parent}" "${dir}") ++ if(result) ++ break() ++ endif() ++ endforeach() ++ set(${result_var} ${result} PARENT_SCOPE) ++endfunction() ++ + # adds include directories in such a way that directories from the OpenCV source tree go first + function(ocv_include_directories) + set(__add_before "") + foreach(dir ${ARGN}) +- get_filename_component(__abs_dir "${dir}" ABSOLUTE) +- if("${__abs_dir}" MATCHES "^${OpenCV_SOURCE_DIR}" OR "${__abs_dir}" MATCHES "^${OpenCV_BINARY_DIR}") ++ ocv_is_opencv_directory(__is_opencv_dir "${dir}") ++ if(__is_opencv_dir) + list(APPEND __add_before "${dir}") + elseif(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0" AND + dir MATCHES "/usr/include$") diff --git a/externals/vcpkg/ports/opencv2/portfile.cmake b/externals/vcpkg/ports/opencv2/portfile.cmake new file mode 100755 index 000000000..c45f4c7b2 --- /dev/null +++ b/externals/vcpkg/ports/opencv2/portfile.cmake @@ -0,0 +1,160 @@ +if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv3") + message(FATAL_ERROR "OpenCV 3 is installed, please uninstall and try again:\n vcpkg remove opencv3") +endif() + +if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv4") + message(FATAL_ERROR "OpenCV 4 is installed, please uninstall and try again:\n vcpkg remove opencv4") +endif() + +file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents) +string(JSON OPENCV_VERSION GET "${_contents}" version) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO opencv/opencv + REF ${OPENCV_VERSION} + SHA512 de7d24ac7ed78ac14673011cbecc477cae688b74222a972e553c95a557b5cb8e5913f97db525421d6a72af30998ca300112fa0b285daed65f65832eb2cf7241a + HEAD_REF master + PATCHES + 0002-install-options.patch + 0003-force-package-requirements.patch + 0004-add-ffmpeg-missing-defines.patch + 0005-fix-cuda.patch + fix-path-contains-++-error.patch +) + +file(REMOVE "${SOURCE_PATH}/cmake/FindCUDA.cmake") +file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/FindCUDA") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "cuda" WITH_CUDA + "eigen" WITH_EIGEN + "ffmpeg" WITH_FFMPEG + "jasper" WITH_JASPER + "jpeg" WITH_JPEG + "openexr" WITH_OPENEXR + "opengl" WITH_OPENGL + "png" WITH_PNG + "qt" WITH_QT + "tiff" WITH_TIFF + "world" BUILD_opencv_world + "dc1394" WITH_1394 +) + +set(WITH_MSMF ON) +if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) + set(WITH_MSMF OFF) +endif() + +set(WITH_GTK OFF) +if("gtk" IN_LIST FEATURES) + if(VCPKG_TARGET_IS_LINUX) + set(WITH_GTK ON) + else() + message(WARNING "The gtk module cannot be enabled outside Linux") + endif() +endif() + +if("ffmpeg" IN_LIST FEATURES) + if(VCPKG_TARGET_IS_UWP) + set(VCPKG_C_FLAGS "/sdl- ${VCPKG_C_FLAGS}") + set(VCPKG_CXX_FLAGS "/sdl- ${VCPKG_CXX_FLAGS}") + endif() +endif() + +set(WITH_PYTHON OFF) +if("python" IN_LIST FEATURES) + x_vcpkg_get_python_packages(PYTHON_VERSION "2" PACKAGES numpy OUT_PYTHON_VAR "PYTHON2") + set(ENV{PYTHON} "${PYTHON2}") + set(WITH_PYTHON ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ###### ocv_options + -DCMAKE_DEBUG_POSTFIX=d + # Do not build docs/examples + -DBUILD_DOCS=OFF + -DBUILD_EXAMPLES=OFF + ###### Disable build 3rd party libs + -DBUILD_JASPER=OFF + -DBUILD_JPEG=OFF + -DBUILD_OPENEXR=OFF + -DBUILD_PNG=OFF + -DBUILD_TIFF=OFF + -DBUILD_TBB=OFF + -DBUILD_ZLIB=OFF + ###### OpenCV Build components + -DBUILD_opencv_apps=OFF + -DBUILD_PACKAGE=OFF + -DBUILD_PERF_TESTS=OFF + -DBUILD_TESTS=OFF + -DBUILD_WITH_DEBUG_INFO=ON + # CMAKE + -DCMAKE_DISABLE_FIND_PACKAGE_JNI=ON + ###### customized properties + ## Options from vcpkg_check_features() + ${FEATURE_OPTIONS} + -DWITH_1394=OFF + -DWITH_IPP=OFF + -DWITH_LAPACK=OFF + -DWITH_MSMF=${WITH_MSMF} + -DWITH_OPENCLAMDBLAS=OFF + -DWITH_OPENMP=OFF + -DWITH_PYTHON=${WITH_PYTHON} + -DWITH_ZLIB=ON + -WITH_GTK=${WITH_GTK} + -DWITH_CUBLAS=OFF # newer libcublas cannot be found by the old cuda cmake script in opencv2, requires a fix +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME opencv CONFIG_PATH "share/opencv") +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES) + + set(DEPS_STRING "include(CMakeFindDependencyMacro) +find_dependency(Threads)") + if("tiff" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(TIFF)") + endif() + if("cuda" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(CUDA)") + endif() + if("openexr" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(OpenEXR CONFIG)") + endif() + if("png" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(PNG)") + endif() + if("qt" IN_LIST FEATURES) + string(APPEND DEPS_STRING " +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) +find_dependency(Qt5 COMPONENTS Core Gui Widgets Test Concurrent)") + if("opengl" IN_LIST FEATURES) + string(APPEND DEPS_STRING " +find_dependency(Qt5 COMPONENTS OpenGL)") + endif() + endif() + + string(REPLACE "set(CMAKE_IMPORT_FILE_VERSION 1)" + "set(CMAKE_IMPORT_FILE_VERSION 1)\n${DEPS_STRING}" OPENCV_MODULES "${OPENCV_MODULES}") + + file(WRITE "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" "${OPENCV_MODULES}") + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE") + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/opencv2/vcpkg.json b/externals/vcpkg/ports/opencv2/vcpkg.json new file mode 100755 index 000000000..35f0e4bfa --- /dev/null +++ b/externals/vcpkg/ports/opencv2/vcpkg.json @@ -0,0 +1,142 @@ +{ + "name": "opencv2", + "version": "2.4.13.7", + "port-version": 13, + "description": "Open Source Computer Vision Library", + "homepage": "https://github.com/opencv/opencv", + "license": "BSD-3-Clause", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + { + "name": "vcpkg-get-python-packages", + "host": true + }, + "zlib" + ], + "default-features": [ + "default-features" + ], + "features": { + "cuda": { + "description": "CUDA support for opencv", + "dependencies": [ + "cuda" + ] + }, + "dc1394": { + "description": "Dc1394 support for opencv", + "dependencies": [ + "libdc1394" + ] + }, + "default-features": { + "description": "Platform-dependent default features", + "dependencies": [ + { + "name": "opencv2", + "default-features": false, + "features": [ + "eigen", + "jpeg", + "png", + "tiff" + ] + }, + { + "name": "opencv2", + "default-features": false, + "features": [ + "gtk" + ], + "platform": "linux" + } + ] + }, + "eigen": { + "description": "Eigen support for opencv", + "dependencies": [ + "eigen3" + ] + }, + "ffmpeg": { + "description": "ffmpeg support for opencv", + "dependencies": [ + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "avcodec", + "avformat", + "swresample", + "swscale" + ] + } + ] + }, + "gtk": { + "description": "GTK support for opencv", + "dependencies": [ + "gtk" + ] + }, + "jasper": { + "description": "JPEG 2000 support for opencv", + "dependencies": [ + "jasper" + ] + }, + "jpeg": { + "description": "JPEG support for opencv", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "openexr": { + "description": "OpenEXR support for opencv", + "dependencies": [ + "openexr" + ] + }, + "opengl": { + "description": "opengl support for opencv", + "dependencies": [ + "opengl" + ] + }, + "png": { + "description": "PNG support for opencv", + "dependencies": [ + "libpng" + ] + }, + "python": { + "description": "Python wrapper support for opencv" + }, + "qt": { + "description": "Qt GUI support for opencv", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] + }, + "tiff": { + "description": "TIFF support for opencv", + "dependencies": [ + "tiff" + ] + }, + "world": { + "description": "Compile to a single package support for opencv" + } + } +} diff --git a/externals/vcpkg/ports/opencv3/0001-disable-downloading.patch b/externals/vcpkg/ports/opencv3/0001-disable-downloading.patch new file mode 100755 index 000000000..e2c886d45 --- /dev/null +++ b/externals/vcpkg/ports/opencv3/0001-disable-downloading.patch @@ -0,0 +1,12 @@ +--- a/cmake/OpenCVDownload.cmake ++++ b/cmake/OpenCVDownload.cmake +@@ -157,6 +157,9 @@ function(ocv_download) + # Download + if(NOT EXISTS "${CACHE_CANDIDATE}") + ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"") ++ string(REPLACE "${OPENCV_DOWNLOAD_PATH}/" "opencv-cache/" CACHE_SUBPATH "${CACHE_CANDIDATE}") ++ message(FATAL_ERROR " Downloads are not permitted during configure. Please pre-download the file \"${CACHE_CANDIDATE}\":\n \n vcpkg_download_distfile(OCV_DOWNLOAD\n URLS \"${DL_URL}\"\n FILENAME \"${CACHE_SUBPATH}\"\n SHA512 0\n )") ++ + foreach(try ${OPENCV_DOWNLOAD_TRIES_LIST}) + ocv_download_log("#try ${try}") + file(DOWNLOAD "${DL_URL}" "${CACHE_CANDIDATE}" diff --git a/externals/vcpkg/ports/opencv3/0002-install-options.patch b/externals/vcpkg/ports/opencv3/0002-install-options.patch new file mode 100755 index 000000000..e47724bfc --- /dev/null +++ b/externals/vcpkg/ports/opencv3/0002-install-options.patch @@ -0,0 +1,59 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -607,7 +607,7 @@ endif() + ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS) + + # --- Python Support --- +-if(NOT IOS) ++if(WITH_PYTHON) + include(cmake/OpenCVDetectPython.cmake) + endif() + +--- a/cmake/OpenCVCompilerOptions.cmake ++++ b/cmake/OpenCVCompilerOptions.cmake +@@ -284,7 +284,6 @@ if(MSVC) + #endif() + + if(BUILD_WITH_DEBUG_INFO) +- set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} /Zi") + set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug") + set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug") + set(OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE} /debug") +--- a/cmake/OpenCVGenConfig.cmake ++++ b/cmake/OpenCVGenConfig.cmake +@@ -109,11 +109,11 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME) + endif() + endfunction() + +-if((CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" OR UNIX) AND NOT ANDROID) ++if(TRUE) + ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "" "") + endif() + +-if(ANDROID) ++if(FALSE) + ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "abi-${ANDROID_NDK_ABI_NAME}" "OpenCVConfig.root-ANDROID.cmake.in") + install(FILES "${OpenCV_SOURCE_DIR}/platforms/android/android.toolchain.cmake" DESTINATION "${OPENCV_CONFIG_INSTALL_PATH}" COMPONENT dev) + endif() +@@ -121,7 +121,7 @@ endif() + # -------------------------------------------------------------------------------------------- + # Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake -> For use within binary installers/packages + # -------------------------------------------------------------------------------------------- +-if(WIN32) ++if(FALSE) + if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows AND NOT OPENCV_SKIP_CMAKE_ROOT_CONFIG) + ocv_gen_config("${CMAKE_BINARY_DIR}/win-install" + "${OPENCV_INSTALL_BINARIES_PREFIX}${OPENCV_INSTALL_BINARIES_SUFFIX}" +diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt +index 1f0d720..0bb1ff7 100644 +--- a/data/CMakeLists.txt ++++ b/data/CMakeLists.txt +@@ -1,8 +1,6 @@ + file(GLOB HAAR_CASCADES haarcascades/*.xml) + file(GLOB LBP_CASCADES lbpcascades/*.xml) + +-install(FILES ${HAAR_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/haarcascades COMPONENT libs) +-install(FILES ${LBP_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/lbpcascades COMPONENT libs) + + if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH) + install(DIRECTORY "${OPENCV_TEST_DATA_PATH}/" DESTINATION "${OPENCV_TEST_DATA_INSTALL_PATH}" COMPONENT "tests") diff --git a/externals/vcpkg/ports/opencv3/0003-force-package-requirements.patch b/externals/vcpkg/ports/opencv3/0003-force-package-requirements.patch new file mode 100755 index 000000000..372811aa8 --- /dev/null +++ b/externals/vcpkg/ports/opencv3/0003-force-package-requirements.patch @@ -0,0 +1,83 @@ +--- a/cmake/OpenCVFindLibsGrfmt.cmake ++++ b/cmake/OpenCVFindLibsGrfmt.cmake +@@ -11,7 +11,7 @@ else() + set(_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) + set(CMAKE_FIND_LIBRARY_SUFFIXES .so) + endif() +- find_package(ZLIB "${MIN_VER_ZLIB}") ++ find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED) + if(ANDROID) + set(CMAKE_FIND_LIBRARY_SUFFIXES ${_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) + unset(_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES) +@@ -41,7 +41,7 @@ if(WITH_JPEG) + ocv_clear_vars(JPEG_FOUND) + else() + ocv_clear_internal_cache_vars(JPEG_LIBRARY JPEG_INCLUDE_DIR) +- include(FindJPEG) ++ find_package(JPEG REQUIRED) + endif() + + if(NOT JPEG_FOUND) +@@ -87,7 +87,7 @@ if(WITH_TIFF) + ocv_clear_vars(TIFF_FOUND) + else() + ocv_clear_internal_cache_vars(TIFF_LIBRARY TIFF_INCLUDE_DIR) +- include(FindTIFF) ++ find_package(TIFF REQUIRED) + if(TIFF_FOUND) + ocv_parse_header("${TIFF_INCLUDE_DIR}/tiff.h" TIFF_VERSION_LINES TIFF_VERSION_CLASSIC TIFF_VERSION_BIG TIFF_VERSION TIFF_BIGTIFF_VERSION) + endif() +@@ -131,7 +131,7 @@ if(WITH_WEBP) + ocv_clear_vars(WEBP_FOUND WEBP_LIBRARY WEBP_LIBRARIES WEBP_INCLUDE_DIR) + else() + ocv_clear_internal_cache_vars(WEBP_LIBRARY WEBP_INCLUDE_DIR) +- include(cmake/OpenCVFindWebP.cmake) ++ find_package(WEBP NAMES WebP REQUIRED) + if(WEBP_FOUND) + set(HAVE_WEBP 1) + endif() +@@ -172,7 +172,7 @@ if(WITH_JASPER) + if(BUILD_JASPER) + ocv_clear_vars(JASPER_FOUND) + else() +- include(FindJasper) ++ find_package(Jasper REQUIRED) + endif() + + if(NOT JASPER_FOUND) +@@ -197,7 +197,7 @@ if(WITH_PNG) + ocv_clear_vars(PNG_FOUND) + else() + ocv_clear_internal_cache_vars(PNG_LIBRARY PNG_INCLUDE_DIR) +- include(FindPNG) ++ find_package(PNG REQUIRED) + if(PNG_FOUND) + include(CheckIncludeFile) + check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H) +@@ -229,7 +229,7 @@ if(WITH_OPENEXR) + ocv_clear_vars(HAVE_OPENEXR) + if(NOT BUILD_OPENEXR) + ocv_clear_internal_cache_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION) +- include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake") ++ find_package(OpenEXR REQUIRED) + endif() + + if(OPENEXR_FOUND) +@@ -247,7 +247,7 @@ endif() + + # --- GDAL (optional) --- + if(WITH_GDAL) +- find_package(GDAL QUIET) ++ find_package(GDAL REQUIRED) + + if(NOT GDAL_FOUND) + set(HAVE_GDAL NO) +@@ -259,7 +259,7 @@ if(WITH_GDAL) + endif() + + if(WITH_GDCM) +- find_package(GDCM QUIET) ++ find_package(GDCM REQUIRED) + if(NOT GDCM_FOUND) + set(HAVE_GDCM NO) + ocv_clear_vars(GDCM_VERSION GDCM_LIBRARIES) diff --git a/externals/vcpkg/ports/opencv3/0004-fix-eigen.patch b/externals/vcpkg/ports/opencv3/0004-fix-eigen.patch new file mode 100755 index 000000000..196542dcd --- /dev/null +++ b/externals/vcpkg/ports/opencv3/0004-fix-eigen.patch @@ -0,0 +1,11 @@ +--- a/cmake/OpenCVFindLibsPerf.cmake ++++ b/cmake/OpenCVFindLibsPerf.cmake +@@ -55,7 +55,7 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN) + OR NOT (CMAKE_VERSION VERSION_LESS "3.0.0") # Eigen3Targets.cmake required CMake 3.0.0+ + ) AND NOT OPENCV_SKIP_EIGEN_FIND_PACKAGE_CONFIG + ) +- find_package(Eigen3 CONFIG QUIET) # Ceres 2.0.0 CMake scripts doesn't work with CMake's FindEigen3.cmake module (due to missing EIGEN3_VERSION_STRING) ++ find_package(Eigen3 CONFIG REQUIRED) # Ceres 2.0.0 CMake scripts doesn't work with CMake's FindEigen3.cmake module (due to missing EIGEN3_VERSION_STRING) + endif() + if(NOT Eigen3_FOUND) + find_package(Eigen3 QUIET) diff --git a/externals/vcpkg/ports/opencv3/0005-fix-vtk9.patch b/externals/vcpkg/ports/opencv3/0005-fix-vtk9.patch new file mode 100755 index 000000000..967cc9e94 --- /dev/null +++ b/externals/vcpkg/ports/opencv3/0005-fix-vtk9.patch @@ -0,0 +1,466 @@ +--- a/cmake/OpenCVDetectVTK.cmake ++++ b/cmake/OpenCVDetectVTK.cmake +@@ -1,12 +1,30 @@ ++# VTK 9.0 ++if(NOT VTK_FOUND) ++ find_package(VTK 9 QUIET NAMES vtk COMPONENTS ++ FiltersExtraction ++ FiltersSources ++ FiltersTexture ++ IOExport ++ IOGeometry ++ IOPLY ++ InteractionStyle ++ RenderingCore ++ RenderingLOD ++ RenderingOpenGL2 ++ NO_MODULE) ++endif() ++ + # VTK 6.x components +-find_package(VTK QUIET COMPONENTS vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE) +-IF(VTK_FOUND) +- IF(VTK_RENDERING_BACKEND) #in vtk 7, the rendering backend is exported as a var. ++if(NOT VTK_FOUND) ++ find_package(VTK QUIET COMPONENTS vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE) ++ IF(VTK_FOUND) ++ IF(VTK_RENDERING_BACKEND) #in vtk 7, the rendering backend is exported as a var. + find_package(VTK QUIET COMPONENTS vtkRendering${VTK_RENDERING_BACKEND} vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport vtkIOGeometry NO_MODULE) +- ELSE(VTK_RENDERING_BACKEND) ++ ELSE(VTK_RENDERING_BACKEND) + find_package(VTK QUIET COMPONENTS vtkRenderingOpenGL vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE) +- ENDIF(VTK_RENDERING_BACKEND) +-ENDIF(VTK_FOUND) ++ ENDIF(VTK_RENDERING_BACKEND) ++ ENDIF(VTK_FOUND) ++endif() + + # VTK 5.x components + if(NOT VTK_FOUND) +diff --git a/modules/viz/CMakeLists.txt b/modules/viz/CMakeLists.txt +index 256b464..92698c3 100644 +--- a/modules/viz/CMakeLists.txt ++++ b/modules/viz/CMakeLists.txt +@@ -3,7 +3,6 @@ if(NOT HAVE_VTK) + endif() + + set(the_description "Viz") +-include(${VTK_USE_FILE}) + + if(NOT BUILD_SHARED_LIBS) + # We observed conflict between builtin 3rdparty libraries and +@@ -27,7 +26,14 @@ endif() + ocv_warnings_disable(CMAKE_CXX_FLAGS -Winconsistent-missing-override -Wsuggest-override) + + ocv_define_module(viz opencv_core WRAP python) +-ocv_target_link_libraries(${the_module} PRIVATE ${VTK_LIBRARIES}) ++ ++if (VTK_VERSION VERSION_LESS "8.90.0") ++ include(${VTK_USE_FILE}) ++ ocv_target_link_libraries(${the_module} PRIVATE ${VTK_LIBRARIES}) ++else () ++ ocv_target_link_libraries(${the_module} PRIVATE ${VTK_LIBRARIES}) ++ vtk_module_autoinit(TARGETS ${the_module} MODULES ${VTK_LIBRARIES}) ++endif() + + if(APPLE AND BUILD_opencv_viz) + ocv_target_link_libraries(${the_module} PRIVATE "-framework Cocoa") +diff --git a/modules/viz/src/precomp.hpp b/modules/viz/src/precomp.hpp +index f92fdb6..4c4bf7c 100644 +--- a/modules/viz/src/precomp.hpp ++++ b/modules/viz/src/precomp.hpp +@@ -133,7 +133,8 @@ + #include + #include + #include +-#include "vtkCallbackCommand.h" ++#include ++#include + + #if !defined(_WIN32) || defined(__CYGWIN__) + # include /* unlink */ +@@ -149,6 +150,11 @@ + #include "vtk/vtkTrajectorySource.h" + #include "vtk/vtkImageMatSource.h" + ++#if VTK_MAJOR_VERSION >= 9 ++typedef vtkIdType const * CellIterT; ++#else ++typedef vtkIdType * CellIterT; ++#endif + + #include + #include +diff --git a/modules/viz/src/types.cpp b/modules/viz/src/types.cpp +index 65571a1..e9a470c 100644 +--- a/modules/viz/src/types.cpp ++++ b/modules/viz/src/types.cpp +@@ -97,10 +97,12 @@ cv::viz::Mesh cv::viz::Mesh::load(const String& file, int type) + // Now handle the polygons + vtkSmartPointer polygons = polydata->GetPolys(); + mesh.polygons.create(1, polygons->GetSize(), CV_32SC1); ++ mesh.polygons = 0; + int* poly_ptr = mesh.polygons.ptr(); + + polygons->InitTraversal(); +- vtkIdType nr_cell_points, *cell_points; ++ vtkIdType nr_cell_points; ++ CellIterT cell_points; + while (polygons->GetNextCell(nr_cell_points, cell_points)) + { + *poly_ptr++ = nr_cell_points; +--- a/modules/viz/src/vizimpl.cpp ++++ b/modules/viz/src/vizimpl.cpp +@@ -55,8 +55,17 @@ cv::viz::Viz3d::VizImpl::VizImpl(const String &name) : spin_once_state_(false), + + // Create render window + window_ = vtkSmartPointer::New(); +- cv::Vec2i window_size = cv::Vec2i(window_->GetScreenSize()) / 2; +- window_->SetSize(window_size.val); ++ int * sz = window_->GetScreenSize(); ++ if (sz) ++ { ++ cv::Vec2i window_size = cv::Vec2i(sz) / 2; ++ window_->SetSize(window_size.val); ++ } ++ else ++ { ++ int new_sz[2] = { 640, 480 }; ++ window_->SetSize(new_sz); ++ } + window_->AddRenderer(renderer_); + + // Create the interactor style +--- a/modules/viz/src/vtk/vtkOBJWriter.cpp ++++ b/modules/viz/src/vtk/vtkOBJWriter.cpp +@@ -72,7 +72,7 @@ void cv::viz::vtkOBJWriter::WriteData() + } + + vtkDebugMacro(<<"Opening vtk file for writing..."); +- ostream *outfilep = new ofstream(this->FileName, ios::out); ++ std::ostream *outfilep = new std::ofstream(this->FileName, ios::out); + if (outfilep->fail()) + { + vtkErrorMacro(<< "Unable to open file: "<< this->FileName); +@@ -127,7 +127,8 @@ void cv::viz::vtkOBJWriter::WriteData() + // write out verts if any + if (input->GetNumberOfVerts() > 0) + { +- vtkIdType npts = 0, *index = 0; ++ vtkIdType npts = 0; ++ CellIterT index = 0; + vtkCellArray *cells = input->GetVerts(); + for (cells->InitTraversal(); cells->GetNextCell(npts, index); ) + { +@@ -141,7 +142,8 @@ void cv::viz::vtkOBJWriter::WriteData() + // write out lines if any + if (input->GetNumberOfLines() > 0) + { +- vtkIdType npts = 0, *index = 0; ++ vtkIdType npts = 0; ++ CellIterT index = 0; + vtkCellArray *cells = input->GetLines(); + for (cells->InitTraversal(); cells->GetNextCell(npts, index); ) + { +@@ -162,7 +164,8 @@ void cv::viz::vtkOBJWriter::WriteData() + // write out polys if any + if (input->GetNumberOfPolys() > 0) + { +- vtkIdType npts = 0, *index = 0; ++ vtkIdType npts = 0; ++ CellIterT index = 0; + vtkCellArray *cells = input->GetPolys(); + for (cells->InitTraversal(); cells->GetNextCell(npts, index); ) + { +@@ -191,7 +194,8 @@ void cv::viz::vtkOBJWriter::WriteData() + // write out tstrips if any + if (input->GetNumberOfStrips() > 0) + { +- vtkIdType npts = 0, *index = 0; ++ vtkIdType npts = 0; ++ CellIterT index = 0; + vtkCellArray *cells = input->GetStrips(); + for (cells->InitTraversal(); cells->GetNextCell(npts, index); ) + { +--- a/modules/viz/src/vtk/vtkXYZReader.cpp ++++ b/modules/viz/src/vtk/vtkXYZReader.cpp +@@ -77,7 +77,7 @@ int cv::viz::vtkXYZReader::RequestData(vtkInformation*, vtkInformationVector**, + } + + // Open the input file. +- ifstream fin(this->FileName); ++ std::ifstream fin(this->FileName); + if(!fin) + { + vtkErrorMacro("Error opening file " << this->FileName); +--- a/modules/viz/src/vtk/vtkXYZWriter.cpp ++++ b/modules/viz/src/vtk/vtkXYZWriter.cpp +@@ -69,7 +69,7 @@ void cv::viz::vtkXYZWriter::WriteData() + } + + vtkDebugMacro(<<"Opening vtk file for writing..."); +- ostream *outfilep = new ofstream(this->FileName, ios::out); ++ std::ostream *outfilep = new std::ofstream(this->FileName, ios::out); + if (outfilep->fail()) + { + vtkErrorMacro(<< "Unable to open file: "<< this->FileName); +--- a/modules/viz/test/test_tutorial2.cpp ++++ b/modules/viz/test/test_tutorial2.cpp +@@ -28,7 +28,7 @@ static void tutorial2() + /// Rodrigues vector + Vec3d rot_vec = Vec3d::all(0); + double translation_phase = 0.0, translation = 0.0; +- while(!myWindow.wasStopped()) ++ for(unsigned num = 0; num < 50; ++num) + { + /* Rotation using rodrigues */ + /// Rotate around (1,1,1) +@@ -45,7 +45,7 @@ static void tutorial2() + + myWindow.setWidgetPose("Cube Widget", pose); + +- myWindow.spinOnce(1, true); ++ myWindow.spinOnce(100, true); + } + } + +--- a/modules/viz/test/test_tutorial3.cpp ++++ b/modules/viz/test/test_tutorial3.cpp +@@ -48,7 +48,7 @@ static void tutorial3(bool camera_pov) + myWindow.setViewerPose(camera_pose); + + /// Start event loop. +- myWindow.spin(); ++ myWindow.spinOnce(500, true); + } + + TEST(Viz, tutorial3_global_view) +--- a/modules/viz/test/test_viz3d.cpp ++++ b/modules/viz/test/test_viz3d.cpp +@@ -59,7 +59,7 @@ TEST(Viz_viz3d, DISABLED_develop) + //cv::Mat cloud = cv::viz::readCloud(get_dragon_ply_file_path()); + //---->>>>> + +- viz.spin(); ++ viz.spinOnce(500, true); + } + + }} // namespace +--- a/modules/viz/test/tests_simple.cpp ++++ b/modules/viz/test/tests_simple.cpp +@@ -56,7 +56,7 @@ TEST(Viz, show_cloud_bluberry) + viz.showWidget("dragon", WCloud(dragon_cloud, Color::bluberry()), pose); + + viz.showWidget("text2d", WText("Bluberry cloud", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_cloud_random_color) +@@ -73,7 +73,7 @@ TEST(Viz, show_cloud_random_color) + viz.showWidget("coosys", WCoordinateSystem()); + viz.showWidget("dragon", WCloud(dragon_cloud, colors), pose); + viz.showWidget("text2d", WText("Random color cloud", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_cloud_masked) +@@ -91,7 +91,7 @@ TEST(Viz, show_cloud_masked) + viz.showWidget("coosys", WCoordinateSystem()); + viz.showWidget("dragon", WCloud(dragon_cloud), pose); + viz.showWidget("text2d", WText("Nan masked cloud", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_cloud_collection) +@@ -109,7 +109,7 @@ TEST(Viz, show_cloud_collection) + viz.showWidget("coosys", WCoordinateSystem()); + viz.showWidget("ccol", ccol); + viz.showWidget("text2d", WText("Cloud collection", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_painted_clouds) +@@ -124,7 +124,7 @@ TEST(Viz, show_painted_clouds) + viz.showWidget("cloud3", WPaintedCloud(cloud, Vec3d(0.0, 0.0, -1.0), Vec3d(0.0, 0.0, 1.0), Color::blue(), Color::red())); + viz.showWidget("arrow", WArrow(Vec3d(0.0, 1.0, -1.0), Vec3d(0.0, 1.0, 1.0), 0.009, Color::raspberry())); + viz.showWidget("text2d", WText("Painted clouds", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_mesh) +@@ -137,7 +137,7 @@ TEST(Viz, show_mesh) + viz.showWidget("coosys", WCoordinateSystem()); + viz.showWidget("mesh", WMesh(mesh), pose); + viz.showWidget("text2d", WText("Just mesh", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_mesh_random_colors) +@@ -152,7 +152,7 @@ TEST(Viz, show_mesh_random_colors) + viz.showWidget("mesh", WMesh(mesh), pose); + viz.setRenderingProperty("mesh", SHADING, SHADING_PHONG); + viz.showWidget("text2d", WText("Random color mesh", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_widget_merger) +@@ -173,7 +173,7 @@ TEST(Viz, show_widget_merger) + viz.showWidget("coo", WCoordinateSystem()); + viz.showWidget("merger", merger); + viz.showWidget("text2d", WText("Widget merger", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_textured_mesh) +@@ -210,7 +210,7 @@ TEST(Viz, show_textured_mesh) + viz.showWidget("mesh", WMesh(mesh)); + viz.setRenderingProperty("mesh", SHADING, SHADING_PHONG); + viz.showWidget("text2d", WText("Textured mesh", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_polyline) +@@ -229,7 +229,7 @@ TEST(Viz, show_polyline) + viz.showWidget("polyline", WPolyLine(polyline, colors)); + viz.showWidget("coosys", WCoordinateSystem()); + viz.showWidget("text2d", WText("Polyline", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_sampled_normals) +@@ -244,7 +244,7 @@ TEST(Viz, show_sampled_normals) + viz.showWidget("normals", WCloudNormals(mesh.cloud, mesh.normals, 30, 0.1f, Color::green()), pose); + viz.setRenderingProperty("normals", LINE_WIDTH, 2.0); + viz.showWidget("text2d", WText("Cloud or mesh normals", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_cloud_shaded_by_normals) +@@ -260,7 +260,7 @@ TEST(Viz, show_cloud_shaded_by_normals) + Viz3d viz("show_cloud_shaded_by_normals"); + viz.showWidget("cloud", cloud, pose); + viz.showWidget("text2d", WText("Cloud shaded by normals", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_trajectories) +@@ -287,15 +287,15 @@ TEST(Viz, show_trajectories) + viz.showWidget("text2d", WText("Different kinds of supported trajectories", Point(20, 20), 20, Color::green())); + + int i = 0; +- while(!viz.wasStopped()) ++ for(unsigned num = 0; num < 50; ++num) + { + double a = --i % 360; + Vec3d pose(sin(a * CV_PI/180), 0.7, cos(a * CV_PI/180)); + viz.setViewerPose(makeCameraPose(pose * 7.5, Vec3d(0.0, 0.5, 0.0), Vec3d(0.0, 0.1, 0.0))); +- viz.spinOnce(20, true); ++ viz.spinOnce(100, true); + } + viz.resetCamera(); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_trajectory_reposition) +@@ -306,7 +306,7 @@ TEST(Viz, show_trajectory_reposition) + viz.showWidget("coos", WCoordinateSystem()); + viz.showWidget("sub3", WTrajectory(Mat(path).rowRange(0, (int)path.size()/3), WTrajectory::BOTH, 0.2, Color::brown()), path.front().inv()); + viz.showWidget("text2d", WText("Trajectory resposition to origin", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_camera_positions) +@@ -330,7 +330,7 @@ TEST(Viz, show_camera_positions) + viz.showWidget("pos3", WCameraPosition(0.75), poses[1]); + viz.showWidget("pos4", WCameraPosition(K, gray, 3, Color::indigo()), poses[1]); + viz.showWidget("text2d", WText("Camera positions with images", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_overlay_image) +@@ -353,16 +353,16 @@ TEST(Viz, show_overlay_image) + viz.showWidget("text2d", WText("Overlay images", Point(20, 20), 20, Color::green())); + + int i = 0; +- while(!viz.wasStopped()) ++ for(unsigned num = 0; num < 50; ++num) + { + double a = ++i % 360; + Vec3d pose(sin(a * CV_PI/180), 0.7, cos(a * CV_PI/180)); + viz.setViewerPose(makeCameraPose(pose * 3, Vec3d(0.0, 0.5, 0.0), Vec3d(0.0, 0.1, 0.0))); + viz.getWidget("img1").cast().setImage(lena * pow(sin(i*10*CV_PI/180) * 0.5 + 0.5, 1.0)); +- viz.spinOnce(1, true); ++ viz.spinOnce(100, true); + } + viz.showWidget("text2d", WText("Overlay images (stopped)", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + +@@ -376,7 +376,7 @@ TEST(Viz, show_image_method) + viz.showImage(lena, lena.size()); + viz.spinOnce(1500, true); + +- cv::viz::imshow("show_image_method", make_gray(lena)).spin(); ++ cv::viz::imshow("show_image_method", make_gray(lena)).spinOnce(500, true); + } + + TEST(Viz, show_image_3d) +@@ -398,13 +398,13 @@ TEST(Viz, show_image_3d) + viz.showWidget("text2d", WText("Images in 3D", Point(20, 20), 20, Color::green())); + + int i = 0; +- while(!viz.wasStopped()) ++ for(unsigned num = 0; num < 50; ++num) + { + viz.getWidget("img0").cast().setImage(lena * pow(sin(i++*7.5*CV_PI/180) * 0.5 + 0.5, 1.0)); +- viz.spinOnce(1, true); ++ viz.spinOnce(100, true); + } + viz.showWidget("text2d", WText("Images in 3D (stopped)", Point(20, 20), 20, Color::green())); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_simple_widgets) +@@ -431,10 +431,10 @@ TEST(Viz, show_simple_widgets) + + viz.showWidget("grid1", WGrid(Vec2i(7,7), Vec2d::all(0.75), Color::gray()), Affine3d().translate(Vec3d(0.0, 0.0, -1.0))); + +- viz.spin(); ++ viz.spinOnce(500, true); + viz.getWidget("text2d").cast().setText("Different simple widgets (updated)"); + viz.getWidget("text3d").cast().setText("Updated text 3D"); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + TEST(Viz, show_follower) +@@ -446,9 +446,9 @@ TEST(Viz, show_follower) + viz.showWidget("t3d_2", WText3D("Simple 3D follower", Point3d(-0.5, -0.5, 0.5), 0.125, true, Color::green())); + viz.showWidget("text2d", WText("Follower: text always facing camera", Point(20, 20), 20, Color::green())); + viz.setBackgroundMeshLab(); +- viz.spin(); ++ viz.spinOnce(500, true); + viz.getWidget("t3d_2").cast().setText("Updated follower 3D"); +- viz.spin(); ++ viz.spinOnce(500, true); + } + + }} // namespace diff --git a/externals/vcpkg/ports/opencv3/0006-fix-uwp.patch b/externals/vcpkg/ports/opencv3/0006-fix-uwp.patch new file mode 100755 index 000000000..cc0216b16 --- /dev/null +++ b/externals/vcpkg/ports/opencv3/0006-fix-uwp.patch @@ -0,0 +1,11 @@ +--- a/cmake/OpenCVModule.cmake ++++ b/cmake/OpenCVModule.cmake +@@ -1188,7 +1188,7 @@ function(ocv_add_perf_tests) + set_target_properties(${the_target} PROPERTIES FOLDER "tests performance") + endif() + +- if(WINRT) ++ if(WINRT AND BUILD_TESTS) + # removing APPCONTAINER from tests to run from console + # look for detailed description inside of ocv_create_module macro above + add_custom_command(TARGET "opencv_perf_${name}" diff --git a/externals/vcpkg/ports/opencv3/0007-fix-hdf5.patch b/externals/vcpkg/ports/opencv3/0007-fix-hdf5.patch new file mode 100755 index 000000000..8e7e154ad --- /dev/null +++ b/externals/vcpkg/ports/opencv3/0007-fix-hdf5.patch @@ -0,0 +1,28 @@ +--- a/modules/hdf/CMakeLists.txt ++++ b/modules/hdf/CMakeLists.txt +@@ -1,25 +1,8 @@ + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}) + +-if(WIN32) +- # windows cmake internal lookups are broken for now +- # will lookup for headers and shared libs given HDF_DIR env +- find_path(HDF5_INCLUDE_DIRS hdf5.h HINTS "$ENV{HDF5_DIR}\\..\\include") +- find_library(HDF5_C_LIBRARY NAMES hdf5 HINTS "$ENV{HDF5_DIR}\\..\\lib") +- if(HDF5_INCLUDE_DIRS AND HDF5_C_LIBRARY) +- set(HDF5_FOUND "YES") +- set(HDF5_LIBRARIES ${HDF5_C_LIBRARY}) +- mark_as_advanced(HDF5_LIBRARIES) +- mark_as_advanced(HDF5_C_LIBRARY) +- mark_as_advanced(HDF5_INCLUDE_DIRS) +- add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB -D_HDF5USEDLL_) +- else() +- set(HDF5_FOUND "NO") +- endif() +-else() + if(NOT CMAKE_CROSSCOMPILING) # iOS build should not reuse OSX package + find_package(HDF5) + endif() +-endif() + + if(NOT HDF5_FOUND) + ocv_module_disable(hdf) # no return diff --git a/externals/vcpkg/ports/opencv3/0008-devendor-quirc.patch b/externals/vcpkg/ports/opencv3/0008-devendor-quirc.patch new file mode 100755 index 000000000..76803851b --- /dev/null +++ b/externals/vcpkg/ports/opencv3/0008-devendor-quirc.patch @@ -0,0 +1,22 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -778,7 +778,7 @@ if(WITH_OPENVX) + endif() + + if(WITH_QUIRC) +- add_subdirectory(3rdparty/quirc) ++ find_package(quirc CONFIG REQUIRED) + set(HAVE_QUIRC TRUE) + endif() + # ---------------------------------------------------------------------------- +--- a/modules/objdetect/CMakeLists.txt ++++ b/modules/objdetect/CMakeLists.txt +@@ -2,7 +2,5 @@ set(the_description "Object Detection") + ocv_define_module(objdetect opencv_core opencv_imgproc opencv_calib3d WRAP java python js) + + if(HAVE_QUIRC) +- get_property(QUIRC_INCLUDE GLOBAL PROPERTY QUIRC_INCLUDE_DIR) +- ocv_include_directories(${QUIRC_INCLUDE}) +- ocv_target_link_libraries(${the_module} quirc) ++ ocv_target_link_libraries(${the_module} quirc::quirc) + endif() diff --git a/externals/vcpkg/ports/opencv3/0009-fix-protobuf.patch b/externals/vcpkg/ports/opencv3/0009-fix-protobuf.patch new file mode 100755 index 000000000..38572e309 --- /dev/null +++ b/externals/vcpkg/ports/opencv3/0009-fix-protobuf.patch @@ -0,0 +1,26 @@ +--- a/cmake/OpenCVFindProtobuf.cmake ++++ b/cmake/OpenCVFindProtobuf.cmake +@@ -31,7 +31,7 @@ if(BUILD_PROTOBUF) + set(HAVE_PROTOBUF TRUE) + else() + unset(Protobuf_VERSION CACHE) +- find_package(Protobuf QUIET) ++ find_package(Protobuf CONFIG REQUIRED) + + # Backwards compatibility + # Define camel case versions of input variables +@@ -76,6 +76,7 @@ if(HAVE_PROTOBUF) + if(NOT BUILD_PROTOBUF) + if(TARGET "${Protobuf_LIBRARIES}") + get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION_RELEASE) ++ get_target_property(__location_debug "${Protobuf_LIBRARIES}" IMPORTED_LOCATION_DEBUG) + if(NOT __location) + get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION) + endif() +@@ -87,5 +88,5 @@ if(HAVE_PROTOBUF) + endif() + list(APPEND CUSTOM_STATUS_protobuf " Protobuf:" + BUILD_PROTOBUF THEN "build (${Protobuf_VERSION})" +- ELSE "${__location} (${Protobuf_VERSION})") ++ ELSE "optimized ${__location} debug ${__location_debug} ; version (${Protobuf_VERSION})") + endif() diff --git a/externals/vcpkg/ports/opencv3/0010-fix-uwp-tiff-imgcodecs.patch b/externals/vcpkg/ports/opencv3/0010-fix-uwp-tiff-imgcodecs.patch new file mode 100755 index 000000000..0bd3d701b --- /dev/null +++ b/externals/vcpkg/ports/opencv3/0010-fix-uwp-tiff-imgcodecs.patch @@ -0,0 +1,13 @@ +--- a/modules/imgcodecs/CMakeLists.txt ++++ b/modules/imgcodecs/CMakeLists.txt +@@ -9,6 +9,10 @@ ocv_add_module(imgcodecs opencv_imgproc WRAP java objc python) + + ocv_clear_vars(GRFMT_LIBS) + ++if(MSVC) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996") ++endif() ++ + if(HAVE_WINRT_CX AND NOT WINRT) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW") + endif() diff --git a/externals/vcpkg/ports/opencv3/0011-remove-python2.patch b/externals/vcpkg/ports/opencv3/0011-remove-python2.patch new file mode 100755 index 000000000..bee0faa87 --- /dev/null +++ b/externals/vcpkg/ports/opencv3/0011-remove-python2.patch @@ -0,0 +1,18 @@ +--- a/cmake/OpenCVDetectPython.cmake ++++ b/cmake/OpenCVDetectPython.cmake +@@ -268,15 +268,6 @@ if(OPENCV_PYTHON_SKIP_DETECTION) + return() + endif() + +-find_python("" "${MIN_VER_PYTHON2}" PYTHON2_LIBRARY PYTHON2_INCLUDE_DIR +- PYTHON2INTERP_FOUND PYTHON2_EXECUTABLE PYTHON2_VERSION_STRING +- PYTHON2_VERSION_MAJOR PYTHON2_VERSION_MINOR PYTHON2LIBS_FOUND +- PYTHON2LIBS_VERSION_STRING PYTHON2_LIBRARIES PYTHON2_LIBRARY +- PYTHON2_DEBUG_LIBRARIES PYTHON2_LIBRARY_DEBUG PYTHON2_INCLUDE_PATH +- PYTHON2_INCLUDE_DIR PYTHON2_INCLUDE_DIR2 PYTHON2_PACKAGES_PATH +- PYTHON2_NUMPY_INCLUDE_DIRS PYTHON2_NUMPY_VERSION) +- +-option(OPENCV_PYTHON3_VERSION "Python3 version" "") + find_python("${OPENCV_PYTHON3_VERSION}" "${MIN_VER_PYTHON3}" PYTHON3_LIBRARY PYTHON3_INCLUDE_DIR + PYTHON3INTERP_FOUND PYTHON3_EXECUTABLE PYTHON3_VERSION_STRING + PYTHON3_VERSION_MAJOR PYTHON3_VERSION_MINOR PYTHON3LIBS_FOUND diff --git a/externals/vcpkg/ports/opencv3/0012-fix-zlib.patch b/externals/vcpkg/ports/opencv3/0012-fix-zlib.patch new file mode 100755 index 000000000..7f01dabf3 --- /dev/null +++ b/externals/vcpkg/ports/opencv3/0012-fix-zlib.patch @@ -0,0 +1,14 @@ +diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake +index 6dbeca9..08e2f4a 100644 +--- a/cmake/OpenCVFindLibsGrfmt.cmake ++++ b/cmake/OpenCVFindLibsGrfmt.cmake +@@ -5,6 +5,9 @@ + # --- zlib (required) --- + if(BUILD_ZLIB) + ocv_clear_vars(ZLIB_FOUND) ++elseif(1) ++ ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) ++ find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED) + else() + ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) + if(ANDROID) diff --git a/externals/vcpkg/ports/opencv3/portfile.cmake b/externals/vcpkg/ports/opencv3/portfile.cmake new file mode 100755 index 000000000..1cf7c930c --- /dev/null +++ b/externals/vcpkg/ports/opencv3/portfile.cmake @@ -0,0 +1,500 @@ +if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv2") + message(FATAL_ERROR "OpenCV 2 is installed, please uninstall and try again:\n vcpkg remove opencv2") +endif() + +if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv4") + message(FATAL_ERROR "OpenCV 4 is installed, please uninstall and try again:\n vcpkg remove opencv4") +endif() + +file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents) +string(JSON OPENCV_VERSION GET "${_contents}" version) + +set(USE_QT_VERSION "5") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO opencv/opencv + REF ${OPENCV_VERSION} + SHA512 2fa9243625309a1c12c916737c94f0e2f9566f0828469b148cc1683dd1b8db8d1d58f90a36cfcaa72052964a718929451f04cda5361d8b546a63da69217d040a + HEAD_REF master + PATCHES + 0001-disable-downloading.patch + 0002-install-options.patch + 0003-force-package-requirements.patch + 0004-fix-eigen.patch + 0005-fix-vtk9.patch + 0006-fix-uwp.patch + 0008-devendor-quirc.patch + 0009-fix-protobuf.patch + 0010-fix-uwp-tiff-imgcodecs.patch + 0011-remove-python2.patch + 0012-fix-zlib.patch +) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(TARGET_IS_AARCH64 1) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(TARGET_IS_ARM 1) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(TARGET_IS_X86_64 1) +else() + set(TARGET_IS_X86 1) +endif() + +file(REMOVE "${SOURCE_PATH}/cmake/FindCUDNN.cmake") + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "contrib" WITH_CONTRIB + "cuda" WITH_CUBLAS + "cuda" WITH_CUDA + "dnn" BUILD_opencv_dnn + "eigen" WITH_EIGEN + "ffmpeg" WITH_FFMPEG + "flann" BUILD_opencv_flann + "gdcm" WITH_GDCM + "gstreamer" WITH_GSTREAMER + "halide" WITH_HALIDE + "jasper" WITH_JASPER + "jpeg" WITH_JPEG + "lapack" WITH_LAPACK + "nonfree" OPENCV_ENABLE_NONFREE + "openexr" WITH_OPENEXR + "opengl" WITH_OPENGL + "png" WITH_PNG + "quirc" WITH_QUIRC + "sfm" BUILD_opencv_sfm + "tiff" WITH_TIFF + "vtk" WITH_VTK + "webp" WITH_WEBP + "world" BUILD_opencv_world + "dc1394" WITH_1394 +) + +# Cannot use vcpkg_check_features() for "dnn", "gtk", "ipp", ovis", "python", "qt", "tbb" +set(BUILD_opencv_dnn OFF) +if("dnn" IN_LIST FEATURES) + if(NOT VCPKG_TARGET_IS_ANDROID) + set(BUILD_opencv_dnn ON) + else() + message(WARNING "The dnn module cannot be enabled on Android") + endif() +endif() + +set(WITH_GTK OFF) +if("gtk" IN_LIST FEATURES) + if(VCPKG_TARGET_IS_LINUX) + set(WITH_GTK ON) + else() + message(WARNING "The gtk module cannot be enabled outside Linux") + endif() +endif() + +set(WITH_QT OFF) +if("qt" IN_LIST FEATURES) + set(WITH_QT ${USE_QT_VERSION}) +endif() + +set(WITH_IPP OFF) +if("ipp" IN_LIST FEATURES) + set(WITH_IPP ON) +endif() + +set(BUILD_opencv_ovis OFF) +if("ovis" IN_LIST FEATURES) + set(BUILD_opencv_ovis ON) +endif() + +set(WITH_TBB OFF) +if("tbb" IN_LIST FEATURES) + set(WITH_TBB ON) +endif() + +set(WITH_PYTHON OFF) +if("python" IN_LIST FEATURES) + x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES numpy OUT_PYTHON_VAR "PYTHON3") + set(ENV{PYTHON} "${PYTHON3}") + set(WITH_PYTHON ON) +endif() + +if("dnn" IN_LIST FEATURES) + vcpkg_download_distfile(TINYDNN_ARCHIVE + URLS "https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz" + FILENAME "opencv-cache/tiny_dnn/adb1c512e09ca2c7a6faef36f9c53e59-v1.0.0a3.tar.gz" + SHA512 5f2c1a161771efa67e85b1fea395953b7744e29f61187ac5a6c54c912fb195b3aef9a5827135c3668bd0eeea5ae04a33cc433e1f6683e2b7955010a2632d168b + ) +endif() + +# Build image quality module when building with 'contrib' feature and not UWP. +set(BUILD_opencv_quality OFF) +if("contrib" IN_LIST FEATURES) + if (VCPKG_TARGET_IS_UWP) + set(BUILD_opencv_quality OFF) + message(WARNING "The image quality module (quality) does not build for UWP, the module has been disabled.") + # The hdf module is silently disabled by OpenCVs buildsystem if HDF5 is not detected. + message(WARNING "The hierarchical data format module (hdf) depends on HDF5 which doesn't support UWP, the module has been disabled.") + else() + set(BUILD_opencv_quality CMAKE_DEPENDS_IN_PROJECT_ONLY) + endif() + + vcpkg_from_github( + OUT_SOURCE_PATH CONTRIB_SOURCE_PATH + REPO opencv/opencv_contrib + REF ${OPENCV_VERSION} + SHA512 31bd55617d3a54fa020d4255e463c90caf41e10136c82a05c24ee19890f0cdc4fc049136874841dc84037dedb0562471ea0345ab1dcd5ad8a5b0218f24ae9a35 + HEAD_REF master + PATCHES + 0007-fix-hdf5.patch + ) + set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") + + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/8afa57abc8229d611c4937165d20e2a2d9fc5a12/face_landmark_model.dat" + FILENAME "opencv-cache/data/7505c44ca4eb54b4ab1e4777cb96ac05-face_landmark_model.dat" + SHA512 c16e60a6c4bb4de3ab39b876ae3c3f320ea56f69c93e9303bd2dff8760841dcd71be4161fff8bc71e8fe4fe8747fa8465d49d6bd8f5ebcdaea161f4bc2da7c93 + ) + + function(download_opencv_3rdparty ID COMMIT HASH) + if(NOT EXISTS "${DOWNLOADS}/opencv-cache/${ID}/${COMMIT}.stamp") + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://github.com/opencv/opencv_3rdparty/archive/${COMMIT}.zip" + FILENAME "opencv_3rdparty-${COMMIT}.zip" + SHA512 ${HASH} + ) + vcpkg_extract_source_archive(extracted_ocv ARCHIVE "${OCV_DOWNLOAD}") + file(MAKE_DIRECTORY "${DOWNLOADS}/opencv-cache/${ID}") + file(GLOB XFEATURES2D_I "${extracted_ocv}/*") + foreach(FILE ${XFEATURES2D_I}) + file(COPY ${FILE} DESTINATION "${DOWNLOADS}/opencv-cache/${ID}") + get_filename_component(XFEATURES2D_I_NAME "${FILE}" NAME) + file(MD5 "${FILE}" FILE_HASH) + file(RENAME "${DOWNLOADS}/opencv-cache/${ID}/${XFEATURES2D_I_NAME}" "${DOWNLOADS}/opencv-cache/${ID}/${FILE_HASH}-${XFEATURES2D_I_NAME}") + endforeach() + file(WRITE "${DOWNLOADS}/opencv-cache/${ID}/${COMMIT}.stamp") + endif() + endfunction() + + # Used for opencv's xfeature2d module + download_opencv_3rdparty( + xfeatures2d/boostdesc + 34e4206aef44d50e6bbcd0ab06354b52e7466d26 + 2ccdc8fb59da55eabc73309a80a4d3b1e73e2341027cdcdd2d714e0f519e60f243f38f79b13ed3de32f595aa23e4f86418eed42e741f32a81b1e6e0879190601 + ) + + # Used for opencv's xfeature2d module + download_opencv_3rdparty( + xfeatures2d/vgg + fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d + 7051f5d6ccb938d296b919dd6d5dcddc5afb527aed456639c9984276a8f64565c084d96a72499a7756f127f8d2b1ce9ab70e4cbb3f89c4e16f82296c2a15daed + ) +endif() + +if(WITH_IPP) + if(VCPKG_TARGET_IS_OSX) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_mac_intel64_20191018_general.tgz" + FILENAME "opencv-cache/ippicv/1c3d675c2a2395d094d523024896e01b-ippicv_2020_mac_intel64_20191018_general.tgz" + SHA512 454dfaaa245e3a3b2f1ffb1aa8e27e280b03685009d66e147482b14e5796fdf2d332cac0f9b0822caedd5760fda4ee0ce2961889597456bbc18202f10bf727cd + ) + else() + message(WARNING "This target architecture is not supported IPPICV") + set(WITH_IPP OFF) + endif() + elseif(VCPKG_TARGET_IS_LINUX) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_lnx_intel64_20191018_general.tgz" + FILENAME "opencv-cache/ippicv/7421de0095c7a39162ae13a6098782f9-ippicv_2020_lnx_intel64_20191018_general.tgz" + SHA512 de6d80695cd6deef359376476edc4ff85fdddcf94972b936e0017f8a48aaa5d18f55c4253ae37deb83bff2f71410f68408063c88b5f3bf4df3c416aa93ceca87 + ) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_lnx_ia32_20191018_general.tgz" + FILENAME "opencv-cache/ippicv/ad189a940fb60eb71f291321322fe3e8-ippicv_2020_lnx_ia32_20191018_general.tgz" + SHA512 5ca9dafc3a634e2a5f83f6a498611c990ef16d54358e9b44574b01694e9d64b118d46d6e2011506e40d37e5a9865f576f790e37ff96b7c8b503507633631a296 + ) + else() + message(WARNING "This target architecture is not supported IPPICV") + set(WITH_IPP OFF) + endif() + elseif(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_win_intel64_20191018_general.zip" + FILENAME "opencv-cache/ippicv/879741a7946b814455eee6c6ffde2984-ippicv_2020_win_intel64_20191018_general.zip" + SHA512 50c4af4b7fe2161d652264230389dad2330e8c95b734d04fb7565bffdab855c06d43085e480da554c56b04f8538087d49503538d5943221ee2a772ee7be4c93c + ) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_win_ia32_20191018_general.zip" + FILENAME "opencv-cache/ippicv/cd39bdf0c2e1cac9a61101dad7a2413e-ippicv_2020_win_ia32_20191018_general.zip" + SHA512 058d00775d9f16955c7a557d554b8c2976ab9dbad4ba3fdb9823c0f768809edbd835e4397f01dc090a9bc80d81de834375e7006614d2a898f42e8004de0e04bf + ) + else() + message(WARNING "This target architecture is not supported IPPICV") + set(WITH_IPP OFF) + endif() + else() + message(WARNING "This target architecture is not supported IPPICV") + set(WITH_IPP OFF) + endif() +endif() + +set(WITH_MSMF ON) +if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) + set(WITH_MSMF OFF) +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + if (WITH_TBB) + message(WARNING "TBB is currently unsupported in this build configuration, turning it off") + set(WITH_TBB OFF) + endif() + + if (VCPKG_TARGET_IS_WINDOWS AND BUILD_opencv_ovis) + message(WARNING "OVIS is currently unsupported in this build configuration, turning it off") + set(BUILD_opencv_ovis OFF) + endif() +endif() + +if("ffmpeg" IN_LIST FEATURES) + if(VCPKG_TARGET_IS_UWP) + set(VCPKG_C_FLAGS "/sdl- ${VCPKG_C_FLAGS}") + set(VCPKG_CXX_FLAGS "/sdl- ${VCPKG_CXX_FLAGS}") + endif() +endif() + +if("qt" IN_LIST FEATURES) + list(APPEND ADDITIONAL_BUILD_FLAGS "-DCMAKE_AUTOMOC=ON") +endif() + +set(BUILD_opencv_line_descriptor ON) +set(BUILD_opencv_saliency ON) +set(BUILD_opencv_bgsegm ON) +if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm") + set(BUILD_opencv_line_descriptor OFF) + set(BUILD_opencv_saliency OFF) + set(BUILD_opencv_bgsegm OFF) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ###### opencv cpu recognition is broken, always using host and not target: here we bypass that + -DOPENCV_SKIP_SYSTEM_PROCESSOR_DETECTION=TRUE + -DAARCH64=${TARGET_IS_AARCH64} + -DX86_64=${TARGET_IS_X86_64} + -DX86=${TARGET_IS_X86} + -DARM=${TARGET_IS_ARM} + ###### ocv_options + -DOpenCV_INSTALL_BINARIES_PREFIX= + -DOPENCV_BIN_INSTALL_PATH=bin + -DOPENCV_INCLUDE_INSTALL_PATH=include + -DOPENCV_LIB_INSTALL_PATH=lib + -DOPENCV_3P_LIB_INSTALL_PATH=lib + -DOPENCV_CONFIG_INSTALL_PATH=share/opencv + -DINSTALL_TO_MANGLED_PATHS=OFF + -DOPENCV_FFMPEG_USE_FIND_PACKAGE=FFMPEG + -DOPENCV_FFMPEG_SKIP_BUILD_CHECK=TRUE + -DCMAKE_DEBUG_POSTFIX=d + -DOPENCV_DLLVERSION= + -DOPENCV_DEBUG_POSTFIX=d + -DOPENCV_GENERATE_SETUPVARS=OFF + # Do not build docs/examples + -DBUILD_DOCS=OFF + -DBUILD_EXAMPLES=OFF + ###### Disable build 3rd party libs + -DBUILD_JASPER=OFF + -DBUILD_JPEG=OFF + -DBUILD_OPENEXR=OFF + -DBUILD_PNG=OFF + -DBUILD_TIFF=OFF + -DBUILD_WEBP=OFF + -DBUILD_ZLIB=OFF + -DBUILD_TBB=OFF + -DBUILD_IPP_IW=OFF + -DBUILD_ITT=OFF + ###### Disable build 3rd party components + -DBUILD_PROTOBUF=OFF + ###### OpenCV Build components + -DBUILD_opencv_apps=OFF + -DBUILD_opencv_bgsegm=${BUILD_opencv_bgsegm} + -DBUILD_opencv_line_descriptor=${BUILD_opencv_line_descriptor} + -DBUILD_opencv_saliency=${BUILD_opencv_saliency} + -DBUILD_ANDROID_PROJECT=OFF + -DBUILD_ANDROID_EXAMPLES=OFF + -DBUILD_PACKAGE=OFF + -DBUILD_PERF_TESTS=OFF + -DBUILD_TESTS=OFF + -DBUILD_WITH_DEBUG_INFO=ON + -DBUILD_WITH_STATIC_CRT=${BUILD_WITH_STATIC_CRT} + -DBUILD_JAVA=OFF + -DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR} + ###### PROTOBUF + -DPROTOBUF_UPDATE_FILES=${BUILD_opencv_flann} + -DUPDATE_PROTO_FILES=${BUILD_opencv_flann} + ###### PYLINT/FLAKE8 + -DENABLE_PYLINT=OFF + -DENABLE_FLAKE8=OFF + # CMAKE + -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON + -DCMAKE_DISABLE_FIND_PACKAGE_JNI=ON + # ENABLE + -DENABLE_CXX11=ON + ###### OPENCV vars + "-DOPENCV_DOWNLOAD_PATH=${DOWNLOADS}/opencv-cache" + ${BUILD_WITH_CONTRIB_FLAG} + -DOPENCV_OTHER_INSTALL_PATH=share/opencv + ###### customized properties + ## Options from vcpkg_check_features() + ${FEATURE_OPTIONS} + -DCMAKE_DISABLE_FIND_PACKAGE_Halide=ON + -DHALIDE_ROOT_DIR=${CURRENT_INSTALLED_DIR} + -DWITH_GTK=${WITH_GTK} + -DWITH_QT=${WITH_QT} + -DWITH_IPP=${WITH_IPP} + -DWITH_MATLAB=OFF + -DWITH_MSMF=${WITH_MSMF} + -DWITH_OPENMP=OFF + -DWITH_PROTOBUF=${BUILD_opencv_flann} + -DWITH_PYTHON=${WITH_PYTHON} + -DWITH_OPENCLAMDBLAS=OFF + -DWITH_TBB=${WITH_TBB} + -DWITH_OPENJPEG=OFF + -DWITH_CPUFEATURES=OFF + ###### BUILD_options (mainly modules which require additional libraries) + -DBUILD_opencv_ovis=${BUILD_opencv_ovis} + -DBUILD_opencv_dnn=${BUILD_opencv_dnn} + ###### The following modules are disabled for UWP + -DBUILD_opencv_quality=${BUILD_opencv_quality} + ###### Additional build flags + ${ADDITIONAL_BUILD_FLAGS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME opencv CONFIG_PATH "share/opencv") +vcpkg_copy_pdbs() + +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + # Update debug paths for libs in Android builds (e.g. sdk/native/staticlibs/armeabi-v7a) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules-debug.cmake" + "\${_IMPORT_PREFIX}/sdk" + "\${_IMPORT_PREFIX}/debug/sdk" + ) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES) + set(DEPS_STRING "include(CMakeFindDependencyMacro) +if(${BUILD_opencv_flann}) + find_dependency(Protobuf CONFIG REQUIRED) + if(TARGET protobuf::libprotobuf) + add_library (libprotobuf INTERFACE IMPORTED) + set_target_properties(libprotobuf PROPERTIES + INTERFACE_LINK_LIBRARIES protobuf::libprotobuf + ) + else() + add_library (libprotobuf UNKNOWN IMPORTED) + set_target_properties(libprotobuf PROPERTIES + IMPORTED_LOCATION \"${Protobuf_LIBRARY}\" + INTERFACE_INCLUDE_DIRECTORIES \"${Protobuf_INCLUDE_DIR}\" + INTERFACE_SYSTEM_INCLUDE_DIRECTORIES \"${Protobuf_INCLUDE_DIR}\" + ) + endif() +endif() +find_dependency(Threads)") + if("tiff" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(TIFF)") + endif() + if("cuda" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(CUDA)") + endif() + if(BUILD_opencv_quality) + string(APPEND DEPS_STRING " +# C language is required for try_compile tests in FindHDF5 +enable_language(C) +find_dependency(HDF5) +find_dependency(Tesseract)") + endif() + if(WITH_TBB) + string(APPEND DEPS_STRING "\nfind_dependency(TBB)") + endif() + if("vtk" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(VTK)") + endif() + if("sfm" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(gflags CONFIG)\nfind_dependency(Ceres CONFIG)") + endif() + if("eigen" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(Eigen3 CONFIG)") + endif() + if("lapack" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(LAPACK)") + endif() + if("openexr" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(OpenEXR CONFIG)") + endif() + if(WITH_OPENMP) + string(APPEND DEPS_STRING "\nfind_dependency(OpenMP)") + endif() + if(BUILD_opencv_ovis) + string(APPEND DEPS_STRING "\nfind_dependency(Ogre)\nfind_dependency(Freetype)") + endif() + if("quirc" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(quirc)") + endif() + if("qt" IN_LIST FEATURES) + string(APPEND DEPS_STRING " +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) +find_dependency(Qt${USE_QT_VERSION} COMPONENTS Core Gui Widgets Test Concurrent)") + if("opengl" IN_LIST FEATURES) + string(APPEND DEPS_STRING " +find_dependency(Qt${USE_QT_VERSION} COMPONENTS OpenGL)") + endif() + endif() + if("ade" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(ade)") + endif() + if("gdcm" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(GDCM)") + endif() + + string(REPLACE "set(CMAKE_IMPORT_FILE_VERSION 1)" + "set(CMAKE_IMPORT_FILE_VERSION 1)\n${DEPS_STRING}" OPENCV_MODULES "${OPENCV_MODULES}") + + if(WITH_OPENMP) + string(REPLACE "set_target_properties(opencv_core PROPERTIES + INTERFACE_LINK_LIBRARIES \"" + "set_target_properties(opencv_core PROPERTIES + INTERFACE_LINK_LIBRARIES \"\$;" OPENCV_MODULES "${OPENCV_MODULES}") + endif() + + if(BUILD_opencv_ovis) + string(REPLACE "OgreGLSupportStatic" + "OgreGLSupport" OPENCV_MODULES "${OPENCV_MODULES}") + endif() + + file(WRITE "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" "${OPENCV_MODULES}") + + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE") + +if(VCPKG_TARGET_IS_ANDROID) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/README.android") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/README.android") +endif() + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/opencv3/vcpkg.json b/externals/vcpkg/ports/opencv3/vcpkg.json new file mode 100755 index 000000000..ee4b94274 --- /dev/null +++ b/externals/vcpkg/ports/opencv3/vcpkg.json @@ -0,0 +1,278 @@ +{ + "name": "opencv3", + "version": "3.4.16", + "port-version": 9, + "description": "Open Source Computer Vision Library", + "homepage": "https://github.com/opencv/opencv", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + { + "name": "vcpkg-get-python-packages", + "host": true + }, + "zlib" + ], + "default-features": [ + "default-features" + ], + "features": { + "contrib": { + "description": "opencv_contrib module", + "dependencies": [ + { + "name": "hdf5", + "platform": "!uwp & !(windows & (arm | arm64))" + }, + { + "name": "opencv3", + "features": [ + "dnn" + ] + }, + { + "name": "tesseract", + "platform": "!uwp & !(windows & (arm | arm64))" + } + ] + }, + "cuda": { + "description": "CUDA support for opencv", + "dependencies": [ + "cuda", + "cudnn", + { + "name": "opencv3", + "features": [ + "contrib" + ] + } + ] + }, + "dc1394": { + "description": "Dc1394 support for opencv", + "dependencies": [ + "libdc1394" + ] + }, + "default-features": { + "description": "Platform-dependent default features", + "dependencies": [ + { + "name": "opencv3", + "default-features": false, + "features": [ + "dnn", + "jpeg", + "png", + "quirc", + "tiff", + "webp" + ] + }, + { + "name": "opencv3", + "default-features": false, + "features": [ + "gtk" + ], + "platform": "linux" + } + ] + }, + "dnn": { + "description": "Enable dnn module", + "dependencies": [ + { + "name": "opencv3", + "features": [ + "flann" + ] + } + ] + }, + "eigen": { + "description": "Eigen support for opencv", + "dependencies": [ + "eigen3" + ] + }, + "ffmpeg": { + "description": "ffmpeg support for opencv", + "dependencies": [ + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "avcodec", + "avformat", + "swresample", + "swscale" + ] + } + ] + }, + "flann": { + "description": "opencv_flann module", + "dependencies": [ + "protobuf" + ] + }, + "gdcm": { + "description": "GDCM support for opencv", + "dependencies": [ + "gdcm" + ] + }, + "gstreamer": { + "description": "gstreamer support for opencv", + "dependencies": [ + "gstreamer" + ] + }, + "gtk": { + "description": "GTK support for opencv", + "dependencies": [ + "gtk" + ] + }, + "halide": { + "description": "Halide support for opencv", + "dependencies": [ + "halide", + { + "name": "opencv3", + "default-features": false + }, + { + "name": "opencv3", + "features": [ + "dnn" + ] + } + ] + }, + "ipp": { + "description": "Enable Intel Integrated Performance Primitives" + }, + "jasper": { + "description": "JPEG 2000 support for opencv", + "dependencies": [ + "jasper" + ] + }, + "jpeg": { + "description": "JPEG support for opencv", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "lapack": { + "description": "LAPACK support for opencv", + "dependencies": [ + "blas", + "lapack" + ] + }, + "nonfree": { + "description": "allow nonfree and unredistributable libraries" + }, + "openexr": { + "description": "OpenEXR support for opencv", + "dependencies": [ + "openexr" + ] + }, + "opengl": { + "description": "opengl support for opencv", + "dependencies": [ + "opengl" + ] + }, + "ovis": { + "description": "opencv_ovis module", + "dependencies": [ + "ogre", + { + "name": "opencv3", + "features": [ + "contrib" + ] + } + ] + }, + "png": { + "description": "PNG support for opencv", + "dependencies": [ + "libpng" + ] + }, + "python": { + "description": "Python wrapper support for opencv" + }, + "qt": { + "description": "Qt GUI support for opencv", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] + }, + "quirc": { + "description": "Enable QR code module", + "dependencies": [ + "quirc" + ] + }, + "sfm": { + "description": "opencv_sfm module", + "dependencies": [ + "ceres", + "eigen3", + "gflags", + "glog", + { + "name": "opencv3", + "features": [ + "contrib" + ] + } + ] + }, + "tbb": { + "description": "Enable Intel Threading Building Blocks", + "dependencies": [ + "tbb" + ] + }, + "tiff": { + "description": "TIFF support for opencv", + "dependencies": [ + "tiff" + ] + }, + "vtk": { + "description": "vtk support for opencv", + "dependencies": [ + "vtk" + ] + }, + "webp": { + "description": "WebP support for opencv", + "dependencies": [ + "libwebp" + ] + }, + "world": { + "description": "Compile to a single package support for opencv" + } + } +} diff --git a/externals/vcpkg/ports/opencv4/0001-disable-downloading.patch b/externals/vcpkg/ports/opencv4/0001-disable-downloading.patch new file mode 100755 index 000000000..e2c886d45 --- /dev/null +++ b/externals/vcpkg/ports/opencv4/0001-disable-downloading.patch @@ -0,0 +1,12 @@ +--- a/cmake/OpenCVDownload.cmake ++++ b/cmake/OpenCVDownload.cmake +@@ -157,6 +157,9 @@ function(ocv_download) + # Download + if(NOT EXISTS "${CACHE_CANDIDATE}") + ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"") ++ string(REPLACE "${OPENCV_DOWNLOAD_PATH}/" "opencv-cache/" CACHE_SUBPATH "${CACHE_CANDIDATE}") ++ message(FATAL_ERROR " Downloads are not permitted during configure. Please pre-download the file \"${CACHE_CANDIDATE}\":\n \n vcpkg_download_distfile(OCV_DOWNLOAD\n URLS \"${DL_URL}\"\n FILENAME \"${CACHE_SUBPATH}\"\n SHA512 0\n )") ++ + foreach(try ${OPENCV_DOWNLOAD_TRIES_LIST}) + ocv_download_log("#try ${try}") + file(DOWNLOAD "${DL_URL}" "${CACHE_CANDIDATE}" diff --git a/externals/vcpkg/ports/opencv4/0002-install-options.patch b/externals/vcpkg/ports/opencv4/0002-install-options.patch new file mode 100755 index 000000000..659272385 --- /dev/null +++ b/externals/vcpkg/ports/opencv4/0002-install-options.patch @@ -0,0 +1,57 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -616,7 +616,7 @@ endif() + ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS) + + # --- Python Support --- +-if(NOT IOS) ++if(WITH_PYTHON) + include(cmake/OpenCVDetectPython.cmake) + endif() + +--- a/cmake/OpenCVCompilerOptions.cmake ++++ b/cmake/OpenCVCompilerOptions.cmake +@@ -286,7 +286,6 @@ if(MSVC) + #endif() + + if(BUILD_WITH_DEBUG_INFO) +- set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} /Zi") + set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug") + set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug") + set(OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE} /debug") +--- a/cmake/OpenCVGenConfig.cmake ++++ b/cmake/OpenCVGenConfig.cmake +@@ -114,11 +114,11 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME) + endif() + endfunction() + +-if((CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" OR UNIX) AND NOT ANDROID) ++if(TRUE) + ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "" "") + endif() + +-if(ANDROID) ++if(FALSE) + ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "abi-${ANDROID_NDK_ABI_NAME}" "OpenCVConfig.root-ANDROID.cmake.in") + install(FILES "${OpenCV_SOURCE_DIR}/platforms/android/android.toolchain.cmake" DESTINATION "${OPENCV_CONFIG_INSTALL_PATH}" COMPONENT dev) + endif() +@@ -126,7 +126,7 @@ endif() + # -------------------------------------------------------------------------------------------- + # Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake -> For use within binary installers/packages + # -------------------------------------------------------------------------------------------- +-if(WIN32) ++if(0) + if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows AND NOT OPENCV_SKIP_CMAKE_ROOT_CONFIG) + ocv_gen_config("${CMAKE_BINARY_DIR}/win-install" + "${OPENCV_INSTALL_BINARIES_PREFIX}${OPENCV_INSTALL_BINARIES_SUFFIX}" +--- a/data/CMakeLists.txt ++++ b/data/CMakeLists.txt +@@ -1,8 +1,6 @@ + file(GLOB HAAR_CASCADES haarcascades/*.xml) + file(GLOB LBP_CASCADES lbpcascades/*.xml) + +-install(FILES ${HAAR_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/haarcascades COMPONENT libs) +-install(FILES ${LBP_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/lbpcascades COMPONENT libs) + + if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH) + install(DIRECTORY "${OPENCV_TEST_DATA_PATH}/" DESTINATION "${OPENCV_TEST_DATA_INSTALL_PATH}" COMPONENT "tests") diff --git a/externals/vcpkg/ports/opencv4/0003-force-package-requirements.patch b/externals/vcpkg/ports/opencv4/0003-force-package-requirements.patch new file mode 100755 index 000000000..6990dd963 --- /dev/null +++ b/externals/vcpkg/ports/opencv4/0003-force-package-requirements.patch @@ -0,0 +1,92 @@ +--- a/cmake/OpenCVFindLibsGrfmt.cmake ++++ b/cmake/OpenCVFindLibsGrfmt.cmake +@@ -11,7 +11,7 @@ else() + set(_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) + set(CMAKE_FIND_LIBRARY_SUFFIXES .so) + endif() +- find_package(ZLIB "${MIN_VER_ZLIB}") ++ find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED) + if(ANDROID) + set(CMAKE_FIND_LIBRARY_SUFFIXES ${_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) + unset(_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES) +@@ -41,7 +41,7 @@ if(WITH_JPEG) + ocv_clear_vars(JPEG_FOUND) + else() + ocv_clear_internal_cache_vars(JPEG_LIBRARY JPEG_INCLUDE_DIR) +- include(FindJPEG) ++ find_package(JPEG REQUIRED) + endif() + + if(NOT JPEG_FOUND) +@@ -87,7 +87,7 @@ if(WITH_TIFF) + ocv_clear_vars(TIFF_FOUND) + else() + ocv_clear_internal_cache_vars(TIFF_LIBRARY TIFF_INCLUDE_DIR) +- include(FindTIFF) ++ find_package(TIFF REQUIRED) + if(TIFF_FOUND) + ocv_parse_header("${TIFF_INCLUDE_DIR}/tiff.h" TIFF_VERSION_LINES TIFF_VERSION_CLASSIC TIFF_VERSION_BIG TIFF_VERSION TIFF_BIGTIFF_VERSION) + endif() +@@ -131,7 +131,7 @@ if(WITH_WEBP) + ocv_clear_vars(WEBP_FOUND WEBP_LIBRARY WEBP_LIBRARIES WEBP_INCLUDE_DIR) + else() + ocv_clear_internal_cache_vars(WEBP_LIBRARY WEBP_INCLUDE_DIR) +- include(cmake/OpenCVFindWebP.cmake) ++ find_package(WEBP NAMES WebP REQUIRED) + if(WEBP_FOUND) + set(HAVE_WEBP 1) + endif() +@@ -172,7 +172,7 @@ if(WITH_OPENJPEG) + if(BUILD_OPENJPEG) + ocv_clear_vars(OpenJPEG_FOUND) + else() +- find_package(OpenJPEG QUIET) ++ find_package(OpenJPEG REQUIRED) + endif() + + if(NOT OpenJPEG_FOUND OR OPENJPEG_MAJOR_VERSION LESS 2) +@@ -200,7 +200,7 @@ if(WITH_JASPER AND NOT HAVE_OPENJPEG) + if(BUILD_JASPER) + ocv_clear_vars(JASPER_FOUND) + else() +- include(FindJasper) ++ find_package(Jasper REQUIRED) + endif() + + if(NOT JASPER_FOUND) +@@ -225,7 +225,7 @@ if(WITH_PNG) + ocv_clear_vars(PNG_FOUND) + else() + ocv_clear_internal_cache_vars(PNG_LIBRARY PNG_INCLUDE_DIR) +- include(FindPNG) ++ find_package(PNG REQUIRED) + if(PNG_FOUND) + include(CheckIncludeFile) + check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H) +@@ -257,7 +257,7 @@ if(WITH_OPENEXR) + ocv_clear_vars(HAVE_OPENEXR) + if(NOT BUILD_OPENEXR) + ocv_clear_internal_cache_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION) +- include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake") ++ find_package(OpenEXR REQUIRED) + endif() + + if(OPENEXR_FOUND) +@@ -275,7 +275,7 @@ endif() + + # --- GDAL (optional) --- + if(WITH_GDAL) +- find_package(GDAL QUIET) ++ find_package(GDAL REQUIRED) + + if(NOT GDAL_FOUND) + set(HAVE_GDAL NO) +@@ -287,7 +287,7 @@ if(WITH_GDAL) + endif() + + if(WITH_GDCM) +- find_package(GDCM QUIET) ++ find_package(GDCM REQUIRED) + if(NOT GDCM_FOUND) + set(HAVE_GDCM NO) + ocv_clear_vars(GDCM_VERSION GDCM_LIBRARIES) diff --git a/externals/vcpkg/ports/opencv4/0004-fix-policy-CMP0057.patch b/externals/vcpkg/ports/opencv4/0004-fix-policy-CMP0057.patch new file mode 100755 index 000000000..96d0cdebe --- /dev/null +++ b/externals/vcpkg/ports/opencv4/0004-fix-policy-CMP0057.patch @@ -0,0 +1,7 @@ +--- a/modules/videoio/CMakeLists.txt ++++ b/modules/videoio/CMakeLists.txt +@@ -1,3 +1,4 @@ ++cmake_minimum_required(VERSION 3.3) + set(VIDEOIO_ENABLE_PLUGINS_DEFAULT ON) + if(EMSCRIPTEN OR IOS OR WINRT) + set(VIDEOIO_ENABLE_PLUGINS_DEFAULT OFF) diff --git a/externals/vcpkg/ports/opencv4/0005-fix-eigen.patch b/externals/vcpkg/ports/opencv4/0005-fix-eigen.patch new file mode 100755 index 000000000..196542dcd --- /dev/null +++ b/externals/vcpkg/ports/opencv4/0005-fix-eigen.patch @@ -0,0 +1,11 @@ +--- a/cmake/OpenCVFindLibsPerf.cmake ++++ b/cmake/OpenCVFindLibsPerf.cmake +@@ -55,7 +55,7 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN) + OR NOT (CMAKE_VERSION VERSION_LESS "3.0.0") # Eigen3Targets.cmake required CMake 3.0.0+ + ) AND NOT OPENCV_SKIP_EIGEN_FIND_PACKAGE_CONFIG + ) +- find_package(Eigen3 CONFIG QUIET) # Ceres 2.0.0 CMake scripts doesn't work with CMake's FindEigen3.cmake module (due to missing EIGEN3_VERSION_STRING) ++ find_package(Eigen3 CONFIG REQUIRED) # Ceres 2.0.0 CMake scripts doesn't work with CMake's FindEigen3.cmake module (due to missing EIGEN3_VERSION_STRING) + endif() + if(NOT Eigen3_FOUND) + find_package(Eigen3 QUIET) diff --git a/externals/vcpkg/ports/opencv4/0006-fix-uwp.patch b/externals/vcpkg/ports/opencv4/0006-fix-uwp.patch new file mode 100755 index 000000000..ec315b498 --- /dev/null +++ b/externals/vcpkg/ports/opencv4/0006-fix-uwp.patch @@ -0,0 +1,11 @@ +--- a/cmake/OpenCVModule.cmake ++++ b/cmake/OpenCVModule.cmake +@@ -1205,7 +1205,7 @@ function(ocv_add_perf_tests) + set_target_properties(${the_target} PROPERTIES FOLDER "tests performance") + endif() + +- if(WINRT) ++ if(WINRT AND BUILD_TESTS) + # removing APPCONTAINER from tests to run from console + # look for detailed description inside of ocv_create_module macro above + add_custom_command(TARGET "opencv_perf_${name}" diff --git a/externals/vcpkg/ports/opencv4/0007-fix-hdf5.patch b/externals/vcpkg/ports/opencv4/0007-fix-hdf5.patch new file mode 100755 index 000000000..8e7e154ad --- /dev/null +++ b/externals/vcpkg/ports/opencv4/0007-fix-hdf5.patch @@ -0,0 +1,28 @@ +--- a/modules/hdf/CMakeLists.txt ++++ b/modules/hdf/CMakeLists.txt +@@ -1,25 +1,8 @@ + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}) + +-if(WIN32) +- # windows cmake internal lookups are broken for now +- # will lookup for headers and shared libs given HDF_DIR env +- find_path(HDF5_INCLUDE_DIRS hdf5.h HINTS "$ENV{HDF5_DIR}\\..\\include") +- find_library(HDF5_C_LIBRARY NAMES hdf5 HINTS "$ENV{HDF5_DIR}\\..\\lib") +- if(HDF5_INCLUDE_DIRS AND HDF5_C_LIBRARY) +- set(HDF5_FOUND "YES") +- set(HDF5_LIBRARIES ${HDF5_C_LIBRARY}) +- mark_as_advanced(HDF5_LIBRARIES) +- mark_as_advanced(HDF5_C_LIBRARY) +- mark_as_advanced(HDF5_INCLUDE_DIRS) +- add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB -D_HDF5USEDLL_) +- else() +- set(HDF5_FOUND "NO") +- endif() +-else() + if(NOT CMAKE_CROSSCOMPILING) # iOS build should not reuse OSX package + find_package(HDF5) + endif() +-endif() + + if(NOT HDF5_FOUND) + ocv_module_disable(hdf) # no return diff --git a/externals/vcpkg/ports/opencv4/0008-devendor-quirc.patch b/externals/vcpkg/ports/opencv4/0008-devendor-quirc.patch new file mode 100755 index 000000000..504e42bc5 --- /dev/null +++ b/externals/vcpkg/ports/opencv4/0008-devendor-quirc.patch @@ -0,0 +1,22 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -810,7 +810,7 @@ if(WITH_OPENVX) + endif() + + if(WITH_QUIRC) +- add_subdirectory(3rdparty/quirc) ++ find_package(quirc CONFIG REQUIRED) + set(HAVE_QUIRC TRUE) + endif() + +--- a/modules/objdetect/CMakeLists.txt ++++ b/modules/objdetect/CMakeLists.txt +@@ -2,7 +2,5 @@ set(the_description "Object Detection") + ocv_define_module(objdetect opencv_core opencv_imgproc opencv_calib3d opencv_dnn WRAP java objc python js) + + if(HAVE_QUIRC) +- get_property(QUIRC_INCLUDE GLOBAL PROPERTY QUIRC_INCLUDE_DIR) +- ocv_include_directories(${QUIRC_INCLUDE}) +- ocv_target_link_libraries(${the_module} quirc) ++ ocv_target_link_libraries(${the_module} quirc::quirc) + endif() diff --git a/externals/vcpkg/ports/opencv4/0009-fix-protobuf.patch b/externals/vcpkg/ports/opencv4/0009-fix-protobuf.patch new file mode 100755 index 000000000..38572e309 --- /dev/null +++ b/externals/vcpkg/ports/opencv4/0009-fix-protobuf.patch @@ -0,0 +1,26 @@ +--- a/cmake/OpenCVFindProtobuf.cmake ++++ b/cmake/OpenCVFindProtobuf.cmake +@@ -31,7 +31,7 @@ if(BUILD_PROTOBUF) + set(HAVE_PROTOBUF TRUE) + else() + unset(Protobuf_VERSION CACHE) +- find_package(Protobuf QUIET) ++ find_package(Protobuf CONFIG REQUIRED) + + # Backwards compatibility + # Define camel case versions of input variables +@@ -76,6 +76,7 @@ if(HAVE_PROTOBUF) + if(NOT BUILD_PROTOBUF) + if(TARGET "${Protobuf_LIBRARIES}") + get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION_RELEASE) ++ get_target_property(__location_debug "${Protobuf_LIBRARIES}" IMPORTED_LOCATION_DEBUG) + if(NOT __location) + get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION) + endif() +@@ -87,5 +88,5 @@ if(HAVE_PROTOBUF) + endif() + list(APPEND CUSTOM_STATUS_protobuf " Protobuf:" + BUILD_PROTOBUF THEN "build (${Protobuf_VERSION})" +- ELSE "${__location} (${Protobuf_VERSION})") ++ ELSE "optimized ${__location} debug ${__location_debug} ; version (${Protobuf_VERSION})") + endif() diff --git a/externals/vcpkg/ports/opencv4/0010-fix-uwp-tiff-imgcodecs.patch b/externals/vcpkg/ports/opencv4/0010-fix-uwp-tiff-imgcodecs.patch new file mode 100755 index 000000000..0bd3d701b --- /dev/null +++ b/externals/vcpkg/ports/opencv4/0010-fix-uwp-tiff-imgcodecs.patch @@ -0,0 +1,13 @@ +--- a/modules/imgcodecs/CMakeLists.txt ++++ b/modules/imgcodecs/CMakeLists.txt +@@ -9,6 +9,10 @@ ocv_add_module(imgcodecs opencv_imgproc WRAP java objc python) + + ocv_clear_vars(GRFMT_LIBS) + ++if(MSVC) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996") ++endif() ++ + if(HAVE_WINRT_CX AND NOT WINRT) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW") + endif() diff --git a/externals/vcpkg/ports/opencv4/0011-remove-python2.patch b/externals/vcpkg/ports/opencv4/0011-remove-python2.patch new file mode 100755 index 000000000..bee0faa87 --- /dev/null +++ b/externals/vcpkg/ports/opencv4/0011-remove-python2.patch @@ -0,0 +1,18 @@ +--- a/cmake/OpenCVDetectPython.cmake ++++ b/cmake/OpenCVDetectPython.cmake +@@ -268,15 +268,6 @@ if(OPENCV_PYTHON_SKIP_DETECTION) + return() + endif() + +-find_python("" "${MIN_VER_PYTHON2}" PYTHON2_LIBRARY PYTHON2_INCLUDE_DIR +- PYTHON2INTERP_FOUND PYTHON2_EXECUTABLE PYTHON2_VERSION_STRING +- PYTHON2_VERSION_MAJOR PYTHON2_VERSION_MINOR PYTHON2LIBS_FOUND +- PYTHON2LIBS_VERSION_STRING PYTHON2_LIBRARIES PYTHON2_LIBRARY +- PYTHON2_DEBUG_LIBRARIES PYTHON2_LIBRARY_DEBUG PYTHON2_INCLUDE_PATH +- PYTHON2_INCLUDE_DIR PYTHON2_INCLUDE_DIR2 PYTHON2_PACKAGES_PATH +- PYTHON2_NUMPY_INCLUDE_DIRS PYTHON2_NUMPY_VERSION) +- +-option(OPENCV_PYTHON3_VERSION "Python3 version" "") + find_python("${OPENCV_PYTHON3_VERSION}" "${MIN_VER_PYTHON3}" PYTHON3_LIBRARY PYTHON3_INCLUDE_DIR + PYTHON3INTERP_FOUND PYTHON3_EXECUTABLE PYTHON3_VERSION_STRING + PYTHON3_VERSION_MAJOR PYTHON3_VERSION_MINOR PYTHON3LIBS_FOUND diff --git a/externals/vcpkg/ports/opencv4/0012-fix-zlib.patch b/externals/vcpkg/ports/opencv4/0012-fix-zlib.patch new file mode 100755 index 000000000..9c38fd892 --- /dev/null +++ b/externals/vcpkg/ports/opencv4/0012-fix-zlib.patch @@ -0,0 +1,14 @@ +diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake +index 8ea5497..7ed3f6b 100644 +--- a/cmake/OpenCVFindLibsGrfmt.cmake ++++ b/cmake/OpenCVFindLibsGrfmt.cmake +@@ -5,6 +5,9 @@ + # --- zlib (required) --- + if(BUILD_ZLIB) + ocv_clear_vars(ZLIB_FOUND) ++elseif(1) ++ ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) ++ find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED) + else() + ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) + if(ANDROID) diff --git a/externals/vcpkg/ports/opencv4/0013-fix-opengl.patch b/externals/vcpkg/ports/opencv4/0013-fix-opengl.patch new file mode 100755 index 000000000..8cd38c9bb --- /dev/null +++ b/externals/vcpkg/ports/opencv4/0013-fix-opengl.patch @@ -0,0 +1,11 @@ +--- a/modules/highgui/CMakeLists.txt ++++ b/modules/highgui/CMakeLists.txt +@@ -271,7 +271,7 @@ if(APPLE) + add_apple_compiler_options(${the_module}) + endif() + +-if(OPENCV_HIGHGUI_BUILTIN_BACKEND STREQUAL "WIN32UI" AND HAVE_OPENGL AND OPENGL_LIBRARIES) ++if(HAVE_OPENGL AND OPENGL_LIBRARIES) + ocv_target_link_libraries(${the_module} PRIVATE "${OPENGL_LIBRARIES}") + endif() + diff --git a/externals/vcpkg/ports/opencv4/0014-fix-gstreamer.patch b/externals/vcpkg/ports/opencv4/0014-fix-gstreamer.patch new file mode 100755 index 000000000..d75c5ec2e --- /dev/null +++ b/externals/vcpkg/ports/opencv4/0014-fix-gstreamer.patch @@ -0,0 +1,29 @@ +--- a/modules/videoio/cmake/detect_gstreamer.cmake ++++ b/modules/videoio/cmake/detect_gstreamer.cmake +@@ -44,6 +44,10 @@ if(NOT HAVE_GSTREAMER AND WIN32) + NAMES gstvideo gstvideo-1.0 + PATHS ${env_paths} + PATH_SUFFIXES "lib") ++ find_library(GSTREAMER_audio_LIBRARY ++ NAMES gstvideo gstaudio-1.0 ++ PATHS ${env_paths} ++ PATH_SUFFIXES "lib") + + find_library(GSTREAMER_glib_LIBRARY + NAMES glib-2.0 +@@ -63,6 +67,7 @@ if(NOT HAVE_GSTREAMER AND WIN32) + AND GSTREAMER_pbutils_LIBRARY + AND GSTREAMER_riff_LIBRARY + AND GSTREAMER_video_LIBRARY ++ AND GSTREAMER_audio_LIBRARY + AND GSTREAMER_glib_LIBRARY + AND GSTREAMER_gobject_LIBRARY) + file(STRINGS "${GSTREAMER_gst_INCLUDE_DIR}/gst/gstversion.h" ver_strings REGEX "#define +GST_VERSION_(MAJOR|MINOR|MICRO|NANO).*") +@@ -77,6 +82,7 @@ if(NOT HAVE_GSTREAMER AND WIN32) + ${GSTREAMER_app_LIBRARY} + ${GSTREAMER_riff_LIBRARY} + ${GSTREAMER_video_LIBRARY} ++ ${GSTREAMER_audio_LIBRARY} + ${GSTREAMER_pbutils_LIBRARY} + ${GSTREAMER_glib_LIBRARY} + ${GSTREAMER_gobject_LIBRARY}) diff --git a/externals/vcpkg/ports/opencv4/0015-fix-freetype.patch b/externals/vcpkg/ports/opencv4/0015-fix-freetype.patch new file mode 100755 index 000000000..62c41f2f4 --- /dev/null +++ b/externals/vcpkg/ports/opencv4/0015-fix-freetype.patch @@ -0,0 +1,16 @@ +diff --git a/modules/gapi/cmake/init.cmake b/modules/gapi/cmake/init.cmake +index 1c46432..43fb8ad 100644 +--- a/modules/gapi/cmake/init.cmake ++++ b/modules/gapi/cmake/init.cmake +@@ -20,10 +20,8 @@ if(NOT TARGET ade) + endif() + + if(WITH_FREETYPE) +- ocv_check_modules(FREETYPE freetype2) +- if (FREETYPE_FOUND) ++ find_package(freetype CONFIG REQUIRED) + set(HAVE_FREETYPE TRUE) +- endif() + endif() + + if(WITH_PLAIDML) diff --git a/externals/vcpkg/ports/opencv4/0016-fix-freetype-contrib.patch b/externals/vcpkg/ports/opencv4/0016-fix-freetype-contrib.patch new file mode 100755 index 000000000..4d0637fd1 --- /dev/null +++ b/externals/vcpkg/ports/opencv4/0016-fix-freetype-contrib.patch @@ -0,0 +1,17 @@ +diff --git a/modules/freetype/CMakeLists.txt b/modules/freetype/CMakeLists.txt +index 6dd4aaf..e734e97 100644 +--- a/modules/freetype/CMakeLists.txt ++++ b/modules/freetype/CMakeLists.txt +@@ -3,8 +5,10 @@ if(APPLE_FRAMEWORK) + ocv_module_disable(freetype) + endif() + +-ocv_check_modules(FREETYPE freetype2) +-ocv_check_modules(HARFBUZZ harfbuzz) ++if(WITH_FREETYPE) ++find_package(freetype CONFIG REQUIRED) ++find_package(harfbuzz CONFIG REQUIRED) ++endif() + + if(OPENCV_INITIAL_PASS) + if(NOT FREETYPE_FOUND) diff --git a/externals/vcpkg/ports/opencv4/portfile.cmake b/externals/vcpkg/ports/opencv4/portfile.cmake new file mode 100755 index 000000000..36b0ac553 --- /dev/null +++ b/externals/vcpkg/ports/opencv4/portfile.cmake @@ -0,0 +1,580 @@ +if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv2") + message(FATAL_ERROR "OpenCV 2 is installed, please uninstall and try again:\n vcpkg remove opencv2") +endif() + +if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv3") + message(FATAL_ERROR "OpenCV 3 is installed, please uninstall and try again:\n vcpkg remove opencv3") +endif() + +file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents) +string(JSON OPENCV_VERSION GET "${_contents}" version) + +set(USE_QT_VERSION "5") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO opencv/opencv + REF ${OPENCV_VERSION} + SHA512 4d1783fd78425cc43bb2153446dd634cedd366a49592bccc0c538a40aa161fcf67db8f1b6b68f1ce0b4a93504b3f06f65931709277afb1a1ee9fe963094bca02 + HEAD_REF master + PATCHES + 0001-disable-downloading.patch + 0002-install-options.patch + 0003-force-package-requirements.patch + 0004-fix-policy-CMP0057.patch + 0005-fix-eigen.patch + 0006-fix-uwp.patch + 0008-devendor-quirc.patch + 0009-fix-protobuf.patch + 0010-fix-uwp-tiff-imgcodecs.patch + 0011-remove-python2.patch + 0012-fix-zlib.patch + 0013-fix-opengl.patch + 0014-fix-gstreamer.patch + 0015-fix-freetype.patch +) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(TARGET_IS_AARCH64 1) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(TARGET_IS_ARM 1) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(TARGET_IS_X86_64 1) +else() + set(TARGET_IS_X86 1) +endif() + +file(REMOVE "${SOURCE_PATH}/cmake/FindCUDNN.cmake") + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT) + +set(ADE_DIR ${CURRENT_INSTALLED_DIR}/share/ade CACHE PATH "Path to existing ADE CMake Config file") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "ade" WITH_ADE + "contrib" WITH_CONTRIB + "cuda" WITH_CUBLAS + "cuda" WITH_CUDA + "cudnn" WITH_CUDNN + "eigen" WITH_EIGEN + "ffmpeg" WITH_FFMPEG + "freetype" WITH_FREETYPE + "gdcm" WITH_GDCM + "gstreamer" WITH_GSTREAMER + "halide" WITH_HALIDE + "jasper" WITH_JASPER + "jpeg" WITH_JPEG + "lapack" WITH_LAPACK + "nonfree" OPENCV_ENABLE_NONFREE + "openexr" WITH_OPENEXR + "opengl" WITH_OPENGL + "png" WITH_PNG + "quirc" WITH_QUIRC + "sfm" BUILD_opencv_sfm + "tiff" WITH_TIFF + "vtk" WITH_VTK + "webp" WITH_WEBP + "world" BUILD_opencv_world + "dc1394" WITH_1394 +) + +# Cannot use vcpkg_check_features() for "dnn", "gtk", ipp", "openmp", "ovis", "python", "qt, "tbb" +set(BUILD_opencv_dnn OFF) +if("dnn" IN_LIST FEATURES) + if(NOT VCPKG_TARGET_IS_ANDROID) + set(BUILD_opencv_dnn ON) + else() + message(WARNING "The dnn module cannot be enabled on Android") + endif() +endif() + +set(WITH_GTK OFF) +if("gtk" IN_LIST FEATURES) + if(VCPKG_TARGET_IS_LINUX) + set(WITH_GTK ON) + else() + message(WARNING "The gtk module cannot be enabled outside Linux") + endif() +endif() + +set(WITH_QT OFF) +if("qt" IN_LIST FEATURES) + set(WITH_QT ${USE_QT_VERSION}) +endif() + +set(BUILD_opencv_gapi ON) +if(VCPKG_TARGET_IS_UWP) + set(BUILD_opencv_gapi OFF) + message(WARNING "The gapi module cannot be enabled on UWP platform") +endif() + +set(WITH_IPP OFF) +if("ipp" IN_LIST FEATURES) + set(WITH_IPP ON) +endif() + +set(WITH_OPENMP OFF) +if("openmp" IN_LIST FEATURES) + if(NOT VCPKG_TARGET_IS_OSX) + set(WITH_OPENMP ON) + else() + message(WARNING "The OpenMP feature is not supported on macOS") + endif() +endif() + +set(BUILD_opencv_ovis OFF) +if("ovis" IN_LIST FEATURES) + set(BUILD_opencv_ovis ON) +endif() + +set(WITH_TBB OFF) +if("tbb" IN_LIST FEATURES) + set(WITH_TBB ON) +endif() + +set(WITH_PYTHON OFF) +set(BUILD_opencv_python3 OFF) +if("python" IN_LIST FEATURES) + if (VCPKG_LIBRARY_LINKAGE STREQUAL static AND VCPKG_TARGET_IS_WINDOWS) + message(WARNING "The python module is currently unsupported on Windows when building static OpenCV libraries") + else() + x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES numpy OUT_PYTHON_VAR "PYTHON3") + set(ENV{PYTHON} "${PYTHON3}") + set(BUILD_opencv_python3 ON) + set(WITH_PYTHON ON) + endif() +endif() + +if("dnn" IN_LIST FEATURES) + vcpkg_download_distfile(TINYDNN_ARCHIVE + URLS "https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz" + FILENAME "opencv-cache/tiny_dnn/adb1c512e09ca2c7a6faef36f9c53e59-v1.0.0a3.tar.gz" + SHA512 5f2c1a161771efa67e85b1fea395953b7744e29f61187ac5a6c54c912fb195b3aef9a5827135c3668bd0eeea5ae04a33cc433e1f6683e2b7955010a2632d168b + ) +endif() + +if("cuda" IN_LIST FEATURES) + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/edb50da3cf849840d680249aa6dbef248ebce2ca.zip" + FILENAME "opencv-cache/nvidia_optical_flow/a73cd48b18dcc0cc8933b30796074191-edb50da3cf849840d680249aa6dbef248ebce2ca.zip" + SHA512 12d655ac9fcfc6df0186daa62f7185dadd489f0eeea25567d78c2b47a9840dcce2bd03a3e9b3b42f125dbaf3150f52590ea7597dc1dc8acee852dc0aed56651e + ) +endif() + +# Build image quality module when building with 'contrib' feature and not UWP. +set(BUILD_opencv_quality OFF) +if("contrib" IN_LIST FEATURES) + if (VCPKG_TARGET_IS_UWP) + set(BUILD_opencv_quality OFF) + message(WARNING "The image quality module (quality) does not build for UWP, the module has been disabled.") + # The hdf module is silently disabled by OpenCVs buildsystem if HDF5 is not detected. + message(WARNING "The hierarchical data format module (hdf) depends on HDF5 which doesn't support UWP, the module has been disabled.") + else() + set(BUILD_opencv_quality CMAKE_DEPENDS_IN_PROJECT_ONLY) + endif() + + vcpkg_from_github( + OUT_SOURCE_PATH CONTRIB_SOURCE_PATH + REPO opencv/opencv_contrib + REF ${OPENCV_VERSION} + SHA512 8469de524e8e6f4c50a74b8cbec5e4cfc48a63a6dfc787609696099eca40dc02b9dc7a347a014d4416fd4efd66955d3af5f4847f44612312a8362f453e6c2e35 + HEAD_REF master + PATCHES + 0007-fix-hdf5.patch + 0016-fix-freetype-contrib.patch + ) + set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") + + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/WeChatCV/opencv_3rdparty/a8b69ccc738421293254aec5ddb38bd523503252/detect.caffemodel" + FILENAME "opencv-cache/wechat_qrcode/238e2b2d6f3c18d6c3a30de0c31e23cf-detect.caffemodel" + SHA512 58d62faf8679d3f568a26a1d9f7c2e88060426a440315ca8bce7b3b5a8efa34be670afd0abfd0dd5d89f89a042a2408ea602f937080abc6910c2e497b7f5a4b8 + ) + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/WeChatCV/opencv_3rdparty/a8b69ccc738421293254aec5ddb38bd523503252/sr.caffemodel" + FILENAME "opencv-cache/wechat_qrcode/cbfcd60361a73beb8c583eea7e8e6664-sr.caffemodel" + SHA512 917c6f6b84a898b8c8c85c79359e48a779c8a600de563dac2e1c5d013401e9ac9dbcd435013a4ed7a69fc936839fb189aaa3038c127d04ceb6fd3b8fd9dd67bd + ) + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/WeChatCV/opencv_3rdparty/a8b69ccc738421293254aec5ddb38bd523503252/detect.prototxt" + FILENAME "opencv-cache/wechat_qrcode/6fb4976b32695f9f5c6305c19f12537d-detect.prototxt" + SHA512 2239d31a597049f358f09dbb4c0a7af0b384d9b67cfa3224f8c7e44329647cf19ee7929ac06199cca23bbbf431de0481b74ab51eace6aa20bb2e2fd19b536e49 + ) + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/WeChatCV/opencv_3rdparty/a8b69ccc738421293254aec5ddb38bd523503252/sr.prototxt" + FILENAME "opencv-cache/wechat_qrcode/69db99927a70df953b471daaba03fbef-sr.prototxt" + SHA512 6b715ec45c3fd081e7e113e351edcef0f3d32a75f8b5a9ca2273cb5da9a1116a1b78cba45582a9acf67a7ab76dc4fcdf123f7b3a0d3de2f5c39b26ef450058b7 + ) + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/34e4206aef44d50e6bbcd0ab06354b52e7466d26/boostdesc_bgm.i" + FILENAME "opencv-cache/xfeatures2d/boostdesc/0ea90e7a8f3f7876d450e4149c97c74f-boostdesc_bgm.i" + SHA512 5c8702a60314fac4ebb6dafb62a603948ec034058d1a582fcb89a063b51511802c02e192eadfc0b233b1f711f4c74cabab6d9ebe8a50c3554ea0ccdbef87dc5c + ) + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/34e4206aef44d50e6bbcd0ab06354b52e7466d26/boostdesc_bgm_bi.i" + FILENAME "opencv-cache/xfeatures2d/boostdesc/232c966b13651bd0e46a1497b0852191-boostdesc_bgm_bi.i" + SHA512 b28ba2b615e0755ff0f6733b567682800fb9e7d522250aa498075cc1b8927f4177cacdcb0cfdf712539a29c4773232dc714931b6d292292b091b5cf170b203a6 + ) + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/34e4206aef44d50e6bbcd0ab06354b52e7466d26/boostdesc_bgm_hd.i" + FILENAME "opencv-cache/xfeatures2d/boostdesc/324426a24fa56ad9c5b8e3e0b3e5303e-boostdesc_bgm_hd.i" + SHA512 c214045c3730a1d9dfc594f70895edf82d2fd3058a3928908627014371e02460d052cbaedf41bb96cf76460c0a8b4b01b7b0ac7d269ec5d3f17f2a46c9f0091b + ) + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/34e4206aef44d50e6bbcd0ab06354b52e7466d26/boostdesc_binboost_064.i" + FILENAME "opencv-cache/xfeatures2d/boostdesc/202e1b3e9fec871b04da31f7f016679f-boostdesc_binboost_064.i" + SHA512 f32240a7b975233d2bbad02fdb74c6e29ed71ed6f0c08172ca33eb1e69a7a7f6d6964adf41422213a0452121a9c4bb2effe3d7b9d6743c9bf58d4bc8c9b1db36 + ) + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/34e4206aef44d50e6bbcd0ab06354b52e7466d26/boostdesc_binboost_128.i" + FILENAME "opencv-cache/xfeatures2d/boostdesc/98ea99d399965c03d555cef3ea502a0b-boostdesc_binboost_128.i" + SHA512 f58e2bebfaa690d324691a6c2067d9a1e5267037ea0f2b397966289253b9efd27d8238aff6206e95262086e1fcddf01ae1a1c49f066a8bbac3aa7908214b9a8f + ) + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/34e4206aef44d50e6bbcd0ab06354b52e7466d26/boostdesc_binboost_256.i" + FILENAME "opencv-cache/xfeatures2d/boostdesc/e6dcfa9f647779eb1ce446a8d759b6ea-boostdesc_binboost_256.i" + SHA512 351ee07b9714a379c311f293d96e99f001c894393c911a421b4c536345d43c02ba2d867e9f657eac104841563045ab8c8edab878e5ffeb1e1a7494375ef58987 + ) + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/34e4206aef44d50e6bbcd0ab06354b52e7466d26/boostdesc_lbgm.i" + FILENAME "opencv-cache/xfeatures2d/boostdesc/0ae0675534aa318d9668f2a179c2a052-boostdesc_lbgm.i" + SHA512 7fa12e2207ff154acf2433bbb4f3f47aa71d1fa8789493b688d635d20586b7ead30ee8dcd3b3753992ebbe98062cbde44d02683db1c563d52e35aefd7912a4f2 + ) + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d/vgg_generated_48.i" + FILENAME "opencv-cache/xfeatures2d/vgg/e8d0dcd54d1bcfdc29203d011a797179-vgg_generated_48.i" + SHA512 2403e9119738261a05a3116ca7e5c9e11da452c422f8670cd96ad2cb5bf970f76172e23b9913a3172adf06f2b31bee956f605b66dbccf3d706c4334aff713774 + ) + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d/vgg_generated_64.i" + FILENAME "opencv-cache/xfeatures2d/vgg/7126a5d9a8884ebca5aea5d63d677225-vgg_generated_64.i" + SHA512 2c954223677905f489b01988389ac80a8caa33bdb57adb3cb9409075012b5e2f472f14966d8be75d75c90c9330f66d59c69539dc6b5a5e265a4d98ff5041f0ea + ) + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d/vgg_generated_80.i" + FILENAME "opencv-cache/xfeatures2d/vgg/7cd47228edec52b6d82f46511af325c5-vgg_generated_80.i" + SHA512 9931ad1d1bd6d11951ca5357ab0a524f6ff9b33f936ceeafebc0dafb379ec7e2105e467443e9f424f60a0f2f445bdff821ed9e42330abed883227183ebad4a9e + ) + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d/vgg_generated_120.i" + FILENAME "opencv-cache/xfeatures2d/vgg/151805e03568c9f490a5e3a872777b75-vgg_generated_120.i" + SHA512 ad7c1d2b159ab5790c898815663bb90549f1cf7ade3c82d939d381608b26d26c5b2af01eb1ba21f4d114ced74586ab3fc83f14e2d8cfe4e6faac538aa0e7e255 + ) + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/8afa57abc8229d611c4937165d20e2a2d9fc5a12/face_landmark_model.dat" + FILENAME "opencv-cache/data/7505c44ca4eb54b4ab1e4777cb96ac05-face_landmark_model.dat" + SHA512 c16e60a6c4bb4de3ab39b876ae3c3f320ea56f69c93e9303bd2dff8760841dcd71be4161fff8bc71e8fe4fe8747fa8465d49d6bd8f5ebcdaea161f4bc2da7c93 + ) +endif() + +if(WITH_IPP) + if(VCPKG_TARGET_IS_OSX) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_mac_intel64_20191018_general.tgz" + FILENAME "opencv-cache/ippicv/1c3d675c2a2395d094d523024896e01b-ippicv_2020_mac_intel64_20191018_general.tgz" + SHA512 454dfaaa245e3a3b2f1ffb1aa8e27e280b03685009d66e147482b14e5796fdf2d332cac0f9b0822caedd5760fda4ee0ce2961889597456bbc18202f10bf727cd + ) + else() + message(WARNING "This target architecture is not supported IPPICV") + set(WITH_IPP OFF) + endif() + elseif(VCPKG_TARGET_IS_LINUX) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_lnx_intel64_20191018_general.tgz" + FILENAME "opencv-cache/ippicv/7421de0095c7a39162ae13a6098782f9-ippicv_2020_lnx_intel64_20191018_general.tgz" + SHA512 de6d80695cd6deef359376476edc4ff85fdddcf94972b936e0017f8a48aaa5d18f55c4253ae37deb83bff2f71410f68408063c88b5f3bf4df3c416aa93ceca87 + ) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_lnx_ia32_20191018_general.tgz" + FILENAME "opencv-cache/ippicv/ad189a940fb60eb71f291321322fe3e8-ippicv_2020_lnx_ia32_20191018_general.tgz" + SHA512 5ca9dafc3a634e2a5f83f6a498611c990ef16d54358e9b44574b01694e9d64b118d46d6e2011506e40d37e5a9865f576f790e37ff96b7c8b503507633631a296 + ) + else() + message(WARNING "This target architecture is not supported IPPICV") + set(WITH_IPP OFF) + endif() + elseif(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_win_intel64_20191018_general.zip" + FILENAME "opencv-cache/ippicv/879741a7946b814455eee6c6ffde2984-ippicv_2020_win_intel64_20191018_general.zip" + SHA512 50c4af4b7fe2161d652264230389dad2330e8c95b734d04fb7565bffdab855c06d43085e480da554c56b04f8538087d49503538d5943221ee2a772ee7be4c93c + ) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_win_ia32_20191018_general.zip" + FILENAME "opencv-cache/ippicv/cd39bdf0c2e1cac9a61101dad7a2413e-ippicv_2020_win_ia32_20191018_general.zip" + SHA512 058d00775d9f16955c7a557d554b8c2976ab9dbad4ba3fdb9823c0f768809edbd835e4397f01dc090a9bc80d81de834375e7006614d2a898f42e8004de0e04bf + ) + else() + message(WARNING "This target architecture is not supported IPPICV") + set(WITH_IPP OFF) + endif() + else() + message(WARNING "This target architecture is not supported IPPICV") + set(WITH_IPP OFF) + endif() +endif() + +set(WITH_MSMF ON) +if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) + set(WITH_MSMF OFF) +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + if (WITH_TBB) + message(WARNING "TBB is currently unsupported in this build configuration, turning it off") + set(WITH_TBB OFF) + endif() + + if (VCPKG_TARGET_IS_WINDOWS AND BUILD_opencv_ovis) + message(WARNING "OVIS is currently unsupported in this build configuration, turning it off") + set(BUILD_opencv_ovis OFF) + endif() +endif() + +if("ffmpeg" IN_LIST FEATURES) + if(VCPKG_TARGET_IS_UWP) + set(VCPKG_C_FLAGS "/sdl- ${VCPKG_C_FLAGS}") + set(VCPKG_CXX_FLAGS "/sdl- ${VCPKG_CXX_FLAGS}") + endif() +endif() + +if("halide" IN_LIST FEATURES) + list(APPEND ADDITIONAL_BUILD_FLAGS + # Halide 13 requires C++17 + "-DCMAKE_CXX_STANDARD=17" + "-DCMAKE_CXX_STANDARD_REQUIRED=ON" + "-DCMAKE_DISABLE_FIND_PACKAGE_Halide=ON" + "-DHALIDE_ROOT_DIR=${CURRENT_INSTALLED_DIR}" + ) +endif() + +if("qt" IN_LIST FEATURES) + list(APPEND ADDITIONAL_BUILD_FLAGS "-DCMAKE_AUTOMOC=ON") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ###### opencv cpu recognition is broken, always using host and not target: here we bypass that + -DOPENCV_SKIP_SYSTEM_PROCESSOR_DETECTION=TRUE + -DAARCH64=${TARGET_IS_AARCH64} + -DX86_64=${TARGET_IS_X86_64} + -DX86=${TARGET_IS_X86} + -DARM=${TARGET_IS_ARM} + ###### ocv_options + -DOpenCV_INSTALL_BINARIES_PREFIX= + -DOPENCV_BIN_INSTALL_PATH=bin + -DOPENCV_INCLUDE_INSTALL_PATH=include + -DOPENCV_LIB_INSTALL_PATH=lib + -DOPENCV_3P_LIB_INSTALL_PATH=lib + -DOPENCV_CONFIG_INSTALL_PATH=share/opencv + -DINSTALL_TO_MANGLED_PATHS=OFF + -DOPENCV_FFMPEG_USE_FIND_PACKAGE=FFMPEG + -DOPENCV_FFMPEG_SKIP_BUILD_CHECK=TRUE + -DCMAKE_DEBUG_POSTFIX=d + -DOPENCV_DLLVERSION= + -DOPENCV_DEBUG_POSTFIX=d + -DOPENCV_GENERATE_SETUPVARS=OFF + # Do not build docs/examples + -DBUILD_DOCS=OFF + -DBUILD_EXAMPLES=OFF + -Dade_DIR=${ADE_DIR} + ###### Disable build 3rd party libs + -DBUILD_JASPER=OFF + -DBUILD_JPEG=OFF + -DBUILD_OPENEXR=OFF + -DBUILD_PNG=OFF + -DBUILD_TIFF=OFF + -DBUILD_WEBP=OFF + -DBUILD_ZLIB=OFF + -DBUILD_TBB=OFF + -DBUILD_IPP_IW=OFF + -DBUILD_ITT=OFF + ###### Disable build 3rd party components + -DBUILD_PROTOBUF=OFF + ###### OpenCV Build components + -DBUILD_opencv_apps=OFF + -DBUILD_opencv_java=OFF + -DBUILD_opencv_js=OFF + -DBUILD_ANDROID_PROJECT=OFF + -DBUILD_ANDROID_EXAMPLES=OFF + -DBUILD_PACKAGE=OFF + -DBUILD_PERF_TESTS=OFF + -DBUILD_TESTS=OFF + -DBUILD_WITH_DEBUG_INFO=ON + -DBUILD_WITH_STATIC_CRT=${BUILD_WITH_STATIC_CRT} + -DBUILD_JAVA=OFF + -DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR} + ###### PROTOBUF + -DPROTOBUF_UPDATE_FILES=${BUILD_opencv_dnn} + -DUPDATE_PROTO_FILES=${BUILD_opencv_dnn} + ###### PYLINT/FLAKE8 + -DENABLE_PYLINT=OFF + -DENABLE_FLAKE8=OFF + # CMAKE + -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON + -DCMAKE_DISABLE_FIND_PACKAGE_JNI=ON + # ENABLE + -DENABLE_CXX11=ON + ###### OPENCV vars + "-DOPENCV_DOWNLOAD_PATH=${DOWNLOADS}/opencv-cache" + ${BUILD_WITH_CONTRIB_FLAG} + -DOPENCV_OTHER_INSTALL_PATH=share/opencv + ###### customized properties + ## Options from vcpkg_check_features() + ${FEATURE_OPTIONS} + -DWITH_GTK=${WITH_GTK} + -DWITH_QT=${WITH_QT} + -DWITH_IPP=${WITH_IPP} + -DWITH_MATLAB=OFF + -DWITH_MSMF=${WITH_MSMF} + -DWITH_PYTHON=${WITH_PYTHON} + -DWITH_OPENMP=${WITH_OPENMP} + -DWITH_PROTOBUF=${BUILD_opencv_dnn} + -DWITH_OPENCLAMDBLAS=OFF + -DWITH_TBB=${WITH_TBB} + -DWITH_OPENJPEG=OFF + -DWITH_CPUFEATURES=OFF + ###### BUILD_options (mainly modules which require additional libraries) + -DBUILD_opencv_ovis=${BUILD_opencv_ovis} + -DBUILD_opencv_dnn=${BUILD_opencv_dnn} + -DBUILD_opencv_python3=${BUILD_opencv_python3} + ###### The following modules are disabled for UWP + -DBUILD_opencv_quality=${BUILD_opencv_quality} + -DBUILD_opencv_gapi=${BUILD_opencv_gapi} + ###### The following module is disabled because it's broken #https://github.com/opencv/opencv_contrib/issues/2307 + -DBUILD_opencv_rgbd=OFF + ###### Additional build flags + ${ADDITIONAL_BUILD_FLAGS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME opencv CONFIG_PATH "share/opencv") +vcpkg_copy_pdbs() + +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + # Update debug paths for libs in Android builds (e.g. sdk/native/staticlibs/armeabi-v7a) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules-debug.cmake" + "\${_IMPORT_PREFIX}/sdk" + "\${_IMPORT_PREFIX}/debug/sdk" + ) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES) + set(DEPS_STRING "include(CMakeFindDependencyMacro) +if(${BUILD_opencv_dnn}) + find_dependency(Protobuf CONFIG REQUIRED) + if(TARGET protobuf::libprotobuf) + add_library (libprotobuf INTERFACE IMPORTED) + set_target_properties(libprotobuf PROPERTIES + INTERFACE_LINK_LIBRARIES protobuf::libprotobuf + ) + else() + add_library (libprotobuf UNKNOWN IMPORTED) + set_target_properties(libprotobuf PROPERTIES + IMPORTED_LOCATION \"${Protobuf_LIBRARY}\" + INTERFACE_INCLUDE_DIRECTORIES \"${Protobuf_INCLUDE_DIR}\" + INTERFACE_SYSTEM_INCLUDE_DIRECTORIES \"${Protobuf_INCLUDE_DIR}\" + ) + endif() +endif() +find_dependency(Threads)") + if("tiff" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(TIFF)") + endif() + if("cuda" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(CUDA)") + endif() + if(BUILD_opencv_quality) + string(APPEND DEPS_STRING " +# C language is required for try_compile tests in FindHDF5 +enable_language(C) +find_dependency(HDF5) +find_dependency(Tesseract)") + endif() + if(WITH_TBB) + string(APPEND DEPS_STRING "\nfind_dependency(TBB)") + endif() + if("vtk" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(VTK)") + endif() + if("sfm" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(gflags CONFIG)\nfind_dependency(Ceres CONFIG)") + endif() + if("eigen" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(Eigen3 CONFIG)") + endif() + if("lapack" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(LAPACK)") + endif() + if("openexr" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(OpenEXR CONFIG)") + endif() + if(WITH_OPENMP) + string(APPEND DEPS_STRING "\nfind_dependency(OpenMP)") + endif() + if(BUILD_opencv_ovis) + string(APPEND DEPS_STRING "\nfind_dependency(Ogre)\nfind_dependency(freetype)") + endif() + if("quirc" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(quirc)") + endif() + if("qt" IN_LIST FEATURES) + string(APPEND DEPS_STRING " +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) +find_dependency(Qt${USE_QT_VERSION} COMPONENTS Core Gui Widgets Test Concurrent)") + if("opengl" IN_LIST FEATURES) + string(APPEND DEPS_STRING " +find_dependency(Qt${USE_QT_VERSION} COMPONENTS OpenGL)") + endif() + endif() + if("ade" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(ade)") + endif() + if("gdcm" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(GDCM)") + endif() + + string(REPLACE "set(CMAKE_IMPORT_FILE_VERSION 1)" + "set(CMAKE_IMPORT_FILE_VERSION 1)\n${DEPS_STRING}" OPENCV_MODULES "${OPENCV_MODULES}") + + if(WITH_OPENMP) + string(REPLACE "set_target_properties(opencv_core PROPERTIES + INTERFACE_LINK_LIBRARIES \"" + "set_target_properties(opencv_core PROPERTIES + INTERFACE_LINK_LIBRARIES \"\$;" OPENCV_MODULES "${OPENCV_MODULES}") + endif() + + if(BUILD_opencv_ovis) + string(REPLACE "OgreGLSupportStatic" + "OgreGLSupport" OPENCV_MODULES "${OPENCV_MODULES}") + endif() + + file(WRITE "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" "${OPENCV_MODULES}") + + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE") + +if(VCPKG_TARGET_IS_ANDROID) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/README.android") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/README.android") +endif() + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/opencv4/vcpkg.json b/externals/vcpkg/ports/opencv4/vcpkg.json new file mode 100755 index 000000000..f22f6e99f --- /dev/null +++ b/externals/vcpkg/ports/opencv4/vcpkg.json @@ -0,0 +1,307 @@ +{ + "name": "opencv4", + "version": "4.5.5", + "port-version": 5, + "description": "computer vision library", + "homepage": "https://github.com/opencv/opencv", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + { + "name": "vcpkg-get-python-packages", + "host": true + }, + "zlib" + ], + "default-features": [ + "default-features" + ], + "features": { + "ade": { + "description": "graph api", + "dependencies": [ + "ade" + ] + }, + "contrib": { + "description": "opencv_contrib module", + "dependencies": [ + { + "name": "hdf5", + "platform": "!uwp & !(windows & (arm | arm64))" + }, + { + "name": "tesseract", + "platform": "!uwp & !(windows & (arm | arm64))" + } + ] + }, + "cuda": { + "description": "CUDA support for opencv", + "dependencies": [ + "cuda", + { + "name": "opencv4", + "default-features": false, + "features": [ + "contrib" + ] + } + ] + }, + "cudnn": { + "description": "cuDNN support for opencv", + "dependencies": [ + "cudnn", + { + "name": "opencv4", + "default-features": false, + "features": [ + "cuda" + ] + } + ] + }, + "dc1394": { + "description": "Dc1394 support for opencv", + "dependencies": [ + "libdc1394" + ] + }, + "default-features": { + "description": "Platform-dependent default features", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "dnn", + "jpeg", + "png", + "quirc", + "tiff", + "webp" + ] + }, + { + "name": "opencv4", + "default-features": false, + "features": [ + "gtk" + ], + "platform": "linux" + } + ] + }, + "dnn": { + "description": "Enable dnn module", + "dependencies": [ + "protobuf" + ] + }, + "eigen": { + "description": "Eigen support for opencv", + "dependencies": [ + "eigen3" + ] + }, + "ffmpeg": { + "description": "ffmpeg support for opencv", + "dependencies": [ + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "avcodec", + "avformat", + "swresample", + "swscale" + ] + } + ] + }, + "freetype": { + "description": "Freetype support for opencv", + "dependencies": [ + "freetype", + "harfbuzz" + ] + }, + "gdcm": { + "description": "GDCM support for opencv", + "dependencies": [ + "gdcm" + ] + }, + "gstreamer": { + "description": "gstreamer support for opencv", + "dependencies": [ + "gstreamer" + ] + }, + "gtk": { + "description": "GTK support for opencv", + "dependencies": [ + "gtk" + ] + }, + "halide": { + "description": "Halide support for opencv", + "dependencies": [ + "halide", + { + "name": "opencv4", + "default-features": false + }, + { + "name": "opencv4", + "features": [ + "dnn" + ] + } + ] + }, + "ipp": { + "description": "Enable Intel Integrated Performance Primitives" + }, + "jasper": { + "description": "JPEG 2000 support for opencv", + "dependencies": [ + "jasper" + ] + }, + "jpeg": { + "description": "JPEG support for opencv", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "lapack": { + "description": "LAPACK support for opencv", + "dependencies": [ + "blas", + "lapack" + ] + }, + "nonfree": { + "description": "allow nonfree and unredistributable libraries" + }, + "openexr": { + "description": "OpenEXR support for opencv", + "dependencies": [ + "openexr" + ] + }, + "opengl": { + "description": "opengl support for opencv", + "dependencies": [ + "opengl" + ] + }, + "openmp": { + "description": "Enable openmp support for opencv" + }, + "ovis": { + "description": "opencv_ovis module", + "dependencies": [ + "ogre", + { + "name": "opencv4", + "default-features": false, + "features": [ + "contrib" + ] + } + ] + }, + "png": { + "description": "PNG support for opencv", + "dependencies": [ + "libpng" + ] + }, + "python": { + "description": "Python wrapper support for opencv", + "dependencies": [ + "python3" + ] + }, + "qt": { + "description": "Qt GUI support for opencv", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] + }, + "quirc": { + "description": "Enable QR code module", + "dependencies": [ + "quirc" + ] + }, + "sfm": { + "description": "opencv_sfm module", + "dependencies": [ + "ceres", + "gflags", + "glog", + { + "name": "opencv4", + "default-features": false, + "features": [ + "contrib" + ] + }, + { + "name": "opencv4", + "default-features": false, + "features": [ + "eigen" + ] + } + ] + }, + "tbb": { + "description": "Enable Intel Threading Building Blocks", + "dependencies": [ + "tbb" + ] + }, + "tiff": { + "description": "TIFF support for opencv", + "dependencies": [ + "tiff" + ] + }, + "vtk": { + "description": "vtk support for opencv", + "dependencies": [ + { + "name": "opencv4", + "features": [ + "contrib" + ] + }, + "vtk" + ] + }, + "webp": { + "description": "WebP support for opencv", + "dependencies": [ + "libwebp" + ] + }, + "world": { + "description": "Compile to a single package support for opencv" + } + } +} diff --git a/externals/vcpkg/ports/opendnp3/deps/asio.cmake b/externals/vcpkg/ports/opendnp3/deps/asio.cmake new file mode 100755 index 000000000..7645e466a --- /dev/null +++ b/externals/vcpkg/ports/opendnp3/deps/asio.cmake @@ -0,0 +1 @@ +find_package(asio CONFIG REQUIRED) diff --git a/externals/vcpkg/ports/opendnp3/opendnp3-config.cmake.in b/externals/vcpkg/ports/opendnp3/opendnp3-config.cmake.in new file mode 100755 index 000000000..79b2ef89e --- /dev/null +++ b/externals/vcpkg/ports/opendnp3/opendnp3-config.cmake.in @@ -0,0 +1,22 @@ +# Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set(@PROJECT_NAME@_VERSION @PROJECT_VERSION@) + +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) +@FIND_DEPENDS@ + +include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake) \ No newline at end of file diff --git a/externals/vcpkg/ports/opendnp3/portfile.cmake b/externals/vcpkg/ports/opendnp3/portfile.cmake new file mode 100755 index 000000000..d0b5b976f --- /dev/null +++ b/externals/vcpkg/ports/opendnp3/portfile.cmake @@ -0,0 +1,65 @@ +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO dnp3/opendnp3 + REF 3.1.1 + SHA512 2d7b26753fa03596ab73944236e5f1d82656f38248cc23fd00f7a2cdac27f481e5fe51e68b5896b6740db1a6d9560f0262e473648e001601125f4af8b4a652c2 +) + +file(READ "${SOURCE_PATH}/deps/ser4cpp.cmake" ser4cpp_cmake) +if(ser4cpp_cmake MATCHES "https://github\\.com/automatak/ser4cpp/archive/([0-9a-f]*)\\.zip") + vcpkg_from_github( + OUT_SOURCE_PATH ser4cpp_src + REPO automatak/ser4cpp + REF "${CMAKE_MATCH_1}" + SHA512 cd8d634c0e9fadda357bdd832c382189461f4707ced4834604668df0aa4e396333cce8d676d4f98ba1b414664228518e9a24c6456204b9d96a5f2df078bada2c + ) +else() + message(FATAL_ERROR "Unable to determine version of ser4cpp") +endif() + +file(READ "${SOURCE_PATH}/deps/exe4cpp.cmake" exe4cpp_cmake) +if(exe4cpp_cmake MATCHES "https://github\\.com/automatak/exe4cpp/archive/([0-9a-f]*)\\.zip") + vcpkg_from_github( + OUT_SOURCE_PATH exe4cpp_src + REPO automatak/exe4cpp + REF "${CMAKE_MATCH_1}" + SHA512 c8946db752c0f8499d21c2da96b84676b8768954bcb1964f4c444c731d9871d8978cb96fe89b1125e91b861aef0984bdd943a4dccb91d17ba43f22c57673b7b2 + ) +else() + message(FATAL_ERROR "Unable to determine version of exe4cpp") +endif() + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/opendnp3-config.cmake.in" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/deps/" DESTINATION "${SOURCE_PATH}/deps/") + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATICLIBS) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tls DNP3_TLS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DDNP3_STATIC_LIBS=${STATICLIBS} + -DFETCHCONTENT_FULLY_DISCONNECTED=ON + -DFETCHCONTENT_SOURCE_DIR_SER4CPP=${ser4cpp_src} + -DFETCHCONTENT_SOURCE_DIR_EXE4CPP=${exe4cpp_src} + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/opendnp3/vcpkg.json b/externals/vcpkg/ports/opendnp3/vcpkg.json new file mode 100755 index 000000000..98d7f3370 --- /dev/null +++ b/externals/vcpkg/ports/opendnp3/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "opendnp3", + "version": "3.1.1", + "port-version": 1, + "description": "DNP3 (IEEE-1815) protocol stack. Modern C++ with bindings for .NET and Java.", + "homepage": "https://github.com/dnp3/opendnp3/", + "supports": "!uwp", + "dependencies": [ + "asio", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tls": { + "description": "Build TLS client/server support", + "dependencies": [ + "openssl" + ] + } + } +} diff --git a/externals/vcpkg/ports/openexr/0001-remove_find_package_macro.patch b/externals/vcpkg/ports/openexr/0001-remove_find_package_macro.patch new file mode 100755 index 000000000..967e89a83 --- /dev/null +++ b/externals/vcpkg/ports/openexr/0001-remove_find_package_macro.patch @@ -0,0 +1,87 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 111a603..109394f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,22 +25,12 @@ endif() + project(OpenEXRMetaProject) + + +-# An "official" way to make this a super-project +-# basically overrides the find_package to not find anything +-# for stuff we're including locally +-set(as_subproject IlmBase OpenEXR) +-macro(find_package) +- if(NOT "${ARGV0}" IN_LIST as_subproject) +- _find_package(${ARGV}) +- endif() +-endmacro() +- + + # If you want to use ctest to configure, build and + # upload the results, cmake has builtin support for + # submitting to CDash, or any server who speaks the + # same protocol +-# ++# + # These settings will need to be set for your environment, + # and then a script such as the example in + # +@@ -51,7 +41,7 @@ endmacro() + # cmake -S cmake/SampleCTestScript.cmake + # + # [or whatever you name the file you edit] +-# ++# + #set(CTEST_PROJECT_NAME "OpenEXR") + #set(CTEST_NIGHTLY_START_TIME "01:01:01 UTC") + #set(CTEST_DROP_METHOD "http") # there are others... +diff --git a/OpenEXR/CMakeLists.txt b/OpenEXR/CMakeLists.txt +index 390b27f..87b2d01 100644 +--- a/OpenEXR/CMakeLists.txt ++++ b/OpenEXR/CMakeLists.txt +@@ -35,7 +35,6 @@ include(config/OpenEXRSetup.cmake) + + # Everyone depends on IlmBase, and we currently rely on + # the version matched with our release +-find_package(IlmBase ${OPENEXR_VERSION} EXACT REQUIRED CONFIG) + + # generates config headers, package config files + add_subdirectory(config) +diff --git a/OpenEXR/config/OpenEXRSetup.cmake b/OpenEXR/config/OpenEXRSetup.cmake +index 5116726..34c7c87 100644 +--- a/OpenEXR/config/OpenEXRSetup.cmake ++++ b/OpenEXR/config/OpenEXRSetup.cmake +@@ -33,7 +33,7 @@ endif() + # Whether to build & install the various command line utility programs + option(OPENEXR_BUILD_UTILS "Enables building of utility programs" ON) + +-# This is a variable here for use in controlling where include files are ++# This is a variable here for use in controlling where include files are + # installed. Care must be taken when changing this, as many things + # probably assume this is OpenEXR + set(OPENEXR_OUTPUT_SUBDIR OpenEXR CACHE STRING "Destination sub-folder of the include path for install") +diff --git a/OpenEXR_Viewers/CMakeLists.txt b/OpenEXR_Viewers/CMakeLists.txt +index 5efa353..5246fa7 100644 +--- a/OpenEXR_Viewers/CMakeLists.txt ++++ b/OpenEXR_Viewers/CMakeLists.txt +@@ -24,8 +24,6 @@ project(OpenEXR_Viewers VERSION ${OPENEXR_VIEWERS_VERSION}) + ####################################### + include(config/OpenEXRViewersSetup.cmake) + +-find_package(IlmBase ${OPENEXR_VIEWERS_VERSION} EXACT REQUIRED CONFIG) +-find_package(OpenEXR ${OPENEXR_VIEWERS_VERSION} EXACT REQUIRED CONFIG) + + # This is for newer cmake versions who know about vendor versions + set(OpenGL_GL_PREFERENCE GLVND) +diff --git a/PyIlmBase/CMakeLists.txt b/PyIlmBase/CMakeLists.txt +index 291b96e..7d5074f 100644 +--- a/PyIlmBase/CMakeLists.txt ++++ b/PyIlmBase/CMakeLists.txt +@@ -27,7 +27,6 @@ project(PyIlmBase VERSION ${PYILMBASE_VERSION} LANGUAGES C CXX) + include(config/PyIlmBaseSetup.cmake) + + # we have a strong dependence on IlmBase being an exact match +-find_package(IlmBase ${PYILMBASE_VERSION} EXACT REQUIRED CONFIG) + + # we are building a python extension, so of course we depend on + # python as well. Except we don't know which version... diff --git a/externals/vcpkg/ports/openexr/0002-fixup_cmake_exports_path.patch b/externals/vcpkg/ports/openexr/0002-fixup_cmake_exports_path.patch new file mode 100755 index 000000000..e39bd3792 --- /dev/null +++ b/externals/vcpkg/ports/openexr/0002-fixup_cmake_exports_path.patch @@ -0,0 +1,78 @@ +diff --git a/IlmBase/config/CMakeLists.txt b/IlmBase/config/CMakeLists.txt +index d9c5ae4..45ee6cc 100644 +--- a/IlmBase/config/CMakeLists.txt ++++ b/IlmBase/config/CMakeLists.txt +@@ -105,7 +105,7 @@ endif() + include(CMakePackageConfigHelpers) + configure_package_config_file(IlmBaseConfig.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake +- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ INSTALL_DESTINATION share/ilmbase + ) + write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" + VERSION ${ILMBASE_VERSION} +@@ -113,10 +113,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" + ) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ DESTINATION share/ilmbase + ) + install(EXPORT ${PROJECT_NAME} +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ DESTINATION share/ilmbase + FILE ${PROJECT_NAME}Targets.cmake + NAMESPACE ${PROJECT_NAME}:: + EXPORT_LINK_INTERFACE_LIBRARIES +diff --git a/OpenEXR/config/CMakeLists.txt b/OpenEXR/config/CMakeLists.txt +index b52ad0d..3dc6d22 100644 +--- a/OpenEXR/config/CMakeLists.txt ++++ b/OpenEXR/config/CMakeLists.txt +@@ -19,7 +19,7 @@ int main() + sysconf(_SC_NPROCESSORS_ONLN); + } + " OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN +-) ++) + + check_cxx_source_compiles( + " +@@ -100,7 +100,7 @@ endif() + include(CMakePackageConfigHelpers) + configure_package_config_file(OpenEXRConfig.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake +- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ INSTALL_DESTINATION share/openexr + ) + write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" + VERSION ${OPENEXR_VERSION} +@@ -108,10 +108,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" + ) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ DESTINATION share/openexr + ) + install(EXPORT ${PROJECT_NAME} +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ DESTINATION share/openexr + FILE ${PROJECT_NAME}Targets.cmake + NAMESPACE ${PROJECT_NAME}:: + EXPORT_LINK_INTERFACE_LIBRARIES +diff --git a/PyIlmBase/config/CMakeLists.txt b/PyIlmBase/config/CMakeLists.txt +index 1872c89..bc61f43 100644 +--- a/PyIlmBase/config/CMakeLists.txt ++++ b/PyIlmBase/config/CMakeLists.txt +@@ -39,10 +39,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" + COMPATIBILITY SameMajorVersion + ) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ DESTINATION share/pyilmbase + ) + install(EXPORT ${PROJECT_NAME} +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ DESTINATION share/pyilmbase + FILE ${PROJECT_NAME}Config.cmake + NAMESPACE ${PROJECT_NAME}:: + EXPORT_LINK_INTERFACE_LIBRARIES diff --git a/externals/vcpkg/ports/openexr/0003-remove_symlinks.patch b/externals/vcpkg/ports/openexr/0003-remove_symlinks.patch new file mode 100755 index 000000000..89b9c53f3 --- /dev/null +++ b/externals/vcpkg/ports/openexr/0003-remove_symlinks.patch @@ -0,0 +1,40 @@ +diff --git a/IlmBase/config/LibraryDefine.cmake b/IlmBase/config/LibraryDefine.cmake +index 44254a7..1f5d2a6 100644 +--- a/IlmBase/config/LibraryDefine.cmake ++++ b/IlmBase/config/LibraryDefine.cmake +@@ -101,15 +101,6 @@ function(ILMBASE_DEFINE_LIBRARY libname) + if(BUILD_SHARED_LIBS AND (NOT "${ILMBASE_LIB_SUFFIX}" STREQUAL "")) + set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${ILMBASE_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX}) +- if(WIN32) +- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") +- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_BINDIR} ${baselibname} -> ${verlibname}\")") +- else() +- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") +- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")") +- endif() +- set(verlibname) +- set(baselibname) + endif() + + if(ILMBASE_BUILD_BOTH_STATIC_SHARED) +diff --git a/OpenEXR/config/LibraryDefine.cmake b/OpenEXR/config/LibraryDefine.cmake +index a9561dc..42853af 100644 +--- a/OpenEXR/config/LibraryDefine.cmake ++++ b/OpenEXR/config/LibraryDefine.cmake +@@ -95,15 +95,6 @@ function(OPENEXR_DEFINE_LIBRARY libname) + if(BUILD_SHARED_LIBS AND (NOT "${OPENEXR_LIB_SUFFIX}" STREQUAL "")) + set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX}) +- if(WIN32) +- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") +- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_BINDIR} ${baselibname} -> ${verlibname}\")") +- else() +- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") +- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_DIR} ${baselibname} -> ${verlibname}\")") +- endif() +- set(verlibname) +- set(baselibname) + endif() + + if(OPENEXR_BUILD_BOTH_STATIC_SHARED) diff --git a/externals/vcpkg/ports/openexr/0004-Fix-pkg-config-lib-suffix-for-cmake-debug-builds.patch b/externals/vcpkg/ports/openexr/0004-Fix-pkg-config-lib-suffix-for-cmake-debug-builds.patch new file mode 100755 index 000000000..83ab73a21 --- /dev/null +++ b/externals/vcpkg/ports/openexr/0004-Fix-pkg-config-lib-suffix-for-cmake-debug-builds.patch @@ -0,0 +1,54 @@ +From 6cd6b32af052563e4cd5114a1d279736d1d8653a Mon Sep 17 00:00:00 2001 +From: "Matthias C. M. Troffaes" +Date: Tue, 1 Jun 2021 08:06:45 +0100 +Subject: [PATCH] Use CMAKE__POSTFIX for .pc file lib suffix. + +Signed-off-by: Matthias C. M. Troffaes +--- + IlmBase/config/CMakeLists.txt | 3 ++- + OpenEXR/config/CMakeLists.txt | 3 ++- + PyIlmBase/config/CMakeLists.txt | 3 ++- + 3 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/IlmBase/config/CMakeLists.txt b/IlmBase/config/CMakeLists.txt +index d9c5ae449..dfebb43bd 100644 +--- a/IlmBase/config/CMakeLists.txt ++++ b/IlmBase/config/CMakeLists.txt +@@ -78,7 +78,8 @@ if(ILMBASE_INSTALL_PKG_CONFIG) + set(exec_prefix "\${prefix}") + set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") + set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") +- set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX}) ++ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) ++ set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}) + if(TARGET Threads::Threads) + # hrm, can't use properties as they end up as generator expressions + # which don't seem to evaluate +diff --git a/OpenEXR/config/CMakeLists.txt b/OpenEXR/config/CMakeLists.txt +index 8386e3a0e..039190cd9 100644 +--- a/OpenEXR/config/CMakeLists.txt ++++ b/OpenEXR/config/CMakeLists.txt +@@ -77,7 +77,8 @@ if(OPENEXR_INSTALL_PKG_CONFIG) + set(exec_prefix "\${prefix}") + set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") + set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") +- set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}) ++ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) ++ set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}) + if(TARGET Threads::Threads) + # hrm, can't use properties as they end up as generator expressions + # which don't seem to evaluate +diff --git a/PyIlmBase/config/CMakeLists.txt b/PyIlmBase/config/CMakeLists.txt +index 1872c89e7..a4139bcfd 100644 +--- a/PyIlmBase/config/CMakeLists.txt ++++ b/PyIlmBase/config/CMakeLists.txt +@@ -18,7 +18,8 @@ if(PYILMBASE_INSTALL_PKG_CONFIG) + set(exec_prefix ${CMAKE_INSTALL_BINDIR}) + set(libdir ${CMAKE_INSTALL_LIBDIR}) + set(includedir ${CMAKE_INSTALL_INCLUDEDIR}) +- set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}) ++ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) ++ set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}) + string(REPLACE ".in" "" pcout ${pcinfile}) + configure_file(${pcinfile} ${CMAKE_CURRENT_BINARY_DIR}/${pcout} @ONLY) + install( diff --git a/externals/vcpkg/ports/openexr/portfile.cmake b/externals/vcpkg/ports/openexr/portfile.cmake new file mode 100755 index 000000000..aac8fea55 --- /dev/null +++ b/externals/vcpkg/ports/openexr/portfile.cmake @@ -0,0 +1,61 @@ +if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "UWP build not supported") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO openexr/openexr + REF ed64d5467dee9763f28baf300f7699e6288b9f5f + SHA512 549d37ed1ef4d1ff7e732d583f7213ee15c7f92625aea9fd65345e4c5b854902c02e5940d0692b1af5ae0a02abf46aaefea2662db2389d1b2fb4264a373baac2 + HEAD_REF master + PATCHES + 0001-remove_find_package_macro.patch + 0002-fixup_cmake_exports_path.patch + 0003-remove_symlinks.patch + 0004-Fix-pkg-config-lib-suffix-for-cmake-debug-builds.patch # https://github.com/AcademySoftwareFoundation/openexr/pull/1032 +) + +vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCMAKE_DEBUG_POSTFIX=_d + -DPYILMBASE_ENABLE=FALSE +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/ilmbase TARGET_PATH share/ilmbase) +vcpkg_fixup_cmake_targets() +vcpkg_fixup_pkgconfig() + +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrenvmap${VCPKG_HOST_EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrheader${VCPKG_HOST_EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmakepreview${VCPKG_HOST_EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmaketiled${VCPKG_HOST_EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmultipart${VCPKG_HOST_EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmultiview${VCPKG_HOST_EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrstdattr${VCPKG_HOST_EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exr2aces${VCPKG_HOST_EXECUTABLE_SUFFIX}) + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/openexr/) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrenvmap${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrenvmap${VCPKG_HOST_EXECUTABLE_SUFFIX}) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrheader${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrheader${VCPKG_HOST_EXECUTABLE_SUFFIX}) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmakepreview${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmakepreview${VCPKG_HOST_EXECUTABLE_SUFFIX}) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmaketiled${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmaketiled${VCPKG_HOST_EXECUTABLE_SUFFIX}) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmultipart${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmultipart${VCPKG_HOST_EXECUTABLE_SUFFIX}) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmultiview${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmultiview${VCPKG_HOST_EXECUTABLE_SUFFIX}) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrstdattr${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrstdattr${VCPKG_HOST_EXECUTABLE_SUFFIX}) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exr2aces${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exr2aces${VCPKG_HOST_EXECUTABLE_SUFFIX}) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/openexr) + +vcpkg_copy_pdbs() + +if (VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/openexr/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/openexr/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..479cd3027 --- /dev/null +++ b/externals/vcpkg/ports/openexr/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,38 @@ +_find_package(${ARGS}) + +if(TARGET OpenEXR::IlmImf AND NOT OPENEXR_LIBRARIES AND NOT OPENEXR_FOUND) + set(OPENEXR_FOUND TRUE CACHE BOOL "") + set(OpenEXR_FOUND TRUE CACHE BOOL "") + set(OPENEXR_VERSION "2.5.0" CACHE STRING "") + set(OpenEXR_VERSION "2.5.0" CACHE STRING "") + get_target_property(OpenEXR_INCLUDE_DIRS OpenEXR::IlmImf INTERFACE_INCLUDE_DIRECTORIES) + get_target_property(OPENEXR_INCLUDE_PATHS OpenEXR::IlmImf INTERFACE_INCLUDE_DIRECTORIES) + get_target_property(OPENEXR_INCLUDE_DIRS OpenEXR::IlmImf INTERFACE_INCLUDE_DIRECTORIES) + get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::IlmImf INTERFACE_INCLUDE_DIRECTORIES) + set(OpenEXR_INCLUDE_DIRS ${OpenEXR_INCLUDE_DIRS} CACHE STRING "") + set(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_PATHS} CACHE STRING "") + set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIRS} CACHE STRING "") + set(OPENEXR_INCLUDE_DIR ${OPENEXR_INCLUDE_DIR} CACHE STRING "") + set(OPENEXR_ILMIMF_LIBRARY "OpenEXR::IlmImf" CACHE STRING "") + set(OPENEXR_ILMIMFUTIL_LIBRARY "OpenEXR::IlmImfUtil" CACHE STRING "") + set(OPENEXR_LIBRARIES ${OPENEXR_ILMIMFUTIL_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} CACHE STRING "") +endif() + +if(TARGET IlmBase::Half AND NOT ILMBASE_LIBRARIES AND NOT ILMBASE_FOUND) + set(ILMBASE_FOUND TRUE CACHE BOOL "") + set(IlmBASE_FOUND TRUE CACHE BOOL "") + set(ILMBASE_VERSION "2.5.0" CACHE STRING "") + set(IlmBASE_VERSION "2.5.0" CACHE STRING "") + get_target_property(ILMBASE_INCLUDE_DIR IlmBase::Half INTERFACE_INCLUDE_DIRECTORIES) + get_target_property(ILMBASE_INCLUDE_DIRS IlmBase::Half INTERFACE_INCLUDE_DIRECTORIES) + get_target_property(ILMBASE_INCLUDE_PATHS IlmBase::Half INTERFACE_INCLUDE_DIRECTORIES) + set(ILMBASE_INCLUDE_DIR ${ILMBASE_INCLUDE_DIR} CACHE STRING "") + set(ILMBASE_INCLUDE_DIRS ${ILMBASE_INCLUDE_DIRS} CACHE STRING "") + set(ILMBASE_INCLUDE_PATHS ${ILMBASE_INCLUDE_PATHS} CACHE STRING "") + set(OPENEXR_HALF_LIBRARY "IlmBase::Half" CACHE STRING "") + set(OPENEXR_IEX_LIBRARY "IlmBase::Iex" CACHE STRING "") + set(OPENEXR_IEXMATH_LIBRARY "IlmBase::IexMath" CACHE STRING "") + set(OPENEXR_ILMTHREAD_LIBRARY "IlmBase::IlmThread" CACHE STRING "") + set(OPENEXR_IMATH_LIBRARY "IlmBase::Imath" CACHE STRING "") + set(ILMBASE_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${OPENEXR_IEXMATH_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "") +endif() diff --git a/externals/vcpkg/ports/openexr/vcpkg.json b/externals/vcpkg/ports/openexr/vcpkg.json new file mode 100755 index 000000000..b293e7047 --- /dev/null +++ b/externals/vcpkg/ports/openexr/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "openexr", + "version-string": "2.5.0", + "port-version": 3, + "description": "OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications", + "homepage": "https://www.openexr.com/", + "supports": "!uwp", + "dependencies": [ + "zlib" + ] +} diff --git a/externals/vcpkg/ports/opengl-registry/portfile.cmake b/externals/vcpkg/ports/opengl-registry/portfile.cmake new file mode 100755 index 000000000..15dcf2a5e --- /dev/null +++ b/externals/vcpkg/ports/opengl-registry/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KhronosGroup/OpenGL-Registry + REF a48c224a2db6edc4f4c610025b529d1c31ee9445 + SHA512 30cfb1f8979676298e72604898879dae31953839acffc203027165fc131e74dafcf827fdeb07e64021fb8e8318bca38fa4d8656d8248f7bfba76e01d24895818 + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/api/GL" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(COPY "${SOURCE_PATH}/api/GLES" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(COPY "${SOURCE_PATH}/api/GLES2" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(COPY "${SOURCE_PATH}/api/GLES3" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(COPY "${SOURCE_PATH}/api/GLSC" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(COPY "${SOURCE_PATH}/api/GLSC2" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(GLOB reg_files "${SOURCE_PATH}/xml/*.xml" "${SOURCE_PATH}/xml/readme.pdf" "${SOURCE_PATH}/xml/*.rnc" "${SOURCE_PATH}/xml/reg.py") +file(COPY + ${reg_files} + DESTINATION "${CURRENT_PACKAGES_DIR}/share/opengl" +) + +# Using the Makefile because it is the smallest file with a complete copy of the license text +file( + INSTALL "${SOURCE_PATH}/xml/Makefile" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) + +# pc layout from cygwin (consumed in xserver!) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/pkgconfig/khronos-opengl-registry.pc" [=[ +prefix=${pcfiledir}/../.. +datadir=${prefix}/share +specdir=${datadir}/opengl +Name: khronos-opengl-registry +Description: Khronos OpenGL registry +Version: git4594c03239fb76580bc5d5a13acb2a8f563f0158 +]=]) diff --git a/externals/vcpkg/ports/opengl-registry/vcpkg.json b/externals/vcpkg/ports/opengl-registry/vcpkg.json new file mode 100755 index 000000000..a5809f6ec --- /dev/null +++ b/externals/vcpkg/ports/opengl-registry/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "opengl-registry", + "version-date": "2021-11-17", + "description": "the API and Extension registries for the OpenGL family APIs", + "homepage": "https://github.com/KhronosGroup/OpenGL-Registry", + "dependencies": [ + "egl-registry" + ] +} diff --git a/externals/vcpkg/ports/opengl/glu.pc.in b/externals/vcpkg/ports/opengl/glu.pc.in new file mode 100755 index 000000000..1d086a91e --- /dev/null +++ b/externals/vcpkg/ports/opengl/glu.pc.in @@ -0,0 +1,10 @@ +prefix=${pcfiledir}/../.. +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: glu +Description: OpenGL Utility Library +Version: @WINDOWS_SDK_SEMVER@ +Requires: opengl +Libs: -L${libdir} -lGlU32 +Cflags: -I${includedir} diff --git a/externals/vcpkg/ports/opengl/opengl.pc.in b/externals/vcpkg/ports/opengl/opengl.pc.in new file mode 100755 index 000000000..231bce085 --- /dev/null +++ b/externals/vcpkg/ports/opengl/opengl.pc.in @@ -0,0 +1,9 @@ +prefix=${pcfiledir}/../.. +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: OpenGL +Description: OpenGL library and headers. +Version: @WINDOWS_SDK_SEMVER@ +Libs: -L${libdir} -lOpenGL32 +Cflags: -I${includedir} diff --git a/externals/vcpkg/ports/opengl/portfile.cmake b/externals/vcpkg/ports/opengl/portfile.cmake new file mode 100755 index 000000000..5a20f8ea0 --- /dev/null +++ b/externals/vcpkg/ports/opengl/portfile.cmake @@ -0,0 +1,79 @@ +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + vcpkg_get_windows_sdk(WINDOWS_SDK) + + if (WINDOWS_SDK MATCHES "10.") + file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Lib/${WINDOWS_SDK}/um/${TRIPLET_SYSTEM_ARCH}/OpenGL32.Lib" LIBGLFILEPATH) + file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Lib/${WINDOWS_SDK}/um/${TRIPLET_SYSTEM_ARCH}/GlU32.Lib" LIBGLUFILEPATH) + file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Include/${WINDOWS_SDK}/um" HEADERSPATH) + elseif(WINDOWS_SDK MATCHES "8.") + file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Lib/winv6.3/um/${TRIPLET_SYSTEM_ARCH}/OpenGL32.Lib" LIBGLFILEPATH) + file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Lib/winv6.3/um/${TRIPLET_SYSTEM_ARCH}/GlU32.Lib" LIBGLUFILEPATH) + file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Include/um" HEADERSPATH) + else() + message(FATAL_ERROR "Portfile not yet configured for Windows SDK with version: ${WINDOWS_SDK}") + endif() + + if (NOT EXISTS "${LIBGLFILEPATH}") + message(FATAL_ERROR "Cannot find Windows ${WINDOWS_SDK} SDK. File does not exist: ${LIBGLFILEPATH}") + endif() + + if (NOT EXISTS "${LIBGLUFILEPATH}") + message(FATAL_ERROR "Cannot find Windows ${WINDOWS_SDK} SDK. File does not exist: ${LIBGLUFILEPATH}") + endif() + + file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/include/gl" INCLUDEGLPATH) + file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/share/opengl" SHAREOPENGLPATH) + file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/lib" RELEASELIBPATH) + file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/debug/lib" DEBUGLIBPATH) + file(TO_NATIVE_PATH "${HEADERSPATH}/gl/GL.h" GLGLHPATH) + file(TO_NATIVE_PATH "${HEADERSPATH}/gl/GLU.h" GLGLUHPATH) + + file(MAKE_DIRECTORY + "${INCLUDEGLPATH}" + "${SHAREOPENGLPATH}" + ) + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(MAKE_DIRECTORY + "${RELEASELIBPATH}" + ) + endif() + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY + "${DEBUGLIBPATH}" + ) + endif() + + file(COPY + "${GLGLHPATH}" + "${GLGLUHPATH}" + DESTINATION "${INCLUDEGLPATH}" + ) + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(COPY ${LIBGLFILEPATH} DESTINATION "${RELEASELIBPATH}") + file(COPY ${LIBGLUFILEPATH} DESTINATION "${RELEASELIBPATH}") + endif() + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(COPY ${LIBGLFILEPATH} DESTINATION "${DEBUGLIBPATH}") + file(COPY ${LIBGLUFILEPATH} DESTINATION "${DEBUGLIBPATH}") + endif() + + if (WINDOWS_SDK MATCHES "10.") + file(WRITE ${CURRENT_PACKAGES_DIR}/share/opengl/copyright "See https://developer.microsoft.com/windows/downloads/windows-10-sdk for the Windows 10 SDK license") + elseif(WINDOWS_SDK MATCHES "8.") + file(WRITE ${CURRENT_PACKAGES_DIR}/share/opengl/copyright "See https://developer.microsoft.com/windows/downloads/windows-8-1-sdk for the Windows 8.1 SDK license") + endif() + + string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" WINDOWS_SDK_SEMVER "${WINDOWS_SDK}") + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + configure_file("${CMAKE_CURRENT_LIST_DIR}/opengl.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/opengl.pc" @ONLY) + configure_file("${CMAKE_CURRENT_LIST_DIR}/glu.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glu.pc" @ONLY) + endif() + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + configure_file("${CMAKE_CURRENT_LIST_DIR}/opengl.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/opengl.pc" @ONLY) + configure_file("${CMAKE_CURRENT_LIST_DIR}/glu.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glu.pc" @ONLY) + endif() + vcpkg_fixup_pkgconfig() + +else() + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +endif() diff --git a/externals/vcpkg/ports/opengl/usage b/externals/vcpkg/ports/opengl/usage new file mode 100755 index 000000000..33e33f6c7 --- /dev/null +++ b/externals/vcpkg/ports/opengl/usage @@ -0,0 +1,24 @@ +The package opengl is compatible with built-in CMake targets via CMake v3.7 and prior syntax + + find_package(OpenGL REQUIRED) + target_link_libraries(main PRIVATE ${OPENGL_LIBRARIES}) + target_include_directories(main PRIVATE ${OPENGL_INCLUDE_DIR}) + +and the CMake v3.8 and beyond imported target syntax + + find_package(OpenGL REQUIRED) + target_link_libraries(main PRIVATE OpenGL::GL) + +introduction of various components + + find_package(OpenGL REQUIRED COMPONENTS GL # v3.8 + GLU # v3.8 + GLX # v3.10 + EGL # v3.10 + OpenGL) # v3.10 + +The OpenGL SDK is highly platform dependent and is usually an OS component. It's not realistic to build from source for every platform. + + WINDOWS: is part of the Windows SDK which this package installs. + LINUX: the SDK may be installed from your distro's repo or from 3rd parties manually. There are too many to count. + APPLE: consult your distribution vendor on the state of OpenGL support: https://support.apple.com/en-us/HT202823 diff --git a/externals/vcpkg/ports/opengl/vcpkg.json b/externals/vcpkg/ports/opengl/vcpkg.json new file mode 100755 index 000000000..e921d648f --- /dev/null +++ b/externals/vcpkg/ports/opengl/vcpkg.json @@ -0,0 +1,5 @@ +{ + "name": "opengl", + "version-date": "2022-03-14", + "description": "Open Graphics Library (OpenGL)[3][4][5] is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics." +} diff --git a/externals/vcpkg/ports/openh264/0001-respect-default-library-option.patch b/externals/vcpkg/ports/openh264/0001-respect-default-library-option.patch new file mode 100755 index 000000000..15e3c7154 --- /dev/null +++ b/externals/vcpkg/ports/openh264/0001-respect-default-library-option.patch @@ -0,0 +1,57 @@ +From 328b15a962caa928373b55d85f9911f45442886e Mon Sep 17 00:00:00 2001 +From: Xavier Claessens +Date: Mon, 19 Oct 2020 17:03:25 -0400 +Subject: [PATCH] meson: Respect default_library option + +When using library() instead of shared_library() and static_library, +meson will build shared, static, or both depending on the +value of static_library option. + +As far as I know extract_all_objects() was uses as workaround for Meson +bugs fixed a while ago when using not installed static libraries. +--- + meson.build | 19 +++---------------- + 1 file changed, 3 insertions(+), 16 deletions(-) + +diff --git a/meson.build b/meson.build +index 283413375b..65641508de 100644 +--- a/meson.build ++++ b/meson.build +@@ -184,26 +184,13 @@ api_header_deps = [] + subdir ('codec') + subdir ('test') + +-all_objects = [ +- libcommon.extract_all_objects(), +- libprocessing.extract_all_objects(), +- libencoder.extract_all_objects(), +- libdecoder.extract_all_objects() +-] +- +-libopenh264_shared = shared_library('openh264', +- objects: all_objects, ++libopenh264 = library('openh264', ++ link_whole: [libcommon, libprocessing, libencoder, libdecoder], + install: true, + soversion: major_version, +- version: meson.project_version(), + vs_module_defs: 'openh264.def', + dependencies: deps) + +-libopenh264_static = static_library('openh264', +- objects: all_objects, +- install: true, +- dependencies: deps) +- + pkg_install_dir = '@0@/pkgconfig'.format(get_option('libdir')) + + foreach t : ['', '-static'] +@@ -235,7 +222,7 @@ foreach t : ['', '-static'] + endforeach + + openh264_dep = declare_dependency( +- link_with: libopenh264_shared, ++ link_with: libopenh264, + include_directories: include_directories('include'), + dependencies: deps + api_header_deps) + diff --git a/externals/vcpkg/ports/openh264/portfile.cmake b/externals/vcpkg/ports/openh264/portfile.cmake new file mode 100755 index 000000000..903bb5939 --- /dev/null +++ b/externals/vcpkg/ports/openh264/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cisco/openh264 + REF f15f940425eebf24ce66984db2445733cf500b7b + SHA512 361003296e9cef2956aeff76ae4df7a949a585710facd84a92c1b4164c5a4522d6615fcc485ebc2e50be8a13feb942b870efdd28837307467081cb1eba1f17d2 + PATCHES + 0001-respect-default-library-option.patch # https://github.com/cisco/openh264/pull/3351 +) + +if((VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")) + vcpkg_find_acquire_program(NASM) + get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) + vcpkg_add_to_path(${NASM_EXE_PATH}) +elseif(VCPKG_TARGET_IS_WINDOWS) + vcpkg_find_acquire_program(GASPREPROCESSOR) + foreach(GAS_PATH ${GASPREPROCESSOR}) + get_filename_component(GAS_ITEM_PATH ${GAS_PATH} DIRECTORY) + vcpkg_add_to_path(${GAS_ITEM_PATH}) + endforeach(GAS_PATH) +endif() + +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS -Dtests=disabled +) + +vcpkg_install_meson() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/openh264/vcpkg.json b/externals/vcpkg/ports/openh264/vcpkg.json new file mode 100755 index 000000000..23f7be6b0 --- /dev/null +++ b/externals/vcpkg/ports/openh264/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "openh264", + "version-date": "2021-03-16", + "port-version": 3, + "description": "OpenH264 is a codec library which supports H.264 encoding and decoding. It is suitable for use in real time applications such as WebRTC.", + "homepage": "https://www.openh264.org/", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/openigtlink/portfile.cmake b/externals/vcpkg/ports/openigtlink/portfile.cmake new file mode 100755 index 000000000..e5e6dd466 --- /dev/null +++ b/externals/vcpkg/ports/openigtlink/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO openigtlink/OpenIGTLink + REF v3.0 + SHA512 3f62ef1c4ca349f653712cecd43af8b5afce642cc3950256498905999861d68143ba3003f6b0899f5f5c3c5c755eb282c63488ac59b4793b3622a47571452739 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTING=OFF + -DOpenIGTLink_INSTALL_PACKAGE_DIR=share/${PORT} +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +vcpkg_copy_pdbs() + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/openigtlink/vcpkg.json b/externals/vcpkg/ports/openigtlink/vcpkg.json new file mode 100755 index 000000000..a106056b5 --- /dev/null +++ b/externals/vcpkg/ports/openigtlink/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "openigtlink", + "version-string": "3.0", + "port-version": 2, + "description": "OpenIGTLink is an open-source network communication interface specifically designed for image-guided interventions.", + "homepage": "https://github.com/openigtlink/OpenIGTLink" +} diff --git a/externals/vcpkg/ports/openimageio/fix-config-cmake.patch b/externals/vcpkg/ports/openimageio/fix-config-cmake.patch new file mode 100755 index 000000000..b1ad70650 --- /dev/null +++ b/externals/vcpkg/ports/openimageio/fix-config-cmake.patch @@ -0,0 +1,13 @@ +diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in +index b498ece..fb45388 100644 +--- a/src/cmake/Config.cmake.in ++++ b/src/cmake/Config.cmake.in +@@ -30,7 +30,7 @@ endif () + #...logic to determine installedPrefix from the own location... + #set (@PROJECT_NAME@_CONFIG_DIR "${installedPrefix}/@CONFIG_INSTALL_DIR@") + +-include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") ++include("${CMAKE_CURRENT_LIST_DIR}/OpenImageIOTargets.cmake") + + check_required_components ("@PROJECT_NAME@") + diff --git a/externals/vcpkg/ports/openimageio/fix-dependencies.patch b/externals/vcpkg/ports/openimageio/fix-dependencies.patch new file mode 100755 index 000000000..fb630ad9a --- /dev/null +++ b/externals/vcpkg/ports/openimageio/fix-dependencies.patch @@ -0,0 +1,69 @@ +diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in +index b690864..fb45388 100644 +--- a/src/cmake/Config.cmake.in ++++ b/src/cmake/Config.cmake.in +@@ -11,6 +11,9 @@ elseif (@OpenEXR_VERSION@ VERSION_GREATER_EQUAL 2.4 AND @FOUND_OPENEXR_WITH_CONF + HINTS @IlmBase_DIR@ @OpenEXR_DIR@) + find_dependency(OpenEXR @OpenEXR_VERSION@ + HINTS @OpenEXR_DIR@) ++ find_dependency(libpng CONFIG REQUIRED) ++ find_dependency(libheif CONFIG REQUIRED) ++ find_dependency(unofficial-libsquish CONFIG REQUIRED) + find_dependency(ZLIB @ZLIB_VERSION@) # Because OpenEXR doesn't do it + find_dependency(Threads) # Because OpenEXR doesn't do it + endif () +diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake +index 631035a..9f4d096 100644 +--- a/src/cmake/externalpackages.cmake ++++ b/src/cmake/externalpackages.cmake +@@ -148,7 +148,7 @@ find_python() + # Dependencies for optional formats and features. If these are not found, + # we will continue building, but the related functionality will be disabled. + +-checked_find_package (PNG) ++checked_find_package (png PREFER_CONFIG) + + checked_find_package (BZip2) # Used by ffmpeg and freetype + if (NOT BZIP2_FOUND) +@@ -200,7 +200,8 @@ if (ENABLE_FIELD3D) + endif () + + # For HEIF/HEIC/AVIF formats +-checked_find_package (Libheif VERSION_MIN 1.3 ++checked_find_package (libheif VERSION_MIN 1.3 ++ PREFER_CONFIG + RECOMMEND_MIN 1.7 + RECOMMEND_MIN_REASON "for AVIF support") + if (APPLE AND LIBHEIF_VERSION VERSION_GREATER_EQUAL 1.10 AND LIBHEIF_VERSION VERSION_LESS 1.11) +@@ -307,7 +308,8 @@ endmacro() + option (USE_EMBEDDED_LIBSQUISH + "Force use of embedded Libsquish, even if external is found" OFF) + if (NOT USE_EMBEDDED_LIBSQUISH) +- checked_find_package (Libsquish) ++ checked_find_package (unofficial-libsquish PREFER_CONFIG) ++ set(libsquish_FOUND 1) + endif () + + +diff --git a/src/ico.imageio/CMakeLists.txt b/src/ico.imageio/CMakeLists.txt +index d290625..cff954c 100644 +--- a/src/ico.imageio/CMakeLists.txt ++++ b/src/ico.imageio/CMakeLists.txt +@@ -2,9 +2,15 @@ + # SPDX-License-Identifier: BSD-3-Clause + # https://github.com/OpenImageIO/oiio + +-if (TARGET PNG::PNG) ++if (libpng_FOUND) ++ if (TARGET png_static) ++ set(PNG_TARGET png_static) ++ elseif (TARGET png) ++ set(PNG_TARGET png) ++ endif() ++ + add_oiio_plugin (icoinput.cpp icooutput.cpp +- LINK_LIBRARIES PNG::PNG ZLIB::ZLIB) ++ LINK_LIBRARIES ${PNG_TARGET} ZLIB::ZLIB) + else () + message (WARNING "libpng not found, so ICO support will not work") + set (format_plugin_definitions ${format_plugin_definitions} DISABLE_ICO=1 PARENT_SCOPE) diff --git a/externals/vcpkg/ports/openimageio/fix-ffmpeg-tool.patch b/externals/vcpkg/ports/openimageio/fix-ffmpeg-tool.patch new file mode 100755 index 000000000..e185a3003 --- /dev/null +++ b/externals/vcpkg/ports/openimageio/fix-ffmpeg-tool.patch @@ -0,0 +1,17 @@ +diff --git a/src/ffmpeg.imageio/CMakeLists.txt b/src/ffmpeg.imageio/CMakeLists.txt +index 5840206..cc52e4c 100644 +--- a/src/ffmpeg.imageio/CMakeLists.txt ++++ b/src/ffmpeg.imageio/CMakeLists.txt +@@ -2,9 +2,10 @@ + # SPDX-License-Identifier: BSD-3-Clause + # https://github.com/OpenImageIO/oiio + +-if (FFmpeg_FOUND) ++if (USE_FFMPEG) ++ find_package(FFMPEG REQUIRED) + add_oiio_plugin (ffmpeginput.cpp +- INCLUDE_DIRS ${FFMPEG_INCLUDES} ++ INCLUDE_DIRS ${FFMPEG_INCLUDE_DIRS} + LINK_LIBRARIES ${FFMPEG_LIBRARIES} + ${BZIP2_LIBRARIES} + DEFINITIONS "-DUSE_FFMPEG" diff --git a/externals/vcpkg/ports/openimageio/fix-openjpeg-linkage.patch b/externals/vcpkg/ports/openimageio/fix-openjpeg-linkage.patch new file mode 100755 index 000000000..7d3a24c2f --- /dev/null +++ b/externals/vcpkg/ports/openimageio/fix-openjpeg-linkage.patch @@ -0,0 +1,13 @@ +diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake +index 1fc2059..62c4efb 100644 +--- a/src/cmake/externalpackages.cmake ++++ b/src/cmake/externalpackages.cmake +@@ -222,7 +222,7 @@ if (LibRaw_FOUND AND LibRaw_VERSION VERSION_LESS 0.20 AND CMAKE_CXX_STANDARD VER + # set (LIBRAW_FOUND 0) + endif () + +-checked_find_package (OpenJPEG VERSION_MIN 2.0) ++checked_find_package (OpenJPEG PREFER_CONFIG VERSION_MIN 2.0) + + checked_find_package (OpenVDB + VERSION_MIN 5.0 diff --git a/externals/vcpkg/ports/openimageio/portfile.cmake b/externals/vcpkg/ports/openimageio/portfile.cmake new file mode 100755 index 000000000..950ebf63a --- /dev/null +++ b/externals/vcpkg/ports/openimageio/portfile.cmake @@ -0,0 +1,82 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO OpenImageIO/oiio + REF ff71703961f7758409fb7e6e689258e2997f7c18 # 2.3.10.1 + SHA512 f56cb58329a496ca1fe3537fe87d469038ac0e74a555990a4510d2c019d2ad14b556240c0d5087a9a25ac01d9b371b5c77ce5a719e71a85fcd56e9cd099bc31e + HEAD_REF master + PATCHES + fix-dependencies.patch + fix-config-cmake.patch + fix-openjpeg-linkage.patch + fix-ffmpeg-tool.patch +) + +file(REMOVE_RECURSE "${SOURCE_PATH}/ext") + +file(REMOVE "${SOURCE_PATH}/src/cmake/modules/FindLibRaw.cmake" + "${SOURCE_PATH}/src/cmake/modules/FindOpenCV.cmake" + "${SOURCE_PATH}/src/cmake/modules/FindFFmpeg.cmake") + +file(MAKE_DIRECTORY "${SOURCE_PATH}/ext/robin-map/tsl") + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LINKSTATIC) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + libraw USE_LIBRAW + opencolorio USE_OPENCOLORIO + ffmpeg USE_FFMPEG + freetype USE_FREETYPE + gif USE_GIF + opencv USE_OPENCV + openjpeg USE_OPENJPEG + webp USE_WEBP + pybind11 USE_PYTHON + tools OIIO_BUILD_TOOLS +) + +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DOIIO_BUILD_TESTS=OFF + -DUSE_DCMTK=OFF + -DUSE_NUKE=OFF + -DUSE_QT=OFF + -DUSE_PTEX=OFF + -DLINKSTATIC=${LINKSTATIC} + -DBUILD_MISSING_FMT=OFF + -DBUILD_MISSING_ROBINMAP=OFF + -DBUILD_MISSING_DEPS=OFF + -DSTOP_ON_WARNING=OFF + -DVERBOSE=ON + -DBUILD_DOCS=OFF + -DINSTALL_DOCS=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME OpenImageIO CONFIG_PATH lib/cmake/OpenImageIO) + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES iconvert idiff igrep iinfo maketx oiiotool iv + AUTO_CLEAN + ) +endif() + +# Clean +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc" + "${CURRENT_PACKAGES_DIR}/debug/doc" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/openimageio/vcpkg.json b/externals/vcpkg/ports/openimageio/vcpkg.json new file mode 100755 index 000000000..9136d4648 --- /dev/null +++ b/externals/vcpkg/ports/openimageio/vcpkg.json @@ -0,0 +1,108 @@ +{ + "name": "openimageio", + "version": "2.3.10.1", + "port-version": 4, + "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.", + "homepage": "https://github.com/OpenImageIO/oiio", + "license": "BSD-3-Clause", + "dependencies": [ + "boost-algorithm", + "boost-asio", + "boost-config", + "boost-filesystem", + "boost-foreach", + "boost-random", + "boost-regex", + "boost-smart-ptr", + "boost-stacktrace", + "boost-static-assert", + "boost-system", + "boost-thread", + "boost-type-traits", + "fmt", + "libheif", + "libjpeg-turbo", + "libpng", + "libsquish", + "openexr", + "robin-map", + "tiff", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "features": { + "ffmpeg": { + "description": "Enable ffmpeg support for openimageio", + "dependencies": [ + { + "name": "ffmpeg", + "features": [ + "avresample" + ] + } + ] + }, + "freetype": { + "description": "Enable freetype support for openimageio", + "dependencies": [ + "freetype" + ] + }, + "gif": { + "description": "Enable giflib support for openimageio", + "dependencies": [ + "giflib" + ] + }, + "libraw": { + "description": "Enable RAW image files support", + "dependencies": [ + "libraw" + ] + }, + "opencolorio": { + "description": "Enable opencolorio support for openimageio", + "dependencies": [ + "opencolorio" + ] + }, + "opencv": { + "description": "Enable opencv support for openimageio", + "dependencies": [ + "opencv" + ] + }, + "openjpeg": { + "description": "Enable openjpeg support for openimageio", + "dependencies": [ + "openjpeg" + ] + }, + "pybind11": { + "description": "Enable Python bindings support for openimageio", + "dependencies": [ + "pybind11" + ] + }, + "tools": { + "description": "Build openimageio tools", + "dependencies": [ + "opengl", + "qt5-base" + ] + }, + "webp": { + "description": "Enable libwebp support for openimageio", + "dependencies": [ + "libwebp" + ] + } + } +} diff --git a/externals/vcpkg/ports/openjpeg/arm.patch b/externals/vcpkg/ports/openjpeg/arm.patch new file mode 100755 index 000000000..357d33e0f --- /dev/null +++ b/externals/vcpkg/ports/openjpeg/arm.patch @@ -0,0 +1,13 @@ +diff --git a/src/lib/openjp2/ht_dec.c b/src/lib/openjp2/ht_dec.c +index 1eb4d525f..e2f3afd6a 100644 +--- a/src/lib/openjp2/ht_dec.c ++++ b/src/lib/openjp2/ht_dec.c +@@ -69,7 +69,7 @@ static OPJ_BOOL only_cleanup_pass_is_decoded = OPJ_FALSE; + static INLINE + OPJ_UINT32 population_count(OPJ_UINT32 val) + { +-#ifdef OPJ_COMPILER_MSVC ++#if defined(OPJ_COMPILER_MSVC) && (defined(_M_IX86) || defined(_M_AMD64)) + return (OPJ_UINT32)__popcnt(val); + #elif (defined OPJ_COMPILER_GNUC) + return (OPJ_UINT32)__builtin_popcount(val); diff --git a/externals/vcpkg/ports/openjpeg/fix-static.patch b/externals/vcpkg/ports/openjpeg/fix-static.patch new file mode 100755 index 000000000..1101e2d95 --- /dev/null +++ b/externals/vcpkg/ports/openjpeg/fix-static.patch @@ -0,0 +1,59 @@ +diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt +index 4d4bd952f..e14b5a692 100644 +--- a/src/bin/jp2/CMakeLists.txt ++++ b/src/bin/jp2/CMakeLists.txt +@@ -33,14 +33,6 @@ include_directories( + ${TIFF_INCLUDE_DIRNAME} + ) + +-if(WIN32) +- if(BUILD_SHARED_LIBS) +- add_definitions(-DOPJ_EXPORTS) +- else() +- add_definitions(-DOPJ_STATIC) +- endif() +-endif() +- + # Loop over all executables: + foreach(exe opj_decompress opj_compress opj_dump) + add_executable(${exe} ${exe}.c ${common_SRCS}) +diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt +index ea4131a3e..dc63f49dd 100644 +--- a/src/lib/openjp2/CMakeLists.txt ++++ b/src/lib/openjp2/CMakeLists.txt +@@ -84,12 +84,12 @@ endif() + + # Build the library + if(WIN32) ++ add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS}) + if(BUILD_SHARED_LIBS) + add_definitions(-DOPJ_EXPORTS) + else() +- add_definitions(-DOPJ_STATIC) ++ target_compile_definitions(${OPENJPEG_LIBRARY_NAME} PUBLIC OPJ_STATIC) + endif() +- add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS}) + set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME}) + else() + if(BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS) +diff --git a/src/lib/openjpip/CMakeLists.txt b/src/lib/openjpip/CMakeLists.txt +index b3cb8ce88..fc6a9dde3 100644 +--- a/src/lib/openjpip/CMakeLists.txt ++++ b/src/lib/openjpip/CMakeLists.txt +@@ -52,14 +52,14 @@ set(LOCAL_SRCS + ) + + # Build the library ++add_library(openjpip ${OPENJPIP_SRCS} ${LOCAL_SRCS}) + if(WIN32) + if(BUILD_SHARED_LIBS) + add_definitions(-DOPJ_EXPORTS) + else() +- add_definitions(-DOPJ_STATIC) ++ target_compile_definitions(openjpip PUBLIC OPJ_STATIC) + endif() + endif() +-add_library(openjpip ${OPENJPIP_SRCS} ${LOCAL_SRCS}) + set_target_properties(openjpip + PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) + if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12") diff --git a/externals/vcpkg/ports/openjpeg/no-wx.patch b/externals/vcpkg/ports/openjpeg/no-wx.patch new file mode 100755 index 000000000..d01844492 --- /dev/null +++ b/externals/vcpkg/ports/openjpeg/no-wx.patch @@ -0,0 +1,10 @@ +diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt +index 292fe5a71..bcbe94160 100644 +--- a/src/bin/CMakeLists.txt ++++ b/src/bin/CMakeLists.txt +@@ -9,4 +9,4 @@ if(BUILD_JPIP) + endif() + + # wx apps: +-add_subdirectory(wx) ++# add_subdirectory(wx) diff --git a/externals/vcpkg/ports/openjpeg/portfile.cmake b/externals/vcpkg/ports/openjpeg/portfile.cmake new file mode 100755 index 000000000..a23bd58bb --- /dev/null +++ b/externals/vcpkg/ports/openjpeg/portfile.cmake @@ -0,0 +1,83 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO uclouvain/openjpeg + REF a5891555eb49ed7cc26b2901ea680acda136d811 #v2.5.0 + SHA512 f388d5770445152cd5ed18c61d2a56a6d2b88c2b56db0d460d09be36f3e6e40cf5be505aa63ac5975e07688be3dfe752080f4939bd792d42c61f4f8ddcaa1f0d + HEAD_REF master + PATCHES + arm.patch + no-wx.patch + fix-static.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) + +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(feature_tools "tools" BUILD_JPIP_SERVER) # Requires pthread + if("tools" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS "-DFCGI_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/fastcgi") + endif() +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "jpip" BUILD_JPIP + ${feature_tools} + "tools" BUILD_VIEWER + "tools" BUILD_CODEC + "tools" BUILD_LUTS_GENERATOR +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DBUILD_CODEC:BOOL=OFF + -DBUILD_DOC:BOOL=OFF + -DOPENJPEG_INSTALL_PACKAGE_DIR=share/openjpeg + -DOPENJPEG_INSTALL_INCLUDE_DIR=include + -DEXECUTABLE_OUTPUT_PATH=tools/${PORT} + -DBUILD_PKGCONFIG_FILES=ON + ${FEATURE_OPTIONS} + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() + +if(VCPKG_TARGET_IS_WINDOWS AND (NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL MinGW)) + if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libopenjp2.pc" "-lm" "") + endif() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libopenjp2.pc" "-lm" "") +else() + if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libopenjp2.pc" "-lm" "-lm -pthread") + endif() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libopenjp2.pc" "-lm" "-lm -pthread") +endif() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +set(TOOL_NAMES) +if("tools" IN_LIST FEATURES) + list(APPEND TOOL_NAMES opj_compress opj_decompress opj_dump opj_dec_server opj_jpip_addxml opj_jpip_test opj_jpip_transcode) +endif() +if(TOOL_NAMES) + vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) +endif() + +file(READ "${CURRENT_PACKAGES_DIR}/include/openjpeg.h" OPENJPEG_H) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + string(REPLACE "defined(OPJ_STATIC)" "1" OPENJPEG_H "${OPENJPEG_H}") +else() + string(REPLACE "defined(OPJ_STATIC)" "0" OPENJPEG_H "${OPENJPEG_H}") +endif() +string(REPLACE "defined(DLL_EXPORT)" "0" OPENJPEG_H "${OPENJPEG_H}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/openjpeg.h" "${OPENJPEG_H}") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/openjpeg/vcpkg.json b/externals/vcpkg/ports/openjpeg/vcpkg.json new file mode 100755 index 000000000..be472aca9 --- /dev/null +++ b/externals/vcpkg/ports/openjpeg/vcpkg.json @@ -0,0 +1,47 @@ +{ + "name": "openjpeg", + "version": "2.5.0", + "description": "OpenJPEG is an open-source JPEG 2000 codec written in C language. It has been developed in order to promote the use of JPEG 2000, a still-image compression standard from the Joint Photographic Experts Group (JPEG). Since April 2015, it is officially recognized by ISO/IEC and ITU-T as a JPEG 2000 Reference Software.", + "homepage": "https://github.com/uclouvain/openjpeg", + "license": "BSD-2-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "jp3d": { + "description": "(deprecated)" + }, + "jpip": { + "description": "Build optional component jpip" + }, + "jpwl": { + "description": "(deprecated)" + }, + "mj2": { + "description": "(deprecated)" + }, + "tools": { + "description": "(deprecated)", + "dependencies": [ + { + "name": "curl", + "platform": "!windows" + }, + { + "name": "fastcgi", + "platform": "!windows" + }, + "lcms", + "tiff", + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/openmama/portfile.cmake b/externals/vcpkg/ports/openmama/portfile.cmake new file mode 100755 index 000000000..dfd63074a --- /dev/null +++ b/externals/vcpkg/ports/openmama/portfile.cmake @@ -0,0 +1,54 @@ +vcpkg_find_acquire_program(FLEX) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO finos/OpenMAMA + REF c4925ee103add1a51c1d27be45b46d97af347f36 # https://github.com/finos/OpenMAMA/releases/tag/OpenMAMA-6.3.1-release + SHA512 e2773d082dd28e073fe81223fc113b1a5db7cd0d95e150e9f3f02c8c9483b9219b5d10682a125dd792c3a7877e15b90fd908084a4c89af4ec8d8c0389c282de2 + HEAD_REF next +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DPROTON_ROOT=${CURRENT_INSTALLED_DIR} + -DAPR_ROOT=${CURRENT_INSTALLED_DIR} + -DINSTALL_RUNTIME_DEPENDENCIES=OFF + -DFLEX_EXECUTABLE=${FLEX} + -DWITH_EXAMPLES=OFF + -DWITH_TESTTOOLS=OFF +) + +vcpkg_install_cmake() + +# Copy across license files and copyright +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY ${SOURCE_PATH}/LICENSE-3RD-PARTY.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/) +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +# Clean up LICENSE file - vcpkg doesn't expect it to be there +file(REMOVE ${CURRENT_PACKAGES_DIR}/LICENSE.MD ${CURRENT_PACKAGES_DIR}/debug/LICENSE.MD) + +# Temporary workaround until upstream project puts dll in right place +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/libmamaplugindqstrategymd.dll") + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libmamaplugindqstrategymd.dll ${CURRENT_PACKAGES_DIR}/bin/libmamaplugindqstrategymd.dll) +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/libmamaplugindqstrategymd.dll") + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libmamaplugindqstrategymd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/libmamaplugindqstrategymd.dll) +endif() + +# Vcpkg does not expect include files to be in the debug directory +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +foreach(OPENMAMA_ROOT_HEADER destroyhandle.h platform.h list.h lookup2.h property.h timers.h wlock.h windows) + if(EXISTS "${CURRENT_PACKAGES_DIR}/include/${OPENMAMA_ROOT_HEADER}") + file(RENAME "${CURRENT_PACKAGES_DIR}/include/${OPENMAMA_ROOT_HEADER}" "${CURRENT_PACKAGES_DIR}/include/wombat/${OPENMAMA_ROOT_HEADER}") + endif() +endforeach() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mama/integration/transport.h" "list.h" "wombat/list.h") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mama/integration/types.h" "list.h" "wombat/list.h") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mama/integration/mama.h" "property.h" "wombat/property.h") + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/openmama/vcpkg.json b/externals/vcpkg/ports/openmama/vcpkg.json new file mode 100755 index 000000000..ae3b79578 --- /dev/null +++ b/externals/vcpkg/ports/openmama/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "openmama", + "version-semver": "6.3.1", + "port-version": 1, + "description": "OpenMAMA is a high performance vendor neutral lightweight wrapper that provides a common API interface to different middleware and messaging solutions across a variety of platforms and languages", + "homepage": "https://github.com/finos/OpenMAMA", + "supports": "windows & (x64 | x86)", + "dependencies": [ + "apr", + "libevent", + "qpid-proton" + ] +} diff --git a/externals/vcpkg/ports/openmesh/portfile.cmake b/externals/vcpkg/ports/openmesh/portfile.cmake new file mode 100755 index 000000000..28ea0e490 --- /dev/null +++ b/externals/vcpkg/ports/openmesh/portfile.cmake @@ -0,0 +1,63 @@ +set(VERSION 8.1) + +# Note: upstream GitLab instance at https://graphics.rwth-aachen.de:9000 often goes down +vcpkg_download_distfile(ARCHIVE + URLS "https://www.openmesh.org/media/Releases/${VERSION}/OpenMesh-${VERSION}.tar.gz" + FILENAME "OpenMesh-${VERSION}.tar.gz" + SHA512 c146e6b21d709a31772621a6a913def93a51460c4abb950c2eb64eea4528c7efd4c86166ba56ae0bc8090cc5878dd9328b570e094e61c1b64d6d298de05aca61 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF "${VERSION}" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(OPENMESH_BUILD_SHARED ON) +else() + set(OPENMESH_BUILD_SHARED OFF) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_APPS=OFF + -DOPENMESH_BUILD_SHARED=${OPENMESH_BUILD_SHARED} + # [TODO]: add apps as feature, requires qt5 and freeglut +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/OpenMesh/cmake TARGET_PATH share/OpenMesh/cmake) + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/libdata/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME "${CURRENT_PACKAGES_DIR}/libdata/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/libdata" "${CURRENT_PACKAGES_DIR}/libdata") +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/OpenMesh/Tools/VDPM/xpm) +# Only move dynamic libraries to bin on Windows +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) + file(RENAME ${CURRENT_PACKAGES_DIR}/OpenMeshCore.dll ${CURRENT_PACKAGES_DIR}/bin/OpenMeshCore.dll) + file(RENAME ${CURRENT_PACKAGES_DIR}/OpenMeshTools.dll ${CURRENT_PACKAGES_DIR}/bin/OpenMeshTools.dll) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/OpenMeshCored.dll ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMeshCored.dll) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/OpenMeshToolsd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMeshToolsd.dll) + endif() +endif() + +configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/openmesh/usage b/externals/vcpkg/ports/openmesh/usage new file mode 100755 index 000000000..1bfc821f5 --- /dev/null +++ b/externals/vcpkg/ports/openmesh/usage @@ -0,0 +1,5 @@ +The package openmesh provides CMake targets: + + find_package(openmesh REQUIRED) + target_include_directories(main PRIVATE ${OPENMESH_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${OPENMESH_LIBRARIES}) diff --git a/externals/vcpkg/ports/openmesh/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/openmesh/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..ee59349e2 --- /dev/null +++ b/externals/vcpkg/ports/openmesh/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,18 @@ +include(FindPackageHandleStandardArgs) +include(SelectLibraryConfigurations) + +find_path(OPENMESHCORE_INCLUDE_DIR EigenVectorT.hh PATH_SUFFIXES OpenMesh/Core/Geometry) +get_filename_component(OPENMESHCORE_INCLUDE_DIR ${OPENMESHCORE_INCLUDE_DIR} DIRECTORY) +get_filename_component(OPENMESHCORE_INCLUDE_DIR ${OPENMESHCORE_INCLUDE_DIR} DIRECTORY) +get_filename_component(OPENMESHCORE_INCLUDE_DIR ${OPENMESHCORE_INCLUDE_DIR} DIRECTORY) + +find_library(OPENMESHCORE_LIBRARY_DEBUG NAMES OpenMeshCored libOpenMeshCored NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED) +find_library(OPENMESHCORE_LIBRARY_RELEASE NAMES OpenMeshCore libOpenMeshCore NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED) +find_library(OPENMESHTOOLS_LIBRARY_DEBUG NAMES OpenMeshToolsd libOpenMeshToolsd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED) +find_library(OPENMESHTOOLS_LIBRARY_RELEASE NAMES OpenMeshTools libOpenMeshTools NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED) + +select_library_configurations(OPENMESHCORE) +select_library_configurations(OPENMESHTOOLS) + +set(OPENMESH_INCLUDE_DIRS ${OPENMESHCORE_INCLUDE_DIR}) +set(OPENMESH_LIBRARIES ${OPENMESHCORE_LIBRARY} ${OPENMESHTOOLS_LIBRARY}) \ No newline at end of file diff --git a/externals/vcpkg/ports/openmesh/vcpkg.json b/externals/vcpkg/ports/openmesh/vcpkg.json new file mode 100755 index 000000000..ab48f6d5f --- /dev/null +++ b/externals/vcpkg/ports/openmesh/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "openmesh", + "version-string": "8.1", + "port-version": 3, + "description": "A generic and efficient polygon mesh data structure" +} diff --git a/externals/vcpkg/ports/openmpi/keep_isystem.patch b/externals/vcpkg/ports/openmpi/keep_isystem.patch new file mode 100755 index 000000000..9352e4ad1 --- /dev/null +++ b/externals/vcpkg/ports/openmpi/keep_isystem.patch @@ -0,0 +1,283 @@ +diff --git a/configure b/configure +index b2451c4..a7fb4da 100755 +--- a/configure ++++ b/configure +@@ -19562,6 +19562,10 @@ $as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + opal_found=0 + opal_i=`expr $opal_count + 1` + ;; ++ -isystem) ++ opal_found=0 ++ opal_i=`expr $opal_count + 1` ++ ;; + --param) + opal_found=0 + opal_i=`expr $opal_count + 1` +@@ -19653,6 +19657,10 @@ $as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + opal_found=0 + opal_i=`expr $opal_count + 1` + ;; ++ -isystem) ++ opal_found=0 ++ opal_i=`expr $opal_count + 1` ++ ;; + --param) + opal_found=0 + opal_i=`expr $opal_count + 1` +@@ -19759,6 +19767,10 @@ $as_echo "$as_me: WARNING: Code coverage functionality is currently available on + opal_found=0 + opal_i=`expr $opal_count + 1` + ;; ++ -isystem) ++ opal_found=0 ++ opal_i=`expr $opal_count + 1` ++ ;; + --param) + opal_found=0 + opal_i=`expr $opal_count + 1` +@@ -19946,6 +19958,10 @@ $as_echo "$opal_cv_cc_wno_long_double" >&6; } + opal_found=0 + opal_i=`expr $opal_count + 1` + ;; ++ -isystem) ++ opal_found=0 ++ opal_i=`expr $opal_count + 1` ++ ;; + --param) + opal_found=0 + opal_i=`expr $opal_count + 1` +@@ -20127,6 +20143,10 @@ $as_echo "$opal_cv_cc_fno_strict_aliasing" >&6; } + opal_found=0 + opal_i=`expr $opal_count + 1` + ;; ++ -isystem) ++ opal_found=0 ++ opal_i=`expr $opal_count + 1` ++ ;; + --param) + opal_found=0 + opal_i=`expr $opal_count + 1` +@@ -20267,6 +20287,10 @@ $as_echo "$opal_cv_cc_restrict_cflags" >&6; } + opal_found=0 + opal_i=`expr $opal_count + 1` + ;; ++ -isystem) ++ opal_found=0 ++ opal_i=`expr $opal_count + 1` ++ ;; + --param) + opal_found=0 + opal_i=`expr $opal_count + 1` +@@ -26120,6 +26144,10 @@ $as_echo "$as_me: WARNING: Code coverage functionality is currently available on + opal_found=0 + opal_i=`expr $opal_count + 1` + ;; ++ -isystem) ++ opal_found=0 ++ opal_i=`expr $opal_count + 1` ++ ;; + --param) + opal_found=0 + opal_i=`expr $opal_count + 1` +@@ -26297,6 +26325,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + opal_found=0 + opal_i=`expr $opal_count + 1` + ;; ++ -isystem) ++ opal_found=0 ++ opal_i=`expr $opal_count + 1` ++ ;; + --param) + opal_found=0 + opal_i=`expr $opal_count + 1` +@@ -26441,6 +26473,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + opal_found=0 + opal_i=`expr $opal_count + 1` + ;; ++ -isystem) ++ opal_found=0 ++ opal_i=`expr $opal_count + 1` ++ ;; + --param) + opal_found=0 + opal_i=`expr $opal_count + 1` +@@ -27799,6 +27835,10 @@ $as_echo "$as_me: WARNING: Code coverage functionality is currently available on + opal_found=0 + opal_i=`expr $opal_count + 1` + ;; ++ -isystem) ++ opal_found=0 ++ opal_i=`expr $opal_count + 1` ++ ;; + --param) + opal_found=0 + opal_i=`expr $opal_count + 1` +@@ -27973,6 +28013,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + opal_found=0 + opal_i=`expr $opal_count + 1` + ;; ++ -isystem) ++ opal_found=0 ++ opal_i=`expr $opal_count + 1` ++ ;; + --param) + opal_found=0 + opal_i=`expr $opal_count + 1` +@@ -28117,6 +28161,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + opal_found=0 + opal_i=`expr $opal_count + 1` + ;; ++ -isystem) ++ opal_found=0 ++ opal_i=`expr $opal_count + 1` ++ ;; + --param) + opal_found=0 + opal_i=`expr $opal_count + 1` +@@ -44127,6 +44175,10 @@ fi + opal_found=0 + opal_i=`expr $opal_count + 1` + ;; ++ -isystem) ++ opal_found=0 ++ opal_i=`expr $opal_count + 1` ++ ;; + --param) + opal_found=0 + opal_i=`expr $opal_count + 1` +@@ -60612,6 +60664,10 @@ $as_echo_n "checking if intel compiler _Quad == REAL*16... " >&6; } + opal_found=0 + opal_i=`expr $opal_count + 1` + ;; ++ -isystem) ++ opal_found=0 ++ opal_i=`expr $opal_count + 1` ++ ;; + --param) + opal_found=0 + opal_i=`expr $opal_count + 1` +@@ -60842,6 +60898,10 @@ $as_echo_n "checking if gnu compiler __float128 == REAL*16... " >&6; } + opal_found=0 + opal_i=`expr $opal_count + 1` + ;; ++ -isystem) ++ opal_found=0 ++ opal_i=`expr $opal_count + 1` ++ ;; + --param) + opal_found=0 + opal_i=`expr $opal_count + 1` +diff --git a/opal/mca/pmix/pmix3x/pmix/configure b/opal/mca/pmix/pmix3x/pmix/configure +index 0326a68..07df146 100755 +--- a/opal/mca/pmix/pmix3x/pmix/configure ++++ b/opal/mca/pmix/pmix3x/pmix/configure +@@ -19386,6 +19386,10 @@ $as_echo "$pmix_cv_cc_coverage" >&6; } + pmix_found=0 + pmix_i=`expr $pmix_count + 1` + ;; ++ -isystem) ++ pmix_found=0 ++ pmix_i=`expr $pmix_count + 1` ++ ;; + --param) + pmix_found=0 + pmix_i=`expr $pmix_count + 1` +@@ -19477,6 +19481,10 @@ $as_echo "$pmix_cv_cc_coverage" >&6; } + pmix_found=0 + pmix_i=`expr $pmix_count + 1` + ;; ++ -isystem) ++ pmix_found=0 ++ pmix_i=`expr $pmix_count + 1` ++ ;; + --param) + pmix_found=0 + pmix_i=`expr $pmix_count + 1` +@@ -19583,6 +19591,10 @@ $as_echo "$as_me: WARNING: Code coverage functionality is currently available on + pmix_found=0 + pmix_i=`expr $pmix_count + 1` + ;; ++ -isystem) ++ pmix_found=0 ++ pmix_i=`expr $pmix_count + 1` ++ ;; + --param) + pmix_found=0 + pmix_i=`expr $pmix_count + 1` +@@ -19770,6 +19782,10 @@ $as_echo "$pmix_cv_cc_wno_long_double" >&6; } + pmix_found=0 + pmix_i=`expr $pmix_count + 1` + ;; ++ -isystem) ++ pmix_found=0 ++ pmix_i=`expr $pmix_count + 1` ++ ;; + --param) + pmix_found=0 + pmix_i=`expr $pmix_count + 1` +@@ -19951,6 +19967,10 @@ $as_echo "$pmix_cv_cc_fno_strict_aliasing" >&6; } + pmix_found=0 + pmix_i=`expr $pmix_count + 1` + ;; ++ -isystem) ++ pmix_found=0 ++ pmix_i=`expr $pmix_count + 1` ++ ;; + --param) + pmix_found=0 + pmix_i=`expr $pmix_count + 1` +@@ -20091,6 +20111,10 @@ $as_echo "$pmix_cv_cc_restrict_cflags" >&6; } + pmix_found=0 + pmix_i=`expr $pmix_count + 1` + ;; ++ -isystem) ++ pmix_found=0 ++ pmix_i=`expr $pmix_count + 1` ++ ;; + --param) + pmix_found=0 + pmix_i=`expr $pmix_count + 1` +@@ -53914,6 +53938,10 @@ fi + pmix_found=0 + pmix_i=`expr $pmix_count + 1` + ;; ++ -isystem) ++ pmix_found=0 ++ pmix_i=`expr $pmix_count + 1` ++ ;; + --param) + pmix_found=0 + pmix_i=`expr $pmix_count + 1` +@@ -54005,6 +54033,10 @@ fi + pmix_found=0 + pmix_i=`expr $pmix_count + 1` + ;; ++ -isystem) ++ pmix_found=0 ++ pmix_i=`expr $pmix_count + 1` ++ ;; + --param) + pmix_found=0 + pmix_i=`expr $pmix_count + 1` +@@ -54096,6 +54128,10 @@ fi + pmix_found=0 + pmix_i=`expr $pmix_count + 1` + ;; ++ -isystem) ++ pmix_found=0 ++ pmix_i=`expr $pmix_count + 1` ++ ;; + --param) + pmix_found=0 + pmix_i=`expr $pmix_count + 1` +@@ -54187,6 +54223,10 @@ fi + pmix_found=0 + pmix_i=`expr $pmix_count + 1` + ;; ++ -isystem) ++ pmix_found=0 ++ pmix_i=`expr $pmix_count + 1` ++ ;; + --param) + pmix_found=0 + pmix_i=`expr $pmix_count + 1` diff --git a/externals/vcpkg/ports/openmpi/portfile.cmake b/externals/vcpkg/ports/openmpi/portfile.cmake new file mode 100755 index 000000000..82b139a2a --- /dev/null +++ b/externals/vcpkg/ports/openmpi/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +set(OpenMPI_FULL_VERSION "4.1.0") +set(OpenMPI_SHORT_VERSION "4.1") + +vcpkg_download_distfile(ARCHIVE + URLS "https://download.open-mpi.org/release/open-mpi/v${OpenMPI_SHORT_VERSION}/openmpi-${OpenMPI_FULL_VERSION}.tar.gz" + FILENAME "openmpi-${OpenMPI_FULL_VERSION}.tar.gz" + SHA512 1f8117b11c5279d34194b4f5652b0223cf1258a4ac0efd40bab78f31f203068e027235a92a87e546b1b35c5b369bc90788b109c05a7068c75533a03649410e99 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + keep_isystem.patch +) + +vcpkg_find_acquire_program(PERL) +get_filename_component(PERL_PATH ${PERL} DIRECTORY) +vcpkg_add_to_path(${PERL_PATH}) + +vcpkg_configure_make( + COPY_SOURCE + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + --with-hwloc=internal + --with-libevent=internal + --disable-mpi-fortran + OPTIONS_DEBUG + --enable-debug +) + +vcpkg_install_make(DISABLE_PARALLEL) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/openmpi/vcpkg.json b/externals/vcpkg/ports/openmpi/vcpkg.json new file mode 100755 index 000000000..d880ce0f1 --- /dev/null +++ b/externals/vcpkg/ports/openmpi/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "openmpi", + "version": "4.1.0", + "port-version": 4, + "description": "The Open MPI Project is an open source Message Passing Interface implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.", + "homepage": "https://www.open-mpi.org/", + "supports": "!(windows | uwp)" +} diff --git a/externals/vcpkg/ports/openmvg/0001-eigen_3.4.0.patch b/externals/vcpkg/ports/openmvg/0001-eigen_3.4.0.patch new file mode 100755 index 000000000..a4e759f52 --- /dev/null +++ b/externals/vcpkg/ports/openmvg/0001-eigen_3.4.0.patch @@ -0,0 +1,13 @@ +diff --git a/src/openMVG/multiview/solver_fundamental_kernel.cpp b/src/openMVG/multiview/solver_fundamental_kernel.cpp +index 2ffd45a..bbf74b4 100644 +--- a/src/openMVG/multiview/solver_fundamental_kernel.cpp ++++ b/src/openMVG/multiview/solver_fundamental_kernel.cpp +@@ -110,7 +110,7 @@ void EightPointSolver::Solve + x2.colwise().homogeneous(), + &epipolar_constraint); + // Find the F matrice in the nullspace of epipolar_constraint. +- Eigen::SelfAdjointEigenSolver solver ++ Eigen::SelfAdjointEigenSolver> solver + (epipolar_constraint.transpose() * epipolar_constraint); + f = solver.eigenvectors().leftCols<1>(); + diff --git a/externals/vcpkg/ports/openmvg/0002-eigen-3.4.patch b/externals/vcpkg/ports/openmvg/0002-eigen-3.4.patch new file mode 100755 index 000000000..19098d2ae --- /dev/null +++ b/externals/vcpkg/ports/openmvg/0002-eigen-3.4.patch @@ -0,0 +1,13 @@ +--- a/src/openMVG/multiview/CMakeLists.txt ++++ b/src/openMVG/multiview/CMakeLists.txt +@@ -38,6 +38,9 @@ target_include_directories(openMVG_multiview + $ + ) + set_target_properties(openMVG_multiview PROPERTIES SOVERSION ${OPENMVG_VERSION_MAJOR} VERSION "${OPENMVG_VERSION_MAJOR}.${OPENMVG_VERSION_MINOR}") ++if (MSVC) ++ set_target_properties(openMVG_multiview PROPERTIES COMPILE_FLAGS "/bigobj") ++endif (MSVC) + + add_library(openMVG_multiview_test_data ${MULTIVIEWTESTDATA}) + target_link_libraries(openMVG_multiview_test_data PRIVATE openMVG_numeric openMVG_multiview) + \ No newline at end of file diff --git a/externals/vcpkg/ports/openmvg/build_fixes.patch b/externals/vcpkg/ports/openmvg/build_fixes.patch new file mode 100755 index 000000000..c343368b1 --- /dev/null +++ b/externals/vcpkg/ports/openmvg/build_fixes.patch @@ -0,0 +1,724 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 5d909ec..ab7eb6f 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -20,6 +20,7 @@ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) + message(FATAL_ERROR "In-source builds not allowed.") + endif() + ++if(0) + # ============================================================================== + # OpenMVG build options + # ============================================================================== +@@ -37,6 +38,7 @@ option(OpenMVG_USE_OPENMP "Enable OpenMP parallelization" ON) + # and openMVG simultaneously + # ============================================================================== + option(OpenMVG_USE_OPENCV "Build or not opencv+openMVG samples programs" OFF) ++endif() + + # ============================================================================== + # Since OpenCV 3, SIFT is no longer in the default modules. See +@@ -95,6 +97,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") + register_definitions(-DOPENMVG_STD_UNORDERED_MAP) + endif() + ++if(0) + # ============================================================================== + # Check that submodule have been initialized and updated + # ============================================================================== +@@ -103,6 +106,7 @@ if (NOT EXISTS ${PROJECT_SOURCE_DIR}/dependencies/cereal/include) + "\n submodule(s) are missing, please update your repository:\n" + " > git submodule update -i\n") + endif() ++endif() + + # ============================================================================== + # Additional cmake find modules +@@ -138,7 +142,6 @@ if (OpenMVG_USE_OPENMP) + find_package(OpenMP) + if (OPENMP_FOUND) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") +- option(OpenMVG_USE_OPENMP "Use OpenMP for parallelization" ON) + register_definitions(-DOPENMVG_USE_OPENMP) + if (NOT MSVC) + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") +@@ -149,11 +152,6 @@ if (OpenMVG_USE_OPENMP) + endif() + endif (NOT MSVC) + endif (OPENMP_FOUND) +-else (OpenMVG_USE_OPENMP) +- option(OpenMVG_USE_OPENMP "Use OpenMP for parallelization" OFF) +- include(UpdateCacheVariable) +- UPDATE_CACHE_VARIABLE(OpenMVG_USE_OPENMP OFF) +- remove_definitions(-DOPENMVG_USE_OPENMP) + endif (OpenMVG_USE_OPENMP) + + # ============================================================================== +@@ -170,9 +168,10 @@ endif() + # ============================================================================== + # IMAGE IO detection + # ============================================================================== +-find_package(JPEG QUIET) +-find_package(PNG QUIET) +-find_package(TIFF QUIET) ++find_package(JPEG REQUIRED) ++find_package(PNG REQUIRED) ++find_package(TIFF REQUIRED) ++find_package(vlfeat REQUIRED) + + # Folders + set_property(GLOBAL PROPERTY USE_FOLDERS ON) +@@ -192,6 +191,7 @@ if (OpenMVG_BUILD_OPENGL_EXAMPLES) + set_property(TARGET glfw PROPERTY FOLDER OpenMVG/3rdParty/glfw) + endif (OpenMVG_BUILD_OPENGL_EXAMPLES) + ++if(0) + # Dependencies install rules + install( + DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/ +@@ -199,6 +199,7 @@ install( + COMPONENT headers + FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h" + ) ++endif() + + # ============================================================================== + # --END-- SUBMODULE CONFIGURATION +@@ -235,6 +236,7 @@ ENDMACRO(UNIT_TEST) + # - external by default + # - internal if cereal not found + # ============================================================================== ++if(0) + find_package(cereal QUIET CONFIG) + if (NOT TARGET cereal) + add_library(cereal INTERFACE) +@@ -247,7 +249,11 @@ if (NOT TARGET cereal) + + set(OpenMVG_USE_INTERNAL_CEREAL ON) + endif() ++endif() + ++find_package(cereal REQUIRED CONFIG) ++get_target_property(CEREAL_INCLUDE_DIRS cereal::cereal INTERFACE_INCLUDE_DIRECTORIES) ++ + # ============================================================================== + # Eigen + # ============================================================================== +@@ -255,6 +261,7 @@ endif() + # - external if EIGEN_INCLUDE_DIR_HINTS is defined + # - internal if Eigen not found + # ============================================================================== ++if(0) + find_package(Eigen3 QUIET) + if (NOT Eigen3_FOUND) + set(EIGEN_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/eigen) +@@ -263,6 +270,10 @@ if (NOT Eigen3_FOUND) + else() + set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR}) + endif() ++endif() ++ ++find_package(Eigen3 REQUIRED) ++set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR}) + + # ============================================================================== + # Ceres +@@ -270,6 +281,7 @@ endif() + # - external by default if CERES_DIR_HINTS or find_package found a valid Ceres + # - internal if ceres not found (ceres-solver+cxsparse+miniglog) + # ============================================================================== ++if(0) + find_package(Ceres QUIET HINTS ${CERES_DIR_HINTS}) + if (NOT Ceres_FOUND) + set(OpenMVG_USE_INTERNAL_CERES ON) +@@ -281,6 +293,9 @@ if (NOT Ceres_FOUND) + STRING(REGEX REPLACE "version ([0-9.]+).*" "\\1" CERES_VERSION ${CERES_CONFIG}) + set(CERES_LIBRARIES openMVG_ceres) + endif() ++endif() ++ ++find_package(Ceres REQUIRED) + + # ============================================================================== + # Flann +@@ -288,6 +303,7 @@ endif() + # - internal by default (flann), + # - external if FLANN_INCLUDE_DIR_HINTS and a valid Flann setup is found + # ============================================================================== ++if(0) + if (NOT DEFINED FLANN_INCLUDE_DIR_HINTS) + set(FLANN_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/flann/src/cpp) + set(OpenMVG_USE_INTERNAL_FLANN ON) +@@ -296,6 +312,9 @@ find_package(Flann QUIET) + if (NOT FLANN_FOUND OR OpenMVG_USE_INTERNAL_FLANN) + set(FLANN_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/flann/src/cpp) + endif() ++endif() ++ ++find_package(flann REQUIRED) + + # ============================================================================== + # CoinUtils +@@ -303,6 +322,7 @@ endif() + # - internal by default (CoinUtils), + # - external if COINUTILS_INCLUDE_DIR_HINTS and a valid CoinUtils setup is found + # ============================================================================== ++if(0) + if (NOT DEFINED COINUTILS_INCLUDE_DIR_HINTS) + set(COINUTILS_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/CoinUtils/src/) + set(OpenMVG_USE_INTERNAL_COINUTILS ON) +@@ -312,6 +332,9 @@ if (NOT DEFINED COINUTILS_INCLUDE_DIR_HINTS) + else() + find_package(CoinUtils QUIET) + endif() ++endif() ++ ++find_package(CoinUtils REQUIRED) + + ## ============================================================================== + ## Clp +@@ -319,6 +342,7 @@ endif() + ## - internal by default (Clp), + ## - external if CLP_INCLUDE_DIR_HINTS and a valid Clp setup is found + ## ============================================================================== ++if(0) + if (NOT DEFINED CLP_INCLUDE_DIR_HINTS) + set(CLP_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Clp/src/) + set(OpenMVG_USE_INTERNAL_CLP ON) +@@ -330,13 +354,17 @@ if (NOT DEFINED CLP_INCLUDE_DIR_HINTS) + else() + find_package(Clp QUIET) + endif() ++endif() + ++find_package(Clp REQUIRED) ++ + # ============================================================================== + # Osi + # ============================================================================== + # - internal by default (Osi), + # - external if OSI_INCLUDE_DIR_HINTS and a valid Osi setup is found + # ============================================================================== ++if(0) + if (NOT DEFINED OSI_INCLUDE_DIR_HINTS) + set(OSI_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Osi/src/) + set(OpenMVG_USE_INTERNAL_OSI ON) +@@ -346,6 +374,9 @@ if (NOT DEFINED OSI_INCLUDE_DIR_HINTS) + else() + find_package(Osi QUIET) + endif() ++endif() ++ ++find_package(Osi REQUIRED) + + # ============================================================================== + # Internal CLP/OSI/COINUTILS libraries: +@@ -364,6 +395,7 @@ endif() + # - internal by default (Lemon), + # - external if LEMON_INCLUDE_DIR_HINTS and a valid Lemon setup is found + # ============================================================================== ++if(0) + if (NOT DEFINED LEMON_INCLUDE_DIR_HINTS) + set(LEMON_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lemon) + set(OpenMVG_USE_INTERNAL_LEMON ON) +@@ -374,6 +406,9 @@ if (NOT LEMON_FOUND OR OpenMVG_USE_INTERNAL_LEMON) + ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lemon + ${PROJECT_BINARY_DIR}/third_party/lemon) + endif() ++endif() ++ ++find_package(LEMON REQUIRED) + + # ============================================================================== + # OpenCV +@@ -381,12 +416,7 @@ endif() + # - only external and enabled only if OpenMVG_USE_OPENCV is set to ON + # ============================================================================== + if (OpenMVG_USE_OPENCV) +- find_package( OpenCV QUIET ) +- if (NOT OpenCV_FOUND OR OpenCV_VERSION VERSION_LESS "3.0.0") +- message(STATUS "OpenCV was not found (note that OpenCV version >= 3.0.0 is required). -> Disabling OpenCV support.") +- UPDATE_CACHE_VARIABLE(OpenMVG_USE_OPENCV OFF) +- UPDATE_CACHE_VARIABLE(OpenMVG_USE_OCVSIFT OFF) +- endif() ++ find_package( OpenCV REQUIRED ) + endif() + + +@@ -394,7 +424,6 @@ endif() + # Third-party libraries: + # ============================================================================== + add_subdirectory(third_party) +-add_subdirectory(testing) + + # ============================================================================== + # openMVG modules +@@ -481,67 +510,67 @@ message("** Use OpenCV SIFT features: " ${OpenMVG_USE_OCVSIFT}) + + message("\n") + +-if (DEFINED OpenMVG_USE_INTERNAL_CEREAL) ++if (OpenMVG_USE_INTERNAL_CEREAL) + message(STATUS "CEREAL: (internal)") + else() + message(STATUS "CEREAL: (external)") + endif() + +-if (DEFINED OpenMVG_USE_INTERNAL_EIGEN) ++if (OpenMVG_USE_INTERNAL_EIGEN) + message(STATUS "EIGEN: " ${EIGEN_VERSION} " (internal)") + else() + message(STATUS "EIGEN: " ${EIGEN_VERSION} " (external)") + endif() + +-if (DEFINED OpenMVG_USE_INTERNAL_CERES) ++if (OpenMVG_USE_INTERNAL_CERES) + message(STATUS "CERES: " ${CERES_VERSION} " (internal)") + else() + message(STATUS "CERES: " ${CERES_VERSION} " (external)") + endif() + +-if (DEFINED OpenMVG_USE_INTERNAL_FLANN) ++if (OpenMVG_USE_INTERNAL_FLANN) + message(STATUS "FLANN: " ${FLANN_VERSION} " (internal)") + else() + message(STATUS "FLANN: " ${FLANN_VERSION} " (external)") + endif() + +-if (DEFINED OpenMVG_USE_INTERNAL_TIFF) ++if (OpenMVG_USE_INTERNAL_TIFF) + message(STATUS "LIBTIFF: " ${TIFF_VERSION_STRING} " (internal)") + else() + message(STATUS "LIBTIFF: " ${TIFF_VERSION_STRING} " (external)") + endif() + +-if (DEFINED OpenMVG_USE_INTERNAL_PNG) ++if (OpenMVG_USE_INTERNAL_PNG) + message(STATUS "LIBPNG: " ${PNG_VERSION_STRING} " (internal)") + else() + message(STATUS "LIBPNG: " ${PNG_VERSION_STRING} " (external)") + endif() + +-if (DEFINED OpenMVG_USE_INTERNAL_JPEG) ++if (OpenMVG_USE_INTERNAL_JPEG) + message(STATUS "LIBJPEG (internal)") + else() + message(STATUS "LIBJPEG (external)") + endif() + +-if (DEFINED OpenMVG_USE_INTERNAL_CLP) ++if (OpenMVG_USE_INTERNAL_CLP) + message(STATUS "CLP: " ${CLP_VERSION} " (internal)") + else() + message(STATUS "CLP: " ${CLP_VERSION} " (external)") + endif() + +-if (DEFINED OpenMVG_USE_INTERNAL_COINUTILS) ++if (OpenMVG_USE_INTERNAL_COINUTILS) + message(STATUS "COINUTILS: " ${COINUTILS_VERSION} " (internal)") + else() + message(STATUS "COINUTILS: " ${COINUTILS_VERSION} " (external)") + endif() + +-if (DEFINED OpenMVG_USE_INTERNAL_OSI) ++if (OpenMVG_USE_INTERNAL_OSI) + message(STATUS "OSI: " ${OSI_VERSION} " (internal)") + else() + message(STATUS "OSI: " ${OSI_VERSION} " (external)") + endif() + +-if (DEFINED OpenMVG_USE_INTERNAL_LEMON) ++if (OpenMVG_USE_INTERNAL_LEMON) + message(STATUS "LEMON: " ${LEMON_VERSION} " (internal)") + else() + message(STATUS "LEMON: " ${LEMON_VERSION} " (external)") +diff --git a/src/cmakeFindModules/FindClp.cmake b/src/cmakeFindModules/FindClp.cmake +index 8a69c23..6ebc661 100644 +--- a/src/cmakeFindModules/FindClp.cmake ++++ b/src/cmakeFindModules/FindClp.cmake +@@ -50,8 +50,8 @@ IF(EXISTS "${CLP_DIR}" AND NOT "${CLP_DIR}" STREQUAL "") + ENDIF (NOT EXISTS ${CLP_VERSION_FILE}) + SET(CLP_INCLUDE_DIR ${CLP_DIR}) + +- FIND_LIBRARY(CLP_LIBRARY NAMES Clp) +- FIND_LIBRARY(CLPSOLVER_LIBRARY NAMES ClpSolver) ++ FIND_LIBRARY(CLPSOLVER_LIBRARY NAMES ClpSolver Clp) ++ FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp Clp) + FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp) + + # locate Clp libraries +diff --git a/src/cmakeFindModules/OpenMVGConfig.cmake.in b/src/cmakeFindModules/OpenMVGConfig.cmake.in +index e7dfbfd..65224c4 100644 +--- a/src/cmakeFindModules/OpenMVGConfig.cmake.in ++++ b/src/cmakeFindModules/OpenMVGConfig.cmake.in +@@ -19,7 +19,7 @@ + # OPENMVG_VERSION: Version of OpenMVG found. + # + +-# Called if we failed to find OpenMVG or any of it's required dependencies, ++# Called if we failed to find OpenMVG or any of its required dependencies, + # unsets all public (designed to be used externally) variables and reports + # error message at priority depending upon [REQUIRED/QUIET/] argument. + macro(OPENMVG_REPORT_NOT_FOUND REASON_MSG) +@@ -58,10 +58,20 @@ set(CALLERS_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}) + # Reset CMake module path to the installation directory of this + # script. + set(CMAKE_MODULE_PATH ${CURRENT_CONFIG_INSTALL_DIR}) ++include(CMakeFindDependencyMacro) ++ ++find_dependency(CoinUtils) ++find_dependency(Clp) ++find_dependency(Osi) ++find_dependency(flann) ++find_dependency(Threads) ++find_dependency(cereal) ++find_dependency(Ceres) ++find_dependency(vlfeat) + + # Build the absolute root install directory as a relative path + get_filename_component(CURRENT_ROOT_INSTALL_DIR +- ${CMAKE_MODULE_PATH}/../../../ ABSOLUTE) ++ ${CMAKE_MODULE_PATH}/../../ ABSOLUTE) + if (NOT EXISTS ${CURRENT_ROOT_INSTALL_DIR}) + OPENMVG_REPORT_NOT_FOUND( + "OpenMVG install root: ${CURRENT_ROOT_INSTALL_DIR}, " +diff --git a/src/nonFree/sift/CMakeLists.txt b/src/nonFree/sift/CMakeLists.txt +index 402a2d8..60ddc11 100644 +--- a/src/nonFree/sift/CMakeLists.txt ++++ b/src/nonFree/sift/CMakeLists.txt +@@ -1,36 +1,36 @@ + +-# libs should be static +-set(BUILD_SHARED_LIBS OFF) +- +-# use PIC code for link into shared lib +-if(UNIX) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") +-endif(UNIX) +- +-if(NOT USE_SSE2) +- add_definitions(-DVL_DISABLE_SSE2) +-endif() +- +-add_definitions(-DVL_DISABLE_THREADS) +- +-include_directories(./vl) +-set(FEATS +- vl/generic.c +- vl/imopv_sse2.c +- vl/sift.c +- vl/imopv.c +- vl/mathop_sse2.c +- vl/sift.c +- vl/host.c +- vl/mathop.c +- vl/random.c) +-set_source_files_properties(${FEATS} PROPERTIES LANGUAGE C) +-add_library(vlsift ${FEATS}) +-install(TARGETS vlsift DESTINATION lib EXPORT openMVG-targets) +-set_property(TARGET vlsift PROPERTY FOLDER OpenMVG/nonFree) ++## libs should be static ++#set(BUILD_SHARED_LIBS OFF) ++# ++## use PIC code for link into shared lib ++#if(UNIX) ++# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") ++#endif(UNIX) ++# ++#if(NOT USE_SSE2) ++# add_definitions(-DVL_DISABLE_SSE2) ++#endif() ++# ++#add_definitions(-DVL_DISABLE_THREADS) ++# ++#include_directories(./vl) ++#set(FEATS ++# vl/generic.c ++# vl/imopv_sse2.c ++# vl/sift.c ++# vl/imopv.c ++# vl/mathop_sse2.c ++# vl/sift.c ++# vl/host.c ++# vl/mathop.c ++# vl/random.c) ++#set_source_files_properties(${FEATS} PROPERTIES LANGUAGE C) ++#add_library(vlsift ${FEATS}) ++#install(TARGETS vlsift DESTINATION lib EXPORT openMVG-targets) ++#set_property(TARGET vlsift PROPERTY FOLDER OpenMVG/nonFree) + install( + DIRECTORY . + DESTINATION include/openMVG_dependencies/nonFree/sift + COMPONENT headers +- FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h" ++ FILES_MATCHING PATTERN "*.hpp" + ) +diff --git a/src/nonFree/sift/SIFT_describer.hpp b/src/nonFree/sift/SIFT_describer.hpp +index cd800b0..20e9c8e 100644 +--- a/src/nonFree/sift/SIFT_describer.hpp ++++ b/src/nonFree/sift/SIFT_describer.hpp +@@ -17,9 +17,7 @@ + #include + #include + +-extern "C" { +-#include "nonFree/sift/vl/sift.h" +-} ++#include + + namespace openMVG { + namespace features { +@@ -174,7 +172,7 @@ public: + const int nkeys = vl_sift_get_nkeypoints(filt); + + // Update gradient before launching parallel extraction +- vl_sift_update_gradient(filt); ++ update_gradient(filt); + + #ifdef OPENMVG_USE_OPENMP + #pragma omp parallel for private(descr, descriptor) +diff --git a/src/openMVG/linearProgramming/CMakeLists.txt b/src/openMVG/linearProgramming/CMakeLists.txt +index cc5212f..acc57dd 100644 +--- a/src/openMVG/linearProgramming/CMakeLists.txt ++++ b/src/openMVG/linearProgramming/CMakeLists.txt +@@ -15,16 +15,12 @@ target_link_libraries(openMVG_linearProgramming + PUBLIC + openMVG_numeric + PRIVATE +- ${CLP_LIBRARIES} # clp + solver wrapper +- ${COINUTILS_LIBRARY} # container tools +- ${OSI_LIBRARY} # generic LP ++ Coin::Clp # clp + solver wrapper ++ Coin::CoinUtils # container tools ++ Coin::Osi # generic LP + ) + + target_include_directories(openMVG_linearProgramming +- PRIVATE +- ${CLP_INCLUDE_DIRS} +- ${COINUTILS_INCLUDE_DIRS} +- ${OSI_INCLUDE_DIRS} + PUBLIC + $ + ) +diff --git a/src/openMVG/matching/CMakeLists.txt b/src/openMVG/matching/CMakeLists.txt +index 2e0eafd7..d54d1e88 100644 +--- a/src/openMVG/matching/CMakeLists.txt ++++ b/src/openMVG/matching/CMakeLists.txt +@@ -16,6 +16,7 @@ list(REMOVE_ITEM matching_files_cpp ${REMOVEFILESUNITTEST}) + + set(THREADS_PREFER_PTHREAD_FLAG ON) + find_package(Threads REQUIRED) ++find_package(flann CONFIG REQUIRED) + + set_source_files_properties(${matching_files_cpp} PROPERTIES LANGUAGE CXX) + add_library(openMVG_matching +@@ -35,12 +36,12 @@ target_link_libraries(openMVG_matching + PUBLIC + openMVG_features + Threads::Threads +- cereal ++ cereal::cereal + ) +-if (NOT DEFINED OpenMVG_USE_INTERNAL_FLANN) ++if (NOT OpenMVG_USE_INTERNAL_FLANN) + target_link_libraries(openMVG_matching + PUBLIC +- ${FLANN_LIBRARIES} ++ $,flann::flann_s,flann::flann> + ) + endif() + set_target_properties(openMVG_matching PROPERTIES SOVERSION ${OPENMVG_VERSION_MAJOR} VERSION "${OPENMVG_VERSION_MAJOR}.${OPENMVG_VERSION_MINOR}") +diff --git a/src/openMVG/numeric/CMakeLists.txt b/src/openMVG/numeric/CMakeLists.txt +index 1f3fc30..4097320 100644 +--- a/src/openMVG/numeric/CMakeLists.txt ++++ b/src/openMVG/numeric/CMakeLists.txt +@@ -26,7 +26,7 @@ target_include_directories(openMVG_numeric + $ + $ + ) +-if (DEFINED OpenMVG_USE_INTERNAL_EIGEN) ++if (OpenMVG_USE_INTERNAL_EIGEN) + target_include_directories(openMVG_numeric PUBLIC + $) + else() +diff --git a/src/openMVG_Samples/describe_and_match_GUI/CMakeLists.txt b/src/openMVG_Samples/describe_and_match_GUI/CMakeLists.txt +index 862ffc7..62508af 100644 +--- a/src/openMVG_Samples/describe_and_match_GUI/CMakeLists.txt ++++ b/src/openMVG_Samples/describe_and_match_GUI/CMakeLists.txt +@@ -18,8 +18,7 @@ if (OpenMVG_BUILD_GUI_SOFTWARES) + add_executable( openMVG_sample_describe_and_match_GUI WIN32 ${FEATURES_PAIR_DEMO_SRCS} ${FEATURES_PAIR_DEMO_HDRS} ) + endif( APPLE ) + +- target_link_libraries( openMVG_sample_describe_and_match_GUI Qt5::Widgets openMVG_features openMVG_image openMVG_matching vlsift ) +- ++ target_link_libraries( openMVG_sample_describe_and_match_GUI Qt5::Widgets openMVG_features openMVG_image openMVG_matching unofficial::vlfeat::vl ) + set_target_properties( openMVG_sample_describe_and_match_GUI PROPERTIES CXX_STANDARD 11) + + set_property(TARGET openMVG_sample_describe_and_match_GUI PROPERTY FOLDER OpenMVG/Samples) +diff --git a/src/openMVG_Samples/features_image_matching/CMakeLists.txt b/src/openMVG_Samples/features_image_matching/CMakeLists.txt +index 18fb385..d44ffce 100644 +--- a/src/openMVG_Samples/features_image_matching/CMakeLists.txt ++++ b/src/openMVG_Samples/features_image_matching/CMakeLists.txt +@@ -5,7 +5,7 @@ target_link_libraries(openMVG_sample_image_matching + openMVG_features + openMVG_matching + ${STLPLUS_LIBRARY} +- vlsift) ++ unofficial::vlfeat::vl) + target_compile_definitions(openMVG_sample_image_matching + PRIVATE -DTHIS_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}") + +diff --git a/src/openMVG_Samples/features_repeatability/CMakeLists.txt b/src/openMVG_Samples/features_repeatability/CMakeLists.txt +index fd2b7c6..91f2766 100644 +--- a/src/openMVG_Samples/features_repeatability/CMakeLists.txt ++++ b/src/openMVG_Samples/features_repeatability/CMakeLists.txt +@@ -6,7 +6,7 @@ target_link_libraries(openMVG_sample_main_features_repeatability_dataset + openMVG_matching + openMVG_system + openMVG_multiview +- vlsift ++ unofficial::vlfeat::vl + ${STLPLUS_LIBRARY}) + + set_property(TARGET openMVG_sample_main_features_repeatability_dataset PROPERTY FOLDER OpenMVG/Samples) +diff --git a/src/software/Localization/CMakeLists.txt b/src/software/Localization/CMakeLists.txt +index 2f60393..0d57d0a 100644 +--- a/src/software/Localization/CMakeLists.txt ++++ b/src/software/Localization/CMakeLists.txt +@@ -11,7 +11,7 @@ target_link_libraries(openMVG_main_SfM_Localization + openMVG_sfm + openMVG_exif + ${STLPLUS_LIBRARY} +- vlsift ++ unofficial::vlfeat::vl + ) + + # Installation rules +diff --git a/src/software/SfM/CMakeLists.txt b/src/software/SfM/CMakeLists.txt +index 6db7e83..51e06f5 100644 +--- a/src/software/SfM/CMakeLists.txt ++++ b/src/software/SfM/CMakeLists.txt +@@ -44,7 +44,7 @@ target_link_libraries(openMVG_main_ComputeFeatures + openMVG_multiview + openMVG_sfm + ${STLPLUS_LIBRARY} +- vlsift ++ unofficial::vlfeat::vl + ) + if (MSVC) + set_target_properties(openMVG_main_ComputeFeatures PROPERTIES COMPILE_FLAGS "/bigobj") +@@ -275,7 +275,7 @@ if(OpenMVG_USE_OPENCV) + openMVG_multiview + openMVG_sfm + ${STLPLUS_LIBRARY} +- vlsift ++ unofficial::vlfeat::vl + ${OpenCV_LIBS}) + target_include_directories(openMVG_main_ComputeFeatures_OpenCV PRIVATE ${OpenCV_INCLUDE_DIRS}) + +diff --git a/src/software/VO/Tracker_opencv_klt.hpp b/src/software/VO/Tracker_opencv_klt.hpp +index aa7dffe..2c4d237 100644 +--- a/src/software/VO/Tracker_opencv_klt.hpp ++++ b/src/software/VO/Tracker_opencv_klt.hpp +@@ -80,7 +80,7 @@ struct Tracker_opencv_KLT : public Abstract_Tracker + std::vector m_nextKeypoints; + + cv::Ptr m_detector = cv::GFTTDetector::create(count); +- if (m_detector == NULL) ++ if (m_detector == nullptr) + return false; + + m_detector->detect(current_img, m_nextKeypoints); +diff --git a/src/third_party/CMakeLists.txt b/src/third_party/CMakeLists.txt +index 0d61c9f..05c8b29 100644 +--- a/src/third_party/CMakeLists.txt ++++ b/src/third_party/CMakeLists.txt +@@ -18,7 +18,7 @@ add_subdirectory(stlplus3) + set(STLPLUS_LIBRARY openMVG_stlplus PARENT_SCOPE) + + # Add graph library +-if(DEFINED OpenMVG_USE_INTERNAL_LEMON) ++if(OpenMVG_USE_INTERNAL_LEMON) + add_subdirectory(lemon) + set(LEMON_LIBRARY openMVG_lemon PARENT_SCOPE) + endif() +@@ -67,7 +67,7 @@ endif (NOT TIFF_FOUND) + add_subdirectory(vectorGraphics) + + # Add ceres-solver (A Nonlinear Least Squares Minimizer) +-if (DEFINED OpenMVG_USE_INTERNAL_CERES) ++if (OpenMVG_USE_INTERNAL_CERES) + add_subdirectory(cxsparse) + add_subdirectory(ceres-solver) + set_property(TARGET openMVG_cxsparse PROPERTY FOLDER OpenMVG/3rdParty/ceres) +@@ -75,7 +75,7 @@ if (DEFINED OpenMVG_USE_INTERNAL_CERES) + endif() + + # Add an Approximate Nearest Neighbor library +-if (DEFINED OpenMVG_USE_INTERNAL_FLANN) ++if (OpenMVG_USE_INTERNAL_FLANN) + set(FLANN_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/openMVG/third_party/flann/src/cpp) + add_subdirectory(flann) + endif() +@@ -89,7 +89,7 @@ add_subdirectory(fast) + ## + # Install Header only libraries if necessary + ## +-if (DEFINED OpenMVG_USE_INTERNAL_EIGEN) ++if (OpenMVG_USE_INTERNAL_EIGEN) + #Configure Eigen install + set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/openMVG/third_party/eigen) + add_subdirectory(eigen) +diff --git a/src/openMVG/cameras/CMakeLists.txt b/src/openMVG/cameras/CMakeLists.txt +index 333ab729..50c8f572 100644 +--- a/src/openMVG/cameras/CMakeLists.txt ++++ b/src/openMVG/cameras/CMakeLists.txt +@@ -4,7 +4,7 @@ set_property(TARGET openMVG_camera APPEND PROPERTY + INTERFACE_INCLUDE_DIRECTORIES "$") + + target_compile_features(openMVG_camera INTERFACE ${CXX11_FEATURES}) +-target_link_libraries(openMVG_camera INTERFACE openMVG_numeric cereal ${OPENMVG_LIBRARY_DEPENDENCIES}) ++target_link_libraries(openMVG_camera INTERFACE openMVG_numeric cereal::cereal ${OPENMVG_LIBRARY_DEPENDENCIES}) + install(TARGETS openMVG_camera DESTINATION lib EXPORT openMVG-targets) + + UNIT_TEST(openMVG Camera_Pinhole openMVG_camera) +diff --git a/src/openMVG/features/CMakeLists.txt b/src/openMVG/features/CMakeLists.txt +index 2e49701d..0b5e1c3d 100644 +--- a/src/openMVG/features/CMakeLists.txt ++++ b/src/openMVG/features/CMakeLists.txt +@@ -31,7 +31,7 @@ target_include_directories(openMVG_features + ) + target_link_libraries(openMVG_features + PRIVATE openMVG_fast ${STLPLUS_LIBRARY} +- PUBLIC ${OPENMVG_LIBRARY_DEPENDENCIES} cereal) ++ PUBLIC ${OPENMVG_LIBRARY_DEPENDENCIES} cereal::cereal) + if (MSVC) + set_target_properties(openMVG_features PROPERTIES COMPILE_FLAGS "/bigobj") + target_compile_options(openMVG_features PUBLIC "-D_USE_MATH_DEFINES") +diff --git a/src/openMVG/geometry/CMakeLists.txt b/src/openMVG/geometry/CMakeLists.txt +index 0a6a016a..e509a4d5 100644 +--- a/src/openMVG/geometry/CMakeLists.txt ++++ b/src/openMVG/geometry/CMakeLists.txt +@@ -21,7 +21,7 @@ set_property(TARGET openMVG_geometry PROPERTY FOLDER OpenMVG/OpenMVG) + target_link_libraries(openMVG_geometry + PUBLIC + openMVG_numeric +- cereal ++ cereal::cereal + PRIVATE + openMVG_linearProgramming + ) +diff --git a/src/openMVG/sfm/CMakeLists.txt b/src/openMVG/sfm/CMakeLists.txt +index b8928083..1d10f939 100644 +--- a/src/openMVG/sfm/CMakeLists.txt ++++ b/src/openMVG/sfm/CMakeLists.txt +@@ -25,7 +25,7 @@ target_link_libraries(openMVG_sfm + openMVG_graph + openMVG_matching + openMVG_multiview +- cereal ++ cereal::cereal + ${OPENMVG_LIBRARY_DEPENDENCIES} + ) + diff --git a/externals/vcpkg/ports/openmvg/no-absolute-paths.patch b/externals/vcpkg/ports/openmvg/no-absolute-paths.patch new file mode 100755 index 000000000..45d00aec4 --- /dev/null +++ b/externals/vcpkg/ports/openmvg/no-absolute-paths.patch @@ -0,0 +1,66 @@ +diff --git a/src/software/SfM/SfM_GlobalPipeline.py.in b/src/software/SfM/SfM_GlobalPipeline.py.in +index 7fda0cd..c6f0bdb 100644 +--- a/src/software/SfM/SfM_GlobalPipeline.py.in ++++ b/src/software/SfM/SfM_GlobalPipeline.py.in +@@ -16,14 +16,13 @@ + # + # if output_dir is not present script will create it + # +- ++import os + # Indicate the openMVG binary directory +-OPENMVG_SFM_BIN = "@OPENMVG_SOFTWARE_SFM_BUILD_DIR@" ++OPENMVG_SFM_BIN = os.path.dirname(__file__) + + # Indicate the openMVG camera sensor width directory +-CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_SOFTWARE_SFM_SRC_DIR@" + "/../../openMVG/exif/sensor_width_database" ++CAMERA_SENSOR_WIDTH_DIRECTORY = os.path.dirname(__file__) + +-import os + import subprocess + import sys + +diff --git a/src/software/SfM/SfM_SequentialPipeline.py.in b/src/software/SfM/SfM_SequentialPipeline.py.in +index 0ff2e77..98d3eb2 100644 +--- a/src/software/SfM/SfM_SequentialPipeline.py.in ++++ b/src/software/SfM/SfM_SequentialPipeline.py.in +@@ -16,14 +16,13 @@ + # + # if output_dir is not present script will create it + # +- ++import os + # Indicate the openMVG binary directory +-OPENMVG_SFM_BIN = "@OPENMVG_SOFTWARE_SFM_BUILD_DIR@" ++OPENMVG_SFM_BIN = os.path.dirname(__file__) + + # Indicate the openMVG camera sensor width directory +-CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_SOFTWARE_SFM_SRC_DIR@" + "/../../openMVG/exif/sensor_width_database" ++CAMERA_SENSOR_WIDTH_DIRECTORY = os.path.dirname(__file__) + +-import os + import subprocess + import sys + +diff --git a/src/software/SfM/tutorial_demo.py.in b/src/software/SfM/tutorial_demo.py.in +index 1c56aab..3fb31c4 100644 +--- a/src/software/SfM/tutorial_demo.py.in ++++ b/src/software/SfM/tutorial_demo.py.in +@@ -8,13 +8,14 @@ + # usage : python tutorial_demo.py + # + ++import os ++ + # Indicate the openMVG binary directory +-OPENMVG_SFM_BIN = "@OPENMVG_SOFTWARE_SFM_BUILD_DIR@" ++OPENMVG_SFM_BIN = os.path.dirname(__file__) + + # Indicate the openMVG camera sensor width directory +-CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_SOFTWARE_SFM_SRC_DIR@" + "/../../openMVG/exif/sensor_width_database" ++CAMERA_SENSOR_WIDTH_DIRECTORY = os.path.dirname(__file__) + +-import os + import subprocess + import sys + diff --git a/externals/vcpkg/ports/openmvg/portfile.cmake b/externals/vcpkg/ports/openmvg/portfile.cmake new file mode 100755 index 000000000..32c8c9196 --- /dev/null +++ b/externals/vcpkg/ports/openmvg/portfile.cmake @@ -0,0 +1,174 @@ +vcpkg_buildpath_length_warning(37) + +#the port produces some empty dlls when building shared libraries, since some components do not export anything, breaking the internal build itself +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +if("software" IN_LIST FEATURES AND VCPKG_CRT_LINKAGE STREQUAL static) + message(FATAL_ERROR "OpenMVG software currently cannot be built with static CRT linking. Please open an issue if you require this feature.") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO openMVG/openMVG + REF d0fe73dd426ae4001631a51272cff71047522df9 # v2.0 + SHA512 1d5c68971ad63ced46d8b9070bdacc1065b4ba950fe919e11f952a004def87d4d83a474d48aee714c21b12106d7d81187d3670d8a2e6daf2d3c5fceb008a5de3 + PATCHES + build_fixes.patch + 0001-eigen_3.4.0.patch + 0002-eigen-3.4.patch + no-absolute-paths.patch +) + +set(OpenMVG_USE_OPENMP OFF) +if("openmp" IN_LIST FEATURES) + set(OpenMVG_USE_OPENMP ON) +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + opencv OpenMVG_USE_OPENCV + opencv OpenMVG_USE_OCVSIFT + software OpenMVG_BUILD_SOFTWARES + software OpenMVG_BUILD_GUI_SOFTWARES +) + +# remove some deps to prevent conflict +file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/ceres-solver + ${SOURCE_PATH}/src/third_party/cxsparse + ${SOURCE_PATH}/src/third_party/eigen + ${SOURCE_PATH}/src/third_party/flann + ${SOURCE_PATH}/src/third_party/jpeg + ${SOURCE_PATH}/src/third_party/lemon + ${SOURCE_PATH}/src/third_party/png + ${SOURCE_PATH}/src/third_party/tiff + ${SOURCE_PATH}/src/third_party/zlib) + +# remove some cmake modules to force using our configs +file(REMOVE_RECURSE ${SOURCE_PATH}/src/cmakeFindModules/FindEigen.cmake + ${SOURCE_PATH}/src/cmakeFindModules/FindLemon.cmake + ${SOURCE_PATH}/src/cmakeFindModules/FindFlann.cmake + ${SOURCE_PATH}/src/cmakeFindModules/FindCoinUtils.cmake + ${SOURCE_PATH}/src/cmakeFindModules/FindClp.cmake + ${SOURCE_PATH}/src/cmakeFindModules/FindOsi.cmake) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/src" + OPTIONS ${FEATURE_OPTIONS} + -DOpenMVG_USE_OPENMP=${OpenMVG_USE_OPENMP} + -DOpenMVG_BUILD_SHARED=OFF + -DOpenMVG_BUILD_TESTS=OFF + -DOpenMVG_BUILD_DOC=OFF + -DOpenMVG_BUILD_EXAMPLES=OFF + -DOpenMVG_BUILD_OPENGL_EXAMPLES=OFF + -DOpenMVG_BUILD_COVERAGE=OFF + -DOpenMVG_USE_INTERNAL_CLP=OFF + -DOpenMVG_USE_INTERNAL_COINUTILS=OFF + -DOpenMVG_USE_INTERNAL_OSI=OFF + -DOpenMVG_USE_INTERNAL_EIGEN=OFF + -DOpenMVG_USE_INTERNAL_CEREAL=OFF + -DOpenMVG_USE_INTERNAL_CERES=OFF + -DOpenMVG_USE_INTERNAL_FLANN=OFF + -DOpenMVG_USE_INTERNAL_LEMON=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/openMVG/cmake) + +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/openMVG-targets.cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/openMVG-targets-debug.cmake") +endif() +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/openMVG-targets.cmake" "${CURRENT_PACKAGES_DIR}/lib/openMVG-targets-release.cmake") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/openMVG/image/image_test" + "${CURRENT_PACKAGES_DIR}/include/openMVG/exif/image_data" + "${CURRENT_PACKAGES_DIR}/include/openMVG_dependencies/nonFree/sift/vl") + +if(OpenMVG_BUILD_SHARED) + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + # release + file(GLOB DLL_FILES "${CURRENT_PACKAGES_DIR}/lib/*.dll") + file(COPY "${DLL_FILES}" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${DLL_FILES}") + endif() + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + # debug + file(GLOB DLL_FILES "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll") + file(COPY "${DLL_FILES}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${DLL_FILES}") + endif() +endif() +vcpkg_copy_pdbs() + +if("software" IN_LIST FEATURES) + if(VCPKG_TARGET_IS_OSX) + vcpkg_copy_tools(TOOL_NAMES + openMVG_main_AlternativeVO.app + ui_openMVG_MatchesViewer.app + ) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/openMVG_main_AlternativeVO.app") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/ui_openMVG_MatchesViewer.app") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/openMVG_main_AlternativeVO.app") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/ui_openMVG_MatchesViewer.app") + else() + vcpkg_copy_tools(AUTO_CLEAN TOOL_NAMES + openMVG_main_AlternativeVO + ui_openMVG_MatchesViewer + ) + endif() + vcpkg_copy_tools(AUTO_CLEAN TOOL_NAMES + openMVG_main_ChangeLocalOrigin + openMVG_main_ColHarmonize + openMVG_main_ComputeClusters + openMVG_main_ComputeFeatures + openMVG_main_ComputeMatches + openMVG_main_ComputeSfM_DataColor + openMVG_main_ComputeStructureFromKnownPoses + openMVG_main_ConvertList + openMVG_main_ConvertSfM_DataFormat + openMVG_main_evalQuality + openMVG_main_ExportCameraFrustums + openMVG_main_exportKeypoints + openMVG_main_exportMatches + openMVG_main_exportTracks + openMVG_main_ExportUndistortedImages + openMVG_main_FrustumFiltering + openMVG_main_geodesy_registration_to_gps_position + openMVG_main_ListMatchingPairs + openMVG_main_MatchesToTracks + openMVG_main_openMVG2Agisoft + openMVG_main_openMVG2CMPMVS + openMVG_main_openMVG2Colmap + openMVG_main_openMVG2MESHLAB + openMVG_main_openMVG2MVE2 + openMVG_main_openMVG2MVSTEXTURING + openMVG_main_openMVG2NVM + openMVG_main_openMVG2openMVS + openMVG_main_openMVG2PMVS + openMVG_main_openMVG2WebGL + openMVG_main_openMVGSpherical2Cubic + openMVG_main_PointsFiltering + openMVG_main_SfMInit_ImageListing + openMVG_main_SfMInit_ImageListingFromKnownPoses + openMVG_main_SfM_Localization + openMVG_main_SplitMatchFileIntoMatchFiles + ui_openMVG_control_points_registration + openMVG_main_GeometricFilter + openMVG_main_PairGenerator + openMVG_main_SfM + ) + if("opencv" IN_LIST FEATURES) + vcpkg_copy_tools(AUTO_CLEAN TOOL_NAMES + openMVG_main_ComputeFeatures_OpenCV) + endif() + + file(COPY "${SOURCE_PATH}/src/openMVG/exif/sensor_width_database/sensor_width_camera_database.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + set(OPENMVG_SOFTWARE_SFM_BUILD_DIR "${CURRENT_INSTALLED_DIR}/tools/${PORT}") + set(OPENMVG_CAMERA_SENSOR_WIDTH_DIRECTORY "${CURRENT_INSTALLED_DIR}/tools/${PORT}") + configure_file("${SOURCE_PATH}/src/software/SfM/tutorial_demo.py.in" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/tutorial_demo.py" @ONLY) + configure_file("${SOURCE_PATH}/src/software/SfM/SfM_GlobalPipeline.py.in" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/SfM_GlobalPipeline.py" @ONLY) + configure_file("${SOURCE_PATH}/src/software/SfM/SfM_SequentialPipeline.py.in" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/SfM_SequentialPipeline.py" @ONLY) +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/openmvg/vcpkg.json b/externals/vcpkg/ports/openmvg/vcpkg.json new file mode 100755 index 000000000..ea5574286 --- /dev/null +++ b/externals/vcpkg/ports/openmvg/vcpkg.json @@ -0,0 +1,59 @@ +{ + "name": "openmvg", + "version": "2.0", + "port-version": 4, + "description": "open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.", + "license": "MPL-2.0-no-copyleft-exception", + "dependencies": [ + "cereal", + { + "name": "ceres", + "features": [ + "cxsparse", + "suitesparse" + ] + }, + "clp", + "coinutils", + "eigen3", + "flann", + "libjpeg-turbo", + "liblemon", + "libpng", + "osi", + "tiff", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "vlfeat", + "zlib" + ], + "features": { + "opencv": { + "description": "opencv support for openmvg", + "dependencies": [ + { + "name": "opencv", + "features": [ + "contrib" + ] + } + ] + }, + "openmp": { + "description": "openmp support for openmvg" + }, + "software": { + "description": "build openMVG tools", + "dependencies": [ + "qt5-base", + "qt5-svg" + ] + } + } +} diff --git a/externals/vcpkg/ports/openmvs/fix-build.patch b/externals/vcpkg/ports/openmvs/fix-build.patch new file mode 100755 index 000000000..50884fd73 --- /dev/null +++ b/externals/vcpkg/ports/openmvs/fix-build.patch @@ -0,0 +1,183 @@ +diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt +index 2365de65f..4d871850d 100644 +--- a/apps/CMakeLists.txt ++++ b/apps/CMakeLists.txt +@@ -1,6 +1,7 @@ + # Add applications + ADD_SUBDIRECTORY(InterfaceCOLMAP) + ADD_SUBDIRECTORY(InterfaceMetashape) ++ADD_SUBDIRECTORY(InterfaceVisualSFM) + ADD_SUBDIRECTORY(DensifyPointCloud) + ADD_SUBDIRECTORY(ReconstructMesh) + ADD_SUBDIRECTORY(RefineMesh) + +diff --git a/build/Templates/OpenMVSConfig.cmake.in b/build/Templates/OpenMVSConfig.cmake.in +index 9747b3e1..5e2469d3 100644 +--- a/build/Templates/OpenMVSConfig.cmake.in ++++ b/build/Templates/OpenMVSConfig.cmake.in +@@ -15,9 +15,67 @@ set(OpenMVS_INCLUDE_DIRS "@INSTALL_INCLUDE_DIR_IN@") + + set(OpenMVS_DEFINITIONS "@OpenMVS_DEFINITIONS@") + ++list(APPEND CMAKE_MODULE_PATH "${OpenMVS_CMAKE_DIR}") ++ ++if (MSVC) ++ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /GL") ++ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL") ++ set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG") ++ set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /LTCG") ++endif() ++ ++set(CMAKE_CXX_STANDARD 14) ++set(CMAKE_CXX_STANDARD_REQUIRED ON) ++ ++include(CMakeFindDependencyMacro) ++ ++if(@OpenMVS_USE_OPENMP@) ++ find_dependency(OpenMP) ++ add_definitions(-D_USE_OPENMP) ++endif() ++ ++if(@OpenMVS_USE_OPENGL@) ++ find_dependency(OpenGL) ++ add_definitions(${OpenGL_DEFINITIONS} -D_USE_OPENGL) ++endif() ++ ++if(@OpenMVS_USE_CUDA@) ++ find_dependency(CUDA) ++ add_definitions(-D_USE_CUDA) ++ include_directories(${CUDA_INCLUDE_DIRS}) ++endif() ++ ++if(@OpenMVS_USE_BREAKPAD@) ++ find_dependency(BREAKPAD) ++ add_definitions(${BREAKPAD_DEFINITIONS} -D_USE_BREAKPAD) ++endif() ++ ++find_dependency(Boost) ++add_definitions(${Boost_DEFINITIONS} -D_USE_BOOST) ++include_directories(${Boost_INCLUDE_DIRS}) ++find_dependency(Eigen3) ++add_definitions(${EIGEN3_DEFINITIONS} -D_USE_EIGEN) ++include_directories(${EIGEN3_INCLUDE_DIRS}) ++find_dependency(OpenCV) ++add_definitions(${OpenCV_DEFINITIONS}) ++find_dependency(CGAL) ++add_definitions(${CGAL_DEFINITIONS}) ++ ++find_dependency(VCG REQUIRED) ++add_definitions(${VCG_DEFINITIONS}) ++ ++if(@OpenMVS_USE_CERES@) ++ find_dependency(Ceres) ++ add_definitions(${CERES_DEFINITIONS}) ++endif() ++ ++add_definitions(@OpenMVS_DEFINITIONS@) ++ ++# Our library dependencies (contains definitions for IMPORTED targets) ++if(NOT TARGET MVS AND NOT OpenMVS_BINARY_DIR) ++ include("${OpenMVS_CMAKE_DIR}/OpenMVSTargets.cmake") ++endif() ++ + # These are IMPORTED targets created by OpenMVSTargets.cmake + set(OpenMVS_LIBRARIES MVS) +-set(OpenMVS_BINARIES InterfaceCOLMAP DensifyPointCloud ReconstructMesh RefineMesh TextureMesh) +- +-include("${CMAKE_CURRENT_LIST_DIR}/OpenMVSTargets.cmake") +-check_required_components("OpenMVS") ++set(OpenMVS_BINARIES InterfaceVisualSFM InterfaceCOLMAP DensifyPointCloud ReconstructMesh RefineMesh TextureMesh) + +diff --git a/build/Utils.cmake b/build/Utils.cmake +index 106d43167..33390d192 100644 +--- a/build/Utils.cmake ++++ b/build/Utils.cmake +@@ -173,32 +173,6 @@ macro(ComposePackageLibSuffix) + set(PACKAGE_LIB_SUFFIX "") + set(PACKAGE_LIB_SUFFIX_DBG "") + set(PACKAGE_LIB_SUFFIX_REL "") +- if(MSVC) +- if("${MSVC_VERSION}" STRGREATER "1929") +- set(PACKAGE_LIB_SUFFIX "/vc17") +- elseif("${MSVC_VERSION}" STRGREATER "1916") +- set(PACKAGE_LIB_SUFFIX "/vc16") +- elseif("${MSVC_VERSION}" STRGREATER "1900") +- set(PACKAGE_LIB_SUFFIX "/vc15") +- elseif("${MSVC_VERSION}" STREQUAL "1900") +- set(PACKAGE_LIB_SUFFIX "/vc14") +- elseif("${MSVC_VERSION}" STREQUAL "1800") +- set(PACKAGE_LIB_SUFFIX "/vc12") +- elseif("${MSVC_VERSION}" STREQUAL "1700") +- set(PACKAGE_LIB_SUFFIX "/vc11") +- elseif("${MSVC_VERSION}" STREQUAL "1600") +- set(PACKAGE_LIB_SUFFIX "/vc10") +- elseif("${MSVC_VERSION}" STREQUAL "1500") +- set(PACKAGE_LIB_SUFFIX "/vc9") +- endif() +- if("${SYSTEM_BITNESS}" STREQUAL "64") +- set(PACKAGE_LIB_SUFFIX "${PACKAGE_LIB_SUFFIX}/x64") +- else() +- set(PACKAGE_LIB_SUFFIX "${PACKAGE_LIB_SUFFIX}/x86") +- endif() +- set(PACKAGE_LIB_SUFFIX_DBG "${PACKAGE_LIB_SUFFIX}/Debug") +- set(PACKAGE_LIB_SUFFIX_REL "${PACKAGE_LIB_SUFFIX}/Release") +- endif() + endmacro() + + +@@ -806,12 +780,8 @@ macro(ConfigLibrary) + # Offer the user the choice of overriding the installation directories + set(INSTALL_LIB_DIR "lib" CACHE PATH "Installation directory for libraries") + set(INSTALL_BIN_DIR "bin" CACHE PATH "Installation directory for executables") +- set(INSTALL_INCLUDE_DIR "include" CACHE PATH "Installation directory for header files") +- if(WIN32 AND NOT CYGWIN) +- set(DEF_INSTALL_CMAKE_DIR "CMake") +- else() +- set(DEF_INSTALL_CMAKE_DIR "lib/cmake") +- endif() ++ set(INSTALL_INCLUDE_DIR "include/openmvs" CACHE PATH "Installation directory for header files") ++ set(DEF_INSTALL_CMAKE_DIR "share/openmvs") + set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files") + # Make relative paths absolute (needed later on) + foreach(p LIB BIN INCLUDE CMAKE) +@@ -822,7 +792,7 @@ macro(ConfigLibrary) + else() + set(${varp} "${CMAKE_INSTALL_PREFIX}/${${var}}") + endif() +- set(${var} "${${varp}}/${PROJECT_NAME}") ++ set(${var} "${${varp}}") + endforeach() + endmacro() + + +diff --git a/libs/Common/Strings.h b/libs/Common/MVSStrings.h +similarity index 100% +rename from libs/Common/Strings.h +rename to libs/Common/MVSStrings.h +diff --git a/libs/Common/Types.h b/libs/Common/Types.h +index bcac65c..9abeefb 100644 +--- a/libs/Common/Types.h ++++ b/libs/Common/Types.h +@@ -380,7 +380,7 @@ typedef TAliasCast CastD2I; + + // I N C L U D E S ///////////////////////////////////////////////// + +-#include "Strings.h" ++#include "MVSStrings.h" + #include "AutoPtr.h" + #include "List.h" + #include "Thread.h" + +diff --git a/apps/InterfaceMetashape/InterfaceMetashape.cpp b/apps/InterfaceMetashape/InterfaceMetashape.cpp +index 1157bf29..73563b3c 100644 +--- a/apps/InterfaceMetashape/InterfaceMetashape.cpp ++++ b/apps/InterfaceMetashape/InterfaceMetashape.cpp +@@ -246,7 +246,7 @@ bool ParseImageListXML(Scene& scene, PlatformDistCoeffs& pltDistCoeffs, size_t& + tinyxml2::XMLElement* elem; + const size_t nLen(pStream->getSize()); + String strCameras; strCameras.resize(nLen); +- pStream->read(&strCameras[0], nLen); ++ pStream->read(strCameras.data(), nLen); + tinyxml2::XMLDocument doc; + doc.Parse(strCameras.c_str(), nLen); + if (doc.ErrorID() != tinyxml2::XML_SUCCESS) diff --git a/externals/vcpkg/ports/openmvs/no-absolute-paths.patch b/externals/vcpkg/ports/openmvs/no-absolute-paths.patch new file mode 100755 index 000000000..9ba0a9753 --- /dev/null +++ b/externals/vcpkg/ports/openmvs/no-absolute-paths.patch @@ -0,0 +1,42 @@ +diff --git a/MvgMvsPipeline.py b/MvgMvsPipeline.py.in +index 53a4a5cc..97735396 100644 +--- a/MvgMvsPipeline.py ++++ b/MvgMvsPipeline.py.in +@@ -109,14 +109,14 @@ def find(afile): + return d + return None + +- ++current_dir = os.path.dirname(os.path.abspath(__file__)) + # Try to find openMVG and openMVS binaries in PATH +-OPENMVG_BIN = whereis("openMVG_main_SfMInit_ImageListing") +-OPENMVS_BIN = whereis("ReconstructMesh") ++OPENMVG_BIN = os.path.join(current_dir, '..', 'openmvg') ++OPENMVS_BIN = current_dir + + # Try to find openMVG camera sensor database +-CAMERA_SENSOR_DB_FILE = "sensor_width_camera_database.txt" +-CAMERA_SENSOR_DB_DIRECTORY = find(CAMERA_SENSOR_DB_FILE) ++CAMERA_SENSOR_DB_FILE = os.path.join(OPENMVG_BIN, 'sensor_width_camera_database.txt') ++CAMERA_SENSOR_DB_DIRECTORY = OPENMVS_BIN + + # Ask user for openMVG and openMVS directories if not found + if not OPENMVG_BIN: + +diff --git a/MvgOptimizeSfM.py b/MvgOptimizeSfM.py.in +index 930d6805..6eb672c1 100644 +--- a/MvgOptimizeSfM.py ++++ b/MvgOptimizeSfM.py.in +@@ -56,9 +56,10 @@ def launch(cmdline): + sys.exit('\r\nProcess canceled by user, all files remains') + + ++current_dir = os.path.dirname(os.path.abspath(__file__)) + # Try to find openMVG and openMVS binaries in PATH +-OPENMVG_BIN = whereis("openMVG_main_SfMInit_ImageListing") +-OPENMVS_BIN = whereis("ReconstructMesh") ++OPENMVG_BIN = os.path.join(current_dir, '..', 'openmvg') ++OPENMVS_BIN = current_dir + + # Ask user for openMVG and openMVS directories if not found + if not OPENMVG_BIN: diff --git a/externals/vcpkg/ports/openmvs/portfile.cmake b/externals/vcpkg/ports/openmvs/portfile.cmake new file mode 100755 index 000000000..1bbcee898 --- /dev/null +++ b/externals/vcpkg/ports/openmvs/portfile.cmake @@ -0,0 +1,75 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cdcseacave/openMVS + REF v2.0.1 + SHA512 f1c1708d6e5c9424b95fb71c88ca510c70a4b11711079f12f173ecf190b009a977f7aa11f49a0b2e634a307f2732e4c33d9cd37d727ba60da99051876adb7d1e + HEAD_REF master + PATCHES + fix-build.patch + no-absolute-paths.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cuda OpenMVS_USE_CUDA + openmp OpenMVS_USE_OPENMP + nonfree OpenMVS_USE_NONFREE + ceres OpenMVS_USE_CERES +) + +file(REMOVE "${SOURCE_PATH}/build/Modules/FindCERES.cmake") +file(REMOVE "${SOURCE_PATH}/build/Modules/FindCGAL.cmake") +file(REMOVE "${SOURCE_PATH}/build/Modules/FindEIGEN.cmake") + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS ${FEATURE_OPTIONS} + -DOpenMVS_USE_FAST_FLOAT2INT=ON + -DOpenMVS_USE_FAST_INVSQRT=OFF + -DOpenMVS_USE_FAST_CBRT=ON + -DOpenMVS_USE_SSE=ON + -DOpenMVS_USE_OPENGL=ON + -DOpenMVS_USE_BREAKPAD=OFF + OPTIONS_RELEASE + -DOpenMVS_BUILD_TOOLS=ON + OPTIONS_DEBUG + -DOpenMVS_BUILD_TOOLS=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_cmake_config_fixup() +file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/OpenMVSTargets-release.cmake TARGETS_CMAKE) +string(REPLACE "bin/InterfaceCOLMAP" "tools/${PORT}/InterfaceCOLMAP" TARGETS_CMAKE "${TARGETS_CMAKE}") +string(REPLACE "bin/InterfaceMetashape" "tools/${PORT}/InterfaceMetashape" TARGETS_CMAKE "${TARGETS_CMAKE}") +string(REPLACE "bin/InterfaceVisualSFM" "tools/${PORT}/InterfaceVisualSFM" TARGETS_CMAKE "${TARGETS_CMAKE}") +string(REPLACE "bin/DensifyPointCloud" "tools/${PORT}/DensifyPointCloud" TARGETS_CMAKE "${TARGETS_CMAKE}") +string(REPLACE "bin/ReconstructMesh" "tools/${PORT}/ReconstructMesh" TARGETS_CMAKE "${TARGETS_CMAKE}") +string(REPLACE "bin/RefineMesh" "tools/${PORT}/RefineMesh" TARGETS_CMAKE "${TARGETS_CMAKE}") +string(REPLACE "bin/TextureMesh" "tools/${PORT}/TextureMesh" TARGETS_CMAKE "${TARGETS_CMAKE}") +string(REPLACE "bin/Viewer" "tools/${PORT}/Viewer" TARGETS_CMAKE "${TARGETS_CMAKE}") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/OpenMVSTargets-release.cmake "${TARGETS_CMAKE}") + +vcpkg_copy_tools(AUTO_CLEAN TOOL_NAMES + DensifyPointCloud + InterfaceCOLMAP + InterfaceMetashape + InterfaceVisualSFM + ReconstructMesh + RefineMesh + TextureMesh + Viewer +) + +set(OPENMVG_TOOLS_PATH "${CURRENT_INSTALLED_DIR}/tools/openmvg") +set(OPENMVS_TOOLS_PATH "${CURRENT_INSTALLED_DIR}/tools/${PORT}") +set(SENSOR_WIDTH_CAMERA_DATABASE_TXT_PATH "${OPENMVG_TOOLS_PATH}/sensor_width_camera_database.txt") +configure_file("${SOURCE_PATH}/MvgMvsPipeline.py.in" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/MvgMvsPipeline.py" @ONLY) +configure_file("${SOURCE_PATH}/MvgOptimizeSfM.py.in" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/MvgOptimizeSfM.py" @ONLY) +file(INSTALL "${SOURCE_PATH}/build/Modules/FindVCG.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/openmvs/vcpkg.json b/externals/vcpkg/ports/openmvs/vcpkg.json new file mode 100755 index 000000000..1d3ab2a3e --- /dev/null +++ b/externals/vcpkg/ports/openmvs/vcpkg.json @@ -0,0 +1,64 @@ +{ + "name": "openmvs", + "version": "2.0.1", + "description": "OpenMVS: open Multi-View Stereo reconstruction library", + "homepage": "https://cdcseacave.github.io/openMVS", + "license": "AGPL-3.0-only", + "dependencies": [ + "boost-iostreams", + "boost-program-options", + "boost-serialization", + "boost-system", + "boost-throw-exception", + { + "name": "cgal", + "default-features": false + }, + "eigen3", + "glew", + "glfw3", + "libpng", + "opencv", + { + "name": "openmvg", + "features": [ + "software" + ], + "platform": "!(windows & static)" + }, + "tiff", + "vcglib", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "default-features": [ + "nonfree" + ], + "features": { + "ceres": { + "description": "CERES support for openmvs", + "dependencies": [ + "ceres" + ] + }, + "cuda": { + "description": "CUDA support for openmvs", + "dependencies": [ + "cuda" + ] + }, + "nonfree": { + "description": "nonfree support for openmvs" + }, + "openmp": { + "description": "OpenMP support for openmvs" + } + } +} diff --git a/externals/vcpkg/ports/openni2/inherit_from_parent_or_project_defaults.patch b/externals/vcpkg/ports/openni2/inherit_from_parent_or_project_defaults.patch new file mode 100755 index 000000000..73893f3b9 --- /dev/null +++ b/externals/vcpkg/ports/openni2/inherit_from_parent_or_project_defaults.patch @@ -0,0 +1,41 @@ +diff --git a/Source/Drivers/Kinect/Kinect.vcxproj b/Source/Drivers/Kinect/Kinect.vcxproj +index 7f54d04..08a49fe 100644 +--- a/Source/Drivers/Kinect/Kinect.vcxproj ++++ b/Source/Drivers/Kinect/Kinect.vcxproj +@@ -72,28 +72,29 @@ + + $(SolutionDir)Bin\$(Platform)-$(Configuration)\OpenNI2\Drivers\ + $(SolutionDir)Bin\Intermediate\$(Platform)-$(Configuration)\$(ProjectName)\ +- $(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include +- $(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib; ++ $(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(IncludePath) ++ $(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;$(LibraryPath) + true + + + $(SolutionDir)Bin\$(Platform)-$(Configuration)\OpenNI2\Drivers\ + $(SolutionDir)Bin\Intermediate\$(Platform)-$(Configuration)\$(ProjectName)\ +- $(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include; +- $(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64; ++ $(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(IncludePath) ++ $(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;$(LibraryPath) + true + + + $(SolutionDir)Bin\$(Platform)-$(Configuration)\OpenNI2\Drivers\ + $(SolutionDir)Bin\Intermediate\$(Platform)-$(Configuration)\$(ProjectName)\ +- $(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include; +- $(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib; ++ $(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(IncludePath) ++ $(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;$(LibraryPath) + false + + + $(SolutionDir)Bin\$(Platform)-$(Configuration)\OpenNI2\Drivers\ + $(SolutionDir)Bin\Intermediate\$(Platform)-$(Configuration)\$(ProjectName)\ +- $(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include ++ $(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(IncludePath) ++ $(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;$(LibraryPath) + false + + diff --git a/externals/vcpkg/ports/openni2/openni2deploy.ps1 b/externals/vcpkg/ports/openni2/openni2deploy.ps1 new file mode 100755 index 000000000..f420014cf --- /dev/null +++ b/externals/vcpkg/ports/openni2/openni2deploy.ps1 @@ -0,0 +1,18 @@ +# Note: This function signature and behavior is depended upon by applocal.ps1 + +function deployOpenNI2([string]$targetBinaryDir, [string]$installedDir, [string]$targetBinaryName) { + if ($targetBinaryName -like "OpenNI2.dll") { + if(Test-Path "$installedDir\bin\OpenNI2\OpenNI.ini") { + Write-Verbose " Deploying OpenNI2 Initialization" + deployBinary "$targetBinaryDir" "$installedDir\bin\OpenNI2" "OpenNI.ini" + } + if(Test-Path "$installedDir\bin\OpenNI2\Drivers") { + Write-Verbose " Deploying OpenNI2 Drivers" + New-Item "$targetBinaryDir\OpenNI2\Drivers" -ItemType Directory -ErrorAction SilentlyContinue | Out-Null + Get-ChildItem "$installedDir\bin\OpenNI2\Drivers\*.*" -include "*.dll","*.ini" | % { + deployBinary "$targetBinaryDir\OpenNI2\Drivers" "$installedDir\bin\OpenNI2\Drivers" $_.Name + } + } + } +} + diff --git a/externals/vcpkg/ports/openni2/portfile.cmake b/externals/vcpkg/ports/openni2/portfile.cmake new file mode 100755 index 000000000..0864fda61 --- /dev/null +++ b/externals/vcpkg/ports/openni2/portfile.cmake @@ -0,0 +1,213 @@ +if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "Error: UWP builds are currently not supported.") +endif() + +find_path(COR_H_PATH cor.h) +if(COR_H_PATH MATCHES "NOTFOUND") + message(FATAL_ERROR "Could not find . Ensure the NETFXSDK is installed.") +endif() +get_filename_component(NETFXSDK_PATH "${COR_H_PATH}/../.." ABSOLUTE) + +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO OpenNI/OpenNI2 + REF 2.2-beta2 + SHA512 60a3a3043679f3069aea869e92dc5881328ce4393d4140ea8d089027321ac501ae27d283657214e2834d216d0d49bf4f29a4b3d3e43df27a6ed21f889cd0083f + HEAD_REF master + PATCHES upgrade_projects.patch + inherit_from_parent_or_project_defaults.patch + replace_environment_variable.patch +) + +file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) +file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) +file(COPY ${SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) + +file(TO_NATIVE_PATH ${CURRENT_INSTALLED_DIR} NATIVE_INSTALLED_DIR) +configure_file("${SOURCE_PATH}/Source/Drivers/Kinect/Kinect.vcxproj" "${SOURCE_PATH}/Source/Drivers/Kinect/Kinect.vcxproj" @ONLY) + +# Build OpenNI2 +vcpkg_build_msbuild( + PROJECT_PATH "${SOURCE_PATH}/OpenNI.sln" + OPTIONS "/p:DotNetSdkRoot=${NETFXSDK_PATH}/" +) + +# Install OpenNI2 +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(PLATFORM Win32) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(PLATFORM x64) +endif() + +set(SOURCE_INCLUDE_PATH "${SOURCE_PATH}/Include") +set(SOURCE_BIN_PATH_RELEASE "${SOURCE_PATH}/Bin/${PLATFORM}-Release") +set(SOURCE_BIN_PATH_DEBUG "${SOURCE_PATH}/Bin/${PLATFORM}-Debug") +set(SOURCE_CONFIG_PATH ${SOURCE_PATH}/Config) +set(SOURCE_THIRDPARTY_PATH "${SOURCE_PATH}/ThirdParty") + +file( + INSTALL + "${SOURCE_INCLUDE_PATH}/Android-Arm/OniPlatformAndroid-Arm.h" + DESTINATION + ${CURRENT_PACKAGES_DIR}/include/openni2/Android-Arm +) + +file( + INSTALL + "${SOURCE_INCLUDE_PATH}/Driver/OniDriverAPI.h" + "${SOURCE_INCLUDE_PATH}/Driver/OniDriverTypes.h" + DESTINATION + ${CURRENT_PACKAGES_DIR}/include/openni2/Driver +) + +file( + INSTALL + "${SOURCE_INCLUDE_PATH}/Linux-Arm/OniPlatformLinux-Arm.h" + DESTINATION + ${CURRENT_PACKAGES_DIR}/include/openni2/Linux-Arm +) + +file( + INSTALL + "${SOURCE_INCLUDE_PATH}/Linux-x86/OniPlatformLinux-x86.h" + DESTINATION + ${CURRENT_PACKAGES_DIR}/include/openni2/Linux-x86 +) + +file( + INSTALL + "${SOURCE_INCLUDE_PATH}/MacOSX/OniPlatformMacOSX.h" + DESTINATION + ${CURRENT_PACKAGES_DIR}/include/openni2/MacOSX +) + +file( + INSTALL + "${SOURCE_INCLUDE_PATH}/Win32/OniPlatformWin32.h" + DESTINATION + ${CURRENT_PACKAGES_DIR}/include/openni2/Win32 +) + +file( + INSTALL + "${SOURCE_INCLUDE_PATH}/OniCAPI.h" + "${SOURCE_INCLUDE_PATH}/OniCEnums.h" + "${SOURCE_INCLUDE_PATH}/OniCProperties.h" + "${SOURCE_INCLUDE_PATH}/OniCTypes.h" + "${SOURCE_INCLUDE_PATH}/OniEnums.h" + "${SOURCE_INCLUDE_PATH}/OniPlatform.h" + "${SOURCE_INCLUDE_PATH}/OniProperties.h" + "${SOURCE_INCLUDE_PATH}/OniVersion.h" + "${SOURCE_INCLUDE_PATH}/OpenNI.h" + "${SOURCE_INCLUDE_PATH}/PrimeSense.h" + "${SOURCE_INCLUDE_PATH}/PS1080.h" + "${SOURCE_INCLUDE_PATH}/PSLink.h" + DESTINATION + ${CURRENT_PACKAGES_DIR}/include/openni2 +) + +file( + INSTALL + "${SOURCE_BIN_PATH_RELEASE}/OpenNI2.lib" + DESTINATION + ${CURRENT_PACKAGES_DIR}/lib +) + +file( + INSTALL + "${SOURCE_BIN_PATH_DEBUG}/OpenNI2.lib" + DESTINATION + ${CURRENT_PACKAGES_DIR}/debug/lib +) + +file( + INSTALL + "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/Kinect.dll" + "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/OniFile.dll" + "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/PS1080.dll" + "${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PS1080.ini" + "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/PSLink.dll" + "${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PSLink.ini" + DESTINATION + ${CURRENT_PACKAGES_DIR}/bin/OpenNI2/Drivers +) + +file( + INSTALL + "${SOURCE_CONFIG_PATH}/OpenNI.ini" + DESTINATION + ${CURRENT_PACKAGES_DIR}/bin/OpenNI2 +) + +file( + INSTALL + "${SOURCE_BIN_PATH_RELEASE}/OpenNI2.dll" + DESTINATION + ${CURRENT_PACKAGES_DIR}/bin +) + +file( + INSTALL + "${SOURCE_BIN_PATH_DEBUG}/OpenNI2/Drivers/Kinect.dll" + "${SOURCE_BIN_PATH_DEBUG}/OpenNI2/Drivers/OniFile.dll" + "${SOURCE_BIN_PATH_DEBUG}/OpenNI2/Drivers/PS1080.dll" + "${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PS1080.ini" + "${SOURCE_BIN_PATH_DEBUG}/OpenNI2/Drivers/PSLink.dll" + "${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PSLink.ini" + DESTINATION + ${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2/Drivers +) + +file( + INSTALL + "${SOURCE_CONFIG_PATH}/OpenNI.ini" + DESTINATION + ${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2 +) + +file( + INSTALL + "${SOURCE_BIN_PATH_DEBUG}/OpenNI2.dll" + DESTINATION + ${CURRENT_PACKAGES_DIR}/debug/bin +) + +file( + INSTALL + "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/Kinect.dll" + "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/OniFile.dll" + "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/PS1080.dll" + "${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PS1080.ini" + "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/PSLink.dll" + "${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PSLink.ini" + DESTINATION + ${CURRENT_PACKAGES_DIR}/tools/openni2/OpenNI2/Drivers +) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(NUMBEROFBIT 32) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(NUMBEROFBIT 64) +endif() + +file( + INSTALL + "${SOURCE_THIRDPARTY_PATH}/GL/glut${NUMBEROFBIT}.dll" + "${SOURCE_BIN_PATH_RELEASE}/NiViewer.exe" + "${SOURCE_CONFIG_PATH}/OpenNI.ini" + "${SOURCE_BIN_PATH_RELEASE}/OpenNI2.dll" + "${SOURCE_BIN_PATH_RELEASE}/PS1080Console.exe" + "${SOURCE_BIN_PATH_RELEASE}/PSLinkConsole.exe" + DESTINATION + ${CURRENT_PACKAGES_DIR}/tools/openni2 +) + +# Deploy Script +file(COPY ${CMAKE_CURRENT_LIST_DIR}/openni2deploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/bin/OpenNI2) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/openni2deploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2) + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openni2) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/openni2/LICENSE ${CURRENT_PACKAGES_DIR}/share/openni2/copyright) diff --git a/externals/vcpkg/ports/openni2/replace_environment_variable.patch b/externals/vcpkg/ports/openni2/replace_environment_variable.patch new file mode 100755 index 000000000..48978e869 --- /dev/null +++ b/externals/vcpkg/ports/openni2/replace_environment_variable.patch @@ -0,0 +1,76 @@ +diff --git a/Source/Drivers/Kinect/Kinect.vcxproj b/Source/Drivers/Kinect/Kinect.vcxproj +index 08a49fe..7fd8620 100644 +--- a/Source/Drivers/Kinect/Kinect.vcxproj ++++ b/Source/Drivers/Kinect/Kinect.vcxproj +@@ -101,7 +101,7 @@ + + Level3 + Disabled +- ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc; ++ ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;@NATIVE_INSTALLED_DIR@\include + _WINDLL;%(PreprocessorDefinitions);_WINDOWS + false + false +@@ -109,7 +109,7 @@ + + true + Kinect10.lib;XnLib.lib;%(AdditionalDependencies) +- $(SolutionDir)Bin\$(Platform)-$(Configuration)\;$(KINECTSDK10_DIR)\lib\x86; ++ $(SolutionDir)Bin\$(Platform)-$(Configuration)\;@NATIVE_INSTALLED_DIR@\debug\lib + true + + +@@ -117,7 +117,7 @@ + + Level3 + Disabled +- ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc; ++ ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;@NATIVE_INSTALLED_DIR@\include + _WINDLL;%(PreprocessorDefinitions);_WINDOWS + false + false +@@ -125,7 +125,7 @@ + + true + Kinect10.lib;XnLib.lib;%(AdditionalDependencies) +- $(SolutionDir)Bin\$(Platform)-$(Configuration)\;$(KINECTSDK10_DIR)\lib\amd64; ++ $(SolutionDir)Bin\$(Platform)-$(Configuration)\;@NATIVE_INSTALLED_DIR@\debug\lib + + + +@@ -139,7 +139,7 @@ + MaxSpeed + true + true +- ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc; ++ ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;@NATIVE_INSTALLED_DIR@\include + false + + +@@ -147,7 +147,7 @@ + true + true + Kinect10.lib;XnLib.lib;%(AdditionalDependencies) +- $(SolutionDir)Bin\$(Platform)-$(Configuration)\;$(KINECTSDK10_DIR)\lib\x86; ++ $(SolutionDir)Bin\$(Platform)-$(Configuration)\;@NATIVE_INSTALLED_DIR@\lib + true + + +@@ -157,7 +157,7 @@ + MaxSpeed + true + true +- ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc; ++ ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;@NATIVE_INSTALLED_DIR@\include + false + + +@@ -165,7 +165,7 @@ + true + true + Kinect10.lib;XnLib.lib;%(AdditionalDependencies) +- $(SolutionDir)Bin\$(Platform)-$(Configuration)\;$(KINECTSDK10_DIR)\lib\amd64; ++ $(SolutionDir)Bin\$(Platform)-$(Configuration)\;@NATIVE_INSTALLED_DIR@\lib + true + + diff --git a/externals/vcpkg/ports/openni2/upgrade_projects.patch b/externals/vcpkg/ports/openni2/upgrade_projects.patch new file mode 100755 index 000000000..86dee5794 --- /dev/null +++ b/externals/vcpkg/ports/openni2/upgrade_projects.patch @@ -0,0 +1,1572 @@ +diff --git a/Samples/ClosestPointViewer/ClosestPointViewer.vcxproj b/Samples/ClosestPointViewer/ClosestPointViewer.vcxproj +index fe63dbf..6050e8f 100644 +--- a/Samples/ClosestPointViewer/ClosestPointViewer.vcxproj ++++ b/Samples/ClosestPointViewer/ClosestPointViewer.vcxproj +@@ -2,4 +2,4 @@ +- ++ + + + Debug +@@ -27,23 +27,27 @@ + Application + true + MultiByte ++ v141 + + + Application + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + +@@ -84,7 +88,7 @@ + _WINDLL;%(PreprocessorDefinitions) + Level4 + true +- true ++ false + + + +@@ -105,7 +109,7 @@ + _WINDLL;%(PreprocessorDefinitions) + Level4 + true +- true ++ false + + + +@@ -133,7 +137,7 @@ + false + StreamingSIMDExtensions2 + Fast +- true ++ false + + + true +@@ -142,6 +146,7 @@ + glut32.lib;OpenNI2.lib;MWClosestPoint.lib + $(OutDir);..\..\ThirdParty\GL + true ++ false + + + ..\..\Include +@@ -161,7 +166,7 @@ + false + StreamingSIMDExtensions2 + Fast +- true ++ false + + + true +diff --git a/Samples/EventBasedRead/EventBasedRead.vcxproj b/Samples/EventBasedRead/EventBasedRead.vcxproj +index f67db7a..ffe19ac 100644 +--- a/Samples/EventBasedRead/EventBasedRead.vcxproj ++++ b/Samples/EventBasedRead/EventBasedRead.vcxproj +@@ -2,4 +2,4 @@ +- ++ + + + Debug +@@ -27,23 +27,27 @@ + Application + true + MultiByte ++ v141 + + + Application + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + +@@ -83,7 +87,7 @@ + ..\..\Include;..\Common;%(AdditionalIncludeDirectories) + _WINDLL;%(PreprocessorDefinitions) + Level4 +- true ++ false + true + + +@@ -101,7 +105,7 @@ + ..\..\Include;..\Common;%(AdditionalIncludeDirectories) + _WINDLL;%(PreprocessorDefinitions) + Level4 +- true ++ false + true + + +@@ -119,7 +123,7 @@ + MaxSpeed + true + ..\..\Include;..\Common;%(AdditionalIncludeDirectories) +- true ++ false + true + AnySuitable + Speed +@@ -144,7 +148,7 @@ + MaxSpeed + true + ..\..\Include;..\Common;%(AdditionalIncludeDirectories) +- true ++ false + true + AnySuitable + Speed +diff --git a/Samples/MWClosestPoint/MWClosestPoint.vcxproj b/Samples/MWClosestPoint/MWClosestPoint.vcxproj +index 74cafe7..5844506 100644 +--- a/Samples/MWClosestPoint/MWClosestPoint.vcxproj ++++ b/Samples/MWClosestPoint/MWClosestPoint.vcxproj +@@ -2,4 +2,4 @@ +- ++ + + + Debug +@@ -27,23 +27,27 @@ + DynamicLibrary + true + MultiByte ++ v141 + + + DynamicLibrary + true + MultiByte ++ v141 + + + DynamicLibrary + false + true + MultiByte ++ v141 + + + DynamicLibrary + false + true + MultiByte ++ v141 + + + +@@ -84,7 +88,7 @@ + ..\..\Include + _CLOSEST_POINT;%(PreprocessorDefinitions) + true +- true ++ false + + + +@@ -105,7 +109,7 @@ + ..\..\Include + _CLOSEST_POINT;%(PreprocessorDefinitions) + true +- true ++ false + + + +@@ -134,7 +138,7 @@ + false + StreamingSIMDExtensions2 + Fast +- true ++ false + + + true +@@ -163,7 +167,7 @@ + false + StreamingSIMDExtensions2 + Fast +- true ++ false + + + true +diff --git a/Samples/MWClosestPointApp/MWClosestPointApp.vcxproj b/Samples/MWClosestPointApp/MWClosestPointApp.vcxproj +index 063ec37..deb7c17 100644 +--- a/Samples/MWClosestPointApp/MWClosestPointApp.vcxproj ++++ b/Samples/MWClosestPointApp/MWClosestPointApp.vcxproj +@@ -2,4 +2,4 @@ +- ++ + + + Debug +@@ -27,23 +27,27 @@ + Application + true + MultiByte ++ v141 + + + Application + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + +@@ -83,7 +87,7 @@ + Disabled + ..\MWClosestPoint;..\..\Include + true +- true ++ false + + + +@@ -103,7 +107,7 @@ + Disabled + ..\MWClosestPoint;..\..\Include + true +- true ++ false + + + +@@ -131,7 +135,7 @@ + false + StreamingSIMDExtensions2 + Fast +- true ++ false + + + true +@@ -159,7 +163,7 @@ + false + StreamingSIMDExtensions2 + Fast +- true ++ false + + + true +diff --git a/Samples/MultiDepthViewer/MultiDepthViewer.vcxproj b/Samples/MultiDepthViewer/MultiDepthViewer.vcxproj +index d021c0d..85a0d4f 100644 +--- a/Samples/MultiDepthViewer/MultiDepthViewer.vcxproj ++++ b/Samples/MultiDepthViewer/MultiDepthViewer.vcxproj +@@ -2,4 +2,4 @@ +- ++ + + + Debug +@@ -27,23 +27,27 @@ + Application + true + MultiByte ++ v141 + + + Application + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + +@@ -84,7 +88,7 @@ + _WINDLL;%(PreprocessorDefinitions) + Level4 + true +- true ++ false + + + +@@ -102,7 +106,7 @@ + _WINDLL;%(PreprocessorDefinitions) + Level4 + true +- true ++ false + + + +@@ -127,7 +131,7 @@ + false + StreamingSIMDExtensions2 + Fast +- true ++ false + + + true +@@ -136,6 +140,7 @@ + glut32.lib;OpenNI2.lib + $(OutDir);..\..\ThirdParty\GL + true ++ false + + + +@@ -152,7 +157,7 @@ + false + StreamingSIMDExtensions2 + Fast +- true ++ false + + + true +diff --git a/Samples/MultipleStreamRead/MultipleStreamRead.vcxproj b/Samples/MultipleStreamRead/MultipleStreamRead.vcxproj +index 15887ec..5fa8202 100644 +--- a/Samples/MultipleStreamRead/MultipleStreamRead.vcxproj ++++ b/Samples/MultipleStreamRead/MultipleStreamRead.vcxproj +@@ -2,4 +2,4 @@ +- ++ + + + Debug +@@ -27,23 +27,27 @@ + Application + true + MultiByte ++ v141 + + + Application + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + +@@ -83,7 +87,7 @@ + ..\..\Include;..\Common;%(AdditionalIncludeDirectories) + _WINDLL;%(PreprocessorDefinitions) + Level4 +- true ++ false + true + + +@@ -101,7 +105,7 @@ + ..\..\Include;..\Common;%(AdditionalIncludeDirectories) + _WINDLL;%(PreprocessorDefinitions) + Level4 +- true ++ false + true + + +@@ -119,7 +123,7 @@ + MaxSpeed + true + ..\..\Include;..\Common;%(AdditionalIncludeDirectories) +- true ++ false + true + AnySuitable + Speed +@@ -144,7 +148,7 @@ + MaxSpeed + true + ..\..\Include;..\Common;%(AdditionalIncludeDirectories) +- true ++ false + true + AnySuitable + Speed +diff --git a/Samples/SimpleRead/SimpleRead.vcxproj b/Samples/SimpleRead/SimpleRead.vcxproj +index de3942f..6ce41e3 100644 +--- a/Samples/SimpleRead/SimpleRead.vcxproj ++++ b/Samples/SimpleRead/SimpleRead.vcxproj +@@ -2,4 +2,4 @@ +- ++ + + + Debug +@@ -27,23 +27,27 @@ + Application + true + MultiByte ++ v141 + + + Application + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + +@@ -83,7 +87,7 @@ + ..\Common;..\..\Include;%(AdditionalIncludeDirectories) + _WINDLL;%(PreprocessorDefinitions) + Level4 +- true ++ false + true + + +@@ -101,7 +105,7 @@ + ..\Common;..\..\Include;%(AdditionalIncludeDirectories) + _WINDLL;%(PreprocessorDefinitions) + Level4 +- true ++ false + true + + +@@ -119,7 +123,7 @@ + MaxSpeed + true + ..\Common;..\..\Include;%(AdditionalIncludeDirectories) +- true ++ false + true + AnySuitable + Speed +@@ -144,7 +148,7 @@ + MaxSpeed + true + ..\Common;..\..\Include;%(AdditionalIncludeDirectories) +- true ++ false + true + AnySuitable + Speed +diff --git a/Samples/SimpleViewer/SimpleViewer.vcxproj b/Samples/SimpleViewer/SimpleViewer.vcxproj +index d693a1d..40621e1 100644 +--- a/Samples/SimpleViewer/SimpleViewer.vcxproj ++++ b/Samples/SimpleViewer/SimpleViewer.vcxproj +@@ -2,4 +2,4 @@ +- ++ + + + Debug +@@ -27,23 +27,27 @@ + Application + true + MultiByte ++ v141 + + + Application + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + +@@ -84,7 +88,7 @@ + _WINDLL;%(PreprocessorDefinitions) + Level4 + true +- true ++ false + + + +@@ -102,7 +106,7 @@ + _WINDLL;%(PreprocessorDefinitions) + Level4 + true +- true ++ false + + + +@@ -127,7 +131,7 @@ + false + StreamingSIMDExtensions2 + Fast +- true ++ false + + + true +@@ -136,6 +140,7 @@ + glut32.lib;OpenNI2.lib + $(OutDir);..\..\ThirdParty\GL + true ++ false + + + +@@ -152,7 +157,7 @@ + false + StreamingSIMDExtensions2 + Fast +- true ++ false + + + true +diff --git a/Source/Core/OpenNI.vcxproj b/Source/Core/OpenNI.vcxproj +index 12189de..f176682 100644 +--- a/Source/Core/OpenNI.vcxproj ++++ b/Source/Core/OpenNI.vcxproj +@@ -2,4 +2,4 @@ +- ++ + + + Debug +@@ -27,23 +27,27 @@ + DynamicLibrary + true + MultiByte ++ v141 + + + DynamicLibrary + true + MultiByte ++ v141 + + + DynamicLibrary + false + true + MultiByte ++ v141 + + + DynamicLibrary + false + true + MultiByte ++ v141 + + + +@@ -88,7 +92,7 @@ + _WINDLL;%(PreprocessorDefinitions);OPENNI2_EXPORT + ProgramDatabase + Level4 +- true ++ false + true + + +@@ -110,7 +114,7 @@ + _WINDLL;%(PreprocessorDefinitions);OPENNI2_EXPORT + ProgramDatabase + Level4 +- true ++ false + true + + +@@ -132,7 +136,7 @@ + true + _MBCS;%(PreprocessorDefinitions);OPENNI2_EXPORT + ..\..\Include;..\Drivers\OniFile\Formats;..\..\ThirdParty\PSCommon\XnLib\Include;..\..\ThirdParty\LibJPEG;%(AdditionalIncludeDirectories) +- true ++ false + true + AnySuitable + Speed +@@ -161,7 +165,7 @@ + true + _MBCS;%(PreprocessorDefinitions);OPENNI2_EXPORT + ..\..\Include;..\Drivers\OniFile\Formats;..\..\ThirdParty\PSCommon\XnLib\Include;..\..\ThirdParty\LibJPEG;%(AdditionalIncludeDirectories) +- true ++ false + true + AnySuitable + Speed +diff --git a/Source/DepthUtils/DepthUtils.vcxproj b/Source/DepthUtils/DepthUtils.vcxproj +index dcab0b7..e474661 100644 +--- a/Source/DepthUtils/DepthUtils.vcxproj ++++ b/Source/DepthUtils/DepthUtils.vcxproj +@@ -2,4 +2,4 @@ +- ++ + + + Debug +@@ -35,23 +35,27 @@ + StaticLibrary + true + MultiByte ++ v141 + + + StaticLibrary + true + MultiByte ++ v141 + + + StaticLibrary + false + true + MultiByte ++ v141 + + + StaticLibrary + false + true + MultiByte ++ v141 + + + +@@ -94,7 +98,7 @@ + Disabled + _WINDLL;%(PreprocessorDefinitions);DepthUtils_EXPORT + Level4 +- true ++ false + true + + +@@ -114,7 +118,7 @@ + Disabled + _WINDLL;%(PreprocessorDefinitions);DepthUtils_EXPORT + Level4 +- true ++ false + true + + +@@ -134,7 +138,7 @@ + MaxSpeed + true + _MBCS;%(PreprocessorDefinitions);DepthUtils_EXPORT +- true ++ false + true + true + AnySuitable +@@ -160,7 +164,7 @@ + MaxSpeed + true + _MBCS;%(PreprocessorDefinitions);DepthUtils_EXPORT +- true ++ false + true + AnySuitable + Speed +diff --git a/Source/Drivers/DummyDevice/DummyDevice.vcxproj b/Source/Drivers/DummyDevice/DummyDevice.vcxproj +index 56c5944..0401f3d 100644 +--- a/Source/Drivers/DummyDevice/DummyDevice.vcxproj ++++ b/Source/Drivers/DummyDevice/DummyDevice.vcxproj +@@ -2,4 +2,4 @@ +- ++ + + + Debug +@@ -27,23 +27,27 @@ + DynamicLibrary + true + MultiByte ++ v141 + + + DynamicLibrary + true + MultiByte ++ v141 + + + DynamicLibrary + false + true + MultiByte ++ v141 + + + DynamicLibrary + false + true + MultiByte ++ v141 + + + +@@ -84,7 +88,7 @@ + _WINDLL;%(PreprocessorDefinitions);DummyDevice2_EXPORT + ProgramDatabase + Level4 +- true ++ false + true + + +@@ -104,7 +108,7 @@ + _WINDLL;%(PreprocessorDefinitions);DummyDevice2_EXPORT + ProgramDatabase + Level4 +- true ++ false + true + + +@@ -124,7 +128,7 @@ + true + _MBCS;%(PreprocessorDefinitions);DummyDevice2_EXPORT + ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include +- true ++ false + true + AnySuitable + Speed +@@ -153,7 +157,7 @@ + true + _MBCS;%(PreprocessorDefinitions);DummyDevice2_EXPORT + ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include +- true ++ false + true + AnySuitable + Speed +diff --git a/Source/Drivers/Kinect/Kinect.vcxproj b/Source/Drivers/Kinect/Kinect.vcxproj +index f54e8b2..6ea2656 100644 +--- a/Source/Drivers/Kinect/Kinect.vcxproj ++++ b/Source/Drivers/Kinect/Kinect.vcxproj +@@ -2,4 +2,4 @@ +- ++ + + + Debug +@@ -28,12 +28,14 @@ + true + Unicode + true ++ v141 + + + DynamicLibrary + true + Unicode + true ++ v141 + + + DynamicLibrary +@@ -41,6 +43,7 @@ + true + MultiByte + true ++ v141 + + + DynamicLibrary +@@ -48,6 +51,7 @@ + true + MultiByte + true ++ v141 + + + +@@ -99,7 +103,7 @@ + ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc; + _WINDLL;%(PreprocessorDefinitions);_WINDOWS + false +- true ++ false + + + true +@@ -115,7 +119,7 @@ + ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc; + _WINDLL;%(PreprocessorDefinitions);_WINDOWS + false +- true ++ false + + + true +@@ -125,7 +129,7 @@ + + + +- true ++ false + + + +@@ -135,7 +139,7 @@ + true + true + ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc; +- true ++ false + + + true +@@ -153,7 +157,7 @@ + true + true + ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc; +- true ++ false + + + true +diff --git a/Source/Drivers/OniFile/OniFile.vcxproj b/Source/Drivers/OniFile/OniFile.vcxproj +index 9b173f7..e2f4391 100644 +--- a/Source/Drivers/OniFile/OniFile.vcxproj ++++ b/Source/Drivers/OniFile/OniFile.vcxproj +@@ -2,4 +2,4 @@ +- ++ + + + Debug +@@ -28,23 +28,27 @@ + DynamicLibrary + true + MultiByte ++ v141 + + + DynamicLibrary + true + MultiByte ++ v141 + + + DynamicLibrary + false + true + MultiByte ++ v141 + + + DynamicLibrary + false + true + MultiByte ++ v141 + + + +@@ -98,7 +102,7 @@ + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;ONIFILESPLAYER_EXPORTS;%(PreprocessorDefinitions) + ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;..\..\..\ThirdParty\LibJPEG +- true ++ false + true + + +@@ -133,7 +137,7 @@ + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;ONIFILESPLAYER_EXPORTS;%(PreprocessorDefinitions) + ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;..\..\..\ThirdParty\LibJPEG +- true ++ false + true + + +@@ -169,7 +173,7 @@ + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;ONIFILESPLAYER_EXPORTS;%(PreprocessorDefinitions) + ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;..\..\..\ThirdParty\LibJPEG +- true ++ false + true + AnySuitable + Speed +@@ -212,7 +216,7 @@ + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;ONIFILESPLAYER_EXPORTS;%(PreprocessorDefinitions) + ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;..\..\..\ThirdParty\LibJPEG +- true ++ false + true + AnySuitable + Speed +diff --git a/Source/Drivers/PS1080/PS1080.vcxproj b/Source/Drivers/PS1080/PS1080.vcxproj +index 2a1154d..8495c28 100644 +--- a/Source/Drivers/PS1080/PS1080.vcxproj ++++ b/Source/Drivers/PS1080/PS1080.vcxproj +@@ -2,4 +2,4 @@ +- ++ + + + Debug +@@ -525,23 +525,27 @@ + DynamicLibrary + true + Unicode ++ v141 + + + DynamicLibrary + true + Unicode ++ v141 + + + DynamicLibrary + false + true + Unicode ++ v141 + + + DynamicLibrary + false + true + Unicode ++ v141 + + + +@@ -587,7 +591,7 @@ + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;PS1080_EXPORTS;%(PreprocessorDefinitions) + .\Include;.\;..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;..\..\..\ThirdParty\LibJPEG;..\..\DepthUtils +- true ++ false + StreamingSIMDExtensions2 + true + +@@ -612,7 +616,7 @@ + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;PS1080_EXPORTS;%(PreprocessorDefinitions) + .\Include;.\;..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;..\..\..\ThirdParty\LibJPEG;..\..\DepthUtils +- true ++ false + StreamingSIMDExtensions2 + true + +@@ -638,7 +642,7 @@ + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;PS1080_EXPORTS;%(PreprocessorDefinitions) + .\Include;.\;..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;..\..\..\ThirdParty\LibJPEG;..\..\DepthUtils +- true ++ false + StreamingSIMDExtensions2 + true + AnySuitable +@@ -670,7 +674,7 @@ + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;PS1080_EXPORTS;%(PreprocessorDefinitions) + .\Include;.\;..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;..\..\..\ThirdParty\LibJPEG;..\..\DepthUtils +- true ++ false + StreamingSIMDExtensions2 + true + AnySuitable +diff --git a/Source/Drivers/PS1080/PS1080Console/PS1080Console.vcxproj b/Source/Drivers/PS1080/PS1080Console/PS1080Console.vcxproj +index b9adfea..7446d5a 100644 +--- a/Source/Drivers/PS1080/PS1080Console/PS1080Console.vcxproj ++++ b/Source/Drivers/PS1080/PS1080Console/PS1080Console.vcxproj +@@ -2,4 +2,4 @@ +- ++ + + + Debug +@@ -28,19 +28,23 @@ + Application + MultiByte + true ++ v141 + + + Application + MultiByte ++ v141 + + + Application + MultiByte + true ++ v141 + + + Application + MultiByte ++ v141 + + + +@@ -87,7 +91,7 @@ + EditAndContinue + 4250;4127;%(DisableSpecificWarnings) + true +- true ++ false + + + XnLib.lib;OpenNI2.lib;%(AdditionalDependencies) +@@ -95,7 +99,7 @@ + true + Console + MachineX86 +- true ++ false + + + +@@ -114,7 +118,7 @@ + Level4 + ProgramDatabase + 4250;4127;%(DisableSpecificWarnings) +- true ++ false + + + XnLib.lib;OpenNI2.lib;%(AdditionalDependencies) +@@ -139,7 +143,7 @@ + Level4 + ProgramDatabase + 4250;4127;%(DisableSpecificWarnings) +- true ++ false + + + XnLib.lib;OpenNI2.lib;%(AdditionalDependencies) +@@ -169,7 +173,7 @@ + Level4 + ProgramDatabase + 4250;4127;%(DisableSpecificWarnings) +- true ++ false + + + XnLib.lib;OpenNI2.lib;%(AdditionalDependencies) +diff --git a/Source/Drivers/PSLink/PSLink.vcxproj b/Source/Drivers/PSLink/PSLink.vcxproj +index 8915163..68a7e96 100644 +--- a/Source/Drivers/PSLink/PSLink.vcxproj ++++ b/Source/Drivers/PSLink/PSLink.vcxproj +@@ -2,4 +2,4 @@ +- ++ + + + Debug +@@ -28,19 +28,23 @@ + DynamicLibrary + Unicode + true ++ v141 + + + DynamicLibrary + Unicode ++ v141 + + + DynamicLibrary + Unicode + true ++ v141 + + + DynamicLibrary + Unicode ++ v141 + + + +@@ -87,7 +91,7 @@ + EditAndContinue + 4250;4127;%(DisableSpecificWarnings) + true +- true ++ false + + + XnLib.lib;%(AdditionalDependencies) +@@ -95,7 +99,7 @@ + true + Windows + MachineX86 +- true ++ false + + + +@@ -115,7 +119,7 @@ + Level4 + ProgramDatabase + 4250;4127;%(DisableSpecificWarnings) +- true ++ false + + + XnLib.lib;%(AdditionalDependencies) +@@ -140,7 +144,7 @@ + Level4 + ProgramDatabase + 4250;4127;%(DisableSpecificWarnings) +- true ++ false + + + XnLib.lib;%(AdditionalDependencies) +@@ -170,7 +174,7 @@ + Level4 + ProgramDatabase + 4250;4127;%(DisableSpecificWarnings) +- true ++ false + + + XnLib.lib;%(AdditionalDependencies) +diff --git a/Source/Drivers/PSLink/PSLinkConsole/PSLinkConsole.vcxproj b/Source/Drivers/PSLink/PSLinkConsole/PSLinkConsole.vcxproj +index e6c7c8c..26ff9c8 100644 +--- a/Source/Drivers/PSLink/PSLinkConsole/PSLinkConsole.vcxproj ++++ b/Source/Drivers/PSLink/PSLinkConsole/PSLinkConsole.vcxproj +@@ -2,4 +2,4 @@ +- ++ + + + Debug +@@ -28,19 +28,23 @@ + Application + MultiByte + true ++ v141 + + + Application + MultiByte ++ v141 + + + Application + MultiByte + true ++ v141 + + + Application + MultiByte ++ v141 + + + +@@ -87,7 +91,7 @@ + EditAndContinue + 4250;4127;%(DisableSpecificWarnings) + true +- true ++ false + + + OpenNI2.lib;XnLib.lib;%(AdditionalDependencies) +@@ -95,7 +99,7 @@ + true + Console + MachineX86 +- true ++ false + + + +@@ -114,7 +118,7 @@ + Level4 + ProgramDatabase + 4250;4127;%(DisableSpecificWarnings) +- true ++ false + + + OpenNI2.lib;XnLib.lib;%(AdditionalDependencies) +@@ -139,7 +143,7 @@ + Level4 + ProgramDatabase + 4250;4127;%(DisableSpecificWarnings) +- true ++ false + + + OpenNI2.lib;XnLib.lib;%(AdditionalDependencies) +@@ -169,7 +173,7 @@ + Level4 + ProgramDatabase + 4250;4127;%(DisableSpecificWarnings) +- true ++ false + + + OpenNI2.lib;XnLib.lib;%(AdditionalDependencies) +diff --git a/Source/Drivers/TestDevice/TestDevice.vcxproj b/Source/Drivers/TestDevice/TestDevice.vcxproj +index e20a074..3777b2e 100644 +--- a/Source/Drivers/TestDevice/TestDevice.vcxproj ++++ b/Source/Drivers/TestDevice/TestDevice.vcxproj +@@ -2,4 +2,4 @@ +- ++ + + + Debug +@@ -27,23 +27,27 @@ + DynamicLibrary + true + MultiByte ++ v141 + + + DynamicLibrary + true + MultiByte ++ v141 + + + DynamicLibrary + false + true + MultiByte ++ v141 + + + DynamicLibrary + false + true + MultiByte ++ v141 + + + +@@ -84,7 +88,7 @@ + _WINDLL;%(PreprocessorDefinitions);TestDevice2_EXPORT + ProgramDatabase + Level4 +- true ++ false + true + + +@@ -101,7 +105,7 @@ + _WINDLL;%(PreprocessorDefinitions);TestDevice2_EXPORT + ProgramDatabase + Level4 +- true ++ false + true + + +@@ -118,7 +122,7 @@ + true + _MBCS;%(PreprocessorDefinitions);TestDevice2_EXPORT + ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include +- true ++ false + true + AnySuitable + Speed +@@ -144,7 +148,7 @@ + true + _MBCS;%(PreprocessorDefinitions);TestDevice2_EXPORT + ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include +- true ++ false + true + AnySuitable + Speed +diff --git a/Source/Tools/NiViewer/NiViewer.vcxproj b/Source/Tools/NiViewer/NiViewer.vcxproj +index 0a4c392..e331009 100644 +--- a/Source/Tools/NiViewer/NiViewer.vcxproj ++++ b/Source/Tools/NiViewer/NiViewer.vcxproj +@@ -2,4 +2,4 @@ +- ++ + + + Debug +@@ -27,23 +27,27 @@ + Application + true + MultiByte ++ v141 + + + Application + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + +@@ -84,7 +88,7 @@ + _WINDLL;%(PreprocessorDefinitions) + Level4 + true +- true ++ false + + + +@@ -105,7 +109,7 @@ + _WINDLL;%(PreprocessorDefinitions) + Level4 + true +- true ++ false + + + +@@ -133,7 +137,7 @@ + false + StreamingSIMDExtensions2 + Fast +- true ++ false + + + true +@@ -142,6 +146,7 @@ + Comdlg32.lib;OpenNI2.lib;XnLib.lib;glut32.lib + $(OutDir);..\..\..\ThirdParty\GL + true ++ false + + + ..\..\..\Include +@@ -161,7 +166,7 @@ + false + StreamingSIMDExtensions2 + Fast +- true ++ false + + + true +diff --git a/ThirdParty/PSCommon/XnLib/Source/XnLib.vcxproj b/ThirdParty/PSCommon/XnLib/Source/XnLib.vcxproj +index 2761222..f2094b3 100644 +--- a/ThirdParty/PSCommon/XnLib/Source/XnLib.vcxproj ++++ b/ThirdParty/PSCommon/XnLib/Source/XnLib.vcxproj +@@ -2,4 +2,4 @@ +- ++ + + + Debug +@@ -116,23 +116,27 @@ + StaticLibrary + true + MultiByte ++ v141 + + + StaticLibrary + true + MultiByte ++ v141 + + + StaticLibrary + false + true + MultiByte ++ v141 + + + StaticLibrary + false + true + MultiByte ++ v141 + + + +@@ -176,7 +180,7 @@ + ..\Include;..\Driver\Win32\Build\sys;%(AdditionalIncludeDirectories) + _WINDLL;%(PreprocessorDefinitions);XnLib_EXPORT + Level4 +- true ++ false + true + + +@@ -198,7 +202,7 @@ + ..\Include;..\Driver\Win32\Build\sys;%(AdditionalIncludeDirectories) + _WINDLL;%(PreprocessorDefinitions);XnLib_EXPORT + Level4 +- true ++ false + true + + +@@ -220,7 +224,7 @@ + true + _MBCS;%(PreprocessorDefinitions);XnLib_EXPORT + ..\Include;..\Driver\Win32\Build\sys;%(AdditionalIncludeDirectories) +- true ++ false + true + true + AnySuitable +@@ -248,7 +252,7 @@ + true + _MBCS;%(PreprocessorDefinitions);XnLib_EXPORT + ..\Include;..\Driver\Win32\Build\sys;%(AdditionalIncludeDirectories) +- true ++ false + true + AnySuitable + Speed +diff --git a/Wrappers/java/OpenNI.jni/OpenNI.jni.vcxproj b/Wrappers/java/OpenNI.jni/OpenNI.jni.vcxproj +index b95c484..bfd0503 100644 +--- a/Wrappers/java/OpenNI.jni/OpenNI.jni.vcxproj ++++ b/Wrappers/java/OpenNI.jni/OpenNI.jni.vcxproj +@@ -2,4 +2,4 @@ +- ++ + + + Debug +@@ -28,18 +28,22 @@ + true + Unicode + true ++ v141 + + + DynamicLibrary + false + true + Unicode ++ v141 + + + DynamicLibrary ++ v141 + + + DynamicLibrary ++ v141 + + + diff --git a/externals/vcpkg/ports/openni2/vcpkg.json b/externals/vcpkg/ports/openni2/vcpkg.json new file mode 100755 index 000000000..5110fbc07 --- /dev/null +++ b/externals/vcpkg/ports/openni2/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "openni2", + "version-string": "2.2.0.33", + "port-version": 13, + "description": "OpenNI is open source library for access to Natural Interaction (NI) devices such as RGB-D camera.", + "homepage": "https://github.com/OpenNI/OpenNI2", + "supports": "!uwp", + "dependencies": [ + "kinectsdk1" + ] +} diff --git a/externals/vcpkg/ports/openscap/fix-build.patch b/externals/vcpkg/ports/openscap/fix-build.patch new file mode 100755 index 000000000..57d22946b --- /dev/null +++ b/externals/vcpkg/ports/openscap/fix-build.patch @@ -0,0 +1,121 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4de5b57..5f483a3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -140,15 +140,25 @@ find_package(SWIG) + find_package(LibXml2 REQUIRED) + find_package(LibXslt REQUIRED) + find_package(BZip2) ++find_package(OpenSSL REQUIRED) ++find_package(ZLIB REQUIRED) + + # PThread +-set(CMAKE_THREAD_PREFER_PTHREAD) +-set(THREADS_PREFER_PTHREAD_FLAG) +-set(THREADS_USE_PTHREADS_WIN32 true) +-find_package(Threads REQUIRED) +-check_library_exists(pthread pthread_timedjoin_np "" HAVE_PTHREAD_TIMEDJOIN_NP) +-check_library_exists(pthread pthread_setname_np "" HAVE_PTHREAD_SETNAME_NP) +-check_library_exists(pthread pthread_getname_np "" HAVE_PTHREAD_GETNAME_NP) ++if (WIN32) ++ set(CMAKE_THREAD_PREFER_PTHREAD) ++ set(THREADS_PREFER_PTHREAD_FLAG) ++ set(THREADS_USE_PTHREADS_WIN32 true) ++ find_package(pthread CONFIG REQUIRED) ++ set(CMAKE_THREAD_LIBS_INIT ${PThreads4W_LIBRARY}) ++ check_library_exists(pthread pthread_timedjoin_np "" HAVE_PTHREAD_TIMEDJOIN_NP) ++ check_library_exists(pthread pthread_setname_np "" HAVE_PTHREAD_SETNAME_NP) ++ check_library_exists(pthread pthread_getname_np "" HAVE_PTHREAD_GETNAME_NP) ++else() ++ set(THREADS_USE_PTHREADS_WIN32 -pthread) ++endif() ++ ++# OpenSSL ++link_libraries(OpenSSL::SSL OpenSSL::Crypto) + + # WITH_CRYPTO + set(WITH_CRYPTO "gcrypt" CACHE STRING "gcrypt|nss3") +@@ -373,19 +383,9 @@ message(STATUS "asciidoc: ${ASCIIDOC_EXECUTABLE}") + + # ---------- PATHS + +-if(WIN32) +- # Windows installer does not allow full paths. +- # The install path can be changed by user in Windows installer. +- # We will use relative names - "schemas", "xsl" and "cpe" +- # directories will be located in the same directory as oscap.exe. +- set(OSCAP_DEFAULT_SCHEMA_PATH "schemas") +- set(OSCAP_DEFAULT_XSLT_PATH "xsl") +- set(OSCAP_DEFAULT_CPE_PATH "cpe") +-else() +- set(OSCAP_DEFAULT_SCHEMA_PATH "${CMAKE_INSTALL_FULL_DATADIR}/openscap/schemas") +- set(OSCAP_DEFAULT_XSLT_PATH "${CMAKE_INSTALL_FULL_DATADIR}/openscap/xsl") +- set(OSCAP_DEFAULT_CPE_PATH "${CMAKE_INSTALL_FULL_DATADIR}/openscap/cpe") +-endif() ++set(OSCAP_DEFAULT_SCHEMA_PATH share/openscap/schemas) ++set(OSCAP_DEFAULT_XSLT_PATH share/openscap/xsl) ++set(OSCAP_DEFAULT_CPE_PATH share/openscap/cpe) + set(OSCAP_TEMP_DIR "/tmp" CACHE STRING "use different temporary directory to execute sce scripts (default=/tmp)") + + # ---------- RPATHS for linking +diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt +index 2a3f373..781d05a 100644 +--- a/utils/CMakeLists.txt ++++ b/utils/CMakeLists.txt +@@ -6,27 +6,32 @@ if(ENABLE_OSCAP_UTIL) + add_executable(oscap ${UTILS_SOURCES}) + target_link_libraries(oscap openscap) + if(WIN32) +- set(OSCAP_UTIL_DESTINATION ".") ++ find_path(GETOPT_INCLUDE_DIR getopt.h) ++ include(SelectLibraryConfigurations) ++ find_library(GETOPT_LIBRARY_RELEASE NAMES getopt) ++ find_library(GETOPT_LIBRARY_DEBUG NAMES getopt PATH_SUFFIXES debug/lib) ++ select_library_configurations(GETOPT) ++ ++ message("GETOPT_INCLUDE_DIR: ${GETOPT_INCLUDE_DIR}") ++ message("GETOPT_LIBRARY: ${GETOPT_LIBRARY}") ++ ++ target_include_directories(oscap PRIVATE ${GETOPT_INCLUDE_DIR}) ++ target_link_libraries(oscap PRIVATE ${GETOPT_LIBRARY}) ++ ++ set(OSCAP_UTIL_DESTINATION tools) + # Install the 'oscap' utility + install(TARGETS "oscap" + DESTINATION ${OSCAP_UTIL_DESTINATION} + ) +- # Install all recursively dependent DLLs for oscap.exe +- set(APPS "\${CMAKE_INSTALL_PREFIX}/oscap.exe") # the \ before $ is required by BundleUtilities +- set(VCPKG_DLL_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin") +- install(CODE " +- include(BundleUtilities) +- fixup_bundle(\"${APPS}\" \"\" \"${VCPKG_DLL_DIR}\") +- ") + else() +- set(OSCAP_UTIL_DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ set(OSCAP_UTIL_DESTINATION tools) + # Install the 'oscap' utility + install(TARGETS "oscap" + DESTINATION ${OSCAP_UTIL_DESTINATION} + ) + # Install manual page + install(FILES "oscap.8" +- DESTINATION "${CMAKE_INSTALL_MANDIR}/man8" ++ DESTINATION share/openscap/man8 + ) + endif() + endif() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9e18613..e84a21f 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -125,4 +125,8 @@ else() + set(OPENSCAP_INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() + +-install(TARGETS openscap DESTINATION ${OPENSCAP_INSTALL_DESTINATION}) ++install(TARGETS openscap ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++) diff --git a/externals/vcpkg/ports/openscap/portfile.cmake b/externals/vcpkg/ports/openscap/portfile.cmake new file mode 100755 index 000000000..70f55be56 --- /dev/null +++ b/externals/vcpkg/ports/openscap/portfile.cmake @@ -0,0 +1,45 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO OpenSCAP/openscap + REF 3a4c635691380fa990a226acc8558db35d7ebabc #1.3.1 + SHA512 12681d43b2ce067c5a5c4eb47e14d91d6e9362b1f98f1d35b05d79ad84c7ee8c29f438eaae8e8465033155e500bb0f936eb79af46fab15e4a07e03c6be8b655d + HEAD_REF dev + PATCHES + fix-build.patch +) + +if ("python" IN_LIST FEATURES) + vcpkg_find_acquire_program(PYTHON3) +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + docs ENABLE_DOCS + tests ENABLE_TESTS + util ENABLE_OSCAP_UTIL + python ENABLE_PYTHON3 +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS ${FEATURE_OPTIONS} + -DPYTHON_EXECUTABLE=${PYTHON3} + -DENABLE_PERL=OFF + -DENABLE_MITRE=OFF + -DENABLE_VALGRIND=OFF + -DENABLE_OSCAP_UTIL_DOCKER=OFF + -DENABLE_OSCAP_UTIL_AS_RPM=OFF + -DENABLE_OSCAP_UTIL_SSH=OFF + -DENABLE_OSCAP_UTIL_VM=OFF + -DENABLE_OSCAP_UTIL_PODMAN=OFF + -DENABLE_OSCAP_UTIL_CHROOT=OFF +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) + +vcpkg_copy_pdbs() + +#Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/openscap/vcpkg.json b/externals/vcpkg/ports/openscap/vcpkg.json new file mode 100755 index 000000000..3bab620ed --- /dev/null +++ b/externals/vcpkg/ports/openscap/vcpkg.json @@ -0,0 +1,39 @@ +{ + "name": "openscap", + "version-string": "1.3.1", + "port-version": 1, + "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", + "dependencies": [ + "curl", + "glib", + "libpopt", + "libxml2", + "libxslt", + "libzip", + "openssl", + "pcre2", + "pthread", + "zlib" + ], + "features": { + "docs": { + "description": "install docs" + }, + "python": { + "description": "build with python3" + }, + "tests": { + "description": "build with tests" + }, + "util": { + "description": "build available utils", + "dependencies": [ + { + "name": "getopt-win32", + "platform": "windows" + } + ] + } + } +} diff --git a/externals/vcpkg/ports/openssl-unix/portfile.cmake b/externals/vcpkg/ports/openssl-unix/portfile.cmake new file mode 100755 index 000000000..065116c27 --- /dev/null +++ b/externals/vcpkg/ports/openssl-unix/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/openssl-unix/vcpkg.json b/externals/vcpkg/ports/openssl-unix/vcpkg.json new file mode 100755 index 000000000..16ac635a7 --- /dev/null +++ b/externals/vcpkg/ports/openssl-unix/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "openssl-unix", + "version-string": "1.1.1h", + "port-version": 2, + "description": "Deprecated OpenSSL port", + "supports": "!(windows | uwp)", + "dependencies": [ + "openssl" + ] +} diff --git a/externals/vcpkg/ports/openssl-uwp/portfile.cmake b/externals/vcpkg/ports/openssl-uwp/portfile.cmake new file mode 100755 index 000000000..0015715fb --- /dev/null +++ b/externals/vcpkg/ports/openssl-uwp/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/externals/vcpkg/ports/openssl-uwp/vcpkg.json b/externals/vcpkg/ports/openssl-uwp/vcpkg.json new file mode 100755 index 000000000..eba2d4781 --- /dev/null +++ b/externals/vcpkg/ports/openssl-uwp/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "openssl-uwp", + "version-string": "1.1.1h", + "port-version": 2, + "description": "Deprecated OpenSSL port", + "supports": "uwp", + "dependencies": [ + "openssl" + ] +} diff --git a/externals/vcpkg/ports/openssl-windows/portfile.cmake b/externals/vcpkg/ports/openssl-windows/portfile.cmake new file mode 100755 index 000000000..0015715fb --- /dev/null +++ b/externals/vcpkg/ports/openssl-windows/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/externals/vcpkg/ports/openssl-windows/vcpkg.json b/externals/vcpkg/ports/openssl-windows/vcpkg.json new file mode 100755 index 000000000..069235b15 --- /dev/null +++ b/externals/vcpkg/ports/openssl-windows/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "openssl-windows", + "version-string": "1.1.1h", + "port-version": 2, + "description": "Deprecated OpenSSL port", + "supports": "windows", + "dependencies": [ + "openssl" + ] +} diff --git a/externals/vcpkg/ports/openssl/install-pc-files.cmake b/externals/vcpkg/ports/openssl/install-pc-files.cmake new file mode 100755 index 000000000..eb8d2b8c2 --- /dev/null +++ b/externals/vcpkg/ports/openssl/install-pc-files.cmake @@ -0,0 +1,32 @@ +function(install_pc_file name pc_data) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${name}.pc" @ONLY) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${name}.pc" @ONLY) + endif() +endfunction() + +install_pc_file(openssl [[ +Name: OpenSSL +Description: Secure Sockets Layer and cryptography libraries and tools +Requires: libssl libcrypto +]]) + +install_pc_file(libssl [[ +Name: OpenSSL-libssl +Description: Secure Sockets Layer and cryptography libraries +Libs: -L"${libdir}" -llibssl +Requires: libcrypto +Cflags: -I"${includedir}" +]]) + +install_pc_file(libcrypto [[ +Name: OpenSSL-libcrypto +Description: OpenSSL cryptography library +Libs: -L"${libdir}" -llibcrypto +Libs.private: -lcrypt32 -lws2_32 +Cflags: -I"${includedir}" +]]) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/openssl/openssl.pc.in b/externals/vcpkg/ports/openssl/openssl.pc.in new file mode 100755 index 000000000..3033e1804 --- /dev/null +++ b/externals/vcpkg/ports/openssl/openssl.pc.in @@ -0,0 +1,6 @@ +prefix=${pcfiledir}/../.. +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include +Version: @OPENSSL_VERSION@ +@pc_data@ diff --git a/externals/vcpkg/ports/openssl/portfile.cmake b/externals/vcpkg/ports/openssl/portfile.cmake new file mode 100755 index 000000000..36a8f4b77 --- /dev/null +++ b/externals/vcpkg/ports/openssl/portfile.cmake @@ -0,0 +1,38 @@ +if(EXISTS "${CURRENT_INSTALLED_DIR}/share/libressl/copyright" + OR EXISTS "${CURRENT_INSTALLED_DIR}/share/boringssl/copyright") + message(FATAL_ERROR "Can't build openssl if libressl/boringssl is installed. Please remove libressl/boringssl, and try install openssl again if you need it.") +endif() + +if (VCPKG_TARGET_IS_LINUX) + message(WARNING +[[openssl currently requires the following library from the system package manager: + linux-headers +It can be installed on alpine systems via apk add linux-headers.]] + ) +endif() + +set(OPENSSL_VERSION 3.0.3) + +vcpkg_download_distfile( + ARCHIVE + URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" + FILENAME "openssl-${OPENSSL_VERSION}.tar.gz" + SHA512 949472025211fabdaf2564122f0a9a3baef0facb6373e90cf6c4485164a50898050b179722d0b358c4d8cf1787384ea30d5fd03b98757634631d3e8978509b1a +) + +vcpkg_find_acquire_program(PERL) +get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) +vcpkg_add_to_path("${PERL_EXE_PATH}") + +if(VCPKG_TARGET_IS_UWP) + include("${CMAKE_CURRENT_LIST_DIR}/uwp/portfile.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/install-pc-files.cmake") +elseif(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + include("${CMAKE_CURRENT_LIST_DIR}/windows/portfile.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/install-pc-files.cmake") +else() + include("${CMAKE_CURRENT_LIST_DIR}/unix/portfile.cmake") +endif() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/openssl/unix/CMakeLists.txt b/externals/vcpkg/ports/openssl/unix/CMakeLists.txt new file mode 100755 index 000000000..9cb6a5325 --- /dev/null +++ b/externals/vcpkg/ports/openssl/unix/CMakeLists.txt @@ -0,0 +1,285 @@ +cmake_minimum_required(VERSION 3.9) +project(openssl C) + +if(NOT SOURCE_PATH) + message(FATAL_ERROR "Requires SOURCE_PATH") +endif() + +if(CMAKE_SYSTEM_NAME STREQUAL "Android" OR CMAKE_SYSTEM_NAME STREQUAL "Linux") + if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") + set(PLATFORM linux-x86_64) + else() + set(PLATFORM linux-generic32) + endif() +elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS") + if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm64") + set(PLATFORM ios64-xcrun) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "arm") + set(PLATFORM ios-xcrun) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" OR + VCPKG_TARGET_ARCHITECTURE MATCHES "x64") + set(PLATFORM iossimulator-xcrun) + else() + message(FATAL_ERROR "Unknown iOS target architecture: ${VCPKG_TARGET_ARCHITECTURE}") + endif() + # disable that makes linkage error (e.g. require stderr usage) + list(APPEND DISABLES no-stdio no-ui no-asm) +elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm64") + set(PLATFORM darwin64-arm64-cc) + else() + set(PLATFORM darwin64-x86_64-cc) + endif() +elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + set(PLATFORM BSD-generic64) +elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") + set(PLATFORM BSD-generic64) +elseif(MINGW) + if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") + set(PLATFORM mingw64) + else() + set(PLATFORM mingw) + endif() +elseif(EMSCRIPTEN) + set(MAKE $ENV{EMSDK}/upstream/emscripten/emmake) + set(ENV{MAKE} $ENV{EMSDK}/upstream/emscripten/emmake) +else() + message(FATAL_ERROR "Unknown platform") +endif() + +get_filename_component(COMPILER_ROOT "${CMAKE_C_COMPILER}" DIRECTORY) + +message("CMAKE_C_COMPILER=${CMAKE_C_COMPILER}") +message("COMPILER_ROOT=${COMPILER_ROOT}") +message("CMAKE_SYSROOT=${CMAKE_SYSROOT}") +message("CMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}") +message("CMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}") +message("CMAKE_C_FLAGS=${CMAKE_C_FLAGS}") +message("CMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}") +message("CMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}") +message("CMAKE_INCLUDE_SYSTEM_FLAG_C=${CMAKE_INCLUDE_SYSTEM_FLAG_C}") +message("CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG=${CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG}") + +string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE) +set(CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${BUILD_TYPE}}") +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + set(CFLAGS "${CFLAGS} -Wno-error=unused-command-line-argument") +endif() +if(CMAKE_C_COMPILER_TARGET AND CMAKE_C_COMPILE_OPTIONS_TARGET) + set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_TARGET}${CMAKE_C_COMPILER_TARGET}") +endif() +if(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN AND CMAKE_C_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN) + set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN}") +endif() +if(CMAKE_SYSROOT AND CMAKE_C_COMPILE_OPTIONS_SYSROOT) + set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}") +elseif(CMAKE_OSX_SYSROOT AND CMAKE_C_COMPILE_OPTIONS_SYSROOT) + set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_OSX_SYSROOT}") +endif() +if (CMAKE_OSX_DEPLOYMENT_TARGET AND CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG) + set(CFLAGS "${CFLAGS} ${CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG}${CMAKE_OSX_DEPLOYMENT_TARGET}") +elseif((CMAKE_SYSTEM_NAME STREQUAL "Darwin") AND (VCPKG_TARGET_ARCHITECTURE MATCHES "arm64")) + set(CFLAGS "${CFLAGS} -mmacosx-version-min=11.0") +endif() + +string(REGEX REPLACE "^ " "" CFLAGS "${CFLAGS}") + +if(CMAKE_HOST_WIN32) + file(TO_NATIVE_PATH ENV_PATH "${COMPILER_ROOT};$ENV{PATH}") +else() + file(TO_NATIVE_PATH ENV_PATH "${COMPILER_ROOT}:$ENV{PATH}") +endif() +set(ENV{ANDROID_DEV} "${CMAKE_SYSROOT}/usr") + +if(NOT IOS) + set(ENV{CC} "${CMAKE_C_COMPILER}") +endif() + +message("ENV{ANDROID_DEV}=$ENV{ANDROID_DEV}") + +get_filename_component(SOURCE_PATH_NAME "${SOURCE_PATH}" NAME) +set(BUILDDIR "${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_PATH_NAME}") + +if(NOT EXISTS "${BUILDDIR}") + file(COPY ${SOURCE_PATH} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) +endif() + +get_filename_component(MSYS_BIN_DIR "${MAKE}" DIRECTORY) + +if(BUILD_SHARED_LIBS) + set(SHARED shared) + file(STRINGS "${BUILDDIR}/VERSION.dat" SHLIB_VERSION + REGEX "^SHLIB_VERSION=.*") + string(REGEX REPLACE "^(SHLIB_VERSION=)(.*)$" "\\2" + SHLIB_VERSION "${SHLIB_VERSION}") + + if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS") + set(LIB_EXT dylib) + set(LIB_EXTS ${SHLIB_VERSION}.${LIB_EXT}) + elseif(MINGW) + string(REPLACE "." "_" SHLIB_VERSION "${SHLIB_VERSION}") + set(BIN_EXT dll) + set(LIB_EXT dll.a) + else() + set(LIB_EXT so) + set(LIB_EXTS ${LIB_EXT}.${SHLIB_VERSION}) + endif() + list(APPEND BIN_EXTS ${BIN_EXT}) + list(APPEND LIB_EXTS ${LIB_EXT}) +else() + set(SHARED no-shared no-module) + set(LIB_EXTS a) +endif() +set(INSTALL_PKG_CONFIGS "${BUILDDIR}/openssl.pc") +foreach(lib ssl crypto) + foreach(ext ${LIB_EXTS}) + list(APPEND INSTALL_LIBS "${BUILDDIR}/lib${lib}.${ext}") + list(APPEND INSTALL_PKG_CONFIGS "${BUILDDIR}/lib${lib}.pc") + endforeach() + foreach(ext ${BIN_EXTS}) + # This might be wrong for targets which don't follow this naming scheme, but I'm not aware of any + if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") + list(APPEND INSTALL_BINS "${BUILDDIR}/lib${lib}-${SHLIB_VERSION}-x64.${ext}") + else() + list(APPEND INSTALL_BINS "${BUILDDIR}/lib${lib}-${SHLIB_VERSION}.${ext}") + endif() + endforeach() +endforeach() + +if(CMAKE_HOST_WIN32) + set(ENV_COMMAND set) + set(PATH_VAR ";%PATH%") +else() + set(ENV_COMMAND export) + set(PATH_VAR ":$ENV{PATH}") +endif() + +add_custom_command( + OUTPUT "${BUILDDIR}/Makefile" + COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}" + VERBATIM + WORKING_DIRECTORY "${BUILDDIR}" +) + +if(NOT IOS) + add_custom_command( + OUTPUT "${BUILDDIR}/Makefile" + COMMAND ${ENV_COMMAND} CC=${CMAKE_C_COMPILER} + COMMAND ${ENV_COMMAND} AR=${CMAKE_AR} + COMMAND ${ENV_COMMAND} LD=${CMAKE_LINKER} + COMMAND ${ENV_COMMAND} RANLIB=${CMAKE_RANLIB} + COMMAND ${ENV_COMMAND} MAKE=${MAKE} + COMMAND ${ENV_COMMAND} MAKEDEPPROG=${CMAKE_C_COMPILER} + COMMAND ${ENV_COMMAND} WINDRES=${CMAKE_RC_COMPILER} + VERBATIM + APPEND + ) + if(EMSCRIPTEN) + list(APPEND DISABLES + threads + no-engine + no-dso + no-asm + no-shared + no-sse2 + no-srtp + ) + else() + list(APPEND DISABLES + enable-static-engine + no-zlib + no-ssl2 + no-idea + no-cast + no-seed + no-md2 + no-tests) + endif() +endif() + +if(EMSCRIPTEN) + add_custom_command( + OUTPUT "${BUILDDIR}/Makefile" + COMMAND "$ENV{EMSDK}/upstream/emscripten/emconfigure" ./config + ${SHARED} + ${DISABLES} + "--prefix=${CMAKE_INSTALL_PREFIX}" + "--openssldir=/etc/ssl" + "--cross-compile-prefix=\"/\"" + VERBATIM + APPEND + ) + + add_custom_target(build_libs ALL + COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}" + COMMAND "${CMAKE_COMMAND}" -E touch "${BUILDDIR}/krb5.h" + COMMAND "${MAKE}" make build_libs + VERBATIM + WORKING_DIRECTORY "${BUILDDIR}" + DEPENDS "${BUILDDIR}/Makefile" + BYPRODUCTS ${INSTALL_LIBS} + ) +else() + add_custom_command( + OUTPUT "${BUILDDIR}/Makefile" + COMMAND "${PERL}" Configure + ${SHARED} + ${DISABLES} + ${PLATFORM} + "--prefix=${CMAKE_INSTALL_PREFIX}" + "--openssldir=/etc/ssl" + ${CFLAGS} + VERBATIM + APPEND + ) + + add_custom_target(build_libs ALL + COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}" + COMMAND "${CMAKE_COMMAND}" -E touch "${BUILDDIR}/krb5.h" + COMMAND "${MAKE}" -j ${VCPKG_CONCURRENCY} build_libs + VERBATIM + WORKING_DIRECTORY "${BUILDDIR}" + DEPENDS "${BUILDDIR}/Makefile" + BYPRODUCTS ${INSTALL_LIBS} + ) +endif() + +add_custom_command( + OUTPUT "${BUILDDIR}/Makefile" + COMMAND "${CMAKE_COMMAND}" "-DDIR=${BUILDDIR}" -P "${CMAKE_CURRENT_LIST_DIR}/remove-deps.cmake" + VERBATIM + APPEND +) + +if((CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS") AND BUILD_SHARED_LIBS) + if(DEFINED CMAKE_INSTALL_NAME_DIR) + set(ID_PREFIX "${CMAKE_INSTALL_NAME_DIR}") + else() + set(ID_PREFIX "@rpath") + endif() + + add_custom_command( + TARGET build_libs + COMMAND /usr/bin/install_name_tool -id "${ID_PREFIX}/libssl.${SHLIB_VERSION}.dylib" + "${BUILDDIR}/libssl.${SHLIB_VERSION}.dylib" + COMMAND /usr/bin/install_name_tool -id "${ID_PREFIX}/libcrypto.${SHLIB_VERSION}.dylib" + "${BUILDDIR}/libcrypto.${SHLIB_VERSION}.dylib" + COMMAND /usr/bin/install_name_tool -change "${CMAKE_INSTALL_PREFIX}/lib/libcrypto.${SHLIB_VERSION}.dylib" + "${ID_PREFIX}/libcrypto.${SHLIB_VERSION}.dylib" + "${BUILDDIR}/libssl.${SHLIB_VERSION}.dylib" + VERBATIM + ) +endif() + +install( + FILES ${INSTALL_LIBS} + DESTINATION lib +) +install( + FILES ${INSTALL_BINS} + DESTINATION bin +) +install( + FILES ${INSTALL_PKG_CONFIGS} + DESTINATION lib/pkgconfig +) diff --git a/externals/vcpkg/ports/openssl/unix/portfile.cmake b/externals/vcpkg/ports/openssl/unix/portfile.cmake new file mode 100755 index 000000000..c1c2b0ecb --- /dev/null +++ b/externals/vcpkg/ports/openssl/unix/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH MASTER_COPY_SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF ${OPENSSL_VERSION} +) + +if(CMAKE_HOST_WIN32) + vcpkg_acquire_msys(MSYS_ROOT PACKAGES make perl) + set(MAKE "${MSYS_ROOT}/usr/bin/make.exe") + set(PERL "${MSYS_ROOT}/usr/bin/perl.exe") +else() + find_program(MAKE make) + if(NOT MAKE) + message(FATAL_ERROR "Could not find make. Please install it through your package manager.") + endif() +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}" + OPTIONS + -DSOURCE_PATH=${MASTER_COPY_SOURCE_PATH} + -DPERL=${PERL} + -DMAKE=${MAKE} + -DVCPKG_CONCURRENCY=${VCPKG_CONCURRENCY} +) + +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() + +file(GLOB HEADERS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/include/openssl/*.h") +set(RESOLVED_HEADERS) +foreach(HEADER ${HEADERS}) + get_filename_component(X "${HEADER}" REALPATH) + list(APPEND RESOLVED_HEADERS "${X}") +endforeach() + +file(INSTALL ${RESOLVED_HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/openssl") +file(INSTALL "${MASTER_COPY_SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/openssl/unix/remove-deps.cmake b/externals/vcpkg/ports/openssl/unix/remove-deps.cmake new file mode 100755 index 000000000..a57c70fe9 --- /dev/null +++ b/externals/vcpkg/ports/openssl/unix/remove-deps.cmake @@ -0,0 +1,7 @@ +file(GLOB_RECURSE MAKEFILES ${DIR}/*/Makefile) +foreach(MAKEFILE ${MAKEFILES}) + message("removing deps from ${MAKEFILE}") + file(READ "${MAKEFILE}" _contents) + string(REGEX REPLACE "\n# DO NOT DELETE THIS LINE.*" "" _contents "${_contents}") + file(WRITE "${MAKEFILE}" "${_contents}") +endforeach() diff --git a/externals/vcpkg/ports/openssl/usage b/externals/vcpkg/ports/openssl/usage new file mode 100755 index 000000000..f535cb6a4 --- /dev/null +++ b/externals/vcpkg/ports/openssl/usage @@ -0,0 +1,4 @@ +The package openssl is compatible with built-in CMake targets: + + find_package(OpenSSL REQUIRED) + target_link_libraries(main PRIVATE OpenSSL::SSL OpenSSL::Crypto) diff --git a/externals/vcpkg/ports/openssl/uwp/make-openssl.bat b/externals/vcpkg/ports/openssl/uwp/make-openssl.bat new file mode 100755 index 000000000..6f6166a24 --- /dev/null +++ b/externals/vcpkg/ports/openssl/uwp/make-openssl.bat @@ -0,0 +1,16 @@ +set build=%1 + +perl Configure no-asm no-hw no-dso VC-WINUNIVERSAL -FS -FIWindows.h + +for /D %%f in ("%WindowsSdkDir%References\%WindowsSDKLibVersion%Windows.Foundation.FoundationContract\*") do set LibPath=%LibPath%;%%f\ +for /D %%f in ("%WindowsSdkDir%References\%WindowsSDKLibVersion%Windows.Foundation.UniversalApiContract\*") do set LibPath=%LibPath%;%%f\ +for /D %%f in ("%WindowsSdkDir%References\Windows.Foundation.FoundationContract\*") do set LibPath=%LibPath%;%%f\ +for /D %%f in ("%WindowsSdkDir%References\Windows.Foundation.UniversalApiContract\*") do set LibPath=%LibPath%;%%f\ + +call ms\do_winuniversal.bat + +mkdir inc32\openssl + +jom -j %NUMBER_OF_PROCESSORS% -k -f ms\ntdll.mak +REM due to a race condition in the build, we need to have a second single-threaded pass. +nmake -f ms\ntdll.mak diff --git a/externals/vcpkg/ports/openssl/uwp/portfile.cmake b/externals/vcpkg/ports/openssl/uwp/portfile.cmake new file mode 100755 index 000000000..628380631 --- /dev/null +++ b/externals/vcpkg/ports/openssl/uwp/portfile.cmake @@ -0,0 +1,160 @@ +vcpkg_find_acquire_program(JOM) +get_filename_component(JOM_EXE_PATH ${JOM} DIRECTORY) +vcpkg_add_to_path("${PERL_EXE_PATH}") + +set(OPENSSL_SHARED no-shared) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(OPENSSL_SHARED shared) +endif() + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +vcpkg_find_acquire_program(NASM) +get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) +vcpkg_add_to_path(PREPEND "${NASM_EXE_PATH}") + +set(CONFIGURE_COMMAND ${PERL} Configure + enable-static-engine + enable-capieng + no-unit-test + no-ssl2 + no-asm + no-uplink + no-tests + -utf-8 + ${OPENSSL_SHARED} +) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(OPENSSL_ARCH VC-WIN32-UWP) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(OPENSSL_ARCH VC-WIN64A-UWP) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(OPENSSL_ARCH VC-WIN32-ARM-UWP) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(OPENSSL_ARCH VC-WIN64-ARM-UWP) +else() + message(FATAL_ERROR "Unsupported target architecture: ${VCPKG_TARGET_ARCHITECTURE}") +endif() + +set(OPENSSL_MAKEFILE "makefile") + +file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + + # Copy openssl sources. + message(STATUS "Copying openssl release source files...") + file(GLOB OPENSSL_SOURCE_FILES "${SOURCE_PATH}/*") + foreach(SOURCE_FILE ${OPENSSL_SOURCE_FILES}) + file(COPY ${SOURCE_FILE} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + endforeach() + message(STATUS "Copying openssl release source files... done") + set(SOURCE_PATH_RELEASE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + + set(OPENSSLDIR_RELEASE "${CURRENT_PACKAGES_DIR}") + + message(STATUS "Configure ${TARGET_TRIPLET}-rel") + vcpkg_execute_required_process( + COMMAND ${CONFIGURE_COMMAND} ${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_RELEASE}" "--openssldir=${OPENSSLDIR_RELEASE}" -FS + WORKING_DIRECTORY "${SOURCE_PATH_RELEASE}" + LOGNAME configure-perl-${TARGET_TRIPLET}-${VCPKG_BUILD_TYPE}-rel + ) + message(STATUS "Configure ${TARGET_TRIPLET}-rel done") + + message(STATUS "Build ${TARGET_TRIPLET}-rel") + # Openssl's buildsystem has a race condition which will cause JOM to fail at some point. + # This is ok; we just do as much work as we can in parallel first, then follow up with a single-threaded build. + make_directory("${SOURCE_PATH_RELEASE}/inc32/openssl") + execute_process( + COMMAND "${JOM}" -k -j ${VCPKG_CONCURRENCY} -f "${OPENSSL_MAKEFILE}" build_libs + WORKING_DIRECTORY "${SOURCE_PATH_RELEASE}" + OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-out.log" + ERROR_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-err.log" + ) + vcpkg_execute_required_process( + COMMAND nmake -f "${OPENSSL_MAKEFILE}" install_dev + WORKING_DIRECTORY "${SOURCE_PATH_RELEASE}" + LOGNAME build-${TARGET_TRIPLET}-rel-1) + + message(STATUS "Build ${TARGET_TRIPLET}-rel done") +endif() + + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + # Copy openssl sources. + message(STATUS "Copying openssl debug source files...") + file(GLOB OPENSSL_SOURCE_FILES ${SOURCE_PATH}/*) + foreach(SOURCE_FILE ${OPENSSL_SOURCE_FILES}) + file(COPY "${SOURCE_FILE}" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + endforeach() + message(STATUS "Copying openssl debug source files... done") + set(SOURCE_PATH_DEBUG "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + + set(OPENSSLDIR_DEBUG "${CURRENT_PACKAGES_DIR}/debug") + + message(STATUS "Configure ${TARGET_TRIPLET}-dbg") + vcpkg_execute_required_process( + COMMAND ${CONFIGURE_COMMAND} debug-${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_DEBUG}" "--openssldir=${OPENSSLDIR_DEBUG}" -FS + WORKING_DIRECTORY "${SOURCE_PATH_DEBUG}" + LOGNAME configure-perl-${TARGET_TRIPLET}-${VCPKG_BUILD_TYPE}-dbg + ) + message(STATUS "Configure ${TARGET_TRIPLET}-dbg done") + + message(STATUS "Build ${TARGET_TRIPLET}-dbg") + make_directory("${SOURCE_PATH_DEBUG}/inc32/openssl") + execute_process( + COMMAND "${JOM}" -k -j ${VCPKG_CONCURRENCY} -f "${OPENSSL_MAKEFILE}" build_libs + WORKING_DIRECTORY "${SOURCE_PATH_DEBUG}" + OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-out.log" + ERROR_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-err.log" + ) + vcpkg_execute_required_process( + COMMAND nmake -f "${OPENSSL_MAKEFILE}" install_dev + WORKING_DIRECTORY "${SOURCE_PATH_DEBUG}" + LOGNAME build-${TARGET_TRIPLET}-dbg-1) + + message(STATUS "Build ${TARGET_TRIPLET}-dbg done") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/certs") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/private") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/engines-1_1") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/certs") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/engines-1_1") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/private") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(REMOVE + "${CURRENT_PACKAGES_DIR}/bin/openssl.exe" + "${CURRENT_PACKAGES_DIR}/debug/bin/openssl.exe" + "${CURRENT_PACKAGES_DIR}/debug/openssl.cnf" + "${CURRENT_PACKAGES_DIR}/openssl.cnf" + "${CURRENT_PACKAGES_DIR}/ct_log_list.cnf" + "${CURRENT_PACKAGES_DIR}/ct_log_list.cnf.dist" + "${CURRENT_PACKAGES_DIR}/openssl.cnf.dist" + "${CURRENT_PACKAGES_DIR}/debug/ct_log_list.cnf" + "${CURRENT_PACKAGES_DIR}/debug/ct_log_list.cnf.dist" + "${CURRENT_PACKAGES_DIR}/debug/openssl.cnf.dist" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + # They should be empty, only the exes deleted above were in these directories + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/") +endif() + +file(READ "${CURRENT_PACKAGES_DIR}/include/openssl/dtls1.h" _contents) +string(REPLACE "" "" _contents "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/openssl/dtls1.h" "${_contents}") + +file(READ "${CURRENT_PACKAGES_DIR}/include/openssl/rand.h" _contents) +string(REPLACE "# include " "#ifndef _WINSOCKAPI_\n#define _WINSOCKAPI_\n#endif\n# include " _contents "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/openssl/rand.h" "${_contents}") + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/openssl/vcpkg-cmake-wrapper.cmake.in b/externals/vcpkg/ports/openssl/vcpkg-cmake-wrapper.cmake.in new file mode 100755 index 000000000..cb3aba0e7 --- /dev/null +++ b/externals/vcpkg/ports/openssl/vcpkg-cmake-wrapper.cmake.in @@ -0,0 +1,82 @@ +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0054 NEW) +cmake_policy(SET CMP0057 NEW) + +set(OPENSSL_VERSION_MAJOR 3) +set(OPENSSL_VERSION_MINOR 0) +set(OPENSSL_VERSION_FIX 3) + +if(OPENSSL_USE_STATIC_LIBS) + if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "dynamic") + message(WARNING "OPENSSL_USE_STATIC_LIBS is set, but vcpkg port openssl was built with dynamic linkage") + endif() + set(OPENSSL_USE_STATIC_LIBS_BAK "${OPENSSL_USE_STATIC_LIBS}") + set(OPENSSL_USE_STATIC_LIBS FALSE) +endif() + +if(DEFINED OPENSSL_ROOT_DIR) + set(OPENSSL_ROOT_DIR_BAK "${OPENSSL_ROOT_DIR}") +endif() +get_filename_component(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) +get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR}" DIRECTORY) +find_path(OPENSSL_INCLUDE_DIR NAMES openssl/ssl.h PATH "${OPENSSL_ROOT_DIR}/include" NO_DEFAULT_PATH) +if(MSVC) + find_library(LIB_EAY_DEBUG NAMES libcrypto PATHS "${OPENSSL_ROOT_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(LIB_EAY_RELEASE NAMES libcrypto PATHS "${OPENSSL_ROOT_DIR}/lib" NO_DEFAULT_PATH) + find_library(SSL_EAY_DEBUG NAMES libssl PATHS "${OPENSSL_ROOT_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(SSL_EAY_RELEASE NAMES libssl PATHS "${OPENSSL_ROOT_DIR}/lib" NO_DEFAULT_PATH) +elseif(WIN32) + find_library(LIB_EAY NAMES libcrypto crypto NAMES_PER_DIR) + find_library(SSL_EAY NAMES libssl ssl NAMES_PER_DIR) +else() + find_library(OPENSSL_CRYPTO_LIBRARY NAMES crypto) + find_library(OPENSSL_SSL_LIBRARY NAMES ssl) +endif() + +_find_package(${ARGS}) + +unset(OPENSSL_ROOT_DIR) +if(DEFINED OPENSSL_ROOT_DIR_BAK) + set(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR_BAK}") + unset(OPENSSL_ROOT_DIR_BAK) +endif() + +if(DEFINED OPENSSL_USE_STATIC_LIBS_BAK) + set(OPENSSL_USE_STATIC_LIBS "${OPENSSL_USE_STATIC_LIBS_BAK}") + unset(OPENSSL_USE_STATIC_LIBS_BAK) +endif() + +if(OPENSSL_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + if(WIN32) + list(APPEND OPENSSL_LIBRARIES crypt32 ws2_32) + if(TARGET OpenSSL::Crypto) + set_property(TARGET OpenSSL::Crypto APPEND PROPERTY INTERFACE_LINK_LIBRARIES "crypt32;ws2_32") + endif() + if(TARGET OpenSSL::SSL) + set_property(TARGET OpenSSL::SSL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "crypt32;ws2_32") + endif() + else() + find_library(OPENSSL_DL_LIBRARY NAMES dl) + if(OPENSSL_DL_LIBRARY) + list(APPEND OPENSSL_LIBRARIES "dl") + if(TARGET OpenSSL::Crypto) + set_property(TARGET OpenSSL::Crypto APPEND PROPERTY INTERFACE_LINK_LIBRARIES "dl") + endif() + endif() + + if("REQUIRED" IN_LIST ARGS) + find_package(Threads REQUIRED) + else() + find_package(Threads) + endif() + list(APPEND OPENSSL_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) + if(TARGET OpenSSL::Crypto) + set_property(TARGET OpenSSL::Crypto APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Threads::Threads") + endif() + if(TARGET OpenSSL::SSL) + set_property(TARGET OpenSSL::SSL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Threads::Threads") + endif() + endif() +endif() +cmake_policy(POP) diff --git a/externals/vcpkg/ports/openssl/vcpkg.json b/externals/vcpkg/ports/openssl/vcpkg.json new file mode 100755 index 000000000..507ecf971 --- /dev/null +++ b/externals/vcpkg/ports/openssl/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "openssl", + "version": "3.0.3", + "port-version": 2, + "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", + "homepage": "https://www.openssl.org", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + { + "name": "vcpkg-cmake-get-vars", + "host": true, + "platform": "windows & !mingw & !uwp" + } + ] +} diff --git a/externals/vcpkg/ports/openssl/windows/flags.patch b/externals/vcpkg/ports/openssl/windows/flags.patch new file mode 100755 index 000000000..90f0e8910 --- /dev/null +++ b/externals/vcpkg/ports/openssl/windows/flags.patch @@ -0,0 +1,22 @@ +diff --git a/Configure b/Configure +index faf57b1..690a9b8 100644 +--- a/Configure ++++ b/Configure +@@ -556,7 +556,7 @@ my $list_separator_re = + # (we supported those before the change to "make variable" support. + my %user = ( + AR => env('AR'), +- ARFLAGS => [], ++ ARFLAGS => [ env('ARFLAGS') || () ], + AS => undef, + ASFLAGS => [], + CC => env('CC'), +@@ -569,7 +569,7 @@ my %user = ( + CPPINCLUDES => [], # Alternative for -I + CROSS_COMPILE => env('CROSS_COMPILE'), + HASHBANGPERL=> env('HASHBANGPERL') || env('PERL'), +- LD => undef, ++ LD => env('LD'), + LDFLAGS => [ env('LDFLAGS') || () ], # -L, -Wl, + LDLIBS => [ env('LDLIBS') || () ], # -l + MT => undef, diff --git a/externals/vcpkg/ports/openssl/windows/portfile.cmake b/externals/vcpkg/ports/openssl/windows/portfile.cmake new file mode 100755 index 000000000..86b6e1957 --- /dev/null +++ b/externals/vcpkg/ports/openssl/windows/portfile.cmake @@ -0,0 +1,213 @@ +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES "${CMAKE_CURRENT_LIST_DIR}/flags.patch" +) + +vcpkg_find_acquire_program(NASM) +get_filename_component(NASM_EXE_PATH "${NASM}" DIRECTORY) +vcpkg_add_to_path(PREPEND "${NASM_EXE_PATH}") + +vcpkg_find_acquire_program(JOM) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(OPENSSL_SHARED shared) +else() + set(OPENSSL_SHARED no-shared no-module) +endif() + +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") + +set(ENV{CC} "${VCPKG_DETECTED_CMAKE_C_COMPILER}") +set(ENV{CXX} "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") +set(ENV{AR} "${VCPKG_DETECTED_CMAKE_AR}") +set(ENV{LD} "${VCPKG_DETECTED_CMAKE_LINKER}") + +# OpenSSL's buildsystem hardcodes certain PDB manipulations, so we cannot use Z7 +string(REGEX REPLACE "(^| )-Z7($| )" " " VCPKG_COMBINED_C_FLAGS_RELEASE "${VCPKG_COMBINED_C_FLAGS_RELEASE}") +string(REGEX REPLACE "(^| )-Z7($| )" " " VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") +string(REGEX REPLACE "(^| )-Z7($| )" " " VCPKG_COMBINED_CXX_FLAGS_RELEASE "${VCPKG_COMBINED_CXX_FLAGS_RELEASE}") +string(REGEX REPLACE "(^| )-Z7($| )" " " VCPKG_COMBINED_CXX_FLAGS_DEBUG "${VCPKG_COMBINED_CXX_FLAGS_DEBUG}") + +set(CONFIGURE_OPTIONS + enable-static-engine + enable-capieng + no-ssl2 + no-tests + ${OPENSSL_SHARED} +) + +if(DEFINED OPENSSL_USE_NOPINSHARED) + set(CONFIGURE_OPTIONS ${CONFIGURE_OPTIONS} no-pinshared) +endif() + +if(OPENSSL_NO_AUTOLOAD_CONFIG) + set(CONFIGURE_OPTIONS ${CONFIGURE_OPTIONS} no-autoload-config) +endif() + +set(CONFIGURE_COMMAND "${PERL}" Configure ${CONFIGURE_OPTIONS}) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(OPENSSL_ARCH VC-WIN32) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(OPENSSL_ARCH VC-WIN64A) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(OPENSSL_ARCH VC-WIN32-ARM) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(OPENSSL_ARCH VC-WIN64-ARM) +else() + message(FATAL_ERROR "Unsupported target architecture: ${VCPKG_TARGET_ARCHITECTURE}") +endif() + +set(OPENSSL_MAKEFILE "makefile") + +file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + # Copy openssl sources. + message(STATUS "Copying openssl release source files...") + file(GLOB OPENSSL_SOURCE_FILES ${SOURCE_PATH}/*) + foreach(SOURCE_FILE ${OPENSSL_SOURCE_FILES}) + file(COPY ${SOURCE_FILE} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + endforeach() + message(STATUS "Copying openssl release source files... done") + set(SOURCE_PATH_RELEASE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + + set(OPENSSLDIR_RELEASE ${CURRENT_PACKAGES_DIR}) + + set(ENV{CFLAGS} "${VCPKG_COMBINED_C_FLAGS_RELEASE}") + set(ENV{CXXFLAGS} "${VCPKG_COMBINED_CXX_FLAGS_RELEASE}") + set(ENV{LDFLAGS} "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_RELEASE}") + set(ENV{ARFLAGS} "${VCPKG_COMBINED_STATIC_LINKER_FLAGS_RELEASE}") + + message(STATUS "Configure ${TARGET_TRIPLET}-rel") + vcpkg_execute_required_process( + COMMAND ${CONFIGURE_COMMAND} ${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_RELEASE}" "--openssldir=${OPENSSLDIR_RELEASE}" -FS + WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} + LOGNAME configure-perl-${TARGET_TRIPLET}-rel + ) + message(STATUS "Configure ${TARGET_TRIPLET}-rel done") + + message(STATUS "Build ${TARGET_TRIPLET}-rel") + # Openssl's buildsystem has a race condition which will cause JOM to fail at some point. + # This is ok; we just do as much work as we can in parallel first, then follow up with a single-threaded build. + make_directory(${SOURCE_PATH_RELEASE}/inc32/openssl) + execute_process( + COMMAND "${JOM}" -k -j "${VCPKG_CONCURRENCY}" -f "${OPENSSL_MAKEFILE}" + WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} + OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-out.log" + ERROR_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-err.log" + ) + vcpkg_execute_required_process( + COMMAND "${JOM}" -j 1 -f "${OPENSSL_MAKEFILE}" install_sw install_ssldirs + WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} + LOGNAME build-${TARGET_TRIPLET}-rel-1) + + message(STATUS "Build ${TARGET_TRIPLET}-rel done") +endif() + + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + # Copy openssl sources. + message(STATUS "Copying openssl debug source files...") + file(GLOB OPENSSL_SOURCE_FILES ${SOURCE_PATH}/*) + foreach(SOURCE_FILE ${OPENSSL_SOURCE_FILES}) + file(COPY ${SOURCE_FILE} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + endforeach() + message(STATUS "Copying openssl debug source files... done") + set(SOURCE_PATH_DEBUG "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + + set(OPENSSLDIR_DEBUG ${CURRENT_PACKAGES_DIR}/debug) + + set(ENV{CFLAGS} "${VCPKG_COMBINED_C_FLAGS_DEBUG}") + set(ENV{CXXFLAGS} "${VCPKG_COMBINED_CXX_FLAGS_DEBUG}") + set(ENV{LDFLAGS} "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG}") + set(ENV{ARFLAGS} "${VCPKG_COMBINED_STATIC_LINKER_FLAGS_DEBUG}") + + message(STATUS "Configure ${TARGET_TRIPLET}-dbg") + vcpkg_execute_required_process( + COMMAND ${CONFIGURE_COMMAND} debug-${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_DEBUG}" "--openssldir=${OPENSSLDIR_DEBUG}" -FS + WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} + LOGNAME configure-perl-${TARGET_TRIPLET}-dbg + ) + message(STATUS "Configure ${TARGET_TRIPLET}-dbg done") + + message(STATUS "Build ${TARGET_TRIPLET}-dbg") + make_directory("${SOURCE_PATH_DEBUG}/inc32/openssl") + execute_process( + COMMAND "${JOM}" -k -j "${VCPKG_CONCURRENCY}" -f "${OPENSSL_MAKEFILE}" + WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} + OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-out.log" + ERROR_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-err.log" + ) + vcpkg_execute_required_process( + COMMAND "${JOM}" -j 1 -f "${OPENSSL_MAKEFILE}" install_sw install_ssldirs + WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} + LOGNAME build-${TARGET_TRIPLET}-dbg-1) + + message(STATUS "Build ${TARGET_TRIPLET}-dbg done") + + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules/legacy.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/legacy.pdb") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ossl-modules/legacy.pdb" "${CURRENT_PACKAGES_DIR}/bin/legacy.pdb") + endif() +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/certs") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/private") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/engines-1_1") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/engines-3") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/certs") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/engines-1_1") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/engines-3") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/private") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if(NOT VCPKG_BUILD_TYPE) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules/legacy.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/legacy.dll") + endif() + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ossl-modules/legacy.dll" "${CURRENT_PACKAGES_DIR}/bin/legacy.dll") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/ossl-modules") + +file(REMOVE + "${CURRENT_PACKAGES_DIR}/ct_log_list.cnf" + "${CURRENT_PACKAGES_DIR}/ct_log_list.cnf.dist" + "${CURRENT_PACKAGES_DIR}/openssl.cnf.dist" + "${CURRENT_PACKAGES_DIR}/debug/bin/openssl.exe" + "${CURRENT_PACKAGES_DIR}/debug/ct_log_list.cnf" + "${CURRENT_PACKAGES_DIR}/debug/ct_log_list.cnf.dist" + "${CURRENT_PACKAGES_DIR}/debug/openssl.cnf" + "${CURRENT_PACKAGES_DIR}/debug/openssl.cnf.dist" +) + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/openssl/") +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/openssl.exe" "${CURRENT_PACKAGES_DIR}/tools/openssl/openssl.exe") +file(RENAME "${CURRENT_PACKAGES_DIR}/openssl.cnf" "${CURRENT_PACKAGES_DIR}/tools/openssl/openssl.cnf") + +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/openssl") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + # They should be empty, only the exes deleted above were in these directories + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/") +endif() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/openssl/dtls1.h" + "" + "" +) + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/openssl/rand.h" + "# include " + "#ifndef _WINSOCKAPI_\n#define _WINSOCKAPI_\n#endif\n# include " +) + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/opensubdiv/fix-build-type.patch b/externals/vcpkg/ports/opensubdiv/fix-build-type.patch new file mode 100755 index 000000000..c8ea3e6d0 --- /dev/null +++ b/externals/vcpkg/ports/opensubdiv/fix-build-type.patch @@ -0,0 +1,20 @@ +diff --git a/opensubdiv/CMakeLists.txt b/opensubdiv/CMakeLists.txt +index 72c5b7e..ca24488 100644 +--- a/opensubdiv/CMakeLists.txt ++++ b/opensubdiv/CMakeLists.txt +@@ -124,6 +124,7 @@ if (NOT NO_LIB) + + #--------------------------------------------------------------------------- + ++ if (NOT BUILD_SHARED_LIBS) + # Build static libs ------------------------------------ + add_library(osd_static_cpu + STATIC +@@ -146,6 +147,7 @@ if (NOT NO_LIB) + ) + + install( TARGETS osd_static_cpu DESTINATION "${CMAKE_LIBDIR_BASE}" ) ++ endif() + + if( OSD_GPU ) + # this macro uses FindCUDA.cmake to compile .cu kernel files diff --git a/externals/vcpkg/ports/opensubdiv/fix-dependencies.patch b/externals/vcpkg/ports/opensubdiv/fix-dependencies.patch new file mode 100755 index 000000000..8b04aa45f --- /dev/null +++ b/externals/vcpkg/ports/opensubdiv/fix-dependencies.patch @@ -0,0 +1,146 @@ +diff --git a/cmake/FindDXSDK.cmake b/cmake/FindDXSDK.cmake +index a396d97..edd06db 100644 +--- a/cmake/FindDXSDK.cmake ++++ b/cmake/FindDXSDK.cmake +@@ -48,15 +48,8 @@ if (WIN32) + "C:/Program Files/Microsoft DirectX SDK*/Include" + ) + +- if ("${CMAKE_GENERATOR}" MATCHES "[Ww]in64" OR +- "${CMAKE_GENERATOR_PLATFORM}" MATCHES "x64") +- set(ARCH x64) +- else() +- set(ARCH x86) +- endif() +- + find_path(LIBRARY_DIR +- d3d11.lib ++ d3dx11.lib + PATHS + "${DXSDK_LOCATION}/Lib/${ARCH}" + "$ENV{DXSDK_LOCATION}/Lib/${ARCH}" +@@ -70,7 +63,7 @@ if (WIN32) + + set(DXSDK_LIBRARY_DIR ${LIBRARY_DIR}) + +- foreach(DX_LIB d3d11 d3dcompiler) ++ foreach(DX_LIB d3dx11 d3dcompiler) + + find_library(DXSDK_${DX_LIB}_LIBRARY + NAMES +diff --git a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake +index 2f4efd3..5f4f85b 100644 +--- a/cmake/FindTBB.cmake ++++ b/cmake/FindTBB.cmake +@@ -30,6 +30,10 @@ + # TBB_LIBRARIES - The libraries needed to use TBB + + # Obtain include directory ++find_package(TBB CONFIG REQUIRED) ++set(TBB_FOUND 1) ++set(TBB_LIBRARIES TBB::tbb) ++if (0) + if (WIN32) + find_path(TBB_INCLUDE_DIR + NAMES +@@ -180,4 +184,4 @@ mark_as_advanced( + TBB_INCLUDE_DIR + TBB_LIBRARIES + ) +- ++endif() +diff --git a/examples/dxPtexViewer/CMakeLists.txt b/examples/dxPtexViewer/CMakeLists.txt +index 2743423..81c8806 100644 +--- a/examples/dxPtexViewer/CMakeLists.txt ++++ b/examples/dxPtexViewer/CMakeLists.txt +@@ -36,6 +36,19 @@ set(PLATFORM_LIBRARIES + "${ZLIB_LIBRARY}" + ) + ++if (OPENCL_FOUND) ++ list(APPEND PLATFORM_LIBRARIES ++ Opengl32 ++ Cfgmgr32 ++ ) ++endif() ++ ++if (DXSDK_FOUND) ++ list(APPEND PLATFORM_LIBRARIES ++ D3D11 ++ ) ++endif() ++ + include_directories( + "${OPENSUBDIV_INCLUDE_DIR}" + "${DXSDK_INCLUDE_DIR}" +diff --git a/examples/dxViewer/CMakeLists.txt b/examples/dxViewer/CMakeLists.txt +index 245ecbd..83b39b8 100644 +--- a/examples/dxViewer/CMakeLists.txt ++++ b/examples/dxViewer/CMakeLists.txt +@@ -33,6 +33,19 @@ set(PLATFORM_LIBRARIES + "${DXSDK_LIBRARIES}" + ) + ++if (OPENCL_FOUND) ++ list(APPEND PLATFORM_LIBRARIES ++ Opengl32 ++ Cfgmgr32 ++ ) ++endif() ++ ++if (DXSDK_FOUND) ++ list(APPEND PLATFORM_LIBRARIES ++ D3D11 ++ ) ++endif() ++ + include_directories( + "${OPENSUBDIV_INCLUDE_DIR}" + "${DXSDK_INCLUDE_DIR}" +diff --git a/examples/glEvalLimit/CMakeLists.txt b/examples/glEvalLimit/CMakeLists.txt +index 1a71f72..8eaaccb 100644 +--- a/examples/glEvalLimit/CMakeLists.txt ++++ b/examples/glEvalLimit/CMakeLists.txt +@@ -41,7 +41,6 @@ if( OPENCL_FOUND ) + endif() + + if( TBB_FOUND ) +- include_directories("${TBB_INCLUDE_DIR}") + list(APPEND PLATFORM_LIBRARIES + "${TBB_LIBRARIES}" + ) +diff --git a/opensubdiv/CMakeLists.txt b/opensubdiv/CMakeLists.txt +index adb0191..0f90a37 100644 +--- a/opensubdiv/CMakeLists.txt ++++ b/opensubdiv/CMakeLists.txt +@@ -49,7 +49,6 @@ if (NOT NO_LIB) + endif() + + if( TBB_FOUND ) +- include_directories("${TBB_INCLUDE_DIR}") + list(APPEND PLATFORM_CPU_LIBRARIES + ${TBB_LIBRARIES} + ) +diff --git a/opensubdiv/osd/CMakeLists.txt b/opensubdiv/osd/CMakeLists.txt +index 75f64b6..90d5ea2 100644 +--- a/opensubdiv/osd/CMakeLists.txt ++++ b/opensubdiv/osd/CMakeLists.txt +@@ -88,7 +88,6 @@ set(TBB_PUBLIC_HEADERS + ) + + if( TBB_FOUND ) +- include_directories("${TBB_INCLUDE_DIR}") + + list(APPEND CPU_SOURCE_FILES + tbbEvaluator.cpp +@@ -379,6 +378,10 @@ add_library(osd_cpu_obj + ${PUBLIC_HEADER_FILES} + ) + ++if (TBB_FOUND) ++ target_link_libraries(osd_cpu_obj ${TBB_LIBRARIES}) ++endif() ++ + set_target_properties(osd_cpu_obj + PROPERTIES + FOLDER "opensubdiv" diff --git a/externals/vcpkg/ports/opensubdiv/fix-mac-build.patch b/externals/vcpkg/ports/opensubdiv/fix-mac-build.patch new file mode 100755 index 000000000..6aa244f1f --- /dev/null +++ b/externals/vcpkg/ports/opensubdiv/fix-mac-build.patch @@ -0,0 +1,13 @@ +diff --git a/opensubdiv/CMakeLists.txt b/opensubdiv/CMakeLists.txt +index ca24488..adb0191 100644 +--- a/opensubdiv/CMakeLists.txt ++++ b/opensubdiv/CMakeLists.txt +@@ -241,7 +241,7 @@ if (NOT NO_LIB) + endif() + + # Build frameworks ---------------------------------- +- if(APPLE) ++ if(APPLE AND OSD_GPU) + get_directory_property(OSD_HEADER_FILES DIRECTORY ${CMAKE_SOURCE_DIR}/opensubdiv/osd DEFINITION PUBLIC_HEADER_FILES) + get_directory_property(FAR_HEADER_FILES DIRECTORY ${CMAKE_SOURCE_DIR}/opensubdiv/far DEFINITION PUBLIC_HEADER_FILES) + get_directory_property(SDC_HEADER_FILES DIRECTORY ${CMAKE_SOURCE_DIR}/opensubdiv/sdc DEFINITION PUBLIC_HEADER_FILES) diff --git a/externals/vcpkg/ports/opensubdiv/fix-version-search.patch b/externals/vcpkg/ports/opensubdiv/fix-version-search.patch new file mode 100755 index 000000000..797347285 --- /dev/null +++ b/externals/vcpkg/ports/opensubdiv/fix-version-search.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/FindOpenCL.cmake b/cmake/FindOpenCL.cmake +index 485e55e..1c98b91 100644 +--- a/cmake/FindOpenCL.cmake ++++ b/cmake/FindOpenCL.cmake +@@ -177,7 +177,7 @@ if(_OPENCL_CPP_INCLUDE_DIRS) + + if(EXISTS "${OPENCL_INCLUDE_DIRS}/CL/cl.h") + +- file(STRINGS "${OPENCL_INCLUDE_DIRS}/CL/cl.h" LINES REGEX "^#define CL_VERSION_.*$") ++ file(STRINGS "${OPENCL_INCLUDE_DIRS}/CL/cl.h" LINES REGEX "^#define CL_VERSION_[0-9]+_[0-9]+.*$") + + foreach(LINE ${LINES}) + diff --git a/externals/vcpkg/ports/opensubdiv/fix_compile-option.patch b/externals/vcpkg/ports/opensubdiv/fix_compile-option.patch new file mode 100755 index 000000000..1acae92c8 --- /dev/null +++ b/externals/vcpkg/ports/opensubdiv/fix_compile-option.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b69912ae..dcde4297 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -218,7 +218,7 @@ elseif(MSVC) + + list(APPEND OSD_COMPILER_FLAGS + /W3 # Use warning level recommended for production purposes. +- /WX # Treat all compiler warnings as errors. ++ # /WX # Treat all compiler warnings as errors. + + # warning C4005: macro redefinition + /wd4005 diff --git a/externals/vcpkg/ports/opensubdiv/portfile.cmake b/externals/vcpkg/ports/opensubdiv/portfile.cmake new file mode 100755 index 000000000..cb218ab17 --- /dev/null +++ b/externals/vcpkg/ports/opensubdiv/portfile.cmake @@ -0,0 +1,135 @@ +if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_IOS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO PixarAnimationStudios/OpenSubdiv + REF 82ab1b9f54c87fdd7e989a3470d53e137b8ca270 # 3.4.3 + SHA512 607cb9aa05d83a24bc2102bfd28abfec58f5723b1c56f6f431111ebf98f105ff7ca2a77610953acd21f73cb74d8d8ec68db3aeb11be1f9ca56d87c36c58dd095 + HEAD_REF master + PATCHES + fix_compile-option.patch + fix-version-search.patch + fix-build-type.patch + fix-mac-build.patch + fix-dependencies.patch +) + +if(VCPKG_TARGET_IS_LINUX) + message( +"OpenSubdiv currently requires the following libraries from the system package manager: + xinerama xxf86vm + +These can be installed on Ubuntu systems via sudo apt install libxinerama-dev libxxf86vm-dev") +endif() + +vcpkg_find_acquire_program(PYTHON2) +get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) +vcpkg_add_to_path("${PYTHON2_DIR}") + +if (VCPKG_CRT_LINKAGE STREQUAL static) + set(STATIC_CRT_LNK ON) +else() + set(STATIC_CRT_LNK OFF) +endif() + +if ("cuda" IN_LIST FEATURES AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + message(FATAL_ERROR "Feature 'cuda' can only build on x64 arch.") +endif() + +if (("dx" IN_LIST FEATURES OR "omp" IN_LIST FEATURES) AND NOT VCPKG_TARGET_IS_WINDOWS) + message(FATAL_ERROR "Feature 'dx' and 'omp' only support Windows.") +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "true-deriv-eval" OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES + INVERTED_FEATURES + "cuda" NO_CUDA + "dx" NO_DX + "examples" NO_EXAMPLES + "glew" NO_GLEW + "glfw" NO_GLFW + "glfw" NO_GLFW_X11 + "omp" NO_OMP + "opencl" NO_OPENCL + "ptex" NO_PTEX + "tbb" NO_TBB + "tutorials" NO_TUTORIALS +) + +set(OSD_EXTRA_OPTS) +if ("ptex" IN_LIST FEATURES) + list(APPEND OSD_EXTRA_OPTS -DPTEX_LOCATION=${CURRENT_INSTALLED_DIR}) +endif() +if ("glew" IN_LIST FEATURES) + list(APPEND OSD_EXTRA_OPTS -DGLEW_LOCATION=${CURRENT_INSTALLED_DIR}) +endif() +if ("glfw" IN_LIST FEATURES) + list(APPEND OSD_EXTRA_OPTS -DGLFW_LOCATION=${CURRENT_INSTALLED_DIR}) +endif() +if ("dx" IN_LIST FEATURES) + list(APPEND OSD_EXTRA_OPTS -DDXSDK_LOCATION=${CURRENT_INSTALLED_DIR}) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DMSVC_STATIC_CRT=${STATIC_CRT_LNK} + -DNO_LIB=OFF + -DNO_REGRESSION=ON + -DNO_DOC=ON + -DNO_TESTS=ON + -DNO_GLTESTS=ON + -DNO_CLEW=ON + -DNO_METAL=ON + -DNO_OPENGL=ON # missing glloader + ${FEATURE_OPTIONS} + ${OSD_EXTRA_OPTS} + MAYBE_UNUSED_VARIABLES + MSVC_STATIC_CRT +) + +vcpkg_cmake_install() + +if ("opencl" IN_LIST FEATURES OR "dx" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES stringify AUTO_CLEAN) +endif() + +if ("examples" IN_LIST FEATURES) + if ("dx" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES dxViewer AUTO_CLEAN) + if ("ptex" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES dxPtexViewer AUTO_CLEAN) + endif() + endif() +endif() + +if ("tutorials" IN_LIST FEATURES) + file(GLOB TUTORIALS_TOOLS "${CURRENT_PACKAGES_DIR}/bin/tutorials/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + set(TUTORIALS_TOOL_NAMES ) + foreach(TUTORIALS_TOOL IN LISTS TUTORIALS_TOOLS) + get_filename_component(TUTORIALS_TOOL_NAME "${TUTORIALS_TOOL}" NAME_WE) + list(APPEND TUTORIALS_TOOL_NAMES "${TUTORIALS_TOOL_NAME}") + endforeach() + if (TUTORIALS_TOOL_NAMES) + vcpkg_copy_tools(TOOL_NAMES ${TUTORIALS_TOOL_NAMES} SEARCH_DIR "${CURRENT_PACKAGES_DIR}/bin/tutorials/" AUTO_CLEAN) + endif() +endif() + +# The header files are read only and can't remove when remove this port +file(GLOB_RECURSE OSD_HDRS "${CURRENT_PACKAGES_DIR}/include/*.h") +file(CHMOD_RECURSE ${OSD_HDRS} + PERMISSIONS + OWNER_READ OWNER_WRITE + GROUP_READ GROUP_WRITE + WORLD_READ WORLD_WRITE +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" +) + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/opensubdiv/vcpkg.json b/externals/vcpkg/ports/opensubdiv/vcpkg.json new file mode 100755 index 000000000..a94a9ea34 --- /dev/null +++ b/externals/vcpkg/ports/opensubdiv/vcpkg.json @@ -0,0 +1,75 @@ +{ + "name": "opensubdiv", + "version-semver": "3.4.3", + "port-version": 4, + "description": "An Open-Source subdivision surface library.", + "homepage": "https://github.com/PixarAnimationStudios/OpenSubdiv", + "supports": "!arm & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "cuda": { + "description": "Enable CUDA backend", + "dependencies": [ + "cuda" + ] + }, + "dx": { + "description": "Enable DirectX support", + "dependencies": [ + { + "name": "directxsdk", + "features": [ + "xp" + ] + } + ] + }, + "examples": { + "description": "Enable examples build" + }, + "glew": { + "description": "Path to glew", + "dependencies": [ + "glew" + ] + }, + "glfw": { + "description": "Path to glfw", + "dependencies": [ + "glfw3" + ] + }, + "omp": { + "description": "Enable OpenMP backend" + }, + "opencl": { + "description": "Enable OpenCL backend", + "dependencies": [ + "opencl" + ] + }, + "ptex": { + "description": "Path to Ptex", + "dependencies": [ + "ptex" + ] + }, + "tbb": { + "description": "Enable TBB backend", + "dependencies": [ + "tbb" + ] + }, + "true-deriv-eval": { + "description": "Enable true derivative evaluation for Gregory basis patches" + }, + "tutorials": { + "description": "Enable tutorials build" + } + } +} diff --git a/externals/vcpkg/ports/opentelemetry-cpp/portfile.cmake b/externals/vcpkg/ports/opentelemetry-cpp/portfile.cmake new file mode 100755 index 000000000..b8dcab966 --- /dev/null +++ b/externals/vcpkg/ports/opentelemetry-cpp/portfile.cmake @@ -0,0 +1,58 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +if ("etw" IN_LIST FEATURES) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "linux" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "OSX") + message(FATAL_ERROR "Feature 'ewt' does not support 'linux & osx'") + endif() +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO open-telemetry/opentelemetry-cpp + REF v1.3.0 + SHA512 38f613c208ec847c8bf7765732d8198fcc427c293a929945d72c2f739e89d2a0ad36be4d94cc3c1b77fd7b1f1d1e5d8bdb38094a493ba3da3125281cd1016836 + HEAD_REF main +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + etw WITH_ETW + zipkin WITH_ZIPKIN + prometheus WITH_PROMETHEUS + elasticsearch WITH_ELASTICSEARCH + jaeger WITH_JAEGER + otlp WITH_OTLP + zpages WITH_ZPAGES +) + +# opentelemetry-proto is a third party submodule and opentelemetry-cpp release did not pack it. +if(WITH_OTLP) + set(OTEL_PROTO_VERSION "0.11.0") + vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/open-telemetry/opentelemetry-proto/archive/v${OTEL_PROTO_VERSION}.tar.gz" + FILENAME "opentelemetry-proto-${OTEL_PROTO_VERSION}.tar.gz" + SHA512 ff6c207fe9cc2b6a344439ab5323b3225cf532358d52caf0afee27d9b4cd89195f6da6b6e383fe94de52f60c772df8b477c1ea943db67a217063c71587b7bb92 + ) + + vcpkg_extract_source_archive(${ARCHIVE} ${SOURCE_PATH}/third_party) + file(REMOVE_RECURSE ${SOURCE_PATH}/third_party/opentelemetry-proto) + file(RENAME ${SOURCE_PATH}/third_party/opentelemetry-proto-${OTEL_PROTO_VERSION} ${SOURCE_PATH}/third_party/opentelemetry-proto) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DWITH_EXAMPLES=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/opentelemetry-cpp/vcpkg.json b/externals/vcpkg/ports/opentelemetry-cpp/vcpkg.json new file mode 100755 index 000000000..659a02dd7 --- /dev/null +++ b/externals/vcpkg/ports/opentelemetry-cpp/vcpkg.json @@ -0,0 +1,57 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", + "name": "opentelemetry-cpp", + "version-semver": "1.3.0", + "description": [ + "OpenTelemetry is a collection of tools, APIs, and SDKs.", + "You use it to instrument, generate, collect, and export telemetry data (metrics, logs, and traces) for analysis in order to understand your software's performance and behavior." + ], + "homepage": "https://github.com/open-telemetry/opentelemetry-cpp", + "license": "Apache-2.0", + "supports": "!(windows & !static)", + "dependencies": [ + "curl", + "nlohmann-json", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "elasticsearch": { + "description": "Whether to include the Elasticsearch Client in the SDK" + }, + "etw": { + "description": "Whether to include the ETW Exporter in the SDK" + }, + "jaeger": { + "description": "Whether to include the Jaeger exporter", + "dependencies": [ + "thrift" + ] + }, + "otlp": { + "description": "Whether to include the OpenTelemetry Protocol in the SDK", + "dependencies": [ + "grpc", + "protobuf" + ] + }, + "prometheus": { + "description": "Whether to include the Prometheus Client in the SDK", + "dependencies": [ + "prometheus-cpp" + ] + }, + "zipkin": { + "description": "Whether to include the Zipkin exporter in the SDK" + }, + "zpages": { + "description": "Whether to include the Zpages Server in the SDK" + } + } +} diff --git a/externals/vcpkg/ports/opentracing/portfile.cmake b/externals/vcpkg/ports/opentracing/portfile.cmake new file mode 100755 index 000000000..537b348ee --- /dev/null +++ b/externals/vcpkg/ports/opentracing/portfile.cmake @@ -0,0 +1,58 @@ +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(LOCAL_OPTIONS + -DBUILD_STATIC_LIBS=OFF + ) +else() + message("Static building is only possible when compiling static and dynamic versions at the same time. Enabling both.") + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO opentracing/opentracing-cpp + REF 4bb431f7728eaf383a07e86f9754a5b67575dab0 # v1.6.0 + SHA512 1c69ff4cfd5f6037a48815367d3026c1bf06c3c49ebf232a64c43167385fb62e444c3b3224fc38f68ef0fdb378e3736db6ee6ba57160e6e578c87c09e92e527e + PATCHES + repair_mojibake.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENABLE_LINTING=OFF + -DBUILD_TESTING=OFF + ${LOCAL_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenTracing) + +vcpkg_copy_pdbs() + +# Move DLLs to /bin +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/opentracing.dll ${CURRENT_PACKAGES_DIR}/bin/opentracing.dll) + + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/opentracing.dll ${CURRENT_PACKAGES_DIR}/debug/bin/opentracing.dll) + + # Fix targets + file(READ ${CURRENT_PACKAGES_DIR}/share/opentracing/OpenTracingTargets-release.cmake RELEASE_CONFIG) + string(REPLACE "\${_IMPORT_PREFIX}/lib/opentracing.dll" + "\${_IMPORT_PREFIX}/bin/opentracing.dll" RELEASE_CONFIG ${RELEASE_CONFIG}) + file(WRITE ${CURRENT_PACKAGES_DIR}/share/opentracing/OpenTracingTargets-release.cmake "${RELEASE_CONFIG}") + + file(READ ${CURRENT_PACKAGES_DIR}/share/opentracing/OpenTracingTargets-debug.cmake DEBUG_CONFIG) + string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/opentracing.dll" + "\${_IMPORT_PREFIX}/debug/bin/opentracing.dll" DEBUG_CONFIG ${DEBUG_CONFIG}) + file(WRITE ${CURRENT_PACKAGES_DIR}/share/opentracing/OpenTracingTargets-debug.cmake "${DEBUG_CONFIG}") + endif() +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# Remove duplicate headers +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/externals/vcpkg/ports/opentracing/repair_mojibake.patch b/externals/vcpkg/ports/opentracing/repair_mojibake.patch new file mode 100755 index 000000000..ae427e661 --- /dev/null +++ b/externals/vcpkg/ports/opentracing/repair_mojibake.patch @@ -0,0 +1,59 @@ +From 31c92781ac953cb83963cfe5ac30324579fa7b2d Mon Sep 17 00:00:00 2001 +From: Billy Robert O'Neal III +Date: Fri, 18 Dec 2020 10:07:02 -0800 +Subject: [PATCH] Repair mojibake in expected.hpp + +The affected characters herein triggered warnings +C:\Dev\vcpkg\buildtrees\opentracing\src\b67575dab0-0250653c81.clean\3rd_party\include\opentracing/expected/expected.hpp(1): warning C4828: The file contains a character starting at offset 0x4a77 that is illegal in the current source character set (codepage 65001). +--- + 3rd_party/include/opentracing/expected/expected.hpp | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/3rd_party/include/opentracing/expected/expected.hpp b/3rd_party/include/opentracing/expected/expected.hpp +index 8283a77..0d21d43 100644 +--- a/3rd_party/include/opentracing/expected/expected.hpp ++++ b/3rd_party/include/opentracing/expected/expected.hpp +@@ -778,13 +778,13 @@ class expected + // expected())),E> map(F&& func) ; + + // template +-// ’see below’ bind(F&& func); ++// 'see below' bind(F&& func); + + // template + // expected catch_error(F&& f); + + // template +-// ’see below’ then(F&& func); ++// 'see below' then(F&& func); + + private: + bool has_value_; +@@ -955,9 +955,9 @@ class expected + return ! has_value() && std::is_base_of< Ex, decltype( get_unexpected().value() ) >::value; + } + +-// template constexpr ’see below’ unwrap() const&; ++// template constexpr 'see below' unwrap() const&; + // +-// template ’see below’ unwrap() &&; ++// template 'see below' unwrap() &&; + + // factories + +@@ -968,13 +968,13 @@ class expected + // expected map(F&& func) ; + // + // template +-// ’see below’ bind(F&& func) ; ++// 'see below' bind(F&& func) ; + // + // template + // expected catch_error(F&& f); + // + // template +-// ’see below’ then(F&& func); ++// 'see below' then(F&& func); + + private: + bool has_value_; diff --git a/externals/vcpkg/ports/opentracing/vcpkg.json b/externals/vcpkg/ports/opentracing/vcpkg.json new file mode 100755 index 000000000..e14d49d0b --- /dev/null +++ b/externals/vcpkg/ports/opentracing/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "opentracing", + "version": "1.6.0", + "port-version": 3, + "description": "C++ implementation of the OpenTracing API", + "homepage": "https://opentracing.io", + "license": "Apache-2.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/openvdb/0003-fix-cmake.patch b/externals/vcpkg/ports/openvdb/0003-fix-cmake.patch new file mode 100755 index 000000000..52839ae14 --- /dev/null +++ b/externals/vcpkg/ports/openvdb/0003-fix-cmake.patch @@ -0,0 +1,152 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8dfbc5e..0ba8887 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -373,13 +373,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") + + if(OPENVDB_INSTALL_CMAKE_MODULES) + set(OPENVDB_CMAKE_MODULES +- cmake/FindBlosc.cmake + cmake/FindJemalloc.cmake +- cmake/FindIlmBase.cmake + cmake/FindLog4cplus.cmake +- cmake/FindOpenEXR.cmake + cmake/FindOpenVDB.cmake +- cmake/FindTBB.cmake + cmake/OpenVDBGLFW3Setup.cmake + cmake/OpenVDBHoudiniSetup.cmake + cmake/OpenVDBMayaSetup.cmake +diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake +index 0dac1de..5014c6a 100644 +--- a/cmake/FindOpenVDB.cmake ++++ b/cmake/FindOpenVDB.cmake +@@ -485,7 +485,7 @@ endif() + + # Add standard dependencies + +-find_package(TBB REQUIRED COMPONENTS tbb) ++find_package(TBB CONFIG REQUIRED) + + if(NOT OPENVDB_USE_STATIC_LIBS AND NOT Boost_USE_STATIC_LIBS) + # @note Both of these must be set for Boost 1.70 (VFX2020) to link against +@@ -635,7 +635,7 @@ elseif(NOT OPENVDB_USE_STATIC_LIBS) + endif() + + if(OpenVDB_USES_BLOSC) +- find_package(Blosc REQUIRED) ++ find_package(blosc CONFIG REQUIRED) + endif() + + if(OpenVDB_USES_ZLIB) +@@ -649,7 +649,7 @@ endif() + if(OpenVDB_USES_IMATH_HALF) + find_package(Imath CONFIG) + if (NOT TARGET Imath::Imath) +- find_package(IlmBase REQUIRED COMPONENTS Half) ++ find_package(IlmBase CONFIG REQUIRED) + endif() + + if(WIN32) +@@ -698,7 +698,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES) + + if(NOT OPENVDB_USE_STATIC_LIBS) + if(OpenVDB_USES_BLOSC) +- list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES Blosc::blosc) ++ list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES blosc) + endif() + if(OpenVDB_USES_ZLIB) + list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES ZLIB::ZLIB) +diff --git a/openvdb/openvdb/CMakeLists.txt b/openvdb/openvdb/CMakeLists.txt +index 1d5b75f..f2da6f9 100644 +--- a/openvdb/openvdb/CMakeLists.txt ++++ b/openvdb/openvdb/CMakeLists.txt +@@ -127,9 +127,9 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BOOST_VERSION) + endif() + endif() + +-find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbb) ++find_package(TBB CONFIG REQUIRED) + if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_TBB_VERSION) +- if(${Tbb_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION) ++ if(${TBB_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION) + message(DEPRECATION "Support for TBB versions < ${FUTURE_MINIMUM_TBB_VERSION} " + "is deprecated and will be removed.") + endif() +@@ -138,7 +138,7 @@ endif() + if(USE_IMATH_HALF) + find_package(Imath CONFIG) + if (NOT TARGET Imath::Imath) +- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half) ++ find_package(IlmBase CONFIG REQUIRED) + if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_ILMBASE_VERSION) + if(${IlmBase_VERSION} VERSION_LESS FUTURE_MINIMUM_ILMBASE_VERSION) + message(DEPRECATION "Support for IlmBase versions < ${FUTURE_MINIMUM_ILMBASE_VERSION} " +@@ -157,26 +157,7 @@ endif() + + if(USE_BLOSC) + # Find Blosc libraries +- find_package(Blosc ${MINIMUM_BLOSC_VERSION} REQUIRED) +- if(Blosc_VERSION) +- if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BLOSC_VERSION) +- if(${Blosc_VERSION} VERSION_LESS FUTURE_MINIMUM_BLOSC_VERSION) +- message(DEPRECATION "Support for Blosc versions < ${FUTURE_MINIMUM_BLOSC_VERSION} " +- "is deprecated and will be removed.") +- endif() +- endif() +- # Print a warning if using of the blosc versions with regression issues +- # with Blosc 1.5.0 caches. +- if((Blosc_VERSION VERSION_GREATER_EQUAL 1.11.0 AND +- Blosc_VERSION VERSION_LESS 1.14.0) OR +- (Blosc_VERSION VERSION_GREATER_EQUAL 1.16.0 AND +- Blosc_VERSION VERSION_LESS 1.16.2)) +- message(WARNING "The following Blosc versions are incompatible with the " +- "recommended builds of OpenVDB: [1.11.0 -> 1.14.0) [1.16.0, 1.16.1]. " +- "Found Blosc version '${Blosc_VERSION}' which falls in this range. We " +- "strongly recommend using the new future minimum version '${FUTURE_MINIMUM_BLOSC_VERSION}'") +- endif() +- endif() ++ find_package(blosc CONFIG REQUIRED) + else() + message(WARNING "Blosc support is disabled. It is strongly recommended to " + "enable blosc for optimal builds of OpenVDB and to support compatible " +@@ -234,7 +215,7 @@ endif() + # /usr/local + + if(USE_BLOSC) +- list(APPEND OPENVDB_CORE_DEPENDENT_LIBS Blosc::blosc) ++ list(APPEND OPENVDB_CORE_DEPENDENT_LIBS blosc) + endif() + + if(USE_BLOSC OR USE_ZLIB) +diff --git a/openvdb/openvdb/cmd/CMakeLists.txt b/openvdb/openvdb/cmd/CMakeLists.txt +index c1d5649..c173566 100644 +--- a/openvdb/openvdb/cmd/CMakeLists.txt ++++ b/openvdb/openvdb/cmd/CMakeLists.txt +@@ -46,7 +46,7 @@ if(CONCURRENT_MALLOC STREQUAL "Jemalloc") + find_package(Jemalloc REQUIRED) + list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS Jemalloc::jemalloc) + elseif(CONCURRENT_MALLOC STREQUAL "Tbbmalloc") +- find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbbmalloc) ++ find_package(TBB CONFIG REQUIRED) + list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS TBB::tbbmalloc) + endif() + +@@ -90,17 +90,13 @@ if(OPENVDB_BUILD_VDB_RENDER) + find_package(Imath CONFIG) + if (NOT TARGET Imath::Imath) + if(USE_EXR) +- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath) +- else() +- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half) ++ find_package(IlmBase CONFIG REQUIRED) + endif() + endif() + endif() + + if(USE_EXR) + if (NOT TARGET Imath::Imath) +- find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf) +- else() + find_package(OpenEXR CONFIG REQUIRED) + endif() + endif() diff --git a/externals/vcpkg/ports/openvdb/fix-Target-notfound.patch b/externals/vcpkg/ports/openvdb/fix-Target-notfound.patch new file mode 100755 index 000000000..421ee5da2 --- /dev/null +++ b/externals/vcpkg/ports/openvdb/fix-Target-notfound.patch @@ -0,0 +1,19 @@ +diff --git a/openvdb/openvdb/cmd/CMakeLists.txt b/openvdb/openvdb/cmd/CMakeLists.txt +index c173566..53f8575 100644 +--- a/openvdb/openvdb/cmd/CMakeLists.txt ++++ b/openvdb/openvdb/cmd/CMakeLists.txt +@@ -137,9 +137,11 @@ if(OPENVDB_BUILD_VDB_RENDER) + + if(WIN32) + # @note OPENVDB_OPENEXR_STATICLIB is old functionality and should be removed +- get_target_property(ILMBASE_LIB_TYPE IlmBase::Half TYPE) +- if(OPENEXR_USE_STATIC_LIBS OR (${ILMBASE_LIB_TYPE} STREQUAL STATIC_LIBRARY)) +- target_compile_definitions(vdb_render PUBLIC -DOPENVDB_OPENEXR_STATICLIB) ++ if(USE_IMATH_HALF) ++ get_target_property(ILMBASE_LIB_TYPE IlmBase::Half TYPE) ++ if(OPENEXR_USE_STATIC_LIBS OR (${ILMBASE_LIB_TYPE} STREQUAL STATIC_LIBRARY)) ++ target_compile_definitions(vdb_render PUBLIC -DOPENVDB_OPENEXR_STATICLIB) ++ endif() + endif() + endif() + diff --git a/externals/vcpkg/ports/openvdb/portfile.cmake b/externals/vcpkg/ports/openvdb/portfile.cmake new file mode 100755 index 000000000..6016632fa --- /dev/null +++ b/externals/vcpkg/ports/openvdb/portfile.cmake @@ -0,0 +1,67 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO AcademySoftwareFoundation/openvdb + REF 0ed0f19ea4fbb0d8bf64d3dca07abab3c7429803 # v9.0.0 + SHA512 f033f2d5801327ab8aeffb12d1a74ff880e477a1f00da3b03a3087262a3e72ef77c13e05fe8e3c94a26721804230c0272d9ca069af997c36c992f3e2f3d962f2 + PATCHES + 0003-fix-cmake.patch + fix-Target-notfound.patch +) + +file(REMOVE "${SOURCE_PATH}/cmake/FindTBB.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/FindIlmBase.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/FindBlosc.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/FindOpenEXR.cmake") + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" OPENVDB_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" OPENVDB_SHARED) + +set(OPENVDB_BUILD_TOOLS OFF) +if ("tools" IN_LIST FEATURES) + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(OPENVDB_BUILD_TOOLS ON) + else() + message(FATAL_ERROR "Unable to build tools if static libraries are required") + endif() +endif() + +if ("ax" IN_LIST FEATURES) + if(NOT VCPKG_TARGET_IS_WINDOWS) + set(OPENVDB_BUILD_AX ON) + else() + message(FATAL_ERROR "Currently no support for building OpenVDB AX on Windows.") + endif() +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DOPENVDB_BUILD_UNITTESTS=OFF + -DOPENVDB_BUILD_PYTHON_MODULE=OFF + -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF + -DUSE_GLFW3=ON + -DOPENVDB_CORE_STATIC=${OPENVDB_STATIC} + -DOPENVDB_CORE_SHARED=${OPENVDB_SHARED} + -DOPENVDB_BUILD_VDB_PRINT=${OPENVDB_BUILD_TOOLS} + -DOPENVDB_BUILD_VDB_VIEW=${OPENVDB_BUILD_TOOLS} + -DOPENVDB_BUILD_VDB_RENDER=${OPENVDB_BUILD_TOOLS} + -DOPENVDB_BUILD_VDB_LOD=${OPENVDB_BUILD_TOOLS} + -DUSE_PKGCONFIG=OFF + ${OPENVDB_BUILD_AX} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenVDB) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +if (OPENVDB_BUILD_TOOLS) + vcpkg_copy_tools(TOOL_NAMES vdb_print vdb_render vdb_view vdb_lod AUTO_CLEAN) +endif() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/openvdb/openvdb/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/openvdb/usage b/externals/vcpkg/ports/openvdb/usage new file mode 100755 index 000000000..854078780 --- /dev/null +++ b/externals/vcpkg/ports/openvdb/usage @@ -0,0 +1,4 @@ +The package openvdb provides CMake targets: + + find_package(OpenVDB CONFIG REQUIRED) + target_link_libraries(main PRIVATE OpenVDB::openvdb) diff --git a/externals/vcpkg/ports/openvdb/vcpkg-cmake-wrapper.cmake.in b/externals/vcpkg/ports/openvdb/vcpkg-cmake-wrapper.cmake.in new file mode 100755 index 000000000..7b9e5ac67 --- /dev/null +++ b/externals/vcpkg/ports/openvdb/vcpkg-cmake-wrapper.cmake.in @@ -0,0 +1,12 @@ +set(OPENVDB_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) + +list(REMOVE_ITEM ARGS "NO_MODULE") +list(REMOVE_ITEM ARGS "CONFIG") +list(REMOVE_ITEM ARGS "MODULE") + +set(OPENVDB_USE_STATIC_LIBS @OPENVDB_STATIC@) + +_find_package(${ARGS}) + +set(CMAKE_MODULE_PATH ${OPENVDB_PREV_MODULE_PATH}) diff --git a/externals/vcpkg/ports/openvdb/vcpkg.json b/externals/vcpkg/ports/openvdb/vcpkg.json new file mode 100755 index 000000000..7acb002f7 --- /dev/null +++ b/externals/vcpkg/ports/openvdb/vcpkg.json @@ -0,0 +1,41 @@ +{ + "name": "openvdb", + "version": "9.0.0", + "description": "Sparse volume data structure and tools", + "homepage": "https://github.com/dreamworksanimation/openvdb", + "license": "MPL-2.0", + "dependencies": [ + "blosc", + "boost-any", + "boost-date-time", + "boost-interprocess", + "boost-iostreams", + "boost-ptr-container", + "boost-system", + "boost-thread", + "boost-uuid", + "ilmbase", + "openexr", + "tbb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "ax": { + "description": "Provides a powerful and easy way of interacting with OpenVDB volume and point data." + }, + "tools": { + "description": "OpenVDB utilities: view, print and render", + "dependencies": [ + "glew", + "glfw3" + ] + } + } +} diff --git a/externals/vcpkg/ports/openvpn3/CMakeLists.txt b/externals/vcpkg/ports/openvpn3/CMakeLists.txt new file mode 100755 index 000000000..b4943038c --- /dev/null +++ b/externals/vcpkg/ports/openvpn3/CMakeLists.txt @@ -0,0 +1,42 @@ +cmake_minimum_required(VERSION 3.5) +project(openvpncli CXX) + +find_path(ASIO_HPP asio.hpp) +find_library(MBEDTLS_LIB mbedtls) +find_library(MBEDCRYPTO_LIB mbedcrypto) +find_library(MBEDX509_LIB mbedx509) + +include_directories(. ${ASIO_HPP}) + +if(WIN32) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") +endif() + +add_definitions(-DNOMINMAX -DUSE_ASIO -DUSE_MBEDTLS -D_WIN32_WINNT=0x0600) +if(LINUX) + add_compile_options(-include bits/endian.h) +endif() + +add_library(ovpncli client/ovpncli.cpp) +target_link_libraries(ovpncli PRIVATE Iphlpapi.lib Wininet.lib Setupapi.lib Cfgmgr32.lib Rpcrt4.lib Fwpuclnt.lib Wtsapi32.lib ${MBEDTLS_LIB} ${MBEDCRYPTO_LIB} ${MBEDX509_LIB}) + +target_include_directories(ovpncli PUBLIC $ $) + +install( + TARGETS ovpncli + EXPORT unofficial-openvpnConfig + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +INSTALL(EXPORT unofficial-openvpnConfig + NAMESPACE unofficial::openvpn3:: + DESTINATION share/unofficial-openvpn +) + +if(BUILD_TOOL) + add_executable(cli test/ovpncli/cli.cpp) + target_compile_definitions(cli PRIVATE -DTAP_WIN_COMPONENT_ID=tap0901) + target_link_libraries(cli PRIVATE ovpncli) +endif() diff --git a/externals/vcpkg/ports/openvpn3/portfile.cmake b/externals/vcpkg/ports/openvpn3/portfile.cmake new file mode 100755 index 000000000..69fd68ee5 --- /dev/null +++ b/externals/vcpkg/ports/openvpn3/portfile.cmake @@ -0,0 +1,37 @@ +set(VCPKG_LIBRARY_LINKAGE static) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO OpenVPN/openvpn3 + REF release/3.7 + SHA512 de95bd2b1a01179aa81e1612be175540c2486b856f66880372d09966655bbbadd71d874ed49b032566dde2896207bc76298c5cfcf73e86272c04d5aaa977d660 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +file(COPY "${SOURCE_PATH}/openvpn" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(COPY "${SOURCE_PATH}/client/ovpncli.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/openvpn") + +file(GLOB_RECURSE HEADERS "${CURRENT_PACKAGES_DIR}/include/openvpn/*") +foreach(HEADER IN LISTS HEADERS) + file(READ "${HEADER}" _contents) + string(REPLACE "defined(USE_ASIO)" "1" _contents "${_contents}") + string(REPLACE "#ifdef USE_ASIO\n" "#if 1\n" _contents "${_contents}") + string(REPLACE "defined(USE_MBEDTLS)" "1" _contents "${_contents}") + string(REPLACE "#ifdef USE_MBEDTLS\n" "#if 1\n" _contents "${_contents}") + file(WRITE "${HEADER}" "${_contents}") +endforeach() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-openvpn CONFIG_PATH share/unofficial-openvpn) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL + "${SOURCE_PATH}/COPYRIGHT.AGPLV3" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/openvpn3/vcpkg.json b/externals/vcpkg/ports/openvpn3/vcpkg.json new file mode 100755 index 000000000..cac878896 --- /dev/null +++ b/externals/vcpkg/ports/openvpn3/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "openvpn3", + "version": "3.7.0", + "port-version": 1, + "description": "a C++ class library that implements the functionality of an OpenVPN client, and is protocol-compatible with the OpenVPN 2.x branch.", + "homepage": "https://openvpn.net", + "license": "AGPL-3.0", + "dependencies": [ + "asio", + "mbedtls", + { + "name": "tap-windows6", + "platform": "windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/openvr/portfile.cmake b/externals/vcpkg/ports/openvr/portfile.cmake new file mode 100755 index 000000000..1aef03e9c --- /dev/null +++ b/externals/vcpkg/ports/openvr/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ValveSoftware/openvr + REF 4c85abcb7f7f1f02adaf3812018c99fc593bc341 # v1.16.8 + SHA512 366e553e6c9caa2bf884caf41b29a7ae6bdad165aeb56ea469625dc963bd91fd8423e753d07a28f8b6a69eed3939ba5a5e4fb0f84b52074bf6279b510e66f793 + HEAD_REF master +) + +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(ARCH_PATH "win64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(ARCH_PATH "win32") + else() + message(FATAL_ERROR "Package only supports x64 and x86 Windows.") + endif() +elseif(VCPKG_TARGET_IS_LINUX) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(ARCH_PATH "linux64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(ARCH_PATH "linux32") + else() + message(FATAL_ERROR "Package only supports x64 and x86 Linux.") + endif() +else() + message(FATAL_ERROR "Package only supports Windows and Linux.") +endif() + +file(COPY ${SOURCE_PATH}/lib/${ARCH_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +file(COPY ${SOURCE_PATH}/lib/${ARCH_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + +file(COPY ${SOURCE_PATH}/bin/${ARCH_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin) +file(COPY ${SOURCE_PATH}/bin/${ARCH_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + +file(INSTALL ${SOURCE_PATH}/headers DESTINATION ${CURRENT_PACKAGES_DIR} RENAME include) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/openvr/vcpkg.json b/externals/vcpkg/ports/openvr/vcpkg.json new file mode 100755 index 000000000..3662ad5a0 --- /dev/null +++ b/externals/vcpkg/ports/openvr/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "openvr", + "version": "1.16.8", + "port-version": 2, + "description": "an API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting.", + "homepage": "https://github.com/ValveSoftware/openvr", + "supports": "!(arm | uwp | osx | android)" +} diff --git a/externals/vcpkg/ports/openxr-loader/002-fix-hpp-gen.patch b/externals/vcpkg/ports/openxr-loader/002-fix-hpp-gen.patch new file mode 100755 index 000000000..9f58f7626 --- /dev/null +++ b/externals/vcpkg/ports/openxr-loader/002-fix-hpp-gen.patch @@ -0,0 +1,16 @@ +diff --git a/scripts/hpp_genxr.py b/scripts/hpp_genxr.py +index 6b95fe4..3a19058 100755 +--- a/scripts/hpp_genxr.py ++++ b/scripts/hpp_genxr.py +@@ -80,6 +80,11 @@ def genTarget(args): + "XR_MSFT_controller_model", + # Projection of static string fails + "XR_MSFT_spatial_graph_bridge", ++ "XR_MSFT_spatial_anchor_persistence", ++ "XR_MSFT_holographic_window_attachment", ++ # Projection of UuidMSFT fails ++ "XR_MSFT_scene_understanding", ++ "XR_MSFT_scene_understanding_serialization", + )) + + # Turn lists of names/patterns into matching regular expressions diff --git a/externals/vcpkg/ports/openxr-loader/fix-jinja2.patch b/externals/vcpkg/ports/openxr-loader/fix-jinja2.patch new file mode 100755 index 000000000..5d77cb4e4 --- /dev/null +++ b/externals/vcpkg/ports/openxr-loader/fix-jinja2.patch @@ -0,0 +1,23 @@ +From d80c7dc3f4810fc49e4444590d39ef71e8a9b01c Mon Sep 17 00:00:00 2001 +From: Adam Johnson +Date: Sat, 19 Feb 2022 19:42:31 -0500 +Subject: [PATCH] Fix bad import in jinja2 + +--- + external/python/jinja2/utils.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/external/python/jinja2/utils.py b/external/python/jinja2/utils.py +index db9c5d06..f198e3ef 100644 +--- a/external/python/jinja2/utils.py ++++ b/external/python/jinja2/utils.py +@@ -639,4 +639,8 @@ def __repr__(self): + + + # Imported here because that's where it was in the past +-from markupsafe import Markup, escape, soft_unicode ++from markupsafe import Markup, escape ++try: ++ from markupsafe import soft_unicode ++except ImportError: ++ from markupsafe import soft_str as soft_unicode diff --git a/externals/vcpkg/ports/openxr-loader/fix-openxr-sdk-jsoncpp.patch b/externals/vcpkg/ports/openxr-loader/fix-openxr-sdk-jsoncpp.patch new file mode 100755 index 000000000..bf915949a --- /dev/null +++ b/externals/vcpkg/ports/openxr-loader/fix-openxr-sdk-jsoncpp.patch @@ -0,0 +1,30 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index c75b145..386494c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -89,7 +89,7 @@ if(NOT VULKAN_INCOMPATIBLE) + endif() + + find_package(Threads REQUIRED) +-find_package(JsonCpp) ++find_package(jsoncpp CONFIG REQUIRED) + + ### All options defined here + option(BUILD_LOADER "Build loader" ON) +diff --git a/src/loader/CMakeLists.txt b/src/loader/CMakeLists.txt +index 6a88cf4..0821a3d 100644 +--- a/src/loader/CMakeLists.txt ++++ b/src/loader/CMakeLists.txt +@@ -68,7 +68,11 @@ add_library(openxr_loader ${LIBRARY_TYPE} + ${openxr_loader_RESOURCE_FILE} + ) + if(BUILD_WITH_SYSTEM_JSONCPP) +- target_link_libraries(openxr_loader PRIVATE JsonCpp::JsonCpp) ++ if(BUILD_SHARED_LIBS) ++ target_link_libraries(openxr_loader PRIVATE jsoncpp_lib) ++ else() ++ target_link_libraries(openxr_loader PRIVATE jsoncpp_static) ++ endif() + else() + target_sources(openxr_loader + PRIVATE diff --git a/externals/vcpkg/ports/openxr-loader/portfile.cmake b/externals/vcpkg/ports/openxr-loader/portfile.cmake new file mode 100755 index 000000000..04a518602 --- /dev/null +++ b/externals/vcpkg/ports/openxr-loader/portfile.cmake @@ -0,0 +1,82 @@ + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KhronosGroup/OpenXR-SDK + REF release-1.0.22 + SHA512 fe3c393c2d11981b42355acd8dbc337727120bcd0ff595abac1975c4ce5f68bb74a9a1b4c959e64e9a847ae5d504100d31979ffd7d9702c55b2dbd889de17d3e + HEAD_REF master + PATCHES + fix-openxr-sdk-jsoncpp.patch +) + +vcpkg_from_github( + OUT_SOURCE_PATH SDK_SOURCE_PATH + REPO KhronosGroup/OpenXR-SDK-Source + REF release-1.0.22 + SHA512 92802d57a45ca1d697d3cea1b3f5619af4ba36156cb28c2c39b2295a74ebc45907caf371c916c54ec3be44a2f3ae447ffc1cd62f54b7b24f7a081408328c7651 + HEAD_REF master + PATCHES + fix-openxr-sdk-jsoncpp.patch + fix-jinja2.patch +) + +vcpkg_from_github( + OUT_SOURCE_PATH HPP_SOURCE_PATH + REPO KhronosGroup/OpenXR-hpp + REF release-1.0.21 + SHA512 cda111f20392a64d5f4de6bd71f1fe7fe39d688bb2376c6b1841763459e32fd6d03b9552804b5ee464ba84cd4c05cfdaa1a6e8a8e5da3eae6b94c7797c65cb36 + HEAD_REF master + PATCHES + 002-fix-hpp-gen.patch +) + +# Weird behavior inside the OpenXR loader. On Windows they force shared libraries to use static crt, and +# vice-versa. Might be better in future iterations to patch the CMakeLists.txt for OpenXR +if (VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(DYNAMIC_LOADER OFF) + set(VCPKG_CRT_LINKAGE dynamic) + else() + set(DYNAMIC_LOADER ON) + set(VCPKG_CRT_LINKAGE static) + endif() +endif() + +vcpkg_find_acquire_program(PYTHON3) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_API_LAYERS=OFF + -DBUILD_TESTS=OFF + -DBUILD_CONFORMANCE_TESTS=OFF + -DDYNAMIC_LOADER=${DYNAMIC_LOADER} + -DPYTHON_EXECUTABLE="${PYTHON3}" + -DBUILD_WITH_SYSTEM_JSONCPP=ON +) + +vcpkg_cmake_install() + +# Generate the OpenXR C++ bindings +set(ENV{OPENXR_REPO} "${SDK_SOURCE_PATH}") +file(STRINGS "${HPP_SOURCE_PATH}/headers.txt" HEADER_LIST REGEX "^openxr.*") +foreach(HEADER ${HEADER_LIST}) + vcpkg_execute_required_process( + COMMAND ${PYTHON3} "${HPP_SOURCE_PATH}/scripts/hpp_genxr.py" -registry "${SDK_SOURCE_PATH}/specification/registry/xr.xml" -o "${CURRENT_PACKAGES_DIR}/include/openxr" ${HEADER} + WORKING_DIRECTORY "${HPP_SOURCE_PATH}" + LOGNAME openxrhpp + ) +endforeach() + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(PACKAGE_NAME OpenXR CONFIG_PATH cmake) +else() + vcpkg_cmake_config_fixup(PACKAGE_NAME OpenXR CONFIG_PATH lib/cmake/openxr) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/openxr-loader/vcpkg.json b/externals/vcpkg/ports/openxr-loader/vcpkg.json new file mode 100755 index 000000000..c2e6b9a40 --- /dev/null +++ b/externals/vcpkg/ports/openxr-loader/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "openxr-loader", + "version": "1.0.22", + "port-version": 3, + "description": "A royalty-free, open standard that provides high-performance access to Augmented Reality (AR) and Virtual Reality (VR)—collectively known as XR—platforms and devices", + "homepage": "https://github.com/KhronosGroup/OpenXR-SDK", + "license": "Apache-2.0", + "supports": "!uwp & !osx", + "dependencies": [ + "jsoncpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "vulkan": { + "description": "Vulkan functionality for OpenXR", + "dependencies": [ + "vulkan" + ] + } + } +} diff --git a/externals/vcpkg/ports/optimus-cpp/portfile.cmake b/externals/vcpkg/ports/optimus-cpp/portfile.cmake new file mode 100755 index 000000000..4692f4f56 --- /dev/null +++ b/externals/vcpkg/ports/optimus-cpp/portfile.cmake @@ -0,0 +1,17 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kafeg/optimus-cpp + REF 0.3.0 + SHA512 93abd13d4552a896f61e32dfebcc9037e7255f3fa86b230c03905df3148b9cc91cec772ec733e83fbcad574fd93fa4dadca9ec88b5836c5a4137d01e16580d6f + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/optimus-cpp/vcpkg.json b/externals/vcpkg/ports/optimus-cpp/vcpkg.json new file mode 100755 index 000000000..2b8ee879d --- /dev/null +++ b/externals/vcpkg/ports/optimus-cpp/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "optimus-cpp", + "version": "0.3.0", + "description": "ID hashing and Obfuscation using Knuth's Algorithm for C++", + "homepage": "https://github.com/kafeg/optimus-cpp", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/optional-bare/portfile.cmake b/externals/vcpkg/ports/optional-bare/portfile.cmake new file mode 100755 index 000000000..6219df627 --- /dev/null +++ b/externals/vcpkg/ports/optional-bare/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO martinmoene/optional-bare + REF v1.1.0 + SHA512 0eed103c4e909991b596c0cd23d6206662e3ca71cd8148e27c19d8e071c2a16e18cc940a6cd4f8571510f5e64577157f94c561fb889330bb7a868af64c2f3aa0 +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DOPTIONAL_BARE_OPT_BUILD_TESTS=OFF + -DOPTIONAL_BARE_OPT_BUILD_EXAMPLES=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets( + CONFIG_PATH lib/cmake/${PORT} +) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug + ${CURRENT_PACKAGES_DIR}/lib +) + +file(INSTALL + ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright +) diff --git a/externals/vcpkg/ports/optional-bare/vcpkg.json b/externals/vcpkg/ports/optional-bare/vcpkg.json new file mode 100755 index 000000000..673d184ac --- /dev/null +++ b/externals/vcpkg/ports/optional-bare/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "optional-bare", + "version-string": "1.1.0", + "port-version": 1, + "description": "A simple version of a C++17-like optional for default-constructible, copyable types, for C++98 and later in a single-file header-only library" +} diff --git a/externals/vcpkg/ports/optional-lite/portfile.cmake b/externals/vcpkg/ports/optional-lite/portfile.cmake new file mode 100755 index 000000000..83d5ac23a --- /dev/null +++ b/externals/vcpkg/ports/optional-lite/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO martinmoene/optional-lite + REF v3.5.0 + SHA512 e578d391bc95e2a5302b4b02e0b17659026b2743fc5c1e16cd83f6227fa9b5990fa3fa23e808a4ea0f5bdafbf80834b0c462d563ab615907f113ee5a09ae88f5 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DOPTIONAL_LITE_OPT_BUILD_TESTS=OFF + -DOPTIONAL_LITE_OPT_BUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + CONFIG_PATH "lib/cmake/${PORT}" +) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" +) + +file(INSTALL + "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright +) diff --git a/externals/vcpkg/ports/optional-lite/vcpkg.json b/externals/vcpkg/ports/optional-lite/vcpkg.json new file mode 100755 index 000000000..4245c02bd --- /dev/null +++ b/externals/vcpkg/ports/optional-lite/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "optional-lite", + "version": "3.5.0", + "port-version": 1, + "description": "A C++17-like optional, a nullable object for C++98, C++11 and later in a single-file header-only library", + "homepage": "https://github.com/martinmoene/optional-lite", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/opus/portfile.cmake b/externals/vcpkg/ports/opus/portfile.cmake new file mode 100755 index 000000000..b2e1e3807 --- /dev/null +++ b/externals/vcpkg/ports/opus/portfile.cmake @@ -0,0 +1,43 @@ +vcpkg_from_github( + OUT_SOURCE_PATH + SOURCE_PATH + REPO + xiph/opus + REF + 5c94ec3205c30171ffd01056f5b4622b7c0ab54c + SHA512 + 2423b1fc86d5b46c32d8e3bde5fc2b410a5c25c001995ce234a94a3a6c7a8b1446fdf19eafe9d6a8a7356fe0857697053db5eb8380d18f8111818aa770b4c4ea + HEAD_REF + master) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + avx AVX_SUPPORTED +) + +if(VCPKG_TARGET_IS_MINGW) + set(STACK_PROTECTOR OFF) + string(APPEND VCPKG_C_FLAGS "-D_FORTIFY_SOURCE=0") + string(APPEND VCPKG_CXX_FLAGS "-D_FORTIFY_SOURCE=0") +else() + set(STACK_PROTECTOR ON) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS ${FEATURE_OPTIONS} + -DOPUS_STACK_PROTECTOR=${STACK_PROTECTOR} + PREFER_NINJA) +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Opus) +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m) + +file(INSTALL + ${SOURCE_PATH}/COPYING + DESTINATION + ${CURRENT_PACKAGES_DIR}/share/opus + RENAME copyright) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake + ${CURRENT_PACKAGES_DIR}/lib/cmake + ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/externals/vcpkg/ports/opus/vcpkg.json b/externals/vcpkg/ports/opus/vcpkg.json new file mode 100755 index 000000000..f1ea43d69 --- /dev/null +++ b/externals/vcpkg/ports/opus/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "opus", + "version-string": "1.3.1", + "port-version": 6, + "description": "Totally open, royalty-free, highly versatile audio codec", + "homepage": "https://github.com/xiph/opus", + "features": { + "avx": { + "description": "Builds the library with avx instruction set" + } + } +} diff --git a/externals/vcpkg/ports/opusfile/CMakeLists.txt b/externals/vcpkg/ports/opusfile/CMakeLists.txt new file mode 100755 index 000000000..ecef1d01f --- /dev/null +++ b/externals/vcpkg/ports/opusfile/CMakeLists.txt @@ -0,0 +1,48 @@ +cmake_minimum_required(VERSION 3.4) +project(opusfile C) + +if(MSVC) +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4267 /wd4244 /wd4090") +endif() + +find_path(OGG_INCLUDE_DIR ogg/ogg.h) +find_library(OGG_LIBRARY ogg) + +find_path(OPUS_INCLUDE_DIR opus.h PATH_SUFFIXES opus) +find_library(OPUS_LIBRARY opus) + +add_library(opusfile + src/info.c + src/internal.c + src/opusfile.c + src/stream.c) + +target_include_directories(opusfile PRIVATE include PUBLIC ${OGG_INCLUDE_DIR} ${OPUS_INCLUDE_DIR}) +target_link_libraries(opusfile PRIVATE ${OGG_LIBRARY} ${OPUS_LIBRARY}) + +install(TARGETS opusfile + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + +if(BUILD_OPUSURL) + find_package(OpenSSL MODULE REQUIRED) + + add_library(opusurl + src/http.c + src/wincerts.c) + + target_compile_definitions(opusurl PRIVATE OP_ENABLE_HTTP) + target_include_directories(opusurl PRIVATE include) + target_link_libraries(opusurl PRIVATE opusfile OpenSSL::SSL ws2_32.lib crypt32.lib) + + install(TARGETS opusurl + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) +endif() + +if(NOT OPUSFILE_SKIP_HEADERS) + install(FILES include/opusfile.h + DESTINATION include/opus) +endif() diff --git a/externals/vcpkg/ports/opusfile/portfile.cmake b/externals/vcpkg/ports/opusfile/portfile.cmake new file mode 100755 index 000000000..ed687167c --- /dev/null +++ b/externals/vcpkg/ports/opusfile/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) + message(FATAL_ERROR "UWP builds not supported") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xiph/opusfile + REF a55c164e9891a9326188b7d4d216ec9a88373739 # v0.12 + SHA512 cfe90b63b8ec027caf6d472167aba863e62f02650245cf0e4d9a543bb565c9088d38b45f7dc2d42cdfcdac5397c3757f4377c24afee73cac52437c125830c411 + HEAD_REF master) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +if("opusurl" IN_LIST FEATURES) + set(BUILD_OPUSURL ON) +else() + set(BUILD_OPUSURL OFF) +endif() + +vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_OPUSURL=${BUILD_OPUSURL} + OPTIONS_DEBUG + -DOPUSFILE_SKIP_HEADERS=ON) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +# make includes work with MSBuild integration +file(READ ${CURRENT_PACKAGES_DIR}/include/opus/opusfile.h OPUSFILE_H) + string(REPLACE "# include " "# include \"opus_multistream.h\"" OPUSFILE_H "${OPUSFILE_H}") +file(WRITE ${CURRENT_PACKAGES_DIR}/include/opus/opusfile.h "${OPUSFILE_H}") + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/opusfile) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/opusfile/COPYING ${CURRENT_PACKAGES_DIR}/share/opusfile/copyright) diff --git a/externals/vcpkg/ports/opusfile/vcpkg.json b/externals/vcpkg/ports/opusfile/vcpkg.json new file mode 100755 index 000000000..212c393f5 --- /dev/null +++ b/externals/vcpkg/ports/opusfile/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "opusfile", + "version-string": "0.12", + "port-version": 1, + "description": "Stand-alone decoder library for .opus streams", + "homepage": "https://github.com/xiph/opusfile", + "supports": "!uwp", + "dependencies": [ + "libogg", + "opus" + ], + "features": { + "opusurl": { + "description": "Support decoding of http(s) streams", + "dependencies": [ + "openssl" + ] + } + } +} diff --git a/externals/vcpkg/ports/orc/0003-dependencies-from-vcpkg.patch b/externals/vcpkg/ports/orc/0003-dependencies-from-vcpkg.patch new file mode 100755 index 000000000..fb7c59144 --- /dev/null +++ b/externals/vcpkg/ports/orc/0003-dependencies-from-vcpkg.patch @@ -0,0 +1,162 @@ +diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt +index 3d4a162..6926bc3 100644 +--- a/c++/src/CMakeLists.txt ++++ b/c++/src/CMakeLists.txt +@@ -230,12 +230,13 @@ endif(BUILD_LIBHDFSPP) + add_library (orc STATIC ${SOURCE_FILES}) + + target_link_libraries (orc +- protobuf +- zlib +- snappy +- lz4 +- zstd +- ${LIBHDFSPP_LIBRARIES} ++ PRIVATE ++ protobuf::libprotobuf ++ ZLIB::ZLIB ++ Snappy::snappy ++ lz4::lz4 ++ $,zstd::libzstd_shared,zstd::libzstd_static> ++ ${LIBHDFSPP_LIBRARIES} + ) + + install(TARGETS orc DESTINATION lib) +diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake +index 3a35325..56ffd74 100644 +--- a/cmake_modules/ThirdpartyToolchain.cmake ++++ b/cmake_modules/ThirdpartyToolchain.cmake +@@ -59,8 +59,8 @@ endif () + # ---------------------------------------------------------------------- + # Snappy + +-if (NOT "${SNAPPY_HOME}" STREQUAL "") +- find_package (Snappy REQUIRED) ++if (1) ++ find_package (Snappy CONFIG REQUIRED) + set(SNAPPY_VENDORED FALSE) + else () + set(SNAPPY_HOME "${THIRDPARTY_DIR}/snappy_ep-install") +@@ -78,10 +78,6 @@ else () + set(SNAPPY_VENDORED TRUE) + endif () + +-include_directories (SYSTEM ${SNAPPY_INCLUDE_DIR}) +-add_library (snappy STATIC IMPORTED) +-set_target_properties (snappy PROPERTIES IMPORTED_LOCATION ${SNAPPY_STATIC_LIB}) +- + if (SNAPPY_VENDORED) + add_dependencies (snappy snappy_ep) + if (INSTALL_VENDORED_LIBS) +@@ -93,7 +89,7 @@ endif () + # ---------------------------------------------------------------------- + # ZLIB + +-if (NOT "${ZLIB_HOME}" STREQUAL "") ++if (1) + find_package (ZLIB REQUIRED) + set(ZLIB_VENDORED FALSE) + else () +@@ -120,10 +116,6 @@ else () + set(ZLIB_VENDORED TRUE) + endif () + +-include_directories (SYSTEM ${ZLIB_INCLUDE_DIR}) +-add_library (zlib STATIC IMPORTED) +-set_target_properties (zlib PROPERTIES IMPORTED_LOCATION ${ZLIB_STATIC_LIB}) +- + if (ZLIB_VENDORED) + add_dependencies (zlib zlib_ep) + if (INSTALL_VENDORED_LIBS) +@@ -135,8 +127,8 @@ endif () + # ---------------------------------------------------------------------- + # Zstd + +-if (NOT "${ZSTD_HOME}" STREQUAL "") +- find_package (ZSTD REQUIRED) ++if (1) ++ find_package (zstd CONFIG REQUIRED) + set(ZSTD_VENDORED FALSE) + else () + set(ZSTD_HOME "${THIRDPARTY_DIR}/zstd_ep-install") +@@ -169,10 +161,6 @@ else () + set(ZSTD_VENDORED TRUE) + endif () + +-include_directories (SYSTEM ${ZSTD_INCLUDE_DIR}) +-add_library (zstd STATIC IMPORTED) +-set_target_properties (zstd PROPERTIES IMPORTED_LOCATION ${ZSTD_STATIC_LIB}) +- + if (ZSTD_VENDORED) + add_dependencies (zstd zstd_ep) + if (INSTALL_VENDORED_LIBS) +@@ -184,8 +172,8 @@ endif () + # ---------------------------------------------------------------------- + # LZ4 + +-if (NOT "${LZ4_HOME}" STREQUAL "") +- find_package (LZ4 REQUIRED) ++if (1) ++ find_package (lz4 CONFIG REQUIRED) + set(LZ4_VENDORED FALSE) + else () + set(LZ4_PREFIX "${THIRDPARTY_DIR}/lz4_ep-install") +@@ -211,10 +199,6 @@ else () + set(LZ4_VENDORED TRUE) + endif () + +-include_directories (SYSTEM ${LZ4_INCLUDE_DIR}) +-add_library (lz4 STATIC IMPORTED) +-set_target_properties (lz4 PROPERTIES IMPORTED_LOCATION ${LZ4_STATIC_LIB}) +- + if (LZ4_VENDORED) + add_dependencies (lz4 lz4_ep) + if (INSTALL_VENDORED_LIBS) +@@ -288,8 +272,8 @@ endif () + # ---------------------------------------------------------------------- + # Protobuf + +-if (NOT "${PROTOBUF_HOME}" STREQUAL "") +- find_package (Protobuf REQUIRED) ++if (1) ++ find_package (Protobuf CONFIG REQUIRED) + set(PROTOBUF_VENDORED FALSE) + else () + set(PROTOBUF_PREFIX "${THIRDPARTY_DIR}/protobuf_ep-install") +@@ -327,12 +311,6 @@ endif () + + include_directories (SYSTEM ${PROTOBUF_INCLUDE_DIR}) + +-add_library (protobuf STATIC IMPORTED) +-set_target_properties (protobuf PROPERTIES IMPORTED_LOCATION ${PROTOBUF_STATIC_LIB}) +- +-add_library (protoc STATIC IMPORTED) +-set_target_properties (protoc PROPERTIES IMPORTED_LOCATION ${PROTOC_STATIC_LIB}) +- + if (PROTOBUF_VENDORED) + add_dependencies (protoc protobuf_ep) + add_dependencies (protobuf protobuf_ep) +diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt +index f5a53ca..ec22e7a 100644 +--- a/tools/src/CMakeLists.txt ++++ b/tools/src/CMakeLists.txt +@@ -51,7 +51,6 @@ add_executable (orc-metadata + + target_link_libraries (orc-metadata + orc +- protobuf + ${CMAKE_THREAD_LIBS_INIT} + ) + +@@ -92,7 +91,7 @@ target_link_libraries (csv-import + ) + + install(TARGETS +- orc-contents +- orc-metadata +- orc-statistics +- DESTINATION bin) ++ orc-scan ++ orc-memory ++ csv-import ++ DESTINATION tools/orc) diff --git a/externals/vcpkg/ports/orc/0005-disable-tzdata.patch b/externals/vcpkg/ports/orc/0005-disable-tzdata.patch new file mode 100755 index 000000000..829bd18b1 --- /dev/null +++ b/externals/vcpkg/ports/orc/0005-disable-tzdata.patch @@ -0,0 +1,30 @@ +diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt +index ea39023..599d79a 100644 +--- a/c++/test/CMakeLists.txt ++++ b/c++/test/CMakeLists.txt +@@ -67,6 +67,7 @@ target_link_libraries (create-test-files + protobuf + ) + ++if (ENABLE_TEST) + if (TEST_VALGRIND_MEMCHECK) + add_test (orc-test + valgrind --tool=memcheck --leak-check=full --error-exitcode=1 ./orc-test) +@@ -86,3 +87,4 @@ if (WIN32) + ENVIRONMENT "TZDIR=${TZDATA_DIR}" + ) + endif () ++endif() +diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake +index 3a35325..364470b 100644 +--- a/cmake_modules/ThirdpartyToolchain.cmake ++++ b/cmake_modules/ThirdpartyToolchain.cmake +@@ -226,7 +226,7 @@ endif () + # ---------------------------------------------------------------------- + # IANA - Time Zone Database + +-if (WIN32) ++if (WIN32 AND TEST_VALGRIND_MEMCHECK) + ExternalProject_Add(tzdata_ep + URL "ftp://cygwin.osuosl.org/pub/cygwin/noarch/release/tzdata/tzdata-2019b-1.tar.xz" + URL_HASH MD5=17D8AB346BB1009D4EB35BC08040E51D diff --git a/externals/vcpkg/ports/orc/portfile.cmake b/externals/vcpkg/ports/orc/portfile.cmake new file mode 100755 index 000000000..12307b885 --- /dev/null +++ b/externals/vcpkg/ports/orc/portfile.cmake @@ -0,0 +1,72 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO apache/orc + REF 23ecc03e87548f6d6783c2d8af2b46672c52214c # rel/release-1.6.4 + SHA512 907984c7e036ddaa90e7cbfabb9af4f6fd3520820b9a8732b304f2213030f7d67cef89ad87d50e028a51bff06f68ff359345ad6894850e299b2fca343d7c0c3e + HEAD_REF master + PATCHES + 0003-dependencies-from-vcpkg.patch + 0005-disable-tzdata.patch +) + +file(REMOVE "${SOURCE_PATH}/cmake_modules/FindGTest.cmake") +file(REMOVE "${SOURCE_PATH}/cmake_modules/FindLZ4.cmake") +file(REMOVE "${SOURCE_PATH}/cmake_modules/FindZSTD.cmake") +file(REMOVE "${SOURCE_PATH}/cmake_modules/FindProtobuf.cmake") +file(REMOVE "${SOURCE_PATH}/cmake_modules/FindSnappy.cmake") +file(REMOVE "${SOURCE_PATH}/cmake_modules/FindZLIB.cmake") + +set(PROTOBUF_EXECUTABLE "${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}") + +if(VCPKG_TARGET_IS_WINDOWS) + set(BUILD_TOOLS OFF) + # when cross compiling, we can't run their test. however: + # - Windows doesn't support time_t < 0 => HAS_PRE_1970 test returns false + # - Windows doesn't support setenv => HAS_POST_2038 test fails to compile + set(time_t_checks "-DHAS_PRE_1970=OFF" "-DHAS_POST_2038=OFF") +else() + set(BUILD_TOOLS ON) + set(time_t_checks "") +endif() + +if(VCPKG_TARGET_IS_UWP) + set(configure_opts WINDOWS_USE_MSBUILD) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + ${configure_opts} + OPTIONS + ${time_t_checks} + -DBUILD_TOOLS=${BUILD_TOOLS} + -DBUILD_CPP_TESTS=OFF + -DBUILD_JAVA=OFF + -DINSTALL_VENDORED_LIBS=OFF + -DBUILD_LIBHDFSPP=OFF + -DPROTOBUF_EXECUTABLE:FILEPATH=${PROTOBUF_EXECUTABLE} + -DSTOP_BUILD_ON_WARNING=OFF + -DENABLE_TEST=OFF + MAYBE_UNUSED_VARIABLES + ENABLE_TEST +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(GLOB TOOLS ${CURRENT_PACKAGES_DIR}/bin/orc-*) +if(TOOLS) + file(COPY ${TOOLS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/orc") + file(REMOVE ${TOOLS}) +endif() + +file(GLOB BINS "${CURRENT_PACKAGES_DIR}/bin/*") +if(NOT BINS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/orc/usage b/externals/vcpkg/ports/orc/usage new file mode 100755 index 000000000..b364b8bfe --- /dev/null +++ b/externals/vcpkg/ports/orc/usage @@ -0,0 +1,11 @@ +The package orc does not provide CMake targets: + + find_package(protobuf CONFIG REQUIRED) + find_package(ZLIB REQUIRED) + find_package(Snappy CONFIG REQUIRED) + + find_library(LZ4_LIBRARY NAMES lz4d lz4) + find_library(ZSTD_LIBRARY NAMES zstd) + find_library(ORC_LIBRARY NAMES orc) + + target_link_libraries(main PRIVATE ${ORC_LIBRARY} protobuf::libprotoc protobuf::libprotobuf Snappy::snappy ${LZ4_LIBRARY} ${ZSTD_LIBRARY} ZLIB::ZLIB) diff --git a/externals/vcpkg/ports/orc/vcpkg.json b/externals/vcpkg/ports/orc/vcpkg.json new file mode 100755 index 000000000..652aa6ca0 --- /dev/null +++ b/externals/vcpkg/ports/orc/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "orc", + "version": "1.6.4", + "port-version": 4, + "description": "The smallest, fastest columnar storage for Hadoop workloads.", + "homepage": "https://orc.apache.org/", + "dependencies": [ + "gtest", + "lz4", + "protobuf", + { + "name": "protobuf", + "host": true + }, + "snappy", + { + "name": "vcpkg-cmake", + "host": true + }, + "zlib", + "zstd" + ] +} diff --git a/externals/vcpkg/ports/orocos-kdl/export-include-dir.patch b/externals/vcpkg/ports/orocos-kdl/export-include-dir.patch new file mode 100755 index 000000000..8c75f5675 --- /dev/null +++ b/externals/vcpkg/ports/orocos-kdl/export-include-dir.patch @@ -0,0 +1,13 @@ +diff --git a/orocos_kdl/src/CMakeLists.txt b/orocos_kdl/src/CMakeLists.txt +index 079ca8a..07eff4f 100644 +--- a/orocos_kdl/src/CMakeLists.txt ++++ b/orocos_kdl/src/CMakeLists.txt +@@ -126,7 +126,7 @@ ENDIF() + #####end RPATH + + # Needed so that the generated config.h can be used +-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) ++TARGET_INCLUDE_DIRECTORIES(orocos-kdl PUBLIC $ $) + TARGET_LINK_LIBRARIES(orocos-kdl ${Boost_LIBRARIES}) + + INSTALL(TARGETS orocos-kdl diff --git a/externals/vcpkg/ports/orocos-kdl/portfile.cmake b/externals/vcpkg/ports/orocos-kdl/portfile.cmake new file mode 100755 index 000000000..6d6764f6c --- /dev/null +++ b/externals/vcpkg/ports/orocos-kdl/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO orocos/orocos_kinematics_dynamics + REF v1.4.0 + SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8 + HEAD_REF master + PATCHES export-include-dir.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/orocos_kdl + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/orocos_kdl/cmake TARGET_PATH share/orocos_kdl) + +file(READ ${CURRENT_PACKAGES_DIR}/share/orocos_kdl/orocos_kdl-config.cmake _contents) +string(REPLACE "\${CMAKE_CURRENT_LIST_DIR}/../../.." "\${CMAKE_CURRENT_LIST_DIR}/../.." _contents "${_contents}") +string(REPLACE "\${_IMPORT_PREFIX}" "\${CMAKE_CURRENT_LIST_DIR}/../.." _contents "${_contents}") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/orocos_kdl/orocos_kdl-config.cmake "${_contents}") + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share + ${CURRENT_PACKAGES_DIR}/share/doc + ${CURRENT_PACKAGES_DIR}/doc/liborocos-kdl) + +file(INSTALL ${SOURCE_PATH}/orocos_kdl/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/orocos-kdl/vcpkg.json b/externals/vcpkg/ports/orocos-kdl/vcpkg.json new file mode 100755 index 000000000..3eeca9030 --- /dev/null +++ b/externals/vcpkg/ports/orocos-kdl/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "orocos-kdl", + "version": "1.4", + "port-version": 5, + "description": "Kinematics and Dynamics Library.", + "homepage": "https://github.com/orocos/orocos_kinematics_dynamics", + "dependencies": [ + "eigen3" + ] +} diff --git a/externals/vcpkg/ports/osg-qt/CMakeLists.patch b/externals/vcpkg/ports/osg-qt/CMakeLists.patch new file mode 100755 index 000000000..0a60fb416 --- /dev/null +++ b/externals/vcpkg/ports/osg-qt/CMakeLists.patch @@ -0,0 +1,16 @@ +diff --git a/src/osgQOpenGL/CMakeLists.txt b/src/osgQOpenGL/CMakeLists.txt +--- a/src/osgQOpenGL/CMakeLists.txt ++++ b/src/osgQOpenGL/CMakeLists.txt +@@ -14,7 +14,11 @@ + ${HEADER_PATH}/OSGRenderer + ) + +- qt5_wrap_cpp(SOURCES_H_MOC ${SOURCE_H} #[[OPTIONS ${MOC_OPTIONS}]]) ++ FOREACH(HEADER_FILE ${SOURCE_H}) ++ get_filename_component(HEADER_FILE_NAME "${CMAKE_CURRENT_LIST_DIR}/${HEADER_FILE}" NAME) ++ qt5_wrap_cpp(HEADER_FILE_MOC ${HEADER_FILE} OPTIONS "-f") ++ LIST(APPEND SOURCES_H_MOC ${HEADER_FILE_MOC}) ++ ENDFOREACH() + + SET(TARGET_H + ${SOURCE_H} diff --git a/externals/vcpkg/ports/osg-qt/OsgMacroUtils.patch b/externals/vcpkg/ports/osg-qt/OsgMacroUtils.patch new file mode 100755 index 000000000..d46f1f90a --- /dev/null +++ b/externals/vcpkg/ports/osg-qt/OsgMacroUtils.patch @@ -0,0 +1,11 @@ +--- a/CMakeModules/OsgMacroUtils.cmake ++++ b/CMakeModules/OsgMacroUtils.cmake +@@ -92,7 +92,7 @@ MACRO(LINK_CORELIB_DEFAULT CORELIB_NAME) + ENDIF() + + LINK_EXTERNAL(${CORELIB_NAME} ${ALL_GL_LIBRARIES}) +- LINK_WITH_VARIABLES(${CORELIB_NAME} OPENTHREADS_LIBRARY) ++ #LINK_WITH_VARIABLES(${CORELIB_NAME} OPENTHREADS_LIBRARY) + IF(OPENSCENEGRAPH_SONAMES) + SET_TARGET_PROPERTIES(${CORELIB_NAME} PROPERTIES VERSION ${OPENSCENEGRAPH_VERSION} SOVERSION ${OPENSCENEGRAPH_SOVERSION}) + ENDIF(OPENSCENEGRAPH_SONAMES) diff --git a/externals/vcpkg/ports/osg-qt/fix-static-install.patch b/externals/vcpkg/ports/osg-qt/fix-static-install.patch new file mode 100755 index 000000000..4b2597c92 --- /dev/null +++ b/externals/vcpkg/ports/osg-qt/fix-static-install.patch @@ -0,0 +1,57 @@ +diff --git a/CMakeModules/ModuleInstall.cmake b/CMakeModules/ModuleInstall.cmake +index eb26ba2..14b8bca 100644 +--- a/CMakeModules/ModuleInstall.cmake ++++ b/CMakeModules/ModuleInstall.cmake +@@ -40,10 +40,10 @@ + ARCHIVE DESTINATION ${INSTALL_ARCHIVEDIR} COMPONENT libopenscenegraph-dev + ) + +-IF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release") ++IF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release" AND DYNAMIC_OPENSCENEGRAPH) + GET_TARGET_PROPERTY(PREFIX ${LIB_NAME} PREFIX) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PREFIX}${LIB_NAME}${CMAKE_BUILD_POSTFIX}.pdb DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph) +-ENDIF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release") ++ENDIF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release" AND DYNAMIC_OPENSCENEGRAPH) + + IF(NOT OSG_COMPILE_FRAMEWORKS) + INSTALL ( +diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake +index 5688f8f..329f862 100644 +--- a/CMakeModules/OsgMacroUtils.cmake ++++ b/CMakeModules/OsgMacroUtils.cmake +@@ -333,9 +333,9 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME) + RUNTIME DESTINATION bin COMPONENT ${PACKAGE_COMPONENT} + ARCHIVE DESTINATION lib/${OSG_PLUGINS} COMPONENT libopenscenegraph-dev + LIBRARY DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT}) +- IF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release") ++ IF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release" AND DYNAMIC_OPENSCENEGRAPH) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_BUILD_POSTFIX}.pdb DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT}) +- ENDIF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release") ++ ENDIF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release" AND DYNAMIC_OPENSCENEGRAPH) + ELSE(WIN32) + INSTALL(TARGETS ${TARGET_TARGETNAME} + RUNTIME DESTINATION bin COMPONENT ${PACKAGE_COMPONENT} +@@ -436,9 +436,9 @@ MACRO(SETUP_APPLICATION APPLICATION_NAME) + INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin BUNDLE DESTINATION bin) + ELSE(APPLE) + INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph ) +- IF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release") ++ IF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release" AND DYNAMIC_OPENSCENEGRAPH) + INSTALL(FILES ${CMAKE_BINARY_DIR}/bin/${TARGET_NAME}${CMAKE_BUILD_POSTFIX}.pdb DESTINATION bin COMPONENT openscenegraph) +- ENDIF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release") ++ ENDIF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release" AND DYNAMIC_OPENSCENEGRAPH) + ENDIF(APPLE) + + ENDMACRO(SETUP_APPLICATION) +@@ -468,9 +468,9 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME) + INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin ) + ELSE(APPLE) + INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples ) +- IF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release") ++ IF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release" AND DYNAMIC_OPENSCENEGRAPH) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_BUILD_POSTFIX}.pdb DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples) +- ENDIF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release") ++ ENDIF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release" AND DYNAMIC_OPENSCENEGRAPH) + ENDIF(APPLE) + + ENDMACRO(SETUP_EXAMPLE) diff --git a/externals/vcpkg/ports/osg-qt/portfile.cmake b/externals/vcpkg/ports/osg-qt/portfile.cmake new file mode 100755 index 000000000..c760ed7d8 --- /dev/null +++ b/externals/vcpkg/ports/osg-qt/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO openscenegraph/osgQt + REF 2cb70673a4e83a618290e7ee66d52402a94ec3f6 + SHA512 29aeb5b31e70d5b12e69de7970b36ab7d1541c984873384a46c6468394e8562688c46ef39179820990817c94f283c7836c2c6ff207eefe385086d850ba3f8306 + HEAD_REF master + PATCHES + OsgMacroUtils.patch + fix-static-install.patch + CMakeLists.patch + use-lib.patch +) + +if(VCPKG_TARGET_IS_OSX) + string(APPEND VCPKG_CXX_FLAGS " -stdlib=libc++") + string(APPEND VCPKG_C_FLAGS "") # both must be set +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(OPTIONS -DDYNAMIC_OPENSCENEGRAPH=ON) +else() + set(OPTIONS -DDYNAMIC_OPENSCENEGRAPH=OFF) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${OPTIONS} + -DBUILD_OSG_EXAMPLES=OFF + -DOSG_BUILD_APPLICATION_BUNDLES=OFF +) + +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/osg-qt/use-lib.patch b/externals/vcpkg/ports/osg-qt/use-lib.patch new file mode 100755 index 000000000..a194c1d71 --- /dev/null +++ b/externals/vcpkg/ports/osg-qt/use-lib.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 66e989a..3569cec 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -467,7 +467,7 @@ ENDIF() + + IF(UNIX AND NOT WIN32 AND NOT APPLE) + IF(CMAKE_SIZEOF_VOID_P MATCHES "8") +- SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement") ++ SET(LIB_POSTFIX "" CACHE STRING "suffix for 32/64 dir placement") + MARK_AS_ADVANCED(LIB_POSTFIX) + ENDIF() + ENDIF() diff --git a/externals/vcpkg/ports/osg-qt/vcpkg.json b/externals/vcpkg/ports/osg-qt/vcpkg.json new file mode 100755 index 000000000..29d55fa16 --- /dev/null +++ b/externals/vcpkg/ports/osg-qt/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "osg-qt", + "version-string": "Qt5", + "port-version": 3, + "description": "osgQt - Qt project for making use of OpenSceneGraph(OSG)", + "dependencies": [ + "osg", + { + "name": "qt5-base", + "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/osg/collada.patch b/externals/vcpkg/ports/osg/collada.patch new file mode 100755 index 000000000..80b260618 --- /dev/null +++ b/externals/vcpkg/ports/osg/collada.patch @@ -0,0 +1,126 @@ +diff --git a/CMakeModules/FindCOLLADA.cmake b/CMakeModules/FindCOLLADA.cmake +index 7c7d290..5b456d7 100644 +--- a/CMakeModules/FindCOLLADA.cmake ++++ b/CMakeModules/FindCOLLADA.cmake +@@ -29,10 +29,7 @@ IF(APPLE) + ELSEIF(MINGW) + SET(COLLADA_BUILDNAME "mingw") + SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME}) +-ELSEIF((MSVC_VERSION GREATER 1910) OR (MSVC_VERSION EQUAL 1910)) +- SET(COLLADA_BUILDNAME "vc14") +- SET(COLLADA_BOOST_BUILDNAME "vc141") +-ELSEIF(MSVC_VERSION EQUAL 1900) ++ELSEIF(MSVC_VERSION GREATER_EQUAL 1900) + SET(COLLADA_BUILDNAME "vc14") + SET(COLLADA_BOOST_BUILDNAME "vc140") + ELSEIF(MSVC_VERSION EQUAL 1800) +@@ -61,6 +58,7 @@ ENDIF() + + + FIND_PATH(COLLADA_INCLUDE_DIR dae.h ++ PATHS + ${COLLADA_DOM_ROOT}/include + $ENV{COLLADA_DIR}/include + $ENV{COLLADA_DIR} +@@ -68,27 +66,19 @@ FIND_PATH(COLLADA_INCLUDE_DIR dae.h + /Library/Frameworks + /opt/local/Library/Frameworks #macports + /usr/local/include +- /usr/local/include/colladadom +- /usr/local/include/collada-dom +- /usr/local/include/collada-dom2.5 +- /usr/local/include/collada-dom2.4 +- /usr/local/include/collada-dom2.2 +- /opt/local/include/collada-dom +- /opt/local/include/collada-dom2.5 +- /opt/local/include/collada-dom2.4 +- /opt/local/include/collada-dom2.2 + /usr/include/ +- /usr/include/colladadom +- /usr/include/collada-dom +- /usr/include/collada-dom2.5 +- /usr/include/collada-dom2.4 +- /usr/include/collada-dom2.2 + /sw/include # Fink + /opt/local/include # DarwinPorts + /opt/csw/include # Blastwave + /opt/include + /usr/freeware/include + ${ACTUAL_3DPARTY_DIR}/include ++ PATH_SUFFIXES ++ colladadom ++ collada-dom ++ collada-dom2.5 ++ collada-dom2.4 ++ collada-dom2.2 + ) + + FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY +@@ -116,7 +106,7 @@ FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY + ) + + FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY_DEBUG +- NAMES collada_dom-d collada14dom-d Collada14Dom-d libcollada14dom21-d libcollada14dom22-d collada-dom2.5-dp-d collada-dom2.5-dp-${COLLADA_BOOST_BUILDNAME}-mt-d collada-dom2.4-dp-d collada-dom2.4-dp-${COLLADA_BOOST_BUILDNAME}-mt-d ++ NAMES collada_dom-d collada14dom-d Collada14Dom-d libcollada14dom21-d libcollada14dom22-d collada-dom2.5-dp-d collada-dom2.5-dp-${COLLADA_BOOST_BUILDNAME}-mt-d collada-dom2.4-dp-d collada-dom2.4-dp-${COLLADA_BOOST_BUILDNAME}-mt-d collada-dom2.5-dp-${COLLADA_BOOST_BUILDNAME}-mt + PATHS + ${COLLADA_DOM_ROOT}/build/${COLLADA_BUILDNAME}-1.4-d + ${COLLADA_DOM_ROOT} +@@ -279,7 +269,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG + ) + + FIND_LIBRARY(COLLADA_BOOST_FILESYSTEM_LIBRARY +- NAMES libboost_filesystem boost_filesystem boost_filesystem-mt libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_54 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_55 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_58 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_62 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_63 ++ NAMES libboost_filesystem boost_filesystem boost_filesystem-mt libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_54 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_55 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_58 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_62 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_63 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt + PATHS + ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME} + ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw +@@ -287,7 +277,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG + ) + + FIND_LIBRARY(COLLADA_BOOST_FILESYSTEM_LIBRARY_DEBUG +- NAMES libboost_filesystem-d boost_filesystem-d boost_filesystem-mt-d libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_54 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_55 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_58 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_62 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_63 ++ NAMES libboost_filesystem-d boost_filesystem-d boost_filesystem-mt-d libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_54 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_55 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_58 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_62 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_63 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd + PATHS + ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME} + ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw +@@ -295,7 +285,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG + ) + + FIND_LIBRARY(COLLADA_BOOST_SYSTEM_LIBRARY +- NAMES libboost_system boost_system boost_system-mt libboost_system-${COLLADA_BOOST_BUILDNAME}-mt libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_54 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_55 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_58 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_62 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_63 ++ NAMES libboost_system boost_system boost_system-mt libboost_system-${COLLADA_BOOST_BUILDNAME}-mt libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_54 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_55 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_58 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_62 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_63 boost_system-${COLLADA_BOOST_BUILDNAME}-mt + PATHS + ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME} + ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw +@@ -303,7 +293,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG + ) + + FIND_LIBRARY(COLLADA_BOOST_SYSTEM_LIBRARY_DEBUG +- NAMES libboost_system-d boost_system-d boost_system-mt-d libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_54 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_55 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_58 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_62 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_63 ++ NAMES libboost_system-d boost_system-d boost_system-mt-d libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_54 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_55 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_58 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_62 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_63 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd + PATHS + ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME} + ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw +@@ -329,5 +319,3 @@ IF(COLLADA_DYNAMIC_LIBRARY OR COLLADA_STATIC_LIBRARY) + + ENDIF() + ENDIF() +- +- + +diff --git a/src/osgPlugins/dae/CMakeLists.txt b/src/osgPlugins/dae/CMakeLists.txt +index af03fb866..7eadfc2f3 100644 +--- a/src/osgPlugins/dae/CMakeLists.txt ++++ b/src/osgPlugins/dae/CMakeLists.txt +@@ -49,7 +49,9 @@ ELSE() + ENDIF() + + ADD_DEFINITIONS(-DNO_BOOST) +-ADD_DEFINITIONS(-DCOLLADA_DOM_SUPPORT141) ++ADD_DEFINITIONS(-DCOLLADA_DOM_USING_141 ++ -DCOLLADA_DOM_SUPPORT141 ++ -DCOLLADA_DOM_SUPPORT150) + + IF (COLLADA_DOM_2_4_OR_LATER) + ADD_DEFINITIONS(-DCOLLADA_DOM_2_4_OR_LATER) + diff --git a/externals/vcpkg/ports/osg/disable-present3d-staticview-in-linux.patch b/externals/vcpkg/ports/osg/disable-present3d-staticview-in-linux.patch new file mode 100755 index 000000000..fd76db35b --- /dev/null +++ b/externals/vcpkg/ports/osg/disable-present3d-staticview-in-linux.patch @@ -0,0 +1,36 @@ +diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt +index ab491c6..bee3d1f 100644 +--- a/applications/CMakeLists.txt ++++ b/applications/CMakeLists.txt +@@ -32,12 +32,16 @@ IF(DYNAMIC_OPENSCENEGRAPH) + ADD_SUBDIRECTORY(osgconv) + ADD_SUBDIRECTORY(osgfilecache) + ADD_SUBDIRECTORY(osgversion) +- ADD_SUBDIRECTORY(present3D) ++ if (NOT UNIX) ++ ADD_SUBDIRECTORY(present3D) ++ endif() + ELSE() + # need to define this on win32 or linker cries about _declspecs + ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC) + + ADD_SUBDIRECTORY(osgversion) +- ADD_SUBDIRECTORY(present3D) ++ if (NOT UNIX) ++ ADD_SUBDIRECTORY(present3D) ++ endif() + ENDIF() + +diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt +index 788e507..3c550bc 100644 +--- a/examples/CMakeLists.txt ++++ b/examples/CMakeLists.txt +@@ -245,7 +245,7 @@ ELSE(DYNAMIC_OPENSCENEGRAPH) + + IF(OSG_BUILD_PLATFORM_IPHONE) + ADD_SUBDIRECTORY(osgviewerIPhone) +- ELSE() ++ ELSEIF (NOT UNIX) + ADD_SUBDIRECTORY(osgstaticviewer) + ENDIF() + diff --git a/externals/vcpkg/ports/osg/fix-curl.patch b/externals/vcpkg/ports/osg/fix-curl.patch new file mode 100755 index 000000000..e95fbee5d --- /dev/null +++ b/externals/vcpkg/ports/osg/fix-curl.patch @@ -0,0 +1,18 @@ +diff --git a/src/osgPlugins/curl/CMakeLists.txt b/src/osgPlugins/curl/CMakeLists.txt +index cc459ff..370dbec 100644 +--- a/src/osgPlugins/curl/CMakeLists.txt ++++ b/src/osgPlugins/curl/CMakeLists.txt +@@ -23,11 +23,11 @@ SET(TARGET_H + + IF(ZLIB_FOUND) + SET(TARGET_LIBRARIES_VARS +- CURL_LIBRARY ++ CURL_LIBRARIES + ZLIB_LIBRARIES) + ELSE() + SET(TARGET_LIBRARIES_VARS +- CURL_LIBRARY) ++ CURL_LIBRARIES) + ENDIF() + + IF(WIN32 OR MINGW) diff --git a/externals/vcpkg/ports/osg/fix-dependency-coin.patch b/externals/vcpkg/ports/osg/fix-dependency-coin.patch new file mode 100755 index 000000000..b04318683 --- /dev/null +++ b/externals/vcpkg/ports/osg/fix-dependency-coin.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 798b8b9..c975d78 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -740,7 +740,7 @@ ELSE() + # Common to all platforms except android: + FIND_PACKAGE(Freetype) + FIND_PACKAGE(ilmbase) +- FIND_PACKAGE(Inventor) ++ FIND_PACKAGE(coin CONFIG) + FIND_PACKAGE(Jasper) + FIND_PACKAGE(OpenEXR) + FIND_PACKAGE(OpenCascade) +diff --git a/src/osgPlugins/Inventor/CMakeLists.txt b/src/osgPlugins/Inventor/CMakeLists.txt +index 963a494..e34b6b8 100644 +--- a/src/osgPlugins/Inventor/CMakeLists.txt ++++ b/src/osgPlugins/Inventor/CMakeLists.txt +@@ -17,10 +17,6 @@ SET(TARGET_HDRS + ShuttleCallback.h + ) + +-ADD_DEFINITIONS(-DCOIN_DLL) +- +-INCLUDE_DIRECTORIES(${INVENTOR_INCLUDE_DIR}) +- +-SET(TARGET_ADDED_LIBRARIES ${INVENTOR_LIBRARY}) ++SET(TARGET_ADDED_LIBRARIES Coin::Coin) + + SETUP_PLUGIN(iv iv) diff --git a/externals/vcpkg/ports/osg/fix-example-application.patch b/externals/vcpkg/ports/osg/fix-example-application.patch new file mode 100755 index 000000000..ebef27fd4 --- /dev/null +++ b/externals/vcpkg/ports/osg/fix-example-application.patch @@ -0,0 +1,34 @@ +diff --git a/applications/present3D/CMakeLists.txt b/applications/present3D/CMakeLists.txt +index df859d0..123313a 100644 +--- a/applications/present3D/CMakeLists.txt ++++ b/applications/present3D/CMakeLists.txt +@@ -103,6 +103,11 @@ ENDIF() + IF (WIN32) + # to support cluster code + SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ws2_32) ++ ++ find_package(EXPAT REQUIRED) ++ find_package(Iconv REQUIRED) ++ ++ list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv) + ELSE() + CHECK_LIBRARY_EXISTS("nsl" "gethostbyname" "" LIB_NSL_HAS_GETHOSTBYNAME) + IF(LIB_NSL_HAS_GETHOSTBYNAME) +diff --git a/examples/osgstaticviewer/CMakeLists.txt b/examples/osgstaticviewer/CMakeLists.txt +index 071ab26..bf8d85f 100644 +--- a/examples/osgstaticviewer/CMakeLists.txt ++++ b/examples/osgstaticviewer/CMakeLists.txt +@@ -19,6 +19,13 @@ IF(FREETYPE_FOUND) + SET(TARGET_ADDED_LIBRARIES ${TARGET_ADDED_LIBRARIES} osgdb_freetype) + ENDIF(FREETYPE_FOUND) + ++IF (WIN32) ++ find_package(EXPAT REQUIRED) ++ find_package(Iconv REQUIRED) ++ ++ list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv) ++ENDIF() ++ + SET(TARGET_SRC osgstaticviewer.cpp ) + #### end var setup ### + SETUP_EXAMPLE(osgstaticviewer) diff --git a/externals/vcpkg/ports/osg/fix-liblas.patch b/externals/vcpkg/ports/osg/fix-liblas.patch new file mode 100755 index 000000000..c36396e97 --- /dev/null +++ b/externals/vcpkg/ports/osg/fix-liblas.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b84fa06..a991670 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -765,7 +765,10 @@ ELSE() + ENDIF() + FIND_PACKAGE(ZeroConf) + +- FIND_PACKAGE(LIBLAS) ++ FIND_PACKAGE(liblas CONFIG) ++ set(LIBLAS_FOUND ${liblas_FOUND}) ++ set(LIBLAS_LIBRARY liblas) ++ set(LIBLASC_LIBRARY liblas_c) + + IF (NOT(OSG_USE_LOCAL_LUA_SOURCE)) + FIND_PACKAGE(Lua52) diff --git a/externals/vcpkg/ports/osg/fix-nvtt.patch b/externals/vcpkg/ports/osg/fix-nvtt.patch new file mode 100755 index 000000000..3cc1c4d58 --- /dev/null +++ b/externals/vcpkg/ports/osg/fix-nvtt.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a991670..5b530c5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -759,7 +759,9 @@ ELSE() + FIND_PACKAGE(RSVG) + FIND_PACKAGE(GtkGl) + FIND_PACKAGE(DirectInput) ++ if (ENABLE_NVTT) + FIND_PACKAGE(NVTT) ++ endif() + IF (NOT WIN32) + FIND_PACKAGE(Asio) + ENDIF() diff --git a/externals/vcpkg/ports/osg/fix-sdl.patch b/externals/vcpkg/ports/osg/fix-sdl.patch new file mode 100755 index 000000000..e97d86476 --- /dev/null +++ b/externals/vcpkg/ports/osg/fix-sdl.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 81328ea..c735419 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -755,8 +755,6 @@ ELSE() + FIND_PACKAGE(GStreamer COMPONENTS app pbutils) + FIND_PACKAGE(GLIB COMPONENTS gobject) + FIND_PACKAGE(DirectShow) +- FIND_PACKAGE(SDL2) +- FIND_PACKAGE(SDL) + FIND_PACKAGE(Poppler-glib) + FIND_PACKAGE(RSVG) + FIND_PACKAGE(GtkGl) +@@ -775,6 +773,10 @@ ELSE() + FIND_PACKAGE(Lua51) + ENDIF() + ENDIF() ++ ++ find_package(SDL) ++ find_package(SDL2 CONFIG) ++ set(SDL2_LIBRARY SDL2::SDL2 SDL2::SDL2main) + + # V8 and Python plugins are tests for linking against these libraries but aren't functionality beyond this. + # FIND_PACKAGE(V8) +diff --git a/examples/osgmovie/osgmovie.cpp b/examples/osgmovie/osgmovie.cpp +index 9de15b1..ae96e11 100644 +--- a/examples/osgmovie/osgmovie.cpp ++++ b/examples/osgmovie/osgmovie.cpp +@@ -691,7 +691,7 @@ int main(int argc, char** argv) + + #if USE_SDL || USE_SDL2 + +-#include "SDL.h" ++#include + + static void soundReadCallback(void * user_data, uint8_t * data, int datalen) + { diff --git a/externals/vcpkg/ports/osg/osgdb_zip_nozip.patch b/externals/vcpkg/ports/osg/osgdb_zip_nozip.patch new file mode 100755 index 000000000..a16deca97 --- /dev/null +++ b/externals/vcpkg/ports/osg/osgdb_zip_nozip.patch @@ -0,0 +1,52 @@ +From bee432e701c541f9a86bd051b795c3e056e36646 Mon Sep 17 00:00:00 2001 +From: Ankur Verma +Date: Sun, 16 Aug 2020 14:36:31 -0700 +Subject: [PATCH] osg + +--- + src/osgPlugins/zip/unzip.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/osgPlugins/zip/unzip.cpp b/src/osgPlugins/zip/unzip.cpp +index 0bec28f0c..74e7b2413 100644 +--- a/src/osgPlugins/zip/unzip.cpp ++++ b/src/osgPlugins/zip/unzip.cpp +@@ -1742,8 +1742,8 @@ int inflate_blocks_free(inflate_blocks_statef *s, z_streamp z) + + + +-extern const char inflate_copyright[] = +- " inflate 1.1.3 Copyright 1995-1998 Mark Adler "; ++//extern const char inflate_copyright[] = ++// " inflate 1.1.3 Copyright 1995-1998 Mark Adler "; + // If you use the zlib library in a product, an acknowledgment is welcome + // in the documentation of your product. If for some reason you cannot + // include such an acknowledgment, I would appreciate that you keep this +-- +2.26.2 + +From 24d4036036884b350bd6c519b64626faa2c7e660 Mon Sep 17 00:00:00 2001 +From: Ankur Verma +Date: Thu, 20 Aug 2020 23:16:12 -0700 +Subject: [PATCH] Symbol clashes + +--- + src/osgPlugins/zip/unzip.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/osgPlugins/zip/unzip.cpp b/src/osgPlugins/zip/unzip.cpp +index 74e7b2413..f5169c6f4 100644 +--- a/src/osgPlugins/zip/unzip.cpp ++++ b/src/osgPlugins/zip/unzip.cpp +@@ -213,7 +213,7 @@ DWORD GetFilePosU(HANDLE hfout) + return ftell(hfout); + } + +-bool FileExists(const TCHAR *fn) ++static bool FileExists(const TCHAR *fn) + { struct stat st; + int res=stat(fn,&st); + return (res==0); +-- +2.26.2 + diff --git a/externals/vcpkg/ports/osg/portfile.cmake b/externals/vcpkg/ports/osg/portfile.cmake new file mode 100755 index 000000000..d4cd4aaa5 --- /dev/null +++ b/externals/vcpkg/ports/osg/portfile.cmake @@ -0,0 +1,173 @@ +set(OSG_VER 3.6.5) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO openscenegraph/OpenSceneGraph + REF OpenSceneGraph-${OSG_VER} + SHA512 7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b + HEAD_REF master + PATCHES + collada.patch + static.patch + fix-sdl.patch + fix-example-application.patch + disable-present3d-staticview-in-linux.patch #Due to some link error we cannot solve yet, disable them in linux. + fix-curl.patch + remove-prefix.patch # Remove this patch when cmake fix Findosg_functions.cmake + fix-liblas.patch + fix-nvtt.patch + use-boost-asio.patch + fix-dependency-coin.patch + osgdb_zip_nozip.patch # This is fix symbol clashes with other libs when built in static-lib mode +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(OSG_DYNAMIC OFF) +else() + set(OSG_DYNAMIC ON) +endif() + +file(REMOVE ${SOURCE_PATH}/CMakeModules/FindSDL2.cmake) + +set(OSG_USE_UTF8_FILENAME ON) +if (NOT VCPKG_TARGET_IS_WINDOWS) + message("Build osg requires gcc with version higher than 4.7.") + # Enable OSG_USE_UTF8_FILENAME will call some windows-only functions. + set(OSG_USE_UTF8_FILENAME OFF) +endif() + +set(OPTIONS) +if(NOT "collada" IN_LIST FEATURES) + list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_COLLADA=ON) +endif() +list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_FFmpeg=ON) +list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_DCMTK=ON) +list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GStreamer=ON) +list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GLIB=ON) +list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_SDL=ON) +list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_LIBLAS=ON) + +# Due to nvtt CRT linkage error, we can only enable static builds here +set(ENABLE_NVTT ON) +if (VCPKG_TARGET_IS_WINDOWS AND OSG_DYNAMIC) + set(ENABLE_NVTT OFF) +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 + plugins BUILD_OSG_PLUGINS + packages BUILD_OSG_PACKAGES + docs BUILD_DOCUMENTATION + docs BUILD_REF_DOCS_SEARCHENGINE + docs BUILD_REF_DOCS_TAGFILE +) + +set(BUILD_OSG_PLUGIN_RESTHTTPDEVICE ON) +if(VCPKG_TARGET_IS_WINDOWS) + set(BUILD_OSG_PLUGIN_RESTHTTPDEVICE OFF) +endif() + +# The package osg can be configured to use different OpenGL profiles via a custom triplet file: +# Possible values are GLCORE, GL2, GL3, GLES1, GLES2, GLES3, and GLES2+GLES3 +if(NOT DEFINED osg_OPENGL_PROFILE) + set(osg_OPENGL_PROFILE "GL3") +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS ${FEATURE_OPTIONS} + -DOSG_USE_UTF8_FILENAME=${OSG_USE_UTF8_FILENAME} + -DDYNAMIC_OPENSCENEGRAPH=${OSG_DYNAMIC} + -DDYNAMIC_OPENTHREADS=${OSG_DYNAMIC} + -DBUILD_OSG_PLUGIN_DICOM=OFF + -DBUILD_OSG_PLUGIN_OPENCASCADE=OFF + -DBUILD_OSG_PLUGIN_INVENTOR=OFF + -DBUILD_OSG_PLUGIN_FBX=OFF + -DBUILD_OSG_PLUGIN_DIRECTSHOW=OFF + -DBUILD_OSG_PLUGIN_QTKIT=OFF + -DBUILD_OSG_PLUGIN_SVG=OFF + -DBUILD_OSG_PLUGIN_VNC=OFF + -DBUILD_OSG_PLUGIN_LUA=OFF + -DOPENGL_PROFILE=${osg_OPENGL_PROFILE} + -DBUILD_OSG_PLUGIN_RESTHTTPDEVICE=${BUILD_OSG_PLUGIN_RESTHTTPDEVICE} + -DBUILD_OSG_PLUGIN_ZEROCONFDEVICE=OFF + -DBUILD_DASHBOARD_REPORTS=OFF + -DCMAKE_CXX_STANDARD=11 + ${OPTIONS} +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +# handle osg tools and plugins +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +set(OSG_TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + +file(GLOB OSG_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}) +if (OSG_TOOLS) + file(MAKE_DIRECTORY ${OSG_TOOL_PATH}) + file(COPY ${OSG_TOOLS} DESTINATION ${OSG_TOOL_PATH}) + file(REMOVE_RECURSE ${OSG_TOOLS}) + file(GLOB OSG_TOOLS_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}) + file(REMOVE_RECURSE ${OSG_TOOLS_DBG}) +endif() +file(GLOB OSG_TOOLS ${CURRENT_PACKAGES_DIR}/share/OpenSceneGraph/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}) +if (OSG_TOOLS) + file(COPY ${OSG_TOOLS} DESTINATION ${OSG_TOOL_PATH}) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/OpenSceneGraph) +endif() + + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(GLOB OSG_PLUGINS_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-${OSG_VER}/*) + if (OSG_PLUGINS_DBG) + file(COPY ${OSG_PLUGINS_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}/osgPlugins-${OSG_VER}) + endif() + file(GLOB OSG_PLUGINS_REL ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-${OSG_VER}/*) + if (OSG_PLUGINS_REL) + if (NOT EXISTS ${OSG_TOOL_PATH}) + file(MAKE_DIRECTORY ${OSG_TOOL_PATH}) + endif() + file(COPY ${OSG_PLUGINS_REL} DESTINATION ${OSG_TOOL_PATH}/osgPlugins-${OSG_VER}) + endif() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-${OSG_VER}/ ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-${OSG_VER}/) +endif() + +file(GLOB OSG_PLUGINS_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-${OSG_VER}/*) +if (OSG_PLUGINS_DBG) + file(COPY ${OSG_PLUGINS_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}/osgPlugins-${OSG_VER}) +endif() + +file(GLOB OSG_PLUGINS_REL ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-${OSG_VER}/*) +if (OSG_PLUGINS_REL) + if (NOT EXISTS ${OSG_TOOL_PATH}) + file(MAKE_DIRECTORY ${OSG_TOOL_PATH}) + endif() + file(COPY ${OSG_PLUGINS_REL} DESTINATION ${OSG_TOOL_PATH}/osgPlugins-${OSG_VER}) +endif() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-${OSG_VER}/ ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-${OSG_VER}/) + +#Cleanup +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-${OSG_VER}/) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() + +# Handle usage +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/osg/remove-prefix.patch b/externals/vcpkg/ports/osg/remove-prefix.patch new file mode 100755 index 000000000..ced94522c --- /dev/null +++ b/externals/vcpkg/ports/osg/remove-prefix.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeModules/ModuleInstall.cmake b/CMakeModules/ModuleInstall.cmake +index bb3be63..356edcd 100644 +--- a/CMakeModules/ModuleInstall.cmake ++++ b/CMakeModules/ModuleInstall.cmake +@@ -21,7 +21,7 @@ SOURCE_GROUP( + FILES ${TARGET_H} + ) + +-IF(MSVC AND OSG_MSVC_VERSIONED_DLL) ++IF(0) + HANDLE_MSVC_DLL() + ENDIF() + +diff --git a/src/OpenThreads/win32/CMakeLists.txt b/src/OpenThreads/win32/CMakeLists.txt +index 84550bd..0e816f7 100644 +--- a/src/OpenThreads/win32/CMakeLists.txt ++++ b/src/OpenThreads/win32/CMakeLists.txt +@@ -39,7 +39,7 @@ LINK_DIRECTORIES( + ${CMAKE_CURRENT_BINARY_DIR} + ) + +-IF(MSVC AND OSG_MSVC_VERSIONED_DLL) ++IF(0) + HANDLE_MSVC_DLL(ot ${OPENTHREADS_SOVERSION}) + ENDIF() + diff --git a/externals/vcpkg/ports/osg/static.patch b/externals/vcpkg/ports/osg/static.patch new file mode 100755 index 000000000..c7278d282 --- /dev/null +++ b/externals/vcpkg/ports/osg/static.patch @@ -0,0 +1,7 @@ +--- a/src/osgPlugins/curl/CMakeLists.txt ++++ b/src/osgPlugins/curl/CMakeLists.txt +@@ -35,3 +35,3 @@ + ADD_DEFINITIONS(-DCURL_STATICLIB) +- SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ws2_32 winmm wldap32) ++ SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ws2_32 winmm wldap32 crypt32) + ENDIF() diff --git a/externals/vcpkg/ports/osg/usage b/externals/vcpkg/ports/osg/usage new file mode 100755 index 000000000..51e9c25a5 --- /dev/null +++ b/externals/vcpkg/ports/osg/usage @@ -0,0 +1,4 @@ +The package osg can be configured to use different OpenGL profiles via a custom triplet file. +Possible values are GLCORE, GL2, GL3, GLES1, GLES2, GLES3 and GLES2+GLES3. +The default value is GL3. +set(osg_OPENGL_PROFILE GL2) diff --git a/externals/vcpkg/ports/osg/use-boost-asio.patch b/externals/vcpkg/ports/osg/use-boost-asio.patch new file mode 100755 index 000000000..4d804973c --- /dev/null +++ b/externals/vcpkg/ports/osg/use-boost-asio.patch @@ -0,0 +1,92 @@ +diff --git a/CMakeModules/FindAsio.cmake b/CMakeModules/FindAsio.cmake +index 433d5c7..04a0edf 100644 +--- a/CMakeModules/FindAsio.cmake ++++ b/CMakeModules/FindAsio.cmake +@@ -1,22 +1,7 @@ + # Locate ASIO-headers (http://think-async.com/Asio) +-# This module defines +-# ASIO_FOUND, if false, do not try to link to gdal +-# ASIO_INCLUDE_DIR, where to find the headers +-# + # Created by Stephan Maximilian Huber + +-FIND_PATH(ASIO_INCLUDE_DIR +- NAMES +- asio.hpp +- PATHS +- /usr/include +- /usr/local/include +-) +- +-SET(ASIO_FOUND "NO") +-IF(ASIO_INCLUDE_DIR) +- FIND_PACKAGE( Boost 1.37 ) +- IF(Boost_FOUND) +- SET(ASIO_FOUND "YES") +- ENDIF() ++FIND_PACKAGE( Boost 1.37 COMPONENTS asio ) ++IF(Boost_FOUND) ++ SET(ASIO_FOUND "YES") + ENDIF() +diff --git a/src/osgPlugins/RestHttpDevice/CMakeLists.txt b/src/osgPlugins/RestHttpDevice/CMakeLists.txt +index 8464b9d..073e8ed 100644 +--- a/src/osgPlugins/RestHttpDevice/CMakeLists.txt ++++ b/src/osgPlugins/RestHttpDevice/CMakeLists.txt +@@ -1,5 +1,4 @@ + INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) +-INCLUDE_DIRECTORIES(${ASIO_INCLUDE_DIR}) + + SET(TARGET_SRC + connection.cpp +diff --git a/src/osgPlugins/RestHttpDevice/connection.hpp b/src/osgPlugins/RestHttpDevice/connection.hpp +index 99f3a93..b205759 100644 +--- a/src/osgPlugins/RestHttpDevice/connection.hpp ++++ b/src/osgPlugins/RestHttpDevice/connection.hpp +@@ -11,7 +11,7 @@ + #ifndef HTTP_SERVER_CONNECTION_HPP + #define HTTP_SERVER_CONNECTION_HPP + +-#include ++#include + #include + #include + #include +diff --git a/src/osgPlugins/RestHttpDevice/io_service_pool.hpp b/src/osgPlugins/RestHttpDevice/io_service_pool.hpp +index 1d363a8..b6e7195 100644 +--- a/src/osgPlugins/RestHttpDevice/io_service_pool.hpp ++++ b/src/osgPlugins/RestHttpDevice/io_service_pool.hpp +@@ -11,7 +11,7 @@ + #ifndef HTTP_SERVER_IO_SERVICE_POOL_HPP + #define HTTP_SERVER_IO_SERVICE_POOL_HPP + +-#include ++#include + #include + #include + #include +diff --git a/src/osgPlugins/RestHttpDevice/reply.hpp b/src/osgPlugins/RestHttpDevice/reply.hpp +index 89f264a..b63d0b9 100644 +--- a/src/osgPlugins/RestHttpDevice/reply.hpp ++++ b/src/osgPlugins/RestHttpDevice/reply.hpp +@@ -13,7 +13,7 @@ + + #include + #include +-#include ++#include + #include "header.hpp" + + namespace http { +diff --git a/src/osgPlugins/RestHttpDevice/server.hpp b/src/osgPlugins/RestHttpDevice/server.hpp +index a14f263..91c4b62 100644 +--- a/src/osgPlugins/RestHttpDevice/server.hpp ++++ b/src/osgPlugins/RestHttpDevice/server.hpp +@@ -11,7 +11,7 @@ + #ifndef HTTP_SERVER_SERVER_HPP + #define HTTP_SERVER_SERVER_HPP + +-#include ++#include + #include + #include + #include diff --git a/externals/vcpkg/ports/osg/vcpkg.json b/externals/vcpkg/ports/osg/vcpkg.json new file mode 100755 index 000000000..1a939cdd3 --- /dev/null +++ b/externals/vcpkg/ports/osg/vcpkg.json @@ -0,0 +1,125 @@ +{ + "name": "osg", + "version": "3.6.5", + "port-version": 12, + "description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.", + "homepage": "https://github.com/openscenegraph/OpenSceneGraph", + "dependencies": [ + { + "name": "expat", + "platform": "windows" + }, + { + "name": "fontconfig", + "platform": "!windows" + }, + "opengl-registry", + { + "name": "openimageio", + "platform": "osx" + }, + "zlib" + ], + "features": { + "collada": { + "description": "Support for Collada (.dae) files", + "dependencies": [ + "collada-dom" + ] + }, + "docs": { + "description": "Build OpenSceneGraph reference documentation using doxygen (use: make doc_openscenegraph doc_openthreads" + }, + "examples": { + "description": "Enable to build OSG Examples", + "dependencies": [ + "freetype", + { + "name": "libiconv", + "platform": "windows" + }, + "sdl1", + "sdl2" + ] + }, + "packages": { + "description": "Set to ON to generate CPack configuration files and packaging targets" + }, + "plugins": { + "description": "Build OSG Plugins - Disable for compile testing examples on a time limit", + "dependencies": [ + { + "name": "boost-asio", + "platform": "!windows" + }, + { + "name": "boost-bind", + "platform": "!windows" + }, + { + "name": "boost-core", + "platform": "!windows" + }, + { + "name": "boost-lexical-cast", + "platform": "!windows" + }, + { + "name": "boost-logic", + "platform": "!windows" + }, + { + "name": "boost-smart-ptr", + "platform": "!windows" + }, + { + "name": "boost-tuple", + "platform": "!windows" + }, + "coin", + "curl", + "freetype", + "gdal", + { + "name": "giflib", + "platform": "windows" + }, + "ilmbase", + "jasper", + "libgta", + { + "name": "libiconv", + "platform": "windows" + }, + "libjpeg-turbo", + "liblas", + "libpng", + { + "name": "libxml2", + "platform": "windows" + }, + { + "name": "nvtt", + "platform": "!x86" + }, + "openexr", + "sdl1", + "tiff" + ] + }, + "tools": { + "description": "Enable to build OSG Applications (e.g. osgviewer)", + "dependencies": [ + "curl", + "freetype", + { + "name": "libiconv", + "platform": "windows" + }, + "libjpeg-turbo", + "libpng", + "sdl1" + ] + } + } +} diff --git a/externals/vcpkg/ports/osgearth/StaticOSG.patch b/externals/vcpkg/ports/osgearth/StaticOSG.patch new file mode 100755 index 000000000..2f4b1bff1 --- /dev/null +++ b/externals/vcpkg/ports/osgearth/StaticOSG.patch @@ -0,0 +1,84 @@ +From 4e719ceacdc8df729f3296f62c9f50075c862967 Mon Sep 17 00:00:00 2001 +From: Ankur Verma +Date: Sun, 27 Dec 2020 22:26:32 -0800 +Subject: [PATCH] StaticOSG + +--- + CMakeLists.txt | 9 ++++++ + CMakeModules/FindGEOS.cmake | 29 +++++++++++++++++++++++++++-- + 2 files changed, 36 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 049e37e..d75a3b9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -266,6 +266,15 @@ ELSE() + SET(OSGEARTH_DYNAMIC_OR_STATIC "STATIC") + ENDIF() + ++IF(NOT OSGEARTH_BUILD_SHARED_LIBS) ++ ADD_DEFINITIONS(-DOSGEARTH_LIBRARY_STATIC) ++ENDIF() ++ ++OPTION(OSG_IS_STATIC "Set to ON to build OSG for static linking. Use OFF for dynamic." OFF) ++IF (OSG_IS_STATIC) ++ ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC) ++ LINK_LIBRARIES(${CMAKE_DL_LIBS}) ++ENDIF(OSG_IS_STATIC) + + # OE Libraries + ADD_SUBDIRECTORY(src) +diff --git a/CMakeModules/FindGEOS.cmake b/CMakeModules/FindGEOS.cmake +index e85f922..b1bbfed 100644 +--- a/CMakeModules/FindGEOS.cmake ++++ b/CMakeModules/FindGEOS.cmake +@@ -65,7 +65,7 @@ FIND_LIBRARY(GEOS_LIBRARY + ) + + FIND_LIBRARY(GEOS_LIBRARY_DEBUG +- NAMES geos_cd geos_i_d geosd ++ NAMES geos_cd geos_i_d + PATHS + ${GEOS_DIR}/lib + $ENV{GEOS_DIR} +@@ -74,7 +74,7 @@ FIND_LIBRARY(GEOS_LIBRARY_DEBUG + ) + + FIND_LIBRARY(GEOS_LIBRARY_DEBUG +- NAMES geos_cd geos_i_d geosd ++ NAMES geos_cd geos_i_d + PATHS + ~/Library/Frameworks + /Library/Frameworks +@@ -92,3 +92,28 @@ SET(GEOS_FOUND "NO") + IF(GEOS_LIBRARY AND GEOS_INCLUDE_DIR) + SET(GEOS_FOUND "YES") + ENDIF(GEOS_LIBRARY AND GEOS_INCLUDE_DIR) ++ ++OPTION(GEOS_IS_STATIC "Set to ON to build GEOS for static linking. Use OFF for dynamic." OFF) ++IF (GEOS_IS_STATIC) ++ FIND_LIBRARY(GEOS_CXX_LIBRARY ++ NAMES geos ++ PATHS ++ ${GEOS_DIR}/lib ++ $ENV{GEOS_DIR} ++ NO_DEFAULT_PATH ++ PATH_SUFFIXES lib64 lib ++ ) ++ ++ FIND_LIBRARY(GEOS_CXX_LIBRARY_DEBUG ++ NAMES geosd ++ PATHS ++ ${GEOS_DIR}/lib ++ $ENV{GEOS_DIR} ++ NO_DEFAULT_PATH ++ PATH_SUFFIXES lib64 lib ++ ) ++ ++ set(GEOS_LIBRARY "${GEOS_LIBRARY};${GEOS_CXX_LIBRARY}" CACHE STRING "Geos Libraries" FORCE ) ++ set(GEOS_LIBRARY_DEBUG "${GEOS_LIBRARY_DEBUG};${GEOS_CXX_LIBRARY_DEBUG}" CACHE STRING "Geos Debug Libraries" FORCE ) ++ ++ENDIF(GEOS_IS_STATIC) +-- +2.29.2 + diff --git a/externals/vcpkg/ports/osgearth/blend2d-fix.patch b/externals/vcpkg/ports/osgearth/blend2d-fix.patch new file mode 100755 index 000000000..2b706573e --- /dev/null +++ b/externals/vcpkg/ports/osgearth/blend2d-fix.patch @@ -0,0 +1,15 @@ +diff --git a/src/osgEarth/FeatureRasterizer.cpp b/src/osgEarth/FeatureRasterizer.cpp +index 84007aee9..de8e511df 100644 +--- a/src/osgEarth/FeatureRasterizer.cpp ++++ b/src/osgEarth/FeatureRasterizer.cpp +@@ -245,8 +245,8 @@ namespace osgEarth { + }); + + Color color(Color::White); +- uint32_t cap = BL_STROKE_CAP_ROUND; +- uint32_t join = BL_STROKE_JOIN_ROUND; ++ auto cap = BL_STROKE_CAP_ROUND; ++ auto join = BL_STROKE_JOIN_ROUND; + + if (symbol->stroke().isSet()) + { diff --git a/externals/vcpkg/ports/osgearth/fix-dependency-osg.patch b/externals/vcpkg/ports/osgearth/fix-dependency-osg.patch new file mode 100755 index 000000000..6aae9a560 --- /dev/null +++ b/externals/vcpkg/ports/osgearth/fix-dependency-osg.patch @@ -0,0 +1,176 @@ +diff --git a/CMakeModules/FindOSG.cmake b/CMakeModules/FindOSG.cmake +index b7dff11..d1ec2ff 100644 +--- a/CMakeModules/FindOSG.cmake ++++ b/CMakeModules/FindOSG.cmake +@@ -121,5 +121,40 @@ IF( OSG_LIBRARY AND OSG_INCLUDE_DIR ) + SET( OSG_FOUND "YES" ) + SET( OSG_INCLUDE_DIRS ${OSG_INCLUDE_DIR} ${OSG_GEN_INCLUDE_DIR} ) + GET_FILENAME_COMPONENT( OSG_LIBRARIES_DIR ${OSG_LIBRARY} PATH ) ++ ++ find_package(ZLIB REQUIRED) ++ set(ZLIB_LIBRARY ZLIB::ZLIB) ++ ++ find_package(Freetype REQUIRED) ++ set(FREETYPE_LIBRARY Freetype::Freetype) ++ ++ find_package(unofficial-brotli CONFIG REQUIRED) ++ find_package(BZip2 REQUIRED) ++ find_package(expat CONFIG REQUIRED) ++ find_package(PNG REQUIRED) ++ find_package(JPEG REQUIRED) ++ find_package(TIFF REQUIRED) ++ find_package(zstd REQUIRED) ++ find_package(GIF REQUIRED) ++ if (WIN32) ++ find_package(pthreads CONFIG REQUIRED) ++ list(APPEND OSG_DEPENDS_LIBRARY PThreads4W::PThreads4W) ++ endif() ++ ++ if (UNIX) ++ list(APPEND OSG_DEPENDS_LIBRARY ${OSG_DEPENDS_LIBRARY} -pthread) ++ # Due to Linux Linker dependency issues these need to included again ++ set(DEPEND_LIB_LIST fontconfig freetype uuid gdal json-c expat zstd proj sqlite3 webp gif cfitsio openjp2 xml2) ++ else(UNIX) ++ set(DEPEND_LIB_LIST cfitsio) ++ endif() ++ foreach (libname ${DEPEND_LIB_LIST}) ++ find_library(${libname}_LIBRARY_RELEASE NAMES ${libname} NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED) ++ find_library(${libname}_LIBRARY_DEBUG NAMES ${libname} ${libname}d ${libname}_d NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED) ++ select_library_configurations(${libname}) ++ list(APPEND OSG_DEPENDS_LIBRARY ${${libname}_LIBRARY}) ++ endforeach() ++ list(APPEND OSG_DEPENDS_LIBRARY ZLIB::ZLIB Freetype::Freetype expat::expat PNG::PNG JPEG::JPEG TIFF::TIFF ${GIF_LIBRARIES} ${CFITSIO_LIBRARY}) ++ + ENDIF( OSG_LIBRARY AND OSG_INCLUDE_DIR ) + +diff --git a/src/applications/osgearth_3pv/CMakeLists.txt b/src/applications/osgearth_3pv/CMakeLists.txt +index e1dc876..6d688ff 100644 +--- a/src/applications/osgearth_3pv/CMakeLists.txt ++++ b/src/applications/osgearth_3pv/CMakeLists.txt +@@ -1,5 +1,5 @@ + INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} ) +-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY) ++SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY) + + SET(TARGET_SRC osgearth_3pv.cpp ) + +diff --git a/src/applications/osgearth_atlas/CMakeLists.txt b/src/applications/osgearth_atlas/CMakeLists.txt +index aadbb5e..69698c7 100644 +--- a/src/applications/osgearth_atlas/CMakeLists.txt ++++ b/src/applications/osgearth_atlas/CMakeLists.txt +@@ -1,6 +1,6 @@ + INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} ) + +-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY) ++SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY) + + SET(TARGET_SRC osgearth_atlas.cpp ) + +diff --git a/src/applications/osgearth_boundarygen/CMakeLists.txt b/src/applications/osgearth_boundarygen/CMakeLists.txt +index fe9ec6b..52915b0 100644 +--- a/src/applications/osgearth_boundarygen/CMakeLists.txt ++++ b/src/applications/osgearth_boundarygen/CMakeLists.txt +@@ -1,5 +1,5 @@ + INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} ) +-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY) ++SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY) + + SET(TARGET_H + BoundaryUtil +diff --git a/src/applications/osgearth_clamp/CMakeLists.txt b/src/applications/osgearth_clamp/CMakeLists.txt +index 996ea43..728ee77 100644 +--- a/src/applications/osgearth_clamp/CMakeLists.txt ++++ b/src/applications/osgearth_clamp/CMakeLists.txt +@@ -1,5 +1,5 @@ + INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} ) +-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OPENTHREADS_LIBRARY) ++SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY) + + SET(TARGET_SRC osgearth_clamp.cpp) + +diff --git a/src/applications/osgearth_conv/CMakeLists.txt b/src/applications/osgearth_conv/CMakeLists.txt +index a77d703..2aac5f2 100644 +--- a/src/applications/osgearth_conv/CMakeLists.txt ++++ b/src/applications/osgearth_conv/CMakeLists.txt +@@ -1,5 +1,5 @@ + INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} ) +-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OPENTHREADS_LIBRARY) ++SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY) + + SET(TARGET_SRC osgearth_conv.cpp ) + +diff --git a/src/applications/osgearth_overlayviewer/CMakeLists.txt b/src/applications/osgearth_overlayviewer/CMakeLists.txt +index bb2802a..5175cfc 100644 +--- a/src/applications/osgearth_overlayviewer/CMakeLists.txt ++++ b/src/applications/osgearth_overlayviewer/CMakeLists.txt +@@ -1,5 +1,5 @@ + INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} ) +-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY) ++SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY) + + SET(TARGET_SRC osgearth_overlayviewer.cpp ) + +diff --git a/src/applications/osgearth_tfs/CMakeLists.txt b/src/applications/osgearth_tfs/CMakeLists.txt +index 90c153a..d331019 100644 +--- a/src/applications/osgearth_tfs/CMakeLists.txt ++++ b/src/applications/osgearth_tfs/CMakeLists.txt +@@ -1,6 +1,6 @@ + INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} ) + +-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY) ++SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY) + + SET(TARGET_SRC osgearth_tfs.cpp ) + +diff --git a/src/applications/osgearth_toc/CMakeLists.txt b/src/applications/osgearth_toc/CMakeLists.txt +index b32c523..7b25b79 100644 +--- a/src/applications/osgearth_toc/CMakeLists.txt ++++ b/src/applications/osgearth_toc/CMakeLists.txt +@@ -1,5 +1,5 @@ + INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} ) +-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY OSGWIDGET_LIBRARY) ++SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGWIDGET_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY) + + SET(TARGET_SRC osgearth_toc.cpp ) + +diff --git a/src/applications/osgearth_version/CMakeLists.txt b/src/applications/osgearth_version/CMakeLists.txt +index 1f1d48d..01e963b 100644 +--- a/src/applications/osgearth_version/CMakeLists.txt ++++ b/src/applications/osgearth_version/CMakeLists.txt +@@ -1,5 +1,5 @@ + INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} ) +-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY) ++SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY) + + SET(TARGET_SRC osgearth_version.cpp ) + +diff --git a/src/applications/osgearth_viewer/CMakeLists.txt b/src/applications/osgearth_viewer/CMakeLists.txt +index 8c61e42..bbda7be 100644 +--- a/src/applications/osgearth_viewer/CMakeLists.txt ++++ b/src/applications/osgearth_viewer/CMakeLists.txt +@@ -1,5 +1,5 @@ + INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} ) +-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY) ++SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY) + + SET(TARGET_SRC osgearth_viewer.cpp ) + +diff --git a/src/osgEarth/CMakeLists.txt b/src/osgEarth/CMakeLists.txt +index cd55c1164..7cecdac74 100644 +--- a/src/osgEarth/CMakeLists.txt ++++ b/src/osgEarth/CMakeLists.txt +@@ -928,9 +928,11 @@ ENDIF(TRACY_FOUND) + + OPTION(NRL_STATIC_LIBRARIES "Link osgEarth against static GDAL and cURL, including static OpenSSL, Proj4, JPEG, PNG, and TIFF." OFF) + if(NOT NRL_STATIC_LIBRARIES) +- LINK_WITH_VARIABLES(${LIB_NAME} OSG_LIBRARY OSGUTIL_LIBRARY OSGSIM_LIBRARY OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY CURL_LIBRARY GDAL_LIBRARY OSGMANIPULATOR_LIBRARY) ++ LINK_WITH_VARIABLES(${LIB_NAME} OSGSIM_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGDB_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY OPENTHREADS_LIBRARY OSGMANIPULATOR_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY) ++ TARGET_LINK_LIBRARIES(${LIB_NAME} ${OSG_DEPENDS_LIBRARY} ${CURL_LIBRARY} ${GDAL_LIBRARIES}) + else(NOT NRL_STATIC_LIBRARIES) +- LINK_WITH_VARIABLES(${LIB_NAME} OSG_LIBRARY OSGUTIL_LIBRARY OSGSIM_LIBRARY OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY CURL_LIBRARY GDAL_LIBRARY OSGMANIPULATOR_LIBRARY SSL_EAY_RELEASE LIB_EAY_RELEASE TIFF_LIBRARY PROJ4_LIBRARY PNG_LIBRARY JPEG_LIBRARY) ++ LINK_WITH_VARIABLES(${LIB_NAME} OSGSIM_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGDB_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY OPENTHREADS_LIBRARY OSGMANIPULATOR_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY) ++ TARGET_LINK_LIBRARIES(${LIB_NAME} ${OSG_DEPENDS_LIBRARY} ${CURL_LIBRARY} ${GDAL_LIBRARIES} ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE} ${TIFF_LIBRARY} ${PROJ4_LIBRARY} ${PNG_LIBRARY} ${JPEG_LIBRARY}) + endif(NOT NRL_STATIC_LIBRARIES) + + LINK_CORELIB_DEFAULT(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIBRARY}) + diff --git a/externals/vcpkg/ports/osgearth/fix-gcc11-compilation.patch b/externals/vcpkg/ports/osgearth/fix-gcc11-compilation.patch new file mode 100755 index 000000000..582389068 --- /dev/null +++ b/externals/vcpkg/ports/osgearth/fix-gcc11-compilation.patch @@ -0,0 +1,38 @@ +From 8c16194c53d5bf70716dae2c6df67e77a1608dde Mon Sep 17 00:00:00 2001 +From: Ankur Verma +Date: Wed, 28 Jul 2021 06:40:45 -0700 +Subject: [PATCH] fix-gcc11-compilation + +--- + src/osgEarth/Units | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/osgEarth/Units b/src/osgEarth/Units +index dd19afe..bfe826a 100644 +--- a/src/osgEarth/Units ++++ b/src/osgEarth/Units +@@ -196,17 +196,17 @@ namespace osgEarth + class qualified_double + { + public: +- qualified_double( double value, const Units& units ) : _value(value), _units(units) { } ++ qualified_double( double value, const Units& units ) : _value(value), _units(units) { } + +- qualified_double( const T& rhs ) : _value(rhs._value), _units(rhs._units) { } ++ qualified_double( const T& rhs ) : _value(rhs._value), _units(rhs._units) { } + + // parses the qualified number from a parseable string (e.g., "123km") +- qualified_double(const std::string& parseable, const Units& defaultUnits) : _value(0.0), _units(defaultUnits) { ++ qualified_double(const std::string& parseable, const Units& defaultUnits) : _value(0.0), _units(defaultUnits) { + Units::parse( parseable, _value, _units, defaultUnits ); + } + + // loads the qualified number from an old-school config (e.g., { value="123" units="km" } ) +- qualified_double( const Config& conf, const Units& defaultUnits ) : _value(0.0) { ++ qualified_double( const Config& conf, const Units& defaultUnits ) : _value(0.0) { + if ( conf.hasValue("value") ) { + _value = conf.value("value", 0.0); + if ( !Units::parse( conf.value("units"), _units ) ) +-- +2.31.1 + diff --git a/externals/vcpkg/ports/osgearth/fix-imgui.patch b/externals/vcpkg/ports/osgearth/fix-imgui.patch new file mode 100755 index 000000000..495c3dff8 --- /dev/null +++ b/externals/vcpkg/ports/osgearth/fix-imgui.patch @@ -0,0 +1,21 @@ +From 2aa1535341c9aace4a5ca0115fa51dbf76f582ec Mon Sep 17 00:00:00 2001 +From: Ankur Verma +Date: Wed, 29 Sep 2021 23:12:52 -0700 +Subject: [PATCH] patch + +--- + src/applications/osgearth_imgui/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/applications/osgearth_imgui/CMakeLists.txt b/src/applications/osgearth_imgui/CMakeLists.txt +index 246fd89..5ea6f63 100644 +--- a/src/applications/osgearth_imgui/CMakeLists.txt ++++ b/src/applications/osgearth_imgui/CMakeLists.txt +@@ -1,3 +1,3 @@ +-set(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY) ++set(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY) + set(TARGET_SRC osgearth_imgui.cpp) + SETUP_IMGUI_APPLICATION(osgearth_imgui) +-- +2.31.1 + diff --git a/externals/vcpkg/ports/osgearth/make-all-find-packages-required.patch b/externals/vcpkg/ports/osgearth/make-all-find-packages-required.patch new file mode 100755 index 000000000..b685f7dba --- /dev/null +++ b/externals/vcpkg/ports/osgearth/make-all-find-packages-required.patch @@ -0,0 +1,114 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7541c8d07..cc14d2160 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -122,40 +122,53 @@ option(OSGEARTH_ENABLE_GEOCODER "Enable the geocoder (GDAL/OGR must be built wit + + # Mobile/GLES: + IF (OSGEARTH_USE_GLES) +- find_package(OpenGLES) ++ find_package(OpenGLES REQUIRED) + ELSE () +- find_package(OpenGL) ++ find_package(OpenGL REQUIRED) + ENDIF (OSGEARTH_USE_GLES) + + # required + find_package(OSG REQUIRED) +-find_package(CURL REQUIRED) ++find_package(CURL CONFIG REQUIRED) ++set(CURL_LIBRARY CURL::libcurl) + find_package(GDAL REQUIRED) +- ++set(GDAL_LIBRARY ${GDAL_LIBRARIES}) ++set(GDAL_FOUND 1) + # optional +-find_package(GEOS) +-find_package(Sqlite3) +-find_package(Draco) +-find_package(BASISU) +-find_package(GLEW) +-find_package(Protobuf) +-find_package(WEBP) +-find_package(Blend2D) ++find_package(geos CONFIG REQUIRED) ++set(GEOS_LIBRARY GEOS::geos GEOS::geos_c) ++set(GEOS_FOUND 1) ++find_package(unofficial-sqlite3 CONFIG REQUIRED) ++set(SQLITE3_FOUND 1) ++set(SQLITE3_LIBRARY unofficial::sqlite3::sqlite3) ++find_package(Draco REQUIRED) ++find_package(BASISU REQUIRED) ++find_package(GLEW REQUIRED) ++set(GLEW_LIBRARIES GLEW::GLEW) ++set(GLEW_FOUND 1) ++find_package(protobuf CONFIG REQUIRED) ++set(Protobuf_LIBRARIES protobuf::libprotoc protobuf::libprotobuf) ++set(Protobuf_FOUND 1) ++find_package(WEBP NAMES WebP CONFIG REQUIRED) ++set(WEBP_LIBRARY WebP::webp) ++find_package(Blend2D CONFIG REQUIRED) + + if(OSGEARTH_ENABLE_PROFILING) +- find_package(Tracy) ++ find_package(Tracy REQUIRED) + endif() + + if(OSGEARTH_BUILD_ZIP_PLUGIN) +- find_package(LIBZIP) ++ find_package(libzip CONFIG REQUIRED) ++ set(LIBZIP_LIBRARY libzip::zip) ++ set(LIBZIP_FOUND 1) + endif() + + if(OSGEARTH_BUILD_TRITON_NODEKIT) +- find_package(Triton QUIET) ++ find_package(Triton QUIET REQUIRED) + endif() + + if(OSGEARTH_BUILD_SILVERLINING_NODEKIT) +- find_package(SilverLining QUIET) ++ find_package(SilverLining QUIET REQUIRED) + endif() + + # Sqlite enables the MBTiles format: +@@ -193,7 +207,7 @@ SET (PROTOBUF_USE_DLLS FALSE CACHE BOOL "Set this to true if Protobuf is compile + # Duktape is the JavaScript interpreter + SET (WITH_EXTERNAL_DUKTAPE FALSE CACHE BOOL "Use bundled or system wide version of Duktape") + IF (WITH_EXTERNAL_DUKTAPE) +- find_package(Duktape) ++ find_package(Duktape REQUIRED) + ENDIF (WITH_EXTERNAL_DUKTAPE) + + # Whether to install shaders (glsl files). +@@ -204,7 +218,9 @@ OPTION(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when doing a Mak + # TinyXML is an XML parsing library + SET (WITH_EXTERNAL_TINYXML FALSE CACHE BOOL "Use bundled or system wide version of TinyXML") + IF (WITH_EXTERNAL_TINYXML) +- find_package(TinyXML) ++ find_package(tinyxml CONFIG REQUIRED) ++ set(TINYXML_FOUND 1) ++ set(TINYXML_LIBRARY unofficial-tinyxml::unofficial-tinyxml) + ENDIF (WITH_EXTERNAL_TINYXML) + + # postfix settings for various configs +diff --git a/src/osgEarth/CMakeLists.txt b/src/osgEarth/CMakeLists.txt +index cd55c1164..4ecb61f0d 100644 +--- a/src/osgEarth/CMakeLists.txt ++++ b/src/osgEarth/CMakeLists.txt +@@ -909,11 +909,11 @@ IF(FILEGDB_FOUND) + LINK_WITH_VARIABLES(${LIB_NAME} FILEGDB_LIBRARY) + ENDIF() + +-IF(BLEND2D_FOUND) ++#IF(BLEND2D_FOUND) + add_definitions(-DOSGEARTH_HAVE_BLEND2D) +- include_directories(${BLEND2D_INCLUDES}) +- link_with_variables(${LIB_NAME} BLEND2D_LIBRARY) +-ENDIF() ++# include_directories(${BLEND2D_INCLUDES}) ++ target_link_libraries(${LIB_NAME} blend2d::blend2d) ++#ENDIF() + + IF (WIN32) + LINK_EXTERNAL(${LIB_NAME} ${TARGET_EXTERNAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIBRARY} ) diff --git a/externals/vcpkg/ports/osgearth/portfile.cmake b/externals/vcpkg/ports/osgearth/portfile.cmake new file mode 100755 index 000000000..edc87e6eb --- /dev/null +++ b/externals/vcpkg/ports/osgearth/portfile.cmake @@ -0,0 +1,90 @@ +# Only dynamic build need dlls +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(GLOB OSG_PLUGINS_SUBDIR "${CURRENT_INSTALLED_DIR}/tools/osg/osgPlugins-*") + list(LENGTH OSG_PLUGINS_SUBDIR OSG_PLUGINS_SUBDIR_LENGTH) + if(NOT OSG_PLUGINS_SUBDIR_LENGTH EQUAL 1) + message(FATAL_ERROR "Could not determine osg version") + endif() + string(REPLACE "${CURRENT_INSTALLED_DIR}/tools/osg/" "" OSG_PLUGINS_SUBDIR "${OSG_PLUGINS_SUBDIR}") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gwaldron/osgearth + REF 15d5340f174212d6f93ae55c0d9af606c3d361c0 #version 3.2 + SHA512 f922e8bbb041a498e948587f03e8dc8a07b92e641f38d50a8eafb8b3ce1e0c92bb1ee01360d57e794429912734b60cf05ba143445a442bc95af39e3dd9fc3670 + HEAD_REF master + PATCHES + StaticOSG.patch # Fix port compilation in static-md module + make-all-find-packages-required.patch + fix-dependency-osg.patch + remove-tool-debug-suffix.patch + fix-imgui.patch + fix-gcc11-compilation.patch + blend2d-fix.patch +) + +# Upstream bug, see https://github.com/gwaldron/osgearth/issues/1002 +file(REMOVE "${SOURCE_PATH}/src/osgEarth/tinyxml.h") + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + tools OSGEARTH_BUILD_TOOLS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} + -DOSGEARTH_BUILD_SHARED_LIBS=${BUILD_SHARED} + -DNRL_STATIC_LIBRARIES=${BUILD_STATIC} + -DOSG_IS_STATIC=${BUILD_STATIC} + -DGEOS_IS_STATIC=${BUILD_STATIC} + -DCURL_IS_STATIC=${BUILD_STATIC} + -DOSGEARTH_BUILD_EXAMPLES=OFF + -DOSGEARTH_BUILD_TESTS=OFF + -DOSGEARTH_BUILD_DOCS=OFF + -DOSGEARTH_BUILD_PROCEDURAL_NODEKIT=OFF + -DOSGEARTH_BUILD_TRITON_NODEKIT=OFF + -DOSGEARTH_BUILD_SILVERLINING_NODEKIT=OFF + -DWITH_EXTERNAL_TINYXML=ON +) + +vcpkg_cmake_install() + +if (WIN32 AND (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")) + #Release + set(OSGEARTH_TOOL_PATH "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + set(OSGEARTH_TOOL_PLUGIN_PATH "${OSGEARTH_TOOL_PATH}/${OSG_PLUGINS_SUBDIR}") + + file(MAKE_DIRECTORY "${OSGEARTH_TOOL_PLUGIN_PATH}") + file(GLOB OSGDB_PLUGINS "${CURRENT_PACKAGES_DIR}/bin/${OSG_PLUGINS_SUBDIR}/osgdb*.dll") + + file(COPY ${OSGDB_PLUGINS} DESTINATION "${OSGEARTH_TOOL_PLUGIN_PATH}") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/${OSG_PLUGINS_SUBDIR}") + + #Debug + set(OSGEARTH_DEBUG_TOOL_PATH "${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}") + set(OSGEARTH_DEBUG_TOOL_PLUGIN_PATH "${OSGEARTH_DEBUG_TOOL_PATH}/${OSG_PLUGINS_SUBDIR}") + + file(MAKE_DIRECTORY "${OSGEARTH_DEBUG_TOOL_PLUGIN_PATH}") + + file(GLOB OSGDB_DEBUG_PLUGINS "${CURRENT_PACKAGES_DIR}/debug/bin/${OSG_PLUGINS_SUBDIR}/osgdb*.dll") + + file(COPY ${OSGDB_DEBUG_PLUGINS} DESTINATION "${OSGEARTH_DEBUG_TOOL_PLUGIN_PATH}") + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/${OSG_PLUGINS_SUBDIR}") +endif() + +if ("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES osgearth_3pv osgearth_atlas osgearth_boundarygen osgearth_clamp + osgearth_conv osgearth_imgui osgearth_overlayviewer osgearth_tfs osgearth_toc osgearth_version osgearth_viewer + AUTO_CLEAN + ) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/osgearth/remove-tool-debug-suffix.patch b/externals/vcpkg/ports/osgearth/remove-tool-debug-suffix.patch new file mode 100755 index 000000000..24cbb2fe5 --- /dev/null +++ b/externals/vcpkg/ports/osgearth/remove-tool-debug-suffix.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeModules/OsgEarthMacroUtils.cmake b/CMakeModules/OsgEarthMacroUtils.cmake +index 6e0eb46..12388c4 100644 +--- a/CMakeModules/OsgEarthMacroUtils.cmake ++++ b/CMakeModules/OsgEarthMacroUtils.cmake +@@ -364,8 +364,6 @@ MACRO(SETUP_EXE IS_COMMANDLINE_APP) + + SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}") + SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES OUTPUT_NAME ${TARGET_NAME}) +- SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_OUTPUT_NAME "${TARGET_NAME}${CMAKE_DEBUG_POSTFIX}") +- SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES RELEASE_OUTPUT_NAME "${TARGET_NAME}${CMAKE_RELEASE_POSTFIX}") + SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES RELWITHDEBINFO_OUTPUT_NAME "${TARGET_NAME}${CMAKE_RELWITHDEBINFO_POSTFIX}") + SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES MINSIZEREL_OUTPUT_NAME "${TARGET_NAME}${CMAKE_MINSIZEREL_POSTFIX}") + diff --git a/externals/vcpkg/ports/osgearth/vcpkg.json b/externals/vcpkg/ports/osgearth/vcpkg.json new file mode 100755 index 000000000..558f4e6e4 --- /dev/null +++ b/externals/vcpkg/ports/osgearth/vcpkg.json @@ -0,0 +1,41 @@ +{ + "name": "osgearth", + "version": "3.2", + "port-version": 5, + "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.", + "homepage": "https://github.com/gwaldron/osgearth", + "supports": "!(x86 | wasm32)", + "dependencies": [ + "basisu", + "blend2d", + "cfitsio", + "draco", + "geos", + "glew", + "libwebp", + "libzip", + "opengl", + { + "name": "osg", + "features": [ + "plugins" + ] + }, + "protobuf", + "pthreads", + "sqlite3", + "tinyxml", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "default-features": [ + "tools" + ], + "features": { + "tools": { + "description": "Build tools" + } + } +} diff --git a/externals/vcpkg/ports/osi/CMakeLists.txt b/externals/vcpkg/ports/osi/CMakeLists.txt new file mode 100755 index 000000000..0542339eb --- /dev/null +++ b/externals/vcpkg/ports/osi/CMakeLists.txt @@ -0,0 +1,89 @@ +cmake_minimum_required(VERSION 3.11) + +project(Osi LANGUAGES C CXX) + +set(PROJECT_VERSION 0.107.9) +set(PROJECT_VERSION_MAJOR 0) +set(PROJECT_VERSION_MINOR 107) +set(PROJECT_VERSION_PATCH 9) + +set(CMAKE_CXX_STANDARD 14) + +set(INSTALL_BIN_DIR "bin" CACHE PATH "Path where exe and dll will be installed") +set(INSTALL_LIB_DIR "lib" CACHE PATH "Path where lib will be installed") +set(INSTALL_INCLUDE_DIR "include/Coin" CACHE PATH "Path where headers will be installed") +set(INSTALL_CMAKE_DIR "share/osi" CACHE PATH "Path where cmake configs will be installed") + +# Make relative paths absolute (needed later on) +set(RELATIVE_INSTALL_INCLUDE_DIR ${INSTALL_INCLUDE_DIR}) +foreach(p LIB BIN INCLUDE CMAKE) + set(var INSTALL_${p}_DIR) + if(NOT IS_ABSOLUTE "${${var}}") + set(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}") + endif() +endforeach() + +if(MSVC) + set( + CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} /bigobj /MP /wd4996 /wd4819 /wd4251 /wd4267 /wd4244 /wd4275" + ) +endif() + +if(APPLE) + set( + CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override -Wno-unused-command-line-argument -Wno-unused-result -Wno-exceptions" + ) + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" + CACHE STRING "Minimum OS X deployment version") +endif() + +find_package(CoinUtils REQUIRED) + +file(GLOB OSI_SOURCES Osi/src/Osi/*.hpp Osi/src/Osi/*.cpp) + +add_library(${PROJECT_NAME} ${OSI_SOURCES}) + +target_include_directories(${PROJECT_NAME} PUBLIC $ $) + +if(MSVC) + target_compile_definitions(${PROJECT_NAME} PRIVATE _CRT_SECURE_NO_WARNINGS) +endif() +target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_CMATH) + +target_link_libraries(${PROJECT_NAME} PRIVATE Coin::CoinUtils) + +install(DIRECTORY Osi/src/Osi/ + DESTINATION ${INSTALL_INCLUDE_DIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN "*.hpp" + PATTERN "config_default.h" EXCLUDE) + +install(TARGETS ${PROJECT_NAME} + EXPORT "${PROJECT_NAME}Targets" + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin) + +include(CMakePackageConfigHelpers) + +set(version_config "${CMAKE_CURRENT_BINARY_DIR}/temp/${PROJECT_NAME}ConfigVersion.cmake") +set(project_config "${CMAKE_CURRENT_BINARY_DIR}/temp/${PROJECT_NAME}Config.cmake") +set(namespace "Coin::") + +write_basic_package_version_file("${version_config}" + COMPATIBILITY SameMajorVersion) + +configure_package_config_file("Config.cmake.in" + "${project_config}" + INSTALL_DESTINATION + "${INSTALL_CMAKE_DIR}") + +install(FILES "${project_config}" "${version_config}" + DESTINATION "${INSTALL_CMAKE_DIR}") + +install(EXPORT "${PROJECT_NAME}Targets" + NAMESPACE "${namespace}" + DESTINATION "${INSTALL_CMAKE_DIR}") diff --git a/externals/vcpkg/ports/osi/Config.cmake.in b/externals/vcpkg/ports/osi/Config.cmake.in new file mode 100755 index 000000000..2c12f83f0 --- /dev/null +++ b/externals/vcpkg/ports/osi/Config.cmake.in @@ -0,0 +1,5 @@ + +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") +check_required_components("@PROJECT_NAME@") diff --git a/externals/vcpkg/ports/osi/portfile.cmake b/externals/vcpkg/ports/osi/portfile.cmake new file mode 100755 index 000000000..ea585b115 --- /dev/null +++ b/externals/vcpkg/ports/osi/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO coin-or/Osi + REF dfa6449d6756fdd96912cf96e168d0be07b1d37c # releases/0.108.6 + SHA512 8c23998a3f442766c515acd5549ed97608b972de61b9ef5b50b9e5d1d03b43fb5f77dc02d3562084fbf4f18f3397f9cd50c0f9bde4f576a4dff0dab795c04358 +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/osi RENAME copyright) diff --git a/externals/vcpkg/ports/osi/vcpkg.json b/externals/vcpkg/ports/osi/vcpkg.json new file mode 100755 index 000000000..de8d0a488 --- /dev/null +++ b/externals/vcpkg/ports/osi/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "osi", + "version-string": "0.108.6", + "port-version": 1, + "description": "Osi (Open Solver Interface) provides an abstract base class to a generic linear programming (LP) solver, along with derived classes for specific solvers. Many applications may be able to use the Osi to insulate themselves from a specific LP solver.", + "dependencies": [ + "coinutils" + ] +} diff --git a/externals/vcpkg/ports/otl/portfile.cmake b/externals/vcpkg/ports/otl/portfile.cmake new file mode 100755 index 000000000..6809aa182 --- /dev/null +++ b/externals/vcpkg/ports/otl/portfile.cmake @@ -0,0 +1,31 @@ +set(OTL_VERSION 40463) + +vcpkg_download_distfile(ARCHIVE + URLS "http://otl.sourceforge.net/otlv4_${OTL_VERSION}.zip" + FILENAME "otlv4_${OTL_VERSION}-9485a0fe15a7-1.zip" + SHA512 46a50234009ca8e8dba3b0b781f4b496759f4c5697f045d816c7e4eddda61da63d03acf29b4d1f71ee035aba4c6daa72c9a546085a6d7b3c192353b854526392 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL +) + +file(INSTALL "${SOURCE_PATH}/otlv${OTL_VERSION}.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}" + RENAME otlv4.h) + +file(READ "${SOURCE_PATH}/otlv${OTL_VERSION}.h" copyright_contents) +string(FIND "${copyright_contents}" "#ifndef OTL_H" start_of_source) +if(start_of_source EQUAL "-1") + message(FATAL_ERROR "Could not find start of source; the header file has changed in a way that we cannot get the license text.") +endif() +string(SUBSTRING "${copyright_contents}" 0 "${start_of_source}" copyright_contents) +string(REGEX REPLACE "// ?" "" copyright_contents "${copyright_contents}") +string(REGEX REPLACE "=+\n" "" copyright_contents "${copyright_contents}") + +file(WRITE + "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" + "${copyright_contents}" +) diff --git a/externals/vcpkg/ports/otl/vcpkg.json b/externals/vcpkg/ports/otl/vcpkg.json new file mode 100755 index 000000000..0c0a12814 --- /dev/null +++ b/externals/vcpkg/ports/otl/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "otl", + "version": "4.0.463", + "port-version": 1, + "description": "Oracle, Odbc and DB2-CLI Template Library", + "homepage": "http://otl.sourceforge.net/", + "license": "ISC" +} diff --git a/externals/vcpkg/ports/outcome/outcome-prune-sources.patch b/externals/vcpkg/ports/outcome/outcome-prune-sources.patch new file mode 100755 index 000000000..59c5db01a --- /dev/null +++ b/externals/vcpkg/ports/outcome/outcome-prune-sources.patch @@ -0,0 +1,12 @@ +diff --git "a/cmake/headers.cmake" "b/cmake/headers.cmake" +index 108038d16..bf4807e16 100644 +--- "a/cmake/headers.cmake" ++++ "b/cmake/headers.cmake" +@@ -47,7 +47,6 @@ set(outcome_HEADERS + "include/outcome/experimental/status-code/include/system_code_from_exception.hpp" + "include/outcome/experimental/status-code/include/system_error2.hpp" + "include/outcome/experimental/status-code/include/win32_code.hpp" +- "include/outcome/experimental/status-code/single-header/system_error2.hpp" + "include/outcome/experimental/status_outcome.hpp" + "include/outcome/experimental/status_result.hpp" + "include/outcome/iostream_support.hpp" diff --git a/externals/vcpkg/ports/outcome/portfile.cmake b/externals/vcpkg/ports/outcome/portfile.cmake new file mode 100755 index 000000000..a031a77b0 --- /dev/null +++ b/externals/vcpkg/ports/outcome/portfile.cmake @@ -0,0 +1,77 @@ +# Outcome is composed of other third party libraries: +# Outcome +# <= status-code +# <= quickcpplib +# <= byte-lite +# <= gsl-lite +# <= Optional +# +# byte-lite and gsl-lite are in vcpkg, but may not be versions +# known to be compatible with Outcome. It has occurred in the +# past that newer versions were severely broken with Outcome. +# +# One can fetch an 'all sources' tarball from +# https://github.com/ned14/outcome/releases which contains +# the exact copy of those third party libraries known to +# have passed Outcome's CI process. + +message(WARNING [=[ +Outcome depends on QuickCppLib which uses the vcpkg versions of gsl-lite and byte-lite, rather than the versions tested by QuickCppLib's and Outcome's CI. It is not guaranteed to work with other versions, with failures experienced in the past up-to-and-including runtime crashes. See the warning message from QuickCppLib for how you can pin the versions of those dependencies in your manifest file to those with which QuickCppLib was tested. Do not report issues to upstream without first pinning the versions as QuickCppLib was tested against. +]=]) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ned14/outcome + REF 9c6ad6e8e6a48ddde65c0617e3df306bc901b41d + SHA512 b53807fdf9ac3647882f2029a7c5311e7f313abaec703142d2c6d4e73651898d868bfdd600e5f2fa3344e91ebb576324b4624ccf4aa8e09314b7a7ede4cb0fbc + HEAD_REF develop + PATCHES + outcome-prune-sources.patch +) + +# Outcome needs a copy of QuickCppLib with which to bootstrap its cmake +file(COPY "${CURRENT_INSTALLED_DIR}/include/quickcpplib" + DESTINATION "${SOURCE_PATH}/quickcpplib/repo/include/" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/ned14-internal-quickcpplib/" + DESTINATION "${SOURCE_PATH}/quickcpplib/repo/" +) + +# Outcome expects status-code to live inside its include directory +file(COPY "${CURRENT_INSTALLED_DIR}/include/status-code/" + DESTINATION "${SOURCE_PATH}/include/outcome/experimental/status-code/include/" +) +file(COPY "${CURRENT_INSTALLED_DIR}/include/status-code/detail/" + DESTINATION "${SOURCE_PATH}/include/outcome/experimental/status-code/include/detail/" +) + +# Because outcome's deployed files are header-only, the debug build is not necessary +set(VCPKG_BUILD_TYPE release) + +# Already installed dependencies don't appear on the include path, which Outcome assumes. +string(APPEND VCPKG_CXX_FLAGS " \"-I${CURRENT_INSTALLED_DIR}/include\"") +string(APPEND VCPKG_C_FLAGS " \"-I${CURRENT_INSTALLED_DIR}/include\"") + +# Use Outcome's own build process, skipping examples and tests. +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS + -DPROJECT_IS_DEPENDENCY=On + -Dquickcpplib_FOUND=1 + -DOUTCOME_ENABLE_DEPENDENCY_SMOKE_TEST=ON # Leave this always on to test everything compiles + -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON +) + +if("run-tests" IN_LIST FEATURES) + vcpkg_build_cmake(TARGET test) +endif() + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/outcome) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/Licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/outcome/usage b/externals/vcpkg/ports/outcome/usage new file mode 100755 index 000000000..6bf004036 --- /dev/null +++ b/externals/vcpkg/ports/outcome/usage @@ -0,0 +1,4 @@ +The package outcome provides CMake targets: + + find_package(outcome CONFIG REQUIRED) + target_link_libraries(main PUBLIC outcome::hl) diff --git a/externals/vcpkg/ports/outcome/vcpkg.json b/externals/vcpkg/ports/outcome/vcpkg.json new file mode 100755 index 000000000..eb8b45aa3 --- /dev/null +++ b/externals/vcpkg/ports/outcome/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "outcome", + "version-string": "2.2.2-20211208", + "description": "Provides very lightweight outcome and result (non-Boost edition)", + "homepage": "https://github.com/ned14/outcome", + "supports": "!uwp", + "dependencies": [ + "ned14-internal-quickcpplib", + "status-code" + ], + "features": { + "run-tests": { + "description": "Build and run the dependency validation tests" + } + } +} diff --git a/externals/vcpkg/ports/p-ranav-csv/portfile.cmake b/externals/vcpkg/ports/p-ranav-csv/portfile.cmake new file mode 100755 index 000000000..fcbaeee74 --- /dev/null +++ b/externals/vcpkg/ports/p-ranav-csv/portfile.cmake @@ -0,0 +1,23 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO p-ranav/csv + REF 13e04e5b31b585855c7d7e7f3c65e47ae863569b + SHA512 ddcdc7af68a0dabb2b7e15822f5900461b9f424ff5e0ac6cafd2454c2f21ca97785ef09ddb805a92e2452fe14c14167c762a822a8af6c5b86446f67e7f3f71bd + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCSV_BUILD_TESTS=OFF +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/p-ranav-csv/vcpkg.json b/externals/vcpkg/ports/p-ranav-csv/vcpkg.json new file mode 100755 index 000000000..86a2e0a0c --- /dev/null +++ b/externals/vcpkg/ports/p-ranav-csv/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "p-ranav-csv", + "version-string": "2019-07-11", + "port-version": 1, + "description": "[deprecated] CSV for modern C++", + "homepage": "https://github.com/p-ranav/csv" +} diff --git a/externals/vcpkg/ports/p-ranav-csv2/portfile.cmake b/externals/vcpkg/ports/p-ranav-csv2/portfile.cmake new file mode 100755 index 000000000..9e03f7ab4 --- /dev/null +++ b/externals/vcpkg/ports/p-ranav-csv2/portfile.cmake @@ -0,0 +1,27 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO p-ranav/csv2 + REF a20992f7a1b75215609037c4cc66f690e8691aab + SHA512 4459f34d3d3d2c256743d93dd9c66ac584366120e3c8829173e6f047bf7dce2b08284c82af360a274dea0d43f5d6e1c84bcae51bf4de97751cf41a2fd48cb62b + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCSV2_BUILD_TESTS=OFF + -DCSV2_SAMPLES=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share/licenses) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE.mio DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/p-ranav-csv2/vcpkg.json b/externals/vcpkg/ports/p-ranav-csv2/vcpkg.json new file mode 100755 index 000000000..957935ad9 --- /dev/null +++ b/externals/vcpkg/ports/p-ranav-csv2/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "p-ranav-csv2", + "version-string": "2020-12-14", + "port-version": 2, + "description": "CSV for modern C++", + "homepage": "https://github.com/p-ranav/csv2" +} diff --git a/externals/vcpkg/ports/pagmo2/disable-C4701.patch b/externals/vcpkg/ports/pagmo2/disable-C4701.patch new file mode 100755 index 000000000..05ed75bd2 --- /dev/null +++ b/externals/vcpkg/ports/pagmo2/disable-C4701.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 96653ba..1afaafa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -80,7 +80,7 @@ endif() + if(YACMA_COMPILER_IS_MSVC) + # Disable the idiotic minmax macros on MSVC, some annoying warnings, + # enable the bigobj option and the WIN32_LEAN_AND_MEAN definition. +- list(APPEND PAGMO_CXX_FLAGS_DEBUG "-DNOMINMAX" "/wd4459" "/wd4127" "/wd4702" "/wd4251" "/bigobj" "-DWIN32_LEAN_AND_MEAN") ++ list(APPEND PAGMO_CXX_FLAGS_DEBUG "-DNOMINMAX" "/wd4459" "/wd4127" "/wd4702" "/wd4251" "/wd4701" "/bigobj" "-DWIN32_LEAN_AND_MEAN") + list(APPEND PAGMO_CXX_FLAGS_RELEASE "-DNOMINMAX" "/wd4459" "/wd4127" "/wd4702" "/wd4251" "/bigobj" "-DWIN32_LEAN_AND_MEAN") + # Enable strict conformance mode, if supported. + set(CMAKE_REQUIRED_QUIET TRUE) diff --git a/externals/vcpkg/ports/pagmo2/disable-md-override.patch b/externals/vcpkg/ports/pagmo2/disable-md-override.patch new file mode 100755 index 000000000..a5e09d3fa --- /dev/null +++ b/externals/vcpkg/ports/pagmo2/disable-md-override.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 96653ba..549d9d4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -141,6 +141,7 @@ endif() + # Boost setup. + include(PagmoFindBoost) + ++if(0) + # Explanation: on MSVC, when building static libraries, it is good practice to link + # to the static runtime. CMake, however, is hard-coded to link to the dynamic runtime. + # Hence we hackishly replace the /MD flag with /MT. This is the approach suggested +@@ -161,6 +162,7 @@ if(YACMA_COMPILER_IS_MSVC AND PAGMO_BUILD_STATIC_LIBRARY) + endif() + endforeach() + endif() ++endif() + + # List of source files. + set(PAGMO_SRC_FILES diff --git a/externals/vcpkg/ports/pagmo2/find-tbb.patch b/externals/vcpkg/ports/pagmo2/find-tbb.patch new file mode 100755 index 000000000..8781910f8 --- /dev/null +++ b/externals/vcpkg/ports/pagmo2/find-tbb.patch @@ -0,0 +1,12 @@ +diff --git a/pagmo-config.cmake.in b/pagmo-config.cmake.in +index 9553fc8..cb5e90b 100644 +--- a/pagmo-config.cmake.in ++++ b/pagmo-config.cmake.in +@@ -8,6 +8,7 @@ set(THREADS_PREFER_PTHREAD_FLAG YES) + find_package(Threads REQUIRED) + unset(THREADS_PREFER_PTHREAD_FLAG) + include(PagmoFindBoost) ++find_package(TBB REQUIRED) + @_PAGMO_CONFIG_OPTIONAL_DEPS@ + # Restore original module path. + set(CMAKE_MODULE_PATH "${_PAGMO_CONFIG_OLD_MODULE_PATH}") diff --git a/externals/vcpkg/ports/pagmo2/portfile.cmake b/externals/vcpkg/ports/pagmo2/portfile.cmake new file mode 100755 index 000000000..a709a2fb6 --- /dev/null +++ b/externals/vcpkg/ports/pagmo2/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO esa/pagmo2 + REF v2.16.1 + SHA512 dac85a8525316e827df809d187d40f14dc20db7119796b7384d7855f83ba37e0bb595f6d8199053aac857460816929dd599c9d43802f2ed920a6f42dd2f16a03 + HEAD_REF master + PATCHES + "disable-C4701.patch" + "disable-md-override.patch" + "find-tbb.patch" +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + nlopt PAGMO_WITH_NLOPT +) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAGMO_BUILD_STATIC_LIBRARY) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + ${FEATURE_OPTIONS} + -DPAGMO_WITH_EIGEN3=ON + -DPAGMO_BUILD_STATIC_LIBRARY=${PAGMO_BUILD_STATIC_LIBRARY} +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/pagmo) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/COPYING.lgpl3 DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + diff --git a/externals/vcpkg/ports/pagmo2/vcpkg.json b/externals/vcpkg/ports/pagmo2/vcpkg.json new file mode 100755 index 000000000..4e491b496 --- /dev/null +++ b/externals/vcpkg/ports/pagmo2/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "pagmo2", + "version": "2.16.1", + "description": "A C++ platform to perform parallel computations of optimisation tasks (global and local) via the asynchronous generalized island model.", + "homepage": "https://esa.github.io/pagmo2/", + "dependencies": [ + "boost-any", + "boost-graph", + "boost-serialization", + "eigen3", + "tbb" + ], + "features": { + "nlopt": { + "description": "Enable the NLopt wrappers", + "dependencies": [ + "nlopt" + ] + } + } +} diff --git a/externals/vcpkg/ports/paho-mqtt/fix-unresolvedsymbol-arm.patch b/externals/vcpkg/ports/paho-mqtt/fix-unresolvedsymbol-arm.patch new file mode 100755 index 000000000..0b7e9fb88 --- /dev/null +++ b/externals/vcpkg/ports/paho-mqtt/fix-unresolvedsymbol-arm.patch @@ -0,0 +1,13 @@ +diff --git a/src/SHA1.c b/src/SHA1.c +index 3ef07d9..8ed6b16 100644 +--- a/src/SHA1.c ++++ b/src/SHA1.c +@@ -18,7 +18,7 @@ + + #if !defined(OPENSSL) + #if defined(_WIN32) || defined(_WIN64) +-#pragma comment(lib, "crypt32.lib") ++#pragma comment(lib, "Advapi32.lib") + + int SHA1_Init(SHA_CTX *c) + { diff --git a/externals/vcpkg/ports/paho-mqtt/portfile.cmake b/externals/vcpkg/ports/paho-mqtt/portfile.cmake new file mode 100755 index 000000000..5257c91be --- /dev/null +++ b/externals/vcpkg/ports/paho-mqtt/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO eclipse/paho.mqtt.c + REF eff2da4875725509fc97641b118d6badf3e3a08f # v1.3.10 + SHA512 5e190ffd978dad0f60b70bdad2727e567539aff2c55e38023dfbcbe9b50bcbe75d8230c501c09e9c0a0329bed3fd149d5d59d65ad0ba0f84a54f641b4f01390a + HEAD_REF master + PATCHES + fix-unresolvedsymbol-arm.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAHO_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PAHO_BUILD_DYNAMIC) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DPAHO_WITH_SSL=TRUE + -DPAHO_BUILD_SHARED=${PAHO_BUILD_DYNAMIC} + -DPAHO_BUILD_STATIC=${PAHO_BUILD_STATIC} + -DPAHO_ENABLE_TESTING=FALSE +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME eclipse-paho-mqtt-c CONFIG_PATH lib/cmake/eclipse-paho-mqtt-c) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_copy_tools(TOOL_NAMES MQTTVersion AUTO_CLEAN) +endif() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/eclipse-paho-mqtt-c/eclipse-paho-mqtt-cConfig.cmake" + [[# Generated by CMake]] + [[# Generated by CMake +include(CMakeFindDependencyMacro) +find_dependency(OpenSSL)]] +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/paho-mqtt/vcpkg.json b/externals/vcpkg/ports/paho-mqtt/vcpkg.json new file mode 100755 index 000000000..2bed81bb8 --- /dev/null +++ b/externals/vcpkg/ports/paho-mqtt/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "paho-mqtt", + "version-semver": "1.3.10", + "description": "Paho project provides open-source client implementations of MQTT and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet of Things", + "homepage": "https://github.com/eclipse/paho.mqtt.c", + "license": "EPL-2.0", + "dependencies": [ + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/paho-mqttpp3/fix-dependency.patch b/externals/vcpkg/ports/paho-mqttpp3/fix-dependency.patch new file mode 100755 index 000000000..1ace8a30d --- /dev/null +++ b/externals/vcpkg/ports/paho-mqttpp3/fix-dependency.patch @@ -0,0 +1,84 @@ +diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt +index a9f8908..5c98f3f 100644 +--- a/cmake/CMakeLists.txt ++++ b/cmake/CMakeLists.txt +@@ -17,6 +17,5 @@ install(EXPORT ${package_name} DESTINATION lib/cmake/${package_name} + + install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake" +- FindPahoMqttC.cmake + "${CMAKE_CURRENT_BINARY_DIR}/${package_name}ConfigVersion.cmake" + DESTINATION lib/cmake/${package_name}) +diff --git a/cmake/PahoMqttCppConfig.cmake.in b/cmake/PahoMqttCppConfig.cmake.in +index 164e123..9beac1c 100644 +--- a/cmake/PahoMqttCppConfig.cmake.in ++++ b/cmake/PahoMqttCppConfig.cmake.in +@@ -5,7 +5,7 @@ set(PAHO_WITH_SSL @PAHO_WITH_SSL@) + + include(CMakeFindDependencyMacro) + list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) +-find_dependency(PahoMqttC REQUIRED) ++find_dependency(eclipse-paho-mqtt-c REQUIRED) + list(REMOVE_AT CMAKE_MODULE_PATH -1) + find_dependency(Threads REQUIRED) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 3d43595..a25f74d 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -23,7 +23,7 @@ + # Frank Pagliughi - made the shared library optional + #*******************************************************************************/ + +-find_package(PahoMqttC REQUIRED) ++find_package(eclipse-paho-mqtt-c CONFIG REQUIRED) + + # --- The headers --- + +@@ -81,13 +81,21 @@ target_include_directories(paho-cpp-objs + ## --- Build the shared library, if requested --- + + if(PAHO_BUILD_SHARED) ++ ## set PAHO_C_LIB ++ if(PAHO_WITH_SSL) ++ find_package(OpenSSL REQUIRED) ++ set(_PAHO_MQTT_C_LIB_NAME eclipse-paho-mqtt-c::paho-mqtt3as eclipse-paho-mqtt-c::paho-mqtt3cs) ++ else() ++ set(_PAHO_MQTT_C_LIB_NAME eclipse-paho-mqtt-c::paho-mqtt3a eclipse-paho-mqtt-c::paho-mqtt3c) ++ endif() ++ + ## create the shared library + add_library(paho-mqttpp3 SHARED $) + + ## add dependencies to the shared library + target_link_libraries(paho-mqttpp3 + PRIVATE ${LIBS_SYSTEM} +- PUBLIC PahoMqttC::PahoMqttC Threads::Threads) ++ PUBLIC ${_PAHO_MQTT_C_LIB_NAME} Threads::Threads) + + # It would be nice to exort the include paths from the obj lib, but we + # get an export error. Perhaps in a future version? +@@ -119,13 +127,22 @@ endif() + ## --- Build static version of the library, if requested --- + + if(PAHO_BUILD_STATIC) ++ ++ ## set PAHO_C_LIB ++ if(PAHO_WITH_SSL) ++ find_package(OpenSSL REQUIRED) ++ set(_PAHO_MQTT_C_LIB_NAME eclipse-paho-mqtt-c::paho-mqtt3as-static eclipse-paho-mqtt-c::paho-mqtt3cs-static) ++ else() ++ set(_PAHO_MQTT_C_LIB_NAME eclipse-paho-mqtt-c::paho-mqtt3a-static eclipse-paho-mqtt-c::paho-mqtt3c-static) ++ endif() ++ + ## create the static library + add_library(paho-mqttpp3-static STATIC $) + + ## add dependencies to the shared library + target_link_libraries(paho-mqttpp3-static + PRIVATE ${LIBS_SYSTEM} +- PUBLIC PahoMqttC::PahoMqttC Threads::Threads) ++ PUBLIC ${_PAHO_MQTT_C_LIB_NAME} Threads::Threads) + + target_include_directories(paho-mqttpp3-static PUBLIC + $ diff --git a/externals/vcpkg/ports/paho-mqttpp3/portfile.cmake b/externals/vcpkg/ports/paho-mqttpp3/portfile.cmake new file mode 100755 index 000000000..d2103a8c5 --- /dev/null +++ b/externals/vcpkg/ports/paho-mqttpp3/portfile.cmake @@ -0,0 +1,65 @@ +# Download from Github +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO eclipse/paho.mqtt.cpp + REF 33921c8b68b351828650c36816e7ecf936764379 #v1.2.0 + SHA512 3f4a91987e0106e50e637d8d4fb13a4f8aca14eea168102664fdcebd1260609434e679f5986a1c4d71746735530f1b72fc29d2ac05cb35b3ce734a6aab1a0a55 + HEAD_REF master + PATCHES + fix-dependency.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "ssl" PAHO_WITH_SSL +) + +# Link with 'paho-mqtt3as' library +set(PAHO_C_LIBNAME paho-mqtt3as) + +# Setting the library path +if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(PAHO_C_LIBRARY_PATH "${CURRENT_INSTALLED_DIR}/lib") +else() + set(PAHO_C_LIBRARY_PATH "${CURRENT_INSTALLED_DIR}/debug/lib") +endif() + +# Setting the include path where MqttClient.h is present +set(PAHO_C_INC "${CURRENT_INSTALLED_DIR}/include") + + +# NOTE: the Paho C++ cmake files on Github are problematic. +# It uses two different options PAHO_BUILD_STATIC and PAHO_BUILD_SHARED instead of just using one variable. +# Unless the open source community cleans up the cmake files, we are stuck with setting both of them. +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(PAHO_MQTTPP3_STATIC ON) + set(PAHO_MQTTPP3_SHARED OFF) + set(PAHO_C_LIB "${PAHO_C_LIBRARY_PATH}/${PAHO_C_LIBNAME}") + set(PAHO_OPTIONS -DPAHO_MQTT_C_LIBRARIES=${PAHO_C_LIB}) +else() + set(PAHO_MQTTPP3_STATIC OFF) + set(PAHO_MQTTPP3_SHARED ON) + set(PAHO_OPTIONS) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DPAHO_BUILD_STATIC=${PAHO_MQTTPP3_STATIC} + -DPAHO_BUILD_SHARED=${PAHO_MQTTPP3_SHARED} + -DPAHO_MQTT_C_INCLUDE_DIRS=${PAHO_C_INC} + ${FEATURE_OPTIONS} + ${PAHO_OPTIONS} +) + +# Run the build, copy pdbs and fixup the cmake targets +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME PahoMqttCpp CONFIG_PATH "lib/cmake/PahoMqttCpp") + +# Remove the include and share folders in debug folder +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Add copyright +file(INSTALL "${SOURCE_PATH}/about.html" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/paho-mqttpp3/vcpkg.json b/externals/vcpkg/ports/paho-mqttpp3/vcpkg.json new file mode 100755 index 000000000..4ea7289ec --- /dev/null +++ b/externals/vcpkg/ports/paho-mqttpp3/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "paho-mqttpp3", + "version": "1.2.0", + "port-version": 1, + "description": "Paho project provides open-source C++ wrapper for Paho C library", + "homepage": "https://github.com/eclipse/paho.mqtt.cpp", + "license": "EPL-1.0", + "dependencies": [ + "paho-mqtt", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "ssl" + ], + "features": { + "ssl": { + "description": "Build with SSL support", + "dependencies": [ + "openssl" + ] + } + } +} diff --git a/externals/vcpkg/ports/palsigslot/portfile.cmake b/externals/vcpkg/ports/palsigslot/portfile.cmake new file mode 100755 index 000000000..4ab6d29cb --- /dev/null +++ b/externals/vcpkg/ports/palsigslot/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO palacaze/sigslot + REF v1.2.1 + SHA512 cd79985a09ad41562dc8e582d30bc9df0fdc9409ee3676919b56d0d70a6c1af9414587b61977d2fa2ba763ef8df65b30c7b7dc883629e016660baeb998e708f5 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSIGSLOT_COMPILE_EXAMPLES=OFF + -DSIGSLOT_COMPILE_TESTS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME PalSigslot CONFIG_PATH lib/cmake/PalSigslot) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" +) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/palsigslot/vcpkg.json b/externals/vcpkg/ports/palsigslot/vcpkg.json new file mode 100755 index 000000000..29c68fa94 --- /dev/null +++ b/externals/vcpkg/ports/palsigslot/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "palsigslot", + "version": "1.2.1", + "description": "A header-only, thread safe implementation of signal-slots for C++.", + "homepage": "https://github.com/palacaze/sigslot", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/pango/portfile.cmake b/externals/vcpkg/ports/pango/portfile.cmake new file mode 100755 index 000000000..6c434e156 --- /dev/null +++ b/externals/vcpkg/ports/pango/portfile.cmake @@ -0,0 +1,42 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.gnome.org/ + OUT_SOURCE_PATH SOURCE_PATH + REPO GNOME/pango + REF a2ccd36a42e039d3600b04fe37fdc47f267d90c7 #v1.50.7 + SHA512 1116080b98e46eb436b5a8712f1f16b3debd22e4e549b7ed74e5f37985644b30c4639cf248758f1d8e72581b7b2009aed95cab47781b09cb9234fcf03f2b425c + HEAD_REF master # branch name +) + +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -Dintrospection=disabled # Build the GObject introspection data for Pango + -Dfontconfig=enabled # Build with FontConfig support. + -Dsysprof=disabled # include tracing support for sysprof + -Dlibthai=disabled # Build with libthai support + -Dcairo=enabled # Build with cairo support + -Dxft=disabled # Build with xft support + -Dfreetype=enabled # Build with freetype support + -Dgtk_doc=false #Build API reference for Pango using GTK-Doc + ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' + ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' +) + +vcpkg_install_meson() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +vcpkg_copy_tools(TOOL_NAMES pango-view pango-list pango-segmentation AUTO_CLEAN) + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/pango.pc") +if(EXISTS "${_file}") + vcpkg_replace_string("${_file}" [[-I"${includedir}/pango-1.0"]] [[-I"${includedir}/pango-1.0" -I"${includedir}/harfbuzz"]]) +endif() +set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/pango.pc") +if(EXISTS "${_file}") + vcpkg_replace_string("${_file}" [[-I"${includedir}/pango-1.0"]] [[-I"${includedir}/pango-1.0" -I"${includedir}/harfbuzz"]]) +endif() diff --git a/externals/vcpkg/ports/pango/vcpkg.json b/externals/vcpkg/ports/pango/vcpkg.json new file mode 100755 index 000000000..3f181b276 --- /dev/null +++ b/externals/vcpkg/ports/pango/vcpkg.json @@ -0,0 +1,36 @@ +{ + "name": "pango", + "version": "1.50.7", + "description": "Text and font handling library.", + "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pango/", + "license": "LGPL-2.0-only", + "dependencies": [ + { + "name": "cairo", + "features": [ + "gobject" + ] + }, + "fontconfig", + "freetype", + "fribidi", + "gettext", + "glib", + { + "name": "glib", + "host": true + }, + "harfbuzz", + { + "name": "harfbuzz", + "features": [ + "coretext" + ], + "platform": "osx" + }, + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/pangolin/fix-build-error-in-vs2019.patch b/externals/vcpkg/ports/pangolin/fix-build-error-in-vs2019.patch new file mode 100755 index 000000000..1b7be934e --- /dev/null +++ b/externals/vcpkg/ports/pangolin/fix-build-error-in-vs2019.patch @@ -0,0 +1,13 @@ +diff --git a/include/mpark/variant.hpp b/include/mpark/variant.hpp +index fb2cf06..6debb99 100644 +--- a/include/mpark/variant.hpp ++++ b/include/mpark/variant.hpp +@@ -243,7 +243,7 @@ namespace std { + #endif + + #if defined(__cpp_constexpr) && __cpp_constexpr >= 201304 +-#define MPARK_CPP14_CONSTEXPR ++//#define MPARK_CPP14_CONSTEXPR + #endif + + #if __has_feature(cxx_exceptions) || defined(__cpp_exceptions) || \ diff --git a/externals/vcpkg/ports/pangolin/fix-cmake-version.patch b/externals/vcpkg/ports/pangolin/fix-cmake-version.patch new file mode 100755 index 000000000..0153d90ea --- /dev/null +++ b/externals/vcpkg/ports/pangolin/fix-cmake-version.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0e13110..6adf1e2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.8) + project("Pangolin") + set(PANGOLIN_VERSION_MAJOR 0) + set(PANGOLIN_VERSION_MINOR 6) diff --git a/externals/vcpkg/ports/pangolin/fix-dependencies.patch b/externals/vcpkg/ports/pangolin/fix-dependencies.patch new file mode 100755 index 000000000..e3ced434e --- /dev/null +++ b/externals/vcpkg/ports/pangolin/fix-dependencies.patch @@ -0,0 +1,97 @@ +diff --git a/include/pangolin/gl/colour.h b/include/pangolin/gl/colour.h +index 92bedf4..8c3e542 100644 +--- a/include/pangolin/gl/colour.h ++++ b/include/pangolin/gl/colour.h +@@ -28,6 +28,7 @@ + #pragma once + + #include ++#include + + #include + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index ddeb144..ee27d57 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -299,7 +299,9 @@ if(BUILD_PANGOLIN_PYTHON AND BUILD_PANGOLIN_GUI AND BUILD_PANGOLIN_VARS AND NOT + + if(pybind11_FOUND) + set(HAVE_PYTHON 1) +- ++ if (UNIX) ++ set(PYTHON_LIBRARY ${PYTHON_LIBRARY} dl util) ++ endif() + file(GLOB pypangolin_SRC "python/pypangolin/*.cpp" ) + file(GLOB pypangolin_HDR "python/pypangolin/*.hpp" ) + list(APPEND HEADERS +@@ -382,6 +384,7 @@ endif() + + option(BUILD_PANGOLIN_FFMPEG "Build support for ffmpeg video input" ON) + if(BUILD_PANGOLIN_FFMPEG AND BUILD_PANGOLIN_VIDEO) ++ add_definitions(-DHAVE_FFMPEG_AVPIXELFORMAT) + find_package(FFMPEG QUIET) + if(FFMPEG_FOUND) + set(HAVE_FFMPEG 1) +@@ -464,11 +467,14 @@ endif() + + option(BUILD_PANGOLIN_LIBUVC "Build support for libuvc video input" ON) + if(BUILD_PANGOLIN_LIBUVC AND BUILD_PANGOLIN_VIDEO) +- find_package(uvc QUIET) +- if(uvc_FOUND) ++ find_package(libuvc CONFIG QUIET) ++ if(libuvc_FOUND) + set(HAVE_UVC 1) +- list(APPEND INTERNAL_INC ${uvc_INCLUDE_DIRS} ) +- list(APPEND LINK_LIBS ${uvc_LIBRARIES} ) ++ if (TARGET LibUVC::UVCShared) ++ list(APPEND LINK_LIBS LibUVC::UVCShared ) ++ else() ++ list(APPEND LINK_LIBS LibUVC::UVCStatic ) ++ endif() + list(APPEND HEADERS ${INCDIR}/video/drivers/uvc.h ) + list(APPEND SOURCES video/drivers/uvc.cpp) + list(APPEND VIDEO_FACTORY_REG RegisterUvcVideoFactory ) +@@ -584,11 +590,10 @@ endif() + + option(BUILD_PANGOLIN_LIBOPENEXR "Build support for libopenexr image input" ON) + if(BUILD_PANGOLIN_LIBOPENEXR) +- find_package(OpenEXR QUIET) ++ find_package(OpenEXR CONFIG QUIET) + if(OpenEXR_FOUND) + set(HAVE_OPENEXR 1) +- list(APPEND INTERNAL_INC ${OpenEXR_INCLUDE_DIR} ) +- list(APPEND LINK_LIBS ${OpenEXR_LIBRARY} ) ++ list(APPEND LINK_LIBS OpenEXR::IlmImf OpenEXR::IlmImfUtil OpenEXR::IlmImfConfig ) + message(STATUS "libopenexr Found and Enabled") + endif() + endif() +@@ -630,6 +635,13 @@ endif() + + set(INSTALL_INCLUDE_DIR "include") + ++# Required by geometry ++if(NOT BUILD_EXTERN_GLEW) ++ find_package(GLEW REQUIRED) ++endif() ++list(APPEND USER_INC ${GLEW_INCLUDE_DIR}) ++list(APPEND LINK_LIBS ${GLEW_LIBRARY}) ++ + add_library(${LIBRARY_NAME} ${SOURCES} ${HEADERS}) + # 'System' includes shield us from warnings in those includes. + target_include_directories(${LIBRARY_NAME} SYSTEM PUBLIC ${USER_INC} PRIVATE ${INTERNAL_INC}) +@@ -692,7 +704,13 @@ CreateMethodCallFile( + option(BUILD_PYPANGOLIN_MODULE "Python wrapper for Pangolin" ON) + if(BUILD_PYPANGOLIN_MODULE AND HAVE_PYTHON ) + file(GLOB pypangolin_SRC "python/pypangolin/*.hpp" "python/pypangolin/*.cpp" "python/pypangolin_module.cpp") +- pybind11_add_module(pypangolin ${pypangolin_SRC}) ++ if (BUILD_SHARED_LIBS) ++ set(PYBIND11_MODULE_TYPE SHARED) ++ else() ++ set(PYBIND11_MODULE_TYPE STATIC) ++ endif() ++ ++ pybind11_add_module(pypangolin ${PYBIND11_MODULE_TYPE} ${pypangolin_SRC}) + target_link_libraries(pypangolin PRIVATE ${LIBRARY_NAME}) + target_include_directories(pypangolin PRIVATE "${USER_INC}") + endif() diff --git a/externals/vcpkg/ports/pangolin/fix-includepath-error.patch b/externals/vcpkg/ports/pangolin/fix-includepath-error.patch new file mode 100755 index 000000000..a5ee1ad1d --- /dev/null +++ b/externals/vcpkg/ports/pangolin/fix-includepath-error.patch @@ -0,0 +1,13 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index a2c60ea..ddeb144 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -735,7 +735,7 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake @ONLY IMMEDIATE ) + + # Install tree config +-set( EXPORT_LIB_INC_DIR "\${PROJECT_CMAKE_DIR}/${REL_INCLUDE_DIR}" ) ++set( EXPORT_LIB_INC_DIR "\${PROJECT_CMAKE_DIR}/../../include" ) + configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PROJECT_NAME}Config.cmake @ONLY ) + diff --git a/externals/vcpkg/ports/pangolin/portfile.cmake b/externals/vcpkg/ports/pangolin/portfile.cmake new file mode 100755 index 000000000..f5398c350 --- /dev/null +++ b/externals/vcpkg/ports/pangolin/portfile.cmake @@ -0,0 +1,95 @@ + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO stevenlovegrove/Pangolin + REF dd801d244db3a8e27b7fe8020cd751404aa818fd #v0.6 + SHA512 8004ab6f146f319df41e4b8d4bdb6677b8faf6db725e34fea76fcbf065522fa286d334c2426dcb39faf0cfb3332946104f78393d2b2b2418fe02d91450916e78 + HEAD_REF master + PATCHES + fix-includepath-error.patch # include path has one more ../ + fix-cmake-version.patch + fix-build-error-in-vs2019.patch + fix-dependencies.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + test BUILD_TESTS + tools BUILD_TOOLS + examples BUILD_EXAMPLES + gui BUILD_PANGOLIN_GUI + vars BUILD_PANGOLIN_VARS + video BUILD_PANGOLIN_VIDEO + pybind11 BUILD_PANGOLIN_PYTHON + eigen BUILD_PANGOLIN_EIGEN + ffmpeg BUILD_PANGOLIN_FFMPEG + realsense BUILD_PANGOLIN_LIBREALSENSE2 + openni2 BUILD_PANGOLIN_OPENNI2 + uvc BUILD_PANGOLIN_LIBUVC + png BUILD_PANGOLIN_LIBPNG + jpeg BUILD_PANGOLIN_LIBJPEG + tiff BUILD_PANGOLIN_LIBTIFF + openexr BUILD_PANGOLIN_LIBOPENEXR + zstd BUILD_PANGOLIN_ZSTD + lz4 BUILD_PANGOLIN_LZ4 + module BUILD_PYPANGOLIN_MODULE +) + +file(REMOVE "${SOURCE_PATH}/CMakeModules/FindGLEW.cmake") +file(REMOVE "${SOURCE_PATH}/CMakeModules/FindFFMPEG.cmake") + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" MSVC_USE_STATIC_CRT) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} + -DBUILD_EXTERN_GLEW=OFF + -DBUILD_EXTERN_LIBPNG=OFF + -DBUILD_EXTERN_LIBJPEG=OFF + -DBUILD_PANGOLIN_PLEORA=OFF + -DBUILD_PANGOLIN_TELICAM=OFF + -DBUILD_PANGOLIN_DEPTHSENSE=OFF + -DBUILD_PANGOLIN_OPENNI=OFF + -DBUILD_PANGOLIN_UVC_MEDIAFOUNDATION=OFF + -DBUILD_PANGOLIN_LIBREALSENSE=OFF + -DBUILD_PANGOLIN_V4L=OFF + -DBUILD_PANGOLIN_LIBDC1394=OFF + -DBUILD_PANGOLIN_TOON=OFF + -DDISPLAY_WAYLAND=OFF + -DDISPLAY_X11=OFF + -DBUILD_FOR_GLES_2=OFF + -DMSVC_USE_STATIC_CRT=${MSVC_USE_STATIC_CRT} + MAYBE_UNUSED_VARIABLES + MSVC_USE_STATIC_CRT + BUILD_FOR_GLES_2 +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Pangolin) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/pangolin/PangolinConfig.cmake" "SET( Pangolin_CMAKEMODULES ${SOURCE_PATH}/src/../CMakeModules )" "") + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES Plotter VideoConvert VideoJsonPrint VideoJsonTransform VideoViewer AUTO_CLEAN) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +if(VCPKG_TARGET_IS_WINDOWS) + # Copy missing header file + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/include/pangolin/pangolin_export.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/pangolin") +endif() + +# Put the license file where vcpkg expects it +file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENCE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/pangolin/usage b/externals/vcpkg/ports/pangolin/usage new file mode 100755 index 000000000..93db9b75b --- /dev/null +++ b/externals/vcpkg/ports/pangolin/usage @@ -0,0 +1,5 @@ +The package pangolin is compatible with built-in CMake targets: + + find_package(Pangolin CONFIG REQUIRED) + target_link_libraries(main PRIVATE pangolin) + target_include_directories(main PRIVATE ${Pangolin_INCLUDE_DIRS}) diff --git a/externals/vcpkg/ports/pangolin/vcpkg.json b/externals/vcpkg/ports/pangolin/vcpkg.json new file mode 100755 index 000000000..f44614473 --- /dev/null +++ b/externals/vcpkg/ports/pangolin/vcpkg.json @@ -0,0 +1,131 @@ +{ + "name": "pangolin", + "version": "0.6", + "port-version": 2, + "description": "Lightweight GUI Library", + "homepage": "https://github.com/stevenlovegrove/Pangolin", + "supports": "!uwp", + "dependencies": [ + "glew", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "eigen", + "ffmpeg", + "gui", + "jpeg", + "png", + "vars", + "video" + ], + "features": { + "eigen": { + "description": "Build support for Eigen matrix types", + "dependencies": [ + "eigen3" + ] + }, + "examples": { + "description": "Build Examples" + }, + "ffmpeg": { + "description": "Build support for ffmpeg video input", + "dependencies": [ + { + "name": "ffmpeg", + "features": [ + "avformat" + ] + } + ] + }, + "gui": { + "description": "Build support for Pangolin GUI" + }, + "jpeg": { + "description": "Build support for libjpeg image input", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "lz4": { + "description": "Build support for liblz4 compression", + "dependencies": [ + "lz4" + ] + }, + "module": { + "description": "Python wrapper for Pangolin", + "dependencies": [ + "python3" + ] + }, + "openexr": { + "description": "Build support for libopenexr image input", + "dependencies": [ + "openexr" + ] + }, + "openni2": { + "description": "Build support for OpenNI2 video input", + "dependencies": [ + "openni2" + ] + }, + "png": { + "description": "Build support for libpng image input", + "dependencies": [ + "libpng" + ] + }, + "pybind11": { + "description": "Build support for Pangolin Interactive Console", + "dependencies": [ + "pybind11" + ] + }, + "realsense": { + "description": "Build support for LibRealSense2 video input", + "dependencies": [ + "realsense2" + ] + }, + "test": { + "description": "Build Tests" + }, + "tiff": { + "description": "Build support for libtiff image input", + "dependencies": [ + "tiff" + ] + }, + "tools": { + "description": "Build Tools" + }, + "uvc": { + "description": "Build support for MediaFoundation UVC input", + "dependencies": [ + "libuvc" + ] + }, + "vars": { + "description": "Build support for Pangolin Vars" + }, + "video": { + "description": "Build support for Pangolin Video Utilities" + }, + "zstd": { + "description": "Build support for libzstd compression", + "dependencies": [ + "zstd" + ] + } + } +} diff --git a/externals/vcpkg/ports/pangomm/portfile.cmake b/externals/vcpkg/ports/pangomm/portfile.cmake new file mode 100755 index 000000000..bc19a9516 --- /dev/null +++ b/externals/vcpkg/ports/pangomm/portfile.cmake @@ -0,0 +1,28 @@ +# Keep distfile, don't use GitLab! +vcpkg_download_distfile(ARCHIVE + URLS "https://ftp.gnome.org/pub/GNOME/sources/pangomm/2.50/pangomm-2.50.0.tar.xz" + FILENAME "pangomm-2.50.0.tar.xz" + SHA512 844850db93b8c4dab19dd364e674ee3d61b2fcb8e020ab3d314f240065ee17aeceea21e9ddc438a7d09d56410e3f82147a57425f76bb01e26d82872934269477 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dmsvc14x-parallel-installable=false + -Dbuild-documentation=false + ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' + ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' +) + +vcpkg_install_meson() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/pangomm/vcpkg.json b/externals/vcpkg/ports/pangomm/vcpkg.json new file mode 100755 index 000000000..a78702129 --- /dev/null +++ b/externals/vcpkg/ports/pangomm/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "pangomm", + "version": "2.50.0", + "port-version": 2, + "description": "pangomm is the official C++ interface for the Pango font layout library. See, for instance, the Pango::Layout class.", + "homepage": "https://gitlab.gnome.org/GNOME/pangomm", + "license": "LGPL-2.1", + "supports": "!arm", + "dependencies": [ + "cairo", + "cairomm", + "fontconfig", + "freetype", + "gettext", + "glib", + { + "name": "glib", + "host": true + }, + "glibmm", + "harfbuzz", + "pango", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/parallel-hashmap/portfile.cmake b/externals/vcpkg/ports/parallel-hashmap/portfile.cmake new file mode 100755 index 000000000..044226d8b --- /dev/null +++ b/externals/vcpkg/ports/parallel-hashmap/portfile.cmake @@ -0,0 +1,23 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO greg7mdp/parallel-hashmap + REF 1.34 + SHA512 3747422e80406aa77b009adee3c16325640dd1044560882fb881dac5ef4109f7d165d26ed7e64002c9285275f95962725ce20c918da12c0c113999c8ca3c7429 + HEAD_REF master +) + +# Use greg7mdp/parallel-hashmap's own build process, skipping examples and tests +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() + +# Delete redundant directories +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/share/doc) + +file(COPY ${SOURCE_PATH}/phmap.natvis DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Put the licence file where vcpkg expects it +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/parallel-hashmap/vcpkg.json b/externals/vcpkg/ports/parallel-hashmap/vcpkg.json new file mode 100755 index 000000000..8393345a8 --- /dev/null +++ b/externals/vcpkg/ports/parallel-hashmap/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "parallel-hashmap", + "version": "1.34", + "description": "A header-only, very fast and memory-friendly family of C++ hash map & btree containers.", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/parallelstl/fix-cmakelist.patch b/externals/vcpkg/ports/parallelstl/fix-cmakelist.patch new file mode 100755 index 000000000..01a2c2271 --- /dev/null +++ b/externals/vcpkg/ports/parallelstl/fix-cmakelist.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 878b212..caa3cba 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -44,7 +44,7 @@ add_library(pstl::ParallelSTL ALIAS ParallelSTL) + if (PARALLELSTL_USE_PARALLEL_POLICIES) + message(STATUS "Using Parallel Policies") + if (PARALLELSTL_BACKEND STREQUAL "tbb") +- find_package(TBB 2018 REQUIRED tbb OPTIONAL_COMPONENTS tbbmalloc) ++ find_package(TBB CONFIG REQUIRED tbb OPTIONAL_COMPONENTS tbbmalloc) + message(STATUS "Parallel STL uses TBB ${TBB_VERSION} (interface version: ${TBB_INTERFACE_VERSION})") + target_link_libraries(ParallelSTL INTERFACE TBB::tbb) + else() +@@ -64,8 +64,7 @@ target_include_directories(ParallelSTL + INTERFACE + $ + $ +- $ +- $) ++ $) + + target_compile_features(ParallelSTL + INTERFACE +@@ -100,6 +99,8 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ParallelSTLConfig.cmake" + DESTINATION lib/cmake/ParallelSTL) + install(DIRECTORY include/pstl + DESTINATION include) ++file(GLOB STDLIB_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/stdlib/pstl/*) ++install(FILES ${STDLIB_HEADERS} DESTINATION include/pstl) + + add_custom_target(install-pstl + COMMAND "${CMAKE_COMMAND}" -P "${PROJECT_BINARY_DIR}/cmake_install.cmake" -DCOMPONENT=ParallelSTL) diff --git a/externals/vcpkg/ports/parallelstl/portfile.cmake b/externals/vcpkg/ports/parallelstl/portfile.cmake new file mode 100755 index 000000000..a082b8b2b --- /dev/null +++ b/externals/vcpkg/ports/parallelstl/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO intel/parallelstl + REF 0241743d73bb405b16d9c4a24b693e4533dc34a7 # 20200330 + SHA512 cd2f1b60639e9da35a722bdef0bc6420ddca064e3bff979d8a6ea591fb43865b7614c811bced642fd5ff1fab659da1dfaa248dc2b321db7f27d0e74544a2f21e + HEAD_REF master + PATCHES + fix-cmakelist.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DPARALLELSTL_USE_PARALLEL_POLICIES=ON +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ParallelSTL) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/parallelstl/vcpkg.json b/externals/vcpkg/ports/parallelstl/vcpkg.json new file mode 100755 index 000000000..f64a2af0f --- /dev/null +++ b/externals/vcpkg/ports/parallelstl/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "parallelstl", + "version-string": "20200330", + "port-version": 1, + "description": "Parallel STL is an implementation of the C++ standard library algorithms with support for execution policies, as specified in ISO/IEC 14882:2017 standard, commonly called C++17.", + "homepage": "https://github.com/intel/parallelstl", + "dependencies": [ + "tbb" + ] +} diff --git a/externals/vcpkg/ports/paraview/add-tools-option.patch b/externals/vcpkg/ports/paraview/add-tools-option.patch new file mode 100755 index 000000000..86ba2c5a6 --- /dev/null +++ b/externals/vcpkg/ports/paraview/add-tools-option.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8b33b25..10cadda 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -730,7 +730,10 @@ if (PARAVIEW_ENABLE_WEB) + @ONLY) + endif () + ++option(PARAVIEW_BUILD_TOOLS "Build paraview tools" OFF) ++if (PARAVIEW_BUILD_TOOLS) + add_subdirectory(Clients) ++endif() + + if (PARAVIEW_USE_PYTHON) + add_subdirectory(Wrapping/Python) diff --git a/externals/vcpkg/ports/paraview/catalyst_install.patch b/externals/vcpkg/ports/paraview/catalyst_install.patch new file mode 100755 index 000000000..e52802fbe --- /dev/null +++ b/externals/vcpkg/ports/paraview/catalyst_install.patch @@ -0,0 +1,24 @@ +diff --git a/Clients/InSitu/CMakeLists.txt b/Clients/InSitu/CMakeLists.txt +index 159aa8ffc..f9bfc7dfe 100644 +--- a/Clients/InSitu/CMakeLists.txt ++++ b/Clients/InSitu/CMakeLists.txt +@@ -86,5 +86,5 @@ _vtk_module_apply_properties(catalyst) + # Update install locations + catalyst_library( + TARGET catalyst +- LIBRARY_DESTINATION "${_vtk_build_LIBRARY_DESTINATION}" ++ #LIBRARY_DESTINATION "${_vtk_build_LIBRARY_DESTINATION}" + INSTALL_EXPORT_DEFAULT) +diff --git a/Remoting/Views/vtkGeometryRepresentationInternal.h b/Remoting/Views/vtkGeometryRepresentationInternal.h +index 86eb383af..cc204fba2 100644 +--- a/Remoting/Views/vtkGeometryRepresentationInternal.h ++++ b/Remoting/Views/vtkGeometryRepresentationInternal.h +@@ -22,7 +22,7 @@ + // serial backend. + #ifndef __VTK_WRAP__ + #if VTK_MODULE_ENABLE_VTK_vtkm +-#include "vtkmConfigFilters.h" // for VTKM_ENABLE_TBB ++//#include "vtkmConfigFilters.h" // for VTKM_ENABLE_TBB + #endif + + #if defined(VTKM_ENABLE_TBB) && VTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters diff --git a/externals/vcpkg/ports/paraview/cgns.patch b/externals/vcpkg/ports/paraview/cgns.patch new file mode 100755 index 000000000..2ebb05e1b --- /dev/null +++ b/externals/vcpkg/ports/paraview/cgns.patch @@ -0,0 +1,29 @@ +diff --git a/CMake/FindCGNS.cmake b/CMake/FindCGNS.cmake +index 005f1afd9..a45103a9f 100644 +--- a/CMake/FindCGNS.cmake ++++ b/CMake/FindCGNS.cmake +@@ -16,7 +16,7 @@ mark_as_advanced(CGNS_INCLUDE_DIR) + + find_library(CGNS_LIBRARY + NAMES +- cgns ++ cgnsdll cgns + DOC "CGNS library") + mark_as_advanced(CGNS_LIBRARY) + +@@ -45,4 +45,15 @@ if (CGNS_FOUND) + IMPORTED_LOCATION "${CGNS_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${CGNS_INCLUDE_DIR}") + endif () ++ include(CMakeFindDependencyMacro) ++ find_dependency(hdf5 CONFIG) ++ if(TARGET hdf5::hdf5-shared) ++ set_property(TARGET CGNS::CGNS APPEND PROPERTY ++ INTERFACE_LINK_LIBRARIES "hdf5::hdf5-shared") ++ elseif(TARGET hdf5::hdf5-static) ++ set_property(TARGET CGNS::CGNS APPEND PROPERTY ++ INTERFACE_LINK_LIBRARIES "hdf5::hdf5-static") ++ else() ++ message(FATAL_ERROR "No HDF5 target to link cgns against") ++ endif() + endif () diff --git a/externals/vcpkg/ports/paraview/external_vtk.patch b/externals/vcpkg/ports/paraview/external_vtk.patch new file mode 100755 index 000000000..0df160d6a --- /dev/null +++ b/externals/vcpkg/ports/paraview/external_vtk.patch @@ -0,0 +1,150 @@ +diff --git a/CMake/ParaViewClient.cmake b/CMake/ParaViewClient.cmake +index b0dea2b32..b035a9dc3 100644 +--- a/CMake/ParaViewClient.cmake ++++ b/CMake/ParaViewClient.cmake +@@ -516,6 +516,7 @@ function (paraview_client_documentation) + NAMES xmlpatterns-qt5 xmlpatterns + HINTS "${Qt5_DIR}/../../../bin" + "${Qt5_DIR}/../../../libexec/qt5/bin" ++ "${Qt5_DIR}/../../../tools/qt5/bin" + DOC "Path to xmlpatterns") + mark_as_advanced(qt_xmlpatterns_executable) + +diff --git a/CMake/ParaViewOptions.cmake b/CMake/ParaViewOptions.cmake +index f544a7c06..c51278931 100644 +--- a/CMake/ParaViewOptions.cmake ++++ b/CMake/ParaViewOptions.cmake +@@ -88,7 +88,7 @@ endif() + #======================================================================== + + # XXX(VTK): External VTK is not yet actually supported. +-if (FALSE) ++if (TRUE) + option(PARAVIEW_USE_EXTERNAL_VTK "Use an external VTK." OFF) + mark_as_advanced(PARAVIEW_USE_EXTERNAL_VTK) + else () +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1af77d164..bebcb83ee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -72,7 +72,8 @@ if (NOT CMAKE_INSTALL_LICENSEDIR) + endif () + + set(paraview_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/CMake") +-set(vtk_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake") ++set(vtk_cmake_dir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/vtk") ++message(STATUS "vtk_cmake_dir:${vtk_cmake_dir}") + if (NOT IS_DIRECTORY "${vtk_cmake_dir}") + message(FATAL_ERROR + "Failed to find the VTK CMake directory. Did you forget to initialize the " +@@ -383,9 +384,73 @@ endif () + + if (PARAVIEW_USE_EXTERNAL_VTK) + if (paraview_required_modules OR paraview_unrecognized_modules) +- message(FATAL_ERROR +- "The following modules were requested or required, but not found: " +- "${paraview_required_modules};${paraview_unrecognized_modules}.") ++ message(STATUS "REQUIRED:${paraview_required_modules}") ++ foreach(mod ${paraview_required_modules}) ++ if(NOT TARGET ${mod}) ++ message(STATUS "REQUIRED TARGET not defined: ${mod}") ++ list(APPEND modules_notarget ${mod}) ++ endif() ++ if(${mod} MATCHES "VTK::") # For better debugging ++ message(STATUS "VTK TARGET found: ${mod}") ++ list(APPEND vtk_modules ${mod}) ++ endif() ++ endforeach() ++ foreach(mod ${paraview_unrecognized_modules}) ++ if(NOT TARGET ${mod}) ++ message(STATUS "UNREC TARGET not defined: ${mod}") ++ list(FIND paraview_rejected_modules ${mod} _found_mod) ++ if(_found_mod GREATER_EQUAL 0) ++ message(STATUS "MODULE ${mod} not necessary; Removing from unrecognized") ++ list(APPEND _to_remove ${mod}) ++ endif() ++ else() ++ list(APPEND _to_remove ${mod}) ++ #list(APPEND vtk_modules ${mod}) #probably do not need to add unrecognized_modules to the wrapper ++ endif() ++ endforeach() ++ message(STATUS "UNRECOGNIZED:${paraview_unrecognized_modules}") ++ list(REMOVE_ITEM paraview_unrecognized_modules ${_to_remove}) ++ message(STATUS "REJECTED MODULES: ${paraview_rejected_modules}") ++ message(STATUS "UNRECOGNIZED WITHOUT REJECTED AND KNOWN TARGETS: ${paraview_unrecognized_modules}") ++ message(STATUS "ALL PROVIDED MODULES: ${paraview_modules}") ++ set(_unnecessary_moduls ${paraview_modules}) ++ list(REMOVE_ITEM _unnecessary_moduls ${paraview_required_modules}) ++ message(STATUS "Unnecessary MODULES: ${_unnecessary_moduls}") ++ if(modules_notarget) ++ message(FATAL_ERROR ++ "The following modules were requested or required, but not found: " ++ "${modules_notarget}") ++ endif() ++ list(REMOVE_DUPLICATES vtk_modules) ++ macro(search_dependent_targets) ++ set(vtk_mod_dep_list) ++ foreach(vtk_targ ${ARGN}) ++ get_target_property(vtk_mod_dep ${vtk_targ} "INTERFACE_vtk_module_depends") ++ if(vtk_mod_dep) ++ list(APPEND vtk_mod_dep_list ${vtk_mod_dep}) ++ endif() ++ get_target_property(vtk_mod_pdep ${vtk_targ} "INTERFACE_vtk_module_private_depends") ++ if(vtk_mod_pdep) ++ list(APPEND vtk_mod_dep_list ${vtk_mod_pdep}) ++ endif() ++ get_target_property(vtk_mod_odep ${vtk_targ} "INTERFACE_vtk_module_opional_depends") ++ if(vtk_mod_odep) ++ list(APPEND vtk_mod_dep_list ${vtk_mod_odep}) ++ endif() ++ if(vtk_mod_dep_list) ++ message(STATUS "Target ${vtk_targ} depends on ${vtk_mod_dep_list}") ++ list(REMOVE_ITEM vtk_mod_dep_list ${vtk_modules}) ++ if(vtk_mod_dep_list) ++ message(STATUS "Newly discovered modules: ${vtk_mod_dep_list}") ++ list(APPEND vtk_modules ${vtk_mod_dep_list}) ++ search_dependent_targets(${vtk_mod_dep_list}) ++ else() ++ message(STATUS "No new modules discovered!") ++ endif() ++ endif() ++ endforeach() ++ endmacro() ++ search_dependent_targets(${vtk_modules}) + endif () + + if (PARAVIEW_USE_PYTHON) +@@ -459,7 +524,7 @@ else () + endif() + + # Set up these variables now so that modules may acess them +- if (NOT PARAVIEW_USE_EXTERNAL_VTK AND PARAVIEW_INSTALL_DEVELOPMENT_FILES) ++ if (PARAVIEW_INSTALL_DEVELOPMENT_FILES) + set(vtk_cmake_dir + "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake") + set(vtk_cmake_destination +@@ -558,6 +623,9 @@ set(_paraview_add_tests_default_data_directory + set(_paraview_add_tests_default_test_data_target + "ParaViewData") + ++list(REMOVE_DUPLICATES vtk_modules) # Missed this somewhere ++list(REMOVE_DUPLICATES paraview_modules) # probably not needed ++ + vtk_module_build( + MODULES ${paraview_modules} + KITS ${paraview_kits} +@@ -596,9 +664,11 @@ vtk_module_build( + TEST_OUTPUT_DATA_DIRECTORY "${paraview_test_data_directory_output}") + + include(vtkModuleJson) +-vtk_module_json( +- MODULES ${vtk_modules} +- OUTPUT "vtk-modules.json") ++if(NOT PARAVIEW_USE_EXTERNAL_VTK) ++ vtk_module_json( ++ MODULES ${vtk_modules} ++ OUTPUT "vtk-modules.json") ++endif() + vtk_module_json( + MODULES ${paraview_modules} + OUTPUT "paraview-modules.json") diff --git a/externals/vcpkg/ports/paraview/portfile.cmake b/externals/vcpkg/ports/paraview/portfile.cmake new file mode 100755 index 000000000..46ea8b9a8 --- /dev/null +++ b/externals/vcpkg/ports/paraview/portfile.cmake @@ -0,0 +1,189 @@ +file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _vcpkg_json) +string(JSON _ver_string GET "${_vcpkg_json}" "version") +string(REGEX MATCH "^[0-9]+\.[0-9]+" VERSION "${_ver_string}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + "cuda" PARAVIEW_USE_CUDA #untested; probably only affects internal VTK build so it does nothing here + "all_modules" PARAVIEW_BUILD_ALL_MODULES #untested + "mpi" PARAVIEW_USE_MPI #untested + "vtkm" PARAVIEW_USE_VTKM + "python" PARAVIEW_USE_PYTHON + "tools" PARAVIEW_BUILD_TOOLS +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Kitware/ParaView + REF aad4b6f1e92154879209102edfab8367f1e7d191 # v5.9.1 + SHA512 330fcb8525bdee9b02e06f05d4e91cc4d631d03df99c30f82bb97da5e06b5a2a6ff4ecee807b6f6c7110d2f53db1c17e4670d6078ae1cc89cfd7089b67d05bdb + HEAD_REF master + PATCHES + external_vtk.patch + cgns.patch + python_include.patch + python_wrapper.patch + add-tools-option.patch + catalyst_install.patch +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND VisItPatches removedoublesymbols.patch) +endif() + +#The following two dependencies should probably be their own port +#but require additional patching in paraview to make it work. + +#Get VisItBridge Plugin +vcpkg_from_gitlab( + OUT_SOURCE_PATH VISITIT_SOURCE_PATH + GITLAB_URL https://gitlab.kitware.com/ + REPO paraview/visitbridge + REF 42fce8ad6863ca2c1308741955cca1d0cf570d22 + SHA512 03a6254989d3e286a462683af92caba1e90decbdcfb2e729f2d7e1116b04d63a05c28d02c4615d780fdd0d33e2719f96617233d6e0602410cc6d894f92fe6ee3 + PATCHES + ${VisItPatches} +) +#Get QtTesting Plugin +vcpkg_from_gitlab( + OUT_SOURCE_PATH QTTESTING_SOURCE_PATH + GITLAB_URL https://gitlab.kitware.com/ + REPO paraview/qttesting + REF 72290689c7c55622d729bf95c97e7627026a234e + SHA512 fb18c6745b784b294f01d5391ba4cdcaa109443a193eb35fbf1553fdb3a4f7217f784fd4893fab72784cec5bd3fc821bf1e766e943d0f562c5917788800599b0 +) + +#Get Catalyst +vcpkg_from_gitlab( + OUT_SOURCE_PATH CATALYST_SOURCE_PATH + GITLAB_URL https://gitlab.kitware.com/ + REPO paraview/catalyst + REF e36e4a5f3c67011c97c335cce23d2bc3abc0d086 + SHA512 9926c272ab8785997f9c98cfaf696943081b0ddb0e9e343602722671b6f3eaef5b8de5dd049ca783b6844c7e328a96e1b09c8b24c16f001eeeed2d154d290480 +) + + +file(COPY "${VISITIT_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/Utilities/VisItBridge") +file(COPY "${QTTESTING_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/ThirdParty/QtTesting/vtkqttesting") +file(COPY "${CATALYST_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/ThirdParty/catalyst/vtkcatalyst/catalyst") + +if("python" IN_LIST FEATURES) + vcpkg_find_acquire_program(PYTHON3) + list(APPEND ADDITIONAL_OPTIONS + -DPython3_FIND_REGISTRY=NEVER + "-DPython3_EXECUTABLE:PATH=${PYTHON3}" # Required by more than one feature + ) + #VTK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} + -DPARAVIEW_BUILD_WITH_EXTERNAL:BOOL=ON + -DPARAVIEW_USE_EXTERNAL_VTK:BOOL=ON + -DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON + -DVTK_MODULE_ENABLE_ParaView_qttesting=YES + -DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION:BOOL=OFF + -DPARAVIEW_USE_QTHELP:BOOL=OFF + + #A little bit of help in finding the boost headers + "-DBoost_INCLUDE_DIR:PATH=${CURRENT_INSTALLED_DIR}/include" + + # Workarounds for CMake issues + -DHAVE_SYS_TYPES_H=0 ## For some strange reason the test first succeeds and then fails the second time around + -DWORDS_BIGENDIAN=0 ## Tests fails in VisItCommon.cmake for some unknown reason this is just a workaround since most systems are little endian. + ${ADDITIONAL_OPTIONS} + + #-DPARAVIEW_ENABLE_FFMPEG:BOOL=OFF +) +if(CMAKE_HOST_UNIX) + # ParaView runs Qt tools so LD_LIBRARY_PATH must be set correctly for them to find *.so files + set(BACKUP_LD_LIBRARY_PATH $ENV{LD_LIBRARY_PATH}) + set(ENV{LD_LIBRARY_PATH} "${BACKUP_LD_LIBRARY_PATH}:${CURRENT_INSTALLED_DIR}/lib") +endif() + +vcpkg_cmake_install(ADD_BIN_TO_PATH) # Bin to path required since paraview will use some self build tools + +if(CMAKE_HOST_UNIX) + set(ENV{LD_LIBRARY_PATH} "${BACKUP_LD_LIBRARY_PATH}") +endif() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/paraview-${VERSION}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# see https://gitlab.kitware.com/paraview/paraview/-/issues/21328 +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/paraview-${VERSION}/vtkCPConfig.h") + +set(TOOLVER pv${VERSION}) +set(TOOLS paraview + pvbatch + pvdataserver + pvpython + pvrenderserver + pvserver + smTestDriver + vtkProcessXML + vtkWrapClientServer) + +foreach(tool ${TOOLS}) + # Remove debug tools + set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}) + if(EXISTS ${filename}) + file(REMOVE "${filename}") + endif() + set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${tool}-${TOOLVER}${VCPKG_TARGET_EXECUTABLE_SUFFIX}) + if(EXISTS ${filename}) + file(REMOVE "${filename}") + endif() + set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${tool}-${TOOLVER}d${VCPKG_TARGET_EXECUTABLE_SUFFIX}) + if(EXISTS ${filename}) + file(REMOVE "${filename}") + endif() + + # Move release tools + set(filename ${CURRENT_PACKAGES_DIR}/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}) + if(EXISTS ${filename}) + file(INSTALL "${filename}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(REMOVE "${filename}") + endif() + set(filename ${CURRENT_PACKAGES_DIR}/bin/${tool}-${TOOLVER}${VCPKG_TARGET_EXECUTABLE_SUFFIX}) + if(EXISTS ${filename}) + file(INSTALL "${filename}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(REMOVE "${filename}") + endif() +endforeach() +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME Copyright.txt) # Which one is the correct one? +file(INSTALL "${SOURCE_PATH}/License_v1.2.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + macro(move_bin_to_lib name) + if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/${name}) + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${name}" "${CURRENT_PACKAGES_DIR}/lib/${name}") + endif() + if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/bin/${name}) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/${name}" "${CURRENT_PACKAGES_DIR}/debug/lib/${name}") + endif() + endmacro() + + set(to_move Lib paraview-${VERSION} paraview-config) + foreach(name ${to_move}) + move_bin_to_lib(${name}) + endforeach() + + file(GLOB_RECURSE cmake_files ${CURRENT_PACKAGES_DIR}/share/${PORT}/*.cmake) + foreach(cmake_file ${cmake_files}) + file(READ "${cmake_file}" _contents) + STRING(REPLACE "bin/" "lib/" _contents "${_contents}") + file(WRITE "${cmake_file}" "${_contents}") + endforeach() + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# The plugins also work without these files +file(REMOVE "${CURRENT_PACKAGES_DIR}/Applications/paraview.app/Contents/Resources/paraview.conf") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/Applications/paraview.app/Contents/Resources/paraview.conf") diff --git a/externals/vcpkg/ports/paraview/python_include.patch b/externals/vcpkg/ports/paraview/python_include.patch new file mode 100755 index 000000000..42ada661b --- /dev/null +++ b/externals/vcpkg/ports/paraview/python_include.patch @@ -0,0 +1,13 @@ +diff --git a/CMake/ParaViewOptions.cmake b/CMake/ParaViewOptions.cmake +index 0ecb928e9..5b5459a37 100644 +--- a/CMake/ParaViewOptions.cmake ++++ b/CMake/ParaViewOptions.cmake +@@ -136,7 +136,7 @@ option(PARAVIEW_ENABLE_RAYTRACING "Build ParaView with OSPray and/or OptiX ray-t + + set(paraview_web_default ON) + if (PARAVIEW_USE_PYTHON AND WIN32) +- include("${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake/FindPythonModules.cmake") ++ include(FindPythonModules) + find_python_module(win32api have_pywin32) + set(paraview_web_default "${have_pywin32}") + endif () diff --git a/externals/vcpkg/ports/paraview/python_wrapper.patch b/externals/vcpkg/ports/paraview/python_wrapper.patch new file mode 100755 index 000000000..33a70f069 --- /dev/null +++ b/externals/vcpkg/ports/paraview/python_wrapper.patch @@ -0,0 +1,19 @@ +diff --git a/CMake/vtkModuleWrapClientServer.cmake b/CMake/vtkModuleWrapClientServer.cmake +index 3804a24e2..91fdd593a 100644 +--- a/CMake/vtkModuleWrapClientServer.cmake ++++ b/CMake/vtkModuleWrapClientServer.cmake +@@ -37,10 +37,13 @@ function (_vtk_module_wrap_client_server_sources module sources classes) + "$") + set(_vtk_client_server_genex_include_directories + "$") ++ set(_vtk_client_server_genex_interface_include_directories ++ "$") + file(GENERATE + OUTPUT "${_vtk_client_server_args_file}" + CONTENT "$<$:\n-D\'$\'>\n +-$<$:\n-I\'$\'>\n") ++ $<$:\n-I\'$\'>\n ++ $<$:\n-I\'$\'>\n") + + _vtk_module_get_module_property("${module}" + PROPERTY "hierarchy" diff --git a/externals/vcpkg/ports/paraview/removedoublesymbols.patch b/externals/vcpkg/ports/paraview/removedoublesymbols.patch new file mode 100755 index 000000000..70df9b0e8 --- /dev/null +++ b/externals/vcpkg/ports/paraview/removedoublesymbols.patch @@ -0,0 +1,89 @@ +diff --git a/Library/VisItLib/visit_vtk/lightweight/vtkUnstructuredGridFacelistFilter.C b/Library/VisItLib/visit_vtk/lightweight/vtkUnstructuredGridFacelistFilter.C +index db64a0534..0d987d8e7 100644 +--- a/Library/VisItLib/visit_vtk/lightweight/vtkUnstructuredGridFacelistFilter.C ++++ b/Library/VisItLib/visit_vtk/lightweight/vtkUnstructuredGridFacelistFilter.C +@@ -69,7 +69,10 @@ + // + // Forward declare some of types used to hash faces. + // +-class Quad; ++namespace hidden { ++ class Quad; ++} ++using hidden::Quad; + class QuadMemoryManager; + class Tri; + class TriMemoryManager; +@@ -322,43 +325,43 @@ class HashEntryList + // Creation: October 21, 2002 + // + // **************************************************************************** ++namespace hidden { ++ class Quad ++ { ++ friend class Tri; + +-class Quad +-{ +- friend class Tri; +- +- public: +- Quad() { ordering_case = 255; }; +- +- vtkIdType AssignNodes(const vtkIdType *); +- bool Equals(Quad *); +- bool Equals(Tri *); +- void AddInRemainingTriangle(Tri *, int); +- inline void ReRegisterMemory(void) +- { +- hashEntryList->qmm.ReRegisterQuad(this); +- } ++ public: ++ Quad() { ordering_case = 255; }; + +- inline void SetOriginalZone(const int &oz) { orig_zone = oz; }; +- inline int GetOriginalZone(void) { return orig_zone; }; ++ vtkIdType AssignNodes(const vtkIdType *); ++ bool Equals(Quad *); ++ bool Equals(Tri *); ++ void AddInRemainingTriangle(Tri *, int); ++ inline void ReRegisterMemory(void) ++ { ++ hashEntryList->qmm.ReRegisterQuad(this); ++ } + +- void OutputCell(int,vtkPolyData *, vtkCellData *, vtkCellData *); ++ inline void SetOriginalZone(const int &oz) { orig_zone = oz; }; ++ inline int GetOriginalZone(void) { return orig_zone; }; + +- inline void RegisterHashEntryList(HashEntryList *hel) +- { hashEntryList = hel; }; +- inline void SetNumberOfPoints(int np) { npts = np; }; ++ void OutputCell(int,vtkPolyData *, vtkCellData *, vtkCellData *); + +- protected: +- unsigned char ordering_case; +- vtkIdType nodes[3]; +- vtkIdType orig_zone; ++ inline void RegisterHashEntryList(HashEntryList *hel) ++ { hashEntryList = hel; }; ++ inline void SetNumberOfPoints(int np) { npts = np; }; + +- HashEntryList *hashEntryList; +- int npts; ++ protected: ++ unsigned char ordering_case; ++ vtkIdType nodes[3]; ++ vtkIdType orig_zone; + +- void AddInRemainingTriangle(int, int); +-}; ++ HashEntryList *hashEntryList; ++ int npts; + ++ void AddInRemainingTriangle(int, int); ++ }; ++} + // + // We will be re-ordering the nodes into numerical order. This enumerated + // type will allow the ordering to be preserved. diff --git a/externals/vcpkg/ports/paraview/vcpkg.json b/externals/vcpkg/ports/paraview/vcpkg.json new file mode 100755 index 000000000..ba62136a0 --- /dev/null +++ b/externals/vcpkg/ports/paraview/vcpkg.json @@ -0,0 +1,100 @@ +{ + "name": "paraview", + "version": "5.9.1", + "port-version": 2, + "description": "VTK-based Data Analysis and Visualization Application", + "homepage": "https://www.paraview.org/", + "license": "BSD-3-Clause", + "dependencies": [ + "boost-algorithm", + "boost-core", + "boost-format", + "cgns", + "protobuf", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + { + "name": "vtk", + "default-features": false, + "features": [ + "paraview" + ] + } + ], + "features": { + "all-modules": { + "description": "enables the build of all paraview modules", + "dependencies": [ + "ffmpeg", + "gdal", + "laszip", + "pdal" + ] + }, + "cuda": { + "description": "enables cuda within paraview", + "dependencies": [ + "cuda", + { + "name": "vtk", + "default-features": false, + "features": [ + "cuda" + ] + } + ] + }, + "mpi": { + "description": "enables cuda within paraview", + "dependencies": [ + { + "name": "hdf5", + "default-features": false, + "features": [ + "parallel" + ] + }, + { + "name": "vtk", + "default-features": false, + "features": [ + "mpi" + ] + } + ] + }, + "python": { + "description": "enables the build of python wrappers", + "dependencies": [ + { + "name": "vtk", + "default-features": false, + "features": [ + "python" + ] + } + ] + }, + "tools": { + "description": "Build paraview tools" + }, + "vtkm": { + "description": "enables vtkm for the build of paraview", + "dependencies": [ + { + "name": "vtk", + "default-features": false, + "features": [ + "vtkm" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/parmetis/fix-gklib-vs14-math.patch b/externals/vcpkg/ports/parmetis/fix-gklib-vs14-math.patch new file mode 100755 index 000000000..059890e36 --- /dev/null +++ b/externals/vcpkg/ports/parmetis/fix-gklib-vs14-math.patch @@ -0,0 +1,11 @@ +--- a/metis/GKlib/gk_arch.h Wed Dec 21 18:34:18 2016 ++++ b/metis/GKlib/gk_arch.h Wed Dec 21 18:30:49 2016 +@@ -58,7 +58,7 @@ + #define PTRDIFF_MAX INT64_MAX + #endif + +-#ifdef __MSC__ ++#if defined(__MSC__) && (_MSC_VER < 1900) + /* MSC does not have rint() function */ + #define rint(x) ((int)((x)+0.5)) + diff --git a/externals/vcpkg/ports/parmetis/fix-libparmetis-cmakelist.patch b/externals/vcpkg/ports/parmetis/fix-libparmetis-cmakelist.patch new file mode 100755 index 000000000..6cdd7be62 --- /dev/null +++ b/externals/vcpkg/ports/parmetis/fix-libparmetis-cmakelist.patch @@ -0,0 +1,15 @@ +--- a/libparmetis/CMakeLists.txt Sat Mar 30 17:24:50 2013 ++++ b/libparmetis/CMakeLists.txt Wed Dec 21 19:40:28 2016 +@@ -5,10 +5,10 @@ + # Create libparmetis + add_library(parmetis ${ParMETIS_LIBRARY_TYPE} ${parmetis_sources}) + # Link with metis and MPI libraries. +-target_link_libraries(parmetis metis ${MPI_LIBRARIES}) ++target_link_libraries(parmetis ${METIS_LIBRARY} ${MPI_LIBRARIES}) + set_target_properties(parmetis PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}") + + install(TARGETS parmetis + LIBRARY DESTINATION lib +- RUNTIME DESTINATION lib ++ RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib) diff --git a/externals/vcpkg/ports/parmetis/fix-metis-vs14-math.patch b/externals/vcpkg/ports/parmetis/fix-metis-vs14-math.patch new file mode 100755 index 000000000..ddf10052a --- /dev/null +++ b/externals/vcpkg/ports/parmetis/fix-metis-vs14-math.patch @@ -0,0 +1,11 @@ +--- a/metis/libmetis/metislib.h Sat Mar 30 17:24:45 2013 ++++ b/metis/libmetis/metislib.h Wed Dec 21 18:30:59 2016 +@@ -31,7 +31,7 @@ + #include + + +-#if defined(COMPILER_MSC) ++#if defined(COMPILER_MSC) && (_MSC_VER < 1900) + #if defined(rint) + #undef rint + #endif diff --git a/externals/vcpkg/ports/parmetis/fix-root-cmakelist-2.patch b/externals/vcpkg/ports/parmetis/fix-root-cmakelist-2.patch new file mode 100755 index 000000000..8f4630bfa --- /dev/null +++ b/externals/vcpkg/ports/parmetis/fix-root-cmakelist-2.patch @@ -0,0 +1,18 @@ +--- a/CMakeLists.txt 2013-03-30 17:24:50.000000000 +0100 ++++ b/CMakeLists.txt 2021-04-20 10:41:49.946801222 +0200 +@@ -1,12 +1,12 @@ + cmake_minimum_required(VERSION 2.8) + project(ParMETIS) + +-set(GKLIB_PATH METIS/GKlib CACHE PATH "path to GKlib") +-set(METIS_PATH METIS CACHE PATH "path to METIS") ++set(GKLIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/metis/GKlib CACHE PATH "path to GKlib") ++set(METIS_PATH metis CACHE PATH "path to METIS") + + # Symlink ./metis to wherever metis is. This allows files to be + # included from metis/libmetis/. +-execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${METIS_PATH} metis) ++#execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${METIS_PATH} metis) + + # Search for MPI. + # GK commented this out as it seems to be creating problems diff --git a/externals/vcpkg/ports/parmetis/fix-root-cmakelist.patch b/externals/vcpkg/ports/parmetis/fix-root-cmakelist.patch new file mode 100755 index 000000000..914bf9189 --- /dev/null +++ b/externals/vcpkg/ports/parmetis/fix-root-cmakelist.patch @@ -0,0 +1,29 @@ +--- a/CMakeLists.txt Sat Mar 30 17:24:50 2013 ++++ b/CMakeLists.txt Wed Dec 21 19:38:12 2016 +@@ -16,6 +16,9 @@ + # endif() + # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MPI_COMPILE_FLAGS}") + ++find_package(MPI REQUIRED) ++find_library(METIS_LIBRARY NAMES metis) ++ + # Prepare libraries. + if(SHARED) + set(ParMETIS_LIBRARY_TYPE SHARED) +@@ -30,13 +33,13 @@ + include_directories(include) + include_directories(${MPI_INCLUDE_PATH}) + include_directories(${GKLIB_PATH}) +-include_directories(${METIS_PATH}/include) ++# include_directories(${METIS_PATH}/include) + + # List of directories that cmake will look for CMakeLists.txt +-add_subdirectory(${METIS_PATH}/libmetis ${CMAKE_BINARY_DIR}/libmetis) ++# add_subdirectory(${METIS_PATH}/libmetis ${CMAKE_BINARY_DIR}/libmetis) + add_subdirectory(include) + add_subdirectory(libparmetis) +-add_subdirectory(programs) ++# add_subdirectory(programs) + + # This is for testing during development and is not being distributed + #add_subdirectory(test) diff --git a/externals/vcpkg/ports/parmetis/portfile.cmake b/externals/vcpkg/ports/parmetis/portfile.cmake new file mode 100755 index 000000000..62d633eac --- /dev/null +++ b/externals/vcpkg/ports/parmetis/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +set(ADDITIONAL_OPTIONS -DSHARED=OFF) + +vcpkg_download_distfile(ARCHIVE + URLS "http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/parmetis-4.0.3.tar.gz" + FILENAME "parmetis-4.0.3.tar.gz" + SHA512 454a91921ca35c981df11c9846a11963ff8fd8407a25179453af33f8fe69493f6dd7f2a0b8feed9a7d3f121e45b715749dd7a94873eaac2bae4cad1e535ca132 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + fix-metis-vs14-math.patch + fix-gklib-vs14-math.patch + fix-root-cmakelist.patch + fix-libparmetis-cmakelist.patch + use_stdint.patch + fix-root-cmakelist-2.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + ${ADDITIONAL_OPTIONS} +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/parmetis) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/parmetis/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/parmetis/copyright) diff --git a/externals/vcpkg/ports/parmetis/use_stdint.patch b/externals/vcpkg/ports/parmetis/use_stdint.patch new file mode 100755 index 000000000..5b239e60c --- /dev/null +++ b/externals/vcpkg/ports/parmetis/use_stdint.patch @@ -0,0 +1,22 @@ +diff --git a/metis/GKlib/ms_stdint.h b/metis/GKlib/ms_stdint.h +index 7e200dc..0d07a7a 100644 +--- a/metis/GKlib/ms_stdint.h ++++ b/metis/GKlib/ms_stdint.h +@@ -42,6 +42,10 @@ + + #include + ++#if(_MSC_VER >= 1900) ++ #include ++#else ++ + // For Visual Studio 6 in C++ mode wrap include with 'extern "C++" {}' + // or compiler give many errors like this: + // error C2733: second C linkage of overloaded function 'wmemchr' not allowed +@@ -218,5 +222,6 @@ typedef uint64_t uintmax_t; + + #endif // __STDC_CONSTANT_MACROS ] + ++#endif + + #endif // _MSC_STDINT_H_ ] diff --git a/externals/vcpkg/ports/parmetis/vcpkg.json b/externals/vcpkg/ports/parmetis/vcpkg.json new file mode 100755 index 000000000..4b5cf9966 --- /dev/null +++ b/externals/vcpkg/ports/parmetis/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "parmetis", + "version-string": "4.0.3", + "port-version": 5, + "description": "Parallel Graph Partitioning and Fill-reducing Matrix Ordering", + "homepage": "https://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview", + "dependencies": [ + "metis", + "mpi" + ] +} diff --git a/externals/vcpkg/ports/parquet/portfile.cmake b/externals/vcpkg/ports/parquet/portfile.cmake new file mode 100755 index 000000000..593c1e136 --- /dev/null +++ b/externals/vcpkg/ports/parquet/portfile.cmake @@ -0,0 +1,2 @@ +# The parquet library has been merged into arrow +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/parquet/vcpkg.json b/externals/vcpkg/ports/parquet/vcpkg.json new file mode 100755 index 000000000..c604f1a9f --- /dev/null +++ b/externals/vcpkg/ports/parquet/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "parquet", + "version-string": "0", + "port-version": 1, + "description": "Parquet-cpp is a C++ library to read and write the Apache Parquet columnar data format. It is now part of the arrow library.", + "dependencies": [ + "arrow" + ] +} diff --git a/externals/vcpkg/ports/parson/CMakeLists.txt b/externals/vcpkg/ports/parson/CMakeLists.txt new file mode 100755 index 000000000..f96ed427c --- /dev/null +++ b/externals/vcpkg/ports/parson/CMakeLists.txt @@ -0,0 +1,19 @@ +cmake_minimum_required(VERSION 3.5) +project(parson C) + +add_library(parson parson.c) +target_include_directories(parson PUBLIC $) + +install(TARGETS parson + EXPORT unofficial-parson-targets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install( + EXPORT unofficial-parson-targets + FILE unofficial-parson-config.cmake + NAMESPACE unofficial::parson:: + DESTINATION share/unofficial-parson +) diff --git a/externals/vcpkg/ports/parson/portfile.cmake b/externals/vcpkg/ports/parson/portfile.cmake new file mode 100755 index 000000000..887be6ec8 --- /dev/null +++ b/externals/vcpkg/ports/parson/portfile.cmake @@ -0,0 +1,31 @@ +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + message("parson only supports static linkage") + set(VCPKG_LIBRARY_LINKAGE "static") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kgabis/parson + REF 102a4467e10c77ffcfde1d233798780acd719cc5 # accessed on 2020-09-14 + SHA512 8498e667525a0f08881c4041877194bf68926af34c9f0cbd9fd3d9538c31e0ad1ab1c083fbee48423f4ffd99f46e25918928c43585206237c8f723e5e47b17b7 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(COPY ${SOURCE_PATH}/parson.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-parson TARGET_PATH share/unofficial-parson) + +file(INSTALL + ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/parson RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/parson/vcpkg.json b/externals/vcpkg/ports/parson/vcpkg.json new file mode 100755 index 000000000..b128637b2 --- /dev/null +++ b/externals/vcpkg/ports/parson/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "parson", + "version-string": "2020-09-14", + "port-version": 1, + "description": "a lighweight json library written in C" +} diff --git a/externals/vcpkg/ports/pbc/linux.patch b/externals/vcpkg/ports/pbc/linux.patch new file mode 100755 index 000000000..198277739 --- /dev/null +++ b/externals/vcpkg/ports/pbc/linux.patch @@ -0,0 +1,45 @@ +--- configure.ac 2018-11-29 13:51:14.495012138 +0100 ++++ configure.ac 2018-11-29 13:51:45.308095312 +0100 +@@ -10,7 +10,6 @@ + LT_INIT + #AC_CANONICAL_HOST + +-CFLAGS= + default_fink_path=/sw + case $host_os in + darwin*) +@@ -78,20 +77,7 @@ + AC_PROG_MAKE_SET + + AC_PROG_LEX +-if test "x$LEX" != xflex; then +- echo "************************" +- echo "flex not found" +- echo "************************" +- exit -1 +-fi +- + AC_PROG_YACC +-if test "x$YACC" != "xbison -y"; then +- echo "************************" +- echo "bison not found" +- echo "************************" +- exit -1 +-fi + + # Checks for libraries. + lib_err_msg="add its path to LDFLAGS\nsee ./configure --help" +@@ -121,13 +134,6 @@ + + CFLAGS="$CFLAGS -Wall -W -Wfloat-equal -Wpointer-arith -Wcast-align -Wstrict-prototypes -Wredundant-decls \ + -Wendif-labels -Wshadow -pipe -ffast-math -U__STRICT_ANSI__ -std=gnu99" +-if test "$with_debug" == "y"; then +- CFLAGS="$CFLAGS -g3 -O0" +-elif test "$with_enable_optimized" != "no"; then +- CFLAGS="$CFLAGS -g -O2" +-else +- CFLAGS="$CFLAGS -fomit-frame-pointer -O3" +-fi + + if test "$with_safe_clean" != "n"; then + CFLAGS="$CFLAGS -DSAFE_CLEAN" diff --git a/externals/vcpkg/ports/pbc/portfile.cmake b/externals/vcpkg/ports/pbc/portfile.cmake new file mode 100755 index 000000000..235cb9f51 --- /dev/null +++ b/externals/vcpkg/ports/pbc/portfile.cmake @@ -0,0 +1,113 @@ +set(PBC_VERSION 0.5.14) + +if(NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_download_distfile( + ARCHIVE + URLS "https://crypto.stanford.edu/pbc/files/pbc-${PBC_VERSION}.tar.gz" + FILENAME pbc-${PBC_VERSION}.tar.gz + SHA512 d75d4ceb3f67ee62c7ca41e2a91ee914fbffaeb70256675aed6734d586950ea8e64e2f16dc069d71481eddb703624df8d46497005fb58e75cf098dd7e7961333 + ) + + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${PBC_VERSION} + PATCHES linux.patch + ) + + vcpkg_find_acquire_program(BISON) + vcpkg_find_acquire_program(FLEX) + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(SHARED_STATIC --enable-static --disable-shared) + else() + set(SHARED_STATIC --disable-static --enable-shared) + endif() + + set(OPTIONS ${SHARED_STATIC} LEX=${FLEX} YACC=${BISON}\ -y) + + vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + COPY_SOURCE + OPTIONS + ${OPTIONS} + ) + + vcpkg_install_make() + + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share/info) + file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +else() + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO blynn/pbc + REF fbf4589036ce4f662e2d06905862c9e816cf9d08 + SHA512 9348afd3866090b9fca189ae3a6bbb86c842b5f6ee7e1972f1a579993e589952c5926cb0795d4db1e647e3af263827e22c7602314c39bd97e03ffe9ad0fb48ab + HEAD_REF master + PATCHES windows.patch + ) + + set(CMAKE_FIND_LIBRARY_PREFIXES "") + set(CMAKE_FIND_LIBRARY_SUFFIXES "") + + find_path(MPIR_INCLUDE_DIR "gmp.h" HINTS ${CURRENT_INSTALLED_DIR} PATH_SUFFIXES include) + if(NOT MPIR_INCLUDE_DIR) + message(FATAL_ERROR "GMP includes not found") + endif() + + find_library(MPIR_LIBRARIES_REL NAMES "mpir.lib" HINTS ${CURRENT_INSTALLED_DIR} PATH_SUFFIXES lib) + if(NOT MPIR_LIBRARIES_REL) + message(FATAL_ERROR "mpir library not found") + endif() + + find_library(MPIR_LIBRARIES_DBG NAMES "mpir.lib" HINTS ${CURRENT_INSTALLED_DIR} PATH_SUFFIXES debug/lib) + if(NOT MPIR_LIBRARIES_DBG) + message(FATAL_ERROR "mpir debug library not found") + endif() + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(LibrarySuffix "lib") + set(ConfigurationSuffix "") + else() + set(LibrarySuffix "dll") + set(ConfigurationSuffix " DLL") + endif() + + if(VCPKG_CRT_LINKAGE STREQUAL "static") + set(RuntimeLibraryExt "") + else() + set(RuntimeLibraryExt "DLL") + endif() + + if(TRIPLET_SYSTEM_ARCH STREQUAL "x86") + set(Platform "Win32") + else() + set(Platform ${TRIPLET_SYSTEM_ARCH}) + endif() + + # PBC expects mpir directory in build root + get_filename_component(SOURCE_PATH_PARENT ${SOURCE_PATH} DIRECTORY) + file(REMOVE_RECURSE ${SOURCE_PATH_PARENT}/mpir) + file(MAKE_DIRECTORY ${SOURCE_PATH_PARENT}/mpir) + file(GLOB FILES ${MPIR_INCLUDE_DIR}/gmp*.h) + file(COPY ${FILES} ${MPIR_LIBRARIES_REL} DESTINATION "${SOURCE_PATH_PARENT}/mpir/${LibrarySuffix}/${Platform}/Release") + file(COPY ${FILES} ${MPIR_LIBRARIES_DBG} DESTINATION "${SOURCE_PATH_PARENT}/mpir/${LibrarySuffix}/${Platform}/Debug") + + get_filename_component(SOURCE_PATH_SUFFIX ${SOURCE_PATH} NAME) + vcpkg_install_msbuild(SOURCE_PATH ${SOURCE_PATH_PARENT} + PROJECT_SUBPATH ${SOURCE_PATH_SUFFIX}/pbcwin/projects/pbclib.vcxproj + INCLUDES_SUBPATH ${SOURCE_PATH_SUFFIX}/include + LICENSE_SUBPATH ${SOURCE_PATH_SUFFIX}/COPYING + RELEASE_CONFIGURATION "Release${ConfigurationSuffix}" + DEBUG_CONFIGURATION "Debug${ConfigurationSuffix}" + OPTIONS_DEBUG "/p:RuntimeLibrary=MultiThreadedDebug${RuntimeLibraryExt}" + OPTIONS_RELEASE "/p:RuntimeLibrary=MultiThreaded${RuntimeLibraryExt}" + OPTIONS /p:SolutionDir=../ + ALLOW_ROOT_INCLUDES ON + ) + + # clean up mpir stuff + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/mpir.lib ${CURRENT_PACKAGES_DIR}/debug/lib/mpir.lib) +endif() diff --git a/externals/vcpkg/ports/pbc/vcpkg.json b/externals/vcpkg/ports/pbc/vcpkg.json new file mode 100755 index 000000000..b7a040aa8 --- /dev/null +++ b/externals/vcpkg/ports/pbc/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "pbc", + "version": "0.5.14", + "port-version": 6, + "description": "Pairing-Based Crypto library provides low-level routines for pairing-based cryptosystems.", + "homepage": "https://crypto.stanford.edu/pbc", + "supports": "!uwp & !arm", + "dependencies": [ + { + "name": "gmp", + "platform": "!windows" + }, + { + "name": "mpir", + "platform": "windows" + } + ] +} diff --git a/externals/vcpkg/ports/pbc/windows.patch b/externals/vcpkg/ports/pbc/windows.patch new file mode 100755 index 000000000..ea4942cde --- /dev/null +++ b/externals/vcpkg/ports/pbc/windows.patch @@ -0,0 +1,130 @@ +diff --git "a/include/pbc_curve.h" "b/include/pbc_curve.h" +--- "a/include/pbc_curve.h" ++++ "b/include/pbc_curve.h" +@@ -60,7 +60,9 @@ + + void field_curve_set_quotient_cmp(field_ptr c, mpz_t quotient_cmp); + ++#ifdef __GNUC__ + #pragma GCC visibility push(hidden) ++#endif + // Internal: + + element_ptr curve_x_coord(element_t e); +@@ -74,6 +76,8 @@ + void curve_set_si(element_t R, long int x, long int y); + void curve_set_gen_no_cofac(element_ptr a); + ++#ifdef __GNUC__ + #pragma GCC visibility pop ++#endif + + #endif //__PBC_CURVE_H__ +diff --git "a/include/pbc_vc_compat.win32.h" "b/include/pbc_vc_compat.win32.h" +index 27d3bba..7f772d4 100644 +--- "a/include/pbc_vc_compat.win32.h" ++++ "b/include/pbc_vc_compat.win32.h" +@@ -3,7 +3,3 @@ + #define __attribute__(X) + #define inline + #define __func__ __FUNCTION__ +- +-#define NULL 0 +- +-#define snprintf _snprintf +\ No newline at end of file +diff --git "a/pbcwin/projects/pbclib.vcxproj" "b/pbcwin/projects/pbclib.vcxproj" +index f0a9b3f..507c24d 100644 +--- "a/pbcwin/projects/pbclib.vcxproj" ++++ "b/pbcwin/projects/pbclib.vcxproj" +@@ -214,13 +214,13 @@  + + + $(SolutionDir)..\include;$(SolutionDir)..;$(SolutionDir)..\..\mpir\lib\$(Platform)\Release;$(IncludePath) +- $(SolutionDir)..\..\mpir\lib\x64\Release;$(LibraryPath) ++ $(SolutionDir)..\..\mpir\lib\$(Platform)\Release;$(LibraryPath) + $(SolutionDir)lib\$(Platform)\Release\ + $(SolutionDir)obj\$(Platform)\$(Configuration)\$(ProjectName)\ + + +- $(SolutionDir)..\include;$(SolutionDir)..;$(SolutionDir)..\..\mpir\lib\x64\Release;$(IncludePath) +- $(SolutionDir)..\..\mpir\lib\x64\Release;$(LibraryPath) ++ $(SolutionDir)..\include;$(SolutionDir)..;$(SolutionDir)..\..\mpir\lib\$(Platform)\Release;$(IncludePath) ++ $(SolutionDir)..\..\mpir\lib\$(Platform)\Release;$(LibraryPath) + $(SolutionDir)lib\$(Platform)\Release\ + $(SolutionDir)obj\$(Platform)\$(Configuration)\$(ProjectName)\ + +@@ -245,7 +245,8 @@  + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + pbc_vc_compat.win32.h + 4068 +- MultiThreadedDebug ++ $(RuntimeLibrary) ++ OldStyle + + + true +@@ -275,7 +276,8 @@ echo *************************************************************************** + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + pbc_vc_compat.win32.h + 4068 +- MultiThreadedDebug ++ $(RuntimeLibrary) ++ OldStyle + + + true +@@ -305,7 +307,7 @@ echo *************************************************************************** + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + pbc_vc_compat.win32.h + 4068 +- MultiThreadedDebugDLL ++ $(RuntimeLibrary) + + + true +@@ -332,7 +334,7 @@ echo *************************************************************************** + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + pbc_vc_compat.win32.h + 4068 +- MultiThreadedDebugDLL ++ $(RuntimeLibrary) + + + true +@@ -361,7 +363,7 @@ echo *************************************************************************** + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + pbc_vc_compat.win32.h + 4068 +- MultiThreaded ++ $(RuntimeLibrary) + + + true +@@ -395,7 +397,7 @@ echo *************************************************************************** + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + pbc_vc_compat.win32.h + 4068 +- MultiThreaded ++ $(RuntimeLibrary) + + + true +@@ -429,7 +431,7 @@ echo *************************************************************************** + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + pbc_vc_compat.win32.h + 4068 +- MultiThreadedDLL ++ $(RuntimeLibrary) + + + true +@@ -460,7 +462,7 @@ echo *************************************************************************** + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + pbc_vc_compat.win32.h + 4068 +- MultiThreadedDLL ++ $(RuntimeLibrary) + + + true diff --git a/externals/vcpkg/ports/pcapplusplus/CMakeLists.txt b/externals/vcpkg/ports/pcapplusplus/CMakeLists.txt new file mode 100755 index 000000000..89ac75005 --- /dev/null +++ b/externals/vcpkg/ports/pcapplusplus/CMakeLists.txt @@ -0,0 +1,106 @@ +cmake_minimum_required(VERSION 3.12) + +project(pcapplusplus CXX) + +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") + +if (WIN32) + set(BUILD_SHARED_LIBS OFF) +endif() + +# dependencies +include(FindPackageHandleStandardArgs) +include(SelectLibraryConfigurations) +if (WIN32) + find_path(PCAP_INCLUDES NAMES pcap.h) + find_library(PCAP_LIBRARY_RELEASE NAMES wpcap PATH_SUFFIXES lib REQUIRED) + find_library(PCAP_LIBRARY_DEBUG NAMES wpcap PATH_SUFFIXES lib REQUIRED) + find_library(PACKET_LIBRARY_RELEASE NAMES Packet PATH_SUFFIXES lib REQUIRED) + find_library(PACKET_LIBRARY_DEBUG NAMES Packet PATH_SUFFIXES lib REQUIRED) + select_library_configurations(PCAP) + select_library_configurations(PACKET) + list(APPEND PCAP_LIBRARIES ${PACKET_LIBRARIES}) +else() + find_path(PCAP_INCLUDES NAMES pcap.h) + find_library(PCAP_LIBRARY_RELEASE NAMES pcap PATH_SUFFIXES lib REQUIRED) + find_library(PCAP_LIBRARY_DEBUG NAMES pcap PATH_SUFFIXES lib REQUIRED) + select_library_configurations(PCAP) +endif() + +find_package(Threads REQUIRED) + +# common++ +file(GLOB COMMONPP_HEADERS "${CMAKE_CURRENT_LIST_DIR}/Common++/header/*.h") +file(GLOB COMMONPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/Common++/src/*.cpp") + +add_library(commonpp ${COMMONPP_SOURCES}) + +target_include_directories(commonpp PUBLIC "${CMAKE_CURRENT_LIST_DIR}/Common++/header" + "${CMAKE_CURRENT_LIST_DIR}/3rdParty/EndianPortable/include") +set_target_properties(commonpp PROPERTIES OUTPUT_NAME Common++) +if (WIN32) + target_compile_definitions(commonpp PRIVATE WPCAP HAVE_REMOTE _CRT_SECURE_NO_WARNINGS) +elseif (UNIX AND NOT APPLE) + target_compile_definitions(commonpp PRIVATE LINUX) +elseif (APPLE) + target_compile_definitions(commonpp PRIVATE MAC_OS_X) +endif() + +# packet++ +file(GLOB PACKETPP_HEADERS "${CMAKE_CURRENT_LIST_DIR}/Packet++/header/*.h") +file(GLOB PACKETPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/Packet++/src/*.cpp") +list(APPEND PACKETPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/3rdParty/hash-library/md5.cpp") + +add_library(packetpp ${PACKETPP_SOURCES}) + +target_include_directories(packetpp PUBLIC "${CMAKE_CURRENT_LIST_DIR}/Packet++/header" + "${CMAKE_CURRENT_LIST_DIR}/3rdParty/hash-library") +target_link_libraries(packetpp PRIVATE commonpp) +set_target_properties(packetpp PROPERTIES OUTPUT_NAME Packet++) +if (WIN32) + target_compile_definitions(packetpp PRIVATE WPCAP HAVE_REMOTE _CRT_SECURE_NO_WARNINGS) +elseif (UNIX AND NOT APPLE) + target_compile_definitions(packetpp PRIVATE LINUX) +elseif (APPLE) + target_compile_definitions(packetpp PRIVATE MAC_OS_X) +endif() + +# pcap++ +file(GLOB PCAPPP_HEADERS "${CMAKE_CURRENT_LIST_DIR}/Pcap++/header/*.h") +file(GLOB PCAPPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/Pcap++/src/*.cpp") +file(GLOB LIGHTPCAPNG_SOURCES "${CMAKE_CURRENT_LIST_DIR}/3rdParty/LightPcapNg/LightPcapNg/src/*.cpp") + +add_library(pcappp ${PCAPPP_SOURCES}) + +target_include_directories(pcappp PUBLIC "${CMAKE_CURRENT_LIST_DIR}/Pcap++/header" "${PCAP_INCLUDES}" + "${CMAKE_CURRENT_LIST_DIR}/3rdParty/LightPcapNg/LightPcapNg/include") +target_link_libraries(pcappp PUBLIC commonpp packetpp ${PCAP_LIBRARIES} Threads::Threads) + +if (WIN32) + target_link_libraries(pcappp PUBLIC ws2_32 iphlpapi) +elseif (APPLE) + find_library(COREFOUNDATION_LIBRARY CoreFoundation) + find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration) + target_link_libraries(pcappp PUBLIC ${COREFOUNDATION_LIBRARY} ${SYSTEMCONFIGURATION_LIBRARY}) +endif() + +if (WIN32) + target_compile_definitions(pcappp PRIVATE WPCAP HAVE_REMOTE HAVE_STRUCT_TIMESPEC _CRT_SECURE_NO_WARNINGS) +elseif (UNIX AND NOT APPLE) + target_compile_definitions(pcappp PRIVATE LINUX) +elseif (APPLE) + target_compile_definitions(pcappp PRIVATE MAC_OS_X) +endif() + +set_target_properties(pcappp PROPERTIES OUTPUT_NAME Pcap++) + +# Install +install(FILES ${PCAPPP_HEADERS} ${COMMONPP_HEADERS} ${PACKETPP_HEADERS} DESTINATION include) +install(FILES "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION share/pcapplusplus) + +install( + TARGETS pcappp commonpp packetpp + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) diff --git a/externals/vcpkg/ports/pcapplusplus/portfile.cmake b/externals/vcpkg/ports/pcapplusplus/portfile.cmake new file mode 100755 index 000000000..60336eb04 --- /dev/null +++ b/externals/vcpkg/ports/pcapplusplus/portfile.cmake @@ -0,0 +1,23 @@ +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO seladb/PcapPlusPlus + REF v22.05 + SHA512 8ffe33406b903fe104f7bf0cf7254028bb3a9997bb5f4b226276af3b2a310e1ed1621558b9fd96ed09c75fa05dfcbfbd7111fe4b19a9288eb214ebcf1254cf6b + HEAD_REF master +) +file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file diff --git a/externals/vcpkg/ports/pcapplusplus/vcpkg.json b/externals/vcpkg/ports/pcapplusplus/vcpkg.json new file mode 100755 index 000000000..83438c9be --- /dev/null +++ b/externals/vcpkg/ports/pcapplusplus/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "pcapplusplus", + "version-string": "22.05", + "description": "PcapPlusPlus is a multi-platform C++ library for capturing, parsing and crafting of network packets", + "homepage": "https://github.com/seladb/PcapPlusPlus", + "license": null, + "dependencies": [ + { + "name": "libpcap", + "platform": "!windows" + }, + { + "name": "pthreads", + "platform": "windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "winpcap", + "platform": "windows" + } + ] +} diff --git a/externals/vcpkg/ports/pcg/portfile.cmake b/externals/vcpkg/ports/pcg/portfile.cmake new file mode 100755 index 000000000..f165692dc --- /dev/null +++ b/externals/vcpkg/ports/pcg/portfile.cmake @@ -0,0 +1,12 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO imneme/pcg-cpp + REF ffd522e7188bef30a00c74dc7eb9de5faff90092 + SHA512 e96e40bf63ddb29ebf8679ddaabbf5dc934173f38cb5ed97c5efe068a742a715daa05e38d9ae322a10fa538c8ec7a271622bfb6569256a471fe5e1c9a83f9e3f + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/include/pcg_extras.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL ${SOURCE_PATH}/include/pcg_random.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL ${SOURCE_PATH}/include/pcg_uint128.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL ${SOURCE_PATH}/LICENSE-MIT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/pcg/vcpkg.json b/externals/vcpkg/ports/pcg/vcpkg.json new file mode 100755 index 000000000..ce5e0de21 --- /dev/null +++ b/externals/vcpkg/ports/pcg/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "pcg", + "version-string": "2021-04-06", + "port-version": 1, + "description": "Permuted Congruential Generator" +} diff --git a/externals/vcpkg/ports/pcl/Workaround-ICE-in-release.patch b/externals/vcpkg/ports/pcl/Workaround-ICE-in-release.patch new file mode 100755 index 000000000..36f66c8d6 --- /dev/null +++ b/externals/vcpkg/ports/pcl/Workaround-ICE-in-release.patch @@ -0,0 +1,20 @@ +diff --git a/surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp b/surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp +index 49e52b4..a9578bd 100644 +--- a/surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp ++++ b/surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp +@@ -666,6 +666,7 @@ std::size_t ON_SerialNumberMap::ActiveIdCount() const + return m_active_id_count; + } + ++#pragma optimize("", off) + struct ON_SerialNumberMap::SN_ELEMENT* ON_SerialNumberMap::FirstElement() const + { + struct SN_ELEMENT* e=0; +@@ -717,6 +718,7 @@ struct ON_SerialNumberMap::SN_ELEMENT* ON_SerialNumberMap::FirstElement() const + } + return e; + } ++#pragma optimize("", on) + + struct ON_SerialNumberMap::SN_ELEMENT* ON_SerialNumberMap::LastElement() const + { diff --git a/externals/vcpkg/ports/pcl/add-gcc-version-check.patch b/externals/vcpkg/ports/pcl/add-gcc-version-check.patch new file mode 100755 index 000000000..1a9740fac --- /dev/null +++ b/externals/vcpkg/ports/pcl/add-gcc-version-check.patch @@ -0,0 +1,27 @@ +From 116e665df611242ea0575a62478c31ec03e78fcc Mon Sep 17 00:00:00 2001 +From: raahilsha-z +Date: Wed, 7 Jul 2021 15:53:49 -0400 +Subject: [PATCH] add gcc version check + +--- + CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 63b38df68..29f79d31b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -311,6 +311,10 @@ if(NOT (${FLANN_LIBRARY_TYPE} MATCHES ${PCL_FLANN_REQUIRED_TYPE}) AND NOT (${PCL + message(FATAL_ERROR "Flann was selected with ${PCL_FLANN_REQUIRED_TYPE} but found as ${FLANN_LIBRARY_TYPE}") + endif() + ++if(UNIX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0) ++ set (CMAKE_CXX_STANDARD 17) ++endif() ++ + # libusb + option(WITH_LIBUSB "Build USB RGBD-Camera drivers" TRUE) + if(WITH_LIBUSB) +-- +2.32.0.windows.1 + diff --git a/externals/vcpkg/ports/pcl/fix-check-sse.patch b/externals/vcpkg/ports/pcl/fix-check-sse.patch new file mode 100755 index 000000000..a8bc78667 --- /dev/null +++ b/externals/vcpkg/ports/pcl/fix-check-sse.patch @@ -0,0 +1,25 @@ +From c65e034afb538932f4ff55a93332f875ae43a578 Mon Sep 17 00:00:00 2001 +From: raahilsha-z +Date: Wed, 7 Jul 2021 15:54:33 -0400 +Subject: [PATCH] fix check sse + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 29f79d31b..a1d9bb58f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -86,7 +86,7 @@ endif() + + # check for SSE flags + include("${PCL_SOURCE_DIR}/cmake/pcl_find_sse.cmake") +-if(PCL_ENABLE_SSE AND "${CMAKE_CXX_FLAGS}" STREQUAL "${CMAKE_CXX_FLAGS_DEFAULT}") ++if(PCL_ENABLE_SSE) + PCL_CHECK_FOR_SSE() + endif() + +-- +2.32.0.windows.1 + diff --git a/externals/vcpkg/ports/pcl/fix-cmake_find_library_suffixes.patch b/externals/vcpkg/ports/pcl/fix-cmake_find_library_suffixes.patch new file mode 100755 index 000000000..b9e5b2572 --- /dev/null +++ b/externals/vcpkg/ports/pcl/fix-cmake_find_library_suffixes.patch @@ -0,0 +1,20 @@ +diff --git a/cmake/pcl_options.cmake b/cmake/pcl_options.cmake +index 6570d75..1d9b0d8 100644 +--- a/cmake/pcl_options.cmake ++++ b/cmake/pcl_options.cmake +@@ -7,14 +7,13 @@ if(PCL_SHARED_LIBS) + set(PCL_LIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(PCL_LIB_TYPE "SHARED") + # set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_LIBRARY_SUFFIX}) +- if(WIN32) ++ if(0) + set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_IMPORT_LIBRARY_SUFFIX}) + endif() + else() + set(PCL_LIB_PREFIX ${CMAKE_STATIC_LIBRARY_PREFIX}) + set(PCL_LIB_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX}) + set(PCL_LIB_TYPE "STATIC") +- set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX}) + endif() + mark_as_advanced(PCL_SHARED_LIBS) + diff --git a/externals/vcpkg/ports/pcl/fix-error-C3052.patch b/externals/vcpkg/ports/pcl/fix-error-C3052.patch new file mode 100755 index 000000000..fce4fe6d7 --- /dev/null +++ b/externals/vcpkg/ports/pcl/fix-error-C3052.patch @@ -0,0 +1,20 @@ +diff --git a/common/src/fft/kiss_fft.c b/common/src/fft/kiss_fft.c +index a996887..37232bd 100644 +--- a/common/src/fft/kiss_fft.c ++++ b/common/src/fft/kiss_fft.c +@@ -260,11 +260,13 @@ void kf_work( + #if (defined _OPENMP && (_OPENMP <= 201307)) || (defined __GNUC__ && (__GNUC__ >= 6 && __GNUC__ < 9)) + #pragma omp parallel for \ + default(none) \ +- shared(f, factors, Fout, in_stride) ++ shared(f, factors, Fout, in_stride) \ ++ private(k) + #else + #pragma omp parallel for \ + default(none) \ +- shared(f, factors, Fout, fstride, in_stride, m, p, st) ++ shared(f, factors, Fout, fstride, in_stride, m, p, st) \ ++ private(k) + #endif + for (k=0;k& cloud, const float + thrust::counting_iterator ce = cf + cloud.size(); + + thrust::tuple init(0.f, 0); +- thrust::maximum< tuple > op; ++ thrust::maximum> op; + +- tuple res = transform_reduce( ++ thrust::tuple res = ++ transform_reduce( + make_zip_iterator(make_tuple( src_beg, cf )), + make_zip_iterator(make_tuple( src_beg, ce )), + TupleDistCvt(pivot), init, op); +@@ -151,9 +151,9 @@ float3 pcl::device::getMaxDistance(const DeviceArray& cloud, const Indic + thrust::counting_iterator ce = cf + indices.size(); + + thrust::tuple init(0.f, 0); +- thrust::maximum< tuple > op; ++ thrust::maximum> op; + +- tuple res = transform_reduce( ++ thrust::tuple res = transform_reduce( + make_zip_iterator(make_tuple( make_permutation_iterator(src_beg, map_beg), cf )), + make_zip_iterator(make_tuple( make_permutation_iterator(src_beg, map_end), ce )), + TupleDistCvt(pivot), init, op); +diff --git a/gpu/octree/src/cuda/bfrs.cu b/gpu/octree/src/cuda/bfrs.cu +index d392f67..0635e1e 100644 +--- a/gpu/octree/src/cuda/bfrs.cu ++++ b/gpu/octree/src/cuda/bfrs.cu +@@ -43,7 +43,6 @@ + + #include "cuda.h" + +-using namespace thrust; + + namespace pcl + { +@@ -80,11 +79,11 @@ void pcl::device::bruteForceRadiusSearch(const OctreeImpl::PointCloud& cloud, co + + InSphere cond(query.x, query.y, query.z, radius); + +- device_ptr cloud_ptr((const PointType*)cloud.ptr()); +- device_ptr res_ptr(buffer.ptr()); ++ thrust::device_ptr cloud_ptr((const PointType*)cloud.ptr()); ++ thrust::device_ptr res_ptr(buffer.ptr()); + +- counting_iterator first(0); +- counting_iterator last = first + cloud.size(); ++ thrust::counting_iterator first(0); ++ thrust::counting_iterator last = first + cloud.size(); + + //main bottle neck is a kernel call overhead/allocs + //work time for 871k points ~0.8ms +diff --git a/gpu/octree/src/cuda/octree_builder.cu b/gpu/octree/src/cuda/octree_builder.cu +index dfd2093..faad764 100644 +--- a/gpu/octree/src/cuda/octree_builder.cu ++++ b/gpu/octree/src/cuda/octree_builder.cu +@@ -51,7 +51,6 @@ + #include + + using namespace pcl::gpu; +-using namespace thrust; + + namespace pcl + { +@@ -316,7 +315,7 @@ void pcl::device::OctreeImpl::build() + // 3 * sizeof(int) => +1 row + + const int transaction_size = 128 / sizeof(int); +- int cols = max(points_num, transaction_size * 4); ++ int cols = std::max(points_num, transaction_size * 4); + int rows = 10 + 1; // = 13 + + storage.create(rows, cols); +@@ -338,8 +337,8 @@ void pcl::device::OctreeImpl::build() + { + //ScopeTimer timer("reduce-morton-sort-permutations"); + +- device_ptr beg(points.ptr()); +- device_ptr end = beg + points.size(); ++ thrust::device_ptr beg(points.ptr()); ++ thrust::device_ptr end = beg + points.size(); + + { + PointType atmax, atmin; +@@ -355,15 +354,15 @@ void pcl::device::OctreeImpl::build() + octreeGlobal.maxp = make_float3(maxp.x, maxp.y, maxp.z); + } + +- device_ptr codes_beg(codes.ptr()); +- device_ptr codes_end = codes_beg + codes.size(); ++ thrust::device_ptr codes_beg(codes.ptr()); ++ thrust::device_ptr codes_end = codes_beg + codes.size(); + { + //ScopeTimer timer("morton"); + thrust::transform(beg, end, codes_beg, CalcMorton(octreeGlobal.minp, octreeGlobal.maxp)); + } + +- device_ptr indices_beg(indices.ptr()); +- device_ptr indices_end = indices_beg + indices.size(); ++ thrust::device_ptr indices_beg(indices.ptr()); ++ thrust::device_ptr indices_end = indices_beg + indices.size(); + { + //ScopeTimer timer("sort"); + thrust::sequence(indices_beg, indices_end); +@@ -378,9 +377,9 @@ void pcl::device::OctreeImpl::build() + } + + { +- device_ptr xs(points_sorted.ptr(0)); +- device_ptr ys(points_sorted.ptr(1)); +- device_ptr zs(points_sorted.ptr(2)); ++ thrust::device_ptr xs(points_sorted.ptr(0)); ++ thrust::device_ptr ys(points_sorted.ptr(1)); ++ thrust::device_ptr zs(points_sorted.ptr(2)); + //ScopeTimer timer("perm2"); + thrust::transform(make_permutation_iterator(beg, indices_beg), + make_permutation_iterator(end, indices_end), diff --git a/externals/vcpkg/ports/pcl/fix-numeric-literals-flag.patch b/externals/vcpkg/ports/pcl/fix-numeric-literals-flag.patch new file mode 100755 index 000000000..b3db97390 --- /dev/null +++ b/externals/vcpkg/ports/pcl/fix-numeric-literals-flag.patch @@ -0,0 +1,26 @@ +From 3ea8aa5ded2782cfb10577348fc9f56144c72d7b Mon Sep 17 00:00:00 2001 +From: raahilsha-z +Date: Wed, 7 Jul 2021 15:57:46 -0400 +Subject: [PATCH] fix numeric literals flag + +--- + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7cf86f74b..e07fd430a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -420,6 +420,9 @@ endif() + + # Boost (required) + include("${PCL_SOURCE_DIR}/cmake/pcl_find_boost.cmake") ++if (NOT APPLE AND NOT WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") ++ add_definitions(-fext-numeric-literals) ++endif() + + ### ---[ Create the config.h file + set(pcl_config_h_in "${CMAKE_CURRENT_SOURCE_DIR}/pcl_config.h.in") +-- +2.32.0.windows.1 + diff --git a/externals/vcpkg/ports/pcl/fix-pkgconfig.patch b/externals/vcpkg/ports/pcl/fix-pkgconfig.patch new file mode 100755 index 000000000..512d17bbd --- /dev/null +++ b/externals/vcpkg/ports/pcl/fix-pkgconfig.patch @@ -0,0 +1,18 @@ +diff --git a/cuda/common/CMakeLists.txt b/cuda/common/CMakeLists.txt +index b5775af..e7a2ff2 100644 +--- a/cuda/common/CMakeLists.txt ++++ b/cuda/common/CMakeLists.txt +@@ -29,10 +29,10 @@ set(common_incs + ) + + include_directories(./include) +-#set(LIB_NAME pcl_${SUBSYS_NAME}) ++set(LIB_NAME "pcl_${SUBSYS_NAME}") + set(EXT_DEPS CUDA) +-#PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}" +-# "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "") ++PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC "${SUBSYS_DESC}" ++ PCL_DEPS "${SUBSYS_DEPS}" EXT_DEPS "" HEADER_ONLY) + + # Install include files + PCL_ADD_INCLUDES(${SUBSYS_NAME} "cuda" ${incs}) diff --git a/externals/vcpkg/ports/pcl/install-examples.patch b/externals/vcpkg/ports/pcl/install-examples.patch new file mode 100755 index 000000000..136a4ce36 --- /dev/null +++ b/externals/vcpkg/ports/pcl/install-examples.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/pcl_targets.cmake b/cmake/pcl_targets.cmake +index 91f2404..18f5a24 100644 +--- a/cmake/pcl_targets.cmake ++++ b/cmake/pcl_targets.cmake +@@ -473,6 +473,8 @@ macro(PCL_ADD_EXAMPLE _name) + # add target to list of example targets created at the parent scope + list(APPEND PCL_EXAMPLES_ALL_TARGETS ${_name}) + set(PCL_EXAMPLES_ALL_TARGETS "${PCL_EXAMPLES_ALL_TARGETS}" PARENT_SCOPE) ++ ++ install(TARGETS ${_name} RUNTIME DESTINATION ${BIN_INSTALL_DIR}) + endmacro() + + ############################################################################### diff --git a/externals/vcpkg/ports/pcl/no-absolute.patch b/externals/vcpkg/ports/pcl/no-absolute.patch new file mode 100755 index 000000000..7c930e719 --- /dev/null +++ b/externals/vcpkg/ports/pcl/no-absolute.patch @@ -0,0 +1,21 @@ +diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in +index 4137ed1..167fde2 100644 +--- a/PCLConfig.cmake.in ++++ b/PCLConfig.cmake.in +@@ -230,7 +230,7 @@ macro(find_flann) + if(PCL_ALL_IN_ONE_INSTALLER) + set(FLANN_ROOT "${PCL_ROOT}/3rdParty/Flann") + elseif(NOT FLANN_ROOT) +- set(FLANN_ROOT "@FLANN_ROOT@") ++ set(FLANN_ROOT "${VCPKG_IMPORT_PREFIX}") + endif() + + set(FLANN_USE_STATIC @FLANN_USE_STATIC@) +@@ -402,7 +402,6 @@ elseif(EXISTS "${PCL_DIR}/include/pcl/pcl_config.h") + # pcl_message("PCL found into a build tree.") + set(PCL_CONF_INCLUDE_DIR "${PCL_DIR}/include") # for pcl_config.h + set(PCL_LIBRARY_DIRS "${PCL_DIR}/@LIB_INSTALL_DIR@") +- set(PCL_SOURCES_TREE "@CMAKE_SOURCE_DIR@") + else() + pcl_report_not_found("PCL can not be found on this machine") + endif() diff --git a/externals/vcpkg/ports/pcl/pcl_config.patch b/externals/vcpkg/ports/pcl/pcl_config.patch new file mode 100755 index 000000000..96971525a --- /dev/null +++ b/externals/vcpkg/ports/pcl/pcl_config.patch @@ -0,0 +1,43 @@ +From 2f4952e1767ad5b0349a03ee56d676d226102381 Mon Sep 17 00:00:00 2001 +From: raahilsha-z +Date: Wed, 7 Jul 2021 15:59:12 -0400 +Subject: [PATCH] pcl_config + +--- + PCLConfig.cmake.in | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in +index a1283a810..4137ed18c 100644 +--- a/PCLConfig.cmake.in ++++ b/PCLConfig.cmake.in +@@ -384,6 +384,7 @@ file(TO_CMAKE_PATH "${PCL_DIR}" PCL_DIR) + if(WIN32 AND NOT MINGW) + # PCLConfig.cmake is installed to PCL_ROOT/cmake + get_filename_component(PCL_ROOT "${PCL_DIR}" PATH) ++ get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH) + if(EXISTS "${PCL_ROOT}/3rdParty") + set(PCL_ALL_IN_ONE_INSTALLER ON) + endif() +@@ -393,16 +394,9 @@ else() + endif() + + # check whether PCLConfig.cmake is found into a PCL installation or in a build tree +-if(EXISTS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}/pcl/pcl_config.h") +- # Found a PCL installation +- # pcl_message("Found a PCL installation") +- set(PCL_CONF_INCLUDE_DIR "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}") +- set(PCL_LIBRARY_DIRS "${PCL_ROOT}/@LIB_INSTALL_DIR@") +-elseif(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h") +- # Found a non-standard (likely ANDROID) PCL installation +- # pcl_message("Found a PCL installation") ++if(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h") + set(PCL_CONF_INCLUDE_DIR "${PCL_ROOT}/include") +- set(PCL_LIBRARY_DIRS "${PCL_ROOT}/lib") ++ set(PCL_LIBRARY_DIRS "${PCL_ROOT}/@LIB_INSTALL_DIR@" "${PCL_ROOT}/debug/@LIB_INSTALL_DIR@") + elseif(EXISTS "${PCL_DIR}/include/pcl/pcl_config.h") + # Found PCLConfig.cmake in a build tree of PCL + # pcl_message("PCL found into a build tree.") +-- +2.32.0.windows.1 + diff --git a/externals/vcpkg/ports/pcl/pcl_utils.patch b/externals/vcpkg/ports/pcl/pcl_utils.patch new file mode 100755 index 000000000..3be0f90fb --- /dev/null +++ b/externals/vcpkg/ports/pcl/pcl_utils.patch @@ -0,0 +1,40 @@ +From 6f4e2fea829b5986863403d6a611c52c5ac8b2a9 Mon Sep 17 00:00:00 2001 +From: raahilsha-z +Date: Wed, 7 Jul 2021 16:00:30 -0400 +Subject: [PATCH] pcl_utils + +--- + cmake/pcl_utils.cmake | 13 ++----------- + 1 file changed, 2 insertions(+), 11 deletions(-) + +diff --git a/cmake/pcl_utils.cmake b/cmake/pcl_utils.cmake +index d87d02da9..7c951bfd5 100644 +--- a/cmake/pcl_utils.cmake ++++ b/cmake/pcl_utils.cmake +@@ -94,21 +94,12 @@ macro(SET_INSTALL_DIRS) + if(NOT DEFINED LIB_INSTALL_DIR) + set(LIB_INSTALL_DIR "lib") + endif() +- if(NOT ANDROID) +- set(INCLUDE_INSTALL_ROOT +- "include/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}") +- else() +- set(INCLUDE_INSTALL_ROOT "include") # Android, don't put into subdir +- endif() ++ set(INCLUDE_INSTALL_ROOT "include") + set(INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_ROOT}/pcl") + set(DOC_INSTALL_DIR "share/doc/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}") + set(BIN_INSTALL_DIR "bin") + set(PKGCFG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig") +- if(WIN32 AND NOT MINGW) +- set(PCLCONFIG_INSTALL_DIR "cmake") +- else() +- set(PCLCONFIG_INSTALL_DIR "share/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}") +- endif() ++ set(PCLCONFIG_INSTALL_DIR "share/pcl") + endmacro() + + +-- +2.32.0.windows.1 + diff --git a/externals/vcpkg/ports/pcl/portfile.cmake b/externals/vcpkg/ports/pcl/portfile.cmake new file mode 100755 index 000000000..cee90574d --- /dev/null +++ b/externals/vcpkg/ports/pcl/portfile.cmake @@ -0,0 +1,127 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO PointCloudLibrary/pcl + REF f36a69a5e89953708990c4669317f989d532cf08 # pcl-1.12.0 + SHA512 dbbd0adbb08949ddef2789e0021b6ca9727be33c7193d0bb135c61def09a42ed6a71333f06b6fad407010ecb4b73c19f087f7520386b92a008e90c254eafe422 + HEAD_REF master + PATCHES + add-gcc-version-check.patch + fix-check-sse.patch + fix-find-qhull.patch + fix-numeric-literals-flag.patch + pcl_config.patch + pcl_utils.patch + remove-broken-targets.patch + fix-cmake_find_library_suffixes.patch + fix-pkgconfig.patch # Remove this patch in the next update + fix-namespace-cub.patch # Remove this patch in the next update + fix-error-C3052.patch # Remove this patch in the next update + fix-find-libusb.patch + install-examples.patch + no-absolute.patch + Workaround-ICE-in-release.patch +) + +file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindQhull.cmake" + "${SOURCE_PATH}/cmake/Modules/Findlibusb.cmake" +) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PCL_SHARED_LIBS) + +if ("cuda" IN_LIST FEATURES AND VCPKG_TARGET_ARCHITECTURE STREQUAL x86) + message(FATAL_ERROR "Feature cuda only supports 64-bit compilation.") +endif() + +if ("tools" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL static) + message(FATAL_ERROR "Feature tools only supports dynamic build") +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openni2 WITH_OPENNI2 + qt WITH_QT + pcap WITH_PCAP + cuda WITH_CUDA + cuda BUILD_CUDA + cuda BUILD_GPU + tools BUILD_tools + opengl WITH_OPENGL + libusb WITH_LIBUSB + visualization WITH_VTK + visualization BUILD_visualization + examples BUILD_examples + apps BUILD_apps + # These 2 apps need openni1 + #apps BUILD_apps_in_hand_scanner + #apps BUILD_apps_3d_rec_framework + simulation BUILD_simulation +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + # BUILD + -DBUILD_surface_on_nurbs=ON + # PCL + -DPCL_BUILD_WITH_BOOST_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS} + -DPCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS} + -DPCL_BUILD_WITH_QHULL_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS} + -DPCL_SHARED_LIBS=${PCL_SHARED_LIBS} + # WITH + -DWITH_PNG=ON + -DWITH_QHULL=ON + -DWITH_OPENNI=OFF + -DWITH_ENSENSO=OFF + -DWITH_DAVIDSDK=OFF + -DWITH_DSSDK=OFF + -DWITH_RSSDK=OFF + -DWITH_RSSDK2=OFF + -DWITH_OPENMP=OFF + # FEATURES + ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + PCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32 +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +vcpkg_copy_pdbs() + +if (WITH_OPENNI2) + if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(GLOB PCL_PKGCONFIG_DBGS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc") + foreach (PCL_PKGCONFIG IN LISTS PCL_PKGCONFIG_DBGS) + file(READ "${PCL_PKGCONFIG}" PCL_PC_DBG) + if (PCL_PC_DBG MATCHES "libopenni2") + string(REPLACE "libopenni2" "" PCL_PC_DBG "${PCL_PC_DBG}") + string(REPLACE "Libs: " "Libs: -lKinect10 -lOpenNI2 " PCL_PC_DBG "${PCL_PC_DBG}") + file(WRITE "${PCL_PKGCONFIG}" "${PCL_PC_DBG}") + endif() + endforeach() + endif() + if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(GLOB PCL_PKGCONFIG_RELS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc") + foreach (PCL_PKGCONFIG IN LISTS PCL_PKGCONFIG_RELS) + file(READ "${PCL_PKGCONFIG}" PCL_PC_REL) + if (PCL_PC_REL MATCHES "libopenni2") + string(REPLACE "libopenni2" "" PCL_PC_REL "${PCL_PC_REL}") + string(REPLACE "Libs: " "Libs: -lKinect10 -lOpenNI2 " PCL_PC_REL "${PCL_PC_REL}") + file(WRITE "${PCL_PKGCONFIG}" "${PCL_PC_REL}") + endif() + endforeach() + endif() +endif() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(BUILD_tools OR BUILD_apps OR BUILD_examples) + file(GLOB EXEFILES_RELEASE "${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + file(GLOB EXEFILES_DEBUG "${CURRENT_PACKAGES_DIR}/debug/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + file(COPY ${EXEFILES_RELEASE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/pcl") + file(REMOVE ${EXEFILES_RELEASE} ${EXEFILES_DEBUG}) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/pcl") +endif() + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/pcl/remove-broken-targets.patch b/externals/vcpkg/ports/pcl/remove-broken-targets.patch new file mode 100755 index 000000000..826babc28 --- /dev/null +++ b/externals/vcpkg/ports/pcl/remove-broken-targets.patch @@ -0,0 +1,32 @@ +From 1b2613e1df507fd868b4971294f9a28183ce2e6c Mon Sep 17 00:00:00 2001 +From: raahilsha-z +Date: Wed, 7 Jul 2021 16:01:03 -0400 +Subject: [PATCH] remove broken targets + +--- + tools/CMakeLists.txt | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt +index 5bfe6e94c..7abf3d746 100644 +--- a/tools/CMakeLists.txt ++++ b/tools/CMakeLists.txt +@@ -123,15 +123,6 @@ target_link_libraries(pcl_concatenate_points_pcd pcl_common pcl_io) + PCL_ADD_EXECUTABLE(pcl_poisson_reconstruction COMPONENT ${SUBSYS_NAME} SOURCES poisson_reconstruction.cpp) + target_link_libraries(pcl_poisson_reconstruction pcl_common pcl_io pcl_surface) + +-PCL_ADD_EXECUTABLE(pcl_train_linemod_template COMPONENT ${SUBSYS_NAME} SOURCES train_linemod_template.cpp) +-target_link_libraries(pcl_train_linemod_template pcl_common pcl_io pcl_segmentation pcl_recognition) +- +-PCL_ADD_EXECUTABLE(pcl_match_linemod_template COMPONENT ${SUBSYS_NAME} SOURCES match_linemod_template.cpp) +-target_link_libraries(pcl_match_linemod_template pcl_common pcl_io pcl_recognition) +- +-PCL_ADD_EXECUTABLE(pcl_linemod_detection COMPONENT ${SUBSYS_NAME} SOURCES linemod_detection.cpp) +-target_link_libraries(pcl_linemod_detection pcl_common pcl_io pcl_recognition) +- + PCL_ADD_EXECUTABLE(pcl_fast_bilateral_filter COMPONENT ${SUBSYS_NAME} SOURCES fast_bilateral_filter.cpp) + target_link_libraries(pcl_fast_bilateral_filter pcl_common pcl_io pcl_filters) + +-- +2.32.0.windows.1 + diff --git a/externals/vcpkg/ports/pcl/usage b/externals/vcpkg/ports/pcl/usage new file mode 100755 index 000000000..60aecd494 --- /dev/null +++ b/externals/vcpkg/ports/pcl/usage @@ -0,0 +1,4 @@ +The package pcl provides CMake targets: + + find_package(PCL CONFIG REQUIRED) + target_link_libraries(main PRIVATE ${PCL_LIBRARIES}) diff --git a/externals/vcpkg/ports/pcl/vcpkg.json b/externals/vcpkg/ports/pcl/vcpkg.json new file mode 100755 index 000000000..edb982fc8 --- /dev/null +++ b/externals/vcpkg/ports/pcl/vcpkg.json @@ -0,0 +1,153 @@ +{ + "name": "pcl", + "version": "1.12.0", + "port-version": 6, + "description": "Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.", + "homepage": "https://github.com/PointCloudLibrary/pcl", + "license": "BSD-3-Clause", + "supports": "!(arm64 & windows)", + "dependencies": [ + "boost-asio", + "boost-date-time", + "boost-dynamic-bitset", + "boost-filesystem", + "boost-foreach", + "boost-graph", + "boost-interprocess", + "boost-iostreams", + "boost-multi-array", + "boost-property-map", + "boost-ptr-container", + "boost-random", + "boost-signals2", + "boost-sort", + "boost-system", + "boost-thread", + "boost-uuid", + "eigen3", + "flann", + "libpng", + "qhull", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "apps": { + "description": "Build application examples/samples that show how PCL works", + "dependencies": [ + { + "name": "pcl", + "default-features": false, + "features": [ + "opengl", + "openni2", + "qt", + "vtk" + ] + } + ] + }, + "cuda": { + "description": "CUDA support for PCL", + "dependencies": [ + "cuda" + ] + }, + "examples": { + "description": "Build PCL examples", + "dependencies": [ + "vtk" + ] + }, + "libusb": { + "description": "Build USB RGBD-Camera drivers", + "dependencies": [ + "libusb" + ] + }, + "opengl": { + "description": "OpenGL support for PCL" + }, + "openni2": { + "description": "OpenNI2 support for PCL", + "dependencies": [ + "openni2", + { + "name": "pcl", + "default-features": false, + "features": [ + "libusb" + ], + "platform": "!windows" + } + ] + }, + "pcap": { + "description": "PCAP support for PCL", + "dependencies": [ + { + "name": "libpcap", + "platform": "!windows" + }, + { + "name": "winpcap", + "platform": "windows" + } + ] + }, + "qt": { + "description": "Qt support for PCL", + "dependencies": [ + { + "name": "vtk", + "features": [ + "qt" + ] + } + ] + }, + "simulation": { + "description": "Build Point Cloud Library Simulation", + "dependencies": [ + "glew", + { + "name": "pcl", + "default-features": false, + "features": [ + "opengl" + ] + } + ] + }, + "tools": { + "description": "Build PCL utilities", + "dependencies": [ + "boost-accumulators" + ] + }, + "visualization": { + "description": "Build visualization", + "dependencies": [ + "vtk" + ] + }, + "vtk": { + "description": "An alias for visualization", + "dependencies": [ + { + "name": "pcl", + "default-features": false, + "features": [ + "visualization" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/pcre/export-cmake-targets.patch b/externals/vcpkg/ports/pcre/export-cmake-targets.patch new file mode 100755 index 000000000..bdbd807d3 --- /dev/null +++ b/externals/vcpkg/ports/pcre/export-cmake-targets.patch @@ -0,0 +1,23 @@ +--- a/CMakeLists.txt 2021-06-14 10:33:38.000000000 +0200 ++++ b/CMakeLists.txt 2021-06-18 18:08:24.162881000 +0200 +@@ -934,10 +934,19 @@ + # Installation + SET(CMAKE_INSTALL_ALWAYS 1) + +-INSTALL(TARGETS ${targets} ++foreach(target ${targets}) ++ INSTALL(TARGETS ${target} ++ EXPORT pcre-targets + RUNTIME DESTINATION bin + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ target_include_directories(${target} PUBLIC $) ++endforeach() ++ ++INSTALL(EXPORT pcre-targets ++ NAMESPACE unofficial::pcre:: ++ FILE unofficial-pcre-targets.cmake ++ DESTINATION "share/unofficial-pcre") + + INSTALL(FILES ${PCRE_HEADERS} ${PCREPOSIX_HEADERS} DESTINATION include) + diff --git a/externals/vcpkg/ports/pcre/pcre-8.4.5_fix_check_function_exists_for_arm-androi_builds.patch b/externals/vcpkg/ports/pcre/pcre-8.4.5_fix_check_function_exists_for_arm-androi_builds.patch new file mode 100755 index 000000000..dd014bf6f --- /dev/null +++ b/externals/vcpkg/ports/pcre/pcre-8.4.5_fix_check_function_exists_for_arm-androi_builds.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2c3a309..cdd480f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -94,7 +94,7 @@ FIND_PACKAGE( Editline ) + + INCLUDE(CheckIncludeFile) + INCLUDE(CheckIncludeFileCXX) +-INCLUDE(CheckFunctionExists) ++INCLUDE(CheckSymbolExists) + INCLUDE(CheckTypeSize) + INCLUDE(GNUInstallDirs) # for CMAKE_INSTALL_LIBDIR + +@@ -109,12 +109,12 @@ CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H) + CHECK_INCLUDE_FILE_CXX(type_traits.h HAVE_TYPE_TRAITS_H) + CHECK_INCLUDE_FILE_CXX(bits/type_traits.h HAVE_BITS_TYPE_TRAITS_H) + +-CHECK_FUNCTION_EXISTS(bcopy HAVE_BCOPY) +-CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE) +-CHECK_FUNCTION_EXISTS(strerror HAVE_STRERROR) +-CHECK_FUNCTION_EXISTS(strtoll HAVE_STRTOLL) +-CHECK_FUNCTION_EXISTS(strtoq HAVE_STRTOQ) +-CHECK_FUNCTION_EXISTS(_strtoi64 HAVE__STRTOI64) ++CHECK_SYMBOL_EXISTS(bcopy strings.h HAVE_BCOPY) ++CHECK_SYMBOL_EXISTS(memmove strings.h HAVE_MEMMOVE) ++CHECK_SYMBOL_EXISTS(strerror strings.h HAVE_STRERROR) ++CHECK_SYMBOL_EXISTS(strtoll stdlib.h HAVE_STRTOLL) ++CHECK_SYMBOL_EXISTS(strtoq stdlib.h HAVE_STRTOQ) ++CHECK_SYMBOL_EXISTS(_strtoi64 stdlib.h HAVE__STRTOI64) + + CHECK_TYPE_SIZE("long long" LONG_LONG) + CHECK_TYPE_SIZE("unsigned long long" UNSIGNED_LONG_LONG) diff --git a/externals/vcpkg/ports/pcre/pcre-8.45_fix_postfix_for_debug_Windows_builds.patch b/externals/vcpkg/ports/pcre/pcre-8.45_fix_postfix_for_debug_Windows_builds.patch new file mode 100755 index 000000000..bd9c9b439 --- /dev/null +++ b/externals/vcpkg/ports/pcre/pcre-8.45_fix_postfix_for_debug_Windows_builds.patch @@ -0,0 +1,161 @@ +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt (revision 1767) ++++ CMakeLists.txt (working copy) +@@ -436,6 +436,12 @@ + @ONLY) + ENDIF(PCRE_BUILD_PCRECPP) + ++# Make sure to not link debug libs ++# against release libs and vice versa ++IF(WIN32) ++ SET(CMAKE_DEBUG_POSTFIX "d") ++ENDIF(WIN32) ++ + # Generate pkg-config files + SET(PACKAGE_VERSION "${PCRE_MAJOR}.${PCRE_MINOR}") + SET(prefix "${CMAKE_INSTALL_PREFIX}") +@@ -442,6 +448,9 @@ + SET(exec_prefix "\${prefix}") + SET(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") + SET(includedir "\${prefix}/include") ++IF(WIN32 AND (CMAKE_BUILD_TYPE MATCHES Debug)) ++ SET(LIB_POSTFIX ${CMAKE_DEBUG_POSTFIX}) ++ENDIF() + IF(NOT BUILD_SHARED_LIBS) + SET(PCRE_STATIC_CFLAG "-DPCRE_STATIC") + ENDIF(NOT BUILD_SHARED_LIBS) +@@ -659,11 +668,6 @@ + ENDIF(MSVC) + + SET(CMAKE_INCLUDE_CURRENT_DIR 1) +-# needed to make sure to not link debug libs +-# against release libs and vice versa +-IF(WIN32) +- SET(CMAKE_DEBUG_POSTFIX "d") +-ENDIF(WIN32) + + SET(targets) + +Index: configure.ac +=================================================================== +--- configure.ac (revision 1767) ++++ configure.ac (working copy) +@@ -1044,6 +1044,9 @@ + AM_CONDITIONAL([WITH_GCOV],[test "x$enable_coverage" = "xyes"]) + + # Produce these files, in addition to config.h. ++# LIB_POSTFIX is used by CMakeLists.txt for Windows debug builds. ++# Pass empty LIB_POSTFIX to *.pc files and pcre-config here. ++AC_SUBST(LIB_POSTFIX) + AC_CONFIG_FILES( + Makefile + libpcre.pc +Index: libpcre.pc.in +=================================================================== +--- libpcre.pc.in (revision 1767) ++++ libpcre.pc.in (working copy) +@@ -8,6 +8,6 @@ + Name: libpcre + Description: PCRE - Perl compatible regular expressions C library with 8 bit character support + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lpcre ++Libs: -L${libdir} -lpcre@LIB_POSTFIX@ + Libs.private: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ + Cflags: -I${includedir} @PCRE_STATIC_CFLAG@ +Index: libpcre16.pc.in +=================================================================== +--- libpcre16.pc.in (revision 1767) ++++ libpcre16.pc.in (working copy) +@@ -8,6 +8,6 @@ + Name: libpcre16 + Description: PCRE - Perl compatible regular expressions C library with 16 bit character support + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lpcre16 ++Libs: -L${libdir} -lpcre16@LIB_POSTFIX@ + Libs.private: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ + Cflags: -I${includedir} @PCRE_STATIC_CFLAG@ +Index: libpcre32.pc.in +=================================================================== +--- libpcre32.pc.in (revision 1767) ++++ libpcre32.pc.in (working copy) +@@ -8,6 +8,6 @@ + Name: libpcre32 + Description: PCRE - Perl compatible regular expressions C library with 32 bit character support + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lpcre32 ++Libs: -L${libdir} -lpcre32@LIB_POSTFIX@ + Libs.private: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ + Cflags: -I${includedir} @PCRE_STATIC_CFLAG@ +Index: libpcrecpp.pc.in +=================================================================== +--- libpcrecpp.pc.in (revision 1767) ++++ libpcrecpp.pc.in (working copy) +@@ -8,5 +8,5 @@ + Name: libpcrecpp + Description: PCRECPP - C++ wrapper for PCRE + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lpcre -lpcrecpp ++Libs: -L${libdir} -lpcre@LIB_POSTFIX@ -lpcrecpp@LIB_POSTFIX@ + Cflags: -I${includedir} @PCRE_STATIC_CFLAG@ +Index: libpcreposix.pc.in +=================================================================== +--- libpcreposix.pc.in (revision 1767) ++++ libpcreposix.pc.in (working copy) +@@ -8,6 +8,6 @@ + Name: libpcreposix + Description: PCREPosix - Posix compatible interface to libpcre + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lpcreposix ++Libs: -L${libdir} -lpcreposix@LIB_POSTFIX@ + Cflags: -I${includedir} @PCRE_STATIC_CFLAG@ + Requires.private: libpcre +Index: pcre-config.in +=================================================================== +--- pcre-config.in (revision 1767) ++++ pcre-config.in (working copy) +@@ -91,7 +91,7 @@ + ;; + --libs-posix) + if test @enable_pcre8@ = yes ; then +- echo $libS$libR -lpcreposix -lpcre ++ echo $libS$libR -lpcreposix@LIB_POSTFIX@ -lpcre@LIB_POSTFIX@ + else + echo "${usage}" 1>&2 + fi +@@ -98,7 +98,7 @@ + ;; + --libs) + if test @enable_pcre8@ = yes ; then +- echo $libS$libR -lpcre ++ echo $libS$libR -lpcre@LIB_POSTFIX@ + else + echo "${usage}" 1>&2 + fi +@@ -105,7 +105,7 @@ + ;; + --libs16) + if test @enable_pcre16@ = yes ; then +- echo $libS$libR -lpcre16 ++ echo $libS$libR -lpcre16@LIB_POSTFIX@ + else + echo "${usage}" 1>&2 + fi +@@ -112,7 +112,7 @@ + ;; + --libs32) + if test @enable_pcre32@ = yes ; then +- echo $libS$libR -lpcre32 ++ echo $libS$libR -lpcre32@LIB_POSTFIX@ + else + echo "${usage}" 1>&2 + fi +@@ -119,7 +119,7 @@ + ;; + --libs-cpp) + if test @enable_cpp@ = yes ; then +- echo $libS$libR -lpcrecpp -lpcre ++ echo $libS$libR -lpcrecpp@LIB_POSTFIX@ -lpcre@LIB_POSTFIX@ + else + echo "${usage}" 1>&2 + fi diff --git a/externals/vcpkg/ports/pcre/pcre-8.45_suppress_cmake_and_compiler_warnings-errors.patch b/externals/vcpkg/ports/pcre/pcre-8.45_suppress_cmake_and_compiler_warnings-errors.patch new file mode 100755 index 000000000..59dbc8b21 --- /dev/null +++ b/externals/vcpkg/ports/pcre/pcre-8.45_suppress_cmake_and_compiler_warnings-errors.patch @@ -0,0 +1,18 @@ +--- a/CMakeLists.txt 2021-06-14 10:33:38.000000000 +0200 ++++ b/CMakeLists.txt 2021-06-18 17:59:59.155148900 +0200 +@@ -77,7 +77,6 @@ + # CMP0026 to avoid warnings for the use of LOCATION in GET_TARGET_PROPERTY. + + CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5) +-CMAKE_POLICY(SET CMP0026 OLD) + + # For FindReadline.cmake. This was changed to allow setting CMAKE_MODULE_PATH + # on the command line. +@@ -199,6 +198,7 @@ + ENDIF(MINGW) + + IF(MSVC) ++ add_definitions(/wd4703 /wd4146 /wd4308) + OPTION(PCRE_STATIC_RUNTIME + "ON=Compile against the static runtime (/MT)." + OFF) diff --git a/externals/vcpkg/ports/pcre/portfile.cmake b/externals/vcpkg/ports/pcre/portfile.cmake new file mode 100755 index 000000000..ca1176fc2 --- /dev/null +++ b/externals/vcpkg/ports/pcre/portfile.cmake @@ -0,0 +1,74 @@ +set(PCRE_VERSION 8.45) +set(EXPECTED_SHA 71f246c0abbf356222933ad1604cab87a1a2a3cd8054a0b9d6deb25e0735ce9f40f923d14cbd21f32fdac7283794270afcb0f221ad24662ac35934fcb73675cd) +set(PATCHES + # Fix CMake Deprecation Warning concerning OLD behavior for policy CMP0026 + # Suppress MSVC compiler warnings C4703, C4146, C4308, which fixes errors + # under x64-uwp and arm-uwp + pcre-8.45_suppress_cmake_and_compiler_warnings-errors.patch + # Modified for 8.45 from https://bugs.exim.org/show_bug.cgi?id=2600 + pcre-8.45_fix_postfix_for_debug_Windows_builds.patch + export-cmake-targets.patch + pcre-8.4.5_fix_check_function_exists_for_arm-androi_builds.patch) + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO pcre/pcre + REF ${PCRE_VERSION} + FILENAME "pcre-${PCRE_VERSION}.zip" + SHA512 ${EXPECTED_SHA} + PATCHES ${PATCHES} +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DPCRE_BUILD_TESTS=NO + -DPCRE_BUILD_PCREGREP=NO + -DPCRE_BUILD_PCRE32=YES + -DPCRE_BUILD_PCRE16=YES + -DPCRE_BUILD_PCRE8=YES + -DPCRE_SUPPORT_JIT=YES + -DPCRE_SUPPORT_UTF=YES + -DPCRE_SUPPORT_UNICODE_PROPERTIES=YES + # optional dependencies for PCREGREP + -DPCRE_SUPPORT_LIBBZ2=OFF + -DPCRE_SUPPORT_LIBZ=OFF + -DPCRE_SUPPORT_LIBEDIT=OFF + -DPCRE_SUPPORT_LIBREADLINE=OFF + # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 + # OPTIONS_RELEASE -DOPTIMIZE=1 + # OPTIONS_DEBUG -DDEBUGGABLE=1 +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME "unofficial-${PORT}" CONFIG_PATH "share/unofficial-${PORT}") + +foreach(FILE "${CURRENT_PACKAGES_DIR}/include/pcre.h" "${CURRENT_PACKAGES_DIR}/include/pcreposix.h") + file(READ ${FILE} PCRE_H) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + string(REPLACE "defined(PCRE_STATIC)" "1" PCRE_H "${PCRE_H}") + else() + string(REPLACE "defined(PCRE_STATIC)" "0" PCRE_H "${PCRE_H}") + endif() + file(WRITE ${FILE} "${PCRE_H}") +endforeach() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/man") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/man") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +else() + file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/pcre-config" "${CURRENT_PACKAGES_DIR}/debug/bin/pcre-config") +endif() + +vcpkg_copy_pdbs() +configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-pcre-config.cmake" "${CURRENT_PACKAGES_DIR}/share/unofficial-pcre/unofficial-pcre-config.cmake" @ONLY) + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/pcre/unofficial-pcre-config.cmake b/externals/vcpkg/ports/pcre/unofficial-pcre-config.cmake new file mode 100755 index 000000000..edf30b977 --- /dev/null +++ b/externals/vcpkg/ports/pcre/unofficial-pcre-config.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-pcre-targets.cmake") diff --git a/externals/vcpkg/ports/pcre/vcpkg.json b/externals/vcpkg/ports/pcre/vcpkg.json new file mode 100755 index 000000000..4c3f8dcb4 --- /dev/null +++ b/externals/vcpkg/ports/pcre/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "pcre", + "version": "8.45", + "port-version": 3, + "description": "Perl Compatible Regular Expressions", + "homepage": "https://www.pcre.org/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/pcre2/no-static-suffix.patch b/externals/vcpkg/ports/pcre2/no-static-suffix.patch new file mode 100755 index 000000000..7f41bcd56 --- /dev/null +++ b/externals/vcpkg/ports/pcre2/no-static-suffix.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fa2181e..3bf5317 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -711,8 +711,8 @@ IF(PCRE2_BUILD_PCRE2_8) + SET(targets ${targets} pcre2-posix-static) + + IF(MSVC) +- SET_TARGET_PROPERTIES(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8-static) +- SET_TARGET_PROPERTIES(pcre2-posix-static PROPERTIES OUTPUT_NAME pcre2-posix-static) ++ SET_TARGET_PROPERTIES(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8) ++ SET_TARGET_PROPERTIES(pcre2-posix-static PROPERTIES OUTPUT_NAME pcre2-posix) + ELSE(MSVC) + SET_TARGET_PROPERTIES(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8) + SET_TARGET_PROPERTIES(pcre2-posix-static PROPERTIES OUTPUT_NAME pcre2-posix) +@@ -777,7 +777,7 @@ IF(PCRE2_BUILD_PCRE2_16) + SET(targets ${targets} pcre2-16-static) + + IF(MSVC) +- SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16-static) ++ SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16) + ELSE(MSVC) + SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16) + ENDIF(MSVC) +@@ -829,7 +829,7 @@ IF(PCRE2_BUILD_PCRE2_32) + SET(targets ${targets} pcre2-32-static) + + IF(MSVC) +- SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32-static) ++ SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32) + ELSE(MSVC) + SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32) + ENDIF(MSVC) diff --git a/externals/vcpkg/ports/pcre2/pcre2-10.35_fix-uwp.patch b/externals/vcpkg/ports/pcre2/pcre2-10.35_fix-uwp.patch new file mode 100755 index 000000000..476dde0f6 --- /dev/null +++ b/externals/vcpkg/ports/pcre2/pcre2-10.35_fix-uwp.patch @@ -0,0 +1,10 @@ +--- a/CMakeLists.txt 2020-05-09 16:43:10.000000000 +0200 ++++ b/CMakeLists.txt 2020-06-03 20:57:17.026182500 +0200 +@@ -619,6 +619,7 @@ + + IF(MSVC) + ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS) ++ add_compile_options(/wd4146) + ENDIF(MSVC) + + SET(CMAKE_INCLUDE_CURRENT_DIR 1) diff --git a/externals/vcpkg/ports/pcre2/portfile.cmake b/externals/vcpkg/ports/pcre2/portfile.cmake new file mode 100755 index 000000000..8211bb287 --- /dev/null +++ b/externals/vcpkg/ports/pcre2/portfile.cmake @@ -0,0 +1,65 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO PCRE2Project/pcre2 + REF pcre2-10.40 + SHA512 098c21d60ecb3bb8449173f50c9ab8e6018fafd5d55548be08b15df37f8e08bcd4f851d75758c4d22505db30a3444bb65783d83cd876c63fdf0de2850815ef93 + HEAD_REF master + PATCHES + pcre2-10.35_fix-uwp.patch + no-static-suffix.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "iOS") + set(JIT OFF) +else() + set(JIT ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC} + -DPCRE2_BUILD_PCRE2_8=ON + -DPCRE2_BUILD_PCRE2_16=ON + -DPCRE2_BUILD_PCRE2_32=ON + -DPCRE2_SUPPORT_JIT=${JIT} + -DPCRE2_SUPPORT_UNICODE=ON + -DPCRE2_BUILD_TESTS=OFF + -DPCRE2_BUILD_PCRE2GREP=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(READ "${CURRENT_PACKAGES_DIR}/include/pcre2.h" PCRE2_H) +if(BUILD_STATIC) + string(REPLACE "defined(PCRE2_STATIC)" "1" PCRE2_H "${PCRE2_H}") +else() + string(REPLACE "defined(PCRE2_STATIC)" "0" PCRE2_H "${PCRE2_H}") +endif() +file(WRITE "${CURRENT_PACKAGES_DIR}/include/pcre2.h" "${PCRE2_H}") + +vcpkg_fixup_pkgconfig() + +# The cmake file provided by pcre2 has some problems, so don't use it for now. +#vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/cmake" "${CURRENT_PACKAGES_DIR}/debug/cmake") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/man") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/man") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(BUILD_STATIC) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +elseif(VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/pcre2-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/..") + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/pcre2-config") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/pcre2-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") + endif() +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/pcre2/vcpkg.json b/externals/vcpkg/ports/pcre2/vcpkg.json new file mode 100755 index 000000000..410cd552e --- /dev/null +++ b/externals/vcpkg/ports/pcre2/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "pcre2", + "version": "10.40", + "description": "Regular Expression pattern matching using the same syntax and semantics as Perl 5.", + "homepage": "https://github.com/PCRE2Project/pcre2", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/pdal-c/cmake-project-include.cmake b/externals/vcpkg/ports/pdal-c/cmake-project-include.cmake new file mode 100755 index 000000000..39f3cca6d --- /dev/null +++ b/externals/vcpkg/ports/pdal-c/cmake-project-include.cmake @@ -0,0 +1,3 @@ +if(WIN32) + add_compile_definitions(NOMINMAX) +endif() diff --git a/externals/vcpkg/ports/pdal-c/portfile.cmake b/externals/vcpkg/ports/pdal-c/portfile.cmake new file mode 100755 index 000000000..bb06b4d04 --- /dev/null +++ b/externals/vcpkg/ports/pdal-c/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO PDAL/CAPI + REF v2.1.0 + SHA512 07c671f83af93594d7792d770890205aad1a44803696f9567aa25f69a277fa5c3f4e9f9f5f0210ebd59f5cf75aff1f80ce532bd7bbd536a699724ceb6e3277fd + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" + -DPDALC_ENABLE_CODE_COVERAGE:BOOL=OFF + -DPDALC_ENABLE_DOCS:BOOL=OFF + -DPDALC_ENABLE_TESTS:BOOL=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Git:BOOL=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +# Remove headers from debug +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Install copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/pdal-c/vcpkg.json b/externals/vcpkg/ports/pdal-c/vcpkg.json new file mode 100755 index 000000000..f02d1afdf --- /dev/null +++ b/externals/vcpkg/ports/pdal-c/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "pdal-c", + "version-string": "2.1", + "description": "C API for the Point Data Abstraction Library (PDAL)", + "homepage": "https://github.com/PDAL/CAPI#readme", + "supports": "!(windows & staticcrt)", + "dependencies": [ + { + "name": "pdal", + "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/pdal/cmake-project-include.cmake b/externals/vcpkg/ports/pdal/cmake-project-include.cmake new file mode 100755 index 000000000..37fd8c2bd --- /dev/null +++ b/externals/vcpkg/ports/pdal/cmake-project-include.cmake @@ -0,0 +1,6 @@ +include(CheckIncludeFileCXX) + +check_include_file_cxx("filesystem" HAVE_CXX17_FILESYSTEM) +if(NOT HAVE_CXX17_FILESYSTEM) + message(FATAL_ERROR "Unable to find header. PDAL requires full C++17 compiler support.") +endif() diff --git a/externals/vcpkg/ports/pdal/fix-dependency.patch b/externals/vcpkg/ports/pdal/fix-dependency.patch new file mode 100755 index 000000000..1c29b5689 --- /dev/null +++ b/externals/vcpkg/ports/pdal/fix-dependency.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 42cca1e..43b0ced 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -266,7 +265,7 @@ target_include_directories(${PDAL_BASE_LIB_NAME} + target_link_libraries(${PDAL_BASE_LIB_NAME} + PRIVATE + ${CMAKE_THREAD_LIBS_INIT} + ${CMAKE_DL_LIBS} +- ${GDAL_LIBRARY} ++ ${GDAL_LIBRARIES} + ${GEOTIFF_LIBRARY} + ${LIBXML2_LIBRARIES} + ${ZLIB_LIBRARIES} +diff --git a/cmake/zstd.cmake b/cmake/zstd.cmake +index bfaa5b2..e73ec9e 100644 +--- a/cmake/zstd.cmake ++++ b/cmake/zstd.cmake +@@ -4,7 +4,14 @@ + option(WITH_ZSTD + "Build support for compression/decompression with Zstd." TRUE) + if (WITH_ZSTD) +- find_package(ZSTD QUIET) ++ find_package(ZSTD NAMES zstd REQUIRED) ++ set(ZSTD_INCLUDE_DIRS "") ++ if(TARGET zstd::libzstd_static) ++ set(ZSTD_LIBRARIES zstd::libzstd_static) ++ set(ZSTD_STATIC_LIB zstd::libzstd_static) ++ else() ++ set(ZSTD_LIBRARIES zstd::libzstd_shared) ++ endif() + set_package_properties(ZSTD PROPERTIES TYPE + PURPOSE "General compression support") + if (ZSTD_FOUND) diff --git a/externals/vcpkg/ports/pdal/fix-find-library-suffix.patch b/externals/vcpkg/ports/pdal/fix-find-library-suffix.patch new file mode 100755 index 000000000..be3cd71ee --- /dev/null +++ b/externals/vcpkg/ports/pdal/fix-find-library-suffix.patch @@ -0,0 +1,11 @@ +diff --git a/cmake/libraries.cmake b/cmake/libraries.cmake +index 665bc53..fcdcf2c 100644 +--- a/cmake/libraries.cmake ++++ b/cmake/libraries.cmake +@@ -1,6 +1,3 @@ + # Build shared libraries by default. + + set(PDAL_LIB_TYPE "SHARED") +-if (WIN32) +- set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_IMPORT_LIBRARY_SUFFIX}) +-endif() diff --git a/externals/vcpkg/ports/pdal/fix-unix-compiler-options.patch b/externals/vcpkg/ports/pdal/fix-unix-compiler-options.patch new file mode 100755 index 000000000..79a379cb9 --- /dev/null +++ b/externals/vcpkg/ports/pdal/fix-unix-compiler-options.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 679b4e7..08965d9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -187,7 +187,7 @@ add_subdirectory(apps) + # so that users only need link libpdalcpp. + # + if (APPLE) +- set(PDAL_REEXPORT "-Wl,-reexport_library,$") ++ set(PDAL_REEXPORT "-Wl$-reexport_library$$") + # + # This allows the rpath reference for the reexported library (above) to + # be found. diff --git a/externals/vcpkg/ports/pdal/no-pkgconfig-requires.patch b/externals/vcpkg/ports/pdal/no-pkgconfig-requires.patch new file mode 100755 index 000000000..1f0841e2c --- /dev/null +++ b/externals/vcpkg/ports/pdal/no-pkgconfig-requires.patch @@ -0,0 +1,12 @@ +diff --git a/apps/pdal.pc.in b/apps/pdal.pc.in +index 6885221..cd2136c 100644 +--- a/apps/pdal.pc.in ++++ b/apps/pdal.pc.in +@@ -5,7 +5,6 @@ includedir=@CMAKE_INSTALL_PREFIX@/include + + Name: PDAL + Description: Point Data Abstraction Library +-Requires: @PKGCONFIG_LIBRARY_DEFINITIONS@ + Version: @PDAL_VERSION@ + Libs: -L${libdir} -l@PDAL_LIB_NAME@ + Cflags: -I${includedir}/pdal @PDAL_CONFIG_DEFINITIONS@ diff --git a/externals/vcpkg/ports/pdal/no-rpath.patch b/externals/vcpkg/ports/pdal/no-rpath.patch new file mode 100755 index 000000000..ab2c555c9 --- /dev/null +++ b/externals/vcpkg/ports/pdal/no-rpath.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/rpath.cmake b/cmake/rpath.cmake +index ba486b7..4323a77 100644 +--- a/cmake/rpath.cmake ++++ b/cmake/rpath.cmake +@@ -1,6 +1,7 @@ + # + # Set options and variable related to OSX rpath. + # ++return() + + # per http://www.cmake.org/Wiki/CMake_RPATH_handling + SET(CMAKE_SKIP_BUILD_RPATH FALSE) diff --git a/externals/vcpkg/ports/pdal/portfile.cmake b/externals/vcpkg/ports/pdal/portfile.cmake new file mode 100755 index 000000000..1a297c56c --- /dev/null +++ b/externals/vcpkg/ports/pdal/portfile.cmake @@ -0,0 +1,130 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO PDAL/PDAL + REF 2.4.0 + SHA512 fd1314058404a1d15e308cee5682dcf3f1c6277884f200069b293b929ddfcd1d0d29bc74353bb08b1d163d3e776c8b036ba62d7c8599470b755128dacfe2f032 + HEAD_REF master + PATCHES + fix-dependency.patch + fix-unix-compiler-options.patch + fix-find-library-suffix.patch + no-pkgconfig-requires.patch + no-rpath.patch +) + +# Prefer pristine CMake find modules + wrappers and config files from vcpkg. +foreach(package IN ITEMS Curl GeoTIFF ICONV ZSTD) + file(REMOVE "${SOURCE_PATH}/cmake/modules/Find${package}.cmake") +endforeach() + +# De-vendoring +file(REMOVE_RECURSE + "${SOURCE_PATH}/vendor/nanoflann" + "${SOURCE_PATH}/vendor/nlohmann" +) +file(INSTALL "${CURRENT_INSTALLED_DIR}/include/nanoflann.hpp" DESTINATION "${SOURCE_PATH}/vendor/nanoflann") +file(INSTALL "${CURRENT_INSTALLED_DIR}/include/nlohmann/json.hpp" DESTINATION "${SOURCE_PATH}/vendor/nlohmann/nlohmann") +file(APPEND "${SOURCE_PATH}/vendor/nlohmann/nlohmann/json.hpp" "namespace NL = nlohmann;\n") + +unset(ENV{OSGEO4W_HOME}) + +if("laszip" IN_LIST FEATURES) + message(WARNING "The 'laszip' feature is obsolete and will be removed in the future.") +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + draco BUILD_PLUGIN_DRACO + e57 BUILD_PLUGIN_E57 + hdf5 BUILD_PLUGIN_HDF + i3s BUILD_PLUGIN_I3S + lzma WITH_LZMA + pgpointcloud BUILD_PLUGIN_PGPOINTCLOUD + zstd WITH_ZSTD +) +if(BUILD_PLUGIN_DRACO) + vcpkg_find_acquire_program(PKGCONFIG) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" + -DPDAL_PLUGIN_INSTALL_PATH=. + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" + -DWITH_TESTS:BOOL=OFF + -DWITH_COMPLETION:BOOL=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Libexecinfo:BOOL=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Libunwind:BOOL=ON + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/PDAL) +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +# Install and cleanup executables +file(GLOB pdal_unsupported + "${CURRENT_PACKAGES_DIR}/bin/*.bat" + "${CURRENT_PACKAGES_DIR}/bin/pdal-config" + "${CURRENT_PACKAGES_DIR}/debug/bin/*.bat" + "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe" + "${CURRENT_PACKAGES_DIR}/debug/bin/pdal-config" +) +file(REMOVE ${pdal_unsupported}) +vcpkg_copy_tools(TOOL_NAMES pdal AUTO_CLEAN) + +# Post-install clean-up +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/include/pdal/filters/private/csf" + "${CURRENT_PACKAGES_DIR}/include/pdal/filters/private/miniball" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(READ "${SOURCE_PATH}/LICENSE.txt" pdal_license) +file(READ "${SOURCE_PATH}/vendor/arbiter/LICENSE" arbiter_license) +file(READ "${SOURCE_PATH}/vendor/kazhdan/PoissonRecon.h" kazhdan_license) +string(REGEX REPLACE "^/\\*\n|\\*/.*\$" "" kazhdan_license "${kazhdan_license}") +file(READ "${SOURCE_PATH}/vendor/lazperf/lazperf.hpp" lazperf_license) +string(REGEX REPLACE "^/\\*\n|\\*/.*\$" "" lazperf_license "${lazperf_license}") +file(READ "${SOURCE_PATH}/vendor/lazperf/detail/field_xyz.hpp" lazperf_detail_license) +string(REGEX REPLACE "^/\\*\n|\\*/.*\$" "" lazperf_detail_license "${lazperf_detail_license}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" +"${pdal_license} +--- + +Files in vendor/arbiter/: + +${arbiter_license} +--- + +Files in vendor/kazhdan/: + +${kazhdan_license} +--- + +Files in vendor/lazperf/: + +${lazperf_license} +--- + +Files in vendor/lazperf/detail/: + +${lazperf_detail_license} +--- + +Files in vendor/eigen: + +Most Eigen source code is subject to the terms of the Mozilla Public License +v. 2.0. You can obtain a copy the MPL 2.0 at http://mozilla.org/MPL/2.0/. + +Some files included in Eigen are under of the following licenses: + - Apache License, Version 2.0 + - BSD 3-Clause \"New\" or \"Revised\" License +") diff --git a/externals/vcpkg/ports/pdal/usage b/externals/vcpkg/ports/pdal/usage new file mode 100755 index 000000000..eaf378864 --- /dev/null +++ b/externals/vcpkg/ports/pdal/usage @@ -0,0 +1,9 @@ +The package pdal provides CMake variables: + + find_package(PDAL CONFIG REQUIRED) + target_include_directories(${PDAL_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${PDAL_LIBRARIES}) + +If necessary, override the default plugin search path by setting the +environment variable PDAL_DRIVER_PATH to a list of directories that +pdal should search for plugins. diff --git a/externals/vcpkg/ports/pdal/vcpkg.json b/externals/vcpkg/ports/pdal/vcpkg.json new file mode 100755 index 000000000..2dc6a4e36 --- /dev/null +++ b/externals/vcpkg/ports/pdal/vcpkg.json @@ -0,0 +1,105 @@ +{ + "name": "pdal", + "version": "2.4.0", + "description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.", + "homepage": "https://pdal.io/", + "license": null, + "supports": "!(windows & staticcrt)", + "dependencies": [ + { + "name": "curl", + "default-features": false + }, + { + "name": "gdal", + "default-features": false + }, + "libgeotiff", + "libxml2", + "nanoflann", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "supported-plugins" + ], + "features": { + "draco": { + "description": "Build the Draco plugin", + "dependencies": [ + "draco" + ] + }, + "e57": { + "description": "Build the E57 plugin", + "dependencies": [ + "xerces-c" + ] + }, + "hdf": { + "description": "Build the HDF plugin", + "dependencies": [ + { + "name": "hdf5", + "default-features": false + } + ] + }, + "i3s": { + "description": "Build the SLPK/I3S plugins", + "dependencies": [ + "zlib" + ] + }, + "laszip": { + "description": "Obsolete. PDAL includes LAZperf." + }, + "liblzma": { + "description": "Support for compression/decompression with LZMA", + "dependencies": [ + "liblzma" + ] + }, + "pgpointcloud": { + "description": "Build the PgPointCloud plugin", + "dependencies": [ + "libpq" + ] + }, + "supported-plugins": { + "description": "Default set of plugins, dependent on platform", + "dependencies": [ + { + "name": "pdal", + "default-features": false, + "features": [ + "draco", + "e57", + "i3s" + ] + }, + { + "name": "pdal", + "default-features": false, + "features": [ + "hdf", + "pgpointcloud" + ], + "platform": "!uwp" + } + ] + }, + "zstd": { + "description": "Support for ZSTD compression/decompression", + "dependencies": [ + "zstd" + ] + } + } +} diff --git a/externals/vcpkg/ports/pdcurses/LICENSE b/externals/vcpkg/ports/pdcurses/LICENSE new file mode 100755 index 000000000..ec633d8f2 --- /dev/null +++ b/externals/vcpkg/ports/pdcurses/LICENSE @@ -0,0 +1,7 @@ +The core package is in the public domain, but small portions of PDCurses are subject to copyright under various licenses. + +The win32 files are released to the public domain. + +If you use PDCurses in an application, an acknowledgement would be appreciated, but is not mandatory. If you make corrections or enhancements to PDCurses, please forward them to the current maintainer for the benefit of other users. + +This software is provided AS IS with NO WARRANTY whatsoever. \ No newline at end of file diff --git a/externals/vcpkg/ports/pdcurses/nmake-install.patch b/externals/vcpkg/ports/pdcurses/nmake-install.patch new file mode 100755 index 000000000..892550352 --- /dev/null +++ b/externals/vcpkg/ports/pdcurses/nmake-install.patch @@ -0,0 +1,21 @@ +diff --git a/wincon/Makefile.vc b/wincon/Makefile.vc +index 80c4689..1bae388 100644 +--- a/wincon/Makefile.vc ++++ b/wincon/Makefile.vc +@@ -118,3 +118,16 @@ tui.obj: $(demodir)\tui.c $(demodir)\tui.h + + tuidemo.obj: $(demodir)\tuidemo.c + $(BUILD) -I$(demodir) $(demodir)\tuidemo.c ++ ++install: all ++ -mkdir $(INSTALLDIR)\lib ++ copy pdcurses.lib $(INSTALLDIR)\lib ++!ifdef DLL ++ -mkdir $(INSTALLDIR)\bin ++ copy pdcurses.dll $(INSTALLDIR)\bin ++!endif ++!ifndef SKIP_HEADERS ++ -mkdir $(INSTALLDIR)\include ++ copy $(PDCURSES_SRCDIR)\curses.h $(INSTALLDIR)\include ++ copy $(PDCURSES_SRCDIR)\panel.h $(INSTALLDIR)\include ++!endif diff --git a/externals/vcpkg/ports/pdcurses/portfile.cmake b/externals/vcpkg/ports/pdcurses/portfile.cmake new file mode 100755 index 000000000..7869f2185 --- /dev/null +++ b/externals/vcpkg/ports/pdcurses/portfile.cmake @@ -0,0 +1,42 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wmcbrine/PDCurses + REF 6c1f95c4fa9f9f105879c2d99dd72a5bf335c046 # 3.9 + SHA512 2d682a3516baaa58a97854aca64d985768b7af76d998240b54afc57ddf2a44894835a1748888f8dd7c1cc8045ede77488284f8adf1b73878879b4b4d3391218d + HEAD_REF master + PATCHES + nmake-install.patch +) + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + cmake_path(NATIVE_PATH SOURCE_PATH PDCURSES_SRCDIR) + set(DLL_OPTION "") + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(DLL_OPTION DLL=Y) + endif() + vcpkg_build_nmake( + SOURCE_PATH "${SOURCE_PATH}/wincon" + PROJECT_NAME Makefile.vc + ENABLE_INSTALL + OPTIONS + /A + "PDCURSES_SRCDIR=${PDCURSES_SRCDIR}" + WIDE=Y + UTF8=Y + ${DLL_OPTION} + OPTIONS_RELEASE + "CFLAGS=-D_CRT_SECURE_NO_WARNINGS" + "LDFLAGS=" + OPTIONS_DEBUG + "CFLAGS=-D_CRT_SECURE_NO_WARNINGS -DPDCDEBUG" + "LDFLAGS=-debug" + DEBUG=Y + SKIP_HEADERS=Y + ) + vcpkg_copy_pdbs() + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/curses.h" "#ifdef PDC_DLL_BUILD" "#if 1") + endif() +endif() + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/pdcurses/vcpkg.json b/externals/vcpkg/ports/pdcurses/vcpkg.json new file mode 100755 index 000000000..fa26f9b12 --- /dev/null +++ b/externals/vcpkg/ports/pdcurses/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "pdcurses", + "version-string": "3.9", + "port-version": 3, + "description": "Public Domain Curses - a curses library for environments that don't fit the termcap/terminfo model.", + "homepage": "https://pdcurses.org/", + "supports": "windows & !uwp & !mingw" +} diff --git a/externals/vcpkg/ports/pdqsort/portfile.cmake b/externals/vcpkg/ports/pdqsort/portfile.cmake new file mode 100755 index 000000000..9e4c3e798 --- /dev/null +++ b/externals/vcpkg/ports/pdqsort/portfile.cmake @@ -0,0 +1,13 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO orlp/pdqsort + REF 08879029ab8dcb80a70142acb709e3df02de5d37 + SHA512 38e8b6e35edf1e88e26850a13ce892d8adc0d3e1d7954287d024b3bb858a6b2284e25fbf7c92a694b3ec77cacaf6bbc27fc365187115f7cca6bc88088f67a18f + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/pdqsort.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/pdqsort) + +# Handle copyright +file(COPY ${SOURCE_PATH}/license.txt ${SOURCE_PATH}/readme.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/pdqsort) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/pdqsort/license.txt ${CURRENT_PACKAGES_DIR}/share/pdqsort/copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/pdqsort/vcpkg.json b/externals/vcpkg/ports/pdqsort/vcpkg.json new file mode 100755 index 000000000..60a5647ea --- /dev/null +++ b/externals/vcpkg/ports/pdqsort/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "pdqsort", + "version-string": "2019-07-30", + "port-version": 1, + "description": "Pattern-defeating quicksort (pdqsort) is a novel sorting algorithm", + "homepage": "https://github.com/orlp/pdqsort" +} diff --git a/externals/vcpkg/ports/pe-parse/arm64-windows-fix.patch b/externals/vcpkg/ports/pe-parse/arm64-windows-fix.patch new file mode 100755 index 000000000..44907c096 --- /dev/null +++ b/externals/vcpkg/ports/pe-parse/arm64-windows-fix.patch @@ -0,0 +1,13 @@ +find_package(Filesystem) fails on arm64 Windows. +We can remove it as it is only used for tests which are not built in vcpkg. +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,7 +15,6 @@ endif () + include(cmake/compilation_flags.cmake) + # Greater c++17 filesystem compatibility (like with experimental) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") +-find_package(Filesystem COMPONENTS Experimental Final REQUIRED) + list(APPEND GLOBAL_CXXFLAGS ${DEFAULT_CXX_FLAGS}) + + option(BUILD_SHARED_LIBS "Build Shared Libraries" ON) diff --git a/externals/vcpkg/ports/pe-parse/portfile.cmake b/externals/vcpkg/ports/pe-parse/portfile.cmake new file mode 100755 index 000000000..c38c8726b --- /dev/null +++ b/externals/vcpkg/ports/pe-parse/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO trailofbits/pe-parse + REF v1.3.0 + SHA512 b723e90821e0ac67b4d6b15e5a46cf13544f21380a4d2add013eedcaa309e1be2cff6789247397c6fb4a938e4a240a835cbe21c8221bd558a4fccf8e93ce1548 + HEAD_REF master + PATCHES + arm64-windows-fix.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_COMMAND_LINE_TOOLS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/pe-parse") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/pe-parse/vcpkg.json b/externals/vcpkg/ports/pe-parse/vcpkg.json new file mode 100755 index 000000000..8c16ca2fa --- /dev/null +++ b/externals/vcpkg/ports/pe-parse/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "pe-parse", + "version": "1.3.0", + "description": "pe-parse is a principled, lightweight C/C++ PE parser", + "homepage": "https://github.com/trailofbits/pe-parse", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/pegtl-2/portfile.cmake b/externals/vcpkg/ports/pegtl-2/portfile.cmake new file mode 100755 index 000000000..554f50c5c --- /dev/null +++ b/externals/vcpkg/ports/pegtl-2/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO taocpp/pegtl + REF 47e878ad4fd72c91253c9d47b6f17e001ca2dfcf # 2.8.3 + SHA512 c7761e36dd28914d89a2d5e2a5ce5ea84bab50b7f7ad235b18dbeca41a675503b00b0fe152247515f81ec380f3c68cf827e667cb3b9a7e34c6d2f5dd60fb4106 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DPEGTL_BUILD_TESTS=OFF + -DPEGTL_BUILD_EXAMPLES=OFF + -DPEGTL_INSTALL_INCLUDE_DIR=include/pegtl-2 + -DPEGTL_INSTALL_DOC_DIR=share/pegtl-2 + -DPEGTL_INSTALL_CMAKE_DIR=share/pegtl-2/cmake +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/pegtl-2/cmake) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +# Handle copyright +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) + +# Handle collision with latest pegtl +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/pegtl-config.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/pegtl-config-version.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config-version.cmake) diff --git a/externals/vcpkg/ports/pegtl-2/vcpkg.json b/externals/vcpkg/ports/pegtl-2/vcpkg.json new file mode 100755 index 000000000..55ee5e69f --- /dev/null +++ b/externals/vcpkg/ports/pegtl-2/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "pegtl-2", + "version-string": "2.8.3", + "port-version": 1, + "description": "The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG). This version maintains compatibility with C++11.", + "homepage": "https://github.com/taocpp/PEGTL" +} diff --git a/externals/vcpkg/ports/pegtl/portfile.cmake b/externals/vcpkg/ports/pegtl/portfile.cmake new file mode 100755 index 000000000..5746327c2 --- /dev/null +++ b/externals/vcpkg/ports/pegtl/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO taocpp/pegtl + REF e65017d398a3b733aedab70bb64b8055472d47aa + SHA512 05ca3754a9c1c94a205c6823e4442dca1f11a890aadd4b0c96f6ccd8946eec061c0a723bc67f8b57b074154e1ab1171bdcdd035926f55e42b5517b9d5ecae873 + HEAD_REF 3.x +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DPEGTL_BUILD_TESTS=OFF + -DPEGTL_BUILD_EXAMPLES=OFF + -DPEGTL_INSTALL_DOC_DIR=share/pegtl + -DPEGTL_INSTALL_CMAKE_DIR=share/pegtl/cmake +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/pegtl/cmake) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +# Handle copyright +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/externals/vcpkg/ports/pegtl/vcpkg.json b/externals/vcpkg/ports/pegtl/vcpkg.json new file mode 100755 index 000000000..e2455acb9 --- /dev/null +++ b/externals/vcpkg/ports/pegtl/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "pegtl", + "version-semver": "3.2.6", + "description": "The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG).", + "homepage": "https://github.com/taocpp/PEGTL", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/pffft/CMakeLists.txt b/externals/vcpkg/ports/pffft/CMakeLists.txt new file mode 100755 index 000000000..40f447ae5 --- /dev/null +++ b/externals/vcpkg/ports/pffft/CMakeLists.txt @@ -0,0 +1,25 @@ +cmake_minimum_required(VERSION 3.12.4) +project(pffft C) + +add_library(pffft pffft.c) + +if(MSVC) + target_compile_definitions(pffft PRIVATE _USE_MATH_DEFINES) +endif() + +target_include_directories(pffft PUBLIC $ $) + +install( + TARGETS pffft + EXPORT pffft-config +) + +install( + EXPORT pffft-config + NAMESPACE pffft:: + DESTINATION share/pffft +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES pffft.h DESTINATION include/pffft) +endif() \ No newline at end of file diff --git a/externals/vcpkg/ports/pffft/copyright b/externals/vcpkg/ports/pffft/copyright new file mode 100755 index 000000000..871b42e83 --- /dev/null +++ b/externals/vcpkg/ports/pffft/copyright @@ -0,0 +1,52 @@ +Copyright (c) 2013 Julien Pommier ( pommier@modartt.com ) + +Based on original fortran 77 code from FFTPACKv4 from NETLIB +(http://www.netlib.org/fftpack), authored by Dr Paul Swarztrauber +of NCAR, in 1985. + +As confirmed by the NCAR fftpack software curators, the following +FFTPACKv5 license applies to FFTPACKv4 sources. My changes are +released under the same terms. + +FFTPACK license: + +http://www.cisl.ucar.edu/css/software/fftpack5/ftpk.html + +Copyright (c) 2004 the University Corporation for Atmospheric +Research ("UCAR"). All rights reserved. Developed by NCAR's +Computational and Information Systems Laboratory, UCAR, +www.cisl.ucar.edu. + +Redistribution and use of the Software in source and binary forms, +with or without modification, is permitted provided that the +following conditions are met: + +- Neither the names of NCAR's Computational and Information Systems +Laboratory, the University Corporation for Atmospheric Research, +nor the names of its sponsors or contributors may be used to +endorse or promote products derived from this Software without +specific prior written permission. + +- Redistributions of source code must retain the above copyright +notices, this list of conditions, and the disclaimer below. + +- Redistributions in binary form must reproduce the above copyright +notice, this list of conditions, and the disclaimer below in the +documentation and/or other materials provided with the +distribution. + +THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE +SOFTWARE. + + +PFFFT : a Pretty Fast FFT. + +This file is largerly based on the original FFTPACK implementation, modified in +order to take advantage of SIMD instructions of modern CPUs. diff --git a/externals/vcpkg/ports/pffft/portfile.cmake b/externals/vcpkg/ports/pffft/portfile.cmake new file mode 100755 index 000000000..32d4f833f --- /dev/null +++ b/externals/vcpkg/ports/pffft/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_bitbucket( + OUT_SOURCE_PATH SOURCE_PATH + REPO jpommier/pffft + REF ed78751d751e51bbd94c41d24f748b400f272d69 + SHA512 44f65c7f7e5b71f549dca2e03d58b1fd64e698858f79e4c2833a9ae3dff8a835cf9d5e14be2341c6370f800012cb69b05b9226d6918b12e67f7f7e81ed8e9ad4 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") \ No newline at end of file diff --git a/externals/vcpkg/ports/pffft/vcpkg.json b/externals/vcpkg/ports/pffft/vcpkg.json new file mode 100755 index 000000000..5ea7a3bd2 --- /dev/null +++ b/externals/vcpkg/ports/pffft/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "pffft", + "version-date": "2021-10-09", + "description": "PFFFT, a pretty fast Fourier Transform.", + "homepage": "https://bitbucket.org/jpommier/pffft/", + "supports": "static", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/pfring/makefile.patch b/externals/vcpkg/ports/pfring/makefile.patch new file mode 100755 index 000000000..cc17fb1f7 --- /dev/null +++ b/externals/vcpkg/ports/pfring/makefile.patch @@ -0,0 +1,59 @@ +diff --git a/Makefile b/Makefile +index 4b377c628..39cbf5cb4 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,10 +1,12 @@ + all: +- cd kernel; make +- cd userland; ./configure; make +- cd drivers; make ++ $(MAKE) -C kernel; ++ #cd kernel; make ++ cd userland; ./configure; ++ $(MAKE) -C userland; ++ $(MAKE) -C drivers; + + install: +- cd userland; make install ++ $(MAKE) install -C userland; + + clean: + -cd kernel; make clean +diff --git a/userland/Makefile b/userland/Makefile +index 959470c0f..e35ca8de7 100644 +--- a/userland/Makefile ++++ b/userland/Makefile +@@ -9,22 +9,22 @@ lib/Makefile: + config: lib/Makefile + + libpfring: config +- cd lib; make ++ $(MAKE) -C lib + + build_nbpf: config +- cd nbpf; make ++ $(MAKE) -C nbpf + + build_c++: libpfring +- cd c++; make ++ $(MAKE) -C c++ + + tcpdump/Makefile: + cd tcpdump; ./configure --with_system_libpcap=yes + + build_tcpdump: libpfring tcpdump/Makefile +- cd tcpdump; make ++ $(MAKE) -C tcpdump + + build_extcap: libpfring +- cd wireshark/extcap; make ++ $(MAKE) -C wireshark/extcap + + ################### + +@@ -46,4 +46,4 @@ extcap_clean: + cd wireshark/extcap; make clean + + install: libpfring +- cd lib; make install ++ $(MAKE) -C lib install diff --git a/externals/vcpkg/ports/pfring/portfile.cmake b/externals/vcpkg/ports/pfring/portfile.cmake new file mode 100755 index 000000000..9ef166735 --- /dev/null +++ b/externals/vcpkg/ports/pfring/portfile.cmake @@ -0,0 +1,63 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ntop/PF_RING + REF 582fa09bc58411cfe6f27facd7e6438924f779d2 + SHA512 78dd2d2f9df259483196905f80a904534632a835f742d1f8b3ad645ea80f2dad78356960a2b35e2678525786a7344fa248b708bd3f86101c43fb36c7abc05598 + HEAD_REF dev + PATCHES + use-vcpkg-libpcap.patch + makefile.patch +) + +file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(COPY "${SOURCE_PATH}/" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(COPY "${SOURCE_PATH}/" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") +endif() +set(ENV{VCPKG_LIBPCAP_DIR} "${CURRENT_INSTALLED_DIR}") +vcpkg_build_make() +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() + +# Install manually because pfring cannot set prefix +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) + set(PFRING_OBJ_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) + + if (VCPKG_BUILD_TYPE STREQUAL debug) + file(GLOB_RECURSE PFRING_KO_FILES "${PFRING_OBJ_DIR}/*.ko") + file(INSTALL ${PFRING_KO_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/share/${PORT}) + + file(INSTALL ${SOURCE_PATH}/userland/lib/pfring.h DESTINATION ${CURRENT_PACKAGES_DIR}/debug/include) + endif() + + file(GLOB_RECURSE PFRING_LIBS "${PFRING_OBJ_DIR}/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + file(INSTALL ${PFRING_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(GLOB_RECURSE PFRING_DLLS "${PFRING_OBJ_DIR}/*${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") + file(INSTALL ${PFRING_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + endif() +endif() + +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) + set(PFRING_OBJ_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) + + file(GLOB_RECURSE PFRING_KO_FILES "${PFRING_OBJ_DIR}/*.ko") + file(INSTALL ${PFRING_KO_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + + file(GLOB_RECURSE PFRING_LIBS "${PFRING_OBJ_DIR}/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + file(INSTALL ${PFRING_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(GLOB_RECURSE PFRING_DLLS "${PFRING_OBJ_DIR}/*${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") + file(INSTALL ${PFRING_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + endif() + + file(INSTALL ${SOURCE_PATH}/userland/lib/pfring.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) +endif() + +#Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/pfring/use-vcpkg-libpcap.patch b/externals/vcpkg/ports/pfring/use-vcpkg-libpcap.patch new file mode 100755 index 000000000..e005442bf --- /dev/null +++ b/externals/vcpkg/ports/pfring/use-vcpkg-libpcap.patch @@ -0,0 +1,146 @@ +diff --git a/userland/Makefile b/userland/Makefile +index d5392c09..959470c0 100644 +--- a/userland/Makefile ++++ b/userland/Makefile +@@ -1,4 +1,4 @@ +-all: libpfring pcap build_examples build_examples_zc build_examples_ft build_extcap ++all: libpfring build_extcap + # build_tcpdump build_c++ + + ################### +@@ -14,52 +14,25 @@ libpfring: config + build_nbpf: config + cd nbpf; make + +-libpcap/Makefile: +- cd libpcap; ./configure --enable-ipv6 --enable-dbus=no --without-libnl --with-snf=no --disable-bluetooth --disable-canusb --with-dag=no +- +-pcap: libpfring libpcap/Makefile +- cd libpcap; make +- +-build_examples: config +- cd examples; make +- +-build_examples_zc: config +- cd examples_zc; make +- +-build_examples_ft: config +- cd examples_ft; make +- + build_c++: libpfring + cd c++; make + + tcpdump/Makefile: +- cd tcpdump; ./configure ++ cd tcpdump; ./configure --with_system_libpcap=yes + +-build_tcpdump: libpfring pcap tcpdump/Makefile ++build_tcpdump: libpfring tcpdump/Makefile + cd tcpdump; make + +-build_extcap: libpfring pcap ++build_extcap: libpfring + cd wireshark/extcap; make + + ################### + +-clean: libpfring_clean pcap_clean examples_clean examples_ft_clean examples_zc_clean c++_clean tcpdump_clean nbpf_clean extcap_clean ++clean: libpfring_clean c++_clean tcpdump_clean nbpf_clean extcap_clean + + libpfring_clean: + cd lib; make clean + +-pcap_clean: +- if test -f libpcap/config.status; then cd libpcap; make clean; fi +- +-examples_clean: +- cd examples; make clean +- +-examples_zc_clean: +- cd examples_zc; make clean +- +-examples_ft_clean: +- cd examples_ft; make clean +- + c++_clean: + cd c++; make clean + +@@ -72,8 +45,5 @@ nbpf_clean: + extcap_clean: + cd wireshark/extcap; make clean + +-install: libpfring pcap examples examples_zc examples_ft ++install: libpfring + cd lib; make install +- cd libpcap; make install +- cd examples; make install +- cd examples_zc; make install +diff --git a/userland/c++/Makefile.in b/userland/c++/Makefile.in +index 02bf5164..b0442d84 100644 +--- a/userland/c++/Makefile.in ++++ b/userland/c++/Makefile.in +@@ -1,8 +1,7 @@ + CPP=g++ -g + + KERNEL_DIR=../../kernel +-LIBPCAP_DIR=../libpcap +-INCLUDE=-I$(KERNEL_DIR) -I$(LIBPCAP_DIR) -I../lib `../lib/pfring_config --include` ++INCLUDE=-I$(KERNEL_DIR) -I$(VCPKG_LIBPCAP_DIR)/include -I../lib `../lib/pfring_config --include` + LIBPFRING_CPP=libpfring_cpp.a + RANLIB=ranlib + OBJ=PFring.o +@@ -11,7 +10,7 @@ LIBS=../lib/libpfring.a `../lib/pfring_config --libs` -lpthread + all: $(LIBPFRING_CPP) pf_test + + pf_test: pf_test.cpp $(LIBPFRING_CPP) +- $(CPP) $(INCLUDE) $< $(LIBPFRING_CPP) -o $@ $(LIBS) $(LIBPCAP_DIR)/libpcap.a @SYSLIBS@ ++ $(CPP) $(INCLUDE) $< $(LIBPFRING_CPP) -o $@ $(LIBS) $(VCPKG_LIBPCAP_DIR)/lib/libpcap.a @SYSLIBS@ + + $(LIBPFRING_CPP): $(OBJ) + @rm -f $@ +diff --git a/userland/snort/pfring-daq-module-zc/Makefile.am b/userland/snort/pfring-daq-module-zc/Makefile.am +index 7123de18..45998688 100644 +--- a/userland/snort/pfring-daq-module-zc/Makefile.am ++++ b/userland/snort/pfring-daq-module-zc/Makefile.am +@@ -4,5 +4,5 @@ ACLOCAL_AMFLAGS = -I m4 + + pkglib_LTLIBRARIES = daq_pfring_zc.la + daq_pfring_zc_la_SOURCES = daq_pfring_zc.c +-daq_pfring_zc_la_CFLAGS = -DBUILDING_SO -I../../libpcap +-daq_pfring_zc_la_LDFLAGS = -module -export-dynamic -avoid-version -shared -lrt ../../libpcap/libpcap.a ++daq_pfring_zc_la_CFLAGS = -DBUILDING_SO -I${VCPKG_LIBPCAP_DIR}/include ++daq_pfring_zc_la_LDFLAGS = -module -export-dynamic -avoid-version -shared -lrt ${VCPKG_LIBPCAP_DIR}/lib/libpcap.a +diff --git a/userland/tcpdump-4.9.2/Makefile.in b/userland/tcpdump-4.9.2/Makefile.in +index e2c74d13..47d9e2cc 100644 +--- a/userland/tcpdump-4.9.2/Makefile.in ++++ b/userland/tcpdump-4.9.2/Makefile.in +@@ -373,7 +373,7 @@ TEST_DIST= `find tests \( -name 'DIFF' -prune \) -o \( -name NEW -prune \) -o -t + + all: $(PROG) $(LIBNETDISSECT) + +-$(PROG): $(OBJ) @V_PCAPDEP@ ++$(PROG): $(OBJ) $(VCPKG_LIBPCAP_DIR)/lib/libpcap.a + @rm -f $@ + $(CC) $(FULL_CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) + +diff --git a/userland/wireshark/extcap/Makefile.in b/userland/wireshark/extcap/Makefile.in +index 970b9680..3e34ccc8 100644 +--- a/userland/wireshark/extcap/Makefile.in ++++ b/userland/wireshark/extcap/Makefile.in +@@ -20,14 +20,13 @@ LIBPFRING = ${PFRINGDIR}/libpfring.a + # + O_FLAG = -O2 -DHAVE_PF_RING + EXTRA_LIBS = +-PCAPDIR = ../../libpcap +-LIBPCAP = ${PCAPDIR}/libpcap.a ${EXTRA_LIBS} ++LIBPCAP = ${VCPKG_LIBPCAP_DIR}/lib/libpcap.a ${EXTRA_LIBS} + + # + # Search directories + # + PFRING_KERNEL=../../../kernel +-INCLUDE = -I${PFRING_KERNEL} -I${PFRINGDIR} -I${PCAPDIR} -Ithird-party `../../lib/pfring_config --include` ++INCLUDE = -I${PFRING_KERNEL} -I${PFRINGDIR} -I${VCPKG_LIBPCAP_DIR}/include -Ithird-party `../../lib/pfring_config --include` + + # + # C compiler and flags diff --git a/externals/vcpkg/ports/pfring/vcpkg.json b/externals/vcpkg/ports/pfring/vcpkg.json new file mode 100755 index 000000000..d0f6d9191 --- /dev/null +++ b/externals/vcpkg/ports/pfring/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "pfring", + "version-date": "2019-10-17", + "port-version": 4, + "description": "PF_RINGâ„¢ is a Linux kernel module and user-space framework that allows you to process packets at high-rates while providing you a consistent API for packet processing applications.", + "homepage": "https://github.com/ntop/PF_RING", + "supports": "!windows", + "dependencies": [ + "libpcap" + ] +} diff --git a/externals/vcpkg/ports/pfultz2-linq/portfile.cmake b/externals/vcpkg/ports/pfultz2-linq/portfile.cmake new file mode 100755 index 000000000..d3eeff7c4 --- /dev/null +++ b/externals/vcpkg/ports/pfultz2-linq/portfile.cmake @@ -0,0 +1,25 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO pfultz2/Linq + REF 7ff0a73fed52be5e11df3d79128ce7b11f430af2 + SHA512 6768e28bf17568436b4c3fed18f6b1edbe048b871ebee25580419b805498beb0800e473ecdc5acc0f9f89bec47d16fd3806018ce6395bdf14a8e2975cde9381f + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/linq TARGET_PATH share/linq) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/pfultz2-linq/vcpkg.json b/externals/vcpkg/ports/pfultz2-linq/vcpkg.json new file mode 100755 index 000000000..768c6118b --- /dev/null +++ b/externals/vcpkg/ports/pfultz2-linq/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "pfultz2-linq", + "version-string": "2019-05-14", + "port-version": 1, + "description": "Linq for list comprehension in C++", + "dependencies": [ + "boost-fusion", + "boost-iterator", + "boost-mpl", + "boost-optional", + "boost-preprocessor", + "boost-range", + "boost-static-assert", + "boost-type-traits", + "boost-unordered", + "boost-utility" + ] +} diff --git a/externals/vcpkg/ports/phnt/portfile.cmake b/externals/vcpkg/ports/phnt/portfile.cmake new file mode 100755 index 000000000..78f6a86c2 --- /dev/null +++ b/externals/vcpkg/ports/phnt/portfile.cmake @@ -0,0 +1,12 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO processhacker/phnt + REF 3f19efe9fd402378c7cd12fe1c0aacd154c8cd3c + SHA512 88f1f5ab1f2c8b3100e47f43cee7bdcb412ef9f688e3840ddc8a78d8b75b4baf714aadc27829e0ea95d97a22031019d25f9916d09bb63cea37304e9c9c08285a + HEAD_REF master +) + +file(GLOB HEADER_FILES ${SOURCE_PATH}/*.h) +file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) \ No newline at end of file diff --git a/externals/vcpkg/ports/phnt/vcpkg.json b/externals/vcpkg/ports/phnt/vcpkg.json new file mode 100755 index 000000000..cc10293aa --- /dev/null +++ b/externals/vcpkg/ports/phnt/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "phnt", + "version-date": "2020-12-21", + "description": "Windows Native API header files", + "homepage": "https://github.com/processhacker/phnt" +} diff --git a/externals/vcpkg/ports/physfs/001-fix-lzmasdk-arm64-windows.patch b/externals/vcpkg/ports/physfs/001-fix-lzmasdk-arm64-windows.patch new file mode 100755 index 000000000..0fad2b580 --- /dev/null +++ b/externals/vcpkg/ports/physfs/001-fix-lzmasdk-arm64-windows.patch @@ -0,0 +1,20 @@ +diff --git a/src/physfs_lzmasdk.h b/src/physfs_lzmasdk.h +--- a/src/physfs_lzmasdk.h ++++ b/src/physfs_lzmasdk.h +@@ -506,6 +506,7 @@ MY_CPU_LE_UNALIGN means that CPU is LITTLE ENDIAN and CPU supports unaligned mem + #endif + + #if defined(MY_CPU_AMD64) \ ++ || defined(_M_ARM64) \ + || defined(_M_IA64) \ + || defined(__AARCH64EL__) \ + || defined(__AARCH64EB__) +@@ -531,6 +532,8 @@ MY_CPU_LE_UNALIGN means that CPU is LITTLE ENDIAN and CPU supports unaligned mem + + #if defined(_WIN32) && defined(_M_ARM) + #define MY_CPU_ARM_LE ++#elif defined(_WIN64) && defined(_M_ARM64) ++#define MY_CPU_ARM_LE + #endif + + #if defined(_WIN32) && defined(_M_IA64) diff --git a/externals/vcpkg/ports/physfs/002-fix-posix-eintr.patch b/externals/vcpkg/ports/physfs/002-fix-posix-eintr.patch new file mode 100755 index 000000000..08d314af1 --- /dev/null +++ b/externals/vcpkg/ports/physfs/002-fix-posix-eintr.patch @@ -0,0 +1,73 @@ +diff --git a/src/physfs_platform_posix.c b/src/physfs_platform_posix.c +--- a/src/physfs_platform_posix.c ++++ b/src/physfs_platform_posix.c +@@ -6,8 +6,6 @@ + * This file written by Ryan C. Gordon. + */ + +-/* !!! FIXME: check for EINTR? */ +- + #define __PHYSICSFS_INTERNAL__ + #include "physfs_platforms.h" + +@@ -167,7 +165,9 @@ static void *doOpen(const char *filename, int mode) + /* O_APPEND doesn't actually behave as we'd like. */ + mode &= ~O_APPEND; + +- fd = open(filename, mode, S_IRUSR | S_IWUSR); ++ do { ++ fd = open(filename, mode, S_IRUSR | S_IWUSR); ++ } while ((fd < 0) && (errno == EINTR)); + BAIL_IF(fd < 0, errcodeFromErrno(), NULL); + + if (appending) +@@ -219,7 +219,9 @@ PHYSFS_sint64 __PHYSFS_platformRead(void *opaque, void *buffer, + if (!__PHYSFS_ui64FitsAddressSpace(len)) + BAIL(PHYSFS_ERR_INVALID_ARGUMENT, -1); + +- rc = read(fd, buffer, (size_t) len); ++ do { ++ rc = read(fd, buffer, (size_t) len); ++ } while ((rc == -1) && (errno == EINTR)); + BAIL_IF(rc == -1, errcodeFromErrno(), -1); + assert(rc >= 0); + assert(rc <= len); +@@ -236,7 +238,9 @@ PHYSFS_sint64 __PHYSFS_platformWrite(void *opaque, const void *buffer, + if (!__PHYSFS_ui64FitsAddressSpace(len)) + BAIL(PHYSFS_ERR_INVALID_ARGUMENT, -1); + +- rc = write(fd, (void *) buffer, (size_t) len); ++ do { ++ rc = write(fd, (void *) buffer, (size_t) len); ++ } while ((rc == -1) && (errno == EINTR)); + BAIL_IF(rc == -1, errcodeFromErrno(), rc); + assert(rc >= 0); + assert(rc <= len); +@@ -275,8 +279,13 @@ PHYSFS_sint64 __PHYSFS_platformFileLength(void *opaque) + int __PHYSFS_platformFlush(void *opaque) + { + const int fd = *((int *) opaque); +- if ((fcntl(fd, F_GETFL) & O_ACCMODE) != O_RDONLY) +- BAIL_IF(fsync(fd) == -1, errcodeFromErrno(), 0); ++ int rc = -1; ++ if ((fcntl(fd, F_GETFL) & O_ACCMODE) != O_RDONLY) { ++ do { ++ rc = fsync(fd); ++ } while ((rc == -1) && (errno == EINTR)); ++ BAIL_IF(rc == -1, errcodeFromErrno(), 0); ++ } + return 1; + } /* __PHYSFS_platformFlush */ + +@@ -284,7 +293,10 @@ int __PHYSFS_platformFlush(void *opaque) + void __PHYSFS_platformClose(void *opaque) + { + const int fd = *((int *) opaque); +- (void) close(fd); /* we don't check this. You should have used flush! */ ++ int rc = -1; ++ do { ++ rc = close(fd); /* we don't check this. You should have used flush! */ ++ } while ((rc == -1) && (errno == EINTR)); + allocator.Free(opaque); + } /* __PHYSFS_platformClose */ + diff --git a/externals/vcpkg/ports/physfs/003-fix-posix-cloexec.patch b/externals/vcpkg/ports/physfs/003-fix-posix-cloexec.patch new file mode 100755 index 000000000..6ff2114a5 --- /dev/null +++ b/externals/vcpkg/ports/physfs/003-fix-posix-cloexec.patch @@ -0,0 +1,34 @@ +diff --git a/src/physfs_platform_posix.c b/src/physfs_platform_posix.c +--- a/src/physfs_platform_posix.c ++++ b/src/physfs_platform_posix.c +@@ -160,16 +160,30 @@ static void *doOpen(const char *filename, int mode) + const int appending = (mode & O_APPEND); + int fd; + int *retval; ++ int flags; ++ flags = -1; + errno = 0; + + /* O_APPEND doesn't actually behave as we'd like. */ + mode &= ~O_APPEND; ++ ++#ifdef O_CLOEXEC ++ /* Add O_CLOEXEC if defined */ ++ mode |= O_CLOEXEC; ++#endif + + do { + fd = open(filename, mode, S_IRUSR | S_IWUSR); + } while ((fd < 0) && (errno == EINTR)); + BAIL_IF(fd < 0, errcodeFromErrno(), NULL); + ++#if !defined(O_CLOEXEC) && defined(FD_CLOEXEC) ++ flags = fcntl(fd, F_GETFD); ++ if (flags != -1) { ++ fcntl(fd, F_SETFD, flags | FD_CLOEXEC); ++ } ++#endif ++ + if (appending) + { + if (lseek(fd, 0, SEEK_END) < 0) diff --git a/externals/vcpkg/ports/physfs/portfile.cmake b/externals/vcpkg/ports/physfs/portfile.cmake new file mode 100755 index 000000000..b47465de2 --- /dev/null +++ b/externals/vcpkg/ports/physfs/portfile.cmake @@ -0,0 +1,43 @@ +set(PHYSFS_VERSION 3.0.2) + +vcpkg_download_distfile(ARCHIVE + URLS "https://icculus.org/physfs/downloads/physfs-${PHYSFS_VERSION}.tar.bz2" + "https://hg.icculus.org/icculus/physfs/archive/release-${PHYSFS_VERSION}.tar.bz2" + FILENAME "physfs-${PHYSFS_VERSION}.tar.bz2" + SHA512 4024b6c3348e0b6fc1036aac330192112dfe17de3e3d14773be9f06e9a062df5a1006869f21162b4e0b584989f463788a35e64186b1913225c073fea62754472 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF ${PHYSFS_VERSION} + PATCHES + "001-fix-lzmasdk-arm64-windows.patch" + "002-fix-posix-eintr.patch" # Remove this patch in the next update + "003-fix-posix-cloexec.patch" # Remove this patch in the next update +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PHYSFS_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PHYSFS_SHARED) + +if(VCPKG_TARGET_IS_UWP) + set(configure_opts WINDOWS_USE_MSBUILD) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + ${configure_opts} + OPTIONS + -DPHYSFS_BUILD_STATIC=${PHYSFS_STATIC} + -DPHYSFS_BUILD_SHARED=${PHYSFS_SHARED} + -DPHYSFS_BUILD_TEST=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/physfs/vcpkg.json b/externals/vcpkg/ports/physfs/vcpkg.json new file mode 100755 index 000000000..649fa9384 --- /dev/null +++ b/externals/vcpkg/ports/physfs/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "physfs", + "version-semver": "3.0.2", + "port-version": 7, + "description": "a library to provide abstract access to various archives", + "homepage": "https://icculus.org/physfs/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/physx/fix-compiler-flag.patch b/externals/vcpkg/ports/physx/fix-compiler-flag.patch new file mode 100755 index 000000000..cfb253e7e --- /dev/null +++ b/externals/vcpkg/ports/physx/fix-compiler-flag.patch @@ -0,0 +1,58 @@ +diff --git a/physx/compiler/public/CMakeLists.txt b/physx/compiler/public/CMakeLists.txt +index 77776ca7..bd7b496d 100644 +--- a/physx/compiler/public/CMakeLists.txt ++++ b/physx/compiler/public/CMakeLists.txt +@@ -33,6 +33,8 @@ ENDIF() + + project(PhysXSDK C CXX) + ++SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS}" CACHE INTERNAL "PhysX Debug CXX Flags") ++ + OPTION(PX_BUILDSNIPPETS "Generate the snippets" OFF) + OPTION(PX_BUILDPUBLICSAMPLES "Generate the samples" OFF) + OPTION(PX_CMAKE_SUPPRESS_REGENERATION "Disable zero_check projects" OFF) +diff --git a/physx/source/compiler/cmake/uwp/CMakeLists.txt b/physx/source/compiler/cmake/uwp/CMakeLists.txt +index 20dcb6ae..c7e03c3e 100644 +--- a/physx/source/compiler/cmake/uwp/CMakeLists.txt ++++ b/physx/source/compiler/cmake/uwp/CMakeLists.txt +@@ -39,11 +39,13 @@ ELSE() + ENDIF() + + # Cache the CXX flags so the other CMakeLists.txt can use them if needed +-SET(PHYSX_CXX_FLAGS "/Wall /d2Zi+ /MP /WX /W4 /GF /GS- /GR- /Gd ${PHYSX_FP_MODE} ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX") ++SET(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS} ${PHYSX_FP_MODE} ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX") ++if(FALSE) + SET(PHYSX_CXX_FLAGS_DEBUG "/Od ${WINCRT_DEBUG} /Zi" CACHE INTERNAL "PhysX Debug CXX Flags") + SET(PHYSX_CXX_FLAGS_CHECKED "/O2 ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Checked CXX Flags") + SET(PHYSX_CXX_FLAGS_PROFILE "/O2 ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Profile CXX Flags") + SET(PHYSX_CXX_FLAGS_RELEASE "/O2 ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Release CXX Flags") ++endif() + + # These flags are local to the directory the CMakeLists.txt is in, so don't get carried over to OTHER CMakeLists.txt (thus the CACHE variables above) + SET(CMAKE_CXX_FLAGS ${PHYSX_CXX_FLAGS}) +diff --git a/physx/source/compiler/cmake/windows/CMakeLists.txt b/physx/source/compiler/cmake/windows/CMakeLists.txt +index a1ab3596..dbd20fb0 100644 +--- a/physx/source/compiler/cmake/windows/CMakeLists.txt ++++ b/physx/source/compiler/cmake/windows/CMakeLists.txt +@@ -41,17 +41,19 @@ ELSE() + SET(PHYSX_FP_MODE "/fp:fast") + ENDIF() + IF(CMAKE_CL_64) +- SET(PHYSX_CXX_FLAGS "/d2Zi+ /MP /WX /W4 /GF /GS- /GR- /Gd ${PHYSX_FP_MODE} /Oy ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX") ++ SET(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS} ${PHYSX_FP_MODE} ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX") + ELSE() +- SET(PHYSX_CXX_FLAGS "/arch:SSE2 /d2Zi+ /MP /WX /W4 /GF /GS- /GR- /Gd ${PHYSX_FP_MODE} /Oy ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX") ++ SET(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS} /arch:SSE2 ${PHYSX_FP_MODE} ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX") + ENDIF() + ++if(FALSE) + SET(PHYSX_CXX_FLAGS_DEBUG "/Od ${WINCRT_DEBUG} /RTCu /Zi" CACHE INTERNAL "PhysX Debug CXX Flags") + # PT: changed /Ox to /O2 because "the /Ox compiler option enables only a subset of the speed optimization options enabled by /O2." + # See https://docs.microsoft.com/en-us/cpp/build/reference/ox-full-optimization?view=vs-2019 + SET(PHYSX_CXX_FLAGS_CHECKED "/O2 ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Checked CXX Flags") + SET(PHYSX_CXX_FLAGS_PROFILE "/O2 ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Profile CXX Flags") + SET(PHYSX_CXX_FLAGS_RELEASE "/O2 ${WINCRT_NDEBUG} /Zi" CACHE INTERNAL "PhysX Release CXX Flags") ++endif() + + # cache lib type defs + IF(PX_GENERATE_STATIC_LIBRARIES) diff --git a/externals/vcpkg/ports/physx/portfile.cmake b/externals/vcpkg/ports/physx/portfile.cmake new file mode 100755 index 000000000..090f74419 --- /dev/null +++ b/externals/vcpkg/ports/physx/portfile.cmake @@ -0,0 +1,157 @@ +vcpkg_download_distfile( + patch1 + URLS "https://github.com/NVIDIAGameWorks/PhysX/commit/ada4fccf04e5a5832af1353d6d1f91de691aa47d.patch" + FILENAME "physx-PR569-ada4fccf.patch" + SHA512 ec2fc2fce0b5aab4d42b77f21373bf067f129543e672516477513419241c56b99f2d663b992cb29d296933440e7e7cc31a57198f6fcc78d6eac26b7706c1e937 +) + +vcpkg_download_distfile( + patch2 + URLS "https://github.com/NVIDIAGameWorks/PhysX/commit/d590c88e3cbf0fb682726abf7d7c16417855084f.patch" + FILENAME "physx-PR569-d590c88e.patch" + SHA512 4eb7630db1cb10b2372220c3706dfe255075f466c6b2b12654c9fbc3b17c4df69d7b91e6f0d798c92a4cb8806e1c34b66bb52b46d9358d643ca62ec0de321fd2 +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO NVIDIAGameWorks/PhysX + REF 93c6dd21b545605185f2febc8eeacebe49a99479 + SHA512 c9f50255ca9e0f1ebdb9926992315a62b77e2eea3addd4e65217283490714e71e24f2f687717dd8eb155078a1a6b25c9fadc123ce8bc4c5615f7ac66cd6b11aa + HEAD_REF master + PATCHES + fix-compiler-flag.patch + "${patch1}" + "${patch2}" + remove-werror.patch +) + +if(NOT DEFINED RELEASE_CONFIGURATION) + set(RELEASE_CONFIGURATION "release") +endif() +set(DEBUG_CONFIGURATION "debug") + +set(OPTIONS + "-DPHYSX_ROOT_DIR=${SOURCE_PATH}/physx" + "-DPXSHARED_PATH=${SOURCE_PATH}/pxshared" + "-DPXSHARED_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}" + "-DCMAKEMODULES_PATH=${SOURCE_PATH}/externals/cmakemodules" + "-DCMAKEMODULES_NAME=CMakeModules" + "-DCMAKE_MODULES_VERSION=1.27" + "-DPX_BUILDSNIPPETS=OFF" + "-DPX_BUILDPUBLICSAMPLES=OFF" + "-DPX_FLOAT_POINT_PRECISE_MATH=OFF" + "-DPX_COPY_EXTERNAL_DLL=OFF" + "-DGPU_DLL_COPIED=ON" +) + +set(OPTIONS_RELEASE + "-DPX_OUTPUT_BIN_DIR=${CURRENT_PACKAGES_DIR}" + "-DPX_OUTPUT_LIB_DIR=${CURRENT_PACKAGES_DIR}" +) +set(OPTIONS_DEBUG + "-DPX_OUTPUT_BIN_DIR=${CURRENT_PACKAGES_DIR}/debug" + "-DPX_OUTPUT_LIB_DIR=${CURRENT_PACKAGES_DIR}/debug" + "-DNV_USE_DEBUG_WINCRT=ON" +) + +if(VCPKG_TARGET_IS_UWP) + list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=uwp") + set(configure_options WINDOWS_USE_MSBUILD) +elseif(VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=windows") +elseif(VCPKG_TARGET_IS_OSX) + list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=mac") +elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_FREEBSD) + list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=linux") +elseif(VCPKG_TARGET_IS_ANDROID) + list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=android") +else() + message(FATAL_ERROR "Unhandled or unsupported target platform.") +endif() + +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) + list(APPEND OPTIONS "-DNV_FORCE_64BIT_SUFFIX=ON" "-DNV_FORCE_32BIT_SUFFIX=OFF") +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + list(APPEND OPTIONS "-DPX_GENERATE_STATIC_LIBRARIES=OFF") +else() + list(APPEND OPTIONS "-DPX_GENERATE_STATIC_LIBRARIES=ON") +endif() + +if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + list(APPEND OPTIONS "-DNV_USE_STATIC_WINCRT=OFF") +else() + list(APPEND OPTIONS "-DNV_USE_STATIC_WINCRT=ON") +endif() + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + list(APPEND OPTIONS "-DPX_OUTPUT_ARCH=arm") +else() + list(APPEND OPTIONS "-DPX_OUTPUT_ARCH=x86") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/physx/compiler/public" + ${configure_options} + DISABLE_PARALLEL_CONFIGURE + OPTIONS ${OPTIONS} + OPTIONS_DEBUG ${OPTIONS_DEBUG} + OPTIONS_RELEASE ${OPTIONS_RELEASE} +) +vcpkg_cmake_install() + +# NVIDIA Gameworks release structure is generally something like //[artifact] +# It would be nice to patch this out, but that directory structure is hardcoded over many cmake files. +# So, we have this helpful helper to copy the bins and libs out. +function(fixup_physx_artifacts) + macro(_fixup _IN_DIRECTORY _OUT_DIRECTORY) + foreach(_SUFFIX IN LISTS _fpa_SUFFIXES) + file(GLOB_RECURSE _ARTIFACTS + LIST_DIRECTORIES false + "${CURRENT_PACKAGES_DIR}/${_IN_DIRECTORY}/*${_SUFFIX}" + ) + if(_ARTIFACTS) + file(COPY ${_ARTIFACTS} DESTINATION "${CURRENT_PACKAGES_DIR}/${_OUT_DIRECTORY}") + endif() + endforeach() + endmacro() + + cmake_parse_arguments(_fpa "" "DIRECTORY" "SUFFIXES" ${ARGN}) + _fixup("bin" ${_fpa_DIRECTORY}) + _fixup("debug/bin" "debug/${_fpa_DIRECTORY}") +endfunction() + +fixup_physx_artifacts( + DIRECTORY "lib" + SUFFIXES ${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} ${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX} +) +fixup_physx_artifacts( + DIRECTORY "bin" + SUFFIXES ${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX} ".pdb" +) + +# Remove compiler directory and descendents. +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin/" + "${CURRENT_PACKAGES_DIR}/debug/bin/" + ) +else() + file(GLOB PHYSX_ARTIFACTS LIST_DIRECTORIES true + "${CURRENT_PACKAGES_DIR}/bin/*" + "${CURRENT_PACKAGES_DIR}/debug/bin/*" + ) + foreach(_ARTIFACT IN LISTS PHYSX_ARTIFACTS) + if(IS_DIRECTORY ${_ARTIFACT}) + file(REMOVE_RECURSE ${_ARTIFACT}) + endif() + endforeach() +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/source" + "${CURRENT_PACKAGES_DIR}/source" +) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/physx/remove-werror.patch b/externals/vcpkg/ports/physx/remove-werror.patch new file mode 100755 index 000000000..86f3a1d71 --- /dev/null +++ b/externals/vcpkg/ports/physx/remove-werror.patch @@ -0,0 +1,52 @@ +diff --git a/physx/source/compiler/cmake/android/CMakeLists.txt b/physx/source/compiler/cmake/android/CMakeLists.txt +index 06e0d98..2e5454d 100644 +--- a/physx/source/compiler/cmake/android/CMakeLists.txt ++++ b/physx/source/compiler/cmake/android/CMakeLists.txt +@@ -52,6 +52,8 @@ SET(PHYSX_CXX_FLAGS_RELEASE "-O3 -g" CACHE INTERNAL "PhysX Release CXX Flags") + + + # These flags are local to the directory the CMakeLists.txt is in ++string(REPLACE " -Werror " " " PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}") ++set(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}" CACHE INTERNAL "PhysX CXX") + SET(CMAKE_CXX_FLAGS ${PHYSX_CXX_FLAGS}) + + SET(CMAKE_CXX_FLAGS_DEBUG ${PHYSX_CXX_FLAGS_DEBUG}) +diff --git a/physx/source/compiler/cmake/ios/CMakeLists.txt b/physx/source/compiler/cmake/ios/CMakeLists.txt +index 5605e9a..b40500b 100644 +--- a/physx/source/compiler/cmake/ios/CMakeLists.txt ++++ b/physx/source/compiler/cmake/ios/CMakeLists.txt +@@ -39,6 +39,8 @@ SET(PHYSX_CXX_FLAGS_PROFILE "-O3 -g" CACHE INTERNAL "PhysX Profile CXX Flags") + SET(PHYSX_CXX_FLAGS_RELEASE "-O3 -g" CACHE INTERNAL "PhysX Release CXX Flags") + + # These flags are local to the directory the CMakeLists.txt is in ++string(REPLACE " -Werror " " " PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}") ++set(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}" CACHE INTERNAL "PhysX CXX") + SET(CMAKE_CXX_FLAGS ${PHYSX_CXX_FLAGS}) + + SET(CMAKE_CXX_FLAGS_DEBUG ${PHYSX_CXX_FLAGS_DEBUG}) +diff --git a/physx/source/compiler/cmake/linux/CMakeLists.txt b/physx/source/compiler/cmake/linux/CMakeLists.txt +index aba5336..fd5f813 100644 +--- a/physx/source/compiler/cmake/linux/CMakeLists.txt ++++ b/physx/source/compiler/cmake/linux/CMakeLists.txt +@@ -45,6 +45,8 @@ SET(PHYSX_CXX_FLAGS_PROFILE "-O3" CACHE INTERNAL "PhysX Profile CXX Flags") + SET(PHYSX_CXX_FLAGS_RELEASE "-O3" CACHE INTERNAL "PhysX Release CXX Flags") + + # These flags are local to the directory the CMakeLists.txt is in, so don't get carried over to OTHER CMakeLists.txt (thus the CACHE variables above) ++string(REPLACE " -Werror " " " PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}") ++set(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}" CACHE INTERNAL "PhysX CXX") + SET(CMAKE_CXX_FLAGS ${PHYSX_CXX_FLAGS}) + + SET(CMAKE_CXX_FLAGS_DEBUG ${PHYSX_CXX_FLAGS_DEBUG}) +diff --git a/physx/source/compiler/cmake/mac/CMakeLists.txt b/physx/source/compiler/cmake/mac/CMakeLists.txt +index bfd1357..cffb090 100644 +--- a/physx/source/compiler/cmake/mac/CMakeLists.txt ++++ b/physx/source/compiler/cmake/mac/CMakeLists.txt +@@ -49,6 +49,8 @@ SET(PHYSX_CXX_FLAGS_PROFILE "-O3 -g" CACHE INTERNAL "PhysX Profile CXX Flags") + SET(PHYSX_CXX_FLAGS_RELEASE "-O3 -g" CACHE INTERNAL "PhysX Release CXX Flags") + + # These flags are local to the directory the CMakeLists.txt is in ++string(REPLACE " -Werror " " " PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}") ++set(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}" CACHE INTERNAL "PhysX CXX") + SET(CMAKE_CXX_FLAGS ${PHYSX_CXX_FLAGS}) + + SET(CMAKE_CXX_FLAGS_DEBUG ${PHYSX_CXX_FLAGS_DEBUG}) diff --git a/externals/vcpkg/ports/physx/vcpkg.json b/externals/vcpkg/ports/physx/vcpkg.json new file mode 100755 index 000000000..1a3adee24 --- /dev/null +++ b/externals/vcpkg/ports/physx/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "physx", + "version": "4.1.2", + "port-version": 4, + "description": "The NVIDIA PhysX SDK is a scalable multi-platform physics solution supporting a wide range of devices, from smartphones to high-end multicore CPUs and GPUs", + "homepage": "https://github.com/NVIDIAGameWorks/PhysX", + "license": null, + "supports": "!mingw & !(windows & arm)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/picojson/portfile.cmake b/externals/vcpkg/ports/picojson/portfile.cmake new file mode 100755 index 000000000..53bd084a0 --- /dev/null +++ b/externals/vcpkg/ports/picojson/portfile.cmake @@ -0,0 +1,13 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kazuho/picojson + REF v1.3.0 + SHA512 76d5a6b3b9e1151198eee707faffcbbba28a2842daccf03d99a5d02ae017f9517ef3ac9da4acc74a4fc1357feaf19e14a15c34698a1d4cb65acb6d23b566b284 + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/picojson.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/picojson/vcpkg.json b/externals/vcpkg/ports/picojson/vcpkg.json new file mode 100755 index 000000000..540a2ad3d --- /dev/null +++ b/externals/vcpkg/ports/picojson/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "picojson", + "version-string": "1.3.0", + "port-version": 2, + "description": "A header-file-only, JSON parser serializer in C++.", + "homepage": "https://github.com/kazuho/picojson" +} diff --git a/externals/vcpkg/ports/picosha2/portfile.cmake b/externals/vcpkg/ports/picosha2/portfile.cmake new file mode 100755 index 000000000..80db0c35f --- /dev/null +++ b/externals/vcpkg/ports/picosha2/portfile.cmake @@ -0,0 +1,10 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO okdshin/PicoSHA2 + REF b699e6c900be6e00152db5a3d123c1db42ea13d0 + SHA512 5972dfe7675c560a0c58491e72938e8e5ea46eabb2e2f564086001eda21b237035aa0deef94bb36a21154a4b5cbc160b9b0f6b5988f6580d693ad74cfbc53bb5 + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/picosha2.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/picosha2 RENAME copyright) diff --git a/externals/vcpkg/ports/picosha2/vcpkg.json b/externals/vcpkg/ports/picosha2/vcpkg.json new file mode 100755 index 000000000..45091e449 --- /dev/null +++ b/externals/vcpkg/ports/picosha2/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "picosha2", + "version-string": "2018-07-30", + "port-version": 1, + "description": "PicoSHA2 - a C++ SHA256 hash generator", + "homepage": "https://github.com/okdshin/PicoSHA2" +} diff --git a/externals/vcpkg/ports/piex/CMakeLists.txt b/externals/vcpkg/ports/piex/CMakeLists.txt new file mode 100755 index 000000000..7b782a66d --- /dev/null +++ b/externals/vcpkg/ports/piex/CMakeLists.txt @@ -0,0 +1,45 @@ +cmake_minimum_required(VERSION 3.8.0) +project(piex) + +if(MSVC) + add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS) +endif() + +include_directories(".") + +add_library(binary_parse + src/binary_parse/cached_paged_byte_array.cc + src/binary_parse/range_checked_byte_ptr.cc +) + +add_library(image_type_recognition + src/image_type_recognition/image_type_recognition_lite.cc +) + +target_link_libraries(image_type_recognition binary_parse) +target_compile_features(image_type_recognition PUBLIC cxx_std_11) + +add_library(tiff_directory + src/tiff_directory/tiff_directory.cc +) + +target_link_libraries(tiff_directory binary_parse) + +add_library(piex + src/piex.cc + src/tiff_parser.cc +) + +target_link_libraries(piex tiff_directory image_type_recognition binary_parse) +target_compile_features(piex PUBLIC cxx_std_11) + +install( + TARGETS piex + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES src/piex.h src/piex_types.h DESTINATION include/src) +endif() diff --git a/externals/vcpkg/ports/piex/portfile.cmake b/externals/vcpkg/ports/piex/portfile.cmake new file mode 100755 index 000000000..44ff3fc7d --- /dev/null +++ b/externals/vcpkg/ports/piex/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/piex + REF 256bd102be288c19b4165e0ecc7097a18c004e92 + SHA512 ae948588a99d586593788c995c3d65a488faaf99b2ab6c51ec39df7e11a42c89454dd505117e90b1f152f6abfc2e3e11f61b0af97e42ecdff0d978934e20f582 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/piex" RENAME copyright) diff --git a/externals/vcpkg/ports/piex/vcpkg.json b/externals/vcpkg/ports/piex/vcpkg.json new file mode 100755 index 000000000..497b60aaa --- /dev/null +++ b/externals/vcpkg/ports/piex/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "piex", + "version-date": "2019-07-11", + "port-version": 2, + "description": "The Preview Image Extractor (PIEX) is designed to find and extract the largest", + "homepage": "https://github.com/google/piex", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/pipewire/portfile.cmake b/externals/vcpkg/ports/pipewire/portfile.cmake new file mode 100755 index 000000000..11214f583 --- /dev/null +++ b/externals/vcpkg/ports/pipewire/portfile.cmake @@ -0,0 +1,83 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/ + OUT_SOURCE_PATH SOURCE_PATH + REPO pipewire/pipewire + REF 0.3.52 + SHA512 30e9cf74c92babafe386f02a03bb5c41a8ee5591a02f15845cca1ee44f091ce68eb14d48943d43b680cb525026a19e0290997670f9a82156eaa72e974fe6d01a + HEAD_REF master # branch name +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dalsa=disabled + -Daudioconvert=disabled + -Daudiomixer=disabled + -Daudiotestsrc=disabled + -Davahi=disabled + -Dbluez5-backend-hfp-native=disabled + -Dbluez5-backend-hsp-native=disabled + -Dbluez5-backend-hsphfpd=disabled + -Dbluez5-backend-ofono=disabled + -Dbluez5-codec-aac=disabled + -Dbluez5-codec-aptx=disabled + -Dbluez5-codec-lc3plus=disabled + -Dbluez5-codec-ldac=disabled + -Dbluez5=disabled + -Dcontrol=disabled + -Ddbus=disabled + -Ddocs=disabled + -Decho-cancel-webrtc=disabled + -Devl=disabled + -Dexamples=disabled + -Dffmpeg=disabled + -Dgstreamer-device-provider=disabled + -Dgstreamer=disabled + -Dinstalled_tests=disabled + -Djack-devel=false + -Djack=disabled + -Dlegacy-rtkit=false + -Dlibcamera=disabled + -Dlibcanberra=disabled + -Dlibpulse=disabled + -Dlibusb=disabled + -Dlv2=disabled + -Dman=disabled + -Dpipewire-alsa=disabled + -Dpipewire-jack=disabled + -Dpipewire-v4l2=disabled + -Dpw-cat=disabled + -Draop=disabled + -Droc=disabled + -Dsdl2=disabled + -Dsndfile=disabled + -Dspa-plugins=enabled # This one must be enabled or the resulting build won't be able to connect to pipewire daemon + -Dsupport=enabled # This one must be enabled or the resulting build won't be able to connect to pipewire daemon + -Dsystemd-system-service=disabled + -Dsystemd-system-unit-dir=disabled + -Dsystemd-user-service=disabled + -Dsystemd-user-unit-dir=disabled + -Dsystemd=disabled + -Dtest=disabled + -Dtests=disabled + -Dudev=disabled + -Dudevrulesdir=disabled + -Dv4l2=disabled + -Dvideoconvert=disabled + -Dvideotestsrc=disabled + -Dvolume=disabled + -Dvulkan=disabled + -Dx11-xfixes=disabled + -Dx11=disabled + -Dsession-managers=[] +) +vcpkg_install_meson() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() diff --git a/externals/vcpkg/ports/pipewire/vcpkg.json b/externals/vcpkg/ports/pipewire/vcpkg.json new file mode 100755 index 000000000..a45c9c806 --- /dev/null +++ b/externals/vcpkg/ports/pipewire/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "pipewire", + "version": "0.3.52", + "description": "Low-latency audio/video router and processor. This port only builds the client library, not the server.", + "homepage": "https://pipewire.org", + "license": "MIT", + "supports": "linux", + "dependencies": [ + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/pistache/portfile.cmake b/externals/vcpkg/ports/pistache/portfile.cmake new file mode 100755 index 000000000..089814ed3 --- /dev/null +++ b/externals/vcpkg/ports/pistache/portfile.cmake @@ -0,0 +1,21 @@ +if(NOT VCPKG_TARGET_IS_LINUX) + message(FATAL_ERROR "${PORT} currently only supports Linux platform.") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO pistacheio/pistache + REF 9dc080b9ebbe6fc1726b45e9db1550305938313e #2021-03-31 + SHA512 b55c395fb98af85317590ed2502564af5e92e30a35618132568c6ab589a6d0971570ad20ddbd1f49d9dd8cf54692866c69cfc1350c6fdccf9efb039aacf153b4 + HEAD_REF master +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_install_meson() + +vcpkg_fixup_pkgconfig() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/pistache/vcpkg.json b/externals/vcpkg/ports/pistache/vcpkg.json new file mode 100755 index 000000000..fb464a5a1 --- /dev/null +++ b/externals/vcpkg/ports/pistache/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "pistache", + "version-date": "2021-03-31", + "port-version": 3, + "description": "Pistache is a modern and elegant HTTP and REST framework for C++. It is entirely written in pure-C++11 and provides a clear and pleasant API", + "homepage": "https://github.com/oktal/pistache", + "supports": "linux", + "dependencies": [ + "rapidjson", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/pixel/001-prevent-examples.patch b/externals/vcpkg/ports/pixel/001-prevent-examples.patch new file mode 100755 index 000000000..ec958f867 --- /dev/null +++ b/externals/vcpkg/ports/pixel/001-prevent-examples.patch @@ -0,0 +1,38 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b910231..71f7ddf 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,6 +34,8 @@ else() + target_link_libraries(pixel PUBLIC SDL2::SDL2) + endif() + ++option(BUILD_EXAMPLES "Build examples" OFF) ++if(BUILD_EXAMPLES) + add_executable(image_swap examples/image_swap/src/image_swap.cpp) + target_link_libraries(image_swap PRIVATE pixel) + add_executable(randomdots examples/randomdots/src/randomdots.cpp) +@@ -50,7 +52,11 @@ add_executable(simple examples/simple/src/simple.cpp) + target_link_libraries(simple PRIVATE pixel) + add_executable(starfield examples/starfield/src/starfield.cpp) + target_link_libraries(starfield PRIVATE pixel) ++endif() + ++if(MSVC) ++ add_compile_definitions(_CRT_SECURE_NO_WARNINGS) ++endif() + + # Install Section + include(GNUInstallDirs) +@@ -87,12 +93,6 @@ install( + DESTINATION ${CMAKE_INSTALL_PREFIX} + ) + +-install( +- FILES +- ${PROJECT_SOURCE_DIR}/LICENSE +- DESTINATION ${CMAKE_INSTALL_DATADIR}/pixel/copyright +- ) +- + install( + FILES + ${PROJECT_BINARY_DIR}/pixelConfig.cmake diff --git a/externals/vcpkg/ports/pixel/portfile.cmake b/externals/vcpkg/ports/pixel/portfile.cmake new file mode 100755 index 000000000..36c5424f4 --- /dev/null +++ b/externals/vcpkg/ports/pixel/portfile.cmake @@ -0,0 +1,29 @@ +if(VCPKG_TARGET_IS_LINUX) + message(WARNING "${PORT} currently requires libglu1-mesa from the system package manager: + This can be installed on Ubuntu systems via sudo apt install libglu1-mesa-dev") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO dascandy/pixel + REF c4411f67746fdd811aa5f8c102ac340e9eaf4ec5 + SHA512 e4f704c076bb61220349524b0b1033a92c44128bb81e79dbd32ea2d1aa9d4abb0d6daab3617f69b59d1c1e50d750767153174fea015d8718804612f4d9f68ff6 + HEAD_REF master + PATCHES + 001-prevent-examples.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/pixel/vcpkg.json b/externals/vcpkg/ports/pixel/vcpkg.json new file mode 100755 index 000000000..cc01890b4 --- /dev/null +++ b/externals/vcpkg/ports/pixel/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "pixel", + "version-date": "2022-03-15", + "port-version": 1, + "description": "Simple 2D Graphics based on standard and portable OpenGL.", + "homepage": "https://github.com/dascandy/pixel", + "license": "Apache-2.0", + "dependencies": [ + "glew", + "opengl", + { + "name": "sdl2", + "default-features": false, + "features": [ + "x11" + ], + "platform": "linux" + }, + { + "name": "sdl2", + "platform": "!linux" + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/pixman/no-host-cpu-checks.patch b/externals/vcpkg/ports/pixman/no-host-cpu-checks.patch new file mode 100755 index 000000000..f70c54a01 --- /dev/null +++ b/externals/vcpkg/ports/pixman/no-host-cpu-checks.patch @@ -0,0 +1,108 @@ +diff --git a/meson.build b/meson.build +index 1cec227..1b07ca8 100644 +--- a/meson.build ++++ b/meson.build +@@ -95,44 +95,7 @@ else + mmx_flags = ['-mmmx', '-Winline'] + endif + if not use_mmx.disabled() +- if host_machine.cpu_family() == 'x86_64' or cc.get_id() == 'msvc' +- have_mmx = true +- elif host_machine.cpu_family() == 'x86' and cc.compiles(''' +- #include +- #include +- +- /* Check support for block expressions */ +- #define _mm_shuffle_pi16(A, N) \ +- ({ \ +- __m64 ret; \ +- \ +- /* Some versions of clang will choke on K */ \ +- asm ("pshufw %2, %1, %0\n\t" \ +- : "=y" (ret) \ +- : "y" (A), "K" ((const int8_t)N) \ +- ); \ +- \ +- ret; \ +- }) +- +- int main () { +- __m64 v = _mm_cvtsi32_si64 (1); +- __m64 w; +- +- w = _mm_shuffle_pi16(v, 5); +- +- /* Some versions of clang will choke on this */ +- asm ("pmulhuw %1, %0\n\t" +- : "+y" (w) +- : "y" (v) +- ); +- +- return _mm_cvtsi64_si32 (v); +- }''', +- args : mmx_flags, +- name : 'MMX Intrinsic Support') +- have_mmx = true +- endif ++ have_mmx = true + endif + + if have_mmx +@@ -154,29 +117,7 @@ elif cc.get_id() != 'msvc' + sse2_flags = ['-msse2', '-Winline'] + endif + if not use_sse2.disabled() +- if host_machine.cpu_family() == 'x86' +- if cc.compiles(''' +- #if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2)) +- # if !defined(__amd64__) && !defined(__x86_64__) +- # error "Need GCC >= 4.2 for SSE2 intrinsics on x86" +- # endif +- #endif +- #include +- #include +- #include +- int param; +- int main () { +- __m128i a = _mm_set1_epi32 (param), b = _mm_set1_epi32 (param + 1), c; +- c = _mm_xor_si128 (a, b); +- return _mm_cvtsi128_si32(c); +- }''', +- args : sse2_flags, +- name : 'SSE2 Intrinsic Support') +- have_sse2 = true +- endif +- elif host_machine.cpu_family() == 'x86_64' +- have_sse2 = true +- endif ++ have_sse2 = true + endif + + if have_sse2 +@@ -192,24 +133,8 @@ if cc.get_id() != 'msvc' + ssse3_flags = ['-mssse3', '-Winline'] + endif + +-# x64 pre-2010 MSVC compilers crashes when building the ssse3 code +-if not use_ssse3.disabled() and not (cc.get_id() == 'msvc' and cc.version().version_compare('<16') and host_machine.cpu_family() == 'x86_64') +- if host_machine.cpu_family().startswith('x86') +- if cc.compiles(''' +- #include +- #include +- #include +- int param; +- int main () { +- __m128i a = _mm_set1_epi32 (param), b = _mm_set1_epi32 (param + 1), c; +- c = _mm_xor_si128 (a, b); +- return _mm_cvtsi128_si32(c); +- }''', +- args : ssse3_flags, +- name : 'SSSE3 Intrinsic Support') +- have_ssse3 = true +- endif +- endif ++if use_ssse3.enabled() ++ have_ssse3 = true + endif + + if have_ssse3 diff --git a/externals/vcpkg/ports/pixman/portfile.cmake b/externals/vcpkg/ports/pixman/portfile.cmake new file mode 100755 index 000000000..fa6c8687a --- /dev/null +++ b/externals/vcpkg/ports/pixman/portfile.cmake @@ -0,0 +1,59 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) # Meson is not able to automatically export symbols for DLLs +endif() + +if(VCPKG_TARGET_IS_UWP) + list(APPEND OPTIONS + -Dmmx=disabled + -Dsse2=disabled + -Dssse3=disabled) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(VCPKG_CXX_FLAGS "/arch:SSE2 ${VCPKG_CXX_FLAGS}") + set(VCPKG_C_FLAGS "/arch:SSE2 ${VCPKG_C_FLAGS}") + list(APPEND OPTIONS + -Dmmx=enabled + -Dsse2=enabled + -Dssse3=enabled) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + #x64 in general has all those intrinsics. (except for UWP for some reason) + list(APPEND OPTIONS + -Dmmx=enabled + -Dsse2=enabled + -Dssse3=enabled) +elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "arm") + list(APPEND OPTIONS + #-Darm-simd=enabled does not work with arm64-windows + -Dmmx=disabled + -Dsse2=disabled + -Dssse3=disabled + ) +endif() + +set(PIXMAN_VERSION 0.40.0) +vcpkg_download_distfile(ARCHIVE + URLS "https://www.cairographics.org/releases/pixman-${PIXMAN_VERSION}.tar.gz" + FILENAME "pixman-${PIXMAN_VERSION}.tar.gz" + SHA512 063776e132f5d59a6d3f94497da41d6fc1c7dca0d269149c78247f0e0d7f520a25208d908cf5e421d1564889a91da44267b12d61c0bd7934cd54261729a7de5f +) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${PIXMAN_VERSION} + PATCHES + remove_test_demos.patch + no-host-cpu-checks.patch +) +# Meson install wrongly pkgconfig file! +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${OPTIONS} + -Dlibpng=enabled +) +vcpkg_install_meson() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/pixman/remove_test_demos.patch b/externals/vcpkg/ports/pixman/remove_test_demos.patch new file mode 100755 index 000000000..18efbdc2f --- /dev/null +++ b/externals/vcpkg/ports/pixman/remove_test_demos.patch @@ -0,0 +1,15 @@ +diff --git a/meson.build b/meson.build +index 1cec22728..fa6199ed0 100644 +--- a/meson.build ++++ b/meson.build +@@ -528,8 +528,8 @@ version_conf.set('PIXMAN_VERSION_MICRO', split[2]) + add_project_arguments('-DHAVE_CONFIG_H', language : ['c']) + + subdir('pixman') +-subdir('test') +-subdir('demos') ++# subdir('test') ++# subdir('demos') + + pkg = import('pkgconfig') + pkg.generate( diff --git a/externals/vcpkg/ports/pixman/vcpkg.json b/externals/vcpkg/ports/pixman/vcpkg.json new file mode 100755 index 000000000..b475c2fb7 --- /dev/null +++ b/externals/vcpkg/ports/pixman/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "pixman", + "version": "0.40.0", + "port-version": 2, + "description": "Pixman is a low-level software library for pixel manipulation, providing features such as image compositing and trapezoid rasterization.", + "homepage": "https://www.cairographics.org/releases", + "license": "MIT", + "dependencies": [ + "libpng", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/pkgconf/portfile.cmake b/externals/vcpkg/ports/pkgconf/portfile.cmake new file mode 100755 index 000000000..0f269dc13 --- /dev/null +++ b/externals/vcpkg/ports/pkgconf/portfile.cmake @@ -0,0 +1,82 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO pkgconf/pkgconf + REF cef30268e1a3f79efd607c26abcf556aa314c9c4 + SHA512 ea03b81d01521201bdc471a39cdc8b13f9452f7cc78706d5c57056595f3e4e8a3562c022ebb72ce6444f2c7a8dfc778114814ef5064eaef770a70cc294c7f7ee + HEAD_REF master +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + NO_PKG_CONFIG + OPTIONS -Dtests=false +) + +set(systemsuffix "") +set(architectureprefix "") + +set(SYSTEM_LIBDIR "") +set(PKG_DEFAULT_PATH "") +set(SYSTEM_INCLUDEDIR "") +set(PERSONALITY_PATH "personality.d") + + +if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_CROSSCOMPILING AND VCPKG_TARGET_ARCHITECTURE MATCHES "x64") + # These defaults are obtained from pkgconf/pkg-config on Ubuntu and OpenSuse + # vcpkg cannot do system introspection to obtain/set these values since it would break binary caching. + set(SYSTEM_INCLUDEDIR "/usr/include") + # System lib dirs will be stripped from -L from the pkg-config output + set(SYSTEM_LIBDIR "/lib:/lib/i386-linux-gnu:/lib/x86_64-linux-gnu:/lib/x86_64-linux-gnux32:/lib64:/lib32:/libx32:/usr/lib:/usr/lib/i386-linux-gnu:/usr/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnux32:/usr/lib64:/usr/lib32:/usr/libx32") + set(PKG_DEFAULT_PATH "/usr/local/lib/x86_64-linux-gnu/pkgconfig:/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig") + set(PERSONALITY_PATH "/usr/share/pkgconfig/personality.d:/etc/pkgconfig/personality.d") +endif() + +if(DEFINED VCPKG_pkgconf_SYSTEM_LIBDIR) + set(SYSTEM_LIBDIR "${VCPKG_pkgconf_SYSTEM_LIBDIR}") +endif() +if(DEFINED VCPKG_pkgconf_PKG_DEFAULT_PATH) + set(PKG_DEFAULT_PATH "${VCPKG_pkgconf_PKG_DEFAULT_PATH}") +endif() +if(DEFINED VCPKG_pkgconf_SYSTEM_INCLUDEDIR) + set(SYSTEM_INCLUDEDIR "${VCPKG_pkgconf_SYSTEM_INCLUDEDIR}") +endif() +if(DEFINED VCPKG_pkgconf_PERSONALITY_PATH) + set(PERSONALITY_PATH "${VCPKG_pkgconf_PERSONALITY_PATH}") +endif() + + +set(pkgconfig_file "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libpkgconf/config.h") +if(EXISTS "${pkgconfig_file}") + file(READ "${pkgconfig_file}" contents) + string(REGEX REPLACE "#define PKG_DEFAULT_PATH [^\n]+" "#define PKG_DEFAULT_PATH \"${PKG_DEFAULT_PATH}\"" contents "${contents}") + string(REGEX REPLACE "#define SYSTEM_INCLUDEDIR [^\n]+" "#define SYSTEM_INCLUDEDIR \"${SYSTEM_INCLUDEDIR}\"" contents "${contents}") + string(REGEX REPLACE "#define SYSTEM_LIBDIR [^\n]+" "#define SYSTEM_LIBDIR \"${SYSTEM_LIBDIR}\"" contents "${contents}") + string(REGEX REPLACE "#define PERSONALITY_PATH [^\n]+" "#define PERSONALITY_PATH \"${PERSONALITY_PATH}\"" contents "${contents}") + file(WRITE "${pkgconfig_file}" "${contents}") +endif() +set(pkgconfig_file "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libpkgconf/config.h") +if(EXISTS "${pkgconfig_file}") + file(READ "${pkgconfig_file}" contents) + string(REGEX REPLACE "#define PKG_DEFAULT_PATH [^\n]+" "#define PKG_DEFAULT_PATH \"${PKG_DEFAULT_PATH}\"" contents "${contents}") + string(REGEX REPLACE "#define SYSTEM_INCLUDEDIR [^\n]+" "#define SYSTEM_INCLUDEDIR \"${SYSTEM_INCLUDEDIR}\"" contents "${contents}") + string(REGEX REPLACE "#define SYSTEM_LIBDIR [^\n]+" "#define SYSTEM_LIBDIR \"${SYSTEM_LIBDIR}\"" contents "${contents}") + string(REGEX REPLACE "#define PERSONALITY_PATH [^\n]+" "#define PERSONALITY_PATH \"${PERSONALITY_PATH}\"" contents "${contents}") + file(WRITE "${pkgconfig_file}" "${contents}") +endif() + +vcpkg_install_meson() +vcpkg_fixup_pkgconfig(SKIP_CHECK) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pkgconf/libpkgconf/libpkgconf-api.h" "#if defined(PKGCONFIG_IS_STATIC)" "#if 1") +endif() + +vcpkg_copy_tools(TOOL_NAMES pkgconf AUTO_CLEAN) + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/pkgconf/vcpkg.json b/externals/vcpkg/ports/pkgconf/vcpkg.json new file mode 100755 index 000000000..e8beeb95b --- /dev/null +++ b/externals/vcpkg/ports/pkgconf/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "pkgconf", + "version": "1.8.0", + "port-version": 3, + "description": "pkgconf is a program which helps to configure compiler and linker flags for development libraries. It is similar to pkg-config from freedesktop.org.", + "homepage": "https://github.com/pkgconf/pkgconf", + "license": null, + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/platform-folders/portfile.cmake b/externals/vcpkg/ports/platform-folders/portfile.cmake new file mode 100755 index 000000000..f7832767d --- /dev/null +++ b/externals/vcpkg/ports/platform-folders/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +set(TARGET_BUILD_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sago007/PlatformFolders + REF 4.1.0 + SHA512 B2C7983399D9EAA8EF95F45E51B7B70626466FC14A0E53C8B497E683D63E40683CC995C75FC9529C7E969BB802CF9C92051B663901326985722AEBF7618C48EB + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_install_cmake() +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${TARGET_BUILD_PATH}-rel/platform_folders.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin/") + file(INSTALL "${TARGET_BUILD_PATH}-dbg/platform_folders.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/") +endif() + +if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_MinGW) + vcpkg_fixup_cmake_targets(CONFIG_PATH cmake/ TARGET_PATH /share/platform_folders) +else() + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ TARGET_PATH /share/) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/platform-folders/vcpkg.json b/externals/vcpkg/ports/platform-folders/vcpkg.json new file mode 100755 index 000000000..48230b046 --- /dev/null +++ b/externals/vcpkg/ports/platform-folders/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "platform-folders", + "version": "4.1.0", + "description": "A C++ library to look for special directories like \"My Documents\" and \"%APPDATA%\"", + "homepage": "https://github.com/sago007/PlatformFolders" +} diff --git a/externals/vcpkg/ports/plf-colony/portfile.cmake b/externals/vcpkg/ports/plf-colony/portfile.cmake new file mode 100755 index 000000000..e4ec7bd47 --- /dev/null +++ b/externals/vcpkg/ports/plf-colony/portfile.cmake @@ -0,0 +1,13 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mattreecebentley/plf_colony + REF 7243b4601b5d7e989550c158a9918ea5a05feaf4 + SHA512 aaf898ac5a37720545a7b7226c8bd09be80dcdd03d9c77a2c64cfe0aedbb59ede4042001c616c4b5d29f13717ae5b637c0608d83819c2bceae5606c8555a64da + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/plf_colony.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/plf-colony/vcpkg.json b/externals/vcpkg/ports/plf-colony/vcpkg.json new file mode 100755 index 000000000..01101a6a1 --- /dev/null +++ b/externals/vcpkg/ports/plf-colony/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "plf-colony", + "version": "6.33", + "description": "An unordered C++ data container providing fast iteration/insertion/erasure while maintaining pointer/iterator validity to non-erased elements regardless of insertions/erasures.", + "homepage": "https://plflib.org/colony.htm" +} diff --git a/externals/vcpkg/ports/plf-hive/portfile.cmake b/externals/vcpkg/ports/plf-hive/portfile.cmake new file mode 100755 index 000000000..8fcbfb5d3 --- /dev/null +++ b/externals/vcpkg/ports/plf-hive/portfile.cmake @@ -0,0 +1,13 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mattreecebentley/plf_hive + REF 39dfcc5712125cc645df123c120006b7a6fd95d6 + SHA512 81a1f185ca8293b6fb83605c05ecf14d024194334cb64932daa29ecae064918241fa7f3e4a688dc2b19b4b5dd8a2605d60947bd513f7cd30299fd6ba25aa8b35 + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/plf_hive.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/plf-hive/vcpkg.json b/externals/vcpkg/ports/plf-hive/vcpkg.json new file mode 100755 index 000000000..4393fa972 --- /dev/null +++ b/externals/vcpkg/ports/plf-hive/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "plf-hive", + "version-date": "2021-12-11", + "description": "plf::hive is a fork of plf::colony to match the current C++ standards proposal.", + "homepage": "https://plflib.org/colony.htm" +} diff --git a/externals/vcpkg/ports/plf-list/portfile.cmake b/externals/vcpkg/ports/plf-list/portfile.cmake new file mode 100755 index 000000000..97fd06280 --- /dev/null +++ b/externals/vcpkg/ports/plf-list/portfile.cmake @@ -0,0 +1,14 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mattreecebentley/plf_list + REF 42fcfca9890598d1c1fda45eb9dbe2b2b2d4dd2b + SHA512 879157aac16dc1b76db942a8ddf25dc33ede10e769496b7f300a070913c6c6946cb40853dd3071ecf3d9c870e1dee5d420d42fbb388e83361235659171f6bd44 + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/plf_list.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/plf-list/vcpkg.json b/externals/vcpkg/ports/plf-list/vcpkg.json new file mode 100755 index 000000000..e86191647 --- /dev/null +++ b/externals/vcpkg/ports/plf-list/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "plf-list", + "version-string": "2019-08-10", + "port-version": 1, + "description": "A drop-in replacement for std::list with 293% faster insertion, 57% faster erasure, 17% faster iteration and 77% faster sorting on average", + "homepage": "https://www.plflib.org/" +} diff --git a/externals/vcpkg/ports/plf-nanotimer/portfile.cmake b/externals/vcpkg/ports/plf-nanotimer/portfile.cmake new file mode 100755 index 000000000..c02495d73 --- /dev/null +++ b/externals/vcpkg/ports/plf-nanotimer/portfile.cmake @@ -0,0 +1,14 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mattreecebentley/plf_nanotimer + REF bc8b44d2befc4395f63701c923ece89835d8415c + SHA512 ec816e82ab855dd7029b03931ffb1e945d3e77f7bb446c4985c4a8404afe20e9de8fac02f64459c47c34e31c06fa8838dba310263197d309e39ec1b0b5da0b6d + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/plf_nanotimer.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/plf-nanotimer/vcpkg.json b/externals/vcpkg/ports/plf-nanotimer/vcpkg.json new file mode 100755 index 000000000..26e8a22e4 --- /dev/null +++ b/externals/vcpkg/ports/plf-nanotimer/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "plf-nanotimer", + "version-string": "2019-08-10", + "port-version": 1, + "description": "A simple C++ 03/11/etc timer class for ~microsecond-precision cross-platform benchmarking", + "homepage": "https://www.plflib.org/" +} diff --git a/externals/vcpkg/ports/plf-stack/portfile.cmake b/externals/vcpkg/ports/plf-stack/portfile.cmake new file mode 100755 index 000000000..370ea578c --- /dev/null +++ b/externals/vcpkg/ports/plf-stack/portfile.cmake @@ -0,0 +1,14 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mattreecebentley/plf_stack + REF 9d046154d8954eafc12f8d4845505beec8c4a5da + SHA512 2202bbff0e93bf515ae7b237551d084dcba9b870bca82f49b4e1a64446f4574079b0cb45fb91f0ad0472e008f21ad014464b45e307ffa6dab19affc6dc38626a + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/plf_stack.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/plf-stack/vcpkg.json b/externals/vcpkg/ports/plf-stack/vcpkg.json new file mode 100755 index 000000000..6c0a75f68 --- /dev/null +++ b/externals/vcpkg/ports/plf-stack/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "plf-stack", + "version-string": "2019-08-10", + "port-version": 1, + "description": "A C++ data container replicating std::stack functionality but with better performance", + "homepage": "https://www.plflib.org/" +} diff --git a/externals/vcpkg/ports/plib/CMakeLists.txt b/externals/vcpkg/ports/plib/CMakeLists.txt new file mode 100755 index 000000000..ac35b6674 --- /dev/null +++ b/externals/vcpkg/ports/plib/CMakeLists.txt @@ -0,0 +1,361 @@ +cmake_minimum_required(VERSION 3.3.0) + +project(plib VERSION 1.8.5) + +set(CMAKE_DEBUG_POSTFIX d) + +# Sources & Headers +set(fnt_SOURCES + src/fnt/fnt.cxx + src/fnt/fntBitmap.cxx + src/fnt/fntTXF.cxx) + +set(fnt_HEADERS + src/fnt/fnt.h + src/fnt/fntLocal.h) + +set(js_SOURCES + src/js/js.cxx + src/js/jsBSD.cxx + src/js/jsLinux.cxx + src/js/jsMacOS.cxx + src/js/jsMacOSX.cxx + src/js/jsNone.cxx + src/js/jsWindows.cxx) + +set(js_HEADERS + src/js/js.h) + +set(net_SOURCES + src/net/netBuffer.cxx + src/net/netChannel.cxx + src/net/netChat.cxx + src/net/netMessage.cxx + src/net/netMonitor.cxx + src/net/netSocket.cxx) + +set(net_HEADERS + src/net/netBuffer.h + src/net/netChannel.h + src/net/netChat.h + src/net/netMessage.h + src/net/netMonitor.h + src/net/netSocket.h) + +set(psl_SOURCES + src/psl/psl.cxx + src/psl/pslCodeGen.cxx + src/psl/pslCompiler.cxx + src/psl/pslContext.cxx + src/psl/pslDump.cxx + src/psl/pslError.cxx + src/psl/pslExpression.cxx + src/psl/pslFileIO.cxx + src/psl/pslProgram.cxx + src/psl/pslSymbols.cxx + src/psl/pslToken.cxx) + +set(psl_HEADERS + src/psl/psl.h + src/psl/pslCompiler.h + src/psl/pslContext.h + src/psl/pslFileIO.h + src/psl/pslLocal.h + src/psl/pslOpcodes.h + src/psl/pslSymbol.h) + +set(puAux_SOURCES + src/puAux/puAux.cxx + src/puAux/puAuxBiSlider.cxx + src/puAux/puAuxBiSliderWithEnds.cxx + src/puAux/puAuxChooser.cxx + src/puAux/puAuxComboBox.cxx + src/puAux/puAuxCompass.cxx + src/puAux/puAuxFileSelector.cxx + src/puAux/puAuxLargeInput.cxx + src/puAux/puAuxList.cxx + src/puAux/puAuxScrollBar.cxx + src/puAux/puAuxSelectBox.cxx + src/puAux/puAuxSliderWithInput.cxx + src/puAux/puAuxSpinBox.cxx + src/puAux/puAuxTriSlider.cxx + src/puAux/puAuxVerticalMenu.cxx) + +set(puAux_HEADERS + src/puAux/puAux.h + src/puAux/puAuxLocal.h) + +set(pui_SOURCES + src/pui/pu.cxx + src/pui/puArrowButton.cxx + src/pui/puBox.cxx + src/pui/puButton.cxx + src/pui/puButtonBox.cxx + src/pui/puDial.cxx + src/pui/puDialogBox.cxx + src/pui/puFont.cxx + src/pui/puFrame.cxx + src/pui/puGroup.cxx + src/pui/puInput.cxx + src/pui/puInputBase.cxx + src/pui/puInterface.cxx + src/pui/puListBox.cxx + src/pui/puMenuBar.cxx + src/pui/puObject.cxx + src/pui/puOneShot.cxx + src/pui/puPopup.cxx + src/pui/puPopupMenu.cxx + src/pui/puRange.cxx + src/pui/puSlider.cxx + src/pui/puText.cxx + src/pui/puValue.cxx) + +set(pui_HEADERS + src/pui/pu.h + src/pui/puFLTK.h + src/pui/puGLUT.h + src/pui/puLocal.h + src/pui/puNative.h + src/pui/puPW.h + src/pui/puSDL.h) + +set(pw_SOURCES + src/pw/pwWindows.cxx) + +set(pw_HEADERS + src/pw/pw.h) + +set(sg_SOURCES + src/sg/sg.cxx + src/sg/sgd.cxx + src/sg/sgdIsect.cxx + src/sg/sgIsect.cxx + src/sg/sgPerlinNoise.cxx) + +set(sg_HEADERS + src/sg/sg.h) + +set(sl_SOURCES + src/sl/slDSP.cxx + src/sl/slEnvelope.cxx + src/sl/slMODdacio.cxx + src/sl/slMODfile.cxx + src/sl/slMODinst.cxx + src/sl/slMODnote.cxx + src/sl/slMODPlayer.cxx + src/sl/slPlayer.cxx + src/sl/slSample.cxx + src/sl/slSamplePlayer.cxx + src/sl/slScheduler.cxx + src/sl/smMixer.cxx) + +set(sl_HEADERS + src/sl/sl.h + src/sl/slMODfile.h + src/sl/slMODPrivate.h + src/sl/slPortability.h + src/sl/sm.h) + +set(ssg_SOURCES + src/ssg/ssg.cxx + src/ssg/ssgAnimation.cxx + src/ssg/ssgAnimTransform.cxx + src/ssg/ssgAxisTransform.cxx + src/ssg/ssgBase.cxx + src/ssg/ssgBaseTransform.cxx + src/ssg/ssgBranch.cxx + src/ssg/ssgContext.cxx + src/ssg/ssgCutout.cxx + src/ssg/ssgDList.cxx + src/ssg/ssgEntity.cxx + src/ssg/ssgInvisible.cxx + src/ssg/ssgIO.cxx + src/ssg/ssgIsect.cxx + src/ssg/ssgLeaf.cxx + src/ssg/ssgList.cxx + src/ssg/ssgLoad.cxx + src/ssg/ssgLoad3ds.cxx + src/ssg/ssgLoadAC.cxx + src/ssg/ssgLoadASC.cxx + src/ssg/ssgLoadASE.cxx + src/ssg/ssgLoadATG.cxx + src/ssg/ssgLoadBMP.cxx + src/ssg/ssgLoadDOF.cxx + src/ssg/ssgLoadDXF.cxx + src/ssg/ssgLoaderWriterStuff.cxx + src/ssg/ssgLoadFLT.cxx + src/ssg/ssgLoadIV.cxx + src/ssg/ssgLoadM.cxx + src/ssg/ssgLoadMD2.cxx + src/ssg/ssgLoadMDL.cxx + src/ssg/ssgLoadMDL_BGLTexture.cxx + src/ssg/ssgLoadOBJ.cxx + src/ssg/ssgLoadOFF.cxx + src/ssg/ssgLoadPCX.cxx + src/ssg/ssgLoadPNG.cxx + src/ssg/ssgLoadSGI.cxx + src/ssg/ssgLoadSSG.cxx + src/ssg/ssgLoadStrip.cxx + src/ssg/ssgLoadTexture.cxx + src/ssg/ssgLoadTGA.cxx + src/ssg/ssgLoadTRI.cxx + src/ssg/ssgLoadVRML1.cxx + src/ssg/ssgLoadX.cxx + src/ssg/ssgLoadXPlaneObj.cxx + src/ssg/ssgOptimiser.cxx + src/ssg/ssgParser.cxx + src/ssg/ssgRangeSelector.cxx + src/ssg/ssgRoot.cxx + src/ssg/ssgSave3ds.cxx + src/ssg/ssgSaveAC.cxx + src/ssg/ssgSaveASC.cxx + src/ssg/ssgSaveASE.cxx + src/ssg/ssgSaveATG.cxx + src/ssg/ssgSaveDXF.cxx + src/ssg/ssgSaveFLT.cxx + src/ssg/ssgSaveIV.cxx + src/ssg/ssgSaveM.cxx + src/ssg/ssgSaveOBJ.cxx + src/ssg/ssgSaveOFF.cxx + src/ssg/ssgSaveQHI.cxx + src/ssg/ssgSaveTRI.cxx + src/ssg/ssgSaveVRML1.cxx + src/ssg/ssgSaveX.cxx + src/ssg/ssgSelector.cxx + src/ssg/ssgSimpleList.cxx + src/ssg/ssgSimpleState.cxx + src/ssg/ssgState.cxx + src/ssg/ssgStateSelector.cxx + src/ssg/ssgStateTables.cxx + src/ssg/ssgStatistics.cxx + src/ssg/ssgStats.cxx + src/ssg/ssgTexTrans.cxx + src/ssg/ssgTexture.cxx + src/ssg/ssgTransform.cxx + src/ssg/ssgTween.cxx + src/ssg/ssgTweenController.cxx + src/ssg/ssgVertSplitter.cxx + src/ssg/ssgVTable.cxx + src/ssg/ssgVtxArray.cxx + src/ssg/ssgVtxTable.cxx) + +set(ssg_HEADERS + src/ssg/ssg.h + src/ssg/ssg3ds.h + src/ssg/ssgKeyFlier.h + src/ssg/ssgLoaderWriterStuff.h + src/ssg/ssgLoadMDL.h + src/ssg/ssgLoadVRML.h + src/ssg/ssgLocal.h + src/ssg/ssgMSFSPalette.h + src/ssg/ssgParser.h + src/ssg/ssgVertSplitter.h) + +set(ssgAux_SOURCES + src/ssgAux/ssgAux.cxx + src/ssgAux/ssgaBillboards.cxx + src/ssgAux/ssgaCelestialBody.cxx + src/ssgAux/ssgaCloudLayer.cxx + src/ssgAux/ssgaFire.cxx + src/ssgAux/ssgaLensFlare.cxx + src/ssgAux/ssgaLensFlareTexture.cxx + src/ssgAux/ssgaParticleSystem.cxx + src/ssgAux/ssgaPatch.cxx + src/ssgAux/ssgaScreenDump.cxx + src/ssgAux/ssgaShapes.cxx + src/ssgAux/ssgaSky.cxx + src/ssgAux/ssgaSkyDome.cxx + src/ssgAux/ssgaSphere.cxx + src/ssgAux/ssgaStars.cxx + src/ssgAux/ssgaTeapot.cxx + src/ssgAux/ssgaWaveSystem.cxx) + +set(ssgAux_HEADERS + src/ssgAux/ssgAux.h + src/ssgAux/ssgaBillboards.h + src/ssgAux/ssgaFire.h + src/ssgAux/ssgaLensFlare.h + src/ssgAux/ssgaParticleSystem.h + src/ssgAux/ssgaScreenDump.h + src/ssgAux/ssgaShapes.h + src/ssgAux/ssgaSky.h + src/ssgAux/ssgaSphere.h + src/ssgAux/ssgaWaveSystem.h) + +set(ul_SOURCES + src/util/ul.cxx + src/util/ulClock.cxx + src/util/ulError.cxx + src/util/ulLinkedList.cxx + src/util/ulList.cxx + src/util/ulRTTI.cxx) + +set(ul_HEADERS + src/util/ul.h + src/util/ulLocal.h + src/util/ulRTTI.h) + +# Create and configure the targets +add_library(plib_fnt STATIC ${fnt_SOURCES} ${fnt_HEADERS}) +target_include_directories(plib_fnt PRIVATE src/sg src/util) + +add_library(plib_js STATIC ${js_SOURCES} ${js_HEADERS}) +target_include_directories(plib_js PRIVATE src/util) + +add_library(plib_net STATIC ${net_SOURCES} ${net_HEADERS}) +target_include_directories(plib_net PRIVATE src/util) + +add_library(plib_psl STATIC ${psl_SOURCES} ${psl_HEADERS}) +target_include_directories(plib_psl PRIVATE src/util) + +add_library(plib_puAux STATIC ${puAux_SOURCES} ${puAux_HEADERS}) +target_include_directories(plib_puAux PRIVATE + src/fnt + src/pui + src/sg + src/util +) + +add_library(plib_pui STATIC ${pui_SOURCES} ${pui_HEADERS}) +target_include_directories(plib_pui PRIVATE src/fnt src/sg src/util) + +add_library(plib_pw STATIC ${pw_SOURCES} ${pw_HEADERS}) +target_include_directories(plib_pw PRIVATE src/util) + +add_library(plib_sg STATIC ${sg_SOURCES} ${sg_HEADERS}) +target_include_directories(plib_sg PRIVATE src/util) + +add_library(plib_sl STATIC ${sl_SOURCES} ${sl_HEADERS}) +target_include_directories(plib_sl PRIVATE src/util) + +add_library(plib_ssg STATIC ${ssg_SOURCES} ${ssg_HEADERS}) +target_include_directories(plib_ssg PRIVATE src/sg src/util) + +add_library(plib_ssgAux STATIC ${ssgAux_SOURCES} ${ssgAux_HEADERS}) +target_include_directories(plib_ssgAux PRIVATE src/sg src/ssg src/util) + +add_library(plib_ul STATIC ${ul_SOURCES} ${ul_HEADERS}) + +# Install +install( + TARGETS plib_fnt plib_js plib_net plib_psl plib_puAux plib_pui plib_pw plib_sg plib_sl plib_ssg plib_ssgAux plib_ul + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin +) + +install( + FILES ${fnt_HEADERS} + ${js_HEADERS} + ${net_HEADERS} + ${psl_HEADERS} + ${puAux_HEADERS} + ${pui_HEADERS} + ${pw_HEADERS} + ${sg_HEADERS} + ${sl_HEADERS} + ${ssg_HEADERS} + ${ssgAux_HEADERS} + ${ul_HEADERS} + DESTINATION include/plib +) diff --git a/externals/vcpkg/ports/plib/portfile.cmake b/externals/vcpkg/ports/plib/portfile.cmake new file mode 100755 index 000000000..1991b2f6b --- /dev/null +++ b/externals/vcpkg/ports/plib/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_download_distfile(ARCHIVE + URLS "http://plib.sourceforge.net/dist/plib-1.8.5.tar.gz" + FILENAME "plib-1.8.5.tar.gz" + SHA512 17154cc77243fe576c2bcbcb0285b98aef1a0634658f5473e95fe0ac8fa3ed477dbe5620e44ccf0b7cc616f812af0cd44d6fcbba0c563180d3b61c9d6f158e1d +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/plib/vcpkg.json b/externals/vcpkg/ports/plib/vcpkg.json new file mode 100755 index 000000000..421823aff --- /dev/null +++ b/externals/vcpkg/ports/plib/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "plib", + "version-string": "1.8.5", + "port-version": 5, + "description": "A suite of portable game libraries" +} diff --git a/externals/vcpkg/ports/plibsys/fix_configuration.patch b/externals/vcpkg/ports/plibsys/fix_configuration.patch new file mode 100755 index 000000000..f48249bfd --- /dev/null +++ b/externals/vcpkg/ports/plibsys/fix_configuration.patch @@ -0,0 +1,142 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 343e3d2..aff7929 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -785,18 +785,18 @@ if (PLIBSYS_PLATFORM_DEFINES) + endif() + + # Add targets +-add_library (plibsys SHARED ${PLIBSYS_SRCS} ${PLIBSYS_PLATFORM_SRCS} ${PLIBSYS_PUBLIC_HDRS} ${PLIBSYS_PRIVATE_HDRS}) +- + if (PLIBSYS_BUILD_STATIC) + add_library (plibsysstatic STATIC ${PLIBSYS_SRCS} ${PLIBSYS_PLATFORM_SRCS} ${PLIBSYS_PUBLIC_HDRS} ${PLIBSYS_PRIVATE_HDRS}) ++else() ++ add_library (plibsys SHARED ${PLIBSYS_SRCS} ${PLIBSYS_PLATFORM_SRCS} ${PLIBSYS_PUBLIC_HDRS} ${PLIBSYS_PRIVATE_HDRS}) + endif() + + # Add include directories + if (COMMAND target_include_directories) +- target_include_directories (plibsys PUBLIC ${PLIBSYS_INCLUDE_DIRS}) +- + if (PLIBSYS_BUILD_STATIC) + target_include_directories (plibsysstatic PUBLIC ${PLIBSYS_INCLUDE_DIRS}) ++ else() ++ target_include_directories (plibsys PUBLIC ${PLIBSYS_INCLUDE_DIRS}) + endif() + else() + include_directories (${PLIBSYS_INCLUDE_DIRS}) +@@ -804,15 +804,16 @@ endif() + + # Add compile definitions + if (COMMAND target_compile_definitions) +- target_compile_definitions (plibsys PRIVATE ${PLIBSYS_COMPILE_DEFS}) +- + if (PLIBSYS_BUILD_STATIC) + target_compile_definitions (plibsysstatic PRIVATE ${PLIBSYS_COMPILE_DEFS}) ++ else() ++ target_compile_definitions (plibsys PRIVATE ${PLIBSYS_COMPILE_DEFS}) + endif() + else() + add_definitions (${PLIBSYS_COMPILE_DEFS}) + endif() + ++if(NOT PLIBSYS_BUILD_STATIC) + set_target_properties (plibsys PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_DIR}) + set_target_properties (plibsys PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_DIR}) + set_target_properties (plibsys PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_DIR}) +@@ -820,6 +821,7 @@ set_target_properties (plibsys PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_DIR} + if (NOT PLIBSYS_TARGET_OS STREQUAL os2 AND NOT PLIBSYS_TARGET_OS STREQUAL amigaos) + set_target_properties (plibsys PROPERTIES SOVERSION ${PLIBSYS_SOVERSION}) + endif() ++endif() + + if (PLIBSYS_BUILD_STATIC) + set_target_properties (plibsysstatic PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_DIR}) +@@ -834,10 +836,10 @@ if (PLIBSYS_PLATFORM_CFLAGS) + set (PLIBSYS_PLATFORM_CFLAGS_STR "${PLIBSYS_PLATFORM_CFLAGS_STR} ${PLATFORM_CFLAG}") + endforeach() + +- set_target_properties (plibsys PROPERTIES COMPILE_FLAGS "${PLIBSYS_PLATFORM_CFLAGS_STR}") +- + if (PLIBSYS_BUILD_STATIC) + set_target_properties (plibsysstatic PROPERTIES COMPILE_FLAGS "${PLIBSYS_PLATFORM_CFLAGS_STR}") ++ else() ++ set_target_properties (plibsys PROPERTIES COMPILE_FLAGS "${PLIBSYS_PLATFORM_CFLAGS_STR}") + endif() + endif() + +@@ -846,29 +848,30 @@ if (PLIBSYS_PLATFORM_LDFLAGS) + set (PLIBSYS_PLATFORM_LDFLAGS_STR "${PLIBSYS_PLATFORM_LDFLAGS_STR} ${PLATFORM_LDFLAG}") + endforeach() + +- set_target_properties (plibsys PROPERTIES LINK_FLAGS "${PLIBSYS_PLATFORM_LDFLAGS_STR}") +- + if (PLIBSYS_BUILD_STATIC) + set_target_properties (plibsysstatic PROPERTIES LINK_FLAGS "${PLIBSYS_PLATFORM_LDFLAGS_STR}") ++ else() ++ set_target_properties (plibsys PROPERTIES LINK_FLAGS "${PLIBSYS_PLATFORM_LDFLAGS_STR}") + endif() + endif() + +-target_link_libraries (plibsys ${PLIBSYS_PLATFORM_LINK_LIBRARIES}) + + if (PLIBSYS_BUILD_STATIC) +- target_link_libraries (plibsysstatic ${PLIBSYS_PLATFORM_LINK_LIBRARIES}) ++ target_link_libraries (plibsysstatic ${PLIBSYS_PLATFORM_LINK_LIBRARIES}) ++else() ++ target_link_libraries (plibsys ${PLIBSYS_PLATFORM_LINK_LIBRARIES}) + endif() + + if (PLIBSYS_BUILD_STATIC) +- set (PLIBSYS_INSTALL_TARGETS plibsys plibsysstatic) ++ set (PLIBSYS_INSTALL_TARGETS plibsysstatic) + else() + set (PLIBSYS_INSTALL_TARGETS plibsys) + endif() + + if (PLIBSYS_NATIVE_WINDOWS) + install (TARGETS ${PLIBSYS_INSTALL_TARGETS} +- DESTINATION lib +- RUNTIME DESTINATION lib ++ LIBRARY DESTINATION lib ++ RUNTIME DESTINATION bin + COMPONENT Core + ) + +@@ -878,11 +881,6 @@ if (PLIBSYS_NATIVE_WINDOWS) + + set (CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE) + include (InstallRequiredSystemLibraries) +- +- install (PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} +- DESTINATION lib +- COMPONENT Core +- ) + endif() + + # Prepare installation dirs +@@ -890,18 +888,18 @@ if (NOT CMAKE_INSTALL_LIBDIR) + set (CMAKE_INSTALL_LIBDIR "lib") + endif() + ++if (NOT CMAKE_INSTALL_BINDIR) ++ set (CMAKE_INSTALL_BINDIR "bin") ++endif() ++ + if (NOT CMAKE_INSTALL_INCLUDEDIR) + set (CMAKE_INSTALL_INCLUDEDIR "include") + endif() + + install (TARGETS ${PLIBSYS_INSTALL_TARGETS} EXPORT plibsys-targets +- DESTINATION ${CMAKE_INSTALL_LIBDIR} +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- COMPONENT Core +-) +-install (TARGETS ${PLIBSYS_INSTALL_TARGETS} +- DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT Core + ) + install (FILES diff --git a/externals/vcpkg/ports/plibsys/portfile.cmake b/externals/vcpkg/ports/plibsys/portfile.cmake new file mode 100755 index 000000000..777443c7b --- /dev/null +++ b/externals/vcpkg/ports/plibsys/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO saprykin/plibsys + REF 0.0.4 + SHA512 61957666fb454469e1ff68435463eaf426e960caed33540dbb495e1aa7c446c9803d100f33f1a6ea70d5f2ee2d0d19ec315f3a8c651747f65a186ad061c05e51 + HEAD_REF master + PATCHES + fix_configuration.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PLIBSYS_STATIC) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DPLIBSYS_TESTS=OFF + -DPLIBSYS_COVERAGE=OFF + -DPLIBSYS_BUILD_DOC=OFF + -DPLIBSYS_BUILD_STATIC=${PLIBSYS_STATIC} +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_copy_pdbs() + +configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/plibsys/usage b/externals/vcpkg/ports/plibsys/usage new file mode 100755 index 000000000..e679f1bdc --- /dev/null +++ b/externals/vcpkg/ports/plibsys/usage @@ -0,0 +1,5 @@ +The package plibsys provides CMake targets: + + find_package(plibsys CONFIG REQUIRED) + target_include_directories(main PRIVATE ${PLIBSYS_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${PLIBSYS_LIBRARIES}) diff --git a/externals/vcpkg/ports/plibsys/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/plibsys/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..acf1ac9f8 --- /dev/null +++ b/externals/vcpkg/ports/plibsys/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,12 @@ +include(FindPackageHandleStandardArgs) +include(SelectLibraryConfigurations) + +find_path(PLIBSYS_INCLUDE_DIR NAMES plibsys.h HINTS ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET} PATH_SUFFIXES plibsys) + +find_library(PLIBSYS_LIBRARY_DEBUG NAMES plibsys plibsysstatic libplibsys NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED) +find_library(PLIBSYS_LIBRARY_RELEASE NAMES plibsys plibsysstatic libplibsys NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED) + +select_library_configurations(PLIBSYS) + +set(PLIBSYS_INCLUDE_DIRS ${PLIBSYS_INCLUDE_DIR}) +set(PLIBSYS_LIBRARIES ${PLIBSYS_LIBRARY}) diff --git a/externals/vcpkg/ports/plibsys/vcpkg.json b/externals/vcpkg/ports/plibsys/vcpkg.json new file mode 100755 index 000000000..fa95157d3 --- /dev/null +++ b/externals/vcpkg/ports/plibsys/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "plibsys", + "version": "0.0.4", + "port-version": 6, + "description": "Highly portable C system library: threads and synchronization, sockets, IPC, data structures and more.", + "homepage": "https://github.com/saprykin/plibsys", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/plog/portfile.cmake b/externals/vcpkg/ports/plog/portfile.cmake new file mode 100755 index 000000000..b06b55b71 --- /dev/null +++ b/externals/vcpkg/ports/plog/portfile.cmake @@ -0,0 +1,20 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO SergiusTheBest/plog + REF 1.1.8 + SHA512 09bf6e0cae7f20c1b42e68a174b4cd6a2fb8751db9758efb87449cbff48375708e43c147c72b7ed17fb9334acaf7802441f61578356284a8ed337fd886a45e79 + HEAD_REF master +) + +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH} OPTIONS -DPLOG_BUILD_SAMPLES=OFF) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +# Copy usage file +file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +# Put the licence file where vcpkg expects it +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/plog/usage b/externals/vcpkg/ports/plog/usage new file mode 100755 index 000000000..bfba94d5e --- /dev/null +++ b/externals/vcpkg/ports/plog/usage @@ -0,0 +1,6 @@ +The package plog is header only and can be used from CMake via: + +Modern CMake: + find_package(plog CONFIG REQUIRED) + target_link_libraries(main PRIVATE plog::plog) + diff --git a/externals/vcpkg/ports/plog/vcpkg.json b/externals/vcpkg/ports/plog/vcpkg.json new file mode 100755 index 000000000..7f0444360 --- /dev/null +++ b/externals/vcpkg/ports/plog/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "plog", + "version": "1.1.8", + "description": "Portable, simple and extensible C++ logging library.", + "homepage": "https://github.com/SergiusTheBest/plog", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/plplot/0001-findwxwidgets-fixes.patch b/externals/vcpkg/ports/plplot/0001-findwxwidgets-fixes.patch new file mode 100755 index 000000000..cc30ca56d --- /dev/null +++ b/externals/vcpkg/ports/plplot/0001-findwxwidgets-fixes.patch @@ -0,0 +1,71 @@ +diff --git a/cmake/modules/FindwxWidgets.cmake b/cmake/modules/FindwxWidgets.cmake +index 4d3a2d1..c83d8a6 100644 +--- a/cmake/modules/FindwxWidgets.cmake ++++ b/cmake/modules/FindwxWidgets.cmake +@@ -515,7 +515,14 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") + set(_WX_ARCH _x64) + endif() + endif() +- if(BUILD_SHARED_LIBS) ++ ++ include(SelectLibraryConfigurations) ++ find_library(wxWidgets_LIB_DIR_LIBRARY_RELEASE NAMES wxmsw31u_core) ++ find_library(wxWidgets_LIB_DIR_LIBRARY_DEBUG NAMES wxmsw31ud_core) ++ select_library_configurations(wxWidgets_LIB_DIR) ++ get_filename_component(wxWidgets_LIB_DIR ${wxWidgets_LIB_DIR} DIRECTORY) ++ if(0) ++ if(BUILD_SHARED_LIBS) + find_path(wxWidgets_LIB_DIR + NAMES + msw/wx/setup.h +@@ -554,6 +561,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") + NO_DEFAULT_PATH + ) + endif() ++ endif() + unset(_WX_TOOL) + unset(_WX_TOOLVER) + unset(_WX_ARCH) +@@ -571,7 +579,9 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") + set(wxWidgets_DEFINITIONS WXUSINGDLL) + DBG_MSG_V("detected SHARED/DLL tree WX_LIB_DIR=${WX_LIB_DIR}") + endif() +- ++ if(BUILD_SHARED_LIBS) ++ set(wxWidgets_DEFINITIONS WXUSINGDLL) ++ endif(BUILD_SHARED_LIBS) + # Search for available configuration types. + foreach(CFG mswunivud mswunivd mswud mswd mswunivu mswuniv mswu msw) + set(WX_${CFG}_FOUND FALSE) +@@ -583,6 +593,13 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") + endforeach() + DBG_MSG_V("WX_CONFIGURATION_LIST=${WX_CONFIGURATION_LIST}") + ++ if(CMAKE_BUILD_TYPE STREQUAL "Debug") ++ set(WX_CONFIGURATION "mswud") ++ else() ++ set(WX_CONFIGURATION "mswu") ++ endif() ++ set(WX_${WX_CONFIGURATION}_FOUND TRUE) ++ + if(WX_CONFIGURATION) + set(wxWidgets_FOUND TRUE) + +@@ -616,6 +633,8 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") + WX_GET_NAME_COMPONENTS(${wxWidgets_CONFIGURATION} UNV UCD DBG) + + # Set wxWidgets lib setup include directory. ++ set(wxWidgets_INCLUDE_DIRS "${wxWidgets_ROOT_DIR}/include") ++ if(0) + if(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h) + set(wxWidgets_INCLUDE_DIRS + ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}) +@@ -623,7 +642,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") + DBG_MSG("wxWidgets_FOUND FALSE because ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h does not exists.") + set(wxWidgets_FOUND FALSE) + endif() +- ++ endif() + # Set wxWidgets main include directory. + if(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h) + list(APPEND wxWidgets_INCLUDE_DIRS ${WX_ROOT_DIR}/include) diff --git a/externals/vcpkg/ports/plplot/0002-wxwidgets-dev-fixes.patch b/externals/vcpkg/ports/plplot/0002-wxwidgets-dev-fixes.patch new file mode 100755 index 000000000..707c64796 --- /dev/null +++ b/externals/vcpkg/ports/plplot/0002-wxwidgets-dev-fixes.patch @@ -0,0 +1,12 @@ +diff --git a/drivers/wxwidgets_dev.cpp b/drivers/wxwidgets_dev.cpp +index f025bd8..f5881b1 100644 +--- a/drivers/wxwidgets_dev.cpp ++++ b/drivers/wxwidgets_dev.cpp +@@ -31,6 +31,7 @@ + + // Headers needed for Rand + #ifdef WIN32 ++#define _WINSOCKAPI_ + // This include must occur before any other include of stdlib.h due to + // the #define _CRT_RAND_S + #define _CRT_RAND_S diff --git a/externals/vcpkg/ports/plplot/fix-pkg-config.patch b/externals/vcpkg/ports/plplot/fix-pkg-config.patch new file mode 100755 index 000000000..dd2601dbf --- /dev/null +++ b/externals/vcpkg/ports/plplot/fix-pkg-config.patch @@ -0,0 +1,17 @@ +diff --git a/cmake/modules/psttf.cmake b/cmake/modules/psttf.cmake +index 950f41b..6c20af5 100644 +--- a/cmake/modules/psttf.cmake ++++ b/cmake/modules/psttf.cmake +@@ -56,7 +56,11 @@ if(PLD_psttf) + endif(PLD_psttf) + + if(PLD_psttf) +- pkg_check_pkgconfig("lasi;pango;pangoft2" includedir libdir linkflags cflags version _PSTTF) ++ set(PKG_LIST lasi pango pangoft2) ++ foreach (SELECTED_PKG ${PKG_LIST}) ++ pkg_check_pkgconfig("${SELECTED_PKG}" includedir libdir linkflags cflags version _PSTTF) ++ endforeach() ++ + if(linkflags) + #blank-separated required. + string(REGEX REPLACE ";" " " psttf_COMPILE_FLAGS "${cflags}") diff --git a/externals/vcpkg/ports/plplot/fix_utils.patch b/externals/vcpkg/ports/plplot/fix_utils.patch new file mode 100755 index 000000000..d1d8596d0 --- /dev/null +++ b/externals/vcpkg/ports/plplot/fix_utils.patch @@ -0,0 +1,23 @@ +diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt +index 59cfe20..b936dad 100644 +--- a/utils/CMakeLists.txt ++++ b/utils/CMakeLists.txt +@@ -75,7 +75,8 @@ add_executable(parity_bit_check parity_bit_check.c) + if(ENABLE_wxwidgets AND NOT OLD_WXWIDGETS) + # Build wxwidgets applications with same wxwidgets compile and link flags + # as used with the PLplot wxwidgets device driver. +- ++ find_package(JPEG REQUIRED) ++ find_package(TIFF REQUIRED) + set(wxPLViewer_SRCS wxplviewer.cpp wxplframe.cpp ${CMAKE_SOURCE_DIR}/drivers/wxwidgets_comms.cpp) + set_source_files_properties(${wxPLViewer_SRCS} + PROPERTIES COMPILE_FLAGS "${wxwidgets_COMPILE_FLAGS}") +@@ -90,7 +91,7 @@ if(ENABLE_wxwidgets AND NOT OLD_WXWIDGETS) + COMPILE_DEFINITIONS "USINGDLL" + ) + endif(BUILD_SHARED_LIBS) +- target_link_libraries(wxPLViewer plplotwxwidgets plplotcxx ${wxwidgets_LINK_FLAGS} ${MATH_LIB} ${RT_LIB}) ++ target_link_libraries(wxPLViewer plplotwxwidgets plplotcxx ${wxwidgets_LINK_FLAGS} ${MATH_LIB} ${RT_LIB} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES}) + + if(USE_RPATH) + # Assume that plplotwxwidgets and plplotcxx have the same install location as plplot diff --git a/externals/vcpkg/ports/plplot/install-interface-include-directories.patch b/externals/vcpkg/ports/plplot/install-interface-include-directories.patch new file mode 100755 index 000000000..3e124b5d0 --- /dev/null +++ b/externals/vcpkg/ports/plplot/install-interface-include-directories.patch @@ -0,0 +1,13 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index d81b6a7..6b51809 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -181,6 +181,8 @@ include_directories( + add_library(plplot ${plplot_LIB_SRCS}) + add_dependencies(plplot plhershey-unicode.h_built) + ++target_include_directories(plplot INTERFACE $) ++ + # Deal with external libraries. + set(LIB_INSTALL_RPATH ${LIB_DIR}) + set(libplplot_LINK_LIBRARIES) diff --git a/externals/vcpkg/ports/plplot/portfile.cmake b/externals/vcpkg/ports/plplot/portfile.cmake new file mode 100755 index 000000000..4f52c12e8 --- /dev/null +++ b/externals/vcpkg/ports/plplot/portfile.cmake @@ -0,0 +1,71 @@ +set(PLPLOT_VERSION 5.13.0) + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO plplot/plplot + REF ${PLPLOT_VERSION}%20Source + FILENAME "plplot-${PLPLOT_VERSION}.tar.gz" + SHA512 1d5cb5da17d4bde6d675585bff1f8dcb581719249a0b2687867e767703f8dab0870e7ea44b9549a497f4ac0141a3cabf6761c49520c0e2b26ffe581468512cbb + PATCHES + 0001-findwxwidgets-fixes.patch + 0002-wxwidgets-dev-fixes.patch + install-interface-include-directories.patch + use-math-h-nan.patch + fix_utils.patch + fix-pkg-config.patch +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + wxwidgets PLD_wxwidgets + wxwidgets ENABLE_wxwidgets +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DDEFAULT_NO_BINDINGS=ON + -DENABLE_cxx=ON + -DPL_HAVE_QHULL=OFF + -DPLPLOT_USE_QT5=OFF + -DPL_DOUBLE=ON + -DENABLE_DYNDRIVERS=OFF + -DDATA_DIR=${CURRENT_PACKAGES_DIR}/share/plplot + ${FEATURE_OPTIONS} + OPTIONS_DEBUG + -DDRV_DIR=${CURRENT_PACKAGES_DIR}/debug/bin + OPTIONS_RELEASE + -DDRV_DIR=${CURRENT_PACKAGES_DIR}/bin +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/plplot) + +# Remove unnecessary tool +file(REMOVE + "${CURRENT_PACKAGES_DIR}/debug/bin/pltek.exe" + "${CURRENT_PACKAGES_DIR}/bin/pltek.exe" + "${CURRENT_PACKAGES_DIR}/debug/bin/wxPLViewer.exe" + "${CURRENT_PACKAGES_DIR}/bin/wxPLViewer.exe" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + message(STATUS "Static build: Removing the full bin directory.") + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/bin" + "${CURRENT_PACKAGES_DIR}/bin" + ) +endif() + +# Remove unwanted and duplicate directories +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/plplot/examples") + +file(INSTALL "${SOURCE_PATH}/Copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/plplot/use-math-h-nan.patch b/externals/vcpkg/ports/plplot/use-math-h-nan.patch new file mode 100755 index 000000000..1f3987730 --- /dev/null +++ b/externals/vcpkg/ports/plplot/use-math-h-nan.patch @@ -0,0 +1,28 @@ +diff --git "a/lib/csa/nan.h" "b/lib/csa/nan.h" +index 29fd3d2f..7f16e8c8 100644 +--- "a/lib/csa/nan.h" ++++ "b/lib/csa/nan.h" +@@ -19,6 +19,16 @@ + #if !defined ( _NAN_H ) + #define _NAN_H + ++// Try to use the implementation-provided NAN constant: ++ ++#include ++ ++#if defined(NAN) ++ ++#define NaN ((double)NAN) ++ ++#else // ^^^ implementation provides NAN // implementation does not provide NAN vvv ++ + #if ( defined ( __GNUC__ ) && !defined ( __ICC ) ) || defined ( __BORLANDC__ ) + + static const double NaN = 0.0 / 0.0; +@@ -63,4 +73,6 @@ static const long long lNaN = ( (unsigned long long) 1 << 63 ) - 1; + + #endif + ++#endif // defined(NAN) ++ + #endif diff --git a/externals/vcpkg/ports/plplot/vcpkg.json b/externals/vcpkg/ports/plplot/vcpkg.json new file mode 100755 index 000000000..07f3f4326 --- /dev/null +++ b/externals/vcpkg/ports/plplot/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "plplot", + "version-semver": "5.13.0", + "port-version": 15, + "description": "PLplot is a cross-platform software package for creating scientific plots whose (UTF-8) plot symbols and text are limited in practice only by what Unicode-aware system fonts are installed on a user's computer.", + "dependencies": [ + "bzip2", + "freetype", + "libpng", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "features": { + "wxwidgets": { + "description": "plplot wxwidgets module", + "dependencies": [ + "wxwidgets" + ] + } + } +} diff --git a/externals/vcpkg/ports/plustache/CMakeLists.txt b/externals/vcpkg/ports/plustache/CMakeLists.txt new file mode 100755 index 000000000..f9579c0c6 --- /dev/null +++ b/externals/vcpkg/ports/plustache/CMakeLists.txt @@ -0,0 +1,36 @@ +cmake_minimum_required(VERSION 3.1 FATAL_ERROR) +project(plustache LANGUAGES CXX) + +find_package(Boost REQUIRED COMPONENTS regex) + +add_library( + plustache + + src/template.cpp + src/context.cpp + ) + + +target_include_directories( + plustache + + PUBLIC + ${CMAKE_CURRENT_LIST_DIR}/include + PRIVATE + ${Boost_INCLUDE_DIRS} +) + +target_link_libraries( + plustache + + PRIVATE + ${Boost_LIBRARIES} +) + + +install(TARGETS plustache + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + ) +install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/include/plustache DESTINATION include) diff --git a/externals/vcpkg/ports/plustache/portfile.cmake b/externals/vcpkg/ports/plustache/portfile.cmake new file mode 100755 index 000000000..def92fc15 --- /dev/null +++ b/externals/vcpkg/ports/plustache/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mrtazz/plustache + REF 3208529343e1858cfe504041be8c1fa0af0a59d1 + SHA512 8d9ae368b2f276da2faaf4e3b543fc7ded88ebd8fbe33544aa7d85765a38d085d4c31bb68f6a2f73d4f660da1618d187fb94c74a5f6594e7642bf3949707c67b + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +#Debug +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/plustache) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/plustache/LICENSE ${CURRENT_PACKAGES_DIR}/share/plustache/copyright) diff --git a/externals/vcpkg/ports/plustache/vcpkg.json b/externals/vcpkg/ports/plustache/vcpkg.json new file mode 100755 index 000000000..3908571d2 --- /dev/null +++ b/externals/vcpkg/ports/plustache/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "plustache", + "version-string": "0.4.0", + "port-version": 2, + "description": "{{mustaches}} for C++", + "dependencies": [ + "boost-algorithm", + "boost-regex" + ] +} diff --git a/externals/vcpkg/ports/pmdk/portfile.cmake b/externals/vcpkg/ports/pmdk/portfile.cmake new file mode 100755 index 000000000..dcda72d8c --- /dev/null +++ b/externals/vcpkg/ports/pmdk/portfile.cmake @@ -0,0 +1,54 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) + +set(PMDK_VERSION "1.11.0") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO pmem/pmdk + REF 8583fcfd68764ac6779e6f93db89b06971b26704 #Commit id corresponding to the version 1.11.0 + SHA512 6d0a9697c97f75ac10e9e8736c2397c6ee23c26af96b65c746e0c32bc2d16f083b177e52bc399aa93c6f2e29ac6106c2696c6bbf9779788d9d19167ac07000b8 + HEAD_REF master +) + +# Build only the selected projects +vcpkg_build_msbuild( + PROJECT_PATH ${SOURCE_PATH}/src/PMDK.sln + TARGET "Solution Items\\libpmem,Solution Items\\libpmemlog,Solution Items\\libpmemblk,Solution Items\\libpmemobj,Solution Items\\libpmempool,Solution Items\\Tools\\pmempool" + OPTIONS /p:SRCVERSION=${PMDK_VERSION} +) + +set(DEBUG_ARTIFACTS_PATH ${SOURCE_PATH}/src/x64/Debug) +set(RELEASE_ARTIFACTS_PATH ${SOURCE_PATH}/src/x64/Release) + +# Install header files +file(GLOB HEADER_FILES ${SOURCE_PATH}/src/include/*.h) +file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(GLOB HEADER_FILES ${SOURCE_PATH}/src/include/libpmemobj/*.h) +file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/libpmemobj) + +# Remove unneeded header files +file(REMOVE ${CURRENT_PACKAGES_DIR}/include/libvmmalloc.h) +file(REMOVE ${CURRENT_PACKAGES_DIR}/include/librpmem.h) + +# Install libraries (debug) +file(GLOB LIB_DEBUG_FILES ${DEBUG_ARTIFACTS_PATH}/libs/libpmem*.lib) +file(INSTALL ${LIB_DEBUG_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libpmemcommon.lib) +file(GLOB LIB_DEBUG_FILES ${DEBUG_ARTIFACTS_PATH}/libs/libpmem*.dll) +file(INSTALL ${LIB_DEBUG_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + +# Install libraries (release) +file(GLOB LIB_RELEASE_FILES ${RELEASE_ARTIFACTS_PATH}/libs/libpmem*.lib) +file(INSTALL ${LIB_RELEASE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libpmemcommon.lib) +file(GLOB LIB_RELEASE_FILES ${RELEASE_ARTIFACTS_PATH}/libs/libpmem*.dll) +file(INSTALL ${LIB_RELEASE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + +# Install tools (release only) +file(INSTALL ${RELEASE_ARTIFACTS_PATH}/libs/pmempool.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/pmdk) + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/pmdk/vcpkg.json b/externals/vcpkg/ports/pmdk/vcpkg.json new file mode 100755 index 000000000..75c6148da --- /dev/null +++ b/externals/vcpkg/ports/pmdk/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "pmdk", + "version": "1.11.0", + "port-version": 1, + "description": "Persistent Memory Development Kit", + "homepage": "https://github.com/pmem/pmdk", + "supports": "!(arm | x86)" +} diff --git a/externals/vcpkg/ports/pngpp/portfile.cmake b/externals/vcpkg/ports/pngpp/portfile.cmake new file mode 100755 index 000000000..1fa23e444 --- /dev/null +++ b/externals/vcpkg/ports/pngpp/portfile.cmake @@ -0,0 +1,15 @@ +# Header only library +vcpkg_download_distfile(ARCHIVE + URLS "http://download.savannah.nongnu.org/releases/pngpp/png++-0.2.10.tar.gz" + FILENAME "png++-0.2.10.tar.gz" + SHA512 c54a74c0c20212bd0dcf86386c0c11dd824ad14952917ba0ff4c184b6547744458728a4f06018371acb7d5b842b641708914ccaa81bad8e72e173903f494ca85 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +file(GLOB HEADER_FILES ${SOURCE_PATH}/*.hpp) +file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/png++) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/pngpp/vcpkg.json b/externals/vcpkg/ports/pngpp/vcpkg.json new file mode 100755 index 000000000..67312ef2f --- /dev/null +++ b/externals/vcpkg/ports/pngpp/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "pngpp", + "version-string": "0.2.10", + "description": "A C++ wrapper for libpng library.", + "dependencies": [ + "libpng" + ] +} diff --git a/externals/vcpkg/ports/pngwriter/portfile.cmake b/externals/vcpkg/ports/pngwriter/portfile.cmake new file mode 100755 index 000000000..610580b22 --- /dev/null +++ b/externals/vcpkg/ports/pngwriter/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO pngwriter/pngwriter + REF 0.7.0 + SHA512 3e4ef098e4d715d18844cada64f32dbf079fdd1f7a64b6fe5e19584094f6b2a61f80c53804f936b6eefd7ef9dad4a01a7210b1273939d385a0850e48f8ba6683 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/PNGwriter) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/doc/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/pngwriter RENAME copyright) diff --git a/externals/vcpkg/ports/pngwriter/vcpkg.json b/externals/vcpkg/ports/pngwriter/vcpkg.json new file mode 100755 index 000000000..f7fa371e3 --- /dev/null +++ b/externals/vcpkg/ports/pngwriter/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "pngwriter", + "version-string": "0.7.0", + "port-version": 3, + "description": "PNGwriter is a very easy to use open source graphics library that uses PNG as its output format", + "dependencies": [ + "freetype", + "libpng", + "zlib" + ] +} diff --git a/externals/vcpkg/ports/poco/arm64_pcre.patch b/externals/vcpkg/ports/poco/arm64_pcre.patch new file mode 100755 index 000000000..b47561ca7 --- /dev/null +++ b/externals/vcpkg/ports/poco/arm64_pcre.patch @@ -0,0 +1,49 @@ +diff --git a/Foundation/src/EventLogChannel.cpp b/Foundation/src/EventLogChannel.cpp +index 1f51296..c67b71b 100644 +--- a/Foundation/src/EventLogChannel.cpp ++++ b/Foundation/src/EventLogChannel.cpp +@@ -11,6 +11,7 @@ + // SPDX-License-Identifier: BSL-1.0 + // + ++#pragma comment(lib,"advapi32.lib") + + #include "Poco/EventLogChannel.h" + #include "Poco/Message.h" +diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h +index 0a222c7..0843315 100644 +--- a/Foundation/src/utils.h ++++ b/Foundation/src/utils.h +@@ -91,7 +91,7 @@ int main(int argc, char** argv) { + // + // If it prints "correct" then the architecture should be here, in the "correct" section. + #if defined(_M_X64) || defined(__x86_64__) || \ +- defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ ++ defined(__ARMEL__) || defined(_M_ARM) || defined(__arm__) || defined(__arm64__) || defined(_M_ARM64) || \ + defined(__hppa__) || defined(__ia64__) || \ + defined(__mips__) || \ + defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ +diff --git a/Net/src/Net.cpp b/Net/src/Net.cpp +index 1a75379..b4081fd 100644 +--- a/Net/src/Net.cpp ++++ b/Net/src/Net.cpp +@@ -11,6 +11,7 @@ + // SPDX-License-Identifier: BSL-1.0 + // + ++#pragma comment(lib,"advapi32.lib") + + #include "Poco/Net/Net.h" + +diff --git a/Util/src/WinRegistryKey.cpp b/Util/src/WinRegistryKey.cpp +index 7fd1a28..a07c5d2 100644 +--- a/Util/src/WinRegistryKey.cpp ++++ b/Util/src/WinRegistryKey.cpp +@@ -11,6 +11,7 @@ + // SPDX-License-Identifier: BSL-1.0 + // + ++#pragma comment(lib,"advapi32.lib") + + #include "Poco/Util/WinRegistryKey.h" + #include "Poco/Exception.h" diff --git a/externals/vcpkg/ports/poco/fix-InstallDataMysql.patch b/externals/vcpkg/ports/poco/fix-InstallDataMysql.patch new file mode 100755 index 000000000..90888df6a --- /dev/null +++ b/externals/vcpkg/ports/poco/fix-InstallDataMysql.patch @@ -0,0 +1,13 @@ +diff --git a/Data/CMakeLists.txt b/Data/CMakeLists.txt +index 9d0a85c..4f1ae21 100644 +--- a/Data/CMakeLists.txt ++++ b/Data/CMakeLists.txt +@@ -45,7 +45,7 @@ else(ENABLE_DATA_SQLITE) + message(STATUS "SQLite Support Disabled") + endif() + +-if((MYSQL_FOUND OR unofficial-libmariadb_FOUND) AND ENABLE_DATA_MYSQL) ++if((unofficial-libmysql_FOUND OR unofficial-libmariadb_FOUND) AND ENABLE_DATA_MYSQL) + message(STATUS "MySQL Support Enabled") + add_subdirectory(MySQL) + else() diff --git a/externals/vcpkg/ports/poco/fix-error-c3861.patch b/externals/vcpkg/ports/poco/fix-error-c3861.patch new file mode 100755 index 000000000..85891622c --- /dev/null +++ b/externals/vcpkg/ports/poco/fix-error-c3861.patch @@ -0,0 +1,12 @@ +diff --git a/XML/include/Poco/XML/ParserEngine.h b/XML/include/Poco/XML/ParserEngine.h +index e0c8455..363654c 100644 +--- a/XML/include/Poco/XML/ParserEngine.h ++++ b/XML/include/Poco/XML/ParserEngine.h +@@ -19,6 +19,7 @@ + + #include "Poco/XML/XML.h" + #if defined(POCO_UNBUNDLED) ++#include + #include + #else + #include "Poco/XML/expat.h" diff --git a/externals/vcpkg/ports/poco/fix-feature-sqlite3.patch b/externals/vcpkg/ports/poco/fix-feature-sqlite3.patch new file mode 100755 index 000000000..1786c1f22 --- /dev/null +++ b/externals/vcpkg/ports/poco/fix-feature-sqlite3.patch @@ -0,0 +1,13 @@ +diff --git a/Data/SQLite/cmake/PocoDataSQLiteConfig.cmake b/Data/SQLite/cmake/PocoDataSQLiteConfig.cmake +index 5478bab..c5d6d6d 100644 +--- a/Data/SQLite/cmake/PocoDataSQLiteConfig.cmake ++++ b/Data/SQLite/cmake/PocoDataSQLiteConfig.cmake +@@ -5,7 +5,7 @@ if(@POCO_UNBUNDLED@) + if(CMAKE_VERSION VERSION_LESS "3.14") + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/V313") + endif() +- find_dependency(SQLite3 REQUIRED) ++ find_dependency(unofficial-sqlite3 REQUIRED) + endif() + + include("${CMAKE_CURRENT_LIST_DIR}/PocoDataSQLiteTargets.cmake") diff --git a/externals/vcpkg/ports/poco/fix_dependency.patch b/externals/vcpkg/ports/poco/fix_dependency.patch new file mode 100755 index 000000000..4b47bfddb --- /dev/null +++ b/externals/vcpkg/ports/poco/fix_dependency.patch @@ -0,0 +1,244 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4e05272..44dd7cb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -82,8 +82,6 @@ option(FORCE_OPENSSL "Force usage of OpenSSL even under windows" OFF) + + if(ENABLE_CRYPTO OR ENABLE_NETSSL OR ENABLE_JWT) + find_package(OpenSSL REQUIRED) +-else() +- find_package(OpenSSL) + endif() + + if(OPENSSL_FOUND) +@@ -113,24 +111,19 @@ else() + option(ENABLE_APACHECONNECTOR "Enable ApacheConnector" OFF) + endif() + +-if(ENABLE_DATA_MYSQL) +- find_package(MySQL REQUIRED) +-else() +- find_package(MySQL) +-endif() ++option(ENABLE_DATA "Enable Data" OFF) ++option(ENABLE_DATA_MYSQL "Enable Data MySQL or MariaDB" OFF) + +-if(MYSQL_FOUND) +- option(ENABLE_DATA "Enable Data" ON) +- option(ENABLE_DATA_MYSQL "Enable Data MySQL or MariaDB" ON) +-else() +- option(ENABLE_DATA "Enable Data" OFF) +- option(ENABLE_DATA_MYSQL "Enable Data MySQL or MariaDB" OFF) ++if(ENABLE_DATA_MYSQL) ++ find_package(libmysql) ++ if (NOT libmysql_FOUND) ++ find_package(unofficial-libmariadb CONFIG REQUIRED) ++ set(MYSQL_LIBRARIES unofficial::libmariadb) ++ endif() + endif() + + if(ENABLE_DATA_POSTGRESQL) + find_package(PostgreSQL REQUIRED) +-else() +- find_package(PostgreSQL) + endif() + + if(PostgreSQL_FOUND) +@@ -207,6 +200,9 @@ include(DefinePlatformSpecifc) + # Collect the built libraries and include dirs, the will be used to create the PocoConfig.cmake file + set(Poco_COMPONENTS "") + ++# Do not declare the link library in the code! ++add_definitions(-DPOCO_NO_AUTOMATIC_LIBS) ++ + if(ENABLE_TESTS) + add_subdirectory(CppUnit) + set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE) +@@ -339,8 +335,11 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/Redis AND ENABLE_REDIS) + list(APPEND Poco_COMPONENTS "Redis") + endif() + +-if(EXISTS ${PROJECT_SOURCE_DIR}/PDF AND ENABLE_PDF) +- add_subdirectory(PDF) ++if(ENABLE_PDF) ++ include(SelectLibraryConfigurations) ++ find_library(PocoPDF_LIBRARY_RELEASE NAMES libhpdf) ++ find_library(PocoPDF_LIBRARY_DEBUG NAMES libhpdfd) ++ select_library_configurations(PocoPDF) + list(APPEND Poco_COMPONENTS "PDF") + endif() + +@@ -478,15 +477,6 @@ install( + Devel + ) + +-if(POCO_UNBUNDLED) +- install(FILES cmake/FindPCRE.cmake +- DESTINATION "${PocoConfigPackageLocation}") +- install(FILES cmake/V39/FindEXPAT.cmake +- DESTINATION "${PocoConfigPackageLocation}/V39") +- install(FILES cmake/V313/FindSQLite3.cmake +- DESTINATION "${PocoConfigPackageLocation}/V313") +-endif() +- + message(STATUS "CMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator") + message(STATUS "${PROJECT_NAME} package version: ${PROJECT_VERSION}") + if(BUILD_SHARED_LIBS) +diff --git a/Data/CMakeLists.txt b/Data/CMakeLists.txt +index 7d1e99e..9d0a85c 100644 +--- a/Data/CMakeLists.txt ++++ b/Data/CMakeLists.txt +@@ -45,7 +45,7 @@ else(ENABLE_DATA_SQLITE) + message(STATUS "SQLite Support Disabled") + endif() + +-if(MYSQL_FOUND AND ENABLE_DATA_MYSQL) ++if((MYSQL_FOUND OR unofficial-libmariadb_FOUND) AND ENABLE_DATA_MYSQL) + message(STATUS "MySQL Support Enabled") + add_subdirectory(MySQL) + else() +diff --git a/Data/MySQL/CMakeLists.txt b/Data/MySQL/CMakeLists.txt +index f71b145..7034974 100644 +--- a/Data/MySQL/CMakeLists.txt ++++ b/Data/MySQL/CMakeLists.txt +@@ -21,7 +21,7 @@ set_target_properties(DataMySQL + DEFINE_SYMBOL MySQL_EXPORTS + ) + +-target_link_libraries(DataMySQL PUBLIC Poco::Data MySQL::client) ++target_link_libraries(DataMySQL PUBLIC Poco::Data ${MYSQL_LIBRARIES}) + target_include_directories(DataMySQL + PUBLIC + $ +diff --git a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h +index 6ddcd39..9e50803 100644 +--- a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h ++++ b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h +@@ -57,8 +57,6 @@ + #endif + #if defined(LIBMARIADB) + #pragma comment(lib, "libmariadb") +- #else +- #pragma comment(lib, "libmysql") + #endif + #endif + +diff --git a/Data/SQLite/CMakeLists.txt b/Data/SQLite/CMakeLists.txt +index b52e2c5..0dcfae2 100644 +--- a/Data/SQLite/CMakeLists.txt ++++ b/Data/SQLite/CMakeLists.txt +@@ -7,7 +7,7 @@ file(GLOB_RECURSE HDRS_G "include/*.h") + POCO_HEADERS_AUTO(SQLITE_SRCS ${HDRS_G}) + + if(POCO_UNBUNDLED) +- find_package(SQLite3 REQUIRED) ++ find_package(unofficial-sqlite3 CONFIG REQUIRED) + else() + # sqlite3 + POCO_SOURCES(SQLITE_SRCS sqlite3 +@@ -43,7 +43,7 @@ target_include_directories(DataSQLite + ) + + if(POCO_UNBUNDLED) +- target_link_libraries(DataSQLite PUBLIC SQLite::SQLite3) ++ target_link_libraries(DataSQLite PUBLIC unofficial::sqlite3::sqlite3) + target_compile_definitions(DataSQLite PUBLIC + POCO_UNBUNDLED + SQLITE_THREADSAFE=1 +diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt +index 6f5100f..c9fa2e5 100644 +--- a/Foundation/CMakeLists.txt ++++ b/Foundation/CMakeLists.txt +@@ -35,7 +35,7 @@ POCO_MESSAGES(SRCS Logging src/pocomsg.mc) + # If POCO_UNBUNDLED is enabled we try to find the required packages + # The configuration will fail if the packages are not found + if(POCO_UNBUNDLED) +- find_package(PCRE REQUIRED) ++ find_package(unofficial-pcre CONFIG REQUIRED) + find_package(ZLIB REQUIRED) + + #HACK: Unicode.cpp requires functions from these files. The can't be taken from the library +@@ -101,7 +101,7 @@ set_target_properties(Foundation + ) + + if(POCO_UNBUNDLED) +- target_link_libraries(Foundation PUBLIC Pcre::Pcre ZLIB::ZLIB) ++ target_link_libraries(Foundation PUBLIC unofficial::pcre::pcre ZLIB::ZLIB) + target_compile_definitions(Foundation PUBLIC POCO_UNBUNDLED) + add_definitions( + -D_pcre_utf8_table1=_poco_pcre_utf8_table1 +diff --git a/Foundation/cmake/PocoFoundationConfig.cmake b/Foundation/cmake/PocoFoundationConfig.cmake +index 46c2d3f..af2e78c 100644 +--- a/Foundation/cmake/PocoFoundationConfig.cmake ++++ b/Foundation/cmake/PocoFoundationConfig.cmake +@@ -2,7 +2,7 @@ if(@POCO_UNBUNDLED@) + include(CMakeFindDependencyMacro) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") + find_dependency(ZLIB REQUIRED) +- find_dependency(PCRE REQUIRED) ++ find_dependency(unofficial-pcre REQUIRED) + endif() + + include("${CMAKE_CURRENT_LIST_DIR}/PocoFoundationTargets.cmake") +diff --git a/XML/CMakeLists.txt b/XML/CMakeLists.txt +index 4fbf06f..793285a 100644 +--- a/XML/CMakeLists.txt ++++ b/XML/CMakeLists.txt +@@ -20,7 +20,7 @@ endif() + # If POCO_UNBUNDLED is enabled we try to find the required packages + # The configuration will fail if the packages are not found + if(POCO_UNBUNDLED) +- find_package(EXPAT REQUIRED) ++ find_package(expat CONFIG REQUIRED) + else() + POCO_SOURCES(SRCS expat + src/xmlparse.cpp +@@ -50,7 +50,7 @@ target_include_directories(XML + ) + + if(POCO_UNBUNDLED) +- target_link_libraries(XML PUBLIC EXPAT::EXPAT) ++ target_link_libraries(XML PUBLIC expat::expat) + target_compile_definitions(XML PUBLIC POCO_UNBUNDLED) + else() + if(WIN32) +diff --git a/XML/cmake/PocoXMLConfig.cmake b/XML/cmake/PocoXMLConfig.cmake +index ef58207..4ed94ec 100644 +--- a/XML/cmake/PocoXMLConfig.cmake ++++ b/XML/cmake/PocoXMLConfig.cmake +@@ -4,7 +4,7 @@ if(@POCO_UNBUNDLED@) + if(CMAKE_VERSION VERSION_LESS "3.10") + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/V39") + endif() +- find_dependency(EXPAT REQUIRED) ++ find_dependency(expat CONFIG REQUIRED) + endif() + + include("${CMAKE_CURRENT_LIST_DIR}/PocoXMLTargets.cmake") +diff --git a/cmake/PocoConfig.cmake.in b/cmake/PocoConfig.cmake.in +index 173eacd..936edf4 100644 +--- a/cmake/PocoConfig.cmake.in ++++ b/cmake/PocoConfig.cmake.in +@@ -8,6 +8,13 @@ if (NOT Poco_FIND_COMPONENTS) + return() + endif() + ++include(CMakeFindDependencyMacro) ++find_dependency(ZLIB REQUIRED) ++find_dependency(unofficial-pcre REQUIRED) ++if(Poco_FIND_REQUIRED_XML) ++ find_dependency(expat CONFIG REQUIRED) ++endif() ++ + set(_Poco_FIND_PARTS_REQUIRED) + if (Poco_FIND_REQUIRED) + set(_Poco_FIND_PARTS_REQUIRED REQUIRED) +@@ -23,7 +30,7 @@ set(_Poco_NOTFOUND_MESSAGE) + + # Let components find each other, but don't overwrite CMAKE_PREFIX_PATH + set(_Poco_CMAKE_PREFIX_PATH_old ${CMAKE_PREFIX_PATH}) +-set(CMAKE_PREFIX_PATH ${_Poco_install_prefix}) ++set(CMAKE_PREFIX_PATH ${_Poco_install_prefix} ${CMAKE_PREFIX_PATH}) + + foreach(module ${Poco_FIND_COMPONENTS}) + find_package(Poco${module} diff --git a/externals/vcpkg/ports/poco/portfile.cmake b/externals/vcpkg/ports/poco/portfile.cmake new file mode 100755 index 000000000..c6c9c0f52 --- /dev/null +++ b/externals/vcpkg/ports/poco/portfile.cmake @@ -0,0 +1,111 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO pocoproject/poco + REF 9d1c428c861f2e5ccf09149bbe8d2149720c5896 # poco-1.11.2-release + SHA512 b812bb194783c94e2a048daf6659e0f0fa5e9040ebd49342a5d39636cee600754d0465f8b28725d76dcb2681d1b64dfd8b08ac9c85b95b4ac8edf9b53d68feb1 + HEAD_REF master + PATCHES + # Fix embedded copy of pcre in static linking mode + static_pcre.patch + # Add the support of arm64-windows + arm64_pcre.patch + fix_dependency.patch + fix-feature-sqlite3.patch + fix-error-c3861.patch + fix-InstallDataMysql.patch +) + +file(REMOVE "${SOURCE_PATH}/Foundation/src/pcre.h") +file(REMOVE "${SOURCE_PATH}/cmake/V39/FindEXPAT.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/V313/FindSQLite3.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/FindPCRE.cmake") +file(REMOVE "${SOURCE_PATH}/XML/src/expat_config.h") +file(REMOVE "${SOURCE_PATH}/cmake/FindMySQL.cmake") + +# define Poco linkage type +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" POCO_STATIC) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" POCO_MT) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + pdf ENABLE_PDF + netssl ENABLE_NETSSL + netssl ENABLE_NETSSL_WIN + netssl ENABLE_CRYPTO + sqlite3 ENABLE_DATA_SQLITE + postgresql ENABLE_DATA_POSTGRESQL +) + +if ("mysql" IN_LIST FEATURES OR "mariadb" IN_LIST FEATURES) + set(POCO_USE_MYSQL ON) +else() + set(POCO_USE_MYSQL OFF) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} + # force to use dependencies as external + -DPOCO_UNBUNDLED=ON + # Define linking feature + -DPOCO_STATIC=${POCO_STATIC} + -DPOCO_MT=${POCO_MT} + -DENABLE_TESTS=OFF + # Allow enabling and disabling components + # POCO_ENABLE_SQL_ODBC, POCO_ENABLE_SQL_MYSQL and POCO_ENABLE_SQL_POSTGRESQL are + # defined on the fly if the required librairies are present + -DENABLE_ENCODINGS=ON + -DENABLE_ENCODINGS_COMPILER=ON + -DENABLE_XML=ON + -DENABLE_JSON=ON + -DENABLE_MONGODB=ON + # -DPOCO_ENABLE_SQL_SQLITE=ON # SQLITE are not supported. + -DENABLE_REDIS=ON + -DENABLE_UTIL=ON + -DENABLE_NET=ON + -DENABLE_SEVENZIP=ON + -DENABLE_ZIP=ON + -DENABLE_CPPPARSER=ON + -DENABLE_POCODOC=ON + -DENABLE_PAGECOMPILER=ON + -DENABLE_PAGECOMPILER_FILE2PAGE=ON + -DPOCO_DISABLE_INTERNAL_OPENSSL=ON + -DENABLE_APACHECONNECTOR=OFF + -DENABLE_DATA_MYSQL=${POCO_USE_MYSQL} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +# Move apps to the tools folder +vcpkg_copy_tools(TOOL_NAMES cpspc f2cpsp PocoDoc tec arc AUTO_CLEAN) + +# Copy additional include files not part of any libraries +if(EXISTS "${CURRENT_PACKAGES_DIR}/include/Poco/SQL") + file(COPY "${SOURCE_PATH}/Data/include" DESTINATION "${CURRENT_PACKAGES_DIR}") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/include/Poco/SQL/MySQL") + file(COPY "${SOURCE_PATH}/Data/MySQL/include" DESTINATION "${CURRENT_PACKAGES_DIR}") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/include/Poco/SQL/ODBC") + file(COPY "${SOURCE_PATH}/Data/ODBC/include" DESTINATION "${CURRENT_PACKAGES_DIR}") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/include/Poco/SQL/PostgreSQL") + file(COPY "${SOURCE_PATH}/Data/PostgreSQL/include" DESTINATION "${CURRENT_PACKAGES_DIR}") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/libpq") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/include/Poco/SQL/SQLite") + file(COPY "${SOURCE_PATH}/Data/SQLite/include" DESTINATION "${CURRENT_PACKAGES_DIR}") +endif() + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +else() + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Poco) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/poco/static_pcre.patch b/externals/vcpkg/ports/poco/static_pcre.patch new file mode 100755 index 000000000..adfc5a7e8 --- /dev/null +++ b/externals/vcpkg/ports/poco/static_pcre.patch @@ -0,0 +1,26 @@ +diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt +index 6b276be..6f5100f 100644 +--- a/Foundation/CMakeLists.txt ++++ b/Foundation/CMakeLists.txt +@@ -103,6 +103,21 @@ set_target_properties(Foundation + if(POCO_UNBUNDLED) + target_link_libraries(Foundation PUBLIC Pcre::Pcre ZLIB::ZLIB) + target_compile_definitions(Foundation PUBLIC POCO_UNBUNDLED) ++ add_definitions( ++ -D_pcre_utf8_table1=_poco_pcre_utf8_table1 ++ -D_pcre_utf8_table1_size=_poco_pcre_utf8_table1_size ++ -D_pcre_utf8_table2=_poco_pcre_utf8_table2 ++ -D_pcre_utf8_table3=_poco_pcre_utf8_table3 ++ -D_pcre_utf8_table4=_poco_pcre_utf8_table4 ++ -D_pcre_utt_names=_poco_pcre_utt_names ++ -D_pcre_utt=_poco_pcre_utt ++ -D_pcre_utt_size=_poco_pcre_utt_size ++ -D_pcre_OP_lengths=_poco_pcre_OP_lengths ++ -D_pcre_hspace_list=_poco_pcre_hspace_list ++ -D_pcre_vspace_list=_poco_pcre_vspace_list ++ -D_pcre_ucp_gentype=_poco_pcre_ucp_gentype ++ -D_pcre_ucp_gbtable=_poco_pcre_ucp_gbtable ++ ) + endif(POCO_UNBUNDLED) + + target_include_directories(Foundation diff --git a/externals/vcpkg/ports/poco/vcpkg.json b/externals/vcpkg/ports/poco/vcpkg.json new file mode 100755 index 000000000..d4a8c97aa --- /dev/null +++ b/externals/vcpkg/ports/poco/vcpkg.json @@ -0,0 +1,62 @@ +{ + "name": "poco", + "version": "1.11.2", + "description": "Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.", + "homepage": "https://github.com/pocoproject/poco", + "license": "BSL-1.0", + "supports": "!uwp", + "dependencies": [ + "expat", + "pcre", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "features": { + "mariadb": { + "description": "MariaDB support for POCO", + "dependencies": [ + "libmariadb" + ] + }, + "mysql": { + "description": "Mysql support for POCO", + "dependencies": [ + "libmysql" + ] + }, + "netssl": { + "description": "NetSSL support for POCO", + "dependencies": [ + { + "name": "openssl", + "platform": "!windows" + } + ] + }, + "pdf": { + "description": "Haru support for POCO", + "dependencies": [ + "libharu" + ] + }, + "postgresql": { + "description": "PostgreSQL support for POCO", + "dependencies": [ + "libpqxx" + ] + }, + "sqlite3": { + "description": "Sqlite3 support for POCO", + "dependencies": [ + "sqlite3" + ] + } + } +} diff --git a/externals/vcpkg/ports/podofo/0002-HAVE_UNISTD_H.patch b/externals/vcpkg/ports/podofo/0002-HAVE_UNISTD_H.patch new file mode 100755 index 000000000..6aed4b279 --- /dev/null +++ b/externals/vcpkg/ports/podofo/0002-HAVE_UNISTD_H.patch @@ -0,0 +1,15 @@ +diff --git a/podofo_config.h.in b/podofo_config.h.in +index fea9ada..a813c7b 100644 +--- a/podofo_config.h.in ++++ b/podofo_config.h.in +@@ -59,3 +59,10 @@ + #cmakedefine PODOFO_HAVE_OPENSSL_NO_RC4 + #cmakedefine PODOFO_HAVE_LIBIDN + #cmakedefine PODOFO_HAVE_UNISTRING_LIB ++ ++/* Fix build for MacOS 10.13 */ ++#if defined(__APPLE__) && !defined(__IOS__) ++#cmakedefine01 HAVE_UNISTD_H ++#else ++#cmakedefine HAVE_UNISTD_H ++#endif diff --git a/externals/vcpkg/ports/podofo/0003-uwp_fix.patch b/externals/vcpkg/ports/podofo/0003-uwp_fix.patch new file mode 100755 index 000000000..4801447c7 --- /dev/null +++ b/externals/vcpkg/ports/podofo/0003-uwp_fix.patch @@ -0,0 +1,15 @@ +diff --git a/src/podofo/base/PdfCompilerCompat.h b/src/podofo/base/PdfCompilerCompat.h +index 146731d..7041712 100644 +--- a/src/podofo/base/PdfCompilerCompat.h ++++ b/src/podofo/base/PdfCompilerCompat.h +@@ -113,6 +113,10 @@ + #define NOMINMAX + #endif + ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) ++#include ++#endif ++ + // Integer types - fixed size types guaranteed to work anywhere + // because we detect the right underlying type name to use with + // CMake. Use typedefs rather than macros for saner error messages diff --git a/externals/vcpkg/ports/podofo/0005-fix-crypto.patch b/externals/vcpkg/ports/podofo/0005-fix-crypto.patch new file mode 100755 index 000000000..a873ee4c9 --- /dev/null +++ b/externals/vcpkg/ports/podofo/0005-fix-crypto.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f23dd5a..fd9e8ed 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -315,11 +315,12 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX) + FIND_PACKAGE(ZLIB REQUIRED) + MESSAGE("Found zlib headers in ${ZLIB_INCLUDE_DIR}, library at ${ZLIB_LIBRARIES}") + +-FIND_PACKAGE(LIBCRYPTO) ++FIND_PACKAGE(OpenSSL) + +-IF(LIBCRYPTO_FOUND) ++IF(OpenSSL_FOUND) + SET(PODOFO_HAVE_OPENSSL TRUE) +- INCLUDE_DIRECTORIES(${LIBCRYPTO_INCLUDE_DIR}) ++ LIST(APPEND OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto) ++ ADD_DEFINITIONS(-DPODOFO_HAVE_OPENSSL_1_1) + MESSAGE("Found OpenSSL's libCrypto headers in ${LIBCRYPTO_INCLUDE_DIR}, library at ${LIBCRYPTO_LIBRARIES}") + ELSE(LIBCRYPTO_FOUND) + MESSAGE("OpenSSL's libCrypto not found. Encryption support will be disabled") +@@ -396,8 +397,6 @@ ENDIF(CppUnit_FOUND) + + ENDIF(NOT PODOFO_BUILD_LIB_ONLY) + +-FIND_PACKAGE(OpenSSL) +- + FIND_PACKAGE(FREETYPE REQUIRED) + MESSAGE("Found freetype library at ${FREETYPE_LIBRARIES}, headers ${FREETYPE_INCLUDE_DIR}") + diff --git a/externals/vcpkg/ports/podofo/fix-x64-osx.patch b/externals/vcpkg/ports/podofo/fix-x64-osx.patch new file mode 100755 index 000000000..621f0f68e --- /dev/null +++ b/externals/vcpkg/ports/podofo/fix-x64-osx.patch @@ -0,0 +1,13 @@ +diff --git a/src/podofo/base/PdfDate.cpp b/src/podofo/base/PdfDate.cpp +index cefa221..75d80e4 100644 +--- a/src/podofo/base/PdfDate.cpp ++++ b/src/podofo/base/PdfDate.cpp +@@ -196,7 +196,7 @@ PdfDate::PdfDate( const PdfString & sDate ) + + strncpy(m_szDate,sDate.GetString(),PDF_DATE_BUFFER_SIZE); + +- struct tm _tm{}; ++ struct tm _tm; memset (&_tm, 0, sizeof(struct tm)); + _tm.tm_mday = 1; + + const char * pszDate = sDate.GetString(); diff --git a/externals/vcpkg/ports/podofo/freetype.patch b/externals/vcpkg/ports/podofo/freetype.patch new file mode 100755 index 000000000..f241690f7 --- /dev/null +++ b/externals/vcpkg/ports/podofo/freetype.patch @@ -0,0 +1,18 @@ +diff --git a/cmake/modules/FindFREETYPE.cmake b/cmake/modules/FindFREETYPE.cmake +index 41114798f..0911dc092 100644 +--- a/cmake/modules/FindFREETYPE.cmake ++++ b/cmake/modules/FindFREETYPE.cmake +@@ -15,9 +15,13 @@ SET(FREETYPE_FIND_QUIETLY 1) + # first we try to find ft2build.h in the new location as + # of freetype 2.5.1 + FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h ++ PATHS + /usr/include/freetype2 + /usr/local/include/freetype2 + /usr/X11/include/freetype2 ++ PATH_SUFFIXES ++ freetype2 ++ include/freetype2 + NO_CMAKE_SYSTEM_PATH + ) + diff --git a/externals/vcpkg/ports/podofo/portfile.cmake b/externals/vcpkg/ports/podofo/portfile.cmake new file mode 100755 index 000000000..b47fbaaf8 --- /dev/null +++ b/externals/vcpkg/ports/podofo/portfile.cmake @@ -0,0 +1,56 @@ +set(PODOFO_VERSION 0.9.7) + +if (VCPKG_TARGET_IS_UWP) + set(ADDITIONAL_PATCH "0003-uwp_fix.patch") +endif() + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO podofo/podofo + REF ${PODOFO_VERSION} + FILENAME "podofo-${PODOFO_VERSION}.tar.gz" + SHA512 0e699739c2fb7d4d02ffca371504bb19f3a8a97ddcbfc06f8d9636db9e73064b4f633f7f09bce92140bb2174610ad68c1e5f8460d474d176ab803ed28295251b + PATCHES + 0002-HAVE_UNISTD_H.patch + freetype.patch + ${ADDITIONAL_PATCH} + 0005-fix-crypto.patch + fix-x64-osx.patch +) + +set(PODOFO_NO_FONTMANAGER ON) +if("fontconfig" IN_LIST FEATURES) + set(PODOFO_NO_FONTMANAGER OFF) +endif() + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PODOFO_BUILD_SHARED) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PODOFO_BUILD_STATIC) + +set(IS_WIN32 OFF) +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) + set(IS_WIN32 ON) +endif() + +file(REMOVE ${SOURCE_PATH}/cmake/modules/FindOpenSSL.cmake) +file(REMOVE ${SOURCE_PATH}/cmake/modules/FindZLIB.cmake) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DPODOFO_BUILD_LIB_ONLY=1 + -DPODOFO_BUILD_SHARED=${PODOFO_BUILD_SHARED} + -DPODOFO_BUILD_STATIC=${PODOFO_BUILD_STATIC} + -DPODOFO_NO_FONTMANAGER=${PODOFO_NO_FONTMANAGER} + -DCMAKE_DISABLE_FIND_PACKAGE_FONTCONFIG=${PODOFO_NO_FONTMANAGER} + -DCMAKE_DISABLE_FIND_PACKAGE_LIBCRYPTO=${IS_WIN32} + -DCMAKE_DISABLE_FIND_PACKAGE_LIBIDN=ON + -DCMAKE_DISABLE_FIND_PACKAGE_CppUnit=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON +) + +vcpkg_install_cmake() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/podofo/vcpkg.json b/externals/vcpkg/ports/podofo/vcpkg.json new file mode 100755 index 000000000..19429b858 --- /dev/null +++ b/externals/vcpkg/ports/podofo/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "podofo", + "version": "0.9.7", + "description": "PoDoFo is a library to work with the PDF file format", + "homepage": "https://sourceforge.net/projects/podofo/", + "supports": "!uwp", + "dependencies": [ + "freetype", + "libjpeg-turbo", + "libpng", + "openssl", + "tiff", + "zlib" + ], + "features": { + "fontconfig": { + "description": "Enable font manager support on Unix platforms", + "dependencies": [ + "fontconfig" + ] + } + } +} diff --git a/externals/vcpkg/ports/poissonrecon/CMakeLists.txt b/externals/vcpkg/ports/poissonrecon/CMakeLists.txt new file mode 100755 index 000000000..31fdb0dcb --- /dev/null +++ b/externals/vcpkg/ports/poissonrecon/CMakeLists.txt @@ -0,0 +1,82 @@ +cmake_minimum_required(VERSION 3.12) + +project(PoissonRecon LANGUAGES NONE) + +set(INSTALL_BIN_DIR "bin" CACHE PATH "Path where exe and dll will be installed") +set(INSTALL_LIB_DIR "lib" CACHE PATH "Path where lib will be installed") +set(INSTALL_INCLUDE_DIR "include/${PROJECT_NAME}" CACHE PATH "Path where headers will be installed") +set(INSTALL_CMAKE_DIR "share/poissonrecon" CACHE PATH "Path where cmake configs will be installed") + +find_package(PNG REQUIRED) +find_package(JPEG REQUIRED) + +set(PoissonRecon_HEADERS +"Src/Allocator.h" +"Src/Array.h" +"Src/BinaryNode.h" +"Src/BlockedVector.h" +"Src/BSplineData.h" +"Src/CmdLineParser.h" +"Src/Factor.h" +"Src/FEMTree.h" +"Src/FunctionData.h" +"Src/Geometry.h" +"Src/Image.h" +"Src/JPEG.h" +"Src/LinearSolvers.h" +"Src/MarchingCubes.h" +"Src/MAT.h" +"Src/MyMiscellany.h" +"Src/Ply.h" +"Src/PlyFile.h" +"Src/PNG.h" +"Src/Polynomial.h" +"Src/PPolynomial.h" +"Src/PreProcessor.h" +"Src/RegularTree.h" +"Src/SparseMatrix.h" +"Src/SparseMatrixInterface.h" +"Src/Window.h" +) + +set(PoissonRecon_INLINES +"Src/Array.inl" +"Src/BMPStream.inl" +"Src/BSplineData.inl" +"Src/CmdLineParser.inl" +"Src/FEMTree.Evaluation.inl" +"Src/FEMTree.Initialize.inl" +"Src/FEMTree.inl" +"Src/FEMTree.IsoSurface.specialized.inl" +"Src/FEMTree.SortedTreeNodes.inl" +"Src/FEMTree.System.inl" +"Src/FEMTree.WeightedSamples.inl" +"Src/FunctionData.inl" +"Src/Geometry.inl" +"Src/JPEG.inl" +"Src/MAT.inl" +"Src/PlyFile.inl" +"Src/PNG.inl" +"Src/Polynomial.inl" +"Src/PPolynomial.inl" +"Src/RegularTree.inl" +"Src/SparseMatrix.inl" +"Src/SparseMatrixInterface.inl" +"Src/Window.inl" +) + +add_library(PoissonRecon INTERFACE) +target_link_libraries(PoissonRecon INTERFACE PNG::PNG JPEG::JPEG) +set_target_properties(PoissonRecon PROPERTIES PUBLIC_HEADER "${PoissonRecon_HEADERS};${PoissonRecon_INLINES}") +target_include_directories(PoissonRecon INTERFACE $) + +install(TARGETS PoissonRecon EXPORT PoissonReconTargets + RUNTIME DESTINATION "${INSTALL_BIN_DIR}" + LIBRARY DESTINATION "${INSTALL_LIB_DIR}" + ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" + PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}" +) +install(EXPORT PoissonReconTargets + NAMESPACE PoissonRecon:: + DESTINATION ${INSTALL_CMAKE_DIR} +) diff --git a/externals/vcpkg/ports/poissonrecon/disable-gcc5-checks.patch b/externals/vcpkg/ports/poissonrecon/disable-gcc5-checks.patch new file mode 100755 index 000000000..c517b3e79 --- /dev/null +++ b/externals/vcpkg/ports/poissonrecon/disable-gcc5-checks.patch @@ -0,0 +1,47 @@ +diff --git a/Src/FEMTree.WeightedSamples.inl b/Src/FEMTree.WeightedSamples.inl +index 7b0d6b4..bb3ad0f 100644 +--- a/Src/FEMTree.WeightedSamples.inl ++++ b/Src/FEMTree.WeightedSamples.inl +@@ -362,7 +362,7 @@ Real FEMTree< Dim , Real >::_splatPointData( Allocator< FEMTreeNode > *nodeAlloc + // pow( width , -dim ): So that each sample is splatted with a unit volume + V _v = v * weight / Real( pow( width , dim ) ) * dx; + // V _v = v / Length(v) * dx; +-#if defined( __GNUC__ ) && __GNUC__ < 5 ++#if defined( __GNUC__ ) && __GNUC__ < 5 && 0 + #ifdef SHOW_WARNINGS + #warning "you've got me gcc version<5" + #endif // SHOW_WARNINGS +diff --git a/Src/FEMTree.h b/Src/FEMTree.h +index 8f00045..2faa0f4 100644 +--- a/Src/FEMTree.h ++++ b/Src/FEMTree.h +@@ -231,6 +231,7 @@ template< class Data , typename Pack > struct _SparseOrDenseNodeData{}; + template< class Data , unsigned int ... FEMSigs > + struct _SparseOrDenseNodeData< Data , UIntPack< FEMSigs ... > > + { ++ virtual ~_SparseOrDenseNodeData() {} + static const unsigned int Dim = sizeof ... ( FEMSigs ); + typedef UIntPack< FEMSigs ... > FEMSignatures; + typedef Data data_type; +diff --git a/Src/FEMTree.inl b/Src/FEMTree.inl +index 814f1ae..405e996 100644 +--- a/Src/FEMTree.inl ++++ b/Src/FEMTree.inl +@@ -425,7 +425,7 @@ SparseNodeData< OutData , UIntPack< DataSigs ... > > FEMTree< Dim , Real >::setI + AddAtomic( weightSum , sample.weight ); + out *= sample.weight; + Allocator< FEMTreeNode > *nodeAllocator = nodeAllocators.size() ? nodeAllocators[ thread ] : NULL; +-#if defined( __GNUC__ ) && __GNUC__ < 5 ++#if defined( __GNUC__ ) && __GNUC__ < 5 && 0 + #ifdef SHOW_WARNINGS + #warning "you've got me gcc version<5" + #endif // SHOW_WARNINGS +@@ -436,7 +436,7 @@ SparseNodeData< OutData , UIntPack< DataSigs ... > > FEMTree< Dim , Real >::setI + else + { + Real width = (Real)( 1.0 / ( 1< +-#include "JPEG/jpeglib.h" +-#include "JPEG/jerror.h" +-#include "JPEG/jmorecfg.h" +-#else // !_WIN32 ++#endif // _WIN32 + #include + #include + #include +-#endif // _WIN32 + + struct my_error_mgr + { +--- a/Src/PNG.h ++++ b/Src/PNG.h +@@ -1,7 +1,7 @@ + #ifndef PNG_INCLUDED + #define PNG_INCLUDED + +-#include "PNG/png.h" ++#include + + struct PNGReader : public ImageReader + { +--- a/Src/PNG.inl ++++ b/Src/PNG.inl +@@ -1,10 +1,6 @@ + #include + #include +-#ifdef _WIN32 +-#include "PNG/png.h" +-#else // !_WIN32 + #include +-#endif // _WIN32 + + inline PNGReader::PNGReader( const char* fileName , unsigned int& width , unsigned int& height , unsigned int& channels ) + { diff --git a/externals/vcpkg/ports/poissonrecon/vcpkg.json b/externals/vcpkg/ports/poissonrecon/vcpkg.json new file mode 100755 index 000000000..636743e72 --- /dev/null +++ b/externals/vcpkg/ports/poissonrecon/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "poissonrecon", + "version-date": "2021-09-26", + "description": "Adaptive Multigrid Solvers", + "homepage": "https://github.com/mkazhdan/PoissonRecon", + "dependencies": [ + "libjpeg-turbo", + "libpng", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/poly2tri/CMakeLists.txt b/externals/vcpkg/ports/poly2tri/CMakeLists.txt new file mode 100755 index 000000000..d3878712a --- /dev/null +++ b/externals/vcpkg/ports/poly2tri/CMakeLists.txt @@ -0,0 +1,57 @@ +cmake_minimum_required(VERSION 3.0) + +project(poly2tri LANGUAGES C CXX) + +set(INSTALL_BIN_DIR "bin" CACHE PATH "Path where exe and dll will be installed") +set(INSTALL_LIB_DIR "lib" CACHE PATH "Path where lib will be installed") +set(INSTALL_INCLUDE_DIR "include/${PROJECT_NAME}" CACHE PATH "Path where headers will be installed") +set(INSTALL_CMAKE_DIR "share/${PROJECT_NAME}" CACHE PATH "Path where cmake configs will be installed") + +set(${PROJECT_NAME}_HEADERS + "poly2tri/poly2tri.h" +) + +set(${PROJECT_NAME}_COMMON_HEADERS + "poly2tri/common/shapes.h" + "poly2tri/common/utils.h" +) + +set(${PROJECT_NAME}_SWEEP_HEADERS + "poly2tri/sweep/advancing_front.h" + "poly2tri/sweep/cdt.h" + "poly2tri/sweep/sweep.h" + "poly2tri/sweep/sweep_context.h" +) + +set(${PROJECT_NAME}_SOURCES + "poly2tri/common/shapes.cc" + "poly2tri/sweep/advancing_front.cc" + "poly2tri/sweep/cdt.cc" + "poly2tri/sweep/sweep.cc" + "poly2tri/sweep/sweep_context.cc" +) + +add_library(${PROJECT_NAME} "${${PROJECT_NAME}_HEADERS}" "${${PROJECT_NAME}_COMMON_HEADERS}" "${${PROJECT_NAME}_SWEEP_HEADERS}" "${${PROJECT_NAME}_SOURCES}") +set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${${PROJECT_NAME}_HEADERS}") +target_include_directories(${PROJECT_NAME} PUBLIC + $ + $ + $ +) + +install(FILES ${${PROJECT_NAME}_COMMON_HEADERS} DESTINATION "${INSTALL_INCLUDE_DIR}/common") +install(FILES ${${PROJECT_NAME}_SWEEP_HEADERS} DESTINATION "${INSTALL_INCLUDE_DIR}/sweep") + +install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets + RUNTIME DESTINATION "${INSTALL_BIN_DIR}" + LIBRARY DESTINATION "${INSTALL_LIB_DIR}" + ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" + PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}" + COMPONENT dev +) + +install (EXPORT ${PROJECT_NAME}Targets + FILE ${PROJECT_NAME}Config.cmake + NAMESPACE ${PROJECT_NAME}:: + DESTINATION "${INSTALL_CMAKE_DIR}" +) diff --git a/externals/vcpkg/ports/poly2tri/fix-sweep-h-codepage.patch b/externals/vcpkg/ports/poly2tri/fix-sweep-h-codepage.patch new file mode 100755 index 000000000..6b418c364 --- /dev/null +++ b/externals/vcpkg/ports/poly2tri/fix-sweep-h-codepage.patch @@ -0,0 +1,13 @@ +diff --git a/poly2tri/sweep/sweep.h b/poly2tri/sweep/sweep.h +index f62c4cc..af8af69 100644 +--- a/poly2tri/sweep/sweep.h ++++ b/poly2tri/sweep/sweep.h +@@ -33,7 +33,7 @@ + * Zalik, B.(2008)'Sweep-line algorithm for constrained Delaunay triangulation', + * International Journal of Geographical Information Science + * +- * "FlipScan" Constrained Edge Algorithm invented by Thomas Åhlén, thahlen@gmail.com ++ * "FlipScan" Constrained Edge Algorithm invented by Thomas, thahlen@gmail.com + */ + + #ifndef SWEEP_H diff --git a/externals/vcpkg/ports/poly2tri/portfile.cmake b/externals/vcpkg/ports/poly2tri/portfile.cmake new file mode 100755 index 000000000..22c463c17 --- /dev/null +++ b/externals/vcpkg/ports/poly2tri/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO greenm01/poly2tri + REF 88de49021b6d9bef6faa1bc94ceb3fbd85c3c204 + SHA512 fa256bcf923ad59f42205edf5a7e07cac6cbd9a37cefb9a0961a2e06aea7fa8ffd09d4e26154c0028601c12804483842cb935d9f602385f5f203c9628382c4fb + HEAD_REF master + PATCHES + fix-sweep-h-codepage.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/poly2tri/vcpkg.json b/externals/vcpkg/ports/poly2tri/vcpkg.json new file mode 100755 index 000000000..c8b963097 --- /dev/null +++ b/externals/vcpkg/ports/poly2tri/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "poly2tri", + "version-string": "2020-07-21", + "port-version": 2, + "description": "The Clipper library performs clipping and offsetting for both lines and polygons. All four boolean clipping operations are supported - intersection, union, difference and exclusive-or. Polygons can be of any shape including self-intersecting polygons.", + "homepage": "https://github.com/greenm01/poly2tri", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/polyclipping/FindCLIPPER.cmake b/externals/vcpkg/ports/polyclipping/FindCLIPPER.cmake new file mode 100755 index 000000000..5a1fcab34 --- /dev/null +++ b/externals/vcpkg/ports/polyclipping/FindCLIPPER.cmake @@ -0,0 +1,45 @@ +# Distributed under the OSI-approved BSD 3-Clause License. + +#.rst: +# FindCLIPPER +# -------- +# +# Result Variables +# ^^^^^^^^^^^^^^^^ +# +# This module will set the following variables in your project:: +# +# ``CLIPPER_FOUND`` +# True if CLIPPER found on the local system +# +# ``CLIPPER_INCLUDE_DIRS`` +# Location of CLIPPER header files. +# +# ``CLIPPER_LIBRARIES`` +# The clipper libraries. +# + +include(FindPackageHandleStandardArgs) +include(SelectLibraryConfigurations) + +if(NOT CLIPPER_INCLUDE_DIR) + find_path(CLIPPER_INCLUDE_DIR clipper.hpp + PATH_SUFFIXES polyclipping) +endif() + +if(NOT CLIPPER_LIBRARY) + find_library(CLIPPER_LIBRARY_RELEASE NAMES polyclipping PATHS "${CMAKE_CURRENT_LIST_DIR}/../../lib" NO_DEFAULT_PATH) + find_library(CLIPPER_LIBRARY_DEBUG NAMES polyclipping PATHS "${CMAKE_CURRENT_LIST_DIR}/../../debug/lib" NO_DEFAULT_PATH) + select_library_configurations(CLIPPER) +endif() + +mark_as_advanced(CLIPPER_LIBRARY CLIPPER_INCLUDE_DIR) + +find_package_handle_standard_args(CLIPPER + REQUIRED_VARS CLIPPER_LIBRARY CLIPPER_INCLUDE_DIR +) + +if(CLIPPER_FOUND) + set(CLIPPER_LIBRARIES ${CLIPPER_LIBRARY}) + set(CLIPPER_INCLUDE_DIRS ${CLIPPER_INCLUDE_DIR}) +endif() diff --git a/externals/vcpkg/ports/polyclipping/fix_targets.patch b/externals/vcpkg/ports/polyclipping/fix_targets.patch new file mode 100755 index 000000000..ebae8f69b --- /dev/null +++ b/externals/vcpkg/ports/polyclipping/fix_targets.patch @@ -0,0 +1,17 @@ +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index f0ed7e8..a5ed444 100644 +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -19,3 +19,12 @@ INSTALL (TARGETS polyclipping LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") + INSTALL (FILES "${PCFILE}" DESTINATION "${CMAKE_INSTALL_PKGCONFIGDIR}") + + SET_TARGET_PROPERTIES(polyclipping PROPERTIES VERSION 22.0.0 SOVERSION 22 ) ++ ++install(TARGETS polyclipping EXPORT polyclippingConfig) ++ ++install( ++ EXPORT polyclippingConfig ++ NAMESPACE polyclipping:: ++ DESTINATION share/polyclipping ++) ++target_include_directories(polyclipping PUBLIC $) diff --git a/externals/vcpkg/ports/polyclipping/portfile.cmake b/externals/vcpkg/ports/polyclipping/portfile.cmake new file mode 100755 index 000000000..260fb93df --- /dev/null +++ b/externals/vcpkg/ports/polyclipping/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO polyclipping + FILENAME "clipper_ver6.4.2.zip" + NO_REMOVE_ONE_LEVEL + SHA512 ffc88818c44a38aa278d5010db6cfd505796f39664919f1e48c7fa9267563f62135868993e88f7246dcd688241d1172878e4a008a390648acb99738452e3e5dd + PATCHES + fix_targets.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/cpp + PREFER_NINJA +) + + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +endif() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/FindCLIPPER.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/clipper) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/clipper) + +file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/polyclipping/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/polyclipping/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..bd8934208 --- /dev/null +++ b/externals/vcpkg/ports/polyclipping/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,10 @@ +list(REMOVE_ITEM ARGS "NO_MODULE") +list(REMOVE_ITEM ARGS "CONFIG") +list(REMOVE_ITEM ARGS "MODULE") + +set(clipper_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) + +_find_package(${ARGS}) + +set(CMAKE_MODULE_PATH ${clipper_PREV_MODULE_PATH}) diff --git a/externals/vcpkg/ports/polyclipping/vcpkg.json b/externals/vcpkg/ports/polyclipping/vcpkg.json new file mode 100755 index 000000000..195a0ae4d --- /dev/null +++ b/externals/vcpkg/ports/polyclipping/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "polyclipping", + "version-string": "6.4.2", + "port-version": 10, + "description": "The Clipper library performs clipping and offsetting for both lines and polygons. All four boolean clipping operations are supported - intersection, union, difference and exclusive-or. Polygons can be of any shape including self-intersecting polygons.", + "homepage": "https://sourceforge.net/projects/polyclipping/" +} diff --git a/externals/vcpkg/ports/polyhook2/portfile.cmake b/externals/vcpkg/ports/polyhook2/portfile.cmake new file mode 100755 index 000000000..25ae59786 --- /dev/null +++ b/externals/vcpkg/ports/polyhook2/portfile.cmake @@ -0,0 +1,46 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO stevemk14ebr/PolyHook_2_0 + REF 750e78f8d7ebfc291e1c0dce3a0763c3a4b86737 + SHA512 c542288cfde258bcb54960593f2b596b6a967cf128a691e4b8ad699127567c58dc55ce2bbf21f4d3ccbaa2d794bcacd3540503b039ee58c614a854f13d51d30e + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + capstone POLYHOOK_DISASM_CAPSTONE + zydis POLYHOOK_DISASM_ZYDIS + exception POLYHOOK_FEATURE_EXCEPTION + detours POLYHOOK_FEATURE_DETOURS + inlinentd POLYHOOK_FEATURE_INLINENTD + pe POLYHOOK_FEATURE_PE + virtuals POLYHOOK_FEATURE_VIRTUALS +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIB) + +if (VCPKG_CRT_LINKAGE STREQUAL "static") + set(BUILD_STATIC_RUNTIME ON) +else() + set(BUILD_STATIC_RUNTIME OFF) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} + -DPOLYHOOK_BUILD_SHARED_LIB=${BUILD_SHARED_LIB} + -DPOLYHOOK_BUILD_STATIC_RUNTIME=${BUILD_STATIC_RUNTIME} + -DPOLYHOOK_USE_EXTERNAL_ASMJIT=ON + -DPOLYHOOK_USE_EXTERNAL_CAPSTONE=ON + -DPOLYHOOK_USE_EXTERNAL_ZYDIS=ON +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME PolyHook_2 CONFIG_PATH lib/PolyHook_2) + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/polyhook2/vcpkg.json b/externals/vcpkg/ports/polyhook2/vcpkg.json new file mode 100755 index 000000000..3e1c552d8 --- /dev/null +++ b/externals/vcpkg/ports/polyhook2/vcpkg.json @@ -0,0 +1,64 @@ +{ + "name": "polyhook2", + "version-date": "2022-03-01", + "description": "C++17, x86/x64 Hooking Library v2.0", + "homepage": "https://github.com/stevemk14ebr/PolyHook_2_0", + "license": "MIT", + "supports": "!(arm | uwp | linux | osx)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "capstone", + "detours", + "exception", + "inlinentd", + "pe", + "virtuals", + "zydis" + ], + "features": { + "capstone": { + "description": "Capstone disassembler integration.", + "dependencies": [ + { + "name": "capstone", + "features": [ + "x86" + ] + } + ] + }, + "detours": { + "description": "Implement detour functionality" + }, + "exception": { + "description": "Implement all exception hooking functionality" + }, + "inlinentd": { + "description": "Support inline hooks without specifying typedefs by generating callback stubs at runtime with AsmJit", + "dependencies": [ + "asmjit" + ] + }, + "pe": { + "description": "Implement all win pe hooking functionality" + }, + "virtuals": { + "description": "Implement all virtual table hooking functionality" + }, + "zydis": { + "description": "Zydis disassembler integration.", + "dependencies": [ + "zydis" + ] + } + } +} diff --git a/externals/vcpkg/ports/polymorphic-value/portfile.cmake b/externals/vcpkg/ports/polymorphic-value/portfile.cmake new file mode 100755 index 000000000..56c665a55 --- /dev/null +++ b/externals/vcpkg/ports/polymorphic-value/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jbcoe/polymorphic_value + REF 8b386a006c68c25c8f8c119c1f9620a916fb5afc #v1.3.0 + SHA512 4b131b5d7c86d589418d85f25afcee70ceb48c11d2ea807ef0e97667ba273ee27659ebf95a2a7aefb6379e43bb8e5f3c25d7921cfa348ca53db4b56a5336933c + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/polymorphic_value) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/externals/vcpkg/ports/polymorphic-value/vcpkg.json b/externals/vcpkg/ports/polymorphic-value/vcpkg.json new file mode 100755 index 000000000..8604b7400 --- /dev/null +++ b/externals/vcpkg/ports/polymorphic-value/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "polymorphic-value", + "version": "1.3.0", + "port-version": 3, + "description": "A polymorphic value-type for C++", + "homepage": "https://github.com/jbcoe/polymorphic_value", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ponder/github-121.patch b/externals/vcpkg/ports/ponder/github-121.patch new file mode 100755 index 000000000..e7564429d --- /dev/null +++ b/externals/vcpkg/ports/ponder/github-121.patch @@ -0,0 +1,21 @@ +From 83b292f263b92082e981a82f5777d927a61772ee Mon Sep 17 00:00:00 2001 +From: Cheney-Wang +Date: Fri, 13 Mar 2020 02:50:33 -0700 +Subject: [PATCH] Include in config.h + +--- + include/ponder/config.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/ponder/config.hpp b/include/ponder/config.hpp +index cd035c19..814403cd 100644 +--- a/include/ponder/config.hpp ++++ b/include/ponder/config.hpp +@@ -60,6 +60,7 @@ + #if defined(_MSC_VER) + #pragma warning(disable: 4275) // non dll-interface class 'X' used as base for dll-interface class 'Y' + #pragma warning(disable: 4251) // class 'X' needs to have dll-interface to be used by clients of class 'Y' ++ #include //In future MSVC, doesn't transitively , ponder will compile failed with error C2027 and C2065, so add for fixing these issues. + #endif + + #if defined(__GNUC__) && __GNUC__ <= 4 && __GNUC_MINOR__ < 9 diff --git a/externals/vcpkg/ports/ponder/no-install-unused.patch b/externals/vcpkg/ports/ponder/no-install-unused.patch new file mode 100755 index 000000000..e540dd909 --- /dev/null +++ b/externals/vcpkg/ports/ponder/no-install-unused.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 091f56d..715f86e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -325,14 +325,14 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PonderConfig.cmake ${CMAKE_CURRENT_BIN + COMPONENT devel + ) + +-install(FILES README.md COPYING.txt +- DESTINATION ${INSTALL_MISC_DIR} +-) +- +-install(DIRECTORY cmake +- DESTINATION ${INSTALL_MISC_DIR} +- COMPONENT utils +-) ++#install(FILES README.md COPYING.txt ++# DESTINATION ${INSTALL_MISC_DIR} ++#) ++ ++#install(DIRECTORY cmake ++# DESTINATION ${INSTALL_MISC_DIR} ++# COMPONENT utils ++#) + + ############################### + # packaging diff --git a/externals/vcpkg/ports/ponder/portfile.cmake b/externals/vcpkg/ports/ponder/portfile.cmake new file mode 100755 index 000000000..94eede7e6 --- /dev/null +++ b/externals/vcpkg/ports/ponder/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO billyquith/ponder + REF 3.0.0 + SHA512 b6ba1ce9fa0584b16085c56afb70e31f204a66b57193c1a4225bfe18abbda561bb71b3279dd0a4f1b21867b985ef5ce78c8e360f3fc654c61ce61c44d35c5f38 + HEAD_REF master + PATCHES + no-install-unused.patch + github-121.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DUSES_RAPIDJSON=OFF + -DUSES_RAPIDXML=OFF + -DBUILD_TEST=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/${PORT}/cmake) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/lib/${PORT}" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/${PORT}/config.hpp" "ifndef PONDER_STATIC" "if 0 //ifndef PONDER_STATIC") +endif() + +# Handle copyright +configure_file("${SOURCE_PATH}/COPYING.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) + diff --git a/externals/vcpkg/ports/ponder/vcpkg.json b/externals/vcpkg/ports/ponder/vcpkg.json new file mode 100755 index 000000000..bd06df5b8 --- /dev/null +++ b/externals/vcpkg/ports/ponder/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "ponder", + "version-string": "3.0.0", + "port-version": 4, + "description": "A C++ multi-purpose reflection library.", + "homepage": "https://github.com/billyquith/ponder", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/poppler/cmake-project-include.cmake b/externals/vcpkg/ports/poppler/cmake-project-include.cmake new file mode 100755 index 000000000..8e9d1db25 --- /dev/null +++ b/externals/vcpkg/ports/poppler/cmake-project-include.cmake @@ -0,0 +1,29 @@ +if("${FONT_CONFIGURATION}" STREQUAL "fontconfig") + # Poppler uses different variable names than CMake. + find_package(Fontconfig REQUIRED) + set(FONTCONFIG_DEFINITIONS "") + set(FONTCONFIG_INCLUDE_DIR "${Fontconfig_INCLUDE_DIRS}") + set(FONTCONFIG_LIBRARIES "Fontconfig::Fontconfig") +endif() + +# Poppler uses different variable names than CMake, +# plus ICONV_SECOND_ARGUMENT_IS_CONST +find_package(Iconv REQUIRED) +set(ICONV_INCLUDE_DIR "${Iconv_INCLUDE_DIR}") +set(ICONV_LIBRARIES "${Iconv_LIBRARIES}") + +# Create helper file for iconv usage requirement +set(poppler_iconv [[ +Name: poppler-vcpkg-iconv +Description: iconv linking requirements for poppler +Version: 0 +Libs:]]) +string(TOLOWER "${Iconv_LIBRARIES}" iconv_libraries) +if(iconv_libraries MATCHES "iconv") + string(APPEND poppler_iconv " -liconv") +endif() +if(iconv_libraries MATCHES "charset") + string(APPEND poppler_iconv " -lcharset") +endif() +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/poppler-vcpkg-iconv.pc" "${poppler_iconv}") +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/poppler-vcpkg-iconv.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") diff --git a/externals/vcpkg/ports/poppler/export-unofficial-poppler.patch b/externals/vcpkg/ports/poppler/export-unofficial-poppler.patch new file mode 100755 index 000000000..c818e8ff2 --- /dev/null +++ b/externals/vcpkg/ports/poppler/export-unofficial-poppler.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9a0dcb1..c1f2f02 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -585,9 +585,16 @@ if(MINGW AND BUILD_SHARED_LIBS) + set_target_properties(poppler PROPERTIES SUFFIX "-${POPPLER_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") + endif() + target_link_libraries(poppler LINK_PRIVATE ${poppler_LIBS}) +-install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++target_include_directories(poppler PUBLIC $) ++set_target_properties(poppler PROPERTIES EXPORT_NAME poppler-private) ++install(TARGETS poppler EXPORT unofficial-poppler-targets RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(EXPORT unofficial-poppler-targets NAMESPACE unofficial::poppler:: DESTINATION share/unofficial-poppler) + + if(ENABLE_UNSTABLE_API_ABI_HEADERS) ++ target_include_directories(poppler PUBLIC ++ $ ++ $ ++ ) + install(FILES + poppler/Annot.h + poppler/AnnotStampImageHelper.h +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index c37936b..344933c 100644 +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -32,7 +32,8 @@ if(MINGW AND BUILD_SHARED_LIBS) + set_target_properties(poppler-cpp PROPERTIES SUFFIX "-${POPPLER_CPP_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") + endif() + target_link_libraries(poppler-cpp poppler ${ICONV_LIBRARIES}) +-install(TARGETS poppler-cpp RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(TARGETS poppler-cpp EXPORT unofficial-poppler-cpp-targets RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(EXPORT unofficial-poppler-cpp-targets NAMESPACE unofficial::poppler:: DESTINATION share/unofficial-poppler) + + install(FILES + poppler-destination.h diff --git a/externals/vcpkg/ports/poppler/portfile.cmake b/externals/vcpkg/ports/poppler/portfile.cmake new file mode 100755 index 000000000..3ae105866 --- /dev/null +++ b/externals/vcpkg/ports/poppler/portfile.cmake @@ -0,0 +1,76 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH SOURCE_PATH + REPO poppler/poppler + REF poppler-22.03.0 + SHA512 0229e50bbf21154f398480730649fd15ca37c7edae5abd63ed41ab722852d09e4dc2b9df66b13b1cfe3e7a0da945916e1bd39c75c4879ded2759eb465f69424a + HEAD_REF master + PATCHES + export-unofficial-poppler.patch +) +file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindFontconfig.cmake") + +set(POPPLER_PC_REQUIRES "freetype2 libjpeg libopenjp2 libpng libtiff-4 poppler-vcpkg-iconv") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cairo WITH_Cairo + curl ENABLE_LIBCURL + private-api ENABLE_UNSTABLE_API_ABI_HEADERS + zlib ENABLE_ZLIB +) +if("fontconfig" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS "-DFONT_CONFIGURATION=fontconfig") + string(APPEND POPPLER_PC_REQUIRES " fontconfig") +elseif(VCPKG_TARGET_IS_WINDOWS) + list(APPEND FEATURE_OPTIONS "-DFONT_CONFIGURATION=win32") +else() + list(APPEND FEATURE_OPTIONS "-DFONT_CONFIGURATION=generic") +endif() +if("cairo" IN_LIST FEATURES) + string(APPEND POPPLER_PC_REQUIRES " cairo") +endif() +if("curl" IN_LIST FEATURES) + string(APPEND POPPLER_PC_REQUIRES " libcurl") +endif() +if("zlib" IN_LIST FEATURES) + string(APPEND POPPLER_PC_REQUIRES " zlib") +endif() + +vcpkg_find_acquire_program(PKGCONFIG) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" + -DBUILD_GTK_TESTS=OFF + -DBUILD_QT5_TESTS=OFF + -DBUILD_QT6_TESTS=OFF + -DBUILD_CPP_TESTS=OFF + -DBUILD_MANUAL_TESTS=OFF + -DENABLE_UTILS=OFF + -DENABLE_GLIB=OFF + -DENABLE_GOBJECT_INTROSPECTION=OFF + -DENABLE_QT5=OFF + -DENABLE_QT6=OFF + -DENABLE_CMS=none + -DRUN_GPERF_IF_PRESENT=OFF + -DENABLE_RELOCATABLE=OFF # https://gitlab.freedesktop.org/poppler/poppler/-/issues/1209 + -DWITH_NSS3=OFF + ${FEATURE_OPTIONS} +) +vcpkg_cmake_install() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-poppler-config.cmake" "${CURRENT_PACKAGES_DIR}/share/unofficial-poppler/unofficial-poppler-config.cmake" @ONLY) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-poppler) + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/poppler.pc" "Libs:" "Requires.private: ${POPPLER_PC_REQUIRES}\nLibs:") +if(NOT DEFINED VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/poppler.pc" "Libs:" "Requires.private: ${POPPLER_PC_REQUIRES}\nLibs:") +endif() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/poppler/unofficial-poppler-config.cmake b/externals/vcpkg/ports/poppler/unofficial-poppler-config.cmake new file mode 100755 index 000000000..ccbef6a08 --- /dev/null +++ b/externals/vcpkg/ports/poppler/unofficial-poppler-config.cmake @@ -0,0 +1,22 @@ +include(CMakeFindDependencyMacro) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0057 NEW) +set(features "@FEATURES@") +find_dependency(Boost) +if("fontconfig" IN_LIST features) + find_dependency(Fontconfig) # CMake 3.14 +endif() +find_dependency(Freetype) +find_dependency(JPEG) +find_dependency(PNG) +find_dependency(TIFF) +find_dependency(OpenJPEG CONFIG) +if("curl" IN_LIST features) + find_dependency(CURL) +endif() +if("zlib" IN_LIST features) + find_dependency(ZLIB) +endif() +find_dependency(Iconv) # CMake 3.11 +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-poppler-targets.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-poppler-cpp-targets.cmake") diff --git a/externals/vcpkg/ports/poppler/usage b/externals/vcpkg/ports/poppler/usage new file mode 100755 index 000000000..1c3ed1b2d --- /dev/null +++ b/externals/vcpkg/ports/poppler/usage @@ -0,0 +1,6 @@ +The package poppler can be imported via CMake FindPkgConfig module: + + find_package(PkgConfig) + pkg_check_modules(POPPLER_CPP REQUIRED IMPORTED_TARGET poppler-cpp) + + target_link_libraries(main PRIVATE PkgConfig::POPPLER_CPP) diff --git a/externals/vcpkg/ports/poppler/vcpkg.json b/externals/vcpkg/ports/poppler/vcpkg.json new file mode 100755 index 000000000..f1a3be54c --- /dev/null +++ b/externals/vcpkg/ports/poppler/vcpkg.json @@ -0,0 +1,83 @@ +{ + "name": "poppler", + "version": "22.3.0", + "port-version": 1, + "description": "A PDF rendering library", + "homepage": "https://poppler.freedesktop.org/", + "license": "GPL-2.0-or-later", + "supports": "!uwp", + "dependencies": [ + "boost-container", + "boost-move", + "freetype", + "libiconv", + "libjpeg-turbo", + "libpng", + "openjpeg", + "tiff", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "font-configuration", + "zlib" + ], + "features": { + "cairo": { + "description": "Enable the Cairo graphics backend", + "dependencies": [ + { + "name": "cairo", + "default-features": false + } + ] + }, + "curl": { + "description": "curl for poppler", + "dependencies": [ + { + "name": "curl", + "default-features": false + } + ] + }, + "font-configuration": { + "description": "Defaut font configuration backend", + "dependencies": [ + { + "name": "poppler", + "default-features": false, + "features": [ + "fontconfig" + ], + "platform": "!windows & !android" + } + ] + }, + "fontconfig": { + "description": "Use fontconfig", + "supports": "!windows, mingw", + "dependencies": [ + "fontconfig" + ] + }, + "private-api": { + "description": "Install headers for private API (aka unstable API/ABI headers)" + }, + "splash": { + "description": "The splash backend is always enabled. This option is kept for compatibility." + }, + "zlib": { + "description": "zlib for poppler", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/popsift/fix_missing_thrust_include.patch b/externals/vcpkg/ports/popsift/fix_missing_thrust_include.patch new file mode 100755 index 000000000..69138afb5 --- /dev/null +++ b/externals/vcpkg/ports/popsift/fix_missing_thrust_include.patch @@ -0,0 +1,21 @@ +From 273adb1c375b12f285694488280e04efd251a76a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Sch=C3=B6ps?= +Date: Sat, 28 Aug 2021 16:52:25 +0200 +Subject: [PATCH] Add missing thrust include + +--- + src/popsift/s_filtergrid.cu | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/popsift/s_filtergrid.cu b/src/popsift/s_filtergrid.cu +index 078eb114..301c6a96 100644 +--- a/src/popsift/s_filtergrid.cu ++++ b/src/popsift/s_filtergrid.cu +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/externals/vcpkg/ports/popsift/portfile.cmake b/externals/vcpkg/ports/popsift/portfile.cmake new file mode 100755 index 000000000..5bd1c9f45 --- /dev/null +++ b/externals/vcpkg/ports/popsift/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO alicevision/popsift + REF v0.9 + SHA512 56789520872203eea86e07e8210e00c0b67d85486af16df9d620b1aff10f8d9ef5d910cf1dda6c68af7ca2ed11658ab5414ac79117b543f91a7d8d6a96a17ce0 + HEAD_REF develop + PATCHES + fix_missing_thrust_include.patch +) + +include("${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake") +vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + apps PopSift_BUILD_EXAMPLES +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS ${FEATURE_OPTIONS} + -DCUDA_TOOLKIT_ROOT_DIR=${CUDA_TOOLKIT_ROOT} +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/PopSift) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +# copy the apps in tools directory +if ("apps" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES popsift-demo AUTO_CLEAN) +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/popsift/vcpkg.json b/externals/vcpkg/ports/popsift/vcpkg.json new file mode 100755 index 000000000..ddff79339 --- /dev/null +++ b/externals/vcpkg/ports/popsift/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "popsift", + "version": "0.9", + "port-version": 3, + "description": "PopSift is an implementation of the SIFT algorithm in CUDA.", + "homepage": "https://github.com/alicevision/popsift", + "supports": "!(uwp | arm | arm64 | android | x86)", + "dependencies": [ + "cuda" + ], + "features": { + "apps": { + "description": "Application programs for popsift (detection and matching)", + "dependencies": [ + "boost-algorithm", + "boost-filesystem", + "boost-program-options", + "boost-system" + ] + } + } +} diff --git a/externals/vcpkg/ports/portable-snippets/CMakeLists.txt b/externals/vcpkg/ports/portable-snippets/CMakeLists.txt new file mode 100755 index 000000000..5f511265a --- /dev/null +++ b/externals/vcpkg/ports/portable-snippets/CMakeLists.txt @@ -0,0 +1,96 @@ +cmake_minimum_required(VERSION 3.14) + +project(portable-snippets LANGUAGES C) + +include(GNUInstallDirs) + +option(PSNIP_INSTALL_HEADERS "Install header files" ON) + +# https://stackoverflow.com/questions/7787823/cmake-how-to-get-the-name-of-all-subdirectories-of-a-directory +function (list_subdir output_variable path) + file(GLOB sub_entries RELATIVE ${path} ${path}/*) + + set(dirlist "") + + foreach (entry ${sub_entries}) + if (IS_DIRECTORY ${path}/${entry}) + list(APPEND dirlist ${entry}) + endif () + endforeach () + + set(${output_variable} ${dirlist} PARENT_SCOPE) +endfunction () + +function (check_if_header_only output_variable files) + set(is_header_only 1) + + foreach (entry ${files}) + get_filename_component(file_ext ${entry} EXT) + if (file_ext STREQUAL .c) + set(is_header_only 0) + endif () + endforeach () + + set(${output_variable} ${is_header_only} PARENT_SCOPE) +endfunction () + +list_subdir(subdirs ${CMAKE_CURRENT_LIST_DIR}) +list(REMOVE_ITEM subdirs tests) + +set(namespace unofficial::portable-snippets) + +foreach (subdir ${subdirs}) + set(module ${subdir}) + set(module_path "${CMAKE_CURRENT_LIST_DIR}/${subdir}") + + file(GLOB entries + LIST_DIRECTORIES false + ${module_path}/*.h + ${module_path}/*.c + ) + + check_if_header_only(header_only "${entries}") + + if (header_only) + add_library(${module} INTERFACE) + + target_include_directories( + ${module} + INTERFACE + $ + ) + else () + add_library(${module} STATIC ${entries}) + + set_target_properties( + ${module} + PROPERTIES + PREFIX "" + OUTPUT_NAME "psnip-${module}" + ) + + target_include_directories( + ${module} + PUBLIC + $ + $ + ) + + list(FILTER entries EXCLUDE REGEX "\.c$") + endif () + + add_library(${namespace}::${module} ALIAS ${module}) + + if (PSNIP_INSTALL_HEADERS) + install(FILES ${entries} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${subdir}) + endif () + + install(TARGETS ${module} EXPORT unofficial-portable-snippets-config) +endforeach () + +install( + EXPORT unofficial-portable-snippets-config + NAMESPACE ${namespace}:: + DESTINATION share/unofficial-portable-snippets + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +) diff --git a/externals/vcpkg/ports/portable-snippets/portfile.cmake b/externals/vcpkg/ports/portable-snippets/portfile.cmake new file mode 100755 index 000000000..197008c3e --- /dev/null +++ b/externals/vcpkg/ports/portable-snippets/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nemequ/portable-snippets + REF 26496acb37ab46ee249ea19d45381da6955d89c4 + SHA512 6213b22e4358b06f92396731d94fd27d4cf3568a47c56c057174c1839929c6a569ad5b1e1302fe0d092c4f393c570607b96e9e977223f86a9e3c2862010f3af0 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DPSNIP_INSTALL_HEADERS=OFF + OPTIONS_RELEASE + -DPSNIP_INSTALL_HEADERS=ON +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) + +# Handle copyright +configure_file(${SOURCE_PATH}/COPYING.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/portable-snippets/vcpkg.json b/externals/vcpkg/ports/portable-snippets/vcpkg.json new file mode 100755 index 000000000..f10854b20 --- /dev/null +++ b/externals/vcpkg/ports/portable-snippets/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "portable-snippets", + "version-date": "2019-09-20", + "port-version": 2, + "description": "Collection of miscellaneous portable C snippets", + "homepage": "https://github.com/nemequ/portable-snippets", + "license": null, + "supports": "!(arm & osx)" +} diff --git a/externals/vcpkg/ports/portaudio/fix-library-can-not-be-found.patch b/externals/vcpkg/ports/portaudio/fix-library-can-not-be-found.patch new file mode 100755 index 000000000..7ef3e581d --- /dev/null +++ b/externals/vcpkg/ports/portaudio/fix-library-can-not-be-found.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 122fe93..b571c38 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -360,11 +360,6 @@ ENDIF() + # embedded builds this is not an issue as they will only build the configuration + # used in the host application. + MARK_AS_ADVANCED(PA_LIBNAME_ADD_SUFFIX) +-IF(MSVC AND PA_BUILD_STATIC AND PA_BUILD_SHARED AND NOT PA_LIBNAME_ADD_SUFFIX) +- MESSAGE(WARNING "Building both shared and static libraries, and avoiding the suffix _static will lead to a name conflict") +- SET(PA_LIBNAME_ADD_SUFFIX ON CACHE BOOL "Forcing use of suffix _static to avoid name conflict between static and import library" FORCE) +- MESSAGE(WARNING "PA_LIBNAME_ADD_SUFFIX was set to ON") +-ENDIF() + + SET(PA_TARGETS "") + diff --git a/externals/vcpkg/ports/portaudio/portfile.cmake b/externals/vcpkg/ports/portaudio/portfile.cmake new file mode 100755 index 000000000..f80cace79 --- /dev/null +++ b/externals/vcpkg/ports/portaudio/portfile.cmake @@ -0,0 +1,45 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO PortAudio/portaudio + REF 147dd722548358763a8b649b3e4b41dfffbcfbb6 + SHA512 0f56e5f5b004f51915f29771b8fc1fe886f1fef5d65ab5ea1db43f43c49917476b9eec14b36aa54d3e9fb4d8bdf61e68c79624d00b7e548d4c493395a758233a + PATCHES + fix-library-can-not-be-found.patch +) + +string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} dynamic PA_BUILD_SHARED) +string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} static PA_BUILD_STATIC) + +# NOTE: the ASIO backend will be built automatically if the ASIO-SDK is provided +# in a sibling folder of the portaudio source in vcpkg/buildtrees/portaudio/src +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DPA_USE_DS=ON + -DPA_USE_WASAPI=ON + -DPA_USE_WDMKS=ON + -DPA_USE_WMME=ON + -DPA_LIBNAME_ADD_SUFFIX=OFF + -DPA_BUILD_SHARED=${PA_BUILD_SHARED} + -DPA_BUILD_STATIC=${PA_BUILD_STATIC} + -DPA_DLL_LINK_WITH_STATIC_RUNTIME=OFF + OPTIONS_DEBUG + -DPA_ENABLE_DEBUG_OUTPUT:BOOL=ON +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/portaudio/vcpkg.json b/externals/vcpkg/ports/portaudio/vcpkg.json new file mode 100755 index 000000000..581b35543 --- /dev/null +++ b/externals/vcpkg/ports/portaudio/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "portaudio", + "version": "19.7", + "port-version": 3, + "description": "PortAudio Portable Cross-platform Audio I/O API PortAudio is a free, cross-platform, open-source, audio I/O library. It lets you write simple audio programs in 'C' or C++ that will compile and run on many platforms including Windows, Macintosh OS X, and Unix (OSS/ALSA). It is intended to promote the exchange of audio software between developers on different platforms. Many applications use PortAudio for Audio I/O.", + "homepage": "http://www.portaudio.com", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/portmidi/portfile.cmake b/externals/vcpkg/ports/portmidi/portfile.cmake new file mode 100755 index 000000000..c6dd12b1c --- /dev/null +++ b/externals/vcpkg/ports/portmidi/portfile.cmake @@ -0,0 +1,16 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO PortMidi/portmidi + REF v2.0.2 + SHA512 36c43dc1f8b304c36de1c4672b8d2abe67c72dd8ea46044ebd479896a0e346f00207d4483e08701a04cdf3f342790c874f8a1c07d71d5d55d763bf97a1276021 + HEAD_REF master +) + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() + +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/PortMidi) + +file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/externals/vcpkg/ports/portmidi/vcpkg.json b/externals/vcpkg/ports/portmidi/vcpkg.json new file mode 100755 index 000000000..4b2da518b --- /dev/null +++ b/externals/vcpkg/ports/portmidi/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "portmidi", + "version": "2.0.2", + "port-version": 1, + "description": "PortMidi is a cross platform (Windows, macOS, Linux, and BSDs which support alsalib) library for interfacing with operating systems' MIDI I/O APIs.", + "homepage": "https://github.com/PortMidi/portmidi", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "alsa", + "platform": "!(windows | osx)" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/portsmf/portfile.cmake b/externals/vcpkg/ports/portsmf/portfile.cmake new file mode 100755 index 000000000..01370f7c2 --- /dev/null +++ b/externals/vcpkg/ports/portsmf/portfile.cmake @@ -0,0 +1,17 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tenacityteam/portsmf + REF 238 + SHA512 af619d1b0a656361af8f8b8b65d7f98047613ac8e9ea51354031629c1732ad02755f84d63ac7c4ed24cdf0ad3db46381061bf32d9afe29b7be3226dc814ef552 + HEAD_REF main +) + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/PortSMF) +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/externals/vcpkg/ports/portsmf/vcpkg.json b/externals/vcpkg/ports/portsmf/vcpkg.json new file mode 100755 index 000000000..f3105391a --- /dev/null +++ b/externals/vcpkg/ports/portsmf/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "portsmf", + "version": "0.238", + "port-version": 1, + "description": "Portsmf is 'Port Standard MIDI File', a cross-platform, C++ library for reading and writing Standard MIDI Files.", + "homepage": "https://github.com/tenacityteam/portsmf", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ppconsul/cmake_build.patch b/externals/vcpkg/ports/ppconsul/cmake_build.patch new file mode 100755 index 000000000..a66c8e1d9 --- /dev/null +++ b/externals/vcpkg/ports/ppconsul/cmake_build.patch @@ -0,0 +1,70 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 92e4698..aa643aa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,6 +52,8 @@ endif() + + enable_testing() + ++find_package(json11 REQUIRED) ++ + if (${USE_CPPNETLIB}) + find_package(Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS thread filesystem system date_time chrono regex) + +@@ -75,6 +77,8 @@ else () + set (CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${CURL_ROOT}/lib") + endif () + find_package(CURL REQUIRED) ++ find_package(OpenSSL REQUIRED) ++ find_package(ZLIB REQUIRED) + endif () + + set(LIBB64_DIR "${PROJECT_SOURCE_DIR}/ext/b64") +@@ -87,9 +91,7 @@ if (WIN32 AND NOT BUILD_STATIC_LIB) + message(FATAL_ERROR "Building Ppconsul as dynamic library on Windows is not supported, see https://github.com/oliora/ppconsul/issues/25") + endif() + +-add_subdirectory(ext/json11) + add_subdirectory(src) +-add_subdirectory(tests) + + install( + DIRECTORY "${HEADERS_DIR}" +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index d747100..966c7e2 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -78,7 +78,7 @@ target_include_directories(${PROJECT_NAME} + + target_link_libraries(${PROJECT_NAME} + PRIVATE +- json11 ++ ${JSON11_LIBRARIES} + ${Boost_LIBRARIES} + ) + +@@ -87,7 +87,10 @@ if (${USE_CPPNETLIB}) + target_link_libraries(${PROJECT_NAME} PRIVATE ${CPPNETLIB_LIBRARIES}) + else () + target_include_directories(${PROJECT_NAME} PRIVATE ${CURL_INCLUDE_DIR}) +- target_link_libraries(${PROJECT_NAME} PRIVATE ${CURL_LIBRARIES}) ++ target_link_libraries(${PROJECT_NAME} PRIVATE ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES} ZLIB::ZLIB) ++ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") ++ target_link_libraries(${PROJECT_NAME} PRIVATE "-framework CoreFoundation" "-framework Security") ++ endif () + endif () + + source_group(${PROJECT_NAME} FILES ${SOURCES}) +diff --git a/src/s11n.h b/src/s11n.h +index c317834..3cb03c4 100644 +--- a/src/s11n.h ++++ b/src/s11n.h +@@ -6,7 +6,7 @@ + + #include "ppconsul/config.h" + #include "ppconsul/error.h" +-#include ++#include + #include + #include + #include diff --git a/externals/vcpkg/ports/ppconsul/portfile.cmake b/externals/vcpkg/ports/ppconsul/portfile.cmake new file mode 100755 index 000000000..cc1692760 --- /dev/null +++ b/externals/vcpkg/ports/ppconsul/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO oliora/ppconsul + REF 8aed30cae0e2df76d920b5cd77933604a4644ee9 + SHA512 756f07c7c8099868fa181571941f511987088abc110ad5eda517ad591ed10b40532cd7b1541dbdad76c2617ce804a1dc26a121380f20f8e4a40e29063523cbbd + HEAD_REF master + PATCHES "cmake_build.patch" +) + +# Force the use of the vcpkg installed versions +file(REMOVE_RECURSE ${SOURCE_PATH}/ext/json11) +file(REMOVE_RECURSE ${SOURCE_PATH}/ext/catch) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + + +file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/ppconsul/vcpkg.json b/externals/vcpkg/ports/ppconsul/vcpkg.json new file mode 100755 index 000000000..ff2b678c8 --- /dev/null +++ b/externals/vcpkg/ports/ppconsul/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "ppconsul", + "version-string": "0.5", + "port-version": 3, + "description": "A C++ client library for Consul. Consul is a distributed tool for discovering and configuring services in your infrastructure.", + "homepage": "https://github.com/oliora/ppconsul", + "dependencies": [ + "boost-core", + "boost-fusion", + "boost-optional", + "boost-variant", + { + "name": "curl", + "features": [ + "openssl" + ] + }, + "json11" + ] +} diff --git a/externals/vcpkg/ports/ppmagic/portfile.cmake b/externals/vcpkg/ports/ppmagic/portfile.cmake new file mode 100755 index 000000000..18f491f80 --- /dev/null +++ b/externals/vcpkg/ports/ppmagic/portfile.cmake @@ -0,0 +1,13 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kobalicek/ppmagic + REF 2c7894e3056c610d383027b2d48149ba9d4a1c62 + SHA512 4ab5f1dbef4c9b7892d8042e2a2b01df21a201b2b05a1b75a6ad594f50e2ec1c6a3e4782bb1d702266c90440df679d7eb24dfe595ce35680f7d263ec6c371a3b + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/ppmagic.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/ppmagic/vcpkg.json b/externals/vcpkg/ports/ppmagic/vcpkg.json new file mode 100755 index 000000000..7bf584f33 --- /dev/null +++ b/externals/vcpkg/ports/ppmagic/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "ppmagic", + "version-string": "2020-07-03", + "port-version": 1, + "description": "C/C++ preprocessor macros that you can use to simplify your life.", + "homepage": "https://github.com/kobalicek/ppmagic" +} diff --git a/externals/vcpkg/ports/pprint/portfile.cmake b/externals/vcpkg/ports/pprint/portfile.cmake new file mode 100755 index 000000000..609117815 --- /dev/null +++ b/externals/vcpkg/ports/pprint/portfile.cmake @@ -0,0 +1,25 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO p-ranav/pprint + REF 2fb81cd4af62c019ea28ea1707164fc3637bc656 + SHA512 51bdf0e06666511fb475b46ff2d512e5d04b231f63c274c021f56b194501885a0302af95cc90977b0a3b39b555d1076926f618d0a6751926acb5f8b2a968bc0a + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DPPRINT_BUILD_TESTS=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/pprint/vcpkg.json b/externals/vcpkg/ports/pprint/vcpkg.json new file mode 100755 index 000000000..386ed2906 --- /dev/null +++ b/externals/vcpkg/ports/pprint/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "pprint", + "version-string": "2019-07-19", + "port-version": 1, + "description": "Pretty Printer for Modern C++", + "homepage": "https://github.com/p-ranav/pprint" +} diff --git a/externals/vcpkg/ports/pqp/CMakeLists.txt b/externals/vcpkg/ports/pqp/CMakeLists.txt new file mode 100755 index 000000000..dab50802f --- /dev/null +++ b/externals/vcpkg/ports/pqp/CMakeLists.txt @@ -0,0 +1,22 @@ +cmake_minimum_required(VERSION 3.0) +project(pqp) + +set(SOURCE_CUSTOM_DIR "PQP_v1.3") +include_directories(${SOURCE_CUSTOM_DIR}/src) + +file(GLOB SRCS + "${SOURCE_CUSTOM_DIR}/src/*.cpp") +file(GLOB HDRS + "${SOURCE_CUSTOM_DIR}/src/*.h") + +add_library(pqp STATIC ${SRCS}) + +install(TARGETS pqp EXPORT pqpConfig + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + +foreach (file ${HDRS}) + get_filename_component(dir ${file} DIRECTORY) + install(FILES ${file} DESTINATION include/ CONFIGURATIONS Release) +endforeach() diff --git a/externals/vcpkg/ports/pqp/LICENSE b/externals/vcpkg/ports/pqp/LICENSE new file mode 100755 index 000000000..2d4e4817a --- /dev/null +++ b/externals/vcpkg/ports/pqp/LICENSE @@ -0,0 +1,32 @@ +Copyright 1999 University of North Carolina at Chapel Hill. +All rights reserved. + +Permission to use, copy, modify, and distribute this software and its +documentation for educational, research, and non-profit purposes, without fee, +and without a written agreement is hereby granted, provided that the above +copyright notice and the following three paragraphs appear in all copies. + +IN NO EVENT SHALL THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL BE LIABLE TO +ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, +INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS +DOCUMENTATION, EVEN IF THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL HAS +BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL SPECIFICALLY DISCLAIMS ANY +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED +HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF NORTH CAROLINA AT +CHAPEL HILL HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, +ENHANCEMENTS, OR MODIFICATIONS. + +The authors may be contacted via: + +US Mail: Eric Larsen, Stefan Gottschalk + Department of Computer Science + Sitterson Hall, CB #3175 + University of North Carolina + Chapel Hill, NC 27599-3175 + +Phone: (919) 962-1749 + +Email: geom@cs.unc.edu \ No newline at end of file diff --git a/externals/vcpkg/ports/pqp/fix-math-functions.patch b/externals/vcpkg/ports/pqp/fix-math-functions.patch new file mode 100755 index 000000000..51a4f15d5 --- /dev/null +++ b/externals/vcpkg/ports/pqp/fix-math-functions.patch @@ -0,0 +1,17 @@ +--- a/PQP_v1.3/src/PQP_Compile.h ++++ b/PQP_v1.3/src/PQP_Compile.h +@@ -44,10 +44,10 @@ + // prevents compiler warnings when PQP_REAL is float + + #include +-inline float sqrt(float x) { return (float)sqrt((double)x); } +-inline float cos(float x) { return (float)cos((double)x); } +-inline float sin(float x) { return (float)sin((double)x); } +-inline float fabs(float x) { return (float)fabs((double)x); } ++//inline float sqrt(float x) { return (float)sqrt((double)x); } ++//inline float cos(float x) { return (float)cos((double)x); } ++//inline float sin(float x) { return (float)sin((double)x); } ++//inline float fabs(float x) { return (float)fabs((double)x); } + + //------------------------------------------------------------------------- + // diff --git a/externals/vcpkg/ports/pqp/portfile.cmake b/externals/vcpkg/ports/pqp/portfile.cmake new file mode 100755 index 000000000..ac6ab13b1 --- /dev/null +++ b/externals/vcpkg/ports/pqp/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_download_distfile(ARCHIVE + URLS "http://gamma.cs.unc.edu/software/downloads/SSV/pqp-1.3.tar.gz" + FILENAME "pqp-1.3.tar.gz" + SHA512 baad7b050b13a6d13de5110cdec443048a3543b65b0d3b30d1b5f737b46715052661f762ef71345d39978c0c788a30a3a935717664806b4729722ee3594ebdc1 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + fix-math-functions.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +# Handle copyright +file(COPY ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/pqp) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/pqp/LICENSE ${CURRENT_PACKAGES_DIR}/share/pqp/copyright) diff --git a/externals/vcpkg/ports/pqp/vcpkg.json b/externals/vcpkg/ports/pqp/vcpkg.json new file mode 100755 index 000000000..70d452f26 --- /dev/null +++ b/externals/vcpkg/ports/pqp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "pqp", + "version-string": "1.3", + "port-version": 5, + "description": "a proximity query package", + "homepage": "https://gamma.cs.unc.edu/SSV/" +} diff --git a/externals/vcpkg/ports/presentmon/CMakeLists.txt b/externals/vcpkg/ports/presentmon/CMakeLists.txt new file mode 100755 index 000000000..1c8bd8620 --- /dev/null +++ b/externals/vcpkg/ports/presentmon/CMakeLists.txt @@ -0,0 +1,71 @@ +cmake_minimum_required(VERSION 3.11) +project(presentmon) + +option(INSTALL_HEADERS "Install presentmon headers" ON) +option(BUILD_TOOLS "Build tool PresentMon" OFF) + +set(PRESENTDATA_SRCS + PresentData/Debug.cpp + PresentData/MixedRealityTraceConsumer.cpp + PresentData/PresentMonTraceConsumer.cpp + PresentData/TraceConsumer.cpp + PresentData/TraceSession.cpp +) + +set(PRESENTDATA_HDRS + PresentData/Debug.hpp + PresentData/MixedRealityTraceConsumer.hpp + PresentData/PresentMonTraceConsumer.hpp + PresentData/TraceConsumer.hpp + PresentData/TraceSession.hpp + ${CMAKE_BINARY_DIR}/generated/version.h +) + + +file(GLOB EXTRA_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/PresentData/ETW/*.h) + +file(WRITE ${CMAKE_BINARY_DIR}/generated/version.h "char const* PRESENT_MON_VERSION = \"1.7.0\";") + +add_library(PresentData STATIC ${PRESENTDATA_SRCS} ${PRESENTDATA_HDRS} ${EXTRA_INCLUDES}) + +target_include_directories(PresentData PUBLIC + $ + $ +) +target_compile_definitions(PresentData PRIVATE UNICODE) + +# Install targets +install(TARGETS PresentData + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if (BUILD_TOOLS) + set(PresentMon_SRCS + PresentMon/CommandLine.cpp + PresentMon/Console.cpp + PresentMon/ConsumerThread.cpp + PresentMon/CsvOutput.cpp + PresentMon/LateStageReprojectionData.cpp + PresentMon/MainThread.cpp + PresentMon/OutputThread.cpp + PresentMon/Privilege.cpp + PresentMon/TraceSession.cpp + ) + + add_executable(PresentMon ${PresentMon_SRCS}) + target_include_directories(PresentMon PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/PresentMon ${CMAKE_BINARY_DIR}) + target_compile_definitions(PresentMon PRIVATE UNICODE) + target_link_libraries(PresentMon PRIVATE PresentData Tdh Shlwapi) + + install(TARGETS PresentMon + RUNTIME DESTINATION bin + ) +endif() + +# Install headers +if (INSTALL_HEADERS) + install(FILES ${PRESENTDATA_HDRS} DESTINATION include/presentmon) + install(FILES ${EXTRA_INCLUDES} DESTINATION include/presentmon/ETW) +endif() diff --git a/externals/vcpkg/ports/presentmon/portfile.cmake b/externals/vcpkg/ports/presentmon/portfile.cmake new file mode 100755 index 000000000..a2c5dc041 --- /dev/null +++ b/externals/vcpkg/ports/presentmon/portfile.cmake @@ -0,0 +1,33 @@ +# The upstream doesn't export any symbols +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO GameTechDev/PresentMon + REF 47669ad0efaddc9787772d5e4900734417b2c07c # 1.7.0 + SHA512 fac2e2ca4d8476e2cdde7c3f77cf1881b7d7a9208387f12dbf07f3ea7f4012ce79602f4fedbf1e778871fd9ce898b101659a6f192de29dc6a4404213aee444be + HEAD_REF main +) + +file(COPY ${CURRENT_PORT_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS ${FEATURE_OPTIONS} + OPTIONS_DEBUG + -DINSTALL_HEADERS=OFF +) + +vcpkg_install_cmake() + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES presentmon AUTO_CLEAN) +endif() + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/presentmon/vcpkg.json b/externals/vcpkg/ports/presentmon/vcpkg.json new file mode 100755 index 000000000..daa764fdd --- /dev/null +++ b/externals/vcpkg/ports/presentmon/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "presentmon", + "version-semver": "1.7.0", + "port-version": 1, + "description": "PresentMon is a tool to capture and analyze ETW events related to swap chain presentation on Windows.", + "supports": "windows & !uwp", + "features": { + "tools": { + "description": "Build tool PresentMon" + } + } +} diff --git a/externals/vcpkg/ports/proj/fix-proj4-targets-cmake.patch b/externals/vcpkg/ports/proj/fix-proj4-targets-cmake.patch new file mode 100755 index 000000000..629643086 --- /dev/null +++ b/externals/vcpkg/ports/proj/fix-proj4-targets-cmake.patch @@ -0,0 +1,66 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7d736d129..2be8f8be9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -129,7 +129,22 @@ if(NOT EXE_SQLITE3) + message(SEND_ERROR "sqlite3 binary not found!") + endif() + +-find_package(Sqlite3 REQUIRED) ++find_package(unofficial-sqlite3 CONFIG REQUIRED) ++if(unofficial-sqlite3_FOUND) ++ set(SQLITE3_FOUND true) ++ get_target_property(SQLITE3_INCLUDE_DIR unofficial::sqlite3::sqlite3 INTERFACE_INCLUDE_DIRECTORIES) ++ set(SQLITE3_LIBRARY unofficial::sqlite3::sqlite3) ++ # Extract version information from the header file ++ if(SQLITE3_INCLUDE_DIR) ++ file(STRINGS ${SQLITE3_INCLUDE_DIR}/sqlite3.h _ver_line ++ REGEX "^#define SQLITE_VERSION *\"[0-9]+\\.[0-9]+\\.[0-9]+\"" ++ LIMIT_COUNT 1) ++ string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" ++ SQLITE3_VERSION "${_ver_line}") ++ unset(_ver_line) ++ endif() ++endif() ++ + if(NOT SQLITE3_FOUND) + message(SEND_ERROR "sqlite3 dependency not found!") + endif() +@@ -151,6 +165,7 @@ if(ENABLE_TIFF) + find_package(TIFF REQUIRED) + if(TIFF_FOUND) + set(TIFF_ENABLED TRUE) ++ set(TIFF_LIBRARY TIFF::TIFF) + else() + message(SEND_ERROR + "libtiff dependency not found! Use ENABLE_TIFF=OFF to force it off") +@@ -171,6 +188,7 @@ if(ENABLE_CURL) + find_package(CURL REQUIRED) + if(CURL_FOUND) + set(CURL_ENABLED TRUE) ++ set(CURL_LIBRARY CURL::libcurl) + else() + message(SEND_ERROR "curl dependency not found!") + endif() +diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in +index 23f997abd..8baef00f0 100644 +--- a/cmake/project-config.cmake.in ++++ b/cmake/project-config.cmake.in +@@ -7,6 +7,17 @@ + # @PROJECT_VARIANT_NAME@_LIBRARY_DIRS = /usr/local/lib + # @PROJECT_VARIANT_NAME@_BINARY_DIRS = /usr/local/bin + # @PROJECT_VARIANT_NAME@_VERSION = 4.9.1 (for example) ++cmake_policy(PUSH) ++cmake_policy(SET CMP0012 NEW) ++include(CMakeFindDependencyMacro) ++find_dependency(unofficial-sqlite3 CONFIG) ++if("@ENABLE_TIFF@") ++ find_dependency(TIFF) ++endif() ++if("@ENABLE_CURL@") ++ find_dependency(CURL CONFIG) ++endif() ++cmake_policy(POP) + + # Tell the user project where to find our headers and libraries + get_filename_component (_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) diff --git a/externals/vcpkg/ports/proj/fix-win-output-name.patch b/externals/vcpkg/ports/proj/fix-win-output-name.patch new file mode 100755 index 000000000..092561441 --- /dev/null +++ b/externals/vcpkg/ports/proj/fix-win-output-name.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/ProjUtilities.cmake b/cmake/ProjUtilities.cmake +index 6f43edb5c..1ed89d597 100644 +--- a/cmake/ProjUtilities.cmake ++++ b/cmake/ProjUtilities.cmake +@@ -51,7 +51,7 @@ function(proj_target_output_name TARGET_NAME OUTPUT_NAME) + + # On Windows, ABI version is specified using binary file name suffix. + # On Unix, suffix is empty and SOVERSION is used instead. +- if(WIN32) ++ if(0) + string(LENGTH "${${PROJECT_NAME}_ABI_VERSION}" abilen) + if(abilen GREATER 0) + set(SUFFIX "_${${PROJECT_NAME}_ABI_VERSION}") diff --git a/externals/vcpkg/ports/proj/portfile.cmake b/externals/vcpkg/ports/proj/portfile.cmake new file mode 100755 index 000000000..63a50506c --- /dev/null +++ b/externals/vcpkg/ports/proj/portfile.cmake @@ -0,0 +1,69 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO OSGeo/PROJ + REF 9.0.0 + SHA512 f11a20e9f9615c513755f54ac400cc2e144e40caa91f616c8f640aef9caf779487dc94927b3a4b57b15a595c17b70636b872d9a77d7baaf912b1a507004e6520 + HEAD_REF master + PATCHES + fix-win-output-name.patch + fix-proj4-targets-cmake.patch + tools-cmake.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + net ENABLE_CURL + tiff ENABLE_TIFF + tools BUILD_APPS +) + +vcpkg_list(SET TOOL_NAMES cct cs2cs geod gie invgeod invproj proj projinfo projsync) +if("tools" IN_LIST FEATURES AND NOT "net" IN_LIST FEATURES) + set(BUILD_PROJSYNC OFF) + vcpkg_list(APPEND FEATURE_OPTIONS -DBUILD_PROJSYNC=${BUILD_PROJSYNC}) + vcpkg_list(REMOVE_ITEM TOOL_NAMES projsync) +endif() + +find_program(EXE_SQLITE3 NAMES "sqlite3" PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools" NO_DEFAULT_PATH REQUIRED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DNLOHMANN_JSON=external + -DPROJ_LIB_SUBDIR=lib + -DPROJ_INCLUDE_SUBDIR=include + -DPROJ_DATA_SUBDIR=share/${PORT}/data + -DBUILD_TESTING=OFF + "-DEXE_SQLITE3=${EXE_SQLITE3}" +) + +vcpkg_cmake_install() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # Enforce consistency with src/lib_proj.cmake build time configuration. + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/proj.h" + "#ifndef PROJ_DLL" + "#ifndef PROJ_DLL\n# define PROJ_DLL\n#elif 0" + ) +endif() + +vcpkg_cmake_config_fixup(PACKAGE_NAME proj4 CONFIG_PATH lib/cmake/proj4 DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/proj) + +if ("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) +endif () + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() +if(NOT DEFINED VCPKG_BUILD_TYPE AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/proj.pc" " -lproj" " -lproj_d") +endif() + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/proj/tools-cmake.patch b/externals/vcpkg/ports/proj/tools-cmake.patch new file mode 100755 index 000000000..cc76be215 --- /dev/null +++ b/externals/vcpkg/ports/proj/tools-cmake.patch @@ -0,0 +1,15 @@ +diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt +index 534bc311b..f9fb0f1bb 100644 +--- a/src/apps/CMakeLists.txt ++++ b/src/apps/CMakeLists.txt +@@ -83,10 +83,3 @@ if(BUILD_PROJSYNC) + + # global configurations for all apps + +-if(MSVC OR CMAKE_CONFIGURATION_TYPES) +- if(BIN_TARGETS) +- # Add _d suffix for debug versions of the apps +- set_target_properties(${BIN_TARGETS} PROPERTIES +- DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX}) +- endif() +-endif() diff --git a/externals/vcpkg/ports/proj/usage b/externals/vcpkg/ports/proj/usage new file mode 100755 index 000000000..a1236dde6 --- /dev/null +++ b/externals/vcpkg/ports/proj/usage @@ -0,0 +1,4 @@ +The package proj provides CMake targets: + + find_package(PROJ CONFIG REQUIRED) + target_link_libraries(main PRIVATE PROJ::proj) diff --git a/externals/vcpkg/ports/proj/vcpkg.json b/externals/vcpkg/ports/proj/vcpkg.json new file mode 100755 index 000000000..a17d5a8aa --- /dev/null +++ b/externals/vcpkg/ports/proj/vcpkg.json @@ -0,0 +1,57 @@ +{ + "name": "proj", + "version": "9.0.0", + "description": "PROJ library for cartographic projections", + "homepage": "https://proj.org/", + "license": "MIT", + "dependencies": [ + "nlohmann-json", + { + "name": "sqlite3", + "default-features": false + }, + { + "name": "sqlite3", + "host": true, + "features": [ + "tool" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "net", + "tiff" + ], + "features": { + "net": { + "description": "Enable network support", + "dependencies": [ + "curl" + ] + }, + "tiff": { + "description": "Enable TIFF support to read some grids", + "dependencies": [ + { + "name": "tiff", + "default-features": false, + "features": [ + "lzma", + "zip" + ] + } + ] + }, + "tools": { + "description": "Build tools" + } + } +} diff --git a/externals/vcpkg/ports/proj4/portfile.cmake b/externals/vcpkg/ports/proj4/portfile.cmake new file mode 100755 index 000000000..cc6e26fcb --- /dev/null +++ b/externals/vcpkg/ports/proj4/portfile.cmake @@ -0,0 +1 @@ +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/proj4/vcpkg.json b/externals/vcpkg/ports/proj4/vcpkg.json new file mode 100755 index 000000000..a66974102 --- /dev/null +++ b/externals/vcpkg/ports/proj4/vcpkg.json @@ -0,0 +1,56 @@ +{ + "name": "proj4", + "version-semver": "8.9.9", + "port-version": 1, + "description": "A stub package that pulls in proj. Do not depend on this package.", + "license": "MIT", + "dependencies": [ + { + "name": "proj", + "default-features": false, + "version>=": "9.0.0" + } + ], + "default-features": [ + "net", + "tiff" + ], + "features": { + "net": { + "description": "Enable network support", + "dependencies": [ + { + "name": "proj", + "default-features": false, + "features": [ + "net" + ] + } + ] + }, + "tiff": { + "description": "Enable TIFF support to read some grids", + "dependencies": [ + { + "name": "proj", + "default-features": false, + "features": [ + "tiff" + ] + } + ] + }, + "tools": { + "description": "Build tools", + "dependencies": [ + { + "name": "proj", + "default-features": false, + "features": [ + "tools" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/prometheus-cpp/portfile.cmake b/externals/vcpkg/ports/prometheus-cpp/portfile.cmake new file mode 100755 index 000000000..de74f9ba8 --- /dev/null +++ b/externals/vcpkg/ports/prometheus-cpp/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jupp0r/prometheus-cpp + REF 76470b3ec024c8214e1f4253fb1f4c0b28d3df94 # v1.0.1 + SHA512 bf5e68d99b5b0251154337bac11703ad4e84e0dc1292ecb3b9cbe0573bf2c0acbb5e3e96a417b0712b85665ea7a54514837a04be762fba954014f600148fd35f + HEAD_REF master +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + compression ENABLE_COMPRESSION + pull ENABLE_PULL + push ENABLE_PUSH + tests ENABLE_TESTING +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DUSE_THIRDPARTY_LIBRARIES=OFF # use vcpkg packages + -DGENERATE_PKGCONFIG=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/prometheus-cpp") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/prometheus-cpp/vcpkg.json b/externals/vcpkg/ports/prometheus-cpp/vcpkg.json new file mode 100755 index 000000000..69217cea6 --- /dev/null +++ b/externals/vcpkg/ports/prometheus-cpp/vcpkg.json @@ -0,0 +1,46 @@ +{ + "name": "prometheus-cpp", + "version-semver": "1.0.1", + "description": "Prometheus Client Library for Modern C++", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "compression", + "pull" + ], + "features": { + "compression": { + "description": "Enable zlib compression", + "dependencies": [ + "zlib" + ] + }, + "pull": { + "description": "Support for regular pull mode", + "dependencies": [ + "civetweb" + ] + }, + "push": { + "description": "Support push gateway", + "dependencies": [ + "curl" + ] + }, + "tests": { + "description": "Additional testing support", + "dependencies": [ + "gtest" + ] + } + } +} diff --git a/externals/vcpkg/ports/promise-cpp/fix-ifdef.patch b/externals/vcpkg/ports/promise-cpp/fix-ifdef.patch new file mode 100755 index 000000000..8d818b3ab --- /dev/null +++ b/externals/vcpkg/ports/promise-cpp/fix-ifdef.patch @@ -0,0 +1,12 @@ +diff --git a/include/promise-cpp/promise.hpp b/include/promise-cpp/promise.hpp +--- a/include/promise-cpp/promise.hpp ++++ b/include/promise-cpp/promise.hpp +@@ -2,7 +2,7 @@ + #ifndef INC_PROMISE_HPP_ + #define INC_PROMISE_HPP_ + +-#ifdef PROMISE_HEADER_ONLY ++#ifdef PROMISE_HEADONLY + #define PROMISE_API inline + #elif defined PROMISE_BUILD_SHARED + diff --git a/externals/vcpkg/ports/promise-cpp/portfile.cmake b/externals/vcpkg/ports/promise-cpp/portfile.cmake new file mode 100755 index 000000000..ed49e0526 --- /dev/null +++ b/externals/vcpkg/ports/promise-cpp/portfile.cmake @@ -0,0 +1,15 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xhawk18/promise-cpp + REF 2.1.2 + SHA512 490571e6d6742e05ae6a2549af4e242a1d7084edc583fbbb183798bdddb25d08a7f68becfa94f55b877cba7e2e8e8515964f892881591b5bb394b4b33e6593f7 + HEAD_REF master + PATCHES fix-ifdef.patch +) + +file(GLOB PROMISE_HEADERS "${SOURCE_PATH}/include/*.hpp") +file(INSTALL "${SOURCE_PATH}/include/promise-cpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/promise-cpp/usage b/externals/vcpkg/ports/promise-cpp/usage new file mode 100755 index 000000000..0e9d48636 --- /dev/null +++ b/externals/vcpkg/ports/promise-cpp/usage @@ -0,0 +1,9 @@ +The package promise-cpp is header only and can be used from CMake via: + + find_path(PROMISE_CPP_INCLUDE_DIRS "promise-cpp/promise.hpp") + target_include_directories(main PRIVATE ${PROMISE_CPP_INCLUDE_DIRS}) + +Make sure to define the pre-processor macro PROMISE_HEADONLY before including "promise-cpp/promise.hpp": + + #define PROMISE_HEADONLY + #include "promise-cpp/promise.hpp" \ No newline at end of file diff --git a/externals/vcpkg/ports/promise-cpp/vcpkg.json b/externals/vcpkg/ports/promise-cpp/vcpkg.json new file mode 100755 index 000000000..3e6b7976d --- /dev/null +++ b/externals/vcpkg/ports/promise-cpp/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "promise-cpp", + "version": "2.1.2", + "description": "C++ promise/A+ library in Javascript style.", + "homepage": "https://github.com/xhawk18/promise-cpp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/protobuf-c/fix-crt-linkage.patch b/externals/vcpkg/ports/protobuf-c/fix-crt-linkage.patch new file mode 100755 index 000000000..974c6e620 --- /dev/null +++ b/externals/vcpkg/ports/protobuf-c/fix-crt-linkage.patch @@ -0,0 +1,12 @@ +diff --git a/build-cmake/CMakeLists.txt b/build-cmake/CMakeLists.txt +--- a/build-cmake/CMakeLists.txt ++++ b/build-cmake/CMakeLists.txt +@@ -70,7 +70,7 @@ if (BUILD_PROTO3) + endif() + ENDIF() + +-if (MSVC AND NOT BUILD_SHARED_LIBS) ++if (0) + # In case we are building static libraries, link also the runtime library statically + # so that MSVCR*.DLL is not required at runtime. + # https://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx diff --git a/externals/vcpkg/ports/protobuf-c/portfile.cmake b/externals/vcpkg/ports/protobuf-c/portfile.cmake new file mode 100755 index 000000000..4bcce7017 --- /dev/null +++ b/externals/vcpkg/ports/protobuf-c/portfile.cmake @@ -0,0 +1,42 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO protobuf-c/protobuf-c + REF v1.4.0 + SHA512 cba4c6116c0f2ebb034236e8455d493bfaa2517733befcd87b6f8d6d3df0c0149b17fcbf59cd1763fa2318119c664d0dae3d2d3a46ebfe2a0fec3ef4719b033b + HEAD_REF master + PATCHES + fix-crt-linkage.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_PROTOC + test BUILD_TESTS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/build-cmake" + DISABLE_PARALLEL_CONFIGURE + OPTIONS ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install(ADD_BIN_TO_PATH) +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES protoc-gen-c + AUTO_CLEAN + ) +endif() + +# Include files should not be duplicated into the /debug/include directory. +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Remove duplicate PDB files (vcpkg_copy_pdbs already copied them to "bin") +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/protobuf-c.pdb") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/protobuf-c.pdb") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/protobuf-c/vcpkg.json b/externals/vcpkg/ports/protobuf-c/vcpkg.json new file mode 100755 index 000000000..73fbd9982 --- /dev/null +++ b/externals/vcpkg/ports/protobuf-c/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "protobuf-c", + "version-semver": "1.4.0", + "description": "This is protobuf-c, a C implementation of the Google Protocol Buffers data serialization format.", + "homepage": "https://github.com/protobuf-c/protobuf-c", + "dependencies": [ + "protobuf", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "test": { + "description": "Build test project.", + "dependencies": [ + { + "name": "protobuf-c", + "features": [ + "tools" + ] + } + ] + }, + "tools": { + "description": "Build tools (protoc-gen-c)." + } + } +} diff --git a/externals/vcpkg/ports/protobuf/fix-default-proto-file-path.patch b/externals/vcpkg/ports/protobuf/fix-default-proto-file-path.patch new file mode 100755 index 000000000..a5af918b3 --- /dev/null +++ b/externals/vcpkg/ports/protobuf/fix-default-proto-file-path.patch @@ -0,0 +1,20 @@ +diff --git a/src/google/protobuf/compiler/command_line_interface.cc b/src/google/protobuf/compiler/command_line_interface.cc +index f192ae6..22900ed 100644 +--- a/src/google/protobuf/compiler/command_line_interface.cc ++++ b/src/google/protobuf/compiler/command_line_interface.cc +@@ -260,11 +260,15 @@ void AddDefaultProtoPaths( + return; + } + // Check if the upper level directory has an "include" subdirectory. ++ // change "'$/bin' is next to 'include'" assumption to "'$/bin/tools' is next to 'include'" ++ for (int i = 0; i < 2; i++) ++ { + pos = path.find_last_of("/\\"); + if (pos == std::string::npos || pos == 0) { + return; + } + path = path.substr(0, pos); ++ } + if (IsInstalledProtoPath(path + "/include")) { + paths->push_back( + std::pair("", path + "/include")); diff --git a/externals/vcpkg/ports/protobuf/fix-static-build.patch b/externals/vcpkg/ports/protobuf/fix-static-build.patch new file mode 100755 index 000000000..d0e3ae010 --- /dev/null +++ b/externals/vcpkg/ports/protobuf/fix-static-build.patch @@ -0,0 +1,26 @@ +diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt +index 51e8478..64347c4 100644 +--- a/cmake/CMakeLists.txt ++++ b/cmake/CMakeLists.txt +@@ -182,7 +182,7 @@ else (protobuf_BUILD_SHARED_LIBS) + # making programmatic control difficult. Prefer the functionality in newer + # CMake versions when available. + if(CMAKE_VERSION VERSION_GREATER 3.15 OR CMAKE_VERSION VERSION_EQUAL 3.15) +- set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded$<$:Debug>) ++ + else() + # In case we are building static libraries, link also the runtime library statically + # so that MSVCR*.DLL is not required at runtime. +diff --git a/cmake/install.cmake b/cmake/install.cmake +index 4e1c5de..d3aa865 100644 +--- a/cmake/install.cmake ++++ b/cmake/install.cmake +@@ -32,7 +32,7 @@ if (protobuf_BUILD_PROTOC_BINARIES) + install(TARGETS protoc EXPORT protobuf-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc + BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc) +- if (UNIX AND NOT APPLE) ++ if (UNIX AND NOT APPLE AND NOT protobuf_MSVC_STATIC_RUNTIME) + set_property(TARGET protoc + PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") + elseif (APPLE) diff --git a/externals/vcpkg/ports/protobuf/portfile.cmake b/externals/vcpkg/ports/protobuf/portfile.cmake new file mode 100755 index 000000000..205cf7cd7 --- /dev/null +++ b/externals/vcpkg/ports/protobuf/portfile.cmake @@ -0,0 +1,125 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO protocolbuffers/protobuf + REF v3.19.4 + SHA512 2653b9852e5ac69f1de9b6ac02887c366aa0a9efd2b29e53135f61a9a10f5a1b5853a8c4cbb3658f519dfdbde9f32c547c39751ab417f123162b08be9e76c9e1 + HEAD_REF master + PATCHES + fix-static-build.patch + fix-default-proto-file-path.patch +) + +string(COMPARE EQUAL "${TARGET_TRIPLET}" "${HOST_TRIPLET}" protobuf_BUILD_PROTOC_BINARIES) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" protobuf_BUILD_SHARED_LIBS) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" protobuf_MSVC_STATIC_RUNTIME) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + zlib protobuf_WITH_ZLIB +) + +if(VCPKG_TARGET_IS_UWP) + set(protobuf_BUILD_LIBPROTOC OFF) +else() + set(protobuf_BUILD_LIBPROTOC ON) +endif() + +if (VCPKG_DOWNLOAD_MODE) + # download PKGCONFIG in download mode which is used in `vcpkg_fixup_pkgconfig()` at the end of this script. + # download it here because `vcpkg_cmake_configure()` halts execution in download mode when running configure process. + vcpkg_find_acquire_program(PKGCONFIG) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH}/cmake + OPTIONS + -Dprotobuf_BUILD_SHARED_LIBS=${protobuf_BUILD_SHARED_LIBS} + -Dprotobuf_MSVC_STATIC_RUNTIME=${protobuf_MSVC_STATIC_RUNTIME} + -Dprotobuf_BUILD_TESTS=OFF + -DCMAKE_INSTALL_CMAKEDIR:STRING=share/protobuf + -Dprotobuf_BUILD_PROTOC_BINARIES=${protobuf_BUILD_PROTOC_BINARIES} + -Dprotobuf_BUILD_LIBPROTOC=${protobuf_BUILD_LIBPROTOC} + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +# It appears that at this point the build hasn't actually finished. There is probably +# a process spawned by the build, therefore we need to wait a bit. + +function(protobuf_try_remove_recurse_wait PATH_TO_REMOVE) + file(REMOVE_RECURSE ${PATH_TO_REMOVE}) + if (EXISTS "${PATH_TO_REMOVE}") + execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 5) + file(REMOVE_RECURSE ${PATH_TO_REMOVE}) + endif() +endfunction() + +protobuf_try_remove_recurse_wait("${CURRENT_PACKAGES_DIR}/debug/include") + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/protobuf/protobuf-targets-release.cmake" + "\${_IMPORT_PREFIX}/bin/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" + "\${_IMPORT_PREFIX}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" + ) +endif() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(READ "${CURRENT_PACKAGES_DIR}/debug/share/protobuf/protobuf-targets-debug.cmake" DEBUG_MODULE) + string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" DEBUG_MODULE "${DEBUG_MODULE}") + string(REPLACE "\${_IMPORT_PREFIX}/debug/bin/protoc${EXECUTABLE_SUFFIX}" "\${_IMPORT_PREFIX}/tools/protobuf/protoc${EXECUTABLE_SUFFIX}" DEBUG_MODULE "${DEBUG_MODULE}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/protobuf/protobuf-targets-debug.cmake" "${DEBUG_MODULE}") +endif() + +protobuf_try_remove_recurse_wait("${CURRENT_PACKAGES_DIR}/debug/share") + +if(protobuf_BUILD_PROTOC_BINARIES) + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_copy_tools(TOOL_NAMES protoc AUTO_CLEAN) + else() + vcpkg_copy_tools(TOOL_NAMES protoc protoc-3.19.4.0 AUTO_CLEAN) + endif() +else() + file(COPY "${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools") +endif() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-config.cmake" + "if(protobuf_MODULE_COMPATIBLE)" + "if(ON)" +) +if(NOT protobuf_BUILD_LIBPROTOC) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-module.cmake" + "_protobuf_find_libraries(Protobuf_PROTOC protoc)" + "" + ) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + protobuf_try_remove_recurse_wait("${CURRENT_PACKAGES_DIR}/bin") + protobuf_try_remove_recurse_wait("${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/google/protobuf/stubs/platform_macros.h" + "\#endif // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_" + "\#ifndef PROTOBUF_USE_DLLS\n\#define PROTOBUF_USE_DLLS\n\#endif // PROTOBUF_USE_DLLS\n\n\#endif // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_" + ) +endif() + +vcpkg_copy_pdbs() +set(packages protobuf protobuf-lite) +foreach(_package IN LISTS packages) + set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${_package}.pc") + if(EXISTS "${_file}") + vcpkg_replace_string(${_file} "-l${_package}" "-l${_package}d") + endif() +endforeach() + +vcpkg_fixup_pkgconfig() + +if(NOT protobuf_BUILD_PROTOC_BINARIES) + configure_file("${CMAKE_CURRENT_LIST_DIR}/protobuf-targets-vcpkg-protoc.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-targets-vcpkg-protoc.cmake" COPYONLY) +endif() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/protobuf/protobuf-targets-vcpkg-protoc.cmake b/externals/vcpkg/ports/protobuf/protobuf-targets-vcpkg-protoc.cmake new file mode 100755 index 000000000..245adf560 --- /dev/null +++ b/externals/vcpkg/ports/protobuf/protobuf-targets-vcpkg-protoc.cmake @@ -0,0 +1,8 @@ +# Create imported target protobuf::protoc +add_executable(protobuf::protoc IMPORTED) + +# Import target "protobuf::protoc" for configuration "Release" +set_property(TARGET protobuf::protoc APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) +set_target_properties(protobuf::protoc PROPERTIES + IMPORTED_LOCATION_RELEASE "${Protobuf_PROTOC_EXECUTABLE}" +) diff --git a/externals/vcpkg/ports/protobuf/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/protobuf/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..7269aedcc --- /dev/null +++ b/externals/vcpkg/ports/protobuf/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,16 @@ +if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.3) + cmake_policy(PUSH) + cmake_policy(SET CMP0057 NEW) + if(NOT "CONFIG" IN_LIST ARGS AND NOT "NO_MODULE" IN_LIST ARGS) + if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + set(Protobuf_USE_STATIC_LIBS ON) + else() + set(Protobuf_USE_STATIC_LIBS OFF) + endif() + endif() + cmake_policy(POP) +endif() + +find_program(Protobuf_PROTOC_EXECUTABLE NAMES protoc PATHS "${CMAKE_CURRENT_LIST_DIR}/../../tools/protobuf" NO_DEFAULT_PATH) + +_find_package(${ARGS}) diff --git a/externals/vcpkg/ports/protobuf/vcpkg.json b/externals/vcpkg/ports/protobuf/vcpkg.json new file mode 100755 index 000000000..3eaa26fc5 --- /dev/null +++ b/externals/vcpkg/ports/protobuf/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "protobuf", + "version-semver": "3.19.4", + "description": "Protocol Buffers - Google's data interchange format", + "homepage": "https://github.com/protocolbuffers/protobuf", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "protobuf", + "host": true + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "zlib": { + "description": "ZLib based features like Gzip streams", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/protopuf/portfile.cmake b/externals/vcpkg/ports/protopuf/portfile.cmake new file mode 100755 index 000000000..af73a5f28 --- /dev/null +++ b/externals/vcpkg/ports/protopuf/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO PragmaTwice/protopuf + REF v2.2.0 + SHA512 b7f00b1575b83ffad66e6fa555b2e420f1178ddf5b9aed64ae2c3af583e3d6c7292f0280e97cb91d4048cd0d0464ea89805f38444b86b7724abe03503682ac7f + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/protopuf/vcpkg.json b/externals/vcpkg/ports/protopuf/vcpkg.json new file mode 100755 index 000000000..ddb27f429 --- /dev/null +++ b/externals/vcpkg/ports/protopuf/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "protopuf", + "version": "2.2.0", + "description": "A little, highly templated, and protobuf-compatible serialization/deserialization library written in C++20", + "homepage": "https://github.com/PragmaTwice/protopuf", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/protozero/fix-no-tests.patch b/externals/vcpkg/ports/protozero/fix-no-tests.patch new file mode 100755 index 000000000..6cedbd965 --- /dev/null +++ b/externals/vcpkg/ports/protozero/fix-no-tests.patch @@ -0,0 +1,17 @@ +From: Fabrice Fontaine +Date: Wed, 16 Feb 2022 00:11:38 +0100 +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b975d490..df2ca15f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,7 +52,9 @@ endif() + # + #----------------------------------------------------------------------------- + +-find_package(Protobuf) ++if(BUILD_TESTING) ++ find_package(Protobuf) ++endif() + + + #----------------------------------------------------------------------------- diff --git a/externals/vcpkg/ports/protozero/portfile.cmake b/externals/vcpkg/ports/protozero/portfile.cmake new file mode 100755 index 000000000..84e704c3c --- /dev/null +++ b/externals/vcpkg/ports/protozero/portfile.cmake @@ -0,0 +1,22 @@ + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mapbox/protozero + SHA512 90bf1f487efa0ad9da2f3b887b7a6dbd849fa3687dd2126c324f902a8584722f4f7d4a2ea86f6a0e75999f7be829f6ae26cad9df1cae55d0b29a9ec24a4dbfd2 + REF v1.7.1 + HEAD_REF master + PATCHES + fix-no-tests.patch # from https://github.com/mapbox/protozero/pull/110 +) + + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug") +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/protozero/vcpkg.json b/externals/vcpkg/ports/protozero/vcpkg.json new file mode 100755 index 000000000..320b34ed8 --- /dev/null +++ b/externals/vcpkg/ports/protozero/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "protozero", + "version-semver": "1.7.1", + "description": "Minimalist protocol buffer decoder and encoder in C++", + "homepage": "https://github.com/mapbox/protozero", + "license": "BSD-2-Clause", + "supports": "!uwp", + "dependencies": [ + "protobuf", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/proxygen/fix-zstd-zlib-dependency.patch b/externals/vcpkg/ports/proxygen/fix-zstd-zlib-dependency.patch new file mode 100755 index 000000000..a56485e87 --- /dev/null +++ b/externals/vcpkg/ports/proxygen/fix-zstd-zlib-dependency.patch @@ -0,0 +1,30 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ea22eab..6bf0f17 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -74,7 +74,7 @@ if (BUILD_QUIC) + else() + find_package(Fizz REQUIRED) + endif() +-find_package(Zstd REQUIRED) ++find_package(zstd CONFIG REQUIRED) + find_package(ZLIB REQUIRED) + find_package(OpenSSL REQUIRED) + find_package(Threads) +diff --git a/proxygen/lib/CMakeLists.txt b/proxygen/lib/CMakeLists.txt +index b3fa2d1..5c50ee1 100644 +--- a/proxygen/lib/CMakeLists.txt ++++ b/proxygen/lib/CMakeLists.txt +@@ -235,10 +235,10 @@ target_link_libraries( + Folly::folly + fizz::fizz + wangle::wangle +- zstd ++ $,zstd::libzstd_shared,zstd::libzstd_static> + Boost::boost + Boost::iostreams +- -lz ++ ZLIB::ZLIB + ${HTTP3_DEPEND_LIBS} + ) + diff --git a/externals/vcpkg/ports/proxygen/portfile.cmake b/externals/vcpkg/ports/proxygen/portfile.cmake new file mode 100755 index 000000000..d9767e751 --- /dev/null +++ b/externals/vcpkg/ports/proxygen/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO facebook/proxygen + REF v2022.03.21.00 + SHA512 66dfd40e45b884d64be9c06b110caaa9333116c402312ee8eb0c21f0ab569ea31b9e4fb676c68b96730abbff0b74d139f5e39e702cd958c24ce0fe76f353fbe9 + HEAD_REF master + PATCHES + remove-register.patch + fix-zstd-zlib-dependency.patch +) + +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_PATH "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path(${PYTHON3_PATH}) + +vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf") + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_cmake_install() + +vcpkg_copy_tools(TOOL_NAMES proxygen_curl proxygen_echo proxygen_proxy proxygen_push proxygen_static AUTO_CLEAN) + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/proxygen) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/proxygen/remove-register.patch b/externals/vcpkg/ports/proxygen/remove-register.patch new file mode 100755 index 000000000..18a930649 --- /dev/null +++ b/externals/vcpkg/ports/proxygen/remove-register.patch @@ -0,0 +1,12 @@ +diff --git a/proxygen/lib/utils/gen_perfect_hash_table.sh b/proxygen/lib/utils/gen_perfect_hash_table.sh +index a870b2d67..2dec9c5a1 100755 +--- a/proxygen/lib/utils/gen_perfect_hash_table.sh ++++ b/proxygen/lib/utils/gen_perfect_hash_table.sh +@@ -35,6 +35,7 @@ function generate_perfect_hash_table { + LC_ALL=C sort -u ${1?} | awk "${6?}" - "${5?}" | \ + ${8:-gperf} -m5 -D --output-file="${7?}" + perl -p -i -e "s/\/\*FALLTHROUGH\*\//FOLLY_FALLTHROUGH;/g" "${7?}" ++ perl -p -i -e "s/register//g" "${7?}" + + # Here we delete one of the comment lines gperf adds to the top of the file. + # i.e. /* Command-line: .../gperf -m5 --output-file=... */ diff --git a/externals/vcpkg/ports/proxygen/vcpkg.json b/externals/vcpkg/ports/proxygen/vcpkg.json new file mode 100755 index 000000000..223c1775b --- /dev/null +++ b/externals/vcpkg/ports/proxygen/vcpkg.json @@ -0,0 +1,36 @@ +{ + "name": "proxygen", + "version-string": "2022.03.21.00", + "port-version": 2, + "description": "It comprises the core C++ HTTP abstractions used at Facebook.", + "homepage": "https://github.com/facebook/proxygen", + "supports": "!windows", + "dependencies": [ + "boost-context", + "boost-date-time", + "boost-filesystem", + "boost-iostreams", + "boost-program-options", + "boost-regex", + "boost-system", + "boost-thread", + "fizz", + "folly", + { + "name": "gperf", + "host": true + }, + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "wangle", + "zlib", + "zstd" + ] +} diff --git a/externals/vcpkg/ports/psimd/portfile.cmake b/externals/vcpkg/ports/psimd/portfile.cmake new file mode 100755 index 000000000..f68dacb83 --- /dev/null +++ b/externals/vcpkg/ports/psimd/portfile.cmake @@ -0,0 +1,15 @@ + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Maratyszcza/psimd + REF 072586a71b55b7f8c584153d223e95687148a900 + SHA512 a18faea093423dd9fe19ece8b228e011dccce0a2a22222f777ea19b023a13173966d4a8aea01147e8fc58de5d39cffcedeb2221a1572ae52bd5aba1295f86a94 +) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) +vcpkg_install_cmake() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) diff --git a/externals/vcpkg/ports/psimd/vcpkg.json b/externals/vcpkg/ports/psimd/vcpkg.json new file mode 100755 index 000000000..49fc6e93d --- /dev/null +++ b/externals/vcpkg/ports/psimd/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "psimd", + "version-string": "2021-02-21", + "description": "Portable 128-bit SIMD intrinsics", + "homepage": "https://github.com/Maratyszcza/psimd" +} diff --git a/externals/vcpkg/ports/ptex/fix-build.patch b/externals/vcpkg/ports/ptex/fix-build.patch new file mode 100755 index 000000000..9c74eeda8 --- /dev/null +++ b/externals/vcpkg/ports/ptex/fix-build.patch @@ -0,0 +1,99 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c708153..0e004da 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,10 +60,11 @@ include(GNUInstallDirs) + include(CTest) + include(FindThreads) + ++find_package(ZLIB REQUIRED) ++if (0) + # Use pkg-config to create a PkgConfig::Ptex_ZLIB imported target + find_package(PkgConfig REQUIRED) + pkg_checK_modules(Ptex_ZLIB REQUIRED zlib IMPORTED_TARGET) +- + enable_testing() + + if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) +@@ -77,6 +78,7 @@ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Release" CACHE STRING "type of build" FORCE) + endif () + endif () ++endif() + + if (NOT WIN32) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic") +@@ -99,7 +101,9 @@ endif () + include_directories(src/ptex) + + add_subdirectory(src/ptex) ++if (0) + add_subdirectory(src/utils) + add_subdirectory(src/tests) + add_subdirectory(src/doc) ++endif() + add_subdirectory(src/build) +diff --git a/src/ptex/CMakeLists.txt b/src/ptex/CMakeLists.txt +index ba3a3cc..1619ff1 100644 +--- a/src/ptex/CMakeLists.txt ++++ b/src/ptex/CMakeLists.txt +@@ -1,6 +1,8 @@ +-if (WIN32) +- add_definitions(/DPTEX_EXPORTS) +-endif (WIN32) ++if (BUILD_SHARED_LIBS) ++ add_definitions(-DPTEX_EXPORTS) ++else () ++ add_definitions(-DPTEX_STATIC) ++endif () + + configure_file(PtexVersion.h.in + ${CMAKE_CURRENT_SOURCE_DIR}/PtexVersion.h @ONLY) +@@ -18,29 +20,35 @@ set(SRCS + PtexWriter.cpp) + + if(PTEX_BUILD_STATIC_LIBS) +- add_library(Ptex_static STATIC ${SRCS}) +- set_target_properties(Ptex_static PROPERTIES OUTPUT_NAME Ptex) +- target_include_directories(Ptex_static ++ add_library(Ptex STATIC ${SRCS}) ++ target_include_directories(Ptex + PUBLIC + $ + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}) +- target_link_libraries(Ptex_static +- PUBLIC ${CMAKE_THREAD_LIBS_INIT} PkgConfig::Ptex_ZLIB) +- install(TARGETS Ptex_static EXPORT Ptex DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ target_link_libraries(Ptex ++ PUBLIC ${CMAKE_THREAD_LIBS_INIT} ZLIB::ZLIB) ++ install(TARGETS Ptex EXPORT Ptex ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++ ) + endif() + + if(PTEX_BUILD_SHARED_LIBS) +- add_library(Ptex_dynamic SHARED ${SRCS}) +- set_target_properties(Ptex_dynamic PROPERTIES OUTPUT_NAME Ptex) +- target_include_directories(Ptex_dynamic ++ add_library(Ptex SHARED ${SRCS}) ++ target_include_directories(Ptex + PUBLIC + $ + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}) +- target_link_libraries(Ptex_dynamic +- PUBLIC ${CMAKE_THREAD_LIBS_INIT} PkgConfig::Ptex_ZLIB) +- install(TARGETS Ptex_dynamic EXPORT Ptex DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ target_link_libraries(Ptex ++ PUBLIC ${CMAKE_THREAD_LIBS_INIT} ZLIB::ZLIB) ++ install(TARGETS Ptex EXPORT Ptex ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++ ) + endif() + + install(FILES diff --git a/externals/vcpkg/ports/ptex/fix-config.cmake.patch b/externals/vcpkg/ports/ptex/fix-config.cmake.patch new file mode 100755 index 000000000..d635d4e05 --- /dev/null +++ b/externals/vcpkg/ports/ptex/fix-config.cmake.patch @@ -0,0 +1,18 @@ +diff --git a/src/build/ptex-config.cmake b/src/build/ptex-config.cmake +index f95df9e..2d3f58f 100644 +--- a/src/build/ptex-config.cmake ++++ b/src/build/ptex-config.cmake +@@ -1,11 +1,11 @@ + @PACKAGE_INIT@ + ++include(CMakeFindDependencyMacro) + include("${CMAKE_CURRENT_LIST_DIR}/ptex-version.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/ptex-exports.cmake") + + # Provide PkgConfig::ZLIB to downstream dependents +-find_package(PkgConfig REQUIRED) +-pkg_checK_modules(Ptex_ZLIB REQUIRED zlib IMPORTED_TARGET) ++find_dependency(ZLIB REQUIRED) + + set_and_check(Ptex_DIR @PACKAGE_CMAKE_INSTALL_PREFIX@) + set_and_check(Ptex_LIBRARY_DIRS @PACKAGE_CMAKE_INSTALL_LIBDIR@) diff --git a/externals/vcpkg/ports/ptex/portfile.cmake b/externals/vcpkg/ports/ptex/portfile.cmake new file mode 100755 index 000000000..057dfc089 --- /dev/null +++ b/externals/vcpkg/ports/ptex/portfile.cmake @@ -0,0 +1,47 @@ +set(PTEX_VER 2.3.2) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wdas/ptex + REF 1b8bc985a71143317ae9e4969fa08e164da7c2e5 + SHA512 37f2df9ec195f3d69d9526d0dea6a93ef49d69287bfae6ccd9671477491502ea760ed14e3b206b4f488831ab728dc749847b7d176c9b8439fb58b0a0466fe6c5 + HEAD_REF master + PATCHES + fix-build.patch + fix-config.cmake.patch +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(BUILD_SHARED_LIB ON) + set(BUILD_STATIC_LIB OFF) +else() + set(BUILD_SHARED_LIB OFF) + set(BUILD_STATIC_LIB ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DPTEX_VER=v${PTEX_VER} + -DPTEX_BUILD_SHARED_LIBS=${BUILD_SHARED_LIB} + -DPTEX_BUILD_STATIC_LIBS=${BUILD_STATIC_LIB} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/Ptex) +vcpkg_copy_pdbs() + +foreach(HEADER PtexHalf.h Ptexture.h) + file(READ "${CURRENT_PACKAGES_DIR}/include/${HEADER}" PTEX_HEADER) + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + string(REPLACE "ifndef PTEX_STATIC" "if 1" PTEX_HEADER "${PTEX_HEADER}") + else() + string(REPLACE "ifndef PTEX_STATIC" "if 0" PTEX_HEADER "${PTEX_HEADER}") + endif() + file(WRITE "${CURRENT_PACKAGES_DIR}/include/${HEADER}" "${PTEX_HEADER}") +endforeach() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/src/doc/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/ptex/vcpkg.json b/externals/vcpkg/ports/ptex/vcpkg.json new file mode 100755 index 000000000..636cea519 --- /dev/null +++ b/externals/vcpkg/ports/ptex/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "ptex", + "version": "2.3.2", + "port-version": 4, + "description": "Per-Face Texture Mapping for Production Rendering.", + "homepage": "https://github.com/wdas/ptex", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/pthread/portfile.cmake b/externals/vcpkg/ports/pthread/portfile.cmake new file mode 100755 index 000000000..9aefc8241 --- /dev/null +++ b/externals/vcpkg/ports/pthread/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/pthread/vcpkg.json b/externals/vcpkg/ports/pthread/vcpkg.json new file mode 100755 index 000000000..7cc1edb46 --- /dev/null +++ b/externals/vcpkg/ports/pthread/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "pthread", + "version-string": "3.0.0", + "port-version": 1, + "description": "empty package, linking to other port", + "dependencies": [ + "pthreads" + ] +} diff --git a/externals/vcpkg/ports/pthreadpool/fix-cmakelists.patch b/externals/vcpkg/ports/pthreadpool/fix-cmakelists.patch new file mode 100755 index 000000000..e46f679d1 --- /dev/null +++ b/externals/vcpkg/ports/pthreadpool/fix-cmakelists.patch @@ -0,0 +1,82 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 09d57b2..57d3a2c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,8 +4,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.5 FATAL_ERROR) + PROJECT(pthreadpool C CXX) + + # ---[ Options. +-SET(PTHREADPOOL_LIBRARY_TYPE "default" CACHE STRING "Type of library (shared, static, or default) to build") +-SET_PROPERTY(CACHE PTHREADPOOL_LIBRARY_TYPE PROPERTY STRINGS default static shared) + OPTION(PTHREADPOOL_ALLOW_DEPRECATED_API "Enable deprecated API functions" ON) + SET(PTHREADPOOL_SYNC_PRIMITIVE "default" CACHE STRING "Synchronization primitive (condvar, futex, gcd, event, or default) for worker threads") + SET_PROPERTY(CACHE PTHREADPOOL_SYNC_PRIMITIVE PROPERTY STRINGS default condvar futex gcd event) +@@ -14,7 +12,7 @@ IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i[3-6]86|AMD64|x86(_64)?)$") + ELSE() + OPTION(PTHREADPOOL_ENABLE_FASTPATH "Enable fast path using atomic decrement instead of atomic compare-and-swap" OFF) + ENDIF() +-IF("${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}") ++IF(FALSE) + OPTION(PTHREADPOOL_BUILD_TESTS "Build pthreadpool unit tests" ON) + OPTION(PTHREADPOOL_BUILD_BENCHMARKS "Build pthreadpool micro-benchmarks" ON) + ELSE() +@@ -36,7 +34,8 @@ MACRO(PTHREADPOOL_TARGET_ENABLE_CXX11 target) + ENDMACRO() + + # ---[ Download deps +-IF(NOT DEFINED FXDIV_SOURCE_DIR) ++find_path(FXDIV_INCLUDE_DIRS "fxdiv.h") ++IF(FALSE) + MESSAGE(STATUS "Downloading FXdiv to ${CMAKE_BINARY_DIR}/FXdiv-source (define FXDIV_SOURCE_DIR to avoid it)") + CONFIGURE_FILE(cmake/DownloadFXdiv.cmake "${CMAKE_BINARY_DIR}/FXdiv-download/CMakeLists.txt") + EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . +@@ -87,21 +86,13 @@ ELSE() + ENDIF() + + ADD_LIBRARY(pthreadpool_interface INTERFACE) +-TARGET_INCLUDE_DIRECTORIES(pthreadpool_interface INTERFACE include) ++TARGET_INCLUDE_DIRECTORIES(pthreadpool_interface INTERFACE $ $) + IF(NOT PTHREADPOOL_ALLOW_DEPRECATED_API) + TARGET_COMPILE_DEFINITIONS(pthreadpool_interface INTERFACE PTHREADPOOL_NO_DEPRECATED_API=1) + ENDIF() + INSTALL(FILES include/pthreadpool.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + +-IF(PTHREADPOOL_LIBRARY_TYPE STREQUAL "default") +- ADD_LIBRARY(pthreadpool ${PTHREADPOOL_SRCS}) +-ELSEIF(PTHREADPOOL_LIBRARY_TYPE STREQUAL "shared") +- ADD_LIBRARY(pthreadpool SHARED ${PTHREADPOOL_SRCS}) +-ELSEIF(PTHREADPOOL_LIBRARY_TYPE STREQUAL "static") +- ADD_LIBRARY(pthreadpool STATIC ${PTHREADPOOL_SRCS}) +-ELSE() +- MESSAGE(FATAL_ERROR "Unsupported library type ${PTHREADPOOL_LIBRARY_TYPE}") +-ENDIF() ++ADD_LIBRARY(pthreadpool ${PTHREADPOOL_SRCS}) + + IF(PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "condvar") + TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE PTHREADPOOL_USE_FUTEX=0) +@@ -150,18 +141,22 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") + ENDIF() + + # ---[ Configure FXdiv +-IF(NOT TARGET fxdiv) ++IF(FALSE) + SET(FXDIV_BUILD_TESTS OFF CACHE BOOL "") + SET(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "") + ADD_SUBDIRECTORY( + "${FXDIV_SOURCE_DIR}" + "${CMAKE_BINARY_DIR}/FXdiv") + ENDIF() +-TARGET_LINK_LIBRARIES(pthreadpool PRIVATE fxdiv) ++TARGET_INCLUDE_DIRECTORIES(pthreadpool PRIVATE ${FXDIV_INCLUDE_DIRS}) + +-INSTALL(TARGETS pthreadpool ++INSTALL(TARGETS pthreadpool pthreadpool_interface ++ EXPORT unofficial-pthreadpool-config ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(EXPORT unofficial-pthreadpool-config NAMESPACE unofficial:: ++ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/unofficial-${PROJECT_NAME}) # share/unofficial-pthreadpool + + IF(PTHREADPOOL_BUILD_TESTS) + # ---[ Build google test diff --git a/externals/vcpkg/ports/pthreadpool/fix-uwp.patch b/externals/vcpkg/ports/pthreadpool/fix-uwp.patch new file mode 100755 index 000000000..0b1e5109a --- /dev/null +++ b/externals/vcpkg/ports/pthreadpool/fix-uwp.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a07945c..6df83d1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -75,7 +75,8 @@ ELSE() + LIST(APPEND PTHREADPOOL_SRCS src/portable-api.c src/memory.c) + IF(APPLE AND (PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "default" OR PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "gcd")) + LIST(APPEND PTHREADPOOL_SRCS src/gcd.c) +- ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^(Windows|CYGWIN|MSYS)$" AND (PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "default" OR PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "event")) ++ ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS)$" AND (PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "default" OR PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "event")) ++ add_compile_options(-wd4146) + LIST(APPEND PTHREADPOOL_SRCS src/windows.c) + ELSE() + LIST(APPEND PTHREADPOOL_SRCS src/pthreads.c) diff --git a/externals/vcpkg/ports/pthreadpool/portfile.cmake b/externals/vcpkg/ports/pthreadpool/portfile.cmake new file mode 100755 index 000000000..dbae48f47 --- /dev/null +++ b/externals/vcpkg/ports/pthreadpool/portfile.cmake @@ -0,0 +1,27 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Maratyszcza/pthreadpool + REF 052e441b70091656199e2283fb1c16a7db6f0f85 # there is a too much gap from the last release... + SHA512 33be676e65719ae8510ec4e8254809033528802681870f8c91b083ce4006e5f630b80207a7e675464b406a785cb45bc74628996ea4817c02816b7b58ddf3a2bc + PATCHES + fix-cmakelists.patch + fix-uwp.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DPTHREADPOOL_BUILD_TESTS=OFF + -DPTHREADPOOL_BUILD_BENCHMARKS=OFF +) +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/externals/vcpkg/ports/pthreadpool/vcpkg.json b/externals/vcpkg/ports/pthreadpool/vcpkg.json new file mode 100755 index 000000000..8341b32ce --- /dev/null +++ b/externals/vcpkg/ports/pthreadpool/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "pthreadpool", + "version-date": "2020-04-10", + "port-version": 2, + "description": "Portable (POSIX/Windows/Emscripten) thread pool for C/C++", + "homepage": "https://github.com/Maratyszcza/pthreadpool", + "dependencies": [ + "fxdiv" + ] +} diff --git a/externals/vcpkg/ports/pthreads/fix-arm-macro.patch b/externals/vcpkg/ports/pthreads/fix-arm-macro.patch new file mode 100755 index 000000000..559b38579 --- /dev/null +++ b/externals/vcpkg/ports/pthreads/fix-arm-macro.patch @@ -0,0 +1,13 @@ +diff --git a/context.h b/context.h +index 33294c1..318b689 100644 +--- a/context.h ++++ b/context.h +@@ -62,7 +62,7 @@ + #endif + + #if defined(_ARM_) || defined(ARM) || defined(_M_ARM) || defined(_M_ARM64) +-#define PTW32_PROGCTR(Context) ((Context).Pc) ++#define __PTW32_PROGCTR(Context) ((Context).Pc) + #endif + + #if !defined (__PTW32_PROGCTR) diff --git a/externals/vcpkg/ports/pthreads/fix-uwp-linkage.patch b/externals/vcpkg/ports/pthreads/fix-uwp-linkage.patch new file mode 100755 index 000000000..77d3a5b15 --- /dev/null +++ b/externals/vcpkg/ports/pthreads/fix-uwp-linkage.patch @@ -0,0 +1,17 @@ +diff --git a/implement.h b/implement.h +index 1579376..3a7d29b 100644 +--- a/implement.h ++++ b/implement.h +@@ -36,6 +36,12 @@ + #if !defined(_IMPLEMENT_H) + #define _IMPLEMENT_H + ++#if 1 // The condition should be `defined(__cplusplus_winrt)` when compile option is provided correctly. ++// porvide 2 static libs to resolve link error. 'kernel32' and 'windowsapp' ++#pragma comment(lib, "kernel32") ++#pragma comment(lib, "WindowsApp") ++#endif ++ + #if !defined (__PTW32_CONFIG_H) + # error "config.h was not #included" + #endif diff --git a/externals/vcpkg/ports/pthreads/portfile.cmake b/externals/vcpkg/ports/pthreads/portfile.cmake new file mode 100755 index 000000000..47493940e --- /dev/null +++ b/externals/vcpkg/ports/pthreads/portfile.cmake @@ -0,0 +1,108 @@ +if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + return() +endif() + +set(PTHREADS4W_VERSION "3.0.0") + +if(VCPKG_TARGET_IS_UWP) + list(APPEND PATCH_FILES fix-uwp-linkage.patch) + # Inject linker option using the `LINK` environment variable + # https://docs.microsoft.com/en-us/cpp/build/reference/linker-options + # https://docs.microsoft.com/en-us/cpp/build/reference/linking#link-environment-variables + set(ENV{LINK} "/APPCONTAINER") +endif() +if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + list(APPEND PATCH_FILES use-md.patch) +else() + list(APPEND PATCH_FILES use-mt.patch) +endif() + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO pthreads4w + FILENAME "pthreads4w-code-v${PTHREADS4W_VERSION}.zip" + SHA512 49e541b66c26ddaf812edb07b61d0553e2a5816ab002edc53a38a897db8ada6d0a096c98a9af73a8f40c94283df53094f76b429b09ac49862465d8697ed20013 + PATCHES + fix-arm-macro.patch + ${PATCH_FILES} +) + +find_program(NMAKE nmake REQUIRED) + +################ +# Release build +################ +message(STATUS "Building ${TARGET_TRIPLET}-rel") +file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR_REL) +vcpkg_execute_required_process( + COMMAND ${NMAKE} -f Makefile all install + "DESTROOT=\"${INST_DIR_REL}\"" + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME nmake-build-${TARGET_TRIPLET}-release +) +message(STATUS "Building ${TARGET_TRIPLET}-rel done") + +################ +# Debug build +################ +message(STATUS "Building ${TARGET_TRIPLET}-dbg") +file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/debug" INST_DIR_DBG) +vcpkg_execute_required_process( + COMMAND ${NMAKE} /G -f Makefile all install + "DESTROOT=\"${INST_DIR_DBG}\"" + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME nmake-build-${TARGET_TRIPLET}-debug +) +message(STATUS "Building ${TARGET_TRIPLET}-dbg done") + +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/pthreadVC3d.dll") +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/pthreadVCE3d.dll") +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/pthreadVSE3d.dll") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/pthreadVC3.dll") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/pthreadVCE3.dll") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/pthreadVSE3.dll") + +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVC3d.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVCE3d.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVSE3d.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVC3.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVCE3.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVSE3.lib") + +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pthreadVC3d.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pthreadVCE3d.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pthreadVSE3d.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVC3.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVCE3.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVSE3.lib") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVC3.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVCE3.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVSE3.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVC3d.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVCE3d.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVSE3d.lib") +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libpthreadVC3.lib ${CURRENT_PACKAGES_DIR}/lib/pthreadVC3.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libpthreadVCE3.lib ${CURRENT_PACKAGES_DIR}/lib/pthreadVCE3.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libpthreadVSE3.lib ${CURRENT_PACKAGES_DIR}/lib/pthreadVSE3.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVC3d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVC3d.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVCE3d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVCE3d.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVSE3d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVSE3d.lib) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthread) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthreads) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthreads_windows) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) diff --git a/externals/vcpkg/ports/pthreads/usage b/externals/vcpkg/ports/pthreads/usage new file mode 100755 index 000000000..343c97f44 --- /dev/null +++ b/externals/vcpkg/ports/pthreads/usage @@ -0,0 +1,9 @@ +The package pthreads provides CMake targets: + + find_package(pthreads REQUIRED) + + target_link_libraries(main PRIVATE PThreads4W::PThreads4W) + #or + target_link_libraries(main PRIVATE PThreads4W::PThreads4W_CXXEXC) + #or + target_link_libraries(main PRIVATE PThreads4W::PThreads4W_STRUCTEXC) \ No newline at end of file diff --git a/externals/vcpkg/ports/pthreads/use-md.patch b/externals/vcpkg/ports/pthreads/use-md.patch new file mode 100755 index 000000000..b25a744a8 --- /dev/null +++ b/externals/vcpkg/ports/pthreads/use-md.patch @@ -0,0 +1,33 @@ +diff --git a/Makefile b/Makefile +index a703b9c..ff81e7c 100644 +--- a/Makefile ++++ b/Makefile +@@ -173,22 +173,22 @@ VC-debug: + # @ $(MAKE) /E /nologo XCFLAGS="/MTd" EHFLAGS="$(VCFLAGSD) /D__PTW32_STATIC_LIB" CLEANUP=__PTW32_CLEANUP_C pthreadVC$(PTW32_VER_DEBUG).small_static_stamp + + VCE-static: +- @ $(MAKE) /E /nologo XCFLAGS="/MT" EHFLAGS="$(VCEFLAGS) /D__PTW32_STATIC_LIB /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_CXX pthreadVCE$(PTW32_VER).inlined_static_stamp ++ @ $(MAKE) /E /nologo XCFLAGS="/MD" EHFLAGS="$(VCEFLAGS) /D__PTW32_STATIC_LIB /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_CXX pthreadVCE$(PTW32_VER).inlined_static_stamp + + VCE-static-debug: +- @ $(MAKE) /E /nologo XCFLAGS="/MTd" EHFLAGS="$(VCEFLAGSD) /D__PTW32_STATIC_LIB /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_CXX pthreadVCE$(PTW32_VER_DEBUG).inlined_static_stamp ++ @ $(MAKE) /E /nologo XCFLAGS="/MDd" EHFLAGS="$(VCEFLAGSD) /D__PTW32_STATIC_LIB /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_CXX pthreadVCE$(PTW32_VER_DEBUG).inlined_static_stamp + + VSE-static: +- @ $(MAKE) /E /nologo XCFLAGS="/MT" EHFLAGS="$(VSEFLAGS) /D__PTW32_STATIC_LIB /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_SEH pthreadVSE$(PTW32_VER).inlined_static_stamp ++ @ $(MAKE) /E /nologo XCFLAGS="/MD" EHFLAGS="$(VSEFLAGS) /D__PTW32_STATIC_LIB /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_SEH pthreadVSE$(PTW32_VER).inlined_static_stamp + + VSE-static-debug: +- @ $(MAKE) /E /nologo XCFLAGS="/MTd" EHFLAGS="$(VSEFLAGSD) /D__PTW32_STATIC_LIB /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_SEH pthreadVSE$(PTW32_VER_DEBUG).inlined_static_stamp ++ @ $(MAKE) /E /nologo XCFLAGS="/MDd" EHFLAGS="$(VSEFLAGSD) /D__PTW32_STATIC_LIB /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_SEH pthreadVSE$(PTW32_VER_DEBUG).inlined_static_stamp + + VC-static: +- @ $(MAKE) /E /nologo XCFLAGS="/MT" EHFLAGS="$(VCFLAGS) /D__PTW32_STATIC_LIB /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_C pthreadVC$(PTW32_VER).inlined_static_stamp ++ @ $(MAKE) /E /nologo XCFLAGS="/MD" EHFLAGS="$(VCFLAGS) /D__PTW32_STATIC_LIB /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_C pthreadVC$(PTW32_VER).inlined_static_stamp + + VC-static-debug: +- @ $(MAKE) /E /nologo XCFLAGS="/MTd" EHFLAGS="$(VCFLAGSD) /D__PTW32_STATIC_LIB /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_C pthreadVC$(PTW32_VER_DEBUG).inlined_static_stamp ++ @ $(MAKE) /E /nologo XCFLAGS="/MDd" EHFLAGS="$(VCFLAGSD) /D__PTW32_STATIC_LIB /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_C pthreadVC$(PTW32_VER_DEBUG).inlined_static_stamp + + + realclean: clean diff --git a/externals/vcpkg/ports/pthreads/use-mt.patch b/externals/vcpkg/ports/pthreads/use-mt.patch new file mode 100755 index 000000000..41154e031 --- /dev/null +++ b/externals/vcpkg/ports/pthreads/use-mt.patch @@ -0,0 +1,33 @@ +diff --git a/Makefile b/Makefile +index a703b9c..502275f 100644 +--- a/Makefile ++++ b/Makefile +@@ -134,22 +134,22 @@ all-tests-mt: + @ echo $@ completed successfully. + + VCE: +- @ $(MAKE) /E /nologo XCFLAGS="/MD" EHFLAGS="$(VCEFLAGS) /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_CXX pthreadVCE$(PTW32_VER).dll ++ @ $(MAKE) /E /nologo XCFLAGS="/MT" EHFLAGS="$(VCEFLAGS) /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_CXX pthreadVCE$(PTW32_VER).dll + + VCE-debug: +- @ $(MAKE) /E /nologo XCFLAGS="/MDd" EHFLAGS="$(VCEFLAGSD) /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_CXX pthreadVCE$(PTW32_VER_DEBUG).dll ++ @ $(MAKE) /E /nologo XCFLAGS="/MTd" EHFLAGS="$(VCEFLAGSD) /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_CXX pthreadVCE$(PTW32_VER_DEBUG).dll + + VSE: +- @ $(MAKE) /E /nologo XCFLAGS="/MD" EHFLAGS="$(VSEFLAGS) /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_SEH pthreadVSE$(PTW32_VER).dll ++ @ $(MAKE) /E /nologo XCFLAGS="/MT" EHFLAGS="$(VSEFLAGS) /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_SEH pthreadVSE$(PTW32_VER).dll + + VSE-debug: +- @ $(MAKE) /E /nologo XCFLAGS="/MDd" EHFLAGS="$(VSEFLAGSD) /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_SEH pthreadVSE$(PTW32_VER_DEBUG).dll ++ @ $(MAKE) /E /nologo XCFLAGS="/MTd" EHFLAGS="$(VSEFLAGSD) /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_SEH pthreadVSE$(PTW32_VER_DEBUG).dll + + VC: +- @ $(MAKE) /E /nologo XCFLAGS="/MD" EHFLAGS="$(VCFLAGS) /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_C pthreadVC$(PTW32_VER).dll ++ @ $(MAKE) /E /nologo XCFLAGS="/MT" EHFLAGS="$(VCFLAGS) /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_C pthreadVC$(PTW32_VER).dll + + VC-debug: +- @ $(MAKE) /E /nologo XCFLAGS="/MDd" EHFLAGS="$(VCFLAGSD) /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_C pthreadVC$(PTW32_VER_DEBUG).dll ++ @ $(MAKE) /E /nologo XCFLAGS="/MTd" EHFLAGS="$(VCFLAGSD) /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_C pthreadVC$(PTW32_VER_DEBUG).dll + + # + # Static builds diff --git a/externals/vcpkg/ports/pthreads/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/pthreads/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..f9818d384 --- /dev/null +++ b/externals/vcpkg/ports/pthreads/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,227 @@ +#.rst: +# PThreads4W config wrap for vcpkg +# ------------ +# +# Find the PThread4W includes and library. +# +# Result Variables +# ^^^^^^^^^^^^^^^^ +# +# This script defines the following variables: +# +# ``PThreads4W_FOUND`` +# True if PThreads4W library found +# +# ``PThreads4W_VERSION`` +# Containing the PThreads4W version tag (manually defined) +# +# ``PThreads4W_INCLUDE_DIR`` +# Location of PThreads4W headers +# +# ``PThreads4W_LIBRARY`` +# List of libraries to link with when using PThreads4W (no exception handling) +# +# ``PThreads4W_CXXEXC_LIBRARY`` +# List of libraries to link with when using PThreads4W (C++ exception handling) +# +# ``PThreads4W_STRUCTEXC_LIBRARY`` +# List of libraries to link with when using PThreads4W (struct exception handling) +# +# Result Targets +# ^^^^^^^^^^^^^^^^ +# +# This script defines the following targets: +# +# ``PThreads4W::PThreads4W`` +# Target to use PThreads4W (no exception handling) +# +# ``PThreads4W::PThreads4W_CXXEXC`` +# Target to use PThreads4W (C++ exception handling) +# +# ``PThreads4W::PThreads4W_STRUCTEXC`` +# Target to use PThreads4W (struct exception handling) +# + +include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) +include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) + +if(NOT PThreads4W_INCLUDE_DIR) + find_path(PThreads4W_INCLUDE_DIR NAMES pthread.h) +endif() + +set(PThreads4W_MAJOR_VERSION 3) +set(PThreads4W_MINOR_VERSION 0) +set(PThreads4W_PATCH_VERSION 0) +set(PThreads4W_VERSION "${PThreads4W_MAJOR_VERSION}.${PThreads4W_MINOR_VERSION}.${PThreads4W_PATCH_VERSION}") + +# Allow libraries to be set manually +if(NOT PThreads4W_LIBRARY) + find_library(PThreads4W_LIBRARY_RELEASE NAMES pthreadVC${PThreads4W_MAJOR_VERSION}) + find_library(PThreads4W_LIBRARY_DEBUG NAMES pthreadVC${PThreads4W_MAJOR_VERSION}d) + select_library_configurations(PThreads4W) +endif() +if(NOT PThreads4W_CXXEXC_LIBRARY) + find_library(PThreads4W_CXXEXC_LIBRARY_RELEASE NAMES pthreadVCE${PThreads4W_MAJOR_VERSION}) + find_library(PThreads4W_CXXEXC_LIBRARY_DEBUG NAMES pthreadVCE${PThreads4W_MAJOR_VERSION}d) + select_library_configurations(PThreads4W_CXXEXC) +endif() +if(NOT PThreads4W_STRUCTEXC_LIBRARY) + find_library(PThreads4W_STRUCTEXC_LIBRARY_RELEASE NAMES pthreadVSE${PThreads4W_MAJOR_VERSION}) + find_library(PThreads4W_STRUCTEXC_LIBRARY_DEBUG NAMES pthreadVSE${PThreads4W_MAJOR_VERSION}d) + select_library_configurations(PThreads4W_STRUCTEXC) +endif() + +find_package_handle_standard_args(PThreads4W DEFAULT_MSG PThreads4W_LIBRARY PThreads4W_CXXEXC_LIBRARY PThreads4W_STRUCTEXC_LIBRARY PThreads4W_INCLUDE_DIR) +mark_as_advanced(PThreads4W_INCLUDE_DIR PThreads4W_LIBRARY PThreads4W_CXXEXC_LIBRARY PThreads4W_STRUCTEXC_LIBRARY) + +set(PThreads4W_DLL_DIR ${PThreads4W_INCLUDE_DIR}) +list(TRANSFORM PThreads4W_DLL_DIR APPEND "/../bin") +message(STATUS "PThreads4W_DLL_DIR: ${PThreads4W_DLL_DIR}") +set(PThreads4W_DEBUG_DLL_DIR ${PThreads4W_INCLUDE_DIR}) +list(TRANSFORM PThreads4W_DEBUG_DLL_DIR APPEND "/../debug/bin") +message(STATUS "PThreads4W_DEBUG_DLL_DIR: ${PThreads4W_DEBUG_DLL_DIR}") + +find_file(PThreads4W_LIBRARY_RELEASE_DLL NAMES pthreadVC${PThreads4W_MAJOR_VERSION}.dll PATHS ${PThreads4W_DLL_DIR}) +find_file(PThreads4W_LIBRARY_DEBUG_DLL NAMES pthreadVC${PThreads4W_MAJOR_VERSION}d.dll PATHS ${PThreads4W_DEBUG_DLL_DIR}) +find_file(PThreads4W_CXXEXC_LIBRARY_RELEASE_DLL NAMES pthreadVCE${PThreads4W_MAJOR_VERSION}.dll PATHS ${PThreads4W_DLL_DIR}) +find_file(PThreads4W_CXXEXC_LIBRARY_DEBUG_DLL NAMES pthreadVCE${PThreads4W_MAJOR_VERSION}d.dll PATHS ${PThreads4W_DEBUG_DLL_DIR}) +find_file(PThreads4W_STRUCTEXC_LIBRARY_RELEASE_DLL NAMES pthreadVSE${PThreads4W_MAJOR_VERSION}.dll PATHS ${PThreads4W_DLL_DIR}) +find_file(PThreads4W_STRUCTEXC_LIBRARY_DEBUG_DLL NAMES pthreadVSE${PThreads4W_MAJOR_VERSION}d.dll PATHS ${PThreads4W_DEBUG_DLL_DIR}) + +#Compatibility definitions, deprecated +set(PTHREAD_INCLUDE_DIR ${PThreads4W_INCLUDE_DIR} CACHE PATH "") +set(PTHREADS_INCLUDE_DIR ${PThreads4W_INCLUDE_DIR} CACHE PATH "") +set(PThreads_windows_INCLUDE_DIR ${PThreads4W_INCLUDE_DIR} CACHE PATH "") +set(PTHREAD_LIBRARIES ${PThreads4W_LIBRARY} CACHE STRING "") +set(PTHREADS_LIBRARIES ${PThreads4W_LIBRARY} CACHE STRING "") +set(PTHREAD_LIBRARY ${PThreads4W_LIBRARY} CACHE STRING "") +set(PTHREADS_LIBRARY ${PThreads4W_LIBRARY} CACHE STRING "") +set(LIBPTHREAD ${PThreads4W_LIBRARY} CACHE STRING "") +set(LIBPTHREADS ${PThreads4W_LIBRARY} CACHE STRING "") +set(PThreads_windows_LIBRARY ${PThreads4W_LIBRARY} CACHE STRING "") +set(PThreads_VERSION "${PThreads4W_VERSION}") +if(PThreads4W_FOUND) + set(PThreads_windows_FOUND TRUE) +endif() + +#TARGETS +if( PThreads4W_FOUND AND NOT TARGET PThreads4W::PThreads4W_CXXEXC ) + if( EXISTS "${PThreads4W_CXXEXC_LIBRARY_RELEASE_DLL}" ) + add_library( PThreads4W::PThreads4W_CXXEXC SHARED IMPORTED ) + set_target_properties( PThreads4W::PThreads4W_CXXEXC PROPERTIES + IMPORTED_LOCATION_RELEASE "${PThreads4W_CXXEXC_LIBRARY_RELEASE_DLL}" + IMPORTED_IMPLIB "${PThreads4W_CXXEXC_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${PThreads4W_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C" ) + if( EXISTS "${PThreads4W_CXXEXC_LIBRARY_DEBUG_DLL}" ) + set_property( TARGET PThreads4W::PThreads4W_CXXEXC APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) + set_target_properties( PThreads4W::PThreads4W_CXXEXC PROPERTIES + IMPORTED_LOCATION_DEBUG "${PThreads4W_CXXEXC_LIBRARY_DEBUG_DLL}" + IMPORTED_IMPLIB_DEBUG "${PThreads4W_CXXEXC_LIBRARY_DEBUG}" ) + endif() + else() + add_library( PThreads4W::PThreads4W_CXXEXC UNKNOWN IMPORTED ) + set_target_properties( PThreads4W::PThreads4W_CXXEXC PROPERTIES + IMPORTED_LOCATION_RELEASE "${PThreads4W_CXXEXC_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${PThreads4W_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C" ) + if( EXISTS "${PThreads4W_CXXEXC_LIBRARY_DEBUG}" ) + set_property( TARGET PThreads4W::PThreads4W_CXXEXC APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) + set_target_properties( PThreads4W::PThreads4W_CXXEXC PROPERTIES + IMPORTED_LOCATION_DEBUG "${PThreads4W_CXXEXC_LIBRARY_DEBUG}" ) + endif() + endif() +endif() + +if( PThreads4W_FOUND AND NOT TARGET PThreads4W::PThreads4W_STRUCTEXC ) + if( EXISTS "${PThreads4W_STRUCTEXC_LIBRARY_RELEASE_DLL}" ) + add_library( PThreads4W::PThreads4W_STRUCTEXC SHARED IMPORTED ) + set_target_properties( PThreads4W::PThreads4W_STRUCTEXC PROPERTIES + IMPORTED_LOCATION_RELEASE "${PThreads4W_STRUCTEXC_LIBRARY_RELEASE_DLL}" + IMPORTED_IMPLIB "${PThreads4W_STRUCTEXC_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${PThreads4W_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C" ) + if( EXISTS "${PThreads4W_STRUCTEXC_LIBRARY_DEBUG_DLL}" ) + set_property( TARGET PThreads4W::PThreads4W_STRUCTEXC APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) + set_target_properties( PThreads4W::PThreads4W_STRUCTEXC PROPERTIES + IMPORTED_LOCATION_DEBUG "${PThreads4W_STRUCTEXC_LIBRARY_DEBUG_DLL}" + IMPORTED_IMPLIB_DEBUG "${PThreads4W_STRUCTEXC_LIBRARY_DEBUG}" ) + endif() + else() + add_library( PThreads4W::PThreads4W_STRUCTEXC UNKNOWN IMPORTED ) + set_target_properties( PThreads4W::PThreads4W_STRUCTEXC PROPERTIES + IMPORTED_LOCATION_RELEASE "${PThreads4W_STRUCTEXC_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${PThreads4W_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C" ) + if( EXISTS "${PThreads4W_STRUCTEXC_LIBRARY_DEBUG}" ) + set_property( TARGET PThreads4W::PThreads4W_STRUCTEXC APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) + set_target_properties( PThreads4W::PThreads4W_STRUCTEXC PROPERTIES + IMPORTED_LOCATION_DEBUG "${PThreads4W_STRUCTEXC_LIBRARY_DEBUG}" ) + endif() + endif() +endif() + +if( PThreads4W_FOUND AND NOT TARGET PThreads4W::PThreads4W ) + if( EXISTS "${PThreads4W_LIBRARY_RELEASE_DLL}" ) + add_library( PThreads4W::PThreads4W SHARED IMPORTED ) + set_target_properties( PThreads4W::PThreads4W PROPERTIES + IMPORTED_LOCATION_RELEASE "${PThreads4W_LIBRARY_RELEASE_DLL}" + IMPORTED_IMPLIB "${PThreads4W_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${PThreads4W_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C" ) + if( EXISTS "${PThreads4W_LIBRARY_DEBUG_DLL}" ) + set_property( TARGET PThreads4W::PThreads4W APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) + set_target_properties( PThreads4W::PThreads4W PROPERTIES + IMPORTED_LOCATION_DEBUG "${PThreads4W_LIBRARY_DEBUG_DLL}" + IMPORTED_IMPLIB_DEBUG "${PThreads4W_LIBRARY_DEBUG}" ) + endif() + else() + add_library( PThreads4W::PThreads4W UNKNOWN IMPORTED ) + set_target_properties( PThreads4W::PThreads4W PROPERTIES + IMPORTED_LOCATION_RELEASE "${PThreads4W_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${PThreads4W_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C" ) + if( EXISTS "${PThreads4W_LIBRARY_DEBUG}" ) + set_property( TARGET PThreads4W::PThreads4W APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) + set_target_properties( PThreads4W::PThreads4W PROPERTIES + IMPORTED_LOCATION_DEBUG "${PThreads4W_LIBRARY_DEBUG}" ) + endif() + endif() +endif() + +#Compatibility targets, deprecated +if( PThreads4W_FOUND AND NOT TARGET PThreads_windows::PThreads_windows ) + if( EXISTS "${PThreads4W_LIBRARY_RELEASE_DLL}" ) + add_library( PThreads_windows::PThreads_windows SHARED IMPORTED ) + set_target_properties( PThreads_windows::PThreads_windows PROPERTIES + IMPORTED_LOCATION_RELEASE "${PThreads4W_LIBRARY_RELEASE_DLL}" + IMPORTED_IMPLIB "${PThreads4W_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${PThreads4W_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C" ) + if( EXISTS "${PThreads4W_LIBRARY_DEBUG_DLL}" ) + set_property( TARGET PThreads_windows::PThreads_windows APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) + set_target_properties( PThreads_windows::PThreads_windows PROPERTIES + IMPORTED_LOCATION_DEBUG "${PThreads4W_LIBRARY_DEBUG_DLL}" + IMPORTED_IMPLIB_DEBUG "${PThreads4W_LIBRARY_DEBUG}" ) + endif() + else() + add_library( PThreads_windows::PThreads_windows UNKNOWN IMPORTED ) + set_target_properties( PThreads_windows::PThreads_windows PROPERTIES + IMPORTED_LOCATION_RELEASE "${PThreads4W_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${PThreads4W_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C" ) + if( EXISTS "${PThreads4W_LIBRARY_DEBUG}" ) + set_property( TARGET PThreads_windows::PThreads_windows APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) + set_target_properties( PThreads_windows::PThreads_windows PROPERTIES + IMPORTED_LOCATION_DEBUG "${PThreads4W_LIBRARY_DEBUG}" ) + endif() + endif() +endif() diff --git a/externals/vcpkg/ports/pthreads/vcpkg.json b/externals/vcpkg/ports/pthreads/vcpkg.json new file mode 100755 index 000000000..db809649b --- /dev/null +++ b/externals/vcpkg/ports/pthreads/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "pthreads", + "version": "3.0.0", + "port-version": 10, + "description": "pthreads for windows", + "homepage": "https://sourceware.org/pub/pthreads-win32/" +} diff --git a/externals/vcpkg/ports/ptyqt/portfile.cmake b/externals/vcpkg/ports/ptyqt/portfile.cmake new file mode 100755 index 000000000..c478deace --- /dev/null +++ b/externals/vcpkg/ports/ptyqt/portfile.cmake @@ -0,0 +1,42 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kafeg/ptyqt + REF 0.6.5 + SHA512 0deb12be6c0e7bb44775daef3d4361c5d22143bc32cbf251ef99f10784b8996c4aa8e2806f1e08c3b39749ada6e85be91d721830ceee5d6ff86eaf714ef4c928 + HEAD_REF master +) + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -lrt") + set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -lrt") + + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + file(READ ${SOURCE_PATH}/core/CMakeLists.txt filedata) + string(REPLACE "-static-libstdc++" "-static-libstdc++ -lglib-2.0" filedata "${filedata}") + file(WRITE ${SOURCE_PATH}/core/CMakeLists.txt "${filedata}") + else() + file(READ ${SOURCE_PATH}/core/CMakeLists.txt filedata) + string(REPLACE "-static-libstdc++ -lglib-2.0" "-static-libstdc++" filedata "${filedata}") + file(WRITE ${SOURCE_PATH}/core/CMakeLists.txt "${filedata}") + endif() +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(BUILD_TYPE SHARED) +else() + set(BUILD_TYPE STATIC) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DNO_BUILD_TESTS=1 + -DNO_BUILD_EXAMPLES=1 + -DBUILD_TYPE=${BUILD_TYPE} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/ptyqt/vcpkg.json b/externals/vcpkg/ports/ptyqt/vcpkg.json new file mode 100755 index 000000000..ff24709cb --- /dev/null +++ b/externals/vcpkg/ports/ptyqt/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "ptyqt", + "version": "0.6.5", + "description": "PtyQt - C++ library for work with PseudoTerminals", + "supports": "!uwp", + "dependencies": [ + "qt5-base", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + { + "name": "winpty", + "platform": "windows" + } + ] +} diff --git a/externals/vcpkg/ports/pugixml/portfile.cmake b/externals/vcpkg/ports/pugixml/portfile.cmake new file mode 100755 index 000000000..372e0f8ec --- /dev/null +++ b/externals/vcpkg/ports/pugixml/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO zeux/pugixml + REF v1.12.1 + SHA512 c1a80518e8d7b21f2a15b2023b77e87484f5b7581e68ff508785a60cab53d1689b5508f5a652d6f0d4fbcc91f66d59246fdfe499fd6b0e188c7914ed5919980b + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DPUGIXML_BUILD_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/pugixml) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/pugixml/vcpkg.json b/externals/vcpkg/ports/pugixml/vcpkg.json new file mode 100755 index 000000000..4485b7042 --- /dev/null +++ b/externals/vcpkg/ports/pugixml/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "pugixml", + "version": "1.12.1", + "description": "Light-weight, simple and fast XML parser for C++ with XPath support", + "homepage": "https://github.com/zeux/pugixml", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/pybind11/portfile.cmake b/externals/vcpkg/ports/pybind11/portfile.cmake new file mode 100755 index 000000000..113a679c9 --- /dev/null +++ b/externals/vcpkg/ports/pybind11/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO pybind/pybind11 + REF v2.9.2 + SHA512 c6c18e5f59873adb3692640ade26472abd257607e7bb9fd48cfd1949878811e83d6ac6eb8c8dd926622d52ca4f13e5e6a58e0abaaaa1fa814ee831ea2b515272 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DPYBIND11_TEST=OFF + -DPYBIND11_FINDPYTHON=ON + OPTIONS_RELEASE + -DPYTHON_IS_DEBUG=OFF + OPTIONS_DEBUG + -DPYTHON_IS_DEBUG=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/pybind11") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/") + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/pybind11/pybind11Tools.cmake" + [=[find_package(PythonLibsNew ${PYBIND11_PYTHON_VERSION} MODULE REQUIRED ${_pybind11_quiet})]=] + [=[find_package(PythonLibs ${PYBIND11_PYTHON_VERSION} MODULE REQUIRED ${_pybind11_quiet})]=]) # CMake's PythonLibs works better with vcpkg + +# copy license +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/pybind11/vcpkg.json b/externals/vcpkg/ports/pybind11/vcpkg.json new file mode 100755 index 000000000..6c9dcf63d --- /dev/null +++ b/externals/vcpkg/ports/pybind11/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "pybind11", + "version": "2.9.2", + "description": "pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code", + "homepage": "https://github.com/pybind/pybind11", + "license": "BSD-3-Clause", + "supports": "!(arm & windows)", + "dependencies": [ + "python3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/pystring/CMakeLists.txt b/externals/vcpkg/ports/pystring/CMakeLists.txt new file mode 100755 index 000000000..48df84919 --- /dev/null +++ b/externals/vcpkg/ports/pystring/CMakeLists.txt @@ -0,0 +1,31 @@ +cmake_minimum_required(VERSION 3.12) +project(pystring CXX) + +if(MSVC) + add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS) +endif() + +add_library(pystring pystring.cpp) +target_include_directories( + pystring + PUBLIC + $ + $ +) + +include(GNUInstallDirs) + +install( + TARGETS pystring + EXPORT pystring-config +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES pystring.h DESTINATION include/pystring) +endif() + +install( + EXPORT pystring-config + NAMESPACE pystring:: + DESTINATION share/pystring +) diff --git a/externals/vcpkg/ports/pystring/portfile.cmake b/externals/vcpkg/ports/pystring/portfile.cmake new file mode 100755 index 000000000..bc370a0c2 --- /dev/null +++ b/externals/vcpkg/ports/pystring/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO imageworks/pystring + REF v1.1.3 + SHA512 a46bb2e96d6eb351a4a8097cde46ac2877d28e88f9e57e0ac36c42e8fc8543517c4be70306a01e2f88a891fc53c612494aeb37f47a200d94b8e1b050ed16eff6 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/pystring/vcpkg.json b/externals/vcpkg/ports/pystring/vcpkg.json new file mode 100755 index 000000000..915b00604 --- /dev/null +++ b/externals/vcpkg/ports/pystring/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "pystring", + "version-semver": "1.1.3", + "port-version": 5, + "description": "Pystring is a collection of C++ functions which match the interface and behavior of python's string class methods using std::string", + "homepage": "https://github.com/imageworks/pystring", + "license": "LGPL-2.1-only", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/python2/001-build-msvc.patch b/externals/vcpkg/ports/python2/001-build-msvc.patch new file mode 100755 index 000000000..c1749b7af --- /dev/null +++ b/externals/vcpkg/ports/python2/001-build-msvc.patch @@ -0,0 +1,199 @@ +diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py +index 86a85c1..65a60b5 100644 +--- a/Lib/distutils/command/build_ext.py ++++ b/Lib/distutils/command/build_ext.py +@@ -193,7 +193,7 @@ class build_ext (Command): + # Append the source distribution include and library directories, + # this allows distutils on windows to work in the source tree + self.include_dirs.append(os.path.join(sys.exec_prefix, 'PC')) +- if MSVC_VERSION == 9: ++ if MSVC_VERSION >= 9: + # Use the .lib files for the correct architecture + if self.plat_name == 'win32': + suffix = '' +diff --git a/Lib/distutils/msvc9compiler.py b/Lib/distutils/msvc9compiler.py +index 33d3e51..9fe6417 100644 +--- a/Lib/distutils/msvc9compiler.py ++++ b/Lib/distutils/msvc9compiler.py +@@ -662,11 +662,12 @@ class MSVCCompiler(CCompiler) : + if mfinfo is not None: + mffilename, mfid = mfinfo + out_arg = '-outputresource:%s;%s' % (output_filename, mfid) +- try: +- self.spawn(['mt.exe', '-nologo', '-manifest', +- mffilename, out_arg]) +- except DistutilsExecError, msg: +- raise LinkError(msg) ++ if self.__version < 10: ++ try: ++ self.spawn(['mt.exe', '-nologo', '-manifest', ++ mffilename, out_arg]) ++ except DistutilsExecError, msg: ++ raise LinkError(msg) + else: + log.debug("skipping %s (up-to-date)", output_filename) + +diff --git a/PC/dl_nt.c b/PC/dl_nt.c +index 3e58bac..cad9de5 100644 +--- a/PC/dl_nt.c ++++ b/PC/dl_nt.c +@@ -18,6 +18,7 @@ char dllVersionBuffer[16] = ""; // a private buffer + HMODULE PyWin_DLLhModule = NULL; + const char *PyWin_DLLVersionString = dllVersionBuffer; + ++#if HAVE_SXS + // Windows "Activation Context" work: + // Our .pyd extension modules are generally built without a manifest (ie, + // those included with Python and those built with a default distutils. +@@ -29,6 +30,8 @@ const char *PyWin_DLLVersionString = dllVersionBuffer; + // As an added complication, this magic only works on XP or later - we simply + // use the existence (or not) of the relevant function pointers from kernel32. + // See bug 4566 (http://python.org/sf/4566) for more details. ++// In Visual Studio 2010, side by side assemblies are no longer used by ++// default. + + typedef BOOL (WINAPI * PFN_GETCURRENTACTCTX)(HANDLE *); + typedef BOOL (WINAPI * PFN_ACTIVATEACTCTX)(HANDLE, ULONG_PTR *); +@@ -75,6 +78,7 @@ void _Py_DeactivateActCtx(ULONG_PTR cookie) + if (!(*pfnDeactivateActCtx)(0, cookie)) + OutputDebugString("Python failed to de-activate the activation context\n"); + } ++#endif /* HAVE_SXS */ + + BOOL WINAPI DllMain (HANDLE hInst, + ULONG ul_reason_for_call, +@@ -87,6 +91,7 @@ BOOL WINAPI DllMain (HANDLE hInst, + // 1000 is a magic number I picked out of the air. Could do with a #define, I spose... + LoadString(hInst, 1000, dllVersionBuffer, sizeof(dllVersionBuffer)); + ++#if HAVE_SXS + // and capture our activation context for use when loading extensions. + _LoadActCtxPointers(); + if (pfnGetCurrentActCtx && pfnAddRefActCtx) +@@ -98,12 +103,15 @@ BOOL WINAPI DllMain (HANDLE hInst, + "activation context\n"); + return FALSE; + } ++#endif + break; + + case DLL_PROCESS_DETACH: ++#if HAVE_SXS + if (pfnReleaseActCtx) + (*pfnReleaseActCtx)(PyWin_DLLhActivationContext); ++#endif + break; + } + return TRUE; + } +diff --git a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c +index 44c82e4..091957e 100644 +--- a/PC/msvcrtmodule.c ++++ b/PC/msvcrtmodule.c +@@ -25,6 +25,8 @@ + #ifdef _MSC_VER + #if _MSC_VER >= 1500 && _MSC_VER < 1600 + #include ++#elif _MSC_VER >= 1600 ++#include + #endif + #endif + +@@ -398,7 +400,7 @@ PyMODINIT_FUNC + initmsvcrt(void) + { + int st; +- PyObject *d; ++ PyObject *d, *version; + PyObject *m = Py_InitModule("msvcrt", msvcrt_functions); + if (m == NULL) + return; +@@ -412,6 +414,7 @@ initmsvcrt(void) + insertint(d, "LK_UNLCK", _LK_UNLCK); + + /* constants for the crt versions */ ++ (void)st; + #ifdef _VC_ASSEMBLY_PUBLICKEYTOKEN + st = PyModule_AddStringConstant(m, "VC_ASSEMBLY_PUBLICKEYTOKEN", + _VC_ASSEMBLY_PUBLICKEYTOKEN); +@@ -427,4 +430,13 @@ initmsvcrt(void) + __LIBRARIES_ASSEMBLY_NAME_PREFIX); + if (st < 0)return; + #endif ++/* constants for the 2010 crt versions */ ++#if defined(_VC_CRT_MAJOR_VERSION) && defined (_VC_CRT_MINOR_VERSION) && defined(_VC_CRT_BUILD_VERSION) && defined(_VC_CRT_RBUILD_VERSION) ++ version = PyUnicode_FromFormat("%d.%d.%d.%d", _VC_CRT_MAJOR_VERSION, ++ _VC_CRT_MINOR_VERSION, ++ _VC_CRT_BUILD_VERSION, ++ _VC_CRT_RBUILD_VERSION); ++ st = PyModule_AddObject(m, "CRT_ASSEMBLY_VERSION", version); ++ if (st < 0) return NULL; ++#endif + } +diff --git a/PC/pyconfig.h b/PC/pyconfig.h +index 5fa6398..0cbd236 100644 +--- a/PC/pyconfig.h ++++ b/PC/pyconfig.h +@@ -226,14 +226,19 @@ typedef int pid_t; + #define Py_IS_FINITE(X) _finite(X) + #define copysign _copysign + +-#endif /* _MSC_VER */ ++/* Side by Side assemblies supported in VS 2005 and VS 2008 but not 2010*/ ++#if _MSC_VER >= 1400 && _MSC_VER < 1600 ++#define HAVE_SXS 1 ++#endif + + /* define some ANSI types that are not defined in earlier Win headers */ +-#if defined(_MSC_VER) && _MSC_VER >= 1200 ++#if _MSC_VER >= 1200 + /* This file only exists in VC 6.0 or higher */ + #include + #endif + ++#endif /* _MSC_VER */ ++ + /* ------------------------------------------------------------------------*/ + /* The Borland compiler defines __BORLANDC__ */ + /* XXX These defines are likely incomplete, but should be easy to fix. */ +diff --git a/Python/dynload_win.c b/Python/dynload_win.c +index 4e5555e..8626642 100644 +--- a/Python/dynload_win.c ++++ b/Python/dynload_win.c +@@ -12,8 +12,10 @@ + #include + + // "activation context" magic - see dl_nt.c... ++#if HAVE_SXS + extern ULONG_PTR _Py_ActivateActCtx(); + void _Py_DeactivateActCtx(ULONG_PTR cookie); ++#endif + + const struct filedescr _PyImport_DynLoadFiletab[] = { + #ifdef _DEBUG +@@ -176,7 +178,9 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname, + char pathbuf[260]; + LPTSTR dummy; + unsigned int old_mode; ++#if HAVE_SXS + ULONG_PTR cookie = 0; ++#endif + /* We use LoadLibraryEx so Windows looks for dependent DLLs + in directory of pathname first. However, Windows95 + can sometimes not work correctly unless the absolute +@@ -190,11 +194,15 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname, + sizeof(pathbuf), + pathbuf, + &dummy)) { ++#if HAVE_SXS + ULONG_PTR cookie = _Py_ActivateActCtx(); ++#endif + /* XXX This call doesn't exist in Windows CE */ + hDLL = LoadLibraryEx(pathname, NULL, + LOAD_WITH_ALTERED_SEARCH_PATH); ++#if HAVE_SXS + _Py_DeactivateActCtx(cookie); ++#endif + } + + /* restore old error mode settings */ diff --git a/externals/vcpkg/ports/python2/002-build-msvc.patch b/externals/vcpkg/ports/python2/002-build-msvc.patch new file mode 100755 index 000000000..c214ab2cc --- /dev/null +++ b/externals/vcpkg/ports/python2/002-build-msvc.patch @@ -0,0 +1,228 @@ +diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py +index ab10ec5..6c43d82 100644 +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -19,6 +19,8 @@ if os.name == "nt": + i = i + len(prefix) + s, rest = sys.version[i:].split(" ", 1) + majorVersion = int(s[:-2]) - 6 ++ if majorVersion >= 13: ++ majorVersion += 1 + minorVersion = int(s[2:3]) / 10.0 + # I don't think paths are affected by minor version in version 6 + if majorVersion == 6: +@@ -36,8 +38,10 @@ if os.name == "nt": + return None + if version <= 6: + clibname = 'msvcrt' +- else: ++ elif version <= 13: + clibname = 'msvcr%d' % (version * 10) ++ else: ++ clibname = 'appcrt%d' % (version * 10) + + # If python was built with in debug mode + import imp +diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py +index 65a60b5..b2ee260 100644 +--- a/Lib/distutils/command/build_ext.py ++++ b/Lib/distutils/command/build_ext.py +@@ -196,7 +196,7 @@ class build_ext (Command): + if MSVC_VERSION >= 9: + # Use the .lib files for the correct architecture + if self.plat_name == 'win32': +- suffix = '' ++ suffix = 'win32' + else: + # win-amd64 or win-ia64 + suffix = self.plat_name[4:] +diff --git a/Lib/distutils/msvc9compiler.py b/Lib/distutils/msvc9compiler.py +index 9fe6417..57d42b7 100644 +--- a/Lib/distutils/msvc9compiler.py ++++ b/Lib/distutils/msvc9compiler.py +@@ -182,6 +182,9 @@ def get_build_version(): + i = i + len(prefix) + s, rest = sys.version[i:].split(" ", 1) + majorVersion = int(s[:-2]) - 6 ++ if majorVersion >= 13: ++ # v13 was skipped and should be v14 ++ majorVersion += 1 + minorVersion = int(s[2:3]) / 10.0 + # I don't think paths are affected by minor version in version 6 + if majorVersion == 6: +diff --git a/Lib/distutils/msvccompiler.py b/Lib/distutils/msvccompiler.py +index 0e69fd3..77025c6 100644 +--- a/Lib/distutils/msvccompiler.py ++++ b/Lib/distutils/msvccompiler.py +@@ -164,6 +164,9 @@ def get_build_version(): + i = i + len(prefix) + s, rest = sys.version[i:].split(" ", 1) + majorVersion = int(s[:-2]) - 6 ++ if majorVersion >= 13: ++ # v13 was skipped and should be v14 ++ majorVersion += 1 + minorVersion = int(s[2:3]) / 10.0 + # I don't think paths are affected by minor version in version 6 + if majorVersion == 6: +diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c +index 7a1a694..7d07150 100644 +--- a/Modules/posixmodule.c ++++ b/Modules/posixmodule.c +@@ -558,15 +558,33 @@ _PyInt_FromDev(PY_LONG_LONG v) + /* The actual size of the structure is determined at runtime. + * Only the first items must be present. + */ ++ ++#if _MSC_VER >= 1900 ++ ++typedef struct { ++ CRITICAL_SECTION lock; ++ intptr_t osfhnd; ++ __int64 startpos; ++ char osfile; ++} my_ioinfo; ++ ++#define IOINFO_L2E 6 ++#define IOINFO_ARRAYS 128 ++ ++#else ++ + typedef struct { + intptr_t osfhnd; + char osfile; + } my_ioinfo; + +-extern __declspec(dllimport) char * __pioinfo[]; + #define IOINFO_L2E 5 +-#define IOINFO_ARRAY_ELTS (1 << IOINFO_L2E) + #define IOINFO_ARRAYS 64 ++ ++#endif ++ ++extern __declspec(dllimport) char * __pioinfo[]; ++#define IOINFO_ARRAY_ELTS (1 << IOINFO_L2E) + #define _NHANDLE_ (IOINFO_ARRAYS * IOINFO_ARRAY_ELTS) + #define FOPEN 0x01 + #define _NO_CONSOLE_FILENO (intptr_t)-2 +diff --git a/Modules/timemodule.c b/Modules/timemodule.c +index 61b8d61..7678283 100644 +--- a/Modules/timemodule.c ++++ b/Modules/timemodule.c +@@ -808,7 +808,7 @@ inittimezone(PyObject *m) { + #ifdef PYOS_OS2 + PyModule_AddIntConstant(m, "timezone", _timezone); + #else /* !PYOS_OS2 */ +- PyModule_AddIntConstant(m, "timezone", timezone); ++ PyModule_AddIntConstant(m, "timezone", _timezone); + #endif /* PYOS_OS2 */ + #ifdef HAVE_ALTZONE + PyModule_AddIntConstant(m, "altzone", altzone); +@@ -816,7 +816,7 @@ inittimezone(PyObject *m) { + #ifdef PYOS_OS2 + PyModule_AddIntConstant(m, "altzone", _timezone-3600); + #else /* !PYOS_OS2 */ +- PyModule_AddIntConstant(m, "altzone", timezone-3600); ++ PyModule_AddIntConstant(m, "altzone", _timezone-3600); + #endif /* PYOS_OS2 */ + #endif + PyModule_AddIntConstant(m, "daylight", daylight); +diff --git a/PC/bdist_wininst/install.c b/PC/bdist_wininst/install.c +index e3b52a8..a7d1c2c 100644 +--- a/PC/bdist_wininst/install.c ++++ b/PC/bdist_wininst/install.c +@@ -1185,7 +1185,7 @@ static void CenterWindow(HWND hwnd) + + #include + +-BOOL CALLBACK ++INT_PTR CALLBACK + IntroDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) + { + LPNMHDR lpnm; +@@ -1534,7 +1534,7 @@ SCHEME *GetScheme(int major, int minor) + return old_scheme; + } + +-BOOL CALLBACK ++INT_PTR CALLBACK + SelectPythonDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) + { + LPNMHDR lpnm; +@@ -1836,7 +1836,7 @@ static void CloseLogfile(void) + fclose(logfile); + } + +-BOOL CALLBACK ++INT_PTR CALLBACK + InstallFilesDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) + { + LPNMHDR lpnm; +@@ -1991,7 +1991,7 @@ InstallFilesDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) + } + + +-BOOL CALLBACK ++INT_PTR CALLBACK + FinishedDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) + { + LPNMHDR lpnm; +@@ -2167,23 +2167,6 @@ BOOL NeedAutoUAC() + return TRUE; + } + +-// Returns TRUE if the platform supports UAC. +-BOOL PlatformSupportsUAC() +-{ +- // Note that win2k does seem to support ShellExecute with 'runas', +- // but does *not* support IsUserAnAdmin - so we just pretend things +- // only work on XP and later. +- BOOL bIsWindowsXPorLater; +- OSVERSIONINFO winverinfo; +- winverinfo.dwOSVersionInfoSize = sizeof(winverinfo); +- if (!GetVersionEx(&winverinfo)) +- return FALSE; // something bad has gone wrong +- bIsWindowsXPorLater = +- ( (winverinfo.dwMajorVersion > 5) || +- ( (winverinfo.dwMajorVersion == 5) && (winverinfo.dwMinorVersion >= 1) )); +- return bIsWindowsXPorLater; +-} +- + // Spawn ourself as an elevated application. On failure, a message is + // displayed to the user - but this app will always terminate, even + // on error. +@@ -2239,7 +2222,7 @@ int DoInstall(void) + + // See if we need to do the Vista UAC magic. + if (strcmp(user_access_control, "force")==0) { +- if (PlatformSupportsUAC() && !MyIsUserAnAdmin()) { ++ if (!MyIsUserAnAdmin()) { + SpawnUAC(); + return 0; + } +@@ -2247,7 +2230,7 @@ int DoInstall(void) + } else if (strcmp(user_access_control, "auto")==0) { + // Check if it looks like we need UAC control, based + // on how Python itself was installed. +- if (PlatformSupportsUAC() && !MyIsUserAnAdmin() && NeedAutoUAC()) { ++ if (!MyIsUserAnAdmin() && NeedAutoUAC()) { + SpawnUAC(); + return 0; + } +diff --git a/PC/pyconfig.h b/PC/pyconfig.h +index 0cbd236..d896a38 100644 +--- a/PC/pyconfig.h ++++ b/PC/pyconfig.h +@@ -226,6 +226,13 @@ typedef int pid_t; + #define Py_IS_FINITE(X) _finite(X) + #define copysign _copysign + ++/* VS 2015 defines these names with a leading underscore */ ++#if _MSC_VER >= 1900 ++// #define timezone _timezone ++#define daylight _daylight ++#define tzname _tzname ++#endif ++ + /* Side by Side assemblies supported in VS 2005 and VS 2008 but not 2010*/ + #if _MSC_VER >= 1400 && _MSC_VER < 1600 + #define HAVE_SXS 1 diff --git a/externals/vcpkg/ports/python2/003-build-msvc.patch b/externals/vcpkg/ports/python2/003-build-msvc.patch new file mode 100755 index 000000000..71d5569f5 --- /dev/null +++ b/externals/vcpkg/ports/python2/003-build-msvc.patch @@ -0,0 +1,234 @@ +From 00164b4a9821e82f513183035587bea9243a7d5e Mon Sep 17 00:00:00 2001 +From: Jean-Christophe Fillion-Robin +Date: Tue, 1 Aug 2017 14:13:24 -0400 +Subject: [PATCH 3/3] VS2015 Support: Backport of "Issue #23524: Replace + _PyVerify_fd function with calling + _set_thread_local_invalid_parameter_handler on every thread." + +This commit is a partial backport of python/cpython@d81431f. It was +originally designed to work with python-cmake-buildsystem. + +Implementation of "_PyVerify_fd" in "Python/fileutils.c" found only in +Python 3.x has been copied into "Modules/posixmodule.c" + +The following modules have NOT been backported: + +* PCbuild +--- + Modules/posixmodule.c | 54 +++++++++++++++++++++++------------------- + PC/invalid_parameter_handler.c | 22 +++++++++++++++++ + Python/pystate.c | 12 ++++++++++ + PCbuild/pythoncore.vcxproj | 1 + + PCbuild/pythoncore.vcxproj.filters | 1 + + 5 files changed, 65 insertions(+), 26 deletions(-) + create mode 100644 PC/invalid_parameter_handler.c + +diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c +index 90d5318..6a180a0 100644 +--- a/Modules/posixmodule.c ++++ b/Modules/posixmodule.c +@@ -277,6 +277,7 @@ extern int lstat(const char *, struct stat *); + #include "osdefs.h" + #include + #include ++#include + #include /* for ShellExecute() */ + #define popen _popen + #define pclose _pclose +@@ -535,8 +534,28 @@ _PyInt_FromDev(PY_LONG_LONG v) + # define _PyInt_FromDev PyInt_FromLong + #endif + ++#ifdef _MSC_VER ++#if _MSC_VER >= 1900 ++ ++/* This function lets the Windows CRT validate the file handle without ++ terminating the process if it's invalid. */ ++int ++_PyVerify_fd(int fd) ++{ ++ intptr_t osh; ++ /* Fast check for the only condition we know */ ++ if (fd < 0) { ++ _set_errno(EBADF); ++ return 0; ++ } ++ osh = _get_osfhandle(fd); ++ return osh != (intptr_t)-1; ++} ++ ++#define _PyVerify_fd_dup2(fd1, fd2) (_PyVerify_fd(fd1) && (fd2) >= 0) ++ ++#elif _MSC_VER >= 1400 + +-#if defined _MSC_VER && _MSC_VER >= 1400 + /* Microsoft CRT in VS2005 and higher will verify that a filehandle is + * valid and raise an assertion if it isn't. + * Normally, an invalid fd is likely to be a C program error and therefore +@@ -601,35 +580,18 @@ _PyInt_FromDev(PY_LONG_LONG v) + * Only the first items must be present. + */ + +-#if _MSC_VER >= 1900 +- +-typedef struct { +- CRITICAL_SECTION lock; +- intptr_t osfhnd; +- __int64 startpos; +- char osfile; +-} my_ioinfo; +- +-#define IOINFO_L2E 6 +-#define IOINFO_ARRAYS 128 +- +-#else +- + typedef struct { + intptr_t osfhnd; + char osfile; + } my_ioinfo; + +-#define IOINFO_L2E 5 +-#define IOINFO_ARRAYS 64 +- +-#endif +- + extern __declspec(dllimport) char * __pioinfo[]; + #define IOINFO_ARRAY_ELTS (1 << IOINFO_L2E) + #define _NHANDLE_ (IOINFO_ARRAYS * IOINFO_ARRAY_ELTS) + #define FOPEN 0x01 + #define _NO_CONSOLE_FILENO (intptr_t)-2 ++#define IOINFO_L2E 5 ++#define IOINFO_ARRAYS 64 + + /* This function emulates what the windows CRT does to validate file handles */ + int +@@ -653,6 +649,8 @@ _PyVerify_fd_dup2(int fd1, int fd2) + #define _PyVerify_fd_dup2(A, B) (1) + #endif + ++#endif /* defined _MSC_VER */ ++ + /* Return a dictionary corresponding to the POSIX environment table */ + #if defined(WITH_NEXT_FRAMEWORK) || (defined(__APPLE__) && defined(Py_ENABLE_SHARED)) + /* On Darwin/MacOSX a shared library or framework has no access to +@@ -1260,14 +1254,10 @@ win32_fstat(int file_number, struct win32_stat *result) + + h = (HANDLE)_get_osfhandle(file_number); + +- /* Protocol violation: we explicitly clear errno, instead of +- setting it to a POSIX error. Callers should use GetLastError. */ + errno = 0; + + if (h == INVALID_HANDLE_VALUE) { +- /* This is really a C library error (invalid file handle). +- We set the Win32 error to the closes one matching. */ +- SetLastError(ERROR_INVALID_HANDLE); ++ errno = EBADF; + return -1; + } + memset(result, 0, sizeof(*result)); +@@ -1268,6 +1266,7 @@ win32_fstat(int file_number, struct win32_stat *result) + if (type == FILE_TYPE_UNKNOWN) { + DWORD error = GetLastError(); + if (error != 0) { ++ errno = EINVAL; + return -1; + } + /* else: valid but unknown file */ +@@ -1284,6 +1281,7 @@ win32_fstat(int file_number, struct win32_stat *result) + } + + if (!GetFileInformationByHandle(h, &info)) { ++ errno = EINVAL; + return -1; + } + +diff --git a/PC/invalid_parameter_handler.c b/PC/invalid_parameter_handler.c +new file mode 100644 +index 0000000..3bc0104 +--- /dev/null ++++ b/PC/invalid_parameter_handler.c +@@ -0,0 +1,22 @@ ++#ifdef _MSC_VER ++ ++#include ++ ++#if _MSC_VER >= 1900 ++/* pyconfig.h uses this function in the _Py_BEGIN/END_SUPPRESS_IPH ++ * macros. It does not need to be defined when building using MSVC ++ * earlier than 14.0 (_MSC_VER == 1900). ++ */ ++ ++static void __cdecl _silent_invalid_parameter_handler( ++ wchar_t const* expression, ++ wchar_t const* function, ++ wchar_t const* file, ++ unsigned int line, ++ uintptr_t pReserved) { } ++ ++void *_Py_silent_invalid_parameter_handler = ++ (void*)_silent_invalid_parameter_handler; ++#endif ++ ++#endif +diff --git a/Python/pystate.c b/Python/pystate.c +index eb992c1..1c0f970 100644 +--- a/Python/pystate.c ++++ b/Python/pystate.c +@@ -22,6 +22,12 @@ the expense of doing their own locking). + #endif + #endif + ++#if defined _MSC_VER && _MSC_VER >= 1900 ++/* Issue #23524: Temporary fix to disable termination due to invalid parameters */ ++PyAPI_DATA(void*) _Py_silent_invalid_parameter_handler; ++#include ++#endif ++ + #ifdef __cplusplus + extern "C" { + #endif +@@ -202,6 +208,12 @@ new_threadstate(PyInterpreterState *interp, int init) + tstate->next = interp->tstate_head; + interp->tstate_head = tstate; + HEAD_UNLOCK(); ++ ++#if defined _MSC_VER && _MSC_VER >= 1900 ++ /* Issue #23524: Temporary fix to disable termination due to invalid parameters */ ++ _set_thread_local_invalid_parameter_handler((_invalid_parameter_handler)_Py_silent_invalid_parameter_handler); ++#endif ++ + } + + return tstate; +-- +2.5.0 + +diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj +index 99291ea..af17762 100644 +--- a/PCbuild/pythoncore.vcxproj ++++ b/PCbuild/pythoncore.vcxproj +@@ -333,6 +333,7 @@ + + + ++ + + + + +diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters +index 99291ea..af17762 100644 +--- a/PCbuild/pythoncore.vcxproj.filters ++++ b/PCbuild/pythoncore.vcxproj.filters +@@ -794,6 +794,9 @@ + + Parser + ++ ++ PC ++ + + PC + diff --git a/externals/vcpkg/ports/python2/004-static-library-msvc.patch b/externals/vcpkg/ports/python2/004-static-library-msvc.patch new file mode 100755 index 000000000..a002de6b5 --- /dev/null +++ b/externals/vcpkg/ports/python2/004-static-library-msvc.patch @@ -0,0 +1,39 @@ +diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj +index 92b32da..8dac984 100644 +--- a/PCbuild/pythoncore.vcxproj ++++ b/PCbuild/pythoncore.vcxproj +@@ -41,7 +41,7 @@ + + + +- DynamicLibrary ++ StaticLibrary + false + + +@@ -70,12 +70,24 @@ + + /Zm200 %(AdditionalOptions) + $(PySourcePath)Python;$(PySourcePath)Modules\zlib;%(AdditionalIncludeDirectories) +- _USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;_CRT_SECURE_NO_WARNINGS;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions) ++ _USRDLL;Py_BUILD_CORE;Py_NO_ENABLE_SHARED;_CRT_SECURE_NO_WARNINGS;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions) + + + ws2_32.lib;%(AdditionalDependencies) + 0x1e000000 + ++ ++ MachineX86 ++ ++ ++ MachineX86 ++ ++ ++ MachineX86 ++ ++ ++ MachineX86 ++ + + + diff --git a/externals/vcpkg/ports/python2/005-static-crt-msvc.patch b/externals/vcpkg/ports/python2/005-static-crt-msvc.patch new file mode 100755 index 000000000..bd254f7d2 --- /dev/null +++ b/externals/vcpkg/ports/python2/005-static-crt-msvc.patch @@ -0,0 +1,15 @@ +diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj +index 8dac984..c18ad1e 100644 +--- a/PCbuild/pythoncore.vcxproj ++++ b/PCbuild/pythoncore.vcxproj +@@ -71,6 +71,10 @@ + /Zm200 %(AdditionalOptions) + $(PySourcePath)Python;$(PySourcePath)Modules\zlib;%(AdditionalIncludeDirectories) + _USRDLL;Py_BUILD_CORE;Py_NO_ENABLE_SHARED;_CRT_SECURE_NO_WARNINGS;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions) ++ MultiThreadedDebug ++ MultiThreadedDebug ++ MultiThreaded ++ MultiThreaded + + + ws2_32.lib;%(AdditionalDependencies) diff --git a/externals/vcpkg/ports/python2/006-static-fix-headers.patch b/externals/vcpkg/ports/python2/006-static-fix-headers.patch new file mode 100755 index 000000000..9e3030b45 --- /dev/null +++ b/externals/vcpkg/ports/python2/006-static-fix-headers.patch @@ -0,0 +1,14 @@ +diff --git a/PC/pyconfig.h b/PC/pyconfig.h +index 64e7aec..aa36745 100644 +--- a/PC/pyconfig.h ++++ b/PC/pyconfig.h +@@ -331,6 +331,7 @@ typedef int pid_t; + + /* For Windows the Python core is in a DLL by default. Test + Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ ++#define Py_NO_ENABLE_SHARED + #if !defined(MS_NO_COREDLL) && !defined(Py_NO_ENABLE_SHARED) + # define Py_ENABLE_SHARED 1 /* standard symbol for shared library */ + # define MS_COREDLL /* deprecated old symbol */ +-- + diff --git a/externals/vcpkg/ports/python2/007-fix-build-path.patch b/externals/vcpkg/ports/python2/007-fix-build-path.patch new file mode 100755 index 000000000..5dc4633e0 --- /dev/null +++ b/externals/vcpkg/ports/python2/007-fix-build-path.patch @@ -0,0 +1,14 @@ +diff --git a/PCbuild/python.props b/PCbuild/python.props +index d2b1991..a22c054 100644 +--- a/PCbuild/python.props ++++ b/PCbuild/python.props +@@ -26,8 +26,7 @@ + $(PySourcePath)\ + + +- $(PySourcePath)PCBuild\ +- $(BuildPath)\$(ArchName)\ ++ $(PySourcePath)PCBuild\$(ArchName)\ + $(BuildPath)\ + + diff --git a/externals/vcpkg/ports/python2/008-bz2d.patch b/externals/vcpkg/ports/python2/008-bz2d.patch new file mode 100755 index 000000000..88ec7405e --- /dev/null +++ b/externals/vcpkg/ports/python2/008-bz2d.patch @@ -0,0 +1,19 @@ +diff --git a/setup.py b/setup.py +index f764223..d6a58e4 100644 +--- a/setup.py ++++ b/setup.py +@@ -1506,6 +1506,14 @@ class PyBuildExt(build_ext): + exts.append( Extension('bz2', ['bz2module.c'], + libraries = ['bz2'], + extra_link_args = bz2_extra_link_args) ) ++ elif (self.compiler.find_library_file(lib_dirs, 'bz2d')): ++ if host_platform == "darwin": ++ bz2_extra_link_args = ('-Wl,-search_paths_first',) ++ else: ++ bz2_extra_link_args = () ++ exts.append( Extension('bz2', ['bz2module.c'], ++ libraries=['bz2d'], ++ extra_link_args = bz2_extra_link_args) ) + else: + missing.append('bz2') + diff --git a/externals/vcpkg/ports/python2/portfile.cmake b/externals/vcpkg/ports/python2/portfile.cmake new file mode 100755 index 000000000..227ffed41 --- /dev/null +++ b/externals/vcpkg/ports/python2/portfile.cmake @@ -0,0 +1,152 @@ +# Patches are from: +# - https://github.com/python-cmake-buildsystem/python-cmake-buildsystem/tree/master/patches/2.7.13/Windows-MSVC/1900 +# - https://github.com/Microsoft/vcpkg/tree/master/ports/python3 + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic AND VCPKG_CRT_LINKAGE STREQUAL static) + message(STATUS "Warning: Dynamic library with static CRT is not supported. Building static library.") + set(VCPKG_LIBRARY_LINKAGE static) +endif() + +set(PYTHON_VERSION_MAJOR 2) +set(PYTHON_VERSION_MINOR 7) +set(PYTHON_VERSION_PATCH 18) +set(PYTHON_VERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}) + +set(_PYTHON_PATCHES "") +if (VCPKG_TARGET_IS_WINDOWS) + list(APPEND _PYTHON_PATCHES + ${CMAKE_CURRENT_LIST_DIR}/001-build-msvc.patch + ${CMAKE_CURRENT_LIST_DIR}/002-build-msvc.patch + ${CMAKE_CURRENT_LIST_DIR}/003-build-msvc.patch + ) +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + list(APPEND _PYTHON_PATCHES + ${CMAKE_CURRENT_LIST_DIR}/004-static-library-msvc.patch + ${CMAKE_CURRENT_LIST_DIR}/006-static-fix-headers.patch + ) +endif() +if (VCPKG_CRT_LINKAGE STREQUAL static) + list(APPEND _PYTHON_PATCHES ${CMAKE_CURRENT_LIST_DIR}/005-static-crt-msvc.patch) +endif() + +if (VCPKG_TARGET_IS_WINDOWS) + list(APPEND _PYTHON_PATCHES + ${CMAKE_CURRENT_LIST_DIR}/007-fix-build-path.patch + ) +else() + list(APPEND _PYTHON_PATCHES + ${CMAKE_CURRENT_LIST_DIR}/008-bz2d.patch + ) +endif() + + +vcpkg_download_distfile(ARCHIVE + URLS https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz + FILENAME Python-${PYTHON_VERSION}.tar.xz + SHA512 a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES ${_PYTHON_PATCHES} +) + +vcpkg_replace_string("${SOURCE_PATH}/Makefile.pre.in" "$(INSTALL) -d -m $(DIRMODE)" "$(MKDIR_P)") + +if (VCPKG_TARGET_IS_WINDOWS) + if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") + set(BUILD_ARCH "Win32") + set(OUT_DIR "win32") + elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "x64") + set(BUILD_ARCH "x64") + set(OUT_DIR "amd64") + else() + message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") + endif() + + vcpkg_build_msbuild( + PROJECT_PATH ${SOURCE_PATH}/PCBuild/pythoncore.vcxproj + PLATFORM ${BUILD_ARCH} + ) + + vcpkg_copy_pdbs() + + file(GLOB HEADERS ${SOURCE_PATH}/Include/*.h) + file(COPY ${HEADERS} ${SOURCE_PATH}/PC/pyconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) + + file(COPY ${SOURCE_PATH}/Lib DESTINATION ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}) + + file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_d.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(COPY ${SOURCE_PATH}/PCBuild/${OUT_DIR}/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_d.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + endif() +else() + vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + ) + + vcpkg_install_make() + vcpkg_fixup_pkgconfig() + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +endif() + +if (NOT VCPKG_TARGET_IS_WINDOWS) + foreach(lib_suffix IN ITEMS "" "/debug") + set(python_config_file "${CURRENT_PACKAGES_DIR}${lib_suffix}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/_sysconfigdata.py") + if(NOT EXISTS "${python_config_file}") + continue() + endif() + + file(READ "${python_config_file}" contents) + + string(PREPEND contents "import os\n_base = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))\n") + # make contents a list of lines + string(REPLACE ";" "\\;" old_contents "${contents}") + string(REGEX REPLACE "\r?\n" ";" old_contents "${contents}") + + set(new_contents "") + foreach(line IN LISTS old_contents) + if(line MATCHES "\"") + string(REGEX REPLACE + "${CURRENT_PACKAGES_DIR}|${CURRENT_INSTALLED_DIR}" + "\" + _base + \"" + line + "${line}" + ) + string(REGEX REPLACE + "\"[^\"]*${CURRENT_BUILDTREES_DIR}[^\"]*\"" + "''" + line + "${line}" + ) + else() + string(REGEX REPLACE + "${CURRENT_PACKAGES_DIR}|${CURRENT_INSTALLED_DIR}" + "' + _base + '" + line + "${line}" + ) + string(REGEX REPLACE + "'[^']*${CURRENT_BUILDTREES_DIR}[^']*'" + "''" + line + "${line}" + ) + endif() + list(APPEND new_contents "${line}") + endforeach() + + list(JOIN new_contents "\n" contents) + file(WRITE "${python_config_file}" "${contents}") + endforeach() +endif() + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}/LICENSE ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}/copyright) diff --git a/externals/vcpkg/ports/python2/vcpkg.json b/externals/vcpkg/ports/python2/vcpkg.json new file mode 100755 index 000000000..ce26b439f --- /dev/null +++ b/externals/vcpkg/ports/python2/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "python2", + "version": "2.7.18", + "port-version": 5, + "description": "The Python programming language as an embeddable library", + "homepage": "https://www.python.org", + "license": "Python-2.0", + "supports": "!(arm & osx) & !(arm & windows) & !uwp" +} diff --git a/externals/vcpkg/ports/python3/0001-static-library.patch b/externals/vcpkg/ports/python3/0001-static-library.patch new file mode 100755 index 000000000..eef387574 --- /dev/null +++ b/externals/vcpkg/ports/python3/0001-static-library.patch @@ -0,0 +1,77 @@ +From 14d91e4f4a9377f47cc4cc33faeeb7c82f64b176 Mon Sep 17 00:00:00 2001 +From: Adam Johnson +Date: Thu, 28 May 2020 17:25:21 -0400 +Subject: [PATCH 1/7] static library + +builds the pythoncore as a static library instead of a DLL +--- + PC/pyconfig.h | 9 +++++++++ + PCbuild/pythoncore.vcxproj | 4 ++-- + 2 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/PC/pyconfig.h b/PC/pyconfig.h +index d7d3cf081e..34269f0b75 100644 +--- a/PC/pyconfig.h ++++ b/PC/pyconfig.h +@@ -251,6 +251,7 @@ typedef int pid_t; + + /* For Windows the Python core is in a DLL by default. Test + Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ ++#define Py_NO_ENABLE_SHARED + #if !defined(MS_NO_COREDLL) && !defined(Py_NO_ENABLE_SHARED) + # define Py_ENABLE_SHARED 1 /* standard symbol for shared library */ + # define MS_COREDLL /* deprecated old symbol */ +@@ -276,6 +277,14 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ + # endif /* _DEBUG */ + # endif /* _MSC_VER */ + # endif /* Py_BUILD_CORE */ ++#else ++ /* So MSVC users need not specify the .lib file in their own config */ ++# pragma comment(lib, "version.lib") ++# pragma comment(lib, "shlwapi.lib") ++# pragma comment(lib, "ws2_32.lib") ++# if Py_WINVER > 0x0601 ++# pragma comment(lib, "pathcch.lib") ++# endif /* Py_WINVER */ + #endif /* MS_COREDLL */ + + #if defined(MS_WIN64) +diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj +index 2625d0293d..2f8bdaa931 100644 +--- a/PCbuild/pythoncore.vcxproj ++++ b/PCbuild/pythoncore.vcxproj +@@ -73,7 +73,7 @@ + + + +- DynamicLibrary ++ StaticLibrary + false + + +@@ -102,7 +102,7 @@ + /Zm200 %(AdditionalOptions) + $(PySourcePath)Python;%(AdditionalIncludeDirectories) + $(zlibDir);%(AdditionalIncludeDirectories) +- _USRDLL;Py_BUILD_CORE;Py_BUILD_CORE_BUILTIN;Py_ENABLE_SHARED;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions) ++ _USRDLL;Py_BUILD_CORE;Py_BUILD_CORE_BUILTIN;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions) + _Py_HAVE_ZLIB;%(PreprocessorDefinitions) + + +diff --git a/Python/sysmodule.c b/Python/sysmodule.c +index ac49f7867a..f3583345ff 100644 +--- a/Python/sysmodule.c ++++ b/Python/sysmodule.c +@@ -2804,6 +2804,9 @@ _PySys_InitCore(PyThreadState *tstate, PyObject *sysdict) + #ifdef MS_COREDLL + SET_SYS("dllhandle", PyLong_FromVoidPtr(PyWin_DLLhModule)); + SET_SYS_FROM_STRING("winver", PyWin_DLLVersionString); ++#elif defined(MS_WINDOWS) ++ SET_SYS("dllhandle", PyLong_FromVoidPtr(NULL)); ++ SET_SYS_FROM_STRING("winver", MS_DLL_ID); + #endif + #ifdef ABIFLAGS + SET_SYS_FROM_STRING("abiflags", ABIFLAGS); +-- +2.28.0.windows.1 + diff --git a/externals/vcpkg/ports/python3/0002-use-vcpkg-zlib.patch b/externals/vcpkg/ports/python3/0002-use-vcpkg-zlib.patch new file mode 100755 index 000000000..c7f9dd60e --- /dev/null +++ b/externals/vcpkg/ports/python3/0002-use-vcpkg-zlib.patch @@ -0,0 +1,39 @@ +From 196555707236f4387875749f66620fb519166963 Mon Sep 17 00:00:00 2001 +From: Adam Johnson +Date: Wed, 9 Sep 2020 15:20:36 -0400 +Subject: [PATCH 2/6] use vcpkg zlib + +building without zlib is not a supported configuration, per the warning +messages. +--- + PCbuild/pythoncore.vcxproj | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj +index dbe236829a..5f30a35eb3 100644 +--- a/PCbuild/pythoncore.vcxproj ++++ b/PCbuild/pythoncore.vcxproj +@@ -507,8 +507,10 @@ + + + +- ++ + ++ ++ + + + +@@ -556,7 +558,7 @@ + + + +- ++ + + + +-- +2.28.0.windows.1 + diff --git a/externals/vcpkg/ports/python3/0003-devendor-external-dependencies.patch b/externals/vcpkg/ports/python3/0003-devendor-external-dependencies.patch new file mode 100755 index 000000000..25e3a1489 --- /dev/null +++ b/externals/vcpkg/ports/python3/0003-devendor-external-dependencies.patch @@ -0,0 +1,117 @@ +From 6c5c3793cbc6ba2a1d0d623a2bdaa9c2125be516 Mon Sep 17 00:00:00 2001 +From: Adam Johnson +Date: Wed, 9 Sep 2020 15:24:38 -0400 +Subject: [PATCH 3/6] devendor external dependencies + +externally fetched libraries may cause linker errors resulting from +duplicate symbols in downstream projects. +--- + PCbuild/_bz2.vcxproj | 4 +++- + PCbuild/_lzma.vcxproj | 5 ++--- + PCbuild/_sqlite3.vcxproj | 2 +- + PCbuild/_ssl.vcxproj | 2 +- + PCbuild/pyexpat.vcxproj | 6 ++++-- + 5 files changed, 11 insertions(+), 8 deletions(-) + +diff --git a/PCbuild/_bz2.vcxproj b/PCbuild/_bz2.vcxproj +index 3fe95fbf83..6b12e8818e 100644 +--- a/PCbuild/_bz2.vcxproj ++++ b/PCbuild/_bz2.vcxproj +@@ -101,6 +101,8 @@ + + + ++ ++ + + + +@@ -109,7 +111,7 @@ + + + +- ++ + + + +diff --git a/PCbuild/_lzma.vcxproj b/PCbuild/_lzma.vcxproj +index fe076a6fc5..70cc61dd95 100644 +--- a/PCbuild/_lzma.vcxproj ++++ b/PCbuild/_lzma.vcxproj +@@ -94,10 +94,9 @@ + + + $(lzmaDir)src/liblzma/api;%(AdditionalIncludeDirectories) +- WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;LZMA_API_STATIC;%(PreprocessorDefinitions) ++ WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + + +- $(OutDir)liblzma$(PyDebugExt).lib;%(AdditionalDependencies) + + + +@@ -111,7 +110,7 @@ + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + +- ++ + {12728250-16eC-4dc6-94d7-e21dd88947f8} + false + +diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj +index 7e0062692b..6fb3279a20 100644 +--- a/PCbuild/_sqlite3.vcxproj ++++ b/PCbuild/_sqlite3.vcxproj +@@ -127,7 +127,7 @@ + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + +- ++ + {a1a295e5-463c-437f-81ca-1f32367685da} + false + +diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj +index 4907f49b66..4dffa202b7 100644 +--- a/PCbuild/_ssl.vcxproj ++++ b/PCbuild/_ssl.vcxproj +@@ -99,7 +99,7 @@ + + + +- ++ + _CRT_SECURE_NO_WARNINGS;$(PreprocessorDefinitions) + + +diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj +index b2d9f5d57d..4efb826a05 100644 +--- a/PCbuild/pyexpat.vcxproj ++++ b/PCbuild/pyexpat.vcxproj +@@ -89,17 +89,19 @@ + + + +- ++ + $(PySourcePath)Modules\expat;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_STATIC;%(PreprocessorDefinitions) + + +- ++ + + + + + ++ ++ + + + +-- +2.28.0.windows.1 + diff --git a/externals/vcpkg/ports/python3/0004-dont-copy-vcruntime.patch b/externals/vcpkg/ports/python3/0004-dont-copy-vcruntime.patch new file mode 100755 index 000000000..174c27e5c --- /dev/null +++ b/externals/vcpkg/ports/python3/0004-dont-copy-vcruntime.patch @@ -0,0 +1,26 @@ +From 8086c67fa7ada1888a7808cbdc6fe74b62abe5b1 Mon Sep 17 00:00:00 2001 +From: Adam Johnson +Date: Wed, 9 Sep 2020 16:12:49 -0400 +Subject: [PATCH 4/6] dont copy vcruntime + +VCRUNTIME140.dll should not be redistributed, ever. +--- + PCbuild/pythoncore.vcxproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj +index 5f30a35eb3..3cf21ba39c 100644 +--- a/PCbuild/pythoncore.vcxproj ++++ b/PCbuild/pythoncore.vcxproj +@@ -565,7 +565,7 @@ + + + +- ++ + + + +-- +2.28.0.windows.1 + diff --git a/externals/vcpkg/ports/python3/0005-only-build-required-projects.patch b/externals/vcpkg/ports/python3/0005-only-build-required-projects.patch new file mode 100755 index 000000000..dbbe37234 --- /dev/null +++ b/externals/vcpkg/ports/python3/0005-only-build-required-projects.patch @@ -0,0 +1,60 @@ +From 6492277e39dbe7dd77d32fdc9ae4b989213ef3c6 Mon Sep 17 00:00:00 2001 +From: Adam Johnson +Date: Wed, 9 Sep 2020 20:15:58 -0400 +Subject: [PATCH 5/6] only build required projects + +strips out tests and unsupported externals (eg tkinter). +--- + PCbuild/_ssl.vcxproj | 2 +- + PCbuild/pcbuild.proj | 14 +++++++------- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj +index 4dffa202b7..e661cb6fb6 100644 +--- a/PCbuild/_ssl.vcxproj ++++ b/PCbuild/_ssl.vcxproj +@@ -111,7 +111,7 @@ + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + +- ++ + {86937f53-c189-40ef-8ce8-8759d8e7d480} + false + +diff --git a/PCbuild/pcbuild.proj b/PCbuild/pcbuild.proj +index 4d416c589e..ede9868a8f 100644 +--- a/PCbuild/pcbuild.proj ++++ b/PCbuild/pcbuild.proj +@@ -45,21 +45,21 @@ + false + + +- ++ + +- ++ + +- ++ + + + + + + +- +- +- +- ++ ++ ++ ++ + + + +-- +2.28.0.windows.1 + diff --git a/externals/vcpkg/ports/python3/0006-restore-support-for-windows-7.patch b/externals/vcpkg/ports/python3/0006-restore-support-for-windows-7.patch new file mode 100755 index 000000000..a8f343e84 --- /dev/null +++ b/externals/vcpkg/ports/python3/0006-restore-support-for-windows-7.patch @@ -0,0 +1,187 @@ +From e30a560527d17ae81685dd11d3268bc982af2048 Mon Sep 17 00:00:00 2001 +From: Adam Johnson +Date: Tue, 16 Feb 2021 18:03:07 -0500 +Subject: [PATCH 7/7] restore support for windows 7 + +this backports the windows 7 compatible fix for bpo-39401 from gh-18234, +originally authored by Steve Dower, and removes explicit dependencies on +pathcch. + +The same mechanism is applied to fix posixmodule.c +--- +index 25ddc82..ff51042 100644 +diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c +--- a/Modules/posixmodule.c ++++ b/Modules/posixmodule.c +@@ -20,7 +20,7 @@ + + FSCTL_GET_REPARSE_POINT is not exported with WIN32_LEAN_AND_MEAN. */ + # include +-# include ++# include + #endif + + #ifdef __VXWORKS__ +@@ -4410,6 +4410,10 @@ os__getvolumepathname_impl(PyObject *module, path_t *path) + return result; + } + ++static int _PathCchSkipRoot_Initialized = 0; ++typedef HRESULT (__stdcall *PPathCchSkipRoot) (PCWSTR pszPath, PCWSTR *ppszRootEnd); ++static PPathCchSkipRoot _PathCchSkipRoot; ++ + + /*[clinic input] + os._path_splitroot +@@ -4428,6 +4432,19 @@ os__path_splitroot_impl(PyObject *module, path_t *path) + PyObject *result = NULL; + HRESULT ret; + ++ if (_PathCchSkipRoot_Initialized == 0) { ++ HMODULE pathapi = LoadLibraryExW(L"api-ms-win-core-path-l1-1-0.dll", NULL, ++ LOAD_LIBRARY_SEARCH_SYSTEM32); ++ ++ if (pathapi) { ++ _PathCchSkipRoot = (PPathCchSkipRoot)GetProcAddress(pathapi, "PathCchSkipRoot"); ++ } else { ++ _PathCchSkipRoot = NULL; ++ } ++ ++ _PathCchSkipRoot_Initialized = 1; ++ } ++ + buffer = (wchar_t*)PyMem_Malloc(sizeof(wchar_t) * (wcslen(path->wide) + 1)); + if (!buffer) { + return NULL; +@@ -4438,7 +4455,14 @@ os__path_splitroot_impl(PyObject *module, path_t *path) + } + + Py_BEGIN_ALLOW_THREADS +- ret = PathCchSkipRoot(buffer, &end); ++ if (_PathCchSkipRoot) { ++ ret = _PathCchSkipRoot(buffer, &end); ++ } else { ++ end = PathSkipRootW(buffer); ++ if (!end) { ++ ret = E_FAIL; ++ } ++ } + Py_END_ALLOW_THREADS + if (FAILED(ret)) { + result = Py_BuildValue("sO", "", path->object); +diff --git a/PC/getpathp.c b/PC/getpathp.c +index 53da3a6..3d58bbf 100644 +--- a/PC/getpathp.c ++++ b/PC/getpathp.c +@@ -90,7 +90,7 @@ + #endif + + #include +-#include ++#include + + #ifdef HAVE_SYS_TYPES_H + #include +@@ -249,14 +249,43 @@ ismodule(wchar_t *filename, int update_filename) + stuff as fits will be appended. + */ + ++ ++static int _PathCchCombineEx_Initialized = 0; ++typedef HRESULT(__stdcall *PPathCchCombineEx) (PWSTR pszPathOut, size_t cchPathOut, ++ PCWSTR pszPathIn, PCWSTR pszMore, ++ unsigned long dwFlags); ++static PPathCchCombineEx _PathCchCombineEx; ++ + static void + join(wchar_t *buffer, const wchar_t *stuff) + { +- if (FAILED(PathCchCombineEx(buffer, MAXPATHLEN+1, buffer, stuff, 0))) { +- Py_FatalError("buffer overflow in getpathp.c's join()"); ++ if (_PathCchCombineEx_Initialized == 0) { ++ HMODULE pathapi = LoadLibraryExW(L"api-ms-win-core-path-l1-1-0.dll", NULL, ++ LOAD_LIBRARY_SEARCH_SYSTEM32); ++ if (pathapi) { ++ _PathCchCombineEx = (PPathCchCombineEx)GetProcAddress(pathapi, "PathCchCombineEx"); ++ } ++ else { ++ _PathCchCombineEx = NULL; ++ } ++ _PathCchCombineEx_Initialized = 1; ++ } ++ if (_PathCchCombineEx) { ++ if (FAILED(_PathCchCombineEx(buffer, MAXPATHLEN+1, buffer, stuff, 0))) { ++ Py_FatalError("buffer overflow in getpathp.c's join()"); ++ } ++ } else { ++ if (!PathCombineW(buffer, buffer, stuff)) { ++ Py_FatalError("buffer overflow in getpathp.c's join()"); ++ } + } + } + ++static int _PathCchCanonicalizeEx_Initialized = 0; ++typedef HRESULT(__stdcall *PPathCchCanonicalizeEx) (PWSTR pszPathOut, size_t cchPathOut, ++ PCWSTR pszPathIn, unsigned long dwFlags); ++static PPathCchCanonicalizeEx _PathCchCanonicalizeEx; ++ + /* Call PathCchCanonicalizeEx(path): remove navigation elements such as "." + and ".." to produce a direct, well-formed path. */ + static PyStatus +@@ -267,8 +296,26 @@ canonicalize(wchar_t *buffer, const wchar_t *path) + return _PyStatus_NO_MEMORY(); + } + +- if (FAILED(PathCchCanonicalizeEx(buffer, MAXPATHLEN + 1, path, 0))) { +- return INIT_ERR_BUFFER_OVERFLOW(); ++ if (_PathCchCanonicalizeEx_Initialized == 0) { ++ HMODULE pathapi = LoadLibraryExW(L"api-ms-win-core-path-l1-1-0.dll", NULL, ++ LOAD_LIBRARY_SEARCH_SYSTEM32); ++ if (pathapi) { ++ _PathCchCanonicalizeEx = (PPathCchCanonicalizeEx)GetProcAddress(pathapi, "PathCchCanonicalizeEx"); ++ } ++ else { ++ _PathCchCanonicalizeEx = NULL; ++ } ++ _PathCchCanonicalizeEx_Initialized = 1; ++ } ++ if (_PathCchCanonicalizeEx) { ++ if (FAILED(_PathCchCanonicalizeEx(buffer, MAXPATHLEN + 1, path, 0))) { ++ return INIT_ERR_BUFFER_OVERFLOW(); ++ } ++ } ++ else { ++ if (!PathCanonicalizeW(buffer, path)) { ++ return INIT_ERR_BUFFER_OVERFLOW(); ++ } + } + return _PyStatus_OK(); + } +diff --git a/PC/pyconfig.h b/PC/pyconfig.h +index d7d3cf0..6e9c090 100644 +--- a/PC/pyconfig.h ++++ b/PC/pyconfig.h +@@ -136,8 +136,8 @@ WIN32 is still required for the locale module. + + /* set the version macros for the windows headers */ + /* Python 3.9+ requires Windows 8 or greater */ +-#define Py_WINVER 0x0602 /* _WIN32_WINNT_WIN8 */ +-#define Py_NTDDI NTDDI_WIN8 ++#define Py_WINVER 0x0601 /* _WIN32_WINNT_WIN7 */ ++#define Py_NTDDI NTDDI_WIN7 + + /* We only set these values when building Python - we don't want to force + these values on extensions, as that will affect the prototypes and +diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj +index c39ba3e1a9..0ef3a05fb6 100644 +--- a/PCbuild/pythoncore.vcxproj ++++ b/PCbuild/pythoncore.vcxproj +@@ -106,7 +106,7 @@ + _Py_HAVE_ZLIB;%(PreprocessorDefinitions) + + +- version.lib;ws2_32.lib;pathcch.lib;%(AdditionalDependencies) ++ version.lib;ws2_32.lib;shlwapi.lib;%(AdditionalDependencies) + + + diff --git a/externals/vcpkg/ports/python3/0007-workaround-windows-11-sdk-rc-compiler-error.patch b/externals/vcpkg/ports/python3/0007-workaround-windows-11-sdk-rc-compiler-error.patch new file mode 100755 index 000000000..e5f8237d1 --- /dev/null +++ b/externals/vcpkg/ports/python3/0007-workaround-windows-11-sdk-rc-compiler-error.patch @@ -0,0 +1,30 @@ +From 0a72b7061ed79c5d6d37b41a5b1610e32fb371a4 Mon Sep 17 00:00:00 2001 +From: Adam Johnson +Date: Wed, 22 Sep 2021 21:04:21 -0400 +Subject: [PATCH] workaround windows 11 sdk rc compiler error + +winnt.h was changed to error if the `SYSTEM_CACHE_ALIGNMENT` cannot be +determined. when the RC compiler is invoked, this seems to fail where +previous SDKs silently set the ARM value. +--- + PC/python_ver_rc.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/PC/python_ver_rc.h b/PC/python_ver_rc.h +index 90fc6ba1a1..e313a5138e 100644 +--- a/PC/python_ver_rc.h ++++ b/PC/python_ver_rc.h +@@ -1,3 +1,10 @@ ++// Temporarily workaround bug in Windows SDK 10.0.22000.0 winnt.h ++#ifdef RC_INVOKED ++# ifndef SYSTEM_CACHE_ALIGNMENT_SIZE ++# define SYSTEM_CACHE_ALIGNMENT_SIZE 64 ++# endif ++#endif ++ + // Resource script for Python core DLL. + // Currently only holds version information. + // +-- +2.33.0.windows.1 + diff --git a/externals/vcpkg/ports/python3/0009-python.pc.patch b/externals/vcpkg/ports/python3/0009-python.pc.patch new file mode 100755 index 000000000..173be389d --- /dev/null +++ b/externals/vcpkg/ports/python3/0009-python.pc.patch @@ -0,0 +1,16 @@ +--- a/Misc/python.pc.in 2022-01-14 05:23:10.299912709 +0000 ++++ b/Misc/python.pc.in 2022-01-14 05:23:15.908022446 +0000 +@@ -10,4 +10,4 @@ + Version: @VERSION@ + Libs.private: @LIBS@ + Libs: +-Cflags: -I${includedir}/python@VERSION@@ABIFLAGS@ ++Cflags: -I${includedir}/python@VERSION@ +--- a/Misc/python-embed.pc.in 2022-01-14 05:22:57.043653570 +0000 ++++ b/Misc/python-embed.pc.in 2022-01-14 05:23:04.603801315 +0000 +@@ -10,4 +10,4 @@ + Version: @VERSION@ + Libs.private: @LIBS@ + Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@ +-Cflags: -I${includedir}/python@VERSION@@ABIFLAGS@ ++Cflags: -I${includedir}/python@VERSION@ diff --git a/externals/vcpkg/ports/python3/0010-bz2d.patch b/externals/vcpkg/ports/python3/0010-bz2d.patch new file mode 100755 index 000000000..162cc7cab --- /dev/null +++ b/externals/vcpkg/ports/python3/0010-bz2d.patch @@ -0,0 +1,19 @@ +diff --git a/setup.py b/setup.py +index 43e807f20..df4d43d3d 100644 +--- a/setup.py ++++ b/setup.py +@@ -1741,6 +1741,14 @@ def detect_compress_exts(self): + self.add(Extension('_bz2', ['_bz2module.c'], + libraries=['bz2'], + extra_link_args=bz2_extra_link_args)) ++ elif (self.compiler.find_library_file(self.lib_dirs, 'bz2d')): ++ if MACOS: ++ bz2_extra_link_args = ('-Wl,-search_paths_first',) ++ else: ++ bz2_extra_link_args = () ++ self.add(Extension('_bz2', ['_bz2module.c'], ++ libraries=['bz2d'], ++ extra_link_args=bz2_extra_link_args)) + else: + self.missing.append('_bz2') + diff --git a/externals/vcpkg/ports/python3/0010-ensurepip.patch b/externals/vcpkg/ports/python3/0010-ensurepip.patch new file mode 100755 index 000000000..ce5b65a3d --- /dev/null +++ b/externals/vcpkg/ports/python3/0010-ensurepip.patch @@ -0,0 +1,11 @@ +--- a/Lib/ensurepip/__init__.py 2021-10-05 00:40:46.000000000 +0700 ++++ b/Lib/ensurepip/__init__.py 2022-01-11 15:22:54.001498300 +0700 +@@ -86,6 +86,8 @@ + code = f""" + import runpy + import sys ++import os ++sys.executable = os.path.dirname(os.path.realpath(__file__)) + sys.path = {additional_paths or []} + sys.path + sys.argv[1:] = {args} + runpy.run_module("pip", run_name="__main__", alter_sys=True) diff --git a/externals/vcpkg/ports/python3/openssl.props.in b/externals/vcpkg/ports/python3/openssl.props.in new file mode 100755 index 000000000..1d404ad57 --- /dev/null +++ b/externals/vcpkg/ports/python3/openssl.props.in @@ -0,0 +1,14 @@ + + + + + Crypt32.lib;ws2_32.lib;%(AdditionalDependencies) + + ${CRYPTO_RELEASE};${SSL_RELEASE};%(AdditionalDependencies) + + + ${CRYPTO_DEBUG};${SSL_DEBUG};%(AdditionalDependencies) + + + + diff --git a/externals/vcpkg/ports/python3/portfile.cmake b/externals/vcpkg/ports/python3/portfile.cmake new file mode 100755 index 000000000..144fd4b00 --- /dev/null +++ b/externals/vcpkg/ports/python3/portfile.cmake @@ -0,0 +1,295 @@ +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic AND VCPKG_CRT_LINKAGE STREQUAL static) + message(STATUS "Warning: Dynamic library with static CRT is not supported. Building static library.") + set(VCPKG_LIBRARY_LINKAGE static) +endif() + +set(PYTHON_VERSION_MAJOR 3) +set(PYTHON_VERSION_MINOR 10) +set(PYTHON_VERSION_PATCH 2) +set(PYTHON_VERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}) + +set(PATCHES + 0002-use-vcpkg-zlib.patch + 0003-devendor-external-dependencies.patch + 0004-dont-copy-vcruntime.patch + 0005-only-build-required-projects.patch + 0009-python.pc.patch + 0010-bz2d.patch +) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(PREPEND PATCHES 0001-static-library.patch) +endif() + +# Python 3.9 removed support for Windows 7. This patch re-adds support for Windows 7 and is therefore +# required to build this port on Windows 7 itself due to Python using itself in its own build system. +if("deprecated-win7-support" IN_LIST FEATURES) + list(APPEND PATCHES 0006-restore-support-for-windows-7.patch) + message(WARNING "Windows 7 support is deprecated and may be removed at any time.") +elseif(VCPKG_TARGET_IS_WINDOWS AND CMAKE_SYSTEM_VERSION EQUAL 6.1) + message(FATAL_ERROR "python3 requires the feature deprecated-win7-support when building on Windows 7.") +endif() + +if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) + string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PYTHON_ALLOW_EXTENSIONS) + # The Windows 11 SDK has a problem that causes it to error on the resource files, so we patch that. + vcpkg_get_windows_sdk(WINSDK_VERSION) + if("${WINSDK_VERSION}" VERSION_GREATER_EQUAL "10.0.22000") + list(APPEND PATCHES "0007-workaround-windows-11-sdk-rc-compiler-error.patch") + endif() +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO python/cpython + REF v${PYTHON_VERSION} + SHA512 14f0d1847d4361fa075adbe4dbf7339fb62be91d5419cf506abdf46b36dc5273564792d35e5a5e0608a8fa877a870152a593743c3b70a98c739d5bd028be9e18 + HEAD_REF master + PATCHES ${PATCHES} +) + +vcpkg_replace_string("${SOURCE_PATH}/Makefile.pre.in" "$(INSTALL) -d -m $(DIRMODE)" "$(MKDIR_P)") + +function(make_python_pkgconfig) + cmake_parse_arguments(PARSE_ARGV 0 arg "" "FILE;INSTALL_ROOT;EXEC_PREFIX;INCLUDEDIR;ABIFLAGS" "") + + set(prefix "${CURRENT_PACKAGES_DIR}") + set(libdir [[${prefix}/lib]]) + set(exec_prefix ${arg_EXEC_PREFIX}) + set(includedir ${arg_INCLUDEDIR}) + set(VERSION "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") + set(ABIFLAGS ${arg_ABIFLAGS}) + + string(REPLACE "python" "python-${VERSION}" out_file ${arg_FILE}) + set(out_full_path "${arg_INSTALL_ROOT}/lib/pkgconfig/${out_file}") + configure_file("${SOURCE_PATH}/Misc/${arg_FILE}.in" ${out_full_path} @ONLY) + + file(READ ${out_full_path} pkgconfig_file) + string(REPLACE "-lpython${VERSION}" "-lpython${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}" pkgconfig_file "${pkgconfig_file}") + file(WRITE ${out_full_path} "${pkgconfig_file}") +endfunction() + +if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) + # Due to the way Python handles C extension modules on Windows, a static python core cannot + # load extension modules. + if(PYTHON_ALLOW_EXTENSIONS) + find_library(BZ2_RELEASE NAMES bz2 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + find_library(BZ2_DEBUG NAMES bz2d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(CRYPTO_RELEASE NAMES libcrypto PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + find_library(CRYPTO_DEBUG NAMES libcrypto PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(EXPAT_RELEASE NAMES libexpat libexpatMD PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + find_library(EXPAT_DEBUG NAMES libexpatd libexpatdMD PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(FFI_RELEASE NAMES libffi PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + find_library(FFI_DEBUG NAMES libffi PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(LZMA_RELEASE NAMES lzma PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + find_library(LZMA_DEBUG NAMES lzma PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(SQLITE_RELEASE NAMES sqlite3 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + find_library(SQLITE_DEBUG NAMES sqlite3 PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(SSL_RELEASE NAMES libssl PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + find_library(SSL_DEBUG NAMES libssl PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + else() + message(STATUS "WARNING: Static builds of Python will not have C extension modules available.") + endif() + find_library(ZLIB_RELEASE NAMES zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + find_library(ZLIB_DEBUG NAMES zlib zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + + configure_file("${SOURCE_PATH}/PC/pyconfig.h" "${SOURCE_PATH}/PC/pyconfig.h") + configure_file("${CMAKE_CURRENT_LIST_DIR}/python_vcpkg.props.in" "${SOURCE_PATH}/PCbuild/python_vcpkg.props") + configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.props.in" "${SOURCE_PATH}/PCbuild/openssl.props") + file(WRITE "${SOURCE_PATH}/PCbuild/libffi.props" + " + " + ) + + if(PYTHON_ALLOW_EXTENSIONS) + set(OPTIONS + "/p:IncludeExtensions=true" + "/p:IncludeExternals=true" + "/p:IncludeCTypes=true" + "/p:IncludeSSL=true" + "/p:IncludeTkinter=false" + "/p:IncludeTests=false" + "/p:ForceImportBeforeCppTargets=${SOURCE_PATH}/PCbuild/python_vcpkg.props" + ) + else() + set(OPTIONS + "/p:IncludeExtensions=false" + "/p:IncludeExternals=false" + "/p:IncludeTests=false" + "/p:ForceImportBeforeCppTargets=${SOURCE_PATH}/PCbuild/python_vcpkg.props" + ) + endif() + if(VCPKG_TARGET_IS_UWP) + list(APPEND OPTIONS "/p:IncludeUwp=true") + else() + list(APPEND OPTIONS "/p:IncludeUwp=false") + endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + list(APPEND OPTIONS "/p:_VcpkgPythonLinkage=DynamicLibrary") + else() + list(APPEND OPTIONS "/p:_VcpkgPythonLinkage=StaticLibrary") + endif() + + # _freeze_importlib.exe is run as part of the build process, so make sure the required dynamic libs are available. + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/bin") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/debug/bin") + endif() + + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "PCbuild/pcbuild.proj" + OPTIONS ${OPTIONS} + LICENSE_SUBPATH "LICENSE" + TARGET_PLATFORM_VERSION "${WINSDK_VERSION}" + SKIP_CLEAN + ) + + # The extension modules must be placed in the DLLs directory, so we can't use vcpkg_copy_tools() + if(PYTHON_ALLOW_EXTENSIONS) + file(GLOB_RECURSE PYTHON_EXTENSIONS "${CURRENT_BUILDTREES_DIR}/*.pyd") + list(FILTER PYTHON_EXTENSIONS EXCLUDE REGEX [[.*_d\.pyd]]) + file(COPY ${PYTHON_EXTENSIONS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/DLLs") + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/DLLs") + file(REMOVE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/DLLs/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.dll") + endif() + + file(COPY "${SOURCE_PATH}/Include/" "${SOURCE_PATH}/PC/pyconfig.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" + FILES_MATCHING PATTERN *.h + ) + file(COPY "${SOURCE_PATH}/Lib" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + + # Remove any extension libraries and other unversioned binaries that could conflict with the python2 port. + # You don't need to link against these anyway. + file(GLOB PYTHON_LIBS + "${CURRENT_PACKAGES_DIR}/lib/*.lib" + "${CURRENT_PACKAGES_DIR}/debug/lib/*.lib" + ) + list(FILTER PYTHON_LIBS EXCLUDE REGEX [[python[0-9]*(_d)?\.lib$]]) + file(GLOB PYTHON_INSTALLERS "${CURRENT_PACKAGES_DIR}/tools/${PORT}/wininst-*.exe") + file(REMOVE ${PYTHON_LIBS} ${PYTHON_INSTALLERS}) + + # pkg-config files + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + make_python_pkgconfig(FILE python.pc INSTALL_ROOT ${CURRENT_PACKAGES_DIR} + EXEC_PREFIX "\${prefix}/tools/${PORT}" INCLUDEDIR [[${prefix}/include]] ABIFLAGS "") + make_python_pkgconfig(FILE python-embed.pc INSTALL_ROOT ${CURRENT_PACKAGES_DIR} + EXEC_PREFIX "\${prefix}/tools/${PORT}" INCLUDEDIR [[${prefix}/include]] ABIFLAGS "") + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + make_python_pkgconfig(FILE python.pc INSTALL_ROOT "${CURRENT_PACKAGES_DIR}/debug" + EXEC_PREFIX "\${prefix}/../tools/${PORT}" INCLUDEDIR [[${prefix}/../include]] ABIFLAGS "_d") + make_python_pkgconfig(FILE python-embed.pc INSTALL_ROOT "${CURRENT_PACKAGES_DIR}/debug" + EXEC_PREFIX "\${prefix}/../tools/${PORT}" INCLUDEDIR [[${prefix}/../include]] ABIFLAGS "_d") + endif() + + vcpkg_fixup_pkgconfig() + + vcpkg_clean_msbuild() + + # Remove static library belonging to executable + if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if (EXISTS "${CURRENT_PACKAGES_DIR}/lib/python.lib") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/python.lib" + "${CURRENT_PACKAGES_DIR}/lib/manual-link/python.lib") + endif() + if (EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/python_d.lib") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/python_d.lib" + "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/python_d.lib") + endif() + endif() +else() + set(OPTIONS + "--with-openssl=${CURRENT_INSTALLED_DIR}" + "--without-ensurepip" + "--with-suffix=" + "--with-system-expat" + "--without-readline" + "--disable-test-modules" + ) + if(VCPKG_TARGET_IS_OSX) + list(APPEND OPTIONS "LIBS=-liconv -lintl") + endif() + + vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${OPTIONS} + OPTIONS_DEBUG "--with-pydebug" + ) + vcpkg_install_make(ADD_BIN_TO_PATH INSTALL_TARGET altinstall) + + file(COPY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + + # Makefiles, c files, __pycache__, and other junk. + file(GLOB PYTHON_LIB_DIRS LIST_DIRECTORIES true + "${CURRENT_PACKAGES_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/*" + "${CURRENT_PACKAGES_DIR}/debug/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/*") + list(FILTER PYTHON_LIB_DIRS INCLUDE REGEX [[config-[0-9].*.*]]) + file(REMOVE_RECURSE ${PYTHON_LIB_DIRS}) + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}d") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/man1") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") + + file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") + + vcpkg_fixup_pkgconfig() +endif() + +file(READ "${CMAKE_CURRENT_LIST_DIR}/usage" usage) +if(VCPKG_TARGET_IS_WINDOWS) + if(PYTHON_ALLOW_EXTENSIONS) + file(READ "${CMAKE_CURRENT_LIST_DIR}/usage.win" usage_extra) + else() + set(usage_extra "") + endif() +else() + file(READ "${CMAKE_CURRENT_LIST_DIR}/usage.unix" usage_extra) +endif() +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage}\n${usage_extra}") + +function(_generate_finder) + cmake_parse_arguments(PythonFinder "NO_OVERRIDE" "DIRECTORY;PREFIX" "" ${ARGN}) + configure_file( + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + "${CURRENT_PACKAGES_DIR}/share/${PythonFinder_DIRECTORY}/vcpkg-cmake-wrapper.cmake" + @ONLY + ) +endfunction() + +message(STATUS "Installing cmake wrappers") +_generate_finder(DIRECTORY "python" PREFIX "Python") +_generate_finder(DIRECTORY "python3" PREFIX "Python3") +_generate_finder(DIRECTORY "pythoninterp" PREFIX "PYTHON" NO_OVERRIDE) + +if (NOT VCPKG_TARGET_IS_WINDOWS) + function(replace_dirs_in_config_file python_config_file) + vcpkg_replace_string("${python_config_file}" "${CURRENT_INSTALLED_DIR}" "' + _base + '") + vcpkg_replace_string("${python_config_file}" "${CURRENT_PACKAGES_DIR}" "' + _base + '") + vcpkg_replace_string("${python_config_file}" "${CURRENT_BUILDTREES_DIR}" "not/existing") + endfunction() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(GLOB python_config_files "${CURRENT_PACKAGES_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/_sysconfigdata*") + list(POP_FRONT python_config_files python_config_file) + vcpkg_replace_string("${python_config_file}" "# system configuration generated and used by the sysconfig module" "# system configuration generated and used by the sysconfig module\nimport os\n_base = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))\n") + replace_dirs_in_config_file("${python_config_file}") + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(GLOB python_config_files "${CURRENT_PACKAGES_DIR}/debug/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/_sysconfigdata*") + list(POP_FRONT python_config_files python_config_file) + vcpkg_replace_string("${python_config_file}" "# system configuration generated and used by the sysconfig module" "# system configuration generated and used by the sysconfig module\nimport os\n_base = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))\n") + replace_dirs_in_config_file("${python_config_file}") + endif() +endif() diff --git a/externals/vcpkg/ports/python3/python_vcpkg.props.in b/externals/vcpkg/ports/python3/python_vcpkg.props.in new file mode 100755 index 000000000..e5b6093a5 --- /dev/null +++ b/externals/vcpkg/ports/python3/python_vcpkg.props.in @@ -0,0 +1,41 @@ + + + + + + _Py_HAVE_ZLIB;%(PreprocessorDefinitions) + XML_STATIC;%(PreprocessorDefinitions) + + %(AdditionalIncludeDirectories);${CURRENT_INSTALLED_DIR}/include + + + MultiThreadedDebug + MultiThreaded + MultiThreadedDebugDLL + MultiThreadedDLL + + + + + ${ZLIB_RELEASE};%(AdditionalDependencies) + + + ${ZLIB_DEBUG};%(AdditionalDependencies) + + + + + ${BZ2_RELEASE};${EXPAT_RELEASE};${FFI_RELEASE};${LZMA_RELEASE};${SQLITE_RELEASE};%(AdditionalDependencies) + + + ${BZ2_DEBUG};${EXPAT_DEBUG};${FFI_DEBUG};${LZMA_DEBUG};${SQLITE_DEBUG};%(AdditionalDependencies) + + + + + + MachineX86 + MachineX64 + + + diff --git a/externals/vcpkg/ports/python3/usage b/externals/vcpkg/ports/python3/usage new file mode 100755 index 000000000..e177b11f6 --- /dev/null +++ b/externals/vcpkg/ports/python3/usage @@ -0,0 +1,4 @@ +The package python3 is compatible with built-in CMake targets: + + find_package(Python3 COMPONENTS Development REQUIRED) + target_link_libraries(main PRIVATE Python3::Python) diff --git a/externals/vcpkg/ports/python3/usage.unix b/externals/vcpkg/ports/python3/usage.unix new file mode 100755 index 000000000..614292c2f --- /dev/null +++ b/externals/vcpkg/ports/python3/usage.unix @@ -0,0 +1,9 @@ +The package python3 provides a python interpreter that supports virtual environments: + + $ tools/python3/python3.10 -m venv /path/to/venv + $ export VIRTUAL_ENV=/path/to/venv + $ export PATH=/path/to/venv/bin:$PATH + $ export -n PYTHONHOME + $ unset PYTHONHOME + + See https://docs.python.org/3/library/venv.html for more details. diff --git a/externals/vcpkg/ports/python3/usage.win b/externals/vcpkg/ports/python3/usage.win new file mode 100755 index 000000000..3fcc343ed --- /dev/null +++ b/externals/vcpkg/ports/python3/usage.win @@ -0,0 +1,8 @@ +The package python3 provides a python interpreter that supports virtual environments: + + >tools\python3\python3.10 -m venv c:\path\to\venv + >set VIRTUAL_ENV=c:\path\to\venv + >set PATH=c:\path\to\venv\bin;%PATH% + >set PYTHONHOME= + + See https://docs.python.org/3/library/venv.html for more details. diff --git a/externals/vcpkg/ports/python3/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/python3/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..83c3fbd1c --- /dev/null +++ b/externals/vcpkg/ports/python3/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,120 @@ +# For very old ports whose upstream do not properly set the minimum CMake version. +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0057 NEW) + +# This prevents the port's python.exe from overriding the Python fetched by +# vcpkg_find_acquire_program(PYTHON3) and prevents the vcpkg toolchain from +# stomping on FindPython's default functionality. +list(REMOVE_ITEM CMAKE_PROGRAM_PATH "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools/python3") +if(@PythonFinder_NO_OVERRIDE@) + _find_package(${ARGS}) + return() +endif() + +# CMake's FindPython's separation of concerns is very muddy. We only want to force vcpkg's Python +# if the consumer is using the development component. What we don't want to do is break detection +# of the system Python, which may have certain packages the user expects. But - if the user is +# embedding Python or using both the development and interpreter components, then we need the +# interpreter matching vcpkg's Python libraries. Note that the "Development" component implies +# both "Development.Module" and "Development.Embed" +if("Development" IN_LIST ARGS OR "Development.Embed" IN_LIST ARGS) + set(_PythonFinder_WantInterp TRUE) + set(_PythonFinder_WantLibs TRUE) +elseif("Development.Module" IN_LIST ARGS) + if("Interpreter" IN_LIST ARGS) + set(_PythonFinder_WantInterp TRUE) + endif() + set(_PythonFinder_WantLibs TRUE) +endif() + +if(_PythonFinder_WantLibs) + find_path( + @PythonFinder_PREFIX@_INCLUDE_DIR + NAMES "Python.h" + PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" + PATH_SUFFIXES "python@PYTHON_VERSION_MAJOR@.@PYTHON_VERSION_MINOR@" + NO_DEFAULT_PATH + ) + + # Don't set the public facing hint or the finder will be unable to detect the debug library. + # Internally, it uses the same value with an underscore prepended. + find_library( + _@PythonFinder_PREFIX@_LIBRARY_RELEASE + NAMES + "python@PYTHON_VERSION_MAJOR@@PYTHON_VERSION_MINOR@" + "python@PYTHON_VERSION_MAJOR@.@PYTHON_VERSION_MINOR@" + PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" + NO_DEFAULT_PATH + ) + find_library( + _@PythonFinder_PREFIX@_LIBRARY_DEBUG + NAMES + "python@PYTHON_VERSION_MAJOR@@PYTHON_VERSION_MINOR@_d" + "python@PYTHON_VERSION_MAJOR@.@PYTHON_VERSION_MINOR@d" + PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" + NO_DEFAULT_PATH + ) + + if(_PythonFinder_WantInterp) + find_program( + @PythonFinder_PREFIX@_EXECUTABLE + NAMES "python" "python@PYTHON_VERSION_MAJOR@.@PYTHON_VERSION_MINOR@" + PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools/python3" + NO_DEFAULT_PATH + ) + endif() + + _find_package(${ARGS}) + + if(@VCPKG_LIBRARY_LINKAGE@ STREQUAL static) + include(CMakeFindDependencyMacro) + + # Python for Windows embeds the zlib module into the core, so we have to link against it. + # This is a separate extension module on Unix-like platforms. + if(WIN32) + find_dependency(ZLIB) + if(TARGET @PythonFinder_PREFIX@::Python) + set_property(TARGET @PythonFinder_PREFIX@::Python APPEND PROPERTY INTERFACE_LINK_LIBRARIES ZLIB::ZLIB) + endif() + if(TARGET @PythonFinder_PREFIX@::Module) + set_property(TARGET @PythonFinder_PREFIX@::Module APPEND PROPERTY INTERFACE_LINK_LIBRARIES ZLIB::ZLIB) + endif() + if(DEFINED @PythonFinder_PREFIX@_LIBRARIES) + list(APPEND @PythonFinder_PREFIX@_LIBRARIES ${ZLIB_LIBRARIES}) + endif() + endif() + + if(APPLE) + find_dependency(Iconv) + find_dependency(Intl) + if(TARGET @PythonFinder_PREFIX@::Python) + get_target_property(_PYTHON_INTERFACE_LIBS @PythonFinder_PREFIX@::Python INTERFACE_LINK_LIBRARIES) + list(REMOVE_ITEM _PYTHON_INTERFACE_LIBS "-liconv" "-lintl") + list(APPEND _PYTHON_INTERFACE_LIBS + Iconv::Iconv + "$,${Intl_LIBRARY_DEBUG},${Intl_LIBRARY_RELEASE}>" + ) + set_property(TARGET @PythonFinder_PREFIX@::Python PROPERTY INTERFACE_LINK_LIBRARIES ${_PYTHON_INTERFACE_LIBS}) + unset(_PYTHON_INTERFACE_LIBS) + endif() + if(TARGET @PythonFinder_PREFIX@::Module) + get_target_property(_PYTHON_INTERFACE_LIBS @PythonFinder_PREFIX@::Module INTERFACE_LINK_LIBRARIES) + list(REMOVE_ITEM _PYTHON_INTERFACE_LIBS "-liconv" "-lintl") + list(APPEND _PYTHON_INTERFACE_LIBS + Iconv::Iconv + "$,${Intl_LIBRARY_DEBUG},${Intl_LIBRARY_RELEASE}>" + ) + set_property(TARGET @PythonFinder_PREFIX@::Module PROPERTY INTERFACE_LINK_LIBRARIES ${_PYTHON_INTERFACE_LIBS}) + unset(_PYTHON_INTERFACE_LIBS) + endif() + if(DEFINED @PythonFinder_PREFIX@_LIBRARIES) + list(APPEND @PythonFinder_PREFIX@_LIBRARIES "-framework CoreFoundation" ${Iconv_LIBRARIES} ${Intl_LIBRARIES}) + endif() + endif() + endif() +else() + _find_package(${ARGS}) +endif() + +unset(_PythonFinder_WantInterp) +unset(_PythonFinder_WantLibs) diff --git a/externals/vcpkg/ports/python3/vcpkg.json b/externals/vcpkg/ports/python3/vcpkg.json new file mode 100755 index 000000000..21ee84f93 --- /dev/null +++ b/externals/vcpkg/ports/python3/vcpkg.json @@ -0,0 +1,50 @@ +{ + "name": "python3", + "version": "3.10.2", + "port-version": 2, + "description": "The Python programming language", + "homepage": "https://github.com/python/cpython", + "license": "Python-2.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "bzip2", + "platform": "!(windows & static)" + }, + "expat", + { + "name": "gettext", + "platform": "osx" + }, + { + "name": "libffi", + "platform": "!(windows & static)" + }, + { + "name": "libiconv", + "platform": "osx" + }, + { + "name": "liblzma", + "platform": "!(windows & static)" + }, + { + "name": "openssl", + "platform": "!(windows & static)" + }, + { + "name": "python3", + "host": true + }, + { + "name": "sqlite3", + "platform": "!(windows & static)" + }, + "zlib" + ], + "features": { + "deprecated-win7-support": { + "description": "Deprecated support for the Windows 7 platform -- may be removed at any time." + } + } +} diff --git a/externals/vcpkg/ports/qca/0001-fix-path-for-vcpkg.patch b/externals/vcpkg/ports/qca/0001-fix-path-for-vcpkg.patch new file mode 100755 index 000000000..744fce107 --- /dev/null +++ b/externals/vcpkg/ports/qca/0001-fix-path-for-vcpkg.patch @@ -0,0 +1,72 @@ +diff --git "a/CMakeLists.txt" "b/CMakeLists.txt" +index 1f84c2c9e..f72ee9d8d 100644 +--- "a/CMakeLists.txt" ++++ "b/CMakeLists.txt" +@@ -58,6 +58,7 @@ set(QCA_SUFFIX "qt5") + if(NOT BUILD_SHARED_LIBS OR QT_IS_STATIC) + set(STATIC_PLUGINS ON) + add_definitions(-DQT_STATICPLUGIN) ++ add_definitions(-DQCA_STATIC) + set(PLUGIN_TYPE "STATIC") + else() + set(PLUGIN_TYPE "MODULE") +@@ -266,10 +267,17 @@ if(DEVELOPER_MODE) + add_definitions(-DDEVELOPER_MODE) + + # To prefer plugins from build tree when run qca from build tree +- file(WRITE ${CMAKE_BINARY_DIR}/bin/qt.conf +-"[Paths] +-Plugins=${CMAKE_BINARY_DIR}/lib/${QCA_LIB_NAME} +-") ++ if(NOT BUILD_SHARED_LIBS OR QT_IS_STATIC) ++ file(WRITE ${CMAKE_BINARY_DIR}/bin/qt.conf ++ "[Paths] ++ Plugins=${CMAKE_BINARY_DIR}/lib/${QCA_LIB_NAME} ++ ") ++ else() ++ file(WRITE ${CMAKE_BINARY_DIR}/bin/qt.conf ++ "[Paths] ++ Plugins=${CMAKE_BINARY_DIR}/bin/${QCA_LIB_NAME} ++ ") ++ endif() + endif() + + if (APPLE) +@@ -309,7 +317,7 @@ else() + set( qca_CERTSTORE "${CMAKE_CURRENT_SOURCE_DIR}/certs/rootcerts.pem") + # note that INSTALL_FILES targets are relative to the current installation prefix... + if(NOT DEVELOPER_MODE) +- install(FILES "${qca_CERTSTORE}" DESTINATION "${QCA_PREFIX_INSTALL_DIR}/certs") ++ install(FILES "${qca_CERTSTORE}" DESTINATION "${QCA_PREFIX_INSTALL_DIR}/share/qca/certs") + endif() + endif() + message(STATUS "certstore path: " ${qca_CERTSTORE}) +@@ -390,10 +398,10 @@ endif() + include(CMakePackageConfigHelpers) + configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/QcaConfig.cmake.in" +- "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/${QCA_CONFIG_NAME_BASE}/${QCA_CONFIG_NAME_BASE}Config.cmake" +- INSTALL_DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/${QCA_CONFIG_NAME_BASE} ++ "${CMAKE_BINARY_DIR}/share/qca/cmake/${QCA_CONFIG_NAME_BASE}Config.cmake" ++ INSTALL_DESTINATION ${CMAKE_BINARY_DIR}/share/qca/cmake + ) +-write_basic_config_version_file("${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/${QCA_CONFIG_NAME_BASE}/${QCA_CONFIG_NAME_BASE}ConfigVersion.cmake" VERSION ${QCA_LIB_VERSION_STRING} COMPATIBILITY AnyNewerVersion) ++write_basic_config_version_file("${CMAKE_BINARY_DIR}/share/qca/cmake/${QCA_CONFIG_NAME_BASE}ConfigVersion.cmake" VERSION ${QCA_LIB_VERSION_STRING} COMPATIBILITY AnyNewerVersion) + + if(NOT DEVELOPER_MODE) + +@@ -461,10 +469,10 @@ if(NOT DEVELOPER_MODE) + endif() + endif() + +- install(EXPORT ${QCA_CONFIG_NAME_BASE}Targets DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/${QCA_CONFIG_NAME_BASE} FILE ${QCA_CONFIG_NAME_BASE}Targets.cmake) ++ install(EXPORT ${QCA_CONFIG_NAME_BASE}Targets DESTINATION ${QCA_PREFIX_INSTALL_DIR}/share/qca/cmake FILE ${QCA_CONFIG_NAME_BASE}Targets.cmake) + install(FILES +- "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/${QCA_CONFIG_NAME_BASE}/${QCA_CONFIG_NAME_BASE}Config.cmake" +- "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/${QCA_CONFIG_NAME_BASE}/${QCA_CONFIG_NAME_BASE}ConfigVersion.cmake" +- DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/${QCA_CONFIG_NAME_BASE} ++ "${CMAKE_BINARY_DIR}/share/qca/cmake/${QCA_CONFIG_NAME_BASE}Config.cmake" ++ "${CMAKE_BINARY_DIR}/share/qca/cmake/${QCA_CONFIG_NAME_BASE}ConfigVersion.cmake" ++ DESTINATION ${QCA_PREFIX_INSTALL_DIR}/share/qca/cmake + ) + endif() diff --git a/externals/vcpkg/ports/qca/0002-fix-build-error.patch b/externals/vcpkg/ports/qca/0002-fix-build-error.patch new file mode 100755 index 000000000..58c52af0a --- /dev/null +++ b/externals/vcpkg/ports/qca/0002-fix-build-error.patch @@ -0,0 +1,71 @@ +From 8d67288a3dde7e535ff747715f96f98282a3bf67 Mon Sep 17 00:00:00 2001 +From: Matthias Kuhn +Date: Fri, 3 Dec 2021 15:17:25 +0100 +Subject: [PATCH] Ifdef codecs + +--- + cmake/modules/QcaMacro.cmake | 9 --------- + plugins/qca-ossl/qca-ossl.cpp | 6 ++++++ + 2 files changed, 6 insertions(+), 9 deletions(-) + +diff --git a/cmake/modules/QcaMacro.cmake b/cmake/modules/QcaMacro.cmake +index 80af6e84..ba86310d 100644 +--- a/cmake/modules/QcaMacro.cmake ++++ b/cmake/modules/QcaMacro.cmake +@@ -69,15 +69,6 @@ macro(add_qca_test TARGET DESCRIPTION) + endmacro(add_qca_test) + + macro(install_pdb TARGET INSTALL_PATH) +- if(MSVC) +- get_target_property(LOCATION ${TARGET} LOCATION_DEBUG) +- string(REGEX REPLACE "\\.[^.]*$" ".pdb" LOCATION "${LOCATION}") +- install(FILES ${LOCATION} DESTINATION ${INSTALL_PATH} CONFIGURATIONS Debug) +- +- get_target_property(LOCATION ${TARGET} LOCATION_RELWITHDEBINFO) +- string(REGEX REPLACE "\\.[^.]*$" ".pdb" LOCATION "${LOCATION}") +- install(FILES ${LOCATION} DESTINATION ${INSTALL_PATH} CONFIGURATIONS RelWithDebInfo) +- endif() + endmacro(install_pdb) + + macro(normalize_path PATH) +diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp +index b2c5d3d3..4250ec26 100644 +--- a/plugins/qca-ossl/qca-ossl.cpp ++++ b/plugins/qca-ossl/qca-ossl.cpp +@@ -6846,6 +6846,7 @@ public: + else if (type == QLatin1String("aes256-ccm")) + return new opensslCipherContext(EVP_aes_256_ccm(), 0, this, type); + #endif ++#ifndef OPENSSL_NO_BF + else if (type == QLatin1String("blowfish-ecb")) + return new opensslCipherContext(EVP_bf_ecb(), 0, this, type); + else if (type == QLatin1String("blowfish-cfb")) +@@ -6856,6 +6857,8 @@ public: + return new opensslCipherContext(EVP_bf_cbc(), 0, this, type); + else if (type == QLatin1String("blowfish-cbc-pkcs7")) + return new opensslCipherContext(EVP_bf_cbc(), 1, this, type); ++#endif ++#ifndef OPENSSL_NO_DES + else if (type == QLatin1String("tripledes-ecb")) + return new opensslCipherContext(EVP_des_ede3(), 0, this, type); + else if (type == QLatin1String("tripledes-cbc")) +@@ -6872,6 +6875,8 @@ public: + return new opensslCipherContext(EVP_des_cfb(), 0, this, type); + else if (type == QLatin1String("des-ofb")) + return new opensslCipherContext(EVP_des_ofb(), 0, this, type); ++#endif ++#ifndef OPENSSL_NO_CAST + else if (type == QLatin1String("cast5-ecb")) + return new opensslCipherContext(EVP_cast5_ecb(), 0, this, type); + else if (type == QLatin1String("cast5-cbc")) +@@ -6882,6 +6887,7 @@ public: + return new opensslCipherContext(EVP_cast5_cfb(), 0, this, type); + else if (type == QLatin1String("cast5-ofb")) + return new opensslCipherContext(EVP_cast5_ofb(), 0, this, type); ++#endif + else if (type == QLatin1String("pkey")) + return new MyPKeyContext(this); + else if (type == QLatin1String("dlgroup")) +-- +2.31.1 + diff --git a/externals/vcpkg/ports/qca/mk-ca-bundle.pl b/externals/vcpkg/ports/qca/mk-ca-bundle.pl new file mode 100755 index 000000000..9574f1dbf --- /dev/null +++ b/externals/vcpkg/ports/qca/mk-ca-bundle.pl @@ -0,0 +1,554 @@ +#!/usr/bin/perl -w +# *************************************************************************** +# * _ _ ____ _ +# * Project ___| | | | _ \| | +# * / __| | | | |_) | | +# * | (__| |_| | _ <| |___ +# * \___|\___/|_| \_\_____| +# * +# * Copyright (C) 1998 - 2016, Daniel Stenberg, , et al. +# * +# * This software is licensed as described in the file COPYING, which +# * you should have received as part of this distribution. The terms +# * are also available at https://curl.haxx.se/docs/copyright.html. +# * +# * You may opt to use, copy, modify, merge, publish, distribute and/or sell +# * copies of the Software, and permit persons to whom the Software is +# * furnished to do so, under the terms of the COPYING file. +# * +# * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY +# * KIND, either express or implied. +# * +# *************************************************************************** +# This Perl script creates a fresh ca-bundle.crt file for use with libcurl. +# It downloads certdata.txt from Mozilla's source tree (see URL below), +# then parses certdata.txt and extracts CA Root Certificates into PEM format. +# These are then processed with the OpenSSL commandline tool to produce the +# final ca-bundle.crt file. +# The script is based on the parse-certs script written by Roland Krikava. +# This Perl script works on almost any platform since its only external +# dependency is the OpenSSL commandline tool for optional text listing. +# Hacked by Guenter Knauf. +# +use Encode; +use Getopt::Std; +use MIME::Base64; +use strict; +use vars qw($opt_b $opt_d $opt_f $opt_h $opt_i $opt_k $opt_l $opt_m $opt_n $opt_p $opt_q $opt_s $opt_t $opt_u $opt_v $opt_w); +use List::Util; +use Text::Wrap; +my $MOD_SHA = "Digest::SHA"; +eval "require $MOD_SHA"; +if ($@) { + $MOD_SHA = "Digest::SHA::PurePerl"; + eval "require $MOD_SHA"; +} +eval "require LWP::UserAgent"; + +my %urls = ( + 'nss' => + 'https://hg.mozilla.org/projects/nss/raw-file/tip/lib/ckfw/builtins/certdata.txt', + 'central' => + 'https://hg.mozilla.org/mozilla-central/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt', + 'aurora' => + 'https://hg.mozilla.org/releases/mozilla-aurora/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt', + 'beta' => + 'https://hg.mozilla.org/releases/mozilla-beta/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt', + 'release' => + 'https://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt', +); + +$opt_d = 'release'; + +# If the OpenSSL commandline is not in search path you can configure it here! +my $openssl = 'openssl'; + +my $version = '1.27'; + +$opt_w = 76; # default base64 encoded lines length + +# default cert types to include in the output (default is to include CAs which may issue SSL server certs) +my $default_mozilla_trust_purposes = "SERVER_AUTH"; +my $default_mozilla_trust_levels = "TRUSTED_DELEGATOR"; +$opt_p = $default_mozilla_trust_purposes . ":" . $default_mozilla_trust_levels; + +my @valid_mozilla_trust_purposes = ( + "DIGITAL_SIGNATURE", + "NON_REPUDIATION", + "KEY_ENCIPHERMENT", + "DATA_ENCIPHERMENT", + "KEY_AGREEMENT", + "KEY_CERT_SIGN", + "CRL_SIGN", + "SERVER_AUTH", + "CLIENT_AUTH", + "CODE_SIGNING", + "EMAIL_PROTECTION", + "IPSEC_END_SYSTEM", + "IPSEC_TUNNEL", + "IPSEC_USER", + "TIME_STAMPING", + "STEP_UP_APPROVED" +); + +my @valid_mozilla_trust_levels = ( + "TRUSTED_DELEGATOR", # CAs + "NOT_TRUSTED", # Don't trust these certs. + "MUST_VERIFY_TRUST", # This explicitly tells us that it ISN'T a CA but is otherwise ok. In other words, this should tell the app to ignore any other sources that claim this is a CA. + "TRUSTED" # This cert is trusted, but only for itself and not for delegates (i.e. it is not a CA). +); + +my $default_signature_algorithms = $opt_s = "MD5"; + +my @valid_signature_algorithms = ( + "MD5", + "SHA1", + "SHA256", + "SHA384", + "SHA512" +); + +$0 =~ s@.*(/|\\)@@; +$Getopt::Std::STANDARD_HELP_VERSION = 1; +getopts('bd:fhiklmnp:qs:tuvw:'); + +if(!defined($opt_d)) { + # to make plain "-d" use not cause warnings, and actually still work + $opt_d = 'release'; +} + +# Use predefined URL or else custom URL specified on command line. +my $url; +if(defined($urls{$opt_d})) { + $url = $urls{$opt_d}; + if(!$opt_k && $url !~ /^https:\/\//i) { + die "The URL for '$opt_d' is not HTTPS. Use -k to override (insecure).\n"; + } +} +else { + $url = $opt_d; +} + +my $curl = `curl -V`; + +if ($opt_i) { + print ("=" x 78 . "\n"); + print "Script Version : $version\n"; + print "Perl Version : $]\n"; + print "Operating System Name : $^O\n"; + print "Getopt::Std.pm Version : ${Getopt::Std::VERSION}\n"; + print "MIME::Base64.pm Version : ${MIME::Base64::VERSION}\n"; + print "LWP::UserAgent.pm Version : ${LWP::UserAgent::VERSION}\n" if($LWP::UserAgent::VERSION); + print "LWP.pm Version : ${LWP::VERSION}\n" if($LWP::VERSION); + print "Digest::SHA.pm Version : ${Digest::SHA::VERSION}\n" if ($Digest::SHA::VERSION); + print "Digest::SHA::PurePerl.pm Version : ${Digest::SHA::PurePerl::VERSION}\n" if ($Digest::SHA::PurePerl::VERSION); + print ("=" x 78 . "\n"); +} + +sub warning_message() { + if ( $opt_d =~ m/^risk$/i ) { # Long Form Warning and Exit + print "Warning: Use of this script may pose some risk:\n"; + print "\n"; + print " 1) If you use HTTP URLs they are subject to a man in the middle attack\n"; + print " 2) Default to 'release', but more recent updates may be found in other trees\n"; + print " 3) certdata.txt file format may change, lag time to update this script\n"; + print " 4) Generally unwise to blindly trust CAs without manual review & verification\n"; + print " 5) Mozilla apps use additional security checks aren't represented in certdata\n"; + print " 6) Use of this script will make a security engineer grind his teeth and\n"; + print " swear at you. ;)\n"; + exit; + } else { # Short Form Warning + print "Warning: Use of this script may pose some risk, -d risk for more details.\n"; + } +} + +sub HELP_MESSAGE() { + print "Usage:\t${0} [-b] [-d] [-f] [-i] [-k] [-l] [-n] [-p] [-q] [-s] [-t] [-u] [-v] [-w] []\n"; + print "\t-b\tbackup an existing version of ca-bundle.crt\n"; + print "\t-d\tspecify Mozilla tree to pull certdata.txt or custom URL\n"; + print "\t\t Valid names are:\n"; + print "\t\t ", join( ", ", map { ( $_ =~ m/$opt_d/ ) ? "$_ (default)" : "$_" } sort keys %urls ), "\n"; + print "\t-f\tforce rebuild even if certdata.txt is current\n"; + print "\t-i\tprint version info about used modules\n"; + print "\t-k\tallow URLs other than HTTPS, enable HTTP fallback (insecure)\n"; + print "\t-l\tprint license info about certdata.txt\n"; + print "\t-m\tinclude meta data in output\n"; + print "\t-n\tno download of certdata.txt (to use existing)\n"; + print wrap("\t","\t\t", "-p\tlist of Mozilla trust purposes and levels for certificates to include in output. Takes the form of a comma separated list of purposes, a colon, and a comma separated list of levels. (default: $default_mozilla_trust_purposes:$default_mozilla_trust_levels)"), "\n"; + print "\t\t Valid purposes are:\n"; + print wrap("\t\t ","\t\t ", join( ", ", "ALL", @valid_mozilla_trust_purposes ) ), "\n"; + print "\t\t Valid levels are:\n"; + print wrap("\t\t ","\t\t ", join( ", ", "ALL", @valid_mozilla_trust_levels ) ), "\n"; + print "\t-q\tbe really quiet (no progress output at all)\n"; + print wrap("\t","\t\t", "-s\tcomma separated list of certificate signatures/hashes to output in plain text mode. (default: $default_signature_algorithms)\n"); + print "\t\t Valid signature algorithms are:\n"; + print wrap("\t\t ","\t\t ", join( ", ", "ALL", @valid_signature_algorithms ) ), "\n"; + print "\t-t\tinclude plain text listing of certificates\n"; + print "\t-u\tunlink (remove) certdata.txt after processing\n"; + print "\t-v\tbe verbose and print out processed CAs\n"; + print "\t-w \twrap base64 output lines after chars (default: ${opt_w})\n"; + exit; +} + +sub VERSION_MESSAGE() { + print "${0} version ${version} running Perl ${]} on ${^O}\n"; +} + +warning_message() unless ($opt_q || $url =~ m/^(ht|f)tps:/i ); +HELP_MESSAGE() if ($opt_h); + +sub report($@) { + my $output = shift; + + print STDERR $output . "\n" unless $opt_q; +} + +sub is_in_list($@) { + my $target = shift; + + return defined(List::Util::first { $target eq $_ } @_); +} + +# Parses $param_string as a case insensitive comma separated list with optional whitespace +# validates that only allowed parameters are supplied +sub parse_csv_param($$@) { + my $description = shift; + my $param_string = shift; + my @valid_values = @_; + + my @values = map { + s/^\s+//; # strip leading spaces + s/\s+$//; # strip trailing spaces + uc $_ # return the modified string as upper case + } split( ',', $param_string ); + + # Find all values which are not in the list of valid values or "ALL" + my @invalid = grep { !is_in_list($_,"ALL",@valid_values) } @values; + + if ( scalar(@invalid) > 0 ) { + # Tell the user which parameters were invalid and print the standard help message which will exit + print "Error: Invalid ", $description, scalar(@invalid) == 1 ? ": " : "s: ", join( ", ", map { "\"$_\"" } @invalid ), "\n"; + HELP_MESSAGE(); + } + + @values = @valid_values if ( is_in_list("ALL",@values) ); + + return @values; +} + +sub sha256 { + my $result; + if ($Digest::SHA::VERSION || $Digest::SHA::PurePerl::VERSION) { + open(FILE, $_[0]) or die "Can't open '$_[0]': $!"; + binmode(FILE); + $result = $MOD_SHA->new(256)->addfile(*FILE)->hexdigest; + close(FILE); + } else { + # Use OpenSSL command if Perl Digest::SHA modules not available + $result = `"$openssl" dgst -r -sha256 "$_[0]"`; + $result =~ s/^([0-9a-f]{64}) .+/$1/is; + } + return $result; +} + + +sub oldhash { + my $hash = ""; + open(C, "<$_[0]") || return 0; + while() { + chomp; + if($_ =~ /^\#\# SHA256: (.*)/) { + $hash = $1; + last; + } + } + close(C); + return $hash; +} + +if ( $opt_p !~ m/:/ ) { + print "Error: Mozilla trust identifier list must include both purposes and levels\n"; + HELP_MESSAGE(); +} + +(my $included_mozilla_trust_purposes_string, my $included_mozilla_trust_levels_string) = split( ':', $opt_p ); +my @included_mozilla_trust_purposes = parse_csv_param( "trust purpose", $included_mozilla_trust_purposes_string, @valid_mozilla_trust_purposes ); +my @included_mozilla_trust_levels = parse_csv_param( "trust level", $included_mozilla_trust_levels_string, @valid_mozilla_trust_levels ); + +my @included_signature_algorithms = parse_csv_param( "signature algorithm", $opt_s, @valid_signature_algorithms ); + +sub should_output_cert(%) { + my %trust_purposes_by_level = @_; + + foreach my $level (@included_mozilla_trust_levels) { + # for each level we want to output, see if any of our desired purposes are included + return 1 if ( defined( List::Util::first { is_in_list( $_, @included_mozilla_trust_purposes ) } @{$trust_purposes_by_level{$level}} ) ); + } + + return 0; +} + +my $crt = $ARGV[0] || 'ca-bundle.crt'; +(my $txt = $url) =~ s@(.*/|\?.*)@@g; + +my $stdout = $crt eq '-'; +my $resp; +my $fetched; + +my $oldhash = oldhash($crt); + +report "SHA256 of old file: $oldhash"; + +if(!$opt_n) { + report "Downloading $txt ..."; + + # If we have an HTTPS URL then use curl + if($url =~ /^https:\/\//i) { + if($curl) { + if($curl =~ /^Protocols:.* https( |$)/m) { + report "Get certdata with curl!"; + my $proto = !$opt_k ? "--proto =https" : ""; + my $quiet = $opt_q ? "-s" : ""; + my @out = `curl -w %{response_code} $proto $quiet -o "$txt" "$url"`; + if(@out && $out[0] == 200) { + $fetched = 1; + report "Downloaded $txt"; + } + else { + report "Failed downloading via HTTPS with curl"; + if(-e $txt && !unlink($txt)) { + report "Failed to remove '$txt': $!"; + } + } + } + else { + report "curl lacks https support"; + } + } + else { + report "curl not found"; + } + } + + # If nothing was fetched then use LWP + if(!$fetched) { + if($url =~ /^https:\/\//i) { + report "Falling back to HTTP"; + $url =~ s/^https:\/\//http:\/\//i; + } + if(!$opt_k) { + report "URLs other than HTTPS are disabled by default, to enable use -k"; + exit 1; + } + report "Get certdata with LWP!"; + if(!defined(${LWP::UserAgent::VERSION})) { + report "LWP is not available (LWP::UserAgent not found)"; + exit 1; + } + my $ua = new LWP::UserAgent(agent => "$0/$version"); + $ua->env_proxy(); + $resp = $ua->mirror($url, $txt); + if($resp && $resp->code eq '304') { + report "Not modified"; + exit 0 if -e $crt && !$opt_f; + } + else { + $fetched = 1; + report "Downloaded $txt"; + } + if(!$resp || $resp->code !~ /^(?:200|304)$/) { + report "Unable to download latest data: " + . ($resp? $resp->code . ' - ' . $resp->message : "LWP failed"); + exit 1 if -e $crt || ! -r $txt; + } + } +} + +my $filedate = $resp ? $resp->last_modified : (stat($txt))[9]; +my $datesrc = "as of"; +if(!$filedate) { + # mxr.mozilla.org gave us a time, hg.mozilla.org does not! + $filedate = time(); + $datesrc="downloaded on"; +} + +# get the hash from the download file +my $newhash= sha256($txt); + +if(!$opt_f && $oldhash eq $newhash) { + report "Downloaded file identical to previous run\'s source file. Exiting"; + exit; +} + +report "SHA256 of new file: $newhash"; + +my $currentdate = scalar gmtime($filedate); + +my $format = $opt_t ? "plain text and " : ""; +if( $stdout ) { + open(CRT, '> -') or die "Couldn't open STDOUT: $!\n"; +} else { + open(CRT,">$crt.~") or die "Couldn't open $crt.~: $!\n"; +} +print CRT <) { + if (/\*\*\*\*\* BEGIN LICENSE BLOCK \*\*\*\*\*/) { + print CRT; + print if ($opt_l); + while () { + print CRT; + print if ($opt_l); + last if (/\*\*\*\*\* END LICENSE BLOCK \*\*\*\*\*/); + } + } + elsif(/^# (Issuer|Serial Number|Subject|Not Valid Before|Not Valid After |Fingerprint \(MD5\)|Fingerprint \(SHA1\)):/) { + push @precert, $_; + next; + } + elsif(/^#|^\s*$/) { + undef @precert; + next; + } + chomp; + + # this is a match for the start of a certificate + if (/^CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE/) { + $start_of_cert = 1 + } + if ($start_of_cert && /^CKA_LABEL UTF8 \"(.*)\"/) { + $caname = $1; + } + my %trust_purposes_by_level; + if ($start_of_cert && /^CKA_VALUE MULTILINE_OCTAL/) { + my $data; + while () { + last if (/^END/); + chomp; + my @octets = split(/\\/); + shift @octets; + for (@octets) { + $data .= chr(oct); + } + } + # scan forwards until the trust part + while () { + last if (/^CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST/); + chomp; + } + # now scan the trust part to determine how we should trust this cert + while () { + last if (/^#/); + if (/^CKA_TRUST_([A-Z_]+)\s+CK_TRUST\s+CKT_NSS_([A-Z_]+)\s*$/) { + if ( !is_in_list($1,@valid_mozilla_trust_purposes) ) { + report "Warning: Unrecognized trust purpose for cert: $caname. Trust purpose: $1. Trust Level: $2"; + } elsif ( !is_in_list($2,@valid_mozilla_trust_levels) ) { + report "Warning: Unrecognized trust level for cert: $caname. Trust purpose: $1. Trust Level: $2"; + } else { + push @{$trust_purposes_by_level{$2}}, $1; + } + } + } + + if ( !should_output_cert(%trust_purposes_by_level) ) { + $skipnum ++; + } else { + my $encoded = MIME::Base64::encode_base64($data, ''); + $encoded =~ s/(.{1,${opt_w}})/$1\n/g; + my $pem = "-----BEGIN CERTIFICATE-----\n" + . $encoded + . "-----END CERTIFICATE-----\n"; + print CRT "\n$caname\n"; + print CRT @precert if($opt_m); + my $maxStringLength = length(decode('UTF-8', $caname, Encode::FB_CROAK)); + if ($opt_t) { + foreach my $key (keys %trust_purposes_by_level) { + my $string = $key . ": " . join(", ", @{$trust_purposes_by_level{$key}}); + $maxStringLength = List::Util::max( length($string), $maxStringLength ); + print CRT $string . "\n"; + } + } + print CRT ("=" x $maxStringLength . "\n"); + if (!$opt_t) { + print CRT $pem; + } else { + my $pipe = ""; + foreach my $hash (@included_signature_algorithms) { + $pipe = "|$openssl x509 -" . $hash . " -fingerprint -noout -inform PEM"; + if (!$stdout) { + $pipe .= " >> $crt.~"; + close(CRT) or die "Couldn't close $crt.~: $!"; + } + open(TMP, $pipe) or die "Couldn't open openssl pipe: $!"; + print TMP $pem; + close(TMP) or die "Couldn't close openssl pipe: $!"; + if (!$stdout) { + open(CRT, ">>$crt.~") or die "Couldn't open $crt.~: $!"; + } + } + $pipe = "|$openssl x509 -text -inform PEM"; + if (!$stdout) { + $pipe .= " >> $crt.~"; + close(CRT) or die "Couldn't close $crt.~: $!"; + } + open(TMP, $pipe) or die "Couldn't open openssl pipe: $!"; + print TMP $pem; + close(TMP) or die "Couldn't close openssl pipe: $!"; + if (!$stdout) { + open(CRT, ">>$crt.~") or die "Couldn't open $crt.~: $!"; + } + } + report "Parsing: $caname" if ($opt_v); + $certnum ++; + $start_of_cert = 0; + } + undef @precert; + } + +} +close(TXT) or die "Couldn't close $txt: $!\n"; +close(CRT) or die "Couldn't close $crt.~: $!\n"; +unless( $stdout ) { + if ($opt_b && -e $crt) { + my $bk = 1; + while (-e "$crt.~${bk}~") { + $bk++; + } + rename $crt, "$crt.~${bk}~" or die "Failed to create backup $crt.~$bk}~: $!\n"; + } elsif( -e $crt ) { + unlink( $crt ) or die "Failed to remove $crt: $!\n"; + } + rename "$crt.~", $crt or die "Failed to rename $crt.~ to $crt: $!\n"; +} +if($opt_u && -e $txt && !unlink($txt)) { + report "Failed to remove $txt: $!\n"; +} +report "Done ($certnum CA certs processed, $skipnum skipped)."; diff --git a/externals/vcpkg/ports/qca/portfile.cmake b/externals/vcpkg/ports/qca/portfile.cmake new file mode 100755 index 000000000..54c137540 --- /dev/null +++ b/externals/vcpkg/ports/qca/portfile.cmake @@ -0,0 +1,91 @@ +# This portfile adds the Qt Cryptographic Arcitecture +# Changes to the original build: +# No -qt5 suffix, which is recommended just for Linux +# Output directories according to vcpkg +# Updated certstore. See certstore.pem in the output dirs +# +vcpkg_find_acquire_program(PERL) +get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) +vcpkg_add_to_path("${PERL_EXE_PATH}") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/qca + REF v2.3.4 + SHA512 04583da17531538fc2a7ae18a1a4f89f1e8d303e2bb390520a8f55a20bab17f8407ab07aefef2a75587e2a0521f41b37a9fdd8430ec483daf5d02c05556b8ddb + PATCHES + 0001-fix-path-for-vcpkg.patch + 0002-fix-build-error.patch +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(QCA_FEATURE_INSTALL_DIR_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/Qca) + set(QCA_FEATURE_INSTALL_DIR_RELEASE ${CURRENT_PACKAGES_DIR}/bin/Qca) +else() + set(QCA_FEATURE_INSTALL_DIR_DEBUG ${CURRENT_PACKAGES_DIR}/debug/lib/Qca) + set(QCA_FEATURE_INSTALL_DIR_RELEASE ${CURRENT_PACKAGES_DIR}/lib/Qca) +endif() + +# According to: +# https://www.openssl.org/docs/faq.html#USER16 +# it is up to developers or admins to maintain CAs. +# So we do it here: +message(STATUS "Importing certstore") +file(REMOVE "${SOURCE_PATH}/certs/rootcerts.pem") +# Using file(DOWNLOAD) to use https +file(DOWNLOAD https://raw.githubusercontent.com/mozilla/gecko-dev/master/security/nss/lib/ckfw/builtins/certdata.txt + "${CURRENT_BUILDTREES_DIR}/cert/certdata.txt" + TLS_VERIFY ON +) +vcpkg_execute_required_process( + COMMAND "${PERL}" "${CMAKE_CURRENT_LIST_DIR}/mk-ca-bundle.pl" -n "${SOURCE_PATH}/certs/rootcerts.pem" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/cert" + LOGNAME ca-bundle +) +message(STATUS "Importing certstore done") + +if("botan" IN_LIST FEATURES) + list(APPEND QCA_OPTIONS -DWITH_botan_PLUGIN="yes") +else() + list(APPEND QCA_OPTIONS -DWITH_botan_PLUGIN="no") +endif() + +# Configure and build +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DUSE_RELATIVE_PATHS=ON + -DBUILD_TESTS=OFF + -DBUILD_TOOLS=OFF + -DQCA_SUFFIX=OFF + -DQCA_FEATURE_INSTALL_DIR=share/qca/mkspecs/features + -DOSX_FRAMEWORK=OFF + ${QCA_OPTIONS} + OPTIONS_DEBUG + -DQCA_PLUGINS_INSTALL_DIR=${QCA_FEATURE_INSTALL_DIR_DEBUG} + OPTIONS_RELEASE + -DQCA_PLUGINS_INSTALL_DIR=${QCA_FEATURE_INSTALL_DIR_RELEASE} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/qca/cmake) +file(READ "${CURRENT_PACKAGES_DIR}/share/${PORT}/QcaConfig.cmake" QCA_CONFIG_FILE) +string(REGEX REPLACE "PACKAGE_PREFIX_DIR \"(.*)\" ABSOLUTE" + [[PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE]] + QCA_CONFIG_FILE "${QCA_CONFIG_FILE}" +) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/QcaConfig.cmake" "${QCA_CONFIG_FILE}") + +# Remove unneeded dirs +file(REMOVE_RECURSE + "${CURRENT_BUILDTREES_DIR}/share/man" + "${CURRENT_PACKAGES_DIR}/share/man" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +vcpkg_fixup_pkgconfig() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/qca/vcpkg.json b/externals/vcpkg/ports/qca/vcpkg.json new file mode 100755 index 000000000..723256ab9 --- /dev/null +++ b/externals/vcpkg/ports/qca/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "qca", + "version": "2.3.4", + "port-version": 2, + "description": "Qt Cryptographic Architecture (QCA).", + "homepage": "https://cgit.kde.org/qca.git/", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "botan" + ], + "features": { + "botan": { + "description": "Build with botan", + "dependencies": [ + "botan" + ] + } + } +} diff --git a/externals/vcpkg/ports/qcustomplot/portfile.cmake b/externals/vcpkg/ports/qcustomplot/portfile.cmake new file mode 100755 index 000000000..026f62fb3 --- /dev/null +++ b/externals/vcpkg/ports/qcustomplot/portfile.cmake @@ -0,0 +1,40 @@ +set(QCP_VERSION 2.0.1) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.qcustomplot.com/release/${QCP_VERSION}/QCustomPlot.tar.gz" + FILENAME "QCustomPlot-${QCP_VERSION}.tar.gz" + SHA512 a15598718146ed3c6b5d38530a56661c16269e530fe0dedb71b4cb2722b5733a3b57689d668a75994b79c19c6e61dcc133dbcb9ed77b93a165f4ac826a5685b9 +) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${QCP_VERSION} +) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.qcustomplot.com/release/${QCP_VERSION}/QCustomPlot-sharedlib.tar.gz" + FILENAME "QCustomPlot-sharedlib-${QCP_VERSION}.tar.gz" + SHA512 ce90540fca7226eac37746327e1939a9c7af38fc2595f385ed04d6d1f49560da08fb5fae15d1b9d22b6ba578583f70de8f89ef26796770d41bf599c1b15c535d +) +vcpkg_extract_source_archive(SharedLib_SOURCE_PATH ARCHIVE "${ARCHIVE}") +file(RENAME "${SharedLib_SOURCE_PATH}" "${SOURCE_PATH}/qcustomplot-sharedlib") + + +vcpkg_configure_qmake(SOURCE_PATH + ${SOURCE_PATH}/qcustomplot-sharedlib/sharedlib-compilation/sharedlib-compilation.pro +) + +vcpkg_install_qmake( + RELEASE_TARGETS release-all + DEBUG_TARGETS debug-all +) + +# Install header file +file(INSTALL ${SOURCE_PATH}/qcustomplot.h + DESTINATION ${CURRENT_PACKAGES_DIR}/include +) + +vcpkg_copy_pdbs() + +# Handle copyright +configure_file(${SOURCE_PATH}/GPL.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/qcustomplot/vcpkg.json b/externals/vcpkg/ports/qcustomplot/vcpkg.json new file mode 100755 index 000000000..6d2c2c665 --- /dev/null +++ b/externals/vcpkg/ports/qcustomplot/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "qcustomplot", + "version": "2.0.1", + "port-version": 5, + "description": "QCustomPlot is a Qt C++ widget for plotting and data visualization.", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/externals/vcpkg/ports/qhttpengine/portfile.cmake b/externals/vcpkg/ports/qhttpengine/portfile.cmake new file mode 100755 index 000000000..3d744bc17 --- /dev/null +++ b/externals/vcpkg/ports/qhttpengine/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nitroshare/qhttpengine + REF 43f55df51623621ed3efb4e42c7894586d988667 + SHA512 bf615016b9078ff1b3b47bb0d0329565d2d44caba67a3a207c430e7f03a7b5d8b326268fafa2b8ebff387aec9356014ec5510e18a422dd2dea7eb1e9bfc009f3 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_DOC=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) +if(VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +else() + vcpkg_fixup_pkgconfig() +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/qhttpengine/vcpkg.json b/externals/vcpkg/ports/qhttpengine/vcpkg.json new file mode 100755 index 000000000..f1762479d --- /dev/null +++ b/externals/vcpkg/ports/qhttpengine/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "qhttpengine", + "version": "1.0.2", + "port-version": 1, + "description": "HTTP server for Qt applications", + "supports": "!uwp", + "dependencies": [ + "qt5-base", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/qhull/fix-missing-symbols.patch b/externals/vcpkg/ports/qhull/fix-missing-symbols.patch new file mode 100755 index 000000000..a1e0b6ecf --- /dev/null +++ b/externals/vcpkg/ports/qhull/fix-missing-symbols.patch @@ -0,0 +1,29 @@ +From 02ba907908ccf5ed0d40a2251272b67cb05c23ea Mon Sep 17 00:00:00 2001 +From: Francisco Facioni +Date: Sat, 31 Jul 2021 22:30:45 +0100 +Subject: [PATCH] Missing symbols in the export + +--- + src/libqhull_r/qhull_r-exports.def | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/libqhull_r/qhull_r-exports.def b/src/libqhull_r/qhull_r-exports.def +index 4c5e17c..b789673 100644 +--- a/src/libqhull_r/qhull_r-exports.def ++++ b/src/libqhull_r/qhull_r-exports.def +@@ -183,6 +183,7 @@ qh_maxouter + qh_maxsimplex + qh_maydropneighbor + qh_memalloc ++qh_memcheck + qh_memfree + qh_memfreeshort + qh_meminit +@@ -351,6 +352,7 @@ qh_setdelnth + qh_setdelnthsorted + qh_setdelsorted + qh_setduplicate ++qh_setendpointer + qh_setequal + qh_setequal_except + qh_setequal_skip diff --git a/externals/vcpkg/ports/qhull/include-qhullcpp-shared.patch b/externals/vcpkg/ports/qhull/include-qhullcpp-shared.patch new file mode 100755 index 000000000..cbf5eaa66 --- /dev/null +++ b/externals/vcpkg/ports/qhull/include-qhullcpp-shared.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f50b187..30109b3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -344,7 +344,7 @@ set(qhull_SHAREDP qhull_p) # libqhull and qhull_p are deprecated, use qhull_r i + + set(qhull_TARGETS_APPLICATIONS qhull rbox qconvex qdelaunay qvoronoi qhalf) + set(qhull_TARGETS_STATIC ${qhull_CPP} ${qhull_STATIC} ${qhull_STATICR}) +-set(qhull_TARGETS_SHARED ${qhull_SHAREDR}) ++set(qhull_TARGETS_SHARED ${qhull_CPP} ${qhull_SHAREDR}) + + set( + qhull_TARGETS_TEST # Unused +@@ -474,7 +474,6 @@ set_target_properties(${qhull_CPP} PROPERTIES + if(NOT ${BUILD_STATIC_LIBS}) + set_target_properties(${qhull_STATIC} PROPERTIES EXCLUDE_FROM_ALL TRUE) + set_target_properties(${qhull_STATICR} PROPERTIES EXCLUDE_FROM_ALL TRUE) +- set_target_properties(${qhull_CPP} PROPERTIES EXCLUDE_FROM_ALL TRUE) + endif() + if(NOT ${BUILD_SHARED_LIBS}) + set_target_properties(${qhull_SHARED} PROPERTIES EXCLUDE_FROM_ALL TRUE) diff --git a/externals/vcpkg/ports/qhull/portfile.cmake b/externals/vcpkg/ports/qhull/portfile.cmake new file mode 100755 index 000000000..6aa76096c --- /dev/null +++ b/externals/vcpkg/ports/qhull/portfile.cmake @@ -0,0 +1,67 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO qhull/qhull + REF 613debeaea72ee66626dace9ba1a2eff11b5d37d + SHA512 5b8ff9665ba73621a9859a6e86717b980b67f8d79d6c78cbf5672bce66aed671f7d64fcbec457bca79eef2e17e105f136017afdf442bb430b9f4a059d7cb93c3 + HEAD_REF master + PATCHES + include-qhullcpp-shared.patch + fix-missing-symbols.patch # upstream https://github.com/qhull/qhull/pull/93 +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/share/man" + "${CURRENT_PACKAGES_DIR}/share/doc" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share/man" + "${CURRENT_PACKAGES_DIR}/debug/share/doc" +) + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Qhull) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/qhull/QhullTargets-interface.cmake" [[ + add_library(Qhull::qhull_r IMPORTED INTERFACE) + set_target_properties(Qhull::qhull_r PROPERTIES INTERFACE_LINK_LIBRARIES Qhull::qhullstatic_r) +]]) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(active_basename "qhullstatic") + set(inactive_basename "qhull") +else() + set(active_basename "qhull") + set(inactive_basename "qhullstatic") +endif() +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${inactive_basename}_r.pc") +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${inactive_basename}.pc") # qhullstatic.pc in dynamic build +if(NOT DEFINED VCPKG_BUILD_TYPE) + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${inactive_basename}_rd.pc") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${active_basename}_rd.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${active_basename}_r.pc") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhullstatic_d.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhullstatic.pc") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${inactive_basename}.pc") # qhullstatic.pc in dynamic build + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhullcpp_d.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhullcpp.pc") +endif() +vcpkg_fixup_pkgconfig() + +vcpkg_copy_tools(TOOL_NAMES + qconvex + qdelaunay + qhalf + qhull + qvoronoi + rbox + AUTO_CLEAN +) + +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME usage) +file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/qhull/usage b/externals/vcpkg/ports/qhull/usage new file mode 100755 index 000000000..94dbcafa6 --- /dev/null +++ b/externals/vcpkg/ports/qhull/usage @@ -0,0 +1,9 @@ +The package qhull provides CMake targets: + + # Reentrant C API + find_package(Qhull CONFIG REQUIRED) + target_link_libraries(main PRIVATE Qhull::qhull_r) + + # C++ API + find_package(Qhull CONFIG REQUIRED) + target_link_libraries(main PRIVATE Qhull::qhullcpp) diff --git a/externals/vcpkg/ports/qhull/vcpkg.json b/externals/vcpkg/ports/qhull/vcpkg.json new file mode 100755 index 000000000..7f6e7e32f --- /dev/null +++ b/externals/vcpkg/ports/qhull/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "qhull", + "version": "8.0.2", + "port-version": 3, + "description": "computes the convex hull, Delaunay triangulation, Voronoi diagram", + "homepage": "https://github.com/qhull/qhull", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/qnnpack/fix-arm64-osx.patch b/externals/vcpkg/ports/qnnpack/fix-arm64-osx.patch new file mode 100755 index 000000000..2b13997e8 --- /dev/null +++ b/externals/vcpkg/ports/qnnpack/fix-arm64-osx.patch @@ -0,0 +1,18 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,12 +32,15 @@ + IF(NOT IOS_ARCH MATCHES "^(i386|x86_64|armv7.*|arm64.*)$") + MESSAGE(FATAL_ERROR "Unrecognized IOS_ARCH = ${IOS_ARCH}") + ENDIF() + ELSE() + MESSAGE(FATAL_ERROR "CMAKE_SYSTEM_PROCESSOR is not defined") + ENDIF() ++ELSEIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") ++ # on macOS, arm64 is called arm64 ++ SET(CMAKE_SYSTEM_PROCESSOR "aarch64") + ELSEIF(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(i[3-6]86|x86_64|armv[5-8].*|aarch64)$") + MESSAGE(FATAL_ERROR "Unrecognized CMAKE_SYSTEM_PROCESSOR = ${CMAKE_SYSTEM_PROCESSOR}") + ENDIF() + + IF(NOT CMAKE_SYSTEM_NAME) + MESSAGE(FATAL_ERROR "CMAKE_SYSTEM_NAME not defined") diff --git a/externals/vcpkg/ports/qnnpack/portfile.cmake b/externals/vcpkg/ports/qnnpack/portfile.cmake new file mode 100755 index 000000000..157d47ec7 --- /dev/null +++ b/externals/vcpkg/ports/qnnpack/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO pytorch/QNNPACK + REF 7d2a4e9931a82adc3814275b6219a03e24e36b4c + SHA512 437a835acfedae851a9a8572fa6eea9854dcb8bcca499bc4a2582314e44f5f199778e857932da4aecf943bea7cb2eb5b1c41d4b4ca6075bddbe0f18b2c7b9127 + HEAD_REF master + PATCHES + use-packages.patch + fix-arm64-osx.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DQNNPACK_BUILD_TESTS=OFF + -DQNNPACK_BUILD_BENCHMARKS=OFF +) +vcpkg_cmake_install() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/bin" +) diff --git a/externals/vcpkg/ports/qnnpack/use-packages.patch b/externals/vcpkg/ports/qnnpack/use-packages.patch new file mode 100755 index 000000000..2591e1331 --- /dev/null +++ b/externals/vcpkg/ports/qnnpack/use-packages.patch @@ -0,0 +1,187 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a5ddc49..05e1279 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,8 +13,6 @@ PROJECT(QNNPACK C CXX ASM) + + # ---[ Options. + OPTION(QNNPACK_CUSTOM_THREADPOOL "Build QNNPACK for custom thread pool" OFF) +-SET(QNNPACK_LIBRARY_TYPE "default" CACHE STRING "Type of library (shared, static, or default) to build") +-SET_PROPERTY(CACHE QNNPACK_LIBRARY_TYPE PROPERTY STRINGS default static shared) + OPTION(QNNPACK_BUILD_TESTS "Build QNNPACK unit tests" ON) + OPTION(QNNPACK_BUILD_BENCHMARKS "Build QNNPACK benchmarks" ON) + +@@ -53,11 +51,11 @@ SET(CONFU_DEPENDENCIES_SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps" + SET(CONFU_DEPENDENCIES_BINARY_DIR "${CMAKE_BINARY_DIR}/deps" + CACHE PATH "Confu-style dependencies binary directory") + +-IF(NOT DEFINED CLOG_SOURCE_DIR) ++IF(FALSE) + SET(CLOG_SOURCE_DIR "${PROJECT_SOURCE_DIR}/deps/clog") + ENDIF() + +-IF(NOT DEFINED CPUINFO_SOURCE_DIR) ++IF(FALSE) + MESSAGE(STATUS "Downloading cpuinfo to ${CONFU_DEPENDENCIES_SOURCE_DIR}/cpuinfo (define CPUINFO_SOURCE_DIR to avoid it)") + CONFIGURE_FILE(cmake/DownloadCpuinfo.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/cpuinfo-download/CMakeLists.txt") + EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . +@@ -67,7 +65,7 @@ IF(NOT DEFINED CPUINFO_SOURCE_DIR) + SET(CPUINFO_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/cpuinfo" CACHE STRING "cpuinfo source directory") + ENDIF() + +-IF(NOT DEFINED FP16_SOURCE_DIR) ++IF(FALSE) + MESSAGE(STATUS "Downloading FP16 to ${CONFU_DEPENDENCIES_SOURCE_DIR}/fp16 (define FP16_SOURCE_DIR to avoid it)") + CONFIGURE_FILE(cmake/DownloadFP16.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/fp16-download/CMakeLists.txt") + EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . +@@ -77,7 +75,7 @@ IF(NOT DEFINED FP16_SOURCE_DIR) + SET(FP16_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/fp16" CACHE STRING "FP16 source directory") + ENDIF() + +-IF(NOT DEFINED FXDIV_SOURCE_DIR) ++IF(FALSE) + MESSAGE(STATUS "Downloading FXdiv to ${CONFU_DEPENDENCIES_SOURCE_DIR}/fxdiv (define FXDIV_SOURCE_DIR to avoid it)") + CONFIGURE_FILE(cmake/DownloadFXdiv.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/fxdiv-download/CMakeLists.txt") + EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . +@@ -87,7 +85,7 @@ IF(NOT DEFINED FXDIV_SOURCE_DIR) + SET(FXDIV_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/fxdiv" CACHE STRING "FXdiv source directory") + ENDIF() + +-IF(NOT DEFINED PSIMD_SOURCE_DIR) ++IF(FALSE) + MESSAGE(STATUS "Downloading PSimd to ${CONFU_DEPENDENCIES_SOURCE_DIR}/psimd (define PSIMD_SOURCE_DIR to avoid it)") + CONFIGURE_FILE(cmake/DownloadPSimd.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/psimd-download/CMakeLists.txt") + EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . +@@ -97,7 +95,7 @@ IF(NOT DEFINED PSIMD_SOURCE_DIR) + SET(PSIMD_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/psimd" CACHE STRING "PSimd source directory") + ENDIF() + +-IF(NOT DEFINED PTHREADPOOL_SOURCE_DIR) ++IF(FALSE) + MESSAGE(STATUS "Downloading pthreadpool to ${CONFU_DEPENDENCIES_SOURCE_DIR}/pthreadpool (define PTHREADPOOL_SOURCE_DIR to avoid it)") + CONFIGURE_FILE(cmake/DownloadPThreadPool.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/pthreadpool-download/CMakeLists.txt") + EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . +@@ -107,7 +105,7 @@ IF(NOT DEFINED PTHREADPOOL_SOURCE_DIR) + SET(PTHREADPOOL_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/pthreadpool" CACHE STRING "pthreadpool source directory") + ENDIF() + +-IF(QNNPACK_BUILD_TESTS AND NOT DEFINED GOOGLETEST_SOURCE_DIR) ++IF(FALSE) + MESSAGE(STATUS "Downloading Google Test to ${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest (define GOOGLETEST_SOURCE_DIR to avoid it)") + CONFIGURE_FILE(cmake/DownloadGoogleTest.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download/CMakeLists.txt") + EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . +@@ -117,7 +115,7 @@ IF(QNNPACK_BUILD_TESTS AND NOT DEFINED GOOGLETEST_SOURCE_DIR) + SET(GOOGLETEST_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest" CACHE STRING "Google Test source directory") + ENDIF() + +-IF(QNNPACK_BUILD_BENCHMARKS AND NOT DEFINED GOOGLEBENCHMARK_SOURCE_DIR) ++IF(FALSE) + MESSAGE(STATUS "Downloading Google Benchmark to ${CONFU_DEPENDENCIES_SOURCE_DIR}/googlebenchmark (define GOOGLEBENCHMARK_SOURCE_DIR to avoid it)") + CONFIGURE_FILE(cmake/DownloadGoogleBenchmark.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/googlebenchmark-download/CMakeLists.txt") + EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . +@@ -229,15 +227,7 @@ IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i[3-6]86|x86_64)$" OR IOS_ARCH MATCHES "^(i + LIST(APPEND QNNPACK_UKERNELS ${QNNPACK_X86_SSE2_UKERNELS}) + ENDIF() + +-IF(QNNPACK_LIBRARY_TYPE STREQUAL "default") +- ADD_LIBRARY(qnnpack ${QNNPACK_INIT_SRCS} ${QNNPACK_EXEC_SRCS} ${QNNPACK_UKERNELS}) +-ELSEIF(QNNPACK_LIBRARY_TYPE STREQUAL "shared") +- ADD_LIBRARY(qnnpack SHARED ${QNNPACK_INIT_SRCS} ${QNNPACK_EXEC_SRCS} ${QNNPACK_UKERNELS}) +-ELSEIF(QNNPACK_LIBRARY_TYPE STREQUAL "static") +- ADD_LIBRARY(qnnpack STATIC ${QNNPACK_INIT_SRCS} ${QNNPACK_EXEC_SRCS} ${QNNPACK_UKERNELS}) +-ELSE() +- MESSAGE(FATAL_ERROR "Unsupported QNNPACK library type \"${QNNPACK_LIBRARY_TYPE}\". Must be \"static\", \"shared\", or \"default\"") +-ENDIF() ++ADD_LIBRARY(qnnpack ${QNNPACK_INIT_SRCS} ${QNNPACK_EXEC_SRCS} ${QNNPACK_UKERNELS}) + SET_TARGET_PROPERTIES(qnnpack PROPERTIES + C_STANDARD 99 + C_EXTENSIONS YES) +@@ -272,7 +262,7 @@ TARGET_INCLUDE_DIRECTORIES(qnnpack PRIVATE src) + SET_TARGET_PROPERTIES(qnnpack PROPERTIES PUBLIC_HEADER include/qnnpack.h) + + # ---[ Configure clog +-IF(NOT TARGET clog) ++IF(FALSE) + SET(CLOG_BUILD_TESTS OFF CACHE BOOL "") + SET(CLOG_RUNTIME_TYPE "${CPUINFO_RUNTIME_TYPE}" CACHE STRING "") + ADD_SUBDIRECTORY( +@@ -281,10 +271,9 @@ IF(NOT TARGET clog) + # We build static version of clog but a dynamic library may indirectly depend on it + SET_PROPERTY(TARGET clog PROPERTY POSITION_INDEPENDENT_CODE ON) + ENDIF() +-TARGET_LINK_LIBRARIES(qnnpack PRIVATE clog) + + # ---[ Configure cpuinfo +-IF(NOT TARGET cpuinfo) ++IF(FALSE) + SET(CPUINFO_BUILD_TOOLS OFF CACHE BOOL "") + SET(CPUINFO_BUILD_UNIT_TESTS OFF CACHE BOOL "") + SET(CPUINFO_BUILD_MOCK_TESTS OFF CACHE BOOL "") +@@ -293,17 +282,19 @@ IF(NOT TARGET cpuinfo) + "${CPUINFO_SOURCE_DIR}" + "${CONFU_DEPENDENCIES_BINARY_DIR}/cpuinfo") + ENDIF() +-TARGET_LINK_LIBRARIES(qnnpack PRIVATE cpuinfo) ++ ++find_package(cpuinfo CONFIG REQUIRED) ++target_link_libraries(qnnpack PUBLIC cpuinfo::clog cpuinfo::cpuinfo) + + # ---[ Configure pthreadpool +-IF(NOT TARGET pthreadpool) ++IF(FALSE) + SET(PTHREADPOOL_BUILD_TESTS OFF CACHE BOOL "") + SET(PTHREADPOOL_BUILD_BENCHMARKS OFF CACHE BOOL "") + ADD_SUBDIRECTORY( + "${PTHREADPOOL_SOURCE_DIR}" + "${CONFU_DEPENDENCIES_BINARY_DIR}/pthreadpool") + ENDIF() +-IF(QNNPACK_CUSTOM_THREADPOOL) ++IF(FALSE) + # Depend on pthreadpool interface, but not on implementation. + # This is used when QNNPACK user (e.g. Caffe2) provides its own threadpool implementation. + TARGET_LINK_LIBRARIES(qnnpack PUBLIC pthreadpool_interface) +@@ -312,34 +303,38 @@ ELSE() + ENDIF() + + # ---[ Configure FXdiv +-IF(NOT TARGET fxdiv) ++IF(FALSE) + SET(FXDIV_BUILD_TESTS OFF CACHE BOOL "") + SET(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "") + ADD_SUBDIRECTORY( + "${FXDIV_SOURCE_DIR}" + "${CONFU_DEPENDENCIES_BINARY_DIR}/fxdiv") + ENDIF() +-TARGET_LINK_LIBRARIES(qnnpack PRIVATE fxdiv) ++find_path(FXDIV_INCLUDE_DIRS "fxdiv.h") ++target_include_directories(qnnpack PRIVATE ${FXDIV_INCLUDE_DIRS}) + + # ---[ Configure psimd +-IF(NOT TARGET psimd) ++IF(FALSE) + ADD_SUBDIRECTORY( + "${PSIMD_SOURCE_DIR}" + "${CONFU_DEPENDENCIES_BINARY_DIR}/psimd") + ENDIF() +-TARGET_LINK_LIBRARIES(qnnpack PRIVATE psimd) ++find_path(PSIMD_INCLUDE_DIRS "psimd.h") ++target_include_directories(qnnpack PRIVATE ${PSIMD_INCLUDE_DIRS}) + + # ---[ Configure FP16 +-IF(NOT TARGET fp16) ++IF(FALSE) + SET(FP16_BUILD_TESTS OFF CACHE BOOL "") + SET(FP16_BUILD_BENCHMARKS OFF CACHE BOOL "") + ADD_SUBDIRECTORY( + "${FP16_SOURCE_DIR}" + "${CONFU_DEPENDENCIES_BINARY_DIR}/fp16") + ENDIF() +-TARGET_LINK_LIBRARIES(qnnpack PRIVATE fp16) ++find_path(FP16_INCLUDE_DIRS "fp16.h") ++target_include_directories(qnnpack PRIVATE ${FP16_INCLUDE_DIRS}) + + INSTALL(TARGETS qnnpack ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/externals/vcpkg/ports/qnnpack/vcpkg.json b/externals/vcpkg/ports/qnnpack/vcpkg.json new file mode 100755 index 000000000..a22b2306e --- /dev/null +++ b/externals/vcpkg/ports/qnnpack/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "qnnpack", + "version-date": "2021-02-26", + "port-version": 3, + "description": "Quantized Neural Network PACKage - mobile-optimized implementation of quantized neural network operators", + "homepage": "https://github.com/pytorch/QNNPACK", + "license": "BSD-3-Clause", + "supports": "!windows", + "dependencies": [ + "cpuinfo", + "fp16", + "fxdiv", + "psimd", + "pthreadpool", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/qpid-proton/fix-dependencies.patch b/externals/vcpkg/ports/qpid-proton/fix-dependencies.patch new file mode 100755 index 000000000..3c679af0b --- /dev/null +++ b/externals/vcpkg/ports/qpid-proton/fix-dependencies.patch @@ -0,0 +1,117 @@ +diff --git a/c/CMakeLists.txt b/c/CMakeLists.txt +index 27b40e7..1931b65 100644 +--- a/c/CMakeLists.txt ++++ b/c/CMakeLists.txt +@@ -727,11 +727,6 @@ install (FILES + ${CMAKE_CURRENT_BINARY_DIR}/ProtonConfig.cmake + ${CMAKE_CURRENT_BINARY_DIR}/ProtonConfigVersion.cmake + DESTINATION ${LIB_INSTALL_DIR}/cmake/Proton) +-install (FILES +- ../tools/cmake/Modules/FindCyrusSASL.cmake +- ../tools/cmake/Modules/FindOpenSSL.cmake +- ../tools/cmake/Modules/FindThreads.cmake +- DESTINATION ${LIB_INSTALL_DIR}/cmake/Proton) + + if (ENABLE_BENCHMARKS) + add_subdirectory(benchmarks) +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index 03fe80a..fd6a31d 100644 +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -26,12 +26,15 @@ find_package(Threads) + include(versions.cmake) + + # Check for JSON-CPP support for connection configuration +-find_package(JsonCpp) +-option(ENABLE_JSONCPP "Use jsoncpp parser for connection configuration" ${JsonCpp_FOUND}) ++option(ENABLE_JSONCPP "Use jsoncpp parser for connection configuration" OFF) + if (ENABLE_JSONCPP) +- include_directories(${JsonCpp_INCLUDE_DIRS}) ++ find_package(jsoncpp CONFIG REQUIRED) + set(CONNECT_CONFIG_SRC src/connect_config.cpp) +- set(CONNECT_CONFIG_LIBS ${JsonCpp_LIBRARY}) ++ if (TARGET jsoncpp_lib) ++ set(CONNECT_CONFIG_LIBS jsoncpp_lib) ++ elseif (TARGET jsoncpp_static) ++ set(CONNECT_CONFIG_LIBS jsoncpp_static) ++ endif() + else() + set(CONNECT_CONFIG_SRC src/connect_config_dummy.cpp) + endif() + +--- a/c/src/ProtonConfig.cmake.in ++++ b/c/src/ProtonConfig.cmake.in +@@ -20,39 +20,40 @@ + # Name: Proton + # Description: Qpid Proton C library + # Version: @PN_VERSION@ + # URL: http://qpid.apache.org/proton/ + + @PACKAGE_INIT@ +-if (NOT Proton_USE_STATIC_LIBS) ++include(CMakeFindDependencyMacro) ++if (1) + include("${CMAKE_CURRENT_LIST_DIR}/ProtonTargets.cmake") + else() + include("${CMAKE_CURRENT_LIST_DIR}/ProtonTargetsStatic.cmake") + endif() + + set(Proton_VERSION @PN_VERSION@) + + # find dependencies, because static libs don't transitively pull them +-if (Proton_USE_STATIC_LIBS) +- set(CMAKE_MODULE_PATH_OLD ${CMAKE_MODULE_PATH}) +- set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") ++if (1) ++ #set(CMAKE_MODULE_PATH_OLD ${CMAKE_MODULE_PATH}) ++ #set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") + + set(CyrusSASL_FOUND @CyrusSASL_FOUND@) + if (CyrusSASL_FOUND) +- find_package (CyrusSASL REQUIRED) ++ find_dependency (CyrusSASL) + endif() + + set(OPENSSL_FOUND @OPENSSL_FOUND@) + set(OpenSSL_FOUND @OpenSSL_FOUND@) + if (OPENSSL_FOUND OR OpenSSL_FOUND) +- find_package (OpenSSL REQUIRED) ++ find_dependency (OpenSSL) + endif() + +- find_package (Threads REQUIRED) ++ find_dependency (Threads) + +- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH_OLD}) ++ #set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH_OLD}) + endif() + + set (Proton_INCLUDE_DIRS @PACKAGE_INCLUDE_INSTALL_DIR@) + set (Proton_LIBRARIES Proton::qpid-proton) + set (Proton_FOUND True) + +--- a/cpp/ProtonCppConfig.cmake.in ++++ b/cpp/ProtonCppConfig.cmake.in +@@ -20,19 +20,21 @@ + # Name: Proton + # Description: Qpid Proton C library + # Version: @PN_VERSION@ + # URL: http://qpid.apache.org/proton/ + + @PACKAGE_INIT@ +-if (NOT ProtonCpp_USE_STATIC_LIBS) ++include(CMakeFindDependencyMacro) ++find_dependency(Proton CONFIG) ++if (1) + include("${CMAKE_CURRENT_LIST_DIR}/ProtonCppTargets.cmake") + else() + include("${CMAKE_CURRENT_LIST_DIR}/ProtonCppTargetsStatic.cmake") + endif() + + set (ProtonCpp_VERSION @PN_VERSION@) + + set (ProtonCpp_INCLUDE_DIRS @PACKAGE_INCLUDE_INSTALL_DIR@) + set (ProtonCpp_LIBRARIES Proton::cpp) + set (ProtonCpp_FOUND True) + + check_required_components(ProtonCpp) diff --git a/externals/vcpkg/ports/qpid-proton/portfile.cmake b/externals/vcpkg/ports/qpid-proton/portfile.cmake new file mode 100755 index 000000000..3e29c19ee --- /dev/null +++ b/externals/vcpkg/ports/qpid-proton/portfile.cmake @@ -0,0 +1,65 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO apache/qpid-proton + REF fee5e94afb83b92ffa60a6f815d5102a67915166 # 0.37.0 + SHA512 e9fbd02444dd073908186e6873b4e230e0a5971929e9b1a49758240d166f6da4e6c88d701c66d5e5539bea0beca380c763bffcef5b0e1ed5f9fc2691f5f86559 + HEAD_REF next + PATCHES fix-dependencies.patch +) + +file(REMOVE "${SOURCE_PATH}/tools/cmake/Modules/FindPython.cmake") +file(REMOVE "${SOURCE_PATH}/tools/cmake/Modules/FindOpenSSL.cmake") +file(REMOVE "${SOURCE_PATH}/tools/cmake/Modules/FindJsonCpp.cmake") + +vcpkg_find_acquire_program(PYTHON3) + +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) + set(rpath "@loader_path") +else() + set(rpath "\$ORIGIN") +endif() +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE # It may cause call CHECK_LIBRARY_EXISTS before call project to set the language + OPTIONS + -DBUILD_GO=no + -DCMAKE_DISABLE_FIND_PACKAGE_CyrusSASL=ON + -DENABLE_JSONCPP=ON + -DENABLE_LINKTIME_OPTIMIZATION=OFF + -DLIB_SUFFIX= + -DENABLE_WARNING_ERROR=OFF + -DENABLE_BENCHMARKS=OFF + -DENABLE_FUZZ_TESTING=OFF + -DBUILD_TESTING=OFF + -DCMAKE_INSTALL_RPATH=${rpath} + -DPython_EXECUTABLE=${PYTHON3} +) + +vcpkg_cmake_install() + +# qpid-proton installs tests into share/proton; this is not desireable +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/proton") + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup( + PACKAGE_NAME Proton + CONFIG_PATH lib/cmake/Proton + DO_NOT_DELETE_PARENT_CONFIG_PATH +) +vcpkg_cmake_config_fixup( + PACKAGE_NAME ProtonCpp + CONFIG_PATH lib/cmake/ProtonCpp +) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/proton/version.h" "#define PN_INSTALL_PREFIX \"${CURRENT_PACKAGES_DIR}\"" "") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/externals/vcpkg/ports/qpid-proton/vcpkg.json b/externals/vcpkg/ports/qpid-proton/vcpkg.json new file mode 100755 index 000000000..c57969ea3 --- /dev/null +++ b/externals/vcpkg/ports/qpid-proton/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "qpid-proton", + "version": "0.37.0", + "port-version": 2, + "description": "Qpid Proton is a high-performance, lightweight messaging library.", + "homepage": "https://github.com/apache/qpid-proton", + "license": "Apache-2.0", + "dependencies": [ + "jsoncpp", + { + "name": "libuv", + "platform": "osx" + }, + { + "name": "openssl", + "platform": "!windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/qscintilla/fix-static.patch b/externals/vcpkg/ports/qscintilla/fix-static.patch new file mode 100755 index 000000000..1c0569d47 --- /dev/null +++ b/externals/vcpkg/ports/qscintilla/fix-static.patch @@ -0,0 +1,29 @@ +diff --git a/src/qscintilla.pro b/src/qscintilla.pro +index 8d0acd2..2246442 100644 +--- a/src/qscintilla.pro ++++ b/src/qscintilla.pro +@@ -37,13 +37,13 @@ CONFIG(debug, debug|release) { + TARGET = qscintilla2_qt$${QT_MAJOR_VERSION} + } + +-macx:!CONFIG(staticlib) { ++macx:!CONFIG(static) { + QMAKE_POST_LINK += install_name_tool -id @rpath/$(TARGET1) $(TARGET) + } + + INCLUDEPATH += . ../scintilla/include ../scintilla/lexlib ../scintilla/src + +-!CONFIG(staticlib) { ++!CONFIG(static) { + DEFINES += QSCINTILLA_MAKE_DLL + } + DEFINES += SCINTILLA_QT SCI_LEXER INCLUDE_DEPRECATED_FEATURES +@@ -82,7 +82,7 @@ qsci.files = ../qsci + INSTALLS += qsci + + features.path = $$[QT_HOST_DATA]/mkspecs/features +-CONFIG(staticlib) { ++CONFIG(static) { + features.files = $$PWD/features_staticlib/qscintilla2.prf + } else { + features.files = $$PWD/features/qscintilla2.prf diff --git a/externals/vcpkg/ports/qscintilla/portfile.cmake b/externals/vcpkg/ports/qscintilla/portfile.cmake new file mode 100755 index 000000000..e239dcc37 --- /dev/null +++ b/externals/vcpkg/ports/qscintilla/portfile.cmake @@ -0,0 +1,50 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.12.0/QScintilla_src-2.12.0.tar.gz" + FILENAME "QScintilla-2.12.0.tar.gz" + SHA512 9bdaba5c33c1b11ccad83eb1fda72142758afc50c955a62d5a8ff102b41d4b67d897bf96ce0540e16bc5a7fae2ce1acbf06931d5f0ae6768759c9ff072c03daa +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + fix-static.patch +) + +vcpkg_find_acquire_program(PYTHON3) + +# Add python3 to path +get_filename_component(PYTHON3_PATH ${PYTHON3} DIRECTORY) +vcpkg_add_to_path(${PYTHON3_PATH}) + +vcpkg_configure_qmake( + SOURCE_PATH ${SOURCE_PATH}/src + OPTIONS + CONFIG+=build_all + CONFIG-=hide_symbols + DEFINES+=SCI_NAMESPACE +) + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_install_qmake( + RELEASE_TARGETS release + DEBUG_TARGETS debug + ) +else() + vcpkg_install_qmake() +endif() + +file(GLOB HEADER_FILES ${SOURCE_PATH}/src/Qsci/*) +file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/Qsci) + +if (VCPKG_TARGET_IS_WINDOWS AND (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/Qsci/qsciglobal.h + "#if defined(QSCINTILLA_DLL)" + "#if 1" + ) +endif() + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/qscintilla/vcpkg.json b/externals/vcpkg/ports/qscintilla/vcpkg.json new file mode 100755 index 000000000..8e822764c --- /dev/null +++ b/externals/vcpkg/ports/qscintilla/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "qscintilla", + "version": "2.12.0", + "port-version": 1, + "description": "QScintilla is a port to Qt of the Scintilla editing component. Features syntax highlighting, code-completion and much more (Barebone build without python bindings (missing dependeny PyQt) and without QtDesigner plugin)", + "homepage": "https://www.riverbankcomputing.com/software/qscintilla", + "supports": "!(windows & (arm | arm64))", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + { + "name": "qt5-macextras", + "platform": "osx" + }, + { + "name": "qt5-winextras", + "platform": "windows" + } + ] +} diff --git a/externals/vcpkg/ports/qt-advanced-docking-system/config_changes.patch b/externals/vcpkg/ports/qt-advanced-docking-system/config_changes.patch new file mode 100755 index 000000000..106ba1c8e --- /dev/null +++ b/externals/vcpkg/ports/qt-advanced-docking-system/config_changes.patch @@ -0,0 +1,13 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 49cd799..6535465 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -54,7 +54,7 @@ if (UNIX AND NOT APPLE) + set(ads_SRCS linux/FloatingWidgetTitleBar.cpp ${ads_SRCS}) + set(ads_HEADERS linux/FloatingWidgetTitleBar.h ${ads_HEADERS}) + endif() +-if(BUILD_STATIC) ++if(NOT BUILD_SHARED_LIBS) + add_library(qtadvanceddocking STATIC ${ads_SRCS} ${ads_HEADERS}) + target_compile_definitions(qtadvanceddocking PUBLIC ADS_STATIC) + else() diff --git a/externals/vcpkg/ports/qt-advanced-docking-system/portfile.cmake b/externals/vcpkg/ports/qt-advanced-docking-system/portfile.cmake new file mode 100755 index 000000000..a369b9a80 --- /dev/null +++ b/externals/vcpkg/ports/qt-advanced-docking-system/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO githubuser0xFFFF/Qt-Advanced-Docking-System + REF d5fefaa35fb53e299b7f39b0d8f541954c710d94 #v3.8.2 + SHA512 fcafee34d4d5365b3677c648e0d9a1ea8afd5463ca682ae19b10661490aca44d4f010ba768ed9c639b8ada10106be7aff336c2b7b42f10dc12db6b51988b4e22 + HEAD_REF master + PATCHES + config_changes.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF + -DADS_VERSION=3.8.2 +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME qtadvanceddocking CONFIG_PATH lib/cmake/qtadvanceddocking) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/license") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/license") + +file(INSTALL "${SOURCE_PATH}/gnu-lgpl-v2.1.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/qt-advanced-docking-system/vcpkg.json b/externals/vcpkg/ports/qt-advanced-docking-system/vcpkg.json new file mode 100755 index 000000000..f81487809 --- /dev/null +++ b/externals/vcpkg/ports/qt-advanced-docking-system/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "qt-advanced-docking-system", + "version": "3.8.2", + "description": "Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio", + "homepage": "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System", + "license": "LGPL-2.1-only", + "dependencies": [ + "bzip2", + { + "name": "qt5-base", + "default-features": false + }, + { + "name": "qt5-x11extras", + "platform": "!windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/qt/portfile.cmake b/externals/vcpkg/ports/qt/portfile.cmake new file mode 100755 index 000000000..9aefc8241 --- /dev/null +++ b/externals/vcpkg/ports/qt/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/qt/vcpkg.json b/externals/vcpkg/ports/qt/vcpkg.json new file mode 100755 index 000000000..392aa1a9f --- /dev/null +++ b/externals/vcpkg/ports/qt/vcpkg.json @@ -0,0 +1,194 @@ +{ + "name": "qt", + "version": "6.3.0", + "description": "Qt", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qt5compat", + "default-features": false, + "features": [ + "big-codecs", + "codecs", + "qml", + "textcodec" + ] + }, + "qtapplicationmanager", + { + "name": "qtbase", + "default-features": false + }, + { + "name": "qtcharts", + "default-features": false, + "features": [ + "designer", + "qml" + ] + }, + "qtcoap", + "qtconnectivity", + "qtdatavis3d", + "qtdeclarative", + { + "name": "qtdeviceutilities", + "default-features": false, + "platform": "linux" + }, + "qtdoc", + { + "name": "qtimageformats", + "default-features": false, + "features": [ + "jasper", + "tiff", + "webp" + ] + }, + "qtinterfaceframework", + { + "name": "qtlottie", + "default-features": false, + "features": [ + "qml" + ] + }, + "qtmqtt", + { + "name": "qtmultimedia", + "default-features": false, + "features": [ + "qml", + "widgets" + ] + }, + { + "name": "qtmultimedia", + "default-features": false, + "features": [ + "gstreamer" + ], + "platform": "!(static & windows)" + }, + "qtnetworkauth", + { + "name": "qtopcua", + "features": [ + "qml" + ] + }, + { + "name": "qtpositioning", + "default-features": false, + "features": [ + "qml" + ] + }, + { + "name": "qtquick3d", + "default-features": false + }, + "qtquicktimeline", + { + "name": "qtremoteobjects", + "default-features": false, + "features": [ + "qml" + ] + }, + { + "name": "qtscxml", + "default-features": false, + "features": [ + "qml" + ] + }, + { + "name": "qtsensors", + "default-features": false, + "features": [ + "qml" + ] + }, + "qtserialbus", + "qtserialport", + "qtshadertools", + "qtsvg", + { + "name": "qttools", + "default-features": false, + "features": [ + "assistant", + "designer", + "qml" + ] + }, + "qttranslations", + "qtvirtualkeyboard", + { + "name": "qtwebchannel", + "default-features": false, + "features": [ + "qml" + ] + }, + { + "name": "qtwebengine", + "default-features": false, + "features": [ + "geolocation", + "spellchecker", + "webchannel" + ], + "platform": "!static" + }, + { + "name": "qtwebsockets", + "default-features": false, + "features": [ + "qml" + ] + }, + { + "name": "qtwebview", + "default-features": false, + "features": [ + "qml" + ] + }, + { + "name": "qtwebview", + "default-features": false, + "features": [ + "webengine" + ], + "platform": "!static" + } + ], + "default-features": [ + "default-features" + ], + "features": { + "default-features": { + "description": "Platform-dependent default features", + "dependencies": [ + { + "name": "qtactiveqt", + "features": [ + "qml" + ], + "platform": "windows" + }, + { + "name": "qtwayland", + "features": [ + "qml" + ], + "platform": "linux" + } + ] + } + } +} diff --git a/externals/vcpkg/ports/qt5-3d/portfile.cmake b/externals/vcpkg/ports/qt5-3d/portfile.cmake new file mode 100755 index 000000000..5e37676c5 --- /dev/null +++ b/externals/vcpkg/ports/qt5-3d/portfile.cmake @@ -0,0 +1,56 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) + +set(OPTIONS -system-assimp) + +if(VCPKG_TARGET_IS_WINDOWS) + set(VCVER vc140 vc141 vc142 vc143 ) + set(CRT mt md) + set(DBG_NAMES) + set(REL_NAMES) + foreach(_ver IN LISTS VCVER) + foreach(_crt IN LISTS CRT) + list(APPEND DBG_NAMES assimp-${_ver}-${_crt}d) + list(APPEND REL_NAMES assimp-${_ver}-${_crt}) + endforeach() + endforeach() +endif() + +find_library(ASSIMP_REL NAMES assimp ${REL_NAMES} PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ASSIMP_DBG NAMES assimp assimpd ${DBG_NAMES} PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + +find_library(MINIZIP_REL NAMES minizip PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(MINIZIP_DBG NAMES minizip minizipd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(KUBAZIP_REL NAMES kubazip PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(KUBAZIP_DBG NAMES kubazip kubazipd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(JPEG_REL NAMES jpeg jpeg-static PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(JPEG_DBG NAMES jpeg jpeg-static jpegd jpeg-staticd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(LIBPNG_REL NAMES png16 libpng16 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) #Depends on zlib +find_library(LIBPNG_DBG NAMES png16 png16d libpng16 libpng16d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(ZLIB_REL NAMES z zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ZLIB_DBG NAMES z zlib zd zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(IRRLICHT_REL NAMES Irrlicht PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(IRRLICHT_DBG NAMES Irrlicht PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(POLYCLIPPING_REL NAMES polyclipping PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(POLYCLIPPING_DBG NAMES polyclipping polyclippingd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(POLY2TRI_REL NAMES poly2tri PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(POLY2TRI_DBG NAMES poly2tri poly2trid PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +# poly2tri +find_library(BZ2_REL bz2 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(BZ2_DBG bz2 bz2d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +if(BZ2_REL) + string(APPEND MINIZIP_REL " ${BZ2_REL}") +endif() +if(BZ2_DBG) + string(APPEND MINIZIP_DBG " ${BZ2_DBG}") +endif() +if(VCPKG_TARGET_IS_WINDOWS) + set(SYSTEM_LIBS "Advapi32.lib user32.lib gdi32.lib") +elseif(VCPKG_TARGET_IS_OSX) + set(SYSTEM_LIBS "-framework OpenGL -framework Cocoa -framework Carbon -framework IOKit -framework AppKit") +else() + set(SYSTEM_LIBS "-lGL -lXxf86vm -lX11") +endif() +set(OPT_REL "ASSIMP_LIBS=${ASSIMP_REL} ${POLYCLIPPING_REL} ${POLY2TRI_REL} ${IRRLICHT_REL} ${JPEG_REL} ${LIBPNG_REL} ${KUBAZIP_REL} ${MINIZIP_REL} ${ZLIB_REL} ${SYSTEM_LIBS}") +set(OPT_DBG "ASSIMP_LIBS=${ASSIMP_DBG} ${POLYCLIPPING_DBG} ${POLY2TRI_DBG} ${IRRLICHT_DBG} ${JPEG_DBG} ${LIBPNG_DBG} ${KUBAZIP_DBG} ${MINIZIP_DBG} ${ZLIB_DBG} ${SYSTEM_LIBS}") + +qt_submodule_installation(BUILD_OPTIONS ${OPTIONS} BUILD_OPTIONS_RELEASE ${OPT_REL} BUILD_OPTIONS_DEBUG ${OPT_DBG}) diff --git a/externals/vcpkg/ports/qt5-3d/vcpkg.json b/externals/vcpkg/ports/qt5-3d/vcpkg.json new file mode 100755 index 000000000..3d57f3ad8 --- /dev/null +++ b/externals/vcpkg/ports/qt5-3d/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "qt5-3d", + "version": "5.15.4", + "description": "Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering", + "license": null, + "dependencies": [ + "assimp", + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative", + "qt5-gamepad", + "qt5-imageformats" + ] +} diff --git a/externals/vcpkg/ports/qt5-activeqt/portfile.cmake b/externals/vcpkg/ports/qt5-activeqt/portfile.cmake new file mode 100755 index 000000000..a73a60551 --- /dev/null +++ b/externals/vcpkg/ports/qt5-activeqt/portfile.cmake @@ -0,0 +1,6 @@ +if (NOT VCPKG_TARGET_IS_WINDOWS) + message(FATAL_ERROR "qt5-activeqt only support Windows.") +endif() + +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-activeqt/vcpkg.json b/externals/vcpkg/ports/qt5-activeqt/vcpkg.json new file mode 100755 index 000000000..9e1d2627d --- /dev/null +++ b/externals/vcpkg/ports/qt5-activeqt/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "qt5-activeqt", + "version": "5.15.4", + "description": "Qt5 ActiveQt Module - ActiveX components", + "license": null, + "supports": "windows", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/externals/vcpkg/ports/qt5-androidextras/portfile.cmake b/externals/vcpkg/ports/qt5-androidextras/portfile.cmake new file mode 100755 index 000000000..214726759 --- /dev/null +++ b/externals/vcpkg/ports/qt5-androidextras/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-androidextras/vcpkg.json b/externals/vcpkg/ports/qt5-androidextras/vcpkg.json new file mode 100755 index 000000000..66e4cc46b --- /dev/null +++ b/externals/vcpkg/ports/qt5-androidextras/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-androidextras", + "version": "5.15.4", + "description": "Qt5 androidextras Module;", + "license": null, + "supports": "android", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/externals/vcpkg/ports/qt5-base/cmake/configure_qt.cmake b/externals/vcpkg/ports/qt5-base/cmake/configure_qt.cmake new file mode 100755 index 000000000..ff2c8bc32 --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/cmake/configure_qt.cmake @@ -0,0 +1,151 @@ +function(configure_qt) + cmake_parse_arguments(_csc "" "SOURCE_PATH;TARGET_PLATFORM;HOST_PLATFORM;HOST_TOOLS_ROOT" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE" ${ARGN}) + + if(NOT _csc_TARGET_PLATFORM) + message(FATAL_ERROR "configure_qt requires a TARGET_PLATFORM argument.") + endif() + + if(DEFINED _csc_HOST_PLATFORM) + list(APPEND _csc_OPTIONS -platform ${_csc_HOST_PLATFORM}) + endif() + + if(DEFINED _csc_HOST_TOOLS_ROOT) + ## vcpkg internal file struture assumed here! + message(STATUS "Building Qt with prepared host tools from ${_csc_HOST_TOOLS_ROOT}!") + vcpkg_add_to_path("${_csc_HOST_TOOLS_ROOT}/bin") + vcpkg_add_to_path("${_csc_HOST_TOOLS_ROOT}") + set(EXT_BIN_DIR -external-hostbindir ${_csc_HOST_TOOLS_ROOT}/bin) # we only use release binaries for building + find_program(QMAKE_COMMAND NAMES qmake PATHS ${_csc_HOST_TOOLS_ROOT}/bin NO_DEFAULT_PATH) + set(INVOKE "${QMAKE_COMMAND}" ) + else() + if(CMAKE_HOST_WIN32) + set(CONFIGURE_BAT "configure.bat") + else() + set(CONFIGURE_BAT "configure") + endif() + set(INVOKE "${_csc_SOURCE_PATH}/${CONFIGURE_BAT}") + endif() + + #Cleanup previous build folders + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + + #Find and ad Perl to PATH + vcpkg_find_acquire_program(PERL) + get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) + vcpkg_add_to_path("${PERL_EXE_PATH}") + + if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + list(APPEND _csc_OPTIONS -static) + else() + #list(APPEND _csc_OPTIONS_DEBUG -separate-debug-info) + endif() + + if(VCPKG_TARGET_IS_WINDOWS AND "${VCPKG_CRT_LINKAGE}" STREQUAL "static") + list(APPEND _csc_OPTIONS -static-runtime) + endif() + + list(APPEND _csc_OPTIONS_RELEASE -release) + list(APPEND _csc_OPTIONS_DEBUG -debug) + + #Replace with VCPKG variables if PR #7733 is merged + unset(BUILDTYPES) + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "debug") + set(_buildname "DEBUG") + list(APPEND BUILDTYPES ${_buildname}) + set(_short_name_${_buildname} "dbg") + set(_path_suffix_${_buildname} "/debug") + set(_build_type_${_buildname} "debug") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "release") + set(_buildname "RELEASE") + list(APPEND BUILDTYPES ${_buildname}) + set(_short_name_${_buildname} "rel") + set(_path_suffix_${_buildname} "") + set(_build_type_${_buildname} "release") + endif() + unset(_buildname) + + vcpkg_find_acquire_program(PKGCONFIG) + set(ENV{PKG_CONFIG} "${PKGCONFIG}") + get_filename_component(PKGCONFIG_PATH "${PKGCONFIG}" DIRECTORY) + vcpkg_add_to_path("${PKGCONFIG_PATH}") + + foreach(_buildname ${BUILDTYPES}) + set(PKGCONFIG_INSTALLED_DIR "${_VCPKG_INSTALLED_PKGCONF}${_path_suffix_${_buildname}}/lib/pkgconfig") + set(PKGCONFIG_INSTALLED_SHARE_DIR "${_VCPKG_INSTALLED_PKGCONF}/share/pkgconfig") + set(PKGCONFIG_PACKAGES_DIR "${_VCPKG_PACKAGES_PKGCONF}${_path_suffix_${_buildname}}/lib/pkgconfig") + set(PKGCONFIG_PACKAGES_SHARE_DIR "${_VCPKG_PACKAGES_PKGCONF}/share/pkgconfig") + if(DEFINED ENV{PKG_CONFIG_PATH}) + set(BACKUP_ENV_PKG_CONFIG_PATH_${_config} $ENV{PKG_CONFIG_PATH}) + set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_INSTALLED_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}$ENV{PKG_CONFIG_PATH}") + else() + set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_INSTALLED_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_SHARE_DIR}") + endif() + + set(_build_triplet ${TARGET_TRIPLET}-${_short_name_${_buildname}}) + message(STATUS "Configuring ${_build_triplet}") + set(_build_dir "${CURRENT_BUILDTREES_DIR}/${_build_triplet}") + file(MAKE_DIRECTORY ${_build_dir}) + # These paths get hardcoded into qmake. So point them into the CURRENT_INSTALLED_DIR instead of CURRENT_PACKAGES_DIR + # makefiles will be fixed to install into CURRENT_PACKAGES_DIR in install_qt + set(BUILD_OPTIONS ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildname}} + -prefix ${CURRENT_INSTALLED_DIR} + #-extprefix ${CURRENT_INSTALLED_DIR} + ${EXT_BIN_DIR} + -hostprefix ${CURRENT_INSTALLED_DIR}/tools/qt5${_path_suffix_${_buildname}} + #-hostprefix ${CURRENT_INSTALLED_DIR}/tools/qt5 + -hostlibdir ${CURRENT_INSTALLED_DIR}/tools/qt5${_path_suffix_${_buildname}}/lib # could probably be move to manual-link + -hostbindir ${CURRENT_INSTALLED_DIR}/tools/qt5${_path_suffix_${_buildname}}/bin + #-hostbindir ${CURRENT_INSTALLED_DIR}/tools/qt5/bin + # Qt VS Plugin requires a /bin subfolder with the executables in the root dir. But to use the wizard a correctly setup lib folder is also required + # So with the vcpkg layout there is no way to make it work unless all dll are are copied to tools/qt5/bin and all libs to tools/qt5/lib + -archdatadir ${CURRENT_INSTALLED_DIR}/tools/qt5${_path_suffix_${_buildname}} + -datadir ${CURRENT_INSTALLED_DIR}${_path_suffix}/share/qt5${_path_suffix_${_buildname}} + -plugindir ${CURRENT_INSTALLED_DIR}${_path_suffix_${_buildname}}/plugins + -qmldir ${CURRENT_INSTALLED_DIR}${_path_suffix_${_buildname}}/qml + -headerdir ${CURRENT_INSTALLED_DIR}/include/qt5 + -libexecdir ${CURRENT_INSTALLED_DIR}/tools/qt5${_path_suffix_${_buildname}} + -bindir ${CURRENT_INSTALLED_DIR}${_path_suffix_${_buildname}}/bin + -libdir ${CURRENT_INSTALLED_DIR}${_path_suffix_${_buildname}}/lib + -I ${CURRENT_INSTALLED_DIR}/include + -I ${CURRENT_INSTALLED_DIR}/include/qt5 + -L ${CURRENT_INSTALLED_DIR}${_path_suffix_${_buildname}}/lib + -L ${CURRENT_INSTALLED_DIR}${_path_suffix_${_buildname}}/lib/manual-link + -platform ${_csc_TARGET_PLATFORM} + ) + + if(DEFINED _csc_HOST_TOOLS_ROOT) #use qmake + if(WIN32) + set(INVOKE_OPTIONS "QMAKE_CXX.QMAKE_MSC_VER=1911" "QMAKE_MSC_VER=1911") + endif() + vcpkg_execute_required_process( + COMMAND ${INVOKE} "${_csc_SOURCE_PATH}" "${INVOKE_OPTIONS}" -- ${BUILD_OPTIONS} + WORKING_DIRECTORY ${_build_dir} + LOGNAME config-${_build_triplet} + ) + else()# call configure (builds qmake for triplet and calls it like above) + vcpkg_execute_required_process( + COMMAND "${INVOKE}" ${BUILD_OPTIONS} + WORKING_DIRECTORY ${_build_dir} + LOGNAME config-${_build_triplet} + ) + endif() + + # Note archdatadir and datadir are required to be prefixed with the hostprefix? + message(STATUS "Configuring ${_build_triplet} done") + + # Copy configuration dependent qt.conf + file(TO_CMAKE_PATH "${CURRENT_PACKAGES_DIR}" CMAKE_CURRENT_PACKAGES_DIR_PATH) + file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}" CMAKE_CURRENT_INSTALLED_DIR_PATH) + file(READ "${CURRENT_BUILDTREES_DIR}/${_build_triplet}/bin/qt.conf" _contents) + string(REPLACE "${CMAKE_CURRENT_PACKAGES_DIR_PATH}" "\${CURRENT_INSTALLED_DIR}" _contents ${_contents}) + string(REPLACE "${CMAKE_CURRENT_INSTALLED_DIR_PATH}" "\${CURRENT_INSTALLED_DIR}" _contents ${_contents}) + #string(REPLACE "HostPrefix=\${CURRENT_PACKAGES_DIR}" "HostPrefix=\${CURRENT_INSTALLED_DIR}" _contents ${_contents}) + string(REPLACE "[EffectivePaths]\nPrefix=..\n" "" _contents ${_contents}) + string(REGEX REPLACE "\\[EffectiveSourcePaths\\]\r?\nPrefix=[^\r\n]+\r?\n" "" _contents ${_contents}) + string(REPLACE "Sysroot=\n" "" _contents ${_contents}) + string(REPLACE "SysrootifyPrefix=false\n" "" _contents ${_contents}) + file(WRITE "${CURRENT_PACKAGES_DIR}/tools/qt5/qt_${_build_type_${_buildname}}.conf" "${_contents}") + endforeach() + +endfunction() diff --git a/externals/vcpkg/ports/qt5-base/cmake/find_qt_mkspec.cmake b/externals/vcpkg/ports/qt5-base/cmake/find_qt_mkspec.cmake new file mode 100755 index 000000000..c9c06c8bd --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/cmake/find_qt_mkspec.cmake @@ -0,0 +1,101 @@ +function(find_qt_mkspec TARGET_PLATFORM_MKSPEC_OUT HOST_PLATFORM_MKSPEC_OUT EXT_HOST_TOOLS_OUT) + ## Figure out QTs target mkspec + if(NOT DEFINED VCPKG_QT_TARGET_MKSPEC) + message(STATUS "Figuring out qt target mkspec. Target arch ${VCPKG_TARGET_ARCHITECTURE}") + if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_IS_UWP) + if(VCPKG_PLATFORM_TOOLSET STREQUAL "v140") + set(msvc_year "2015") + elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v141") + set(msvc_year "2017") + elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v142") + set(msvc_year "2019") + else() + message(FATAL_ERROR "No target mkspec found!") + endif() + set(_tmp_targ_out "winrt-${VCPKG_TARGET_ARCHITECTURE}-msvc${msvc_year}") + else() + if("${VCPKG_TARGET_ARCHITECTURE}" MATCHES "arm64") + message(STATUS "Figuring out arm64") + set(_tmp_targ_out "win32-arm64-msvc2017") #mkspec does not have anything defined related to msvc2017 so this should work + else() + set(_tmp_targ_out "win32-msvc") + endif() + endif() + elseif(VCPKG_TARGET_IS_LINUX) + set(_tmp_targ_out "linux-g++" ) + elseif(VCPKG_TARGET_IS_OSX) + set(_tmp_targ_out "macx-clang") # switch to macx-g++ since vcpkg requires g++ to compile any way? + endif() + else() + set(_tmp_targ_out ${VCPKG_QT_TARGET_MKSPEC}) + endif() + message(STATUS "Target mkspec set to: ${_tmp_targ_out}") + set(${TARGET_PLATFORM_MKSPEC_OUT} ${_tmp_targ_out} PARENT_SCOPE) + + ## Figure out QTs host mkspec + if(NOT DEFINED VCPKG_QT_HOST_MKSPEC) + #if(WIN32) + # set(_tmp_host_out "win32-msvc") + #elseif("${CMAKE_HOST_SYSTEM}" STREQUAL "Linux") + # set(_tmp_host_out "linux-g++") + #elseif("${CMAKE_HOST_SYSTEM}" STREQUAL "Darwin") + # set(_tmp_host_out "macx-clang") + #endif() + if(DEFINED _tmp_host_out) + message(STATUS "Host mkspec set to: ${_tmp_host_out}") + else() + message(STATUS "Host mkspec not set. Qt's own buildsystem will try to figure out the host system") + endif() + else() + set(_tmp_host_out ${VCPKG_QT_HOST_MKSPEC}) + endif() + + if(DEFINED _tmp_host_out) + set(${HOST_PLATFORM_MKSPEC_OUT} ${_tmp_host_out} PARENT_SCOPE) + endif() + + ## Figure out VCPKG qt-tools directory for the port. + if(NOT DEFINED VCPKG_QT_HOST_TOOLS_ROOT AND DEFINED VCPKG_QT_HOST_PLATFORM) ## Root dir of the required host tools + if(NOT "${_tmp_host_out}" MATCHES "${_tmp_host_out}") + if(CMAKE_HOST_WIN32) + + if($ENV{PROCESSOR_ARCHITECTURE} MATCHES "[aA][rR][mM]64") + list(APPEND _test_triplets arm64-windows) + elseif($ENV{PROCESSOR_ARCHITECTURE} MATCHES "[aA][mM][dD]64") + list(APPEND _test_triplets x64-windows x64-windows-static) + list(APPEND _test_triplets x86-windows x86-windows-static) + elseif($ENV{PROCESSOR_ARCHITECTURE} MATCHES "x86") + list(APPEND _test_triplets x86-windows x86-windows-static) + else() + message(FATAL_ERROR "Unknown host processor! Host Processor $ENV{PROCESSOR_ARCHITECTURE}") + endif() + elseif(CMAKE_HOST_SYSTEM STREQUAL "Linux") + list(APPEND _test_triplets "x64-linux") + elseif(CMAKE_HOST_SYSTEM STREQUAL "Darwin") + list(APPEND _test_triplets "x64-osx") + else() + endif() + foreach(_triplet ${_test_triplets}) + find_program(QMAKE_PATH qmake PATHS ${VCPKG_INSTALLED_DIR}/${_triplet}/tools/qt5/bin NO_DEFAULT_PATHS) + message(STATUS "Checking: ${VCPKG_INSTALLED_DIR}/${_triplet}/tools/qt5/bin. ${QMAKE_PATH}") + if(QMAKE_PATH) + set(_tmp_host_root "${VCPKG_INSTALLED_DIR}/${_triplet}/tools/qt5") + set(_tmp_host_qmake ${QMAKE_PATH} PARENT_SCOPE) + message(STATUS "Qt host tools root dir within vcpkg: ${_tmp_host_root}") + break() + endif() + endforeach() + if(NOT DEFINED _tmp_host_root) + message(FATAL_ERROR "Unable to locate required host tools. Please define VCPKG_QT_HOST_TOOLS_ROOT to the required root dir of the host tools") + endif() + endif() + else() + set(_tmp_host_root ${VCPKG_QT_HOST_TOOLS_ROOT}) + endif() + + if(DEFINED _tmp_host_root) + set(${EXT_HOST_TOOLS_OUT} ${_tmp_host_root} PARENT_SCOPE) + endif() + +endfunction() diff --git a/externals/vcpkg/ports/qt5-base/cmake/install_qt.cmake b/externals/vcpkg/ports/qt5-base/cmake/install_qt.cmake new file mode 100755 index 000000000..39781cebe --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/cmake/install_qt.cmake @@ -0,0 +1,129 @@ +include(qt_fix_makefile_install) + +function(install_qt) + if(CMAKE_HOST_WIN32) + if (VCPKG_QMAKE_USE_NMAKE) + find_program(NMAKE nmake REQUIRED) + set(INVOKE "${NMAKE}") + set(INVOKE_SINGLE "${NMAKE}") + get_filename_component(NMAKE_EXE_PATH ${NMAKE} DIRECTORY) + set(PATH_GLOBAL "$ENV{PATH}") + set(ENV{PATH} "$ENV{PATH};${NMAKE_EXE_PATH}") + set(ENV{CL} "$ENV{CL} /MP${VCPKG_CONCURRENCY}") + else() + vcpkg_find_acquire_program(JOM) + set(INVOKE "${JOM}" /J ${VCPKG_CONCURRENCY}) + set(INVOKE_SINGLE "${JOM}" /J 1) + endif() + else() + find_program(MAKE make) + set(INVOKE "${MAKE}" -j${VCPKG_CONCURRENCY}) + set(INVOKE_SINGLE "${MAKE}" -j1) + endif() + vcpkg_find_acquire_program(PYTHON3) + get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) + vcpkg_add_to_path(PREPEND "${PYTHON3_EXE_PATH}") + + if (CMAKE_HOST_WIN32) + # flex and bison for ANGLE library + vcpkg_find_acquire_program(FLEX) + get_filename_component(FLEX_EXE_PATH ${FLEX} DIRECTORY) + get_filename_component(FLEX_DIR ${FLEX_EXE_PATH} NAME) + + file(COPY ${FLEX_EXE_PATH} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-tools" ) + set(FLEX_TEMP "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-tools/${FLEX_DIR}") + file(RENAME "${FLEX_TEMP}/win_bison.exe" "${FLEX_TEMP}/bison.exe") + file(RENAME "${FLEX_TEMP}/win_flex.exe" "${FLEX_TEMP}/flex.exe") + vcpkg_add_to_path("${FLEX_TEMP}") + endif() + + set(_path "$ENV{PATH}") + + #Replace with VCPKG variables if PR #7733 is merged + unset(BUILDTYPES) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(_buildname "DEBUG") + list(APPEND BUILDTYPES ${_buildname}) + set(_short_name_${_buildname} "dbg") + set(_path_suffix_${_buildname} "/debug") + set(_build_type_${_buildname} "debug") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(_buildname "RELEASE") + list(APPEND BUILDTYPES ${_buildname}) + set(_short_name_${_buildname} "rel") + set(_path_suffix_${_buildname} "") + set(_build_type_${_buildname} "release") + endif() + unset(_buildname) + + foreach(_buildname ${BUILDTYPES}) + set(_build_triplet ${TARGET_TRIPLET}-${_short_name_${_buildname}}) + + set(_installed_prefix_ "${CURRENT_INSTALLED_DIR}${_path_suffix_${_buildname}}") + set(_installed_libpath_ "${_installed_prefix_}/lib/${VCPKG_HOST_PATH_SEPARATOR}${_installed_prefix_}/lib/manual-link/") + + vcpkg_add_to_path(PREPEND "${_installed_prefix_}/bin") + vcpkg_add_to_path(PREPEND "${_installed_prefix_}/lib") + + # We set LD_LIBRARY_PATH ENV variable to allow executing Qt tools (rcc,...) even with dynamic linking + if(CMAKE_HOST_UNIX) + if(DEFINED ENV{LD_LIBRARY_PATH}) + set(_ld_library_path_defined_ TRUE) + set(_ld_library_path_backup_ $ENV{LD_LIBRARY_PATH}) + set(ENV{LD_LIBRARY_PATH} "${_installed_libpath_}${VCPKG_HOST_PATH_SEPARATOR}${_ld_library_path_backup_}") + else() + set(_ld_library_path_defined_ FALSE) + set(ENV{LD_LIBRARY_PATH} "${_installed_libpath_}") + endif() + endif() + + if(VCPKG_TARGET_IS_OSX) + # For some reason there will be an error on MacOSX without this clean! + message(STATUS "Cleaning before build ${_build_triplet}") + vcpkg_execute_required_process( + COMMAND ${INVOKE_SINGLE} clean + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${_build_triplet} + LOGNAME cleaning-1-${_build_triplet} + ) + endif() + + message(STATUS "Building ${_build_triplet}") + vcpkg_execute_build_process( + COMMAND ${INVOKE} + NO_PARALLEL_COMMAND ${INVOKE_SINGLE} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${_build_triplet} + LOGNAME build-${_build_triplet} + ) + + if(VCPKG_TARGET_IS_OSX) + # For some reason there will be an error on MacOSX without this clean! + message(STATUS "Cleaning after build before install ${_build_triplet}") + vcpkg_execute_required_process( + COMMAND ${INVOKE_SINGLE} clean + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${_build_triplet} + LOGNAME cleaning-2-${_build_triplet} + ) + endif() + + message(STATUS "Fixing makefile installation path ${_build_triplet}") + qt_fix_makefile_install("${CURRENT_BUILDTREES_DIR}/${_build_triplet}") + message(STATUS "Installing ${_build_triplet}") + vcpkg_execute_required_process( + COMMAND ${INVOKE} install + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${_build_triplet} + LOGNAME package-${_build_triplet} + ) + message(STATUS "Package ${_build_triplet} done") + set(ENV{PATH} "${_path}") + + # Restore backup + if(CMAKE_HOST_UNIX) + if(_ld_library_path_defined_) + set(ENV{LD_LIBRARY_PATH} "${_ld_library_path_backup_}") + else() + unset(ENV{LD_LIBRARY_PATH}) + endif() + endif() + endforeach() +endfunction() diff --git a/externals/vcpkg/ports/qt5-base/cmake/qt_build_submodule.cmake b/externals/vcpkg/ports/qt5-base/cmake/qt_build_submodule.cmake new file mode 100755 index 000000000..e2e390cec --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/cmake/qt_build_submodule.cmake @@ -0,0 +1,129 @@ + +function(qt_build_submodule SOURCE_PATH) + # This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings + set(ENV{_CL_} "/utf-8") + + if(NOT PORT STREQUAL "qt5-webengine") + vcpkg_find_acquire_program(PYTHON3) + get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) + vcpkg_add_to_path("${PYTHON3_EXE_PATH}") + endif() + + vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH} ${ARGV}) + + vcpkg_build_qmake(SKIP_MAKEFILES) + + #Fix the installation location within the makefiles + qt_fix_makefile_install("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/") + qt_fix_makefile_install("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/") + + #Install the module files + vcpkg_build_qmake(TARGETS install SKIP_MAKEFILES BUILD_LOGNAME install) + + qt_fix_cmake(${CURRENT_PACKAGES_DIR} ${PORT}) + vcpkg_fixup_pkgconfig() # Needs further investigation if this is enough! + + #Replace with VCPKG variables if PR #7733 is merged + unset(BUILDTYPES) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(_buildname "DEBUG") + list(APPEND BUILDTYPES ${_buildname}) + set(_short_name_${_buildname} "dbg") + set(_path_suffix_${_buildname} "/debug") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(_buildname "RELEASE") + list(APPEND BUILDTYPES ${_buildname}) + set(_short_name_${_buildname} "rel") + set(_path_suffix_${_buildname} "") + endif() + unset(_buildname) + + foreach(_buildname ${BUILDTYPES}) + set(CURRENT_BUILD_PACKAGE_DIR "${CURRENT_PACKAGES_DIR}${_path_suffix_${_buildname}}") + #Fix PRL files + file(GLOB_RECURSE PRL_FILES "${CURRENT_BUILD_PACKAGE_DIR}/lib/*.prl" "${CURRENT_PACKAGES_DIR}/tools/qt5${_path_suffix_${_buildname}}/lib/*.prl" + "${CURRENT_PACKAGES_DIR}/tools/qt5${_path_suffix_${_buildname}}/mkspecs/*.pri") + qt_fix_prl("${CURRENT_BUILD_PACKAGE_DIR}" "${PRL_FILES}") + + # This makes it impossible to use the build tools in any meaningful way. qt5 assumes they are all in one folder! + # So does the Qt VS Plugin which even assumes all of the in a bin folder + #Move tools to the correct directory + #if(EXISTS ${CURRENT_BUILD_PACKAGE_DIR}/tools/qt5) + # file(RENAME ${CURRENT_BUILD_PACKAGE_DIR}/tools/qt5 ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + #endif() + + # Move executables in bin to tools + # This is ok since those are not build tools. + file(GLOB PACKAGE_EXE ${CURRENT_BUILD_PACKAGE_DIR}/bin/*.exe) + if(PACKAGE_EXE) + file(INSTALL ${PACKAGE_EXE} DESTINATION "${CURRENT_BUILD_PACKAGE_DIR}/tools/${PORT}") + file(REMOVE ${PACKAGE_EXE}) + foreach(_exe ${PACKAGE_EXE}) + string(REPLACE ".exe" ".pdb" _prb_file ${_exe}) + if(EXISTS ${_prb_file}) + file(INSTALL ${_prb_file} DESTINATION "${CURRENT_BUILD_PACKAGE_DIR}/tools/${PORT}") + file(REMOVE ${_prb_file}) + endif() + endforeach() + endif() + + #cleanup empty folders + file(GLOB PACKAGE_LIBS "${CURRENT_BUILD_PACKAGE_DIR}/lib/*") + if(NOT PACKAGE_LIBS) + file(REMOVE_RECURSE "${CURRENT_BUILD_PACKAGE_DIR}/lib") + endif() + + file(GLOB PACKAGE_BINS "${CURRENT_BUILD_PACKAGE_DIR}/bin/*") + if(NOT PACKAGE_BINS) + file(REMOVE_RECURSE "${CURRENT_BUILD_PACKAGE_DIR}/bin") + endif() + endforeach() + if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/qt5/bin") + file(COPY "${CURRENT_PACKAGES_DIR}/tools/qt5/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + + set(CURRENT_INSTALLED_DIR_BACKUP "${CURRENT_INSTALLED_DIR}") + set(CURRENT_INSTALLED_DIR "./../../.." ) # Making the qt.conf relative and not absolute + configure_file(${CURRENT_INSTALLED_DIR_BACKUP}/tools/qt5/qt_release.conf ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/qt.conf) # This makes the tools at least useable for release + set(CURRENT_INSTALLED_DIR "${CURRENT_INSTALLED_DIR_BACKUP}") + + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(GLOB_RECURSE DLL_DEPS_AVAIL "${CURRENT_INSTALLED_DIR}/tools/qt5/bin/*.dll") + string(REPLACE "${CURRENT_INSTALLED_DIR}/tools/qt5/bin/" "" DLL_DEPS_AVAIL "${DLL_DEPS_AVAIL}") + file(GLOB_RECURSE DLL_DEPS_NEEDED "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/*.dll") + string(REPLACE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/" "" DLL_DEPS_NEEDED "${DLL_DEPS_NEEDED}") + if(DLL_DEPS_AVAIL AND DLL_DEPS_NEEDED) + list(REMOVE_ITEM DLL_DEPS_NEEDED ${DLL_DEPS_AVAIL}) + endif() + foreach(dll_dep ${DLL_DEPS_NEEDED}) + string(REGEX REPLACE "[^/]+$" "" dll_subpath "${dll_dep}") + file(COPY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${dll_dep}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/qt5/bin/${dll_subpath}") + endforeach() + endif() + endif() + + #This should be removed if somehow possible + if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/qt5/debug/bin") + set(CURRENT_INSTALLED_DIR_BACKUP "${CURRENT_INSTALLED_DIR}") + set(CURRENT_INSTALLED_DIR "./../../../.." ) # Making the qt.conf relative and not absolute + configure_file(${CURRENT_INSTALLED_DIR_BACKUP}/tools/qt5/qt_debug.conf ${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/qt.conf) # This makes the tools at least useable for release + set(CURRENT_INSTALLED_DIR "${CURRENT_INSTALLED_DIR_BACKUP}") + + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin") + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(GLOB_RECURSE DLL_DEPS_AVAIL "${CURRENT_INSTALLED_DIR}/tools/qt5/debug/bin/*.dll") + string(REPLACE "${CURRENT_INSTALLED_DIR}/tools/qt5/debug/bin/" "" DLL_DEPS_AVAIL "${DLL_DEPS_AVAIL}") + file(GLOB_RECURSE DLL_DEPS_NEEDED "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/*.dll") + string(REPLACE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/" "" DLL_DEPS_NEEDED "${DLL_DEPS_NEEDED}") + if(DLL_DEPS_AVAIL AND DLL_DEPS_NEEDED) + list(REMOVE_ITEM DLL_DEPS_NEEDED ${DLL_DEPS_AVAIL}) + endif() + foreach(dll_dep ${DLL_DEPS_NEEDED}) + string(REGEX REPLACE "[^/]+$" "" dll_subpath "${dll_dep}") + file(COPY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/${dll_dep}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/qt5/debug/bin/${dll_subpath}") + endforeach() + endif() + endif() + +endfunction() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-base/cmake/qt_download_submodule.cmake b/externals/vcpkg/ports/qt5-base/cmake/qt_download_submodule.cmake new file mode 100755 index 000000000..5c8aff033 --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/cmake/qt_download_submodule.cmake @@ -0,0 +1,41 @@ +function(qt_get_submodule_name OUT_NAME) + string(REPLACE "5-" "" _tmp_name ${PORT}) + set(${OUT_NAME} ${_tmp_name} PARENT_SCOPE) +endfunction() + +function(qt_download_submodule) + cmake_parse_arguments(_csc "" "OUT_SOURCE_PATH" "PATCHES;BUILD_OPTIONS;BUILD_OPTIONS_RELEASE;BUILD_OPTIONS_DEBUG" ${ARGN}) + + if(NOT DEFINED _csc_OUT_SOURCE_PATH) + message(FATAL_ERROR "qt_download_module requires parameter OUT_SOURCE_PATH to be set! Please correct the portfile!") + endif() + + vcpkg_buildpath_length_warning(37) + qt_get_submodule_name(NAME) + + set(FULL_VERSION "${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}") + set(ARCHIVE_NAME "${NAME}-everywhere-opensource-src-${FULL_VERSION}.tar.xz") + set(URLS "https://download.qt.io/official_releases/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" + "https://mirrors.ocf.berkeley.edu/qt/official_releases/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" + ) + vcpkg_download_distfile(ARCHIVE_FILE + URLS ${URLS} + FILENAME ${ARCHIVE_NAME} + SHA512 ${QT_HASH_${PORT}} + ) + + if(QT_UPDATE_VERSION) + file(SHA512 "${ARCHIVE_FILE}" ARCHIVE_HASH) + message(STATUS "${PORT} new hash is ${ARCHIVE_HASH}") + file(APPEND "${VCPKG_ROOT_DIR}/ports/qt5-base/cmake/qt_new_hashes.cmake" "set(QT_HASH_${PORT} ${ARCHIVE_HASH})\n") + else() + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE_FILE}" + REF ${FULL_VERSION} + PATCHES ${_csc_PATCHES} + ) + endif() + + set(${_csc_OUT_SOURCE_PATH} ${SOURCE_PATH} PARENT_SCOPE) +endfunction() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-base/cmake/qt_fix_cmake.cmake b/externals/vcpkg/ports/qt5-base/cmake/qt_fix_cmake.cmake new file mode 100755 index 000000000..1b6522716 --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/cmake/qt_fix_cmake.cmake @@ -0,0 +1,21 @@ +function(qt_fix_cmake PACKAGE_DIR_TO_FIX PORT_TO_FIX) + + file(GLOB_RECURSE cmakefiles ${PACKAGE_DIR_TO_FIX}/share/cmake/*.cmake ${PACKAGE_DIR_TO_FIX}/lib/cmake/*.cmake) + foreach(cmakefile ${cmakefiles}) + file(READ "${cmakefile}" _contents) + if(_contents MATCHES "_install_prefix}/tools/qt5/bin/([a-z0-9]+)") # there are only about 3 to 5 cmake files which require the fix in ports: qt5-tools qt5-xmlpattern at5-activeqt qt5-quick + string(REGEX REPLACE "_install_prefix}/tools/qt5/bin/([a-z0-9]+)" "_install_prefix}/tools/${PORT_TO_FIX}/bin/\\1" _contents "${_contents}") + file(WRITE "${cmakefile}" "${_contents}") + endif() + endforeach() + + #Install cmake files + if(EXISTS ${PACKAGE_DIR_TO_FIX}/lib/cmake) + file(MAKE_DIRECTORY ${PACKAGE_DIR_TO_FIX}/share) + file(RENAME ${PACKAGE_DIR_TO_FIX}/lib/cmake ${PACKAGE_DIR_TO_FIX}/share/cmake) + endif() + #Remove extra cmake files + if(EXISTS ${PACKAGE_DIR_TO_FIX}/debug/lib/cmake) + file(REMOVE_RECURSE ${PACKAGE_DIR_TO_FIX}/debug/lib/cmake) + endif() +endfunction() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-base/cmake/qt_fix_makefile_install.cmake b/externals/vcpkg/ports/qt5-base/cmake/qt_fix_makefile_install.cmake new file mode 100755 index 000000000..69b016fc8 --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/cmake/qt_fix_makefile_install.cmake @@ -0,0 +1,30 @@ +#Could probably be a vcpkg_fix_makefile_install for other ports? +function(qt_fix_makefile_install BUILD_DIR) + #Fix the installation location + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" NATIVE_INSTALLED_DIR) + file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" NATIVE_PACKAGES_DIR) + + if(WIN32) + string(SUBSTRING "${NATIVE_INSTALLED_DIR}" 2 -1 INSTALLED_DIR_WITHOUT_DRIVE) + string(SUBSTRING "${NATIVE_PACKAGES_DIR}" 2 -1 PACKAGES_DIR_WITHOUT_DRIVE) + string(SUBSTRING "${NATIVE_INSTALLED_DIR}" 0 2 INSTALLED_DRIVE) + string(SUBSTRING "${NATIVE_PACKAGES_DIR}" 0 2 PACKAGES_DRIVE) + else() + set(INSTALLED_DRIVE) + set(PACKAGES_DRIVE) + set(INSTALLED_DIR_WITHOUT_DRIVE ${NATIVE_INSTALLED_DIR}) + set(PACKAGES_DIR_WITHOUT_DRIVE ${NATIVE_PACKAGES_DIR}) + endif() + + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" NATIVE_INSTALLED_DIR) + file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" NATIVE_PACKAGES_DIR) + + file(GLOB_RECURSE MAKEFILES "${BUILD_DIR}/*Makefile*") + + foreach(MAKEFILE ${MAKEFILES}) + file(READ "${MAKEFILE}" _contents) + #Set the correct install directory to packages + string(REPLACE "${INSTALLED_DRIVE}$(INSTALL_ROOT)${INSTALLED_DIR_WITHOUT_DRIVE}" "${PACKAGES_DRIVE}$(INSTALL_ROOT)${PACKAGES_DIR_WITHOUT_DRIVE}" _contents "${_contents}") + file(WRITE "${MAKEFILE}" "${_contents}") + endforeach() +endfunction() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-base/cmake/qt_fix_prl.cmake b/externals/vcpkg/ports/qt5-base/cmake/qt_fix_prl.cmake new file mode 100755 index 000000000..551ec1134 --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/cmake/qt_fix_prl.cmake @@ -0,0 +1,15 @@ +function(qt_fix_prl PACKAGE_DIR PRL_FILES) + file(TO_CMAKE_PATH "${PACKAGE_DIR}/lib" CMAKE_LIB_PATH) + file(TO_CMAKE_PATH "${PACKAGE_DIR}/include/qt5" CMAKE_INCLUDE_PATH) + file(TO_CMAKE_PATH "${PACKAGE_DIR}/include" CMAKE_INCLUDE_PATH2) + file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}" CMAKE_INSTALLED_PREFIX) + foreach(PRL_FILE IN LISTS PRL_FILES) + file(READ "${PRL_FILE}" _contents) + string(REPLACE "${CMAKE_LIB_PATH}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}") + string(REPLACE "${CMAKE_INCLUDE_PATH}" "\$\$[QT_INSTALL_HEADERS]" _contents "${_contents}") + string(REPLACE "${CMAKE_INCLUDE_PATH2}" "\$\$[QT_INSTALL_HEADERS]/../" _contents "${_contents}") + string(REPLACE "${CMAKE_INSTALLED_PREFIX}" "\$\$[QT_INSTALL_PREFIX]" _contents "${_contents}") + #Note: This only works without an extra if case since QT_INSTALL_PREFIX is the same for debug and release + file(WRITE "${PRL_FILE}" "${_contents}") + endforeach() +endfunction() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-base/cmake/qt_install_copyright.cmake b/externals/vcpkg/ports/qt5-base/cmake/qt_install_copyright.cmake new file mode 100755 index 000000000..ba4d70c28 --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/cmake/qt_install_copyright.cmake @@ -0,0 +1,18 @@ +#Could probably be the beginning of a vcpkg_install_copyright? +function(qt_install_copyright SOURCE_PATH) + #Find the relevant license file and install it + if(EXISTS "${SOURCE_PATH}/LICENSE.LGPLv3") + set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.LGPLv3") + elseif(EXISTS "${SOURCE_PATH}/LICENSE.LGPL3") + set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.LGPL3") + elseif(EXISTS "${SOURCE_PATH}/LICENSE.GPLv3") + set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.GPLv3") + elseif(EXISTS "${SOURCE_PATH}/LICENSE.GPL3") + set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.GPL3") + elseif(EXISTS "${SOURCE_PATH}/LICENSE.GPL3-EXCEPT") + set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.GPL3-EXCEPT") + elseif(EXISTS "${SOURCE_PATH}/LICENSE.FDL") + set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.FDL") + endif() + file(INSTALL ${LICENSE_PATH} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +endfunction() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-base/cmake/qt_port_functions.cmake b/externals/vcpkg/ports/qt5-base/cmake/qt_port_functions.cmake new file mode 100755 index 000000000..19f53f98b --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/cmake/qt_port_functions.cmake @@ -0,0 +1,14 @@ +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") + +#Basic setup +include(qt_port_hashes) +#Fixup scripts +include(qt_fix_makefile_install) +include(qt_fix_cmake) +include(qt_fix_prl) +#Helper functions +include(qt_download_submodule) +include(qt_build_submodule) +include(qt_install_copyright) + +include(qt_submodule_installation) diff --git a/externals/vcpkg/ports/qt5-base/cmake/qt_port_hashes.cmake b/externals/vcpkg/ports/qt5-base/cmake/qt_port_hashes.cmake new file mode 100755 index 000000000..dffbb5b15 --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/cmake/qt_port_hashes.cmake @@ -0,0 +1,72 @@ +# Every update requires an update of these hashes and the version within the control file of each of the 32 ports. +# So it is probably better to have a central location for these hashes and let the ports update via a script +set(QT_MAJOR_MINOR_VER 5.15) +set(QT_PATCH_VER 4) +set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes. + +set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth + purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets + webview winextras xmlpatterns doc x11extras androidextras translations serialbus webengine webglplugin wayland) + +set(QT_HASH_qt5-base 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3) +set(QT_HASH_qt5-3d cb2ea961109a153e78147450310408f4f573186d12412ebdd71511eb273ca78113d3aede583ec8aa44fe19f5268bb6fab3386c5501142ad6a22e10890ce52f62) +set(QT_HASH_qt5-activeqt 39ef01523583cbdea80143fae25afb1cfeb7131769430ab153a82edd6c5478383c558a06ea7053b8d99b8945a6422c4f38765ffb72cd87f0f34cc9ad78ebc603) +set(QT_HASH_qt5-androidextras 527471c0dc9b51ffccdb6c8134b78be4f6d2039bc8dee22529a117457e8153aaf1b081e23704864cc6999ba3059876a85bd3a27b9bcc9fbfda618816c92b719b) +set(QT_HASH_qt5-charts e7a4cac3b3a0c60c7ab509d5a533521dd8dc0cb5ad69d66a87f12671c73c1928d902e0be377efb77e0ddadefe1ef8800c0cf07e8213f44367bcd80a787342bcf) +set(QT_HASH_qt5-connectivity 3f2c0a59ff6be9531f5ebc81a4344e0b12c8ef92fbfa466f2777d4ed3b4b08657214e93e0aada856a0c6475b6b760aeeb06f0b2be894e61cd7b344c49fefaf95) +set(QT_HASH_qt5-datavis3d 044cdee342ef4d9beb62b910cee59f9cb362c85d517e19a1c0327dfa2b518b2fa484e36756ee9302fb043cc506340b501202861a858d374a5f69cbcddec18301) +set(QT_HASH_qt5-declarative 8a4ff61238fde7cc563f9d94b5d1f4fd71ecb95ace447e57d08f71da82400b37c42f4f1ecdcd561116bffa1ed483219e06fb550f91c90842e5a43487bc4706b6) +set(QT_HASH_qt5-doc 2552501dfbc5ad8e42f211a621340902fa85634bc8a2a62ce457029d6f7cbd534a29a671c33aa1d034198a1491fd6d257db7177b0ca5e1ef57b84272a392cf06) +set(QT_HASH_qt5-gamepad 37eaad5338b6c5114571c6983fb806ff6537ba7d3dc4bf8d02899e693198a22ce17b0b3ddf2aa52447fcebb0ef97a3baa8e1bc3a7e3f265ad047509f53160ee9) +set(QT_HASH_qt5-graphicaleffects 00cf02057dfc1624c84079e1a08a65ceb6fb7df712f05ac9cb0006de0add9241e56a8e3909eeb04d1f6a90d5032909a41d59341e002750ab99d2449f635e64e3) +set(QT_HASH_qt5-imageformats 388a9ceebdca6d32f606615af37233f2d8394856d067c9a80486b88ad5714eac90263cd6555a3efd9c1b5fdcc27431b7f99eed6fc02760b1a9974515bfe70274) +set(QT_HASH_qt5-location 6208052d6ac173d19dc77496d8108558e7f31696dc5792fcbbeef2029539db76a60c5a51a7d198f54ea6c0ec23977a57cd8c8f8fa80fe5eac9528d2510c3dbb3) +set(QT_HASH_qt5-macextras 93985001db49985c69360dc58f6260ce2e26f861696c2f5989be9da3e239292fa5b954e0d036869a2e3d6fb046053e39ae113e4307ec762d8db1aa17af1998f5) +set(QT_HASH_qt5-mqtt 7a81d0bec0c59cb5574e96a2f9b33c0eea04789731909247544d14c87a0fa854214b8bfd35ee69831747e9487b616b75bbc9dfd9e78f33acd6b7a69dfaacdd75) +set(QT_HASH_qt5-multimedia bb0ada7560093b89751b5b3c0e1a573de215a388d621d356bc3c0e1acfffc2d696230c67b7a7cef037b18c4da900c7eb3d315bd2e73ce12f9aedd0e340399117) +set(QT_HASH_qt5-networkauth a36ce21151cb98bcbc99a819e873ef10f68d988aebfbae9aaaa7dc85bd4a693ad7510c47627f0f3841c5ef50173b21cdebe6a602fa429839fd9ad9bcc02d6c3c) +set(QT_HASH_qt5-purchasing 6455cff7b3dd2bbf5fc85ba9067b86bb042723b73d0b8984ab43ffdf444e50b5a68bb992ec82b133ac0e0cc3e18ca784cff8357e1e61ffe9fbbef1ff0f21a55f) +set(QT_HASH_qt5-quickcontrols 887a8f5fdcd3764575f9068ec8428526a049bb09ae0c214daef3652527d5e448baa53738dccf316b20ccf18f36951ecebd570aee3a27f9c32b9213ef7629de10) +set(QT_HASH_qt5-quickcontrols2 4ebbb0199db156307140406b6da4fa83c47aee2105e8c46c0da96313ddc4d6d7ea2f1f85691856144eb8c5109c108bb6810ba0693a2d2411b4feaeed1ec9a8f4) +set(QT_HASH_qt5-remoteobjects 6702f9419d5198572e37f0ee6883c2af38f4a249036365d9e084cd4acb30478f6935835493330b101482e998153d4e4f515004e0ffd428b64a86bba17eb203d6) +set(QT_HASH_qt5-script 01d3b03eec23f462a7931e268eb8572d85ed560dd8b24f85b420ff8ebb1932d4c18f47c8d5fad7b7c09c147158b02b6cceb9c571b10249ba4008b363e23d7f95) +set(QT_HASH_qt5-scxml 2664e4e707fd10aa2ef832fdfc133695da3f6f80c2a611dc94b4e22b34c3226d5baa1e5afc77db2115317c654460ebb60896c006aa93b324fe67d6860ae9b431) +set(QT_HASH_qt5-sensors b8b9ffedfdcd392bd5c1ab76db3f621d16094f444e14900726378a289c04c08a75b82628cb61f4ca66bba8c1eeba2a56d9f90d9a82adfdc90fc00ac1b579c63e) +set(QT_HASH_qt5-serialbus 931362b171799fd8e449d418c3ae80c029c39edffc66b5c3fa054991332950241803d282e1ae1e5f72c8395f88f9d82d6a2d04f00b3907b5e9f7fb5be4f555e7) +set(QT_HASH_qt5-serialport d8bc3d0b89bb4fc05bfe27a4c76bc3732ef5f8ba889400c8116f18c2ed58db7a3b99c4bda1cd60d1e8051121d31a4b55b95d20e89578a6e523d527e6182262ba) +set(QT_HASH_qt5-speech 6582fe36950aee8428c72582ff2eda2dae433ad969c323e0c6e8be611be7d81766ceb1cae85a10dcd4d266e33a0cf782fe857e1502d7f3863e0dfb2306af2aed) +set(QT_HASH_qt5-svg 364400e17cdc659ff1a521f7bd171c5dfe537136f263cd5f64c6b5e27b0398d83ae0b5fe46e77847f3a2feccf0ea75f9591ff4b932d0250e5859272630b5a31c) +set(QT_HASH_qt5-tools 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e) +set(QT_HASH_qt5-translations 56b20c0174cb68c3e4def85ec6c113576bc8872d1cdac318bc3d9a121645f67ce68e9bd3a73e32fd53617fcef641fb95831b37c40f1250c1c05e109e55b41ee2) +set(QT_HASH_qt5-virtualkeyboard 870279299a5e166badea0746a2d4badc758c66f8404e36d1df05997dcfeb66733154fc2a9830c433fbacf885b7afb44bc8dc8a5aacc02713966630ce98231ba3) +set(QT_HASH_qt5-wayland 58ae262f7aa0455fb577a36fe9413a969398a2043160642501bac064d6fbc3280f76aa566e62b9d73c67a8c3606849b1b97bcb9b0250d26c269ec921112f40e4) +set(QT_HASH_qt5-webchannel 18d5e6f44b780c7dfc94e1620ba76d7b0731d671df537b2e29fef062a0775e8dc973deb6c949b37000f5e8a49bdd31a723aa069bafcb9ecdc3259d0bf97e5a26) +set(QT_HASH_qt5-webengine 935c5a21ec2529d8cc3dbaf906e1f68f6e0879da212719d2da9fc1c97efd572563e8d12a6742a0a995efa5014ce5378235833eafb8d463ebe4060b60a590c476) +set(QT_HASH_qt5-webglplugin e637abc9388f6c9c6641a38c7f33cef781320616be7d181d7fc63aa6f3ed6d378ec3cef91c8feebda52ff669bb3eb2df771bc2a2e447d482ce940abe4c1edce9) +set(QT_HASH_qt5-websockets 01714b9927c3a234fac9386a596aa3dc3833d9cfe8cc152892fec969e51b428bed00f501c16b8e4f810452739ff8491e5c64f9b936aa10e1a839c09c8f2832ce) +set(QT_HASH_qt5-webview fb5177f0e8f79490598120f01b6cdd78ce5cbac8f313c0e088ded7b4daada290d2c058ecd6eebdba76fd15efd2e198bc03cbaf544fba664d49efb55709703be6) +set(QT_HASH_qt5-winextras cac1b2b2194f3c21cba73e0c49384957a40e3297965b3fcf625eba0d069e3955202cae5e545a6186a9fad51df18afddd27fe55535265d2acf15fe2ba9e71a1d5) +set(QT_HASH_qt5-x11extras 79c718eff9daba9ff3f361d38f828f8f3c447b87486d652d4ed1f964ec686259ae4d0a1a50b7b6b9349453ba3f8b56b3c20c8a5f26971d5cc3c8f99d668744d6) +set(QT_HASH_qt5-xmlpatterns fc4b4723407f6a1e765933d9d76ec4ffe874cb4a70e47bc4110def2c4a491b86fa753c33ef31ef95ad1a6eaa3de1fadbc49deb7783d32d8fc2f51672670d5a87) + +if(QT_UPDATE_VERSION) + message(STATUS "Running Qt in automatic version port update mode!") + set(_VCPKG_INTERNAL_NO_HASH_CHECK 1) + if("${PORT}" MATCHES "qt5-base") + function(update_qt_version_in_manifest _port_name) + set(_current_control "${VCPKG_ROOT_DIR}/ports/${_port_name}/vcpkg.json") + file(READ ${_current_control} _control_contents) + #message(STATUS "Before: \n${_control_contents}") + string(REGEX REPLACE "\"version.*\": \"[0-9]+\.[0-9]+\.[0-9]+\",\n" "\"version\": \"${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}\",\n" _control_contents "${_control_contents}") + string(REGEX REPLACE "\n \"port-version\": [0-9]+," "" _control_contents "${_control_contents}") + #message(STATUS "After: \n${_control_contents}") + file(WRITE ${_current_control} "${_control_contents}") + configure_file("${_current_control}" "${_current_control}" @ONLY NEWLINE_STYLE LF) + endfunction() + + update_qt_version_in_manifest("qt5") + foreach(_current_qt_port_basename ${QT_PORT_LIST}) + update_qt_version_in_manifest("qt5-${_current_qt_port_basename}") + endforeach() + endif() +endif() diff --git a/externals/vcpkg/ports/qt5-base/cmake/qt_submodule_installation.cmake b/externals/vcpkg/ports/qt5-base/cmake/qt_submodule_installation.cmake new file mode 100755 index 000000000..19c0b4ef4 --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/cmake/qt_submodule_installation.cmake @@ -0,0 +1,15 @@ + + +function(qt_submodule_installation) + cmake_parse_arguments(_csc "" "OUT_SOURCE_PATH" "" ${ARGN}) + qt_download_submodule(OUT_SOURCE_PATH TARGET_SOURCE_PATH ${_csc_UNPARSED_ARGUMENTS}) + if(QT_UPDATE_VERSION) + SET(VCPKG_POLICY_EMPTY_PACKAGE enabled PARENT_SCOPE) + else() + qt_build_submodule(${TARGET_SOURCE_PATH} ${_csc_UNPARSED_ARGUMENTS}) + qt_install_copyright(${TARGET_SOURCE_PATH}) + endif() + if(DEFINED _csc_OUT_SOURCE_PATH) + set(${_csc_OUT_SOURCE_PATH} ${TARGET_SOURCE_PATH} PARENT_SCOPE) + endif() +endfunction() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-base/patches/Qt5BasicConfig.patch b/externals/vcpkg/ports/qt5-base/patches/Qt5BasicConfig.patch new file mode 100755 index 000000000..4f5d1fab0 --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/patches/Qt5BasicConfig.patch @@ -0,0 +1,194 @@ +diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +index c72989288..a88234dca 100644 +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -53,8 +53,12 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura + set(_lib_deps) + set(_link_flags) + +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}\") ++!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) ++ if(\"${Configuration}\" STREQUAL \"DEBUG\") ++ set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}\") ++ else() ++ set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}\") ++ endif() + !!ELSE + set(_qt5_install_libs \"$${CMAKE_LIB_DIR}\") + !!ENDIF +@@ -125,6 +129,8 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura + elseif(EXISTS \"${_flag}\") + # The flag is an absolute path to an existing library + list(APPEND _lib_deps \"${_flag}\") ++ elseif(_flag MATCHES \"\\\\.lib$\") #Library name only. No -l. Probably missing some cases ++ list(APPEND _lib_deps \"${_flag}\") + elseif(_flag MATCHES \"^-L(.*)$\") + # Handle -Lfoo flags by putting their paths in the search path used by find_library above + list(APPEND _search_paths \"${CMAKE_MATCH_1}\") +@@ -147,7 +153,11 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ if(\"${Configuration}\" STREQUAL \"DEBUG\") # 1 ++ set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ else() ++ set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ endif() + !!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ENDIF +@@ -174,21 +184,22 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + ) + + !!IF !isEmpty(CMAKE_STATIC_TYPE) +- if(NOT "${IsDebugAndRelease}") +- set(_genex_condition \"1\") ++ #if(NOT "${IsDebugAndRelease}") ++ # set(_genex_condition \"1\") ++ #else() ++ if("${Configuration}" STREQUAL "DEBUG") ++ set(_genex_condition \"$\") + else() +- if("${Configuration}" STREQUAL "DEBUG") +- set(_genex_condition \"$\") +- else() +- set(_genex_condition \"$>\") +- endif() ++ set(_genex_condition \"$>\") + endif() ++ #endif() + + if(_static_deps) + set(_static_deps_genex \"$<${_genex_condition}:${_static_deps}>\") + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES + \"${_static_deps_genex}\" + ) ++ #message(STATUS \"Target Qt5::$${CMAKE_MODULE_NAME} static links: ${_static_dep} through ${_static_dep_genex}\") # Added for debugging + endif() + + set(_static_link_flags \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\") +@@ -205,13 +216,18 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES + \"${_static_link_flags_genex}\" + ) ++ #message(STATUS \"Target Qt5::$${CMAKE_MODULE_NAME} static link flags: ${_static_link_flags} through ${_static_link_flags_genex}\") + endif() + endif() + !!ENDIF + + !!IF !isEmpty(CMAKE_WINDOWS_BUILD) + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ if(\"${Configuration}\" STREQUAL \"DEBUG\") ++ set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ else() ++ set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ endif() + !!ELSE + set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ENDIF +@@ -373,13 +389,14 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + + !!IF !isEmpty(CMAKE_STATIC_TYPE) + if(NOT Qt5_EXCLUDE_STATIC_DEPENDENCIES) +-!!IF !isEmpty(CMAKE_DEBUG_TYPE) + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) ++ if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\") + _qt5_$${CMAKE_MODULE_NAME}_process_prl_file( +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG ++ \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG + _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES + _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LINK_FLAGS + ) ++ endif() + !!ELSE + _qt5_$${CMAKE_MODULE_NAME}_process_prl_file( + \"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG +@@ -387,22 +404,21 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LINK_FLAGS + ) + !!ENDIF +-!!ENDIF + +-!!IF !isEmpty(CMAKE_RELEASE_TYPE) + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) ++ if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\") + _qt5_$${CMAKE_MODULE_NAME}_process_prl_file( + \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE + _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES + _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LINK_FLAGS + ) ++ endif() + !!ELSE + _qt5_$${CMAKE_MODULE_NAME}_process_prl_file( + \"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE + _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES + _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LINK_FLAGS + ) +-!!ENDIF + !!ENDIF + endif() + +@@ -466,7 +482,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + !!IF isEmpty(CMAKE_DEBUG_TYPE) + !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) ++ if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + !!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE + if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE +@@ -474,13 +490,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + !!ELSE // CMAKE_STATIC_WINDOWS_BUILD + if (EXISTS + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" ++ \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" + !!ELSE + \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" + !!ENDIF + AND EXISTS + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) ++ \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + !!ELSE + \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + !!ENDIF +@@ -543,7 +559,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") ++ if(\"${Configuration}\" STREQUAL \"DEBUG\") ++ set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") ++ else() ++ set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") ++ endif() + !!ELSE + set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") + !!ENDIF +@@ -557,15 +577,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + ${_Qt5${Plugin}_STATIC_${Configuration}_LIB_DEPENDENCIES} + ) + +- if(NOT "${IsDebugAndRelease}") +- set(_genex_condition \"1\") ++ #if(NOT "${IsDebugAndRelease}") ++ # set(_genex_condition \"1\") ++ #else() ++ if("${Configuration}" STREQUAL "DEBUG") ++ set(_genex_condition \"$\") + else() +- if("${Configuration}" STREQUAL "DEBUG") +- set(_genex_condition \"$\") +- else() +- set(_genex_condition \"$>\") +- endif() ++ set(_genex_condition \"$>\") + endif() ++ #endif() + if(_static_deps) + set(_static_deps_genex \"$<${_genex_condition}:${_static_deps}>\") + set_property(TARGET Qt5::${Plugin} APPEND PROPERTY INTERFACE_LINK_LIBRARIES diff --git a/externals/vcpkg/ports/qt5-base/patches/Qt5GuiConfigExtras.patch b/externals/vcpkg/ports/qt5-base/patches/Qt5GuiConfigExtras.patch new file mode 100755 index 000000000..0029f2aa5 --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/patches/Qt5GuiConfigExtras.patch @@ -0,0 +1,13 @@ +diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in +index 84dbbfebd..accb86e3f 100644 +--- a/src/gui/Qt5GuiConfigExtras.cmake.in ++++ b/src/gui/Qt5GuiConfigExtras.cmake.in +@@ -148,6 +153,8 @@ macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs) + !!ENDIF + unset(Qt5Gui_${_cmake_lib_name}_LIBRARY CACHE) + ++ find_library(Qt5Gui_${_cmake_lib_name}_LIBRARY_DEBUG ${_lib}d ${_lib} NAMES_PER_DIR ++ PATHS \"${_qt5Gui_install_prefix}/debug/lib\" NO_DEFAULT_PATH) + find_library(Qt5Gui_${_cmake_lib_name}_LIBRARY_DEBUG ${_lib}d + PATHS \"${LibDir}\" + !!IF !mac diff --git a/externals/vcpkg/ports/qt5-base/patches/Qt5PluginTarget.patch b/externals/vcpkg/ports/qt5-base/patches/Qt5PluginTarget.patch new file mode 100755 index 000000000..a8377b585 --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/patches/Qt5PluginTarget.patch @@ -0,0 +1,74 @@ +diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +index 5baf0fdb1..185abfffd 100644 +--- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +@@ -15,13 +15,14 @@ foreach(_module_dep ${_Qt5$${CMAKE_PLUGIN_NAME}_MODULE_DEPENDENCIES}) + endif() + endforeach() + +-!!IF !isEmpty(CMAKE_RELEASE_TYPE) + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-_qt5_$${CMAKE_MODULE_NAME}_process_prl_file( +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE +- _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES +- _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LINK_FLAGS +-) ++if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\") ++ _qt5_$${CMAKE_MODULE_NAME}_process_prl_file( ++ \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE ++ _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES ++ _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LINK_FLAGS ++ ) ++endif() + !!ELSE + _qt5_$${CMAKE_MODULE_NAME}_process_prl_file( + \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE +@@ -29,15 +30,15 @@ _qt5_$${CMAKE_MODULE_NAME}_process_prl_file( + _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LINK_FLAGS + ) + !!ENDIF +-!!ENDIF + +-!!IF !isEmpty(CMAKE_DEBUG_TYPE) + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-_qt5_$${CMAKE_MODULE_NAME}_process_prl_file( +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG +- _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES +- _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LINK_FLAGS +-) ++if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\") ++ _qt5_$${CMAKE_MODULE_NAME}_process_prl_file( ++ \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG ++ _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES ++ _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LINK_FLAGS ++ ) ++endif() + !!ELSE + _qt5_$${CMAKE_MODULE_NAME}_process_prl_file( + \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG +@@ -45,19 +46,18 @@ _qt5_$${CMAKE_MODULE_NAME}_process_prl_file( + _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LINK_FLAGS + ) + !!ENDIF +-!!ENDIF + + set_property(TARGET Qt5::$$CMAKE_PLUGIN_NAME PROPERTY INTERFACE_SOURCES + \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_$${CMAKE_PLUGIN_NAME}_Import.cpp\" + ) + !!ENDIF + +-!!IF !isEmpty(CMAKE_RELEASE_TYPE) +-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) +-!!ENDIF +-!!IF !isEmpty(CMAKE_DEBUG_TYPE) +-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) +-!!ENDIF ++if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\") ++ _populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) ++endif() ++if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\") ++ _populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) ++endif() + + list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY QT_ALL_PLUGINS_$${CMAKE_PLUGIN_TYPE_ESCAPED} Qt5::$${CMAKE_PLUGIN_NAME}) diff --git a/externals/vcpkg/ports/qt5-base/patches/cocoa.patch b/externals/vcpkg/ports/qt5-base/patches/cocoa.patch new file mode 100755 index 000000000..242c38c86 --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/patches/cocoa.patch @@ -0,0 +1,12 @@ +diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h +index e070ba97..07c75b04 100644 +--- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h ++++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h +@@ -40,6 +40,7 @@ + #ifndef QIOSURFACEGRAPHICSBUFFER_H + #define QIOSURFACEGRAPHICSBUFFER_H + ++#include + #include + #include + diff --git a/externals/vcpkg/ports/qt5-base/patches/create_cmake.patch b/externals/vcpkg/ports/qt5-base/patches/create_cmake.patch new file mode 100755 index 000000000..69bd39a2a --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/patches/create_cmake.patch @@ -0,0 +1,41 @@ +diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf +index 4aa5dad46..cee6d2882 100644 +--- a/mkspecs/features/create_cmake.prf ++++ b/mkspecs/features/create_cmake.prf +@@ -212,10 +212,10 @@ contains(CONFIG, plugin) { + CMAKE_PLUGIN_TYPE_ESCAPED = $$replace(PLUGIN_TYPE, [-/], _) + + win32 { +- !mingw|qtConfig(debug_and_release): debug_suffix="d" ++ debug_suffix="d" + + CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl + CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl + + isEmpty(CMAKE_STATIC_TYPE) { + CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.dll +@@ -295,6 +295,7 @@ CMAKE_INTERFACE_QT5_MODULE_DEPS = $$join(aux_lib_deps, ";") + equals(TEMPLATE, aux): CMAKE_FEATURE_PROPERTY_PREFIX = "INTERFACE_" + + mac { ++ CMAKE_FIND_OTHER_LIBRARY_BUILD = "true" + !isEmpty(CMAKE_STATIC_TYPE) { + CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.a + CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a +@@ -315,7 +316,7 @@ mac { + CMAKE_WINDOWS_BUILD = "true" + CMAKE_FIND_OTHER_LIBRARY_BUILD = "true" + +- !mingw|qtConfig(debug_and_release): debug_suffix="d" ++ debug_suffix="d" + + CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll + CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll +@@ -342,6 +342,7 @@ mac { + CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib + } + } else { ++ CMAKE_FIND_OTHER_LIBRARY_BUILD = "true" + !isEmpty(CMAKE_STATIC_TYPE) { + CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a + CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a diff --git a/externals/vcpkg/ports/qt5-base/patches/egl.patch b/externals/vcpkg/ports/qt5-base/patches/egl.patch new file mode 100755 index 000000000..17f0a55de --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/patches/egl.patch @@ -0,0 +1,16 @@ +diff --git a/src/gui/configure.json b/src/gui/configure.json +index 5fceb1150..7702cb261 100644 +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -220,7 +220,10 @@ + "headers": "EGL/egl.h", + "sources": [ + { "type": "pkgConfig", "args": "egl" }, +- { "type": "makeSpec", "spec": "EGL" } ++ { "type": "makeSpec", "spec": "EGL" }, ++ { "libs": "-lEGL -lGLESv2 -lGL -lANGLE -lGL -lX11 -ldl -lm -lpthread" }, ++ { "libs": "-DGL_GLES_PROTOTYPES=1 -DGL_GLEXT_PROTOTYPES -DEGL_EGL_PROTOTYPES=1 -DEGL_EGLEXT_PROTOTYPES -lEGL -lGLESv2 -lGL -lANGLE -lGL -lX11 -ldl -lm -lpthread" }, ++ { "libs": "-DANGLE_EXPORT -DANGLE_UTIL_EXPORT -DGL_API -DGL_APICALL -DEGLAPI -DGL_GLES_PROTOTYPES=1 -DGL_GLEXT_PROTOTYPES -DEGL_EGL_PROTOTYPES=1 -DEGL_EGLEXT_PROTOTYPES -lEGL -lGLESv2 -lGL -lANGLE -lGL -lX11 -ldl -lm -lpthread" } + ] + }, + "freetype": { diff --git a/externals/vcpkg/ports/qt5-base/patches/gui_configure.patch b/externals/vcpkg/ports/qt5-base/patches/gui_configure.patch new file mode 100755 index 000000000..7a283dc62 --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/patches/gui_configure.patch @@ -0,0 +1,29 @@ +diff --git a/src/gui/configure.json b/src/gui/configure.json +index c51e3ceee..7f7e206b6 100644 +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -239,9 +239,9 @@ + "headers": "ft2build.h", + "sources": [ + { "type": "pkgConfig", "args": "freetype2" }, +- { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" }, ++ { "type": "freetype", "libs": "-lbreakfreetypeautofind", "condition": "!config.wasm" }, + { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }, +- { "libs": "-lfreetype" } ++ { "libs": "-lbreakfreetypeautofind" } + ], + "use": [ + { "lib": "zlib", "condition": "features.system-zlib" } +@@ -262,7 +262,10 @@ + "headers": "fontconfig/fontconfig.h", + "sources": [ +- { "type": "pkgConfig", "args": "fontconfig" }, ++ { "type": "pkgConfig", "args": "breakfontconfig" }, +- { "type": "freetype", "libs": "-lfontconfig" } ++ { "type": "freetype", "libs": "-lbreakautofind" }, ++ { "libs": "-lfontconfig -lexpat" }, ++ { "libs": "-llibfontconfig -llibexpat" }, ++ "-lfontconfig" + ], + "use": "freetype" + }, diff --git a/externals/vcpkg/ports/qt5-base/patches/icu.patch b/externals/vcpkg/ports/qt5-base/patches/icu.patch new file mode 100755 index 000000000..16c13b0c3 --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/patches/icu.patch @@ -0,0 +1,24 @@ +diff --git a/src/corelib/configure.json b/src/corelib/configure.json +index de8d26a12..068b80c51 100644 +--- a/src/corelib/configure.json ++++ b/src/corelib/configure.json +@@ -106,13 +106,17 @@ + "headers": [ "unicode/utypes.h", "unicode/ucol.h", "unicode/ustring.h" ], + "sources": [ + { ++ "libs": "", + "builds": { +- "debug": "-lsicuind -lsicuucd -lsicudtd", +- "release": "-lsicuin -lsicuuc -lsicudt" ++ "debug": "-licuind -licuucd -licudtd", ++ "release": "-licuin -licuuc -licudt" + }, + "condition": "config.win32 && !features.shared" + }, ++ { "libs": "-licuind -licuucd -licudtd", "condition": "config.win32 && !features.shared"}, ++ { "libs": "-licuin -licuuc -licudt", "condition": "config.win32 && !features.shared"}, + { "libs": "-licuin -licuuc -licudt", "condition": "config.win32 && features.shared" }, ++ { "libs": "-licuind -licuucd -licudtd", "condition": "config.win32 && features.shared" }, + { "libs": "-licui18n -licuuc -licudata", "condition": "!config.win32" } + ], + "use": [ diff --git a/externals/vcpkg/ports/qt5-base/patches/limits_include.patch b/externals/vcpkg/ports/qt5-base/patches/limits_include.patch new file mode 100755 index 000000000..4fe495281 --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/patches/limits_include.patch @@ -0,0 +1,13 @@ +diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h +index 0eedfc1d20..f5f9bef7b8 100644 +--- a/src/corelib/text/qbytearraymatcher.h ++++ b/src/corelib/text/qbytearraymatcher.h +@@ -42,6 +42,8 @@ + + #include + ++#include ++ + QT_BEGIN_NAMESPACE + + diff --git a/externals/vcpkg/ports/qt5-base/patches/mysql-configure.patch b/externals/vcpkg/ports/qt5-base/patches/mysql-configure.patch new file mode 100755 index 000000000..1ec06734e --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/patches/mysql-configure.patch @@ -0,0 +1,11 @@ +--- a/src/plugins/sqldrivers/configure.json ++++ b/src/plugins/sqldrivers/configure.json +@@ -65,7 +65,7 @@ + ], + "main": "mysql_get_client_version();" + }, +- "headers": "mysql.h", ++ "headers": "mysql/mysql.h", + "sources": [ + { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": true }, + { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true }, diff --git a/externals/vcpkg/ports/qt5-base/patches/mysql_plugin_include.patch b/externals/vcpkg/ports/qt5-base/patches/mysql_plugin_include.patch new file mode 100755 index 000000000..a66300d2c --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/patches/mysql_plugin_include.patch @@ -0,0 +1,11 @@ +--- a/src/plugins/sqldrivers/mysql/qsql_mysql_p.h ++++ b/src/plugins/sqldrivers/mysql/qsql_mysql_p.h +@@ -57,7 +57,7 @@ + #include + #endif + +-#include ++#include + + #ifdef QT_PLUGIN + #define Q_EXPORT_SQLDRIVER_MYSQL diff --git a/externals/vcpkg/ports/qt5-base/patches/qt_app.patch b/externals/vcpkg/ports/qt5-base/patches/qt_app.patch new file mode 100755 index 000000000..e04446bf2 --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/patches/qt_app.patch @@ -0,0 +1,17 @@ +diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf +index 8354f30e..8f24b72e 100644 +--- a/mkspecs/features/qt_app.prf ++++ b/mkspecs/features/qt_app.prf +@@ -27,10 +27,11 @@ host_build:force_bootstrap { + QT -= core core-private xml + QT += bootstrap-private + } + target.path = $$[QT_HOST_BINS] ++ CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable + } else { + !build_pass:qtConfig(debug_and_release): CONFIG += release +- target.path = $$[QT_INSTALL_BINS] ++ target.path = $$[QT_HOST_BINS] + CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable + } + INSTALLS += target diff --git a/externals/vcpkg/ports/qt5-base/patches/static_opengl.patch b/externals/vcpkg/ports/qt5-base/patches/static_opengl.patch new file mode 100755 index 000000000..51818b8b7 --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/patches/static_opengl.patch @@ -0,0 +1,62 @@ +diff --git a/mkspecs/features/win32/opengl.prf b/mkspecs/features/win32/opengl.prf +index f21848f94..202c49688 100644 +--- a/mkspecs/features/win32/opengl.prf ++++ b/mkspecs/features/win32/opengl.prf +@@ -30,7 +30,7 @@ qtConfig(opengles2) { + LIBS += $$QMAKE_LIBS_OPENGL_ES2 + QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES2_RELEASE + } +- qtConfig(static): DEFINES += GL_APICALL= EGLAPI= ++ qtConfig(static): DEFINES += _GDI32_ GL_APICALL= EGLAPI= ANGLE_EXPORT= ANGLE_PLATFORM_EXPORT= + } else { + !qtConfig(dynamicgl) { + QMAKE_LIBS += $$QMAKE_LIBS_OPENGL +diff --git a/src/angle/src/common/gles_common.pri b/src/angle/src/common/gles_common.pri +index 70b65dd4c..1dcc96af5 100644 +--- a/src/angle/src/common/gles_common.pri ++++ b/src/angle/src/common/gles_common.pri +@@ -23,7 +23,8 @@ for(libname, STATICLIBS) { + PRE_TARGETDEPS += $$staticlib + } + +-DEFINES += LIBANGLE_IMPLEMENTATION LIBGLESV2_IMPLEMENTATION GL_APICALL= GL_GLEXT_PROTOTYPES= EGLAPI= ++!qtConfig(static): DEFINES += LIBANGLE_IMPLEMENTATION LIBGLESV2_IMPLEMENTATION ++qtConfig(static): DEFINES += GL_APICALL= EGLAPI= ANGLE_EXPORT= ANGLE_PLATFORM_EXPORT= + !winrt: DEFINES += ANGLE_ENABLE_D3D9 ANGLE_SKIP_DXGI_1_2_CHECK + + QT_FOR_CONFIG += gui-private +diff --git a/src/3rdparty/angle/include/platform/Platform.h b/src/3rdparty/angle/include/platform/Platform.h +index aa1221a86..a49ee4f6d 100644 +--- a/src/3rdparty/angle/include/platform/Platform.h ++++ b/src/3rdparty/angle/include/platform/Platform.h +@@ -12,7 +12,7 @@ + #include + #include + +-#if defined(_WIN32) ++#if defined(_WIN32) && !defined(ANGLE_PLATFORM_EXPORT) + # if !defined(LIBANGLE_IMPLEMENTATION) + # define ANGLE_PLATFORM_EXPORT __declspec(dllimport) + # else +diff --git a/src/3rdparty/angle/src/libGLESv2/entry_points_gles_2_0_ext.cpp b/src/3rdparty/angle/src/libGLESv2/entry_points_gles_2_0_ext.cpp +index d4459ec28..d1416041e 100644 +--- a/src/3rdparty/angle/src/libGLESv2/entry_points_gles_2_0_ext.cpp ++++ b/src/3rdparty/angle/src/libGLESv2/entry_points_gles_2_0_ext.cpp +@@ -3505,7 +3505,7 @@ ANGLE_EXPORT void GL_APIENTRY GetQueryObjectui64vRobustANGLE(GLuint id, + } + } + +-GL_APICALL void GL_APIENTRY FramebufferTextureMultiviewLayeredANGLE(GLenum target, ++ANGLE_EXPORT void GL_APIENTRY FramebufferTextureMultiviewLayeredANGLE(GLenum target, + GLenum attachment, + GLuint texture, + GLint level, +@@ -3530,7 +3530,7 @@ GL_APICALL void GL_APIENTRY FramebufferTextureMultiviewLayeredANGLE(GLenum targe + } + } + +-GL_APICALL void GL_APIENTRY FramebufferTextureMultiviewSideBySideANGLE(GLenum target, ++ANGLE_EXPORT void GL_APIENTRY FramebufferTextureMultiviewSideBySideANGLE(GLenum target, + GLenum attachment, + GLuint texture, + GLint level, diff --git a/externals/vcpkg/ports/qt5-base/patches/windows_prf.patch b/externals/vcpkg/ports/qt5-base/patches/windows_prf.patch new file mode 100755 index 000000000..6051daae8 --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/patches/windows_prf.patch @@ -0,0 +1,13 @@ +diff --git a/mkspecs/features/win32/windows.prf b/mkspecs/features/win32/windows.prf +index 272170d4..70b8ea2e 100644 +--- a/mkspecs/features/win32/windows.prf ++++ b/mkspecs/features/win32/windows.prf +@@ -6,7 +6,7 @@ contains(TEMPLATE, ".*app") { + + qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) { + isEqual(entryLib, -lqtmain) { +- lib = $$QT.core.libs/$${QMAKE_PREFIX_STATICLIB}qtmain$$QT_LIBINFIX$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB ++ lib = $$QT.core.libs/manual-link/$${QMAKE_PREFIX_STATICLIB}qtmain$$QT_LIBINFIX$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB + PRE_TARGETDEPS += $$lib + QMAKE_LIBS += $$lib + } else { diff --git a/externals/vcpkg/ports/qt5-base/patches/winmain_pro.patch b/externals/vcpkg/ports/qt5-base/patches/winmain_pro.patch new file mode 100755 index 000000000..66460ccd6 --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/patches/winmain_pro.patch @@ -0,0 +1,27 @@ +diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro +index 9cb6ab0c..52c7876e 100644 +--- a/src/winmain/winmain.pro ++++ b/src/winmain/winmain.pro +@@ -3,7 +3,7 @@ + + TEMPLATE = lib + TARGET = qtmain +-DESTDIR = $$QT.core.libs ++DESTDIR = $$QT.core.libs/manual-link + + CONFIG += static + QT = core +@@ -27,7 +27,12 @@ winrt { + } + + load(qt_installs) +- ++!qt_no_install_library { ++ host_build: \ ++ target.path = $$[QT_HOST_LIBS]/manual-link ++ else: \ ++ target.path = $$[QT_INSTALL_LIBS]/manual-link ++} + TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end + + load(qt_targets) diff --git a/externals/vcpkg/ports/qt5-base/patches/xlib.patch b/externals/vcpkg/ports/qt5-base/patches/xlib.patch new file mode 100755 index 000000000..07cba5b82 --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/patches/xlib.patch @@ -0,0 +1,39 @@ +diff --git a/src/gui/configure.json b/src/gui/configure.json +index 9a749516b..242f47504 100644 +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -568,7 +568,9 @@ + }, + "headers": "X11/Xlib.h", + "sources": [ +- { "type": "makeSpec", "spec": "X11" } ++ { "type": "makeSpec", "spec": "X11" }, ++ { "type": "pkgConfig", "args": "x11" }, ++ { "type": "pkgConfig", "args": "x11 --static" } + ] + }, + "x11sm": { +@@ -590,6 +592,7 @@ + "headers": "xcb/xcb.h", + "sources": [ + { "type": "pkgConfig", "args": "xcb >= 1.11" }, ++ { "type": "pkgConfig", "args": "xcb >= 1.11 --static" }, + "-lxcb" + ] + }, +@@ -691,6 +694,7 @@ + "headers": "X11/Xlib-xcb.h", + "sources": [ + { "type": "pkgConfig", "args": "x11-xcb" }, ++ { "type": "pkgConfig", "args": "x11-xcb --static" }, + "-lX11-xcb" + ], + "use": "xcb xlib" +@@ -711,6 +715,7 @@ + "headers": "xcb/xkb.h", + "sources": [ + { "type": "pkgConfig", "args": "xcb-xkb" }, ++ { "type": "pkgConfig", "args": "xcb-xkb --static" }, + "-lxcb-xkb" + ], + "use": "xcb" diff --git a/externals/vcpkg/ports/qt5-base/portfile.cmake b/externals/vcpkg/ports/qt5-base/portfile.cmake new file mode 100755 index 000000000..2dff4f2ce --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/portfile.cmake @@ -0,0 +1,511 @@ +vcpkg_buildpath_length_warning(37) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(QT_OPENSSL_LINK_DEFAULT ON) +else() + set(QT_OPENSSL_LINK_DEFAULT OFF) +endif() +option(QT_OPENSSL_LINK "Link against OpenSSL at compile-time." ${QT_OPENSSL_LINK_DEFAULT}) + +if (VCPKG_TARGET_IS_LINUX) + message(WARNING "qt5-base currently requires some packages from the system package manager, see https://doc.qt.io/qt-5/linux-requirements.html") + message(WARNING +[[ +qt5-base for qt5-x11extras requires several libraries from the system package manager. Please refer to + https://github.com/microsoft/vcpkg/blob/master/scripts/azure-pipelines/linux/provision-image.sh + for a complete list of them. +]] + ) +endif() + +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake) + +set(WITH_PGSQL_PLUGIN OFF) +if("postgresqlplugin" IN_LIST FEATURES) + set(WITH_PGSQL_PLUGIN ON) +endif() + +set(WITH_MYSQL_PLUGIN OFF) +if ("mysqlplugin" IN_LIST FEATURES) + set(WITH_MYSQL_PLUGIN ON) +endif() +if(WITH_MYSQL_PLUGIN AND NOT VCPKG_TARGET_IS_WINDOWS) + message(WARNING "${PORT} is currently not setup to support feature 'mysqlplugin' on platforms other than windows. Feel free to open up a PR to fix it!") +endif() + +include(qt_port_functions) +include(configure_qt) +include(install_qt) + + +######################### +## Find Host and Target mkspec name for configure +include(find_qt_mkspec) +find_qt_mkspec(TARGET_MKSPEC HOST_MKSPEC HOST_TOOLS) +set(QT_PLATFORM_CONFIGURE_OPTIONS TARGET_PLATFORM ${TARGET_MKSPEC}) +if(DEFINED HOST_MKSPEC) + list(APPEND QT_PLATFORM_CONFIGURE_OPTIONS HOST_PLATFORM ${HOST_MKSPEC}) +endif() +if(DEFINED HOST_TOOLS) + list(APPEND QT_PLATFORM_CONFIGURE_OPTIONS HOST_TOOLS_ROOT ${HOST_TOOLS}) +endif() + +######################### +## Downloading Qt5-Base + +qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH + PATCHES + patches/winmain_pro.patch #Moves qtmain to manual-link + patches/windows_prf.patch #fixes the qtmain dependency due to the above move + patches/qt_app.patch #Moves the target location of qt5 host apps to always install into the host dir. + patches/gui_configure.patch #Patches the gui configure.json to break freetype/fontconfig autodetection because it does not include its dependencies. + patches/icu.patch #Help configure find static icu builds in vcpkg on windows + patches/xlib.patch #Patches Xlib check to actually use Pkgconfig instead of makeSpec only + patches/egl.patch #Fix egl detection logic. + patches/mysql_plugin_include.patch #Fix include path of mysql plugin + patches/mysql-configure.patch #Fix mysql project + patches/cocoa.patch #Fix missing include on macOS Monterrey, https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/cocoa?id=dece6f5840463ae2ddf927d65eb1b3680e34a547 + #patches/static_opengl.patch #Use this patch if you really want to statically link angle on windows (e.g. using -opengl es2 and -static). + #Be carefull since it requires definining _GDI32_ for all dependent projects due to redefinition errors in the + #the windows supplied gl.h header and the angle gl.h otherwise. + # CMake fixes + patches/Qt5BasicConfig.patch + patches/Qt5PluginTarget.patch + patches/create_cmake.patch + patches/Qt5GuiConfigExtras.patch # Patches the library search behavior for EGL since angle is not build with Qt + patches/limits_include.patch # Add missing includes to build with gcc 11 + ) + +# Remove vendored dependencies to ensure they are not picked up by the build +foreach(DEPENDENCY zlib freetype harfbuzz-ng libjpeg libpng double-conversion sqlite pcre2) + if(EXISTS ${SOURCE_PATH}/src/3rdparty/${DEPENDENCY}) + file(REMOVE_RECURSE ${SOURCE_PATH}/src/3rdparty/${DEPENDENCY}) + endif() +endforeach() +#file(REMOVE_RECURSE ${SOURCE_PATH}/include/QtZlib) + +######################### +## Setup Configure options + +# This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings +set(ENV{_CL_} "/utf-8") + +set(CORE_OPTIONS + -confirm-license + -opensource + #-simulator_and_device + #-ltcg + #-combined-angle-lib + # ENV ANGLE_DIR to external angle source dir. (Will always be compiled with Qt) + #-optimized-tools + #-force-debug-info + -verbose +) + +## 3rd Party Libs +list(APPEND CORE_OPTIONS + -system-zlib + -system-libjpeg + -system-libpng + -system-freetype + -system-pcre + -system-doubleconversion + -system-sqlite + -system-harfbuzz + -icu + -no-angle # Qt does not need to build angle. VCPKG will build angle! + -no-glib + ) + +if(QT_OPENSSL_LINK) + list(APPEND CORE_OPTIONS -openssl-linked) +endif() + +if(WITH_PGSQL_PLUGIN) + list(APPEND CORE_OPTIONS -sql-psql) +else() + list(APPEND CORE_OPTIONS -no-sql-psql) +endif() +if(WITH_MYSQL_PLUGIN) + list(APPEND CORE_OPTIONS -sql-mysql) +else() + list(APPEND CORE_OPTIONS -no-sql-mysql) +endif() + +if ("vulkan" IN_LIST FEATURES) + list(APPEND CORE_OPTIONS --vulkan=yes) +else() + list(APPEND CORE_OPTIONS --vulkan=no) +endif() + +find_library(ZLIB_RELEASE NAMES z zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ZLIB_DEBUG NAMES z zlib zd zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(JPEG_RELEASE NAMES jpeg jpeg-static PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(JPEG_DEBUG NAMES jpeg jpeg-static jpegd jpeg-staticd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(LIBPNG_RELEASE NAMES png16 libpng16 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) #Depends on zlib +find_library(LIBPNG_DEBUG NAMES png16 png16d libpng16 libpng16d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(PSQL_RELEASE NAMES pq libpq PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # Depends on openssl and zlib(linux) +find_library(PSQL_DEBUG NAMES pq libpq pqd libpqd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + +if(NOT (PSQL_RELEASE MATCHES ".*\.so") AND NOT (PSQL_DEBUG MATCHES ".*\.so")) + find_library(PSQL_COMMON_RELEASE NAMES pgcommon libpgcommon PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # Depends on openssl and zlib(linux) + find_library(PSQL_COMMON_DEBUG NAMES pgcommon libpgcommon pgcommond libpgcommond PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(PSQL_PORT_RELEASE NAMES pgport libpgport PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # Depends on openssl and zlib(linux) + find_library(PSQL_PORT_DEBUG NAMES pgport libpgport pgportd libpgportd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +endif() +find_library(MYSQL_RELEASE NAMES libmysql mysqlclient PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # Depends on openssl and zlib(linux) +find_library(MYSQL_DEBUG NAMES libmysql libmysqld mysqlclient mysqlclientd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + +find_library(PCRE2_RELEASE NAMES pcre2-16 pcre2-16-static PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(PCRE2_DEBUG NAMES pcre2-16 pcre2-16-static pcre2-16d pcre2-16-staticd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(FREETYPE_RELEASE NAMES freetype PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) #zlib, bzip2, libpng +find_library(FREETYPE_DEBUG NAMES freetype freetyped PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(DOUBLECONVERSION_RELEASE NAMES double-conversion PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(DOUBLECONVERSION_DEBUG NAMES double-conversion PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(HARFBUZZ_RELEASE NAMES harfbuzz PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(HARFBUZZ_DEBUG NAMES harfbuzz PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(SQLITE_RELEASE NAMES sqlite3 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # Depends on openssl and zlib(linux) +find_library(SQLITE_DEBUG NAMES sqlite3 sqlite3d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + +find_library(BROTLI_COMMON_RELEASE NAMES brotlicommon brotlicommon-static PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(BROTLI_COMMON_DEBUG NAMES brotlicommon brotlicommon-static brotlicommond brotlicommon-staticd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(BROTLI_DEC_RELEASE NAMES brotlidec brotlidec-static PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(BROTLI_DEC_DEBUG NAMES brotlidec brotlidec-static brotlidecd brotlidec-staticd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + +find_library(ICUUC_RELEASE NAMES icuuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ICUUC_DEBUG NAMES icuucd libicuucd icuuc libicuuc PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(ICUTU_RELEASE NAMES icutu libicutu PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ICUTU_DEBUG NAMES icutud libicutud icutu libicutu PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + +# Was installed in WSL but not on CI machine +# find_library(ICULX_RELEASE NAMES iculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +# find_library(ICULX_DEBUG NAMES iculxd libiculxd iculx libiculx PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + +find_library(ICUIO_RELEASE NAMES icuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ICUIO_DEBUG NAMES icuiod libicuiod icuio libicuio PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(ICUIN_RELEASE NAMES icui18n libicui18n icuin PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ICUIN_DEBUG NAMES icui18nd libicui18nd icui18n libicui18n icuin icuind PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(ICUDATA_RELEASE NAMES icudata libicudata icudt PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ICUDATA_DEBUG NAMES icudatad libicudatad icudata libicudata icudtd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +set(ICU_RELEASE "${ICUIN_RELEASE} ${ICUTU_RELEASE} ${ICULX_RELEASE} ${ICUUC_RELEASE} ${ICUIO_RELEASE} ${ICUDATA_RELEASE}") +set(ICU_DEBUG "${ICUIN_DEBUG} ${ICUTU_DEBUG} ${ICULX_DEBUG} ${ICUUC_DEBUG} ${ICUIO_DEBUG} ${ICUDATA_DEBUG}") +if(VCPKG_TARGET_IS_WINDOWS) + set(ICU_RELEASE "${ICU_RELEASE} Advapi32.lib") + set(ICU_DEBUG "${ICU_DEBUG} Advapi32.lib" ) +endif() + +find_library(FONTCONFIG_RELEASE NAMES fontconfig PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(FONTCONFIG_DEBUG NAMES fontconfig PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(EXPAT_RELEASE NAMES expat PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(EXPAT_DEBUG NAMES expat PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + +#Dependent libraries +find_library(ZSTD_RELEASE NAMES zstd PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ZSTD_DEBUG NAMES zstd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(BZ2_RELEASE bz2 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(BZ2_DEBUG bz2 bz2d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(SSL_RELEASE ssl ssleay32 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(SSL_DEBUG ssl ssleay32 ssld ssleay32d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(EAY_RELEASE libeay32 crypto libcrypto PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(EAY_DEBUG libeay32 crypto libcrypto libeay32d cryptod libcryptod PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + +set(FREETYPE_RELEASE_ALL "${FREETYPE_RELEASE} ${BZ2_RELEASE} ${LIBPNG_RELEASE} ${ZLIB_RELEASE} ${BROTLI_DEC_RELEASE} ${BROTLI_COMMON_RELEASE}") +set(FREETYPE_DEBUG_ALL "${FREETYPE_DEBUG} ${BZ2_DEBUG} ${LIBPNG_DEBUG} ${ZLIB_DEBUG} ${BROTLI_DEC_DEBUG} ${BROTLI_COMMON_DEBUG}") + +# If HarfBuzz is built with GLib enabled, it must be statically link +x_vcpkg_pkgconfig_get_modules(PREFIX harfbuzz MODULES harfbuzz LIBRARIES) + +set(RELEASE_OPTIONS + "LIBJPEG_LIBS=${JPEG_RELEASE}" + "ZLIB_LIBS=${ZLIB_RELEASE}" + "LIBPNG_LIBS=${LIBPNG_RELEASE} ${ZLIB_RELEASE}" + "PCRE2_LIBS=${PCRE2_RELEASE}" + "FREETYPE_LIBS=${FREETYPE_RELEASE_ALL}" + "ICU_LIBS=${ICU_RELEASE}" + "QMAKE_LIBS_PRIVATE+=${BZ2_RELEASE}" + "QMAKE_LIBS_PRIVATE+=${LIBPNG_RELEASE}" + "QMAKE_LIBS_PRIVATE+=${ICU_RELEASE}" + "QMAKE_LIBS_PRIVATE+=${ZSTD_RELEASE}" + ) +set(DEBUG_OPTIONS + "LIBJPEG_LIBS=${JPEG_DEBUG}" + "ZLIB_LIBS=${ZLIB_DEBUG}" + "LIBPNG_LIBS=${LIBPNG_DEBUG} ${ZLIB_DEBUG}" + "PCRE2_LIBS=${PCRE2_DEBUG}" + "FREETYPE_LIBS=${FREETYPE_DEBUG_ALL}" + "ICU_LIBS=${ICU_DEBUG}" + "QMAKE_LIBS_PRIVATE+=${BZ2_DEBUG}" + "QMAKE_LIBS_PRIVATE+=${LIBPNG_DEBUG}" + "QMAKE_LIBS_PRIVATE+=${ICU_DEBUG}" + "QMAKE_LIBS_PRIVATE+=${ZSTD_DEBUG}" + ) + +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_IS_UWP) + list(APPEND CORE_OPTIONS -appstore-compliant) + endif() + if(NOT ${VCPKG_LIBRARY_LINKAGE} STREQUAL "static") + list(APPEND CORE_OPTIONS -opengl dynamic) # other options are "-no-opengl", "-opengl angle", and "-opengl desktop" and "-opengel es2" + else() + list(APPEND CORE_OPTIONS -opengl dynamic) # other possible option without moving angle dlls: "-opengl desktop". "-opengel es2" only works with commented patch + endif() + list(APPEND RELEASE_OPTIONS + "SQLITE_LIBS=${SQLITE_RELEASE}" + "HARFBUZZ_LIBS=${harfbuzz_LIBRARIES_RELEASE}" + "OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib" + ) + + list(APPEND DEBUG_OPTIONS + "SQLITE_LIBS=${SQLITE_DEBUG}" + "HARFBUZZ_LIBS=${harfbuzz_LIBRARIES_DEBUG}" + "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib" + ) + if(WITH_PGSQL_PLUGIN) + list(APPEND RELEASE_OPTIONS "PSQL_LIBS=${PSQL_RELEASE} ${PSQL_PORT_RELEASE} ${PSQL_COMMON_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib") + list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${PSQL_PORT_DEBUG} ${PSQL_COMMON_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib") + endif() + if (WITH_MYSQL_PLUGIN) + list(APPEND RELEASE_OPTIONS "MYSQL_LIBS=${MYSQL_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} ${ZLIB_RELEASE} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib") + list(APPEND DEBUG_OPTIONS "MYSQL_LIBS=${MYSQL_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} ${ZLIB_DEBUG} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib") + endif(WITH_MYSQL_PLUGIN) + +elseif(VCPKG_TARGET_IS_LINUX) + list(APPEND CORE_OPTIONS -fontconfig -xcb-xlib -xcb -linuxfb) + if (NOT EXISTS "/usr/include/GL/glu.h") + message(FATAL_ERROR "qt5 requires libgl1-mesa-dev and libglu1-mesa-dev, please use your distribution's package manager to install them.\nExample: \"apt-get install libgl1-mesa-dev libglu1-mesa-dev\"") + endif() + list(APPEND RELEASE_OPTIONS + "SQLITE_LIBS=${SQLITE_RELEASE} -ldl -lpthread" + "HARFBUZZ_LIBS=${harfbuzz_LIBRARIES_RELEASE}" + "OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread" + "FONTCONFIG_LIBS=${FONTCONFIG_RELEASE} ${FREETYPE_RELEASE} ${EXPAT_RELEASE} -luuid" + ) + list(APPEND DEBUG_OPTIONS + "SQLITE_LIBS=${SQLITE_DEBUG} -ldl -lpthread" + "HARFBUZZ_LIBS=${harfbuzz_LIBRARIES_DEBUG}" + "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" + "FONTCONFIG_LIBS=${FONTCONFIG_DEBUG} ${FREETYPE_DEBUG} ${EXPAT_DEBUG} -luuid" + ) + if(WITH_PGSQL_PLUGIN) + list(APPEND RELEASE_OPTIONS "PSQL_LIBS=${PSQL_RELEASE} ${PSQL_PORT_RELEASE} ${PSQL_TYPES_RELEASE} ${PSQL_COMMON_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread") + list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${PSQL_PORT_DEBUG} ${PSQL_TYPES_DEBUG} ${PSQL_COMMON_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread") + endif() +elseif(VCPKG_TARGET_IS_OSX) + list(APPEND CORE_OPTIONS -fontconfig) + if("${VCPKG_TARGET_ARCHITECTURE}" MATCHES "arm64") + FILE(READ "${SOURCE_PATH}/mkspecs/common/macx.conf" _tmp_contents) + string(REPLACE "QMAKE_APPLE_DEVICE_ARCHS = x86_64" "QMAKE_APPLE_DEVICE_ARCHS = arm64" _tmp_contents ${_tmp_contents}) + FILE(WRITE "${SOURCE_PATH}/mkspecs/common/macx.conf" ${_tmp_contents}) + endif() + if(DEFINED VCPKG_OSX_DEPLOYMENT_TARGET) + set(ENV{QMAKE_MACOSX_DEPLOYMENT_TARGET} ${VCPKG_OSX_DEPLOYMENT_TARGET}) + else() + execute_process(COMMAND xcrun --show-sdk-version + OUTPUT_FILE OSX_SDK_VER.txt + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}) + FILE(STRINGS "${CURRENT_BUILDTREES_DIR}/OSX_SDK_VER.txt" OSX_SDK_VERSION REGEX "^[0-9][0-9]\.[0-9][0-9]*") + message(STATUS "Detected OSX SDK Version: ${OSX_SDK_VERSION}") + string(REGEX MATCH "^[0-9][0-9]\.[0-9][0-9]*" OSX_SDK_VERSION ${OSX_SDK_VERSION}) + message(STATUS "Major.Minor OSX SDK Version: ${OSX_SDK_VERSION}") + + execute_process(COMMAND sw_vers -productVersion + OUTPUT_FILE OSX_SYS_VER.txt + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}) + FILE(STRINGS "${CURRENT_BUILDTREES_DIR}/OSX_SYS_VER.txt" VCPKG_OSX_DEPLOYMENT_TARGET REGEX "^[0-9][0-9]\.[0-9][0-9]*") + message(STATUS "Detected OSX system Version: ${VCPKG_OSX_DEPLOYMENT_TARGET}") + string(REGEX MATCH "^[0-9][0-9]\.[0-9][0-9]*" VCPKG_OSX_DEPLOYMENT_TARGET ${VCPKG_OSX_DEPLOYMENT_TARGET}) + message(STATUS "Major.Minor OSX system Version: ${VCPKG_OSX_DEPLOYMENT_TARGET}") + + set(ENV{QMAKE_MACOSX_DEPLOYMENT_TARGET} ${VCPKG_OSX_DEPLOYMENT_TARGET}) + if(${VCPKG_OSX_DEPLOYMENT_TARGET} GREATER "10.15") # Max Version supported by QT. This version is defined in mkspecs/common/macx.conf as QT_MAC_SDK_VERSION_MAX + message(STATUS "Qt ${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER} only support OSX_DEPLOYMENT_TARGET up to 10.15") + set(VCPKG_OSX_DEPLOYMENT_TARGET "10.15") + endif() + set(ENV{QMAKE_MACOSX_DEPLOYMENT_TARGET} ${VCPKG_OSX_DEPLOYMENT_TARGET}) + message(STATUS "Enviromnent OSX SDK Version: $ENV{QMAKE_MACOSX_DEPLOYMENT_TARGET}") + FILE(READ "${SOURCE_PATH}/mkspecs/common/macx.conf" _tmp_contents) + string(REPLACE "QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13" "QMAKE_MACOSX_DEPLOYMENT_TARGET = ${VCPKG_OSX_DEPLOYMENT_TARGET}" _tmp_contents ${_tmp_contents}) + FILE(WRITE "${SOURCE_PATH}/mkspecs/common/macx.conf" ${_tmp_contents}) + endif() + #list(APPEND QT_PLATFORM_CONFIGURE_OPTIONS HOST_PLATFORM ${TARGET_MKSPEC}) + list(APPEND RELEASE_OPTIONS + "SQLITE_LIBS=${SQLITE_RELEASE} -ldl -lpthread" + "HARFBUZZ_LIBS=${harfbuzz_LIBRARIES_RELEASE} -framework ApplicationServices" + "OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread" + "FONTCONFIG_LIBS=${FONTCONFIG_RELEASE} ${FREETYPE_RELEASE} ${EXPAT_RELEASE} -liconv" + ) + list(APPEND DEBUG_OPTIONS + "SQLITE_LIBS=${SQLITE_DEBUG} -ldl -lpthread" + "HARFBUZZ_LIBS=${harfbuzz_LIBRARIES_DEBUG} -framework ApplicationServices" + "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread" + "FONTCONFIG_LIBS=${FONTCONFIG_DEBUG} ${FREETYPE_DEBUG} ${EXPAT_DEBUG} -liconv" + ) + + if(WITH_PGSQL_PLUGIN) + list(APPEND RELEASE_OPTIONS "PSQL_LIBS=${PSQL_RELEASE} ${PSQL_PORT_RELEASE} ${PSQL_TYPES_RELEASE} ${PSQL_COMMON_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread") + list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${PSQL_PORT_DEBUG} ${PSQL_TYPES_DEBUG} ${PSQL_COMMON_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread") + endif() +endif() + +## Do not build tests or examples +list(APPEND CORE_OPTIONS + -nomake examples + -nomake tests) + +if(QT_UPDATE_VERSION) + SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + configure_qt( + SOURCE_PATH ${SOURCE_PATH} + ${QT_PLATFORM_CONFIGURE_OPTIONS} + OPTIONS ${CORE_OPTIONS} + OPTIONS_RELEASE ${RELEASE_OPTIONS} + OPTIONS_DEBUG ${DEBUG_OPTIONS} + ) + install_qt() + + ######################### + #TODO: Make this a function since it is also done by modular scripts! + # e.g. by patching mkspecs/features/qt_tools.prf somehow + file(GLOB_RECURSE PRL_FILES "${CURRENT_PACKAGES_DIR}/lib/*.prl" "${CURRENT_PACKAGES_DIR}/tools/qt5/lib/*.prl" "${CURRENT_PACKAGES_DIR}/tools/qt5/mkspecs/*.pri" + "${CURRENT_PACKAGES_DIR}/debug/lib/*.prl" "${CURRENT_PACKAGES_DIR}/tools/qt5/debug/lib/*.prl" "${CURRENT_PACKAGES_DIR}/tools/qt5/debug/mkspecs/*.pri") + + file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}/include" CMAKE_INCLUDE_PATH) + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + qt_fix_prl("${CURRENT_INSTALLED_DIR}" "${PRL_FILES}") + file(COPY ${CMAKE_CURRENT_LIST_DIR}/qtdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/plugins) + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + qt_fix_prl("${CURRENT_INSTALLED_DIR}/debug" "${PRL_FILES}") + file(COPY ${CMAKE_CURRENT_LIST_DIR}/qtdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/plugins) + endif() + + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake ${CURRENT_PACKAGES_DIR}/share/cmake) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) # TODO: check if important debug information for cmake is lost + + #This needs a new VCPKG policy or a static angle build (ANGLE needs to be fixed in VCPKG!) + if(VCPKG_TARGET_IS_WINDOWS AND ${VCPKG_LIBRARY_LINKAGE} MATCHES "static") # Move angle dll libraries + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin") + message(STATUS "Moving ANGLE dlls from /bin to /tools/qt5-angle/bin. In static builds dlls are not allowed in /bin") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/qt5-angle) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/qt5-angle/bin) + if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/bin) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/qt5-angle/debug) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/tools/qt5-angle/debug/bin) + endif() + endif() + endif() + + ## Fix location of qtmain(d).lib. Has been moved into manual-link. Add debug version + set(cmakefile "${CURRENT_PACKAGES_DIR}/share/cmake/Qt5Core/Qt5CoreConfigExtras.cmake") + file(READ "${cmakefile}" _contents) + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_BUILD_TYPE) + string(REPLACE "set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)" "set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE DEBUG)" _contents "${_contents}") + string(REPLACE + [[set(imported_location "${_qt5Core_install_prefix}/lib/qtmain.lib")]] + [[set(imported_location_release "${_qt5Core_install_prefix}/lib/manual-link/qtmain.lib") + set(imported_location_debug "${_qt5Core_install_prefix}/debug/lib/manual-link/qtmaind.lib")]] + _contents "${_contents}") + string(REPLACE +[[ set_target_properties(Qt5::WinMain PROPERTIES + IMPORTED_LOCATION_RELEASE ${imported_location} + )]] +[[ set_target_properties(Qt5::WinMain PROPERTIES + IMPORTED_LOCATION_RELEASE ${imported_location_release} + IMPORTED_LOCATION_DEBUG ${imported_location_debug} + )]] + _contents "${_contents}") + else() # Single configuration build (either debug or release) + # Release case + string(REPLACE + [[set(imported_location "${_qt5Core_install_prefix}/lib/qtmain.lib")]] + [[set(imported_location "${_qt5Core_install_prefix}/lib/manual-link/qtmain.lib")]] + _contents "${_contents}") + # Debug case (whichever will match) + string(REPLACE + [[set(imported_location "${_qt5Core_install_prefix}/lib/qtmaind.lib")]] + [[set(imported_location "${_qt5Core_install_prefix}/debug/lib/manual-link/qtmaind.lib")]] + _contents "${_contents}") + string(REPLACE + [[set(imported_location "${_qt5Core_install_prefix}/debug/lib/qtmaind.lib")]] + [[set(imported_location "${_qt5Core_install_prefix}/debug/lib/manual-link/qtmaind.lib")]] + _contents "${_contents}") + endif() + file(WRITE "${cmakefile}" "${_contents}") + + if(EXISTS ${CURRENT_PACKAGES_DIR}/tools/qt5/bin) + file(COPY ${CURRENT_PACKAGES_DIR}/tools/qt5/bin DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/qt5/bin) + endif() + # This should be removed if possible! (Currently debug build of qt5-translations requires it.) + if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/tools/qt5/bin) + file(COPY ${CURRENT_PACKAGES_DIR}/tools/qt5/bin DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5/debug) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/qt5/debug/bin) + endif() + + if(EXISTS ${CURRENT_PACKAGES_DIR}/tools/qt5/bin/qt.conf) + file(REMOVE "${CURRENT_PACKAGES_DIR}/tools/qt5/bin/qt.conf") + endif() + set(CURRENT_INSTALLED_DIR_BACKUP "${CURRENT_INSTALLED_DIR}") + set(CURRENT_INSTALLED_DIR "./../../.." ) # Making the qt.conf relative and not absolute + configure_file(${CURRENT_PACKAGES_DIR}/tools/qt5/qt_release.conf ${CURRENT_PACKAGES_DIR}/tools/qt5/bin/qt.conf) # This makes the tools at least useable for release + set(CURRENT_INSTALLED_DIR "${CURRENT_INSTALLED_DIR_BACKUP}") + + qt_install_copyright(${SOURCE_PATH}) +endif() +#install scripts for other qt ports +file(COPY + ${CMAKE_CURRENT_LIST_DIR}/cmake/qt_port_hashes.cmake + ${CMAKE_CURRENT_LIST_DIR}/cmake/qt_port_functions.cmake + ${CMAKE_CURRENT_LIST_DIR}/cmake/qt_fix_makefile_install.cmake + ${CMAKE_CURRENT_LIST_DIR}/cmake/qt_fix_cmake.cmake + ${CMAKE_CURRENT_LIST_DIR}/cmake/qt_fix_prl.cmake + ${CMAKE_CURRENT_LIST_DIR}/cmake/qt_download_submodule.cmake + ${CMAKE_CURRENT_LIST_DIR}/cmake/qt_build_submodule.cmake + ${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_copyright.cmake + ${CMAKE_CURRENT_LIST_DIR}/cmake/qt_submodule_installation.cmake + DESTINATION + ${CURRENT_PACKAGES_DIR}/share/qt5 +) + +# Fix Qt5GuiConfigExtras EGL path +if(VCPKG_TARGET_IS_LINUX) + set(_file "${CURRENT_PACKAGES_DIR}/share/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake") + file(READ "${_file}" _contents) + string(REGEX REPLACE "_qt5gui_find_extra_libs\\\(EGL[^\\\n]+" "_qt5gui_find_extra_libs(EGL \"EGL\" \"\" \"\${_qt5Gui_install_prefix}/include\")\n" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") +endif() + +vcpkg_fixup_pkgconfig() + +if(VCPKG_TARGET_IS_OSX) + file(GLOB _debug_files "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*_debug.pc") + foreach(_file ${_debug_files}) + string(REGEX REPLACE "_debug\\.pc$" ".pc" _new_filename "${_file}") + string(REGEX MATCH "(Qt5[a-zA-Z]+)_debug\\.pc$" _not_used "${_file}") + set(_name ${CMAKE_MATCH_1}) + file(STRINGS "${_file}" _version REGEX "^(Version):.+$") + file(WRITE "${_new_filename}" "Name: ${_name}\nDescription: Forwarding to the _debug version by vcpkg\n${_version}\nRequires: ${_name}_debug\n") + endforeach() +endif() +# #Code to get generated CMake files from CI +# file(RENAME "${CURRENT_PACKAGES_DIR}/share/cmake/Qt5Core/Qt5CoreConfig.cmake" "${CURRENT_BUILDTREES_DIR}/Qt5CoreConfig.cmake.log") +# file(GLOB_RECURSE CMAKE_GUI_FILES "${CURRENT_PACKAGES_DIR}/share/cmake/Qt5Gui/*.cmake" ) +# foreach(cmake_file ${CMAKE_GUI_FILES}) + # get_filename_component(cmake_filename "${cmake_file}" NAME) + # file(COPY "${cmake_file}" DESTINATION "${CURRENT_BUILDTREES_DIR}") + # file(RENAME "${CURRENT_BUILDTREES_DIR}/${cmake_filename}" "${CURRENT_BUILDTREES_DIR}/${cmake_filename}.log") +# endforeach() +# #Copy config.log from buildtree/triplet to buildtree to get the log in CI in case of failure +# if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config.log") + # file(RENAME "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config.log" "${CURRENT_BUILDTREES_DIR}/config-rel.log") +# endif() +# if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/config.log") + # file(RENAME "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/config.log" "${CURRENT_BUILDTREES_DIR}/config-dbg.log") +# endif() +# message(FATAL_ERROR "Need Info from CI!") diff --git a/externals/vcpkg/ports/qt5-base/qtdeploy.ps1 b/externals/vcpkg/ports/qt5-base/qtdeploy.ps1 new file mode 100755 index 000000000..4973cfc38 --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/qtdeploy.ps1 @@ -0,0 +1,104 @@ +# This script is based on the implementation of windeployqt for qt5.7.1 +# +# Qt's plugin deployment strategy is that each main Qt Module has a hardcoded +# set of plugin subdirectories. Each of these subdirectories is deployed in +# full if that Module is referenced. +# +# This hardcoded list is found inside qttools\src\windeployqt\main.cpp. For +# updating, inspect the symbols qtModuleEntries and qtModuleForPlugin. + +# Note: this function signature and behavior is depended upon by applocal.ps1 +function deployPluginsIfQt([string]$targetBinaryDir, [string]$QtPluginsDir, [string]$targetBinaryName) { + $baseDir = Split-Path $QtPluginsDir -parent + $binDir = "$baseDir\bin" + + function deployPlugins([string]$pluginSubdirName) { + if (Test-Path "$QtPluginsDir\$pluginSubdirName") { + Write-Verbose " Deploying plugins directory '$pluginSubdirName'" + New-Item "$targetBinaryDir\plugins\$pluginSubdirName" -ItemType Directory -ErrorAction SilentlyContinue | Out-Null + Get-ChildItem "$QtPluginsDir\$pluginSubdirName\*.dll" | % { + deployBinary "$targetBinaryDir\plugins\$pluginSubdirName" "$QtPluginsDir\$pluginSubdirName" $_.Name + resolve "$targetBinaryDir\plugins\$pluginSubdirName\$($_.Name)" + } + } else { + Write-Verbose " Skipping plugins directory '$pluginSubdirName': doesn't exist" + } + } + + # We detect Qt modules in use via the DLLs themselves. See qtModuleEntries in Qt to find the mapping. + if ($targetBinaryName -match "Qt5Cored?.dll") { + if (!(Test-Path "$targetBinaryDir\qt.conf")) { + "[Paths]" | Out-File -encoding ascii "$targetBinaryDir\qt.conf" + } + } elseif ($targetBinaryName -match "Qt5Guid?.dll") { + Write-Verbose " Deploying platforms" + New-Item "$targetBinaryDir\plugins\platforms" -ItemType Directory -ErrorAction SilentlyContinue | Out-Null + Get-ChildItem "$QtPluginsDir\platforms\qwindows*.dll" | % { + deployBinary "$targetBinaryDir\plugins\platforms" "$QtPluginsDir\platforms" $_.Name + } + + deployPlugins "accessible" + deployPlugins "imageformats" + deployPlugins "iconengines" + deployPlugins "platforminputcontexts" + deployPlugins "styles" + } elseif ($targetBinaryName -match "Qt5Networkd?.dll") { + deployPlugins "bearer" + if (Test-Path "$binDir\libcrypto-1_1-x64.dll") + { + deployBinary "$targetBinaryDir" "$binDir" "libcrypto-1_1-x64.dll" + deployBinary "$targetBinaryDir" "$binDir" "libssl-1_1-x64.dll" + } + if (Test-Path "$binDir\libcrypto-1_1.dll") + { + deployBinary "$targetBinaryDir" "$binDir" "libcrypto-1_1.dll" + deployBinary "$targetBinaryDir" "$binDir" "libssl-1_1.dll" + } + } elseif ($targetBinaryName -match "Qt5Sqld?.dll") { + deployPlugins "sqldrivers" + } elseif ($targetBinaryName -match "Qt5Multimediad?.dll") { + deployPlugins "audio" + deployPlugins "mediaservice" + deployPlugins "playlistformats" + } elseif ($targetBinaryName -match "Qt5PrintSupportd?.dll") { + deployPlugins "printsupport" + } elseif ($targetBinaryName -match "Qt5Qmld?.dll") { + if(!(Test-Path "$targetBinaryDir\qml")) + { + if (Test-Path "$binDir\..\qml") { + cp -r "$binDir\..\qml" $targetBinaryDir + } elseif (Test-Path "$binDir\..\..\qml") { + cp -r "$binDir\..\..\qml" $targetBinaryDir + } else { + throw "FAILED" + } + } + } elseif ($targetBinaryName -match "Qt5Quickd?.dll") { + foreach ($a in @("Qt5QuickControls2", "Qt5QuickControls2d", "Qt5QuickShapes", "Qt5QuickShapesd", "Qt5QuickTemplates2", "Qt5QuickTemplates2d", "Qt5QmlWorkerScript", "Qt5QmlWorkerScriptd", "Qt5QuickParticles", "Qt5QuickParticlesd", "Qt5QuickWidgets", "Qt5QuickWidgetsd")) + { + if (Test-Path "$binDir\$a.dll") + { + deployBinary "$targetBinaryDir" "$binDir" "$a.dll" + } + } + deployPlugins "scenegraph" + deployPlugins "qmltooling" + } elseif ($targetBinaryName -like "Qt5Declarative*.dll") { + deployPlugins "qml1tooling" + } elseif ($targetBinaryName -like "Qt5Positioning*.dll") { + deployPlugins "position" + } elseif ($targetBinaryName -like "Qt5Location*.dll") { + deployPlugins "geoservices" + } elseif ($targetBinaryName -like "Qt5Sensors*.dll") { + deployPlugins "sensors" + deployPlugins "sensorgestures" + } elseif ($targetBinaryName -like "Qt5WebEngineCore*.dll") { + deployPlugins "qtwebengine" + } elseif ($targetBinaryName -like "Qt53DRenderer*.dll") { + deployPlugins "sceneparsers" + } elseif ($targetBinaryName -like "Qt5TextToSpeech*.dll") { + deployPlugins "texttospeech" + } elseif ($targetBinaryName -like "Qt5SerialBus*.dll") { + deployPlugins "canbus" + } +} diff --git a/externals/vcpkg/ports/qt5-base/vcpkg.json b/externals/vcpkg/ports/qt5-base/vcpkg.json new file mode 100755 index 000000000..5334144f5 --- /dev/null +++ b/externals/vcpkg/ports/qt5-base/vcpkg.json @@ -0,0 +1,64 @@ +{ + "name": "qt5-base", + "version": "5.15.4", + "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "angle", + "platform": "!windows" + }, + "double-conversion", + "egl-registry", + { + "name": "fontconfig", + "platform": "!windows" + }, + "freetype", + "harfbuzz", + { + "name": "icu", + "platform": "!uwp" + }, + "libjpeg-turbo", + "libpng", + "openssl", + "pcre2", + { + "name": "qt5-base", + "host": true, + "default-features": false + }, + "sqlite3", + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true + }, + "zlib", + "zstd" + ], + "features": { + "latest": { + "description": "(deprecated)" + }, + "mysqlplugin": { + "description": "Build the sql plugin for connecting to mysql databases", + "dependencies": [ + "libmysql" + ] + }, + "postgresqlplugin": { + "description": "Build the sql plugin for connecting to postgresql databases", + "dependencies": [ + "libpq" + ] + }, + "vulkan": { + "description": "Enable Vulkan support in QtGui", + "dependencies": [ + "vulkan" + ] + } + } +} diff --git a/externals/vcpkg/ports/qt5-canvas3d/portfile.cmake b/externals/vcpkg/ports/qt5-canvas3d/portfile.cmake new file mode 100755 index 000000000..14a8cbdb2 --- /dev/null +++ b/externals/vcpkg/ports/qt5-canvas3d/portfile.cmake @@ -0,0 +1,4 @@ +message(FATAL_ERROR "${PORT} has been deprecated and will be removed in the future from VCPKG") +#set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +#include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +#qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-canvas3d/vcpkg.json b/externals/vcpkg/ports/qt5-canvas3d/vcpkg.json new file mode 100755 index 000000000..f26c201b8 --- /dev/null +++ b/externals/vcpkg/ports/qt5-canvas3d/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "qt5-canvas3d", + "version-string": "0", + "port-version": 1, + "description": "Qt5 Canvas 3d Module;", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/externals/vcpkg/ports/qt5-charts/portfile.cmake b/externals/vcpkg/ports/qt5-charts/portfile.cmake new file mode 100755 index 000000000..214726759 --- /dev/null +++ b/externals/vcpkg/ports/qt5-charts/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-charts/vcpkg.json b/externals/vcpkg/ports/qt5-charts/vcpkg.json new file mode 100755 index 000000000..b7535bb57 --- /dev/null +++ b/externals/vcpkg/ports/qt5-charts/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "qt5-charts", + "version": "5.15.4", + "description": "Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative", + "qt5-multimedia" + ] +} diff --git a/externals/vcpkg/ports/qt5-connectivity/portfile.cmake b/externals/vcpkg/ports/qt5-connectivity/portfile.cmake new file mode 100755 index 000000000..2cd1cf479 --- /dev/null +++ b/externals/vcpkg/ports/qt5-connectivity/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-connectivity/vcpkg.json b/externals/vcpkg/ports/qt5-connectivity/vcpkg.json new file mode 100755 index 000000000..cc3ed0089 --- /dev/null +++ b/externals/vcpkg/ports/qt5-connectivity/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "qt5-connectivity", + "version": "5.15.4", + "description": "Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/externals/vcpkg/ports/qt5-datavis3d/portfile.cmake b/externals/vcpkg/ports/qt5-datavis3d/portfile.cmake new file mode 100755 index 000000000..214726759 --- /dev/null +++ b/externals/vcpkg/ports/qt5-datavis3d/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-datavis3d/vcpkg.json b/externals/vcpkg/ports/qt5-datavis3d/vcpkg.json new file mode 100755 index 000000000..3092cb959 --- /dev/null +++ b/externals/vcpkg/ports/qt5-datavis3d/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "qt5-datavis3d", + "version": "5.15.4", + "description": "Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative", + "qt5-multimedia" + ] +} diff --git a/externals/vcpkg/ports/qt5-declarative/limits_include.patch b/externals/vcpkg/ports/qt5-declarative/limits_include.patch new file mode 100755 index 000000000..b4580dd21 --- /dev/null +++ b/externals/vcpkg/ports/qt5-declarative/limits_include.patch @@ -0,0 +1,24 @@ +From 2dfb893c130a9f9195805fcc81d7e5e242bc558d Mon Sep 17 00:00:00 2001 +From: Nicolas Fella +Date: Wed, 11 Aug 2021 17:03:06 +0200 +Subject: [PATCH] Add missing limits include + +--- + src/qmldebug/qqmlprofilerevent_p.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h +index a7e37d1964..01b2f58f16 100644 +--- a/src/qmldebug/qqmlprofilerevent_p.h ++++ b/src/qmldebug/qqmlprofilerevent_p.h +@@ -48,6 +48,7 @@ + #include + + #include ++#include + #include + + // +-- +2.32.0 + diff --git a/externals/vcpkg/ports/qt5-declarative/portfile.cmake b/externals/vcpkg/ports/qt5-declarative/portfile.cmake new file mode 100755 index 000000000..f01e38143 --- /dev/null +++ b/externals/vcpkg/ports/qt5-declarative/portfile.cmake @@ -0,0 +1,6 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation(OUT_SOURCE_PATH SOURCE_PATH PATCHES limits_include.patch) + +if(NOT QT_UPDATE_VERSION) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/qt5/QtQml/${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}/QtQml/private/qqmljsparser_p.h" "${SOURCE_PATH}" "") +endif() diff --git a/externals/vcpkg/ports/qt5-declarative/vcpkg.json b/externals/vcpkg/ports/qt5-declarative/vcpkg.json new file mode 100755 index 000000000..dcd1966ac --- /dev/null +++ b/externals/vcpkg/ports/qt5-declarative/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "qt5-declarative", + "version": "5.15.4", + "description": "Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-imageformats", + "qt5-svg" + ] +} diff --git a/externals/vcpkg/ports/qt5-doc/portfile.cmake b/externals/vcpkg/ports/qt5-doc/portfile.cmake new file mode 100755 index 000000000..4f6e6848e --- /dev/null +++ b/externals/vcpkg/ports/qt5-doc/portfile.cmake @@ -0,0 +1,7 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +if(VCPKG_TARGET_IS_WINDOWS) + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + message(STATUS "${PORT} will not build any artifacts on Windows!") +endif() +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-doc/vcpkg.json b/externals/vcpkg/ports/qt5-doc/vcpkg.json new file mode 100755 index 000000000..330a79ceb --- /dev/null +++ b/externals/vcpkg/ports/qt5-doc/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "qt5-doc", + "version": "5.15.4", + "description": "Qt5 doc Module;", + "license": null, + "supports": "linux", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative", + "qt5-quickcontrols2", + "qt5-tools" + ] +} diff --git a/externals/vcpkg/ports/qt5-gamepad/portfile.cmake b/externals/vcpkg/ports/qt5-gamepad/portfile.cmake new file mode 100755 index 000000000..214726759 --- /dev/null +++ b/externals/vcpkg/ports/qt5-gamepad/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-gamepad/vcpkg.json b/externals/vcpkg/ports/qt5-gamepad/vcpkg.json new file mode 100755 index 000000000..a37497d0b --- /dev/null +++ b/externals/vcpkg/ports/qt5-gamepad/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-gamepad", + "version": "5.15.4", + "description": "Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/externals/vcpkg/ports/qt5-graphicaleffects/portfile.cmake b/externals/vcpkg/ports/qt5-graphicaleffects/portfile.cmake new file mode 100755 index 000000000..d473c5625 --- /dev/null +++ b/externals/vcpkg/ports/qt5-graphicaleffects/portfile.cmake @@ -0,0 +1,3 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-graphicaleffects/vcpkg.json b/externals/vcpkg/ports/qt5-graphicaleffects/vcpkg.json new file mode 100755 index 000000000..1ca41fbe4 --- /dev/null +++ b/externals/vcpkg/ports/qt5-graphicaleffects/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-graphicaleffects", + "version": "5.15.4", + "description": "Qt5 GraphicalEffects Module.", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/externals/vcpkg/ports/qt5-imageformats/portfile.cmake b/externals/vcpkg/ports/qt5-imageformats/portfile.cmake new file mode 100755 index 000000000..04c41716e --- /dev/null +++ b/externals/vcpkg/ports/qt5-imageformats/portfile.cmake @@ -0,0 +1,54 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) + + +list(APPEND CORE_OPTIONS + -system-tiff + -system-webp + -jasper + -no-mng # must be explicitly disabled to not automatically pick up mng + -verbose) + +find_library(TIFF_RELEASE NAMES tiff PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # Depends on lzma +find_library(TIFF_DEBUG NAMES tiffd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(JPEG_RELEASE NAMES jpeg jpeg-static PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(JPEG_DEBUG NAMES jpeg jpeg-static jpegd jpeg-staticd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(ZLIB_RELEASE NAMES z zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ZLIB_DEBUG NAMES z zlib zd zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + +find_library(JASPER_RELEASE NAMES jasper PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(JASPER_DEBUG NAMES jasperd jasper libjasperd libjasper PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +if(NOT VCPKG_TARGET_IS_OSX) + find_library(FREEGLUT_RELEASE NAMES freeglut glut PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + find_library(FREEGLUT_DEBUG NAMES freeglutd freeglut glutd glut PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +endif() + +find_library(WEBP_RELEASE NAMES webp PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(WEBP_DEBUG NAMES webp PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(WEBPDEMUX_RELEASE NAMES webpdemux PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(WEBPDEMUX_DEBUG NAMES webpdemux PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(WEBPMUX_RELEASE NAMES webpmux PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(WEBPMUX_DEBUG NAMES webpmux PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(WEBPDECODER_RELEASE NAMES webpdecoder PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(WEBPDECODER_DEBUG NAMES webpdecoder PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +# Depends on opengl in default build but might depend on giflib, libjpeg-turbo, zlib, libpng, tiff, freeglut (!osx), sdl1 (windows) +# which would require extra libraries to be linked e.g. giflib freeglut sdl1 other ones are already linked + +#Dependent libraries +find_library(LZMA_RELEASE lzma PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(LZMA_DEBUG lzma PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + +if(NOT VCPKG_TARGET_IS_WINDOWS) + string(APPEND WEBP_RELEASE " -pthread") + string(APPEND WEBP_DEBUG " -pthread") +endif() + +set(OPT_REL "TIFF_LIBS=${TIFF_RELEASE} ${LZMA_RELEASE} ${JPEG_RELEASE} ${ZLIB_RELEASE}" + "WEBP_LIBS=${WEBPDECODER_RELEASE} ${WEBPDEMUX_RELEASE} ${WEBPMUX_RELEASE} ${WEBP_RELEASE}" + "JASPER_LIBS=${JASPER_RELEASE} ${FREEGLUT_RELEASE} ${JPEG_RELEASE} ${ZLIB_RELEASE}") # This will still fail if LIBWEBP is installed with all available features due to the missing additional dependencies +set(OPT_DBG "TIFF_LIBS=${TIFF_DEBUG} ${LZMA_DEBUG} ${JPEG_DEBUG} ${ZLIB_DEBUG}" + "WEBP_LIBS=${WEBPDECODER_DEBUG} ${WEBPDEMUX_DEBUG} ${WEBPMUX_DEBUG} ${WEBP_DEBUG}" + "JASPER_LIBS=${JASPER_DEBUG} ${FREEGLUT_DEBUG} ${JPEG_DEBUG} ${ZLIB_DEBUG}") +list(APPEND CORE_OPTIONS "WEBP_INCDIR=${CURRENT_INSTALLED_DIR}/include") # Requires libwebp[all] + +qt_submodule_installation(BUILD_OPTIONS ${CORE_OPTIONS} BUILD_OPTIONS_RELEASE ${OPT_REL} BUILD_OPTIONS_DEBUG ${OPT_DBG}) \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-imageformats/vcpkg.json b/externals/vcpkg/ports/qt5-imageformats/vcpkg.json new file mode 100755 index 000000000..7342d9ce9 --- /dev/null +++ b/externals/vcpkg/ports/qt5-imageformats/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "qt5-imageformats", + "version": "5.15.4", + "description": "Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP", + "license": null, + "dependencies": [ + "jasper", + "libwebp", + { + "name": "qt5-base", + "default-features": false + }, + "tiff" + ] +} diff --git a/externals/vcpkg/ports/qt5-location/portfile.cmake b/externals/vcpkg/ports/qt5-location/portfile.cmake new file mode 100755 index 000000000..c8d591b2d --- /dev/null +++ b/externals/vcpkg/ports/qt5-location/portfile.cmake @@ -0,0 +1,3 @@ +message(STATUS "${PORT} has a spurious failure in which it is unable to create a parent directory! Just retry.") +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() diff --git a/externals/vcpkg/ports/qt5-location/vcpkg.json b/externals/vcpkg/ports/qt5-location/vcpkg.json new file mode 100755 index 000000000..2d12a4a92 --- /dev/null +++ b/externals/vcpkg/ports/qt5-location/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "qt5-location", + "version": "5.15.4", + "description": "Qt5 Location Module - Displays map, navigation, and place content in a QML application.", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative", + "qt5-quickcontrols", + "qt5-quickcontrols2", + "qt5-serialport" + ] +} diff --git a/externals/vcpkg/ports/qt5-macextras/portfile.cmake b/externals/vcpkg/ports/qt5-macextras/portfile.cmake new file mode 100755 index 000000000..cc2391d87 --- /dev/null +++ b/externals/vcpkg/ports/qt5-macextras/portfile.cmake @@ -0,0 +1,5 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +if (NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT QT_UPDATE_VERSION) + message(FATAL_ERROR "qt5-macextras only support OSX.") +endif() +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-macextras/vcpkg.json b/externals/vcpkg/ports/qt5-macextras/vcpkg.json new file mode 100755 index 000000000..d9ada4bfd --- /dev/null +++ b/externals/vcpkg/ports/qt5-macextras/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-macextras", + "version": "5.15.4", + "description": "Qt5 Mac Extras Module. Provides platform-specific APIs for mac.", + "license": null, + "supports": "osx", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/externals/vcpkg/ports/qt5-modularscripts/portfile.cmake b/externals/vcpkg/ports/qt5-modularscripts/portfile.cmake new file mode 100755 index 000000000..0015715fb --- /dev/null +++ b/externals/vcpkg/ports/qt5-modularscripts/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-modularscripts/vcpkg.json b/externals/vcpkg/ports/qt5-modularscripts/vcpkg.json new file mode 100755 index 000000000..30de99c4c --- /dev/null +++ b/externals/vcpkg/ports/qt5-modularscripts/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "qt5-modularscripts", + "version-string": "deprecated", + "port-version": 1, + "description": "now part of qt5-base, formerly vcpkg helpers to package qt5 modules" +} diff --git a/externals/vcpkg/ports/qt5-mqtt/portfile.cmake b/externals/vcpkg/ports/qt5-mqtt/portfile.cmake new file mode 100755 index 000000000..f0462af13 --- /dev/null +++ b/externals/vcpkg/ports/qt5-mqtt/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation(PATCHES ${_qis_PATCHES}) diff --git a/externals/vcpkg/ports/qt5-mqtt/vcpkg.json b/externals/vcpkg/ports/qt5-mqtt/vcpkg.json new file mode 100755 index 000000000..7b8c661de --- /dev/null +++ b/externals/vcpkg/ports/qt5-mqtt/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "qt5-mqtt", + "version": "5.15.4", + "description": "Qt5 MQTT module.", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/externals/vcpkg/ports/qt5-multimedia/portfile.cmake b/externals/vcpkg/ports/qt5-multimedia/portfile.cmake new file mode 100755 index 000000000..214726759 --- /dev/null +++ b/externals/vcpkg/ports/qt5-multimedia/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-multimedia/vcpkg.json b/externals/vcpkg/ports/qt5-multimedia/vcpkg.json new file mode 100755 index 000000000..bbd6b93a7 --- /dev/null +++ b/externals/vcpkg/ports/qt5-multimedia/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-multimedia", + "version": "5.15.4", + "description": "Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/externals/vcpkg/ports/qt5-networkauth/portfile.cmake b/externals/vcpkg/ports/qt5-networkauth/portfile.cmake new file mode 100755 index 000000000..214726759 --- /dev/null +++ b/externals/vcpkg/ports/qt5-networkauth/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-networkauth/vcpkg.json b/externals/vcpkg/ports/qt5-networkauth/vcpkg.json new file mode 100755 index 000000000..65a7ff017 --- /dev/null +++ b/externals/vcpkg/ports/qt5-networkauth/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "qt5-networkauth", + "version": "5.15.4", + "description": "Qt5 Network Authorization Module", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/externals/vcpkg/ports/qt5-purchasing/portfile.cmake b/externals/vcpkg/ports/qt5-purchasing/portfile.cmake new file mode 100755 index 000000000..2cd1cf479 --- /dev/null +++ b/externals/vcpkg/ports/qt5-purchasing/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-purchasing/vcpkg.json b/externals/vcpkg/ports/qt5-purchasing/vcpkg.json new file mode 100755 index 000000000..933a0dd9c --- /dev/null +++ b/externals/vcpkg/ports/qt5-purchasing/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-purchasing", + "version": "5.15.4", + "description": "Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications.", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/externals/vcpkg/ports/qt5-quickcontrols/portfile.cmake b/externals/vcpkg/ports/qt5-quickcontrols/portfile.cmake new file mode 100755 index 000000000..d473c5625 --- /dev/null +++ b/externals/vcpkg/ports/qt5-quickcontrols/portfile.cmake @@ -0,0 +1,3 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-quickcontrols/vcpkg.json b/externals/vcpkg/ports/qt5-quickcontrols/vcpkg.json new file mode 100755 index 000000000..dac213398 --- /dev/null +++ b/externals/vcpkg/ports/qt5-quickcontrols/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "qt5-quickcontrols", + "version": "5.15.4", + "description": "Qt5 QuickControls Module.", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative", + "qt5-graphicaleffects" + ] +} diff --git a/externals/vcpkg/ports/qt5-quickcontrols2/portfile.cmake b/externals/vcpkg/ports/qt5-quickcontrols2/portfile.cmake new file mode 100755 index 000000000..214726759 --- /dev/null +++ b/externals/vcpkg/ports/qt5-quickcontrols2/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-quickcontrols2/vcpkg.json b/externals/vcpkg/ports/qt5-quickcontrols2/vcpkg.json new file mode 100755 index 000000000..88179828a --- /dev/null +++ b/externals/vcpkg/ports/qt5-quickcontrols2/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "qt5-quickcontrols2", + "version": "5.15.4", + "description": "Qt5 QuickControls2 Module.", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative", + "qt5-imageformats" + ] +} diff --git a/externals/vcpkg/ports/qt5-remoteobjects/portfile.cmake b/externals/vcpkg/ports/qt5-remoteobjects/portfile.cmake new file mode 100755 index 000000000..2cd1cf479 --- /dev/null +++ b/externals/vcpkg/ports/qt5-remoteobjects/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-remoteobjects/vcpkg.json b/externals/vcpkg/ports/qt5-remoteobjects/vcpkg.json new file mode 100755 index 000000000..cef6bad78 --- /dev/null +++ b/externals/vcpkg/ports/qt5-remoteobjects/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-remoteobjects", + "version": "5.15.4", + "description": "Qt5 Remoteobjects module - Provides an easy to use mechanism for sharing a QObject's API (Properties/Signals/Slots) between processes or devices.", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/externals/vcpkg/ports/qt5-script/portfile.cmake b/externals/vcpkg/ports/qt5-script/portfile.cmake new file mode 100755 index 000000000..2cd1cf479 --- /dev/null +++ b/externals/vcpkg/ports/qt5-script/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-script/vcpkg.json b/externals/vcpkg/ports/qt5-script/vcpkg.json new file mode 100755 index 000000000..88254060e --- /dev/null +++ b/externals/vcpkg/ports/qt5-script/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-script", + "version": "5.15.4", + "description": "Qt5 Script Module.", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-tools" + ] +} diff --git a/externals/vcpkg/ports/qt5-scxml/portfile.cmake b/externals/vcpkg/ports/qt5-scxml/portfile.cmake new file mode 100755 index 000000000..214726759 --- /dev/null +++ b/externals/vcpkg/ports/qt5-scxml/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-scxml/vcpkg.json b/externals/vcpkg/ports/qt5-scxml/vcpkg.json new file mode 100755 index 000000000..61fc9159d --- /dev/null +++ b/externals/vcpkg/ports/qt5-scxml/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-scxml", + "version": "5.15.4", + "description": "Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/externals/vcpkg/ports/qt5-sensors/portfile.cmake b/externals/vcpkg/ports/qt5-sensors/portfile.cmake new file mode 100755 index 000000000..2cd1cf479 --- /dev/null +++ b/externals/vcpkg/ports/qt5-sensors/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-sensors/vcpkg.json b/externals/vcpkg/ports/qt5-sensors/vcpkg.json new file mode 100755 index 000000000..63fa677d3 --- /dev/null +++ b/externals/vcpkg/ports/qt5-sensors/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-sensors", + "version": "5.15.4", + "description": "Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition.", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/externals/vcpkg/ports/qt5-serialbus/portfile.cmake b/externals/vcpkg/ports/qt5-serialbus/portfile.cmake new file mode 100755 index 000000000..d4e611db9 --- /dev/null +++ b/externals/vcpkg/ports/qt5-serialbus/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() diff --git a/externals/vcpkg/ports/qt5-serialbus/vcpkg.json b/externals/vcpkg/ports/qt5-serialbus/vcpkg.json new file mode 100755 index 000000000..f2cc2c512 --- /dev/null +++ b/externals/vcpkg/ports/qt5-serialbus/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-serialbus", + "version": "5.15.4", + "description": "Qt5 Serialbus Module;", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-serialport" + ] +} diff --git a/externals/vcpkg/ports/qt5-serialport/portfile.cmake b/externals/vcpkg/ports/qt5-serialport/portfile.cmake new file mode 100755 index 000000000..214726759 --- /dev/null +++ b/externals/vcpkg/ports/qt5-serialport/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-serialport/vcpkg.json b/externals/vcpkg/ports/qt5-serialport/vcpkg.json new file mode 100755 index 000000000..49637d5d4 --- /dev/null +++ b/externals/vcpkg/ports/qt5-serialport/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "qt5-serialport", + "version": "5.15.4", + "description": "Qt5 Serial Port - provides access to hardware and virtual serial ports", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/externals/vcpkg/ports/qt5-speech/portfile.cmake b/externals/vcpkg/ports/qt5-speech/portfile.cmake new file mode 100755 index 000000000..214726759 --- /dev/null +++ b/externals/vcpkg/ports/qt5-speech/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-speech/vcpkg.json b/externals/vcpkg/ports/qt5-speech/vcpkg.json new file mode 100755 index 000000000..3379fa84b --- /dev/null +++ b/externals/vcpkg/ports/qt5-speech/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "qt5-speech", + "version": "5.15.4", + "description": "Qt5 Speech Module", + "license": null, + "dependencies": [ + { + "name": "atlmfc", + "platform": "windows" + }, + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative", + "qt5-multimedia" + ] +} diff --git a/externals/vcpkg/ports/qt5-svg/portfile.cmake b/externals/vcpkg/ports/qt5-svg/portfile.cmake new file mode 100755 index 000000000..ca67a6846 --- /dev/null +++ b/externals/vcpkg/ports/qt5-svg/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation(PATCHES "static_svg_link_fix.patch") \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-svg/static_svg_link_fix.patch b/externals/vcpkg/ports/qt5-svg/static_svg_link_fix.patch new file mode 100755 index 000000000..c6d21e83a --- /dev/null +++ b/externals/vcpkg/ports/qt5-svg/static_svg_link_fix.patch @@ -0,0 +1,24 @@ +diff --git a/src/plugins/iconengines/svgiconengine/svgiconengine.pro b/src/plugins/iconengines/svgiconengine/svgiconengine.pro +index bfc739fa8..c0df08194 100644 +--- a/src/plugins/iconengines/svgiconengine/svgiconengine.pro ++++ b/src/plugins/iconengines/svgiconengine/svgiconengine.pro +@@ -8,6 +8,6 @@ OTHER_FILES += qsvgiconengine-nocompress.json + QT += svg core-private gui-private + + PLUGIN_TYPE = iconengines +-PLUGIN_EXTENDS = svg ++PLUGIN_EXTENDS = gui + PLUGIN_CLASS_NAME = QSvgIconPlugin + load(qt_plugin) +diff --git a/src/plugins/imageformats/svg/svg.pro b/src/plugins/imageformats/svg/svg.pro +index 9db6a9ab0..dcfc4b555 100644 +--- a/src/plugins/imageformats/svg/svg.pro ++++ b/src/plugins/imageformats/svg/svg.pro +@@ -6,6 +6,6 @@ SOURCES += main.cpp \ + QT += svg + + PLUGIN_TYPE = imageformats +-PLUGIN_EXTENDS = svg ++PLUGIN_EXTENDS = gui + PLUGIN_CLASS_NAME = QSvgPlugin + load(qt_plugin) diff --git a/externals/vcpkg/ports/qt5-svg/vcpkg.json b/externals/vcpkg/ports/qt5-svg/vcpkg.json new file mode 100755 index 000000000..2cf571f20 --- /dev/null +++ b/externals/vcpkg/ports/qt5-svg/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "qt5-svg", + "version": "5.15.4", + "description": "Qt5 SVG Module - provides classes for displaying the contents of SVG files", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/externals/vcpkg/ports/qt5-tools/Fix-regression-in-lconvert-handling-empty-translations.patch b/externals/vcpkg/ports/qt5-tools/Fix-regression-in-lconvert-handling-empty-translations.patch new file mode 100755 index 000000000..b1e960bca --- /dev/null +++ b/externals/vcpkg/ports/qt5-tools/Fix-regression-in-lconvert-handling-empty-translations.patch @@ -0,0 +1,25 @@ +diff --git a/src/linguist/shared/qm.cpp b/src/linguist/shared/qm.cpp +index 8c3fc3f..d772855 100644 +--- a/src/linguist/shared/qm.cpp ++++ b/src/linguist/shared/qm.cpp +@@ -552,12 +552,17 @@ bool loadQM(Translator &translator, QIODevice &dev, ConversionData &cd) + goto end; + case Tag_Translation: { + int len = read32(m); +- if (len & 1) { ++ m += 4; ++ ++ // -1 indicates an empty string ++ // Otherwise streaming format is UTF-16 -> 2 bytes per character ++ if ((len != -1) && (len & 1)) { + cd.appendError(QLatin1String("QM-Format error")); + return false; + } +- m += 4; +- QString str = QString((const QChar *)m, len/2); ++ QString str; ++ if (len != -1) ++ str = QString((const QChar *)m, len / 2); + if (QSysInfo::ByteOrder == QSysInfo::LittleEndian) { + for (int i = 0; i < str.length(); ++i) + str[i] = QChar((str.at(i).unicode() >> 8) + diff --git a/externals/vcpkg/ports/qt5-tools/icudt-debug-suffix.patch b/externals/vcpkg/ports/qt5-tools/icudt-debug-suffix.patch new file mode 100755 index 000000000..9d9d8bb39 --- /dev/null +++ b/externals/vcpkg/ports/qt5-tools/icudt-debug-suffix.patch @@ -0,0 +1,13 @@ +diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp +index 4e480bb..e15f076 100644 +--- a/src/windeployqt/main.cpp ++++ b/src/windeployqt/main.cpp +@@ -1324,7 +1324,7 @@ static DeployResult deploy(const Options &options, + const QString icuVersion = icuLibs.front().mid(index, numberExpression.matchedLength()); + if (optVerboseLevel > 1) + std::wcout << "Adding ICU version " << icuVersion << '\n'; +- icuLibs.push_back(QStringLiteral("icudt") + icuVersion + QLatin1String(windowsSharedLibrarySuffix)); ++ icuLibs.push_back(QStringLiteral("icudt") + (result.isDebug && platformHasDebugSuffix(options.platform) ? QStringLiteral("d") : QString()) + icuVersion + QLatin1String(windowsSharedLibrarySuffix)); + } + for (const QString &icuLib : qAsConst(icuLibs)) { + const QString icuPath = findInPath(icuLib); diff --git a/externals/vcpkg/ports/qt5-tools/portfile.cmake b/externals/vcpkg/ports/qt5-tools/portfile.cmake new file mode 100755 index 000000000..0abab4cab --- /dev/null +++ b/externals/vcpkg/ports/qt5-tools/portfile.cmake @@ -0,0 +1,10 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) + +qt_submodule_installation(PATCHES + icudt-debug-suffix.patch # https://bugreports.qt.io/browse/QTBUG-87677 + Fix-regression-in-lconvert-handling-empty-translations.patch # https://codereview.qt-project.org/c/qt/qttools/+/337738 +) + +if(EXISTS "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") + file(INSTALL "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/plugins/platforms") +endif() diff --git a/externals/vcpkg/ports/qt5-tools/vcpkg.json b/externals/vcpkg/ports/qt5-tools/vcpkg.json new file mode 100755 index 000000000..e3655514c --- /dev/null +++ b/externals/vcpkg/ports/qt5-tools/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "qt5-tools", + "version": "5.15.4", + "port-version": 1, + "description": "Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications", + "license": null, + "dependencies": [ + { + "name": "qt5-activeqt", + "platform": "windows" + }, + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/externals/vcpkg/ports/qt5-translations/portfile.cmake b/externals/vcpkg/ports/qt5-translations/portfile.cmake new file mode 100755 index 000000000..d473c5625 --- /dev/null +++ b/externals/vcpkg/ports/qt5-translations/portfile.cmake @@ -0,0 +1,3 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-translations/vcpkg.json b/externals/vcpkg/ports/qt5-translations/vcpkg.json new file mode 100755 index 000000000..9f8c614d2 --- /dev/null +++ b/externals/vcpkg/ports/qt5-translations/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-translations", + "version": "5.15.4", + "description": "Qt5 translations module", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-tools" + ] +} diff --git a/externals/vcpkg/ports/qt5-virtualkeyboard/portfile.cmake b/externals/vcpkg/ports/qt5-virtualkeyboard/portfile.cmake new file mode 100755 index 000000000..214726759 --- /dev/null +++ b/externals/vcpkg/ports/qt5-virtualkeyboard/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-virtualkeyboard/vcpkg.json b/externals/vcpkg/ports/qt5-virtualkeyboard/vcpkg.json new file mode 100755 index 000000000..4c1394ef9 --- /dev/null +++ b/externals/vcpkg/ports/qt5-virtualkeyboard/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "qt5-virtualkeyboard", + "version": "5.15.4", + "description": "Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes", + "license": null, + "dependencies": [ + "qt5-multimedia", + "qt5-quickcontrols", + "qt5-quickcontrols", + "qt5-svg" + ] +} diff --git a/externals/vcpkg/ports/qt5-wayland/portfile.cmake b/externals/vcpkg/ports/qt5-wayland/portfile.cmake new file mode 100755 index 000000000..42560f179 --- /dev/null +++ b/externals/vcpkg/ports/qt5-wayland/portfile.cmake @@ -0,0 +1,8 @@ +#Will not build on Windows! +message(WARNING "This port is just a placeholder until the required wayland libraries have been added into VCPKG! \ + As such the build will most likely fail until your system has the required wayland libraries installed (untested)") +message(WARNING "qtwayland requires libwayland-dev from your system package manager. You can install it with +sudo apt install libwayland-dev +on Ubuntu systems.") +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() diff --git a/externals/vcpkg/ports/qt5-wayland/vcpkg.json b/externals/vcpkg/ports/qt5-wayland/vcpkg.json new file mode 100755 index 000000000..f7f56ecd7 --- /dev/null +++ b/externals/vcpkg/ports/qt5-wayland/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-wayland", + "version": "5.15.4", + "description": "Qt5 wayland Module;", + "license": null, + "supports": "linux", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/externals/vcpkg/ports/qt5-webchannel/portfile.cmake b/externals/vcpkg/ports/qt5-webchannel/portfile.cmake new file mode 100755 index 000000000..2cd1cf479 --- /dev/null +++ b/externals/vcpkg/ports/qt5-webchannel/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-webchannel/vcpkg.json b/externals/vcpkg/ports/qt5-webchannel/vcpkg.json new file mode 100755 index 000000000..14d04063e --- /dev/null +++ b/externals/vcpkg/ports/qt5-webchannel/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-webchannel", + "version": "5.15.4", + "description": "Qt5 Web Channel module - Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients.", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/externals/vcpkg/ports/qt5-webengine/build_1.patch b/externals/vcpkg/ports/qt5-webengine/build_1.patch new file mode 100755 index 000000000..4bef9ebd4 --- /dev/null +++ b/externals/vcpkg/ports/qt5-webengine/build_1.patch @@ -0,0 +1,12 @@ +diff --git a/src/3rdparty/chromium/third_party/angle/BUILD.gn b/src/3rdparty/chromium/third_party/angle/BUILD.gn +index fb57176..fa84cc5 100644 +--- a/src/3rdparty/chromium/third_party/angle/BUILD.gn ++++ b/src/3rdparty/chromium/third_party/angle/BUILD.gn +@@ -131,7 +131,6 @@ config("extra_warnings") { + # Enable more default warnings on Windows. + if (is_win) { + cflags += [ +- "/we4244", # Conversion: possible loss of data. + "/we4312", # Conversion: greater size. + "/we4456", # Variable shadowing. + "/we4458", # declaration hides class member. diff --git a/externals/vcpkg/ports/qt5-webengine/build_2.patch b/externals/vcpkg/ports/qt5-webengine/build_2.patch new file mode 100755 index 000000000..77d7cbe0d --- /dev/null +++ b/externals/vcpkg/ports/qt5-webengine/build_2.patch @@ -0,0 +1,24 @@ +diff --git a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h +index 18ca770..5585a67 100644 +--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h ++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h +@@ -74,16 +74,16 @@ class CircularQueue { + return queue_->Get(pos_); + } + +- const T* operator->() const { ++ T* operator->() const { + return const_cast::Iterator*>(this)->operator->(); + } + + T& operator*() { return *(operator->()); } +- const T& operator*() const { return *(operator->()); } ++ T& operator*() const { return *(operator->()); } + + value_type& operator[](difference_type i) { return *(*this + i); } + +- const value_type& operator[](difference_type i) const { ++ value_type& operator[](difference_type i) const { + return const_cast::Iterator&>(*this)[i]; + } + diff --git a/externals/vcpkg/ports/qt5-webengine/common.pri.patch b/externals/vcpkg/ports/qt5-webengine/common.pri.patch new file mode 100755 index 000000000..ad58ab9e1 --- /dev/null +++ b/externals/vcpkg/ports/qt5-webengine/common.pri.patch @@ -0,0 +1,12 @@ +diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri +#latest diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri +index 97d39535c..dc09da43a 100644 +--- a/src/buildtools/config/common.pri ++++ b/src/buildtools/config/common.pri +@@ -57,5 +57,5 @@ + precompile_header { +- gn_args += enable_precompiled_headers=true ++ gn_args += enable_precompiled_headers=false + } else { + gn_args += enable_precompiled_headers=false + } diff --git a/externals/vcpkg/ports/qt5-webengine/gl.patch b/externals/vcpkg/ports/qt5-webengine/gl.patch new file mode 100755 index 000000000..a48ddf6c3 --- /dev/null +++ b/externals/vcpkg/ports/qt5-webengine/gl.patch @@ -0,0 +1,13 @@ +diff --git a/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h b/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h +index d54583e8b..1921185f8 100644 +--- a/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h ++++ b/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h +@@ -16,7 +16,7 @@ + namespace gl { + + class GLContext; +- ++typedef void *GLeglImageOES; + typedef void(GL_BINDING_CALL* glActiveShaderProgramProc)(GLuint pipeline, + GLuint program); + typedef void(GL_BINDING_CALL* glActiveTextureProc)(GLenum texture); diff --git a/externals/vcpkg/ports/qt5-webengine/portfile.cmake b/externals/vcpkg/ports/qt5-webengine/portfile.cmake new file mode 100755 index 000000000..842b7ae46 --- /dev/null +++ b/externals/vcpkg/ports/qt5-webengine/portfile.cmake @@ -0,0 +1,62 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +string(LENGTH "${CURRENT_BUILDTREES_DIR}" buildtrees_path_length) +if(buildtrees_path_length GREATER 35 AND CMAKE_HOST_WIN32) + vcpkg_buildpath_length_warning(35) + message(WARNING "The ${PORT} source was will be extracted to ${CURRENT_BUILDTREES_DIR} , which has more then 35 characters in length.") + message(FATAL_ERROR "terminating due to ${CURRENT_BUILDTREES_DIR} being too long.") +endif() +#set(VCPKG_BUILD_TYPE release) #You probably want to set this to reduce build type and space requirements +message(STATUS "${PORT} requires a lot of free disk space (>100GB), ram (>8 GB) and time (>2h per configuration) to be successfully build.\n\ +-- As such ${PORT} is currently experimental.\n\ +-- If ${PORT} fails post build validation please try manually reducing VCPKG_MAX_CONCURRENCY and open up an issue if it still cannot build. \n\ +-- If it fails due to post validation the successfully installed files can be found in ${CURRENT_PACKAGES_DIR} \n\ +-- and just need to be copied into ${CURRENT_INSTALLED_DIR}") +if(NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "If ${PORT} directly fails ${PORT} might require additional prerequisites on Linux and OSX. Please check the configure logs.\n") +endif() +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) + +vcpkg_find_acquire_program(FLEX) +vcpkg_find_acquire_program(BISON) +vcpkg_find_acquire_program(GPERF) +vcpkg_find_acquire_program(PYTHON2) +vcpkg_find_acquire_program(NINJA) +set(NODEJS "${CURRENT_HOST_INSTALLED_DIR}/tools/node/node${VCPKG_HOST_EXECUTABLE_SUFFIX}") +get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) +get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) +get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY ) +get_filename_component(GPERF_DIR "${GPERF}" DIRECTORY ) +get_filename_component(NINJA_DIR "${NINJA}" DIRECTORY ) +get_filename_component(NODEJS_DIR "${NODEJS}" DIRECTORY ) + +if(WIN32) # WIN32 HOST probably has win_flex and win_bison! + if(NOT EXISTS "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") + file(CREATE_LINK "${FLEX}" "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") + endif() + if(NOT EXISTS "${BISON_DIR}/BISON${VCPKG_HOST_EXECUTABLE_SUFFIX}") + file(CREATE_LINK "${BISON}" "${BISON_DIR}/bison${VCPKG_HOST_EXECUTABLE_SUFFIX}") + endif() +endif() + +vcpkg_add_to_path(PREPEND "${FLEX_DIR}") +vcpkg_add_to_path(PREPEND "${BISON_DIR}") +vcpkg_add_to_path(PREPEND "${PYTHON2_DIR}") +vcpkg_add_to_path(PREPEND "${GPERF_DIR}") +vcpkg_add_to_path(PREPEND "${NINJA_DIR}") +vcpkg_add_to_path(PREPEND "${NODEJS_DIR}") + +set(PATCHES common.pri.patch + gl.patch + build_1.patch + build_2.patch + workaround-msvc2022-ice.patch) + +set(OPTIONS) +if("proprietary-codecs" IN_LIST FEATURES) + list(APPEND OPTIONS "-webengine-proprietary-codecs") +endif() +if(NOT VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS "-webengine-system-libwebp" "-webengine-system-ffmpeg" "-webengine-system-icu") +endif() + +qt_submodule_installation(PATCHES ${PATCHES} BUILD_OPTIONS ${OPTIONS}) diff --git a/externals/vcpkg/ports/qt5-webengine/vcpkg.json b/externals/vcpkg/ports/qt5-webengine/vcpkg.json new file mode 100755 index 000000000..45d6df616 --- /dev/null +++ b/externals/vcpkg/ports/qt5-webengine/vcpkg.json @@ -0,0 +1,35 @@ +{ + "name": "qt5-webengine", + "version": "5.15.4", + "port-version": 2, + "description": "Qt5 webengine Module;", + "license": null, + "supports": "!static", + "dependencies": [ + { + "name": "atlmfc", + "platform": "windows" + }, + { + "name": "ffmpeg", + "default-features": false, + "platform": "!windows" + }, + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative", + "qt5-location", + "qt5-quickcontrols", + "qt5-quickcontrols2", + "qt5-tools", + "qt5-webchannel", + "vcpkg-tool-nodejs" + ], + "features": { + "proprietary-codecs": { + "description": "Enable proprietary-codecs in qtwebengine" + } + } +} diff --git a/externals/vcpkg/ports/qt5-webengine/workaround-msvc2022-ice.patch b/externals/vcpkg/ports/qt5-webengine/workaround-msvc2022-ice.patch new file mode 100755 index 000000000..59cc004b6 --- /dev/null +++ b/externals/vcpkg/ports/qt5-webengine/workaround-msvc2022-ice.patch @@ -0,0 +1,101 @@ +--- a/src/3rdparty/chromium/base/hash/md5_constexpr_internal.h ++++ b/src/3rdparty/chromium/base/hash/md5_constexpr_internal.h +@@ -281,15 +281,63 @@ struct MD5CE { + return IntermediateDataToMD5Digest(ProcessMessage(data, n)); + } + +- static constexpr uint64_t Hash64(const char* data, uint32_t n) { +- IntermediateData intermediate = ProcessMessage(data, n); +- return (static_cast(SwapEndian(intermediate.a)) << 32) | +- static_cast(SwapEndian(intermediate.b)); ++ static constexpr uint64_t Hash64(const char* message, uint32_t n) { ++ const uint32_t m = GetPaddedMessageLength(n); ++ IntermediateData intermediate0 = kInitialIntermediateData; ++ for (uint32_t offset = 0; offset < m; offset += 64) { ++ RoundData data = { ++ GetPaddedMessageWord(message, n, m, offset), ++ GetPaddedMessageWord(message, n, m, offset + 4), ++ GetPaddedMessageWord(message, n, m, offset + 8), ++ GetPaddedMessageWord(message, n, m, offset + 12), ++ GetPaddedMessageWord(message, n, m, offset + 16), ++ GetPaddedMessageWord(message, n, m, offset + 20), ++ GetPaddedMessageWord(message, n, m, offset + 24), ++ GetPaddedMessageWord(message, n, m, offset + 28), ++ GetPaddedMessageWord(message, n, m, offset + 32), ++ GetPaddedMessageWord(message, n, m, offset + 36), ++ GetPaddedMessageWord(message, n, m, offset + 40), ++ GetPaddedMessageWord(message, n, m, offset + 44), ++ GetPaddedMessageWord(message, n, m, offset + 48), ++ GetPaddedMessageWord(message, n, m, offset + 52), ++ GetPaddedMessageWord(message, n, m, offset + 56), ++ GetPaddedMessageWord(message, n, m, offset + 60)}; ++ IntermediateData intermediate1 = intermediate0; ++ for (uint32_t i = 0; i < 64; ++i) ++ intermediate1 = ApplyStep(i, data, intermediate1); ++ intermediate0 = Add(intermediate0, intermediate1); ++ } ++ return (static_cast(SwapEndian(intermediate0.a)) << 32) | ++ static_cast(SwapEndian(intermediate0.b)); + } + +- static constexpr uint32_t Hash32(const char* data, uint32_t n) { +- IntermediateData intermediate = ProcessMessage(data, n); +- return SwapEndian(intermediate.a); ++ static constexpr uint32_t Hash32(const char* message, uint32_t n) { ++ const uint32_t m = GetPaddedMessageLength(n); ++ IntermediateData intermediate0 = kInitialIntermediateData; ++ for (uint32_t offset = 0; offset < m; offset += 64) { ++ RoundData data = { ++ GetPaddedMessageWord(message, n, m, offset), ++ GetPaddedMessageWord(message, n, m, offset + 4), ++ GetPaddedMessageWord(message, n, m, offset + 8), ++ GetPaddedMessageWord(message, n, m, offset + 12), ++ GetPaddedMessageWord(message, n, m, offset + 16), ++ GetPaddedMessageWord(message, n, m, offset + 20), ++ GetPaddedMessageWord(message, n, m, offset + 24), ++ GetPaddedMessageWord(message, n, m, offset + 28), ++ GetPaddedMessageWord(message, n, m, offset + 32), ++ GetPaddedMessageWord(message, n, m, offset + 36), ++ GetPaddedMessageWord(message, n, m, offset + 40), ++ GetPaddedMessageWord(message, n, m, offset + 44), ++ GetPaddedMessageWord(message, n, m, offset + 48), ++ GetPaddedMessageWord(message, n, m, offset + 52), ++ GetPaddedMessageWord(message, n, m, offset + 56), ++ GetPaddedMessageWord(message, n, m, offset + 60)}; ++ IntermediateData intermediate1 = intermediate0; ++ for (uint32_t i = 0; i < 64; ++i) ++ intermediate1 = ApplyStep(i, data, intermediate1); ++ intermediate0 = Add(intermediate0, intermediate1); ++ } ++ return SwapEndian(intermediate0.a); + } + }; + +--- a/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_versions.h ++++ b/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_versions.h +@@ -26,6 +26,7 @@ + #include + #include + ++#include "absl/base/macros.h" + #include "net/third_party/quiche/src/quic/core/quic_tag.h" + #include "net/third_party/quiche/src/quic/core/quic_types.h" + #include "net/third_party/quiche/src/quic/platform/api/quic_export.h" +@@ -181,8 +182,14 @@ QUIC_EXPORT_PRIVATE constexpr bool ParsedQuicVersionIsValid( + transport_version == QUIC_VERSION_RESERVED_FOR_NEGOTIATION; + if (!transport_version_is_valid) { + // Iterators are not constexpr in C++14 which Chrome uses. +- constexpr auto supported_transport_versions = SupportedTransportVersions(); +- for (size_t i = 0; i < supported_transport_versions.size(); ++i) { ++ constexpr QuicTransportVersion supported_transport_versions[] = { ++ QUIC_VERSION_IETF_DRAFT_29, ++ QUIC_VERSION_IETF_DRAFT_27, ++ QUIC_VERSION_51, ++ QUIC_VERSION_50, ++ QUIC_VERSION_46, ++ QUIC_VERSION_43}; ++ for (size_t i = 0; i < ABSL_ARRAYSIZE(supported_transport_versions); ++i) { + const QuicTransportVersion& trans_vers = supported_transport_versions[i]; + if (trans_vers == transport_version) { + transport_version_is_valid = true; + diff --git a/externals/vcpkg/ports/qt5-webglplugin/portfile.cmake b/externals/vcpkg/ports/qt5-webglplugin/portfile.cmake new file mode 100755 index 000000000..d473c5625 --- /dev/null +++ b/externals/vcpkg/ports/qt5-webglplugin/portfile.cmake @@ -0,0 +1,3 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-webglplugin/vcpkg.json b/externals/vcpkg/ports/qt5-webglplugin/vcpkg.json new file mode 100755 index 000000000..06dadeda5 --- /dev/null +++ b/externals/vcpkg/ports/qt5-webglplugin/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "qt5-webglplugin", + "version": "5.15.4", + "description": "Qt5 webglplugin Module;", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/externals/vcpkg/ports/qt5-websockets/portfile.cmake b/externals/vcpkg/ports/qt5-websockets/portfile.cmake new file mode 100755 index 000000000..214726759 --- /dev/null +++ b/externals/vcpkg/ports/qt5-websockets/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-websockets/vcpkg.json b/externals/vcpkg/ports/qt5-websockets/vcpkg.json new file mode 100755 index 000000000..7820c5787 --- /dev/null +++ b/externals/vcpkg/ports/qt5-websockets/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-websockets", + "version": "5.15.4", + "description": "Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/externals/vcpkg/ports/qt5-webview/portfile.cmake b/externals/vcpkg/ports/qt5-webview/portfile.cmake new file mode 100755 index 000000000..2cd1cf479 --- /dev/null +++ b/externals/vcpkg/ports/qt5-webview/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-webview/vcpkg.json b/externals/vcpkg/ports/qt5-webview/vcpkg.json new file mode 100755 index 000000000..0fc59fd56 --- /dev/null +++ b/externals/vcpkg/ports/qt5-webview/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "qt5-webview", + "version": "5.15.4", + "description": "Qt5 WebView module - Provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense.", + "license": null, + "dependencies": [ + "qt5-declarative" + ] +} diff --git a/externals/vcpkg/ports/qt5-winextras/patches/require_quick.patch b/externals/vcpkg/ports/qt5-winextras/patches/require_quick.patch new file mode 100755 index 000000000..471fa5a17 --- /dev/null +++ b/externals/vcpkg/ports/qt5-winextras/patches/require_quick.patch @@ -0,0 +1,12 @@ +diff --git a/src/src.pro b/src/src.pro +index fceeb21..8a242d0 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -2,6 +2,7 @@ win32 { + TEMPLATE = subdirs + CONFIG += ordered + SUBDIRS += winextras ++ SUBDIRS += imports + } else { + # fake project for creating the documentation + TEMPLATE = aux diff --git a/externals/vcpkg/ports/qt5-winextras/patches/unrequire_quick.patch b/externals/vcpkg/ports/qt5-winextras/patches/unrequire_quick.patch new file mode 100755 index 000000000..98f652da1 --- /dev/null +++ b/externals/vcpkg/ports/qt5-winextras/patches/unrequire_quick.patch @@ -0,0 +1,12 @@ +diff --git a/src/src.pro b/src/src.pro +index fceeb21..7e4835b 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -2,7 +2,6 @@ win32 { + TEMPLATE = subdirs + CONFIG += ordered + SUBDIRS += winextras +- qtHaveModule(quick): SUBDIRS += imports + } else { + # fake project for creating the documentation + TEMPLATE = aux diff --git a/externals/vcpkg/ports/qt5-winextras/portfile.cmake b/externals/vcpkg/ports/qt5-winextras/portfile.cmake new file mode 100755 index 000000000..3f9ff8cc7 --- /dev/null +++ b/externals/vcpkg/ports/qt5-winextras/portfile.cmake @@ -0,0 +1,12 @@ +include("${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake") + +vcpkg_list(SET _patches + "patches/unrequire_quick.patch" +) +if("declarative" IN_LIST FEATURES) + list(APPEND _patches + "patches/require_quick.patch" + ) +endif() + +qt_submodule_installation(PATCHES ${_patches}) diff --git a/externals/vcpkg/ports/qt5-winextras/vcpkg.json b/externals/vcpkg/ports/qt5-winextras/vcpkg.json new file mode 100755 index 000000000..ff8c8cd6b --- /dev/null +++ b/externals/vcpkg/ports/qt5-winextras/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "qt5-winextras", + "version": "5.15.4", + "description": "Qt5 Windows Extras Module. Provides platform-specific APIs for Windows.", + "license": null, + "supports": "windows", + "dependencies": [ + "atlmfc", + { + "name": "qt5-base", + "default-features": false + } + ], + "features": { + "declarative": { + "description": "Build Qt.Quick imports", + "dependencies": [ + "qt5-declarative" + ] + } + } +} diff --git a/externals/vcpkg/ports/qt5-x11extras/portfile.cmake b/externals/vcpkg/ports/qt5-x11extras/portfile.cmake new file mode 100755 index 000000000..214726759 --- /dev/null +++ b/externals/vcpkg/ports/qt5-x11extras/portfile.cmake @@ -0,0 +1,2 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-x11extras/vcpkg.json b/externals/vcpkg/ports/qt5-x11extras/vcpkg.json new file mode 100755 index 000000000..826f2694c --- /dev/null +++ b/externals/vcpkg/ports/qt5-x11extras/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "qt5-x11extras", + "version": "5.15.4", + "description": "Qt5 x11extras Module;", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/externals/vcpkg/ports/qt5-xmlpatterns/portfile.cmake b/externals/vcpkg/ports/qt5-xmlpatterns/portfile.cmake new file mode 100755 index 000000000..fdbfa8d8e --- /dev/null +++ b/externals/vcpkg/ports/qt5-xmlpatterns/portfile.cmake @@ -0,0 +1,5 @@ +include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +qt_submodule_installation() +if(EXISTS "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") + file(INSTALL "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/plugins/platforms") +endif() \ No newline at end of file diff --git a/externals/vcpkg/ports/qt5-xmlpatterns/vcpkg.json b/externals/vcpkg/ports/qt5-xmlpatterns/vcpkg.json new file mode 100755 index 000000000..d2b807786 --- /dev/null +++ b/externals/vcpkg/ports/qt5-xmlpatterns/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-xmlpatterns", + "version": "5.15.4", + "description": "Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/externals/vcpkg/ports/qt5/portfile.cmake b/externals/vcpkg/ports/qt5/portfile.cmake new file mode 100755 index 000000000..cc6e26fcb --- /dev/null +++ b/externals/vcpkg/ports/qt5/portfile.cmake @@ -0,0 +1 @@ +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/qt5/vcpkg.json b/externals/vcpkg/ports/qt5/vcpkg.json new file mode 100755 index 000000000..62fde5719 --- /dev/null +++ b/externals/vcpkg/ports/qt5/vcpkg.json @@ -0,0 +1,348 @@ +{ + "name": "qt5", + "version": "5.15.4", + "description": "Qt5 Application Framework", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ], + "default-features": [ + "essentials" + ], + "features": { + "3d": { + "description": [], + "dependencies": [ + "qt5-3d" + ] + }, + "activeqt": { + "description": "Windows Only", + "dependencies": [ + { + "name": "qt5-activeqt", + "platform": "windows" + } + ] + }, + "all": { + "description": "Install all Qt5 submodules (Warning: Could take a long time and fail...)", + "dependencies": [ + { + "name": "qt5", + "features": [ + "3d", + "activeqt", + "charts", + "connectivity", + "datavis3d", + "declarative", + "doc", + "extras", + "gamepad", + "graphicaleffects", + "imageformats", + "location", + "mqtt", + "multimedia", + "networkauth", + "purchasing", + "quickcontrols", + "quickcontrols2", + "remoteobjects", + "script", + "scxml", + "sensors", + "serialbus", + "serialport", + "speech", + "svg", + "tools", + "translations", + "virtualkeyboard", + "webchannel", + "webglplugin", + "websockets", + "webview", + "xmlpatterns" + ] + }, + { + "name": "qt5", + "default-features": false, + "features": [ + "webengine" + ], + "platform": "!static" + }, + { + "name": "qt5", + "default-features": false, + "features": [ + "wayland" + ], + "platform": "!windows" + }, + { + "name": "qt5-base", + "default-features": false, + "features": [ + "mysqlplugin", + "postgresqlplugin" + ] + } + ] + }, + "charts": { + "description": [], + "dependencies": [ + "qt5-charts" + ] + }, + "connectivity": { + "description": [], + "dependencies": [ + "qt5-connectivity" + ] + }, + "datavis3d": { + "description": [], + "dependencies": [ + "qt5-datavis3d" + ] + }, + "declarative": { + "description": [], + "dependencies": [ + "qt5-declarative" + ] + }, + "doc": { + "description": [], + "dependencies": [ + { + "name": "qt5-doc", + "platform": "!windows" + } + ] + }, + "essentials": { + "description": "Build the essential qt modules", + "dependencies": [ + { + "name": "qt5", + "default-features": false, + "features": [ + "activeqt", + "declarative", + "imageformats", + "multimedia", + "networkauth", + "quickcontrols2", + "svg", + "tools" + ] + } + ] + }, + "extras": { + "description": [], + "dependencies": [ + { + "name": "qt5-androidextras", + "platform": "android" + }, + { + "name": "qt5-macextras", + "platform": "osx" + }, + { + "name": "qt5-winextras", + "features": [ + "declarative" + ], + "platform": "windows" + }, + { + "name": "qt5-x11extras", + "platform": "linux" + } + ] + }, + "gamepad": { + "description": [], + "dependencies": [ + "qt5-gamepad" + ] + }, + "graphicaleffects": { + "description": [], + "dependencies": [ + "qt5-graphicaleffects" + ] + }, + "imageformats": { + "description": [], + "dependencies": [ + "qt5-imageformats" + ] + }, + "latest": { + "description": "(deprecated)" + }, + "location": { + "description": [], + "dependencies": [ + "qt5-location" + ] + }, + "mqtt": { + "description": [], + "dependencies": [ + "qt5-mqtt" + ] + }, + "multimedia": { + "description": [], + "dependencies": [ + "qt5-multimedia" + ] + }, + "networkauth": { + "description": [], + "dependencies": [ + "qt5-networkauth" + ] + }, + "purchasing": { + "description": [], + "dependencies": [ + "qt5-purchasing" + ] + }, + "quickcontrols": { + "description": "(deprecated)", + "dependencies": [ + "qt5-quickcontrols" + ] + }, + "quickcontrols2": { + "description": [], + "dependencies": [ + "qt5-quickcontrols2" + ] + }, + "remoteobjects": { + "description": [], + "dependencies": [ + "qt5-remoteobjects" + ] + }, + "script": { + "description": "(deprecated)", + "dependencies": [ + "qt5-script" + ] + }, + "scxml": { + "description": [], + "dependencies": [ + "qt5-scxml" + ] + }, + "sensors": { + "description": [], + "dependencies": [ + "qt5-sensors" + ] + }, + "serialbus": { + "description": [], + "dependencies": [ + "qt5-serialbus" + ] + }, + "serialport": { + "description": [], + "dependencies": [ + "qt5-serialport" + ] + }, + "speech": { + "description": [], + "dependencies": [ + "qt5-speech" + ] + }, + "svg": { + "description": [], + "dependencies": [ + "qt5-svg" + ] + }, + "tools": { + "description": [], + "dependencies": [ + "qt5-tools" + ] + }, + "translations": { + "description": [], + "dependencies": [ + "qt5-translations" + ] + }, + "virtualkeyboard": { + "description": [], + "dependencies": [ + "qt5-virtualkeyboard" + ] + }, + "wayland": { + "description": [], + "dependencies": [ + "qt5-wayland" + ] + }, + "webchannel": { + "description": [], + "dependencies": [ + "qt5-webchannel" + ] + }, + "webengine": { + "description": [], + "dependencies": [ + "qt5-webengine" + ] + }, + "webglplugin": { + "description": [], + "dependencies": [ + "qt5-webglplugin" + ] + }, + "websockets": { + "description": [], + "dependencies": [ + "qt5-websockets" + ] + }, + "webview": { + "description": [], + "dependencies": [ + "qt5-webview" + ] + }, + "xmlpatterns": { + "description": "(deprecated)", + "dependencies": [ + "qt5-xmlpatterns" + ] + } + } +} diff --git a/externals/vcpkg/ports/qt5compat/portfile.cmake b/externals/vcpkg/ports/qt5compat/portfile.cmake new file mode 100755 index 000000000..452cf48be --- /dev/null +++ b/externals/vcpkg/ports/qt5compat/portfile.cmake @@ -0,0 +1,35 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "textcodec" FEATURE_textcodec + "codecs" FEATURE_codecs + "big-codecs" FEATURE_big_codecs + "iconv" FEATURE_iconv + "iconv" CMAKE_DISABLE_FIND_PACKAGE_ICU + #"iconv" CMAKE_REQUIRE_FIND_PACKAGE_WrapIconv + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick +INVERTED_FEATURES + "iconv" CMAKE_DISABLE_FIND_PACKAGE_WrapIconv + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick + ) + +#For iconv feature to work the following must be true: +#CONDITION NOT FEATURE_icu AND FEATURE_textcodec AND NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND WrapIconv_FOUND +#TODO: check if qtbase was built with ICU and fail if iconv is given here. + +set(TOOL_NAMES) +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS + ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) + +#For my documentation: +# find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) +# find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Network Xml Gui Quick) diff --git a/externals/vcpkg/ports/qt5compat/vcpkg.json b/externals/vcpkg/ports/qt5compat/vcpkg.json new file mode 100755 index 000000000..59a13e68c --- /dev/null +++ b/externals/vcpkg/ports/qt5compat/vcpkg.json @@ -0,0 +1,81 @@ +{ + "name": "qt5compat", + "version": "6.3.0", + "description": "The module contains unsupported Qt 5 APIs", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false + } + ], + "default-features": [ + "big-codecs", + "codecs", + "default-features", + "qml", + "textcodec" + ], + "features": { + "big-codecs": { + "description": "Supports big codecs, e.g. CJK.", + "dependencies": [ + { + "name": "qt5compat", + "default-features": false, + "features": [ + "textcodec" + ] + } + ] + }, + "codecs": { + "description": "Supports non-unicode text conversions.", + "dependencies": [ + { + "name": "qt5compat", + "default-features": false, + "features": [ + "textcodec" + ] + } + ] + }, + "default-features": { + "description": "Platform-dependent default features" + }, + "iconv": { + "description": "Provides internationalization on Unix.", + "dependencies": [ + "libiconv", + { + "name": "qt5compat", + "default-features": false, + "features": [ + "textcodec" + ] + } + ] + }, + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + }, + { + "name": "qtdeclarative", + "default-features": false + } + ] + }, + "textcodec": { + "description": "Supports conversions between text encodings." + } + } +} diff --git a/externals/vcpkg/ports/qtactiveqt/portfile.cmake b/externals/vcpkg/ports/qtactiveqt/portfile.cmake new file mode 100755 index 000000000..32b1aa7b1 --- /dev/null +++ b/externals/vcpkg/ports/qtactiveqt/portfile.cmake @@ -0,0 +1,36 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + +set(NO_BIN_AND_TOOLS FALSE) +if(VCPKG_TARGET_ARCHITECTURE MATCHES "^arm" AND VCPKG_TARGET_IS_WINDOWS) + set(NO_BIN_AND_TOOLS TRUE) +endif() + +if(NOT NO_BIN_AND_TOOLS) + set(TOOL_NAMES + dumpcpp + dumpdoc + idc + testcon + ) +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick +) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) + +if(NO_BIN_AND_TOOLS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/tools") +endif() diff --git a/externals/vcpkg/ports/qtactiveqt/vcpkg.json b/externals/vcpkg/ports/qtactiveqt/vcpkg.json new file mode 100755 index 000000000..f89842ac5 --- /dev/null +++ b/externals/vcpkg/ports/qtactiveqt/vcpkg.json @@ -0,0 +1,35 @@ +{ + "name": "qtactiveqt", + "version": "6.3.0", + "description": "ActiveQt", + "homepage": "https://www.qt.io/", + "license": null, + "supports": "windows", + "dependencies": [ + { + "name": "qtactiveqt", + "host": true, + "default-features": false + }, + { + "$comment": "also requires printsupport!", + "name": "qtbase", + "default-features": false, + "features": [ + "gui", + "widgets" + ] + } + ], + "features": { + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] + } + } +} diff --git a/externals/vcpkg/ports/qtapplicationmanager/bump-cmake-version.patch b/externals/vcpkg/ports/qtapplicationmanager/bump-cmake-version.patch new file mode 100755 index 000000000..31b99c71d --- /dev/null +++ b/externals/vcpkg/ports/qtapplicationmanager/bump-cmake-version.patch @@ -0,0 +1,11 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f2236c0..904c5b7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,5 @@ + +-cmake_minimum_required(VERSION 3.16) ++cmake_minimum_required(VERSION 3.19) + + include(.cmake.conf) + project(QtApplicationManager # special case diff --git a/externals/vcpkg/ports/qtapplicationmanager/portfile.cmake b/externals/vcpkg/ports/qtapplicationmanager/portfile.cmake new file mode 100755 index 000000000..8e190a55e --- /dev/null +++ b/externals/vcpkg/ports/qtapplicationmanager/portfile.cmake @@ -0,0 +1,62 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES + bump-cmake-version.patch + wrapper-fixes.patch + ) + +set(TOOL_NAMES appman + appman-controller + appman-dumpqmltypes + appman-packager + appman-qmltestrunner + appman-launcher-qml + package-uploader + ) + +qt_download_submodule(PATCHES ${${PORT}_PATCHES}) +if(QT_UPDATE_VERSION) + return() +endif() + +set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) +set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) +qt_cmake_configure(${_opt} + OPTIONS + -DINPUT_libarchive=system + -DINPUT_libyaml=system + -DFEATURE_am_system_libyaml=ON + -DFEATURE_am_system_libarchive=ON + OPTIONS_DEBUG + OPTIONS_RELEASE) + +### Need to fix one post-build.bat; Couldn't find the place where it gets generated! +if(VCPKG_TARGET_IS_WINDOWS) + set(scriptfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tools/dumpqmltypes/CMakeFiles/appman-dumpqmltypes.dir/post-build.bat") + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" CURRENT_INSTALLED_DIR_NATIVE) + if(EXISTS "${scriptfile}") + vcpkg_replace_string("${scriptfile}" "${CURRENT_INSTALLED_DIR_NATIVE}\\bin" "${CURRENT_INSTALLED_DIR_NATIVE}\\debug\\bin") + endif() +endif() +vcpkg_cmake_install(ADD_BIN_TO_PATH) + +qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) + +qt_install_copyright("${SOURCE_PATH}") + +# Switch to a more complicated script due to the one post-build script which needed fixing after configure. +# If somebody finds out how/where post-build.bat gets generated please fix it there instead. +#qt_install_submodule(PATCHES ${${PORT}_PATCHES} +# TOOL_NAMES ${TOOL_NAMES} +# CONFIGURE_OPTIONS +# --trace-expand +# -DINPUT_libarchive=system +# -DINPUT_libyaml=system +# -DFEATURE_am_system_libyaml=ON +# -DFEATURE_am_system_libarchive=ON +# CONFIGURE_OPTIONS_RELEASE +# CONFIGURE_OPTIONS_DEBUG +# ) + +set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) #Debug tracing libraries are only build if CMAKE_BUILD_TYPE is equal to Debug diff --git a/externals/vcpkg/ports/qtapplicationmanager/vcpkg.json b/externals/vcpkg/ports/qtapplicationmanager/vcpkg.json new file mode 100755 index 000000000..a74a219c7 --- /dev/null +++ b/externals/vcpkg/ports/qtapplicationmanager/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "qtapplicationmanager", + "version": "6.3.0", + "description": "Qt component for application lifecycle management", + "homepage": "https://www.qt.io/", + "license": null, + "supports": "!(windows & arm)", + "dependencies": [ + "libarchive", + "libyaml", + { + "name": "qtapplicationmanager", + "host": true, + "default-features": false + }, + { + "name": "qtbase", + "default-features": false + }, + { + "name": "qtdeclarative", + "default-features": false + }, + { + "name": "qtwayland", + "default-features": false, + "platform": "!windows" + } + ] +} diff --git a/externals/vcpkg/ports/qtapplicationmanager/wrapper-fixes.patch b/externals/vcpkg/ports/qtapplicationmanager/wrapper-fixes.patch new file mode 100755 index 000000000..194e35f81 --- /dev/null +++ b/externals/vcpkg/ports/qtapplicationmanager/wrapper-fixes.patch @@ -0,0 +1,56 @@ +diff --git a/cmake/FindWrapLibArchive.cmake b/cmake/FindWrapLibArchive.cmake +index 67e4ce0..887b766 100644 +--- a/cmake/FindWrapLibArchive.cmake ++++ b/cmake/FindWrapLibArchive.cmake +@@ -16,3 +16,24 @@ add_library(WrapLibArchive::WrapLibArchive INTERFACE IMPORTED) + target_link_libraries(WrapLibArchive::WrapLibArchive INTERFACE ${LibArchive_LIBRARIES}) + target_include_directories(WrapLibArchive::WrapLibArchive INTERFACE ${LibArchive_INCLUDE_DIRS}) + set(WrapLibArchive_FOUND TRUE) ++if(TARGET BZip2::BZip2) ++ set_property(TARGET BZip2::BZip2 PROPERTY _qt_no_promote_global TRUE) ++endif() ++if(TARGET Threads::Threads) ++ set_property(TARGET Threads::Threads PROPERTY _qt_no_promote_global TRUE) ++endif() ++if(TARGET OpenSSL::Crypto) ++ set_property(TARGET OpenSSL::Crypto PROPERTY _qt_no_promote_global TRUE) ++endif() ++if(TARGET zstd::libzstd) ++ set_property(TARGET zstd::libzstd PROPERTY _qt_no_promote_global TRUE) ++endif() ++if(TARGET zstd::libzstd_shared) ++ set_property(TARGET zstd::libzstd_shared PROPERTY _qt_no_promote_global TRUE) ++endif() ++if(TARGET zstd::libzstd_static) ++ set_property(TARGET zstd::libzstd_static PROPERTY _qt_no_promote_global TRUE) ++endif() ++if(TARGET ZLIB::ZLIB) ++ set_property(TARGET ZLIB::ZLIB PROPERTY _qt_no_promote_global TRUE) ++endif() +diff --git a/cmake/FindWrapLibYaml.cmake b/cmake/FindWrapLibYaml.cmake +index 1dab912..c09e97f 100644 +--- a/cmake/FindWrapLibYaml.cmake ++++ b/cmake/FindWrapLibYaml.cmake +@@ -10,10 +10,17 @@ pkg_check_modules(pc_libyaml yaml-0.1 IMPORTED_TARGET) + + + if (NOT pc_libyaml_FOUND) +- set(WrapLibYaml_FOUND FALSE) +- return() ++ find_package(yaml) ++ if(yaml_FOUND) ++ add_library(WrapLibYaml::WrapLibYaml INTERFACE IMPORTED) ++ target_link_libraries(WrapLibYaml::WrapLibYaml INTERFACE ${yaml_LIBRARIES}) ++ else() ++ set(WrapLibYaml_FOUND FALSE) ++ return() ++ endif() ++else() ++ add_library(WrapLibYaml::WrapLibYaml INTERFACE IMPORTED) ++ target_link_libraries(WrapLibYaml::WrapLibYaml INTERFACE PkgConfig::pc_libyaml) + endif() +- +-add_library(WrapLibYaml::WrapLibYaml INTERFACE IMPORTED) +-target_link_libraries(WrapLibYaml::WrapLibYaml INTERFACE ${pc_libyaml_LIBRARIES}) + set(WrapLibYaml_FOUND TRUE) ++ diff --git a/externals/vcpkg/ports/qtbase/allow_outside_prefix.patch b/externals/vcpkg/ports/qtbase/allow_outside_prefix.patch new file mode 100755 index 000000000..7ddef9e4f --- /dev/null +++ b/externals/vcpkg/ports/qtbase/allow_outside_prefix.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake +index bd186c28b..2c1994d2e 100644 +--- a/cmake/QtBuild.cmake ++++ b/cmake/QtBuild.cmake +@@ -28,11 +28,13 @@ function(qt_configure_process_path name default docstring) + elseif(rel_path MATCHES "^\.\./") + # INSTALL_SYSCONFDIR is allowed to be outside the prefix. + if(NOT name STREQUAL "INSTALL_SYSCONFDIR") +- message(FATAL_ERROR +- "Path component '${name}' is outside computed install prefix: ${rel_path} ") +- return() ++ #message(FATAL_ERROR ++ # "Path component '${name}' is outside computed install prefix: ${rel_path} ") ++ #return() ++ set("${name}" "${rel_path}" CACHE STRING "${docstring}" FORCE) ++ else() ++ set("${name}" "${${name}}" CACHE STRING "${docstring}" FORCE) + endif() +- set("${name}" "${${name}}" CACHE STRING "${docstring}" FORCE) + else() + set("${name}" "${rel_path}" CACHE STRING "${docstring}" FORCE) + endif() diff --git a/externals/vcpkg/ports/qtbase/clang-cl_source_location.patch b/externals/vcpkg/ports/qtbase/clang-cl_source_location.patch new file mode 100755 index 000000000..6d0a9527e --- /dev/null +++ b/externals/vcpkg/ports/qtbase/clang-cl_source_location.patch @@ -0,0 +1,14 @@ +diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h +index 823b2057b..4a8cd4fa8 100644 +--- a/src/corelib/kernel/qproperty.h ++++ b/src/corelib/kernel/qproperty.h +@@ -49,8 +49,8 @@ + + #include + +-#if __has_include() && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC) ++#if __has_include() && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC) && defined(__cpp_consteval) + #include + #if defined(__cpp_lib_source_location) + #define QT_SOURCE_LOCATION_NAMESPACE std + #define QT_PROPERTY_COLLECT_BINDING_LOCATION diff --git a/externals/vcpkg/ports/qtbase/cmake/qt_install_copyright.cmake b/externals/vcpkg/ports/qtbase/cmake/qt_install_copyright.cmake new file mode 100755 index 000000000..5215f9675 --- /dev/null +++ b/externals/vcpkg/ports/qtbase/cmake/qt_install_copyright.cmake @@ -0,0 +1,18 @@ +#Could probably be the beginning of a vcpkg_install_copyright? +function(qt_install_copyright SOURCE_PATH) + #Find the relevant license file and install it + if(EXISTS "${SOURCE_PATH}/LICENSE.LGPLv3") + set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.LGPLv3") + elseif(EXISTS "${SOURCE_PATH}/LICENSE.LGPL3") + set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.LGPL3") + elseif(EXISTS "${SOURCE_PATH}/LICENSE.GPLv3") + set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.GPLv3") + elseif(EXISTS "${SOURCE_PATH}/LICENSE.GPL3") + set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.GPL3") + elseif(EXISTS "${SOURCE_PATH}/LICENSE.GPL3-EXCEPT") + set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.GPL3-EXCEPT") + elseif(EXISTS "${SOURCE_PATH}/LICENSE.FDL") + set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.FDL") + endif() + file(INSTALL "${LICENSE_PATH}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endfunction() diff --git a/externals/vcpkg/ports/qtbase/cmake/qt_install_submodule.cmake b/externals/vcpkg/ports/qtbase/cmake/qt_install_submodule.cmake new file mode 100755 index 000000000..d193d075d --- /dev/null +++ b/externals/vcpkg/ports/qtbase/cmake/qt_install_submodule.cmake @@ -0,0 +1,311 @@ +include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-cmake/vcpkg-port-config.cmake") +include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-cmake-config/vcpkg-port-config.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/qt_install_copyright.cmake") + +if(QT_IS_LATEST AND PORT STREQUAL "qtbase") + include("${CMAKE_CURRENT_LIST_DIR}/qt_port_details-latest.cmake") +else() + include("${CMAKE_CURRENT_LIST_DIR}/qt_port_details.cmake") +endif() +#set(PORT_DEBUG ON) + +if(NOT DEFINED QT6_DIRECTORY_PREFIX) + set(QT6_DIRECTORY_PREFIX "Qt6/") +endif() + +macro(qt_stop_on_update) + if(QT_UPDATE_VERSION) + set(VCPKG_POLICY_EMPTY_PACKAGE enabled CACHE INTERNAL "") + return() + endif() +endmacro() + +function(qt_download_submodule) + cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "" + "" + "PATCHES") + + if(QT_UPDATE_VERSION) + set(VCPKG_USE_HEAD_VERSION ON) + set(UPDATE_PORT_GIT_OPTIONS + HEAD_REF "${QT_GIT_TAG}") + endif() + + vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH + URL "https://code.qt.io/qt/${PORT}.git" + REF "${${PORT}_REF}" + ${UPDATE_PORT_GIT_OPTIONS} + ${QT_FETCH_REF} + PATCHES ${_qarg_PATCHES} + ) + + if(QT_UPDATE_VERSION) + set(VCPKG_POLICY_EMPTY_PACKAGE enabled CACHE INTERNAL "") + message(STATUS "VCPKG_HEAD_VERSION:${VCPKG_HEAD_VERSION}") + file(APPEND "${VCPKG_ROOT_DIR}/ports/qtbase/cmake/qt_new_refs.cmake" "set(${PORT}_REF ${VCPKG_HEAD_VERSION})\n") + endif() + set(SOURCE_PATH "${SOURCE_PATH}" PARENT_SCOPE) +endfunction() + + +function(qt_cmake_configure) + cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "DISABLE_NINJA;DISABLE_PARALLEL_CONFIGURE" + "" + "TOOL_NAMES;OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;OPTIONS_MAYBE_UNUSED") + + vcpkg_find_acquire_program(PERL) # Perl is probably required by all qt ports for syncqt + get_filename_component(PERL_PATH ${PERL} DIRECTORY) + vcpkg_add_to_path(${PERL_PATH}) + if(NOT PORT STREQUAL "qtwebengine" OR QT_IS_LATEST) # qtwebengine requires python2; since 6.3 python3 + vcpkg_find_acquire_program(PYTHON3) # Python is required by some qt ports + get_filename_component(PYTHON3_PATH ${PYTHON3} DIRECTORY) + vcpkg_add_to_path(${PYTHON3_PATH}) + endif() + + if(NOT PORT MATCHES "^qtbase") + list(APPEND _qarg_OPTIONS "-DQT_SYNCQT:PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/syncqt.pl") + endif() + set(PERL_OPTION "-DHOST_PERL:PATH=${PERL}") + + set(ninja_option "") + if(_qarg_DISABLE_NINJA) + set(ninja_option WINDOWS_USE_MSBUILD) + endif() + + set(disable_parallel "") + if(_qarg_DISABLE_PARALLEL_CONFIGURE) + set(disable_parallel DISABLE_PARALLEL_CONFIGURE) + endif() + + if(VCPKG_CROSSCOMPILING) + list(APPEND _qarg_OPTIONS "-DQT_HOST_PATH=${CURRENT_HOST_INSTALLED_DIR}") + list(APPEND _qarg_OPTIONS "-DQT_HOST_PATH_CMAKE_DIR:PATH=${CURRENT_HOST_INSTALLED_DIR}/share") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 AND VCPKG_TARGET_IS_WINDOWS) # Remove if PR #16111 is merged + list(APPEND _qarg_OPTIONS -DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_PROCESSOR:STRING=ARM64 -DCMAKE_SYSTEM_NAME:STRING=Windows) + endif() + endif() + + # Disable warning for CMAKE_(REQUIRE|DISABLE)_FIND_PACKAGE_ + string(REGEX MATCHALL "CMAKE_DISABLE_FIND_PACKAGE_[^:=]+" disabled_find_package "${_qarg_OPTIONS}") + list(APPEND _qarg_OPTIONS_MAYBE_UNUSED ${disabled_find_package}) + + string(REGEX MATCHALL "CMAKE_REQUIRE_FIND_PACKAGE_[^:=]+(:BOOL)?=OFF" require_find_package "${_qarg_OPTIONS}") + list(TRANSFORM require_find_package REPLACE "(:BOOL)?=OFF" "") + list(APPEND _qarg_OPTIONS_MAYBE_UNUSED ${require_find_package}) + + # Disable unused warnings for disabled features. Qt might decide to not emit the feature variables if other features are deactivated. + string(REGEX MATCHALL "(QT_)?FEATURE_[^:=]+(:BOOL)?=OFF" disabled_features "${_qarg_OPTIONS}") + list(TRANSFORM disabled_features REPLACE "(:BOOL)?=OFF" "") + list(APPEND _qarg_OPTIONS_MAYBE_UNUSED ${disabled_features}) + + if(QT_IS_LATEST) + list(APPEND _qarg_OPTIONS "-DQT_NO_FORCE_SET_CMAKE_BUILD_TYPE:BOOL=ON") + endif() + + if(NOT PORT MATCHES "qtbase") + list(APPEND _qarg_OPTIONS "-DQT_MKSPECS_DIR:PATH=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6/mkspecs") + endif() + + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + ${ninja_option} + ${disable_parallel} + OPTIONS + -DQT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS:BOOL=ON # We don't want Qt to screw with users toolchain settings. + #-DQT_HOST_PATH= # For crosscompiling + #-DQT_PLATFORM_DEFINITION_DIR=mkspecs/win32-msvc + #-DQT_QMAKE_TARGET_MKSPEC=win32-msvc + #-DQT_USE_CCACHE + -DQT_BUILD_EXAMPLES:BOOL=OFF + -DQT_BUILD_TESTS:BOOL=OFF + -DQT_BUILD_BENCHMARKS:BOOL=OFF + ${PERL_OPTION} + -DINSTALL_BINDIR:STRING=bin + -DINSTALL_LIBEXECDIR:STRING=bin + -DINSTALL_PLUGINSDIR:STRING=${qt_plugindir} + -DINSTALL_QMLDIR:STRING=${qt_qmldir} + ${_qarg_OPTIONS} + OPTIONS_RELEASE + ${_qarg_OPTIONS_RELEASE} + -DINSTALL_DOCDIR:STRING=doc/${QT6_DIRECTORY_PREFIX} + -DINSTALL_INCLUDEDIR:STRING=include/${QT6_DIRECTORY_PREFIX} + -DINSTALL_DESCRIPTIONSDIR:STRING=share/Qt6/modules + -DINSTALL_MKSPECSDIR:STRING=share/Qt6/mkspecs + -DINSTALL_TRANSLATIONSDIR:STRING=translations/${QT6_DIRECTORY_PREFIX} + OPTIONS_DEBUG + # -DFEATURE_debug:BOOL=ON only needed by qtbase and auto detected? + -DINSTALL_DOCDIR:STRING=../doc/${QT6_DIRECTORY_PREFIX} + -DINSTALL_INCLUDEDIR:STRING=../include/${QT6_DIRECTORY_PREFIX} + -DINSTALL_TRANSLATIONSDIR:STRING=../translations/${QT6_DIRECTORY_PREFIX} + -DINSTALL_DESCRIPTIONSDIR:STRING=../share/Qt6/modules + -DINSTALL_MKSPECSDIR:STRING=../share/Qt6/mkspecs + ${_qarg_OPTIONS_DEBUG} + MAYBE_UNUSED_VARIABLES + INSTALL_BINDIR + INSTALL_DOCDIR + INSTALL_LIBEXECDIR + INSTALL_QMLDIR # No qml files + INSTALL_TRANSLATIONSDIR # No translations + INSTALL_PLUGINSDIR # No plugins + INSTALL_DESCRIPTIONSDIR + INSTALL_INCLUDEDIR + HOST_PERL + QT_SYNCQT + QT_NO_FORCE_SET_CMAKE_BUILD_TYPE + ${_qarg_OPTIONS_MAYBE_UNUSED} + ) + set(Z_VCPKG_CMAKE_GENERATOR "${Z_VCPKG_CMAKE_GENERATOR}" PARENT_SCOPE) +endfunction() + +function(qt_fix_prl_files) + file(TO_CMAKE_PATH "${CURRENT_PACKAGES_DIR}/lib" package_dir) + file(TO_CMAKE_PATH "${package_dir}/lib" lib_path) + file(TO_CMAKE_PATH "${package_dir}/include/Qt6" include_path) + file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}" install_prefix) + file(GLOB_RECURSE prl_files "${CURRENT_PACKAGES_DIR}/*.prl") + foreach(prl_file IN LISTS prl_files) + file(READ "${prl_file}" _contents) + string(REPLACE "${lib_path}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}") + string(REPLACE "${include_path}" "\$\$[QT_INSTALL_HEADERS]" _contents "${_contents}") + string(REPLACE "${install_prefix}" "\$\$[QT_INSTALL_PREFIX]" _contents "${_contents}") + string(REPLACE "[QT_INSTALL_PREFIX]/lib/objects-Debug" "[QT_INSTALL_LIBS]/objects-Debug" _contents "${_contents}") + string(REPLACE "[QT_INSTALL_PREFIX]/Qt6/qml" "[QT_INSTALL_QML]" _contents "${_contents}") + #Note: This only works without an extra if case since QT_INSTALL_PREFIX is the same for debug and release + file(WRITE "${prl_file}" "${_contents}") + endforeach() +endfunction() + +function(qt_fixup_and_cleanup) + cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "" + "" + "TOOL_NAMES") + vcpkg_copy_pdbs() + + ## Handle PRL files + qt_fix_prl_files() + + ## Handle CMake files. + set(COMPONENTS) + file(GLOB COMPONENTS_OR_FILES LIST_DIRECTORIES true "${CURRENT_PACKAGES_DIR}/share/Qt6*") + list(REMOVE_ITEM COMPONENTS_OR_FILES "${CURRENT_PACKAGES_DIR}/share/Qt6") + foreach(_glob IN LISTS COMPONENTS_OR_FILES) + if(IS_DIRECTORY "${_glob}") + string(REPLACE "${CURRENT_PACKAGES_DIR}/share/Qt6" "" _component "${_glob}") + debug_message("Adding cmake component: '${_component}'") + list(APPEND COMPONENTS ${_component}) + endif() + endforeach() + + foreach(_comp IN LISTS COMPONENTS) + if(EXISTS "${CURRENT_PACKAGES_DIR}/share/Qt6${_comp}") + vcpkg_cmake_config_fixup(PACKAGE_NAME "Qt6${_comp}" CONFIG_PATH "share/Qt6${_comp}" TOOLS_PATH "tools/Qt6/bin") + # Would rather put it into share/cmake as before but the import_prefix correction in vcpkg_cmake_config_fixup is working against that. + else() + message(STATUS "WARNING: Qt component ${_comp} not found/built!") + endif() + endforeach() + #fix debug plugin paths (should probably be fixed in vcpkg_cmake_config_fixup) + file(GLOB_RECURSE DEBUG_CMAKE_TARGETS "${CURRENT_PACKAGES_DIR}/share/**/*Targets-debug.cmake") + debug_message("DEBUG_CMAKE_TARGETS:${DEBUG_CMAKE_TARGETS}") + foreach(_debug_target IN LISTS DEBUG_CMAKE_TARGETS) + vcpkg_replace_string("${_debug_target}" "{_IMPORT_PREFIX}/${qt_plugindir}" "{_IMPORT_PREFIX}/debug/${qt_plugindir}") + vcpkg_replace_string("${_debug_target}" "{_IMPORT_PREFIX}/${qt_qmldir}" "{_IMPORT_PREFIX}/debug/${qt_qmldir}") + endforeach() + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(GLOB_RECURSE STATIC_CMAKE_TARGETS "${CURRENT_PACKAGES_DIR}/share/Qt6Qml/QmlPlugins/*.cmake") + foreach(_plugin_target IN LISTS STATIC_CMAKE_TARGETS) + # restore a single get_filename_component which was remove by vcpkg_cmake_config_fixup + vcpkg_replace_string("${_plugin_target}" + [[get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)]] + "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)") + endforeach() + endif() + + set(qt_tooldest "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") + set(qt_searchdir "${CURRENT_PACKAGES_DIR}/bin") + ## Handle Tools + foreach(_tool IN LISTS _qarg_TOOL_NAMES) + if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/bin/${_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + debug_message("Removed '${_tool}' from copy tools list since it was not found!") + list(REMOVE_ITEM _qarg_TOOL_NAMES ${_tool}) + endif() + endforeach() + if(_qarg_TOOL_NAMES) + set(tool_names ${_qarg_TOOL_NAMES}) + vcpkg_copy_tools(TOOL_NAMES ${tool_names} SEARCH_DIR "${qt_searchdir}" DESTINATION "${qt_tooldest}" AUTO_CLEAN) + if(EXISTS "${CURRENT_PACKAGES_DIR}/${qt_plugindir}") + file(COPY "${CURRENT_PACKAGES_DIR}/${qt_plugindir}/" DESTINATION "${qt_tooldest}") + endif() + endif() + + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/") + file(COPY "${CURRENT_PACKAGES_DIR}/bin/" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") + endif() + file(GLOB_RECURSE _installed_dll_files RELATIVE "${CURRENT_INSTALLED_DIR}/tools/Qt6/bin" "${CURRENT_INSTALLED_DIR}/tools/Qt6/bin/*.dll") + foreach(_dll_to_remove IN LISTS _installed_dll_files) + file(GLOB_RECURSE _packaged_dll_file "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${_dll_to_remove}") + if(EXISTS "${_packaged_dll_file}") + file(REMOVE "${_packaged_dll_file}") + endif() + endforeach() + file(GLOB_RECURSE _folders LIST_DIRECTORIES true "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/**/") + file(GLOB_RECURSE _files "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/**/") + if(_files) + list(REMOVE_ITEM _folders ${_files}) + endif() + foreach(_dir IN LISTS _folders) + if(NOT "${_remaining_dll_files}" MATCHES "${_dir}") + file(REMOVE_RECURSE "${_dir}") + endif() + endforeach() + endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/lib/cmake/" + "${CURRENT_PACKAGES_DIR}/debug/include" + ) + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(GLOB_RECURSE _bin_files "${CURRENT_PACKAGES_DIR}/bin/*") + if(NOT _bin_files STREQUAL "") + message(STATUS "Remaining files in bin: '${_bin_files}'") + else() # Only clean if empty otherwise let vcpkg throw and error. + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/" "${CURRENT_PACKAGES_DIR}/debug/bin/") + endif() + endif() + +endfunction() + +function(qt_install_submodule) + cmake_parse_arguments(PARSE_ARGV 0 "_qis" "DISABLE_NINJA" + "" + "PATCHES;TOOL_NAMES;CONFIGURE_OPTIONS;CONFIGURE_OPTIONS_DEBUG;CONFIGURE_OPTIONS_RELEASE;CONFIGURE_OPTIONS_MAYBE_UNUSED") + + set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) + set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) + + qt_download_submodule(PATCHES ${_qis_PATCHES}) + if(QT_UPDATE_VERSION) + return() + endif() + + if(_qis_DISABLE_NINJA) + set(_opt DISABLE_NINJA) + endif() + qt_cmake_configure(${_opt} + OPTIONS ${_qis_CONFIGURE_OPTIONS} + OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} + OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE} + OPTIONS_MAYBE_UNUSED ${_qis_CONFIGURE_OPTIONS_MAYBE_UNUSED} + ) + + vcpkg_cmake_install(ADD_BIN_TO_PATH) + + qt_fixup_and_cleanup(TOOL_NAMES ${_qis_TOOL_NAMES}) + + qt_install_copyright("${SOURCE_PATH}") + set(SOURCE_PATH "${SOURCE_PATH}" PARENT_SCOPE) +endfunction() diff --git a/externals/vcpkg/ports/qtbase/cmake/qt_port_details-latest.cmake b/externals/vcpkg/ports/qtbase/cmake/qt_port_details-latest.cmake new file mode 100755 index 000000000..db721335a --- /dev/null +++ b/externals/vcpkg/ports/qtbase/cmake/qt_port_details-latest.cmake @@ -0,0 +1,136 @@ +set(QT_VERSION 6.3.0) + +if(PORT MATCHES "qtquickcontrols2") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + message(STATUS "qtquickcontrols2 is integrated in qtdeclarative since Qt 6.2. Please remove your dependency on it!") + return() +endif() + +### Setting up the git tag. +set(QT_FETCH_REF "") +set(QT_GIT_TAG "v${QT_VERSION}") +if(PORT MATCHES "qtdeviceutilities") + set(QT_FETCH_REF FETCH_REF "6.3.0") + set(QT_GIT_TAG "6.3.0") +endif() +if(PORT MATCHES "qtlocation") + set(QT_FETCH_REF FETCH_REF "${QT_VERSION}") + set(QT_GIT_TAG "${QT_VERSION}") +endif() + +set(QT_IS_LATEST TRUE) +#set(QT_UPDATE_VERSION TRUE) +if(QT_UPDATE_VERSION) + function(vcpkg_extract_source_archive) + endfunction() +endif() + +set(QT_PORTS qt + qtbase + qttools + qtdeclarative + qtsvg + qt5compat + qtshadertools + qtquicktimeline + qtquick3d + qttranslations + qtwayland + qtdoc + qtcoap + qtopcua + qtimageformats + qtmqtt + qtnetworkauth + # qtquickcontrols2 -> moved into qtdeclarative + ## New in 6.1 + qtactiveqt + qtdatavis3d + qtdeviceutilities + qtlottie + qtscxml + qtvirtualkeyboard + qtcharts + ## New in 6.2 + qtconnectivity + qtpositioning + qtlocation + qtmultimedia + qtremoteobjects + qtsensors + qtserialbus + qtserialport + qtwebchannel + qtwebengine + qtwebsockets + qtwebview + ## New in 6.2.2 + qtinterfaceframework + qtapplicationmanager + ) + +foreach(_port IN LISTS QT_PORTS) + set(${_port}_TAG ${QT_GIT_TAG}) +endforeach() +set(qtbase_REF 0668a36d2804b300010d874f5ff4073c25c2784c) +set(qtshadertools_REF e526e8ca88197d82996818db1f00e8a3e07bf584) +set(qtdeclarative_REF cbe89ee41aa219ce7e90143e3cf54283e580f7c1) +set(qt5compat_REF 32db676ab6854633512181b2c40950c98525c5ba) +set(qttools_REF a0a9cf1d1338b3e7f868bc0840e1e9a096c86dfa) # Additional refs below +set(qtcoap_REF 4453575b94836cf1cd52642eceb1d6f5d16b26a9) +set(qtdoc_REF d0da4d47f152dc50fb672bc5011b61a5bbb36f43) +set(qtimageformats_REF 45cfb044698df541ced53e3523799232599712a6) +set(qtmqtt_REF 3174dc30d2b37c74ea685d27ab0030c7392032c0) +set(qtnetworkauth_REF 507214965cbcebbbd563904d615cf7ebc464cc48) +set(qtopcua_REF 2c7051d85f640e9afe6c3f8f718bb2152305467c) +set(qtquicktimeline_REF 16bc2eb9f5e84923dc04c3941f5347cbc1b0e5b0) +set(qtquick3d_REF bf912a678898dcde61f139f63b49e1e42717fa8d) +set(qtsvg_REF cf900932886ebdd3de6c3a4a7e63cf363663eb87) +set(qttranslations_REF 19701f38b9dc10d925c6974833d693b5038e1589) +set(qtwayland_REF 840673bf1849595869873bad15c52a312e849ffb) +### New in 6.1 +set(qtactiveqt_REF 747fdd27c413ea42fb730230331984f388d3826b) +set(qtcharts_REF 03929b43d8e2a5c9b1487fdc6b8a2b067ada16f8) +set(qtdatavis3d_REF 137ebda0932e6faf0fbd61b0beb3cfb4dac8efbd) +set(qtdeviceutilities_REF 0520d7fd121f7773d04a7d3318553ff7fed1b3a9) # +set(qtlottie_REF e68bf89fefd941a930c83e2c29b629fcfea03eb3) +set(qtscxml_REF 4f52a1b6e4f25f3473f42ce249c4c183c5910183) +set(qtvirtualkeyboard_REF 92aee38dab196e8b5ca436f9f20c0fc66d8155d5) +### New in 6.2 +set(qtconnectivity_REF f62954bad729f7853c9fbe2ea0b3235cfae2701a) +set(qtmultimedia_REF 3d2dafab1eb60c17a30cf03213cd2f6f71185137) +set(qtremoteobjects_REF 2c53bf0e9262a24f8fc8553e5004e7d00bc7e556) +set(qtserialport_REF 7e44935b14b783add342a25f426fcdf299279024) +set(qtsensors_REF 3222894c246076c6e7bd151e638ce3eb4ce5c16b) +set(qtserialbus_REF 3ee1694d2a8fb0b755adce4b59001b784e9c301e) +set(qtlocation_REF 0) # Currently empty port +set(qtwebchannel_REF a85e05069a2b17ceb5b6332671a2eef261ec783f) +set(qtwebengine_REF 9158e7652f24800b2b7dbe59b7834687bc1baf13) # Additional refs below +set(qtwebsockets_REF 487116c9a85d8f5a920f47045dfce0b0defd5139) +set(qtwebview_REF d7498a108c67b21c39d8ba775330cc122ce21c1a) +set(qtpositioning_REF f61d2f336892b85cdcd5d508bb4a0db7f768d439) +### New in Qt 6.2.2 +set(qtapplicationmanager_REF 68464eb2b3fa89c69cfc5fc4f19450af61116dd2) # +set(qtinterfaceframework_REF 7ddeb99d6215a4b63102d6a5bc73e50d77ddb3d7) # + +#Submodule stuff: +set(qttools_qlitehtml_REF 4931b7aa30f256c20573d283561aa432fecf8f38) +set(qttools_litehtml_REF 6236113734bb0a28467e5999e86fdd2834be8e01) +set(qttools_litehtml_HASH 38effe92aaebd7113ad3bf3b70c1b3564d6226a766aa968c80ab35fa90ae78d601486226f97d16fa5bd3abf314db19f9f0c90e31de91e87bda82cde27f0a57dc) +set(qtwebengine_chromium_REF 2c9916de251f15369fa0f0c6bd3f45f5cf1a6f06) + +if(QT_UPDATE_VERSION) + message(STATUS "Running Qt in automatic version port update mode!") + set(_VCPKG_INTERNAL_NO_HASH_CHECK 1) + if("${PORT}" MATCHES "qtbase") + file(REMOVE "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_new_refs.cmake") + foreach(_current_qt_port IN LISTS QT_PORTS) + set(_current_control "${VCPKG_ROOT_DIR}/ports/${_current_qt_port}/vcpkg.json") + file(READ "${_current_control}" _control_contents) + string(REGEX REPLACE "\"version-(string|semver)\": [^\n]+\n" "\"version-semver\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}") + string(REGEX REPLACE "\"port-version\": [^\n]+\n" "" _control_contents "${_control_contents}") + file(WRITE "${_current_control}" "${_control_contents}") + #need to run a vcpkg format-manifest --all after update once + endforeach() + endif() +endif() diff --git a/externals/vcpkg/ports/qtbase/cmake/qt_port_details.cmake b/externals/vcpkg/ports/qtbase/cmake/qt_port_details.cmake new file mode 100755 index 000000000..a33f93b4a --- /dev/null +++ b/externals/vcpkg/ports/qtbase/cmake/qt_port_details.cmake @@ -0,0 +1,132 @@ +set(QT_VERSION 6.2.4) + +if(PORT MATCHES "qtquickcontrols2") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + message(STATUS "qtquickcontrols2 is integrated in qtdeclarative since Qt 6.2. Please remove your dependency on it!") + return() +endif() + +### Setting up the git tag. +set(QT_FETCH_REF "") +set(QT_GIT_TAG "v${QT_VERSION}") +if(PORT MATCHES "qtdeviceutilities|qtlocation|qtinterfaceframework|qtapplicationmanager") + # So much for consistency .... + set(QT_FETCH_REF FETCH_REF "${QT_VERSION}") + set(QT_GIT_TAG "${QT_VERSION}") +endif() + +#set(QT_UPDATE_VERSION TRUE) +if(QT_UPDATE_VERSION) + function(vcpkg_extract_source_archive) + endfunction() +endif() + +set(QT_PORTS qt + qtbase + qttools + qtdeclarative + qtsvg + qt5compat + qtshadertools + qtquicktimeline + qtquick3d + qttranslations + qtwayland + qtdoc + qtcoap + qtopcua + qtimageformats + qtmqtt + qtnetworkauth + # qtquickcontrols2 -> moved into qtdeclarative + ## New in 6.1 + qtactiveqt + qtdatavis3d + qtdeviceutilities + qtlottie + qtscxml + qtvirtualkeyboard + qtcharts + ## New in 6.2 + qtconnectivity + qtpositioning + qtlocation + qtmultimedia + qtremoteobjects + qtsensors + qtserialbus + qtserialport + qtwebchannel + qtwebengine + qtwebsockets + qtwebview + ## New in 6.2.2 + qtinterfaceframework + qtapplicationmanager + ) + +foreach(_port IN LISTS QT_PORTS) + set(${_port}_TAG ${QT_GIT_TAG}) +endforeach() +set(qtbase_REF 597359f7d0736917123842dee63a7ae45522eb8e ) +set(qtshadertools_REF d954aeb073375ee1edda4d6b2956c3c79b26b386 ) +set(qtdeclarative_REF 614d85d460fa46e947eeb4281609ce5453a29e5c ) +set(qt5compat_REF c5dab10ba77dd2701dbd2d7b69998fbee90557f2 ) +set(qttools_REF a60e0e5dfb2af83ffb1adda28028b24e21fe9131 ) # Additional refs below +set(qtcoap_REF 29df645fc165087e74b603e7ad20033381006fb5 ) +set(qtdoc_REF 5c70158a15f23224a76b6919ab06eefee6ed187e ) +set(qtimageformats_REF 356fb7846b5bc002b2d34e23253fda1dffed7932 ) +set(qtmqtt_REF 9ad6c48474c2b94c62a518dc3dc7e65d30a6309e ) +set(qtnetworkauth_REF d5ffb7549dd1e6139b746021c4d40053d0f15950 ) +set(qtopcua_REF 4a0dd4334d98bea48acda1e203ab2c31f207bad3 ) +set(qtquicktimeline_REF 6a06bdbaa55d1c165e992732f2e3dc923846b921 ) +set(qtquick3d_REF d126dea81f48386ef24e8b30e1328c40e72c4861 ) +set(qtsvg_REF 77ea18adfb91c591f249f442e0ffc0079023e431 ) +set(qttranslations_REF 87f95df09b1fc388ea15ce208a349d6b1deac2a4 ) +set(qtwayland_REF 6bdaed8301336750dda95823ed0dfac4828ebab6 ) +### New in 6.1 +set(qtactiveqt_REF 5dd7acd1395627e6bd0d87beb148957059c1a3c6 ) +set(qtcharts_REF 7184ea521d04ec13587562c3275ae698fa9a722e ) +set(qtdatavis3d_REF 74c469d4926f59264c5cbc47fe301fe4713aa358 ) +set(qtdeviceutilities_REF f7333510b4dcfe32eb9065a63c434704750d4fb6 ) +set(qtlottie_REF fd61d8e92cfacbd3d10f31b176a7cde911525632 ) +set(qtscxml_REF 63455c888e012fdc682c32fd3d0de96127721bd4 ) +set(qtvirtualkeyboard_REF ffe9bba23ae45662d25ac3d90167d794e0d6c828 ) +### New in 6.2 +set(qtconnectivity_REF f0ac95d1685f4f0f2e72fb42800b17d7738ccefb ) +set(qtmultimedia_REF 3423c7172f948f27ff0512d1d2db4ea97fc0e9c0 ) +set(qtremoteobjects_REF 2d0f27e736211e2a6b9d08345f65c736a17a67eb ) +set(qtserialport_REF c7dc6737a2e98af81900f55f814cf79a6d579779 ) +set(qtsensors_REF 32dda47f507e74ef7ed33290545b762a0c20e532 ) +set(qtserialbus_REF 1ebbf87cbc90c22817785bffc563d4bb86525abc ) +set(qtlocation_REF 0 ) # Currently empty port +set(qtwebchannel_REF e1014dcf9a924d3b8fd3450a3360381a0a8fc6ab ) +set(qtwebengine_REF cc7181c12d1d1605ecab6c448df4a684278d01d8 ) # Additional refs below +set(qtwebsockets_REF fd509016da201ed63122c5ec79355930f2489ee8 ) +set(qtwebview_REF aade84c30fbbc85fe5a8c5e49172a02a7522623d ) +set(qtpositioning_REF 3a68165bc88f9ddd165567d30887147d2d71915b ) +### New in Qt 6.2.2 +set(qtapplicationmanager_REF 2626ae6e9ce84aebd88a163153719c07d7f65b7d ) +set(qtinterfaceframework_REF 71512be8758c75b4b6b0130d6b623f564c6bf227 ) + +#Submodule stuff: +set(qttools_qlitehtml_REF 4931b7aa30f256c20573d283561aa432fecf8f38) +set(qttools_litehtml_REF 6236113734bb0a28467e5999e86fdd2834be8e01) +set(qttools_litehtml_HASH 38effe92aaebd7113ad3bf3b70c1b3564d6226a766aa968c80ab35fa90ae78d601486226f97d16fa5bd3abf314db19f9f0c90e31de91e87bda82cde27f0a57dc) +set(qtwebengine_chromium_REF b33b4266df8c333d3d273ae4665d6b322eee33c6) + +if(QT_UPDATE_VERSION) + message(STATUS "Running Qt in automatic version port update mode!") + set(_VCPKG_INTERNAL_NO_HASH_CHECK 1) + if("${PORT}" MATCHES "qtbase") + file(REMOVE "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_new_refs.cmake") + foreach(_current_qt_port IN LISTS QT_PORTS) + set(_current_control "${VCPKG_ROOT_DIR}/ports/${_current_qt_port}/vcpkg.json") + file(READ "${_current_control}" _control_contents) + string(REGEX REPLACE "\"version(-(string|semver))?\": [^\n]+\n" "\"version\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}") + string(REGEX REPLACE "\"port-version\": [^\n]+\n" "" _control_contents "${_control_contents}") + file(WRITE "${_current_control}" "${_control_contents}") + #need to run a vcpkg format-manifest --all after update once + endforeach() + endif() +endif() diff --git a/externals/vcpkg/ports/qtbase/config_install.patch b/externals/vcpkg/ports/qtbase/config_install.patch new file mode 100755 index 000000000..51c6e975c --- /dev/null +++ b/externals/vcpkg/ports/qtbase/config_install.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake +index bd186c28b..edee52e8b 100644 +--- a/cmake/QtBuild.cmake ++++ b/cmake/QtBuild.cmake +@@ -194,7 +194,7 @@ function(qt_internal_set_up_global_paths) + if(QT_CONFIG_INSTALL_DIR) + string(APPEND QT_CONFIG_INSTALL_DIR "/") + endif() +- string(APPEND QT_CONFIG_INSTALL_DIR ${__config_path_part}) ++ string(APPEND QT_CONFIG_INSTALL_DIR "share") + + set(QT_BUILD_DIR "${QT_BUILD_DIR}" PARENT_SCOPE) + set(QT_INSTALL_DIR "${QT_INSTALL_DIR}" PARENT_SCOPE) diff --git a/externals/vcpkg/ports/qtbase/dont_force_cmakecache.patch b/externals/vcpkg/ports/qtbase/dont_force_cmakecache.patch new file mode 100755 index 000000000..fc5423425 --- /dev/null +++ b/externals/vcpkg/ports/qtbase/dont_force_cmakecache.patch @@ -0,0 +1,58 @@ +diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake +index 4f8106dfa..bec5c402e 100644 +--- a/cmake/QtPostProcessHelpers.cmake ++++ b/cmake/QtPostProcessHelpers.cmake +@@ -472,7 +472,7 @@ function(qt_generate_install_prefixes out_var) + + foreach(var ${vars}) + get_property(docstring CACHE "${var}" PROPERTY HELPSTRING) +- string(APPEND content "set(${var} \"${${var}}\" CACHE STRING \"${docstring}\" FORCE)\n") ++ string(APPEND content "set(${var} \"${${var}}\" CACHE STRING \"${docstring}\" )\n") + endforeach() + + set(${out_var} "${content}" PARENT_SCOPE) +@@ -528,7 +528,7 @@ qt_internal_force_set_cmake_build_type_conditionally( + endif() + if(CMAKE_CONFIGURATION_TYPES) + string(APPEND multi_config_specific +- " set(CMAKE_CONFIGURATION_TYPES \"${CMAKE_CONFIGURATION_TYPES}\" CACHE STRING \"\" FORCE)\n") ++ " set(CMAKE_CONFIGURATION_TYPES \"${CMAKE_CONFIGURATION_TYPES}\" CACHE STRING \"\")\n") + endif() + if(CMAKE_TRY_COMPILE_CONFIGURATION) + string(APPEND multi_config_specific +@@ -655,7 +655,7 @@ endif()\n") + # find_package(Qt6Core) is called in case if the feature was disabled. + string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS " + if(NOT QT_SKIP_BUILD_INTERNALS_PKG_CONFIG_FEATURE) +- set(FEATURE_pkg_config \"${FEATURE_pkg_config}\" CACHE STRING \"Using pkg-config\" FORCE) ++ set(FEATURE_pkg_config \"${FEATURE_pkg_config}\" CACHE STRING \"Using pkg-config\") + endif()\n") + + # The OpenSSL root dir needs to be saved so that repos other than qtbase (like qtopcua) can +diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in +index cadf3847c..6ec51fd63 100644 +--- a/cmake/QtBuildInternalsExtra.cmake.in ++++ b/cmake/QtBuildInternalsExtra.cmake.in +@@ -41,11 +41,11 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND + AND "${CMAKE_STAGING_PREFIX}" STREQUAL "" + AND NOT QT_BUILD_INTERNALS_NO_FORCE_SET_STAGING_PREFIX) + set(CMAKE_STAGING_PREFIX "${qtbi_new_prefix}" CACHE PATH +- "Staging path prefix, prepended onto install directories on the host machine." FORCE) ++ "Staging path prefix, prepended onto install directories on the host machine." ) + set(qtbi_new_prefix "${qtbi_orig_prefix}") + endif() + set(CMAKE_INSTALL_PREFIX "${qtbi_new_prefix}" CACHE PATH +- "Install path prefix, prepended onto install directories." FORCE) ++ "Install path prefix, prepended onto install directories." ) + unset(qtbi_orig_prefix) + unset(qtbi_real_orig_prefix) + unset(qtbi_new_prefix) +@@ -138,7 +138,7 @@ function(qt_internal_force_set_cmake_build_type_conditionally value) + AND NOT __qt_toolchain_cmake_build_type_before_project_call + AND NOT QT_NO_FORCE_SET_CMAKE_BUILD_TYPE + AND NOT __qt_internal_extras_is_multi_config) +- set(CMAKE_BUILD_TYPE "${value}" CACHE STRING "Choose the type of build." FORCE) ++ set(CMAKE_BUILD_TYPE "${value}" CACHE STRING "Choose the type of build.") + endif() + endfunction() + diff --git a/externals/vcpkg/ports/qtbase/dont_force_cmakecache_latest.patch b/externals/vcpkg/ports/qtbase/dont_force_cmakecache_latest.patch new file mode 100755 index 000000000..752cefe6d --- /dev/null +++ b/externals/vcpkg/ports/qtbase/dont_force_cmakecache_latest.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake +index 4f8106dfa..bec5c402e 100644 +--- a/cmake/QtPostProcessHelpers.cmake ++++ b/cmake/QtPostProcessHelpers.cmake +@@ -414,7 +414,7 @@ function(qt_generate_install_prefixes out_var) + + foreach(var ${vars}) + get_property(docstring CACHE "${var}" PROPERTY HELPSTRING) +- string(APPEND content "set(${var} \"${${var}}\" CACHE STRING \"${docstring}\" FORCE)\n") ++ string(APPEND content "set(${var} \"${${var}}\" CACHE STRING \"${docstring}\")\n") + endforeach() + + set(${out_var} "${content}" PARENT_SCOPE) diff --git a/externals/vcpkg/ports/qtbase/env.patch b/externals/vcpkg/ports/qtbase/env.patch new file mode 100755 index 000000000..6a3716759 --- /dev/null +++ b/externals/vcpkg/ports/qtbase/env.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/QtTestHelpers.cmake b/cmake/QtTestHelpers.cmake +index 279ab07dd..951fd3d36 100644 +--- a/cmake/QtTestHelpers.cmake ++++ b/cmake/QtTestHelpers.cmake +@@ -653,9 +653,9 @@ function(qt_internal_collect_command_environment out_path out_plugin_path) + # The regular CMAKE_INSTALL_PREFIX can be different for example when building standalone tests. + # Any given CMAKE_INSTALL_PREFIX takes priority over qt_relocatable_install_prefix for the + # PATH environment variable. +- set(install_prefixes "${CMAKE_INSTALL_PREFIX}") ++ set(install_prefixes "${CMAKE_INSTALL_PREFIX}$<$:/debug>") + if(QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX) +- list(APPEND install_prefixes "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}") ++ list(APPEND install_prefixes "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}$<$:/debug>") + endif() + + file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}" test_env_path) diff --git a/externals/vcpkg/ports/qtbase/fix_cmake_build.patch b/externals/vcpkg/ports/qtbase/fix_cmake_build.patch new file mode 100755 index 000000000..65410e3fc --- /dev/null +++ b/externals/vcpkg/ports/qtbase/fix_cmake_build.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in +index ffc9d90f8..0b3a7d59e 100644 +--- a/cmake/QtBuildInternalsExtra.cmake.in ++++ b/cmake/QtBuildInternalsExtra.cmake.in +@@ -51,8 +51,8 @@ endif() + set(QT_WILL_INSTALL @QT_WILL_INSTALL@ CACHE BOOL + "Boolean indicating if doing a Qt prefix build (vs non-prefix build)." FORCE) + +-set(QT_SOURCE_TREE "@QT_SOURCE_TREE@" CACHE PATH +-"A path to the source tree of the previously configured QtBase project." FORCE) ++# set(QT_SOURCE_TREE "@QT_SOURCE_TREE@" CACHE PATH ++# "A path to the source tree of the previously configured QtBase project." FORCE) + + # Propagate decision of building tests and examples to other repositories. + set(QT_BUILD_TESTS @QT_BUILD_TESTS@ CACHE BOOL "Build the testing tree.") diff --git a/externals/vcpkg/ports/qtbase/fix_egl.patch b/externals/vcpkg/ports/qtbase/fix_egl.patch new file mode 100755 index 000000000..786831068 --- /dev/null +++ b/externals/vcpkg/ports/qtbase/fix_egl.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake +index eafbc1ff9..dd4068838 100644 +--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake ++++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake +@@ -82,6 +82,7 @@ find_path(EGL_INCLUDE_DIR + find_library(EGL_LIBRARY + NAMES + EGL ++ libEGL # required to find angle on windows within vcpkg. + HINTS + ${PKG_EGL_LIBRARY_DIRS} + ) diff --git a/externals/vcpkg/ports/qtbase/harfbuzz.patch b/externals/vcpkg/ports/qtbase/harfbuzz.patch new file mode 100755 index 000000000..a2f8e7424 --- /dev/null +++ b/externals/vcpkg/ports/qtbase/harfbuzz.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/FindWrapSystemHarfbuzz.cmake b/cmake/FindWrapSystemHarfbuzz.cmake +index 3cb44aa76..9bf0d7165 100644 +--- a/cmake/FindWrapSystemHarfbuzz.cmake ++++ b/cmake/FindWrapSystemHarfbuzz.cmake +@@ -6,7 +6,7 @@ if(TARGET WrapSystemHarfbuzz::WrapSystemHarfbuzz) + endif() + set(WrapSystemHarfbuzz_REQUIRED_VARS __harfbuzz_found) + +-find_package(harfbuzz ${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION} QUIET) ++find_package(harfbuzz QUIET) # VCPKG is missing the version file for harfbuzz. + + # Gentoo has some buggy version of a harfbuzz Config file. Check if include paths are valid. + set(__harfbuzz_target_name "harfbuzz::harfbuzz") diff --git a/externals/vcpkg/ports/qtbase/portfile.cmake b/externals/vcpkg/ports/qtbase/portfile.cmake new file mode 100755 index 000000000..d3f48e118 --- /dev/null +++ b/externals/vcpkg/ports/qtbase/portfile.cmake @@ -0,0 +1,438 @@ +# Reminder for myself and everybody else: +# Qt cross module dependency information within the Qt respository is wrong and/or incomplete. +# Always check the toplevel CMakeLists.txt for the find_package call and search for linkage against the Qt:: targets +# Often enough certain (bigger) dependencies are only used to build examples and/or tests. +# As such getting the correct dependency information relevant for vcpkg requires a manual search/check +set(QT_IS_LATEST ON) +if("latest" IN_LIST FEATURES) + set(QT_IS_LATEST ON) +endif() + +## All above goes into the qt_port_hashes in the future +include("${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_submodule.cmake") + +set(${PORT}_PATCHES + allow_outside_prefix.patch + clang-cl_source_location.patch + config_install.patch + fix_cmake_build.patch + harfbuzz.patch + fix_egl.patch + ) + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + list(APPEND ${PORT}_PATCHES env.patch) +endif() + +if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST) + list(APPEND ${PORT}_PATCHES + dont_force_cmakecache.patch + ) +else() + list(APPEND ${PORT}_PATCHES + dont_force_cmakecache_latest.patch + ) +endif() + +if(VCPKG_TARGET_IS_WINDOWS AND NOT "doubleconversion" IN_LIST FEATURES) + message(FATAL_ERROR "${PORT} requires feature doubleconversion on windows!" ) +endif() + +# Features can be found via searching for qt_feature in all configure.cmake files in the source: +# The files also contain information about the Platform for which it is searched +# Always use FEATURE_ in vcpkg_cmake_configure +# (using QT_FEATURE_X overrides Qts condition check for the feature.) +# Theoretically there is a feature for every widget to enable/disable it but that is way to much for vcpkg + +set(input_vars doubleconversion freetype harfbuzz libb2 jpeg libmd4c png sql-sqlite) +set(INPUT_OPTIONS) +foreach(_input IN LISTS input_vars) + if(_input MATCHES "(png|jpeg)" ) + list(APPEND INPUT_OPTIONS -DINPUT_lib${_input}:STRING=) + elseif(_input MATCHES "(sql-sqlite)") # Not yet used by the cmake build + else() + list(APPEND INPUT_OPTIONS -DINPUT_${_input}:STRING=) + endif() + if("${_input}" IN_LIST FEATURES) + string(APPEND INPUT_OPTIONS system) + elseif(_input STREQUAL "libb2" AND NOT VCPKG_TARGET_IS_WINDOWS) + string(APPEND INPUT_OPTIONS system) + elseif(_input STREQUAL "libmd4c") + string(APPEND INPUT_OPTIONS qt) # libmd4c is not yet in VCPKG (but required by qtdeclarative) + else() + string(APPEND INPUT_OPTIONS no) + endif() +endforeach() + +# General features: + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "appstore-compliant" FEATURE_appstore_compliant + "zstd" FEATURE_zstd + "framework" FEATURE_framework + "concurrent" FEATURE_concurrent + "concurrent" FEATURE_future + "dbus" FEATURE_dbus + "gui" FEATURE_gui + "thread" FEATURE_thread + "network" FEATURE_network + "sql" FEATURE_sql + "widgets" FEATURE_widgets + #"xml" FEATURE_xml # Required to build moc + "testlib" FEATURE_testlib + "zstd" CMAKE_REQUIRE_FIND_PACKAGE_zstd + ${require_features} +INVERTED_FEATURES + "zstd" CMAKE_DISABLE_FIND_PACKAGE_ZSTD + "dbus" CMAKE_DISABLE_FIND_PACKAGE_WrapDBus1 + ) + +list(APPEND FEATURE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libudev:BOOL=ON) +list(APPEND FEATURE_OPTIONS -DFEATURE_xml:BOOL=ON) + +if(VCPKG_QT_NAMESPACE) + list(APPEND FEATURE_OPTIONS "-DQT_NAMESPACE:STRING=${VCPKG_QT_NAMESPACE}") +endif() + +# Corelib features: +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_CORE_OPTIONS +FEATURES + "doubleconversion" FEATURE_doubleconversion + "glib" FEATURE_glib + "icu" FEATURE_icu + "pcre2" FEATURE_pcre2 + #"icu" CMAKE_REQUIRE_FIND_PACKAGE_ICU + "glib" CMAKE_REQUIRE_FIND_PACKAGE_GLIB2 +INVERTED_FEATURES + #"doubleconversion" CMAKE_DISABLE_FIND_PACKAGE_WrapDoubleConversion # Required + #"pcre2" CMAKE_DISABLE_FIND_PACKAGE_WrapSystemPCRE2 # Bug in qt cannot be deactivated + "icu" CMAKE_DISABLE_FIND_PACKAGE_ICU + "glib" CMAKE_DISABLE_FIND_PACKAGE_GLIB2 + ) + +list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_LTTngUST:BOOL=ON) +list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_PPS:BOOL=ON) +list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Slog2:BOOL=ON) +list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libsystemd:BOOL=ON) + +# Network features: + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_NET_OPTIONS + FEATURES + "openssl" FEATURE_openssl + "brotli" FEATURE_brotli + #"brotli" CMAKE_REQUIRE_FIND_PACKAGE_WrapBrotli + #"openssl" CMAKE_REQUIRE_FIND_PACKAGE_WrapOpenSSL + INVERTED_FEATURES + "brotli" CMAKE_DISABLE_FIND_PACKAGE_WrapBrotli + "openssl" CMAKE_DISABLE_FIND_PACKAGE_WrapOpenSSL + ) + +if("openssl" IN_LIST FEATURES) + list(APPEND FEATURE_NET_OPTIONS -DINPUT_openssl=linked) +else() + list(APPEND FEATURE_NET_OPTIONS -DINPUT_openssl=no) +endif() + +list(APPEND FEATURE_NET_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libproxy:BOOL=ON) +list(APPEND FEATURE_NET_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GSSAPI:BOOL=ON) + +# Gui features: +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS + FEATURES + "freetype" FEATURE_freetype # required on windows + "harfbuzz" FEATURE_harfbuzz + "fontconfig" FEATURE_fontconfig # NOT WINDOWS + "jpeg" FEATURE_jpeg + "png" FEATURE_png + #"opengl" INPUT_opengl=something + "xlib" FEATURE_xlib + "xkb" FEATURE_xkbcommon + "xcb" FEATURE_xcb + "xcb-xlib" FEATURE_xcb_xlib + "xkbcommon-x11" FEATURE_xkbcommon_x11 + "xrender" FEATURE_xrender # requires FEATURE_xcb_native_painting; otherwise disabled. + "xrender" FEATURE_xcb_native_painting # experimental + #"vulkan" CMAKE_REQUIRE_FIND_PACKAGE_Vulkan + #"egl" CMAKE_REQUIRE_FIND_PACKAGE_EGL + #"fontconfig" CMAKE_REQUIRE_FIND_PACKAGE_Fontconfig + #"harfbuzz" CMAKE_REQUIRE_FIND_PACKAGE_WrapSystemHarfbuzz + #"jpeg" CMAKE_REQUIRE_FIND_PACKAGE_JPEG + #"png" CMAKE_REQUIRE_FIND_PACKAGE_PNG + #"xlib" CMAKE_REQUIRE_FIND_PACKAGE_X11 + #"xkb" CMAKE_REQUIRE_FIND_PACKAGE_XKB + #"xcb" CMAKE_REQUIRE_FIND_PACKAGE_XCB + #"xcb-xlib" CMAKE_REQUIRE_FIND_PACKAGE_X11_XCB + #"xkbcommon-x11" CMAKE_REQUIRE_FIND_PACKAGE_XKB_COMMON_X11 + #"xrender" CMAKE_REQUIRE_FIND_PACKAGE_XRender + INVERTED_FEATURES + "vulkan" CMAKE_DISABLE_FIND_PACKAGE_Vulkan + "egl" CMAKE_DISABLE_FIND_PACKAGE_EGL + "fontconfig" CMAKE_DISABLE_FIND_PACKAGE_Fontconfig + #"freetype" CMAKE_DISABLE_FIND_PACKAGE_WrapSystemFreetype # Bug in qt cannot be deactivated + "harfbuzz" CMAKE_DISABLE_FIND_PACKAGE_WrapSystemHarfbuzz + "jpeg" CMAKE_DISABLE_FIND_PACKAGE_JPEG + "png" CMAKE_DISABLE_FIND_PACKAGE_PNG + "xlib" CMAKE_DISABLE_FIND_PACKAGE_X11 + "xkb" CMAKE_DISABLE_FIND_PACKAGE_XKB + "xcb" CMAKE_DISABLE_FIND_PACKAGE_XCB + "xcb-xlib" CMAKE_DISABLE_FIND_PACKAGE_X11_XCB + "xkbcommon-x11" CMAKE_DISABLE_FIND_PACKAGE_XKB_COMMON_X11 + "xrender" CMAKE_DISABLE_FIND_PACKAGE_XRender + # There are more X features but I am unsure how to safely disable them! Most of them seem to be found automaticall with find_package(X11) + ) + +if("xcb" IN_LIST FEATURES) + list(APPEND FEATURE_GUI_OPTIONS -DINPUT_xcb=yes) +else() + list(APPEND FEATURE_GUI_OPTIONS -DINPUT_xcb=no) +endif() +if("xkb" IN_LIST FEATURES) + list(APPEND FEATURE_GUI_OPTIONS -DINPUT_xkbcommon=yes) +else() + list(APPEND FEATURE_GUI_OPTIONS -DINPUT_xkbcommon=no) +endif() +list(APPEND FEATURE_GUI_OPTIONS ) + +list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_ATSPI2:BOOL=ON) +list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_DirectFB:BOOL=ON) +list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libdrm:BOOL=ON) +list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_gbm:BOOL=ON) +list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libinput:BOOL=ON) +list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Mtdev:BOOL=ON) +list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GLESv2:BOOL=ON) # only used if INPUT_opengl is correctly set +list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Tslib:BOOL=ON) +# sql-drivers features: + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_SQLDRIVERS_OPTIONS + FEATURES + "sql-sqlite" FEATURE_system_sqlite + #"sql-psql" CMAKE_REQUIRE_FIND_PACKAGE_PostgreSQL + #"sql-sqlite" CMAKE_REQUIRE_FIND_PACKAGE_SQLite3 + INVERTED_FEATURES + "sql-psql" CMAKE_DISABLE_FIND_PACKAGE_PostgreSQL + "sql-sqlite" CMAKE_DISABLE_FIND_PACKAGE_SQLite3 + # "sql-db2" FEATURE_sql-db2 + # "sql-ibase" FEATURE_sql-ibase + # "sql-mysql" FEATURE_sql-mysql + # "sql-oci" FEATURE_sql-oci + # "sql-odbc" FEATURE_sql-odbc + ) + +set(DB_LIST DB2 MySQL Oracle ODBC) +foreach(_db IN LISTS DB_LIST) + list(APPEND FEATURE_SQLDRIVERS_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_${_db}:BOOL=ON) +endforeach() + +# printsupport features: +# vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_PRINTSUPPORT_OPTIONS + # ) +list(APPEND FEATURE_PRINTSUPPORT_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_CUPS:BOOL=ON) + +# widgets features: +# vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_WIDGETS_OPTIONS + # "gtk3" FEATURE_gtk3 + # There are a lot of additional features here to deactivate parts of widgets. + # ) +list(APPEND FEATURE_WIDGETS_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GTK3:BOOL=ON) + +set(TOOL_NAMES + androiddeployqt + androidtestrunner + cmake_automoc_parser + moc + qdbuscpp2xml + qdbusxml2cpp + qlalr + qmake + qmake6 + qvkgen + rcc + tracegen + uic + qtpaths + qtpaths6 + windeployqt + macdeployqt + ) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS + #--trace-expand + ${FEATURE_OPTIONS} + ${FEATURE_CORE_OPTIONS} + ${FEATURE_NET_OPTIONS} + ${FEATURE_GUI_OPTIONS} + ${FEATURE_SQLDRIVERS_OPTIONS} + ${FEATURE_PRINTSUPPORT_OPTIONS} + ${FEATURE_WIDGETS_OPTIONS} + ${INPUT_OPTIONS} + -DQT_USE_BUNDLED_BundledFreetype:BOOL=FALSE + -DQT_USE_BUNDLED_BundledHarfbuzz:BOOL=FALSE + -DQT_USE_BUNDLED_BundledLibpng:BOOL=FALSE + -DQT_USE_BUNDLED_BundledPcre2:BOOL=FALSE + -DINPUT_bundled_xcb_xinput:STRING=no + -DFEATURE_force_debug_info:BOOL=ON + -DFEATURE_relocatable:BOOL=ON + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + -DFEATURE_debug:BOOL=ON + CONFIGURE_OPTIONS_MAYBE_UNUSED + FEATURE_appstore_compliant # only used for android/ios + ) + +# Install CMake helper scripts +if(QT_IS_LATEST) + set(port_details "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_port_details-latest.cmake") +else() + set(port_details "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_port_details.cmake") +endif() +file(INSTALL + "${port_details}" + DESTINATION + "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME + "qt_port_details.cmake" + ) +file(COPY + "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_copyright.cmake" + "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_submodule.cmake" + DESTINATION + "${CURRENT_PACKAGES_DIR}/share/${PORT}" + ) + +qt_stop_on_update() + +set(script_files qt-cmake qt-cmake-private qt-cmake-standalone-test qt-configure-module qt-internal-configure-tests) +if(CMAKE_HOST_WIN32) + set(script_suffix .bat) +else() + set(script_suffix) +endif() +set(other_files + target_qt.conf + qt-cmake-private-install.cmake + syncqt.pl + android_cmakelist_patcher.sh + android_emulator_launcher.sh + ensure_pro_file.cmake + ) +foreach(_config debug release) + if(_config MATCHES "debug") + set(path_suffix debug/) + else() + set(path_suffix) + endif() + if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/${path_suffix}bin") + continue() + endif() + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${path_suffix}") + foreach(script IN LISTS script_files) + if(EXISTS "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${script}${script_suffix}") + set(target_script "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${path_suffix}${script}${script_suffix}") + file(RENAME "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${script}${script_suffix}" "${target_script}") + file(READ "${target_script}" _contents) + if(_config MATCHES "debug") + string(REPLACE "\\..\\share\\" "\\..\\..\\..\\..\\share\\" _contents "${_contents}") + else() + string(REPLACE "\\..\\share\\" "\\..\\..\\..\\share\\" _contents "${_contents}") + endif() + file(WRITE "${target_script}" "${_contents}") + endif() + endforeach() + foreach(other IN LISTS other_files) + if(EXISTS "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${other}") + file(RENAME "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${other}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${path_suffix}${other}") + endif() + endforeach() +endforeach() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if(VCPKG_CROSSCOMPILING) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/qmake" "${CURRENT_PACKAGES_DIR}/debug/bin/qmake") # qmake has been moved so this is the qmake helper script + endif() + file(GLOB_RECURSE _bin_files "${CURRENT_PACKAGES_DIR}/bin/*") + if(NOT _bin_files) # Only clean if empty otherwise let vcpkg throw and error. + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/" "${CURRENT_PACKAGES_DIR}/debug/bin/") + endif() +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Qt6/QtBuildInternals") + +if(NOT VCPKG_TARGET_IS_OSX) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Qt6/macos") +endif() +if(NOT VCPKG_TARGET_IS_IOS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Qt6/ios") +endif() + +file(RELATIVE_PATH installed_to_host "${CURRENT_INSTALLED_DIR}" "${CURRENT_HOST_INSTALLED_DIR}") +file(RELATIVE_PATH host_to_installed "${CURRENT_HOST_INSTALLED_DIR}" "${CURRENT_INSTALLED_DIR}") +if(installed_to_host) + string(APPEND installed_to_host "/") + string(APPEND host_to_installed "/") +endif() +set(_file "${CMAKE_CURRENT_LIST_DIR}/qt.conf.in") +set(REL_PATH "") +set(REL_HOST_TO_DATA "\${CURRENT_INSTALLED_DIR}/") +configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/qt_release.conf" @ONLY) # For vcpkg-qmake +set(BACKUP_CURRENT_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}") +set(BACKUP_CURRENT_HOST_INSTALLED_DIR "${CURRENT_HOST_INSTALLED_DIR}") +set(CURRENT_INSTALLED_DIR "./../../../") +set(CURRENT_HOST_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}${installed_to_host}") + +## Configure installed qt.conf +set(REL_HOST_TO_DATA "${host_to_installed}") +configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qt.conf") +set(REL_PATH debug/) +configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qt.debug.conf") + +set(CURRENT_INSTALLED_DIR "${BACKUP_CURRENT_INSTALLED_DIR}") +set(CURRENT_HOST_INSTALLED_DIR "${BACKUP_CURRENT_HOST_INSTALLED_DIR}") +set(REL_HOST_TO_DATA "\${CURRENT_INSTALLED_DIR}/") +configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/qt_debug.conf" @ONLY) # For vcpkg-qmake + +if(VCPKG_TARGET_IS_WINDOWS) + set(_DLL_FILES brotlicommon brotlidec bz2 freetype harfbuzz libpng16) + set(DLLS_TO_COPY) + foreach(_file IN LISTS _DLL_FILES) + if(EXISTS "${CURRENT_INSTALLED_DIR}/bin/${_file}.dll") + list(APPEND DLLS_TO_COPY "${CURRENT_INSTALLED_DIR}/bin/${_file}.dll") + endif() + endforeach() + file(COPY ${DLLS_TO_COPY} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") +endif() + +set(hostinfofile "${CURRENT_PACKAGES_DIR}/share/Qt6HostInfo/Qt6HostInfoConfig.cmake") +file(READ "${hostinfofile}" _contents) +string(REPLACE [[set(QT6_HOST_INFO_LIBEXECDIR "bin")]] [[set(QT6_HOST_INFO_LIBEXECDIR "tools/Qt6/bin")]] _contents "${_contents}") +string(REPLACE [[set(QT6_HOST_INFO_BINDIR "bin")]] [[set(QT6_HOST_INFO_BINDIR "tools/Qt6/bin")]] _contents "${_contents}") +file(WRITE "${hostinfofile}" "${_contents}") + +if(QT_IS_LATEST) + set(configfile "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsTargets-debug.cmake") + if(EXISTS "${configfile}") + file(READ "${configfile}" _contents) + if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qmake.exe") + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/qmake.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") + string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.exe"]] [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.debug.bat"]] _contents "${_contents}") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qtpaths.exe") + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/qtpaths.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") + string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qtpaths.exe"]] [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qtpaths.debug.bat"]] _contents "${_contents}") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/windeployqt.exe") + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/windeployqt.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") + string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.exe"]] [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.debug.bat"]] _contents "${_contents}") + endif() + file(WRITE "${configfile}" "${_contents}") + endif() +else() + set(coretools "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreTools.cmake") + if(EXISTS "${coretools}") + file(READ "${coretools}" _contents) + string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.exe"]] [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.debug.bat"]] _contents "${_contents}") + file(WRITE "${coretools}" "${_contents}") + endif() +endif() diff --git a/externals/vcpkg/ports/qtbase/qmake.debug.bat b/externals/vcpkg/ports/qtbase/qmake.debug.bat new file mode 100755 index 000000000..a7ed903a3 --- /dev/null +++ b/externals/vcpkg/ports/qtbase/qmake.debug.bat @@ -0,0 +1,2 @@ +@echo off +"%0\..\qmake.exe" -qtconf "%0\..\qt.debug.conf" %* diff --git a/externals/vcpkg/ports/qtbase/qt.conf.in b/externals/vcpkg/ports/qtbase/qt.conf.in new file mode 100755 index 000000000..8e76b8f6d --- /dev/null +++ b/externals/vcpkg/ports/qtbase/qt.conf.in @@ -0,0 +1,31 @@ +[DevicePaths] +Prefix=${CURRENT_INSTALLED_DIR} +Headers=include/@QT6_DIRECTORY_PREFIX@ +Libraries=@REL_PATH@lib +Plugins=@REL_PATH@@QT6_DIRECTORY_PREFIX@plugins +Qml2Imports=@REL_PATH@@QT6_DIRECTORY_PREFIX@qml +Documentation=doc/@QT6_DIRECTORY_PREFIX@ +Binaries=@REL_PATH@bin +LibraryExecutables=tools/Qt6/bin +ArchData=share/Qt6 +Data=share/Qt6 +Translations=translations/@QT6_DIRECTORY_PREFIX@ +Examples=share/examples/@QT6_DIRECTORY_PREFIX@ +[Paths] +Prefix=${CURRENT_INSTALLED_DIR} +Headers=include/@QT6_DIRECTORY_PREFIX@ +Libraries=@REL_PATH@lib +Plugins=@REL_PATH@@QT6_DIRECTORY_PREFIX@plugins +Qml2Imports=@REL_PATH@@QT6_DIRECTORY_PREFIX@qml +Documentation=doc/@QT6_DIRECTORY_PREFIX@ +Binaries=@REL_PATH@bin +LibraryExecutables=tools/Qt6/bin +ArchData=share/Qt6 +Data=share/Qt6 +Translations=translations/@QT6_DIRECTORY_PREFIX@ +Examples=share/examples/@QT6_DIRECTORY_PREFIX@ +HostPrefix=${CURRENT_HOST_INSTALLED_DIR} +HostData=@REL_HOST_TO_DATA@share/Qt6 +HostBinaries=@REL_PATH@bin +HostLibraries=@REL_PATH@lib +HostLibraryExecutables=tools/Qt6/bin diff --git a/externals/vcpkg/ports/qtbase/qtpaths.debug.bat b/externals/vcpkg/ports/qtbase/qtpaths.debug.bat new file mode 100755 index 000000000..4fef8e754 --- /dev/null +++ b/externals/vcpkg/ports/qtbase/qtpaths.debug.bat @@ -0,0 +1,2 @@ +@echo off +"%0\..\qtpaths.exe" --qtconf "%0\..\qt.debug.conf" %* diff --git a/externals/vcpkg/ports/qtbase/vcpkg.json b/externals/vcpkg/ports/qtbase/vcpkg.json new file mode 100755 index 000000000..482883605 --- /dev/null +++ b/externals/vcpkg/ports/qtbase/vcpkg.json @@ -0,0 +1,380 @@ +{ + "name": "qtbase", + "version": "6.3.0", + "port-version": 2, + "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", + "homepage": "https://www.qt.io/", + "license": null, + "supports": "!uwp", + "dependencies": [ + "freetype", + { + "name": "libb2", + "platform": "!windows" + }, + "pcre2", + { + "name": "qtbase", + "host": true, + "default-features": false + }, + { + "name": "qtbase", + "default-features": false, + "features": [ + "doubleconversion" + ], + "platform": "windows" + }, + { + "name": "qtbase", + "default-features": false, + "features": [ + "pcre2" + ], + "platform": "windows & static" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "default-features": [ + "brotli", + "concurrent", + "dbus", + "default-features", + "doubleconversion", + "freetype", + "gui", + "harfbuzz", + "icu", + "jpeg", + "network", + "openssl", + "pcre2", + "png", + "sql", + "sql-psql", + "sql-sqlite", + "testlib", + "thread", + "widgets", + "zstd" + ], + "features": { + "appstore-compliant": { + "description": "Disable code that is not allowed in platform app stores. This is on by default for platforms which require distribution through an app store by default, in particular Android, iOS, tvOS, and watchOS." + }, + "brotli": { + "description": "Support for downloading and decompressing resources compressed with Brotli through QNetworkAccessManager.", + "dependencies": [ + "brotli", + { + "name": "qtbase", + "default-features": false, + "features": [ + "network" + ] + } + ] + }, + "concurrent": { + "description": "Provides a high-level multi-threading API. Qt Concurrent", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "thread" + ] + } + ] + }, + "dbus": { + "description": "Qt D-Bus" + }, + "default-features": { + "description": "Platform-dependent default features", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "appstore-compliant" + ], + "platform": "uwp" + }, + { + "name": "qtbase", + "default-features": false, + "features": [ + "egl", + "fontconfig", + "xcb", + "xcb-xlib", + "xrender" + ], + "platform": "linux" + } + ] + }, + "doubleconversion": { + "description": "Enable double conversion support", + "dependencies": [ + "double-conversion" + ] + }, + "egl": { + "description": "EGL", + "dependencies": [ + "egl-registry" + ] + }, + "fontconfig": { + "description": "Use fontconfig", + "dependencies": [ + "fontconfig", + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + } + ] + }, + "framework": { + "$platform": "osx", + "description": "MAC framework build" + }, + "freetype": { + "description": "Supports the FreeType 2 font engine (and its supported font formats).", + "dependencies": [ + { + "name": "freetype", + "default-features": false + } + ] + }, + "glib": { + "description": "GLib", + "dependencies": [ + "glib" + ] + }, + "gui": { + "description": "Qt Gui", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "freetype" + ] + }, + { + "name": "qtbase", + "default-features": false, + "features": [ + "thread" + ], + "platform": "windows" + } + ] + }, + "harfbuzz": { + "description": "Use harfbuzz", + "dependencies": [ + "harfbuzz", + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + } + ] + }, + "icu": { + "description": "Enable ICU support", + "dependencies": [ + "icu" + ] + }, + "jpeg": { + "description": "Enable JPEG", + "dependencies": [ + "libjpeg-turbo", + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + } + ] + }, + "network": { + "description": "Qt Network" + }, + "openssl": { + "description": "Enable OpenSSL", + "dependencies": [ + "openssl", + { + "name": "qtbase", + "default-features": false, + "features": [ + "network" + ] + } + ] + }, + "pcre2": { + "description": "Enable PCRE2 support", + "dependencies": [ + "pcre2" + ] + }, + "png": { + "description": "Enable PNG", + "dependencies": [ + "libpng", + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + } + ] + }, + "sql": { + "description": "Qt Sql", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "concurrent" + ] + } + ] + }, + "sql-psql": { + "description": "Enable SQL Driver psql", + "dependencies": [ + "libpq", + { + "name": "qtbase", + "default-features": false, + "features": [ + "sql" + ] + } + ] + }, + "sql-sqlite": { + "description": "Enable SQL Driver sqlite", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "sql" + ] + }, + "sqlite3" + ] + }, + "testlib": { + "description": "Qt Testlib" + }, + "thread": { + "description": "Thread support; provides QThread and related classes." + }, + "vulkan": { + "description": "Enable Vulkan support" + }, + "widgets": { + "description": "Qt Widgets", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + } + ] + }, + "xcb": { + "description": "XCB", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "concurrent", + "xkbcommon-x11", + "xlib" + ] + } + ] + }, + "xcb-xlib": { + "description": "xcb-xlib", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "xlib" + ] + } + ] + }, + "xkb": { + "description": "XKB" + }, + "xkbcommon-x11": { + "description": "xkbcommon_x11", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "xkb" + ] + } + ] + }, + "xlib": { + "description": "XLib" + }, + "xrender": { + "description": "XRender for native painting", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "xcb" + ] + } + ] + }, + "zstd": { + "description": "Zstandard support", + "dependencies": [ + "zstd" + ] + } + } +} diff --git a/externals/vcpkg/ports/qtbase/windeployqt.debug.bat b/externals/vcpkg/ports/qtbase/windeployqt.debug.bat new file mode 100755 index 000000000..99e5e79e7 --- /dev/null +++ b/externals/vcpkg/ports/qtbase/windeployqt.debug.bat @@ -0,0 +1,10 @@ +@echo off +setlocal enabledelayedexpansion +set mypath=%~dp0 +set mypath=%mypath:~0,-1% +set BAKCD=!CD! +cd /D %mypath%\..\..\..\debug\bin +set PATH=!CD!;%PATH% +"%mypath%\windeployqt.exe" --qtpaths "%mypath%\qtpaths.debug.bat" %* +cd %BAKCD% +endlocal diff --git a/externals/vcpkg/ports/qtcharts/portfile.cmake b/externals/vcpkg/ports/qtcharts/portfile.cmake new file mode 100755 index 000000000..0f5be8a03 --- /dev/null +++ b/externals/vcpkg/ports/qtcharts/portfile.cmake @@ -0,0 +1,17 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick +) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/externals/vcpkg/ports/qtcharts/vcpkg.json b/externals/vcpkg/ports/qtcharts/vcpkg.json new file mode 100755 index 000000000..ef321ae95 --- /dev/null +++ b/externals/vcpkg/ports/qtcharts/vcpkg.json @@ -0,0 +1,37 @@ +{ + "name": "qtcharts", + "version": "6.3.0", + "description": "QtCharts module", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui", + "widgets" + ] + } + ], + "features": { + "designer": { + "description": "Build Designer plugin", + "dependencies": [ + { + "name": "qttools", + "default-features": false + } + ] + }, + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] + } + } +} diff --git a/externals/vcpkg/ports/qtcoap/portfile.cmake b/externals/vcpkg/ports/qtcoap/portfile.cmake new file mode 100755 index 000000000..1940e3989 --- /dev/null +++ b/externals/vcpkg/ports/qtcoap/portfile.cmake @@ -0,0 +1,10 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/externals/vcpkg/ports/qtcoap/vcpkg.json b/externals/vcpkg/ports/qtcoap/vcpkg.json new file mode 100755 index 000000000..5a3474a9f --- /dev/null +++ b/externals/vcpkg/ports/qtcoap/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "qtcoap", + "version": "6.3.0", + "description": "Qt CoAP client module", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "network" + ] + } + ] +} diff --git a/externals/vcpkg/ports/qtconnectivity/portfile.cmake b/externals/vcpkg/ports/qtconnectivity/portfile.cmake new file mode 100755 index 000000000..1a3a6f1bf --- /dev/null +++ b/externals/vcpkg/ports/qtconnectivity/portfile.cmake @@ -0,0 +1,10 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/externals/vcpkg/ports/qtconnectivity/vcpkg.json b/externals/vcpkg/ports/qtconnectivity/vcpkg.json new file mode 100755 index 000000000..e6fb60802 --- /dev/null +++ b/externals/vcpkg/ports/qtconnectivity/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "qtconnectivity", + "version": "6.3.0", + "description": "Qt Connectivity", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "dbus", + "gui", + "network" + ] + } + ] +} diff --git a/externals/vcpkg/ports/qtdatavis3d/portfile.cmake b/externals/vcpkg/ports/qtdatavis3d/portfile.cmake new file mode 100755 index 000000000..1a3a6f1bf --- /dev/null +++ b/externals/vcpkg/ports/qtdatavis3d/portfile.cmake @@ -0,0 +1,10 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/externals/vcpkg/ports/qtdatavis3d/vcpkg.json b/externals/vcpkg/ports/qtdatavis3d/vcpkg.json new file mode 100755 index 000000000..bbef5e0d5 --- /dev/null +++ b/externals/vcpkg/ports/qtdatavis3d/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "qtdatavis3d", + "version": "6.3.0", + "description": "Qt 3D data visualization framework", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui", + "testlib" + ] + }, + { + "name": "qtdeclarative", + "default-features": false + } + ] +} diff --git a/externals/vcpkg/ports/qtdeclarative/portfile.cmake b/externals/vcpkg/ports/qtdeclarative/portfile.cmake new file mode 100755 index 000000000..9589d6284 --- /dev/null +++ b/externals/vcpkg/ports/qtdeclarative/portfile.cmake @@ -0,0 +1,32 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + + set(TOOL_NAMES + qml + qmlcachegen + qmleasing + qmlformat + qmlimportscanner + qmllint + qmlplugindump + qmlpreview + qmlprofiler + qmlscene + qmltestrunner + qmltime + qmltyperegistrar + qmldom + qmltc + ) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) + +# remove `${SOURCE_PATH}` from the front of `#line` directives +if(NOT QT_UPDATE_VERSION) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Qt6/QtQml/${QT_VERSION}/QtQml/private/qqmljsparser_p.h" "${SOURCE_PATH}" "") +endif() diff --git a/externals/vcpkg/ports/qtdeclarative/vcpkg.json b/externals/vcpkg/ports/qtdeclarative/vcpkg.json new file mode 100755 index 000000000..98039dc9f --- /dev/null +++ b/externals/vcpkg/ports/qtdeclarative/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "qtdeclarative", + "version": "6.3.0", + "description": "Qt Declarative (Quick 2)", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "testlib" + ] + }, + { + "name": "qtdeclarative", + "host": true, + "default-features": false + }, + { + "name": "qtshadertools", + "default-features": false + } + ] +} diff --git a/externals/vcpkg/ports/qtdeviceutilities/portfile.cmake b/externals/vcpkg/ports/qtdeviceutilities/portfile.cmake new file mode 100755 index 000000000..f83d1fd6f --- /dev/null +++ b/externals/vcpkg/ports/qtdeviceutilities/portfile.cmake @@ -0,0 +1,13 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + +set(TOOL_NAMES settingsui) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/externals/vcpkg/ports/qtdeviceutilities/vcpkg.json b/externals/vcpkg/ports/qtdeviceutilities/vcpkg.json new file mode 100755 index 000000000..ca9d565bf --- /dev/null +++ b/externals/vcpkg/ports/qtdeviceutilities/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "qtdeviceutilities", + "version": "6.3.0", + "description": "Utils for Boot2Qt", + "homepage": "https://www.qt.io/", + "license": null, + "supports": "linux", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + }, + { + "name": "qttools", + "default-features": false + } + ] +} diff --git a/externals/vcpkg/ports/qtdoc/portfile.cmake b/externals/vcpkg/ports/qtdoc/portfile.cmake new file mode 100755 index 000000000..df99e640f --- /dev/null +++ b/externals/vcpkg/ports/qtdoc/portfile.cmake @@ -0,0 +1,13 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/externals/vcpkg/ports/qtdoc/vcpkg.json b/externals/vcpkg/ports/qtdoc/vcpkg.json new file mode 100755 index 000000000..2b683ec95 --- /dev/null +++ b/externals/vcpkg/ports/qtdoc/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qtdoc", + "version": "6.3.0", + "description": "Qt Documentation", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false + } + ] +} diff --git a/externals/vcpkg/ports/qtimageformats/no_target_promotion.patch b/externals/vcpkg/ports/qtimageformats/no_target_promotion.patch new file mode 100755 index 000000000..73e5f7d4e --- /dev/null +++ b/externals/vcpkg/ports/qtimageformats/no_target_promotion.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7fdd7ddbd..f189c472c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,7 +9,16 @@ project(QtImageFormats # special case + HOMEPAGE_URL "https://qt.io/" + LANGUAGES CXX C + ) +- ++find_package(Threads) ++set_property(TARGET Threads::Threads PROPERTY _qt_no_promote_global TRUE) ++find_package(ZLIB) ++if(TARGET ZLIB::ZLIB) ++ set_property(TARGET ZLIB::ZLIB PROPERTY _qt_no_promote_global TRUE) ++endif() ++find_package(JPEG) ++if(TARGET JPEG::JPEG) ++ set_property(TARGET JPEG::JPEG PROPERTY _qt_no_promote_global TRUE) ++endif() + # special case begin + # Make sure we only use latest private CMake API, aka no compatibility wrappers. + set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE) diff --git a/externals/vcpkg/ports/qtimageformats/no_target_promotion_latest.patch b/externals/vcpkg/ports/qtimageformats/no_target_promotion_latest.patch new file mode 100755 index 000000000..1b76e36b5 --- /dev/null +++ b/externals/vcpkg/ports/qtimageformats/no_target_promotion_latest.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7fdd7ddbd..f189c472c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,6 +9,15 @@ project(QtImageFormats # special case + HOMEPAGE_URL "https://qt.io/" + LANGUAGES CXX C + ) +- ++find_package(Threads) ++set_property(TARGET Threads::Threads PROPERTY _qt_no_promote_global TRUE) ++find_package(ZLIB) ++if(TARGET ZLIB::ZLIB) ++ set_property(TARGET ZLIB::ZLIB PROPERTY _qt_no_promote_global TRUE) ++endif() ++find_package(JPEG) ++if(TARGET JPEG::JPEG) ++ set_property(TARGET JPEG::JPEG PROPERTY _qt_no_promote_global TRUE) ++endif() + find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) # special case + find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui) # special case diff --git a/externals/vcpkg/ports/qtimageformats/portfile.cmake b/externals/vcpkg/ports/qtimageformats/portfile.cmake new file mode 100755 index 000000000..80341bd83 --- /dev/null +++ b/externals/vcpkg/ports/qtimageformats/portfile.cmake @@ -0,0 +1,44 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # Only plugins +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST) + set(${PORT}_PATCHES no_target_promotion.patch) +else() + set(${PORT}_PATCHES no_target_promotion_latest.patch) +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + #"jasper" CMAKE_REQUIRE_FIND_PACKAGE_WrapJasper + #"webp" CMAKE_REQUIRE_FIND_PACKAGE_WrapWebP + #"tiff" CMAKE_REQUIRE_FIND_PACKAGE_TIFF + INVERTED_FEATURES + "jasper" CMAKE_DISABLE_FIND_PACKAGE_WrapJasper + "webp" CMAKE_DISABLE_FIND_PACKAGE_WrapWebP + "tiff" CMAKE_DISABLE_FIND_PACKAGE_TIFF + ) + +if("jasper" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS -DINPUT_jasper=system) +else() + list(APPEND FEATURE_OPTIONS -DINPUT_jasper=no) +endif() +if("webp" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS -DINPUT_webp=system) +else() + list(APPEND FEATURE_OPTIONS -DINPUT_webp=no) +endif() +if("tiff" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS -DINPUT_tiff=system) +else() + list(APPEND FEATURE_OPTIONS -DINPUT_tiff=no) +endif() +list(APPEND FEATURE_OPTIONS -DINPUT_mng=no) # marked as FIXME + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS + ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/externals/vcpkg/ports/qtimageformats/vcpkg.json b/externals/vcpkg/ports/qtimageformats/vcpkg.json new file mode 100755 index 000000000..fb4eff8a6 --- /dev/null +++ b/externals/vcpkg/ports/qtimageformats/vcpkg.json @@ -0,0 +1,45 @@ +{ + "name": "qtimageformats", + "version": "6.3.0", + "description": "Additional Image Format plugins for Qt", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + } + ], + "default-features": [ + "default-features", + "jasper", + "tiff", + "webp" + ], + "features": { + "default-features": { + "description": "Platform-dependent default features" + }, + "jasper": { + "description": "Use jasper", + "dependencies": [ + "jasper" + ] + }, + "tiff": { + "description": "Use TIFF", + "dependencies": [ + "tiff" + ] + }, + "webp": { + "description": "Use WebP", + "dependencies": [ + "libwebp" + ] + } + } +} diff --git a/externals/vcpkg/ports/qtinterfaceframework/49b44d4.diff b/externals/vcpkg/ports/qtinterfaceframework/49b44d4.diff new file mode 100755 index 000000000..6bff7b7ae --- /dev/null +++ b/externals/vcpkg/ports/qtinterfaceframework/49b44d4.diff @@ -0,0 +1,148 @@ +From 49b44d45c9eb5b5b98697f9ebb74204d45f0db38 Mon Sep 17 00:00:00 2001 +From: Dominik Holland +Date: Wed, 06 Apr 2022 15:43:23 +0200 +Subject: [PATCH] ifcodegen: Add a fallback mechanism for too recent python packages + +After the virtualenv is created the generator is now verified to be +working correctly. In case the generator doesn't work, an error +message is shown, which suggests to reconfigure with + +-DQT_USE_MINIMAL_QFACE_PACKAGES=TRUE + +The new option will install the minimum required dependencies for +qface. + +Fixes: QTBUG-102348 +Pick-to: 6.2 6.3 +Change-Id: I59aca5848da8928e94c0d33a108735847d9260a2 +--- + +diff --git a/src/tools/ifcodegen/CMakeLists.txt b/src/tools/ifcodegen/CMakeLists.txt +index 2d9e3a4..317d77f 100644 +--- a/src/tools/ifcodegen/CMakeLists.txt ++++ b/src/tools/ifcodegen/CMakeLists.txt +@@ -22,11 +22,13 @@ + if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows") + set(VIRTUALENV_ACTIVATE ${VIRTUALENV_PATH}/Scripts/activate.bat) + set(VIRTUALENV_ACTIVATE_COMMAND ${VIRTUALENV_ACTIVATE}) ++ set(VIRTUALENV_PYTHON ${VIRTUALENV_PATH}/Scripts/python.exe) + set(IFCODEGEN_BIN ${VIRTUALENV_PATH}/Scripts/qface.exe) + set(DEPLOY_VIRTUALENV ${CMAKE_CURRENT_SOURCE_DIR}/deploy-virtualenv.bat) + else() + set(VIRTUALENV_ACTIVATE ${VIRTUALENV_PATH}/bin/activate) + set(VIRTUALENV_ACTIVATE_COMMAND . ${VIRTUALENV_ACTIVATE}) ++ set(VIRTUALENV_PYTHON ${VIRTUALENV_PATH}/bin/python) + set(IFCODEGEN_BIN ${VIRTUALENV_PATH}/bin/qface) + set(DEPLOY_VIRTUALENV ${CMAKE_CURRENT_SOURCE_DIR}/deploy-virtualenv.sh) + endif() +@@ -63,6 +65,15 @@ + # someone is working on the qface sources + file(GLOB_RECURSE IFCODEGEN_SOURCE_FILES ${IFCODEGEN_SOURCE_DIR}/*.py) + ++ # If the upstream python packages introduce a regression this option can be used to install ++ # the minimum version for all required python package and produce a working setup ++ # Those packages might be outdated and may contain security holes, but they are known to be ++ # working. ++ set(INSTALL_MINIMAL_QFACE_PACKAGES_COMMAND) ++ if (QT_USE_MINIMAL_QFACE_PACKAGES) ++ set(INSTALL_MINIMAL_QFACE_PACKAGES_COMMAND COMMAND pip3 install -r ${IFCODEGEN_SOURCE_DIR}/requirements_minimal.txt) ++ endif() ++ + # On the CI we use the special wheel folder when available to not download all packages again on each build + set(PYTHON3_WHEEL_CACHE "$ENV{PYTHON3_WHEEL_CACHE}" CACHE PATH "Python3 wheel cache") + if (EXISTS "${PYTHON3_WHEEL_CACHE}") +@@ -74,6 +85,7 @@ + + add_custom_command(OUTPUT ${IFCODEGEN_BIN} + COMMAND ${VIRTUALENV_ACTIVATE_COMMAND} ++ ${INSTALL_MINIMAL_QFACE_PACKAGES_COMMAND} + COMMAND ${PIP3_INSTALL_COMMAND} + DEPENDS ${VIRTUALENV_ACTIVATE} + ${IFCODEGEN_SOURCE_DIR}/requirements.txt +@@ -82,16 +94,23 @@ + ) + + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/.stamp-deploy_virtualenv +- ${CMAKE_CURRENT_BINARY_DIR}/.stamp-cmake-rerun + COMMAND ${DEPLOY_VIRTUALENV} qtif_qface_virtualenv + COMMAND ${CMAKE_COMMAND} -E touch .stamp-deploy_virtualenv +- COMMAND ${CMAKE_COMMAND} -E touch .stamp-cmake-rerun + DEPENDS ${IFCODEGEN_BIN} + ) + ++ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/.stamp-generator-verified ++ ${CMAKE_CURRENT_BINARY_DIR}/.stamp-cmake-rerun ++ COMMAND ${VIRTUALENV_PYTHON} ${CMAKE_CURRENT_SOURCE_DIR}/verify_generator.py ++ COMMAND ${CMAKE_COMMAND} -E touch .stamp-generator-verified ++ COMMAND ${CMAKE_COMMAND} -E touch .stamp-cmake-rerun ++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/.stamp-deploy_virtualenv ++ COMMENT "Verifying generator" ++ ) ++ + # main target which just relies on the stamp file to be uptodate + add_custom_target(ifcodegen ALL +- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/.stamp-deploy_virtualenv ++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/.stamp-generator-verified + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/.stamp-cmake-rerun + ) + # Create the rerun cmake stamp file here to be able to add cmake configure dependency +@@ -109,6 +128,7 @@ + ##################################################################### + + set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_CLEAN_FILES ++ ${CMAKE_CURRENT_BINARY_DIR}/.stamp-generator-verified + ${CMAKE_CURRENT_BINARY_DIR}/.stamp-deploy_virtualenv + ${CMAKE_CURRENT_BINARY_DIR}/.stamp-cmake-rerun + ${VIRTUALENV_PATH} +diff --git a/src/tools/ifcodegen/verify_generator.py b/src/tools/ifcodegen/verify_generator.py +new file mode 100755 +index 0000000..c3f85d6 +--- /dev/null ++++ b/src/tools/ifcodegen/verify_generator.py +@@ -0,0 +1,46 @@ ++#!/usr/bin/env python3 ++############################################################################# ++## ++## Copyright (C) 2022 The Qt Company Ltd. ++## Contact: https://www.qt.io/licensing/ ++## ++## This file is part of the QtInterfaceFramework module of the Qt Toolkit. ++## ++## $QT_BEGIN_LICENSE:GPL-EXCEPT$ ++## Commercial License Usage ++## Licensees holding valid commercial Qt licenses may use this file in ++## accordance with the commercial license agreement provided with the ++## Software or, alternatively, in accordance with the terms contained in ++## a written agreement between you and The Qt Company. For licensing terms ++## and conditions see https://www.qt.io/terms-conditions. For further ++## information use the contact form at https://www.qt.io/contact-us. ++## ++## GNU General Public License Usage ++## Alternatively, this file may be used under the terms of the GNU ++## General Public License version 3 as published by the Free Software ++## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT ++## included in the packaging of this file. Please review the following ++## information to ensure the GNU General Public License requirements will ++## be met: https://www.gnu.org/licenses/gpl-3.0.html. ++## ++## $QT_END_LICENSE$ ++## ++############################################################################# ++ ++try: ++ import generate ++except Exception as e: ++ raise SystemExit(""" ++ Verifying the generator failed! ++ ++ This might be caused by a too recent python version or ++ too recent python packages. You can try installing older ++ python packages by running configure again with the the ++ following option: ++ ++ -DQT_USE_MINIMAL_QFACE_PACKAGES=TRUE ++ ++ The python error was: ++ ++ {} ++ """.format(e)) diff --git a/externals/vcpkg/ports/qtinterfaceframework/fix-taglib-search.patch b/externals/vcpkg/ports/qtinterfaceframework/fix-taglib-search.patch new file mode 100755 index 000000000..b8027bdf6 --- /dev/null +++ b/externals/vcpkg/ports/qtinterfaceframework/fix-taglib-search.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/FindWrapSystemTagLib.cmake b/cmake/FindWrapSystemTagLib.cmake +index e82d2c1a9..14463c791 100644 +--- a/cmake/FindWrapSystemTagLib.cmake ++++ b/cmake/FindWrapSystemTagLib.cmake +@@ -4,7 +4,7 @@ if(TARGET WrapSystemTagLib::WrapSystemTagLib) + set(WrapSystemTagLib_FOUND ON) + return() + endif() +- ++unset(PKG_CONFIG_EXECUTABLE CACHE) + find_package(PkgConfig) + + pkg_check_modules(TagLib taglib IMPORTED_TARGET) diff --git a/externals/vcpkg/ports/qtinterfaceframework/portfile.cmake b/externals/vcpkg/ports/qtinterfaceframework/portfile.cmake new file mode 100755 index 000000000..f788ab725 --- /dev/null +++ b/externals/vcpkg/ports/qtinterfaceframework/portfile.cmake @@ -0,0 +1,49 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES fix-taglib-search.patch # Strictly this is only required if qt does not use pkg-config since it forces it to off. + 49b44d4.diff) +set(TOOL_NAMES + ifmedia-simulation-server + ifvehiclefunctions-simulation-server + ) + +qt_download_submodule(PATCHES ${${PORT}_PATCHES}) +if(QT_UPDATE_VERSION) + return() +endif() + +if(_qis_DISABLE_NINJA) + set(_opt DISABLE_NINJA) +endif() + +vcpkg_find_acquire_program(PKGCONFIG) + +x_vcpkg_get_python_packages(PYTHON_VERSION "3" + REQUIREMENTS_FILE "${CURRENT_PORT_DIR}/requirements_minimal.txt" + PACKAGES qface==2.0.5 + OUT_PYTHON_VAR "PYTHON3") + +if(VCPKG_CROSSCOMPILING) + list(APPEND FEATURE_OPTIONS "-DVCPKG_HOST_TRIPLET=${_HOST_TRIPLET}") +endif() + +set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) +set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) +qt_cmake_configure(${_opt} + OPTIONS ${FEATURE_OPTIONS} + "-DPython3_EXECUTABLE=${PYTHON3}" # Otherwise a VS installation might be found. + "-DQT_USE_MINIMAL_QFACE_PACKAGES=TRUE" + OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} + OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) + +vcpkg_cmake_install(ADD_BIN_TO_PATH) + +qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) + +qt_install_copyright("${SOURCE_PATH}") + +if(NOT VCPKG_CROSSCOMPILING) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/ifcodegen") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/ifcodegen" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/ifcodegen") +endif() diff --git a/externals/vcpkg/ports/qtinterfaceframework/requirements_minimal.txt b/externals/vcpkg/ports/qtinterfaceframework/requirements_minimal.txt new file mode 100755 index 000000000..3c62c19ee --- /dev/null +++ b/externals/vcpkg/ports/qtinterfaceframework/requirements_minimal.txt @@ -0,0 +1,14 @@ +antlr4-python3-runtime==4.7.1 +argh==0.26.2 +click==6.7 +coloredlogs==10.0 +humanfriendly==4.15.1 +Jinja2==2.11.3 +MarkupSafe==1.1 +path.py==11.0.1 +pathtools==0.1.2 +PyYAML==5.4 +six==1.11.0 +watchdog==2.1.7 +pytest==5.3.5 +pytest-cov==2.8.1 diff --git a/externals/vcpkg/ports/qtinterfaceframework/vcpkg.json b/externals/vcpkg/ports/qtinterfaceframework/vcpkg.json new file mode 100755 index 000000000..a3c3bf4e7 --- /dev/null +++ b/externals/vcpkg/ports/qtinterfaceframework/vcpkg.json @@ -0,0 +1,40 @@ +{ + "name": "qtinterfaceframework", + "version": "6.3.0", + "description": "Qt Interface Framework", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "pkgconf", + "host": true + }, + { + "name": "qtdeclarative", + "default-features": false + }, + { + "name": "qtinterfaceframework", + "host": true, + "default-features": false + }, + { + "name": "qtmultimedia", + "default-features": false + }, + { + "name": "qtremoteobjects", + "default-features": false + }, + { + "name": "qttools", + "default-features": false + }, + "taglib", + { + "name": "vcpkg-get-python-packages", + "host": true, + "default-features": false + } + ] +} diff --git a/externals/vcpkg/ports/qtkeychain-qt6/portfile.cmake b/externals/vcpkg/ports/qtkeychain-qt6/portfile.cmake new file mode 100755 index 000000000..875ae642a --- /dev/null +++ b/externals/vcpkg/ports/qtkeychain-qt6/portfile.cmake @@ -0,0 +1,49 @@ +message(WARNING "qtkeychain is a third-party extension to Qt and is not affiliated with The Qt Company") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO frankosterfeld/qtkeychain + # 0.13.2 plus three commits, for a CMake export target fix + REF cd4d73299b144d11c310f6ca9a6ab1ef50c45431 + SHA512 a1af668bec23df5d696ad49129ec2aa6d332f043b43bb9875c2b025007452571bfd9431fd37c72189e957329491c04703e8c6d1104c7a117ebf28cb91249b639 + HEAD_REF master +) + +if(VCPKG_CROSSCOMPILING) + list(APPEND QTKEYCHAIN_OPTIONS -DQT_HOST_PATH=${CURRENT_HOST_INSTALLED_DIR}) + list(APPEND QTKEYCHAIN_OPTIONS -DQT_HOST_PATH_CMAKE_DIR:PATH=${CURRENT_HOST_INSTALLED_DIR}/share) + # remove when https://github.com/microsoft/vcpkg/pull/16111 is merged + if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 AND VCPKG_TARGET_IS_WINDOWS) + list(APPEND QTKEYCHAIN_OPTIONS -DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_PROCESSOR:STRING=ARM64 -DCMAKE_SYSTEM_NAME:STRING=Windows) + endif() +endif() + +list(APPEND QTKEYCHAIN_OPTIONS -DBUILD_TEST_APPLICATION:BOOL=OFF) + +# FIXME: Why does build translations fail on arm64-windows? +if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL arm64) + list(APPEND QTKEYCHAIN_OPTIONS -DBUILD_TRANSLATIONS:BOOL=OFF) +else() + list(APPEND QTKEYCHAIN_OPTIONS -DBUILD_TRANSLATIONS:BOOL=ON) +endif() + +vcpkg_cmake_configure( + DISABLE_PARALLEL_CONFIGURE + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DBUILD_WITH_QT6=ON + ${QTKEYCHAIN_OPTIONS} +) +vcpkg_cmake_install() + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Qt6Keychain PACKAGE_NAME Qt6Keychain) + +# Remove unneeded dirs +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/qtkeychain-qt6/vcpkg.json b/externals/vcpkg/ports/qtkeychain-qt6/vcpkg.json new file mode 100755 index 000000000..3df8b0829 --- /dev/null +++ b/externals/vcpkg/ports/qtkeychain-qt6/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "qtkeychain-qt6", + "version": "0.13.2", + "port-version": 1, + "description": "(Unaffiliated with Qt) Platform-independent Qt6 API for storing passwords securely", + "homepage": "https://github.com/frankosterfeld/qtkeychain", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "libsecret", + "platform": "!(windows | uwp | osx)" + }, + { + "name": "qttools", + "features": [ + "linguist" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/qtkeychain/portfile.cmake b/externals/vcpkg/ports/qtkeychain/portfile.cmake new file mode 100755 index 000000000..53b7683d8 --- /dev/null +++ b/externals/vcpkg/ports/qtkeychain/portfile.cmake @@ -0,0 +1,38 @@ +message(WARNING "qtkeychain is a third-party extension to Qt and is not affiliated with The Qt Company") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO frankosterfeld/qtkeychain + # 0.13.2 plus three commits, for a CMake export target fix + REF cd4d73299b144d11c310f6ca9a6ab1ef50c45431 + SHA512 a1af668bec23df5d696ad49129ec2aa6d332f043b43bb9875c2b025007452571bfd9431fd37c72189e957329491c04703e8c6d1104c7a117ebf28cb91249b639 + HEAD_REF master +) + +# Opportunity to build without dependency on qt5-tools/qt5-declarative +set(BUILD_TRANSLATIONS OFF) +if("translations" IN_LIST FEATURES) + set(BUILD_TRANSLATIONS ON) +endif() + +vcpkg_cmake_configure( + DISABLE_PARALLEL_CONFIGURE + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DBUILD_WITH_QT6=OFF + -DBUILD_TEST_APPLICATION=OFF + -DBUILD_TRANSLATIONS=${BUILD_TRANSLATIONS} +) +vcpkg_cmake_install() + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Qt5Keychain PACKAGE_NAME Qt5Keychain) + +# Remove unneeded dirs +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/qtkeychain/vcpkg.json b/externals/vcpkg/ports/qtkeychain/vcpkg.json new file mode 100755 index 000000000..6f1e1e257 --- /dev/null +++ b/externals/vcpkg/ports/qtkeychain/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "qtkeychain", + "version": "0.13.2", + "port-version": 3, + "description": "(Unaffiliated with Qt) Platform-independent Qt5 API for storing passwords securely", + "homepage": "https://github.com/frankosterfeld/qtkeychain", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "libsecret", + "platform": "!(windows | uwp | osx)" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "translations" + ], + "features": { + "translations": { + "description": "Build qtkeychain translations", + "dependencies": [ + "qt5-tools" + ] + } + } +} diff --git a/externals/vcpkg/ports/qtlocation/portfile.cmake b/externals/vcpkg/ports/qtlocation/portfile.cmake new file mode 100755 index 000000000..15fa294cd --- /dev/null +++ b/externals/vcpkg/ports/qtlocation/portfile.cmake @@ -0,0 +1,24 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +message(STATUS "Upstream decided to split this into qtpositioning and qtlocation. qtlocation however is currently empty!") +# set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +# include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +# set(${PORT}_PATCHES) + +# vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +# FEATURES +# INVERTED_FEATURES + # "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick + # "nmea" CMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort + # "nmea" CMAKE_DISABLE_FIND_PACKAGE_Qt6Network +# ) + +# list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_Gypsy=ON" + # "-DCMAKE_DISABLE_FIND_PACKAGE_Gconf=ON" +# ) + +# qt_install_submodule(PATCHES ${${PORT}_PATCHES} + # CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + # CONFIGURE_OPTIONS_RELEASE + # CONFIGURE_OPTIONS_DEBUG + # ) diff --git a/externals/vcpkg/ports/qtlocation/vcpkg.json b/externals/vcpkg/ports/qtlocation/vcpkg.json new file mode 100755 index 000000000..845debcbe --- /dev/null +++ b/externals/vcpkg/ports/qtlocation/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "qtlocation", + "version": "6.3.0", + "description": "Qt Location", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false + }, + { + "name": "qtbase", + "default-features": false, + "features": [ + "dbus" + ], + "platform": "linux" + }, + "qtpositioning" + ] +} diff --git a/externals/vcpkg/ports/qtlottie/portfile.cmake b/externals/vcpkg/ports/qtlottie/portfile.cmake new file mode 100755 index 000000000..f07e0c6e2 --- /dev/null +++ b/externals/vcpkg/ports/qtlottie/portfile.cmake @@ -0,0 +1,18 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick +) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/externals/vcpkg/ports/qtlottie/vcpkg.json b/externals/vcpkg/ports/qtlottie/vcpkg.json new file mode 100755 index 000000000..654d11143 --- /dev/null +++ b/externals/vcpkg/ports/qtlottie/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "qtlottie", + "version": "6.3.0", + "description": "Lottie is a family of player software for a certain json-based file format for describing 2d vector graphics animations. These files are created/exported directly from After Effects by a plugin called Bodymovin.", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + } + ], + "features": { + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] + } + } +} diff --git a/externals/vcpkg/ports/qtmqtt/portfile.cmake b/externals/vcpkg/ports/qtmqtt/portfile.cmake new file mode 100755 index 000000000..1a3a6f1bf --- /dev/null +++ b/externals/vcpkg/ports/qtmqtt/portfile.cmake @@ -0,0 +1,10 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/externals/vcpkg/ports/qtmqtt/vcpkg.json b/externals/vcpkg/ports/qtmqtt/vcpkg.json new file mode 100755 index 000000000..962679e25 --- /dev/null +++ b/externals/vcpkg/ports/qtmqtt/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "qtmqtt", + "version": "6.3.0", + "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "network" + ] + } + ] +} diff --git a/externals/vcpkg/ports/qtmultimedia/fix_windows_header_include.patch b/externals/vcpkg/ports/qtmultimedia/fix_windows_header_include.patch new file mode 100755 index 000000000..6e06e5c4a --- /dev/null +++ b/externals/vcpkg/ports/qtmultimedia/fix_windows_header_include.patch @@ -0,0 +1,13 @@ +diff --git a/src/multimedia/platform/windows/qwindowsmediadevices_p.h b/src/multimedia/platform/windows/qwindowsmediadevices_p.h +index 23e349e02..233a816d4 100644 +--- a/src/multimedia/platform/windows/qwindowsmediadevices_p.h ++++ b/src/multimedia/platform/windows/qwindowsmediadevices_p.h +@@ -56,7 +56,7 @@ + #include + #include + #include +-#include ++#include + + struct IMMDeviceEnumerator; + diff --git a/externals/vcpkg/ports/qtmultimedia/portfile.cmake b/externals/vcpkg/ports/qtmultimedia/portfile.cmake new file mode 100755 index 000000000..67a771a9b --- /dev/null +++ b/externals/vcpkg/ports/qtmultimedia/portfile.cmake @@ -0,0 +1,52 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES fix_windows_header_include.patch + remove_unistd.patch + ) + +#Maybe TODO: ALSA + PulseAudio? (Missing Ports) -> check ALSA since it was added + +# qt_find_package(ALSA PROVIDED_TARGETS ALSA::ALSA MODULE_NAME multimedia QMAKE_LIB alsa) +# qt_find_package(AVFoundation PROVIDED_TARGETS AVFoundation::AVFoundation MODULE_NAME multimedia QMAKE_LIB avfoundation) +# qt_find_package(WrapPulseAudio PROVIDED_TARGETS WrapPulseAudio::WrapPulseAudio MODULE_NAME multimedia QMAKE_LIB pulseaudio) +# qt_find_package(WMF PROVIDED_TARGETS WMF::WMF MODULE_NAME multimedia QMAKE_LIB wmf) + +# qt_configure_add_summary_section(NAME "Qt Multimedia") +# qt_configure_add_summary_entry(ARGS "alsa") +# qt_configure_add_summary_entry(ARGS "gstreamer_1_0") +# qt_configure_add_summary_entry(ARGS "linux_v4l") +# qt_configure_add_summary_entry(ARGS "pulseaudio") +# qt_configure_add_summary_entry(ARGS "mmrenderer") +# qt_configure_add_summary_entry(ARGS "avfoundation") +# qt_configure_add_summary_entry(ARGS "wmf") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick + "widgets" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Widgets + #"gstreamer" CMAKE_REQUIRE_FIND_PACKAGE_GStreamer +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick + "widgets" CMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets + "gstreamer" CMAKE_DISABLE_FIND_PACKAGE_GStreamer +) + +if("gstreamer" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer='yes'") +else() + list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer='no'") +endif() + +if(VCPKG_TARGET_IS_LINUX) + list(APPEND FEATURE_OPTIONS "-DFEATURE_alsa=ON") + list(APPEND FEATURE_OPTIONS "-DCMAKE_REQUIRE_FIND_PACKAGE_ALSA=ON") +else() + list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_ALSA=ON") +endif() + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/externals/vcpkg/ports/qtmultimedia/remove_unistd.patch b/externals/vcpkg/ports/qtmultimedia/remove_unistd.patch new file mode 100755 index 000000000..0f6d3ab15 --- /dev/null +++ b/externals/vcpkg/ports/qtmultimedia/remove_unistd.patch @@ -0,0 +1,24 @@ +diff --git a/src/multimedia/platform/gstreamer/audio/qgstreameraudiosink.cpp b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosink.cpp +index d4806b23a..f985a973b 100644 +--- a/src/multimedia/platform/gstreamer/audio/qgstreameraudiosink.cpp ++++ b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosink.cpp +@@ -45,7 +45,6 @@ + #include "qgstreameraudiosink_p.h" + #include "qgstreameraudiodevice_p.h" + #include +-#include + + #include + #include +diff --git a/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource.cpp b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource.cpp +index 51fc26c42..3b04a77bb 100644 +--- a/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource.cpp ++++ b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource.cpp +@@ -45,7 +45,6 @@ + #include "qgstreameraudiosource_p.h" + #include "qgstreameraudiodevice_p.h" + #include +-#include + + #include + Q_DECLARE_OPAQUE_POINTER(GstSample *); diff --git a/externals/vcpkg/ports/qtmultimedia/vcpkg.json b/externals/vcpkg/ports/qtmultimedia/vcpkg.json new file mode 100755 index 000000000..dcd5e4e7b --- /dev/null +++ b/externals/vcpkg/ports/qtmultimedia/vcpkg.json @@ -0,0 +1,59 @@ +{ + "name": "qtmultimedia", + "version": "6.3.0", + "description": "Qt Multimedia", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "alsa", + "platform": "linux" + }, + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui", + "network" + ] + }, + { + "name": "qtshadertools", + "host": true, + "default-features": false + } + ], + "default-features": [ + "widgets" + ], + "features": { + "gstreamer": { + "description": "Build with gstreamer", + "dependencies": [ + "angle", + "gstreamer" + ] + }, + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] + }, + "widgets": { + "description": "Build Multimedia Widgets", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "widgets" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/qtnetworkauth/portfile.cmake b/externals/vcpkg/ports/qtnetworkauth/portfile.cmake new file mode 100755 index 000000000..1a3a6f1bf --- /dev/null +++ b/externals/vcpkg/ports/qtnetworkauth/portfile.cmake @@ -0,0 +1,10 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/externals/vcpkg/ports/qtnetworkauth/vcpkg.json b/externals/vcpkg/ports/qtnetworkauth/vcpkg.json new file mode 100755 index 000000000..685bcaf02 --- /dev/null +++ b/externals/vcpkg/ports/qtnetworkauth/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "qtnetworkauth", + "version": "6.3.0", + "description": "Qt Network Authenticators; QtOAuth in particular", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "network" + ] + } + ] +} diff --git a/externals/vcpkg/ports/qtopcua/portfile.cmake b/externals/vcpkg/ports/qtopcua/portfile.cmake new file mode 100755 index 000000000..80738f36b --- /dev/null +++ b/externals/vcpkg/ports/qtopcua/portfile.cmake @@ -0,0 +1,32 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +# General features: +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "open62541" FEATURE_open62541 +# "open62541" FEATURE_open62541_security # requires vendored open62541 + "uacpp" FEATURE_uacpp + "ns0idnames" FEATURE_ns0idnames + "ns0idgenerator" FEATURE_ns0idgenerator + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick + ) +if("open62541" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS -DINPUT_open62541=system + -DHAVE_open62541=true) +else() + list(APPEND FEATURE_OPTIONS -DINPUT_open62541=no) +endif() + +if(NOT "open62541" IN_LIST FEATURES AND NOT "gds" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapOpenSSL=ON) +endif() + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS + ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/externals/vcpkg/ports/qtopcua/vcpkg.json b/externals/vcpkg/ports/qtopcua/vcpkg.json new file mode 100755 index 000000000..6484e6aba --- /dev/null +++ b/externals/vcpkg/ports/qtopcua/vcpkg.json @@ -0,0 +1,69 @@ +{ + "name": "qtopcua", + "version": "6.3.0", + "description": "Qt wrapper for existing OPC UA stacks", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "network" + ] + } + ], + "default-features": [ + "default-features", + "gds", + "ns0idnames", + "open62541" + ], + "features": { + "default-features": { + "description": "Platform-dependent default features" + }, + "gds": { + "description": "Support for global discovery server" + }, + "ns0idgenerator": { + "description": "Namespace 0 NodeIds generator from the NodeIds.csv file." + }, + "ns0idnames": { + "description": "Support for namespace 0 NodeId names" + }, + "open62541": { + "description": "Open62541 with plugin to connect to servers with signing and encryption", + "dependencies": [ + { + "name": "open62541", + "default-features": false, + "features": [ + "amalgamation", + "historizing", + "openssl" + ] + } + ] + }, + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + }, + { + "name": "qtdeclarative", + "default-features": false + } + ] + }, + "uacpp": { + "description": "Unified Automation C++ SDK" + } + } +} diff --git a/externals/vcpkg/ports/qtpositioning/portfile.cmake b/externals/vcpkg/ports/qtpositioning/portfile.cmake new file mode 100755 index 000000000..005fe5f33 --- /dev/null +++ b/externals/vcpkg/ports/qtpositioning/portfile.cmake @@ -0,0 +1,19 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick +) + +list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_Gypsy=ON" + "-DCMAKE_DISABLE_FIND_PACKAGE_Gconf=ON" +) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/externals/vcpkg/ports/qtpositioning/vcpkg.json b/externals/vcpkg/ports/qtpositioning/vcpkg.json new file mode 100755 index 000000000..2d6fa1e4a --- /dev/null +++ b/externals/vcpkg/ports/qtpositioning/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "qtpositioning", + "version": "6.3.0", + "description": "Qt Positioning", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false + }, + { + "name": "qtserialport", + "default-features": false + } + ], + "features": { + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] + } + } +} diff --git a/externals/vcpkg/ports/qtquick3d/portfile.cmake b/externals/vcpkg/ports/qtquick3d/portfile.cmake new file mode 100755 index 000000000..43449146f --- /dev/null +++ b/externals/vcpkg/ports/qtquick3d/portfile.cmake @@ -0,0 +1,27 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +# General features: +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "assimp" FEATURE_quick3d_assimp + #"assimp" CMAKE_REQUIRE_FIND_PACKAGE_WrapQuick3DAssimp +INVERTED_FEATURES + "assimp" CMAKE_DISABLE_FIND_PACKAGE_WrapQuick3DAssimp + ) + +if("assimp" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS -DINPUT_quick3d_assimp=system -DTEST_quick3d_assimp=ON -DHAVE_Assimp=ON) +else() + list(APPEND FEATURE_OPTIONS -DINPUT_quick3d_assimp=no) +endif() + +set(TOOL_NAMES balsam balsamui meshdebug shadergen instancer materialeditor shapegen) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS + ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/externals/vcpkg/ports/qtquick3d/vcpkg.json b/externals/vcpkg/ports/qtquick3d/vcpkg.json new file mode 100755 index 000000000..6828042ef --- /dev/null +++ b/externals/vcpkg/ports/qtquick3d/vcpkg.json @@ -0,0 +1,39 @@ +{ + "name": "qtquick3d", + "version": "6.3.0", + "description": "A new module and API for defining 3D content in Qt Quick.", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + }, + "qtdeclarative", + { + "name": "qtquick3d", + "host": true, + "default-features": false + }, + "qtquicktimeline", + "qtshadertools" + ], + "default-features": [ + "default-features" + ], + "features": { + "assimp": { + "$comment": "feature assimp requires a newer version of assimp than available within vcpkg. Install assimp with e.g. --head or use an overlay", + "description": "assimp", + "dependencies": [ + "assimp" + ] + }, + "default-features": { + "description": "Platform-dependent default features" + } + } +} diff --git a/externals/vcpkg/ports/qtquickcontrols2/portfile.cmake b/externals/vcpkg/ports/qtquickcontrols2/portfile.cmake new file mode 100755 index 000000000..2999fa8f3 --- /dev/null +++ b/externals/vcpkg/ports/qtquickcontrols2/portfile.cmake @@ -0,0 +1,2 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") diff --git a/externals/vcpkg/ports/qtquickcontrols2/vcpkg.json b/externals/vcpkg/ports/qtquickcontrols2/vcpkg.json new file mode 100755 index 000000000..cdc422ec3 --- /dev/null +++ b/externals/vcpkg/ports/qtquickcontrols2/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "qtquickcontrols2", + "version-semver": "6.2.0", + "description": "Qt Quick Controls 2 (deprecated). Included in qtdeclarative", + "homepage": "https://www.qt.io/", + "dependencies": [ + "qtdeclarative" + ] +} diff --git a/externals/vcpkg/ports/qtquicktimeline/portfile.cmake b/externals/vcpkg/ports/qtquicktimeline/portfile.cmake new file mode 100755 index 000000000..5ed735d38 --- /dev/null +++ b/externals/vcpkg/ports/qtquicktimeline/portfile.cmake @@ -0,0 +1,15 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + +set(TOOL_NAMES) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # QML plugin only diff --git a/externals/vcpkg/ports/qtquicktimeline/vcpkg.json b/externals/vcpkg/ports/qtquicktimeline/vcpkg.json new file mode 100755 index 000000000..fa1ad823b --- /dev/null +++ b/externals/vcpkg/ports/qtquicktimeline/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "qtquicktimeline", + "version": "6.3.0", + "description": "Module for keyframe-based timeline construction.", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false + }, + "qtdeclarative" + ] +} diff --git a/externals/vcpkg/ports/qtremoteobjects/portfile.cmake b/externals/vcpkg/ports/qtremoteobjects/portfile.cmake new file mode 100755 index 000000000..f2b31ed8e --- /dev/null +++ b/externals/vcpkg/ports/qtremoteobjects/portfile.cmake @@ -0,0 +1,19 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) +set(TOOL_NAMES repc) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick +) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/externals/vcpkg/ports/qtremoteobjects/vcpkg.json b/externals/vcpkg/ports/qtremoteobjects/vcpkg.json new file mode 100755 index 000000000..4c2591f07 --- /dev/null +++ b/externals/vcpkg/ports/qtremoteobjects/vcpkg.json @@ -0,0 +1,43 @@ +{ + "name": "qtremoteobjects", + "version": "6.3.0", + "description": "Qt distributed object system", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "network" + ] + }, + { + "name": "qtdeclarative", + "default-features": false + }, + { + "name": "qtremoteobjects", + "host": true, + "default-features": false + } + ], + "features": { + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + }, + { + "name": "qtdeclarative", + "default-features": false + } + ] + } + } +} diff --git a/externals/vcpkg/ports/qtscxml/portfile.cmake b/externals/vcpkg/ports/qtscxml/portfile.cmake new file mode 100755 index 000000000..74fa2ed04 --- /dev/null +++ b/externals/vcpkg/ports/qtscxml/portfile.cmake @@ -0,0 +1,20 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + +set(TOOL_NAMES qscxmlc) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Qml +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Qml +) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/externals/vcpkg/ports/qtscxml/vcpkg.json b/externals/vcpkg/ports/qtscxml/vcpkg.json new file mode 100755 index 000000000..01a1d1387 --- /dev/null +++ b/externals/vcpkg/ports/qtscxml/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "qtscxml", + "version": "6.3.0", + "description": "SCXML (state machine notation) compiler and related tools", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + }, + { + "name": "qtscxml", + "host": true, + "default-features": false + } + ], + "features": { + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] + } + } +} diff --git a/externals/vcpkg/ports/qtsensors/portfile.cmake b/externals/vcpkg/ports/qtsensors/portfile.cmake new file mode 100755 index 000000000..0f5be8a03 --- /dev/null +++ b/externals/vcpkg/ports/qtsensors/portfile.cmake @@ -0,0 +1,17 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick +) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/externals/vcpkg/ports/qtsensors/vcpkg.json b/externals/vcpkg/ports/qtsensors/vcpkg.json new file mode 100755 index 000000000..e7a799fa6 --- /dev/null +++ b/externals/vcpkg/ports/qtsensors/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "qtsensors", + "version": "6.3.0", + "description": "Qt Sensors", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "dbus" + ] + }, + { + "name": "qtconnectivity", + "default-features": false + } + ], + "features": { + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] + } + } +} diff --git a/externals/vcpkg/ports/qtserialbus/portfile.cmake b/externals/vcpkg/ports/qtserialbus/portfile.cmake new file mode 100755 index 000000000..b69e37c31 --- /dev/null +++ b/externals/vcpkg/ports/qtserialbus/portfile.cmake @@ -0,0 +1,18 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + + set(TOOL_NAMES + canbusutil + ) + +# Probably not worth the time to make it features: +# qt_configure_add_summary_entry(ARGS "socketcan") # only unix +# qt_configure_add_summary_entry(ARGS "socketcan_fd") # only unix +# qt_configure_add_summary_entry(ARGS "modbus-serialport") + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/externals/vcpkg/ports/qtserialbus/vcpkg.json b/externals/vcpkg/ports/qtserialbus/vcpkg.json new file mode 100755 index 000000000..5d26a8a1e --- /dev/null +++ b/externals/vcpkg/ports/qtserialbus/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "qtserialbus", + "version": "6.3.0", + "description": "Support for CAN and potentially other serial buses.", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "network" + ] + }, + { + "name": "qtserialbus", + "host": true, + "default-features": false + }, + { + "name": "qtserialport", + "default-features": false + } + ], + "default-features": [ + "default-features" + ], + "features": { + "default-features": { + "description": "Platform-dependent default features" + } + } +} diff --git a/externals/vcpkg/ports/qtserialport/portfile.cmake b/externals/vcpkg/ports/qtserialport/portfile.cmake new file mode 100755 index 000000000..1a3a6f1bf --- /dev/null +++ b/externals/vcpkg/ports/qtserialport/portfile.cmake @@ -0,0 +1,10 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/externals/vcpkg/ports/qtserialport/vcpkg.json b/externals/vcpkg/ports/qtserialport/vcpkg.json new file mode 100755 index 000000000..c4bde3e9c --- /dev/null +++ b/externals/vcpkg/ports/qtserialport/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qtserialport", + "version": "6.3.0", + "description": "Qt Serial Port support", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false + } + ] +} diff --git a/externals/vcpkg/ports/qtshadertools/portfile.cmake b/externals/vcpkg/ports/qtshadertools/portfile.cmake new file mode 100755 index 000000000..0311a481a --- /dev/null +++ b/externals/vcpkg/ports/qtshadertools/portfile.cmake @@ -0,0 +1,13 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + +set(TOOL_NAMES qsb) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/externals/vcpkg/ports/qtshadertools/vcpkg.json b/externals/vcpkg/ports/qtshadertools/vcpkg.json new file mode 100755 index 000000000..2384a42d4 --- /dev/null +++ b/externals/vcpkg/ports/qtshadertools/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "qtshadertools", + "version": "6.3.0", + "description": "APIs and tools in this module provide the producer functionality for the shader pipeline that allows Qt Quick to operate on Vulkan, Metal, and Direct3D, in addition to OpenGL.", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + }, + { + "name": "qtshadertools", + "host": true, + "default-features": false + } + ] +} diff --git a/externals/vcpkg/ports/qtsvg/portfile.cmake b/externals/vcpkg/ports/qtsvg/portfile.cmake new file mode 100755 index 000000000..975bf122f --- /dev/null +++ b/externals/vcpkg/ports/qtsvg/portfile.cmake @@ -0,0 +1,13 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + +set(TOOL_NAMES) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/externals/vcpkg/ports/qtsvg/vcpkg.json b/externals/vcpkg/ports/qtsvg/vcpkg.json new file mode 100755 index 000000000..4c8bdb3fa --- /dev/null +++ b/externals/vcpkg/ports/qtsvg/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "qtsvg", + "version": "6.3.0", + "description": "Qt SVG", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + } + ] +} diff --git a/externals/vcpkg/ports/qttools/fix_static_build.patch b/externals/vcpkg/ports/qttools/fix_static_build.patch new file mode 100755 index 000000000..bc67faf5d --- /dev/null +++ b/externals/vcpkg/ports/qttools/fix_static_build.patch @@ -0,0 +1,27 @@ +diff --git a/src/designer/src/components/lib/CMakeLists.txt b/src/designer/src/components/lib/CMakeLists.txt +index 53358741f..ce070bd6a 100644 +--- a/src/designer/src/components/lib/CMakeLists.txt ++++ b/src/designer/src/components/lib/CMakeLists.txt +@@ -878,7 +878,7 @@ qt_internal_add_resource(DesignerComponents "widgetbox" + ## Scopes: + ##################################################################### + +-qt_internal_extend_target(DesignerComponents CONDITION static ++qt_internal_extend_target(DesignerComponents CONDITION NOT BUILD_SHARED_LIBS + DEFINES + QT_DESIGNER_STATIC + ) +diff --git a/src/designer/src/designer/CMakeLists.txt b/src/designer/src/designer/CMakeLists.txt +index f786f1dd6..8c635ff14 100644 +--- a/src/designer/src/designer/CMakeLists.txt ++++ b/src/designer/src/designer/CMakeLists.txt +@@ -103,8 +103,8 @@ qt_internal_extend_target(designer CONDITION TARGET Qt::PrintSupport + PUBLIC_LIBRARIES + Qt::PrintSupport + ) + +-qt_internal_extend_target(designer CONDITION QT_CONFIG___contains___static ++qt_internal_extend_target(designer CONDITION NOT BUILD_SHARED_LIBS + DEFINES + QT_DESIGNER_STATIC + ) diff --git a/externals/vcpkg/ports/qttools/no_src_changes.patch b/externals/vcpkg/ports/qttools/no_src_changes.patch new file mode 100755 index 000000000..8b948c26a --- /dev/null +++ b/externals/vcpkg/ports/qttools/no_src_changes.patch @@ -0,0 +1,41 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 20bd474..7b69743 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -187,13 +187,13 @@ endif() + if(WIN32) + file(TO_NATIVE_PATH ${XXD_COMMAND} XXD_COMMAND) + file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/include/master.css MASTER_FILE) +- add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc +- COMMAND type ${MASTER_FILE} | "${XXD_COMMAND}" -i > ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc) ++ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc ++ COMMAND type ${MASTER_FILE} | "${XXD_COMMAND}" -i > ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc) + else() +- add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc +- COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/include/master.css | xxd -i > ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc) ++ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc ++ COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/include/master.css | xxd -i > ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc) + endif() +-set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc PROPERTIES GENERATED TRUE) ++set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc PROPERTIES GENERATED TRUE) + + # Tests + +@@ -218,7 +218,7 @@ if (BUILD_TESTING) + add_executable( + ${TEST_NAME} + ${TEST_LITEHTML} +- ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc ++ ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc + ) + + set_target_properties(${TEST_NAME} PROPERTIES +@@ -243,7 +243,7 @@ if (BUILD_TESTING) + endif() + + # set(TEST_NAME ${PROJECT_NAME}_tests) +-# add_executable(${TEST_NAME} ${TEST_LITEHTML} ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc) ++# add_executable(${TEST_NAME} ${TEST_LITEHTML} ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc) + # set_target_properties(${TEST_NAME} PROPERTIES + # CXX_STANDARD 11 + # C_STANDARD 99 diff --git a/externals/vcpkg/ports/qttools/portfile.cmake b/externals/vcpkg/ports/qttools/portfile.cmake new file mode 100755 index 000000000..bab69a67c --- /dev/null +++ b/externals/vcpkg/ports/qttools/portfile.cmake @@ -0,0 +1,151 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES )#fix_static_build.patch) + +#TODO check features and setup: (means force features!) + +# -- The following OPTIONAL packages have not been found: + + # * Qt6AxContainer + # * Clang + # * WrapLibClang (required version >= 8) + +# Configure summary: + +# Qt Tools: + # Qt Assistant ........................... yes + # QDoc ................................... no + # Clang-based lupdate parser ............. no + # Qt Designer ............................ yes + # Qt Distance Field Generator ............ yes + # kmap2qmap .............................. yes + # Qt Linguist ............................ yes + # Mac Deployment Tool .................... no + # pixeltool .............................. yes + # qdbus .................................. yes + # qev .................................... yes + # Qt Attributions Scanner ................ yes + # qtdiag ................................. yes + # qtpaths ................................ yes + # qtplugininfo ........................... yes + # Windows deployment tool ................ yes + +# General features: +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "assistant" FEATURE_assistant + "designer" FEATURE_designer + "linguist" FEATURE_linguist + "qdoc" CMAKE_REQUIRE_FIND_PACKAGE_Clang + #"qdoc" CMAKE_REQUIRE_FIND_PACKAGE_WrapLibClang + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6QuickWidgets + INVERTED_FEATURES + "qdoc" CMAKE_DISABLE_FIND_PACKAGE_Clang + "qdoc" CMAKE_DISABLE_FIND_PACKAGE_WrapLibClang + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets + ) + + set(TOOL_NAMES + assistant + designer + lconvert + linguist + lprodump + lrelease-pro + lrelease + lupdate-pro + lupdate + pixeltool + qcollectiongenerator + qdistancefieldgenerator + qhelpgenerator + qtattributionsscanner + qtdiag + qtdiag6 + qtpaths + qtplugininfo + qdbus + qdbusviewer + qdoc + ) +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND TOOL_NAMES windeployqt) +elseif(VCPKG_TARGET_IS_OSX) + list(APPEND TOOL_NAMES macdeployqt) +endif() + +### Download third_party modules +vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH_QLITEHTML + URL git://code.qt.io/playground/qlitehtml.git # git://code.qt.io/playground/qlitehtml.git + REF "${${PORT}_qlitehtml_REF}" + FETCH_REF master + HEAD_REF master +) +# port 'litehtml' is not in vcpkg! +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH_LITEHTML + REPO litehtml/litehtml + REF "${${PORT}_litehtml_REF}" + SHA512 "${${PORT}_litehtml_HASH}" + HEAD_REF master + PATCHES no_src_changes.patch +) + +##### qt_install_submodule +set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) +set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) + +qt_download_submodule(PATCHES ${${PORT}_PATCHES}) +if(QT_UPDATE_VERSION) + return() +endif() +file(COPY "${SOURCE_PATH_QLITEHTML}/" DESTINATION "${SOURCE_PATH}/src/assistant/qlitehtml") +file(COPY "${SOURCE_PATH_LITEHTML}/" DESTINATION "${SOURCE_PATH}/src/assistant/qlitehtml/src/3rdparty/litehtml") + + +if(_qis_DISABLE_NINJA) + set(_opt DISABLE_NINJA) +endif() +qt_cmake_configure(${_opt} + OPTIONS ${FEATURE_OPTIONS} + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=ON + OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} + OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) + +vcpkg_cmake_install(ADD_BIN_TO_PATH) + +qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) + +qt_install_copyright("${SOURCE_PATH}") + +##### qt_install_submodule + +if(VCPKG_TARGET_IS_OSX) + set(OSX_APP_FOLDERS Designer.app Linguist.app pixeltool.app qdbusviewer.app) + foreach(_appfolder IN LISTS OSX_APP_FOLDERS) + message(STATUS "Moving: ${_appfolder}") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${_appfolder}/" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}/") + endforeach() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +if(NOT QT_IS_LATEST) + set(configfile "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsTargets-debug.cmake") + if(EXISTS "${configfile}" AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/windeployqt.exe") + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/windeployqt.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") + file(READ "${configfile}" _contents) + string(REPLACE [[${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.exe]] [[${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.debug.bat]] _contents "${_contents}") + file(WRITE "${configfile}" "${_contents}") + endif() +endif() + +file(GLOB_RECURSE debug_dir "${CURRENT_PACKAGES_DIR}/debug/*") +list(LENGTH debug_dir debug_dir_elements) +if(debug_dir_elements EQUAL 0) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +endif() diff --git a/externals/vcpkg/ports/qttools/vcpkg.json b/externals/vcpkg/ports/qttools/vcpkg.json new file mode 100755 index 000000000..cbbda35b6 --- /dev/null +++ b/externals/vcpkg/ports/qttools/vcpkg.json @@ -0,0 +1,84 @@ +{ + "name": "qttools", + "version": "6.3.0", + "port-version": 1, + "description": "Qt Tools", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false + }, + { + "name": "qttools", + "host": true, + "default-features": false, + "features": [ + "assistant", + "linguist" + ] + } + ], + "features": { + "assistant": { + "description": "Build Qt Assistant", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "network", + "sql-sqlite" + ] + } + ] + }, + "designer": { + "description": "Build Qt Designer", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "network" + ] + } + ] + }, + "linguist": { + "description": "Build Qt Linguist components", + "dependencies": [ + { + "name": "qttools", + "default-features": false, + "features": [ + "designer" + ] + } + ] + }, + "qdoc": { + "description": "Build QDoc.", + "dependencies": [ + "llvm" + ] + }, + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + }, + { + "name": "qtdeclarative", + "default-features": false + } + ] + } + } +} diff --git a/externals/vcpkg/ports/qttools/windeployqt.debug.bat b/externals/vcpkg/ports/qttools/windeployqt.debug.bat new file mode 100755 index 000000000..c0c41e34d --- /dev/null +++ b/externals/vcpkg/ports/qttools/windeployqt.debug.bat @@ -0,0 +1,10 @@ +@echo off +setlocal enabledelayedexpansion +set mypath=%~dp0 +set mypath=%mypath:~0,-1% +set BAKCD=!CD! +cd /D %mypath%\..\..\..\debug\bin +set PATH=!CD!;%PATH% +"%mypath%\windeployqt.exe" --qmake "%mypath%\qmake.debug.bat" %* +cd %BAKCD% +endlocal diff --git a/externals/vcpkg/ports/qttranslations/portfile.cmake b/externals/vcpkg/ports/qttranslations/portfile.cmake new file mode 100755 index 000000000..f151f0a5b --- /dev/null +++ b/externals/vcpkg/ports/qttranslations/portfile.cmake @@ -0,0 +1,15 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) +set(TOOL_NAMES) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS_MAYBE_UNUSED + QT_BUILD_EXAMPLES + QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS + ) + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # only translation files. +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/externals/vcpkg/ports/qttranslations/vcpkg.json b/externals/vcpkg/ports/qttranslations/vcpkg.json new file mode 100755 index 000000000..135e74658 --- /dev/null +++ b/externals/vcpkg/ports/qttranslations/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "qttranslations", + "version": "6.3.0", + "description": "Qt Translations", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false + }, + { + "name": "qttools", + "default-features": false, + "features": [ + "linguist" + ] + } + ], + "default-features": [ + "default-features" + ], + "features": { + "default-features": { + "description": "Platform-dependent default features" + } + } +} diff --git a/externals/vcpkg/ports/qtvirtualkeyboard/hunspell_include_path_fix.patch b/externals/vcpkg/ports/qtvirtualkeyboard/hunspell_include_path_fix.patch new file mode 100755 index 000000000..7c92d6a89 --- /dev/null +++ b/externals/vcpkg/ports/qtvirtualkeyboard/hunspell_include_path_fix.patch @@ -0,0 +1,26 @@ +diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.cpp b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.cpp +index 8ee4d7503..0fb4461d2 100644 +--- a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.cpp ++++ b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.cpp +@@ -29,7 +29,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellworker_p.h b/src/plugins/hunspell/hunspellinputmethod/hunspellworker_p.h +index b79354429..a843bdfa6 100644 +--- a/src/plugins/hunspell/hunspellinputmethod/hunspellworker_p.h ++++ b/src/plugins/hunspell/hunspellinputmethod/hunspellworker_p.h +@@ -50,7 +50,7 @@ + #include + #include + #include +-#include ++#include + #include + + QT_BEGIN_NAMESPACE diff --git a/externals/vcpkg/ports/qtvirtualkeyboard/portfile.cmake b/externals/vcpkg/ports/qtvirtualkeyboard/portfile.cmake new file mode 100755 index 000000000..528a0a4de --- /dev/null +++ b/externals/vcpkg/ports/qtvirtualkeyboard/portfile.cmake @@ -0,0 +1,29 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES hunspell_include_path_fix.patch) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + "xcb" CMAKE_DISABLE_FIND_PACKAGE_XCB + ) + + +if("hunspell" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS -DINPUT_vkb_hunspell:STRING=system) +else() + list(APPEND FEATURE_OPTIONS -DINPUT_vkb_hunspell=no) +endif() +if("t9write" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS -DINPUT_vkb_handwriting=t9write) +else() + list(APPEND FEATURE_OPTIONS -DINPUT_vkb_handwriting=no) +endif() + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + -DINPUT_vkb_style:STRING=default + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG -DFEATURE_vkb_record_trace_input=ON + -DFEATURE_vkb_sensitive_debug=ON + ) diff --git a/externals/vcpkg/ports/qtvirtualkeyboard/vcpkg.json b/externals/vcpkg/ports/qtvirtualkeyboard/vcpkg.json new file mode 100755 index 000000000..69c4aa803 --- /dev/null +++ b/externals/vcpkg/ports/qtvirtualkeyboard/vcpkg.json @@ -0,0 +1,48 @@ +{ + "name": "qtvirtualkeyboard", + "version": "6.3.0", + "description": "SCXML (state machine notation) compiler and related tools", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + }, + { + "name": "qtdeclarative", + "default-features": false + }, + { + "name": "qtsvg", + "default-features": false + } + ], + "default-features": [ + "default-features", + "hunspell" + ], + "features": { + "default-features": { + "description": "Platform-dependent default features" + }, + "hunspell": { + "description": "Use hunspell", + "dependencies": [ + "hunspell" + ] + }, + "t9write": { + "description": "T9Write handwriting (commercial SDK requires port overlay)", + "dependencies": [ + "t9write" + ] + }, + "xcb": { + "description": "XCB integration" + } + } +} diff --git a/externals/vcpkg/ports/qtwayland/portfile.cmake b/externals/vcpkg/ports/qtwayland/portfile.cmake new file mode 100755 index 000000000..54d9d9390 --- /dev/null +++ b/externals/vcpkg/ports/qtwayland/portfile.cmake @@ -0,0 +1,25 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +message(WARNING "qtwayland requires libwayland-dev from your system package manager. You can install it with +sudo apt install libwayland-dev +on Ubuntu systems.") + +set(${PORT}_PATCHES) + +set(TOOL_NAMES qtwaylandscanner) + + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick +) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/externals/vcpkg/ports/qtwayland/vcpkg.json b/externals/vcpkg/ports/qtwayland/vcpkg.json new file mode 100755 index 000000000..e662994d2 --- /dev/null +++ b/externals/vcpkg/ports/qtwayland/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "qtwayland", + "version": "6.3.0", + "description": "A toolbox for making Qt based Wayland compositors", + "homepage": "https://www.qt.io/", + "license": null, + "supports": "!windows", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + } + ], + "features": { + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] + } + } +} diff --git a/externals/vcpkg/ports/qtwebchannel/portfile.cmake b/externals/vcpkg/ports/qtwebchannel/portfile.cmake new file mode 100755 index 000000000..f07e0c6e2 --- /dev/null +++ b/externals/vcpkg/ports/qtwebchannel/portfile.cmake @@ -0,0 +1,18 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick +) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/externals/vcpkg/ports/qtwebchannel/vcpkg.json b/externals/vcpkg/ports/qtwebchannel/vcpkg.json new file mode 100755 index 000000000..13315f04e --- /dev/null +++ b/externals/vcpkg/ports/qtwebchannel/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "qtwebchannel", + "version": "6.3.0", + "description": "Qt WebChannel", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false + } + ], + "features": { + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] + } + } +} diff --git a/externals/vcpkg/ports/qtwebengine/0ce5e91.diff b/externals/vcpkg/ports/qtwebengine/0ce5e91.diff new file mode 100755 index 000000000..cf26bade1 --- /dev/null +++ b/externals/vcpkg/ports/qtwebengine/0ce5e91.diff @@ -0,0 +1,94 @@ +From 0ce5e91bdfa2cd7cac247911b9e8c4404c114937 Mon Sep 17 00:00:00 2001 +From: Peter Varga +Date: Thu, 21 Apr 2022 08:49:53 +0200 +Subject: [PATCH] Workaround MSVC2022 ICE in constexpr functions + +It happens around initialization of STL containers in a constexpr +function. In this case, aggregate initialization of std::array with +double braces seems to cause the crash. + +For some reason it doesn't seem to happen in 98-based. This workaround +can be reverted after Microsoft fixes the issue: +https://developercommunity.visualstudio.com/t/fatal-error-C1001:-Internal-compiler-err/1669485 + +Change-Id: I6bc2c71d328691cc74bc53c6d62f3d5df519b81e +Pick-to: 90-based +Fixes: QTBUG-101917 +Reviewed-by: Allan Sandfeld Jensen +--- + +diff --git a/chromium/base/hash/md5_constexpr_internal.h b/chromium/base/hash/md5_constexpr_internal.h +index b705bc8..5c9c004 100644 +--- a/chromium/base/hash/md5_constexpr_internal.h ++++ b/chromium/base/hash/md5_constexpr_internal.h +@@ -281,15 +281,63 @@ + return IntermediateDataToMD5Digest(ProcessMessage(data, n)); + } + +- static constexpr uint64_t Hash64(const char* data, uint32_t n) { +- IntermediateData intermediate = ProcessMessage(data, n); +- return (static_cast(SwapEndian(intermediate.a)) << 32) | +- static_cast(SwapEndian(intermediate.b)); ++ static constexpr uint64_t Hash64(const char* message, uint32_t n) { ++ const uint32_t m = GetPaddedMessageLength(n); ++ IntermediateData intermediate0 = kInitialIntermediateData; ++ for (uint32_t offset = 0; offset < m; offset += 64) { ++ RoundData data = { ++ GetPaddedMessageWord(message, n, m, offset), ++ GetPaddedMessageWord(message, n, m, offset + 4), ++ GetPaddedMessageWord(message, n, m, offset + 8), ++ GetPaddedMessageWord(message, n, m, offset + 12), ++ GetPaddedMessageWord(message, n, m, offset + 16), ++ GetPaddedMessageWord(message, n, m, offset + 20), ++ GetPaddedMessageWord(message, n, m, offset + 24), ++ GetPaddedMessageWord(message, n, m, offset + 28), ++ GetPaddedMessageWord(message, n, m, offset + 32), ++ GetPaddedMessageWord(message, n, m, offset + 36), ++ GetPaddedMessageWord(message, n, m, offset + 40), ++ GetPaddedMessageWord(message, n, m, offset + 44), ++ GetPaddedMessageWord(message, n, m, offset + 48), ++ GetPaddedMessageWord(message, n, m, offset + 52), ++ GetPaddedMessageWord(message, n, m, offset + 56), ++ GetPaddedMessageWord(message, n, m, offset + 60)}; ++ IntermediateData intermediate1 = intermediate0; ++ for (uint32_t i = 0; i < 64; ++i) ++ intermediate1 = ApplyStep(i, data, intermediate1); ++ intermediate0 = Add(intermediate0, intermediate1); ++ } ++ return (static_cast(SwapEndian(intermediate0.a)) << 32) | ++ static_cast(SwapEndian(intermediate0.b)); + } + +- static constexpr uint32_t Hash32(const char* data, uint32_t n) { +- IntermediateData intermediate = ProcessMessage(data, n); +- return SwapEndian(intermediate.a); ++ static constexpr uint32_t Hash32(const char* message, uint32_t n) { ++ const uint32_t m = GetPaddedMessageLength(n); ++ IntermediateData intermediate0 = kInitialIntermediateData; ++ for (uint32_t offset = 0; offset < m; offset += 64) { ++ RoundData data = { ++ GetPaddedMessageWord(message, n, m, offset), ++ GetPaddedMessageWord(message, n, m, offset + 4), ++ GetPaddedMessageWord(message, n, m, offset + 8), ++ GetPaddedMessageWord(message, n, m, offset + 12), ++ GetPaddedMessageWord(message, n, m, offset + 16), ++ GetPaddedMessageWord(message, n, m, offset + 20), ++ GetPaddedMessageWord(message, n, m, offset + 24), ++ GetPaddedMessageWord(message, n, m, offset + 28), ++ GetPaddedMessageWord(message, n, m, offset + 32), ++ GetPaddedMessageWord(message, n, m, offset + 36), ++ GetPaddedMessageWord(message, n, m, offset + 40), ++ GetPaddedMessageWord(message, n, m, offset + 44), ++ GetPaddedMessageWord(message, n, m, offset + 48), ++ GetPaddedMessageWord(message, n, m, offset + 52), ++ GetPaddedMessageWord(message, n, m, offset + 56), ++ GetPaddedMessageWord(message, n, m, offset + 60)}; ++ IntermediateData intermediate1 = intermediate0; ++ for (uint32_t i = 0; i < 64; ++i) ++ intermediate1 = ApplyStep(i, data, intermediate1); ++ intermediate0 = Add(intermediate0, intermediate1); ++ } ++ return SwapEndian(intermediate0.a); + } + }; + diff --git a/externals/vcpkg/ports/qtwebengine/portfile.cmake b/externals/vcpkg/ports/qtwebengine/portfile.cmake new file mode 100755 index 000000000..f228d620a --- /dev/null +++ b/externals/vcpkg/ports/qtwebengine/portfile.cmake @@ -0,0 +1,138 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(TOOL_NAMES gn QtWebEngineProcess qwebengine_convert_dict) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "proprietary-codecs" FEATURE_webengine_proprietary_codecs + "spellchecker" FEATURE_webengine_spellchecker + "geolocation" FEATURE_webengine_geolocation + "webchannel" FEATURE_webengine_webchannel + "geolocation" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Positioning + "webchannel" CMAKE_REQUIRE_FIND_PACKAGE_Qt6WebChannel +INVERTED_FEATURES + "geolocation" CMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning + "webchannel" CMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel +) + +if(VCPKG_TARGET_IS_OSX AND "spellchecker" IN_LIST FEATRUES) + list(APPEND FEATURE_OPTIONS "-DFEATURE_webengine_native_spellchecker=ON") +endif() + +# webengine-extensions +# webengine-printing-and-pdf +# webengine-pepper-plugins +set(deactivated_features webengine_webrtc_pipewire) +foreach(_feat IN LISTS deactivated_features) + list(APPEND FEATURE_OPTIONS "-DFEATURE_${_feat}=OFF") +endforeach() +set(enabled_features webengine_webrtc webengine_v8_snapshot_support) +foreach(_feat IN LISTS enabled_features) + list(APPEND FEATURE_OPTIONS "-DFEATURE_${_feat}=ON") +endforeach() + +if(VCPKG_TARGET_IS_LINUX) + # qt_configure_add_summary_entry(ARGS "webengine-system-lcms2") + # qt_configure_add_summary_entry(ARGS "webengine-system-libpci") + # + ALSA and PULSEAUDIO + set(system_libs re2 icu libwebp opus ffmpeg libvpx snappy glib zlib minizip libevent protobuf libxml libpng libjpeg harfbuzz freetype) + foreach(_sys_lib IN LISTS system_libs) + list(APPEND FEATURE_OPTIONS "-DFEATURE_webengine_system_${_sys_lib}=ON") + endforeach() +endif() + +vcpkg_find_acquire_program(FLEX) +vcpkg_find_acquire_program(BISON) + +#vcpkg_find_acquire_program(GN) # Qt builds its own internal version + +find_program(NODEJS NAMES node PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/node" "bin" NO_DEFAULT_PATHS) +find_program(NODEJS NAMES node) +if(NOT NODEJS) + message(FATAL_ERROR "node not found! Please install it via your system package manager!") +endif() + +get_filename_component(NODEJS_DIR "${NODEJS}" DIRECTORY ) +vcpkg_add_to_path(PREPEND "${NODEJS_DIR}") +get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) +vcpkg_add_to_path(PREPEND "${FLEX_DIR}") +get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) +vcpkg_add_to_path(PREPEND "${BISON_DIR}") + +if(NOT QT_IS_LATEST) + vcpkg_find_acquire_program(PYTHON2) + get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY ) + vcpkg_add_to_path(PREPEND "${PYTHON2_DIR}") + list(APPEND FEATURE_OPTIONS "-DPython2_EXECUTABLE=${PYTHON2}") +else() + vcpkg_find_acquire_program(PYTHON3) + x_vcpkg_get_python_packages(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES html5lib) +endif() + +vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf") +set(GPERF "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf/gperf${VCPKG_HOST_EXECUTABLE_SUFFIX}") + +if(WIN32) # WIN32 HOST probably has win_flex and win_bison! + if(NOT EXISTS "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") + file(CREATE_LINK "${FLEX}" "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") + endif() + if(NOT EXISTS "${BISON_DIR}/BISON${VCPKG_HOST_EXECUTABLE_SUFFIX}") + file(CREATE_LINK "${BISON}" "${BISON_DIR}/bison${VCPKG_HOST_EXECUTABLE_SUFFIX}") + endif() +endif() + +string(LENGTH "${CURRENT_BUILDTREES_DIR}" buildtree_length) +# We know that C:/buildrees/${PORT} is to long to build Release. Debug works however. Means 24 length is too much but 23 might work. +if(buildtree_length GREATER 22 AND VCPKG_TARGET_IS_WINDOWS) + message(WARNING "Buildtree path '${CURRENT_BUILDTREES_DIR}' is too long.\nConsider passing --x-buildtrees-root= to vcpkg!\nTrying to use '${CURRENT_BUILDTREES_DIR}/../tmp'") + set(CURRENT_BUILDTREES_DIR "${CURRENT_BUILDTREES_DIR}/../tmp") # activly avoid long path issues in CI. -> Means CI will not return logs + cmake_path(NORMAL_PATH CURRENT_BUILDTREES_DIR) + string(LENGTH "${CURRENT_BUILDTREES_DIR}" buildtree_length_new) + if(buildtree_length_new GREATER 22) + message(FATAL_ERROR "Buildtree path is too long. Build will fail! Pass --x-buildtrees-root= to vcpkg!") + endif() + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}") +endif() + +### Download third_party modules +vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH_WEBENGINE + URL git://code.qt.io/qt/qtwebengine-chromium.git + REF "${${PORT}_chromium_REF}" + PATCHES + 0ce5e91.diff +) + +##### qt_install_submodule +set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) +set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) + +qt_download_submodule(PATCHES ${${PORT}_PATCHES}) +if(QT_UPDATE_VERSION) + return() +endif() +if(NOT EXISTS "${SOURCE_PATH}/src/3rdparty/chromium") + file(RENAME "${SOURCE_PATH_WEBENGINE}/chromium" "${SOURCE_PATH}/src/3rdparty/chromium") +endif() +if(NOT EXISTS "${SOURCE_PATH}/src/3rdparty/gn") + file(RENAME "${SOURCE_PATH_WEBENGINE}/gn" "${SOURCE_PATH}/src/3rdparty/gn") +endif() + +qt_cmake_configure( DISABLE_PARALLEL_CONFIGURE # due to in source changes. + OPTIONS ${FEATURE_OPTIONS} + -DGPerf_EXECUTABLE=${GPERF} + -DBISON_EXECUTABLE=${BISON} + -DFLEX_EXECUTABLE=${FLEX} + #-DGn_EXECUTABLE=${GN} + -DNodejs_EXECUTABLE=${NODEJS} + OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} + OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) + +vcpkg_cmake_install(ADD_BIN_TO_PATH) + +qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) + +qt_install_copyright("${SOURCE_PATH}") + +##### qt_install_submodule diff --git a/externals/vcpkg/ports/qtwebengine/vcpkg.json b/externals/vcpkg/ports/qtwebengine/vcpkg.json new file mode 100755 index 000000000..9198d677d --- /dev/null +++ b/externals/vcpkg/ports/qtwebengine/vcpkg.json @@ -0,0 +1,160 @@ +{ + "$comment": "x86-windows is not within the upstream support matrix of Qt6", + "name": "qtwebengine", + "version": "6.3.0", + "port-version": 2, + "description": "Qt WebEngine", + "homepage": "https://www.qt.io/", + "license": null, + "supports": "!static & !((arm | x86) & windows)", + "dependencies": [ + { + "name": "ffmpeg", + "platform": "!windows" + }, + { + "name": "fontconfig", + "platform": "!windows" + }, + { + "name": "freetype", + "platform": "!windows" + }, + { + "name": "glib", + "platform": "!windows" + }, + { + "name": "gperf", + "host": true + }, + { + "name": "harfbuzz", + "platform": "!windows" + }, + { + "name": "icu", + "platform": "!windows" + }, + { + "name": "libevent", + "platform": "!windows" + }, + { + "name": "libjpeg-turbo", + "platform": "!windows" + }, + { + "name": "libpng", + "platform": "!windows" + }, + { + "name": "libvpx", + "platform": "!windows" + }, + { + "name": "libwebp", + "platform": "!windows" + }, + { + "name": "libxml2", + "platform": "!windows" + }, + { + "name": "minizip", + "platform": "!windows" + }, + "opengl-registry", + { + "name": "opus", + "platform": "!windows" + }, + { + "name": "protobuf", + "platform": "!windows" + }, + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui", + "network", + "widgets" + ] + }, + { + "name": "qtdeclarative", + "default-features": false + }, + { + "name": "qtdeclarative", + "default-features": false + }, + { + "name": "qttools", + "default-features": false + }, + { + "$comment": "Requires GN host tool build by the port itself! (special version check)", + "name": "qtwebengine", + "host": true, + "default-features": false + }, + { + "name": "re2", + "platform": "!windows" + }, + { + "name": "snappy", + "platform": "!windows" + }, + { + "name": "vcpkg-get-python-packages", + "host": true + }, + { + "name": "vcpkg-tool-nodejs", + "host": true + }, + { + "name": "vcpkg-tool-python2", + "host": true + }, + { + "name": "zlib", + "platform": "!windows" + } + ], + "default-features": [ + "default-features" + ], + "features": { + "default-features": { + "description": "Platform-dependent default features" + }, + "geolocation": { + "description": "Build with Geolocation", + "dependencies": [ + { + "name": "qtlocation", + "default-features": false + } + ] + }, + "proprietary-codecs": { + "description": "Enables the use of proprietary codecs such as h.264/h.265 and MP3." + }, + "spellchecker": { + "description": "Provides a spellchecker" + }, + "webchannel": { + "description": "Provides QtWebChannel integration", + "dependencies": [ + { + "name": "qtwebchannel", + "default-features": false + } + ] + } + } +} diff --git a/externals/vcpkg/ports/qtwebsockets/portfile.cmake b/externals/vcpkg/ports/qtwebsockets/portfile.cmake new file mode 100755 index 000000000..f07e0c6e2 --- /dev/null +++ b/externals/vcpkg/ports/qtwebsockets/portfile.cmake @@ -0,0 +1,18 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick +) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/externals/vcpkg/ports/qtwebsockets/vcpkg.json b/externals/vcpkg/ports/qtwebsockets/vcpkg.json new file mode 100755 index 000000000..3f37294d9 --- /dev/null +++ b/externals/vcpkg/ports/qtwebsockets/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "qtwebsockets", + "version": "6.3.0", + "description": "Qt WebSockets", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "network" + ] + } + ], + "features": { + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] + } + } +} diff --git a/externals/vcpkg/ports/qtwebview/portfile.cmake b/externals/vcpkg/ports/qtwebview/portfile.cmake new file mode 100755 index 000000000..8a3f752c5 --- /dev/null +++ b/externals/vcpkg/ports/qtwebview/portfile.cmake @@ -0,0 +1,22 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6WebEngineQuick + "webengine" CMAKE_REQUIRE_FIND_PACKAGE_WebEngineCore +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick + "webengine" CMAKE_DISABLE_FIND_PACKAGE_WebEngineCore +) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/externals/vcpkg/ports/qtwebview/vcpkg.json b/externals/vcpkg/ports/qtwebview/vcpkg.json new file mode 100755 index 000000000..084279921 --- /dev/null +++ b/externals/vcpkg/ports/qtwebview/vcpkg.json @@ -0,0 +1,37 @@ +{ + "name": "qtwebview", + "version": "6.3.0", + "description": "Qt Web View", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + } + ], + "features": { + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] + }, + "webengine": { + "description": "Build with Webengine", + "supports": "!static", + "dependencies": [ + { + "name": "qtwebengine", + "default-features": false + } + ] + } + } +} diff --git a/externals/vcpkg/ports/quadtree/portfile.cmake b/externals/vcpkg/ports/quadtree/portfile.cmake new file mode 100755 index 000000000..01e6b371a --- /dev/null +++ b/externals/vcpkg/ports/quadtree/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO pvigier/Quadtree + REF fec2e1a011f656353ba12c58cefe33482e1a27b5 + SHA512 8291afb29b9ff5714125e411122f6f10e1c2e4c2109384e25afa834548dc1f63c90b2d09c7cfed213ad69a8c54cf32fc598783b3ff0882bc86562594895d5c35 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DCODE_COVERAGE=OFF + -DBUILD_BENCHMARKS=OFF + -DBUILD_TESTING=OFF + -DBUILD_EXAMPLES=OFF +) + +file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/quadtree/vcpkg.json b/externals/vcpkg/ports/quadtree/vcpkg.json new file mode 100755 index 000000000..49004d690 --- /dev/null +++ b/externals/vcpkg/ports/quadtree/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "quadtree", + "version-string": "2020-04-13", + "port-version": 1, + "description": "A simple and modern C++ quadtree implementation", + "homepage": "https://github.com/pvigier/Quadtree" +} diff --git a/externals/vcpkg/ports/quantlib/portfile.cmake b/externals/vcpkg/ports/quantlib/portfile.cmake new file mode 100755 index 000000000..36504190a --- /dev/null +++ b/externals/vcpkg/ports/quantlib/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lballabio/QuantLib + REF QuantLib-v1.26 + SHA512 597dcb4aa3e2701bea758c7b0c62ca0b303a16eda5f324b349ba4e8cc011f6a256fb26d5c42f2bb432da06df1c7b5ec208195e1104e620b69d2a7e8265fd6470 + HEAD_REF master +) + +if (VCPKG_TARGET_IS_WINDOWS) + # This can (and should) be removed if QuantLib ever supports dynamically linking on Windows + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DQL_BUILD_BENCHMARK=OFF + -DQL_BUILD_EXAMPLES=OFF + -DQL_BUILD_TEST_SUITE=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME QuantLib CONFIG_PATH lib/cmake/QuantLib) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Install custom usage +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/quantlib/usage b/externals/vcpkg/ports/quantlib/usage new file mode 100755 index 000000000..e121873e2 --- /dev/null +++ b/externals/vcpkg/ports/quantlib/usage @@ -0,0 +1,4 @@ +The package quantlib provides CMake targets: + + find_package(QuantLib CONFIG REQUIRED) + target_link_libraries(main PRIVATE QuantLib::QuantLib) diff --git a/externals/vcpkg/ports/quantlib/vcpkg.json b/externals/vcpkg/ports/quantlib/vcpkg.json new file mode 100755 index 000000000..27dc4edad --- /dev/null +++ b/externals/vcpkg/ports/quantlib/vcpkg.json @@ -0,0 +1,51 @@ +{ + "name": "quantlib", + "version": "1.26", + "port-version": 1, + "description": "The QuantLib C++ library", + "homepage": "https://www.quantlib.org/", + "license": "BSD-3-Clause", + "supports": "!(windows & !staticcrt)", + "dependencies": [ + "boost-accumulators", + "boost-algorithm", + "boost-any", + "boost-array", + "boost-assert", + "boost-assign", + "boost-atomic", + "boost-bind", + "boost-config", + "boost-core", + "boost-date-time", + "boost-dynamic-bitset", + "boost-format", + "boost-function", + "boost-functional", + "boost-iterator", + "boost-lexical-cast", + "boost-math", + "boost-multi-array", + "boost-multiprecision", + "boost-optional", + "boost-preprocessor", + "boost-random", + "boost-serialization", + "boost-signals2", + "boost-smart-ptr", + "boost-thread", + "boost-tuple", + "boost-type-traits", + "boost-ublas", + "boost-unordered", + "boost-utility", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/quaternions/portfile.cmake b/externals/vcpkg/ports/quaternions/portfile.cmake new file mode 100755 index 000000000..2613abed8 --- /dev/null +++ b/externals/vcpkg/ports/quaternions/portfile.cmake @@ -0,0 +1,12 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ferd36/quaternions + REF 68fc6c7fb392b1a920779d80bb75879263329ff5 + SHA512 b7b934a493645e9c9ec04d581d2e5af57298325086919c20fbaa13df264c16cb5a0e380042cf5a0cfddbf142c82e5da63b84e8f2bc90615b1eccad83a1c9df88 + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/quaternions/vcpkg.json b/externals/vcpkg/ports/quaternions/vcpkg.json new file mode 100755 index 000000000..b6d8b22e2 --- /dev/null +++ b/externals/vcpkg/ports/quaternions/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "quaternions", + "version-string": "1.0.0", + "port-version": 1, + "description": "A C++11 library to work with quaternions, as a single header file.", + "homepage": "https://github.com/ferd36/quaternions", + "dependencies": [ + "boost-mpl" + ] +} diff --git a/externals/vcpkg/ports/quazip/portfile.cmake b/externals/vcpkg/ports/quazip/portfile.cmake new file mode 100755 index 000000000..1f805f5dc --- /dev/null +++ b/externals/vcpkg/ports/quazip/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO stachenov/quazip + REF v1.3 + SHA512 3861a9084059576ff2690e8b911394b0286a60542ab021a4cc588537a60ea3a186ed7903c76544698001fa383dfd0de96bdfed433abaefc44158d3b30ab16fe2 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/QuaZip-Qt5-1.3) +vcpkg_copy_pdbs() +if(VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +else() + vcpkg_fixup_pkgconfig() +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/quazip/vcpkg.json b/externals/vcpkg/ports/quazip/vcpkg.json new file mode 100755 index 000000000..89ee6996c --- /dev/null +++ b/externals/vcpkg/ports/quazip/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "quazip", + "version": "1.3", + "description": "Qt/C++ wrapper over minizip", + "homepage": "https://stachenov.github.io/quazip/", + "dependencies": [ + "qt5-base", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/quickfast/00001-fix-boost-asio.patch b/externals/vcpkg/ports/quickfast/00001-fix-boost-asio.patch new file mode 100755 index 000000000..13a4cfa2a --- /dev/null +++ b/externals/vcpkg/ports/quickfast/00001-fix-boost-asio.patch @@ -0,0 +1,39 @@ +diff --git a/src/Common/QuickFASTPch.h b/src/Common/QuickFASTPch.h +index 3574df8..c4ef4e1 100644 +--- a/src/Common/QuickFASTPch.h ++++ b/src/Common/QuickFASTPch.h +@@ -32,7 +32,7 @@ + #include + + // If building for .NET, must link boost threads dynamically +-#define BOOST_THREAD_USE_DLL ++// #define BOOST_THREAD_USE_DLL + // This reports at compile time which boost libraries will be used + // #define BOOST_LIB_DIAGNOSTIC + +diff --git a/src/Communication/AsioService.h b/src/Communication/AsioService.h +index 4f61915..96f2198 100644 +--- a/src/Communication/AsioService.h ++++ b/src/Communication/AsioService.h +@@ -99,6 +99,7 @@ namespace QuickFAST + { + return ioService_; + } ++ boost::asio::io_service::executor_type get_executor() BOOST_ASIO_NOEXCEPT { return ioService_.get_executor();} + + ///@brief Post a completion handler for later processing (usually in a different thread) + /// @param handler is the handler to be posted +diff --git a/src/Communication/AsioService_fwd.h b/src/Communication/AsioService_fwd.h +index dc2f235..6ad5e68 100644 +--- a/src/Communication/AsioService_fwd.h ++++ b/src/Communication/AsioService_fwd.h +@@ -17,7 +17,8 @@ namespace boost + { + namespace asio + { +- class io_service; ++ class io_context; ++ typedef io_context io_service; + } + } + diff --git a/externals/vcpkg/ports/quickfast/CMakeLists.txt b/externals/vcpkg/ports/quickfast/CMakeLists.txt new file mode 100755 index 000000000..2464b6a25 --- /dev/null +++ b/externals/vcpkg/ports/quickfast/CMakeLists.txt @@ -0,0 +1,54 @@ +cmake_minimum_required(VERSION 3.13) +project(quickfast CXX) + +option(BUILD_SHARED_LIBS "Build shared instead of static library" ON) + +find_package(Boost REQUIRED COMPONENTS thread) +find_package(XercesC REQUIRED) + +file(GLOB SOURCES + quickfast/Application/*.cpp + quickfast/Common/*.cpp + quickfast/Codecs/*.cpp + quickfast/Communication/*.cpp + quickfast/Messages/*.cpp +) + +file(GLOB HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + quickfast/Application/*.h + quickfast/Common/*.h + quickfast/Codecs/*.h + quickfast/Communication/*.h + quickfast/Messages/*.h +) + +if(BUILD_SHARED_LIBS) + add_library(quickfast SHARED ${HEADERS} ${SOURCES}) + target_compile_definitions(quickfast PRIVATE -DQUICKFAST_BUILD_DLL) +else() + add_library(quickfast STATIC ${HEADERS} ${SOURCES}) + target_compile_definitions(quickfast PUBLIC -DQUICKFAST_HAS_DLL=0) +endif() + +target_include_directories(quickfast PUBLIC + $ + $ + $ +) + +target_link_libraries(quickfast PRIVATE + ${Boost_LIBRARIES} + XercesC::XercesC +) + +install(TARGETS quickfast EXPORT quickfast-config + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) +install(EXPORT quickfast-config DESTINATION share/cmake/quickfast) + +foreach (HEADER ${HEADERS} ) + get_filename_component(HEADER_DIR ${HEADER} DIRECTORY) + install(FILES ${HEADER} DESTINATION include/${HEADER_DIR}) +endforeach() diff --git a/externals/vcpkg/ports/quickfast/portfile.cmake b/externals/vcpkg/ports/quickfast/portfile.cmake new file mode 100755 index 000000000..bf4878bd3 --- /dev/null +++ b/externals/vcpkg/ports/quickfast/portfile.cmake @@ -0,0 +1,48 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO objectcomputing/quickfast + REF V1_5 + SHA512 f224ffbe0ee1b84616b46d536d27da01346103cf9ed135a87543da51e8e979ec3735e08ece8525ee1316ea323d41dcacc4d44eabe2e033d68f93432ea43d1ce9 + HEAD_REF master + PATCHES 00001-fix-boost-asio.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +if(NOT EXISTS "${SOURCE_PATH}/quickfast") + file(RENAME ${SOURCE_PATH}/src ${SOURCE_PATH}/quickfast) +endif() + +file(GLOB_RECURSE SRC_FILES "${SOURCE_PATH}/quickfast/*.cpp" "${SOURCE_PATH}/quickfast/*.h") +foreach(SRC_FILE IN LISTS SRC_FILES) + file(READ "${SRC_FILE}" _contents) + string(REPLACE "#include ) + + set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${quickfix_VERSION} SOVERSION ${quickfix_VERSION_MAJOR} ) ++target_compile_definitions(${PROJECT_NAME} PUBLIC HAVE_STD_UNIQUE_PTR HAVE_STD_SHARED_PTR HAVE_SSL=1) + +-install(TARGETS ${PROJECT_NAME} DESTINATION lib) ++install(TARGETS ${PROJECT_NAME} EXPORT quickfix-config DESTINATION lib) + install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/C++/ DESTINATION include/quickfix + FILES_MATCHING PATTERN "*.h" + PATTERN double-conversion EXCLUDE + PATTERN test EXCLUDE) ++install(EXPORT quickfix-config DESTINATION share/cmake/quickfix) +diff --git a/src/C++/Utility.h b/src/C++/Utility.h +index 0aa2cd3e..2829e110 100644 +--- a/src/C++/Utility.h ++++ b/src/C++/Utility.h +@@ -242,4 +242,10 @@ using std::strtol; + using std::strerror; + #endif + ++#ifdef __cpp_noexcept_function_type ++#define QUICKFIX_THROW(...) noexcept(false) ++#else ++#define QUICKFIX_THROW(...) throw(__VA_ARGS__) ++#endif ++ + #endif +diff --git a/src/C++/UtilitySSL.cpp b/src/C++/UtilitySSL.cpp +index a01606ac..aee41bbf 100644 +--- a/src/C++/UtilitySSL.cpp ++++ b/src/C++/UtilitySSL.cpp +@@ -498,7 +498,11 @@ static void ssl_rand_seed(void) + /* + * seed in the current process id (usually just 4 bytes) + */ ++#ifdef _MSC_VER ++ pid = GetCurrentProcessId(); ++#else + pid = getpid(); ++#endif + l = sizeof(pid); + RAND_seed((unsigned char *)&pid, l); + /* +diff --git a/src/C++/double-conversion/utils.h b/src/C++/double-conversion/utils.h +index aef2f166..779b8ab7 100644 +--- a/src/C++/double-conversion/utils.h ++++ b/src/C++/double-conversion/utils.h +@@ -61,7 +61,7 @@ + // disabled.) + // On Linux,x86 89255e-22 != Div_double(89255.0/1e22) + #if defined(_M_X64) || defined(__x86_64__) || \ +- defined(__ARMEL__) || defined(__avr32__) || \ ++ defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ + defined(__hppa__) || defined(__ia64__) || \ + defined(__mips__) || \ + defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ diff --git a/externals/vcpkg/ports/quickfix/fix_wsl_symlink_error.patch b/externals/vcpkg/ports/quickfix/fix_wsl_symlink_error.patch new file mode 100755 index 000000000..ce6465a4e --- /dev/null +++ b/externals/vcpkg/ports/quickfix/fix_wsl_symlink_error.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/QuickfixPrebuildSetup.cmake b/cmake/QuickfixPrebuildSetup.cmake +index 9e53126ec..1c3368fcb 100644 +--- a/cmake/QuickfixPrebuildSetup.cmake ++++ b/cmake/QuickfixPrebuildSetup.cmake +@@ -3,8 +3,9 @@ + if (NOT WIN32) + add_custom_target(QUICKFIX_HEADERS_LINK ALL + COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_SOURCE_DIR}/include/ +- COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/src/C++ ${CMAKE_SOURCE_DIR}/include/quickfix ++ #COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/src/C++ ${CMAKE_SOURCE_DIR}/include/quickfix + ) ++ include_directories(${CMAKE_SOURCE_DIR}/src/C++) + else() + add_custom_target(QUICKFIX_HEADERS_COPY ALL + COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_SOURCE_DIR}/include/ diff --git a/externals/vcpkg/ports/quickfix/portfile.cmake b/externals/vcpkg/ports/quickfix/portfile.cmake new file mode 100755 index 000000000..6ae5f2991 --- /dev/null +++ b/externals/vcpkg/ports/quickfix/portfile.cmake @@ -0,0 +1,49 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO quickfix/quickfix + REF v1.15.1 + SHA512 6c3dc53f25932c9b7516ab9228f634511ae0f399719f87f0ec2b38c380c0a7d1c808f0f9a14a70a063e1956118550d1121222283a9139f23cd4f8f038f595f70 + HEAD_REF master + PATCHES + 00001-fix-build.patch + fix_wsl_symlink_error.patch +) + +file(GLOB_RECURSE SRC_FILES RELATIVE "${SOURCE_PATH}" + "${SOURCE_PATH}/src/*.cpp" + "${SOURCE_PATH}/src/*.h" +) + +list(REMOVE_ITEM SRC_FILES "src/C++/Utility.h") +list(REMOVE_ITEM SRC_FILES "src/C++/pugixml.cpp") + +foreach(SRC_FILE IN LISTS SRC_FILES) + file(READ "${SOURCE_PATH}/${SRC_FILE}" _contents) + string(REPLACE "throw(" "QUICKFIX_THROW(" _contents "${_contents}") + string(REPLACE "throw (" "QUICKFIX_THROW(" _contents "${_contents}") + file(WRITE "${SOURCE_PATH}/${SRC_FILE}" "${_contents}") +endforeach() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DHAVE_EMX=OFF + -DHAVE_MYSQL=OFF + -DHAVE_POSTGRESQL=OFF + -DHAVE_PYTHON=OFF + -DHAVE_PYTHON2=OFF + -DHAVE_PYTHON3=OFF + -DHAVE_SSL=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/quickfix) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/quickfix/usage b/externals/vcpkg/ports/quickfix/usage new file mode 100755 index 000000000..2bed80460 --- /dev/null +++ b/externals/vcpkg/ports/quickfix/usage @@ -0,0 +1,4 @@ +The package quickfix provides CMake targets: + + find_package(quickfix CONFIG REQUIRED) + target_link_libraries(main PRIVATE quickfix) diff --git a/externals/vcpkg/ports/quickfix/vcpkg.json b/externals/vcpkg/ports/quickfix/vcpkg.json new file mode 100755 index 000000000..7ad5fb2a3 --- /dev/null +++ b/externals/vcpkg/ports/quickfix/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "quickfix", + "version": "1.15.1", + "port-version": 7, + "description": "QuickFIX is a free and open source implementation of the FIX protocol.", + "homepage": "https://github.com/quickfix/quickfix", + "supports": "!uwp", + "dependencies": [ + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/quill/portfile.cmake b/externals/vcpkg/ports/quill/portfile.cmake new file mode 100755 index 000000000..045df2c14 --- /dev/null +++ b/externals/vcpkg/ports/quill/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO odygrd/quill + REF v2.0.0 + SHA512 fed4362fcf32b20beeb44d1421fb58505f5fd0880518abc7c19e645beff9a1e2f83d79273404cd2c297a51c27555ce5fbd3bf96cc657268c7645b68e062e8c59 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DQUILL_FMT_EXTERNAL=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/quill) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/quill/bundled") + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME "${CURRENT_PACKAGES_DIR}/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +endif() +vcpkg_fixup_pkgconfig() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quill/TweakMe.h" "// #define QUILL_FMT_EXTERNAL" "#define QUILL_FMT_EXTERNAL") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/quill/vcpkg.json b/externals/vcpkg/ports/quill/vcpkg.json new file mode 100755 index 000000000..eed1937b1 --- /dev/null +++ b/externals/vcpkg/ports/quill/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "quill", + "version": "2.0.0", + "description": "C++14 Asynchronous Low Latency Logging Library", + "homepage": "https://github.com/odygrd/quill/", + "license": "MIT", + "supports": "!(uwp | android)", + "dependencies": [ + "fmt", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/quirc/CMakeLists.txt b/externals/vcpkg/ports/quirc/CMakeLists.txt new file mode 100755 index 000000000..236b281b7 --- /dev/null +++ b/externals/vcpkg/ports/quirc/CMakeLists.txt @@ -0,0 +1,27 @@ +cmake_minimum_required(VERSION 3.19) + +project(quirc C) + +add_library(quirc + lib/decode.c + lib/identify.c + lib/quirc.c + lib/version_db.c + lib/quirc.h +) + +target_include_directories(quirc INTERFACE $) + +install(TARGETS quirc + EXPORT quirc-targets + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib) + +install(FILES lib/quirc.h DESTINATION include) + +install(EXPORT quirc-targets + FILE quirc-config.cmake + NAMESPACE quirc:: + DESTINATION share/quirc +) diff --git a/externals/vcpkg/ports/quirc/portfile.cmake b/externals/vcpkg/ports/quirc/portfile.cmake new file mode 100755 index 000000000..225479cd4 --- /dev/null +++ b/externals/vcpkg/ports/quirc/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO dlbeer/quirc + REF 7e7ab596e4d0988faf1c12ae89c354b114181c40 + SHA512 d10a783a33ffcc168a287b03250c5ac00b942ec724da641b13fe2ef3f456453b143146422b7e18129a75ce00f13d2d9e3097ac4620134d832de8be4adbbc61c2 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/quirc/copyright) diff --git a/externals/vcpkg/ports/quirc/vcpkg.json b/externals/vcpkg/ports/quirc/vcpkg.json new file mode 100755 index 000000000..9297f7366 --- /dev/null +++ b/externals/vcpkg/ports/quirc/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "quirc", + "version": "1.1", + "port-version": 2, + "description": "quirc is one of the C library available for scanning QR Codes" +} diff --git a/externals/vcpkg/ports/qwt/fix-dynamic-static.patch b/externals/vcpkg/ports/qwt/fix-dynamic-static.patch new file mode 100755 index 000000000..d0bd646fc --- /dev/null +++ b/externals/vcpkg/ports/qwt/fix-dynamic-static.patch @@ -0,0 +1,15 @@ +diff --git a/qwtconfig.pri b/qwtconfig.pri +index 0b054e0..f93fef6 100644 +--- a/qwtconfig.pri ++++ b/qwtconfig.pri +@@ -72,7 +72,10 @@ QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features + # it will be a static library. + ###################################################################### + ++CONFIG(dynamic, dynamic|static) { ++ + QWT_CONFIG += QwtDll ++} + + ###################################################################### + # QwtPlot enables all classes, that are needed to use the QwtPlot diff --git a/externals/vcpkg/ports/qwt/portfile.cmake b/externals/vcpkg/ports/qwt/portfile.cmake new file mode 100755 index 000000000..9bee7b211 --- /dev/null +++ b/externals/vcpkg/ports/qwt/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO qwt/qwt + REF 6.2.0 + FILENAME "qwt-6.2.0.zip" + SHA512 a3946c6e23481b5a2193819a1c1298db5a069d514ca60de54accb3a249403f5acd778172ae6fae24fae252767b1e58deba524de6225462f1bafd7c947996aae9 + PATCHES + fix-dynamic-static.patch +) + +vcpkg_configure_qmake( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + CONFIG+=${VCPKG_LIBRARY_LINKAGE} +) + +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_install_qmake( + RELEASE_TARGETS sub-src-release_ordered + DEBUG_TARGETS sub-src-debug_ordered + ) +else () + vcpkg_install_qmake( + RELEASE_TARGETS sub-src-all-ordered + DEBUG_TARGETS sub-src-all-ordered + ) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +#Install the header files +file(GLOB HEADER_FILES "${SOURCE_PATH}/src/*.h" "${SOURCE_PATH}/classincludes/*") +file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/qwt/vcpkg.json b/externals/vcpkg/ports/qwt/vcpkg.json new file mode 100755 index 000000000..380c84454 --- /dev/null +++ b/externals/vcpkg/ports/qwt/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "qwt", + "version-semver": "6.2.0", + "port-version": 2, + "description": "qt widgets library for technical applications", + "homepage": "https://sourceforge.net/projects/qwt", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-svg", + "qt5-tools" + ] +} diff --git a/externals/vcpkg/ports/qwtw/portfile.cmake b/externals/vcpkg/ports/qwtw/portfile.cmake new file mode 100755 index 000000000..5799b3d6f --- /dev/null +++ b/externals/vcpkg/ports/qwtw/portfile.cmake @@ -0,0 +1,16 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ig-or/qwtw + REF 7d6e7c95437cbc7d5d123fc1ccf0d6a3c4e419e6 # v3.1.0 + SHA512 de5abf26d0975b9f0ed88e10cd4d5b4d12e25cce8c87ab6a18d8e7064697de6fc8da83e118b5a4e2819c09e2dbbfd20daeecc6a42748c019c6699666276d075a + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/qwtw/vcpkg.json b/externals/vcpkg/ports/qwtw/vcpkg.json new file mode 100755 index 000000000..486530564 --- /dev/null +++ b/externals/vcpkg/ports/qwtw/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "qwtw", + "version": "3.1.0", + "port-version": 2, + "description": "qwt-based 2D plotting library", + "homepage": "https://github.com/ig-or/qwtw", + "supports": "windows & x64 & !static", + "dependencies": [ + "boost-asio", + "boost-chrono", + "boost-circular-buffer", + "boost-date-time", + "boost-filesystem", + "boost-regex", + "boost-system", + "boost-thread", + "marble", + "qt5-base", + "qt5-networkauth", + "qt5-svg", + "qwt" + ] +} diff --git a/externals/vcpkg/ports/rabit/fix-file-conflict.patch b/externals/vcpkg/ports/rabit/fix-file-conflict.patch new file mode 100755 index 000000000..665695305 --- /dev/null +++ b/externals/vcpkg/ports/rabit/fix-file-conflict.patch @@ -0,0 +1,52 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 08330d9..a58d669 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,10 +5,16 @@ project(rabit VERSION 0.0.0) + option(RABIT_BUILD_TESTS "Build rabit tests" OFF) + option(RABIT_BUILD_MPI "Build MPI" OFF) + ++find_package(dmlc CONFIG REQUIRED) ++ + add_library(rabit src/allreduce_base.cc src/allreduce_robust.cc src/engine.cc src/c_api.cc) + add_library(rabit_base src/allreduce_base.cc src/engine_base.cc src/c_api.cc) + add_library(rabit_empty src/engine_empty.cc src/c_api.cc) + ++target_link_libraries(rabit dmlc::dmlc) ++target_link_libraries(rabit_base dmlc::dmlc) ++target_link_libraries(rabit_empty dmlc::dmlc) ++ + set(rabit_libs rabit rabit_base rabit_empty) + if(RABIT_BUILD_MPI) + find_package(MPI REQUIRED) +@@ -22,7 +28,6 @@ if(RABIT_BUILD_TESTS) + add_library(rabit_mock STATIC src/allreduce_base.cc src/allreduce_robust.cc src/engine_mock.cc src/c_api.cc) + list(APPEND rabit_libs rabit_mock) # add to list to apply build settings, then remove + endif() +- + foreach(lib ${rabit_libs}) + #include "./internal/utils.h" + target_include_directories(${lib} PUBLIC +@@ -42,7 +47,8 @@ if(RABIT_BUILD_TESTS) + if(RABIT_BUILD_MPI) + add_executable(speed_test_mpi test/speed_test.cc) + target_link_libraries(speed_test_mpi rabit_mpi) +- install(TARGETS speed_test_mpi DESTINATION bin) ++ install(TARGETS speed_test_mpi DESTINATION bin) ++ message("IN MPI ") + endif() + endif() + +diff --git a/include/rabit/serializable.h b/include/rabit/serializable.h +index 4a3c2a1..0fd4154 100644 +--- a/include/rabit/serializable.h ++++ b/include/rabit/serializable.h +@@ -9,7 +9,7 @@ + #include + #include + #include "./internal/utils.h" +-#include "../dmlc/io.h" ++#include + + namespace rabit { + /*! diff --git a/externals/vcpkg/ports/rabit/portfile.cmake b/externals/vcpkg/ports/rabit/portfile.cmake new file mode 100755 index 000000000..b8846b22e --- /dev/null +++ b/externals/vcpkg/ports/rabit/portfile.cmake @@ -0,0 +1,34 @@ +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "${PORT} does not currently support UWP.") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO dmlc/rabit + REF v0.1 + SHA512 145fd839898cb95eaab9a88ad3301a0ccac0c8b672419ee2b8eb6ba273cc9a26e069e5ecbc37a3078e46dc64d11efb3e5ab10e5f8fed714e7add85b9e6ac2ec7 + HEAD_REF master + PATCHES fix-file-conflict.patch +) + +file(REMOVE_RECURSE ${SOURCE_PATH}/include/dmlc) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DRABIT_BUILD_TESTS=OFF + -DRABIT_BUILD_MPI=OFF +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +vcpkg_copy_pdbs() + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) diff --git a/externals/vcpkg/ports/rabit/vcpkg.json b/externals/vcpkg/ports/rabit/vcpkg.json new file mode 100755 index 000000000..a7635dfa6 --- /dev/null +++ b/externals/vcpkg/ports/rabit/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "rabit", + "version-string": "0.1", + "port-version": 3, + "description": "rabit is a light weight library that provides a fault tolerant interface of Allreduce and Broadcast. It is designed to support easy implementations of distributed machine learning programs, many of which fall naturally under the Allreduce abstraction.", + "homepage": "https://github.com/dmlc/rabit", + "supports": "!uwp", + "dependencies": [ + "dmlc" + ] +} diff --git a/externals/vcpkg/ports/ragel/0001-remove-unistd-h.patch b/externals/vcpkg/ports/ragel/0001-remove-unistd-h.patch new file mode 100755 index 000000000..fba598e0c --- /dev/null +++ b/externals/vcpkg/ports/ragel/0001-remove-unistd-h.patch @@ -0,0 +1,14 @@ +diff --git a/ragel/main.cpp b/ragel/main.cpp +index f5fbd7b..947b1c8 100644 +--- a/ragel/main.cpp ++++ b/ragel/main.cpp +@@ -24,9 +24,7 @@ + #include + #include + #include +-#include + #include +-#include + #include + #include + #include diff --git a/externals/vcpkg/ports/ragel/CMakeLists.txt b/externals/vcpkg/ports/ragel/CMakeLists.txt new file mode 100755 index 000000000..2f5d1dc00 --- /dev/null +++ b/externals/vcpkg/ports/ragel/CMakeLists.txt @@ -0,0 +1,128 @@ +cmake_minimum_required(VERSION 3.0) +project(ragel) + +file(GLOB HEADERS + ragel/buffer.h + ragel/cdgoto.h + ragel/cscodegen.h + ragel/csipgoto.h + ragel/inputdata.h + ragel/rbxgoto.h + ragel/rubyflat.h + ragel/cdcodegen.h + ragel/cdipgoto.h + ragel/csfflat.h + ragel/cssplit.h + ragel/javacodegen.h + ragel/redfsm.h + ragel/rubyftable.h + ragel/cdfflat.h + ragel/cdsplit.h + ragel/csfgoto.h + ragel/cstable.h + ragel/parsedata.h + ragel/rlparse.h + ragel/rubytable.h + ragel/cdfgoto.h + ragel/cdtable.h + ragel/csflat.h + ragel/dotcodegen.h + ragel/parsetree.h + ragel/rlscan.h + ragel/version.h + ragel/cdflat.h + ragel/common.h + ragel/csftable.h + ragel/fsmgraph.h + ragel/pcheck.h + ragel/rubycodegen.h + ragel/xmlcodegen.h + ragel/cdftable.h + ragel/csgoto.h + ragel/gendata.h + ragel/ragel.h + ragel/rubyfflat.h + ragel/gocodegen.h + ragel/gotable.h + ragel/goftable.h + ragel/goflat.h + ragel/gofflat.h + ragel/gogoto.h + ragel/gofgoto.h + ragel/goipgoto.h + ragel/gotablish.h + ragel/mlcodegen.h + ragel/mltable.h + ragel/mlftable.h + ragel/mlflat.h + ragel/mlfflat.h + ragel/mlgoto.h + ragel/mlfgoto.h +) + +file(GLOB SRC + ragel/main.cpp + ragel/parsetree.cpp + ragel/parsedata.cpp + ragel/fsmstate.cpp + ragel/fsmbase.cpp + ragel/fsmattach.cpp + ragel/fsmmin.cpp + ragel/fsmgraph.cpp + ragel/fsmap.cpp + ragel/rlscan.cpp + ragel/rlparse.cpp + ragel/inputdata.cpp + ragel/common.cpp + ragel/redfsm.cpp + ragel/gendata.cpp + ragel/cdcodegen.cpp + ragel/cdtable.cpp + ragel/cdftable.cpp + ragel/cdflat.cpp + ragel/cdfflat.cpp + ragel/cdgoto.cpp + ragel/cdfgoto.cpp + ragel/cdipgoto.cpp + ragel/cdsplit.cpp + ragel/javacodegen.cpp + ragel/rubycodegen.cpp + ragel/rubytable.cpp + ragel/rubyftable.cpp + ragel/rubyflat.cpp + ragel/rubyfflat.cpp + ragel/rbxgoto.cpp + ragel/cscodegen.cpp + ragel/cstable.cpp + ragel/csftable.cpp + ragel/csflat.cpp + ragel/csfflat.cpp + ragel/csgoto.cpp + ragel/csfgoto.cpp + ragel/csipgoto.cpp + ragel/cssplit.cpp + ragel/dotcodegen.cpp + ragel/xmlcodegen.cpp + ragel/gocodegen.cpp + ragel/gotable.cpp + ragel/goftable.cpp + ragel/goflat.cpp + ragel/gofflat.cpp + ragel/gogoto.cpp + ragel/gofgoto.cpp + ragel/goipgoto.cpp + ragel/gotablish.cpp + ragel/mlcodegen.cpp + ragel/mltable.cpp + ragel/mlftable.cpp + ragel/mlflat.cpp + ragel/mlfflat.cpp + ragel/mlgoto.cpp + ragel/mlfgoto.cpp +) + +include_directories(aapl) + +add_executable(ragel ${SRC}) + +install(TARGETS ragel DESTINATION tools CONFIGURATIONS Release) diff --git a/externals/vcpkg/ports/ragel/config.h b/externals/vcpkg/ports/ragel/config.h new file mode 100755 index 000000000..dbcd06dd9 --- /dev/null +++ b/externals/vcpkg/ports/ragel/config.h @@ -0,0 +1,26 @@ +/* ragel/config.h. Generated from config.h.in by configure. */ +/* ragel/config.h.in. Generated from configure.in by autoheader. */ + +/* Name of package */ +#define PACKAGE "ragel" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "ragel" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "ragel 6.9" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "ragel" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "6.9" + +/* Version number of package */ +#define VERSION "6.9" diff --git a/externals/vcpkg/ports/ragel/portfile.cmake b/externals/vcpkg/ports/ragel/portfile.cmake new file mode 100755 index 000000000..69c47a1cd --- /dev/null +++ b/externals/vcpkg/ports/ragel/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_download_distfile(ARCHIVE + URLS "http://www.colm.net/files/ragel/ragel-6.10.tar.gz" + FILENAME "ragel-6.10.tar.gz" + SHA512 6c1fe4f6fa8546ae28b92ccfbae94355ff0d3cea346b9ae8ce4cf6c2bdbeb823e0ccd355332643ea72d3befd533a8b3030ddbf82be7ffa811c2c58cbb01aaa38 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + 0001-remove-unistd-h.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h DESTINATION ${SOURCE_PATH}/ragel) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +# Allow empty include directory +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +# Handle copyright +file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ragel) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/ragel/COPYING ${CURRENT_PACKAGES_DIR}/share/ragel/copyright) diff --git a/externals/vcpkg/ports/ragel/vcpkg.json b/externals/vcpkg/ports/ragel/vcpkg.json new file mode 100755 index 000000000..e55e333d8 --- /dev/null +++ b/externals/vcpkg/ports/ragel/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "ragel", + "version-string": "6.10", + "port-version": 4, + "description": "Ragel State Machine Compiler", + "homepage": "https://www.colm.net/files/ragel" +} diff --git a/externals/vcpkg/ports/random123/portfile.cmake b/externals/vcpkg/ports/random123/portfile.cmake new file mode 100755 index 000000000..31e0049ad --- /dev/null +++ b/externals/vcpkg/ports/random123/portfile.cmake @@ -0,0 +1,23 @@ +# Random123 - Header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "DEShawResearch/random123" + REF "v1.14.0" + SHA512 1c7d139193f5404e5d14d229f55e0a14b11de596a4cfbf0a39c1419f5ae146055dccc61e9430f724a2d7c1efb8bd01edb72866d4f4705508fcc6ebda6e90e91e + HEAD_REF "main" + ) + +# Copy the headers that define this package to the install location. +file(GLOB header_files + "${SOURCE_PATH}/include/Random123/*.h" + "${SOURCE_PATH}/include/Random123/*.hpp") +file(COPY ${header_files} + "${SOURCE_PATH}/include/Random123/features" + "${SOURCE_PATH}/include/Random123/conventional" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/Random123") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) diff --git a/externals/vcpkg/ports/random123/vcpkg.json b/externals/vcpkg/ports/random123/vcpkg.json new file mode 100755 index 000000000..dd5bf9db5 --- /dev/null +++ b/externals/vcpkg/ports/random123/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "random123", + "version": "1.14.0", + "description": "Random123 is a library of 'counter-based' random number generators (CBRNGs), in which the Nth random number can be obtained by applying a stateless mixing function to N instead of the conventional approach of using N iterations of a stateful transformation.", + "homepage": "http://www.deshawresearch.com/resources_random123.html", + "license": "BSD-3-Clause" +} diff --git a/externals/vcpkg/ports/randomstr/portfile.cmake b/externals/vcpkg/ports/randomstr/portfile.cmake new file mode 100755 index 000000000..20b7425fe --- /dev/null +++ b/externals/vcpkg/ports/randomstr/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO offscale/c89randomstr + REF 9d577c4343913a330ef32b93ed12b8942808bbbc + SHA512 7adfac8000d9057b9ca230f794bff82e1628864140e08d393e3faff890848606fff72c3dd2b296a20bf3003ed035e9e4273a0599764f515b7a6ac7091e9d2949 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DBUILD_TESTING=OFF" +) +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/COPYING" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/externals/vcpkg/ports/randomstr/vcpkg.json b/externals/vcpkg/ports/randomstr/vcpkg.json new file mode 100755 index 000000000..29ea9f92a --- /dev/null +++ b/externals/vcpkg/ports/randomstr/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "randomstr", + "version-date": "2022-02-03", + "description": "Simple randomstr function in a header-only C89 library", + "license": "0BSD", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/rang/portfile.cmake b/externals/vcpkg/ports/rang/portfile.cmake new file mode 100755 index 000000000..9fa3eecb4 --- /dev/null +++ b/externals/vcpkg/ports/rang/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO agauniyal/rang + REF v3.2 + SHA512 f579aaf3bddbfa2325dd31bdbe7c32598af8a340fee62c3a1e7ed1cf189af2808b7838a5fb13b3765279ddd1e7481f6229da72e72218a4916455cf3ae12b5a68 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/rang) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/rang/vcpkg.json b/externals/vcpkg/ports/rang/vcpkg.json new file mode 100755 index 000000000..d316d7a90 --- /dev/null +++ b/externals/vcpkg/ports/rang/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "rang", + "version": "3.2", + "description": "Colors for your Terminal.", + "homepage": "https://github.com/agauniyal/rang", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/range-v3-vs2015/portfile.cmake b/externals/vcpkg/ports/range-v3-vs2015/portfile.cmake new file mode 100755 index 000000000..004711ab2 --- /dev/null +++ b/externals/vcpkg/ports/range-v3-vs2015/portfile.cmake @@ -0,0 +1,12 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Microsoft/Range-V3-VS2015 + REF 423bcae5cf18948591361329784d3b12ef41711b + SHA512 c6756bc6b5131c4c0ffb96550fb40decf734fc8c30e3d51c5c2bf03aae4d7426de36e896a1abf0a200a49a3906d4b60c1cf52f43504554b64d89c91de3e92746 + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/range-v3-vs2015) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/range-v3-vs2015/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/range-v3-vs2015/copyright) +file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.hpp") +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/range-v3-vs2015/vcpkg.json b/externals/vcpkg/ports/range-v3-vs2015/vcpkg.json new file mode 100755 index 000000000..289515dca --- /dev/null +++ b/externals/vcpkg/ports/range-v3-vs2015/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "range-v3-vs2015", + "version-string": "20151130-vcpkg5", + "port-version": 1, + "description": "Range library for C++11/14/17.", + "homepage": "https://github.com/Microsoft/Range-V3-VS2015" +} diff --git a/externals/vcpkg/ports/range-v3/portfile.cmake b/externals/vcpkg/ports/range-v3/portfile.cmake new file mode 100755 index 000000000..86b0340ab --- /dev/null +++ b/externals/vcpkg/ports/range-v3/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ericniebler/range-v3 + REF 83783f578e0e6666d68a3bf17b0038a80e62530e # 2021-11-2 + SHA512 f0953e3c4e25ddf2f94b583080b8966faf1973243e01f77d23f8c04c2e0352003e4bd12490a46176472ad46c80dec99a1a8880a9bde8006eb01e3c3d8eee2fb4 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DRANGE_V3_TESTS=OFF + -DRANGE_V3_EXAMPLES=OFF + -DRANGE_V3_PERF=OFF + -DRANGE_V3_HEADER_CHECKS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/range-v3) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/range-v3/vcpkg.json b/externals/vcpkg/ports/range-v3/vcpkg.json new file mode 100755 index 000000000..f29c55497 --- /dev/null +++ b/externals/vcpkg/ports/range-v3/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "range-v3", + "version-date": "2021-11-02", + "description": "Range library for C++11/14/17/20.", + "homepage": "https://github.com/ericniebler/range-v3", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/rapidcheck/portfile.cmake b/externals/vcpkg/ports/rapidcheck/portfile.cmake new file mode 100755 index 000000000..29f430a92 --- /dev/null +++ b/externals/vcpkg/ports/rapidcheck/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO emil-e/rapidcheck + REF 08b505857e32d52a20b2240b5125d937d67a6d86 + SHA512 d71d17354d2597a168be935e03b1330fc96ff12d6551b6bd34ef8f6c2ba69f7f9bff865afd6a6a59c48496bcc9ddf997b07112d80c761d909f7cd9ef93a7464b + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DRC_INSTALL_ALL_EXTRAS=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/${PORT}/cmake) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) + +configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/rapidcheck/vcpkg.json b/externals/vcpkg/ports/rapidcheck/vcpkg.json new file mode 100755 index 000000000..981a45ebb --- /dev/null +++ b/externals/vcpkg/ports/rapidcheck/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "rapidcheck", + "version-date": "2021-12-20", + "description": "A property-based testing library for C++ (a la QuickCheck) with the goal of being simple to use with as little boilerplate as possible.", + "homepage": "https://github.com/emil-e/rapidcheck", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/rapidcsv/portfile.cmake b/externals/vcpkg/ports/rapidcsv/portfile.cmake new file mode 100755 index 000000000..94ebf914a --- /dev/null +++ b/externals/vcpkg/ports/rapidcsv/portfile.cmake @@ -0,0 +1,16 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO d99kris/rapidcsv + REF v8.53 + SHA512 64a6100f1adf90eeaa4a513fbcf4ffd611a40b1f41b6e88eeda6c73c360e26c5a7cc6fc68a65bb2dff5f72ba663a976d2922e3114468dbd8c291c7eef211ae1f + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/rapidcsv/vcpkg.json b/externals/vcpkg/ports/rapidcsv/vcpkg.json new file mode 100755 index 000000000..79268aa98 --- /dev/null +++ b/externals/vcpkg/ports/rapidcsv/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "rapidcsv", + "version": "8.53", + "description": "Rapidcsv is a C++ header-only library for CSV parsing.", + "homepage": "https://github.com/d99kris/rapidcsv/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/rapidjson/portfile.cmake b/externals/vcpkg/ports/rapidjson/portfile.cmake new file mode 100755 index 000000000..9a3ed57f8 --- /dev/null +++ b/externals/vcpkg/ports/rapidjson/portfile.cmake @@ -0,0 +1,31 @@ +#header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Tencent/rapidjson + REF ce81bc9edfe773667a7a4454ba81dac72ed4364c # accessed on 2020-09-14 + SHA512 a1bbc5668fca9ee34b05ae424a5177b66beaf7b3b4cdfbb3cb067fc58ce91717b4030e2c268ad32e4aa4a7ef59ab5e3aae05ff71d0d91d463eafa7d2e077df07 + HEAD_REF master +) + +# Use RapidJSON's own build process, skipping examples and tests +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DRAPIDJSON_BUILD_DOC:BOOL=OFF + -DRAPIDJSON_BUILD_EXAMPLES:BOOL=OFF + -DRAPIDJSON_BUILD_TESTS:BOOL=OFF + -DCMAKE_INSTALL_DIR:STRING=cmake +) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH cmake) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/share/doc") + +file(READ "${CURRENT_PACKAGES_DIR}/share/rapidjson/RapidJSONConfig.cmake" _contents) +string(REPLACE "\${RapidJSON_SOURCE_DIR}" "\${RapidJSON_CMAKE_DIR}/../.." _contents "${_contents}") +string(REPLACE "set( RapidJSON_SOURCE_DIR \"${SOURCE_PATH}\")" "" _contents "${_contents}") +string(REPLACE "set( RapidJSON_DIR \"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel\")" "" _contents "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/rapidjson/RapidJSONConfig.cmake" "${_contents}\nset(RAPIDJSON_INCLUDE_DIRS \"\${RapidJSON_INCLUDE_DIRS}\")\n") + +file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/rapidjson/vcpkg.json b/externals/vcpkg/ports/rapidjson/vcpkg.json new file mode 100755 index 000000000..9c0f7d6dc --- /dev/null +++ b/externals/vcpkg/ports/rapidjson/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "rapidjson", + "version-date": "2020-09-14", + "port-version": 2, + "description": "A fast JSON parser/generator for C++ with both SAX/DOM style API ", + "homepage": "http://rapidjson.org/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/rapidxml-ns/portfile.cmake b/externals/vcpkg/ports/rapidxml-ns/portfile.cmake new file mode 100755 index 000000000..e2d9a0cc9 --- /dev/null +++ b/externals/vcpkg/ports/rapidxml-ns/portfile.cmake @@ -0,0 +1,20 @@ +#header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO svgpp/rapidxml_ns + REF v1.13.2 + SHA512 72cdd7e728471e8903ce64470f5172abe7f2300d4d115b3a27b4d4ffb3c20e59aefb9b23c535e37baa3f53c9125aa2932d6fa9ba24e658151e1c9b12f959523a + HEAD_REF master +) + +# Handle copyright +file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/rapidxml-ns) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/rapidxml-ns/license.txt ${CURRENT_PACKAGES_DIR}/share/rapidxml-ns/copyright) + +# Copy the header files +file(INSTALL + ${SOURCE_PATH}/rapidxml_ns.hpp + ${SOURCE_PATH}/rapidxml_ns_print.hpp + ${SOURCE_PATH}/rapidxml_ns_utils.hpp + DESTINATION + ${CURRENT_PACKAGES_DIR}/include/rapidxml-ns) diff --git a/externals/vcpkg/ports/rapidxml-ns/vcpkg.json b/externals/vcpkg/ports/rapidxml-ns/vcpkg.json new file mode 100755 index 000000000..a0422d1eb --- /dev/null +++ b/externals/vcpkg/ports/rapidxml-ns/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "rapidxml-ns", + "version-string": "1.13.2", + "port-version": 1, + "description": "RapidXML with added XML namespaces support." +} diff --git a/externals/vcpkg/ports/rapidxml/portfile.cmake b/externals/vcpkg/ports/rapidxml/portfile.cmake new file mode 100755 index 000000000..b13d1a2bc --- /dev/null +++ b/externals/vcpkg/ports/rapidxml/portfile.cmake @@ -0,0 +1,15 @@ +#header-only library +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO rapidxml/rapidxml + REF rapidxml%201.13 + FILENAME "rapidxml-1.13.zip" + SHA512 6c10583e6631ccdb0217d0a5381172cb4c1046226de6ef1acf398d85e81d145228e14c3016aefcd7b70a1db8631505b048d8b4f5d4b0dbf1811d2482eefdd265 +) + +# Handle copyright +file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/rapidxml) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/rapidxml/license.txt ${CURRENT_PACKAGES_DIR}/share/rapidxml/copyright) + +# Copy the header files +file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/rapidxml FILES_MATCHING PATTERN "*.hpp") diff --git a/externals/vcpkg/ports/rapidxml/vcpkg.json b/externals/vcpkg/ports/rapidxml/vcpkg.json new file mode 100755 index 000000000..d43ff6cf8 --- /dev/null +++ b/externals/vcpkg/ports/rapidxml/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "rapidxml", + "version-string": "1.13", + "port-version": 5, + "description": "RapidXml is an attempt to create the fastest XML parser possible, while retaining useability, portability and reasonable W3C compatibility.", + "homepage": "https://sourceforge.net/projects/rapidxml" +} diff --git a/externals/vcpkg/ports/rappture/CMakeLists.txt b/externals/vcpkg/ports/rappture/CMakeLists.txt new file mode 100755 index 000000000..57d773925 --- /dev/null +++ b/externals/vcpkg/ports/rappture/CMakeLists.txt @@ -0,0 +1,110 @@ +cmake_minimum_required(VERSION 3.11) +cmake_policy(VERSION 3.11) + +project (rappture) + +set(SRC_RAPPTURE_CORE + src/core/scew_extras.c + src/core/RpBindingsDict.cc + src/core/RpBuffer.cc + src/core/RpBufferCInterface.cc + src/core/RpDXWriter.cc + src/core/RpDXWriterFInterface.cc + src/core/RpEncode.cc + src/core/RpEntityRef.cc + src/core/RpFortranCommon.cc + src/core/RpLibrary.cc + src/core/RpLibraryCInterface.cc + src/core/RpLibraryFInterface.cc + src/core/RpOutcome.cc + src/core/RpOutcomeCInterface.cc + src/core/RpPtr.cc + src/core/RpResult.cc + src/core/RpUnits.cc + src/core/RpUnitsCInterface.cc + src/core/RpUnitsFInterface.cc + src/core/RpUnitsStd.cc + src/core/RpUtils.cc + src/core/RpUtilsCInterface.cc + src/core/RpUtilsFInterface.cc + src/core/b64/cdecode.c + src/core/b64/cencode.c + src/core/scew/attribute.c + src/core/scew/element.c + src/core/scew/error.c + src/core/scew/parser.c + src/core/scew/str.c + src/core/scew/tree.c + src/core/scew/writer.c + src/core/scew/xattribute.c + src/core/scew/xerror.c + src/core/scew/xhandler.c + src/core/scew/xparser.c + src/core/scew/xprint.c +) + +set(HEADERS + src/core/rappture.h + src/core/RpBindingsDict.h + src/core/RpBuffer.h + src/core/RpBufferCHelper.h + src/core/RpBufferCInterface.h + src/core/RpDict.h + src/core/RpDXWriter.h + src/core/RpDXWriterFInterface.h + src/core/RpDXWriterFStubs.h + src/core/RpEncode.h + src/core/RpEntityRef.h + src/core/RpFortranCommon.h + src/core/RpLibrary.h + src/core/RpLibraryCInterface.h + src/core/RpLibraryFInterface.h + src/core/RpLibraryFStubs.h + src/core/RpOutcome.h + src/core/RpOutcomeCHelper.h + src/core/RpOutcomeCInterface.h + src/core/RpPtr.h + src/core/RpSimpleBuffer.h + src/core/RpUnits.h + src/core/RpUnitsCInterface.h + src/core/RpUnitsFInterface.h + src/core/RpUnitsFStubs.h + src/core/RpUnitsStd.h + src/core/RpUtils.h + src/core/RpUtilsCInterface.h + src/core/RpUtilsFInterface.h + src/core/RpUtilsFStubs.h + src/core/scew_extras.h + +) + +add_library(rappture ${SRC_RAPPTURE_CORE} ${HEADERS}) + +target_include_directories(rappture PUBLIC + $ + $ +) + +find_package(expat CONFIG REQUIRED) +find_package(ZLIB REQUIRED) + +target_compile_definitions(rappture PUBLIC + -D_CRT_SECURE_NO_WARNINGS + -DRAPPTURE_VERSION=1.9 + -DSVN_VERSION=6713 + -D_USE_MATH_DEFINES +) + +target_link_libraries(rappture PRIVATE + expat::expat + ZLIB::ZLIB +) + +install(TARGETS rappture EXPORT rappture-config + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + ) + +install(FILES ${HEADERS} DESTINATION include/rappture) +install(EXPORT rappture-config NAMESPACE unofficial::rappture:: DESTINATION share/rappture) diff --git a/externals/vcpkg/ports/rappture/portfile.cmake b/externals/vcpkg/ports/rappture/portfile.cmake new file mode 100755 index 000000000..e79ec3085 --- /dev/null +++ b/externals/vcpkg/ports/rappture/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_download_distfile(ARCHIVE + URLS "https://nanohub.org/app/site/downloads/rappture/rappture-src-20130903.tar.gz" + FILENAME "rappture-src-20130903.tar.gz" + SHA512 3b42569d056c5e80762eada3aff23d230d4ba8f6f0078de44d8571a713dde91e31e66fe3c37ceb66e934a1410b338fb481aeb5a29ef56b53da4ad2e8a2a2ae59 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + "${CMAKE_CURRENT_LIST_DIR}/rappture.patch" +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +file( + INSTALL ${SOURCE_PATH}/license.terms + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright +) diff --git a/externals/vcpkg/ports/rappture/rappture.patch b/externals/vcpkg/ports/rappture/rappture.patch new file mode 100755 index 000000000..d8c7ff6c8 --- /dev/null +++ b/externals/vcpkg/ports/rappture/rappture.patch @@ -0,0 +1,89 @@ +diff --git a/src/core/RpBuffer.cc b/src/core/RpBuffer.cc +index 6d439fe..ec45405 100644 +--- a/src/core/RpBuffer.cc ++++ b/src/core/RpBuffer.cc +@@ -16,7 +16,6 @@ + #include + #include + #include +-#include + #include + #include + #include "b64/encode.h" +@@ -24,6 +23,11 @@ + #include "RpBuffer.h" + #include "RpEncode.h" + ++#if defined(_MSC_VER) ++#include ++typedef SSIZE_T ssize_t; ++#endif ++ + namespace Rappture { + + /** +@@ -109,6 +113,9 @@ Buffer::operator+=(const Buffer& b) + Buffer::~Buffer() + {} + ++#ifndef _WIN32 ++# define _fileno fileno ++#endif + + bool + Buffer::load (Outcome &status, const char *path) +@@ -123,7 +130,7 @@ Buffer::load (Outcome &status, const char *path) + } + + struct stat stat; +- if (fstat(fileno(f), &stat) < 0) { ++ if (fstat(_fileno(f), &stat) < 0) { + status.addError("can't stat \"%s\": %s", path, strerror(errno)); + return false; + } +diff --git a/src/core/RpDXWriter.cc b/src/core/RpDXWriter.cc +index e4748b3..8990c0f 100644 +--- a/src/core/RpDXWriter.cc ++++ b/src/core/RpDXWriter.cc +@@ -18,6 +18,12 @@ + #include + #include + #include ++ ++#if defined(_MSC_VER) ++#include ++typedef SSIZE_T ssize_t; ++#endif ++ + using namespace Rappture; + + DXWriter::DXWriter() : +diff --git a/src/core/RpLibrary.cc b/src/core/RpLibrary.cc +index 2b9a540..4da787b 100644 +--- a/src/core/RpLibrary.cc ++++ b/src/core/RpLibrary.cc +@@ -11,7 +11,6 @@ + * ====================================================================== + */ + +-#include "config.h" + #include "scew/scew.h" + #include "scew_extras.h" + #include "RpLibrary.h" +diff --git a/src/core/scew/scew.h b/src/core/scew/scew.h +index 9741ed5..e335c2d 100644 +--- a/src/core/scew/scew.h ++++ b/src/core/scew/scew.h +@@ -61,12 +61,6 @@ + # define SCEW_LIB_D + # endif /* _DEBUG */ + +-# if defined(SCEW_LIB_U) || defined(SCEW_LIB_S) || defined(SCEW_LIB_D) +-# pragma comment( lib, "scew_" SCEW_LIB_U SCEW_LIB_S SCEW_LIB_D ".lib" ) +-# else +-# pragma comment( lib, "scew.lib" ) +-# endif +- + #endif /* _WIN32 */ + + #endif /* SCEW_H_ALEIX0211250134 */ diff --git a/externals/vcpkg/ports/rappture/vcpkg.json b/externals/vcpkg/ports/rappture/vcpkg.json new file mode 100755 index 000000000..68a1a5efa --- /dev/null +++ b/externals/vcpkg/ports/rappture/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "rappture", + "version": "1.9", + "port-version": 1, + "description": "Rappture is a toolkit supporting Rapid application infrastructure, making it quick and easy to develop powerful scientific applications.", + "dependencies": [ + "expat", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/raylib/fix-linkGlfw.patch b/externals/vcpkg/ports/raylib/fix-linkGlfw.patch new file mode 100755 index 000000000..d495e2814 --- /dev/null +++ b/externals/vcpkg/ports/raylib/fix-linkGlfw.patch @@ -0,0 +1,29 @@ +diff --git a/cmake/GlfwImport.cmake b/cmake/GlfwImport.cmake +index 1b94cdf..4cc8f8f 100644 +--- a/cmake/GlfwImport.cmake ++++ b/cmake/GlfwImport.cmake +@@ -5,7 +5,7 @@ elseif(USE_EXTERNAL_GLFW STREQUAL "IF_POSSIBLE") + find_package(glfw3 3.3.3 QUIET) + endif() + if (glfw3_FOUND) +- set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw) ++ set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw3) + endif() + + # Explicitly check against "ON", because USE_EXTERNAL_GLFW is a tristate option +@@ -32,3 +32,4 @@ else() + MESSAGE(STATUS "Using external GLFW") + set(GLFW_PKG_DEPS glfw3) + endif() ++set(GLFW_PKG_DEPS glfw3) +diff --git a/cmake/LibraryConfigurations.cmake b/cmake/LibraryConfigurations.cmake +index c156d6b..55c5bca 100644 +--- a/cmake/LibraryConfigurations.cmake ++++ b/cmake/LibraryConfigurations.cmake +@@ -104,5 +104,5 @@ endif () + set(LIBS_PRIVATE ${LIBS_PRIVATE} ${OPENAL_LIBRARY}) + + if (${PLATFORM} MATCHES "Desktop") +- set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw) ++ set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw3) + endif () diff --git a/externals/vcpkg/ports/raylib/portfile.cmake b/externals/vcpkg/ports/raylib/portfile.cmake new file mode 100755 index 000000000..96a0298d4 --- /dev/null +++ b/externals/vcpkg/ports/raylib/portfile.cmake @@ -0,0 +1,80 @@ +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX) + message( + "raylib currently requires the following libraries from the system package manager: + libgl1-mesa-dev + libx11-dev + libxcursor-dev + libxinerama-dev + libxrandr-dev +These can be installed on Ubuntu systems via sudo apt install libgl1-mesa-dev libx11-dev libxcursor-dev libxinerama-dev libxrandr-dev" + ) +endif() + +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX) + set(patches fix-linkGlfw.patch) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO raysan5/raylib + REF 4.0.0 + SHA512 e9ffab14ab902e3327202e68ca139209ff24100dab62eb03fef50adf363f81e2705d81e709c58cf1514e68e6061c8963555bd2d00744daacc3eb693825fc3417 + HEAD_REF master + PATCHES ${patches} +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + hidpi SUPPORT_HIGH_DPI + use-audio USE_AUDIO +) + +if(VCPKG_TARGET_IS_MINGW) + set(DEBUG_ENABLE_SANITIZERS OFF) +else() + set(DEBUG_ENABLE_SANITIZERS ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_GAMES=OFF + -DSHARED=${SHARED} + -DSTATIC=${STATIC} + -DUSE_EXTERNAL_GLFW=OFF # externl glfw3 causes build errors on Windows + ${FEATURE_OPTIONS} + OPTIONS_DEBUG + -DENABLE_ASAN=${DEBUG_ENABLE_SANITIZERS} + -DENABLE_UBSAN=${DEBUG_ENABLE_SANITIZERS} + -DENABLE_MSAN=OFF + OPTIONS_RELEASE + -DENABLE_ASAN=OFF + -DENABLE_UBSAN=OFF + -DENABLE_MSAN=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + vcpkg_replace_string( + ${CURRENT_PACKAGES_DIR}/include/raylib.h + "defined(USE_LIBTYPE_SHARED)" + "1 // defined(USE_LIBTYPE_SHARED)" + ) +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/raylib/vcpkg.json b/externals/vcpkg/ports/raylib/vcpkg.json new file mode 100755 index 000000000..348eb943e --- /dev/null +++ b/externals/vcpkg/ports/raylib/vcpkg.json @@ -0,0 +1,34 @@ +{ + "name": "raylib", + "version-semver": "4.0.0", + "port-version": 3, + "description": "A simple and easy-to-use library to enjoy videogames programming", + "homepage": "https://github.com/raysan5/raylib", + "license": "Zlib", + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "glfw3", + "platform": "!windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "use-audio" + ], + "features": { + "hidpi": { + "description": "Support high-DPI displays" + }, + "use-audio": { + "description": "Build raylib with audio module" + } + } +} diff --git a/externals/vcpkg/ports/rbdl-orb/portfile.cmake b/externals/vcpkg/ports/rbdl-orb/portfile.cmake new file mode 100755 index 000000000..17c841268 --- /dev/null +++ b/externals/vcpkg/ports/rbdl-orb/portfile.cmake @@ -0,0 +1,45 @@ +if (EXISTS "${CURRENT_INSTALLED_DIR}/share/rbdl/copyright") + message(FATAL_ERROR "${PORT} conflict with rbdl, please remove rbdl before install ${PORT}.") +endif() + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RBDL_STATIC) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ORB-HD/rbdl-orb + REF a2e5428729b636c6232c3b90e4ddac80f7d42b1a + SHA512 2a10b3a7ac4e49b0ac5e7204f419a132bef7431c3ba55a72a8d10f9fea1972419682367bda32506b8daf58fc65405c7f3b7fe11fe661fc3dc6c98a3206cf1253 + HEAD_REF master +) + +vcpkg_from_github( + OUT_SOURCE_PATH PARSER_SOURCE_PATH + REPO ORB-HD/URDF_Parser + REF 8fcc3174743cf3e7561ffb6625524f8133161df4 + SHA512 6cba22e98f23e74fd7c1dcb356d88b5e24c61913dc900e584ed313b1fcce5d6832ceafcf15a3ea7a56714ab82d3cd7d9f4350d3d242614561c836bd4735e3f4f +) +if(NOT EXISTS "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser/CMakeLists.txt") + file(REMOVE_RECURSE "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser") + file(RENAME "${PARSER_SOURCE_PATH}" "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DRBDL_BUILD_STATIC=${RBDL_STATIC} + -DRBDL_BUILD_ADDON_LUAMODEL=ON + -DRBDL_BUILD_ADDON_GEOMETRY=ON + -DRBDL_BUILD_ADDON_URDFREADER=ON + -DRBDL_BUILD_EXECUTABLES=OFF + -DRBDL_VCPKG_BUILD=ON +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/RBDL PACKAGE_NAME RBDL) +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/rbdl-orb/vcpkg.json b/externals/vcpkg/ports/rbdl-orb/vcpkg.json new file mode 100755 index 000000000..0b96b7d6f --- /dev/null +++ b/externals/vcpkg/ports/rbdl-orb/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "rbdl-orb", + "version": "3.1.2", + "port-version": 1, + "description": "Rigid Body Dynamics Library - ORB", + "homepage": "https://github.com/orb-hd/rbdl-orb", + "dependencies": [ + "boost", + "eigen3", + "lua", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/rbdl/001_x64_number_of_sections_exceeded_in_object_file_patch.diff b/externals/vcpkg/ports/rbdl/001_x64_number_of_sections_exceeded_in_object_file_patch.diff new file mode 100755 index 000000000..8aaf4d384 --- /dev/null +++ b/externals/vcpkg/ports/rbdl/001_x64_number_of_sections_exceeded_in_object_file_patch.diff @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b2db532da..42c004380 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -112,6 +112,10 @@ SET ( RBDL_SOURCES + src/Kinematics.cc + ) + ++IF (MSVC) ++ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") ++ENDIF (MSVC) ++ + IF (MSVC AND NOT RBDL_BUILD_STATIC) + MESSAGE (FATAL_ERROR, "Compiling RBDL as a DLL currently not supported. Please enable RBDL_BUILD_STATIC.") + ENDIF (MSVC AND NOT RBDL_BUILD_STATIC) diff --git a/externals/vcpkg/ports/rbdl/portfile.cmake b/externals/vcpkg/ports/rbdl/portfile.cmake new file mode 100755 index 000000000..750e4c675 --- /dev/null +++ b/externals/vcpkg/ports/rbdl/portfile.cmake @@ -0,0 +1,31 @@ +if (EXISTS "${CURRENT_INSTALLED_DIR}/share/rbdl-orb/copyright") + message(FATAL_ERROR "${PORT} conflict with rbdl-orb, please remove rbdl-orb before install ${PORT}.") +endif() + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RBDL_STATIC) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rbdl/rbdl + REF v2.6.0 + SHA512 7b5fd03c0090277f295a28a1ff0542cd8cff76dda4379b3edc61ca3d868bf77d8b4882f81865fdffd0cf756c613fe55238b29a83bc163fc32aa94aa9d5781480 + HEAD_REF master + PATCHES 001_x64_number_of_sections_exceeded_in_object_file_patch.diff +) + + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DRBDL_BUILD_STATIC=${RBDL_STATIC} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/rbdl/vcpkg.json b/externals/vcpkg/ports/rbdl/vcpkg.json new file mode 100755 index 000000000..9bc73197e --- /dev/null +++ b/externals/vcpkg/ports/rbdl/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "rbdl", + "version": "2.6.0", + "port-version": 3, + "description": "Rigid Body Dynamics Library", + "homepage": "https://github.com/rbdl/rbdl", + "license": "Zlib", + "dependencies": [ + "eigen3", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/re2/portfile.cmake b/externals/vcpkg/ports/re2/portfile.cmake new file mode 100755 index 000000000..3adf713fd --- /dev/null +++ b/externals/vcpkg/ports/re2/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/re2 + REF 2021-11-01 + SHA512 9ea04638b7a8667fa9a9d9894c543417c86dde21a93bd4508ae8a43fdd21384092866a3f55e93249942f36488c165e93bee18c61bab3cf138a920654563b8122 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DRE2_BUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/re2) + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") \ No newline at end of file diff --git a/externals/vcpkg/ports/re2/vcpkg.json b/externals/vcpkg/ports/re2/vcpkg.json new file mode 100755 index 000000000..be979d97b --- /dev/null +++ b/externals/vcpkg/ports/re2/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "re2", + "version-date": "2021-11-01", + "description": "RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library.", + "homepage": "https://github.com/google/re2", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/readerwriterqueue/portfile.cmake b/externals/vcpkg/ports/readerwriterqueue/portfile.cmake new file mode 100755 index 000000000..b0d25a479 --- /dev/null +++ b/externals/vcpkg/ports/readerwriterqueue/portfile.cmake @@ -0,0 +1,12 @@ +# header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cameron314/readerwriterqueue + REF v1.0.6 + SHA512 93606d8337ec6bb8aad23a40a7d5e685f8b97f6c75ca4a6b11947aaef02c2283648c5352d3c7f451006b2244ce45d0c04384ba0e1da8ac515ce7644f83f49f2c + HEAD_REF master +) + +file(GLOB HEADER_FILES ${SOURCE_PATH}/*.h) +file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/readerwriterqueue/vcpkg.json b/externals/vcpkg/ports/readerwriterqueue/vcpkg.json new file mode 100755 index 000000000..2cf005c77 --- /dev/null +++ b/externals/vcpkg/ports/readerwriterqueue/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "readerwriterqueue", + "version-semver": "1.0.6", + "description": "A single-producer, single-consumer lock-free queue", + "homepage": "https://github.com/cameron314/readerwriterqueue" +} diff --git a/externals/vcpkg/ports/readline-osx/portfile.cmake b/externals/vcpkg/ports/readline-osx/portfile.cmake new file mode 100755 index 000000000..9aefc8241 --- /dev/null +++ b/externals/vcpkg/ports/readline-osx/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/readline-osx/vcpkg.json b/externals/vcpkg/ports/readline-osx/vcpkg.json new file mode 100755 index 000000000..381e95164 --- /dev/null +++ b/externals/vcpkg/ports/readline-osx/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "readline-osx", + "version-date": "2020-01-04", + "description": "empty package, linking to readline-unix", + "supports": "osx", + "dependencies": [ + "readline-unix" + ] +} diff --git a/externals/vcpkg/ports/readline-unix/portfile.cmake b/externals/vcpkg/ports/readline-unix/portfile.cmake new file mode 100755 index 000000000..b7422e53a --- /dev/null +++ b/externals/vcpkg/ports/readline-unix/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_download_distfile( + ARCHIVE + URLS https://ftp.gnu.org/gnu/readline/readline-8.1.tar.gz + FILENAME readline-8.1.tar.gz + SHA512 27790d0461da3093a7fee6e89a51dcab5dc61928ec42e9228ab36493b17220641d5e481ea3d8fee5ee0044c70bf960f55c7d3f1a704cf6b9c42e5c269b797e00 +) + +vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + --with-curses=yes +) + +vcpkg_install_make() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/readline-unix/vcpkg.json b/externals/vcpkg/ports/readline-unix/vcpkg.json new file mode 100755 index 000000000..6d3b9382b --- /dev/null +++ b/externals/vcpkg/ports/readline-unix/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "readline-unix", + "version": "8.1", + "port-version": 1, + "description": "Implementation of readline for unix", + "supports": "!windows", + "dependencies": [ + "ncurses" + ] +} diff --git a/externals/vcpkg/ports/readline-win32/CMakeLists.txt b/externals/vcpkg/ports/readline-win32/CMakeLists.txt new file mode 100755 index 000000000..ac062d0dc --- /dev/null +++ b/externals/vcpkg/ports/readline-win32/CMakeLists.txt @@ -0,0 +1,56 @@ +cmake_minimum_required(VERSION 3.0) +project(readline C) + +add_definitions(-DREADLINE_LIBRARY) +add_definitions(-DHAVE_CONFIG_H) +add_definitions(-D_CRT_SECURE_NO_WARNINGS) + +if(BUILD_SHARED_LIBS) + add_definitions(-DBUILD_READLINE_DLL) +else() + add_definitions(-DREADLINE_STATIC) +endif() + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} # thats where the config.h is located +) + +add_library(readline + readline.c + funmap.c + keymaps.c + vi_mode.c + parens.c + rltty.c + complete.c + bind.c + isearch.c + display.c + signals.c + util.c + kill.c + undo.c + macro.c + input.c + callback.c + terminal.c + xmalloc.c + history.c + histsearch.c + histexpand.c + histfile.c + nls.c + search.c + shell.c + savestring.c + tilde.c + text.c + misc.c + compat.c + mbutil.c + support/wcwidth.c) + +install(TARGETS readline + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) diff --git a/externals/vcpkg/ports/readline-win32/config.h b/externals/vcpkg/ports/readline-win32/config.h new file mode 100755 index 000000000..de0a352fe --- /dev/null +++ b/externals/vcpkg/ports/readline-win32/config.h @@ -0,0 +1,58 @@ +#define RETSIGTYPE void +#define VOID_SIGHANDLER 1 +#define PROTOTYPES 1 +#define HAVE_ISASCII 1 +#define HAVE_ISXDIGIT 1 +#define HAVE_MBRLEN 1 +#define HAVE_MBRTOWC 1 +#define HAVE_MBRTOWC 1 +#define HAVE_MBSRTOWCS 1 +#define HAVE_MEMMOVE 1 +#define HAVE_PUTENV 1 +#define HAVE_SETENV 1 +#define HAVE_SETLOCALE 1 +#define HAVE_STRCOLL 1 +#define STRCOLL_BROKEN 1 +#define HAVE_STRPBRK 1 +#define HAVE_TCGETATTR 1 +#define HAVE_VSNPRINTF 1 +#define HAVE_WCTOMB 1 +#define HAVE_WCWIDTH 1 +#define STDC_HEADERS 1 +#define HAVE_LANGINFO_H 1 +#define HAVE_LIMITS_H 1 +#define HAVE_LOCALE_H 1 +#define HAVE_MEMORY_H 1 +#define HAVE_STDARG_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STRING_H 1 +#define HAVE_TERMIOS_H 1 +#define HAVE_WCHAR_H 1 +#define HAVE_WCTYPE_H 1 +#define HAVE_MBSTATE_T 1 +#define HAVE_LANGINFO_CODESET 1 +#define VOID_SIGHANDLER 1 +#define STRUCT_WINSIZE_IN_SYS_IOCTL 1 +#define HAVE_GETPW_DECLS 1 +#define MUST_REINSTALL_SIGHANDLERS 1 +#define CTYPE_NON_ASCII 1 + +/* Ultrix botches type-ahead when switching from canonical to + non-canonical mode, at least through version 4.3 */ +#if !defined (HAVE_TERMIOS_H) || !defined (HAVE_TCGETATTR) || defined (ultrix) +# define TERMIOS_MISSING +#endif + +#if defined (STRCOLL_BROKEN) +# define HAVE_STRCOLL 1 +#endif + +#if defined (__STDC__) && defined (HAVE_STDARG_H) +# define PREFER_STDARG +# define USE_VARARGS +#else +# if defined (HAVE_VARARGS_H) +# define PREFER_VARARGS +# define USE_VARARGS +# endif +#endif diff --git a/externals/vcpkg/ports/readline-win32/portfile.cmake b/externals/vcpkg/ports/readline-win32/portfile.cmake new file mode 100755 index 000000000..c6fa9435f --- /dev/null +++ b/externals/vcpkg/ports/readline-win32/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lltcggie/readline + REF ea414b4e98475e3976198738061824e8a8379a50 + SHA512 82d54ab3e19fb2673fe97eff07117d36704791669baa283ec737c704635f872e4c7cd30485a6648d445cb2912e4364286e664e9425444f456a4c862b9e4de843 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/src/readline/5.0/readline-5.0-src) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h DESTINATION ${SOURCE_PATH}/src/readline/5.0/readline-5.0-src) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/src/readline/5.0/readline-5.0-src + PREFER_NINJA +) + +vcpkg_install_cmake() + +# Copy headers +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include/readline) +file(GLOB headers "${SOURCE_PATH}/src/readline/5.0/readline-5.0-src/*.h") +file(COPY ${headers} DESTINATION ${CURRENT_PACKAGES_DIR}/include/readline) + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/src/readline/5.0/readline-5.0-src/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/readline-win32/vcpkg.json b/externals/vcpkg/ports/readline-win32/vcpkg.json new file mode 100755 index 000000000..79e3a7f7d --- /dev/null +++ b/externals/vcpkg/ports/readline-win32/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "readline-win32", + "version": "5.0", + "port-version": 4, + "description": "Implementation of readline for Windows Desktop", + "homepage": "https://github.com/lltcggie", + "supports": "windows & !uwp" +} diff --git a/externals/vcpkg/ports/readline/portfile.cmake b/externals/vcpkg/ports/readline/portfile.cmake new file mode 100755 index 000000000..45db4f37a --- /dev/null +++ b/externals/vcpkg/ports/readline/portfile.cmake @@ -0,0 +1,5 @@ +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "No implementation of readline is currently available for UWP targets") +endif() + +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/readline/vcpkg.json b/externals/vcpkg/ports/readline/vcpkg.json new file mode 100755 index 000000000..cc79a73bf --- /dev/null +++ b/externals/vcpkg/ports/readline/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "readline", + "version-string": "0", + "port-version": 3, + "description": "GNU readline and history libraries", + "supports": "!uwp", + "dependencies": [ + { + "name": "readline-unix", + "platform": "!windows" + }, + { + "name": "readline-win32", + "platform": "windows" + } + ] +} diff --git a/externals/vcpkg/ports/readosm/fix-makefiles.patch b/externals/vcpkg/ports/readosm/fix-makefiles.patch new file mode 100755 index 000000000..a955938b7 --- /dev/null +++ b/externals/vcpkg/ports/readosm/fix-makefiles.patch @@ -0,0 +1,48 @@ +diff --git a/makefile.vc b/makefile.vc +index 8edb536b9..33fd83e35 100644 +--- a/makefile.vc ++++ b/makefile.vc +@@ -8,7 +8,7 @@ LIBOBJ = src\readosm.obj src\osmxml.obj \ + src\protobuf.obj src\osm_objects.obj + READOSM_DLL = readosm$(VERSION).dll + +-CFLAGS = /nologo -I. -Iheaders -IC:\OSGeo4W\include $(OPTFLAGS) ++CFLAGS = /nologo -I. -Iheaders -I$(INSTALLED_ROOT)\include $(OPTFLAGS) + + default: all + +@@ -21,9 +21,9 @@ readosm.lib: $(LIBOBJ) + $(READOSM_DLL): readosm_i.lib + + readosm_i.lib: $(LIBOBJ) +- link /dll /out:$(READOSM_DLL) \ ++ link $(LINK_FLAGS) /dll /out:$(READOSM_DLL) \ + /implib:readosm_i.lib $(LIBOBJ) \ +- C:\OSGeo4w\lib\libexpat.lib C:\OSGeo4w\lib\zlib.lib ++ $(LIBS_ALL) + if exist $(READOSM_DLL).manifest mt -manifest \ + $(READOSM_DLL).manifest -outputresource:$(READOSM_DLL);2 + +@@ -35,7 +35,7 @@ clean: + del *.exp + del *.manifest + del *.lib +- del *.obj ++ del src\*.obj + del *.pdb + + install: all + +diff --git a/nmake.opt b/nmake.opt +index 5e45c0e..61c44f9 100644 +--- a/nmake.opt ++++ b/nmake.opt +@@ -2,7 +2,7 @@ + INSTDIR=C:\OSGeo4W + + # Uncomment the first for an optimized build, or the second for debug. +-OPTFLAGS= /nologo /Ox /fp:precise /W3 /MD /D_CRT_SECURE_NO_WARNINGS \ ++OPTFLAGS= /nologo /fp:precise /W3 $(CL_FLAGS) /D_CRT_SECURE_NO_WARNINGS \ + /DDLL_EXPORT + #OPTFLAGS= /nologo /Zi /MD /Fdreadosm.pdb /DDLL_EXPORT + diff --git a/externals/vcpkg/ports/readosm/pc-file.patch b/externals/vcpkg/ports/readosm/pc-file.patch new file mode 100755 index 000000000..34ea86806 --- /dev/null +++ b/externals/vcpkg/ports/readosm/pc-file.patch @@ -0,0 +1,12 @@ +diff --git a/readosm.pc.in b/readosm.pc.in +index c1a0961..2417433 100644 +--- a/readosm.pc.in ++++ b/readosm.pc.in +@@ -8,5 +8,6 @@ includedir=@includedir@ + Name: readosm + Description: a simple library parsing Open Street Map files + Version: @VERSION@ +-Libs: -L${libdir} -lreadosm -lz -lexpat ++Requires.private: expat zlib ++Libs: -L${libdir} -lreadosm + Cflags: -I${includedir} diff --git a/externals/vcpkg/ports/readosm/portfile.cmake b/externals/vcpkg/ports/readosm/portfile.cmake new file mode 100755 index 000000000..fabd6c4bf --- /dev/null +++ b/externals/vcpkg/ports/readosm/portfile.cmake @@ -0,0 +1,94 @@ +set(READOSM_VERSION_STR "1.1.0a") +vcpkg_download_distfile(ARCHIVE + URLS "https://www.gaia-gis.it/gaia-sins/readosm-sources/readosm-${READOSM_VERSION_STR}.tar.gz" + FILENAME "readosm-${READOSM_VERSION_STR}.tar.gz" + SHA512 ec8516cdd0b02027cef8674926653f8bc76e2082c778b02fb2ebcfa6d01e21757aaa4fd5d5104059e2f5ba97190183e60184f381bfd592a635805aa35cd7a682 +) + +vcpkg_extract_source_archive(SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES + fix-makefiles.patch + pc-file.patch +) + +set(PKGCONFIG_MODULES expat zlib) + +if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + x_vcpkg_pkgconfig_get_modules( + PREFIX PKGCONFIG + MODULES --msvc-syntax ${PKGCONFIG_MODULES} + LIBS + ) + + if(VCPKG_TARGET_IS_UWP) + set(UWP_LIBS windowsapp.lib) + set(UWP_LINK_FLAGS /APPCONTAINER) + endif() + + file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR) + + vcpkg_install_nmake( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_RELEASE + "INSTDIR=${INST_DIR}" + "LINK_FLAGS=${UWP_LINK_FLAGS}" + "LIBS_ALL=${PKGCONFIG_LIBS_RELEASE} ${UWP_LIBS}" + OPTIONS_DEBUG + "INSTDIR=${INST_DIR}\\debug" + "LINK_FLAGS=${UWP_LINK_FLAGS} /debug" + "LIBS_ALL=${PKGCONFIG_LIBS_DEBUG} ${UWP_LIBS}" + ) + + if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/readosm_i.lib") + if(NOT DEFINED VCPKG_BUILD_TYPE) + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/readosm_i.lib") + endif() + else() + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/readosm.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/readosm_i.lib" "${CURRENT_PACKAGES_DIR}/lib/readosm.lib") + if(NOT DEFINED VCPKG_BUILD_TYPE) + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/readosm.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/readosm_i.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/readosm.lib") + endif() + endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + + set(infile "${SOURCE_PATH}/readosm.pc.in") + set(outfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/readosm.pc") + set(VERSION "${READOSM_VERSION_STR}") + set(exec_prefix [[${prefix}]]) + set(libdir [[${prefix}/lib]]) + set(includedir [[${prefix}/include]]) + list(JOIN pkg_config_modules " " requires_private) + configure_file("${infile}" "${outfile}" @ONLY) + if(NOT DEFINED VCPKG_BUILD_TYPE) + set(outfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/readosm.pc") + set(includedir [[${prefix}/../include]]) + configure_file("${infile}" "${outfile}" @ONLY) + endif() + +else() + x_vcpkg_pkgconfig_get_modules( + PREFIX PKGCONFIG + MODULES ${PKGCONFIG_MODULES} + LIBS + ) + vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS_RELEASE + "LIBS=${PKGCONFIG_LIBS_RELEASE} \$LIBS" + OPTIONS_DEBUG + "LIBS=${PKGCONFIG_LIBS_DEBUG} \$LIBS" + ) + + vcpkg_install_make() +endif() + +vcpkg_fixup_pkgconfig() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/readosm/vcpkg.json b/externals/vcpkg/ports/readosm/vcpkg.json new file mode 100755 index 000000000..f93c64336 --- /dev/null +++ b/externals/vcpkg/ports/readosm/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "readosm", + "version-string": "1.1.0a", + "port-version": 2, + "description": "ReadOSM is an open source library to extract valid data from within an Open Street Map input file (.osm or .osm.pbf)", + "homepage": "https://www.gaia-gis.it/gaia-sins/readosm-sources", + "dependencies": [ + "expat", + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/realsense2/fix_config_osx.patch b/externals/vcpkg/ports/realsense2/fix_config_osx.patch new file mode 100755 index 000000000..d96f4bea5 --- /dev/null +++ b/externals/vcpkg/ports/realsense2/fix_config_osx.patch @@ -0,0 +1,12 @@ +diff --git a/CMake/unix_config.cmake b/CMake/unix_config.cmake +index 3e5929b..57dbe76 100644 +--- a/CMake/unix_config.cmake ++++ b/CMake/unix_config.cmake +@@ -35,7 +35,6 @@ macro(os_set_flags) + + if(APPLE) + set(FORCE_RSUSB_BACKEND ON) +- set(BUILD_WITH_TM2 ON) + endif() + + if(FORCE_RSUSB_BACKEND) diff --git a/externals/vcpkg/ports/realsense2/fix_openni2.patch b/externals/vcpkg/ports/realsense2/fix_openni2.patch new file mode 100755 index 000000000..541f8376a --- /dev/null +++ b/externals/vcpkg/ports/realsense2/fix_openni2.patch @@ -0,0 +1,18 @@ +diff --git a/wrappers/openni2/CMakeLists.txt b/wrappers/openni2/CMakeLists.txt +index 0eee84c2..769e67ff 100755 +--- a/wrappers/openni2/CMakeLists.txt ++++ b/wrappers/openni2/CMakeLists.txt +@@ -6,12 +6,7 @@ set(OPENNI2_DIR "c:/Program Files/OpenNI2" CACHE FILEPATH "OpenNI2 SDK directory + set(REALSENSE2_DIR "c:/Program Files (x86)/Intel RealSense SDK 2.0" CACHE FILEPATH "RealSense2 SDK directory") + + # INCLUDE DIR +-if (UNIX) +- include_directories (${OPENNI2_DIR}) +-else () +- include_directories (${OPENNI2_DIR}/Include) +-endif () +- ++include_directories (${OPENNI2_DIR}) + include_directories (${REALSENSE2_DIR}/include) + include_directories (src) + diff --git a/externals/vcpkg/ports/realsense2/portfile.cmake b/externals/vcpkg/ports/realsense2/portfile.cmake new file mode 100755 index 000000000..e9ab6c89b --- /dev/null +++ b/externals/vcpkg/ports/realsense2/portfile.cmake @@ -0,0 +1,72 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO IntelRealSense/librealsense + REF v2.50.0 + SHA512 ede964a5d5d7c70ff69b9d19e72ed2572f6d28c922cccae6d805ce72115b9d09d3b57d83163192aacc45856fe145d745472df4ca0053a41c65c175434709e3f0 + HEAD_REF master + PATCHES + fix_openni2.patch + fix_config_osx.patch +) + +file(COPY "${SOURCE_PATH}/src/win7/drivers/IntelRealSense_D400_series_win7.inf" DESTINATION "${SOURCE_PATH}") +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_CRT_LINKAGE) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tm2 BUILD_WITH_TM2 + tools BUILD_TOOLS +) + +set(BUILD_OPENNI2_BINDINGS OFF) +if(("openni2" IN_LIST FEATURES) AND (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")) + set(BUILD_OPENNI2_BINDINGS ON) +endif() + +set(PLATFORM_OPTIONS) +if (VCPKG_TARGET_IS_ANDROID) + list(APPEND PLATFORM_OPTIONS -DFORCE_RSUSB_BACKEND=ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} + -DENFORCE_METADATA=ON + -DBUILD_WITH_OPENMP=OFF + -DBUILD_UNIT_TESTS=OFF + -DBUILD_WITH_STATIC_CRT=${BUILD_CRT_LINKAGE} + -DBUILD_OPENNI2_BINDINGS=${BUILD_OPENNI2_BINDINGS} + -DOPENNI2_DIR=${CURRENT_INSTALLED_DIR}/include/openni2 + ${PLATFORM_OPTIONS} + -DBUILD_EXAMPLES=OFF + -DBUILD_GRAPHICAL_EXAMPLES=OFF + MAYBE_UNUSED_VARIABLES + OPENNI2_DIR +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/realsense2) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/realsense2/realsense2Targets.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "\${_IMPORT_PREFIX}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/realsense2/realsense2Targets.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "\${_IMPORT_PREFIX}") +endif() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(BUILD_TOOLS) + set(TOOL_NAMES rs-convert rs-embed rs-enumerate-devices rs-fw-logger rs-fw-update rs-record rs-terminal) + vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) +endif() + +if(BUILD_OPENNI2_BINDINGS) + file(GLOB RS2DRIVER "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/_out/rs2driver*") + if(RS2DRIVER) + file(COPY ${RS2DRIVER} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/openni2/OpenNI2/Drivers") + endif() +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/realsense2/vcpkg.json b/externals/vcpkg/ports/realsense2/vcpkg.json new file mode 100755 index 000000000..4414ef1af --- /dev/null +++ b/externals/vcpkg/ports/realsense2/vcpkg.json @@ -0,0 +1,36 @@ +{ + "name": "realsense2", + "version": "2.50.0", + "port-version": 1, + "description": "Intel® RealSenseâ„¢ SDK 2.0 is a cross-platform library for Intel® RealSenseâ„¢ depth cameras (D400 series and the SR300).", + "homepage": "https://github.com/IntelRealSense/librealsense", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "libusb", + "platform": "!windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "openni2": { + "description": "Build Intel® RealSenseâ„¢ OpenNI2 driver", + "dependencies": [ + "openni2" + ] + }, + "tm2": { + "description": "Build Intel® RealSenseâ„¢ T265 device" + }, + "tools": { + "description": "Build Intel® RealSenseâ„¢ tools" + } + } +} diff --git a/externals/vcpkg/ports/recast/CMakeLists.txt b/externals/vcpkg/ports/recast/CMakeLists.txt new file mode 100755 index 000000000..7ccc0828a --- /dev/null +++ b/externals/vcpkg/ports/recast/CMakeLists.txt @@ -0,0 +1,67 @@ +cmake_minimum_required(VERSION 3.8) +project(recast) + +set(SRC + DebugUtils/Source/DebugDraw.cpp + DebugUtils/Source/DetourDebugDraw.cpp + DebugUtils/Source/RecastDebugDraw.cpp + DebugUtils/Source/RecastDump.cpp + Detour/Source/DetourAlloc.cpp + Detour/Source/DetourCommon.cpp + Detour/Source/DetourNavMesh.cpp + Detour/Source/DetourNavMeshBuilder.cpp + Detour/Source/DetourNavMeshQuery.cpp + Detour/Source/DetourNode.cpp + DetourCrowd/Source/DetourCrowd.cpp + DetourCrowd/Source/DetourLocalBoundary.cpp + DetourCrowd/Source/DetourObstacleAvoidance.cpp + DetourCrowd/Source/DetourPathCorridor.cpp + DetourCrowd/Source/DetourPathQueue.cpp + DetourCrowd/Source/DetourProximityGrid.cpp + DetourTileCache/Source/DetourTileCache.cpp + DetourTileCache/Source/DetourTileCacheBuilder.cpp + Recast/Source/Recast.cpp + Recast/Source/RecastAlloc.cpp + Recast/Source/RecastArea.cpp + Recast/Source/RecastContour.cpp + Recast/Source/RecastFilter.cpp + Recast/Source/RecastLayers.cpp + Recast/Source/RecastMesh.cpp + Recast/Source/RecastMeshDetail.cpp + Recast/Source/RecastRasterization.cpp + Recast/Source/RecastRegion.cpp +) + +add_library(recast ${SRC}) + +target_include_directories( + recast PUBLIC + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ +) + +install( + TARGETS recast + EXPORT unofficial-recast-config + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(EXPORT unofficial-recast-config DESTINATION share/unofficial-recast) + +if(NOT DISABLE_INSTALL_HEADERS) + install(DIRECTORY DebugUtils/Include/ DESTINATION include/recast/DebugUtils) + install(DIRECTORY Detour/Include/ DESTINATION include/recast/Detour) + install(DIRECTORY DetourCrowd/Include/ DESTINATION include/recast/DetourCrowd) + install(DIRECTORY DetourTileCache/Include/ DESTINATION include/recast/DetourTileCache) + install(DIRECTORY Recast/Include/ DESTINATION include/recast/Recast) +endif() diff --git a/externals/vcpkg/ports/recast/portfile.cmake b/externals/vcpkg/ports/recast/portfile.cmake new file mode 100755 index 000000000..ebace1d11 --- /dev/null +++ b/externals/vcpkg/ports/recast/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO recastnavigation/recastnavigation + REF 1.5.1 + SHA512 09900d8893e0c633a79e6188d15e68d1047040a0f2bceb2542f486dded64e69b918eaae159def81416a014fae26a46502783a2a712462bee4be2a3edf7bef47f + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-recast CONFIG_PATH share/unofficial-recast) + +vcpkg_copy_pdbs() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/recast/vcpkg.json b/externals/vcpkg/ports/recast/vcpkg.json new file mode 100755 index 000000000..7163e255a --- /dev/null +++ b/externals/vcpkg/ports/recast/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "recast", + "version": "1.5.1", + "port-version": 5, + "description": "Navigation-mesh Toolset for Games", + "homepage": "https://github.com/recastnavigation/recastnavigation", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/redis-plus-plus/fix-conversion.patch b/externals/vcpkg/ports/redis-plus-plus/fix-conversion.patch new file mode 100755 index 000000000..57d6da26e --- /dev/null +++ b/externals/vcpkg/ports/redis-plus-plus/fix-conversion.patch @@ -0,0 +1,13 @@ +diff --git a/src/sw/redis++/shards.cpp b/src/sw/redis++/shards.cpp +index c5baf5a..08e96cd 100644 +--- a/src/sw/redis++/shards.cpp ++++ b/src/sw/redis++/shards.cpp +@@ -41,7 +41,7 @@ std::pair RedirectionError::_parse_error(const std::string &msg) con + auto host = msg.substr(space_pos + 1, colon_pos - space_pos - 1); + auto port = std::stoi(msg.substr(colon_pos + 1)); + +- return {slot, {host, port}}; ++ return {static_cast(slot), {host, port}}; + } catch (const std::exception &e) { + throw ProtoError("Invalid ASK error message: " + msg); + } diff --git a/externals/vcpkg/ports/redis-plus-plus/fix-ws2-linking-windows.patch b/externals/vcpkg/ports/redis-plus-plus/fix-ws2-linking-windows.patch new file mode 100755 index 000000000..06f75083b --- /dev/null +++ b/externals/vcpkg/ports/redis-plus-plus/fix-ws2-linking-windows.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 452cc0f..90932ce 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -148,6 +148,7 @@ if(REDIS_PLUS_PLUS_BUILD_SHARED) + target_compile_definitions(${SHARED_LIB} PRIVATE NOMINMAX) + set_target_properties(${SHARED_LIB} PROPERTIES CXX_STANDARD ${REDIS_PLUS_PLUS_CXX_STANDARD}) + set_target_properties(${SHARED_LIB} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE) ++ target_link_libraries(${SHARED_LIB} PUBLIC Ws2_32.lib) + else() + target_compile_options(${SHARED_LIB} PRIVATE "-Wall" "-W" "-Werror") + endif() diff --git a/externals/vcpkg/ports/redis-plus-plus/portfile.cmake b/externals/vcpkg/ports/redis-plus-plus/portfile.cmake new file mode 100755 index 000000000..93ee71b58 --- /dev/null +++ b/externals/vcpkg/ports/redis-plus-plus/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sewenew/redis-plus-plus + REF e29c63db54653a660d7a0f556f670b7a6fce0a78 # 1.3.2 + SHA512 47b18f41cfaf5e11d6eba1201a3da3a1ed355583cde0772de68e5f0f25953e1467c83249848b25b16c9db9e3f6c5df5e1dd832f4b3dd41289c69111867e48d8c + HEAD_REF master + PATCHES + fix-ws2-linking-windows.patch + fix-conversion.patch +) + +if("cxx17" IN_LIST FEATURES) + set(REDIS_PLUS_PLUS_CXX_STANDARD 17) +else() + set(REDIS_PLUS_PLUS_CXX_STANDARD 11) +endif() + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" REDIS_PLUS_PLUS_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" REDIS_PLUS_PLUS_BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DREDIS_PLUS_PLUS_USE_TLS=OFF + -DREDIS_PLUS_PLUS_BUILD_STATIC=${REDIS_PLUS_PLUS_BUILD_STATIC} + -DREDIS_PLUS_PLUS_BUILD_SHARED=${REDIS_PLUS_PLUS_BUILD_SHARED} + -DREDIS_PLUS_PLUS_BUILD_TEST=OFF + -DREDIS_PLUS_PLUS_CXX_STANDARD=${REDIS_PLUS_PLUS_CXX_STANDARD} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/redis-plus-plus/vcpkg.json b/externals/vcpkg/ports/redis-plus-plus/vcpkg.json new file mode 100755 index 000000000..769edb78d --- /dev/null +++ b/externals/vcpkg/ports/redis-plus-plus/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "redis-plus-plus", + "version-semver": "1.3.2", + "description": "This is a C++ client for Redis. It's based on hiredis, and written in C++ 11", + "homepage": "https://github.com/sewenew/redis-plus-plus", + "dependencies": [ + "hiredis", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cxx17": { + "description": "Build redis-plus-plus with cxx 17 standard" + } + } +} diff --git a/externals/vcpkg/ports/refl-cpp/portfile.cmake b/externals/vcpkg/ports/refl-cpp/portfile.cmake new file mode 100755 index 000000000..3ef302408 --- /dev/null +++ b/externals/vcpkg/ports/refl-cpp/portfile.cmake @@ -0,0 +1,12 @@ +# header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO veselink1/refl-cpp + REF ce47c1355219f3b9af56ae91d997daf2b1555d97 #v0.12.3 + SHA512 f73e542a9ee00d677e2445c148b732cbdf6247adc1f4f412ad8e9587c5971b3cb02b39b15cdb9b0788f53e9efea6c5a485367505ecb569a367be012f6246ea92 + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/include/refl.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/refl-cpp/vcpkg.json b/externals/vcpkg/ports/refl-cpp/vcpkg.json new file mode 100755 index 000000000..88defcfdd --- /dev/null +++ b/externals/vcpkg/ports/refl-cpp/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "refl-cpp", + "version": "0.12.3", + "port-version": 1, + "description": "Static reflection for C++17 (compile-time enumeration, attributes, proxies, overloads, template functions, metaprogramming).", + "homepage": "https://github.com/veselink1/refl-cpp", + "license": "MIT" +} diff --git a/externals/vcpkg/ports/refprop-headers/portfile.cmake b/externals/vcpkg/ports/refprop-headers/portfile.cmake new file mode 100755 index 000000000..befb0184b --- /dev/null +++ b/externals/vcpkg/ports/refprop-headers/portfile.cmake @@ -0,0 +1,16 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO CoolProp/REFPROP-headers + REF 8df35c7cb557d385bb66431e92e836104a63a33c + SHA512 4424d036c3cd6c9028fffbeda0919d38f4b0a290fb141c6d1ff26c70cd416d9a0d2e1584c51b6ad2e989e84a8a71660f62dadaa88bb22428972165ba01131cb2 + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/REFPROP_lib.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +file( + INSTALL ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/refprop-headers + RENAME copyright +) diff --git a/externals/vcpkg/ports/refprop-headers/vcpkg.json b/externals/vcpkg/ports/refprop-headers/vcpkg.json new file mode 100755 index 000000000..f0b73813b --- /dev/null +++ b/externals/vcpkg/ports/refprop-headers/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "refprop-headers", + "version-string": "2019-04-14", + "port-version": 1, + "description": "The REFPROP Headers", + "homepage": "https://github.com/CoolProp/REFPROP-headers" +} diff --git a/externals/vcpkg/ports/rendergraph/portfile.cmake b/externals/vcpkg/ports/rendergraph/portfile.cmake new file mode 100755 index 000000000..2869a1f69 --- /dev/null +++ b/externals/vcpkg/ports/rendergraph/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH + REPO DragonJoker/RenderGraph + REF 13a196fc91df174290c88b2d3ddca93974abd004 + HEAD_REF master + SHA512 cd3b2ce33d799488ce5beacad37ef36bcbe8e597e39f5656e1e54c7c1c634b77e1ce43b64ea6598beb942d78afb1a4ca286bcc7052dac0ba62385fe274ae4393 +) + +vcpkg_from_github(OUT_SOURCE_PATH CMAKE_SOURCE_PATH + REPO DragonJoker/CMakeUtils + REF 9fbaae40ccdc92f86989dc6875f362e7943b6a94 + HEAD_REF master + SHA512 dada8ac1f9676c60f1ff5a09a9f788eb8d85eaca450407e4bf0100fbec87228f99cf66cb23de9c9358dda72c426655814cbd1ea90360ca0c63e7660c15aff22b +) + +get_filename_component(SRC_PATH "${CMAKE_SOURCE_PATH}" DIRECTORY) +if (EXISTS "${SRC_PATH}/CMake") + file(REMOVE_RECURSE "${SRC_PATH}/CMake") +endif() +file(RENAME "${CMAKE_SOURCE_PATH}" "${SRC_PATH}/CMake") +set(CMAKE_SOURCE_PATH "${SRC_PATH}/CMake") +file(COPY "${CMAKE_SOURCE_PATH}" DESTINATION "${SOURCE_PATH}") + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DPROJECTS_USE_PRECOMPILED_HEADERS=ON + -DCRG_UNITY_BUILD=ON + -DCRG_BUILD_STATIC=${BUILD_STATIC} + -DVULKAN_HEADERS_INCLUDE_DIRS=${CURRENT_INSTALLED_DIR}/include +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/RenderGraph) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/rendergraph/vcpkg.json b/externals/vcpkg/ports/rendergraph/vcpkg.json new file mode 100755 index 000000000..e588873aa --- /dev/null +++ b/externals/vcpkg/ports/rendergraph/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "rendergraph", + "version": "1.1.0", + "description": "Vulkan render graph implementation.", + "homepage": "https://github.com/DragonJoker/RenderGraph", + "license": "MIT", + "supports": "!x86 & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "vulkan-headers" + ] +} diff --git a/externals/vcpkg/ports/replxx/portfile.cmake b/externals/vcpkg/ports/replxx/portfile.cmake new file mode 100755 index 000000000..140d7425e --- /dev/null +++ b/externals/vcpkg/ports/replxx/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO AmokHuginnsson/replxx + REF release-0.0.4 + SHA512 5b87d3b53a99ead00a1ff0ee7a158b13339446682da630989643db7d47d4877d5d97c46954dc51cd282c8130c62a4fed5ce74d73d193690a1518fef974c8b497 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/replxx") +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/replxx/vcpkg.json b/externals/vcpkg/ports/replxx/vcpkg.json new file mode 100755 index 000000000..e82e01326 --- /dev/null +++ b/externals/vcpkg/ports/replxx/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "replxx", + "version": "0.0.4", + "port-version": 1, + "description": "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters.", + "homepage": "https://github.com/AmokHuginnsson/replxx", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/reproc/portfile.cmake b/externals/vcpkg/ports/reproc/portfile.cmake new file mode 100755 index 000000000..572cce5fb --- /dev/null +++ b/externals/vcpkg/ports/reproc/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DaanDeMeyer/reproc + REF v14.2.4 + SHA512 c592521960f1950d626261738091d25efdf764ee1a0c72a58c28c66eaebf6073b2c978f1dc2c8dbe89b0be7ec1629a3a45cb1fafa0ebe21b5df8d4d27c992675 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DREPROC++=ON + -DREPROC_INSTALL_PKGCONFIG=OFF + -DREPROC_INSTALL_CMAKECONFIGDIR=share +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +foreach(TARGET reproc reproc++) + vcpkg_cmake_config_fixup( + PACKAGE_NAME ${TARGET} + ) +endforeach() + +file( + INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/externals/vcpkg/ports/reproc/vcpkg.json b/externals/vcpkg/ports/reproc/vcpkg.json new file mode 100755 index 000000000..7c4999355 --- /dev/null +++ b/externals/vcpkg/ports/reproc/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "reproc", + "version": "14.2.4", + "port-version": 1, + "description": "Cross-platform (C99/C++11) process library", + "homepage": "https://github.com/DaanDeMeyer/reproc", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/rest-rpc/portfile.cmake b/externals/vcpkg/ports/rest-rpc/portfile.cmake new file mode 100755 index 000000000..551ff1428 --- /dev/null +++ b/externals/vcpkg/ports/rest-rpc/portfile.cmake @@ -0,0 +1,28 @@ +if (EXISTS ${CURRENT_INSTALLED_DIR}/include/msgpack/pack.h) + message(FATAL_ERROR "Cannot install ${PORT} when msgpack is already installed, please remove msgpack using \"./vcpkg remove msgpack:${TARGET_TRIPLET}\"") +endif() + +# header-only library +set(RESTRPC_VERSION V0.07) +set(RESTRPC_HASH 148152776c8c4f16e404c62ab3f46618e1817c0b4b186dbcc399c859efd110ed5a207bf56e961c312f80844f696f597068e0abc00e426409d50a2889d30c6d8e) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/rest-rpc-${RESTRPC_VERSION}) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO qicosmos/rest_rpc + REF ${RESTRPC_VERSION} + SHA512 ${RESTRPC_HASH} + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL ${SOURCE_PATH}/third/msgpack/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/rest_rpc.hpp" + "#include \"rest_rpc/rpc_server.h\"" + "#define ASIO_STANDALONE\n#include \"rest_rpc/rpc_server.h\"" +) + +# # Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/rest-rpc/vcpkg.json b/externals/vcpkg/ports/rest-rpc/vcpkg.json new file mode 100755 index 000000000..478198e72 --- /dev/null +++ b/externals/vcpkg/ports/rest-rpc/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "rest-rpc", + "version-string": "0.07", + "port-version": 2, + "description": "c++11, high performance, cross platform, easy to use rpc framework", + "homepage": "https://github.com/qicosmos/rest_rpc", + "dependencies": [ + "asio" + ] +} diff --git a/externals/vcpkg/ports/restbed/fix-cmake.patch b/externals/vcpkg/ports/restbed/fix-cmake.patch new file mode 100755 index 000000000..9a8602778 --- /dev/null +++ b/externals/vcpkg/ports/restbed/fix-cmake.patch @@ -0,0 +1,63 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -57,7 +57,11 @@ find_package( asio REQUIRED ) + + if ( BUILD_SSL ) + add_definitions( "-DBUILD_SSL" ) +- find_package( openssl REQUIRED ) ++ find_package( OpenSSL REQUIRED ) ++ set( ssl_LIBRARY_SHARED OpenSSL::SSL ) ++ set( crypto_LIBRARY_SHARED OpenSSL::Crypto ) ++ set( ssl_LIBRARY_STATIC OpenSSL::SSL ) ++ set( crypto_LIBRARY_STATIC OpenSSL::Crypto ) + endif ( ) + + include_directories( ${INCLUDE_DIR} SYSTEM ${asio_INCLUDE} ${ssl_INCLUDE} ) +@@ -76,12 +76,13 @@ endif ( ) + # + file( GLOB_RECURSE MANIFEST "${SOURCE_DIR}/*.cpp" ) + ++if ( NOT BUILD_SHARED_LIBS ) + set( STATIC_LIBRARY_NAME "${PROJECT_NAME}-static" ) + add_library( ${STATIC_LIBRARY_NAME} STATIC ${MANIFEST} ) + set_property( TARGET ${STATIC_LIBRARY_NAME} PROPERTY CXX_STANDARD 14 ) + set_property( TARGET ${STATIC_LIBRARY_NAME} PROPERTY CXX_STANDARD_REQUIRED ON ) + set_target_properties( ${STATIC_LIBRARY_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME} ) +- ++else ( ) + set( SHARED_LIBRARY_NAME "${PROJECT_NAME}-shared" ) + add_library( ${SHARED_LIBRARY_NAME} SHARED ${MANIFEST} ) + set_property( TARGET ${SHARED_LIBRARY_NAME} PROPERTY CXX_STANDARD 14 ) +@@ -93,13 +94,20 @@ else ( ) + set_target_properties( ${SHARED_LIBRARY_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME} ) + endif ( ) + set_target_properties( ${SHARED_LIBRARY_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION_MAJOR} VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} ) ++endif ( ) + + if ( BUILD_SSL ) ++if ( BUILD_SHARED_LIBS ) + target_link_libraries( ${SHARED_LIBRARY_NAME} LINK_PRIVATE ${ssl_LIBRARY_SHARED} ${crypto_LIBRARY_SHARED} ) ++else ( ) + target_link_libraries( ${STATIC_LIBRARY_NAME} LINK_PRIVATE ${ssl_LIBRARY_STATIC} ${crypto_LIBRARY_STATIC} ${CMAKE_DL_LIBS} ) ++endif ( ) + else ( ) ++if ( BUILD_SHARED_LIBS ) + target_link_libraries( ${SHARED_LIBRARY_NAME} ) ++else ( ) + target_link_libraries( ${STATIC_LIBRARY_NAME} ${CMAKE_DL_LIBS} ) ++endif ( ) + endif ( ) + + if ( BUILD_TESTS ) +@@ -119,5 +127,8 @@ file( GLOB ARTIFACTS "${SOURCE_DIR}/*.hpp" ) + + install( FILES "${INCLUDE_DIR}/${PROJECT_NAME}" DESTINATION "${CMAKE_INSTALL_PREFIX}/include" ) + install( FILES ${ARTIFACTS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/corvusoft/${PROJECT_NAME}" ) ++if ( NOT BUILD_SHARED_LIBS ) +-install( TARGETS ${STATIC_LIBRARY_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT library ) ++install( TARGETS ${STATIC_LIBRARY_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT library ) ++else ( ) +-install( TARGETS ${SHARED_LIBRARY_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT library ) ++install( TARGETS ${SHARED_LIBRARY_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT library ) ++endif ( ) diff --git a/externals/vcpkg/ports/restbed/portfile.cmake b/externals/vcpkg/ports/restbed/portfile.cmake new file mode 100755 index 000000000..bd8e890a1 --- /dev/null +++ b/externals/vcpkg/ports/restbed/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openssl BUILD_SSL +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Corvusoft/restbed + REF 4.8 + SHA512 989027c926b97a9dd02951c881dc41819014783da4848cc9ee50776545ba206830d35c2e775abd8c0f705f7b0611d5cd335dd1eb305cdcbf2c86100abaf1623c + HEAD_REF master + PATCHES + fix-cmake.patch +) + +file(REMOVE "${SOURCE_PATH}/cmake/Findopenssl.cmake") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DBUILD_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +# Remove include debug files +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/restbed/vcpkg.json b/externals/vcpkg/ports/restbed/vcpkg.json new file mode 100755 index 000000000..fa275eb22 --- /dev/null +++ b/externals/vcpkg/ports/restbed/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "restbed", + "version": "4.8", + "description": "Corvusoft's Restbed framework brings asynchronous RESTful functionality to C++14 applications.", + "homepage": "https://github.com/corvusoft/restbed", + "dependencies": [ + "asio", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "openssl": { + "description": "Secure over the wire communication allowing you to transmit private data online.", + "dependencies": [ + { + "name": "asio", + "features": [ + "openssl" + ] + }, + "openssl" + ] + } + } +} diff --git a/externals/vcpkg/ports/restc-cpp/0001-exclude-cmake-external-projects.patch b/externals/vcpkg/ports/restc-cpp/0001-exclude-cmake-external-projects.patch new file mode 100755 index 000000000..fff79c1f4 --- /dev/null +++ b/externals/vcpkg/ports/restc-cpp/0001-exclude-cmake-external-projects.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index aa690fe..d3ff45d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -16,7 +16,7 @@ if (NOT DEFINED INSTALL_RAPIDJSON_HEADERS) + option(INSTALL_RAPIDJSON_HEADERS "Install rapidjson headers when make install is executed" ON) + endif() + +-include(cmake_scripts/external-projects.cmake) ++#include(cmake_scripts/external-projects.cmake) + + if (EXISTS ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) + message(STATUS "Using conan configuration: ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake") +@@ -137,7 +137,9 @@ target_include_directories(${PROJECT_NAME} + + SET_CPP_STANDARD(${PROJECT_NAME}) + +-add_dependencies(${PROJECT_NAME} externalRapidJson) ++#add_dependencies(${PROJECT_NAME} externalRapidJson) ++find_package(RapidJSON CONFIG REQUIRED) ++target_include_directories(${PROJECT_NAME} PRIVATE ${RAPIDJSON_INCLUDE_DIRS}) + + if (NOT EMBEDDED_RESTC_CPP) + diff --git a/externals/vcpkg/ports/restc-cpp/portfile.cmake b/externals/vcpkg/ports/restc-cpp/portfile.cmake new file mode 100755 index 000000000..c7eacd2b3 --- /dev/null +++ b/externals/vcpkg/ports/restc-cpp/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jgaa/restc-cpp + REF v0.10.0 + SHA512 0f74d825d3958810c270748c2810953fe394d0bf1f147d81b9177803e29a86c702715d5995c5966c4fe671b7689f26d9a0fad4e82d111277bbd3ddce1a68f73a + HEAD_REF master + PATCHES + 0001-exclude-cmake-external-projects.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openssl RESTC_CPP_WITH_TLS + zlib RESTC_CPP_WITH_ZLIB + threaded-ctx RESTC_CPP_THREADED_CTX + boost-log RESTC_CPP_LOG_WITH_BOOST_LOG +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DINSTALL_RAPIDJSON_HEADERS=OFF + -DRESTC_CPP_WITH_EXAMPLES=OFF + -DRESTC_CPP_WITH_UNIT_TESTS=OFF + -DRESTC_CPP_WITH_FUNCTIONALT_TESTS=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share + ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/restc-cpp/vcpkg.json b/externals/vcpkg/ports/restc-cpp/vcpkg.json new file mode 100755 index 000000000..b06c5faa8 --- /dev/null +++ b/externals/vcpkg/ports/restc-cpp/vcpkg.json @@ -0,0 +1,47 @@ +{ + "name": "restc-cpp", + "version-semver": "0.10.0", + "port-version": 1, + "description": "Modern C++ REST Client library", + "homepage": "https://github.com/jgaa/restc-cpp", + "license": "MIT", + "dependencies": [ + "boost-asio", + "boost-chrono", + "boost-context", + "boost-coroutine", + "boost-date-time", + "boost-filesystem", + "boost-program-options", + "boost-system", + "boost-uuid", + "rapidjson" + ], + "default-features": [ + "openssl", + "zlib" + ], + "features": { + "boost-log": { + "description": "Use boost-log for logging.", + "dependencies": [ + "boost-log" + ] + }, + "openssl": { + "description": "OpenSSL support.", + "dependencies": [ + "openssl" + ] + }, + "threaded-ctx": { + "description": "Allow asio contexts with multiple threads. Enables thread-safe internal access." + }, + "zlib": { + "description": "Use zlib.", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/restclient-cpp/portfile.cmake b/externals/vcpkg/ports/restclient-cpp/portfile.cmake new file mode 100755 index 000000000..508a0ffc1 --- /dev/null +++ b/externals/vcpkg/ports/restclient-cpp/portfile.cmake @@ -0,0 +1,30 @@ +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mrtazz/restclient-cpp + REF b782bd26539a3d1a8edcb6d8a3493b111f8fac66 #v2022-02-009 + SHA512 992b2c067c7b672432a202fea6b5263ff51ca77facace5078077e77e57390d3ddcb99e0e20ad1a1595612efbb625d34f4d2cd8c4a2ac4bb33e3f9d5d28c2c579 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_GTest=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_jsoncpp=TRUE +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/restclient-cpp) + +vcpkg_copy_pdbs() + +# Remove includes in debug +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/restclient-cpp/vcpkg.json b/externals/vcpkg/ports/restclient-cpp/vcpkg.json new file mode 100755 index 000000000..d7dad2896 --- /dev/null +++ b/externals/vcpkg/ports/restclient-cpp/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "restclient-cpp", + "version-date": "2022-02-09", + "description": "Simple REST client for C++. It wraps libcurl for HTTP requests.", + "homepage": "https://code.mrtazz.com/restclient-cpp/", + "license": "MIT", + "dependencies": [ + "curl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/restinio/portfile.cmake b/externals/vcpkg/ports/restinio/portfile.cmake new file mode 100755 index 000000000..56f8c8851 --- /dev/null +++ b/externals/vcpkg/ports/restinio/portfile.cmake @@ -0,0 +1,17 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO stiffstream/restinio + REF 3bbbc97f572efc62dcf8ebfe3baf919593c22d81 # v.0.6.15 + SHA512 3a89d72bad4383b83bcfe8bbe16e12f7c08367dc3dfb2feff5642334d2bd5df3c75e5b25c4402c54d4279c45d5ab5997992fba18c3099772b6145fa90af7c808 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/vcpkg" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/restinio) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug") +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/restinio/vcpkg.json b/externals/vcpkg/ports/restinio/vcpkg.json new file mode 100755 index 000000000..018ba32eb --- /dev/null +++ b/externals/vcpkg/ports/restinio/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "restinio", + "version": "0.6.15", + "description": "A header-only C++14 library that gives you an embedded HTTP/Websocket server targeted primarily for asynchronous processing of HTTP-requests.", + "homepage": "https://github.com/Stiffstream/restinio", + "license": "BSD-3-Clause", + "dependencies": [ + "asio", + "fmt", + "http-parser", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/rexo/portfile.cmake b/externals/vcpkg/ports/rexo/portfile.cmake new file mode 100755 index 000000000..9fdf50774 --- /dev/null +++ b/externals/vcpkg/ports/rexo/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "christophercrouzet/rexo" + REF "v0.2.2" + SHA512 "c7b093920bb23d1b8ecb905c8d3eb281e46607890c071c079df4c194215fc007d672ce3524848a1f0376188869f51fd9955e3fe027c10f3d286a003adfd78d09" + HEAD_REF "main" +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DREXO_BUILD_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Rexo) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +configure_file("${SOURCE_PATH}/UNLICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/rexo/vcpkg.json b/externals/vcpkg/ports/rexo/vcpkg.json new file mode 100755 index 000000000..5971ea422 --- /dev/null +++ b/externals/vcpkg/ports/rexo/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "rexo", + "version-semver": "0.2.2", + "description": "Rexo is a neat single-file cross-platform unit testing framework for C/C++", + "homepage": "https://github.com/christophercrouzet/rexo", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/rhash/CMakeLists.txt b/externals/vcpkg/ports/rhash/CMakeLists.txt new file mode 100755 index 000000000..3d4dd189b --- /dev/null +++ b/externals/vcpkg/ports/rhash/CMakeLists.txt @@ -0,0 +1,27 @@ +cmake_minimum_required(VERSION 3.5) +project(rhash C) + +file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/Makefile RHASH_SOURCES REGEX "^SOURCES = .*$") +string(REPLACE "SOURCES = " "" RHASH_SOURCES "${RHASH_SOURCES}") +string(REPLACE " " ";" RHASH_SOURCES "${RHASH_SOURCES}") +add_definitions(-DRHASH_XVERSION="${RHASH_XVERSION}") +add_library(rhash ${RHASH_SOURCES}) +set_target_properties(rhash PROPERTIES COMPILE_DEFINITIONS "IN_RHASH" DEFINE_SYMBOL "RHASH_EXPORTS") + +target_include_directories(rhash INTERFACE $) + +install(TARGETS rhash EXPORT unofficial-rhash-config + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(EXPORT unofficial-rhash-config + FILE unofficial-rhash-config.cmake + NAMESPACE unofficial::rhash:: + DESTINATION share/unofficial-rhash +) + +if(NOT RHASH_SKIP_HEADERS) + install(FILES rhash.h rhash_torrent.h DESTINATION include) +endif() diff --git a/externals/vcpkg/ports/rhash/portfile.cmake b/externals/vcpkg/ports/rhash/portfile.cmake new file mode 100755 index 000000000..fe40f0e84 --- /dev/null +++ b/externals/vcpkg/ports/rhash/portfile.cmake @@ -0,0 +1,22 @@ +set(RHASH_XVERSION 1.4.2) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rhash/RHash + REF 02c8b1dbae01c8d56613b6a3034c3698f94a52be # v1.4.2 + SHA512 4c1d0a91a758ba85bc9ea194cf148834d6a0ebd849ed5384444798c522723ad78c3eedf65e7460fba61989a69b2c0f9a0f12bd6583381c544778c4b1c199a4ba + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/librhash") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/librhash" + OPTIONS_DEBUG + -DRHASH_SKIP_HEADERS=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-rhash) + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/rhash/vcpkg.json b/externals/vcpkg/ports/rhash/vcpkg.json new file mode 100755 index 000000000..0e489e903 --- /dev/null +++ b/externals/vcpkg/ports/rhash/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "rhash", + "version": "1.4.2", + "port-version": 1, + "description": "C library for computing a wide variety of hash sums", + "homepage": "https://github.com/rhash/RHash", + "license": "0BSD", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/rhasheq/portfile.cmake b/externals/vcpkg/ports/rhasheq/portfile.cmake new file mode 100755 index 000000000..fed79c5cd --- /dev/null +++ b/externals/vcpkg/ports/rhasheq/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO offscale/rhasheq + REF c42b672daf9bb1525cb94645244a09344c2a7363 + SHA512 55947069a67e7de8561b92bad753481402dd353aa40b06719346fa1247d8d0a5073a8a3e38419e7d9028684c091eb23b11b254fea836383a24ce8dcfe0cffefc + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DBUILD_TESTING=OFF" +) +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/COPYING" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/rhasheq" + RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/externals/vcpkg/ports/rhasheq/vcpkg.json b/externals/vcpkg/ports/rhasheq/vcpkg.json new file mode 100755 index 000000000..2ada70aec --- /dev/null +++ b/externals/vcpkg/ports/rhasheq/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "rhasheq", + "version": "0.0.1", + "description": "Simple header-only librhash wrapper for verifying hashes from a file to a given `const char *`.", + "license": "0BSD", + "supports": "!uwp", + "dependencies": [ + "c89stringutils", + "rhash", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/riffcpp/portfile.cmake b/externals/vcpkg/ports/riffcpp/portfile.cmake new file mode 100755 index 000000000..9460bd3f7 --- /dev/null +++ b/externals/vcpkg/ports/riffcpp/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libdmusic/riffcpp + REF v2.2.4 + SHA512 abceba02441305267c444ed724ca769fa08369302eb74b7729b700883b9354f3db95d8c68ee15f25844a75f1609edd2bcf7482fc639b9e2d3ee3b8caf5e9585f + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DRIFFCPP_INSTALL_EXAMPLE=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/riffcpp) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/riffcpp/LICENSE ${CURRENT_PACKAGES_DIR}/share/riffcpp/copyright) diff --git a/externals/vcpkg/ports/riffcpp/vcpkg.json b/externals/vcpkg/ports/riffcpp/vcpkg.json new file mode 100755 index 000000000..13d887647 --- /dev/null +++ b/externals/vcpkg/ports/riffcpp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "riffcpp", + "version-string": "2.2.4", + "port-version": 1, + "description": "Simple library for reading RIFF files", + "homepage": "https://github.com/libdmusic/riffcpp" +} diff --git a/externals/vcpkg/ports/ring-span-lite/portfile.cmake b/externals/vcpkg/ports/ring-span-lite/portfile.cmake new file mode 100755 index 000000000..ce1e7b0b8 --- /dev/null +++ b/externals/vcpkg/ports/ring-span-lite/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO martinmoene/ring-span-lite + REF v0.6.0 + SHA512 1C3C9560BC1F8CBDF9CDFD5593233020D8403CE707D8B129FED82080CB806E82E83CBB839BEA64D53B022A58400F817A54FFB30099A0D7D7B300E8D0103F483B +) + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS + -DRING_SPAN_LITE_OPT_BUILD_TESTS=OFF + -DRING_SPAN_LITE_OPT_BUILD_EXAMPLES=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets( + CONFIG_PATH "lib/cmake/${PORT}" +) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" +) + +file(INSTALL + "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright +) diff --git a/externals/vcpkg/ports/ring-span-lite/vcpkg.json b/externals/vcpkg/ports/ring-span-lite/vcpkg.json new file mode 100755 index 000000000..9907d29b4 --- /dev/null +++ b/externals/vcpkg/ports/ring-span-lite/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "ring-span-lite", + "version": "0.6.0", + "description": "A C++yy-like ring_span type for C++98, C++11 and later in a single-file header-only library", + "homepage": "https://github.com/martinmoene/ring-span-lite" +} diff --git a/externals/vcpkg/ports/rmlui/add-robin-hood.patch b/externals/vcpkg/ports/rmlui/add-robin-hood.patch new file mode 100755 index 000000000..4a39a8a5a --- /dev/null +++ b/externals/vcpkg/ports/rmlui/add-robin-hood.patch @@ -0,0 +1,38 @@ +diff --git a/CMake/FileList.cmake b/CMake/FileList.cmake +index 9c3042c..c3820df 100644 +--- a/CMake/FileList.cmake ++++ b/CMake/FileList.cmake +@@ -133,7 +133,6 @@ set(Core_PUB_HDR_FILES + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ComputedValues.h + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/chobo/flat_map.hpp + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/chobo/flat_set.hpp +- ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/robin_hood.h + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Context.h + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ContextInstancer.h + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ConvolutionFilter.h +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 62432f1..d9287c9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -387,6 +387,8 @@ if( ENABLE_SVG_PLUGIN ) + message("-- Can SVG plugin be enabled - yes - lunasvg library found") + endif() + ++find_path(ROBIN_HOOD_INCLUDE_DIR robin_hood.h) ++include_directories(${ROBIN_HOOD_INCLUDE_DIR}) + + if(NOT BUILD_FRAMEWORK) + #=================================== +diff --git a/Include/RmlUi/Config/Config.h b/Include/RmlUi/Config/Config.h +index dc42753..5249e1d 100644 +--- a/Include/RmlUi/Config/Config.h ++++ b/Include/RmlUi/Config/Config.h +@@ -57,7 +57,7 @@ + #else + #include "../Core/Containers/chobo/flat_map.hpp" + #include "../Core/Containers/chobo/flat_set.hpp" +-#include "../Core/Containers/robin_hood.h" ++#include + #endif // RMLUI_NO_THIRDPARTY_CONTAINERS + + namespace Rml { diff --git a/externals/vcpkg/ports/rmlui/portfile.cmake b/externals/vcpkg/ports/rmlui/portfile.cmake new file mode 100755 index 000000000..551393904 --- /dev/null +++ b/externals/vcpkg/ports/rmlui/portfile.cmake @@ -0,0 +1,56 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mikke89/RmlUi + REF 4.4 + SHA512 b0c0a4c6cbc6892fe2ae5bbed21b672b7ec842de04347341925bd34712a37c84da4589578c6fbf1ab4ce8137b5530244f545d7c5bc1fbbd7ffa54eb83a6952d4 + HEAD_REF master + PATCHES + add-robin-hood.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + lua BUILD_LUA_BINDINGS + INVERTED_FEATURES + freetype NO_FONT_INTERFACE_DEFAULT +) + +# Remove built-in header, instead we use vcpkg version (from robin-hood-hashing port) +file(REMOVE ${SOURCE_PATH}/Include/RmlUi/Core/Containers/robin_hood.h) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + CONFIG_PATH lib/RmlUi/cmake +) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/lib/RmlUi + ${CURRENT_PACKAGES_DIR}/lib/RmlUi +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/RmlUi/Core/Header.h + "#if !defined RMLUI_STATIC_LIB" + "#if 0" + ) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/RmlUi/Debugger/Header.h + "#if !defined RMLUI_STATIC_LIB" + "#if 0" + ) + if ("lua" IN_LIST FEATURES) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/RmlUi/Lua/Header.h + "#if !defined RMLUI_STATIC_LIB" + "#if 0" + ) + endif() +endif() + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/rmlui/vcpkg.json b/externals/vcpkg/ports/rmlui/vcpkg.json new file mode 100755 index 000000000..6396b098b --- /dev/null +++ b/externals/vcpkg/ports/rmlui/vcpkg.json @@ -0,0 +1,34 @@ +{ + "name": "rmlui", + "version": "4.4", + "maintainers": "Michael R. P. Ragazzon ", + "description": "RmlUi is the C++ user interface library based on the HTML and CSS standards, designed as a complete solution for any project's interface needs.", + "homepage": "https://github.com/mikke89/RmlUi", + "documentation": "https://mikke89.github.io/RmlUiDoc/", + "license": "MIT", + "dependencies": [ + "robin-hood-hashing", + "vcpkg-cmake", + "vcpkg-cmake-config" + ], + "default-features": [ + "freetype" + ], + "features": { + "freetype": { + "description": "Include font engine based on FreeType", + "dependencies": [ + { + "name": "freetype", + "default-features": false + } + ] + }, + "lua": { + "description": "Build Lua bindings", + "dependencies": [ + "lua" + ] + } + } +} diff --git a/externals/vcpkg/ports/roaring/portfile.cmake b/externals/vcpkg/ports/roaring/portfile.cmake new file mode 100755 index 000000000..820e6f5db --- /dev/null +++ b/externals/vcpkg/ports/roaring/portfile.cmake @@ -0,0 +1,33 @@ +if (TARGET_TRIPLET MATCHES "^x86") + message(WARNING "The CRoaring authors recommend users of this lib against using a 32-bit build.") +endif () + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO RoaringBitmap/CRoaring + REF ac3eaf56af8691374b63e53e842feff0322169f0 + SHA512 db10331559df1503bcd25f7f5cab1fdf6b29984634dbfd54289cd7750032a1dd25cd0b57b490cac3d0d3fd5bc785730617536a7162c6e59f66fadb77f972b1c4 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ROARING_BUILD_STATIC) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DROARING_BUILD_STATIC=${ROARING_BUILD_STATIC} + -DENABLE_ROARING_TESTS=OFF +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/roaring/vcpkg.json b/externals/vcpkg/ports/roaring/vcpkg.json new file mode 100755 index 000000000..598893916 --- /dev/null +++ b/externals/vcpkg/ports/roaring/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "roaring", + "version-string": "2019-03-05", + "port-version": 3, + "description": "A better compressed bitset in C (and C++)" +} diff --git a/externals/vcpkg/ports/robin-hood-hashing/portfile.cmake b/externals/vcpkg/ports/robin-hood-hashing/portfile.cmake new file mode 100755 index 000000000..8cc9746eb --- /dev/null +++ b/externals/vcpkg/ports/robin-hood-hashing/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO martinus/robin-hood-hashing + REF 3.11.5 + SHA512 5f73e089b1e8ec41a9bedded22bc64a789d3a3d04873a2ad9f8cc2970797a473b0f4d3436c2324b3ced85a0d983998a75b1dfaf2b7f3b77235b29806ff2fd489 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DRH_STANDALONE_PROJECT=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME robin_hood + CONFIG_PATH lib/cmake/robin_hood +) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" +) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/robin-hood-hashing/vcpkg.json b/externals/vcpkg/ports/robin-hood-hashing/vcpkg.json new file mode 100755 index 000000000..6a8b86b97 --- /dev/null +++ b/externals/vcpkg/ports/robin-hood-hashing/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "robin-hood-hashing", + "version": "3.11.5", + "description": "Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20", + "homepage": "https://github.com/martinus/robin-hood-hashing", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/robin-map/portfile.cmake b/externals/vcpkg/ports/robin-map/portfile.cmake new file mode 100755 index 000000000..ca5aa4b73 --- /dev/null +++ b/externals/vcpkg/ports/robin-map/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Tessil/robin-map + REF v1.0.1 + SHA512 5741049287fdb9c3316e1eb84b99343efc7b35f492e1db8166d65c2d16c7905f51b11cf164bedae9e44d4b6000bbea3c49012acf725a977e665a8dc23e89b1fb + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/tsl-robin-map) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/robin-map/vcpkg.json b/externals/vcpkg/ports/robin-map/vcpkg.json new file mode 100755 index 000000000..82f20f11c --- /dev/null +++ b/externals/vcpkg/ports/robin-map/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "robin-map", + "version-semver": "1.0.1", + "description": "A C++ implementation of a fast hash map and hash set using robin hood hashing", + "homepage": "https://github.com/Tessil/robin-map", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/rocksdb/0002-only-build-one-flavor.patch b/externals/vcpkg/ports/rocksdb/0002-only-build-one-flavor.patch new file mode 100755 index 000000000..125149b70 --- /dev/null +++ b/externals/vcpkg/ports/rocksdb/0002-only-build-one-flavor.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1a6411653..526dfcf60 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1077,13 +1077,17 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS) + + install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination}) + +- install( +- TARGETS ${ROCKSDB_STATIC_LIB} +- EXPORT RocksDBTargets +- COMPONENT devel +- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" +- INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" +- ) ++ if(NOT ROCKSDB_BUILD_SHARED) ++ install( ++ TARGETS ${ROCKSDB_STATIC_LIB} ++ EXPORT RocksDBTargets ++ COMPONENT devel ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ++ ) ++ else() ++ set_target_properties(${ROCKSDB_STATIC_LIB} PROPERTIES EXCLUDE_FROM_ALL TRUE) ++ endif() + + if(ROCKSDB_BUILD_SHARED) + install( diff --git a/externals/vcpkg/ports/rocksdb/0003-use-find-package.patch b/externals/vcpkg/ports/rocksdb/0003-use-find-package.patch new file mode 100755 index 000000000..3ee0da9d1 --- /dev/null +++ b/externals/vcpkg/ports/rocksdb/0003-use-find-package.patch @@ -0,0 +1,61 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 526dfcf60..241f706b7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -97,7 +97,7 @@ endif() + + include(CMakeDependentOption) + +-if(MSVC) ++if(MSVC AND NOT VCPKG_TOOLCHAIN) + option(WITH_GFLAGS "build with GFlags" OFF) + option(WITH_XPRESS "build with windows built in compression" OFF) + include(${CMAKE_CURRENT_SOURCE_DIR}/thirdparty.inc) +@@ -142,10 +142,7 @@ else() + endif() + + if(WITH_SNAPPY) +- find_package(Snappy CONFIG) +- if(NOT Snappy_FOUND) +- find_package(Snappy REQUIRED) +- endif() ++ find_package(Snappy CONFIG REQUIRED) + add_definitions(-DSNAPPY) + list(APPEND THIRDPARTY_LIBS Snappy::snappy) + endif() +@@ -169,16 +166,19 @@ else() + endif() + + if(WITH_LZ4) +- find_package(lz4 REQUIRED) ++ find_package(lz4 CONFIG REQUIRED) + add_definitions(-DLZ4) + list(APPEND THIRDPARTY_LIBS lz4::lz4) + endif() + + if(WITH_ZSTD) +- find_package(zstd REQUIRED) ++ find_package(zstd CONFIG REQUIRED) + add_definitions(-DZSTD) +- include_directories(${ZSTD_INCLUDE_DIR}) +- list(APPEND THIRDPARTY_LIBS zstd::zstd) ++ if(TARGET zstd::libzstd_shared) ++ list(APPEND THIRDPARTY_LIBS zstd::libzstd_shared) ++ elseif(TARGET zstd::libzstd_static) ++ list(APPEND THIRDPARTY_LIBS zstd::libzstd_static) ++ endif() + endif() + endif() + +@@ -438,9 +438,9 @@ endif() + + option(WITH_TBB "build with Threading Building Blocks (TBB)" OFF) + if(WITH_TBB) +- find_package(TBB REQUIRED) ++ find_package(TBB CONFIG REQUIRED) + add_definitions(-DTBB) +- list(APPEND THIRDPARTY_LIBS TBB::TBB) ++ list(APPEND THIRDPARTY_LIBS TBB::tbb) + endif() + + # Stall notifications eat some performance from inserts diff --git a/externals/vcpkg/ports/rocksdb/0004-fix-dependency-in-config.patch b/externals/vcpkg/ports/rocksdb/0004-fix-dependency-in-config.patch new file mode 100755 index 000000000..7688b7763 --- /dev/null +++ b/externals/vcpkg/ports/rocksdb/0004-fix-dependency-in-config.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/RocksDBConfig.cmake.in b/cmake/RocksDBConfig.cmake.in +index 0bd14be11..f9f6aa878 100644 +--- a/cmake/RocksDBConfig.cmake.in ++++ b/cmake/RocksDBConfig.cmake.in +@@ -37,7 +37,7 @@ if(@WITH_LZ4@) + endif() + + if(@WITH_ZSTD@) +- find_dependency(zstd) ++ find_dependency(zstd CONFIG) + endif() + + if(@WITH_NUMA@) +@@ -45,7 +45,7 @@ if(@WITH_NUMA@) + endif() + + if(@WITH_TBB@) +- find_dependency(TBB) ++ find_dependency(TBB CONFIG) + endif() + + find_dependency(Threads) diff --git a/externals/vcpkg/ports/rocksdb/0005-do-not-install-cmake-modules.patch b/externals/vcpkg/ports/rocksdb/0005-do-not-install-cmake-modules.patch new file mode 100755 index 000000000..08bf30497 --- /dev/null +++ b/externals/vcpkg/ports/rocksdb/0005-do-not-install-cmake-modules.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 241f706b7..5c0a417c6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1075,7 +1075,7 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS) + + install(DIRECTORY include/rocksdb COMPONENT devel DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + +- install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination}) ++ #install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination}) + + if(NOT ROCKSDB_BUILD_SHARED) + install( diff --git a/externals/vcpkg/ports/rocksdb/portfile.cmake b/externals/vcpkg/ports/rocksdb/portfile.cmake new file mode 100755 index 000000000..d87195643 --- /dev/null +++ b/externals/vcpkg/ports/rocksdb/portfile.cmake @@ -0,0 +1,62 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO facebook/rocksdb + REF fcf3d75f3f022a6a55ff1222d6b06f8518d38c7c # v6.27.3 + SHA512 da78886dbd21339fbc9081e3f3de3aeac5b1124a0e4a879c936fae5248177bfc58ec5397d200e15ceeaf9cda2fb3850145e007a18ac0ba632dba084cc4064bfb + HEAD_REF master + PATCHES + 0002-only-build-one-flavor.patch + 0003-use-find-package.patch + 0004-fix-dependency-in-config.patch + 0005-do-not-install-cmake-modules.patch +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" WITH_MD_LIBRARY) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ROCKSDB_BUILD_SHARED) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "lz4" WITH_LZ4 + "snappy" WITH_SNAPPY + "zlib" WITH_ZLIB + "zstd" WITH_ZSTD + "bzip2" WITH_BZ2 + "tbb" WITH_TBB + INVERTED_FEATURES + "tbb" CMAKE_DISABLE_FIND_PACKAGE_TBB +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DWITH_GFLAGS=OFF + -DWITH_TESTS=OFF + -DWITH_BENCHMARK_TOOLS=OFF + -DWITH_TOOLS=OFF + -DWITH_FOLLY_DISTRIBUTED_MUTEX=OFF + -DUSE_RTTI=1 + -DROCKSDB_INSTALL_ON_WINDOWS=ON + -DFAIL_ON_WARNINGS=OFF + -DWITH_MD_LIBRARY=${WITH_MD_LIBRARY} + -DPORTABLE=ON + -DCMAKE_DEBUG_POSTFIX=d + -DROCKSDB_BUILD_SHARED=${ROCKSDB_BUILD_SHARED} + -DCMAKE_DISABLE_FIND_PACKAGE_NUMA=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_gtest=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/rocksdb) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE.Apache" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.leveldb" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/rocksdb/vcpkg.json b/externals/vcpkg/ports/rocksdb/vcpkg.json new file mode 100755 index 000000000..a69ead1df --- /dev/null +++ b/externals/vcpkg/ports/rocksdb/vcpkg.json @@ -0,0 +1,57 @@ +{ + "name": "rocksdb", + "version": "6.27.3", + "description": "A library that provides an embeddable, persistent key-value store for fast storage", + "homepage": "https://github.com/facebook/rocksdb", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "zlib" + ], + "features": { + "bzip2": { + "description": "bzip2 support in rocksdb", + "dependencies": [ + "bzip2" + ] + }, + "lz4": { + "description": "lz4 support in rocksdb", + "dependencies": [ + "lz4" + ] + }, + "snappy": { + "description": "snappy support in rocksdb", + "dependencies": [ + "snappy" + ] + }, + "tbb": { + "description": "tbb support in rocksdb", + "dependencies": [ + "tbb" + ] + }, + "zlib": { + "description": "zlib support in rocksdb", + "dependencies": [ + "zlib" + ] + }, + "zstd": { + "description": "zstd support in rocksdb", + "dependencies": [ + "zstd" + ] + } + } +} diff --git a/externals/vcpkg/ports/rpclib/portfile.cmake b/externals/vcpkg/ports/rpclib/portfile.cmake new file mode 100755 index 000000000..ef13e9150 --- /dev/null +++ b/externals/vcpkg/ports/rpclib/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rpclib/rpclib + REF v2.3.0 + SHA512 9C65AE5D000CD66E39498667DC826A4E8A2C28EB4138CFFE3AA09D5DDC22575551B9FA6CE9D951343213B9583F947899CB18B58130AEAEE36DAB5881EA496272 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/rpclib") + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/rpclib/vcpkg.json b/externals/vcpkg/ports/rpclib/vcpkg.json new file mode 100755 index 000000000..add630ed8 --- /dev/null +++ b/externals/vcpkg/ports/rpclib/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "rpclib", + "version-semver": "2.3.0", + "port-version": 1, + "description": "a RPC library for C++, providing both a client and server implementation. It is built using modern C++14.", + "homepage": "https://github.com/rpclib/rpclib" +} diff --git a/externals/vcpkg/ports/rply/CMakeLists.txt b/externals/vcpkg/ports/rply/CMakeLists.txt new file mode 100755 index 000000000..8885a79c4 --- /dev/null +++ b/externals/vcpkg/ports/rply/CMakeLists.txt @@ -0,0 +1,59 @@ +cmake_minimum_required (VERSION 3.14) +project ("rply") +set (target_name ${CMAKE_PROJECT_NAME}) +set (target_include_prefix "rply") + +option (BUILD_SHARED_LIBS "Create ${target_name} as a shared library" ON) + +set (CMAKE_DEBUG_POSTFIX "d" CACHE STRING "postfix for debug lib") + +include (GNUInstallDirs) + +file (GLOB target_headers "*.h") +file (GLOB target_srcs "*.c" ) + +if (MSVC) + set(sources_msvc "rply.def") +endif() + +add_library (${target_name} ${target_srcs} ${target_headers} ${sources_msvc}) + +target_include_directories (${target_name} + PUBLIC $ +) + +set_target_properties(${target_name} PROPERTIES + C_STANDARD 11 +) + +if (MSVC) + target_compile_definitions(${target_name} PRIVATE _CRT_SECURE_NO_WARNINGS) + set_target_properties(${target_name} PROPERTIES + VS_DEBUGGER_WORKING_DIRECTORY $ + ) + set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${target_name}) +endif() + +install (TARGETS ${target_name} EXPORT ${target_name}-targets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) + +install (FILES ${target_headers} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${target_name}" + CONFIGURATIONS Release +) + +install (EXPORT ${target_name}-targets + FILE ${target_name}-targets.cmake + NAMESPACE ${target_name}:: + DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${target_name}" +) + +configure_file(${target_name}-config.cmake.in "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${target_name}-config.cmake" @ONLY) + +install(FILES + "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${target_name}-config.cmake" + DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${target_name}" +) diff --git a/externals/vcpkg/ports/rply/fix-uninitialized-local-variable.patch b/externals/vcpkg/ports/rply/fix-uninitialized-local-variable.patch new file mode 100755 index 000000000..f23ad8450 --- /dev/null +++ b/externals/vcpkg/ports/rply/fix-uninitialized-local-variable.patch @@ -0,0 +1,22 @@ +diff --git a/rply.c b/rply.c +index c4105ef..7c7e72a 100644 +--- a/rply.c ++++ b/rply.c +@@ -372,7 +372,7 @@ p_ply ply_open(const char *name, p_ply_error_cb error_cb, + + p_ply ply_open_from_file(FILE *fp, p_ply_error_cb error_cb, + long idata, void *pdata) { +- p_ply ply; ++ p_ply ply = NULL; + if (error_cb == NULL) error_cb = ply_error_cb; + assert(fp); + if (!ply_type_check()) { +@@ -475,7 +475,7 @@ p_ply ply_create(const char *name, e_ply_storage_mode storage_mode, + + p_ply ply_create_to_file(FILE *fp, e_ply_storage_mode storage_mode, + p_ply_error_cb error_cb, long idata, void *pdata) { +- p_ply ply; ++ p_ply ply = NULL; + assert(fp && storage_mode <= PLY_DEFAULT); + if (!ply_type_check()) { + error_cb(ply, "Incompatible type system"); diff --git a/externals/vcpkg/ports/rply/portfile.cmake b/externals/vcpkg/ports/rply/portfile.cmake new file mode 100755 index 000000000..665b9e300 --- /dev/null +++ b/externals/vcpkg/ports/rply/portfile.cmake @@ -0,0 +1,33 @@ + +set(VERSION 1.1.4) + +vcpkg_download_distfile(ARCHIVE + URLS "http://w3.impa.br/~diego/software/rply/rply-${VERSION}.tar.gz" + FILENAME "rply-${VERSION}.tar.gz" + SHA512 be389780b8ca74658433f271682d91e89709ced588c4012c152ccf4014557692a1afd37b1bd5e567cedf9c412d42721eb0412ff3331f38717e527bd5d29c27a7 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${VERSION} + PATCHES + fix-uninitialized-local-variable.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/rply.def DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/rply-config.cmake.in DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/rply RENAME copyright) + diff --git a/externals/vcpkg/ports/rply/rply-config.cmake.in b/externals/vcpkg/ports/rply/rply-config.cmake.in new file mode 100755 index 000000000..303034207 --- /dev/null +++ b/externals/vcpkg/ports/rply/rply-config.cmake.in @@ -0,0 +1,8 @@ +get_filename_component(_RPLY_PREFIX_DIR "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY) +set (_TARGET_NAME "rply") + +# IMPORTED targets +include("${_RPLY_PREFIX_DIR}/${_TARGET_NAME}-targets.cmake") + +set(_RPLY_PREFIX_DIR) +set(_TARGET_NAME) diff --git a/externals/vcpkg/ports/rply/rply.def b/externals/vcpkg/ports/rply/rply.def new file mode 100755 index 000000000..8662c2421 --- /dev/null +++ b/externals/vcpkg/ports/rply/rply.def @@ -0,0 +1,28 @@ +EXPORTS + ply_get_ply_user_data + ply_open + ply_read_header + ply_set_read_cb + ply_get_argument_element + ply_get_argument_property + ply_get_argument_user_data + ply_get_argument_value + ply_read + ply_get_next_element + ply_get_next_comment + ply_get_next_obj_info + ply_get_element_info + ply_get_next_property + ply_get_property_info + ply_create + ply_add_element + ply_add_property + ply_add_list_property + ply_add_scalar_property + ply_add_comment + ply_add_obj_info + ply_write_header + ply_write + ply_close + ply_open_from_file + ply_create_to_file diff --git a/externals/vcpkg/ports/rply/vcpkg.json b/externals/vcpkg/ports/rply/vcpkg.json new file mode 100755 index 000000000..100177a41 --- /dev/null +++ b/externals/vcpkg/ports/rply/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "rply", + "version-string": "1.1.4", + "port-version": 1, + "description": "ANSI C Library for PLY file format input and output", + "homepage": "http://w3.impa.br/~diego/software/rply" +} diff --git a/externals/vcpkg/ports/rsasynccpp/portfile.cmake b/externals/vcpkg/ports/rsasynccpp/portfile.cmake new file mode 100755 index 000000000..4fa5cbb81 --- /dev/null +++ b/externals/vcpkg/ports/rsasynccpp/portfile.cmake @@ -0,0 +1,47 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO renestein/Rstein.AsyncCpp + REF 0.0.7 + SHA512 b4cc1c68b6fc7bb8b418457ba18b834769abec07e44305955214f8918cc57f85c4258a0521ea55388fab3ec9724488e506d2b114c765b804991c38bf33133c55 + HEAD_REF master +) + +if("lib-cl-win-legacy-await" IN_LIST FEATURES) + if (VCPKG_CRT_LINKAGE MATCHES "static") + set(RELEASE_CONFIGURATION "ReleaseMT_VSAWAIT") + set(DEBUG_CONFIGURATION "DebugMT_VSAWAIT") + else() + set(RELEASE_CONFIGURATION "Release_VSAWAIT") + set(DEBUG_CONFIGURATION "Debug_VSAWAIT") + endif() +else() + if (VCPKG_CRT_LINKAGE MATCHES "static") + set(RELEASE_CONFIGURATION "ReleaseMT") + set(DEBUG_CONFIGURATION "DebugMT") + else() + set(RELEASE_CONFIGURATION "Release") + set(DEBUG_CONFIGURATION "Debug") + endif() +endif() + +if (TRIPLET_SYSTEM_ARCH MATCHES "x86") + set(MSBUILD_PLATFORM "x86") +else () + set(MSBUILD_PLATFORM ${TRIPLET_SYSTEM_ARCH}) +endif() + + +vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH RStein.AsyncCppLib.sln + LICENSE_SUBPATH LICENSE + PLATFORM ${MSBUILD_PLATFORM} + DEBUG_CONFIGURATION ${DEBUG_CONFIGURATION} + RELEASE_CONFIGURATION ${RELEASE_CONFIGURATION} +) + +file(COPY "${SOURCE_PATH}/RStein.AsyncCpp/" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/asynccpp" + FILES_MATCHING PATTERN "*.h") diff --git a/externals/vcpkg/ports/rsasynccpp/vcpkg.json b/externals/vcpkg/ports/rsasynccpp/vcpkg.json new file mode 100755 index 000000000..b74ead250 --- /dev/null +++ b/externals/vcpkg/ports/rsasynccpp/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "rsasynccpp", + "version": "0.0.7", + "port-version": 1, + "maintainers": "Rene Stein ", + "description": "Task Parallel Library (TPL)/dataflow/actors/async primitives for C++ based on C++ 20 coroutines.", + "homepage": "https://github.com/renestein/Rstein.AsyncCpp", + "supports": "windows & !arm", + "features": { + "lib-cl-win-legacy-await": { + "description": "Legacy coroutines (/await switch, std::experimental namespace)." + } + } +} diff --git a/externals/vcpkg/ports/rsig/portfile.cmake b/externals/vcpkg/ports/rsig/portfile.cmake new file mode 100755 index 000000000..cf1449860 --- /dev/null +++ b/externals/vcpkg/ports/rsig/portfile.cmake @@ -0,0 +1,10 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rioki/rsig + REF v0.1.0 + SHA512 73de6dfe0b18f141a388c9307d8dff9a0709ceb758f58c474a7ddc5d9d77f2f8808fe4d78f3ad88466f81ca61b15ae3504255595d78387b23f87974de46d1d2b + ) + +file(INSTALL ${SOURCE_PATH}/rsig/rsig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/rsig) + +configure_file(${SOURCE_PATH}/README.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/rsig/vcpkg.json b/externals/vcpkg/ports/rsig/vcpkg.json new file mode 100755 index 000000000..1a6f81257 --- /dev/null +++ b/externals/vcpkg/ports/rsig/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "rsig", + "version-semver": "0.1.0", + "description": "rioki's signal library", + "homepage": "https://github.com/rioki/rsig", + "license": "MIT" +} diff --git a/externals/vcpkg/ports/rsm-binary-io/portfile.cmake b/externals/vcpkg/ports/rsm-binary-io/portfile.cmake new file mode 100755 index 000000000..121c06018 --- /dev/null +++ b/externals/vcpkg/ports/rsm-binary-io/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Ryan-rsm-McKenzie/binary_io + REF 2.0.5 + SHA512 787833487b9e2b64aeb73842024a52a6ad646d2609342983ebf1539878b96565bf329c8b05afca0fb35a1e40a91174131ad7a0bdc79b168a12bf02f3d6e0cd6d + HEAD_REF main +) + +if(VCPKG_TARGET_IS_LINUX) + message(WARNING "Build ${PORT} requires at least gcc 10.") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME binary_io + CONFIG_PATH "lib/cmake/binary_io" +) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/rsm-binary-io/vcpkg.json b/externals/vcpkg/ports/rsm-binary-io/vcpkg.json new file mode 100755 index 000000000..1b66d5141 --- /dev/null +++ b/externals/vcpkg/ports/rsm-binary-io/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "rsm-binary-io", + "version-semver": "2.0.5", + "description": "A binary i/o library for C++, without the agonizing pain", + "homepage": "https://github.com/Ryan-rsm-McKenzie/binary_io", + "documentation": "https://ryan-rsm-mckenzie.github.io/binary_io/", + "license": "MIT", + "supports": "!osx & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/rsm-bsa/portfile.cmake b/externals/vcpkg/ports/rsm-bsa/portfile.cmake new file mode 100755 index 000000000..03b46262b --- /dev/null +++ b/externals/vcpkg/ports/rsm-bsa/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Ryan-rsm-McKenzie/bsa + REF 4.0.3 + SHA512 ec8a2aff1c833d7bffd6345ab989bc57137eee3fb2c5b7509027f068783d42d61bcc4b694b53a7961c1c69ee52834efadef9b3c82e1a739c0c5491af75e8dde7 + HEAD_REF master +) + +if (VCPKG_TARGET_IS_LINUX) + message(WARNING "Build ${PORT} requires at least gcc 10.") +endif() + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + xmem BSA_SUPPORT_XMEM +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + ${FEATURE_OPTIONS} +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME bsa + CONFIG_PATH "lib/cmake/bsa" +) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share +) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/rsm-bsa/vcpkg.json b/externals/vcpkg/ports/rsm-bsa/vcpkg.json new file mode 100755 index 000000000..354a0f17d --- /dev/null +++ b/externals/vcpkg/ports/rsm-bsa/vcpkg.json @@ -0,0 +1,36 @@ +{ + "name": "rsm-bsa", + "version-semver": "4.0.3", + "description": "A C++ library for working with the Bethesda archive file format", + "homepage": "https://github.com/Ryan-rsm-McKenzie/bsa", + "documentation": "https://ryan-rsm-mckenzie.github.io/bsa/", + "license": "MIT", + "supports": "!x86 & !osx & !uwp", + "dependencies": [ + { + "name": "directxtex", + "platform": "windows" + }, + "lz4", + "rsm-binary-io", + "rsm-mmio", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "features": { + "xmem": { + "description": "Compression support for the xmem codec", + "supports": "windows", + "dependencies": [ + "reproc" + ] + } + } +} diff --git a/externals/vcpkg/ports/rsm-mmio/portfile.cmake b/externals/vcpkg/ports/rsm-mmio/portfile.cmake new file mode 100755 index 000000000..cec066167 --- /dev/null +++ b/externals/vcpkg/ports/rsm-mmio/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Ryan-rsm-McKenzie/mmio + REF 1.1.0 + SHA512 54c63c345d9e0a284d13078d525fcbe73d793462968121fee89a19c810cdac736aca9c81f4c8b4f5ea51db1c47ad0c55e7cea38772049e4939b0d6e280f9a332 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME "mmio" + CONFIG_PATH "lib/cmake/mmio" +) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/rsm-mmio/vcpkg.json b/externals/vcpkg/ports/rsm-mmio/vcpkg.json new file mode 100755 index 000000000..b88664f9c --- /dev/null +++ b/externals/vcpkg/ports/rsm-mmio/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "rsm-mmio", + "version-semver": "1.1.0", + "port-version": 2, + "description": "A cross-platform memory-mapped io library for C++ ", + "homepage": "https://github.com/Ryan-rsm-McKenzie/mmio", + "supports": "!osx & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/rsocket/fix-cmake-config.patch b/externals/vcpkg/ports/rsocket/fix-cmake-config.patch new file mode 100755 index 000000000..d3bf7b886 --- /dev/null +++ b/externals/vcpkg/ports/rsocket/fix-cmake-config.patch @@ -0,0 +1,26 @@ +diff --git a/cmake/rsocket-config.cmake.in b/cmake/rsocket-config.cmake.in +index d5579a85..ea12752a 100644 +--- a/cmake/rsocket-config.cmake.in ++++ b/cmake/rsocket-config.cmake.in +@@ -4,7 +4,7 @@ + @PACKAGE_INIT@ + + if(NOT TARGET rsocket::ReactiveSocket) +- include("${PACKAGE_PREFIX_DIR}/lib/cmake/rsocket/rsocket-exports.cmake") ++ include("${CMAKE_CURRENT_LIST_DIR}/rsocket-exports.cmake") + endif() + + if (NOT rsocket_FIND_QUIETLY) +diff --git a/yarpl/cmake/yarpl-config.cmake.in b/yarpl/cmake/yarpl-config.cmake.in +index d557b213..1b83fffc 100644 +--- a/yarpl/cmake/yarpl-config.cmake.in ++++ b/yarpl/cmake/yarpl-config.cmake.in +@@ -4,7 +4,7 @@ + @PACKAGE_INIT@ + + if(NOT TARGET yarpl::yarpl) +- include("${PACKAGE_PREFIX_DIR}/lib/cmake/yarpl/yarpl-exports.cmake") ++ include("${CMAKE_CURRENT_LIST_DIR}/yarpl-exports.cmake") + endif() + + set(YARPL_LIBRARIES yarpl::yarpl) diff --git a/externals/vcpkg/ports/rsocket/fix-find-dependencies.patch b/externals/vcpkg/ports/rsocket/fix-find-dependencies.patch new file mode 100755 index 000000000..287a6fa99 --- /dev/null +++ b/externals/vcpkg/ports/rsocket/fix-find-dependencies.patch @@ -0,0 +1,94 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f69e907..22570b5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -124,7 +124,7 @@ option(BUILD_BENCHMARKS "Build benchmarks" ON) + option(BUILD_EXAMPLES "Build examples" ON) + option(BUILD_TESTS "Build tests" ON) + +-enable_testing() ++#enable_testing() + + include(ExternalProject) + include(CTest) +@@ -172,7 +172,9 @@ endif() + + if("${BUILD_TYPE_LOWER}" MATCHES "debug") + message("debug mode was set") ++ if (NOT WIN32) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unreachable-code") ++ endif() + else() + message("release mode was set") + endif() +@@ -181,18 +183,25 @@ if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") + set(TEST_CXX_FLAGS ${TEST_CXX_FLAGS} -Wno-inconsistent-missing-override) + endif() + +-find_library(DOUBLE-CONVERSION double-conversion) ++find_package(double-conversion CONFIG REQUIRED) + + find_package(OpenSSL REQUIRED) + +-find_package(Gflags REQUIRED) ++find_package(gflags CONFIG REQUIRED) + +-# find glog::glog to satisfy the folly dep. +-find_package(Glog REQUIRED) ++find_package(ZLIB REQUIRED) + +-find_package(fmt CONFIG REQUIRED) ++if (BUILD_SHARED_LIBS) ++ set(gflags gflags_shared) ++else() ++ set(gflags gflags_static) ++endif() + +-include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR}) ++# find glog::glog to satisfy the folly dep. ++find_package(folly CONFIG REQUIRED) ++#find_package(glog CONFIG REQUIRED) ++# ++#find_package(fmt CONFIG REQUIRED) + + include_directories(SYSTEM ${GFLAGS_INCLUDE_DIR}) + +@@ -327,7 +336,7 @@ target_compile_options( + ReactiveSocket + PRIVATE ${EXTRA_CXX_FLAGS}) + +-enable_testing() ++#enable_testing() + + install(TARGETS ReactiveSocket EXPORT rsocket-exports DESTINATION lib) + install(DIRECTORY rsocket DESTINATION include FILES_MATCHING PATTERN "*.h") +@@ -470,7 +479,7 @@ if(BUILD_TESTS) + ${GMOCK_LIBS} # This also needs the preceding `add_dependencies` + glog::glog + gflags +- ${DOUBLE-CONVERSION}) ++ double-conversion::double-conversion) + + # Download the latest TCK drivers JAR. + set(TCK_DRIVERS_JAR rsocket-tck-drivers-0.9.10.jar) +diff --git a/yarpl/CMakeLists.txt b/yarpl/CMakeLists.txt +index f4159b8..8c01ffb 100644 +--- a/yarpl/CMakeLists.txt ++++ b/yarpl/CMakeLists.txt +@@ -53,8 +53,14 @@ endif() + # Using NDEBUG in Release builds. + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG") + +-find_package(Gflags REQUIRED) +-find_package(Glog REQUIRED) ++find_package(gflags CONFIG REQUIRED) ++if (BUILD_SHARED_LIBS) ++ set(gflags gflags_shared) ++else() ++ set(gflags gflags_static) ++endif() ++ ++find_package(glog CONFIG REQUIRED) + find_package(fmt CONFIG REQUIRED) + + IF(NOT FOLLY_VERSION) diff --git a/externals/vcpkg/ports/rsocket/fix-folly.patch b/externals/vcpkg/ports/rsocket/fix-folly.patch new file mode 100755 index 000000000..05d003126 --- /dev/null +++ b/externals/vcpkg/ports/rsocket/fix-folly.patch @@ -0,0 +1,13 @@ +diff --git a/rsocket/transports/tcp/TcpConnectionAcceptor.cpp b/rsocket/transports/tcp/TcpConnectionAcceptor.cpp +index 12ac289f..c37f621a 100644 +--- a/rsocket/transports/tcp/TcpConnectionAcceptor.cpp ++++ b/rsocket/transports/tcp/TcpConnectionAcceptor.cpp +@@ -31,7 +31,7 @@ class TcpConnectionAcceptor::SocketCallback + + void connectionAccepted( + folly::NetworkSocket fdNetworkSocket, +- const folly::SocketAddress& address) noexcept override { ++ const folly::SocketAddress& address, AcceptInfo info) noexcept override { + int fd = fdNetworkSocket.toFd(); + + VLOG(2) << "Accepting TCP connection from " << address << " on FD " << fd; diff --git a/externals/vcpkg/ports/rsocket/portfile.cmake b/externals/vcpkg/ports/rsocket/portfile.cmake new file mode 100755 index 000000000..f6ec73c4a --- /dev/null +++ b/externals/vcpkg/ports/rsocket/portfile.cmake @@ -0,0 +1,44 @@ +# yarpl only support static build in Windows +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rsocket/rsocket-cpp + REF 45ed594ebd6701f40795c31ec922d784ec7fc921 + SHA512 51871253524b93a9622fa0f562019605b6034e4089cd955810050b4d43ff020813d632ea1e91bcaca0a8659638908c51df6eb686ba4f6583d4c15c04d5dc35bd + HEAD_REF master + PATCHES + fix-cmake-config.patch + fix-find-dependencies.patch + use-cpp-17.patch + fix-folly.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF + -DBUILD_BENCHMARKS=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME yarpl CONFIG_PATH lib/cmake/yarpl DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/rsocket) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/include/yarpl/perf" + "${CURRENT_PACKAGES_DIR}/include/yarpl/cmake" + "${CURRENT_PACKAGES_DIR}/include/yarpl/test" + "${CURRENT_PACKAGES_DIR}/include/rsocket/examples" + "${CURRENT_PACKAGES_DIR}/include/rsocket/test" +) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/rsocket/use-cpp-17.patch b/externals/vcpkg/ports/rsocket/use-cpp-17.patch new file mode 100755 index 000000000..4ef2f8abd --- /dev/null +++ b/externals/vcpkg/ports/rsocket/use-cpp-17.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 22570b5..15a750b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -154,7 +154,7 @@ if(BUILD_TESTS) + + endif() + +-set(CMAKE_CXX_STANDARD 14) ++set(CMAKE_CXX_STANDARD 17) + + include(CheckCXXCompilerFlag) + diff --git a/externals/vcpkg/ports/rsocket/vcpkg.json b/externals/vcpkg/ports/rsocket/vcpkg.json new file mode 100755 index 000000000..018579f0b --- /dev/null +++ b/externals/vcpkg/ports/rsocket/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "rsocket", + "version-string": "2021.08.30.00", + "port-version": 1, + "description": "C++ implementation of RSocket http://rsocket.io", + "homepage": "https://github.com/rsocket/rsocket-cpp", + "dependencies": [ + "boost-context", + "boost-filesystem", + "boost-program-options", + "boost-regex", + "boost-system", + "boost-thread", + "double-conversion", + "fmt", + "folly", + "gflags", + "glog", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/rtabmap/0001-add-bigobj-for-msvc.patch b/externals/vcpkg/ports/rtabmap/0001-add-bigobj-for-msvc.patch new file mode 100755 index 000000000..ea6c73b84 --- /dev/null +++ b/externals/vcpkg/ports/rtabmap/0001-add-bigobj-for-msvc.patch @@ -0,0 +1,24 @@ +From 37a2b1fe682bcea48cb944762853bec404c9e937 Mon Sep 17 00:00:00 2001 +From: Amin Yahyaabadi +Date: Sun, 6 Feb 2022 12:29:02 -0800 +Subject: [PATCH] add bigobj for msvc + +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5cdae617..ed829a46 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -106,6 +106,7 @@ if(MSVC) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP${N}") + endif() + endif() ++ add_compile_options("/bigobj") + endif() + + # [Eclipse] Automatic Discovery of Include directories (Optional, but handy) +-- +2.35.1.windows.2 + diff --git a/externals/vcpkg/ports/rtabmap/fix-qt.patch b/externals/vcpkg/ports/rtabmap/fix-qt.patch new file mode 100755 index 000000000..e7baa15df --- /dev/null +++ b/externals/vcpkg/ports/rtabmap/fix-qt.patch @@ -0,0 +1,31 @@ +From a9f8c032bb7915c075f0fb32a0bbfa633ca3b388 Mon Sep 17 00:00:00 2001 +Date: Wed, 7 Jul 2021 15:13:43 -0400 +Subject: [PATCH] Fix Qt + +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5cdae617..fe98199b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -966,13 +966,13 @@ IF(ANDROID) + IF(BUILD_APP) + ADD_SUBDIRECTORY( app ) + ENDIF(BUILD_APP) ++ELSEIF(NOT WITH_QT) ++ MESSAGE(WARNING "the GUI lib and the stand-alone application will not be compiled...") + ELSEIF(Qt5_FOUND OR (QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND)) + ADD_SUBDIRECTORY( guilib ) + IF(BUILD_APP) + ADD_SUBDIRECTORY( app ) + ENDIF(BUILD_APP) +-ELSEIF(WITH_QT) +- MESSAGE(WARNING "Qt not found, the GUI lib and the stand-alone application will not be compiled...") + ENDIF() + + IF(BUILD_TOOLS) +-- +2.32.0.windows.1 + diff --git a/externals/vcpkg/ports/rtabmap/portfile.cmake b/externals/vcpkg/ports/rtabmap/portfile.cmake new file mode 100755 index 000000000..1cd6d123f --- /dev/null +++ b/externals/vcpkg/ports/rtabmap/portfile.cmake @@ -0,0 +1,98 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO introlab/rtabmap + REF a921d615c5cb4eb55a8dfc608dae6efde13e9126 + SHA512 7787d5f927f53554cec3044221011cbc78b654c504d96af29947266e25058194923c5463aefde73b93dcfb3930eedf731f6af4d0c311d8f2f0d7be2114393e05 + HEAD_REF master + PATCHES + fix-qt.patch + 0001-add-bigobj-for-msvc.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE + OPTIONS + ${FEATURE_OPTIONS} + -DBUILD_APP=OFF + -DBUILD_EXAMPLES=OFF + -DWITH_QT=OFF + -DWITH_ORB_OCTREE=OFF + -DWITH_TORCH=OFF + -DWITH_PYTHON=OFF + -DWITH_PYTHON_THREADING=OFF + -DWITH_PDAL=OFF + -DWITH_FREENECT=OFF + -DWITH_FREENECT2=OFF + -DWITH_K4W2=OFF + -DWITH_K4A=OFF + -DWITH_OPENNI2=OFF + -DWITH_DC1394=OFF + -DWITH_G2O=OFF + -DWITH_GTSAM=OFF + -DWITH_CERES=OFF + -DWITH_VERTIGO=OFF + -DWITH_CVSBA=OFF + -DWITH_POINTMATCHER=OFF + -DWITH_CCCORELIB=OFF + -DWITH_LOAM=OFF + -DWITH_FLYCAPTURE2=OFF + -DWITH_ZED=OFF + -DWITH_ZEDOC=OFF + -DWITH_REALSENSE=OFF + -DWITH_REALSENSE_SLAM=OFF + -DWITH_REALSENSE2=OFF + -DWITH_MYNTEYE=OFF + -DWITH_DEPTHAI=OFF + -DWITH_OCTOMAP=OFF + -DWITH_CPUTSDF=OFF + -DWITH_OPENCHISEL=OFF + -DWITH_ALICE_VISION=OFF + -DWITH_FOVIS=OFF + -DWITH_VISO2=OFF + -DWITH_DVO=OFF + -DWITH_OKVIS=OFF + -DWITH_MSCKF_VIO=OFF + -DWITH_VINS=OFF + -DWITH_OPENVINS=OFF + -DWITH_MADGWICK=OFF + -DWITH_FASTCV=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH cmake) + +vcpkg_copy_tools(TOOL_NAMES rtabmap-res_tool AUTO_CLEAN) + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES + rtabmap-camera + rtabmap-console + rtabmap-detectMoreLoopClosures + rtabmap-export + rtabmap-extractObject + rtabmap-info + rtabmap-kitti_dataset + rtabmap-recovery + rtabmap-report + rtabmap-reprocess + rtabmap-rgbd_dataset + rtabmap-euroc_dataset + AUTO_CLEAN + ) +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/rtabmap/vcpkg.json b/externals/vcpkg/ports/rtabmap/vcpkg.json new file mode 100755 index 000000000..f92769710 --- /dev/null +++ b/externals/vcpkg/ports/rtabmap/vcpkg.json @@ -0,0 +1,35 @@ +{ + "name": "rtabmap", + "version": "0.20.13", + "port-version": 3, + "description": "Real-Time Appearance-Based Mapping", + "homepage": "https://introlab.github.io/rtabmap/", + "supports": "windows & !static", + "dependencies": [ + "opencv", + { + "name": "pcl", + "default-features": false, + "features": [ + "vtk" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "features": { + "tools": { + "description": "Build tools", + "dependencies": [ + "yaml-cpp" + ] + } + } +} diff --git a/externals/vcpkg/ports/rtaudio/fix-alsa.patch b/externals/vcpkg/ports/rtaudio/fix-alsa.patch new file mode 100755 index 000000000..3953aadae --- /dev/null +++ b/externals/vcpkg/ports/rtaudio/fix-alsa.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a59e8bb..1334f5a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -123,12 +123,12 @@ endif() + # ALSA + if (RTAUDIO_API_ALSA) + set(NEED_PTHREAD ON) +- find_package(ALSA) ++ find_package(ALSA REQUIRED) + if (NOT ALSA_FOUND) + message(FATAL_ERROR "ALSA API requested but no ALSA dev libraries found") + endif() + list(APPEND INCDIRS ${ALSA_INCLUDE_DIR}) +- list(APPEND LINKLIBS ${ALSA_LIBRARY}) ++ list(APPEND LINKLIBS ${ALSA_LIBRARY} dl) + list(APPEND PKGCONFIG_REQUIRES "alsa") + list(APPEND API_DEFS "-D__LINUX_ALSA__") + list(APPEND API_LIST "alsa") diff --git a/externals/vcpkg/ports/rtaudio/portfile.cmake b/externals/vcpkg/ports/rtaudio/portfile.cmake new file mode 100755 index 000000000..3739afc3d --- /dev/null +++ b/externals/vcpkg/ports/rtaudio/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO thestk/rtaudio + REF 46b01b5b134f33d8ddc3dab76829d4b1350e0522 + SHA512 f26f64fe77aa18c9adf401a720fc3d929af8655827f2c149539a1b73736efb3757ac2eaf5a6535a3c801df13e5f49728a49b6ffe5c01c2f91ab23e145bad5355 + HEAD_REF master + PATCHES fix-alsa.patch +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" RTAUDIO_STATIC_MSVCRT) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + asio RTAUDIO_API_ASIO + alsa RTAUDIO_API_ALSA +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DRTAUDIO_STATIC_MSVCRT=${RTAUDIO_STATIC_MSVCRT} + -DRTAUDIO_API_JACK=OFF + -DRTAUDIO_API_PULSE=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/rtaudio/vcpkg.json b/externals/vcpkg/ports/rtaudio/vcpkg.json new file mode 100755 index 000000000..529386ba1 --- /dev/null +++ b/externals/vcpkg/ports/rtaudio/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "rtaudio", + "version-date": "2021-11-16", + "description": "A set of C++ classes that provide a common API for realtime audio input/output across Linux (native ALSA, JACK, PulseAudio and OSS), Macintosh OS X (CoreAudio and JACK), and Windows (DirectSound, ASIO and WASAPI) operating systems.", + "homepage": "https://github.com/thestk/rtaudio", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "alsa": { + "description": "Build ALSA API", + "dependencies": [ + "alsa" + ] + }, + "asio": { + "description": "Build with ASIO backend" + } + } +} diff --git a/externals/vcpkg/ports/rtlsdr/Compile-with-msvc.patch b/externals/vcpkg/ports/rtlsdr/Compile-with-msvc.patch new file mode 100755 index 000000000..5374ed412 --- /dev/null +++ b/externals/vcpkg/ports/rtlsdr/Compile-with-msvc.patch @@ -0,0 +1,88 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2def354..674ff2d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -66,6 +66,12 @@ endif() + ######################################################################## + # Find build dependencies + ######################################################################## ++if(MSVC) ++find_package(pthreads) ++find_package(libusb) ++include_directories(${PThreads4W_INCLUDE_DIR}) ++include_directories(${LIBUSB_INCLUDE_DIRS}) ++else() + if(WIN32 AND NOT MINGW) + set(THREADS_USE_PTHREADS_WIN32 true) + endif() +@@ -79,6 +85,7 @@ endif() + if(NOT THREADS_FOUND) + message(FATAL_ERROR "pthreads(-win32) required to compile rtl-sdr") + endif() ++endif() + + ######################################################################## + # Create uninstall target +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 33faee7..fda4612 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -20,7 +20,11 @@ + ######################################################################## + add_library(rtlsdr SHARED librtlsdr.c + tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) ++if(MSVC) ++target_link_libraries(rtlsdr ${LIBUSB_LIBRARIES}) ++else() + target_link_libraries(rtlsdr PkgConfig::LIBUSB) ++endif() + target_include_directories(rtlsdr PUBLIC + $ + $ # /include +@@ -36,7 +40,11 @@ generate_export_header(rtlsdr) + ######################################################################## + add_library(rtlsdr_static STATIC librtlsdr.c + tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) ++if(MSVC) ++target_link_libraries(rtlsdr_static ${LIBUSB_LIBRARIES}) ++else() + target_link_libraries(rtlsdr_static PkgConfig::LIBUSB) ++endif() + target_include_directories(rtlsdr_static PUBLIC + $ + $ # /include +@@ -58,8 +66,8 @@ IF(MSVC) + ${CMAKE_CURRENT_SOURCE_DIR}/rtlsdr.rc.in + ${CMAKE_CURRENT_BINARY_DIR}/rtlsdr.rc + @ONLY) +- target_sources(rtlsdr ${CMAKE_CURRENT_BINARY_DIR}/rtlsdr.rc) +- target_sources(rtlsdr_static ${CMAKE_CURRENT_BINARY_DIR}/rtlsdr.rc) ++ target_sources(rtlsdr PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/rtlsdr.rc) ++ target_sources(rtlsdr_static PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/rtlsdr.rc) + ENDIF(MSVC) + + ######################################################################## +@@ -77,6 +85,11 @@ add_library(libgetopt_static STATIC + target_link_libraries(convenience_static + rtlsdr + ) ++if(MSVC) ++target_link_libraries(convenience_static ++ ${PThreads4W_LIBRARY} ++) ++endif() + endif() + + ######################################################################## +diff --git a/src/rtl_tcp.c b/src/rtl_tcp.c +index 562198f..b4bfa51 100644 +--- a/src/rtl_tcp.c ++++ b/src/rtl_tcp.c +@@ -35,6 +35,7 @@ + #include + #else + #include ++#include + #include "getopt/getopt.h" + #endif + diff --git a/externals/vcpkg/ports/rtlsdr/Findlibusb.cmake b/externals/vcpkg/ports/rtlsdr/Findlibusb.cmake new file mode 100755 index 000000000..052ae21df --- /dev/null +++ b/externals/vcpkg/ports/rtlsdr/Findlibusb.cmake @@ -0,0 +1,17 @@ +find_path( + LIBUSB_INCLUDE_DIRS + NAMES libusb.h + PATH_SUFFIXES libusb-1.0 +) + +find_library( + LIBUSB_LIBRARIES + NAMES libusb-1.0 +) + +include(FindPackageHandleStandardArgs) + +find_package_handle_standard_args( + LIBUSB + REQUIRED_VARS LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIRS +) diff --git a/externals/vcpkg/ports/rtlsdr/fix-version.patch b/externals/vcpkg/ports/rtlsdr/fix-version.patch new file mode 100755 index 000000000..854a054ab --- /dev/null +++ b/externals/vcpkg/ports/rtlsdr/fix-version.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/modules/Version.cmake b/cmake/modules/Version.cmake +index 2d4e76d..6acffe2 100644 +--- a/cmake/modules/Version.cmake ++++ b/cmake/modules/Version.cmake +@@ -39,7 +39,9 @@ if(GIT_FOUND) + OUTPUT_VARIABLE GIT_DESCRIBE OUTPUT_STRIP_TRAILING_WHITESPACE + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + ) +-else() ++endif() ++ ++if ("${GIT_DESCRIBE}" STREQUAL "") + set(GIT_DESCRIBE "v${MAJOR_VERSION}.${MINOR_VERSION}.x-xxx-xunknown") + endif() + diff --git a/externals/vcpkg/ports/rtlsdr/portfile.cmake b/externals/vcpkg/ports/rtlsdr/portfile.cmake new file mode 100755 index 000000000..472dbe098 --- /dev/null +++ b/externals/vcpkg/ports/rtlsdr/portfile.cmake @@ -0,0 +1,45 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO osmocom/rtl-sdr + REF d794155ba65796a76cd0a436f9709f4601509320 + SHA512 21fe10f1dbecca651650f03d1008560930fac439d220c33b4a23acce98d78d8476ff200765eed8cfa6cddde761d45f7ba36c8b5bc3662aa85819172830ea4938 + HEAD_REF master + PATCHES + Compile-with-msvc.patch + fix-version.patch +) + +file( + COPY ${CMAKE_CURRENT_LIST_DIR}/Findlibusb.cmake + DESTINATION ${SOURCE_PATH}/cmake/Modules +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/rtlsdr) +vcpkg_copy_pdbs() + +file( + INSTALL ${SOURCE_PATH}/COPYING + DESTINATION ${CURRENT_PACKAGES_DIR}/share/rtlsdr + RENAME copyright +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +else() + file(GLOB DEBUG_TOOLS "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") + file(GLOB RELEASE_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*.exe") + file( + INSTALL ${RELEASE_TOOLS} + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT} + ) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + file(REMOVE ${DEBUG_TOOLS} ${RELEASE_TOOLS}) +endif() diff --git a/externals/vcpkg/ports/rtlsdr/vcpkg.json b/externals/vcpkg/ports/rtlsdr/vcpkg.json new file mode 100755 index 000000000..3680d3128 --- /dev/null +++ b/externals/vcpkg/ports/rtlsdr/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "rtlsdr", + "version-date": "2020-04-16", + "port-version": 3, + "description": "rtl-sdr is a library that turns your Realtek RTL2832 based DVB dongle into a SDR receiver", + "homepage": "https://osmocom.org/projects/rtl-sdr", + "supports": "windows & (x86 | x64)", + "dependencies": [ + "libusb", + { + "name": "pthreads", + "platform": "windows" + } + ] +} diff --git a/externals/vcpkg/ports/rtmidi/fix-cmake-usage.patch b/externals/vcpkg/ports/rtmidi/fix-cmake-usage.patch new file mode 100755 index 000000000..8e6c6efee --- /dev/null +++ b/externals/vcpkg/ports/rtmidi/fix-cmake-usage.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 616fdaf..e6af930 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -280,7 +280,7 @@ include(CMakePackageConfigHelpers) + + # Write cmake package version file + write_basic_package_version_file( +- RtMidi-config-version.cmake ++ rtmidi-config-version.cmake + VERSION ${FULL_VER} + COMPATIBILITY SameMajorVersion + ) +@@ -288,15 +288,15 @@ write_basic_package_version_file( + # Write cmake package config file + configure_package_config_file ( + cmake/RtMidi-config.cmake.in +- RtMidi-config.cmake ++ rtmidi-config.cmake + INSTALL_DESTINATION "${RTMIDI_CMAKE_DESTINATION}" + ) + + # Install package files + install ( + FILES +- "${CMAKE_CURRENT_BINARY_DIR}/RtMidi-config.cmake" +- "${CMAKE_CURRENT_BINARY_DIR}/RtMidi-config-version.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/rtmidi-config.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/rtmidi-config-version.cmake" + DESTINATION + "${RTMIDI_CMAKE_DESTINATION}" + ) diff --git a/externals/vcpkg/ports/rtmidi/portfile.cmake b/externals/vcpkg/ports/rtmidi/portfile.cmake new file mode 100755 index 000000000..404a49ebc --- /dev/null +++ b/externals/vcpkg/ports/rtmidi/portfile.cmake @@ -0,0 +1,34 @@ +# Upstream uses CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS, which causes issues +# https://github.com/thestk/rtmidi/blob/4.0.0/CMakeLists.txt#L20 +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO thestk/rtmidi + REF 84a99422a3faf1ab417fe71c0903a48debb9376a # 5.0.0 + SHA512 388e280b7966281e22b0048d6fb2541921df1113d84e49bbc444fff591d2025588edd8d61dbe5ff017afd76c26fd05edc8f9f15d0cce16315ccc15e6aac1d57f + HEAD_REF master + PATCHES fix-cmake-usage.patch # Remove this patch in the next update +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + alsa RTMIDI_API_ALSA +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DRTMIDI_API_JACK=OFF + -DRTMIDI_BUILD_TESTING=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/rtmidi/vcpkg.json b/externals/vcpkg/ports/rtmidi/vcpkg.json new file mode 100755 index 000000000..91979a2d5 --- /dev/null +++ b/externals/vcpkg/ports/rtmidi/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "rtmidi", + "version": "5.0.0", + "port-version": 2, + "description": "A set of C++ classes that provide a common API for realtime MIDI input/output across Linux (ALSA & JACK), Macintosh OS X (CoreMidi & JACK) and Windows (Multimedia)", + "homepage": "https://github.com/thestk/rtmidi", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "alsa": { + "description": "Build ALSA API", + "supports": "linux", + "dependencies": [ + "alsa" + ] + } + } +} diff --git a/externals/vcpkg/ports/rttr/Fix-depends.patch b/externals/vcpkg/ports/rttr/Fix-depends.patch new file mode 100755 index 000000000..8357a47c2 --- /dev/null +++ b/externals/vcpkg/ports/rttr/Fix-depends.patch @@ -0,0 +1,14 @@ +diff --git a/CMake/3rd_party_libs.cmake b/CMake/3rd_party_libs.cmake +index dca5071..4dd4471 100644 +--- a/CMake/3rd_party_libs.cmake ++++ b/CMake/3rd_party_libs.cmake +@@ -51,7 +51,8 @@ if (BUILD_BENCHMARKS) + find_package(Threads REQUIRED) + endif() + +-set(RAPID_JSON_DIR ${RTTR_3RD_PARTY_DIR}/rapidjson-1.1.0) ++find_package(RapidJSON CONFIG REQUIRED) ++set(RAPID_JSON_DIR ${RAPIDJSON_INCLUDE_DIRS}) + set(NONIUS_DIR ${RTTR_3RD_PARTY_DIR}/nonius-1.1.2) + + # Prepare "Catch" library for other executables diff --git a/externals/vcpkg/ports/rttr/fix-directory-output.patch b/externals/vcpkg/ports/rttr/fix-directory-output.patch new file mode 100755 index 000000000..97e47f371 --- /dev/null +++ b/externals/vcpkg/ports/rttr/fix-directory-output.patch @@ -0,0 +1,13 @@ +diff --git a/CMake/config.cmake b/CMake/config.cmake +index a718199..eab64c2 100644 +--- a/CMake/config.cmake ++++ b/CMake/config.cmake +@@ -47,7 +47,7 @@ set(CMAKE_EXECUTABLE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin") + + # here we specify the installation directory + if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) +- set(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/install" CACHE PATH "RTTR install prefix" FORCE) ++ #set(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/install" CACHE PATH "RTTR install prefix") + endif() + + # in order to group in visual studio the targets into solution filters diff --git a/externals/vcpkg/ports/rttr/portfile.cmake b/externals/vcpkg/ports/rttr/portfile.cmake new file mode 100755 index 000000000..9b8f01ca0 --- /dev/null +++ b/externals/vcpkg/ports/rttr/portfile.cmake @@ -0,0 +1,57 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rttrorg/rttr + REF v0.9.6 + SHA512 5c94f037b319568d351ee6d25f1404adce00b40598dce4a331789d5357c059e50aae3894f90e60d37307b7e96f4672ae09d3798bbe47f796ef2044f1ac6f9e50 + HEAD_REF master + PATCHES + fix-directory-output.patch + Fix-depends.patch + remove-owner-read-perms.patch +) + +if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static" AND "${VCPKG_CRT_LINKAGE}" STREQUAL "static") + set(BUILD_STATIC ON) + set(BUILD_RTTR_DYNAMIC OFF) + set(BUILD_WITH_STATIC_RUNTIME_LIBS OFF) +elseif("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "dynamic" AND "${VCPKG_CRT_LINKAGE}" STREQUAL "static") + set(BUILD_STATIC OFF) + set(BUILD_RTTR_DYNAMIC OFF) + set(BUILD_WITH_STATIC_RUNTIME_LIBS ON) +elseif("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "dynamic" AND "${VCPKG_CRT_LINKAGE}" STREQUAL "dynamic") + set(BUILD_STATIC OFF) + set(BUILD_RTTR_DYNAMIC ON) + set(BUILD_WITH_STATIC_RUNTIME_LIBS OFF) +else() + message(FATAL_ERROR "rttr's build system does not support this configuration: VCPKG_LIBRARY_LINKAGE: ${VCPKG_LIBRARY_LINKAGE} VCPKG_CRT_LINKAGE: ${VCPKG_CRT_LINKAGE}") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_BENCHMARKS=OFF + -DBUILD_UNIT_TESTS=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_DOCUMENTATION=OFF + -DBUILD_STATIC=${BUILD_STATIC} + -DBUILD_RTTR_DYNAMIC=${BUILD_RTTR_DYNAMIC} + -DBUILD_WITH_STATIC_RUNTIME_LIBS=${BUILD_WITH_STATIC_RUNTIME_LIBS} +) + +vcpkg_cmake_install() + +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +else() + vcpkg_cmake_config_fixup(CONFIG_PATH share/rttr/cmake) +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/README.md" + "${CURRENT_PACKAGES_DIR}/debug/LICENSE.txt" + "${CURRENT_PACKAGES_DIR}/LICENSE.txt" + "${CURRENT_PACKAGES_DIR}/README.md" +) diff --git a/externals/vcpkg/ports/rttr/remove-owner-read-perms.patch b/externals/vcpkg/ports/rttr/remove-owner-read-perms.patch new file mode 100755 index 000000000..3fc98422d --- /dev/null +++ b/externals/vcpkg/ports/rttr/remove-owner-read-perms.patch @@ -0,0 +1,44 @@ +diff --git a/CMake/config.cmake b/CMake/config.cmake +index 4483900..dfef016 100644 +--- a/CMake/config.cmake ++++ b/CMake/config.cmake +@@ -171,6 +171,5 @@ if (BUILD_INSTALLER) + COMPONENT Devel) + + install(FILES "${LICENSE_FILE}" "${README_FILE}" +- DESTINATION ${RTTR_ADDITIONAL_FILES_INSTALL_DIR} +- PERMISSIONS OWNER_READ) ++ DESTINATION ${RTTR_ADDITIONAL_FILES_INSTALL_DIR}) + endif() +diff --git a/CMake/utility.cmake b/CMake/utility.cmake +index 7e1f677..a3932ae 100644 +--- a/CMake/utility.cmake ++++ b/CMake/utility.cmake +@@ -165,7 +165,7 @@ function(loadFolder FOLDER _HEADER_FILES _SOURCE_FILES) + getNameOfDir(CMAKE_CURRENT_SOURCE_DIR DIRNAME) + if (${shouldInstall}) + if (NOT ${FULL_HEADER_PATH} MATCHES ".*_p.h$") # we don't want to install header files which are marked as private +- install(FILES ${FULL_HEADER_PATH} DESTINATION "include/${DIRNAME}/${REL_PATH}" PERMISSIONS OWNER_READ) ++ install(FILES ${FULL_HEADER_PATH} DESTINATION "include/${DIRNAME}/${REL_PATH}") + endif() + endif() + endforeach() +diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt +index bacb280..a92d642 100644 +--- a/doc/CMakeLists.txt ++++ b/doc/CMakeLists.txt +@@ -132,12 +132,10 @@ set_target_properties(doc PROPERTIES FOLDER "Documentation") + + install(DIRECTORY "${DOXYGEN_OUTPUT_DIRECTORY}/${DOXYGEN_CUSTOM_HTML_DIR}" + DESTINATION "${DOXYGEN_DOC_INSTALL_DIR}" +- PATTERN "*.*" +- PERMISSIONS OWNER_READ) ++ PATTERN "*.*") + + install(FILES "${DOXYGEN_OUTPUT_DIRECTORY}/${DOXYGEN_INDEX_FILE}" +- DESTINATION "${DOXYGEN_DOC_INSTALL_DIR}" +- PERMISSIONS OWNER_READ) ++ DESTINATION "${DOXYGEN_DOC_INSTALL_DIR}") + + ######################################################################################### + diff --git a/externals/vcpkg/ports/rttr/vcpkg.json b/externals/vcpkg/ports/rttr/vcpkg.json new file mode 100755 index 000000000..d1d1389cd --- /dev/null +++ b/externals/vcpkg/ports/rttr/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "rttr", + "version": "0.9.6", + "port-version": 4, + "description": "an easy and intuitive way to use reflection in C++", + "homepage": "https://github.com/rttrorg/rttr", + "license": "MIT", + "supports": "(static & staticcrt) | (!static & staticcrt) | (!static & !staticcrt)", + "dependencies": [ + "rapidjson", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/rxcpp/portfile.cmake b/externals/vcpkg/ports/rxcpp/portfile.cmake new file mode 100755 index 000000000..b98701132 --- /dev/null +++ b/externals/vcpkg/ports/rxcpp/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ReactiveX/RxCpp + REF v4.1.0 + SHA512 a92e817ecbdf6f235cae724ada2615af9fa0c243249625d0f2c2f09ff5dd7f53fdabd03a0278fe2995fe27528c5511d71f87b7a6b3d54f73b49b65aef56e32fd + HEAD_REF master + PATCHES support_find_package.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTS=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT}/cmake/) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(COPY ${SOURCE_PATH}/license.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/license.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) diff --git a/externals/vcpkg/ports/rxcpp/support_find_package.patch b/externals/vcpkg/ports/rxcpp/support_find_package.patch new file mode 100755 index 000000000..bb1da2d2d --- /dev/null +++ b/externals/vcpkg/ports/rxcpp/support_find_package.patch @@ -0,0 +1,32 @@ +diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt +index 3d0744740..293f187c5 100644 +--- a/projects/CMake/CMakeLists.txt ++++ b/projects/CMake/CMakeLists.txt +@@ -146,3 +146,27 @@ set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY TRUE CACHE BOOL "Don't require all project + + install(DIRECTORY ${RXCPP_DIR}/Rx/v2/src/rxcpp/ DESTINATION include/rxcpp + FILES_MATCHING PATTERN "*.hpp") ++ ++# Here we are exporting TARGETS so that other projects can import rxcpp ++# just with find_package(rxcpp CONFIG) after rxcpp is installed into system by "make install". ++add_library(rxcpp INTERFACE) ++ ++target_include_directories(rxcpp INTERFACE ++ $ ++ $ ++) ++ ++install(TARGETS rxcpp EXPORT rxcppConfig) ++install(EXPORT rxcppConfig DESTINATION share/rxcpp/cmake) ++ ++# When find_package(rxcpp SOME_VERSION REQUIRED) will be used in third party project ++# where SOME_VERSION is any version incompatible with ${PROJECT_VERSION} then cmake will generate the error. ++# It means you don't need track versions manually. ++include(CMakePackageConfigHelpers) ++write_basic_package_version_file("${PROJECT_BINARY_DIR}/rxcppConfigVersion.cmake" ++ VERSION ++ ${PROJECT_VERSION} ++ COMPATIBILITY ++ AnyNewerVersion ++) ++install(FILES "${PROJECT_BINARY_DIR}/rxcppConfigVersion.cmake" DESTINATION share/rxcpp/cmake) diff --git a/externals/vcpkg/ports/rxcpp/vcpkg.json b/externals/vcpkg/ports/rxcpp/vcpkg.json new file mode 100755 index 000000000..013aa46a3 --- /dev/null +++ b/externals/vcpkg/ports/rxcpp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "rxcpp", + "version-string": "4.1.0", + "port-version": 2, + "description": "Reactive Extensions for C++", + "homepage": "https://github.com/Reactive-Extensions/RxCpp" +} diff --git a/externals/vcpkg/ports/rxqt/portfile.cmake b/externals/vcpkg/ports/rxqt/portfile.cmake new file mode 100755 index 000000000..34799c346 --- /dev/null +++ b/externals/vcpkg/ports/rxqt/portfile.cmake @@ -0,0 +1,18 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tetsurom/rxqt + REF bb2138c835ef96a53bb79c47fb318237564f9a0c + SHA512 df39f05b0b4fcd950dd39f40b32e20097352a935778af1be077a08644b3562d07dcc77ab658bc45437454372be955a40013570124e86943bb32493c66cdce439 + HEAD_REF master +) + +file(INSTALL + ${SOURCE_PATH}/include + DESTINATION ${CURRENT_PACKAGES_DIR} +) + +file(INSTALL + ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/rxqt RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/rxqt/vcpkg.json b/externals/vcpkg/ports/rxqt/vcpkg.json new file mode 100755 index 000000000..71638f964 --- /dev/null +++ b/externals/vcpkg/ports/rxqt/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "rxqt", + "version-string": "bb2138c", + "port-version": 1, + "description": "The Reactive Extensions for Qt.", + "homepage": "https://github.com/tetsurom/rxqt", + "dependencies": [ + "rxcpp" + ] +} diff --git a/externals/vcpkg/ports/rxspencer/disable-docs-and-tests.patch b/externals/vcpkg/ports/rxspencer/disable-docs-and-tests.patch new file mode 100755 index 000000000..9cacda578 --- /dev/null +++ b/externals/vcpkg/ports/rxspencer/disable-docs-and-tests.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 49faf30..e590001 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,7 +6,7 @@ + project ( rxspencer C ) + cmake_minimum_required ( VERSION 3.0 ) + option ( rxshared "build shared library instead of static" OFF ) +-enable_testing() ++#enable_testing() + + # Define POSIX_MISTAKE to allow unmatched right parentheses as literals, as + # required by POSIX 1003.2. +@@ -47,10 +47,12 @@ install ( TARGETS rxspencer + PUBLIC_HEADER DESTINATION ${RXSPENCER_INCLUDE_DIR} ) + + # Install docs ++if(FALSE) + set ( RXSPENCER_DATA_FILES "COPYRIGHT;README;WHATSNEW" ) + install ( FILES ${RXSPENCER_DATA_FILES} DESTINATION ${RXSPENCER_DATA_DIR} ) + install ( FILES rxspencer.3 DESTINATION ${RXSPENCER_MAN3_DIR} ) + install ( FILES rxspencer.7 DESTINATION ${RXSPENCER_MAN7_DIR} ) ++endif() + + # generate cmake configuration file + include ( CMakePackageConfigHelpers ) +@@ -69,8 +71,9 @@ install ( EXPORT RXSpencerTargets DESTINATION ${CMAKE_CONFIG_DEST} ) + install ( FILES + ${CMAKE_CURRENT_BINARY_DIR}/RXSpencerConfig.cmake + DESTINATION ${CMAKE_CONFIG_DEST} ) +- ++if(FALSE) + add_executable(tester ${RXSPENCER_SRCS} debug.c main.c split.c) + add_test(NAME test1 COMMAND sh -c "./tester -f ${CMAKE_CURRENT_SOURCE_DIR}/tests") + add_test(NAME test2 COMMAND sh -c "./tester -el -f ${CMAKE_CURRENT_SOURCE_DIR}/tests") + add_test(NAME test3 COMMAND sh -c "./tester -er -f ${CMAKE_CURRENT_SOURCE_DIR}/tests") ++endif() diff --git a/externals/vcpkg/ports/rxspencer/portfile.cmake b/externals/vcpkg/ports/rxspencer/portfile.cmake new file mode 100755 index 000000000..4f31d69fb --- /dev/null +++ b/externals/vcpkg/ports/rxspencer/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO garyhouston/rxspencer + REF 9f835b523f1af617ca54e06863a1924c23f6e56a #v3.9.0 + SHA512 fe7721bd4b4e4f7d31fd5a7e42d34d0c9735d062d8b146ee47a25f87c809eead7133265fc37fa958c37bc4ffeaf101d143202080508d98efd160b8fd0a278598 + HEAD_REF master + PATCHES + disable-docs-and-tests.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCMAKE_CONFIG_DEST=share/rxspencer + -Drxshared=${BUILD_SHARED} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH "share/rxspencer") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/regex") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/rxspencer/vcpkg.json b/externals/vcpkg/ports/rxspencer/vcpkg.json new file mode 100755 index 000000000..910ff4279 --- /dev/null +++ b/externals/vcpkg/ports/rxspencer/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "rxspencer", + "version": "3.9.0", + "port-version": 2, + "description": "Henry Spencer's BSD regular expression library.", + "homepage": "https://garyhouston.github.io/regex/", + "license": "MIT AND CC0-1.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/ryml/cmake-fix.patch b/externals/vcpkg/ports/ryml/cmake-fix.patch new file mode 100755 index 000000000..4c973e9fd --- /dev/null +++ b/externals/vcpkg/ports/ryml/cmake-fix.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d18407c..db19e0b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,8 +21,7 @@ option(RYML_DBG "Enable (very verbose) ryml debug prints." OFF) + + #------------------------------------------------------- + +-c4_require_subproject(c4core INCORPORATE +- SUBDIRECTORY ${RYML_EXT_DIR}/c4core) ++find_package(c4core CONFIG REQUIRED) + + c4_add_library(ryml + SOURCES +@@ -54,10 +53,10 @@ c4_add_library(ryml + ryml.natvis + SOURCE_ROOT ${RYML_SRC_DIR} + INC_DIRS ++ $ + $ + $ +- LIBS c4core +- INCORPORATE c4core ++ LIBS c4core::c4core + ) + + if(RYML_WITH_TAB_TOKENS) diff --git a/externals/vcpkg/ports/ryml/portfile.cmake b/externals/vcpkg/ports/ryml/portfile.cmake new file mode 100755 index 000000000..7d650c096 --- /dev/null +++ b/externals/vcpkg/ports/ryml/portfile.cmake @@ -0,0 +1,71 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +# Get rapidyaml src +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO biojppm/rapidyaml + REF 213b201d264139cd1b887790197e08850af628e3 #v0.4.1 + SHA512 f76e3c41284441dc195402fadda5ceb56fd48c7954a24c29457e14d2f1996d46e9cfb01dd366b00c588108777735b7ccc1d68215c6ecc609cc7b805535c77309 + HEAD_REF master + PATCHES cmake-fix.patch +) + +set(CM_COMMIT_HASH fe41e86552046c3df9ba73a40bf3d755df028c1e) + +# Get cmake scripts for rapidyaml +vcpkg_download_distfile( + CMAKE_ARCHIVE + URLS "https://github.com/biojppm/cmake/archive/${CM_COMMIT_HASH}.zip" + FILENAME "cmake-${CM_COMMIT_HASH}.zip" + SHA512 7292f9856d9c41581f2731e73fdf08880e0f4353b757da38a13ec89b62c5c8cb52b9efc1a9ff77336efa0b6809727c17649e607d8ecacc965a9b2a7a49925237 +) + +vcpkg_extract_source_archive( + SOURCE_PATH_CMAKE + ARCHIVE ${CMAKE_ARCHIVE} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/deps" +) + +file(REMOVE_RECURSE "${SOURCE_PATH}/ext/c4core/cmake") +file(RENAME "${SOURCE_PATH_CMAKE}" "${SOURCE_PATH}/ext/c4core/cmake") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + def-callbacks RYML_DEFAULT_CALLBACKS + dbg RYML_DBG +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/ryml") + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ryml) +endif() + +# Move headers and natvis to own dir +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include/ryml") +file(RENAME "${CURRENT_PACKAGES_DIR}/include/ryml.hpp" "${CURRENT_PACKAGES_DIR}/include/ryml/ryml.hpp") +file(RENAME "${CURRENT_PACKAGES_DIR}/include/ryml_std.hpp" "${CURRENT_PACKAGES_DIR}/include/ryml/ryml_std.hpp") +file(RENAME "${CURRENT_PACKAGES_DIR}/include/ryml.natvis" "${CURRENT_PACKAGES_DIR}/include/ryml/ryml.natvis") + +# Fix paths in headers file +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ryml/ryml.hpp" "./c4" "../c4") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ryml/ryml_std.hpp" "./c4" "../c4") + +# Fix paths in config file +file(READ "${CURRENT_PACKAGES_DIR}/share/ryml/rymlConfig.cmake" _contents) +string(REGEX REPLACE [[[ \t\r\n]*"\${PACKAGE_PREFIX_DIR}[\./\\]*"]] [["${PACKAGE_PREFIX_DIR}/../.."]] _contents "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/ryml/rymlConfig.cmake" "${_contents}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/ryml/vcpkg.json b/externals/vcpkg/ports/ryml/vcpkg.json new file mode 100755 index 000000000..8fccd4407 --- /dev/null +++ b/externals/vcpkg/ports/ryml/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "ryml", + "version": "0.4.1", + "description": "Rapid YAML library", + "homepage": "https://github.com/biojppm/rapidyaml", + "license": "MIT", + "dependencies": [ + { + "name": "c4core", + "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "def-callbacks" + ], + "features": { + "dbg": { + "description": "Enable (very verbose) ryml debug prints." + }, + "def-callbacks": { + "description": "Enable ryml's default implementation of callbacks: allocate(), free(), error()" + } + } +} diff --git a/externals/vcpkg/ports/ryu/portfile.cmake b/externals/vcpkg/ports/ryu/portfile.cmake new file mode 100755 index 000000000..c37850966 --- /dev/null +++ b/externals/vcpkg/ports/ryu/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ulfjack/ryu + REF v2.0 + SHA512 88a0cca74a4889e8e579987abdc75a6ac87c1cdae557e5a15c29dbfd65733f9e591d6569e97a9374444918475099087f8056e696a97c9be24e38eb737e2304c2 + HEAD_REF master +) + +vcpkg_find_acquire_program(BAZEL) +get_filename_component(BAZEL_DIR "${BAZEL}" DIRECTORY) +vcpkg_add_to_path(PREPEND ${BAZEL_DIR}) +set(ENV{BAZEL_BIN_PATH} "${BAZEL}") + +if (CMAKE_HOST_WIN32) + set(ENV{BAZEL_VS} $ENV{VSInstallDir}) + set(ENV{BAZEL_VC} $ENV{VCInstallDir}) +endif () + +vcpkg_execute_build_process( + COMMAND ${BAZEL} build --verbose_failures --strategy=CppCompile=standalone //ryu //ryu:ryu_printf + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME build-${TARGET_TRIPLET}-rel + ) + +if (CMAKE_HOST_WIN32) + file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) + file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) + file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu_printf.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) + file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu_printf.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) +else() + file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu.a DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) + file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) + file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu_printf.a DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) + file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu_printf.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) +endif() + +file(INSTALL ${SOURCE_PATH}/LICENSE-Boost DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/ryu/ryu.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/ryu/) +file(INSTALL ${SOURCE_PATH}/ryu/ryu2.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/ryu/) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/ryuConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/externals/vcpkg/ports/ryu/ryuConfig.cmake b/externals/vcpkg/ports/ryu/ryuConfig.cmake new file mode 100755 index 000000000..76e489d19 --- /dev/null +++ b/externals/vcpkg/ports/ryu/ryuConfig.cmake @@ -0,0 +1,26 @@ +function(set_library_target NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR) + add_library(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED) + set_target_properties(${NAMESPACE}::${LIB_NAME} PROPERTIES + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}" + IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}" + INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}" + ) + set(${NAMESPACE}_${LIB_NAME}_FOUND 1) +endfunction() + +get_filename_component(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(ROOT "${ROOT}" PATH) +get_filename_component(ROOT "${ROOT}" PATH) + +if (TRUE) +find_library(RYU_RELEASE_LIB ryu PATHS "${ROOT}/lib" NO_DEFAULT_PATH) +find_library(RYU_DEBUG_LIB ryu PATHS "${ROOT}/debug/lib" NO_DEFAULT_PATH) +find_library(RYUPF_RELEASE_LIB ryu_printf PATHS "${ROOT}/lib" NO_DEFAULT_PATH) +find_library(RYUPF_DEBUG_LIB ryu_printf PATHS "${ROOT}/debug/lib" NO_DEFAULT_PATH) +set_library_target("RYU" "ryu" "${RYU_DEBUG_LIB}" "${RYU_RELEASE_LIB}" "${ROOT}/include/") +set_library_target("RYU" "ryu_printf" "${RYUPF_DEBUG_LIB}" "${RYUPF_RELEASE_LIB}" "${ROOT}/include/") +else() +set_library_target("RYU" "ryu" "${ROOT}/debug/lib/libryu.a" "${ROOT}/lib/libryu.a" "${ROOT}/include/") +set_library_target("RYU" "ryu_printf" "${ROOT}/debug/lib/libryu_printf.a" "${ROOT}/lib/libryu_printf.a" "${ROOT}/include/") +endif() diff --git a/externals/vcpkg/ports/ryu/vcpkg.json b/externals/vcpkg/ports/ryu/vcpkg.json new file mode 100755 index 000000000..19096019b --- /dev/null +++ b/externals/vcpkg/ports/ryu/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "ryu", + "version": "2.0", + "port-version": 6, + "description": "Ryu generates the shortest decimal representation of a floating point number that maintains round-trip safety.", + "homepage": "https://github.com/ulfjack/ryu", + "supports": "!(uwp | arm | x86)" +} diff --git a/externals/vcpkg/ports/s2geometry/CMakeLists.txt.patch b/externals/vcpkg/ports/s2geometry/CMakeLists.txt.patch new file mode 100755 index 000000000..262b0bcd0 --- /dev/null +++ b/externals/vcpkg/ports/s2geometry/CMakeLists.txt.patch @@ -0,0 +1,118 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5ecd280..9859890 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,16 +20,8 @@ set(CMAKE_CXX_EXTENSIONS OFF) + + list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/third_party/cmake") + +-option(WITH_GFLAGS "Use gflags to change command line flags." OFF) +-add_feature_info(GFLAGS WITH_GFLAGS +- "allows changing command line flags.") + +-# glog option can only be turned on if gflags is on. +-cmake_dependent_option(WITH_GLOG "Use glog for logging." ON +- "WITH_GFLAGS" OFF) +-add_feature_info(GLOG WITH_GLOG "provides logging configurability.") +- +-option(BUILD_SHARED_LIBS "Build shared libraries instead of static." ON) ++option(BUILD_SHARED_LIBS "Build shared libraries instead of static." OFF) + add_feature_info(SHARED_LIBS BUILD_SHARED_LIBS + "builds shared libraries instead of static.") + +@@ -37,26 +29,19 @@ option(BUILD_EXAMPLES "Build s2 documentation examples." ON) + + feature_summary(WHAT ALL) + +-if (WITH_GLOG) +- find_package(Glog REQUIRED) +- # FindGFlags.cmake and FindGlog.cmake do not seem to implement REQUIRED; +- # check manually. +- if (NOT ${GLOG_FOUND}) +- message(FATAL_ERROR "Glog requested but not found") +- endif() +- add_definitions(-DS2_USE_GLOG) +-else() +- # Don't output anything for LOG(INFO). +- add_definitions(-DABSL_MIN_LOG_LEVEL=1) ++find_package(glog CONFIG REQUIRED) ++# FindGFlags.cmake and FindGlog.cmake do not seem to implement REQUIRED; ++# check manually. ++if (NOT ${GLOG_FOUND}) ++ message(FATAL_ERROR "Glog requested but not found") + endif() ++add_definitions(-DS2_USE_GLOG) + +-if (WITH_GFLAGS) +- find_package(GFlags REQUIRED) +- if (NOT ${GFLAGS_FOUND}) +- message(FATAL_ERROR "GFlags requested but not found") +- endif() +- add_definitions(-DS2_USE_GFLAGS) ++find_package(gflags CONFIG REQUIRED) ++if (NOT ${GFLAGS_FOUND}) ++ message(FATAL_ERROR "GFlags requested but not found") + endif() ++add_definitions(-DS2_USE_GFLAGS) + + find_package(OpenSSL REQUIRED) + # pthreads isn't used directly, but this is still required for std::thread. +@@ -204,14 +189,18 @@ add_library(s2testing STATIC + src/s2/s2testing.cc) + target_link_libraries( + s2 +- ${GFLAGS_LIBRARIES} ${GLOG_LIBRARIES} ${OPENSSL_LIBRARIES} ++ gflags::gflags glog::glog OpenSSL::SSL OpenSSL::Crypto + ${CMAKE_THREAD_LIBS_INIT}) + + # Allow other CMake projects to use this one with: + # list(APPEND CMAKE_MODULE_PATH "/third_party/cmake") + # add_subdirectory( s2geometry) + # target_link_libraries( s2) +-target_include_directories(s2 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src) ++target_include_directories(s2 PUBLIC ++ $ ++ $ ++) ++ + + # We don't need to install all headers, only those + # transitively included by s2 headers we are exporting. +@@ -407,7 +396,18 @@ install(FILES src/s2/util/math/mathutil.h + install(FILES src/s2/util/units/length-units.h + src/s2/util/units/physical-units.h + DESTINATION include/s2/util/units) +-install(TARGETS s2 s2testing DESTINATION lib) ++ install(TARGETS s2 s2testing ++ RUNTIME DESTINATION bin ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib) ++install(TARGETS s2 ++ EXPORT unofficial-s2Targets ++ ) ++install(EXPORT unofficial-s2Targets ++ NAMESPACE unofficial-s2 ++ FILE unofficial-s2Targets.cmake ++ DESTINATION share/unofficial-s2/ ++) + + message("GTEST_ROOT: ${GTEST_ROOT}") + if (GTEST_ROOT) +@@ -534,3 +534,17 @@ endif() + if (${SWIG_FOUND} AND ${PYTHONLIBS_FOUND}) + add_subdirectory("src/python" python) + endif() ++ ++ ++include(CMakePackageConfigHelpers) ++# generate the config file that is includes the exports ++configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in ++ "${CMAKE_CURRENT_BINARY_DIR}/unofficial-s2Config.cmake" ++ INSTALL_DESTINATION "share/unofficial-s2/" ++ NO_SET_AND_CHECK_MACRO ++ NO_CHECK_REQUIRED_COMPONENTS_MACRO ++ ) ++ install(FILES ++ ${CMAKE_CURRENT_BINARY_DIR}/unofficial-s2Config.cmake ++ DESTINATION "share/unofficial-s2/" ++ ) diff --git a/externals/vcpkg/ports/s2geometry/Config.cmake.in.patch b/externals/vcpkg/ports/s2geometry/Config.cmake.in.patch new file mode 100755 index 000000000..30162e6b9 --- /dev/null +++ b/externals/vcpkg/ports/s2geometry/Config.cmake.in.patch @@ -0,0 +1,9 @@ +diff --git a/Config.cmake.in b/Config.cmake.in +new file mode 100644 +index 0000000..42bcf00 +--- /dev/null ++++ b/Config.cmake.in +@@ -0,0 +1,3 @@ ++@PACKAGE_INIT@ ++ ++include ( "${CMAKE_CURRENT_LIST_DIR}/unofficial-s2Targets.cmake" ) diff --git a/externals/vcpkg/ports/s2geometry/portfile.cmake b/externals/vcpkg/ports/s2geometry/portfile.cmake new file mode 100755 index 000000000..8eeeccaf1 --- /dev/null +++ b/externals/vcpkg/ports/s2geometry/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/s2geometry + REF v0.9.0 + SHA512 854ec84a54aff036b3092a6233be0f5fc0e4846ac5f882326bbb3f2b9ce88bd5c866a80ae352d8e7d5ae00b9c9a8ab1cff6a95412f990b7bc1fdc5ca3d632b9c + HEAD_REF main + PATCHES + CMakeLists.txt.patch + Config.cmake.in.patch +) + + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTING=OFF + MAYBE_UNUSED_VARIABLES BUILD_TESTING +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/s2geometry/" RENAME copyright) +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/s2geometry/") diff --git a/externals/vcpkg/ports/s2geometry/usage b/externals/vcpkg/ports/s2geometry/usage new file mode 100755 index 000000000..314384460 --- /dev/null +++ b/externals/vcpkg/ports/s2geometry/usage @@ -0,0 +1,4 @@ +The package s2geometry provides CMake targets: + + find_package(unofficial-s2 CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial-s2::s2) diff --git a/externals/vcpkg/ports/s2geometry/vcpkg.json b/externals/vcpkg/ports/s2geometry/vcpkg.json new file mode 100755 index 000000000..e6f274b11 --- /dev/null +++ b/externals/vcpkg/ports/s2geometry/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "s2geometry", + "version": "0.9.0", + "port-version": 1, + "description": "S2 is a library for spherical geometry that aims to have the same robustness, flexibility, and performance as the very best planar geometry libraries.", + "homepage": "https://s2geometry.io", + "supports": "!windows", + "dependencies": [ + "gflags", + "glog", + "gtest", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/s2n/fix-cmake-target-path.patch b/externals/vcpkg/ports/s2n/fix-cmake-target-path.patch new file mode 100755 index 000000000..f83ac21e6 --- /dev/null +++ b/externals/vcpkg/ports/s2n/fix-cmake-target-path.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 132f414..c7cfb5f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -503,7 +503,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/${TARGET_DIR}" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/s2n-config.cmake b/cmake/s2n-config.cmake +index 09d1c3a..4e76ed6 100644 +--- a/cmake/s2n-config.cmake ++++ b/cmake/s2n-config.cmake +@@ -8,9 +8,5 @@ endif() + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules") + find_dependency(LibCrypto) + +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else() +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) + diff --git a/externals/vcpkg/ports/s2n/portfile.cmake b/externals/vcpkg/ports/s2n/portfile.cmake new file mode 100755 index 000000000..4ad9e76ce --- /dev/null +++ b/externals/vcpkg/ports/s2n/portfile.cmake @@ -0,0 +1,48 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO aws/s2n-tls + REF 36c3dc72ab1359cf721294e1258dfdc2962f3ffc # v1.3.5 + SHA512 2c9eed12e90e5fc987758635fec4a7418c20d25c724cfa391090b06bfcc4eb5925b4011d51a99e7c7ab80f535684ee3934ba4734b7966edd323bf88bc5953d7c + PATCHES + fix-cmake-target-path.patch + use-openssl-crypto.patch + remove-trycompile.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tests BUILD_TESTING +) + +set(EXTRA_ARGS) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32") + set(EXTRA_ARGS "-DS2N_NO_PQ=TRUE") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${EXTRA_ARGS} + ${FEATURE_OPTIONS} + -DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/s2n/cmake) + +if(BUILD_TESTING) + message(STATUS Testing) + vcpkg_cmake_build(TARGET test LOGFILE_BASE test) +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/s2n" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/lib/s2n" + "${CURRENT_PACKAGES_DIR}/share/s2n/modules" +) + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/s2n/remove-trycompile.patch b/externals/vcpkg/ports/s2n/remove-trycompile.patch new file mode 100755 index 000000000..bf5582e39 --- /dev/null +++ b/externals/vcpkg/ports/s2n/remove-trycompile.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt (revision 86c857094a2d94fafce15a3d32abb4052e664c5c) ++++ b/CMakeLists.txt (date 1643340236796) +@@ -409,32 +409,6 @@ + endif() + endif() + +-# Determine if EVP_md5_sha1 is available in libcrypto +-try_compile( +- LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH +- ${CMAKE_BINARY_DIR} +- SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_md5_sha1.c" +- LINK_LIBRARIES crypto ${OS_LIBS} +- CMAKE_FLAGS +- "-DINCLUDE_DIRECTORIES=$" +-) +-if (LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH) +- target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH) +-endif() +- +-# Determine if EVP_MD_CTX_set_pkey_ctx is available in libcrypto +-try_compile( +- LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX +- ${CMAKE_BINARY_DIR} +- SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_md_ctx_set_pkey_ctx.c" +- LINK_LIBRARIES crypto ${OS_LIBS} +- CMAKE_FLAGS +- "-DINCLUDE_DIRECTORIES=$" +-) +-if (LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX) +- target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX) +-endif() +- + if (S2N_INTERN_LIBCRYPTO) + if (NOT LibCrypto_STATIC_LIBRARY) + message(FATAL_ERROR "libcrypto interning requires a static build of libcrypto.a to be available") diff --git a/externals/vcpkg/ports/s2n/use-openssl-crypto.patch b/externals/vcpkg/ports/s2n/use-openssl-crypto.patch new file mode 100755 index 000000000..75c6885bc --- /dev/null +++ b/externals/vcpkg/ports/s2n/use-openssl-crypto.patch @@ -0,0 +1,70 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index edbf248..2992a05 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -400,7 +400,7 @@ endif() + set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) + + if (SEARCH_LIBCRYPTO) +- find_package(LibCrypto REQUIRED) ++ find_package(OpenSSL COMPONENTS Crypto REQUIRED) + else() + if (TARGET crypto) + message(STATUS "S2N found target: crypto") +@@ -465,7 +465,7 @@ if (S2N_INTERN_LIBCRYPTO) + ) + endif() + else() +- target_link_libraries(${PROJECT_NAME} PUBLIC crypto) ++ target_link_libraries(${PROJECT_NAME} PUBLIC OpenSSL::Crypto) + endif() + + target_link_libraries(${PROJECT_NAME} PUBLIC ${OS_LIBS} m) +@@ -473,7 +473,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC ${OS_LIBS} m) + target_include_directories(${PROJECT_NAME} PUBLIC $) + target_include_directories(${PROJECT_NAME} PUBLIC $ $) + +-target_include_directories(${PROJECT_NAME} PRIVATE $) ++target_include_directories(${PROJECT_NAME} PRIVATE $) + + if (BUILD_TESTING) + enable_testing() +@@ -485,7 +485,7 @@ if (BUILD_TESTING) + target_include_directories(testss2n PUBLIC tests) + target_compile_options(testss2n PRIVATE -std=gnu99) + target_link_libraries(testss2n PUBLIC ${PROJECT_NAME}) +- target_include_directories(testss2n PUBLIC $) ++ target_include_directories(testss2n PUBLIC $) + + if (S2N_INTERN_LIBCRYPTO) + # if libcrypto was interned, rewrite libcrypto symbols so use of internal functions will link correctly +@@ -536,13 +536,13 @@ if (BUILD_TESTING) + + add_executable(s2nc "bin/s2nc.c" "bin/echo.c" "bin/https.c" "bin/common.c") + target_link_libraries(s2nc ${PROJECT_NAME}) +- target_include_directories(s2nc PRIVATE $) ++ target_include_directories(s2nc PRIVATE $) + target_include_directories(s2nc PRIVATE api) + target_compile_options(s2nc PRIVATE -std=gnu99 -D_POSIX_C_SOURCE=200112L) + + add_executable(s2nd "bin/s2nd.c" "bin/echo.c" "bin/https.c" "bin/common.c") + target_link_libraries(s2nd ${PROJECT_NAME}) +- target_include_directories(s2nd PRIVATE $) ++ target_include_directories(s2nd PRIVATE $) + target_include_directories(s2nd PRIVATE api) + target_compile_options(s2nd PRIVATE -std=gnu99 -D_POSIX_C_SOURCE=200112L) + +diff --git a/cmake/s2n-config.cmake b/cmake/s2n-config.cmake +index 4e76ed6..f714df0 100644 +--- a/cmake/s2n-config.cmake ++++ b/cmake/s2n-config.cmake +@@ -5,8 +5,7 @@ if (NOT MSVC) + find_package(Threads REQUIRED) + endif() + +-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules") +-find_dependency(LibCrypto) ++find_dependency(OpenSSL COMPONENTS Crypto) + + include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) + diff --git a/externals/vcpkg/ports/s2n/vcpkg.json b/externals/vcpkg/ports/s2n/vcpkg.json new file mode 100755 index 000000000..826420429 --- /dev/null +++ b/externals/vcpkg/ports/s2n/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "s2n", + "version": "1.3.5", + "description": "C99 implementation of the TLS/SSL protocols.", + "homepage": "https://github.com/aws/s2n-tls", + "supports": "!uwp & !windows", + "dependencies": [ + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tests": { + "description": "Build and run the tests" + } + } +} diff --git a/externals/vcpkg/ports/safeint/portfile.cmake b/externals/vcpkg/ports/safeint/portfile.cmake new file mode 100755 index 000000000..298dd559f --- /dev/null +++ b/externals/vcpkg/ports/safeint/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO dcleblanc/SafeInt + REF 3.0.26 + SHA512 fc58c244d8d4999ccfb89bcc214646d27238fd2e4e3081accb937276ebd3010807548576f6db1baf08878175133f4f6925773b4376df7669b65ed5c1e6572e26 + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/SafeInt.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/safeint/vcpkg.json b/externals/vcpkg/ports/safeint/vcpkg.json new file mode 100755 index 000000000..aa544da3b --- /dev/null +++ b/externals/vcpkg/ports/safeint/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "safeint", + "version": "3.0.26", + "description": "SafeInt is a class library for C++ that manages integer overflows", + "homepage": "https://github.com/dcleblanc/SafeInt" +} diff --git a/externals/vcpkg/ports/sail/portfile.cmake b/externals/vcpkg/ports/sail/portfile.cmake new file mode 100755 index 000000000..8d7c58689 --- /dev/null +++ b/externals/vcpkg/ports/sail/portfile.cmake @@ -0,0 +1,48 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO HappySeaFox/sail + REF v0.9.0-pre21 + SHA512 51c23792d18b28520d04d7a097a6d46521d12107919ff76a7ff270a518beb862e4a1df89f3effb945ff908c39336bd60c5f118d6db80baf50005c05f55d2d96f + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + + OPTIONS + -DSAIL_COMBINE_CODECS=ON + -DSAIL_BUILD_APPS=OFF + -DSAIL_BUILD_EXAMPLES=OFF + -DSAIL_BUILD_TESTS=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +# Remove duplicate files +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share) + +# Move cmake configs +vcpkg_cmake_config_fixup(PACKAGE_NAME sail CONFIG_PATH lib/cmake/sail DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME sailcodecs CONFIG_PATH lib/cmake/sailcodecs DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME sailcommon CONFIG_PATH lib/cmake/sailcommon DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME sailc++ CONFIG_PATH lib/cmake/sailc++ DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME sailmanip CONFIG_PATH lib/cmake/sailmanip DO_NOT_DELETE_PARENT_CONFIG_PATH) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" + "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") + + +# Fix pkg-config files +vcpkg_fixup_pkgconfig() + +# Unused because SAIL_COMBINE_CODECS is On +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sail/sail-common/config.h" "#define SAIL_CODECS_PATH \"${CURRENT_PACKAGES_DIR}/lib/sail/codecs\"" "") + +# Handle usage +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/sail/usage b/externals/vcpkg/ports/sail/usage new file mode 100755 index 000000000..bf901e2e8 --- /dev/null +++ b/externals/vcpkg/ports/sail/usage @@ -0,0 +1,11 @@ +The package sail provides CMake targets: + +C libraries: + + find_package(Sail CONFIG REQUIRED) + target_link_libraries(main PRIVATE SAIL::sail) + +C++ bindings: + + find_package(SailC++ CONFIG REQUIRED) + target_link_libraries(main PRIVATE SAIL::sail-c++) diff --git a/externals/vcpkg/ports/sail/vcpkg.json b/externals/vcpkg/ports/sail/vcpkg.json new file mode 100755 index 000000000..fade1e924 --- /dev/null +++ b/externals/vcpkg/ports/sail/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "sail", + "version-semver": "0.9.0-pre21", + "description": "The missing small and fast image decoding library for humans (not for machines)", + "homepage": "https://github.com/HappySeaFox/sail", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + "giflib", + "jasper", + "libavif", + "libjpeg-turbo", + "libpng", + "libwebp", + "tiff", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/sais/portfile.cmake b/externals/vcpkg/ports/sais/portfile.cmake new file mode 100755 index 000000000..5c0a0891a --- /dev/null +++ b/externals/vcpkg/ports/sais/portfile.cmake @@ -0,0 +1,27 @@ + +vcpkg_download_distfile(ARCHIVE + URLS "https://sites.google.com/site/yuta256/sais-2.4.1.zip" + FILENAME "sais-2.4.1.zip" + SHA512 6f6dd11f842f680bebc1d9b7f6b75752c9589c600fdd5e6373bb7290a686f1de35d4cc3226347e717f89a295363f7fee0ae8b1aa05ad341f4c2ea056fb5b1425 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_SAIS64=ON +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/sais/vcpkg.json b/externals/vcpkg/ports/sais/vcpkg.json new file mode 100755 index 000000000..7b0edbadd --- /dev/null +++ b/externals/vcpkg/ports/sais/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "sais", + "version-string": "2.4.1", + "port-version": 3, + "description": "An implementation of the induced sorting algorithm" +} diff --git a/externals/vcpkg/ports/sajson/CMakeLists.txt b/externals/vcpkg/ports/sajson/CMakeLists.txt new file mode 100755 index 000000000..da8327003 --- /dev/null +++ b/externals/vcpkg/ports/sajson/CMakeLists.txt @@ -0,0 +1,26 @@ +cmake_minimum_required(VERSION 3.8) + +project(sajson) + +add_library(sajson INTERFACE) + +target_compile_features(sajson INTERFACE cxx_std_11) + +target_include_directories(sajson INTERFACE + $ + $) + +install(DIRECTORY include/ + DESTINATION include + USE_SOURCE_PERMISSIONS + FILES_MATCHING PATTERN "*.h" + ) + +install(TARGETS sajson EXPORT unofficial-sajson-config) + +install(EXPORT unofficial-sajson-config + FILE unofficial-sajson-config.cmake + NAMESPACE unofficial::sajson:: + DESTINATION share/cmake/unofficial-sajson + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +) diff --git a/externals/vcpkg/ports/sajson/portfile.cmake b/externals/vcpkg/ports/sajson/portfile.cmake new file mode 100755 index 000000000..4fd0cac33 --- /dev/null +++ b/externals/vcpkg/ports/sajson/portfile.cmake @@ -0,0 +1,25 @@ +# Header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO chadaustin/sajson + REF 2dcfd350586375f9910f74821d4f07d67ae455ba + SHA512 6029a640f8bd6c7cefc507819a18a708f6d7e9ce84fdd2998506cea26d597b999d2776a7307908f5df02994bc53c3c9bdf6a73344ab70ee6a5c775b54351e7d2 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/unofficial-sajson TARGET_PATH share/unofficial-sajson) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/sajson/copyright COPYONLY) diff --git a/externals/vcpkg/ports/sajson/vcpkg.json b/externals/vcpkg/ports/sajson/vcpkg.json new file mode 100755 index 000000000..2cde87c54 --- /dev/null +++ b/externals/vcpkg/ports/sajson/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "sajson", + "version-string": "2018-09-21", + "port-version": 1, + "description": "Lightweight, extremely high-performance JSON parser for C++11" +} diff --git a/externals/vcpkg/ports/sassc/portfile.cmake b/externals/vcpkg/ports/sassc/portfile.cmake new file mode 100755 index 000000000..45982e835 --- /dev/null +++ b/externals/vcpkg/ports/sassc/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sass/sassc + REF 3.6.2 + SHA512 fff3995ce8608bdaed5f4f1352ae4f1f882de58663b932c598d6168df421e4dbf907ec0f8caebb1e56490a71ca11105726f291b475816dd53e705bc53121969f + HEAD_REF master + PATCHES remove_compiler_flags.patch +) + +find_library(LIBSASS_DEBUG sass PATHS "${CURRENT_INSTALLED_DIR}/debug/lib/" NO_DEFAULT_PATH) +find_library(LIBSASS_RELEASE sass PATHS "${CURRENT_INSTALLED_DIR}/lib/" NO_DEFAULT_PATH) +if(VCPKG_TARGET_IS_WINDOWS) + set(ENV{LIBS} "$ENV{LIBS} -lgetopt") +endif() +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + --with-libsass-include='${CURRENT_INSTALLED_DIR}/include' + OPTIONS_DEBUG + --with-libsass-lib='${LIBSASS_DEBUG}' + OPTIONS_RELEASE + --with-libsass-lib='${LIBSASS_RELEASE}' +) +vcpkg_install_make(MAKEFILE GNUmakefile) +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) \ No newline at end of file diff --git a/externals/vcpkg/ports/sassc/remove_compiler_flags.patch b/externals/vcpkg/ports/sassc/remove_compiler_flags.patch new file mode 100755 index 000000000..c5f644276 --- /dev/null +++ b/externals/vcpkg/ports/sassc/remove_compiler_flags.patch @@ -0,0 +1,12 @@ +diff --git a/GNUmakefile.am b/GNUmakefile.am +index 58e8aecd1..da6a7db98 100644 +--- a/GNUmakefile.am ++++ b/GNUmakefile.am +@@ -1,6 +1,6 @@ + ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 -I script + +-AM_COPT = -Wall -O2 ++AM_COPT = + AM_COVLDFLAGS = + + if ENABLE_COVERAGE diff --git a/externals/vcpkg/ports/sassc/vcpkg.json b/externals/vcpkg/ports/sassc/vcpkg.json new file mode 100755 index 000000000..84158ee4d --- /dev/null +++ b/externals/vcpkg/ports/sassc/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "sassc", + "version": "3.6.2", + "description": "SassC is a wrapper around libsass (http://github.com/sass/libsass) used to generate a useful command-line application that can be installed and packaged for several operating systems.", + "homepage": "https://github.com/sass/sassc", + "dependencies": [ + "getopt", + "libsass" + ] +} diff --git a/externals/vcpkg/ports/sbp/portfile.cmake b/externals/vcpkg/ports/sbp/portfile.cmake new file mode 100755 index 000000000..d345735fc --- /dev/null +++ b/externals/vcpkg/ports/sbp/portfile.cmake @@ -0,0 +1,45 @@ +# Windows shared libraries are not supported yet +# See https://github.com/swift-nav/libsbp/issues/1062 +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO swift-nav/libsbp + REF v3.4.10 + SHA512 bbdcefad9ff8995759b577790bcffb94355bd0ee29f259fa8d51f54907e252b55871dc5a841e21d23e661fd5b33109761eb20b66c2fb73e9e7de8a34cc8d6528 + HEAD_REF master + PATCHES + "win32-install-fix.patch" +) + +vcpkg_from_github( + OUT_SOURCE_PATH CMAKE_EXTRA_MODS + REPO swift-nav/cmake + REF 373d4fcafbbc0c208dc9ecb278d36ed8c9448eda + SHA512 afefc8c7a3fb43ee65b9b8733968a5836938460abbf1bc9e8330f83c3ac4a5819f71a36dcb034004296161c592f4d61545ba10016d6666e7eaf1dca556d99e2e + HEAD_REF master +) + +# Copy cmake files to expected location +file(INSTALL "${CMAKE_EXTRA_MODS}/CCache.cmake" DESTINATION "${SOURCE_PATH}/c/cmake/common") +file(INSTALL "${CMAKE_EXTRA_MODS}/SwiftCmakeOptions.cmake" DESTINATION "${SOURCE_PATH}/c/cmake/common") +file(INSTALL "${CMAKE_EXTRA_MODS}/CompileOptions.cmake" DESTINATION "${SOURCE_PATH}/c/cmake/common") +file(INSTALL "${CMAKE_EXTRA_MODS}/LanguageStandards.cmake" DESTINATION "${SOURCE_PATH}/c/cmake/common") +file(INSTALL "${CMAKE_EXTRA_MODS}/ClangFormat.cmake" DESTINATION "${SOURCE_PATH}/c/cmake/common") +file(INSTALL "${CMAKE_EXTRA_MODS}/ClangTidy.cmake" DESTINATION "${SOURCE_PATH}/c/cmake/common") +file(INSTALL "${CMAKE_EXTRA_MODS}/CodeCoverage.cmake" DESTINATION "${SOURCE_PATH}/c/cmake/common") +file(INSTALL "${CMAKE_EXTRA_MODS}/TestTargets.cmake" DESTINATION "${SOURCE_PATH}/c/cmake/common") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/c" + OPTIONS + -Dlibsbp_ENABLE_TESTS=OFF + -Dlibsbp_ENABLE_DOCS=OFF +) + +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/externals/vcpkg/ports/sbp/vcpkg.json b/externals/vcpkg/ports/sbp/vcpkg.json new file mode 100755 index 000000000..ca94345d4 --- /dev/null +++ b/externals/vcpkg/ports/sbp/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "sbp", + "version-semver": "3.4.10", + "port-version": 1, + "description": "Swift Navigation Binary Protocol (SBP) is a binary protocol for communicating GNSS data used by Piksi devices.", + "homepage": "https://github.com/swift-nav/libsbp", + "documentation": "https://support.swiftnav.com/support/solutions/articles/44001850782-swift-binary-protocol", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/sbp/win32-install-fix.patch b/externals/vcpkg/ports/sbp/win32-install-fix.patch new file mode 100755 index 000000000..5c880d381 --- /dev/null +++ b/externals/vcpkg/ports/sbp/win32-install-fix.patch @@ -0,0 +1,27 @@ +commit 6023d12ca2df861b134b345151d2463a963e50c4 +Author: Rodrigo Reichert +Date: Wed Aug 4 13:24:43 2021 +1000 + + ESD-2166 Fix windows install dll directory (#1061) + +diff --git a/c/src/CMakeLists.txt b/c/src/CMakeLists.txt +index b00fa523..1019683f 100644 +--- a/c/src/CMakeLists.txt ++++ b/c/src/CMakeLists.txt +@@ -27,9 +27,13 @@ if (MINGW) + endif() + endif() + +-install(TARGETS sbp +- EXPORT sbp-export +- DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}) ++install( ++ TARGETS sbp ++ EXPORT sbp-export ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++) + install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/libsbp/" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libsbp") + + export(EXPORT sbp-export diff --git a/externals/vcpkg/ports/scintilla/0001-static-lib.patch b/externals/vcpkg/ports/scintilla/0001-static-lib.patch new file mode 100755 index 000000000..2661b0f2d --- /dev/null +++ b/externals/vcpkg/ports/scintilla/0001-static-lib.patch @@ -0,0 +1,14 @@ +diff --git a/win32/SciLexer.vcxproj b/win32/SciLexer.vcxproj +index b2e993c..c8774f1 100644 +--- a/win32/SciLexer.vcxproj ++++ b/win32/SciLexer.vcxproj +@@ -33,7 +33,7 @@ + + + +- DynamicLibrary ++ StaticLibrary + Unicode + v141 + +-- diff --git a/externals/vcpkg/ports/scintilla/0002-static-crt.patch b/externals/vcpkg/ports/scintilla/0002-static-crt.patch new file mode 100755 index 000000000..20268d7d9 --- /dev/null +++ b/externals/vcpkg/ports/scintilla/0002-static-crt.patch @@ -0,0 +1,37 @@ +diff --git a/win32/SciLexer.vcxproj b/win32/SciLexer.vcxproj +index b2e993c..c8774f1 100644 +--- a/win32/SciLexer.vcxproj ++++ b/win32/SciLexer.vcxproj +@@ -88,6 +88,7 @@ + + _DEBUG;%(PreprocessorDefinitions) + stdcpp17 ++ MultiThreadedDebug + + + Default +@@ -97,6 +98,7 @@ + + _DEBUG;%(PreprocessorDefinitions) + stdcpp17 ++ MultiThreadedDebug + + + Default +@@ -117,6 +119,7 @@ + true + NDEBUG;%(PreprocessorDefinitions) + stdcpp17 ++ MultiThreaded + + + true +@@ -129,6 +132,7 @@ + true + NDEBUG;%(PreprocessorDefinitions) + stdcpp17 ++ MultiThreaded + + + true +-- diff --git a/externals/vcpkg/ports/scintilla/portfile.cmake b/externals/vcpkg/ports/scintilla/portfile.cmake new file mode 100755 index 000000000..50d61e642 --- /dev/null +++ b/externals/vcpkg/ports/scintilla/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://www.scintilla.org/scintilla446.zip" + FILENAME "scintilla446.zip" + SHA512 db6fa38283401497d8331f97dc5b57ea11d998988001f06b95892de769de5829b9f567635f3c1f2d9cfbc4384024d11666d28224ce90c5813ceef865b0dec255 +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND PATCHES 0001-static-lib.patch) +endif() + +if(VCPKG_CRT_LINKAGE STREQUAL "static") + list(APPEND PATCHES 0002-static-crt.patch) +endif() + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF 4.4.6 + PATCHES ${PATCHES} +) + +vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH Win32/SciLexer.vcxproj + LICENSE_SUBPATH License.txt +) + +file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT} FILES_MATCHING PATTERN "*.*") diff --git a/externals/vcpkg/ports/scintilla/vcpkg.json b/externals/vcpkg/ports/scintilla/vcpkg.json new file mode 100755 index 000000000..2a934dc63 --- /dev/null +++ b/externals/vcpkg/ports/scintilla/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "scintilla", + "version": "4.4.6", + "port-version": 1, + "description": "A free source code editing component for Win32, GTK+, and OS X", + "homepage": "https://www.scintilla.org/", + "supports": "!(uwp | linux | osx)" +} diff --git a/externals/vcpkg/ports/sciplot/portfile.cmake b/externals/vcpkg/ports/sciplot/portfile.cmake new file mode 100755 index 000000000..c6a369eb6 --- /dev/null +++ b/externals/vcpkg/ports/sciplot/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sciplot/sciplot + REF v0.2.2 + SHA512 2e7646e0fd52643bf86c09466d921d7b6a53349cd113e15177c3389654e0489df1d56f5fdcad7fc73834e632fff0a303d1366688ac7bb11937d49babd0742a7f + HEAD_REF vcpkg +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/sciplot) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/sciplot/vcpkg.json b/externals/vcpkg/ports/sciplot/vcpkg.json new file mode 100755 index 000000000..0fdf43a09 --- /dev/null +++ b/externals/vcpkg/ports/sciplot/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "sciplot", + "version": "0.2.2", + "description": "A modern c++ scientific plotting library powered by gnuplot", + "homepage": "https://github.com/sciplot/sciplot", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/sciter-js/portfile.cmake b/externals/vcpkg/ports/sciter-js/portfile.cmake new file mode 100755 index 000000000..82759029e --- /dev/null +++ b/externals/vcpkg/ports/sciter-js/portfile.cmake @@ -0,0 +1,109 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +if(VCPKG_TARGET_IS_UWP) + message(FATAL_ERROR "Sciter only supports Windows Desktop") +endif() + +set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) + +set(SCITER_REVISION 52bfe183983118c884294c864ee7b3d0dd199de6) +set(SCITER_SHA d31ef2a07525bf1c91b9f36ee434db6227bead732f5779cb4ee28ab6d92957bfb3d4656a960d3c47e64f3efc207f78be64853a56b1e1a14f56fd3c829b022155) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) + set(SCITER_ARCH x64) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) + set(SCITER_ARCH x32) +else() + message(FATAL_ERROR "Sciter only supports x86/x64") +endif() + +# check out the `https://github.com/c-smile/sciter-js-sdk/archive/${SCITER_REVISION}.tar.gz` +# hash checksum can be obtained with `curl -L -o tmp.tgz ${URL} && vcpkg hash tmp.tgz` +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO c-smile/sciter-js-sdk + REF ${SCITER_REVISION} + SHA512 ${SCITER_SHA} +) + +# install include directory +file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/sciter-js + FILES_MATCHING + PATTERN "*.cpp" + PATTERN "*.mm" + PATTERN "*.h" + PATTERN "*.hpp" +) + +set(SCITER_SHARE "${CURRENT_PACKAGES_DIR}/share/sciter-js") +set(SCITER_TOOLS ${CURRENT_PACKAGES_DIR}/tools/sciter-js) +set(TOOL_PERMS FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + +# license +file(COPY ${SOURCE_PATH}/logfile.md DESTINATION ${SCITER_SHARE}) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${SCITER_SHARE} RENAME copyright) + +# tools +if(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(SCITER_BIN ${SOURCE_PATH}/bin/linux/x64) + + file(INSTALL ${SOURCE_PATH}/bin/linux/packfolder DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + file(INSTALL ${SOURCE_PATH}/bin/linux/qjs DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + file(INSTALL ${SOURCE_PATH}/bin/linux/qjsc DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + + file(INSTALL ${SCITER_BIN}/usciter DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + file(INSTALL ${SCITER_BIN}/inspector DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + file(INSTALL ${SCITER_BIN}/libsciter-gtk.so DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/sciter-sqlite.so DESTINATION ${SCITER_TOOLS}) + + if ("windowless" IN_LIST FEATURES) + set(SCITER_BIN ${SOURCE_PATH}/bin.lite/linux/x64) + endif() + + file(INSTALL ${SCITER_BIN}/libsciter-gtk.so DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(INSTALL ${SCITER_BIN}/libsciter-gtk.so DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + + file(INSTALL ${SCITER_BIN}/sciter-sqlite.so DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(INSTALL ${SCITER_BIN}/sciter-sqlite.so DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + +elseif(VCPKG_TARGET_IS_OSX) + set(SCITER_BIN ${SOURCE_PATH}/bin/macosx) + + file(INSTALL ${SCITER_BIN}/packfolder DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + file(INSTALL ${SCITER_BIN}/qjs DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + file(INSTALL ${SCITER_BIN}/qjsc DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + + file(INSTALL ${SCITER_BIN}/inspector.app DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/usciterjs.app DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/libsciter.dylib DESTINATION ${SCITER_TOOLS}) + + execute_process(COMMAND sh -c "chmod +x usciterjs.app/Contents/MacOS/usciterjs" WORKING_DIRECTORY ${SCITER_TOOLS}) + execute_process(COMMAND sh -c "chmod +x inspector.app/Contents/MacOS/inspector" WORKING_DIRECTORY ${SCITER_TOOLS}) + + file(INSTALL ${SCITER_BIN}/libsciter.dylib DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(INSTALL ${SCITER_BIN}/libsciter.dylib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + +elseif(VCPKG_TARGET_IS_WINDOWS) + set(SCITER_BIN ${SOURCE_PATH}/bin/windows/${SCITER_ARCH}) + set(SCITER_BIN32 ${SOURCE_PATH}/bin/windows/x32) + + file(INSTALL ${SOURCE_PATH}/bin/windows/packfolder.exe DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SOURCE_PATH}/bin/windows/qjs.exe DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SOURCE_PATH}/bin/windows/qjsc.exe DESTINATION ${SCITER_TOOLS}) + + file(INSTALL ${SCITER_BIN}/scapp.exe DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/usciter.exe DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/inspector.exe DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/window-mixin.exe DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${SCITER_TOOLS}) + + if ("windowless" IN_LIST FEATURES) + set(SCITER_BIN ${SOURCE_PATH}/bin.lite/windows/${SCITER_ARCH}) + endif() + + file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + + message(WARNING "Sciter requires manual deployment of the correct DLL files.") + +endif() diff --git a/externals/vcpkg/ports/sciter-js/vcpkg.json b/externals/vcpkg/ports/sciter-js/vcpkg.json new file mode 100755 index 000000000..6e5606aab --- /dev/null +++ b/externals/vcpkg/ports/sciter-js/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "sciter-js", + "version": "4.4.8.31", + "description": "Sciter.JS - Sciter but with QuickJS on board instead of TIScript. Sciter is an embeddable HTML/CSS/scripting engine.", + "homepage": "https://github.com/c-smile/sciter-js-sdk", + "supports": "!uwp & !arm & !static", + "features": { + "windowless": { + "description": "windowless version - lite version" + } + } +} diff --git a/externals/vcpkg/ports/sciter/portfile.cmake b/externals/vcpkg/ports/sciter/portfile.cmake new file mode 100755 index 000000000..781259cb6 --- /dev/null +++ b/externals/vcpkg/ports/sciter/portfile.cmake @@ -0,0 +1,12 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +message(FATAL_ERROR "The sciter port is deprecated by upstream and conflicts with upstream's replacement. + +Upstream has stopped active development of sciter and instead encourage users to move to a new library Sciter.JS that uses javascript as the internal scripting language (sciter-js in vcpkg). + +Options for existing users are: +1. Depend upon `sciter-js` and change your code to work with the new library +2. Use `\"overrides\"` in manifest mode to pin to `\"version-string\": \"4.4.8.3#1\"` +3. Copy the last available `sciter` version into an overlay port (commit 756f1845537a916ba706f6af544b2f490c30fbb1 at subpath `ports/sciter`) +4. Use the community registry `https://github.com/VuYeK/vcpkg-registry` which may have newer versions of `sciter` available (not affiliated with Microsoft) +") diff --git a/externals/vcpkg/ports/sciter/vcpkg.json b/externals/vcpkg/ports/sciter/vcpkg.json new file mode 100755 index 000000000..fb5784988 --- /dev/null +++ b/externals/vcpkg/ports/sciter/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "sciter", + "version": "0", + "port-version": 1, + "description": "Sciter is an embeddable HTML/CSS/scripting engine.", + "homepage": "https://github.com/c-smile/sciter-sdk" +} diff --git a/externals/vcpkg/ports/scnlib/portfile.cmake b/externals/vcpkg/ports/scnlib/portfile.cmake new file mode 100755 index 000000000..0595fa487 --- /dev/null +++ b/externals/vcpkg/ports/scnlib/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO eliaskosunen/scnlib + REF v1.0 + SHA512 0d34b5a710a472618df5d8202bbd647f488aa0ac2ad593c4a212e42b8aee5c35882f6e0ab7a7241c766ed17c9273d5e6704b012ef7f23a1b329b2a2f28ec60c6 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DSCN_TESTS=OFF + -DSCN_EXAMPLES=OFF + -DSCN_BENCHMARKS=OFF + -DSCN_DOCS=OFF + -DSCN_RANGES=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/scn) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share + ${CURRENT_PACKAGES_DIR}/share/scn) + +file(INSTALL ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright) diff --git a/externals/vcpkg/ports/scnlib/vcpkg.json b/externals/vcpkg/ports/scnlib/vcpkg.json new file mode 100755 index 000000000..755442087 --- /dev/null +++ b/externals/vcpkg/ports/scnlib/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "scnlib", + "version": "1.0", + "description": "scnlib is a modern C++ library for replacing scanf and std::istream", + "homepage": "https://scnlib.dev/" +} diff --git a/externals/vcpkg/ports/scottt-debugbreak/portfile.cmake b/externals/vcpkg/ports/scottt-debugbreak/portfile.cmake new file mode 100755 index 000000000..95bb180be --- /dev/null +++ b/externals/vcpkg/ports/scottt-debugbreak/portfile.cmake @@ -0,0 +1,16 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO scottt/debugbreak + REF v1.0 + SHA512 bf8c43d42d9b19c9a3cb1fa5955a24efb48c2c21f0d89685f23702c3e2644637f2e8c6ec599024866138519b107787baef838b6d981779e2484e30d20a7386b9 + HEAD_REF master +) + +file( + COPY "${SOURCE_PATH}/debugbreak.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" +) + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/scottt-debugbreak/vcpkg.json b/externals/vcpkg/ports/scottt-debugbreak/vcpkg.json new file mode 100755 index 000000000..599aa158a --- /dev/null +++ b/externals/vcpkg/ports/scottt-debugbreak/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "scottt-debugbreak", + "version": "1.0", + "description": "Break into the debugger programmatically", + "homepage": "https://github.com/scottt/debugbreak" +} diff --git a/externals/vcpkg/ports/scylla-wrapper/CMakeLists.txt b/externals/vcpkg/ports/scylla-wrapper/CMakeLists.txt new file mode 100755 index 000000000..b906d15c9 --- /dev/null +++ b/externals/vcpkg/ports/scylla-wrapper/CMakeLists.txt @@ -0,0 +1,32 @@ +cmake_minimum_required(VERSION 3.8.0) +project(scylla_wrapper CXX) + +if(MSVC) + add_compile_options(/W3 /wd4005 /wd4996 /wd4018 /DUNICODE /D_UNICODE -D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DNOMINMAX) +endif() + +find_library(DISTORM_LIBRARY distorm) +find_path(DISTORM_INCLUDE_DIR distorm.h) + +include_directories(scylla_wrapper ${DISTORM_INCLUDE_DIR}) + +file(GLOB scylla_wrapper_srcs "scylla_wrapper/*.cpp") + +add_library(scylla_wrapper ${scylla_wrapper_srcs}) + +if(BUILD_SHARED_LIBS) + target_compile_definitions(scylla_wrapper PRIVATE -DSCYLLA_WRAPPER_EXPORTS) +endif() + +target_link_libraries(scylla_wrapper PRIVATE ${DISTORM_LIBRARY}) + +install( + TARGETS scylla_wrapper + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES scylla_wrapper/scylla_wrapper.h DESTINATION include) +endif() diff --git a/externals/vcpkg/ports/scylla-wrapper/portfile.cmake b/externals/vcpkg/ports/scylla-wrapper/portfile.cmake new file mode 100755 index 000000000..f883451b5 --- /dev/null +++ b/externals/vcpkg/ports/scylla-wrapper/portfile.cmake @@ -0,0 +1,28 @@ +# scylla_wrapper_dll supplies a DllMain +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_bitbucket( + OUT_SOURCE_PATH SOURCE_PATH + REPO cypherpunk/scylla_wrapper_dll + REF 4ad953ec04108269f1d80a91b2723b3e22d1b4d2 + SHA512 d7cb72e097e86e96cf0a8f463c0f839c9608fa4276bc1e2e984290984bcfe8a5b2257b1511259cb78802819fadf2c1001dc3011ee2c6dc9dfcbdb561d34e0c35 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(REMOVE + "${SOURCE_PATH}/scylla_wrapper_dll/distorm.h" + "${SOURCE_PATH}/scylla_wrapper_dll/distorm_x64.lib" + "${SOURCE_PATH}/scylla_wrapper_dll/distorm_x86.lib" +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/scylla-wrapper/vcpkg.json b/externals/vcpkg/ports/scylla-wrapper/vcpkg.json new file mode 100755 index 000000000..79d6d09a5 --- /dev/null +++ b/externals/vcpkg/ports/scylla-wrapper/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "scylla-wrapper", + "version-string": "2018-08-26-16e6f435", + "port-version": 2, + "description": "This is a wrapper around Scylla. It exports functions for IAT fixing, dumping and PE rebuilding. based on https://github.com/NtQuery/Scylla commit 0f6b7198be (v0.9.6b).", + "supports": "windows & !uwp & !arm & !static", + "dependencies": [ + "distorm", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/sdformat10/fix-quote.patch b/externals/vcpkg/ports/sdformat10/fix-quote.patch new file mode 100755 index 000000000..6a8495c17 --- /dev/null +++ b/externals/vcpkg/ports/sdformat10/fix-quote.patch @@ -0,0 +1,85 @@ +diff --git a/cmake/FindSSE.cmake b/cmake/FindSSE.cmake +index cdbcfcc..0339a17 100644 +--- a/cmake/FindSSE.cmake ++++ b/cmake/FindSSE.cmake +@@ -5,7 +5,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + IF(CMAKE_SYSTEM_NAME MATCHES "Linux") + EXEC_PROGRAM(cat ARGS "/proc/cpuinfo" OUTPUT_VARIABLE CPUINFO) + +- STRING(REGEX REPLACE "^.*(sse2).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(sse2).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "sse2" "${SSE_THERE}" SSE2_TRUE) + IF (SSE2_TRUE) + set(SSE2_FOUND true CACHE BOOL "SSE2 available on host") +@@ -14,14 +14,14 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + ENDIF (SSE2_TRUE) + + # /proc/cpuinfo apparently omits sse3 :( +- STRING(REGEX REPLACE "^.*[^s](sse3).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*[^s](sse3).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "sse3" "${SSE_THERE}" SSE3_TRUE) + IF (NOT SSE3_TRUE) +- STRING(REGEX REPLACE "^.*(T2300).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(T2300).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "T2300" "${SSE_THERE}" SSE3_TRUE) + ENDIF (NOT SSE3_TRUE) + +- STRING(REGEX REPLACE "^.*(ssse3).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(ssse3).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "ssse3" "${SSE_THERE}" SSSE3_TRUE) + IF (SSE3_TRUE OR SSSE3_TRUE) + set(SSE3_FOUND true CACHE BOOL "SSE3 available on host") +@@ -34,7 +34,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host") + ENDIF (SSSE3_TRUE) + +- STRING(REGEX REPLACE "^.*(sse4_1).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(sse4_1).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "sse4_1" "${SSE_THERE}" SSE41_TRUE) + IF (SSE41_TRUE) + set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host") +@@ -42,7 +42,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host") + ENDIF (SSE41_TRUE) + +- STRING(REGEX REPLACE "^.*(sse4_2).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(sse4_2).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "sse4_2" "${SSE_THERE}" SSE42_TRUE) + IF (SSE42_TRUE) + set(SSE4_2_FOUND true CACHE BOOL "SSE4.2 available on host") +@@ -54,7 +54,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + EXEC_PROGRAM("/usr/sbin/sysctl -n machdep.cpu.features" OUTPUT_VARIABLE + CPUINFO) + +- STRING(REGEX REPLACE "^.*[^S](SSE2).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*[^S](SSE2).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "SSE2" "${SSE_THERE}" SSE2_TRUE) + IF (SSE2_TRUE) + set(SSE2_FOUND true CACHE BOOL "SSE2 available on host") +@@ -62,7 +62,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSE2_FOUND false CACHE BOOL "SSE2 available on host") + ENDIF (SSE2_TRUE) + +- STRING(REGEX REPLACE "^.*[^S](SSE3).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*[^S](SSE3).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "SSE3" "${SSE_THERE}" SSE3_TRUE) + IF (SSE3_TRUE) + set(SSE3_FOUND true CACHE BOOL "SSE3 available on host") +@@ -70,7 +70,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSE3_FOUND false CACHE BOOL "SSE3 available on host") + ENDIF (SSE3_TRUE) + +- STRING(REGEX REPLACE "^.*(SSSE3).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(SSSE3).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "SSSE3" "${SSE_THERE}" SSSE3_TRUE) + IF (SSSE3_TRUE) + set(SSSE3_FOUND true CACHE BOOL "SSSE3 available on host") +@@ -78,7 +78,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host") + ENDIF (SSSE3_TRUE) + +- STRING(REGEX REPLACE "^.*(SSE4.1).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(SSE4.1).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "SSE4.1" "${SSE_THERE}" SSE41_TRUE) + IF (SSE41_TRUE) + set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host") diff --git a/externals/vcpkg/ports/sdformat10/no-absolute.patch b/externals/vcpkg/ports/sdformat10/no-absolute.patch new file mode 100755 index 000000000..4b5315365 --- /dev/null +++ b/externals/vcpkg/ports/sdformat10/no-absolute.patch @@ -0,0 +1,38 @@ +diff --git a/cmake/sdf_config.h.in b/cmake/sdf_config.h.in +index 52408866..bd541701 100644 +--- a/cmake/sdf_config.h.in ++++ b/cmake/sdf_config.h.in +@@ -32,6 +32,3 @@ + #cmakedefine HAVE_URDFDOM 1 + #cmakedefine USE_INTERNAL_URDF 1 + #cmakedefine SDFORMAT_DISABLE_CONSOLE_LOGFILE 1 +- +-#define SDF_SHARE_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/" +-#define SDF_VERSION_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${SDF_MAJOR_VERSION}/${SDF_PKG_VERSION}" +diff --git a/src/SDF.cc b/src/SDF.cc +index 20dcd4c6..802cbde3 100644 +--- a/src/SDF.cc ++++ b/src/SDF.cc +@@ -98,22 +98,6 @@ std::string findFile(const std::string &_filename, bool _searchLocalPath, + filename = filename.substr(idx + sep.length()); + } + +- // Next check the install path. +- path = sdf::filesystem::append(SDF_SHARE_PATH, filename); +- if (sdf::filesystem::exists(path)) +- { +- return path; +- } +- +- // Next check the versioned install path. +- path = sdf::filesystem::append(SDF_SHARE_PATH, +- "sdformat" SDF_MAJOR_VERSION_STR, +- sdf::SDF::Version(), filename); +- if (sdf::filesystem::exists(path)) +- { +- return path; +- } +- + // Next check to see if the given file exists. + path = filename; + if (sdf::filesystem::exists(path)) diff --git a/externals/vcpkg/ports/sdformat10/portfile.cmake b/externals/vcpkg/ports/sdformat10/portfile.cmake new file mode 100755 index 000000000..0d4c0f623 --- /dev/null +++ b/externals/vcpkg/ports/sdformat10/portfile.cmake @@ -0,0 +1,42 @@ + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO osrf/sdformat + REF sdformat10_10.0.0 + SHA512 1caf98427d25e7c17bfacaab20382c573fac0c965b40ad0c5e0efd32ddfdaa20250d8c79ecf574989ba10b1feb884a9df3927b18ec2cd88f7c66b4d8194bc731 + HEAD_REF sdf10 + PATCHES + fix-quote.patch + no-absolute.patch +) + +# Ruby is required by the sdformat build process +vcpkg_find_acquire_program(RUBY) +get_filename_component(RUBY_PATH ${RUBY} DIRECTORY) +set(_path $ENV{PATH}) +vcpkg_add_to_path(${RUBY_PATH}) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DUSE_EXTERNAL_URDF=ON + -DUSE_EXTERNAL_TINYXML=ON +) + +vcpkg_cmake_install() + +# Restore original path +set(ENV{PATH} ${_path}) + +# Fix cmake targets and pkg-config file location +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/sdformat10") +vcpkg_fixup_pkgconfig() + +# Remove debug files +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" + "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/sdformat10/vcpkg.json b/externals/vcpkg/ports/sdformat10/vcpkg.json new file mode 100755 index 000000000..13c81a93b --- /dev/null +++ b/externals/vcpkg/ports/sdformat10/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "sdformat10", + "version": "10.0.0", + "port-version": 2, + "description": "Simulation Description Format (SDF) parser and description files.", + "homepage": "http://sdformat.org/", + "supports": "!uwp", + "dependencies": [ + "ignition-math6", + "tinyxml2", + "urdfdom", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/sdformat6/disable-test.patch b/externals/vcpkg/ports/sdformat6/disable-test.patch new file mode 100755 index 000000000..6861e3448 --- /dev/null +++ b/externals/vcpkg/ports/sdformat6/disable-test.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 78e72e6..8f97304 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -252,7 +252,9 @@ else (buid_errors) + + link_directories(${PROJECT_BINARY_DIR}/src) + ++ if (BUILD_TESTING) + add_subdirectory(test) ++ endif() + add_subdirectory(src) + add_subdirectory(include/sdf) + add_subdirectory(sdf) +diff --git a/cmake/SDFUtils.cmake b/cmake/SDFUtils.cmake +index acd57f8..3626e68 100644 +--- a/cmake/SDFUtils.cmake ++++ b/cmake/SDFUtils.cmake +@@ -119,6 +119,7 @@ endmacro() + include_directories(${PROJECT_SOURCE_DIR}/test/gtest/include) + macro (sdf_build_tests) + # Build all the tests ++ if (BUILD_TESTING) + foreach(GTEST_SOURCE_file ${ARGN}) + string(REGEX REPLACE ".cc" "" BINARY_NAME ${GTEST_SOURCE_file}) + set(BINARY_NAME ${TEST_TYPE}_${BINARY_NAME}) +@@ -205,6 +206,7 @@ macro (sdf_build_tests) + --error-exitcode=1 --show-leak-kinds=all ${CMAKE_CURRENT_BINARY_DIR}/${BINARY_NAME}) + endif() + endforeach() ++ endif() + endmacro() + + ################################################# diff --git a/externals/vcpkg/ports/sdformat6/disable-unneeded-include-findboost.patch b/externals/vcpkg/ports/sdformat6/disable-unneeded-include-findboost.patch new file mode 100755 index 000000000..6a9220292 --- /dev/null +++ b/externals/vcpkg/ports/sdformat6/disable-unneeded-include-findboost.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index c2a0ee4..2735a07 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -13,7 +13,6 @@ if (WIN32) + set(Boost_USE_STATIC_RUNTIME OFF) + endif() + +-include(FindBoost) + find_package(Boost ${MIN_BOOST_VERSION}) + + if (NOT Boost_FOUND) diff --git a/externals/vcpkg/ports/sdformat6/fix-dependency-urdfdom.patch b/externals/vcpkg/ports/sdformat6/fix-dependency-urdfdom.patch new file mode 100755 index 000000000..dad6fc106 --- /dev/null +++ b/externals/vcpkg/ports/sdformat6/fix-dependency-urdfdom.patch @@ -0,0 +1,34 @@ +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index 2735a07..6721de4 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -62,16 +62,16 @@ if (NOT PKG_CONFIG_FOUND) + if (NOT DEFINED USE_INTERNAL_URDF) + BUILD_WARNING("Couldn't find pkg-config for urdfdom, using internal copy") + set(USE_INTERNAL_URDF true) +- elseif(NOT USE_INTERNAL_URDF) ++ elseif(0) + BUILD_ERROR("Couldn't find pkg-config for urdfdom") + endif() + endif() + + if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF) + # check for urdfdom with pkg-config +- pkg_check_modules(URDF urdfdom>=1.0) ++ find_package(urdfdom CONFIG REQUIRED) + +- if (NOT URDF_FOUND) ++ if (NOT urdfdom_FOUND) + if (NOT DEFINED USE_INTERNAL_URDF) + message(STATUS "Couldn't find urdfdom >= 1.0, using internal copy") + set(USE_INTERNAL_URDF true) +@@ -80,8 +80,7 @@ if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF) + endif() + else() + # what am I doing here? pkg-config and cmake +- set(URDF_INCLUDE_DIRS ${URDF_INCLUDEDIR}) +- set(URDF_LIBRARY_DIRS ${URDF_LIBDIR}) ++ set(URDF_LIBRARIES urdfdom::urdfdom_model urdfdom::urdfdom_world urdfdom::urdfdom_sensor urdfdom::urdfdom_model_state) + endif() + endif() + diff --git a/externals/vcpkg/ports/sdformat6/portfile.cmake b/externals/vcpkg/ports/sdformat6/portfile.cmake new file mode 100755 index 000000000..ef7c774c5 --- /dev/null +++ b/externals/vcpkg/ports/sdformat6/portfile.cmake @@ -0,0 +1,59 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO osrf/sdformat + REF sdformat6_6.2.0 + SHA512 3d139ec4b4c9fbfd547ed8bfca0adb5cdca92c1b7cc4d4b554a7c51ccf755b9079c26a006ebfedc5bc5b1ba5e16ad950bb38c47ea97bf97e59a2fd7d12d60620 + HEAD_REF sdf6 + PATCHES + disable-unneeded-include-findboost.patch + fix-dependency-urdfdom.patch + disable-test.patch +) + +# Ruby is required by the sdformat build process +vcpkg_find_acquire_program(RUBY) +get_filename_component(RUBY_PATH ${RUBY} DIRECTORY) +set(_path $ENV{PATH}) +vcpkg_add_to_path(${RUBY_PATH}) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DUSE_INTERNAL_URDF=OFF + -DUSE_EXTERNAL_TINYXML=ON +) + +vcpkg_cmake_install() + +# Restore original path +set(ENV{PATH} ${_path}) + +# Move location of sdformat.dll from lib to bin +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/sdformat.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/sdformat.dll" + "${CURRENT_PACKAGES_DIR}/bin/sdformat.dll") +endif() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/sdformat.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/sdformat.dll" + "${CURRENT_PACKAGES_DIR}/debug/bin/sdformat.dll") +endif() + +# Fix cmake targets location +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/sdformat") + +# Remove debug files +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" + "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ignition/sdformat6.yaml" "${CURRENT_PACKAGES_DIR}" "../..") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sdformat-6.2/sdf/sdf_config.h" "#define SDF_SHARE_PATH \"${CURRENT_PACKAGES_DIR}/share/\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sdformat-6.2/sdf/sdf_config.h" "#define SDF_VERSION_PATH \"${CURRENT_PACKAGES_DIR}/share/sdformat/\"" "") +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/sdformat6/vcpkg.json b/externals/vcpkg/ports/sdformat6/vcpkg.json new file mode 100755 index 000000000..c66f66a3c --- /dev/null +++ b/externals/vcpkg/ports/sdformat6/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "sdformat6", + "version": "6.2.0", + "port-version": 6, + "description": "Simulation Description Format (SDF) parser and description files.", + "homepage": "http://sdformat.org/", + "license": "Apache-2.0", + "supports": "!(arm | uwp)", + "dependencies": [ + "boost-any", + "boost-variant", + "ignition-math4", + "tinyxml", + "urdfdom", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/sdformat9/fix-dependency-urdfdom.patch b/externals/vcpkg/ports/sdformat9/fix-dependency-urdfdom.patch new file mode 100755 index 000000000..d16cc831b --- /dev/null +++ b/externals/vcpkg/ports/sdformat9/fix-dependency-urdfdom.patch @@ -0,0 +1,35 @@ +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index 427e5e7..af31df4 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -43,7 +43,7 @@ endif() + # 2. if USE_INTERNAL_URDF is set to True, use the internal copy + # 3. if USE_INTERNAL_URDF is set to False, force to search system installation, fail on error + +-if (NOT PKG_CONFIG_FOUND) ++if (0) + if (NOT DEFINED USE_INTERNAL_URDF) + BUILD_WARNING("Couldn't find pkg-config for urdfdom, using internal copy") + set(USE_INTERNAL_URDF true) +@@ -53,10 +53,9 @@ if (NOT PKG_CONFIG_FOUND) + endif() + + if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF) +- # check for urdfdom with pkg-config +- pkg_check_modules(URDF urdfdom>=1.0) ++ find_package(urdfdom CONFIG REQUIRED) + +- if (NOT URDF_FOUND) ++ if (NOT urdfdom_FOUND) + find_package(urdfdom) + if (urdfdom_FOUND) + set(URDF_INCLUDE_DIRS ${urdfdom_INCLUDE_DIRS}) +@@ -73,6 +72,7 @@ if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF) + # what am I doing here? pkg-config and cmake +- set(URDF_INCLUDE_DIRS ${URDF_INCLUDEDIR}) + set(URDF_LIBRARY_DIRS ${URDF_LIBDIR}) ++ set(URDF_INCLUDE_DIRS ${urdfdom_INCLUDE_DIRS}) ++ set(URDF_LIBRARIES ${urdfdom_LIBRARIES}) + endif() + endif() + diff --git a/externals/vcpkg/ports/sdformat9/fix-quote.patch b/externals/vcpkg/ports/sdformat9/fix-quote.patch new file mode 100755 index 000000000..6a8495c17 --- /dev/null +++ b/externals/vcpkg/ports/sdformat9/fix-quote.patch @@ -0,0 +1,85 @@ +diff --git a/cmake/FindSSE.cmake b/cmake/FindSSE.cmake +index cdbcfcc..0339a17 100644 +--- a/cmake/FindSSE.cmake ++++ b/cmake/FindSSE.cmake +@@ -5,7 +5,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + IF(CMAKE_SYSTEM_NAME MATCHES "Linux") + EXEC_PROGRAM(cat ARGS "/proc/cpuinfo" OUTPUT_VARIABLE CPUINFO) + +- STRING(REGEX REPLACE "^.*(sse2).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(sse2).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "sse2" "${SSE_THERE}" SSE2_TRUE) + IF (SSE2_TRUE) + set(SSE2_FOUND true CACHE BOOL "SSE2 available on host") +@@ -14,14 +14,14 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + ENDIF (SSE2_TRUE) + + # /proc/cpuinfo apparently omits sse3 :( +- STRING(REGEX REPLACE "^.*[^s](sse3).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*[^s](sse3).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "sse3" "${SSE_THERE}" SSE3_TRUE) + IF (NOT SSE3_TRUE) +- STRING(REGEX REPLACE "^.*(T2300).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(T2300).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "T2300" "${SSE_THERE}" SSE3_TRUE) + ENDIF (NOT SSE3_TRUE) + +- STRING(REGEX REPLACE "^.*(ssse3).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(ssse3).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "ssse3" "${SSE_THERE}" SSSE3_TRUE) + IF (SSE3_TRUE OR SSSE3_TRUE) + set(SSE3_FOUND true CACHE BOOL "SSE3 available on host") +@@ -34,7 +34,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host") + ENDIF (SSSE3_TRUE) + +- STRING(REGEX REPLACE "^.*(sse4_1).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(sse4_1).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "sse4_1" "${SSE_THERE}" SSE41_TRUE) + IF (SSE41_TRUE) + set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host") +@@ -42,7 +42,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host") + ENDIF (SSE41_TRUE) + +- STRING(REGEX REPLACE "^.*(sse4_2).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(sse4_2).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "sse4_2" "${SSE_THERE}" SSE42_TRUE) + IF (SSE42_TRUE) + set(SSE4_2_FOUND true CACHE BOOL "SSE4.2 available on host") +@@ -54,7 +54,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + EXEC_PROGRAM("/usr/sbin/sysctl -n machdep.cpu.features" OUTPUT_VARIABLE + CPUINFO) + +- STRING(REGEX REPLACE "^.*[^S](SSE2).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*[^S](SSE2).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "SSE2" "${SSE_THERE}" SSE2_TRUE) + IF (SSE2_TRUE) + set(SSE2_FOUND true CACHE BOOL "SSE2 available on host") +@@ -62,7 +62,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSE2_FOUND false CACHE BOOL "SSE2 available on host") + ENDIF (SSE2_TRUE) + +- STRING(REGEX REPLACE "^.*[^S](SSE3).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*[^S](SSE3).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "SSE3" "${SSE_THERE}" SSE3_TRUE) + IF (SSE3_TRUE) + set(SSE3_FOUND true CACHE BOOL "SSE3 available on host") +@@ -70,7 +70,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSE3_FOUND false CACHE BOOL "SSE3 available on host") + ENDIF (SSE3_TRUE) + +- STRING(REGEX REPLACE "^.*(SSSE3).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(SSSE3).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "SSSE3" "${SSE_THERE}" SSSE3_TRUE) + IF (SSSE3_TRUE) + set(SSSE3_FOUND true CACHE BOOL "SSSE3 available on host") +@@ -78,7 +78,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host") + ENDIF (SSSE3_TRUE) + +- STRING(REGEX REPLACE "^.*(SSE4.1).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(SSE4.1).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "SSE4.1" "${SSE_THERE}" SSE41_TRUE) + IF (SSE41_TRUE) + set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host") diff --git a/externals/vcpkg/ports/sdformat9/no-absolute.patch b/externals/vcpkg/ports/sdformat9/no-absolute.patch new file mode 100755 index 000000000..40c99f26e --- /dev/null +++ b/externals/vcpkg/ports/sdformat9/no-absolute.patch @@ -0,0 +1,38 @@ +diff --git a/cmake/sdf_config.h.in b/cmake/sdf_config.h.in +index c3ce2336..64ac9f5f 100644 +--- a/cmake/sdf_config.h.in ++++ b/cmake/sdf_config.h.in +@@ -31,6 +31,3 @@ + #cmakedefine BUILD_TYPE_RELEASE 1 + #cmakedefine HAVE_URDFDOM 1 + #cmakedefine USE_INTERNAL_URDF 1 +- +-#define SDF_SHARE_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/" +-#define SDF_VERSION_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${SDF_MAJOR_VERSION}/${SDF_PKG_VERSION}" +diff --git a/src/SDF.cc b/src/SDF.cc +index 48c1943b..bd2c5b31 100644 +--- a/src/SDF.cc ++++ b/src/SDF.cc +@@ -100,22 +100,6 @@ std::string findFile(const std::string &_filename, bool _searchLocalPath, + filename = filename.substr(idx + sep.length()); + } + +- // Next check the install path. +- path = sdf::filesystem::append(SDF_SHARE_PATH, filename); +- if (sdf::filesystem::exists(path)) +- { +- return path; +- } +- +- // Next check the versioned install path. +- path = sdf::filesystem::append(SDF_SHARE_PATH, +- "sdformat" SDF_MAJOR_VERSION_STR, +- sdf::SDF::Version(), filename); +- if (sdf::filesystem::exists(path)) +- { +- return path; +- } +- + // Next check to see if the given file exists. + path = filename; + if (sdf::filesystem::exists(path)) diff --git a/externals/vcpkg/ports/sdformat9/portfile.cmake b/externals/vcpkg/ports/sdformat9/portfile.cmake new file mode 100755 index 000000000..058988450 --- /dev/null +++ b/externals/vcpkg/ports/sdformat9/portfile.cmake @@ -0,0 +1,42 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO osrf/sdformat + REF sdformat9_9.4.0 + SHA512 b7ed458a5a9ba5b5dcf457d3e0c9de0bca3d514a6870aa977a00a84f8a3b8d1bd21f3b437c0651af7f0cc9b9c6c8b905c968525194605b334ab62280b9d55b0e + HEAD_REF sdf9 + PATCHES + fix-dependency-urdfdom.patch + fix-quote.patch + no-absolute.patch + use-external-tinyxml-windows.patch +) + +# Ruby is required by the sdformat build process +vcpkg_find_acquire_program(RUBY) +get_filename_component(RUBY_PATH ${RUBY} DIRECTORY) +set(_path $ENV{PATH}) +vcpkg_add_to_path("${RUBY_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DUSE_INTERNAL_URDF=OFF +) + +vcpkg_cmake_install() + +# Restore original path +set(ENV{PATH} ${_path}) + +# Fix cmake targets and pkg-config file location +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/sdformat9") +vcpkg_fixup_pkgconfig() + +# Remove debug files +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" + "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/sdformat9/use-external-tinyxml-windows.patch b/externals/vcpkg/ports/sdformat9/use-external-tinyxml-windows.patch new file mode 100755 index 000000000..1f48617bc --- /dev/null +++ b/externals/vcpkg/ports/sdformat9/use-external-tinyxml-windows.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3dad12e5..e290a3be 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -113,7 +113,7 @@ include (${sdf_cmake_dir}/SDFUtils.cmake) + + message (STATUS "\n\n====== Finding 3rd Party Packages ======") + # Use of tinyxml. System installation on UNIX. Internal copy on WIN +-if (UNIX) ++if (true) + message (STATUS "Using system tinyxml") + set (USE_EXTERNAL_TINYXML True) + elseif(WIN32) +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index 427e5e7a..655fafc0 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -9,7 +9,7 @@ if (USE_EXTERNAL_TINYXML) + ################################################# + # Find tinyxml. Only debian distributions package tinyxml with a pkg-config + # Use pkg_check_modules and fallback to manual detection (needed, at least, for MacOS) +- pkg_check_modules(tinyxml tinyxml) ++ find_package(tinyxml CONFIG REQUIRED) + if (NOT tinyxml_FOUND) + find_path (tinyxml_INCLUDE_DIRS tinyxml.h ${tinyxml_INCLUDE_DIRS} ENV CPATH) + find_library(tinyxml_LIBRARIES NAMES tinyxml) diff --git a/externals/vcpkg/ports/sdformat9/vcpkg.json b/externals/vcpkg/ports/sdformat9/vcpkg.json new file mode 100755 index 000000000..df9310a61 --- /dev/null +++ b/externals/vcpkg/ports/sdformat9/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "sdformat9", + "version": "9.4.0", + "port-version": 6, + "description": "Simulation Description Format (SDF) parser and description files.", + "homepage": "http://sdformat.org/", + "license": "Apache-2.0", + "supports": "!uwp", + "dependencies": [ + "ignition-math6", + "tinyxml", + "urdfdom", + "urdfdom-headers", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/sdl1-net/CMakeLists.txt b/externals/vcpkg/ports/sdl1-net/CMakeLists.txt new file mode 100755 index 000000000..1e1f95171 --- /dev/null +++ b/externals/vcpkg/ports/sdl1-net/CMakeLists.txt @@ -0,0 +1,27 @@ +cmake_minimum_required(VERSION 3.0) +project(SDL1_NET C) + +if (MSVC) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4244 /wd4996") +endif() + +find_package(SDL) + +add_library(SDL_net SDLnet.c SDLnetselect.c SDLnetTCP.c SDLnetUDP.c version.rc) + +set_target_properties(SDL_net PROPERTIES DEFINE_SYMBOL SDL1_EXPORTS) +target_compile_definitions(SDL_net PRIVATE _WINSOCK_DEPRECATED_NO_WARNINGS) +target_include_directories(SDL_net PRIVATE ${SDL_INCLUDE_DIR}) +target_link_libraries(SDL_net ${SDL_LIBRARY} ws2_32 iphlpapi) + +install(TARGETS SDL_net + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib) + +if(NOT DEFINED SDL_NET_SKIP_HEADERS) + install(FILES SDL_net.h DESTINATION include) +endif() + +message(STATUS "Link-time dependencies:") +message(STATUS " " ${SDL_LIBRARY}) diff --git a/externals/vcpkg/ports/sdl1-net/portfile.cmake b/externals/vcpkg/ports/sdl1-net/portfile.cmake new file mode 100755 index 000000000..e88d99d35 --- /dev/null +++ b/externals/vcpkg/ports/sdl1-net/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.8.tar.gz" + FILENAME "SDL_net-1.2.8.tar.gz" + SHA512 2766ca55343127c619958ab3a3ae3052a27a676839f10a158f7dfc071b8db38c2f1fc853e8add32b9fef94ab07eaa986f46a68e264e8087b57c990af30ea9a0b +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DSDL_NET_SKIP_HEADERS=ON) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdl1-net) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/sdl1-net/COPYING ${CURRENT_PACKAGES_DIR}/share/sdl1-net/copyright) diff --git a/externals/vcpkg/ports/sdl1-net/vcpkg.json b/externals/vcpkg/ports/sdl1-net/vcpkg.json new file mode 100755 index 000000000..cd4e84a03 --- /dev/null +++ b/externals/vcpkg/ports/sdl1-net/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "sdl1-net", + "version-string": "1.2.8", + "port-version": 4, + "description": "Networking library for SDL", + "dependencies": [ + "sdl1" + ] +} diff --git a/externals/vcpkg/ports/sdl1/SDL.vcxproj.in b/externals/vcpkg/ports/sdl1/SDL.vcxproj.in new file mode 100755 index 000000000..f4b29a2c8 --- /dev/null +++ b/externals/vcpkg/ports/sdl1/SDL.vcxproj.in @@ -0,0 +1,462 @@ + + + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} + SDL + + + + @LIB_TYPE@ + v141 + false + + + @LIB_TYPE@ + v141 + false + + + @LIB_TYPE@ + v141 + false + + + @LIB_TYPE@ + v141 + false + + + @LIB_TYPE@ + v141 + false + + + @LIB_TYPE@ + v141 + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>15.0.27924.0 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/SDL.tlb + + + Disabled + $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions) + @CRT_TYPE_DBG@ + false + + .\Debug/SDL.pch + Level3 + true + EditAndContinue + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /MACHINE:I386 %(AdditionalOptions) + winmm.lib;dxguid.lib;%(AdditionalDependencies) + .\Debug/SDL.dll + true + false + true + .\Debug/SDL.pdb + Windows + false + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Debug/SDL.tlb + + + Disabled + $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions) + @CRT_TYPE_DBG@ + false + + .\Debug/SDL.pch + Level3 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + winmm.lib;dxguid.lib;%(AdditionalDependencies) + .\Debug/SDL.dll + true + false + true + .\Debug/SDL.pdb + Windows + MachineX64 + false + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug/SDL.tlb + + + Disabled + $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions) + @CRT_TYPE_DBG@ + false + + + .\Debug/SDL.pch + Level3 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + winmm.lib;dxguid.lib;%(AdditionalDependencies) + .\Debug/SDL.dll + true + false + true + .\Debug/SDL.pdb + Windows + false + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/SDL.tlb + + + OnlyExplicitInline + false + $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions) + true + @CRT_TYPE_REL@ + false + true + + .\Release/SDL.pch + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /MACHINE:I386 %(AdditionalOptions) + winmm.lib;dxguid.lib;%(AdditionalDependencies) + .\Release/SDL.dll + true + false + .\Release/SDL.pdb + Windows + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Release/SDL.tlb + + + OnlyExplicitInline + false + $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions) + true + @CRT_TYPE_REL@ + false + true + + .\Release/SDL.pch + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + winmm.lib;dxguid.lib;%(AdditionalDependencies) + .\Release/SDL.dll + true + false + .\Release/SDL.pdb + Windows + MachineX64 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release/SDL.tlb + + + OnlyExplicitInline + false + $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions) + true + @CRT_TYPE_REL@ + false + true + + + .\Release/SDL.pch + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + winmm.lib;dxguid.lib;%(AdditionalDependencies) + .\Release/SDL.dll + true + false + .\Release/SDL.pdb + Windows + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/externals/vcpkg/ports/sdl1/SDL1_2017.sln b/externals/vcpkg/ports/sdl1/SDL1_2017.sln new file mode 100755 index 000000000..ff6de0860 --- /dev/null +++ b/externals/vcpkg/ports/sdl1/SDL1_2017.sln @@ -0,0 +1,65 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28010.2003 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "SDL\SDL.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "SDLmain\SDLmain.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM64 = Debug|ARM64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release_NoSTDIO|ARM64 = Release_NoSTDIO|ARM64 + Release_NoSTDIO|Win32 = Release_NoSTDIO|Win32 + Release_NoSTDIO|x64 = Release_NoSTDIO|x64 + Release|ARM64 = Release|ARM64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|ARM64.Build.0 = Debug|ARM64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.ActiveCfg = Debug|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.Build.0 = Debug|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.ActiveCfg = Debug|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.Build.0 = Debug|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|ARM64.ActiveCfg = Release|ARM64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|ARM64.Build.0 = Release|ARM64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|Win32.ActiveCfg = Release|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|Win32.Build.0 = Release|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|x64.ActiveCfg = Release|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|x64.Build.0 = Release|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|ARM64.ActiveCfg = Release|ARM64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|ARM64.Build.0 = Release|ARM64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.Build.0 = Release|Win32 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.ActiveCfg = Release|x64 + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.Build.0 = Release|x64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|ARM64.Build.0 = Debug|ARM64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.ActiveCfg = Debug|Win32 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.Build.0 = Debug|Win32 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.ActiveCfg = Debug|x64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.Build.0 = Debug|x64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|ARM64.ActiveCfg = Release_NoSTDIO|ARM64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|ARM64.Build.0 = Release_NoSTDIO|ARM64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|Win32.ActiveCfg = Release_NoSTDIO|Win32 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|Win32.Build.0 = Release_NoSTDIO|Win32 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|x64.ActiveCfg = Release_NoSTDIO|x64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|x64.Build.0 = Release_NoSTDIO|x64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|ARM64.ActiveCfg = Release|ARM64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|ARM64.Build.0 = Release|ARM64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.ActiveCfg = Release|Win32 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.Build.0 = Release|Win32 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.ActiveCfg = Release|x64 + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {D0FB7C52-B8AE-4A23-A002-2F7DEF5F6BD6} + EndGlobalSection +EndGlobal diff --git a/externals/vcpkg/ports/sdl1/SDLmain.vcxproj.in b/externals/vcpkg/ports/sdl1/SDLmain.vcxproj.in new file mode 100755 index 000000000..249b17440 --- /dev/null +++ b/externals/vcpkg/ports/sdl1/SDLmain.vcxproj.in @@ -0,0 +1,313 @@ + + + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release_NoSTDIO + ARM64 + + + Release_NoSTDIO + Win32 + + + Release_NoSTDIO + x64 + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} + + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>15.0.27924.0 + + + .\Release\ + .\Release\ + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + .\Release_NOSTDIO\ + .\Release_NOSTDIO\ + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + .\Debug\ + .\Debug\ + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + + OnlyExplicitInline + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + @CRT_TYPE_REL@ + true + + .\Release/SDLmain.pch + Level3 + Default + + + + + X64 + + + OnlyExplicitInline + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + @CRT_TYPE_REL@ + true + + .\Release/SDLmain.pch + Level3 + Default + + + + + + OnlyExplicitInline + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + @CRT_TYPE_REL@ + true + + + .\Release/SDLmain.pch + Level3 + Default + + + + + OnlyExplicitInline + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;NO_STDIO_REDIRECT;%(PreprocessorDefinitions) + true + @CRT_TYPE_REL@ + true + + .\Release_NOSTDIO/SDLmain.pch + Level3 + Default + + + + + X64 + + + OnlyExplicitInline + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;NO_STDIO_REDIRECT;%(PreprocessorDefinitions) + true + @CRT_TYPE_REL@ + true + + .\Release_NOSTDIO/SDLmain.pch + Level3 + Default + + + + + + OnlyExplicitInline + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;NO_STDIO_REDIRECT;%(PreprocessorDefinitions) + true + @CRT_TYPE_REL@ + true + + + .\Release_NOSTDIO/SDLmain.pch + Level3 + Default + + + + + Disabled + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + @CRT_TYPE_DBG@ + + .\Debug/SDLmain.pch + Level3 + OldStyle + Default + + + + + X64 + + + Disabled + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + @CRT_TYPE_DBG@ + + .\Debug/SDLmain.pch + Level3 + OldStyle + Default + + + + + + Disabled + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + @CRT_TYPE_DBG@ + + + .\Debug/SDLmain.pch + Level3 + OldStyle + Default + + + + + + + + + \ No newline at end of file diff --git a/externals/vcpkg/ports/sdl1/export-symbols-only-in-shared-build.patch b/externals/vcpkg/ports/sdl1/export-symbols-only-in-shared-build.patch new file mode 100755 index 000000000..c1ea96dc3 --- /dev/null +++ b/externals/vcpkg/ports/sdl1/export-symbols-only-in-shared-build.patch @@ -0,0 +1,15 @@ +diff -r 8df7a59b5528 -r 46ec9baae30c include/begin_code.h +--- a/include/begin_code.h Fri Sep 22 11:25:52 2017 -0700 ++++ b/include/begin_code.h Sun Sep 24 14:32:30 2017 +0300 +@@ -54,8 +54,10 @@ + # else + # define DECLSPEC __declspec(dllimport) + # endif ++# elif defined(_DLL) ++# define DECLSPEC __declspec(dllexport) + # else +-# define DECLSPEC __declspec(dllexport) ++# define DECLSPEC + # endif + # elif defined(__OS2__) + # ifdef __WATCOMC__ diff --git a/externals/vcpkg/ports/sdl1/fix-linux-build.patch b/externals/vcpkg/ports/sdl1/fix-linux-build.patch new file mode 100755 index 000000000..f6ad36c2d --- /dev/null +++ b/externals/vcpkg/ports/sdl1/fix-linux-build.patch @@ -0,0 +1,13 @@ +diff --git a/src/video/x11/SDL_x11sym.h b/src/video/x11/SDL_x11sym.h +index 4875b98..10bf365 100644 +--- a/src/video/x11/SDL_x11sym.h ++++ b/src/video/x11/SDL_x11sym.h +@@ -165,7 +165,7 @@ SDL_X11_SYM(Bool,XShmQueryExtension,(Display* a),(a),return) + */ + #ifdef LONG64 + SDL_X11_MODULE(IO_32BIT) +-SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) ++SDL_X11_SYM(int,_XData32,(Display *dpy,_Xconst register long *data,unsigned len),(dpy,data,len),return) + SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),) + #endif + diff --git a/externals/vcpkg/ports/sdl1/portfile.cmake b/externals/vcpkg/ports/sdl1/portfile.cmake new file mode 100755 index 000000000..3f46fe389 --- /dev/null +++ b/externals/vcpkg/ports/sdl1/portfile.cmake @@ -0,0 +1,87 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO SDL-Mirror/SDL + REF release-1.2.15 + SHA512 38b94a650ec205377ae1503d0ec8a5254ef6d50ed0acac8d985b57b64bc16ea042cfa41e19e5ef8317980c4afb83186829f5bc3da9433d0a649dfd10554801b5 + HEAD_REF master + PATCHES + export-symbols-only-in-shared-build.patch + fix-linux-build.patch + sdl-config.patch +) + +configure_file("${SOURCE_PATH}/include/SDL_config.h.default" "${SOURCE_PATH}/include/SDL_config.h" COPYONLY) + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/SDL1_2017.sln" DESTINATION "${SOURCE_PATH}/VisualC/") + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(LIB_TYPE StaticLibrary) + else() + set(LIB_TYPE DynamicLibrary) + endif() + + if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + set(CRT_TYPE_DBG MultiThreadedDebugDLL) + set(CRT_TYPE_REL MultiThreadedDLL) + else() + set(CRT_TYPE_DBG MultiThreadedDebug) + set(CRT_TYPE_REL MultiThreaded) + endif() + + configure_file("${CURRENT_PORT_DIR}/SDL.vcxproj.in" "${SOURCE_PATH}/VisualC/SDL/SDL.vcxproj" @ONLY) + configure_file("${CURRENT_PORT_DIR}/SDLmain.vcxproj.in" "${SOURCE_PATH}/VisualC/SDLmain/SDLmain.vcxproj" @ONLY) + + # This text file gets copied as a library, and included as one in the package + file(REMOVE_RECURSE "${SOURCE_PATH}/src/hermes/COPYING.LIB") + + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH VisualC/SDL1_2017.sln + INCLUDES_SUBPATH include + LICENSE_SUBPATH COPYING + ALLOW_ROOT_INCLUDES + ) + + #Take all the fils into include/SDL to sovle conflict with SDL2 port + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/doxyfile") + file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include.tmp") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") + file(RENAME "${CURRENT_PACKAGES_DIR}/include.tmp" "${CURRENT_PACKAGES_DIR}/include/SDL") + + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/SDLmain.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/SDLmain.lib") + if(NOT DEFINED VCPKG_BUILD_TYPE) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/SDLmain.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/SDLmaind.lib") + endif() +else() + if(VCPKG_TARGET_IS_LINUX) + message("libgles2-mesa-dev must be installed before sdl1 can build. Install it with \"apt install libgles2-mesa-dev\".") + endif() + + find_program(WHICH_COMMAND NAMES which) + if(NOT WHICH_COMMAND) + set(polyfill_scripts "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-bin") + file(REMOVE_RECURSE "${polyfill_scripts}") + file(MAKE_DIRECTORY "${polyfill_scripts}") + vcpkg_host_path_list(APPEND ENV{PATH} "${polyfill_scripts}") + # sdl's autoreconf.sh needs `which`, but our msys root doesn't have it. + file(WRITE "${polyfill_scripts}/which" "#!/bin/sh\nif test -f \"/usr/bin/\$1\"; then echo \"/usr/bin/\$1\"; else false; fi\n") + file(CHMOD "${polyfill_scripts}/which" PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE) + endif() + + vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + ) + + vcpkg_install_make() + vcpkg_fixup_pkgconfig() + + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/man3" + ) + + file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/externals/vcpkg/ports/sdl1/sdl-config.patch b/externals/vcpkg/ports/sdl1/sdl-config.patch new file mode 100755 index 000000000..0851ade5d --- /dev/null +++ b/externals/vcpkg/ports/sdl1/sdl-config.patch @@ -0,0 +1,13 @@ +diff --git a/sdl-config.in b/sdl-config.in +index e0fcc0c..de602d8 100644 +--- a/sdl-config.in ++++ b/sdl-config.in +@@ -1,6 +1,7 @@ + #!/bin/sh + +-prefix=@prefix@ ++DIRNAME=$(dirname $0) ++prefix=$(CDPATH= cd -- "${DIRNAME%/tools/sdl1/*}" && pwd -P) + exec_prefix=@exec_prefix@ + exec_prefix_set=no + libdir=@libdir@ diff --git a/externals/vcpkg/ports/sdl1/vcpkg.json b/externals/vcpkg/ports/sdl1/vcpkg.json new file mode 100755 index 000000000..43968e5ed --- /dev/null +++ b/externals/vcpkg/ports/sdl1/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "sdl1", + "version": "1.2.15", + "port-version": 17, + "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", + "homepage": "https://www.libsdl.org", + "license": "LGPL-2.1-or-later", + "supports": "!osx & !uwp" +} diff --git a/externals/vcpkg/ports/sdl2-gfx/001-lrint-arm64.patch b/externals/vcpkg/ports/sdl2-gfx/001-lrint-arm64.patch new file mode 100755 index 000000000..50de17973 --- /dev/null +++ b/externals/vcpkg/ports/sdl2-gfx/001-lrint-arm64.patch @@ -0,0 +1,26 @@ +diff --git a/SDL2_gfxPrimitives.c b/SDL2_gfxPrimitives.c +index f81e6da..91817fd 100755 +--- a/SDL2_gfxPrimitives.c ++++ b/SDL2_gfxPrimitives.c +@@ -1771,8 +1771,20 @@ __declspec(naked) long int + __emit(0xE12FFF1E); // bx lr + } + #pragma warning(pop) ++#elif defined(_M_ARM64) ++#include ++#pragma warning(push) ++#pragma warning(disable: 4716) ++__declspec(naked) long ++ lrint (double f) ++{ ++ __emit(0x1e674000); // frintx d0, d0 ++ __emit(0x9e780000); // fcvtzs x0, d0 ++ __emit(0xd65f03c0); // ret ++} ++#pragma warning(pop) + #else +-#error lrint needed for MSVC on non X86/AMD64/ARM targets. ++#error lrint needed for MSVC on non X86/AMD64/ARM/ARM64 targets. + #endif + #endif + diff --git a/externals/vcpkg/ports/sdl2-gfx/002-use-the-lrintf-intrinsic.patch b/externals/vcpkg/ports/sdl2-gfx/002-use-the-lrintf-intrinsic.patch new file mode 100755 index 000000000..51af54d71 --- /dev/null +++ b/externals/vcpkg/ports/sdl2-gfx/002-use-the-lrintf-intrinsic.patch @@ -0,0 +1,14 @@ +diff --git a/SDL2_gfxPrimitives.c b/SDL2_gfxPrimitives.c +index d8afb10..6c88288 100644 +--- a/SDL2_gfxPrimitives.c ++++ b/SDL2_gfxPrimitives.c +@@ -1757,7 +1757,8 @@ int filledCircleRGBA(SDL_Renderer * renderer, Sint16 x, Sint16 y, Sint16 rad, Ui + /* ----- AA Ellipse */ + + /* Windows targets do not have lrint, so provide a local inline version */ +-#if defined(_MSC_VER) ++/* MSVC pre 16.8 do not have lrint */ ++#if defined(_MSC_VER) && _MSC_VER < 1928 + /* Detect 64bit and use intrinsic version */ + #ifdef _M_X64 + #include diff --git a/externals/vcpkg/ports/sdl2-gfx/CMakeLists.txt b/externals/vcpkg/ports/sdl2-gfx/CMakeLists.txt new file mode 100755 index 000000000..9c94b9b22 --- /dev/null +++ b/externals/vcpkg/ports/sdl2-gfx/CMakeLists.txt @@ -0,0 +1,53 @@ +cmake_minimum_required(VERSION 3.0) +project(SDL2_gfx VERSION 1.0.4 LANGUAGES C) + +set(CONFIG_NAME "sdl2-gfx") + +find_path(SDL_INCLUDE_DIR SDL2/SDL.h) +find_package(SDL2 CONFIG REQUIRED) + +# builtin formats +set(SDL_GFX_DEFINES WIN32) +if(BUILD_SHARED_LIBS) + list(APPEND SDL_GFX_DEFINES DLL_EXPORT) +endif() + +add_library(${PROJECT_NAME} + SDL2_framerate.c + SDL2_gfxPrimitives.c + SDL2_imageFilter.c + SDL2_rotozoom.c) + +target_include_directories(${PROJECT_NAME} PUBLIC + $ + $ + $ +) + +if(WIN32) + add_compile_definitions(${SDL_GFX_DEFINES}) +endif() +target_include_directories(${PROJECT_NAME} PRIVATE ${SDL_INCLUDE_DIR}/SDL2) +target_link_libraries(${PROJECT_NAME} PRIVATE SDL2::SDL2) + +install(TARGETS ${PROJECT_NAME} + EXPORT ${PROJECT_NAME} + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib) + +install(EXPORT ${PROJECT_NAME} + FILE ${CONFIG_NAME}-targets.cmake + NAMESPACE SDL2:: + DESTINATION share/${CONFIG_NAME}/ +) +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}-config.cmake +"include(CMakeFindDependencyMacro) +find_dependency(SDL2 CONFIG) +include(\${CMAKE_CURRENT_LIST_DIR}/${CONFIG_NAME}-targets.cmake)" +) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}-config.cmake DESTINATION share/${CONFIG_NAME}) + +if(NOT SDL_GFX_SKIP_HEADERS) + install(FILES SDL2_framerate.h SDL2_gfxPrimitives.h SDL2_imageFilter.h SDL2_rotozoom.h SDL2_gfxPrimitives_font.h DESTINATION include/SDL2) +endif() diff --git a/externals/vcpkg/ports/sdl2-gfx/portfile.cmake b/externals/vcpkg/ports/sdl2-gfx/portfile.cmake new file mode 100755 index 000000000..16616c23b --- /dev/null +++ b/externals/vcpkg/ports/sdl2-gfx/portfile.cmake @@ -0,0 +1,32 @@ +set(VERSION 1.0.4) + +vcpkg_download_distfile(ARCHIVE + URLS "http://www.ferzkopp.net/Software/SDL2_gfx/SDL2_gfx-${VERSION}.zip" + FILENAME "SDL2_gfx-${VERSION}.zip" + SHA512 213b481469ba2161bd8558a7a5427b129420193b1c3895923d515f69f87991ed2c99bbc44349c60b4bcbb7d7d2255c1f15ee8a3523c26502070cfaacccaa5242 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${VERSION} + PATCHES + 001-lrint-arm64.patch + 002-use-the-lrintf-intrinsic.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG -DSDL_GFX_SKIP_HEADERS=1 +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_copy_pdbs() \ No newline at end of file diff --git a/externals/vcpkg/ports/sdl2-gfx/vcpkg.json b/externals/vcpkg/ports/sdl2-gfx/vcpkg.json new file mode 100755 index 000000000..8818ca6a3 --- /dev/null +++ b/externals/vcpkg/ports/sdl2-gfx/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "sdl2-gfx", + "version-string": "1.0.4", + "port-version": 8, + "description": "Graphics primitives (line, circle, rectangle etc.) with AA support, rotozoomer and other drawing related support functions wrapped up in a C based add-on library for the Simple Direct Media (SDL) cross-platform API layer.", + "dependencies": [ + "sdl2" + ] +} diff --git a/externals/vcpkg/ports/sdl2-image/0001-sdl2-image-potentially-uninitialized_local-pointer-variable-start.patch b/externals/vcpkg/ports/sdl2-image/0001-sdl2-image-potentially-uninitialized_local-pointer-variable-start.patch new file mode 100755 index 000000000..897c0aac7 --- /dev/null +++ b/externals/vcpkg/ports/sdl2-image/0001-sdl2-image-potentially-uninitialized_local-pointer-variable-start.patch @@ -0,0 +1,12 @@ +--- a/nanosvg.h ++++ b/nanosvg.h +@@ -2778,7 +2778,7 @@ static void nsvg__content(void* ud, const char* s) + if (p->styleFlag) { + + int state = 0; +- const char* start; ++ const char* start = 0; + while (*s) { + char c = *s; + if (nsvg__isspace(c) || c == '{') { + diff --git a/externals/vcpkg/ports/sdl2-image/CMakeLists.txt b/externals/vcpkg/ports/sdl2-image/CMakeLists.txt new file mode 100755 index 000000000..45b2b57e6 --- /dev/null +++ b/externals/vcpkg/ports/sdl2-image/CMakeLists.txt @@ -0,0 +1,130 @@ +cmake_minimum_required(VERSION 2.6) +project(SDL2_image C) + +### configuration ### + +# enable all file formats which are supported natively +set(SUPPORTED_FORMATS BMP GIF LBM PCX PNM TGA XPM XCF XV SVG) + +# enable all file formats which are supported through external dependencies +option(USE_WEBP "Enable support for WebP format" OFF) +option(USE_PNG "Enable support for PNG format" OFF) +option(USE_JPEG "Enable support for JPEG format" OFF) +option(USE_TIFF "Enable support for TIFF format" OFF) + +### implementation ### + +add_library(SDL2_image + IMG.c + IMG_bmp.c + IMG_gif.c + IMG_jpg.c + IMG_lbm.c + IMG_pcx.c + IMG_png.c + IMG_pnm.c + IMG_svg.c + IMG_tga.c + IMG_tif.c + IMG_webp.c + IMG_xcf.c + IMG_xpm.c + IMG_xv.c + IMG_xxx.c + IMG_WIC.c + version.rc + ) + +if (APPLE) + target_sources(SDL2_image PRIVATE + IMG_ImageIO.m + ) + target_compile_options(SDL2_image BEFORE PRIVATE + "-x" "objective-c" + ) +endif() + +set_target_properties(SDL2_image PROPERTIES DEFINE_SYMBOL DLL_EXPORT) + +foreach(FORMAT ${SUPPORTED_FORMATS}) + add_definitions(-DLOAD_${FORMAT}) +endforeach(FORMAT) + +# SDL +find_path(SDL_INCLUDE_DIR SDL2/SDL.h) +find_package(SDL2 CONFIG REQUIRED) + +include_directories(${SDL_INCLUDE_DIR}) +include_directories(${SDL_INCLUDE_DIR}/SDL2) +include_directories(${CMAKE_SOURCE_DIR}) + +target_link_libraries(SDL2_image SDL2::SDL2) + +# external dependencies +if(USE_WEBP) + find_package(WebP CONFIG REQUIRED) + add_definitions(-DLOAD_WEBP) + target_link_libraries(SDL2_image PRIVATE WebP::webp) +endif() + +if(USE_PNG) + find_package(PNG REQUIRED) + add_definitions(-DLOAD_PNG) + target_link_libraries(SDL2_image PRIVATE PNG::PNG) +endif() + +if(USE_JPEG) + find_package(JPEG REQUIRED) + add_definitions(-DLOAD_JPG) + target_link_libraries(SDL2_image PRIVATE ${JPEG_LIBRARIES}) +endif() + +if(USE_TIFF) + find_package(TIFF REQUIRED) + add_definitions(-DLOAD_TIF) + target_link_libraries(SDL2_image PRIVATE TIFF::TIFF) + + if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996") + endif() +endif() + +install(TARGETS SDL2_image + EXPORT SDL2_image + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib) + +install(FILES SDL_image.h DESTINATION include/SDL2 CONFIGURATIONS Release) + +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sdl2-image-config.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/sdl2-image-config.cmake" @ONLY + INSTALL_DESTINATION "share/sdl2-image") + +set(prefix "") +set(exec_prefix [[${prefix}]]) +set(libdir [[${prefix}/lib]]) +set(includedir [[${prefix}/include]]) +set(PACKAGE "SDL2_image") +file(READ "SDL_image.h" header_contents) +# #define SDL_IMAGE_MAJOR_VERSION 2 +# #define SDL_IMAGE_MINOR_VERSION 0 +# #define SDL_IMAGE_PATCHLEVEL 5 +string(REGEX MATCH "define *SDL_IMAGE_MAJOR_VERSION *([0-9]+)" _ "${header_contents}") +set(VERSION ${CMAKE_MATCH_1}) +string(REGEX MATCH "define *SDL_IMAGE_MINOR_VERSION *([0-9]+)" _ "${header_contents}") +string(APPEND VERSION ".${CMAKE_MATCH_1}") +string(REGEX MATCH "define *SDL_IMAGE_PATCHLEVEL *([0-9]+)" _ "${header_contents}") +string(APPEND VERSION ".${CMAKE_MATCH_1}") +set(SDL_VERSION 0.0) +configure_file(SDL2_image.pc.in "${CMAKE_CURRENT_BINARY_DIR}/SDL2_image.pc" @ONLY) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/SDL2_image.pc DESTINATION lib/pkgconfig) + +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sdl2-image-config.cmake DESTINATION share/sdl2-image) + +install(EXPORT SDL2_image + DESTINATION share/sdl2-image/ + FILE sdl2-image-targets.cmake + NAMESPACE SDL2:: +) diff --git a/externals/vcpkg/ports/sdl2-image/portfile.cmake b/externals/vcpkg/ports/sdl2-image/portfile.cmake new file mode 100755 index 000000000..cede4e416 --- /dev/null +++ b/externals/vcpkg/ports/sdl2-image/portfile.cmake @@ -0,0 +1,43 @@ +set(SDL2_IMAGE_VERSION "2.0.5") + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.libsdl.org/projects/SDL_image/release/SDL2_image-${SDL2_IMAGE_VERSION}.zip" + FILENAME "SDL2_image-${SDL2_IMAGE_VERSION}.zip" + SHA512 c10e28a0d50fb7a6c985ffe8904370ab4faeb9bbed6f2ffbc81536422e8f8bb66eddbf69b12423082216c2bcfcb617cba4c5970f63fe75bfacccd9f99f02a6a2 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${SDL2_IMAGE_VERSION} + PATCHES + 0001-sdl2-image-potentially-uninitialized_local-pointer-variable-start.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/sdl2-image-config.cmake.in" DESTINATION "${SOURCE_PATH}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + libjpeg-turbo USE_JPEG + tiff USE_TIFF + libwebp USE_WEBP +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DUSE_PNG=ON + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/sdl2-image/sdl2-image-config.cmake.in b/externals/vcpkg/ports/sdl2-image/sdl2-image-config.cmake.in new file mode 100755 index 000000000..8db8b11d0 --- /dev/null +++ b/externals/vcpkg/ports/sdl2-image/sdl2-image-config.cmake.in @@ -0,0 +1,13 @@ +include(CMakeFindDependencyMacro) + +find_dependency(SDL2 CONFIG) + +if(@USE_WEBP@) + find_dependency(WebP CONFIG) +endif() + +if (@USE_PNG@) + find_dependency(PNG) +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/sdl2-image-targets.cmake") diff --git a/externals/vcpkg/ports/sdl2-image/vcpkg.json b/externals/vcpkg/ports/sdl2-image/vcpkg.json new file mode 100755 index 000000000..0eb0da92b --- /dev/null +++ b/externals/vcpkg/ports/sdl2-image/vcpkg.json @@ -0,0 +1,61 @@ +{ + "name": "sdl2-image", + "version": "2.0.5", + "port-version": 6, + "description": "SDL_image is an image file loading library. It loads images as SDL surfaces and textures, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV", + "homepage": "https://www.libsdl.org/projects/SDL_image", + "license": "Zlib", + "dependencies": [ + "libpng", + "sdl2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "libjpeg-turbo": { + "description": "Support for JPEG image format", + "dependencies": [ + "libjpeg-turbo", + { + "name": "sdl2", + "features": [ + "x11" + ], + "platform": "!windows" + } + ] + }, + "libwebp": { + "description": "Support for WEBP image format.", + "dependencies": [ + "libwebp", + { + "name": "sdl2", + "features": [ + "x11" + ], + "platform": "!windows" + } + ] + }, + "tiff": { + "description": "Support for TIFF image format", + "dependencies": [ + { + "name": "sdl2", + "features": [ + "x11" + ], + "platform": "!windows" + }, + "tiff" + ] + } + } +} diff --git a/externals/vcpkg/ports/sdl2-mixer/CMakeLists.txt b/externals/vcpkg/ports/sdl2-mixer/CMakeLists.txt new file mode 100755 index 000000000..2ab5e00ad --- /dev/null +++ b/externals/vcpkg/ports/sdl2-mixer/CMakeLists.txt @@ -0,0 +1,166 @@ +cmake_minimum_required(VERSION 3.1) +project(SDL2_MIXER C) + +find_path(SDL_INCLUDE_DIR SDL.h PATH_SUFFIXES SDL2) +find_package(SDL2 CONFIG REQUIRED) +set(SDL_MIXER_INCLUDES ${SDL_INCLUDE_DIR}) + +set(SDL_MIXER_LIBRARIES SDL2::SDL2) + +# builtin formats +set(SDL_MIXER_DEFINES MUSIC_WAV) + +# MP3 support +if(SDL_MIXER_ENABLE_MP3) + find_path(MPG123_INCLUDE_DIR mpg123.h) + find_library(MPG123_LIBRARY NAMES libmpg123 mpg123) + list(APPEND SDL_MIXER_INCLUDES ${MPG123_INCLUDE_DIR}) + list(APPEND SDL_MIXER_DEFINES MUSIC_MP3_MPG123) + list(APPEND SDL_MIXER_LIBRARIES ${MPG123_LIBRARY}) + if (SDL_DYNAMIC_LOAD) + get_filename_component(MPG123_LIBRARY_NAME "${MPG123_LIBRARY}" NAME_WE) + list(APPEND SDL_MIXER_LOAD_DEFINES -DMPG123_DYNAMIC="${MPG123_LIBRARY_NAME}${LIBRARY_SUFFIX}") + endif() +endif() + +# FLAC support +if(SDL_MIXER_ENABLE_FLAC) + find_path(FLAC_INCLUDE_DIR FLAC/all.h) + find_library(FLAC_LIBRARY FLAC) + list(APPEND SDL_MIXER_INCLUDES ${FLAC_INCLUDE_DIR}) + list(APPEND SDL_MIXER_DEFINES MUSIC_FLAC) + list(APPEND SDL_MIXER_LIBRARIES ${FLAC_LIBRARY}) + if (SDL_DYNAMIC_LOAD) + get_filename_component(FLAC_LIBRARY_NAME "${FLAC_LIBRARY}" NAME_WE) + list(APPEND SDL_MIXER_LOAD_DEFINES -DFLAC_DYNAMIC="${FLAC_LIBRARY_NAME}${LIBRARY_SUFFIX}") + endif() +endif() + +# MOD support +if(SDL_MIXER_ENABLE_MOD) + find_path(MODPLUG_INCLUDE_DIR libmodplug/modplug.h) + find_library(MODPLUG_LIBRARY modplug) + list(APPEND SDL_MIXER_INCLUDES ${MODPLUG_INCLUDE_DIR}) + list(APPEND SDL_MIXER_DEFINES MUSIC_MOD_MODPLUG) + list(APPEND SDL_MIXER_LIBRARIES ${MODPLUG_LIBRARY}) + if (SDL_DYNAMIC_LOAD) + get_filename_component(MODPLUG_LIBRARY_NAME "${MODPLUG_LIBRARY}" NAME_WE) + list(APPEND SDL_MIXER_LOAD_DEFINES -DMODPLUG_DYNAMIC="${MODPLUG_LIBRARY_NAME}${LIBRARY_SUFFIX}") + endif() +endif() + +# Ogg-Vorbis support +if(SDL_MIXER_ENABLE_OGGVORBIS) + find_path(VORBIS_INCLUDE_DIR vorbis/codec.h) + find_library(VORBISFILE_LIBRARY vorbisfile) + list(APPEND SDL_MIXER_INCLUDES ${VORBIS_INCLUDE_DIR}) + list(APPEND SDL_MIXER_DEFINES MUSIC_OGG) + list(APPEND SDL_MIXER_LIBRARIES ${VORBISFILE_LIBRARY}) + if (SDL_DYNAMIC_LOAD) + get_filename_component(VORBISFILE_LIBRARY_NAME "${VORBISFILE_LIBRARY}" NAME_WE) + list(APPEND SDL_MIXER_LOAD_DEFINES -DOGG_DYNAMIC="${VORBISFILE_LIBRARY_NAME}${LIBRARY_SUFFIX}") + endif() +endif() + +# Opus support +if(SDL_MIXER_ENABLE_OPUS) + find_path(OPUS_INCLUDE_DIR opus/opusfile.h) + find_library(OPUSFILE_LIBRARY opusfile) + list(APPEND SDL_MIXER_INCLUDES ${OPUS_INCLUDE_DIR}) + list(APPEND SDL_MIXER_DEFINES MUSIC_OPUS) + list(APPEND SDL_MIXER_LIBRARIES ${OPUSFILE_LIBRARY}) + if (SDL_DYNAMIC_LOAD) + get_filename_component(OPUSFILE_LIBRARY_NAME "${OPUSFILE_LIBRARY}" NAME_WE) + list(APPEND SDL_MIXER_LOAD_DEFINES -DOPUS_DYNAMIC="${OPUSFILE_LIBRARY_NAME}${LIBRARY_SUFFIX}") + endif() +endif() + +# Fluidsynth support +if(SDL_MIXER_ENABLE_FLUIDSYNTH) + find_path(FLUIDSYNTH_INCLUDE_DIR fluidsynth.h) + find_library(FLUIDSYNTH_LIBRARY fluidsynth) + list(APPEND SDL_MIXER_INCLUDES ${FLUIDSYNTH_INCLUDE_DIR}) + list(APPEND SDL_MIXER_DEFINES MUSIC_MID_FLUIDSYNTH) + list(APPEND SDL_MIXER_LIBRARIES ${FLUIDSYNTH_LIBRARY}) + if (SDL_DYNAMIC_LOAD) + get_filename_component(FLUIDSYNTH_LIBRARY_NAME "${FLUIDSYNTH_LIBRARY}" NAME_WE) + list(APPEND SDL_MIXER_LOAD_DEFINES -DFLUIDSYNTH_DYNAMIC="${FLUIDSYNTH_LIBRARY_NAME}${LIBRARY_SUFFIX}") + endif() +endif() + +add_library(SDL2_mixer + effect_position.c + effect_stereoreverse.c + effects_internal.c + load_aiff.c + load_voc.c + mixer.c + music.c + music_cmd.c + music_flac.c + music_fluidsynth.c + music_mad.c + music_mikmod.c + music_modplug.c + music_mpg123.c + music_ogg.c + music_opus.c + music_timidity.c + music_wav.c + version.rc) + +if((WIN32 OR APPLE) AND SDL_MIXER_ENABLE_NATIVEMIDI) + list(APPEND SDL_MIXER_DEFINES MUSIC_MID_NATIVE) + target_sources(SDL2_mixer PRIVATE music_nativemidi.c native_midi/native_midi_common.c) + target_link_libraries(SDL2_mixer ${SDL_MIXER_LIBRARIES}) + if(WIN32) + target_sources(SDL2_mixer PRIVATE native_midi/native_midi_win32.c) + target_link_libraries(SDL2_mixer Winmm) + elseif(APPLE) + target_sources(SDL2_mixer PRIVATE native_midi/native_midi_macosx.c) + endif() +endif() + +set_target_properties(SDL2_mixer PROPERTIES DEFINE_SYMBOL DLL_EXPORT) +target_compile_definitions(SDL2_mixer PRIVATE ${SDL_MIXER_DEFINES} ${SDL_MIXER_LOAD_DEFINES}) +target_include_directories(SDL2_mixer PRIVATE ${SDL_MIXER_INCLUDES} ./native_midi) + +install(TARGETS SDL2_mixer + EXPORT SDL2_mixer + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib) + +install(EXPORT SDL2_mixer + DESTINATION share/sdl2-mixer/ + FILE sdl2-mixer-config.cmake + NAMESPACE SDL2:: +) + +set(prefix "") +set(exec_prefix [[${prefix}]]) +set(libdir [[${prefix}/lib]]) +set(includedir [[${prefix}/include]]) +set(PACKAGE "SDL2_mixer") +file(READ "SDL_mixer.h" header_contents) +# #define SDL_MIXER_MAJOR_VERSION 2 +# #define SDL_MIXER_MINOR_VERSION 0 +# #define SDL_MIXER_PATCHLEVEL 5 +string(REGEX MATCH "define *SDL_MIXER_MAJOR_VERSION *([0-9]+)" _ "${header_contents}") +set(VERSION ${CMAKE_MATCH_1}) +string(REGEX MATCH "define *SDL_MIXER_MINOR_VERSION *([0-9]+)" _ "${header_contents}") +string(APPEND VERSION ".${CMAKE_MATCH_1}") +string(REGEX MATCH "define *SDL_MIXER_PATCHLEVEL *([0-9]+)" _ "${header_contents}") +string(APPEND VERSION ".${CMAKE_MATCH_1}") +set(SDL_VERSION 0.0) +configure_file(SDL2_mixer.pc.in "${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer.pc" @ONLY) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer.pc DESTINATION lib/pkgconfig) + +if(NOT SDL_MIXER_SKIP_HEADERS) + install(FILES SDL_mixer.h DESTINATION include/SDL2) +endif() + +message(STATUS "Link-time dependencies:") +foreach(LIBRARY ${SDL_MIXER_LIBRARIES}) + message(STATUS " " ${LIBRARY}) +endforeach() diff --git a/externals/vcpkg/ports/sdl2-mixer/fix-featurempg123.patch b/externals/vcpkg/ports/sdl2-mixer/fix-featurempg123.patch new file mode 100755 index 000000000..0edcdf871 --- /dev/null +++ b/externals/vcpkg/ports/sdl2-mixer/fix-featurempg123.patch @@ -0,0 +1,47 @@ +diff --git a/music_mpg123.c b/music_mpg123.c +index cd151b9..b4294ab 100644 +--- a/music_mpg123.c ++++ b/music_mpg123.c +@@ -31,7 +31,11 @@ + #include "music_mpg123.h" + + #include +- ++#ifdef _MSC_VER ++typedef ptrdiff_t MIX_SSIZE_T; ++#else ++typedef ssize_t MIX_SSIZE_T; ++#endif + + typedef struct { + int loaded; +@@ -49,7 +53,7 @@ typedef struct { + const char* (*mpg123_plain_strerror)(int errcode); + void (*mpg123_rates)(const long **list, size_t *number); + int (*mpg123_read)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done ); +- int (*mpg123_replace_reader_handle)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) ); ++ int (*mpg123_replace_reader_handle)( mpg123_handle *mh, MIX_SSIZE_T (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) ); + off_t (*mpg123_seek)( mpg123_handle *mh, off_t sampleoff, int whence ); + const char* (*mpg123_strerror)(mpg123_handle *mh); + } mpg123_loader; +@@ -96,7 +100,7 @@ static int MPG123_Load(void) + FUNCTION_LOADER(mpg123_plain_strerror, const char* (*)(int errcode)) + FUNCTION_LOADER(mpg123_rates, void (*)(const long **list, size_t *number)); + FUNCTION_LOADER(mpg123_read, int (*)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done )) +- FUNCTION_LOADER(mpg123_replace_reader_handle, int (*)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) )) ++ FUNCTION_LOADER(mpg123_replace_reader_handle, int (*)( mpg123_handle *mh, MIX_SSIZE_T (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) )) + FUNCTION_LOADER(mpg123_seek, off_t (*)( mpg123_handle *mh, off_t sampleoff, int whence )) + FUNCTION_LOADER(mpg123_strerror, const char* (*)(mpg123_handle *mh)) + } +@@ -181,9 +185,9 @@ static char const* mpg_err(mpg123_handle* mpg, int result) + } + + /* we're gonna override mpg123's I/O with these wrappers for RWops */ +-static ssize_t rwops_read(void* p, void* dst, size_t n) ++static MIX_SSIZE_T rwops_read(void* p, void* dst, size_t n) + { +- return (ssize_t)SDL_RWread((SDL_RWops*)p, dst, 1, n); ++ return (MIX_SSIZE_T )SDL_RWread((SDL_RWops*)p, dst, 1, n); + } + + static off_t rwops_seek(void* p, off_t offset, int whence) diff --git a/externals/vcpkg/ports/sdl2-mixer/portfile.cmake b/externals/vcpkg/ports/sdl2-mixer/portfile.cmake new file mode 100755 index 000000000..c0f1a0225 --- /dev/null +++ b/externals/vcpkg/ports/sdl2-mixer/portfile.cmake @@ -0,0 +1,60 @@ +set(SDL2_MIXER_VERSION 2.0.4) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${SDL2_MIXER_VERSION}.zip" + FILENAME "SDL2_mixer-${SDL2_MIXER_VERSION}.zip" + SHA512 359b4f9877804f9c4b3cb608ca6082aab684f07a20a816ab71c8cdf85d26f76d67eeb5aee44daf52b7935d82aa3b45941f8f53f07ca3dd5150d6c58ed99e1492 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${SDL2_MIXER_VERSION} + PATCHES + fix-featurempg123.patch +) + +if ("dynamic-load" IN_LIST FEATURES) + if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + message("Building static library, disable dynamic loading") + elseif (NOT "mpg123" IN_LIST FEATURES + AND NOT "libflac" IN_LIST FEATURES + AND NOT "libmodplug" IN_LIST FEATURES + AND NOT "libvorbis" IN_LIST FEATURES + AND NOT "opusfile" IN_LIST FEATURES + ) + message("No features selected, dynamic loading will not be enabled") + endif() +endif() + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + dynamic-load SDL_DYNAMIC_LOAD + mpg123 SDL_MIXER_ENABLE_MP3 + libflac SDL_MIXER_ENABLE_FLAC + libmodplug SDL_MIXER_ENABLE_MOD + libvorbis SDL_MIXER_ENABLE_OGGVORBIS + opusfile SDL_MIXER_ENABLE_OPUS + nativemidi SDL_MIXER_ENABLE_NATIVEMIDI + fluidsynth SDL_MIXER_ENABLE_FLUIDSYNTH +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DLIBRARY_SUFFIX=${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX} # It should always be dynamic suffix + OPTIONS_DEBUG + -DSDL_MIXER_SKIP_HEADERS=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/sdl2-mixer/vcpkg.json b/externals/vcpkg/ports/sdl2-mixer/vcpkg.json new file mode 100755 index 000000000..a0286dd91 --- /dev/null +++ b/externals/vcpkg/ports/sdl2-mixer/vcpkg.json @@ -0,0 +1,65 @@ +{ + "name": "sdl2-mixer", + "version": "2.0.4", + "port-version": 16, + "description": "Multi-channel audio mixer library for SDL.", + "homepage": "https://www.libsdl.org/projects/SDL_mixer", + "dependencies": [ + "sdl2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "nativemidi" + ], + "features": { + "dynamic-load": { + "description": "Load plugins with dynamic call." + }, + "fluidsynth": { + "description": "Support for FluidSynth MIDI/SF2 audio format.", + "dependencies": [ + "fluidsynth" + ] + }, + "libflac": { + "description": "Support for FLAC audio format.", + "dependencies": [ + "libflac" + ] + }, + "libmodplug": { + "description": "Support for MOD audio format.", + "dependencies": [ + "libmodplug" + ] + }, + "libvorbis": { + "description": "Support for OGG Vorbis audio format.", + "dependencies": [ + "libvorbis" + ] + }, + "mpg123": { + "description": "Support for MP3 audio format.", + "dependencies": [ + "mpg123" + ] + }, + "nativemidi": { + "description": "Support for MIDI audio format on Windows and macOS." + }, + "opusfile": { + "description": "Support for Opus audio format.", + "dependencies": [ + "opusfile" + ] + } + } +} diff --git a/externals/vcpkg/ports/sdl2-net/CMakeLists.txt b/externals/vcpkg/ports/sdl2-net/CMakeLists.txt new file mode 100755 index 000000000..87c77929c --- /dev/null +++ b/externals/vcpkg/ports/sdl2-net/CMakeLists.txt @@ -0,0 +1,38 @@ +cmake_minimum_required(VERSION 3.0) +project(SDL2_NET C) + +if (MSVC) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4244 /wd4996") +endif() + +find_path(SDL_INCLUDE_DIR SDL2/SDL.h) +find_package(SDL2 CONFIG REQUIRED) + +add_library(SDL2_net SDLnet.c SDLnetselect.c SDLnetTCP.c SDLnetUDP.c version.rc) + +set_target_properties(SDL2_net PROPERTIES DEFINE_SYMBOL DLL_EXPORT) +target_compile_definitions(SDL2_net PRIVATE _WINSOCK_DEPRECATED_NO_WARNINGS) +target_include_directories(SDL2_net PRIVATE ${SDL_INCLUDE_DIR}/SDL2) + +if (WIN32) + target_link_libraries(SDL2_net SDL2::SDL2 ws2_32 iphlpapi) +endif() + +install(TARGETS SDL2_net + EXPORT SDL2_net + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib) + +install(EXPORT SDL2_net + DESTINATION "share/sdl2-net" + FILE sdl2-net-config.cmake + NAMESPACE SDL2:: +) + +if(NOT DEFINED SDL_NET_SKIP_HEADERS) + install(FILES SDL_net.h DESTINATION include/SDL2) +endif() + +message(STATUS "Link-time dependencies:") +message(STATUS " " SDL2::SDL2) diff --git a/externals/vcpkg/ports/sdl2-net/portfile.cmake b/externals/vcpkg/ports/sdl2-net/portfile.cmake new file mode 100755 index 000000000..9534a9aa4 --- /dev/null +++ b/externals/vcpkg/ports/sdl2-net/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://www.libsdl.org/projects/SDL_net/release/SDL2_net-2.0.1.tar.gz" + FILENAME "SDL2_net-2.0.1.tar.gz" + SHA512 d27faee3cddc3592dae38947e6c1df0cbaa95f82fde9c87db6d11f6312d868cea74f6830ad07ceeb3d0d75e9424cebf39e54fddf9a1147e8d9e664609de92b7a +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DSDL_NET_SKIP_HEADERS=ON) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/sdl2-net/vcpkg.json b/externals/vcpkg/ports/sdl2-net/vcpkg.json new file mode 100755 index 000000000..03aa452d8 --- /dev/null +++ b/externals/vcpkg/ports/sdl2-net/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "sdl2-net", + "version-string": "2.0.1", + "port-version": 9, + "description": "Networking library for SDL", + "homepage": "https://www.libsdl.org/projects/SDL_net", + "dependencies": [ + "sdl2" + ] +} diff --git a/externals/vcpkg/ports/sdl2-ttf/CMakeLists.txt b/externals/vcpkg/ports/sdl2-ttf/CMakeLists.txt new file mode 100755 index 000000000..71f875902 --- /dev/null +++ b/externals/vcpkg/ports/sdl2-ttf/CMakeLists.txt @@ -0,0 +1,52 @@ +cmake_minimum_required(VERSION 3.0) +project(SDL2_TTF C) + +find_path(SDL_INCLUDE_DIR SDL2/SDL.h) +find_package(SDL2 CONFIG REQUIRED) +find_package(Freetype REQUIRED) + +add_library(SDL2_ttf SDL_ttf.c version.rc) + +set_target_properties(SDL2_ttf PROPERTIES DEFINE_SYMBOL DLL_EXPORT) +target_include_directories(SDL2_ttf PRIVATE ${SDL_INCLUDE_DIR}/SDL2 ${FREETYPE_INCLUDE_DIRS}) +target_link_libraries(SDL2_ttf SDL2::SDL2 ${FREETYPE_LIBRARIES}) + +install(TARGETS SDL2_ttf + EXPORT SDL2_ttf + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib) + +INSTALL(EXPORT SDL2_ttf + DESTINATION "share/sdl2-ttf" + FILE sdl2-ttf-config.cmake + NAMESPACE SDL2:: +) + +set(prefix "") +set(exec_prefix [[${prefix}]]) +set(libdir [[${prefix}/lib]]) +set(includedir [[${prefix}/include]]) +set(PACKAGE "SDL2_ttf") +file(READ "SDL_ttf.h" header_contents) +# #define SDL_TTF_MAJOR_VERSION 2 +# #define SDL_TTF_MINOR_VERSION 0 +# #define SDL_TTF_PATCHLEVEL 5 +string(REGEX MATCH "define *SDL_TTF_MAJOR_VERSION *([0-9]+)" _ "${header_contents}") +set(VERSION ${CMAKE_MATCH_1}) +string(REGEX MATCH "define *SDL_TTF_MINOR_VERSION *([0-9]+)" _ "${header_contents}") +string(APPEND VERSION ".${CMAKE_MATCH_1}") +string(REGEX MATCH "define *SDL_TTF_PATCHLEVEL *([0-9]+)" _ "${header_contents}") +string(APPEND VERSION ".${CMAKE_MATCH_1}") +set(SDL_VERSION 0.0) +configure_file(SDL2_ttf.pc.in "${CMAKE_CURRENT_BINARY_DIR}/SDL2_ttf.pc" @ONLY) +file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/SDL2_ttf.pc" "Requires.private: freetype2") +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/SDL2_ttf.pc DESTINATION lib/pkgconfig) + +if(NOT DEFINED SDL_TTF_SKIP_HEADERS) + install(FILES SDL_ttf.h DESTINATION include/SDL2) +endif() + +message(STATUS "Link-time dependencies:") +message(STATUS " " SDL2::SDL2) +message(STATUS " " ${FREETYPE_LIBRARIES}) diff --git a/externals/vcpkg/ports/sdl2-ttf/portfile.cmake b/externals/vcpkg/ports/sdl2-ttf/portfile.cmake new file mode 100755 index 000000000..781c47766 --- /dev/null +++ b/externals/vcpkg/ports/sdl2-ttf/portfile.cmake @@ -0,0 +1,31 @@ +set(VERSION 2.0.15) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${VERSION}.tar.gz" + FILENAME "SDL2_ttf-${VERSION}.tar.gz" + SHA512 30d685932c3dd6f2c94e2778357a5c502f0421374293d7102a64d92f9c7861229bf36bedf51c1a698b296a58c858ca442d97afb908b7df1592fc8d4f8ae8ddfd +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${VERSION} +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DSDL_TTF_SKIP_HEADERS=ON) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +file(COPY ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdl2-ttf) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/sdl2-ttf/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/sdl2-ttf/copyright) diff --git a/externals/vcpkg/ports/sdl2-ttf/vcpkg.json b/externals/vcpkg/ports/sdl2-ttf/vcpkg.json new file mode 100755 index 000000000..58978546c --- /dev/null +++ b/externals/vcpkg/ports/sdl2-ttf/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "sdl2-ttf", + "version-string": "2.0.15", + "port-version": 5, + "description": "A library for rendering TrueType fonts with SDL", + "homepage": "https://www.libsdl.org/projects/SDL_ttf/", + "dependencies": [ + "freetype", + "sdl2" + ] +} diff --git a/externals/vcpkg/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch b/externals/vcpkg/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch new file mode 100755 index 000000000..967b433aa --- /dev/null +++ b/externals/vcpkg/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch @@ -0,0 +1,38 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 644715a..6eacfb8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2670,8 +2670,6 @@ endif() + configure_file("${SDL2_SOURCE_DIR}/include/SDL_revision.h.cmake" + "${SDL2_BINARY_DIR}/include/SDL_revision.h") + +-if(NOT WINDOWS OR CYGWIN OR MINGW) +- + set(prefix ${CMAKE_INSTALL_PREFIX}) + + set(exec_prefix "\${prefix}") +@@ -2705,7 +2703,7 @@ Libs.private:") + set(SDL_STATIC_LIBS ${_SDL_STATIC_LIBS}) + listtostrrev(SDL_LIBS _SDL_LIBS) + set(SDL_LIBS ${_SDL_LIBS}) +- else() ++ elseif(NOT WINDOWS_STORE) + listtostr(EXTRA_LIBS _EXTRA_LIBS "-l") + set(SDL_STATIC_LIBS ${SDL_LIBS} ${EXTRA_LDFLAGS} ${_EXTRA_LIBS}) + list(REMOVE_DUPLICATES SDL_STATIC_LIBS) +@@ -2726,7 +2724,6 @@ Libs.private:") + "${SDL2_BINARY_DIR}/sdl2-config" @ONLY) + configure_file("${SDL2_SOURCE_DIR}/SDL2.spec.in" + "${SDL2_BINARY_DIR}/SDL2.spec" @ONLY) +-endif() + + macro(check_add_debug_flag FLAG SUFFIX) + check_c_compiler_flag(${FLAG} HAS_C_FLAG_${SUFFIX}) +@@ -3075,6 +3072,7 @@ if(NOT SDL2_DISABLE_INSTALL) + # TODO: what about the .spec file? Is it only needed for RPM creation? + install(FILES "${SDL2_SOURCE_DIR}/sdl2.m4" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/aclocal") + endif() ++ install(FILES ${SDL2_BINARY_DIR}/sdl2.pc DESTINATION "lib${LIB_SUFFIX}/pkgconfig") + endif() + + ##### Uninstall target ##### diff --git a/externals/vcpkg/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch b/externals/vcpkg/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch new file mode 100755 index 000000000..b7c56c14b --- /dev/null +++ b/externals/vcpkg/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch @@ -0,0 +1,15 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1342,12 +1342,6 @@ elseif(UNIX AND NOT APPLE AND NOT ANDROID AND NOT RISCOS AND NOT HAIKU) + set(HAVE_FCITX TRUE) + endif() + +- pkg_search_module(IBUS ibus-1.0 ibus) +- if(IBUS_FOUND) +- set(HAVE_IBUS_IBUS_H TRUE) +- target_include_directories(sdl-build-options INTERFACE "${IBUS_INCLUDE_DIRS}") +- list(APPEND EXTRA_LIBS ${IBUS_LIBRARIES}) +- endif() + + if (HAVE_IBUS_IBUS_H OR HAVE_FCITX) + set(SDL_USE_IME 1) diff --git a/externals/vcpkg/ports/sdl2/0003-sdl2-disable-sdlmain-target-search-on-uwp.patch b/externals/vcpkg/ports/sdl2/0003-sdl2-disable-sdlmain-target-search-on-uwp.patch new file mode 100755 index 000000000..e24057c3e --- /dev/null +++ b/externals/vcpkg/ports/sdl2/0003-sdl2-disable-sdlmain-target-search-on-uwp.patch @@ -0,0 +1,34 @@ +--- a/SDL2Config.cmake ++++ b/SDL2Config.cmake +@@ -46,6 +46,7 @@ foreach(prop ${relprops}) + endif() + endforeach() + ++if(NOT WINDOWS_STORE) + foreach(prop ${relprops}) + get_target_property(sdl2mainimplib SDL2::SDL2main ${prop}) + if(sdl2mainimplib) +@@ -53,6 +54,7 @@ foreach(prop ${relprops}) + break() + endif() + endforeach() ++endif() + + foreach(prop ${dbgprops}) + get_target_property(sdl2implibdbg SDL2::SDL2 ${prop}) +@@ -62,6 +64,7 @@ foreach(prop ${dbgprops}) + endif() + endforeach() + ++if(NOT WINDOWS_STORE) + foreach(prop ${dbgprops}) + get_target_property(sdl2mainimplibdbg SDL2::SDL2main ${prop}) + if(sdl2mainimplibdbg) +@@ -69,6 +72,7 @@ foreach(prop ${dbgprops}) + break() + endif() + endforeach() ++endif() + + if( sdl2implib AND sdl2mainimplib AND sdl2implibdbg AND sdl2mainimplibdbg ) + # we have both release and debug builds of SDL2 and SDL2main, so use this ugly diff --git a/externals/vcpkg/ports/sdl2/0004-Define-crt-macros.patch b/externals/vcpkg/ports/sdl2/0004-Define-crt-macros.patch new file mode 100755 index 000000000..ac8f185a7 --- /dev/null +++ b/externals/vcpkg/ports/sdl2/0004-Define-crt-macros.patch @@ -0,0 +1,15 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -602,6 +602,11 @@ if(USE_GCC OR USE_CLANG) + list(APPEND EXTRA_CFLAGS -fcolor-diagnostics) + endif() + endif() + endif() ++if(MSVC) ++ target_compile_definitions(sdl-build-options INTERFACE "-D_CRT_SECURE_NO_DEPRECATE") ++ target_compile_definitions(sdl-build-options INTERFACE "-D_CRT_NONSTDC_NO_DEPRECATE") ++ target_compile_definitions(sdl-build-options INTERFACE "-D_CRT_SECURE_NO_WARNINGS") ++endif() + + if(SDL_ASSEMBLY) + diff --git a/externals/vcpkg/ports/sdl2/portfile.cmake b/externals/vcpkg/ports/sdl2/portfile.cmake new file mode 100755 index 000000000..489ee17b1 --- /dev/null +++ b/externals/vcpkg/ports/sdl2/portfile.cmake @@ -0,0 +1,103 @@ +set(SDL2_VERSION 2.0.20) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libsdl-org/SDL + REF 53dea9830964eee8b5c2a7ee0a65d6e268dc78a1 #vrelease-2.0.22 + SHA512 809ac18aeb739cfc6558dc11a7b3abbdad62a8e651ae2bfc157f26947b0df063a34c117ea8bd003428b5618fa6ce21a655fda073f1ef15aa34bc4a442a578523 + HEAD_REF master + PATCHES + 0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch + 0002-sdl2-skip-ibus-on-linux.patch + 0003-sdl2-disable-sdlmain-target-search-on-uwp.patch + 0004-Define-crt-macros.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SDL_SHARED) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" FORCE_STATIC_VCRT) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + vulkan SDL_VULKAN + x11 SDL_X11_SHARED +) + +if ("x11" IN_LIST FEATURES) + message(WARNING "You will need to install Xorg dependencies to use feature x11:\nsudo apt install libx11-dev libxft-dev libxext-dev\n") +endif() + +if(VCPKG_TARGET_IS_UWP) + set(configure_opts WINDOWS_USE_MSBUILD) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + ${configure_opts} + OPTIONS ${FEATURE_OPTIONS} + -DSDL_STATIC=${SDL_STATIC} + -DSDL_SHARED=${SDL_SHARED} + -DSDL_FORCE_STATIC_VCRT=${FORCE_STATIC_VCRT} + -DSDL_LIBC=ON + -DSDL_HIDAPI_JOYSTICK=ON +) + +vcpkg_cmake_install() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/SDL2") + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SDL2) +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/SDL2.framework/Resources") + vcpkg_cmake_config_fixup(CONFIG_PATH SDL2.framework/Resources) +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/bin/sdl2-config" + "${CURRENT_PACKAGES_DIR}/debug/bin/sdl2-config" + "${CURRENT_PACKAGES_DIR}/SDL2.framework" + "${CURRENT_PACKAGES_DIR}/debug/SDL2.framework" +) + +file(GLOB BINS "${CURRENT_PACKAGES_DIR}/debug/bin/*" "${CURRENT_PACKAGES_DIR}/bin/*") +if(NOT BINS) + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) +endif() + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP AND NOT VCPKG_TARGET_IS_MINGW) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/SDL2main.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/SDL2main.lib") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/SDL2maind.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/SDL2maind.lib") + endif() + + file(GLOB SHARE_FILES "${CURRENT_PACKAGES_DIR}/share/sdl2/*.cmake") + foreach(SHARE_FILE ${SHARE_FILES}) + vcpkg_replace_string("${SHARE_FILE}" "lib/SDL2main" "lib/manual-link/SDL2main") + endforeach() +endif() + +vcpkg_copy_pdbs() + +set(DYLIB_COMPATIBILITY_VERSION_REGEX "set\\(DYLIB_COMPATIBILITY_VERSION (.+)\\)") +set(DYLIB_CURRENT_VERSION_REGEX "set\\(DYLIB_CURRENT_VERSION (.+)\\)") +file(STRINGS "${SOURCE_PATH}/CMakeLists.txt" DYLIB_COMPATIBILITY_VERSION REGEX ${DYLIB_COMPATIBILITY_VERSION_REGEX}) +file(STRINGS "${SOURCE_PATH}/CMakeLists.txt" DYLIB_CURRENT_VERSION REGEX ${DYLIB_CURRENT_VERSION_REGEX}) +string(REGEX REPLACE ${DYLIB_COMPATIBILITY_VERSION_REGEX} "\\1" DYLIB_COMPATIBILITY_VERSION "${DYLIB_COMPATIBILITY_VERSION}") +string(REGEX REPLACE ${DYLIB_CURRENT_VERSION_REGEX} "\\1" DYLIB_CURRENT_VERSION "${DYLIB_CURRENT_VERSION}") + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2main" "-lSDL2maind") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2 " "-lSDL2d ") +endif() + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/sdl2/vcpkg.json b/externals/vcpkg/ports/sdl2/vcpkg.json new file mode 100755 index 000000000..660cbe9e1 --- /dev/null +++ b/externals/vcpkg/ports/sdl2/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "sdl2", + "version": "2.0.22", + "port-version": 1, + "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", + "homepage": "https://www.libsdl.org/download-2.0.php", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "vulkan": { + "description": "Vulkan functionality for SDL" + }, + "x11": { + "description": "Dynamically load X11 support", + "supports": "!windows" + } + } +} diff --git a/externals/vcpkg/ports/sdl2pp/fix-dependencies.patch b/externals/vcpkg/ports/sdl2pp/fix-dependencies.patch new file mode 100755 index 000000000..48e5c8f97 --- /dev/null +++ b/externals/vcpkg/ports/sdl2pp/fix-dependencies.patch @@ -0,0 +1,82 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cdfd2a6..dc08748 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,11 +23,15 @@ ENDIF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) + + # depends + FIND_PACKAGE(SDL2 REQUIRED) +-SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_INCLUDE_DIR}) +-SET(SDL2_ALL_LIBRARIES ${SDL2_LIBRARY}) ++SET(SDL2_ALL_INCLUDE_DIRS ) ++IF (BUILD_SHARED_LIBS) ++ SET(SDL2_ALL_LIBRARIES SDL2::SDL2) ++ELSE() ++ SET(SDL2_ALL_LIBRARIES SDL2::SDL2-static) ++ENDIF() + SET(SDL2_ALL_PKGCONFIG_MODULES sdl2) +-SET(SDL2PP_EXTRA_LIBRARIES ${SDL2MAIN_LIBRARY}) +-SET(SDL2PP_EXTRA_PKGCONFIG_LIBRARIES ${SDL2MAIN_LIBRARY}) ++SET(SDL2PP_EXTRA_LIBRARIES SDL2::SDL2main) ++SET(SDL2PP_EXTRA_PKGCONFIG_LIBRARIES SDL2::SDL2main) + + IF(MINGW) + SET(MINGW32_LIBRARY "mingw32" CACHE STRING "mingw32 library") +@@ -36,27 +40,27 @@ IF(MINGW) + ENDIF(MINGW) + + IF(SDL2PP_WITH_IMAGE) +- FIND_PACKAGE(SDL2_image REQUIRED) +- SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS} ${SDL2_IMAGE_INCLUDE_DIR}) +- SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} ${SDL2_IMAGE_LIBRARY}) ++ FIND_PACKAGE(sdl2-image CONFIG REQUIRED) ++ SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS}) ++ SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} SDL2::SDL2_image) + SET(SDL2_ALL_PKGCONFIG_MODULES "${SDL2_ALL_PKGCONFIG_MODULES} SDL2_image") + ELSE(SDL2PP_WITH_IMAGE) + MESSAGE(STATUS "SDL2_image support disabled") + ENDIF(SDL2PP_WITH_IMAGE) + + IF(SDL2PP_WITH_TTF) +- FIND_PACKAGE(SDL2_ttf REQUIRED) +- SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS} ${SDL2_TTF_INCLUDE_DIR}) +- SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} ${SDL2_TTF_LIBRARY}) ++ FIND_PACKAGE(sdl2-ttf CONFIG REQUIRED) ++ SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS}) ++ SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} SDL2::SDL2_ttf) + SET(SDL2_ALL_PKGCONFIG_MODULES "${SDL2_ALL_PKGCONFIG_MODULES} SDL2_ttf") + ELSE(SDL2PP_WITH_TTF) + MESSAGE(STATUS "SDL2_ttf support disabled") + ENDIF(SDL2PP_WITH_TTF) + + IF(SDL2PP_WITH_MIXER) +- FIND_PACKAGE(SDL2_mixer REQUIRED) +- SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS} ${SDL2_MIXER_INCLUDE_DIR}) +- SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} ${SDL2_MIXER_LIBRARY}) ++ FIND_PACKAGE(sdl2-mixer CONFIG REQUIRED) ++ SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS}) ++ SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} SDL2::SDL2_mixer) + SET(SDL2_ALL_PKGCONFIG_MODULES "${SDL2_ALL_PKGCONFIG_MODULES} SDL2_mixer") + ELSE(SDL2PP_WITH_MIXER) + MESSAGE(STATUS "SDL2_mixer support disabled") +@@ -81,7 +85,6 @@ ELSE(MSVC) + ENDIF() + ENDIF(MSVC) + +-LIST(REMOVE_DUPLICATES SDL2_ALL_INCLUDE_DIRS) + + INCLUDE_DIRECTORIES(BEFORE ${PROJECT_SOURCE_DIR}) + INCLUDE_DIRECTORIES(SYSTEM ${SDL2_ALL_INCLUDE_DIRS}) +@@ -200,10 +203,10 @@ IF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) + OPTION(SDL2PP_STATIC "Build static library instead of shared one" OFF) + + # library +- IF(SDL2PP_STATIC) ++ IF(0) + ADD_LIBRARY(SDL2pp STATIC ${LIBRARY_SOURCES} ${LIBRARY_HEADERS}) + ELSE(SDL2PP_STATIC) +- ADD_LIBRARY(SDL2pp SHARED ${LIBRARY_SOURCES} ${LIBRARY_HEADERS}) ++ ADD_LIBRARY(SDL2pp ${LIBRARY_SOURCES} ${LIBRARY_HEADERS}) + TARGET_LINK_LIBRARIES(SDL2pp ${SDL2_ALL_LIBRARIES}) + SET_TARGET_PROPERTIES(SDL2pp PROPERTIES VERSION 8.3.0 SOVERSION 8) + ENDIF(SDL2PP_STATIC) diff --git a/externals/vcpkg/ports/sdl2pp/portfile.cmake b/externals/vcpkg/ports/sdl2pp/portfile.cmake new file mode 100755 index 000000000..265c9bf50 --- /dev/null +++ b/externals/vcpkg/ports/sdl2pp/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libSDL2pp/libSDL2pp + REF a02d5a81c3d4122cb578fcd1e5cd4e836878f63b # 0.16.1 + SHA512 cf08abe69b3d313d1c3f63cb138f05105453ea0d04e26daa6d85da41cb742912a37766cce1f8af1277e92a227ea75f481f07bff76f0b501fadec392b8b62336a + HEAD_REF master + PATCHES fix-dependencies.patch +) + +file(REMOVE "${SOURCE_PATH}/cmake/FindSDL2.cmake" + "${SOURCE_PATH}/cmake/FindSDL2_image.cmake" + "${SOURCE_PATH}/cmake/FindSDL2_mixer.cmake" + "${SOURCE_PATH}/cmake/FindSDL2_ttf.cmake" +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL2PP_STATIC) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSDL2PP_WITH_EXAMPLES=OFF + -DSDL2PP_WITH_TESTS=OFF + -DSDL2PP_STATIC=${SDL2PP_STATIC} +) + +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/cmake/Modules/FindSDL2PP.cmake" "HINTS \"${CURRENT_PACKAGES_DIR}/include\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/cmake/Modules/FindSDL2PP.cmake" "HINTS \"${CURRENT_PACKAGES_DIR}/lib\"" "") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/sdl2pp/usage b/externals/vcpkg/ports/sdl2pp/usage new file mode 100755 index 000000000..e19381a32 --- /dev/null +++ b/externals/vcpkg/ports/sdl2pp/usage @@ -0,0 +1,4 @@ +The package sdl2pp provides CMake targets: + + find_package(SDL2PP REQUIRED) + target_include_directories(main PRIVATE ${SDL2PP_INCLUDE_DIRS}) diff --git a/externals/vcpkg/ports/sdl2pp/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/sdl2pp/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..5141fdd39 --- /dev/null +++ b/externals/vcpkg/ports/sdl2pp/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,6 @@ +set(SDL2PP_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/../cmake/Modules) + +_find_package(${ARGS}) + +set(CMAKE_MODULE_PATH ${SDL2PP_PREV_MODULE_PATH}) diff --git a/externals/vcpkg/ports/sdl2pp/vcpkg.json b/externals/vcpkg/ports/sdl2pp/vcpkg.json new file mode 100755 index 000000000..316c630be --- /dev/null +++ b/externals/vcpkg/ports/sdl2pp/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "sdl2pp", + "version": "0.16.1", + "port-version": 2, + "description": "C++11 bindings/wrapper for SDL2", + "homepage": "https://sdl2pp.amdmi3.ru", + "dependencies": [ + "sdl2", + "sdl2-image", + "sdl2-mixer", + "sdl2-ttf", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/seal/gsl.patch b/externals/vcpkg/ports/seal/gsl.patch new file mode 100755 index 000000000..700c076be --- /dev/null +++ b/externals/vcpkg/ports/seal/gsl.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0039517..4cc8a01 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -149,7 +149,7 @@ if(SEAL_USE_MSGSL) + message(STATUS "Microsoft GSL: download ...") + seal_fetch_thirdparty_content(ExternalMSGSL) + else() +- find_package(Microsoft.GSL 3 CONFIG) ++ find_package(Microsoft.GSL 4 CONFIG) + if(NOT Microsoft.GSL_FOUND) + message(FATAL_ERROR "Microsoft GSL: not found") + else() diff --git a/externals/vcpkg/ports/seal/portfile.cmake b/externals/vcpkg/ports/seal/portfile.cmake new file mode 100755 index 000000000..b4a73e829 --- /dev/null +++ b/externals/vcpkg/ports/seal/portfile.cmake @@ -0,0 +1,51 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/SEAL + REF 79234726053c45eede688400aa219fdec0810bd8 + SHA512 634ad75d70f04cce220bfa9f6d13e8ddb293e8403ebd195e2c8b522b751a1a268021feea7843038037ed6d1b354b2e470ad565966a117613cf5371073afda9a4 + HEAD_REF main + PATCHES + gsl.patch + shared-zstd.patch +) + +vcpkg_replace_string( + "${SOURCE_PATH}/cmake/CheckCXXIntrinsicsSpecific.cmake" + "check_cxx_source_runs" + "check_cxx_source_compiles" +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + ms-gsl SEAL_USE_MSGSL + zlib SEAL_USE_ZLIB + zstd SEAL_USE_ZSTD + hexl SEAL_USE_INTEL_HEXL + INVERTED_FEATURES + no-throw-tran SEAL_THROW_ON_TRANSPARENT_CIPHERTEXT +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE + OPTIONS + "-DSEAL_BUILD_DEPS=OFF" + "-DSEAL_BUILD_EXAMPLES=OFF" + "-DSEAL_BUILD_TESTS=OFF" + "-DSEAL_BUILD_SEAL_C=OFF" + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME "SEAL" CONFIG_PATH "lib/cmake/SEAL-3.7") + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/seal/shared-zstd.patch b/externals/vcpkg/ports/seal/shared-zstd.patch new file mode 100755 index 000000000..b8515fbcd --- /dev/null +++ b/externals/vcpkg/ports/seal/shared-zstd.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4cc8a01..b8c92c2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -205,7 +205,7 @@ if(SEAL_USE_ZSTD) + message(FATAL_ERROR "Zstandard: must be static") + endif() + elseif(TARGET zstd::libzstd_shared) +- message(FATAL_ERROR "Zstandard: must be static") ++ set(zstd_static "zstd::libzstd_shared") + else() + message(FATAL_ERROR "Zstandard: not found") + endif() diff --git a/externals/vcpkg/ports/seal/vcpkg.json b/externals/vcpkg/ports/seal/vcpkg.json new file mode 100755 index 000000000..bccf3b64e --- /dev/null +++ b/externals/vcpkg/ports/seal/vcpkg.json @@ -0,0 +1,51 @@ +{ + "name": "seal", + "version-semver": "3.7.2", + "port-version": 3, + "description": "Microsoft SEAL is an easy-to-use and powerful homomorphic encryption library.", + "homepage": "https://github.com/microsoft/SEAL", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "ms-gsl", + "zlib", + "zstd" + ], + "features": { + "hexl": { + "description": "Use Intel® HEXL for acceleration of low-level kernels.", + "dependencies": [ + "hexl" + ] + }, + "ms-gsl": { + "description": "Use ms-gsl for span view", + "dependencies": [ + "ms-gsl" + ] + }, + "no-throw-tran": { + "description": "Do not throw when operating on transparent ciphertexts" + }, + "zlib": { + "description": "Use zlib for compressed serialization", + "dependencies": [ + "zlib" + ] + }, + "zstd": { + "description": "Use zstd for compressed serialization", + "dependencies": [ + "zstd" + ] + } + } +} diff --git a/externals/vcpkg/ports/secp256k1/CMakeLists.txt b/externals/vcpkg/ports/secp256k1/CMakeLists.txt new file mode 100755 index 000000000..a3af313b6 --- /dev/null +++ b/externals/vcpkg/ports/secp256k1/CMakeLists.txt @@ -0,0 +1,35 @@ +cmake_minimum_required(VERSION 3.8) +project(secp256k1 C) + +option(INSTALL_HEADERS "Install header files" ON) + +add_definitions( + -DENABLE_MODULE_ECDH + -DENABLE_MODULE_RECOVERY + -DHAVE_CONFIG_H +) + +file(GLOB SOURCES src/secp256k1.c) +add_library(secp256k1 ${SOURCES}) + +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src) + +target_include_directories(secp256k1 PUBLIC $ $) + +if(INSTALL_HEADERS) + file(GLOB HEADERS include/*.h) + install(FILES ${HEADERS} DESTINATION include) +endif() + +install(TARGETS secp256k1 EXPORT unofficial-secp256k1-targets + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) + +install( + EXPORT unofficial-secp256k1-targets + FILE unofficial-secp256k1-targets.cmake + NAMESPACE unofficial:: + DESTINATION share/unofficial-secp256k1 +) \ No newline at end of file diff --git a/externals/vcpkg/ports/secp256k1/libsecp256k1-config.h b/externals/vcpkg/ports/secp256k1/libsecp256k1-config.h new file mode 100755 index 000000000..693d3ed25 --- /dev/null +++ b/externals/vcpkg/ports/secp256k1/libsecp256k1-config.h @@ -0,0 +1,29 @@ +/********************************************************************** + * Copyright (c) 2013, 2014 Pieter Wuille * + * Distributed under the MIT software license, see the accompanying * + * file COPYING or http://www.opensource.org/licenses/mit-license.php.* + **********************************************************************/ + +#ifndef SECP256K1_BASIC_CONFIG_H +#define SECP256K1_BASIC_CONFIG_H + +#undef USE_ASM_X86_64 +#undef USE_ENDOMORPHISM +#undef USE_FIELD_10X26 +#undef USE_FIELD_5X52 +#undef USE_FIELD_INV_BUILTIN +#undef USE_FIELD_INV_NUM +#undef USE_NUM_GMP +#undef USE_NUM_NONE +#undef USE_SCALAR_4X64 +#undef USE_SCALAR_8X32 +#undef USE_SCALAR_INV_BUILTIN +#undef USE_SCALAR_INV_NUM + +#define USE_NUM_NONE 1 +#define USE_FIELD_INV_BUILTIN 1 +#define USE_SCALAR_INV_BUILTIN 1 +#define USE_FIELD_10X26 1 +#define USE_SCALAR_8X32 1 + +#endif /* SECP256K1_BASIC_CONFIG_H */ diff --git a/externals/vcpkg/ports/secp256k1/portfile.cmake b/externals/vcpkg/ports/secp256k1/portfile.cmake new file mode 100755 index 000000000..3bf158816 --- /dev/null +++ b/externals/vcpkg/ports/secp256k1/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "bitcoin-core/secp256k1" + REF "0b7024185045a49a1a6a4c5615bf31c94f63d9c4" + SHA512 54e0c446ae63105800dfaf23dc934734f196c91f275db0455e58a36926c29ecc51a13d9b1eb2e45bc86199120c3c472ec7b39086787a49ce388a4df462a870bc +) + +file(COPY ${CURRENT_PORT_DIR}/libsecp256k1-config.h DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DINSTALL_HEADERS=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +configure_file(${CMAKE_CURRENT_LIST_DIR}/secp256k1-config.cmake ${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-secp256k1-config.cmake @ONLY) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/secp256k1/secp256k1-config.cmake b/externals/vcpkg/ports/secp256k1/secp256k1-config.cmake new file mode 100755 index 000000000..5cc40fe82 --- /dev/null +++ b/externals/vcpkg/ports/secp256k1/secp256k1-config.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-secp256k1-targets.cmake") diff --git a/externals/vcpkg/ports/secp256k1/vcpkg.json b/externals/vcpkg/ports/secp256k1/vcpkg.json new file mode 100755 index 000000000..43a10ad02 --- /dev/null +++ b/externals/vcpkg/ports/secp256k1/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "secp256k1", + "version-string": "2017-19-10", + "port-version": 4, + "description": "Optimized C library for EC operations on curve", + "homepage": "https://github.com/bitcoin-core/secp256k1" +} diff --git a/externals/vcpkg/ports/selene/disable_x86_intrinsics_on_arm.patch b/externals/vcpkg/ports/selene/disable_x86_intrinsics_on_arm.patch new file mode 100755 index 000000000..79e38c57c --- /dev/null +++ b/externals/vcpkg/ports/selene/disable_x86_intrinsics_on_arm.patch @@ -0,0 +1,13 @@ +diff --git a/selene/base/Bitcount.hpp b/selene/base/Bitcount.hpp +index a4d69e4..709f650 100755 +--- a/selene/base/Bitcount.hpp ++++ b/selene/base/Bitcount.hpp +@@ -69,7 +69,7 @@ inline std::size_t bit_count(unsigned long long x) + return static_cast(__builtin_popcountll(x)); + } + +-#elif defined(_MSC_VER) ++#elif defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64) + + /** \brief Performs a bit count on the supplied value. + * diff --git a/externals/vcpkg/ports/selene/portfile.cmake b/externals/vcpkg/ports/selene/portfile.cmake new file mode 100755 index 000000000..d300f5f83 --- /dev/null +++ b/externals/vcpkg/ports/selene/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kmhofmann/selene + REF v0.3.1 + SHA512 7bc57ebe9e2442da2716eb5c1af11f8d610b0b09fe96e3122d1028575732b6045a987c499bbf7de53003edd627b8809d86c80ea4975fc2264a1c61d5891a46c3 + HEAD_REF master + PATCHES + disable_x86_intrinsics_on_arm.patch + tiff-deprecated-typedefs.patch + trivial-pixel.patch +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "opencv" SELENE_USE_OPENCV +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/selene) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/selene/tiff-deprecated-typedefs.patch b/externals/vcpkg/ports/selene/tiff-deprecated-typedefs.patch new file mode 100755 index 000000000..e2429138d --- /dev/null +++ b/externals/vcpkg/ports/selene/tiff-deprecated-typedefs.patch @@ -0,0 +1,14 @@ +diff --git a/selene/CMakeLists.txt b/selene/CMakeLists.txt +index ab2760c..d1e1e6c 100644 +--- a/selene/CMakeLists.txt ++++ b/selene/CMakeLists.txt +@@ -229,6 +229,9 @@ if(TIFF_FOUND) + ) + + target_compile_options(selene_img_io_tiff PRIVATE ${SELENE_COMPILER_OPTIONS} ${SELENE_IMG_COMPILER_OPTIONS}) ++ if(MSVC) ++ target_compile_options(selene_img_io_tiff PRIVATE /wd4996) ++ endif() + + target_compile_definitions(selene_img_io_tiff PRIVATE ${SELENE_COMPILER_DEFINITIONS}) + diff --git a/externals/vcpkg/ports/selene/trivial-pixel.patch b/externals/vcpkg/ports/selene/trivial-pixel.patch new file mode 100755 index 000000000..9aeb7e44e --- /dev/null +++ b/externals/vcpkg/ports/selene/trivial-pixel.patch @@ -0,0 +1,23 @@ +--- a/selene/img/pixel/Pixel.hpp ++++ b/selene/img/pixel/Pixel.hpp +@@ -45,6 +45,6 @@ + constexpr Pixel() noexcept = default; ///< Default constructor. Pixel values are uninitialized. + +- template > +- constexpr Pixel(Args... args) noexcept; ++ template > ++ constexpr Pixel(Arg1 arg1, Args... args) noexcept; + + constexpr explicit Pixel(const std::array& arr) noexcept; +@@ -216,8 +216,8 @@ + template +-template +-constexpr Pixel::Pixel(Args... args) noexcept +- : data_{{static_cast(args)...}} ++template ++constexpr Pixel::Pixel(Arg1 arg1, Args... args) noexcept ++ : data_{{static_cast(arg1), static_cast(args)...}} + { + static_assert(std::is_trivial>::value, "Pixel type is not trivial"); + static_assert(std::is_standard_layout>::value, + "Pixel type is not standard layout"); diff --git a/externals/vcpkg/ports/selene/vcpkg.json b/externals/vcpkg/ports/selene/vcpkg.json new file mode 100755 index 000000000..71bcb2514 --- /dev/null +++ b/externals/vcpkg/ports/selene/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "selene", + "version": "0.3.1", + "port-version": 5, + "description": "A C++17 image representation, processing and I/O library.", + "homepage": "https://github.com/kmhofmann/selene", + "dependencies": [ + "libjpeg-turbo", + "libpng", + "tiff", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "features": { + "opencv": { + "description": "Enable using OpenCV", + "dependencies": [ + { + "name": "opencv", + "default-features": false + } + ] + } + } +} diff --git a/externals/vcpkg/ports/sentencepiece/portfile.cmake b/externals/vcpkg/ports/sentencepiece/portfile.cmake new file mode 100755 index 000000000..3f862e90b --- /dev/null +++ b/externals/vcpkg/ports/sentencepiece/portfile.cmake @@ -0,0 +1,33 @@ +if(NOT VCPKG_CMAKE_SYSTEM_NAME) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_STATIC_CRT) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/sentencepiece + REF v0.1.96 + SHA512 c3f23b483ebe148a37a01908f5624f06536efcba5609192957239d844244ab445d39e59b1b44b6df1f182166d58a6df38c046506ce45160a272f1e7f46c25010 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSPM_ENABLE_SHARED=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") +if(NOT VCPKG_CMAKE_SYSTEM_NAME) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/sentencepiece.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/sentencepieced.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/sentencepiece_train.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/sentencepiece_traind.lib") +endif() + +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/sentencepiece/vcpkg.json b/externals/vcpkg/ports/sentencepiece/vcpkg.json new file mode 100755 index 000000000..ad6898b3f --- /dev/null +++ b/externals/vcpkg/ports/sentencepiece/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "sentencepiece", + "version": "0.1.96", + "port-version": 1, + "description": "SentencePiece is an unsupervised text tokenizer and detokenizer mainly for Neural Network-based text generation systems where the vocabulary size is predetermined prior to the neural model training", + "supports": "!((windows | uwp) & !static)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/sentry-native/fix-config-cmake.patch b/externals/vcpkg/ports/sentry-native/fix-config-cmake.patch new file mode 100755 index 000000000..3d8db2a0e --- /dev/null +++ b/externals/vcpkg/ports/sentry-native/fix-config-cmake.patch @@ -0,0 +1,27 @@ +diff --git a/sentry-config.cmake.in b/sentry-config.cmake.in +index 89ea345..c14b31c 100644 +--- a/sentry-config.cmake.in ++++ b/sentry-config.cmake.in +@@ -3,9 +3,11 @@ + set(SENTRY_BACKEND @SENTRY_BACKEND@) + set(SENTRY_TRANSPORT @SENTRY_TRANSPORT@) + ++include(CMakeFindDependencyMacro) ++ + if(SENTRY_BACKEND STREQUAL "crashpad") + if(@SENTRY_CRASHPAD_SYSTEM@) +- find_package(crashpad REQUIRED) ++ find_dependency(crashpad) + else() + include("${CMAKE_CURRENT_LIST_DIR}/sentry_crashpad-targets.cmake") + endif() +@@ -14,7 +16,7 @@ endif() + include("${CMAKE_CURRENT_LIST_DIR}/sentry-targets.cmake") + + if(SENTRY_TRANSPORT STREQUAL "curl" AND NOT @BUILD_SHARED_LIBS@) +- find_package(CURL REQUIRED) ++ find_dependency(CURL) + set_property(TARGET sentry::sentry APPEND +- PROPERTY INTERFACE_LINK_LIBRARIES ${CURL_LIBRARIES}) ++ PROPERTY INTERFACE_LINK_LIBRARIES CURL::libcurl) + endif() diff --git a/externals/vcpkg/ports/sentry-native/fix-warningC5105.patch b/externals/vcpkg/ports/sentry-native/fix-warningC5105.patch new file mode 100755 index 000000000..52f0dc705 --- /dev/null +++ b/externals/vcpkg/ports/sentry-native/fix-warningC5105.patch @@ -0,0 +1,12 @@ +diff --git a/external/crashpad/third_party/zlib/zlib/x86.c b/external/crashpad/third_party/zlib/zlib/x86.c +index e56fe8b..902e373 100644 +--- a/external/crashpad/third_party/zlib/zlib/x86.c ++++ b/external/crashpad/third_party/zlib/zlib/x86.c +@@ -8,6 +8,7 @@ + * For conditions of distribution and use, see copyright notice in zlib.h + */ + ++#pragma warning(disable : 5105) + #include "x86.h" + #include "zutil.h" + diff --git a/externals/vcpkg/ports/sentry-native/portfile.cmake b/externals/vcpkg/ports/sentry-native/portfile.cmake new file mode 100755 index 000000000..49ef2a03a --- /dev/null +++ b/externals/vcpkg/ports/sentry-native/portfile.cmake @@ -0,0 +1,68 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.17/sentry-native.zip" + FILENAME "sentry-native-0.4.17.zip" + SHA512 03ee36f5420b0f3a21b1e4b58fe88b67a883abda27c0c644e3a9916674e1847a91ee2a3815908747738a77e8984b46f92fc776405ee443c71c69e352eeecebe6 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL + PATCHES + fix-warningC5105.patch + fix-config-cmake.patch + use-zlib-target.patch +) + +if (NOT DEFINED SENTRY_BACKEND) + if(MSVC AND CMAKE_GENERATOR_TOOLSET MATCHES "_xp$") + set(SENTRY_BACKEND "breakpad") + elseif(APPLE OR WIN32) + set(SENTRY_BACKEND "crashpad") + elseif(LINUX) + set(SENTRY_BACKEND "breakpad") + else() + set(SENTRY_BACKEND "inproc") + endif() +endif() + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(VCPKG_CXX_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_CXX_FLAGS}") + set(VCPKG_C_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_C_FLAGS}") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSENTRY_BUILD_TESTS=OFF + -DSENTRY_BUILD_EXAMPLES=OFF + -DSENTRY_BACKEND=${SENTRY_BACKEND} + -DCRASHPAD_ZLIB_SYSTEM=ON + MAYBE_UNUSED_VARIABLES + CRASHPAD_ZLIB_SYSTEM +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_cmake_config_fixup(PACKAGE_NAME sentry CONFIG_PATH lib/cmake/sentry) + +if (SENTRY_BACKEND STREQUAL "crashpad") + vcpkg_copy_tools( + TOOL_NAMES crashpad_handler + AUTO_CLEAN + ) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file( + INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/externals/vcpkg/ports/sentry-native/use-zlib-target.patch b/externals/vcpkg/ports/sentry-native/use-zlib-target.patch new file mode 100755 index 000000000..d4b3dfca3 --- /dev/null +++ b/externals/vcpkg/ports/sentry-native/use-zlib-target.patch @@ -0,0 +1,12 @@ +diff --git a/external/crashpad/CMakeLists.txt b/external/crashpad/CMakeLists.txt +index abb0697..a57ff04 100644 +--- a/external/crashpad/CMakeLists.txt ++++ b/external/crashpad/CMakeLists.txt +@@ -22,6 +22,7 @@ option(CRASHPAD_ZLIB_SYSTEM "Use system zlib library" "${CRASHPAD_ZLIB_SYSTEM_DE + + if(CRASHPAD_ZLIB_SYSTEM) + find_package(ZLIB REQUIRED) ++ set(ZLIB_LIBRARIES ZLIB::ZLIB) + endif() + + if(LINUX OR ANDROID) diff --git a/externals/vcpkg/ports/sentry-native/vcpkg.json b/externals/vcpkg/ports/sentry-native/vcpkg.json new file mode 100755 index 000000000..ce741d226 --- /dev/null +++ b/externals/vcpkg/ports/sentry-native/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "sentry-native", + "version": "0.4.17", + "description": "Sentry SDK for C, C++ and native applications.", + "homepage": "https://sentry.io/", + "license": "MIT", + "supports": "osx | (!arm & !uwp)", + "dependencies": [ + { + "name": "curl", + "platform": "!windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/septag-dmon/portfile.cmake b/externals/vcpkg/ports/septag-dmon/portfile.cmake new file mode 100755 index 000000000..2628c4306 --- /dev/null +++ b/externals/vcpkg/ports/septag-dmon/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO septag/dmon + REF 59fac713a168b6c9fd08db48da49f7bd50fd9d37 + SHA512 61fa6a0e243be456d3b59d20e18183392d106983dc9f1b0a7290b54fefa964d4eeba4bacd92cd5310b6f3da2dac232fd043c529c51fe3e6cccbfb9422dd31311 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DBUILD_TESTS=OFF" +) +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/externals/vcpkg/ports/septag-dmon/vcpkg.json b/externals/vcpkg/ports/septag-dmon/vcpkg.json new file mode 100755 index 000000000..d9df93c87 --- /dev/null +++ b/externals/vcpkg/ports/septag-dmon/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "septag-dmon", + "version-date": "2022-02-08", + "description": "a tiny C library that monitors changes in a directory", + "homepage": "https://github.com/septag/dmon", + "license": "BSD-2-Clause", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/septag-sx/portfile.cmake b/externals/vcpkg/ports/septag-sx/portfile.cmake new file mode 100755 index 000000000..0d7686bcf --- /dev/null +++ b/externals/vcpkg/ports/septag-sx/portfile.cmake @@ -0,0 +1,39 @@ +if(TARGET_TRIPLET MATCHES "(uwp|arm)") + message(FATAL_ERROR "septag-sx doesn't support ${TARGET_TRIPLET} currently.") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO septag/sx + REF b70567a52636f9ecfdb904c586a957a806efc990 + SHA512 8945476b428418d3c7845afd831503f43fd44672a9b3506576c5baf50f55739327275a8be97a323f3ae146f84b76bbe266ac7b5df1b85cb05a826ed5e30b9547 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SX_SHARED_LIB) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DSX_BUILD_TESTS=OFF + -DSX_SHARED_LIB=${SX_SHARED_LIB} +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sx TARGET_PATH share/sx) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/sx/config.h + "define SX_CONFIG_SHARED_LIB 0" + "define SX_CONFIG_SHARED_LIB 1" + ) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/septag-sx/vcpkg.json b/externals/vcpkg/ports/septag-sx/vcpkg.json new file mode 100755 index 000000000..7348da827 --- /dev/null +++ b/externals/vcpkg/ports/septag-sx/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "septag-sx", + "version-string": "2019-05-07", + "port-version": 3, + "description": "Portable base library for C programmers, designed for performance and simplicity.", + "supports": "!(uwp | arm)" +} diff --git a/externals/vcpkg/ports/seqan/portfile.cmake b/externals/vcpkg/ports/seqan/portfile.cmake new file mode 100755 index 000000000..b343b82c4 --- /dev/null +++ b/externals/vcpkg/ports/seqan/portfile.cmake @@ -0,0 +1,14 @@ +vcpkg_download_distfile(ARCHIVE + URLS "http://packages.seqan.de/seqan-library/seqan-library-2.4.0.zip" + FILENAME "seqan-library-2.4.0.zip" + SHA512 9a1b4fe9dff9ad49a8761798a6a6eaeebce683ccb5e2dd78ea4b8829093918606830a16ea458d67bf3f652531ddc55b550c12cb257be913bb187c8940d96a575 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.h") + +file(INSTALL ${SOURCE_PATH}/share/doc/seqan/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/seqan RENAME copyright) diff --git a/externals/vcpkg/ports/seqan/vcpkg.json b/externals/vcpkg/ports/seqan/vcpkg.json new file mode 100755 index 000000000..e49b11d09 --- /dev/null +++ b/externals/vcpkg/ports/seqan/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "seqan", + "version-string": "2.4.0", + "port-version": 2, + "description": "SeqAn is an open source C++ library of efficient algorithms and data structures for the analysis of sequences with the focus on biological data." +} diff --git a/externals/vcpkg/ports/serd/CMakeLists.txt b/externals/vcpkg/ports/serd/CMakeLists.txt new file mode 100755 index 000000000..2f0711987 --- /dev/null +++ b/externals/vcpkg/ports/serd/CMakeLists.txt @@ -0,0 +1,46 @@ +cmake_minimum_required(VERSION 3.17) +project(serd C) + +add_library(serd + src/byte_source.c + src/env.c + src/n3.c + src/node.c + src/reader.c + src/string.c + src/uri.c + src/writer.c +) + +file(WRITE "${CMAKE_BINARY_DIR}/serd_config.h" "") + +target_include_directories(serd + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" +) + +set_target_properties(serd PROPERTIES + C_STANDARD 99 + C_STANDARD_REQUIRED ON +) + +target_compile_definitions(serd PRIVATE SERD_INTERNAL _CRT_SECURE_NO_WARNINGS) + +if(BUILD_SHARED_LIBS) + target_compile_definitions(serd PUBLIC SERD_SHARED) +endif() + +install( + TARGETS serd + EXPORT serd-config + INCLUDES DESTINATION include +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(DIRECTORY serd DESTINATION include) +endif() + +install( + EXPORT serd-config + NAMESPACE serd:: + DESTINATION "${CMAKE_INSTALL_PREFIX}/share/serd" +) diff --git a/externals/vcpkg/ports/serd/portfile.cmake b/externals/vcpkg/ports/serd/portfile.cmake new file mode 100755 index 000000000..6e6173cc0 --- /dev/null +++ b/externals/vcpkg/ports/serd/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.com + OUT_SOURCE_PATH SOURCE_PATH + REPO drobilla/serd + REF v0.30.4 + SHA512 59b4f67dfa8a2c01119b1c69609030d851339ba6d85c5c559b7c2454492ef40498ce710e5cf5f7a698a292db81e6bffacb86f9dafa5d7f3fe0c60d53d6e2281f + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1 +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() +file( + INSTALL "${SOURCE_PATH}/COPYING" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/externals/vcpkg/ports/serd/vcpkg.json b/externals/vcpkg/ports/serd/vcpkg.json new file mode 100755 index 000000000..db40b57c2 --- /dev/null +++ b/externals/vcpkg/ports/serd/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "serd", + "version-string": "0.30.4", + "description": "Serd is a lightweight C library for RDF syntax which supports reading and writing Turtle, TRiG, NTriples, and NQuads.", + "homepage": "https://drobilla.net/software/serd", + "license": "ISC" +} diff --git a/externals/vcpkg/ports/serdepp/portfile.cmake b/externals/vcpkg/ports/serdepp/portfile.cmake new file mode 100755 index 000000000..3e347b7c9 --- /dev/null +++ b/externals/vcpkg/ports/serdepp/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO injae/serdepp + REF v0.1.4 + SHA512 da84ad82e882c0cada5c9dd3c77afd45aaf7b3b4eb150257b09b9b4854b349fdb2c39be2f6ba40bb39b34262e44609a02afba1ec860625f25a2313f7ac34a055 + HEAD_REF main +) + + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSERDEPP_BUILD_TESTING=OFF + -DENABLE_INLINE_CPPM_TOOLS=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/serdepp) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/cmake" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/lib/cmake" +) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/serdepp/vcpkg.json b/externals/vcpkg/ports/serdepp/vcpkg.json new file mode 100755 index 000000000..0bf3d3c7a --- /dev/null +++ b/externals/vcpkg/ports/serdepp/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "serdepp", + "version": "0.1.4", + "description": "c++ 17 universal serialize deserialize library like rust serde, support libraries: [nlohmann_json, fmt, yaml-cpp, toml11, rapidjson]", + "homepage": "https://github.com/injae/serdepp", + "license": "MIT", + "dependencies": [ + "magic-enum", + "nameof", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/sf2cute/portfile.cmake b/externals/vcpkg/ports/sf2cute/portfile.cmake new file mode 100755 index 000000000..d82c0f94f --- /dev/null +++ b/externals/vcpkg/ports/sf2cute/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gocha/sf2cute + REF v0.2 + HEAD_REF master + SHA512 721762556c392a134500fa110ec849a60d1285a57e4e8d9cacb6281bed02f5658a14694efcccb8248719558b45db89da5ad53c56990bb9c263a9760fe0d99b8f +) + +set(BUILD_EXAMPLE OFF) + +if("example" IN_LIST FEATURES) + set(BUILD_EXAMPLE ON) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DSF2CUTE_EXAMPLES_INSTALL_DIR=tools/sf2cute + OPTIONS_RELEASE + -DSF2CUTE_INSTALL_EXAMPLES=${BUILD_EXAMPLE} + -DSF2CUTE_EXAMPLES_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/tools/sf2cute +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sf2cute RENAME copyright) + +if(BUILD_EXAMPLE) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/sf2cute) +endif() diff --git a/externals/vcpkg/ports/sf2cute/vcpkg.json b/externals/vcpkg/ports/sf2cute/vcpkg.json new file mode 100755 index 000000000..9db53abbc --- /dev/null +++ b/externals/vcpkg/ports/sf2cute/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "sf2cute", + "version-string": "0.2.0", + "port-version": 2, + "description": "C++14 Library for SoundFont 2", + "features": { + "example": { + "description": "Installs an example application" + } + } +} diff --git a/externals/vcpkg/ports/sfgui/001-fix-corefoundation-link.patch b/externals/vcpkg/ports/sfgui/001-fix-corefoundation-link.patch new file mode 100755 index 000000000..e3c80bcf3 --- /dev/null +++ b/externals/vcpkg/ports/sfgui/001-fix-corefoundation-link.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c0af720..774e2d8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -107,16 +107,8 @@ if( WIN32 ) + set( LIB_PATH "lib" ) + elseif( APPLE ) + find_library( COREFOUNDATION_LIBRARY CoreFoundation ) +- mark_as_advanced( COREFOUNDATION_LIBRARY ) +- +- add_library( CoreFoundation SHARED IMPORTED ) +- set_target_properties( +- CoreFoundation PROPERTIES +- IMPORTED_LOCATION "${COREFOUNDATION_LIBRARY}" +- INTERFACE_INCLUDE_DIRECTORIES "/System/Library/Frameworks/CoreFoundation.framework/Headers" +- ) +- +- target_link_libraries( ${TARGET} PUBLIC CoreFoundation ) ++ ++ target_link_libraries( ${TARGET} PUBLIC ${COREFOUNDATION_LIBRARY} ) + set( SHARE_PATH "${CMAKE_INSTALL_PREFIX}/share/SFGUI" ) + set( LIB_PATH "lib" ) + elseif( "${CMAKE_SYSTEM_NAME}" MATCHES "Linux" ) diff --git a/externals/vcpkg/ports/sfgui/002-add-limits-header.patch b/externals/vcpkg/ports/sfgui/002-add-limits-header.patch new file mode 100755 index 000000000..e16e57663 --- /dev/null +++ b/externals/vcpkg/ports/sfgui/002-add-limits-header.patch @@ -0,0 +1,13 @@ +diff --git a/src/SFGUI/ComboBox.cpp b/src/SFGUI/ComboBox.cpp +index a01937b..454ec3e 100644 +--- a/src/SFGUI/ComboBox.cpp ++++ b/src/SFGUI/ComboBox.cpp +@@ -9,6 +9,8 @@ + #include + #include + ++#include ++ + namespace sfg { + + // Signals. diff --git a/externals/vcpkg/ports/sfgui/portfile.cmake b/externals/vcpkg/ports/sfgui/portfile.cmake new file mode 100755 index 000000000..ee3974c10 --- /dev/null +++ b/externals/vcpkg/ports/sfgui/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO TankOs/SFGUI + REF 0.4.0 + SHA512 15456c6080b7095bcdcec08489b2b91b5cfc36cdf3c0b645b305072e7e835837eb4f95b59371ff176630b2b7ae51da475d8ea0bde5ff7fc0ba74c463bf5f54cf + HEAD_REF master + PATCHES + "001-fix-corefoundation-link.patch" + "002-add-limits-header.patch" +) + +file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindSFML.cmake) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SFGUI_BUILD_SHARED_LIBS) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DSFGUI_BUILD_DOC=OFF + -DSFGUI_BUILD_EXAMPLES=OFF + -DSFGUI_BUILD_SHARED_LIBS=${SFGUI_BUILD_SHARED_LIBS} +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + file(GLOB_RECURSE SFGUI_DOC_RELEASE ${CURRENT_PACKAGES_DIR}/*.md) + file(GLOB_RECURSE SFGUI_DOC_DEBUG ${CURRENT_PACKAGES_DIR}/debug/*.md) + file(REMOVE ${SFGUI_DOC_RELEASE} ${SFGUI_DOC_DEBUG}) +else() + vcpkg_fixup_cmake_targets(CONFIG_PATH share/SFGUI/cmake) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/sfgui RENAME copyright) diff --git a/externals/vcpkg/ports/sfgui/vcpkg.json b/externals/vcpkg/ports/sfgui/vcpkg.json new file mode 100755 index 000000000..e0cbe393a --- /dev/null +++ b/externals/vcpkg/ports/sfgui/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "sfgui", + "version": "0.4.0", + "port-version": 5, + "description": "simple and fast graphical user interface library", + "homepage": "https://github.com/TankOs/SFGUI", + "dependencies": [ + "sfml" + ] +} diff --git a/externals/vcpkg/ports/sfml/arm64.patch b/externals/vcpkg/ports/sfml/arm64.patch new file mode 100755 index 000000000..7faefc0e6 --- /dev/null +++ b/externals/vcpkg/ports/sfml/arm64.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 67b61712ec..73711753ae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -253,10 +253,12 @@ if(SFML_OS_MACOSX) + endif() + endif() + +- # only the default architecture (i.e. 64-bit) is supported +- if(NOT CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64") +- message(FATAL_ERROR "Only 64-bit architecture is supported") +- endif() ++ # only the default x86_64 or arm64 are supported ++ foreach (arch IN LISTS CMAKE_OSX_ARCHITECTURES) ++ if (NOT (arch STREQUAL "x86_64" OR arch STREQUAL "arm64")) ++ message(FATAL_ERROR "Invalid arch ${arch}") ++ endif() ++ endforeach() + + # configure Xcode templates + set(XCODE_TEMPLATES_ARCH "\$(NATIVE_ARCH_ACTUAL)") diff --git a/externals/vcpkg/ports/sfml/portfile.cmake b/externals/vcpkg/ports/sfml/portfile.cmake new file mode 100755 index 000000000..2352bfabd --- /dev/null +++ b/externals/vcpkg/ports/sfml/portfile.cmake @@ -0,0 +1,60 @@ +vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH + REPO SFML/SFML + REF 2.5.1 + HEAD_REF master + SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59 + PATCHES + use-system-freetype.patch + stb_include.patch + arm64.patch +) + +file(REMOVE_RECURSE "${SOURCE_PATH}/extlibs") +# Without this, we get error: list sub-command REMOVE_DUPLICATES requires list to be present. +file(MAKE_DIRECTORY "${SOURCE_PATH}/extlibs/libs") +file(WRITE "${SOURCE_PATH}/extlibs/libs/x" "") +# The embedded FindFreetype doesn't properly handle debug libraries +file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/Modules/FindFreetype.cmake") + +if(VCPKG_TARGET_IS_LINUX) + message(STATUS "SFML currently requires the following libraries from the system package manager:\n libudev\n libx11\n libxrandr\n opengl\n\nThese can be installed on Ubuntu systems via apt-get install libx11-dev libxrandr-dev libxi-dev libudev-dev libgl1-mesa-dev") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSFML_BUILD_FRAMEWORKS=OFF + -DSFML_USE_SYSTEM_DEPS=ON + -DSFML_MISC_INSTALL_PREFIX=share/sfml + -DSFML_GENERATE_PDB=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SFML) +vcpkg_copy_pdbs() + +FILE(READ "${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake" SFML_CONFIG) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + FILE(WRITE "${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake" "set(SFML_STATIC_LIBRARIES true)\ninclude(CMakeFindDependencyMacro)\nfind_dependency(Freetype)\n${SFML_CONFIG}") +else() + FILE(WRITE "${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake" "set(SFML_STATIC_LIBRARIES false)\n${SFML_CONFIG}") +endif() + +# move sfml-main to manual link dir +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/sfml-main.lib") + file(COPY "${CURRENT_PACKAGES_DIR}/lib/sfml-main.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/manual-link") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/sfml-main.lib") + file(COPY "${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib") + file(GLOB FILES "${CURRENT_PACKAGES_DIR}/share/sfml/SFML*Targets-*.cmake") + foreach(FILE ${FILES}) + vcpkg_replace_string("${FILE}" "/lib/sfml-main" "/lib/manual-link/sfml-main") + endforeach() +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) + +vcpkg_fixup_pkgconfig() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) +configure_file("${SOURCE_PATH}/license.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/sfml/stb_include.patch b/externals/vcpkg/ports/sfml/stb_include.patch new file mode 100755 index 000000000..0ead09af5 --- /dev/null +++ b/externals/vcpkg/ports/sfml/stb_include.patch @@ -0,0 +1,12 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -188,6 +188,9 @@ if(SFML_USE_SYSTEM_DEPS) + endforeach() + + list(REMOVE_DUPLICATES CMAKE_IGNORE_PATH) ++ ++ find_path(STB_INCLUDE_DIR stb_image.h) ++ include_directories("${STB_INCLUDE_DIR}") + endif() + + # Visual C++: remove warnings regarding SL security and algorithms on pointers diff --git a/externals/vcpkg/ports/sfml/usage b/externals/vcpkg/ports/sfml/usage new file mode 100755 index 000000000..784d1173a --- /dev/null +++ b/externals/vcpkg/ports/sfml/usage @@ -0,0 +1,7 @@ +The package sfml provides CMake targets: + + find_package(SFML COMPONENTS system window graphics CONFIG REQUIRED) + target_link_libraries(main PRIVATE sfml-system sfml-network sfml-graphics sfml-window) + + # If you want SFML to provide an implementation of main(): + target_link_libraries(main PRIVATE sfml-main) diff --git a/externals/vcpkg/ports/sfml/use-system-freetype.patch b/externals/vcpkg/ports/sfml/use-system-freetype.patch new file mode 100755 index 000000000..4d895b741 --- /dev/null +++ b/externals/vcpkg/ports/sfml/use-system-freetype.patch @@ -0,0 +1,11 @@ +--- a/src/SFML/Graphics/CMakeLists.txt ++++ b/src/SFML/Graphics/CMakeLists.txt +@@ -135,7 +135,7 @@ if(SFML_OS_ANDROID) + endif() + + sfml_find_package(Freetype INCLUDE "FREETYPE_INCLUDE_DIRS" LINK "FREETYPE_LIBRARY") +-target_link_libraries(sfml-graphics PRIVATE Freetype) ++target_link_libraries(sfml-graphics PRIVATE Freetype::Freetype) + + # add preprocessor symbols + target_compile_definitions(sfml-graphics PRIVATE "STBI_FAILURE_USERMSG") diff --git a/externals/vcpkg/ports/sfml/vcpkg.json b/externals/vcpkg/ports/sfml/vcpkg.json new file mode 100755 index 000000000..f700631de --- /dev/null +++ b/externals/vcpkg/ports/sfml/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "sfml", + "version": "2.5.1", + "port-version": 13, + "description": "Simple and fast multimedia library", + "homepage": "https://github.com/sfml/sfml", + "license": "Zlib", + "dependencies": [ + "freetype", + "libflac", + "libogg", + "libvorbis", + "openal-soft", + "stb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/sfsexp/CMakeLists.txt b/externals/vcpkg/ports/sfsexp/CMakeLists.txt new file mode 100755 index 000000000..e770b9d6d --- /dev/null +++ b/externals/vcpkg/ports/sfsexp/CMakeLists.txt @@ -0,0 +1,20 @@ +cmake_minimum_required(VERSION 3.13) +project(sexp) + +if(MSVC) + add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS) +endif() + +file(GLOB sources src/*.c src/*.h) +include_directories(src/) + +add_library(sexp ${sources}) + +set_target_properties(sexp PROPERTIES PUBLIC_HEADER "src/cstring.h;src/faststack.h;src/sexp.h;src/sexp_errors.h;src/sexp_memory.h;src/sexp_ops.h;src/sexp_vis.h") + +install(TARGETS sexp + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin + PUBLIC_HEADER DESTINATION include +) \ No newline at end of file diff --git a/externals/vcpkg/ports/sfsexp/portfile.cmake b/externals/vcpkg/ports/sfsexp/portfile.cmake new file mode 100755 index 000000000..7b266ce08 --- /dev/null +++ b/externals/vcpkg/ports/sfsexp/portfile.cmake @@ -0,0 +1,23 @@ +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mjsottile/sfsexp + REF v1.3.1 + SHA512 56DABC8F0C16C4707F191C8D60E97C6C3DB1B359673E77967E3C21ACBDC2239F1423FE62A062CE256F3F7A1CCF8572D16A82EF67FFCD215B48E261ED1D8720D7 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/externals/vcpkg/ports/sfsexp/vcpkg.json b/externals/vcpkg/ports/sfsexp/vcpkg.json new file mode 100755 index 000000000..cb2134fff --- /dev/null +++ b/externals/vcpkg/ports/sfsexp/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "sfsexp", + "version": "1.3.1", + "description": "Small Fast S-Expression Library", + "homepage": "https://github.com/mjsottile/sfsexp" +} diff --git a/externals/vcpkg/ports/shaderc/build-version.inc b/externals/vcpkg/ports/shaderc/build-version.inc new file mode 100755 index 000000000..d5b1449e2 --- /dev/null +++ b/externals/vcpkg/ports/shaderc/build-version.inc @@ -0,0 +1 @@ +"shaderc v2021.1-dev unknown hash, 2021-06-21\n" diff --git a/externals/vcpkg/ports/shaderc/disable-update-version.patch b/externals/vcpkg/ports/shaderc/disable-update-version.patch new file mode 100755 index 000000000..7bf47bd50 --- /dev/null +++ b/externals/vcpkg/ports/shaderc/disable-update-version.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a4e779b..dc5f1a9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -121,11 +121,6 @@ if(${SHADERC_ENABLE_EXAMPLES}) + add_subdirectory(examples) + endif() + +-add_custom_target(build-version +- ${PYTHON_EXECUTABLE} +- ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py +- ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc +- COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).") + + function(define_pkg_config_file NAME LIBS) + add_custom_target(${NAME}-pkg-config ALL +diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt +index acf6fb0..d0df7db 100644 +--- a/glslc/CMakeLists.txt ++++ b/glslc/CMakeLists.txt +@@ -26,7 +26,6 @@ shaderc_default_compile_options(glslc_exe) + target_include_directories(glslc_exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/.. ${spirv-tools_SOURCE_DIR}/include) + set_target_properties(glslc_exe PROPERTIES OUTPUT_NAME glslc) + target_link_libraries(glslc_exe PRIVATE glslc shaderc_util shaderc) +-add_dependencies(glslc_exe build-version) + + shaderc_add_tests( + TEST_PREFIX glslc diff --git a/externals/vcpkg/ports/shaderc/fix-build-type.patch b/externals/vcpkg/ports/shaderc/fix-build-type.patch new file mode 100755 index 000000000..8e5cd22db --- /dev/null +++ b/externals/vcpkg/ports/shaderc/fix-build-type.patch @@ -0,0 +1,67 @@ +diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt +index 3ada419..f3277f0 100644 +--- a/libshaderc/CMakeLists.txt ++++ b/libshaderc/CMakeLists.txt +@@ -24,13 +24,16 @@ set(SHADERC_SOURCES + src/shaderc_private.h + ) + ++if (NOT BUILD_SHARED_LIBS) + add_library(shaderc STATIC ${SHADERC_SOURCES}) + shaderc_default_compile_options(shaderc) + target_include_directories(shaderc + PUBLIC include + PRIVATE ${glslang_SOURCE_DIR} + ${SPIRV-Headers_SOURCE_DIR}/include) ++set(shaderc_install_target shaderc) + ++else() + add_library(shaderc_shared SHARED ${SHADERC_SOURCES}) + shaderc_default_compile_options(shaderc_shared) + target_include_directories(shaderc_shared +@@ -42,6 +45,8 @@ target_compile_definitions(shaderc_shared + PUBLIC SHADERC_SHAREDLIB + ) + set_target_properties(shaderc_shared PROPERTIES SOVERSION 1) ++set(shaderc_install_target shaderc_shared) ++endif() + + if(SHADERC_ENABLE_INSTALL) + install( +@@ -54,7 +59,7 @@ if(SHADERC_ENABLE_INSTALL) + DESTINATION + ${CMAKE_INSTALL_INCLUDEDIR}/shaderc) + +- install(TARGETS shaderc shaderc_shared ++ install(TARGETS ${shaderc_install_target} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +@@ -68,8 +73,11 @@ set(SHADERC_LIBS + SPIRV-Tools + ) + ++if(NOT BUILD_SHARED_LIBS) + target_link_libraries(shaderc PRIVATE ${SHADERC_LIBS}) ++else() + target_link_libraries(shaderc_shared PRIVATE ${SHADERC_LIBS}) ++endif() + + shaderc_add_tests( + TEST_PREFIX shaderc +@@ -93,6 +101,7 @@ shaderc_add_tests( + shaderc_cpp + shaderc_private) + ++if(0) + shaderc_combine_static_lib(shaderc_combined shaderc) + + if(SHADERC_ENABLE_INSTALL) +@@ -121,6 +130,7 @@ shaderc_add_tests( + TEST_NAMES + shaderc + shaderc_cpp) ++endif() + + if(${SHADERC_ENABLE_TESTS}) + add_executable(shaderc_c_smoke_test ./src/shaderc_c_smoke_test.c) diff --git a/externals/vcpkg/ports/shaderc/fix-export-cmakefiles.patch b/externals/vcpkg/ports/shaderc/fix-export-cmakefiles.patch new file mode 100755 index 000000000..75e3aba81 --- /dev/null +++ b/externals/vcpkg/ports/shaderc/fix-export-cmakefiles.patch @@ -0,0 +1,93 @@ +diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt +index f3277f0..5fd58ef 100644 +--- a/libshaderc/CMakeLists.txt ++++ b/libshaderc/CMakeLists.txt +@@ -28,7 +28,9 @@ if (NOT BUILD_SHARED_LIBS) + add_library(shaderc STATIC ${SHADERC_SOURCES}) + shaderc_default_compile_options(shaderc) + target_include_directories(shaderc +- PUBLIC include ++ PUBLIC ++ $ ++ $ + PRIVATE ${glslang_SOURCE_DIR} + ${SPIRV-Headers_SOURCE_DIR}/include) + set(shaderc_install_target shaderc) +@@ -37,7 +39,9 @@ else() + add_library(shaderc_shared SHARED ${SHADERC_SOURCES}) + shaderc_default_compile_options(shaderc_shared) + target_include_directories(shaderc_shared +- PUBLIC include ++ PUBLIC ++ $ ++ $ + PRIVATE ${glslang_SOURCE_DIR} + ${SPIRV-Headers_SOURCE_DIR}/include) + target_compile_definitions(shaderc_shared +@@ -59,10 +63,14 @@ if(SHADERC_ENABLE_INSTALL) + DESTINATION + ${CMAKE_INSTALL_INCLUDEDIR}/shaderc) + +- install(TARGETS ${shaderc_install_target} ++ install(TARGETS ${shaderc_install_target} EXPORT unofficial-shadercTargets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ install(EXPORT unofficial-shadercTargets ++ NAMESPACE unofficial::shaderc:: ++ DESTINATION share/unofficial-shaderc ++ ) + endif(SHADERC_ENABLE_INSTALL) + + find_package(Threads) +@@ -79,6 +87,11 @@ else() + target_link_libraries(shaderc_shared PRIVATE ${SHADERC_LIBS}) + endif() + ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc-config.cmake.in" ++[[include("${CMAKE_CURRENT_LIST_DIR}/unofficial-shadercTargets.cmake")]]) ++configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc-config.cmake" @ONLY) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc-config.cmake DESTINATION share/unofficial-shaderc) ++ + shaderc_add_tests( + TEST_PREFIX shaderc + LINK_LIBS shaderc +diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt +index 4926203..b152d7b 100644 +--- a/libshaderc_util/CMakeLists.txt ++++ b/libshaderc_util/CMakeLists.txt +@@ -39,7 +39,10 @@ add_library(shaderc_util STATIC + + shaderc_default_compile_options(shaderc_util) + target_include_directories(shaderc_util +- PUBLIC include PRIVATE ${glslang_SOURCE_DIR}) ++ PUBLIC ++ $ ++ $ ++ PRIVATE ${glslang_SOURCE_DIR}) + # We use parts of Glslang's HLSL compilation interface, which + # now requires this preprocessor definition. + add_definitions(-DENABLE_HLSL) +@@ -50,12 +53,21 @@ target_link_libraries(shaderc_util PRIVATE + SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) + + if(SHADERC_ENABLE_INSTALL AND NOT BUILD_SHARED_LIBS) +- install(TARGETS shaderc_util ++ install(TARGETS shaderc_util EXPORT unofficial-shaderc_utilTargets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ install(EXPORT unofficial-shaderc_utilTargets ++ NAMESPACE unofficial::shaderc_util:: ++ DESTINATION share/unofficial-shaderc_util ++ ) + endif(SHADERC_ENABLE_INSTALL) + ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc_util-config.cmake.in" ++[[include("${CMAKE_CURRENT_LIST_DIR}/unofficial-shaderc_utilTargets.cmake")]]) ++configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc_util-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc_util-config.cmake" @ONLY) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc_util-config.cmake DESTINATION share/unofficial-shaderc_util) ++ + shaderc_add_tests( + TEST_PREFIX shaderc_util + LINK_LIBS shaderc_util diff --git a/externals/vcpkg/ports/shaderc/fix-install-shaderc_util.patch b/externals/vcpkg/ports/shaderc/fix-install-shaderc_util.patch new file mode 100755 index 000000000..7601f3020 --- /dev/null +++ b/externals/vcpkg/ports/shaderc/fix-install-shaderc_util.patch @@ -0,0 +1,18 @@ +diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt +index 99ce3c4..4926203 100644 +--- a/libshaderc_util/CMakeLists.txt ++++ b/libshaderc_util/CMakeLists.txt +@@ -49,6 +49,13 @@ target_link_libraries(shaderc_util PRIVATE + glslang OSDependent OGLCompiler HLSL glslang SPIRV + SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) + ++if(SHADERC_ENABLE_INSTALL AND NOT BUILD_SHARED_LIBS) ++ install(TARGETS shaderc_util ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++endif(SHADERC_ENABLE_INSTALL) ++ + shaderc_add_tests( + TEST_PREFIX shaderc_util + LINK_LIBS shaderc_util diff --git a/externals/vcpkg/ports/shaderc/glslang/CMakeLists.txt b/externals/vcpkg/ports/shaderc/glslang/CMakeLists.txt new file mode 100755 index 000000000..0e745779d --- /dev/null +++ b/externals/vcpkg/ports/shaderc/glslang/CMakeLists.txt @@ -0,0 +1,13 @@ +cmake_minimum_required(VERSION 3.11) + +find_package(glslang CONFIG REQUIRED) + +set_property(TARGET glslang PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET OSDependent PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET OGLCompiler PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET HLSL PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET SPIRV PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET MachineIndependent PROPERTY IMPORTED_GLOBAL TRUE) + +find_path(glslang_SOURCE_DIR glslang/Public/ShaderLang.h) +set(glslang_SOURCE_DIR "${glslang_SOURCE_DIR}/glslang" "${glslang_SOURCE_DIR}" CACHE STRING "" FORCE) diff --git a/externals/vcpkg/ports/shaderc/portfile.cmake b/externals/vcpkg/ports/shaderc/portfile.cmake new file mode 100755 index 000000000..4a2f62cba --- /dev/null +++ b/externals/vcpkg/ports/shaderc/portfile.cmake @@ -0,0 +1,49 @@ +#Note: glslang and spir tools doesn't export symbol and need to be build as static lib for cmake to work +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/shaderc + REF adca18dcadd460eb517fe44f6cd2460fa0650ebe + SHA512 3a27d4c51be9e9396b9a854cb96d88e78ff2ca6dcb8400bd3288f6984d25876af0eae649aa1c72ad613edbbcfa4324a12809f13ceb7a0134eef41cb1a698dfdf + HEAD_REF master + PATCHES + disable-update-version.patch + fix-build-type.patch + fix-install-shaderc_util.patch + fix-export-cmakefiles.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/build-version.inc" DESTINATION "${SOURCE_PATH}/glslc/src") + +set(OPTIONS) +if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + list(APPEND OPTIONS -DSHADERC_ENABLE_SHARED_CRT=ON) +endif() + +# shaderc uses python to manipulate copyright information +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) +vcpkg_add_to_path(PREPEND "${PYTHON3_EXE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${OPTIONS} + -DSHADERC_SKIP_TESTS=true + -DSHADERC_GLSLANG_DIR=${CMAKE_CURRENT_LIST_DIR}/glslang + -DSHADERC_SPIRV_TOOLS_DIR=${CMAKE_CURRENT_LIST_DIR}/spirv-tools + -DSHADERC_ENABLE_EXAMPLES=OFF +) + +vcpkg_cmake_install() + +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-shaderc CONFIG_PATH share/unofficial-shaderc) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-shaderc_util CONFIG_PATH share/unofficial-shaderc_util) + +vcpkg_copy_tools(TOOL_NAMES glslc AUTO_CLEAN) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/shaderc/spirv-tools/CMakeLists.txt b/externals/vcpkg/ports/shaderc/spirv-tools/CMakeLists.txt new file mode 100755 index 000000000..d9e013601 --- /dev/null +++ b/externals/vcpkg/ports/shaderc/spirv-tools/CMakeLists.txt @@ -0,0 +1,8 @@ +find_library(SPIRVTOOLSOPT SPIRV-Tools-opt) +find_library(SPIRVTOOLS SPIRV-Tools) + +add_library(SPIRV-Tools-opt STATIC IMPORTED GLOBAL) +set_property(TARGET SPIRV-Tools-opt PROPERTY IMPORTED_LOCATION "${SPIRVTOOLSOPT}") + +add_library(SPIRV-Tools STATIC IMPORTED GLOBAL) +set_property(TARGET SPIRV-Tools PROPERTY IMPORTED_LOCATION "${SPIRVTOOLS}") diff --git a/externals/vcpkg/ports/shaderc/vcpkg.json b/externals/vcpkg/ports/shaderc/vcpkg.json new file mode 100755 index 000000000..903544d80 --- /dev/null +++ b/externals/vcpkg/ports/shaderc/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "shaderc", + "version": "2021.1", + "port-version": 2, + "description": "A collection of tools, libraries and tests for shader compilation.", + "homepage": "https://github.com/google/shaderc", + "license": "Apache-2.0", + "dependencies": [ + "glslang", + "spirv-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/shaderwriter/portfile.cmake b/externals/vcpkg/ports/shaderwriter/portfile.cmake new file mode 100755 index 000000000..14276ee98 --- /dev/null +++ b/externals/vcpkg/ports/shaderwriter/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH + REPO DragonJoker/ShaderWriter + REF e962d383c9c418767b96d2c3e864b3800e98826f + HEAD_REF development + SHA512 7ef1d4622bb1a38f201e9325ffca0de675816e9dc6f644d2e4a900409a5045f603dda5c86a3099a99f3be70175ca7bf6aed1c4c1e25aa9b5172967e30498536d +) + +vcpkg_from_github(OUT_SOURCE_PATH CMAKE_SOURCE_PATH + REPO DragonJoker/CMakeUtils + REF 9fbaae40ccdc92f86989dc6875f362e7943b6a94 + HEAD_REF master + SHA512 dada8ac1f9676c60f1ff5a09a9f788eb8d85eaca450407e4bf0100fbec87228f99cf66cb23de9c9358dda72c426655814cbd1ea90360ca0c63e7660c15aff22b +) + +file(REMOVE_RECURSE "${SOURCE_PATH}/CMake") +file(COPY "${CMAKE_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/CMake") + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DPROJECTS_USE_PRECOMPILED_HEADERS=OFF + -DSDW_GENERATE_SOURCE=OFF + -DSDW_BUILD_VULKAN_LAYER=OFF + -DSDW_BUILD_TESTS=OFF + -DSDW_BUILD_STATIC_SDW=${BUILD_STATIC} + -DSDW_BUILD_STATIC_SDAST=${BUILD_STATIC} + -DSDW_UNITY_BUILD=ON +) + +vcpkg_copy_pdbs() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME ShaderWriter CONFIG_PATH lib/cmake/shaderwriter) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/shaderwriter/vcpkg.json b/externals/vcpkg/ports/shaderwriter/vcpkg.json new file mode 100755 index 000000000..d9de58a84 --- /dev/null +++ b/externals/vcpkg/ports/shaderwriter/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "shaderwriter", + "version": "2.3.0", + "description": "Library to write shaders directly from C++ code, supports GLSL, HLSL and SPIRV outputs.", + "homepage": "https://github.com/DragonJoker/ShaderWriter", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/shapelib/fix-usage.patch b/externals/vcpkg/ports/shapelib/fix-usage.patch new file mode 100755 index 000000000..8b22423fa --- /dev/null +++ b/externals/vcpkg/ports/shapelib/fix-usage.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b3b3b51..ea3f129 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -73,8 +73,8 @@ set( + + # Export build information to help other projects link installed + # shapelib software. Only one of these signatures is required +-# for the export_shp name. +-install(EXPORT export_shp DESTINATION ${CMAKE_INSTALL_SHP_DATADIR}) ++# for the shpConfig name. ++install(EXPORT shpConfig DESTINATION ${CMAKE_INSTALL_SHP_DATADIR}) + + # Initial boilerplate done, now build library and executables. + +@@ -127,12 +127,17 @@ if(USE_RPATH) + endif(USE_RPATH) + + install(TARGETS shp +- EXPORT export_shp ++ EXPORT shpConfig + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) + ++INSTALL(EXPORT shpConfig ++ DESTINATION share/shp ++) ++ ++ + # executables to be built and installed. + set(executables + shpcreate diff --git a/externals/vcpkg/ports/shapelib/option-build-test.patch b/externals/vcpkg/ports/shapelib/option-build-test.patch new file mode 100755 index 000000000..c91410f38 --- /dev/null +++ b/externals/vcpkg/ports/shapelib/option-build-test.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c3ef935..845ec06 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -148,7 +148,7 @@ set(executables + find_program(BASH_EXECUTABLE bash) + find_program(SED_EXECUTABLE sed) + if(BASH_EXECUTABLE AND SED_EXECUTABLE) +- set(BUILD_TEST ON) ++ option(BUILD_TEST "" ON) + else(BASH_EXECUTABLE AND SED_EXECUTABLE) + message(STATUS "WARNING: sed or bash not available so disabling testing") + endif(BASH_EXECUTABLE AND SED_EXECUTABLE) diff --git a/externals/vcpkg/ports/shapelib/portfile.cmake b/externals/vcpkg/ports/shapelib/portfile.cmake new file mode 100755 index 000000000..b7fe51a1e --- /dev/null +++ b/externals/vcpkg/ports/shapelib/portfile.cmake @@ -0,0 +1,50 @@ +set(SHAPELIB_VERSION 1.5.0) +set(SHAPELIB_HASH 230939afb33aee042808a32b38ee9dfc7ec1f39432e5a4ebe3fda99c2f87bfbebc91830d4e21691c51aae3f4bb65d7e71e7061472bb08124dcd3402c46800d6c) + +vcpkg_download_distfile(ARCHIVE + URLS "http://download.osgeo.org/shapelib/shapelib-${SHAPELIB_VERSION}.zip" + FILENAME "shapelib-${SHAPELIB_VERSION}.zip" + SHA512 ${SHAPELIB_HASH} +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + option-build-test.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TEST=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME shp) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*.exe") +if(EXES) + file(COPY ${EXES} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/shapelib") + file(REMOVE ${EXES}) +endif() + +file(GLOB DEBUG_EXES "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") +if(DEBUG_EXES) + file(REMOVE ${DEBUG_EXES}) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/shapelib") + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/shapelib/vcpkg.json b/externals/vcpkg/ports/shapelib/vcpkg.json new file mode 100755 index 000000000..db87581cf --- /dev/null +++ b/externals/vcpkg/ports/shapelib/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "shapelib", + "version": "1.5.0", + "port-version": 3, + "description": "Shapefile C Library is simple C API for reading and writing ESRI Shapefiles", + "homepage": "https://download.osgeo.org/shapelib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/shiva-sfml/portfile.cmake b/externals/vcpkg/ports/shiva-sfml/portfile.cmake new file mode 100755 index 000000000..0e603e8de --- /dev/null +++ b/externals/vcpkg/ports/shiva-sfml/portfile.cmake @@ -0,0 +1,142 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Milerius/shiva + REF 1.0 + SHA512 d1ce33e89b17fa8f82e21b51dfa1308e38c617fea52c34a20b7b6c8643318280df24c043238ddd73ba2dbc139c5b5de1c2cb3add1f5629a54694c78b415d73d1 + HEAD_REF master + ) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DSHIVA_BUILD_TESTS=OFF -DSHIVA_USE_SFML_AS_RENDERER=ON -DSHIVA_INSTALL_PLUGINS=ON -DSHIVA_BUILD_EXAMPLES=OFF +) + +vcpkg_install_cmake() + + +if (VCPKG_CMAKE_SYSTEM_NAME) + file(GLOB PLUGINS_RELEASE ${SOURCE_PATH}/bin/Release/systems/*) + file(GLOB PLUGINS_DEBUG ${SOURCE_PATH}/bin/Debug/systems/*) +else() + file(GLOB PLUGINS_RELEASE ${SOURCE_PATH}/bin/Release/systems/*.dll) + file(GLOB PLUGINS_DEBUG ${SOURCE_PATH}/bin/Debug/systems/*.dll) +endif() + +message(STATUS "PLUGINS_RELEASE -> ${PLUGINS_RELEASE}") +message(STATUS "PLUGINS_DEBUG -> ${PLUGINS_DEBUG}") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/shiva-sfml) + + +if (VCPKG_CMAKE_SYSTEM_NAME) + set(SUFFIX_BINARY lib) +else() + set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) + set(SUFFIX_BINARY bin) +endif() + +##! Pre removing +if (VCPKG_CMAKE_SYSTEM_NAME) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +endif() + +##! Include +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include/shiva-sfml) + +##! Release +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Release) + +##! Debug +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Debug) + +##! Copy Plugins +file(COPY ${PLUGINS_RELEASE} DESTINATION ${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Release) +file(COPY ${PLUGINS_DEBUG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Debug) + +if (NOT VCPKG_CMAKE_SYSTEM_NAME) + find_file(LUADLL lua.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) + find_file(FMTDLL fmt.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) + find_file(FLACDLL FLAC.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) + find_file(FREETYPEDLL freetype.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) + find_file(LIBBZ2DLL libbz2.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) + find_file(LIBPNG16DLL libpng16.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) + find_file(OGGDLL ogg.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) + find_file(OPENAL32DLL OpenAL32.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) + find_file(SFMLAUDIO2DLL sfml-audio-2.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) + find_file(SFMLGRAPHICS2DLL sfml-graphics-2.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) + find_file(SFMLSYSTEM2DLL sfml-system-2.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) + find_file(SFMLWINDOW2DLL sfml-window-2.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) + find_file(VORBISDLL vorbis.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) + find_file(VORBISENCDLL vorbisenc.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) + find_file(VORBISFILEDLL vorbisfile.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) + find_file(ZLIB1DLL zlib1.dll PATHS ${CURRENT_INSTALLED_DIR}/bin) + set(DEPENDANCIES_RELEASE_DLL + ${LUADLL} + ${FMTDLL} + ${FLACDLL} + ${FREETYPEDLL} + ${LIBBZ2DLL} + ${LIBPNG16DLL} + ${OGGDLL} + ${OPENAL32DLL} + ${SFMLAUDIO2DLL} + ${SFMLGRAPHICS2DLL} + ${SFMLSYSTEM2DLL} + ${SFMLWINDOW2DLL} + ${VORBISDLL} + ${VORBISENCDLL} + ${VORBISFILEDLL} + ${ZLIB1DLL}) + + find_file(LUADLL_D lua.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) + find_file(FMTDLL_D fmtd.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) + find_file(FLACDLL_D FLAC.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) + find_file(FREETYPEDLL_D freetyped.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) + find_file(LIBBZ2DLL_D libbz2d.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) + find_file(LIBPNG16DLL_D libpng16d.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) + find_file(OGGDLL_D ogg.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) + find_file(OPENAL32DLL_D OpenAL32.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) + find_file(SFMLAUDIO2DLL_D sfml-audio-d-2.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) + find_file(SFMLGRAPHICS2DLL_D sfml-graphics-d-2.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) + find_file(SFMLSYSTEM2DLL_D sfml-system-d-2.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) + find_file(SFMLWINDOW2DLL_D sfml-window-d-2.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) + find_file(VORBISDLL_D vorbis.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) + find_file(VORBISENCDLL_D vorbisenc.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) + find_file(VORBISFILEDLL_D vorbisfile.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) + find_file(ZLIB1DLL_D zlibd1.dll PATHS ${CURRENT_INSTALLED_DIR}/debug/bin) + set(DEPENDANCIES_DEBUG_DLL + ${LUADLL_D} + ${FMTDLL_D} + ${FLACDLL_D} + ${FREETYPEDLL_D} + ${LIBBZ2DLL_D} + ${LIBPNG16DLL_D} + ${OGGDLL_D} + ${OPENAL32DLL} + ${SFMLAUDIO2DLL_D} + ${SFMLGRAPHICS2DLL_D} + ${SFMLSYSTEM2DLL_D} + ${SFMLWINDOW2DLL_D} + ${VORBISDLL_D} + ${VORBISENCDLL_D} + ${VORBISFILEDLL_D} + ${ZLIB1DLL_D} + ) + + file(COPY ${DEPENDANCIES_RELEASE_DLL} DESTINATION ${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Release) + file(COPY ${DEPENDANCIES_DEBUG_DLL} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Debug) +endif() + +file(WRITE ${CURRENT_PACKAGES_DIR}/include/shiva-sfml/empty.h "") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/shiva-sfml/copyright "") diff --git a/externals/vcpkg/ports/shiva-sfml/vcpkg.json b/externals/vcpkg/ports/shiva-sfml/vcpkg.json new file mode 100755 index 000000000..7fce5e809 --- /dev/null +++ b/externals/vcpkg/ports/shiva-sfml/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "shiva-sfml", + "version-string": "1.0", + "port-version": 2, + "description": "shiva-sfml plugins of shiva C++ engine", + "dependencies": [ + { + "name": "sfml", + "platform": "windows" + }, + "shiva" + ] +} diff --git a/externals/vcpkg/ports/shiva/no_copy_dll.patch b/externals/vcpkg/ports/shiva/no_copy_dll.patch new file mode 100755 index 000000000..add7f22a4 --- /dev/null +++ b/externals/vcpkg/ports/shiva/no_copy_dll.patch @@ -0,0 +1,13 @@ +diff --git a/modules/python/CMakeLists.txt b/modules/python/CMakeLists.txt +index eef14ee87..d52a147d8 100644 +--- a/modules/python/CMakeLists.txt ++++ b/modules/python/CMakeLists.txt +@@ -4,7 +4,7 @@ set(MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) + find_package(pybind11 CONFIG REQUIRED) + + +-if (WIN32) ++if (WIN32 AND FALSE) + ## We need pyton dll + file(GLOB PYTHON_DLL ${PYTHON_LIBRARIES}/../*.dll) + diff --git a/externals/vcpkg/ports/shiva/portfile.cmake b/externals/vcpkg/ports/shiva/portfile.cmake new file mode 100755 index 000000000..884a8de10 --- /dev/null +++ b/externals/vcpkg/ports/shiva/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Milerius/shiva + REF 1.0 + SHA512 d1ce33e89b17fa8f82e21b51dfa1308e38c617fea52c34a20b7b6c8643318280df24c043238ddd73ba2dbc139c5b5de1c2cb3add1f5629a54694c78b415d73d1 + HEAD_REF master + PATCHES no_copy_dll.patch +) + +find_library(PYTHON_RELEASE NAMES python310 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(PYTHON_DEBUG NAMES python310_d python310 PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +include(SelectLibraryConfigurations) +select_library_configurations(PYTHON) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DSHIVA_BUILD_TESTS=OFF + "-DPYTHON_LIBRARY=${PYTHON_LIBRARIES}" + "-DPYTHON_LIBRARIES=${PYTHON_LIBRARIES}" + "-DPYTHON_EXECUTABLE=${CURRENT_INSTALLED_DIR}/tools/python3/python${VCPKG_EXECUTABLE_SUFFIX}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/shiva") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/shiva") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/shiva/LICENSE" "${CURRENT_PACKAGES_DIR}/share/shiva/copyright") diff --git a/externals/vcpkg/ports/shiva/vcpkg.json b/externals/vcpkg/ports/shiva/vcpkg.json new file mode 100755 index 000000000..447297bd0 --- /dev/null +++ b/externals/vcpkg/ports/shiva/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "shiva", + "version": "1.0", + "port-version": 5, + "description": "Modern C++ Game Engine", + "homepage": "https://github.com/Milerius/shiva", + "dependencies": [ + "boost-dll", + "boost-filesystem", + "boost-stacktrace", + "entt", + "lua", + { + "name": "luafilesystem", + "platform": "windows" + }, + "nlohmann-json", + "pybind11", + "sol2", + "spdlog", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/shogun/cmake-config.in.patch b/externals/vcpkg/ports/shogun/cmake-config.in.patch new file mode 100755 index 000000000..8ee2a1343 --- /dev/null +++ b/externals/vcpkg/ports/shogun/cmake-config.in.patch @@ -0,0 +1,11 @@ +diff --git a/cmake/ShogunConfig.cmake.in b/cmake/ShogunConfig.cmake.in +index e8e8035..a5097cb 100644 +--- a/cmake/ShogunConfig.cmake.in ++++ b/cmake/ShogunConfig.cmake.in +@@ -2,5 +2,5 @@ + + set_and_check(shogun_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") + +-include("@PACKAGE_CONFIG_PACKAGE_DIR@/ShogunTargets.cmake") ++include("@PACKAGE_CONFIG_PACKAGE_DIR@/../../../share/shogun/ShogunTargets.cmake") + check_required_components(shogun) diff --git a/externals/vcpkg/ports/shogun/cmake.patch b/externals/vcpkg/ports/shogun/cmake.patch new file mode 100755 index 000000000..16f1c3ad4 --- /dev/null +++ b/externals/vcpkg/ports/shogun/cmake.patch @@ -0,0 +1,73 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6c48bed..6f97c8b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,8 +60,8 @@ SET(SYSTEM_C_FLAGS "${CMAKE_C_FLAGS}") + SET(SYSTEM_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + STRING(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE_UC) + IF(NOT ("${BUILD_TYPE_UC}" STREQUAL "DISTRIBUTION")) +- SET(CMAKE_C_FLAGS "") +- SET(CMAKE_CXX_FLAGS "") ++# SET(CMAKE_C_FLAGS "") ++# SET(CMAKE_CXX_FLAGS "") + ENDIF(NOT ("${BUILD_TYPE_UC}" STREQUAL "DISTRIBUTION")) + + # CCACHE +@@ -184,12 +184,12 @@ SET(SWIG_CXX_COMPILER_FLAGS "-O0 -g") + SET(CMAKE_C_FLAGS "${COMPILER_WARNINGS} ${CMAKE_C_FLAGS}") + SET(CMAKE_CXX_FLAGS "${COMPILER_WARNINGS} ${CMAKE_CXX_FLAGS}") + IF(MSVC) +- SET(CMAKE_C_FLAGS_RELEASE "/O2 ${RELEASE_COMPILER_FLAGS}") +- SET(CMAKE_CXX_FLAGS_RELEASE "/O2 ${RELEASE_COMPILER_FLAGS}") +- SET(CMAKE_C_FLAGS_DISTRIBUTION "/Ot") +- SET(CMAKE_CXX_FLAGS_DISTRIBUTION "/Ot") +- SET(CMAKE_C_FLAGS_DEBUG "/DEBUG /Od /Zi") +- SET(CMAKE_CXX_FLAGS_DEBUG "/DEBUG /Od /Zi") ++ # SET(CMAKE_C_FLAGS_RELEASE "/O2 ${RELEASE_COMPILER_FLAGS}") ++ # SET(CMAKE_CXX_FLAGS_RELEASE "/O2 ${RELEASE_COMPILER_FLAGS}") ++ # SET(CMAKE_C_FLAGS_DISTRIBUTION "/Ot") ++ # SET(CMAKE_CXX_FLAGS_DISTRIBUTION "/Ot") ++ # SET(CMAKE_C_FLAGS_DEBUG "/DEBUG /Od /Zi") ++ # SET(CMAKE_CXX_FLAGS_DEBUG "/DEBUG /Od /Zi") + add_compile_options("/bigobj") + ELSE() + SET(CMAKE_C_FLAGS_RELEASE "-O3 ${RELEASE_COMPILER_FLAGS}") +diff --git a/cmake/version.cmake b/cmake/version.cmake +index fbca111..f6847f7 100644 +--- a/cmake/version.cmake ++++ b/cmake/version.cmake +@@ -5,7 +5,7 @@ SET(MAINVERSION ${VERSION}) + + SET(EXTRA "") + +-IF(EXISTS "${ROOT_DIR}/.git/") ++IF(EXISTS "${ROOT_DIR}/.git/" AND FALSE) + FIND_PACKAGE(Git QUIET) + IF (NOT GIT_FOUND) + MESSAGE(FATAL_ERROR "The source is checked out from a git repository, but cannot find git executable!") +diff --git a/src/shogun/CMakeLists.txt b/src/shogun/CMakeLists.txt +index 9e79786..fd76961 100644 +--- a/src/shogun/CMakeLists.txt ++++ b/src/shogun/CMakeLists.txt +@@ -145,7 +145,7 @@ endif() + # add target for static library if enabled + if (LIBSHOGUN_BUILD_STATIC) + add_library(shogun-static STATIC $ ${CMAKE_CURRENT_BINARY_DIR}/lib/config.h) +- set_property(TARGET shogun-static PROPERTY OUTPUT_NAME shogun) ++ set_property(TARGET shogun-static PROPERTY OUTPUT_NAME libshogun) + target_include_directories(shogun-static PUBLIC + $ + $ +@@ -492,10 +492,12 @@ ELSE() + ENDIF() + + # set the desidered targets to be installed ++if(NOT INSTALL_TARGETS) + set(INSTALL_TARGETS shogun) + if (LIBSHOGUN_BUILD_STATIC) + LIST(APPEND INSTALL_TARGETS shogun-static) + endif() ++endif() + + INSTALL( + TARGETS ${INSTALL_TARGETS} diff --git a/externals/vcpkg/ports/shogun/eigen-3.4.patch b/externals/vcpkg/ports/shogun/eigen-3.4.patch new file mode 100755 index 000000000..c6cd369b1 --- /dev/null +++ b/externals/vcpkg/ports/shogun/eigen-3.4.patch @@ -0,0 +1,65 @@ +--- a/src/shogun/machine/gp/MultiLaplaceInferenceMethod.cpp ++++ b/src/shogun/machine/gp/MultiLaplaceInferenceMethod.cpp +@@ -84,9 +84,9 @@ class CMultiPsiLine : public func_base + float64_t result=0; + for(index_t bl=0; blblock(bl*n,0,n,1)*CMath::exp(log_scale*2.0); +- result+=alpha->block(bl*n,0,n,1).dot(eigen_f.block(bl*n,0,n,1))/2.0; +- eigen_f.block(bl*n,0,n,1)+=eigen_m; ++ eigen_f.segment(bl*n,n)=K*alpha->segment(bl*n,n)*CMath::exp(log_scale*2.0); ++ result+=alpha->segment(bl*n,n).dot(eigen_f.segment(bl*n,n))/2.0; ++ eigen_f.segment(bl*n,n)+=eigen_m; + } + + // get first and second derivatives of log likelihood +@@ -272,7 +272,7 @@ void CMultiLaplaceInferenceMethod::update_alpha() + { + Map alpha(m_alpha.vector, m_alpha.vlen); + for(index_t bl=0; bl chol_tmp((eigen_sD*eigen_sD.transpose()).cwiseProduct(eigen_ktrtr*CMath::exp(m_log_scale*2.0))+ + MatrixXd::Identity(m_ktrtr.num_rows, m_ktrtr.num_cols)); + MatrixXd eigen_L_tmp=chol_tmp.matrixU(); +@@ -341,11 +341,11 @@ void CMultiLaplaceInferenceMethod::update_alpha() + VectorXd tmp2=m_tmp.array().rowwise().sum(); + + for(index_t bl=0; bl &eigen_c=eigen_W; + for(index_t bl=0; bl c_tmp(eigen_c.data(),n,C); + +@@ -409,7 +409,7 @@ float64_t CMultiLaplaceInferenceMethod::get_derivative_helper(SGMatrix CMultiLaplaceInferenceMethod::get_derivative_wrt_mean( + result[i]=0; + //currently only compute the explicit term + for(index_t bl=0; bl + #include + #include ++#include + + #ifdef HAVE_CXX11 + #include diff --git a/externals/vcpkg/ports/shogun/fix-cblas-path.patch b/externals/vcpkg/ports/shogun/fix-cblas-path.patch new file mode 100755 index 000000000..e21a3723c --- /dev/null +++ b/externals/vcpkg/ports/shogun/fix-cblas-path.patch @@ -0,0 +1,13 @@ +diff --git a/src/shogun/mathematics/lapack.h b/src/shogun/mathematics/lapack.h +index 6ba466f..f5de479 100644 +--- a/src/shogun/mathematics/lapack.h ++++ b/src/shogun/mathematics/lapack.h +@@ -38,7 +38,7 @@ extern "C" { + #include + #endif + #else +-#include ++#include + #endif + + #ifdef HAVE_ACML diff --git a/externals/vcpkg/ports/shogun/fix-dirent.patch b/externals/vcpkg/ports/shogun/fix-dirent.patch new file mode 100755 index 000000000..f45102356 --- /dev/null +++ b/externals/vcpkg/ports/shogun/fix-dirent.patch @@ -0,0 +1,17 @@ +diff --git a/src/shogun/CMakeLists.txt b/src/shogun/CMakeLists.txt +index fd76961..396251c 100644 +--- a/src/shogun/CMakeLists.txt ++++ b/src/shogun/CMakeLists.txt +@@ -170,10 +170,10 @@ IF(MSVC) + ENDIF() + + # bundle dirent +- include(external/MSDirent) ++ find_path(MSDIRENT_INCLUDE_DIR NAMES dirent.h) + SHOGUN_INCLUDE_DIRS(SCOPE PUBLIC + $ +- $ ++ $ + ) + + target_link_libraries(shogun PUBLIC winmm) diff --git a/externals/vcpkg/ports/shogun/portfile.cmake b/externals/vcpkg/ports/shogun/portfile.cmake new file mode 100755 index 000000000..59ca49306 --- /dev/null +++ b/externals/vcpkg/ports/shogun/portfile.cmake @@ -0,0 +1,61 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO shogun-toolbox/shogun + REF ab274e7ab6bf24dd598c1daf1e626cb686d6e1cc + SHA512 fb90e5bf802c6fd59bf35ab7bbde5e8cfcdc5d46c69c52097140b30c6b29e28b8341dd1ece7f8a1f9d9123f4bc06d44d288584ce7dfddccf3d33fe05106884ae + HEAD_REF master + PATCHES + cmake.patch + cmake-config.in.patch + eigen-3.4.patch + fix-dirent.patch + fix-ASSERT-not-found.patch + fix-cblas-path.patch +) + +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path(${PYTHON3_DIR}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_META_EXAMPLES=OFF + -DBUILD_EXAMPLES=OFF + -DUSE_SVMLIGHT=OFF + -DENABLE_TESTING=OFF + -DLICENSE_GPL_SHOGUN=OFF + -DLIBSHOGUN_BUILD_STATIC=ON + -DCMAKE_DISABLE_FIND_PACKAGE_JSON=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_ViennaCL=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_TFLogger=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_GLPK=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_CPLEX=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_ARPACK=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_Mosek=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_LpSolve=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_ColPack=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_ARPREC=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_Ctags=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_CCache=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_CURL=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_OpenMP=TRUE + -DINSTALL_TARGETS=shogun-static +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/shogun) + +file(REMOVE_RECURSE + # This directory is empty given the settings above + ${CURRENT_PACKAGES_DIR}/include/shogun/mathematics/linalg/backend + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share +) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/shogun/vcpkg.json b/externals/vcpkg/ports/shogun/vcpkg.json new file mode 100755 index 000000000..d3c78c1b2 --- /dev/null +++ b/externals/vcpkg/ports/shogun/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "shogun", + "version-string": "6.1.4", + "port-version": 7, + "description": "Unified and efficient Machine Learning", + "homepage": "https://github.com/shogun-toolbox/shogun", + "dependencies": [ + "blas", + "bzip2", + "curl", + "dirent", + "eigen3", + "liblzma", + "libxml2", + "lzo", + "nlopt", + "protobuf", + "rxcpp", + "snappy", + "zlib" + ] +} diff --git a/externals/vcpkg/ports/signalrclient/0001_cmake.patch b/externals/vcpkg/ports/signalrclient/0001_cmake.patch new file mode 100755 index 000000000..8002aeab7 --- /dev/null +++ b/externals/vcpkg/ports/signalrclient/0001_cmake.patch @@ -0,0 +1,75 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8c73730..4cd9074 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,7 +1,9 @@ + cmake_minimum_required (VERSION 2.8.11) + project (signalrclient) + ++if(NOT WIN32) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -L -lcpprest") ++endif() + + set(CPPREST_INCLUDE_DIR "" CACHE FILEPATH "Path to casablanca include dir") + +@@ -16,4 +18,32 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) + + add_subdirectory(src/signalrclient) +-add_subdirectory(test) ++if(NOT DISABLE_TESTS) ++ add_subdirectory(test) ++endif() ++ ++if(BUILD_SHARED_LIBS) ++ install(FILES include/signalrclient/_exports.h DESTINATION include/signalrclient) ++else() ++ file(READ include/signalrclient/_exports.h EXPORTS_H) ++ string(REPLACE "#ifdef NO_SIGNALRCLIENT_EXPORTS" "#if 1" EXPORTS_H_2 ${EXPORTS_H}) ++ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/_exports.h "${EXPORTS_H_2}") ++ ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/_exports.h DESTINATION include/signalrclient) ++endif() ++ ++set(HEADERS ++ include/signalrclient/connection.h ++ include/signalrclient/connection_state.h ++ include/signalrclient/hub_connection.h ++ include/signalrclient/hub_exception.h ++ include/signalrclient/hub_proxy.h ++ include/signalrclient/log_writer.h ++ include/signalrclient/trace_level.h ++ include/signalrclient/transport_type.h ++ include/signalrclient/web_exception.h) ++ ++install( ++ FILES ${HEADERS} ++ DESTINATION "include/signalrclient" ++) +diff --git a/src/signalrclient/CMakeLists.txt b/src/signalrclient/CMakeLists.txt +index 76a5e1b..db141eb 100644 +--- a/src/signalrclient/CMakeLists.txt ++++ b/src/signalrclient/CMakeLists.txt +@@ -22,6 +22,21 @@ set (SOURCES + websocket_transport.cpp + ) + +-add_library (signalrclient SHARED ${SOURCES}) ++if(BUILD_SHARED_LIBS) ++ add_definitions(-DSIGNALRCLIENT_EXPORTS) ++else() ++ add_definitions(-DNO_SIGNALRCLIENT_EXPORTS) ++endif() ++ ++add_definitions(-DUNICODE -D_UNICODE) ++ ++add_library (signalrclient ${SOURCES}) + + target_link_libraries(signalrclient ${CPPREST_SO}) ++ ++install( ++ TARGETS signalrclient ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++ RUNTIME DESTINATION bin ++) diff --git a/externals/vcpkg/ports/signalrclient/0002_fix-compile-error.patch b/externals/vcpkg/ports/signalrclient/0002_fix-compile-error.patch new file mode 100755 index 000000000..e3631379b --- /dev/null +++ b/externals/vcpkg/ports/signalrclient/0002_fix-compile-error.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 91c2300..2439fec 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,6 +5,8 @@ if(NOT WIN32) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -L -lcpprest") + endif() + ++find_package(OpenSSL REQUIRED) ++ + set(CPPREST_INCLUDE_DIR "" CACHE FILEPATH "Path to casablanca include dir") + + include_directories ( +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 506680d04..d8bd404a6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,7 +13,7 @@ include_directories ( + include + "${CPPREST_INCLUDE_DIR}") + +-find_library(CPPREST_SO NAMES "cpprest" PATHS ${CPPREST_LIB_DIR} REQUIRED) ++find_package(cpprestsdk REQUIRED) + + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) +diff --git a/src/signalrclient/CMakeLists.txt b/src/signalrclient/CMakeLists.txt +index db141eb..c4306d8 100644 +--- a/src/signalrclient/CMakeLists.txt ++++ b/src/signalrclient/CMakeLists.txt +@@ -32,7 +32,7 @@ add_definitions(-DUNICODE -D_UNICODE) + + add_library (signalrclient ${SOURCES}) + +-target_link_libraries(signalrclient ${CPPREST_SO}) ++target_link_libraries(signalrclient cpprestsdk::cpprest OpenSSL::SSL OpenSSL::Crypto) + + install( + TARGETS signalrclient diff --git a/externals/vcpkg/ports/signalrclient/portfile.cmake b/externals/vcpkg/ports/signalrclient/portfile.cmake new file mode 100755 index 000000000..f66b3a2fc --- /dev/null +++ b/externals/vcpkg/ports/signalrclient/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO SignalR/SignalR-Client-Cpp + REF 1.0.0-beta1 + SHA512 b38f6f946f1499080071949cbcf574405118f9acfb469441e5b5b0df3e5f0d277a83b30e0d613dc5e54732b9071e3273dac1ee65129f994d5a60eef0e45bdf6c + HEAD_REF master + PATCHES + 0001_cmake.patch + 0002_fix-compile-error.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DCPPREST_SO=${CURRENT_INSTALLED_DIR}/debug/lib/cpprest_2_10d.lib + OPTIONS_RELEASE + -DCPPREST_SO=${CURRENT_INSTALLED_DIR}/lib/cpprest_2_10.lib + OPTIONS + -DCPPREST_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include + -DDISABLE_TESTS=ON +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# copy license +file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/signalrclient) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/signalrclient/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/signalrclient/copyright) diff --git a/externals/vcpkg/ports/signalrclient/vcpkg.json b/externals/vcpkg/ports/signalrclient/vcpkg.json new file mode 100755 index 000000000..e2faf07bc --- /dev/null +++ b/externals/vcpkg/ports/signalrclient/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "signalrclient", + "version-string": "1.0.0-beta1-9", + "port-version": 2, + "description": "C++ client for SignalR.", + "homepage": "https://github.com/SignalR/SignalR-Client-Cpp", + "dependencies": [ + { + "name": "cpprestsdk", + "features": [ + "default-features", + "websockets" + ] + }, + "openssl" + ] +} diff --git a/externals/vcpkg/ports/sigslot/LICENSE b/externals/vcpkg/ports/sigslot/LICENSE new file mode 100755 index 000000000..d706712aa --- /dev/null +++ b/externals/vcpkg/ports/sigslot/LICENSE @@ -0,0 +1,8 @@ +License +The sigslot library has been placed in the public domain. This means that you are free to use it however you like. + +The author takes no responsibility or liability of any kind for any use that you may make of this library. + +If you screw up, it's your fault. + +If the library screws up, you got it for free, so you should have tested it better - it's still your responsibility. \ No newline at end of file diff --git a/externals/vcpkg/ports/sigslot/portfile.cmake b/externals/vcpkg/ports/sigslot/portfile.cmake new file mode 100755 index 000000000..d841668ba --- /dev/null +++ b/externals/vcpkg/ports/sigslot/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO sigslot/sigslot + REF 1.0.0 + FILENAME "sigslot-1-0-0.tar.gz" + SHA512 3f16f94a653e49934ec1d695eac02234d15b203f42e9fa88723ee582a84670a645a89e5b87afe2378fa7a9eaef054049255bf3bd531ab1d6825a042641ba8906 +) + +file(INSTALL ${SOURCE_PATH}/sigslot.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +file(INSTALL ${CURRENT_PORT_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/sigslot/vcpkg.json b/externals/vcpkg/ports/sigslot/vcpkg.json new file mode 100755 index 000000000..20bf9b068 --- /dev/null +++ b/externals/vcpkg/ports/sigslot/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "sigslot", + "version-string": "1.0.0", + "port-version": 4, + "description": "Portable C++ type-safe, thread-safe signal/slot library for ISO C++, Unix/BSD/Linux and Win32. Sigslot allows C++ code to use the signal/slot paradigm made popular by, for example, Qt." +} diff --git a/externals/vcpkg/ports/simage/portfile.cmake b/externals/vcpkg/ports/simage/portfile.cmake new file mode 100755 index 000000000..ff1611082 --- /dev/null +++ b/externals/vcpkg/ports/simage/portfile.cmake @@ -0,0 +1,76 @@ +set(SIMAGE_VERSION 1.8.2) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Coin3D/simage + REF 3940692136e02b9e62b3061cf72f053827b5494e #v1.8.2 + SHA512 9a39738e32004bdd3e2882fe96778c773758b6d74398a62ba1c5ab09836c0637f89b8a46e8485b9d4196f33864f31f75511f441cfc24d7536659fa610ddf1875 + HEAD_REF master + PATCHES requies-all-dependencies.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SIMAGE_BUILD_SHARED_LIBS) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SIMAGE_USE_STATIC_LIBS) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" SIMAGE_USE_MSVC_STATIC_RUNTIME) + + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + avienc SIMAGE_USE_AVIENC + gdiplus SIMAGE_USE_GDIPLUS + oggvorbis SIMAGE_OGGVORBIS_SUPPORT + sndfile SIMAGE_LIBSNDFILE_SUPPORT + giflib SIMAGE_GIF_SUPPORT + jpeg SIMAGE_JPEG_SUPPORT + png SIMAGE_PNG_SUPPORT + tiff SIMAGE_TIFF_SUPPORT + zlib SIMAGE_ZLIB_SUPPORT +) + +# Depends on the platform +if(VCPKG_TARGET_IS_WINDOWS AND "gdiplus" IN_LIST FEATURES) + message(WARNING "Feature 'gdiplus' will disable feature 'zlib', 'giflib', 'jpeg', 'png' and 'tiff' automaticly.") +elseif ((VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) + AND ("gdiplus" IN_LIST FEATURES OR "avienc" IN_LIST FEATURES)) + message(FATAL_ERROR "Feature 'avienc' and 'gdiplus' only support Windows.") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS ${FEATURE_OPTIONS} + -DSIMAGE_BUILD_SHARED_LIBS:BOOL=${SIMAGE_BUILD_SHARED_LIBS} + -DSIMAGE_USE_STATIC_LIBS:BOOL=${SIMAGE_USE_STATIC_LIBS} + -DSIMAGE_USE_MSVC_STATIC_RUNTIME:BOOL=${SIMAGE_USE_MSVC_STATIC_RUNTIME} + -DSIMAGE_USE_CGIMAGE=OFF + -DSIMAGE_USE_QIMAGE=OFF + -DSIMAGE_USE_QT6=OFF + -DSIMAGE_USE_QT5=OFF + -DSIMAGE_USE_CPACK=OFF + -DSIMAGE_LIBJASPER_SUPPORT=OFF + -DSIMAGE_EPS_SUPPORT=OFF + -DSIMAGE_MPEG2ENC_SUPPORT=OFF + -DSIMAGE_PIC_SUPPORT=OFF + -DSIMAGE_RGB_SUPPORT=OFF + -DSIMAGE_XWD_SUPPORT=OFF + -DSIMAGE_TGA_SUPPORT=OFF + -DSIMAGE_BUILD_MSVC_MP=OFF + -DSIMAGE_BUILD_EXAMPLES=OFF + -DSIMAGE_BUILD_TESTS=OFF + -DSIMAGE_BUILD_DOCUMENTATION=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/simage-${SIMAGE_VERSION}) + +if (NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) + vcpkg_copy_tools(TOOL_NAMES simage-config AUTO_CLEAN) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Coin") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/simage/requies-all-dependencies.patch b/externals/vcpkg/ports/simage/requies-all-dependencies.patch new file mode 100755 index 000000000..a0765f8a9 --- /dev/null +++ b/externals/vcpkg/ports/simage/requies-all-dependencies.patch @@ -0,0 +1,44 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ef92706..fee22e4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -129,6 +129,9 @@ if(SIMAGE_USE_GDIPLUS) + } + " GDIPLUS_FOUND) + unset(CMAKE_REQUIRED_LIBRARIES) ++ if(NOT GDIPLUS_FOUND) ++ message(FATAL_ERROR "GDI+ is required on Windows.") ++ endif() + endif() + if(SIMAGE_USE_AVIENC) + set(CMAKE_REQUIRED_LIBRARIES vfw32) +@@ -142,6 +145,9 @@ if(SIMAGE_USE_AVIENC) + } + " VFW_FOUND) + unset(CMAKE_REQUIRED_LIBRARIES) ++ if(NOT VFW_FOUND) ++ message(FATAL_ERROR "Video for Windows is required on Windows.") ++ endif() + endif() + + # On macOS QuickTime supports BMP, GIF, JPEG, JPEG 2000, PNG, TIFF, and TGA. +@@ -286,7 +292,7 @@ if(SIMAGE_OGGVORBIS_SUPPORT) + find_package(Ogg REQUIRED) + find_package(Vorbis REQUIRED) + if(OGG_FOUND) +- find_package(Opus) ++ find_package(Opus REQUIRED) + endif() + endif() + +@@ -306,8 +312,8 @@ if(NOT SIMAGE_QUICKTIME_SUPPORT AND NOT SIMAGE_CGIMAGE_SUPPORT AND NOT SIMAGE_GD + if(SIMAGE_TIFF_SUPPORT) + find_package(TIFF REQUIRED) + if(TIFF_FOUND) +- find_package(LibLZMA) +- find_package(Zstd) ++ find_package(LibLZMA REQUIRED) ++ find_package(Zstd REQUIRED) + endif() + endif() + diff --git a/externals/vcpkg/ports/simage/vcpkg.json b/externals/vcpkg/ports/simage/vcpkg.json new file mode 100755 index 000000000..f961409b4 --- /dev/null +++ b/externals/vcpkg/ports/simage/vcpkg.json @@ -0,0 +1,157 @@ +{ + "name": "simage", + "version-semver": "1.8.2", + "port-version": 1, + "description": "Image file format library abstraction layer", + "homepage": "https://github.com/coin3d/simage", + "license": "ISC", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "all" + ], + "features": { + "all": { + "description": "Enable all features", + "dependencies": [ + { + "name": "simage", + "default-features": false, + "features": [ + "oggvorbis" + ] + }, + { + "name": "simage", + "default-features": false, + "features": [ + "sndfile" + ] + }, + { + "name": "simage", + "default-features": false, + "features": [ + "avienc" + ], + "platform": "windows" + }, + { + "name": "simage", + "default-features": false, + "features": [ + "gdiplus" + ], + "platform": "windows" + }, + { + "name": "simage", + "default-features": false, + "features": [ + "giflib" + ], + "platform": "!windows" + }, + { + "name": "simage", + "default-features": false, + "features": [ + "jpeg" + ], + "platform": "!windows" + }, + { + "name": "simage", + "default-features": false, + "features": [ + "png" + ], + "platform": "!windows" + }, + { + "name": "simage", + "default-features": false, + "features": [ + "tiff" + ], + "platform": "!windows" + }, + { + "name": "simage", + "default-features": false, + "features": [ + "zlib" + ], + "platform": "!windows" + } + ] + }, + "avienc": { + "description": "Use Video for Windows for AVI encoding" + }, + "gdiplus": { + "description": "Use GDI+ on Windows to load/save images" + }, + "giflib": { + "description": "Enable support for GIF images", + "dependencies": [ + "giflib" + ] + }, + "jpeg": { + "description": "Enable support for JPEG images", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "oggvorbis": { + "description": "Enable support for ogg/vorbis extensions", + "dependencies": [ + "libogg", + "libvorbis", + "opus" + ] + }, + "png": { + "description": "Enable support for PNG images", + "dependencies": [ + "libpng" + ] + }, + "sndfile": { + "description": "Use libsndfile to load/save sampled sound", + "dependencies": [ + { + "name": "libsndfile", + "default-features": false, + "features": [ + "external-libs" + ] + } + ] + }, + "tiff": { + "description": "Enable support for TIFF images", + "dependencies": [ + "liblzma", + "tiff", + "zstd" + ] + }, + "zlib": { + "description": "Enable support for zlib library", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/simbody/portfile.cmake b/externals/vcpkg/ports/simbody/portfile.cmake new file mode 100755 index 000000000..4b4d990fd --- /dev/null +++ b/externals/vcpkg/ports/simbody/portfile.cmake @@ -0,0 +1,42 @@ + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO simbody/simbody + REF 040562785acd4b6d9d26ea6762d5c80075e0c474 + SHA512 b803ed45fbaa60c5af601ac2d0be2a109eae19428d72ab06952403e12116ee08592014d85accad8e6a64aed6bb0afbd6f9dff6588c4b22da65fd1bac067f8662 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBRARIES) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_DYNAMIC_LIBRARIES) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_DYNAMIC_LIBRARIES=${BUILD_DYNAMIC_LIBRARIES} + -DBUILD_STATIC_LIBRARIES=${BUILD_STATIC_LIBRARIES} + -DWINDOWS_USE_EXTERNAL_LIBS=ON + -DINSTALL_DOCS=OFF + -DBUILD_VISUALIZER=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTING=OFF + -DBUILD_TESTS_AND_EXAMPLES_STATIC=OFF + -DBUILD_TESTS_AND_EXAMPLES_SHARED=OFF +) + +vcpkg_cmake_install() + +if(WIN32) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +else() + vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc") + +vcpkg_fixup_pkgconfig() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/simbody/vcpkg.json b/externals/vcpkg/ports/simbody/vcpkg.json new file mode 100755 index 000000000..51cb881fb --- /dev/null +++ b/externals/vcpkg/ports/simbody/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "simbody", + "version-date": "2022-01-04", + "port-version": 2, + "description": "High-performance C++ multibody dynamics/physics library for simulating articulated biomechanical and mechanical systems like vehicles, robots, and the human skeleton.", + "homepage": "https://simtk.org/home/simbody", + "license": "Apache-2.0", + "supports": "!uwp", + "dependencies": [ + "blas", + "lapack", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/simde/portfile.cmake b/externals/vcpkg/ports/simde/portfile.cmake new file mode 100755 index 000000000..68020a27a --- /dev/null +++ b/externals/vcpkg/ports/simde/portfile.cmake @@ -0,0 +1,13 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nemequ/simde + REF v0.7.2 + SHA512 E4EE5A4A7E8453F116F1325D147F91D358A300F41EA5566EA30FC19649BABABF3B87E3DC838D5608B578BD152207DF4156200FFC7FB98141BC7C0BB60C75F1F5 + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/simde" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/simde/vcpkg.json b/externals/vcpkg/ports/simde/vcpkg.json new file mode 100755 index 000000000..d26159fe7 --- /dev/null +++ b/externals/vcpkg/ports/simde/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "simde", + "version": "0.7.2", + "description": "Implementations of SIMD instruction sets for systems which don't natively support them", + "homepage": "https://github.com/simd-everywhere/simde" +} diff --git a/externals/vcpkg/ports/simdjson/portfile.cmake b/externals/vcpkg/ports/simdjson/portfile.cmake new file mode 100755 index 000000000..4d1107694 --- /dev/null +++ b/externals/vcpkg/ports/simdjson/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO simdjson/simdjson + REF v1.1.0 + HEAD_REF master + SHA512 f8718bd039e1a25f0b95880b957c43e6eba6eada6bb7f58cedde37669a46b15b3ff9f4c4ea775e1cf949657642ef0472fa8bac5bdc98882df63e7f292fb5a723 +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + exceptions SIMDJSON_EXCEPTIONS + threads SIMDJSON_ENABLE_THREADS + INVERTED_FEATURES + deprecated SIMDJSON_DISABLE_DEPRECATED_API +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SIMDJSON_BUILD_STATIC) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSIMDJSON_JUST_LIBRARY=ON + -DSIMDJSON_SANITIZE_UNDEFINED=OFF + -DSIMDJSON_SANITIZE=OFF + -DSIMDJSON_SANITIZE_THREADS=OFF + -DSIMDJSON_BUILD_STATIC=${SIMDJSON_BUILD_STATIC} + -DSIMDJSON_DEVELOPMENT_CHECKS=OFF + -DSIMDJSON_VERBOSE_LOGGING=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/simdjson/vcpkg.json b/externals/vcpkg/ports/simdjson/vcpkg.json new file mode 100755 index 000000000..f31850d16 --- /dev/null +++ b/externals/vcpkg/ports/simdjson/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "simdjson", + "version-semver": "1.1.0", + "description": "A extremely fast JSON library that can parse gigabytes of JSON per second", + "homepage": "https://simdjson.org/", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "deprecated", + "exceptions", + "threads" + ], + "features": { + "deprecated": { + "description": "Enable deprecated APIs" + }, + "exceptions": { + "description": "Enable exception-throwing interface" + }, + "threads": { + "description": "Link with thread support" + } + } +} diff --git a/externals/vcpkg/ports/simdutf/disable-tests-and-benchmarks.patch b/externals/vcpkg/ports/simdutf/disable-tests-and-benchmarks.patch new file mode 100755 index 000000000..d621f6d7a --- /dev/null +++ b/externals/vcpkg/ports/simdutf/disable-tests-and-benchmarks.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5453644..d3f2869 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,17 +14,10 @@ include(cmake/simdutf-flags.cmake) + + set(SIMDUTF_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + +-enable_testing() + add_subdirectory(src) +-add_subdirectory(tests) + + + +-if(CMAKE_CXX_COMPILER_ID MATCHES GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0) +- message(STATUS "The benchmark tool requires GCC 8.0 or better.") +-else() +- add_subdirectory(benchmarks) +-endif() + + + # ---- Install rules ---- diff --git a/externals/vcpkg/ports/simdutf/portfile.cmake b/externals/vcpkg/ports/simdutf/portfile.cmake new file mode 100755 index 000000000..809247a8c --- /dev/null +++ b/externals/vcpkg/ports/simdutf/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO simdutf/simdutf + REF v1.0.0 + SHA512 3ab09aa61cb9765bf1a77de59c5b823ee58ae5e4badfd5dd70e511fd4f378f8d3917a5b577e7f275720b975740344968132ce0b3f628452bde67f2ab6cc82337 + HEAD_REF master + PATCHES + disable-tests-and-benchmarks.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE-APACHE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/simdutf/vcpkg.json b/externals/vcpkg/ports/simdutf/vcpkg.json new file mode 100755 index 000000000..68ddc24a2 --- /dev/null +++ b/externals/vcpkg/ports/simdutf/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "simdutf", + "version-semver": "1.0.0", + "port-version": 1, + "description": "Unicode validation and transcoding at billions of characters per second", + "homepage": "https://github.com/simdutf/simdutf", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/simple-fft/portfile.cmake b/externals/vcpkg/ports/simple-fft/portfile.cmake new file mode 100755 index 000000000..81f33e054 --- /dev/null +++ b/externals/vcpkg/ports/simple-fft/portfile.cmake @@ -0,0 +1,20 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO d1vanov/Simple-FFT + REF a0cc843ff36d33ad09c08674b9503614742ad0b9 + SHA512 6fbbda1f172505f6627f97ae671d12ff282844ca50e6e6c8016f78ee333c32ce6d17763837c281e47f10cfc277cb1f67394169f6bbf137b09885c1a053d6d342 + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/include/simple_fft/check_fft.hpp + ${SOURCE_PATH}/include/simple_fft/copy_array.hpp + ${SOURCE_PATH}/include/simple_fft/error_handling.hpp + ${SOURCE_PATH}/include/simple_fft/fft.h + ${SOURCE_PATH}/include/simple_fft/fft.hpp + ${SOURCE_PATH}/include/simple_fft/fft_impl.hpp + ${SOURCE_PATH}/include/simple_fft/fft_settings.h + DESTINATION ${CURRENT_PACKAGES_DIR}/include/simple_fft +) + +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/simple-fft/vcpkg.json b/externals/vcpkg/ports/simple-fft/vcpkg.json new file mode 100755 index 000000000..76b399066 --- /dev/null +++ b/externals/vcpkg/ports/simple-fft/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "simple-fft", + "version-string": "2020-06-14", + "port-version": 1, + "description": "Header-only C++ library implementing fast Fourier transform of 1D, 2D and 3D data", + "homepage": "https://github.com/d1vanov/Simple-FFT" +} diff --git a/externals/vcpkg/ports/simpleini/portfile.cmake b/externals/vcpkg/ports/simpleini/portfile.cmake new file mode 100755 index 000000000..beb99a048 --- /dev/null +++ b/externals/vcpkg/ports/simpleini/portfile.cmake @@ -0,0 +1,19 @@ +# header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO brofield/simpleini + REF 9b3ed7ec815997bc8c5b9edf140d6bde653e1458 #v4.19 + SHA512 80358c8e5b8d8ea6183c685d002378805450ee3d65599f5966c1c24c20869be4680b044a4443f00d64740e131d1c0efcdaaf0a53d5cbce26b185cdf946630d8a + HEAD_REF master +) + +# Install codes +set(SIMPLEINI_SOURCE ${SOURCE_PATH}/SimpleIni.h + ${SOURCE_PATH}/ConvertUTF.h + ${SOURCE_PATH}/ConvertUTF.c +) + +file(INSTALL ${SIMPLEINI_SOURCE} DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# copyright +file(INSTALL "${SOURCE_PATH}/LICENCE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/simpleini/vcpkg.json b/externals/vcpkg/ports/simpleini/vcpkg.json new file mode 100755 index 000000000..0cc26e223 --- /dev/null +++ b/externals/vcpkg/ports/simpleini/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "simpleini", + "version": "4.19", + "description": "Cross-platform C++ library providing a simple API to read and write INI-style configuration files", + "homepage": "https://github.com/brofield/simpleini", + "license": "MIT" +} diff --git a/externals/vcpkg/ports/sjpeg/portfile.cmake b/externals/vcpkg/ports/sjpeg/portfile.cmake new file mode 100755 index 000000000..7a4843c23 --- /dev/null +++ b/externals/vcpkg/ports/sjpeg/portfile.cmake @@ -0,0 +1,26 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO webmproject/sjpeg + REF 676de227d75877eb5863ec805ba0a4b97fc2fc6c + SHA512 cf9e5a744f79996817679dc2e64be2efd64cbc9bb5f505f5c6530f92d60fe99715c57bcf71e0bb80c77732ace1d71fbf1ff9b4e4ec2562a9576c74a4410c2cb1 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSJPEG_BUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/sjpeg/cmake) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/sjpeg/vcpkg.json b/externals/vcpkg/ports/sjpeg/vcpkg.json new file mode 100755 index 000000000..dd79e9587 --- /dev/null +++ b/externals/vcpkg/ports/sjpeg/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "sjpeg", + "version-date": "2021-10-31", + "description": "Simple library for encoding baseline JPEG files", + "homepage": "https://github.com/webmproject/sjpeg", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/skcrypter/portfile.cmake b/externals/vcpkg/ports/skcrypter/portfile.cmake new file mode 100755 index 000000000..3faa896af --- /dev/null +++ b/externals/vcpkg/ports/skcrypter/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO skadro-official/skCrypter + REF 7970de8acc01af5ecef044374c26ecb33b7cd069 + SHA512 f0ef3c6673523d5b86bc9b5859ae77fb4d182238b67ce4f07da1068f23ee7915e028ed837b8c6b2dd5421ae5a7c043e0d486d18c4b5404ebee50bd8cef4ba4bb + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/files/skCrypter.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) \ No newline at end of file diff --git a/externals/vcpkg/ports/skcrypter/vcpkg.json b/externals/vcpkg/ports/skcrypter/vcpkg.json new file mode 100755 index 000000000..6d3b3083b --- /dev/null +++ b/externals/vcpkg/ports/skcrypter/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "skcrypter", + "version-date": "2021-12-03", + "description": "Compile-time, Usermode + Kernelmode, safe and lightweight string crypter library for C++11", + "homepage": "https://github.com/skadro-official/skCrypter" +} diff --git a/externals/vcpkg/ports/skia/dawn_use_vcpkg_spirv.patch b/externals/vcpkg/ports/skia/dawn_use_vcpkg_spirv.patch new file mode 100755 index 000000000..02e25148c --- /dev/null +++ b/externals/vcpkg/ports/skia/dawn_use_vcpkg_spirv.patch @@ -0,0 +1,13 @@ +diff --git a/src/dawn_native/BUILD.gn b/src/dawn_native/BUILD.gn +index f73bfe24..e37792a0 100644 +--- a/src/dawn_native/BUILD.gn ++++ b/src/dawn_native/BUILD.gn +@@ -145,7 +145,7 @@ source_set("dawn_native_sources") { + ":dawn_native_headers", + ":dawn_native_utils_gen", + "${dawn_root}/src/common", +- "${dawn_root}/third_party/gn/spirv_cross:spirv_cross", ++ "//third_party/spirv-cross:spirv_cross", + "${dawn_spirv_tools_dir}:spvtools_opt", + "${dawn_spirv_tools_dir}:spvtools_val", + "${dawn_tint_dir}/src:libtint", diff --git a/externals/vcpkg/ports/skia/expat.gn b/externals/vcpkg/ports/skia/expat.gn new file mode 100755 index 000000000..7e0e09b4c --- /dev/null +++ b/externals/vcpkg/ports/skia/expat.gn @@ -0,0 +1,10 @@ +import("../third_party.gni") + +system("expat") { + include_dirs = @_INCLUDES@ + if(is_debug) { + libs = @_LIBS_DBG@ + } else { + libs = @_LIBS_REL@ + } +} diff --git a/externals/vcpkg/ports/skia/fontconfig.gn b/externals/vcpkg/ports/skia/fontconfig.gn new file mode 100755 index 000000000..ae4fe7b46 --- /dev/null +++ b/externals/vcpkg/ports/skia/fontconfig.gn @@ -0,0 +1,10 @@ +import("../third_party.gni") + + system("fontconfig") { + include_dirs = @_INCLUDES@ + if(is_debug) { + libs = @_LIBS_DBG@ + } else { + libs = @_LIBS_REL@ + } + } diff --git a/externals/vcpkg/ports/skia/freetype2.gn b/externals/vcpkg/ports/skia/freetype2.gn new file mode 100755 index 000000000..5ea73b7a8 --- /dev/null +++ b/externals/vcpkg/ports/skia/freetype2.gn @@ -0,0 +1,10 @@ +import("../third_party.gni") + +system("freetype2") { + include_dirs = @_INCLUDES@ + if(is_debug) { + libs = @_LIBS_DBG@ + } else { + libs = @_LIBS_REL@ + } +} diff --git a/externals/vcpkg/ports/skia/harfbuzz.gn b/externals/vcpkg/ports/skia/harfbuzz.gn new file mode 100755 index 000000000..5095f6d8a --- /dev/null +++ b/externals/vcpkg/ports/skia/harfbuzz.gn @@ -0,0 +1,10 @@ +import("../third_party.gni") + +system("harfbuzz") { + include_dirs = @_INCLUDES@ + if(is_debug) { + libs = @_LIBS_DBG@ + } else { + libs = @_LIBS_REL@ + } +} diff --git a/externals/vcpkg/ports/skia/icu.gn b/externals/vcpkg/ports/skia/icu.gn new file mode 100755 index 000000000..3da247995 --- /dev/null +++ b/externals/vcpkg/ports/skia/icu.gn @@ -0,0 +1,11 @@ +import("../third_party.gni") + +system("icu") { + include_dirs = @_INCLUDES@ + if(is_debug) { + libs = @_LIBS_DBG@ + } else { + libs = @_LIBS_REL@ + } + defines = @_DEFINITIONS@ +} diff --git a/externals/vcpkg/ports/skia/libjpeg-turbo.gn b/externals/vcpkg/ports/skia/libjpeg-turbo.gn new file mode 100755 index 000000000..92669bb92 --- /dev/null +++ b/externals/vcpkg/ports/skia/libjpeg-turbo.gn @@ -0,0 +1,10 @@ +import("../third_party.gni") + +system("libjpeg") { + include_dirs = @_INCLUDES@ + if(is_debug) { + libs = @_LIBS_DBG@ + } else { + libs = @_LIBS_REL@ + } +} diff --git a/externals/vcpkg/ports/skia/libpng.gn b/externals/vcpkg/ports/skia/libpng.gn new file mode 100755 index 000000000..0867ef8a9 --- /dev/null +++ b/externals/vcpkg/ports/skia/libpng.gn @@ -0,0 +1,10 @@ +import("../third_party.gni") + +system("libpng") { + include_dirs = @_INCLUDES@ + if(is_debug) { + libs = @_LIBS_DBG@ + } else { + libs = @_LIBS_REL@ + } +} diff --git a/externals/vcpkg/ports/skia/libwebp.gn b/externals/vcpkg/ports/skia/libwebp.gn new file mode 100755 index 000000000..bdcaffe21 --- /dev/null +++ b/externals/vcpkg/ports/skia/libwebp.gn @@ -0,0 +1,10 @@ +import("../third_party.gni") + +system("libwebp") { + include_dirs = @_INCLUDES@ + if(is_debug) { + libs = @_LIBS_DBG@ + } else { + libs = @_LIBS_REL@ + } +} diff --git a/externals/vcpkg/ports/skia/piex.gn b/externals/vcpkg/ports/skia/piex.gn new file mode 100755 index 000000000..1d5a237b9 --- /dev/null +++ b/externals/vcpkg/ports/skia/piex.gn @@ -0,0 +1,10 @@ +import("../third_party.gni") + +system("piex") { + include_dirs = @_INCLUDES@ + if(is_debug) { + libs = @_LIBS_DBG@ + } else { + libs = @_LIBS_REL@ + } +} diff --git a/externals/vcpkg/ports/skia/portfile.cmake b/externals/vcpkg/ports/skia/portfile.cmake new file mode 100755 index 000000000..6c68b7fc9 --- /dev/null +++ b/externals/vcpkg/ports/skia/portfile.cmake @@ -0,0 +1,397 @@ +vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH + URL https://github.com/google/skia + REF 3aa7f602018816ab3f009f1b8d359ccde752e1de + PATCHES + "use_vcpkg_fontconfig.patch" +) + +# Replace hardcoded python paths +vcpkg_find_acquire_program(PYTHON3) +vcpkg_replace_string("${SOURCE_PATH}/.gn" "script_executable = \"python3\"" "script_executable = \"${PYTHON3}\"") + +vcpkg_replace_string("${SOURCE_PATH}/gn/toolchain/BUILD.gn" "command = \"$shell python" "command = \"$shell '${PYTHON3}'") + +function(checkout_in_path PATH URL REF) + if(EXISTS "${PATH}") + return() + endif() + + vcpkg_from_git( + OUT_SOURCE_PATH DEP_SOURCE_PATH + URL "${URL}" + REF "${REF}" + ) + file(RENAME "${DEP_SOURCE_PATH}" "${PATH}") + file(REMOVE_RECURSE "${DEP_SOURCE_PATH}") +endfunction() + +function(checkout_in_path_with_patch PATH URL REF PATCH) + if(EXISTS "${PATH}") + return() + endif() + + vcpkg_from_git( + OUT_SOURCE_PATH DEP_SOURCE_PATH + URL "${URL}" + REF "${REF}" + PATCHES "${PATCH}" + ) + file(RENAME "${DEP_SOURCE_PATH}" "${PATH}") + file(REMOVE_RECURSE "${DEP_SOURCE_PATH}") +endfunction() + +set(EXTERNALS "${SOURCE_PATH}/third_party/externals") +file(MAKE_DIRECTORY "${EXTERNALS}") + +# these following aren't available in vcpkg +# to update, visit the DEPS file in Skia's root directory +# define SKIA_USE_MIRROR in a triplet to use the mirrors +checkout_in_path("${EXTERNALS}/sfntly" + "https://github.com/googlefonts/sfntly" + "b55ff303ea2f9e26702b514cf6a3196a2e3e2974" +) +checkout_in_path("${EXTERNALS}/dng_sdk" + "https://android.googlesource.com/platform/external/dng_sdk" + "c8d0c9b1d16bfda56f15165d39e0ffa360a11123" +) +checkout_in_path("${EXTERNALS}/libgifcodec" + "https://skia.googlesource.com/libgifcodec" + "fd59fa92a0c86788dcdd84d091e1ce81eda06a77" +) +checkout_in_path("${EXTERNALS}/piex" + "https://android.googlesource.com/platform/external/piex" + "bb217acdca1cc0c16b704669dd6f91a1b509c406" +) + +# turn a CMake list into a GN list of quoted items +# "a;b;c" -> ["a","b","c"] +function(cmake_to_gn_list OUTPUT_ INPUT_) + if(NOT INPUT_) + set(${OUTPUT_} "[]" PARENT_SCOPE) + else() + string(REPLACE ";" "\",\"" TEMP "${INPUT_}") + set(${OUTPUT_} "[\"${TEMP}\"]" PARENT_SCOPE) + endif() +endfunction() + +# multiple libraries with multiple names may be passed as +# "libA,libA2;libB,libB2,libB3;..." +function(find_libraries RESOLVED LIBRARY_NAMES PATHS) + set(_RESOLVED "") + foreach(_LIB_GROUP ${LIBRARY_NAMES}) + string(REPLACE "," ";" _LIB_GROUP_NAMES "${_LIB_GROUP}") + unset(_LIB CACHE) + find_library(_LIB NAMES ${_LIB_GROUP_NAMES} + PATHS "${PATHS}" + NO_DEFAULT_PATH) + + if(_LIB MATCHES "-NOTFOUND") + message(FATAL_ERROR "Could not find library with names: ${_LIB_GROUP_NAMES}") + endif() + + list(APPEND _RESOLVED "${_LIB}") + endforeach() + set(${RESOLVED} "${_RESOLVED}" PARENT_SCOPE) +endfunction() + +# For each .gn file in the current list directory, configure and install at +# the corresponding directory to replace Skia dependencies with ones from vcpkg. +function(replace_skia_dep NAME INCLUDES LIBS_DBG LIBS_REL DEFINITIONS) + list(TRANSFORM INCLUDES PREPEND "${CURRENT_INSTALLED_DIR}") + cmake_to_gn_list(_INCLUDES "${INCLUDES}") + + find_libraries(_LIBS_DBG "${LIBS_DBG}" "${CURRENT_INSTALLED_DIR}/debug/lib") + cmake_to_gn_list(_LIBS_DBG "${_LIBS_DBG}") + + find_libraries(_LIBS_REL "${LIBS_REL}" "${CURRENT_INSTALLED_DIR}/lib") + cmake_to_gn_list(_LIBS_REL "${_LIBS_REL}") + + cmake_to_gn_list(_DEFINITIONS "${DEFINITIONS}") + + set(OUT_FILE "${SOURCE_PATH}/third_party/${NAME}/BUILD.gn") + file(REMOVE "${OUT_FILE}") + configure_file("${CMAKE_CURRENT_LIST_DIR}/${NAME}.gn" "${OUT_FILE}" @ONLY) +endfunction() + +set(_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include") + +replace_skia_dep(expat "/include" "libexpat,libexpatd,libexpatdMD" "libexpat,libexpatMD" "") +replace_skia_dep(freetype2 "/include" "freetype,freetyped" "freetype" "") +replace_skia_dep(harfbuzz "/include/harfbuzz" "harfbuzz;harfbuzz-subset" "harfbuzz;harfbuzz-subset" "") +replace_skia_dep(icu "/include" "icuuc,icuucd" "icuuc" "U_USING_ICU_NAMESPACE=0") +replace_skia_dep(libjpeg-turbo "/include" "jpeg,jpegd;turbojpeg,turbojpegd" "jpeg;turbojpeg" "") +replace_skia_dep(libpng "/include" "libpng16,libpng16d" "libpng16" "") +replace_skia_dep(libwebp "/include" + "webp,webpd;webpdemux,webpdemuxd;webpdecoder,webpdecoderd;webpmux,webpmuxd" + "webp;webpdemux;webpdecoder;webpmux" "") +replace_skia_dep(zlib "/include" "z,zlib,zlibd" "z,zlib" "") +if(CMAKE_HOST_UNIX) + replace_skia_dep(fontconfig "/include" "fontconfig" "fontconfig" "") + endif() + +set(OPTIONS "\ +skia_use_lua=false \ +skia_enable_tools=false \ +skia_enable_spirv_validation=false \ +target_cpu=\"${VCPKG_TARGET_ARCHITECTURE}\"") + +# used for passing feature-specific definitions to the config file +set(SKIA_PUBLIC_DEFINITIONS + SK_SUPPORT_PDF + SK_HAS_JPEG_LIBRARY + SK_USE_LIBGIFCODEC + SK_HAS_PNG_LIBRARY + SK_HAS_WEBP_LIBRARY + SK_XML) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + string(APPEND OPTIONS " is_component_build=true") + if(CMAKE_HOST_WIN32) + set(SKIA_PUBLIC_DEFINITIONS SKIA_DLL) + endif() +else() + string(APPEND OPTIONS " is_component_build=false") +endif() + +if(CMAKE_HOST_APPLE) + if("metal" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} skia_use_metal=true") + list(APPEND SKIA_PUBLIC_DEFINITIONS SK_METAL) + endif() +endif() + +if("vulkan" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} skia_use_vulkan=true") + list(APPEND SKIA_PUBLIC_DEFINITIONS SK_VULKAN) + endif() + +if(CMAKE_HOST_WIN32) + if("direct3d" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} skia_use_direct3d=true") + list(APPEND SKIA_PUBLIC_DEFINITIONS SK_DIRECT3D) + + checkout_in_path("${EXTERNALS}/spirv-cross" + "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" + "6a67891418a3f08be63f92726e049dc788e46f5b" + ) + + checkout_in_path("${EXTERNALS}/spirv-headers" + "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git" + "82becc8a8a92e509d3d8d635889da0a3c17d0606" + ) + + checkout_in_path("${EXTERNALS}/spirv-tools" + "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git" + "cb96abbf7affd986016f17dd09f9f971138a922b" + ) + + checkout_in_path("${EXTERNALS}/d3d12allocator" + "https://skia.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator.git" + "169895d529dfce00390a20e69c2f516066fe7a3b" + ) + endif() +endif() + +if("dawn" IN_LIST FEATURES) + + if (VCPKG_TARGET_IS_LINUX) + message(WARNING +[[ +dawn support requires the following libraries from the system package manager: + + libx11-xcb-dev mesa-common-dev + +They can be installed on Debian based systems via + + apt-get install libx11-xcb-dev mesa-common-dev +]] + ) + endif() + + set(OPTIONS "${OPTIONS} skia_use_dawn=true") + list(APPEND SKIA_PUBLIC_DEFINITIONS SK_DAWN) + + checkout_in_path("${EXTERNALS}/spirv-cross" + "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" + "6a67891418a3f08be63f92726e049dc788e46f5b" + ) + + checkout_in_path("${EXTERNALS}/spirv-headers" + "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git" + "82becc8a8a92e509d3d8d635889da0a3c17d0606" + ) + + checkout_in_path("${EXTERNALS}/spirv-tools" + "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git" + "cb96abbf7affd986016f17dd09f9f971138a922b" + ) + + checkout_in_path("${EXTERNALS}/tint" + "https://dawn.googlesource.com/tint" + "b612c505939bf86c80a55c193b93c41ed0f252a1" + ) + + checkout_in_path("${EXTERNALS}/jinja2" + "https://chromium.googlesource.com/chromium/src/third_party/jinja2" + "ee69aa00ee8536f61db6a451f3858745cf587de6" + ) + + checkout_in_path("${EXTERNALS}/markupsafe" + "https://chromium.googlesource.com/chromium/src/third_party/markupsafe" + "0944e71f4b2cb9a871bcbe353f95e889b64a611a" + ) + +## Remove + checkout_in_path("${EXTERNALS}/vulkan-headers" + "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" + "76f00ef6cbb1886eb1162d1fa39bee8b51e22ee8" + ) + + checkout_in_path("${EXTERNALS}/vulkan-tools" + "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" + "ef20059aea7ec24d0842edca2f75255eaa33a7b0" + ) + + checkout_in_path("${EXTERNALS}/abseil-cpp" + "https://skia.googlesource.com/external/github.com/abseil/abseil-cpp.git" + "c5a424a2a21005660b182516eb7a079cd8021699" + ) + +## REMOVE ^ + checkout_in_path("${EXTERNALS}/dawn" + "https://dawn.googlesource.com/dawn.git" + "e6d4598d36157639606a780164c425c6bffb93f6" + ) + + vcpkg_find_acquire_program(GIT) + file(READ "${SOURCE_PATH}/third_party/externals/dawn/generator/dawn_version_generator.py" DVG_CONTENT) + string(REPLACE "return 'git.bat' if sys.platform == 'win32' else 'git'" "return '${GIT}'" DVG_CONTENT ${DVG_CONTENT}) + file(WRITE "${SOURCE_PATH}/third_party/externals/dawn/generator/dawn_version_generator.py" ${DVG_CONTENT}) +endif() + +if("gl" IN_LIST FEATURES) + string(APPEND OPTIONS " skia_use_gl=true") + list(APPEND SKIA_PUBLIC_DEFINITIONS SK_GL) +endif() + +set(OPTIONS_DBG "${OPTIONS} is_debug=true") +set(OPTIONS_REL "${OPTIONS} is_official_build=true") + +if(CMAKE_HOST_WIN32) + # Load toolchains + if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") + endif() + include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") + + # turn a space delimited string into a gn list: + # "a b c" -> ["a","b","c"] + function(to_gn_list OUTPUT_ INPUT_) + string(STRIP "${INPUT_}" TEMP) + string(REPLACE " " " " TEMP "${TEMP}") + string(REPLACE " " "\",\"" TEMP "${TEMP}") + set(${OUTPUT_} "[\"${TEMP}\"]" PARENT_SCOPE) + endfunction() + + to_gn_list(SKIA_C_FLAGS_DBG "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_DEBUG}") + to_gn_list(SKIA_C_FLAGS_REL "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELEASE}") + + to_gn_list(SKIA_CXX_FLAGS_DBG "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") + to_gn_list(SKIA_CXX_FLAGS_REL "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") + + string(APPEND OPTIONS_DBG " extra_cflags_c=${SKIA_C_FLAGS_DBG} \ + extra_cflags_cc=${SKIA_CXX_FLAGS_DBG}") + string(APPEND OPTIONS_REL " extra_cflags_c=${SKIA_C_FLAGS_REL} \ + extra_cflags_cc=${SKIA_CXX_FLAGS_REL}") + + set(WIN_VC "$ENV{VCINSTALLDIR}") + string(REPLACE "\\VC\\" "\\VC" WIN_VC "${WIN_VC}") + string(APPEND OPTIONS_DBG " win_vc=\"${WIN_VC}\"") + string(APPEND OPTIONS_REL " win_vc=\"${WIN_VC}\"") +endif() + +vcpkg_configure_gn( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG "${OPTIONS_DBG}" + OPTIONS_RELEASE "${OPTIONS_REL}" +) + +set(DAWN_LINKAGE "") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(DAWN_LINKAGE "shared") +else() + set(DAWN_LINKAGE "static") +endif() + +vcpkg_list(SET SKIA_TARGETS ":skia") +if("dawn" IN_LIST FEATURES) + vcpkg_list(APPEND SKIA_TARGETS + "third_party/externals/dawn/src/dawn:proc_${DAWN_LINKAGE}" + "third_party/externals/dawn/src/dawn/native:${DAWN_LINKAGE}" + "third_party/externals/dawn/src/dawn/platform:${DAWN_LINKAGE}" + ) +endif() + +vcpkg_install_gn( + SOURCE_PATH "${SOURCE_PATH}" + TARGETS + ${SKIA_TARGETS} +) + +message(STATUS "Installing: ${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(COPY "${SOURCE_PATH}/include" + DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(RENAME "${CURRENT_PACKAGES_DIR}/include/include" + "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(GLOB_RECURSE SKIA_INCLUDE_FILES LIST_DIRECTORIES false + "${CURRENT_PACKAGES_DIR}/include/${PORT}/*") +foreach(file_ ${SKIA_INCLUDE_FILES}) + vcpkg_replace_string("${file_}" "#include \"include/" "#include \"${PORT}/") +endforeach() + +# get a list of library dependencies for TARGET +function(gn_desc_target_libs OUTPUT BUILD_DIR TARGET) + z_vcpkg_install_gn_get_desc("${OUTPUT}" + SOURCE_PATH "${SOURCE_PATH}" + BUILD_DIR "${BUILD_DIR}" + TARGET "${TARGET}" + WHAT_TO_DISPLAY libs) +endfunction() + +function(gn_desc_target_defines OUTPUT BUILD_DIR TARGET) + z_vcpkg_install_gn_get_desc(OUTPUT_ + SOURCE_PATH "${SOURCE_PATH}" + BUILD_DIR "${BUILD_DIR}" + TARGET "${TARGET}" + WHAT_TO_DISPLAY defines) + # exclude system defines such as _HAS_EXCEPTIONS=0 + list(FILTER OUTPUT_ EXCLUDE REGEX "^_") + set(${OUTPUT} ${OUTPUT_} PARENT_SCOPE) +endfunction() + +# skiaConfig.cmake.in input variables +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + gn_desc_target_libs(SKIA_DEP_DBG + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + //:skia) + gn_desc_target_defines(SKIA_DEFINITIONS_DBG + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + //extract_public_config:extract_skia) +endif() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + gn_desc_target_libs(SKIA_DEP_REL + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + //:skia) + gn_desc_target_defines(SKIA_DEFINITIONS_REL + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + //extract_public_config:extract_skia) +endif() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/skiaConfig.cmake.in" + "${CURRENT_PACKAGES_DIR}/share/skia/skiaConfig.cmake" @ONLY) + +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) diff --git a/externals/vcpkg/ports/skia/skiaConfig.cmake.in b/externals/vcpkg/ports/skia/skiaConfig.cmake.in new file mode 100755 index 000000000..62f816a6b --- /dev/null +++ b/externals/vcpkg/ports/skia/skiaConfig.cmake.in @@ -0,0 +1,46 @@ +add_library(skia INTERFACE) +add_library(skia::skia ALIAS skia) +set(SKIA_DEP_DBG @SKIA_DEP_DBG@) +set(SKIA_DEP_REL @SKIA_DEP_REL@) +set(SKIA_DEFINITIONS_DBG @SKIA_DEFINITIONS_DBG@) +set(SKIA_DEFINITIONS_REL @SKIA_DEFINITIONS_REL@) + +# Compute the installation prefix relative to this file. +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +if(_IMPORT_PREFIX STREQUAL "/") + set(_IMPORT_PREFIX "") +endif() + +find_library(SKIA_LIB NAMES skia skia.dll) +target_link_libraries(skia INTERFACE "${SKIA_LIB}") + +function(set_dependencies CONFIG LIBRARIES) + foreach(LIB ${LIBRARIES}) + if(LIB MATCHES "^/") + if(WIN32) + string(SUBSTRING "${LIB}" 1 -1 LIB) + endif() + target_link_libraries(skia INTERFACE + "$<$:${LIB}>") + else() + string(REGEX REPLACE "\\.framework" "" LIB ${LIB}) + string(REGEX REPLACE "[^a-zA-Z]" "_" LIB_NAME ${LIB}) + string(TOUPPER ${LIB_NAME} LIB_NAME) + set(LIB_NAME SKIA_${LIB_NAME}_LIBRARY) + find_library(${LIB_NAME} ${LIB}) + target_link_libraries(skia INTERFACE + "$<$:${${LIB_NAME}}>") + endif() + endforeach() +endfunction() + +set_dependencies(Debug "${SKIA_DEP_DBG}") +set_dependencies(Release "${SKIA_DEP_REL}") + +target_compile_definitions(skia INTERFACE + $<$:${SKIA_DEFINITIONS_DBG}> + $<$:${SKIA_DEFINITIONS_REL}>) + +target_include_directories(skia INTERFACE ${_IMPORT_PREFIX}/include) diff --git a/externals/vcpkg/ports/skia/use_vcpkg_fontconfig.patch b/externals/vcpkg/ports/skia/use_vcpkg_fontconfig.patch new file mode 100755 index 000000000..56bfd2c2b --- /dev/null +++ b/externals/vcpkg/ports/skia/use_vcpkg_fontconfig.patch @@ -0,0 +1,42 @@ +diff --git a/BUILD.gn b/BUILD.gn +index aeb46b4664..2ddbcd0ebe 100644 +--- a/BUILD.gn ++++ b/BUILD.gn +@@ -452,7 +452,7 @@ optional("fontmgr_fontconfig") { + enabled = skia_enable_fontmgr_fontconfig + + # The public header includes fontconfig.h and uses FcConfig* +- public_deps = [ "//third_party:fontconfig" ] ++ public_deps = [ "//third_party/fontconfig" ] + public = [ "include/ports/SkFontMgr_fontconfig.h" ] + deps = [ ":typeface_freetype" ] + sources = [ "src/ports/SkFontMgr_fontconfig.cpp" ] +@@ -469,7 +469,7 @@ optional("fontmgr_FontConfigInterface") { + + deps = [ + ":typeface_freetype", +- "//third_party:fontconfig", ++ "//third_party/fontconfig", + ] + public = [ + "include/ports/SkFontConfigInterface.h", +diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn +index 63fa748d16..6760e0f41b 100644 +--- a/third_party/BUILD.gn ++++ b/third_party/BUILD.gn +@@ -6,9 +6,9 @@ + declare_args() { + } + +-config("system_fontconfig") { +- libs = [ "fontconfig" ] +-} +-group("fontconfig") { +- public_configs = [ ":system_fontconfig" ] +-} ++#config("system_fontconfig") { ++# libs = [ "fontconfig" ] ++#} ++#group("fontconfig") { ++# public_configs = [ ":system_fontconfig" ] ++#} diff --git a/externals/vcpkg/ports/skia/vcpkg.json b/externals/vcpkg/ports/skia/vcpkg.json new file mode 100755 index 000000000..39f604a2d --- /dev/null +++ b/externals/vcpkg/ports/skia/vcpkg.json @@ -0,0 +1,54 @@ +{ + "name": "skia", + "version-date": "2022-04-15", + "description": [ + "Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.", + "It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.", + "Skia is sponsored and managed by Google, but is available for use by anyone under the BSD Free Software License. While engineering of the core components is done by the Skia development team, we consider contributions from any source." + ], + "homepage": "https://skia.org", + "license": "BSD-3-Clause", + "supports": "(osx | windows | linux) & !(windows & x86)", + "dependencies": [ + "expat", + "fontconfig", + { + "name": "freetype", + "default-features": false + }, + "harfbuzz", + "icu", + "libjpeg-turbo", + "libpng", + "libwebp", + { + "name": "vcpkg-cmake-config", + "host": true + }, + { + "name": "vcpkg-tool-gn", + "host": true + }, + "zlib" + ], + "default-features": [ + "gl" + ], + "features": { + "dawn": { + "description": "dawn support for skia" + }, + "direct3d": { + "description": "Direct3D support for skia" + }, + "gl": { + "description": "OpenGL support for skia" + }, + "metal": { + "description": "Metal support for skia" + }, + "vulkan": { + "description": "Vulkan support for skia" + } + } +} diff --git a/externals/vcpkg/ports/skia/zlib.gn b/externals/vcpkg/ports/skia/zlib.gn new file mode 100755 index 000000000..5c2bc8fc1 --- /dev/null +++ b/externals/vcpkg/ports/skia/zlib.gn @@ -0,0 +1,10 @@ +import("../third_party.gni") + +system("zlib") { + include_dirs = @_INCLUDES@ + if(is_debug) { + libs = @_LIBS_DBG@ + } else { + libs = @_LIBS_REL@ + } +} diff --git a/externals/vcpkg/ports/skyr-url/portfile.cmake b/externals/vcpkg/ports/skyr-url/portfile.cmake new file mode 100755 index 000000000..4744ed203 --- /dev/null +++ b/externals/vcpkg/ports/skyr-url/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cpp-netlib/url + REF v1.13.0 + SHA512 187898f5c0d2919095b293c7fbb6757d7b1391c9c79ccc3467ffc8b76a10685fd91faf9e9b8b0c0c21d0a9aecb3a50d52f2eab52823e770fc10ecd6ed874a748 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dskyr_BUILD_TESTS=OFF + -Dskyr_BUILD_DOCS=OFF + -Dskyr_BUILD_EXAMPLES=OFF + -Dskyr_WARNINGS_AS_ERRORS=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/skyr-url) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/skyr-url/vcpkg.json b/externals/vcpkg/ports/skyr-url/vcpkg.json new file mode 100755 index 000000000..fd08456bd --- /dev/null +++ b/externals/vcpkg/ports/skyr-url/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "skyr-url", + "version": "1.13.0", + "port-version": 2, + "description": "A C++ library that implements the WhatWG URL specification", + "homepage": "https://github.com/cpp-netlib/url", + "dependencies": [ + "nlohmann-json", + "range-v3", + "tl-expected", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/sleef/portfile.cmake b/externals/vcpkg/ports/sleef/portfile.cmake new file mode 100755 index 000000000..04fd4a7b8 --- /dev/null +++ b/externals/vcpkg/ports/sleef/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO shibatch/sleef + REF 3.5.1 + SHA512 e8e4e5028db52998c6b82bd462622c08d670e4e85273327f1c3bdbd900827dd7793b217c2876ca1229b6f672493bb96f40140e14366390cccea0e6780689e128 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_LIBM=ON + -DBUILD_DFT=ON + -DBUILD_QUAD=ON + -DBUILD_GNUABI_LIBS=${VCPKG_TARGET_IS_LINUX} + -DBUILD_TESTS=OFF + -DBUILD_INLINE_HEADERS=OFF +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/sleef/vcpkg.json b/externals/vcpkg/ports/sleef/vcpkg.json new file mode 100755 index 000000000..cc7e923fa --- /dev/null +++ b/externals/vcpkg/ports/sleef/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "sleef", + "version": "3.5.1", + "port-version": 2, + "description": "SIMD Library for Evaluating Elementary Functions, vectorized libm and DFT", + "homepage": "https://sleef.org/", + "license": "BSL-1.0", + "supports": "!uwp & !(arm & windows)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/sleepy-discord/fix-boost.patch b/externals/vcpkg/ports/sleepy-discord/fix-boost.patch new file mode 100755 index 000000000..a8279182d --- /dev/null +++ b/externals/vcpkg/ports/sleepy-discord/fix-boost.patch @@ -0,0 +1,13 @@ +diff --git a/sleepy_discord/CMakeLists.txt b/sleepy_discord/CMakeLists.txt +index 6c134141..2d115985 100644 +--- a/sleepy_discord/CMakeLists.txt ++++ b/sleepy_discord/CMakeLists.txt +@@ -84,7 +84,7 @@ if (NOT ONLY_SLEEPY_DISCORD) + elseif(USE_BOOST_ASIO) + #Look for boost as an alt + find_package(Boost REQUIRED) +- list(APPEND LIBRARIES_TO_LINK ${Boost_LIBRARIES}) ++ list(APPEND LIBRARIES_INCLUDE_DIRS "${Boost_INCLUDE_DIRS}") + list(APPEND LIB_CONFIG "EXISTENT_BOOST_ASIO") + list(APPEND LIB_CONFIG "EXISTENT_ASIO") + list(APPEND REQUIRED_PACKAGES "Boost") diff --git a/externals/vcpkg/ports/sleepy-discord/portfile.cmake b/externals/vcpkg/ports/sleepy-discord/portfile.cmake new file mode 100755 index 000000000..8f70125a1 --- /dev/null +++ b/externals/vcpkg/ports/sleepy-discord/portfile.cmake @@ -0,0 +1,43 @@ +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "websocketpp" USE_WEBSOCKETPP + "cpr" USE_CPR + "voice" ENABLE_VOICE + "compression" USE_ZLIB +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO yourWaifu/sleepy-discord + REF 70b9ec13427ea68de6f4213e9dfec6129fbab21b + SHA512 c91fbb9a672257c63ee83b40b62961b89568ca33081048b440876c390a2a2e11c602aaf43a6c9485fd85a91248f34a70d7b9ea769d0cfcd4b35b80d58a6ad737 + HEAD_REF develop +) + +# Handle version data here to prevent issues from doing this twice in parallel +set(SLEEPY_DISCORD_VERSION_HASH 70b9ec13427ea68de6f4213e9dfec6129fbab21b) +set(SLEEPY_DISCORD_VERSION_BUILD 949) +set(SLEEPY_DISCORD_VERSION_BRANCH "develop") +set(SLEEPY_DISCORD_VERSION_IS_MASTER 0) +set(SLEEPY_DISCORD_VERSION_DESCRIPTION_CONCAT " ") +set(SLEEPY_DISCORD_VERSION_DESCRIPTION "70b9ec13") +configure_file( + "${SOURCE_PATH}/include/sleepy_discord/version.h.in" + "${SOURCE_PATH}/include/sleepy_discord/version.h" +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DSLEEPY_VCPKG=ON + -DAUTO_DOWNLOAD_LIBRARY=OFF + -DUSE_BOOST_ASIO=ON + ${FEATURE_OPTIONS} +) +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sleepy-discord) + +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/sleepy-discord/vcpkg.json b/externals/vcpkg/ports/sleepy-discord/vcpkg.json new file mode 100755 index 000000000..514e661cf --- /dev/null +++ b/externals/vcpkg/ports/sleepy-discord/vcpkg.json @@ -0,0 +1,49 @@ +{ + "name": "sleepy-discord", + "version-date": "2022-02-05", + "description": "C++ library for the Discord chat client", + "homepage": "https://yourwaifu.dev/sleepy-discord/", + "dependencies": [ + "boost-asio", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "cpr", + "websocketpp" + ], + "features": { + "compression": { + "description": "Allow compression for Websockets connection", + "dependencies": [ + "zlib" + ] + }, + "cpr": { + "description": "Use CPR library for handling HTTPS", + "dependencies": [ + "cpr" + ] + }, + "voice": { + "description": "Voice Chat support", + "dependencies": [ + "libsodium", + "opus" + ] + }, + "websocketpp": { + "description": "Use Websocketpp for handling WebSockets", + "dependencies": [ + "boost-random", + "websocketpp" + ] + } + } +} diff --git a/externals/vcpkg/ports/slikenet/fix-install.patch b/externals/vcpkg/ports/slikenet/fix-install.patch new file mode 100755 index 000000000..008dd1e7f --- /dev/null +++ b/externals/vcpkg/ports/slikenet/fix-install.patch @@ -0,0 +1,51 @@ +diff --git a/Lib/DLL/CMakeLists.txt b/Lib/DLL/CMakeLists.txt +index 7f6453d..48f9562 100644 +--- a/Lib/DLL/CMakeLists.txt ++++ b/Lib/DLL/CMakeLists.txt +@@ -50,6 +50,7 @@ ELSE(WIN32 AND NOT UNIX) + ENDIF(WIN32 AND NOT UNIX) + + target_link_libraries(SLikeNetDLL ${SLIKENET_LIBRARY_LIBS}) ++if(0) + IF(NOT WIN32 OR UNIX) + configure_file(../../slikenet-config-version.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/slikenet-config-version.cmake @ONLY) + +@@ -60,3 +61,12 @@ IF(NOT WIN32 OR UNIX) + INSTALL(FILES ../../slikenet-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/slikenet-config-version.cmake DESTINATION lib/slikenet-${SLikeNet_VERSION}) + INSTALL(EXPORT SLikeNetDLL DESTINATION lib/slikenet-${SLikeNet_VERSION}) + ENDIF(NOT WIN32 OR UNIX) ++endif() ++ ++install(TARGETS SLikeNetDLL ++ EXPORT SLikeNetDLL ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) ++INSTALL(FILES ${ALL_HEADER_SRCS} DESTINATION include/slikenet) ++install(EXPORT SLikeNetDLL FILE slikenetTargets.cmake DESTINATION share/slikenet) +diff --git a/Lib/LibStatic/CMakeLists.txt b/Lib/LibStatic/CMakeLists.txt +index f936fa5..a5dcc4f 100644 +--- a/Lib/LibStatic/CMakeLists.txt ++++ b/Lib/LibStatic/CMakeLists.txt +@@ -50,6 +50,8 @@ ELSE(WIN32 AND NOT UNIX) + ENDIF(WIN32 AND NOT UNIX) + + target_link_libraries(SLikeNetLibStatic ${SLIKENET_LIBRARY_LIBS}) ++ ++if(0) + IF(WIN32 AND NOT UNIX) + IF(NOT ${CMAKE_GENERATOR} STREQUAL "MSYS Makefiles") + set_target_properties(SLikeNetLibStatic PROPERTIES STATIC_LIBRARY_FLAGS "/NODEFAULTLIB:\"LIBCD.lib LIBCMTD.lib MSVCRT.lib\"" ) +@@ -64,3 +66,12 @@ ELSE(WIN32 AND NOT UNIX) + INSTALL(FILES ../../slikenet-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/slikenet-config-version.cmake DESTINATION lib/slikenet-${SLikeNet_VERSION}) + INSTALL(EXPORT SLikeNetLibStatic FILE slikenet.cmake DESTINATION lib/slikenet-${SLikeNet_VERSION}) + ENDIF(WIN32 AND NOT UNIX) ++endif() ++ ++INSTALL(TARGETS SLikeNetLibStatic ++ EXPORT SLikeNetLibStatic ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) ++INSTALL(FILES ${ALL_HEADER_SRCS} DESTINATION include/slikenet) ++INSTALL(EXPORT SLikeNetLibStatic FILE slikenetTargets.cmake DESTINATION share/slikenet) diff --git a/externals/vcpkg/ports/slikenet/portfile.cmake b/externals/vcpkg/ports/slikenet/portfile.cmake new file mode 100755 index 000000000..74572911d --- /dev/null +++ b/externals/vcpkg/ports/slikenet/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO SLikeSoft/SLikeNet + REF 358462052fce7e585fc1cce0a17a7042ba724c08 + SHA512 2c932b0a7910ec36dd6a340dd841cefcf259fbdadadff220747d13752181ea14e3c5f05331beb36dea21c0de360edc270ff4c55375bbea23ee2149828f07e9ab + HEAD_REF master + PATCHES + fix-install.patch +) +#Uses an outdated OpenSSL version and is in an experimental namespace any way. As such we delete it here +file(REMOVE_RECURSE "${SOURCE_PATH}/Source/src/crypto" "${SOURCE_PATH}/Source/include/slikenet/crypto") + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SLIKENET_ENABLE_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SLIKENET_ENABLE_DLL) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DSLIKENET_ENABLE_DLL=${SLIKENET_ENABLE_DLL} + -DSLIKENET_ENABLE_STATIC=${SLIKENET_ENABLE_STATIC} + -DSLIKENET_ENABLE_SAMPLES=FALSE +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/slikenet) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) + +configure_file("${CMAKE_CURRENT_LIST_DIR}/slikenet-config.cmake" "${CURRENT_PACKAGES_DIR}/share/slikenet/slikenet-config.cmake" COPYONLY) +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/slikenet/vcpkg-cmake-wrapper.cmake" COPYONLY) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/slikenet/slikenet-config.cmake b/externals/vcpkg/ports/slikenet/slikenet-config.cmake new file mode 100755 index 000000000..be473367a --- /dev/null +++ b/externals/vcpkg/ports/slikenet/slikenet-config.cmake @@ -0,0 +1,4 @@ +include(CMakeFindDependencyMacro) +find_dependency(OpenSSL) +set(slikenet_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/../../include") +include(${CMAKE_CURRENT_LIST_DIR}/slikenetTargets.cmake) diff --git a/externals/vcpkg/ports/slikenet/usage b/externals/vcpkg/ports/slikenet/usage new file mode 100755 index 000000000..6f98ae5f8 --- /dev/null +++ b/externals/vcpkg/ports/slikenet/usage @@ -0,0 +1,4 @@ +The package slikenet provides CMake targets: + + find_package(slikenet CONFIG REQUIRED) + target_link_libraries(main PRIVATE SLikeNet) \ No newline at end of file diff --git a/externals/vcpkg/ports/slikenet/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/slikenet/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..237389f63 --- /dev/null +++ b/externals/vcpkg/ports/slikenet/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,11 @@ +_find_package(${ARGS}) + +if(NOT TARGET SLikeNet AND TARGET SLikeNetDLL) +add_library(SLikeNet INTERFACE IMPORTED) +set_target_properties(SLikeNet PROPERTIES INTERFACE_LINK_LIBRARIES SLikeNetDLL) +endif() + +if(NOT TARGET SLikeNet AND TARGET SLikeNetLibStatic) +add_library(SLikeNet INTERFACE IMPORTED) +set_target_properties(SLikeNet PROPERTIES INTERFACE_LINK_LIBRARIES SLikeNetLibStatic) +endif() diff --git a/externals/vcpkg/ports/slikenet/vcpkg.json b/externals/vcpkg/ports/slikenet/vcpkg.json new file mode 100755 index 000000000..fa74ed594 --- /dev/null +++ b/externals/vcpkg/ports/slikenet/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "slikenet", + "version-date": "2021-06-07", + "port-version": 1, + "description": "SLikeNetT is an Open Source/Free Software cross-platform network engine written in C++ and specifially designed for games (and applications which have comparable requirements on a network engine like games) building upon the discontinued RakNet network engine which had more than 13 years of active development.", + "homepage": "https://github.com/SLikeSoft/SLikeNet", + "supports": "!uwp", + "dependencies": [ + "openssl" + ] +} diff --git a/externals/vcpkg/ports/sltbench/portfile.cmake b/externals/vcpkg/ports/sltbench/portfile.cmake new file mode 100755 index 000000000..2111c896b --- /dev/null +++ b/externals/vcpkg/ports/sltbench/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ivafanas/sltbench + REF 52c7c7852abc3159185eb79e699ad77fadfc35bd + SHA512 0c66b51f5a950a09df47019775941554538bc3642788f61aaf8c5ec3644d5fef721391f73c3fddfd9529159f9b81c7d7ed76c7995a79f37adaf8d0ff55a99d4b + HEAD_REF master) + +vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH}) +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake/ TARGET_PATH share/sltbench) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file( + INSTALL ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright) diff --git a/externals/vcpkg/ports/sltbench/vcpkg.json b/externals/vcpkg/ports/sltbench/vcpkg.json new file mode 100755 index 000000000..efa7c527f --- /dev/null +++ b/externals/vcpkg/ports/sltbench/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "sltbench", + "version-string": "2.4.0", + "description": "C++ benchmark tool. Practical, stable and fast performance testing framework.", + "homepage": "https://github.com/ivafanas/sltbench" +} diff --git a/externals/vcpkg/ports/smpeg2/001-correct-sdl-headers-dir.patch b/externals/vcpkg/ports/smpeg2/001-correct-sdl-headers-dir.patch new file mode 100755 index 000000000..6cbcb6b9b --- /dev/null +++ b/externals/vcpkg/ports/smpeg2/001-correct-sdl-headers-dir.patch @@ -0,0 +1,17 @@ +diff --git a/smpeg.h b/smpeg.h +index 6bc2dbd..d12c8f8 100644 +--- a/smpeg.h ++++ b/smpeg.h +@@ -22,9 +22,9 @@ + #ifndef _SMPEG_H_ + #define _SMPEG_H_ + +-#include "SDL.h" +-#include "SDL_mutex.h" +-#include "SDL_audio.h" ++#include "SDL2/SDL.h" ++#include "SDL2/SDL_mutex.h" ++#include "SDL2/SDL_audio.h" + #include "MPEGframe.h" + + #ifdef __cplusplus diff --git a/externals/vcpkg/ports/smpeg2/002-use-SDL2-headers.patch b/externals/vcpkg/ports/smpeg2/002-use-SDL2-headers.patch new file mode 100755 index 000000000..9737c6d7b --- /dev/null +++ b/externals/vcpkg/ports/smpeg2/002-use-SDL2-headers.patch @@ -0,0 +1,229 @@ +diff --git a/MPEG.cpp b/MPEG.cpp +index 1645965..9d44166 100644 +--- a/MPEG.cpp ++++ b/MPEG.cpp +@@ -1,4 +1,4 @@ +-#include "SDL.h" ++#include "SDL2/SDL.h" + + #include "MPEG.h" + +diff --git a/MPEG.h b/MPEG.h +index ca04260..d0b0d55 100644 +--- a/MPEG.h ++++ b/MPEG.h +@@ -28,7 +28,7 @@ + #include + #include + +-#include "SDL.h" ++#include "SDL2/SDL.h" + + #include "MPEGerror.h" + #include "MPEGstream.h" +diff --git a/MPEGaction.h b/MPEGaction.h +index f9da3a3..ea0b94f 100644 +--- a/MPEGaction.h ++++ b/MPEGaction.h +@@ -24,7 +24,7 @@ + #ifndef _MPEGACTION_H_ + #define _MPEGACTION_H_ + +-#include "SDL.h" ++#include "SDL2/SDL.h" + #include "MPEGframe.h" + + typedef enum { +diff --git a/MPEGaudio.h b/MPEGaudio.h +index 3f315d2..2ec4377 100644 +--- a/MPEGaudio.h ++++ b/MPEGaudio.h +@@ -24,7 +24,7 @@ + #ifndef _MPEGAUDIO_H_ + #define _MPEGAUDIO_H_ + +-#include "SDL.h" ++#include "SDL2/SDL.h" + #include "MPEGerror.h" + #include "MPEGaction.h" + +diff --git a/MPEGlist.h b/MPEGlist.h +index 3a58a5f..fe0dbac 100644 +--- a/MPEGlist.h ++++ b/MPEGlist.h +@@ -6,7 +6,7 @@ + #ifndef _MPEGLIST_H_ + #define _MPEGLIST_H_ + +-#include "SDL.h" ++#include "SDL2/SDL.h" + + class MPEGlist { + public: +diff --git a/MPEGring.cpp b/MPEGring.cpp +index 6d9dabb..0350d54 100644 +--- a/MPEGring.cpp ++++ b/MPEGring.cpp +@@ -23,7 +23,7 @@ + #include + #include + +-#include "SDL_timer.h" ++#include "SDL2/SDL_timer.h" + + #include "MPEGring.h" + +diff --git a/MPEGring.h b/MPEGring.h +index 89172ac..550fbcc 100644 +--- a/MPEGring.h ++++ b/MPEGring.h +@@ -24,8 +24,8 @@ + #ifndef _MPEGRING_H + #define _MPEGRING_H + +-#include "SDL_types.h" +-#include "SDL_thread.h" ++#include "SDL2/SDL_types.h" ++#include "SDL2/SDL_thread.h" + + class MPEG_ring { + public: +diff --git a/MPEGstream.h b/MPEGstream.h +index b96c631..50e0c3a 100644 +--- a/MPEGstream.h ++++ b/MPEGstream.h +@@ -22,7 +22,7 @@ + #ifndef _MPEGSTREAM_H_ + #define _MPEGSTREAM_H_ + +-#include "SDL_types.h" ++#include "SDL2/SDL_types.h" + #include "MPEGerror.h" + #include "MPEGvideo.h" + #include "MPEGaudio.h" +diff --git a/MPEGsystem.h b/MPEGsystem.h +index 823b679..28454b3 100644 +--- a/MPEGsystem.h ++++ b/MPEGsystem.h +@@ -6,8 +6,8 @@ + #define _MPEGSYSTEM_H_ + #define USE_SYSTEM_TIMESTAMP + +-#include "SDL.h" +-#include "SDL_thread.h" ++#include "SDL2/SDL.h" ++#include "SDL2/SDL_thread.h" + #include "MPEGerror.h" + + class MPEGstream; +diff --git a/MPEGvideo.h b/MPEGvideo.h +index 12da092..9f1ed43 100644 +--- a/MPEGvideo.h ++++ b/MPEGvideo.h +@@ -24,8 +24,8 @@ + #ifndef _MPEGVIDEO_H_ + #define _MPEGVIDEO_H_ + +-#include "SDL.h" +-#include "SDL_thread.h" ++#include "SDL2/SDL.h" ++#include "SDL2/SDL_thread.h" + #include "MPEGerror.h" + #include "MPEGaction.h" + +diff --git a/README.SDL_mixer b/README.SDL_mixer +index c01b575..5cacc4f 100644 +--- a/README.SDL_mixer ++++ b/README.SDL_mixer +@@ -5,7 +5,7 @@ You can have the SDL mixer library mix audio from a movie by hooking into + the SDL mixer music hooks: + + #include "smpeg.h" +-#include "SDL_mixer.h" ++#include "SDL2/SDL_mixer.h" + + .. set up the mixer audio ... + +diff --git a/acinclude/sdl2.m4 b/acinclude/sdl2.m4 +index 93bc4b0..776ad42 100644 +--- a/acinclude/sdl2.m4 ++++ b/acinclude/sdl2.m4 +@@ -84,7 +84,7 @@ dnl + #include + #include + #include +-#include "SDL.h" ++#include "SDL2/SDL.h" + + char* + my_strdup (char *str) +@@ -167,7 +167,7 @@ int main (int argc, char *argv[]) + LIBS="$LIBS $SDL_LIBS" + AC_TRY_LINK([ + #include +-#include "SDL.h" ++#include "SDL2/SDL.h" + + int main(int argc, char *argv[]) + { return 0; } +diff --git a/configure b/configure +index 4ac7e60..ee1d934 100644 +--- a/configure ++++ b/configure +@@ -15270,7 +15270,7 @@ else + #include + #include + #include +-#include "SDL.h" ++#include "SDL2/SDL.h" + + char* + my_strdup (char *str) +@@ -15367,7 +15367,7 @@ $as_echo "no" >&6; } + /* end confdefs.h. */ + + #include +-#include "SDL.h" ++#include "SDL2/SDL.h" + + int main(int argc, char *argv[]) + { return 0; } +diff --git a/video/gdith.cpp b/video/gdith.cpp +index c56da96..53ba388 100644 +--- a/video/gdith.cpp ++++ b/video/gdith.cpp +@@ -52,7 +52,7 @@ + #include "video.h" + #include "proto.h" + #include "dither.h" +-#include "SDL_timer.h" ++#include "SDL2/SDL_timer.h" + + #ifdef __STDC__ + #include +diff --git a/video/readfile.cpp b/video/readfile.cpp +index eb71194..a19e66d 100644 +--- a/video/readfile.cpp ++++ b/video/readfile.cpp +@@ -56,7 +56,7 @@ + #include + #include + +-#include "SDL_endian.h" ++#include "SDL2/SDL_endian.h" + #include "video.h" + #include "proto.h" + #include "util.h" +diff --git a/video/video.h b/video/video.h +index 96de89b..a35095b 100644 +--- a/video/video.h ++++ b/video/video.h +@@ -400,7 +400,7 @@ extern unsigned int cacheMiss[8][8]; + #define __SCO__ 1 + #endif + +-#include "SDL_endian.h" ++#include "SDL2/SDL_endian.h" + #if SDL_BYTEORDER == SDL_BIG_ENDIAN + #ifdef LITTLE_ENDIAN_ARCHITECTURE + #undef LITTLE_ENDIAN_ARCHITECTURE diff --git a/externals/vcpkg/ports/smpeg2/003-fix-double-ptr-to-int-comparison.patch b/externals/vcpkg/ports/smpeg2/003-fix-double-ptr-to-int-comparison.patch new file mode 100755 index 000000000..31128a848 --- /dev/null +++ b/externals/vcpkg/ports/smpeg2/003-fix-double-ptr-to-int-comparison.patch @@ -0,0 +1,13 @@ +diff --git a/audio/mpegtoraw.cpp b/audio/mpegtoraw.cpp +index 493c870..a4eabdc 100644 +--- a/audio/mpegtoraw.cpp ++++ b/audio/mpegtoraw.cpp +@@ -448,7 +448,7 @@ int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len) + if (audio->timestamp[0] != -1){ + double timeshift = audio->Time() - audio->timestamp[0]; + double correction = 0; +- assert(audio->timestamp >= 0); ++ assert(audio->timestamp[0] >= 0); + if (fabs(timeshift) > 1.0){ + correction = -timeshift; + #ifdef DEBUG_TIMESTAMP_SYNC diff --git a/externals/vcpkg/ports/smpeg2/CMakeLists.txt b/externals/vcpkg/ports/smpeg2/CMakeLists.txt new file mode 100755 index 000000000..5515c698f --- /dev/null +++ b/externals/vcpkg/ports/smpeg2/CMakeLists.txt @@ -0,0 +1,65 @@ +cmake_minimum_required(VERSION 2.6) +project(SMPEG2 CXX) + +find_path(SDL_INCLUDE_DIR SDL2/SDL.h) +find_package(SDL2 CONFIG REQUIRED) + +include_directories(${SDL_INCLUDE_DIR}) +include_directories(${SDL_INCLUDE_DIR}/SDL2) +include_directories(${CMAKE_SOURCE_DIR}) + +if(MSVC) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) +endif() +add_definitions(-DNOCONTROLS -DTHREADED_AUDIO) + +# some c++ code just assumes memset is available +file(WRITE ${CMAKE_SOURCE_DIR}/declare_memset.h "#include \n") +add_definitions(-FIdeclare_memset.h) + +add_library(smpeg2 + audio/bitwindow.cpp + audio/filter.cpp + audio/filter_2.cpp + audio/hufftable.cpp + audio/mpeglayer1.cpp + audio/mpeglayer2.cpp + audio/mpeglayer3.cpp + audio/mpegtable.cpp + audio/mpegtoraw.cpp + audio/MPEGaudio.cpp + video/decoders.cpp + video/floatdct.cpp + video/gdith.cpp + video/jrevdct.cpp + video/motionvec.cpp + video/parseblock.cpp + video/readfile.cpp + video/util.cpp + video/video.cpp + video/MPEGvideo.cpp + MPEG.cpp + MPEGlist.cpp + MPEGring.cpp + MPEGstream.cpp + MPEGsystem.cpp + smpeg.cpp) + +set_target_properties(smpeg2 PROPERTIES DEFINE_SYMBOL DLL_EXPORT) +if(BUILD_SHARED_LIBS) + target_link_libraries(smpeg2 SDL2::SDL2) +else() + target_link_libraries(smpeg2 SDL2::SDL2-static) +endif() + +install(TARGETS smpeg2 + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib) + +if(NOT DEFINED SMPEG_SKIP_HEADERS) + install(FILES smpeg.h MPEGframe.h DESTINATION include) +endif() + +message(STATUS "Link-time dependencies:") +message(STATUS " " ${SDL_LIBRARY}) diff --git a/externals/vcpkg/ports/smpeg2/portfile.cmake b/externals/vcpkg/ports/smpeg2/portfile.cmake new file mode 100755 index 000000000..acba22237 --- /dev/null +++ b/externals/vcpkg/ports/smpeg2/portfile.cmake @@ -0,0 +1,31 @@ + +set(VERSION 2.0.0) +vcpkg_download_distfile(ARCHIVE + URLS "https://www.libsdl.org/projects/smpeg/release/smpeg2-${VERSION}.tar.gz" + FILENAME "smpeg2-${VERSION}.tar.gz" + SHA512 80a779d01e7aa76778ef6ceea8041537db9e4b354df413214c4413c875cb98551891cef98fa0f057cc6a3222e4983da9ae65b86bdad2f87f9e2a6751837e2baf +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${VERSION} + PATCHES + "001-correct-sdl-headers-dir.patch" + "002-use-SDL2-headers.patch" + "003-fix-double-ptr-to-int-comparison.patch" +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DSMPEG_SKIP_HEADERS=ON) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/smpeg2) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/smpeg2/COPYING ${CURRENT_PACKAGES_DIR}/share/smpeg2/copyright) diff --git a/externals/vcpkg/ports/smpeg2/vcpkg.json b/externals/vcpkg/ports/smpeg2/vcpkg.json new file mode 100755 index 000000000..24eb88e52 --- /dev/null +++ b/externals/vcpkg/ports/smpeg2/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "smpeg2", + "version-string": "2.0.0", + "port-version": 7, + "description": "SDL MPEG Player Library", + "homepage": "https://www.libsdl.org/projects/smpeg/", + "dependencies": [ + "sdl2" + ] +} diff --git a/externals/vcpkg/ports/snappy/portfile.cmake b/externals/vcpkg/ports/snappy/portfile.cmake new file mode 100755 index 000000000..45b8c706d --- /dev/null +++ b/externals/vcpkg/ports/snappy/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/snappy + REF 1.1.9 + SHA512 f1f8a90f5f7f23310423574b1d8c9acb84c66ea620f3999d1060395205e5760883476837aba02f0aa913af60819e34c625d8308c18a5d7a9c4e190f35968b024 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSNAPPY_BUILD_TESTS=OFF + -DSNAPPY_BUILD_BENCHMARKS=OFF + -DCMAKE_DEBUG_POSTFIX=d +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Snappy) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/snappy/vcpkg.json b/externals/vcpkg/ports/snappy/vcpkg.json new file mode 100755 index 000000000..593b02343 --- /dev/null +++ b/externals/vcpkg/ports/snappy/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "snappy", + "version": "1.1.9", + "port-version": 1, + "description": "A fast compressor/decompressor.", + "homepage": "https://github.com/google/snappy", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/sndfile/portfile.cmake b/externals/vcpkg/ports/sndfile/portfile.cmake new file mode 100755 index 000000000..d3910bb2c --- /dev/null +++ b/externals/vcpkg/ports/sndfile/portfile.cmake @@ -0,0 +1,3 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +message(WARNING "The sndfile port is deprecated, using libsndfile instead") diff --git a/externals/vcpkg/ports/sndfile/vcpkg.json b/externals/vcpkg/ports/sndfile/vcpkg.json new file mode 100755 index 000000000..2f91543bd --- /dev/null +++ b/externals/vcpkg/ports/sndfile/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "sndfile", + "version-string": "0", + "port-version": 1, + "description": "x Library to read, write and manipulate many soundfile types.", + "dependencies": [ + "libsndfile" + ], + "default-features": [ + "external-libs" + ], + "features": { + "external-libs": { + "description": "Support Ogg Vorbis and FLAC audio files", + "dependencies": [ + { + "name": "libsndfile", + "features": [ + "external-libs" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/snowhouse/portfile.cmake b/externals/vcpkg/ports/snowhouse/portfile.cmake new file mode 100755 index 000000000..279fa6e4a --- /dev/null +++ b/externals/vcpkg/ports/snowhouse/portfile.cmake @@ -0,0 +1,12 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO banditcpp/snowhouse + REF 3faaff8d836c726aa2001adf3d2253d3b368b06b # v5.0.0 + SHA512 d1fdd01b376ea26a4c9312df9f952f5b543d1f9d4a8049b7302961d3403200659cb448e5c032f9f05f4f0eeed7434d94beaf108f80cd155c37fe63eaf14651c2 + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/include/snowhouse DESTINATION ${CURRENT_PACKAGES_DIR}/include/ FILES_MATCHING PATTERN *.h) + +file(COPY ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/snowhouse) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/snowhouse/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/snowhouse/copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/snowhouse/vcpkg.json b/externals/vcpkg/ports/snowhouse/vcpkg.json new file mode 100755 index 000000000..f8d9a392f --- /dev/null +++ b/externals/vcpkg/ports/snowhouse/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "snowhouse", + "version-string": "5.0.0", + "port-version": 1, + "description": "An assertion library for C++" +} diff --git a/externals/vcpkg/ports/so5extra/portfile.cmake b/externals/vcpkg/ports/so5extra/portfile.cmake new file mode 100755 index 000000000..caee67fd8 --- /dev/null +++ b/externals/vcpkg/ports/so5extra/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO stiffstream/so5extra + REF 3105cfdaccf2609765f19cd9bc6173375a1ee18d # v.1.5.1 + SHA512 a53734afcc591cf114e654e5f798b973faa1c37926a18e71728571b6762133001147db5d92b872f5d63927c15e394b8c6f33968aa6f0ee23038fc94a271b9b85 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/dev/so_5_extra" + OPTIONS + -DSO5EXTRA_INSTALL=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/so5extra) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/so5extra" RENAME copyright) + diff --git a/externals/vcpkg/ports/so5extra/vcpkg.json b/externals/vcpkg/ports/so5extra/vcpkg.json new file mode 100755 index 000000000..d5f31b478 --- /dev/null +++ b/externals/vcpkg/ports/so5extra/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "so5extra", + "version": "1.5.1", + "description": "A set of additional tools for SObjectizer framework.", + "homepage": "https://github.com/Stiffstream/so5extra", + "license": "BSD-3-Clause", + "dependencies": [ + "sobjectizer", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/sobjectizer/portfile.cmake b/externals/vcpkg/ports/sobjectizer/portfile.cmake new file mode 100755 index 000000000..2fca780f5 --- /dev/null +++ b/externals/vcpkg/ports/sobjectizer/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO stiffstream/sobjectizer + REF 646ac5891c15af766181d8ed7061b4fa9fa43e9f # v.5.7.4 + SHA512 c2ed2e0f41b31e56865469ddfa6f67cc41af8b154f73b8d431aad75f7af5033bddae5445e64454e17fd9c8a207a19415c7dd33102205687c4937cf92bcfb3fa2 +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SOBJECTIZER_BUILD_STATIC ) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SOBJECTIZER_BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/dev" + OPTIONS + -DSOBJECTIZER_BUILD_STATIC=${SOBJECTIZER_BUILD_STATIC} + -DSOBJECTIZER_BUILD_SHARED=${SOBJECTIZER_BUILD_SHARED} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sobjectizer) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/externals/vcpkg/ports/sobjectizer/vcpkg.json b/externals/vcpkg/ports/sobjectizer/vcpkg.json new file mode 100755 index 000000000..984741690 --- /dev/null +++ b/externals/vcpkg/ports/sobjectizer/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "sobjectizer", + "version": "5.7.4", + "description": "SObjectizer is a C++ in-process message dispatching framework with implementation of Actor Model, Publish-Subscribe Model and CSP-like channels.", + "homepage": "https://github.com/Stiffstream/sobjectizer", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/soci/export-include-dirs.patch b/externals/vcpkg/ports/soci/export-include-dirs.patch new file mode 100755 index 000000000..e141363fc --- /dev/null +++ b/externals/vcpkg/ports/soci/export-include-dirs.patch @@ -0,0 +1,36 @@ +diff --git a/cmake/SociBackend.cmake b/cmake/SociBackend.cmake +index 5d4ef0d..bb0edf2 100644 +--- a/cmake/SociBackend.cmake ++++ b/cmake/SociBackend.cmake +@@ -159,8 +159,14 @@ macro(soci_backend NAME) + ${THIS_BACKEND_HEADERS}) + + target_link_libraries(${THIS_BACKEND_TARGET} ++ PUBLIC + ${SOCI_CORE_TARGET} + ${THIS_BACKEND_DEPENDS_LIBRARIES}) ++ ++ target_include_directories(${THIS_BACKEND_TARGET} ++ PUBLIC ++ ${THIS_BACKEND_DEPENDS_INCLUDE_DIRS} ++ ) + + if(WIN32) + set_target_properties(${THIS_BACKEND_TARGET} +@@ -197,9 +203,15 @@ macro(soci_backend NAME) + + # Still need to link the libraries for tests to work + target_link_libraries (${THIS_BACKEND_TARGET_STATIC} ++ PUBLIC + ${THIS_BACKEND_DEPENDS_LIBRARIES} + ) +- ++ ++ target_include_directories(${THIS_BACKEND_TARGET_STATIC} ++ PUBLIC ++ ${THIS_BACKEND_DEPENDS_INCLUDE_DIRS} ++ ) ++ + set_target_properties(${THIS_BACKEND_TARGET_STATIC} + PROPERTIES + OUTPUT_NAME ${THIS_BACKEND_OUTPUT_NAME} diff --git a/externals/vcpkg/ports/soci/fix-dependency-libmysql.patch b/externals/vcpkg/ports/soci/fix-dependency-libmysql.patch new file mode 100755 index 000000000..809ec76d5 --- /dev/null +++ b/externals/vcpkg/ports/soci/fix-dependency-libmysql.patch @@ -0,0 +1,14 @@ +diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake +index 1233568..9a7cb61 100644 +--- a/cmake/modules/FindMySQL.cmake ++++ b/cmake/modules/FindMySQL.cmake +@@ -13,6 +13,9 @@ + # + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. ++find_package(libmysql REQUIRED) ++set(MySQL_FOUND 1) ++return() + + include(CheckCXXSourceCompiles) + diff --git a/externals/vcpkg/ports/soci/fix-mysql-feature-error.patch b/externals/vcpkg/ports/soci/fix-mysql-feature-error.patch new file mode 100755 index 000000000..05e9c4bfe --- /dev/null +++ b/externals/vcpkg/ports/soci/fix-mysql-feature-error.patch @@ -0,0 +1,12 @@ +diff --git a/src/backends/mysql/session.cpp b/src/backends/mysql/session.cpp +index 383248c..86a5bfd 100644 +--- a/src/backends/mysql/session.cpp ++++ b/src/backends/mysql/session.cpp +@@ -5,6 +5,7 @@ + // (See accompanying file LICENSE_1_0.txt or copy at + // http://www.boost.org/LICENSE_1_0.txt) + // ++typedef bool my_bool; + + #define SOCI_MYSQL_SOURCE + #include "soci/mysql/soci-mysql.h" diff --git a/externals/vcpkg/ports/soci/portfile.cmake b/externals/vcpkg/ports/soci/portfile.cmake new file mode 100755 index 000000000..b852d6da7 --- /dev/null +++ b/externals/vcpkg/ports/soci/portfile.cmake @@ -0,0 +1,61 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO SOCI/soci + REF 99e2d567161a302de4f99832af76e6d3b75b68e6 #version 4.0.2 + SHA512 d08d2383808d46d5e9550e9c7d93fb405d9e336eb38d974ba429e5b9446d3af53d4e702b90e80c67e298333da0145457fa1146d9773322676030be69de4ec4f4 + HEAD_REF master + PATCHES + fix-dependency-libmysql.patch + export-include-dirs.patch + fix-mysql-feature-error.patch # https://bugs.mysql.com/bug.php?id=85131 +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SOCI_DYNAMIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SOCI_STATIC) + +# Handle features +set(_COMPONENT_FLAGS "") +foreach(_feature IN LISTS ALL_FEATURES) + # Uppercase the feature name and replace "-" with "_" + string(TOUPPER "${_feature}" _FEATURE) + string(REPLACE "-" "_" _FEATURE "${_FEATURE}") + + # Turn "-DWITH_*=" ON or OFF depending on whether the feature + # is in the list. + if(_feature IN_LIST FEATURES) + list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=ON") + else() + list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=OFF") + endif() + + if(_feature MATCHES "mysql") + set(MYSQL_OPT -DMYSQL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/mysql) + endif() +endforeach() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSOCI_TESTS=OFF + -DSOCI_CXX11=ON + -DSOCI_STATIC=${SOCI_STATIC} + -DSOCI_SHARED=${SOCI_DYNAMIC} + ${_COMPONENT_FLAGS} + ${MYSQL_OPT} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SOCI) + +if ("mysql" IN_LIST FEATURES) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/SOCIConfig.cmake" + "# Create imported target SOCI::soci_mysql" + "\ninclude(CMakeFindDependencyMacro)\nfind_dependency(libmysql)\n# Create imported target SOCI::soci_mysql" + ) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/soci/vcpkg.json b/externals/vcpkg/ports/soci/vcpkg.json new file mode 100755 index 000000000..03c329444 --- /dev/null +++ b/externals/vcpkg/ports/soci/vcpkg.json @@ -0,0 +1,49 @@ +{ + "name": "soci", + "version": "4.0.2", + "description": "SOCI database access library", + "homepage": "https://github.com/SOCI/soci", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "boost": { + "description": "Integration with Boost", + "dependencies": [ + "boost-date-time", + "boost-fusion", + "boost-optional", + "boost-preprocessor", + "boost-tuple" + ] + }, + "mysql": { + "description": "Build mysql backend", + "dependencies": [ + "libmysql" + ] + }, + "odbc": { + "description": "Build odbc backend" + }, + "postgresql": { + "description": "Build postgresql backend", + "dependencies": [ + "libpq" + ] + }, + "sqlite3": { + "description": "Build sqlite3 backend", + "dependencies": [ + "sqlite3" + ] + } + } +} diff --git a/externals/vcpkg/ports/socket-io-client/fix-file-not-found.patch b/externals/vcpkg/ports/socket-io-client/fix-file-not-found.patch new file mode 100755 index 000000000..b758c7a29 --- /dev/null +++ b/externals/vcpkg/ports/socket-io-client/fix-file-not-found.patch @@ -0,0 +1,49 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -31,20 +31,24 @@ add_definitions( + -D_WEBSOCKETPP_CPP11_FUNCTIONAL_ + ) + ++find_package(websocketpp CONFIG REQUIRED) ++find_package(asio CONFIG REQUIRED) ++find_package(RapidJSON CONFIG REQUIRED) ++ + add_library(sioclient ${ALL_SRC}) + target_include_directories(sioclient PRIVATE + ${CMAKE_CURRENT_LIST_DIR}/src +- ${CMAKE_CURRENT_LIST_DIR}/lib/websocketpp +- ${CMAKE_CURRENT_LIST_DIR}/lib/rapidjson/include +- ${CMAKE_CURRENT_LIST_DIR}/lib/asio/asio/include + ) + + if (CMAKE_VERSION VERSION_GREATER "3.1") + set_property(TARGET sioclient PROPERTY CXX_STANDARD 11) + set_property(TARGET sioclient PROPERTY CXX_STANDARD_REQUIRED ON) + else() + set_property(TARGET sioclient APPEND_STRING PROPERTY COMPILE_FLAGS "-std=c++11") + endif() ++ ++target_link_libraries(sioclient PRIVATE websocketpp::websocketpp asio asio::asio rapidjson) ++ + if(BUILD_SHARED_LIBS) + set_target_properties(sioclient + PROPERTIES +@@ -56,16 +59,13 @@ if(OPENSSL_FOUND) + add_library(sioclient_tls ${ALL_SRC}) + target_include_directories(sioclient_tls PRIVATE + ${CMAKE_CURRENT_LIST_DIR}/src +- ${CMAKE_CURRENT_LIST_DIR}/lib/websocketpp +- ${CMAKE_CURRENT_LIST_DIR}/lib/rapidjson/include +- ${CMAKE_CURRENT_LIST_DIR}/lib/asio/asio/include + ${OPENSSL_INCLUDE_DIR} + ) + + if (CMAKE_VERSION VERSION_GREATER "3.1") + set_property(TARGET sioclient_tls PROPERTY CXX_STANDARD 11) + set_property(TARGET sioclient_tls PROPERTY CXX_STANDARD_REQUIRED ON) +-target_link_libraries(sioclient_tls PRIVATE ${OPENSSL_LIBRARIES} ) ++target_link_libraries(sioclient_tls PRIVATE ${OPENSSL_LIBRARIES} websocketpp::websocketpp asio asio::asio rapidjson) + else() + set_property(TARGET sioclient_tls APPEND_STRING PROPERTY COMPILE_FLAGS "-std=c++11") + endif() diff --git a/externals/vcpkg/ports/socket-io-client/portfile.cmake b/externals/vcpkg/ports/socket-io-client/portfile.cmake new file mode 100755 index 000000000..c5a1dfb32 --- /dev/null +++ b/externals/vcpkg/ports/socket-io-client/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO socketio/socket.io-client-cpp + REF 3.1.0 + SHA512 a0adaa06ddb24297686a40b1e71a55bbab437093f828f76040c376b4adccb7d8b06eff4d8569dbde9b2e071257b3290e7e2bffd6354b33ecf67378ffa1d0cc13 + HEAD_REF master + PATCHES + fix-file-not-found.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/socket-io-client/vcpkg.json b/externals/vcpkg/ports/socket-io-client/vcpkg.json new file mode 100755 index 000000000..aa6a8e52a --- /dev/null +++ b/externals/vcpkg/ports/socket-io-client/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "socket-io-client", + "version": "3.1.0", + "port-version": 1, + "description": "C++11 implementation of Socket.IO client", + "homepage": "https://github.com/socketio/socket.io-client-cpp", + "license": "MIT", + "dependencies": [ + "asio", + "rapidjson", + { + "name": "vcpkg-cmake", + "host": true + }, + "websocketpp" + ] +} diff --git a/externals/vcpkg/ports/sockpp/portfile.cmake b/externals/vcpkg/ports/sockpp/portfile.cmake new file mode 100755 index 000000000..2ab525a96 --- /dev/null +++ b/externals/vcpkg/ports/sockpp/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO fpagliughi/sockpp + REF 999ad87296e34d5a8e4edf15d985315d0d84eda7 + SHA512 159b9288f45d5f5144a002f35caf520e55a66c2d45cdb1fe325021f100db0770601e973b86ec5b032e5bea1542203b30eba3e6be20e03c78f0504b62da1900b3 + HEAD_REF master +) + +vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "\${SOCKPP}-static" "\${SOCKPP}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSOCKPP_BUILD_SHARED=OFF + -DSOCKPP_BUILD_STATIC=ON + -DSOCKPP_BUILD_DOCUMENTATION=OFF + -DSOCKPP_BUILD_EXAMPLES=OFF + -DSOCKPP_BUILD_TESTS=OFF +) + +vcpkg_cmake_install() + +file(INSTALL "${CURRENT_PORT_DIR}/sockppConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/sockpp/sockppConfig.cmake b/externals/vcpkg/ports/sockpp/sockppConfig.cmake new file mode 100755 index 000000000..840b96ed0 --- /dev/null +++ b/externals/vcpkg/ports/sockpp/sockppConfig.cmake @@ -0,0 +1,23 @@ +get_filename_component(_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE) +if(NOT SOCKPP_FIND_COMPONENTS) + set(SOCKPP_FIND_COMPONENTS sockpp) + if(SOCKPP_FIND_REQUIRED) + set(SOCKPP_FIND_REQUIRED_sockpp TRUE) + endif() + set(SOCKPP_FOUND TRUE) +endif() + +set(SOCKPP_INCLUDE_DIRS ${_DIR}/include) +set(SOCKPP_LIBRARIES) +if (EXISTS ${_DIR}/lib/libsockpp.a) + list(APPEND SOCKPP_LIBRARIES optimized ${_DIR}/lib/libsockpp.a) +endif() +if (EXISTS ${_DIR}/debug/lib/libsockpp.a) + list(APPEND SOCKPP_LIBRARIES debug ${_DIR}/debug/lib/libsockpp.a) +endif() +if (EXISTS ${_DIR}/lib/sockpp.lib) + list(APPEND SOCKPP_LIBRARIES optimized ${_DIR}/lib/sockpp.lib) +endif() +if (EXISTS ${_DIR}/debug/lib/sockpp.lib) + list(APPEND SOCKPP_LIBRARIES debug ${_DIR}/debug/lib/sockpp.lib) +endif() diff --git a/externals/vcpkg/ports/sockpp/usage b/externals/vcpkg/ports/sockpp/usage new file mode 100755 index 000000000..5cfb06d29 --- /dev/null +++ b/externals/vcpkg/ports/sockpp/usage @@ -0,0 +1,5 @@ +The package sockpp provides CMake integration: + + find_package(sockpp CONFIG REQUIRED) + target_include_directories(main PRIVATE ${SOCKPP_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${SOCKPP_LIBRARIES}) diff --git a/externals/vcpkg/ports/sockpp/vcpkg.json b/externals/vcpkg/ports/sockpp/vcpkg.json new file mode 100755 index 000000000..07d6f3f00 --- /dev/null +++ b/externals/vcpkg/ports/sockpp/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "sockpp", + "version": "0.7.1", + "port-version": 1, + "description": "Simple, modern, C++ socket library. This is a fairly low-level C++ wrapper around the Berkeley sockets library using socket, acceptor, and connector classes that are familiar concepts from other languages.", + "homepage": "https://github.com/fpagliughi/sockpp", + "license": "BSD-3-Clause", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/soem/disable-werror.patch b/externals/vcpkg/ports/soem/disable-werror.patch new file mode 100755 index 000000000..7c1fd9685 --- /dev/null +++ b/externals/vcpkg/ports/soem/disable-werror.patch @@ -0,0 +1,42 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1778965..4c481b7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,21 +13,18 @@ set(BUILD_TESTS TRUE) + + if(WIN32) + set(OS "win32") +- find_path(winpcap_INCLUDE_DIRS NAMES pcap.h) +- find_library(winpcap_LIBRARY NAMES wpcap) +- find_library(packet_LIBRARY NAMES packet) +- include_directories(${winpcap_INCLUDE_DIRS}) ++ find_path(winpcap_INCLUDE_DIRS NAMES pcap.h) ++ find_library(winpcap_LIBRARY NAMES wpcap) ++ find_library(packet_LIBRARY NAMES packet) ++ include_directories(${winpcap_INCLUDE_DIRS}) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_NO_WARNINGS") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") +- set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib) ++ set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib) + elseif(UNIX AND NOT APPLE) + set(OS "linux") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror") + set(OS_LIBS pthread rt) + elseif(APPLE) + # This must come *before* linux or MacOSX will identify as Unix. + set(OS "macosx") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror") + set(OS_LIBS pthread pcap) + elseif(${CMAKE_SYSTEM_NAME} MATCHES "rt-kernel") + set(OS "rtk") +@@ -36,10 +33,6 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "rt-kernel") + include_directories(oshw/${OS}/${ARCH}) + file(GLOB OSHW_EXTRA_SOURCES oshw/${OS}/${ARCH}/*.c) + set(OSHW_SOURCES "${OS_HW_SOURCES} ${OSHW_ARCHSOURCES}") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-but-set-variable") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-format") + set(OS_LIBS "-Wl,--start-group -l${BSP} -l${ARCH} -lkern -ldev -lsio -lblock -lfs -lusb -llwip -leth -li2c -lrtc -lcan -lnand -lspi -lnor -lpwm -ladc -ltrace -lc -lm -Wl,--end-group") + elseif(${CMAKE_SYSTEM_NAME} MATCHES "rtems") + message("Building for RTEMS") diff --git a/externals/vcpkg/ports/soem/portfile.cmake b/externals/vcpkg/ports/soem/portfile.cmake new file mode 100755 index 000000000..069e40562 --- /dev/null +++ b/externals/vcpkg/ports/soem/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO OpenEtherCATsociety/SOEM + REF abbf0d42e38d6cfbaa4c1e9e8e07ace651c386fd #v1.4.0 + SHA512 2967775c6746bb63becea5eb12f136c184bbf874e1e5e8753374bfc212ec9cefbf1159350e79627b978af3562d261b61c50f38936a425c4d9c70598a1d136817 + HEAD_REF master + PATCHES + winpcap.patch + disable-werror.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/bin + ${CURRENT_PACKAGES_DIR}/debug/bin + ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/soem/vcpkg.json b/externals/vcpkg/ports/soem/vcpkg.json new file mode 100755 index 000000000..8b4dcaab7 --- /dev/null +++ b/externals/vcpkg/ports/soem/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "soem", + "version": "1.4.0", + "port-version": 3, + "description": "Simple Open Source EtherCAT Master", + "homepage": "https://github.com/OpenEtherCATsociety/SOEM", + "supports": "!uwp", + "dependencies": [ + { + "name": "winpcap", + "platform": "windows" + } + ] +} diff --git a/externals/vcpkg/ports/soem/winpcap.patch b/externals/vcpkg/ports/soem/winpcap.patch new file mode 100755 index 000000000..215226e6f --- /dev/null +++ b/externals/vcpkg/ports/soem/winpcap.patch @@ -0,0 +1,23 @@ +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -13,15 +13,13 @@ + + if(WIN32) + set(OS "win32") +- include_directories(oshw/win32/wpcap/Include) +- if(CMAKE_SIZEOF_VOID_P EQUAL 8) +- link_directories(${CMAKE_SOURCE_DIR}/oshw/win32/wpcap/Lib/x64) +- elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) +- link_directories(${CMAKE_SOURCE_DIR}/oshw/win32/wpcap/Lib) +- endif() ++ find_path(winpcap_INCLUDE_DIRS NAMES pcap.h) ++ find_library(winpcap_LIBRARY NAMES wpcap) ++ find_library(packet_LIBRARY NAMES packet) ++ include_directories(${winpcap_INCLUDE_DIRS}) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_NO_WARNINGS") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") +- set(OS_LIBS wpcap.lib Packet.lib Ws2_32.lib Winmm.lib) ++ set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib) + elseif(UNIX AND NOT APPLE) + set(OS "linux") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror") diff --git a/externals/vcpkg/ports/soil/fix-cmakelists.patch b/externals/vcpkg/ports/soil/fix-cmakelists.patch new file mode 100755 index 000000000..406d45eea --- /dev/null +++ b/externals/vcpkg/ports/soil/fix-cmakelists.patch @@ -0,0 +1,45 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c29d9bf..fc66b85 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,7 @@ + cmake_minimum_required(VERSION 2.6) + ++project(soil C) ++ + include_directories(inc) + + ADD_LIBRARY( soil STATIC +@@ -8,3 +10,31 @@ ADD_LIBRARY( soil STATIC + src/image_DXT.c + src/SOIL.c + ) ++ ++target_include_directories(soil INTERFACE $) ++ ++install(TARGETS soil ++ EXPORT soilTargets ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib) ++ ++install(FILES inc/SOIL/SOIL.h ++ DESTINATION include/SOIL) ++ ++# Prepare and install package files ++set(soil_VERSION "2021.4.22") ++ ++export(TARGETS soil FILE "${PROJECT_BINARY_DIR}/soilTargets.cmake") ++ ++export(PACKAGE soil) ++# Create the soilConfig.cmake and soilConfigVersion files ++configure_file(soilConfig.cmake.in "${PROJECT_BINARY_DIR}/soilConfig.cmake" @ONLY) ++configure_file(soilConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/soilConfigVersion.cmake" @ONLY) ++# Install the soilConfig.cmake and soilConfigVersion.cmake ++install(FILES ++ "${PROJECT_BINARY_DIR}/soilConfig.cmake" ++ "${PROJECT_BINARY_DIR}/soilConfigVersion.cmake" ++ DESTINATION "share/soil") ++# Install the export set for use with the install-tree ++install(EXPORT soilTargets DESTINATION ++ "share/soil") +\ No newline at end of file diff --git a/externals/vcpkg/ports/soil/portfile.cmake b/externals/vcpkg/ports/soil/portfile.cmake new file mode 100755 index 000000000..4d591dbe1 --- /dev/null +++ b/externals/vcpkg/ports/soil/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO paralin/soil + REF 8bb18a909f94e58afbc0bda941ffc6eee58b4066 # committed on 2014-03-06 + SHA512 6cbaa10d8b2a274c389fda723db53a3f1ba7d25a7367df40efec4d0553c09f0d67fb16f927bba2ff0aed4234e3a83922edcc574ffac72dd7e05d6cec768b561b + HEAD_REF master + PATCHES fix-cmakelists.patch +) + +file(COPY + ${CMAKE_CURRENT_LIST_DIR}/soilConfig.cmake.in + ${CMAKE_CURRENT_LIST_DIR}/soilConfigVersion.cmake.in + DESTINATION ${SOURCE_PATH} +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/soil/soilConfig.cmake.in b/externals/vcpkg/ports/soil/soilConfig.cmake.in new file mode 100755 index 000000000..0c15a254c --- /dev/null +++ b/externals/vcpkg/ports/soil/soilConfig.cmake.in @@ -0,0 +1,13 @@ +# - Config file for the SOIL package +# It defines the following variables +# SOIL_INCLUDE_DIRS - include directories for SOIL +# SOIL_LIBRARIES - libraries to link against + +# Load targets +get_filename_component(SOIL_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +include("${SOIL_CMAKE_DIR}/soilTargets.cmake") + +# Set properties +get_target_property(SOIL_INCLUDE_DIRS soil INTERFACE_INCLUDE_DIRECTORIES) +set(SOIL_LIBRARIES soil) +mark_as_advanced(SOIL_INCLUDE_DIRS SOIL_LIBRARIES) diff --git a/externals/vcpkg/ports/soil/soilConfigVersion.cmake.in b/externals/vcpkg/ports/soil/soilConfigVersion.cmake.in new file mode 100755 index 000000000..1e3e04965 --- /dev/null +++ b/externals/vcpkg/ports/soil/soilConfigVersion.cmake.in @@ -0,0 +1,11 @@ +set(PACKAGE_VERSION "@SOIL_VERSION@") + +# Check whether the requested PACKAGE_FIND_VERSION is compatible +if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}") + set(PACKAGE_VERSION_COMPATIBLE FALSE) +else() + set(PACKAGE_VERSION_COMPATIBLE TRUE) + if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}") + set(PACKAGE_VERSION_EXACT TRUE) + endif() +endif() diff --git a/externals/vcpkg/ports/soil/vcpkg.json b/externals/vcpkg/ports/soil/vcpkg.json new file mode 100755 index 000000000..11ef3473b --- /dev/null +++ b/externals/vcpkg/ports/soil/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "soil", + "version-date": "2021-04-22", + "port-version": 1, + "description": "SOIL is a tiny C library used primarily for uploading textures into OpenGL.", + "homepage": "https://github.com/paralin/soil", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/soil2/CMakeLists.txt b/externals/vcpkg/ports/soil2/CMakeLists.txt new file mode 100755 index 000000000..ca0b7ca6a --- /dev/null +++ b/externals/vcpkg/ports/soil2/CMakeLists.txt @@ -0,0 +1,84 @@ +cmake_minimum_required(VERSION 3.9) + +# Create the soil2 project +project("soil2" LANGUAGES C) + +find_package(OpenGL) + +# Do we want to install the headers? +option(INSTALL_HEADERS "Install header files" ON) + +# Set the install dir +set(INSTALL_CMAKE_DIR share/soil2) + +# Set the source files to compile +set(SOIL2_SRC + "src/SOIL2/image_DXT.c" + "src/SOIL2/image_DXT.h" + "src/SOIL2/image_helper.c" + "src/SOIL2/image_helper.h" + "src/SOIL2/jo_jpeg.h" + "src/SOIL2/pkm_helper.h" + "src/SOIL2/pvr_helper.h" + "src/SOIL2/SOIL2.c" + "src/SOIL2/SOIL2.h" + "src/SOIL2/stbi_DDS.h" + "src/SOIL2/stbi_DDS_c.h" + "src/SOIL2/stbi_ext.h" + "src/SOIL2/stbi_ext_c.h" + "src/SOIL2/stbi_pkm.h" + "src/SOIL2/stbi_pkm_c.h" + "src/SOIL2/stbi_pvr.h" + "src/SOIL2/stbi_pvr_c.h" + "src/SOIL2/stb_image.h" + "src/SOIL2/stb_image_write.h" + "src/SOIL2/wfETC.c" + "src/SOIL2/wfETC.h" +) + +# Add the library as a static linkage +add_library(soil2 STATIC ${SOIL2_SRC}) + +# The include dir +target_include_directories(soil2 INTERFACE $) + +# link opengl32 +target_link_libraries(soil2 PRIVATE ${OPENGL_gl_LIBRARY}) + +# If its msvc mute the secure warnings +if(MSVC) + target_compile_definitions(soil2 PRIVATE _CRT_SECURE_NO_WARNINGS) +endif(MSVC) + +if(INSTALL_HEADERS) + # Install the library object + install(TARGETS soil2 EXPORT soil2Targets + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + ) + + # Install the headers + install(FILES "src/SOIL2/SOIL2.h" DESTINATION include/SOIL2/) + + # Export the stuff + export(TARGETS soil2 FILE "${PROJECT_BINARY_DIR}/soil2Targets.cmake") + export(PACKAGE soil2) + + # Create the soil2Config.cmake and soil2ConfigVersion.cmake + configure_file(soil2Config.cmake.in "${PROJECT_BINARY_DIR}/soil2Config.cmake" @ONLY) + + # Install the soil2Config.cmake and soil2ConfigVersion.cmake + install(FILES + "${PROJECT_BINARY_DIR}/soil2Config.cmake" + DESTINATION "${INSTALL_CMAKE_DIR}" + ) + + # Install the export set for use with the install-tree + install(EXPORT soil2Targets DESTINATION "${INSTALL_CMAKE_DIR}") +else(INSTALL_HEADERS) + # Install the library object + install(TARGETS soil2 EXPORT soil2 + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + ) +endif(INSTALL_HEADERS) diff --git a/externals/vcpkg/ports/soil2/Workaround-ICE-in-release.patch b/externals/vcpkg/ports/soil2/Workaround-ICE-in-release.patch new file mode 100755 index 000000000..3e9e29aa2 --- /dev/null +++ b/externals/vcpkg/ports/soil2/Workaround-ICE-in-release.patch @@ -0,0 +1,20 @@ +diff --git a/src/SOIL2/SOIL2.c b/src/SOIL2/SOIL2.c +index 3a10885..01bbb23 100644 +--- a/src/SOIL2/SOIL2.c ++++ b/src/SOIL2/SOIL2.c +@@ -2027,6 +2027,7 @@ const char* + return result_string_pointer; + } + ++#pragma optimize("", off) + unsigned int SOIL_direct_load_DDS_from_memory( + const unsigned char *const buffer, + int buffer_length, +@@ -2409,6 +2410,7 @@ unsigned int SOIL_direct_load_DDS_from_memory( + quick_exit: + return tex_ID; + } ++#pragma optimize("", on) + + unsigned int SOIL_direct_load_DDS( + const char *filename, diff --git a/externals/vcpkg/ports/soil2/portfile.cmake b/externals/vcpkg/ports/soil2/portfile.cmake new file mode 100755 index 000000000..b8c223779 --- /dev/null +++ b/externals/vcpkg/ports/soil2/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO SpartanJ/soil2 + REF ddcb35d13cc4129103de1c1a3cb74b828fe46b4a # 1.3.0 + SHA512 627c7bf4fddd5afef85ba7634c5ec0e10005c700abc1eb07c6346c1604e430c34aa4c33f6ffecbecb3dc2b04de7b855a3f6d923e94f23621ae0184e706358908 + HEAD_REF master + PATCHES Workaround-ICE-in-release.patch +) + +file( + COPY + "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" + "${CMAKE_CURRENT_LIST_DIR}/soil2Config.cmake.in" + DESTINATION "${SOURCE_PATH}" +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG -DINSTALL_HEADERS=OFF +) + +vcpkg_cmake_install() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/soil2/soil2Config.cmake.in b/externals/vcpkg/ports/soil2/soil2Config.cmake.in new file mode 100755 index 000000000..4d9d8b4ca --- /dev/null +++ b/externals/vcpkg/ports/soil2/soil2Config.cmake.in @@ -0,0 +1,13 @@ +# - Config file for the soil2 package +# It defines the following variables +# SOIL2_INCLUDE_DIRS - include directories for SOIL2 +# SOIL2_LIBRARIES - libraries to link against + +# Load targets +get_filename_component(SOIL2_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +include("${SOIL2_CMAKE_DIR}/soil2Targets.cmake") + +# Set properties +get_target_property(SOIL2_INCLUDE_DIRS soil2 INTERFACE_INCLUDE_DIRECTORIES) +set(SOIL2_LIBRARIES soil2) +mark_as_advanced(SOIL2_INCLUDE_DIRS SOIL2_LIBRARIES) diff --git a/externals/vcpkg/ports/soil2/vcpkg.json b/externals/vcpkg/ports/soil2/vcpkg.json new file mode 100755 index 000000000..55acddbbb --- /dev/null +++ b/externals/vcpkg/ports/soil2/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "soil2", + "version": "1.3.0", + "description": "Simple OpenGL Image Library 2", + "homepage": "https://github.com/SpartanJ/SOIL2", + "license": "MIT-0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/sokol/portfile.cmake b/externals/vcpkg/ports/sokol/portfile.cmake new file mode 100755 index 000000000..9785eecca --- /dev/null +++ b/externals/vcpkg/ports/sokol/portfile.cmake @@ -0,0 +1,18 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO floooh/sokol + REF 425e906d2af8c976c30f7e925a303fea9f0bf879 + SHA512 4606735b9466637f3b676402cc2d7ef96e4152836c901d7a84039c52951aec27922726de21a537e0fef2d2218f48e3a9a3c32c3bc67076c10d199f067f50dad9 + HEAD_REF master +) + +file(GLOB SOKOL_INCLUDE_FILES ${SOURCE_PATH}/*.h) +file(COPY ${SOKOL_INCLUDE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +file(GLOB SOKOL_UTIL_INCLUDE_FILES ${SOURCE_PATH}/util/*.h) +file(COPY ${SOKOL_UTIL_INCLUDE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/util) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/sokol/vcpkg.json b/externals/vcpkg/ports/sokol/vcpkg.json new file mode 100755 index 000000000..375455b94 --- /dev/null +++ b/externals/vcpkg/ports/sokol/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "sokol", + "version-string": "2019-09-09", + "port-version": 1, + "description": "Minimal cross-platform standalone C headers", + "homepage": "https://github.com/floooh/sokol" +} diff --git a/externals/vcpkg/ports/sol2/fix-namespace.patch b/externals/vcpkg/ports/sol2/fix-namespace.patch new file mode 100755 index 000000000..bcce158db --- /dev/null +++ b/externals/vcpkg/ports/sol2/fix-namespace.patch @@ -0,0 +1,19 @@ +diff --git a/cmake/sol2-config.cmake.in b/cmake/sol2-config.cmake.in +index 70c448d..7965bc6 100644 +--- a/cmake/sol2-config.cmake.in ++++ b/cmake/sol2-config.cmake.in +@@ -26,11 +26,11 @@ include("${CMAKE_CURRENT_LIST_DIR}/sol2-targets.cmake") + + MESSAGE(STATUS ${CMAKE_CURRENT_LIST_DIR}) + +-if (TARGET sol2) ++if (TARGET sol2::sol2) + get_target_property(SOL2_INCLUDE_DIRS +- sol2 INTERFACE_INCLUDE_DIRECTORIES) ++ sol2::sol2 INTERFACE_INCLUDE_DIRECTORIES) + set_and_check(SOL2_INCLUDE_DIRS "${SOL2_INCLUDE_DIRS}") +- set(SOL2_LIBRARIES sol2) ++ set(SOL2_LIBRARIES sol2::sol2) + endif() + + if(TARGET sol2_single) diff --git a/externals/vcpkg/ports/sol2/portfile.cmake b/externals/vcpkg/ports/sol2/portfile.cmake new file mode 100755 index 000000000..901aeb51f --- /dev/null +++ b/externals/vcpkg/ports/sol2/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ThePhD/sol2 + REF v3.2.2 + SHA512 e5a739b37aea7150f141f6a003c2689dd33155feed5bb3cf2569abbfe9f0062eacdaaf346be523d627f0e491b35e68822c80e1117fa09ece8c9d8d5af09fdbec + HEAD_REF develop + PATCHES fix-namespace.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sol2) + +file( + REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug + ${CURRENT_PACKAGES_DIR}/lib + ${CURRENT_PACKAGES_DIR}/include +) + +file(INSTALL ${SOURCE_PATH}/single/include/sol DESTINATION ${CURRENT_PACKAGES_DIR}/include/) + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/sol2/vcpkg.json b/externals/vcpkg/ports/sol2/vcpkg.json new file mode 100755 index 000000000..54c8837d5 --- /dev/null +++ b/externals/vcpkg/ports/sol2/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "sol2", + "version-string": "3.2.2", + "port-version": 2, + "description": "Sol v2.0 - a C++ <-> Lua API wrapper with advanced features and top notch performance - is here, and it's great", + "homepage": "https://github.com/ThePhD/sol2", + "dependencies": [ + { + "name": "lua", + "platform": "windows" + } + ] +} diff --git a/externals/vcpkg/ports/solid3/disable-examples.patch b/externals/vcpkg/ports/solid3/disable-examples.patch new file mode 100755 index 000000000..5af3b2645 --- /dev/null +++ b/externals/vcpkg/ports/solid3/disable-examples.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0303a8f..be43838 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -97,7 +97,7 @@ if(UNIX) + endif(UNIX) + + add_subdirectory(src) +-add_subdirectory(examples) ++#add_subdirectory(examples) + #add_subdirectory(doc) + + include(CMakePackageConfigHelpers) diff --git a/externals/vcpkg/ports/solid3/portfile.cmake b/externals/vcpkg/ports/solid3/portfile.cmake new file mode 100755 index 000000000..8cca23ada --- /dev/null +++ b/externals/vcpkg/ports/solid3/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO dtecta/solid3 + REF c53f6bb1eaaafb1cfb305ef71b1c3a2edb4844e6 + SHA512 ae42ba75f5309fecba836e5786d4cb81eeb1240f6fd7c458c6d1329d8e1075021504b927ea0aedb66162deeb79ad674cacb0190385afe456420c0d9184596f1f + HEAD_REF master + PATCHES + disable-examples.patch + potentially-uninitialized-local-pointer-variable.patch +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(DYNAMIC_SOLID OFF) +else() + set(DYNAMIC_SOLID ON) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DDYNAMIC_SOLID=${DYNAMIC_SOLID} +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/solid3) + +file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/solid3) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/solid3/README.md ${CURRENT_PACKAGES_DIR}/share/solid3/copyright) +file(COPY ${SOURCE_PATH}/LICENSE_GPL.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/solid3) +file(COPY ${SOURCE_PATH}/LICENSE_QPL.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/solid3) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/externals/vcpkg/ports/solid3/potentially-uninitialized-local-pointer-variable.patch b/externals/vcpkg/ports/solid3/potentially-uninitialized-local-pointer-variable.patch new file mode 100755 index 000000000..baec56793 --- /dev/null +++ b/externals/vcpkg/ports/solid3/potentially-uninitialized-local-pointer-variable.patch @@ -0,0 +1,26 @@ +diff --git a/src/qhull/geom2.c b/src/qhull/geom2.c +index bd58ce1..c4798d2 100644 +--- a/src/qhull/geom2.c ++++ b/src/qhull/geom2.c +@@ -2080,7 +2080,7 @@ boolT qh_sharpnewfacets () { + pointT *qh_voronoi_center (int dim, setT *points) { + pointT *point, **pointp, *point0; + pointT *center= (pointT*)qh_memalloc (qh center_size); +- setT *simplex; ++ setT *simplex= NULL; + int i, j, k, size= qh_setsize(points); + coordT *gmcoord; + realT *diffp, sum2, *sum2row, *sum2p, det, factor; +diff --git a/src/qhull/io.c b/src/qhull/io.c +index 79ca799..41c18bc 100644 +--- a/src/qhull/io.c ++++ b/src/qhull/io.c +@@ -3740,7 +3740,7 @@ coordT *qh_readpoints(int *numpoints, int *dimension, boolT *ismalloc) { + coordT *points, *coords, *infinity= NULL; + realT paraboloid, maxboloid= -REALmax, value; + realT *coordp= NULL, *offsetp= NULL, *normalp= NULL; +- char *s, *t, firstline[qh_MAXfirst+1]; ++ char *s= NULL, *t, firstline[qh_MAXfirst+1]; + int diminput=0, numinput=0, dimfeasible= 0, newnum, k, tempi; + int firsttext=0, firstshort=0, firstlong=0, firstpoint=0; + int tokcount= 0, linecount=0, maxcount, coordcount=0; diff --git a/externals/vcpkg/ports/solid3/vcpkg.json b/externals/vcpkg/ports/solid3/vcpkg.json new file mode 100755 index 000000000..d8493859d --- /dev/null +++ b/externals/vcpkg/ports/solid3/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "solid3", + "version-string": "3.5.8", + "port-version": 1, + "description": "Software Library for Interference Detection" +} diff --git a/externals/vcpkg/ports/sophus/portfile.cmake b/externals/vcpkg/ports/sophus/portfile.cmake new file mode 100755 index 000000000..81cdf077d --- /dev/null +++ b/externals/vcpkg/ports/sophus/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO strasdat/Sophus + REF 49a7e1286910019f74fb4f0bb3e213c909f8e1b7 + SHA512 d415aff722a6aff91b4f787804496fb534ad44ada8ce6f03adcf9e23dbf2e080af8d3d973b8cd2b5a024da856b76e4f5e45e60bf7c2a0500f9a77aa7b4e938e0 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_SOPHUS_TESTS=OFF + -DBUILD_SOPHUS_EXAMPLES=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/sophus/cmake) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/sophus/vcpkg.json b/externals/vcpkg/ports/sophus/vcpkg.json new file mode 100755 index 000000000..5982c622d --- /dev/null +++ b/externals/vcpkg/ports/sophus/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "sophus", + "version-date": "2021-09-14", + "description": "Lie group library for C++", + "homepage": "https://github.com/strasdat/Sophus", + "license": "MIT", + "dependencies": [ + "ceres", + "eigen3", + "fmt", + "suitesparse", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/soqt/disable-cpackd.patch b/externals/vcpkg/ports/soqt/disable-cpackd.patch new file mode 100755 index 000000000..1450b2de3 --- /dev/null +++ b/externals/vcpkg/ports/soqt/disable-cpackd.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 802e512c..21cc23a9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -393,4 +393,4 @@ add_subdirectory(test-code) + + ############################################################################ + # New CPACK section, please see the README file inside cpack.d directory. +-add_subdirectory(cpack.d) ++#add_subdirectory(cpack.d) diff --git a/externals/vcpkg/ports/soqt/disable-test-code.patch b/externals/vcpkg/ports/soqt/disable-test-code.patch new file mode 100755 index 000000000..3e1216a92 --- /dev/null +++ b/externals/vcpkg/ports/soqt/disable-test-code.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4b0815f2..236ffa8d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -390,7 +390,7 @@ set(PACKAGE_REQUIREMENTS "Coin, ${PACKAGE_ADDITIONAL_REQUIREMENTS}") + add_subdirectory(data) + add_subdirectory(src) + ##### small test programs (to be run interactively) +-add_subdirectory(test-code) ++#add_subdirectory(test-code) + + ############################################################################ + # New CPACK section, please see the README file inside cpack.d directory. diff --git a/externals/vcpkg/ports/soqt/portfile.cmake b/externals/vcpkg/ports/soqt/portfile.cmake new file mode 100755 index 000000000..de7bae0da --- /dev/null +++ b/externals/vcpkg/ports/soqt/portfile.cmake @@ -0,0 +1,58 @@ + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Coin3D/soqt + REF SoQt-1.6.0 + SHA512 204d49769dda1a9833093ff78bdb788df0c514e800ae0bc35d4ef832ece304c7c26fc7d893ee83db95c34d9457e27e04c74301bcd2029aa3a0f96ec2ecbb3984 + HEAD_REF master + PATCHES + disable-cpackd.patch + disable-test-code.patch +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOANYDATA_SOURCE_PATH + REPO coin3d/soanydata + REF 3ff6e9203fbb0cc08a2bdf209212b7ef4d78a1f2 + SHA512 9e176feda43a12ccdf8756f7329517936357499771a7d0a58357d343bdea125c34f8734ff1cd16cda3eeee58090dc1680999849c50132c30940a23d3f81a5c66 + HEAD_REF master +) + +if(NOT EXISTS "${SOURCE_PATH}/data") + file(RENAME "${SOANYDATA_SOURCE_PATH}" "${SOURCE_PATH}/data") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOGUI_SOURCE_PATH + REPO coin3d/sogui + REF fb79af47cff89f0f3657501601a7ea5c11968b17 + SHA512 bcf4d2e04c3b6ac87a6425d90c6077ec655732bcc0f99bf181ff2dfce8d356509f52d71b884660fafddc135551ee8fbb139e02b6706d2a01be006193918d232b + HEAD_REF master +) + +if(NOT EXISTS "${SOURCE_PATH}/src/Inventor/Qt/common") + file(RENAME "${SOGUI_SOURCE_PATH}" "${SOURCE_PATH}/src/Inventor/Qt/common") +endif() + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SOQT_BUILD_SHARED_LIBS) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSOQT_BUILD_DOCUMENTATION=OFF + -DSOQT_BUILD_SHARED_LIBS=${SOQT_BUILD_SHARED_LIBS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +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) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/externals/vcpkg/ports/soqt/vcpkg.json b/externals/vcpkg/ports/soqt/vcpkg.json new file mode 100755 index 000000000..6125dd237 --- /dev/null +++ b/externals/vcpkg/ports/soqt/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "soqt", + "version": "1.6.0", + "port-version": 4, + "description": "A Qt Gui-toolkit binding for Coin", + "homepage": "https://github.com/coin3d/soqt", + "supports": "!(arm | arm64 | uwp)", + "dependencies": [ + "coin", + { + "name": "qt5-base", + "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/sord/CMakeLists.txt b/externals/vcpkg/ports/sord/CMakeLists.txt new file mode 100755 index 000000000..be83dc278 --- /dev/null +++ b/externals/vcpkg/ports/sord/CMakeLists.txt @@ -0,0 +1,55 @@ +cmake_minimum_required(VERSION 3.17) +project(sord C) + +find_package(serd CONFIG REQUIRED) + +add_library(sord + src/sord.c + src/syntax.c +) + +file(WRITE "${CMAKE_BINARY_DIR}/sord_config.h" "") + +target_include_directories(sord + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/src" "${CMAKE_BINARY_DIR}" +) + +target_link_libraries(sord PUBLIC serd::serd) + +set_target_properties(sord PROPERTIES + C_STANDARD 99 + C_STANDARD_REQUIRED ON +) + +target_compile_definitions(sord PRIVATE SORD_INTERNAL _CRT_SECURE_NO_WARNINGS) + +if(BUILD_SHARED_LIBS) + target_compile_definitions(sord PUBLIC SORD_SHARED) +endif() + +install( + TARGETS sord + EXPORT sord-targets + INCLUDES DESTINATION include +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(DIRECTORY sord DESTINATION include) +endif() + +install( + EXPORT sord-targets + NAMESPACE sord:: + DESTINATION "${CMAKE_INSTALL_PREFIX}/share/sord" +) + +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/sord-config.cmake" [[ +include(CMakeFindDependencyMacro) +find_dependency(serd CONFIG) +include("${CMAKE_CURRENT_LIST_DIR}/sord-targets.cmake") +]]) + +install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/sord-config.cmake" + DESTINATION "${CMAKE_INSTALL_PREFIX}/share/sord" +) diff --git a/externals/vcpkg/ports/sord/portfile.cmake b/externals/vcpkg/ports/sord/portfile.cmake new file mode 100755 index 000000000..6725863d5 --- /dev/null +++ b/externals/vcpkg/ports/sord/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.com + OUT_SOURCE_PATH SOURCE_PATH + REPO drobilla/sord + REF v0.16.4 + SHA512 cad8f8fd07afb5075938fce247d95f9d666f61f4d913ff0c3fde335384177de066a5c0f2620c76e098178aeded0412b3e76ef63a1ae65aba7eb99e3e8ce15896 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1 +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() +file( + INSTALL "${SOURCE_PATH}/COPYING" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/externals/vcpkg/ports/sord/vcpkg.json b/externals/vcpkg/ports/sord/vcpkg.json new file mode 100755 index 000000000..51dacf793 --- /dev/null +++ b/externals/vcpkg/ports/sord/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "sord", + "version-string": "0.16.4", + "description": "Sord is a lightweight C library for storing RDF statements in memory.", + "homepage": "https://drobilla.net/software/sord", + "license": "ISC", + "dependencies": [ + "serd" + ] +} diff --git a/externals/vcpkg/ports/soundtouch/portfile.cmake b/externals/vcpkg/ports/soundtouch/portfile.cmake new file mode 100755 index 000000000..0e2ad0626 --- /dev/null +++ b/externals/vcpkg/ports/soundtouch/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + GITHUB_HOST https://codeberg.org + REPO soundtouch/soundtouch + REF 2.3.1 + SHA512 c9d110b06cafb79968c94c4d206360b9ea9673d63eaf1470b097a39acf18b5b9cd53759f2656ff8963c6eee6a36fecdf1ea9aa7dc014fbf8bbee0dcfb8e4e438 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + soundstretch SOUNDSTRETCH + soundtouchdll SOUNDTOUCH_DLL +) + +if(SOUNDTOUCH_DLL) + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} +) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SoundTouch) +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +if(SOUNDSTRETCH) + vcpkg_copy_tools(TOOL_NAMES soundstretch AUTO_CLEAN) +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/externals/vcpkg/ports/soundtouch/vcpkg.json b/externals/vcpkg/ports/soundtouch/vcpkg.json new file mode 100755 index 000000000..645d9b391 --- /dev/null +++ b/externals/vcpkg/ports/soundtouch/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "soundtouch", + "version": "2.3.1", + "port-version": 2, + "description": "SoundTouch is an open-source audio processing library for changing the Tempo, Pitch and Playback Rates of audio streams or audio files.", + "homepage": "https://www.surina.net/soundtouch", + "supports": "!uwp", + "dependencies": [ + { + "name": "atlmfc", + "platform": "windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "soundstretch": { + "description": "Build the soundstretch command line tool" + }, + "soundtouchdll": { + "description": "Build the SoundTouchDLL C wrapper dynamic library" + } + } +} diff --git a/externals/vcpkg/ports/soxr/001_initialize-resampler.patch b/externals/vcpkg/ports/soxr/001_initialize-resampler.patch new file mode 100755 index 000000000..6be5f29bd --- /dev/null +++ b/externals/vcpkg/ports/soxr/001_initialize-resampler.patch @@ -0,0 +1,13 @@ +diff --git a/src/soxr.c b/src/soxr.c +index c2861ac..c95cfd4 100644 +--- a/src/soxr.c ++++ b/src/soxr.c +@@ -815,7 +815,7 @@ soxr_error_t soxr_oneshot( + soxr_quality_spec_t const * q_spec, + soxr_runtime_spec_t const * runtime_spec) + { +- soxr_t resampler; ++ soxr_t resampler = NULL; + soxr_error_t error = q_spec? q_spec->e : 0; + if (!error) { + soxr_quality_spec_t q_spec1; diff --git a/externals/vcpkg/ports/soxr/002_disable_warning.patch b/externals/vcpkg/ports/soxr/002_disable_warning.patch new file mode 100755 index 000000000..fc8550187 --- /dev/null +++ b/externals/vcpkg/ports/soxr/002_disable_warning.patch @@ -0,0 +1,12 @@ +diff --git a/src/pffft.c b/src/pffft.c +index 46c841e..0686bef 100644 +--- a/src/pffft.c ++++ b/src/pffft.c +@@ -182,7 +182,6 @@ typedef float32x4_t v4sf; + # define VALIGNED(ptr) ((((long)(ptr)) & 0x3) == 0) + #else + # if !defined(PFFFT_SIMD_DISABLE) +-# warning "building with simd disabled !\n"; + # define PFFFT_SIMD_DISABLE /* fallback to scalar code */ + # endif + #endif diff --git a/externals/vcpkg/ports/soxr/003_detect_arm_on_windows.patch b/externals/vcpkg/ports/soxr/003_detect_arm_on_windows.patch new file mode 100755 index 000000000..f1643fb63 --- /dev/null +++ b/externals/vcpkg/ports/soxr/003_detect_arm_on_windows.patch @@ -0,0 +1,13 @@ +diff --git a/src/pffft.c b/src/pffft.c +index 0686bef..e4cb094 100644 +--- a/src/pffft.c ++++ b/src/pffft.c +@@ -157,7 +157,7 @@ typedef __m128 v4sf; + /* + ARM NEON support macros + */ +-#elif !defined(PFFFT_SIMD_DISABLE) && defined(__arm__) ++#elif !defined(PFFFT_SIMD_DISABLE) && (defined(__arm__) || defined(_M_ARM)) + # include + typedef float32x4_t v4sf; + # define SIMD_SZ 4 diff --git a/externals/vcpkg/ports/soxr/portfile.cmake b/externals/vcpkg/ports/soxr/portfile.cmake new file mode 100755 index 000000000..63070fcb4 --- /dev/null +++ b/externals/vcpkg/ports/soxr/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO soxr + FILENAME "soxr-0.1.3-Source.tar.xz" + SHA512 f4883ed298d5650399283238aac3dbe78d605b988246bea51fa343d4a8ce5ce97c6e143f6c3f50a3ff81795d9c19e7a07217c586d4020f6ced102aceac46aaa8 + PATCHES + 001_initialize-resampler.patch + 002_disable_warning.patch + 003_detect_arm_on_windows.patch +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openmp WITH_OPENMP + lsr-bindings WITH_LSR_BINDINGS +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" BUILD_SHARED_RUNTIME) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTS=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_SHARED_RUNTIME=${BUILD_SHARED_RUNTIME} + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +file(INSTALL "${SOURCE_PATH}/LICENCE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/doc") + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/soxr/vcpkg.json b/externals/vcpkg/ports/soxr/vcpkg.json new file mode 100755 index 000000000..ec6f10990 --- /dev/null +++ b/externals/vcpkg/ports/soxr/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "soxr", + "version": "0.1.3", + "port-version": 6, + "description": "High quality audio resampling", + "homepage": "https://sourceforge.net/projects/soxr/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "lsr-bindings": { + "description": "Include a `libsamplerate'-like interface." + }, + "openmp": { + "description": "Include OpenMP threading." + } + } +} diff --git a/externals/vcpkg/ports/spaceland/portfile.cmake b/externals/vcpkg/ports/spaceland/portfile.cmake new file mode 100755 index 000000000..2897f7367 --- /dev/null +++ b/externals/vcpkg/ports/spaceland/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_download_distfile(ARCHIVE + URLS "http://vic.crs4.it/vic/download/pkgs/sl-7.8.2-Source.tar.gz" + FILENAME "sl-7.8.2-Source.tar.gz" + SHA512 1391dac1474ddb47d0cf0eb7baeb7db68d6356c2116f732dd57b8a050739523282ded0643cc466640f2b22f25dd6bfced00ede4e041b7ff83754a99ae6725d7d +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DSL_TEST=OFF + -DSL_INSTALL_SLFIND_MODULE=OFF + OPTIONS_DEBUG + -DSL_TEST=OFF + -DSL_INSTALL_SLFIND_MODULE=OFF +) + +vcpkg_install_cmake() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/spaceland/vcpkg.json b/externals/vcpkg/ports/spaceland/vcpkg.json new file mode 100755 index 000000000..ddcdb9fde --- /dev/null +++ b/externals/vcpkg/ports/spaceland/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "spaceland", + "version-string": "7.8.2", + "port-version": 5, + "description": "Spaceland Lib (sl) is a suite for geometric computation, specifically adapted to OpenGL.", + "dependencies": [ + "zlib" + ] +} diff --git a/externals/vcpkg/ports/span-lite/portfile.cmake b/externals/vcpkg/ports/span-lite/portfile.cmake new file mode 100755 index 000000000..fcf8b9210 --- /dev/null +++ b/externals/vcpkg/ports/span-lite/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO martinmoene/span-lite + REF v0.10.3 + SHA512 001259FEC3F043391D8C00D858841823F7F88B56884AE73FA0D08F71CD35FAC636DDCC323FE5AAA7E680BDE6092E693F810DA821E8E3ADE29C6D73ED46DB3609 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSPAN_LITE_OPT_BUILD_TESTS=OFF + -DSPAN_LITE_OPT_BUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + CONFIG_PATH "lib/cmake/${PORT}" +) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" +) + +file(INSTALL + "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright +) diff --git a/externals/vcpkg/ports/span-lite/vcpkg.json b/externals/vcpkg/ports/span-lite/vcpkg.json new file mode 100755 index 000000000..43526240e --- /dev/null +++ b/externals/vcpkg/ports/span-lite/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "span-lite", + "version": "0.10.3", + "description": "A C++20-like span for C++98, C++11 and later in a single-file header-only library", + "homepage": "https://github.com/martinmoene/span-lite", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/sparsehash/Config.cmake.in b/externals/vcpkg/ports/sparsehash/Config.cmake.in new file mode 100755 index 000000000..07739ddb6 --- /dev/null +++ b/externals/vcpkg/ports/sparsehash/Config.cmake.in @@ -0,0 +1,10 @@ + +get_filename_component(_sparsehash_root "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_sparsehash_root "${_sparsehash_root}" PATH) +get_filename_component(_sparsehash_root "${_sparsehash_root}" PATH) + +add_library(sparsehash::sparsehash INTERFACE IMPORTED) +set_target_properties(sparsehash::sparsehash + PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_sparsehash_root}/include") + +unset(_sparsehash_root) diff --git a/externals/vcpkg/ports/sparsehash/portfile.cmake b/externals/vcpkg/ports/sparsehash/portfile.cmake new file mode 100755 index 000000000..876726cd4 --- /dev/null +++ b/externals/vcpkg/ports/sparsehash/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sparsehash/sparsehash + REF sparsehash-2.0.4 + SHA512 40C007BC5814DD5F2BDACD5EC884BC5424F7126F182D4C7B34371F88B674456FC193B947FDD283DBD0C7EB044D8F06BAF8CAEC6C93E73B1B587282B9026EA877 + HEAD_REF master +) + +if(VCPKG_TARGET_IS_WINDOWS) + + file(COPY ${SOURCE_PATH}/src/google DESTINATION ${CURRENT_PACKAGES_DIR}/include) + file(COPY ${SOURCE_PATH}/src/sparsehash DESTINATION ${CURRENT_PACKAGES_DIR}/include) + file(COPY ${SOURCE_PATH}/src/windows/sparsehash/internal/sparseconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/sparsehash/internal) + +else() + + vcpkg_execute_required_process( + COMMAND ${SOURCE_PATH}/configure ${OPTIONS} --prefix=${CURRENT_PACKAGES_DIR} + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME configure-${TARGET_TRIPLET} + ) + + vcpkg_execute_required_process( + COMMAND make -j ${VCPKG_CONCURRENCY} install + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME install-${TARGET_TRIPLET} + ) + +endif() + +configure_file( + ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in + ${CURRENT_PACKAGES_DIR}/share/sparsehash/sparsehash-config.cmake + @ONLY +) + +configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/sparsehash/copyright COPYONLY) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/sparsehash) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/sparsehash/usage b/externals/vcpkg/ports/sparsehash/usage new file mode 100755 index 000000000..5222b2402 --- /dev/null +++ b/externals/vcpkg/ports/sparsehash/usage @@ -0,0 +1,4 @@ +The package sparsehash provides CMake targets: + + find_package(sparsehash CONFIG REQUIRED) + target_link_libraries(main PRIVATE sparsehash::sparsehash) diff --git a/externals/vcpkg/ports/sparsehash/vcpkg.json b/externals/vcpkg/ports/sparsehash/vcpkg.json new file mode 100755 index 000000000..9882cefac --- /dev/null +++ b/externals/vcpkg/ports/sparsehash/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "sparsehash", + "version": "2.0.4", + "port-version": 2, + "description": "The sparsehash package consists of two hashtable implementations: sparse, which is designed to be very space efficient, and dense, which is designed to be very time efficient.", + "homepage": "https://github.com/sparsehash/sparsehash" +} diff --git a/externals/vcpkg/ports/sparsepp/CMakeLists.txt b/externals/vcpkg/ports/sparsepp/CMakeLists.txt new file mode 100755 index 000000000..36d304ce5 --- /dev/null +++ b/externals/vcpkg/ports/sparsepp/CMakeLists.txt @@ -0,0 +1,18 @@ +cmake_minimum_required (VERSION 3.9) +project (sparsepp) + +set(HEADERS + sparsepp/spp.h + sparsepp/spp_config.h + sparsepp/spp_dlalloc.h + sparsepp/spp_memory.h + sparsepp/spp_smartptr.h + sparsepp/spp_stdint.h + sparsepp/spp_timer.h + sparsepp/spp_traits.h + sparsepp/spp_utils.h + ) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES ${HEADERS} DESTINATION include/sparsepp) +endif() diff --git a/externals/vcpkg/ports/sparsepp/portfile.cmake b/externals/vcpkg/ports/sparsepp/portfile.cmake new file mode 100755 index 000000000..c326c214c --- /dev/null +++ b/externals/vcpkg/ports/sparsepp/portfile.cmake @@ -0,0 +1,30 @@ + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO greg7mdp/sparsepp + REF 1.22 + SHA512 b660cd7de48fcab50d4a0df4e4813226b0b0a8a3791aba4e4cc6a456af7bba0be6694bc44781a7d00b5582b32b1d85b9afa83095b7e5c0a26d1b0344ddc94b0f + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +# Note: we could add: OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON +# but it's an header only package, so there's no INSTALL target. So +# we remove the duplicate headers. + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sparsepp RENAME copyright) diff --git a/externals/vcpkg/ports/sparsepp/vcpkg.json b/externals/vcpkg/ports/sparsepp/vcpkg.json new file mode 100755 index 000000000..9dda35239 --- /dev/null +++ b/externals/vcpkg/ports/sparsepp/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "sparsepp", + "version-string": "1.22", + "port-version": 2, + "description": "A fast, memory efficient hash map for C++" +} diff --git a/externals/vcpkg/ports/spatialite-tools/fix-makefiles.patch b/externals/vcpkg/ports/spatialite-tools/fix-makefiles.patch new file mode 100755 index 000000000..8512f5431 --- /dev/null +++ b/externals/vcpkg/ports/spatialite-tools/fix-makefiles.patch @@ -0,0 +1,134 @@ +diff --git a/makefile.vc b/makefile.vc +index 53ef75197..d48fb02db 100644 +--- a/makefile.vc ++++ b/makefile.vc +@@ -16,7 +16,7 @@ SPATIALITE_OSM_RAW_EXE = spatialite_osm_raw.exe + SPATIALITE_OSM_FILTER_EXE = spatialite_osm_filter.exe + SPATIALITE_GML_EXE = spatialite_gml.exe + +-CFLAGS = /nologo -IC:\OSGeo4W\include $(OPTFLAGS) ++CFLAGS = /nologo $(OPTFLAGS) + + default: all + +@@ -27,96 +27,63 @@ all: $(SPATIALITE_EXE) $(SHP_DOCTOR_EXE) $(SPATIALITE_TOOL_EXE) \ + $(SPATIALITE_OSM_FILTER_EXE) $(SHP_SANITIZE_EXE) + + $(SPATIALITE_EXE): shell.obj +- cl shell.obj C:\OSGeo4W\lib\proj_i.lib \ +- C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \ +- C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib \ +- /Fe$(SPATIALITE_EXE) ++ cl shell.obj /Fe$(SPATIALITE_EXE) $(LIBS_ALL) + if exist $(SPATIALITE_EXE).manifest mt -manifest \ + $(SPATIALITE_EXE).manifest -outputresource:$(SPATIALITE_EXE);1 + + $(EXIF_LOADER_EXE): exif_loader.obj +- cl exif_loader.obj C:\OSGeo4W\lib\proj_i.lib \ +- C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \ +- C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib ++ cl exif_loader.obj $(LIBS_ALL) + if exist $(EXIF_LOADER_EXE).manifest mt -manifest \ + $(EXIF_LOADER_EXE).manifest -outputresource:$(EXIF_LOADER_EXE);1 + + $(SHP_DOCTOR_EXE): shp_doctor.obj +- cl shp_doctor.obj C:\OSGeo4W\lib\proj_i.lib \ +- C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \ +- C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib ++ cl shp_doctor.obj $(LIBS_ALL) + if exist $(SHP_DOCTOR_EXE).manifest mt -manifest \ + $(SHP_DOCTOR_EXE).manifest -outputresource:$(SHP_DOCTOR_EXE);1 + + $(SHP_SANITIZE_EXE): shp_sanitize.obj +- cl shp_sanitize.obj C:\OSGeo4W\lib\proj_i.lib \ +- C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \ +- C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib ++ cl shp_sanitize.obj $(LIBS_ALL) + if exist $(SHP_SANITIZE_EXE).manifest mt -manifest \ + $(SHP_SANITIZE_EXE).manifest -outputresource:$(SHP_SANITIZE_EXE);1 + + $(SPATIALITE_NETWORK_EXE): spatialite_network.obj +- cl spatialite_network.obj C:\OSGeo4W\lib\proj_i.lib \ +- C:\OSGeo4W\lib\iconv.lib \ +- C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib ++ cl spatialite_network.obj $(LIBS_ALL) + if exist $(SPATIALITE_NETWORK_EXE).manifest mt -manifest \ + $(SPATIALITE_TOOL_EXE).manifest \ + -outputresource:$(SPATIALITE_TOOL_EXE);1 + + $(SPATIALITE_TOOL_EXE): spatialite_tool.obj +- cl spatialite_tool.obj C:\OSGeo4W\lib\proj_i.lib \ +- C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \ +- C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib ++ cl spatialite_tool.obj $(LIBS_ALL) + if exist $(SPATIALITE_TOOL_EXE).manifest mt -manifest \ + $(SPATIALITE_TOOL_EXE).manifest \ + -outputresource:$(SPATIALITE_TOOL_EXE);1 + + $(SPATIALITE_OSM_NET_EXE): spatialite_osm_net.obj +- cl spatialite_osm_net.obj C:\OSGeo4W\lib\proj_i.lib \ +- C:\OSGeo4W\lib\iconv.lib \ +- C:\OSGeo4W\lib\readosm_i.lib \ +- C:\OSGeo4W\lib\libexpat.lib \ +- C:\OSGeo4W\lib\zlib.lib \ +- C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib ++ cl spatialite_osm_net.obj $(LIBS_ALL) + if exist $(SPATIALITE_OSM_EXE).manifest mt -manifest \ + $(SPATIALITE_OSM_EXE).manifest \ + -outputresource:$(SPATIALITE_OSM_NET_EXE);1 + + $(SPATIALITE_OSM_MAP_EXE): spatialite_osm_map.obj +- cl spatialite_osm_map.obj C:\OSGeo4W\lib\proj_i.lib \ +- C:\OSGeo4W\lib\iconv.lib \ +- C:\OSGeo4W\lib\readosm_i.lib \ +- C:\OSGeo4W\lib\libexpat.lib \ +- C:\OSGeo4W\lib\zlib.lib \ +- C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib ++ cl spatialite_osm_map.obj $(LIBS_ALL) + if exist $(SPATIALITE_OSM_MAP_EXE).manifest mt -manifest \ + $(SPATIALITE_OSM_MAP_EXE).manifest \ + -outputresource:$(SPATIALITE_OSM_MAP_EXE);1 + + $(SPATIALITE_GML_EXE): spatialite_gml.obj +- cl spatialite_gml.obj C:\OSGeo4W\lib\proj_i.lib \ +- C:\OSGeo4W\lib\iconv.lib \ +- C:\OSGeo4W\lib\libexpat.lib \ +- C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib ++ cl spatialite_gml.obj $(LIBS_ALL) + if exist $(SPATIALITE_GML_EXE).manifest mt -manifest \ + $(SPATIALITE_GML_EXE).manifest \ + -outputresource:$(SPATIALITE_GML_EXE);1 + + $(SPATIALITE_OSM_RAW_EXE): spatialite_osm_raw.obj +- cl spatialite_osm_raw.obj C:\OSGeo4W\lib\proj_i.lib \ +- C:\OSGeo4W\lib\iconv.lib \ +- C:\OSGeo4W\lib\readosm_i.lib \ +- C:\OSGeo4W\lib\libexpat.lib \ +- C:\OSGeo4W\lib\zlib.lib \ +- C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib ++ cl spatialite_osm_raw.obj $(LIBS_ALL) + if exist $(SPATIALITE_OSM_RAW_EXE).manifest mt -manifest \ + $(SPATIALITE_OSM_RAW_EXE).manifest \ + -outputresource:$(SPATIALITE_OSM_RAW_EXE);1 + + $(SPATIALITE_OSM_FILTER_EXE): spatialite_osm_filter.obj +- cl spatialite_osm_filter.obj C:\OSGeo4W\lib\proj_i.lib \ +- C:\OSGeo4W\lib\iconv.lib \ +- C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib ++ cl spatialite_osm_filter.obj $(LIBS_ALL) + if exist $(SPATIALITE_OSM_FILTER_EXE).manifest mt -manifest \ + $(SPATIALITE_OSM_FILTER_EXE).manifest \ + -outputresource:$(SPATIALITE_OSM_FILTER_EXE);1 +diff --git a/nmake.opt b/nmake.opt +index 4f4a9538e..d9efecf7b 100644 +--- a/nmake.opt ++++ b/nmake.opt +@@ -2,7 +2,7 @@ + INSTDIR=C:\OSGeo4W + + # Uncomment the first for an optimized build, or the second for debug. +-OPTFLAGS= /nologo /Ox /fp:precise /W3 /MD /D_CRT_SECURE_NO_WARNINGS \ ++OPTFLAGS= /nologo /fp:precise /W3 $(CL_FLAGS) /D_CRT_SECURE_NO_WARNINGS \ + /D_LARGE_FILE=1 /D_FILE_OFFSET_BITS=64 /D_LARGEFILE_SOURCE=1 + #OPTFLAGS= /nologo /Zi /MD /Fdspatialite.pdb + diff --git a/externals/vcpkg/ports/spatialite-tools/portfile.cmake b/externals/vcpkg/ports/spatialite-tools/portfile.cmake new file mode 100755 index 000000000..c25028fed --- /dev/null +++ b/externals/vcpkg/ports/spatialite-tools/portfile.cmake @@ -0,0 +1,102 @@ +# Allow empty include directory +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +set(SPATIALITE_TOOLS_VERSION_STR "5.0.1") +vcpkg_download_distfile(ARCHIVE + URLS "https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/spatialite-tools-${SPATIALITE_TOOLS_VERSION_STR}.tar.gz" + FILENAME "spatialite-tools-${SPATIALITE_TOOLS_VERSION_STR}.tar.gz" + SHA512 dad52f6ed3c66ffd95f3a5c21225cd1b20641523af616f7e8defba8e4e46921da169e5f7bf9c53a355e132b6e74750d6db3fe02c870a3386f850df49c83bb8cd +) + +vcpkg_extract_source_archive(SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES + fix-makefiles.patch +) +file(REMOVE "${SOURCE_PATH}/config.h") + +set(PKGCONFIG_MODULES expat libxml-2.0 sqlite3) + +if (VCPKG_TARGET_IS_WINDOWS) + list(APPEND PKGCONFIG_MODULES readosm spatialite) + x_vcpkg_pkgconfig_get_modules( + PREFIX PKGCONFIG + MODULES --msvc-syntax ${PKGCONFIG_MODULES} + LIBS + ) + + # vcpkg_build_nmake doesn't supply cmake's implicit link libraries + if(PKGCONFIG_LIBS_DEBUG MATCHES "libcrypto") + string(APPEND PKGCONFIG_LIBS_DEBUG " user32.lib") + endif() + if(PKGCONFIG_LIBS_RELEASE MATCHES "libcrypto") + string(APPEND PKGCONFIG_LIBS_RELEASE " user32.lib") + endif() + + set(ICONV_LIBS "iconv.lib") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + string(APPEND ICONV_LIBS " charset.lib") + endif() + + set(UWP_LIBS "") + if(VCPKG_TARGET_IS_UWP) + set(UWP_LIBS "windowsapp.lib /APPCONTAINER") + endif() + + file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR) + + vcpkg_install_nmake( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_RELEASE + "INSTDIR=${INST_DIR}" + "LIBS_ALL=/link ${PKGCONFIG_LIBS_RELEASE} ${ICONV_LIBS} ${UWP_LIBS}" + OPTIONS_DEBUG + "INSTDIR=${INST_DIR}\\debug" + "LIBS_ALL=/link ${PKGCONFIG_LIBS_DEBUG} ${ICONV_LIBS} ${UWP_LIBS}" + ) + + set(TOOL_EXES + shp_sanitize + spatialite_osm_filter + spatialite_osm_raw + spatialite_gml + spatialite_osm_map + exif_loader + spatialite_osm_net + spatialite_network + spatialite_tool + shp_doctor + spatialite + ) + vcpkg_copy_tools(TOOL_NAMES ${TOOL_EXES} AUTO_CLEAN) + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +else() + x_vcpkg_pkgconfig_get_modules( + PREFIX PKGCONFIG + MODULES ${PKGCONFIG_MODULES} + LIBS + ) + + vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + --disable-minizip + --disable-readline + --enable-readosm + OPTIONS_DEBUG + "LIBS=${PKGCONFIG_LIBS_DEBUG} \$LIBS" + OPTIONS_RELEASE + "LIBS=${PKGCONFIG_LIBS_RELEASE} \$LIBS" + ) + + vcpkg_install_make() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/spatialite-tools/vcpkg.json b/externals/vcpkg/ports/spatialite-tools/vcpkg.json new file mode 100755 index 000000000..85e9b04db --- /dev/null +++ b/externals/vcpkg/ports/spatialite-tools/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "spatialite-tools", + "version": "5.0.1", + "port-version": 1, + "description": "Contains spatialite.exe and other command line tools to work with SpatiaLite databases (import, export, SQL queries)", + "homepage": "https://www.gaia-gis.it/fossil/spatialite-tools/index", + "dependencies": [ + "expat", + "libiconv", + { + "name": "libspatialite", + "features": [ + "gcp", + "rttopo" + ] + }, + "libxml2", + "readosm", + "sqlite3", + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/spdk-dpdk/CMakeLists.txt b/externals/vcpkg/ports/spdk-dpdk/CMakeLists.txt new file mode 100755 index 000000000..1952227ae --- /dev/null +++ b/externals/vcpkg/ports/spdk-dpdk/CMakeLists.txt @@ -0,0 +1,63 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 3.9) +PROJECT(dpdk C) + +LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}") +LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}") + +INCLUDE(ProcessorCount) +PROCESSORCOUNT(PROCS) + +#ARCH can be: i686, x86_64, ppc_64, arm64 +#MACHINE can be: native, power8, armv8a +#EXECENV can be: linuxapp, bsdapp +#TOOLCHAIN can be: gcc, icc + +SET(ARCH x86_64) +SET(MACHINE native) +SET(EXECENV linuxapp) +SET(TOOLCHAIN gcc) + +IF (CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") + SET(ARCH "i686") +ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") + SET(MACHINE arm8a) +ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") + SET(MACHINE power8) + SET(ARCH ppc_64) +ENDIF () + +IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + SET(EXECENV bsdapp) +ENDIF () + +FIND_PACKAGE(Numa REQUIRED) +FIND_PROGRAM(MAKE make) + +SET(DPDK_CFLAGS "-fPIC") +IF (CMAKE_BUILD_TYPE STREQUAL Debug) + STRING(APPEND ${DPDK_CFLAGS} "-O0 -g") +ENDIF () + +SET(DPDK_TARGET ${ARCH}-${MACHINE}-${EXECENV}-${TOOLCHAIN}) +#SET(DPDK_CONFIG O=${CMAKE_BUILD_TYPE}/build T=${DPDK_TARGET}) +SET(DPDK_CONFIG "T=${DPDK_TARGET}") + +IF (SOURCE_PATH) + SET(CMAKE_SOURCE_DIR ${SOURCE_PATH}) +ENDIF () + +ADD_CUSTOM_TARGET(dpdk-configure + COMMAND ${MAKE} config ${DPDK_CONFIG} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/ + VERBATIM + ) + +ADD_CUSTOM_TARGET(dpdk ALL + COMMAND ${MAKE} EXTRA_CFLAGS=\"${DPDK_CFLAGS}\" MAKEFLAGS=\"${DPDK_CONFIG} -j ${PROCS}\" + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/ + ) + +ADD_DEPENDENCIES(dpdk dpdk-configure) + +INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/build/lib + DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/) diff --git a/externals/vcpkg/ports/spdk-dpdk/FindNuma.cmake b/externals/vcpkg/ports/spdk-dpdk/FindNuma.cmake new file mode 100755 index 000000000..d5bb61435 --- /dev/null +++ b/externals/vcpkg/ports/spdk-dpdk/FindNuma.cmake @@ -0,0 +1,26 @@ +INCLUDE(FindPackageHandleStandardArgs) + +FIND_PATH(NUMA_ROOT_DIR + NAMES include/numa.h + PATHS ENV NUMA_ROOT + DOC "NUMA library root directory") + +FIND_PATH(NUMA_INCLUDE_DIR + NAMES numa.h + HINTS ${NUMA_ROOT_DIR} + PATH_SUFFIXES include + DOC "NUMA include directory") + +FIND_LIBRARY(NUMA_LIBRARY + NAMES numa + HINTS ${NUMA_ROOT_DIR} + DOC "NUMA library file") + +IF (NUMA_LIBRARY) + GET_FILENAME_COMPONENT(NUMA_LIBRARY_DIR ${NUMA_LIBRARY} PATH) + MARK_AS_ADVANCED(NUMA_INCLUDE_DIR NUMA_LIBRARY_DIR NUMA_LIBRARY) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(NUMA REQUIRED_VARS NUMA_ROOT_DIR NUMA_INCLUDE_DIR NUMA_LIBRARY) +ELSE () + SET(NUMA_FOUND FALSE) + MESSAGE(FATAL_ERROR "Numa library not found.\nTry: 'sudo yum install numactl numactl-devel' (or sudo apt-get install libnuma1 libnuma-dev)") +ENDIF () diff --git a/externals/vcpkg/ports/spdk-dpdk/portfile.cmake b/externals/vcpkg/ports/spdk-dpdk/portfile.cmake new file mode 100755 index 000000000..f8a8d46e1 --- /dev/null +++ b/externals/vcpkg/ports/spdk-dpdk/portfile.cmake @@ -0,0 +1,43 @@ +IF (NOT VCPKG_CMAKE_SYSTEM_NAME OR NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + MESSAGE(FATAL_ERROR "Intel dpdk currently only supports Linux/BSD platforms") +ENDIF () + +VCPKG_FROM_GITHUB( + OUT_SOURCE_PATH SOURCE_PATH + REPO spdk/dpdk + REF spdk-18.11 + SHA512 9c069bb0e445f8287ee056452fa32263746f78e27377e8fd75809b9ebf7f25c2395ee13ae4804d8c464e5bc7db7335692759ab3202748dd0c82243aad35e5e7c + HEAD_REF master +) + +FIND_PATH(NUMA_INCLUDE_DIR NAME numa.h + PATHS ENV NUMA_ROOT + HINTS $ENV{HOME}/local/include /opt/local/include /usr/local/include /usr/include + ) +IF (NOT NUMA_INCLUDE_DIR) + MESSAGE(FATAL_ERROR "Numa library not found.\nTry: 'sudo yum install numactl numactl-devel' (or sudo apt-get install libnuma1 libnuma-dev)") +ENDIF () + +VCPKG_CONFIGURE_CMAKE( + SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR} + PREFER_NINJA + OPTIONS + -DSOURCE_PATH=${SOURCE_PATH} +) + +VCPKG_INSTALL_CMAKE() + +# Headers are symbolic links here, gather all, resolve and copy real files +FILE(GLOB_RECURSE HEADERS FOLLOW_SYMLINKS "${SOURCE_PATH}/build/include/*") +SET(REAL_FILES "") +FOREACH (HEADER ${HEADERS}) + GET_FILENAME_COMPONENT(REAL_FILE "${HEADER}" REALPATH) + LIST(APPEND REAL_FILES "${REAL_FILE}") +ENDFOREACH () + +FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/spdk) +FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/spdk) +FILE(INSTALL ${REAL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) +FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/spdk-dpdkConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +FILE(INSTALL ${SOURCE_PATH}/license/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/spdk-dpdk/spdk-dpdkConfig.cmake b/externals/vcpkg/ports/spdk-dpdk/spdk-dpdkConfig.cmake new file mode 100755 index 000000000..85b850812 --- /dev/null +++ b/externals/vcpkg/ports/spdk-dpdk/spdk-dpdkConfig.cmake @@ -0,0 +1,31 @@ + +FUNCTION(SET_LIBRARY_TARGET NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR) + ADD_LIBRARY(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED) + SET_TARGET_PROPERTIES(${NAMESPACE}::${LIB_NAME} PROPERTIES + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}" + IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}" + INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}" + ) + SET(${NAMESPACE}_${LIB_NAME}_FOUND 1) +ENDFUNCTION() + +GET_FILENAME_COMPONENT(DPDK_ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) +GET_FILENAME_COMPONENT(DPDK_ROOT "${DPDK_ROOT}" PATH) +GET_FILENAME_COMPONENT(DPDK_ROOT "${DPDK_ROOT}" PATH) + +SET_LIBRARY_TARGET("SPDK" "dpdk" "${DPDK_ROOT}/debug/lib/spdk/libdpdk.a" "${DPDK_ROOT}/lib/spdk/libdpdk.a" "${DPDK_ROOT}/include/spdk-dpdk") + +IF (CMAKE_BUILD_TYPE STREQUAL Debug) + LINK_DIRECTORIES(${DPDK_ROOT}/debug/lib/spdk) +ELSE () + LINK_DIRECTORIES(${DPDK_ROOT}/lib/spdk) +ENDIF () + +FILE(GLOB DPDK_LIBS ${DPDK_ROOT}/lib/spdk/librte*.*) +FOREACH (LIB_FILE_NAME ${DPDK_LIBS}) + GET_FILENAME_COMPONENT(LIB_NAME ${LIB_FILE_NAME} NAME_WE) + GET_FILENAME_COMPONENT(FULL_LIB_NAME ${LIB_FILE_NAME} NAME) + STRING(REPLACE "lib" "" LIB_NAME "${LIB_NAME}") + SET_LIBRARY_TARGET("SPDK" "${LIB_NAME}" "${DPDK_ROOT}/debug/lib/spdk/${FULL_LIB_NAME}" "${DPDK_ROOT}/lib/spdk/${FULL_LIB_NAME}" "${DPDK_ROOT}/include/spdk-dpdk") +ENDFOREACH () diff --git a/externals/vcpkg/ports/spdk-dpdk/usage b/externals/vcpkg/ports/spdk-dpdk/usage new file mode 100755 index 000000000..4fc9ddf25 --- /dev/null +++ b/externals/vcpkg/ports/spdk-dpdk/usage @@ -0,0 +1 @@ +This package is a dependency of SPDK port. It is not intended for direct consumption by end-user. \ No newline at end of file diff --git a/externals/vcpkg/ports/spdk-dpdk/vcpkg.json b/externals/vcpkg/ports/spdk-dpdk/vcpkg.json new file mode 100755 index 000000000..ec63984b9 --- /dev/null +++ b/externals/vcpkg/ports/spdk-dpdk/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "spdk-dpdk", + "version-string": "20181124", + "port-version": 1, + "description": "SPDK mirror of DPDK. A set of libraries and drivers for fast packet processing", + "supports": "linux" +} diff --git a/externals/vcpkg/ports/spdk-ipsec/CMakeLists.txt b/externals/vcpkg/ports/spdk-ipsec/CMakeLists.txt new file mode 100755 index 000000000..fb02b164b --- /dev/null +++ b/externals/vcpkg/ports/spdk-ipsec/CMakeLists.txt @@ -0,0 +1,57 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 3.9) +PROJECT(ipsec C) + +IF (SOURCE_PATH) + SET(CMAKE_SOURCE_DIR ${SOURCE_PATH}) +ENDIF () + +INCLUDE(ProcessorCount) +PROCESSORCOUNT(PROCS) + +FIND_PROGRAM(NASM nasm) +IF (NOT NASM) + MESSAGE(FATAL_ERROR "NASM not found") +ENDIF () + +FIND_PROGRAM(MAKE make) +IF (NOT MAKE) + MESSAGE(FATAL_ERROR "MAKE not found") +ENDIF () + +IF (EXEC_ENV STREQUAL "Windows") + FIND_PROGRAM(MAKE nmake) + IF (NOT MAKE) + MESSAGE(FATAL_ERROR "nmake not found") + ENDIF () +ENDIF () + +SET(MAKE_FLAGS) + +IF (EXEC_ENV STREQUAL "Windows") + LIST(APPEND MAKE_FLAGS /f win_x64.mak) +ENDIF () + +IF (CMAKE_BUILD_TYPE STREQUAL Debug) + LIST(APPEND MAKE_FLAGS DEBUG=y) +ENDIF () + +IF (NOT BUILD_SHARED_LIBS) + LIST(APPEND MAKE_FLAGS SHARED=n) +ENDIF () + +MESSAGE(STATUS "${MAKE_FLAGS}") +ADD_CUSTOM_TARGET(ipsec-mb ALL + COMMAND ${MAKE} -j ${MAKE_FLAGS} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/ +# VERBATIM + ) + +SET(LIB_PATH ${CMAKE_SOURCE_DIR}/) +IF(BUILD_SHARED_LIBS) + STRING(APPEND LIB_PATH libIPSec_MB.so) +ELSE () + STRING(APPEND LIB_PATH libIPSec_MB.a) +ENDIF () +INSTALL(FILES ${LIB_PATH} + DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/lib/) +INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/) diff --git a/externals/vcpkg/ports/spdk-ipsec/portfile.cmake b/externals/vcpkg/ports/spdk-ipsec/portfile.cmake new file mode 100755 index 000000000..df7ee6771 --- /dev/null +++ b/externals/vcpkg/ports/spdk-ipsec/portfile.cmake @@ -0,0 +1,56 @@ +IF (NOT VCPKG_CMAKE_SYSTEM_NAME) + SET(EXEC_ENV "Windows") +ELSE () + SET(EXEC_ENV "${VCPKG_CMAKE_SYSTEM_NAME}") +ENDIF () + +IF (NOT VCPKG_TARGET_IS_LINUX) + MESSAGE(FATAL_ERROR "Intel(R) Multi-Buffer Crypto for IPsec Library currently only supports Linux/Windows platforms") + MESSAGE(STATUS "Well, it is not true, but I didnt manage to get it working on Windows") +ENDIF () + +IF (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + MESSAGE(FATAL_ERROR "Intel(R) Multi-Buffer Crypto for IPsec Library currently only supports x64 architecture") +ELSEIF (NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + MESSAGE(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") +ENDIF () + +VCPKG_FROM_GITHUB( + OUT_SOURCE_PATH SOURCE_PATH + REPO spdk/intel-ipsec-mb + REF spdk + SHA512 037fc382d9aa87b6645309f29cb761a584ed855c583638c9e27b5b7200ceb2ae21ad5adcc7c92b2b1d1387186a7fd2b5ae22f337a8f52dea3f6c35d8f90b42bd + HEAD_REF master +) + +VCPKG_FIND_ACQUIRE_PROGRAM(NASM) + +execute_process( + COMMAND "${NASM}" -v + OUTPUT_VARIABLE NASM_OUTPUT + ERROR_VARIABLE NASM_OUTPUT +) +STRING(REGEX REPLACE "NASM version ([0-9]+\\.[0-9]+\\.[0-9]+).*" "\\1" NASM_VERSION "${NASM_OUTPUT}") +IF (NASM_VERSION VERSION_LESS 2.13.03) + MESSAGE(FATAL_ERROR "NASM version 2.13.03 (or newer) is required to build this package") +ENDIF () + +GET_FILENAME_COMPONENT(NASM_PATH ${NASM} DIRECTORY) +vcpkg_add_to_path("${NASM_PATH}") + +VCPKG_CONFIGURE_CMAKE( + SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR} + PREFER_NINJA + OPTIONS + -DSOURCE_PATH=${SOURCE_PATH} + -DEXEC_ENV=${VCPKG_CMAKE_SYSTEM_NAME} +) + +VCPKG_INSTALL_CMAKE() + +FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/spdk) +FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/spdk) +FILE(INSTALL ${SOURCE_PATH}/Release/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) +FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/spdk-ipsecConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +FILE(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/spdk-ipsec/spdk-ipsecConfig.cmake b/externals/vcpkg/ports/spdk-ipsec/spdk-ipsecConfig.cmake new file mode 100755 index 000000000..60777b959 --- /dev/null +++ b/externals/vcpkg/ports/spdk-ipsec/spdk-ipsecConfig.cmake @@ -0,0 +1,17 @@ + +FUNCTION(SET_LIBRARY_TARGET NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR) + ADD_LIBRARY(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED) + SET_TARGET_PROPERTIES(${NAMESPACE}::${LIB_NAME} PROPERTIES + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}" + IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}" + INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}" + ) + SET(${NAMESPACE}_${LIB_NAME}_FOUND 1) +ENDFUNCTION() + +GET_FILENAME_COMPONENT(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) +GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH) +GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH) + +SET_LIBRARY_TARGET("SPDK" "ipsec" "${ROOT}/debug/lib/spdk/libIPSec_MB.a" "${ROOT}/lib/spdk/libIPSec_MB.a" "${ROOT}/include/spdk-ipsec") diff --git a/externals/vcpkg/ports/spdk-ipsec/usage b/externals/vcpkg/ports/spdk-ipsec/usage new file mode 100755 index 000000000..4fc9ddf25 --- /dev/null +++ b/externals/vcpkg/ports/spdk-ipsec/usage @@ -0,0 +1 @@ +This package is a dependency of SPDK port. It is not intended for direct consumption by end-user. \ No newline at end of file diff --git a/externals/vcpkg/ports/spdk-ipsec/vcpkg.json b/externals/vcpkg/ports/spdk-ipsec/vcpkg.json new file mode 100755 index 000000000..e41c9d957 --- /dev/null +++ b/externals/vcpkg/ports/spdk-ipsec/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "spdk-ipsec", + "version-string": "20180711", + "port-version": 1, + "description": "SPDK mirror of ipsec. Intel(R) Multi-Buffer Crypto for IPsec Library", + "supports": "x64 & linux" +} diff --git a/externals/vcpkg/ports/spdk-isal/portfile.cmake b/externals/vcpkg/ports/spdk-isal/portfile.cmake new file mode 100755 index 000000000..3a09af620 --- /dev/null +++ b/externals/vcpkg/ports/spdk-isal/portfile.cmake @@ -0,0 +1,26 @@ + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO spdk/isa-l + REF spdk + SHA512 1d170ed050fb612816c77b3586f1cdce9129eedc559e3fcefc983ede05b6c8e13a52e400ee6935f5da6ab045a899c97f6ed6be3a79691284e211ea8a6d697f7c + HEAD_REF master +) + +vcpkg_find_acquire_program(NASM) +get_filename_component(NASM_PATH ${NASM} DIRECTORY) +vcpkg_add_to_path("${NASM_PATH}") + +vcpkg_find_acquire_program(YASM) + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_install_make() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/spdk-isalConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/spdk-isal/spdk-isalConfig.cmake b/externals/vcpkg/ports/spdk-isal/spdk-isalConfig.cmake new file mode 100755 index 000000000..f14282ff1 --- /dev/null +++ b/externals/vcpkg/ports/spdk-isal/spdk-isalConfig.cmake @@ -0,0 +1,17 @@ + +FUNCTION(SET_LIBRARY_TARGET NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR) + ADD_LIBRARY(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED) + SET_TARGET_PROPERTIES(${NAMESPACE}::${LIB_NAME} PROPERTIES + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}" + IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}" + INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}" + ) + SET(${NAMESPACE}_${LIB_NAME}_FOUND 1) +ENDFUNCTION() + +GET_FILENAME_COMPONENT(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) +GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH) +GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH) + +SET_LIBRARY_TARGET("SPDK" "isal" "${ROOT}/debug/lib/spdk/isa-l.a" "${ROOT}/lib/spdk/isa-l.a" "${ROOT}/include/spdk-isal") diff --git a/externals/vcpkg/ports/spdk-isal/usage b/externals/vcpkg/ports/spdk-isal/usage new file mode 100755 index 000000000..4fc9ddf25 --- /dev/null +++ b/externals/vcpkg/ports/spdk-isal/usage @@ -0,0 +1 @@ +This package is a dependency of SPDK port. It is not intended for direct consumption by end-user. \ No newline at end of file diff --git a/externals/vcpkg/ports/spdk-isal/vcpkg.json b/externals/vcpkg/ports/spdk-isal/vcpkg.json new file mode 100755 index 000000000..d2caf2dfc --- /dev/null +++ b/externals/vcpkg/ports/spdk-isal/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "spdk-isal", + "version-string": "20181006", + "port-version": 2, + "description": "SPDK mirror of isa-l. Intel(R) Intelligent Storage Acceleration Library", + "license": "BSD-3-Clause", + "supports": "!windows & !(osx & x64)" +} diff --git a/externals/vcpkg/ports/spdk/CMakeLists.txt b/externals/vcpkg/ports/spdk/CMakeLists.txt new file mode 100755 index 000000000..dabc61c5a --- /dev/null +++ b/externals/vcpkg/ports/spdk/CMakeLists.txt @@ -0,0 +1,45 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 3.9) +PROJECT(spdk C) + +LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}") +LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}") + +FIND_PACKAGE(Numa REQUIRED) +FIND_PACKAGE(uuid REQUIRED) +FIND_PACKAGE(ibverbs REQUIRED) +FIND_PACKAGE(RDMA REQUIRED) +FIND_PACKAGE(OpenSSL REQUIRED) +FIND_PACKAGE(Python COMPONENTS Interpreter REQUIRED) + +FIND_PROGRAM(MAKE make) + +IF (SOURCE_PATH) + SET(CMAKE_SOURCE_DIR ${SOURCE_PATH}) +ENDIF () + +SET(SPDK_CONFIG --disable-tests --with-rdma --without-isal --with-dpdk=${CMAKE_SOURCE_DIR}/../../../spdk-dpdk/src/spdk-18.11-411c51fb97/build) +# No option to define path for isa-l (--with-isal=${CMAKE_SOURCE_DIR}/../../../spdk-isal/src/spdk-d34ebb51cd) +IF (CMAKE_BUILD_TYPE STREQUAL Debug) + LIST(APPEND ${SPDK_CONFIG} --enable-debug) +ENDIF () + +SET(DPDK_CONFIG "-fPIC") +IF (CMAKE_BUILD_TYPE STREQUAL Debug) + STRING(APPEND ${DPDK_CONFIG} "-O0 -g") +ENDIF () + +ADD_CUSTOM_TARGET(spdk-configure + COMMAND ./configure ${SPDK_CONFIG} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/ + VERBATIM + ) + +ADD_CUSTOM_TARGET(spdk ALL + COMMAND ${MAKE} -j DPDK_CFLAGS=${DPDK_CONFIG} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/ + ) + +ADD_DEPENDENCIES(spdk spdk-configure) + +INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/build/lib + DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/) diff --git a/externals/vcpkg/ports/spdk/FindNuma.cmake b/externals/vcpkg/ports/spdk/FindNuma.cmake new file mode 100755 index 000000000..d5bb61435 --- /dev/null +++ b/externals/vcpkg/ports/spdk/FindNuma.cmake @@ -0,0 +1,26 @@ +INCLUDE(FindPackageHandleStandardArgs) + +FIND_PATH(NUMA_ROOT_DIR + NAMES include/numa.h + PATHS ENV NUMA_ROOT + DOC "NUMA library root directory") + +FIND_PATH(NUMA_INCLUDE_DIR + NAMES numa.h + HINTS ${NUMA_ROOT_DIR} + PATH_SUFFIXES include + DOC "NUMA include directory") + +FIND_LIBRARY(NUMA_LIBRARY + NAMES numa + HINTS ${NUMA_ROOT_DIR} + DOC "NUMA library file") + +IF (NUMA_LIBRARY) + GET_FILENAME_COMPONENT(NUMA_LIBRARY_DIR ${NUMA_LIBRARY} PATH) + MARK_AS_ADVANCED(NUMA_INCLUDE_DIR NUMA_LIBRARY_DIR NUMA_LIBRARY) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(NUMA REQUIRED_VARS NUMA_ROOT_DIR NUMA_INCLUDE_DIR NUMA_LIBRARY) +ELSE () + SET(NUMA_FOUND FALSE) + MESSAGE(FATAL_ERROR "Numa library not found.\nTry: 'sudo yum install numactl numactl-devel' (or sudo apt-get install libnuma1 libnuma-dev)") +ENDIF () diff --git a/externals/vcpkg/ports/spdk/FindRDMA.cmake b/externals/vcpkg/ports/spdk/FindRDMA.cmake new file mode 100755 index 000000000..b84ec123e --- /dev/null +++ b/externals/vcpkg/ports/spdk/FindRDMA.cmake @@ -0,0 +1,32 @@ +FIND_PATH(RDMA_INCLUDE_DIR rdma/rdma_cma.h + /usr/include + /usr/include/linux + /usr/local/include + ) + +FIND_LIBRARY(RDMA_LIBRARY NAMES rdmacm + PATHS + /usr/lib + /usr/local/lib + /usr/lib64 + /usr/local/lib64 + /lib/i386-linux-gnu + /lib/x86_64-linux-gnu + /usr/lib/x86_64-linux-gnu + ) + +INCLUDE(FindPackageHandleStandardArgs) +IF (APPLE) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(RDMA DEFAULT_MSG + RDMA_INCLUDE_DIR) +ELSE () + FIND_PACKAGE_HANDLE_STANDARD_ARGS(RDMA DEFAULT_MSG + RDMA_LIBRARY RDMA_INCLUDE_DIR) +ENDIF () + +MARK_AS_ADVANCED(RDMA_INCLUDE_DIR RDMA_LIBRARY) + +IF (NOT RDMA_LIBRARY) + SET(RDMA_FOUND FALSE) + MESSAGE(FATAL_ERROR "RDMA library not found.\nTry: 'sudo yum install librdmacm-devel librdmacm' (or sudo apt-get install librdmacm-dev librdmacm1)") +ENDIF () diff --git a/externals/vcpkg/ports/spdk/Findibverbs.cmake b/externals/vcpkg/ports/spdk/Findibverbs.cmake new file mode 100755 index 000000000..c018df19d --- /dev/null +++ b/externals/vcpkg/ports/spdk/Findibverbs.cmake @@ -0,0 +1,34 @@ +# Find the ibverbs libraries +# +# The following variables are optionally searched for defaults +# IBVERBS_ROOT_DIR: Base directory where all ibverbs components are found +# IBVERBS_INCLUDE_DIR: Directory where ibverbs headers are found +# IBVERBS_LIB_DIR: Directory where ibverbs libraries are found + +# The following are set after configuration is done: +# IBVERBS_FOUND +# IBVERBS_INCLUDE_DIRS +# IBVERBS_LIBRARIES + +FIND_PATH(IBVERBS_INCLUDE_DIRS + NAMES infiniband/verbs.h + HINTS + ${IBVERBS_INCLUDE_DIR} + ${IBVERBS_ROOT_DIR} + ${IBVERBS_ROOT_DIR}/include) + +FIND_LIBRARY(IBVERBS_LIBRARIES + NAMES ibverbs + HINTS + ${IBVERBS_LIB_DIR} + ${IBVERBS_ROOT_DIR} + ${IBVERBS_ROOT_DIR}/lib) + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(ibverbs DEFAULT_MSG IBVERBS_INCLUDE_DIRS IBVERBS_LIBRARIES) +MARK_AS_ADVANCED(IBVERBS_INCLUDE_DIR IBVERBS_LIBRARIES) + +IF (NOT IBVERBS_LIBRARIES) + SET(IBVERBS_FOUND FALSE) + MESSAGE(FATAL_ERROR "ibverbs library not found.\nTry: 'sudo yum install libibverbs-devel libibverbs' (or sudo apt-get install libibverbs-dev libibverbs1)") +ENDIF () diff --git a/externals/vcpkg/ports/spdk/Finduuid.cmake b/externals/vcpkg/ports/spdk/Finduuid.cmake new file mode 100755 index 000000000..2bd54af78 --- /dev/null +++ b/externals/vcpkg/ports/spdk/Finduuid.cmake @@ -0,0 +1,49 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +FIND_PATH(UUID_INCLUDE_DIR uuid/uuid.h + /usr/include + /usr/include/linux + /usr/local/include + ) + +FIND_LIBRARY(UUID_LIBRARY NAMES uuid + PATHS + /usr/lib + /usr/local/lib + /usr/lib64 + /usr/local/lib64 + /lib/i386-linux-gnu + /lib/x86_64-linux-gnu + /usr/lib/x86_64-linux-gnu + ) + +INCLUDE(FindPackageHandleStandardArgs) +IF (APPLE) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(UUID DEFAULT_MSG + UUID_INCLUDE_DIR) +ELSE () + FIND_PACKAGE_HANDLE_STANDARD_ARGS(UUID DEFAULT_MSG + UUID_LIBRARY UUID_INCLUDE_DIR) +ENDIF () + +MARK_AS_ADVANCED(UUID_INCLUDE_DIR UUID_LIBRARY) + +IF (NOT UUID_LIBRARY) + SET(UUID_FOUND FALSE) + MESSAGE(FATAL_ERROR "UUID library not found.\nTry: 'sudo yum install libuuid uuid-devel' (or sudo apt-get install libuuid1 uuid-dev)") +ENDIF () diff --git a/externals/vcpkg/ports/spdk/portfile.cmake b/externals/vcpkg/ports/spdk/portfile.cmake new file mode 100755 index 000000000..38c0326fe --- /dev/null +++ b/externals/vcpkg/ports/spdk/portfile.cmake @@ -0,0 +1,38 @@ +IF (NOT VCPKG_CMAKE_SYSTEM_NAME OR NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + MESSAGE(FATAL_ERROR "Intel spdk currently only supports Linux/BSD platforms") +ENDIF () + +VCPKG_FROM_GITHUB( + OUT_SOURCE_PATH SOURCE_PATH + REPO spdk/spdk + REF v19.01.1 + SHA512 cb2c085e1a5d370df60599aaeb6302f8252626342a9e0644018df8c769f406304591680f905572848390c3139e640496f96e3b4fc67469c56eb9a5329aee4b24 + HEAD_REF master +) + +FIND_PATH(NUMA_INCLUDE_DIR NAME numa.h + PATHS ENV NUMA_ROOT + HINTS $ENV{HOME}/local/include /opt/local/include /usr/local/include /usr/include + ) +IF (NOT NUMA_INCLUDE_DIR) + MESSAGE(FATAL_ERROR "Numa library not found.\nTry: 'sudo yum install numactl numactl-devel' (or sudo apt-get install libnuma1 libnuma-dev)") +ENDIF () + +VCPKG_CONFIGURE_CMAKE( + SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR} + PREFER_NINJA + OPTIONS + -DSOURCE_PATH=${SOURCE_PATH} +) + +VCPKG_INSTALL_CMAKE() + +FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +FILE(INSTALL ${SOURCE_PATH}/include/spdk DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) +FILE(INSTALL ${SOURCE_PATH}/scripts/setup.sh DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/scripts) +FILE(INSTALL ${SOURCE_PATH}/scripts/common.sh DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/scripts) +FILE(INSTALL ${SOURCE_PATH}/include/spdk/pci_ids.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/include/spdk) +FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/spdkConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +FILE(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/spdk/spdkConfig.cmake b/externals/vcpkg/ports/spdk/spdkConfig.cmake new file mode 100755 index 000000000..7db413800 --- /dev/null +++ b/externals/vcpkg/ports/spdk/spdkConfig.cmake @@ -0,0 +1,29 @@ + +FUNCTION(SET_LIBRARY_TARGET NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR) + ADD_LIBRARY(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED) + SET_TARGET_PROPERTIES(${NAMESPACE}::${LIB_NAME} PROPERTIES + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}" + IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}" + INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}" + ) + SET(${NAMESPACE}_${LIB_NAME}_FOUND 1) +ENDFUNCTION() + +GET_FILENAME_COMPONENT(SPDK_ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) +GET_FILENAME_COMPONENT(SPDK_ROOT "${SPDK_ROOT}" PATH) +GET_FILENAME_COMPONENT(SPDK_ROOT "${SPDK_ROOT}" PATH) + +IF (CMAKE_BUILD_TYPE STREQUAL Debug) + LINK_DIRECTORIES(${SPDK_ROOT}/debug/lib/) +ELSE () + LINK_DIRECTORIES(${SPDK_ROOT}/lib/) +ENDIF () + +FILE(GLOB SPDK_LIBS ${SPDK_ROOT}/lib/libspdk*.*) +FOREACH (LIB_FILE_NAME ${SPDK_LIBS}) + GET_FILENAME_COMPONENT(LIB_NAME ${LIB_FILE_NAME} NAME_WE) + GET_FILENAME_COMPONENT(FULL_LIB_NAME ${LIB_FILE_NAME} NAME) + STRING(REPLACE "lib" "" LIB_NAME "${LIB_NAME}") + SET_LIBRARY_TARGET("SPDK" "${LIB_NAME}" "${SPDK_ROOT}/debug/lib/${FULL_LIB_NAME}" "${SPDK_ROOT}/lib/${FULL_LIB_NAME}" "${SPDK_ROOT}/include/spdk") +ENDFOREACH () diff --git a/externals/vcpkg/ports/spdk/usage b/externals/vcpkg/ports/spdk/usage new file mode 100755 index 000000000..f26b41649 --- /dev/null +++ b/externals/vcpkg/ports/spdk/usage @@ -0,0 +1,44 @@ +The package spdk is compatible with built-in CMake targets: + +Add following to build examples/nvme/perf/perf.c + + FIND_PACKAGE(spdk CONFIG REQUIRED) + FIND_PACKAGE(spdk-dpdk CONFIG REQUIRED) + + ADD_EXECUTABLE(SPDKTest perf.c) + + TARGET_LINK_DIRECTORIES(SPDKTest PRIVATE ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/spdk) + TARGET_LINK_LIBRARIES(SPDKTest PRIVATE + SPDK::spdk_app_rpc + SPDK::spdk_bdev + SPDK::spdk_bdev_null + SPDK::spdk_bdev_rpc + SPDK::spdk_conf + SPDK::spdk_copy + SPDK::spdk_thread + SPDK::spdk_event + SPDK::spdk_event_bdev + SPDK::spdk_event_copy + SPDK::spdk_event_net + SPDK::spdk_net + SPDK::spdk_nvmf + SPDK::spdk_nvme + SPDK::spdk_sock_posix + SPDK::spdk_sock + SPDK::spdk_rpc + SPDK::spdk_jsonrpc + SPDK::spdk_json + SPDK::spdk_trace + SPDK::spdk_util + SPDK::spdk_log + SPDK::spdk_env_dpdk + SPDK::dpdk + numa + rdmacm + uuid + ibverbs + pthread + dl + ) + +Configuration script can be found at: ${CURRENT_PACKAGES_DIR}/share/${PORT}/scripts diff --git a/externals/vcpkg/ports/spdk/vcpkg.json b/externals/vcpkg/ports/spdk/vcpkg.json new file mode 100755 index 000000000..90a9c4940 --- /dev/null +++ b/externals/vcpkg/ports/spdk/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "spdk", + "version-string": "19.01.1", + "port-version": 2, + "description": "Storage Performance Development Kit", + "supports": "linux", + "dependencies": [ + "spdk-dpdk", + "spdk-ipsec", + "spdk-isal" + ] +} diff --git a/externals/vcpkg/ports/spdlog/portfile.cmake b/externals/vcpkg/ports/spdlog/portfile.cmake new file mode 100755 index 000000000..e460dc0a7 --- /dev/null +++ b/externals/vcpkg/ports/spdlog/portfile.cmake @@ -0,0 +1,70 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gabime/spdlog + REF v1.10.0 + SHA512 e82ec0a0c813ed2f1c8a31a0f21dbb733d0a7bd8d05284feae3bd66040bc53ad47a93b26c3e389c7e5623cfdeba1854d690992c842748e072aab3e6e6ecc5666 + HEAD_REF v1.x +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + benchmark SPDLOG_BUILD_BENCH + wchar SPDLOG_WCHAR_SUPPORT +) + +# SPDLOG_WCHAR_FILENAMES can only be configured in triplet file since it is an alternative (not additive) +if(NOT DEFINED SPDLOG_WCHAR_FILENAMES) + set(SPDLOG_WCHAR_FILENAMES OFF) +endif() +if(NOT VCPKG_TARGET_IS_WINDOWS) + if("wchar" IN_LIST FEATURES) + message(WARNING "Feature 'wchar' is only supported for Windows and has no effect on other platforms.") + elseif(SPDLOG_WCHAR_FILENAMES) + message(FATAL_ERROR "Build option 'SPDLOG_WCHAR_FILENAMES' is for Windows.") + endif() +endif() + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SPDLOG_BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} + -DSPDLOG_FMT_EXTERNAL=ON + -DSPDLOG_INSTALL=ON + -DSPDLOG_BUILD_SHARED=${SPDLOG_BUILD_SHARED} + -DSPDLOG_WCHAR_FILENAMES=${SPDLOG_WCHAR_FILENAMES} + -DSPDLOG_BUILD_EXAMPLE=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/spdlog) +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +# use vcpkg-provided fmt library (see also option SPDLOG_FMT_EXTERNAL above) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/bundled) + +# add support for integration other than cmake +vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h + "// #define SPDLOG_FMT_EXTERNAL" + "#ifndef SPDLOG_FMT_EXTERNAL\n#define SPDLOG_FMT_EXTERNAL\n#endif" +) +if(SPDLOG_WCHAR_SUPPORT) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h + "// #define SPDLOG_WCHAR_TO_UTF8_SUPPORT" + "#ifndef SPDLOG_WCHAR_TO_UTF8_SUPPORT\n#define SPDLOG_WCHAR_TO_UTF8_SUPPORT\n#endif" + ) +endif() +if(SPDLOG_WCHAR_FILENAMES) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h + "// #define SPDLOG_WCHAR_FILENAMES" + "#ifndef SPDLOG_WCHAR_FILENAMES\n#define SPDLOG_WCHAR_FILENAMES\n#endif" + ) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/spdlog/vcpkg.json b/externals/vcpkg/ports/spdlog/vcpkg.json new file mode 100755 index 000000000..88c834167 --- /dev/null +++ b/externals/vcpkg/ports/spdlog/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "spdlog", + "version-semver": "1.10.0", + "port-version": 1, + "description": "Very fast, header only, C++ logging library", + "homepage": "https://github.com/gabime/spdlog", + "license": "MIT", + "dependencies": [ + "fmt", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "benchmark": { + "description": "Use google benchmark", + "dependencies": [ + "benchmark" + ] + }, + "wchar": { + "description": "Build with wchar_t (Windows only)" + } + } +} diff --git a/externals/vcpkg/ports/spectra/portfile.cmake b/externals/vcpkg/ports/spectra/portfile.cmake new file mode 100755 index 000000000..dad97dd37 --- /dev/null +++ b/externals/vcpkg/ports/spectra/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO yixuan/spectra + REF v1.0.1 + SHA512 575f90d2ab9c3cbdd4bbfe1abce35a262e319dac8689420859811a169cbfd8f617c80bfcd430aa8a5383c96f338155870a0ad7ac0d5db855c1e822c2d19837b5 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/spectra/cmake) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/spectra/vcpkg.json b/externals/vcpkg/ports/spectra/vcpkg.json new file mode 100755 index 000000000..1d7f1e1e7 --- /dev/null +++ b/externals/vcpkg/ports/spectra/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "spectra", + "version": "1.0.1", + "description": "A header-only C++ library for large scale eigenvalue problems", + "homepage": "https://spectralib.org", + "documentation": "https://spectralib.org/quick-start.html", + "license": "MPL-2.0", + "dependencies": [ + "eigen3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/speex/0001-make-pkg-config-lib-name-configurable.patch b/externals/vcpkg/ports/speex/0001-make-pkg-config-lib-name-configurable.patch new file mode 100755 index 000000000..72b61f4cc --- /dev/null +++ b/externals/vcpkg/ports/speex/0001-make-pkg-config-lib-name-configurable.patch @@ -0,0 +1,13 @@ +diff --git a/speex.pc.in b/speex.pc.in +index 97bba4f..52a1d3c 100644 +--- a/speex.pc.in ++++ b/speex.pc.in +@@ -10,6 +10,6 @@ Description: Speex is an audio codec tuned for speech + Version: @SPEEX_VERSION@ + Requires: + Conflicts: +-Libs: -L${libdir} -lspeex ++Libs: -L${libdir} -l@SPEEXLIB@ + Libs.private: @LIBM@ + Cflags: -I${includedir} + diff --git a/externals/vcpkg/ports/speex/CMakeLists.txt b/externals/vcpkg/ports/speex/CMakeLists.txt new file mode 100755 index 000000000..b151b2439 --- /dev/null +++ b/externals/vcpkg/ports/speex/CMakeLists.txt @@ -0,0 +1,111 @@ +cmake_minimum_required (VERSION 3.8.0) +project (libspeex C) + +include(GNUInstallDirs) +include(CheckLibraryExists) + +option(USE_SSE "USE_SSE used Note: USE_SSE and FIXED_POINT are mutually exclusive." ON) +if(MSVC) + add_definitions(-DHAVE_CONFIG_H) + if(USE_SSE) + add_definitions(-DUSE_SSE -DFLOATING_POINT) + else() + add_definitions(-DFIXED_POINT) + endif() +endif() + +include_directories(win32 include) + +set(CMAKE_DEBUG_POSTFIX d) + +file(READ "win32/libspeex.def" _contents) +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + string(REPLACE "LIBRARY libspeex" "LIBRARY libspeexd" _contents "${_contents}") +endif() +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/libspeex.def" + "${_contents}\n" + "speex_nb_mode\n" + "speex_wb_mode\n" + "speex_uwb_mode\n" + "speex_mode_list\n" + "speex_header_free\n" +) + +file(STRINGS "configure.ac" + _speex_version_defines REGEX "SPEEX_(MAJOR|MINOR|MICRO)_VERSION=([0-9]+)$") +foreach(ver ${_speex_version_defines}) + if(ver MATCHES "SPEEX_(MAJOR|MINOR|MICRO)_VERSION=([0-9]+)$") + set(SPEEX_${CMAKE_MATCH_1}_VERSION "${CMAKE_MATCH_2}" CACHE INTERNAL "") + endif() +endforeach() +set(SPEEX_VERSION ${SPEEX_MAJOR_VERSION}.${SPEEX_MINOR_VERSION}.${SPEEX_MICRO_VERSION}) + +set(SRC + "libspeex/bits.c" + "libspeex/cb_search.c" + "libspeex/exc_10_16_table.c" + "libspeex/exc_10_32_table.c" + "libspeex/exc_20_32_table.c" + "libspeex/exc_5_256_table.c" + "libspeex/exc_5_64_table.c" + "libspeex/exc_8_128_table.c" + "libspeex/fftwrap.c" + "libspeex/filters.c" + "libspeex/gain_table.c" + "libspeex/gain_table_lbr.c" + "libspeex/hexc_10_32_table.c" + "libspeex/hexc_table.c" + "libspeex/high_lsp_tables.c" + "libspeex/kiss_fft.c" + "libspeex/kiss_fftr.c" + "libspeex/lpc.c" + "libspeex/lsp.c" + "libspeex/lsp_tables_nb.c" + "libspeex/ltp.c" + "libspeex/modes.c" + "libspeex/modes_wb.c" + "libspeex/nb_celp.c" + "libspeex/quant_lsp.c" + "libspeex/sb_celp.c" + "libspeex/smallft.c" + "libspeex/speex.c" + "libspeex/speex_callbacks.c" + "libspeex/speex_header.c" + "libspeex/stereo.c" + "libspeex/vbr.c" + "libspeex/vq.c" + "libspeex/window.c" + "${CMAKE_CURRENT_BINARY_DIR}/libspeex.def" +) + +add_library(libspeex ${SRC}) + +install( + TARGETS libspeex + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h") +endif() + +# pkgconfig file +set(prefix ${CMAKE_INSTALL_PREFIX}) +set(exec_prefix ${CMAKE_INSTALL_PREFIX}) +set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) +set(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}) +set(LIBM ) +check_library_exists(m ceil "" LIBMEXIST) +if(LIBMEXIST) + list(APPEND LIBM -lm) +endif() +set(SPEEXLIB "${CMAKE_PROJECT_NAME}") +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + set(SPEEXLIB "${CMAKE_PROJECT_NAME}d") +endif() +configure_file(speex.pc.in speex.pc @ONLY) +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/speex.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/externals/vcpkg/ports/speex/portfile.cmake b/externals/vcpkg/ports/speex/portfile.cmake new file mode 100755 index 000000000..b3c81875c --- /dev/null +++ b/externals/vcpkg/ports/speex/portfile.cmake @@ -0,0 +1,47 @@ +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND PATCHES "0001-make-pkg-config-lib-name-configurable.patch") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xiph/speex + REF Speex-1.2.0 + SHA512 612dfd67a9089f929b7f2a613ed3a1d2fda3d3ec0a4adafe27e2c1f4542de1870b42b8042f0dcb16d52e08313d686cc35b76940776419c775417f5bad18b448f + HEAD_REF master + PATCHES ${PATCHES} +) + +if(VCPKG_TARGET_IS_WINDOWS) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + + vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON + ) + vcpkg_cmake_install() + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/speex/speex.h" + "extern const SpeexMode" + "__declspec(dllimport) extern const SpeexMode" + ) + endif() +else() + if(VCPKG_TARGET_IS_OSX) + message("${PORT} currently requires the following libraries from the system package manager:\n autoconf\n automake\n libtool\n\nIt can be installed with brew install autoconf automake libtool") + elseif(VCPKG_TARGET_IS_LINUX) + message("${PORT} currently requires the following libraries from the system package manager:\n autoconf\n automake\n libtool\n\nIt can be installed with apt-get install autoconf automake libtool") + endif() + vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + OPTIONS --disable-binaries # no example programs (require libogg) + ) + vcpkg_install_make() + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +endif() + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/speex/vcpkg.json b/externals/vcpkg/ports/speex/vcpkg.json new file mode 100755 index 000000000..b5f4250c0 --- /dev/null +++ b/externals/vcpkg/ports/speex/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "speex", + "version": "1.2.0", + "port-version": 11, + "description": "Speex is an Open Source/Free Software patent-free audio compression format designed for speech.", + "homepage": "https://github.com/xiph/speex", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true, + "platform": "windows" + } + ] +} diff --git a/externals/vcpkg/ports/speexdsp/CMakeLists.txt b/externals/vcpkg/ports/speexdsp/CMakeLists.txt new file mode 100755 index 000000000..6d9658916 --- /dev/null +++ b/externals/vcpkg/ports/speexdsp/CMakeLists.txt @@ -0,0 +1,120 @@ +cmake_minimum_required(VERSION 3.1) +option(USE_SSE "Use SSE" OFF) +option(USE_NEON "Use NEON" OFF) +option(FIXED_POINT "Use Fixed Point Arithmetic" OFF) + +set(LIBSPEEXDSP_VERSION "1.2.0") +set(LIBSPEEXDSP_SOVERSION "1") +project(libspeexdsp) + +set(LIBSPEEXDSP_SOURCES + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/buffer.c" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/fftwrap.c" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/filterbank.c" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/jitter.c" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/mdf.c" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/preprocess.c" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/resample.c" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/scal.c" +) +set(LIBSPEEXDSP_HEADERS + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/arch.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/bfin.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/fftwrap.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/filterbank.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/fixed_arm4.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/fixed_arm5e.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/fixed_bfin.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/fixed_debug.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/fixed_generic.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/math_approx.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/misc_bfin.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/os_support.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/pseudofloat.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/resample_neon.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/resample_sse.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/smallft.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/stack_alloc.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/vorbis_psy.h" + "${CMAKE_CURRENT_LIST_DIR}/include/speex/speex_buffer.h" +) +set(LIBSPEEXDSP_HEADERS_PUBLIC + "${CMAKE_CURRENT_LIST_DIR}/include/speex/speex_echo.h" + "${CMAKE_CURRENT_LIST_DIR}/include/speex/speex_jitter.h" + "${CMAKE_CURRENT_LIST_DIR}/include/speex/speex_preprocess.h" + "${CMAKE_CURRENT_LIST_DIR}/include/speex/speex_resampler.h" + "${CMAKE_CURRENT_LIST_DIR}/include/speex/speexdsp_types.h" +) + +set(CMAKE_C_VISIBILITY_PRESET hidden) +if (NOT BUILD_SHARED_LIBS) + add_definitions("-DEXPORT=") +elseif(WIN32) + add_definitions("-DEXPORT=") + list(APPEND LIBSPEEXDSP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/win32/libspeexdsp.def") +else() + add_definitions("-DEXPORT=__attribute__((visibility(\"default\")))") +endif() + +if (USE_SSE AND NOT FIXED_POINT) + add_definitions(-DUSE_SSE -DUSE_SSE2) +endif() +if (USE_NEON AND NOT MSVC) + add_definitions(-DUSE_NEON) +endif() + +if (FIXED_POINT) + add_definitions(-DFIXED_POINT -DUSE_KISS_FFT) + list(APPEND LIBSPEEXDSP_SOURCES + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/kiss_fft.c" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/kiss_fftr.c" + ) + list(APPEND LIBSPEEXDSP_HEADERS + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/_kiss_fft_guts.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/kiss_fft.h" + "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/kiss_fftr.h" + ) +else() + add_definitions(-DFLOATING_POINT -DUSE_SMALLFT) + list(APPEND LIBSPEEXDSP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/smallft.c") +endif() + +if (NOT MSVC) + add_definitions(-DVAR_ARRAYS) +endif() + +# Basic speexdsp_config_types.h for Linux support +set(INCLUDE_STDINT "#include ") +set(SIZE16 "int16_t") +set(USIZE16 "uint16_t") +set(SIZE32 "int32_t") +set(USIZE32 "uint32_t") +configure_file("${CMAKE_CURRENT_LIST_DIR}/include/speex/speexdsp_config_types.h.in" + "${CMAKE_CURRENT_BINARY_DIR}/speexdsp_config_types.h" @ONLY) +list(APPEND LIBSPEEXDSP_HEADERS_PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/speexdsp_config_types.h") + +include_directories("${CMAKE_CURRENT_LIST_DIR}/include") +include_directories("${CMAKE_CURRENT_BINARY_DIR}") + +add_library(speexdsp ${LIBSPEEXDSP_SOURCES} ${LIBSPEEXDSP_HEADERS}) +set_target_properties(speexdsp PROPERTIES PUBLIC_HEADER "${LIBSPEEXDSP_HEADERS_PUBLIC}") +set_target_properties(speexdsp PROPERTIES VERSION "${LIBSPEEXDSP_VERSION}") +set_target_properties(speexdsp PROPERTIES SOVERSION "${LIBSPEEXDSP_SOVERSION}") + +# pkgconfig file +set(prefix "${CMAKE_INSTALL_PREFIX}") +set(exec_prefix \${prefix}) +SET(bindir \${exec_prefix}/${CMAKE_INSTALL_BINDIR}) +SET(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR}) +SET(includedir \${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) +if(CMAKE_SYSTEM_NAME MATCHES BSD) + set(PKG_CONFIG_RPATH "-Wl,-R\${libdir}") +endif(CMAKE_SYSTEM_NAME MATCHES BSD) +set(PACKAGE_VERSION "${LIBSPEEXDSP_VERSION}") +configure_file(speexdsp.pc.in speexdsp.pc @ONLY) +install(FILES ${PROJECT_BINARY_DIR}/speexdsp.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + +install(TARGETS speexdsp + ARCHIVE DESTINATION "lib" + RUNTIME DESTINATION "bin" + PUBLIC_HEADER DESTINATION "include/speex") diff --git a/externals/vcpkg/ports/speexdsp/jitter_ctl.patch b/externals/vcpkg/ports/speexdsp/jitter_ctl.patch new file mode 100755 index 000000000..0fd3971e9 --- /dev/null +++ b/externals/vcpkg/ports/speexdsp/jitter_ctl.patch @@ -0,0 +1,14 @@ +diff --git a/win32/libspeexdsp.def b/win32/libspeexdsp.def +index 45fc69d9..9b5abbad 100755 +--- a/win32/libspeexdsp.def ++++ b/win32/libspeexdsp.def +@@ -40,6 +40,8 @@ jitter_buffer_get + jitter_buffer_get_pointer_timestamp + jitter_buffer_tick + jitter_buffer_update_delay ++jitter_buffer_ctl ++jitter_buffer_remaining_span + + ; + ; speex_preprocess.h + \ No newline at end of file diff --git a/externals/vcpkg/ports/speexdsp/portfile.cmake b/externals/vcpkg/ports/speexdsp/portfile.cmake new file mode 100755 index 000000000..276ea6e4d --- /dev/null +++ b/externals/vcpkg/ports/speexdsp/portfile.cmake @@ -0,0 +1,50 @@ +if(VCPKG_USE_HEAD_VERSION) + vcpkg_from_gitlab( + GITLAB_URL "https://gitlab.xiph.org" + OUT_SOURCE_PATH SOURCE_PATH + REPO xiph/speexdsp + HEAD_REF master + ) +else() + # Since the github repo is out-dated, use official download URL for release builds to reduce traffic to the Gitlab host + vcpkg_download_distfile(ARCHIVE + URLS "http://downloads.xiph.org/releases/speex/speexdsp-1.2.0.tar.gz" + FILENAME "speexdsp-1.2.0.tar.gz" + SHA512 e357cd5377415ea66c862302c7cf8bf6a10063cacd903f0846478975b87974cf5bdf00e2c6759d8f4f453c4c869cf284e9dc948a84a83d7b2ab96bd5405c05ec + ) + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF "1.2.0" + PATCHES + jitter_ctl.patch + ) +endif() + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +set(USE_SSE OFF) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(USE_SSE ON) +endif() +set(USE_NEON OFF) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(USE_NEON ON) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DUSE_SSE=${USE_SSE} + -DUSE_NEON=${USE_NEON} +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") diff --git a/externals/vcpkg/ports/speexdsp/vcpkg.json b/externals/vcpkg/ports/speexdsp/vcpkg.json new file mode 100755 index 000000000..f62f8416d --- /dev/null +++ b/externals/vcpkg/ports/speexdsp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "speexdsp", + "version": "1.2.0", + "port-version": 7, + "description": "A patent-free, Open Source/Free Software DSP library.", + "homepage": "https://speex.org/" +} diff --git a/externals/vcpkg/ports/spirit-po/portfile.cmake b/externals/vcpkg/ports/spirit-po/portfile.cmake new file mode 100755 index 000000000..36b9564bb --- /dev/null +++ b/externals/vcpkg/ports/spirit-po/portfile.cmake @@ -0,0 +1,15 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cbeck88/spirit-po + REF v1.1.2 + SHA512 990e26e041607fe81cc2df673bd9e5e2647537d7e121b2300e631874dcd4ccdb084159fa4f635b128c39143c9423d67c494af05206b665541124a0447b8f4a3f + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/include/spirit_po + DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# spirit-po is header-only, so no vcpkg_{configure,install}_cmake + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/spirit-po RENAME copyright) diff --git a/externals/vcpkg/ports/spirit-po/vcpkg.json b/externals/vcpkg/ports/spirit-po/vcpkg.json new file mode 100755 index 000000000..e088d9ebc --- /dev/null +++ b/externals/vcpkg/ports/spirit-po/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "spirit-po", + "version-string": "1.1.2", + "port-version": 2, + "description": "A header-only C++ library for localization using GNU gettext po files, based on Boost.Spirit.", + "homepage": "https://github.com/cbeck88/spirit-po", + "dependencies": [ + "boost" + ] +} diff --git a/externals/vcpkg/ports/spirv-cross/portfile.cmake b/externals/vcpkg/ports/spirv-cross/portfile.cmake new file mode 100755 index 000000000..e177784fe --- /dev/null +++ b/externals/vcpkg/ports/spirv-cross/portfile.cmake @@ -0,0 +1,42 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KhronosGroup/SPIRV-Cross + REF 2021-01-15 + SHA512 f934ef61602223f6fe6d9c826ed5beb129beb7a30b18b389625d4fc0b1efa1b8df930a2a2d2a0b4f377ef2899e8e034239819a4c6629a78c666f72004464da93 + HEAD_REF master +) + +if(VCPKG_TARGET_IS_IOS) + message(STATUS "Using iOS trplet. Executables won't be created...") + set(BUILD_CLI OFF) +else() + set(BUILD_CLI ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS=OFF + -DSPIRV_CROSS_CLI=${BUILD_CLI} + -DSPIRV_CROSS_SKIP_INSTALL=OFF + -DSPIRV_CROSS_ENABLE_C_API=ON +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +foreach(COMPONENT core c cpp glsl hlsl msl reflect util) + vcpkg_cmake_config_fixup(CONFIG_PATH share/spirv_cross_${COMPONENT}/cmake PACKAGE_NAME spirv_cross_${COMPONENT}) +endforeach() + +if(BUILD_CLI) + vcpkg_copy_tools(TOOL_NAMES spirv-cross AUTO_CLEAN) +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") diff --git a/externals/vcpkg/ports/spirv-cross/vcpkg.json b/externals/vcpkg/ports/spirv-cross/vcpkg.json new file mode 100755 index 000000000..dc05fe058 --- /dev/null +++ b/externals/vcpkg/ports/spirv-cross/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "spirv-cross", + "version-date": "2021-01-15", + "port-version": 2, + "description": "SPIRV-Cross is a practical tool and library for performing reflection on SPIR-V and disassembling SPIR-V back to high level languages.", + "homepage": "https://github.com/KhronosGroup/SPIRV-Cross", + "dependencies": [ + "spirv-headers", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/spirv-headers/portfile.cmake b/externals/vcpkg/ports/spirv-headers/portfile.cmake new file mode 100755 index 000000000..272746438 --- /dev/null +++ b/externals/vcpkg/ports/spirv-headers/portfile.cmake @@ -0,0 +1,14 @@ + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KhronosGroup/SPIRV-Headers + REF sdk-1.3.204.1 + SHA512 ef994e0a5232cb21377ed39ef6a941b59eb45524f1d78092a6476245e4e0fb692780e98f5cc2176fdc2fd95430cce523fa376b0eed97042523b5f14a0586955f + HEAD_REF master +) + +# This must be spirv as other spirv packages expect it there. +file(COPY "${SOURCE_PATH}/include/spirv/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/spirv") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/spirv-headers/vcpkg.json b/externals/vcpkg/ports/spirv-headers/vcpkg.json new file mode 100755 index 000000000..ff5cf7cf8 --- /dev/null +++ b/externals/vcpkg/ports/spirv-headers/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "spirv-headers", + "version": "1.3.204.1", + "description": "Machine-readable files for the SPIR-V Registry", + "homepage": "https://github.com/KhronosGroup/SPIRV-Headers" +} diff --git a/externals/vcpkg/ports/spirv-reflect/CMakeLists.txt b/externals/vcpkg/ports/spirv-reflect/CMakeLists.txt new file mode 100755 index 000000000..7fc007d90 --- /dev/null +++ b/externals/vcpkg/ports/spirv-reflect/CMakeLists.txt @@ -0,0 +1,33 @@ +cmake_minimum_required(VERSION 3.1) +project(spirv-reflect) + +set_property(GLOBAL PROPERTY USE_FOLDERS ON) + +add_library(spirv-reflect ${CMAKE_CURRENT_SOURCE_DIR}/spirv_reflect.h + ${CMAKE_CURRENT_SOURCE_DIR}/spirv_reflect.c) +if (SPIRV_REFLECT_ENABLE_ASSERTS) + target_compile_definitions(spirv-reflect PRIVATE SPIRV_REFLECT_ENABLE_ASSERTS) +endif() +set_target_properties(spirv-reflect PROPERTIES CXX_STANDARD 11) +target_include_directories(spirv-reflect PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) +if(WIN32) + target_compile_definitions(spirv-reflect PRIVATE _CRT_SECURE_NO_WARNINGS) +endif() + +target_include_directories(spirv-reflect INTERFACE $) + +install( + TARGETS spirv-reflect EXPORT unofficial-spirv-reflect-config + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) + +install( + EXPORT unofficial-spirv-reflect-config + NAMESPACE unofficial::spirv-reflect:: + DESTINATION share/unofficial-spirv-reflect +) + +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/spirv_reflect.h" DESTINATION include) +install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include" DESTINATION include) diff --git a/externals/vcpkg/ports/spirv-reflect/portfile.cmake b/externals/vcpkg/ports/spirv-reflect/portfile.cmake new file mode 100755 index 000000000..068652edd --- /dev/null +++ b/externals/vcpkg/ports/spirv-reflect/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KhronosGroup/SPIRV-Reflect + REF sdk-1.3.204.1 + SHA512 af0bfcb7a8565cbd981034900760d304792e9dfb0a166b712e3506475fdeff282e0ba0f02d82d671ee05e7ed0792815eba654b66af0739404bf38c9e12ebf4f5 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/spirv-reflect" RENAME copyright) diff --git a/externals/vcpkg/ports/spirv-reflect/vcpkg.json b/externals/vcpkg/ports/spirv-reflect/vcpkg.json new file mode 100755 index 000000000..dc532e47d --- /dev/null +++ b/externals/vcpkg/ports/spirv-reflect/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "spirv-reflect", + "version": "1.3.204.1", + "description": "SPIRV-Reflect is a lightweight library that provides a C/C++ reflection API for SPIR-V shader bytecode in Vulkan applications.", + "homepage": "https://github.com/KhronosGroup/SPIRV-Reflect", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "vulkan" + ] +} diff --git a/externals/vcpkg/ports/spirv-tools/portfile.cmake b/externals/vcpkg/ports/spirv-tools/portfile.cmake new file mode 100755 index 000000000..3997af9ef --- /dev/null +++ b/externals/vcpkg/ports/spirv-tools/portfile.cmake @@ -0,0 +1,88 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KhronosGroup/SPIRV-Tools + REF v2022.1 + SHA512 19ff4386c74c15f9b870d5348b76c7d643da5bf1637b1faed153d9ec9f00de941a83a22782f169b4aa5001c715721937c3bb3bc07541a60e503a0455a1d2287e +) + +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") + +if(VCPKG_TARGET_IS_IOS) + message(STATUS "Using iOS trplet. Executables won't be created...") + set(TOOLS_INSTALL OFF) + set(SKIP_EXECUTABLES ON) +else() + set(TOOLS_INSTALL ON) + set(SKIP_EXECUTABLES OFF) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSPIRV-Headers_SOURCE_DIR=${CURRENT_INSTALLED_DIR} + -DSPIRV_WERROR=OFF + -DSPIRV_SKIP_TESTS=ON + -DSPIRV_SKIP_EXECUTABLES=${SKIP_EXECUTABLES} + -DENABLE_SPIRV_TOOLS_INSTALL=${TOOLS_INSTALL} + -DSPIRV_TOOLS_BUILD_STATIC=ON + -DENABLE_SPIRV_TOOLS_INSTALL=ON +) + +vcpkg_cmake_install() + # the directory name is capitalized as opposed to the port name +if(WIN32) + vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools/cmake PACKAGE_NAME SPIRV-Tools) + vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools-link/cmake PACKAGE_NAME SPIRV-Tools-link) + vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools-lint/cmake PACKAGE_NAME SPIRV-Tools-lint) + vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools-opt/cmake PACKAGE_NAME SPIRV-Tools-opt) + vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools-reduce/cmake PACKAGE_NAME SPIRV-Tools-reduce) +else() + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools PACKAGE_NAME SPIRV-Tools DO_NOT_DELETE_PARENT_CONFIG_PATH) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-link PACKAGE_NAME SPIRV-Tools-link DO_NOT_DELETE_PARENT_CONFIG_PATH) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-lint PACKAGE_NAME SPIRV-Tools-lint DO_NOT_DELETE_PARENT_CONFIG_PATH) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-opt PACKAGE_NAME SPIRV-Tools-opt DO_NOT_DELETE_PARENT_CONFIG_PATH) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-reduce PACKAGE_NAME SPIRV-Tools-reduce) # now delete +endif() +vcpkg_fixup_pkgconfig() + +if(TOOLS_INSTALL) + vcpkg_copy_tools( + TOOL_NAMES + spirv-as + spirv-cfg + spirv-dis + spirv-link + spirv-lint + spirv-opt + spirv-reduce + spirv-val + AUTO_CLEAN + ) +endif() + +if(WIN32) + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools" + "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools-link" + "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools-lint" + "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools-opt" + "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools-reduce" + "${CURRENT_PACKAGES_DIR}/SPIRV-Tools" + "${CURRENT_PACKAGES_DIR}/SPIRV-Tools-link" + "${CURRENT_PACKAGES_DIR}/SPIRV-Tools-lint" + "${CURRENT_PACKAGES_DIR}/SPIRV-Tools-opt" + "${CURRENT_PACKAGES_DIR}/SPIRV-Tools-reduce" + ) +endif() +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # lesspipe.sh is the only file there + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/spirv-tools/vcpkg.json b/externals/vcpkg/ports/spirv-tools/vcpkg.json new file mode 100755 index 000000000..01d71eb66 --- /dev/null +++ b/externals/vcpkg/ports/spirv-tools/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "spirv-tools", + "version": "2022.1", + "description": "API and commands for processing SPIR-V modules", + "homepage": "https://github.com/KhronosGroup/SPIRV-Tools", + "license": "Apache-2.0", + "dependencies": [ + "spirv-headers", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/spix/portfile.cmake b/externals/vcpkg/ports/spix/portfile.cmake new file mode 100755 index 000000000..91512aa78 --- /dev/null +++ b/externals/vcpkg/ports/spix/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO faaxm/spix + REF v0.3 + SHA512 be5695e1e061583645a711c91f218c2038ed66896932d9f32129242d20d0a451a032d53aee2fdb917f1423de96ebcba97887421636a13260a7e7c228a13666c0 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ANYRPC_LIB_BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSPIX_BUILD_EXAMPLES=OFF + -DSPIX_BUILD_TESTS=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/spix/vcpkg.json b/externals/vcpkg/ports/spix/vcpkg.json new file mode 100755 index 000000000..e2e1e5c48 --- /dev/null +++ b/externals/vcpkg/ports/spix/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "spix", + "version": "0.3", + "description": "A minimally invasive UI testing library that enables your Qt/QML app's UI to be controlled either via c++ code, or through an http RPC interface.", + "homepage": "https://github.com/faaxm/spix", + "dependencies": [ + "anyrpc", + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/sprout/portfile.cmake b/externals/vcpkg/ports/sprout/portfile.cmake new file mode 100755 index 000000000..5cfb923b3 --- /dev/null +++ b/externals/vcpkg/ports/sprout/portfile.cmake @@ -0,0 +1,14 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO bolero-MURAKAMI/Sprout + REF 6b5addba9face0a6403e66e7db2aa94d87387f61 + SHA512 b81c299842c48626a7fbedb5b70932623ddb128bd5c71115269253b2c82a331d4f5d5adeab24529be2c886d293de96c15c9641280b4eb31bd60379b284556900 + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/sprout DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/sprout/vcpkg.json b/externals/vcpkg/ports/sprout/vcpkg.json new file mode 100755 index 000000000..22bab62af --- /dev/null +++ b/externals/vcpkg/ports/sprout/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "sprout", + "version-string": "2019-06-20", + "port-version": 1, + "description": "C++11/14 constexpr based Containers, Algorithms, Random numbers, Parsing, Ray tracing, Synthesizer, and others", + "homepage": "https://github.com/bolero-MURAKAMI/Sprout", + "dependencies": [ + "boost-array", + "boost-mpl" + ] +} diff --git a/externals/vcpkg/ports/spscqueue/portfile.cmake b/externals/vcpkg/ports/spscqueue/portfile.cmake new file mode 100755 index 000000000..e1650e852 --- /dev/null +++ b/externals/vcpkg/ports/spscqueue/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rigtorp/SPSCQueue + REF v1.1 + SHA512 148d60b3677f9d96603413577ff7062d8830bfec955cf3631bea66e5937ee0564d3ff51d05bf9417e5f964e761b7d7fbb8a871e5b6e0fe21112479b4830b0025 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/SPSCQueue) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/spscqueue/vcpkg.json b/externals/vcpkg/ports/spscqueue/vcpkg.json new file mode 100755 index 000000000..9ed6879f3 --- /dev/null +++ b/externals/vcpkg/ports/spscqueue/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "spscqueue", + "version-string": "1.1", + "port-version": 1, + "description": "A bounded single-producer single-consumer wait-free and lock-free queue written in C++11", + "homepage": "https://github.com/rigtorp/SPSCQueue" +} diff --git a/externals/vcpkg/ports/sqlcipher/CMakeLists.txt b/externals/vcpkg/ports/sqlcipher/CMakeLists.txt new file mode 100755 index 000000000..35eeb68aa --- /dev/null +++ b/externals/vcpkg/ports/sqlcipher/CMakeLists.txt @@ -0,0 +1,74 @@ +cmake_minimum_required(VERSION 3.10) +project(sqlcipher C) + +find_package(OpenSSL REQUIRED) + +include_directories(. ${OPENSSL_INCLUDE_DIR}) +if(BUILD_SHARED_LIBS) + if(UNIX) + set(API "-DSQLITE_API=__attribute__((visibility(\"default\")))") + elseif(CMAKE_SYSTEM_NAME MATCHES "Windows") + set(API "-DSQLITE_API=__declspec(dllexport)") + else() + message(FATAL_ERROR "Unsupported platform: ${CMAKE_SYSTEM_NAME}") + endif() +else() + set(API "-DSQLITE_API=extern") +endif() +add_library(sqlcipher sqlite3.c) + +target_compile_definitions( + sqlcipher + PRIVATE + $<$:SQLITE_DEBUG> + ${API} + -DSQLITE_ENABLE_RTREE + -DSQLITE_ENABLE_UNLOCK_NOTIFY + -DSQLITE_ENABLE_COLUMN_METADATA + -DSQLITE_HAS_CODEC + -DSQLITE_TEMP_STORE=2 +) + +if(WITH_GEOPOLY) + add_compile_definitions(SQLITE_ENABLE_GEOPOLY) +endif() + +if(WITH_JSON1) + add_compile_definitions(SQLITE_ENABLE_JSON1) +endif() + +target_include_directories(sqlcipher INTERFACE $) +if(NOT WIN32) + find_package(Threads REQUIRED) + target_link_libraries(sqlcipher PRIVATE Threads::Threads ${CMAKE_DL_LIBS}) +endif() +if (UNIX AND NOT APPLE) + target_link_libraries(sqlcipher PRIVATE m) +endif() + +target_link_libraries(sqlcipher PRIVATE ${OPENSSL_CRYPTO_LIBRARY}) + +if(CMAKE_SYSTEM_NAME MATCHES "WindowsStore") + target_compile_definitions(sqlcipher PRIVATE -DSQLITE_OS_WINRT=1) +endif() + +if(NOT SQLITE3_SKIP_TOOLS) + add_executable(sqlcipher-bin shell.c) + target_link_libraries(sqlcipher-bin PRIVATE sqlcipher) + install(TARGETS sqlcipher-bin sqlcipher + RUNTIME DESTINATION tools/sqlcipher + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + ) +endif() + +install( + TARGETS sqlcipher + EXPORT sqlcipher-targets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(FILES sqlite3.h sqlite3ext.h DESTINATION include/sqlcipher CONFIGURATIONS Release) +install(EXPORT sqlcipher-targets NAMESPACE sqlcipher:: FILE sqlcipher-targets.cmake DESTINATION share/sqlcipher) diff --git a/externals/vcpkg/ports/sqlcipher/portfile.cmake b/externals/vcpkg/ports/sqlcipher/portfile.cmake new file mode 100755 index 000000000..55d0b01e4 --- /dev/null +++ b/externals/vcpkg/ports/sqlcipher/portfile.cmake @@ -0,0 +1,84 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sqlcipher/sqlcipher + REF v4.5.1 + SHA512 157ab90e1b80ae9ae85c68c6b77008fe8ab5b526cbb2604297a5ba54279286b4cac1fecd0db552e0113a75ff61a198f649611b8bde4dec5156c443e7b7fbe0c3 + HEAD_REF master +) + +# Don't use vcpkg_build_nmake, because it doesn't handle nmake targets correctly. +find_program(NMAKE nmake REQUIRED) + +# Find tclsh Executable needed for Amalgamation of SQLite +file(GLOB TCLSH_CMD + ${CURRENT_INSTALLED_DIR}/tools/tcl/bin/tclsh*${VCPKG_HOST_EXECUTABLE_SUFFIX} +) +file(TO_NATIVE_PATH "${TCLSH_CMD}" TCLSH_CMD) +file(TO_NATIVE_PATH "${SOURCE_PATH}" SOURCE_PATH_NAT) + +# Determine TCL version (e.g. [path]tclsh90s.exe -> 90) +string(REGEX REPLACE ^.*tclsh "" TCLVERSION ${TCLSH_CMD}) +string(REGEX REPLACE [A-Za-z]?${VCPKG_HOST_EXECUTABLE_SUFFIX}$ "" TCLVERSION ${TCLVERSION}) + +list(APPEND NMAKE_OPTIONS + TCLSH_CMD="${TCLSH_CMD}" + TCLVERSION=${TCLVERSION} + ORIGINAL_SRC="${SOURCE_PATH_NAT}" + EXT_FEATURE_FLAGS=-DSQLITE_TEMP_STORE=2\ -DSQLITE_HAS_CODEC + LTLIBS=libcrypto.lib + LTLIBPATHS=/LIBPATH:"${CURRENT_INSTALLED_DIR}/lib/" +) + +set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;$ENV{INCLUDE}") + +# Creating amalgamation files +message(STATUS "Pre-building ${TARGET_TRIPLET}") +vcpkg_execute_required_process( + COMMAND ${NMAKE} -f Makefile.msc /A /NOLOGO clean tcl + ${NMAKE_OPTIONS} + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME pre-build-${TARGET_TRIPLET} +) +message(STATUS "Pre-building ${TARGET_TRIPLET} done") + +# The rest of the build process with the CMakeLists.txt is merely a copy of sqlite3 + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + geopoly WITH_GEOPOLY + json1 WITH_JSON1 + INVERTED_FEATURES + tool SQLITE3_SKIP_TOOLS +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS ${FEATURE_OPTIONS} + OPTIONS_DEBUG + -DSQLITE3_SKIP_TOOLS=ON +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT} TARGET_PATH share/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +if(NOT SQLITE3_SKIP_TOOLS AND EXISTS ${CURRENT_PACKAGES_DIR}/tools/${PORT}/sqlcipher-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/${PORT}/sqlcipher-bin${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/${PORT}/sqlcipher${VCPKG_HOST_EXECUTABLE_SUFFIX}) +endif() + +configure_file( + ${CMAKE_CURRENT_LIST_DIR}/sqlcipher-config.in.cmake + ${CURRENT_PACKAGES_DIR}/share/${PORT}/sqlcipher-config.cmake + @ONLY +) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_copy_pdbs() +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) diff --git a/externals/vcpkg/ports/sqlcipher/sqlcipher-config.in.cmake b/externals/vcpkg/ports/sqlcipher/sqlcipher-config.in.cmake new file mode 100755 index 000000000..308ea4715 --- /dev/null +++ b/externals/vcpkg/ports/sqlcipher/sqlcipher-config.in.cmake @@ -0,0 +1,7 @@ + +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32) + include(CMakeFindDependencyMacro) + find_dependency(Threads) +endif() + +include(${CMAKE_CURRENT_LIST_DIR}/sqlcipher-targets.cmake) diff --git a/externals/vcpkg/ports/sqlcipher/vcpkg.json b/externals/vcpkg/ports/sqlcipher/vcpkg.json new file mode 100755 index 000000000..2d67e5175 --- /dev/null +++ b/externals/vcpkg/ports/sqlcipher/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "sqlcipher", + "version": "4.5.1", + "description": "SQLCipher extends the SQLite database library to add security enhancements that make it more suitable for encrypted local data storage.", + "homepage": "https://www.zetetic.net/sqlcipher", + "supports": "windows & !uwp & !static", + "dependencies": [ + "openssl", + "tcl" + ], + "features": { + "geopoly": { + "description": "enable geopoly functionality for sqlite3" + }, + "json1": { + "description": "enable JSON functionality for sqlite3" + }, + "tool": { + "description": "sqlite3 executable" + } + } +} diff --git a/externals/vcpkg/ports/sqlite-modern-cpp/portfile.cmake b/externals/vcpkg/ports/sqlite-modern-cpp/portfile.cmake new file mode 100755 index 000000000..5d4cad040 --- /dev/null +++ b/externals/vcpkg/ports/sqlite-modern-cpp/portfile.cmake @@ -0,0 +1,13 @@ +# header only +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO SqliteModernCpp/sqlite_modern_cpp + REF 936cd0c86aacac87a3dab32906397944ae5f6c3d + SHA512 8ce1b7593fe77dcab297ab4cae0158b43d55b33c1823b2dc5bf22e5545d9781d675ba5ac82b81782f502b34d2335eee2c26167726746a61a0ad566b657d2faf0 + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/hdr/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/sqlite-modern-cpp) +file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/sqlite-modern-cpp RENAME copyright) diff --git a/externals/vcpkg/ports/sqlite-modern-cpp/vcpkg.json b/externals/vcpkg/ports/sqlite-modern-cpp/vcpkg.json new file mode 100755 index 000000000..39dbdc1d1 --- /dev/null +++ b/externals/vcpkg/ports/sqlite-modern-cpp/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "sqlite-modern-cpp", + "version-string": "3.2-936cd0c8", + "port-version": 1, + "description": "The C++14 wrapper around sqlite library", + "homepage": "https://github.com/aminroosta/sqlite_modern_cpp", + "dependencies": [ + "sqlite3" + ] +} diff --git a/externals/vcpkg/ports/sqlite-orm/fix-dependency.patch b/externals/vcpkg/ports/sqlite-orm/fix-dependency.patch new file mode 100755 index 000000000..7372d67fe --- /dev/null +++ b/externals/vcpkg/ports/sqlite-orm/fix-dependency.patch @@ -0,0 +1,10 @@ +diff --git a/cmake/SqliteOrmConfig.cmake.in b/cmake/SqliteOrmConfig.cmake.in +index e0635d2..30403cd 100644 +--- a/cmake/SqliteOrmConfig.cmake.in ++++ b/cmake/SqliteOrmConfig.cmake.in +@@ -1,4 +1,4 @@ + include(CMakeFindDependencyMacro) +-find_dependency(SQLite3) ++find_dependency(unofficial-sqlite3) + + include(${CMAKE_CURRENT_LIST_DIR}/SqliteOrmTargets.cmake) diff --git a/externals/vcpkg/ports/sqlite-orm/fix-features-build-error.patch b/externals/vcpkg/ports/sqlite-orm/fix-features-build-error.patch new file mode 100755 index 000000000..fa7ca257a --- /dev/null +++ b/externals/vcpkg/ports/sqlite-orm/fix-features-build-error.patch @@ -0,0 +1,45 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -31,15 +31,14 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") + include(CTest) + + ### Dependencies +-add_subdirectory(dependencies) + + ### Main Build Targets + set(SqliteOrm_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/include") + add_library(sqlite_orm INTERFACE) + add_library(sqlite_orm::sqlite_orm ALIAS sqlite_orm) + +-find_package(SQLite3 REQUIRED) +-target_link_libraries(sqlite_orm INTERFACE SQLite::SQLite3) ++find_package(unofficial-sqlite3 CONFIG REQUIRED) ++target_link_libraries(sqlite_orm INTERFACE unofficial::sqlite3::sqlite3) + + target_sources(sqlite_orm INTERFACE $) + +diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt +index 2857b65..3ee46e6 100644 +--- a/examples/CMakeLists.txt ++++ b/examples/CMakeLists.txt +@@ -4,5 +4,5 @@ file(GLOB files "*.cpp") + foreach(file ${files}) + get_filename_component(file_basename ${file} NAME_WE) + add_executable(${file_basename} ${file}) +- target_link_libraries(${file_basename} PRIVATE sqlite_orm sqlite3) ++ target_link_libraries(${file_basename} PRIVATE sqlite_orm) + endforeach() +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index fd41e70..8087899 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -0,6 +0,8 @@ + cmake_minimum_required (VERSION 3.2) + + option(SQLITE_ORM_OMITS_CODECVT "Omits codec testing" OFF) ++ ++find_package(Catch2 CONFIG REQUIRED) + + add_executable(unit_tests + tests.cpp diff --git a/externals/vcpkg/ports/sqlite-orm/portfile.cmake b/externals/vcpkg/ports/sqlite-orm/portfile.cmake new file mode 100755 index 000000000..d569626d2 --- /dev/null +++ b/externals/vcpkg/ports/sqlite-orm/portfile.cmake @@ -0,0 +1,34 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO fnc12/sqlite_orm + REF v1.7.1 + SHA512 ab934959245e8e0aaefd543ef0c1ab336547e4c311aff9dda916c7577c006622dec917313350d0d8bde4366d42b458c915fc2ea2fb927c01910fe429e55c8bbc + HEAD_REF master + PATCHES + fix-features-build-error.patch + fix-dependency.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + test BUILD_TESTING + example BUILD_EXAMPLES +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DSQLITE_ORM_ENABLE_CXX_17=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME SqliteOrm CONFIG_PATH lib/cmake/SqliteOrm) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/sqlite-orm/vcpkg.json b/externals/vcpkg/ports/sqlite-orm/vcpkg.json new file mode 100755 index 000000000..8ad253184 --- /dev/null +++ b/externals/vcpkg/ports/sqlite-orm/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "sqlite-orm", + "version": "1.7.1", + "description": "SQLite ORM light header only library for modern C++", + "homepage": "https://github.com/fnc12/sqlite_orm", + "dependencies": [ + "sqlite3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "example": { + "description": "Build examples" + }, + "test": { + "description": "Build sqlite_orm unit tests", + "dependencies": [ + "catch2" + ] + } + } +} diff --git a/externals/vcpkg/ports/sqlite3/CMakeLists.txt b/externals/vcpkg/ports/sqlite3/CMakeLists.txt new file mode 100755 index 000000000..aa14b8bb9 --- /dev/null +++ b/externals/vcpkg/ports/sqlite3/CMakeLists.txt @@ -0,0 +1,171 @@ +cmake_minimum_required(VERSION 3.10) + +project(sqlite3 C) + +option(ENABLE_FTS3 "Enable the FTS3 extension" OFF) +option(ENABLE_FTS4 "Enable the FTS4 extension" OFF) +option(ENABLE_FTS5 "Enable the FTS5 extension" OFF) +option(ENABLE_MEMSYS3 "Enable MEMSYS3" OFF) +option(ENABLE_MEMSYS5 "Enable MEMSYS5" OFF) +option(ENABLE_MATH_FUNCTION "Enable math functions" OFF) +option(ENABLE_LIMIT "Enable the UPDATE/DELETE LIMIT clause" OFF) +option(ENABLE_RTREE "Enable the RTREE extension" OFF) +option(ENABLE_SESSION "Enable the SESSION extension" OFF) +option(ENABLE_OMIT_LOAD_EXT "Enable loading of external extensions" OFF) +option(WITH_GEOPOLY "Enable geopoly functionality for sqlite3" OFF) +option(WITH_JSON1 "Enable JSON functionality for sqlite3" OFF) +option(WITH_ZLIB "Build sqlite3 with zlib support" OFF) +option(SQLITE3_SKIP_TOOLS "Disable build sqlite3 executable" OFF) + +if(BUILD_SHARED_LIBS) + if(UNIX) + set(SQLITE_API "-DSQLITE_API=__attribute__((visibility(\"default\")))") + elseif(WIN32) + set(SQLITE_API "-DSQLITE_API=__declspec(dllexport)") + else() + message(FATAL_ERROR "Unsupported platform: ${CMAKE_SYSTEM_NAME}") + endif() +endif() + +add_library(sqlite3 sqlite3.c) + +target_include_directories(sqlite3 PUBLIC $ $) + +target_compile_definitions( + sqlite3 + PRIVATE + $<$:SQLITE_DEBUG=1> + $<$:SQLITE_ENABLE_SELECTTRACE> + $<$:SQLITE_ENABLE_WHERETRACE> + ${SQLITE_API} + -DSQLITE_ENABLE_UNLOCK_NOTIFY + -DSQLITE_ENABLE_COLUMN_METADATA +) + +if (BUILD_SHARED_LIBS) + if (UNIX) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_API=__attribute__((visibility(\"default\")))") + target_compile_definitions(sqlite3 INTERFACE "SQLITE_API=__attribute__((visibility(\"default\")))") + elseif (WIN32) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_API=__declspec(dllimport)") + target_compile_definitions(sqlite3 INTERFACE "SQLITE_API=__declspec(dllimport)") + endif() +endif() + +if (ENABLE_FTS3) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_FTS3") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_FTS3) +endif() + +if (ENABLE_FTS4) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_FTS4") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_FTS4) +endif() + +if (ENABLE_FTS5) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_FTS5") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_FTS5) +endif() + +if (ENABLE_MEMSYS3) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_MEMSYS3") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_MEMSYS3) +endif() + +if (ENABLE_MEMSYS5) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_MEMSYS5") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_MEMSYS5) +endif() + +if (ENABLE_MATH_FUNCTION) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_MATH_FUNCTIONS") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_MATH_FUNCTIONS) +endif() + +if (ENABLE_LIMIT) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_UPDATE_DELETE_LIMIT) +endif() + +if (ENABLE_RTREE) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_RTREE") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_RTREE) +endif() + +if (ENABLE_SESSION) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_PREUPDATE_HOOK") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_SESSION SQLITE_ENABLE_PREUPDATE_HOOK) +endif() + +if (ENABLE_OMIT_LOAD_EXT) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_OMIT_LOAD_EXTENSION") + target_compile_definitions(sqlite3 PUBLIC SQLITE_OMIT_LOAD_EXTENSION) +endif() + +if(WITH_GEOPOLY) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_GEOPOLY") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_GEOPOLY) +endif() + +if(WITH_JSON1) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_JSON1") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_JSON1) +endif() + +if (WIN32) + string(APPEND PKGCONFIG_DEFINES " -DQLITE_OS_WIN=1") + target_compile_definitions(sqlite3 PUBLIC -DSQLITE_OS_WIN=1) + + if(CMAKE_SYSTEM_NAME MATCHES "WindowsStore") + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_OS_WINRT=1") + target_compile_definitions(sqlite3 PUBLIC -DSQLITE_OS_WINRT=1) + endif() +else() + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_OS_UNIX=1") + target_compile_definitions(sqlite3 PUBLIC -DSQLITE_OS_UNIX=1) +endif() + +if(NOT WIN32) + find_package(Threads REQUIRED) + target_link_libraries(sqlite3 PUBLIC Threads::Threads ${CMAKE_DL_LIBS}) +endif() + +if (WITH_ZLIB) + find_package(ZLIB REQUIRED) + target_link_libraries(sqlite3 PUBLIC ZLIB::ZLIB) +endif() + +if(NOT SQLITE3_SKIP_TOOLS) + add_executable(sqlite3-bin shell.c) + + target_link_libraries(sqlite3-bin PRIVATE sqlite3) + + install(TARGETS sqlite3-bin sqlite3 + RUNTIME DESTINATION tools + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + ) +endif() + +install( + TARGETS sqlite3 + EXPORT unofficial-sqlite3-targets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(FILES sqlite3.h sqlite3ext.h DESTINATION include CONFIGURATIONS Release) +install(EXPORT unofficial-sqlite3-targets NAMESPACE unofficial::sqlite3:: FILE unofficial-sqlite3-targets.cmake DESTINATION share/unofficial-sqlite3) + +if(UNIX) + set(PKGCONFIG_LIBS_PRIVATE "-lm -ldl") + if(NOT ANDROID) + string(APPEND PKGCONFIG_LIBS_PRIVATE " -lpthread") + endif() +else() + set(PKGCONFIG_LIBS_PRIVATE "") +endif() + +configure_file(sqlite3.pc.in sqlite3.pc @ONLY) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sqlite3.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") diff --git a/externals/vcpkg/ports/sqlite3/fix-arm-uwp.patch b/externals/vcpkg/ports/sqlite3/fix-arm-uwp.patch new file mode 100755 index 000000000..03e092965 --- /dev/null +++ b/externals/vcpkg/ports/sqlite3/fix-arm-uwp.patch @@ -0,0 +1,33 @@ +diff --git a/shell.c b/shell.c +index 10d8cc1..99f37a5 100644 +--- a/shell.c ++++ b/shell.c +@@ -316,7 +316,11 @@ static int hasTimer(void){ + */ + hProcess = GetCurrentProcess(); + if( hProcess ){ ++#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP) + HINSTANCE hinstLib = LoadLibrary(TEXT("Kernel32.dll")); ++#else ++ HINSTANCE hinstLib = LoadPackagedLibrary(TEXT("Kernel32.dll"), 0); ++#endif + if( NULL != hinstLib ){ + getProcessTimesAddr = + (GETPROCTIMES) GetProcAddress(hinstLib, "GetProcessTimes"); +@@ -2437,10 +2441,16 @@ static int writeFile( + if( zUnicodeName==0 ){ + return 1; + } ++#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP) + hFile = CreateFileW( + zUnicodeName, FILE_WRITE_ATTRIBUTES, 0, NULL, OPEN_EXISTING, + FILE_FLAG_BACKUP_SEMANTICS, NULL + ); ++#else ++ hFile = CreateFile2( ++ zUnicodeName, FILE_WRITE_ATTRIBUTES, 0, OPEN_EXISTING, NULL ++ ); ++#endif + sqlite3_free(zUnicodeName); + if( hFile!=INVALID_HANDLE_VALUE ){ + BOOL bResult = SetFileTime(hFile, NULL, &lastAccess, &lastWrite); diff --git a/externals/vcpkg/ports/sqlite3/portfile.cmake b/externals/vcpkg/ports/sqlite3/portfile.cmake new file mode 100755 index 000000000..30ef7c855 --- /dev/null +++ b/externals/vcpkg/ports/sqlite3/portfile.cmake @@ -0,0 +1,72 @@ +# Be sure to update both of these versions together. +set(SQLITE_VERSION 3370100) +set(PKGCONFIG_VERSION 3.37.1) +set(SQLITE_HASH b59343772dc4c6bb8e05fff6206eeb44861efa52c120c789ce6b733e974cf950657b6ab369aa405d75f45ed9cf1cb8128a76447bc63e9ce9822578d71581a7a3) + +vcpkg_download_distfile(ARCHIVE + URLS "https://sqlite.org/2021/sqlite-amalgamation-${SQLITE_VERSION}.zip" + FILENAME "sqlite-amalgamation-${SQLITE_VERSION}.zip" + SHA512 ${SQLITE_HASH} +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${SQLITE_VERSION} + PATCHES fix-arm-uwp.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/sqlite3.pc.in" DESTINATION "${SOURCE_PATH}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + fts3 ENABLE_FTS3 + fts4 ENABLE_FTS4 + fts5 ENABLE_FTS5 + memsys3 ENABLE_MEMSYS3 + memsys5 ENABLE_MEMSYS5 + math ENABLE_MATH_FUNCTION + limit ENABLE_LIMIT + rtree ENABLE_RTREE + session ENABLE_SESSION + omit-load-extension ENABLE_OMIT_LOAD_EXT + geopoly WITH_GEOPOLY + json1 WITH_JSON1 + zlib WITH_ZLIB + INVERTED_FEATURES + tool SQLITE3_SKIP_TOOLS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DPKGCONFIG_VERSION=${PKGCONFIG_VERSION} + OPTIONS_DEBUG + -DSQLITE3_SKIP_TOOLS=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unofficial-${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(NOT SQLITE3_SKIP_TOOLS AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/sqlite3-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/sqlite3-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/sqlite3${VCPKG_HOST_EXECUTABLE_SUFFIX}") +endif() + +configure_file( + "${CMAKE_CURRENT_LIST_DIR}/sqlite3-config.in.cmake" + "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-sqlite3-config.cmake" + @ONLY +) + +vcpkg_fixup_pkgconfig() + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sqlite3.h" "# define SQLITE_API\n" "# define SQLITE_API __declspec(dllimport)\n") +endif() + +file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "SQLite is in the Public Domain.\nhttp://www.sqlite.org/copyright.html\n") diff --git a/externals/vcpkg/ports/sqlite3/sqlite3-config.in.cmake b/externals/vcpkg/ports/sqlite3/sqlite3-config.in.cmake new file mode 100755 index 000000000..e7e26bf2c --- /dev/null +++ b/externals/vcpkg/ports/sqlite3/sqlite3-config.in.cmake @@ -0,0 +1,7 @@ + +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32) + include(CMakeFindDependencyMacro) + find_dependency(Threads) +endif() + +include(${CMAKE_CURRENT_LIST_DIR}/unofficial-sqlite3-targets.cmake) diff --git a/externals/vcpkg/ports/sqlite3/sqlite3.pc.in b/externals/vcpkg/ports/sqlite3/sqlite3.pc.in new file mode 100755 index 000000000..c7ecbf1a5 --- /dev/null +++ b/externals/vcpkg/ports/sqlite3/sqlite3.pc.in @@ -0,0 +1,11 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix} +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: SQLite +Description: SQL database engine +Version: @PKGCONFIG_VERSION@ +Libs: -L${libdir} -lsqlite3 +Libs.private: @PKGCONFIG_LIBS_PRIVATE@ +Cflags: -I${includedir} @PKGCONFIG_DEFINES@ diff --git a/externals/vcpkg/ports/sqlite3/vcpkg.json b/externals/vcpkg/ports/sqlite3/vcpkg.json new file mode 100755 index 000000000..f59f84fc6 --- /dev/null +++ b/externals/vcpkg/ports/sqlite3/vcpkg.json @@ -0,0 +1,65 @@ +{ + "name": "sqlite3", + "version": "3.37.2", + "port-version": 1, + "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.", + "homepage": "https://github.com/sqlite/sqlite", + "license": "blessing", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "fts3": { + "description": "Enable the FTS3 extension" + }, + "fts4": { + "description": "Enable the FTS4 extension" + }, + "fts5": { + "description": "Enable the FTS5 extension" + }, + "geopoly": { + "description": "Enable geopoly functionality for sqlite3" + }, + "json1": { + "description": "Enable JSON functionality for sqlite3" + }, + "limit": { + "description": "Enable the UPDATE/DELETE LIMIT clause" + }, + "math": { + "description": "Enable math functions" + }, + "memsys3": { + "description": "Enable MEMSYS3" + }, + "memsys5": { + "description": "Enable MEMSYS5" + }, + "omit-load-extension": { + "description": "Enable loading of external extensions" + }, + "rtree": { + "description": "Enable the RTREE extension" + }, + "session": { + "description": "Enable the SESSION extension" + }, + "tool": { + "description": "Build sqlite3 executable" + }, + "zlib": { + "description": "Build sqlite3 with zlib support", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/sqlitecpp/0001-unofficial-sqlite3-and-sqlcipher.patch b/externals/vcpkg/ports/sqlitecpp/0001-unofficial-sqlite3-and-sqlcipher.patch new file mode 100755 index 000000000..9b3e0e4af --- /dev/null +++ b/externals/vcpkg/ports/sqlitecpp/0001-unofficial-sqlite3-and-sqlcipher.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 85c1061..684205f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -232,16 +232,17 @@ if (SQLITECPP_INTERNAL_SQLITE) + add_subdirectory(sqlite3) + target_link_libraries(SQLiteCpp PUBLIC sqlite3) + else (SQLITECPP_INTERNAL_SQLITE) +- find_package (SQLite3 REQUIRED) +- message(STATUS "Link to sqlite3 system library") +- target_link_libraries(SQLiteCpp PUBLIC SQLite::SQLite3) +- if(SQLite3_VERSION VERSION_LESS "3.19") +- set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-DSQLITECPP_HAS_MEM_STRUCT") +- endif() ++ if(NOT SQLITE_HAS_CODEC) ++ find_package(unofficial-sqlite3 CONFIG) ++ message(STATUS "Link to sqlite3 system library") ++ target_link_libraries(SQLiteCpp PRIVATE unofficial::sqlite3::sqlite3) ++ if(SQLite3_VERSION VERSION_LESS "3.19") ++ set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-DSQLITECPP_HAS_MEM_STRUCT") ++ endif() ++ else() ++ # When using the SQLite codec, we need to link against the sqlcipher lib & include ++ # So this gets the lib & header, and links/includes everything + +- # When using the SQLite codec, we need to link against the sqlcipher lib & include +- # So this gets the lib & header, and links/includes everything +- if(SQLITE_HAS_CODEC) + # Make PkgConfig optional since Windows doesn't usually have it installed. + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) diff --git a/externals/vcpkg/ports/sqlitecpp/fix_dependency.patch b/externals/vcpkg/ports/sqlitecpp/fix_dependency.patch new file mode 100755 index 000000000..a55c94cff --- /dev/null +++ b/externals/vcpkg/ports/sqlitecpp/fix_dependency.patch @@ -0,0 +1,11 @@ +diff --git a/cmake/SQLiteCppConfig.cmake.in b/cmake/SQLiteCppConfig.cmake.in +index 568922f..01196db 100644 +--- a/cmake/SQLiteCppConfig.cmake.in ++++ b/cmake/SQLiteCppConfig.cmake.in +@@ -1,5 +1,5 @@ + include(CMakeFindDependencyMacro) +-find_dependency(SQLite3 REQUIRED) ++find_dependency(unofficial-sqlite3 REQUIRED) + if(@UNIX@) + set(THREADS_PREFER_PTHREAD_FLAG @THREADS_PREFER_PTHREAD_FLAG@) + find_dependency(Threads REQUIRED) diff --git a/externals/vcpkg/ports/sqlitecpp/portfile.cmake b/externals/vcpkg/ports/sqlitecpp/portfile.cmake new file mode 100755 index 000000000..efeb21450 --- /dev/null +++ b/externals/vcpkg/ports/sqlitecpp/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH + REPO "SRombauts/SQLiteCpp" + REF 3.1.1 + HEAD_REF master + SHA512 9030b5249c149db8a5b2fe350f71613e4ee91061765a771640ed3ffa7c24aada4000ba884ef91790fdc0f13dc4519038c1edeba64b85b85ac09c3e955a7988a1 + PATCHES + 0001-unofficial-sqlite3-and-sqlcipher.patch + fix_dependency.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + sqlcipher SQLITE_HAS_CODEC +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + ${FEATURE_OPTIONS} + -DSQLITECPP_RUN_CPPLINT=OFF + -DSQLITECPP_RUN_CPPCHECK=OFF + -DSQLITECPP_INTERNAL_SQLITE=OFF + -DSQLITE_ENABLE_COLUMN_METADATA=OFF + -DSQLITECPP_INTERNAL_SQLITE=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/SQLiteCpp) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/sqlitecpp/vcpkg.json b/externals/vcpkg/ports/sqlitecpp/vcpkg.json new file mode 100755 index 000000000..c86c7b95e --- /dev/null +++ b/externals/vcpkg/ports/sqlitecpp/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "sqlitecpp", + "version-string": "3.1.1", + "port-version": 1, + "description": "SQLiteC++ (SQLiteCpp) is a smart and easy to use C++ SQLite3 wrapper.", + "homepage": "https://github.com/SRombauts/SQLiteCpp", + "default-features": [ + "sqlite" + ], + "features": { + "sqlcipher": { + "description": "Use the sqlcipher port", + "dependencies": [ + { + "name": "sqlcipher", + "default-features": false + } + ] + }, + "sqlite": { + "description": "Use the (unofficial) sqlite3 port of vcpkg", + "dependencies": [ + "sqlite3" + ] + } + } +} diff --git a/externals/vcpkg/ports/sqlpp11-connector-mysql/portfile.cmake b/externals/vcpkg/ports/sqlpp11-connector-mysql/portfile.cmake new file mode 100755 index 000000000..2dd953ff7 --- /dev/null +++ b/externals/vcpkg/ports/sqlpp11-connector-mysql/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rbock/sqlpp11-connector-mysql + REF 0.29 + SHA512 0c71d2ea94933be3bbaa8d6afaac7059660bdb0af5ba905844d95facb5e73a122c3ccd723a48a7fd8db0c028309ac6dc8b91c6838dfbfe530727161d62a1481f + HEAD_REF master +) + +# Use sqlpp11-connector-mysql's own build process, skipping tests +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DENABLE_TESTS:BOOL=OFF + -DDATE_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include + -DSQLPP11_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include + -DMYSQL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/mysql +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sqlpp11-connector-mysql RENAME copyright) diff --git a/externals/vcpkg/ports/sqlpp11-connector-mysql/vcpkg.json b/externals/vcpkg/ports/sqlpp11-connector-mysql/vcpkg.json new file mode 100755 index 000000000..8eb8e93f5 --- /dev/null +++ b/externals/vcpkg/ports/sqlpp11-connector-mysql/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "sqlpp11-connector-mysql", + "version-string": "0.29", + "port-version": 2, + "description": "A C++ wrapper for MySQL meant to be used in combination with sqlpp11.", + "homepage": "https://github.com/rbock/sqlpp11-connector-mysql", + "dependencies": [ + "date", + "sqlpp11" + ], + "default-features": [ + "mariadb" + ], + "features": { + "mariadb": { + "description": "Use MariaDB connector", + "dependencies": [ + "libmariadb" + ] + }, + "mysql": { + "description": "Use MySQL connector", + "dependencies": [ + "libmysql" + ] + } + } +} diff --git a/externals/vcpkg/ports/sqlpp11-connector-sqlite3/portfile.cmake b/externals/vcpkg/ports/sqlpp11-connector-sqlite3/portfile.cmake new file mode 100755 index 000000000..1663ca73a --- /dev/null +++ b/externals/vcpkg/ports/sqlpp11-connector-sqlite3/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rbock/sqlpp11-connector-sqlite3 + REF a06d6944a55349fbd0ab0337c45d80c6efa2ff81 # 0.30 + SHA512 51efe8914b5ccf8092e15a9a7b29798db070ce0b47bb87b212724e209149c3a81821a3841ac317f506356430d87d3f16a066c74f60ad1ad7bf1333c9de36916b + HEAD_REF master +) + +# Use sqlpp11-connector-sqlite3's own build process, skipping tests +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DENABLE_TESTS:BOOL=OFF + -DSQLPP11_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sqlpp11-connector-sqlite3 RENAME copyright) diff --git a/externals/vcpkg/ports/sqlpp11-connector-sqlite3/vcpkg.json b/externals/vcpkg/ports/sqlpp11-connector-sqlite3/vcpkg.json new file mode 100755 index 000000000..09ebb22b5 --- /dev/null +++ b/externals/vcpkg/ports/sqlpp11-connector-sqlite3/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "sqlpp11-connector-sqlite3", + "version-string": "0.30", + "port-version": 1, + "description": "A C++ wrapper for sqlite3 meant to be used in combination with sqlpp11.", + "dependencies": [ + "date", + "sqlite3", + "sqlpp11" + ] +} diff --git a/externals/vcpkg/ports/sqlpp11/ddl2cpp_path.patch b/externals/vcpkg/ports/sqlpp11/ddl2cpp_path.patch new file mode 100755 index 000000000..bc828e829 --- /dev/null +++ b/externals/vcpkg/ports/sqlpp11/ddl2cpp_path.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/Sqlpp11Config.cmake b/cmake/Sqlpp11Config.cmake +index 18ea9b1..730bce1 100644 +--- a/cmake/Sqlpp11Config.cmake ++++ b/cmake/Sqlpp11Config.cmake +@@ -32,7 +32,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/Sqlpp11Targets.cmake") + + # Import "ddl2cpp" script + if(NOT TARGET sqlpp11::ddl2cpp) +- get_filename_component(sqlpp11_ddl2cpp_location "${CMAKE_CURRENT_LIST_DIR}/../../../bin/sqlpp11-ddl2cpp" REALPATH) ++ get_filename_component(sqlpp11_ddl2cpp_location "${CMAKE_CURRENT_LIST_DIR}/../../scripts/sqlpp11-ddl2cpp" REALPATH) + if(NOT EXISTS "${sqlpp11_ddl2cpp_location}") + message(FATAL_ERROR "The imported target sqlpp11::ddl2cpp references the file '${sqlpp11_ddl2cpp_location}' but this file does not exists.") + endif() diff --git a/externals/vcpkg/ports/sqlpp11/fix-dependency.patch b/externals/vcpkg/ports/sqlpp11/fix-dependency.patch new file mode 100755 index 000000000..d43e10bf3 --- /dev/null +++ b/externals/vcpkg/ports/sqlpp11/fix-dependency.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b8de9fa..82dd632 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,14 +32,11 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/") + + include(CTest) + +- +-### Dependencies +-add_subdirectory(dependencies) +- + ### Main targets + add_library(sqlpp11 INTERFACE) + add_library(sqlpp11::sqlpp11 ALIAS sqlpp11) + ++find_package(date CONFIG REQUIRED) + target_link_libraries(sqlpp11 INTERFACE date::date) + + target_include_directories(sqlpp11 INTERFACE diff --git a/externals/vcpkg/ports/sqlpp11/portfile.cmake b/externals/vcpkg/ports/sqlpp11/portfile.cmake new file mode 100755 index 000000000..312c16d4e --- /dev/null +++ b/externals/vcpkg/ports/sqlpp11/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rbock/sqlpp11 + REF 085713d4d301aeb58e7d14f44cfac6ce35fe2e77 # 0.60 + SHA512 835536482def61c9978cda58507a7f5983b99765f69e7865cf5597b06075dc3e7ad4a3be0b2de2e44e4a4c3a6998115bf567ff586fb656cf5d95a0a7465fb2fe + HEAD_REF master + PATCHES + ddl2cpp_path.patch + fix-dependency.patch +) + +# Use sqlpp11's own build process, skipping tests +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DENABLE_TESTS:BOOL=OFF +) + +vcpkg_install_cmake() + +# Move CMake config files to the right place +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Sqlpp11 TARGET_PATH share/${PORT}) + +# Delete redundant and unnecessary directories +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/cmake ${CURRENT_PACKAGES_DIR}/include/date) + +# Move python script from bin directory +file(COPY ${CURRENT_PACKAGES_DIR}/bin/sqlpp11-ddl2cpp DESTINATION ${CURRENT_PACKAGES_DIR}/scripts) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/sqlpp11/vcpkg.json b/externals/vcpkg/ports/sqlpp11/vcpkg.json new file mode 100755 index 000000000..63951d797 --- /dev/null +++ b/externals/vcpkg/ports/sqlpp11/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "sqlpp11", + "version-string": "0.60", + "port-version": 1, + "description": "A type safe embedded domain specific language for SQL queries and results in C++.", + "homepage": "https://github.com/rbock/sqlpp11", + "dependencies": [ + "date" + ] +} diff --git a/externals/vcpkg/ports/squirrel/fix_optionally_build_sq.patch b/externals/vcpkg/ports/squirrel/fix_optionally_build_sq.patch new file mode 100755 index 000000000..9566ec870 --- /dev/null +++ b/externals/vcpkg/ports/squirrel/fix_optionally_build_sq.patch @@ -0,0 +1,41 @@ + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dc35b6f..628c649 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,6 +3,7 @@ project(squirrel VERSION 3.1 LANGUAGES C CXX) + + option(DISABLE_STATIC "Avoid building/installing static libraries.") + option(LONG_OUTPUT_NAMES "Use longer names for binaries and libraries: squirrel3 (not sq).") ++option(BUILD_SQ "Build sq interpreter.") + + if (NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE "Release") +@@ -35,15 +36,24 @@ endif() + + add_subdirectory(squirrel) + add_subdirectory(sqstdlib) +-add_subdirectory(sq) ++ ++if(BUILD_SQ) ++ add_subdirectory(sq) ++endif() + + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(tgts) + if(NOT DISABLE_DYNAMIC) +- list(APPEND tgts squirrel sqstdlib sq) ++ list(APPEND tgts squirrel sqstdlib) ++ if(BUILD_SQ) ++ list(APPEND tgts sq) ++ endif() + endif() + if(NOT DISABLE_STATIC) +- list(APPEND tgts squirrel_static sqstdlib_static sq_static) ++ list(APPEND tgts squirrel_static sqstdlib_static) ++ if(BUILD_SQ) ++ list(APPEND tgts sq_static) ++ endif() + endif() + foreach(t ${tgts}) + target_compile_definitions(${t} PUBLIC -D_SQ64) diff --git a/externals/vcpkg/ports/squirrel/portfile.cmake b/externals/vcpkg/ports/squirrel/portfile.cmake new file mode 100755 index 000000000..d344afc4f --- /dev/null +++ b/externals/vcpkg/ports/squirrel/portfile.cmake @@ -0,0 +1,53 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO albertodemichelis/squirrel + HEAD_REF master + REF 23a0620658714b996d20da3d4dd1a0dcf9b0bd98 + SHA512 205ba0b2b37ca2133f8c1b3024a3a34186697998714140d409006ae0f5facc76b2664dbbad33bbc51c86199e2524bd0cd905b8941e306db892a50a58f1b96371 + PATCHES fix_optionally_build_sq.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_DYNAMIC) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "interpreter" BUILD_SQ +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DDISABLE_DYNAMIC=${DISABLE_DYNAMIC} + -DDISABLE_STATIC=${DISABLE_STATIC} + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/squirrel) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(BUILD_SQ) + if(BUILD_STATIC) + message(STATUS "Copying sq tool") + vcpkg_copy_tools( + TOOL_NAMES sq + AUTO_CLEAN + ) + elseif(BUILD_DYNAMIC) + message(STATUS "Copying sq and sq_static tool") + vcpkg_copy_tools( + TOOL_NAMES sq sq_static + AUTO_CLEAN + ) + endif() +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/squirrel/vcpkg.json b/externals/vcpkg/ports/squirrel/vcpkg.json new file mode 100755 index 000000000..bdf5fb56e --- /dev/null +++ b/externals/vcpkg/ports/squirrel/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "squirrel", + "version-date": "2021-09-17", + "description": "Squirrel is a high level imperative, object-oriented programming language, designed to be a light-weight scripting language that fits in the size, memory bandwidth, and real-time requirements of applications like video games.", + "homepage": "http://www.squirrel-lang.org", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "interpreter": { + "description": "Build sq command-line interpreter" + } + } +} diff --git a/externals/vcpkg/ports/sratom/CMakeLists.txt b/externals/vcpkg/ports/sratom/CMakeLists.txt new file mode 100755 index 000000000..040f151d5 --- /dev/null +++ b/externals/vcpkg/ports/sratom/CMakeLists.txt @@ -0,0 +1,54 @@ +cmake_minimum_required(VERSION 3.17) +project(sratom C) + +find_package(lv2 CONFIG REQUIRED) +find_package(serd CONFIG REQUIRED) +find_package(sord CONFIG REQUIRED) + +add_library(sratom + src/sratom.c +) + +target_include_directories(sratom PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}") + +target_link_libraries(sratom PUBLIC lv2::lv2 serd::serd sord::sord) + +set_target_properties(sratom PROPERTIES + C_STANDARD 99 + C_STANDARD_REQUIRED ON +) + +target_compile_definitions(sratom PRIVATE SRATOM_INTERNAL _CRT_SECURE_NO_WARNINGS) + +if(BUILD_SHARED_LIBS) + target_compile_definitions(sratom PUBLIC SRATOM_SHARED) +endif() + +install( + TARGETS sratom + EXPORT sratom-targets + INCLUDES DESTINATION include +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(DIRECTORY sratom DESTINATION include) +endif() + +install( + EXPORT sratom-targets + NAMESPACE sratom:: + DESTINATION "${CMAKE_INSTALL_PREFIX}/share/sratom" +) + +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/sratom-config.cmake" [[ +include(CMakeFindDependencyMacro) +find_dependency(lv2 CONFIG) +find_dependency(serd CONFIG) +find_dependency(sord CONFIG) +include("${CMAKE_CURRENT_LIST_DIR}/sratom-targets.cmake") +]]) + +install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/sratom-config.cmake" + DESTINATION "${CMAKE_INSTALL_PREFIX}/share/sratom" +) diff --git a/externals/vcpkg/ports/sratom/portfile.cmake b/externals/vcpkg/ports/sratom/portfile.cmake new file mode 100755 index 000000000..a0446c3be --- /dev/null +++ b/externals/vcpkg/ports/sratom/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.com + OUT_SOURCE_PATH SOURCE_PATH + REPO lv2/sratom + REF v0.6.4 + SHA512 c155694365e9efe2f108135cccafd6369e896bd27ec816ac8bb429785d9218b1b30e8532188cfb39485d4b163a920ddb47466a461dcd6958d754ed0698d31081 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1 +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() +file( + INSTALL "${SOURCE_PATH}/COPYING" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/externals/vcpkg/ports/sratom/vcpkg.json b/externals/vcpkg/ports/sratom/vcpkg.json new file mode 100755 index 000000000..013a4b436 --- /dev/null +++ b/externals/vcpkg/ports/sratom/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "sratom", + "version-string": "0.6.4", + "description": "Sratom is a library for serialising LV2 atoms to and from RDF, particularly the Turtle syntax.", + "homepage": "https://drobilla.net/software/sratom", + "license": "ISC", + "dependencies": [ + "lv2", + "serd", + "sord" + ] +} diff --git a/externals/vcpkg/ports/srell/portfile.cmake b/externals/vcpkg/ports/srell/portfile.cmake new file mode 100755 index 000000000..397834a67 --- /dev/null +++ b/externals/vcpkg/ports/srell/portfile.cmake @@ -0,0 +1,23 @@ +set(VERSION 3_010) + +vcpkg_download_distfile( + ARCHIVE + URLS "https://www.akenotsuki.com/misc/srell/srell${VERSION}.zip" + FILENAME "srell${VERSION}.zip" + SHA512 5F2762A98E1B68C3A4FA79051AE2CBEFD23CEDF1CE833FA1EB812D3F1112734018AF36AA9D9A50E2DC40C87A7FAAF46AF0B8F4161481994DC5E19F44301E867D +) + +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" + NO_REMOVE_ONE_LEVEL +) + +file(INSTALL + "${SOURCE_PATH}/srell.hpp" + "${SOURCE_PATH}/srell_ucfdata2.hpp" + "${SOURCE_PATH}/srell_updata.hpp" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" +) + +file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/srell/vcpkg.json b/externals/vcpkg/ports/srell/vcpkg.json new file mode 100755 index 000000000..579906d3f --- /dev/null +++ b/externals/vcpkg/ports/srell/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "srell", + "version-string": "3.010", + "description": "SRELL (std::regex-like library) is a regular expression template library for C++.", + "homepage": "https://www.akenotsuki.com/misc/srell/en/", + "license": "BSD-2-Clause" +} diff --git a/externals/vcpkg/ports/srpc/portfile.cmake b/externals/vcpkg/ports/srpc/portfile.cmake new file mode 100755 index 000000000..5b5dbc81a --- /dev/null +++ b/externals/vcpkg/ports/srpc/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sogou/srpc + REF v0.9.3 + SHA512 e64cfec279f833ad24b1942ef2b572fc4bd3bfc5f9d623cd5d25b3c869d2ff9b35250cc814e8aaeb919ebed0929c44407eb9abb2e6793cfdc967708210f5f7e3 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/srpc) +vcpkg_copy_pdbs() +vcpkg_copy_tools( + TOOL_NAMES srpc_generator + AUTO_CLEAN +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/srpc/vcpkg.json b/externals/vcpkg/ports/srpc/vcpkg.json new file mode 100755 index 000000000..3b95d8da0 --- /dev/null +++ b/externals/vcpkg/ports/srpc/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "srpc", + "version-semver": "0.9.3", + "description": "RPC based on Sogou C++ Workflow", + "homepage": "https://github.com/sogou/srpc", + "dependencies": [ + "lz4", + "openssl", + "protobuf", + "snappy", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "workflow", + "zlib" + ] +} diff --git a/externals/vcpkg/ports/starlink-ast/portfile.cmake b/externals/vcpkg/ports/starlink-ast/portfile.cmake new file mode 100755 index 000000000..058b37bad --- /dev/null +++ b/externals/vcpkg/ports/starlink-ast/portfile.cmake @@ -0,0 +1,45 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/Starlink/ast/releases/download/v9.2.7/ast-9.2.7.tar.gz" + FILENAME "ast-9.2.7.tar.gz" + SHA512 4778658fe6b08af29b51807e2d988f8425d99d630a14d8fef9ca4ea43016d676df419a93c4b2fdecc0549c28c0665f61e366bd4e7aa896ebb8e47f56d5af1887 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +set(CONFIGURE_OPTIONS + --without-fortran + --with-external-cminpack + star_cv_cnf_trail_type=long + star_cv_cnf_f2c_compatible=no +) + +if ("yaml" IN_LIST FEATURES) + list(APPEND CONFIGURE_OPTIONS --with-yaml) +else() + list(APPEND CONFIGURE_OPTIONS --without-yaml) +endif() + +if ("pthreads" IN_LIST FEATURES) + list(APPEND CONFIGURE_OPTIONS --with-pthreads) +else() + list(APPEND CONFIGURE_OPTIONS --without-pthreads) +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + USE_WRAPPERS + DETERMINE_BUILD_TRIPLET + ADDITIONAL_MSYS_PACKAGES perl + OPTIONS ${CONFIGURE_OPTIONS} +) + +vcpkg_install_make() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share") + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/starlink-ast/vcpkg.json b/externals/vcpkg/ports/starlink-ast/vcpkg.json new file mode 100755 index 000000000..5acdf6d3d --- /dev/null +++ b/externals/vcpkg/ports/starlink-ast/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "starlink-ast", + "version": "9.2.7", + "port-version": 1, + "description": "The AST library provides a comprehensive range of facilities for attaching world coordinate systems to astronomical data, for retrieving and interpreting that information and for generating graphical output based on it", + "homepage": "https://starlink.eao.hawaii.edu/starlink/AST", + "supports": "windows", + "dependencies": [ + "cminpack" + ], + "features": { + "pthreads": { + "description": "build with POSIX threads support", + "dependencies": [ + "pthreads" + ] + }, + "yaml": { + "description": "build with YAML support", + "dependencies": [ + "libyaml" + ] + } + } +} diff --git a/externals/vcpkg/ports/status-code/portfile.cmake b/externals/vcpkg/ports/status-code/portfile.cmake new file mode 100755 index 000000000..a7bf19e77 --- /dev/null +++ b/externals/vcpkg/ports/status-code/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ned14/status-code + REF 0cca391ad9168581641b569e031f25c7ee1673b3 + SHA512 5fdf3e268d0a4a388202547ceac271832642648fdc50824a8f26d86bad1d45c93394ff6651e50232dde534e057dfadaf7a7436b893dd7b182a75bcd57e24fc9d + HEAD_REF master +) + +# Because status-code's deployed files are header-only, the debug build is not necessary +set(VCPKG_BUILD_TYPE release) + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS + -DPROJECT_IS_DEPENDENCY=On +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/status-code) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include2") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") +file(RENAME "${CURRENT_PACKAGES_DIR}/include2" "${CURRENT_PACKAGES_DIR}/include/status-code") + +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/Licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/status-code/usage b/externals/vcpkg/ports/status-code/usage new file mode 100755 index 000000000..52d8cd77c --- /dev/null +++ b/externals/vcpkg/ports/status-code/usage @@ -0,0 +1,4 @@ +The package status-code provides CMake targets: + + find_package(status-code CONFIG REQUIRED) + target_link_libraries(main PUBLIC status-code::hl) diff --git a/externals/vcpkg/ports/status-code/vcpkg.json b/externals/vcpkg/ports/status-code/vcpkg.json new file mode 100755 index 000000000..93b58dace --- /dev/null +++ b/externals/vcpkg/ports/status-code/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "status-code", + "version-string": "1.0.0-20211208", + "port-version": 1, + "description": "Proposed SG14 status_code for the C++ standard (https://wg21.link/P1028).", + "homepage": "https://github.com/ned14/status-code" +} diff --git a/externals/vcpkg/ports/status-value-lite/portfile.cmake b/externals/vcpkg/ports/status-value-lite/portfile.cmake new file mode 100755 index 000000000..3e935cd5c --- /dev/null +++ b/externals/vcpkg/ports/status-value-lite/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO martinmoene/status-value-lite + REF v1.1.0 + SHA512 09cad9f40f2b1592316b374e0d1a206e3a79a1c560a2ae3be3bdae9045fa026435cc29f1eee08e26e29a5499f8dc60e485adc50517a827977678d3a5a6e220d2 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + test BUILD_TESTS +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DNSSV_OPT_BUILD_TESTS=${BUILD_TESTS} + -DNSSV_OPT_BUILD_EXAMPLES=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/status_value-lite) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) diff --git a/externals/vcpkg/ports/status-value-lite/vcpkg.json b/externals/vcpkg/ports/status-value-lite/vcpkg.json new file mode 100755 index 000000000..9850afb43 --- /dev/null +++ b/externals/vcpkg/ports/status-value-lite/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "status-value-lite", + "version-string": "1.1.0", + "port-version": 1, + "description": "status_value is a single-file header-only library for objects that represent a status and an optional value. It is intended for use with C++11 and later.", + "homepage": "https://github.com/martinmoene/status-value-lite", + "features": { + "test": { + "description": "Build with test" + } + } +} diff --git a/externals/vcpkg/ports/stb/FindStb.cmake b/externals/vcpkg/ports/stb/FindStb.cmake new file mode 100755 index 000000000..4ffa8b1ff --- /dev/null +++ b/externals/vcpkg/ports/stb/FindStb.cmake @@ -0,0 +1,29 @@ +# Distributed under the OSI-approved BSD 3-Clause License. + +#.rst: +# FindStb +# ------------ +# +# Find the Stb include headers. +# +# Result Variables +# ^^^^^^^^^^^^^^^^ +# +# This module defines the following variables: +# +# ``Stb_FOUND`` +# True if Stb library found +# +# ``Stb_INCLUDE_DIR`` +# Location of Stb headers +# + +include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) +include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) + +if(NOT Stb_INCLUDE_DIR) + find_path(Stb_INCLUDE_DIR NAMES stb_image.h PATHS ${Stb_DIR} PATH_SUFFIXES include) +endif() + +find_package_handle_standard_args(Stb DEFAULT_MSG Stb_INCLUDE_DIR) +mark_as_advanced(Stb_INCLUDE_DIR) diff --git a/externals/vcpkg/ports/stb/portfile.cmake b/externals/vcpkg/ports/stb/portfile.cmake new file mode 100755 index 000000000..5f42687d3 --- /dev/null +++ b/externals/vcpkg/ports/stb/portfile.cmake @@ -0,0 +1,15 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nothings/stb + REF af1a5bc352164740c1cc1354942b1c6b72eacb8a # committed on 2021-09-10 + SHA512 5937baa1a9b7342ddc0e41c37ba0ea6b0c878f670a81b55bb124681e6b5e381fdc1d9557c96637e3ba082d6d968ed67a78b47f16aa5555c1c43394d1f9e57f2d + HEAD_REF master +) + +file(GLOB HEADER_FILES "${SOURCE_PATH}/*.h") +file(COPY ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/FindStb.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/stb/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/stb/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..e787d29f0 --- /dev/null +++ b/externals/vcpkg/ports/stb/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,6 @@ +set(STB_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) + +_find_package(${ARGS}) + +set(CMAKE_MODULE_PATH ${STB_PREV_MODULE_PATH}) diff --git a/externals/vcpkg/ports/stb/vcpkg.json b/externals/vcpkg/ports/stb/vcpkg.json new file mode 100755 index 000000000..599b59f6e --- /dev/null +++ b/externals/vcpkg/ports/stb/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "stb", + "version-date": "2021-09-10", + "description": "public domain header-only libraries", + "homepage": "https://github.com/nothings/stb", + "license": "MIT OR CC-PDDC" +} diff --git a/externals/vcpkg/ports/stduuid/fix-gsl-polyfill.patch b/externals/vcpkg/ports/stduuid/fix-gsl-polyfill.patch new file mode 100755 index 000000000..2e07871bd --- /dev/null +++ b/externals/vcpkg/ports/stduuid/fix-gsl-polyfill.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f45a7dc..039ee53 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -37,11 +37,11 @@ if (UUID_TIME_GENERATOR) + endif() + + # Using span from std +-if (NOT UUID_USING_CXX20_SPAN) +- target_include_directories(${PROJECT_NAME} INTERFACE +- $ +- $) +- install(DIRECTORY gsl DESTINATION include) ++if (UUID_USING_CXX20_SPAN) ++ target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_20) ++else() ++ find_package(Microsoft.GSL CONFIG REQUIRED) ++ target_link_libraries(${PROJECT_NAME} INTERFACE Microsoft.GSL::GSL) + endif () + + # Install step and imported target +diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in +index 7217b72..fb981d2 100644 +--- a/cmake/Config.cmake.in ++++ b/cmake/Config.cmake.in +@@ -9,6 +9,10 @@ if (@UUID_SYSTEM_GENERATOR@) + endif () + endif () + ++if (NOT "@UUID_USING_CXX20_SPAN@") ++ find_dependency(Microsoft.GSL) ++endif () ++ + include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake") + + check_required_components(@PROJECT_NAME@) +\ No newline at end of file diff --git a/externals/vcpkg/ports/stduuid/fix-install-directory.patch b/externals/vcpkg/ports/stduuid/fix-install-directory.patch new file mode 100755 index 000000000..f80d5b6a6 --- /dev/null +++ b/externals/vcpkg/ports/stduuid/fix-install-directory.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fffb92c..f45a7dc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,7 +11,8 @@ option(UUID_USING_CXX20_SPAN "Using span from std instead of gsl" OFF) + add_library(${PROJECT_NAME} INTERFACE) + target_include_directories(${PROJECT_NAME} INTERFACE + $ +- $) ++ $ ++ $) + + # Using system uuid generator + if (UUID_SYSTEM_GENERATOR) +@@ -44,7 +45,7 @@ if (NOT UUID_USING_CXX20_SPAN) + endif () + + # Install step and imported target +-install(FILES include/uuid.h DESTINATION include) ++install(FILES include/uuid.h DESTINATION include/stduuid) + install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-targets) + install(EXPORT ${PROJECT_NAME}-targets + DESTINATION lib/cmake/${PROJECT_NAME}) diff --git a/externals/vcpkg/ports/stduuid/fix-libuuid-dependency.patch b/externals/vcpkg/ports/stduuid/fix-libuuid-dependency.patch new file mode 100755 index 000000000..59134811d --- /dev/null +++ b/externals/vcpkg/ports/stduuid/fix-libuuid-dependency.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 039ee53..d4218a4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,11 +23,8 @@ if (UUID_SYSTEM_GENERATOR) + find_library(CFLIB CoreFoundation REQUIRED) + target_link_libraries(${PROJECT_NAME} INTERFACE ${CFLIB}) + else () +- find_package(Libuuid REQUIRED) +- if (Libuuid_FOUND) +- target_include_directories(${PROJECT_NAME} INTERFACE ${Libuuid_INCLUDE_DIRS}) +- target_link_libraries(${PROJECT_NAME} INTERFACE ${Libuuid_LIBRARIES}) +- endif () ++ find_package(unofficial-libuuid CONFIG REQUIRED) ++ target_link_libraries(${PROJECT_NAME} INTERFACE unofficial::UUID::uuid) + endif () + endif () + +diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in +index fb981d2..8a3c8ab 100644 +--- a/cmake/Config.cmake.in ++++ b/cmake/Config.cmake.in +@@ -4,8 +4,7 @@ include(CMakeFindDependencyMacro) + if (@UUID_SYSTEM_GENERATOR@) + if (WIN32 OR APPLE) + else () +- list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) +- find_dependency(Libuuid REQUIRED) ++ find_dependency(unofficial-libuuid CONFIG) + endif () + endif () + diff --git a/externals/vcpkg/ports/stduuid/portfile.cmake b/externals/vcpkg/ports/stduuid/portfile.cmake new file mode 100755 index 000000000..27a3bf8d3 --- /dev/null +++ b/externals/vcpkg/ports/stduuid/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mariusbancila/stduuid + REF v1.2.2 + SHA512 30970c25992e1ba35d96e3b2fc8530466c1070b8b913b8c37e9f698f39121a5a74361e2c4db4c2ba2feddb0ce9b2f14b78c4761cdac09b89a6a0117b179b08a7 + HEAD_REF master + PATCHES + fix-install-directory.patch + fix-gsl-polyfill.patch + fix-libuuid-dependency.patch +) + +# the debug build is not necessary, because stduuid deployed files are header-only +set(VCPKG_BUILD_TYPE release) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + system-gen UUID_SYSTEM_GENERATOR + INVERTED_FEATURES + gsl-span UUID_USING_CXX20_SPAN +) + +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DUUID_BUILD_TESTS=OFF + ${FEATURE_OPTIONS} +) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) + +if("gsl-span" IN_LIST FEATURES) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/stduuid/uuid.h" "#ifdef __cpp_lib_span" "#if 0") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/stduuid/uuid.h" "#include " "#include ") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/stduuid/uuid.h" "#ifdef __cpp_lib_span" "#if 1") +endif() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/stduuid/vcpkg.json b/externals/vcpkg/ports/stduuid/vcpkg.json new file mode 100755 index 000000000..840ce796b --- /dev/null +++ b/externals/vcpkg/ports/stduuid/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "stduuid", + "version": "1.2.2", + "description": "A C++17 cross-platform implementation for UUIDs", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "gsl-span": { + "description": "Using span from gsl instead of std", + "dependencies": [ + "ms-gsl" + ] + }, + "system-gen": { + "description": "Enable operating system uuid generator", + "dependencies": [ + { + "name": "libuuid", + "platform": "!osx & !windows" + } + ] + } + } +} diff --git a/externals/vcpkg/ports/stftpitchshift/portfile.cmake b/externals/vcpkg/ports/stftpitchshift/portfile.cmake new file mode 100755 index 000000000..1b6c2232e --- /dev/null +++ b/externals/vcpkg/ports/stftpitchshift/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jurihock/stftPitchShift + HEAD_REF main + REF v1.4.1 + SHA512 69e68af5baeb1bbeae440d2b2dc7a510a72b8b49cd9b23e0934eb8070d31c9a2e98759ea6d609f81caa3c57e1615cc50028dd13a9d04e82725a41da79175a868 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DVCPKG=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + CONFIG_PATH "lib/cmake/${PORT}" +) + +file( + INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) + +file( + REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" +) diff --git a/externals/vcpkg/ports/stftpitchshift/vcpkg.json b/externals/vcpkg/ports/stftpitchshift/vcpkg.json new file mode 100755 index 000000000..dea081ce3 --- /dev/null +++ b/externals/vcpkg/ports/stftpitchshift/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "stftpitchshift", + "version": "1.4.1", + "description": "STFT based multi pitch shifting with optional formant preservation.", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/stlab/portfile.cmake b/externals/vcpkg/ports/stlab/portfile.cmake new file mode 100755 index 000000000..8bfecad31 --- /dev/null +++ b/externals/vcpkg/ports/stlab/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO stlab/libraries + REF 0a7232a4120c2daf8ddb6621ec13f313a029e495 # V1.6.2 + SHA512 6e03a5370d02accd798fc14fd256ab593b9a33b4a9b9cda8f2233eeafacf70c389c2999d1834b7ffef6968008921d28d88bcf728a322ba7943106ddc9d8e6f16 + HEAD_REF develop +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/stlab) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/share/cmake) + +file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/stlabConfig.cmake STLAB_CONFIG) +string(REPLACE "find_dependency(Boost 1.60.0)" "if(APPLE)\nfind_dependency(Boost)\nendif()" STLAB_CONFIG ${STLAB_CONFIG}) + +file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/stlabConfig.cmake "${STLAB_CONFIG}") + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/stlab/vcpkg.json b/externals/vcpkg/ports/stlab/vcpkg.json new file mode 100755 index 000000000..a3041dca7 --- /dev/null +++ b/externals/vcpkg/ports/stlab/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "stlab", + "version-string": "1.6.2", + "port-version": 1, + "description": [ + "stlab is the ongoing work of what was Adobe Software Technology Lab.", + "The Concurrency library provides futures and channels, high level constructs for implementing algorithms that eases the use of multiple CPU cores while minimizing contention. This library solves several problems of the C++11 and C++17 TS futures." + ], + "dependencies": [ + { + "name": "boost-variant", + "platform": "osx" + } + ] +} diff --git a/externals/vcpkg/ports/stormlib/CMakeLists.txt b/externals/vcpkg/ports/stormlib/CMakeLists.txt new file mode 100755 index 000000000..e8bf793ab --- /dev/null +++ b/externals/vcpkg/ports/stormlib/CMakeLists.txt @@ -0,0 +1,286 @@ +cmake_minimum_required(VERSION 3.9) +project(stormlib) + +set(SRC_FILES + stormlib_dll/StormLib.def + src/adpcm/adpcm.cpp + src/huffman/huff.cpp + src/jenkins/lookup3.c + src/lzma/C/LzFind.c + src/lzma/C/LzmaDec.c + src/lzma/C/LzmaEnc.c + src/pklib/explode.c + src/pklib/implode.c + src/sparse/sparse.cpp + src/FileStream.cpp + src/SBaseCommon.cpp + src/SBaseDumpData.cpp + src/SBaseFileTable.cpp + src/SBaseSubTypes.cpp + src/SCompression.cpp + src/SFileAddFile.cpp + src/SFileAttributes.cpp + src/SFileCompactArchive.cpp + src/SFileCreateArchive.cpp + src/SFileExtractFile.cpp + src/SFileFindFile.cpp + src/SFileGetFileInfo.cpp + src/SFileListFile.cpp + src/SFileOpenArchive.cpp + src/SFileOpenFileEx.cpp + src/SFilePatchArchives.cpp + src/SFileReadFile.cpp + src/SFileVerify.cpp + src/libtomcrypt/src/pk/rsa/rsa_verify_simple.c + src/libtomcrypt/src/misc/crypt_libc.c +) + +if(MSVC) + # This file is used to create a DLL on windows + # Use BUILD_SHARED_LIBS to create StormLib.dll + set(STORM_DEF_FILES + stormlib_dll/StormLib.def + ) +endif() + +set(TOMCRYPT_FILES + src/libtomcrypt/src/hashes/hash_memory.c + src/libtomcrypt/src/hashes/md5.c + src/libtomcrypt/src/hashes/sha1.c + src/libtomcrypt/src/math/ltm_desc.c + src/libtomcrypt/src/math/multi.c + src/libtomcrypt/src/math/rand_prime.c + src/libtomcrypt/src/misc/base64_decode.c + src/libtomcrypt/src/misc/crypt_argchk.c + src/libtomcrypt/src/misc/crypt_find_hash.c + src/libtomcrypt/src/misc/crypt_find_prng.c + src/libtomcrypt/src/misc/crypt_hash_descriptor.c + src/libtomcrypt/src/misc/crypt_hash_is_valid.c + src/libtomcrypt/src/misc/crypt_ltc_mp_descriptor.c + src/libtomcrypt/src/misc/crypt_prng_descriptor.c + src/libtomcrypt/src/misc/crypt_prng_is_valid.c + src/libtomcrypt/src/misc/crypt_register_hash.c + src/libtomcrypt/src/misc/crypt_register_prng.c + src/libtomcrypt/src/misc/zeromem.c + src/libtomcrypt/src/pk/asn1/der_decode_bit_string.c + src/libtomcrypt/src/pk/asn1/der_decode_boolean.c + src/libtomcrypt/src/pk/asn1/der_decode_choice.c + src/libtomcrypt/src/pk/asn1/der_decode_ia5_string.c + src/libtomcrypt/src/pk/asn1/der_decode_integer.c + src/libtomcrypt/src/pk/asn1/der_decode_object_identifier.c + src/libtomcrypt/src/pk/asn1/der_decode_octet_string.c + src/libtomcrypt/src/pk/asn1/der_decode_printable_string.c + src/libtomcrypt/src/pk/asn1/der_decode_sequence_ex.c + src/libtomcrypt/src/pk/asn1/der_decode_sequence_flexi.c + src/libtomcrypt/src/pk/asn1/der_decode_sequence_multi.c + src/libtomcrypt/src/pk/asn1/der_decode_short_integer.c + src/libtomcrypt/src/pk/asn1/der_decode_utctime.c + src/libtomcrypt/src/pk/asn1/der_decode_utf8_string.c + src/libtomcrypt/src/pk/asn1/der_encode_bit_string.c + src/libtomcrypt/src/pk/asn1/der_encode_boolean.c + src/libtomcrypt/src/pk/asn1/der_encode_ia5_string.c + src/libtomcrypt/src/pk/asn1/der_encode_integer.c + src/libtomcrypt/src/pk/asn1/der_encode_object_identifier.c + src/libtomcrypt/src/pk/asn1/der_encode_octet_string.c + src/libtomcrypt/src/pk/asn1/der_encode_printable_string.c + src/libtomcrypt/src/pk/asn1/der_encode_sequence_ex.c + src/libtomcrypt/src/pk/asn1/der_encode_sequence_multi.c + src/libtomcrypt/src/pk/asn1/der_encode_set.c + src/libtomcrypt/src/pk/asn1/der_encode_setof.c + src/libtomcrypt/src/pk/asn1/der_encode_short_integer.c + src/libtomcrypt/src/pk/asn1/der_encode_utctime.c + src/libtomcrypt/src/pk/asn1/der_encode_utf8_string.c + src/libtomcrypt/src/pk/asn1/der_length_bit_string.c + src/libtomcrypt/src/pk/asn1/der_length_boolean.c + src/libtomcrypt/src/pk/asn1/der_length_ia5_string.c + src/libtomcrypt/src/pk/asn1/der_length_integer.c + src/libtomcrypt/src/pk/asn1/der_length_object_identifier.c + src/libtomcrypt/src/pk/asn1/der_length_octet_string.c + src/libtomcrypt/src/pk/asn1/der_length_printable_string.c + src/libtomcrypt/src/pk/asn1/der_length_sequence.c + src/libtomcrypt/src/pk/asn1/der_length_utctime.c + src/libtomcrypt/src/pk/asn1/der_sequence_free.c + src/libtomcrypt/src/pk/asn1/der_length_utf8_string.c + src/libtomcrypt/src/pk/asn1/der_length_short_integer.c + src/libtomcrypt/src/pk/ecc/ltc_ecc_map.c + src/libtomcrypt/src/pk/ecc/ltc_ecc_mul2add.c + src/libtomcrypt/src/pk/ecc/ltc_ecc_mulmod.c + src/libtomcrypt/src/pk/ecc/ltc_ecc_points.c + src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_add_point.c + src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_dbl_point.c + src/libtomcrypt/src/pk/pkcs1/pkcs_1_mgf1.c + src/libtomcrypt/src/pk/pkcs1/pkcs_1_oaep_decode.c + src/libtomcrypt/src/pk/pkcs1/pkcs_1_pss_decode.c + src/libtomcrypt/src/pk/pkcs1/pkcs_1_pss_encode.c + src/libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_decode.c + src/libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_encode.c + src/libtomcrypt/src/pk/rsa/rsa_exptmod.c + src/libtomcrypt/src/pk/rsa/rsa_free.c + src/libtomcrypt/src/pk/rsa/rsa_import.c + src/libtomcrypt/src/pk/rsa/rsa_make_key.c + src/libtomcrypt/src/pk/rsa/rsa_sign_hash.c + src/libtomcrypt/src/pk/rsa/rsa_verify_hash.c +) + +set(TOMMATH_FILES + src/libtommath/bncore.c + src/libtommath/bn_fast_mp_invmod.c + src/libtommath/bn_fast_mp_montgomery_reduce.c + src/libtommath/bn_fast_s_mp_mul_digs.c + src/libtommath/bn_fast_s_mp_mul_high_digs.c + src/libtommath/bn_fast_s_mp_sqr.c + src/libtommath/bn_mp_2expt.c + src/libtommath/bn_mp_abs.c + src/libtommath/bn_mp_add.c + src/libtommath/bn_mp_addmod.c + src/libtommath/bn_mp_add_d.c + src/libtommath/bn_mp_and.c + src/libtommath/bn_mp_clamp.c + src/libtommath/bn_mp_clear.c + src/libtommath/bn_mp_clear_multi.c + src/libtommath/bn_mp_cmp.c + src/libtommath/bn_mp_cmp_d.c + src/libtommath/bn_mp_cmp_mag.c + src/libtommath/bn_mp_cnt_lsb.c + src/libtommath/bn_mp_copy.c + src/libtommath/bn_mp_count_bits.c + src/libtommath/bn_mp_div.c + src/libtommath/bn_mp_div_2.c + src/libtommath/bn_mp_div_2d.c + src/libtommath/bn_mp_div_3.c + src/libtommath/bn_mp_div_d.c + src/libtommath/bn_mp_dr_is_modulus.c + src/libtommath/bn_mp_dr_reduce.c + src/libtommath/bn_mp_dr_setup.c + src/libtommath/bn_mp_exch.c + src/libtommath/bn_mp_exptmod.c + src/libtommath/bn_mp_exptmod_fast.c + src/libtommath/bn_mp_expt_d.c + src/libtommath/bn_mp_exteuclid.c + src/libtommath/bn_mp_fread.c + src/libtommath/bn_mp_fwrite.c + src/libtommath/bn_mp_gcd.c + src/libtommath/bn_mp_get_int.c + src/libtommath/bn_mp_grow.c + src/libtommath/bn_mp_init.c + src/libtommath/bn_mp_init_copy.c + src/libtommath/bn_mp_init_multi.c + src/libtommath/bn_mp_init_set.c + src/libtommath/bn_mp_init_set_int.c + src/libtommath/bn_mp_init_size.c + src/libtommath/bn_mp_invmod.c + src/libtommath/bn_mp_invmod_slow.c + src/libtommath/bn_mp_is_square.c + src/libtommath/bn_mp_jacobi.c + src/libtommath/bn_mp_karatsuba_mul.c + src/libtommath/bn_mp_karatsuba_sqr.c + src/libtommath/bn_mp_lcm.c + src/libtommath/bn_mp_lshd.c + src/libtommath/bn_mp_mod.c + src/libtommath/bn_mp_mod_2d.c + src/libtommath/bn_mp_mod_d.c + src/libtommath/bn_mp_montgomery_calc_normalization.c + src/libtommath/bn_mp_montgomery_reduce.c + src/libtommath/bn_mp_montgomery_setup.c + src/libtommath/bn_mp_mul.c + src/libtommath/bn_mp_mulmod.c + src/libtommath/bn_mp_mul_2.c + src/libtommath/bn_mp_mul_2d.c + src/libtommath/bn_mp_mul_d.c + src/libtommath/bn_mp_neg.c + src/libtommath/bn_mp_n_root.c + src/libtommath/bn_mp_or.c + src/libtommath/bn_mp_prime_fermat.c + src/libtommath/bn_mp_prime_is_divisible.c + src/libtommath/bn_mp_prime_is_prime.c + src/libtommath/bn_mp_prime_miller_rabin.c + src/libtommath/bn_mp_prime_next_prime.c + src/libtommath/bn_mp_prime_rabin_miller_trials.c + src/libtommath/bn_mp_prime_random_ex.c + src/libtommath/bn_mp_radix_size.c + src/libtommath/bn_mp_radix_smap.c + src/libtommath/bn_mp_rand.c + src/libtommath/bn_mp_read_radix.c + src/libtommath/bn_mp_read_signed_bin.c + src/libtommath/bn_mp_read_unsigned_bin.c + src/libtommath/bn_mp_reduce.c + src/libtommath/bn_mp_reduce_2k.c + src/libtommath/bn_mp_reduce_2k_l.c + src/libtommath/bn_mp_reduce_2k_setup.c + src/libtommath/bn_mp_reduce_2k_setup_l.c + src/libtommath/bn_mp_reduce_is_2k.c + src/libtommath/bn_mp_reduce_is_2k_l.c + src/libtommath/bn_mp_reduce_setup.c + src/libtommath/bn_mp_rshd.c + src/libtommath/bn_mp_set.c + src/libtommath/bn_mp_set_int.c + src/libtommath/bn_mp_shrink.c + src/libtommath/bn_mp_signed_bin_size.c + src/libtommath/bn_mp_sqr.c + src/libtommath/bn_mp_sqrmod.c + src/libtommath/bn_mp_sqrt.c + src/libtommath/bn_mp_sub.c + src/libtommath/bn_mp_submod.c + src/libtommath/bn_mp_sub_d.c + src/libtommath/bn_mp_toom_mul.c + src/libtommath/bn_mp_toom_sqr.c + src/libtommath/bn_mp_toradix.c + src/libtommath/bn_mp_toradix_n.c + src/libtommath/bn_mp_to_signed_bin.c + src/libtommath/bn_mp_to_signed_bin_n.c + src/libtommath/bn_mp_to_unsigned_bin.c + src/libtommath/bn_mp_to_unsigned_bin_n.c + src/libtommath/bn_mp_unsigned_bin_size.c + src/libtommath/bn_mp_xor.c + src/libtommath/bn_mp_zero.c + src/libtommath/bn_prime_tab.c + src/libtommath/bn_reverse.c + src/libtommath/bn_s_mp_add.c + src/libtommath/bn_s_mp_exptmod.c + src/libtommath/bn_s_mp_mul_digs.c + src/libtommath/bn_s_mp_mul_high_digs.c + src/libtommath/bn_s_mp_sqr.c + src/libtommath/bn_s_mp_sub.c +) + +find_package(ZLIB REQUIRED) +find_package(BZip2 REQUIRED) + +if(WIN32) + set(LINK_LIBS wininet) +endif() + +list(APPEND LINK_LIBS ZLIB::ZLIB BZip2::BZip2) + +if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + message(STATUS "Using FreeBSD port") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DO_LARGEFILE=0 -Dstat64=stat -Dlstat64=lstat -Dlseek64=lseek -Doff64_t=off_t -Dfstat64=fstat -Dftruncate64=ftruncate") +endif() + +add_library(stormlib ${LIB_TYPE} ${SRC_FILES} ${TOMCRYPT_FILES} ${TOMMATH_FILES} ${STORM_DEF_FILES}) +add_definitions(-D__SYS_ZLIB -D__SYS_BZLIB) + +target_link_libraries(stormlib PRIVATE ${LINK_LIBS}) + +target_compile_definitions(stormlib PRIVATE _7ZIP_ST BZ_STRICT_ANSI) + +if(WIN32) + target_compile_definitions(stormlib PRIVATE UNICODE _UNICODE) +endif() + +if(NOT MSVC) + # don't error on implicit declarations, which are invalid in C99 but commonly used + target_compile_options(stormlib PRIVATE -Wno-error=implicit-function-declaration) +endif() + + +set_target_properties(stormlib PROPERTIES PUBLIC_HEADER "src/StormLib.h;src/StormPort.h") + +install(TARGETS stormlib EXPORT stormlibConfig + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + PUBLIC_HEADER DESTINATION include +) + +install(EXPORT stormlibConfig NAMESPACE stormlib:: DESTINATION share/stormlib) diff --git a/externals/vcpkg/ports/stormlib/portfile.cmake b/externals/vcpkg/ports/stormlib/portfile.cmake new file mode 100755 index 000000000..b494d5606 --- /dev/null +++ b/externals/vcpkg/ports/stormlib/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ladislav-zezula/StormLib + REF 2f0e0e69e6b3739d7c450ac3d38816aee45ac3c2 + SHA512 54cbe4270963944edf3d75b845047add2b004e0d95b20b75a4c4790c2a12a41bf19cc4f55aaeaec697a0a913827e11cfabde2123b2b13730556310dd89eef1e9 + HEAD_REF master +) + +file(COPY + ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt + DESTINATION ${SOURCE_PATH} +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/stormlib RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_fixup_cmake_targets() \ No newline at end of file diff --git a/externals/vcpkg/ports/stormlib/vcpkg.json b/externals/vcpkg/ports/stormlib/vcpkg.json new file mode 100755 index 000000000..b293260ec --- /dev/null +++ b/externals/vcpkg/ports/stormlib/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "stormlib", + "version-string": "2019-05-10", + "port-version": 3, + "description": "StormLib is a library for opening and manipulating Blizzard MPQ files", + "dependencies": [ + "bzip2", + "zlib" + ] +} diff --git a/externals/vcpkg/ports/strict-variant/portfile.cmake b/externals/vcpkg/ports/strict-variant/portfile.cmake new file mode 100755 index 000000000..cc258b561 --- /dev/null +++ b/externals/vcpkg/ports/strict-variant/portfile.cmake @@ -0,0 +1,15 @@ +# header-only +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cbeck88/strict-variant + REF 6378755e3c612cd870c2720232db1e5423dbbe73 + SHA512 45432caab51d42b86839f5ed194e79630ee5cbedd6e41eaadc10d28788ceb8c4629c0432ce888a5729266585e03cf4e6206c8ec66d1b1bc3d7d60220b3909f1d + HEAD_REF master +) + +# Copy header files +file(COPY ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.hpp") + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/strict-variant) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/strict-variant/LICENSE ${CURRENT_PACKAGES_DIR}/share/strict-variant/copyright) diff --git a/externals/vcpkg/ports/strict-variant/vcpkg.json b/externals/vcpkg/ports/strict-variant/vcpkg.json new file mode 100755 index 000000000..f95e19258 --- /dev/null +++ b/externals/vcpkg/ports/strict-variant/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "strict-variant", + "version-string": "0.5", + "port-version": 1, + "description": "Tagged union implementation that will never throw an exception or make a dynamic allocation in the effort of supporting types that have throwing moves." +} diff --git a/externals/vcpkg/ports/string-theory/portfile.cmake b/externals/vcpkg/ports/string-theory/portfile.cmake new file mode 100755 index 000000000..3277af3a9 --- /dev/null +++ b/externals/vcpkg/ports/string-theory/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO zrax/string_theory + REF 3.6 + SHA512 2bbd8e6c5c2501cc9616ee6a77b60a7cac5e7c9fa58d6616f6ba39cfdee33dc1b072c5d1b34bd2f88726fb4d65d32032595be7a67854a2e894eb3d81d4a8eea9 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME string_theory CONFIG_PATH lib/cmake/string_theory) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/string-theory/vcpkg.json b/externals/vcpkg/ports/string-theory/vcpkg.json new file mode 100755 index 000000000..ba3752a62 --- /dev/null +++ b/externals/vcpkg/ports/string-theory/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "string-theory", + "version": "3.6", + "description": "Flexible modern C++ string library with type-safe formatting.", + "homepage": "https://github.com/zrax/string_theory", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/string-view-lite/portfile.cmake b/externals/vcpkg/ports/string-view-lite/portfile.cmake new file mode 100755 index 000000000..007185ffb --- /dev/null +++ b/externals/vcpkg/ports/string-view-lite/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO martinmoene/string-view-lite + REF v1.6.0 + SHA512 a21c4c956360b76cf6f530ae7c26d97777d4c37164e6fc0da0dc931d41378aa020a235e40d7f8e8160c1b9dab552c6d7bf3aa7697e9048effef2b3cee8573553 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSTRING_VIEW_LITE_OPT_BUILD_TESTS=OFF + -DSTRING_VIEW_LITE_OPT_BUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + CONFIG_PATH "lib/cmake/${PORT}" +) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" +) + +file(INSTALL + "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright +) diff --git a/externals/vcpkg/ports/string-view-lite/vcpkg.json b/externals/vcpkg/ports/string-view-lite/vcpkg.json new file mode 100755 index 000000000..1d1bfc18f --- /dev/null +++ b/externals/vcpkg/ports/string-view-lite/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "string-view-lite", + "version": "1.6.0", + "description": "A C++17-like string_view for C++98, C++11 and later in a single-file header-only library", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/strtk/copyright b/externals/vcpkg/ports/strtk/copyright new file mode 100755 index 000000000..e732a0a9a --- /dev/null +++ b/externals/vcpkg/ports/strtk/copyright @@ -0,0 +1,8 @@ +Copyright 2002-2018 Arash Partow +http://www.partow.net/programming/strtk/index.html + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/externals/vcpkg/ports/strtk/portfile.cmake b/externals/vcpkg/ports/strtk/portfile.cmake new file mode 100755 index 000000000..770f183c0 --- /dev/null +++ b/externals/vcpkg/ports/strtk/portfile.cmake @@ -0,0 +1,9 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ArashPartow/strtk + REF d9cc24c696ca3aea25d2ac8c2c495e18d7e6cd89 # accessed on 2020-09-14 + SHA512 c37c0df1dd3f7bc1dfcceea83ed9303cf9388ba400ee645f26a24bca50bf85209f7b8a2169f6b98b0267ece986a29a27605ff3eaef50a44629fb7e042d06f26a +) + +file(COPY ${SOURCE_PATH}/strtk.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/strtk) diff --git a/externals/vcpkg/ports/strtk/vcpkg.json b/externals/vcpkg/ports/strtk/vcpkg.json new file mode 100755 index 000000000..41a303b37 --- /dev/null +++ b/externals/vcpkg/ports/strtk/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "strtk", + "version-string": "2020-09-14", + "port-version": 1, + "description": "robust, optimized and portable string processing algorithms for the C++ language", + "homepage": "https://github.com/ArashPartow/strtk", + "dependencies": [ + "boost" + ] +} diff --git a/externals/vcpkg/ports/stx/CMakeLists.patch b/externals/vcpkg/ports/stx/CMakeLists.patch new file mode 100755 index 000000000..70aaccbfd --- /dev/null +++ b/externals/vcpkg/ports/stx/CMakeLists.patch @@ -0,0 +1,71 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e4ed99e..b0d2b15 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -204,12 +204,7 @@ endif() + # =============================================== + + if(STX_ENABLE_BACKTRACE) +- if(NOT EXISTS third_party/abseil) +- execute_process( +- COMMAND git submodule update --init --recursive third_party/abseil +- WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) +- endif() +- add_subdirectory(third_party/abseil) ++ find_package(absl CONFIG REQUIRED) + endif() + + # the atomics library doesn't automatically link on my Android phone +@@ -246,13 +241,17 @@ else() + add_library(stx STATIC ${STX_SRCS}) + endif() + +-target_include_directories(stx PUBLIC include) ++target_include_directories(stx PUBLIC ++ $ ++ $ ++) ++ + target_compile_options(stx PRIVATE ${STX_FLAGS} ${STX_WARNING_FLAGS}) + target_compile_definitions(stx PUBLIC ${STX_COMPILER_DEFS}) + target_link_libraries(stx ${STX_LIB_DEPENDENCIES}) + + if(STX_ENABLE_BACKTRACE) +- target_link_libraries(stx absl::stacktrace absl::symbolize) ++ target_link_libraries(stx PUBLIC absl::stacktrace absl::symbolize) + endif() + + if(ANDROID) +@@ -288,6 +287,7 @@ endif() + # + # =============================================== + ++ + if(STX_BUILD_BENCHMARKS) + + if(NOT EXISTS third_party/benchmark) +@@ -433,3 +433,24 @@ if(STX_BUILD_DOCS) + DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/docs/html/assets) + + endif() ++ ++install( ++ TARGETS stx ++ EXPORT stx ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++ RUNTIME DESTINATION bin ++) ++ ++install( ++ DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ ++ DESTINATION include ++ FILES_MATCHING PATTERN "*.h*") ++ ++install( ++ EXPORT stx ++ DESTINATION share/stx ++ FILE stxConfig.cmake ++ NAMESPACE stx:: ++) ++ diff --git a/externals/vcpkg/ports/stx/portfile.cmake b/externals/vcpkg/ports/stx/portfile.cmake new file mode 100755 index 000000000..ebfca54ab --- /dev/null +++ b/externals/vcpkg/ports/stx/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lamarrr/STX + REF v1.0.1 + SHA512 544ca32f07cd863082fa9688f5d56e2715b0129ff90d2a8533cc24a92c943e5848c4b2b06a71f54c12668f6e89e9e3c649f595f9eb886f671a5fa18d343f794b + HEAD_REF master + PATCHES + "CMakeLists.patch" +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + backtrace STX_ENABLE_BACKTRACE +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + ${FEATURE_OPTIONS} + -DSTX_BUILD_DOCS=OFF + -DSTX_BUILD_BENCHMARKS=OFF + -DSTX_BUILD_SHARED=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/stx) +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" +) diff --git a/externals/vcpkg/ports/stx/vcpkg.json b/externals/vcpkg/ports/stx/vcpkg.json new file mode 100755 index 000000000..536f55751 --- /dev/null +++ b/externals/vcpkg/ports/stx/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "stx", + "version-string": "1.0.1", + "port-version": 1, + "description": "C++17 & C++ 20 error-handling and utility extensions", + "homepage": "https://github.com/lamarrr/STX", + "features": { + "backtrace": { + "description": "stacktrace support for STX", + "dependencies": [ + "abseil" + ] + } + } +} diff --git a/externals/vcpkg/ports/stxxl/0001-fix-visual-studio.patch b/externals/vcpkg/ports/stxxl/0001-fix-visual-studio.patch new file mode 100755 index 000000000..287b0ae3d --- /dev/null +++ b/externals/vcpkg/ports/stxxl/0001-fix-visual-studio.patch @@ -0,0 +1,289 @@ +diff --git a/include/stxxl/bits/algo/ksort.h b/include/stxxl/bits/algo/ksort.h +index 33ec8cf..8101741 100644 +--- a/include/stxxl/bits/algo/ksort.h ++++ b/include/stxxl/bits/algo/ksort.h +@@ -299,11 +299,7 @@ create_runs( + template +-struct run_cursor2_cmp : public std::binary_function< +- run_cursor2, +- run_cursor2, +- bool +- > ++struct run_cursor2_cmp + { + typedef run_cursor2 cursor_type; + KeyExtractor keyobj; +@@ -327,7 +323,7 @@ private: + }; + + template +-class key_comparison : public std::binary_function ++class key_comparison + { + KeyExtractor ke; + +diff --git a/include/stxxl/bits/algo/sort_helper.h b/include/stxxl/bits/algo/sort_helper.h +index 524e40d..69234c4 100644 +--- a/include/stxxl/bits/algo/sort_helper.h ++++ b/include/stxxl/bits/algo/sort_helper.h +@@ -51,7 +51,6 @@ struct trigger_entry + + template + struct trigger_entry_cmp +- : public std::binary_function + { + typedef TriggerEntryType trigger_entry_type; + ValueCmp cmp; +@@ -67,11 +66,6 @@ template + struct run_cursor2_cmp +- : public std::binary_function< +- run_cursor2, +- run_cursor2, +- bool +- > + { + typedef BlockType block_type; + typedef PrefetcherType prefetcher_type; +diff --git a/include/stxxl/bits/compat/unique_ptr.h b/include/stxxl/bits/compat/unique_ptr.h +index 9df12ff..7110246 100644 +--- a/include/stxxl/bits/compat/unique_ptr.h ++++ b/include/stxxl/bits/compat/unique_ptr.h +@@ -22,12 +22,7 @@ STXXL_BEGIN_NAMESPACE + + template + struct compat_unique_ptr { +-#if __cplusplus >= 201103L && ((__GNUC__ * 10000 + __GNUC_MINOR__ * 100) >= 40400) + typedef std::unique_ptr result; +-#else +- // auto_ptr is inherently broken and is deprecated by unique_ptr in c++0x +- typedef std::auto_ptr result; +-#endif + }; + + STXXL_END_NAMESPACE +diff --git a/include/stxxl/bits/containers/btree/leaf.h b/include/stxxl/bits/containers/btree/leaf.h +index d7c619f..969adfd 100644 +--- a/include/stxxl/bits/containers/btree/leaf.h ++++ b/include/stxxl/bits/containers/btree/leaf.h +@@ -66,7 +66,7 @@ public: + typedef node_cache leaf_cache_type; + + public: +- struct value_compare : public std::binary_function ++ struct value_compare + { + key_compare comp; + +diff --git a/include/stxxl/bits/containers/btree/node.h b/include/stxxl/bits/containers/btree/node.h +index 13dec7b..c26cfff 100644 +--- a/include/stxxl/bits/containers/btree/node.h ++++ b/include/stxxl/bits/containers/btree/node.h +@@ -71,7 +71,7 @@ public: + typedef node_cache node_cache_type; + + private: +- struct value_compare : public std::binary_function ++ struct value_compare + { + key_compare comp; + +diff --git a/include/stxxl/bits/containers/hash_map/hash_map.h b/include/stxxl/bits/containers/hash_map/hash_map.h +index 0759bd2..edcc2ac 100644 +--- a/include/stxxl/bits/containers/hash_map/hash_map.h ++++ b/include/stxxl/bits/containers/hash_map/hash_map.h +@@ -1258,10 +1258,7 @@ protected: + * lexicographically by Note: the hash-value has already + * been computed. + */ +- struct Cmp : public std::binary_function< +- std::pair, +- std::pair, bool +- > ++ struct Cmp + { + self_type& map_; + Cmp(self_type& map) : map_(map) { } +@@ -1520,7 +1517,7 @@ protected: + + public: + //! Construct an equality predicate from the comparison operator +- struct equal_to : public std::binary_function ++ struct equal_to + { + //! reference to hash_map + const self_type& m_map; +diff --git a/include/stxxl/bits/io/wbtl_file.h b/include/stxxl/bits/io/wbtl_file.h +index 933a216..d9f0674 100644 +--- a/include/stxxl/bits/io/wbtl_file.h ++++ b/include/stxxl/bits/io/wbtl_file.h +@@ -65,7 +65,7 @@ class wbtl_file : public disk_queued_file + size_type curpos; + request_ptr backend_request; + +- struct FirstFit : public std::binary_function ++ struct FirstFit + { + bool operator () ( + const place& entry, +diff --git a/include/stxxl/bits/mng/block_alloc.h b/include/stxxl/bits/mng/block_alloc.h +index 19ade8b..dac408f 100644 +--- a/include/stxxl/bits/mng/block_alloc.h ++++ b/include/stxxl/bits/mng/block_alloc.h +@@ -138,7 +138,7 @@ private: + perm[i] = i; + + stxxl::random_number rnd; +- std::random_shuffle(perm.begin(), perm.end(), rnd _STXXL_FORCE_SEQUENTIAL); ++ std::shuffle(perm.begin(), perm.end(), std::mt19937(std::random_device()())); + } + + public: +diff --git a/include/stxxl/bits/mng/block_alloc_interleaved.h b/include/stxxl/bits/mng/block_alloc_interleaved.h +index a82ee34..83925a3 100644 +--- a/include/stxxl/bits/mng/block_alloc_interleaved.h ++++ b/include/stxxl/bits/mng/block_alloc_interleaved.h +@@ -93,7 +93,7 @@ struct interleaved_RC : public interleaved_striping + perms[i][j] = j; + + random_number rnd; +- std::random_shuffle(perms[i].begin(), perms[i].end(), rnd _STXXL_FORCE_SEQUENTIAL); ++ std::shuffle(perms[i].begin(), perms[i].end(), std::mt19937(std::random_device()())); + } + } + +diff --git a/include/stxxl/bits/mng/disk_allocator.h b/include/stxxl/bits/mng/disk_allocator.h +index 59ad085..a4e534e 100644 +--- a/include/stxxl/bits/mng/disk_allocator.h ++++ b/include/stxxl/bits/mng/disk_allocator.h +@@ -44,7 +44,7 @@ class disk_allocator : private noncopyable + { + typedef std::pair place; + +- struct first_fit : public std::binary_function ++ struct first_fit + { + bool operator () ( + const place& entry, +@@ -189,7 +189,7 @@ void disk_allocator::new_blocks(BID* begin, BID* end) + + sortseq::iterator space; + space = std::find_if(free_space.begin(), free_space.end(), +- bind2nd(first_fit(), requested_size) _STXXL_FORCE_SEQUENTIAL); ++ std::bind(first_fit(), std::placeholders::_1, requested_size) _STXXL_FORCE_SEQUENTIAL); + + if (space == free_space.end() && requested_size == BlockSize) + { +@@ -207,7 +207,7 @@ void disk_allocator::new_blocks(BID* begin, BID* end) + grow_file(BlockSize); + + space = std::find_if(free_space.begin(), free_space.end(), +- bind2nd(first_fit(), requested_size) _STXXL_FORCE_SEQUENTIAL); ++ std::bind(first_fit(), std::placeholders::_1, requested_size) _STXXL_FORCE_SEQUENTIAL); + } + + if (space != free_space.end()) +diff --git a/include/stxxl/bits/msvc_compatibility.h b/include/stxxl/bits/msvc_compatibility.h +index c2c937d..0cb22e5 100644 +--- a/include/stxxl/bits/msvc_compatibility.h ++++ b/include/stxxl/bits/msvc_compatibility.h +@@ -19,10 +19,12 @@ + + #include + ++#if _MSC_VER < 1900 + inline double log2(double x) + { + return (log(x) / log(2.)); + } ++#endif // ^^^ _MSC_VER < 1900 + + // http://msdn.microsoft.com/en-us/library/2ts7cx93.aspx + #define snprintf _snprintf +diff --git a/include/stxxl/bits/parallel.h b/include/stxxl/bits/parallel.h +index d973861..c858d87 100644 +--- a/include/stxxl/bits/parallel.h ++++ b/include/stxxl/bits/parallel.h +@@ -121,7 +121,6 @@ using __gnu_parallel::random_shuffle; + #elif STXXL_PARALLEL + + using std::sort; +-using std::random_shuffle; + + #else + +diff --git a/include/stxxl/bits/parallel/base.h b/include/stxxl/bits/parallel/base.h +index 141d515..1c970f9 100644 +--- a/include/stxxl/bits/parallel/base.h ++++ b/include/stxxl/bits/parallel/base.h +@@ -33,7 +33,6 @@ namespace parallel { + */ + template + class binary_negate +- : public std::binary_function + { + protected: + Predicate pred; +@@ -80,7 +79,7 @@ static inline void decode2(lcas_t x, int& a, int& b) + * Constructs predicate for equality from strict weak ordering predicate + */ + template +-class equal_from_less : public std::binary_function ++class equal_from_less + { + private: + Comparator& comp; +@@ -126,7 +125,7 @@ median_of_three_iterators(RandomAccessIterator a, RandomAccessIterator b, + + /** Similar to std::equal_to, but allows two different types. */ + template +-struct equal_to : std::binary_function ++struct equal_to + { + bool operator () (const T1& t1, const T2& t2) const + { +@@ -136,7 +135,7 @@ struct equal_to : std::binary_function + + /** Similar to std::less, but allows two different types. */ + template +-struct less : std::binary_function ++struct less + { + bool operator () (const T1& t1, const T2& t2) const + { +diff --git a/include/stxxl/bits/parallel/multiseq_selection.h b/include/stxxl/bits/parallel/multiseq_selection.h +index 57e7599..f41d9aa 100644 +--- a/include/stxxl/bits/parallel/multiseq_selection.h ++++ b/include/stxxl/bits/parallel/multiseq_selection.h +@@ -35,7 +35,6 @@ namespace parallel { + //! Compare a pair of types lexcigraphically, ascending. + template + class lexicographic +- : public std::binary_function, std::pair, bool> + { + protected: + Comparator& m_comp; +@@ -60,7 +59,6 @@ public: + //! Compare a pair of types lexcigraphically, descending. + template + class lexicographic_rev +- : public std::binary_function, std::pair, bool> + { + protected: + Comparator& m_comp; +diff --git a/lib/io/wbtl_file.cpp b/lib/io/wbtl_file.cpp +index 310d76a..5f1a766 100644 +--- a/lib/io/wbtl_file.cpp ++++ b/lib/io/wbtl_file.cpp +@@ -304,7 +304,7 @@ wbtl_file::offset_type wbtl_file::get_next_write_block() + // mapping_lock has to be aquired by caller + sortseq::iterator space = + std::find_if(free_space.begin(), free_space.end(), +- bind2nd(FirstFit(), write_block_size) _STXXL_FORCE_SEQUENTIAL); ++ std::bind(FirstFit(), std::placeholders::_1, write_block_size) _STXXL_FORCE_SEQUENTIAL); + + if (space != free_space.end()) + { diff --git a/externals/vcpkg/ports/stxxl/fix-include-dir.patch b/externals/vcpkg/ports/stxxl/fix-include-dir.patch new file mode 100755 index 000000000..043252fb6 --- /dev/null +++ b/externals/vcpkg/ports/stxxl/fix-include-dir.patch @@ -0,0 +1,31 @@ +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 06f9e50a..281e1f04 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -94,6 +94,8 @@ if(BUILD_SHARED_LIBS) + add_library(stxxl SHARED ${LIBSTXXL_SOURCES}) + set_target_properties(stxxl PROPERTIES OUTPUT_NAME "${STXXL_LIBNAME}") + set_target_properties(stxxl PROPERTIES VERSION "${STXXL_VERSION_STRING}") ++ target_include_directories(stxxl PUBLIC $) ++ + install(TARGETS stxxl + EXPORT stxxl-targets + ARCHIVE DESTINATION ${INSTALL_LIB_DIR} +@@ -104,6 +106,8 @@ if(BUILD_SHARED_LIBS) + add_library(stxxl_static STATIC ${LIBSTXXL_SOURCES}) + set_target_properties(stxxl_static PROPERTIES OUTPUT_NAME "${STXXL_LIBNAME}") + set_target_properties(stxxl_static PROPERTIES VERSION "${STXXL_VERSION_STRING}") ++ target_include_directories(stxxl_static PUBLIC $) ++ + install(TARGETS stxxl_static + EXPORT stxxl-targets + ARCHIVE DESTINATION ${INSTALL_LIB_DIR}) +@@ -122,6 +126,8 @@ else() + add_library(stxxl STATIC ${LIBSTXXL_SOURCES}) + set_target_properties(stxxl PROPERTIES OUTPUT_NAME "${STXXL_LIBNAME}") + set_target_properties(stxxl PROPERTIES VERSION "${STXXL_VERSION_STRING}") ++ target_include_directories(stxxl PUBLIC $) ++ + install(TARGETS stxxl + EXPORT stxxl-targets + ARCHIVE DESTINATION ${INSTALL_LIB_DIR} diff --git a/externals/vcpkg/ports/stxxl/portfile.cmake b/externals/vcpkg/ports/stxxl/portfile.cmake new file mode 100755 index 000000000..d11b14015 --- /dev/null +++ b/externals/vcpkg/ports/stxxl/portfile.cmake @@ -0,0 +1,74 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO stxxl/stxxl + REF b9e44f0ecba7d7111fbb33f3330c3e53f2b75236 + SHA512 800a8fb95b52b21256cecb848f95645c54851f4dc070e0cd64fb5009f7663c0c962a24ca3f246e54d6d45e81a5c734309268d7ea6f0b0987336a50a3dcb99616 + HEAD_REF master + PATCHES + # This patch can be removed when stxxl/stxxl/#95 is accepted + fix-include-dir.patch + 0001-fix-visual-studio.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_STATIC_LIBS=ON + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF + -DBUILD_EXTRAS=OFF + -DUSE_BOOST=OFF + -DTRY_COMPILE_HEADERS=OFF + -DUSE_STD_THREADS=ON + -DNO_CXX11=OFF + -DUSE_VALGRIND=OFF + -DUSE_MALLOC_COUNT=OFF + -DUSE_GCOV=OFF + -DUSE_TPIE=OFF + OPTIONS_DEBUG + -DSTXXL_DEBUG_ASSERTIONS=ON + OPTIONS_RELEASE + -DSTXXL_DEBUG_ASSERTIONS=OFF +) + +vcpkg_install_cmake() + +if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake) + vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +endif() +if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}) + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +endif() + +vcpkg_replace_string( + ${CURRENT_PACKAGES_DIR}/share/${PORT}/stxxl-config.cmake + "\${STXXL_CMAKE_DIR}/../include" + "\${STXXL_CMAKE_DIR}/../../include" +) + +if(CMAKE_HOST_WIN32) + set(EXECUTABLE_SUFFIX ".exe") +else() + set(EXECUTABLE_SUFFIX "") +endif() + +file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/stxxl_tool${EXECUTABLE_SUFFIX} + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/bin + ${CURRENT_PACKAGES_DIR}/debug/share + ${CURRENT_PACKAGES_DIR}/bin +) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/stxxl/vcpkg.json b/externals/vcpkg/ports/stxxl/vcpkg.json new file mode 100755 index 000000000..107a43249 --- /dev/null +++ b/externals/vcpkg/ports/stxxl/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "stxxl", + "version-date": "2018-11-15", + "port-version": 5, + "description": "Standard Template Library for Extra Large Data Sets" +} diff --git a/externals/vcpkg/ports/suitesparse/FindCXSparse.cmake b/externals/vcpkg/ports/suitesparse/FindCXSparse.cmake new file mode 100755 index 000000000..65d596aca --- /dev/null +++ b/externals/vcpkg/ports/suitesparse/FindCXSparse.cmake @@ -0,0 +1,73 @@ +# Distributed under the OSI-approved BSD 3-Clause License. +# +#.rst: +# FindCXSparse +# -------- +# +# Find the CXSparse library +# +# Result Variables +# ^^^^^^^^^^^^^^^^ +# +# The following variables will be defined: +# +# ``CXSparse_FOUND`` +# True if CXSparse found on the local system +# +# ``CXSPARSE_FOUND`` +# True if CXSparse found on the local system +# +# ``CXSparse_INCLUDE_DIRS`` +# Location of CXSparse header files +# +# ``CXSPARSE_INCLUDE_DIRS`` +# Location of CXSparse header files +# +# ``CXSparse_LIBRARIES`` +# List of the CXSparse libraries found +# +# ``CXSPARSE_LIBRARIES`` +# List of the CXSparse libraries found +# +# + +include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) +include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) + +find_path(CXSPARSE_INCLUDE_DIR NAMES cs.h PATH_SUFFIXES suitesparse) + +find_library(CXSPARSE_LIBRARY_RELEASE NAMES cxsparse libcxsparse) +find_library(CXSPARSE_LIBRARY_DEBUG NAMES cxsparsed libcxsparsed) +select_library_configurations(CXSPARSE) + +if(CXSPARSE_INCLUDE_DIR) + set(CXSPARSE_VERSION_FILE ${CXSPARSE_INCLUDE_DIR}/cs.h) + file(READ ${CXSPARSE_INCLUDE_DIR}/cs.h CXSPARSE_VERSION_FILE_CONTENTS) + + string(REGEX MATCH "#define CS_VER [0-9]+" + CXSPARSE_MAIN_VERSION "${CXSPARSE_VERSION_FILE_CONTENTS}") + string(REGEX REPLACE "#define CS_VER ([0-9]+)" "\\1" + CXSPARSE_MAIN_VERSION "${CXSPARSE_MAIN_VERSION}") + + string(REGEX MATCH "#define CS_SUBVER [0-9]+" + CXSPARSE_SUB_VERSION "${CXSPARSE_VERSION_FILE_CONTENTS}") + string(REGEX REPLACE "#define CS_SUBVER ([0-9]+)" "\\1" + CXSPARSE_SUB_VERSION "${CXSPARSE_SUB_VERSION}") + + string(REGEX MATCH "#define CS_SUBSUB [0-9]+" + CXSPARSE_SUBSUB_VERSION "${CXSPARSE_VERSION_FILE_CONTENTS}") + string(REGEX REPLACE "#define CS_SUBSUB ([0-9]+)" "\\1" + CXSPARSE_SUBSUB_VERSION "${CXSPARSE_SUBSUB_VERSION}") + + set(CXSPARSE_VERSION "${CXSPARSE_MAIN_VERSION}.${CXSPARSE_SUB_VERSION}.${CXSPARSE_SUBSUB_VERSION}") +endif() + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(CXSparse + REQUIRED_VARS CXSPARSE_INCLUDE_DIR CXSPARSE_LIBRARIES + VERSION_VAR CXSPARSE_VERSION) + +set(CXSPARSE_FOUND ${CXSparse_FOUND}) +set(CXSPARSE_INCLUDE_DIRS ${CXSPARSE_INCLUDE_DIR}) +set(CXSparse_INCLUDE_DIRS ${CXSPARSE_INCLUDE_DIR}) +set(CXSparse_LIBRARIES ${CXSPARSE_LIBRARIES}) diff --git a/externals/vcpkg/ports/suitesparse/build_fixes.patch b/externals/vcpkg/ports/suitesparse/build_fixes.patch new file mode 100755 index 000000000..2734bb02c --- /dev/null +++ b/externals/vcpkg/ports/suitesparse/build_fixes.patch @@ -0,0 +1,281 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9602cce..dafb434 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,14 +5,6 @@ + # Updated by jesnault (jerome.esnault@inria.fr) 2014-01-21 + # ----------------------------------------------------------------- + +-option(HUNTER_ENABLED "Enable Hunter package manager support" OFF) +-include(cmake/HunterGate.cmake) +- +-HunterGate( +- URL "https://github.com/ruslo/hunter/archive/v0.23.214.tar.gz" +- SHA1 "e14bc153a7f16d6a5eeec845fb0283c8fad8c358" +-) +- + PROJECT(SuiteSparseProject) + + cmake_minimum_required(VERSION 3.1) +@@ -47,29 +39,9 @@ else() + message(STATUS "Using user defined CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}") + endif() + +-# Fix GKlib path: +-IF(NOT WIN32) +- SET(GKLIB_PATH "${${PROJECT_NAME}_SOURCE_DIR}/SuiteSparse/metis-5.1.0/GKlib" CACHE INTERNAL "Path to GKlib (for METIS)" FORCE) +-ENDIF() +- +-# allow creating DLLs in Windows without touching the source code: +-IF(NOT ${CMAKE_VERSION} VERSION_LESS "3.4.0" AND WIN32) +- set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) +-ENDIF() +- + ## get CMAKE_INSTALL_BINDIR and CMAKE_INSTALL_LIBDIR + include(GNUInstallDirs) + +-if(CMAKE_SIZEOF_VOID_P MATCHES "8") +- set(SUITESPARSE_LIB_POSTFIX "64") +-else() +- set(SUITESPARSE_LIB_POSTFIX "") +-endif() +- +-## get POSTFIX for lib install dir +-set(LIB_POSTFIX "${SUITESPARSE_LIB_POSTFIX}" CACHE STRING "suffix for 32/64 inst dir placement") +-mark_as_advanced(LIB_POSTFIX) +- + # We want libraries to be named "libXXX" and "libXXXd" in all compilers: + # ------------------------------------------------------------------------ + set(CMAKE_DEBUG_POSTFIX "d") +@@ -77,59 +49,6 @@ IF(MSVC) + set(SP_LIB_PREFIX "lib") # Libs are: "libXXX" + ENDIF(MSVC) + +-## check if we can build metis +-SET(BUILD_METIS_DEFAULT ON) +-if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/SuiteSparse/metis-5.1.0/CMakeLists.txt") +- SET(BUILD_METIS_DEFAULT OFF) +-endif() +- +-SET(WITH_CUDA OFF CACHE BOOL "Build with CUDA support") +- +-SET(BUILD_METIS ${BUILD_METIS_DEFAULT} CACHE BOOL "Build METIS for partitioning?") +-SET(METIS_DIR ${${PROJECT_NAME}_SOURCE_DIR}/SuiteSparse/metis-5.1.0 CACHE PATH "Source directory of METIS") +- +-if(BUILD_METIS) +- ## prepare the installation : +- ## using metis target here is not possible because this target is added in another branch of the CMake structure +- ## TRICK: need to dynamically modify the metis CMakeLists.txt file before it going to parsed... +- ## (very ugly/poor for a metis project get from SCM (git/svn/cvs) but it's works ;) and it doesn't matter if metis was get from .zip) +- if(EXISTS "${METIS_DIR}/libmetis/CMakeLists.txt") +- file(READ "${METIS_DIR}/libmetis/CMakeLists.txt" contentFile) +- string(REGEX MATCH "EXPORT SuiteSparseTargets" alreadyModified ${contentFile}) ## use a string pattern to check if we have to do the modif +- if(NOT alreadyModified) +- file(APPEND "${METIS_DIR}/libmetis/CMakeLists.txt" +- " +- set_target_properties(metis PROPERTIES PUBLIC_HEADER \"../include/metis.h\") +- install(TARGETS metis ## this line is also the string pattern to check if the modification had already done +- EXPORT SuiteSparseTargets +- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +- PUBLIC_HEADER DESTINATION include +- ) +- " +- ) +- endif() +- endif() +- add_subdirectory(SuiteSparse/metis-5.1.0) ## important part for building metis from its src files +-endif(BUILD_METIS) +- +- +-## For EXPORT only : +-## Previous version of cmake (>2.8.12) doesn't auto take into account external lib (here I mean blas and lapack) we need to link to for our current target we want to export. +-## Or at least we need to investigate how to do with previous version. +-## This may cause some trouble in case you want to build in static mode and then use it into another custom project. +-## You will need to manually link your target into your custom project to the correct dependencies link interfaces. +-if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" GREATER 2.8.11) ## (policies introduced both in 2.8.12) +- set(EXPORT_USE_INTERFACE_LINK_LIBRARIES ON CACHE BOOL "") +- mark_as_advanced(EXPORT_USE_INTERFACE_LINK_LIBRARIES) +- if(EXPORT_USE_INTERFACE_LINK_LIBRARIES) +- cmake_policy(SET CMP0023 NEW) ## just for respecting the new target_link_libraries(...) signature procedure +- cmake_policy(SET CMP0022 NEW) ## use INTERFACE_LINK_LIBRARIES property for in-build targets and ignore old properties (IMPORTED_)?LINK_INTERFACE_LIBRARIES(_)? +- ## Here, next version of cmake 2.8.12 auto take into account the link interface dependencies (see generated cmake/SuiteSparse-config*.cmake into your install dir) +- endif() +-endif() +- + ## install_suitesparse_project(targetName headersList) + ## factorise the way we will install all projects (part of the suitesparse project) + ## is the target of the current project you build +@@ -176,16 +95,16 @@ macro(declare_suitesparse_library targetName srcsList headersList) + set(dsl_TARGET_PUBLIC_LINK "") + endif() + if(WITH_CUDA) +- find_package(CUDA) ++ find_package(CUDA REQUIRED) + endif() +- IF(${CUDA_FOUND}) ++ IF(CUDA_FOUND) + INCLUDE_DIRECTORIES(${CUDA_INCLUDE_DIRS}) + INCLUDE_DIRECTORIES(${SuiteSparse_GPUQREngine_INCLUDE}) + INCLUDE_DIRECTORIES(${SuiteSparse_GPURuntime_INCLUDE}) + CUDA_ADD_LIBRARY(${targetName} ${srcsList} ${headersList}) +- ELSE(${CUDA_FOUND}) ++ ELSE() + ADD_LIBRARY(${targetName} ${srcsList} ${headersList}) +- ENDIF(${CUDA_FOUND}) ++ ENDIF() + SET_TARGET_PROPERTIES(${targetName} PROPERTIES + OUTPUT_NAME ${SP_LIB_PREFIX}${targetName} + ) +@@ -211,44 +130,30 @@ MACRO(REMOVE_MATCHING_FILES_FROM_LIST match_expr lst_files) + ENDMACRO(REMOVE_MATCHING_FILES_FROM_LIST) + + if(WITH_CUDA) +- FIND_PACKAGE(cuda) +- IF(${CUDA_FOUND}) ++ FIND_PACKAGE(CUDA REQUIRED) ++ IF(CUDA_FOUND) + ADD_DEFINITIONS(-DGPU_BLAS) +- ENDIF(${CUDA_FOUND}) ++ ENDIF() + endif() + +-hunter_add_package(LAPACK) # only in effect if HUNTER_ENABLED is set +-# prefer LAPACK config file +-find_package(LAPACK CONFIG) +-if (LAPACK_FOUND AND TARGET blas AND TARGET lapack) +- message(STATUS "found lapack and blas config file. Linking targets lapack and blas") +- message(STATUS "- LAPACK_CONFIG: ${LAPACK_CONFIG}") +- set(SuiteSparse_LINKER_LAPACK_BLAS_LIBS lapack blas) +- # for suitesparse-config file set method used to find LAPACK (and BLAS) +- set(SuiteSparse_LAPACK_used_CONFIG YES) +-else() +- # missing config file or targets, try BLAS and LAPACK +- find_package(BLAS) +- find_package(LAPACK) +- if (BLAS_FOUND AND LAPACK_FOUND) ++ find_package(BLAS REQUIRED) ++ find_package(LAPACK REQUIRED) + message(STATUS "found lapack and blas config file. Linking targets lapack and blas") + message(STATUS "- LAPACK_LIBRARIES: ${LAPACK_LIBRARIES}") + message(STATUS "- BLAS_LIBRARIES: ${BLAS_LIBRARIES}") + set(SuiteSparse_LINKER_LAPACK_BLAS_LIBS ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES}) + # for suitesparse-config file set method used to find LAPACK (and BLAS) + set(SuiteSparse_LAPACK_used_CONFIG NO) +- else () # LAPACK is not found +- message(FATAL_ERROR "lapack not found") +- endif() +-endif() + +-IF(BUILD_METIS) ++IF(USE_VCPKG_METIS) ++ find_package(metis REQUIRED) + set(SuiteSparse_LINKER_METIS_LIBS "metis") +- ## namespaced library target for config +- set(SuiteSparse_EXPORTED_METIS_LIBS "SuiteSparse::metis") ++ set(SuiteSparse_EXPORTED_METIS_LIBS "metis") ++ set(SuiteSparse_FIND_DEPENDENCY_METIS "find_dependency(metis REQUIRED)") + else() + set(SuiteSparse_LINKER_METIS_LIBS "") + set(SuiteSparse_EXPORTED_METIS_LIBS "") ++ set(SuiteSparse_FIND_PACKAGE_METIS "") + ENDIF() + + add_subdirectory(SuiteSparse) +@@ -287,7 +192,7 @@ endmacro() + # get SuiteSparse version + get_SuiteSparse_Version() + +-set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/suitesparse-${SuiteSparse_VERSION}) ++set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/suitesparse) + ## create targets file + export(EXPORT SuiteSparseTargets + FILE "${CMAKE_CURRENT_BINARY_DIR}/suitesparse/suitesparse-targets.cmake" +@@ -301,7 +206,7 @@ configure_file(cmake/SuiteSparse-config-install.cmake.in + ## do the EXPORT for allowing other project to easily use suitesparse with cmake + install(EXPORT SuiteSparseTargets + FILE +- SuiteSparse-targets.cmake ++ suitesparse-targets.cmake + NAMESPACE + SuiteSparse:: + DESTINATION +diff --git a/SuiteSparse/CMakeLists.txt b/SuiteSparse/CMakeLists.txt +index c6e2834..6fdfb01 100644 +--- a/SuiteSparse/CMakeLists.txt ++++ b/SuiteSparse/CMakeLists.txt +@@ -1,23 +1,5 @@ + PROJECT(SuiteSparse) + +-# Set optimized building: +-IF(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_BUILD_TYPE MATCHES "Debug") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3") +- # only optimize for native processer when NOT cross compiling +- if(NOT CMAKE_CROSSCOMPILING) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=native") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mtune=native") +- endif(NOT CMAKE_CROSSCOMPILING) +-ENDIF(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_BUILD_TYPE MATCHES "Debug") +- +-# Global flags: +-IF (BUILD_METIS) +- INCLUDE_DIRECTORIES("${METIS_SOURCE_DIR}/include") +-ELSE (BUILD_METIS) +- ADD_DEFINITIONS(-DNPARTITION) +-ENDIF ( BUILD_METIS) +- + # Disable COMPLEX numbers: disable it by default, since it causes problems in some platforms. + SET(HAVE_COMPLEX OFF CACHE BOOL "Enables building SuiteSparse with complex numbers (disabled by default to avoid problems in some platforms)") + IF (NOT HAVE_COMPLEX) +@@ -38,12 +20,12 @@ if(WITH_CUDA) + set(SUBPROJECTS_TO_ADD + ${SUBPROJECTS_TO_ADD} + SuiteSparse_GPURuntime +- GPUQREngine ++ GPUQREngine + ) + endif() + + set(SUBPROJECTS_TO_ADD +- ${SUBPROJECTS_TO_ADD} ++ ${SUBPROJECTS_TO_ADD} + SuiteSparse_config + AMD + BTF +diff --git a/cmake/SuiteSparse-config-install.cmake.in b/cmake/SuiteSparse-config-install.cmake.in +index 1e587d1..fd8f3a7 100644 +--- a/cmake/SuiteSparse-config-install.cmake.in ++++ b/cmake/SuiteSparse-config-install.cmake.in +@@ -2,20 +2,14 @@ + get_filename_component(_SuiteSparse_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) + get_filename_component(_SuiteSparse_PREFIX "${_SuiteSparse_SELF_DIR}" PATH) + get_filename_component(_SuiteSparse_PREFIX "${_SuiteSparse_PREFIX}" PATH) +-get_filename_component(_SuiteSparse_PREFIX "${_SuiteSparse_PREFIX}" PATH) + + include(CMakeFindDependencyMacro) +-if (@SuiteSparse_LAPACK_used_CONFIG@) # SuiteSparse_LAPACK_used_CONFIG +- # use config file which provides LAPACK (and BLAS) for us +- find_dependency(LAPACK CONFIG) +-else() +- # try to find BLAS and LAPACK with modules + find_dependency(BLAS) + find_dependency(LAPACK) +-endif () ++ @SuiteSparse_FIND_DEPENDENCY_METIS@ + + # Load targets from the install tree. +-include(${_SuiteSparse_SELF_DIR}/SuiteSparse-targets.cmake) ++include(${_SuiteSparse_SELF_DIR}/suitesparse-targets.cmake) + + # Report SuiteSparse header search locations. + set(SuiteSparse_INCLUDE_DIRS ${_SuiteSparse_PREFIX}/include) +@@ -39,3 +33,7 @@ set(SuiteSparse_LIBRARIES + + unset(_SuiteSparse_PREFIX) + unset(_SuiteSparse_SELF_DIR) ++set(SUITESPARSE_FOUND TRUE) ++set(SuiteSparse_FOUND TRUE) ++set(SUITESPARSE_LIBRARIES ${SuiteSparse_LIBRARIES}) ++set(SUITESPARSE_INCLUDE_DIRS ${SuiteSparse_INCLUDE_DIRS}) diff --git a/externals/vcpkg/ports/suitesparse/portfile.cmake b/externals/vcpkg/ports/suitesparse/portfile.cmake new file mode 100755 index 000000000..44dfa8c36 --- /dev/null +++ b/externals/vcpkg/ports/suitesparse/portfile.cmake @@ -0,0 +1,56 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DrTimothyAldenDavis/SuiteSparse + REF 71e330ca2bc0a2f12f416c461d23dbca21db4d8f + SHA512 06c75927c924cfd5511b07504e826714f504586243d6f3449d67408a33f3ecea824a7f2de7a165171791b9bda4fc09c0d7093125970895c2ed8d4d37ca1d5a3d + HEAD_REF master +) + +vcpkg_from_github( + OUT_SOURCE_PATH SUITESPARSEWIN_SOURCE_PATH + REPO jlblancoc/suitesparse-metis-for-windows + REF c11e8dd7a2ef7d0d93af4c16f75374dd8ca029e2 + SHA512 fbd2a9e6f7df47eeb5d890c7b286bef7fc4c8bcb22783ce800723bacaf2cfe902177828ce5b9e1c2ed9fb5c54591c5fb046a8667e7d354d452a4baac693e47d2 + HEAD_REF master + PATCHES + build_fixes.patch +) + +# Copy suitesparse sources. +message(STATUS "Overwriting SuiteSparseWin source files with SuiteSparse source files...") +# Should probably remove everything but CMakeLists.txt files? +file(GLOB SUITESPARSE_SOURCE_FILES ${SOURCE_PATH}/*) +foreach(SOURCE_FILE ${SUITESPARSE_SOURCE_FILES}) + file(COPY ${SOURCE_FILE} DESTINATION "${SUITESPARSEWIN_SOURCE_PATH}/SuiteSparse") +endforeach() +message(STATUS "Overwriting SuiteSparseWin source files with SuiteSparse source files... done") +message(STATUS "Removing integrated lapack and metis lib...") +file(REMOVE_RECURSE ${SUITESPARSEWIN_SOURCE_PATH}/lapack_windows) +file(REMOVE_RECURSE ${SUITESPARSEWIN_SOURCE_PATH}/SuiteSparse/metis-5.1.0) +message(STATUS "Removing integrated lapack and metis lib... done") + +vcpkg_configure_cmake( + SOURCE_PATH ${SUITESPARSEWIN_SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_METIS=OFF + -DUSE_VCPKG_METIS=ON + "-DMETIS_SOURCE_DIR=${CURRENT_INSTALLED_DIR}" + OPTIONS_DEBUG + -DSUITESPARSE_INSTALL_PREFIX="${CURRENT_PACKAGES_DIR}/debug" + OPTIONS_RELEASE + -DSUITESPARSE_INSTALL_PREFIX="${CURRENT_PACKAGES_DIR}" +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/suitesparse) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SUITESPARSEWIN_SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright_suitesparse-metis-for-windows) + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/cxsparse) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper_cxsparse.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/cxsparse RENAME vcpkg-cmake-wrapper.cmake) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindCXSparse.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/cxsparse) diff --git a/externals/vcpkg/ports/suitesparse/vcpkg-cmake-wrapper_cxsparse.cmake b/externals/vcpkg/ports/suitesparse/vcpkg-cmake-wrapper_cxsparse.cmake new file mode 100755 index 000000000..67d87e8b6 --- /dev/null +++ b/externals/vcpkg/ports/suitesparse/vcpkg-cmake-wrapper_cxsparse.cmake @@ -0,0 +1,10 @@ +set(CXSPARSE_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) + +list(REMOVE_ITEM ARGS "NO_MODULE") +list(REMOVE_ITEM ARGS "CONFIG") +list(REMOVE_ITEM ARGS "MODULE") + +_find_package(${ARGS}) + +set(CMAKE_MODULE_PATH ${CXSPARSE_PREV_MODULE_PATH}) diff --git a/externals/vcpkg/ports/suitesparse/vcpkg.json b/externals/vcpkg/ports/suitesparse/vcpkg.json new file mode 100755 index 000000000..71f44d724 --- /dev/null +++ b/externals/vcpkg/ports/suitesparse/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "suitesparse", + "version-semver": "5.8.0", + "port-version": 1, + "description": "A suite of sparse matrix algorithms. Also provides libcxsparse.", + "homepage": "http://suitesparse.com", + "dependencies": [ + "lapack", + "metis" + ] +} diff --git a/externals/vcpkg/ports/sundials/install-dlls-in-bin.patch b/externals/vcpkg/ports/sundials/install-dlls-in-bin.patch new file mode 100755 index 000000000..2a4ab5a49 --- /dev/null +++ b/externals/vcpkg/ports/sundials/install-dlls-in-bin.patch @@ -0,0 +1,11 @@ +--- a/cmake/macros/SundialsAddLibrary.cmake ++++ b/cmake/macros/SundialsAddLibrary.cmake +@@ -323,7 +323,7 @@ + set_target_properties(${_actual_target_name} PROPERTIES ${_properties}) + endif() + + # install phase +- install(TARGETS ${_actual_target_name} DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT sundials-targets) ++ install(TARGETS ${_actual_target_name} EXPORT sundials-targets) + + endif() diff --git a/externals/vcpkg/ports/sundials/portfile.cmake b/externals/vcpkg/ports/sundials/portfile.cmake new file mode 100755 index 000000000..b340a361d --- /dev/null +++ b/externals/vcpkg/ports/sundials/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LLNL/sundials + REF e2f29c34f324829302037a1492db480be8828084 + SHA512 9af9a5d7a44de1f2afbc35d8e2ec3d35a2d15f1b708be7a90bf849a0d0576fda6c73fae6b8954025805ac1ca25468558c02dcc2fd86b5767699518988817d4d8 + HEAD_REF master + PATCHES + install-dlls-in-bin.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SUN_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SUN_BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -D_BUILD_EXAMPLES=OFF + -DBUILD_STATIC_LIBS=${SUN_BUILD_STATIC} + -DBUILD_SHARED_LIBS=${SUN_BUILD_SHARED} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE") + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") diff --git a/externals/vcpkg/ports/sundials/vcpkg.json b/externals/vcpkg/ports/sundials/vcpkg.json new file mode 100755 index 000000000..bcb330e61 --- /dev/null +++ b/externals/vcpkg/ports/sundials/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "sundials", + "version-semver": "6.2.0", + "description": "SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation Solvers)", + "homepage": "https://computation.llnl.gov/projects/sundials", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/superlu/fix-libm.patch b/externals/vcpkg/ports/superlu/fix-libm.patch new file mode 100755 index 000000000..a356bbda2 --- /dev/null +++ b/externals/vcpkg/ports/superlu/fix-libm.patch @@ -0,0 +1,17 @@ +diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt +index e627f06..9aa8949 100644 +--- a/SRC/CMakeLists.txt ++++ b/SRC/CMakeLists.txt +@@ -232,7 +232,11 @@ if(enable_complex16) + endif() + + add_library(superlu ${sources} ${HEADERS}) +-target_link_libraries(superlu PUBLIC ${BLAS_LIB} m) ++if(CMAKE_SYSTEM_NAME STREQUAL "Windows") ++ target_link_libraries(superlu PUBLIC ${BLAS_LIB}) ++else() ++ target_link_libraries(superlu PUBLIC ${BLAS_LIB} m) ++endif() + target_include_directories(superlu PUBLIC + $ + $ diff --git a/externals/vcpkg/ports/superlu/portfile.cmake b/externals/vcpkg/ports/superlu/portfile.cmake new file mode 100755 index 000000000..7b4f8d25a --- /dev/null +++ b/externals/vcpkg/ports/superlu/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xiaoyeli/superlu + REF a3d5233770f0caad4bc4578b46d3b26af99e9c19 + SHA512 c07e64be51ddef7774a367e1309ef4e596e93571531ec58a0c7b9db60a3db8b3a4a8b1262d66fcd512ad467db5df59a3726db342b259e392a08f56f5dd67c6ef + HEAD_REF master + PATCHES + fix-libm.patch + remove-make.inc.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DXSDK_ENABLE_Fortran=OFF + -Denable_tests=OFF + -Denable_blaslib=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/superlu/remove-make.inc.patch b/externals/vcpkg/ports/superlu/remove-make.inc.patch new file mode 100755 index 000000000..8f7716aad --- /dev/null +++ b/externals/vcpkg/ports/superlu/remove-make.inc.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b414f5f..22f29ce 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -155,7 +155,6 @@ endif() + # file(WRITE "make.defs" "# can be exposed to users" + # ${CMAKE_C_COMPILER} ) + # configure_file(${CMAKE_SOURCE_DIR}/make.inc.in ${CMAKE_SOURCE_DIR}/make.inc) +-configure_file(${SuperLU_SOURCE_DIR}/make.inc.in ${SuperLU_SOURCE_DIR}/make.inc) + + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/superlu.pc.in ${CMAKE_CURRENT_BINARY_DIR}/superlu.pc @ONLY) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/superlu.pc diff --git a/externals/vcpkg/ports/superlu/vcpkg.json b/externals/vcpkg/ports/superlu/vcpkg.json new file mode 100755 index 000000000..fc100ad2e --- /dev/null +++ b/externals/vcpkg/ports/superlu/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "superlu", + "version-date": "2020-01-07", + "port-version": 5, + "description": "Supernodal sparse direct solver.", + "homepage": "https://github.com/xiaoyeli/superlu", + "supports": "!(uwp | arm)", + "dependencies": [ + "blas" + ] +} diff --git a/externals/vcpkg/ports/symengine/portfile.cmake b/externals/vcpkg/ports/symengine/portfile.cmake new file mode 100755 index 000000000..dc0329930 --- /dev/null +++ b/externals/vcpkg/ports/symengine/portfile.cmake @@ -0,0 +1,68 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO symengine/symengine + REF 7b1880824c2cce98787ae29a317682ba6c294484 #v0.9.0 + SHA512 745b2616b88032ff047a28e46b703bc1912d109524f8aa411a5b7a650a6d89d3f16dc92812381e95b13bc5cf61218d2ff3db9d3809443264340eae180968cbcf + HEAD_REF master +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + arb WITH_ARB + flint WITH_FLINT + mpfr WITH_MPFR + tcmalloc WITH_TCMALLOC +) + +if(integer-class-boostmp IN_LIST FEATURES) + set(INTEGER_CLASS boostmp) + + if(integer-class-flint IN_LIST FEATURES) + message(WARNING "Both boostmp and flint are given for integer class, will use boostmp only.") + endif() +elseif(integer-class-flint IN_LIST FEATURES) + set(INTEGER_CLASS flint) +endif() + +if(VCPKG_TARGET_IS_UWP) + set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE") + set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE") +endif() + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" MSVC_USE_MT) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DINTEGER_CLASS=${INTEGER_CLASS} + -DBUILD_BENCHMARKS=no + -DBUILD_TESTS=no + -DMSVC_WARNING_LEVEL=3 + -DMSVC_USE_MT=${MSVC_USE_MT} + -DWITH_SYMENGINE_RCP=yes + -DWITH_SYMENGINE_TEUCHOS=no + -DINTEGER_CLASS=${INTEGER_CLASS} + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/CMake") + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}") + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +endif() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/symengine/symengine_config_cling.h") + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/symengine/SymEngineConfig.cmake" "${CURRENT_BUILDTREES_DIR}" "") # not used, inside if (False) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/symengine/SymEngineConfig.cmake" + [[${SYMENGINE_CMAKE_DIR}/../../../include]] + [[${SYMENGINE_CMAKE_DIR}/../../include]] +) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/symengine/vcpkg.json b/externals/vcpkg/ports/symengine/vcpkg.json new file mode 100755 index 000000000..825797818 --- /dev/null +++ b/externals/vcpkg/ports/symengine/vcpkg.json @@ -0,0 +1,61 @@ +{ + "name": "symengine", + "version": "0.9.0", + "description": "SymEngine is a fast symbolic manipulation library", + "homepage": "https://github.com/symengine/symengine", + "license": "BSD-3-Clause", + "dependencies": [ + "boost-math", + "boost-random", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "integer-class-boostmp" + ], + "features": { + "arb": { + "description": "Build with arb", + "dependencies": [ + "arb" + ] + }, + "flint": { + "description": "Build with flint", + "dependencies": [ + "flint" + ] + }, + "integer-class-boostmp": { + "description": "Use Boost.multiprecision integer class", + "dependencies": [ + "boost-multiprecision" + ] + }, + "integer-class-flint": { + "description": "Use flint integer class", + "dependencies": [ + "flint", + "gmp" + ] + }, + "mpfr": { + "description": "Build with mpfr", + "dependencies": [ + "mpfr" + ] + }, + "tcmalloc": { + "description": "Build with tcmalloc", + "dependencies": [ + "gperftools" + ] + } + } +} diff --git a/externals/vcpkg/ports/systemc/install.patch b/externals/vcpkg/ports/systemc/install.patch new file mode 100755 index 000000000..ef133a14f --- /dev/null +++ b/externals/vcpkg/ports/systemc/install.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b7815ae..86d79d1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -555,7 +555,7 @@ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + endif (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + + # Set the installation paths for headers, libraries, and documentation. +-set (CMAKE_INSTALL_DOCDIR "share/doc/systemc" CACHE PATH ++set (CMAKE_INSTALL_DOCDIR "share/systemc/doc" CACHE PATH + "Documentation installation directory") # otherwise mixed-case + if (INSTALL_TO_LIB_BUILD_TYPE_DIR) + # Install libraries to lib-${CMAKE_BUILD_TYPE} so that different build variants +@@ -584,14 +584,14 @@ if (INSTALL_LIB_TARGET_ARCH_SYMLINK AND CMAKE_HOST_UNIX) + endif (INSTALL_LIB_TARGET_ARCH_SYMLINK AND CMAKE_HOST_UNIX) + + if (INSTALL_TO_LIB_BUILD_TYPE_DIR OR INSTALL_TO_LIB_TARGET_ARCH_DIR) +- set (SystemCLanguage_INSTALL_CMAKEDIR share/cmake/SystemCLanguage CACHE PATH ++ set (SystemCLanguage_INSTALL_CMAKEDIR lib/cmake/SystemCLanguage CACHE PATH + "CMake package configuration installation directory" FORCE) + set (SystemCTLM_INSTALL_CMAKEDIR share/cmake/SystemCTLM CACHE PATH + "CMake package configuration installation directory" FORCE) + else (INSTALL_TO_LIB_BUILD_TYPE_DIR OR INSTALL_TO_LIB_TARGET_ARCH_DIR) +- set (SystemCLanguage_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/SystemCLanguage CACHE PATH ++ set (SystemCLanguage_INSTALL_CMAKEDIR lib/cmake/SystemCLanguage CACHE PATH + "CMake package configuration installation directory for the SystemCLanguage package.") +- set (SystemCTLM_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/SystemCTLM CACHE PATH ++ set (SystemCTLM_INSTALL_CMAKEDIR share/cmake/SystemCTLM CACHE PATH + "CMake package configuration installation directory for the SystemCTLM package.") + endif (INSTALL_TO_LIB_BUILD_TYPE_DIR OR INSTALL_TO_LIB_TARGET_ARCH_DIR) + mark_as_advanced(SystemCLanguage_INSTALL_CMAKEDIR SystemCTLM_INSTALL_CMAKEDIR) diff --git a/externals/vcpkg/ports/systemc/portfile.cmake b/externals/vcpkg/ports/systemc/portfile.cmake new file mode 100755 index 000000000..e6439eb5c --- /dev/null +++ b/externals/vcpkg/ports/systemc/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +set(SYSTEMC_VERSION 2.3.3) +vcpkg_download_distfile(ARCHIVE + URLS "https://www.accellera.org/images/downloads/standards/systemc/systemc-${SYSTEMC_VERSION}.zip" + FILENAME "systemc-${SYSTEMC_VERSION}.zip" + SHA512 f4df172addf816a1928d411dcab42c1679dc4c9d772f406c10d798a2c174d89cdac7a83947fa8beea1e3aff93da522d2d2daf61a4841ec456af7b7446c5c4a14 +) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${SYSTEMC_VERSION} + PATCHES + install.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCMAKE_CXX_STANDARD=17 + -DDISABLE_COPYRIGHT_MESSAGE=ON +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/SystemCLanguage TARGET_PATH share/systemclanguage) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/SystemCTLM TARGET_PATH share/systemctlm) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/sysc/packages/qt/time) + +file(INSTALL ${SOURCE_PATH}/NOTICE DESTINATION ${CURRENT_PACKAGES_DIR}/share/systemc RENAME copyright) diff --git a/externals/vcpkg/ports/systemc/vcpkg.json b/externals/vcpkg/ports/systemc/vcpkg.json new file mode 100755 index 000000000..9f9d743fe --- /dev/null +++ b/externals/vcpkg/ports/systemc/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "systemc", + "version-string": "2.3.3", + "port-version": 6, + "description": "A set of C++ classes and macros which provide an event-driven simulation kernel in C++" +} diff --git a/externals/vcpkg/ports/szip/fix-linkage-config.patch b/externals/vcpkg/ports/szip/fix-linkage-config.patch new file mode 100755 index 000000000..6d862e418 --- /dev/null +++ b/externals/vcpkg/ports/szip/fix-linkage-config.patch @@ -0,0 +1,47 @@ +diff -urN a/config/cmake/szip-config.cmake.in b/config/cmake/szip-config.cmake.in +--- a/config/cmake/szip-config.cmake.in 2017-01-09 16:14:35.000000000 +0100 ++++ b/config/cmake/szip-config.cmake.in 2021-05-14 21:26:09.490134839 +0200 +@@ -39,8 +39,13 @@ + + # Handle default component(static) : + if (NOT ${SZIP_PACKAGE_NAME}_FIND_COMPONENTS) ++ if(@BUILD_SHARED_LIBS@) ++ set (${SZIP_PACKAGE_NAME}_FIND_COMPONENTS shared) ++ set (${SZIP_PACKAGE_NAME}_FIND_REQUIRED_shared true) ++ else() + set (${SZIP_PACKAGE_NAME}_FIND_COMPONENTS static) + set (${SZIP_PACKAGE_NAME}_FIND_REQUIRED_static true) ++ endif() + endif () + + # Handle requested components: +diff -urN a/src/CMakeLists.txt b/src/CMakeLists.txt +--- a/src/CMakeLists.txt 2017-02-03 20:42:43.000000000 +0100 ++++ b/src/CMakeLists.txt 2021-05-14 22:20:28.237632925 +0200 +@@ -22,6 +22,7 @@ + ${SZIP_SRC_SOURCE_DIR}/szlib.h + ) + ++if(NOT BUILD_SHARED_LIBS) + add_library (${SZIP_LIB_TARGET} STATIC ${SZIP_SRCS} ${SZIP_PUBLIC_HEADERS}) + #set_target_properties (${SZIP_LIB_TARGET} + # PROPERTIES +@@ -36,6 +37,7 @@ + set_global_variable (SZIP_LIBRARIES_TO_EXPORT ${SZIP_LIB_TARGET}) + SZIP_SET_LIB_OPTIONS (${SZIP_LIB_TARGET} ${SZIP_LIB_NAME} STATIC) + set (install_targets ${SZIP_LIB_TARGET}) ++endif(NOT BUILD_SHARED_LIBS) + + if (BUILD_SHARED_LIBS) + add_library (${SZIP_LIBSH_TARGET} SHARED ${SZIP_SRCS} ${SZIP_PUBLIC_HEADERS}) +@@ -62,8 +64,9 @@ + if (SZIP_EXPORTED_TARGETS) + if (BUILD_SHARED_LIBS) + INSTALL_TARGET_PDB (${SZIP_LIBSH_TARGET} ${SZIP_INSTALL_BIN_DIR} libraries) +- endif (BUILD_SHARED_LIBS) ++ else() + INSTALL_TARGET_PDB (${SZIP_LIB_TARGET} ${SZIP_INSTALL_BIN_DIR} libraries) ++ endif() + + install ( + TARGETS diff --git a/externals/vcpkg/ports/szip/mingw-lib-names.patch b/externals/vcpkg/ports/szip/mingw-lib-names.patch new file mode 100755 index 000000000..c9d2c249f --- /dev/null +++ b/externals/vcpkg/ports/szip/mingw-lib-names.patch @@ -0,0 +1,30 @@ +diff -urN a/config/cmake/SZIPMacros.cmake b/config/cmake/SZIPMacros.cmake +--- a/config/cmake/SZIPMacros.cmake 2021-05-15 09:06:50.546455249 +0200 ++++ b/config/cmake/SZIPMacros.cmake 2021-05-15 09:01:24.933765423 +0200 +@@ -126,7 +126,7 @@ + macro (SZIP_SET_BASE_OPTIONS libtarget libname libtype) + # message (STATUS "${libname} libtype: ${libtype}") + if (${libtype} MATCHES "SHARED") +- if (WIN32) ++ if (WIN32 AND NOT MINGW) + set (LIB_RELEASE_NAME "${libname}") + set (LIB_DEBUG_NAME "${libname}_D") + else () +@@ -134,7 +134,7 @@ + set (LIB_DEBUG_NAME "${libname}_debug") + endif () + else () +- if (WIN32) ++ if (WIN32 AND NOT MINGW) + set (LIB_RELEASE_NAME "lib${libname}") + set (LIB_DEBUG_NAME "lib${libname}_D") + else () +@@ -164,7 +164,7 @@ + endif () + + #----- Use MSVC Naming conventions for Shared Libraries +- if (MINGW AND ${libtype} MATCHES "SHARED") ++ if (FALSE AND MINGW AND ${libtype} MATCHES "SHARED") + set_target_properties (${libtarget} + PROPERTIES + IMPORT_SUFFIX ".lib" diff --git a/externals/vcpkg/ports/szip/portfile.cmake b/externals/vcpkg/ports/szip/portfile.cmake new file mode 100755 index 000000000..1f5a9fb2f --- /dev/null +++ b/externals/vcpkg/ports/szip/portfile.cmake @@ -0,0 +1,68 @@ +set(SZIP_VERSION "2.1.1") +vcpkg_download_distfile(ARCHIVE + URLS "https://support.hdfgroup.org/ftp/lib-external/szip/${SZIP_VERSION}/src/szip-${SZIP_VERSION}.tar.gz" + FILENAME "szip-${SZIP_VERSION}.tar.gz" + SHA512 ada6406efb096cd8a2daf8f9217fe9111a96dcae87e29d1c31f58ddd2ad2aa7bac03f23c7205dc9360f3b62d259461759330c7189ef0c2fe559704b1ea9d40dd +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF "szip-${SZIP_VERSION}" + PATCHES + fix-linkage-config.patch + mingw-lib-names.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSZIP_INSTALL_DATA_DIR=share/szip/data + -DSZIP_INSTALL_CMAKE_DIR=share/szip +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/szip_adpt.h" + "\n#ifdef SZ_BUILT_AS_DYNAMIC_LIB" + "\n#if 1 // SZ_BUILT_AS_DYNAMIC_LIB") +endif() + +if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) + set(SZIP_LIB_RELEASE "-lszip") + set(SZIP_LIB_DEBUG "-lszip_debug") + set(SZIP_LIBS_PRIVATE "-lm") +elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(SZIP_LIB_RELEASE "-llibszip") + set(SZIP_LIB_DEBUG "-llibszip_D") + set(SZIP_LIBS_PRIVATE "") +else() + set(SZIP_LIB_RELEASE "-lszip") + set(SZIP_LIB_DEBUG "-lszip_D") + set(SZIP_LIBS_PRIVATE "") +endif() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(SZIP_LINKAGE_FLAGS "-DSZ_BUILT_AS_DYNAMIC_LIB=1") +else() + set(SZIP_LINKAGE_FLAGS "") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib") + set(SZIP_LIB "${SZIP_LIB_RELEASE}") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") + configure_file("${CMAKE_CURRENT_LIST_DIR}/szip.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/szip.pc" @ONLY) +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib") + set(SZIP_LIB "${SZIP_LIB_DEBUG}") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + configure_file("${CMAKE_CURRENT_LIST_DIR}/szip.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/szip.pc" @ONLY) +endif() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/szip/data") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/szip/szip.pc.in b/externals/vcpkg/ports/szip/szip.pc.in new file mode 100755 index 000000000..b89c9a1dd --- /dev/null +++ b/externals/vcpkg/ports/szip/szip.pc.in @@ -0,0 +1,16 @@ +prefix=${pcfiledir}/../.. + +exec_prefix=${prefix} +libdir=${prefix}/lib +sharedlibdir=${prefix}/lib +includedir=${prefix}/include + +Name: szip +Description: Szip compression software +Version: @SZIP_VERSION@ + +Requires: +Cflags: -I"${includedir}" @SZIP_LINKAGE_FLAGS@ +Libs: -L"${libdir}" @SZIP_LIB@ +Libs.private: @SZIP_LIBS_PRIVATE@ + diff --git a/externals/vcpkg/ports/szip/vcpkg.json b/externals/vcpkg/ports/szip/vcpkg.json new file mode 100755 index 000000000..a0e93f315 --- /dev/null +++ b/externals/vcpkg/ports/szip/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "szip", + "version": "2.1.1", + "port-version": 8, + "description": "Szip compression software, providing lossless compression of scientific data", + "homepage": "https://support.hdfgroup.org/ftp/lib-external/szip", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/tabulate/portfile.cmake b/externals/vcpkg/ports/tabulate/portfile.cmake new file mode 100755 index 000000000..284dc218a --- /dev/null +++ b/externals/vcpkg/ports/tabulate/portfile.cmake @@ -0,0 +1,26 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO p-ranav/tabulate + REF 8f7a31b58806384b755858fe5e69593f9f216ed0 + SHA512 33a51617d363f9e8eed2153f60c5a087ed84edaeb21a0bc779d0af6228d4d7deb211e03c1eb7c8d56ac538de6a1cc0b641d219b4ff95d277f3daa7762f64a8f6 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -Dtabulate_BUILD_TESTS=OFF + -DSAMPLES=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE.termcolor DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/externals/vcpkg/ports/tabulate/vcpkg.json b/externals/vcpkg/ports/tabulate/vcpkg.json new file mode 100755 index 000000000..cdbb579bb --- /dev/null +++ b/externals/vcpkg/ports/tabulate/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tabulate", + "version-string": "2019-01-06", + "port-version": 1, + "description": "Table maker for modern C++", + "homepage": "https://github.com/p-ranav/tabulate" +} diff --git a/externals/vcpkg/ports/tacopie/fix-cmakelists.patch b/externals/vcpkg/ports/tacopie/fix-cmakelists.patch new file mode 100755 index 000000000..48ba317bd --- /dev/null +++ b/externals/vcpkg/ports/tacopie/fix-cmakelists.patch @@ -0,0 +1,27 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,6 +26,7 @@ + cmake_minimum_required(VERSION 2.8.7) + set(CMAKE_MACOSX_RPATH 1) + include(${CMAKE_ROOT}/Modules/ExternalProject.cmake) ++include(${CMAKE_ROOT}/Modules/GenerateExportHeader.cmake) + + + ### +@@ -153,6 +154,8 @@ IF (SELECT_TIMEOUT) + set_target_properties(${PROJECT} PROPERTIES COMPILE_DEFINITIONS "__TACOPIE_TIMEOUT=${SELECT_TIMEOUT}") + ENDIF(SELECT_TIMEOUT) + ++generate_export_header(${PROJECT} EXPORT_FILE_NAME ${CMAKE_BINARY_DIR}/tacopie/utils/${PROJECT}_export.hpp) ++target_include_directories(${PROJECT} PUBLIC ${CMAKE_BINARY_DIR}) + + ### + # install +@@ -164,6 +167,7 @@ install(DIRECTORY DESTINATION ${CMAKE_BINARY_DIR}/bin/) + install (DIRECTORY ${CMAKE_BINARY_DIR}/lib/ DESTINATION lib USE_SOURCE_PERMISSIONS) + install (DIRECTORY ${CMAKE_BINARY_DIR}/bin/ DESTINATION bin USE_SOURCE_PERMISSIONS) + install (DIRECTORY ${TACOPIE_INCLUDES}/ DESTINATION include USE_SOURCE_PERMISSIONS) ++install (FILES ${CMAKE_BINARY_DIR}/tacopie/utils/${PROJECT}_export.hpp DESTINATION include/tacopie/utils) + + + ### diff --git a/externals/vcpkg/ports/tacopie/fix-export.patch b/externals/vcpkg/ports/tacopie/fix-export.patch new file mode 100755 index 000000000..d971b8338 --- /dev/null +++ b/externals/vcpkg/ports/tacopie/fix-export.patch @@ -0,0 +1,20 @@ +--- a/includes/tacopie/utils/logger.hpp ++++ b/includes/tacopie/utils/logger.hpp +@@ -26,6 +26,8 @@ + #include + #include + ++#include ++ + namespace tacopie { + + //! +@@ -161,7 +163,7 @@ private: + //! variable containing the current logger + //! by default, not set (no logs) + //! +-extern std::unique_ptr active_logger; ++extern TACOPIE_EXPORT std::unique_ptr active_logger; + + //! + //! debug logging diff --git a/externals/vcpkg/ports/tacopie/portfile.cmake b/externals/vcpkg/ports/tacopie/portfile.cmake new file mode 100755 index 000000000..4cf2d73dc --- /dev/null +++ b/externals/vcpkg/ports/tacopie/portfile.cmake @@ -0,0 +1,43 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cpp-redis/tacopie + REF 3.2.0 + SHA512 079b294b537aaffe3bcf43a485c3be5b15f633c3f7c70140032d60cb010d35b76e76ef4ddd7596f6bfaf3f7edca7cb086c67552efffbf65846e725d7be54ce72 + HEAD_REF master + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/fix-cmakelists.patch + ${CMAKE_CURRENT_LIST_DIR}/fix-export.patch +) + +if(VCPKG_CRT_LINKAGE STREQUAL dynamic) + set(MSVC_RUNTIME_LIBRARY_CONFIG "/MD") +else() + set(MSVC_RUNTIME_LIBRARY_CONFIG "/MT") +endif() + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) + # tacopie forcibly removes "/RTC1" in its cmake file. Because this is an ABI-sensitive flag, we need to re-add it in a form that won't be detected. + set(VCPKG_CXX_FLAGS_DEBUG "${VCPKG_CXX_FLAGS_DEBUG} -RTC1") + set(VCPKG_C_FLAGS_DEBUG "${VCPKG_C_FLAGS_DEBUG} -RTC1") +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DMSVC_RUNTIME_LIBRARY_CONFIG=${MSVC_RUNTIME_LIBRARY_CONFIG} +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/tacopie/vcpkg.json b/externals/vcpkg/ports/tacopie/vcpkg.json new file mode 100755 index 000000000..4c1167a8a --- /dev/null +++ b/externals/vcpkg/ports/tacopie/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tacopie", + "version-string": "3.2.0", + "port-version": 3, + "description": "Tacopie is a TCP Client & Server C++11 library", + "homepage": "https://github.com/cpp-redis/tacopie" +} diff --git a/externals/vcpkg/ports/taglib/msvc-disable-deprecated-warnings.patch b/externals/vcpkg/ports/taglib/msvc-disable-deprecated-warnings.patch new file mode 100755 index 000000000..4d99bb8bc --- /dev/null +++ b/externals/vcpkg/ports/taglib/msvc-disable-deprecated-warnings.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5fc91cc6..6f57e4ee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -58,10 +58,17 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") + endif() + +-if(MSVC AND ENABLE_STATIC_RUNTIME) +- foreach(flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) +- string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") +- endforeach(flag_var) ++if(MSVC) ++ if(ENABLE_STATIC_RUNTIME) ++ foreach(flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) ++ string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") ++ endforeach(flag_var) ++ endif() ++ # Disable warnings for internal invocations of API functions ++ # that have been marked with TAGLIB_DEPRECATED ++ # https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-3-c4996 ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996") + endif() + + # Read version information from file taglib/toolkit/taglib.h into variables diff --git a/externals/vcpkg/ports/taglib/portfile.cmake b/externals/vcpkg/ports/taglib/portfile.cmake new file mode 100755 index 000000000..c376de69a --- /dev/null +++ b/externals/vcpkg/ports/taglib/portfile.cmake @@ -0,0 +1,47 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO taglib/taglib + REF v1.12 + SHA512 63c96297d65486450908bda7cc1583ec338fa5a56a7c088fc37d6e125e1ee76e6d20343556a8f3d36f5b7e5187c58a5d15be964c996e3586ea1438910152b1a6 + HEAD_REF master + PATCHES msvc-disable-deprecated-warnings.patch +) + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(WINRT_OPTIONS -DHAVE_VSNPRINTF=1 -DPLATFORM_WINRT=1) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${WINRT_OPTIONS} +) +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() + +set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/taglib.pc") +if(EXISTS "${pcfile}") + vcpkg_replace_string("${pcfile}" "Requires: " "Requires: zlib") + vcpkg_replace_string("${pcfile}" " -lz" "") +endif() +set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/taglib.pc") +if(EXISTS "${pcfile}") + vcpkg_replace_string("${pcfile}" "Requires: " "Requires: zlib") + vcpkg_replace_string("${pcfile}" " -lz" "") +endif() + +# remove the debug/include files +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/taglib-config.cmd" "${CURRENT_PACKAGES_DIR}/debug/bin/taglib-config.cmd") # Contains absolute paths + +# remove bin directory for static builds (taglib creates a cmake batch file there) +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/taglib/taglib_export.h" "defined(TAGLIB_STATIC)" "1") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +vcpkg_copy_pdbs() + +# copyright file +file(COPY "${SOURCE_PATH}/COPYING.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib") +file(COPY "${SOURCE_PATH}/COPYING.MPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/taglib/COPYING.LGPL" "${CURRENT_PACKAGES_DIR}/share/taglib/copyright") diff --git a/externals/vcpkg/ports/taglib/vcpkg.json b/externals/vcpkg/ports/taglib/vcpkg.json new file mode 100755 index 000000000..2a3f1c97a --- /dev/null +++ b/externals/vcpkg/ports/taglib/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "taglib", + "version-semver": "1.12.0", + "port-version": 3, + "description": "TagLib Audio Meta-Data Library", + "homepage": "https://taglib.org/", + "license": "LGPL-2.1-only OR MPL-1.1", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/taocpp-json/portfile.cmake b/externals/vcpkg/ports/taocpp-json/portfile.cmake new file mode 100755 index 000000000..653a3d201 --- /dev/null +++ b/externals/vcpkg/ports/taocpp-json/portfile.cmake @@ -0,0 +1,33 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO taocpp/json + REF f357d7269b7503eed21d0c3b98b9075c28a98f56 # accessed on 2020-09-14 + SHA512 4a4be970779ed0c6044c7ad40918ad6b3908ca10dbfb3738cbebb62154d437ad13ca27947119a6b1a6c8d92b22a9282477c73ddc5721ca30b8b355b77d7ce729 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE + PREFER_NINJA + OPTIONS + -DTAOCPP_JSON_BUILD_TESTS=OFF + -DTAOCPP_JSON_BUILD_EXAMPLES=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/taocpp-json/cmake) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug + ${CURRENT_PACKAGES_DIR}/share/doc +) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(COPY ${SOURCE_PATH}/LICENSE.double-conversion DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY ${SOURCE_PATH}/LICENSE.itoa DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY ${SOURCE_PATH}/LICENSE.ryu DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/externals/vcpkg/ports/taocpp-json/vcpkg.json b/externals/vcpkg/ports/taocpp-json/vcpkg.json new file mode 100755 index 000000000..b1e5f2fb9 --- /dev/null +++ b/externals/vcpkg/ports/taocpp-json/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "taocpp-json", + "version-string": "2020-09-14", + "port-version": 1, + "description": "C++ header-only JSON library" +} diff --git a/externals/vcpkg/ports/tap-windows6/portfile.cmake b/externals/vcpkg/ports/tap-windows6/portfile.cmake new file mode 100755 index 000000000..dcd27824e --- /dev/null +++ b/externals/vcpkg/ports/tap-windows6/portfile.cmake @@ -0,0 +1,13 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO OpenVPN/tap-windows6 + REF 0e30f5c13b3c7b0bdd60da915350f653e4c14d92 + SHA512 88edecccd4818091f7d70b66f3dfa07146f010a064829dc971abdd0c180ce1f72db9d8f3a1c9f5b4fb3f31e7afe3eadbd7d6f7d711f698e723441d30beaf9e30 + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/src/tap-windows.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/) + +file(INSTALL + ${SOURCE_PATH}/COPYRIGHT.MIT + DESTINATION ${CURRENT_PACKAGES_DIR}/share/tap-windows6 RENAME copyright) diff --git a/externals/vcpkg/ports/tap-windows6/vcpkg.json b/externals/vcpkg/ports/tap-windows6/vcpkg.json new file mode 100755 index 000000000..777db703c --- /dev/null +++ b/externals/vcpkg/ports/tap-windows6/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "tap-windows6", + "version-string": "9.21.2-0e30f5c", + "port-version": 1, + "description": "an NDIS 6 implementation of the TAP-Windows driver, used by OpenVPN and other apps. Note: This package only contains the headers for the driver." +} diff --git a/externals/vcpkg/ports/taskflow/portfile.cmake b/externals/vcpkg/ports/taskflow/portfile.cmake new file mode 100755 index 000000000..87c60ac15 --- /dev/null +++ b/externals/vcpkg/ports/taskflow/portfile.cmake @@ -0,0 +1,28 @@ +# header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO taskflow/taskflow + REF bfad4b9a0cc5acad5fc99fb6ff6b904b79f27f93 #v3.3.0 + SHA512 489807c84438a727832e9d530c9b2948240bebee48f210ce4a8c69917cbb71306df378440621b1bf091e4aa62c86681d71afd38a3343c8ea872a4eefcabc496e + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DTF_BUILD_BENCHMARKS=OFF + -DTF_BUILD_CUDA=OFF + -DTF_BUILD_TESTS=OFF + -DTF_BUILD_EXAMPLES=OFF + -DBUILD_TESTING=OFF + -DCMAKE_CUDA_COMPILER=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Taskflow) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/taskflow/vcpkg.json b/externals/vcpkg/ports/taskflow/vcpkg.json new file mode 100755 index 000000000..9d2cbca95 --- /dev/null +++ b/externals/vcpkg/ports/taskflow/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "taskflow", + "version": "3.3.0", + "description": "Fast Parallel Tasking Programming Library using Modern C++", + "homepage": "https://github.com/taskflow/taskflow", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/tbb/CMakeLists.txt b/externals/vcpkg/ports/tbb/CMakeLists.txt new file mode 100755 index 000000000..ae53c40f2 --- /dev/null +++ b/externals/vcpkg/ports/tbb/CMakeLists.txt @@ -0,0 +1,40 @@ +project(tbb CXX) + +file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*) +file(COPY ${SOURCES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/src) + +include(${CMAKE_CURRENT_BINARY_DIR}/src/cmake/TBBBuild.cmake REQUIRED) +if(NOT BUILD_SHARED_LIBS) + set(TBB_STATIC_INCLUDE extra_inc=big_iron.inc) +endif() +if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(FORWARD_SDK_ROOT "SDKROOT=${CMAKE_OSX_SYSROOT}") + if(CMAKE_OSX_ARCHITECTURES STREQUAL "arm64") + set(arch "arch=arm64") + endif() +endif() + +if(CMAKE_SYSTEM_NAME STREQUAL "Linux") + if(NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL CMAKE_SYSTEM_PROCESSOR) + set(arch "arch=${CMAKE_SYSTEM_PROCESSOR}") + if(CMAKE_CXX_COMPILER) + set(CPLUS "CPLUS=${CMAKE_CXX_COMPILER}") + endif() + if(CMAKE_C_COMPILER) + set(CONLY "CONLY=${CMAKE_C_COMPILER}") + endif() + endif() +endif() + +tbb_build(TBB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/src MAKE_ARGS ${arch} ${CPLUS} ${CONLY} ${TBB_STATIC_INCLUDE} ${FORWARD_SDK_ROOT}) + +set(SUBDIR ${CMAKE_CURRENT_BINARY_DIR}/tbb_cmake_build/tbb_cmake_build_subdir) +if(CMAKE_BUILD_TYPE STREQUAL "Release") + set(SUBDIR "${SUBDIR}_release") +else() + set(SUBDIR "${SUBDIR}_debug") +endif() + +file(GLOB OUTPUTS ${SUBDIR}/*.so.* ${SUBDIR}/*.so ${SUBDIR}/*.a ${SUBDIR}/*.dylib ${SUBDIR}/*.dylib.*) + +install(FILES ${OUTPUTS} DESTINATION lib) diff --git a/externals/vcpkg/ports/tbb/fix-static-build.patch b/externals/vcpkg/ports/tbb/fix-static-build.patch new file mode 100755 index 000000000..18f3e2b49 --- /dev/null +++ b/externals/vcpkg/ports/tbb/fix-static-build.patch @@ -0,0 +1,13 @@ +diff --git a/src/tbb/cilk-tbb-interop.h b/src/tbb/cilk-tbb-interop.h +index 295734b..f35531e 100644 +--- a/src/tbb/cilk-tbb-interop.h ++++ b/src/tbb/cilk-tbb-interop.h +@@ -29,6 +29,8 @@ + #else + #ifdef IN_CILK_RUNTIME + #define CILK_EXPORT __declspec(dllexport) ++#elif defined(IN_CILK_STATIC) ++#define CILK_EXPORT /* nothing */ + #else + #define CILK_EXPORT __declspec(dllimport) + #endif // IN_CILK_RUNTIME diff --git a/externals/vcpkg/ports/tbb/portfile.cmake b/externals/vcpkg/ports/tbb/portfile.cmake new file mode 100755 index 000000000..e826081f8 --- /dev/null +++ b/externals/vcpkg/ports/tbb/portfile.cmake @@ -0,0 +1,138 @@ +set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO oneapi-src/oneTBB + REF eca91f16d7490a8abfdee652dadf457ec820cc37 # 2020_U3 + SHA512 7144e1dc68304b5358e6ea330431b6f0c61fadb147efa353a5b242777d6fabf7b8cf99b79cffb51b49b911dd17a9f1879619d6eebdf319f23ec3235c89cffc25 + HEAD_REF tbb_2019 + PATCHES + fix-static-build.patch + terminate-when-buildtool-notfound.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +if (NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + ) + + vcpkg_install_cmake() + + # Settings for TBBConfigInternal.cmake.in + if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(TBB_LIB_EXT a) + else() + if (VCPKG_TARGET_IS_LINUX) + set(TBB_LIB_EXT "so.2") + elseif(VCPKG_TARGET_IS_OSX) + set(TBB_LIB_EXT "dylib") + else() + set(TBB_LIB_EXT "so") + endif() + endif() + set(TBB_LIB_PREFIX lib) +else() + if (VCPKG_CRT_LINKAGE STREQUAL static) + set(RELEASE_CONFIGURATION Release-MT) + set(DEBUG_CONFIGURATION Debug-MT) + else() + set(RELEASE_CONFIGURATION Release) + set(DEBUG_CONFIGURATION Debug) + endif() + + macro(CONFIGURE_PROJ_FILE arg) + set(CONFIGURE_FILE_NAME ${arg}) + set(CONFIGURE_BAK_FILE_NAME ${arg}.bak) + if (NOT EXISTS ${CONFIGURE_BAK_FILE_NAME}) + configure_file(${CONFIGURE_FILE_NAME} ${CONFIGURE_BAK_FILE_NAME} COPYONLY) + endif() + configure_file(${CONFIGURE_BAK_FILE_NAME} ${CONFIGURE_FILE_NAME} COPYONLY) + file(READ ${CONFIGURE_FILE_NAME} SLN_CONFIGURE) + if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + string(REPLACE "DynamicLibrary<\/ConfigurationType>" + "StaticLibrary<\/ConfigurationType>" SLN_CONFIGURE "${SLN_CONFIGURE}") + string(REPLACE "\/D_CRT_SECURE_NO_DEPRECATE" + "\/D_CRT_SECURE_NO_DEPRECATE \/DIN_CILK_STATIC" SLN_CONFIGURE "${SLN_CONFIGURE}") + else() + string(REPLACE "\/D_CRT_SECURE_NO_DEPRECATE" + "\/D_CRT_SECURE_NO_DEPRECATE \/DIN_CILK_RUNTIME" SLN_CONFIGURE "${SLN_CONFIGURE}") + endif() + file(WRITE ${CONFIGURE_FILE_NAME} "${SLN_CONFIGURE}") + endmacro() + + CONFIGURE_PROJ_FILE(${SOURCE_PATH}/build/vs2013/tbb.vcxproj) + CONFIGURE_PROJ_FILE(${SOURCE_PATH}/build/vs2013/tbbmalloc.vcxproj) + CONFIGURE_PROJ_FILE(${SOURCE_PATH}/build/vs2013/tbbmalloc_proxy.vcxproj) + + vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH build/vs2013/makefile.sln + RELEASE_CONFIGURATION ${RELEASE_CONFIGURATION} + DEBUG_CONFIGURATION ${DEBUG_CONFIGURATION} + ) + # Settings for TBBConfigInternal.cmake.in + set(TBB_LIB_EXT lib) + set(TBB_LIB_PREFIX) +endif() + +file(COPY + ${SOURCE_PATH}/include/tbb + ${SOURCE_PATH}/include/serial + DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Settings for TBBConfigInternal.cmake.in +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(TBB_DEFAULT_COMPONENTS tbb tbbmalloc) +else() + set(TBB_DEFAULT_COMPONENTS tbb tbbmalloc tbbmalloc_proxy) +endif() + +file(READ "${SOURCE_PATH}/include/tbb/tbb_stddef.h" _tbb_stddef) +string(REGEX REPLACE ".*#define TBB_VERSION_MAJOR ([0-9]+).*" "\\1" _tbb_ver_major "${_tbb_stddef}") +string(REGEX REPLACE ".*#define TBB_VERSION_MINOR ([0-9]+).*" "\\1" _tbb_ver_minor "${_tbb_stddef}") +string(REGEX REPLACE ".*#define TBB_INTERFACE_VERSION ([0-9]+).*" "\\1" TBB_INTERFACE_VERSION "${_tbb_stddef}") +set(TBB_VERSION "${_tbb_ver_major}.${_tbb_ver_minor}") +set(TBB_RELEASE_DIR "\${_tbb_root}/lib") +set(TBB_DEBUG_DIR "\${_tbb_root}/debug/lib") + +configure_file( + ${SOURCE_PATH}/cmake/templates/TBBConfigInternal.cmake.in + ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake + @ONLY +) + +configure_file( + ${SOURCE_PATH}/cmake/templates/TBBConfigVersion.cmake.in + ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfigVersion.cmake + @ONLY +) + +file(READ ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake _contents) +string(REPLACE + "get_filename_component(_tbb_root \"\${_tbb_root}\" PATH)" + "get_filename_component(_tbb_root \"\${_tbb_root}\" PATH)\nget_filename_component(_tbb_root \"\${_tbb_root}\" PATH)" + _contents + "${_contents}" +) +string(REPLACE + "set(_tbb_release_lib \"/${TBB_LIB_PREFIX}" + "set(_tbb_release_lib \"\${_tbb_root}/lib/${TBB_LIB_PREFIX}" + _contents + "${_contents}" +) +string(REPLACE + "set(_tbb_debug_lib \"/${TBB_LIB_PREFIX}" + "set(_tbb_debug_lib \"\${_tbb_root}/debug/lib/${TBB_LIB_PREFIX}" + _contents + "${_contents}" +) + +string(REPLACE "SHARED IMPORTED)" "UNKNOWN IMPORTED)" _contents "${_contents}") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake "${_contents}") + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/tbb) +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/tbb/terminate-when-buildtool-notfound.patch b/externals/vcpkg/ports/tbb/terminate-when-buildtool-notfound.patch new file mode 100755 index 000000000..9599b48cd --- /dev/null +++ b/externals/vcpkg/ports/tbb/terminate-when-buildtool-notfound.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/TBBBuild.cmake b/cmake/TBBBuild.cmake +index a2222e3..756d85c 100644 +--- a/cmake/TBBBuild.cmake ++++ b/cmake/TBBBuild.cmake +@@ -158,7 +158,7 @@ function(tbb_build) + mark_as_advanced(TBB_MAKE_TOOL) + + if (NOT TBB_MAKE_TOOL) +- message(STATUS "Intel TBB can not be built: required make-tool (${make_tool_name}) was not found") ++ message(FATAL_ERROR "Intel TBB can not be built: required make-tool (${make_tool_name}) was not found") + set(${tbb_build_CONFIG_DIR} ${tbb_build_CONFIG_DIR}-NOTFOUND PARENT_SCOPE) + return() + endif() diff --git a/externals/vcpkg/ports/tbb/usage b/externals/vcpkg/ports/tbb/usage new file mode 100755 index 000000000..ecea9834c --- /dev/null +++ b/externals/vcpkg/ports/tbb/usage @@ -0,0 +1,4 @@ +The package tbb provides CMake targets: + + find_package(TBB CONFIG REQUIRED) + target_link_libraries(main PRIVATE TBB::tbb) diff --git a/externals/vcpkg/ports/tbb/vcpkg.json b/externals/vcpkg/ports/tbb/vcpkg.json new file mode 100755 index 000000000..09ab4cd1e --- /dev/null +++ b/externals/vcpkg/ports/tbb/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "tbb", + "version-string": "2020_U3", + "port-version": 8, + "description": "Intel's Threading Building Blocks.", + "homepage": "https://github.com/01org/tbb", + "supports": "!(uwp | arm | arm64) | linux | osx" +} diff --git a/externals/vcpkg/ports/tcb-span/portfile.cmake b/externals/vcpkg/ports/tcb-span/portfile.cmake new file mode 100755 index 000000000..48edffef3 --- /dev/null +++ b/externals/vcpkg/ports/tcb-span/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tcbrindle/span + REF 427f6bd0bbf36ad46aec4d8bdd7760beeb10dd33 # master commit 2021-12-15 + SHA512 c775bd50bc68d98fcde5e99bb9b6594c8ac9ef15fa15efe89c253b4135df77d83e58743d3c7e90d3aff03429251497a7d56d1900f6e258416c0664a82326243c + HEAD_REF master +) + +# Just a single header +file( + INSTALL "${SOURCE_PATH}/include/tcb/span.hpp" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/tcb" +) + +# Handle copyright +file( + INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/externals/vcpkg/ports/tcb-span/vcpkg.json b/externals/vcpkg/ports/tcb-span/vcpkg.json new file mode 100755 index 000000000..777f195d0 --- /dev/null +++ b/externals/vcpkg/ports/tcb-span/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tcb-span", + "version-date": "2021-12-15", + "description": "Implementation of C++20's std::span for older compilers", + "homepage": "https://github.com/tcbrindle/span", + "license": "BSL-1.0" +} diff --git a/externals/vcpkg/ports/tcl/force-shell-install.patch b/externals/vcpkg/ports/tcl/force-shell-install.patch new file mode 100755 index 000000000..0725945f7 --- /dev/null +++ b/externals/vcpkg/ports/tcl/force-shell-install.patch @@ -0,0 +1,27 @@ +From 85842ba83b70d99f90ee3fff8c956e82d17759f2 Mon Sep 17 00:00:00 2001 +From: Marek Roszko +Date: Tue, 18 Aug 2020 23:11:27 -0400 +Subject: [PATCH] Remove broken exist check for shell install + +--- + win/makefile.vc | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/win/makefile.vc b/win/makefile.vc +index f5d2f4a..6bffe32 100644 +--- a/win/makefile.vc ++++ b/win/makefile.vc +@@ -869,10 +869,8 @@ install-binaries: + @$(CPY) "$(TCLLIB)" "$(BIN_INSTALL_DIR)\" + !endif + @$(CPY) "$(TCLIMPLIB)" "$(LIB_INSTALL_DIR)\" +-!if exist($(TCLSH)) + @echo Installing $(TCLSHNAME) + @$(CPY) "$(TCLSH)" "$(BIN_INSTALL_DIR)\" +-!endif + @echo Installing $(TCLSTUBLIBNAME) + @$(CPY) "$(TCLSTUBLIB)" "$(LIB_INSTALL_DIR)\" + +-- +2.28.0.windows.1 + diff --git a/externals/vcpkg/ports/tcl/portfile.cmake b/externals/vcpkg/ports/tcl/portfile.cmake new file mode 100755 index 000000000..c385ee84d --- /dev/null +++ b/externals/vcpkg/ports/tcl/portfile.cmake @@ -0,0 +1,149 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tcltk/tcl + REF 0fa6a4e5aad821a5c34fdfa070c37c3f1ffc8c8e + SHA512 9d7f35309fe8b1a7c116639aaea50cc01699787c7afb432389bee2b9ad56a67034c45d90c9585ef1ccf15bdabf0951cbef86257c0c6aedbd2591bbfae3e93b76 + PATCHES force-shell-install.patch +) + +if (VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE MATCHES "x64") + set(TCL_BUILD_MACHINE_STR MACHINE=AMD64) + else() + set(TCL_BUILD_MACHINE_STR MACHINE=IX86) + endif() + + # Handle features + set(TCL_BUILD_OPTS OPTS=pdbs) + set(TCL_BUILD_STATS STATS=none) + set(TCL_BUILD_CHECKS CHECKS=none) + if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(TCL_BUILD_OPTS ${TCL_BUILD_OPTS},static,staticpkg) + endif() + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + set(TCL_BUILD_OPTS ${TCL_BUILD_OPTS},msvcrt) + endif() + + if ("thrdalloc" IN_LIST FEATURES) + set(TCL_BUILD_OPTS ${TCL_BUILD_OPTS},thrdalloc) + endif() + if ("profile" IN_LIST FEATURES) + set(TCL_BUILD_OPTS ${TCL_BUILD_OPTS},profile) + endif() + if ("unchecked" IN_LIST FEATURES) + set(TCL_BUILD_OPTS ${TCL_BUILD_OPTS},unchecked) + endif() + if ("utfmax" IN_LIST FEATURES) + set(TCL_BUILD_OPTS ${TCL_BUILD_OPTS},time64bit) + endif() + + vcpkg_install_nmake( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH win + OPTIONS + ${TCL_BUILD_MACHINE_STR} + ${TCL_BUILD_STATS} + ${TCL_BUILD_CHECKS} + OPTIONS_DEBUG + ${TCL_BUILD_OPTS},symbols + INSTALLDIR=${CURRENT_PACKAGES_DIR}/debug + SCRIPT_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/tools/tcl/debug/lib/tcl9.0 + OPTIONS_RELEASE + release + ${TCL_BUILD_OPTS} + INSTALLDIR=${CURRENT_PACKAGES_DIR} + SCRIPT_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/tools/tcl/lib/tcl9.0 + ) + + + # Install + # Note: tcl shell requires it to be in a folder adjacent to the /lib/ folder, i.e. in a /bin/ folder + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) + file(GLOB_RECURSE TOOL_BIN + "${CURRENT_PACKAGES_DIR}/bin/*.exe" + "${CURRENT_PACKAGES_DIR}/bin/*.dll" + ) + file(COPY ${TOOL_BIN} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/tcl/bin/") + + # Remove .exes only after copying + file(GLOB_RECURSE TOOL_EXES + ${CURRENT_PACKAGES_DIR}/bin/*.exe + ) + file(REMOVE ${TOOL_EXES}) + + file(GLOB_RECURSE TOOLS + "${CURRENT_PACKAGES_DIR}/lib/dde1.4/*" + "${CURRENT_PACKAGES_DIR}/lib/nmake/*" + "${CURRENT_PACKAGES_DIR}/lib/reg1.3/*" + "${CURRENT_PACKAGES_DIR}/lib/tcl8/*" + "${CURRENT_PACKAGES_DIR}/lib/tcl8.6/*" + "${CURRENT_PACKAGES_DIR}/lib/tdbcsqlite31.1.0/*" + ) + + foreach(TOOL ${TOOLS}) + get_filename_component(DST_DIR ${TOOL} PATH) + file(COPY "${TOOL}" DESTINATION ${DST_DIR}) + endforeach() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/dde1.4" + "${CURRENT_PACKAGES_DIR}/lib/nmake" + "${CURRENT_PACKAGES_DIR}/lib/reg1.3" + "${CURRENT_PACKAGES_DIR}/lib/tcl8" + "${CURRENT_PACKAGES_DIR}/lib/tcl8.6" + "${CURRENT_PACKAGES_DIR}/lib/tdbcsqlite31.1.0" + ) + endif() + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) + file(GLOB_RECURSE TOOL_BIN + "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe" + "${CURRENT_PACKAGES_DIR}/debug/bin/*.dll" + ) + file(COPY ${TOOL_BIN} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/tcl/debug/bin/") + + # Remove .exes only after copying + file(GLOB_RECURSE EXES + "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe" + ) + file(REMOVE ${EXES}) + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/dde1.4" + "${CURRENT_PACKAGES_DIR}/debug/lib/nmake" + "${CURRENT_PACKAGES_DIR}/debug/lib/reg1.3" + "${CURRENT_PACKAGES_DIR}/debug/lib/tcl8" + "${CURRENT_PACKAGES_DIR}/debug/lib/tcl8.6" + "${CURRENT_PACKAGES_DIR}/debug/lib/tdbcsqlite31.1.0" + ) + endif() + + if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + + file(CHMOD_RECURSE + "${CURRENT_PACKAGES_DIR}/tools/tcl/debug/lib/tcl9.0/msgs" "${CURRENT_PACKAGES_DIR}/tools/tcl/debug/lib/tcl9.0/tzdata" + "${CURRENT_PACKAGES_DIR}/tools/tcl/lib/tcl9.0/msgs" "${CURRENT_PACKAGES_DIR}/tools/tcl/lib/tcl9.0/tzdata" + PERMISSIONS + OWNER_READ OWNER_WRITE + GROUP_READ GROUP_WRITE + WORLD_READ WORLD_WRITE + ) +else() + file(REMOVE "${SOURCE_PATH}/unix/configure") + vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH unix + ) + + vcpkg_install_make() + vcpkg_fixup_pkgconfig() + + if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +endif() + +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/tclConfig.sh" "${CURRENT_PACKAGES_DIR}/debug/lib/tclConfig.sh") + +file(INSTALL "${SOURCE_PATH}/license.terms" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/tcl/vcpkg.json b/externals/vcpkg/ports/tcl/vcpkg.json new file mode 100755 index 000000000..513c6a97c --- /dev/null +++ b/externals/vcpkg/ports/tcl/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "tcl", + "version-string": "core-9-0-a1", + "port-version": 5, + "description": "Tcl provides a powerful platform for creating integration applications that tie together diverse applications, protocols, devices, and frameworks. When paired with the Tk toolkit, Tcl provides the fastest and most powerful way to create GUI applications that run on PCs, Unix, and Mac OS X. Tcl can also be used for a variety of web-related tasks and for creating powerful command languages for applications.", + "homepage": "https://github.com/tcltk/tcl", + "features": { + "profile": { + "description": "Adds profiling hooks. Map file is assumed." + }, + "thrdalloc": { + "description": "Use the thread allocator (shared global free pool)." + }, + "unchecked": { + "description": "Allows a symbols build to not use the debug enabled runtime (msvcrt.dll not msvcrtd.dll or libcmt.lib not libcmtd.lib)." + }, + "utfmax": { + "description": "Forces Tcl_UniChar to be a 32-bit quantity in stead of 16-bits" + } + } +} diff --git a/externals/vcpkg/ports/tclap/portfile.cmake b/externals/vcpkg/ports/tclap/portfile.cmake new file mode 100755 index 000000000..9688be8f7 --- /dev/null +++ b/externals/vcpkg/ports/tclap/portfile.cmake @@ -0,0 +1,10 @@ +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO tclap + FILENAME "tclap-1.2.5.tar.gz" + SHA512 3b5b3d76e8ff21133001f5f9589fa6ec143729909bf0b9cc9934377bce178360c161fb5c1f4c4d9e9c74b09cff3d65f1d5100e61d4a732283524a78b6f236b10 +) + +file(COPY "${SOURCE_PATH}/include/tclap" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.h") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/tclap/vcpkg.json b/externals/vcpkg/ports/tclap/vcpkg.json new file mode 100755 index 000000000..25488bc26 --- /dev/null +++ b/externals/vcpkg/ports/tclap/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tclap", + "version": "1.2.5", + "description": "Templatized command-line argument parser for C++", + "homepage": "https://sourceforge.net/projects/tclap/", + "license": "MIT" +} diff --git a/externals/vcpkg/ports/teemo/portfile.cmake b/externals/vcpkg/ports/teemo/portfile.cmake new file mode 100755 index 000000000..a6db35396 --- /dev/null +++ b/externals/vcpkg/ports/teemo/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO winsoft666/teemo + REF 03f40f92bfbf3b83dc597a60ba36582505adfa54 + SHA512 86962883dfe09f90c4892deb0235e4f71fc295fb837e2b33a9bcf240b4f91d0e191157968d28a6ec02dfe3f8cb9a3869c6bb5986b8a0ea96250fce6c27fe1172 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" TEEMO_STATIC) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_CRT) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DTEEMO_STATIC:BOOL=${TEEMO_STATIC} + -DUSE_STATIC_CRT:BOOL=${USE_STATIC_CRT} + -DBUILD_TESTS:BOOL=OFF +) + +vcpkg_cmake_install() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/teemo") + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/teemo) +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/share/teemo") + vcpkg_cmake_config_fixup(CONFIG_PATH share/teemo) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/teemo/teemo.h" "#ifdef TEEMO_STATIC" "#if 1") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/teemo/teemo.h" "#ifdef TEEMO_STATIC" "#if 0") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/teemo/vcpkg.json b/externals/vcpkg/ports/teemo/vcpkg.json new file mode 100755 index 000000000..c4428ccf1 --- /dev/null +++ b/externals/vcpkg/ports/teemo/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "teemo", + "version": "2.7", + "maintainers": "winsoft666 ", + "description": "C++ File Download Library, support Multithreading, Breakpoint Transmission, Speed Limit, Real-time Speed.", + "homepage": "https://github.com/winsoft666/teemo", + "supports": "!osx & !uwp & !arm", + "dependencies": [ + { + "name": "curl", + "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/telnetpp/fix-install-paths.patch b/externals/vcpkg/ports/telnetpp/fix-install-paths.patch new file mode 100755 index 000000000..5e2bdd550 --- /dev/null +++ b/externals/vcpkg/ports/telnetpp/fix-install-paths.patch @@ -0,0 +1,48 @@ + CMakeLists.txt | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 09722a9..7bf9952 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -277,18 +277,18 @@ install( + EXPORT + telnetpp-config + ARCHIVE DESTINATION +- lib/telnetpp-${TELNETPP_VERSION} ++ lib + RUNTIME DESTINATION +- lib/telnetpp-${TELNETPP_VERSION} ++ bin + LIBRARY DESTINATION +- lib/telnetpp-${TELNETPP_VERSION} ++ lib + ) + + install( + DIRECTORY + include/ + DESTINATION +- include/telnetpp-${TELNETPP_VERSION} ++ include + ) + + export( +@@ -302,7 +302,7 @@ install( + EXPORT + telnetpp-config + DESTINATION +- lib/telnetpp-${TELNETPP_VERSION} ++ share/telnetpp + ) + + include(CMakePackageConfigHelpers) +@@ -317,7 +317,7 @@ install( + FILES + "${CMAKE_CURRENT_BINARY_DIR}/telnetpp-config-version.cmake" + DESTINATION +- lib/telnetpp-${TELNETPP_VERSION} ++ share/telnetpp + ) + + if (TELNETPP_WITH_TESTS) diff --git a/externals/vcpkg/ports/telnetpp/portfile.cmake b/externals/vcpkg/ports/telnetpp/portfile.cmake new file mode 100755 index 000000000..f4a196144 --- /dev/null +++ b/externals/vcpkg/ports/telnetpp/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KazDragon/telnetpp + REF f370ebd0c0dc6505708065ee5afdc59a6de54387 # v2.1.2 + MSVC patches + SHA512 c58cb9159a8fb6c4b089a0212a995f70f08b93877d98828aa263e9f065f42a932d98749b56741d9e711c0805dcc2dcf0607dc86b0553c4e34bd3fad99e0bf157 + HEAD_REF master + PATCHES fix-install-paths.patch +) + +set(USE_ZLIB OFF) +if("zlib" IN_LIST FEATURES) + set(USE_ZLIB ON) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE + PREFER_NINJA + OPTIONS + -DGSL_INCLUDE_PATH=${CURRENT_INSTALLED_DIR}/include + -DTELNETPP_WITH_ZLIB=${USE_ZLIB} + -DTELNETPP_WITH_TESTS=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/telnetpp) + +vcpkg_copy_pdbs() + +# Remove duplicate header files and CMake input file +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE ${CURRENT_PACKAGES_DIR}/include/telnetpp/version.hpp.in) +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/telnetpp RENAME copyright) diff --git a/externals/vcpkg/ports/telnetpp/vcpkg.json b/externals/vcpkg/ports/telnetpp/vcpkg.json new file mode 100755 index 000000000..b59fcde67 --- /dev/null +++ b/externals/vcpkg/ports/telnetpp/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "telnetpp", + "version-string": "2.1.2", + "port-version": 1, + "description": "Telnet++ is an implementation of the Telnet Session Layer protocol using C++14", + "homepage": "https://github.com/KazDragon/telnetpp", + "supports": "!uwp", + "dependencies": [ + "boost-container", + "boost-exception", + "boost-range", + "boost-signals2", + "boost-variant", + "gsl-lite" + ], + "default-features": [ + "zlib" + ], + "features": { + "zlib": { + "description": "Zlib support", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/tensorflow-cc/portfile.cmake b/externals/vcpkg/ports/tensorflow-cc/portfile.cmake new file mode 100755 index 000000000..ee9926b15 --- /dev/null +++ b/externals/vcpkg/ports/tensorflow-cc/portfile.cmake @@ -0,0 +1,11 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +set(TF_LIB_SUFFIX "_cc") +set(TF_PORT_SUFFIX "-cc") +set(TF_INCLUDE_DIRS "\${TENSORFLOW_INSTALL_PREFIX}/include/tensorflow-external \${TENSORFLOW_INSTALL_PREFIX}/include/tensorflow-external/src") +list(APPEND CMAKE_MODULE_PATH "${CURRENT_INSTALLED_DIR}/share/tensorflow-common") +include(tensorflow-common) + +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow-external") diff --git a/externals/vcpkg/ports/tensorflow-cc/vcpkg.json b/externals/vcpkg/ports/tensorflow-cc/vcpkg.json new file mode 100755 index 000000000..9bb69848c --- /dev/null +++ b/externals/vcpkg/ports/tensorflow-cc/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "tensorflow-cc", + "version-semver": "2.7.0", + "port-version": 2, + "description": "Library for computation using data flow graphs for scalable machine learning (C++ API version)", + "homepage": "https://github.com/tensorflow/tensorflow", + "supports": "!(x86 | arm | uwp)", + "dependencies": [ + "tensorflow-common" + ] +} diff --git a/externals/vcpkg/ports/tensorflow-common/LICENSE.txt b/externals/vcpkg/ports/tensorflow-common/LICENSE.txt new file mode 100755 index 000000000..2e4eac826 --- /dev/null +++ b/externals/vcpkg/ports/tensorflow-common/LICENSE.txt @@ -0,0 +1,23 @@ +Copyright (c) Microsoft Corporation + +All rights reserved. + +MIT License + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/externals/vcpkg/ports/tensorflow-common/README-linux b/externals/vcpkg/ports/tensorflow-common/README-linux new file mode 100755 index 000000000..4e0cb514a --- /dev/null +++ b/externals/vcpkg/ports/tensorflow-common/README-linux @@ -0,0 +1,13 @@ +Warning: Static TensorFlow build contains several external dependencies that may cause linking conflicts + (for example, one cannot use both openssl and TensorFlow in the same project, since TensorFlow contains boringssl). + +Note: Besides TensorFlow itself, you'll also need to pass its dependencies to the linker: + * libm + * libdl + * libpthread +for example, '-ltensorflow_cc -lm -ldl -lpthread'. + +Note: There is no separate libtensorflow_framework.a as it got merged into libtensorflow_cc.a to avoid linking conflicts. + +Note: For some TensorFlow features (e.g. OpRegistry), it might be necessary to tell the linker to include the whole library: + '-Wl,--whole-archive -ltensorflow_cc -Wl,--no-whole-archive [rest of linker arguments]' diff --git a/externals/vcpkg/ports/tensorflow-common/README-macos b/externals/vcpkg/ports/tensorflow-common/README-macos new file mode 100755 index 000000000..6bbfd0781 --- /dev/null +++ b/externals/vcpkg/ports/tensorflow-common/README-macos @@ -0,0 +1,12 @@ +Warning: Static TensorFlow build contains several external dependencies that may cause linking conflicts + (for example, one cannot use both openssl and TensorFlow in the same project, since TensorFlow contains boringssl). + +Note: Besides TensorFlow itself, you'll also need to pass its dependencies to the linker: + * CoreFoundation + * Security (only when linking against the whole library, see below) +for example, '-ltensorflow_cc -framework CoreFoundation -framework Security'. + +Note: There is no separate libtensorflow_framework.a as it got merged into libtensorflow_cc.a to avoid linking conflicts. + +Note: For some TensorFlow features (e.g. OpRegistry), it might be necessary to tell the linker to include the whole library: + '-Wl,-force_load,path/to/libtensorflow_cc.a [rest of linker arguments]' diff --git a/externals/vcpkg/ports/tensorflow-common/README-windows b/externals/vcpkg/ports/tensorflow-common/README-windows new file mode 100755 index 000000000..5a1952976 --- /dev/null +++ b/externals/vcpkg/ports/tensorflow-common/README-windows @@ -0,0 +1,5 @@ +Warning: Static TensorFlow build contains several external dependencies that may cause linking conflicts + (for example, one cannot use both openssl and TensorFlow in the same project, since TensorFlow contains boringssl). + +Note: For some TensorFlow features (e.g. OpRegistry), it might be necessary to convince the linker to include the whole library, i.e., link using options + '/WHOLEARCHIVE:tensorflow_cc.lib /WHOLEARCHIVE:tensorflow_cc-part2.lib /WHOLEARCHIVE:tensorflow_cc-part3.lib ...' diff --git a/externals/vcpkg/ports/tensorflow-common/change-macros-for-static-lib.patch b/externals/vcpkg/ports/tensorflow-common/change-macros-for-static-lib.patch new file mode 100755 index 000000000..a9d5fe7a0 --- /dev/null +++ b/externals/vcpkg/ports/tensorflow-common/change-macros-for-static-lib.patch @@ -0,0 +1,318 @@ +diff --git a/tensorflow/core/platform/macros.h b/tensorflow/core/platform/macros.h +--- a/tensorflow/core/platform/macros.h ++++ b/tensorflow/core/platform/macros.h +@@ -57,16 +57,7 @@ + #define TF_SCANF_ATTRIBUTE(string_index, first_to_check) + #endif + +-// Control visibility outside .so +-#if defined(_WIN32) +-#ifdef TF_COMPILE_LIBRARY +-#define TF_EXPORT __declspec(dllexport) +-#else +-#define TF_EXPORT __declspec(dllimport) +-#endif // TF_COMPILE_LIBRARY +-#else +-#define TF_EXPORT __attribute__((visibility("default"))) +-#endif // _WIN32 ++#define TF_EXPORT + + #ifdef __has_builtin + #define TF_HAS_BUILTIN(x) __has_builtin(x) + +diff --git a/tensorflow/c/c_api.h b/tensorflow/c/c_api.h +--- a/tensorflow/c/c_api.h ++++ b/tensorflow/c/c_api.h +@@ -71,24 +71,7 @@ + // and the API just provides high level controls over the number of + // devices of each type. + +-// Macro to control visibility of exported symbols in the shared library (.so, +-// .dylib, .dll). +-// This duplicates the TF_EXPORT macro definition in +-// tensorflow/core/platform/macros.h in order to keep this .h file independent +-// of any other includes. +-#ifdef SWIG + #define TF_CAPI_EXPORT +-#else +-#if defined(_WIN32) +-#ifdef TF_COMPILE_LIBRARY +-#define TF_CAPI_EXPORT __declspec(dllexport) +-#else +-#define TF_CAPI_EXPORT __declspec(dllimport) +-#endif // TF_COMPILE_LIBRARY +-#else +-#define TF_CAPI_EXPORT __attribute__((visibility("default"))) +-#endif // _WIN32 +-#endif // SWIG + + #ifdef __cplusplus + extern "C" { + +diff --git a/tensorflow/c/c_api_experimental.h b/tensorflow/c/c_api_experimental.h +--- a/tensorflow/c/c_api_experimental.h ++++ b/tensorflow/c/c_api_experimental.h +@@ -28,24 +28,7 @@ + // The API here is subject to changes in the future. + // -------------------------------------------------------------------------- + +-// Macro to control visibility of exported symbols in the shared library (.so, +-// .dylib, .dll). +-// This duplicates the TF_EXPORT macro definition in +-// tensorflow/core/platform/macros.h in order to keep this .h file independent +-// of any other includes.$a +-#ifdef SWIG + #define TF_CAPI_EXPORT +-#else +-#if defined(_WIN32) +-#ifdef TF_COMPILE_LIBRARY +-#define TF_CAPI_EXPORT __declspec(dllexport) +-#else +-#define TF_CAPI_EXPORT __declspec(dllimport) +-#endif // TF_COMPILE_LIBRARY +-#else +-#define TF_CAPI_EXPORT __attribute__((visibility("default"))) +-#endif // _WIN32 +-#endif // SWIG + + #ifdef __cplusplus + extern "C" { + +diff --git a/tensorflow/c/c_api_macros.h b/tensorflow/c/c_api_macros.h +--- a/tensorflow/c/c_api_macros.h ++++ b/tensorflow/c/c_api_macros.h +@@ -16,17 +16,5 @@ + #ifndef TENSORFLOW_C_C_API_MACROS_H_ + #define TENSORFLOW_C_C_API_MACROS_H_ + +-#ifdef SWIG + #define TF_CAPI_EXPORT +-#else +-#if defined(_WIN32) +-#ifdef TF_COMPILE_LIBRARY +-#define TF_CAPI_EXPORT __declspec(dllexport) +-#else +-#define TF_CAPI_EXPORT __declspec(dllimport) +-#endif // TF_COMPILE_LIBRARY +-#else +-#define TF_CAPI_EXPORT __attribute__((visibility("default"))) +-#endif // _WIN32 +-#endif // SWIG + + +diff --git a/tensorflow/c/kernels.h b/tensorflow/c/kernels.h +--- a/tensorflow/c/kernels.h ++++ b/tensorflow/c/kernels.h +@@ -24,24 +24,7 @@ + #include "tensorflow/c/tf_status.h" + #include "tensorflow/c/tf_tensor.h" + +-// Macro to control visibility of exported symbols in the shared library (.so, +-// .dylib, .dll). +-// This duplicates the TF_EXPORT macro definition in +-// tensorflow/core/platform/macros.h in order to keep this .h file independent +-// of any other includes. +-#ifdef SWIG + #define TF_CAPI_EXPORT +-#else +-#if defined(_WIN32) +-#ifdef TF_COMPILE_LIBRARY +-#define TF_CAPI_EXPORT __declspec(dllexport) +-#else +-#define TF_CAPI_EXPORT __declspec(dllimport) +-#endif // TF_COMPILE_LIBRARY +-#else +-#define TF_CAPI_EXPORT __attribute__((visibility("default"))) +-#endif // _WIN32 +-#endif // SWIG + + #ifdef __cplusplus + extern "C" { + +diff --git a/tensorflow/c/kernels_experimental.h b/tensorflow/c/kernels_experimental.h +--- a/tensorflow/c/kernels_experimental.h ++++ b/tensorflow/c/kernels_experimental.h +@@ -25,24 +25,7 @@ + // The API here is subject to changes in the future. + // -------------------------------------------------------------------------- + +-// Macro to control visibility of exported symbols in the shared library (.so, +-// .dylib, .dll). +-// This duplicates the TF_EXPORT macro definition in +-// tensorflow/core/platform/macros.h in order to keep this .h file independent +-// of any other includes. +-#ifdef SWIG + #define TF_CAPI_EXPORT +-#else +-#if defined(_WIN32) +-#ifdef TF_COMPILE_LIBRARY +-#define TF_CAPI_EXPORT __declspec(dllexport) +-#else +-#define TF_CAPI_EXPORT __declspec(dllimport) +-#endif // TF_COMPILE_LIBRARY +-#else +-#define TF_CAPI_EXPORT __attribute__((visibility("default"))) +-#endif // _WIN32 +-#endif // SWIG + + #ifdef __cplusplus + extern "C" { + +diff --git a/tensorflow/c/ops.h b/tensorflow/c/ops.h +--- a/tensorflow/c/ops.h ++++ b/tensorflow/c/ops.h +@@ -76,19 +76,7 @@ + #include "tensorflow/c/tf_datatype.h" + #include "tensorflow/c/tf_status.h" + +-#ifdef SWIG + #define TF_CAPI_EXPORT +-#else +-#if defined(_WIN32) +-#ifdef TF_COMPILE_LIBRARY +-#define TF_CAPI_EXPORT __declspec(dllexport) +-#else +-#define TF_CAPI_EXPORT __declspec(dllimport) +-#endif // TF_COMPILE_LIBRARY +-#else +-#define TF_CAPI_EXPORT __attribute__((visibility("default"))) +-#endif // _WIN32 +-#endif // SWIG + + #ifdef __cplusplus + extern "C" { + +diff --git a/tensorflow/c/tf_datatype.h b/tensorflow/c/tf_datatype.h +--- a/tensorflow/c/tf_datatype.h ++++ b/tensorflow/c/tf_datatype.h +@@ -18,24 +18,7 @@ + + #include + +-// Macro to control visibility of exported symbols in the shared library (.so, +-// .dylib, .dll). +-// This duplicates the TF_EXPORT macro definition in +-// tensorflow/core/platform/macros.h in order to keep this .h file independent +-// of any other includes. +-#ifdef SWIG + #define TF_CAPI_EXPORT +-#else +-#if defined(_WIN32) +-#ifdef TF_COMPILE_LIBRARY +-#define TF_CAPI_EXPORT __declspec(dllexport) +-#else +-#define TF_CAPI_EXPORT __declspec(dllimport) +-#endif // TF_COMPILE_LIBRARY +-#else +-#define TF_CAPI_EXPORT __attribute__((visibility("default"))) +-#endif // _WIN32 +-#endif // SWIG + + #ifdef __cplusplus + extern "C" { + +diff --git a/tensorflow/c/tf_status.h b/tensorflow/c/tf_status.h +--- a/tensorflow/c/tf_status.h ++++ b/tensorflow/c/tf_status.h +@@ -16,19 +16,7 @@ + #ifndef TENSORFLOW_C_TF_STATUS_H_ + #define TENSORFLOW_C_TF_STATUS_H_ + +-#ifdef SWIG + #define TF_CAPI_EXPORT +-#else +-#if defined(_WIN32) +-#ifdef TF_COMPILE_LIBRARY +-#define TF_CAPI_EXPORT __declspec(dllexport) +-#else +-#define TF_CAPI_EXPORT __declspec(dllimport) +-#endif // TF_COMPILE_LIBRARY +-#else +-#define TF_CAPI_EXPORT __attribute__((visibility("default"))) +-#endif // _WIN32 +-#endif // SWIG + + #ifdef __cplusplus + extern "C" { + +diff --git a/tensorflow/c/tf_tensor.h b/tensorflow/c/tf_tensor.h +--- a/tensorflow/c/tf_tensor.h ++++ b/tensorflow/c/tf_tensor.h +@@ -23,24 +23,7 @@ + #include "tensorflow/c/tf_datatype.h" + #include "tensorflow/c/tf_status.h" + +-// Macro to control visibility of exported symbols in the shared library (.so, +-// .dylib, .dll). +-// This duplicates the TF_EXPORT macro definition in +-// tensorflow/core/platform/macros.h in order to keep this .h file independent +-// of any other includes. +-#ifdef SWIG + #define TF_CAPI_EXPORT +-#else +-#if defined(_WIN32) +-#ifdef TF_COMPILE_LIBRARY +-#define TF_CAPI_EXPORT __declspec(dllexport) +-#else +-#define TF_CAPI_EXPORT __declspec(dllimport) +-#endif // TF_COMPILE_LIBRARY +-#else +-#define TF_CAPI_EXPORT __attribute__((visibility("default"))) +-#endif // _WIN32 +-#endif // SWIG + + #ifdef __cplusplus + extern "C" { + +diff --git a/tensorflow/c/tf_tstring.h b/tensorflow/c/tf_tstring.h +--- a/tensorflow/c/tf_tstring.h ++++ b/tensorflow/c/tf_tstring.h +@@ -18,19 +18,7 @@ + #include "tensorflow/c/tf_tensor.h" + #include "tensorflow/core/platform/ctstring.h" + +-#ifdef SWIG + #define TF_CAPI_EXPORT +-#else +-#if defined(_WIN32) +-#ifdef TF_COMPILE_LIBRARY +-#define TF_CAPI_EXPORT __declspec(dllexport) +-#else +-#define TF_CAPI_EXPORT __declspec(dllimport) +-#endif // TF_COMPILE_LIBRARY +-#else +-#define TF_CAPI_EXPORT __attribute__((visibility("default"))) +-#endif // _WIN32 +-#endif // SWIG + + #ifdef __cplusplus + extern "C" { + +diff --git a/tensorflow/c/eager/c_api.h b/tensorflow/c/eager/c_api.h +--- a/tensorflow/c/eager/c_api.h ++++ b/tensorflow/c/eager/c_api.h +@@ -22,24 +22,7 @@ + + #include "tensorflow/c/c_api.h" + +-// Macro to control visibility of exported symbols in the shared library (.so, +-// .dylib, .dll). +-// This duplicates the TF_EXPORT macro definition in +-// tensorflow/core/platform/macros.h in order to keep this .h file independent +-// of any other includes.$a +-#ifdef SWIG + #define TF_CAPI_EXPORT +-#else +-#if defined(_WIN32) +-#ifdef TF_COMPILE_LIBRARY +-#define TF_CAPI_EXPORT __declspec(dllexport) +-#else +-#define TF_CAPI_EXPORT __declspec(dllimport) +-#endif // TF_COMPILE_LIBRARY +-#else +-#define TF_CAPI_EXPORT __attribute__((visibility("default"))) +-#endif // _WIN32 +-#endif // SWIG + + #ifdef __cplusplus + extern "C" { diff --git a/externals/vcpkg/ports/tensorflow-common/convert_lib_params_linux.py b/externals/vcpkg/ports/tensorflow-common/convert_lib_params_linux.py new file mode 100755 index 000000000..b24d45d63 --- /dev/null +++ b/externals/vcpkg/ports/tensorflow-common/convert_lib_params_linux.py @@ -0,0 +1,30 @@ +import sys + +version = sys.argv[1] +lib_suffix = "" if len(sys.argv) < 3 else sys.argv[2] + +with open(f"libtensorflow{lib_suffix}.a.{version}-2.params", "w") as f_out: + parts = [] + with open(f"libtensorflow_framework.so.{version}-2.params", "r") as f_in: + skip_next = False + for line in f_in: + if skip_next: + skip_next = False + continue + if line.startswith("-o"): + skip_next = True + elif line.startswith("bazel-out"): + f_out.write(line) + parts.append(line) + parts = set(parts) + with open(f"libtensorflow{lib_suffix}.so.{version}-2.params", "r") as f_in: + skip_next = False + for line in f_in: + if skip_next: + skip_next = False + continue + if line.startswith("-o"): + skip_next = True + elif line.startswith("bazel-out"): + if line not in parts: + f_out.write(line) diff --git a/externals/vcpkg/ports/tensorflow-common/convert_lib_params_macos.py b/externals/vcpkg/ports/tensorflow-common/convert_lib_params_macos.py new file mode 100755 index 000000000..d49f4d581 --- /dev/null +++ b/externals/vcpkg/ports/tensorflow-common/convert_lib_params_macos.py @@ -0,0 +1,20 @@ +import os.path +import sys + +version = sys.argv[1] +lib_suffix = "" if len(sys.argv) < 3 else sys.argv[2] + +if os.path.isfile(f"libtensorflow_framework.{version}.dylib-2.params"): + with open(f"libtensorflow{lib_suffix}.{version}.a-2.params", "w") as f_out: + parts = [] + with open(f"libtensorflow_framework.{version}.dylib-2.params", "r") as f_in: + for line in f_in: + if line.startswith("-Wl,-force_load,"): + f_out.write(line[16:]) + parts.append(line[16:]) + parts = set(parts) + with open(f"libtensorflow{lib_suffix}.{version}.dylib-2.params", "r") as f_in: + for line in f_in: + if line.startswith("-Wl,-force_load,"): + if line[16:] not in parts: + f_out.write(line[16:]) diff --git a/externals/vcpkg/ports/tensorflow-common/convert_lib_params_windows.py b/externals/vcpkg/ports/tensorflow-common/convert_lib_params_windows.py new file mode 100755 index 000000000..e150b4e5b --- /dev/null +++ b/externals/vcpkg/ports/tensorflow-common/convert_lib_params_windows.py @@ -0,0 +1,28 @@ +import os +import sys + +lib_suffix = "" if len(sys.argv) < 2 else sys.argv[1] + +file_no = 1 +with open(f"tensorflow{lib_suffix}.dll-2.params", "r") as f_in: + lib_name = None + acc_size = 0 + f_out = open(f"tensorflow{lib_suffix}.lib-2.params-part1", "w") + for line in f_in: + if line.startswith("/OUT:"): + lib_name = line + line = line.replace(".dll", "-part1.lib") + f_out.write(line) + elif line.startswith("/WHOLEARCHIVE:"): + line = line[len("/WHOLEARCHIVE:"):] + size = os.stat(f"../../{line.strip()}").st_size + if acc_size + size > 0xFFFFFFFF: + # we need to split the library if it is >4GB, because it's not supported even on x64 Windows + f_out.close() + file_no += 1 + f_out = open(f"tensorflow{lib_suffix}.lib-2.params-part{file_no}", "w") + acc_size = 0 + f_out.write(lib_name.replace(".dll", f"-part{file_no}.lib")) + acc_size += size + f_out.write(line) + f_out.close() diff --git a/externals/vcpkg/ports/tensorflow-common/fix-build-error.patch b/externals/vcpkg/ports/tensorflow-common/fix-build-error.patch new file mode 100755 index 000000000..eb2a91c97 --- /dev/null +++ b/externals/vcpkg/ports/tensorflow-common/fix-build-error.patch @@ -0,0 +1,21 @@ +diff --git a/tensorflow/core/platform/default/logging.h b/tensorflow/core/platform/default/logging.h +--- a/tensorflow/core/platform/default/logging.h ++++ b/tensorflow/core/platform/default/logging.h +@@ -104,13 +104,13 @@ class LogMessageFatal : public LogMessage { + }; + + #define _TF_LOG_INFO \ +- ::tensorflow::internal::LogMessage(__FILE__, __LINE__, ::tensorflow::INFO) ++ tensorflow::internal::LogMessage(__FILE__, __LINE__, tensorflow::INFO) + #define _TF_LOG_WARNING \ +- ::tensorflow::internal::LogMessage(__FILE__, __LINE__, ::tensorflow::WARNING) ++ tensorflow::internal::LogMessage(__FILE__, __LINE__, tensorflow::WARNING) + #define _TF_LOG_ERROR \ +- ::tensorflow::internal::LogMessage(__FILE__, __LINE__, ::tensorflow::ERROR) ++ tensorflow::internal::LogMessage(__FILE__, __LINE__, tensorflow::ERROR) + #define _TF_LOG_FATAL \ +- ::tensorflow::internal::LogMessageFatal(__FILE__, __LINE__) ++ tensorflow::internal::LogMessageFatal(__FILE__, __LINE__) + + #define _TF_LOG_QFATAL _TF_LOG_FATAL + diff --git a/externals/vcpkg/ports/tensorflow-common/fix-windows-build.patch b/externals/vcpkg/ports/tensorflow-common/fix-windows-build.patch new file mode 100755 index 000000000..9f7f8dea8 --- /dev/null +++ b/externals/vcpkg/ports/tensorflow-common/fix-windows-build.patch @@ -0,0 +1,25 @@ +diff --git a/tensorflow/core/kernels/depthtospace_op.cc b/tensorflow/core/kernels/depthtospace_op.cc +--- a/tensorflow/core/kernels/depthtospace_op.cc ++++ b/tensorflow/core/kernels/depthtospace_op.cc +@@ -112,7 +112,7 @@ + auto Tinput = input.tensor(); + auto Toutput = outputs_tensor->tensor(); + +- if (std::is_same::value) { ++ if constexpr (std::is_same::value) { + if (is_int8x4) { + // NCHW_VECT_C with 4 x qint8 can be treated as NCHW int32. + auto Tinput_v = input.template reinterpret_last_dimension(); + +diff --git a/tensorflow/core/kernels/spacetodepth_op.cc b/tensorflow/core/kernels/spacetodepth_op.cc +--- a/tensorflow/core/kernels/spacetodepth_op.cc ++++ b/tensorflow/core/kernels/spacetodepth_op.cc +@@ -126,7 +126,7 @@ + output_width, output_depth), + &outputs_tensor)); + +- if (std::is_same::value) { ++ if constexpr (std::is_same::value) { + using RT = typename RawType::type; + if (data_format_ == FORMAT_NCHW_VECT_C) { + // NCHW_VECT_C with 4 x qint8 can be treated as NCHW int32. diff --git a/externals/vcpkg/ports/tensorflow-common/generate_static_link_cmd_linux.py b/externals/vcpkg/ports/tensorflow-common/generate_static_link_cmd_linux.py new file mode 100755 index 000000000..56a31ca0a --- /dev/null +++ b/externals/vcpkg/ports/tensorflow-common/generate_static_link_cmd_linux.py @@ -0,0 +1,26 @@ +import re +import sys + +params_path = sys.argv[2] +version = sys.argv[3] +lib_suffix = "" if len(sys.argv) < 5 else sys.argv[4] + +with open(sys.argv[1], "r") as f_in: + with open("static_link.sh", "w") as f_out: + p_cd = re.compile(r"^\((cd .*) && \\$") + p_linker = re.compile(fr"^\s*(.+)gcc.+(@bazel-out\S+libtensorflow{lib_suffix}\.so\.\d\.\d\.\d-2\.params).*") + f_out.write("#!/bin/bash\n# note: ar/binutils version 2.27 required to support output files > 4GB\n") + env = [] + for line in f_in: + if line.startswith("(cd"): + # new command, reset + env = [line] + else: + m1 = p_linker.match(line) + if m1: + m2 = p_cd.match(env[0]) + f_out.write(m2.group(1) + "\n") + line = f'"{m1.group(1)}ar" rcs {m1.group(2)[1:-9].replace(".so", ".a")} {m1.group(2).replace(".so", ".a")}\n' + f_out.write(line) + else: + env.append(line) diff --git a/externals/vcpkg/ports/tensorflow-common/generate_static_link_cmd_macos.py b/externals/vcpkg/ports/tensorflow-common/generate_static_link_cmd_macos.py new file mode 100755 index 000000000..470a6a6e6 --- /dev/null +++ b/externals/vcpkg/ports/tensorflow-common/generate_static_link_cmd_macos.py @@ -0,0 +1,71 @@ +import os.path +import re +import sys + +params_path = sys.argv[2] +version = sys.argv[3] +lib_suffix = "" if len(sys.argv) < 5 else sys.argv[4] + +with open(sys.argv[1], "r") as f_in: + with open("static_link.sh", "w") as f_out: + if os.path.isfile(f"{params_path}/libtensorflow_framework.{version}.dylib-2.params"): + p_cd = re.compile(r"^\((cd .*) && \\$") + p_linker = re.compile(fr"^\s*.+cc_wrapper.sh.+(@bazel-out\S+libtensorflow{lib_suffix}\.\d\.\d\.\d\.dylib-2\.params).*") + f_out.write("#!/bin/bash\n# note: ar/binutils version 2.27 required to support output files > 4GB\n") + env = [] + for line in f_in: + if line.startswith("(cd"): + # new command, reset + env = [line] + else: + m1 = p_linker.match(line) + if m1: + m2 = p_cd.match(env[0]) + f_out.write(m2.group(1) + "\n") + line = f'"/usr/bin/libtool" -static -o {m1.group(1)[1:-9].replace(".dylib", ".a")} {m1.group(1).replace(".dylib", ".a")}\n' + f_out.write(line) + else: + env.append(line) + else: + # old behaviour (still on some platforms): inline all parameters instead of using -2.params file + p_cd = re.compile(r"^\((cd .*) && \\$") + p_linker1 = re.compile(fr"^.*cc_wrapper.sh.+-shared.+-o (bazel-out\S+libtensorflow{lib_suffix}\.\d\.\d\.\d\.dylib)") + p_linker2 = re.compile("^.*cc_wrapper.sh.+-shared.+-o (bazel-out\\S+libtensorflow_framework\\.\\d\\.\\d\\.\\d\\.dylib)") + f_out.write("#!/bin/bash\n# note: ar/binutils version 2.27 required to support output files > 4GB\n") + env = [] + parts = None + for line in f_in: + if line.startswith("(cd"): + # new command, reset + env = [line] + else: + m1 = p_linker1.match(line) + m2 = p_linker2.match(line) + if m1: + tokens = line.split() + if parts is None: + parts = [t[16:] for t in tokens if t.startswith("-Wl,-force_load,")] + else: + m = p_cd.match(env[0]) + f_out.write(m.group(1) + "\n") + tmp = [t[16:] for t in tokens if t.startswith("-Wl,-force_load,")] + old = set(parts) + parts += [t for t in tmp if t not in old] + line = f"libtool -static -o {m1.group(1).replace('.dylib', '.a')} {' '.join(parts)}\n" + f_out.write(line) + break + elif m2 and len(env) > 6: + tokens = line.split() + if parts is None: + parts = [t[16:] for t in tokens if t.startswith("-Wl,-force_load,")] + else: + m = p_cd.match(env[0]) + f_out.write(m.group(1) + "\n") + tmp = [t[16:] for t in tokens if t.startswith("-Wl,-force_load,")] + old = set(parts) + parts += [t for t in tmp if t not in old] + line = f"libtool -static -o {m2.group(1).replace('_framework', lib_suffix).replace('.dylib', '.a')} {' '.join(parts)}\n" + f_out.write(line) + break + else: + env.append(line) diff --git a/externals/vcpkg/ports/tensorflow-common/generate_static_link_cmd_windows.py b/externals/vcpkg/ports/tensorflow-common/generate_static_link_cmd_windows.py new file mode 100755 index 000000000..b75bdba64 --- /dev/null +++ b/externals/vcpkg/ports/tensorflow-common/generate_static_link_cmd_windows.py @@ -0,0 +1,45 @@ +import os.path +import re +import sys + +params_path = sys.argv[2] +version = sys.argv[3] +lib_suffix = "" if len(sys.argv) < 5 else sys.argv[4] + +with open(sys.argv[1], "r") as f_in: + with open("static_link.bat", "w") as f_out: + p_setenv = re.compile(r"^\s*(SET .+=.*)$") + p_linker = re.compile(fr".+link\.exe.+tensorflow{lib_suffix}\.dll-2\.params.*") + env = [] + for line in f_in: + if line.startswith("cd"): + # new command, reset + env = [] + else: + m = p_setenv.match(line) + if m: + env.append(m.group(1)) + else: + m = p_linker.match(line) + if m: + for e in env: + f_out.write(e + "\n") + tokens = line.split() + line = "\"" + params_file = None + for t in tokens: + if t.endswith("link.exe"): + t = t[:-len("link.exe")] + "lib.exe\"" + elif t == "/DLL" or t.lower()[1:].startswith("defaultlib:") or t.lower()[1:].startswith("ignore") or t.startswith("/OPT:") or t.startswith("/DEF:") or t.startswith("/DEBUG:") or t.startswith("/INCREMENTAL:"): + continue + elif t[0] == '@' and t.endswith(f"tensorflow{lib_suffix}.dll-2.params"): + t = t[:-len("dll-2.params")] + "lib-2.params-part1" + params_file = t[1:-len("-part1")] + line += t + " " + f_out.write(line + "\n") + # check for more parts if library needs to be split + file_no = 2 + while os.path.isfile(f"{params_file}-part{file_no}"): + f_out.write(line.replace("lib-2.params-part1", f"lib-2.params-part{file_no}") + "\n") + file_no += 1 + break diff --git a/externals/vcpkg/ports/tensorflow-common/portfile.cmake b/externals/vcpkg/ports/tensorflow-common/portfile.cmake new file mode 100755 index 000000000..45fb70e27 --- /dev/null +++ b/externals/vcpkg/ports/tensorflow-common/portfile.cmake @@ -0,0 +1,26 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +set(TENSORFLOW_FILES + "${CMAKE_CURRENT_LIST_DIR}/change-macros-for-static-lib.patch" + "${CMAKE_CURRENT_LIST_DIR}/convert_lib_params_linux.py" + "${CMAKE_CURRENT_LIST_DIR}/convert_lib_params_macos.py" + "${CMAKE_CURRENT_LIST_DIR}/convert_lib_params_windows.py" + "${CMAKE_CURRENT_LIST_DIR}/fix-build-error.patch" + "${CMAKE_CURRENT_LIST_DIR}/fix-windows-build.patch" + "${CMAKE_CURRENT_LIST_DIR}/generate_static_link_cmd_linux.py" + "${CMAKE_CURRENT_LIST_DIR}/generate_static_link_cmd_macos.py" + "${CMAKE_CURRENT_LIST_DIR}/generate_static_link_cmd_windows.py" + "${CMAKE_CURRENT_LIST_DIR}/README-linux" + "${CMAKE_CURRENT_LIST_DIR}/README-macos" + "${CMAKE_CURRENT_LIST_DIR}/README-windows" + "${CMAKE_CURRENT_LIST_DIR}/tensorflow-common.cmake" + "${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-shared.cmake.in" + "${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-static.cmake.in" + "${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-windows-dll.cmake.in" + "${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-windows-lib.cmake.in" + ) + +file(COPY ${TENSORFLOW_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +# Use vcpkg's license +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/tensorflow-common/tensorflow-common.cmake b/externals/vcpkg/ports/tensorflow-common/tensorflow-common.cmake new file mode 100755 index 000000000..fd1ff2b02 --- /dev/null +++ b/externals/vcpkg/ports/tensorflow-common/tensorflow-common.cmake @@ -0,0 +1,468 @@ +set(TF_VERSION 2.7.0) +set(TF_VERSION_SHORT 2.7) + +vcpkg_find_acquire_program(BAZEL) +get_filename_component(BAZEL_DIR "${BAZEL}" DIRECTORY) +vcpkg_add_to_path(PREPEND ${BAZEL_DIR}) +set(ENV{BAZEL_BIN_PATH} "${BAZEL}") + +function(tensorflow_try_remove_recurse_wait PATH_TO_REMOVE) + file(REMOVE_RECURSE ${PATH_TO_REMOVE}) + if(EXISTS "${PATH_TO_REMOVE}") + vcpkg_execute_required_process(COMMAND ${CMAKE_COMMAND} -E sleep 5 WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequisites-sleep-${TARGET_TRIPLET}) + file(REMOVE_RECURSE ${PATH_TO_REMOVE}) + endif() +endfunction() + +vcpkg_find_acquire_program(GIT) +get_filename_component(GIT_DIR "${GIT}" DIRECTORY) +vcpkg_add_to_path(PREPEND ${GIT_DIR}) + +string(FIND "${CURRENT_BUILDTREES_DIR}" " " POS) +if(NOT POS EQUAL -1) + message(FATAL_ERROR "Your vcpkg path contains spaces. This is not supported by the bazel build tool. Aborting.") +endif() + +if(CMAKE_HOST_WIN32) + string(FIND "$ENV{USERNAME}" " " POS) + if(NOT POS EQUAL -1) + message(WARNING "Your Windows username '$ENV{USERNAME}' contains spaces. Applying work-around to bazel. Be warned of possible further issues.") + endif() + + vcpkg_acquire_msys(MSYS_ROOT PACKAGES bash unzip patch diffutils libintl gzip coreutils mingw-w64-x86_64-python-numpy) + vcpkg_add_to_path(${MSYS_ROOT}/usr/bin) + vcpkg_add_to_path(${MSYS_ROOT}/mingw64/bin) + set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) + + set(ENV{BAZEL_SH} ${MSYS_ROOT}/usr/bin/bash.exe) + set(ENV{BAZEL_VC} $ENV{VCInstallDir}) + set(ENV{BAZEL_VC_FULL_VERSION} $ENV{VCToolsVersion}) + + set(PYTHON3 "${MSYS_ROOT}/mingw64/bin/python3.exe") + vcpkg_execute_required_process(COMMAND ${PYTHON3} -c "import site; print(site.getsitepackages()[0])" WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequisites-pypath-${TARGET_TRIPLET} OUTPUT_VARIABLE PYTHON_LIB_PATH) +else() + vcpkg_find_acquire_program(PYTHON3) + + vcpkg_execute_required_process(COMMAND ${PYTHON3} -m venv --symlinks "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-venv" WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequisites-venv-${TARGET_TRIPLET}) + vcpkg_add_to_path(PREPEND ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-venv/bin) + set(PYTHON3 ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-venv/bin/python3) + set(ENV{VIRTUAL_ENV} ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-venv) + + if(VCPKG_TARGET_IS_OSX) + vcpkg_execute_required_process(COMMAND ${PYTHON3} -m pip install -U pip WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequisites-pip-${TARGET_TRIPLET}) + # acceleration libs currently broken on macOS => force numpy user space reinstall without BLAS/LAPACK/ATLAS + # remove this work-around again, i.e. default to "else" branch, once acceleration libs are fixed upstream + set(ENV{BLAS} "None") + set(ENV{LAPACK} "None") + set(ENV{ATLAS} "None") + vcpkg_execute_required_process(COMMAND ${PYTHON3} -m pip install -U --force-reinstall numpy WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequistes-pip-${TARGET_TRIPLET}) + else() + vcpkg_execute_required_process(COMMAND ${PYTHON3} -m pip install -U pip numpy WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequisites-pip-${TARGET_TRIPLET}) + endif() + + vcpkg_execute_required_process(COMMAND ${PYTHON3} -c "import site; print(site.getusersitepackages())" WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequisites-pypath-${TARGET_TRIPLET} OUTPUT_VARIABLE PYTHON_LIB_PATH) +endif() +set(ENV{PYTHON_BIN_PATH} "${PYTHON3}") +set(ENV{PYTHON_LIB_PATH} "${PYTHON_LIB_PATH}") + +# check if numpy can be loaded +vcpkg_execute_required_process(COMMAND ${PYTHON3} -c "import numpy" WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequisites-numpy-${TARGET_TRIPLET}) + +set(ENV{USE_DEFAULT_PYTHON_LIB_PATH} 1) +set(ENV{TF_NEED_KAFKA} 0) +set(ENV{TF_NEED_OPENCL_SYCL} 0) +set(ENV{TF_NEED_AWS} 0) +set(ENV{TF_NEED_GCP} 0) +set(ENV{TF_NEED_HDFS} 0) +set(ENV{TF_NEED_S3} 0) +set(ENV{TF_ENABLE_XLA} 0) +set(ENV{TF_NEED_GDR} 0) +set(ENV{TF_NEED_VERBS} 0) +set(ENV{TF_NEED_OPENCL} 0) +set(ENV{TF_NEED_MPI} 0) +set(ENV{TF_NEED_TENSORRT} 0) +set(ENV{TF_NEED_NGRAPH} 0) +set(ENV{TF_NEED_IGNITE} 0) +set(ENV{TF_NEED_ROCM} 0) +set(ENV{TF_SET_ANDROID_WORKSPACE} 0) +set(ENV{TF_DOWNLOAD_CLANG} 0) +set(ENV{TF_NCCL_VERSION} ${TF_VERSION_SHORT}) +set(ENV{NCCL_INSTALL_PATH} "") +set(ENV{CC_OPT_FLAGS} "/arch:AVX") +set(ENV{TF_NEED_CUDA} 0) +set(ENV{TF_CONFIGURE_IOS} 0) + +if(VCPKG_TARGET_IS_WINDOWS) + set(BAZEL_LIB_NAME tensorflow${TF_LIB_SUFFIX}.dll) + set(PLATFORM_SUFFIX windows) + set(STATIC_LINK_CMD static_link.bat) +elseif(VCPKG_TARGET_IS_OSX) + set(BAZEL_LIB_NAME libtensorflow${TF_LIB_SUFFIX}.dylib) + set(PLATFORM_SUFFIX macos) + set(STATIC_LINK_CMD sh static_link.sh) + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(TF_LIB_NAME "libtensorflow${TF_LIB_SUFFIX}.dylib") + set(TF_LIB_NAME_SHORT "libtensorflow${TF_LIB_SUFFIX}.2.dylib") + set(TF_LIB_NAME_FULL "libtensorflow${TF_LIB_SUFFIX}.${TF_VERSION}.dylib") + set(TF_FRAMEWORK_NAME "libtensorflow_framework.dylib") + set(TF_FRAMEWORK_NAME_SHORT "libtensorflow_framework.2.dylib") + set(TF_FRAMEWORK_NAME_FULL "libtensorflow_framework.${TF_VERSION}.dylib") + else() + set(TF_LIB_NAME "libtensorflow${TF_LIB_SUFFIX}.a") + set(TF_LIB_NAME_SHORT "libtensorflow${TF_LIB_SUFFIX}.2.a") + set(TF_LIB_NAME_FULL "libtensorflow${TF_LIB_SUFFIX}.${TF_VERSION}.a") + endif() +else() + set(BAZEL_LIB_NAME libtensorflow${TF_LIB_SUFFIX}.so) + set(PLATFORM_SUFFIX linux) + set(STATIC_LINK_CMD sh static_link.sh) + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(TF_LIB_NAME "libtensorflow${TF_LIB_SUFFIX}.so") + set(TF_LIB_NAME_SHORT "libtensorflow${TF_LIB_SUFFIX}.so.2") + set(TF_LIB_NAME_FULL "libtensorflow${TF_LIB_SUFFIX}.so.${TF_VERSION}") + set(TF_FRAMEWORK_NAME "libtensorflow_framework.so") + set(TF_FRAMEWORK_NAME_SHORT "libtensorflow_framework.so.2") + set(TF_FRAMEWORK_NAME_FULL "libtensorflow_framework.so.${TF_VERSION}") + else() + set(TF_LIB_NAME "libtensorflow${TF_LIB_SUFFIX}.a") + set(TF_LIB_NAME_SHORT "libtensorflow${TF_LIB_SUFFIX}.a.2") + set(TF_LIB_NAME_FULL "libtensorflow${TF_LIB_SUFFIX}.a.${TF_VERSION}") + endif() +endif() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + list(APPEND PORT_BUILD_CONFIGS "dbg") +endif() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + list(APPEND PORT_BUILD_CONFIGS "rel") +endif() + +foreach(BUILD_TYPE IN LISTS PORT_BUILD_CONFIGS) + # prefer repeated source extraction here for each build type over extracting once above the loop and copying because users reported issues with copying symlinks + set(STATIC_ONLY_PATCHES) + set(WINDOWS_ONLY_PATCHES) + if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(STATIC_ONLY_PATCHES "${CMAKE_CURRENT_LIST_DIR}/change-macros-for-static-lib.patch") # there is no static build option - change macros via patch and link library manually at the end + endif() + if(VCPKG_TARGET_IS_WINDOWS) + set(WINDOWS_ONLY_PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-windows-build.patch") + endif() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tensorflow/tensorflow + REF "v${TF_VERSION}" + SHA512 f1e892583c7b3a73d4d39ec65dc135a5b02c789b357d57414ad2b6d05ad9fbfc8ef81918ba6410e314abd6928b76f764e6ef64c0b0c84b58b50796634be03f39 + HEAD_REF master + PATCHES + "${CMAKE_CURRENT_LIST_DIR}/fix-build-error.patch" # Fix namespace error + ${STATIC_ONLY_PATCHES} + ${WINDOWS_ONLY_PATCHES} + ) + + message(STATUS "Configuring TensorFlow (${BUILD_TYPE})") + tensorflow_try_remove_recurse_wait(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}) + file(RENAME ${SOURCE_PATH} ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}) + set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}") + + vcpkg_execute_required_process( + COMMAND ${PYTHON3} ${SOURCE_PATH}/configure.py --workspace "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}" + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE} + LOGNAME config-${TARGET_TRIPLET}-${BUILD_TYPE} + ) + + if(DEFINED ENV{BAZEL_CUSTOM_CACERTS}) + file(APPEND ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/.bazelrc "startup --host_jvm_args=-Djavax.net.ssl.trustStore='$ENV{BAZEL_CUSTOM_CACERTS}'\n") + message(STATUS "Using custom CA certificate store at: $ENV{BAZEL_CUSTOM_CACERTS}") + if(DEFINED ENV{BAZEL_CUSTOM_CACERTS_PASSWORD}) + file(APPEND ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/.bazelrc "startup --host_jvm_args=-Djavax.net.ssl.trustStorePassword='$ENV{BAZEL_CUSTOM_CACERTS_PASSWORD}'\n") + message(STATUS "Using supplied custom CA certificate store password.") + endif() + else() + if(DEFINED ENV{HTTPS_PROXY}) + message(STATUS "You are using HTTPS_PROXY. In case you encounter bazel certificate errors, you might want to set: BAZEL_CUSTOM_CACERTS=/path/to/trust.store (and optionally BAZEL_CUSTOM_CACERTS_PASSWORD), and to enable vcpkg to actually use it: VCPKG_KEEP_ENV_VARS=BAZEL_CUSTOM_CACERTS;BAZEL_CUSTOM_CACERTS_PASSWORD") + if(CMAKE_HOST_WIN32) + message(STATUS "(For BAZEL_CUSTOM_CACERTS please use forward slashes instead of backslashes on Windows systems.") + endif() + endif() + endif() + + message(STATUS "Warning: Building TensorFlow can take an hour or more.") + set(COPTS) + set(CXXOPTS) + set(LINKOPTS) + if(VCPKG_TARGET_IS_WINDOWS) + set(PLATFORM_COMMAND WINDOWS_COMMAND) + else() + set(PLATFORM_COMMAND UNIX_COMMAND) + endif() + if(BUILD_TYPE STREQUAL dbg) + if(VCPKG_TARGET_IS_WINDOWS) + set(BUILD_OPTS "--compilation_mode=dbg --features=fastbuild") # link with /DEBUG:FASTLINK instead of /DEBUG:FULL to avoid .pdb >4GB error + elseif(VCPKG_TARGET_IS_OSX) + set(BUILD_OPTS --compilation_mode=fastbuild) # debug build on macOS currently broken + else() + set(BUILD_OPTS --compilation_mode=dbg) + endif() + + separate_arguments(VCPKG_C_FLAGS ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS}) + separate_arguments(VCPKG_C_FLAGS_DEBUG ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS_DEBUG}) + foreach(OPT IN LISTS VCPKG_C_FLAGS VCPKG_C_FLAGS_DEBUG) + list(APPEND COPTS "--copt=${OPT}") + endforeach() + separate_arguments(VCPKG_CXX_FLAGS ${PLATFORM_COMMAND} ${VCPKG_CXX_FLAGS}) + separate_arguments(VCPKG_CXX_FLAGS_DEBUG ${PLATFORM_COMMAND} ${VCPKG_CXX_FLAGS_DEBUG}) + foreach(OPT IN LISTS VCPKG_CXX_FLAGS VCPKG_CXX_FLAGS_DEBUG) + list(APPEND CXXOPTS "--cxxopt=${OPT}") + endforeach() + separate_arguments(VCPKG_LINKER_FLAGS ${PLATFORM_COMMAND} ${VCPKG_LINKER_FLAGS}) + separate_arguments(VCPKG_LINKER_FLAGS_DEBUG ${PLATFORM_COMMAND} ${VCPKG_LINKER_FLAGS_DEBUG}) + foreach(OPT IN LISTS VCPKG_LINKER_FLAGS VCPKG_LINKER_FLAGS_DEBUG) + list(APPEND LINKOPTS "--linkopt=${OPT}") + endforeach() + else() + set(BUILD_OPTS --compilation_mode=opt) + + separate_arguments(VCPKG_C_FLAGS ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS}) + separate_arguments(VCPKG_C_FLAGS_RELEASE ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS_RELEASE}) + foreach(OPT IN LISTS VCPKG_C_FLAGS VCPKG_C_FLAGS_RELEASE) + list(APPEND COPTS "--copt=${OPT}") + endforeach() + separate_arguments(VCPKG_CXX_FLAGS ${PLATFORM_COMMAND} ${VCPKG_CXX_FLAGS}) + separate_arguments(VCPKG_CXX_FLAGS_RELEASE ${PLATFORM_COMMAND} ${VCPKG_CXX_FLAGS_RELEASE}) + foreach(OPT IN LISTS VCPKG_CXX_FLAGS VCPKG_CXX_FLAGS_RELEASE) + list(APPEND CXXOPTS "--cxxopt=${OPT}") + endforeach() + separate_arguments(VCPKG_LINKER_FLAGS ${PLATFORM_COMMAND} ${VCPKG_LINKER_FLAGS}) + separate_arguments(VCPKG_LINKER_FLAGS_RELEASE ${PLATFORM_COMMAND} ${VCPKG_LINKER_FLAGS_RELEASE}) + foreach(OPT IN LISTS VCPKG_LINKER_FLAGS VCPKG_LINKER_FLAGS_RELEASE) + list(APPEND LINKOPTS "--linkopt=${OPT}") + endforeach() + endif() + + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if(VCPKG_TARGET_IS_WINDOWS) + list(JOIN COPTS " " COPTS) + list(JOIN CXXOPTS " " CXXOPTS) + list(JOIN LINKOPTS " " LINKOPTS) + # use --output_user_root to work-around too-long-path-names issue and username-with-spaces issue + vcpkg_execute_build_process( + COMMAND ${BASH} --noprofile --norc -c "'${BAZEL}' --output_user_root='${CURRENT_BUILDTREES_DIR}/.bzl' --max_idle_secs=1 build --verbose_failures ${BUILD_OPTS} ${COPTS} ${CXXOPTS} ${LINKOPTS} --python_path='${PYTHON3}' --define=no_tensorflow_py_deps=true ///tensorflow:${BAZEL_LIB_NAME} ///tensorflow:install_headers" + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE} + LOGNAME build-${TARGET_TRIPLET}-${BUILD_TYPE} + ) + else() + vcpkg_execute_build_process( + COMMAND ${BAZEL} --output_user_root=${CURRENT_BUILDTREES_DIR}/.bzl --max_idle_secs=1 build --verbose_failures ${BUILD_OPTS} --python_path=${PYTHON3} ${COPTS} ${CXXOPTS} ${LINKOPTS} --define=no_tensorflow_py_deps=true //tensorflow:${BAZEL_LIB_NAME} //tensorflow:install_headers + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE} + LOGNAME build-${TARGET_TRIPLET}-${BUILD_TYPE} + ) + endif() + else() + if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_CRT_LINKAGE STREQUAL static) + if(BUILD_TYPE STREQUAL dbg) + list(APPEND COPTS "--copt=-MTd") + else() + list(APPEND COPTS "--copt=-MT") + endif() + endif() + list(JOIN COPTS " " COPTS) + list(JOIN CXXOPTS " " CXXOPTS) + list(JOIN LINKOPTS " " LINKOPTS) + # use --output_user_root to work-around too-long-path-names issue and username-with-spaces issue + vcpkg_execute_build_process( + COMMAND ${BASH} --noprofile --norc -c "${BAZEL} --output_user_root='${CURRENT_BUILDTREES_DIR}/.bzl' --max_idle_secs=1 build -s --verbose_failures ${BUILD_OPTS} --features=fully_static_link ${COPTS} ${CXXOPTS} ${LINKOPTS} --python_path='${PYTHON3}' --define=no_tensorflow_py_deps=true ///tensorflow:${BAZEL_LIB_NAME} ///tensorflow:install_headers" + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE} + LOGNAME build-${TARGET_TRIPLET}-${BUILD_TYPE} + ) + else() + vcpkg_execute_build_process( + COMMAND ${BAZEL} --output_user_root=${CURRENT_BUILDTREES_DIR}/.bzl --max_idle_secs=1 build -s --verbose_failures ${BUILD_OPTS} ${COPTS} ${CXXOPTS} ${LINKOPTS} --python_path=${PYTHON3} --define=no_tensorflow_py_deps=true //tensorflow:${BAZEL_LIB_NAME} //tensorflow:install_headers + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE} + LOGNAME build-${TARGET_TRIPLET}-${BUILD_TYPE} + ) + endif() + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_execute_build_process( + COMMAND ${PYTHON3} "${CMAKE_CURRENT_LIST_DIR}/convert_lib_params_${PLATFORM_SUFFIX}.py" ${TF_LIB_SUFFIX} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow + LOGNAME postbuild1-${TARGET_TRIPLET}-${BUILD_TYPE} + ) + else() + vcpkg_execute_build_process( + COMMAND ${PYTHON3} "${CMAKE_CURRENT_LIST_DIR}/convert_lib_params_${PLATFORM_SUFFIX}.py" ${TF_VERSION} ${TF_LIB_SUFFIX} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow + LOGNAME postbuild1-${TARGET_TRIPLET}-${BUILD_TYPE} + ) + endif() + # for some reason stdout of bazel ends up in stderr, so use err log file in the following command + vcpkg_execute_build_process( + COMMAND ${PYTHON3} "${CMAKE_CURRENT_LIST_DIR}/generate_static_link_cmd_${PLATFORM_SUFFIX}.py" "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-${BUILD_TYPE}-err.log" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow" ${TF_VERSION} ${TF_LIB_SUFFIX} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-${TARGET_TRIPLET}-${BUILD_TYPE} + LOGNAME postbuild2-${TARGET_TRIPLET}-${BUILD_TYPE} + ) + vcpkg_execute_build_process( + COMMAND ${STATIC_LINK_CMD} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-${TARGET_TRIPLET}-${BUILD_TYPE} + LOGNAME postbuild3-${TARGET_TRIPLET}-${BUILD_TYPE} + ) + endif() + + if(BUILD_TYPE STREQUAL "dbg") + set(DIR_PREFIX "/debug") + else() + set(DIR_PREFIX "") + endif() + + if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow/tensorflow${TF_LIB_SUFFIX}.dll DESTINATION ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/bin) + # rename before copy because after copy the file might be locked by anti-malware scanners for some time so that renaming fails + file(RENAME ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow/tensorflow${TF_LIB_SUFFIX}.dll.if.lib ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow/tensorflow${TF_LIB_SUFFIX}.lib) + file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow/tensorflow${TF_LIB_SUFFIX}.lib DESTINATION ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/lib) + if(BUILD_TYPE STREQUAL dbg) + file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow/tensorflow${TF_LIB_SUFFIX}.pdb DESTINATION ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/bin) + message(STATUS "Warning: debug information tensorflow${TF_LIB_SUFFIX}.pdb will be of limited use because only a reduced set could be produced due to the 4GB internal PDB file limit even on x64.") + endif() + else() + if(BUILD_TYPE STREQUAL dbg) + set(library_parts_variable TF_LIB_PARTS_DEBUG) + else() + set(library_parts_variable TF_LIB_PARTS_RELEASE) + endif() + set(${library_parts_variable}) + + # library might have been split because no more than 4GB are supported even on x64 Windows + foreach(PART_NO RANGE 1 100) + set(source "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow/tensorflow${TF_LIB_SUFFIX}-part${PART_NO}.lib") + if(EXISTS "${source}") + file(COPY "${source}" DESTINATION "${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/lib") + list(APPEND ${library_parts_variable} "tensorflow${TF_LIB_SUFFIX}-part${PART_NO}.lib") + else() + break() + endif() + endforeach() + endif() + else() + file(COPY + ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow/${TF_LIB_NAME_FULL} + DESTINATION ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/lib + ) + + # Note: these use relative links + file(CREATE_LINK ${TF_LIB_NAME_FULL} + ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/lib/${TF_LIB_NAME_SHORT} + SYMBOLIC + ) + file(CREATE_LINK ${TF_LIB_NAME_FULL} + ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/lib/${TF_LIB_NAME} + SYMBOLIC + ) + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(COPY + ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow/${TF_FRAMEWORK_NAME_FULL} + DESTINATION ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/lib + ) + file(CREATE_LINK + ${TF_FRAMEWORK_NAME_FULL} + ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/lib/${TF_FRAMEWORK_NAME_SHORT} + SYMBOLIC + ) + file(CREATE_LINK + ${TF_FRAMEWORK_NAME_FULL} + ${CURRENT_PACKAGES_DIR}${DIR_PREFIX}/lib/${TF_FRAMEWORK_NAME} + SYMBOLIC + ) + endif() + endif() +endforeach() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + message(STATUS "Warning: Static TensorFlow build contains several external dependencies that may cause linking conflicts (for example, one cannot use both openssl and TensorFlow in the same project, since TensorFlow contains boringssl).") + if(VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Note: For some TensorFlow features (e.g. OpRegistry), it might be necessary to tell the linker to include the whole library, i.e., link using options '/WHOLEARCHIVE:tensorflow${TF_LIB_SUFFIX}-part1.lib /WHOLEARCHIVE:tensorflow${TF_LIB_SUFFIX}-part2.lib ...'") + else() + message(STATUS "Note: There is no separate libtensorflow_framework.a as it got merged into libtensorflow${TF_LIB_SUFFIX}.a to avoid linking conflicts.") + if(VCPKG_TARGET_IS_OSX) + message(STATUS "Note: Beside TensorFlow itself, you'll need to also pass its dependancies to the linker, for example '-ltensorflow${TF_LIB_SUFFIX} -framework CoreFoundation'") + message(STATUS "Note: For some TensorFlow features (e.g. OpRegistry), it might be necessary to tell the linker to include the whole library: '-Wl,-force_load,path/to/libtensorflow${TF_LIB_SUFFIX}.a -framework CoreFoundation -framework Security [rest of linker arguments]'") + else() + message(STATUS "Note: Beside TensorFlow itself, you'll need to also pass its dependancies to the linker, for example '-ltensorflow${TF_LIB_SUFFIX} -lm -ldl -lpthread'") + message(STATUS "Note: For some TensorFlow features (e.g. OpRegistry), it might be necessary to tell the linker to include the whole library: '-Wl,--whole-archive -ltensorflow${TF_LIB_SUFFIX} -Wl,--no-whole-archive [rest of linker arguments]'") + endif() + endif() + + configure_file( + ${CMAKE_CURRENT_LIST_DIR}/README-${PLATFORM_SUFFIX} + ${CURRENT_PACKAGES_DIR}/share/tensorflow${TF_PORT_SUFFIX}/README + COPYONLY) +endif() + +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/tensorflow${TF_PORT_SUFFIX}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/tensorflow${TF_PORT_SUFFIX}/LICENSE ${CURRENT_PACKAGES_DIR}/share/tensorflow${TF_PORT_SUFFIX}/copyright) + + +# NOTE: if this port ever supports VCPKG_BUILD_TYPE, use that to set these. +set(TENSORFLOW_HAS_RELEASE ON) +set(TENSORFLOW_HAS_DEBUG ON) + +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + configure_file( + ${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-windows-dll.cmake.in + ${CURRENT_PACKAGES_DIR}/share/tensorflow${TF_PORT_SUFFIX}/tensorflow${TF_PORT_SUFFIX}-config.cmake + @ONLY) + else() + configure_file( + ${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-windows-lib.cmake.in + ${CURRENT_PACKAGES_DIR}/share/tensorflow${TF_PORT_SUFFIX}/tensorflow${TF_PORT_SUFFIX}-config.cmake + @ONLY) + + set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) + + set(prefix [[${TENSORFLOW_INSTALL_PREFIX}]]) + + set(libs_to_link) + foreach(lib IN LISTS TF_LIB_PARTS_RELEASE) + list(APPEND libs_to_link "$<$:${prefix}/lib/${lib}>") + endforeach() + foreach(lib IN LISTS TF_LIB_PARTS_DEBUG) + list(APPEND libs_to_link "$<$:${prefix}/debug/lib/${lib}>") + endforeach() + if(TENSORFLOW_HAS_RELEASE) + set(TF_LIB_PARTS_DEFAULT ${TF_LIB_PARTS_RELEASE}) + set(prefix_DEFAULT "${prefix}") + elseif(TENSORFLOW_HAS_DEBUG) + set(TF_LIB_PARTS_DEFAULT ${TF_LIB_PARTS_DEBUG}) + set(prefix_DEFAULT "${prefix}/debug") + endif() + + foreach(lib IN LISTS TF_LIB_PARTS_DEFAULT) + list(APPEND libs_to_link + "$<$,$>>:${prefix}/lib/${lib}>") + endforeach() + + string(REPLACE ";" "\n\t\t" libs_to_link "${libs_to_link}") + file(APPEND ${CURRENT_PACKAGES_DIR}/share/tensorflow${TF_PORT_SUFFIX}/tensorflow${TF_PORT_SUFFIX}-config.cmake " +target_link_libraries(tensorflow${TF_LIB_SUFFIX}::tensorflow${TF_LIB_SUFFIX} + INTERFACE + ${libs_to_link} +)" + ) + endif() +else() + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + configure_file( + ${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-shared.cmake.in + ${CURRENT_PACKAGES_DIR}/share/tensorflow${TF_PORT_SUFFIX}/tensorflow${TF_PORT_SUFFIX}-config.cmake + @ONLY) + else() + configure_file( + ${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-static.cmake.in + ${CURRENT_PACKAGES_DIR}/share/tensorflow${TF_PORT_SUFFIX}/tensorflow${TF_PORT_SUFFIX}-config.cmake + @ONLY) + endif() +endif() + +message(STATUS "You may want to delete ${CURRENT_BUILDTREES_DIR} to free diskspace.") diff --git a/externals/vcpkg/ports/tensorflow-common/tensorflow-config-shared.cmake.in b/externals/vcpkg/ports/tensorflow-common/tensorflow-config-shared.cmake.in new file mode 100755 index 000000000..df4ad83b6 --- /dev/null +++ b/externals/vcpkg/ports/tensorflow-common/tensorflow-config-shared.cmake.in @@ -0,0 +1,85 @@ +if(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ OR TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow_framework) + if(NOT (TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ AND TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow_framework)) + message(FATAL_ERROR "Some (but not all) targets in this config.cmake were already defined.") + endif() + + return() +endif() + +add_library(tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ SHARED IMPORTED GLOBAL) +add_library(tensorflow@TF_LIB_SUFFIX@::tensorflow_framework SHARED IMPORTED GLOBAL) + +# Compute the installation prefix from this tensorflow@TF_PORT_SUFFIX@-config.cmake file location. +# CMAKE_CURRENT_LIST_DIR = [vcpkg_installed_dir]/[target_triplet]/share/tensorflow@TF_PORT_SUFFIX@ +get_filename_component(TENSORFLOW_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) +# TENSORFLOW_INSTALL_PREFIX = [vcpkg_installed_dir]/[target_triplet]/share +get_filename_component(TENSORFLOW_INSTALL_PREFIX "${TENSORFLOW_INSTALL_PREFIX}" DIRECTORY) +# TENSORFLOW_INSTALL_PREFIX = [vcpkg_installed_dir]/[target_triplet] + +target_include_directories(tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + INTERFACE + @TF_INCLUDE_DIRS@ +) +target_include_directories(tensorflow@TF_LIB_SUFFIX@::tensorflow_framework + INTERFACE + @TF_INCLUDE_DIRS@ +) + +if(@TENSORFLOW_HAS_RELEASE@) + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + PROPERTY IMPORTED_LOCATION + "${TENSORFLOW_INSTALL_PREFIX}/lib/@TF_LIB_NAME@" + ) + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow_framework + PROPERTY IMPORTED_LOCATION + "${TENSORFLOW_INSTALL_PREFIX}/lib/@TF_FRAMEWORK_NAME@" + ) + + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE + ) + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow_framework + APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE + ) + + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + PROPERTY IMPORTED_LOCATION_RELEASE + "${TENSORFLOW_INSTALL_PREFIX}/lib/@TF_LIB_NAME@" + ) + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow_framework + PROPERTY IMPORTED_LOCATION_RELEASE + "${TENSORFLOW_INSTALL_PREFIX}/lib/@TF_FRAMEWORK_NAME@" + ) +endif() + +if(@TENSORFLOW_HAS_DEBUG) + if(NOT @TENSORFLOW_HAS_RELEASE) + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + PROPERTY IMPORTED_LOCATION + "${TENSORFLOW_INSTALL_PREFIX}/debug/lib/@TF_LIB_NAME@" + ) + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow_framework + PROPERTY IMPORTED_LOCATION + "${TENSORFLOW_INSTALL_PREFIX}/debug/lib/@TF_FRAMEWORK_NAME@" + ) + endif() + + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG + ) + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow_framework + APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG + ) + + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + PROPERTY IMPORTED_LOCATION_DEBUG + "${TENSORFLOW_INSTALL_PREFIX}/debug/lib/@TF_LIB_NAME@" + ) + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow_framework + PROPERTY IMPORTED_LOCATION_DEBUG + "${TENSORFLOW_INSTALL_PREFIX}/debug/lib/@TF_FRAMEWORK_NAME@" + ) +endif() + +set(tensorflow@TF_LIB_SUFFIX@_FOUND TRUE) +set(tensorflow_framework_FOUND TRUE) diff --git a/externals/vcpkg/ports/tensorflow-common/tensorflow-config-static.cmake.in b/externals/vcpkg/ports/tensorflow-common/tensorflow-config-static.cmake.in new file mode 100755 index 000000000..bd8510c5e --- /dev/null +++ b/externals/vcpkg/ports/tensorflow-common/tensorflow-config-static.cmake.in @@ -0,0 +1,55 @@ +if(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@) + return() +endif() + +add_library(tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ STATIC IMPORTED GLOBAL) + +# Compute the installation prefix from this tensorflow@TF_PORT_SUFFIX@-config.cmake file location. +# CMAKE_CURRENT_LIST_DIR = [vcpkg_installed_dir]/[target_triplet]/share/tensorflow@TF_PORT_SUFFIX@ +get_filename_component(TENSORFLOW_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) +# TENSORFLOW_INSTALL_PREFIX = [vcpkg_installed_dir]/[target_triplet]/share +get_filename_component(TENSORFLOW_INSTALL_PREFIX "${TENSORFLOW_INSTALL_PREFIX}" DIRECTORY) +# TENSORFLOW_INSTALL_PREFIX = [vcpkg_installed_dir]/[target_triplet] + +target_include_directories(tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + INTERFACE + @TF_INCLUDE_DIRS@ +) + +if(@TENSORFLOW_HAS_RELEASE@) + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + PROPERTY IMPORTED_LOCATION + "${TENSORFLOW_INSTALL_PREFIX}/lib/@TF_LIB_NAME@" + ) + + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + APPEND PROPERTY IMPORTED_CONFIGURATIONS + RELEASE + ) + + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + PROPERTY IMPORTED_LOCATION_RELEASE + "${TENSORFLOW_INSTALL_PREFIX}/lib/@TF_LIB_NAME@" + ) +endif() + +if(@TENSORFLOW_HAS_DEBUG@) + if(NOT @TENSORFLOW_HAS_RELEASE@) + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + PROPERTY IMPORTED_LOCATION + "${TENSORFLOW_INSTALL_PREFIX}/debug/lib/@TF_LIB_NAME@" + ) + endif() + + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + APPEND PROPERTY IMPORTED_CONFIGURATIONS + DEBUG + ) + + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + PROPERTY IMPORTED_LOCATION_DEBUG + "${TENSORFLOW_INSTALL_PREFIX}/debug/lib/@TF_LIB_NAME@" + ) +endif() + +set(tensorflow@TF_LIB_SUFFIX@_FOUND TRUE) diff --git a/externals/vcpkg/ports/tensorflow-common/tensorflow-config-windows-dll.cmake.in b/externals/vcpkg/ports/tensorflow-common/tensorflow-config-windows-dll.cmake.in new file mode 100755 index 000000000..1c3cfa23e --- /dev/null +++ b/externals/vcpkg/ports/tensorflow-common/tensorflow-config-windows-dll.cmake.in @@ -0,0 +1,55 @@ +if(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@) + return() +endif() + +add_library(tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ SHARED IMPORTED GLOBAL) + +# Compute the installation prefix from this tensorflow@TF_PORT_SUFFIX@-config.cmake file location. +# CMAKE_CURRENT_LIST_DIR = [vcpkg_installed_dir]/[target_triplet]/share/tensorflow@TF_PORT_SUFFIX@ +get_filename_component(TENSORFLOW_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) +# TENSORFLOW_INSTALL_PREFIX = [vcpkg_installed_dir]/[target_triplet]/share +get_filename_component(TENSORFLOW_INSTALL_PREFIX "${TENSORFLOW_INSTALL_PREFIX}" DIRECTORY) +# TENSORFLOW_INSTALL_PREFIX = [vcpkg_installed_dir]/[target_triplet] + +target_include_directories(tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + INTERFACE + @TF_INCLUDE_DIRS@ +) + +if(@TENSORFLOW_HAS_RELEASE@) + set_target_properties(tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + PROPERTIES + IMPORTED_LOCATION "${TENSORFLOW_INSTALL_PREFIX}/bin/tensorflow@TF_LIB_SUFFIX@.dll" + IMPORTED_IMPLIB "${TENSORFLOW_INSTALL_PREFIX}/lib/tensorflow@TF_LIB_SUFFIX@.lib" + ) + + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE + ) + set_target_properties(tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + PROPERTIES + IMPORTED_LOCATION_RELEASE "${TENSORFLOW_INSTALL_PREFIX}/bin/tensorflow@TF_LIB_SUFFIX@.dll" + IMPORTED_IMPLIB_RELEASE "${TENSORFLOW_INSTALL_PREFIX}/lib/tensorflow@TF_LIB_SUFFIX@.lib" + ) +endif() + +if(@TENSORFLOW_HAS_DEBUG@) + if(NOT @TENSORFLOW_HAS_RELEASE@) + set_target_properties(tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + PROPERTIES + IMPORTED_LOCATION "${TENSORFLOW_INSTALL_PREFIX}/debug/bin/tensorflow@TF_LIB_SUFFIX@.dll" + IMPORTED_IMPLIB "${TENSORFLOW_INSTALL_PREFIX}/debug/lib/tensorflow@TF_LIB_SUFFIX@.lib" + ) + endif() + + set_property(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG + ) + set_target_properties(tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + PROPERTIES + IMPORTED_LOCATION_DEBUG "${TENSORFLOW_INSTALL_PREFIX}/debug/bin/tensorflow@TF_LIB_SUFFIX@.dll" + IMPORTED_IMPLIB_DEBUG "${TENSORFLOW_INSTALL_PREFIX}/debug/lib/tensorflow@TF_LIB_SUFFIX@.lib" + ) +endif() + +set(tensorflow@TF_LIB_SUFFIX@_FOUND TRUE) diff --git a/externals/vcpkg/ports/tensorflow-common/tensorflow-config-windows-lib.cmake.in b/externals/vcpkg/ports/tensorflow-common/tensorflow-config-windows-lib.cmake.in new file mode 100755 index 000000000..00382b187 --- /dev/null +++ b/externals/vcpkg/ports/tensorflow-common/tensorflow-config-windows-lib.cmake.in @@ -0,0 +1,18 @@ +if(TARGET tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@) + return() +endif() + +set(tensorflow@TF_LIB_SUFFIX@_FOUND TRUE) + +# Compute the installation prefix from this tensorflow@TF_PORT_SUFFIX@-config.cmake file location. +# CMAKE_CURRENT_LIST_DIR = [vcpkg_installed_dir]/[target_triplet]/share/tensorflow@TF_PORT_SUFFIX@ +get_filename_component(TENSORFLOW_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) +# TENSORFLOW_INSTALL_PREFIX = [vcpkg_installed_dir]/[target_triplet]/share +get_filename_component(TENSORFLOW_INSTALL_PREFIX "${TENSORFLOW_INSTALL_PREFIX}" DIRECTORY) +# TENSORFLOW_INSTALL_PREFIX = [vcpkg_installed_dir]/[target_triplet] + +add_library(tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ INTERFACE IMPORTED GLOBAL) +target_include_directories(tensorflow@TF_LIB_SUFFIX@::tensorflow@TF_LIB_SUFFIX@ + INTERFACE + @TF_INCLUDE_DIRS@ +) diff --git a/externals/vcpkg/ports/tensorflow-common/vcpkg.json b/externals/vcpkg/ports/tensorflow-common/vcpkg.json new file mode 100755 index 000000000..56d7b1b3c --- /dev/null +++ b/externals/vcpkg/ports/tensorflow-common/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tensorflow-common", + "version-semver": "2.7.0", + "port-version": 2, + "description": "This meta package holds common files for the C [tensorflow] and the C++ [tensorflow-cc] API version of TensorFlow but is not installable on its own.", + "homepage": "https://github.com/tensorflow/tensorflow" +} diff --git a/externals/vcpkg/ports/tensorflow/portfile.cmake b/externals/vcpkg/ports/tensorflow/portfile.cmake new file mode 100755 index 000000000..1782730f9 --- /dev/null +++ b/externals/vcpkg/ports/tensorflow/portfile.cmake @@ -0,0 +1,21 @@ +set(TF_LIB_SUFFIX "") +set(TF_PORT_SUFFIX "") +set(TF_INCLUDE_DIRS "\${TENSORFLOW_INSTALL_PREFIX}/include") +list(APPEND CMAKE_MODULE_PATH "${CURRENT_INSTALLED_DIR}/share/tensorflow-common") +include(tensorflow-common) + +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/c_api.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/c_api_experimental.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/c_api_macros.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tensor_interface.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_attrtype.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_datatype.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_file_statistics.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_status.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_tensor.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/tf_tstring.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/eager/c_api.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c/eager") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/eager/c_api_experimental.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c/eager") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/c/eager/dlpack.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/c/eager") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/core/platform/ctstring.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/core/platform") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bazel-bin/tensorflow/include/tensorflow/core/platform/ctstring_internal.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/tensorflow/core/platform") diff --git a/externals/vcpkg/ports/tensorflow/vcpkg.json b/externals/vcpkg/ports/tensorflow/vcpkg.json new file mode 100755 index 000000000..2c00ec901 --- /dev/null +++ b/externals/vcpkg/ports/tensorflow/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "tensorflow", + "version-semver": "2.7.0", + "port-version": 2, + "description": "Library for computation using data flow graphs for scalable machine learning (C API version)", + "homepage": "https://github.com/tensorflow/tensorflow", + "supports": "!(x86 | arm | uwp)", + "dependencies": [ + "tensorflow-common" + ] +} diff --git a/externals/vcpkg/ports/tensorpipe/portfile.cmake b/externals/vcpkg/ports/tensorpipe/portfile.cmake new file mode 100755 index 000000000..5598679b6 --- /dev/null +++ b/externals/vcpkg/ports/tensorpipe/portfile.cmake @@ -0,0 +1,53 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_download_distfile(INSTALL_PACKAGE_CONFIG_PATCH + URLS "https://patch-diff.githubusercontent.com/raw/pytorch/tensorpipe/pull/435.diff" + FILENAME tensorpipe-pr-435.patch + SHA512 7bcf604a967da36b8af936f8b8ab87b442834024b0b2cb886811c15e80893be842fbee2667bbbc39886814ec9b2f4ed0c2527de51fdb7dc293b25cce515f5e4b +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO pytorch/tensorpipe + REF 52791a2fd214b2a9dc5759d36725909c1daa7f2e + SHA512 1e5faf17a7236c5506c08cb28be16069b11bb929bbca64ed9745ce4277d46739186ab7d6597da7437d90ed2d166d4c37ef2f3bceabe8083ef3adbb0e8e5f227e + PATCHES + "${INSTALL_PACKAGE_CONFIG_PATCH}" + use-vcpkg.patch + support-test.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cuda TP_USE_CUDA + cuda TP_ENABLE_CUDA_IPC + pybind11 TP_BUILD_PYTHON + test TP_BUILD_TESTING +) + +if("pybind11" IN_LIST FEATURES) + vcpkg_find_acquire_program(PYTHON3) + list(APPEND FEATURE_OPTIONS -DPYTHON_EXECUTABLE=${PYTHON3}) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DTP_ENABLE_SHM=${VCPKG_TARGET_IS_LINUX} + -DTP_ENABLE_IBV=OFF + -DTP_ENABLE_CMA=OFF + -DTP_BUILD_LIBUV=OFF # will use libuv package + -DTP_ENABLE_CUDA_GDR=OFF + MAYBE_UNUSED_VARIABLES + TP_ENABLE_CUDA_GDR + TP_ENABLE_CUDA_IPC +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/Tensorpipe") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) diff --git a/externals/vcpkg/ports/tensorpipe/support-test.patch b/externals/vcpkg/ports/tensorpipe/support-test.patch new file mode 100755 index 000000000..af1280485 --- /dev/null +++ b/externals/vcpkg/ports/tensorpipe/support-test.patch @@ -0,0 +1,39 @@ +diff --git a/tensorpipe/test/CMakeLists.txt b/tensorpipe/test/CMakeLists.txt +index 53e8643..c49ada6 100644 +--- a/tensorpipe/test/CMakeLists.txt ++++ b/tensorpipe/test/CMakeLists.txt +@@ -93,25 +93,24 @@ if(TP_USE_CUDA) + channel/cuda_ipc/cuda_ipc_test.cc + ) + endif() +- +- list(APPEND TP_TEST_SRCS +- channel/cuda_gdr/cuda_gdr_test.cc +- ) +- ++ if(TP_ENABLE_CUDA_GDR) ++ list(APPEND TP_TEST_SRCS ++ channel/cuda_gdr/cuda_gdr_test.cc ++ ) ++ endif() + cuda_add_library(tensorpipe_cuda_kernel channel/kernel.cu) + list(APPEND TP_TEST_LINK_LIBRARIES tensorpipe_cuda_kernel) + + list(APPEND TP_TEST_LINK_LIBRARIES tensorpipe_cuda) + endif() + +-add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/googletest +- ${PROJECT_BINARY_DIR}/third_party/googletest EXCLUDE_FROM_ALL) ++find_package(GTest CONFIG REQUIRED) + + list(APPEND TP_TEST_LINK_LIBRARIES + tensorpipe +- uv::uv +- gmock +- gtest_main) ++ unofficial::libuv::libuv ++ GTest::gmock ++ GTest::gtest_main) + + add_executable(tensorpipe_test ${TP_TEST_SRCS}) + diff --git a/externals/vcpkg/ports/tensorpipe/use-vcpkg.patch b/externals/vcpkg/ports/tensorpipe/use-vcpkg.patch new file mode 100755 index 000000000..b08d2cb10 --- /dev/null +++ b/externals/vcpkg/ports/tensorpipe/use-vcpkg.patch @@ -0,0 +1,48 @@ +diff --git a/tensorpipe/CMakeLists.txt b/tensorpipe/CMakeLists.txt +index efcffc2..e167fae 100644 +--- a/tensorpipe/CMakeLists.txt ++++ b/tensorpipe/CMakeLists.txt +@@ -119,8 +119,8 @@ list(APPEND TP_PUBLIC_HDRS + transport/uv/utility.h) + + # Add uv package +-find_package(uv REQUIRED) +-list(APPEND TP_LINK_LIBRARIES uv::uv) ++find_package(unofficial-libuv CONFIG REQUIRED) ++list(APPEND TP_LINK_LIBRARIES unofficial::libuv::libuv) + + ### shm + +@@ -184,7 +184,8 @@ configure_file(config.h.in config.h) + # We should keep libnop headers private as they should not be exposed to downstream users, + # but they're currently transitively included by tensorpipe/transport/connection.h (which + # is still unclear whether it should be a public or private header). +-list(APPEND TP_INCLUDE_DIRS $) ++find_path(LIBNOP_INCLUDE_DIRS "nop/serializer.h" REQUIRED) ++list(APPEND TP_INCLUDE_DIRS $) + + + ## Target +diff --git a/tensorpipe/python/CMakeLists.txt b/tensorpipe/python/CMakeLists.txt +index b722381..688886a 100644 +--- a/tensorpipe/python/CMakeLists.txt ++++ b/tensorpipe/python/CMakeLists.txt +@@ -4,16 +4,11 @@ + # This source code is licensed under the BSD-style license found in the + # LICENSE file in the root directory of this source tree. + +-if(NOT (COMMAND pybind11_add_module)) +- add_subdirectory( +- ${PROJECT_SOURCE_DIR}/third_party/pybind11 +- ${PROJECT_BINARY_DIR}/third_party/pybind11 +- EXCLUDE_FROM_ALL) +-endif() ++find_package(pybind11 CONFIG REQUIRED) + + set(PYBIND11_CPP_STANDARD -std=c++14) + pybind11_add_module(pytensorpipe tensorpipe.cc) +-target_link_libraries(pytensorpipe PRIVATE tensorpipe) ++target_link_libraries(pytensorpipe PRIVATE tensorpipe pybind11::module) + + install(TARGETS pytensorpipe + EXPORT TensorpipeTargets diff --git a/externals/vcpkg/ports/tensorpipe/vcpkg.json b/externals/vcpkg/ports/tensorpipe/vcpkg.json new file mode 100755 index 000000000..ac5f0d271 --- /dev/null +++ b/externals/vcpkg/ports/tensorpipe/vcpkg.json @@ -0,0 +1,40 @@ +{ + "name": "tensorpipe", + "version-date": "2022-03-16", + "description": "A tensor-aware point-to-point communication primitive for machine learning", + "homepage": "https://github.com/pytorch/tensorpipe", + "license": "BSD-3-Clause", + "supports": "linux | osx", + "dependencies": [ + "libnop", + "libuv", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cuda": { + "description": "Enable support for CUDA tensors, CUDA IPC channel", + "dependencies": [ + "cuda" + ] + }, + "pybind11": { + "description": "Build Python bindings", + "dependencies": [ + "pybind11" + ] + }, + "test": { + "description": "Build with Google.Test", + "dependencies": [ + "gtest" + ] + } + } +} diff --git a/externals/vcpkg/ports/termcolor/portfile.cmake b/externals/vcpkg/ports/termcolor/portfile.cmake new file mode 100755 index 000000000..bde6d1390 --- /dev/null +++ b/externals/vcpkg/ports/termcolor/portfile.cmake @@ -0,0 +1,16 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ikalnytskyi/termcolor + REF b3cb0f365f8435588df7a6b12a82b2ac5fc1fe95 #v2.1.0 + SHA512 8a95c654b68728a2258eba1c40daf0e5cc69ba24e15e839f75341a694a20a930c042820d68c661ca1971b68dcc93f895513dc73774818b94e205a3a73199b550 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${port}/") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/termcolor/vcpkg.json b/externals/vcpkg/ports/termcolor/vcpkg.json new file mode 100755 index 000000000..8ec81e13b --- /dev/null +++ b/externals/vcpkg/ports/termcolor/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "termcolor", + "version": "2.1.0", + "description": "Termcolor is a header-only C++ library for printing colored messages to the terminal.", + "homepage": "https://github.com/ikalnytskyi/termcolor", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/tesseract/fix-tiff-linkage.patch b/externals/vcpkg/ports/tesseract/fix-tiff-linkage.patch new file mode 100755 index 000000000..f4720c022 --- /dev/null +++ b/externals/vcpkg/ports/tesseract/fix-tiff-linkage.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f154663..c07b827 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -431,7 +431,7 @@ endif() + add_executable (tesseract ${tesseractmain_src} ${tesseractmain_rsc}) + target_link_libraries (tesseract libtesseract) + if (HAVE_TIFFIO_H) +- target_link_libraries(tesseract tiff) ++ target_link_libraries(tesseract TIFF::TIFF) + endif() + + if (OPENMP_BUILD AND UNIX) diff --git a/externals/vcpkg/ports/tesseract/fix-timeval.patch b/externals/vcpkg/ports/tesseract/fix-timeval.patch new file mode 100755 index 000000000..5a3274830 --- /dev/null +++ b/externals/vcpkg/ports/tesseract/fix-timeval.patch @@ -0,0 +1,14 @@ +diff --git a/src/ccutil/ocrclass.h b/src/ccutil/ocrclass.h +index d39a6dd..3755632 100644 +--- a/src/ccutil/ocrclass.h ++++ b/src/ccutil/ocrclass.h +@@ -28,6 +28,9 @@ + + #include + #include ++#ifndef _WIN32 ++#include ++#endif + #ifdef _WIN32 + #include // for timeval + #endif diff --git a/externals/vcpkg/ports/tesseract/portfile.cmake b/externals/vcpkg/ports/tesseract/portfile.cmake new file mode 100755 index 000000000..6978f5625 --- /dev/null +++ b/externals/vcpkg/ports/tesseract/portfile.cmake @@ -0,0 +1,73 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tesseract-ocr/tesseract + REF 4.1.1 + SHA512 017723a2268be789fe98978eed02fd294968cc8050dde376dee026f56f2b99df42db935049ae5e72c4519a920e263b40af1a6a40d9942e66608145b3131a71a2 + PATCHES + fix-tiff-linkage.patch + fix-timeval.patch # Remove this patch in the next update +) + +# The built-in cmake FindICU is better +file(REMOVE "${SOURCE_PATH}/cmake/FindICU.cmake") + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + training-tools BUILD_TRAINING_TOOLS +) + +if("cpu-independed" IN_LIST FEATURES) + set(TARGET_ARCHITECTURE none) +else() + set(TARGET_ARCHITECTURE auto) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DSTATIC=${BUILD_STATIC} + -DUSE_SYSTEM_ICU=True + -DCMAKE_DISABLE_FIND_PACKAGE_LibArchive=ON + -DCMAKE_DISABLE_FIND_PACKAGE_OpenCL=ON + -DLeptonica_DIR=YES + -DTARGET_ARCHITECTURE=${TARGET_ARCHITECTURE} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH cmake) + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/tesseract/TesseractConfig.cmake" + "find_package(Leptonica REQUIRED)" +[[ +find_package(Leptonica REQUIRED) +find_package(LibArchive REQUIRED) +]] +) + +vcpkg_copy_tools(TOOL_NAMES tesseract AUTO_CLEAN) + +if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/tesseract.pc" "-ltesseract41" "-ltesseract41d") +endif() +vcpkg_fixup_pkgconfig() + +if("training-tools" IN_LIST FEATURES) + list(APPEND TRAINING_TOOLS + ambiguous_words classifier_tester combine_tessdata + cntraining dawg2wordlist mftraining shapeclustering + wordlist2dawg combine_lang_model lstmeval lstmtraining + set_unicharset_properties unicharset_extractor text2image + ) + vcpkg_copy_tools(TOOL_NAMES ${TRAINING_TOOLS} AUTO_CLEAN) +endif() + + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/tesseract/vcpkg.json b/externals/vcpkg/ports/tesseract/vcpkg.json new file mode 100755 index 000000000..6b2477d6b --- /dev/null +++ b/externals/vcpkg/ports/tesseract/vcpkg.json @@ -0,0 +1,34 @@ +{ + "name": "tesseract", + "version": "4.1.1", + "port-version": 10, + "description": "An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.", + "homepage": "https://github.com/tesseract-ocr/tesseract", + "supports": "!arm", + "dependencies": [ + "leptonica", + "libarchive", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cpu-independed": { + "description": "build on any cpu extension commands support" + }, + "training-tools": { + "description": "build training tools", + "dependencies": [ + "cairo", + "fontconfig", + "icu", + "pango" + ] + } + } +} diff --git a/externals/vcpkg/ports/tfhe/mac-fix.patch b/externals/vcpkg/ports/tfhe/mac-fix.patch new file mode 100755 index 000000000..20161feb5 --- /dev/null +++ b/externals/vcpkg/ports/tfhe/mac-fix.patch @@ -0,0 +1,13 @@ +diff --git a/src/libtfhe/fft_processors/nayuki/fft_processor_nayuki.cpp b/src/libtfhe/fft_processors/nayuki/fft_processor_nayuki.cpp +index 26de3f0..422c7f6 100644 +--- a/src/libtfhe/fft_processors/nayuki/fft_processor_nayuki.cpp ++++ b/src/libtfhe/fft_processors/nayuki/fft_processor_nayuki.cpp +@@ -12,7 +12,7 @@ FFT_Processor_nayuki::FFT_Processor_nayuki(const int N): _2N(2*N),N(N),Ns2(N/2) + tables_reverse = fft_init_reverse(_2N); + omegaxminus1 = (cplx*) malloc(sizeof(cplx) * _2N); + for (int x=0; x<_2N; x++) { +- omegaxminus1[x]=cos(x*M_PI/N)-1. + sin(x*M_PI/N) * 1i; ++ omegaxminus1[x]=cplx(cos(x*M_PI/N)-1., sin(x*M_PI/N)); // instead of cos(x*M_PI/N)-1. + sin(x*M_PI/N) * 1i + //exp(i.x.pi/N)-1 + } + } diff --git a/externals/vcpkg/ports/tfhe/portfile.cmake b/externals/vcpkg/ports/tfhe/portfile.cmake new file mode 100755 index 000000000..6eb77f140 --- /dev/null +++ b/externals/vcpkg/ports/tfhe/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tfhe/tfhe + REF v1.0.1 + SHA512 1d625eb00bf6a36fd86cfad8e1763d7030dd73d68f2422d1678f51352708e9275f0ce69c23fb0d9fec30fba00e1ca4a3df29fb4fc6dfe3b7f16e0d350aa7f170 + HEAD_REF master + PATCHES + mac-fix.patch +) + +# Workaround for https://github.com/tfhe/tfhe/issues/246 +vcpkg_replace_string("${SOURCE_PATH}/src/CMakeLists.txt" "-Wall -Werror" "") + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/src + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/tfhe/vcpkg.json b/externals/vcpkg/ports/tfhe/vcpkg.json new file mode 100755 index 000000000..9749d5d1c --- /dev/null +++ b/externals/vcpkg/ports/tfhe/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "tfhe", + "version-semver": "1.0.1", + "port-version": 3, + "description": "TFHE is open-source software distributed under the terms of the Apache 2.0 license.", + "homepage": "https://github.com/tfhe/tfhe", + "supports": "!windows" +} diff --git a/externals/vcpkg/ports/tgbot-cpp/portfile.cmake b/externals/vcpkg/ports/tgbot-cpp/portfile.cmake new file mode 100755 index 000000000..dba7d1e16 --- /dev/null +++ b/externals/vcpkg/ports/tgbot-cpp/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO reo7sp/tgbot-cpp + REF v1.3 + SHA512 1b992c7705a5f7bb081df3eb032feb78b2b5eb2e73a7be822cd12552702a4d18ac9eecbd0c842f2d6c48757e91d3f8ceb5965237264b9ec18657e51c3bde7f79 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/tgbot-cpp/vcpkg.json b/externals/vcpkg/ports/tgbot-cpp/vcpkg.json new file mode 100755 index 000000000..3543ee054 --- /dev/null +++ b/externals/vcpkg/ports/tgbot-cpp/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "tgbot-cpp", + "version": "1.3", + "description": "C++14 library for Telegram bot API.", + "homepage": "https://github.com/reo7sp/tgbot-cpp", + "license": "MIT", + "dependencies": [ + "boost-algorithm", + "boost-asio", + "boost-lexical-cast", + "boost-property-tree", + "boost-system", + "boost-test", + "boost-variant", + "curl", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/tgc/CMakeLists.txt b/externals/vcpkg/ports/tgc/CMakeLists.txt new file mode 100755 index 000000000..20f5f0a1a --- /dev/null +++ b/externals/vcpkg/ports/tgc/CMakeLists.txt @@ -0,0 +1,25 @@ +cmake_minimum_required(VERSION 3.14) + +project(tgc LANGUAGES C) + +include(GNUInstallDirs) + +add_library(tgc tgc.c) + +target_include_directories( + tgc + PUBLIC + $ + $ +) + +set_target_properties(tgc PROPERTIES PUBLIC_HEADER tgc.h) + +install(TARGETS tgc EXPORT unofficial-tgc-config) + +install( + EXPORT unofficial-tgc-config + NAMESPACE unofficial::tgc:: + DESTINATION share/unofficial-tgc + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +) diff --git a/externals/vcpkg/ports/tgc/portfile.cmake b/externals/vcpkg/ports/tgc/portfile.cmake new file mode 100755 index 000000000..317146191 --- /dev/null +++ b/externals/vcpkg/ports/tgc/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO orangeduck/tgc + REF 35207051557c79ea25942c021fb18856c72af8e3 + SHA512 d56153cfb00ad4941c7c88e6cc54b54812466e95b61581e9f71e41b6200746e2143344f0d292032e92f7c90eaa60d0df91120b36e3aad0e354836df6d28e2c35 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/tgc/vcpkg.json b/externals/vcpkg/ports/tgc/vcpkg.json new file mode 100755 index 000000000..960f3fe19 --- /dev/null +++ b/externals/vcpkg/ports/tgc/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tgc", + "version-string": "2019-08-11", + "port-version": 2, + "description": "A tiny garbage collector for C", + "homepage": "https://github.com/orangeduck/tgc" +} diff --git a/externals/vcpkg/ports/tgui/fix-dependencies.patch b/externals/vcpkg/ports/tgui/fix-dependencies.patch new file mode 100755 index 000000000..ad6b7107c --- /dev/null +++ b/externals/vcpkg/ports/tgui/fix-dependencies.patch @@ -0,0 +1,27 @@ +diff --git a/src/Backends/SDL/CMakeLists.txt b/src/Backends/SDL/CMakeLists.txt +index d86f11d..1e31e21 100644 +--- a/src/Backends/SDL/CMakeLists.txt ++++ b/src/Backends/SDL/CMakeLists.txt +@@ -1,10 +1,10 @@ + list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake_modules) + +-find_package(SDL2 REQUIRED) +-find_package(SDL2_ttf REQUIRED) ++find_package(SDL2 CONFIG REQUIRED) ++find_package(sdl2-ttf CONFIG REQUIRED) + + # Link to SDL and set include and library search directories +-target_link_libraries(tgui PRIVATE SDL2::Core SDL2::TTF) ++target_link_libraries(tgui PRIVATE SDL2::SDL2 SDL2::SDL2_ttf) + + # Add the backend source files to the library + target_sources(tgui PRIVATE +@@ -19,7 +19,7 @@ target_sources(tgui PRIVATE + ) + + add_library(tgui-sdl-interface INTERFACE) +-target_link_libraries(tgui-sdl-interface INTERFACE SDL2::Core SDL2::TTF SDL2::Main) ++target_link_libraries(tgui-sdl-interface INTERFACE SDL2::SDL2 SDL2::SDL2_ttf SDL2::SDL2main) + + # Also link to OpenGL or OpenGL ES + if(NOT TGUI_USE_GLES) diff --git a/externals/vcpkg/ports/tgui/fix-usage.patch b/externals/vcpkg/ports/tgui/fix-usage.patch new file mode 100755 index 000000000..cbc43b4e7 --- /dev/null +++ b/externals/vcpkg/ports/tgui/fix-usage.patch @@ -0,0 +1,23 @@ +diff --git a/cmake/TGUIConfig.cmake.in b/cmake/TGUIConfig.cmake.in +index 63e8a45..01804cd 100644 +--- a/cmake/TGUIConfig.cmake.in ++++ b/cmake/TGUIConfig.cmake.in +@@ -44,6 +44,9 @@ + # add_executable(myapp ...) + # target_link_libraries(myapp tgui) + ++include(CMakeFindDependencyMacro) ++find_dependency(SFML COMPONENTS graphics CONFIG) ++ + set(FIND_TGUI_PATHS + "${CMAKE_CURRENT_LIST_DIR}/../.." + ${TGUI_ROOT} +@@ -58,7 +61,7 @@ set(FIND_TGUI_PATHS + /opt) + + # Choose which target definitions must be imported +-if (TGUI_STATIC_LIBRARIES) ++if (NOT @TGUI_SHARED_LIBS@) + set(TGUI_IS_FRAMEWORK_INSTALL "@TGUI_BUILD_FRAMEWORKS@") + if (TGUI_IS_FRAMEWORK_INSTALL) + message(WARNING "Static frameworks are not supported by TGUI. Clear TGUI_DIR cache entry, \ diff --git a/externals/vcpkg/ports/tgui/portfile.cmake b/externals/vcpkg/ports/tgui/portfile.cmake new file mode 100755 index 000000000..fc5fa414f --- /dev/null +++ b/externals/vcpkg/ports/tgui/portfile.cmake @@ -0,0 +1,65 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO texus/TGUI + REF 6515153c2466e6677ba933679b3dca6c283daf87 + SHA512 109e64c114336979a4bd0d44765e4bc26cb4ecb6e4db92d7441230d148438b084d01cb56dd292f09a6fd28b0f7420044455ffb519147cc3aea71e322142cd9a0 + HEAD_REF 0.9 + PATCHES + fix-usage.patch + fix-dependencies.patch +) + +set(TGUI_SHARE_PATH ${CURRENT_PACKAGES_DIR}/share/tgui) +set(TGUI_TOOLS_PATH ${CURRENT_PACKAGES_DIR}/tools/tgui) + +# Enable static build +file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindSFML.cmake") +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" TGUI_SHARED_LIBS) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + sdl2 TGUI_HAS_BACKEND_SDL + sfml TGUI_HAS_BACKEND_SFML + tool TGUI_BUILD_GUI_BUILDER +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS ${FEATURE_OPTIONS} + -DTGUI_MISC_INSTALL_PREFIX=${TGUI_SHARE_PATH} + -DTGUI_SHARED_LIBS=${TGUI_SHARED_LIBS} + -DTGUI_BACKEND=Custom + -DTGUI_BUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/TGUI) +vcpkg_copy_pdbs() + +if("tool" IN_LIST FEATURES) + message(STATUS "Check for: ${TGUI_SHARE_PATH}/gui-builder/gui-builder${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + if(EXISTS "${TGUI_SHARE_PATH}/gui-builder/gui-builder${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + file(MAKE_DIRECTORY "${TGUI_TOOLS_PATH}") + file(RENAME + "${TGUI_SHARE_PATH}/gui-builder/gui-builder${VCPKG_TARGET_EXECUTABLE_SUFFIX}" + "${TGUI_TOOLS_PATH}/gui-builder${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + # Need to copy `resources` and `themes` directories + file(COPY "${TGUI_SHARE_PATH}/gui-builder/resources" DESTINATION "${TGUI_TOOLS_PATH}") + file(COPY "${TGUI_SHARE_PATH}/gui-builder/themes" DESTINATION "${TGUI_TOOLS_PATH}") + file(REMOVE_RECURSE "${TGUI_SHARE_PATH}/gui-builder") + vcpkg_copy_tool_dependencies("${TGUI_TOOLS_PATH}") + endif() +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/TGUI/extlibs/nanosvg" "${CURRENT_PACKAGES_DIR}/include/TGUI/extlibs/glad" + "${CURRENT_PACKAGES_DIR}/include/TGUI/extlibs/stb" +) # All folders are empty + +file(RENAME "${CURRENT_PACKAGES_DIR}/share/doc" "${CURRENT_PACKAGES_DIR}/share/${PORT}/doc") + +vcpkg_fixup_pkgconfig() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/tgui/vcpkg.json b/externals/vcpkg/ports/tgui/vcpkg.json new file mode 100755 index 000000000..2dce59186 --- /dev/null +++ b/externals/vcpkg/ports/tgui/vcpkg.json @@ -0,0 +1,61 @@ +{ + "name": "tgui", + "version-date": "2021-04-19", + "port-version": 3, + "description": "TGUI is an easy to use, cross-platform, C++ GUI for SFML.", + "homepage": "https://tgui.eu", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "sdl2", + "sfml" + ], + "features": { + "sdl2": { + "description": "build the SDL backend", + "dependencies": [ + "sdl2", + "sdl2-ttf" + ] + }, + "sfml": { + "description": "build the SFML backend", + "dependencies": [ + { + "name": "glad", + "features": [ + "egl" + ], + "platform": "!android & !ios" + }, + { + "name": "opengl", + "platform": "android | ios" + }, + "sfml", + "stb" + ] + }, + "tool": { + "description": "Build GUI builder", + "dependencies": [ + { + "name": "tgui", + "features": [ + "sdl2", + "sfml" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/theia/eigen-3.4.patch b/externals/vcpkg/ports/theia/eigen-3.4.patch new file mode 100755 index 000000000..9bbd5e24b --- /dev/null +++ b/externals/vcpkg/ports/theia/eigen-3.4.patch @@ -0,0 +1,24 @@ +--- a/libraries/akaze/src/nldiffusion_functions.cpp ++++ b/libraries/akaze/src/nldiffusion_functions.cpp +@@ -222,8 +222,8 @@ void halfsample_image(const RowMatrixXf& src, RowMatrixXf& dst) { + + // Do the whole resampling in one pass by using neighboring values. First, we + // compute the borders. +- const double x_kernel_size = static_cast(src.cols()) / dst.cols(); +- const double y_kernel_size = static_cast(src.rows()) / dst.rows(); ++ const int x_kernel_size = static_cast(src.cols()) / dst.cols(); ++ const int y_kernel_size = static_cast(src.rows()) / dst.rows(); + + // Do simple linear interpolation. + if (x_kernel_size == 2 && y_kernel_size == 2) { +@@ -237,8 +237,8 @@ void halfsample_image(const RowMatrixXf& src, RowMatrixXf& dst) { + return; + } + +- const double x_kernel_clamped_size = static_cast(ceil(x_kernel_size)); +- const double y_kernel_clamped_size = static_cast(ceil(y_kernel_size)); ++ const int x_kernel_clamped_size = static_cast(ceil(static_cast(src.cols()) / dst.cols())); ++ const int y_kernel_clamped_size = static_cast(ceil(static_cast(src.rows()) / dst.rows())); + + // Set up precomputed factor matrices. + Eigen::RowVectorXf x_kernel_mul(static_cast(x_kernel_clamped_size)), diff --git a/externals/vcpkg/ports/theia/fix-external-dependencies.patch b/externals/vcpkg/ports/theia/fix-external-dependencies.patch new file mode 100755 index 000000000..fc6e540f3 --- /dev/null +++ b/externals/vcpkg/ports/theia/fix-external-dependencies.patch @@ -0,0 +1,458 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9c1b150..1adbfed 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -105,10 +105,10 @@ add_definitions(-DTHEIA_DATA_DIR="${CMAKE_SOURCE_DIR}/data") + + # Eigen + set(MIN_EIGEN_VERSION 3.2.0) +-find_package(Eigen ${MIN_EIGEN_VERSION} REQUIRED) +-if (EIGEN_FOUND) +- message("-- Found Eigen version ${EIGEN_VERSION}: ${EIGEN_INCLUDE_DIRS}") +-endif (EIGEN_FOUND) ++find_package(Eigen3 ${MIN_EIGEN_VERSION} REQUIRED) ++if (EIGEN3_FOUND) ++ message("-- Found Eigen version ${EIGEN3_VERSION}: ${EIGEN3_INCLUDE_DIRS}") ++endif (EIGEN3_FOUND) + + # Use a larger inlining threshold for Clang, since it hobbles Eigen, + # resulting in an unreasonably slow version of the blas routines. The +@@ -129,70 +129,27 @@ endif () + + # GFlags. The namespace patch is borrow from Ceres Solver (see license in + # FindGflags.cmake) ++message("-- Check for Google Flags") + find_package(Gflags REQUIRED) +-if (GFLAGS_FOUND) +- message("-- Found Google Flags: ${GFLAGS_INCLUDE_DIRS} in namespace: ${GFLAGS_NAMESPACE}") +- add_definitions(-DTHEIA_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE}) +-else (GFLAGS_FOUND) +- message(FATAL_ERROR "Can't find Google FLAGS.") +-endif (GFLAGS_FOUND) + + # Google Logging + message("-- Check for Google Log") + find_package(Glog REQUIRED) +-if (GLOG_FOUND) +- message("-- Found Google Logging: ${GLOG_INCLUDE_DIRS}") +-else (GLOG_FOUND) +- message(FATAL_ERROR "Can't find Google Logging. Please set GLOG_INCLUDE_DIR & " +- "GLOG_LIBRARY") +-endif (GLOG_FOUND) ++ ++# Flann ++message("-- Check for Flann") ++find_package(Flann REQUIRED) + + # Ceres + message("-- Check for Ceres") + find_package(Ceres REQUIRED SuiteSparse) +-if (CERES_FOUND) +- message("-- Found Ceres: ${CERES_INCLUDE_DIRS}") +-else (CERES_FOUND) +- message(FATAL_ERROR "Can't find Ceres. Please set CERES_INCLUDE_DIR & " +- "CERES_LIBRARY") +-endif (CERES_FOUND) + + # OpenImageIO + message("-- Check for OpenImageIO") + find_package(OpenImageIO REQUIRED) +-if (OPENIMAGEIO_FOUND) +- message("-- Found OpenImageIO: ${OPENIMAGEIO_INCLUDE_DIRS}") +-else (OPENIMAGEIO_FOUND) +- message(FATAL_ERROR "Can't find OpenImageIO. Please set OPENIMAGEIO_INCLUDE_DIR & " +- "OPENIMAGEIO_LIBRARY") +-endif (OPENIMAGEIO_FOUND) + + # Suitesparse + find_package(SuiteSparse REQUIRED) +-if (SUITESPARSE_FOUND) +- # On Ubuntu the system install of SuiteSparse (v3.4.0) up to at least +- # Ubuntu 13.10 cannot be used to link shared libraries. +- if (BUILD_SHARED_LIBS AND +- SUITESPARSE_IS_BROKEN_SHARED_LINKING_UBUNTU_SYSTEM_VERSION) +- message(FATAL_ERROR "You are attempting to build Theia as a shared " +- "library on Ubuntu using a system package install of SuiteSparse " +- "3.4.0. This package is broken and does not support the " +- "construction of shared libraries (you can still build Theia as " +- "a static library). If you wish to build a shared version of Theia " +- "you should uninstall the system install of SuiteSparse " +- "(libsuitesparse-dev) and perform a source install of SuiteSparse " +- "(we recommend that you use the latest version), " +- "see http://theia-solver.org/building.html for more information.") +- endif (BUILD_SHARED_LIBS AND +- SUITESPARSE_IS_BROKEN_SHARED_LINKING_UBUNTU_SYSTEM_VERSION) +- message("-- Found SuiteSparse ${SUITESPARSE_VERSION}") +- add_definitions(-DTHEIA_SUITESPARSE_VERSION="${SUITESPARSE_VERSION}") +-else (SUITESPARSE_FOUND) +- # Disable use of SuiteSparse if it cannot be found and continue. +- message(FATAL ERROR "Can't find SuiteSparse. This library is required " +- "for bundle adjustment and for solving convex optimization problems. " +- "Please set SUITESPARSE_INCLUDE_DIR & SUITESPARSE_LIBRARY") +-endif (SUITESPARSE_FOUND) + + include_directories( + include +@@ -225,24 +182,19 @@ include_directories( + libraries/spectra + ${akaze_SOURCE_DIR} + ${akaze_INCLUDE_DIR} +- ${cereal_SOURCE_DIR} +- ${cereal_SOURCE_DIR}/include +- ${flann_SOURCE_DIR} +- ${flann_SOURCE_DIR}/src/cpp +- ${gtest_SOURCE_DIR}/include +- ${gtest_SOURCE_DIR} + ${optimo_SOURCE_DIR} + ${statx_SOURCE_DIR} + ${stlplus3_SOURCE_DIR} + ${vlfeat_SOURCE_DIR} +- ${visual_sfm_SOURCE_DIR}) ++ ${visual_sfm_SOURCE_DIR} ++) + + list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") + include(OptimizeTheiaCompilerFlags) + optimizetheiacompilerflags() + + add_subdirectory(src/theia) +-add_subdirectory(applications) ++#add_subdirectory(applications) + + if (BUILD_DOCUMENTATION) + message("-- Documentation building is enabled") +@@ -260,7 +212,13 @@ install(FILES ${THEIA_HDRS} DESTINATION include/theia) + file(GLOB_RECURSE THEIA_INTERNAL_HDRS ${CMAKE_SOURCE_DIR}/src/theia/*.h) + install(DIRECTORY src/theia/ DESTINATION include/theia FILES_MATCHING PATTERN "*.h") + +-install(DIRECTORY libraries/ DESTINATION include/theia/libraries FILES_MATCHING PATTERN "*.h*") ++install(DIRECTORY libraries/akaze/ DESTINATION include/theia/libraries/akaze FILES_MATCHING PATTERN "*.h*") ++install(DIRECTORY libraries/optimo/ DESTINATION include/theia/libraries/optimo FILES_MATCHING PATTERN "*.h*") ++install(DIRECTORY libraries/spectra/ DESTINATION include/theia/libraries/spectra FILES_MATCHING PATTERN "*.h*") ++install(DIRECTORY libraries/statx/ DESTINATION include/theia/libraries/statx FILES_MATCHING PATTERN "*.h*") ++install(DIRECTORY libraries/stlplus3/ DESTINATION include/theia/libraries/stlplus3 FILES_MATCHING PATTERN "*.h*") ++install(DIRECTORY libraries/visual_sfm/ DESTINATION include/theia/libraries/visual_sfm FILES_MATCHING PATTERN "*.h*") ++install(DIRECTORY libraries/vlfeat/ DESTINATION include/theia/libraries/vlfeat FILES_MATCHING PATTERN "*.h*") + + # Add an uninstall target to remove all installed files. + configure_file("${CMAKE_SOURCE_DIR}/cmake/uninstall.cmake.in" +@@ -272,17 +230,10 @@ add_custom_target(uninstall + + # Set up install directories. INCLUDE_INSTALL_DIR, LIB_INSTALL_DIR and + # CMAKECONFIG_INSTALL_DIR must not be absolute paths. +-if (WIN32) +- set(INCLUDE_INSTALL_DIR Include) +- set(LIB_INSTALL_DIR Lib) +- set(CMAKECONFIG_INSTALL_DIR CMake) +- set(RELATIVE_CMAKECONFIG_INSTALL_DIR CMake) +-else () +- set(INCLUDE_INSTALL_DIR include) +- set(LIB_INSTALL_DIR lib) +- set(CMAKECONFIG_INSTALL_DIR share/Theia) +- set(RELATIVE_CMAKECONFIG_INSTALL_DIR share/Theia) +-endif () ++set(INCLUDE_INSTALL_DIR include) ++set(LIB_INSTALL_DIR lib) ++set(CMAKECONFIG_INSTALL_DIR share/theia) ++set(RELATIVE_CMAKECONFIG_INSTALL_DIR share/theia) + + # This "exports" all targets which have been put into the export set + # "TheiaExport". This means that CMake generates a file with the given +@@ -319,9 +270,5 @@ configure_file("${CMAKE_SOURCE_DIR}/cmake/TheiaConfigVersion.cmake.in" + # in the public API of Theia and should thus be present in THEIA_INCLUDE_DIRS. + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/TheiaConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/TheiaConfigVersion.cmake" +- "${CMAKE_SOURCE_DIR}/cmake/FindEigen.cmake" +- "${CMAKE_SOURCE_DIR}/cmake/FindGlog.cmake" +- "${CMAKE_SOURCE_DIR}/cmake/FindGflags.cmake" +- "${CMAKE_SOURCE_DIR}/cmake/FindOpenImageIO.cmake" +- "${CMAKE_SOURCE_DIR}/cmake/FindSuiteSparse.cmake" ++ "${CMAKE_SOURCE_DIR}/cmake/FindOpenImageIO.cmake" + DESTINATION ${CMAKECONFIG_INSTALL_DIR}) +diff --git a/cmake/TheiaConfig.cmake.in b/cmake/TheiaConfig.cmake.in +index a3ea187..7e9d912 100644 +--- a/cmake/TheiaConfig.cmake.in ++++ b/cmake/TheiaConfig.cmake.in +@@ -124,14 +124,7 @@ list(APPEND CERES_INCLUDE_DIR_HINTS @CERES_INCLUDE_DIR@) + get_filename_component(THEIA_BUILD_CERES_LIBRARY_DIR @CERES_LIBRARIES@ PATH) + list(APPEND CERES_LIBRARY_DIR_HINTS ${THEIA_BUILD_CERES_LIBRARY_DIR}) + # Search quietly s/t we control the timing of the error message if not found. +-find_package(Ceres QUIET) +-if (CERES_FOUND) +- message(STATUS "Found required Theia dependency: " +- "Ceres in ${CERES_INCLUDE_DIRS}") +-else (CERES_FOUND) +- theia_report_not_found("Missing required Theia " +- "dependency: Ceres, please set CERES_INCLUDE_DIR.") +-endif (CERES_FOUND) ++find_package(Ceres REQUIRED) + list(APPEND THEIA_INCLUDE_DIRS ${CERES_INCLUDE_DIRS}) + + # Glog. +@@ -140,64 +133,19 @@ list(APPEND GLOG_INCLUDE_DIR_HINTS @GLOG_INCLUDE_DIR@) + get_filename_component(THEIA_BUILD_GLOG_LIBRARY_DIR @GLOG_LIBRARY@ PATH) + list(APPEND GLOG_LIBRARY_DIR_HINTS ${THEIA_BUILD_GLOG_LIBRARY_DIR}) + # Search quietly s/t we control the timing of the error message if not found. +-find_package(Glog QUIET) +-if (GLOG_FOUND) +- message(STATUS "Found required Theia dependency: " +- "Glog in ${GLOG_INCLUDE_DIRS}") +-else (GLOG_FOUND) +- theia_report_not_found("Missing required Theia " +- "dependency: Glog, please set GLOG_INCLUDE_DIR.") +-endif (GLOG_FOUND) ++find_package(Glog REQUIRED) + list(APPEND THEIA_INCLUDE_DIRS ${GLOG_INCLUDE_DIRS}) + + # GFlags. The namespace patch is borrow from Ceres Solver (see license in + # FindGflags.cmake) +-find_package(Gflags QUIET) +-if (GFLAGS_FOUND) +- message(STATUS "Found required Theia dependency: Google Flags in " +- "${GFLAGS_INCLUDE_DIRS} in namespace: ${GFLAGS_NAMESPACE}") +- add_definitions(-DTHEIA_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE}) +-else (GFLAGS_FOUND) +- theia_report_not_found("Missing required Theia dependency: Google Flags, please set " +- "GFLAGS_INCLUDE_DIR.") +-endif (GFLAGS_FOUND) ++find_package(Gflags REQUIRED) + list(APPEND THEIA_INCLUDE_DIRS ${GFLAGS_INCLUDE_DIRS}) + + # OpenImageIO +-find_package(OpenImageIO QUIET) +-if (OPENIMAGEIO_FOUND) +- message(STATUS "Found Theia dependency: OpenImageIO in ${OPENIMAGEIO_INCLUDE_DIRS}") +-else (OPENIMAGEIO_FOUND) +- theia_report_not_found("Missing required Theia dependency: OpenImageIO. Please set " +- "OPENIMAGEIO_INCLUDE_DIR & OPENIMAGEIO_LIBRARY") +-endif (OPENIMAGEIO_FOUND) ++find_package(OpenImageIO REQUIRED) + list(APPEND THEIA_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIRS}) + +-find_package(SuiteSparse QUIET) +-if (SUITESPARSE_FOUND) +- # On Ubuntu the system install of SuiteSparse (v3.4.0) up to at least +- # Ubuntu 13.10 cannot be used to link shared libraries. +- if (BUILD_SHARED_LIBS AND +- SUITESPARSE_IS_BROKEN_SHARED_LINKING_UBUNTU_SYSTEM_VERSION) +- theia_report_not_found("You are attempting to build Theia as a shared " +- "library on Ubuntu using a system package install of SuiteSparse " +- "3.4.0. This package is broken and does not support the " +- "construction of shared libraries (you can still build Theia as " +- "a static library). If you wish to build a shared version of Theia " +- "you should uninstall the system install of SuiteSparse " +- "(libsuitesparse-dev) and perform a source install of SuiteSparse " +- "(we recommend that you use the latest version), " +- "see http://theia-solver.org/building.html for more information.") +- endif (BUILD_SHARED_LIBS AND +- SUITESPARSE_IS_BROKEN_SHARED_LINKING_UBUNTU_SYSTEM_VERSION) +- message("-- Found SuiteSparse ${SUITESPARSE_VERSION}") +- add_definitions(-DTHEIA_SUITESPARSE_VERSION="${SUITESPARSE_VERSION}") +-else (SUITESPARSE_FOUND) +- # Disable use of SuiteSparse if it cannot be found and continue. +- theia_report_not_found("Can't find SuiteSparse. This library is required " +- "for bundle adjustment and for solving convex optimization problems. " +- "Please set SUITESPARSE_INCLUDE_DIR & SUITESPARSE_LIBRARY") +-endif (SUITESPARSE_FOUND) ++find_package(SuiteSparse REQUIRED) + list(APPEND THEIA_INCLUDE_DIRS ${SUITESPARSE_INCLUDE_DIRS}) + + # Import exported Theia targets. +@@ -207,22 +155,24 @@ endif (NOT TARGET theia AND NOT Theia_BINARY_DIR) + # Set the expected XX_LIBRARIES variable for FindPackage(). + set(THEIA_LIBRARIES theia) + ++find_package(cereal REQUIRED) ++list(APPEND THEIA_LIBRARIES cereal) ++ ++find_package(Flann REQUIRED) ++list(APPEND THEIA_INCLUDE_DIRS ${FLANN_INCLUDE_DIR}) ++list(APPEND THEIA_LIBRARIES ${FLANN_LIBRARY}) ++ + # Add the libraries included with the distribution. + set(THEIA_INTERNAL_LIB_PREFIX ${THEIA_INCLUDE_DIR}/theia/libraries) + set(THEIA_INTERNAL_LIBS_INCLUDES + ${THEIA_INTERNAL_LIB_PREFIX} + ${THEIA_INTERNAL_LIB_PREFIX}/akaze +- ${THEIA_INTERNAL_LIB_PREFIX}/cereal +- ${THEIA_INTERNAL_LIB_PREFIX}/cereal/include +- ${THEIA_INTERNAL_LIB_PREFIX}/flann +- ${THEIA_INTERNAL_LIB_PREFIX}/gtest +- ${THEIA_INTERNAL_LIB_PREFIX}/gtest/include + ${THEIA_INTERNAL_LIB_PREFIX}/optimo + ${THEIA_INTERNAL_LIB_PREFIX}/spectra + ${THEIA_INTERNAL_LIB_PREFIX}/statx + ${THEIA_INTERNAL_LIB_PREFIX}/stlplus3 +- ${THEIA_INTERNAL_LIB_PREFIX}/vlfeat +- ${THEIA_INTERNAL_LIB_PREFIX}/visual_sfm) ++ ${THEIA_INTERNAL_LIB_PREFIX}/visual_sfm ++ ${THEIA_INTERNAL_LIB_PREFIX}/vlfeat) + + list(APPEND THEIA_INCLUDE_DIRS ${THEIA_INTERNAL_LIBS_INCLUDES}) + +diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt +index 84f3829..f88d75a 100644 +--- a/libraries/CMakeLists.txt ++++ b/libraries/CMakeLists.txt +@@ -5,12 +5,6 @@ endif (${BUILD_TESTING}) + # AKAZE feature extractor. + add_subdirectory(akaze) + +-# Cereal for portable IO. +-add_subdirectory(cereal) +- +-# Flann for fast approximate nearest neighbor searches. +-add_subdirectory(flann) +- + # Add Optimo. + add_subdirectory(optimo) + +@@ -24,4 +18,4 @@ add_subdirectory(stlplus3) + add_subdirectory(vlfeat) + + # Add VisualSfM files. +-add_subdirectory(visual_sfm) +\ No newline at end of file ++add_subdirectory(visual_sfm) +diff --git a/libraries/optimo/CMakeLists.txt b/libraries/optimo/CMakeLists.txt +index 80f5e5f..ea57f1b 100644 +--- a/libraries/optimo/CMakeLists.txt ++++ b/libraries/optimo/CMakeLists.txt +@@ -67,11 +67,11 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) + + # Locations to search for Eigen + # Eigen +-find_package(Eigen REQUIRED) +-if (EIGEN_FOUND) +- message("-- Found Eigen version ${EIGEN_VERSION}: ${EIGEN_INCLUDE_DIRS}") +-endif (EIGEN_FOUND) +-include_directories(${EIGEN_INCLUDE_DIRS}) ++find_package(Eigen3 REQUIRED) ++if (EIGEN3_FOUND) ++ message("-- Found Eigen version ${EIGEN3_VERSION_STRING}: ${EIGEN3_INCLUDE_DIRS}") ++endif (EIGEN3_FOUND) ++include_directories(${EIGEN3_INCLUDE_DIRS}) + + # Setting CXX FLAGS appropriately. The code below was inspired from + # Google CERES and modified for this library. +diff --git a/libraries/statx/CMakeLists.txt b/libraries/statx/CMakeLists.txt +index 23b9e49..c58a550 100644 +--- a/libraries/statx/CMakeLists.txt ++++ b/libraries/statx/CMakeLists.txt +@@ -72,11 +72,11 @@ message("-- Default Install prefix: ${CMAKE_INSTALL_PREFIX}") + option(STATX_WITH_CERES "Enables GEV parameter estimation using Ceres" ON) + + # Eigen +-find_package(Eigen REQUIRED) +-if (EIGEN_FOUND) +- message("-- Found Eigen version ${EIGEN_VERSION}: ${EIGEN_INCLUDE_DIRS}") +-endif (EIGEN_FOUND) +-include_directories(${EIGEN_INCLUDE_DIRS}) ++find_package(Eigen3 REQUIRED) ++if (EIGEN3_FOUND) ++ message("-- Found Eigen version ${EIGEN3_VERSION_STRING}: ${EIGEN3_INCLUDE_DIRS}") ++endif (EIGEN3_FOUND) ++include_directories(${EIGEN3_INCLUDE_DIRS}) + + # Google Flags + find_package(Gflags REQUIRED) +@@ -103,7 +103,11 @@ if(STATX_WITH_CERES) + endif(CERES_FOUND) + + # BLAS +- find_package(BLAS REQUIRED) ++ if(UNIX AND NOT APPLE) ++ find_package(OpenBLAS REQUIRED) ++ else() ++ find_package(BLAS REQUIRED) ++ endif() + + # LAPACK + find_package(LAPACK REQUIRED) +@@ -129,7 +133,6 @@ set(XGAMMA_FILES ${XGAMMA_FUNCS}/asa121.cpp ${XGAMMA_FUNCS}/asa103.cpp) + + # Setting CXX FLAGS appropriately. The code below was inspired from + # Google CERES and modified for this library. +-set (CMAKE_BUILD_TYPE Release) + set (STATX_CXX_FLAGS) + + if (CMAKE_BUILD_TYPE STREQUAL "Release") +diff --git a/libraries/vlfeat/CMakeLists.txt b/libraries/vlfeat/CMakeLists.txt +index 7f4ffc7..15bca12 100644 +--- a/libraries/vlfeat/CMakeLists.txt ++++ b/libraries/vlfeat/CMakeLists.txt +@@ -18,14 +18,19 @@ set(vl_sources + vl/random.c + vl/sift.c + vl/vlad.c) ++ + set_source_files_properties(${vl_sources} PROPERTIES LANGUAGE C) + ++add_library(vlfeat ${vl_sources}) ++ + if (MSVC) +- add_definitions(-DVL_BUILD_DLL) +- add_definitions(-DVL_DISABLE_SSE2) ++ if(BUILD_SHARED_LIBS) ++ target_compile_definitions(vlfeat PRIVATE VL_BUILD_DLL) ++ target_compile_definitions(vlfeat INTERFACE BUILD_DLL) ++ endif() ++ target_compile_definitions(vlfeat PUBLIC VL_DISABLE_SSE2) + endif (MSVC) + +-add_library(vlfeat SHARED ${vl_sources}) + install(TARGETS vlfeat + EXPORT TheiaExport + RUNTIME DESTINATION bin +diff --git a/libraries/vlfeat/vl/host.h b/libraries/vlfeat/vl/host.h +index 293fe1f..0ea3d42 100644 +--- a/libraries/vlfeat/vl/host.h ++++ b/libraries/vlfeat/vl/host.h +@@ -312,27 +312,31 @@ defined(__DOXYGEN__) + #if defined(VL_COMPILER_MSC) & ! defined(__DOXYGEN__) + # define VL_UNUSED + # define VL_INLINE static __inline +-# define snprintf _snprintf + # define isnan _isnan +-# ifdef VL_BUILD_DLL ++# if defined(VL_BUILD_DLL) + # ifdef __cplusplus + # define VL_EXPORT extern "C" __declspec(dllexport) + # else + # define VL_EXPORT extern __declspec(dllexport) + # endif +-# else ++# elif defined(VL_DLL) + # ifdef __cplusplus + # define VL_EXPORT extern "C" __declspec(dllimport) + # else + # define VL_EXPORT extern __declspec(dllimport) + # endif ++# else ++# ifdef __cplusplus ++# define VL_EXPORT extern "C" ++# else ++# define VL_EXPORT extern ++# endif + # endif + #endif + + #if defined(VL_COMPILER_LCC) & ! defined(__DOXYGEN__) + # define VL_UNUSED + # define VL_INLINE static __inline +-# define snprintf _snprintf + # define isnan _isnan + VL_INLINE float fabsf(float x) { return (float) fabs((double) x) ; } + # ifdef VL_BUILD_DLL +diff --git a/src/theia/CMakeLists.txt b/src/theia/CMakeLists.txt +index 6830f71..768586d 100644 +--- a/src/theia/CMakeLists.txt ++++ b/src/theia/CMakeLists.txt +@@ -209,7 +209,6 @@ set(THEIA_LIBRARY_DEPENDENCIES + ${SUITESPARSE_LIBRARIES} + ${OPENIMAGEIO_LIBRARIES} + akaze +- flann_cpp + statx + stlplus3 + vlfeat diff --git a/externals/vcpkg/ports/theia/fix-external-dependencies2.patch b/externals/vcpkg/ports/theia/fix-external-dependencies2.patch new file mode 100755 index 000000000..f7026ba1a --- /dev/null +++ b/externals/vcpkg/ports/theia/fix-external-dependencies2.patch @@ -0,0 +1,76 @@ +diff --git a/cmake/TheiaConfig.cmake.in b/cmake/TheiaConfig.cmake.in +index 7e9d912..2a98124 100644 +--- a/cmake/TheiaConfig.cmake.in ++++ b/cmake/TheiaConfig.cmake.in +@@ -43,7 +43,7 @@ macro(THEIA_REPORT_NOT_FOUND REASON_MSG) + # use the camelcase library name, not uppercase. + if (Theia_FIND_QUIETLY) + message(STATUS "Failed to find Theia - " ${REASON_MSG} ${ARGN}) +- else (Theia_FIND_REQUIRED) ++ elseif (Theia_FIND_REQUIRED) + message(FATAL_ERROR "Failed to find Theia - " ${REASON_MSG} ${ARGN}) + else() + # Neither QUIETLY nor REQUIRED, use SEND_ERROR which emits an error +@@ -103,35 +103,35 @@ set(THEIA_INCLUDE_DIRS ${THEIA_INCLUDE_DIR}) + + # Eigen. + # Flag set during configuration and build of Theia. +-set(THEIA_EIGEN_VERSION @EIGEN_VERSION@) ++set(THEIA_EIGEN_VERSION @EIGEN3_VERSION@) + # Append the locations of Eigen when Theia was built to the search path hints. +-list(APPEND EIGEN_INCLUDE_DIR_HINTS @EIGEN_INCLUDE_DIR@) ++list(APPEND EIGEN_INCLUDE_DIR_HINTS @EIGEN3_INCLUDE_DIR@) + # Search quietly s/t we control the timing of the error message if not found. +-find_package(Eigen ${THEIA_EIGEN_VERSION} EXACT QUIET) +-if (EIGEN_FOUND) ++find_package(Eigen3 ${THEIA_EIGEN_VERSION} REQUIRED) ++if (EIGEN3_FOUND) + message(STATUS "Found required Theia dependency: " +- "Eigen version ${THEIA_EIGEN_VERSION} in ${EIGEN_INCLUDE_DIRS}") +-else (EIGEN_FOUND) ++ "Eigen version ${THEIA_EIGEN_VERSION} in ${EIGEN3_INCLUDE_DIRS}") ++else (EIGEN3_FOUND) + theia_report_not_found("Missing required Theia " + "dependency: Eigen version ${THEIA_EIGEN_VERSION}, please set " + "EIGEN_INCLUDE_DIR.") +-endif (EIGEN_FOUND) +-list(APPEND THEIA_INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}) ++endif (EIGEN3_FOUND) ++list(APPEND THEIA_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIRS}) + + # Ceres. + # Append the locations of ceres when Theia was built to the search path hints. +-list(APPEND CERES_INCLUDE_DIR_HINTS @CERES_INCLUDE_DIR@) +-get_filename_component(THEIA_BUILD_CERES_LIBRARY_DIR @CERES_LIBRARIES@ PATH) +-list(APPEND CERES_LIBRARY_DIR_HINTS ${THEIA_BUILD_CERES_LIBRARY_DIR}) ++#list(APPEND CERES_INCLUDE_DIR_HINTS @CERES_INCLUDE_DIR@) ++#get_filename_component(THEIA_BUILD_CERES_LIBRARY_DIR @CERES_LIBRARIES@ PATH) ++#list(APPEND CERES_LIBRARY_DIR_HINTS ${THEIA_BUILD_CERES_LIBRARY_DIR}) + # Search quietly s/t we control the timing of the error message if not found. + find_package(Ceres REQUIRED) + list(APPEND THEIA_INCLUDE_DIRS ${CERES_INCLUDE_DIRS}) + + # Glog. + # Append the locations of glog when Theia was built to the search path hints. +-list(APPEND GLOG_INCLUDE_DIR_HINTS @GLOG_INCLUDE_DIR@) +-get_filename_component(THEIA_BUILD_GLOG_LIBRARY_DIR @GLOG_LIBRARY@ PATH) +-list(APPEND GLOG_LIBRARY_DIR_HINTS ${THEIA_BUILD_GLOG_LIBRARY_DIR}) ++#list(APPEND GLOG_INCLUDE_DIR_HINTS @GLOG_INCLUDE_DIR@) ++#get_filename_component(THEIA_BUILD_GLOG_LIBRARY_DIR @GLOG_LIBRARY@ PATH) ++#list(APPEND GLOG_LIBRARY_DIR_HINTS ${THEIA_BUILD_GLOG_LIBRARY_DIR}) + # Search quietly s/t we control the timing of the error message if not found. + find_package(Glog REQUIRED) + list(APPEND THEIA_INCLUDE_DIRS ${GLOG_INCLUDE_DIRS}) +diff --git a/src/theia/CMakeLists.txt b/src/theia/CMakeLists.txt +index 768586d..c1f6593 100644 +--- a/src/theia/CMakeLists.txt ++++ b/src/theia/CMakeLists.txt +@@ -207,7 +207,7 @@ set(THEIA_LIBRARY_DEPENDENCIES + ${GFLAGS_LIBRARIES} + ${GLOG_LIBRARIES} + ${SUITESPARSE_LIBRARIES} +- ${OPENIMAGEIO_LIBRARIES} ++ OpenImageIO::OpenImageIO + akaze + statx + stlplus3 diff --git a/externals/vcpkg/ports/theia/portfile.cmake b/externals/vcpkg/ports/theia/portfile.cmake new file mode 100755 index 000000000..c68a4a685 --- /dev/null +++ b/externals/vcpkg/ports/theia/portfile.cmake @@ -0,0 +1,47 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sweeneychris/TheiaSfM + REF v0.8 + SHA512 2f620389c415badec36f4b44be0378fc62761dd6b2ee4cd7033b13573c372f098e248553575fb2cceb757b1ca00e86a11c67e03b6077e0a4b0f8797065746312 + HEAD_REF master + PATCHES + fix-external-dependencies.patch + fix-external-dependencies2.patch + eigen-3.4.patch +) + +file(REMOVE ${SOURCE_PATH}/cmake/FindSuiteSparse.cmake) +file(REMOVE ${SOURCE_PATH}/cmake/FindGflags.cmake) +file(REMOVE ${SOURCE_PATH}/cmake/FindGlog.cmake) +file(REMOVE ${SOURCE_PATH}/cmake/FindEigen.cmake) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DCMAKE_CXX_STANDARD=14 + -DCMAKE_CXX_EXTENSIONS=OFF + -DCMAKE_CXX_STANDARD_REQUIRED=ON + -DBUILD_TESTING=OFF + -DTHEIA_USE_EXTERNAL_CEREAL=ON + -DTHEIA_USE_EXTERNAL_FLANN=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +vcpkg_copy_pdbs() + +# Clean +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/optimo) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/optimo) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/theia/libraries/akaze/cimg/cmake-modules) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/theia/libraries/akaze/cmake) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/theia/libraries/akaze/datasets) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/theia/libraries/spectra/doxygen) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(COPY ${SOURCE_PATH}/data/camera_sensor_database_license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/externals/vcpkg/ports/theia/vcpkg.json b/externals/vcpkg/ports/theia/vcpkg.json new file mode 100755 index 000000000..c02f1aecd --- /dev/null +++ b/externals/vcpkg/ports/theia/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "theia", + "version-string": "0.8", + "port-version": 6, + "description": "An open source library for multiview geometry and structure from motion", + "homepage": "https://github.com/sweeneychris/TheiaSfM", + "dependencies": [ + "cereal", + { + "name": "ceres", + "features": [ + "suitesparse" + ] + }, + "flann", + { + "name": "freeglut", + "platform": "!osx" + }, + "glew", + "openimageio", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/think-cell-range/portfile.cmake b/externals/vcpkg/ports/think-cell-range/portfile.cmake new file mode 100755 index 000000000..2599e517d --- /dev/null +++ b/externals/vcpkg/ports/think-cell-range/portfile.cmake @@ -0,0 +1,15 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO think-cell/range + REF 498839d41519d38bb81089f7d0f517026bd042cc + SHA512 1292ba4dd994aab2cb620c24ebd03437a47e426368ed803579dad13a3fa52762cefe42c77c9921d5c4bcbd6592775714191de63097c230e50f9b59b9498005e5 + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/range DESTINATION ${CURRENT_PACKAGES_DIR}/include/think-cell FILES_MATCHING PATTERN "*.h") + +file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/think-cell-range) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/think-cell-range/COPYING ${CURRENT_PACKAGES_DIR}/share/think-cell-range/copyright) +file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/think-cell-range) + +file(COPY ${SOURCE_PATH}/range/range.example.cpp DESTINATION ${CURRENT_PACKAGES_DIR}/share/think-cell-range) diff --git a/externals/vcpkg/ports/think-cell-range/vcpkg.json b/externals/vcpkg/ports/think-cell-range/vcpkg.json new file mode 100755 index 000000000..3296cf654 --- /dev/null +++ b/externals/vcpkg/ports/think-cell-range/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "think-cell-range", + "version-string": "498839d", + "port-version": 2, + "description": "think-cell's range library", + "homepage": "https://github.com/think-cell/range", + "dependencies": [ + "boost" + ] +} diff --git a/externals/vcpkg/ports/thor/fix-dependency-sfml.patch b/externals/vcpkg/ports/thor/fix-dependency-sfml.patch new file mode 100755 index 000000000..8b6fb09da --- /dev/null +++ b/externals/vcpkg/ports/thor/fix-dependency-sfml.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 03536be..abcff44 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -115,11 +115,10 @@ set (CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/Modules/;${CMAKE_MODULE_PATH + if(NOT THOR_SHARED_LIBS) + set(SFML_STATIC_LIBRARIES TRUE) + endif() +-find_package(SFML 2 COMPONENTS audio graphics window system) ++find_package(SFML COMPONENTS system window graphics CONFIG REQUIRED) ++set(SFML_LIBRARIES sfml-system sfml-network sfml-graphics sfml-window) + +-if(SFML_FOUND) +- include_directories(${SFML_INCLUDE_DIR}) +-else() ++if(0) + set(SFML_ROOT "" CACHE PATH "SFML top-level directory") + message("\n-> SFML directory not found. Set SFML_ROOT to SFML's top-level path (containing \"include\" and \"lib\" directories).") + message("-> Make sure the SFML libraries with the same configuration (Release/Debug, Static/Dynamic) exist.\n") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 75e118e..0f90ac8 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -72,6 +72,7 @@ else() + add_library(${THOR_LIB} STATIC ${THOR_SRC}) + set_target_properties(${THOR_LIB} PROPERTIES DEBUG_POSTFIX -s-d) + set_target_properties(${THOR_LIB} PROPERTIES RELEASE_POSTFIX -s) ++ thor_link_sfml(${THOR_LIB}) + endif() + + diff --git a/externals/vcpkg/ports/thor/portfile.cmake b/externals/vcpkg/ports/thor/portfile.cmake new file mode 100755 index 000000000..c45ca4297 --- /dev/null +++ b/externals/vcpkg/ports/thor/portfile.cmake @@ -0,0 +1,56 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Bromeon/Thor + REF v2.0 + SHA512 634fa5286405d9a8a837c082ace98bbb02e609521418935855b9e2fcad57003dbe35088bd771cf6a9292e55d3787f7e463d7a4cca0d0f007509de2520d9a8cf9 + HEAD_REF master + PATCHES fix-dependency-sfml.patch +) +file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindSFML.cmake") + +file(REMOVE_RECURSE "${SOURCE_PATH}/extlibs") +file(COPY "${CURRENT_INSTALLED_DIR}/include/Aurora" DESTINATION "${SOURCE_PATH}/extlibs/aurora/include") +file(WRITE "${SOURCE_PATH}/extlibs/aurora/License.txt") + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" THOR_STATIC_STD_LIBS) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" THOR_SHARED_LIBS) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DTHOR_SHARED_LIBS=${THOR_SHARED_LIBS} + -DTHOR_STATIC_STD_LIBS=${THOR_STATIC_STD_LIBS} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Thor/Config.hpp" + "defined(SFML_STATIC)" "1" + ) +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Thor/Config.hpp" + "defined(SFML_STATIC)" "0" + ) +endif() + +file(GLOB LICENSE + "${CURRENT_PACKAGES_DIR}/debug/LicenseThor.txt" + "${CURRENT_PACKAGES_DIR}/debug/LicenseAurora.txt" + "${CURRENT_PACKAGES_DIR}/LicenseThor.txt" + "${CURRENT_PACKAGES_DIR}/LicenseAurora.txt" +) + +if(LICENSE) + file(REMOVE ${LICENSE}) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/include/Aurora") + +if(NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +endif() + +file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/thor/vcpkg.json b/externals/vcpkg/ports/thor/vcpkg.json new file mode 100755 index 000000000..17b1ad360 --- /dev/null +++ b/externals/vcpkg/ports/thor/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "thor", + "version": "2.0", + "port-version": 5, + "description": "Extends the multimedia library SFML with higher-level features", + "homepage": "www.bromeon.ch/libraries/thor", + "license": "Zlib", + "dependencies": [ + "aurora", + "sfml", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/threadpool/portfile.cmake b/externals/vcpkg/ports/threadpool/portfile.cmake new file mode 100755 index 000000000..05d47be52 --- /dev/null +++ b/externals/vcpkg/ports/threadpool/portfile.cmake @@ -0,0 +1,14 @@ +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO threadpool/threadpool + REF "0.2.5 (Stable)" + SHA512 961576b619e5227098fa37a3c8d903128b3c2a9cf1e55c057c6f9126062bcccfa6fe2510b4e8ee5d1a0e3d0425f0077c50eccad2120a423f69e2705460780e7c + FILENAME "threadpool-0_2_5-src.zip" +) + +file(INSTALL ${SOURCE_PATH}/threadpool/boost + DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +file(INSTALL ${SOURCE_PATH}/threadpool/COPYING + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright) diff --git a/externals/vcpkg/ports/threadpool/vcpkg.json b/externals/vcpkg/ports/threadpool/vcpkg.json new file mode 100755 index 000000000..3e16feecc --- /dev/null +++ b/externals/vcpkg/ports/threadpool/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "threadpool", + "version-string": "0.2.5", + "port-version": 2, + "description": "threadpool is a cross-platform C++ thread pool library. It provides a convenient way for dispatching asynchronous tasks and can be easily customized. threadpool is based on the high-quality Boost source libraries.", + "homepage": "http://threadpool.sourceforge.net/", + "dependencies": [ + "boost-thread" + ] +} diff --git a/externals/vcpkg/ports/thrift/correct-paths.patch b/externals/vcpkg/ports/thrift/correct-paths.patch new file mode 100755 index 000000000..26c21dd02 --- /dev/null +++ b/externals/vcpkg/ports/thrift/correct-paths.patch @@ -0,0 +1,15 @@ +diff --git a/build/cmake/GenerateConfigModule.cmake b/build/cmake/GenerateConfigModule.cmake +index 9533c82..d074a1b 100644 +--- a/build/cmake/GenerateConfigModule.cmake ++++ b/build/cmake/GenerateConfigModule.cmake +@@ -19,8 +19,8 @@ + + include(CMakePackageConfigHelpers) + set(PACKAGE_INCLUDE_INSTALL_DIR "${includedir}/thrift") +-set(PACKAGE_CMAKE_INSTALL_DIR "${cmakedir}/thrift") +-set(PACKAGE_BIN_INSTALL_DIR "${exec_prefix}") ++set(PACKAGE_CMAKE_INSTALL_DIR "${prefix}/share/thrift") ++set(PACKAGE_BIN_INSTALL_DIR "${prefix}/tools/thrift") + + # In CYGWIN enviroment below commands does not work properly + if (NOT CYGWIN) diff --git a/externals/vcpkg/ports/thrift/pc-suffix.patch b/externals/vcpkg/ports/thrift/pc-suffix.patch new file mode 100755 index 000000000..8fb0dc6da --- /dev/null +++ b/externals/vcpkg/ports/thrift/pc-suffix.patch @@ -0,0 +1,44 @@ +diff --git a/lib/cpp/thrift-nb.pc.in b/lib/cpp/thrift-nb.pc.in +index 2c6a96973..e99eff2bc 100644 +--- a/lib/cpp/thrift-nb.pc.in ++++ b/lib/cpp/thrift-nb.pc.in +@@ -26,5 +26,5 @@ Name: Thrift + Description: Thrift Nonblocking API + Version: @VERSION@ + Requires: thrift = @VERSION@ +-Libs: -L${libdir} -lthriftnb ++Libs: -L${libdir} -lthriftnb@THRIFT_RUNTIME_POSTFIX@ + Cflags: -I${includedir} +diff --git a/lib/cpp/thrift-qt5.pc.in b/lib/cpp/thrift-qt5.pc.in +index a8b16663e..2720bea79 100644 +--- a/lib/cpp/thrift-qt5.pc.in ++++ b/lib/cpp/thrift-qt5.pc.in +@@ -26,5 +26,5 @@ Name: Thrift + Description: Thrift Qt5 API + Version: @VERSION@ + Requires: thrift = @VERSION@ +-Libs: -L${libdir} -lthriftqt5 ++Libs: -L${libdir} -lthriftqt5@THRIFT_RUNTIME_POSTFIX@ + Cflags: -I${includedir} +diff --git a/lib/cpp/thrift-z.pc.in b/lib/cpp/thrift-z.pc.in +index 467d2e11c..cde44158a 100644 +--- a/lib/cpp/thrift-z.pc.in ++++ b/lib/cpp/thrift-z.pc.in +@@ -26,5 +26,5 @@ Name: Thrift + Description: Thrift Zlib API + Version: @VERSION@ + Requires: thrift = @VERSION@ +-Libs: -L${libdir} -lthriftz ++Libs: -L${libdir} -lthriftz@THRIFT_RUNTIME_POSTFIX@ + Cflags: -I${includedir} +diff --git a/lib/cpp/thrift.pc.in b/lib/cpp/thrift.pc.in +index d11e6db29..77da61c3e 100644 +--- a/lib/cpp/thrift.pc.in ++++ b/lib/cpp/thrift.pc.in +@@ -25,5 +25,5 @@ includedir=@includedir@ + Name: Thrift + Description: Thrift C++ API + Version: @VERSION@ +-Libs: -L${libdir} -lthrift ++Libs: -L${libdir} -lthrift@THRIFT_RUNTIME_POSTFIX@ + Cflags: -I${includedir} diff --git a/externals/vcpkg/ports/thrift/portfile.cmake b/externals/vcpkg/ports/thrift/portfile.cmake new file mode 100755 index 000000000..f9f2b70f0 --- /dev/null +++ b/externals/vcpkg/ports/thrift/portfile.cmake @@ -0,0 +1,93 @@ +# We currently insist on static only because: +# - Thrift doesn't yet support building as a DLL on Windows, +# - x64-linux only builds static anyway. +# From https://github.com/apache/thrift/blob/master/CHANGES.md +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_find_acquire_program(FLEX) +vcpkg_find_acquire_program(BISON) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO apache/thrift + REF 2a93df80f27739ccabb5b885cb12a8dc7595ecdf #0.16.0 + SHA512 aed4f60b8a4eca5b4bce26f6f29d1178684d2b4e6de290ab1e696ac78a9f85d941afe5dca99d1d22d640371ad538b930cf445f9f899a2e322f39b0cceec307a3 + HEAD_REF master + PATCHES + "correct-paths.patch" + "pc-suffix.patch" +) + +if (VCPKG_TARGET_IS_OSX) + message(WARNING "${PORT} requires bison version greater than 2.5,\n\ +please use command \`brew install bison\` to install bison") +endif() + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" shared_lib) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" static_lib) + +# note we specify values for WITH_STATIC_LIB and WITH_SHARED_LIB because even though +# they're marked as deprecated, Thrift incorrectly hard-codes a value for BUILD_SHARED_LIBS. +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + NO_CHARSET_FLAG + OPTIONS + --trace-expand + -DLIB_INSTALL_DIR:PATH=lib + -DWITH_SHARED_LIB=${shared_lib} + -DWITH_STATIC_LIB=${static_lib} + -DBUILD_TESTING=OFF + -DBUILD_JAVA=OFF + -DWITH_C_GLIB=OFF + -DBUILD_C_GLIB=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_GLIB=TRUE + -DBUILD_PYTHON=OFF + -DBUILD_CPP=ON + -DWITH_CPP=ON + -DWITH_ZLIB=ON + -DCMAKE_FIND_PACKAGE_REQUIRE_ZLIB=TRUE + -DWITH_LIBEVENT=ON + -DCMAKE_FIND_PACKAGE_REQUIRE_Libevent=TRUE + -DWITH_OPENSSL=ON + -DCMAKE_FIND_PACKAGE_REQUIRE_OpenSSL=TRUE + -DBUILD_TUTORIALS=OFF + -DFLEX_EXECUTABLE=${FLEX} + -DWITH_QT5=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_Gradle=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_Java=TRUE + -DBUILD_JAVASCRIPT=OFF + -DBUILD_NODEJS=OFF + -DBISON_EXECUTABLE=${BISON} + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_GLIB + CMAKE_DISABLE_FIND_PACKAGE_Gradle + CMAKE_FIND_PACKAGE_REQUIRE_Libevent + CMAKE_FIND_PACKAGE_REQUIRE_OpenSSL + CMAKE_FIND_PACKAGE_REQUIRE_ZLIB + +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +# Move CMake config files to the right place +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") +vcpkg_fixup_pkgconfig() + +file(GLOB COMPILER "${CURRENT_PACKAGES_DIR}/bin/thrift" "${CURRENT_PACKAGES_DIR}/bin/thrift.exe") +if(COMPILER) + vcpkg_copy_tools(TOOL_NAMES thrift AUTO_CLEAN) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/thrift/vcpkg.json b/externals/vcpkg/ports/thrift/vcpkg.json new file mode 100755 index 000000000..5b556459a --- /dev/null +++ b/externals/vcpkg/ports/thrift/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "thrift", + "version": "0.16.0", + "description": "Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible.", + "homepage": "https://github.com/apache/thrift", + "license": "Apache-2.0", + "dependencies": [ + "boost-date-time", + "boost-locale", + "boost-range", + "boost-scope-exit", + "boost-smart-ptr", + "libevent", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/tidy-html5/portfile.cmake b/externals/vcpkg/ports/tidy-html5/portfile.cmake new file mode 100755 index 000000000..350d98859 --- /dev/null +++ b/externals/vcpkg/ports/tidy-html5/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO htacg/tidy-html5 + REF d1b906991a7587688d384b648c55731f9be52506 + SHA512 ac1229f95db9ab6367d7650e27b87e76a0874e01c9d404e8c5fb75ba2761318218b658a4f7522188fda8008974393a333a8a5fbed8e3a472c98445f13e459ad5 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + NO_CHARSET_FLAG + OPTIONS + -DBUILD_SHARED_LIB=OFF + -DTIDY_CONSOLE_SHARED=OFF +) +vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/libxslt/bin") +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/tidyd.exe") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/tidyd") + +vcpkg_copy_tools(TOOL_NAMES tidy AUTO_CLEAN) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/README/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/tidy-html5/vcpkg.json b/externals/vcpkg/ports/tidy-html5/vcpkg.json new file mode 100755 index 000000000..1c16d8657 --- /dev/null +++ b/externals/vcpkg/ports/tidy-html5/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "tidy-html5", + "version": "5.7.28", + "port-version": 5, + "description": "Tidy tidies HTML and XML. It can tidy your documents by itself, and developers can easily integrate its features into even more powerful tools.", + "homepage": "https://github.com/htacg/tidy-html5", + "license": null, + "dependencies": [ + { + "name": "libxslt", + "host": true + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/tiff/FindCMath.patch b/externals/vcpkg/ports/tiff/FindCMath.patch new file mode 100755 index 000000000..9158f6fcf --- /dev/null +++ b/externals/vcpkg/ports/tiff/FindCMath.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/FindCMath.cmake b/cmake/FindCMath.cmake +index 2da3b7f..e6d5145 100644 +--- a/cmake/FindCMath.cmake ++++ b/cmake/FindCMath.cmake +@@ -32,7 +32,7 @@ include(CheckLibraryExists) + + check_symbol_exists(pow "math.h" CMath_HAVE_LIBC_POW) + if(NOT CMath_HAVE_LIBC_POW) +- find_library(CMath_LIBRARY NAMES m) ++ find_library(CMath_LIBRARY NAMES m PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) + + set(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES}) + set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${CMath_LIBRARY}) diff --git a/externals/vcpkg/ports/tiff/android-libm.patch b/externals/vcpkg/ports/tiff/android-libm.patch new file mode 100755 index 000000000..16e63feb1 --- /dev/null +++ b/externals/vcpkg/ports/tiff/android-libm.patch @@ -0,0 +1,14 @@ +diff --color -Naur v4.4.0-1eba4caf45.clean/cmake/FindCMath.cmake v4.4.0-1eba4caf45.patched/cmake/FindCMath.cmake +--- v4.4.0-1eba4caf45.clean/cmake/FindCMath.cmake 2022-06-09 13:28:09.894347027 +0200 ++++ v4.4.0-1eba4caf45.patched/cmake/FindCMath.cmake 2022-06-09 13:29:36.220230025 +0200 +@@ -31,8 +31,9 @@ + include(CheckLibraryExists) + + check_symbol_exists(pow "math.h" CMath_HAVE_LIBC_POW) ++find_library(CMath_LIBRARY NAMES m PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) ++ + if(NOT CMath_HAVE_LIBC_POW) +- find_library(CMath_LIBRARY NAMES m PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) + + set(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES}) + set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${CMath_LIBRARY}) diff --git a/externals/vcpkg/ports/tiff/cmakelists.patch b/externals/vcpkg/ports/tiff/cmakelists.patch new file mode 100755 index 000000000..0e244a09b --- /dev/null +++ b/externals/vcpkg/ports/tiff/cmakelists.patch @@ -0,0 +1,59 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 770b0fac..df44e99e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -131,16 +131,28 @@ find_package(CMath REQUIRED) + # Release support + include(Release) + ++if(MSVC) ++ add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS) ++ add_compile_options(/wd4996) ++endif() + + # Process subdirectories + add_subdirectory(port) + add_subdirectory(libtiff) ++if(BUILD_TOOLS) + add_subdirectory(tools) ++endif() ++if(BUILD_TESTS) + add_subdirectory(test) ++endif() ++if(BUILD_CONTRIB) + add_subdirectory(contrib) + add_subdirectory(build) ++endif() ++if(BUILD_DOCS) + add_subdirectory(man) + add_subdirectory(html) ++endif() + + # pkg-config support + include(PkgConfig) +diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt +index b6b31677..5c21e29f 100755 +--- a/libtiff/CMakeLists.txt ++++ b/libtiff/CMakeLists.txt +@@ -189,7 +189,7 @@ if(CXX_SUPPORT) + set(tiffxx_HEADERS + tiffio.hxx) + +- add_library(tiffxx ../placeholder.h) ++ add_library(tiffxx STATIC ../placeholder.h) + target_sources(tiffxx PRIVATE + ${tiffxx_HEADERS} + tif_stream.cxx) +@@ -217,6 +217,7 @@ if(CXX_SUPPORT) + + endif() + ++if(NOT CMAKE_CROSSCOMPILING) + add_executable(mkg3states ../placeholder.h) + target_sources(mkg3states PRIVATE mkg3states.c tif_fax3.h) + target_link_libraries(mkg3states tiff port) +@@ -226,3 +227,4 @@ add_custom_target(faxtable + COMMAND ${CMAKE_COMMAND} -E rm "tif_fax3sm.c" + COMMAND mkg3states -b -c const "tif_fax3sm.c" + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") ++endif() diff --git a/externals/vcpkg/ports/tiff/portfile.cmake b/externals/vcpkg/ports/tiff/portfile.cmake new file mode 100755 index 000000000..c974e9de9 --- /dev/null +++ b/externals/vcpkg/ports/tiff/portfile.cmake @@ -0,0 +1,95 @@ +set(LIBTIFF_VERSION 4.4.0) + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.com + OUT_SOURCE_PATH SOURCE_PATH + REPO libtiff/libtiff + REF v${LIBTIFF_VERSION} + SHA512 93955a2b802cf243e41d49048499da73862b5d3ffc005e3eddf0bf948a8bd1537f7c9e7f112e72d082549b4c49e256b9da9a3b6d8039ad8fc5c09a941b7e75d7 + HEAD_REF master + PATCHES + cmakelists.patch + FindCMath.patch + android-libm.patch +) + +set(EXTRA_OPTIONS "") +if(VCPKG_TARGET_IS_UWP) + list(APPEND EXTRA_OPTIONS "-DUSE_WIN32_FILEIO=OFF") # On UWP we use the unix I/O api. +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cxx cxx + jpeg jpeg + lzma lzma + tools BUILD_TOOLS + webp webp + zip zlib + zstd zstd +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + ${EXTRA_OPTIONS} + -DBUILD_DOCS=OFF + -DBUILD_CONTRIB=OFF + -DBUILD_TESTS=OFF + -Dlibdeflate=OFF + -Djbig=OFF # This is disabled by default due to GPL/Proprietary licensing. + -Djpeg12=OFF + -Dlerc=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=ON + -DCMAKE_DISABLE_FIND_PACKAGE_GLUT=ON + OPTIONS_DEBUG + -DCMAKE_DEBUG_POSTFIX=d # tiff sets "d" for MSVC only. +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libtiff-4.pc") +if(EXISTS "${_file}") + vcpkg_replace_string("${_file}" "-ltiff" "-ltiffd") +endif() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share" +) + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +if ("tools" IN_LIST FEATURES) + set(_tools + fax2ps + fax2tiff + pal2rgb + ppm2tiff + raw2tiff + tiff2bw + tiff2pdf + tiff2ps + tiff2rgba + tiffcmp + tiffcp + tiffcrop + tiffdither + tiffdump + tiffinfo + tiffmedian + tiffset + tiffsplit + ) + vcpkg_copy_tools(TOOL_NAMES ${_tools} AUTO_CLEAN) +elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/tiff/vcpkg-cmake-wrapper.cmake.in b/externals/vcpkg/ports/tiff/vcpkg-cmake-wrapper.cmake.in new file mode 100755 index 000000000..1acf30fad --- /dev/null +++ b/externals/vcpkg/ports/tiff/vcpkg-cmake-wrapper.cmake.in @@ -0,0 +1,60 @@ +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0057 NEW) +set(z_vcpkg_tiff_find_options "") +if("REQUIRED" IN_LIST ARGS) + list(APPEND z_vcpkg_tiff_find_options "REQUIRED") +endif() +if("QUIET" IN_LIST ARGS) + list(APPEND z_vcpkg_tiff_find_options "QUIET") +endif() + +_find_package(${ARGS}) + +if(TIFF_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + set(z_vcpkg_tiff_link_libraries "") + set(z_vcpkg_tiff_libraries "") + if(@webp@) + find_package(WebP CONFIG ${z_vcpkg_tiff_find_options}) + list(APPEND z_vcpkg_tiff_link_libraries WebP::WebP) + list(APPEND z_vcpkg_tiff_libraries ${WebP_LIBRARIES}) + endif() + if(@lzma@) + find_package(LibLZMA ${z_vcpkg_tiff_find_options}) + list(APPEND z_vcpkg_tiff_link_libraries LibLZMA::LibLZMA) + list(APPEND z_vcpkg_tiff_libraries ${LIBLZMA_LIBRARIES}) + endif() + if(@jpeg@) + find_package(JPEG ${z_vcpkg_tiff_find_options}) + list(APPEND z_vcpkg_tiff_link_libraries JPEG::JPEG) + list(APPEND z_vcpkg_tiff_libraries ${JPEG_LIBRARIES}) + endif() + if(@zstd@) + find_package(ZSTD CONFIG ${z_vcpkg_tiff_find_options}) + if(TARGET zstd::libzstd_shared) + set(z_vcpkg_tiff_zstd zstd::libzstd_shared) + else() + set(z_vcpkg_tiff_zstd zstd::libzstd_static) + endif() + list(APPEND z_vcpkg_tiff_link_libraries ${z_vcpkg_tiff_zstd}) + list(APPEND z_vcpkg_tiff_libraries ${z_vcpkg_tiff_zstd}) + endif() + if(@zlib@) + find_package(ZLIB ${z_vcpkg_tiff_find_options}) + list(APPEND z_vcpkg_tiff_link_libraries ZLIB::ZLIB) + list(APPEND z_vcpkg_tiff_libraries ${ZLIB_LIBRARIES}) + endif() + if(UNIX) + list(APPEND z_vcpkg_tiff_link_libraries m) + list(APPEND z_vcpkg_tiff_libraries m) + endif() + + if(TARGET TIFF::TIFF) + set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${z_vcpkg_tiff_link_libraries}) + endif() + list(APPEND TIFF_LIBRARIES ${z_vcpkg_tiff_libraries}) + unset(z_vcpkg_tiff_link_libraries) + unset(z_vcpkg_tiff_libraries) +endif() +unset(z_vcpkg_tiff_find_options) +cmake_policy(POP) diff --git a/externals/vcpkg/ports/tiff/vcpkg.json b/externals/vcpkg/ports/tiff/vcpkg.json new file mode 100755 index 000000000..5160ce19b --- /dev/null +++ b/externals/vcpkg/ports/tiff/vcpkg.json @@ -0,0 +1,62 @@ +{ + "name": "tiff", + "version": "4.4.0", + "port-version": 1, + "description": "A library that supports the manipulation of TIFF image files", + "homepage": "https://libtiff.gitlab.io/libtiff/", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "jpeg", + "lzma", + "zip" + ], + "features": { + "cxx": { + "description": "Build C++ libtiffxx library", + "supports": "!arm" + }, + "jpeg": { + "description": "Support JPEG compression in TIFF image files", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "lzma": { + "description": "Support LZMA compression in TIFF image files", + "dependencies": [ + "liblzma" + ] + }, + "tools": { + "description": "Build tools" + }, + "webp": { + "description": "Support WEBP compression in TIFF image files", + "dependencies": [ + "libwebp" + ] + }, + "zip": { + "description": "Support ZIP/deflate compression in TIFF image files", + "dependencies": [ + "zlib" + ] + }, + "zstd": { + "description": "Support ZSTD compression in TIFF image files", + "dependencies": [ + "zstd" + ] + } + } +} diff --git a/externals/vcpkg/ports/tinkerforge/CMakeLists.txt b/externals/vcpkg/ports/tinkerforge/CMakeLists.txt new file mode 100755 index 000000000..3cd991650 --- /dev/null +++ b/externals/vcpkg/ports/tinkerforge/CMakeLists.txt @@ -0,0 +1,68 @@ +cmake_minimum_required (VERSION 3.13 FATAL_ERROR) +include(GNUInstallDirs) + +if(WIN32) + set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}") +endif() + +project(tinkerforge LANGUAGES C VERSION 2.1.25) + +if(NOT CONFIG_INSTALL_DIR) + set(CONFIG_INSTALL_DIR "share/${PROJECT_NAME}/") +endif() +if(NOT INCLUDE_INSTALL_DIR) + set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}") +endif() +if(NOT TARGET_INSTALL_DIR) + set(TARGET_INSTALL_DIR "share/${PROJECT_NAME}") +endif() + + +file(GLOB CPP_FILES source/*.c) +file(GLOB H_FILES source/*.h) +file(GLOB DEF_FILE source/*.def) + +add_library(${PROJECT_NAME} ${CPP_FILES} ${H_FILES} ${DEF_FILE}) +target_include_directories(${PROJECT_NAME} PUBLIC + $ + $) + +find_package(Threads) +target_link_libraries(${PROJECT_NAME} PUBLIC Threads::Threads) + +if("${CMAKE_SYSTEM_NAME}" MATCHES "Windows") + target_link_libraries(${PROJECT_NAME} PUBLIC Ws2_32 advapi32) +endif() +##---------------------------------------------------------------------------------------## +##----- Package definition. +##---------------------------------------------------------------------------------------## +include(CMakePackageConfigHelpers) + +#Export as Package +set_target_properties (${PROJECT_NAME} PROPERTIES EXPORT_NAME ${PROJECT_NAME}) +export(TARGETS ${PROJECT_NAME} NAMESPACE ${PROJECT_NAME}:: FILE cmake/${PROJECT_NAME}Targets.cmake) +export(PACKAGE ${PROJECT_NAME}) + +#Config files for find_package +configure_package_config_file( + ${PROJECT_NAME}Config.cmake.in cmake/${PROJECT_NAME}Config.cmake + INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}/${PROJECT_NAME}Config.cmake" + PATH_VARS TARGET_INSTALL_DIR INCLUDE_INSTALL_DIR +) +write_basic_package_version_file(cmake/${PROJECT_NAME}ConfigVersion.cmake COMPATIBILITY SameMinorVersion) + +#Install the target and all it build outputs. +install (TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT Runtime + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT Development + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT Runtime + PUBLIC_HEADER DESTINATION "${INCLUDE_INSTALL_DIR}" COMPONENT Development + BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT Runtime) +#Install public headers +install(FILES ${H_FILES} DESTINATION "${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}") +#Install the config files for find_package +install(FILES "${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake" + "${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}Config.cmake" + DESTINATION "${CONFIG_INSTALL_DIR}") +#install the targets file included by the config +install(EXPORT ${PROJECT_NAME}Targets NAMESPACE ${PROJECT_NAME}:: DESTINATION "${TARGET_INSTALL_DIR}") \ No newline at end of file diff --git a/externals/vcpkg/ports/tinkerforge/portfile.cmake b/externals/vcpkg/ports/tinkerforge/portfile.cmake new file mode 100755 index 000000000..96f561ae5 --- /dev/null +++ b/externals/vcpkg/ports/tinkerforge/portfile.cmake @@ -0,0 +1,34 @@ +set(VERSION 2_1_25) + +vcpkg_download_distfile(ARCHIVE + URLS "http://download.tinkerforge.com/bindings/c/tinkerforge_c_bindings_${VERSION}.zip" + FILENAME "tinkerforge-${VERSION}.zip" + SHA512 c02b789bd466803d60aeb39a544b0aa17af811377b065a0b273bcfc15c5844f8cfe981d8143743e32bd05470c2c6af297df50924da0d2895a4cdf4bc9e9bd0b8 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF tinker-${VERSION} + NO_REMOVE_ONE_LEVEL +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/tinkerforgeConfig.cmake.in" DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets() + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share +) + +file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/tinkerforge/tinkerforgeConfig.cmake.in b/externals/vcpkg/ports/tinkerforge/tinkerforgeConfig.cmake.in new file mode 100755 index 000000000..07b771c65 --- /dev/null +++ b/externals/vcpkg/ports/tinkerforge/tinkerforgeConfig.cmake.in @@ -0,0 +1,5 @@ +@PACKAGE_INIT@ + +include ("@PACKAGE_TARGET_INSTALL_DIR@/@PROJECT_NAME@Targets.cmake") +set_and_check(TINKERFORGE_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") +check_required_components("@PROJECT_NAME@") diff --git a/externals/vcpkg/ports/tinkerforge/vcpkg.json b/externals/vcpkg/ports/tinkerforge/vcpkg.json new file mode 100755 index 000000000..bc809a76a --- /dev/null +++ b/externals/vcpkg/ports/tinkerforge/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tinkerforge", + "version": "2.1.25", + "port-version": 2, + "description": "Tinkerforge C API bindings for bricks and bricklets", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/tiny-aes-c/CMakeLists.txt b/externals/vcpkg/ports/tiny-aes-c/CMakeLists.txt new file mode 100755 index 000000000..6e3222547 --- /dev/null +++ b/externals/vcpkg/ports/tiny-aes-c/CMakeLists.txt @@ -0,0 +1,24 @@ +cmake_minimum_required(VERSION 3.14) + +project(tiny-aes-c LANGUAGES C ASM) + +include(GNUInstallDirs) + +add_library(tiny-aes-c aes.c) + +target_include_directories( + tiny-aes-c + PUBLIC + $ +) + +install(FILES aes.h aes.hpp DESTINATION include) + +install(TARGETS tiny-aes-c EXPORT unofficial-tiny-aes-c-config) + +install( + EXPORT unofficial-tiny-aes-c-config + NAMESPACE unofficial::tiny-aes-c:: + DESTINATION share/unofficial-tiny-aes-c + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +) diff --git a/externals/vcpkg/ports/tiny-aes-c/portfile.cmake b/externals/vcpkg/ports/tiny-aes-c/portfile.cmake new file mode 100755 index 000000000..80439c1e0 --- /dev/null +++ b/externals/vcpkg/ports/tiny-aes-c/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kokke/tiny-AES-c + REF ca85e00de963102d3999ea5fa865c0deff6370d3 + SHA512 538d5d9cee8cecbf801d3553f2425f8a1331b59c652c11ee56c6e46a23450c1e9a59e3e1833f4384b7a4d992a93f30635855a47e2414b9293e0d27c426b6a4f3 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/unlicense.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/tiny-aes-c/vcpkg.json b/externals/vcpkg/ports/tiny-aes-c/vcpkg.json new file mode 100755 index 000000000..d49995957 --- /dev/null +++ b/externals/vcpkg/ports/tiny-aes-c/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tiny-aes-c", + "version-string": "2019-07-31", + "port-version": 1, + "description": "Small portable AES128/192/256 in C", + "homepage": "https://github.com/kokke/tiny-AES-c" +} diff --git a/externals/vcpkg/ports/tiny-bignum-c/CMakeLists.txt b/externals/vcpkg/ports/tiny-bignum-c/CMakeLists.txt new file mode 100755 index 000000000..8891356d7 --- /dev/null +++ b/externals/vcpkg/ports/tiny-bignum-c/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.14) + +project(tiny-bignum-c LANGUAGES C) + +include(GNUInstallDirs) + +add_library(tiny-bignum-c bn.c) + +target_include_directories( + tiny-bignum-c + PUBLIC + $ +) +target_compile_definitions( + tiny-bignum-c + PRIVATE + $<$:_CRT_SECURE_NO_WARNINGS> +) +set_target_properties(tiny-bignum-c PROPERTIES PUBLIC_HEADER bn.h) + +install(TARGETS tiny-bignum-c EXPORT unofficial-tiny-bignum-c-config) + +install( + EXPORT unofficial-tiny-bignum-c-config + NAMESPACE unofficial::tiny-bignum-c:: + DESTINATION share/unofficial-tiny-bignum-c + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +) diff --git a/externals/vcpkg/ports/tiny-bignum-c/portfile.cmake b/externals/vcpkg/ports/tiny-bignum-c/portfile.cmake new file mode 100755 index 000000000..81bdd55a6 --- /dev/null +++ b/externals/vcpkg/ports/tiny-bignum-c/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kokke/tiny-bignum-c + REF e814d2b6b522ecaa67701453c492811a8adbc555 + SHA512 2cea21588d018bd74fb9a128576764feecd87364d157acee21bd37cd8890c0776b228e25580de88a0c6d723a7b8e88cb8120c8c66b3999661c707b04dffc3f5b + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/tiny-bignum-c/vcpkg.json b/externals/vcpkg/ports/tiny-bignum-c/vcpkg.json new file mode 100755 index 000000000..2d78d4dfd --- /dev/null +++ b/externals/vcpkg/ports/tiny-bignum-c/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tiny-bignum-c", + "version-string": "2019-07-31", + "port-version": 1, + "description": "Small portable multiple-precision unsigned integer arithmetic in C", + "homepage": "https://github.com/kokke/tiny-bignum-c" +} diff --git a/externals/vcpkg/ports/tiny-dnn/portfile.cmake b/externals/vcpkg/ports/tiny-dnn/portfile.cmake new file mode 100755 index 000000000..77d7fe4e4 --- /dev/null +++ b/externals/vcpkg/ports/tiny-dnn/portfile.cmake @@ -0,0 +1,13 @@ +#header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tiny-dnn/tiny-dnn + REF c0f576f5cb7b35893f62127cb7aec18f77a3bcc5 + SHA512 f2bdf8a39781e0b2e3383d9e7a4a92daa28ee32e6f390c3fb21e9b24a597a50a8ccc4b5be345c433943db4db70fd2df8922ce3f13a792a4e73cd1fdd35842acf + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/tiny_dnn DESTINATION ${CURRENT_PACKAGES_DIR}/include/) + +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/tiny-dnn) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/tiny-dnn/LICENSE ${CURRENT_PACKAGES_DIR}/share/tiny-dnn/copyright) diff --git a/externals/vcpkg/ports/tiny-dnn/vcpkg.json b/externals/vcpkg/ports/tiny-dnn/vcpkg.json new file mode 100755 index 000000000..977ae26ad --- /dev/null +++ b/externals/vcpkg/ports/tiny-dnn/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tiny-dnn", + "version-string": "2018-10-25", + "port-version": 1, + "description": "A C++14 implementation of deep learning. It is suitable for deep learning on limited computational resource.", + "homepage": "https://github.com/tiny-dnn/tiny-dnn" +} diff --git a/externals/vcpkg/ports/tiny-process-library/portfile.cmake b/externals/vcpkg/ports/tiny-process-library/portfile.cmake new file mode 100755 index 000000000..20af73f6a --- /dev/null +++ b/externals/vcpkg/ports/tiny-process-library/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.com + OUT_SOURCE_PATH SOURCE_PATH + REPO eidheim/tiny-process-library + REF v2.0.4 + SHA512 bbdd268361159b7c64cb60f29afa780ee5e57fa696f0683a55cb9824ec5985c8229a9a8217d2b9ecdd194b9a3acbbd75a1a821392361fbc85b1f6841f40c95db + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTING=OFF + -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets( + CONFIG_PATH lib/cmake/${PORT} + TARGET_PATH share/${PORT} +) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share +) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/tiny-process-library/vcpkg.json b/externals/vcpkg/ports/tiny-process-library/vcpkg.json new file mode 100755 index 000000000..e6daaf322 --- /dev/null +++ b/externals/vcpkg/ports/tiny-process-library/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "tiny-process-library", + "version-string": "2.0.4", + "port-version": 1, + "description": "A small platform independent library to create and stop new processes in C++" +} diff --git a/externals/vcpkg/ports/tiny-regex-c/CMakeLists.txt b/externals/vcpkg/ports/tiny-regex-c/CMakeLists.txt new file mode 100755 index 000000000..44c7ad710 --- /dev/null +++ b/externals/vcpkg/ports/tiny-regex-c/CMakeLists.txt @@ -0,0 +1,24 @@ +cmake_minimum_required(VERSION 3.14) + +project(tiny-regex-c LANGUAGES C) + +include(GNUInstallDirs) + +add_library(tiny-regex-c re.c) + +target_include_directories( + tiny-regex-c + PUBLIC + $ +) + +set_target_properties(tiny-regex-c PROPERTIES PUBLIC_HEADER re.h) + +install(TARGETS tiny-regex-c EXPORT unofficial-tiny-regex-c-config) + +install( + EXPORT unofficial-tiny-regex-c-config + NAMESPACE unofficial::tiny-regex-c:: + DESTINATION share/unofficial-tiny-regex-c + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +) diff --git a/externals/vcpkg/ports/tiny-regex-c/portfile.cmake b/externals/vcpkg/ports/tiny-regex-c/portfile.cmake new file mode 100755 index 000000000..4a5564cf6 --- /dev/null +++ b/externals/vcpkg/ports/tiny-regex-c/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kokke/tiny-regex-c + REF d3058f271f7a06ff298dff0a6a9a1e0753a5fa17 + SHA512 bd524c63850b08f02fa5f7725fcde85cbd9c9c6ec8a804f2570df0e04518961a758c017cdb33ebaf72df1abca42ba3b82681655404bc26e6142b5a52a0534ab4 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/tiny-regex-c/vcpkg.json b/externals/vcpkg/ports/tiny-regex-c/vcpkg.json new file mode 100755 index 000000000..c9a39a6af --- /dev/null +++ b/externals/vcpkg/ports/tiny-regex-c/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tiny-regex-c", + "version-string": "2019-07-31", + "port-version": 1, + "description": "A small regex implementation in C", + "homepage": "https://github.com/kokke/tiny-regex-c" +} diff --git a/externals/vcpkg/ports/tinycbor/CMakeLists.txt b/externals/vcpkg/ports/tinycbor/CMakeLists.txt new file mode 100755 index 000000000..b902a7df3 --- /dev/null +++ b/externals/vcpkg/ports/tinycbor/CMakeLists.txt @@ -0,0 +1,9 @@ +cmake_minimum_required(VERSION 3.20) +project(tinycbor C) + +file(GLOB sources src/cbor*.c) +list(FILTER sources EXCLUDE REGEX "cbortojson.c$") +add_library(tinycbor ${sources}) + +install(TARGETS tinycbor) +install(FILES src/cbor.h src/cborjson.h src/tinycbor-version.h DESTINATION include/tinycbor) diff --git a/externals/vcpkg/ports/tinycbor/portfile.cmake b/externals/vcpkg/ports/tinycbor/portfile.cmake new file mode 100755 index 000000000..325b4eb08 --- /dev/null +++ b/externals/vcpkg/ports/tinycbor/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO intel/tinycbor + REF v0.6.0 + SHA512 af1ed05c03d3aed56e35fdcaad3235992f96b5043b594c0246e600e4b1f085df78c5345beaac8758c2b5db2952ab83997019de5940857eecb81d84b6fb642093 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") + +vcpkg_cmake_install() + +# Remove duplicated include headers +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/tinycbor/vcpkg.json b/externals/vcpkg/ports/tinycbor/vcpkg.json new file mode 100755 index 000000000..23016c5f7 --- /dev/null +++ b/externals/vcpkg/ports/tinycbor/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "tinycbor", + "version-semver": "0.6.0", + "port-version": 1, + "description": "Concise Binary Object Representation (CBOR) Library", + "homepage": "https://github.com/intel/tinycbor", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/tinycthread/portfile.cmake b/externals/vcpkg/ports/tinycthread/portfile.cmake new file mode 100755 index 000000000..2d6c8b18b --- /dev/null +++ b/externals/vcpkg/ports/tinycthread/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tinycthread/tinycthread + REF 6957fc8383d6c7db25b60b8c849b29caab1caaee + SHA512 d8b1ad73676f90b236bef06464cfd34996e7b6676ef28cf011cfff86d63e9d6322f7b00ca15290b3f87ed40e704d5325f676440d0223a7f8716d3392a5d1345d + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DTINYCTHREAD_DISABLE_TESTS=OFF + -DTINYCTHREAD_INSTALL=ON +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(STRINGS ${SOURCE_PATH}/README.txt SOURCE_LINES) +list(SUBLIST SOURCE_LINES 70 120 SOURCE_LINES) +list(JOIN SOURCE_LINES "\n" _contents) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "${_contents}") diff --git a/externals/vcpkg/ports/tinycthread/vcpkg.json b/externals/vcpkg/ports/tinycthread/vcpkg.json new file mode 100755 index 000000000..d67a40f53 --- /dev/null +++ b/externals/vcpkg/ports/tinycthread/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tinycthread", + "version-string": "2019-08-06", + "port-version": 1, + "description": "Small, portable implementation of the C11 threads API", + "homepage": "https://tinycthread.github.io/" +} diff --git a/externals/vcpkg/ports/tinydir/portfile.cmake b/externals/vcpkg/ports/tinydir/portfile.cmake new file mode 100755 index 000000000..6f5204fe1 --- /dev/null +++ b/externals/vcpkg/ports/tinydir/portfile.cmake @@ -0,0 +1,9 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cxong/tinydir + REF 1.2.5 + SHA512 d86a8709b92c9b6847bd85b4b307a411edf30156a06557641a051f74a7c19898451616772ee53ad2d8fc6c2ea2285c4c4edf2197f36cf48ede6d539d24ebb2cf + HEAD_REF master +) +file(INSTALL "${SOURCE_PATH}/tinydir.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/tinydir" RENAME copyright) diff --git a/externals/vcpkg/ports/tinydir/vcpkg.json b/externals/vcpkg/ports/tinydir/vcpkg.json new file mode 100755 index 000000000..037891565 --- /dev/null +++ b/externals/vcpkg/ports/tinydir/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tinydir", + "version": "1.2.5", + "description": "Lightweight, portable and easy to integrate C directory and file reader", + "homepage": "https://github.com/cxong/tinydir", + "license": "BSD-2-Clause" +} diff --git a/externals/vcpkg/ports/tinyexif/portfile.cmake b/externals/vcpkg/ports/tinyexif/portfile.cmake new file mode 100755 index 000000000..5a697f13f --- /dev/null +++ b/externals/vcpkg/ports/tinyexif/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cdcseacave/TinyEXIF + REF 6e56015f56ee0f387f1b8c76e50eb35ac60372da #2022-02-15 + SHA512 46f55a163cfed2d8fadd7ac0425b190c59136252e5f60d945f6655d0a6df20ea08f272d25c66e76df4c8c0340f654cef875da12627b8bef88f8f6e875fc1bf48 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DBUILD_DEMO=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/TinyEXIF) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/tinyexif/vcpkg.json b/externals/vcpkg/ports/tinyexif/vcpkg.json new file mode 100755 index 000000000..708541d3d --- /dev/null +++ b/externals/vcpkg/ports/tinyexif/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "tinyexif", + "version-date": "2022-02-15", + "description": "tiny ISO-compliant C++ EXIF and XMP parsing library for JPEG images", + "homepage": "https://github.com/cdcseacave/TinyEXIF", + "dependencies": [ + "tinyxml2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/tinyexpr/CMakeLists.txt b/externals/vcpkg/ports/tinyexpr/CMakeLists.txt new file mode 100755 index 000000000..60f38348a --- /dev/null +++ b/externals/vcpkg/ports/tinyexpr/CMakeLists.txt @@ -0,0 +1,48 @@ +cmake_minimum_required(VERSION 3.14) + +project(tinyexpr LANGUAGES C) + +include(CheckSymbolExists) +include(GNUInstallDirs) + +if(WIN32 AND BUILD_SHARED_LIBS) + add_library(tinyexpr tinyexpr.c exports.def) +else() + add_library(tinyexpr tinyexpr.c) +endif() + +target_include_directories( + tinyexpr + PUBLIC + $ +) + +# https://stackoverflow.com/questions/32816646/can-cmake-detect-if-i-need-to-link-to-libm-when-using-pow-in-c +if(NOT POW_FUNCTION_EXISTS AND NOT NEED_LINKING_AGAINST_LIBM) + check_symbol_exists(pow "math.h" POW_FUNCTION_EXISTS) + if(NOT POW_FUNCTION_EXISTS) + unset(POW_FUNCTION_EXISTS CACHE) + list(APPEND CMAKE_REQUIRED_LIBRARIES m) + check_symbol_exists(pow "math.h" POW_FUNCTION_EXISTS) + if(POW_FUNCTION_EXISTS) + set(NEED_LINKING_AGAINST_LIBM True CACHE BOOL "" FORCE) + else() + message(FATAL_ERROR "Failed making the pow() function available") + endif() + endif() +endif() + +if(NEED_LINKING_AGAINST_LIBM) + target_link_libraries(tinyexpr PUBLIC m) +endif() + +set_target_properties(tinyexpr PROPERTIES PUBLIC_HEADER tinyexpr.h) + +install(TARGETS tinyexpr EXPORT unofficial-tinyexpr-config) + +install( + EXPORT unofficial-tinyexpr-config + NAMESPACE unofficial::tinyexpr:: + DESTINATION share/unofficial-tinyexpr + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +) diff --git a/externals/vcpkg/ports/tinyexpr/exports.def b/externals/vcpkg/ports/tinyexpr/exports.def new file mode 100755 index 000000000..a43f437d2 --- /dev/null +++ b/externals/vcpkg/ports/tinyexpr/exports.def @@ -0,0 +1,6 @@ +EXPORTS + te_compile + te_eval + te_free + te_interp + te_print diff --git a/externals/vcpkg/ports/tinyexpr/fix-issue-34.patch b/externals/vcpkg/ports/tinyexpr/fix-issue-34.patch new file mode 100755 index 000000000..000fea053 --- /dev/null +++ b/externals/vcpkg/ports/tinyexpr/fix-issue-34.patch @@ -0,0 +1,16 @@ +diff --git a/tinyexpr.c b/tinyexpr.c +index 90ed8fc..570f2fd 100755 +--- a/tinyexpr.c ++++ b/tinyexpr.c +@@ -49,6 +49,11 @@ For log = natural log uncomment the next line. */ + #define INFINITY (1.0/0.0) + #endif + ++/* https://github.com/codeplea/tinyexpr/issues/34 */ ++#ifdef _MSC_VER ++#pragma function(ceil) ++#pragma function(floor) ++#endif + + typedef double (*te_fun2)(double, double); + diff --git a/externals/vcpkg/ports/tinyexpr/portfile.cmake b/externals/vcpkg/ports/tinyexpr/portfile.cmake new file mode 100755 index 000000000..480c67a24 --- /dev/null +++ b/externals/vcpkg/ports/tinyexpr/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO codeplea/tinyexpr + REF ffb0d41b13e5f8d318db95feb071c220c134fe70 + SHA512 fe4975f8b444a50d7ba8135450a42007a81f1545eebd7775f92307b87b72bc9abee4591e56ddeb76ec9e5aa41f0852ba98c99881d671f47a58caca8bd1ca9999 + HEAD_REF master + PATCHES + fix-issue-34.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/exports.def DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/tinyexpr/vcpkg.json b/externals/vcpkg/ports/tinyexpr/vcpkg.json new file mode 100755 index 000000000..6ed72b483 --- /dev/null +++ b/externals/vcpkg/ports/tinyexpr/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tinyexpr", + "version-string": "2020-09-25", + "description": "Tiny recursive descent parser and evaluation engine in C", + "homepage": "https://codeplea.com/tinyexpr", + "license": "Zlib" +} diff --git a/externals/vcpkg/ports/tinyexr/fixtargets.patch b/externals/vcpkg/ports/tinyexr/fixtargets.patch new file mode 100755 index 000000000..e06f1831e --- /dev/null +++ b/externals/vcpkg/ports/tinyexr/fixtargets.patch @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3613642..93fb6c1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,6 +7,20 @@ set(SAMPLE_TARGET "test_tinyexr") + + project(${BUILD_TARGET} CXX) + ++set(INSTALL_BIN_DIR "bin" CACHE PATH "Path where exe and dll will be installed") ++set(INSTALL_LIB_DIR "lib" CACHE PATH "Path where lib will be installed") ++set(INSTALL_INCLUDE_DIR "include" CACHE PATH "Path where headers will be installed") ++set(INSTALL_CMAKE_DIR "share/tinyexr" CACHE PATH "Path where cmake configs will be installed") ++ ++# Make relative paths absolute (needed later on) ++set(RELATIVE_INSTALL_INCLUDE_DIR ${INSTALL_INCLUDE_DIR}) ++foreach(p LIB BIN INCLUDE CMAKE) ++ set(var INSTALL_${p}_DIR) ++ if(NOT IS_ABSOLUTE "${${var}}") ++ set(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}") ++ endif() ++endforeach() ++ + # options + option(TINYEXR_BUILD_SAMPLE "Build a sample" ON) + +@@ -60,3 +74,20 @@ if (TINYEXR_BUILD_SAMPLE) + endif(WIN32) + + endif (TINYEXR_BUILD_SAMPLE) ++ ++target_include_directories(${BUILD_TARGET} PUBLIC $ $) ++set_target_properties(${BUILD_TARGET} PROPERTIES PUBLIC_HEADER "${PROJECT_SOURCE_DIR}/tinyexr.h") ++ ++install(TARGETS ${BUILD_TARGET} EXPORT ${BUILD_TARGET}Targets ++ RUNTIME DESTINATION "${INSTALL_BIN_DIR}" ++ LIBRARY DESTINATION "${INSTALL_LIB_DIR}" ++ ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" ++ PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}" ++ COMPONENT dev ++) ++ ++install(EXPORT ${BUILD_TARGET}Targets ++ FILE ${BUILD_TARGET}Config.cmake ++ NAMESPACE unofficial::${BUILD_TARGET}:: ++ DESTINATION "${INSTALL_CMAKE_DIR}" ++) diff --git a/externals/vcpkg/ports/tinyexr/portfile.cmake b/externals/vcpkg/ports/tinyexr/portfile.cmake new file mode 100755 index 000000000..fe1dcce4f --- /dev/null +++ b/externals/vcpkg/ports/tinyexr/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO syoyo/tinyexr + REF v1.0.0 + SHA512 5c7dc7201ea57d98505ece22161dc72c284b3db1a7993e46317254dfc42b0f0e76a59227c3cc601fd8a347f0d3aedf2e5f7d7eb9434068face94f503b94711fd + HEAD_REF master + PATCHES + fixtargets.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DTINYEXR_BUILD_SAMPLE=OFF +) +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/tinyexr/vcpkg.json b/externals/vcpkg/ports/tinyexr/vcpkg.json new file mode 100755 index 000000000..a1e89b42a --- /dev/null +++ b/externals/vcpkg/ports/tinyexr/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tinyexr", + "version-string": "1.0.0", + "port-version": 1, + "description": "Library to load and save OpenEXR(.exr) images", + "homepage": "https://github.com/syoyo/tinyexr" +} diff --git a/externals/vcpkg/ports/tinyfiledialogs/CMakeLists.txt b/externals/vcpkg/ports/tinyfiledialogs/CMakeLists.txt new file mode 100755 index 000000000..c4bbfd23b --- /dev/null +++ b/externals/vcpkg/ports/tinyfiledialogs/CMakeLists.txt @@ -0,0 +1,29 @@ +cmake_minimum_required(VERSION 3.4) +project(tinyfiledialogs C) + +add_library(tinyfiledialogs tinyfiledialogs.c) + +target_include_directories(tinyfiledialogs INTERFACE $) + +install( + TARGETS tinyfiledialogs + EXPORT tinyfiledialogsConfig + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" +) +install( + FILES tinyfiledialogs.h + DESTINATION "${CMAKE_INSTALL_PREFIX}/include/tinyfiledialogs" +) + +export( + TARGETS tinyfiledialogs + NAMESPACE tinyfiledialogs:: + FILE "${CMAKE_CURRENT_BINARY_DIR}/tinyfiledialogsConfig.cmake" +) +install( + EXPORT tinyfiledialogsConfig + NAMESPACE tinyfiledialogs:: + DESTINATION share/tinyfiledialogs +) diff --git a/externals/vcpkg/ports/tinyfiledialogs/portfile.cmake b/externals/vcpkg/ports/tinyfiledialogs/portfile.cmake new file mode 100755 index 000000000..b93dec69f --- /dev/null +++ b/externals/vcpkg/ports/tinyfiledialogs/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH + FETCH_REF master + HEAD_REF master + URL https://git.code.sf.net/p/tinyfiledialogs/code + REF e11f94cd7887b101d64f74892d769f0139b5e166 +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(READ "${CURRENT_PACKAGES_DIR}/include/tinyfiledialogs/tinyfiledialogs.h" _contents) +# reads between the line "- License -" and a closing "*/" +if (NOT _contents MATCHES [[- License -(([^*]|\*[^/])*)\*/]]) + message(FATAL_ERROR "Failed to parse license from tinyfiledialogs.h") +endif() +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "${CMAKE_MATCH_1}") diff --git a/externals/vcpkg/ports/tinyfiledialogs/vcpkg.json b/externals/vcpkg/ports/tinyfiledialogs/vcpkg.json new file mode 100755 index 000000000..ca44d2c9e --- /dev/null +++ b/externals/vcpkg/ports/tinyfiledialogs/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "tinyfiledialogs", + "version": "3.8.8", + "port-version": 4, + "description": "Highly portable and cross-platform dialogs for native inputbox, passwordbox, colorpicker and more", + "homepage": "https://sourceforge.net/projects/tinyfiledialogs/", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/tinygltf/portfile.cmake b/externals/vcpkg/ports/tinygltf/portfile.cmake new file mode 100755 index 000000000..74df10d05 --- /dev/null +++ b/externals/vcpkg/ports/tinygltf/portfile.cmake @@ -0,0 +1,15 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO syoyo/tinygltf + REF v2.5.0 + SHA512 f0e9c3f385deaf3c803edea05602da1cbf173e42c6946ec06b0ec6145f7f258a2429921a1c9baf0ca48353219fedeedfe4ad4516429c970ec4c27d7538873003 + HEAD_REF master +) + +# Put the licence file where vcpkg expects it +# Copy the tinygltf header files and fix the path to json +vcpkg_replace_string("${SOURCE_PATH}/tiny_gltf.h" "#include \"json.hpp\"" "#include ") +file(INSTALL "${SOURCE_PATH}/tiny_gltf.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/tinygltf/vcpkg.json b/externals/vcpkg/ports/tinygltf/vcpkg.json new file mode 100755 index 000000000..56d6df314 --- /dev/null +++ b/externals/vcpkg/ports/tinygltf/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "tinygltf", + "version": "2.5.0", + "description": "A header only C++11 glTF 2.0 library.", + "homepage": "https://github.com/syoyo/tinygltf", + "dependencies": [ + "nlohmann-json", + "stb" + ] +} diff --git a/externals/vcpkg/ports/tinynpy/portfile.cmake b/externals/vcpkg/ports/tinynpy/portfile.cmake new file mode 100755 index 000000000..283a91b10 --- /dev/null +++ b/externals/vcpkg/ports/tinynpy/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cdcseacave/TinyNPY + REF 0a11001009cc3e8f3c95c61b92c0ce1bd52d5383 + SHA512 a5fe962e433896a5c7363808e87fca1297c98496cf6b6fd98154f4f4bc113ea213e281ebcdbceadf47fc573b6d707097f3a06cc58bf26351ebf7f935954d79c0 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DBUILD_DEMO=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/TinyNPY") + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/tinynpy RENAME copyright) diff --git a/externals/vcpkg/ports/tinynpy/vcpkg.json b/externals/vcpkg/ports/tinynpy/vcpkg.json new file mode 100755 index 000000000..438863c47 --- /dev/null +++ b/externals/vcpkg/ports/tinynpy/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "tinynpy", + "version-string": "1.0.0", + "port-version": 4, + "description": "tiny C++ loader/exporter of python numpy array NPY/NPZ files", + "dependencies": [ + "zlib" + ] +} diff --git a/externals/vcpkg/ports/tinyobjloader/portfile.cmake b/externals/vcpkg/ports/tinyobjloader/portfile.cmake new file mode 100755 index 000000000..c513670e9 --- /dev/null +++ b/externals/vcpkg/ports/tinyobjloader/portfile.cmake @@ -0,0 +1,46 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO syoyo/tinyobjloader + REF v2.0.0rc9 + SHA512 e188d6077cb19f9044da9c98c2c4284cad09f4ee745f4746d0df5b22a379d3b32fe20aa998151d6dc08e7f113f50abf80a7509d63c36de46547ce43b5fe1fa54 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + double TINYOBJLOADER_USE_DOUBLE +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCMAKE_INSTALL_DOCDIR:STRING=share/tinyobjloader + # FEATURES + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/tinyobjloader/cmake) + +if("double" IN_LIST FEATURES) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/tiny_obj_loader.h" "#ifdef TINYOBJLOADER_USE_DOUBLE" "#if 1") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/tiny_obj_loader.h" "#ifdef TINYOBJLOADER_USE_DOUBLE" "#if 0") +endif() +file( + REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share + ${CURRENT_PACKAGES_DIR}/lib/tinyobjloader + ${CURRENT_PACKAGES_DIR}/debug/lib/tinyobjloader +) + +vcpkg_copy_pdbs() + +# Put the licence file where vcpkg expects it +file(RENAME ${CURRENT_PACKAGES_DIR}/share/tinyobjloader/LICENSE ${CURRENT_PACKAGES_DIR}/share/tinyobjloader/copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/tinyobjloader/vcpkg.json b/externals/vcpkg/ports/tinyobjloader/vcpkg.json new file mode 100755 index 000000000..a37b24903 --- /dev/null +++ b/externals/vcpkg/ports/tinyobjloader/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "tinyobjloader", + "version": "2.0.0-rc9", + "description": "Tiny but powerful single file wavefront obj loader", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "double": { + "description": "enable double(64bit) precision" + } + } +} diff --git a/externals/vcpkg/ports/tinyply/fix-cmake.patch b/externals/vcpkg/ports/tinyply/fix-cmake.patch new file mode 100755 index 000000000..681e30f1f --- /dev/null +++ b/externals/vcpkg/ports/tinyply/fix-cmake.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2bd9563..4d4d9fe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -50,6 +50,8 @@ set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake") + set(targets_export_name "${PROJECT_NAME}Targets") + set(namespace "") + ++include(GNUInstallDirs) ++ + write_basic_package_version_file( + "${version_config}" + VERSION ${PROJECT_VERSION} +@@ -63,9 +65,10 @@ configure_package_config_file( + + # Install + install(TARGETS tinyply EXPORT ${targets_export_name} +- RUNTIME DESTINATION bin +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(FILES source/tinyply.h + DESTINATION include) + diff --git a/externals/vcpkg/ports/tinyply/portfile.cmake b/externals/vcpkg/ports/tinyply/portfile.cmake new file mode 100755 index 000000000..b41fdb0fe --- /dev/null +++ b/externals/vcpkg/ports/tinyply/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ddiakopoulos/tinyply + REF ca7b279fb6c9af931ffdaed96a3b11ca3ccd79ea + SHA512 d3adfe7cce849a14fd473cfd67baef0163d4e45ff32724516270d5893a18086f7ac17d87bda5c33381442766849b41516bd2c7757e97038c95af0c70d5f0edde + HEAD_REF master + PATCHES + # TODO: Remove this patch if https://github.com/ddiakopoulos/tinyply/pull/41 was accepted. + fix-cmake.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIB) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DSHARED_LIB=${SHARED_LIB} + -DBUILD_TESTS=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# License +file(READ "${SOURCE_PATH}/readme.md" readme_contents) +string(FIND "${readme_contents}" "License" license_line_pos) +string(SUBSTRING "${readme_contents}" ${license_line_pos} -1 license_contents) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "${license_contents}") + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/tinyply/vcpkg.json b/externals/vcpkg/ports/tinyply/vcpkg.json new file mode 100755 index 000000000..b369c4245 --- /dev/null +++ b/externals/vcpkg/ports/tinyply/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tinyply", + "version-string": "2020-05-22", + "port-version": 2, + "description": "C++11 ply 3d mesh format importer & exporter", + "homepage": "https://github.com/ddiakopoulos/tinyply" +} diff --git a/externals/vcpkg/ports/tinyspline/portfile.cmake b/externals/vcpkg/ports/tinyspline/portfile.cmake new file mode 100755 index 000000000..3d6dc3453 --- /dev/null +++ b/externals/vcpkg/ports/tinyspline/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO msteinbeck/tinyspline + REF v0.4.0 + SHA512 45c3e6937c0c48c3a6953cea26f31a0217a3943f5bca3b4432010b615d30d7e46081625409917a15cf88d671c1c0e0c9c3e61a65a81c842a9a36c2acd8fc6c26 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DTINYSPLINE_BUILD_EXAMPLES=OFF + -DTINYSPLINE_BUILD_TESTS=OFF + -DTINYSPLINE_BUILD_DOCS=OFF + -DTINYSPLINE_WARNINGS_AS_ERRORS=OFF + -DTINYSPLINE_INSTALL_LIBRARY_DIR=lib +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/tinyspline DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME tinysplinecxx CONFIG_PATH lib/cmake/tinysplinecxx) +vcpkg_fixup_pkgconfig() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/tinyspline/vcpkg.json b/externals/vcpkg/ports/tinyspline/vcpkg.json new file mode 100755 index 000000000..0cb155e92 --- /dev/null +++ b/externals/vcpkg/ports/tinyspline/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "tinyspline", + "version": "0.4.0", + "description": "Library for NURBS, B-Splines, and Bézier curves, allowing you to handle splines with ease", + "homepage": "https://github.com/msteinbeck/tinyspline", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/tinythread/CMakeLists.txt b/externals/vcpkg/ports/tinythread/CMakeLists.txt new file mode 100755 index 000000000..57e972132 --- /dev/null +++ b/externals/vcpkg/ports/tinythread/CMakeLists.txt @@ -0,0 +1,21 @@ +cmake_minimum_required(VERSION 3.8.0) + +project(tinythread) + +if(MSVC) + add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS) +endif() + +include_directories(source) + +add_library(tinythread source/tinythread.cpp) + +install( + TARGETS tinythread + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES source/tinythread.h source/fast_mutex.h DESTINATION include) +endif() diff --git a/externals/vcpkg/ports/tinythread/portfile.cmake b/externals/vcpkg/ports/tinythread/portfile.cmake new file mode 100755 index 000000000..7b29ab146 --- /dev/null +++ b/externals/vcpkg/ports/tinythread/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_download_distfile(ARCHIVE + URLS "http://tinythreadpp.bitsnbites.eu/files/TinyThread%2B%2B-1.1-src.tar.bz2" + FILENAME "TinyThread++-1.1.tar.bz2" + SHA512 407f54fcf3f68dd7fec25e9e0749a1803dffa5d52d606905155714d29f519b5eae64ff654b11768fecc32c0123a78c48be37c47993e0caf157a63349a2f869c6 +) + +vcpkg_extract_source_archive_ex( + ARCHIVE ${ARCHIVE} + OUT_SOURCE_PATH SOURCE_PATH +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_install_cmake() + +file(INSTALL "${SOURCE_PATH}/README.txt" DESTINATION ${CURRENT_PACKAGES_DIR}/share/tinythread RENAME copyright) diff --git a/externals/vcpkg/ports/tinythread/vcpkg.json b/externals/vcpkg/ports/tinythread/vcpkg.json new file mode 100755 index 000000000..3e45f68b0 --- /dev/null +++ b/externals/vcpkg/ports/tinythread/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tinythread", + "version-string": "1.1", + "port-version": 4, + "description": "Implements a fairly compatible subset of the C++11 thread management classes", + "homepage": "https://tinythreadpp.bitsnbites.eu/" +} diff --git a/externals/vcpkg/ports/tinytoml/portfile.cmake b/externals/vcpkg/ports/tinytoml/portfile.cmake new file mode 100755 index 000000000..6f3af53f4 --- /dev/null +++ b/externals/vcpkg/ports/tinytoml/portfile.cmake @@ -0,0 +1,14 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mayah/tinytoml + + REF 8fe890978b3390de1fc1f26c2d6bf1711c700c5a + SHA512 c7302950c94001b5376009a08181589c7fb040d7c23343e3dbbdcf37caa0ce8f4319adb1899d946ecee3bfb7079dbe46689d6016d94fc08b610ed56fb1113b81 + + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.h") + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/tinytoml RENAME copyright) diff --git a/externals/vcpkg/ports/tinytoml/vcpkg.json b/externals/vcpkg/ports/tinytoml/vcpkg.json new file mode 100755 index 000000000..f7a894c86 --- /dev/null +++ b/externals/vcpkg/ports/tinytoml/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tinytoml", + "version-string": "20180219", + "port-version": 2, + "description": "A header only C++11 library for parsing TOML.", + "homepage": "https://github.com/mayah/tinytoml" +} diff --git a/externals/vcpkg/ports/tinyutf8/fixbuild.patch b/externals/vcpkg/ports/tinyutf8/fixbuild.patch new file mode 100755 index 000000000..a2008089d --- /dev/null +++ b/externals/vcpkg/ports/tinyutf8/fixbuild.patch @@ -0,0 +1,43 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index eef0c41..5d2c0d1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,7 +1,7 @@ + cmake_minimum_required(VERSION 3.1) + project(tinyutf8) + +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 17) + + option(TINYUTF8_BUILD_STATIC "Build as static library" On) + +@@ -12,3 +12,14 @@ else() + endif() + + add_library(tinyutf8 ${LIB_BUILD_TYPE} tinyutf8.cpp) ++ ++if(MSVC) ++ ADD_DEFINITIONS(-D_UNICODE) ++endif() ++ ++install(TARGETS tinyutf8 ++ RUNTIME DESTINATION bin ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib) ++ ++install(FILES tinyutf8.h DESTINATION include) +diff --git a/tinyutf8.cpp b/tinyutf8.cpp +index ca07b1e..502312f 100644 +--- a/tinyutf8.cpp ++++ b/tinyutf8.cpp +@@ -1,6 +1,6 @@ + #include "tinyutf8.h" + + // Explicit template instantiations for utf8_string +-template struct tiny_utf8::basic_utf8_string<>; +-template extern std::ostream& operator<<( std::ostream& stream , const tiny_utf8::basic_utf8_string<>& str ); +-template extern std::istream& operator>>( std::istream& stream , tiny_utf8::basic_utf8_string<>& str ); +\ No newline at end of file ++template class tiny_utf8::basic_utf8_string<>; ++extern template std::ostream& operator<<( std::ostream& stream , const tiny_utf8::basic_utf8_string<>& str ); ++extern template std::istream& operator>>( std::istream& stream , tiny_utf8::basic_utf8_string<>& str ); diff --git a/externals/vcpkg/ports/tinyutf8/portfile.cmake b/externals/vcpkg/ports/tinyutf8/portfile.cmake new file mode 100755 index 000000000..2dad4fbaa --- /dev/null +++ b/externals/vcpkg/ports/tinyutf8/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DuffsDevice/tinyutf8 + REF 68eaf247a3761c324b1a3806a954d773dfe9106b + SHA512 e8bd51ea66a84d236be7c2028b6f3a67b5b01f0fac758729f3152542c8a6a859ddb3f72d6c5abb058c909bf84862ed816e2235cfde6bfa7edaa8026a4f7f4b2a + HEAD_REF master + PATCHES fixbuild.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" TINYUTF8_BUILD_STATIC) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DTINYUTF8_BUILD_STATIC=${TINYUTF8_BUILD_STATIC} +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENCE ${CURRENT_PACKAGES_DIR}/share/tinyutf8/copyright COPYONLY) + +# remove unneeded files +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/externals/vcpkg/ports/tinyutf8/vcpkg.json b/externals/vcpkg/ports/tinyutf8/vcpkg.json new file mode 100755 index 000000000..008757cdd --- /dev/null +++ b/externals/vcpkg/ports/tinyutf8/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "tinyutf8", + "version-string": "4.0.2", + "port-version": 1, + "description": "TINYUTF8 is a library for extremely easy integration of Unicode into an arbitrary C++11 project." +} diff --git a/externals/vcpkg/ports/tinyxml/0001_use_stl.patch b/externals/vcpkg/ports/tinyxml/0001_use_stl.patch new file mode 100755 index 000000000..a36f930ee --- /dev/null +++ b/externals/vcpkg/ports/tinyxml/0001_use_stl.patch @@ -0,0 +1,27 @@ +From 5ca492fee93015411a0f10e0b2f1d3503bf962a1 Mon Sep 17 00:00:00 2001 +From: Mikhail Paulyshka +Date: Sun, 3 Sep 2017 21:43:36 +0300 +Subject: [PATCH] enforce STL usage + +--- + tinyxml.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tinyxml.h b/tinyxml.h +index a3589e5..7195033 100644 +--- a/tinyxml.h ++++ b/tinyxml.h +@@ -43,6 +43,10 @@ distribution. + #define DEBUG + #endif + ++#ifndef TIXML_USE_STL ++#define TIXML_USE_STL ++#endif ++ + #ifdef TIXML_USE_STL + #include + #include +-- +2.12.2.windows.2 + diff --git a/externals/vcpkg/ports/tinyxml/0002_export_tinyxml.patch b/externals/vcpkg/ports/tinyxml/0002_export_tinyxml.patch new file mode 100755 index 000000000..7f09a6ec9 --- /dev/null +++ b/externals/vcpkg/ports/tinyxml/0002_export_tinyxml.patch @@ -0,0 +1,26 @@ +# User Francisco Dias +# Date 1545049386 7200 +# Mon Dec 17 10:23:06 2018 -0200 +Export tinyXML. + +diff --git a/tinyxml.h b/tinyxml.h +--- a/tinyxml.h ++++ b/tinyxml.h +@@ -38,6 +38,8 @@ + #include + #include + ++#include "tinyxml_export.h" ++ + // Help out windows: + #if defined( _DEBUG ) && !defined( DEBUG ) + #define DEBUG +@@ -414,7 +416,7 @@ + + }; + static Entity entity[ NUM_ENTITY ]; +- static bool condenseWhiteSpace; ++ static TINYXML_EXPORT bool condenseWhiteSpace; + }; + + diff --git a/externals/vcpkg/ports/tinyxml/CMakeLists.txt b/externals/vcpkg/ports/tinyxml/CMakeLists.txt new file mode 100755 index 000000000..2004da4af --- /dev/null +++ b/externals/vcpkg/ports/tinyxml/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.4) +project(tinyxml) + +set(HEADERS "tinyxml.h") + +set(SOURCES "tinyxml.cpp" + "tinyxmlerror.cpp" + "tinyxmlparser.cpp" +) + +option(BUILD_SHARED_LIBS "Build shared libs" OFF) + +add_library(unofficial-tinyxml ${SOURCES}) +target_compile_definitions(unofficial-tinyxml PRIVATE "-DTIXML_USE_STL") +set_target_properties(unofficial-tinyxml PROPERTIES OUTPUT_NAME tinyxml) + +include(GenerateExportHeader) +generate_export_header(unofficial-tinyxml BASE_NAME tinyxml) + +target_include_directories(unofficial-tinyxml + PUBLIC + $ + $ +) +install(TARGETS unofficial-tinyxml + EXPORT tinyxml-export + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin +) +install(EXPORT tinyxml-export +FILE + tinyxmlTargets.cmake +NAMESPACE + unofficial-tinyxml:: +DESTINATION + share/tinyxml +) +install(FILES ${HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/tinyxml_export.h DESTINATION include) diff --git a/externals/vcpkg/ports/tinyxml/License.txt b/externals/vcpkg/ports/tinyxml/License.txt new file mode 100755 index 000000000..2987cf75f --- /dev/null +++ b/externals/vcpkg/ports/tinyxml/License.txt @@ -0,0 +1,20 @@ +TinyXML is released under the zlib license: + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any +damages arising from the use of this software. + +Permission is granted to anyone to use this software for any +purpose, including commercial applications, and to alter it and +redistribute it freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must +not claim that you wrote the original software. If you use this +software in a product, an acknowledgment in the product documentation +would be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and +must not be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source +distribution. \ No newline at end of file diff --git a/externals/vcpkg/ports/tinyxml/portfile.cmake b/externals/vcpkg/ports/tinyxml/portfile.cmake new file mode 100755 index 000000000..1f42e4d75 --- /dev/null +++ b/externals/vcpkg/ports/tinyxml/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO tinyxml/tinyxml + REF 2.6.2 + FILENAME "tinyxml_2_6_2.tar.gz" + SHA512 133b5db06131a90ad0c2b39b0063f1c8e65e67288a7e5d67e1f7d9ba32af10dc5dfa0462f9723985ee27debe8f09a10a25d4b5a5aaff2ede979b1cebe8e59d56 + PATCHES + 0001_use_stl.patch + 0002_export_tinyxml.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/tinyxml RENAME copyright) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/tinyxml-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/tinyxml) diff --git a/externals/vcpkg/ports/tinyxml/tinyxml-config.cmake b/externals/vcpkg/ports/tinyxml/tinyxml-config.cmake new file mode 100755 index 000000000..15ad7bdc5 --- /dev/null +++ b/externals/vcpkg/ports/tinyxml/tinyxml-config.cmake @@ -0,0 +1,8 @@ +if (tinyxml_CONFIG_INCLUDED) + return() +endif() +set(tinyxml_CONFIG_INCLUDED TRUE) + +include(${CMAKE_CURRENT_LIST_DIR}/tinyxmlTargets.cmake) +set(tinyxml_LIBRARIES unofficial-tinyxml::unofficial-tinyxml) +get_target_property(tinyxml_INCLUDE_DIRS unofficial-tinyxml::unofficial-tinyxml INTERFACE_INCLUDE_DIRECTORIES) \ No newline at end of file diff --git a/externals/vcpkg/ports/tinyxml/vcpkg.json b/externals/vcpkg/ports/tinyxml/vcpkg.json new file mode 100755 index 000000000..8ee2d5d2d --- /dev/null +++ b/externals/vcpkg/ports/tinyxml/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tinyxml", + "version-string": "2.6.2", + "port-version": 8, + "description": "A simple, small, minimal, C++ XML parser that can be easily integrating into other programs.", + "homepage": "https://sourceforge.net/projects/tinyxml" +} diff --git a/externals/vcpkg/ports/tinyxml2/portfile.cmake b/externals/vcpkg/ports/tinyxml2/portfile.cmake new file mode 100755 index 000000000..424107590 --- /dev/null +++ b/externals/vcpkg/ports/tinyxml2/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO leethomason/tinyxml2 + REF 9.0.0 + SHA512 9C5CE8131984690DF302CA3E32314573B137180ED522C92FD631692979C942372A28F697FDB3D5E56BCF2D3DC596262B724D088153F3E1D721C9536F2A883367 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dtinyxml2_BUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/tinyxml2) +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/tinyxml2/vcpkg.json b/externals/vcpkg/ports/tinyxml2/vcpkg.json new file mode 100755 index 000000000..60601c5d2 --- /dev/null +++ b/externals/vcpkg/ports/tinyxml2/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "tinyxml2", + "version-semver": "9.0.0", + "port-version": 1, + "description": "A simple, small, efficient, C++ XML parser", + "homepage": "https://github.com/leethomason/tinyxml2", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/tl-expected/portfile.cmake b/externals/vcpkg/ports/tl-expected/portfile.cmake new file mode 100755 index 000000000..1c99d0741 --- /dev/null +++ b/externals/vcpkg/ports/tl-expected/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO TartanLlama/expected + REF v1.0.0 + SHA512 747ea34b5540dfcf595896332851f10c52a823ab8ba3fc8152478b0a9e8ca01f0f26827348407249827f4106ff577bd6e697ea6f749c1f21bd1f0913a621075d + HEAD_REF master +) + +vcpkg_from_github( + OUT_SOURCE_PATH TL_CMAKE_SOURCE_DIR + REPO TartanLlama/tl-cmake + REF 284c6a3f0f61823cc3871b0f193e8df699e2c4ce + SHA512 f611326d75d6e87e58cb05e91f9506b1d83e6fd3b214fe311c4c15604feabfb7a18bbf9c4b4c389a39d615eb468b1f4b15802ab9f44f334a12310cb183fa77a7 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DFETCHCONTENT_FULLY_DISCONNECTED=ON + -DFETCHCONTENT_SOURCE_DIR_TL_CMAKE=${TL_CMAKE_SOURCE_DIR} + -DEXPECTED_ENABLE_TESTS=OFF +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/tl-expected RENAME copyright) diff --git a/externals/vcpkg/ports/tl-expected/vcpkg.json b/externals/vcpkg/ports/tl-expected/vcpkg.json new file mode 100755 index 000000000..1f27474b5 --- /dev/null +++ b/externals/vcpkg/ports/tl-expected/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "tl-expected", + "version-string": "1.0.0", + "port-version": 2, + "description": "C++11/14/17 std::expected implementation with functional-style extensions" +} diff --git a/externals/vcpkg/ports/tl-function-ref/portfile.cmake b/externals/vcpkg/ports/tl-function-ref/portfile.cmake new file mode 100755 index 000000000..ea5274796 --- /dev/null +++ b/externals/vcpkg/ports/tl-function-ref/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO TartanLlama/function_ref + REF v1.0.0 + SHA512 64324049021548361caa667a5ad61a8c0acc787d3966e5b132520da99af709970e37b5a5cb71f69523b6254c9d0d8bab441356e7a25880fe53a6998067c587bd + HEAD_REF master +) + +vcpkg_from_github( + OUT_SOURCE_PATH TL_CMAKE_SOURCE_DIR + REPO TartanLlama/tl-cmake + REF 284c6a3f0f61823cc3871b0f193e8df699e2c4ce + SHA512 f611326d75d6e87e58cb05e91f9506b1d83e6fd3b214fe311c4c15604feabfb7a18bbf9c4b4c389a39d615eb468b1f4b15802ab9f44f334a12310cb183fa77a7 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DFETCHCONTENT_FULLY_DISCONNECTED=ON + -DFETCHCONTENT_SOURCE_DIR_TL_CMAKE=${TL_CMAKE_SOURCE_DIR} + -DFUNCTION_REF_ENABLE_TESTS=OFF +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/tl-function-ref RENAME copyright) diff --git a/externals/vcpkg/ports/tl-function-ref/vcpkg.json b/externals/vcpkg/ports/tl-function-ref/vcpkg.json new file mode 100755 index 000000000..e8cf323a4 --- /dev/null +++ b/externals/vcpkg/ports/tl-function-ref/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "tl-function-ref", + "version-string": "1.0.0", + "port-version": 2, + "description": "A lightweight, non-owning reference to a callable." +} diff --git a/externals/vcpkg/ports/tl-generator/portfile.cmake b/externals/vcpkg/ports/tl-generator/portfile.cmake new file mode 100755 index 000000000..1ec53ebcd --- /dev/null +++ b/externals/vcpkg/ports/tl-generator/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO TartanLlama/generator + REF a8e421f04159199f6896b09cad2bd3c6fbb2a5fb + SHA512 bb00cc0b3224813c7837175d81d7a08627dfe7a2f52c0bb8125ec7c6e8018a0a856c94463105dd04e7e20b8af9afc57c1c7228e9119174a9e621e675f8a3b447 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DGENERATOR_BUILD_TESTS=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/tl-generator/vcpkg.json b/externals/vcpkg/ports/tl-generator/vcpkg.json new file mode 100755 index 000000000..6fb847154 --- /dev/null +++ b/externals/vcpkg/ports/tl-generator/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "tl-generator", + "version-date": "2021-09-28", + "description": "Single-header, ranges-compatible generator type built on C++20 coroutines", + "homepage": "https://tl.tartanllama.xyz", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/tl-optional/portfile.cmake b/externals/vcpkg/ports/tl-optional/portfile.cmake new file mode 100755 index 000000000..bbd80307d --- /dev/null +++ b/externals/vcpkg/ports/tl-optional/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO TartanLlama/optional + REF v1.0.0 + SHA512 6e5020808650ec312f5cdf4bc92be9067dc214c2e02d635511e99b325d34c360ce360cf93e67287dba4b9c0d674f3cbae96a75b83b13374fbb1291d2bb0f078a + HEAD_REF master +) + +vcpkg_from_github( + OUT_SOURCE_PATH TL_CMAKE_SOURCE_DIR + REPO TartanLlama/tl-cmake + REF 284c6a3f0f61823cc3871b0f193e8df699e2c4ce + SHA512 f611326d75d6e87e58cb05e91f9506b1d83e6fd3b214fe311c4c15604feabfb7a18bbf9c4b4c389a39d615eb468b1f4b15802ab9f44f334a12310cb183fa77a7 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DFETCHCONTENT_FULLY_DISCONNECTED=ON + -DFETCHCONTENT_SOURCE_DIR_TL_CMAKE=${TL_CMAKE_SOURCE_DIR} + -DOPTIONAL_ENABLE_TESTS=OFF +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/tl-optional RENAME copyright) diff --git a/externals/vcpkg/ports/tl-optional/vcpkg.json b/externals/vcpkg/ports/tl-optional/vcpkg.json new file mode 100755 index 000000000..4dc6d13b7 --- /dev/null +++ b/externals/vcpkg/ports/tl-optional/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "tl-optional", + "version-string": "1.0.0", + "port-version": 2, + "description": "C++11/14/17 std::optional implementation with functional-style extensions" +} diff --git a/externals/vcpkg/ports/tl-ranges/portfile.cmake b/externals/vcpkg/ports/tl-ranges/portfile.cmake new file mode 100755 index 000000000..fff05a10d --- /dev/null +++ b/externals/vcpkg/ports/tl-ranges/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO TartanLlama/ranges + REF f1aa65d89cee16071f1f5b21e32df5f8ff0d1688 + SHA512 0b94ceba4aaa26a2aefff7837df7b832aea79a5822fb33f18ba47610aed7341ff173b23b8fe9dbf8060c144edd44ae916a3c71db440a66f3c1e8f7bdab27d767 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DRANGES_BUILD_TESTS=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/tl-ranges/vcpkg.json b/externals/vcpkg/ports/tl-ranges/vcpkg.json new file mode 100755 index 000000000..209585d34 --- /dev/null +++ b/externals/vcpkg/ports/tl-ranges/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "tl-ranges", + "version-date": "2021-12-02", + "description": "Ranges that didn't make C++20", + "homepage": "https://tl.tartanllama.xyz", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/tlx/portfile.cmake b/externals/vcpkg/ports/tlx/portfile.cmake new file mode 100755 index 000000000..2ee4ca4f3 --- /dev/null +++ b/externals/vcpkg/ports/tlx/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +# TODO: Fix .dlls not producing .lib files + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tlx/tlx + REF 903b9b35df8731496a90d8d74f8bedbad2517d9b + SHA512 17087973f2f4751538c589e9f80d2b5ea872d2e7d90659769ae3350d441bda0b64aec9a4150d01a7cf5323ce327ebd104cdca7b4a3bc4eebdf574e71e013ba6e + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DVERBOSE=1 + -DTLX_BUILD_TESTS=off + -DTLX_USE_GCOV=off + -DTLX_TRY_COMPILE_HEADERS=off + -DTLX_MORE_TESTS=off + -DTLX_BUILD_STATIC_LIBS=${BUILD_STATIC} + -DTLX_BUILD_SHARED_LIBS=${BUILD_SHARED} +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake/") +else() + vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/tlx") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/tlx/vcpkg.json b/externals/vcpkg/ports/tlx/vcpkg.json new file mode 100755 index 000000000..5433956b1 --- /dev/null +++ b/externals/vcpkg/ports/tlx/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tlx", + "version-string": "0.5.20191212", + "port-version": 2, + "description": "tlx is a collection of C++ helpers and extensions universally needed, but not found in the STL", + "homepage": "https://github.com/tlx/tlx" +} diff --git a/externals/vcpkg/ports/tmx/portfile.cmake b/externals/vcpkg/ports/tmx/portfile.cmake new file mode 100755 index 000000000..ee7616910 --- /dev/null +++ b/externals/vcpkg/ports/tmx/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO baylej/tmx + REF tmx_1.2.0 + HEAD_REF master + SHA512 cb29c67af560a1844e798d3fe2677a6b71866943b233c0700212b91de35f252a0a465c33911a2c432aa54be309e3ac10770bc95c6450227e39abe049c1fbbdd1 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/tmx) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +# Handle copyright +configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/tmx/vcpkg.json b/externals/vcpkg/ports/tmx/vcpkg.json new file mode 100755 index 000000000..764177045 --- /dev/null +++ b/externals/vcpkg/ports/tmx/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "tmx", + "version": "1.2.0", + "port-version": 1, + "description": "A portable C library to load tiled maps in your games.", + "dependencies": [ + "libxml2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/tmxlite/portfile.cmake b/externals/vcpkg/ports/tmxlite/portfile.cmake new file mode 100755 index 000000000..aaf079cb7 --- /dev/null +++ b/externals/vcpkg/ports/tmxlite/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO fallahn/tmxlite + REF v1.3.0 + HEAD_REF master + SHA512 3D432152080F7FDDD14A150FF87C34932695C96D7F676399C7610FF373972223CE54C9483BD9A872FD53668C113E334FCBF8596AE21CFDAF83B6159C7287A4A3 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/tmxlite" +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/tmxlite/vcpkg.json b/externals/vcpkg/ports/tmxlite/vcpkg.json new file mode 100755 index 000000000..fdecfa92a --- /dev/null +++ b/externals/vcpkg/ports/tmxlite/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "tmxlite", + "version": "1.3.0", + "port-version": 1, + "description": "A lightweight C++14 parsing library for tmx map files created with the Tiled map editor.", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/tmxparser/fix_include_paths.patch b/externals/vcpkg/ports/tmxparser/fix_include_paths.patch new file mode 100755 index 000000000..fedcb43bc --- /dev/null +++ b/externals/vcpkg/ports/tmxparser/fix_include_paths.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9d06cb4..593bbfd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -43,6 +43,8 @@ endif (NOT USE_MINIZ) + + set(EXAMPLE_CFLAGS "-std=c++11 -pedantic -Werror -Wall -g") + #include_directories("${PROJECT_SOURCE_DIR}/include") ++include_directories("${PROJECT_BINARY_DIR}") ++include_directories("${PROJECT_SOURCE_DIR}/src") + + add_library(tmxparser_static STATIC ${SOURCES} ${HEADERS}) + set_target_properties(tmxparser_static PROPERTIES +@@ -67,8 +69,6 @@ add_executable(run_tests test/test.cpp) + set_target_properties(run_tests PROPERTIES + COMPILE_FLAGS ${EXAMPLE_CFLAGS}) + target_link_libraries(run_tests tmxparser ${TINYXML2_LIBRARIES}) +-include_directories("${PROJECT_BINARY_DIR}") +-include_directories("${PROJECT_SOURCE_DIR}/src") + + install(FILES ${HEADERS} DESTINATION include/tmxparser) + install(TARGETS tmxparser tmxparser_static DESTINATION lib) diff --git a/externals/vcpkg/ports/tmxparser/portfile.cmake b/externals/vcpkg/ports/tmxparser/portfile.cmake new file mode 100755 index 000000000..cf45ef272 --- /dev/null +++ b/externals/vcpkg/ports/tmxparser/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sainteos/tmxparser + REF v2.1.0 + HEAD_REF master + SHA512 011cce3bb98057f8e2a0a82863fedb7c4b9e41324d5cfa6daade4d000c3f6c8c157da7b153f7f2564ecdefe8019fc8446c9b1b8a675be04329b04a0891ee1c27 + PATCHES + fix_include_paths.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(GLOB LIBS ${CURRENT_PACKAGES_DIR}/lib/*.so* ${CURRENT_PACKAGES_DIR}/debug/lib/*.so*) + if(LIBS) + file(REMOVE ${LIBS}) + endif() +else() + file(GLOB LIBS ${CURRENT_PACKAGES_DIR}/lib/*.a ${CURRENT_PACKAGES_DIR}/debug/lib/*.a) + if(LIBS) + file(REMOVE ${LIBS}) + endif() +endif() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/tmxparser/vcpkg.json b/externals/vcpkg/ports/tmxparser/vcpkg.json new file mode 100755 index 000000000..9beb4ea25 --- /dev/null +++ b/externals/vcpkg/ports/tmxparser/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "tmxparser", + "version-string": "2.1.0", + "port-version": 6, + "description": "C++11 library for parsing the maps generated by the Map Editor called Tiled.", + "dependencies": [ + "tinyxml2", + "zlib" + ] +} diff --git a/externals/vcpkg/ports/toml11/portfile.cmake b/externals/vcpkg/ports/toml11/portfile.cmake new file mode 100755 index 000000000..fe37147cc --- /dev/null +++ b/externals/vcpkg/ports/toml11/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ToruNiina/toml11 + REF v3.7.1 + SHA512 a4710972ab9b1ff836b2191243d628e0c4672fbfe95ede50c49796aaa75bb05d3ac71164102651d5c7342a4ac88781dfe417957b8b8ce373989f627231966550 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dtoml11_BUILD_TEST=OFF +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/toml11) + +vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/share/toml11/toml11Config.cmake" + "\${PACKAGE_PREFIX_DIR}/lib/cmake/toml11/toml11Targets.cmake" + "\${PACKAGE_PREFIX_DIR}/share/toml11/toml11Targets.cmake" +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/toml11/vcpkg.json b/externals/vcpkg/ports/toml11/vcpkg.json new file mode 100755 index 000000000..b94992dd9 --- /dev/null +++ b/externals/vcpkg/ports/toml11/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "toml11", + "version": "3.7.1", + "description": "A C++11 header-only toml parser/encoder depending only on C++ standard library.", + "homepage": "https://github.com/ToruNiina/toml11", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/tomlplusplus/portfile.cmake b/externals/vcpkg/ports/tomlplusplus/portfile.cmake new file mode 100755 index 000000000..dd0d7b869 --- /dev/null +++ b/externals/vcpkg/ports/tomlplusplus/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO marzer/tomlplusplus + REF v3.1.0 + SHA512 b5223fa978b606f6b14fa74495884ccd491fa6017ef44b2ac9a384fa1df7100745145163e2a139255927fb51e5ecd779ee2643c19579eab6e4533b15e75c9be9 + HEAD_REF master +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dgenerate_cmake_config=true + -Dbuild_tests=false + -Dbuild_examples=false +) + +vcpkg_install_meson() +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/tomlplusplus) +cmake_path(NATIVE_PATH SOURCE_PATH native_source_path) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/tomlplusplus/tomlplusplusConfig.cmake" "${native_source_path}" "") +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/tomlplusplus/vcpkg.json b/externals/vcpkg/ports/tomlplusplus/vcpkg.json new file mode 100755 index 000000000..2ecfcff54 --- /dev/null +++ b/externals/vcpkg/ports/tomlplusplus/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "tomlplusplus", + "version": "3.1.0", + "description": "Header-only TOML config file parser and serializer for modern C++.", + "homepage": "https://marzer.github.io/tomlplusplus/", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake-config", + "host": true + }, + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/tool-meson/portfile.cmake b/externals/vcpkg/ports/tool-meson/portfile.cmake new file mode 100755 index 000000000..ed3c452cc --- /dev/null +++ b/externals/vcpkg/ports/tool-meson/portfile.cmake @@ -0,0 +1,4 @@ +#deprecated port. -> new port "vcpkg-tool-meson" for better grouping with other vcpkg tools +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +vcpkg_find_acquire_program(MESON) +message(STATUS "Using meson: ${MESON}") \ No newline at end of file diff --git a/externals/vcpkg/ports/tool-meson/vcpkg.json b/externals/vcpkg/ports/tool-meson/vcpkg.json new file mode 100755 index 000000000..4601eda68 --- /dev/null +++ b/externals/vcpkg/ports/tool-meson/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "tool-meson", + "version-date": "2022-01-21", + "description": "Meson build system", + "homepage": "https://github.com/mesonbuild/meson", + "dependencies": [ + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/torch-th/debug.patch b/externals/vcpkg/ports/torch-th/debug.patch new file mode 100755 index 000000000..2a15e84d0 --- /dev/null +++ b/externals/vcpkg/ports/torch-th/debug.patch @@ -0,0 +1,52 @@ +diff --git a/lib/TH/CMakeLists.txt b/lib/TH/CMakeLists.txt +index 803dfe1..7db876b 100644 +--- a/lib/TH/CMakeLists.txt ++++ b/lib/TH/CMakeLists.txt +@@ -221,7 +221,13 @@ ENDIF(C_AVX2_FOUND OR C_AVX_FOUND OR C_SSE4_2_FOUND OR C_SSE4_1_FOUND) + IF(C_SSE4_1_FOUND AND C_SSE4_2_FOUND) + SET(CMAKE_C_FLAGS "${C_SSE4_1_FLAGS} -DUSE_SSE4_1 ${C_SSE4_2_FLAGS} -DUSE_SSE4_2 ${CMAKE_C_FLAGS}") + IF(MSVC) +- SET_SOURCE_FILES_PROPERTIES(generic/simd/convolve5x5_sse.c PROPERTIES COMPILE_FLAGS "/Ox /fp:fast") ++ IF(CMAKE_BUILD_TYPE STREQUAL Release) ++ SET_SOURCE_FILES_PROPERTIES(generic/simd/convolve5x5_sse.c PROPERTIES COMPILE_FLAGS "/Ox /fp:fast") ++ MESSAGE(STATUS "Release mode. Found SSE4_1 and SSE4_2.") ++ ELSE() ++ SET_SOURCE_FILES_PROPERTIES(generic/simd/convolve5x5_sse.c PROPERTIES COMPILE_FLAGS "/fp:fast") ++ MESSAGE(STATUS "Non-release mode. Found SSE4_1 and SSE4_2.") ++ ENDIF() + ELSE(MSVC) + SET_SOURCE_FILES_PROPERTIES(generic/simd/convolve5x5_sse.c PROPERTIES COMPILE_FLAGS "-O3 -ffast-math") + ENDIF(MSVC) +@@ -231,8 +237,15 @@ ENDIF(C_SSE4_1_FOUND AND C_SSE4_2_FOUND) + # IF AVX FOUND + IF(C_AVX_FOUND) + IF(MSVC) +- SET_SOURCE_FILES_PROPERTIES(generic/simd/convolve5x5_avx.c PROPERTIES COMPILE_FLAGS "/Ox /fp:fast ${C_AVX_FLAGS}") +- SET_SOURCE_FILES_PROPERTIES(vector/AVX.c PROPERTIES COMPILE_FLAGS "/Ox /arch:AVX ${C_AVX_FLAGS}") ++ IF(CMAKE_BUILD_TYPE STREQUAL Release) ++ SET_SOURCE_FILES_PROPERTIES(generic/simd/convolve5x5_avx.c PROPERTIES COMPILE_FLAGS "/Ox /fp:fast ${C_AVX_FLAGS}") ++ SET_SOURCE_FILES_PROPERTIES(vector/AVX.c PROPERTIES COMPILE_FLAGS "/Ox /arch:AVX ${C_AVX_FLAGS}") ++ MESSAGE(STATUS "Release mode. Found AVX.") ++ ELSE() ++ SET_SOURCE_FILES_PROPERTIES(generic/simd/convolve5x5_avx.c PROPERTIES COMPILE_FLAGS "/fp:fast ${C_AVX_FLAGS}") ++ SET_SOURCE_FILES_PROPERTIES(vector/AVX.c PROPERTIES COMPILE_FLAGS "/arch:AVX ${C_AVX_FLAGS}") ++ MESSAGE(STATUS "Non-release mode. Found AVX.") ++ ENDIF() + ELSE(MSVC) + SET_SOURCE_FILES_PROPERTIES(generic/simd/convolve5x5_avx.c PROPERTIES COMPILE_FLAGS "-O3 -ffast-math ${C_AVX_FLAGS}") + SET_SOURCE_FILES_PROPERTIES(vector/AVX.c PROPERTIES COMPILE_FLAGS "-O3 ${C_AVX_FLAGS}") +@@ -242,7 +255,13 @@ ENDIF(C_AVX_FOUND) + + IF(C_AVX2_FOUND) + IF(MSVC) +- SET_SOURCE_FILES_PROPERTIES(vector/AVX2.c PROPERTIES COMPILE_FLAGS "/Ox /arch:AVX2 ${C_AVX2_FLAGS}") ++ IF(CMAKE_BUILD_TYPE STREQUAL Release) ++ SET_SOURCE_FILES_PROPERTIES(vector/AVX2.c PROPERTIES COMPILE_FLAGS "/Ox /arch:AVX2 ${C_AVX2_FLAGS}") ++ MESSAGE(STATUS "Release mode. Found AVX2.") ++ ELSE() ++ SET_SOURCE_FILES_PROPERTIES(vector/AVX2.c PROPERTIES COMPILE_FLAGS "/arch:AVX2 ${C_AVX2_FLAGS}") ++ MESSAGE(STATUS "Non-release mode. Found AVX2.") ++ ENDIF() + ELSE(MSVC) + SET_SOURCE_FILES_PROPERTIES(vector/AVX2.c PROPERTIES COMPILE_FLAGS "-O3 ${C_AVX2_FLAGS}") + ENDIF(MSVC) diff --git a/externals/vcpkg/ports/torch-th/portfile.cmake b/externals/vcpkg/ports/torch-th/portfile.cmake new file mode 100755 index 000000000..7fd23944b --- /dev/null +++ b/externals/vcpkg/ports/torch-th/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO torch/torch7 + REF dde9e56fb61eee040d7f3dba2331c6d6c095aee8 + SHA512 ef813e6f583f26019da362be1e5d9886ecf3306a2b41e5f7a73d432872eacd2745e0cf26bfcc691452f87611e02e302c54f07b2f3a3288744535e57d154a73db + HEAD_REF master + PATCHES + debug.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/lib/TH + PREFER_NINJA + OPTIONS + -DWITH_OPENMP=OFF +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/cmake) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/COPYRIGHT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/torch-th RENAME copyright) diff --git a/externals/vcpkg/ports/torch-th/vcpkg.json b/externals/vcpkg/ports/torch-th/vcpkg.json new file mode 100755 index 000000000..81f500f82 --- /dev/null +++ b/externals/vcpkg/ports/torch-th/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "torch-th", + "version-string": "2019-04-19", + "port-version": 3, + "description": "Torch's TH library", + "homepage": "https://github.com/torch/torch7" +} diff --git a/externals/vcpkg/ports/tracy/001-fix-vcxproj-vcpkg.patch b/externals/vcpkg/ports/tracy/001-fix-vcxproj-vcpkg.patch new file mode 100755 index 000000000..cef0a0ad2 --- /dev/null +++ b/externals/vcpkg/ports/tracy/001-fix-vcxproj-vcpkg.patch @@ -0,0 +1,44 @@ +diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj +index 8215cc7..f427953 100644 +--- a/profiler/build/win32/Tracy.vcxproj ++++ b/profiler/build/win32/Tracy.vcxproj +@@ -57,7 +57,7 @@ + Disabled + true + _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;IMGUI_ENABLE_FREETYPE;%(PreprocessorDefinitions) +- ..\..\..\imgui;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) ++ ..\..\..\imgui;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) + true + false + true +@@ -67,9 +67,8 @@ + Fast + + +- brotlicommon-static.lib;brotlidec-static.lib;ws2_32.lib;freetyped.lib;glfw3.lib;libpng16d.lib;zlibd.lib;bz2d.lib;capstone.lib;%(AdditionalDependencies) ++ ws2_32.lib;%(AdditionalDependencies) + Windows +- ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\debug\lib + + + true +@@ -83,7 +82,7 @@ + true + true + NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;IMGUI_ENABLE_FREETYPE;%(PreprocessorDefinitions) +- ..\..\..\imgui;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) ++ ..\..\..\imgui;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) + true + true + AdvancedVectorExtensions2 +@@ -94,9 +93,8 @@ + + true + true +- brotlicommon-static.lib;brotlidec-static.lib;ws2_32.lib;freetype.lib;glfw3.lib;libpng16.lib;zlib.lib;bz2.lib;capstone.lib;%(AdditionalDependencies) ++ ws2_32.lib;%(AdditionalDependencies) + Windows +- ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\lib + + + true diff --git a/externals/vcpkg/ports/tracy/002-fix-capstone-5.patch b/externals/vcpkg/ports/tracy/002-fix-capstone-5.patch new file mode 100755 index 000000000..2c9f4c753 --- /dev/null +++ b/externals/vcpkg/ports/tracy/002-fix-capstone-5.patch @@ -0,0 +1,26 @@ +diff --git a/server/TracySourceView.cpp b/server/TracySourceView.cpp +index cc56298..7b9370a 100644 +--- a/server/TracySourceView.cpp ++++ b/server/TracySourceView.cpp +@@ -2,7 +2,7 @@ + #include + #include + +-#include ++#include + + #include "imgui.h" + #include "TracyCharUtil.hpp" +diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp +index fcb1718..2433e59 100644 +--- a/server/TracyWorker.cpp ++++ b/server/TracyWorker.cpp +@@ -19,7 +19,7 @@ + #include + #include + +-#include ++#include + + #define ZDICT_STATIC_LINKING_ONLY + #include "../zstd/zdict.h" diff --git a/externals/vcpkg/ports/tracy/portfile.cmake b/externals/vcpkg/ports/tracy/portfile.cmake new file mode 100755 index 000000000..e687dd3a2 --- /dev/null +++ b/externals/vcpkg/ports/tracy/portfile.cmake @@ -0,0 +1,174 @@ + +# It is possible to run into some issues when profiling when we uses Tracy client as a shared client +# As as safety measure let's build Tracy as a static library for now +# More details on Tracy Discord (e.g. https://discord.com/channels/585214693895962624/585214693895962630/953599951328403506) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wolfpld/tracy + REF 80f6a93da79af94fc4604e37439f5a75d5e7dfbd + SHA512 80d24fd969a9f8ac000b127c586745c85239139c50f6aacf625cea50551303031a7e14da01fd96a0e17d59ea639019cab119b76945e96cb6e7cfc7e5399252f8 + HEAD_REF master + PATCHES + 001-fix-vcxproj-vcpkg.patch + 002-fix-capstone-5.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} +) +vcpkg_cmake_install() + +if(VCPKG_TARGET_IS_LINUX) + set(any_tracy_tool_requested OFF) + if(profiler IN_LIST FEATURES) + message(WARNING +"Tracy currently requires the following libraries from the system package manager to build its tools: + gtk+-3.0 + tbb + +These can be installed on Ubuntu systems via sudo apt install libgtk-3-dev libtbb-dev") + set(any_tracy_tool_requested ON) + else() + foreach(CLI_TOOL capture csvexport import-chrome update) + if(${CLI_TOOL} IN_LIST FEATURES) + message(WARNING +"Tracy currently requires the following libraries from the system package manager to build its tools: + tbb + +These can be installed on Ubuntu systems via sudo apt install libtbb-dev") + set(any_tracy_tool_requested ON) + break() + endif() + endforeach() + endif() + +endif() + +vcpkg_list(SET tracy_tools) +if("cli-tools" IN_LIST FEATURES) + vcpkg_list(APPEND tracy_tools capture csvexport import-chrome update) +endif() +if("gui-tools" IN_LIST FEATURES) + vcpkg_list(APPEND tracy_tools profiler) +endif() + +function(tracy_tool_install_make tracy_TOOL tracy_TOOL_NAME) + foreach(buildtype IN ITEMS "debug" "release") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "${buildtype}") + if("${buildtype}" STREQUAL "debug") + set(short_buildtype "-dbg") + set(path_suffix "/debug") + else() + set(short_buildtype "-rel") + set(path_suffix "") + endif() + + file(COPY "${SOURCE_PATH}/${tracy_TOOL}/build/unix" DESTINATION "${SOURCE_PATH}/${tracy_TOOL}/_build") + file(RENAME "${SOURCE_PATH}/${tracy_TOOL}/_build/unix" "${SOURCE_PATH}/${tracy_TOOL}/build/unix${short_buildtype}") + file(REMOVE_RECURSE "${SOURCE_PATH}/${tracy_TOOL}/_build") + + set(path_makefile_dir "${SOURCE_PATH}/${tracy_TOOL}/build/unix${short_buildtype}") + cmake_path(RELATIVE_PATH path_makefile_dir + BASE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${short_buildtype}" + OUTPUT_VARIABLE relative_path_makefile_dir) + + vcpkg_backup_env_variables(VARS PKG_CONFIG_PATH) + vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}${path_suffix}/lib/pkgconfig") + + message(STATUS "Building ${tracy_TOOL_NAME} ${TARGET_TRIPLET}${short_buildtype}") + vcpkg_build_make( + BUILD_TARGET ${buildtype} + SUBPATH ${relative_path_makefile_dir} + LOGFILE_ROOT "build-${tracy_TOOL}" + ) + vcpkg_restore_env_variables(VARS PKG_CONFIG_PATH) + + file(INSTALL "${SOURCE_PATH}/${tracy_TOOL}/build/unix${short_buildtype}/${tracy_TOOL_NAME}-${buildtype}" DESTINATION "${CURRENT_PACKAGES_DIR}${path_suffix}/tools/${PORT}" RENAME "${tracy_TOOL_NAME}") + endif() + endforeach() +endfunction() + +if("capture" IN_LIST tracy_tools) + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "capture/build/win32/capture.vcxproj" + USE_VCPKG_INTEGRATION + ) + else() + tracy_tool_install_make(capture capture) + endif() +endif() + +if("csvexport" IN_LIST tracy_tools) + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "csvexport/build/win32/csvexport.vcxproj" + USE_VCPKG_INTEGRATION + ) + else() + tracy_tool_install_make(csvexport csvexport) + endif() +endif() + +if("import-chrome" IN_LIST tracy_tools) + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "import-chrome/build/win32/import-chrome.vcxproj" + USE_VCPKG_INTEGRATION + ) + else() + tracy_tool_install_make(import-chrome import-chrome) + endif() +endif() + +if("profiler" IN_LIST tracy_tools) + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "profiler/build/win32/Tracy.vcxproj" + USE_VCPKG_INTEGRATION + ) + else() + tracy_tool_install_make(profiler Tracy) + endif() +endif() + +if("update" IN_LIST tracy_tools) + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "update/build/win32/update.vcxproj" + USE_VCPKG_INTEGRATION + ) + else() + tracy_tool_install_make(update update) + endif() +endif() + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME Tracy) +vcpkg_fixup_pkgconfig() + +foreach(TOOL capture csvexport import-chrome profiler update) + if(${TOOL} IN_LIST tracy_tools) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") + endif() + break() + endif() +endforeach() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# Cleanup +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/externals/vcpkg/ports/tracy/vcpkg.json b/externals/vcpkg/ports/tracy/vcpkg.json new file mode 100755 index 000000000..8e6345964 --- /dev/null +++ b/externals/vcpkg/ports/tracy/vcpkg.json @@ -0,0 +1,54 @@ +{ + "name": "tracy", + "version-semver": "0.8.1", + "description": "A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.", + "homepage": "https://github.com/wolfpld/tracy", + "license": "BSD-3-Clause", + "supports": "!(windows & (arm | uwp))", + "dependencies": [ + { + "name": "pthreads", + "platform": "!windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cli-tools": { + "description": "Build Tracy command-line tools: `capture`, `csvexport`, `import-chrome` and `update`", + "supports": "!(windows & x86)", + "dependencies": [ + { + "name": "capstone", + "features": [ + "arm", + "arm64", + "x86" + ] + } + ] + }, + "gui-tools": { + "description": "Build Tracy GUI tool: `profiler` (aka `Tracy` executable)", + "supports": "!(windows & x86)", + "dependencies": [ + { + "name": "capstone", + "features": [ + "arm", + "arm64", + "x86" + ] + }, + "freetype", + "glfw3" + ] + } + } +} diff --git a/externals/vcpkg/ports/transwarp/portfile.cmake b/externals/vcpkg/ports/transwarp/portfile.cmake new file mode 100755 index 000000000..1535c0829 --- /dev/null +++ b/externals/vcpkg/ports/transwarp/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO bloomen/transwarp + REF 2.2.2 + SHA512 32e5dce698bff565f98ac73e7a4213858f5024003f01d798a6f7eb99289f192dd56b45c975c0e42be36e28e0b828c9810f5d27e62312649606b78ec93e4afae4 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/transwarp/vcpkg.json b/externals/vcpkg/ports/transwarp/vcpkg.json new file mode 100755 index 000000000..de9a2a114 --- /dev/null +++ b/externals/vcpkg/ports/transwarp/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "transwarp", + "version": "2.2.2", + "description": "A header-only C++ library for task concurrency", + "homepage": "https://github.com/bloomen/transwarp", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/trantor/portfile.cmake b/externals/vcpkg/ports/trantor/portfile.cmake new file mode 100755 index 000000000..f2dcdfb46 --- /dev/null +++ b/externals/vcpkg/ports/trantor/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO an-tao/trantor + REF v1.5.5 + SHA512 41068dcefcaf55908735126375b65a83a7d7085f30d5eb14e8d73fa255405ec77164c34b9ef0e5e6da3aeae3e66b9d57d4fca8901d63d4414bf8e857bd25dcd4 + HEAD_REF master + PATCHES + vcpkg.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +# Fix CMake files +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Trantor) + +vcpkg_fixup_pkgconfig() + +# # Remove includes in debug +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +# Handle copyright +file(INSTALL "${SOURCE_PATH}/License" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# Copy pdb files +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/trantor/vcpkg.json b/externals/vcpkg/ports/trantor/vcpkg.json new file mode 100755 index 000000000..3af0abe63 --- /dev/null +++ b/externals/vcpkg/ports/trantor/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "trantor", + "version-semver": "1.5.5", + "description": "A non-blocking I/O cross-platform TCP network library, using C++14", + "homepage": "https://github.com/an-tao/trantor", + "license": "BSD-2-Clause", + "dependencies": [ + "c-ares", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/trantor/vcpkg.patch b/externals/vcpkg/ports/trantor/vcpkg.patch new file mode 100755 index 000000000..7735262b1 --- /dev/null +++ b/externals/vcpkg/ports/trantor/vcpkg.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 33b8e2c..e8c1cc2 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -148,6 +148,9 @@ if(HAVE_C-ARES) + set(private_headers + ${private_headers} + trantor/net/inner/AresResolver.h) ++ if(APPLE) ++ target_link_libraries(${PROJECT_NAME} PRIVATE resolv) ++ endif() + else() + set(TRANTOR_SOURCES + ${TRANTOR_SOURCES} diff --git a/externals/vcpkg/ports/tre/CMakeLists.txt b/externals/vcpkg/ports/tre/CMakeLists.txt new file mode 100755 index 000000000..09113fca1 --- /dev/null +++ b/externals/vcpkg/ports/tre/CMakeLists.txt @@ -0,0 +1,37 @@ +cmake_minimum_required (VERSION 3.9) +project (tre) + +set (HEADERS + lib/regex.h + include/tre/tre.h + include/tre/tre-config.h +) + +set (SRCS + lib/regcomp.c + lib/regerror.c + lib/regexec.c + lib/tre-ast.c + lib/tre-compile.c + lib/tre-match-approx.c + lib/tre-match-backtrack.c + lib/tre-match-parallel.c + lib/tre-mem.c + lib/tre-parse.c + lib/tre-stack.c + lib/xmalloc.c + win32/tre.def +) + +include_directories(win32 include/tre) +add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DHAVE_CONFIG_H) +add_library(tre ${SRCS}) + +install( + TARGETS tre + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(FILES ${HEADERS} DESTINATION include/tre) diff --git a/externals/vcpkg/ports/tre/portfile.cmake b/externals/vcpkg/ports/tre/portfile.cmake new file mode 100755 index 000000000..cbc904e6e --- /dev/null +++ b/externals/vcpkg/ports/tre/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO laurikari/tre + REF 6fb7206b935b35814c5078c20046dbe065435363 + SHA512 f1d664719eab23b665d71e34ca3d11f8ba49da23ff20dc28f46d4ce30fe155c12208ba7fd212dbeb20a7037e069909f0c2120ce1fc01074656399805e3289a90 + HEAD_REF master +) + +file(READ ${SOURCE_PATH}/win32/config.h CONFIG_H) +string(REPLACE "#define snprintf sprintf_s" "" CONFIG_H ${CONFIG_H}) +file(WRITE ${SOURCE_PATH}/win32/config.h "${CONFIG_H}") + +if(VCPKG_TARGET_IS_MINGW) + vcpkg_replace_string(${SOURCE_PATH}/win32/tre.def "tre.dll" "libtre.dll") +endif() + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/tre RENAME copyright) diff --git a/externals/vcpkg/ports/tre/vcpkg.json b/externals/vcpkg/ports/tre/vcpkg.json new file mode 100755 index 000000000..cada62dae --- /dev/null +++ b/externals/vcpkg/ports/tre/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tre", + "version-string": "0.8.0", + "port-version": 3, + "description": "TRE is a lightweight, robust, and efficient POSIX compliant regexp matching library with some exciting features such as approximate (fuzzy) matching.", + "homepage": "https://github.com/laurikari/tre" +} diff --git a/externals/vcpkg/ports/treehh/copyright b/externals/vcpkg/ports/treehh/copyright new file mode 100755 index 000000000..2fcaf2b3a --- /dev/null +++ b/externals/vcpkg/ports/treehh/copyright @@ -0,0 +1,5 @@ +Copyright (C) 2001-2020 Kasper Peeters +Distributed under the GNU General Public License version 3. + +Special permission to use tree.hh under the conditions of a +different license can be requested from the author. diff --git a/externals/vcpkg/ports/treehh/portfile.cmake b/externals/vcpkg/ports/treehh/portfile.cmake new file mode 100755 index 000000000..1546f3640 --- /dev/null +++ b/externals/vcpkg/ports/treehh/portfile.cmake @@ -0,0 +1,10 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kpeeters/tree.hh + REF 8dc57bc2bb7cd2fd1d6e777c6b5b58db0c3852ef + SHA512 a40481952802fdfab05159822b012a576ea956135a44f88d93844cb578c49ed5fb6fb7330bce699d7fa6ba1da65d12b284b6e9e6b103eadfd76cbc96d6839db5 + HEAD_REF master +) + +file(INSTALL "${SOURCE_PATH}/src/tree.hh" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/") +file(INSTALL "${CURRENT_PORT_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/treehh/vcpkg.json b/externals/vcpkg/ports/treehh/vcpkg.json new file mode 100755 index 000000000..85147876d --- /dev/null +++ b/externals/vcpkg/ports/treehh/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "treehh", + "version": "3.16", + "description": "An STL-like C++ header-only tree library", + "homepage": "https://github.com/kpeeters/tree.hh" +} diff --git a/externals/vcpkg/ports/treehopper/portfile.cmake b/externals/vcpkg/ports/treehopper/portfile.cmake new file mode 100755 index 000000000..c9e9855ce --- /dev/null +++ b/externals/vcpkg/ports/treehopper/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO treehopper-electronics/treehopper-sdk + REF 1.11.3 + SHA512 65b748375b798787c8b59f9657151f340920c939c3f079105b9b78f4e3b775125598106c6dfa4feba111a64d30f007003a70110ac767802a7dd1127a25c9fb14 + HEAD_REF master) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/C++/API/ + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +file(INSTALL ${SOURCE_PATH}/C++/API/inc/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/Treehopper/) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + diff --git a/externals/vcpkg/ports/treehopper/vcpkg.json b/externals/vcpkg/ports/treehopper/vcpkg.json new file mode 100755 index 000000000..822c8c949 --- /dev/null +++ b/externals/vcpkg/ports/treehopper/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "treehopper", + "version-string": "1.11.3", + "port-version": 5, + "description": "Treehopper connects the physical world to your computer, tablet, or smartphone.", + "homepage": "https://treehopper.io", + "dependencies": [ + "libusb" + ] +} diff --git a/externals/vcpkg/ports/triangle/CMakeLists.txt b/externals/vcpkg/ports/triangle/CMakeLists.txt new file mode 100755 index 000000000..6157c00f3 --- /dev/null +++ b/externals/vcpkg/ports/triangle/CMakeLists.txt @@ -0,0 +1,45 @@ +cmake_minimum_required(VERSION 2.8.12) +project(triangle) + +include(GNUInstallDirs) + +add_library(triangleLib triangle.c exports.def) +add_executable(triangle triangle.c) + +target_compile_definitions(triangleLib PRIVATE -DTRILIBRARY -DANSI_DECLARATORS) +target_compile_definitions(triangle PRIVATE -DANSI_DECLARATORS) +if(WIN32) + target_compile_definitions(triangleLib PRIVATE -DNO_TIMER) + target_compile_definitions(triangle PRIVATE -DNO_TIMER) +endif() + +if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") + target_link_libraries(triangle m) +endif() + +target_include_directories(triangleLib PUBLIC + $ +) + +set_target_properties(triangleLib PROPERTIES POSITION_INDEPENDENT_CODE ON) + +set_target_properties(triangleLib PROPERTIES PUBLIC_HEADER + "${CMAKE_SOURCE_DIR}/triangle.h" +) + +set_target_properties(triangleLib PROPERTIES OUTPUT_NAME "triangle") + +install(TARGETS triangleLib EXPORT triangleTargets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} +) + +install(TARGETS triangle DESTINATION tools/triangle) + +install(EXPORT triangleTargets + FILE triangleConfig.cmake + NAMESPACE triangle:: + DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/triangle" +) diff --git a/externals/vcpkg/ports/triangle/enable_64bit_architecture.patch b/externals/vcpkg/ports/triangle/enable_64bit_architecture.patch new file mode 100755 index 000000000..9ad7b8079 --- /dev/null +++ b/externals/vcpkg/ports/triangle/enable_64bit_architecture.patch @@ -0,0 +1,418 @@ + triangle.c | 116 ++++++++++++++++++++++++++----------------------------------- + triangle.h | 29 +++++++++------- + 2 files changed, 66 insertions(+), 79 deletions(-) + +diff --git a/triangle.c b/triangle.c +index f7a5700..084902e 100644 +--- a/triangle.c ++++ b/triangle.c +@@ -194,27 +194,8 @@ + /* */ + /*****************************************************************************/ + +-/* For single precision (which will save some memory and reduce paging), */ +-/* define the symbol SINGLE by using the -DSINGLE compiler switch or by */ +-/* writing "#define SINGLE" below. */ +-/* */ +-/* For double precision (which will allow you to refine meshes to a smaller */ +-/* edge length), leave SINGLE undefined. */ +-/* */ +-/* Double precision uses more memory, but improves the resolution of the */ +-/* meshes you can generate with Triangle. It also reduces the likelihood */ +-/* of a floating exception due to overflow. Finally, it is much faster */ +-/* than single precision on 64-bit architectures like the DEC Alpha. I */ +-/* recommend double precision unless you want to generate a mesh for which */ +-/* you do not have enough memory. */ +- +-/* #define SINGLE */ +- +-#ifdef SINGLE +-#define REAL float +-#else /* not SINGLE */ + #define REAL double +-#endif /* not SINGLE */ ++#define VOID void + + /* If yours is not a Unix system, define the NO_TIMER compiler switch to */ + /* remove the Unix-specific timing code. */ +@@ -308,12 +289,6 @@ + #define DEADVERTEX -32768 + #define UNDEADVERTEX -32767 + +-/* The next line is used to outsmart some very stupid compilers. If your */ +-/* compiler is smarter, feel free to replace the "int" with "void". */ +-/* Not that it matters. */ +- +-#define VOID int +- + /* Two constants for algorithms based on random sampling. Both constants */ + /* have been chosen empirically to optimize their respective algorithms. */ + +@@ -340,6 +315,7 @@ + + #define ONETHIRD 0.333333333333333333333333333333333333333333333333333333333333 + ++#include + #include + #include + #include +@@ -938,16 +914,16 @@ int minus1mod3[3] = {2, 0, 1}; + /* extracted from the two least significant bits of the pointer. */ + + #define decode(ptr, otri) \ +- (otri).orient = (int) ((unsigned long) (ptr) & (unsigned long) 3l); \ ++ (otri).orient = (int) ((uintptr_t) (ptr) & (uintptr_t) 3l); \ + (otri).tri = (triangle *) \ +- ((unsigned long) (ptr) ^ (unsigned long) (otri).orient) ++ ((uintptr_t) (ptr) ^ (uintptr_t) (otri).orient) + + /* encode() compresses an oriented triangle into a single pointer. It */ + /* relies on the assumption that all triangles are aligned to four-byte */ + /* boundaries, so the two least significant bits of (otri).tri are zero. */ + + #define encode(otri) \ +- (triangle) ((unsigned long) (otri).tri | (unsigned long) (otri).orient) ++ (triangle) ((uintptr_t) (otri).tri | (uintptr_t) (otri).orient) + + /* The following handle manipulation primitives are all described by Guibas */ + /* and Stolfi. However, Guibas and Stolfi use an edge-based data */ +@@ -1111,16 +1087,16 @@ int minus1mod3[3] = {2, 0, 1}; + + #define infect(otri) \ + (otri).tri[6] = (triangle) \ +- ((unsigned long) (otri).tri[6] | (unsigned long) 2l) ++ ((uintptr_t) (otri).tri[6] | (uintptr_t) 2l) + + #define uninfect(otri) \ + (otri).tri[6] = (triangle) \ +- ((unsigned long) (otri).tri[6] & ~ (unsigned long) 2l) ++ ((uintptr_t) (otri).tri[6] & ~ (uintptr_t) 2l) + + /* Test a triangle for viral infection. */ + + #define infected(otri) \ +- (((unsigned long) (otri).tri[6] & (unsigned long) 2l) != 0l) ++ (((uintptr_t) (otri).tri[6] & (uintptr_t) 2l) != 0l) + + /* Check or set a triangle's attributes. */ + +@@ -1158,16 +1134,16 @@ int minus1mod3[3] = {2, 0, 1}; + /* are masked out to produce the real pointer. */ + + #define sdecode(sptr, osub) \ +- (osub).ssorient = (int) ((unsigned long) (sptr) & (unsigned long) 1l); \ ++ (osub).ssorient = (int) ((uintptr_t) (sptr) & (uintptr_t) 1l); \ + (osub).ss = (subseg *) \ +- ((unsigned long) (sptr) & ~ (unsigned long) 3l) ++ ((uintptr_t) (sptr) & ~ (uintptr_t) 3l) + + /* sencode() compresses an oriented subsegment into a single pointer. It */ + /* relies on the assumption that all subsegments are aligned to two-byte */ + /* boundaries, so the least significant bit of (osub).ss is zero. */ + + #define sencode(osub) \ +- (subseg) ((unsigned long) (osub).ss | (unsigned long) (osub).ssorient) ++ (subseg) ((uintptr_t) (osub).ss | (uintptr_t) (osub).ssorient) + + /* ssym() toggles the orientation of a subsegment. */ + +@@ -3891,7 +3867,7 @@ struct memorypool *pool; + #endif /* not ANSI_DECLARATORS */ + + { +- unsigned long alignptr; ++ uintptr_t alignptr = 0; + + pool->items = 0; + pool->maxitems = 0; +@@ -3899,11 +3875,11 @@ struct memorypool *pool; + /* Set the currently active block. */ + pool->nowblock = pool->firstblock; + /* Find the first item in the pool. Increment by the size of (VOID *). */ +- alignptr = (unsigned long) (pool->nowblock + 1); ++ alignptr = (uintptr_t) (pool->nowblock + 1); + /* Align the item on an `alignbytes'-byte boundary. */ + pool->nextitem = (VOID *) +- (alignptr + (unsigned long) pool->alignbytes - +- (alignptr % (unsigned long) pool->alignbytes)); ++ (alignptr + (uintptr_t) pool->alignbytes - ++ (alignptr % (uintptr_t) pool->alignbytes)); + /* There are lots of unallocated items left in this block. */ + pool->unallocateditems = pool->itemsfirstblock; + /* The stack of deallocated items is empty. */ +@@ -4008,7 +3984,7 @@ struct memorypool *pool; + { + VOID *newitem; + VOID **newblock; +- unsigned long alignptr; ++ uintptr_t alignptr = 0; + + /* First check the linked list of dead items. If the list is not */ + /* empty, allocate an item from the list rather than a fresh one. */ +@@ -4033,11 +4009,11 @@ struct memorypool *pool; + pool->nowblock = (VOID **) *(pool->nowblock); + /* Find the first item in the block. */ + /* Increment by the size of (VOID *). */ +- alignptr = (unsigned long) (pool->nowblock + 1); ++ alignptr = (uintptr_t) (pool->nowblock + 1); + /* Align the item on an `alignbytes'-byte boundary. */ + pool->nextitem = (VOID *) +- (alignptr + (unsigned long) pool->alignbytes - +- (alignptr % (unsigned long) pool->alignbytes)); ++ (alignptr + (uintptr_t) pool->alignbytes - ++ (alignptr % (uintptr_t) pool->alignbytes)); + /* There are lots of unallocated items left in this block. */ + pool->unallocateditems = pool->itemsperblock; + } +@@ -4092,16 +4068,16 @@ struct memorypool *pool; + #endif /* not ANSI_DECLARATORS */ + + { +- unsigned long alignptr; ++ uintptr_t alignptr = 0; + + /* Begin the traversal in the first block. */ + pool->pathblock = pool->firstblock; + /* Find the first item in the block. Increment by the size of (VOID *). */ +- alignptr = (unsigned long) (pool->pathblock + 1); ++ alignptr = (uintptr_t) (pool->pathblock + 1); + /* Align with item on an `alignbytes'-byte boundary. */ + pool->pathitem = (VOID *) +- (alignptr + (unsigned long) pool->alignbytes - +- (alignptr % (unsigned long) pool->alignbytes)); ++ (alignptr + (uintptr_t) pool->alignbytes - ++ (alignptr % (uintptr_t) pool->alignbytes)); + /* Set the number of items left in the current block. */ + pool->pathitemsleft = pool->itemsfirstblock; + } +@@ -4129,7 +4105,7 @@ struct memorypool *pool; + + { + VOID *newitem; +- unsigned long alignptr; ++ uintptr_t alignptr = 0; + + /* Stop upon exhausting the list of items. */ + if (pool->pathitem == pool->nextitem) { +@@ -4141,11 +4117,11 @@ struct memorypool *pool; + /* Find the next block. */ + pool->pathblock = (VOID **) *(pool->pathblock); + /* Find the first item in the block. Increment by the size of (VOID *). */ +- alignptr = (unsigned long) (pool->pathblock + 1); ++ alignptr = (uintptr_t) (pool->pathblock + 1); + /* Align with item on an `alignbytes'-byte boundary. */ + pool->pathitem = (VOID *) +- (alignptr + (unsigned long) pool->alignbytes - +- (alignptr % (unsigned long) pool->alignbytes)); ++ (alignptr + (uintptr_t) pool->alignbytes - ++ (alignptr % (uintptr_t) pool->alignbytes)); + /* Set the number of items left in the current block. */ + pool->pathitemsleft = pool->itemsperblock; + } +@@ -4197,16 +4173,16 @@ int subsegbytes; + #endif /* not ANSI_DECLARATORS */ + + { +- unsigned long alignptr; ++ uintptr_t alignptr = 0; + + /* Set up `dummytri', the `triangle' that occupies "outer space." */ + m->dummytribase = (triangle *) trimalloc(trianglebytes + + m->triangles.alignbytes); + /* Align `dummytri' on a `triangles.alignbytes'-byte boundary. */ +- alignptr = (unsigned long) m->dummytribase; ++ alignptr = (uintptr_t) m->dummytribase; + m->dummytri = (triangle *) +- (alignptr + (unsigned long) m->triangles.alignbytes - +- (alignptr % (unsigned long) m->triangles.alignbytes)); ++ (alignptr + (uintptr_t) m->triangles.alignbytes - ++ (alignptr % (uintptr_t) m->triangles.alignbytes)); + /* Initialize the three adjoining triangles to be "outer space." These */ + /* will eventually be changed by various bonding operations, but their */ + /* values don't really matter, as long as they can legally be */ +@@ -4226,10 +4202,10 @@ int subsegbytes; + m->dummysubbase = (subseg *) trimalloc(subsegbytes + + m->subsegs.alignbytes); + /* Align `dummysub' on a `subsegs.alignbytes'-byte boundary. */ +- alignptr = (unsigned long) m->dummysubbase; ++ alignptr = (uintptr_t) m->dummysubbase; + m->dummysub = (subseg *) +- (alignptr + (unsigned long) m->subsegs.alignbytes - +- (alignptr % (unsigned long) m->subsegs.alignbytes)); ++ (alignptr + (uintptr_t) m->subsegs.alignbytes - ++ (alignptr % (uintptr_t) m->subsegs.alignbytes)); + /* Initialize the two adjoining subsegments to be the omnipresent */ + /* subsegment. These will eventually be changed by various bonding */ + /* operations, but their values don't really matter, as long as they */ +@@ -4586,7 +4562,7 @@ int number; + { + VOID **getblock; + char *foundvertex; +- unsigned long alignptr; ++ uintptr_t alignptr = 0; + int current; + + getblock = m->vertices.firstblock; +@@ -4603,9 +4579,9 @@ int number; + } + + /* Now find the right vertex. */ +- alignptr = (unsigned long) (getblock + 1); +- foundvertex = (char *) (alignptr + (unsigned long) m->vertices.alignbytes - +- (alignptr % (unsigned long) m->vertices.alignbytes)); ++ alignptr = (uintptr_t) (getblock + 1); ++ foundvertex = (char *) (alignptr + (uintptr_t) m->vertices.alignbytes - ++ (alignptr % (uintptr_t) m->vertices.alignbytes)); + return (vertex) (foundvertex + m->vertices.itembytes * (number - current)); + } + +@@ -4883,6 +4859,7 @@ struct osub *newsubseg; + /* */ + /*****************************************************************************/ + ++static + void exactinit() + { + REAL half; +@@ -4956,6 +4933,7 @@ void exactinit() + /* */ + /*****************************************************************************/ + ++static + #ifdef ANSI_DECLARATORS + int fast_expansion_sum_zeroelim(int elen, REAL *e, int flen, REAL *f, REAL *h) + #else /* not ANSI_DECLARATORS */ +@@ -5050,6 +5028,7 @@ REAL *h; + /* */ + /*****************************************************************************/ + ++static + #ifdef ANSI_DECLARATORS + int scale_expansion_zeroelim(int elen, REAL *e, REAL b, REAL *h) + #else /* not ANSI_DECLARATORS */ +@@ -5106,6 +5085,7 @@ REAL *h; + /* */ + /*****************************************************************************/ + ++static + #ifdef ANSI_DECLARATORS + REAL estimate(int elen, REAL *e) + #else /* not ANSI_DECLARATORS */ +@@ -5303,6 +5283,7 @@ vertex pc; + /* */ + /*****************************************************************************/ + ++static + #ifdef ANSI_DECLARATORS + REAL incircleadapt(vertex pa, vertex pb, vertex pc, vertex pd, REAL permanent) + #else /* not ANSI_DECLARATORS */ +@@ -5882,6 +5863,7 @@ REAL permanent; + return finnow[finlength - 1]; + } + ++static + #ifdef ANSI_DECLARATORS + REAL incircle(struct mesh *m, struct behavior *b, + vertex pa, vertex pb, vertex pc, vertex pd) +@@ -5964,6 +5946,7 @@ vertex pd; + /* */ + /*****************************************************************************/ + ++static + #ifdef ANSI_DECLARATORS + REAL orient3dadapt(vertex pa, vertex pb, vertex pc, vertex pd, + REAL aheight, REAL bheight, REAL cheight, REAL dheight, +@@ -6389,6 +6372,7 @@ REAL permanent; + return finnow[finlength - 1]; + } + ++static + #ifdef ANSI_DECLARATORS + REAL orient3d(struct mesh *m, struct behavior *b, + vertex pa, vertex pb, vertex pc, vertex pd, +@@ -7649,7 +7633,7 @@ struct otri *searchtri; + char *firsttri; + struct otri sampletri; + vertex torg, tdest; +- unsigned long alignptr; ++ uintptr_t alignptr = 0; + REAL searchdist, dist; + REAL ahead; + long samplesperblock, totalsamplesleft, samplesleft; +@@ -7721,11 +7705,11 @@ struct otri *searchtri; + population = totalpopulation; + } + /* Find a pointer to the first triangle in the block. */ +- alignptr = (unsigned long) (sampleblock + 1); ++ alignptr = (uintptr_t) (sampleblock + 1); + firsttri = (char *) (alignptr + +- (unsigned long) m->triangles.alignbytes - ++ (uintptr_t) m->triangles.alignbytes - + (alignptr % +- (unsigned long) m->triangles.alignbytes)); ++ (uintptr_t) m->triangles.alignbytes)); + + /* Choose `samplesleft' randomly sampled triangles in this block. */ + do { +diff --git a/triangle.h b/triangle.h +index 9df1f39..8d9c754 100644 +--- a/triangle.h ++++ b/triangle.h +@@ -248,16 +248,20 @@ + /* */ + /*****************************************************************************/ + ++#ifdef __cplusplus ++extern "C" { ++#endif ++ + struct triangulateio { +- REAL *pointlist; /* In / out */ +- REAL *pointattributelist; /* In / out */ ++ double *pointlist; /* In / out */ ++ double *pointattributelist; /* In / out */ + int *pointmarkerlist; /* In / out */ + int numberofpoints; /* In / out */ + int numberofpointattributes; /* In / out */ + + int *trianglelist; /* In / out */ +- REAL *triangleattributelist; /* In / out */ +- REAL *trianglearealist; /* In only */ ++ double *triangleattributelist; /* In / out */ ++ double *trianglearealist; /* In only */ + int *neighborlist; /* Out only */ + int numberoftriangles; /* In / out */ + int numberofcorners; /* In / out */ +@@ -267,23 +271,22 @@ struct triangulateio { + int *segmentmarkerlist; /* In / out */ + int numberofsegments; /* In / out */ + +- REAL *holelist; /* In / pointer to array copied out */ ++ double *holelist; /* In / pointer to array copied out */ + int numberofholes; /* In / copied out */ + +- REAL *regionlist; /* In / pointer to array copied out */ ++ double *regionlist; /* In / pointer to array copied out */ + int numberofregions; /* In / copied out */ + + int *edgelist; /* Out only */ + int *edgemarkerlist; /* Not used with Voronoi diagram; out only */ +- REAL *normlist; /* Used only with Voronoi diagram; out only */ ++ double *normlist; /* Used only with Voronoi diagram; out only */ + int numberofedges; /* Out only */ + }; + +-#ifdef ANSI_DECLARATORS + void triangulate(char *, struct triangulateio *, struct triangulateio *, + struct triangulateio *); +-void trifree(VOID *memptr); +-#else /* not ANSI_DECLARATORS */ +-void triangulate(); +-void trifree(); +-#endif /* not ANSI_DECLARATORS */ ++void trifree(void *memptr); ++ ++#ifdef __cplusplus ++} ++#endif +\ No newline at end of file diff --git a/externals/vcpkg/ports/triangle/exports.def b/externals/vcpkg/ports/triangle/exports.def new file mode 100755 index 000000000..5c4ba321e --- /dev/null +++ b/externals/vcpkg/ports/triangle/exports.def @@ -0,0 +1,3 @@ +EXPORTS + triangulate + trifree \ No newline at end of file diff --git a/externals/vcpkg/ports/triangle/portfile.cmake b/externals/vcpkg/ports/triangle/portfile.cmake new file mode 100755 index 000000000..15f027c2c --- /dev/null +++ b/externals/vcpkg/ports/triangle/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_download_distfile(ARCHIVE_FILE + URLS "http://www.netlib.org/voronoi/triangle.zip" + FILENAME "triangle.zip" + SHA512 c9c1ac527c4bf836ed877b1c5495abf9fd2c453741f4c9698777e23cde939ebf0dd73c84cec64f35a93ca01bff4b86ce32ec559da33e570a0744a764e46d2186 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + NO_REMOVE_ONE_LEVEL + ARCHIVE ${ARCHIVE_FILE} + PATCHES + "enable_64bit_architecture.patch" +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/exports.def DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") + +file(INSTALL ${SOURCE_PATH}/README DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/triangle/vcpkg.json b/externals/vcpkg/ports/triangle/vcpkg.json new file mode 100755 index 000000000..29cd78867 --- /dev/null +++ b/externals/vcpkg/ports/triangle/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "triangle", + "version": "1.6", + "port-version": 2, + "description": "A Two-Dimensional Quality Mesh Generator and Delaunay Triangulator.", + "homepage": "http://www.cs.cmu.edu/~quake/triangle.html", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/triton/001-fix-dependency-z3.patch b/externals/vcpkg/ports/triton/001-fix-dependency-z3.patch new file mode 100755 index 000000000..31e654317 --- /dev/null +++ b/externals/vcpkg/ports/triton/001-fix-dependency-z3.patch @@ -0,0 +1,30 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c8da1610..106fdb8b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -103,9 +103,9 @@ list(APPEND CMAKE_MODULE_PATH "${TRITON_ROOT}/CMakeModules/") + # Find Z3 + if(Z3_INTERFACE) + message(STATUS "Compiling with Z3 SMT solver") +- find_package(Z3 REQUIRED) +- include_directories(${Z3_INCLUDE_DIRS}) ++ find_package(Z3 CONFIG REQUIRED) + set(TRITON_Z3_INTERFACE ON) ++ set(Z3_LIBRARIES z3::libz3) + endif() + + # Find bitwuzla +diff --git a/src/libtriton/Config.cmake.in b/src/libtriton/Config.cmake.in +index 90cf6bfe..33f27d23 100644 +--- a/src/libtriton/Config.cmake.in ++++ b/src/libtriton/Config.cmake.in +@@ -47,8 +47,7 @@ endif() + + # Z3 include directories + if (TRITON_Z3_INTERFACE) +- include_directories("@Z3_INCLUDE_DIRS@") +- link_directories(BEFORE "@Z3_LIB_DIR@") ++ find_dependency(Z3 CONFIG) + endif() + + # Bitwuzla include directories diff --git a/externals/vcpkg/ports/triton/002-fix-capstone-5.patch b/externals/vcpkg/ports/triton/002-fix-capstone-5.patch new file mode 100755 index 000000000..4d2f08c56 --- /dev/null +++ b/externals/vcpkg/ports/triton/002-fix-capstone-5.patch @@ -0,0 +1,62 @@ +diff --git a/src/libtriton/arch/x86/x86Specifications.cpp b/src/libtriton/arch/x86/x86Specifications.cpp +index 0806ac3..6295c95 100644 +--- a/src/libtriton/arch/x86/x86Specifications.cpp ++++ b/src/libtriton/arch/x86/x86Specifications.cpp +@@ -153,9 +153,11 @@ namespace triton { + tritonId = triton::arch::x86::ID_INS_FIADD; + break; + ++#if CS_API_MAJOR < 5 + case triton::extlibs::capstone::X86_INS_FADDP: + tritonId = triton::arch::x86::ID_INS_FADDP; + break; ++#endif + + case triton::extlibs::capstone::X86_INS_ADOX: + tritonId = triton::arch::x86::ID_INS_ADOX; +@@ -2877,9 +2879,11 @@ namespace triton { + tritonId = triton::arch::x86::ID_INS_FUCOM; + break; + ++#if CS_API_MAJOR < 5 + case triton::extlibs::capstone::X86_INS_UD2B: + tritonId = triton::arch::x86::ID_INS_UD2B; + break; ++#endif + + case triton::extlibs::capstone::X86_INS_UNPCKHPD: + tritonId = triton::arch::x86::ID_INS_UNPCKHPD; +@@ -3037,17 +3041,21 @@ namespace triton { + tritonId = triton::arch::x86::ID_INS_VCVTDQ2PS; + break; + ++#if CS_API_MAJOR < 5 + case triton::extlibs::capstone::X86_INS_VCVTPD2DQX: + tritonId = triton::arch::x86::ID_INS_VCVTPD2DQX; + break; ++#endif + + case triton::extlibs::capstone::X86_INS_VCVTPD2DQ: + tritonId = triton::arch::x86::ID_INS_VCVTPD2DQ; + break; + ++#if CS_API_MAJOR < 5 + case triton::extlibs::capstone::X86_INS_VCVTPD2PSX: + tritonId = triton::arch::x86::ID_INS_VCVTPD2PSX; + break; ++#endif + + case triton::extlibs::capstone::X86_INS_VCVTPD2PS: + tritonId = triton::arch::x86::ID_INS_VCVTPD2PS; +@@ -3093,9 +3101,11 @@ namespace triton { + tritonId = triton::arch::x86::ID_INS_VCVTSS2USI; + break; + ++#if CS_API_MAJOR < 5 + case triton::extlibs::capstone::X86_INS_VCVTTPD2DQX: + tritonId = triton::arch::x86::ID_INS_VCVTTPD2DQX; + break; ++#endif + + case triton::extlibs::capstone::X86_INS_VCVTTPD2DQ: + tritonId = triton::arch::x86::ID_INS_VCVTTPD2DQ; diff --git a/externals/vcpkg/ports/triton/003-fix-python.patch b/externals/vcpkg/ports/triton/003-fix-python.patch new file mode 100755 index 000000000..24c123784 --- /dev/null +++ b/externals/vcpkg/ports/triton/003-fix-python.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c8da1610..40ab12c1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -53,7 +53,6 @@ if(PYTHON_BINDINGS) + find_package(PythonInterp ${PYTHON_VERSION} REQUIRED) + find_package(PythonLibs ${PYTHON_VERSION} REQUIRED) + include_directories(${PYTHON_INCLUDE_DIRS}) +- add_definitions("-DPYTHON_LIBRARIES=\"${PYTHON_LIBRARIES}\"") + cmake_path(GET PYTHON_LIBRARY PARENT_PATH PYTHON_LIB_DIR) + cmake_path(GET PYTHON_LIBRARY STEM LAST_ONLY PYTHON_LIB_NAME) + string(REGEX REPLACE "^lib" "" PYTHON_LIB_NAME ${PYTHON_LIB_NAME}) +diff --git a/src/libtriton/CMakeLists.txt b/src/libtriton/CMakeLists.txt +index 7101cce8..a052b066 100644 +--- a/src/libtriton/CMakeLists.txt ++++ b/src/libtriton/CMakeLists.txt +@@ -330,9 +330,9 @@ if(PYTHON_BINDINGS) + if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + execute_process (COMMAND ${PYTHON_EXECUTABLE} -c "from sysconfig import get_path; print(get_path('platlib'))" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) + if(${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "GNU") +- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/triton${PYTHON_SUFFIX} DESTINATION ${PYTHON_SITE_PACKAGES}) ++ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_CONFIG_NAME}/triton${PYTHON_SUFFIX} DESTINATION share/triton) + else() +- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/triton${PYTHON_SUFFIX} DESTINATION ${PYTHON_SITE_PACKAGES}) ++ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/triton${PYTHON_SUFFIX} DESTINATION share/triton) + endif() + else() + execute_process (COMMAND ${PYTHON_EXECUTABLE} -c "from sys import version_info; print(f'lib/python{version_info[0]}.{version_info[1]}/site-packages')" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) diff --git a/externals/vcpkg/ports/triton/portfile.cmake b/externals/vcpkg/ports/triton/portfile.cmake new file mode 100755 index 000000000..3786b0a24 --- /dev/null +++ b/externals/vcpkg/ports/triton/portfile.cmake @@ -0,0 +1,53 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO JonathanSalwan/Triton + REF 243026c9c1e07a5ca834c4aaf628d1079f6a85ea + SHA512 9e46c500203647de545286b78a7d4ae6da1796b8eed30fe7346ae6e51865ef70de1adb858c402c3687c471ad654cc6aefdff8893196f5ef7b45e4cee6dd9c577 + PATCHES + 001-fix-dependency-z3.patch + 002-fix-capstone-5.patch + 003-fix-python.patch +) + +string(COMPARE NOTEQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DYNAMICLIB) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATICCRT) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "python" PYTHON_BINDINGS +) + +set(ADDITIONAL_OPTIONS ) +if(PYTHON_BINDINGS) + vcpkg_find_acquire_program(PYTHON3) + list(APPEND ADDITIONAL_OPTIONS + -DPYTHON_EXECUTABLE=${PYTHON3} + ) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DZ3_INTERFACE=ON + -DTRITON_BOOST_INTERFACE=OFF + -DBUILD_SHARED_LIBS=${DYNAMICLIB} + -DMSVC_STATIC=${STATICCRT} + -DBUILD_EXAMPLES=OFF + -DENABLE_TEST=OFF + ${ADDITIONAL_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +# Move cmake configs +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +# Remove duplicate files +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/triton/vcpkg.json b/externals/vcpkg/ports/triton/vcpkg.json new file mode 100755 index 000000000..d23ab93a2 --- /dev/null +++ b/externals/vcpkg/ports/triton/vcpkg.json @@ -0,0 +1,40 @@ +{ + "name": "triton", + "version": "0.9", + "port-version": 3, + "description": "Triton is a Dynamic Binary Analysis (DBA) framework. It provides internal components like a Dynamic Symbolic Execution (DSE) engine, a dynamic taint engine, AST representations of the x86, x86-64, ARM32 and AArch64 Instructions Set Architecture (ISA), SMT simplification passes, an SMT solver interface and, the last but not least, Python bindings.", + "homepage": "https://github.com/JonathanSalwan/Triton", + "license": "Apache-2.0", + "supports": "!arm", + "dependencies": [ + { + "name": "capstone", + "default-features": false, + "features": [ + "arm", + "arm64", + "x86" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "z3" + ], + "features": { + "python": { + "description": "Build Triton with Python bindings", + "dependencies": [ + { + "name": "python3", + "default-features": false + } + ] + } + } +} diff --git a/externals/vcpkg/ports/trompeloeil/disable_master_project.patch b/externals/vcpkg/ports/trompeloeil/disable_master_project.patch new file mode 100755 index 000000000..155363d7d --- /dev/null +++ b/externals/vcpkg/ports/trompeloeil/disable_master_project.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6e59ab8..615a6cb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,9 +34,6 @@ target_include_directories( + ) + + set(MASTER_PROJECT OFF) +-if (${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR}) +- set(MASTER_PROJECT ON) +-endif() + + if (MASTER_PROJECT AND CMAKE_BUILD_TYPE MATCHES Debug) + diff --git a/externals/vcpkg/ports/trompeloeil/portfile.cmake b/externals/vcpkg/ports/trompeloeil/portfile.cmake new file mode 100755 index 000000000..1390637eb --- /dev/null +++ b/externals/vcpkg/ports/trompeloeil/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rollbear/trompeloeil + REF v41 + SHA512 f68a3f1c5f2cd1b49fb8c90612383d68ca1a0bcd1ca6b0a0fbe6e3cef23af011b5503d788023519f182a1221d55774796115f9248caf33175f919fd18e5e43f9 + HEAD_REF master + PATCHES disable_master_project.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/trompeloeil) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/include/trompeloeil.hpp") + message(FATAL_ERROR "Main includes have moved. Please update the forwarder.") +endif() + +configure_file("${SOURCE_PATH}/LICENSE_1_0.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/trompeloeil/vcpkg.json b/externals/vcpkg/ports/trompeloeil/vcpkg.json new file mode 100755 index 000000000..6c70e20d3 --- /dev/null +++ b/externals/vcpkg/ports/trompeloeil/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "trompeloeil", + "version": "41", + "description": "A thread-safe header-only mocking framework for C++11/14 using the Boost Software License 1.0", + "homepage": "https://github.com/rollbear/trompeloeil", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/tsl-hopscotch-map/portfile.cmake b/externals/vcpkg/ports/tsl-hopscotch-map/portfile.cmake new file mode 100755 index 000000000..b74e41409 --- /dev/null +++ b/externals/vcpkg/ports/tsl-hopscotch-map/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Tessil/hopscotch-map + REF 29030f55ca518bb1be5113ab0a8e134772024a9d # v2.3.0 + SHA512 944f26fe0faa59b799ddf741c4f86b715934e740bfbb40a157f667eaff07013a35ad40a343b720b36279acefbb5b206a54cfcfec1f6cd052314936d19e5da413 +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +file(INSTALL ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright +) diff --git a/externals/vcpkg/ports/tsl-hopscotch-map/vcpkg.json b/externals/vcpkg/ports/tsl-hopscotch-map/vcpkg.json new file mode 100755 index 000000000..b3d3792e2 --- /dev/null +++ b/externals/vcpkg/ports/tsl-hopscotch-map/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "tsl-hopscotch-map", + "version-string": "2.3.0", + "port-version": 1, + "description": "C++ implementation of a fast hash map and hash set using hopscotch hashing" +} diff --git a/externals/vcpkg/ports/tsl-ordered-map/portfile.cmake b/externals/vcpkg/ports/tsl-ordered-map/portfile.cmake new file mode 100755 index 000000000..4605d72eb --- /dev/null +++ b/externals/vcpkg/ports/tsl-ordered-map/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Tessil/ordered-map + REF 4051af7e344e0c0c6af5573b064342c0987d1028 # v1.0.0 + SHA512 c4789df12db34bba1a1b2e07ada39afd6bfb637d34006675ee7f83253e49b5741d301cebb7c368c7a99311c51304f844a6229d00df3717e346e5fc1254e7721b +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +file(INSTALL ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright +) diff --git a/externals/vcpkg/ports/tsl-ordered-map/vcpkg.json b/externals/vcpkg/ports/tsl-ordered-map/vcpkg.json new file mode 100755 index 000000000..8ce8f079f --- /dev/null +++ b/externals/vcpkg/ports/tsl-ordered-map/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "tsl-ordered-map", + "version-string": "1.0.0", + "port-version": 1, + "description": "C++ hash map and hash set which preserve the order of insertion" +} diff --git a/externals/vcpkg/ports/tsl-sparse-map/portfile.cmake b/externals/vcpkg/ports/tsl-sparse-map/portfile.cmake new file mode 100755 index 000000000..9feba6cc3 --- /dev/null +++ b/externals/vcpkg/ports/tsl-sparse-map/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Tessil/sparse-map + REF d71e6fd75f4970f07f4f1fe67438055be70d0945 # v0.6.2 + SHA512 ad270be66b3d5f96cb0305f0e086807aee1c909dd022c19ca99e5f7a72d5116f2ecb4b67fcb80e8bdb4f98925387d95bdc0bcc450a10b97c61f9b92c681f95b5 +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +file(INSTALL ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright +) diff --git a/externals/vcpkg/ports/tsl-sparse-map/vcpkg.json b/externals/vcpkg/ports/tsl-sparse-map/vcpkg.json new file mode 100755 index 000000000..ff5229abc --- /dev/null +++ b/externals/vcpkg/ports/tsl-sparse-map/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "tsl-sparse-map", + "version-string": "0.6.2", + "port-version": 1, + "description": "C++ implementation of a memory efficient hash map and hash set" +} diff --git a/externals/vcpkg/ports/ttauri/portfile.cmake b/externals/vcpkg/ports/ttauri/portfile.cmake new file mode 100755 index 000000000..52eeca7ba --- /dev/null +++ b/externals/vcpkg/ports/ttauri/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ttauri-project/ttauri + REF v0.5.0 + SHA512 946c8b7fbd030235d06fff3e100c6be15c2dd360306c674906eb395067642ea38551290ebf4d2c398798219b5c0711eeaecb57bc5021db9f91ec343baab64171 + HEAD_REF main +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DTT_BUILD_TESTS=OFF + -DTT_BUILD_EXAMPLES=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets() +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/externals/vcpkg/ports/ttauri/vcpkg.json b/externals/vcpkg/ports/ttauri/vcpkg.json new file mode 100755 index 000000000..b59bd25f4 --- /dev/null +++ b/externals/vcpkg/ports/ttauri/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "ttauri", + "version": "0.5.0", + "port-version": 1, + "maintainers": "@takev", + "description": "A portable, low latency, retained-mode GUI framework written in C++.", + "homepage": "https://github.com/ttauri-project/ttauri", + "license": "BSL-1.0", + "supports": "windows & x64", + "dependencies": [ + "vulkan", + "vulkan-memory-allocator" + ] +} diff --git a/externals/vcpkg/ports/turbobase64/CMakeLists.txt b/externals/vcpkg/ports/turbobase64/CMakeLists.txt new file mode 100755 index 000000000..c4fcebc47 --- /dev/null +++ b/externals/vcpkg/ports/turbobase64/CMakeLists.txt @@ -0,0 +1,70 @@ +cmake_minimum_required(VERSION 3.14) + +project(turbobase64 C) +if (SOURCE_PATH) + set(CMAKE_SOURCE_DIR ${SOURCE_PATH}) +endif () + +#Copyright 2016-2020 Yandex LLC +# https://github.com/ClickHouse/ClickHouse/blob/master/contrib/base64-cmake/CMakeLists.txt +# +#Apache License +#Version 2.0, January 2004 +#http://www.apache.org/licenses/ +#Yandex code starts + +SET(LIBRARY_DIR ${CMAKE_SOURCE_DIR}) + +add_library(base64_scalar OBJECT ${LIBRARY_DIR}/turbob64c.c ${LIBRARY_DIR}/turbob64d.c) +add_library(base64_ssse3 OBJECT ${LIBRARY_DIR}/turbob64sse.c) # This file also contains code for ARM NEON + +if (ARCH_AMD64) + add_library(base64_avx OBJECT ${LIBRARY_DIR}/turbob64sse.c) # This is not a mistake. One file is compiled twice. + add_library(base64_avx2 OBJECT ${LIBRARY_DIR}/turbob64avx2.c) +endif () + +target_compile_options(base64_scalar PRIVATE -falign-loops) + +if (ARCH_AMD64) + target_compile_options(base64_ssse3 PRIVATE -mssse3 -falign-loops) + target_compile_options(base64_avx PRIVATE -falign-loops -mavx) + target_compile_options(base64_avx2 PRIVATE -falign-loops -mavx2) +else () + target_compile_options(base64_ssse3 PRIVATE -falign-loops) +endif () + +if (ARCH_AMD64) + add_library(base64 + $ + $ + $ + $) +else () + add_library(base64 + $ + $) +endif () + +# End of Yandex code + +target_include_directories(base64 SYSTEM PUBLIC $) +set_target_properties(base64 PROPERTIES PUBLIC_HEADER "${CMAKE_SOURCE_DIR}/turbob64.h") + +install(TARGETS base64 + EXPORT base64Config + RUNTIME DESTINATION "bin" + LIBRARY DESTINATION "lib" + ARCHIVE DESTINATION "lib" + PUBLIC_HEADER DESTINATION "include" + COMPONENT dev + ) + +export(TARGETS base64 + NAMESPACE TURBO:: + FILE "share/base64/base64Config.cmake" + ) + +install(EXPORT base64Config + DESTINATION "share/base64" + NAMESPACE TURBO:: + ) \ No newline at end of file diff --git a/externals/vcpkg/ports/turbobase64/portfile.cmake b/externals/vcpkg/ports/turbobase64/portfile.cmake new file mode 100755 index 000000000..e4db2c00b --- /dev/null +++ b/externals/vcpkg/ports/turbobase64/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO powturbo/Turbo-Base64 + REF 95ba56a9b041f9933f5cd2bbb2ee4e083468c20a + SHA512 bacab8ede5e20974207e01c13a93e6d8afc8d08bc84f1da2b6efa1b4d17408cef6cea085e209a8b7d3b2e2a7223a785f8c76aa954c3c787e9b8d891880b63606 + HEAD_REF master +) + +configure_file(${CURRENT_PORT_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/turbobase64/vcpkg.json b/externals/vcpkg/ports/turbobase64/vcpkg.json new file mode 100755 index 000000000..b0e93558d --- /dev/null +++ b/externals/vcpkg/ports/turbobase64/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "turbobase64", + "version-date": "2020-01-12", + "port-version": 2, + "description": "Fastest Base64 SIMD/Neon library", + "homepage": "https://github.com/powturbo/Turbo-Base64", + "supports": "!windows" +} diff --git a/externals/vcpkg/ports/tvision/portfile.cmake b/externals/vcpkg/ports/tvision/portfile.cmake new file mode 100755 index 000000000..4df140166 --- /dev/null +++ b/externals/vcpkg/ports/tvision/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO magiblot/tvision + REF 638f963fe4f6c84854f60f1e9c5772bf6603e4b2 + HEAD_REF master + SHA512 87c26fed26a332dd4b2a431dfbe0f8629d6565c59f61a3968fc658beda313ee8dad9bb59f53d47b1d664c0494841850b09e5c05533b2a74a372cc03548def2c5 +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DTV_BUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/tvision/vcpkg.json b/externals/vcpkg/ports/tvision/vcpkg.json new file mode 100755 index 000000000..9d2af79cc --- /dev/null +++ b/externals/vcpkg/ports/tvision/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "tvision", + "version-date": "2021-08-10", + "port-version": 1, + "description": "A modern port of Turbo Vision 2.0, the classical framework for text-based user interfaces.", + "homepage": "https://github.com/magiblot/tvision", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/tweeny/portfile.cmake b/externals/vcpkg/ports/tweeny/portfile.cmake new file mode 100755 index 000000000..9aa0e901c --- /dev/null +++ b/externals/vcpkg/ports/tweeny/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mobius3/tweeny + REF v3.2.0 + SHA512 809b8250f7df6c3e9d27e9967c586d1ca4be29e3b551b57285da1060a6928c91e0afa6b3ef6b546cae48035383939f19d67889b632dd60a2fbb0a22aafaabe89 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH "/lib/cmake/Tweeny/") + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake/Tweeny) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/tweeny/vcpkg.json b/externals/vcpkg/ports/tweeny/vcpkg.json new file mode 100755 index 000000000..a68863b67 --- /dev/null +++ b/externals/vcpkg/ports/tweeny/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "tweeny", + "version": "3.2.0", + "description": "A modern C++ tweening library", + "homepage": "https://github.com/mobius3/tweeny" +} diff --git a/externals/vcpkg/ports/type-lite/portfile.cmake b/externals/vcpkg/ports/type-lite/portfile.cmake new file mode 100755 index 000000000..421fbf51e --- /dev/null +++ b/externals/vcpkg/ports/type-lite/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO martinmoene/type-lite + REF v0.1.0 + SHA512 5a5ea623890af9c88c7f82869278af743e08b3dbda3c48c4523737244a7da76d2509501b4502efc2226aaef5df72b6ff69cd6b5b36c8cfc282b8c8406525016b + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + test BUILD_TESTS +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DTYPE_LITE_OPT_BUILD_TESTS=${BUILD_TESTS} + -DTYPE_LITE_OPT_BUILD_EXAMPLES=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) diff --git a/externals/vcpkg/ports/type-lite/vcpkg.json b/externals/vcpkg/ports/type-lite/vcpkg.json new file mode 100755 index 000000000..9fa6607e1 --- /dev/null +++ b/externals/vcpkg/ports/type-lite/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "type-lite", + "version-string": "0.1.0", + "port-version": 1, + "description": "Strong types for C++98, C++11 and later in a single-file header-only library.", + "homepage": "https://github.com/martinmoene/type-lite", + "features": { + "test": { + "description": "Build with test" + } + } +} diff --git a/externals/vcpkg/ports/type-safe/portfile.cmake b/externals/vcpkg/ports/type-safe/portfile.cmake new file mode 100755 index 000000000..de3a4080f --- /dev/null +++ b/externals/vcpkg/ports/type-safe/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO foonathan/type_safe + REF v0.2.2 + SHA512 5dbc9e906e066cfc5eb8fd9a308e952e33c7463b5d2abaadd4303ebe8c38a1d8e79865076ad6422f4c56ffa23113b291e3c11d6dd28e73ec3d6fe2e3e7a233a3 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DTYPE_SAFE_BUILD_TEST_EXAMPLE=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME type_safe CONFIG_PATH lib/cmake/type_safe) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/type-safe/vcpkg.json b/externals/vcpkg/ports/type-safe/vcpkg.json new file mode 100755 index 000000000..4d659c409 --- /dev/null +++ b/externals/vcpkg/ports/type-safe/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "type-safe", + "version": "0.2.2", + "port-version": 1, + "description": "Zero overhead abstractions that use the C++ type system to prevent bugs.", + "homepage": "https://github.com/foonathan/type_safe", + "dependencies": [ + "debug-assert", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/uchardet/fix-uwp-build.patch b/externals/vcpkg/ports/uchardet/fix-uwp-build.patch new file mode 100755 index 000000000..d08ba9e79 --- /dev/null +++ b/externals/vcpkg/ports/uchardet/fix-uwp-build.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 50a11e8..3a93c83 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -54,6 +54,10 @@ if (TARGET_ARCHITECTURE MATCHES ".*(x86|amd|i686).*") + endif (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH) + endif (TARGET_ARCHITECTURE MATCHES ".*(x86|amd|i686).*") + ++if (MSVC) ++ add_compile_options(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE) ++endif (MSVC) ++ + configure_file( + uchardet.pc.in + uchardet.pc diff --git a/externals/vcpkg/ports/uchardet/portfile.cmake b/externals/vcpkg/ports/uchardet/portfile.cmake new file mode 100755 index 000000000..a4b5f2177 --- /dev/null +++ b/externals/vcpkg/ports/uchardet/portfile.cmake @@ -0,0 +1,46 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH SOURCE_PATH + REPO uchardet/uchardet + REF 6f38ab95f55afd45ee6ccefcb92d21034b4a2521 + SHA512 a2e655d6e1eb6934cf93d99d27dfebc382eb01b6e62021f56b3fa71d269a851e7d68fe57536d40470e0329b3aa035467a9cdd9e11698f8ff76f06611ea7a58d1 + HEAD_REF master + PATCHES fix-uwp-build.patch +) + + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tool BUILD_BINARY +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DBUILD_BINARY=OFF + OPTIONS_RELEASE + ${FEATURE_OPTIONS} + OPTIONS + -DBUILD_STATIC=${BUILD_STATIC} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +if(tool IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES uchardet AUTO_CLEAN) +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share/man" +) + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/uchardet/vcpkg.json b/externals/vcpkg/ports/uchardet/vcpkg.json new file mode 100755 index 000000000..821a9cdea --- /dev/null +++ b/externals/vcpkg/ports/uchardet/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "uchardet", + "version-date": "2021-09-03", + "port-version": 2, + "description": "An encoding detector library ported from Mozilla.", + "homepage": "https://cgit.freedesktop.org/uchardet/uchardet/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "tool": { + "description": "Build uchardet CLI tool.", + "dependencies": [ + "getopt" + ] + } + } +} diff --git a/externals/vcpkg/ports/umock-c/portfile.cmake b/externals/vcpkg/ports/umock-c/portfile.cmake new file mode 100755 index 000000000..4e9345fcd --- /dev/null +++ b/externals/vcpkg/ports/umock-c/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +if("public-preview" IN_LIST FEATURES) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/umock-c + REF 87d2214384c886a1e2406ac0756a0b3786add8da + SHA512 230b6c79a8346727bbc124d1aefaa14da8ecd82b2a56d68b3d2511b8efa5931872da440137a5d266835ba8c5193b83b4bc5ee85abb5242d07904a0706727926c + HEAD_REF master + ) +else() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/umock-c + REF 504193e65d1c2f6eb50c15357167600a296df7ff + SHA512 68d5d986314dbd46d20de2a9b9454154c11675c25d1b5a5b1cfecdd0c0945d9dc68d0348ec1dbb00b5d1a6a1f0356121ba561d7c8fffb97ab37864edade5a85b + HEAD_REF master + ) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -Drun_unittests=OFF + -Drun_int_tests=OFF + -Duse_installed_dependencies=ON +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/umock_c) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) + +configure_file(${SOURCE_PATH}/readme.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/umock-c/vcpkg.json b/externals/vcpkg/ports/umock-c/vcpkg.json new file mode 100755 index 000000000..d791b44b5 --- /dev/null +++ b/externals/vcpkg/ports/umock-c/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "umock-c", + "version-date": "2022-01-21", + "description": "A pure C mocking library", + "homepage": "https://github.com/Azure/umock-c", + "dependencies": [ + "azure-macro-utils-c" + ], + "features": { + "public-preview": { + "description": "A pure C mocking library (public-preview)", + "dependencies": [ + { + "name": "azure-macro-utils-c", + "features": [ + "public-preview" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/unicorn-lib/CMakeLists.txt b/externals/vcpkg/ports/unicorn-lib/CMakeLists.txt new file mode 100755 index 000000000..b668c3c09 --- /dev/null +++ b/externals/vcpkg/ports/unicorn-lib/CMakeLists.txt @@ -0,0 +1,39 @@ +cmake_minimum_required(VERSION 3.10) + +project(Unicorn_Lib LANGUAGES CXX DESCRIPTION "Unicode library for C++ by Ross Smith") +set(CMAKE_CXX_STANDARD 17) +option(UNICORN_LIB_SKIP_HEADERS "If the headers installation is skipped or not." OFF) + +include(SelectLibraryConfigurations) +find_package(ZLIB REQUIRED) +find_library(PCRE2_LIBRARY_DEBUG NAMES pcre2-8d pcre2-8-staticd HINTS ${INSTALLED_LIB_PATH}) +find_library(PCRE2_LIBRARY_RELEASE NAMES pcre2-8 pcre2-8-static HINTS ${INSTALLED_LIB_PATH}) +select_library_configurations(PCRE2) + +file(GLOB_RECURSE UNICORN_LIB_SOURCES ${PROJECT_SOURCE_DIR}/unicorn/*.cpp) +foreach(ITR ${UNICORN_LIB_SOURCES}) + if(ITR MATCHES "(.*)-test.cpp(.*)") + list(REMOVE_ITEM UNICORN_LIB_SOURCES ${ITR}) + endif() +endforeach() +add_library(unicorn-lib ${UNICORN_LIB_SOURCES}) +target_include_directories( + unicorn-lib + PUBLIC ${PROJECT_SOURCE_DIR} +) +target_compile_definitions( + unicorn-lib + PRIVATE -DUNICODE -D_UNICODE _CRT_SECURE_NO_WARNINGS +) + +target_link_libraries(unicorn-lib PUBLIC ${PCRE2_LIBRARY}) +target_link_libraries(unicorn-lib PUBLIC ZLIB::ZLIB) + +if(NOT UNICORN_LIB_SKIP_HEADERS) + install(DIRECTORY ${PROJECT_SOURCE_DIR}/unicorn DESTINATION include FILES_MATCHING PATTERN "*.hpp") +endif() +install(TARGETS unicorn-lib + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + ) \ No newline at end of file diff --git a/externals/vcpkg/ports/unicorn-lib/portfile.cmake b/externals/vcpkg/ports/unicorn-lib/portfile.cmake new file mode 100755 index 000000000..a206c633c --- /dev/null +++ b/externals/vcpkg/ports/unicorn-lib/portfile.cmake @@ -0,0 +1,27 @@ +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + message("unicorn-lib is a static library, now build with static.") + set(VCPKG_LIBRARY_LINKAGE static) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO CaptainCrowbar/unicorn-lib + REF 44e975ffc8dcd8dedbe01a8cbe7812e351f3f74f # 2022-01-24 + SHA512 b22264420174c950ca8025e861366118d79a53edce9297d84af9511e255af5971c3719f0b464f4a4886848edea7c2ba4ae32ce9abab135628d64adbde5fa7b0d + HEAD_REF master +) + +file(COPY ${CURRENT_PORT_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DUNICORN_LIB_SKIP_HEADERS=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/unicorn-lib/vcpkg.json b/externals/vcpkg/ports/unicorn-lib/vcpkg.json new file mode 100755 index 000000000..9a7ed9aeb --- /dev/null +++ b/externals/vcpkg/ports/unicorn-lib/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "unicorn-lib", + "version-date": "2022-01-24", + "description": "Unicode library for C++ by Ross Smith", + "homepage": "https://github.com/CaptainCrowbar/unicorn-lib", + "license": "MIT", + "dependencies": [ + "pcre2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/unicorn/portfile.cmake b/externals/vcpkg/ports/unicorn/portfile.cmake new file mode 100755 index 000000000..cccfbfe21 --- /dev/null +++ b/externals/vcpkg/ports/unicorn/portfile.cmake @@ -0,0 +1,56 @@ +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "WindowsStore not supported") +endif() + +if(VCPKG_CRT_LINKAGE STREQUAL "dynamic" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + message(FATAL_ERROR "unicorn can currently only be built with /MT or /MTd (static CRT linkage)") +endif() + +# Note: this is safe because unicorn is a C library and takes steps to avoid memory allocate/free across the DLL boundary. +set(VCPKG_CRT_LINKAGE "static") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO unicorn-engine/unicorn + REF 52f90cda023abaca510d59f021c88629270ad6c0 # v1.0.3 + SHA512 bb47e7d680b122e38bd9390f44a3f7e3c3e314ea3ac86dbab3e755b7bcc2db5daca3a4432276a874f59675f811f7785d68ec0d39696c955d3718d6a720adf70b + HEAD_REF master +) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(UNICORN_PLATFORM "Win32") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(UNICORN_PLATFORM "x64") +else() + message(FATAL_ERROR "Unsupported architecture") +endif() + +vcpkg_build_msbuild( + PROJECT_PATH "${SOURCE_PATH}/msvc/unicorn.sln" + PLATFORM "${UNICORN_PLATFORM}" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(INSTALL "${SOURCE_PATH}/msvc/${UNICORN_PLATFORM}/Release/unicorn.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${SOURCE_PATH}/msvc/${UNICORN_PLATFORM}/Release/unicorn.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${SOURCE_PATH}/msvc/${UNICORN_PLATFORM}/Debug/unicorn.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(INSTALL "${SOURCE_PATH}/msvc/${UNICORN_PLATFORM}/Debug/unicorn.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") +else() + file(INSTALL "${SOURCE_PATH}/msvc/${UNICORN_PLATFORM}/Release/unicorn_static.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${SOURCE_PATH}/msvc/${UNICORN_PLATFORM}/Debug/unicorn_static.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +endif() + +file( + INSTALL "${SOURCE_PATH}/msvc/distro/include/unicorn" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" + RENAME "unicorn" +) +file( + INSTALL "${SOURCE_PATH}/COPYING" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/unicorn" + RENAME "copyright" +) +file( + INSTALL "${SOURCE_PATH}/COPYING_GLIB" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/unicorn" +) diff --git a/externals/vcpkg/ports/unicorn/vcpkg.json b/externals/vcpkg/ports/unicorn/vcpkg.json new file mode 100755 index 000000000..e4ea908ad --- /dev/null +++ b/externals/vcpkg/ports/unicorn/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "unicorn", + "version": "1.0.3", + "description": "Unicorn is a lightweight multi-platform, multi-architecture CPU emulator framework", + "homepage": "https://github.com/unicorn-engine/unicorn", + "license": "GPL-2.0-only", + "supports": "windows & !uwp & !arm" +} diff --git a/externals/vcpkg/ports/units/portfile.cmake b/externals/vcpkg/ports/units/portfile.cmake new file mode 100755 index 000000000..4d1d281c0 --- /dev/null +++ b/externals/vcpkg/ports/units/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nholthaus/units + REF v2.3.1 + SHA512 1ec9e4d7d60f073ad82a02116f16b9dda57406a3b22a5b06d34f9e5a4df8fd20cc28fc7acfd8fc33054718e0efca3973df0424563f7e1833687a6c1696b9c340 +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA # Disable this option if project cannot be built with Ninja + OPTIONS -DBUILD_TESTS=OFF +) + +vcpkg_install_cmake() + +# Handle copyright/readme/package files +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +# remove uneeded directories +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) \ No newline at end of file diff --git a/externals/vcpkg/ports/units/vcpkg.json b/externals/vcpkg/ports/units/vcpkg.json new file mode 100755 index 000000000..3169b9319 --- /dev/null +++ b/externals/vcpkg/ports/units/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "units", + "version-string": "2.3.1", + "port-version": 1, + "description": "A compile-time, header-only, dimensional analysis and unit conversion library built on c++14 with no dependencies.", + "homepage": "https://github.com/nholthaus/units" +} diff --git a/externals/vcpkg/ports/unittest-cpp/fix-include-path.patch b/externals/vcpkg/ports/unittest-cpp/fix-include-path.patch new file mode 100755 index 000000000..32455dec5 --- /dev/null +++ b/externals/vcpkg/ports/unittest-cpp/fix-include-path.patch @@ -0,0 +1,11 @@ +diff --git a/cmake/UnitTest++Config.cmake b/cmake/UnitTest++Config.cmake +index afe165c..cc43a2b 100644 +--- a/cmake/UnitTest++Config.cmake ++++ b/cmake/UnitTest++Config.cmake +@@ -1,2 +1,4 @@ + include("${CMAKE_CURRENT_LIST_DIR}/UnitTest++Targets.cmake") +-get_filename_component(UTPP_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/../../../include/" ABSOLUTE) ++get_filename_component(UTPP_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/../../include/" ABSOLUTE) ++ ++get_filename_component(UnitTest++_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/../../include/" ABSOLUTE) +\ No newline at end of file diff --git a/externals/vcpkg/ports/unittest-cpp/portfile.cmake b/externals/vcpkg/ports/unittest-cpp/portfile.cmake new file mode 100755 index 000000000..f962a5b88 --- /dev/null +++ b/externals/vcpkg/ports/unittest-cpp/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO unittest-cpp/unittest-cpp + REF v2.0.0 + SHA512 39318f4ed31534c116679a3257bf1438a6c4b3bef1894dfd40aea934950c6c8197af6a7f61539b8e9ddc67327c9388d7e8a6f8a3e0e966ad26c07554e2429cab + HEAD_REF master + PATCHES + fix-include-path.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/UnitTest++) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/unittest-cpp ${CURRENT_PACKAGES_DIR}/share/unittest++) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +# Remove duplicate includes +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/unittest-cpp/vcpkg.json b/externals/vcpkg/ports/unittest-cpp/vcpkg.json new file mode 100755 index 000000000..8e48fb8ae --- /dev/null +++ b/externals/vcpkg/ports/unittest-cpp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "unittest-cpp", + "version-semver": "2.0.0", + "port-version": 3, + "description": "A lightweight unit testing framework for C++", + "homepage": "https://github.com/unittest-cpp/unittest-cpp" +} diff --git a/externals/vcpkg/ports/unixodbc/portfile.cmake b/externals/vcpkg/ports/unixodbc/portfile.cmake new file mode 100755 index 000000000..c2d5f9776 --- /dev/null +++ b/externals/vcpkg/ports/unixodbc/portfile.cmake @@ -0,0 +1,54 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lurcher/unixODBC + REF 6c8071b1bef4e4991e7b3023a1c1c712168a818e # v2.3.11 + SHA512 5c5b189e3b62935fdee5e25f5cf9b41fb2bc68fc9bd1652cab1b109032ab586978ba14d19e83328838b55e773f099046344bb4c84ec99edac309650ed863543e + HEAD_REF master +) + +set(ENV{CFLAGS} "$ENV{CFLAGS} -Wno-error=implicit-function-declaration") + +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX) + list(APPEND OPTIONS --with-included-ltdl) +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + COPY_SOURCE + OPTIONS ${OPTIONS} +) + +vcpkg_install_make() + +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif () + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/etc" + "${CURRENT_PACKAGES_DIR}/etc" + "${CURRENT_PACKAGES_DIR}/share/man" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/man1" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/man5" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/man7" +) + +foreach(FILE config.h unixodbc_conf.h) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define BIN_PREFIX \"${CURRENT_INSTALLED_DIR}/tools/unixodbc/bin\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define DEFLIB_PATH \"${CURRENT_INSTALLED_DIR}/lib\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define EXEC_PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define INCLUDE_PREFIX \"${CURRENT_INSTALLED_DIR}/include\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define LIB_PREFIX \"${CURRENT_INSTALLED_DIR}/lib\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define SYSTEM_FILE_PATH \"${CURRENT_INSTALLED_DIR}/etc\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define SYSTEM_LIB_PATH \"${CURRENT_INSTALLED_DIR}/lib\"" "") +endforeach() + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unixodbcConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/unixodbc/unixodbcConfig.cmake b/externals/vcpkg/ports/unixodbc/unixodbcConfig.cmake new file mode 100755 index 000000000..e8565517a --- /dev/null +++ b/externals/vcpkg/ports/unixodbc/unixodbcConfig.cmake @@ -0,0 +1,31 @@ +function(set_library_target NAMESPACE LIB_NAME DEBUG_DIR RELEASE_DIR INCLUDE_DIR) + add_library(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED) + + find_library (RELEASE_LIB_FILE_NAME NAMES "lib${LIB_NAME}.a" PATHS ${RELEASE_DIR} NO_DEFAULT_PATH) + if (RELEASE_LIB_FILE_NAME) + set(LIBODBC_USE_STATIC_LIB true) + endif() + find_library (RELEASE_LIB_FILE_NAME NAMES ${LIB_NAME} PATHS ${RELEASE_DIR} NO_DEFAULT_PATH) + find_library (DEBUG_LIB_FILE_NAME NAMES "lib${LIB_NAME}.a" PATHS ${DEBUG_DIR} NO_DEFAULT_PATH) + if (DEBUG_LIB_FILE_NAME) + set(LIBODBC_USE_STATIC_LIB true) + endif() + find_library (DEBUG_LIB_FILE_NAME NAMES ${LIB_NAME} PATHS ${DEBUG_DIR} NO_DEFAULT_PATH) + set_target_properties(${NAMESPACE}::${LIB_NAME} PROPERTIES + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}" + IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}" + INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}" + ) + if(LIBODBC_USE_STATIC_LIB) + find_package(Iconv MODULE) + set_property(TARGET ${NAMESPACE}::${LIB_NAME} PROPERTY INTERFACE_LINK_LIBRARIES ${CMAKE_DL_LIBS} Iconv::Iconv) + endif() + set(${NAMESPACE}_${LIB_NAME}_FOUND 1) +endfunction() + +get_filename_component(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(ROOT "${ROOT}" PATH) +get_filename_component(ROOT "${ROOT}" PATH) + +set_library_target("UNIX" "odbc" "${ROOT}/debug/lib/" "${ROOT}/lib/" "${ROOT}/include/") \ No newline at end of file diff --git a/externals/vcpkg/ports/unixodbc/usage b/externals/vcpkg/ports/unixodbc/usage new file mode 100755 index 000000000..9e6f2f5cf --- /dev/null +++ b/externals/vcpkg/ports/unixodbc/usage @@ -0,0 +1,4 @@ +The package unixodbc is compatible with built-in CMake targets: + + find_package(unixodbc REQUIRED) + target_link_libraries(main PRIVATE UNIX::odbc) diff --git a/externals/vcpkg/ports/unixodbc/vcpkg.json b/externals/vcpkg/ports/unixodbc/vcpkg.json new file mode 100755 index 000000000..4f3457179 --- /dev/null +++ b/externals/vcpkg/ports/unixodbc/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "unixodbc", + "version": "2.3.11", + "port-version": 1, + "description": "unixODBC is an Open Source ODBC sub-system and an ODBC SDK for Linux, Mac OSX, and UNIX", + "homepage": "https://github.com/lurcher/unixODBC", + "license": "LGPL-2.1-only", + "supports": "osx | linux" +} diff --git a/externals/vcpkg/ports/unqlite/portfile.cmake b/externals/vcpkg/ports/unqlite/portfile.cmake new file mode 100755 index 000000000..a976c307f --- /dev/null +++ b/externals/vcpkg/ports/unqlite/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO symisc/unqlite + REF ddb1687036d207bbfc67b98cb470fe52ddf22f62 # 1.1.9 + SHA512 eaabaf5f35662a6ea734c18878f55f5e6e956cd151bb941321f97247bbe0b7f402ceca39c191d31e87db1c04188ca0eaf69c9b202848babfe23d5ffee48df9a7 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/unqlite/vcpkg.json b/externals/vcpkg/ports/unqlite/vcpkg.json new file mode 100755 index 000000000..4efa6c6ca --- /dev/null +++ b/externals/vcpkg/ports/unqlite/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "unqlite", + "version-string": "1.1.9", + "description": "An embedded NoSQL, transactional database engine", + "homepage": "https://unqlite.org/", + "license": "BSD-2-Clause" +} diff --git a/externals/vcpkg/ports/unrar/Config.cmake.in b/externals/vcpkg/ports/unrar/Config.cmake.in new file mode 100755 index 000000000..79add4e2f --- /dev/null +++ b/externals/vcpkg/ports/unrar/Config.cmake.in @@ -0,0 +1,22 @@ + +get_filename_component(_unrar_root "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_unrar_root "${_unrar_root}" PATH) +get_filename_component(_unrar_root "${_unrar_root}" PATH) + +set(_unrar_lib "${_unrar_root}/lib/unrar.lib") +if (EXISTS "${_unrar_lib}") + + add_library(unofficial::unrar::unrar INTERFACE IMPORTED) + set_target_properties(unofficial::unrar::unrar PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_unrar_root}/include") + set_target_properties(unofficial::unrar::unrar PROPERTIES IMPORTED_LOCATION "${_unrar_lib}") + set_property(TARGET unofficial::unrar::unrar APPEND PROPERTY IMPORTED_CONFIGURATIONS) + set(unrar_FOUND TRUE) + +else() + + set(unrar_FOUND FALSE) + +endif() +unset(_unrar_lib) + +unset(_unrar_root) diff --git a/externals/vcpkg/ports/unrar/msbuild-use-default-sma.patch b/externals/vcpkg/ports/unrar/msbuild-use-default-sma.patch new file mode 100755 index 000000000..928f5a377 --- /dev/null +++ b/externals/vcpkg/ports/unrar/msbuild-use-default-sma.patch @@ -0,0 +1,52 @@ +diff --git a/UnRARDll.vcxproj b/UnRARDll.vcxproj +index ec5c17b00..7d3d91bc6 100644 +--- a/UnRARDll.vcxproj ++++ b/UnRARDll.vcxproj +@@ -138,7 +138,6 @@ + Sync + EnableFastChecks + MultiThreadedDebug +- 4Bytes + false + Use + rar.hpp +@@ -168,7 +167,6 @@ + Sync + EnableFastChecks + MultiThreadedDebug +- 4Bytes + false + Use + rar.hpp +@@ -198,7 +196,6 @@ + false + Sync + MultiThreaded +- 4Bytes + true + true + NoExtensions +@@ -239,7 +236,6 @@ + false + Sync + MultiThreaded +- 4Bytes + true + true + false +@@ -274,7 +270,6 @@ + false + Sync + MultiThreaded +- 4Bytes + true + true + NoExtensions +@@ -315,7 +310,6 @@ + false + Sync + MultiThreaded +- 4Bytes + true + true + false diff --git a/externals/vcpkg/ports/unrar/portfile.cmake b/externals/vcpkg/ports/unrar/portfile.cmake new file mode 100755 index 000000000..a7041a813 --- /dev/null +++ b/externals/vcpkg/ports/unrar/portfile.cmake @@ -0,0 +1,42 @@ +set(UNRAR_VERSION "5.8.1") +set(UNRAR_SHA512 31303df575e8a5ed9fc03e20d0482306536c3496894a39788052c5c9dfde61eb7f5ca29b8c48354581622a020aa446f108af956ab43024a48731a12233155612) +set(UNRAR_FILENAME unrarsrc-${UNRAR_VERSION}.tar.gz) +set(UNRAR_URL https://www.rarlab.com/rar/${UNRAR_FILENAME}) + +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +#SRC +vcpkg_download_distfile(ARCHIVE + URLS ${UNRAR_URL} + FILENAME ${UNRAR_FILENAME} + SHA512 ${UNRAR_SHA512} +) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${UNRAR_VERSION} + PATCHES msbuild-use-default-sma.patch +) + +vcpkg_build_msbuild( + PROJECT_PATH "${SOURCE_PATH}/UnRARDll.vcxproj" + OPTIONS_DEBUG /p:OutDir=../../${TARGET_TRIPLET}-dbg/ + OPTIONS_RELEASE /p:OutDir=../../${TARGET_TRIPLET}-rel/ + OPTIONS /VERBOSITY:Diagnostic /DETAILEDSUMMARY +) + +#INCLUDE (named dll.hpp in source, and unrar.h in all rarlabs distributions) +file(INSTALL "${SOURCE_PATH}/dll.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME unrar.h) + +#DLL & LIB +file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/unrar.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/unrar.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/unrar.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") +file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/unrar.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + +vcpkg_copy_pdbs() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-unrar/unofficial-unrar-config.cmake" @ONLY) + +#COPYRIGHT +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/unrar/vcpkg.json b/externals/vcpkg/ports/unrar/vcpkg.json new file mode 100755 index 000000000..579dc62ea --- /dev/null +++ b/externals/vcpkg/ports/unrar/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "unrar", + "version": "5.8.1", + "port-version": 3, + "description": "rarlab's unrar library", + "homepage": "https://www.rarlab.com", + "license": null, + "supports": "windows & !uwp & !arm & !static" +} diff --git a/externals/vcpkg/ports/upb/add-all-libs-target.patch b/externals/vcpkg/ports/upb/add-all-libs-target.patch new file mode 100755 index 000000000..9a6a6d242 --- /dev/null +++ b/externals/vcpkg/ports/upb/add-all-libs-target.patch @@ -0,0 +1,25 @@ +diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt +index b4f43f9..c90968f 100644 +--- a/cmake/CMakeLists.txt ++++ b/cmake/CMakeLists.txt +@@ -137,4 +137,20 @@ add_library(table INTERFACE) + target_link_libraries(table INTERFACE + port) + ++add_library(all_libs INTERFACE) ++target_link_libraries(all_libs ++ INTERFACE ++ upb ++ fastdecode ++ utf8_range ++ json ++ port ++ table ++ descriptor_upb_proto ++ reflection ++ textformat ++) ++set_target_properties(reflection PROPERTIES OUTPUT_NAME upb_reflection) ++set_target_properties(fastdecode PROPERTIES OUTPUT_NAME upb_fastdecode) ++set_target_properties(textformat PROPERTIES OUTPUT_NAME upb_textformat) + diff --git a/externals/vcpkg/ports/upb/add-cmake-install.patch b/externals/vcpkg/ports/upb/add-cmake-install.patch new file mode 100755 index 000000000..51e740d03 --- /dev/null +++ b/externals/vcpkg/ports/upb/add-cmake-install.patch @@ -0,0 +1,41 @@ +diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt +index c90968f..50637ec 100644 +--- a/cmake/CMakeLists.txt ++++ b/cmake/CMakeLists.txt +@@ -8,7 +8,7 @@ else() + cmake_policy(VERSION 3.12) + endif() + +-cmake_minimum_required (VERSION 3.0) ++cmake_minimum_required (VERSION 3.14) + cmake_policy(SET CMP0048 NEW) + + project(upb) +@@ -154,3 +154,27 @@ set_target_properties(reflection PROPERTIES OUTPUT_NAME upb_reflection) + set_target_properties(fastdecode PROPERTIES OUTPUT_NAME upb_fastdecode) + set_target_properties(textformat PROPERTIES OUTPUT_NAME upb_textformat) + ++install( ++ DIRECTORY ../upb ++ DESTINATION include ++ FILES_MATCHING ++ PATTERN "*.h" ++ PATTERN "*.hpp" ++ PATTERN "*.inc" ++ PATTERN "*.int.h" ++) ++target_include_directories(upb PUBLIC $) ++install(TARGETS ++ upb ++ utf8_range ++ fastdecode ++ json ++ port ++ table ++ descriptor_upb_proto ++ reflection ++ textformat ++ all_libs ++ EXPORT upb-config ++) ++install(EXPORT upb-config NAMESPACE upb:: DESTINATION share/upb) diff --git a/externals/vcpkg/ports/upb/fix-cmakelists.patch b/externals/vcpkg/ports/upb/fix-cmakelists.patch new file mode 100755 index 000000000..2a01d62cc --- /dev/null +++ b/externals/vcpkg/ports/upb/fix-cmakelists.patch @@ -0,0 +1,33 @@ +diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt +index 6b4c50d..b4f43f9 100644 +--- a/cmake/CMakeLists.txt ++++ b/cmake/CMakeLists.txt +@@ -66,6 +66,10 @@ endif() + enable_testing() + + add_library(port INTERFACE) ++add_library(descriptor_upb_proto INTERFACE) ++add_library(utf8_range ++ ../third_party/utf8_range/utf8_range.c ++ ../third_party/utf8_range/utf8_range.h) + add_library(upb + ../upb/decode.c + ../upb/decode_internal.h +@@ -84,7 +88,7 @@ add_library(upb + target_link_libraries(upb + fastdecode + port +- /third_party/utf8_range) ++ utf8_range) + add_library(fastdecode + ../upb/decode.h + ../upb/decode_internal.h +@@ -96,7 +100,7 @@ add_library(fastdecode + target_link_libraries(fastdecode + port + table +- /third_party/utf8_range) ++ utf8_range) + add_library(generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE) + target_link_libraries(generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE + table diff --git a/externals/vcpkg/ports/upb/fix-uwp.patch b/externals/vcpkg/ports/upb/fix-uwp.patch new file mode 100755 index 000000000..c681fa336 --- /dev/null +++ b/externals/vcpkg/ports/upb/fix-uwp.patch @@ -0,0 +1,28 @@ +diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt +index a6b432f..003615e 100644 +--- a/cmake/CMakeLists.txt ++++ b/cmake/CMakeLists.txt +@@ -59,6 +59,10 @@ elseif(UNIX) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id") + endif() + ++if (MSVC) ++ add_compile_options(/wd4146 /wd4703 -D_CRT_SECURE_NO_WARNINGS) ++endif() ++ + enable_testing() + + add_library(port INTERFACE) +diff --git a/upb/json_decode.c b/upb/json_decode.c +index bb33744..1fadd26 100644 +--- a/upb/json_decode.c ++++ b/upb/json_decode.c +@@ -1160,7 +1160,7 @@ static void jsondec_struct(jsondec *d, upb_msg *msg, const upb_msgdef *m) { + static void jsondec_wellknownvalue(jsondec *d, upb_msg *msg, + const upb_msgdef *m) { + upb_msgval val; +- const upb_fielddef *f; ++ const upb_fielddef *f = NULL; + upb_msg *submsg; + + switch (jsondec_peek(d)) { diff --git a/externals/vcpkg/ports/upb/portfile.cmake b/externals/vcpkg/ports/upb/portfile.cmake new file mode 100755 index 000000000..d7cdef245 --- /dev/null +++ b/externals/vcpkg/ports/upb/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO protocolbuffers/upb + REF 160625a9728b4031a21ad1e1c0146ea2c3a851eb # 2021-10-19 + SHA512 13b205dd4278600e6ec05c829dc6c7e449747cccb118a3b83abc0ab5ef0ab180feb364ac84da8075471697fbba798ed3d9d763934d7fe9a64ac0560f5f9d3e83 + HEAD_REF master + PATCHES + fix-uwp.patch + fix-cmakelists.patch + add-all-libs-target.patch + add-cmake-install.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/cmake" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/upb/vcpkg.json b/externals/vcpkg/ports/upb/vcpkg.json new file mode 100755 index 000000000..2f9c03412 --- /dev/null +++ b/externals/vcpkg/ports/upb/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "upb", + "version-date": "2021-10-19", + "description": "μpb (often written 'upb') is a small protobuf implementation written in C.", + "homepage": "https://github.com/protocolbuffers/upb/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/urdfdom-headers/fix-include-path.patch b/externals/vcpkg/ports/urdfdom-headers/fix-include-path.patch new file mode 100755 index 000000000..6ecfad8eb --- /dev/null +++ b/externals/vcpkg/ports/urdfdom-headers/fix-include-path.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/urdfdom_headers-config.cmake.in b/cmake/urdfdom_headers-config.cmake.in +index 4686d39..026b65e 100644 +--- a/cmake/urdfdom_headers-config.cmake.in ++++ b/cmake/urdfdom_headers-config.cmake.in +@@ -3,8 +3,8 @@ if (@PACKAGE_NAME@_CONFIG_INCLUDED) + endif() + set(@PACKAGE_NAME@_CONFIG_INCLUDED TRUE) + +-set(@PACKAGE_NAME@_INCLUDE_DIRS "${@PROJECT_NAME@_DIR}/@RELATIVE_PATH_CMAKE_DIR_TO_PREFIX@/include") ++set(@PACKAGE_NAME@_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/../../include") + +-include("${@PACKAGE_NAME@_DIR}/@PACKAGE_NAME@Export.cmake") ++include("${CMAKE_CURRENT_LIST_DIR}/@PACKAGE_NAME@Export.cmake") + + list(APPEND @PACKAGE_NAME@_TARGETS @PACKAGE_NAME@::@PACKAGE_NAME@) diff --git a/externals/vcpkg/ports/urdfdom-headers/portfile.cmake b/externals/vcpkg/ports/urdfdom-headers/portfile.cmake new file mode 100755 index 000000000..eac0cb96e --- /dev/null +++ b/externals/vcpkg/ports/urdfdom-headers/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ros/urdfdom_headers + REF a15d906ff16a7fcbf037687b9c63b946c0cc04a1 # 1.0.5 + SHA512 794acd3b077a1d8fa27d0a698cecbce42f3a7b30f867e79b9897b0d97dcd9e80d2cf3b0c75ee34f628f73afb871c439fffe4a1d7ed85c7fac6553fb1e5b56c36 + HEAD_REF master + PATCHES fix-include-path.patch + ) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) + vcpkg_fixup_cmake_targets(CONFIG_PATH CMake TARGET_PATH share/urdfdom_headers) +else() + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/urdfdom_headers/cmake TARGET_PATH share/urdfdom_headers) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/urdfdom_headers) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/urdfdom_headers) +endif() + +if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) + vcpkg_fixup_pkgconfig() +endif() + +# The config files for this project use underscore +if(EXISTS ${CURRENT_PACKAGES_DIR}/share/urdfdom-headers) + file(RENAME ${CURRENT_PACKAGES_DIR}/share/urdfdom-headers ${CURRENT_PACKAGES_DIR}/share/urdfdom_headers) +endif() + +if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +else() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +endif() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/urdfdom-headers/vcpkg.json b/externals/vcpkg/ports/urdfdom-headers/vcpkg.json new file mode 100755 index 000000000..4326813b3 --- /dev/null +++ b/externals/vcpkg/ports/urdfdom-headers/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "urdfdom-headers", + "version-string": "1.0.5", + "port-version": 2, + "description": "The URDF (U-Robot Description Format) headers provides core data structure headers for URDF.", + "homepage": "https://github.com/ros/urdfdom_headers" +} diff --git a/externals/vcpkg/ports/urdfdom/0001_use_math_defines.patch b/externals/vcpkg/ports/urdfdom/0001_use_math_defines.patch new file mode 100755 index 000000000..b791533aa --- /dev/null +++ b/externals/vcpkg/ports/urdfdom/0001_use_math_defines.patch @@ -0,0 +1,26 @@ +From a374a5b04db27fde58a11cc2ba5ea10a0d0a7dad Mon Sep 17 00:00:00 2001 +From: Mikhail Paulyshka +Date: Sun, 3 Sep 2017 23:24:55 +0300 +Subject: [PATCH] define _USE_MATH_DEFINES + +--- + urdf_parser/CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/urdf_parser/CMakeLists.txt b/urdf_parser/CMakeLists.txt +index 333226e..2158965 100644 +--- a/urdf_parser/CMakeLists.txt ++++ b/urdf_parser/CMakeLists.txt +@@ -1,5 +1,9 @@ + include_directories(include) + ++if(MSVC) ++add_definitions(-D_USE_MATH_DEFINES) ++endif() ++ + add_library(urdfdom_world SHARED src/pose.cpp src/model.cpp src/link.cpp src/joint.cpp src/world.cpp) + target_link_libraries(urdfdom_world ${TinyXML_LIBRARIES} ${console_bridge_LIBRARIES}) + set_target_properties(urdfdom_world PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERSION}) +-- +2.12.2.windows.2 + diff --git a/externals/vcpkg/ports/urdfdom/0002_fix_exports.patch b/externals/vcpkg/ports/urdfdom/0002_fix_exports.patch new file mode 100755 index 000000000..727883f8d --- /dev/null +++ b/externals/vcpkg/ports/urdfdom/0002_fix_exports.patch @@ -0,0 +1,29 @@ +From 06aa5a06ee543102bf1a4057601adba3490dad60 Mon Sep 17 00:00:00 2001 +From: Mikhail Paulyshka +Date: Sun, 3 Sep 2017 23:55:11 +0300 +Subject: [PATCH] fix exports + +--- + urdf_parser/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/urdf_parser/CMakeLists.txt b/urdf_parser/CMakeLists.txt +index 2158965..c209228 100644 +--- a/urdf_parser/CMakeLists.txt ++++ b/urdf_parser/CMakeLists.txt +@@ -15,10 +15,12 @@ set_target_properties(urdfdom_model PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERS + add_library(urdfdom_sensor SHARED src/urdf_sensor.cpp) + target_link_libraries(urdfdom_sensor urdfdom_model ${TinyXML_LIBRARIES} ${console_bridge_LIBRARIES}) + set_target_properties(urdfdom_sensor PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERSION}) ++set_target_properties(urdfdom_sensor PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) + + add_library(urdfdom_model_state SHARED src/urdf_model_state.cpp src/twist.cpp) + target_link_libraries(urdfdom_model_state ${TinyXML_LIBRARIES} ${console_bridge_LIBRARIES}) + set_target_properties(urdfdom_model_state PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERSION}) ++set_target_properties(urdfdom_model_state PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) + + # -------------------------------- + +-- +2.12.2.windows.2 + diff --git a/externals/vcpkg/ports/urdfdom/0004_fix-dependency-console_bridge.patch b/externals/vcpkg/ports/urdfdom/0004_fix-dependency-console_bridge.patch new file mode 100755 index 000000000..4e149b1a0 --- /dev/null +++ b/externals/vcpkg/ports/urdfdom/0004_fix-dependency-console_bridge.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 92762f1..f0d115d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,7 +41,7 @@ if (NOT MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + endif() + +-find_package(console_bridge 0.3 REQUIRED) ++find_package(console_bridge REQUIRED) + include_directories(SYSTEM ${console_bridge_INCLUDE_DIRS}) + link_directories(${console_bridge_LIBRARY_DIRS}) + diff --git a/externals/vcpkg/ports/urdfdom/0005-fix-config-and-install.patch b/externals/vcpkg/ports/urdfdom/0005-fix-config-and-install.patch new file mode 100755 index 000000000..a0b654fd0 --- /dev/null +++ b/externals/vcpkg/ports/urdfdom/0005-fix-config-and-install.patch @@ -0,0 +1,101 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f0d115d..9acbfbe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -58,17 +58,18 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}" + + enable_testing() + +-add_subdirectory(urdf_parser) +- + if(WIN32 AND NOT CYGWIN) + set(CMAKE_CONFIG_INSTALL_DIR CMake) + else() + set(CMAKE_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME}/cmake/) + endif() + ++add_subdirectory(urdf_parser) ++ + set(PKG_NAME ${PROJECT_NAME}) + set(PKG_LIBRARIES urdfdom_sensor urdfdom_model_state urdfdom_model urdfdom_world) + set(PKG_DEPENDS urdfdom_headers console_bridge) ++set(PKG_EXPORTS urdfdom) + set(cmake_conf_file "cmake/urdfdom-config.cmake") + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${cmake_conf_file}.in" "${CMAKE_BINARY_DIR}/${cmake_conf_file}" @ONLY) + install(FILES ${CMAKE_BINARY_DIR}/${cmake_conf_file} +diff --git a/cmake/urdfdom-config.cmake.in b/cmake/urdfdom-config.cmake.in +index fb81b47..8b4ef8f 100644 +--- a/cmake/urdfdom-config.cmake.in ++++ b/cmake/urdfdom-config.cmake.in +@@ -3,8 +3,12 @@ if (@PKG_NAME@_CONFIG_INCLUDED) + endif() + set(@PKG_NAME@_CONFIG_INCLUDED TRUE) + +-set(@PKG_NAME@_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/include" "@TinyXML_INCLUDE_DIRS@") ++get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) ++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + ++set(@PKG_NAME@_INCLUDE_DIRS "${_IMPORT_PREFIX}/include" "@TinyXML_INCLUDE_DIRS@") ++ ++if (0) + foreach(lib @PKG_LIBRARIES@) + set(onelib "${lib}-NOTFOUND") + find_library(onelib ${lib} +@@ -25,3 +29,13 @@ foreach(dep @PKG_DEPENDS@) + list(APPEND @PKG_NAME@_INCLUDE_DIRS ${${dep}_INCLUDE_DIRS}) + list(APPEND @PKG_NAME@_LIBRARIES ${${dep}_LIBRARIES}) + endforeach() ++endif() ++ ++include(CMakeFindDependencyMacro) ++find_dependency(console_bridge) ++ ++foreach(exp @PKG_EXPORTS@) ++ include(${@PROJECT_NAME@_DIR}/${exp}Export.cmake) ++endforeach() ++ ++set(@PKG_NAME@_LIBRARIES urdfdom::urdfdom_model urdfdom::urdfdom_world urdfdom::urdfdom_sensor urdfdom::urdfdom_model_state) +\ No newline at end of file +diff --git a/urdf_parser/CMakeLists.txt b/urdf_parser/CMakeLists.txt +index 731b57a..ebd0586 100644 +--- a/urdf_parser/CMakeLists.txt ++++ b/urdf_parser/CMakeLists.txt +@@ -39,10 +39,32 @@ if(BUILD_TESTING) + add_subdirectory(test) + endif() + +-INSTALL(TARGETS urdfdom_model DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-INSTALL(TARGETS urdfdom_world DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-INSTALL(TARGETS check_urdf urdf_to_graphiz urdf_mem_test +- DESTINATION ${CMAKE_INSTALL_BINDIR}) +-INSTALL(TARGETS urdfdom_sensor DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-INSTALL(TARGETS urdfdom_model_state DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++INSTALL( ++ TARGETS ++ check_urdf ++ urdf_to_graphiz ++ urdf_mem_test ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++) ++INSTALL( ++ TARGETS ++ urdfdom_model ++ urdfdom_world ++ urdfdom_sensor ++ urdfdom_model_state ++ EXPORT ++ urdfdom ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++) ++install( ++ EXPORT urdfdom ++ DESTINATION ${CMAKE_CONFIG_INSTALL_DIR} ++ NAMESPACE "${PROJECT_NAME}::" ++ FILE "urdfdomExport.cmake" ++) ++ + INSTALL(DIRECTORY include/urdf_parser DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/externals/vcpkg/ports/urdfdom/portfile.cmake b/externals/vcpkg/ports/urdfdom/portfile.cmake new file mode 100755 index 000000000..ef1dfa803 --- /dev/null +++ b/externals/vcpkg/ports/urdfdom/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ros/urdfdom + REF 0da4b20675cdbe14b532d484a1c17df85b4e1584 # 1.0.4 + SHA512 cad59307fef466e2bbe3769a4123571d48223ea25a80dde76cb25c9f6dfc961570090d188ddaf8fc93f41f355ffa240eb00abe20cdea4a5ee3e49f56d1258686 + HEAD_REF master + PATCHES + 0001_use_math_defines.patch + 0002_fix_exports.patch + 0004_fix-dependency-console_bridge.patch + 0005-fix-config-and-install.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_copy_tools(TOOL_NAMES check_urdf urdf_mem_test urdf_to_graphiz AUTO_CLEAN) + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) +else() + vcpkg_cmake_config_fixup(CONFIG_PATH lib/urdfdom/cmake) + # Empty folders + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/urdfdom") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/urdfdom") +endif() + +if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) + vcpkg_fixup_pkgconfig() +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/urdfdom/vcpkg.json b/externals/vcpkg/ports/urdfdom/vcpkg.json new file mode 100755 index 000000000..0b9ee602c --- /dev/null +++ b/externals/vcpkg/ports/urdfdom/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "urdfdom", + "version": "1.0.4", + "port-version": 5, + "description": "Provides core data structures and a simple XML parsers for populating the class data structures from an URDF file.", + "homepage": "https://github.com/ros/urdfdom", + "dependencies": [ + "console-bridge", + "tinyxml", + "urdfdom-headers", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/urho3d/add_options.patch b/externals/vcpkg/ports/urho3d/add_options.patch new file mode 100755 index 000000000..73a88cb48 --- /dev/null +++ b/externals/vcpkg/ports/urho3d/add_options.patch @@ -0,0 +1,17 @@ +diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt +index 866fc22..ee02d2e 100644 +--- a/Source/CMakeLists.txt ++++ b/Source/CMakeLists.txt +@@ -147,8 +147,12 @@ endif () + + # In order to get clean module segregation, always exclude player/samples from AAR + if (NOT ANDROID) ++ if (URHO3D_BUILD_TOOLS) + add_subdirectory (Tools) ++ endif() ++ if (URHO3D_BUILD_SAMPLES) + add_subdirectory (Samples) ++ endif() + endif () + + if (URHO3D_EXTRAS) diff --git a/externals/vcpkg/ports/urho3d/asm_files.patch b/externals/vcpkg/ports/urho3d/asm_files.patch new file mode 100755 index 000000000..91318e1d7 --- /dev/null +++ b/externals/vcpkg/ports/urho3d/asm_files.patch @@ -0,0 +1,36 @@ +diff --git a/Source/ThirdParty/AngelScript/CMakeLists.txt b/Source/ThirdParty/AngelScript/CMakeLists.txt +index 6709cf5fc..4842f20b1 100644 +--- a/Source/ThirdParty/AngelScript/CMakeLists.txt ++++ b/Source/ThirdParty/AngelScript/CMakeLists.txt +@@ -44,10 +44,10 @@ if (ARM) + elseif (MSVC AND URHO3D_64BIT) + enable_language (ASM_MASM) + # Commented out due to cmake bug - todo: Recheck if this workaround is still necessary when increasing CMake minimum version +- #set (ASM_FILES source/as_callfunc_x64_msvc_asm.asm) ++ set (ASM_FILES source/as_callfunc_x64_msvc_asm.asm) + # As a temporary workaround +- add_custom_command (OUTPUT as_callfunc_x64_msvc_asm.obj COMMAND ${CMAKE_ASM_MASM_COMPILER} -Fo ${CMAKE_CURRENT_BINARY_DIR}/as_callfunc_x64_msvc_asm.obj -c ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm COMMENT "Temporary workaround for MASM") +- set (ASM_FILES ${CMAKE_CURRENT_BINARY_DIR}/as_callfunc_x64_msvc_asm.obj ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm) ++ #add_custom_command (OUTPUT as_callfunc_x64_msvc_asm.obj COMMAND ${CMAKE_ASM_MASM_COMPILER} -Fo ${CMAKE_CURRENT_BINARY_DIR}/as_callfunc_x64_msvc_asm.obj -c ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm COMMENT "Temporary workaround for MASM") ++ #set (ASM_FILES ${CMAKE_CURRENT_BINARY_DIR}/as_callfunc_x64_msvc_asm.obj ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm) + endif () + list (APPEND SOURCE_FILES ${ASM_FILES}) + +diff --git a/Source/ThirdParty/LibCpuId/CMakeLists.txt b/Source/ThirdParty/LibCpuId/CMakeLists.txt +index 0aecafb06..677fd4b84 100644 +--- a/Source/ThirdParty/LibCpuId/CMakeLists.txt ++++ b/Source/ThirdParty/LibCpuId/CMakeLists.txt +@@ -33,10 +33,10 @@ endif () + if (MSVC AND URHO3D_64BIT) + enable_language (ASM_MASM) + # Commented out due to cmake bug +- #set (ASM_FILES src/masm-x64.asm) ++ set (ASM_FILES src/masm-x64.asm) + # As a temporary workaround +- add_custom_command (OUTPUT masm-x64.obj COMMAND ${CMAKE_ASM_MASM_COMPILER} -Fo ${CMAKE_CURRENT_BINARY_DIR}/masm-x64.obj -c ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm COMMENT "Temporary workaround for MASM") +- set (ASM_FILES ${CMAKE_CURRENT_BINARY_DIR}/masm-x64.obj ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm) ++ #add_custom_command (OUTPUT masm-x64.obj COMMAND ${CMAKE_ASM_MASM_COMPILER} -Fo ${CMAKE_CURRENT_BINARY_DIR}/masm-x64.obj -c ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm COMMENT "Temporary workaround for MASM") ++ #set (ASM_FILES ${CMAKE_CURRENT_BINARY_DIR}/masm-x64.obj ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm) + endif () + + # Define source files diff --git a/externals/vcpkg/ports/urho3d/externalproject.patch b/externals/vcpkg/ports/urho3d/externalproject.patch new file mode 100755 index 000000000..89d5dba7f --- /dev/null +++ b/externals/vcpkg/ports/urho3d/externalproject.patch @@ -0,0 +1,12 @@ +diff --git a/Source/Urho3D/CMakeLists.txt b/Source/Urho3D/CMakeLists.txt +index ae341cb3e..743302069 100644 +--- a/Source/Urho3D/CMakeLists.txt ++++ b/Source/Urho3D/CMakeLists.txt +@@ -316,6 +316,7 @@ if (URHO3D_LUA) + else () + set (ALTERNATE_COMMAND CMAKE_COMMAND ${CMAKE_COMMAND} -E env CC=${SAVED_CC} CXX=${SAVED_CXX} CI=$ENV{CI} ${CMAKE_COMMAND}) + endif () ++ set(CMAKE_DISABLE_SOURCE_CHANGES OFF) + ExternalProject_Add (tolua++ + SOURCE_DIR ${CMAKE_SOURCE_DIR}/Source/ThirdParty/toluapp/src/bin + CMAKE_ARGS -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/bin/tool -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D URHO3D_UPDATE_SOURCE_TREE=${URHO3D_UPDATE_SOURCE_TREE} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} diff --git a/externals/vcpkg/ports/urho3d/fix-dependency-readline.patch b/externals/vcpkg/ports/urho3d/fix-dependency-readline.patch new file mode 100755 index 000000000..ec36fb39a --- /dev/null +++ b/externals/vcpkg/ports/urho3d/fix-dependency-readline.patch @@ -0,0 +1,29 @@ +diff --git a/cmake/Modules/FindReadline.cmake b/cmake/Modules/FindReadline.cmake +index ad5fbd0..f1ee2e8 100644 +--- a/cmake/Modules/FindReadline.cmake ++++ b/cmake/Modules/FindReadline.cmake +@@ -48,4 +48,8 @@ endif () + include (FindPackageHandleStandardArgs) + find_package_handle_standard_args (Readline REQUIRED_VARS READLINE_LIBRARIES READLINE_INCLUDE_DIRS FAIL_MESSAGE "Could NOT find Readline development library") + ++if (READLINE_FOUND) ++ set(READLINE_LIBRARIES ${READLINE_LIBRARIES} curses) ++endif() ++ + mark_as_advanced (READLINE_INCLUDE_DIRS READLINE_LIBRARIES) +diff --git a/cmake/Modules/UrhoCommon.cmake b/cmake/Modules/UrhoCommon.cmake +index b196095..9dd0ee9 100644 +--- a/cmake/Modules/UrhoCommon.cmake ++++ b/cmake/Modules/UrhoCommon.cmake +@@ -226,9 +226,9 @@ if (CMAKE_PROJECT_NAME STREQUAL Urho3D) + option (URHO3D_TESTING "Enable testing support") + # By default this option is off (i.e. we use the MSVC dynamic runtime), this can be switched on if using Urho3D as a STATIC library + cmake_dependent_option (URHO3D_STATIC_RUNTIME "Use static C/C++ runtime libraries and eliminate the need for runtime DLLs installation (VS only)" FALSE "MSVC" FALSE) +- if (((URHO3D_LUA AND NOT URHO3D_LUAJIT) OR URHO3D_DATABASE_SQLITE) AND NOT ANDROID AND NOT IOS AND NOT TVOS AND NOT WEB AND NOT WIN32) ++ if (URHO3D_ENABLE_READLINE AND ((URHO3D_LUA AND NOT URHO3D_LUAJIT) OR URHO3D_DATABASE_SQLITE) AND NOT ANDROID AND NOT IOS AND NOT TVOS AND NOT WEB AND NOT WIN32) + # Find GNU Readline development library for Lua interpreter and SQLite's isql +- find_package (Readline) ++ find_package (Readline REQUIRED) + endif () + if (CPACK_SYSTEM_NAME STREQUAL Linux) + cmake_dependent_option (URHO3D_USE_LIB64_RPM "Enable 64-bit RPM CPack generator using /usr/lib64 and disable all other generators (Debian-based host only)" FALSE "URHO3D_64BIT AND NOT HAS_LIB64" FALSE) diff --git a/externals/vcpkg/ports/urho3d/fix-install.patch b/externals/vcpkg/ports/urho3d/fix-install.patch new file mode 100755 index 000000000..50934bfc4 --- /dev/null +++ b/externals/vcpkg/ports/urho3d/fix-install.patch @@ -0,0 +1,187 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b8f54e9..1c23bbc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -37,7 +37,6 @@ set (PATH_SUFFIX Urho3D) + if (WIN32) + set (SCRIPT_EXT .bat) + if (CMAKE_HOST_WIN32) +- set (PATH_SUFFIX .) + if (URHO3D_64BIT AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + string (REPLACE " (x86)" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") + endif () +@@ -45,7 +44,7 @@ if (WIN32) + else () + set (SCRIPT_EXT .sh) + endif () +-if (URHO3D_64BIT) ++if (0) + # Install to 'lib64' when one of these conditions is true + if ((MINGW AND CMAKE_CROSSCOMPILING) OR URHO3D_USE_LIB64_RPM OR (HAS_LIB64 AND NOT URHO3D_USE_LIB_DEB)) + set (LIB_SUFFIX 64) +@@ -59,7 +58,7 @@ set (DEST_LIBRARY_DIR lib${LIB_SUFFIX}/${PATH_SUFFIX}) + set (DEST_PKGCONFIG_DIR lib${LIB_SUFFIX}/pkgconfig) + # Install application launcher scripts + file (GLOB APP_SCRIPTS ${CMAKE_SOURCE_DIR}/bin/*${SCRIPT_EXT}) +-install (PROGRAMS ${APP_SCRIPTS} DESTINATION ${DEST_RUNTIME_DIR}) # DEST_RUNTIME_DIR variable is set by the set_output_directories() macro call in the UrhoCommon module ++install (PROGRAMS ${APP_SCRIPTS} DESTINATION ${DEST_SHARE_DIR}/script) # DEST_RUNTIME_DIR variable is set by the set_output_directories() macro call in the UrhoCommon module + # Install CMake modules and toolchains provided by and for Urho3D + install (DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/ DESTINATION ${DEST_SHARE_DIR}/cmake) # Note: the trailing slash is significant + # Install CMake build scripts and rakefile +diff --git a/Docs/CMakeLists.txt b/Docs/CMakeLists.txt +index 9993d07..9a58363 100644 +--- a/Docs/CMakeLists.txt ++++ b/Docs/CMakeLists.txt +@@ -99,7 +99,7 @@ if (DOXYGEN_FOUND) + execute_process (COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/generated/LuaPkgToDox.txt.new) + file (GLOB_RECURSE API_PKG_FILES ${CMAKE_SOURCE_DIR}/Source/Urho3D/LuaScript/pkgs/*.pkg) + add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/generated/LuaScriptAPI.dox +- COMMAND ${CMAKE_BINARY_DIR}/bin/tool/tolua++ -L ToDoxHook.lua -P -o ${CMAKE_CURRENT_BINARY_DIR}/generated/LuaScriptAPI.dox ${CMAKE_CURRENT_BINARY_DIR}/generated/LuaPkgToDox.txt ++ COMMAND ${CMAKE_BINARY_DIR}/tools/urho3d/tolua++ -L ToDoxHook.lua -P -o ${CMAKE_CURRENT_BINARY_DIR}/generated/LuaScriptAPI.dox ${CMAKE_CURRENT_BINARY_DIR}/generated/LuaPkgToDox.txt + DEPENDS tolua++ ${API_PKG_FILES} ${CMAKE_CURRENT_BINARY_DIR}/generated/LuaPkgToDox.txt ${CMAKE_SOURCE_DIR}/Source/Urho3D/LuaScript/pkgs/ToDoxHook.lua + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/Source/Urho3D/LuaScript/pkgs + COMMENT "Dumping LuaScript API to LuaScriptAPI.dox") +diff --git a/Source/ThirdParty/LuaJIT/CMakeLists.txt b/Source/ThirdParty/LuaJIT/CMakeLists.txt +index f1ec925..c310fcc 100644 +--- a/Source/ThirdParty/LuaJIT/CMakeLists.txt ++++ b/Source/ThirdParty/LuaJIT/CMakeLists.txt +@@ -603,7 +603,7 @@ if (NOT CMAKE_PROJECT_NAME MATCHES ^Urho3D-ExternalProject-LuaJIT AND NOT IOS AN + + # Install dependency files required by luajit + if (DEST_RUNTIME_DIR) +- install (DIRECTORY ${LUAJIT_DEP_DIR} DESTINATION ${DEST_RUNTIME_DIR}) ++ install (DIRECTORY ${LUAJIT_DEP_DIR} DESTINATION share/Urho3D) + endif () + endif () + +diff --git a/Source/ThirdParty/toluapp/src/bin/CMakeLists.txt b/Source/ThirdParty/toluapp/src/bin/CMakeLists.txt +index 0cd69fc..e761ef6 100644 +--- a/Source/ThirdParty/toluapp/src/bin/CMakeLists.txt ++++ b/Source/ThirdParty/toluapp/src/bin/CMakeLists.txt +@@ -52,7 +52,7 @@ if (URHO3D_UPDATE_SOURCE_TREE) + endif () + file (GLOB TOLUA lua/*.lua) + add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/generated/toluabind.c +- COMMAND ${CMAKE_BINARY_DIR}/bin/tool/tolua++ -o ${CMAKE_CURRENT_BINARY_DIR}/generated/toluabind.c -H ${CMAKE_CURRENT_BINARY_DIR}/generated/toluabind.h -n tolua tolua_scons.pkg 2>${NULL_DEVICE} || ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/toluabind.c ${CMAKE_CURRENT_BINARY_DIR}/generated/toluabind.c ++ COMMAND ${CMAKE_BINARY_DIR}/tools/urho3d/tolua++ -o ${CMAKE_CURRENT_BINARY_DIR}/generated/toluabind.c -H ${CMAKE_CURRENT_BINARY_DIR}/generated/toluabind.h -n tolua tolua_scons.pkg 2>${NULL_DEVICE} || ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/toluabind.c ${CMAKE_CURRENT_BINARY_DIR}/generated/toluabind.c + ${UPDATE_COMMAND} + DEPENDS ${TOLUA} tolua_scons.pkg + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +diff --git a/Source/Tools/CMakeLists.txt b/Source/Tools/CMakeLists.txt +index 65b59d9..db8f5cd 100644 +--- a/Source/Tools/CMakeLists.txt ++++ b/Source/Tools/CMakeLists.txt +@@ -51,24 +51,24 @@ if (CMAKE_CROSSCOMPILING) + if (URHO3D_PACKAGING) + ExternalProject_Add (PackageTool + SOURCE_DIR ${CMAKE_SOURCE_DIR}/Source/Tools/PackageTool +- CMAKE_ARGS -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/bin/tool -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D BAKED_CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} ++ CMAKE_ARGS -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/tools/urho3d -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D BAKED_CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} + ${ALTERNATE_COMMAND}) + add_make_clean_files (${CMAKE_BINARY_DIR}/bin/tool/PackageTool) + if (CMAKE_HOST_WIN32 AND NOT HAS_MKLINK) + add_dependencies (PackageTool Urho3D) # Ensure Urho3D headers are fresh when building PackageTool externally on Windows host system without MKLINK + endif () +- install (PROGRAMS ${CMAKE_BINARY_DIR}/bin/tool/PackageTool DESTINATION ${DEST_RUNTIME_DIR}/tool) ++ install (PROGRAMS ${CMAKE_BINARY_DIR}/bin/tool/PackageTool DESTINATION ${DEST_RUNTIME_DIR}) + endif () + if (URHO3D_GENERATEBINDINGS) + ExternalProject_Add (BindingGenerator + SOURCE_DIR ${CMAKE_SOURCE_DIR}/Source/Tools/BindingGenerator +- CMAKE_ARGS -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/bin/tool -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D BAKED_CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} ++ CMAKE_ARGS -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/tools/urho3d -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D BAKED_CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} + ${ALTERNATE_COMMAND}) + add_make_clean_files (${CMAKE_BINARY_DIR}/bin/tool/BindingGenerator) + if (CMAKE_HOST_WIN32 AND NOT HAS_MKLINK) + add_dependencies (BindingGenerator Urho3D) + endif () +- install (PROGRAMS ${CMAKE_BINARY_DIR}/bin/tool/BindingGenerator DESTINATION ${DEST_RUNTIME_DIR}/tool) ++ install (PROGRAMS ${CMAKE_BINARY_DIR}/bin/tool/BindingGenerator DESTINATION ${DEST_RUNTIME_DIR}) + endif () + endif () + +diff --git a/Source/Urho3D/CMakeLists.txt b/Source/Urho3D/CMakeLists.txt +index 7433020..8161011 100644 +--- a/Source/Urho3D/CMakeLists.txt ++++ b/Source/Urho3D/CMakeLists.txt +@@ -283,7 +283,7 @@ if (URHO3D_BINDINGS) + endif () + ExternalProject_Add (AutoBinder + SOURCE_DIR ${CMAKE_SOURCE_DIR}/Source/Clang-Tools +- CMAKE_ARGS -D URHO3D_CLANG_TOOLS=AutoBinder -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/bin/tool/clang -D DEST_INCLUDE_DIR=${DEST_INCLUDE_DIR} -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} ++ CMAKE_ARGS -D URHO3D_CLANG_TOOLS=AutoBinder -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/tools/urho3d/clang -D DEST_INCLUDE_DIR=${DEST_INCLUDE_DIR} -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} + ${ALTERNATE_COMMAND}) + add_make_clean_files (${CMAKE_BINARY_DIR}/bin/tool/clang/AutoBinder) + file (MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated/generated) +@@ -319,10 +319,10 @@ if (URHO3D_LUA) + set(CMAKE_DISABLE_SOURCE_CHANGES OFF) + ExternalProject_Add (tolua++ + SOURCE_DIR ${CMAKE_SOURCE_DIR}/Source/ThirdParty/toluapp/src/bin +- CMAKE_ARGS -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/bin/tool -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D URHO3D_UPDATE_SOURCE_TREE=${URHO3D_UPDATE_SOURCE_TREE} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} ++ CMAKE_ARGS -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/tools/urho3d -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D URHO3D_UPDATE_SOURCE_TREE=${URHO3D_UPDATE_SOURCE_TREE} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} + ${TRAVIS_ANDROID_FIX} + ${ALTERNATE_COMMAND}) +- add_make_clean_files (${CMAKE_BINARY_DIR}/bin/tool/tolua++) ++ add_make_clean_files (${CMAKE_BINARY_DIR}/tools/urho3d/tolua++) + else () + # Otherwise, build it internally as per normal + add_subdirectory (../ThirdParty/toluapp/src/bin ../ThirdParty/toluapp/src/bin) +@@ -343,7 +343,7 @@ if (URHO3D_LUA) + list (APPEND LUA_GEN_CPP_FILES ${GEN_CPP_FILE}) + file (GLOB PKG_FILES LuaScript/pkgs/${DIR}/*.pkg) + add_custom_command (OUTPUT ${GEN_CPP_FILE} +- COMMAND ${CMAKE_BINARY_DIR}/bin/tool/tolua++ -E ${CMAKE_PROJECT_NAME} -L ToCppHook.lua -o ${GEN_CPP_FILE} ${NAME} ++ COMMAND ${CMAKE_BINARY_DIR}/tools/urho3d/tolua++ -E ${CMAKE_PROJECT_NAME} -L ToCppHook.lua -o ${GEN_CPP_FILE} ${NAME} + DEPENDS tolua++ ${API_PKG_FILE} ${PKG_FILES} LuaScript/pkgs/ToCppHook.lua + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/LuaScript/pkgs + COMMENT "Generating tolua++ API binding on the fly for ${DIR}") +diff --git a/cmake/Modules/UrhoCommon.cmake b/cmake/Modules/UrhoCommon.cmake +index cfac648..b196095 100644 +--- a/cmake/Modules/UrhoCommon.cmake ++++ b/cmake/Modules/UrhoCommon.cmake +@@ -1358,7 +1358,7 @@ macro (find_Urho3D_tool VAR NAME) + find_program (${VAR} ${NAME} HINTS ${ARG_HINTS} PATHS ${ARG_PATHS} PATH_SUFFIXES ${ARG_PATH_SUFFIXES} DOC ${ARG_DOC} NO_DEFAULT_PATH) + mark_as_advanced (${VAR}) # Hide it from cmake-gui in non-advanced mode + if (NOT ${VAR}) +- set (${VAR} ${CMAKE_BINARY_DIR}/bin/tool/${NAME}) ++ set (${VAR} ${CMAKE_BINARY_DIR}/tools/urho3d/${NAME}) + if (ARG_MSG_MODE AND NOT CMAKE_PROJECT_NAME STREQUAL Urho3D) + message (${ARG_MSG_MODE} + "Could not find ${VAR} tool in the Urho3D build tree or Urho3D SDK. Your project may not build successfully without this tool. " +@@ -1515,8 +1515,8 @@ macro (setup_executable) + if (ARG_TOOL) + list (APPEND TARGET_PROPERTIES XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH YES) + if (NOT ARG_PRIVATE AND NOT DEST_RUNTIME_DIR MATCHES tool) +- set_output_directories (${CMAKE_BINARY_DIR}/bin/tool LOCAL RUNTIME PDB) +- set (RUNTIME_DIR ${CMAKE_BINARY_DIR}/bin/tool) ++ set_output_directories (${CMAKE_BINARY_DIR}/tools/urho3d LOCAL RUNTIME PDB) ++ set (RUNTIME_DIR ${CMAKE_BINARY_DIR}/tools/urho3d) + endif () + endif () + if (NOT ARG_NODEPS) +@@ -1570,7 +1570,6 @@ macro (setup_executable) + endif () + if (DIRECT3D_DLL AND NOT DIRECT3D_DLL_INSTALLED) + # Make a copy of the D3D DLL to the runtime directory in the installed location +- install (FILES ${DIRECT3D_DLL} DESTINATION ${DEST_RUNTIME_DIR}) + set (DIRECT3D_DLL_INSTALLED TRUE) + endif () + endif () +@@ -1692,7 +1691,7 @@ macro (setup_main_executable) + if (URHO3D_PACKAGING) + # Urho3D project builds the PackageTool as required; downstream project uses PackageTool found in the Urho3D build tree or Urho3D SDK + find_Urho3d_tool (PACKAGE_TOOL PackageTool +- HINTS ${CMAKE_BINARY_DIR}/bin/tool ${URHO3D_HOME}/bin/tool ++ HINTS ${CMAKE_BINARY_DIR}/tools/urho3d ${URHO3D_HOME}/bin/tool + DOC "Path to PackageTool" MSG_MODE WARNING) + if (CMAKE_PROJECT_NAME STREQUAL Urho3D) + set (PACKAGING_DEP DEPENDS PackageTool) +@@ -1741,7 +1740,7 @@ macro (setup_main_executable) + foreach (DIR ${RESOURCE_DIRS}) + list (FIND INSTALLED_RESOURCE_DIRS ${DIR} FOUND_INDEX) + if (FOUND_INDEX EQUAL -1) +- install (DIRECTORY ${DIR} DESTINATION ${DEST_SHARE_DIR}/resources) ++ install (DIRECTORY ${DIR} DESTINATION tools/urho3d) + list (APPEND INSTALLED_RESOURCE_DIRS ${DIR}) + endif () + # This cache variable is used to keep track of whether a resource directory has been instructed to be installed by CMake or not diff --git a/externals/vcpkg/ports/urho3d/macosx.patch b/externals/vcpkg/ports/urho3d/macosx.patch new file mode 100755 index 000000000..edcae1460 --- /dev/null +++ b/externals/vcpkg/ports/urho3d/macosx.patch @@ -0,0 +1,27 @@ +diff --git a/Source/ThirdParty/Assimp/contrib/zlib/gzguts.h b/Source/ThirdParty/Assimp/contrib/zlib/gzguts.h +index 6378d468a..c8563db52 100644 +--- a/Source/ThirdParty/Assimp/contrib/zlib/gzguts.h ++++ b/Source/ThirdParty/Assimp/contrib/zlib/gzguts.h +@@ -38,6 +38,9 @@ + #if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32) + # include + #endif ++#ifdef __APPLE__ ++# include ++#endif + + #if defined(_WIN32) + # define WIDECHAR +diff --git a/Source/ThirdParty/Civetweb/src/civetweb.c b/Source/ThirdParty/Civetweb/src/civetweb.c +index 4d26e0a83..2bd577e81 100644 +--- a/Source/ThirdParty/Civetweb/src/civetweb.c ++++ b/Source/ThirdParty/Civetweb/src/civetweb.c +@@ -167,6 +167,8 @@ mg_static_assert(sizeof(void *) >= sizeof(int), "data type size check"); + + #endif + ++#include ++ + #if !defined(DEBUG_TRACE) + #if defined(DEBUG) + diff --git a/externals/vcpkg/ports/urho3d/portfile.cmake b/externals/vcpkg/ports/urho3d/portfile.cmake new file mode 100755 index 000000000..a79dcf225 --- /dev/null +++ b/externals/vcpkg/ports/urho3d/portfile.cmake @@ -0,0 +1,119 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO urho3d/Urho3D + REF fff115a0c0cd50b8a34dfa20b4c5f33eb4f765c8 + SHA512 4bddcd1d4165b74134a499616710c382d0463db24382aaa3111b8b38e82818053144d4ecb0ba7156589da1e18d85c0f20e0d847237291685ea80957f0bf7f8be + HEAD_REF master + PATCHES + asm_files.patch + macosx.patch + shared_libs.patch + externalproject.patch + add_options.patch + fix-install.patch + fix-dependency-readline.patch +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(URHO3D_LIB_TYPE "STATIC") +else() + set(URHO3D_LIB_TYPE "SHARED") +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + readline URHO3D_ENABLE_READLINE + tools URHO3D_BUILD_TOOLS + examples URHO3D_BUILD_SAMPLES +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DURHO3D_LIB_TYPE=${URHO3D_LIB_TYPE} + -DURHO3D_PCH=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/share/Urho3D/CMake/Modules") + vcpkg_cmake_config_fixup(CONFIG_PATH share/Urho3D/CMake/Modules) +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/share/CMake/Modules") + vcpkg_cmake_config_fixup(CONFIG_PATH share/CMake/Modules) +endif() + +# Handle tools +if ("tools" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_ANDROID) + vcpkg_copy_tools(TOOL_NAMES AssetImporter OgreImporter PackageTool RampGenerator ScriptCompiler SpritePacker + SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools/urho3d" + AUTO_CLEAN + ) + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/tool" "${CURRENT_PACKAGES_DIR}/debug/bin/tool") + + vcpkg_copy_tools(TOOL_NAMES Urho3DPlayer AUTO_CLEAN) + + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/Urho3DPlayer_d${VCPKG_TARGET_EXECUTABLE_SUFFIX}") +endif() + +# Handle examples +if ("examples" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_ANDROID) + file(GLOB URHO3D_BINARIES "${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + foreach(URHO3D_BINARY ${URHO3D_BINARIES}) + get_filename_component(BINARY_NAME ${URHO3D_BINARY} NAME_WE) + if (BINARY_NAME MATCHES "[0-9][0-9]\_.+") + list(APPEND URHO3D_TOOLS ${BINARY_NAME}) + endif() + endforeach() + vcpkg_copy_tools(TOOL_NAMES ${URHO3D_TOOLS} AUTO_CLEAN) + + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + foreach(URHO3D_TOOL IN_LIST ${URHO3D_TOOLS}) + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${URHO3D_TOOL}_d${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + endforeach() + endif() +endif() + +if (EXISTS "${CURRENT_PACKAGES_DIR}/bin/luajit${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + list(APPEND LUA_EXES "luajit") +endif() +if (EXISTS "${CURRENT_PACKAGES_DIR}/bin/lua${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + list(APPEND LUA_EXES "lua") +endif() +if (EXISTS "${CURRENT_PACKAGES_DIR}/bin/luac${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + list(APPEND LUA_EXES "luac") +endif() +vcpkg_copy_tools(TOOL_NAMES ${LUA_EXES} AUTO_CLEAN) + +# Cleanup +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# Fix includes +list(APPEND SDL_RELATED_HEADERS + "${CURRENT_PACKAGES_DIR}/include/Urho3D/Input/InputConstants.h" + "${CURRENT_PACKAGES_DIR}/include/Urho3D/IO/NamedPipe.h" + "${CURRENT_PACKAGES_DIR}/include/Urho3D/IO/RWOpsWrapper.h" +) +foreach (SDL_RELATED_HEADER IN LISTS SDL_RELATED_HEADERS) + vcpkg_replace_string("${SDL_RELATED_HEADER}" + "#include + Level3 + Disabled +- WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_USE_32BIT_TIME_T;HAVE_LIBIMOBILEDEVICE ++ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_USE_32BIT_TIME_T;HAVE_LIBIMOBILEDEVICE;HAVE_ENUM_IDEVICE_CONNECTION_TYPE;PACKAGE_URL="";PACKAGE_BUGREPORT="" + 4013 + + +@@ -144,7 +144,7 @@ + + Level3 + Disabled +- _DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;WIN32;HAVE_LIBIMOBILEDEVICE ++ _DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;WIN32;HAVE_LIBIMOBILEDEVICE;HAVE_ENUM_IDEVICE_CONNECTION_TYPE;PACKAGE_URL="";PACKAGE_BUGREPORT="" + + + Console +@@ -160,7 +160,7 @@ + MaxSpeed + true + true +- WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_USE_32BIT_TIME_T;HAVE_LIBIMOBILEDEVICE ++ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_USE_32BIT_TIME_T;HAVE_LIBIMOBILEDEVICE;HAVE_ENUM_IDEVICE_CONNECTION_TYPE;PACKAGE_URL="";PACKAGE_BUGREPORT="" + 4013 + + +@@ -179,7 +179,7 @@ + MaxSpeed + true + true +- NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;WIN32;HAVE_LIBIMOBILEDEVICE ++ NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;WIN32;HAVE_LIBIMOBILEDEVICE;HAVE_ENUM_IDEVICE_CONNECTION_TYPE;PACKAGE_URL="";PACKAGE_BUGREPORT="" + + + Console diff --git a/externals/vcpkg/ports/usbmuxd/fix-dependence-pthreads.patch b/externals/vcpkg/ports/usbmuxd/fix-dependence-pthreads.patch new file mode 100755 index 000000000..5ff4d8472 --- /dev/null +++ b/externals/vcpkg/ports/usbmuxd/fix-dependence-pthreads.patch @@ -0,0 +1,40 @@ +diff --git a/usbmuxd.vcxproj b/usbmuxd.vcxproj +index d1d8a4d..086e8a4 100644 +--- a/usbmuxd.vcxproj ++++ b/usbmuxd.vcxproj +@@ -135,7 +135,7 @@ + + Console + true +- ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadsVC2d.lib;%(AdditionalDependencies) ++ ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC3d.lib;%(AdditionalDependencies) + + + +@@ -149,7 +149,7 @@ + + Console + true +- ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadsVC2d.lib;%(AdditionalDependencies) ++ ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC3d.lib;%(AdditionalDependencies) + + + +@@ -168,7 +168,7 @@ + true + true + true +- ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadsVC2.lib;%(AdditionalDependencies) ++ ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC3.lib;%(AdditionalDependencies) + + + +@@ -186,7 +186,7 @@ + true + true + true +- ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadsVC2.lib;%(AdditionalDependencies) ++ ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC3.lib;%(AdditionalDependencies) + + + diff --git a/externals/vcpkg/ports/usbmuxd/portfile.cmake b/externals/vcpkg/ports/usbmuxd/portfile.cmake new file mode 100755 index 000000000..c9ac23d35 --- /dev/null +++ b/externals/vcpkg/ports/usbmuxd/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libimobiledevice-win32/usbmuxd + REF f1329e742825c93fd080bdb8253d710ef8b6f751 # v1.2.235 + SHA512 3259040a3266ce068a6fa1fdecdea824d22f04391ca073fc61d72a1f6d401d93469b9681ddc89a8016ef410bb7443875b2c5df2b571227dd34c66248cbe87fe7 + HEAD_REF master-msvc + PATCHES + fix-dependence-pthreads.patch + fix-definitions.patch +) + +vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH usbmuxd.vcxproj + LICENSE_SUBPATH COPYING.GPLv2 + USE_VCPKG_INTEGRATION +) + +# No headers +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/externals/vcpkg/ports/usbmuxd/vcpkg.json b/externals/vcpkg/ports/usbmuxd/vcpkg.json new file mode 100755 index 000000000..7f660afaf --- /dev/null +++ b/externals/vcpkg/ports/usbmuxd/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "usbmuxd", + "version-string": "1.2.235", + "port-version": 1, + "description": "A socket daemon to multiplex connections from and to iOS devices", + "homepage": "http://www.libimobiledevice.org", + "dependencies": [ + "libimobiledevice", + "libusb", + "libusb-win32", + "pthreads" + ] +} diff --git a/externals/vcpkg/ports/usd/fix_build-location.patch b/externals/vcpkg/ports/usd/fix_build-location.patch new file mode 100755 index 000000000..34d77cae6 --- /dev/null +++ b/externals/vcpkg/ports/usd/fix_build-location.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/macros/Private.cmake b/cmake/macros/Private.cmake +index 3825e2a19..0a79b49bd 100644 +--- a/cmake/macros/Private.cmake ++++ b/cmake/macros/Private.cmake +@@ -1238,7 +1238,7 @@ function(_pxr_library NAME) + MFB_PACKAGE_NAME=${PXR_PACKAGE} + MFB_ALT_PACKAGE_NAME=${PXR_PACKAGE} + MFB_PACKAGE_MODULE=${pythonModuleName} +- PXR_BUILD_LOCATION=usd ++ PXR_BUILD_LOCATION=../lib/usd + PXR_PLUGIN_BUILD_LOCATION=../plugin/usd + ${pxrInstallLocation} + ${pythonModulesEnabled} diff --git a/externals/vcpkg/ports/usd/portfile.cmake b/externals/vcpkg/ports/usd/portfile.cmake new file mode 100755 index 000000000..58d328ea8 --- /dev/null +++ b/externals/vcpkg/ports/usd/portfile.cmake @@ -0,0 +1,83 @@ +# Don't file if the bin folder exists. We need exe and custom files. +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO PixarAnimationStudios/USD + REF 71b4baace2044ea4400ba802e91667f9ebe342f0 # v20.08 + SHA512 0f23b84d314d88d3524f22ebc344e2b506cb7e8ac064726df432a968a4bae0fd2249e968bd10845de9067290eaaa3f8c9e2a483551ffc06b826f3eba816061a9 + HEAD_REF master + PATCHES + fix_build-location.patch +) + +vcpkg_find_acquire_program(PYTHON2) +get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) +vcpkg_add_to_path("${PYTHON2_DIR}") + +IF (VCPKG_TARGET_IS_WINDOWS) +ELSE() +file(REMOVE ${SOURCE_PATH}/cmake/modules/FindTBB.cmake) +ENDIF() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DPXR_BUILD_ALEMBIC_PLUGIN:BOOL=OFF + -DPXR_BUILD_EMBREE_PLUGIN:BOOL=OFF + -DPXR_BUILD_IMAGING:BOOL=OFF + -DPXR_BUILD_MAYA_PLUGIN:BOOL=OFF + -DPXR_BUILD_MONOLITHIC:BOOL=OFF + -DPXR_BUILD_TESTS:BOOL=OFF + -DPXR_BUILD_USD_IMAGING:BOOL=OFF + -DPXR_ENABLE_PYTHON_SUPPORT:BOOL=OFF + -DPXR_BUILD_EXAMPLES:BOOL=OFF + -DPXR_BUILD_TUTORIALS:BOOL=OFF + -DPXR_BUILD_USD_TOOLS:BOOL=OFF +) + +vcpkg_install_cmake() + +file( + RENAME + "${CURRENT_PACKAGES_DIR}/pxrConfig.cmake" + "${CURRENT_PACKAGES_DIR}/cmake/pxrConfig.cmake") + +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/pxr) + +vcpkg_copy_pdbs() + +# Remove duplicates in debug folder +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +# Move all dlls to bin +file(GLOB RELEASE_DLL ${CURRENT_PACKAGES_DIR}/lib/*.dll) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) +file(GLOB DEBUG_DLL ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) +foreach(CURRENT_FROM ${RELEASE_DLL} ${DEBUG_DLL}) + string(REPLACE "/lib/" "/bin/" CURRENT_TO ${CURRENT_FROM}) + file(RENAME ${CURRENT_FROM} ${CURRENT_TO}) +endforeach() + +function(file_replace_regex filename match_string replace_string) + file(READ ${filename} _contents) + string(REGEX REPLACE "${match_string}" "${replace_string}" _contents "${_contents}") + file(WRITE ${filename} "${_contents}") +endfunction() + +# fix dll path for cmake +file_replace_regex(${CURRENT_PACKAGES_DIR}/share/pxr/pxrConfig.cmake "/cmake/pxrTargets.cmake" "/pxrTargets.cmake") +file_replace_regex(${CURRENT_PACKAGES_DIR}/share/pxr/pxrTargets-debug.cmake "debug/lib/([a-zA-Z0-9_]+)\\.dll" "debug/bin/\\1.dll") +file_replace_regex(${CURRENT_PACKAGES_DIR}/share/pxr/pxrTargets-release.cmake "lib/([a-zA-Z0-9_]+)\\.dll" "bin/\\1.dll") + +# fix plugInfo.json for runtime +file(GLOB_RECURSE PLUGINFO_FILES ${CURRENT_PACKAGES_DIR}/lib/usd/*/resources/plugInfo.json) +file(GLOB_RECURSE PLUGINFO_FILES_DEBUG ${CURRENT_PACKAGES_DIR}/debug/lib/usd/*/resources/plugInfo.json) +foreach(PLUGINFO ${PLUGINFO_FILES} ${PLUGINFO_FILES_DEBUG}) + file_replace_regex(${PLUGINFO} [=["LibraryPath": "../../([a-zA-Z0-9_]+).dll"]=] [=["LibraryPath": "../../../bin/\1.dll"]=]) +endforeach() diff --git a/externals/vcpkg/ports/usd/vcpkg.json b/externals/vcpkg/ports/usd/vcpkg.json new file mode 100755 index 000000000..dd308fe5d --- /dev/null +++ b/externals/vcpkg/ports/usd/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "usd", + "version-string": "20.08", + "port-version": 2, + "description": "Universal Scene Description (USD) is an efficient, scalable system for authoring, reading, and streaming time-sampled scene description for interchange between graphics applications.", + "homepage": "https://github.com/PixarAnimationStudios/USD", + "supports": "!x86", + "dependencies": [ + "boost-assign", + "boost-crc", + "boost-date-time", + "boost-filesystem", + "boost-format", + "boost-multi-index", + "boost-program-options", + "boost-regex", + "boost-system", + "boost-vmd", + "tbb", + "zlib" + ] +} diff --git a/externals/vcpkg/ports/usockets/CMakeLists.txt b/externals/vcpkg/ports/usockets/CMakeLists.txt new file mode 100755 index 000000000..69a742db1 --- /dev/null +++ b/externals/vcpkg/ports/usockets/CMakeLists.txt @@ -0,0 +1,66 @@ +cmake_minimum_required(VERSION 3.13) +project(uSockets C CXX) + +option(INSTALL_HEADERS "Install header files" ON) + +if (CMAKE_USE_OPENSSL) + find_package(OpenSSL REQUIRED) + set(USE_OPENSSL "-DUSE_OPENSSL -DLIBUS_USE_OPENSSL") + #set(OPENSSL_LIB "OpenSSL::SSL OpenSSL::Crypto") + list(APPEND CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) +else() + set(NOT_USE_OPENSSL "-DLIBUS_NO_SSL") +endif() + +find_package(unofficial-libuv CONFIG REQUIRED) +find_path(LIBUV_INCLUDE_DIR uv.h) +find_library(LIBUV_LIBRARY NAMES libuv) +include_directories(APPEND "${CMAKE_CURRENT_LIST_DIR}/src") + +file(GLOB SOURCES src/*.c src/eventing/*.c) + +set(USOCKETS_EXT_INCLUDE_DIR ) +set(USOCKETS_EXT_LIBS ) + +if (CMAKE_USE_OPENSSL) + # It requires C++17 or later, see https://github.com/uNetworking/uSockets/blob/0ebdde0601cc82349fc11a7c4bbb6dc5c9f28f42/Makefile#L55 + set(CMAKE_CXX_STANDARD 17) + find_package(OpenSSL REQUIRED) + file(GLOB SSL_SOURCES src/crypto/*.c*) + list(APPEND SOURCES ${SSL_SOURCES}) + list(APPEND USOCKETS_EXT_LIBS OpenSSL::SSL OpenSSL::Crypto) +endif() + +if (CMAKE_USE_EVENT) + file(GLOB SSL_SOURCES src/eventing/*.c) + list(APPEND SOURCES ${SSL_SOURCES}) + list(APPEND USOCKETS_EXT_INCLUDE_DIR src/internal/eventing) +endif() + +if (CMAKE_USE_NETWORK) + list(APPEND USOCKETS_EXT_INCLUDE_DIR src/internal/networking) + list(APPEND USOCKETS_EXT_LIBS Ws2_32) +endif() + +add_library(uSockets ${SOURCES}) + +if (${LIBUS_USE_LIBUV}) + target_compile_definitions(uSockets PRIVATE -DLIBUS_USE_LIBUV) +endif() + +target_compile_definitions(uSockets PRIVATE ${NOT_USE_OPENSSL} ${USE_OPENSSL}) +target_include_directories(uSockets PUBLIC ${OPENSSL_INCLUDE_DIR} ${LIBUV_INCLUDE_DIR} ${USOCKETS_EXT_INCLUDE_DIR}) +target_link_libraries(uSockets PUBLIC ${OPENSSL_LIBRARIES} ${LIBUV_LIBRARY} ${USOCKETS_EXT_LIBS}) + +install(TARGETS uSockets + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) + +if(INSTALL_HEADERS) + file(GLOB HEADERS src/*.h) + install(FILES ${HEADERS} DESTINATION include) + file(GLOB HEADERS src/interfaces/*.h) + install(FILES ${HEADERS} DESTINATION include/interfaces) +endif() diff --git a/externals/vcpkg/ports/usockets/portfile.cmake b/externals/vcpkg/ports/usockets/portfile.cmake new file mode 100755 index 000000000..867a4e7a9 --- /dev/null +++ b/externals/vcpkg/ports/usockets/portfile.cmake @@ -0,0 +1,39 @@ +if(NOT VCPKG_TARGET_IS_LINUX) + set(USE_LIBUV ON) +endif() + +if ("network" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(FATAL_ERROR "Feature 'network' is only supported on Windows") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO uNetworking/uSockets + REF v0.8.1 + SHA512 B3AD6387E20731831A3A6086D7DE320CCD8F720FAD3237B65EE165236E3F30CBEC3E3B1384BF53BF0F274D7E57665DE79E3244F841455D2ADAFBF954B453437F + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + ssl CMAKE_USE_OPENSSL + event CMAKE_USE_EVENT + network CMAKE_USE_NETWORK +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + "-DLIBUS_USE_LIBUV=${USE_LIBUV}" + OPTIONS_DEBUG + -DINSTALL_HEADERS=OFF +) + +vcpkg_cmake_install() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/usockets/vcpkg.json b/externals/vcpkg/ports/usockets/vcpkg.json new file mode 100755 index 000000000..9300c6e94 --- /dev/null +++ b/externals/vcpkg/ports/usockets/vcpkg.json @@ -0,0 +1,34 @@ +{ + "name": "usockets", + "version": "0.8.1", + "description": "Miniscule cross-platform eventing, networking & crypto for async applications", + "homepage": "https://github.com/uNetworking/uSockets", + "dependencies": [ + "libuv", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "event": { + "description": "Build usockets with epoll support" + }, + "network": { + "description": "Build usockets with winsock support", + "dependencies": [ + "winsock2" + ] + }, + "ssl": { + "description": "Build usockets with openssl support", + "dependencies": [ + "openssl" + ] + } + } +} diff --git a/externals/vcpkg/ports/usrsctp/portfile.cmake b/externals/vcpkg/ports/usrsctp/portfile.cmake new file mode 100755 index 000000000..55ea67667 --- /dev/null +++ b/externals/vcpkg/ports/usrsctp/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sctplab/usrsctp + REF 0.9.5.0 + SHA512 7b28706449f9365ba9750fd39925e7171516a1e3145d123ec69a12486637ae2393ad4c587b056403298dc13c149f0b01a262cbe4852abca42e425d7680c77ee3 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -Dsctp_werror=OFF + -Dsctp_build_programs=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +configure_file("${SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/usrsctp/copyright" COPYONLY) + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/usrsctp/vcpkg.json b/externals/vcpkg/ports/usrsctp/vcpkg.json new file mode 100755 index 000000000..56683423a --- /dev/null +++ b/externals/vcpkg/ports/usrsctp/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "usrsctp", + "version": "0.9.5.0", + "port-version": 1, + "description": "A userland SCTP stack supporting FreeBSD, Linux, Mac OS X and Windows.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/utf8h/portfile.cmake b/externals/vcpkg/ports/utf8h/portfile.cmake new file mode 100755 index 000000000..041d253aa --- /dev/null +++ b/externals/vcpkg/ports/utf8h/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sheredom/utf8.h + REF 500d4ea9f4c3449e5243c088d8af8700f7189734 + SHA512 fbae7dbfd932176058dacb33ea491d17eb8e02c845e1ef2afc0ae482f563578a8a8011a8578f4aa8593bb0d7de8ba2df140bda05859a9a6bd67f6545ca0d7421 + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/utf8.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/utf8h") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/utf8h/vcpkg.json b/externals/vcpkg/ports/utf8h/vcpkg.json new file mode 100755 index 000000000..620e9bbe8 --- /dev/null +++ b/externals/vcpkg/ports/utf8h/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "utf8h", + "version-date": "2021-11-18", + "description": "Single header utf8 string functions for C and C++", + "homepage": "https://github.com/sheredom/utf8.h" +} diff --git a/externals/vcpkg/ports/utf8proc/export-cmake-targets.patch b/externals/vcpkg/ports/utf8proc/export-cmake-targets.patch new file mode 100755 index 000000000..26d2f9651 --- /dev/null +++ b/externals/vcpkg/ports/utf8proc/export-cmake-targets.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index edf1d80..bf9d982 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,7 +26,7 @@ add_library (utf8proc + ) + + # expose header path, for when this is part of a larger cmake project +-target_include_directories(utf8proc PUBLIC .) ++target_include_directories(utf8proc PUBLIC $ $) + + if (BUILD_SHARED_LIBS) + # Building shared library +@@ -57,10 +57,12 @@ if (UTF8PROC_INSTALL) + include(GNUInstallDirs) + install(FILES utf8proc.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}") + install(TARGETS utf8proc ++ EXPORT unofficial-utf8proc-config + ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" + RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" + ) ++ install(EXPORT unofficial-utf8proc-config DESTINATION share/unofficial-utf8proc) + configure_file(libutf8proc.pc.cmakein libutf8proc.pc @ONLY) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libutf8proc.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") + endif() diff --git a/externals/vcpkg/ports/utf8proc/portfile.cmake b/externals/vcpkg/ports/utf8proc/portfile.cmake new file mode 100755 index 000000000..bd69ecdff --- /dev/null +++ b/externals/vcpkg/ports/utf8proc/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO JuliaLang/utf8proc + REF 8ca6144c85c165987cb1c5d8395c7314e13d4cd7 # v2.7.0 + SHA512 a33e2335e9978e7a49bc0ecf9128abd93466d9daffb052f9db88097e771588547df6ba07b6028c77621e60f3b85eab78a368d9b8266ecb97ad7bdfae2b4866fc + PATCHES + export-cmake-targets.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DUTF8PROC_ENABLE_TESTING=OFF + -DUTF8PROC_INSTALL=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-utf8proc CONFIG_PATH share/unofficial-utf8proc) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(READ "${CURRENT_PACKAGES_DIR}/include/utf8proc.h" UTF8PROC_H) +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + string(REPLACE "defined UTF8PROC_SHARED" "0" UTF8PROC_H "${UTF8PROC_H}") +else() + string(REPLACE "defined UTF8PROC_SHARED" "1" UTF8PROC_H "${UTF8PROC_H}") +endif() +file(WRITE "${CURRENT_PACKAGES_DIR}/include/utf8proc.h" "${UTF8PROC_H}") + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/utf8proc/vcpkg.json b/externals/vcpkg/ports/utf8proc/vcpkg.json new file mode 100755 index 000000000..6797ee836 --- /dev/null +++ b/externals/vcpkg/ports/utf8proc/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "utf8proc", + "version": "2.7.0", + "description": "Clean C library for processing UTF-8 Unicode data.", + "homepage": "https://github.com/JuliaLang/utf8proc", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/utfcpp/portfile.cmake b/externals/vcpkg/ports/utfcpp/portfile.cmake new file mode 100755 index 000000000..7eb0f6242 --- /dev/null +++ b/externals/vcpkg/ports/utfcpp/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nemtrif/utfcpp + REF v3.2.1 + SHA512 5798487f12b1bc55d3e06aed38f7604271ca3402963efcf85d181fd590d8a088d21e961e77698e60dc2cdae8cf4506645903442c45fd328201752d9589180e0d + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DUTF8_INSTALL=ON + -DUTF8_SAMPLES=OFF + -DUTF8_TESTS=OFF +) + +vcpkg_install_cmake() + +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/utf8cpp) +else() + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/utf8cpp TARGET_PATH share/utf8cpp) +endif() + +# Header only +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/utfcpp/vcpkg.json b/externals/vcpkg/ports/utfcpp/vcpkg.json new file mode 100755 index 000000000..d7f0c4639 --- /dev/null +++ b/externals/vcpkg/ports/utfcpp/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "utfcpp", + "version": "3.2.1", + "description": "UTF-8 with C++ in a Portable Way", + "homepage": "https://github.com/nemtrif/utfcpp" +} diff --git a/externals/vcpkg/ports/utfz/portfile.cmake b/externals/vcpkg/ports/utfz/portfile.cmake new file mode 100755 index 000000000..d81f1aeb1 --- /dev/null +++ b/externals/vcpkg/ports/utfz/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO IMQS/utfz + REF v1.2 + SHA512 286a7a79fe860df8c5a4e1fc75f56460026fe9fbcd2f0ea3e70ecf78e4c5de73442a008339a90c2bd4ef94d5a89c0ed2fb537b91927f11aaa1aa5876d36a628b + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +# Copy the include file +file(COPY ${SOURCE_PATH}/utfz.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +file(COPY ${SOURCE_PATH}/license DESTINATION ${CURRENT_PACKAGES_DIR}/share/utfz) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/utfz/license ${CURRENT_PACKAGES_DIR}/share/utfz/copyright) diff --git a/externals/vcpkg/ports/utfz/vcpkg.json b/externals/vcpkg/ports/utfz/vcpkg.json new file mode 100755 index 000000000..480e32b4d --- /dev/null +++ b/externals/vcpkg/ports/utfz/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "utfz", + "version-string": "1.2", + "port-version": 2, + "description": "A tiny C++ library for parsing and encoding utf-8", + "homepage": "https://github.com/IMQS/utfz" +} diff --git a/externals/vcpkg/ports/uthash/portfile.cmake b/externals/vcpkg/ports/uthash/portfile.cmake new file mode 100755 index 000000000..c84a29b38 --- /dev/null +++ b/externals/vcpkg/ports/uthash/portfile.cmake @@ -0,0 +1,13 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO troydhanson/uthash + REF e493aa90a2833b4655927598f169c31cfcdf7861 + SHA512 a4a2cdee11b238f57bdc3104eee1b3d2014359b65ada896dd26c7f21dda13921f63b44d3d0e7b6fa03731f64b4b4013861d0a49df8b54d7e3726454cbfebaa39 + HEAD_REF master +) + +file(GLOB uthash_PUBLIC_HEADERS ${SOURCE_PATH}/src/*.h) +file(INSTALL ${uthash_PUBLIC_HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/uthash/vcpkg.json b/externals/vcpkg/ports/uthash/vcpkg.json new file mode 100755 index 000000000..46e36906e --- /dev/null +++ b/externals/vcpkg/ports/uthash/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "uthash", + "version-semver": "2.3.0", + "description": "C macros for hash tables and more.", + "homepage": "https://troydhanson.github.io/uthash/", + "license": "BSD-1-Clause" +} diff --git a/externals/vcpkg/ports/uthenticode/openssl.patch b/externals/vcpkg/ports/uthenticode/openssl.patch new file mode 100755 index 000000000..e447c1fad --- /dev/null +++ b/externals/vcpkg/ports/uthenticode/openssl.patch @@ -0,0 +1,72 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 75b82ee..47bed29 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -3,11 +3,7 @@ cmake_minimum_required(VERSION 3.10 FATAL_ERROR) + project(uthenticode) + + find_package(pe-parse REQUIRED) +-find_package( +- OpenSSL 1.1 +- COMPONENTS Crypto +- REQUIRED +-) ++find_package(OpenSSL REQUIRED) + + add_library("${PROJECT_NAME}" uthenticode.cpp) + +@@ -38,7 +34,7 @@ else () + target_link_libraries("${PROJECT_NAME}" PUBLIC pe-parse::pe-parser-library) + endif () + +-target_link_libraries("${PROJECT_NAME}" PUBLIC OpenSSL::Crypto) ++target_link_libraries("${PROJECT_NAME}" PUBLIC OpenSSL::SSL OpenSSL::Crypto) + + install( + TARGETS "${PROJECT_NAME}" +diff --git a/src/include/uthenticode.h b/src/include/uthenticode.h +index 8422cc3..938d8b8 100644 +--- a/src/include/uthenticode.h ++++ b/src/include/uthenticode.h +@@ -48,6 +48,7 @@ DECLARE_ASN1_FUNCTIONS(Authenticode_SpcIndirectDataContent) + * So we wrap it here for use with unique_ptr. + */ + void OpenSSL_free(void *ptr); ++void SK_X509_free(stack_st_X509 *ptr); + + /* Convenient self-releasing aliases for libcrypto and custom ASN.1 types. + */ +@@ -56,7 +57,7 @@ using ASN1_OBJECT_ptr = std::unique_ptr; + using OpenSSL_ptr = std::unique_ptr; + using BN_ptr = std::unique_ptr; +-using STACK_OF_X509_ptr = std::unique_ptr; ++using STACK_OF_X509_ptr = std::unique_ptr; + + using SectionList = std::vector; + +diff --git a/src/uthenticode.cpp b/src/uthenticode.cpp +index b1be0bc..7043589 100644 +--- a/src/uthenticode.cpp ++++ b/src/uthenticode.cpp +@@ -39,6 +39,11 @@ IMPLEMENT_ASN1_FUNCTIONS(Authenticode_SpcIndirectDataContent) + void OpenSSL_free(void *ptr) { + OPENSSL_free(ptr); + } ++ ++void SK_X509_free(stack_st_X509 *ptr) { ++ sk_X509_free(ptr); ++} ++ + // clang-format on + } // namespace impl + +@@ -252,7 +257,7 @@ std::vector SignedData::get_signers() const { + if (signers_stack_ptr == nullptr) { + return {}; + } +- auto signers_stack = impl::STACK_OF_X509_ptr(signers_stack_ptr, sk_X509_free); ++ auto signers_stack = impl::STACK_OF_X509_ptr(signers_stack_ptr, impl::SK_X509_free); + + std::vector signers; + for (auto i = 0; i < sk_X509_num(signers_stack.get()); ++i) { diff --git a/externals/vcpkg/ports/uthenticode/portfile.cmake b/externals/vcpkg/ports/uthenticode/portfile.cmake new file mode 100755 index 000000000..74a6a2957 --- /dev/null +++ b/externals/vcpkg/ports/uthenticode/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO trailofbits/uthenticode + REF v1.0.6 + SHA512 6C9C4DD9E1FE7C329E10BC39E41927C8B82DD004275A88385C691AD85EF4079EBE2922083D5252019B8B25CC540F48E544B42B8178F256AE987D6B677713B063 + HEAD_REF master + PATCHES + openssl.patch +) + +# compatibility fix for newer versions of pe-parse +foreach(FILE IN ITEMS test/wincert-test.cpp test/signeddata-test.cpp test/uthenticode-test.cpp test/certificate-test.cpp src/include/uthenticode.h) + vcpkg_replace_string("${SOURCE_PATH}/${FILE}" "#include " "#include ") +endforeach() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/uthenticode) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/uthenticode/vcpkg.json b/externals/vcpkg/ports/uthenticode/vcpkg.json new file mode 100755 index 000000000..13ece8b48 --- /dev/null +++ b/externals/vcpkg/ports/uthenticode/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "uthenticode", + "version": "1.0.6", + "port-version": 2, + "description": "A cross-platform library for verifying Authenticode signatures", + "homepage": "https://github.com/trailofbits/uthenticode", + "supports": "!uwp", + "dependencies": [ + "openssl", + "pe-parse", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/uvatlas/portfile.cmake b/externals/vcpkg/ports/uvatlas/portfile.cmake new file mode 100755 index 000000000..49d16aad5 --- /dev/null +++ b/externals/vcpkg/ports/uvatlas/portfile.cmake @@ -0,0 +1,62 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Microsoft/UVAtlas + REF may2022 + SHA512 132c7570acd14e69f9a9888ce62aaa58f78d7d7e933bd3648af7208689693906fe6d8e17f4f41ba46a5151e09a0012874b0d11b96f30246337208c4f6f5ef8db + HEAD_REF main +) + +if (VCPKG_HOST_IS_LINUX) + message(WARNING "Build ${PORT} requires GCC version 9 or later") +endif() + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + eigen ENABLE_USE_EIGEN +) + +if(VCPKG_TARGET_IS_UWP) + set(EXTRA_OPTIONS -DBUILD_TOOLS=OFF) +else() + set(EXTRA_OPTIONS -DBUILD_TOOLS=ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS ${FEATURE_OPTIONS} ${EXTRA_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/uvatlas/cmake) + +if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("eigen" IN_LIST FEATURES))) + vcpkg_download_distfile( + UVATLASTOOL_EXE + URLS "https://github.com/Microsoft/UVAtlas/releases/download/may2022/uvatlastool.exe" + FILENAME "uvatlastool-may2022.exe" + SHA512 8a58e54881b16dc2e2489cfb605c02d5368bbfe02182c4d64ee1e903496d2ebcfc9cfaca63d602572c2241109c4ee4591aa7bb4f8da65daeead99b8144049b84 + ) + + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/uvatlas/") + + file(INSTALL + ${UVATLASTOOL_EXE} + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/uvatlas/) + + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool-may2022.exe ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool.exe) + +elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) + + vcpkg_copy_tools( + TOOL_NAMES uvatlastool + SEARCH_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake + ) + +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/uvatlas/vcpkg.json b/externals/vcpkg/ports/uvatlas/vcpkg.json new file mode 100755 index 000000000..1f8f5be4f --- /dev/null +++ b/externals/vcpkg/ports/uvatlas/vcpkg.json @@ -0,0 +1,38 @@ +{ + "name": "uvatlas", + "version-date": "2022-05-09", + "description": "UVAtlas isochart texture atlas", + "homepage": "https://github.com/Microsoft/UVAtlas", + "documentation": "https://github.com/Microsoft/UVAtlas/wiki", + "license": "MIT", + "supports": "windows | linux", + "dependencies": [ + "directx-headers", + "directxmath", + { + "name": "directxmesh", + "platform": "!(uwp | linux)" + }, + { + "name": "directxtex", + "platform": "!(uwp | linux)" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "eigen": { + "description": "Use Eigen & Spectra for eigen-value computations", + "dependencies": [ + "eigen3", + "spectra" + ] + } + } +} diff --git a/externals/vcpkg/ports/uvw/CMakeLists.txt b/externals/vcpkg/ports/uvw/CMakeLists.txt new file mode 100755 index 000000000..f359b7351 --- /dev/null +++ b/externals/vcpkg/ports/uvw/CMakeLists.txt @@ -0,0 +1,25 @@ +cmake_minimum_required(VERSION 3.8) +project(uvw) + +find_package(unofficial-libuv CONFIG REQUIRED) + +add_library(uvw INTERFACE) +target_link_libraries(uvw INTERFACE unofficial::libuv::libuv) + +install(TARGETS uvw + EXPORT uvw + INCLUDES DESTINATION include/) + +install(EXPORT uvw + DESTINATION "share/uvw" + FILE uvw-targets.cmake + NAMESPACE uvw::) + +install(DIRECTORY + src/uvw/ + DESTINATION include/uvw/) + +install(FILES + src/uvw.hpp + DESTINATION include/ +) diff --git a/externals/vcpkg/ports/uvw/portfile.cmake b/externals/vcpkg/ports/uvw/portfile.cmake new file mode 100755 index 000000000..21145e6f9 --- /dev/null +++ b/externals/vcpkg/ports/uvw/portfile.cmake @@ -0,0 +1,22 @@ +#header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO skypjack/uvw + REF 3db9e8f75a4351325e1ea00e17586af2b00cf1ea # v2.12.1_libuv_v1.44 + SHA512 35e799fe877abc26ae44d20c9b5b292497d1468d9f89c0fc19b96a0b0712e35084480100e2fe7324353e2c3805c2f018e89192357d974bfd009af9b58bfcb7ec +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/uvw-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/uvw/") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +# Handle copyright/readme/package files +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/uvw/uvw-config.cmake b/externals/vcpkg/ports/uvw/uvw-config.cmake new file mode 100755 index 000000000..1fdc98f53 --- /dev/null +++ b/externals/vcpkg/ports/uvw/uvw-config.cmake @@ -0,0 +1,2 @@ +find_package(unofficial-libuv CONFIG REQUIRED) +include ("${CMAKE_CURRENT_LIST_DIR}/uvw-targets.cmake") diff --git a/externals/vcpkg/ports/uvw/vcpkg.json b/externals/vcpkg/ports/uvw/vcpkg.json new file mode 100755 index 000000000..ba7b4673d --- /dev/null +++ b/externals/vcpkg/ports/uvw/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "uvw", + "version": "2.12.1", + "description": "Header-only, event based, tiny and easy to use libuv wrapper in modern C++.", + "homepage": "https://github.com/skypjack/uvw", + "license": "MIT", + "dependencies": [ + "libuv", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/uwebsockets/portfile.cmake b/externals/vcpkg/ports/uwebsockets/portfile.cmake new file mode 100755 index 000000000..31984b177 --- /dev/null +++ b/externals/vcpkg/ports/uwebsockets/portfile.cmake @@ -0,0 +1,12 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO uNetworking/uWebSockets + REF v20.11.0 + SHA512 cd4efb386b4d140c6ccbfa92e8be1d3c9b896474a3074b95ad35bedde9face80a1e4bae594359555010d76c2ccf8243b29e97079de8b0f18cda510274135b8e0 + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/src" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(RENAME "${CURRENT_PACKAGES_DIR}/include/src" "${CURRENT_PACKAGES_DIR}/include/uwebsockets") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/uwebsockets/vcpkg.json b/externals/vcpkg/ports/uwebsockets/vcpkg.json new file mode 100755 index 000000000..fe675dbb0 --- /dev/null +++ b/externals/vcpkg/ports/uwebsockets/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "uwebsockets", + "version-semver": "20.11.0", + "description": "Simple, secure & standards compliant web I/O for the most demanding of applications", + "homepage": "https://github.com/uWebSockets/uWebSockets", + "dependencies": [ + "usockets", + "zlib" + ] +} diff --git a/externals/vcpkg/ports/v-hacd/CMakeLists.txt b/externals/vcpkg/ports/v-hacd/CMakeLists.txt new file mode 100755 index 000000000..f4451ecaa --- /dev/null +++ b/externals/vcpkg/ports/v-hacd/CMakeLists.txt @@ -0,0 +1,19 @@ +cmake_minimum_required(VERSION 3.10.0 FATAL_ERROR) + +project(VHACD) + +# Determine if VHACD is built as a subproject (using add_subdirectory) +# or if it is the master project. +set(MASTER_PROJECT OFF) +if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) + set(MASTER_PROJECT ON) + message(STATUS "CMake version: ${CMAKE_VERSION}") +endif () + +option(NO_OPENCL "NO_OPENCL" OFF) +option(NO_OPENMP "NO_OPENMP" OFF) + +message("NO_OPENCL " ${NO_OPENCL}) +message("NO_OPENMP " ${NO_OPENMP}) + +add_subdirectory(src) \ No newline at end of file diff --git a/externals/vcpkg/ports/v-hacd/fix-cmake.patch b/externals/vcpkg/ports/v-hacd/fix-cmake.patch new file mode 100755 index 000000000..46c53da11 --- /dev/null +++ b/externals/vcpkg/ports/v-hacd/fix-cmake.patch @@ -0,0 +1,140 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2bbb283..2f7eb52 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,12 +1 @@ +-cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR) +-project(VHACD) +-option(NO_OPENCL "NO_OPENCL" OFF) +-option(NO_OPENMP "NO_OPENMP" OFF) +- +-message("NO_OPENCL " ${NO_OPENCL}) +-message("NO_OPENMP " ${NO_OPENMP}) +- +-#set(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/output" CACHE PATH "project install prefix" FORCE) +-set(CMAKE_COMMON_INC "${CMAKE_SOURCE_DIR}/../scripts/cmake_common.cmake") +-add_subdirectory ("${CMAKE_SOURCE_DIR}/VHACD_Lib") +-add_subdirectory ("${CMAKE_SOURCE_DIR}/test") ++add_subdirectory ("${CMAKE_CURRENT_SOURCE_DIR}/VHACD_Lib") +\ No newline at end of file +diff --git a/src/VHACD_Lib/CMakeLists.txt b/src/VHACD_Lib/CMakeLists.txt +index 46fc1b1..2260fdc 100644 +--- a/src/VHACD_Lib/CMakeLists.txt ++++ b/src/VHACD_Lib/CMakeLists.txt +@@ -1,77 +1,79 @@ ++cmake_minimum_required(VERSION 3.10.0) ++ + project(VHACD_LIB CXX C) +-include(${CMAKE_COMMON_INC}) ++include("${CMAKE_CURRENT_SOURCE_DIR}/../../scripts/cmake_common.cmake") ++ ++set(CMAKE_CXX_STANDARD 11) + +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") ++set(LIB_TYPE "STATIC" CACHE STRING "STATIC, SHARED or MODULE?") ++message("[VHACD] \t LIB_TYPE " ${LIB_TYPE}) ++add_library(vhacd ${LIB_TYPE} ${PROJECT_CPP_FILES} ${PROJECT_C_FILES} ${PROJECT_INC_FILES} ${PROJECT_INL_FILES} ${PROJECT_CL_FILES}) + + if (NOT NO_OPENCL) + #include(FindOpenCL OPTIONAL) +- find_package(OpenCL) ++ find_package(OpenCL REQUIRED) + endif() + if (NOT NO_OPENMP) + #include(FindOpenMP OPTIONAL) +- find_package(OpenMP) ++ find_package(OpenMP REQUIRED) + endif() + if(OPENMP_FOUND) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") +- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}") ++ target_link_libraries(vhacd PRIVATE OpenMP::OpenMP_CXX) + endif() +-set(LIB_TYPE "STATIC" CACHE STRING "STATIC, SHARED or MODULE?") +-message("[VHACD] \t LIB_TYPE " ${LIB_TYPE}) +-add_library(vhacd ${LIB_TYPE} ${PROJECT_CPP_FILES} ${PROJECT_C_FILES} ${PROJECT_INC_FILES} ${PROJECT_INL_FILES} ${PROJECT_CL_FILES}) + + if (OpenCL_FOUND) +- target_include_directories(vhacd PRIVATE "${OpenCL_INCLUDE_DIR}") +- target_link_libraries(vhacd PRIVATE "${OpenCL_LIBRARY}") ++ target_link_libraries(vhacd PRIVATE OpenCL::OpenCL) + target_compile_definitions(vhacd PRIVATE -DOPENCL_FOUND=1 ) + target_compile_definitions(vhacd PRIVATE -DOPENCL_CL_FILES="${PROJECT_CL_FILES}" ) + endif() + +- + target_include_directories(vhacd PUBLIC ++ $ ++ $) ++ ++target_include_directories(vhacd PRIVATE + $ +- $ # /include/mylib + ) + + + message("[VHACD] \t -> CMAKE_INSTALL_PREFIX " ${CMAKE_INSTALL_PREFIX}) + install(TARGETS vhacd EXPORT vhacd-targets DESTINATION lib) +-install(FILES ${PROJECT_INC_FILES} DESTINATION include) +-install(FILES ${PROJECT_INL_FILES} DESTINATION include) ++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/public/VHACD.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/) ++ + + + set(VHACD_LIB_VERSION 3.2.0) + include(CMakePackageConfigHelpers) + write_basic_package_version_file( +- "${CMAKE_CURRENT_BINARY_DIR}/vhacd/vhacd-config-version.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/vhacd/v-hacd-config-version.cmake" + VERSION ${VHACD_LIB_VERSION} + COMPATIBILITY AnyNewerVersion + ) + +-export(EXPORT vhacd-targets NAMESPACE :: +- FILE "${CMAKE_CURRENT_BINARY_DIR}/vhacd/vhacd-targets.cmake" ++export(EXPORT vhacd-targets NAMESPACE vhacd:: ++ FILE "${CMAKE_CURRENT_BINARY_DIR}/vhacd/v-hacd-targets.cmake" + ) + + configure_file(cmake/vhacd-config.cmake +- "${CMAKE_CURRENT_BINARY_DIR}/vhacd/vhacd-config.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/vhacd/v-hacd-config.cmake" + COPYONLY + ) + + set(ConfigPackageLocation lib/cmake/vhacd) + install(EXPORT vhacd-targets + FILE +- vhacd-targets.cmake ++ v-hacd-targets.cmake + DESTINATION + ${ConfigPackageLocation} +- NAMESPACE :: ++ NAMESPACE vhacd:: + ) + install( + FILES +- "${CMAKE_CURRENT_BINARY_DIR}/vhacd/vhacd-config.cmake" +- "${CMAKE_CURRENT_BINARY_DIR}/vhacd/vhacd-config-version.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/vhacd/v-hacd-config.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/vhacd/v-hacd-config-version.cmake" + DESTINATION + ${ConfigPackageLocation} + COMPONENT + Devel + ) + + +diff --git a/src/VHACD_Lib/cmake/vhacd-config.cmake b/src/VHACD_Lib/cmake/vhacd-config.cmake +index 8fc5c58..7677f58 100644 +--- a/src/VHACD_Lib/cmake/vhacd-config.cmake ++++ b/src/VHACD_Lib/cmake/vhacd-config.cmake +@@ -1,4 +1,4 @@ + + find_package(OpenCL) + find_package(OpenMP) +-include("${CMAKE_CURRENT_LIST_DIR}/vhacd-targets.cmake") +\ No newline at end of file ++include("${CMAKE_CURRENT_LIST_DIR}/v-hacd-targets.cmake") +\ No newline at end of file diff --git a/externals/vcpkg/ports/v-hacd/portfile.cmake b/externals/vcpkg/ports/v-hacd/portfile.cmake new file mode 100755 index 000000000..70148bfb9 --- /dev/null +++ b/externals/vcpkg/ports/v-hacd/portfile.cmake @@ -0,0 +1,44 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kmammou/v-hacd + REF 1a49edf29c69039df15286181f2f27e17ceb9aef + SHA512 14157e5fd9cbfeb44735dc2952d7b4f43337ea2243f3b690125dda27e3bb8328cc38050415c7150cf11fbd85c5258c3aaa8899f306ce118f78a4d5e6139ef0f0 + HEAD_REF master + PATCHES + fix-cmake.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(LIB_TYPE "SHARED") +else() + set(LIB_TYPE "STATIC") +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + openmp NO_OPENMP + opencl NO_OPENCL +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + ${FEATURE_OPTIONS} + -DLIB_TYPE=${LIB_TYPE} +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/vhacd) + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/v-hacd/vcpkg.json b/externals/vcpkg/ports/v-hacd/vcpkg.json new file mode 100755 index 000000000..217ee155f --- /dev/null +++ b/externals/vcpkg/ports/v-hacd/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "v-hacd", + "version": "3.2.0", + "port-version": 3, + "description": "The V-HACD library decomposes a 3D surface into a set of \"near\" convex parts.", + "homepage": "https://github.com/kmammou/v-hacd", + "supports": "!arm", + "features": { + "opencl": { + "description": "Builds opencl enabled lib", + "dependencies": [ + "opencl" + ] + }, + "openmp": { + "description": "Builds openmp enabled lib" + } + } +} diff --git a/externals/vcpkg/ports/v8/V8Config-shared.cmake b/externals/vcpkg/ports/v8/V8Config-shared.cmake new file mode 100755 index 000000000..fadfdb5ac --- /dev/null +++ b/externals/vcpkg/ports/v8/V8Config-shared.cmake @@ -0,0 +1,111 @@ +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +if(_IMPORT_PREFIX STREQUAL "/") + set(_IMPORT_PREFIX "") +endif() + +include(SelectLibraryConfigurations) + +find_path(V8_INCLUDE_DIR NAMES v8.h PATH_SUFFIXES include) + +if(EXISTS ${_IMPORT_PREFIX}/bin/snapshot_blob.bin) + set(V8_SNAPSHOT_BLOB_RELEASE ${_IMPORT_PREFIX}/bin/snapshot_blob.bin CACHE FILEPATH "Release version of V8 snapshot blob location") +endif() +if(EXISTS ${_IMPORT_PREFIX}/debug/bin/snapshot_blob.bin) + set(V8_SNAPSHOT_BLOB_DEBUG ${_IMPORT_PREFIX}/debug/bin/snapshot_blob.bin CACHE FILEPATH "Debug version of V8 snapshot blob location") +endif() +set(V8_SNAPSHOT_BLOB "$,${V8_SNAPSHOT_BLOB_DEBUG},${V8_SNAPSHOT_BLOB_RELEASE}>") + +if(EXISTS "${_IMPORT_PREFIX}/lib/v8${CMAKE_SHARED_LIBRARY_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}") + set(V8_LIBRARY_RELEASE "${_IMPORT_PREFIX}/lib/v8${CMAKE_SHARED_LIBRARY_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}" CACHE FILEPATH "Release version of the V8 library location") +endif() +if(EXISTS "${_IMPORT_PREFIX}/debug/lib/v8${CMAKE_SHARED_LIBRARY_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}") + set(V8_LIBRARY_DEBUG "${_IMPORT_PREFIX}/debug/lib/v8${CMAKE_SHARED_LIBRARY_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}" CACHE FILEPATH "Debug version of the V8 library location") +endif() +select_library_configurations(V8) + +if(EXISTS "${_IMPORT_PREFIX}/lib/v8_libbase${CMAKE_SHARED_LIBRARY_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}") + set(V8LIBBASE_LIBRARY_RELEASE "${_IMPORT_PREFIX}/lib/v8_libbase${CMAKE_SHARED_LIBRARY_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}" CACHE FILEPATH "Release version of the V8 libbase library location") +endif() +if(EXISTS "${_IMPORT_PREFIX}/debug/lib/v8_libbase${CMAKE_SHARED_LIBRARY_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}") + set(V8LIBBASE_LIBRARY_DEBUG "${_IMPORT_PREFIX}/debug/lib/v8_libbase${CMAKE_SHARED_LIBRARY_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}" CACHE FILEPATH "Debug version of the V8 libbase library location") +endif() +select_library_configurations(V8LIBBASE) + +if(EXISTS "${_IMPORT_PREFIX}/lib/v8_libplatform${CMAKE_SHARED_LIBRARY_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}") + set(V8LIBPLATFORM_LIBRARY_RELEASE "${_IMPORT_PREFIX}/lib/v8_libplatform${CMAKE_SHARED_LIBRARY_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}" CACHE FILEPATH "Release version of the V8 libplatform library location") +endif() +if(EXISTS "${_IMPORT_PREFIX}/debug/lib/v8_libplatform${CMAKE_SHARED_LIBRARY_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}") + set(V8LIBPLATFORM_LIBRARY_DEBUG "${_IMPORT_PREFIX}/debug/lib/v8_libplatform${CMAKE_SHARED_LIBRARY_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}" CACHE FILEPATH "Delete version of the V8 libplatform library location") +endif() +select_library_configurations(V8LIBPLATFORM) + +mark_as_advanced(V8_INCLUDE_DIR) + +if(V8_INCLUDE_DIR AND EXISTS "${V8_INCLUDE_DIR}/v8-version.h") + file(STRINGS "${V8_INCLUDE_DIR}/v8-version.h" V8_MAJOR_VERSION REGEX "^#define V8_MAJOR_VERSION [0-9]+.*$") + string(REGEX REPLACE "^#define V8_MAJOR_VERSION ([0-9]+).*$" "\\1" V8_MAJOR_VERSION "${V8_MAJOR_VERSION}") + file(STRINGS "${V8_INCLUDE_DIR}/v8-version.h" V8_MINOR_VERSION REGEX "^#define V8_MINOR_VERSION [0-9]+.*$") + string(REGEX REPLACE "^#define V8_MINOR_VERSION ([0-9]+).*$" "\\1" V8_MINOR_VERSION "${V8_MINOR_VERSION}") + file(STRINGS "${V8_INCLUDE_DIR}/v8-version.h" V8_BUILD_NUMBER REGEX "^#define V8_BUILD_NUMBER [0-9]+.*$") + string(REGEX REPLACE "^#define V8_BUILD_NUMBER ([0-9]+).*$" "\\1" V8_BUILD_NUMBER "${V8_BUILD_NUMBER}") + file(STRINGS "${V8_INCLUDE_DIR}/v8-version.h" V8_PATCH_LEVEL REGEX "^#define V8_PATCH_LEVEL [0-9]+.*$") + string(REGEX REPLACE "^#define V8_PATCH_LEVEL ([0-9]+).*$" "\\1" V8_PATCH_LEVEL "${V8_PATCH_LEVEL}") + set(V8_VERSION_STRING "${V8_MAJOR_VERSION}.${V8_MINOR_VERSION}.${V8_BUILD_NUMBER}.${V8_PATCH_LEVEL}") +endif() + + +if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(V8_COMPILE_DEFINITIONS "V8_COMPRESS_POINTERS;V8_31BIT_SMIS_ON_64BIT_ARCH") +elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) + set(V8_COMPILE_DEFINITIONS " ") +endif() + +mark_as_advanced(V8_COMPILE_DEFINITIONS) + +include(FindPackageHandleStandardArgs) + +FIND_PACKAGE_HANDLE_STANDARD_ARGS(V8 REQUIRED_VARS V8_LIBRARY V8LIBBASE_LIBRARY V8LIBPLATFORM_LIBRARY V8_INCLUDE_DIR V8_COMPILE_DEFINITIONS +VERSION_VAR V8_VERSION_STRING) +set(V8_LIBRARIES ${V8_LIBRARY} ${V8LIBBASE_LIBRARY} ${V8LIBPLATFORM_LIBRARY}) + +mark_as_advanced(V8_LIBRARIES) + +if(NOT TARGET V8::V8) + add_library(V8::V8 SHARED IMPORTED) + set_target_properties(V8::V8 PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${V8_INCLUDE_DIR}" + INTERFACE_COMPILE_DEFINITIONS "${V8_COMPILE_DEFINITIONS}") + + if(V8_LIBRARY_RELEASE) + set_property(TARGET V8::V8 APPEND PROPERTY + IMPORTED_CONFIGURATIONS RELEASE) + set_target_properties(V8::V8 PROPERTIES + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/v8${CMAKE_SHARED_LIBRARY_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}" + IMPORTED_IMPLIB_RELEASE "${V8_LIBRARY_RELEASE}" + ) + set_target_properties(V8::V8 PROPERTIES + IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE + "${V8LIBBASE_LIBRARY_RELEASE};${V8LIBPLATFORM_LIBRARY_RELEASE}") + endif() + + if(V8_LIBRARY_DEBUG) + set_property(TARGET V8::V8 APPEND PROPERTY + IMPORTED_CONFIGURATIONS DEBUG) + set_target_properties(V8::V8 PROPERTIES + IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/debug/bin/v8${CMAKE_SHARED_LIBRARY_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}" + IMPORTED_IMPLIB_DEBUG "${V8_LIBRARY_DEBUG}") + set_target_properties(V8::V8 PROPERTIES + IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG + "${V8LIBBASE_LIBRARY_DEBUG};${V8LIBPLATFORM_LIBRARY_DEBUG}") + endif() + + if(NOT V8_LIBRARY_RELEASE AND NOT V8_LIBRARY_DEBUG) + set_property(TARGET V8::V8 APPEND PROPERTY + IMPORTED_IMPLIB "${V8_LIBRARY}") + set_target_properties(V8::V8 PROPERTIES + IMPORTED_LINK_INTERFACE_LIBRARIES + "${V8LIBBASE_LIBRARY};${V8LIBPLATFORM_LIBRARY}") + endif() +endif() diff --git a/externals/vcpkg/ports/v8/V8Config-static.cmake b/externals/vcpkg/ports/v8/V8Config-static.cmake new file mode 100755 index 000000000..debd1f169 --- /dev/null +++ b/externals/vcpkg/ports/v8/V8Config-static.cmake @@ -0,0 +1,98 @@ +include(CMakeFindDependencyMacro) +find_dependency(ICU REQUIRED COMPONENTS in uc dt) +find_dependency(ZLIB REQUIRED) +if(UNIX) + find_package(PkgConfig REQUIRED) + pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 IMPORTED_TARGET) + set(V8_IMPORTED_LINK_INTERFACE_LIBRARIES + "ICU::in;ICU::uc;ICU::dt;ZLIB::ZLIB") +elseif(WIN32) + set(V8_IMPORTED_LINK_INTERFACE_LIBRARIES + "Winmm;DbgHelp;ZLIB::ZLIB;ICU::in;ICU::uc;ICU::dt") +endif() + +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +if(_IMPORT_PREFIX STREQUAL "/") + set(_IMPORT_PREFIX "") +endif() + +include(SelectLibraryConfigurations) + +find_path(V8_INCLUDE_DIR NAMES v8.h PATH_SUFFIXES include) + +if(EXISTS "${_IMPORT_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}v8_monolith${CMAKE_STATIC_LIBRARY_SUFFIX}") + set(V8_LIBRARY_RELEASE "${_IMPORT_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}v8_monolith${CMAKE_STATIC_LIBRARY_SUFFIX}" CACHE FILEPATH "Release version of the V8 library location") +endif() +if(EXISTS "${_IMPORT_PREFIX}/debug/lib/${CMAKE_STATIC_LIBRARY_PREFIX}v8_monolith${CMAKE_STATIC_LIBRARY_SUFFIX}") + set(V8_LIBRARY_DEBUG "${_IMPORT_PREFIX}/debug/lib/${CMAKE_STATIC_LIBRARY_PREFIX}v8_monolith${CMAKE_STATIC_LIBRARY_SUFFIX}" CACHE FILEPATH "Debug version of the V8 library location") +endif() +select_library_configurations(V8) + +mark_as_advanced(V8_INCLUDE_DIR) + +if(V8_INCLUDE_DIR AND EXISTS "${V8_INCLUDE_DIR}/v8-version.h") + file(STRINGS "${V8_INCLUDE_DIR}/v8-version.h" V8_MAJOR_VERSION REGEX "^#define V8_MAJOR_VERSION [0-9]+.*$") + string(REGEX REPLACE "^#define V8_MAJOR_VERSION ([0-9]+).*$" "\\1" V8_MAJOR_VERSION "${V8_MAJOR_VERSION}") + file(STRINGS "${V8_INCLUDE_DIR}/v8-version.h" V8_MINOR_VERSION REGEX "^#define V8_MINOR_VERSION [0-9]+.*$") + string(REGEX REPLACE "^#define V8_MINOR_VERSION ([0-9]+).*$" "\\1" V8_MINOR_VERSION "${V8_MINOR_VERSION}") + file(STRINGS "${V8_INCLUDE_DIR}/v8-version.h" V8_BUILD_NUMBER REGEX "^#define V8_BUILD_NUMBER [0-9]+.*$") + string(REGEX REPLACE "^#define V8_BUILD_NUMBER ([0-9]+).*$" "\\1" V8_BUILD_NUMBER "${V8_BUILD_NUMBER}") + file(STRINGS "${V8_INCLUDE_DIR}/v8-version.h" V8_PATCH_LEVEL REGEX "^#define V8_PATCH_LEVEL [0-9]+.*$") + string(REGEX REPLACE "^#define V8_PATCH_LEVEL ([0-9]+).*$" "\\1" V8_PATCH_LEVEL "${V8_PATCH_LEVEL}") + set(V8_VERSION_STRING "${V8_MAJOR_VERSION}.${V8_MINOR_VERSION}.${V8_BUILD_NUMBER}.${V8_PATCH_LEVEL}") +endif() + + +if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(V8_COMPILE_DEFINITIONS "V8_COMPRESS_POINTERS;V8_31BIT_SMIS_ON_64BIT_ARCH") +else() + set(V8_COMPILE_DEFINITIONS " ") +endif() + +mark_as_advanced(V8_COMPILE_DEFINITIONS) + +include(FindPackageHandleStandardArgs) + +FIND_PACKAGE_HANDLE_STANDARD_ARGS(V8 REQUIRED_VARS V8_LIBRARY V8_INCLUDE_DIR V8_COMPILE_DEFINITIONS +VERSION_VAR V8_VERSION_STRING) +set(V8_LIBRARIES ${V8_LIBRARY}) + +mark_as_advanced(V8_LIBRARIES) + +if(NOT TARGET V8::V8) + add_library(V8::V8 STATIC IMPORTED) + set_target_properties(V8::V8 PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${V8_INCLUDE_DIR}" + INTERFACE_COMPILE_DEFINITIONS "${V8_COMPILE_DEFINITIONS}") + if(MSVC) + set_target_properties(V8::V8 PROPERTIES + INTERFACE_COMPILE_OPTIONS "/MT$<$:d>") + endif() + + if(V8_LIBRARY_RELEASE) + set_property(TARGET V8::V8 APPEND PROPERTY + IMPORTED_CONFIGURATIONS RELEASE) + set_target_properties(V8::V8 PROPERTIES + IMPORTED_LOCATION_RELEASE "${V8_LIBRARY_RELEASE}" + IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE + "${V8_IMPORTED_LINK_INTERFACE_LIBRARIES}") + endif() + + if(V8_LIBRARY_DEBUG) + set_property(TARGET V8::V8 APPEND PROPERTY + IMPORTED_CONFIGURATIONS DEBUG) + set_target_properties(V8::V8 PROPERTIES + IMPORTED_LOCATION_DEBUG "${V8_LIBRARY_DEBUG}" + IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG + "${V8_IMPORTED_LINK_INTERFACE_LIBRARIES}") + endif() + + if(NOT V8_LIBRARY_RELEASE AND NOT V8_LIBRARY_DEBUG) + set_property(TARGET V8::V8 APPEND PROPERTY + IMPORTED_LOCATION "${V8_LIBRARY}" + IMPORTED_LINK_INTERFACE_LIBRARIES + "${V8_IMPORTED_LINK_INTERFACE_LIBRARIES}") + endif() +endif() diff --git a/externals/vcpkg/ports/v8/build.patch b/externals/vcpkg/ports/v8/build.patch new file mode 100755 index 000000000..15fede3fe --- /dev/null +++ b/externals/vcpkg/ports/v8/build.patch @@ -0,0 +1,187 @@ +diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn +index 1904a2559..e66586c88 100644 +--- a/config/compiler/BUILD.gn ++++ b/config/compiler/BUILD.gn +@@ -1571,6 +1571,7 @@ config("default_warnings") { + # Disables. + "-Wno-missing-field-initializers", # "struct foo f = {0};" + "-Wno-unused-parameter", # Unused function parameters. ++ "-Wno-invalid-offsetof", # Use of "conditionally-supported" offsetof in c++17 + ] + } + +@@ -1987,8 +1988,17 @@ config("no_incompatible_pointer_warnings") { + # Shared settings for both "optimize" and "optimize_max" configs. + # IMPORTANT: On Windows "/O1" and "/O2" must go before the common flags. + if (is_win) { +- common_optimize_on_cflags = [ +- "/Ob2", # Both explicit and auto inlining. ++ common_optimize_on_cflags = [] ++ if(is_clang) { ++ common_optimize_on_cflags += [ ++ "/Ob2", # Both explicit and auto inlining. ++ ] ++ } else { ++ common_optimize_on_cflags += [ ++ "/Ob3", # Both explicit and auto inlining. ++ ] ++ } ++ common_optimize_on_cflags += [ + "/Oy-", # Disable omitting frame pointers, must be after /O2. + "/Zc:inline", # Remove unreferenced COMDAT (faster links). + ] +diff --git a/config/linux/pkg-config.py b/config/linux/pkg-config.py +index 5adf70cc3..dab159f98 100755 +--- a/config/linux/pkg-config.py ++++ b/config/linux/pkg-config.py +@@ -41,6 +41,11 @@ from optparse import OptionParser + # Additionally, you can specify the option --atleast-version. This will skip + # the normal outputting of a dictionary and instead print true or false, + # depending on the return value of pkg-config for the given package. ++# ++# --pkg_config_libdir= allows direct override ++# of the PKG_CONFIG_LIBDIR environment library. ++# ++# --full-path-libs causes lib names to include their full path. + + + def SetConfigPath(options): +@@ -105,11 +110,32 @@ def RewritePath(path, strip_prefix, sysroot): + return path + + ++flag_regex = re.compile("(-.)(.+)") ++ ++ ++def FlagReplace(matchobj): ++ if matchobj.group(1) == '-I': ++ return matchobj.group(1) + subprocess.check_output([u'cygpath',u'-w',matchobj.group(2)]).strip().decode("utf-8") ++ if matchobj.group(1) == '-L': ++ return matchobj.group(1) + subprocess.check_output([u'cygpath',u'-w',matchobj.group(2)]).strip().decode("utf-8") ++ if matchobj.group(1) == '-l': ++ return matchobj.group(1) + matchobj.group(2) + '.lib' ++ return matchobj.group(0) ++ ++ ++def ConvertGCCToMSVC(flags): ++ """Rewrites GCC flags into MSVC flags.""" ++ # need a better way to determine mingw vs msvc build ++ if 'win32' not in sys.platform or "GCC" in sys.version: ++ return flags ++ return [ flag_regex.sub(FlagReplace,flag) for flag in flags] ++ ++ + def main(): + # If this is run on non-Linux platforms, just return nothing and indicate + # success. This allows us to "kind of emulate" a Linux build from other + # platforms. +- if "linux" not in sys.platform: ++ if "linux" not in sys.platform and 'win32' not in sys.platform: + print("[[],[],[],[],[]]") + return 0 + +@@ -128,6 +154,9 @@ def main(): + parser.add_option('--dridriverdir', action='store_true', dest='dridriverdir') + parser.add_option('--version-as-components', action='store_true', + dest='version_as_components') ++ parser.add_option('--pkg_config_libdir', action='store', dest='pkg_config_libdir', ++ type='string') ++ parser.add_option('--full-path-libs', action='store_true', dest='full_path_libs') + (options, args) = parser.parse_args() + + # Make a list of regular expressions to strip out. +@@ -144,6 +173,10 @@ def main(): + else: + prefix = '' + ++ # Override PKG_CONFIG_LIBDIR ++ if options.pkg_config_libdir: ++ os.environ['PKG_CONFIG_LIBDIR'] = options.pkg_config_libdir ++ + if options.atleast_version: + # When asking for the return value, just run pkg-config and print the return + # value, no need to do other work. +@@ -203,7 +236,7 @@ def main(): + # For now just split on spaces to get the args out. This will break if + # pkgconfig returns quoted things with spaces in them, but that doesn't seem + # to happen in practice. +- all_flags = flag_string.strip().split(' ') ++ all_flags = ConvertGCCToMSVC(flag_string.strip().split(' ')) + + + sysroot = options.sysroot +@@ -220,7 +253,10 @@ def main(): + continue; + + if flag[:2] == '-l': +- libs.append(RewritePath(flag[2:], prefix, sysroot)) ++ library = RewritePath(flag[2:], prefix, sysroot) ++ # Skip math library on MSVC ++ if library != 'm.lib': ++ libs.append(library) + elif flag[:2] == '-L': + lib_dirs.append(RewritePath(flag[2:], prefix, sysroot)) + elif flag[:2] == '-I': +@@ -237,6 +273,14 @@ def main(): + else: + cflags.append(flag) + ++ if options.full_path_libs: ++ full_path_libs = [] ++ for lib_dir in lib_dirs: ++ for lib in libs: ++ if os.path.isfile(lib_dir+"/"+lib): ++ full_path_libs.append(lib_dir+"/"+lib) ++ libs = full_path_libs ++ + # Output a GN array, the first one is the cflags, the second are the libs. The + # JSON formatter prints GN compatible lists when everything is a list of + # strings. +diff --git a/config/linux/pkg_config.gni b/config/linux/pkg_config.gni +index 428e44ac0..a0d2175ee 100644 +--- a/config/linux/pkg_config.gni ++++ b/config/linux/pkg_config.gni +@@ -45,6 +45,9 @@ declare_args() { + # in similar fashion by setting the `system_libdir` variable in the build's + # args.gn file to 'lib' or 'lib64' as appropriate for the target architecture. + system_libdir = "lib" ++ ++ # Allow directly overriding the PKG_CONFIG_LIBDIR enviroment variable ++ pkg_config_libdir = "" + } + + pkg_config_script = "//build/config/linux/pkg-config.py" +@@ -87,6 +90,17 @@ if (host_pkg_config != "") { + host_pkg_config_args = pkg_config_args + } + ++if (pkg_config_libdir != "") { ++ pkg_config_args += [ ++ "--pkg_config_libdir", ++ pkg_config_libdir, ++ ] ++ host_pkg_config_args += [ ++ "--pkg_config_libdir", ++ pkg_config_libdir, ++ ] ++} ++ + template("pkg_config") { + assert(defined(invoker.packages), + "Variable |packages| must be defined to be a list in pkg_config.") +diff --git a/util/lastchange.py b/util/lastchange.py +index 02a36642b..78934f1b0 100755 +--- a/util/lastchange.py ++++ b/util/lastchange.py +@@ -192,7 +192,10 @@ def GetGitTopDirectory(source_dir): + Returns: + The output of "git rev-parse --show-toplevel" as a string + """ +- return _RunGitCommand(source_dir, ['rev-parse', '--show-toplevel']) ++ directory = _RunGitCommand(source_dir, ['rev-parse', '--show-toplevel']) ++ if "GCC" in sys.version and sys.platform=='win32': ++ return subprocess.check_output(["cygpath", "-w", directory]).strip(b"\n").decode() ++ return directory + + + def WriteIfChanged(file_name, contents): diff --git a/externals/vcpkg/ports/v8/icu.gn b/externals/vcpkg/ports/v8/icu.gn new file mode 100755 index 000000000..60dc6b8b7 --- /dev/null +++ b/externals/vcpkg/ports/v8/icu.gn @@ -0,0 +1,71 @@ +import("//build/config/linux/pkg_config.gni") + +declare_args() { + # Tells icu to load an external data file rather than rely on the icudata + # being linked directly into the binary. + icu_use_data_file = true + # If true, compile icu into a standalone static library. Currently this is + # only useful on Chrome OS. + icu_disable_thin_archive = false +} + +pkg_config("system_icui18n") { + packages = [ "icu-i18n" ] + if (is_win) { + extra_args = ["--full-path-libs"] # Workaround the WinSDK having an older version of ICU + } +} + +pkg_config("system_icuuc") { + packages = [ "icu-uc" ] + if (is_win) { + extra_args = ["--full-path-libs"] # Workaround the WinSDK having an older version of ICU + } +} + +group("icu") { + public_deps = [ + ":icui18n", + ":icuuc", + ] +} + +config("icu_config") { + defines = [ + "USING_SYSTEM_ICU=1", + ] + if(is_win){ + if(!is_component_build) { + ldflags = ["/ignore:4099"] # needed on CI builds + } + defines += [ "UCHAR_TYPE=wchar_t" ] + } + else{ + defines += [ "UCHAR_TYPE=uint16_t" ] + } + if (icu_use_data_file) { + defines += [ "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE" ] + } else { + defines += [ "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC" ] + } +} + +source_set("icui18n") { + public_configs = [ + ":icu_config", + ":system_icui18n" + ] +} + +source_set("icuuc") { + public_configs = [ + ":icu_config", + ":system_icuuc" + ] +} + +source_set("icudata") { + public_configs = [ + ":icu_config", + ] +} diff --git a/externals/vcpkg/ports/v8/portfile.cmake b/externals/vcpkg/ports/v8/portfile.cmake new file mode 100755 index 000000000..72bf6c36a --- /dev/null +++ b/externals/vcpkg/ports/v8/portfile.cmake @@ -0,0 +1,198 @@ + +set(pkgver "9.1.269.39") + +set(ENV{DEPOT_TOOLS_WIN_TOOLCHAIN} 0) + +get_filename_component(GIT_PATH ${GIT} DIRECTORY) +vcpkg_find_acquire_program(PYTHON2) +get_filename_component(PYTHON2_PATH ${PYTHON2} DIRECTORY) +vcpkg_find_acquire_program(GN) +get_filename_component(GN_PATH ${GN} DIRECTORY) +vcpkg_find_acquire_program(NINJA) +get_filename_component(NINJA_PATH ${NINJA} DIRECTORY) + +vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin") +vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin") +vcpkg_add_to_path(PREPEND "${GIT_PATH}") +vcpkg_add_to_path(PREPEND "${PYTHON2_PATH}") +vcpkg_add_to_path(PREPEND "${GN_PATH}") +vcpkg_add_to_path(PREPEND "${NINJA_PATH}") +if(WIN32) + vcpkg_acquire_msys(MSYS_ROOT PACKAGES pkg-config) + vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") +endif() + +set(VCPKG_KEEP_ENV_VARS PATH;DEPOT_TOOLS_WIN_TOOLCHAIN) + +function(v8_fetch) + set(oneValueArgs DESTINATION URL REF SOURCE) + set(multipleValuesArgs PATCHES) + cmake_parse_arguments(V8 "" "${oneValueArgs}" "${multipleValuesArgs}" ${ARGN}) + + if(NOT DEFINED V8_DESTINATION) + message(FATAL_ERROR "DESTINATION must be specified.") + endif() + + if(NOT DEFINED V8_URL) + message(FATAL_ERROR "The git url must be specified") + endif() + + if(NOT DEFINED V8_REF) + message(FATAL_ERROR "The git ref must be specified.") + endif() + + if(EXISTS ${V8_SOURCE}/${V8_DESTINATION}) + vcpkg_execute_required_process( + COMMAND ${GIT} reset --hard + WORKING_DIRECTORY ${V8_SOURCE}/${V8_DESTINATION} + LOGNAME build-${TARGET_TRIPLET}) + else() + vcpkg_execute_required_process( + COMMAND ${GIT} clone --depth 1 ${V8_URL} ${V8_DESTINATION} + WORKING_DIRECTORY ${V8_SOURCE} + LOGNAME build-${TARGET_TRIPLET}) + vcpkg_execute_required_process( + COMMAND ${GIT} fetch --depth 1 origin ${V8_REF} + WORKING_DIRECTORY ${V8_SOURCE}/${V8_DESTINATION} + LOGNAME build-${TARGET_TRIPLET}) + vcpkg_execute_required_process( + COMMAND ${GIT} checkout FETCH_HEAD + WORKING_DIRECTORY ${V8_SOURCE}/${V8_DESTINATION} + LOGNAME build-${TARGET_TRIPLET}) + endif() + foreach(PATCH ${V8_PATCHES}) + vcpkg_execute_required_process( + COMMAND ${GIT} apply ${PATCH} + WORKING_DIRECTORY ${V8_SOURCE}/${V8_DESTINATION} + LOGNAME build-${TARGET_TRIPLET}) + endforeach() +endfunction() + +vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH + URL https://chromium.googlesource.com/v8/v8.git + REF 7d3d62c91f69a702e5aa54c6b4dbbaa883683717 + PATCHES ${CURRENT_PORT_DIR}/v8.patch +) + +message(STATUS "Fetching submodules") +v8_fetch( + DESTINATION build + URL https://chromium.googlesource.com/chromium/src/build.git + REF fd86d60f33cbc794537c4da2ef7e298d7f81138e + SOURCE ${SOURCE_PATH} + PATCHES ${CURRENT_PORT_DIR}/build.patch) +v8_fetch( + DESTINATION third_party/zlib + URL https://chromium.googlesource.com/chromium/src/third_party/zlib.git + REF 156be8c52f80cde343088b4a69a80579101b6e67 + SOURCE ${SOURCE_PATH}) +v8_fetch( + DESTINATION base/trace_event/common + URL https://chromium.googlesource.com/chromium/src/base/trace_event/common.git + REF dab187b372fc17e51f5b9fad8201813d0aed5129 + SOURCE ${SOURCE_PATH}) +v8_fetch( + DESTINATION third_party/googletest/src + URL https://chromium.googlesource.com/external/github.com/google/googletest.git + REF 10b1902d893ea8cc43c69541d70868f91af3646b + SOURCE ${SOURCE_PATH}) +v8_fetch( + DESTINATION third_party/jinja2 + URL https://chromium.googlesource.com/chromium/src/third_party/jinja2.git + REF b41863e42637544c2941b574c7877d3e1f663e25 + SOURCE ${SOURCE_PATH}) +v8_fetch( + DESTINATION third_party/markupsafe + URL https://chromium.googlesource.com/chromium/src/third_party/markupsafe.git + REF 8f45f5cfa0009d2a70589bcda0349b8cb2b72783 + SOURCE ${SOURCE_PATH}) + +vcpkg_execute_required_process( + COMMAND ${PYTHON2} build/util/lastchange.py -o build/util/LASTCHANGE + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME build-${TARGET_TRIPLET} +) + +file(MAKE_DIRECTORY "${SOURCE_PATH}/third_party/icu") +configure_file("${CURRENT_PORT_DIR}/zlib.gn" "${SOURCE_PATH}/third_party/zlib/BUILD.gn" COPYONLY) +configure_file("${CURRENT_PORT_DIR}/icu.gn" "${SOURCE_PATH}/third_party/icu/BUILD.gn" COPYONLY) +file(WRITE "${SOURCE_PATH}/build/config/gclient_args.gni" "checkout_google_benchmark = false\n") +if(WIN32) + string(REGEX REPLACE "\\\\+$" "" WindowsSdkDir $ENV{WindowsSdkDir}) + file(APPEND "${SOURCE_PATH}/build/config/gclient_args.gni" "windows_sdk_path = \"${WindowsSdkDir}\"\n") +endif() + +if(UNIX) + set(UNIX_CURRENT_INSTALLED_DIR ${CURRENT_INSTALLED_DIR}) + set(LIBS "-ldl -lpthread") + set(REQUIRES ", gmodule-2.0, gobject-2.0, gthread-2.0") +elseif(WIN32) + execute_process(COMMAND cygpath "${CURRENT_INSTALLED_DIR}" OUTPUT_VARIABLE UNIX_CURRENT_INSTALLED_DIR) + string(STRIP ${UNIX_CURRENT_INSTALLED_DIR} UNIX_CURRENT_INSTALLED_DIR) + set(LIBS "-lWinmm -lDbgHelp") +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(is_component_build true) + set(v8_monolithic false) + set(v8_use_external_startup_data true) + set(targets :v8_libbase :v8_libplatform :v8) +else() + set(is_component_build false) + set(v8_monolithic true) + set(v8_use_external_startup_data false) + set(targets :v8_monolith) +endif() + +message(STATUS "Generating v8 build files. Please wait...") + +vcpkg_configure_gn( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS "is_component_build=${is_component_build} target_cpu=\"${VCPKG_TARGET_ARCHITECTURE}\" v8_monolithic=${v8_monolithic} v8_use_external_startup_data=${v8_use_external_startup_data} use_sysroot=false is_clang=false use_custom_libcxx=false v8_enable_verify_heap=false icu_use_data_file=false" + OPTIONS_DEBUG "is_debug=true enable_iterator_debugging=true pkg_config_libdir=\"${UNIX_CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig\"" + OPTIONS_RELEASE "is_debug=false enable_iterator_debugging=false pkg_config_libdir=\"${UNIX_CURRENT_INSTALLED_DIR}/lib/pkgconfig\"" +) + +message(STATUS "Building v8. Please wait...") + +vcpkg_install_gn( + SOURCE_PATH "${SOURCE_PATH}" + TARGETS ${targets} +) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(CFLAGS "-DV8_COMPRESS_POINTERS -DV8_31BIT_SMIS_ON_64BIT_ARCH") +endif() + +file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.h") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(PREFIX ${CURRENT_PACKAGES_DIR}) + configure_file("${CURRENT_PORT_DIR}/v8.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/v8.pc" @ONLY) + configure_file("${CURRENT_PORT_DIR}/v8_libbase.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/v8_libbase.pc" @ONLY) + configure_file("${CURRENT_PORT_DIR}/v8_libplatform.pc.in" "{CURRENT_PACKAGES_DIR}/lib/pkgconfig/v8_libplatform.pc" @ONLY) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/snapshot_blob.bin" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + + set(PREFIX ${CURRENT_PACKAGES_DIR}/debug) + configure_file("${CURRENT_PORT_DIR}/v8.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/v8.pc" @ONLY) + configure_file("${CURRENT_PORT_DIR}/v8_libbase.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/v8_libbase.pc" @ONLY) + configure_file("${CURRENT_PORT_DIR}/v8_libplatform.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/v8_libplatform.pc" @ONLY) + configure_file("${CURRENT_PORT_DIR}/V8Config-shared.cmake" "${CURRENT_PACKAGES_DIR}/share/v8/V8Config.cmake" @ONLY) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/snapshot_blob.bin" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") +else() + set(PREFIX ${CURRENT_PACKAGES_DIR}) + configure_file("${CURRENT_PORT_DIR}/v8_monolith.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/v8_monolith.pc" @ONLY) + set(PREFIX ${CURRENT_PACKAGES_DIR}/debug) + configure_file("${CURRENT_PORT_DIR}/v8_monolith.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/v8_monolith.pc" @ONLY) + configure_file("${CURRENT_PORT_DIR}/V8Config-static.cmake" "${CURRENT_PACKAGES_DIR}/share/v8/V8Config.cmake" @ONLY) +endif() + + +vcpkg_copy_pdbs() + +# v8 libraries are listed as SYSTEM_LIBRARIES because the pc files reference each other. +vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m dl pthread Winmm DbgHelp v8_libbase v8_libplatform v8) + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/v8/v8.patch b/externals/vcpkg/ports/v8/v8.patch new file mode 100755 index 000000000..7b41c8d3e --- /dev/null +++ b/externals/vcpkg/ports/v8/v8.patch @@ -0,0 +1,241 @@ +diff --git a/BUILD.gn b/BUILD.gn +index d2bfb6129d..c5ab18ee44 100644 +--- a/BUILD.gn ++++ b/BUILD.gn +@@ -5366,6 +5366,7 @@ if (is_component_build) { + + public_deps = [ + ":v8_base", ++ ":v8_initializers", + ":v8_snapshot", + ] + +diff --git a/src/codegen/code-stub-assembler.h b/src/codegen/code-stub-assembler.h +index 72b8fbc8a8..3ebfc23f1f 100644 +--- a/src/codegen/code-stub-assembler.h ++++ b/src/codegen/code-stub-assembler.h +@@ -303,7 +303,7 @@ enum class PrimitiveType { kBoolean, kNumber, kString, kSymbol }; + // it's possible to add JavaScript-specific useful CodeAssembler "macros" + // without modifying files in the compiler directory (and requiring a review + // from a compiler directory OWNER). +-class V8_EXPORT_PRIVATE CodeStubAssembler ++class V8_EXPORT CodeStubAssembler + : public compiler::CodeAssembler, + public TorqueGeneratedExportedMacrosAssembler { + public: +diff --git a/src/common/globals.h b/src/common/globals.h +index f51c3210f8..5291285337 100644 +--- a/src/common/globals.h ++++ b/src/common/globals.h +@@ -1364,7 +1364,7 @@ class BinaryOperationFeedback { + // This is distinct from BinaryOperationFeedback on purpose, because the + // feedback that matters differs greatly as well as the way it is consumed. + class CompareOperationFeedback { +- enum { ++ enum : uint32_t { + kSignedSmallFlag = 1 << 0, + kOtherNumberFlag = 1 << 1, + kBooleanFlag = 1 << 2, +@@ -1378,7 +1378,7 @@ class CompareOperationFeedback { + }; + + public: +- enum Type { ++ enum Type : uint32_t { + kNone = 0, + + kBoolean = kBooleanFlag, +diff --git a/src/compiler/node-cache.h b/src/compiler/node-cache.h +index 8e1d3d4eae..c55d8329de 100644 +--- a/src/compiler/node-cache.h ++++ b/src/compiler/node-cache.h +@@ -29,7 +29,7 @@ class Node; + // nodes such as constants, parameters, etc. + template , + typename Pred = std::equal_to > +-class EXPORT_TEMPLATE_DECLARE(V8_EXPORT_PRIVATE) NodeCache final { ++class V8_EXPORT_PRIVATE NodeCache final { + public: + explicit NodeCache(Zone* zone) : map_(zone) {} + ~NodeCache() = default; +diff --git a/src/heap/paged-spaces-inl.h b/src/heap/paged-spaces-inl.h +index e135e30efc..0c055247bc 100644 +--- a/src/heap/paged-spaces-inl.h ++++ b/src/heap/paged-spaces-inl.h +@@ -19,7 +19,7 @@ namespace internal { + // ----------------------------------------------------------------------------- + // PagedSpaceObjectIterator + +-HeapObject PagedSpaceObjectIterator::Next() { ++inline HeapObject PagedSpaceObjectIterator::Next() { + do { + HeapObject next_obj = FromCurrentPage(); + if (!next_obj.is_null()) return next_obj; +diff --git a/src/heap/paged-spaces.h b/src/heap/paged-spaces.h +index 621d92aa89..a8592a5b4d 100644 +--- a/src/heap/paged-spaces.h ++++ b/src/heap/paged-spaces.h +@@ -45,7 +45,7 @@ class V8_EXPORT_PRIVATE PagedSpaceObjectIterator : public ObjectIterator { + // Advance to the next object, skipping free spaces and other fillers and + // skipping the special garbage section of which there is one per space. + // Returns nullptr when the iteration has ended. +- inline HeapObject Next() override; ++ HeapObject Next() override; + + private: + // Fast (inlined) path of next(). +diff --git a/src/objects/feedback-vector.cc b/src/objects/feedback-vector.cc +index a77ea5d265..0cddb92a02 100644 +--- a/src/objects/feedback-vector.cc ++++ b/src/objects/feedback-vector.cc +@@ -114,9 +114,9 @@ Handle FeedbackMetadata::New(LocalIsolate* isolate, + return metadata; + } + +-template Handle FeedbackMetadata::New( ++template V8_EXPORT Handle FeedbackMetadata::New( + Isolate* isolate, const FeedbackVectorSpec* spec); +-template Handle FeedbackMetadata::New( ++template V8_EXPORT Handle FeedbackMetadata::New( + LocalIsolate* isolate, const FeedbackVectorSpec* spec); + + bool FeedbackMetadata::SpecDiffersFrom( +diff --git a/src/objects/fixed-array-inl.h b/src/objects/fixed-array-inl.h +index cca6d40070..d6d36ff59f 100644 +--- a/src/objects/fixed-array-inl.h ++++ b/src/objects/fixed-array-inl.h +@@ -88,7 +88,7 @@ bool FixedArray::is_the_hole(Isolate* isolate, int index) { + return get(isolate, index).IsTheHole(isolate); + } + +-void FixedArray::set(int index, Smi value) { ++inline V8_EXPORT_PRIVATE void FixedArray::set(int index, Smi value) { + DCHECK_NE(map(), GetReadOnlyRoots().fixed_cow_array_map()); + DCHECK_LT(static_cast(index), static_cast(length())); + DCHECK(Object(value).IsSmi()); +diff --git a/src/objects/fixed-array.h b/src/objects/fixed-array.h +index 98c5d8d5b5..bd5303e44c 100644 +--- a/src/objects/fixed-array.h ++++ b/src/objects/fixed-array.h +@@ -132,7 +132,7 @@ class FixedArray + inline bool is_the_hole(Isolate* isolate, int index); + + // Setter that doesn't need write barrier. +- inline void set(int index, Smi value); ++ inline V8_EXPORT_PRIVATE void set(int index, Smi value); + // Setter with explicit barrier mode. + inline void set(int index, Object value, WriteBarrierMode mode); + +diff --git a/src/snapshot/snapshot-utils.cc b/src/snapshot/snapshot-utils.cc +index eb2372372c..7defadb4b1 100644 +--- a/src/snapshot/snapshot-utils.cc ++++ b/src/snapshot/snapshot-utils.cc +@@ -5,7 +5,7 @@ + #include "src/snapshot/snapshot-utils.h" + + #include "src/sanitizer/msan.h" +-#include "third_party/zlib/zlib.h" ++#include "zlib.h" + + namespace v8 { + namespace internal { +diff --git a/src/wasm/function-body-decoder-impl.h b/src/wasm/function-body-decoder-impl.h +index d37f718681..3a409e1d76 100644 +--- a/src/wasm/function-body-decoder-impl.h ++++ b/src/wasm/function-body-decoder-impl.h +@@ -2013,7 +2013,7 @@ class WasmDecoder : public Decoder { + } + + // TODO(clemensb): This is only used by the interpreter; move there. +- V8_EXPORT_PRIVATE std::pair StackEffect(const byte* pc) { ++ std::pair StackEffect(const byte* pc) { + WasmOpcode opcode = static_cast(*pc); + // Handle "simple" opcodes with a fixed signature first. + const FunctionSig* sig = WasmOpcodes::Signature(opcode); +diff --git a/test/cctest/BUILD.gn b/test/cctest/BUILD.gn +index ffa4e3a136..a279faee9b 100644 +--- a/test/cctest/BUILD.gn ++++ b/test/cctest/BUILD.gn +@@ -493,6 +493,10 @@ v8_source_set("cctest_sources") { + # C4309: 'static_cast': truncation of constant value + cflags += [ "/wd4309" ] + ++ if(!is_clang) { ++ cflags += [ "/wd4789" ] ++ } ++ + # MSVS wants this for gay-{precision,shortest}.cc. + cflags += [ "/bigobj" ] + +diff --git a/tools/debug_helper/BUILD.gn b/tools/debug_helper/BUILD.gn +index 2256df1f55..29e27c6af9 100644 +--- a/tools/debug_helper/BUILD.gn ++++ b/tools/debug_helper/BUILD.gn +@@ -100,10 +100,12 @@ v8_component("v8_debug_helper") { + "../..:v8_libbase", + "../..:v8_shared_internal_headers", + "../..:v8_tracing", ++ "../..:v8", + ] + + configs = [ ":internal_config" ] + if (v8_enable_i18n_support) { ++ public_deps = [ "//third_party/icu" ] + configs += [ "//third_party/icu:icu_config" ] + } + +diff --git a/tools/v8windbg/BUILD.gn b/tools/v8windbg/BUILD.gn +index 5618d2d945..71568f1670 100644 +--- a/tools/v8windbg/BUILD.gn ++++ b/tools/v8windbg/BUILD.gn +@@ -6,7 +6,7 @@ import("../../gni/v8.gni") + + config("v8windbg_config") { + # Required for successful compilation of SDK header file DbgModel.h. +- cflags_cc = [ "/Zc:twoPhase-" ] ++ cflags_cc = [ "/Zc:twoPhase-", "/std:c++latest" ] + + include_dirs = [ "../.." ] + } +diff --git a/tools/v8windbg/base/dbgext.h b/tools/v8windbg/base/dbgext.h +index 8b36a8f361..f8d9f0d64e 100644 +--- a/tools/v8windbg/base/dbgext.h ++++ b/tools/v8windbg/base/dbgext.h +@@ -9,6 +9,7 @@ + #error Unicode not defined + #endif + ++#include + #include + #include + #include +diff --git a/tools/v8windbg/src/v8-debug-helper-interop.h b/tools/v8windbg/src/v8-debug-helper-interop.h +index f7d78c5dd3..1c70e54e7a 100644 +--- a/tools/v8windbg/src/v8-debug-helper-interop.h ++++ b/tools/v8windbg/src/v8-debug-helper-interop.h +@@ -5,10 +5,11 @@ + #ifndef V8_TOOLS_V8WINDBG_SRC_V8_DEBUG_HELPER_INTEROP_H_ + #define V8_TOOLS_V8WINDBG_SRC_V8_DEBUG_HELPER_INTEROP_H_ + +-#include +- ++#include ++#include + #include + ++#include + #include + #include + #include +diff --git a/tools/v8windbg/test/debug-callbacks.h b/tools/v8windbg/test/debug-callbacks.h +index 8855d6ffbc..ed2b0f62e9 100644 +--- a/tools/v8windbg/test/debug-callbacks.h ++++ b/tools/v8windbg/test/debug-callbacks.h +@@ -9,6 +9,7 @@ + #error Unicode not defined + #endif + ++#include + #include + #include + #include diff --git a/externals/vcpkg/ports/v8/v8.pc.in b/externals/vcpkg/ports/v8/v8.pc.in new file mode 100755 index 000000000..5f5721725 --- /dev/null +++ b/externals/vcpkg/ports/v8/v8.pc.in @@ -0,0 +1,11 @@ +prefix=@PREFIX@ +exec_prefix=${prefix} +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: v8 +Description: V8 JavaScript Engine +Version: @pkgver@ +Requires: zlib, icu-uc, icu-i18n, v8_libbase = @pkgver@ +Libs: -L${libdir} -lv8 +Cflags: -I${includedir} @CFLAGS@ diff --git a/externals/vcpkg/ports/v8/v8_libbase.pc.in b/externals/vcpkg/ports/v8/v8_libbase.pc.in new file mode 100755 index 000000000..ad472abf9 --- /dev/null +++ b/externals/vcpkg/ports/v8/v8_libbase.pc.in @@ -0,0 +1,10 @@ +prefix=@PREFIX@ +exec_prefix=${prefix} +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: v8 +Description: V8 JavaScript Engine - Base library +Version: @pkgver@ +Libs: -L${libdir} -lv8_libbase +Cflags: -I${includedir} @CFLAGS@ diff --git a/externals/vcpkg/ports/v8/v8_libplatform.pc.in b/externals/vcpkg/ports/v8/v8_libplatform.pc.in new file mode 100755 index 000000000..19c54ba79 --- /dev/null +++ b/externals/vcpkg/ports/v8/v8_libplatform.pc.in @@ -0,0 +1,10 @@ +prefix=@PREFIX@ +exec_prefix=${prefix} +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: v8 +Description: V8 JavaScript Engine - Platform library +Version: @pkgver@ +Libs: -L${libdir} -lv8_libplatform +Cflags: -I${includedir} @CFLAGS@ diff --git a/externals/vcpkg/ports/v8/v8_monolith.pc.in b/externals/vcpkg/ports/v8/v8_monolith.pc.in new file mode 100755 index 000000000..b23c661e8 --- /dev/null +++ b/externals/vcpkg/ports/v8/v8_monolith.pc.in @@ -0,0 +1,11 @@ +prefix=@PREFIX@ +exec_prefix=${prefix} +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: v8 +Description: V8 JavaScript Engine +Version: @pkgver@ +Requires: zlib, icu-uc, icu-i18n @REQUIRES@ +Libs: -L${libdir} -lv8_monolith @LIBS@ +Cflags: -I${includedir} @CFLAGS@ diff --git a/externals/vcpkg/ports/v8/vcpkg.json b/externals/vcpkg/ports/v8/vcpkg.json new file mode 100755 index 000000000..eae65fcd0 --- /dev/null +++ b/externals/vcpkg/ports/v8/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "v8", + "version": "9.1.269.39", + "port-version": 4, + "description": "Google Chrome's JavaScript engine", + "homepage": "https://v8.dev", + "license": "BSD-3-Clause", + "supports": "!(arm | arm64 | uwp | osx | linux)", + "dependencies": [ + { + "name": "glib", + "platform": "linux" + }, + "icu", + { + "name": "pthread", + "platform": "linux" + }, + { + "name": "vcpkg-tool-python2", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/ports/v8/zlib.gn b/externals/vcpkg/ports/v8/zlib.gn new file mode 100755 index 000000000..570d0e22a --- /dev/null +++ b/externals/vcpkg/ports/v8/zlib.gn @@ -0,0 +1,21 @@ +import("//build/config/linux/pkg_config.gni") + +pkg_config("system_zlib") { + packages = [ "zlib" ] + defines = [ "USE_SYSTEM_ZLIB=1" ] +} + +config("zlib_config") { + if(is_win && !is_component_build) { + ldflags = ["/ignore:4099"] # needed on VCPKG CI builds + } + configs = [ + ":system_zlib", + ] +} + +source_set("zlib") { + public_configs = [ + ":system_zlib", + ] +} diff --git a/externals/vcpkg/ports/valijson/fix-optional.patch b/externals/vcpkg/ports/valijson/fix-optional.patch new file mode 100755 index 000000000..307d630a5 --- /dev/null +++ b/externals/vcpkg/ports/valijson/fix-optional.patch @@ -0,0 +1,12 @@ +diff --git a/include/valijson/internal/optional.hpp b/include/valijson/internal/optional.hpp +index c9bc47b..c73c7fb 100644 +--- a/include/valijson/internal/optional.hpp ++++ b/include/valijson/internal/optional.hpp +@@ -9,6 +9,6 @@ namespace opt = std; + # endif + # endif + #else +-# include ++# include + namespace opt = std::experimental; + #endif diff --git a/externals/vcpkg/ports/valijson/fix-picojson.patch b/externals/vcpkg/ports/valijson/fix-picojson.patch new file mode 100755 index 000000000..ae276f8eb --- /dev/null +++ b/externals/vcpkg/ports/valijson/fix-picojson.patch @@ -0,0 +1,34 @@ +diff --git a/include/valijson/adapters/picojson_adapter.hpp b/include/valijson/adapters/picojson_adapter.hpp +index 4f5e5b6..0da2bf2 100644 +--- a/include/valijson/adapters/picojson_adapter.hpp ++++ b/include/valijson/adapters/picojson_adapter.hpp +@@ -29,10 +29,10 @@ + + #ifdef _MSC_VER + #pragma warning(disable: 4706) +-#include ++#include + #pragma warning(default: 4706) + #else +-#include ++#include + #endif + + #include +diff --git a/include/valijson/utils/picojson_utils.hpp b/include/valijson/utils/picojson_utils.hpp +index 36420d2..8660c30 100644 +--- a/include/valijson/utils/picojson_utils.hpp ++++ b/include/valijson/utils/picojson_utils.hpp +@@ -4,10 +4,10 @@ + + #ifdef _MSC_VER + #pragma warning(disable: 4706) +-#include ++#include + #pragma warning(default: 4706) + #else +-#include ++#include + #endif + + #include diff --git a/externals/vcpkg/ports/valijson/portfile.cmake b/externals/vcpkg/ports/valijson/portfile.cmake new file mode 100755 index 000000000..3481d8678 --- /dev/null +++ b/externals/vcpkg/ports/valijson/portfile.cmake @@ -0,0 +1,24 @@ +#header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tristanpenman/valijson + REF v0.6 + SHA512 a493d17159e479be7fe29d45c610c7d4fdd2c2f9ba897923129734fb07257dbb41fddde4c4263dbf0aa5c7101cd1555568a048beba2f60d2b32e625dd9690749 + HEAD_REF master + PATCHES fix-picojson.patch + fix-optional.patch +) + +# Copy the header files +file(GLOB HEADER_FILES ${SOURCE_PATH}/include/valijson/*) +file(COPY ${HEADER_FILES} + DESTINATION ${CURRENT_PACKAGES_DIR}/include/valijson + REGEX "\.(gitattributes|gitignore)$" EXCLUDE) + +file(COPY ${SOURCE_PATH}/include/compat/optional.hpp + DESTINATION ${CURRENT_PACKAGES_DIR}/include/valijson/compat) + +# Put the licence file where vcpkg expects it +file(COPY ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/valijson) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/valijson/LICENSE ${CURRENT_PACKAGES_DIR}/share/valijson/copyright) diff --git a/externals/vcpkg/ports/valijson/vcpkg.json b/externals/vcpkg/ports/valijson/vcpkg.json new file mode 100755 index 000000000..f78a85c40 --- /dev/null +++ b/externals/vcpkg/ports/valijson/vcpkg.json @@ -0,0 +1,5 @@ +{ + "name": "valijson", + "version": "0.6", + "description": "Header-only C++ library for JSON Schema validation" +} diff --git a/externals/vcpkg/ports/value-ptr-lite/portfile.cmake b/externals/vcpkg/ports/value-ptr-lite/portfile.cmake new file mode 100755 index 000000000..b272643d6 --- /dev/null +++ b/externals/vcpkg/ports/value-ptr-lite/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO martinmoene/value-ptr-lite + REF v0.2.1 + SHA512 96bea32310b3b3f91d19706d8ae9bdfa9a6ba485f529562e3b7cf89311d1e9b99fd24c0c6f23d169c5a7c84ebd9bd7b8ace972ee279b38c4c1caa398a3dd1590 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + test VALUE_PTR_LITE_OPT_BUILD_TESTS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} + -DVALUE_PTR_LITE_OPT_BUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME value_ptr-lite CONFIG_PATH lib/cmake/value_ptr-lite) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/value-ptr-lite/vcpkg.json b/externals/vcpkg/ports/value-ptr-lite/vcpkg.json new file mode 100755 index 000000000..3615f4971 --- /dev/null +++ b/externals/vcpkg/ports/value-ptr-lite/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "value-ptr-lite", + "version-semver": "0.2.1", + "port-version": 1, + "description": "A C++ smart-pointer with value semantics for C++98, C++11 and later in a single-file header-only library.", + "homepage": "https://github.com/martinmoene/value-ptr-lite", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "test": { + "description": "Build and perform value_ptr-lite tests." + } + } +} diff --git a/externals/vcpkg/ports/vamp-sdk/CMakeLists.txt b/externals/vcpkg/ports/vamp-sdk/CMakeLists.txt new file mode 100755 index 000000000..c5e29d922 --- /dev/null +++ b/externals/vcpkg/ports/vamp-sdk/CMakeLists.txt @@ -0,0 +1,119 @@ +cmake_minimum_required(VERSION 3.8) +project(vamp-cmake) + +find_package(SndFile REQUIRED) + +set(VAMP_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/vamp/vamp.h) + +set(SDK_HEADERS + ${CMAKE_CURRENT_SOURCE_DIR}/vamp-sdk/Plugin.h + ${CMAKE_CURRENT_SOURCE_DIR}/vamp-sdk/PluginAdapter.h + ${CMAKE_CURRENT_SOURCE_DIR}/vamp-sdk/PluginBase.h + ${CMAKE_CURRENT_SOURCE_DIR}/vamp-sdk/RealTime.h + ${CMAKE_CURRENT_SOURCE_DIR}/vamp-sdk/FFT.h + ${CMAKE_CURRENT_SOURCE_DIR}/vamp-sdk/plugguard.h + ${CMAKE_CURRENT_SOURCE_DIR}/vamp-sdk/vamp-sdk.h) + +set(SDK_SRC + ${CMAKE_CURRENT_SOURCE_DIR}/src/vamp-sdk/acsymbols.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/vamp-sdk/FFT.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/vamp-sdk/PluginAdapter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/vamp-sdk/RealTime.cpp) + +set(HOST_SDK_HEADERS + ${CMAKE_CURRENT_SOURCE_DIR}/vamp-hostsdk/Plugin.h + ${CMAKE_CURRENT_SOURCE_DIR}/vamp-hostsdk/PluginBase.h + ${CMAKE_CURRENT_SOURCE_DIR}/vamp-hostsdk/PluginHostAdapter.h + ${CMAKE_CURRENT_SOURCE_DIR}/vamp-hostsdk/RealTime.h + ${CMAKE_CURRENT_SOURCE_DIR}/vamp-hostsdk/PluginBufferingAdapter.h + ${CMAKE_CURRENT_SOURCE_DIR}/vamp-hostsdk/PluginChannelAdapter.h + ${CMAKE_CURRENT_SOURCE_DIR}/vamp-hostsdk/PluginInputDomainAdapter.h + ${CMAKE_CURRENT_SOURCE_DIR}/vamp-hostsdk/PluginLoader.h + ${CMAKE_CURRENT_SOURCE_DIR}/vamp-hostsdk/PluginSummarisingAdapter.h + ${CMAKE_CURRENT_SOURCE_DIR}/vamp-hostsdk/PluginWrapper.h + ${CMAKE_CURRENT_SOURCE_DIR}/vamp-hostsdk/hostguard.h + ${CMAKE_CURRENT_SOURCE_DIR}/vamp-hostsdk/host-c.h + ${CMAKE_CURRENT_SOURCE_DIR}/vamp-hostsdk/vamp-hostsdk.h) + +set(HOST_SDK_SRC + ${CMAKE_CURRENT_SOURCE_DIR}/src/vamp-hostsdk/acsymbols.c + ${CMAKE_CURRENT_SOURCE_DIR}/src/vamp-hostsdk/Files.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/vamp-hostsdk/PluginBufferingAdapter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/vamp-hostsdk/PluginChannelAdapter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/vamp-hostsdk/PluginHostAdapter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/vamp-hostsdk/PluginInputDomainAdapter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/vamp-hostsdk/PluginLoader.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/vamp-hostsdk/PluginSummarisingAdapter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/vamp-hostsdk/PluginWrapper.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/vamp-hostsdk/RealTime.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/vamp-hostsdk/host-c.cpp) + +if(BUILD_SHARED_LIBS) + if(MSVC) + set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + endif() +endif() + +add_library(vamp-sdk ${SDK_SRC} ${SDK_HEADERS}) +add_library(vamp-hostsdk ${HOST_SDK_SRC} ${HOST_SDK_HEADERS}) + +message(${SDK_HEADERS}) + +set_target_properties(vamp-sdk PROPERTIES PUBLIC_HEADER "${SDK_HEADERS}") +set_target_properties(vamp-hostsdk PROPERTIES PUBLIC_HEADER + "${HOST_SDK_HEADERS}") + +# The Visual Studio project files upstream intentionally output different +# library file names than autotools. +# https://github.com/tenacityteam/tenacity/pull/577#discussion_r702328284 +if(WIN32) + set_target_properties(vamp-sdk PROPERTIES OUTPUT_NAME VampPluginSDK) + set_target_properties(vamp-hostsdk PROPERTIES OUTPUT_NAME VampHostSDK) +endif() + +set_property(TARGET vamp-sdk PROPERTY CXX_STANDARD 11) +set_property(TARGET vamp-hostsdk PROPERTY CXX_STANDARD 11) + +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +add_definitions(-D_LIB -D_USE_MATH_DEFINES) + +target_link_libraries(vamp-hostsdk PUBLIC SndFile::sndfile) + +target_link_libraries(vamp-sdk PUBLIC SndFile::sndfile) + +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/vamp.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/vamp.pc" @ONLY) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/vamp-hostsdk.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/vamp-hostsdk.pc" @ONLY) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/vamp-sdk.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/vamp-sdk.pc" @ONLY) +file(GLOB PKGCONFIG_FILES "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/*.pc") +install(FILES ${PKGCONFIG_FILES} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + +install( + TARGETS vamp-hostsdk vamp-sdk + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + +if(NOT DISABLE_INSTALL_HEADERS) + install( + DIRECTORY vamp-hostsdk/ + DESTINATION include/vamp-hostsdk + FILES_MATCHING + PATTERN "*.h" + PATTERN "*_priv.h" EXCLUDE + PATTERN "config.h" EXCLUDE) + install( + DIRECTORY vamp-sdk/ + DESTINATION include/vamp-sdk + FILES_MATCHING + PATTERN "*.h" + PATTERN "*_priv.h" EXCLUDE + PATTERN "config.h" EXCLUDE) + install( + DIRECTORY vamp/ + DESTINATION include/vamp + FILES_MATCHING + PATTERN "*.h" + PATTERN "*_priv.h" EXCLUDE + PATTERN "config.h" EXCLUDE) +endif() diff --git a/externals/vcpkg/ports/vamp-sdk/portfile.cmake b/externals/vcpkg/ports/vamp-sdk/portfile.cmake new file mode 100755 index 000000000..83c60e6fa --- /dev/null +++ b/externals/vcpkg/ports/vamp-sdk/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + REPO c4dm/vamp-plugin-sdk + REF vamp-plugin-sdk-v2.10 + SHA512 67a71e5396eab5ce9503e9111b4cfc16fc9755cf6ae2d8dfc99ed29fd91e75eaf0de9a9c55ce8f7751f04c235eb86430856eff18f02adde54f1850a87c917ef0 + OUT_SOURCE_PATH SOURCE_PATH +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_cmake_install() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# # Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/vamp-sdk/vcpkg.json b/externals/vcpkg/ports/vamp-sdk/vcpkg.json new file mode 100755 index 000000000..33f02b235 --- /dev/null +++ b/externals/vcpkg/ports/vamp-sdk/vcpkg.json @@ -0,0 +1,24 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", + "name": "vamp-sdk", + "version": "2.10", + "port-version": 3, + "description": "Library for Vamp plugins", + "homepage": "https://www.vamp-plugins.org/develop.html", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "libsndfile", + "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/variant-lite/portfile.cmake b/externals/vcpkg/ports/variant-lite/portfile.cmake new file mode 100755 index 000000000..eb3124532 --- /dev/null +++ b/externals/vcpkg/ports/variant-lite/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO martinmoene/variant-lite + REF v2.0.0 + SHA512 dd255d3664b42305e58c14a0bfc7d6ba54462656001e4e79c14fdb64a6f54b57a00ec3cf10d006614c849528529c6897031df4b52a49ecb91531e89d366d6a9c +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DVARIANT_LITE_OPT_BUILD_TESTS=OFF + -DVARIANT_LITE_OPT_BUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + CONFIG_PATH "lib/cmake/${PORT}" +) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" +) + +file(INSTALL + "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright +) diff --git a/externals/vcpkg/ports/variant-lite/vcpkg.json b/externals/vcpkg/ports/variant-lite/vcpkg.json new file mode 100755 index 000000000..a4fe11838 --- /dev/null +++ b/externals/vcpkg/ports/variant-lite/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "variant-lite", + "version": "2.0.0", + "description": "A C++17-like variant, a type-safe union for C++98, C++11 and later in a single-file header-only library", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/vc/Fix-internal-func-export.patch b/externals/vcpkg/ports/vc/Fix-internal-func-export.patch new file mode 100755 index 000000000..a06321649 --- /dev/null +++ b/externals/vcpkg/ports/vc/Fix-internal-func-export.patch @@ -0,0 +1,16 @@ +diff --git a/src/support_x86.cpp b/src/support_x86.cpp +index 0ab9669..d5c17ba 100644 +--- a/src/support_x86.cpp ++++ b/src/support_x86.cpp +@@ -58,8 +58,9 @@ static inline bool xgetbvCheck(unsigned int bits) + #endif + } + +-Vc_TARGET_NO_SIMD +-bool isImplementationSupported(Implementation impl) ++ ++Vc_TARGET_NO_SIMD ++bool Vc_VDECL isImplementationSupported(Vc::Implementation impl) + { + CpuId::init(); + diff --git a/externals/vcpkg/ports/vc/correct_cmake_config_path.patch b/externals/vcpkg/ports/vc/correct_cmake_config_path.patch new file mode 100755 index 000000000..bb1d5437b --- /dev/null +++ b/externals/vcpkg/ports/vc/correct_cmake_config_path.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/VcConfig.cmake.in b/cmake/VcConfig.cmake.in +index 36de476..5cb0e5b 100644 +--- a/cmake/VcConfig.cmake.in ++++ b/cmake/VcConfig.cmake.in +@@ -4,7 +4,7 @@ + set_and_check(@PROJECT_NAME@_INSTALL_DIR @PACKAGE_CMAKE_INSTALL_PREFIX@) + set_and_check(@PROJECT_NAME@_INCLUDE_DIR @PACKAGE_CMAKE_INSTALL_PREFIX@/include) + set_and_check(@PROJECT_NAME@_LIB_DIR @PACKAGE_CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@) +-set_and_check(@PROJECT_NAME@_CMAKE_MODULES_DIR ${@PROJECT_NAME@_LIB_DIR}/cmake/Vc) ++set_and_check(@PROJECT_NAME@_CMAKE_MODULES_DIR @PACKAGE_CMAKE_INSTALL_PREFIX@/share/vc) + set(@PROJECT_NAME@_VERSION_STRING "@PROJECT_VERSION@") + + ### Setup @PROJECT_NAME@ defaults +@@ -20,7 +20,7 @@ list(APPEND @PROJECT_NAME@_ALL_FLAGS ${@PROJECT_NAME@_COMPILE_FLAGS}) + list(APPEND @PROJECT_NAME@_ALL_FLAGS ${@PROJECT_NAME@_ARCHITECTURE_FLAGS}) + + ### Import targets +-include("@PACKAGE_CMAKE_INSTALL_PREFIX@/@PACKAGE_INSTALL_DESTINATION@/@PROJECT_NAME@Targets.cmake") ++include(${@PROJECT_NAME@_CMAKE_MODULES_DIR}/@PROJECT_NAME@Targets.cmake) + + ### Define @PROJECT_NAME@_LIBRARIES for backwards compatibility + get_target_property(vc_lib_location @PROJECT_NAME@::Vc INTERFACE_LOCATION) diff --git a/externals/vcpkg/ports/vc/portfile.cmake b/externals/vcpkg/ports/vc/portfile.cmake new file mode 100755 index 000000000..d185dd587 --- /dev/null +++ b/externals/vcpkg/ports/vc/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO VcDevel/Vc + REF 1.4.3 + SHA512 7c0c4ccf8c7c4585334482135f2daf1a5bc088114b880093893583bdcea1fbfcec02485da6059304c510c8b1bb1b768ef04fd7ac8ccb21b9ebbad5d0d5babaef + HEAD_REF 1.4 + PATCHES + correct_cmake_config_path.patch + Fix-internal-func-export.patch #remove it in next version +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DBUILD_EXAMPLES=OFF +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/Vc/") +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/vc/vcpkg.json b/externals/vcpkg/ports/vc/vcpkg.json new file mode 100755 index 000000000..09bb05010 --- /dev/null +++ b/externals/vcpkg/ports/vc/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "vc", + "version": "1.4.3", + "description": "SIMD Vector Classes for C++ .", + "homepage": "https://github.com/VcDevel/Vc", + "license": "BSD-3-Clause", + "supports": "!arm64", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/vcglib/consume-vcpkg-eigen3.patch b/externals/vcpkg/ports/vcglib/consume-vcpkg-eigen3.patch new file mode 100755 index 000000000..a84f436c4 --- /dev/null +++ b/externals/vcpkg/ports/vcglib/consume-vcpkg-eigen3.patch @@ -0,0 +1,19 @@ +diff --git a/vcg/math/eigen.h b/vcg/math/eigen.h +index 5cae402f..e8f82258 100644 +--- a/vcg/math/eigen.h ++++ b/vcg/math/eigen.h +@@ -53,10 +53,10 @@ struct ei_to_vcgtype; + } + + #include "base.h" +-#include "../../eigenlib/Eigen/LU" +-#include "../../eigenlib/Eigen/Geometry" +-#include "../../eigenlib/Eigen/Array" +-#include "../../eigenlib/Eigen/Core" ++#include ++#include ++#include ++#include + + // add support for unsigned char and short int + namespace Eigen { diff --git a/externals/vcpkg/ports/vcglib/fix-build.patch b/externals/vcpkg/ports/vcglib/fix-build.patch new file mode 100755 index 000000000..635805cd2 --- /dev/null +++ b/externals/vcpkg/ports/vcglib/fix-build.patch @@ -0,0 +1,13 @@ +diff --git a/vcg/simplex/tetrahedron/pos.h b/vcg/simplex/tetrahedron/pos.h +index d47348ce..078b1f6a 100644 +--- a/vcg/simplex/tetrahedron/pos.h ++++ b/vcg/simplex/tetrahedron/pos.h +@@ -385,7 +385,7 @@ public: + void Assert() + #ifdef _DEBUG + { +- HETYPE ht=*this; ++ BasePosType ht=*this; + ht.FlipT(); + ht.FlipT(); + assert(ht==*this); diff --git a/externals/vcpkg/ports/vcglib/portfile.cmake b/externals/vcpkg/ports/vcglib/portfile.cmake new file mode 100755 index 000000000..24c4cb6ae --- /dev/null +++ b/externals/vcpkg/ports/vcglib/portfile.cmake @@ -0,0 +1,15 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cnr-isti-vclab/vcglib + REF 2022.02 + SHA512 1a4b04c53eb52d0d9864f4e942f0a06e6f4fe5f2b5686fa534b6c68b715941147d89ed6d83bce9dc8d0c7029460824ab1f73231ba6b7c32472becfe641e2a7cb + PATCHES + consume-vcpkg-eigen3.patch + fix-build.patch + ) + +file(COPY ${SOURCE_PATH}/vcg/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/vcg) +file(COPY ${SOURCE_PATH}/wrap/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/wrap) +file(COPY ${SOURCE_PATH}/img/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/img) + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/vcglib/vcpkg.json b/externals/vcpkg/ports/vcglib/vcpkg.json new file mode 100755 index 000000000..d8d489802 --- /dev/null +++ b/externals/vcpkg/ports/vcglib/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "vcglib", + "version-string": "2022.02", + "description": "library for manipulation, processing, cleaning, simplifying triangle meshes.", + "license": "GPL-3.0-only", + "dependencies": [ + "eigen3" + ] +} diff --git a/externals/vcpkg/ports/vcpkg-cmake-config/copyright b/externals/vcpkg/ports/vcpkg-cmake-config/copyright new file mode 100755 index 000000000..2e4eac826 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-cmake-config/copyright @@ -0,0 +1,23 @@ +Copyright (c) Microsoft Corporation + +All rights reserved. + +MIT License + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/externals/vcpkg/ports/vcpkg-cmake-config/portfile.cmake b/externals/vcpkg/ports/vcpkg-cmake-config/portfile.cmake new file mode 100755 index 000000000..fc3dbafd5 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-cmake-config/portfile.cmake @@ -0,0 +1,12 @@ +if(NOT TARGET_TRIPLET STREQUAL _HOST_TRIPLET) + # make FATAL_ERROR in CI when issue #16773 fixed + message(WARNING "vcpkg-cmake-config is a host-only port; please mark it as a host port in your dependencies.") +endif() + +file(INSTALL + "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_config_fixup.cmake" + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" + "${CMAKE_CURRENT_LIST_DIR}/copyright" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/vcpkg-cmake-config/vcpkg-port-config.cmake b/externals/vcpkg/ports/vcpkg-cmake-config/vcpkg-port-config.cmake new file mode 100755 index 000000000..980d41131 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-cmake-config/vcpkg-port-config.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_config_fixup.cmake") diff --git a/externals/vcpkg/ports/vcpkg-cmake-config/vcpkg.json b/externals/vcpkg/ports/vcpkg-cmake-config/vcpkg.json new file mode 100755 index 000000000..db965341a --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-cmake-config/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "vcpkg-cmake-config", + "version-date": "2022-02-06", + "port-version": 1, + "documentation": "https://vcpkg.io/en/docs/README.html", + "license": "MIT" +} diff --git a/externals/vcpkg/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake b/externals/vcpkg/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake new file mode 100755 index 000000000..368e5809a --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake @@ -0,0 +1,258 @@ +include_guard(GLOBAL) + +function(vcpkg_cmake_config_fixup) + cmake_parse_arguments(PARSE_ARGV 0 "arg" "DO_NOT_DELETE_PARENT_CONFIG_PATH;NO_PREFIX_CORRECTION" "PACKAGE_NAME;CONFIG_PATH;TOOLS_PATH" "") + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "vcpkg_cmake_config_fixup was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + if(NOT arg_PACKAGE_NAME) + set(arg_PACKAGE_NAME "${PORT}") + endif() + if(NOT arg_CONFIG_PATH) + set(arg_CONFIG_PATH "share/${arg_PACKAGE_NAME}") + endif() + if(NOT arg_TOOLS_PATH) + set(arg_TOOLS_PATH "tools/${PORT}") + endif() + set(target_path "share/${arg_PACKAGE_NAME}") + + string(REPLACE "." "\\." EXECUTABLE_SUFFIX "${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + + set(debug_share "${CURRENT_PACKAGES_DIR}/debug/${target_path}") + set(release_share "${CURRENT_PACKAGES_DIR}/${target_path}") + + if(NOT arg_CONFIG_PATH STREQUAL "share/${arg_PACKAGE_NAME}") + if(arg_CONFIG_PATH STREQUAL "share") + set(arg_CONFIG_PATH z_vcpkg_share) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/${arg_CONFIG_PATH}") + file(RENAME "${CURRENT_PACKAGES_DIR}/share" "${CURRENT_PACKAGES_DIR}/${arg_CONFIG_PATH}") + endif() + + set(debug_config "${CURRENT_PACKAGES_DIR}/debug/${arg_CONFIG_PATH}") + set(release_config "${CURRENT_PACKAGES_DIR}/${arg_CONFIG_PATH}") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if(NOT EXISTS "${debug_config}") + message(FATAL_ERROR "'${debug_config}' does not exist.") + endif() + + # This roundabout handling enables CONFIG_PATH = share + file(MAKE_DIRECTORY "${debug_share}") + file(GLOB files "${debug_config}/*") + file(COPY ${files} DESTINATION "${debug_share}") + file(REMOVE_RECURSE "${debug_config}") + endif() + + file(GLOB files "${release_config}/*") + file(COPY ${files} DESTINATION "${release_share}") + file(REMOVE_RECURSE "${release_config}") + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + get_filename_component(debug_config_dir_name "${debug_config}" NAME) + string(TOLOWER "${debug_config_dir_name}" debug_config_dir_name) + if(debug_config_dir_name STREQUAL "cmake" AND NOT arg_DO_NOT_DELETE_PARENT_CONFIG_PATH) + file(REMOVE_RECURSE "${debug_config}") + else() + get_filename_component(debug_config_parent_dir "${debug_config}" DIRECTORY) + get_filename_component(debug_config_dir_name "${debug_config_parent_dir}" NAME) + string(TOLOWER "${debug_config_dir_name}" debug_config_dir_name) + if(debug_config_dir_name STREQUAL "cmake" AND NOT arg_DO_NOT_DELETE_PARENT_CONFIG_PATH) + file(REMOVE_RECURSE "${debug_config_parent_dir}") + endif() + endif() + endif() + + get_filename_component(release_config_dir_name "${release_config}" NAME) + string(TOLOWER "${release_config_dir_name}" release_config_dir_name) + if(release_config_dir_name STREQUAL "cmake" AND NOT arg_DO_NOT_DELETE_PARENT_CONFIG_PATH) + file(REMOVE_RECURSE "${release_config}") + else() + get_filename_component(release_config_parent_dir "${release_config}" DIRECTORY) + get_filename_component(release_config_dir_name "${release_config_parent_dir}" NAME) + string(TOLOWER "${release_config_dir_name}" release_config_dir_name) + if(release_config_dir_name STREQUAL "cmake" AND NOT arg_DO_NOT_DELETE_PARENT_CONFIG_PATH) + file(REMOVE_RECURSE "${release_config_parent_dir}") + endif() + endif() + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if(NOT EXISTS "${debug_share}") + message(FATAL_ERROR "'${debug_share}' does not exist.") + endif() + endif() + + file(GLOB_RECURSE release_targets + "${release_share}/*-release.cmake" + ) + foreach(release_target IN LISTS release_targets) + file(READ "${release_target}" contents) + string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${_IMPORT_PREFIX}" contents "${contents}") + string(REGEX REPLACE "\\\${_IMPORT_PREFIX}/bin/([^ \"]+${EXECUTABLE_SUFFIX})" "\${_IMPORT_PREFIX}/${arg_TOOLS_PATH}/\\1" contents "${contents}") + file(WRITE "${release_target}" "${contents}") + endforeach() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(GLOB_RECURSE debug_targets + "${debug_share}/*-debug.cmake" + ) + foreach(debug_target IN LISTS debug_targets) + file(RELATIVE_PATH debug_target_rel "${debug_share}" "${debug_target}") + + file(READ "${debug_target}" contents) + string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${_IMPORT_PREFIX}" contents "${contents}") + string(REGEX REPLACE "\\\${_IMPORT_PREFIX}/bin/([^ \";]+${EXECUTABLE_SUFFIX})" "\${_IMPORT_PREFIX}/${arg_TOOLS_PATH}/\\1" contents "${contents}") + string(REPLACE "\${_IMPORT_PREFIX}/lib" "\${_IMPORT_PREFIX}/debug/lib" contents "${contents}") + string(REPLACE "\${_IMPORT_PREFIX}/bin" "\${_IMPORT_PREFIX}/debug/bin" contents "${contents}") + file(WRITE "${release_share}/${debug_target_rel}" "${contents}") + + file(REMOVE "${debug_target}") + endforeach() + endif() + + #Fix ${_IMPORT_PREFIX} and absolute paths in cmake generated targets and configs; + #Since those can be renamed we have to check in every *.cmake, but only once. + file(GLOB_RECURSE main_cmakes "${release_share}/*.cmake") + if(NOT DEFINED Z_VCPKG_CMAKE_CONFIG_ALREADY_FIXED_UP) + vcpkg_list(SET Z_VCPKG_CMAKE_CONFIG_ALREADY_FIXED_UP) + endif() + foreach(already_fixed_up IN LISTS Z_VCPKG_CMAKE_CONFIG_ALREADY_FIXED_UP) + vcpkg_list(REMOVE_ITEM main_cmakes "${already_fixed_up}") + endforeach() + vcpkg_list(APPEND Z_VCPKG_CMAKE_CONFIG_ALREADY_FIXED_UP ${main_cmakes}) + set(Z_VCPKG_CMAKE_CONFIG_ALREADY_FIXED_UP "${Z_VCPKG_CMAKE_CONFIG_ALREADY_FIXED_UP}" CACHE INTERNAL "") + + foreach(main_cmake IN LISTS main_cmakes) + file(READ "${main_cmake}" contents) + # Note: I think the following comment is no longer true, since we now require the path to be `share/blah` + # however, I don't know it for sure. + # - nimazzuc + + #This correction is not correct for all cases. To make it correct for all cases it needs to consider + #original folder deepness to CURRENT_PACKAGES_DIR in comparison to the moved to folder deepness which + #is always at least (>=) 2, e.g. share/${PORT}. Currently the code assumes it is always 2 although + #this requirement is only true for the *Config.cmake. The targets are not required to be in the same + #folder as the *Config.cmake! + if(NOT arg_NO_PREFIX_CORRECTION) + string(REGEX REPLACE +[[get_filename_component\(_IMPORT_PREFIX "\${CMAKE_CURRENT_LIST_FILE}" PATH\)( +get_filename_component\(_IMPORT_PREFIX "\${_IMPORT_PREFIX}" PATH\))*]] +[[get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)]] + contents "${contents}") # see #1044 for details why this replacement is necessary. See #4782 why it must be a regex. + string(REGEX REPLACE +[[get_filename_component\(PACKAGE_PREFIX_DIR "\${CMAKE_CURRENT_LIST_DIR}/\.\./(\.\./)*" ABSOLUTE\)]] +[[get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE)]] + contents "${contents}") + string(REGEX REPLACE +[[get_filename_component\(PACKAGE_PREFIX_DIR "\${CMAKE_CURRENT_LIST_DIR}/\.\.((\\|/)\.\.)*" ABSOLUTE\)]] +[[get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE)]] + contents "${contents}") # This is a meson-related workaround, see https://github.com/mesonbuild/meson/issues/6955 + endif() + + # Merge release and debug configurations of target property INTERFACE_LINK_LIBRARIES. + string(REPLACE "${release_share}/" "${debug_share}/" debug_cmake "${main_cmake}") + if(DEFINED VCPKG_BUILD_TYPE) + # Skip. Warning: A release-only port in a dual-config installation + # may pull release dependencies into the debug configuration. + elseif(NOT contents MATCHES "INTERFACE_LINK_LIBRARIES") + # Skip. No relevant properties. + elseif(NOT contents MATCHES "# Generated CMake target import file\\.") + # Skip. No safe assumptions about a matching debug import file. + elseif(NOT EXISTS "${debug_cmake}") + message(SEND_ERROR "Did not find a debug import file matching '${main_cmake}'") + else() + file(READ "${debug_cmake}" debug_contents) + while(contents MATCHES "set_target_properties\\(([^ \$]*) PROPERTIES[^)]*\\)") + set(matched_command "${CMAKE_MATCH_0}") + string(REPLACE "+" "\\+" target "${CMAKE_MATCH_1}") + if(NOT debug_contents MATCHES "set_target_properties\\(${target} PROPERTIES[^)]*\\)") + message(SEND_ERROR "Did not find a debug configuration for target '${target}'.") + endif() + set(debug_command "${CMAKE_MATCH_0}") + string(REGEX MATCH " INTERFACE_LINK_LIBRARIES \"([^\"]*)\"" release_line "${matched_command}") + set(release_libs "${CMAKE_MATCH_1}") + string(REGEX MATCH " INTERFACE_LINK_LIBRARIES \"([^\"]*)\"" debug_line "${debug_command}") + set(debug_libs "${CMAKE_MATCH_1}") + z_vcpkg_cmake_config_fixup_merge(merged_libs release_libs debug_libs) + string(REPLACE "${release_line}" " INTERFACE_LINK_LIBRARIES \"${merged_libs}\"" updated_command "${matched_command}") + string(REPLACE "set_target_properties" "set_target_properties::done" updated_command "${updated_command}") # Prevend 2nd match + string(REPLACE "${matched_command}" "${updated_command}" contents "${contents}") + endwhile() + string(REPLACE "set_target_properties::done" "set_target_properties" contents "${contents}") # Restore original command + endif() + + #Fix absolute paths to installed dir with ones relative to ${CMAKE_CURRENT_LIST_DIR} + #This happens if vcpkg built libraries are directly linked to a target instead of using + #an imported target. + string(REPLACE "${CURRENT_INSTALLED_DIR}" [[${VCPKG_IMPORT_PREFIX}]] contents "${contents}") + file(TO_CMAKE_PATH "${CURRENT_PACKAGES_DIR}" cmake_current_packages_dir) + string(REPLACE "${cmake_current_packages_dir}" [[${VCPKG_IMPORT_PREFIX}]] contents "${contents}") + # If ${VCPKG_IMPORT_PREFIX} was actually used, inject a definition of it: + string(FIND "${contents}" [[${VCPKG_IMPORT_PREFIX}]] index) + if (NOT index STREQUAL "-1") + get_filename_component(main_cmake_dir "${main_cmake}" DIRECTORY) + # Calculate relative to be a sequence of "../" + file(RELATIVE_PATH relative "${main_cmake_dir}" "${cmake_current_packages_dir}") + string(PREPEND contents "get_filename_component(VCPKG_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_DIR}\/${relative}\" ABSOLUTE)\n") + endif() + + file(WRITE "${main_cmake}" "${contents}") + endforeach() + + file(GLOB_RECURSE unused_files + "${debug_share}/*[Tt]argets.cmake" + "${debug_share}/*[Cc]onfig.cmake" + "${debug_share}/*[Cc]onfigVersion.cmake" + "${debug_share}/*[Cc]onfig-version.cmake" + ) + foreach(unused_file IN LISTS unused_files) + file(REMOVE "${unused_file}") + endforeach() + + # Remove /debug// if it's empty. + file(GLOB_RECURSE remaining_files "${debug_share}/*") + if(remaining_files STREQUAL "") + file(REMOVE_RECURSE "${debug_share}") + endif() + + # Remove /debug/share/ if it's empty. + file(GLOB_RECURSE remaining_files "${CURRENT_PACKAGES_DIR}/debug/share/*") + if(remaining_files STREQUAL "") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + endif() +endfunction() + +# Merges link interface library lists for release and debug +# into a single expression which use generator expression as necessary. +function(z_vcpkg_cmake_config_fixup_merge out_var release_var debug_var) + set(release_libs "VCPKG;${${release_var}}") + string(REGEX REPLACE ";optimized;([^;]*)" ";\\1" release_libs "${release_libs}") + string(REGEX REPLACE ";debug;([^;]*)" ";" release_libs "${release_libs}") + list(REMOVE_AT release_libs 0) + list(FILTER release_libs EXCLUDE REGEX [[^\\[$]<\\[$]:]]) + list(TRANSFORM release_libs REPLACE [[^\\[$]<\\[$]>:(.*)>$]] "\\1") + + set(debug_libs "VCPKG;${${debug_var}}") + string(REGEX REPLACE ";optimized;([^;]*)" ";" debug_libs "${debug_libs}") + string(REGEX REPLACE ";debug;([^;]*)" ";\\1" debug_libs "${debug_libs}") + list(REMOVE_AT debug_libs 0) + list(FILTER debug_libs EXCLUDE REGEX [[^\\[$]<\\[$]>:]]) + list(TRANSFORM debug_libs REPLACE [[^\\[$]<\\[$]:(.*)>$]] "\\1") + + set(merged_libs "") + foreach(release_lib debug_lib IN ZIP_LISTS release_libs debug_libs) + if(release_lib STREQUAL debug_lib) + list(APPEND merged_libs "${release_lib}") + else() + if(release_lib) + list(APPEND merged_libs "\\\$<\\\$>:${release_lib}>") + endif() + if(debug_lib) + list(APPEND merged_libs "\\\$<\\\$:${debug_lib}>") + endif() + endif() + endforeach() + set("${out_var}" "${merged_libs}" PARENT_SCOPE) +endfunction() diff --git a/externals/vcpkg/ports/vcpkg-cmake-get-vars/cmake_get_vars/CMakeLists.txt b/externals/vcpkg/ports/vcpkg-cmake-get-vars/cmake_get_vars/CMakeLists.txt new file mode 100755 index 000000000..fb1da4696 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-cmake-get-vars/cmake_get_vars/CMakeLists.txt @@ -0,0 +1,204 @@ +cmake_minimum_required(VERSION 3.20) + +set(VCPKG_LANGUAGES "C;CXX" CACHE STRING "Languages to enables for this project") + +set(OUTPUT_STRING) +# Build default checklists +list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_CROSSCOMPILING + CMAKE_SYSTEM_NAME + CMAKE_HOST_SYSTEM_NAME + CMAKE_SYSTEM_PROCESSOR + CMAKE_HOST_SYSTEM_PROCESSOR + CMAKE_SIZEOF_VOID_P + MSVC + MSVC_VERSION) +if(CMAKE_SYSTEM_NAME MATCHES "Darwin") + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_OSX_DEPLOYMENT_TARGET + CMAKE_OSX_SYSROOT) +endif() +# Programs to check +set(PROGLIST AR RANLIB STRIP NM OBJDUMP DLLTOOL MT LINKER) +foreach(prog IN LISTS PROGLIST) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${prog}) +endforeach() +set(COMPILERS ${VCPKG_LANGUAGES} RC) +foreach(prog IN LISTS COMPILERS) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${prog}_COMPILER) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${prog}_COMPILER_ID) +endforeach() +# Variables to check +foreach(_lang IN LISTS VCPKG_LANGUAGES) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_STANDARD_INCLUDE_DIRECTORIES) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_STANDARD_LIBRARIES) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_STANDARD) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_COMPILE_FEATURES) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_EXTENSION) + # Probably never required since implicit. + #list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES) + #list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_IMPLICIT_INCLUDE_DIRECTORIES) + #list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_IMPLICIT_LINK_DIRECTORIES) + #list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_IMPLICIT_LINK_LIBRARIES) +endforeach() +list(REMOVE_DUPLICATES VCPKG_DEFAULT_VARS_TO_CHECK) + +# Environment variables to check. +list(APPEND VCPKG_DEFAULT_ENV_VARS_TO_CHECK PATH INCLUDE C_INCLUDE_PATH CPLUS_INCLUDE_PATH LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH) +list(REMOVE_DUPLICATES VCPKG_DEFAULT_ENV_VARS_TO_CHECK) + +#Flags to check. Flags are a bit special since they are configuration aware. +set(FLAGS ${VCPKG_LANGUAGES} RC SHARED_LINKER STATIC_LINKER EXE_LINKER) +foreach(flag IN LISTS FLAGS) + list(APPEND VCPKG_DEFAULT_FLAGS_TO_CHECK CMAKE_${flag}_FLAGS) +endforeach() +list(REMOVE_DUPLICATES VCPKG_DEFAULT_FLAGS_TO_CHECK) + +#Language-specific flags. +foreach(_lang IN LISTS VCPKG_LANGUAGES) + list(APPEND VCPKG_LANG_FLAGS CMAKE_${_lang}_FLAGS) +endforeach() +list(REMOVE_DUPLICATES VCPKG_LANG_FLAGS) + +# TODO if ever necessary: Properties to check + +set(VCPKG_VAR_PREFIX "VCPKG_DETECTED" CACHE STRING "Variable prefix to use for detected flags") +set(VCPKG_VARS_TO_CHECK "${VCPKG_DEFAULT_VARS_TO_CHECK}" CACHE STRING "Variables to check. If not given there is a list of defaults") +set(VCPKG_FLAGS_TO_CHECK "${VCPKG_DEFAULT_FLAGS_TO_CHECK}" CACHE STRING "Variables to check. If not given there is a list of defaults") +set(VCPKG_ENV_VARS_TO_CHECK "${VCPKG_DEFAULT_ENV_VARS_TO_CHECK}" CACHE STRING "Variables to check. If not given there is a list of defaults") + +if(NOT VCPKG_OUTPUT_FILE) + message(FATAL_ERROR "VCPKG_OUTPUT_FILE is required to be defined") +endif() + +if(NOT CMAKE_BUILD_TYPE) + message(FATAL_ERROR "CMAKE_BUILD_TYPE is required to be defined") +else() + string(TOUPPER "${CMAKE_BUILD_TYPE}" VCPKG_CONFIGS) +endif() + + +project(get_cmake_vars LANGUAGES ${VCPKG_LANGUAGES}) + +foreach(VAR IN LISTS VCPKG_VARS_TO_CHECK VCPKG_FLAGS_TO_CHECK) + string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_${VAR} \"${${VAR}}\")\n") +endforeach() + +foreach(_env IN LISTS VCPKG_ENV_VARS_TO_CHECK) + if(CMAKE_HOST_WIN32) + string(REPLACE "\\" "/" ENV_${_env} "$ENV{${_env}}") + string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_ENV_${_env} \"${ENV_${_env}}\")\n") + else() + string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_ENV_${_env} \"$ENV{${_env}}\")\n") + endif() +endforeach() + +set(EXTRA_FLAGS "") + +if(APPLE) + if(CMAKE_OSX_SYSROOT) + string(APPEND EXTRA_FLAGS " -isysroot \"${CMAKE_OSX_SYSROOT}\"") + endif() + foreach(arch IN LISTS CMAKE_OSX_ARCHITECTURES) + string(APPEND EXTRA_FLAGS " -arch ${arch}") + endforeach() + if(CMAKE_OSX_DEPLOYMENT_TARGET) + if(CMAKE_SYSTEM_NAME STREQUAL "iOS") + string(APPEND EXTRA_FLAGS " -mios-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}") + elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + string(APPEND EXTRA_FLAGS " -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}") + endif() + endif() +endif() +if(CMAKE_CXX_COMPILER_TARGET) + if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + string(APPEND EXTRA_FLAGS " \"${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}\"") + elseif(CMAKE_CXX_COMPILE_OPTIONS_TARGET) + string(APPEND EXTRA_FLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_TARGET} \"${CMAKE_CXX_COMPILER_TARGET}\"") + endif() +endif() +if(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN) + if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + string(APPEND EXTRA_FLAGS " \"${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}\"") + else() + string(APPEND EXTRA_FLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} \"${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}\"") + endif() +endif() +if(CMAKE_SYSROOT AND CMAKE_CXX_COMPILE_OPTIONS_SYSROOT) + string(APPEND EXTRA_FLAGS " \"${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}\"") +endif() + +foreach(flags CXX C SHARED_LINKER EXE_LINKER) + set(${flags}_FLAGS "${CMAKE_${flags}_FLAGS} ${CMAKE_${flags}_FLAGS_${VCPKG_CONFIGS}} ${EXTRA_FLAGS}") +endforeach() + +foreach(flags STATIC_LINKER RC) + set(${flags}_FLAGS "${CMAKE_${flags}_FLAGS} ${CMAKE_${flags}_FLAGS_${VCPKG_CONFIGS}}") +endforeach() + +foreach(incdir IN LISTS CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES) + string(APPEND CXX_FLAGS " \"${CMAKE_INCLUDE_FLAG_CXX}${incdir}\"") +endforeach() + +foreach(incdir IN LISTS CMAKE_C_STANDARD_INCLUDE_DIRECTORIES) + string(APPEND C_FLAGS " \"${CMAKE_INCLUDE_FLAG_C}${incdir}\"") +endforeach() + +foreach(flag CXX C SHARED_LINKER EXE_LINKER STATIC_LINKER RC) + # When using MSVC, maybe transform /flags to -flags. + # When cross compiling, "/flags" may be an absolute path starting with /, so don't transform. + # Otherwise, transform to improve compatibility with scripts interpreting "/flags" as a path. + if(MSVC AND "${CMAKE_HOST_SYSTEM_NAME}" MATCHES "Windows") + # This implementation is imperfect because it fails on directories with trailing spaces, + # but those are rare. + string(REGEX REPLACE "(^| )/" "\\1-" ${flag}_FLAGS "${${flag}_FLAGS}") + if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + if("${flag}" STREQUAL "CXX") + string(APPEND ${flag}_FLAGS " -ZW:nostdlib") + endif() + endif() + endif() + string(REPLACE "\\" "\\\\" ${flag}_FLAGS "${${flag}_FLAGS}") + string(REPLACE "\"" "\\\"" ${flag}_FLAGS "${${flag}_FLAGS}") + string(REPLACE "\$" "\\\$" ${flag}_FLAGS "${${flag}_FLAGS}") + string(APPEND OUTPUT_STRING "set(VCPKG_COMBINED_${flag}_FLAGS_${VCPKG_CONFIGS} \"${${flag}_FLAGS}\")\n") +endforeach() + +file(WRITE "${VCPKG_OUTPUT_FILE}" "${OUTPUT_STRING}") + +# Programs: +# CMAKE_AR +# CMAKE__COMPILER_AR (Wrapper) +# CMAKE_RANLIB +# CMAKE__COMPILER_RANLIB +# CMAKE_STRIP +# CMAKE_NM +# CMAKE_OBJDUMP +# CMAKE_DLLTOOL +# CMAKE_MT +# CMAKE_LINKER +# CMAKE_C_COMPILER +# CMAKE_CXX_COMPILER +# CMAKE_RC_COMPILER + +# Program details: +# CMAKE__COMPILER_ID +# MSVC +# MSVC_VERSION + +# Flags: +# CMAKE__FLAGS +# CMAKE__FLAGS_ +# CMAKE_RC_FLAGS +# CMAKE_SHARED_LINKER_FLAGS +# CMAKE_SHARED_LINKER_FLAGS_ +# CMAKE_STATIC_LINKER_FLAGS +# CMAKE_STATIC_LINKER_FLAGS_ +# CMAKE_EXE_LINKER_FLAGS +# CMAKE_EXE_LINKER_FLAGS_ + +# Additional information: +# CMAKE_SIZEOF_VOID_P +# CMAKE_CROSSCOMPILING +# CMAKE_SYSTEM_NAME +# CMAKE_HOST_SYSTEM_NAME +# CMAKE_SYSTEM_PROCESSOR +# CMAKE_HOST_SYSTEM_PROCESSOR diff --git a/externals/vcpkg/ports/vcpkg-cmake-get-vars/portfile.cmake b/externals/vcpkg/ports/vcpkg-cmake-get-vars/portfile.cmake new file mode 100755 index 000000000..4f3183adf --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-cmake-get-vars/portfile.cmake @@ -0,0 +1,14 @@ +if(VCPKG_CROSSCOMPILING) + # make FATAL_ERROR in CI when issue #16773 fixed + message(WARNING "vcpkg-cmake-get-vars is a host-only port; please mark it as a host port in your dependencies.") +endif() + +file(INSTALL + "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_get_vars.cmake" + "${CMAKE_CURRENT_LIST_DIR}/cmake_get_vars" + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(INSTALL "${VCPKG_ROOT_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled) + diff --git a/externals/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg-port-config.cmake b/externals/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg-port-config.cmake new file mode 100755 index 000000000..d5b5c2b1c --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg-port-config.cmake @@ -0,0 +1,2 @@ +include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake/vcpkg-port-config.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_get_vars.cmake") diff --git a/externals/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg.json b/externals/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg.json new file mode 100755 index 000000000..33b547882 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "vcpkg-cmake-get-vars", + "version-date": "2022-05-10", + "port-version": 1, + "documentation": "https://vcpkg.io/en/docs/README.html", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.cmake b/externals/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.cmake new file mode 100755 index 000000000..8ce706bdf --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.cmake @@ -0,0 +1,34 @@ +include_guard(GLOBAL) + +set(Z_VCPKG_CMAKE_GET_VARS_CURRENT_LIST_DIR "${CMAKE_CURRENT_LIST_DIR}" CACHE INTERNAL "") + +function(vcpkg_cmake_get_vars out_file) + cmake_parse_arguments(PARSE_ARGV 1 arg "" "" "") + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + if(NOT DEFINED CACHE{Z_VCPKG_CMAKE_GET_VARS_FILE}) + set(Z_VCPKG_CMAKE_GET_VARS_FILE "${CURRENT_BUILDTREES_DIR}/cmake-get-vars-${TARGET_TRIPLET}.cmake.log" + CACHE PATH "The file to include to access the CMake variables from a generated project.") + vcpkg_cmake_configure( + SOURCE_PATH "${Z_VCPKG_CMAKE_GET_VARS_CURRENT_LIST_DIR}/cmake_get_vars" + OPTIONS_DEBUG "-DVCPKG_OUTPUT_FILE:PATH=${CURRENT_BUILDTREES_DIR}/cmake-get-vars-${TARGET_TRIPLET}-dbg.cmake.log" + OPTIONS_RELEASE "-DVCPKG_OUTPUT_FILE:PATH=${CURRENT_BUILDTREES_DIR}/cmake-get-vars-${TARGET_TRIPLET}-rel.cmake.log" + LOGFILE_BASE cmake-get-vars-${TARGET_TRIPLET} + Z_CMAKE_GET_VARS_USAGE # be quiet, don't set variables... + ) + + set(include_string "") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + string(APPEND include_string "include(\"\${CMAKE_CURRENT_LIST_DIR}/cmake-get-vars-${TARGET_TRIPLET}-rel.cmake.log\")\n") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + string(APPEND include_string "include(\"\${CMAKE_CURRENT_LIST_DIR}/cmake-get-vars-${TARGET_TRIPLET}-dbg.cmake.log\")\n") + endif() + file(WRITE "${Z_VCPKG_CMAKE_GET_VARS_FILE}" "${include_string}") + endif() + + set("${out_file}" "${Z_VCPKG_CMAKE_GET_VARS_FILE}" PARENT_SCOPE) +endfunction() diff --git a/externals/vcpkg/ports/vcpkg-cmake/portfile.cmake b/externals/vcpkg/ports/vcpkg-cmake/portfile.cmake new file mode 100755 index 000000000..0b7dd5020 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-cmake/portfile.cmake @@ -0,0 +1,14 @@ +if(VCPKG_CROSSCOMPILING) + # make FATAL_ERROR in CI when issue #16773 fixed + message(WARNING "vcpkg-cmake is a host-only port; please mark it as a host port in your dependencies.") +endif() + +file(INSTALL + "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_configure.cmake" + "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_build.cmake" + "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_install.cmake" + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(INSTALL "${VCPKG_ROOT_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled) diff --git a/externals/vcpkg/ports/vcpkg-cmake/vcpkg-port-config.cmake b/externals/vcpkg/ports/vcpkg-cmake/vcpkg-port-config.cmake new file mode 100755 index 000000000..f2a973d4e --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-cmake/vcpkg-port-config.cmake @@ -0,0 +1,3 @@ +include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_configure.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_build.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_install.cmake") diff --git a/externals/vcpkg/ports/vcpkg-cmake/vcpkg.json b/externals/vcpkg/ports/vcpkg-cmake/vcpkg.json new file mode 100755 index 000000000..d78546dd8 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-cmake/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "vcpkg-cmake", + "version-date": "2022-05-10", + "port-version": 1, + "documentation": "https://vcpkg.io/en/docs/README.html", + "license": "MIT" +} diff --git a/externals/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_build.cmake b/externals/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_build.cmake new file mode 100755 index 000000000..efdb194fa --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_build.cmake @@ -0,0 +1,91 @@ +include_guard(GLOBAL) + +function(vcpkg_cmake_build) + cmake_parse_arguments(PARSE_ARGV 0 "arg" "DISABLE_PARALLEL;ADD_BIN_TO_PATH" "TARGET;LOGFILE_BASE" "") + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "vcpkg_cmake_build was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + if(NOT DEFINED arg_LOGFILE_BASE) + set(arg_LOGFILE_BASE "build") + endif() + vcpkg_list(SET build_param) + vcpkg_list(SET parallel_param) + vcpkg_list(SET no_parallel_param) + + if("${Z_VCPKG_CMAKE_GENERATOR}" STREQUAL "Ninja") + vcpkg_list(SET build_param "-v") # verbose output + vcpkg_list(SET parallel_param "-j${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_param "-j1") + elseif("${Z_VCPKG_CMAKE_GENERATOR}" MATCHES "^Visual Studio") + vcpkg_list(SET build_param + "/p:VCPkgLocalAppDataDisabled=true" + "/p:UseIntelMKL=No" + ) + vcpkg_list(SET parallel_param "/m") + elseif("${Z_VCPKG_CMAKE_GENERATOR}" STREQUAL "NMake Makefiles") + # No options are currently added for nmake builds + elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Unix Makefiles") + vcpkg_list(SET build_args "VERBOSE=1") + vcpkg_list(SET parallel_args "-j${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_args "") + elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Xcode") + vcpkg_list(SET parallel_args -jobs "${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_args -jobs 1) + else() + message(WARNING "Unrecognized GENERATOR setting from vcpkg_cmake_configure().") + endif() + + vcpkg_list(SET target_param) + if(arg_TARGET) + vcpkg_list(SET target_param "--target" "${arg_TARGET}") + endif() + + foreach(build_type IN ITEMS debug release) + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "${build_type}") + if("${build_type}" STREQUAL "debug") + set(short_build_type "dbg") + set(config "Debug") + else() + set(short_build_type "rel") + set(config "Release") + endif() + + message(STATUS "Building ${TARGET_TRIPLET}-${short_build_type}") + + if(arg_ADD_BIN_TO_PATH) + vcpkg_backup_env_variables(VARS PATH) + if("${build_type}" STREQUAL "debug") + vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin") + else() + vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin") + endif() + endif() + + if(arg_DISABLE_PARALLEL) + vcpkg_execute_build_process( + COMMAND + "${CMAKE_COMMAND}" --build . --config "${config}" ${target_param} + -- ${build_param} ${no_parallel_param} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_build_type}" + LOGNAME "${arg_LOGFILE_BASE}-${TARGET_TRIPLET}-${short_build_type}" + ) + else() + vcpkg_execute_build_process( + COMMAND + "${CMAKE_COMMAND}" --build . --config "${config}" ${target_param} + -- ${build_param} ${parallel_param} + NO_PARALLEL_COMMAND + "${CMAKE_COMMAND}" --build . --config "${config}" ${target_param} + -- ${build_param} ${no_parallel_param} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_build_type}" + LOGNAME "${arg_LOGFILE_BASE}-${TARGET_TRIPLET}-${short_build_type}" + ) + endif() + + if(arg_ADD_BIN_TO_PATH) + vcpkg_restore_env_variables(VARS PATH) + endif() + endif() + endforeach() +endfunction() diff --git a/externals/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/externals/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake new file mode 100755 index 000000000..748410a3a --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -0,0 +1,308 @@ +include_guard(GLOBAL) + +macro(z_vcpkg_cmake_configure_both_set_or_unset var1 var2) + if(DEFINED ${var1} AND NOT DEFINED ${var2}) + message(FATAL_ERROR "If ${var1} is set, then ${var2} must be set.") + elseif(NOT DEFINED ${var1} AND DEFINED ${var2}) + message(FATAL_ERROR "If ${var2} is set, then ${var1} must be set.") + endif() +endmacro() + +function(vcpkg_cmake_configure) + cmake_parse_arguments(PARSE_ARGV 0 "arg" + "PREFER_NINJA;DISABLE_PARALLEL_CONFIGURE;WINDOWS_USE_MSBUILD;NO_CHARSET_FLAG;Z_CMAKE_GET_VARS_USAGE" + "SOURCE_PATH;GENERATOR;LOGFILE_BASE" + "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;MAYBE_UNUSED_VARIABLES" + ) + + if(NOT arg_Z_CMAKE_GET_VARS_USAGE AND DEFINED CACHE{Z_VCPKG_CMAKE_GENERATOR}) + message(WARNING "${CMAKE_CURRENT_FUNCTION} already called; this function should only be called once.") + endif() + if(arg_PREFER_NINJA) + message(WARNING "PREFER_NINJA has been deprecated in ${CMAKE_CURRENT_FUNCTION}. Please remove it from the portfile!") + endif() + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + if(NOT DEFINED arg_SOURCE_PATH) + message(FATAL_ERROR "SOURCE_PATH must be set") + endif() + if(NOT DEFINED arg_LOGFILE_BASE) + set(arg_LOGFILE_BASE "config-${TARGET_TRIPLET}") + endif() + + set(manually_specified_variables "") + + if(arg_Z_CMAKE_GET_VARS_USAGE) + set(configuring_message "Getting CMake variables for ${TARGET_TRIPLET}") + else() + set(configuring_message "Configuring ${TARGET_TRIPLET}") + + foreach(option IN LISTS arg_OPTIONS arg_OPTIONS_RELEASE arg_OPTIONS_DEBUG) + if("${option}" MATCHES "^-D([^:=]*)[:=]") + vcpkg_list(APPEND manually_specified_variables "${CMAKE_MATCH_1}") + endif() + endforeach() + vcpkg_list(REMOVE_DUPLICATES manually_specified_variables) + foreach(maybe_unused_var IN LISTS arg_MAYBE_UNUSED_VARIABLES) + vcpkg_list(REMOVE_ITEM manually_specified_variables "${maybe_unused_var}") + endforeach() + debug_message("manually specified variables: ${manually_specified_variables}") + endif() + + if(CMAKE_HOST_WIN32) + if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) + set(host_architecture "$ENV{PROCESSOR_ARCHITEW6432}") + else() + set(host_architecture "$ENV{PROCESSOR_ARCHITECTURE}") + endif() + endif() + + set(ninja_can_be_used ON) # Ninja as generator + set(ninja_host ON) # Ninja as parallel configurator + + if(host_architecture STREQUAL "x86") + # Prebuilt ninja binaries are only provided for x64 hosts + set(ninja_can_be_used OFF) + set(ninja_host OFF) + endif() + + set(generator "Ninja") + if(DEFINED arg_GENERATOR) + set(generator "${arg_GENERATOR}") + elseif(arg_WINDOWS_USE_MSBUILD OR NOT ninja_can_be_used) + set(generator "") + set(arch "") + z_vcpkg_get_visual_studio_generator(OUT_GENERATOR generator OUT_ARCH arch) + endif() + + if(NOT generator) + if(NOT VCPKG_CMAKE_SYSTEM_NAME) + set(VCPKG_CMAKE_SYSTEM_NAME "Windows") + endif() + message(FATAL_ERROR "Unable to determine appropriate generator for: " + "${VCPKG_CMAKE_SYSTEM_NAME}-${VCPKG_TARGET_ARCHITECTURE}-${VCPKG_PLATFORM_TOOLSET}") + endif() + + # If we use Ninja, make sure it's on PATH + if(generator STREQUAL "Ninja" AND NOT DEFINED ENV{VCPKG_FORCE_SYSTEM_BINARIES}) + vcpkg_find_acquire_program(NINJA) + get_filename_component(ninja_path "${NINJA}" DIRECTORY) + vcpkg_add_to_path("${ninja_path}") + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}") + endif() + + set(build_dir_release "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + set(build_dir_debug "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + file(REMOVE_RECURSE + "${build_dir_release}" + "${build_dir_debug}") + file(MAKE_DIRECTORY "${build_dir_release}") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY "${build_dir_debug}") + endif() + + if(DEFINED VCPKG_CMAKE_SYSTEM_NAME) + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}") + if(VCPKG_TARGET_IS_UWP AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) + elseif(VCPKG_TARGET_IS_ANDROID AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + set(VCPKG_CMAKE_SYSTEM_VERSION 21) + endif() + endif() + + if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}") + endif() + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_list(APPEND arg_OPTIONS "-DBUILD_SHARED_LIBS=ON") + elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_list(APPEND arg_OPTIONS "-DBUILD_SHARED_LIBS=OFF") + else() + message(FATAL_ERROR + "Invalid setting for VCPKG_LIBRARY_LINKAGE: \"${VCPKG_LIBRARY_LINKAGE}\". " + "It must be \"static\" or \"dynamic\"") + endif() + + z_vcpkg_cmake_configure_both_set_or_unset(VCPKG_CXX_FLAGS_DEBUG VCPKG_C_FLAGS_DEBUG) + z_vcpkg_cmake_configure_both_set_or_unset(VCPKG_CXX_FLAGS_RELEASE VCPKG_C_FLAGS_RELEASE) + z_vcpkg_cmake_configure_both_set_or_unset(VCPKG_CXX_FLAGS VCPKG_C_FLAGS) + + set(VCPKG_SET_CHARSET_FLAG ON) + if(arg_NO_CHARSET_FLAG) + set(VCPKG_SET_CHARSET_FLAG OFF) + endif() + + if(NOT DEFINED VCPKG_CHAINLOAD_TOOLCHAIN_FILE) + z_vcpkg_select_default_vcpkg_chainload_toolchain() + endif() + + list(JOIN VCPKG_TARGET_ARCHITECTURE "\;" target_architecture_string) + vcpkg_list(APPEND arg_OPTIONS + "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" + "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}" + "-DVCPKG_SET_CHARSET_FLAG=${VCPKG_SET_CHARSET_FLAG}" + "-DVCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET}" + "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON" + "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON" + "-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON" + "-DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=TRUE" + "-DCMAKE_VERBOSE_MAKEFILE=ON" + "-DVCPKG_APPLOCAL_DEPS=OFF" + "-DCMAKE_TOOLCHAIN_FILE=${SCRIPTS}/buildsystems/vcpkg.cmake" + "-DCMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION=ON" + "-DVCPKG_CXX_FLAGS=${VCPKG_CXX_FLAGS}" + "-DVCPKG_CXX_FLAGS_RELEASE=${VCPKG_CXX_FLAGS_RELEASE}" + "-DVCPKG_CXX_FLAGS_DEBUG=${VCPKG_CXX_FLAGS_DEBUG}" + "-DVCPKG_C_FLAGS=${VCPKG_C_FLAGS}" + "-DVCPKG_C_FLAGS_RELEASE=${VCPKG_C_FLAGS_RELEASE}" + "-DVCPKG_C_FLAGS_DEBUG=${VCPKG_C_FLAGS_DEBUG}" + "-DVCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE}" + "-DVCPKG_LINKER_FLAGS=${VCPKG_LINKER_FLAGS}" + "-DVCPKG_LINKER_FLAGS_RELEASE=${VCPKG_LINKER_FLAGS_RELEASE}" + "-DVCPKG_LINKER_FLAGS_DEBUG=${VCPKG_LINKER_FLAGS_DEBUG}" + "-DVCPKG_TARGET_ARCHITECTURE=${target_architecture_string}" + "-DCMAKE_INSTALL_LIBDIR:STRING=lib" + "-DCMAKE_INSTALL_BINDIR:STRING=bin" + "-D_VCPKG_ROOT_DIR=${VCPKG_ROOT_DIR}" + "-D_VCPKG_INSTALLED_DIR=${_VCPKG_INSTALLED_DIR}" + "-DVCPKG_MANIFEST_INSTALL=OFF" + ) + + if(DEFINED arch AND NOT arch STREQUAL "") + vcpkg_list(APPEND arg_OPTIONS "-A${arch}") + endif() + + # Sets configuration variables for macOS builds + foreach(config_var IN ITEMS INSTALL_NAME_DIR OSX_DEPLOYMENT_TARGET OSX_SYSROOT OSX_ARCHITECTURES) + if(DEFINED VCPKG_${config_var}) + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${VCPKG_${config_var}}") + endif() + endforeach() + + # Allow overrides / additional configuration variables from triplets + if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS) + vcpkg_list(APPEND arg_OPTIONS "${VCPKG_CMAKE_CONFIGURE_OPTIONS}") + endif() + if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS_RELEASE) + vcpkg_list(APPEND arg_OPTIONS_RELEASE "${VCPKG_CMAKE_CONFIGURE_OPTIONS_RELEASE}") + endif() + if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS_DEBUG) + vcpkg_list(APPEND arg_OPTIONS_DEBUG "${VCPKG_CMAKE_CONFIGURE_OPTIONS_DEBUG}") + endif() + + vcpkg_list(SET rel_command + "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" + -G "${generator}" + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}" + ${arg_OPTIONS} ${arg_OPTIONS_RELEASE}) + vcpkg_list(SET dbg_command + "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" + -G "${generator}" + "-DCMAKE_BUILD_TYPE=Debug" + "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug" + ${arg_OPTIONS} ${arg_OPTIONS_DEBUG}) + + if(ninja_host AND CMAKE_HOST_WIN32 AND NOT arg_DISABLE_PARALLEL_CONFIGURE) + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_DISABLE_SOURCE_CHANGES=ON") + + vcpkg_find_acquire_program(NINJA) + if(NOT DEFINED ninja_path) + # if ninja_path was defined above, we've already done this + get_filename_component(ninja_path "${NINJA}" DIRECTORY) + vcpkg_add_to_path("${ninja_path}") + endif() + + #parallelize the configure step + set(ninja_configure_contents + "rule CreateProcess\n command = \$process\n\n" + ) + + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "release") + z_vcpkg_configure_cmake_build_cmakecache(ninja_configure_contents ".." "rel") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "debug") + z_vcpkg_configure_cmake_build_cmakecache(ninja_configure_contents "../../${TARGET_TRIPLET}-dbg" "dbg") + endif() + + file(MAKE_DIRECTORY "${build_dir_release}/vcpkg-parallel-configure") + file(WRITE + "${build_dir_release}/vcpkg-parallel-configure/build.ninja" + "${ninja_configure_contents}") + + message(STATUS "${configuring_message}") + vcpkg_execute_required_process( + COMMAND "${NINJA}" -v + WORKING_DIRECTORY "${build_dir_release}/vcpkg-parallel-configure" + LOGNAME "${arg_LOGFILE_BASE}" + ) + + vcpkg_list(APPEND config_logs + "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-out.log" + "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-err.log") + else() + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "debug") + message(STATUS "${configuring_message}-dbg") + vcpkg_execute_required_process( + COMMAND ${dbg_command} + WORKING_DIRECTORY "${build_dir_debug}" + LOGNAME "${arg_LOGFILE_BASE}-dbg" + ) + vcpkg_list(APPEND config_logs + "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-dbg-out.log" + "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-dbg-err.log") + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "release") + message(STATUS "${configuring_message}-rel") + vcpkg_execute_required_process( + COMMAND ${rel_command} + WORKING_DIRECTORY "${build_dir_release}" + LOGNAME "${arg_LOGFILE_BASE}-rel" + ) + vcpkg_list(APPEND config_logs + "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-rel-out.log" + "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-rel-err.log") + endif() + endif() + + set(all_unused_variables) + foreach(config_log IN LISTS config_logs) + if(NOT EXISTS "${config_log}") + continue() + endif() + file(READ "${config_log}" log_contents) + debug_message("Reading configure log ${config_log}...") + if(NOT log_contents MATCHES "Manually-specified variables were not used by the project:\n\n(( [^\n]*\n)*)") + continue() + endif() + string(STRIP "${CMAKE_MATCH_1}" unused_variables) # remove leading ` ` and trailing `\n` + string(REPLACE "\n " ";" unused_variables "${unused_variables}") + debug_message("unused variables: ${unused_variables}") + foreach(unused_variable IN LISTS unused_variables) + if(unused_variable IN_LIST manually_specified_variables) + debug_message("manually specified unused variable: ${unused_variable}") + vcpkg_list(APPEND all_unused_variables "${unused_variable}") + else() + debug_message("unused variable (not manually specified): ${unused_variable}") + endif() + endforeach() + endforeach() + + if(DEFINED all_unused_variables) + vcpkg_list(REMOVE_DUPLICATES all_unused_variables) + vcpkg_list(JOIN all_unused_variables "\n " all_unused_variables) + message(WARNING "The following variables are not used in CMakeLists.txt: + ${all_unused_variables} +Please recheck them and remove the unnecessary options from the `vcpkg_cmake_configure` call. +If these options should still be passed for whatever reason, please use the `MAYBE_UNUSED_VARIABLES` argument.") + endif() + + if(NOT arg_Z_CMAKE_GET_VARS_USAGE) + set(Z_VCPKG_CMAKE_GENERATOR "${generator}" CACHE INTERNAL "The generator which was used to configure CMake.") + endif() +endfunction() diff --git a/externals/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_install.cmake b/externals/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_install.cmake new file mode 100755 index 000000000..2bd8b4ea7 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_install.cmake @@ -0,0 +1,21 @@ +include_guard(GLOBAL) + +function(vcpkg_cmake_install) + cmake_parse_arguments(PARSE_ARGV 0 "arg" "DISABLE_PARALLEL;ADD_BIN_TO_PATH" "" "") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "vcpkg_cmake_install was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + set(args) + foreach(arg IN ITEMS DISABLE_PARALLEL ADD_BIN_TO_PATH) + if(arg_${arg}) + list(APPEND args "${arg}") + endif() + endforeach() + + vcpkg_cmake_build( + ${args} + LOGFILE_BASE install + TARGET install + ) +endfunction() diff --git a/externals/vcpkg/ports/vcpkg-get-python-packages/copyright b/externals/vcpkg/ports/vcpkg-get-python-packages/copyright new file mode 100755 index 000000000..2e4eac826 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-get-python-packages/copyright @@ -0,0 +1,23 @@ +Copyright (c) Microsoft Corporation + +All rights reserved. + +MIT License + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/externals/vcpkg/ports/vcpkg-get-python-packages/portfile.cmake b/externals/vcpkg/ports/vcpkg-get-python-packages/portfile.cmake new file mode 100755 index 000000000..7935b09b4 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-get-python-packages/portfile.cmake @@ -0,0 +1,10 @@ +file(COPY + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" + "${CMAKE_CURRENT_LIST_DIR}/copyright" + "${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_get_python_packages.cmake" + "${CMAKE_CURRENT_LIST_DIR}/python310._pth" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +include("${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_get_python_packages.cmake") + +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/vcpkg-get-python-packages/python310._pth b/externals/vcpkg/ports/vcpkg-get-python-packages/python310._pth new file mode 100755 index 000000000..f53ed18de --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-get-python-packages/python310._pth @@ -0,0 +1,7 @@ +python310.zip +Lib +Lib/site-packages +. + +# Uncomment to run site.main() automatically +#import site diff --git a/externals/vcpkg/ports/vcpkg-get-python-packages/vcpkg-port-config.cmake b/externals/vcpkg/ports/vcpkg-get-python-packages/vcpkg-port-config.cmake new file mode 100755 index 000000000..a061a7128 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-get-python-packages/vcpkg-port-config.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_get_python_packages.cmake") diff --git a/externals/vcpkg/ports/vcpkg-get-python-packages/vcpkg.json b/externals/vcpkg/ports/vcpkg-get-python-packages/vcpkg.json new file mode 100755 index 000000000..227e4557b --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-get-python-packages/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "vcpkg-get-python-packages", + "version-date": "2022-04-11", + "port-version": 1, + "documentation": "https://vcpkg.io/en/docs/README.html", + "license": "MIT", + "supports": "native" +} diff --git a/externals/vcpkg/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake b/externals/vcpkg/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake new file mode 100755 index 000000000..189017cd2 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake @@ -0,0 +1,99 @@ +include_guard(GLOBAL) + +function(x_vcpkg_get_python_packages) + cmake_parse_arguments(PARSE_ARGV 0 arg "" "PYTHON_VERSION;PYTHON_EXECUTABLE;REQUIREMENTS_FILE;OUT_PYTHON_VAR" "PACKAGES") + + if(DEFINED arg_PYTHON_VERSION AND NOT DEFINED arg_PYTHON_EXECUTABLE) + vcpkg_find_acquire_program(PYTHON${arg_PYTHON_VERSION}) + set(arg_PYTHON_EXECUTABLE "${PYTHON${arg_PYTHON_VERSION}}") + endif() + + if(NOT DEFINED arg_PYTHON_EXECUTABLE AND NOT DEFINED arg_PYTHON_VERSION) + message(FATAL_ERROR "PYTHON_EXECUTABLE or PYTHON_VERSION must be specified.") + elseif(NOT DEFINED arg_PYTHON_VERSION) + if(arg_PYTHON_EXECUTABLE MATCHES "(python3|python-3)") + set(arg_PYTHON_VERSION 3) + else() + set(arg_PYTHON_VERSION 2) + endif() + endif() + + if(NOT DEFINED arg_OUT_PYTHON_VAR) + set(arg_OUT_PYTHON_VAR "PYTHON${arg_PYTHON_VERSION}") + endif() + + if(NOT DEFINED arg_PACKAGES AND NOT DEFINED arg_REQUIREMENTS_FILE) + message(FATAL_ERROR "PACKAGES or REQUIREMENTS_FILE must be specified.") + endif() + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + get_filename_component(python_dir "${arg_PYTHON_EXECUTABLE}" DIRECTORY) + set(ENV{PYTHONNOUSERSITE} "1") + if("${python_dir}" MATCHES "(${DOWNLOADS}|${CURRENT_HOST_INSTALLED_DIR})" AND CMAKE_HOST_WIN32) # inside vcpkg and windows host. + #if(NOT EXISTS "${python_dir}/python310._pth" AND PYTHON_EXECUTABLE MATCHES "python3") + # file(COPY "${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-get-python-packages/python310._pth" DESTINATION "${python_dir}") + #endif() + if(NOT EXISTS "${python_dir}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}") + if(NOT EXISTS "${python_dir}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}") + vcpkg_from_github( + OUT_SOURCE_PATH PYFILE_PATH + REPO pypa/get-pip + REF 38e54e5de07c66e875c11a1ebbdb938854625dd8 #2022-03-07 + SHA512 431a9f66618a2f251db3a8c3311e7fc3af3ff7364ec1d14a99f1b9c237646b6146cef8b9471d83e1086dba2ed448bccc48d99b2bb375e4235d78e76d9970d3e5 + ) + vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/public/get-pip.py" --no-warn-script-location + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "get-pip-${TARGET_TRIPLET}") + endif() + vcpkg_execute_required_process(COMMAND "${python_dir}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install virtualenv --no-warn-script-location + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "pip-install-virtualenv-${TARGET_TRIPLET}") + else() + vcpkg_execute_required_process(COMMAND "${python_dir}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" virtualenv --no-warn-script-location #${_package} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "easy-install-virtualenv-${TARGET_TRIPLET}") + endif() + endif() + set(venv_path "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-venv") + file(REMOVE_RECURSE "${venv_path}") # Remove old venv + file(MAKE_DIRECTORY "${venv_path}") + if(CMAKE_HOST_WIN32) + file(MAKE_DIRECTORY "${python_dir}/DLLs") + set(python_sub_path /Scripts) + set(python_venv virtualenv) + file(COPY "${python_dir}/python310.zip" DESTINATION "${venv_path}/Scripts") + set(python_venv_options "--app-data" "${venv_path}/data") + else() + set(python_sub_path /bin) + set(python_venv venv) + set(python_venv_options --symlinks) + endif() + + set(ENV{PYTHONNOUSERSITE} "1") + message(STATUS "Setting up python virtual environmnent...") + vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" -m "${python_venv}" ${python_venv_options} "${venv_path}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "venv-setup-${TARGET_TRIPLET}") + vcpkg_add_to_path(PREPEND "${venv_path}${python_sub_path}") + set(${arg_OUT_PYTHON_VAR} "${venv_path}${python_sub_path}/python${VCPKG_HOST_EXECUTABLE_SUFFIX}") + set(ENV{VIRTUAL_ENV} "${venv_path}") + unset(ENV{PYTHONHOME}) + unset(ENV{PYTHONPATH}) + if(DEFINED arg_REQUIREMENTS_FILE) + message(STATUS "Installing requirements from: ${arg_REQUIREMENTS_FILE}") + vcpkg_execute_required_process(COMMAND "${${arg_OUT_PYTHON_VAR}}" -m pip install -r ${arg_REQUIREMENTS_FILE} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "pip-install-requirements-file-${TARGET_TRIPLET}") + endif() + if(DEFINED arg_PACKAGES) + message(STATUS "Installing python packages: ${arg_PACKAGES}") + vcpkg_execute_required_process(COMMAND "${${arg_OUT_PYTHON_VAR}}" -m pip install ${arg_PACKAGES} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "pip-install-packages-${TARGET_TRIPLET}") + endif() + message(STATUS "Setting up python virtual environmnent...finished.") + set(${arg_OUT_PYTHON_VAR} "${PYTHON${arg_PYTHON_VERSION}}" PARENT_SCOPE) + set(${arg_OUT_PYTHON_VAR} "${PYTHON${arg_PYTHON_VERSION}}" CACHE PATH "" FORCE) +endfunction() diff --git a/externals/vcpkg/ports/vcpkg-gfortran/portfile.cmake b/externals/vcpkg/ports/vcpkg-gfortran/portfile.cmake new file mode 100755 index 000000000..d1b7168a5 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-gfortran/portfile.cmake @@ -0,0 +1,51 @@ +include(vcpkg_find_fortran) +vcpkg_find_fortran(FORTRAN_CMAKE) +if(VCPKG_USE_INTERNAL_Fortran) + set(VCPKG_CRT_LINKAGE dynamic) # Will always be dynamic no way to overwrite internal CRT linkage here + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) + set(HOST_ARCH $ENV{PROCESSOR_ARCHITEW6432}) + else() + set(HOST_ARCH $ENV{PROCESSOR_ARCHITECTURE}) + endif() + + if(HOST_ARCH MATCHES "(amd|AMD)64") + set(MINGW_W w64) + set(MSYS_HOST x86_64) + elseif(HOST_ARCH MATCHES "(x|X)86") + set(MINGW_W w32) + set(MSYS_HOST i686) + else() + message(FATAL_ERROR "Unsupported host architecture ${HOST_ARCH}!" ) + endif() + + if(VCPKG_TARGET_ARCHITECTURE MATCHES "(x|X)64") + set(MSYS_TARGET x86_64) + set(MINGW_W_TARGET 64) + set(GCC_LIB_SUFFIX s_seh-1) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "(x|X)86") + set(MSYS_TARGET i686) + set(MINGW_W_TARGET 32) + set(GCC_LIB_SUFFIX s_dw2-1) + else() + message(FATAL_ERROR "Unsupported target architecture ${VCPKG_TARGET_ARCHITECTURE}!" ) + endif() + + set(MINGW_BIN "${vcpkg_find_fortran_MSYS_ROOT}/mingw${MINGW_W_TARGET}/bin/") + set(MINGW_Fortran_DLLS + "${MINGW_BIN}/libgfortran-5.dll" + "${MINGW_BIN}/libquadmath-0.dll" + "${MINGW_BIN}/libwinpthread-1.dll" + "${MINGW_BIN}/libgcc_${GCC_LIB_SUFFIX}.dll" + ) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(COPY ${MINGW_Fortran_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(COPY ${MINGW_Fortran_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${vcpkg_find_fortran_MSYS_ROOT}/mingw${MINGW_W_TARGET}/share/licenses" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + file(INSTALL "${vcpkg_find_fortran_MSYS_ROOT}/mingw${MINGW_W_TARGET}/share/licenses/crt/COPYING.MinGW-w64-runtime.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + set(VCPKG_POLICY_SKIP_DUMPBIN_CHECKS enabled) # due to outdated msvcrt + set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) + set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +else() + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +endif() diff --git a/externals/vcpkg/ports/vcpkg-gfortran/vcpkg.json b/externals/vcpkg/ports/vcpkg-gfortran/vcpkg.json new file mode 100755 index 000000000..ea146c420 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-gfortran/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "vcpkg-gfortran", + "version": "3", + "port-version": 2, + "description": "Metaport to install gfortran dependencies from msys if VCPKG_USE_EXTERNAL_Fortran is false", + "supports": "windows & !arm" +} diff --git a/externals/vcpkg/ports/vcpkg-gn/portfile.cmake b/externals/vcpkg/ports/vcpkg-gn/portfile.cmake new file mode 100755 index 000000000..721f8ff07 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-gn/portfile.cmake @@ -0,0 +1,73 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +if(NOT TARGET_TRIPLET STREQUAL _HOST_TRIPLET) + message(FATAL_ERROR "vcpkg-gn is a host-only port; please mark it as a host port in your dependencies.") +endif() + +set(BASE_URL "https://chrome-infra-packages.appspot.com/dl/gn/gn") +set(PLATFORM "") +set(ID "") +set(HASH "") + +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(PLATFORM "windows-amd64") + set(ID "UXzb_By8w0nZJ4HNiOo0-ylLKn97JMEGeFgu7lh-5bYC") + set(HASH "4508eee7a8d594d31d34a9810371ba13f0b233642ed89b0185ef209165af1c1b2df49d4b5020e01f333a0724b66bcae80133db8f6256d37295b02927743eaddf") + else() + message(FATAL_ERROR "Only x64 is supported on Windows") + endif() +elseif(VCPKG_TARGET_IS_OSX) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(PLATFORM "mac-amd64") + set(ID "Al2dYNoD4IBgOnjJSohdXIZMhZJIqHeyaE2AiqWYfIYC") + set(HASH "98b0f6c99ab5e9f6aac448e19aa22d6f2a4924cff51493ce905be7329e1575575c5b9be96e86b07eb0be7215718bf6384bcee01233c8ef0d5554bfa3f51fc811") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(PLATFORM "mac-arm64") + set(ID "WVStyq9u1pq0xScIl-o4nOlNBYTHCQQCV0KPhgRAAhEC") + set(HASH "ec7a46574d6dc4177e02ac0e558da59dfaa503bf2263c904b09145bc5cbee759c91f0b55b4bc9f372953af78eb3ac6ad98e0fc1b1cf419689a1f7615c786311d") + else() + message(FATAL_ERROR "Only x64 and arm64 are supported on osx") + endif() +elseif(VCPKG_TARGET_IS_LINUX) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(PLATFORM "linux-amd64") + set(ID "bMLaJoqEAsCsT5M_sG6KxlaiRQ5aS2RVhrC2qLPilE8C") + set(HASH "fd073139b4ca816dd9f742232d565017237589ec62d02dcb2e54a1d22350450e61b11cc8aa9acd645565f7aac62f9d0bf64ca30f8e6c07f547c746cea3998064") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(PLATFORM "linux-arm64") + set(ID "A_VzbiVBrgO0cxX_Iyt8FomIH-WU8YAG2LW8FAhSaOgC") + set(HASH "71da448fd496f803d241ef3656a0c69889a7084624f7f6f92c5326b6e7c0a67b386c69f5cff1a07402b5aa57f5d754a23e09191bbecae8d443ad9896198e36a7") + else() + message(FATAL_ERROR "Only x64 and arm64 are supported on linux") + endif() +else() + message(FATAL_ERROR "Target not yet supported by '${PORT}'") +endif() + +set(URL "${BASE_URL}/${PLATFORM}/+/${ID}") +message(STATUS "URL: '${URL}'") + +vcpkg_download_distfile(ARCHIVE_PATH + URLS "${URL}" + SHA512 "${HASH}" + FILENAME "gn-${PLATFORM}-${ID}.zip" + #ALWAYS_REDOWNLOAD + #SKIP_SHA512 +) + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +message(STATUS "ARCHIVE_PATH: '${ARCHIVE_PATH}'") + +vcpkg_execute_in_download_mode( + COMMAND ${CMAKE_COMMAND} -E tar xzf "${ARCHIVE_PATH}" + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}" +) +file(GLOB_RECURSE folders "${CURRENT_PACKAGES_DIR}/tools/${PORT}/*" LIST_DIRECTORIES true) +message(STATUS "Files and Folders: '${folders}'") + +file(INSTALL + "${CMAKE_CURRENT_LIST_DIR}/vcpkg_gn_configure.cmake" + "${CMAKE_CURRENT_LIST_DIR}/vcpkg_gn_install.cmake" + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/vcpkg-gn/vcpkg-port-config.cmake b/externals/vcpkg/ports/vcpkg-gn/vcpkg-port-config.cmake new file mode 100755 index 000000000..229050aea --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-gn/vcpkg-port-config.cmake @@ -0,0 +1,3 @@ +include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_gn_configure.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_gn_install.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/z_vcpkg_gn_real_path.cmake") diff --git a/externals/vcpkg/ports/vcpkg-gn/vcpkg.json b/externals/vcpkg/ports/vcpkg-gn/vcpkg.json new file mode 100755 index 000000000..6dd718376 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-gn/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "vcpkg-gn", + "version-date": "2021-11-16", + "port-version": 2, + "description": "https://gn.googlesource.com/gn/+/4aa9bdfa05b688c58d3d7d3e496f3f18cbb3d89e", + "documentation": "https://vcpkg.io/en/docs/README.html", + "license": "MIT", + "supports": "native & !x86", + "dependencies": [ + { + "name": "vcpkg-tool-python2", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/vcpkg-gn/vcpkg_gn_configure.cmake b/externals/vcpkg/ports/vcpkg-gn/vcpkg_gn_configure.cmake new file mode 100755 index 000000000..39de456e4 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-gn/vcpkg_gn_configure.cmake @@ -0,0 +1,49 @@ +include_guard(GLOBAL) +include("${CMAKE_CURRENT_LIST_DIR}/z_vcpkg_gn_real_path.cmake") + +function(z_vcpkg_gn_configure_generate) + cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "SOURCE_PATH;CONFIG;ARGS" "") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "Internal error: generate was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + message(STATUS "Generating build (${arg_CONFIG})...") + vcpkg_execute_required_process( + COMMAND "${VCPKG_GN}" gen "${CURRENT_BUILDTREES_DIR}/${arg_CONFIG}" "${arg_ARGS}" + WORKING_DIRECTORY "${arg_SOURCE_PATH}" + LOGNAME "generate-${arg_CONFIG}" + ) +endfunction() + +function(vcpkg_gn_configure) + cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "SOURCE_PATH;OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE" "") + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "vcpkg_gn_configure was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + if(NOT DEFINED arg_SOURCE_PATH) + message(FATAL_ERROR "SOURCE_PATH must be specified.") + endif() + + vcpkg_find_acquire_program(PYTHON2) + get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) + vcpkg_add_to_path(PREPEND "${PYTHON2_DIR}") + + vcpkg_find_acquire_program(GN) + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + z_vcpkg_gn_configure_generate( + SOURCE_PATH "${arg_SOURCE_PATH}" + CONFIG "${TARGET_TRIPLET}-dbg" + ARGS "--args=${arg_OPTIONS} ${arg_OPTIONS_DEBUG}" + ) + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + z_vcpkg_gn_configure_generate( + SOURCE_PATH "${arg_SOURCE_PATH}" + CONFIG "${TARGET_TRIPLET}-rel" + ARGS "--args=${arg_OPTIONS} ${arg_OPTIONS_RELEASE}" + ) + endif() +endfunction() diff --git a/externals/vcpkg/ports/vcpkg-gn/vcpkg_gn_install.cmake b/externals/vcpkg/ports/vcpkg-gn/vcpkg_gn_install.cmake new file mode 100755 index 000000000..8b9c3b2b7 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-gn/vcpkg_gn_install.cmake @@ -0,0 +1,116 @@ +include_guard(GLOBAL) +include("${CMAKE_CURRENT_LIST_DIR}/z_vcpkg_gn_real_path.cmake") + +function(z_vcpkg_gn_install_get_target_type out_var) + cmake_parse_arguments(PARSE_ARGV 1 "arg" "" "SOURCE_PATH;BUILD_DIR;TARGET" "") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "Internal error: get_target_type was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + execute_process( + COMMAND "${VCPKG_GN}" desc "${arg_BUILD_DIR}" "${arg_TARGET}" + WORKING_DIRECTORY "${arg_SOURCE_PATH}" + OUTPUT_VARIABLE output + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + if(output MATCHES [[type: ([A-Za-z0-9_]+)]]) + set("${out_var}" "${CMAKE_MATCH_1}" PARENT_SCOPE) + else() + message(FATAL_ERROR "invalid result from `gn desc`: ${output}") + endif() +endfunction() + +function(z_vcpkg_gn_install_get_desc out_var) + cmake_parse_arguments(PARSE_ARGV 1 "arg" "" "SOURCE_PATH;BUILD_DIR;TARGET;WHAT_TO_DISPLAY" "") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "Internal error: get_desc was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + execute_process( + COMMAND "${VCPKG_GN}" desc "${arg_BUILD_DIR}" "${arg_TARGET}" "${arg_WHAT_TO_DISPLAY}" + WORKING_DIRECTORY "${arg_SOURCE_PATH}" + OUTPUT_VARIABLE output + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + string(REPLACE ";" "\\;" output "${output}") + string(REGEX REPLACE "\n|(\r\n)" ";" output "${output}") + set("${out_var}" "${output}" PARENT_SCOPE) +endfunction() + +function(z_vcpkg_gn_install_install) + cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "SOURCE_PATH;BUILD_DIR;INSTALL_DIR" "TARGETS") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "Internal error: install was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + foreach(target IN LISTS arg_TARGETS) + # GN targets must start with a // + z_vcpkg_gn_install_get_desc(outputs + SOURCE_PATH "${arg_SOURCE_PATH}" + BUILD_DIR "${arg_BUILD_DIR}" + TARGET "//${target}" + WHAT_TO_DISPLAY outputs + ) + z_vcpkg_gn_install_get_target_type(target_type + SOURCE_PATH "${arg_SOURCE_PATH}" + BUILD_DIR "${arg_BUILD_DIR}" + TARGET "//${target}" + ) + + foreach(output IN LISTS outputs) + if(output MATCHES "^//") + # relative path (e.g. //out/Release/target.lib) + string(REGEX REPLACE "^//" "${arg_SOURCE_PATH}/" output "${output}") + elseif(output MATCHES "^/" AND CMAKE_HOST_WIN32) + # absolute path (e.g. /C:/path/to/target.lib) + string(REGEX REPLACE "^/" "" output "${output}") + endif() + + if(NOT EXISTS "${output}") + message(WARNING "Output for target `${target}` doesn't exist: ${output}.") + continue() + endif() + + if(target_type STREQUAL "executable") + file(INSTALL "${output}" DESTINATION "${arg_INSTALL_DIR}/tools") + elseif(output MATCHES "(\\.dll|\\.pdb)$") + file(INSTALL "${output}" DESTINATION "${arg_INSTALL_DIR}/bin") + else() + file(INSTALL "${output}" DESTINATION "${arg_INSTALL_DIR}/lib") + endif() + endforeach() + endforeach() +endfunction() + +function(vcpkg_gn_install) + cmake_parse_arguments(PARSE_ARGV 0 arg "" "SOURCE_PATH" "TARGETS") + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "vcpkg_gn_install was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + if(NOT DEFINED arg_SOURCE_PATH) + message(FATAL_ERROR "SOURCE_PATH must be specified.") + endif() + + vcpkg_build_ninja(TARGETS ${arg_TARGETS}) + + vcpkg_find_acquire_program(GN) + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + z_vcpkg_gn_install_install( + SOURCE_PATH "${arg_SOURCE_PATH}" + BUILD_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + INSTALL_DIR "${CURRENT_PACKAGES_DIR}/debug" + TARGETS ${arg_TARGETS} + ) + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + z_vcpkg_gn_install_install( + SOURCE_PATH "${arg_SOURCE_PATH}" + BUILD_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + INSTALL_DIR "${CURRENT_PACKAGES_DIR}" + TARGETS ${arg_TARGETS} + ) + endif() +endfunction() diff --git a/externals/vcpkg/ports/vcpkg-gn/z_vcpkg_gn_real_path.cmake b/externals/vcpkg/ports/vcpkg-gn/z_vcpkg_gn_real_path.cmake new file mode 100755 index 000000000..855bf3e47 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-gn/z_vcpkg_gn_real_path.cmake @@ -0,0 +1,4 @@ +include_guard(GLOBAL) + +file(REAL_PATH "${CMAKE_CURRENT_LIST_DIR}/../../tools/vcpkg-gn/gn${CMAKE_EXECUTABLE_SUFFIX}" VCPKG_GN) +set(VCPKG_GN "${VCPKG_GN}" CACHE INTERNAL "") diff --git a/externals/vcpkg/ports/vcpkg-pkgconfig-get-modules/copyright b/externals/vcpkg/ports/vcpkg-pkgconfig-get-modules/copyright new file mode 100755 index 000000000..2e4eac826 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-pkgconfig-get-modules/copyright @@ -0,0 +1,23 @@ +Copyright (c) Microsoft Corporation + +All rights reserved. + +MIT License + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/externals/vcpkg/ports/vcpkg-pkgconfig-get-modules/portfile.cmake b/externals/vcpkg/ports/vcpkg-pkgconfig-get-modules/portfile.cmake new file mode 100755 index 000000000..f82cf371b --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-pkgconfig-get-modules/portfile.cmake @@ -0,0 +1,13 @@ +if(NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET) + # make FATAL_ERROR in CI when issue #16773 fixed + message(WARNING "vcpkg-pkgconfig-get-modules is a host-only port; please mark it as a host port in your dependencies.") +endif() + +file(COPY + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" + "${CMAKE_CURRENT_LIST_DIR}/copyright" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +configure_file("${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_pkgconfig_get_modules.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/x_vcpkg_pkgconfig_get_modules.cmake" @ONLY) + +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/vcpkg-pkgconfig-get-modules/vcpkg-port-config.cmake b/externals/vcpkg/ports/vcpkg-pkgconfig-get-modules/vcpkg-port-config.cmake new file mode 100755 index 000000000..01c9e6aec --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-pkgconfig-get-modules/vcpkg-port-config.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_pkgconfig_get_modules.cmake") diff --git a/externals/vcpkg/ports/vcpkg-pkgconfig-get-modules/vcpkg.json b/externals/vcpkg/ports/vcpkg-pkgconfig-get-modules/vcpkg.json new file mode 100755 index 000000000..f38c13d4d --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-pkgconfig-get-modules/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "vcpkg-pkgconfig-get-modules", + "version-date": "2022-02-10", + "port-version": 1, + "documentation": "https://vcpkg.io/en/docs/README.html", + "license": "MIT", + "dependencies": [ + { + "name": "pkgconf", + "host": true, + "default-features": false + } + ] +} diff --git a/externals/vcpkg/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake b/externals/vcpkg/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake new file mode 100755 index 000000000..0ed124cff --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake @@ -0,0 +1,119 @@ +include_guard(GLOBAL) + +function(x_vcpkg_pkgconfig_get_modules) + cmake_parse_arguments(PARSE_ARGV 0 "arg" "CFLAGS;LIBS;LIBRARIES;LIBRARIES_DIR;INCLUDE_DIRS" "PREFIX" "MODULES") + if(NOT DEFINED arg_PREFIX OR arg_PREFIX STREQUAL "") + message(FATAL_ERROR "x_vcpkg_pkgconfig_get_modules requires parameter PREFIX!") + endif() + if(NOT DEFINED arg_MODULES OR arg_MODULES STREQUAL "") + message(FATAL_ERROR "x_vcpkg_pkgconfig_get_modules requires parameter MODULES!") + endif() + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "extra arguments passed to x_vcpkg_pkgconfig_get_modules: ${arg_UNPARSED_ARGUMENTS}") + endif() + + set(PKGCONFIG "${CURRENT_INSTALLED_DIR}/../@HOST_TRIPLET@/tools/pkgconf/pkgconf@VCPKG_HOST_EXECUTABLE_SUFFIX@") + + set(backup_PKG_CONFIG_PATH "$ENV{PKG_CONFIG_PATH}") + + set(var_suffixes) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + z_vcpkg_set_pkgconfig_path("${CURRENT_INSTALLED_DIR}/lib/pkgconfig${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${backup_PKG_CONFIG_PATH}") + if(arg_LIBS) + execute_process( + COMMAND "${PKGCONFIG}" --libs ${arg_MODULES} + OUTPUT_VARIABLE ${arg_PREFIX}_LIBS_RELEASE + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + list(APPEND var_suffixes LIBS_RELEASE) + endif() + if(arg_LIBRARIES) + execute_process( + COMMAND "${PKGCONFIG}" --libs-only-l ${arg_MODULES} + OUTPUT_VARIABLE ${arg_PREFIX}_LIBRARIES_RELEASE + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + list(APPEND var_suffixes LIBRARIES_RELEASE) + endif() + if(arg_LIBRARIES_DIRS) + execute_process( + COMMAND "${PKGCONFIG}" --libs-only-L ${arg_MODULES} + OUTPUT_VARIABLE ${arg_PREFIX}_LIBRARIES_DIRS_RELEASE + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + list(APPEND var_suffixes LIBRARIES_DIRS_RELEASE) + endif() + if(arg_INCLUDE_DIRS) + execute_process( + COMMAND "${PKGCONFIG}" --cflags-only-I ${arg_MODULES} + OUTPUT_VARIABLE ${arg_PREFIX}_INCLUDE_DIRS_RELEASE + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + list(APPEND var_suffixes INCLUDE_DIRS_RELEASE) + endif() + if(arg_CFLAGS) + execute_process( + COMMAND "${PKGCONFIG}" --cflags ${arg_MODULES} + OUTPUT_VARIABLE ${arg_PREFIX}_CFLAGS_RELEASE + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + list(APPEND var_suffixes CFLAGS_RELEASE) + endif() + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + z_vcpkg_set_pkgconfig_path("${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" "${backup_PKG_CONFIG_PATH}") + if(arg_LIBS) + execute_process( + COMMAND "${PKGCONFIG}" --libs ${arg_MODULES} + OUTPUT_VARIABLE ${arg_PREFIX}_LIBS_DEBUG + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + list(APPEND var_suffixes LIBS_DEBUG) + endif() + if(arg_LIBRARIES) + execute_process( + COMMAND "${PKGCONFIG}" --libs-only-l ${arg_MODULES} + OUTPUT_VARIABLE ${arg_PREFIX}_LIBRARIES_DEBUG + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + list(APPEND var_suffixes LIBRARIES_DEBUG) + endif() + if(arg_LIBRARIES_DIRS) + execute_process( + COMMAND "${PKGCONFIG}" --libs-only-L ${arg_MODULES} + OUTPUT_VARIABLE ${arg_PREFIX}_LIBRARIES_DIRS_DEBUG + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + list(APPEND var_suffixes LIBRARIES_DIRS_DEBUG) + endif() + if(arg_INCLUDE_DIRS) + execute_process( + COMMAND "${PKGCONFIG}" --cflags-only-I ${arg_MODULES} + OUTPUT_VARIABLE ${arg_PREFIX}_INCLUDE_DIRS_DEBUG + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + list(APPEND var_suffixes INCLUDE_DIRS_DEBUG) + endif() + if(arg_CFLAGS) + execute_process( + COMMAND "${PKGCONFIG}" --cflags ${arg_MODULES} + OUTPUT_VARIABLE ${arg_PREFIX}_CFLAGS_DEBUG + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + list(APPEND var_suffixes CFLAGS_DEBUG) + endif() + endif() + set(ENV{PKG_CONFIG_PATH} "${backup_PKG_CONFIG_PATH}") + + foreach(_var IN LISTS var_suffixes) + set("${arg_PREFIX}_${_var}" "${${arg_PREFIX}_${_var}}" PARENT_SCOPE) + endforeach() +endfunction() + +function(z_vcpkg_set_pkgconfig_path _path _backup) + if(NOT _backup STREQUAL "") + set(ENV{PKG_CONFIG_PATH} "${_path}${VCPKG_HOST_PATH_SEPARATOR}${_backup}") + else() + set(ENV{PKG_CONFIG_PATH} "${_path}") + endif() +endfunction() diff --git a/externals/vcpkg/ports/vcpkg-qmake/portfile.cmake b/externals/vcpkg/ports/vcpkg-qmake/portfile.cmake new file mode 100755 index 000000000..d2ff5db15 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-qmake/portfile.cmake @@ -0,0 +1,7 @@ +file(INSTALL + "${CMAKE_CURRENT_LIST_DIR}/vcpkg_qmake_configure.cmake" + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(INSTALL "${VCPKG_ROOT_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled) diff --git a/externals/vcpkg/ports/vcpkg-qmake/vcpkg-port-config.cmake b/externals/vcpkg/ports/vcpkg-qmake/vcpkg-port-config.cmake new file mode 100755 index 000000000..325cba3b9 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-qmake/vcpkg-port-config.cmake @@ -0,0 +1,4 @@ +include_guard(GLOBAL) +include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake-get-vars/vcpkg-port-config.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_qmake_configure.cmake") + diff --git a/externals/vcpkg/ports/vcpkg-qmake/vcpkg.json b/externals/vcpkg/ports/vcpkg-qmake/vcpkg.json new file mode 100755 index 000000000..727763343 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-qmake/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "vcpkg-qmake", + "version-date": "2022-05-10", + "port-version": 1, + "documentation": "https://vcpkg.io/en/docs/README.html", + "license": "MIT", + "supports": "native", + "dependencies": [ + "pkgconf", + { + "name": "qtbase", + "default-features": false + }, + { + "name": "vcpkg-cmake-get-vars", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/vcpkg-qmake/vcpkg_qmake_configure.cmake b/externals/vcpkg/ports/vcpkg-qmake/vcpkg_qmake_configure.cmake new file mode 100755 index 000000000..89edab5d8 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-qmake/vcpkg_qmake_configure.cmake @@ -0,0 +1,135 @@ +include_guard(GLOBAL) + +function(vcpkg_qmake_configure) + cmake_parse_arguments(PARSE_ARGV 0 arg "" "SOURCE_PATH" "QMAKE_OPTIONS;QMAKE_OPTIONS_RELEASE;QMAKE_OPTIONS_DEBUG;OPTIONS;OPTIONS_RELEASE;OPTIONS_DEBUG") + + vcpkg_cmake_get_vars(detected_file) + include("${detected_file}") + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_list(APPEND arg_QMAKE_OPTIONS "CONFIG-=shared") + vcpkg_list(APPEND arg_QMAKE_OPTIONS "CONFIG*=static") + else() + vcpkg_list(APPEND arg_QMAKE_OPTIONS "CONFIG-=static") + vcpkg_list(APPEND arg_QMAKE_OPTIONS "CONFIG*=shared") + vcpkg_list(APPEND arg_QMAKE_OPTIONS_DEBUG "CONFIG*=separate_debug_info") + endif() + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_CRT_LINKAGE STREQUAL "static") + vcpkg_list(APPEND _csc_QMAKE_OPTIONS "CONFIG*=static-runtime") + endif() + + if(DEFINED VCPKG_OSX_DEPLOYMENT_TARGET) + set(ENV{QMAKE_MACOSX_DEPLOYMENT_TARGET} "${VCPKG_OSX_DEPLOYMENT_TARGET}") + endif() + + set(ENV{PKG_CONFIG} "${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX}") + get_filename_component(PKGCONFIG_PATH "${PKGCONFIG}" DIRECTORY) + vcpkg_add_to_path("${PKGCONFIG_PATH}") + + set(buildtypes "") + if(NOT VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "debug") + list(APPEND buildtypes "DEBUG") # Using uppercase to also access the detected cmake variables with it + set(path_suffix_DEBUG "debug/") + set(short_name_DEBUG "dbg") + set(qmake_config_DEBUG CONFIG+=debug CONFIG-=release) + endif() + if(NOT VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "release") + list(APPEND buildtypes "RELEASE") + set(path_suffix_RELEASE "") + set(short_name_RELEASE "rel") + set(qmake_config_RELEASE CONFIG-=debug CONFIG+=release) + endif() + + function(qmake_append_program var qmake_var value) + get_filename_component(prog "${value}" NAME) + # QMake assumes everything is on PATH? + vcpkg_list(APPEND ${var} "${qmake_var}=${prog}") + find_program(${qmake_var} NAMES "${prog}") + cmake_path(COMPARE "${${qmake_var}}" EQUAL "${value}" correct_prog_on_path) + if(NOT correct_prog_on_path AND NOT "${value}" MATCHES "|:") + message(FATAL_ERROR "Detect path mismatch for '${qmake_var}'. '${value}' is not the same as '${${qmake_var}}'. Please correct your PATH!") + endif() + unset(${qmake_var}) + unset(${qmake_var} CACHE) + set(${var} "${${var}}" PARENT_SCOPE) # Is this correct? Or is there a vcpkg_list command for that? + endfunction() + # Setup Build tools + if(NOT VCPKG_QMAKE_COMMAND) # For users using outside Qt6 + set(VCPKG_QMAKE_COMMAND "${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/qmake${VCPKG_HOST_EXECUTABLE_SUFFIX}") + endif() + + set(qmake_build_tools "") + qmake_append_program(qmake_build_tools "QMAKE_CC" "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_CXX" "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_AR" "${VCPKG_DETECTED_CMAKE_AR}") + qmake_append_program(qmake_build_tools "QMAKE_RANLIB" "${VCPKG_DETECTED_CMAKE_RANLIB}") + qmake_append_program(qmake_build_tools "QMAKE_STRIP" "${VCPKG_DETECTED_CMAKE_STRIP}") + qmake_append_program(qmake_build_tools "QMAKE_NM" "${VCPKG_DETECTED_CMAKE_NM}") + qmake_append_program(qmake_build_tools "QMAKE_RC" "${VCPKG_DETECTED_CMAKE_RC_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_MT" "${VCPKG_DETECTED_CMAKE_MT}") + + # QMAKE_OBJCOPY ? + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + qmake_append_program(qmake_build_tools "LINKER" "${VCPKG_DETECTED_CMAKE_LINKER}") + qmake_append_program(qmake_build_tools "QMAKE_LINK" "${VCPKG_DETECTED_CMAKE_LINKER}") + qmake_append_program(qmake_build_tools "QMAKE_LINK_C" "${VCPKG_DETECTED_CMAKE_LINKER}") + else() + qmake_append_program(qmake_build_tools "QMAKE_LINK" "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_LINK_C" "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + endif() + + foreach(buildtype IN LISTS buildtypes) + set(short "${short_name_${buildtype}}") + string(TOLOWER "${buildtype}" lowerbuildtype) + set(prefix "${CURRENT_INSTALLED_DIR}${path_suffix_${buildtype}}") + set(prefix_package "${CURRENT_PACKAGES_DIR}${path_suffix_${buildtype}}") + set(config_triplet "${TARGET_TRIPLET}-${short}") + # Cleanup build directories + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${config_triplet}") + + # Setup qt.conf + if(NOT VCPKG_QT_CONF_${buildtype}) + set(VCPKG_QT_CONF_${buildtype} "${CURRENT_INSTALLED_DIR}/tools/Qt6/qt_${lowerbuildtype}.conf") + endif() + configure_file("${VCPKG_QT_CONF_${buildtype}}" "${CURRENT_BUILDTREES_DIR}/${config_triplet}/qt.conf") # Needs probably more TODO for cross builds + + vcpkg_backup_env_variables(VARS PKG_CONFIG_PATH) + vcpkg_host_path_list(PREPEND PKG_CONFIG_PATH "${prefix}/lib/pkgconfig" "${prefix}/share/pkgconfig") + + set(qmake_comp_flags "") + # Note sure about these. VCPKG_QMAKE_OPTIONS offers a way to opt out of these. (earlier values being overwritten by later values; = set +=append *=append unique -=remove) + vcpkg_list(APPEND qmake_comp_flags "QMAKE_LIBS+=${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES} ${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}" + "QMAKE_RC+=${VCPKG_COMBINED_RC_FLAGS_${buildtype}}" + "QMAKE_CFLAGS_${buildtype}*=${VCPKG_COMBINED_C_FLAGS_${buildtype}}" + "QMAKE_CXXFLAGS_${buildtype}*=${VCPKG_COMBINED_CXX_FLAGS_${buildtype}}" + "QMAKE_LFLAGS*=${VCPKG_COMBINED_SHARED_LINKER_FLAGS_${buildtype}}" + "QMAKE_LIBFLAGS*=${VCPKG_COMBINED_STATIC_LINKER_FLAGS_${buildtype}}" + "QMAKE_LFLAGS_EXE*=${VCPKG_COMBINED_EXE_LINKER_FLAGS_${buildtype}}" + ) + + message(STATUS "Configuring ${config_triplet}") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${config_triplet}") + if(DEFINED arg_OPTIONS OR DEFINED arg_OPTIONS_${buildtype}) + set(options -- ${arg_OPTIONS} ${arg_OPTIONS_${buildtype}}) + endif() + # Options might need to go into a response file? I am a bit concerned about cmd line length. + vcpkg_execute_required_process( + COMMAND ${VCPKG_QMAKE_COMMAND} ${qmake_config_${buildtype}} + ${arg_QMAKE_OPTIONS} ${arg_QMAKE_OPTIONS_DEBUG} + ${VCPKG_QMAKE_OPTIONS} ${VCPKG_QMAKE_OPTIONS_${buildtype}} # Advanced users need a way to inject QMAKE variables via the triplet. + ${qmake_build_tools} ${qmake_comp_flags} + "${arg_SOURCE_PATH}" + -qtconf "${CURRENT_BUILDTREES_DIR}/${config_triplet}/qt.conf" + ${options} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${config_triplet} + LOGNAME config-${config_triplet} + ) + message(STATUS "Configuring ${config_triplet} done") + + vcpkg_restore_env_variables(VARS PKG_CONFIG_PATH) + if(EXISTS "${CURRENT_BUILDTREES_DIR}/${config_triplet}/config.log") + file(REMOVE "${CURRENT_BUILDTREES_DIR}/internal-config-${config_triplet}.log") + file(RENAME "${CURRENT_BUILDTREES_DIR}/${config_triplet}/config.log" "${CURRENT_BUILDTREES_DIR}/internal-config-${config_triplet}.log") + endif() + endforeach() +endfunction() \ No newline at end of file diff --git a/externals/vcpkg/ports/vcpkg-tool-gn/portfile.cmake b/externals/vcpkg/ports/vcpkg-tool-gn/portfile.cmake new file mode 100755 index 000000000..a8c42daa4 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-tool-gn/portfile.cmake @@ -0,0 +1,62 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(program GN) +set(search_names gn gn.exe) +set(paths_to_search "${CURRENT_PACKAGES_DIR}/tools/gn") + +set(cipd_download_gn "https://chrome-infra-packages.appspot.com/dl/gn/gn") +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") + EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH) + if(HOST_ARCH STREQUAL "aarch64") + set(program_version "GkfFAfAUyE-qfeWkdUMaeM1Ov64Fk3SjSj9pwKqZX7gC") + set(gn_platform "linux-arm64") + set(download_sha512 "E88201309A12C00CE60137261B8E1A759780C81D1925B819583B16D2095A16A7D32EFB2AF36C1E1D6EAA142BF6A6A811847D3140E4E94967EE28F4ADF6373E4B") + else() + set(program_version "Fv1ENXodhXmEXy_xpZr2gQkVJh57w_IsbsrEJOU0_EoC") + set(gn_platform "linux-amd64") + set(download_sha512 "A7A5CD5633C5547EC1B1A95958486DDAAC91F1A65881EDC0AD8F74DF44E82F08BA74358E9A72DFCDDE6F534A6B9C9A430D3E16ACE2E4346C4D2E9113F7654B3F") + endif() +elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + set(supported_on_unix ON) + EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH) + if(HOST_ARCH STREQUAL "arm64") + set(program_version "qMPtGq7xZlpb-lHjP-SK27ftT4X71WIvguuyx6X14DEC") + set(gn_platform "mac-arm64") + set(download_sha512 "D096FB958D017807427911089AB5A7655AED117F6851C0491AC8063CEDB544423122EF64DF4264ECA86C20A2BDE9E64D7B72DA7ED8C95C2BA79A68B8247D36B8") + else() + set(program_version "0x2juPLNfP9603GIyZrUfflxK6LiMcppLAoxEpYuIYoC") + set(gn_platform "mac-amd64") + set(download_sha512 "2696ECE7B2C8008CABDDF10024017E2ECF875F8679424E77052252BDDC83A2096DF3C61D89CD25120EF27E0458C8914BEEED9D418593BDBC4F6ED33A8D4C3DC5") + endif() +else() + if($ENV{PROCESSOR_ARCHITECTURE} STREQUAL "ARM64") + set(program_version "q5ExVHmXyD34Q_Tzb-aRxsPipO-e37-csVRhVM7IJh0C") + set(gn_platform "windows-amd64") + set(download_sha512 "FA764AA44EB6F48ED50E855B4DC1DD1ABE35E45FD4AAC7F059A35293A14894C1B591215E34FB0CE9362E646EA9463BA3B489EFB7EBBAA2693D14238B50E4E686") + else() # AMD64 + set(program_version "q5ExVHmXyD34Q_Tzb-aRxsPipO-e37-csVRhVM7IJh0C") + set(gn_platform "windows-amd64") + set(download_sha512 "FA764AA44EB6F48ED50E855B4DC1DD1ABE35E45FD4AAC7F059A35293A14894C1B591215E34FB0CE9362E646EA9463BA3B489EFB7EBBAA2693D14238B50E4E686") + endif() +endif() + +set(download_urls "${cipd_download_gn}/${gn_platform}/+/${program_version}") +set(download_filename "gn-${gn_platform}.zip") +vcpkg_download_distfile(archive_path + URLS ${download_urls} + SHA512 "${download_sha512}" + FILENAME "${download_filename}" +) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/gn") +vcpkg_execute_in_download_mode( + COMMAND "${CMAKE_COMMAND}" -E tar xzf "${archive_path}" + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/gn" +) + +z_vcpkg_find_acquire_program_find_internal("${program}" + PATHS ${paths_to_search} + NAMES ${search_names} +) + +message(STATUS "Using gn: ${GN}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/gn/version.txt" "${program_version}") # For vcpkg_find_acquire_program diff --git a/externals/vcpkg/ports/vcpkg-tool-gn/vcpkg.json b/externals/vcpkg/ports/vcpkg-tool-gn/vcpkg.json new file mode 100755 index 000000000..2239a3aa5 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-tool-gn/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "vcpkg-tool-gn", + "version-date": "2022-04-16", + "description": "GN build system", + "homepage": "https://gn.googlesource.com/gn/", + "license": null, + "supports": "native" +} diff --git a/externals/vcpkg/ports/vcpkg-tool-gyp-nss/portfile.cmake b/externals/vcpkg/ports/vcpkg-tool-gyp-nss/portfile.cmake new file mode 100755 index 000000000..16bd07b2f --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-tool-gyp-nss/portfile.cmake @@ -0,0 +1,21 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(PROGNAME gyp-nss) +set(PROG_VERSION b3177c3f6c2c45a8ca098ae0f0ebb4536c624762) +set(ARCHIVE gyp-nss-${PROG_VERSION}) + +vcpkg_download_distfile(ARCHIVE_PATH + URLS "https://github.com/plq/gyp-nss/archive/${PROG_VERSION}.zip" + SHA512 7cd05e1bdcdb579e8226ecae2e925285e164349927f60350b87703afe9cbdc308f044bc9f6455318f99778b7b49304003aab47f6c587a13e6fbdaaa1533c558d + FILENAME "${ARCHIVE}.zip" +) + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") + +vcpkg_execute_in_download_mode( + COMMAND "${CMAKE_COMMAND}" -E tar xzf "${ARCHIVE_PATH}" + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools" +) +file(GLOB_RECURSE folders "${CURRENT_PACKAGES_DIR}/tools/*" LIST_DIRECTORIES true) + +file(RENAME "${CURRENT_PACKAGES_DIR}/tools/${ARCHIVE}" "${CURRENT_PACKAGES_DIR}/tools/gyp-nss") diff --git a/externals/vcpkg/ports/vcpkg-tool-gyp-nss/vcpkg.json b/externals/vcpkg/ports/vcpkg-tool-gyp-nss/vcpkg.json new file mode 100755 index 000000000..74299811b --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-tool-gyp-nss/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "vcpkg-tool-gyp-nss", + "version-date": "2022-03-04", + "description": "https://github.com/plq/gyp-nss", + "supports": "native" +} diff --git a/externals/vcpkg/ports/vcpkg-tool-lessmsi/portfile.cmake b/externals/vcpkg/ports/vcpkg-tool-lessmsi/portfile.cmake new file mode 100755 index 000000000..cd523cf41 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-tool-lessmsi/portfile.cmake @@ -0,0 +1,17 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(version v1.10.0) + +vcpkg_download_distfile(archive_path + URLS "https://github.com/activescott/lessmsi/releases/download/${version}/lessmsi-${version}.zip" + FILENAME "lessmsi-${version}.zip" + SHA512 91be9363d75e8ca0129304008ddc26fe575cc4fd76d7f43ef0a6ff414855dc1c6e412f4e694b2950026e02cc3d31b18bd8c2e4c03e1ddce01477f3f2d2197479 +) + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + +file(ARCHIVE_EXTRACT + INPUT "${archive_path}" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}" +) + diff --git a/externals/vcpkg/ports/vcpkg-tool-lessmsi/vcpkg.json b/externals/vcpkg/ports/vcpkg-tool-lessmsi/vcpkg.json new file mode 100755 index 000000000..df6fc3711 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-tool-lessmsi/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "vcpkg-tool-lessmsi", + "version": "1.10.0", + "description": "This is a utility with a graphical user interface and a command line interface that can be used to view and extract the contents of an MSI file.", + "homepage": "https://github.com/activescott/lessmsi", + "license": "MIT", + "supports": "native & windows" +} diff --git a/externals/vcpkg/ports/vcpkg-tool-meson/meson-intl.patch b/externals/vcpkg/ports/vcpkg-tool-meson/meson-intl.patch new file mode 100755 index 000000000..614db056d --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-tool-meson/meson-intl.patch @@ -0,0 +1,14 @@ +diff --git a/tools/meson/mesonbuild/dependencies/misc.py b/tools/meson/mesonbuild/dependencies/misc.py +index 537af1f89..43d7febf2 100644 +--- a/tools/meson/mesonbuild/dependencies/misc.py ++++ b/tools/meson/mesonbuild/dependencies/misc.py +@@ -610,7 +610,8 @@ iconv_factory = DependencyFactory( + + intl_factory = DependencyFactory( + 'intl', ++ [DependencyMethods.BUILTIN, DependencyMethods.SYSTEM, DependencyMethods.CMAKE], ++ cmake_name='Intl', +- [DependencyMethods.BUILTIN, DependencyMethods.SYSTEM], + builtin_class=IntlBuiltinDependency, + system_class=IntlSystemDependency, + ) diff --git a/externals/vcpkg/ports/vcpkg-tool-meson/portfile.cmake b/externals/vcpkg/ports/vcpkg-tool-meson/portfile.cmake new file mode 100755 index 000000000..ea2a7b229 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-tool-meson/portfile.cmake @@ -0,0 +1,63 @@ +# This port represents a dependency on the Meson build system. +# In the future, it is expected that this port acquires and installs Meson. +# Currently is used in ports that call vcpkg_find_acquire_program(MESON) in order to force rebuilds. + +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(program MESON) +set(program_version 0.62.1) +set(program_name meson) +set(search_names meson meson.py) +set(interpreter PYTHON3) +set(apt_package_name "meson") +set(brew_package_name "meson") +set(ref bb91cea0d66d8d036063dedec1f194d663399cdf) +set(paths_to_search "${CURRENT_PACKAGES_DIR}/tools/meson") +set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz") +set(download_filename "meson-${ref}.tar.gz") +set(download_sha512 e5888eb35dd4ab5fc0a16143cfbb5a7849f6d705e211a80baf0a8b753e2cf877a4587860a79cad129ec5f3474c12a73558ffe66439b1633d80b8044eceaff2da) +set(supported_on_unix ON) +set(version_command --version) +set(extra_search_args EXACT_VERSION_MATCH) + +vcpkg_find_acquire_program(PYTHON3) + +# Reenable if no patching of meson is required within vcpkg +# z_vcpkg_find_acquire_program_find_external("${program}" +# ${extra_search_args} +# PROGRAM_NAME "${program_name}" +# MIN_VERSION "${program_version}" +# INTERPRETER "${interpreter}" +# NAMES ${search_names} +# VERSION_COMMAND ${version_command} +# ) + +if(NOT "${program}") + vcpkg_download_distfile(archive_path + URLS ${download_urls} + SHA512 "${download_sha512}" + FILENAME "${download_filename}" + ) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") + vcpkg_execute_in_download_mode( + COMMAND "${CMAKE_COMMAND}" -E tar xzf "${archive_path}" + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools" + ) + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/meson-${ref}" "${CURRENT_PACKAGES_DIR}/tools/meson") + z_vcpkg_apply_patches( + SOURCE_PATH "${CURRENT_PACKAGES_DIR}" + PATCHES + meson-intl.patch + ) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/meson/test cases") + configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY) +endif() + +z_vcpkg_find_acquire_program_find_internal("${program}" + INTERPRETER "${interpreter}" + PATHS ${paths_to_search} + NAMES ${search_names} +) + +message(STATUS "Using meson: ${MESON}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/meson/version.txt" "${program_version}") # For vcpkg_find_acquire_program diff --git a/externals/vcpkg/ports/vcpkg-tool-meson/vcpkg-port-config.cmake b/externals/vcpkg/ports/vcpkg-tool-meson/vcpkg-port-config.cmake new file mode 100755 index 000000000..887c4adbe --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-tool-meson/vcpkg-port-config.cmake @@ -0,0 +1 @@ +set(SCRIPT_MESON "${CMAKE_CURRENT_LIST_DIR}/../../tools/meson/meson.py") diff --git a/externals/vcpkg/ports/vcpkg-tool-meson/vcpkg.json b/externals/vcpkg/ports/vcpkg-tool-meson/vcpkg.json new file mode 100755 index 000000000..4863acaca --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-tool-meson/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "vcpkg-tool-meson", + "version": "0.62.1", + "description": "Meson build system", + "homepage": "https://github.com/mesonbuild/meson", + "license": "Apache-2.0", + "supports": "native" +} diff --git a/externals/vcpkg/ports/vcpkg-tool-mozbuild/portfile.cmake b/externals/vcpkg/ports/vcpkg-tool-mozbuild/portfile.cmake new file mode 100755 index 000000000..28a65b99d --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-tool-mozbuild/portfile.cmake @@ -0,0 +1,28 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(PROGNAME mozbuild) +set(EXE_NAME mozmake) +set(PROG_VERSION 3.3) +set(ARCHIVE MozillaBuildSetup-${PROG_VERSION}) +set(BASE_URL "https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-") +set(URL "${BASE_URL}${PROG_VERSION}.exe") +set(HASH ac33d15dd9c974ef8ad581f9b414520a9d5e3b9816ab2bbf3e305d0a33356cc22c356cd9761e64a19588d17b6c13f124e837cfb462a36b8da898899e7db22ded) + +if(VCPKG_CROSSCOMPILING) + message(FATAL_ERROR "This is a host only port!") +endif() + +vcpkg_download_distfile(ARCHIVE_PATH + URLS "${URL}" + SHA512 ${HASH} + FILENAME "${ARCHIVE}.7z.exe" +) + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/mozbuild") + +vcpkg_find_acquire_program(7Z) + +vcpkg_execute_in_download_mode( + COMMAND "${7Z}" x "${ARCHIVE_PATH}" -aoa + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/mozbuild" +) diff --git a/externals/vcpkg/ports/vcpkg-tool-mozbuild/vcpkg.json b/externals/vcpkg/ports/vcpkg-tool-mozbuild/vcpkg.json new file mode 100755 index 000000000..feb244e7e --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-tool-mozbuild/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "vcpkg-tool-mozbuild", + "version": "3.3", + "description": "mozbuild is a Python package providing functionality used by Mozilla’s build system", + "homepage": "https://firefox-source-docs.mozilla.org/build/buildsystem/mozbuild/index.html", + "supports": "native & x64 & windows" +} diff --git a/externals/vcpkg/ports/vcpkg-tool-ninja/portfile.cmake b/externals/vcpkg/ports/vcpkg-tool-ninja/portfile.cmake new file mode 100755 index 000000000..8cb941b47 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-tool-ninja/portfile.cmake @@ -0,0 +1,28 @@ +set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled) + +vcpkg_download_distfile( + LONG_PATH_PATCH + URLS "https://patch-diff.githubusercontent.com/raw/ninja-build/ninja/pull/2056.diff" # stable? + FILENAME 2056.diff + SHA512 90f17c2cbb5e0c5b41de748f75a3fc3e0c9da8837a0507c8570a49affe15ae7258661dc1f1bc201574847d93ea8b7fe4cbecfffd868395d50ca821033c5f295d +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ninja-build/ninja + REF 170c387a7461d476523ae29c115a58f16e4d3430 + SHA512 75c0f263ad325d14c99c9a1d85e571832407b481271a2733e78183a478f7ecd22d84451fc8d7ce16ab20d641ce040761d7ab266695d66bbac5b2b9a3a29aa521 + HEAD_REF master + PATCHES "${LONG_PATH_PATCH}" # Long path support windows +) +set(VCPKG_BUILD_TYPE release) #we only need release here! +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() +vcpkg_copy_tools( + TOOL_NAMES ninja + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/ninja" + AUTO_CLEAN +) + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY) diff --git a/externals/vcpkg/ports/vcpkg-tool-ninja/vcpkg-port-config.cmake b/externals/vcpkg/ports/vcpkg-tool-ninja/vcpkg-port-config.cmake new file mode 100755 index 000000000..8bf42e9f6 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-tool-ninja/vcpkg-port-config.cmake @@ -0,0 +1 @@ +set(NINJA "${CMAKE_CURRENT_LIST_DIR}/../../tools/ninja/ninja@VCPKG_TARGET_EXECUTABLE_SUFFIX@") diff --git a/externals/vcpkg/ports/vcpkg-tool-ninja/vcpkg.json b/externals/vcpkg/ports/vcpkg-tool-ninja/vcpkg.json new file mode 100755 index 000000000..434990e25 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-tool-ninja/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "vcpkg-tool-ninja", + "version-date": "2022-03-31", + "description": "Ninja is a small build system with a focus on speed.", + "homepage": "https://ninja-build.org/", + "license": "Apache-2.0", + "supports": "native", + "dependencies": [ + "vcpkg-cmake", + "vcpkg-cmake-config" + ] +} diff --git a/externals/vcpkg/ports/vcpkg-tool-nodejs/portfile.cmake b/externals/vcpkg/ports/vcpkg-tool-nodejs/portfile.cmake new file mode 100755 index 000000000..c7dd8e17b --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-tool-nodejs/portfile.cmake @@ -0,0 +1,57 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(PROGNAME node) +set(PROG_VERSION 14.17.4) + +set(BREW_PACKAGE_NAME "${PROGNAME}") +set(APT_PACKAGE_NAME "${PROGNAME}") + +if(VCPKG_CROSSCOMPILING) + message(FATAL_ERROR "This is a host only port!") +endif() + +set(BASE_URL "https://nodejs.org/dist/v${PROG_VERSION}/") +set(ARCHIVE "") +set(ARCHIVE_EXT "") + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "^x86$|arm") + set(ARCHIVE "node-v${PROG_VERSION}-win-x86") + set(ARCHIVE_EXT ".zip") + set(HASH 82ea09a10f20ecab860b9e15b2cc72eec4a60ac5f20680f7846f37c5c1422d38d448cd7a71382cbb41101c1382412368bb74bf1a0bd7698f7ba882e022ae7304) +elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(ARCHIVE "node-v${PROG_VERSION}-win-x64") + set(ARCHIVE_EXT ".zip") + set(HASH 9a067c9ac5abc8d6af756b9a5344beee552f877a54833bdfa3a88e694359831f4edc9fac9c2c29b2f02f859e79bfeb4b91735e70c02c9daddf3e82efbfcbe46c) +elseif(VCPKG_TARGET_IS_OSX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(ARCHIVE "node-v${PROG_VERSION}-darwin-x64") + set(ARCHIVE_EXT ".tar.gz") + set(HASH 76575afb5711c6fbccd45ef319d6c3960d0363808a0703e7e9ed5c637fe19af63a8ff6eb08182df77c7620d50a42bf9fd324489466556a1b5895f0f2aebb8a5a) +elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(ARCHIVE "node-v${PROG_VERSION}-linux-x64") + set(ARCHIVE_EXT ".tar.xz") + set(HASH 696af62f78147dc20e15364ba7fea6f707b0d5e3c9ae925975d64ec7dc90db4f27a3e5e90307a26bf48b05e0096ab34144d29cd9379b70b384cbd3144bf8cd85) +else() + message(FATAL_ERROR "Target not yet supported by '${PORT}'") +endif() +set(URL "${BASE_URL}${ARCHIVE}${ARCHIVE_EXT}") +message(STATUS "URL: '${URL}'") + +vcpkg_download_distfile(ARCHIVE_PATH + URLS "${URL}" + SHA512 "${HASH}" + FILENAME "${ARCHIVE}${ARCHIVE_EXT}" + #ALWAYS_REDOWNLOAD + #SKIP_SHA512 +) + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") +message(STATUS "ARCHIVE_PATH: '${ARCHIVE_PATH}'") + +vcpkg_execute_in_download_mode( + COMMAND ${CMAKE_COMMAND} -E tar xzf "${ARCHIVE_PATH}" + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools" +) +file(GLOB_RECURSE folders "${CURRENT_PACKAGES_DIR}/tools/*" LIST_DIRECTORIES true) +message(STATUS "Files and Folders: '${folders}'") + +file(RENAME "${CURRENT_PACKAGES_DIR}/tools/${ARCHIVE}" "${CURRENT_PACKAGES_DIR}/tools/node") diff --git a/externals/vcpkg/ports/vcpkg-tool-nodejs/vcpkg.json b/externals/vcpkg/ports/vcpkg-tool-nodejs/vcpkg.json new file mode 100755 index 000000000..aed974a26 --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-tool-nodejs/vcpkg.json @@ -0,0 +1,5 @@ +{ + "name": "vcpkg-tool-nodejs", + "version-semver": "14.17.4", + "supports": "native" +} diff --git a/externals/vcpkg/ports/vcpkg-tool-python2/portfile.cmake b/externals/vcpkg/ports/vcpkg-tool-python2/portfile.cmake new file mode 100755 index 000000000..703173bba --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-tool-python2/portfile.cmake @@ -0,0 +1,60 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +if(VCPKG_TARGET_IS_WINDOWS) + set(arch_suffix "") + set(program_name python) + set(program_version 2.7.18) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) + set(tool_subdirectory "python-${program_version}-x86") + set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.msi") + set(download_filename "python-${program_version}.msi") + set(download_sha512 2c112733c777ddbf189b0a54047a9d5851ebce0564cc38b9687d79ce6c7a09006109dbad8627fb1a60c3ad55e261db850d9dfa454af0533b460b2afc316fe115) + else() + set(tool_subdirectory "python-${program_version}-x64") + set(arch_suffix ".amd64") + set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.amd64.msi") + set(download_filename "python-${program_version}.amd64.msi") + set(download_sha512 6a81a413b80fd39893e7444fd47efa455d240cbb77a456c9d12f7cf64962b38c08cfa244cd9c50a65947c40f936c6c8c5782f7236d7b92445ab3dd01e82af23e) + endif() + set(paths_to_search "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}") + + vcpkg_download_distfile(archive_path + URLS ${download_urls} + SHA512 "${download_sha512}" + FILENAME "${download_filename}" + ) + set(output_path "${CURRENT_PACKAGES_DIR}/manual-tools") # vcpkg.cmake adds everything in /tools to CMAKE_PROGRAM_PATH. That is not desired for Python2 + file(MAKE_DIRECTORY "${output_path}") + cmake_path(NATIVE_PATH archive_path archive_path_native) # lessmsi is a bit picky about path formats. + message(STATUS "Extracting Python2 ...") + vcpkg_execute_in_download_mode( + COMMAND "${CURRENT_HOST_INSTALLED_DIR}/tools/vcpkg-tool-lessmsi/lessmsi.exe" x "${archive_path_native}" # Using output_path here does not work in bash + WORKING_DIRECTORY "${output_path}" + OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/lessmsi-${TARGET_TRIPLET}-out.log" + ERROR_FILE "${CURRENT_BUILDTREES_DIR}/lessmsi-${TARGET_TRIPLET}-err.log" + RESULT_VARIABLE error_code + ) + if(error_code) + message(FATAL_ERROR "Couldn't extract Python2 with lessmsi!") + endif() + message(STATUS "Extracting Python2 ... finished!") + file(RENAME "${output_path}/python-2.7.18${arch_suffix}/SourceDir/" "${output_path}/${PORT}/") + file(REMOVE_RECURSE "${output_path}/python-2.7.18.amd64" + # Files below are not part of a msiexec installation/extraction. + "${output_path}/${PORT}/Windows" + "${output_path}/${PORT}/Microsoft.VC90.CRT.manifest" + "${output_path}/${PORT}/msvcr90.dll") + z_vcpkg_find_acquire_program_find_internal("PYTHON2" + INTERPRETER "${interpreter}" + PATHS ${paths_to_search} + NAMES ${program_name} + ) + if(NOT PYTHON2) + message(FATAL_ERROR "Unable to find python2: ${PYTHON2}") + endif() + message(STATUS "Using python2: ${PYTHON2}") + set(details "set(program_version \"${program_version}\")\n") + string(APPEND details "set(paths_to_search \"\${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}\")\n") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/details.cmake" "${details}") +endif() + diff --git a/externals/vcpkg/ports/vcpkg-tool-python2/vcpkg.json b/externals/vcpkg/ports/vcpkg-tool-python2/vcpkg.json new file mode 100755 index 000000000..346a8b15c --- /dev/null +++ b/externals/vcpkg/ports/vcpkg-tool-python2/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "vcpkg-tool-python2", + "version": "2.7.18", + "description": "Python 2", + "homepage": "https://www.python.org/download/releases/2.0/", + "license": "PSF-2.0", + "supports": "!uwp & !(arm & windows)", + "dependencies": [ + { + "name": "vcpkg-tool-lessmsi", + "host": true, + "platform": "windows" + } + ] +} diff --git a/externals/vcpkg/ports/vectorclass/CMakeLists.txt b/externals/vcpkg/ports/vectorclass/CMakeLists.txt new file mode 100755 index 000000000..54b83b267 --- /dev/null +++ b/externals/vcpkg/ports/vectorclass/CMakeLists.txt @@ -0,0 +1,24 @@ +cmake_minimum_required(VERSION 3.8.0) +project(vectorclass VERSION 2.00.01 LANGUAGES CXX) + +add_library(${PROJECT_NAME} STATIC instrset_detect.cpp) + +target_include_directories(${PROJECT_NAME} INTERFACE + $ + $) + +target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_17) + +include(CMakePackageConfigHelpers) +write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake" + VERSION ${${PROJECT_NAME}_VERSION} + COMPATIBILITY SameMajorVersion) + +install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-config) +install( + EXPORT ${PROJECT_NAME}-config DESTINATION lib/cmake/${PROJECT_NAME} + NAMESPACE ${PROJECT_NAME}::) +install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake" + DESTINATION lib/cmake/${PROJECT_NAME}) +install(DIRECTORY . DESTINATION include/${PROJECT_NAME} FILES_MATCHING PATTERN *.h) \ No newline at end of file diff --git a/externals/vcpkg/ports/vectorclass/portfile.cmake b/externals/vcpkg/ports/vectorclass/portfile.cmake new file mode 100755 index 000000000..ae5823889 --- /dev/null +++ b/externals/vcpkg/ports/vectorclass/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO vectorclass/version2 + REF v2.00.01 + SHA512 2e1f714cf0e23cf7986f0e78b4c1eeab4da6434ac92449b81990931e19ae189df6fbbef50f11e9532a41dc6eaff0a4fea840349a3747621ff537bbd7519f2c3d + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Put the licence file where vcpkg expects it +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) diff --git a/externals/vcpkg/ports/vectorclass/vcpkg.json b/externals/vcpkg/ports/vectorclass/vcpkg.json new file mode 100755 index 000000000..40b26d754 --- /dev/null +++ b/externals/vcpkg/ports/vectorclass/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "vectorclass", + "version-string": "2.00.01", + "port-version": 2, + "description": "C++ class library for using the Single Instruction Multiple Data (SIMD) instructions in modern Microprocessors", + "homepage": "https://github.com/vectorclass/version2", + "supports": "!(arm | arm64)" +} diff --git a/externals/vcpkg/ports/visit-struct/CMakeLists.txt b/externals/vcpkg/ports/visit-struct/CMakeLists.txt new file mode 100755 index 000000000..df4fa2890 --- /dev/null +++ b/externals/vcpkg/ports/visit-struct/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 3.11) +project(visit_struct) + +add_library(visit_struct INTERFACE) + +install(TARGETS visit_struct + EXPORT visit_struct-targets + INCLUDES DESTINATION include) + +install(EXPORT visit_struct-targets + FILE visit_struct-config.cmake + NAMESPACE visit_struct:: + DESTINATION share/visit_struct) + +install(DIRECTORY + include/visit_struct + DESTINATION include) diff --git a/externals/vcpkg/ports/visit-struct/portfile.cmake b/externals/vcpkg/ports/visit-struct/portfile.cmake new file mode 100755 index 000000000..a797803ef --- /dev/null +++ b/externals/vcpkg/ports/visit-struct/portfile.cmake @@ -0,0 +1,25 @@ +#header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cbeck88/visit_struct + REF v1.0 + SHA512 1396d0d4c4d37f48434361d1e0ab4cb02c397aff1134678b26de713a27a4fcfa1c352890845502be645ba01e20314bf67731893fc6410b93e4521c1261d63c06 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/visit_struct TARGET_PATH share/visit_struct) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +file(INSTALL ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright) +file(INSTALL ${SOURCE_PATH}/README.md + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/externals/vcpkg/ports/visit-struct/vcpkg.json b/externals/vcpkg/ports/visit-struct/vcpkg.json new file mode 100755 index 000000000..0227710a4 --- /dev/null +++ b/externals/vcpkg/ports/visit-struct/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "visit-struct", + "version-string": "1.0", + "port-version": 2, + "description": "A header-only library providing structure visitors for C++11 and C++14" +} diff --git a/externals/vcpkg/ports/vk-bootstrap/portfile.cmake b/externals/vcpkg/ports/vk-bootstrap/portfile.cmake new file mode 100755 index 000000000..f0a1c3a6c --- /dev/null +++ b/externals/vcpkg/ports/vk-bootstrap/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO charles-lunarg/vk-bootstrap + REF 142986cdb767037118b687387b097ff6b3e7fe7d + SHA512 1dc32f09f4548ffaf71d39d5200d60a9bd58971327039f2adb4327fdb885f984bbd91409d28dbfc24e5fdac8c241824e141a2558cddc1b86b84cf2376e7d7567 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/${PORT}-config.cmake" "${CMAKE_CURRENT_LIST_DIR}/${PORT}-targets-release.cmake" "${CMAKE_CURRENT_LIST_DIR}/${PORT}-targets-debug.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +configure_file("${SOURCE_PATH}/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/vk-bootstrap/vcpkg.json b/externals/vcpkg/ports/vk-bootstrap/vcpkg.json new file mode 100755 index 000000000..5126f4ca1 --- /dev/null +++ b/externals/vcpkg/ports/vk-bootstrap/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "vk-bootstrap", + "version": "0.5", + "description": "Vulkan bootstraping library", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + "vulkan" + ] +} diff --git a/externals/vcpkg/ports/vk-bootstrap/vk-bootstrap-config.cmake b/externals/vcpkg/ports/vk-bootstrap/vk-bootstrap-config.cmake new file mode 100755 index 000000000..4d2244eae --- /dev/null +++ b/externals/vcpkg/ports/vk-bootstrap/vk-bootstrap-config.cmake @@ -0,0 +1,14 @@ +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + +add_library(vk-bootstrap::vk-bootstrap SHARED IMPORTED) +set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include" +) + +get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +file(GLOB CONFIG_FILES "${_DIR}/vk-bootstrap-targets-*.cmake") +foreach(f ${CONFIG_FILES}) + include(${f}) +endforeach() diff --git a/externals/vcpkg/ports/vk-bootstrap/vk-bootstrap-targets-debug.cmake b/externals/vcpkg/ports/vk-bootstrap/vk-bootstrap-targets-debug.cmake new file mode 100755 index 000000000..ec882d433 --- /dev/null +++ b/externals/vcpkg/ports/vk-bootstrap/vk-bootstrap-targets-debug.cmake @@ -0,0 +1,12 @@ +#---------------------------------------------------------------- +# Generated CMake target import file for configuration "Debug". +#---------------------------------------------------------------- + +set(CMAKE_IMPORT_FILE_VERSION 1) + +set_property(TARGET vk-bootstrap::vk-bootstrap APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) +set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES + IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/debug/lib/vk-bootstrap.lib" +) + +set(CMAKE_IMPORT_FILE_VERSION) diff --git a/externals/vcpkg/ports/vk-bootstrap/vk-bootstrap-targets-release.cmake b/externals/vcpkg/ports/vk-bootstrap/vk-bootstrap-targets-release.cmake new file mode 100755 index 000000000..a25d3be07 --- /dev/null +++ b/externals/vcpkg/ports/vk-bootstrap/vk-bootstrap-targets-release.cmake @@ -0,0 +1,12 @@ +#---------------------------------------------------------------- +# Generated CMake target import file for configuration "Debug". +#---------------------------------------------------------------- + +set(CMAKE_IMPORT_FILE_VERSION 1) + +set_property(TARGET vk-bootstrap::vk-bootstrap APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) +set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES + IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/vk-bootstrap.lib" +) + +set(CMAKE_IMPORT_FILE_VERSION) diff --git a/externals/vcpkg/ports/vkfft/portfile.cmake b/externals/vcpkg/ports/vkfft/portfile.cmake new file mode 100755 index 000000000..23c2a86d7 --- /dev/null +++ b/externals/vcpkg/ports/vkfft/portfile.cmake @@ -0,0 +1,12 @@ +# header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DTolm/VkFFT + REF fc981ecc022ae7932d4d906bed3cf9def592ddf5 #v1.2.17 + SHA512 c2ffae4885fe75778743f4165475026a43ab2ad2df2e02774a2750ad77ad8ceb3c6ff22a5cec56af3913af46eeb48bc09d2e119a54d893daa13af1fd768d9a9f + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/vkFFT/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/VkFFT") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/vkfft/vcpkg.json b/externals/vcpkg/ports/vkfft/vcpkg.json new file mode 100755 index 000000000..8e656038c --- /dev/null +++ b/externals/vcpkg/ports/vkfft/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "vkfft", + "version": "1.2.17", + "description": "Vulkan/CUDA/HIP/OpenCL/Level Zero Fast Fourier Transform library", + "homepage": "https://github.com/DTolm/VkFFT", + "license": "MIT" +} diff --git a/externals/vcpkg/ports/vlfeat/CMakeLists.txt b/externals/vcpkg/ports/vlfeat/CMakeLists.txt new file mode 100755 index 000000000..39ecfbc6b --- /dev/null +++ b/externals/vcpkg/ports/vlfeat/CMakeLists.txt @@ -0,0 +1,159 @@ +cmake_minimum_required (VERSION 3.10) +project (vlfeat) + +set(INSTALL_BIN_DIR "bin" CACHE PATH "Path where exe and dll will be installed") +set(INSTALL_LIB_DIR "lib" CACHE PATH "Path where lib will be installed") +set(INSTALL_INCLUDE_DIR "include/vlfeat" CACHE PATH "Path where headers will be installed") +set(INSTALL_CMAKE_DIR "share/vlfeat" CACHE PATH "Path where cmake configs will be installed") + +# Make relative paths absolute (needed later on) +set(RELATIVE_INSTALL_INCLUDE_DIR ${INSTALL_INCLUDE_DIR}) +foreach(p LIB BIN INCLUDE CMAKE) + set(var INSTALL_${p}_DIR) + if(NOT IS_ABSOLUTE "${${var}}") + set(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}") + endif() +endforeach() + +# make sure that the default is a RELEASE +set(default_build_type "Release") +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + message(STATUS "Setting build type to '${default_build_type}' as none was specified.") + set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE + STRING "Choose the type of build." FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Release" "MinSizeRel" "RelWithDebInfo") +endif() + +if(ENABLE_OPENMP) + find_package(OpenMP REQUIRED) + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") +endif() + +if(MSVC) + add_definitions(-D_CRT_SECURE_NO_DEPRECATE) + add_definitions(-D__LITTLE_ENDIAN__) + add_definitions(/Zp8) + add_definitions(/wd4146) + if(CMAKE_C_FLAGS MATCHES "/W[0-4]") + string(REGEX REPLACE "/W[0-4]" "/W1" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") + endif() +endif() + +if(CMAKE_COMPILER_IS_GNUCC) + add_definitions(-std=c99) + add_definitions(-Wno-unused-function) + add_definitions(-Wno-long-long) + add_definitions(-Wno-variadic-macros) +endif() + +if(USE_SSE) + add_definitions(-D__SSE2__) + set(SSE2_VL_C_FILES "vl/mathop_sse2.c" "vl/imopv_sse2.c") + set(SSE2_VL_H_FILES "vl/mathop_sse2.h" "vl/imopv_sse2.h") +else() + add_definitions(-DVL_DISABLE_SSE2) +endif() + +if(USE_AVX) + set(AVX_VL_C_FILES "vl/mathop_avx.c") + set(AVX_VL_H_FILES "vl/mathop_avx.h") +else() + add_definitions(-DVL_DISABLE_AVX) +endif() + + +set (C_SOURCES + vl/aib.c + vl/array.c + vl/covdet.c + vl/dsift.c + vl/fisher.c + vl/generic.c + vl/getopt_long.c + vl/gmm.c + vl/hikmeans.c + vl/hog.c + vl/homkermap.c + vl/host.c + vl/ikmeans.c + vl/imopv.c + vl/kdtree.c + vl/kmeans.c + vl/lbp.c + vl/liop.c + vl/mathop.c + ${AVX_VL_C_FILES} + ${SSE2_VL_C_FILES} + vl/mser.c + vl/pgm.c + vl/quickshift.c + vl/random.c + vl/rodrigues.c + vl/scalespace.c + vl/sift.c + vl/slic.c + vl/stringop.c + vl/svm.c + vl/svmdataset.c + vl/vlad.c +) + +set (H_SOURCES + vl/aib.h + vl/array.h + vl/covdet.h + vl/dsift.h + vl/fisher.h + vl/generic.h + vl/getopt_long.h + vl/gmm.h + vl/heap-def.h + vl/hikmeans.h + vl/hog.h + vl/homkermap.h + vl/host.h + vl/ikmeans.h + vl/imopv.h + vl/kdtree.h + vl/kmeans.h + vl/lbp.h + vl/liop.h + vl/mathop.h + ${AVX_VL_H_FILES} + ${SSE2_VL_H_FILES} + vl/mser.h + vl/pgm.h + vl/qsort-def.h + vl/quickshift.h + vl/random.h + vl/rodrigues.h + vl/scalespace.h + vl/shuffle-def.h + vl/sift.h + vl/slic.h + vl/stringop.h + vl/svm.h + vl/svmdataset.h + vl/vlad.h +) + +add_library(vl ${C_SOURCES} ${H_SOURCES}) +set_property(TARGET vl PROPERTY POSITION_INDEPENDENT_CODE ON) +target_compile_definitions(vl PRIVATE -DVL_BUILD_DLL) +target_include_directories(vl PUBLIC $ $) +set_target_properties(vl PROPERTIES PUBLIC_HEADER "${H_SOURCES}") + +install(TARGETS vl EXPORT vlfeatTargets + RUNTIME DESTINATION "${INSTALL_BIN_DIR}" + LIBRARY DESTINATION "${INSTALL_LIB_DIR}" + ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" + PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}" + COMPONENT dev +) + +install(EXPORT vlfeatTargets + FILE vlfeatConfig.cmake + NAMESPACE unofficial::vlfeat:: + DESTINATION "${INSTALL_CMAKE_DIR}" +) diff --git a/externals/vcpkg/ports/vlfeat/expose_missing_symbols.patch b/externals/vcpkg/ports/vlfeat/expose_missing_symbols.patch new file mode 100755 index 000000000..02e9ce0a6 --- /dev/null +++ b/externals/vcpkg/ports/vlfeat/expose_missing_symbols.patch @@ -0,0 +1,79 @@ +diff --git a/vl/generic.c b/vl/generic.c +index c6f84a9..8617ed2 100644 +--- a/vl/generic.c ++++ b/vl/generic.c +@@ -1513,13 +1513,13 @@ vl_thread_specific_state_delete (VlThreadState * self) + */ + + #if (defined(VL_OS_LINUX) || defined(VL_OS_MACOSX)) && defined(VL_COMPILER_GNUC) +-static void vl_constructor () __attribute__ ((constructor)) ; +-static void vl_destructor () __attribute__ ((destructor)) ; ++//static void vl_constructor () __attribute__ ((constructor)) ; ++//static void vl_destructor () __attribute__ ((destructor)) ; + #endif + + #if defined(VL_OS_WIN) +-static void vl_constructor () ; +-static void vl_destructor () ; ++//static void vl_constructor () ; ++//static void vl_destructor () ; + + BOOL WINAPI DllMain( + HINSTANCE hinstDLL, // handle to DLL module +@@ -1563,7 +1563,7 @@ BOOL WINAPI DllMain( + /* ---------------------------------------------------------------- */ + + /** @internal @brief Initialize VLFeat state */ +-static void ++void + vl_constructor (void) + { + VlState * state ; +@@ -1637,7 +1637,7 @@ vl_constructor (void) + } + + /** @internal @brief Destruct VLFeat */ +-static void ++void + vl_destructor () + { + VlState * state ; +diff --git a/vl/generic.h b/vl/generic.h +index 4ef87f2..30a974e 100644 +--- a/vl/generic.h ++++ b/vl/generic.h +@@ -206,5 +206,7 @@ VL_EXPORT double vl_toc (void) ; + VL_EXPORT double vl_get_cpu_time (void) ; + /** @} */ + ++VL_EXPORT void vl_constructor(); ++VL_EXPORT void vl_destructor(); + /* VL_GENERIC_H */ + #endif +diff --git a/vl/sift.c b/vl/sift.c +index 03963fe..6477a81 100644 +--- a/vl/sift.c ++++ b/vl/sift.c +@@ -1443,7 +1443,7 @@ vl_sift_detect (VlSiftFilt * f) + ** @remark The minimum octave size is 2x2xS. + **/ + +-static void ++void + update_gradient (VlSiftFilt *f) + { + int s_min = f->s_min ; +diff --git a/vl/sift.h b/vl/sift.h +index 50e03f4..f9558ad 100644 +--- a/vl/sift.h ++++ b/vl/sift.h +@@ -138,7 +138,8 @@ void vl_sift_keypoint_init (VlSiftFilt const *f, + double y, + double sigma) ; + /** @} */ +- ++VL_EXPORT ++void update_gradient(VlSiftFilt* f); + /** @name Retrieve data and parameters + ** @{ + **/ diff --git a/externals/vcpkg/ports/vlfeat/portfile.cmake b/externals/vcpkg/ports/vlfeat/portfile.cmake new file mode 100755 index 000000000..a075bdef7 --- /dev/null +++ b/externals/vcpkg/ports/vlfeat/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO vlfeat/vlfeat + REF 1b9075fc42fe54b42f0e937f8b9a230d8e2c7701 + SHA512 6d317a1a9496ccac80244553d555fe060b150ccc7ee397a353b64f3a8451f24d1f03d8c00ed04cd9fc2dc066a5c5089b03695c614cb43ffa09be363660278255 + PATCHES + expose_missing_symbols.patch +) + +set(USE_SSE ON) +set(USE_AVX OFF) # feature is broken, so it's always off anyway + +if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm") + set(USE_SSE OFF) + set(USE_AVX OFF) +endif() + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DUSE_SSE=${USE_SSE} + -DUSE_AVX=${USE_AVX} +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/vlfeat/vcpkg.json b/externals/vcpkg/ports/vlfeat/vcpkg.json new file mode 100755 index 000000000..0e0c0d78b --- /dev/null +++ b/externals/vcpkg/ports/vlfeat/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "vlfeat", + "version-string": "2020-07-10", + "port-version": 1, + "description": "An open library of computer vision algorithms", + "homepage": "https://www.vlfeat.org" +} diff --git a/externals/vcpkg/ports/vlpp/CMakeLists.txt b/externals/vcpkg/ports/vlpp/CMakeLists.txt new file mode 100755 index 000000000..5c254595f --- /dev/null +++ b/externals/vcpkg/ports/vlpp/CMakeLists.txt @@ -0,0 +1,46 @@ +cmake_minimum_required(VERSION 3.3.0) + +project(Vlpp VERSION 0.10.0.0 LANGUAGES CXX) + +# Sources +set(SRCS + Import/Vlpp.cpp + Import/VlppWorkflowLibrary.cpp + Import/VlppWorkflowCompiler.cpp + Import/VlppWorkflowRuntime.cpp) + +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") +endif() + +if(NOT CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 14) +endif() + +# Create and configure the target +add_library(Vlpp ${SRCS}) + +# target_compile_definitions +target_compile_definitions(Vlpp PRIVATE UNICODE) +target_compile_definitions(Vlpp PRIVATE _UNICODE) + +target_include_directories(Vlpp PRIVATE ${PROJECT_SOURCE_DIR}/Import) + +# Install +install( + TARGETS Vlpp + RUNTIME DESTINATION "bin" + LIBRARY DESTINATION "lib" + ARCHIVE DESTINATION "lib" + ) + +if (NOT DEFINED SKIP_HEADERS) + install( + FILES + Import/Vlpp.h + Import/VlppWorkflowLibrary.h + Import/VlppWorkflowCompiler.h + Import/VlppWorkflowRuntime.h + DESTINATION "include" + ) +endif() diff --git a/externals/vcpkg/ports/vlpp/fix-arm.patch b/externals/vcpkg/ports/vlpp/fix-arm.patch new file mode 100755 index 000000000..862e94f08 --- /dev/null +++ b/externals/vcpkg/ports/vlpp/fix-arm.patch @@ -0,0 +1,34 @@ +--- a/Import/Vlpp.h ++++ b/Import/Vlpp.h +@@ -50,13 +50,12 @@ + #define abstract + #endif +- ++#include + #if defined VCZH_MSVC + #include + #elif defined VCZH_GCC +-#include + #include + #include + #include + #define abstract + #define __thiscall + #define __forceinline inline +@@ -160,14 +159,14 @@ + #define UI64TOA_S _ui64toa_s + #define UI64TOW_S _ui64tow_s + #if defined VCZH_MSVC + #define INCRC(x) (_InterlockedIncrement((volatile long*)(x))) + #define DECRC(x) (_InterlockedDecrement((volatile long*)(x))) + #elif defined VCZH_GCC +-#define INCRC(x) (__sync_add_and_fetch(x, 1)) +-#define DECRC(x) (__sync_sub_and_fetch(x, 1)) ++#define INCRC(x) (__atomic_add_fetch(x, 1, __ATOMIC_SEQ_CST)) ++#define DECRC(x) (__atomic_sub_fetch(x, 1, __ATOMIC_SEQ_CST)) + #endif + #endif + + /*********************************************************************** + Basic Types + ***********************************************************************/ diff --git a/externals/vcpkg/ports/vlpp/portfile.cmake b/externals/vcpkg/ports/vlpp/portfile.cmake new file mode 100755 index 000000000..ee1591d87 --- /dev/null +++ b/externals/vcpkg/ports/vlpp/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO vczh-libraries/Release + REF 5dfe25c4f4997da2d7a23bdc80c2438e72d9813a # 0.11.0.0 + SHA512 5d585e561246385b074c625a3644b79defa22328dab0ab14112c846cb917f384abb617a5f400971ca29e4ee5ac391b88b17ee65d594caf9ebf279806db669a4a + HEAD_REF master + PATCHES fix-arm.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Tools +file(INSTALL "${SOURCE_PATH}/Tools/CppMerge.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/tools") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/vlpp" RENAME copyright) diff --git a/externals/vcpkg/ports/vlpp/vcpkg.json b/externals/vcpkg/ports/vlpp/vcpkg.json new file mode 100755 index 000000000..01662b300 --- /dev/null +++ b/externals/vcpkg/ports/vlpp/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "vlpp", + "version": "0.11.0.0", + "port-version": 3, + "description": "Common C++ construction, including string operation / generic container / linq / General-LR parser generator / multithreading / reflection for C++ / etc", + "homepage": "https://github.com/vczh-libraries/Release", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/volk/portfile.cmake b/externals/vcpkg/ports/volk/portfile.cmake new file mode 100755 index 000000000..76fa4af58 --- /dev/null +++ b/externals/vcpkg/ports/volk/portfile.cmake @@ -0,0 +1,23 @@ +# volk is not prepared to be a DLL. +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO zeux/volk + REF 1.3.204 + SHA512 73108aff5bed08f711730948c80070a8d913f2ba2e7886232cd981272fe47bc85cff84eabfdf14d4261c658b58ee098a9bd837222f65323f304d6abcdbeb8613 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DVOLK_INSTALL=ON +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/volk) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/volk/vcpkg.json b/externals/vcpkg/ports/volk/vcpkg.json new file mode 100755 index 000000000..51387523f --- /dev/null +++ b/externals/vcpkg/ports/volk/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "volk", + "version": "1.3.204", + "port-version": 1, + "description": [ + "Meta loader for Vulkan API.", + "Note that the static library target volk::volk is built without platform-specific defines.", + "Use the header-only target volk::volk_headers if you require platform-specific extensions." + ], + "homepage": "https://github.com/zeux/volk", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "vulkan" + ] +} diff --git a/externals/vcpkg/ports/vs-yasm/fix_paths.patch b/externals/vcpkg/ports/vs-yasm/fix_paths.patch new file mode 100755 index 000000000..8b74a3aa1 --- /dev/null +++ b/externals/vcpkg/ports/vs-yasm/fix_paths.patch @@ -0,0 +1,23 @@ +diff --git a/yasm.props b/yasm.props +index 06efe7a..10f6309 100644 +--- a/yasm.props ++++ b/yasm.props +@@ -6,15 +6,15 @@ + CustomBuild + + +- $(VCInstallDir) ++ $(VCInstallDir) + + + + 0 + 0 + $(IntDir)%(FileName).obj +- "$(YasmPath)"yasm.exe -Xvc -f win32 [AllOptions] [AdditionalOptions] "%(FullPath)" +- "$(YasmPath)"yasm.exe -Xvc -f win64 [AllOptions] [AdditionalOptions] "%(FullPath)" ++ "$(YasmPath)" -Xvc -f win32 [AllOptions] [AdditionalOptions] "%(FullPath)" ++ "$(YasmPath)" -Xvc -f win64 [AllOptions] [AdditionalOptions] "%(FullPath)" + echo YASM not supported on this platform + exit 1 + %(Identity) diff --git a/externals/vcpkg/ports/vs-yasm/portfile.cmake b/externals/vcpkg/ports/vs-yasm/portfile.cmake new file mode 100755 index 000000000..fc291c259 --- /dev/null +++ b/externals/vcpkg/ports/vs-yasm/portfile.cmake @@ -0,0 +1,17 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ShiftMediaProject/VSYASM + REF deb50d9f18e8461538468339d508cdf240e64897 #v0.5 + SHA512 04627546020d33e5ea91f74b09c5ce3b817dce5f6ae4548c3b4148daa82fbd837c81675ac8730d3ca1cdf91fefa8bb23eec76d1bcd02c03dda1203d0c261178d + HEAD_REF master + PATCHES + fix_paths.patch +) + +set(_files yasm.props yasm.targets yasm.xml) +foreach(_file ${_files}) + file(INSTALL "${SOURCE_PATH}/${_file}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +endforeach() + +configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/vs-yasm/vcpkg.json b/externals/vcpkg/ports/vs-yasm/vcpkg.json new file mode 100755 index 000000000..830838cc7 --- /dev/null +++ b/externals/vcpkg/ports/vs-yasm/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "vs-yasm", + "version-string": "0.5.0", + "port-version": 1, + "description": "Provides Visual Studio integration for the YASM assembler.", + "homepage": "https://github.com/ShiftMediaProject/VSYASM", + "supports": "windows & !arm" +} diff --git a/externals/vcpkg/ports/vtk-dicom/portfile.cmake b/externals/vcpkg/ports/vtk-dicom/portfile.cmake new file mode 100755 index 000000000..171a046a2 --- /dev/null +++ b/externals/vcpkg/ports/vtk-dicom/portfile.cmake @@ -0,0 +1,42 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO dgobbi/vtk-dicom + REF 5034c68450de857b70fbe4a4b9f8dddb62badef3 # v0.8.12 + SHA512 bad1ed6a4a412402a2cd69e5f85b2b73f1ee7ea46a6bbcac31c5f66d07ae006679ffbd9a3c70f9baa1b05b1af0a2d4ca0efc34ec0a85a92f5116b900e81635cd + HEAD_REF master + PATCHES std.patch # similar patch is already in master +) + +if ("gdcm" IN_LIST FEATURES) + set(USE_GDCM ON ) +else() + set(USE_GDCM OFF ) +endif() + + +if(USE_GDCM) + list(APPEND ADDITIONAL_OPTIONS + -DUSE_GDCM=ON + -DUSE_DCMTK=OFF + ) +endif() +vcpkg_find_acquire_program(PYTHON3) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_PROGRAMS=OFF + -DBUILD_EXAMPLES=OFF + "-DPython3_EXECUTABLE=${PYTHON3}" + ${ADDITIONAL_OPTIONS} +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/vtk-dicom/std.patch b/externals/vcpkg/ports/vtk-dicom/std.patch new file mode 100755 index 000000000..59160f089 --- /dev/null +++ b/externals/vcpkg/ports/vtk-dicom/std.patch @@ -0,0 +1,74 @@ +diff --git a/Source/vtkScancoCTReader.cxx b/Source/vtkScancoCTReader.cxx +index a71f2e46e..afe202ffc 100644 +--- a/Source/vtkScancoCTReader.cxx ++++ b/Source/vtkScancoCTReader.cxx +@@ -176,7 +176,7 @@ int vtkScancoCTReader::CheckVersion(const char header[16]) + //---------------------------------------------------------------------------- + int vtkScancoCTReader::CanReadFile(const char *filename) + { +- ifstream infile(filename, ios::in | ios::binary); ++ std::ifstream infile(filename, ios::in | ios::binary); + + bool canRead = false; + if (infile.good()) +@@ -409,7 +409,7 @@ void vtkScancoCTReader::StripString(char *dest, const char *cp, size_t l) + } + + //---------------------------------------------------------------------------- +-int vtkScancoCTReader::ReadISQHeader(ifstream *file, unsigned long bytesRead) ++int vtkScancoCTReader::ReadISQHeader(std::ifstream *file, unsigned long bytesRead) + { + if (bytesRead < 512) + { +@@ -620,7 +620,7 @@ int vtkScancoCTReader::ReadISQHeader(ifstream *file, unsigned long bytesRead) + } + + //---------------------------------------------------------------------------- +-int vtkScancoCTReader::ReadAIMHeader(ifstream *file, unsigned long bytesRead) ++int vtkScancoCTReader::ReadAIMHeader(std::ifstream *file, unsigned long bytesRead) + { + if (bytesRead < 160) + { +@@ -987,7 +987,7 @@ int vtkScancoCTReader::RequestInformation( + const char *ufilename = filename; + #endif + +- ifstream infile(ufilename, ios::in | ios::binary); ++ std::ifstream infile(ufilename, ios::in | ios::binary); + if (!infile.good()) + { + vtkErrorMacro("Cannot open file " << filename); +@@ -1115,7 +1115,7 @@ int vtkScancoCTReader::RequestData( + static_cast(data->GetScalarPointer()); + + // open the file +- ifstream infile(filename, ios::in | ios::binary); ++ std::ifstream infile(filename, ios::in | ios::binary); + if (!infile.good()) + { + vtkErrorMacro("Cannot open file " << filename); +diff --git a/Source/vtkScancoCTReader.h b/Source/vtkScancoCTReader.h +index ca31d7572..240d532f2 100644 +--- a/Source/vtkScancoCTReader.h ++++ b/Source/vtkScancoCTReader.h +@@ -34,6 +34,7 @@ + #ifndef vtkScancoCTReader_h + #define vtkScancoCTReader_h + ++#include + #include "vtkImageReader2.h" + #include "vtkDICOMModule.h" // For export macro + #include "vtkDICOMConfig.h" // For configuration details +@@ -185,10 +186,10 @@ protected: + void InitializeHeader(); + + //! Read an ISQ header. +- int ReadISQHeader(ifstream *file, unsigned long bytesRead); ++ int ReadISQHeader(std::ifstream *file, unsigned long bytesRead); + + //! Read AIM header. +- int ReadAIMHeader(ifstream *file, unsigned long bytesRead); ++ int ReadAIMHeader(std::ifstream *file, unsigned long bytesRead); + + //! Check the file header to see what type of file it is. + /*! diff --git a/externals/vcpkg/ports/vtk-dicom/vcpkg.json b/externals/vcpkg/ports/vtk-dicom/vcpkg.json new file mode 100755 index 000000000..097ecde74 --- /dev/null +++ b/externals/vcpkg/ports/vtk-dicom/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "vtk-dicom", + "version-string": "0.8.12", + "port-version": 2, + "description": "DICOM for VTK", + "homepage": "https://github.com/dgobbi/vtk-dicom", + "dependencies": [ + { + "name": "vtk", + "default-features": false + }, + "zlib" + ], + "features": { + "gdcm": { + "description": "Use gdcm for decompressing DICOM files.", + "dependencies": [ + "gdcm" + ] + } + } +} diff --git a/externals/vcpkg/ports/vtk-m/portfile.cmake b/externals/vcpkg/ports/vtk-m/portfile.cmake new file mode 100755 index 000000000..373aba8ba --- /dev/null +++ b/externals/vcpkg/ports/vtk-m/portfile.cmake @@ -0,0 +1,59 @@ +# VENDORED DEPENDENCIES! +# TODO: Should be replaced in the future with VCPKG internal versions +# add_subdirectory(thirdparty/diy) +# add_subdirectory(thirdparty/lodepng) +# if(VTKm_ENABLE_LOGGING) + # add_subdirectory(thirdparty/loguru) +# endif() +# add_subdirectory(thirdparty/optionparser) +# add_subdirectory(thirdparty/taotuple) +# add_subdirectory(thirdparty/lcl) + +vcpkg_check_features (OUT_FEATURE_OPTIONS OPTIONS + FEATURES + cuda VTKm_ENABLE_CUDA + omp VTKm_ENABLE_OPENMP + tbb VTKm_ENABLE_TBB + mpi VTKm_ENABLE_MPI + double VTKm_USE_DOUBLE_PRECISION + ) + +if("cuda" IN_LIST FEATURES AND NOT ENV{CUDACXX}) + set(ENV{CUDACXX} "$ENV{CUDA_PATH}/bin/nvcc") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + message(STATUS "Feature CUDA forces static build!") + endif() + set(VCPKG_LIBRARY_LINKAGE "static") # CUDA forces static build. +endif() + +list(APPEND OPTIONS -DVTKm_ENABLE_RENDERING=ON) +list(APPEND OPTIONS -DVTKm_ENABLE_DEVELOPER_FLAGS=OFF) +list(APPEND OPTIONS -DVTKm_ENABLE_CPACK=OFF) +list(APPEND OPTIONS -DVTKm_USE_DEFAULT_TYPES_FOR_VTK=ON) +# For port customizations on unix systems. +# Please feel free to make these port features if it makes any sense +#list(APPEND OPTIONS -DVTKm_ENABLE_GL_CONTEXT=ON) # or +#list(APPEND OPTIONS -DVTKm_ENABLE_EGL_CONTEXT=ON) # or +#list(APPEND OPTIONS -DVTKm_ENABLE_OSMESA_CONTEXT=ON) +list(APPEND OPTIONS -DBUILD_TESTING=OFF) + +vcpkg_from_gitlab(GITLAB_URL "https://gitlab.kitware.com" + OUT_SOURCE_PATH SOURCE_PATH + REPO vtk/vtk-m + REF 13a117e0e8935eef3f320b5a1cd71d9911ad9853 # v1.6.0 Version is strongly locked to VTK 9.0. Upgrading will most likly brake the VTK build + SHA512 54f7f52ab4ee7954b6a303ffd3b8bcb18105b5d2fd8ed54b4e487fce2ebfbc51507e632189f775c79eea22ad24bd56bca401ddd679fc03d787342dd33d2ba18b + FILE_DISAMBIGUATOR 1) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${OPTIONS} +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/vtkm-1.6 PACKAGE_NAME vtkm) + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/vtkm/VTKmConfig.cmake" [[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/lib/cmake/vtkm-1.6")]] [[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/share/vtkm")]]) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/vtkm/VTKmConfig.cmake" "${CURRENT_BUILDTREES_DIR}" "not/existing/buildtree") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/vtk-m/vcpkg.json b/externals/vcpkg/ports/vtk-m/vcpkg.json new file mode 100755 index 000000000..08ad663c1 --- /dev/null +++ b/externals/vcpkg/ports/vtk-m/vcpkg.json @@ -0,0 +1,44 @@ +{ + "name": "vtk-m", + "version-semver": "1.6.0", + "port-version": 2, + "description": "VTK-m is a toolkit of scientific visualization algorithms for emerging processor architectures.", + "homepage": "https://gitlab.kitware.com/vtk/vtk-m/", + "supports": "!x86 & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cuda": { + "description": "Use the NVIDIA CUDA device adapter.", + "dependencies": [ + "cuda" + ] + }, + "double": { + "description": "Use double precision in floating point calculations" + }, + "mpi": { + "description": "Use the MPI controller.", + "dependencies": [ + "mpi" + ] + }, + "omp": { + "description": "Use the OpenMP device adapter." + }, + "tbb": { + "description": "Use the Intel TBB device adapter.", + "dependencies": [ + "tbb" + ] + } + } +} diff --git a/externals/vcpkg/ports/vtk/156fb524.patch b/externals/vcpkg/ports/vtk/156fb524.patch new file mode 100755 index 000000000..716fd5c7e --- /dev/null +++ b/externals/vcpkg/ports/vtk/156fb524.patch @@ -0,0 +1,393 @@ +diff --git a/Accelerators/Vtkm/Filters/CMakeLists.txt b/Accelerators/Vtkm/Filters/CMakeLists.txt +index 14e84f1dd6e8b9da275045fe5d80868b2e52ad5a..3a41bc4d2bffca8c3df79da218443b90f8ceb7d3 100644 +--- a/Accelerators/Vtkm/Filters/CMakeLists.txt ++++ b/Accelerators/Vtkm/Filters/CMakeLists.txt +@@ -46,6 +46,10 @@ foreach (class IN LISTS impl_classes) + list(APPEND headers "${class}.h") + endforeach () + ++list(APPEND sources ++ "vtkmClipInstantiationsWithField.cxx" ++ "vtkmClipInstantiationsWithImplicitFunction.cxx") ++ + configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/vtkmConfigFilters.h.in" + "${CMAKE_CURRENT_BINARY_DIR}/vtkmConfigFilters.h" +diff --git a/Accelerators/Vtkm/Filters/vtkmClip.cxx b/Accelerators/Vtkm/Filters/vtkmClip.cxx +index 0b1dc86d3bedd425d4846f524818a68ada052ce9..65fec3110ebb6522900cbc965c5298031921e1e4 100644 +--- a/Accelerators/Vtkm/Filters/vtkmClip.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmClip.cxx +@@ -14,6 +14,7 @@ + =========================================================================*/ + + #include "vtkmClip.h" ++#include "vtkmClipInternals.h" + + #include "vtkCellIterator.h" + #include "vtkDataArray.h" +@@ -36,11 +37,9 @@ + + #include "vtkmFilterPolicy.h" + ++#include + #include + +-#include +-#include +- + #include + + vtkStandardNewMacro(vtkmClip); +@@ -50,19 +49,17 @@ void vtkmClip::PrintSelf(std::ostream& os, vtkIndent indent) + { + this->Superclass::PrintSelf(os, indent); + +- os << indent << "ClipValue: " << this->ClipValue << "\n"; ++ os << indent << "ClipValue: " << this->GetClipValue() << "\n"; + os << indent << "ClipFunction: \n"; +- this->ClipFunction->PrintSelf(os, indent.GetNextIndent()); +- os << indent << "ComputeScalars: " << this->ComputeScalars << "\n"; ++ this->GetClipFunction()->PrintSelf(os, indent.GetNextIndent()); ++ os << indent << "ComputeScalars: " << this->GetComputeScalars() << "\n"; + } + + //------------------------------------------------------------------------------ + vtkmClip::vtkmClip() +- : ClipValue(0.) +- , ComputeScalars(true) +- , ClipFunction(nullptr) +- , ClipFunctionConverter(new tovtkm::ImplicitFunctionConverter) ++ : Internals(new vtkmClip::internals) + { ++ this->Internals->ClipFunctionConverter.reset(new tovtkm::ImplicitFunctionConverter()); + // Clip active point scalars by default + this->SetInputArrayToProcess( + 0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS, vtkDataSetAttributes::SCALARS); +@@ -75,24 +72,54 @@ vtkmClip::~vtkmClip() = default; + vtkMTimeType vtkmClip::GetMTime() + { + vtkMTimeType mTime = this->Superclass::GetMTime(); +- if (this->ClipFunction) ++ if (this->GetClipFunction()) + { +- mTime = std::max(mTime, this->ClipFunction->GetMTime()); ++ mTime = std::max(mTime, this->GetClipFunction()->GetMTime()); + } + return mTime; + } + ++//------------------------------------------------------------------------------ ++double vtkmClip::GetClipValue() ++{ ++ return this->Internals->ClipValue; ++} ++ ++//------------------------------------------------------------------------------ ++void vtkmClip::SetClipValue(double val) ++{ ++ this->Internals->ClipValue = val; ++} ++ ++//------------------------------------------------------------------------------ ++bool vtkmClip::GetComputeScalars() ++{ ++ return this->Internals->ComputeScalars; ++} ++ ++//------------------------------------------------------------------------------ ++void vtkmClip::SetComputeScalars(bool val) ++{ ++ this->Internals->ComputeScalars = val; ++} ++ + //------------------------------------------------------------------------------ + void vtkmClip::SetClipFunction(vtkImplicitFunction* clipFunction) + { +- if (this->ClipFunction != clipFunction) ++ if (this->GetClipFunction() != clipFunction) + { +- this->ClipFunction = clipFunction; +- this->ClipFunctionConverter->Set(clipFunction); ++ this->Internals->ClipFunction = clipFunction; ++ this->Internals->ClipFunctionConverter->Set(clipFunction); + this->Modified(); + } + } + ++//------------------------------------------------------------------------------ ++vtkImplicitFunction* vtkmClip::GetClipFunction() ++{ ++ return this->Internals->ClipFunction; ++} ++ + //------------------------------------------------------------------------------ + int vtkmClip::RequestData( + vtkInformation*, vtkInformationVector** inInfoVec, vtkInformationVector* outInfoVec) +@@ -111,7 +138,7 @@ int vtkmClip::RequestData( + // Find the scalar array: + int assoc = this->GetInputArrayAssociation(0, inInfoVec); + vtkDataArray* scalars = this->GetInputArrayToProcess(0, inInfoVec); +- if (!this->ClipFunction && ++ if (!this->GetClipFunction() && + (assoc != vtkDataObject::FIELD_ASSOCIATION_POINTS || scalars == nullptr || + scalars->GetName() == nullptr || scalars->GetName()[0] == '\0')) + { +@@ -129,37 +156,18 @@ int vtkmClip::RequestData( + { + // Convert inputs to vtkm objects: + auto fieldsFlag = +- this->ComputeScalars ? tovtkm::FieldsFlag::PointsAndCells : tovtkm::FieldsFlag::None; ++ this->GetComputeScalars() ? tovtkm::FieldsFlag::PointsAndCells : tovtkm::FieldsFlag::None; + auto in = tovtkm::Convert(input, fieldsFlag); + + // Run filter: + vtkm::cont::DataSet result; +- if (this->ClipFunction) ++ if (this->GetClipFunction()) + { +- vtkm::filter::ClipWithImplicitFunction functionFilter; +- auto function = this->ClipFunctionConverter->Get(); +- if (function.GetValid()) +- { +- functionFilter.SetImplicitFunction(function); +- result = functionFilter.Execute(in); +- } ++ result = this->Internals->ExecuteClipWithImplicitFunction(in); + } + else + { +- vtkm::filter::ClipWithField fieldFilter; +- if (!this->ComputeScalars) +- { +- // explicitly convert just the field we need +- auto inField = tovtkm::Convert(scalars, assoc); +- in.AddField(inField); +- // don't pass this field +- fieldFilter.SetFieldsToPass( +- vtkm::filter::FieldSelection(vtkm::filter::FieldSelection::MODE_NONE)); +- } +- +- fieldFilter.SetActiveField(scalars->GetName(), vtkm::cont::Field::Association::POINTS); +- fieldFilter.SetClipValue(this->ClipValue); +- result = fieldFilter.Execute(in); ++ result = this->Internals->ExecuteClipWithField(in, scalars, assoc); + } + + // Convert result to output: +@@ -169,7 +177,7 @@ int vtkmClip::RequestData( + return 0; + } + +- if (!this->ClipFunction && this->ComputeScalars) ++ if (!this->GetClipFunction() && this->GetComputeScalars()) + { + output->GetPointData()->SetActiveScalars(scalars->GetName()); + } +@@ -189,8 +197,8 @@ int vtkmClip::RequestData( + << "Falling back to serial implementation."); + + vtkNew filter; +- filter->SetClipFunction(this->ClipFunction); +- filter->SetValue(this->ClipValue); ++ filter->SetClipFunction(this->GetClipFunction()); ++ filter->SetValue(this->GetClipValue()); + filter->SetInputData(input); + filter->Update(); + output->ShallowCopy(filter->GetOutput()); +diff --git a/Accelerators/Vtkm/Filters/vtkmClip.h b/Accelerators/Vtkm/Filters/vtkmClip.h +index edb3cebfadc9ebeddf3c5030716ba532c0e149fe..6f33d36460d72de340eb81bb321ee868d70e6b5b 100644 +--- a/Accelerators/Vtkm/Filters/vtkmClip.h ++++ b/Accelerators/Vtkm/Filters/vtkmClip.h +@@ -32,13 +32,6 @@ + + class vtkImplicitFunction; + +-namespace tovtkm +-{ +- +-class ImplicitFunctionConverter; +- +-} // namespace tovtkm +- + class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmClip : public vtkUnstructuredGridAlgorithm + { + public: +@@ -50,15 +43,15 @@ public: + * The scalar value to use when clipping the dataset. Values greater than + * ClipValue are preserved in the output dataset. Default is 0. + */ +- vtkGetMacro(ClipValue, double); +- vtkSetMacro(ClipValue, double); ++ double GetClipValue(); ++ void SetClipValue(double); + + /** + * If true, all input point data arrays will be mapped onto the output + * dataset. Default is true. + */ +- vtkGetMacro(ComputeScalars, bool); +- vtkSetMacro(ComputeScalars, bool); ++ bool GetComputeScalars(); ++ void SetComputeScalars(bool); + + /** + * Set the implicit function with which to perform the clipping. If set, +@@ -66,7 +59,7 @@ public: + * function. + */ + void SetClipFunction(vtkImplicitFunction*); +- vtkGetObjectMacro(ClipFunction, vtkImplicitFunction); ++ vtkImplicitFunction* GetClipFunction(); + + vtkMTimeType GetMTime() override; + +@@ -87,17 +80,13 @@ protected: + ~vtkmClip() override; + + int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; +- + int FillInputPortInformation(int port, vtkInformation* info) override; + +- double ClipValue; +- bool ComputeScalars; +- +- vtkImplicitFunction* ClipFunction; +- std::unique_ptr ClipFunctionConverter; +- + vtkTypeBool ForceVTKm = false; + ++ struct internals; ++ std::unique_ptr Internals; ++ + private: + vtkmClip(const vtkmClip&) = delete; + void operator=(const vtkmClip&) = delete; +diff --git a/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithField.cxx b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithField.cxx +new file mode 100644 +index 0000000000000000000000000000000000000000..e81b5cdab62a436ef09afac33ffa0599cb9dd2a8 +--- /dev/null ++++ b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithField.cxx +@@ -0,0 +1,39 @@ ++/*========================================================================= ++ ++ Program: Visualization Toolkit ++ Module: vtkmClipInstantiationsWithField.cxx ++ ++ Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen ++ All rights reserved. ++ See Copyright.txt or http://www.kitware.com/Copyright.htm for details. ++ ++ This software is distributed WITHOUT ANY WARRANTY; without even ++ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ++ PURPOSE. See the above copyright notice for more information. ++ ++=========================================================================*/ ++ ++#include "vtkmClipInternals.h" ++#include "vtkmlib/DataSetConverters.h" ++ ++#include ++ ++//------------------------------------------------------------------------------ ++vtkm::cont::DataSet vtkmClip::internals::ExecuteClipWithField( ++ vtkm::cont::DataSet& in, vtkDataArray* scalars, int assoc) ++{ ++ vtkm::filter::ClipWithField fieldFilter; ++ if (!this->ComputeScalars) ++ { ++ // explicitly convert just the field we need ++ auto inField = tovtkm::Convert(scalars, assoc); ++ in.AddField(inField); ++ // don't pass this field ++ fieldFilter.SetFieldsToPass( ++ vtkm::filter::FieldSelection(vtkm::filter::FieldSelection::MODE_NONE)); ++ } ++ ++ fieldFilter.SetActiveField(scalars->GetName(), vtkm::cont::Field::Association::POINTS); ++ fieldFilter.SetClipValue(this->ClipValue); ++ return fieldFilter.Execute(in); ++} +diff --git a/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx +new file mode 100644 +index 0000000000000000000000000000000000000000..04a637a92d487b019742bbf81884750c48ba105d +--- /dev/null ++++ b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx +@@ -0,0 +1,35 @@ ++/*========================================================================= ++ ++ Program: Visualization Toolkit ++ Module: vtkmClipInstantiationsWithImplicitFunction.cxx ++ ++ Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen ++ All rights reserved. ++ See Copyright.txt or http://www.kitware.com/Copyright.htm for details. ++ ++ This software is distributed WITHOUT ANY WARRANTY; without even ++ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ++ PURPOSE. See the above copyright notice for more information. ++ ++=========================================================================*/ ++ ++#include "vtkmClipInternals.h" ++#include "vtkmlib/DataSetConverters.h" ++ ++#include ++ ++//------------------------------------------------------------------------------ ++vtkm::cont::DataSet vtkmClip::internals::ExecuteClipWithImplicitFunction(vtkm::cont::DataSet& in) ++{ ++ auto function = this->ClipFunctionConverter->Get(); ++ ++ vtkm::cont::DataSet result; ++ if (function.GetValid()) ++ { ++ vtkm::filter::ClipWithImplicitFunction functionFilter; ++ functionFilter.SetImplicitFunction(function); ++ result = functionFilter.Execute(in); ++ } ++ ++ return result; ++} +diff --git a/Accelerators/Vtkm/Filters/vtkmClipInternals.h b/Accelerators/Vtkm/Filters/vtkmClipInternals.h +new file mode 100644 +index 0000000000000000000000000000000000000000..5384347bf9d48f04f5d2847753c92b64fc82346e +--- /dev/null ++++ b/Accelerators/Vtkm/Filters/vtkmClipInternals.h +@@ -0,0 +1,37 @@ ++/*========================================================================= ++ ++ Program: Visualization Toolkit ++ Module: vtkmClipInternals.h ++ ++ Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen ++ All rights reserved. ++ See Copyright.txt or http://www.kitware.com/Copyright.htm for details. ++ ++ This software is distributed WITHOUT ANY WARRANTY; without even ++ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ++ PURPOSE. See the above copyright notice for more information. ++ ++=========================================================================*/ ++ ++#ifndef vtkmClipInternals_h ++#define vtkmClipInternals_h ++ ++#include "vtkDataArray.h" ++#include "vtkmClip.h" ++#include "vtkmlib/ImplicitFunctionConverter.h" ++ ++#include ++ ++struct vtkmClip::internals ++{ ++ double ClipValue = .0; ++ bool ComputeScalars = true; ++ ++ vtkImplicitFunction* ClipFunction = nullptr; ++ std::unique_ptr ClipFunctionConverter; ++ ++ vtkm::cont::DataSet ExecuteClipWithImplicitFunction(vtkm::cont::DataSet&); ++ vtkm::cont::DataSet ExecuteClipWithField(vtkm::cont::DataSet&, vtkDataArray*, int); ++}; ++ ++#endif diff --git a/externals/vcpkg/ports/vtk/1f00a0c9.patch b/externals/vcpkg/ports/vtk/1f00a0c9.patch new file mode 100755 index 000000000..4cd8f1963 --- /dev/null +++ b/externals/vcpkg/ports/vtk/1f00a0c9.patch @@ -0,0 +1,185 @@ +diff --git a/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx b/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx +index da8f2e6498c2a08165500fc458eb3c9c7dc0b7e6..147c3c6e175dbd342095805750bfc4fee81735dc 100644 +--- a/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx ++++ b/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx +@@ -265,7 +265,7 @@ vtkIdType vtkmDataSet::FindPoint(double x[3]) + std::lock_guard lock(locator.lock); + if (locator.buildTime < this->GetMTime()) + { +- locator.control.reset(new vtkm::cont::PointLocatorUniformGrid); ++ locator.control.reset(new vtkm::cont::PointLocatorSparseGrid); + locator.control->SetCoordinates(this->Internals->Coordinates); + locator.control->Update(); + locator.buildTime = this->GetMTime(); +diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.cxx b/Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.cxx +index f311f90e17814a05d082a0df67108f242018bb69..7ecfa50e4aa9922987fd33f7b29eb1bf4be3577a 100644 +--- a/Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.cxx ++++ b/Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.cxx +@@ -240,11 +240,11 @@ bool Convert(const vtkm::cont::DataSet& vtkmOut, vtkRectilinearGrid* output, vtk + auto coordsArray = vtkm::cont::Cast(vtkmOut.GetCoordinateSystem().GetData()); + + vtkSmartPointer xArray = +- Convert(vtkm::cont::make_FieldPoint("xArray", coordsArray.GetStorage().GetFirstArray())); ++ Convert(vtkm::cont::make_FieldPoint("xArray", coordsArray.GetFirstArray())); + vtkSmartPointer yArray = +- Convert(vtkm::cont::make_FieldPoint("yArray", coordsArray.GetStorage().GetSecondArray())); ++ Convert(vtkm::cont::make_FieldPoint("yArray", coordsArray.GetSecondArray())); + vtkSmartPointer zArray = +- Convert(vtkm::cont::make_FieldPoint("zArray", coordsArray.GetStorage().GetThirdArray())); ++ Convert(vtkm::cont::make_FieldPoint("zArray", coordsArray.GetThirdArray())); + + if (!xArray || !yArray || !zArray) + { +diff --git a/Accelerators/Vtkm/Filters/vtkmAverageToCells.cxx b/Accelerators/Vtkm/Filters/vtkmAverageToCells.cxx +index 334ec1219dd269e323ae11e61a5a68e9e6e3d2e7..ed9d58fe91713a12e7b2588471275e694f71f618 100644 +--- a/Accelerators/Vtkm/Filters/vtkmAverageToCells.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmAverageToCells.cxx +@@ -27,7 +27,6 @@ + #include "vtkmFilterPolicy.h" + + #include +-#include + + vtkStandardNewMacro(vtkmAverageToCells); + +diff --git a/Accelerators/Vtkm/Filters/vtkmAverageToPoints.cxx b/Accelerators/Vtkm/Filters/vtkmAverageToPoints.cxx +index 1003f88c4d4e1dcf0be24b7f9f4e6d58e4e735f0..00c722f3162ebb042fb3973bb28a3c1c2fb48c45 100644 +--- a/Accelerators/Vtkm/Filters/vtkmAverageToPoints.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmAverageToPoints.cxx +@@ -28,7 +28,6 @@ + #include "vtkmFilterPolicy.h" + + #include +-#include + + vtkStandardNewMacro(vtkmAverageToPoints); + +diff --git a/Accelerators/Vtkm/Filters/vtkmCleanGrid.cxx b/Accelerators/Vtkm/Filters/vtkmCleanGrid.cxx +index 98f0fdb70a296a8dd97df56f706f11e0aca20f32..0cfde7e99f8f07289b08310675ee16f438bc61be 100644 +--- a/Accelerators/Vtkm/Filters/vtkmCleanGrid.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmCleanGrid.cxx +@@ -30,7 +30,6 @@ + #include "vtkmFilterPolicy.h" + + #include +-#include + + vtkStandardNewMacro(vtkmCleanGrid); + +diff --git a/Accelerators/Vtkm/Filters/vtkmClip.cxx b/Accelerators/Vtkm/Filters/vtkmClip.cxx +index 2649b2da024310f58159574758d278318e23f4b9..0b1dc86d3bedd425d4846f524818a68ada052ce9 100644 +--- a/Accelerators/Vtkm/Filters/vtkmClip.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmClip.cxx +@@ -39,9 +39,7 @@ + #include + + #include +-#include + #include +-#include + + #include + +diff --git a/Accelerators/Vtkm/Filters/vtkmContour.cxx b/Accelerators/Vtkm/Filters/vtkmContour.cxx +index c9d35a544641a629ee4fb4f54c4d8245be8e6fd5..eae3a03398ffeef8b0f8ec449f89163f8c275122 100644 +--- a/Accelerators/Vtkm/Filters/vtkmContour.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmContour.cxx +@@ -33,7 +33,6 @@ + + #include + #include +-#include + + vtkStandardNewMacro(vtkmContour); + +diff --git a/Accelerators/Vtkm/Filters/vtkmExternalFaces.cxx b/Accelerators/Vtkm/Filters/vtkmExternalFaces.cxx +index 58969b5707aab56e6fcd6300ca650c9b2d88e32f..3661060164d738eb9055316fd6c0b023b09ef72f 100644 +--- a/Accelerators/Vtkm/Filters/vtkmExternalFaces.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmExternalFaces.cxx +@@ -33,7 +33,6 @@ + #include "vtkmFilterPolicy.h" + + #include +-#include + + vtkStandardNewMacro(vtkmExternalFaces); + +diff --git a/Accelerators/Vtkm/Filters/vtkmExtractVOI.cxx b/Accelerators/Vtkm/Filters/vtkmExtractVOI.cxx +index 3606f28de2229436afbcb8b0cf3ed61430055b8e..32bf94f630931a0d052cf5880d950df4588046cb 100644 +--- a/Accelerators/Vtkm/Filters/vtkmExtractVOI.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmExtractVOI.cxx +@@ -27,7 +27,6 @@ + #include "vtkmFilterPolicy.h" + + #include "vtkm/filter/ExtractStructured.h" +-#include "vtkm/filter/ExtractStructured.hxx" + + vtkStandardNewMacro(vtkmExtractVOI); + +diff --git a/Accelerators/Vtkm/Filters/vtkmGradient.cxx b/Accelerators/Vtkm/Filters/vtkmGradient.cxx +index 9b79c9e5a5e434ae810df73b51bc6bf52cefa829..6aa284878c88e2fcaf243f6721477536891f002f 100644 +--- a/Accelerators/Vtkm/Filters/vtkmGradient.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmGradient.cxx +@@ -31,7 +31,6 @@ + + #include + #include +-#include + + vtkStandardNewMacro(vtkmGradient); + +diff --git a/Accelerators/Vtkm/Filters/vtkmHistogram.cxx b/Accelerators/Vtkm/Filters/vtkmHistogram.cxx +index ed09a73d938997fe0dab1ae7eb4338f4914bad15..c13fd742477686e2dd51e95c4757628630788a77 100644 +--- a/Accelerators/Vtkm/Filters/vtkmHistogram.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmHistogram.cxx +@@ -32,7 +32,6 @@ + #include "vtkSmartPointer.h" + + #include "vtkmFilterPolicy.h" +-#include + #include + + vtkStandardNewMacro(vtkmHistogram); +diff --git a/Accelerators/Vtkm/Filters/vtkmLevelOfDetail.cxx b/Accelerators/Vtkm/Filters/vtkmLevelOfDetail.cxx +index 04ccdce35f14b708c111302c759b5d328225cdef..db8d3f64b5e9b96f9b3e491f044056b14ae1bcdd 100644 +--- a/Accelerators/Vtkm/Filters/vtkmLevelOfDetail.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmLevelOfDetail.cxx +@@ -33,7 +33,6 @@ + #include + // To handle computing custom coordinate sets bounds we need to include + // the following +-#include + + vtkStandardNewMacro(vtkmLevelOfDetail); + +diff --git a/Accelerators/Vtkm/Filters/vtkmPointTransform.cxx b/Accelerators/Vtkm/Filters/vtkmPointTransform.cxx +index 9906573f18312cb803e5ab2bce30218e4f95772c..685fb618764fc62969b5373cd922aaea7d1311e3 100644 +--- a/Accelerators/Vtkm/Filters/vtkmPointTransform.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmPointTransform.cxx +@@ -33,7 +33,6 @@ + + #include "vtkm/cont/Error.h" + #include "vtkm/filter/PointTransform.h" +-#include "vtkm/filter/PointTransform.hxx" + + #include "vtkmFilterPolicy.h" + +diff --git a/Accelerators/Vtkm/Filters/vtkmThreshold.cxx b/Accelerators/Vtkm/Filters/vtkmThreshold.cxx +index 7604acd333978a72b1e34584d14640e097b34292..647514050c42771cda57b439280d238de72911e2 100644 +--- a/Accelerators/Vtkm/Filters/vtkmThreshold.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmThreshold.cxx +@@ -31,7 +31,6 @@ + #include "vtkmFilterPolicy.h" + + #include +-#include + + vtkStandardNewMacro(vtkmThreshold); + +diff --git a/ThirdParty/vtkm/vtkvtkm/vtk-m b/ThirdParty/vtkm/vtkvtkm/vtk-m +index 0457427ed7b4d21e1a8e33e96713414ca11a42fc..ff7de5a72e917eac39f9a3c3a0002da5fa26c3f7 160000 +--- a/ThirdParty/vtkm/vtkvtkm/vtk-m ++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m +@@ -1 +1 @@ +-Subproject commit 0457427ed7b4d21e1a8e33e96713414ca11a42fc ++Subproject commit ff7de5a72e917eac39f9a3c3a0002da5fa26c3f7 diff --git a/externals/vcpkg/ports/vtk/FindExpat.patch b/externals/vcpkg/ports/vtk/FindExpat.patch new file mode 100755 index 000000000..a9fdc46bd --- /dev/null +++ b/externals/vcpkg/ports/vtk/FindExpat.patch @@ -0,0 +1,48 @@ +diff --git a/CMake/FindEXPAT.cmake b/CMake/FindEXPAT.cmake +index 45d923764..0ebcd3c83 100644 +--- a/CMake/FindEXPAT.cmake ++++ b/CMake/FindEXPAT.cmake +@@ -73,15 +73,37 @@ if(EXPAT_FOUND) + + if(NOT TARGET EXPAT::EXPAT) + include(vtkDetectLibraryType) +- vtk_detect_library_type(expat_library_type +- PATH "${EXPAT_LIBRARY}") ++ if(EXPAT_LIBRARY_RELEASE) ++ vtk_detect_library_type(expat_library_type ++ PATH "${EXPAT_LIBRARY_RELEASE}") ++ elseif(EXPAT_LIBRARY_DEBUG) ++ vtk_detect_library_type(expat_library_type ++ PATH "${EXPAT_LIBRARY_RELEASE}") ++ else() ++ vtk_detect_library_type(expat_library_type ++ PATH "${EXPAT_LIBRARY}") ++ endif() ++ + add_library(EXPAT::EXPAT "${expat_library_type}" IMPORTED) + unset(expat_library_type) + set_target_properties(EXPAT::EXPAT PROPERTIES +- IMPORTED_LINK_INTERFACE_LANGUAGES "C" +- IMPORTED_LOCATION "${EXPAT_LIBRARY}" +- IMPORTED_IMPLIB "${EXPAT_LIBRARY}" +- INTERFACE_INCLUDE_DIRECTORIES "${EXPAT_INCLUDE_DIRS}") ++ IMPORTED_LINK_INTERFACE_LANGUAGES "C" ++ INTERFACE_INCLUDE_DIRECTORIES "${EXPAT_INCLUDE_DIRS}") ++ if(EXPAT_LIBRARY_RELEASE) ++ set_target_properties(EXPAT::EXPAT PROPERTIES ++ IMPORTED_LOCATION_RELEASE "${EXPAT_LIBRARY_RELEASE}" ++ IMPORTED_IMPLIB_RELEASE "${EXPAT_LIBRARY_RELEASE}") ++ endif() ++ if(EXPAT_LIBRARY_DEBUG) ++ set_target_properties(EXPAT::EXPAT PROPERTIES ++ IMPORTED_LOCATION_DEBUG "${EXPAT_LIBRARY_DEBUG}" ++ IMPORTED_IMPLIB_DEBUG "${EXPAT_LIBRARY_DEBUG}") ++ endif() ++ if(EXPAT_LIBRARY_RELEASE OR EXPAT_LIBRARY_DEBUG AND NOT (EXPAT_LIBRARY_RELEASE AND EXPAT_LIBRARY_DEBUG)) ++ set_target_properties(EXPAT::EXPAT PROPERTIES ++ IMPORTED_LOCATION "${EXPAT_LIBRARY}" ++ IMPORTED_IMPLIB "${EXPAT_LIBRARY}") ++ endif() + endif() + endif() + diff --git a/externals/vcpkg/ports/vtk/FindHDF5.cmake b/externals/vcpkg/ports/vtk/FindHDF5.cmake new file mode 100755 index 000000000..27d8a8c74 --- /dev/null +++ b/externals/vcpkg/ports/vtk/FindHDF5.cmake @@ -0,0 +1,30 @@ +find_package(hdf5 QUIET NO_MODULE) +if(TARGET hdf5::hdf5-shared) + set_target_properties(hdf5::hdf5-shared PROPERTIES IMPORTED_GLOBAL TRUE) + if(NOT TARGET hdf5::hdf5) + add_library(hdf5::hdf5 ALIAS hdf5::hdf5-shared) + endif() +elseif(TARGET hdf5::hdf5-static) + set_target_properties(hdf5::hdf5-static PROPERTIES IMPORTED_GLOBAL TRUE) + if(NOT TARGET hdf5::hdf5) + add_library(hdf5::hdf5 ALIAS hdf5::hdf5-static) + endif() +else() + message(FATAL_ERROR "HDF5 target not found") +endif() +if(TARGET hdf5::hdf5_hl-shared) + set_target_properties(hdf5::hdf5_hl-shared PROPERTIES IMPORTED_GLOBAL TRUE) + if(NOT TARGET hdf5::hdf5_hl) + add_library(hdf5::hdf5_hl ALIAS hdf5::hdf5_hl-shared) + endif() +elseif(TARGET hdf5::hdf5_hl-static) + set_target_properties(hdf5::hdf5_hl-static PROPERTIES IMPORTED_GLOBAL TRUE) + if(NOT TARGET hdf5::hdf5_hl) + add_library(hdf5::hdf5_hl ALIAS hdf5::hdf5_hl-static) + endif() +else() + message(FATAL_ERROR "HDF5 HL target not found") +endif() +set(HDF5_IS_PARALLEL ${HDF5_ENABLE_PARALLEL} CACHE BOOL "" FORCE) +set(HDF5_FOUND ON CACHE BOOL "" FORCE) +set(hdf5_FOUND ON CACHE BOOL "" FORCE) diff --git a/externals/vcpkg/ports/vtk/FindLZ4.patch b/externals/vcpkg/ports/vtk/FindLZ4.patch new file mode 100755 index 000000000..635d0261b --- /dev/null +++ b/externals/vcpkg/ports/vtk/FindLZ4.patch @@ -0,0 +1,49 @@ +diff --git a/CMake/FindLZ4.cmake b/CMake/FindLZ4.cmake +index 8c94e3bcd..ade3f9451 100644 +--- a/CMake/FindLZ4.cmake ++++ b/CMake/FindLZ4.cmake +@@ -1,38 +1,5 @@ +-find_path(LZ4_INCLUDE_DIR +- NAMES lz4.h +- DOC "lz4 include directory") +-mark_as_advanced(LZ4_INCLUDE_DIR) +-find_library(LZ4_LIBRARY +- NAMES lz4 liblz4 +- DOC "lz4 library") +-mark_as_advanced(LZ4_LIBRARY) +- +-if (LZ4_INCLUDE_DIR) +- file(STRINGS "${LZ4_INCLUDE_DIR}/lz4.h" _lz4_version_lines +- REGEX "#define[ \t]+LZ4_VERSION_(MAJOR|MINOR|RELEASE)") +- string(REGEX REPLACE ".*LZ4_VERSION_MAJOR *\([0-9]*\).*" "\\1" _lz4_version_major "${_lz4_version_lines}") +- string(REGEX REPLACE ".*LZ4_VERSION_MINOR *\([0-9]*\).*" "\\1" _lz4_version_minor "${_lz4_version_lines}") +- string(REGEX REPLACE ".*LZ4_VERSION_RELEASE *\([0-9]*\).*" "\\1" _lz4_version_release "${_lz4_version_lines}") +- set(LZ4_VERSION "${_lz4_version_major}.${_lz4_version_minor}.${_lz4_version_release}") +- unset(_lz4_version_major) +- unset(_lz4_version_minor) +- unset(_lz4_version_release) +- unset(_lz4_version_lines) +-endif () +- +-include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args(LZ4 +- REQUIRED_VARS LZ4_LIBRARY LZ4_INCLUDE_DIR +- VERSION_VAR LZ4_VERSION) +- +-if (LZ4_FOUND) +- set(LZ4_INCLUDE_DIRS "${LZ4_INCLUDE_DIR}") +- set(LZ4_LIBRARIES "${LZ4_LIBRARY}") +- +- if (NOT TARGET LZ4::LZ4) +- add_library(LZ4::LZ4 UNKNOWN IMPORTED) +- set_target_properties(LZ4::LZ4 PROPERTIES +- IMPORTED_LOCATION "${LZ4_LIBRARY}" +- INTERFACE_INCLUDE_DIRECTORIES "${LZ4_INCLUDE_DIR}") +- endif () +-endif () ++find_package(LZ4 CONFIG REQUIRED) ++if(NOT TARGET LZ4::LZ4) ++ add_library(LZ4::LZ4 INTERFACE IMPORTED) ++ target_link_libraries(LZ4::LZ4 INTERFACE lz4::lz4) ++endif() +\ No newline at end of file diff --git a/externals/vcpkg/ports/vtk/FindLZMA.patch b/externals/vcpkg/ports/vtk/FindLZMA.patch new file mode 100755 index 000000000..990f2b2ae --- /dev/null +++ b/externals/vcpkg/ports/vtk/FindLZMA.patch @@ -0,0 +1,16 @@ +diff --git a/CMake/FindLZMA.cmake b/CMake/FindLZMA.cmake +index 0c8c794..796558c 100644 +--- a/CMake/FindLZMA.cmake ++++ b/CMake/FindLZMA.cmake +@@ -1,3 +1,11 @@ ++find_package(LibLZMA) ++set(LZMA_INCLUDE_DIR "${LIBLZMA_INCLUDE_DIR}" CACHE INTERNAL "") ++set(LZMA_LIBRARY "${LIBLZMA_LIBRARIES}" CACHE INTERNAL "") ++if(NOT TARGET LZMA::LZMA) ++ add_library(LZMA::LZMA INTERFACE IMPORTED) ++ target_link_libraries(LZMA::LZMA INTERFACE LibLZMA::LibLZMA) ++endif() ++ + find_path(LZMA_INCLUDE_DIR + NAMES lzma.h + DOC "lzma include directory") diff --git a/externals/vcpkg/ports/vtk/Findproj.patch b/externals/vcpkg/ports/vtk/Findproj.patch new file mode 100755 index 000000000..d83b0f451 --- /dev/null +++ b/externals/vcpkg/ports/vtk/Findproj.patch @@ -0,0 +1,13 @@ +diff --git a/CMake/FindLibPROJ.cmake b/CMake/FindLibPROJ.cmake +index e2344bb17..bac4c747e 100644 +--- a/CMake/FindLibPROJ.cmake ++++ b/CMake/FindLibPROJ.cmake +@@ -9,7 +9,7 @@ find_library(LibPROJ_LIBRARY_RELEASE + mark_as_advanced(LibPROJ_LIBRARY_RELEASE) + + find_library(LibPROJ_LIBRARY_DEBUG +- NAMES projd ++ NAMES projd proj_d proj NAMES_PER_DIR + DOC "libproj debug library") + mark_as_advanced(LibPROJ_LIBRARY_DEBUG) + diff --git a/externals/vcpkg/ports/vtk/NoUndefDebug.patch b/externals/vcpkg/ports/vtk/NoUndefDebug.patch new file mode 100755 index 000000000..a7bb750e7 --- /dev/null +++ b/externals/vcpkg/ports/vtk/NoUndefDebug.patch @@ -0,0 +1,13 @@ +diff --git a/Utilities/Python/vtkPython.h b/Utilities/Python/vtkPython.h +index 166f24104..79ae1d371 100644 +--- a/Utilities/Python/vtkPython.h ++++ b/Utilities/Python/vtkPython.h +@@ -53,7 +53,7 @@ + #include + #include + #include +-#undef _DEBUG ++ + #if defined(_MSC_VER) + #define _CRT_NOFORCE_MANIFEST 1 + #endif diff --git a/externals/vcpkg/ports/vtk/UseProj5Api.patch b/externals/vcpkg/ports/vtk/UseProj5Api.patch new file mode 100755 index 000000000..7ee7adae3 --- /dev/null +++ b/externals/vcpkg/ports/vtk/UseProj5Api.patch @@ -0,0 +1,149 @@ +From 0325638832e35c8c8c6fc96e2c1d887aeea3dd43 Mon Sep 17 00:00:00 2001 +From: Julien Schueller +Date: Mon, 8 Mar 2021 10:57:46 +0100 +Subject: [PATCH] Geovis: Use proj>=5 api + +Closes #18130 +--- + Geovis/Core/vtkGeoProjection.cxx | 17 ++++++++++++++++- + Geovis/Core/vtkGeoTransform.cxx | 28 ++++++++++++++-------------- + ThirdParty/libproj/vtk_libproj.h.in | 7 +------ + 3 files changed, 31 insertions(+), 21 deletions(-) + +diff --git a/Geovis/Core/vtkGeoProjection.cxx b/Geovis/Core/vtkGeoProjection.cxx +index 7ff6526a5d..0a0d06eba1 100644 +--- a/Geovis/Core/vtkGeoProjection.cxx ++++ b/Geovis/Core/vtkGeoProjection.cxx +@@ -121,7 +121,11 @@ vtkGeoProjection::~vtkGeoProjection() + this->SetPROJ4String(nullptr); + if (this->Projection) + { ++#if PROJ_VERSION_MAJOR >= 5 ++ proj_destroy(this->Projection); ++#else + pj_free(this->Projection); ++#endif + } + delete this->Internals; + this->Internals = nullptr; +@@ -185,13 +189,21 @@ int vtkGeoProjection::UpdateProjection() + + if (this->Projection) + { ++#if PROJ_VERSION_MAJOR >= 5 ++ proj_destroy(this->Projection); ++#else + pj_free(this->Projection); ++#endif + this->Projection = nullptr; + } + + if (this->PROJ4String && strlen(this->PROJ4String)) + { ++#if PROJ_VERSION_MAJOR >= 5 ++ this->Projection = proj_create(PJ_DEFAULT_CTX, this->PROJ4String); ++#else + this->Projection = pj_init_plus(this->PROJ4String); ++#endif + if (!this->Projection) + { + vtkErrorMacro("Cannot set projection with string " << this->PROJ4String); +@@ -234,8 +246,11 @@ int vtkGeoProjection::UpdateProjection() + stringHolder[i] = param.str(); + pjArgs[3 + i] = stringHolder[i].c_str(); + } +- ++#if PROJ_VERSION_MAJOR >= 5 ++ this->Projection = proj_create_argv(PJ_DEFAULT_CTX, argSize, const_cast(pjArgs)); ++#else + this->Projection = pj_init(argSize, const_cast(pjArgs)); ++#endif + delete[] pjArgs; + } + this->ProjectionMTime = this->GetMTime(); +diff --git a/Geovis/Core/vtkGeoTransform.cxx b/Geovis/Core/vtkGeoTransform.cxx +index 5c2c74279d..1c99b6b11b 100644 +--- a/Geovis/Core/vtkGeoTransform.cxx ++++ b/Geovis/Core/vtkGeoTransform.cxx +@@ -163,8 +163,12 @@ void vtkGeoTransform::InternalTransformPoints(double* x, vtkIdType numPts, int s + projPJ src = this->SourceProjection ? this->SourceProjection->GetProjection() : nullptr; + projPJ dst = this->DestinationProjection ? this->DestinationProjection->GetProjection() : nullptr; + int delta = stride - 2; ++#if PROJ_VERSION_MAJOR >= 5 ++ PJ_COORD c, c_out; ++#else + projLP lp; + projXY xy; ++#endif + if (src) + { + // Convert from src system to lat/long using inverse of src transform +@@ -172,17 +176,15 @@ void vtkGeoTransform::InternalTransformPoints(double* x, vtkIdType numPts, int s + for (vtkIdType i = 0; i < numPts; ++i) + { + #if PROJ_VERSION_MAJOR >= 5 +- xy.x = coord[0]; +- xy.y = coord[1]; ++ c.xy.x = coord[0]; ++ c.xy.y = coord[1]; ++ c_out = proj_trans(src, PJ_INV, c); ++ coord[0] = c_out.lp.lam; ++ coord[1] = c_out.lp.phi; + #else + xy.u = coord[0]; + xy.v = coord[1]; +-#endif + lp = pj_inv(xy, src); +-#if PROJ_VERSION_MAJOR >= 5 +- coord[0] = lp.lam; +- coord[1] = lp.phi; +-#else + coord[0] = lp.u; + coord[1] = lp.v; + #endif +@@ -208,17 +210,15 @@ void vtkGeoTransform::InternalTransformPoints(double* x, vtkIdType numPts, int s + for (vtkIdType i = 0; i < numPts; ++i) + { + #if PROJ_VERSION_MAJOR >= 5 +- lp.lam = coord[0]; +- lp.phi = coord[1]; ++ c.lp.lam = coord[0]; ++ c.lp.phi = coord[1]; ++ c_out = proj_trans(src, PJ_FWD, c); ++ coord[0] = c_out.xy.x; ++ coord[1] = c_out.xy.y; + #else + lp.u = coord[0]; + lp.v = coord[1]; +-#endif + xy = pj_fwd(lp, dst); +-#if PROJ_VERSION_MAJOR >= 5 +- coord[0] = xy.x; +- coord[1] = xy.y; +-#else + coord[0] = xy.u; + coord[1] = xy.v; + #endif +diff --git a/ThirdParty/libproj/vtk_libproj.h.in b/ThirdParty/libproj/vtk_libproj.h.in +index 4d8ffc3c5d..c4182c4db2 100644 +--- a/ThirdParty/libproj/vtk_libproj.h.in ++++ b/ThirdParty/libproj/vtk_libproj.h.in +@@ -28,14 +28,9 @@ + #if VTK_MODULE_USE_EXTERNAL_vtklibproj + # if VTK_LibPROJ_MAJOR_VERSION >= 5 + # include +-# endif +-# if VTK_LibPROJ_MAJOR_VERSION < 6 ++# else + # include + # endif +-# if VTK_LibPROJ_MAJOR_VERSION >= 6 +-# define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H 1 +-# endif +-# include + # include + #else + # include +-- +2.32.0.windows.1 + diff --git a/externals/vcpkg/ports/vtk/d107698a.patch b/externals/vcpkg/ports/vtk/d107698a.patch new file mode 100755 index 000000000..1a7ac0877 --- /dev/null +++ b/externals/vcpkg/ports/vtk/d107698a.patch @@ -0,0 +1,291 @@ +diff --git a/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.h b/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.h +index 0b3f1a963063cdf5f1685dbde55deaaea7a77d2f..24198dada846d6d81fb9f1c155e5a6612e1e7055 100644 +--- a/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.h ++++ b/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.h +@@ -25,6 +25,7 @@ + + #include + #include ++#include + + #include // for std::underlying_type + +diff --git a/Accelerators/Vtkm/DataModel/Testing/Cxx/TestVTKMDataSet.cxx b/Accelerators/Vtkm/DataModel/Testing/Cxx/TestVTKMDataSet.cxx +index ec41b18b60db354a8c4a1532eb5cedfd70ce7534..2493ae5b03cf29c5dfc90614489a8049fc623715 100644 +--- a/Accelerators/Vtkm/DataModel/Testing/Cxx/TestVTKMDataSet.cxx ++++ b/Accelerators/Vtkm/DataModel/Testing/Cxx/TestVTKMDataSet.cxx +@@ -274,18 +274,19 @@ vtkm::cont::testing::MakeTestDataSet Maker; + void TestUniformDataSet() + { + auto dataset = Maker.Make3DUniformDataSet0(); +- auto coords = +- dataset.GetCoordinateSystem().GetData().Cast(); ++ auto coords = dataset.GetCoordinateSystem() ++ .GetData() ++ .AsArrayHandle(); + auto portal = coords.ReadPortal(); + auto dims = portal.GetDimensions(); + auto origin = portal.GetOrigin(); + auto spacing = portal.GetSpacing(); + + vtkNew pointField, cellField; +- FieldCopy(dataset.GetField("pointvar").GetData().Cast>(), ++ FieldCopy(dataset.GetField("pointvar").GetData().AsArrayHandle>(), + "pointvar", pointField); +- FieldCopy(dataset.GetField("cellvar").GetData().Cast>(), "cellvar", +- cellField); ++ FieldCopy(dataset.GetField("cellvar").GetData().AsArrayHandle>(), ++ "cellvar", cellField); + + vtkNew imageData; + imageData->SetDimensions(dims[0], dims[1], dims[2]); +@@ -315,10 +316,10 @@ void TestCurvilinearDataSet() + CoordsCopy(dataset.GetCoordinateSystem(), points); + + vtkNew pointField, cellField; +- FieldCopy(dataset.GetField("pointvar").GetData().Cast>(), ++ FieldCopy(dataset.GetField("pointvar").GetData().AsArrayHandle>(), + "pointvar", pointField); +- FieldCopy(dataset.GetField("cellvar").GetData().Cast>(), "cellvar", +- cellField); ++ FieldCopy(dataset.GetField("cellvar").GetData().AsArrayHandle>(), ++ "cellvar", cellField); + + vtkNew dsVtk; + dsVtk->SetDimensions(dims[0], dims[1], dims[2]); +@@ -357,10 +358,10 @@ void TestExplicitDataSet() + } + + vtkNew pointField, cellField; +- FieldCopy(dataset.GetField("pointvar").GetData().Cast>(), ++ FieldCopy(dataset.GetField("pointvar").GetData().AsArrayHandle>(), + "pointvar", pointField); +- FieldCopy(dataset.GetField("cellvar").GetData().Cast>(), "cellvar", +- cellField); ++ FieldCopy(dataset.GetField("cellvar").GetData().AsArrayHandle>(), ++ "cellvar", cellField); + + vtkNew dsVtk; + dsVtk->SetPoints(points); +diff --git a/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx b/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx +index 147c3c6e175dbd342095805750bfc4fee81735dc..f1ef72ffae91ca843ca56bdc305ab68bbc955157 100644 +--- a/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx ++++ b/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx +@@ -35,8 +35,7 @@ + #include + #include + #include +-#include +-#include ++#include + #include + + #include +@@ -62,8 +61,8 @@ struct vtkmDataSet::DataMembers + vtkm::cont::CoordinateSystem Coordinates; + vtkNew Cell; + +- VtkmLocator PointLocator; +- VtkmLocator CellLocator; ++ VtkmLocator PointLocator; ++ VtkmLocator CellLocator; + }; + + //------------------------------------------------------------------------------ +@@ -172,7 +171,7 @@ void vtkmDataSet::GetCellBounds(vtkIdType cellId, double bounds[6]) + this->Internals->CellSet.IsType>()) + { + auto portal = this->Internals->Coordinates.GetData() +- .Cast() ++ .AsArrayHandle() + .ReadPortal(); + + vtkm::internal::ConnectivityStructuredInternals<3> helper; +@@ -279,7 +278,7 @@ vtkIdType vtkmDataSet::FindPoint(double x[3]) + vtkm::Id pointId = -1; + vtkm::FloatDefault d2 = 0; + // exec object created for the Serial device can be called directly +- execLocator->FindNearestNeighbor(point, pointId, d2); ++ execLocator.FindNearestNeighbor(point, pointId, d2); + return pointId; + } + +@@ -316,7 +315,7 @@ vtkIdType vtkmDataSet::FindCell(double x[3], vtkCell*, vtkGenericCell*, vtkIdTyp + vtkm::Vec pc; + vtkm::Id cellId = -1; + // exec object created for the Serial device can be called directly +- execLocator->FindCell(point, cellId, pc); ++ execLocator.FindCell(point, cellId, pc); + + if (cellId >= 0) + { +diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.cxx b/Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.cxx +index 351c0d5ce169cf455d2d3c0a1307ba8e60510371..c7ecff3c9fc5eafecb9dd11d9dbea15cbd44bd3d 100644 +--- a/Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.cxx ++++ b/Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.cxx +@@ -121,7 +121,7 @@ bool Convert( + return false; + } + +- auto points = cs.GetData().Cast(); ++ auto points = cs.GetData().AsArrayHandle(); + auto portal = points.ReadPortal(); + + auto origin = portal.GetOrigin(); +@@ -156,7 +156,7 @@ bool Convert(const vtkm::cont::DataSet& voutput, vtkImageData* output, vtkDataSe + return false; + } + +- auto points = cs.GetData().Cast(); ++ auto points = cs.GetData().AsArrayHandle(); + auto portal = points.ReadPortal(); + + auto dim = portal.GetDimensions(); +diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.cxx b/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.cxx +index f2411d0e70505435cd312ee23b3cb2e653eb28d8..814af43cc168b4c3b44107b0c19e68cc1b42538d 100644 +--- a/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.cxx ++++ b/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.cxx +@@ -52,8 +52,7 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction* function) + box->GetXMin(xmin); + box->GetXMax(xmax); + +- auto b = new vtkm::Box(MakeFVec3(xmin), MakeFVec3(xmax)); +- this->OutFunction.Reset(b, true); ++ this->OutFunction = vtkm::Box(MakeFVec3(xmin), MakeFVec3(xmax)); + } + else if ((cylinder = vtkCylinder::SafeDownCast(function))) + { +@@ -62,9 +61,8 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction* function) + cylinder->GetAxis(axis); + radius = cylinder->GetRadius(); + +- auto c = new vtkm::Cylinder( +- MakeFVec3(center), MakeFVec3(axis), static_cast(radius)); +- this->OutFunction.Reset(c, true); ++ this->OutFunction = ++ vtkm::Cylinder(MakeFVec3(center), MakeFVec3(axis), static_cast(radius)); + } + else if ((plane = vtkPlane::SafeDownCast(function))) + { +@@ -72,8 +70,7 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction* function) + plane->GetOrigin(origin); + plane->GetNormal(normal); + +- auto p = new vtkm::Plane(MakeFVec3(origin), MakeFVec3(normal)); +- this->OutFunction.Reset(p, true); ++ this->OutFunction = vtkm::Plane(MakeFVec3(origin), MakeFVec3(normal)); + } + else if ((sphere = vtkSphere::SafeDownCast(function))) + { +@@ -81,8 +78,7 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction* function) + sphere->GetCenter(center); + radius = sphere->GetRadius(); + +- auto s = new vtkm::Sphere(MakeFVec3(center), static_cast(radius)); +- this->OutFunction.Reset(s, true); ++ this->OutFunction = vtkm::Sphere(MakeFVec3(center), static_cast(radius)); + } + else + { +@@ -95,7 +91,7 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction* function) + this->InFunction = function; + } + +-const vtkm::cont::ImplicitFunctionHandle& ImplicitFunctionConverter::Get() const ++const vtkm::ImplicitFunctionGeneral& ImplicitFunctionConverter::Get() + { + if (this->InFunction && (this->MTime < this->InFunction->GetMTime())) + { +@@ -110,9 +106,7 @@ const vtkm::cont::ImplicitFunctionHandle& ImplicitFunctionConverter::Get() const + box->GetXMin(xmin); + box->GetXMax(xmax); + +- auto b = static_cast(this->OutFunction.Get()); +- b->SetMinPoint(MakeFVec3(xmin)); +- b->SetMaxPoint(MakeFVec3(xmax)); ++ this->OutFunction = vtkm::Box(MakeFVec3(xmin), MakeFVec3(xmax)); + } + else if ((cylinder = vtkCylinder::SafeDownCast(this->InFunction))) + { +@@ -121,10 +115,8 @@ const vtkm::cont::ImplicitFunctionHandle& ImplicitFunctionConverter::Get() const + cylinder->GetAxis(axis); + radius = cylinder->GetRadius(); + +- auto c = static_cast(this->OutFunction.Get()); +- c->SetCenter(MakeFVec3(center)); +- c->SetAxis(MakeFVec3(axis)); +- c->SetRadius(static_cast(radius)); ++ this->OutFunction = ++ vtkm::Cylinder(MakeFVec3(center), MakeFVec3(axis), static_cast(radius)); + } + else if ((plane = vtkPlane::SafeDownCast(this->InFunction))) + { +@@ -132,9 +124,7 @@ const vtkm::cont::ImplicitFunctionHandle& ImplicitFunctionConverter::Get() const + plane->GetOrigin(origin); + plane->GetNormal(normal); + +- auto p = static_cast(this->OutFunction.Get()); +- p->SetOrigin(MakeFVec3(origin)); +- p->SetNormal(MakeFVec3(normal)); ++ this->OutFunction = vtkm::Plane(MakeFVec3(origin), MakeFVec3(normal)); + } + else if ((sphere = vtkSphere::SafeDownCast(this->InFunction))) + { +@@ -142,9 +132,7 @@ const vtkm::cont::ImplicitFunctionHandle& ImplicitFunctionConverter::Get() const + sphere->GetCenter(center); + radius = sphere->GetRadius(); + +- auto s = static_cast(this->OutFunction.Get()); +- s->SetCenter(MakeFVec3(center)); +- s->SetRadius(static_cast(radius)); ++ this->OutFunction = vtkm::Sphere(MakeFVec3(center), static_cast(radius)); + } + + this->MTime = this->InFunction->GetMTime(); +diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.h b/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.h +index 10e2ae99ae819ca86516bf7ab5a0988c75b6323e..a1a571c93d44a7d62f79afc86aab05d1f359af82 100644 +--- a/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.h ++++ b/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.h +@@ -20,7 +20,7 @@ + #include "vtkType.h" // For vtkMTimeType + #include "vtkmConfigDataModel.h" //required for general vtkm setup + +-#include "vtkm/cont/ImplicitFunctionHandle.h" ++#include "vtkm/ImplicitFunction.h" + + class vtkImplicitFunction; + +@@ -33,11 +33,11 @@ public: + ImplicitFunctionConverter(); + + void Set(vtkImplicitFunction*); +- const vtkm::cont::ImplicitFunctionHandle& Get() const; ++ const vtkm::ImplicitFunctionGeneral& Get(); + + private: + vtkImplicitFunction* InFunction; +- vtkm::cont::ImplicitFunctionHandle OutFunction; ++ vtkm::ImplicitFunctionGeneral OutFunction; + mutable vtkMTimeType MTime; + }; + +diff --git a/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx +index 04a637a92d487b019742bbf81884750c48ba105d..674d9b6e0dfe36edd787e519e70ec0bf46602c81 100644 +--- a/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx +@@ -24,12 +24,9 @@ vtkm::cont::DataSet vtkmClip::internals::ExecuteClipWithImplicitFunction(vtkm::c + auto function = this->ClipFunctionConverter->Get(); + + vtkm::cont::DataSet result; +- if (function.GetValid()) +- { +- vtkm::filter::ClipWithImplicitFunction functionFilter; +- functionFilter.SetImplicitFunction(function); +- result = functionFilter.Execute(in); +- } ++ vtkm::filter::ClipWithImplicitFunction functionFilter; ++ functionFilter.SetImplicitFunction(function); ++ result = functionFilter.Execute(in); + + return result; + } diff --git a/externals/vcpkg/ports/vtk/fix-gdal.patch b/externals/vcpkg/ports/vtk/fix-gdal.patch new file mode 100755 index 000000000..9a249efd1 --- /dev/null +++ b/externals/vcpkg/ports/vtk/fix-gdal.patch @@ -0,0 +1,39 @@ +diff --git a/CMake/vtkInstallCMakePackage.cmake b/CMake/vtkInstallCMakePackage.cmake +index bcb2044..c87bb9c 100644 +--- a/CMake/vtkInstallCMakePackage.cmake ++++ b/CMake/vtkInstallCMakePackage.cmake +@@ -113,7 +113,6 @@ set(vtk_cmake_patch_files + patches/3.18/FindPython/Support.cmake + patches/3.18/FindPython2.cmake + patches/3.18/FindPython3.cmake +- patches/99/FindGDAL.cmake + patches/99/FindHDF5.cmake + patches/99/FindJPEG.cmake + patches/99/FindLibArchive.cmake +diff --git a/Geovis/GDAL/CMakeLists.txt b/Geovis/GDAL/CMakeLists.txt +index dfd58f0..f46177f 100644 +--- a/Geovis/GDAL/CMakeLists.txt ++++ b/Geovis/GDAL/CMakeLists.txt +@@ -9,4 +9,7 @@ vtk_module_add_module(VTK::GeovisGDAL + CLASSES ${classes}) + vtk_module_link(VTK::GeovisGDAL + PRIVATE +- GDAL::GDAL) ++ ${GDAL_LIBRARIES}) ++vtk_module_include(VTK::GeovisGDAL ++ PRIVATE ++ ${GDAL_INCLUDE_DIRS}) +diff --git a/IO/GDAL/CMakeLists.txt b/IO/GDAL/CMakeLists.txt +index 0a1248a..621a060 100644 +--- a/IO/GDAL/CMakeLists.txt ++++ b/IO/GDAL/CMakeLists.txt +@@ -9,4 +9,7 @@ vtk_module_add_module(VTK::IOGDAL + CLASSES ${classes}) + vtk_module_link(VTK::IOGDAL + PRIVATE +- GDAL::GDAL) ++ ${GDAL_LIBRARIES}) ++vtk_module_include(VTK::IOGDAL ++ PRIVATE ++ ${GDAL_INCLUDE_DIRS}) +\ No newline at end of file diff --git a/externals/vcpkg/ports/vtk/fix-using-hdf5.patch b/externals/vcpkg/ports/vtk/fix-using-hdf5.patch new file mode 100755 index 000000000..834ab15e9 --- /dev/null +++ b/externals/vcpkg/ports/vtk/fix-using-hdf5.patch @@ -0,0 +1,22 @@ +diff --git a/ThirdParty/h5part/vtkh5part/src/H5Part.c b/ThirdParty/h5part/vtkh5part/src/H5Part.c +index 228d246..41af04d 100644 +--- a/ThirdParty/h5part/vtkh5part/src/H5Part.c ++++ b/ThirdParty/h5part/vtkh5part/src/H5Part.c +@@ -2092,7 +2092,7 @@ _H5Part_iteration_operator2 ( + case H5L_TYPE_HARD: { + + H5O_info_t objinfo; +- if( H5Oget_info_by_name( group_id, member_name, &objinfo, H5P_DEFAULT ) < 0 ) { ++ if( H5Oget_info_by_name1( group_id, member_name, &objinfo, H5P_DEFAULT ) < 0 ) { + return (herr_t)HANDLE_H5G_GET_OBJINFO_ERR ( member_name ); + } + +@@ -2142,7 +2142,7 @@ _H5Part_iteration_operator2 ( + if ( obj_id < 0 ) { + return (herr_t)HANDLE_H5G_OPEN_ERR ( member_name ); + } +- else if ( H5Oget_info ( obj_id, &objinfo ) < 0 ) { ++ else if ( H5Oget_info1 ( obj_id, &objinfo ) < 0 ) { + return (herr_t)HANDLE_H5G_GET_OBJINFO_ERR ( member_name ); + } + else { diff --git a/externals/vcpkg/ports/vtk/missing-limits.patch b/externals/vcpkg/ports/vtk/missing-limits.patch new file mode 100755 index 000000000..2450e480c --- /dev/null +++ b/externals/vcpkg/ports/vtk/missing-limits.patch @@ -0,0 +1,48 @@ +diff --git a/Common/Core/vtkGenericDataArrayLookupHelper.h b/Common/Core/vtkGenericDataArrayLookupHelper.h +index ab9d572..202aaa2 100644 +--- a/Common/Core/vtkGenericDataArrayLookupHelper.h ++++ b/Common/Core/vtkGenericDataArrayLookupHelper.h +@@ -25,6 +25,7 @@ + #include "vtkIdList.h" + #include + #include ++#include + #include + #include + +diff --git a/Common/DataModel/vtkPiecewiseFunction.cxx b/Common/DataModel/vtkPiecewiseFunction.cxx +index 22eca0b..11086f1 100644 +--- a/Common/DataModel/vtkPiecewiseFunction.cxx ++++ b/Common/DataModel/vtkPiecewiseFunction.cxx +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + #include + #include + +diff --git a/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx b/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx +index a16bb27..1052192 100644 +--- a/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx ++++ b/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx +@@ -27,6 +27,7 @@ + #include "vtkHyperTreeGridNonOrientedCursor.h" + + #include ++#include + + vtkStandardNewMacro(vtkHyperTreeGridThreshold); + +diff --git a/Rendering/Core/vtkColorTransferFunction.cxx b/Rendering/Core/vtkColorTransferFunction.cxx +index 55c046b..1be0291 100644 +--- a/Rendering/Core/vtkColorTransferFunction.cxx ++++ b/Rendering/Core/vtkColorTransferFunction.cxx +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + diff --git a/externals/vcpkg/ports/vtk/pegtl.patch b/externals/vcpkg/ports/vtk/pegtl.patch new file mode 100755 index 000000000..cbd1d8693 --- /dev/null +++ b/externals/vcpkg/ports/vtk/pegtl.patch @@ -0,0 +1,73 @@ +diff --git a/CMake/FindPEGTL.cmake b/CMake/FindPEGTL.cmake +index 73eee02f7..22d8bc159 100644 +--- a/CMake/FindPEGTL.cmake ++++ b/CMake/FindPEGTL.cmake +@@ -19,31 +19,42 @@ + # Copyright (c) 2009 Benoit Jacob + # Redistribution and use is allowed according to the terms of the 2-clause BSD license. + +-find_path(PEGTL_INCLUDE_DIR +- NAMES pegtl/version.hpp +- PATH_SUFFIXES tao +- DOC "Path to PEGTL headers") +-mark_as_advanced(PEGTL_INCLUDE_DIR) ++message(STATUS "Searching for PEGTL") ++find_package(PEGTL CONFIG NAMES PEGTL-2) ++if(TARGET taocpp::pegtl) ++ message(STATUS "Searching for PEGTL - found target taocpp::pegtl") ++ set_target_properties(taocpp::pegtl PROPERTIES IMPORTED_GLOBAL TRUE) ++ if(NOT TARGET PEGTL::PEGTL) ++ add_library(PEGTL::PEGTL ALIAS taocpp::pegtl) ++ endif() ++else() ++ find_path(PEGTL_INCLUDE_DIR ++ NAMES pegtl/version.hpp ++ PATH_SUFFIXES tao ++ DOC "Path to PEGTL headers") ++ mark_as_advanced(PEGTL_INCLUDE_DIR) + +-if (PEGTL_INCLUDE_DIR) +- file(STRINGS "${PEGTL_INCLUDE_DIR}/pegtl/version.hpp" _pegtl_version_header +- REGEX "TAO_PEGTL_VERSION") +- string(REGEX MATCH "define[ \t]+TAO_PEGTL_VERSION[ \t]+\"([0-9.]+)\"" _pegtl_version_match "${_pegtl_version_header}") +- set(PEGTL_VERSION "${CMAKE_MATCH_1}") +- unset(_pegtl_version_header) +- unset(_pegtl_version_match) +-endif () ++ if (PEGTL_INCLUDE_DIR) ++ file(STRINGS "${PEGTL_INCLUDE_DIR}/pegtl/version.hpp" _pegtl_version_header ++ REGEX "TAO_PEGTL_VERSION") ++ string(REGEX MATCH "define[ \t]+TAO_PEGTL_VERSION[ \t]+\"([0-9.]+)\"" _pegtl_version_match "${_pegtl_version_header}") ++ set(PEGTL_VERSION "${CMAKE_MATCH_1}") ++ unset(_pegtl_version_header) ++ unset(_pegtl_version_match) ++ endif () + +-include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args(PEGTL +- REQUIRED_VARS PEGTL_INCLUDE_DIR +- VERSION_VAR PEGTL_VERSION) ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(PEGTL ++ REQUIRED_VARS PEGTL_INCLUDE_DIR ++ VERSION_VAR PEGTL_VERSION) + +-if (PEGTL_FOUND) +- set(PEGTL_INCLUDE_DIRS "${PEGTL_INCLUDE_DIR}") +- if (NOT TARGET PEGTL::PEGTL) +- add_library(PEGTL::PEGTL INTERFACE IMPORTED) +- set_target_properties(PEGTL::PEGTL PROPERTIES +- INTERFACE_INCLUDE_DIRECTORIES "${PEGTL_INCLUDE_DIR}") +- endif () +-endif () ++ if (PEGTL_FOUND) ++ set(PEGTL_INCLUDE_DIRS "${PEGTL_INCLUDE_DIR}") ++ if (NOT TARGET PEGTL::PEGTL) ++ add_library(PEGTL::PEGTL INTERFACE IMPORTED) ++ set_target_properties(PEGTL::PEGTL PROPERTIES ++ INTERFACE_INCLUDE_DIRECTORIES "${PEGTL_INCLUDE_DIR}") ++ endif () ++ message(STATUS "Searching for PEGTL - found") ++ endif () ++endif () +\ No newline at end of file diff --git a/externals/vcpkg/ports/vtk/portfile.cmake b/externals/vcpkg/ports/vtk/portfile.cmake new file mode 100755 index 000000000..64dd5901a --- /dev/null +++ b/externals/vcpkg/ports/vtk/portfile.cmake @@ -0,0 +1,306 @@ +if(NOT VCPKG_TARGET_IS_WINDOWS) + message(WARNING "You will need to install Xorg dependencies to build vtk:\napt-get install libxt-dev\n") +endif() + +# ============================================================================= +# Clone & patch +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Kitware/VTK + REF 2959413ff190bc6e3ff40f5b6c1342edd2e5233f # v9.0.x used by ParaView 5.9.1 + SHA512 16229c107ed904e8fa6850c3814b8bdcdf9700ef44f6ff5b3a77e7d793ce19954fc2c7b1219a0162cf588def6e990883cd3f808c316a4db6e65bd6cd1769dd3f + HEAD_REF master + PATCHES + FindLZMA.patch + FindLZ4.patch + Findproj.patch + pegtl.patch + pythonwrapper.patch # Required by ParaView to Wrap required classes + NoUndefDebug.patch # Required to link against correct Python library depending on build type. + python_debug.patch + fix-using-hdf5.patch + # CHECK: module-name-mangling.patch + # Last patch TODO: Patch out internal loguru + FindExpat.patch # The find_library calls are taken care of by vcpkg-cmake-wrapper.cmake of expat + # upstream vtkm patches to make it work with vtkm 1.6 + vtkm.patch # To include an external VTKm build + 1f00a0c9.patch + 156fb524.patch + d107698a.patch + fix-gdal.patch + missing-limits.patch # This patch can be removed in next version. Since it has been merged to upstream via https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7611 + UseProj5Api.patch # Allow Proj 8.0+ (commit b66e4a7, backported). Should be in soon after 9.0.3 +) + +# ============================================================================= +#Overwrite outdated modules if they have not been patched: +file(COPY "${CURRENT_PORT_DIR}/FindHDF5.cmake" DESTINATION "${SOURCE_PATH}/CMake/patches/99") # due to usage of targets in netcdf-c +# ============================================================================= + +# ============================================================================= +# Options: +# Collect CMake options for optional components + +# TODO: +# - add loguru as a dependency requires #8682 +vcpkg_check_features(OUT_FEATURE_OPTIONS VTK_FEATURE_OPTIONS + FEATURES + "qt" VTK_GROUP_ENABLE_Qt + "qt" VTK_MODULE_ENABLE_VTK_GUISupportQt + "qt" VTK_MODULE_ENABLE_VTK_GUISupportQtSQL + "qt" VTK_MODULE_ENABLE_VTK_RenderingQt + "qt" VTK_MODULE_ENABLE_VTK_ViewsQt + "atlmfc" VTK_MODULE_ENABLE_VTK_GUISupportMFC + "vtkm" VTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore + "vtkm" VTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel + "vtkm" VTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters + "vtkm" VTK_MODULE_ENABLE_VTK_vtkm + "python" VTK_MODULE_ENABLE_VTK_Python + "python" VTK_MODULE_ENABLE_VTK_PythonContext2D + "python" VTK_MODULE_ENABLE_VTK_PythonInterpreter + "paraview" VTK_MODULE_ENABLE_VTK_FiltersParallelStatistics + "paraview" VTK_MODULE_ENABLE_VTK_IOParallelExodus + "paraview" VTK_MODULE_ENABLE_VTK_RenderingParallel + "paraview" VTK_MODULE_ENABLE_VTK_RenderingVolumeAMR + "paraview" VTK_MODULE_ENABLE_VTK_IOXdmf2 + "paraview" VTK_MODULE_ENABLE_VTK_IOH5part + "paraview" VTK_MODULE_ENABLE_VTK_IOParallelLSDyna + "paraview" VTK_MODULE_ENABLE_VTK_IOTRUCHAS + "paraview" VTK_MODULE_ENABLE_VTK_IOVPIC + "paraview" VTK_MODULE_ENABLE_VTK_RenderingAnnotation + "paraview" VTK_MODULE_ENABLE_VTK_DomainsChemistry + "paraview" VTK_MODULE_ENABLE_VTK_FiltersParallelDIY2 + "mpi" VTK_GROUP_ENABLE_MPI + "opengl" VTK_MODULE_ENABLE_VTK_ImagingOpenGL2 + "opengl" VTK_MODULE_ENABLE_VTK_RenderingGL2PSOpenGL2 + "opengl" VTK_MODULE_ENABLE_VTK_RenderingOpenGL2 + "opengl" VTK_MODULE_ENABLE_VTK_RenderingVolumeOpenGL2 + "opengl" VTK_MODULE_ENABLE_VTK_opengl + "openvr" VTK_MODULE_ENABLE_VTK_RenderingOpenVR + "gdal" VTK_MODULE_ENABLE_VTK_IOGDAL + "geojson" VTK_MODULE_ENABLE_VTK_IOGeoJSON +) + +# Replace common value to vtk value +list(TRANSFORM VTK_FEATURE_OPTIONS REPLACE "=ON" "=YES") +list(TRANSFORM VTK_FEATURE_OPTIONS REPLACE "=OFF" "=DONT_WANT") + +if("python" IN_LIST FEATURES) + vcpkg_find_acquire_program(PYTHON3) + list(APPEND ADDITIONAL_OPTIONS + -DVTK_WRAP_PYTHON=ON + -DVTK_PYTHON_VERSION=3 + -DPython3_FIND_REGISTRY=NEVER + "-DPython3_EXECUTABLE:PATH=${PYTHON3}" + ) + #VTK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages +endif() + +if ("paraview" IN_LIST FEATURES OR "opengl" IN_LIST FEATURES) + list(APPEND ADDITIONAL_OPTIONS + -DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2=YES + -DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2=YES + -DVTK_MODULE_ENABLE_VTK_DomainsChemistryOpenGL2=YES + ) +endif() + +if("paraview" IN_LIST FEATURES AND "python" IN_LIST FEATURES) + list(APPEND ADDITIONAL_OPTIONS + -DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib=YES + ) +endif() + +if("mpi" IN_LIST FEATURES AND "python" IN_LIST FEATURES) + list(APPEND ADDITIONAL_OPTIONS + -DVTK_MODULE_USE_EXTERNAL_VTK_mpi4py=OFF + ) +endif() + +if("cuda" IN_LIST FEATURES AND CMAKE_HOST_WIN32) + vcpkg_add_to_path("$ENV{CUDA_PATH}/bin") +endif() + +if("utf8" IN_LIST FEATURES) + list(APPEND ADDITIONAL_OPTIONS + -DKWSYS_ENCODING_DEFAULT_CODEPAGE=CP_UTF8 + ) +endif() + +if("all" IN_LIST FEATURES) + list(APPEND ADDITIONAL_OPTIONS + -DVTK_USE_TK=OFF # TCL/TK currently not included in vcpkg + -DVTK_FORBID_DOWNLOADS=OFF + ) +else() + list(APPEND ADDITIONAL_OPTIONS + -DVTK_FORBID_DOWNLOADS=ON + ) +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "cuda" VTK_USE_CUDA + "mpi" VTK_USE_MPI + "all" VTK_BUILD_ALL_MODULES +) +# ============================================================================= +# Configure & Install + +# We set all libraries to "system" and explicitly list the ones that should use embedded copies +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + ${VTK_FEATURE_OPTIONS} + -DBUILD_TESTING=OFF + -DVTK_BUILD_TESTING=OFF + -DVTK_BUILD_EXAMPLES=OFF + -DVTK_ENABLE_REMOTE_MODULES=OFF + # VTK groups to enable + -DVTK_GROUP_ENABLE_StandAlone=YES + -DVTK_GROUP_ENABLE_Rendering=YES + -DVTK_GROUP_ENABLE_Views=YES + # Disable deps not in VCPKG + -DVTK_USE_TK=OFF # TCL/TK currently not included in vcpkg + # Select modules / groups to install + -DVTK_USE_EXTERNAL:BOOL=ON + -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF # Not yet in VCPKG + ${ADDITIONAL_OPTIONS} + -DVTK_DEBUG_MODULE_ALL=ON + -DVTK_DEBUG_MODULE=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +# ============================================================================= +# Fixup target files +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/vtk-9.0) + +# ============================================================================= +# Clean-up other directories + +# Delete the debug binary TOOL_NAME that is not required +function(_vtk_remove_debug_tool TOOL_NAME) + set(filename "${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + if(EXISTS "${filename}") + file(REMOVE "${filename}") + endif() + set(filename "${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}d${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + if(EXISTS "${filename}") + file(REMOVE "${filename}") + endif() + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) + # we also have to bend the lines referencing the tools in VTKTargets-debug.cmake + # to make them point to the release version of the tools + file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/VTK-targets-debug.cmake" VTK_TARGETS_CONTENT_DEBUG) + string(REPLACE "debug/bin/${TOOL_NAME}" "tools/vtk/${TOOL_NAME}" VTK_TARGETS_CONTENT_DEBUG "${VTK_TARGETS_CONTENT_DEBUG}") + string(REPLACE "tools/vtk/${TOOL_NAME}d" "tools/vtk/${TOOL_NAME}" VTK_TARGETS_CONTENT_DEBUG "${VTK_TARGETS_CONTENT_DEBUG}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/VTK-targets-debug.cmake" "${VTK_TARGETS_CONTENT_DEBUG}") + endif() +endfunction() + +# Move the release binary TOOL_NAME from bin to tools +function(_vtk_move_release_tool TOOL_NAME) + set(old_filename "${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + if(EXISTS "${old_filename}") + file(INSTALL "${old_filename}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/vtk" USE_SOURCE_PERMISSIONS) + file(REMOVE "${old_filename}") + endif() + + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) + # we also have to bend the lines referencing the tools in VTKTargets-release.cmake + # to make them point to the tool folder + file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/VTK-targets-release.cmake" VTK_TARGETS_CONTENT_RELEASE) + string(REPLACE "bin/${TOOL_NAME}" "tools/vtk/${TOOL_NAME}" VTK_TARGETS_CONTENT_RELEASE "${VTK_TARGETS_CONTENT_RELEASE}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/VTK-targets-release.cmake" "${VTK_TARGETS_CONTENT_RELEASE}") + endif() +endfunction() + +set(VTK_SHORT_VERSION 9.0) +set(VTK_TOOLS + vtkEncodeString-${VTK_SHORT_VERSION} + vtkHashSource-${VTK_SHORT_VERSION} + vtkWrapTclInit-${VTK_SHORT_VERSION} + vtkWrapTcl-${VTK_SHORT_VERSION} + vtkWrapPythonInit-${VTK_SHORT_VERSION} + vtkWrapPython-${VTK_SHORT_VERSION} + vtkWrapJava-${VTK_SHORT_VERSION} + vtkWrapHierarchy-${VTK_SHORT_VERSION} + vtkParseJava-${VTK_SHORT_VERSION} + vtkParseOGLExt-${VTK_SHORT_VERSION} + vtkProbeOpenGLVersion-${VTK_SHORT_VERSION} + vtkTestOpenGLVersion-${VTK_SHORT_VERSION} + vtkpython + pvtkpython +) +# TODO: Replace with vcpkg_copy_tools if known which tools are built with which feature +# or add and option to vcpkg_copy_tools which does not require the tool to be present +foreach(TOOL_NAME IN LISTS VTK_TOOLS) + _vtk_remove_debug_tool("${TOOL_NAME}") + _vtk_move_release_tool("${TOOL_NAME}") +endforeach() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/vtk") + +## Files Modules needed by ParaView +if("paraview" IN_LIST FEATURES) + set(VTK_CMAKE_NEEDED vtkCompilerChecks vtkCompilerPlatformFlags vtkCompilerExtraFlags vtkInitializeBuildType + vtkSupportMacros vtkVersion FindPythonModules vtkModuleDebugging vtkExternalData) + foreach(module ${VTK_CMAKE_NEEDED}) + file(INSTALL "${SOURCE_PATH}/CMake/${module}.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/vtk") + endforeach() + + ## Check List on UPDATE !! + file(INSTALL "${SOURCE_PATH}/CMake/vtkRequireLargeFilesSupport.cxx" DESTINATION "${CURRENT_PACKAGES_DIR}/share/vtk") + file(INSTALL "${SOURCE_PATH}/Rendering/Volume/vtkBlockSortHelper.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") # this should get installed by VTK + file(INSTALL "${SOURCE_PATH}/Filters/ParallelDIY2/vtkDIYKdTreeUtilities.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") + file(INSTALL "${SOURCE_PATH}/Parallel/DIY/vtkDIYUtilities.txx" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") + + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Rendering/OpenGL2/vtkTextureObjectVS.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") + +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/CMakeFiles/vtkpythonmodules/static_python") #python headers + file(GLOB_RECURSE STATIC_PYTHON_FILES "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/CMakeFiles/*/static_python/*.h") + file(INSTALL ${STATIC_PYTHON_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") + endif() +endif() + +#remove one get_filename_component(_vtk_module_import_prefix "${_vtk_module_import_prefix}" DIRECTORY) from vtk-prefix.cmake and VTK-vtk-module-properties and vtk-python.cmake +set(filenames_fix_prefix vtk-prefix VTK-vtk-module-properties vtk-python) +foreach(name IN LISTS filenames_fix_prefix) +if(EXISTS "${CURRENT_PACKAGES_DIR}/share/vtk/${name}.cmake") + file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/${name}.cmake" _contents) + string(REPLACE +[[set(_vtk_module_import_prefix "${CMAKE_CURRENT_LIST_DIR}") +get_filename_component(_vtk_module_import_prefix "${_vtk_module_import_prefix}" DIRECTORY)]] +[[set(_vtk_module_import_prefix "${CMAKE_CURRENT_LIST_DIR}")]] _contents "${_contents}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/${name}.cmake" "${_contents}") +else() + debug_message("FILE:${CURRENT_PACKAGES_DIR}/share/vtk/${name}.cmake does not exist! No prefix correction!") +endif() +endforeach() + +# Use vcpkg provided find method +file(REMOVE "${CURRENT_PACKAGES_DIR}/share/${PORT}/FindEXPAT.cmake") + +file(RENAME "${CURRENT_PACKAGES_DIR}/share/licenses" "${CURRENT_PACKAGES_DIR}/share/${PORT}/licenses") + +if(EXISTS "${CURRENT_PACKAGES_DIR}/include/vtk-9.0/vtkChemistryConfigure.h") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/vtk-9.0/vtkChemistryConfigure.h" "${SOURCE_PATH}" "not/existing") +endif() +# ============================================================================= +# Usage +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) +# Handle copyright +file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") diff --git a/externals/vcpkg/ports/vtk/python_debug.patch b/externals/vcpkg/ports/vtk/python_debug.patch new file mode 100755 index 000000000..6b69d8094 --- /dev/null +++ b/externals/vcpkg/ports/vtk/python_debug.patch @@ -0,0 +1,13 @@ +diff --git a/CMake/patches/3.18/FindPython/Support.cmake b/CMake/patches/3.18/FindPython/Support.cmake +index 0879537ed..122e7228d 100644 +--- a/CMake/patches/3.18/FindPython/Support.cmake ++++ b/CMake/patches/3.18/FindPython/Support.cmake +@@ -2253,7 +2257,7 @@ if (("Development.Module" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS + NAMES ${_${_PYTHON_PREFIX}_LIB_NAMES_DEBUG} + NAMES_PER_DIR + HINTS "${_${_PYTHON_PREFIX}_PATH}" ${_${_PYTHON_PREFIX}_HINTS} +- NO_DEFAULT_PATH) ++ ) + endif() + + # retrieve runtime libraries diff --git a/externals/vcpkg/ports/vtk/pythonwrapper.patch b/externals/vcpkg/ports/vtk/pythonwrapper.patch new file mode 100755 index 000000000..6cdd4162a --- /dev/null +++ b/externals/vcpkg/ports/vtk/pythonwrapper.patch @@ -0,0 +1,19 @@ +diff --git a/CMake/vtkModuleWrapPython.cmake b/CMake/vtkModuleWrapPython.cmake +index 5d2c2e1bf..e33a16d68 100644 +--- a/CMake/vtkModuleWrapPython.cmake ++++ b/CMake/vtkModuleWrapPython.cmake +@@ -152,11 +152,14 @@ function (_vtk_module_wrap_python_sources module sources classes) + set(_vtk_python_genex_compile_definitions + "$") + set(_vtk_python_genex_include_directories + "$") ++ set(_vtk_python_genex_interface_include_directories ++ "$") + file(GENERATE + OUTPUT "${_vtk_python_args_file}" + CONTENT "$<$:\n-D\'$\'>\n + $<$:\n-I\'$\'>\n ++$<$:\n-I\'$\'>\n + $<$:\n--types \'$\'>\n") + + set(_vtk_python_sources) diff --git a/externals/vcpkg/ports/vtk/usage b/externals/vcpkg/ports/vtk/usage new file mode 100755 index 000000000..bba2f6390 --- /dev/null +++ b/externals/vcpkg/ports/vtk/usage @@ -0,0 +1,5 @@ +The package vtk provides CMake targets: + + find_package(VTK REQUIRED) + include("${VTK_USE_FILE}") + target_link_libraries(main PRIVATE ${VTK_LIBRARIES}) diff --git a/externals/vcpkg/ports/vtk/vcpkg.json b/externals/vcpkg/ports/vtk/vcpkg.json new file mode 100755 index 000000000..fb5a115dc --- /dev/null +++ b/externals/vcpkg/ports/vtk/vcpkg.json @@ -0,0 +1,201 @@ +{ + "name": "vtk", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 10, + "description": "Software system for 3D computer graphics, image processing, and visualization", + "homepage": "https://github.com/Kitware/VTK", + "license": "BSD-3-Clause", + "dependencies": [ + "double-conversion", + "eigen3", + "expat", + "freetype", + "glew", + { + "name": "hdf5", + "default-features": false + }, + "jsoncpp", + { + "name": "libharu", + "features": [ + "notiffsymbols" + ] + }, + "libjpeg-turbo", + "liblzma", + "libogg", + "libpng", + "libtheora", + "libxml2", + "lz4", + "netcdf-c", + "pegtl-2", + "proj", + "pugixml", + "sqlite3", + "tiff", + "utfcpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "features": { + "all": { + "description": "Build all vtk modules", + "dependencies": [ + "ffmpeg", + "libmysql", + { + "name": "vtk", + "default-features": false, + "features": [ + "gdal", + "geojson", + "mpi", + "python", + "qt" + ] + }, + { + "name": "vtk", + "default-features": false, + "features": [ + "atlmfc", + "utf8" + ], + "platform": "windows" + } + ] + }, + "atlmfc": { + "description": "Mfc functionality for vtk on Windows", + "dependencies": [ + { + "name": "atlmfc", + "platform": "windows" + } + ] + }, + "cuda": { + "description": "Support CUDA compilation", + "dependencies": [ + "cuda" + ] + }, + "gdal": { + "description": "Support GDAL compilation", + "dependencies": [ + "gdal", + { + "name": "vtk", + "default-features": false, + "features": [ + "mpi" + ] + } + ] + }, + "geojson": { + "description": "Convert Geo JSON format to vtkPolyData" + }, + "mpi": { + "description": "MPI functionality for VTK", + "dependencies": [ + { + "name": "hdf5", + "default-features": false, + "features": [ + "parallel" + ] + }, + "mpi", + { + "name": "vtk-m", + "default-features": false, + "features": [ + "mpi" + ] + } + ] + }, + "opengl": { + "description": "All opengl related modules", + "dependencies": [ + { + "name": "vtk", + "default-features": false + } + ] + }, + "openvr": { + "description": "OpenVR functionality for VTK", + "dependencies": [ + "openvr", + "sdl2" + ] + }, + "paraview": { + "description": "Build vtk modules required by paraview", + "dependencies": [ + { + "name": "vtk", + "default-features": false, + "features": [ + "qt" + ] + }, + { + "name": "vtk", + "default-features": false, + "features": [ + "atlmfc" + ], + "platform": "windows" + } + ] + }, + "python": { + "description": "Python functionality for VTK", + "dependencies": [ + "python3" + ] + }, + "qt": { + "description": "Qt functionality for VTK", + "dependencies": [ + "qt5-imageformats", + "qt5-tools", + { + "name": "qt5-x11extras", + "platform": "linux" + }, + "qt5-xmlpatterns" + ] + }, + "utf8": { + "description": "Enables vtk reader/writer with utf-8 path support", + "dependencies": [ + { + "name": "vtk", + "default-features": false + } + ] + }, + "vtkm": { + "description": "Build with vtk-m accelerator and module.", + "dependencies": [ + { + "name": "vtk-m", + "default-features": false + } + ] + } + } +} diff --git a/externals/vcpkg/ports/vtk/vtkm.patch b/externals/vcpkg/ports/vtk/vtkm.patch new file mode 100755 index 000000000..72c8ce2bd --- /dev/null +++ b/externals/vcpkg/ports/vtk/vtkm.patch @@ -0,0 +1,168 @@ +diff --git a/Accelerators/Vtkm/Core/CMakeLists.txt b/Accelerators/Vtkm/Core/CMakeLists.txt +index b889a771f..317d83f75 100644 +--- a/Accelerators/Vtkm/Core/CMakeLists.txt ++++ b/Accelerators/Vtkm/Core/CMakeLists.txt +@@ -14,8 +14,9 @@ + ## + ##============================================================================= + +-list(INSERT 0 CMAKE_MODULE_PATH +- "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake") ++find_package(VTKm CONFIG REQUIRED) ++#list(INSERT 0 CMAKE_MODULE_PATH ++# "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake") + + set(private_headers + vtkmlib/DataArrayConverters.hxx +@@ -77,9 +78,9 @@ vtkm_add_target_information(${vtkm_accel_target} + MODIFY_CUDA_FLAGS + DEVICE_SOURCES ${sources}) + +-vtk_module_set_property(VTK::AcceleratorsVTKmCore +- PROPERTY JOB_POOL_COMPILE +- VALUE vtkm_pool) ++#vtk_module_set_property(VTK::AcceleratorsVTKmCore ++# PROPERTY JOB_POOL_COMPILE ++# VALUE vtkm_pool) + + if (TARGET vtkm::cuda) + vtk_module_set_property(VTK::AcceleratorsVTKmCore +diff --git a/Accelerators/Vtkm/DataModel/CMakeLists.txt b/Accelerators/Vtkm/DataModel/CMakeLists.txt +index 56307be8d..30fff98e8 100644 +--- a/Accelerators/Vtkm/DataModel/CMakeLists.txt ++++ b/Accelerators/Vtkm/DataModel/CMakeLists.txt +@@ -14,8 +14,9 @@ + ## + ##============================================================================= + +-list(INSERT 0 CMAKE_MODULE_PATH +- "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake") ++find_package(VTKm CONFIG REQUIRED) ++#list(INSERT 0 CMAKE_MODULE_PATH ++# "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake") + + set(sources + vtkmlib/ArrayConvertersReal.cxx +@@ -85,9 +86,9 @@ vtkm_add_target_information(${vtkm_accel_target} + MODIFY_CUDA_FLAGS + DEVICE_SOURCES ${sources}) + +-vtk_module_set_property(VTK::AcceleratorsVTKmDataModel +- PROPERTY JOB_POOL_COMPILE +- VALUE vtkm_pool) ++#vtk_module_set_property(VTK::AcceleratorsVTKmDataModel ++# PROPERTY JOB_POOL_COMPILE ++# VALUE vtkm_pool) + + if (TARGET vtkm::cuda) + vtk_module_set_property(VTK::AcceleratorsVTKmDataModel +diff --git a/Accelerators/Vtkm/Filters/CMakeLists.txt b/Accelerators/Vtkm/Filters/CMakeLists.txt +index 14e84f1dd..0a931285d 100644 +--- a/Accelerators/Vtkm/Filters/CMakeLists.txt ++++ b/Accelerators/Vtkm/Filters/CMakeLists.txt +@@ -14,8 +14,9 @@ + ## + ##============================================================================= + +-list(INSERT 0 CMAKE_MODULE_PATH +- "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake") ++find_package(VTKm CONFIG REQUIRED) ++#list(INSERT 0 CMAKE_MODULE_PATH ++# "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake") + + set(impl_classes + vtkmAverageToCells +@@ -80,9 +81,9 @@ vtkm_add_target_information(${vtkm_accel_target} + MODIFY_CUDA_FLAGS + DEVICE_SOURCES ${sources}) + +-vtk_module_set_property(VTK::AcceleratorsVTKmFilters +- PROPERTY JOB_POOL_COMPILE +- VALUE vtkm_pool) ++#vtk_module_set_property(VTK::AcceleratorsVTKmFilters ++# PROPERTY JOB_POOL_COMPILE ++# VALUE vtkm_pool) + vtk_module_link(VTK::AcceleratorsVTKmFilters + PRIVATE + vtkm_worklet +diff --git a/CMake/vtk-config.cmake.in b/CMake/vtk-config.cmake.in +index 5a5e8b8df..96413875f 100644 +--- a/CMake/vtk-config.cmake.in ++++ b/CMake/vtk-config.cmake.in +@@ -121,9 +121,7 @@ set("${CMAKE_FIND_PACKAGE_NAME}_AVAILABLE_COMPONENTS" "@vtk_all_components@") + unset("${CMAKE_FIND_PACKAGE_NAME}_FOUND") + set("${CMAKE_FIND_PACKAGE_NAME}_HAS_VTKm" "@vtk_has_vtkm@") + if (${CMAKE_FIND_PACKAGE_NAME}_HAS_VTKm) +- find_package(VTKm +- PATHS "${CMAKE_CURRENT_LIST_DIR}/vtkm" +- NO_DEFAULT_PATH) ++ find_package(VTKm CONFIG REQUIRED) + if (NOT VTKm_FOUND) + set("${CMAKE_FIND_PACKAGE_NAME}_FOUND" 0) + endif () +diff --git a/ThirdParty/vtkm/CMakeLists.txt b/ThirdParty/vtkm/CMakeLists.txt +index 5817d42f8..f21d17da8 100644 +--- a/ThirdParty/vtkm/CMakeLists.txt ++++ b/ThirdParty/vtkm/CMakeLists.txt +@@ -1,6 +1,41 @@ +-vtk_module_third_party_internal( +- LICENSE_FILES "vtkvtkm/vtk-m/LICENSE.txt" +- VERSION "master" +- SUBDIRECTORY vtkvtkm +- STANDARD_INCLUDE_DIRS +- INTERFACE) ++#vtk_module_third_party_internal( ++# LICENSE_FILES "vtkvtkm/vtk-m/LICENSE.txt" ++# VERSION "master" ++# SUBDIRECTORY vtkvtkm ++# STANDARD_INCLUDE_DIRS ++# INTERFACE) ++ ++message(STATUS "VTK_MODULE_USE_EXTERNAL_VTK_vtkm: ${VTK_MODULE_USE_EXTERNAL_VTK_vtkm}") ++if(TRUE) ++ message(STATUS "Searching for external VTKm") ++ find_package(VTKm CONFIG REQUIRED) ++ if(TARGET vtkm_compiler_flags) ++ get_target_property(VTKm_INCLUDE_DIRS vtkm_compiler_flags INTERFACE_INCLUDE_DIRECTORIES) ++ message(STATUS "INCLUDE: ${VTKm_INCLUDE_DIRS}") ++ get_target_property(VTKm_DIY_INCLUDE_DIRS vtkm_diy INTERFACE_INCLUDE_DIRECTORIES) ++ get_target_property(VTKm_OPTION_INCLUDE_DIRS vtkm_optionparser INTERFACE_INCLUDE_DIRECTORIES) ++ if(MSVC) ++ set(VTKm_DEFINITIONS /bigobj) ++ endif() ++ else() ++ message(FATAL_ERROR "VTKM target missing") ++ endif() ++ if(VTKM_FOUND) ++ message(STATUS "Found VTKm") ++ endif() ++endif() ++ ++vtk_module_third_party( ++ INTERNAL ++ HEADER_ONLY ++ LICENSE_FILES "vtkvtkm/vtk-m/LICENSE.txt" ++ VERSION "master" ++ SUBDIRECTORY vtkvtkm ++ STANDARD_INCLUDE_DIRS ++ INTERFACE ++ EXTERNAL ++ PACKAGE VTKm ++ TARGETS vtkm_cont vtkm_filter vtkm_diy vtkm_optionparser vtkm_taotuple ++ #LIBRARIES vtkm_cont vtkm_filter vtkm_diy vtkm_optionparser vtkm_taotuple ++ INCLUDE_DIRS VTKm_INCLUDE_DIRS VTKm_DIY_INCLUDE_DIRS VTKm_OPTION_INCLUDE_DIRS ++) +\ No newline at end of file +diff --git a/ThirdParty/vtkm/vtk.module b/ThirdParty/vtkm/vtk.module +index a8e4dad0f..c7bbbf0e8 100644 +--- a/ThirdParty/vtkm/vtk.module ++++ b/ThirdParty/vtkm/vtk.module +@@ -3,5 +3,7 @@ NAME + PRIVATE_DEPENDS + # While not needed to satisfy symbols, this is necessary to guarantee that + # VTK_SMP_IMPLEMENTATION_TYPE is available when configuring vtk-m. +- VTK::CommonCore ++ # VTK::CommonCore ++LIBRARY_NAME ++ VTKm + THIRD_PARTY diff --git a/externals/vcpkg/ports/vulkan-headers/portfile.cmake b/externals/vcpkg/ports/vulkan-headers/portfile.cmake new file mode 100755 index 000000000..45b6eddf9 --- /dev/null +++ b/externals/vcpkg/ports/vulkan-headers/portfile.cmake @@ -0,0 +1,15 @@ +# header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KhronosGroup/Vulkan-Headers + REF 52a76fd0a693708eb8c25bd0ab7a1008091f64d4 #v1.2.203 + SHA512 e3a337f0f1d0d003db522385b40ed187416e2246e64718b7d980ecdd92ac400a9e96b06dbb52c6f09cf7725772b5772727efb61c0e2f3a67989fe693fa569d38 + HEAD_REF master +) + +# This must be vulkan as other vulkan packages expect it there. +file(COPY "${SOURCE_PATH}/include/vulkan/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vulkan") +file(COPY "${SOURCE_PATH}/include/vk_video/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vk_video") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/vulkan-headers/vcpkg.json b/externals/vcpkg/ports/vulkan-headers/vcpkg.json new file mode 100755 index 000000000..72f263045 --- /dev/null +++ b/externals/vcpkg/ports/vulkan-headers/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "vulkan-headers", + "version": "1.2.203", + "description": "Vulkan header files and API registry", + "homepage": "https://github.com/KhronosGroup/Vulkan-Headers" +} diff --git a/externals/vcpkg/ports/vulkan-hpp/portfile.cmake b/externals/vcpkg/ports/vulkan-hpp/portfile.cmake new file mode 100755 index 000000000..79e062ef8 --- /dev/null +++ b/externals/vcpkg/ports/vulkan-hpp/portfile.cmake @@ -0,0 +1,14 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KhronosGroup/Vulkan-Hpp + REF 3de6ccafd688df4be0c7830c23167535c511594d #v1.2.203 + SHA512 a3d3058afd88d9313a676acf49d908f0b00010b34de1e4b1263c3e20079f1ba829c050e5c26c835963b8f117bc9b118e4dea2ad295867da7b657a0890f46fecc + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/vulkan/vulkan.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vulkan") + +# Handle copyright +configure_file("${SOURCE_PATH}/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/vulkan-hpp/vcpkg.json b/externals/vcpkg/ports/vulkan-hpp/vcpkg.json new file mode 100755 index 000000000..a678cb791 --- /dev/null +++ b/externals/vcpkg/ports/vulkan-hpp/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "vulkan-hpp", + "version": "1.2.203", + "description": "Header only C++ bindings for the Vulkan C API", + "dependencies": [ + "vulkan" + ] +} diff --git a/externals/vcpkg/ports/vulkan-memory-allocator/portfile.cmake b/externals/vcpkg/ports/vulkan-memory-allocator/portfile.cmake new file mode 100755 index 000000000..32a96bdbf --- /dev/null +++ b/externals/vcpkg/ports/vulkan-memory-allocator/portfile.cmake @@ -0,0 +1,13 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator + REF 42be483bd5c6605e789e011aac684e0b95d05359 #v3.0.0 + SHA512 5bb2240481511e51f1617f2c010a3e93a1c72a63713ed4aecf94488e7f46c78a3cfc591e8f94e14b1262b264bc06e1a78cfe69967b41e02441fad1a433747ee6 + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/include/vk_mem_alloc.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-vulkan-memory-allocator-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-vulkan-memory-allocator") + +configure_file("${SOURCE_PATH}/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/vulkan-memory-allocator/unofficial-vulkan-memory-allocator-config.cmake b/externals/vcpkg/ports/vulkan-memory-allocator/unofficial-vulkan-memory-allocator-config.cmake new file mode 100755 index 000000000..fc9f62550 --- /dev/null +++ b/externals/vcpkg/ports/vulkan-memory-allocator/unofficial-vulkan-memory-allocator-config.cmake @@ -0,0 +1,8 @@ + +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + +add_library(unofficial::vulkan-memory-allocator::vulkan-memory-allocator INTERFACE IMPORTED) +set_target_properties(unofficial::vulkan-memory-allocator::vulkan-memory-allocator PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include") +set(_IMPORT_PREFIX) diff --git a/externals/vcpkg/ports/vulkan-memory-allocator/vcpkg.json b/externals/vcpkg/ports/vulkan-memory-allocator/vcpkg.json new file mode 100755 index 000000000..50a39ecc5 --- /dev/null +++ b/externals/vcpkg/ports/vulkan-memory-allocator/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "vulkan-memory-allocator", + "version": "3.0.0", + "description": "Easy to integrate Vulkan memory allocation library from GPUOpen", + "homepage": "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator", + "license": "MIT" +} diff --git a/externals/vcpkg/ports/vulkan/LICENSE.txt b/externals/vcpkg/ports/vulkan/LICENSE.txt new file mode 100755 index 000000000..af642b906 --- /dev/null +++ b/externals/vcpkg/ports/vulkan/LICENSE.txt @@ -0,0 +1,726 @@ +/* +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + + +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. + +Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. + +Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. + +You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + +You must give any other recipients of the Work or Derivative Works a copy of this License; and +You must cause any modified files to carry prominent notices stating that You changed the files; and +You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and +If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. +You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. + +Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. + +This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. + +Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. + +In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. + +While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +=============================================================================================================================================== + +/Copyright (C) 2012 LunarG, Inc. +//All rights reserved. +// +//Redistribution and use in source and binary forms, with or without +//modification, are permitted provided that the following conditions +//are met: +// +// Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// Neither the name of LunarG Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +//POSSIBILITY OF SUCH DAMAGE. + +=============================================================================================================================================== + +#============================================================================= +# Copyright 2007-2009 Kitware, Inc. +# Copyright 2007-2008 Miguel A. Figueroa-Villanueva +# +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file Copyright_cmake.txt for details. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= +# (To distributed this file outside of CMake, substitute the full +# License text for the above reference.) + + +============================================================================================================================================== + +// +// Copyright (C) 2015-2018 Google, Inc. +// Copyright (C) +// +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// +// Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// Neither the name of 3Dlabs Inc. Ltd. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +// COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// POSSIBILITY OF SUCH DAMAGE. +// + +========================================================================================================================================== + +Note: This license has also been called the "New BSD License" or "Modified BSD License". See also the 2-clause BSD License. +Copyright +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +========================================================================================================================================== + +/* +* xxHash - Fast Hash algorithm +* Copyright (C) 2012-2016, Yann Collet +* +* BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are +* met: +* +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above +* copyright notice, this list of conditions and the following disclaimer +* in the documentation and/or other materials provided with the +* distribution. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +* +* You can contact the author at : +* - xxHash homepage: http://www.xxhash.com +* - xxHash source repository : https://github.com/Cyan4973/xxHash +*/ + + +=========================================================================================================================================== + +# Copyright (C) 2018 Google, Inc. +# +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials provided +# with the distribution. +# +# Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. + +========================================================================================================================================== + +/* A Bison parser, made by GNU Bison 3.0.4. */ + +/* Bison implementation for Yacc-like parsers in C +Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc. +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU General Public License +along with this program. If not, see . */ + +/* As a special exception, you may create a larger work that contains +part or all of the Bison parser skeleton and distribute that work +under terms of your choice, so long as that work isn't itself a +parser generator using the skeleton or a modified version thereof +as a parser skeleton. Alternatively, if you modify or redistribute +the parser skeleton itself, you may (at your option) remove this +special exception, which will cause the skeleton and the resulting +Bison output files to be licensed under the GNU General Public +License without this special exception. +This special exception was added by the Free Software Foundation in +version 2.2 of Bison. */ + +/* C LALR(1) parser skeleton written by Richard Stallman, by +simplifying the original so-called "semantic" parser. */ + +/* All symbols defined below should begin with yy or YY, to avoid +infringing on user name space. This should be done even for local +variables, as they might otherwise be expanded by user macros. +There are some unavoidable exceptions within include files to +define necessary library symbols; they are noted "INFRINGES ON +USER NAME SPACE" below. */ + +============================================================================================================================================== + +copyright : [ +Copyright (c) 2017 The Khronos Group Inc., +, +Permission is hereby granted, free of charge, to any person obtaining a copy, +of this software and/or associated documentation files (the \Materials\"),", +to deal in the Materials without restriction, including without limitation, +the rights to use, copy, modify, merge, publish, distribute, sublicense,, +and/or sell copies of the Materials, and to permit persons to whom the, +Materials are furnished to do so, subject to the following conditions:, +, +The above copyright notice and this permission notice shall be included in, +all copies or substantial portions of the Materials., +, +MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS, +STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND, +HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/ , +, +THE MATERIALS ARE PROVIDED \AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS", +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL, +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER, +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING, +FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS, +IN THE MATERIALS. + +============================================================================================================================================= + +CMake - Cross Platform Makefile Generator +Copyright 2000-2009 Kitware, Inc., Insight Software Consortium +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +* Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. + +* Neither the names of Kitware, Inc., the Insight Software Consortium, +nor the names of their contributors may be used to endorse or promote +products derived from this software without specific prior written +permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +------------------------------------------------------------------------------ + +The above copyright and license notice applies to distributions of +CMake in source and binary form. Some source files contain additional +notices of original copyright by their contributors; see each source +for details. Third-party software packages supplied with CMake under +compatible licenses provide their own copyright notices documented in +corresponding subdirectories. + +------------------------------------------------------------------------------ + +CMake was initially developed by Kitware with the following sponsorship: + +* National Library of Medicine at the National Institutes of Health +as part of the Insight Segmentation and Registration Toolkit (ITK). + +* US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel +Visualization Initiative. + +* National Alliance for Medical Image Computing (NAMIC) is funded by the +National Institutes of Health through the NIH Roadmap for Medical Research, +Grant U54 EB005149. + +* Kitware, Inc. + +======================================================================================================================================== + +The authors of this software are Rob Pike and Ken Thompson. +* Copyright (c) 2002 by Lucent Technologies. +* Permission to use, copy, modify, and distribute this software for any +* purpose without fee is hereby granted, provided that this entire notice +* is included in all copies of any software which is or includes a copy +* or modification of this software and in all copies of the supporting +* documentation for such software. +* THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED +* WARRANTY. IN PARTICULAR, NEITHER THE AUTHORS NOR LUCENT TECHNOLOGIES MAKE ANY +* REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY +* OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE. + + +======================================================================================================================================== + +Copyright (c) 2015-2018 Baldur Karlsson + +Copyright (c) 2014 Crytek + +Copyright (c) 1998-2018 Third party code and tools + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +========================================================================================================================================= + +/* +Copyright (c) 2009 Dave Gamble +Copyright (c) 2015-2016 The Khronos Group Inc. +Copyright (c) 2015-2016 Valve Corporation +Copyright (c) 2015-2016 LunarG, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +=========================================================================================================================================== + +Copyright (c) 2005 - 2017 G-Truc Creation + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + + +========================================================================================================================================== + +/* +The JsonCpp library's source code, including accompanying documentation, +tests and demonstration applications, are licensed under the following +conditions... +The author (Baptiste Lepilleur) explicitly disclaims copyright in all +jurisdictions which recognize such a disclaimer. In such jurisdictions, +this software is released into the Public Domain. +In jurisdictions which do not recognize Public Domain property (e.g. Germany as of +2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur, and is +released under the terms of the MIT License (see below). +In jurisdictions which recognize Public Domain property, the user of this +software may choose to accept it either as 1) Public Domain, 2) under the +conditions of the MIT License (see below), or 3) under the terms of dual +Public Domain/MIT License conditions described here, as they choose. +The MIT License is about as close to Public Domain as a license can get, and is +described in clear, concise terms at: +http://en.wikipedia.org/wiki/MIT_License + +The full text of the MIT License follows: + +Copyright (c) 2007-2010 Baptiste Lepilleur +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, copy, +modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +========================================================================================================================================== + +/** +* `murmurhash.h' - murmurhash +* +* copyright (c) 2014 joseph werle +* Copyright (c) 2015-2016 The Khronos Group Inc. +* Copyright (c) 2015-2016 Valve Corporation +* Copyright (c) 2015-2016 LunarG, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and/or associated documentation files (the "Materials"), to +* deal in the Materials without restriction, including without limitation the +* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +* sell copies of the Materials, and to permit persons to whom the Materials are +* furnished to do so, subject to the following conditions: +* +* The above copyright notice(s) and this permission notice shall be included in +* all copies or substantial portions of the Materials. +* +* THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +* +* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE +* USE OR OTHER DEALINGS IN THE MATERIALS. +*/ + +========================================================================================================================================= + +Licenced as X11: http://www.kryogenix.org/code/browser/licence.html +This basically means: do what you want with it. + +========================================================================================================================================= + +/////////////////////////////////////////////////////////////////////////////////// +/// OpenGL Mathematics (glm.g-truc.net) +/// +/// Copyright (c) 2005 - 2014 G-Truc Creation (www.g-truc.net) +/// Permission is hereby granted, free of charge, to any person obtaining a copy +/// of this software and associated documentation files (the "Software"), to deal +/// in the Software without restriction, including without limitation the rights +/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +/// copies of the Software, and to permit persons to whom the Software is +/// furnished to do so, subject to the following conditions: +/// +/// The above copyright notice and this permission notice shall be included in +/// all copies or substantial portions of the Software. +/// +/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +/// THE SOFTWARE. +/// +/// @ref core +/// @file glm/common.hpp +/// @date 2013-12-24 / 2013-12-24 +/// @author Christophe Riccio +/////////////////////////////////////////////////////////////////////////////////// + + +========================================================================================================================================== + +// LICENSE +// +// This software is in the public domain. Where that dedication is not +// recognized, you are granted a perpetual, irrevocable license to copy, +// distribute, and modify this file as you see fit. +// + +========================================================================================================================================== + +Simple DirectMedia Layer +Copyright (C) 1997-2018 Sam Lantinga + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not +claim that you wrote the original software. If you use this software +in a product, an acknowledgment in the product documentation would be +appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be +misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. + +========================================================================================================================================= + +/****************************************************************************\ +Copyright (c) 2002, NVIDIA Corporation. + +NVIDIA Corporation("NVIDIA") supplies this software to you in +consideration of your agreement to the following terms, and your use, +installation, modification or redistribution of this NVIDIA software +constitutes acceptance of these terms. If you do not agree with these +terms, please do not use, install, modify or redistribute this NVIDIA +software. + +In consideration of your agreement to abide by the following terms, and +subject to these terms, NVIDIA grants you a personal, non-exclusive +license, under NVIDIA's copyrights in this original NVIDIA software (the +NVIDIA Software), to use, reproduce, modify and redistribute the +NVIDIA Software, with or without modifications, in source and/or binary +forms; provided that if you redistribute the NVIDIA Software, you must +retain the copyright notice of NVIDIA, this notice and the following +text and disclaimers in all such redistributions of the NVIDIA Software. +Neither the name, trademarks, service marks nor logos of NVIDIA +Corporation may be used to endorse or promote products derived from the +NVIDIA Software without specific prior written permission from NVIDIA. +Except as expressly stated in this notice, no other rights or licenses +express or implied, are granted by NVIDIA herein, including but not +limited to any patent rights that may be infringed by your derivative +works or by other works in which the NVIDIA Software may be +incorporated. No hardware is licensed hereunder. + +THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, +INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE, +NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR +ITS USE AND OPERATION EITHER ALONE OR IN COMBINATION WITH OTHER +PRODUCTS. + +IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT, +INCIDENTAL, EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY +OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE +NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, +TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF +NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +\****************************************************************************/ + +================================================================================================================================================== + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. + + +================================================================================================================================================== + +GNU LESSER GENERAL PUBLIC LICENSE +Version 3, 29 June 2007 + +Copyright (C) 2007 Free Software Foundation, Inc. + +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + +This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. + +0. Additional Definitions. + +As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU General Public License. + +"The Library" refers to a covered work governed by this License, other than an Application or a Combined Work as defined below. + +An "Application" is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library. + +A "Combined Work" is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the "Linked Version". + +The "Minimal Corresponding Source" for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Version. + +The "Corresponding Application Code" for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries of the Combined Work. + +1. Exception to Section 3 of the GNU GPL. + +You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL. + +2. Conveying Modified Versions. + +If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of the modified version: + +a) under this License, provided that you make a good faith effort to ensure that, in the event an Application does not supply the function or data, the facility still operates, and performs whatever part of its purpose remains meaningful, or +b) under the GNU GPL, with none of the additional permissions of this License applicable to that copy. +3. Object Code Incorporating Material from Library Header Files. + +The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following: + +a) Give prominent notice with each copy of the object code that the Library is used in it and that the Library and its use are covered by this License. +b) Accompany the object code with a copy of the GNU GPL and this license document. +4. Combined Works. + +You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do each of the following: + +a) Give prominent notice with each copy of the Combined Work that the Library is used in it and that the Library and its use are covered by this License. +b) Accompany the Combined Work with a copy of the GNU GPL and this license document. +c) For a Combined Work that displays copyright notices during execution, include the copyright notice for the Library among these notices, as well as a reference directing the user to the copies of the GNU GPL and this license document. +d) Do one of the following: +0) Convey the Minimal Corresponding Source under the terms of this License, and the Corresponding Application Code in a form suitable for, and under terms that permit, the user to recombine or relink the Application with a modified version of the Linked Version to produce a modified Combined Work, in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source. +1) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (a) uses at run time a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked Version. +e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the GNU GPL, and only to the extent that such information is necessary to install and execute a modified version of the Combined Work produced by recombining or relinking the Application with a modified version of the Linked Version. (If you use option 4d0, the Installation Information must accompany the Minimal Corresponding Source and Corresponding Application Code. If you use option 4d1, you must provide the Installation Information in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.) +5. Combined Libraries. + +You may place library facilities that are a work based on the Library side by side in a single library together with other library facilities that are not Applications and are not covered by this License, and convey such a combined library under terms of your choice, if you do both of the following: + +a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities, conveyed under the terms of this License. +b) Give prominent notice with the combined library that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. +6. Revised Versions of the GNU Lesser General Public License. + +The Free Software Foundation may publish revised and/or new versions of the GNU Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library as you received it specifies that a certain numbered version of the GNU Lesser General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the GNU Lesser General Public License ever published by the Free Software Foundation. + +If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. diff --git a/externals/vcpkg/ports/vulkan/portfile.cmake b/externals/vcpkg/ports/vulkan/portfile.cmake new file mode 100755 index 000000000..7493614e1 --- /dev/null +++ b/externals/vcpkg/ports/vulkan/portfile.cmake @@ -0,0 +1,42 @@ +# Due to the complexity involved, this package doesn't install the Vulkan SDK. +# It instead verifies that Vulkan is installed. +# Other packages can depend on this package to declare a dependency on Vulkan. +message(STATUS "Querying VULKAN_SDK Enviroment variable") +file(TO_CMAKE_PATH "$ENV{VULKAN_SDK}" VULKAN_DIR) +set(VULKAN_INCLUDE "${VULKAN_DIR}/include/vulkan/") +set(VULKAN_ERROR_DL "Before continuing, please download and install Vulkan from:\n https://vulkan.lunarg.com/sdk/home\nIf you have already downloaded it, make sure the VULKAN_SDK environment variable is set to vulkan's installation root.") + +if(NOT DEFINED ENV{VULKAN_SDK}) + message(FATAL_ERROR "Could not find Vulkan SDK. ${VULKAN_ERROR_DL}") +endif() + +message(STATUS "Searching " ${VULKAN_INCLUDE} " for vulkan.h") +if(NOT EXISTS "${VULKAN_INCLUDE}/vulkan.h") + message(FATAL_ERROR "Could not find vulkan.h. ${VULKAN_ERROR_DL}") +endif() +message(STATUS "Found vulkan.h") + +# Check if the user left the version in the installation directory e.g. c:/vulkanSDK/1.1.82.1/ +if(VULKAN_DIR MATCHES "(([0-9]+)\\.([0-9]+)\\.([0-9]+)\\.([0-9]+))") + set(VULKAN_VERSION "${CMAKE_MATCH_1}") + set(VULKAN_MAJOR "${CMAKE_MATCH_2}") + set(VULKAN_MINOR "${CMAKE_MATCH_3}") + set(VULKAN_PATCH "${CMAKE_MATCH_4}") + message(STATUS "Found Vulkan SDK version ${VULKAN_VERSION}") + + set(VULKAN_REQUIRED_VERSION "1.1.82.1") + if (VULKAN_MAJOR LESS 1 OR VULKAN_MINOR LESS 1 OR VULKAN_PATCH LESS 82) + message(FATAL_ERROR "Vulkan ${VULKAN_VERSION} but ${VULKAN_REQUIRED_VERSION} is required. Please download and install a more recent version from:" + "\n https://vulkan.lunarg.com/sdk/home\n") + endif() +endif() + +if (EXISTS ${VULKAN_DIR}/../LICENSE.txt) + configure_file(${VULKAN_DIR}/../LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/vulkan/copyright COPYONLY) +elseif(EXISTS ${VULKAN_DIR}/LICENSE.txt) + configure_file(${VULKAN_DIR}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/vulkan/copyright COPYONLY) +else() + configure_file(${CURRENT_PORT_DIR}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/vulkan/copyright COPYONLY) +endif() + +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/vulkan/usage b/externals/vcpkg/ports/vulkan/usage new file mode 100755 index 000000000..62130b840 --- /dev/null +++ b/externals/vcpkg/ports/vulkan/usage @@ -0,0 +1,9 @@ +The package vulkan does not provide cmake or visual studio integration directly. +However, it can still easily be used. + + Visual Studio: + Include $(VULKAN_SDK)/include to your include path. + + CMake: + find_package(Vulkan REQUIRED) + target_link_libraries(main PRIVATE Vulkan::Vulkan) diff --git a/externals/vcpkg/ports/vulkan/vcpkg.json b/externals/vcpkg/ports/vulkan/vcpkg.json new file mode 100755 index 000000000..fa84de037 --- /dev/null +++ b/externals/vcpkg/ports/vulkan/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "vulkan", + "version-string": "1.1.82.1", + "port-version": 2, + "description": "A graphics and compute API that provides high-efficiency, cross-platform access to modern GPUs on a wide variety of devices." +} diff --git a/externals/vcpkg/ports/vxl/fix_dependency.patch b/externals/vcpkg/ports/vxl/fix_dependency.patch new file mode 100755 index 000000000..88cecfd66 --- /dev/null +++ b/externals/vcpkg/ports/vxl/fix_dependency.patch @@ -0,0 +1,13 @@ +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index 3483f9c..57e149b 100644 +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -100,7 +100,7 @@ endif() + + + # coordinate systems +-if(VXL_BUILD_CORE_GEOMETRY AND VXL_BUILD_CORE_NUMERICS) ++if(VXL_BUILD_CORE_GEOMETRY AND VXL_BUILD_CORE_NUMERICS AND VXL_BUILD_CORE_IMAGING) + add_subdirectory(vcsl) + add_subdirectory(vpgl) + endif() diff --git a/externals/vcpkg/ports/vxl/portfile.cmake b/externals/vcpkg/ports/vxl/portfile.cmake new file mode 100755 index 000000000..b56645806 --- /dev/null +++ b/externals/vcpkg/ports/vxl/portfile.cmake @@ -0,0 +1,61 @@ +set(VXL_BUILD_CORE_IMAGING OFF) +if("core-imaging" IN_LIST FEATURES) + set(VXL_BUILD_CORE_IMAGING ON) + if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openjpeg.h") + set(VXL_BUILD_CORE_IMAGING OFF) + message(WARNING "Can't build VXL CORE_IMAGING features with non built-in OpenJpeg. Please remove OpenJpeg, and try install VXL again if you need them.") + endif() +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO vxl/vxl + REF dac1c7ed8e183e9c6de8b928c8b0294a7bd1d8ee # v2.0.2 + SHA512 4c6f6dcd793a50cbbc9c7f61c561ed4a747ded67e3dceb09792998c0f0d4294445a441fed668d59297560f196274b1c25593ce67b0aa7597cbb773328e8612c0 + HEAD_REF master + PATCHES + fix_dependency.patch + testlib.patch +) + +set(USE_WIN_WCHAR_T OFF) +if(VCPKG_TARGET_IS_WINDOWS) + set(USE_WIN_WCHAR_T ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DVXL_BUILD_EXAMPLES=OFF + -DBUILD_TESTING=OFF + -DVXL_BUILD_CORE_IMAGING=${VXL_BUILD_CORE_IMAGING} + -DVXL_FORCE_V3P_BZLIB2=OFF + -DVXL_USING_NATIVE_BZLIB2=TRUE # for disable build built-in bzip2 (v3p/bzlib/CMakeLists.txt#L10-L26) + -DVXL_FORCE_V3P_CLIPPER=ON # TODO : need add clipper port to turn off + -DVXL_FORCE_V3P_DCMTK=OFF + -DVXL_FORCE_V3P_GEOTIFF=OFF + -DVXL_FORCE_V3P_J2K=OFF + -DVXL_FORCE_V3P_JPEG=OFF + -DVXL_FORCE_V3P_OPENJPEG2=ON # TODO : need fix compile error when using openjpeg port to turn off + -DVXL_FORCE_V3P_PNG=OFF + -DVXL_FORCE_V3P_TIFF=OFF + -DVXL_FORCE_V3P_ZLIB=OFF + -DVXL_USE_DCMTK=OFF # TODO : need fix dcmtk support to turn on + -DVXL_USE_GEOTIFF=ON + -DVXL_USE_WIN_WCHAR_T=${USE_WIN_WCHAR_T} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +# Remove tests which assume that the source dir still exists +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/vxl/vcl/vcl_where_root_dir.h") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/vxl/core/testlib") + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/vxl/cmake/VXLConfig.cmake" "${CURRENT_BUILDTREES_DIR}" "") # only used in comment + +file(INSTALL "${SOURCE_PATH}/core/vxl_copyright.h" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/vxl/testlib.patch b/externals/vcpkg/ports/vxl/testlib.patch new file mode 100755 index 000000000..cc94aec56 --- /dev/null +++ b/externals/vcpkg/ports/vxl/testlib.patch @@ -0,0 +1,15 @@ +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index 581d00b..336f170 100644 +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -135,7 +135,9 @@ else() + endif () + + # common test executable +-add_subdirectory(testlib) ++if(BUILD_TESTING) ++ add_subdirectory(testlib) ++endif() + + # Tests that check and output the vxl configuration + # NOTE: some external projects remove the tests directory (aka ITK) diff --git a/externals/vcpkg/ports/vxl/vcpkg.json b/externals/vcpkg/ports/vxl/vcpkg.json new file mode 100755 index 000000000..fb87b04d2 --- /dev/null +++ b/externals/vcpkg/ports/vxl/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "vxl", + "version": "2.0.2", + "port-version": 4, + "description": "A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding.", + "dependencies": [ + "bzip2", + "expat", + "libgeotiff", + "libjpeg-turbo", + "libpng", + "shapelib", + "tiff", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "features": { + "core-imaging": { + "description": "core-imaging support for vxl" + } + } +} diff --git a/externals/vcpkg/ports/wampcc/portfile.cmake b/externals/vcpkg/ports/wampcc/portfile.cmake new file mode 100755 index 000000000..6940a964c --- /dev/null +++ b/externals/vcpkg/ports/wampcc/portfile.cmake @@ -0,0 +1,33 @@ +if (VCPKG_TARGET_IS_WINDOWS) + message("Shared build is broken under Windows. See https://github.com/darrenjs/wampcc/issues/57") + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO darrenjs/wampcc + REF 43d10a7ccf37ec1b895742712dd4a05577b73ff1 + SHA512 e830d26de00e8f5f378145f06691cb16121c40d3bd2cd663fad9a97db37251a11b56053178b619e3a2627f0cd518b6290a8381b26e517a9f16f0246d2f91958e + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + examples BUILD_EXAMPLES + utils BUILD_UTILS +) + + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTS:BOOL=OFF # Tests build is broken + ${FEATURE_OPTIONS} +) +vcpkg_cmake_install() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/wampcc/vcpkg.json b/externals/vcpkg/ports/wampcc/vcpkg.json new file mode 100755 index 000000000..a1d992491 --- /dev/null +++ b/externals/vcpkg/ports/wampcc/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "wampcc", + "version-date": "2019-09-04", + "port-version": 3, + "description": "Wampcc is C++ library that implements the Web Application Messaging Protocol (WAMP) protocol.", + "license": "MIT", + "supports": "!(windows & arm64)", + "dependencies": [ + "jansson", + "libuv", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "examples": { + "description": "Build example apps" + }, + "utils": { + "description": "Build utility apps", + "supports": "!windows" + } + } +} diff --git a/externals/vcpkg/ports/wangle/fix-config-cmake.patch b/externals/vcpkg/ports/wangle/fix-config-cmake.patch new file mode 100755 index 000000000..1d5949cea --- /dev/null +++ b/externals/vcpkg/ports/wangle/fix-config-cmake.patch @@ -0,0 +1,22 @@ +diff --git a/wangle/cmake/wangle-config.cmake.in b/wangle/cmake/wangle-config.cmake.in +index e50af54..e0fd0dc 100644 +--- a/wangle/cmake/wangle-config.cmake.in ++++ b/wangle/cmake/wangle-config.cmake.in +@@ -12,7 +12,16 @@ + @PACKAGE_INIT@ + + set_and_check(WANGLE_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") +-set_and_check(WANGLE_CMAKE_DIR "@PACKAGE_CMAKE_INSTALL_DIR@") ++set_and_check(WANGLE_CMAKE_DIR "${PACKAGE_PREFIX_DIR}/share/wangle") ++ ++include(CMakeFindDependencyMacro) ++find_dependency(folly REQUIRED) ++find_dependency(fizz REQUIRED) ++find_dependency(glog REQUIRED) ++find_dependency(Threads REQUIRED) ++find_dependency(Libevent REQUIRED) ++find_dependency(OpenSSL REQUIRED) ++find_dependency(double-conversion REQUIRED) + + if (NOT TARGET wangle::wangle) + include("${WANGLE_CMAKE_DIR}/wangle-targets.cmake") diff --git a/externals/vcpkg/ports/wangle/fix_dependency.patch b/externals/vcpkg/ports/wangle/fix_dependency.patch new file mode 100755 index 000000000..6b80a68f8 --- /dev/null +++ b/externals/vcpkg/ports/wangle/fix_dependency.patch @@ -0,0 +1,56 @@ +diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt +index 8df7c76..f605f25 100644 +--- a/wangle/CMakeLists.txt ++++ b/wangle/CMakeLists.txt +@@ -62,7 +62,7 @@ find_package(folly CONFIG REQUIRED) + find_package(fizz CONFIG REQUIRED) + find_package(fmt CONFIG REQUIRED) + find_package(OpenSSL REQUIRED) +-find_package(Glog REQUIRED) ++find_package(glog CONFIG REQUIRED) + find_package(gflags CONFIG QUIET) + if (gflags_FOUND) + message(STATUS "Found gflags from package config") +@@ -70,8 +70,8 @@ if (gflags_FOUND) + else() + find_package(Gflags REQUIRED) + endif() +-find_package(LibEvent MODULE REQUIRED) +-find_package(DoubleConversion REQUIRED) ++find_package(Libevent CONFIG REQUIRED) ++find_package(double-conversion CONFIG REQUIRED) + find_package(Threads REQUIRED) + if (UNIX AND NOT APPLE) + find_package(Librt) +@@ -153,24 +153,23 @@ target_include_directories( + PUBLIC + $ + $ ++ PRIVATE + ${FIZZ_INCLUDE_DIR} + ${FOLLY_INCLUDE_DIR} + ${Boost_INCLUDE_DIR} +- ${OPENSSL_INCLUDE_DIR} +- ${GLOG_INCLUDE_DIRS} + ${GFLAGS_INCLUDE_DIRS} +- ${LIBEVENT_INCLUDE_DIR} +- ${DOUBLE_CONVERSION_INCLUDE_DIRS} + ) + target_link_libraries(wangle PUBLIC + ${FOLLY_LIBRARIES} + ${FIZZ_LIBRARIES} + ${Boost_LIBRARIES} +- ${OPENSSL_LIBRARIES} +- ${GLOG_LIBRARIES} ++ OpenSSL::SSL ++ OpenSSL::Crypto ++ glog::glog + ${GFLAGS_LIBRARIES} +- ${LIBEVENT_LIB} +- ${DOUBLE_CONVERSION_LIBRARIES} ++ libevent::core ++ libevent::extra ++ double-conversion::double-conversion + ${CMAKE_DL_LIBS} + ${LIBRT_LIBRARIES} + Threads::Threads) diff --git a/externals/vcpkg/ports/wangle/portfile.cmake b/externals/vcpkg/ports/wangle/portfile.cmake new file mode 100755 index 000000000..bf8313bef --- /dev/null +++ b/externals/vcpkg/ports/wangle/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO facebook/wangle + REF v2022.03.21.00 + SHA512 069fe7758ccb2f33665f53109047f2e0158e248fda8c760eddd978afd6980acbc6421db60721bf320deca557369377c8757f13c67f8685e3a98394324e75e72e + HEAD_REF master + PATCHES + fix-config-cmake.patch + fix_dependency.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/wangle" + OPTIONS + -DBUILD_TESTS=OFF + -DBUILD_EXAMPLES=OFF + -DINCLUDE_INSTALL_DIR:STRING=include +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/wangle) + +file(READ "${CURRENT_PACKAGES_DIR}/share/wangle/wangle-targets.cmake" _contents) +STRING(REPLACE "\${_IMPORT_PREFIX}/lib/" "\${_IMPORT_PREFIX}/\$<\$:debug/>lib/" _contents "${_contents}") +STRING(REPLACE "\${_IMPORT_PREFIX}/debug/lib/" "\${_IMPORT_PREFIX}/\$<\$:debug/>lib/" _contents "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/wangle/wangle-targets.cmake" "${_contents}") + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/include/wangle/util/test" + "${CURRENT_PACKAGES_DIR}/include/wangle/ssl/test/certs" + "${CURRENT_PACKAGES_DIR}/include/wangle/service/test" + "${CURRENT_PACKAGES_DIR}/include/wangle/deprecated/rx/test" +) + +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/wangle/usage b/externals/vcpkg/ports/wangle/usage new file mode 100755 index 000000000..50903e726 --- /dev/null +++ b/externals/vcpkg/ports/wangle/usage @@ -0,0 +1,4 @@ +The package wangle is compatible with built-in CMake targets: + + find_package(wangle REQUIRED) + target_link_libraries(main PRIVATE wangle::wangle) diff --git a/externals/vcpkg/ports/wangle/vcpkg.json b/externals/vcpkg/ports/wangle/vcpkg.json new file mode 100755 index 000000000..fb51f4338 --- /dev/null +++ b/externals/vcpkg/ports/wangle/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "wangle", + "version-string": "2022.03.21.00", + "description": "Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.", + "homepage": "https://github.com/facebook/wangle", + "license": "Apache-2.0", + "dependencies": [ + "boost-context", + "boost-filesystem", + "boost-regex", + "boost-system", + "boost-thread", + "double-conversion", + "fizz", + "folly", + "glog", + "libevent", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/wavelib/disable-test.patch b/externals/vcpkg/ports/wavelib/disable-test.patch new file mode 100755 index 000000000..de8516523 --- /dev/null +++ b/externals/vcpkg/ports/wavelib/disable-test.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e2e8a4d..d228001 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,7 +48,6 @@ endif() + + add_subdirectory(src) + add_subdirectory(auxiliary) +-add_subdirectory(test) + + install(DIRECTORY ${WAVELIB_SRC_ROOT}/header/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} diff --git a/externals/vcpkg/ports/wavelib/portfile.cmake b/externals/vcpkg/ports/wavelib/portfile.cmake new file mode 100755 index 000000000..7dfc299ad --- /dev/null +++ b/externals/vcpkg/ports/wavelib/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rafat/wavelib + REF a92456d2e20451772dd76c2a0a3368537ee94184 + SHA512 d14ebc0d96e86d9226fa346cb6ef157b2949985dfedf4228dd4356ccacaac48fde47edfcba31e7455b25dc95c7a1cb148ad6845143c17ae5972659c98e683865 + HEAD_REF master + PATCHES + disable-test.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_UT=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/wavelib/vcpkg.json b/externals/vcpkg/ports/wavelib/vcpkg.json new file mode 100755 index 000000000..0906ba865 --- /dev/null +++ b/externals/vcpkg/ports/wavelib/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "wavelib", + "version-date": "2021-11-26", + "description": "C implementation of wavelet transform (DWT,SWT and MODWT)", + "homepage": "https://github.com/rafat/wavelib", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/wavpack/OpenSSL.patch b/externals/vcpkg/ports/wavpack/OpenSSL.patch new file mode 100755 index 000000000..6d8e956ad --- /dev/null +++ b/externals/vcpkg/ports/wavpack/OpenSSL.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 70e1043f..d8cb8b10 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -208,7 +208,7 @@ target_include_directories(wavpack + target_link_libraries(wavpack + PRIVATE + $<$:m> +- $<$:${OPENSSL_CRYPTO_LIBRARY}> ++ $<$:OpenSSL::Crypto> + ) + target_compile_definitions(wavpack + PRIVATE diff --git a/externals/vcpkg/ports/wavpack/fix-symbol-exports.patch b/externals/vcpkg/ports/wavpack/fix-symbol-exports.patch new file mode 100755 index 000000000..999a05417 --- /dev/null +++ b/externals/vcpkg/ports/wavpack/fix-symbol-exports.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 70e1043f..d8cb8b10 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -328,7 +328,7 @@ foreach(EXPORT_SYMBOL ${WAVPACK_EXPORT_SYMBOLS}) + list(APPEND FILE_CONTENTS "_${EXPORT_SYMBOL}\n") + endforeach() + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libwavpack.sym ${FILE_CONTENTS}) +- target_link_libraries(wavpack PRIVATE "-Wl,-exported_symbols_list,'${CMAKE_CURRENT_BINARY_DIR}/libwavpack.sym'") ++ set_target_properties(wavpack PROPERTIES LINK_FLAGS "-Wl,-exported_symbols_list,'${CMAKE_CURRENT_BINARY_DIR}/libwavpack.sym'") + else() + set(CONFTTEST_CONTENTS "VERS_1 {\n global: sym\;\n\n};\n\nVERS_2 {\n global: sym;\n} VERS_1\;") + file(WRITE ${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/conftest.map "${CONFTTEST_CONTENTS}") +@@ -340,7 +340,7 @@ list(APPEND FILE_CONTENTS "${EXPORT_SYMBOL}\;\n") + endforeach() + list(APPEND FILE_CONTENTS "local: *\; }\;") + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libwavpack.map ${FILE_CONTENTS}) +- target_link_libraries(wavpack PRIVATE "-Wl,--version-script='${CMAKE_CURRENT_BINARY_DIR}/libwavpack.map';-Wl,-no-undefined") ++ set_target_properties(wavpack PROPERTIES LINK_FLAGS "-Wl,--version-script='${CMAKE_CURRENT_BINARY_DIR}/libwavpack.map';-Wl,-no-undefined") + endif() + endif() + diff --git a/externals/vcpkg/ports/wavpack/portfile.cmake b/externals/vcpkg/ports/wavpack/portfile.cmake new file mode 100755 index 000000000..6b3d4a5c4 --- /dev/null +++ b/externals/vcpkg/ports/wavpack/portfile.cmake @@ -0,0 +1,44 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO dbry/WavPack + REF 5.4.0 + SHA512 4DD6C484032FDFB1BC0E9A95881677FADE39A5E07CB98713A6B29DF0E9A570D6D27856FCAF412A714A5D7708C9CC2ADACE03A06970B06C4C5B2987E7EB2E643D + HEAD_REF master + PATCHES + OpenSSL.patch + fix-symbol-exports.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DWAVPACK_INSTALL_DOCS=OFF + -DWAVPACK_BUILD_PROGRAMS=OFF + -DWAVPACK_BUILD_COOLEDIT_PLUGIN=OFF + -DWAVPACK_BUILD_WINAMP_PLUGIN=OFF + -DBUILD_TESTING=OFF + -DWAVPACK_BUILD_DOCS=OFF +) + +vcpkg_cmake_install() + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +else() + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/WavPack) +endif() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +if(WIN32 AND (NOT MINGW)) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/wavpack.pc" "-lwavpack" "-lwavpackdll") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/wavpack.pc" "-lwavpack" "-lwavpackdll") + endif() +endif() + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/wavpack/vcpkg.json b/externals/vcpkg/ports/wavpack/vcpkg.json new file mode 100755 index 000000000..dff83543e --- /dev/null +++ b/externals/vcpkg/ports/wavpack/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "wavpack", + "version": "5.4.0", + "port-version": 2, + "description": "WavPack encode/decode library, command-line programs, and several plugins", + "homepage": "https://github.com/dbry/WavPack", + "license": "BSD-3-Clause", + "supports": "!(windows & arm)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/websocketpp/cxx20.patch b/externals/vcpkg/ports/websocketpp/cxx20.patch new file mode 100755 index 000000000..34283e2b1 --- /dev/null +++ b/externals/vcpkg/ports/websocketpp/cxx20.patch @@ -0,0 +1,66 @@ +diff --git "a/websocketpp/endpoint.hpp" "b/websocketpp/endpoint.hpp" +index c124b1d..9ce8a62 100644 +--- "a/websocketpp/endpoint.hpp" ++++ "b/websocketpp/endpoint.hpp" +@@ -109,7 +109,7 @@ public: + + + /// Destructor +- ~endpoint() {} ++ ~endpoint() {} + + #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_ + // no copy constructor because endpoints are not copyable +diff --git "a/websocketpp/logger/basic.hpp" "b/websocketpp/logger/basic.hpp" +index 8451413..4c9d836 100644 +--- "a/websocketpp/logger/basic.hpp" ++++ "b/websocketpp/logger/basic.hpp" +@@ -58,33 +58,33 @@ namespace log { + template + class basic { + public: +- basic(channel_type_hint::value h = ++ basic(channel_type_hint::value h = + channel_type_hint::access) + : m_static_channels(0xffffffff) + , m_dynamic_channels(0) + , m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {} + +- basic(std::ostream * out) ++ basic(std::ostream * out) + : m_static_channels(0xffffffff) + , m_dynamic_channels(0) + , m_out(out) {} + +- basic(level c, channel_type_hint::value h = ++ basic(level c, channel_type_hint::value h = + channel_type_hint::access) + : m_static_channels(c) + , m_dynamic_channels(0) + , m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {} + +- basic(level c, std::ostream * out) ++ basic(level c, std::ostream * out) + : m_static_channels(c) + , m_dynamic_channels(0) + , m_out(out) {} + + /// Destructor +- ~basic() {} ++ ~basic() {} + + /// Copy constructor +- basic(basic const & other) ++ basic(basic const & other) + : m_static_channels(other.m_static_channels) + , m_dynamic_channels(other.m_dynamic_channels) + , m_out(other.m_out) +@@ -97,7 +97,7 @@ public: + + #ifdef _WEBSOCKETPP_MOVE_SEMANTICS_ + /// Move constructor +- basic(basic && other) ++ basic(basic && other) + : m_static_channels(other.m_static_channels) + , m_dynamic_channels(other.m_dynamic_channels) + , m_out(other.m_out) diff --git a/externals/vcpkg/ports/websocketpp/portfile.cmake b/externals/vcpkg/ports/websocketpp/portfile.cmake new file mode 100755 index 000000000..2592ca331 --- /dev/null +++ b/externals/vcpkg/ports/websocketpp/portfile.cmake @@ -0,0 +1,26 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO zaphoyd/websocketpp + REF 56123c87598f8b1dd471be83ca841ceae07f95ba # 0.8.2 + SHA512 f185a66e5a7c783254352a6ef87e2e559f681032b7368765d08393ed12bcae76825abed7dcaea73de09df644320409dad46279701f5f469520542a2c9b6a6163 + HEAD_REF master + PATCHES + cxx20.patch +) + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +# Copy the header files +file(COPY "${SOURCE_PATH}/websocketpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.hpp") + +set(PACKAGE_INSTALL_INCLUDE_DIR "\${CMAKE_CURRENT_LIST_DIR}/../../include") +set(WEBSOCKETPP_VERSION 0.8.2) +set(PACKAGE_INIT " +macro(set_and_check) + set(\${ARGV}) +endmacro() +") +configure_file(${SOURCE_PATH}/websocketpp-config.cmake.in "${CURRENT_PACKAGES_DIR}/share/${PORT}/websocketpp-config.cmake" @ONLY) +configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/websocketpp/vcpkg.json b/externals/vcpkg/ports/websocketpp/vcpkg.json new file mode 100755 index 000000000..daa7f5cf6 --- /dev/null +++ b/externals/vcpkg/ports/websocketpp/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "websocketpp", + "version": "0.8.2", + "port-version": 2, + "description": "Library that implements RFC6455 The WebSocket Protocol", + "homepage": "https://github.com/zaphoyd/websocketpp", + "documentation": "http://docs.websocketpp.org/", + "default-features": [ + "recommended" + ], + "features": { + "recommended": { + "description": "Use recommended dependencies", + "dependencies": [ + "boost-asio", + "openssl", + "zlib" + ] + } + } +} diff --git a/externals/vcpkg/ports/webview2/portfile.cmake b/externals/vcpkg/ports/webview2/portfile.cmake new file mode 100755 index 000000000..d2b215616 --- /dev/null +++ b/externals/vcpkg/ports/webview2/portfile.cmake @@ -0,0 +1,55 @@ +if(VCPKG_TARGET_IS_UWP) + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +endif() + +set(VERSION 1.0.1210.39) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.nuget.org/api/v2/package/Microsoft.Web.WebView2/${VERSION}" + FILENAME "microsoft.web.webview2.${VERSION}.zip" + SHA512 c87812247a466f4aaeac8be8b32be49166b4ddb5bbf65581d5df81d69eda340e9911144a8dd8401baa6e51f95337001cd18ff90cd36ca0af86cc65227e8e2ccf +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF "${VERSION}" + NO_REMOVE_ONE_LEVEL +) + +file(COPY + "${SOURCE_PATH}/build/native/include/" + DESTINATION "${CURRENT_PACKAGES_DIR}/include") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(COPY + "${SOURCE_PATH}/build/native/${VCPKG_TARGET_ARCHITECTURE}/WebView2LoaderStatic.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +else() + file(COPY + "${SOURCE_PATH}/build/native/include-winrt/" + DESTINATION "${CURRENT_PACKAGES_DIR}/include") + file(COPY + "${SOURCE_PATH}/lib/Microsoft.Web.WebView2.Core.winmd" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(COPY + "${SOURCE_PATH}/build/native/${VCPKG_TARGET_ARCHITECTURE}/WebView2Loader.dll.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(COPY + "${SOURCE_PATH}/build/native/${VCPKG_TARGET_ARCHITECTURE}/WebView2Loader.dll" + "${SOURCE_PATH}/runtimes/win-${VCPKG_TARGET_ARCHITECTURE}/native_uap/Microsoft.Web.WebView2.Core.dll" + DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +endif() +if(NOT VCPKG_BUILD_TYPE) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(COPY "${CURRENT_PACKAGES_DIR}/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") + endif() + file(COPY "${CURRENT_PACKAGES_DIR}/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") +endif() + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-webview2-config.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-webview2") + +# The import libraries for webview fail with "Could not find proper second linker member" +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +configure_file("${SOURCE_PATH}/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/webview2/unofficial-webview2-config.cmake b/externals/vcpkg/ports/webview2/unofficial-webview2-config.cmake new file mode 100755 index 000000000..60851bc23 --- /dev/null +++ b/externals/vcpkg/ports/webview2/unofficial-webview2-config.cmake @@ -0,0 +1,21 @@ +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_DIR}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + +if(NOT TARGET unofficial::webview2::webview2) + if(EXISTS "${_IMPORT_PREFIX}/lib/WebView2LoaderStatic.lib") + add_library(unofficial::webview2::webview2 STATIC IMPORTED) + set_target_properties(unofficial::webview2::webview2 + PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" + IMPORTED_LOCATION "${_IMPORT_PREFIX}/lib/WebView2LoaderStatic.lib") + else() + add_library(unofficial::webview2::webview2 SHARED IMPORTED) + set_target_properties(unofficial::webview2::webview2 + PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" + IMPORTED_LOCATION "${_IMPORT_PREFIX}/bin/WebView2Loader.dll" + IMPORTED_IMPLIB "${_IMPORT_PREFIX}/lib/WebView2Loader.dll.lib") + endif() +endif() + +unset(_IMPORT_PREFIX) diff --git a/externals/vcpkg/ports/webview2/vcpkg.json b/externals/vcpkg/ports/webview2/vcpkg.json new file mode 100755 index 000000000..8a0327873 --- /dev/null +++ b/externals/vcpkg/ports/webview2/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "webview2", + "version": "1.0.1210.39", + "description": "The WebView2 control allows you to embed web technologies (HTML, CSS, and JavaScript) using Microsoft Edge", + "homepage": "https://docs.microsoft.com/en-us/microsoft-edge/webview2", + "documentation": "https://docs.microsoft.com/en-us/microsoft-edge/webview2", + "license": "BSD-3-Clause", + "supports": "windows & (x86 | x64 | arm64)", + "dependencies": [ + "wil" + ] +} diff --git a/externals/vcpkg/ports/wepoll/CMakeLists.txt b/externals/vcpkg/ports/wepoll/CMakeLists.txt new file mode 100755 index 000000000..cd8d29a2c --- /dev/null +++ b/externals/vcpkg/ports/wepoll/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.14) + +project(wepoll C) + +add_library(wepoll wepoll.c) + +if (MSVC) + if (BUILD_SHARED_LIBS) + target_compile_definitions( + wepoll + PRIVATE + "-DWEPOLL_EXPORT=__declspec(dllexport)" + ) + endif () + + target_compile_options(wepoll PRIVATE /Wall /wd4127 /wd4201 /wd4242 /wd4710 /wd4711 /wd4820) + + if (MSVC_VERSION GREATER_EQUAL 1900) + target_compile_options(wepoll PRIVATE /wd5045) + endif () +else () + target_compile_definitions( + wepoll + PRIVATE + "-DWEPOLL_EXPORT=__attribute__((visibility(\"default\")))" + ) + + target_compile_options(wepoll PRIVATE -Wall -Wextra -Werror -fvisibility=hidden) +endif () + +target_link_libraries(wepoll PUBLIC ws2_32) + +set_target_properties( + wepoll + PROPERTIES + OUTPUT_NAME wepoll + PUBLIC_HEADER wepoll.h +) + +install(TARGETS wepoll) diff --git a/externals/vcpkg/ports/wepoll/portfile.cmake b/externals/vcpkg/ports/wepoll/portfile.cmake new file mode 100755 index 000000000..8032e6000 --- /dev/null +++ b/externals/vcpkg/ports/wepoll/portfile.cmake @@ -0,0 +1,30 @@ +if(NOT VCPKG_TARGET_IS_WINDOWS) + message(FATAL_ERROR "${PORT} only supports Windows.") +endif() + +# We use `dist` branch instead of `master` branch here, +# as suggested by the library author. +# https://github.com/microsoft/vcpkg/pull/8280 +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO piscisaureus/wepoll + REF v1.5.8 + SHA512 e87fbdd0f64a06910fdf29565acff0443b500c409cf7456657829ece3674563581a5c9a298f9ac70f5a0bb78c0a5eb17cfd1a164ab5cbd6fdaacd19d015a3f85 + HEAD_REF dist +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/wepoll/vcpkg.json b/externals/vcpkg/ports/wepoll/vcpkg.json new file mode 100755 index 000000000..c2d14c637 --- /dev/null +++ b/externals/vcpkg/ports/wepoll/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "wepoll", + "version-string": "1.5.8", + "port-version": 1, + "description": "Fast epoll for windows", + "homepage": "https://github.com/piscisaureus/wepoll", + "supports": "windows" +} diff --git a/externals/vcpkg/ports/wg21-sg14/portfile.cmake b/externals/vcpkg/ports/wg21-sg14/portfile.cmake new file mode 100755 index 000000000..4fdf80df5 --- /dev/null +++ b/externals/vcpkg/ports/wg21-sg14/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO WG21-SG14/SG14 + REF 836e4d202249a86ba5ff56139c35e0afa60e7a1c + SHA512 002a6b83ecfb41bde978e912feda77639460ff376ad634e1cd0a908e2be35863489132db579d399bb6e5087fcb0355a222e611eae58eb0c2d8372bdd25f60e07 + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/SG14 DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright + +file(STRINGS "${SOURCE_PATH}/SG14/flat_map.h" SOURCE_LINES) +list(SUBLIST SOURCE_LINES 0 26 SOURCE_LINES) +list(JOIN SOURCE_LINES "\n" _contents) + +file(READ "${SOURCE_PATH}/Docs/plf_licensing.txt" plf_licensing_contents) + +file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "${_contents}\n${plf_licensing_contents}") diff --git a/externals/vcpkg/ports/wg21-sg14/vcpkg.json b/externals/vcpkg/ports/wg21-sg14/vcpkg.json new file mode 100755 index 000000000..4999f444b --- /dev/null +++ b/externals/vcpkg/ports/wg21-sg14/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "wg21-sg14", + "version-string": "2019-08-13", + "port-version": 1, + "description": "A library for Study Group 14 of Working Group 21 (C++)", + "homepage": "https://github.com/WG21-SG14/SG14" +} diff --git a/externals/vcpkg/ports/wil/portfile.cmake b/externals/vcpkg/ports/wil/portfile.cmake new file mode 100755 index 000000000..d03741ced --- /dev/null +++ b/externals/vcpkg/ports/wil/portfile.cmake @@ -0,0 +1,23 @@ +#header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Microsoft/wil + REF f9284c19c9873664978b873b8858d7dfacc6af1e + SHA512 df81e7f12f15f8e382f537f783c33c9833bb83c4d86d571bd47503e7400698686f51a8a50efd2224c95a5409ab8ef719186d806afbfc4ea2af8d4fd7f8dce024 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DWIL_BUILD_TESTS=OFF + -DWIL_BUILD_PACKAGING=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/WIL) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/wil/vcpkg.json b/externals/vcpkg/ports/wil/vcpkg.json new file mode 100755 index 000000000..9914ec02d --- /dev/null +++ b/externals/vcpkg/ports/wil/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "wil", + "version-date": "2021-12-25", + "description": "The Windows Implementation Libraries (WIL) is a header-only C++ library created to make life easier for developers on Windows through readable type-safe C++ interfaces for common Windows coding patterns.", + "homepage": "https://github.com/microsoft/wil", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/wildmidi/portfile.cmake b/externals/vcpkg/ports/wildmidi/portfile.cmake new file mode 100755 index 000000000..6dbfb7557 --- /dev/null +++ b/externals/vcpkg/ports/wildmidi/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Mindwerks/wildmidi + REF wildmidi-0.4.4 + SHA512 5B74EE83F1D7CE3B45D2F996AAA30EC6E7D7808EAB294A3EAF6FCEF77443523DF1F54BB0FB1B3105EDD0D72D75885FDA1A2E97C68DEFB5BBD687BDA5077D3454 + HEAD_REF master +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(WANT_STATIC "OFF") +else() + set(WANT_STATIC "ON") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DWANT_PLAYER=OFF + -DWANT_STATIC=${WANT_STATIC} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME WildMidi CONFIG_PATH lib/cmake/WildMidi) +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") + +file(INSTALL "${SOURCE_PATH}/docs/license/LGPLv3.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/wildmidi/vcpkg.json b/externals/vcpkg/ports/wildmidi/vcpkg.json new file mode 100755 index 000000000..389ae4881 --- /dev/null +++ b/externals/vcpkg/ports/wildmidi/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "wildmidi", + "version": "0.4.4", + "description": "MIDI software synthesizer library.", + "homepage": "https://github.com/Mindwerks/wildmidi", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/wincrypt/portfile.cmake b/externals/vcpkg/ports/wincrypt/portfile.cmake new file mode 100755 index 000000000..9eaedf3d2 --- /dev/null +++ b/externals/vcpkg/ports/wincrypt/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_get_windows_sdk(WINDOWS_SDK) + +if (WINDOWS_SDK MATCHES "10.") + set(LIBFILEPATH "$ENV{WindowsSdkDir}Lib\\${WINDOWS_SDK}\\um\\${TRIPLET_SYSTEM_ARCH}\\Crypt32.Lib") + set(HEADERSPATH "$ENV{WindowsSdkDir}Include\\${WINDOWS_SDK}\\um") +elseif(WINDOWS_SDK MATCHES "8.") + set(LIBFILEPATH "$ENV{WindowsSdkDir}Lib\\winv6.3\\um\\${TRIPLET_SYSTEM_ARCH}\\Crypt32.Lib") + set(HEADERSPATH "$ENV{WindowsSdkDir}Include\\um") +else() + message(FATAL_ERROR "Portfile not yet configured for Windows SDK with version: ${WINDOWS_SDK}") +endif() + +if (NOT EXISTS "${LIBFILEPATH}") + message(FATAL_ERROR "Cannot find Windows ${WINDOWS_SDK} SDK. File does not exist: ${LIBFILEPATH}") +endif() + +file(COPY ${LIBFILEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +file(COPY ${LIBFILEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + +if (WINDOWS_SDK MATCHES "10.") + file(WRITE ${CURRENT_PACKAGES_DIR}/share/wincrypt/copyright "See https://developer.microsoft.com/windows/downloads/windows-10-sdk for the Windows 10 SDK license") +elseif(WINDOWS_SDK MATCHES "8.") + file(WRITE ${CURRENT_PACKAGES_DIR}/share/wincrypt/copyright "See https://developer.microsoft.com/windows/downloads/windows-8-1-sdk for the Windows 8.1 SDK license") +endif() + +# Allow empty include directory +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/externals/vcpkg/ports/wincrypt/vcpkg.json b/externals/vcpkg/ports/wincrypt/vcpkg.json new file mode 100755 index 000000000..938cad7fa --- /dev/null +++ b/externals/vcpkg/ports/wincrypt/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "wincrypt", + "version": "0.0", + "port-version": 4, + "description": "Windows Cryptography.", + "supports": "windows" +} diff --git a/externals/vcpkg/ports/winlamb/portfile.cmake b/externals/vcpkg/ports/winlamb/portfile.cmake new file mode 100755 index 000000000..d4509647b --- /dev/null +++ b/externals/vcpkg/ports/winlamb/portfile.cmake @@ -0,0 +1,17 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rodrigocfd/winlamb + REF b7a6767994b2a8c0782c6b6e7b9e78a224a078cf + SHA512 343a900ef003eac47489b34d2b5affc1f133929ff036d535f604fbc5771767075835eed59acd7b93674729badf28ac99f6ba10ac3bf34af6aa4ac49021925e7c + HEAD_REF master +) + +file(GLOB WINLAMB_PUBLIC_HEADERS ${SOURCE_PATH}/*.h) +file(GLOB WINLAMB_INTERNAL_HEADERS ${SOURCE_PATH}/internals/*.h) +file(INSTALL ${WINLAMB_PUBLIC_HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) +file(INSTALL ${WINLAMB_INTERNAL_HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}/internals) + +file(INSTALL ${SOURCE_PATH}/win10.exe.manifest DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/winlamb/vcpkg.json b/externals/vcpkg/ports/winlamb/vcpkg.json new file mode 100755 index 000000000..d290ada88 --- /dev/null +++ b/externals/vcpkg/ports/winlamb/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "winlamb", + "version-date": "2020-10-15", + "description": "A lightweight modern C++11 library for Win32 API, using lambdas to handle Windows messages.", + "homepage": "https://github.com/rodrigocfd/winlamb", + "license": "MIT", + "supports": "windows" +} diff --git a/externals/vcpkg/ports/winpcap/Packet.vcxproj b/externals/vcpkg/ports/winpcap/Packet.vcxproj new file mode 100755 index 000000000..71e190caa --- /dev/null +++ b/externals/vcpkg/ports/winpcap/Packet.vcxproj @@ -0,0 +1,768 @@ + + + + + Debug No NetMon + Win32 + + + Debug No NetMon + x64 + + + Debug NT4 + Win32 + + + Debug NT4 + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release LOG_TO_FILE + Win32 + + + Release LOG_TO_FILE + x64 + + + Release No NetMon LOG_TO_FILE + Win32 + + + Release No NetMon LOG_TO_FILE + x64 + + + Release No NetMon + Win32 + + + Release No NetMon + x64 + + + Release NT4 LOG_TO_FILE + Win32 + + + Release NT4 LOG_TO_FILE + x64 + + + Release NT4 + Win32 + + + Release NT4 + x64 + + + Release + Win32 + + + Release + x64 + + + + {17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52} + Packet + Win32Proj + + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>15.0.28127.55 + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + true + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + true + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + false + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + false + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + true + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + true + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + false + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + false + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + true + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + true + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + false + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + false + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + false + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + false + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + false + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + false + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + false + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + false + + + + Disabled + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;HAVE_IPHELPER_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level4 + EditAndContinue + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + MachineX86 + + + MachineX86 + + + + + X64 + + + Disabled + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;HAVE_IPHELPER_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level4 + ProgramDatabase + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + MachineX64 + + + + + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;HAVE_IPHELPER_API;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX86 + + + MachineX86 + + + + + X64 + + + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS; ;HAVE_IPHELPER_API;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX64 + + + + + Disabled + ..\..\..\Common;..\..\driver;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS; _WINNT4;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level4 + EditAndContinue + + + _UNICODE;UNICODE;_WINNT4;%(PreprocessorDefinitions) + + + version.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + MachineX86 + + + + + X64 + + + Disabled + ..\..\..\Common;..\..\driver;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;PACKET_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level4 + ProgramDatabase + + + version.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + MachineX64 + + + + + ..\..\..\Common;..\..\driver;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS; _WINNT4;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + _UNICODE;UNICODE;_WINNT4;%(PreprocessorDefinitions) + + + version.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX86 + + + + + X64 + + + ..\..\..\Common;..\..\driver;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;PACKET_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + version.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX64 + + + + + Disabled + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;HAVE_IPHELPER_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level4 + EditAndContinue + + + _UNICODE;UNICODE;_WINVISTA;%(PreprocessorDefinitions) + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + MachineX86 + + + + + X64 + + + Disabled + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;HAVE_IPHELPER_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level4 + ProgramDatabase + + + _UNICODE;UNICODE;_WINVISTA;%(PreprocessorDefinitions) + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + MachineX64 + + + + + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;HAVE_IPHELPER_API;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + _UNICODE;UNICODE;_WINVISTA;%(PreprocessorDefinitions) + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX86 + + + + + X64 + + + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS; ;HAVE_IPHELPER_API;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + _UNICODE;UNICODE;_WINVISTA;%(PreprocessorDefinitions) + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX64 + + + + + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;HAVE_IPHELPER_API;_DEBUG_TO_FILE;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX86 + + + + + X64 + + + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS; ;HAVE_IPHELPER_API;_DEBUG_TO_FILE;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX64 + + + + + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;HAVE_IPHELPER_API;_DEBUG_TO_FILE;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + _UNICODE;UNICODE;_WINVISTA;%(PreprocessorDefinitions) + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX86 + + + + + X64 + + + ..\..\..\Common;..\..\driver;..\..\..\..\AirPcap_devpack\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS; ;HAVE_IPHELPER_API;_DEBUG_TO_FILE;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + _UNICODE;UNICODE;_WINVISTA;%(PreprocessorDefinitions) + + + version.lib;setupapi.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX64 + + + + + ..\..\..\Common;..\..\driver;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS; _WINNT4;_DEBUG_TO_FILE;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + _UNICODE;UNICODE;_WINNT4;%(PreprocessorDefinitions) + + + version.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX86 + + + + + X64 + + + ..\..\..\Common;..\..\driver;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;PACKET_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + + Level4 + ProgramDatabase + + + version.lib;%(AdditionalDependencies) + ..\packet.def + true + Windows + true + true + MachineX64 + + + + + true + true + true + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/externals/vcpkg/ports/winpcap/create_bin.bat b/externals/vcpkg/ports/winpcap/create_bin.bat new file mode 100755 index 000000000..aa9e7f106 --- /dev/null +++ b/externals/vcpkg/ports/winpcap/create_bin.bat @@ -0,0 +1,20 @@ +@echo off + +IF "%2"=="" (set WPDPACKDESTDIR=.\WpdPack\) ELSE (set WPDPACKDESTDIR=%2) + +IF ""=="%1" (set WINPCAPSOURCEDIR=.\) ELSE (set WINPCAPSOURCEDIR=%1) + +echo Creating \Lib folder +mkdir %WPDPACKDESTDIR% >nul 2>nul +mkdir %WPDPACKDESTDIR%\Bin >nul 2>nul +mkdir %WPDPACKDESTDIR%\Bin\x64 >nul 2>nul + +xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x86\wpcap.dll" %WPDPACKDESTDIR%\Bin\ >nul +xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x64\wpcap.dll" %WPDPACKDESTDIR%\Bin\x64 >nul +xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x86\packet.dll %WPDPACKDESTDIR%\Bin\ >nul +xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x64\packet.dll %WPDPACKDESTDIR%\Bin\x64 >nul + +echo Folder \Bin created successfully + +set WPDPACKDESTDIR= +set WINPCAPSOURCEDIR= \ No newline at end of file diff --git a/externals/vcpkg/ports/winpcap/create_lib.patch b/externals/vcpkg/ports/winpcap/create_lib.patch new file mode 100755 index 000000000..8e144fa3d --- /dev/null +++ b/externals/vcpkg/ports/winpcap/create_lib.patch @@ -0,0 +1,19 @@ +diff --git a/create_lib.bat b/create_lib.bat +index dbe511c..d431b88 100644 +--- a/create_lib.bat ++++ b/create_lib.bat +@@ -9,12 +9,10 @@ mkdir %WPDPACKDESTDIR% >nul 2>nul + mkdir %WPDPACKDESTDIR%\Lib >nul 2>nul + mkdir %WPDPACKDESTDIR%\Lib\x64 >nul 2>nul + +-xcopy /v /Y %WINPCAPSOURCEDIR%\wpcap\PRJ\Release\x86\wpcap.lib %WPDPACKDESTDIR%\Lib\ >nul +-xcopy /v /Y %WINPCAPSOURCEDIR%\wpcap\PRJ\Release\x64\wpcap.lib %WPDPACKDESTDIR%\Lib\x64 >nul ++xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x86\wpcap.lib" %WPDPACKDESTDIR%\Lib\ >nul ++xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x64\wpcap.lib" %WPDPACKDESTDIR%\Lib\x64 >nul + xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x86\packet.lib %WPDPACKDESTDIR%\Lib\ >nul + xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x64\packet.lib %WPDPACKDESTDIR%\Lib\x64 >nul +-xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\libpacket.a %WPDPACKDESTDIR%\Lib\ >nul +-xcopy /v /Y %WINPCAPSOURCEDIR%\wpcap\LIB\libwpcap.a %WPDPACKDESTDIR%\Lib\ >nul + + echo Folder \Lib created successfully + diff --git a/externals/vcpkg/ports/winpcap/fix-create-lib-batch.patch b/externals/vcpkg/ports/winpcap/fix-create-lib-batch.patch new file mode 100755 index 000000000..0a1d9017d --- /dev/null +++ b/externals/vcpkg/ports/winpcap/fix-create-lib-batch.patch @@ -0,0 +1,23 @@ +diff --git a/create_lib.bat b/create_lib.bat +index c70a179..4690d9e 100644 +--- a/create_lib.bat ++++ b/create_lib.bat +@@ -7,10 +7,16 @@ IF ""=="%1" (set WINPCAPSOURCEDIR=.\) ELSE (set WINPCAPSOURCEDIR=%1) + echo Creating \Lib folder + mkdir %WPDPACKDESTDIR% >nul 2>nul + mkdir %WPDPACKDESTDIR%\Lib >nul 2>nul ++mkdir %WPDPACKDESTDIR%\Lib\debug\ >nul 2>nul + mkdir %WPDPACKDESTDIR%\Lib\x64 >nul 2>nul ++mkdir %WPDPACKDESTDIR%\Lib\x64\debug >nul 2>nul + +-xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x86\wpcap.lib" %WPDPACKDESTDIR%\Lib\ >nul +-xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x64\wpcap.lib" %WPDPACKDESTDIR%\Lib\x64 >nul ++xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Debug No AirPcap\x86\wpcap.lib" %WPDPACKDESTDIR%\Lib\debug\ >nul ++xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Debug No AirPcap\x64\wpcap.lib" %WPDPACKDESTDIR%\Lib\x64\debug\ >nul ++xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x86\wpcap.lib" %WPDPACKDESTDIR%\Lib\ >nul ++xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x64\wpcap.lib" %WPDPACKDESTDIR%\Lib\x64 >nul ++xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Debug\x86\packet.lib %WPDPACKDESTDIR%\Lib\debug\ >nul ++xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Debug\x64\packet.lib %WPDPACKDESTDIR%\Lib\x64\debug\ >nul + xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x86\packet.lib %WPDPACKDESTDIR%\Lib\ >nul + xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x64\packet.lib %WPDPACKDESTDIR%\Lib\x64 >nul + diff --git a/externals/vcpkg/ports/winpcap/packetNtx.patch.in b/externals/vcpkg/ports/winpcap/packetNtx.patch.in new file mode 100755 index 000000000..c19056a0c --- /dev/null +++ b/externals/vcpkg/ports/winpcap/packetNtx.patch.in @@ -0,0 +1,725 @@ +diff --git a/packetNtx/Dll/Project/Packet.dsp b/packetNtx/Dll/Project/Packet.dsp +index 6e69440..fc520ce 100644 +--- a/packetNtx/Dll/Project/Packet.dsp ++++ b/packetNtx/Dll/Project/Packet.dsp +@@ -55,8 +55,8 @@ RSC=rc.exe + # PROP Intermediate_Dir "Release" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" +-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +-# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "NDEBUG" /D "HAVE_AIRPCAP_API" /D "WIN32" /D "_WINDOWS" /D "HAVE_IPHELPER_API" /D "HAVE_WANPACKET_API" /YX /FD /c ++# ADD BASE CPP /nologo /@CRT_LINKAGE@ /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c ++# ADD CPP /nologo /@CRT_LINKAGE@ /W3 /GX /Zi /O2 /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "HAVE_IPHELPER_API" /YX /FD /c + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + # ADD BASE RSC /l 0x410 /d "NDEBUG" +@@ -87,8 +87,8 @@ PostBuild_Cmds=copy $(OutDir)\packet.lib . + # PROP Intermediate_Dir "Debug" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" +-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "HAVE_AIRPCAP_API" /D "WIN32" /D "_WINDOWS" /D "HAVE_IPHELPER_API" /D "HAVE_WANPACKET_API" /YX /FD /c ++# ADD BASE CPP /nologo /@CRT_LINKAGE@d /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c ++# ADD CPP /nologo /@CRT_LINKAGE@d /W3 /Gm /GX /ZI /Od /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "WIN32" /D "_WINDOWS" /D "HAVE_IPHELPER_API" /YX /FD /c + # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + # ADD BASE RSC /l 0x410 /d "_DEBUG" +@@ -120,8 +120,8 @@ PostBuild_Cmds=copy $(OutDir)\packet.lib . + # PROP Intermediate_Dir "NT4_Debug" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" +-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../common" /D "WIN32" /D "_WINDOWS" /YX /FD /c +-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "WIN32" /D "_WINDOWS" /D "_WINNT4" /YX /FD /c ++# ADD BASE CPP /nologo /@CRT_LINKAGE@d /W3 /Gm /GX /ZI /Od /I "../../../common" /D "WIN32" /D "_WINDOWS" /YX /FD /c ++# ADD CPP /nologo /@CRT_LINKAGE@d /W3 /Gm /GX /ZI /Od /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "WIN32" /D "_WINDOWS" /D "_WINNT4" /YX /FD /c + # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "_DEBUG" /D "_WINNT4" /mktyplib203 /o "NUL" /win32 + # ADD BASE RSC /l 0x410 /d "_DEBUG" +@@ -154,8 +154,8 @@ PostBuild_Cmds=copy $(OutDir)\packet.lib . + # PROP Intermediate_Dir "NT4_Release" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" +-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../../../common" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c +-# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINNT4" /YX /FD /c ++# ADD BASE CPP /nologo /@CRT_LINKAGE@ /W3 /GX /O2 /I "../../../common" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c ++# ADD CPP /nologo /@CRT_LINKAGE@ /W3 /GX /Zi /O2 /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINNT4" /YX /FD /c + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "NDEBUG" /D "_WINNT4" /mktyplib203 /o "NUL" /win32 + # ADD BASE RSC /l 0x410 /d "NDEBUG" +@@ -187,8 +187,8 @@ PostBuild_Cmds=copy $(OutDir)\packet.lib . + # PROP Intermediate_Dir "Debug_LOG_TO_FILE" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" +-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../common" /I "../../../dag/include" /I "../../../dag/drv/windows" /D "WIN32" /D "_WINDOWS" /D "HAVE_DAG_API" /YX /FD /c +-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "HAVE_AIRPCAP_API" /D "_DEBUG_TO_FILE" /D "WIN32" /D "_WINDOWS" /D "HAVE_WANPACKET_API" /D "HAVE_IPHELPER_API" /FR /YX /FD /c ++# ADD BASE CPP /nologo /@CRT_LINKAGE@d /W3 /Gm /GX /ZI /Od /I "../../../common" /I "../../../dag/include" /I "../../../dag/drv/windows" /D "WIN32" /D "_WINDOWS" /D "HAVE_DAG_API" /YX /FD /c ++# ADD CPP /nologo /@CRT_LINKAGE@d /W3 /Gm /GX /ZI /Od /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "_DEBUG_TO_FILE" /D "WIN32" /D "_WINDOWS" /D "HAVE_IPHELPER_API" /FR /YX /FD /c + # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + # ADD BASE RSC /l 0x410 /d "_DEBUG" +@@ -221,8 +221,8 @@ PostBuild_Cmds=copy $(OutDir)\packet.lib . + # PROP Intermediate_Dir "Release_LOG_TO_FILE" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" +-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../../../common" /I "../../../dag/include" /I "../../../dag/drv/windows" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "HAVE_DAG_API" /YX /FD /c +-# ADD CPP /nologo /MT /W4 /GX /Zi /O2 /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "NDEBUG" /D "HAVE_AIRPCAP_API" /D "_DEBUG_TO_FILE" /D "WIN32" /D "_WINDOWS" /D "HAVE_WANPACKET_API" /D "HAVE_IPHELPER_API" /FR /YX /FD /c ++# ADD BASE CPP /nologo /@CRT_LINKAGE@ /W3 /GX /O2 /I "../../../common" /I "../../../dag/include" /I "../../../dag/drv/windows" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "HAVE_DAG_API" /YX /FD /c ++# ADD CPP /nologo /@CRT_LINKAGE@ /W4 /GX /Zi /O2 /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "NDEBUG" /D "_DEBUG_TO_FILE" /D "WIN32" /D "_WINDOWS" /D "HAVE_IPHELPER_API" /FR /YX /FD /c + # SUBTRACT CPP /u + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +@@ -255,8 +255,8 @@ PostBuild_Cmds=copy $(OutDir)\packet.lib . + # PROP Intermediate_Dir "NT4_Debug_LOG_TO_FILE" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" +-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../common" /D "WIN32" /D "_WINDOWS" /D "_WINNT4" /YX /FD /c +-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "WIN32" /D "_WINDOWS" /D "_WINNT4" /D "_DEBUG_TO_FILE" /YX /FD /c ++# ADD BASE CPP /nologo /@CRT_LINKAGE@d /W3 /Gm /GX /ZI /Od /I "../../../common" /D "WIN32" /D "_WINDOWS" /D "_WINNT4" /YX /FD /c ++# ADD CPP /nologo /@CRT_LINKAGE@d /W3 /Gm /GX /ZI /Od /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "WIN32" /D "_WINDOWS" /D "_WINNT4" /D "_DEBUG_TO_FILE" /YX /FD /c + # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "_DEBUG" /D "_WINNT4" /mktyplib203 /o "NUL" /win32 + # ADD BASE RSC /l 0x410 /d "_DEBUG" +@@ -289,8 +289,8 @@ PostBuild_Cmds=copy $(OutDir)\packet.lib . + # PROP Intermediate_Dir "NT4_Release_LOG_TO_FILE" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" +-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../../../common" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINNT4" /YX /FD /c +-# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINNT4" /D "_DEBUG_TO_FILE" /YX /FD /c ++# ADD BASE CPP /nologo /@CRT_LINKAGE@ /W3 /GX /O2 /I "../../../common" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINNT4" /YX /FD /c ++# ADD CPP /nologo /@CRT_LINKAGE@ /W3 /GX /Zi /O2 /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_WINNT4" /D "_DEBUG_TO_FILE" /YX /FD /c + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "NDEBUG" /D "_WINNT4" /mktyplib203 /o "NUL" /win32 + # ADD BASE RSC /l 0x410 /d "NDEBUG" +@@ -323,8 +323,8 @@ PostBuild_Cmds=copy $(OutDir)\packet.lib . + # PROP Intermediate_Dir "Debug_No_AirPcap" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" +-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../z1211u/airpcap/" /D "WIN32" /D "_WINDOWS" /D "HAVE_AIRPCAP_API" /YX /FD /c +-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "WIN32" /D "_WINDOWS" /D "HAVE_WANPACKET_API" /D "HAVE_IPHELPER_API" /YX /FD /c ++# ADD BASE CPP /nologo /@CRT_LINKAGE@d /W3 /Gm /GX /ZI /Od /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../z1211u/airpcap/" /D "WIN32" /D "_WINDOWS" /YX /FD /c ++# ADD CPP /nologo /@CRT_LINKAGE@d /W3 /Gm /GX /ZI /Od /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "WIN32" /D "_WINDOWS" /D "HAVE_IPHELPER_API" /YX /FD /c + # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + # ADD BASE RSC /l 0x410 /d "_DEBUG" +@@ -357,8 +357,8 @@ PostBuild_Cmds=copy $(OutDir)\packet.lib . + # PROP Intermediate_Dir "Release_No_AirPcap" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" +-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../z1211u/airpcap/" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "HAVE_AIRPCAP_API" /YX /FD /c +-# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "HAVE_WANPACKET_API" /D "HAVE_IPHELPER_API" /YX /FD /c ++# ADD BASE CPP /nologo /@CRT_LINKAGE@ /W3 /GX /O2 /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../z1211u/airpcap/" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c ++# ADD CPP /nologo /@CRT_LINKAGE@ /W3 /GX /Zi /O2 /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "HAVE_IPHELPER_API" /YX /FD /c + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + # ADD BASE RSC /l 0x410 /d "NDEBUG" +@@ -390,8 +390,8 @@ PostBuild_Cmds=copy $(OutDir)\packet.lib . + # PROP Intermediate_Dir "Debug_No_NpfIm" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" +-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "HAVE_AIRPCAP_API" /D "WIN32" /D "_WINDOWS" /D "HAVE_WANPACKET_API" /D "HAVE_IPHELPER_API" /D "HAVE_NPFIM_API" /D "_DBG" /YX /FD /c +-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /I "../../../../NpfIm_DevPack" /D "HAVE_AIRPCAP_API" /D "WIN32" /D "_WINDOWS" /D "HAVE_WANPACKET_API" /D "HAVE_IPHELPER_API" /D "HAVE_NPFIM_API" /YX /FD /c ++# ADD BASE CPP /nologo /@CRT_LINKAGE@d /W3 /Gm /GX /ZI /Od /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "WIN32" /D "_WINDOWS" /D "HAVE_IPHELPER_API" /D "HAVE_NPFIM_API" /D "_DBG" /YX /FD /c ++# ADD CPP /nologo /@CRT_LINKAGE@d /W3 /Gm /GX /ZI /Od /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /I "../../../../NpfIm_DevPack" /D "WIN32" /D "_WINDOWS" /D "HAVE_IPHELPER_API" /D "HAVE_NPFIM_API" /YX /FD /c + # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + # ADD BASE RSC /l 0x410 /d "_DEBUG" +@@ -424,8 +424,8 @@ PostBuild_Cmds=copy $(OutDir)\packet.lib . + # PROP Intermediate_Dir "Release_No_NpfIm" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" +-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "NDEBUG" /D "HAVE_AIRPCAP_API" /D "WIN32" /D "_WINDOWS" /D "HAVE_WANPACKET_API" /D "HAVE_IPHELPER_API" /D "HAVE_NPFIM_API" /YX /FD /c +-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /I "../../../../NpfIm_DevPack" /D "NDEBUG" /D "HAVE_AIRPCAP_API" /D "WIN32" /D "_WINDOWS" /D "HAVE_WANPACKET_API" /D "HAVE_IPHELPER_API" /D "HAVE_NPFIM_API" /YX /FD /c ++# ADD BASE CPP /nologo /@CRT_LINKAGE@ /W3 /GX /O2 /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "HAVE_IPHELPER_API" /D "HAVE_NPFIM_API" /YX /FD /c ++# ADD CPP /nologo /@CRT_LINKAGE@ /W3 /GX /O2 /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /I "../../../../NpfIm_DevPack" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "HAVE_IPHELPER_API" /D "HAVE_NPFIM_API" /YX /FD /c + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + # ADD BASE RSC /l 0x410 /d "NDEBUG" +@@ -457,8 +457,8 @@ PostBuild_Cmds=copy $(OutDir)\packet.lib . + # PROP Intermediate_Dir "Debug_Vista" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" +-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "HAVE_AIRPCAP_API" /D "WIN32" /D "_WINDOWS" /D "HAVE_IPHELPER_API" /D "HAVE_NPFIM_API" /YX /FD /c +-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "HAVE_AIRPCAP_API" /D "WIN32" /D "_WINDOWS" /D "HAVE_IPHELPER_API" /YX /FD /c ++# ADD BASE CPP /nologo /@CRT_LINKAGE@d /W3 /Gm /GX /ZI /Od /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "WIN32" /D "_WINDOWS" /D "HAVE_IPHELPER_API" /D "HAVE_NPFIM_API" /YX /FD /c ++# ADD CPP /nologo /@CRT_LINKAGE@d /W3 /Gm /GX /ZI /Od /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "WIN32" /D "_WINDOWS" /D "HAVE_IPHELPER_API" /YX /FD /c + # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + # ADD BASE RSC /l 0x410 /d "_DEBUG" +@@ -491,8 +491,8 @@ PostBuild_Cmds=copy $(OutDir)\packet.lib . + # PROP Intermediate_Dir "Release_Vista" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" +-# ADD BASE CPP /nologo /MT /W3 /GX /Zi /O2 /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "NDEBUG" /D "HAVE_AIRPCAP_API" /D "WIN32" /D "_WINDOWS" /D "HAVE_IPHELPER_API" /D "HAVE_NPFIM_API" /YX /FD /c +-# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "NDEBUG" /D "HAVE_AIRPCAP_API" /D "WIN32" /D "_WINDOWS" /D "HAVE_IPHELPER_API" /YX /FD /c ++# ADD BASE CPP /nologo /@CRT_LINKAGE@ /W3 /GX /Zi /O2 /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "HAVE_IPHELPER_API" /D "HAVE_NPFIM_API" /YX /FD /c ++# ADD CPP /nologo /@CRT_LINKAGE@ /W3 /GX /Zi /O2 /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "HAVE_IPHELPER_API" /YX /FD /c + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + # ADD BASE RSC /l 0x410 /d "NDEBUG" +@@ -525,9 +525,9 @@ PostBuild_Cmds=copy $(OutDir)\packet.lib . + # PROP Intermediate_Dir "Release_Vista_LOG_TO_FILE" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" +-# ADD BASE CPP /nologo /MT /W4 /GX /Zi /O2 /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "NDEBUG" /D "HAVE_AIRPCAP_API" /D "_DEBUG_TO_FILE" /D "WIN32" /D "_WINDOWS" /D "HAVE_WANPACKET_API" /D "HAVE_IPHELPER_API" /D "HAVE_NPFIM_API" /FR /YX /FD /c ++# ADD BASE CPP /nologo /@CRT_LINKAGE@ /W4 /GX /Zi /O2 /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "NDEBUG" /D "_DEBUG_TO_FILE" /D "WIN32" /D "_WINDOWS" /D "HAVE_IPHELPER_API" /D "HAVE_NPFIM_API" /FR /YX /FD /c + # SUBTRACT BASE CPP /u +-# ADD CPP /nologo /MT /W4 /GX /Zi /O2 /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "NDEBUG" /D "HAVE_AIRPCAP_API" /D "_DEBUG_TO_FILE" /D "WIN32" /D "_WINDOWS" /D "HAVE_IPHELPER_API" /FR /YX /FD /c ++# ADD CPP /nologo /@CRT_LINKAGE@ /W4 /GX /Zi /O2 /I "../../../dag/include" /I "../../../dag/drv/windows" /I "../../../common" /I "../../../../Airpcap_Devpack/include/" /D "NDEBUG" /D "_DEBUG_TO_FILE" /D "WIN32" /D "_WINDOWS" /D "HAVE_IPHELPER_API" /FR /YX /FD /c + # SUBTRACT CPP /u + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +diff --git a/packetNtx/Dll/Project/Packet.vcproj b/packetNtx/Dll/Project/Packet.vcproj +index 8be719e..e16afe2 100644 +--- a/packetNtx/Dll/Project/Packet.vcproj ++++ b/packetNtx/Dll/Project/Packet.vcproj +@@ -22,7 +22,7 @@ + Name="Debug|Win32" + OutputDirectory="$(ProjectDir)\$(ConfigurationName)\x86" + IntermediateDirectory="$(ProjectDir)\$(ConfigurationName)\x86" +- ConfigurationType="2" ++ ConfigurationType="@LIBRARY_LINKAGE@" + CharacterSet="1" + > + + + + +@@ -201,7 +201,7 @@ + + +@@ -280,7 +280,7 @@ + + + + + +@@ -573,7 +573,7 @@ + Name="Release NT4|x64" + OutputDirectory="$(ProjectDir)\$(ConfigurationName)\x64" + IntermediateDirectory="$(ProjectDir)\$(ConfigurationName)\x64" +- ConfigurationType="2" ++ ConfigurationType="@LIBRARY_LINKAGE@" + CharacterSet="1" + WholeProgramOptimization="1" + > +@@ -614,7 +614,7 @@ + /> + + + +@@ -833,7 +833,7 @@ + +@@ -913,7 +913,7 @@ + + +@@ -992,7 +992,7 @@ + + +@@ -1071,7 +1071,7 @@ + + +@@ -1149,7 +1149,7 @@ + +@@ -1229,7 +1229,7 @@ + + +@@ -1365,7 +1365,7 @@ + Name="Release NT4 LOG_TO_FILE|x64" + OutputDirectory="$(ProjectDir)\$(ConfigurationName)\x64" + IntermediateDirectory="$(ProjectDir)\$(ConfigurationName)\x64" +- ConfigurationType="2" ++ ConfigurationType="@LIBRARY_LINKAGE@" + CharacterSet="1" + WholeProgramOptimization="1" + > +@@ -1406,7 +1406,7 @@ + /> + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + nul copy + # PROP Intermediate_Dir "Debug_REMOTE_DAG" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" +-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /D "HAVE_ADDRINFO" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "_DEBUG" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_REMOTE" /FR /YX /FD /GZ /c +-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D "HAVE_ADDRINFO" /D "_DEBUG" /D "HAVE_REMOTE" /D "HAVE_DAG_API" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_AIRPCAP_API" /FR /YX /FD /GZ /c ++# ADD BASE CPP /nologo /@CRT_LINKAGE@d /W3 /Gm /GX /ZI /Od /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /D "HAVE_ADDRINFO" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "_DEBUG" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_REMOTE" /FR /YX /FD /GZ /c ++# ADD CPP /nologo /@CRT_LINKAGE@d /W3 /Gm /GX /ZI /Od /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D "HAVE_ADDRINFO" /D "_DEBUG" /D "HAVE_REMOTE" /D "HAVE_DAG_API" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_AIRPCAP_API" /FR /YX /FD /GZ /c + # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 + # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 + # ADD BASE RSC /l 0x410 /d "_DEBUG" +@@ -173,8 +173,8 @@ PostBuild_Cmds=mkdir $(OutDir)\..\..\LIB > nul copy + # PROP Intermediate_Dir "Release_REMOTE" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" +-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /D HAVE_ADDRINFO=1 /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "NDEBUG" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_REMOTE" /YX /FD /c +-# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D HAVE_ADDRINFO=1 /D "NDEBUG" /D "HAVE_REMOTE" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_AIRPCAP_API" /YX /FD /c ++# ADD BASE CPP /nologo /@CRT_LINKAGE@ /W3 /GX /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /D HAVE_ADDRINFO=1 /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "NDEBUG" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_REMOTE" /YX /FD /c ++# ADD CPP /nologo /@CRT_LINKAGE@ /W3 /GX /Zi /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D HAVE_ADDRINFO=1 /D "NDEBUG" /D "HAVE_REMOTE" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_AIRPCAP_API" /YX /FD /c + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 + # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 + # ADD BASE RSC /l 0x410 /d "NDEBUG" +@@ -208,8 +208,8 @@ PostBuild_Cmds=mkdir $(OutDir)\..\..\LIB > nul copy + # PROP Intermediate_Dir "Release_REMOTE_DAG" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" +-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /D HAVE_ADDRINFO=1 /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "NDEBUG" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_REMOTE" /YX /FD /c +-# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D HAVE_ADDRINFO=1 /D "NDEBUG" /D "HAVE_REMOTE" /D "HAVE_DAG_API" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_AIRPCAP_API" /YX /FD /c ++# ADD BASE CPP /nologo /@CRT_LINKAGE@ /W3 /GX /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /D HAVE_ADDRINFO=1 /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "NDEBUG" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_REMOTE" /YX /FD /c ++# ADD CPP /nologo /@CRT_LINKAGE@ /W3 /GX /Zi /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D HAVE_ADDRINFO=1 /D "NDEBUG" /D "HAVE_REMOTE" /D "HAVE_DAG_API" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /D "HAVE_AIRPCAP_API" /YX /FD /c + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 + # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 + # ADD BASE RSC /l 0x410 /d "NDEBUG" +@@ -243,8 +243,8 @@ PostBuild_Cmds=mkdir $(OutDir)\..\..\LIB > nul copy + # PROP Intermediate_Dir "Release_REMOTE_NO_AIRPCAP" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" +-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D HAVE_ADDRINFO=1 /D "NDEBUG" /D "HAVE_REMOTE" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /YX /FD /c +-# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D HAVE_ADDRINFO=1 /D "NDEBUG" /D "HAVE_REMOTE" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /YX /FD /c ++# ADD BASE CPP /nologo /@CRT_LINKAGE@ /W3 /GX /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D HAVE_ADDRINFO=1 /D "NDEBUG" /D "HAVE_REMOTE" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /YX /FD /c ++# ADD CPP /nologo /@CRT_LINKAGE@ /W3 /GX /Zi /O2 /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D HAVE_ADDRINFO=1 /D "NDEBUG" /D "HAVE_REMOTE" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /YX /FD /c + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 + # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 + # ADD BASE RSC /l 0x410 /d "NDEBUG" +@@ -278,8 +278,8 @@ PostBuild_Cmds=mkdir $(OutDir)\..\..\LIB > nul copy + # PROP Intermediate_Dir "Debug_REMOTE_NO_AIRPCAP" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" +-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D "HAVE_ADDRINFO" /D "_DEBUG" /D "HAVE_REMOTE" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c +-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D "HAVE_ADDRINFO" /D "_DEBUG" /D "HAVE_REMOTE" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c ++# ADD BASE CPP /nologo /@CRT_LINKAGE@d /W3 /Gm /GX /ZI /Od /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D "HAVE_ADDRINFO" /D "_DEBUG" /D "HAVE_REMOTE" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c ++# ADD CPP /nologo /@CRT_LINKAGE@d /W3 /Gm /GX /ZI /Od /I "../libpcap/" /I "../libpcap/bpf" /I "../libpcap/lbl" /I "../libpcap/Win32/Include" /I "../../common" /I "../Win32-Extensions" /I "../../../Airpcap_Devpack/include" /D "HAVE_ADDRINFO" /D "_DEBUG" /D "HAVE_REMOTE" /D "YY_NEVER_INTERACTIVE" /D yylval=pcap_lval /D "_USRDLL" /D "LIBPCAP_EXPORTS" /D "HAVE_STRERROR" /D "__STDC__" /D "INET6" /D "_WINDOWS" /D SIZEOF_CHAR=1 /D SIZEOF_SHORT=2 /D SIZEOF_INT=4 /D "WPCAP" /D "HAVE_VSNPRINTF" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c + # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 + # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 + # ADD BASE RSC /l 0x410 /d "_DEBUG" +diff --git a/wpcap/PRJ/wpcap.vcproj b/wpcap/PRJ/wpcap.vcproj +index c1d56b4..40a8ce1 100644 +--- a/wpcap/PRJ/wpcap.vcproj ++++ b/wpcap/PRJ/wpcap.vcproj +@@ -22,7 +22,7 @@ + Name="Debug|Win32" + OutputDirectory="$(ProjectDir)\$(ConfigurationName)\x86" + IntermediateDirectory="$(ProjectDir)\$(ConfigurationName)\x86" +- ConfigurationType="2" ++ ConfigurationType="@LIBRARY_LINKAGE@" + CharacterSet="2" + > + + +@@ -205,7 +205,7 @@ + +@@ -285,7 +285,7 @@ + + + +@@ -525,7 +525,7 @@ + +@@ -605,7 +605,7 @@ + + + #if !defined(HAVE_SNPRINTF) +-#define snprintf pcap_snprintf +-extern int snprintf (char *, size_t, const char *, ...); ++#define snprintf _snprintf ++//#define snprintf pcap_snprintf ++//extern int snprintf (char *, size_t, const char *, ...); + #endif + + #if !defined(HAVE_VSNPRINTF) +diff --git a/wpcap/libpcap/rpcapd/rpcapd.dsp b/wpcap/libpcap/rpcapd/rpcapd.dsp +index f7c00af..1cd823e 100644 +--- a/wpcap/libpcap/rpcapd/rpcapd.dsp ++++ b/wpcap/libpcap/rpcapd/rpcapd.dsp +@@ -44,8 +44,8 @@ RSC=rc.exe + # PROP Intermediate_Dir "Debug_REMOTE" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" +-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /FR /YX /FD /GZ /c +-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /FR /YX /FD /GZ /c ++# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /FR /YX /FD /GZ /c ++# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /FR /YX /FD /GZ /c + # ADD BASE RSC /l 0x409 /d "_DEBUG" + # ADD RSC /l 0x409 /d "_DEBUG" + BSC32=bscmake.exe +@@ -69,8 +69,8 @@ LINK32=link.exe + # PROP Intermediate_Dir "Debug_REMOTE_DAG" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" +-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /FR /YX /FD /GZ /c +-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /D "HAVE_DAG_API" /FR /YX /FD /GZ /c ++# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /FR /YX /FD /GZ /c ++# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /D "HAVE_DAG_API" /FR /YX /FD /GZ /c + # ADD BASE RSC /l 0x409 /d "_DEBUG" + # ADD RSC /l 0x409 /d "_DEBUG" + BSC32=bscmake.exe +@@ -94,8 +94,8 @@ LINK32=link.exe + # PROP Intermediate_Dir "Release_REMOTE" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" +-# ADD BASE CPP /nologo /W3 /GX /O2 /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /YX /FD /c +-# ADD CPP /nologo /W3 /GX /Zi /O2 /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /YX /FD /c ++# ADD BASE CPP /nologo /W3 /GX /O2 /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /YX /FD /c ++# ADD CPP /nologo /W3 /GX /Zi /O2 /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /YX /FD /c + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe +@@ -120,8 +120,8 @@ LINK32=link.exe + # PROP Intermediate_Dir "Release_REMOTE_DAG" + # PROP Ignore_Export_Lib 0 + # PROP Target_Dir "" +-# ADD BASE CPP /nologo /W3 /GX /O2 /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /YX /FD /c +-# ADD CPP /nologo /W3 /GX /Zi /O2 /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_SNPRINTF" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /D "HAVE_DAG_API" /YX /FD /c ++# ADD BASE CPP /nologo /W3 /GX /O2 /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /YX /FD /c ++# ADD CPP /nologo /W3 /GX /Zi /O2 /I "../" /I "../bpf/" /I "../Win32/Include" /I "../../../Common/" /I "win32-pthreads" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "HAVE_VSNPRINTF" /D "HAVE_REMOTE" /D "HAVE_DAG_API" /YX /FD /c + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" + BSC32=bscmake.exe +diff --git a/wpcap/libpcap/rpcapd/rpcapd.vcproj b/wpcap/libpcap/rpcapd/rpcapd.vcproj +index 882fbac..b89f1f9 100644 +--- a/wpcap/libpcap/rpcapd/rpcapd.vcproj ++++ b/wpcap/libpcap/rpcapd/rpcapd.vcproj +@@ -41,7 +41,7 @@ + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\;..\Win32\include;..\..\..\Common;.\Win32-pthreads;..\..\Win32-Extensions" +- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_SNPRINTF;HAVE_VSNPRINTF;HAVE_REMOTE;WPCAP;_CRT_SECURE_NO_DEPRECATE;HAVE_TC_API" ++ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_VSNPRINTF;HAVE_REMOTE;WPCAP;_CRT_SECURE_NO_DEPRECATE;HAVE_TC_API" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" +@@ -119,7 +119,7 @@ + + + + + Debug No AirPcap + Win32 + + + Debug No AirPcap + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release No AirPcap + Win32 + + + Release No AirPcap + x64 + + + Release + Win32 + + + Release + x64 + + + + {20B438DA-CBEC-4AFF-B11C-67B301D14AD5} + wpcap + Win32Proj + + + + StaticLibrary + v141 + MultiByte + true + + + StaticLibrary + v141 + MultiByte + + + StaticLibrary + v141 + MultiByte + true + + + StaticLibrary + v141 + MultiByte + + + StaticLibrary + v141 + MultiByte + true + + + StaticLibrary + v141 + MultiByte + + + StaticLibrary + v141 + MultiByte + true + + + StaticLibrary + v141 + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>15.0.28127.55 + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + true + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + true + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + false + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + false + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + true + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + true + + + $(ProjectDir)\$(Configuration)\x86\ + $(ProjectDir)\$(Configuration)\x86\ + false + + + $(ProjectDir)\$(Configuration)\x64\ + $(ProjectDir)\$(Configuration)\x64\ + false + + + + Disabled + ..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;..\..\..\AirPcap_DevPack\include;%(AdditionalIncludeDirectories) + LIBPCAP_EXPORTS;WIN32;_DEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;HAVE_AIRPCAP_API;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level3 + EditAndContinue + + + ws2_32.lib;packet.lib;%(AdditionalDependencies) + ..\..\packetNtx\Dll\Project\Debug\x86;%(AdditionalLibraryDirectories) + false + wpcap.def + true + Windows + MachineX86 + + + + + X64 + + + Disabled + ..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;..\..\..\AirPcap_DevPack\include;%(AdditionalIncludeDirectories) + LIBPCAP_EXPORTS;WIN32;_DEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;HAVE_AIRPCAP_API;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level3 + ProgramDatabase + + + ws2_32.lib;packet.lib;%(AdditionalDependencies) + ..\..\packetNtx\Dll\Project\Debug\x64;%(AdditionalLibraryDirectories) + false + wpcap.def + true + Windows + MachineX64 + + + + + ..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;..\..\..\AirPcap_DevPack\include;%(AdditionalIncludeDirectories) + LIBPCAP_EXPORTS;WIN32;NDEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;HAVE_AIRPCAP_API;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions) + MultiThreaded + + Level3 + ProgramDatabase + + + ws2_32.lib;packet.lib;%(AdditionalDependencies) + ..\..\packetNtx\Dll\Project\Release\x86;%(AdditionalLibraryDirectories) + wpcap.def + true + Windows + true + true + MachineX86 + + + + + X64 + + + ..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;..\..\..\AirPcap_DevPack\include;%(AdditionalIncludeDirectories) + LIBPCAP_EXPORTS;WIN32;NDEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;HAVE_AIRPCAP_API;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions) + MultiThreaded + + Level3 + ProgramDatabase + + + ws2_32.lib;packet.lib;%(AdditionalDependencies) + ..\..\packetNtx\Dll\Project\Release\x64;%(AdditionalLibraryDirectories) + wpcap.def + true + Windows + true + true + MachineX64 + + + + + Disabled + ..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;%(AdditionalIncludeDirectories) + LIBPCAP_EXPORTS;WIN32;_DEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level3 + EditAndContinue + + + ws2_32.lib;packet.lib;%(AdditionalDependencies) + ..\..\packetNtx\Dll\Project\Debug\x86;%(AdditionalLibraryDirectories) + false + wpcap.def + true + Windows + MachineX86 + + + MachineX86 + + + + + X64 + + + Disabled + ..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;%(AdditionalIncludeDirectories) + LIBPCAP_EXPORTS;WIN32;_DEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level3 + ProgramDatabase + + + ws2_32.lib;packet.lib;%(AdditionalDependencies) + ..\..\packetNtx\Dll\Project\Debug\x64;%(AdditionalLibraryDirectories) + false + wpcap.def + true + Windows + MachineX64 + + + + + ..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;%(AdditionalIncludeDirectories) + LIBPCAP_EXPORTS;WIN32;NDEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions) + MultiThreaded + + Level3 + ProgramDatabase + + + ws2_32.lib;packet.lib;%(AdditionalDependencies) + ..\..\packetNtx\Dll\Project\Release\x86;%(AdditionalLibraryDirectories) + wpcap.def + true + Windows + true + true + MachineX86 + + + MachineX86 + + + + + X64 + + + ..\libpcap;..\libpcap\lbl;..\libpcap\bpf\;..\..\common;..\libpcap\win32\include;..\Win32-Extensions;%(AdditionalIncludeDirectories) + LIBPCAP_EXPORTS;WIN32;NDEBUG;_WINDOWS;HAVE_ADDRINFO;YY_NEVER_INTERACTIVE;yylval=pcap_lval;HAVE_STRERROR;__STDC__;INET6;SIZEOF_CHAR=1;SIZEOF_SHORT=2;SIZEOF_INT=4;WPCAP;HAVE_VSNPRINTF;HAVE_REMOTE;_U_=;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;HAVE_TC_API;%(PreprocessorDefinitions) + MultiThreaded + + Level3 + ProgramDatabase + + + ws2_32.lib;packet.lib;%(AdditionalDependencies) + ..\..\packetNtx\Dll\Project\Release\x64;%(AdditionalLibraryDirectories) + wpcap.def + true + Windows + true + true + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/externals/vcpkg/ports/winpty/CMakeLists.txt b/externals/vcpkg/ports/winpty/CMakeLists.txt new file mode 100755 index 000000000..ce3eb0021 --- /dev/null +++ b/externals/vcpkg/ports/winpty/CMakeLists.txt @@ -0,0 +1,172 @@ +cmake_minimum_required(VERSION 3.12.0) + +set(PROJECT_VERSION "0.4.3") +project(winpty VERSION ${PROJECT_VERSION} LANGUAGES CXX) + +add_definitions(-DPROJECT_VERSION="${PROJECT_VERSION}") +add_definitions(-D_WIN32_WINNT=0x0600) +add_definitions(-DUNICODE) +add_definitions(-D_UNICODE) +add_definitions(-DNOMINMAX) + +if("${BUILD_TYPE}" STREQUAL "STATIC") + add_definitions(-DBUILD_STATIC) +else() + add_definitions(-DCOMPILING_WINPTY_DLL) +endif() + +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(WINPTY_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include) +set(WINPTY_INSTALL_BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin) +set(WINPTY_INSTALL_LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib) + +include_directories(${WINPTY_INSTALL_INCLUDE_DIR}) + +#winpty library +set(WINPTYLIB_SOURCE_FILES + src/include/winpty.h + src/libwinpty/AgentLocation.cc + src/libwinpty/AgentLocation.h + src/libwinpty/winpty.cc + src/shared/AgentMsg.h + src/shared/BackgroundDesktop.h + src/shared/BackgroundDesktop.cc + src/shared/Buffer.h + src/shared/Buffer.cc + src/shared/DebugClient.h + src/shared/DebugClient.cc + src/shared/GenRandom.h + src/shared/GenRandom.cc + src/shared/OsModule.h + src/shared/OwnedHandle.h + src/shared/OwnedHandle.cc + src/shared/StringBuilder.h + src/shared/StringUtil.cc + src/shared/StringUtil.h + src/shared/WindowsSecurity.cc + src/shared/WindowsSecurity.h + src/shared/WindowsVersion.h + src/shared/WindowsVersion.cc + src/shared/WinptyAssert.h + src/shared/WinptyAssert.cc + src/shared/WinptyException.h + src/shared/WinptyException.cc + src/shared/WinptyVersion.h + src/shared/WinptyVersion.cc + src/shared/winpty_snprintf.h +) + +add_library( winpty ${BUILD_TYPE} ${WINPTYLIB_SOURCE_FILES} ) + +#winpty agent executable +set(WINPTYAGENT_SOURCE_FILES + src/agent/Agent.h + src/agent/Agent.cc + src/agent/AgentCreateDesktop.h + src/agent/AgentCreateDesktop.cc + src/agent/ConsoleFont.cc + src/agent/ConsoleFont.h + src/agent/ConsoleInput.cc + src/agent/ConsoleInput.h + src/agent/ConsoleInputReencoding.cc + src/agent/ConsoleInputReencoding.h + src/agent/ConsoleLine.cc + src/agent/ConsoleLine.h + src/agent/Coord.h + src/agent/DebugShowInput.h + src/agent/DebugShowInput.cc + src/agent/DefaultInputMap.h + src/agent/DefaultInputMap.cc + src/agent/DsrSender.h + src/agent/EventLoop.h + src/agent/EventLoop.cc + src/agent/InputMap.h + src/agent/InputMap.cc + src/agent/LargeConsoleRead.h + src/agent/LargeConsoleRead.cc + src/agent/NamedPipe.h + src/agent/NamedPipe.cc + src/agent/Scraper.h + src/agent/Scraper.cc + src/agent/SimplePool.h + src/agent/SmallRect.h + src/agent/Terminal.h + src/agent/Terminal.cc + src/agent/UnicodeEncoding.h + src/agent/Win32Console.cc + src/agent/Win32Console.h + src/agent/Win32ConsoleBuffer.cc + src/agent/Win32ConsoleBuffer.h + src/agent/main.cc + src/shared/AgentMsg.h + src/shared/BackgroundDesktop.h + src/shared/BackgroundDesktop.cc + src/shared/Buffer.h + src/shared/Buffer.cc + src/shared/DebugClient.h + src/shared/DebugClient.cc + src/shared/GenRandom.h + src/shared/GenRandom.cc + src/shared/OsModule.h + src/shared/OwnedHandle.h + src/shared/OwnedHandle.cc + src/shared/StringBuilder.h + src/shared/StringUtil.cc + src/shared/StringUtil.h + src/shared/UnixCtrlChars.h + src/shared/WindowsSecurity.cc + src/shared/WindowsSecurity.h + src/shared/WindowsVersion.h + src/shared/WindowsVersion.cc + src/shared/WinptyAssert.h + src/shared/WinptyAssert.cc + src/shared/WinptyException.h + src/shared/WinptyException.cc + src/shared/WinptyVersion.h + src/shared/WinptyVersion.cc + src/shared/winpty_snprintf.h +) + +add_executable(winpty-agent ${WINPTYAGENT_SOURCE_FILES}) +target_compile_definitions(winpty-agent PRIVATE -DWINPTY_AGENT_ASSERT) + + +#winpty debugserver executable +set(WINPTYAGENT_SOURCE_FILES + src/debugserver/DebugServer.cc + src/shared/DebugClient.h + src/shared/DebugClient.cc + src/shared/OwnedHandle.h + src/shared/OwnedHandle.cc + src/shared/OsModule.h + src/shared/StringBuilder.h + src/shared/StringUtil.cc + src/shared/StringUtil.h + src/shared/WindowsSecurity.h + src/shared/WindowsSecurity.cc + src/shared/WindowsVersion.h + src/shared/WindowsVersion.cc + src/shared/WinptyAssert.h + src/shared/WinptyAssert.cc + src/shared/WinptyException.h + src/shared/WinptyException.cc + src/shared/winpty_snprintf.h +) + +add_executable(winpty-debugserver ${WINPTYAGENT_SOURCE_FILES}) + + +if("${BUILD_TYPE}" STREQUAL "STATIC") + install(TARGETS winpty DESTINATION ${WINPTY_INSTALL_LIB_DIR}) +else() + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/winpty.dll DESTINATION ${WINPTY_INSTALL_BIN_DIR}) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/winpty.lib DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) +endif() +install(TARGETS winpty-agent DESTINATION ${WINPTY_INSTALL_BIN_DIR}) +install(TARGETS winpty-debugserver DESTINATION ${WINPTY_INSTALL_BIN_DIR}) +install(FILES src/include/winpty.h src/include/winpty_constants.h DESTINATION ${WINPTY_INSTALL_INCLUDE_DIR}) + + + diff --git a/externals/vcpkg/ports/winpty/allow-build-static.patch b/externals/vcpkg/ports/winpty/allow-build-static.patch new file mode 100755 index 000000000..14447dfbd --- /dev/null +++ b/externals/vcpkg/ports/winpty/allow-build-static.patch @@ -0,0 +1,45 @@ +diff --git a/src/include/winpty.h b/src/include/winpty.h +index fdfe4bc..7864d96 100644 +--- a/src/include/winpty.h ++++ b/src/include/winpty.h +@@ -32,11 +32,15 @@ + * When compiled with __declspec(dllexport), with either MinGW or MSVC, the + * winpty functions are unadorned--no underscore prefix or '@nn' suffix--so + * GetProcAddress can be used easily. */ ++#ifndef BUILD_STATIC + #ifdef COMPILING_WINPTY_DLL + #define WINPTY_API __declspec(dllexport) + #else + #define WINPTY_API __declspec(dllimport) + #endif ++#else ++#define WINPTY_API ++#endif + + #ifdef __cplusplus + extern "C" { +diff --git a/src/shared/WinptyVersion.cc b/src/shared/WinptyVersion.cc +index 76bb8a5..33a2c23 100644 +--- a/src/shared/WinptyVersion.cc ++++ b/src/shared/WinptyVersion.cc +@@ -28,15 +28,15 @@ + // This header is auto-generated by either the Makefile (Unix) or + // UpdateGenVersion.bat (gyp). It is placed in a 'gen' directory, which is + // added to the search path. +-#include "GenVersion.h" ++//#include "GenVersion.h" + + void dumpVersionToStdout() { +- printf("winpty version %s\n", GenVersion_Version); +- printf("commit %s\n", GenVersion_Commit); ++ printf("winpty version %s\n", PROJECT_VERSION); ++ printf("commit %s\n", "empty"); + } + + void dumpVersionToTrace() { + trace("winpty version %s (commit %s)", +- GenVersion_Version, +- GenVersion_Commit); ++ PROJECT_VERSION, ++ "empty"); + } diff --git a/externals/vcpkg/ports/winpty/portfile.cmake b/externals/vcpkg/ports/winpty/portfile.cmake new file mode 100755 index 000000000..87cecef41 --- /dev/null +++ b/externals/vcpkg/ports/winpty/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rprichard/winpty + REF antivirus + SHA512 8f5539c1af2a1127219278446c1d028079867cecdeb03c4f208c7d8176e8802e8075ce1b6992e0ef73db34c69e58f73d3828698d865deb35cb883821ee245e4d + HEAD_REF master + PATCHES + allow-build-static.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(BUILD_TYPE SHARED) +else() + set(BUILD_TYPE STATIC) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DBUILD_TYPE=${BUILD_TYPE} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +vcpkg_copy_tools(TOOL_NAMES winpty-agent winpty-debugserver AUTO_CLEAN) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/winpty/vcpkg.json b/externals/vcpkg/ports/winpty/vcpkg.json new file mode 100755 index 000000000..dc2288546 --- /dev/null +++ b/externals/vcpkg/ports/winpty/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "winpty", + "version": "0.4.3", + "description": "winpty is a Windows software package providing an interface similar to a Unix pty-master for communicating with Windows console programs", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/winreg/portfile.cmake b/externals/vcpkg/ports/winreg/portfile.cmake new file mode 100755 index 000000000..085f76d80 --- /dev/null +++ b/externals/vcpkg/ports/winreg/portfile.cmake @@ -0,0 +1,13 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO GiovanniDicanio/WinReg + REF 4ac74bfec290ec4376100372f59dbc2554e54692 #v5.1.0 + SHA512 3d25725c9fc781ffdfa1bbd3ed143a8381d40a1613d4786861e13b180098a5ce92ff193cf25d7490be0096c2eafcace45e6a2f94fbfaa28964d12b80b55d0637 + HEAD_REF master +) + +# Copy the single reusable library header +file(COPY "${SOURCE_PATH}/WinReg/WinReg.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/winreg/vcpkg.json b/externals/vcpkg/ports/winreg/vcpkg.json new file mode 100755 index 000000000..cfe7aeac9 --- /dev/null +++ b/externals/vcpkg/ports/winreg/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "winreg", + "version": "5.1.0", + "description": "High-level C++ wrapper around the Windows Registry C API.", + "homepage": "https://github.com/GiovanniDicanio/WinReg", + "license": "MIT", + "supports": "windows | uwp" +} diff --git a/externals/vcpkg/ports/winsock2/portfile.cmake b/externals/vcpkg/ports/winsock2/portfile.cmake new file mode 100755 index 000000000..b684c2f43 --- /dev/null +++ b/externals/vcpkg/ports/winsock2/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_get_windows_sdk(WINDOWS_SDK) + +if (WINDOWS_SDK MATCHES "10.") + set(LIBFILEPATH "$ENV{WindowsSdkDir}Lib\\${WINDOWS_SDK}\\um\\${TRIPLET_SYSTEM_ARCH}\\Ws2_32.Lib") + set(HEADERSPATH "$ENV{WindowsSdkDir}Include\\${WINDOWS_SDK}\\um") +elseif(WINDOWS_SDK MATCHES "8.") + set(LIBFILEPATH "$ENV{WindowsSdkDir}Lib\\winv6.3\\um\\${TRIPLET_SYSTEM_ARCH}\\Ws2_32.Lib") + set(HEADERSPATH "$ENV{WindowsSdkDir}Include\\um") +else() + message(FATAL_ERROR "Portfile not yet configured for Windows SDK with version: ${WINDOWS_SDK}") +endif() + +if (NOT EXISTS "${LIBFILEPATH}") + message(FATAL_ERROR "Cannot find Windows ${WINDOWS_SDK} SDK. File does not exist: ${LIBFILEPATH}") +endif() + +file(COPY ${LIBFILEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +file(COPY ${LIBFILEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + +if (WINDOWS_SDK MATCHES "10.") + file(WRITE ${CURRENT_PACKAGES_DIR}/share/winsock2/copyright "See https://developer.microsoft.com/windows/downloads/windows-10-sdk for the Windows 10 SDK license") +elseif(WINDOWS_SDK MATCHES "8.") + file(WRITE ${CURRENT_PACKAGES_DIR}/share/winsock2/copyright "See https://developer.microsoft.com/windows/downloads/windows-8-1-sdk for the Windows 8.1 SDK license") +endif() + +# Allow empty include directory +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/externals/vcpkg/ports/winsock2/vcpkg.json b/externals/vcpkg/ports/winsock2/vcpkg.json new file mode 100755 index 000000000..02e569826 --- /dev/null +++ b/externals/vcpkg/ports/winsock2/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "winsock2", + "version": "0.0", + "port-version": 4, + "description": "Windows Sockets.", + "supports": "windows" +} diff --git a/externals/vcpkg/ports/winsparkle/portfile.cmake b/externals/vcpkg/ports/winsparkle/portfile.cmake new file mode 100755 index 000000000..1c86809a6 --- /dev/null +++ b/externals/vcpkg/ports/winsparkle/portfile.cmake @@ -0,0 +1,48 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/vslavik/winsparkle/releases/download/v0.7.0/WinSparkle-0.7.0.zip" + FILENAME "winsparkle-070.zip" + SHA512 c2cf29e1880534c170110f8e5a966939aecc9a9e05afc87868400074f1492fcac949b61e2ce4636eadd2f127caad3660e0f763476e9523aad3834d673f6edd77 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +file(GLOB HEADER_LIST "${SOURCE_PATH}/include/*.h") +file(INSTALL ${HEADER_LIST} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(GLOB TOOLS_LIST "${SOURCE_PATH}/bin/*.bat") +file(INSTALL ${TOOLS_LIST} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + + +# Note: It is an explicit design goal for WinSparkle to be a single +# self-contained DLL with no external dependencies (to the point that +# it even links to static CRT!). This matters for e.g. in-app delta updates +# or re-launching the app after update. It is not statically linked even if a +# static linking is used for everything else. +set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) + +if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + + # We have no debug, but since Winsparkle is a self-contained dll, we can copy it to the Debug folder as well + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + + # We have no debug, but since Winsparkle is a self-contained dll, we can copy it to the Debug folder as well + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +else() + message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/externals/vcpkg/ports/winsparkle/vcpkg.json b/externals/vcpkg/ports/winsparkle/vcpkg.json new file mode 100755 index 000000000..b2055e91a --- /dev/null +++ b/externals/vcpkg/ports/winsparkle/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "winsparkle", + "version": "0.7.0", + "port-version": 1, + "description": "WinSparkle is an easy-to-use software update library for Windows developers.", + "homepage": "https://winsparkle.org", + "license": "MIT", + "supports": "windows & !(arm | uwp)" +} diff --git a/externals/vcpkg/ports/wintoast/CMakeLists.txt b/externals/vcpkg/ports/wintoast/CMakeLists.txt new file mode 100755 index 000000000..eb70fb9cf --- /dev/null +++ b/externals/vcpkg/ports/wintoast/CMakeLists.txt @@ -0,0 +1,25 @@ +cmake_minimum_required(VERSION 3.11) +project(wintoast) + +set(SRC_FILES +src/wintoastlib.cpp +) + +add_library(wintoast ${SRC_FILES}) + +target_include_directories(wintoast PUBLIC + $ + $ +) + +# Install targets +install(TARGETS wintoast + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +# Install headers +if (INSTALL_HEADERS) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/wintoastlib.h DESTINATION include/wintoast) +endif() \ No newline at end of file diff --git a/externals/vcpkg/ports/wintoast/portfile.cmake b/externals/vcpkg/ports/wintoast/portfile.cmake new file mode 100755 index 000000000..3cbb33b65 --- /dev/null +++ b/externals/vcpkg/ports/wintoast/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mohabouje/WinToast + REF v1.2.0 + SHA512 d8bd44439100772929eb8a4eb4aebfd66fa54562c838eb4c081a382dc1d73c545faa6d9675e320864d9b533e4a0c4a673e44058c7f643ccd56ec90830cdfaf45 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_RELEASE -DINSTALL_HEADERS=ON + OPTIONS_DEBUG -DINSTALL_HEADERS=OFF + +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Install license +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/wintoast/vcpkg.json b/externals/vcpkg/ports/wintoast/vcpkg.json new file mode 100755 index 000000000..b96aa95b3 --- /dev/null +++ b/externals/vcpkg/ports/wintoast/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "wintoast", + "version": "1.2.0", + "port-version": 2, + "description": "WinToast is a lightly library written in C++ which brings a complete integration of the modern toast notifications of Windows 8 & Windows 10.", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/woff2/0001-unofficial-brotli.patch b/externals/vcpkg/ports/woff2/0001-unofficial-brotli.patch new file mode 100755 index 000000000..12997b53d --- /dev/null +++ b/externals/vcpkg/ports/woff2/0001-unofficial-brotli.patch @@ -0,0 +1,72 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ecfbb83..420c578 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,13 +34,23 @@ endif() + # Find Brotli dependencies + set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") + find_package(BrotliDec) +-if (NOT BROTLIDEC_FOUND) +- message(FATAL_ERROR "librotlidec is needed to build woff2.") +-endif () + find_package(BrotliEnc) +-if (NOT BROTLIENC_FOUND) +- message(FATAL_ERROR "librotlienc is needed to build woff2.") +-endif () ++if(BROTLIDEC_FOUND AND BROTLIENC_FOUND) ++ include_directories("${BROTLIDEC_INCLUDE_DIRS}" "${BROTLIENC_INCLUDE_DIRS}") ++ set(WOFF2_BROTLIDEC libbrotlidec) ++ set(WOFF2_BROTLIENC libbrotlienc) ++ set(WOFF2_BORTLIDEC_LIBRARIES "${BROTLIDEC_LIBRARIES}") ++ set(WOFF2_BORTLIENC_LIBRARIES "${BROTLIENC_LIBRARIES}") ++else() ++ find_package(unofficial-brotli REQUIRED) ++ if(TARGET unofficial::brotli::brotlidec-static) ++ set(BROTLI_LINKAGE -static) ++ endif() ++ set(WOFF2_BROTLIDEC unofficial::brotli::brotlidec${BROTLI_LINKAGE}) ++ set(WOFF2_BROTLIENC unofficial::brotli::brotlienc${BROTLI_LINKAGE}) ++ set(WOFF2_BORTLIDEC_LIBRARIES unofficial::brotli::brotlidec${BROTLI_LINKAGE} unofficial::brotli::brotlicommon${BROTLI_LINKAGE}) ++ set(WOFF2_BORTLIENC_LIBRARIES unofficial::brotli::brotlienc${BROTLI_LINKAGE} unofficial::brotli::brotlicommon${BROTLI_LINKAGE}) ++endif() + + # Set compiler flags + if (NOT CANONICAL_PREFIXES) +@@ -63,9 +73,8 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAG}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAG}") + set(CMAKE_CXX_STANDARD 11) + +-# Set search path for our private/public headers as well as Brotli headers +-include_directories("src" "include" +- "${BROTLIDEC_INCLUDE_DIRS}" "${BROTLIENC_INCLUDE_DIRS}") ++# Set search path for our private/public headers ++include_directories("src" "include") + + # Common part used by decoder and encoder + add_library(woff2common +@@ -77,7 +86,7 @@ add_library(woff2common + add_library(woff2dec + src/woff2_dec.cc + src/woff2_out.cc) +-target_link_libraries(woff2dec woff2common "${BROTLIDEC_LIBRARIES}") ++target_link_libraries(woff2dec woff2common ${WOFF2_BORTLIDEC_LIBRARIES}) + add_executable(woff2_decompress src/woff2_decompress.cc) + target_link_libraries(woff2_decompress woff2dec) + +@@ -88,7 +97,7 @@ add_library(woff2enc + src/normalize.cc + src/transform.cc + src/woff2_enc.cc) +-target_link_libraries(woff2enc woff2common "${BROTLIENC_LIBRARIES}") ++target_link_libraries(woff2enc woff2common ${WOFF2_BORTLIENC_LIBRARIES}) + add_executable(woff2_compress src/woff2_compress.cc) + target_link_libraries(woff2_compress woff2enc) + +@@ -264,6 +273,7 @@ if (NOT BUILD_SHARED_LIBS) + install( + TARGETS woff2_decompress woff2_compress woff2_info + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}" + ) + endif() + diff --git a/externals/vcpkg/ports/woff2/portfile.cmake b/externals/vcpkg/ports/woff2/portfile.cmake new file mode 100755 index 000000000..b392fed7f --- /dev/null +++ b/externals/vcpkg/ports/woff2/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_check_linkage( + ONLY_STATIC_LIBRARY +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/woff2 + REF v1.0.2 + SHA512 c788bba1530aec463e755e901f9342f4b599e3a07f54645fef1dc388ab5d5c30625535e5dd38e9e792e04a640574baa50eeefb6b7338ab403755f4a4e0c3044d + HEAD_REF master + PATCHES + 0001-unofficial-brotli.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCANONICAL_PREFIXES=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(COPY "${CURRENT_PACKAGES_DIR}/bin/" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/woff2") +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + "${CURRENT_PACKAGES_DIR}/debug/include" +) + +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/woff2") + +vcpkg_fixup_pkgconfig() +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/woff2" RENAME copyright) diff --git a/externals/vcpkg/ports/woff2/vcpkg.json b/externals/vcpkg/ports/woff2/vcpkg.json new file mode 100755 index 000000000..14023e2c5 --- /dev/null +++ b/externals/vcpkg/ports/woff2/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "woff2", + "version": "1.0.2", + "port-version": 3, + "description": "font compression reference code", + "dependencies": [ + "brotli", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/wolfmqtt/portfile.cmake b/externals/vcpkg/ports/wolfmqtt/portfile.cmake new file mode 100755 index 000000000..a8d47137a --- /dev/null +++ b/externals/vcpkg/ports/wolfmqtt/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wolfssl/wolfmqtt + REF v1.13.0 + SHA512 2bd05471c548bacf6fc5166d9c2ee546b3ce5c4fab89ff16175de9ab7696b8b570cdd7d4377378fc0cb579447488dbf727cb938192eb3180ed007414cb949a8a + HEAD_REF master + ) + +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DWOLFMQTT_EXAMPLES=no + OPTIONS_DEBUG + -DCMAKE_C_FLAGS='-DDEBUG_MQTT' + ) + + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/wolfmqtt) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/externals/vcpkg/ports/wolfmqtt/vcpkg.json b/externals/vcpkg/ports/wolfmqtt/vcpkg.json new file mode 100755 index 000000000..a148d4a72 --- /dev/null +++ b/externals/vcpkg/ports/wolfmqtt/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "wolfmqtt", + "version": "1.13.0", + "description": "MQTT library used with wolfSSL libraray for many platforms", + "homepage": "https://wolfssl.com", + "license": "GPL-2.0-or-later", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "wolfssl" + ] +} diff --git a/externals/vcpkg/ports/wolfssl/portfile.cmake b/externals/vcpkg/ports/wolfssl/portfile.cmake new file mode 100755 index 000000000..00faef9db --- /dev/null +++ b/externals/vcpkg/ports/wolfssl/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wolfssl/wolfssl + REF v5.3.0-stable + SHA512 399d2b8aad58471d237d21dea68c33fde2b9a3c117c554c241d9174db02847a6c31afae2908839d18f9ada317b2388560a24c077b76014f663227061342bf045 + HEAD_REF master + ) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DWOLFSSL_BUILD_OUT_OF_TREE=yes + -DWOLFSSL_EXAMPLES=no + -DWOLFSSL_CRYPT_TESTS=no + -DWOLFSSL_OPENSSLEXTRA=yes + -DWOLFSSL_TPM=yes + -DWOLFSSL_TLSX=yes + -DWOLFSSL_OCSP=yes + -DWOLFSSL_OCSPSTAPLING=yes + -DWOLFSSL_OCSPSTAPLING_V2=yes + -DWOLFSSL_CRL=yes + -DWOLFSSL_DES3=yes + -DCMAKE_C_FLAGS='-DWOLFSSL_ALT_CERT_CHAINS\ -DWOLFSSL_DES_ECB' + OPTIONS_DEBUG + -DWOLFSSL_DEBUG=yes) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/wolfssl) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/externals/vcpkg/ports/wolfssl/vcpkg.json b/externals/vcpkg/ports/wolfssl/vcpkg.json new file mode 100755 index 000000000..048f6f0c4 --- /dev/null +++ b/externals/vcpkg/ports/wolfssl/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "wolfssl", + "version": "5.3.0", + "description": "TLS and Cryptographic libraray for many platforms", + "homepage": "https://wolfssl.com", + "license": "GPL-2.0-or-later", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/wolftpm/portfile.cmake b/externals/vcpkg/ports/wolftpm/portfile.cmake new file mode 100755 index 000000000..e43b43fe8 --- /dev/null +++ b/externals/vcpkg/ports/wolftpm/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wolfssl/wolftpm + REF v2.4.0 + SHA512 82aa43f8773cc230d403d7e6cdbc4dc7dc8a3cb8e2f942c810a5ef0d60647d288ce82910820127ed6e67771d3900cfc55c5f9d87b722e0847bcb6a81c4e41441 + HEAD_REF master + ) + +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DWOLFTPM_EXAMPLES=no + OPTIONS_DEBUG + -DCMAKE_C_FLAGS='-DDEBUG_WOLFTPM' + ) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/wolftpm) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/externals/vcpkg/ports/wolftpm/vcpkg.json b/externals/vcpkg/ports/wolftpm/vcpkg.json new file mode 100755 index 000000000..839a4a8a1 --- /dev/null +++ b/externals/vcpkg/ports/wolftpm/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "wolftpm", + "version": "2.4.0", + "description": "TPM library used with wolfSSL libraray for many platforms", + "homepage": "https://wolfssl.com", + "license": "GPL-2.0-or-later", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "wolfssl" + ] +} diff --git a/externals/vcpkg/ports/wordnet/CMakeLists.txt b/externals/vcpkg/ports/wordnet/CMakeLists.txt new file mode 100755 index 000000000..78a16c1d7 --- /dev/null +++ b/externals/vcpkg/ports/wordnet/CMakeLists.txt @@ -0,0 +1,69 @@ +cmake_minimum_required (VERSION 3.14) +project ("wordnet") +set (target_name ${CMAKE_PROJECT_NAME}) # CMAKE_PROJECT_NAME for the top-level project() call + +option (BUILD_SHARED_LIBS "Create ${target_name} as a shared library" OFF) +set (CMAKE_DEBUG_POSTFIX "d" CACHE STRING "postfix for debug lib") + +set (INCLUDE_DIR_BUILD "${CMAKE_CURRENT_LIST_DIR}/include") + +include (GNUInstallDirs) + +file (GLOB wordnet_headers ${INCLUDE_DIR_BUILD}/wn.h) +file (GLOB wordnet_srcs "lib/*.c") + +add_library (${target_name} ${wordnet_srcs} ${wordnet_headers}) + +target_include_directories (${target_name} + PRIVATE ${INCLUDE_DIR_BUILD} + PUBLIC $ +) + +set_target_properties(${target_name} PROPERTIES + C_STANDARD 11 +) + +target_compile_definitions(${PROJECT_NAME} PUBLIC DEFAULTPATH="${WORDNET_DICT_PATH}") + +if (MSVC) + set_target_properties(${target_name} PROPERTIES + VS_DEBUGGER_WORKING_DIRECTORY $ + COMPILE_FLAGS "/wd4996 /wd4267 /wd4244 /wd4047" + ) + target_compile_definitions(${PROJECT_NAME} PRIVATE _CRT_SECURE_NO_WARNINGS) + set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${target_name}) +endif() + +install (TARGETS ${target_name} EXPORT ${target_name}-targets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) + +install(FILES + ${wordnet_headers} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${target_name} + CONFIGURATIONS Release +) + +install (EXPORT ${target_name}-targets + FILE ${target_name}-targets.cmake + NAMESPACE ${target_name}:: + DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${target_name}" +) + +configure_file(${target_name}-config.cmake.in "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${target_name}-config.cmake" @ONLY) + +install(FILES + "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${target_name}-config.cmake" + DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${target_name}" +) + +install(DIRECTORY + dict/ DESTINATION ${WORDNET_DICT_PATH} + CONFIGURATIONS Release +) +install(DIRECTORY + doc/ DESTINATION ${CMAKE_INSTALL_DOCDIR} + CONFIGURATIONS Release +) diff --git a/externals/vcpkg/ports/wordnet/fix_gobal_vars_uninit_local_ptr.patch b/externals/vcpkg/ports/wordnet/fix_gobal_vars_uninit_local_ptr.patch new file mode 100755 index 000000000..8686779e7 --- /dev/null +++ b/externals/vcpkg/ports/wordnet/fix_gobal_vars_uninit_local_ptr.patch @@ -0,0 +1,78 @@ +diff --git a/include/wn.h b/include/wn.h +index d3ffa08..8452377 100644 +--- a/include/wn.h ++++ b/include/wn.h +@@ -151,14 +151,6 @@ + #define PREDICATIVE PADJ + #define IMMED_POSTNOMINAL IPADJ + +-extern char *wnrelease; /* WordNet release/version number */ +- +-extern char *lexfiles[]; /* names of lexicographer files */ +-extern char *ptrtyp[]; /* pointer characters */ +-extern char *partnames[]; /* POS strings */ +-extern char partchars[]; /* single chars for each POS */ +-extern char *adjclass[]; /* adjective class strings */ +-extern char *frametext[]; /* text of verb frames */ + + /* Data structures used by search code functions. */ + +@@ -236,6 +228,21 @@ typedef struct { + + typedef SearchResults *SearchResultsPtr; + ++/* Make all the functions compatible with c++ files */ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++extern char* wnrelease; /* WordNet release/version number */ ++ ++extern char* lexfiles[]; /* names of lexicographer files */ ++extern char* ptrtyp[]; /* pointer characters */ ++extern char* partnames[]; /* POS strings */ ++extern char partchars[]; /* single chars for each POS */ ++extern char* adjclass[]; /* adjective class strings */ ++extern char* frametext[]; /* text of verb frames */ ++ ++ + /* Global variables and flags */ + + extern SearchResults wnresults; /* structure containing results of search */ +@@ -271,11 +278,6 @@ extern int default_display_message(char *); + extern int (*display_message)(char *); + + +-/* Make all the functions compatible with c++ files */ +-#ifdef __cplusplus +-extern "C" { +-#endif +- + /* External library function prototypes */ + + /*** Search and database functions (search.c) ***/ +diff --git a/lib/search.c b/lib/search.c +index 1cdedc3..72c4bb5 100644 +--- a/lib/search.c ++++ b/lib/search.c +@@ -1256,7 +1256,7 @@ static void add_relatives(int pos, IndexPtr idx, int rel1, int rel2) + { + int i; + struct relgrp *rel, *last, *r; +- ++ last = NULL; + /* If either of the new relatives are already in a relative group, + then add the other to the existing group (transitivity). + Otherwise create a new group and add these 2 senses to it. */ +@@ -1281,8 +1281,9 @@ static void add_relatives(int pos, IndexPtr idx, int rel1, int rel2) + rel->senses[rel1] = rel->senses[rel2] = 1; + if (rellist == NULL) + rellist = rel; +- else +- last->next = rel; ++ else if (last) { ++ last->next = rel; ++ } + } + + static struct relgrp *mkrellist(void) diff --git a/externals/vcpkg/ports/wordnet/portfile.cmake b/externals/vcpkg/ports/wordnet/portfile.cmake new file mode 100755 index 000000000..59ca68051 --- /dev/null +++ b/externals/vcpkg/ports/wordnet/portfile.cmake @@ -0,0 +1,52 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +set(VERSION 3.0) + +vcpkg_download_distfile(ARCHIVE + URLS "http://wordnetcode.princeton.edu/${VERSION}/WordNet-${VERSION}.tar.gz" + FILENAME "wordnet-${VERSION}.tar.gz" + SHA512 9539bc016d710f31d65072bbf5068edffcd735978d8cc6f1b361b19428b97546ef6c7e246e1b6f2ff4557a0885a8305341e35173a6723f0740dda18d097ca248 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${VERSION} + PATCHES + fix_gobal_vars_uninit_local_ptr.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/wordnet-config.cmake.in DESTINATION ${SOURCE_PATH}) + +if("dbfiles" IN_LIST FEATURES) + vcpkg_download_distfile(WORDNET_DICT_DBFILES + URLS "http://wordnetcode.princeton.edu/wn3.1.dict.tar.gz" + FILENAME "wordnet-cache/wn3.1.dict.tar.gz" + SHA512 16dca17a87026d8a0b7b4758219cd21a869c3ef3da23ce7875924546f2eacac4c2f376cb271b798b2c458fe8c078fb43d681356e3d9beef40f4bd88d3579394f + ) + file(REMOVE_RECURSE "${SOURCE_PATH}/dict/") + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH WORDNET_DICT_DBFILES_EX + ARCHIVE ${WORDNET_DICT_DBFILES} + REF 3.1 + WORKING_DIRECTORY ${SOURCE_PATH} + ) + file(RENAME ${WORDNET_DICT_DBFILES_EX} "${SOURCE_PATH}/dict") +endif() + +set (WORDNET_DICT_PATH "${CURRENT_PACKAGES_DIR}/tools/${PORT}/dict") + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DWORDNET_DICT_PATH=${WORDNET_DICT_PATH} +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/wordnet RENAME copyright) + diff --git a/externals/vcpkg/ports/wordnet/vcpkg.json b/externals/vcpkg/ports/wordnet/vcpkg.json new file mode 100755 index 000000000..ffa68c3f2 --- /dev/null +++ b/externals/vcpkg/ports/wordnet/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "wordnet", + "version-string": "3.0", + "port-version": 1, + "description": "WordNet is a large lexical database of English", + "features": { + "dbfiles": { + "description": "WordNet 3.1 database files" + } + } +} diff --git a/externals/vcpkg/ports/wordnet/wordnet-config.cmake.in b/externals/vcpkg/ports/wordnet/wordnet-config.cmake.in new file mode 100755 index 000000000..1de99b5e8 --- /dev/null +++ b/externals/vcpkg/ports/wordnet/wordnet-config.cmake.in @@ -0,0 +1,14 @@ +# Config file for the wordnet package + +get_filename_component(_WORDNET_PREFIX_DIR "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY) + +set (_TARGET_NAME "wordnet") + +set (WORDNET_DICT_PATH @WORDNET_DICT_PATH@) +message (STATUS "WORDNET_DICT_PATH: @WORDNET_DICT_PATH@") + +# IMPORTED targets for wordnet +include("${_WORDNET_PREFIX_DIR}/${_TARGET_NAME}-targets.cmake") + +set(_WORDNET_PREFIX_DIR) +set(_TARGET_NAME) diff --git a/externals/vcpkg/ports/workflow/portfile.cmake b/externals/vcpkg/ports/workflow/portfile.cmake new file mode 100755 index 000000000..300b21cc3 --- /dev/null +++ b/externals/vcpkg/ports/workflow/portfile.cmake @@ -0,0 +1,32 @@ +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sogou/workflow + REF v0.9.7-win + SHA512 c23b8c1910c4ca5d57fa732e3084f56e17fdfead5561a8eab7be469d8f6081d830555365b2cf74e27956ffa88a6fb284dbde4654b23b130da9fbb4eb404686bd + HEAD_REF windows + ) +else() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sogou/workflow + REF v0.9.7 + SHA512 4866d9cfe2d9ba30f2f7866819ee8f425b91082d7f86994c1194a6b4406e8ee99e22ce6b0bafeb22c5f098f7da30029fb6b12895c2ac45810d33c28d4bfad006 + HEAD_REF master + ) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/workflow/vcpkg.json b/externals/vcpkg/ports/workflow/vcpkg.json new file mode 100755 index 000000000..66c55a536 --- /dev/null +++ b/externals/vcpkg/ports/workflow/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "workflow", + "version": "0.9.7", + "port-version": 1, + "description": "About C++ Parallel Computing and Asynchronous Networking Engine", + "homepage": "https://github.com/sogou/workflow", + "license": "Apache-2.0", + "dependencies": [ + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/wpilib/portfile.cmake b/externals/vcpkg/ports/wpilib/portfile.cmake new file mode 100755 index 000000000..f4b48dc30 --- /dev/null +++ b/externals/vcpkg/ports/wpilib/portfile.cmake @@ -0,0 +1,60 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wpilibsuite/allwpilib + REF 35eb90c135eba994a2ca2cbd50a68c367910f4b6 + SHA512 55bc608632ab67c097f3cce7c5ad9790b2b123a633c93bf5b4008f90bf79538cc142c911850d5f49b75e3a12f43ffad9f6f5f9bcdf1351cce7513ecc4b04e439 +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + cameraserver WITHOUT_CSCORE + allwpilib WITHOUT_ALLWPILIB +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + + OPTIONS + -DWITHOUT_JAVA=ON + ${FEATURE_OPTIONS} + -DUSE_VCPKG_LIBUV=ON + -DUSE_VCPKG_EIGEN=ON + -DFLAT_INSTALL_WPILIB=ON +) +vcpkg_install_cmake() + +file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/ntcore/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/wpiutil/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +if ("allwpilib" IN_LIST FEATURES) + file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/wpilibc/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) + file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/hal/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/gen) +endif() + +if ("cameraserver" IN_LIST FEATURES) + file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/cameraserver/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) + file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/cscore/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) +endif() + +if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dll") + file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dll") + + file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.so") + file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.so") + + file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dylib") + file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dylib") +endif() + +file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.lib") +file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.lib") + +file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.a") +file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.a") + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/wpilib/vcpkg.json b/externals/vcpkg/ports/wpilib/vcpkg.json new file mode 100755 index 000000000..b0e07c291 --- /dev/null +++ b/externals/vcpkg/ports/wpilib/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "wpilib", + "version-string": "2020.3.2", + "port-version": 2, + "description": "WPILib is the software library package for the FIRST Robotics Competition. The core install includes wpiutil, a common utilies library, and ntcore, the base NetworkTables library.", + "homepage": "https://github.com/wpilibsuite/allwpilib", + "supports": "!osx", + "dependencies": [ + "eigen3", + "libuv" + ], + "features": { + "allwpilib": { + "description": "Enables the simulation HAL, and the high level wpilibc library.", + "dependencies": [ + "opencv", + { + "name": "wpilib", + "features": [ + "cameraserver" + ] + } + ] + }, + "cameraserver": { + "description": "Enables the CameraServer and CSCore libraries for manipulating USB Cameras and HTTP Camera Streams", + "dependencies": [ + "opencv" + ] + } + } +} diff --git a/externals/vcpkg/ports/wren/CMakeLists.txt b/externals/vcpkg/ports/wren/CMakeLists.txt new file mode 100755 index 000000000..b57a6a907 --- /dev/null +++ b/externals/vcpkg/ports/wren/CMakeLists.txt @@ -0,0 +1,50 @@ +# CMake taken from https://github.com/walterschell/wren/blob/cmake/CMakeLists.txt + +# Need transitive dependencies introduced in 2.8.12 +cmake_minimum_required(VERSION 2.8.12) + +project(Wren LANGUAGES "C") + +set(wren_warning_flags "-Wall" "-Wextra" "-Werror" "-Wno-unused-parameter") + +IF (WIN32) + ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS ) +ENDIF () + +set(opt_DIR "src/optional") +set(vm_DIR "src/vm") + +# TODO: Don't glob +file(GLOB opt_SRCS ${opt_DIR}/*.c) +file(GLOB vm_SRCS ${vm_DIR}/*.c) + +set(wren_SRCS ${vm_SRCS} ${opt_SRCS}) + +add_library(wren ${wren_SRCS}) + +target_include_directories(wren PUBLIC src/include PRIVATE src/vm src/optional) + +target_link_libraries(wren INTERFACE m) + +target_compile_options(wren PRIVATE "-Wall") + +if (CMAKE_BUILD_TYPE STREQUAL "Debug") + target_compile_options(wren PUBLIC -DDEBUG) +endif() + + +INSTALL (TARGETS wren + RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib + ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib +) + + +IF (NOT DEFINED SKIP_INSTALL_HEADERS) + INSTALL( + FILES + src/include/wren.h + src/include/wren.hpp + DESTINATION include + ) +ENDIF () diff --git a/externals/vcpkg/ports/wren/portfile.cmake b/externals/vcpkg/ports/wren/portfile.cmake new file mode 100755 index 000000000..d20b518b4 --- /dev/null +++ b/externals/vcpkg/ports/wren/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wren-lang/wren + REF 4a18fc489f9ea3d253b20dd40f4cdad0d6bb40eb #0.4.0 + SHA512 b3d79e9cb647e52db06d5cddfc8c93d05ae0e8d87f0f879ac2b812fcc7f55e018d21d3b04d62eaeb12e6d931b5e43fbe357b187e7f446e86e39be015c51c2eee + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCOMPILE_AS_CPP=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/wren/vcpkg.json b/externals/vcpkg/ports/wren/vcpkg.json new file mode 100755 index 000000000..4cb9889ef --- /dev/null +++ b/externals/vcpkg/ports/wren/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "wren", + "version": "0.4.0", + "description": "Wren is a small, fast, class-based concurrent scripting language.", + "homepage": "https://github.com/wren-lang/wren", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/wt/0002-link-glew.patch b/externals/vcpkg/ports/wt/0002-link-glew.patch new file mode 100755 index 000000000..af441e81f --- /dev/null +++ b/externals/vcpkg/ports/wt/0002-link-glew.patch @@ -0,0 +1,23 @@ +From 6301c4ccaf8d3b6982898fed84e691ab8ddd7a4f Mon Sep 17 00:00:00 2001 +From: Robert Schumacher +Date: Fri, 23 Feb 2018 03:12:45 -0800 +Subject: [PATCH 2/3] link glew + + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 80734fb..70e755b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -556,7 +556,8 @@ ENDIF("${WT_WRASTERIMAGE_IMPLEMENTATION}" STREQUAL "GraphicsMagick") + IF(HAVE_GL) + INCLUDE_DIRECTORIES(${GL_INCLUDE_DIRS}) + IF(USE_SYSTEM_GLEW) +- TARGET_LINK_LIBRARIES(wt PRIVATE GLEW) ++ find_package(glew REQUIRED) ++ TARGET_LINK_LIBRARIES(wt PRIVATE GLEW::GLEW) + ENDIF(USE_SYSTEM_GLEW) + TARGET_LINK_LIBRARIES(wt PRIVATE ${GL_LIBRARIES}) + ELSE(HAVE_GL) +-- +2.16.2.windows.1 + diff --git a/externals/vcpkg/ports/wt/0005-XML_file_path.patch b/externals/vcpkg/ports/wt/0005-XML_file_path.patch new file mode 100755 index 000000000..b2be62c9d --- /dev/null +++ b/externals/vcpkg/ports/wt/0005-XML_file_path.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ca19b30..4765632 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -197,7 +197,11 @@ SET(CMAKE_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake" CACHE STRING + + IF(WIN32) + +- SET(RUNDIR "c:/witty") # Does not apply to win32 ++ if (NOT INSTALL_CONFIG_FILE_PATH) ++ SET(RUNDIR "c:/witty") # Does not apply to win32 ++ else() ++ SET(RUNDIR ${INSTALL_CONFIG_FILE_PATH}) # Does not apply to win32 ++ endif() + + IF(NOT DEFINED CONFIGDIR) + SET(CONFIGDIR ${RUNDIR} CACHE STRING "Path for the configuration files") diff --git a/externals/vcpkg/ports/wt/0006-GraphicsMagick.patch b/externals/vcpkg/ports/wt/0006-GraphicsMagick.patch new file mode 100755 index 000000000..2f1b50a60 --- /dev/null +++ b/externals/vcpkg/ports/wt/0006-GraphicsMagick.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5012cfd1b..95f812685 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -338,7 +338,7 @@ ELSE (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8) + ENDIF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8) + + IF (${WT_WRASTERIMAGE_IMPLEMENTATION} STREQUAL "GraphicsMagick") +- IF (NOT GM_FOUND) ++ IF (0) + MESSAGE(FATAL_ERROR "WT_WRASTERIMAGE_IMPLEMENTATION set to GraphicsMagick but GM is not found. Indicate the location of your graphicsmagick library using -DGM_PREFIX=...") + ENDIF (NOT GM_FOUND) + SET(WT_HAS_WRASTERIMAGE true) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 78d82ee53..01ac5f42a 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -595,8 +595,9 @@ ELSE(HAVE_HARU) + ENDIF(HAVE_HARU) + + IF("${WT_WRASTERIMAGE_IMPLEMENTATION}" STREQUAL "GraphicsMagick") +- TARGET_LINK_LIBRARIES(wt PRIVATE ${GM_LIBRARIES}) +- INCLUDE_DIRECTORIES(${GM_INCLUDE_DIRS}) ++ find_package(unofficial-graphicsmagick REQUIRED) ++ TARGET_LINK_LIBRARIES(wt PRIVATE unofficial::graphicsmagick::graphicsmagick) ++ # INCLUDE_DIRECTORIES(${GM_INCLUDE_DIRS}) + ADD_DEFINITIONS(-DHAVE_GRAPHICSMAGICK) + ELSEIF("${WT_WRASTERIMAGE_IMPLEMENTATION}" STREQUAL "skia") + TARGET_LINK_LIBRARIES(wt PRIVATE ${SKIA_LIBRARIES}) diff --git a/externals/vcpkg/ports/wt/portfile.cmake b/externals/vcpkg/ports/wt/portfile.cmake new file mode 100755 index 000000000..a04cee499 --- /dev/null +++ b/externals/vcpkg/ports/wt/portfile.cmake @@ -0,0 +1,95 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO emweb/wt + REF d0e9f2e8096a1acb4558130a851812dd424d8f3e # 4.7.1 + SHA512 ddda642e464a0c93017161404911cd8261e105971162171cd6aa0e4334e22b5f284a753e8b81a4f43c9269b14389abd28c61e2cdfe706b414808e82fc4bc1680 + HEAD_REF master + PATCHES + 0002-link-glew.patch + 0005-XML_file_path.patch + 0006-GraphicsMagick.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIBS) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS + FEATURE_OPTIONS + FEATURES + dbo ENABLE_LIBWTDBO + postgresql ENABLE_POSTGRES + sqlite3 ENABLE_SQLITE + sqlserver ENABLE_MSSQLSERVER + openssl ENABLE_SSL +) + +if(VCPKG_TARGET_IS_WINDOWS) + set(WT_PLATFORM_SPECIFIC_OPTIONS + -DWT_WRASTERIMAGE_IMPLEMENTATION=Direct2D + -DCONNECTOR_ISAPI=ON + -DENABLE_PANGO=OFF) +else() + set(WT_PLATFORM_SPECIFIC_OPTIONS + -DCONNECTOR_FCGI=OFF + -DENABLE_PANGO=ON + -DHARFBUZZ_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/harfbuzz) + + if ("graphicsmagick" IN_LIST FEATURES) + list(APPEND WT_PLATFORM_SPECIFIC_OPTIONS + -DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick) + else() + list(APPEND WT_PLATFORM_SPECIFIC_OPTIONS + -DWT_WRASTERIMAGE_IMPLEMENTATION=none) + endif() +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + GENERATOR Ninja + OPTIONS + -DINSTALL_CONFIG_FILE_PATH="${DOWNLOADS}/wt" + -DSHARED_LIBS=${SHARED_LIBS} + -DBOOST_DYNAMIC=${SHARED_LIBS} + -DDISABLE_BOOST_AUTOLINK=ON + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF + + -DWTHTTP_CONFIGURATION= + -DCONFIGURATION= + + -DCONNECTOR_HTTP=ON + -DENABLE_HARU=ON + -DHARU_DYNAMIC=${SHARED_LIBS} + -DENABLE_MYSQL=OFF + -DENABLE_FIREBIRD=OFF + -DENABLE_QT4=OFF + -DENABLE_QT5=OFF + -DENABLE_LIBWTTEST=ON + -DENABLE_OPENGL=ON + + ${FEATURE_OPTIONS} + ${WT_PLATFORM_SPECIFIC_OPTIONS} + + -DUSE_SYSTEM_SQLITE3=ON + -DUSE_SYSTEM_GLEW=ON + + -DCMAKE_INSTALL_DIR=share + # see https://redmine.webtoolkit.eu/issues/9646 + -DWTHTTP_CONFIGURATION= + -DCONFIGURATION= + +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() + +# There is no way to suppress installation of the headers and resource files in debug build. +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/var" "${CURRENT_PACKAGES_DIR}/debug/var") + +# RUNDIR is only used for wtfcgi what we don't build. See https://redmine.webtoolkit.eu/issues/9646 +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Wt/WConfig.h" "#define RUNDIR \"${CURRENT_PACKAGES_DIR}/var/run/wt\"" "") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/wt/vcpkg.json b/externals/vcpkg/ports/wt/vcpkg.json new file mode 100755 index 000000000..443486fe2 --- /dev/null +++ b/externals/vcpkg/ports/wt/vcpkg.json @@ -0,0 +1,116 @@ +{ + "name": "wt", + "version": "4.7.1", + "description": "Wt is a C++ library for developing web applications", + "homepage": "https://github.com/emweb/wt", + "license": "GPL-2.0-only", + "dependencies": [ + "boost-algorithm", + "boost-array", + "boost-asio", + "boost-bind", + "boost-config", + "boost-container-hash", + "boost-filesystem", + "boost-foreach", + "boost-fusion", + "boost-interprocess", + "boost-lexical-cast", + "boost-logic", + "boost-math", + "boost-multi-index", + "boost-optional", + "boost-phoenix", + "boost-pool", + "boost-program-options", + "boost-range", + "boost-serialization", + "boost-smart-ptr", + "boost-spirit", + "boost-system", + "boost-thread", + "boost-tokenizer", + "boost-tuple", + "boost-ublas", + "boost-variant", + "glew", + { + "name": "harfbuzz", + "platform": "!windows" + }, + "libharu", + "libpng", + { + "name": "pango", + "platform": "!windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "default-features": [ + "openssl" + ], + "features": { + "dbo": { + "description": "Wt::Dbo" + }, + "graphicsmagick": { + "description": "WRasterImage support on non-Windows based on GraphicsMagick", + "dependencies": [ + "graphicsmagick" + ] + }, + "openssl": { + "description": "TLS support", + "dependencies": [ + "openssl" + ] + }, + "postgresql": { + "description": "Wt::Dbo PostgreSQL backend", + "dependencies": [ + "libpq", + { + "name": "wt", + "features": [ + "dbo" + ] + } + ] + }, + "sqlite3": { + "description": "Wt::Dbo Sqlite 3 backend", + "dependencies": [ + "sqlite3", + { + "name": "wt", + "features": [ + "dbo" + ] + } + ] + }, + "sqlserver": { + "description": "Wt::Dbo MS SQL Server backend", + "dependencies": [ + { + "name": "unixodbc", + "platform": "!windows" + }, + { + "name": "wt", + "features": [ + "dbo" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/wtl/appwizard_setup.js-vs2022.patch b/externals/vcpkg/ports/wtl/appwizard_setup.js-vs2022.patch new file mode 100755 index 000000000..1f0f4e5f0 --- /dev/null +++ b/externals/vcpkg/ports/wtl/appwizard_setup.js-vs2022.patch @@ -0,0 +1,35 @@ +--- a/AppWizard/Setup.js ++++ b/AppWizard/Setup.js +@@ -185,26 +185,30 @@ + } + } + +-// Search for Visual Studio 2017-2019 +- var nVersionsNew = 2; ++// Search for Visual Studio 2017/2019/2022 ++ var nVersionsNew = 3; + + var strWizardFolderNew = "Common7\\IDE\\VC\\vcprojects"; + + var astrVersionsNew = new Array(); + astrVersionsNew[0] = "Visual Studio 2017 (15.0)"; + astrVersionsNew[1] = "Visual Studio 2019 (16.0)"; ++ astrVersionsNew[2] = "Visual Studio 2022 (17.0)"; + + var astrWizVerNew = new Array(); + astrWizVerNew[0] = "15.0"; + astrWizVerNew[1] = "16.0"; ++ astrWizVerNew[2] = "17.0"; + + var astrParamVerNew = new Array(); + astrParamVerNew[0] = "15"; + astrParamVerNew[1] = "16"; ++ astrParamVerNew[2] = "17"; + + var astrFilterVer = new Array(); + astrFilterVer[0] = "[15.0,16.0]"; + astrFilterVer[1] = "[16.0,17.0]"; ++ astrFilterVer[2] = "[17.0,18.0]"; + + // Ensure that we can run vswhere.exe + var strProgFileRegKey_x86 = "HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\ProgramFilesDir (x86)"; diff --git a/externals/vcpkg/ports/wtl/atlmisc.h-bug329.patch b/externals/vcpkg/ports/wtl/atlmisc.h-bug329.patch new file mode 100755 index 000000000..6bffba9be --- /dev/null +++ b/externals/vcpkg/ports/wtl/atlmisc.h-bug329.patch @@ -0,0 +1,11 @@ +--- a/Include/atlmisc.h ++++ b/Include/atlmisc.h +@@ -628,7 +628,7 @@ + { + ATLASSERT(m_hFind != NULL); + +- ATL::CString strResult("file://"); ++ ATL::CString strResult(_T("file://")); + strResult += GetFilePath(); + return strResult; + } diff --git a/externals/vcpkg/ports/wtl/portfile.cmake b/externals/vcpkg/ports/wtl/portfile.cmake new file mode 100755 index 000000000..23c13b9c4 --- /dev/null +++ b/externals/vcpkg/ports/wtl/portfile.cmake @@ -0,0 +1,17 @@ +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO wtl/WTL%2010 + REF WTL%2010.0.10320%20Release + FILENAME "WTL10_10320_Release.zip" + NO_REMOVE_ONE_LEVEL + SHA512 086a6cf6a49a4318a8c519136ba6019ded7aa7f2c1d85f78c30b21183654537b3428a400a64fcdacba3a7a10a9ef05137b6f2119f59594da300d55f9ebfb1309 + PATCHES + appwizard_setup.js-vs2022.patch + atlmisc.h-bug329.patch +) + +file(INSTALL "${SOURCE_PATH}/Include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.h") +file(COPY "${SOURCE_PATH}/Samples" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(COPY "${SOURCE_PATH}/AppWizard" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(INSTALL "${SOURCE_PATH}/MS-PL.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/wtl/vcpkg.json b/externals/vcpkg/ports/wtl/vcpkg.json new file mode 100755 index 000000000..eda850d79 --- /dev/null +++ b/externals/vcpkg/ports/wtl/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "wtl", + "version": "10.0.10320", + "port-version": 3, + "description": "Windows Template Library (WTL) is a C++ library for developing Windows applications and UI components.", + "homepage": "https://sourceforge.net/projects/wtl/", + "license": "MS-PL" +} diff --git a/externals/vcpkg/ports/wxchartdir/CMakeLists.txt b/externals/vcpkg/ports/wxchartdir/CMakeLists.txt new file mode 100755 index 000000000..3ad438970 --- /dev/null +++ b/externals/vcpkg/ports/wxchartdir/CMakeLists.txt @@ -0,0 +1,33 @@ +cmake_minimum_required(VERSION 3.13) +project(wxchartdir CXX) + +set(wxWidgets_EXCLUDE_COMMON_LIBRARIES TRUE) +find_package(wxWidgets REQUIRED COMPONENTS core base) +include(${wxWidgets_USE_FILE}) + +find_package(chartdir CONFIG REQUIRED) + +add_library(wxchartdir STATIC wxdemo/common/wxchartviewer.cpp) + +target_include_directories(wxchartdir PUBLIC + $ +) + +target_link_libraries(wxchartdir + PRIVATE ${wxWidgets_LIBRARIES} + PRIVATE chartdir +) + +install(TARGETS wxchartdir EXPORT wxchartdir-config + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) + +install(EXPORT wxchartdir-config DESTINATION share/cmake/wxchartdir) + +install(FILES wxdemo/common/mondrian.xpm DESTINATION include/wxchartdir) +install(FILES wxdemo/common/wxchartviewer.h DESTINATION include/wxchartdir) +install(FILES wxdemo/common/wxchartviewer_defs.h DESTINATION include/wxchartdir) +install(FILES wxdemo/common/wxchartviewer_version.h DESTINATION include/wxchartdir) +install(FILES wxdemo/common/wxchartviewer_version.rc DESTINATION include/wxchartdir) diff --git a/externals/vcpkg/ports/wxchartdir/portfile.cmake b/externals/vcpkg/ports/wxchartdir/portfile.cmake new file mode 100755 index 000000000..8ad0c5500 --- /dev/null +++ b/externals/vcpkg/ports/wxchartdir/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO utelle/wxchartdir + REF v2.0.0 + SHA512 dd255af1031465c635df7ea7eee2dd15f0dcce30f91cae1eff6527b8b78ea872fa22fa05da5363f57817dc8844c0bc171a2c68f54c38f2519c7bfe0256605622 + HEAD_REF main +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/wxchartdir) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +configure_file("${SOURCE_PATH}/COPYING.txt" "${CURRENT_PACKAGES_DIR}/share/wxchartdir/copyright" COPYONLY) + +file(COPY "${SOURCE_PATH}/CHARTDIRECTOR-LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/wxchartdir") +file(COPY "${SOURCE_PATH}/CHARTDIRECTOR-README.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/wxchartdir") +file(COPY "${SOURCE_PATH}/GPL-3.0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/wxchartdir") +file(COPY "${SOURCE_PATH}/LGPL-3.0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/wxchartdir") +file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/wxchartdir") +file(COPY "${SOURCE_PATH}/LICENSE.spdx" DESTINATION "${CURRENT_PACKAGES_DIR}/share/wxchartdir") +file(COPY "${SOURCE_PATH}/WxWindows-exception-3.1.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/wxchartdir") diff --git a/externals/vcpkg/ports/wxchartdir/vcpkg.json b/externals/vcpkg/ports/wxchartdir/vcpkg.json new file mode 100755 index 000000000..008135748 --- /dev/null +++ b/externals/vcpkg/ports/wxchartdir/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "wxchartdir", + "version": "2.0.0", + "description": "wxChartDir provides components for the integration and use of the commercial C++ library ChartDirector, a universal chart component developed by Advanced Software Engineering Ltd, in wxWidgets based applications.", + "homepage": "https://github.com/utelle/wxchartdir", + "license": "GPL-3.0-only AND LGPL-3.0 AND wxWindows", + "dependencies": [ + "chartdir", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "wxwidgets" + ] +} diff --git a/externals/vcpkg/ports/wxcharts/portfile.cmake b/externals/vcpkg/ports/wxcharts/portfile.cmake new file mode 100755 index 000000000..cee922050 --- /dev/null +++ b/externals/vcpkg/ports/wxcharts/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wxIshiko/wxCharts + REF c7c7eb4c4132eeb83f25546b1b981dc61e5c188f + SHA512 f46cf467b356e2ffa46db020de42f8aca9beab801e2ade50f7e75650bba9bc83c641702dcd5ee45e82425b96d4371b82e7f16dce3077050a86ba696ed5c326de +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/wxcharts/vcpkg.json b/externals/vcpkg/ports/wxcharts/vcpkg.json new file mode 100755 index 000000000..6e3928655 --- /dev/null +++ b/externals/vcpkg/ports/wxcharts/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "wxcharts", + "version-date": "2022-04-22", + "description": "Chart controls for the wxWidgets cross-platform GUI library", + "homepage": "https://www.wxishiko.com/wxCharts", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "wxwidgets" + ] +} diff --git a/externals/vcpkg/ports/wxwidgets/example/CMakeLists.txt b/externals/vcpkg/ports/wxwidgets/example/CMakeLists.txt new file mode 100755 index 000000000..7d5b12dba --- /dev/null +++ b/externals/vcpkg/ports/wxwidgets/example/CMakeLists.txt @@ -0,0 +1,26 @@ +cmake_minimum_required(VERSION 3.7) + +project(wxwidgets-example) + +add_executable(main WIN32 popup.cpp) + +find_package(wxWidgets REQUIRED) +target_compile_definitions(main PRIVATE ${wxWidgets_DEFINITIONS} "$<$:${wxWidgets_DEFINITIONS_DEBUG}>") +target_include_directories(main PRIVATE ${wxWidgets_INCLUDE_DIRS}) +target_link_libraries(main PRIVATE ${wxWidgets_LIBRARIES}) + +option(USE_WXRC "Use the wxrc resource compiler" ON) +if(USE_WXRC) + execute_process( + COMMAND "${wxWidgets_wxrc_EXECUTABLE}" --help + RESULTS_VARIABLE error_result + ) + if(error_result) + message(FATAL_ERROR "Failed to run wxWidgets_wxrc_EXECUTABLE (${wxWidgets_wxrc_EXECUTABLE})") + endif() +endif() + +set(PRINT_VARS "" CACHE STRING "Variables to print at the end of configuration") +foreach(var IN LISTS PRINT_VARS) + message(STATUS "${var}:=${${var}}") +endforeach() diff --git a/externals/vcpkg/ports/wxwidgets/fix-libs-export.patch b/externals/vcpkg/ports/wxwidgets/fix-libs-export.patch new file mode 100755 index 000000000..a334be306 --- /dev/null +++ b/externals/vcpkg/ports/wxwidgets/fix-libs-export.patch @@ -0,0 +1,21 @@ +diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake +index 52ae69d3f6..f261d5d262 100644 +--- a/build/cmake/config.cmake ++++ b/build/cmake/config.cmake +@@ -39,8 +39,14 @@ macro(wx_get_dependencies var lib) + else() + # For the value like $<$:LIB_PATH> + # Or $<$>:LIB_PATH> +- string(REGEX REPLACE "^.+>:(.+)>$" "\\1" dep_name ${dep}) +- if (NOT dep_name) ++ if(dep MATCHES "^(.+>):(.+)>$") ++ if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND CMAKE_MATCH_1 STREQUAL [[$<$>]]) ++ continue() ++ elseif(CMAKE_BUILD_TYPE STREQUAL "Release" AND CMAKE_MATCH_1 STREQUAL [[$<$]]) ++ continue() ++ endif() ++ set(dep_name "${CMAKE_MATCH_2}") ++ else() + set(dep_name ${dep}) + endif() + endif() diff --git a/externals/vcpkg/ports/wxwidgets/fix-pcre2.patch b/externals/vcpkg/ports/wxwidgets/fix-pcre2.patch new file mode 100755 index 000000000..20063f441 --- /dev/null +++ b/externals/vcpkg/ports/wxwidgets/fix-pcre2.patch @@ -0,0 +1,23 @@ +diff --git a/build/cmake/modules/FindPCRE2.cmake b/build/cmake/modules/FindPCRE2.cmake +index a27693a..455675a 100644 +--- a/build/cmake/modules/FindPCRE2.cmake ++++ b/build/cmake/modules/FindPCRE2.cmake +@@ -24,7 +24,10 @@ set(PCRE2_CODE_UNIT_WIDTH_USED "${PCRE2_CODE_UNIT_WIDTH}" CACHE INTERNAL "") + + find_package(PkgConfig QUIET) + pkg_check_modules(PC_PCRE2 QUIET libpcre2-${PCRE2_CODE_UNIT_WIDTH}) ++set(PCRE2_LIBRARIES ${PC_PCRE2_LINK_LIBRARIES}) ++set(PCRE2_INCLUDE_DIRS ${PC_PCRE2_INCLUDE_DIRS}) + ++if (0) + find_path(PCRE2_INCLUDE_DIRS + NAMES pcre2.h + HINTS ${PC_PCRE2_INCLUDEDIR} +@@ -36,6 +39,7 @@ find_library(PCRE2_LIBRARIES + HINTS ${PC_PCRE2_LIBDIR} + ${PC_PCRE2_LIBRARY_DIRS} + ) ++endif() + + include(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE2 REQUIRED_VARS PCRE2_LIBRARIES PCRE2_INCLUDE_DIRS VERSION_VAR PC_PCRE2_VERSION) diff --git a/externals/vcpkg/ports/wxwidgets/install-layout.patch b/externals/vcpkg/ports/wxwidgets/install-layout.patch new file mode 100755 index 000000000..a0676bcb3 --- /dev/null +++ b/externals/vcpkg/ports/wxwidgets/install-layout.patch @@ -0,0 +1,51 @@ +diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake +index b5175236e2..8c9275974f 100644 +--- a/build/cmake/init.cmake ++++ b/build/cmake/init.cmake +@@ -146,7 +146,7 @@ if(WIN32) + endif() + endif() + +-if(WIN32_MSVC_NAMING) ++if(WIN32_MSVC_NAMING AND NOT wxBUILD_DISABLE_PLATFORM_LIB_DIR) + if(wxBUILD_SHARED) + set(lib_suffix "_dll") + else() +index 9e6aafa900..defd196d2e 100644 +--- a/build/cmake/functions.cmake ++++ b/build/cmake/functions.cmake +@@ -417,7 +417,7 @@ macro(wx_add_library name) + + # Setup install + set(runtime_dir "lib") +- if(WIN32 AND NOT WIN32_MSVC_NAMING) ++ if(VCPKG_TOOLCHAIN OR (WIN32 AND NOT WIN32_MSVC_NAMING)) + # configure puts the .dll in the bin directory + set(runtime_dir "bin") + endif() +diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake +index 7902646ef4..04ccd1aba7 100644 +--- a/build/cmake/install.cmake ++++ b/build/cmake/install.cmake +@@ -48,7 +48,7 @@ else() + + install(DIRECTORY DESTINATION "bin") + install(CODE "execute_process( \ +- COMMAND ${CMAKE_COMMAND} -E create_symlink \ ++ COMMAND ${CMAKE_COMMAND} -E copy \ + ${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID} \ + ${CMAKE_INSTALL_PREFIX}/bin/wx-config \ + )" +diff --git a/build/cmake/utils/CMakeLists.txt b/build/cmake/utils/CMakeLists.txt +index 2b3a22834d..e0e964db9d 100644 +--- a/build/cmake/utils/CMakeLists.txt ++++ b/build/cmake/utils/CMakeLists.txt +@@ -41,7 +41,7 @@ if(wxUSE_XRC) + endif() + + install(CODE "execute_process( \ +- COMMAND ${CMAKE_COMMAND} -E create_symlink \ ++ COMMAND ${CMAKE_COMMAND} -E copy \ + ${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX} \ + ${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX} \ + )" diff --git a/externals/vcpkg/ports/wxwidgets/mingw-output-name.patch b/externals/vcpkg/ports/wxwidgets/mingw-output-name.patch new file mode 100755 index 000000000..772ac0743 --- /dev/null +++ b/externals/vcpkg/ports/wxwidgets/mingw-output-name.patch @@ -0,0 +1,21 @@ +diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake +index 902b7c5..ad8d1c4 100644 +--- a/build/cmake/functions.cmake ++++ b/build/cmake/functions.cmake +@@ -184,7 +184,6 @@ function(wx_set_target_properties target_name is_base) + set_target_properties(${target_name} + PROPERTIES + OUTPUT_NAME "wx_${lib_toolkit}${lib_unicode}${lib_flavour}${lib_suffix}-${lib_version}" +- OUTPUT_NAME_DEBUG "wx_${lib_toolkit}${lib_unicode}d${lib_flavour}${lib_suffix}-${lib_version}" + PREFIX "lib" + ) + endif() +@@ -486,7 +485,7 @@ function(wx_set_builtin_target_properties target_name) + PROPERTIES + OUTPUT_NAME ${target_name}${lib_unicode}${postfix} + ) +- if(WIN32) ++ if(WIN32 AND NOT MINGW) + set_target_properties(${target_name} + PROPERTIES + OUTPUT_NAME_DEBUG ${target_name}${lib_unicode}d diff --git a/externals/vcpkg/ports/wxwidgets/nanosvg-ext-depend.patch b/externals/vcpkg/ports/wxwidgets/nanosvg-ext-depend.patch new file mode 100755 index 000000000..d9d96639f --- /dev/null +++ b/externals/vcpkg/ports/wxwidgets/nanosvg-ext-depend.patch @@ -0,0 +1,35 @@ +diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake +index 8c9275974f..3758261299 100644 +--- a/build/cmake/init.cmake ++++ b/build/cmake/init.cmake +@@ -615,3 +615,6 @@ if(wxBUILD_PRECOMP) + wx_option_force_value(wxBUILD_PRECOMP OFF) + endif() + endif(wxBUILD_PRECOMP) ++ ++find_package(unofficial-nanosvg CONFIG REQUIRED) ++list(APPEND wxTOOLKIT_LIBRARIES unofficial::nanosvg::nanosvg) +diff --git a/src/generic/bmpsvg.cpp b/src/generic/bmpsvg.cpp +index 76f20dce4c..7a7c24b4dd 100644 +--- a/src/generic/bmpsvg.cpp ++++ b/src/generic/bmpsvg.cpp +@@ -26,7 +26,7 @@ + // your source tree doesn't contain 3rdparty/nanosvg and you should initialize + // and update the corresponding submodule. + #ifdef __has_include +- #if ! __has_include("../../3rdparty/nanosvg/src/nanosvg.h") ++ #if 0 + #error You need to run "git submodule update --init 3rdparty/nanosvg". + #undef wxHAS_SVG + #endif +@@ -60,8 +60,8 @@ + #define NANOSVG_IMPLEMENTATION + #define NANOSVGRAST_IMPLEMENTATION + #define NANOSVG_ALL_COLOR_KEYWORDS +-#include "../../3rdparty/nanosvg/src/nanosvg.h" +-#include "../../3rdparty/nanosvg/src/nanosvgrast.h" ++#include ++#include + + #ifdef __VISUALC__ + #pragma warning(pop) diff --git a/externals/vcpkg/ports/wxwidgets/portfile.cmake b/externals/vcpkg/ports/wxwidgets/portfile.cmake new file mode 100755 index 000000000..32b331623 --- /dev/null +++ b/externals/vcpkg/ports/wxwidgets/portfile.cmake @@ -0,0 +1,190 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wxWidgets/wxWidgets + REF 35a6d7b15fedfdb5198bb6c28b31cda33b2c2a76 #v3.1.6-final + SHA512 f42b97a695e037130da9935e3abf117c0720325f194fcdabace95fa16a5ca06d49e35db9616bb0ef16600044397739459551a6276f3c239bd4fc160ecb6cdc16 + HEAD_REF master + PATCHES + install-layout.patch + relocatable-wx-config.patch + nanosvg-ext-depend.patch + fix-libs-export.patch + fix-pcre2.patch +) + +if(VCPKG_TARGET_IS_LINUX) + message(WARNING [[ +Port wxwidgets currently requires the following packages from the system package manager: + pkg-config + GTK 3 + libsecret + libgcrypt + libsystemd +These development packages can be installed on Ubuntu systems via + sudo apt-get install pkg-config libgtk-3-dev libsecret-1-dev libgcrypt20-dev libsystemd-dev +]]) + foreach(conflicting_port IN ITEMS freetype glib) + if(EXISTS "${CURRENT_INSTALLED_DIR}/share/${conflicting_port}/copyright") + message(FATAL_ERROR "Port ${conflicting_port} must not be installed when building ${PORT}:${TARGET_TRIPLET}.") + endif() + endforeach() +endif() + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + sound wxUSE_SOUND +) + +vcpkg_find_acquire_program(PKGCONFIG) + +set(OPTIONS "") +if(VCPKG_TARGET_IS_OSX) + list(APPEND OPTIONS -DCOTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES=9999) +endif() + +if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")) + list(APPEND OPTIONS + -DwxUSE_OPENGL=OFF + -DwxUSE_STACKWALKER=OFF + ) +endif() + +if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX) + list(APPEND OPTIONS -DwxUSE_WEBREQUEST_CURL=OFF) +else() + list(APPEND OPTIONS -DwxUSE_WEBREQUEST_CURL=ON) +endif() + +# wxWidgets on Linux currently needs to find the system's `gtk+-3.0.pc`. +# vcpkg's port pkgconf would prevent this lookup. +if(VCPKG_TARGET_IS_LINUX AND NOT VCPKG_CROSSCOMPILING AND NOT DEFINED ENV{PKG_CONFIG}) + find_program(system_pkg_config NAMES pkg-config) + if(system_pkg_config) + set(ENV{PKG_CONFIG} "${system_pkg_config}") + endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND OPTIONS -DPKG_CONFIG_ARGN=--static) + endif() +endif() + +# This may be set to ON by users in a custom triplet. +# The use of 'wxUSE_STL' and 'WXWIDGETS_USE_STD_CONTAINERS' (ON or OFF) are not API compatible +# which is why they must be set in a custom triplet rather than a port feature. +if(NOT DEFINED WXWIDGETS_USE_STL) + set(WXWIDGETS_USE_STL OFF) +endif() + +if(NOT DEFINED WXWIDGETS_USE_STD_CONTAINERS) + set(WXWIDGETS_USE_STD_CONTAINERS OFF) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DwxUSE_REGEX=sys + -DwxUSE_ZLIB=sys + -DwxUSE_EXPAT=sys + -DwxUSE_LIBJPEG=sys + -DwxUSE_LIBPNG=sys + -DwxUSE_LIBTIFF=sys + -DwxUSE_SECRETSTORE=FALSE + -DwxBUILD_DISABLE_PLATFORM_LIB_DIR=ON + -DwxUSE_STL=${WXWIDGETS_USE_STL} + -DwxUSE_STD_CONTAINERS=${WXWIDGETS_USE_STD_CONTAINERS} + ${OPTIONS} + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" + # The minimum cmake version requirement for Cotire is 2.8.12. + # however, we need to declare that the minimum cmake version requirement is at least 3.1 to use CMAKE_PREFIX_PATH as the path to find .pc. + -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON +) + +vcpkg_cmake_install() + +set(tools wxrc) +if(VCPKG_TARGET_IS_MINGW OR NOT VCPKG_TARGET_IS_WINDOWS) + list(APPEND tools wxrc-3.1) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/wx-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/wx-config") + if(NOT VCPKG_BUILD_TYPE) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/wx-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/wx-config") + endif() +endif() +vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN) + +# do the copy pdbs now after the dlls got moved to the expected /bin folder above +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/msvc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(GLOB_RECURSE INCLUDES "${CURRENT_PACKAGES_DIR}/include/*.h") +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h") + list(APPEND INCLUDES "${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h") + list(APPEND INCLUDES "${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h") +endif() +foreach(INC IN LISTS INCLUDES) + file(READ "${INC}" _contents) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + string(REPLACE "defined(WXUSINGDLL)" "0" _contents "${_contents}") + else() + string(REPLACE "defined(WXUSINGDLL)" "1" _contents "${_contents}") + endif() + # Remove install prefix from setup.h to ensure package is relocatable + string(REGEX REPLACE "\n#define wxINSTALL_PREFIX [^\n]*" "\n#define wxINSTALL_PREFIX \"\"" _contents "${_contents}") + file(WRITE "${INC}" "${_contents}") +endforeach() + +if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/include/wx/setup.h") + file(GLOB_RECURSE WX_SETUP_H_FILES_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/*.h") + file(GLOB_RECURSE WX_SETUP_H_FILES_REL "${CURRENT_PACKAGES_DIR}/lib/*.h") + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_replace_string("${WX_SETUP_H_FILES_REL}" "${CURRENT_PACKAGES_DIR}" "") + + string(REPLACE "${CURRENT_PACKAGES_DIR}/lib/" "" WX_SETUP_H_FILES_REL "${WX_SETUP_H_FILES_REL}") + string(REPLACE "/setup.h" "" WX_SETUP_H_REL_RELATIVE "${WX_SETUP_H_FILES_REL}") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${WX_SETUP_H_FILES_DBG}" "${CURRENT_PACKAGES_DIR}" "") + + string(REPLACE "${CURRENT_PACKAGES_DIR}/debug/lib/" "" WX_SETUP_H_FILES_DBG "${WX_SETUP_H_FILES_DBG}") + string(REPLACE "/setup.h" "" WX_SETUP_H_DBG_RELATIVE "${WX_SETUP_H_FILES_DBG}") + endif() + + configure_file("${CMAKE_CURRENT_LIST_DIR}/setup.h.in" "${CURRENT_PACKAGES_DIR}/include/wx/setup.h" @ONLY) +endif() + +file(GLOB configs LIST_DIRECTORIES false "${CURRENT_PACKAGES_DIR}/lib/wx/config/*" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/wx-config") +foreach(config IN LISTS configs) + vcpkg_replace_string("${config}" "${CURRENT_INSTALLED_DIR}" [[${prefix}]]) +endforeach() +file(GLOB configs LIST_DIRECTORIES false "${CURRENT_PACKAGES_DIR}/debug/lib/wx/config/*" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/wx-config") +foreach(config IN LISTS configs) + vcpkg_replace_string("${config}" "${CURRENT_INSTALLED_DIR}/debug" [[${prefix}]]) +endforeach() + +# For CMake multi-config in connection with wrapper +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h") + file(INSTALL "${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib/mswud/wx" + ) +endif() + +if("example" IN_LIST FEATURES) + file(INSTALL + "${CMAKE_CURRENT_LIST_DIR}/example/CMakeLists.txt" + "${SOURCE_PATH}/samples/popup/popup.cpp" + "${SOURCE_PATH}/samples/sample.xpm" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/example" + ) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/example/popup.cpp" "../sample.xpm" "sample.xpm") +endif() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/docs/licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/wxwidgets/relocatable-wx-config.patch b/externals/vcpkg/ports/wxwidgets/relocatable-wx-config.patch new file mode 100755 index 000000000..8a5e7c4d5 --- /dev/null +++ b/externals/vcpkg/ports/wxwidgets/relocatable-wx-config.patch @@ -0,0 +1,49 @@ +diff --git a/wx-config.in b/wx-config.in +index 441f88c..b326867 100755 +--- a/wx-config.in ++++ b/wx-config.in +@@ -91,7 +91,7 @@ EOF + + + # Contentious tools determined by configure. +-EGREP="@EGREP@" ++EGREP="grep -E" # no absolute path from host + + + # For the people who know what they want, or think they do: +@@ -402,8 +402,23 @@ is_cross() { [ "x@cross_compiling@" = "xyes" ]; } + + + # Determine the base directories we require. +-prefix=${input_option_prefix-${this_prefix:-@prefix@}} +-exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-@exec_prefix@}}} ++vcpkg_prefix=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P) ++case "$vcpkg_prefix" in ++ */lib/wx/config) ++ vcpkg_prefix=${vcpkg_prefix%/*/*/*} ++ ;; ++ */tools/wxwidgets/debug) ++ vcpkg_prefix=${vcpkg_prefix%/*/*/*}/debug ++ ;; ++ */tools/wxwidgets) ++ vcpkg_prefix=${vcpkg_prefix%/*/*} ++ ;; ++esac ++if [ -n "@MINGW@" -a -n "@CMAKE_HOST_WIN32@" ]; then ++ vcpkg_prefix=$(cygpath -m "$vcpkg_prefix") ++fi ++prefix=${input_option_prefix-${this_prefix:-$vcpkg_prefix}} ++exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-$prefix}}} + wxconfdir="@libdir@/wx/config" + + installed_configs=`cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-"` +@@ -940,6 +949,9 @@ prefix=${this_prefix-$prefix} + exec_prefix=${this_exec_prefix-$exec_prefix} + + includedir="@includedir@" ++if [ "@CMAKE_BUILD_TYPE@" = "Debug" ] ; then ++ includedir="${includedir%/debug/include}/include" ++fi + libdir="@libdir@" + bindir="@bindir@" + diff --git a/externals/vcpkg/ports/wxwidgets/setup.h.in b/externals/vcpkg/ports/wxwidgets/setup.h.in new file mode 100755 index 000000000..ad9579727 --- /dev/null +++ b/externals/vcpkg/ports/wxwidgets/setup.h.in @@ -0,0 +1,5 @@ +#ifdef _DEBUG +#include "../../debug/lib/@WX_SETUP_H_DBG_RELATIVE@/setup.h" +#else +#include "../../lib/@WX_SETUP_H_REL_RELATIVE@/setup.h" +#endif diff --git a/externals/vcpkg/ports/wxwidgets/usage b/externals/vcpkg/ports/wxwidgets/usage new file mode 100755 index 000000000..f86b40619 --- /dev/null +++ b/externals/vcpkg/ports/wxwidgets/usage @@ -0,0 +1,6 @@ +The package wxwidgets provides CMake integration: + + find_package(wxWidgets REQUIRED) + target_compile_definitions(main PRIVATE ${wxWidgets_DEFINITIONS} "$<$:${wxWidgets_DEFINITIONS_DEBUG}>") + target_include_directories(main PRIVATE ${wxWidgets_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${wxWidgets_LIBRARIES}) diff --git a/externals/vcpkg/ports/wxwidgets/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/wxwidgets/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..f4a1403ee --- /dev/null +++ b/externals/vcpkg/ports/wxwidgets/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,71 @@ +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0054 NEW) + +get_filename_component(_vcpkg_wx_root "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE) +set(wxWidgets_ROOT_DIR "${_vcpkg_wx_root}" CACHE INTERNAL "") +set(WX_ROOT_DIR "${_vcpkg_wx_root}" CACHE INTERNAL "") +unset(_vcpkg_wx_root) + +if(MINGW) + # Force FindwxWidgets.cmake unix mode, matching mingw install layout + set(_vcpkg_wxwidgets_backup_crosscompiling "${CMAKE_CROSSCOMPILING}") + set(CMAKE_CROSSCOMPILING 1) +elseif(WIN32) + # Force FindwxWidgets.cmake win32 mode, matching win32 install layout + set(_vcpkg_wxwidgets_backup_crosscompiling "${CMAKE_CROSSCOMPILING}") + set(CMAKE_CROSSCOMPILING 0) +endif() + +if(WIN32 AND NOT CMAKE_CROSSCOMPILING) + # FindwxWidgets.cmake win32 mode, multi-config + # Get cache variables for debug libs + set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/debug/lib" CACHE INTERNAL "") + set(WX_LIB_DIR "${wxWidgets_LIB_DIR}" CACHE INTERNAL "") + _find_package(${ARGS}) + # Reset for regular lookup + unset(wxWidgets_CONFIGURATION CACHE) + unset(wxWidgets_USE_REL_AND_DBG CACHE) + set(WX_CONFIGURATION_LIST "") + set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/lib" CACHE INTERNAL "") +else() + # FindwxWidgets.cmake unix mode, single-config + set(_vcpkg_wxconfig "") + if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR "Debug" IN_LIST MAP_IMPORTED_CONFIG_${CMAKE_BUILD_TYPE}) + # Debug + set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/debug/lib" CACHE INTERNAL "") + file(GLOB _vcpkg_wxconfig LIST_DIRECTORIES false "${wxWidgets_LIB_DIR}/wx/config/*") + endif() + if(NOT _vcpkg_wxconfig) + # Release or fallback + set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/lib" CACHE INTERNAL "") + file(GLOB _vcpkg_wxconfig LIST_DIRECTORIES false "${wxWidgets_LIB_DIR}/wx/config/*") + endif() + set(wxWidgets_CONFIG_EXECUTABLE "${_vcpkg_wxconfig}" CACHE INTERNAL "") + unset(_vcpkg_wxconfig) +endif() +set(WX_LIB_DIR "${wxWidgets_LIB_DIR}" CACHE INTERNAL "") + +_find_package(${ARGS}) + +if(DEFINED _vcpkg_wxwidgets_backup_crosscompiling) + set(CMAKE_CROSSCOMPILING "${_vcpkg_wxwidgets_backup_crosscompiling}") + unset(_vcpkg_wxwidgets_backup_crosscompiling) +endif() + +if(WIN32 AND NOT MINGW AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + find_package(EXPAT QUIET) + find_package(JPEG QUIET) + find_package(PNG QUIET) + find_package(TIFF QUIET) + find_package(ZLIB QUIET) + list(APPEND wxWidgets_LIBRARIES + ${EXPAT_LIBRARIES} + ${JPEG_LIBRARIES} + ${PNG_LIBRARIES} + ${TIFF_LIBRARIES} + ${ZLIB_LIBRARIES} + ) +endif() + +cmake_policy(POP) diff --git a/externals/vcpkg/ports/wxwidgets/vcpkg.json b/externals/vcpkg/ports/wxwidgets/vcpkg.json new file mode 100755 index 000000000..fdf7608f0 --- /dev/null +++ b/externals/vcpkg/ports/wxwidgets/vcpkg.json @@ -0,0 +1,53 @@ +{ + "name": "wxwidgets", + "version": "3.1.6", + "port-version": 1, + "description": [ + "Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ", + "Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.", + "Set WXWIDGETS_USE_STD_CONTAINERS in a custom triplet to build with the wxUSE_STD_CONTAINERS build option." + ], + "homepage": "https://github.com/wxWidgets/wxWidgets", + "license": "LGPL-2.0-or-later WITH WxWindows-exception-3.1", + "supports": "!uwp", + "dependencies": [ + { + "name": "curl", + "default-features": false, + "platform": "!windows & !osx" + }, + "expat", + "libjpeg-turbo", + "libpng", + "nanosvg", + "pcre2", + "tiff", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "default-features": [ + "sound" + ], + "features": { + "example": { + "description": "Example source code and CMake project" + }, + "sound": { + "description": "Build wxSound support", + "dependencies": [ + { + "name": "sdl2", + "default-features": false, + "platform": "!windows & !osx" + } + ] + } + } +} diff --git a/externals/vcpkg/ports/x-plane/portfile.cmake b/externals/vcpkg/ports/x-plane/portfile.cmake new file mode 100755 index 000000000..3b7c9a679 --- /dev/null +++ b/externals/vcpkg/ports/x-plane/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_download_distfile(ARCHIVE + URLS "http://developer.x-plane.com/wp-content/plugins/code-sample-generation/sample_templates/XPSDK303.zip" + FILENAME "XPSDK303.zip" + SHA512 23a1efc893fdb838ce90307ac2e1bf592b03880e9c7bf7aac51cf0d358816931b56a3d603e266f3c9041620190c689dc4d3b28b288bc39cf6e653db6f2125395 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +# create lib dir +if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX) + file(MAKE_DIRECTORY + ${CURRENT_PACKAGES_DIR}/lib + ${CURRENT_PACKAGES_DIR}/debug/lib + ) +endif() + +# copy headers & sources +file(COPY ${SOURCE_PATH}/CHeaders/Widgets/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${SOURCE_PATH}/CHeaders/Wrappers/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${SOURCE_PATH}/CHeaders/XPLM/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# copy prebuilt libs +if(VCPKG_TARGET_IS_WINDOWS) + file(COPY ${SOURCE_PATH}/Libraries/Win/XPLM_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) + file(COPY ${SOURCE_PATH}/Libraries/Win/XPWidgets_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) + file(COPY ${SOURCE_PATH}/Libraries/Win/XPLM_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) + file(COPY ${SOURCE_PATH}/Libraries/Win/XPWidgets_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) +elseif (VCPKG_TARGET_IS_OSX) + file(COPY ${SOURCE_PATH}/Libraries/Mac/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) + file(COPY ${SOURCE_PATH}/Libraries/Mac/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) +endif() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/x-plane/vcpkg.json b/externals/vcpkg/ports/x-plane/vcpkg.json new file mode 100755 index 000000000..6402bd4b5 --- /dev/null +++ b/externals/vcpkg/ports/x-plane/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "x-plane", + "version": "3.0.3", + "port-version": 1, + "description": "The X-Plane Plugin SDK", + "homepage": "https://developer.x-plane.com/sdk/", + "supports": "!(x86 | arm | wasm32)" +} diff --git a/externals/vcpkg/ports/x264/portfile.cmake b/externals/vcpkg/ports/x264/portfile.cmake new file mode 100755 index 000000000..33e6979ac --- /dev/null +++ b/externals/vcpkg/ports/x264/portfile.cmake @@ -0,0 +1,94 @@ +set(X264_VERSION 164) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mirror/x264 + REF 5db6aa6cab1b146e07b60cc1736a01f21da01154 + SHA512 d2cdd40d195fd6507abacc8b8810107567dff2c0a93424ba1eb00b544cb78a5430f00f9bcf8f19bd663ae77849225577da05bfcdb57948a8af9dc32a7c8b9ffd + HEAD_REF stable + PATCHES + "uwp-cflags.patch" +) + +vcpkg_find_acquire_program(NASM) +get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) +vcpkg_add_to_path(${NASM_EXE_PATH}) + +if(VCPKG_TARGET_IS_WINDOWS) + z_vcpkg_determine_autotools_host_cpu(BUILD_ARCH) + z_vcpkg_determine_autotools_target_cpu(HOST_ARCH) + list(APPEND OPTIONS --build=${BUILD_ARCH}-pc-mingw32) + list(APPEND OPTIONS --host=${HOST_ARCH}-pc-mingw32) + set(ENV{AS} "${NASM}") +endif() + +if(VCPKG_TARGET_IS_UWP) + list(APPEND OPTIONS --extra-cflags=-DWINAPI_FAMILY=WINAPI_FAMILY_APP --extra-cflags=-D_WIN32_WINNT=0x0A00) + list(APPEND OPTIONS --extra-ldflags=-APPCONTAINER --extra-ldflags=WindowsApp.lib) + list(APPEND OPTIONS --disable-asm) +endif() + +if(VCPKG_TARGET_IS_LINUX) + list(APPEND OPTIONS --enable-pic) +endif() + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + NO_ADDITIONAL_PATHS + OPTIONS + ${OPTIONS} + --enable-strip + --disable-lavf + --disable-swscale + --disable-avs + --disable-ffms + --disable-gpac + --disable-lsmash + --enable-debug + +) + +vcpkg_install_make() + +if(NOT VCPKG_TARGET_IS_UWP) + vcpkg_copy_tools(TOOL_NAMES x264 AUTO_CLEAN) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +if(VCPKG_TARGET_IS_WINDOWS) + set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x264.pc") + if(EXISTS "${pcfile}") + vcpkg_replace_string("${pcfile}" "-lx264" "-llibx264") + endif() + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x264.pc") + if(EXISTS "${pcfile}") + vcpkg_replace_string("${pcfile}" "-lx264" "-llibx264") + endif() + endif() +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libx264.dll.lib ${CURRENT_PACKAGES_DIR}/lib/libx264.lib) + + if (NOT VCPKG_BUILD_TYPE) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libx264.dll.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libx264.lib) + endif() +elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # force U_STATIC_IMPLEMENTATION macro + file(READ ${CURRENT_PACKAGES_DIR}/include/x264.h HEADER_CONTENTS) + string(REPLACE "defined(U_STATIC_IMPLEMENTATION)" "1" HEADER_CONTENTS "${HEADER_CONTENTS}") + file(WRITE ${CURRENT_PACKAGES_DIR}/include/x264.h "${HEADER_CONTENTS}") + + file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/bin + ${CURRENT_PACKAGES_DIR}/debug/bin + ) +endif() + +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/x264/uwp-cflags.patch b/externals/vcpkg/ports/x264/uwp-cflags.patch new file mode 100755 index 000000000..792e99927 --- /dev/null +++ b/externals/vcpkg/ports/x264/uwp-cflags.patch @@ -0,0 +1,12 @@ +diff --git a/configure b/configure +index f7b14d9..2c92b2a 100644 +--- a/configure ++++ b/configure +@@ -821,7 +821,6 @@ if [ $SYS = WINDOWS ]; then + if cpp_check "winapifamily.h" "" "!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)" ; then + [ $compiler = CL ] || die "WinRT requires MSVC" + define HAVE_WINRT +- CFLAGS="$CFLAGS -MD" + LDFLAGS="$LDFLAGS -appcontainer" + if ! cpp_check "" "" "defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0603" ; then + die "_WIN32_WINNT must be defined to at least 0x0603 (Windows 8.1) for WinRT" diff --git a/externals/vcpkg/ports/x264/vcpkg.json b/externals/vcpkg/ports/x264/vcpkg.json new file mode 100755 index 000000000..436cf0b5e --- /dev/null +++ b/externals/vcpkg/ports/x264/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "x264", + "version-string": "164-5db6aa6cab1b146", + "port-version": 4, + "description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format", + "homepage": "https://github.com/mirror/x264", + "supports": "!(arm & windows)", + "dependencies": [ + { + "name": "pthread", + "platform": "linux & osx" + } + ] +} diff --git a/externals/vcpkg/ports/x265/disable-install-pdb.patch b/externals/vcpkg/ports/x265/disable-install-pdb.patch new file mode 100755 index 000000000..6826fe855 --- /dev/null +++ b/externals/vcpkg/ports/x265/disable-install-pdb.patch @@ -0,0 +1,22 @@ +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index 33b6523..06e3193 100644 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -580,13 +580,13 @@ endif() + install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include) + if((WIN32 AND ENABLE_CLI) OR (WIN32 AND ENABLE_SHARED)) + if(MSVC_IDE) +- install(FILES "${PROJECT_BINARY_DIR}/Debug/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug) +- install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo) ++ #install(FILES "${PROJECT_BINARY_DIR}/Debug/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug) ++ #install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo) + install(FILES "${PROJECT_BINARY_DIR}/Debug/libx265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug OPTIONAL NAMELINK_ONLY) + install(FILES "${PROJECT_BINARY_DIR}/RelWithDebInfo/libx265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo OPTIONAL NAMELINK_ONLY) + else() +- install(FILES "${PROJECT_BINARY_DIR}/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug) +- install(FILES "${PROJECT_BINARY_DIR}/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo) ++ #install(FILES "${PROJECT_BINARY_DIR}/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug) ++ #install(FILES "${PROJECT_BINARY_DIR}/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo) + install(FILES "${PROJECT_BINARY_DIR}/libx265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug OPTIONAL NAMELINK_ONLY) + install(FILES "${PROJECT_BINARY_DIR}/libx265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo OPTIONAL NAMELINK_ONLY) + endif() diff --git a/externals/vcpkg/ports/x265/portfile.cmake b/externals/vcpkg/ports/x265/portfile.cmake new file mode 100755 index 000000000..8dd9dd1e3 --- /dev/null +++ b/externals/vcpkg/ports/x265/portfile.cmake @@ -0,0 +1,96 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO videolan/x265 + REF 07295ba7ab551bb9c1580fdaee3200f1b45711b7 #v3.4 + SHA512 21a4ef8733a9011eec8b336106c835fbe04689e3a1b820acb11205e35d2baba8c786d9d8cf5f395e78277f921857e4eb8622cf2ef3597bce952d374f7fe9ec29 + HEAD_REF master + PATCHES + disable-install-pdb.patch +) + +set(ENABLE_ASSEMBLY OFF) +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_find_acquire_program(NASM) + get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) + set(ENV{PATH} "$ENV{PATH};${NASM_EXE_PATH}") + set(ENABLE_ASSEMBLY ON) +endif () + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/source + PREFER_NINJA + OPTIONS + -DENABLE_ASSEMBLY=${ENABLE_ASSEMBLY} + -DENABLE_SHARED=${ENABLE_SHARED} + OPTIONS_DEBUG + -DENABLE_CLI=OFF +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +# remove duplicated include files +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +endif() +vcpkg_copy_tools(TOOL_NAMES x265 AUTO_CLEAN) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_IS_LINUX) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) +endif() + +if(VCPKG_TARGET_IS_WINDOWS AND (NOT VCPKG_TARGET_IS_MINGW)) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x265.pc" "-lx265" "-lx265-static") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x265.pc" "-lx265" "-lx265-static") + endif() + endif() +endif() + +# maybe create vcpkg_regex_replace_string? + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(READ ${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x265.pc _contents) + string(REGEX REPLACE "-l(std)?c\\+\\+" "" _contents "${_contents}") + file(WRITE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x265.pc "${_contents}") +endif() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(READ ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x265.pc _contents) + string(REGEX REPLACE "-l(std)?c\\+\\+" "" _contents "${_contents}") + file(WRITE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x265.pc "${_contents}") +endif() + +if(VCPKG_TARGET_IS_MINGW AND ENABLE_SHARED) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libx265.a) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libx265.a) + endif() +endif() + +if(UNIX) + foreach(FILE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x265.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x265.pc") + if(EXISTS "${FILE}") + file(READ "${FILE}" _contents) + string(REPLACE " -lstdc++" "" _contents "${_contents}") + string(REPLACE " -lc++" "" _contents "${_contents}") + string(REPLACE " -lgcc_s" "" _contents "${_contents}") + string(REPLACE " -lgcc" "" _contents "${_contents}") + string(REPLACE " -lrt" "" _contents "${_contents}") + file(WRITE "${FILE}" "${_contents}") + endif() + endforeach() + vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES numa) +else() + vcpkg_fixup_pkgconfig() +endif() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/x265/vcpkg.json b/externals/vcpkg/ports/x265/vcpkg.json new file mode 100755 index 000000000..cc19a6f2b --- /dev/null +++ b/externals/vcpkg/ports/x265/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "x265", + "version-string": "3.4", + "port-version": 5, + "description": "x265 is a H.265 / HEVC video encoder application library, designed to encode video or images into an H.265 / HEVC encoded bitstream.", + "homepage": "https://github.com/videolan/x265", + "supports": "!(uwp | arm)" +} diff --git a/externals/vcpkg/ports/xalan-c/fix-linux-no-bin.patch b/externals/vcpkg/ports/xalan-c/fix-linux-no-bin.patch new file mode 100755 index 000000000..3d468a1c5 --- /dev/null +++ b/externals/vcpkg/ports/xalan-c/fix-linux-no-bin.patch @@ -0,0 +1,20 @@ +diff --git a/src/xalanc/Utils/CMakeLists.txt b/src/xalanc/Utils/CMakeLists.txt +index 2d78685..72b611b 100644 +--- a/src/xalanc/Utils/CMakeLists.txt ++++ b/src/xalanc/Utils/CMakeLists.txt +@@ -41,11 +41,15 @@ add_custom_target(locale ALL) + set_target_properties(locale PROPERTIES FOLDER "Message Library") + + # workaround for case of missing xerces-c dll ++if(CMAKE_HOST_WIN32) + if(EXISTS ${XercesC_INCLUDE_DIR}/../bin) + set(MsgCreator_WD $/../bin) + else() + set(MsgCreator_WD "${XSL_NLS_GEN_DIR}") + endif() ++else() ++ set(MsgCreator_WD "${PROJECT_BINARY_DIR}") ++endif() + + if(msgloader STREQUAL "inmemory") + add_custom_command( diff --git a/externals/vcpkg/ports/xalan-c/fix-missing-dll-error.patch b/externals/vcpkg/ports/xalan-c/fix-missing-dll-error.patch new file mode 100755 index 000000000..db49a2be6 --- /dev/null +++ b/externals/vcpkg/ports/xalan-c/fix-missing-dll-error.patch @@ -0,0 +1,48 @@ +diff --git a/src/xalanc/Utils/CMakeLists.txt b/src/xalanc/Utils/CMakeLists.txt +index dc39ad0..2d78685 100644 +--- a/src/xalanc/Utils/CMakeLists.txt ++++ b/src/xalanc/Utils/CMakeLists.txt +@@ -40,6 +40,13 @@ set(SUPPORTMSGINDEX "${GEN_SUPPORTDIR}/LocalMsgIndex.hpp") + add_custom_target(locale ALL) + set_target_properties(locale PROPERTIES FOLDER "Message Library") + ++# workaround for case of missing xerces-c dll ++if(EXISTS ${XercesC_INCLUDE_DIR}/../bin) ++ set(MsgCreator_WD $/../bin) ++else() ++ set(MsgCreator_WD "${XSL_NLS_GEN_DIR}") ++endif() ++ + if(msgloader STREQUAL "inmemory") + add_custom_command( + OUTPUT "${GENMSGINDEX}" +@@ -48,7 +55,8 @@ if(msgloader STREQUAL "inmemory") + "${XLIFF_FILE_NAME}" + -TYPE inmem + -LOCALE ${LOCALE} +- WORKING_DIRECTORY "${XSL_NLS_GEN_DIR}" ++ -OUTDIR "${XSL_NLS_GEN_DIR}" ++ WORKING_DIRECTORY "${MsgCreator_WD}" + COMMENT "Generating inmemory locale message data" + DEPENDS MsgCreator "${XLIFF_FILE_NAME}") + +@@ -92,7 +100,8 @@ if(msgloader STREQUAL "icu") + "${XLIFF_FILE_NAME}" + -TYPE icu + -LOCALE ${LOCALE} +- WORKING_DIRECTORY "${XSL_NLS_GEN_DIR}" ++ -OUTDIR "${XSL_NLS_GEN_DIR}" ++ WORKING_DIRECTORY "${MsgCreator_WD}" + COMMENT "Generating ICU locale message data" + DEPENDS MsgCreator "${XLIFF_FILE_NAME}") + +@@ -141,7 +150,8 @@ if(msgloader STREQUAL "nls") + "${XLIFF_FILE_NAME}" + -TYPE nls + -LOCALE ${LOCALE} +- WORKING_DIRECTORY "${XSL_NLS_GEN_DIR}" ++ -OUTDIR "${XSL_NLS_GEN_DIR}" ++ WORKING_DIRECTORY "${MsgCreator_WD}" + COMMENT "Generating nls locale message data" + DEPENDS MsgCreator "${XLIFF_FILE_NAME}") + diff --git a/externals/vcpkg/ports/xalan-c/fix-win-deprecated-err.patch b/externals/vcpkg/ports/xalan-c/fix-win-deprecated-err.patch new file mode 100755 index 000000000..1484f4e27 --- /dev/null +++ b/externals/vcpkg/ports/xalan-c/fix-win-deprecated-err.patch @@ -0,0 +1,15 @@ +diff --git a/src/xalanc/Utils/MsgCreator/CMakeLists.txt b/src/xalanc/Utils/MsgCreator/CMakeLists.txt +index 20215d4..dc74c1b 100644 +--- a/src/xalanc/Utils/MsgCreator/CMakeLists.txt ++++ b/src/xalanc/Utils/MsgCreator/CMakeLists.txt +@@ -37,6 +37,10 @@ set(msgcreator_headers + NLSHandler.hpp + SAX2Handler.hpp) + ++if(MSVC) ++ add_definitions(-D_CRT_SECURE_NO_WARNINGS=1) ++endif() ++ + add_executable(MsgCreator ${msgcreator_sources} ${msgcreator_headers}) + target_include_directories(MsgCreator PUBLIC + $ diff --git a/externals/vcpkg/ports/xalan-c/portfile.cmake b/externals/vcpkg/ports/xalan-c/portfile.cmake new file mode 100755 index 000000000..6fa5ca3ab --- /dev/null +++ b/externals/vcpkg/ports/xalan-c/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO apache/xalan-c + REF 4055bb0c58e3053b04fcd0c68fdcda8f84411213 #1.12 + SHA512 0d591f5a07dbc69050c7b696189c46a32e6dd7a80a302fd38dcc82f9454688729e361c4d5c3b0aacfc3acc7df78c0981ba54eb3ce82b1ca6566a30aa19648280 + PATCHES + fix-win-deprecated-err.patch + fix-missing-dll-error.patch + fix-linux-no-bin.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_ICU=ON +) + +vcpkg_install_cmake() +vcpkg_copy_tools(TOOL_NAMES Xalan AUTO_CLEAN) + +if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake) + vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/xalanc) +else() + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/XalanC TARGET_PATH share/xalanc) +endif() + +# cleanup +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share +) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/xalan-c/vcpkg.json b/externals/vcpkg/ports/xalan-c/vcpkg.json new file mode 100755 index 000000000..425d9bfd2 --- /dev/null +++ b/externals/vcpkg/ports/xalan-c/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "xalan-c", + "version": "1.12", + "port-version": 1, + "description": "Xalan is an XSLT processor for transforming XML documents into HTML, text, or other XML document types", + "homepage": "https://github.com/apache/xalan-c", + "dependencies": [ + "xerces-c" + ] +} diff --git a/externals/vcpkg/ports/xaudio2redist/portfile.cmake b/externals/vcpkg/ports/xaudio2redist/portfile.cmake new file mode 100755 index 000000000..f0680eaf3 --- /dev/null +++ b/externals/vcpkg/ports/xaudio2redist/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +set(XAUDIO2REDIST_VERSION 1.2.9) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.nuget.org/api/v2/package/Microsoft.XAudio2.Redist/${XAUDIO2REDIST_VERSION}" + FILENAME "xaudio2redist.${XAUDIO2REDIST_VERSION}.zip" + SHA512 c3b37640fb871523a63cd227653d8d972dd95d6e12ccf2f28c434f51bb77011c821a0cd5ae2a9fa311f005a0083798a3218a98c0a9db5db094a5ef54bb960675 +) + +vcpkg_extract_source_archive( + PACKAGE_PATH + ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL +) + +file(GLOB HEADER_FILES "${PACKAGE_PATH}/build/native/include/*.h") +file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") + +file(INSTALL "${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + +if(VCPKG_CRT_LINKAGE STREQUAL dynamic) + file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist_md.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(INSTALL "${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist_md.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +else() + file(INSTALL "${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +endif() + +file(COPY "${PACKAGE_PATH}/build/native/release/bin/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +file(COPY "${PACKAGE_PATH}/build/native/debug/bin/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + +file(INSTALL "${PACKAGE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +configure_file("${CMAKE_CURRENT_LIST_DIR}/xaudio2redist-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" COPYONLY) diff --git a/externals/vcpkg/ports/xaudio2redist/vcpkg.json b/externals/vcpkg/ports/xaudio2redist/vcpkg.json new file mode 100755 index 000000000..817d14e84 --- /dev/null +++ b/externals/vcpkg/ports/xaudio2redist/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "xaudio2redist", + "version": "1.2.9", + "description": "Redistributable version of XAudio 2.9 for Windows 7 SP1 or later", + "homepage": "https://aka.ms/XAudio2Redist", + "documentation": "https://aka.ms/XAudio2Redist", + "license": null, + "supports": "windows & !arm & !uwp & !staticcrt" +} diff --git a/externals/vcpkg/ports/xaudio2redist/xaudio2redist-config.cmake.in b/externals/vcpkg/ports/xaudio2redist/xaudio2redist-config.cmake.in new file mode 100755 index 000000000..023827fc5 --- /dev/null +++ b/externals/vcpkg/ports/xaudio2redist/xaudio2redist-config.cmake.in @@ -0,0 +1,35 @@ + +get_filename_component(_xaudio2_root "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_xaudio2_root "${_xaudio2_root}" PATH) +get_filename_component(_xaudio2_root "${_xaudio2_root}" PATH) + +set(_xaudio2_root_lib "${_xaudio2_root}/lib/xaudio2_9redist.lib") +if (EXISTS "${_xaudio2_root_lib}") + + add_library(Microsoft::XAudio2Redist SHARED IMPORTED) + set_target_properties(Microsoft::XAudio2Redist PROPERTIES + IMPORTED_LOCATION_RELEASE "${_xaudio2_root}/bin/xaudio2_9redist.dll" + IMPORTED_IMPLIB_RELEASE "${_xaudio2_root_lib}" + IMPORTED_LOCATION_DEBUG "${_xaudio2_root}/debug/bin/xaudio2_9redist.dll" + IMPORTED_IMPLIB_DEBUG "${_xaudio2_root}/debug/lib/xaudio2_9redist.lib" + INTERFACE_INCLUDE_DIRECTORIES "${_xaudio2_root}/include/xaudio2redist" + IMPORTED_CONFIGURATIONS "Debug;Release" + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + + add_library(Microsoft::XApoBase STATIC IMPORTED) + set_target_properties(Microsoft::XApoBase PROPERTIES + IMPORTED_LOCATION_RELEASE "${_xaudio2_root}/lib/xapobaseredist_md.lib" + IMPORTED_LOCATION_DEBUG "${_xaudio2_root}/debug/lib/xapobaseredist_md.lib" + INTERFACE_INCLUDE_DIRECTORIES "${_xaudio2_root}/include/xaudio2redist" + IMPORTED_CONFIGURATIONS "Debug;Release") + + set(xaudio2redist_FOUND TRUE) + +else() + + set(xaudio2redist_FOUND FALSE) + +endif() + +unset(_xaudio2_root_lib) +unset(_xaudio2_root) diff --git a/externals/vcpkg/ports/xbyak/portfile.cmake b/externals/vcpkg/ports/xbyak/portfile.cmake new file mode 100755 index 000000000..fd08f1af9 --- /dev/null +++ b/externals/vcpkg/ports/xbyak/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO herumi/xbyak + REF v6.60 + SHA512 83dba532c7aaa618d61f2d345caeb0ca0b1c3e4946b758095410f269ba954d1870325ed05aa7a1f8aab0b5a2961ecd878980ab835f3db3078a969d2d951aa7e9 + HEAD_REF master +) + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/xbyak") + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" +) + +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/xbyak/vcpkg.json b/externals/vcpkg/ports/xbyak/vcpkg.json new file mode 100755 index 000000000..8244ab284 --- /dev/null +++ b/externals/vcpkg/ports/xbyak/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "xbyak", + "version": "6.60", + "description": "Xbyak is a JIT assembler for x86(IA-32)/x64(AMD64, x86-64).", + "homepage": "https://github.com/herumi/xbyak", + "license": "BSD-3-Clause", + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/xerces-c/disable-tests.patch b/externals/vcpkg/ports/xerces-c/disable-tests.patch new file mode 100755 index 000000000..843b022d7 --- /dev/null +++ b/externals/vcpkg/ports/xerces-c/disable-tests.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4254f89..aa08565 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -175,10 +175,16 @@ install( + COMPONENT "development") + + # Process subdirectories ++if(NOT DISABLE_DOC) + add_subdirectory(doc) ++endif() + add_subdirectory(src) ++if(NOT DISABLE_TESTS) + add_subdirectory(tests) ++endif() ++if(NOT DISABLE_SAMPLES) + add_subdirectory(samples) ++endif() + + # Display configuration summary + message(STATUS "") diff --git a/externals/vcpkg/ports/xerces-c/portfile.cmake b/externals/vcpkg/ports/xerces-c/portfile.cmake new file mode 100755 index 000000000..d09f44251 --- /dev/null +++ b/externals/vcpkg/ports/xerces-c/portfile.cmake @@ -0,0 +1,78 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO apache/xerces-c + REF v3.2.3 + SHA512 aaafe2de4ea156d94e71e3631c79bd66660badf17bf2a19587a0ca34011f70bd1584a0beef909409a3ff05eecea9d37ffee6dbb267625f59217fd86705d2cd28 + HEAD_REF master + PATCHES + disable-tests.patch + remove-dll-export-macro.patch +) + +set(DISABLE_ICU ON) +if("icu" IN_LIST FEATURES) + set(DISABLE_ICU OFF) +endif() +if ("xmlch-wchar" IN_LIST FEATURES) + set(XMLCHTYPE -Dxmlch-type=wchar_t) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DDISABLE_TESTS=ON + -DDISABLE_DOC=ON + -DDISABLE_SAMPLES=ON + -DCMAKE_DISABLE_FIND_PACKAGE_ICU=${DISABLE_ICU} + -DCMAKE_DISABLE_FIND_PACKAGE_CURL=ON + ${XMLCHTYPE} +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake) + vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/xercesc) +else() + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/XercesC TARGET_PATH share/xercesc) +endif() + +file(READ ${CURRENT_PACKAGES_DIR}/share/xercesc/XercesCConfigInternal.cmake _contents) +string(REPLACE + "get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)" + "get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)" + _contents + "${_contents}" +) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/xercesc/XercesCConfigInternal.cmake "${_contents}") + +file(READ ${CURRENT_PACKAGES_DIR}/share/xercesc/XercesCConfig.cmake _contents) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/xercesc/XercesCConfig.cmake "include(CMakeFindDependencyMacro)\nfind_dependency(Threads)\n${_contents}") + +configure_file( + ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake + ${CURRENT_PACKAGES_DIR}/share/xercesc + @ONLY +) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() +if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(pc_file_release "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/xerces-c.pc") + set(pc_file_debug "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xerces-c.pc") + if(EXISTS "${pc_file_release}") + vcpkg_replace_string("${pc_file_release}" "-lxerces-c" "-lxerces-c_3") + endif() + if(EXISTS "${pc_file_debug}") + vcpkg_replace_string("${pc_file_debug}" "-lxerces-c" "-lxerces-c_3D") + endif() +endif() \ No newline at end of file diff --git a/externals/vcpkg/ports/xerces-c/remove-dll-export-macro.patch b/externals/vcpkg/ports/xerces-c/remove-dll-export-macro.patch new file mode 100755 index 000000000..f6f0e6975 --- /dev/null +++ b/externals/vcpkg/ports/xerces-c/remove-dll-export-macro.patch @@ -0,0 +1,27 @@ +diff --git a/src/xercesc/util/XercesDefs.hpp b/src/xercesc/util/XercesDefs.hpp +index 8071260..cd6bd68 100644 +--- a/src/xercesc/util/XercesDefs.hpp ++++ b/src/xercesc/util/XercesDefs.hpp +@@ -133,7 +133,7 @@ typedef XMLUInt32 UCS4Ch; + // The DLL_EXPORT flag should be defined on the command line during the build of a DLL + // configure conspires to make this happen. + +-#if defined(DLL_EXPORT) ++#if defined(XERCES_DLL_EXPORT) + #if defined(XERCES_BUILDING_LIBRARY) + #define XMLUTIL_EXPORT XERCES_PLATFORM_EXPORT + #define XMLPARSER_EXPORT XERCES_PLATFORM_EXPORT +diff --git a/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in b/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in +index e849e08..69fe3bf 100644 +--- a/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in ++++ b/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in +@@ -85,9 +85,6 @@ + #define XERCES_PLATFORM_EXPORT @XERCES_PLATFORM_EXPORT@ + #define XERCES_PLATFORM_IMPORT @XERCES_PLATFORM_IMPORT@ + #define XERCES_TEMPLATE_EXTERN @XERCES_TEMPLATE_EXTERN@ +-#ifdef XERCES_DLL_EXPORT +-# define DLL_EXPORT +-#endif + + // --------------------------------------------------------------------------- + // Include standard headers, if available, that we may rely on below. diff --git a/externals/vcpkg/ports/xerces-c/usage b/externals/vcpkg/ports/xerces-c/usage new file mode 100755 index 000000000..70333bf7c --- /dev/null +++ b/externals/vcpkg/ports/xerces-c/usage @@ -0,0 +1,4 @@ +The package xerces-c is compatible with built-in CMake targets: + + find_package(XercesC REQUIRED) + target_link_libraries(main PRIVATE XercesC::XercesC) diff --git a/externals/vcpkg/ports/xerces-c/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/xerces-c/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..6704b83d5 --- /dev/null +++ b/externals/vcpkg/ports/xerces-c/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,8 @@ +_find_package(${ARGS}) + +if (APPLE) + if (TARGET XercesC::XercesC) + set_property(TARGET XercesC::XercesC APPEND PROPERTY INTERFACE_LINK_LIBRARIES "-framework CoreServices" "-framework CoreFoundation" curl) + list(APPEND XercesC_LIBRARIES "-framework CoreServices" "-framework CoreFoundation" curl) + endif() +endif() diff --git a/externals/vcpkg/ports/xerces-c/vcpkg.json b/externals/vcpkg/ports/xerces-c/vcpkg.json new file mode 100755 index 000000000..41cb5a1cb --- /dev/null +++ b/externals/vcpkg/ports/xerces-c/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "xerces-c", + "version": "3.2.3", + "port-version": 4, + "description": "Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs.", + "homepage": "https://github.com/apache/xerces-c", + "license": "Apache-2.0", + "features": { + "icu": { + "description": "ICU support", + "dependencies": [ + "icu" + ] + }, + "xmlch-wchar": { + "description": "XMLCh type uses wchar_t" + } + } +} diff --git a/externals/vcpkg/ports/xeus/Fix-Compile-nlohmann-json.patch b/externals/vcpkg/ports/xeus/Fix-Compile-nlohmann-json.patch new file mode 100755 index 000000000..463c09170 --- /dev/null +++ b/externals/vcpkg/ports/xeus/Fix-Compile-nlohmann-json.patch @@ -0,0 +1,12 @@ +diff --git a/src/xmessage.cpp b/src/xmessage.cpp +index 1ab9544..5a14ba0 100644 +--- a/src/xmessage.cpp ++++ b/src/xmessage.cpp +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #include "nlohmann/json.hpp" + diff --git a/externals/vcpkg/ports/xeus/portfile.cmake b/externals/vcpkg/ports/xeus/portfile.cmake new file mode 100755 index 000000000..85ffb5e8b --- /dev/null +++ b/externals/vcpkg/ports/xeus/portfile.cmake @@ -0,0 +1,48 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO QuantStack/xeus + REF 0f6327a2782181e7ded9729abb32b7d8eb690aea # 0.24.3 + SHA512 2c0ccd1bebf487a9a73e73ecfb74b7605756652b2a84c71e739d7b2d8923960594c025e36d75cec850c5f0e38614a20299feccea6cfbe9ea0f66bdf315af02b4 + HEAD_REF master + PATCHES + Fix-Compile-nlohmann-json.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBS) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_EXAMPLES=OFF + -DXEUS_BUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DXEUS_BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} + -DBUILD_TESTS=OFF + -DDOWNLOAD_GTEST=OFF + -DDISABLE_ARCH_NATIVE=OFF +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/xeus/xeus.hpp + "#ifdef XEUS_STATIC_LIB" + "#if 1 // #ifdef XEUS_STATIC_LIB" + ) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# Install usage +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/externals/vcpkg/ports/xeus/usage b/externals/vcpkg/ports/xeus/usage new file mode 100755 index 000000000..1f959804e --- /dev/null +++ b/externals/vcpkg/ports/xeus/usage @@ -0,0 +1,4 @@ +The package xeus provides CMake targets: + + find_package(xeus CONFIG REQUIRED) + target_link_libraries(main PRIVATE xeus xeus_static) diff --git a/externals/vcpkg/ports/xeus/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/xeus/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..62a3cc765 --- /dev/null +++ b/externals/vcpkg/ports/xeus/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,9 @@ +_find_package(${ARGS}) + +if(TARGET xeus AND NOT TARGET xeus_static) + add_library(xeus_static INTERFACE IMPORTED) + set_target_properties(xeus_static PROPERTIES INTERFACE_LINK_LIBRARIES xeus) +elseif(TARGET xeus_static AND NOT TARGET xeus) + add_library(xeus INTERFACE IMPORTED) + set_target_properties(xeus PROPERTIES INTERFACE_LINK_LIBRARIES xeus_static) +endif() diff --git a/externals/vcpkg/ports/xeus/vcpkg.json b/externals/vcpkg/ports/xeus/vcpkg.json new file mode 100755 index 000000000..178c6e716 --- /dev/null +++ b/externals/vcpkg/ports/xeus/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "xeus", + "version-string": "0.24.3", + "port-version": 1, + "description": "C++ implementation of the Jupyter kernel protocol", + "homepage": "https://github.com/jupyter-xeus/xeus", + "dependencies": [ + "cppzmq", + { + "name": "libuuid", + "platform": "linux" + }, + "nlohmann-json", + "openssl", + "xtl", + "zeromq" + ] +} diff --git a/externals/vcpkg/ports/xframe/portfile.cmake b/externals/vcpkg/ports/xframe/portfile.cmake new file mode 100755 index 000000000..cb3111bd9 --- /dev/null +++ b/externals/vcpkg/ports/xframe/portfile.cmake @@ -0,0 +1,22 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xtensor-stack/xframe + REF 0.3.0 + SHA512 880fe8ca00bd189a197cc71e5f32539562db69433fdfa03db5f0db8211230db36eb96757a5ca3c667ae1d4edc96eae38393718e7a1e3f7c1827130cf21579b07 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/xframe) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/xframe/vcpkg.json b/externals/vcpkg/ports/xframe/vcpkg.json new file mode 100755 index 000000000..663ca1f2a --- /dev/null +++ b/externals/vcpkg/ports/xframe/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "xframe", + "version-string": "0.3.0", + "port-version": 1, + "description": "xframe is a dataframe for C++, based on xtensor and xtl.", + "homepage": "https://github.com/xtensor-stack/xframe", + "dependencies": [ + "xtensor", + "xtl" + ] +} diff --git a/externals/vcpkg/ports/xlnt/fix-not-found-include.patch b/externals/vcpkg/ports/xlnt/fix-not-found-include.patch new file mode 100755 index 000000000..a3068b14c --- /dev/null +++ b/externals/vcpkg/ports/xlnt/fix-not-found-include.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/XlntConfig.cmake.in b/cmake/XlntConfig.cmake.in +index 01fe4981..9cefa6e0 100644 +--- a/cmake/XlntConfig.cmake.in ++++ b/cmake/XlntConfig.cmake.in +@@ -7,7 +7,6 @@ + get_filename_component(XLNT_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) + +-set_and_check(XLNT_INCLUDE_DIR "@XLNT_INCLUDE_INSTALL_DIR@") + + check_required_components(xlnt) + + if(NOT TARGET xlnt::xlnt) diff --git a/externals/vcpkg/ports/xlnt/portfile.cmake b/externals/vcpkg/ports/xlnt/portfile.cmake new file mode 100755 index 000000000..3ad72194a --- /dev/null +++ b/externals/vcpkg/ports/xlnt/portfile.cmake @@ -0,0 +1,42 @@ +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(win_patch "static-linking-for-windows.patch") + endif() +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tfussell/xlnt + REF 568ac85346bc37757b0cd16464e7e1ea7656df91 # v1.5.0 + SHA512 414d691b372934326dc0da134eb7752c27c3223b6e92b433494d0758ca657f43b66894ad54ac97a8410387a2531a573c81572daa6a0434fa023e8e29ca74331c + HEAD_REF master + PATCHES + "fix-not-found-include.patch" + ${win_patch} +) +file(REMOVE "${SOURCE_PATH}/third-party/libstudxml/version") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(STATIC OFF) +else() + set(STATIC ON) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DTESTS=OFF -DSAMPLES=OFF -DBENCHMARKS=OFF -DSTATIC=${STATIC} +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/xlnt) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man) +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/xlnt/static-linking-for-windows.patch b/externals/vcpkg/ports/xlnt/static-linking-for-windows.patch new file mode 100755 index 000000000..603286cf9 --- /dev/null +++ b/externals/vcpkg/ports/xlnt/static-linking-for-windows.patch @@ -0,0 +1,16 @@ +diff --git a/include/xlnt/xlnt.hpp b/include/xlnt/xlnt.hpp +index fdd33c38..0d21128f 100644 +--- a/include/xlnt/xlnt.hpp ++++ b/include/xlnt/xlnt.hpp +@@ -23,6 +23,11 @@ + + #pragma once + ++// Patched by vcpkg to handle static non-cmake builds ++#ifndef XLNT_STATIC ++#define XLNT_STATIC ++#endif ++ + #include + + // cell diff --git a/externals/vcpkg/ports/xlnt/vcpkg.json b/externals/vcpkg/ports/xlnt/vcpkg.json new file mode 100755 index 000000000..eb2275878 --- /dev/null +++ b/externals/vcpkg/ports/xlnt/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "xlnt", + "version": "1.5.0", + "port-version": 3, + "description": "Cross-platform user-friendly xlsx library for C++14", + "homepage": "https://github.com/tfussell/xlnt" +} diff --git a/externals/vcpkg/ports/xlsxio/fix-dependencies.patch b/externals/vcpkg/ports/xlsxio/fix-dependencies.patch new file mode 100755 index 000000000..7a02d8f9d --- /dev/null +++ b/externals/vcpkg/ports/xlsxio/fix-dependencies.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 490ee5c..05c7ee5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -49,9 +49,8 @@ IF(WITH_LIBZIP) + SET(ANYZIP_LIBRARIES ${LIBZIP_LIBRARIES}) + SET(ANYZIP_DEF USE_LIBZIP) + ELSE() +- FIND_PACKAGE(Minizip REQUIRED) +- SET(ANYZIP_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS}) +- SET(ANYZIP_LIBRARIES ${MINIZIP_LIBRARIES}) ++ FIND_PACKAGE(minizip CONFIG REQUIRED) ++ SET(ANYZIP_LIBRARIES minizip::minizip) + SET(ANYZIP_DEF USE_MINIZIP) + ENDIF() + # dependancy: expat diff --git a/externals/vcpkg/ports/xlsxio/portfile.cmake b/externals/vcpkg/ports/xlsxio/portfile.cmake new file mode 100755 index 000000000..74b004755 --- /dev/null +++ b/externals/vcpkg/ports/xlsxio/portfile.cmake @@ -0,0 +1,46 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO brechtsanders/xlsxio + REF e3acace39e5fb153f5ce3500a4952c2bf93175bd + SHA512 8148b89c43cf45653c583d51fb8050714d3cd0a76ab9a05d46604f3671a06487e4fc58d3f6f9f2a9f9b57a9f9fe1863ef07017c74197f151390576c5aac360ea + HEAD_REF master + PATCHES fix-dependencies.patch +) + +file(REMOVE ${SOURCE_PATH}/CMake/FindMinizip.cmake) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + libzip WITH_LIBZIP +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(BUILD_STATIC ON) + set(BUILD_SHARED OFF) +else() + set(BUILD_SHARED ON) + set(BUILD_STATIC OFF) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + ${FEATURE_OPTIONS} + -DBUILD_SHARED=${BUILD_SHARED} + -DBUILD_STATIC=${BUILD_STATIC} + -DWITH_WIDE=OFF + -DBUILD_DOCUMENTATION=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_PC_FILES=OFF + -DBUILD_TOOLS=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/xlsxio/vcpkg.json b/externals/vcpkg/ports/xlsxio/vcpkg.json new file mode 100755 index 000000000..bc61d92e4 --- /dev/null +++ b/externals/vcpkg/ports/xlsxio/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "xlsxio", + "version-date": "2021-03-24", + "description": "Cross-platform C library for reading values from and writing values to .xlsx files", + "homepage": "https://github.com/brechtsanders/xlsxio", + "dependencies": [ + "expat", + { + "name": "minizip", + "features": [ + "bzip2" + ] + } + ] +} diff --git a/externals/vcpkg/ports/xmlsec/CMakeLists.txt b/externals/vcpkg/ports/xmlsec/CMakeLists.txt new file mode 100755 index 000000000..cf019d51c --- /dev/null +++ b/externals/vcpkg/ports/xmlsec/CMakeLists.txt @@ -0,0 +1,182 @@ +cmake_minimum_required (VERSION 3.8) +project (xmlsec1 C) + +option(INSTALL_HEADERS_TOOLS "Install public header files and tools" ON) + +find_package(LibXml2 REQUIRED) +find_package(OpenSSL REQUIRED) +find_package(Iconv REQUIRED) + +FILE(GLOB SOURCESXMLSEC + src/*.c +) + +FILE(GLOB SOURCESXMLSECOPENSSL + src/openssl/*.c + src/strings.c +) + +# Generate xmlexports with fixed definition of XMLSEC_STATIC +file(READ include/xmlsec/exports.h EXPORTS_H) +if(BUILD_SHARED_LIBS) + string(REPLACE "!defined(XMLSEC_STATIC)" "1" EXPORTS_H "${EXPORTS_H}") +else() + string(REPLACE "!defined(XMLSEC_STATIC)" "0" EXPORTS_H "${EXPORTS_H}") +endif() +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/exports.h "${EXPORTS_H}") + +message(STATUS "Reading version info from configure.ac") + +file(STRINGS "configure.ac" + _xmlsec_version_defines REGEX "XMLSEC_VERSION_(MAJOR|MINOR|SUBMINOR)=([0-9]+)$") + +foreach(ver ${_xmlsec_version_defines}) + if(ver MATCHES "XMLSEC_VERSION_(MAJOR|MINOR|SUBMINOR)=([0-9]+)$") + set(XMLSEC_VERSION_${CMAKE_MATCH_1} "${CMAKE_MATCH_2}" CACHE INTERNAL "") + endif() +endforeach() + +set(XMLSEC_VERSION ${XMLSEC_VERSION_MAJOR}.${XMLSEC_VERSION_MINOR}.${XMLSEC_VERSION_SUBMINOR}) +math(EXPR XMLSEC_VERSION_INFO_NUMBER + "${XMLSEC_VERSION_MAJOR} + ${XMLSEC_VERSION_MINOR}") +set(XMLSEC_VERSION_INFO ${XMLSEC_VERSION_INFO_NUMBER}:${XMLSEC_VERSION_SUBMINOR}:${XMLSEC_VERSION_MINOR}) + +message(STATUS "XMLSEC_VERSION: ${XMLSEC_VERSION}") +message(STATUS "XMLSEC_VERSION_MAJOR: ${XMLSEC_VERSION_MAJOR}") +message(STATUS "XMLSEC_VERSION_MINOR: ${XMLSEC_VERSION_MINOR}") +message(STATUS "XMLSEC_VERSION_SUBMINOR: ${XMLSEC_VERSION_SUBMINOR}") +message(STATUS "XMLSEC_VERSION_INFO: ${XMLSEC_VERSION_INFO}") + +message(STATUS "Generating version.h") + +configure_file(include/xmlsec/version.h.in include/xmlsec/version.h) + +if(MSVC) + add_compile_options(/wd4130 /wd4127 /wd4152) +endif() + +set(CMAKE_SHARED_LIBRARY_PREFIX "lib") +set(CMAKE_STATIC_LIBRARY_PREFIX "lib") + +add_library(xmlsec1 ${SOURCESXMLSEC}) +add_library(xmlsec1-openssl ${SOURCESXMLSECOPENSSL}) + +include_directories(${CMAKE_CURRENT_BINARY_DIR}/include include ${LIBXML2_INCLUDE_DIRS}) + +target_link_libraries(xmlsec1 PRIVATE + ${LIBXML2_LIBRARIES} OpenSSL::SSL +) +target_link_libraries(xmlsec1-openssl PRIVATE + ${LIBXML2_LIBRARIES} OpenSSL::SSL xmlsec1 +) + +add_compile_definitions(inline=__inline) +add_compile_definitions(PACKAGE="xmlsec1") +add_compile_definitions(XMLSEC_MSCRYPTO_NT4=1) +add_compile_definitions(HAVE_STDIO_H) +add_compile_definitions(HAVE_STDLIB_H) +add_compile_definitions(HAVE_STRING_H) +add_compile_definitions(HAVE_CTYPE_H) +add_compile_definitions(HAVE_MALLOC_H) +add_compile_definitions(HAVE_MEMORY_H) +add_compile_definitions(XMLSEC_NO_XSLT=1) +add_compile_definitions(XMLSEC_DEFAULT_CRYPTO="openssl") +add_compile_definitions(XMLSEC_NO_GOST) +add_compile_definitions(XMLSEC_NO_GOST2012) +add_compile_definitions(XMLSEC_NO_SIZE_T) +add_compile_definitions(UNICODE) +add_compile_definitions(_UNICODE) +add_compile_definitions(_MBCS) +add_compile_definitions(_REENTRANT) + +target_compile_definitions(xmlsec1-openssl PRIVATE + -DXMLSEC_CRYPTO_OPENSSL +) + +set_target_properties(xmlsec1 PROPERTIES VERSION ${XMLSEC_VERSION_MAJOR}.${XMLSEC_VERSION_MINOR}) +set_target_properties(xmlsec1-openssl PROPERTIES VERSION ${XMLSEC_VERSION_MAJOR}.${XMLSEC_VERSION_MINOR}) + +if(NOT BUILD_SHARED_LIBS) + set(XMLSEC_CORE_CFLAGS "-DLIBXML_STATIC -DLIBXSLT_STATIC -DXMLSEC_STATIC -DXMLSEC_NO_CRYPTO_DYNAMIC_LOADING") + set(XMLSEC_OPENSSL_CFLAGS ${XMLSEC_CORE_CFLAGS}) +else() + set(XMLSEC_CORE_CFLAGS "-DXMLSEC_DL_WIN32") + set(XMLSEC_OPENSSL_CFLAGS ${XMLSEC_CORE_CFLAGS}) +endif() + +target_compile_definitions(xmlsec1 PRIVATE ${XMLSEC_CORE_CFLAGS}) +target_compile_definitions(xmlsec1-openssl PRIVATE ${XMLSEC_OPENSSL_CFLAGS}) + +install(TARGETS xmlsec1 xmlsec1-openssl + EXPORT xmlsecExport + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(EXPORT xmlsecExport FILE xmlsec-config.cmake DESTINATION share/xmlsec) + +if(INSTALL_HEADERS_TOOLS) + file(GLOB PUBLIC_HEADERS + include/xmlsec/*.h + include/xmlsec/openssl/*.h) + list(FILTER PUBLIC_HEADERS EXCLUDE REGEX "exports\\.h$") + + foreach(file IN LISTS PUBLIC_HEADERS) + get_filename_component(dir ${file} DIRECTORY) + file(RELATIVE_PATH rel_dir ${CMAKE_SOURCE_DIR}/xmlsec/${LIB} ${dir}) + install(FILES ${file} DESTINATION "include/${rel_dir}") + endforeach() + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/xmlsec/version.h DESTINATION "include/xmlsec") + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exports.h DESTINATION "include/xmlsec") + + # xmlsec application + add_executable(xmlsec + apps/crypto.c + apps/cmdline.c + apps/xmlsec.c) + + if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + target_link_libraries(xmlsec PRIVATE crypt32.lib) + endif() + + target_link_libraries(xmlsec PRIVATE + ${LIBXML2_LIBRARIES} OpenSSL::SSL xmlsec1 xmlsec1-openssl + ) + if(NOT Iconv_IS_BUILT_IN) + target_link_libraries(xmlsec PRIVATE Iconv::Iconv) + endif() + + target_compile_definitions(xmlsec PRIVATE + -DXMLSEC_CRYPTO_OPENSSL + ) + + if(BUILD_SHARED_LIBS) + target_compile_definitions(xmlsec PRIVATE -DXMLSEC_CRYPTO_DYNAMIC_LOADING) + else() + find_package(Threads REQUIRED) + target_compile_definitions(xmlsec PRIVATE -DLIBXML_STATIC -DLIBXSLT_STATIC -DXMLSEC_STATIC) + target_link_libraries(xmlsec PUBLIC Threads::Threads) + endif() + install(TARGETS xmlsec DESTINATION tools/xmlsec) +endif() + +message(STATUS "Generating pkgconfig files") + +set(prefix ${CMAKE_INSTALL_PREFIX}) +set(exec_prefix ${prefix}) +set(libdir ${prefix}/${CMAKE_INSTALL_LIBDIR}) +set(includedir ${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) +set(VERSION ${XMLSEC_VERSION}) +set(LIBXML_MIN_VERSION ${LIBXML2_VERSION_STRING}) +set(OPENSSL_LIBS "-lssl -lcrypto") +set(XMLSEC_CORE_CFLAGS "${XMLSEC_CORE_CFLAGS} -DXMLSEC_DL_LIBLTDL=1 -I\${includedir}/xmlsec1 -DXMLSEC_CRYPTO_OPENSSL=1") +set(XMLSEC_CORE_LIBS "-lxmlsec1 -lltdl") +set(XMLSEC_OPENSSL_CFLAGS "${XMLSEC_OPENSSL_CFLAGS} -I\${includedir}/xmlsec1") +set(XMLSEC_OPENSSL_LIBS "-L\${libdir} -lxmlsec1-openssl ${XMLSEC_CORE_LIBS} ${OPENSSL_LIBS}") + +configure_file(${PROJECT_SOURCE_DIR}/xmlsec.pc.in ${PROJECT_BINARY_DIR}/xmlsec1.pc @ONLY) +configure_file(${PROJECT_SOURCE_DIR}/xmlsec-openssl.pc.in ${PROJECT_BINARY_DIR}/xmlsec1-openssl.pc @ONLY) +install(FILES ${PROJECT_BINARY_DIR}/xmlsec1.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/) +install(FILES ${PROJECT_BINARY_DIR}/xmlsec1-openssl.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/) diff --git a/externals/vcpkg/ports/xmlsec/pkgconfig_fixes.patch b/externals/vcpkg/ports/xmlsec/pkgconfig_fixes.patch new file mode 100755 index 000000000..c923ea597 --- /dev/null +++ b/externals/vcpkg/ports/xmlsec/pkgconfig_fixes.patch @@ -0,0 +1,21 @@ +diff --git a/xmlsec-openssl.pc.in b/xmlsec-openssl.pc.in +index af3ae29..40635cf 100644 +--- a/xmlsec-openssl.pc.in ++++ b/xmlsec-openssl.pc.in +@@ -8,5 +8,4 @@ Version: @VERSION@ + Description: XML Security Library implements XML Signature and XML Encryption standards + Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ @LIBXSLT_PC_FILE_COND@ + Cflags: @XMLSEC_OPENSSL_CFLAGS@ +-Cflags.private: -DXMLSEC_STATIC + Libs: @XMLSEC_OPENSSL_LIBS@ +diff --git a/xmlsec.pc.in b/xmlsec.pc.in +index 2d5a3ad..0f72d68 100644 +--- a/xmlsec.pc.in ++++ b/xmlsec.pc.in +@@ -7,5 +7,5 @@ Name: xmlsec1 + Version: @VERSION@ + Description: XML Security Library implements XML Signature and XML Encryption standards + Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ @LIBXSLT_PC_FILE_COND@ +-Cflags: -DXMLSEC_CRYPTO_DYNAMIC_LOADING=1 @XMLSEC_CORE_CFLAGS@ ++Cflags: @XMLSEC_CORE_CFLAGS@ + Libs: -L${libdir} @XMLSEC_CORE_LIBS@ diff --git a/externals/vcpkg/ports/xmlsec/portfile.cmake b/externals/vcpkg/ports/xmlsec/portfile.cmake new file mode 100755 index 000000000..e105d409c --- /dev/null +++ b/externals/vcpkg/ports/xmlsec/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lsh123/xmlsec + REF d823da17c80b38ccc3c4262d7b2042b07e69e266 # xmlsec-1_2_34 + SHA512 10ca5cb948723fcf1531efaab547c0665bc323cd52906decd314e0c78fff46ac7bc51eba5177838fc7f081f74f5e4a202d765c17dd0da6e378798676773a68ce + HEAD_REF master + PATCHES + pkgconfig_fixes.patch +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG -DINSTALL_HEADERS_TOOLS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/Copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/xmlsec/vcpkg.json b/externals/vcpkg/ports/xmlsec/vcpkg.json new file mode 100755 index 000000000..c09ebc45e --- /dev/null +++ b/externals/vcpkg/ports/xmlsec/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "xmlsec", + "version": "1.2.34", + "description": "XML Security Library is a C library based on LibXML2. The library supports major XML security standards.", + "homepage": "https://www.aleksey.com/xmlsec/", + "dependencies": [ + "libxml2", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/xnnpack/portfile.cmake b/externals/vcpkg/ports/xnnpack/portfile.cmake new file mode 100755 index 000000000..28abad2a4 --- /dev/null +++ b/externals/vcpkg/ports/xnnpack/portfile.cmake @@ -0,0 +1,33 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/XNNPACK + REF 5223fd1922d9d965ddb07865d1d13293069fab65 # 2021-05-17 + SHA512 5c1eb9171a046c683d5a96ae70b6dab36c415c981e8f29857d16ad67afa22681f0fe6f7623527200fd954403d50b036bb2892ba44e397d639860b9ec4873e7c6 + HEAD_REF master + PATCHES + use-packages.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DXNNPACK_USE_SYSTEM_LIBS=ON + -DXNNPACK_ENABLE_ASSEMBLY=ON + -DXNNPACK_ENABLE_MEMOPT=ON + -DXNNPACK_ENABLE_SPARSE=ON + -DXNNPACK_BUILD_TESTS=OFF + -DXNNPACK_BUILD_BENCHMARKS=OFF +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/bin + ${CURRENT_PACKAGES_DIR}/debug/share +) diff --git a/externals/vcpkg/ports/xnnpack/use-packages.patch b/externals/vcpkg/ports/xnnpack/use-packages.patch new file mode 100755 index 000000000..e31fbc745 --- /dev/null +++ b/externals/vcpkg/ports/xnnpack/use-packages.patch @@ -0,0 +1,90 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b69ce50c..1e8938b7 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3042,7 +3032,7 @@ ELSE() + ENDIF() + ENDIF() + +-TARGET_INCLUDE_DIRECTORIES(XNNPACK PUBLIC include) ++TARGET_INCLUDE_DIRECTORIES(XNNPACK PUBLIC $ $) + TARGET_INCLUDE_DIRECTORIES(XNNPACK PRIVATE src) + IF(WIN32) + # Target Windows 7+ API +@@ -3057,7 +3047,7 @@ IF(LIBM) + ENDIF() + + # ---[ Configure clog +-IF(NOT TARGET clog) ++IF(FALSE) + IF(NOT XNNPACK_USE_SYSTEM_LIBS) + SET(CLOG_BUILD_TESTS OFF CACHE BOOL "") + SET(CLOG_RUNTIME_TYPE "${CPUINFO_RUNTIME_TYPE}" CACHE STRING "") +@@ -3075,10 +3065,9 @@ IF(NOT TARGET clog) + SET_PROPERTY(TARGET clog PROPERTY IMPORTED_LOCATION "${CLOG_LIBRARY}") + ENDIF() + ENDIF() +-TARGET_LINK_LIBRARIES(XNNPACK PRIVATE clog) + + # ---[ Configure cpuinfo +-IF(NOT TARGET cpuinfo) ++IF(FALSE) + IF(NOT XNNPACK_USE_SYSTEM_LIBS) + SET(CPUINFO_BUILD_TOOLS OFF CACHE BOOL "") + SET(CPUINFO_BUILD_UNIT_TESTS OFF CACHE BOOL "") +@@ -3096,10 +3085,11 @@ IF(NOT TARGET cpuinfo) + SET_PROPERTY(TARGET cpuinfo PROPERTY IMPORTED_LOCATION "${CPUINFO_LIBRARY}") + ENDIF() + ENDIF() +-TARGET_LINK_LIBRARIES(XNNPACK PRIVATE cpuinfo) ++find_package(cpuinfo CONFIG REQUIRED) ++target_link_libraries(XNNPACK PUBLIC cpuinfo::clog cpuinfo::cpuinfo) + + # ---[ Configure pthreadpool +-IF(NOT TARGET pthreadpool) ++IF(FALSE) + IF(NOT XNNPACK_USE_SYSTEM_LIBS) + SET(PTHREADPOOL_BUILD_TESTS OFF CACHE BOOL "") + SET(PTHREADPOOL_BUILD_BENCHMARKS OFF CACHE BOOL "") +@@ -3119,7 +3109,7 @@ ENDIF() + TARGET_LINK_LIBRARIES(XNNPACK PUBLIC pthreadpool) + + # ---[ Configure FXdiv +-IF(NOT TARGET fxdiv) ++IF(FALSE) + IF(NOT XNNPACK_USE_SYSTEM_LIBS) + SET(FXDIV_BUILD_TESTS OFF CACHE BOOL "") + SET(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "") +@@ -3135,10 +3125,11 @@ IF(NOT TARGET fxdiv) + SET_PROPERTY(TARGET fxdiv PROPERTY LINKER_LANGUAGE C) + ENDIF() + ENDIF() +-TARGET_LINK_LIBRARIES(XNNPACK PRIVATE fxdiv) ++find_path(FXDIV_INCLUDE_DIRS "fxdiv.h") ++target_include_directories(XNNPACK PRIVATE ${FXDIV_INCLUDE_DIRS}) + + # ---[ Configure FP16 +-IF(NOT TARGET fp16) ++IF(FALSE) + IF(NOT XNNPACK_USE_SYSTEM_LIBS) + SET(FP16_BUILD_TESTS OFF CACHE BOOL "") + SET(FP16_BUILD_BENCHMARKS OFF CACHE BOOL "") +@@ -3154,12 +3145,17 @@ IF(NOT TARGET fp16) + SET_PROPERTY(TARGET fp16 PROPERTY LINKER_LANGUAGE C) + ENDIF() + ENDIF() +-TARGET_LINK_LIBRARIES(XNNPACK PRIVATE fp16) ++find_path(FP16_INCLUDE_DIRS "fp16.h") ++target_include_directories(XNNPACK PRIVATE ${FP16_INCLUDE_DIRS}) + + INSTALL(TARGETS XNNPACK ++ EXPORT xnnpack-config ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++install(EXPORT xnnpack-config NAMESPACE unofficial:: ++ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/xnnpack) + + # ---[ XNNPACK unit tests + IF(XNNPACK_BUILD_TESTS) diff --git a/externals/vcpkg/ports/xnnpack/vcpkg.json b/externals/vcpkg/ports/xnnpack/vcpkg.json new file mode 100755 index 000000000..6c692a05b --- /dev/null +++ b/externals/vcpkg/ports/xnnpack/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "xnnpack", + "version-date": "2021-05-17", + "port-version": 2, + "description": "High-efficiency floating-point neural network inference operators for mobile, server, and Web", + "homepage": "https://github.com/google/XNNPACK", + "license": "BSD-3-Clause", + "supports": "!(arm & windows) & !uwp", + "dependencies": [ + "cpuinfo", + "fp16", + "fxdiv", + "pthreadpool", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/xorstr/portfile.cmake b/externals/vcpkg/ports/xorstr/portfile.cmake new file mode 100755 index 000000000..b482f276a --- /dev/null +++ b/externals/vcpkg/ports/xorstr/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO JustasMasiulis/xorstr + REF 3ef854178f3df03c94b83308000ed06760dcc8aa + SHA512 c7599991d819a7bd253e763ecccb270d0c94642e52dda225d986bcc603bef9a5eecdb01bd87bd96c3320152c22f2d1d3312e84ac10b2020aa36a4229f230d7d8 + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/include/xorstr.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/ports/xorstr/vcpkg.json b/externals/vcpkg/ports/xorstr/vcpkg.json new file mode 100755 index 000000000..067c755c3 --- /dev/null +++ b/externals/vcpkg/ports/xorstr/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "xorstr", + "version-date": "2021-10-23", + "description": "Heavily vectorized c++17 compile time string encryption", + "homepage": "https://github.com/JustasMasiulis/xorstr" +} diff --git a/externals/vcpkg/ports/xproperty/fix-target.patch b/externals/vcpkg/ports/xproperty/fix-target.patch new file mode 100755 index 000000000..a838b29c8 --- /dev/null +++ b/externals/vcpkg/ports/xproperty/fix-target.patch @@ -0,0 +1,44 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5dcddc2..9d99227 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,7 +7,7 @@ + ############################################################################ + + cmake_minimum_required(VERSION 3.1) +-project(xproperty) ++project(xproperty CXX) + + set(XPROPERTY_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include) + +@@ -28,7 +28,8 @@ message(STATUS "xproperty v${${PROJECT_NAME}_VERSION}") + # Dependencies + # ============ + +-find_package(xtl 0.5.3 REQUIRED) ++set(xtl_REQUIRED_VERSION 0.5.3) ++find_package(xtl ${xtl_REQUIRED_VERSION} REQUIRED) + message(STATUS "Found xtl: ${xtl_INCLUDE_DIRS}/xtl") + + # Build +diff --git a/xpropertyConfig.cmake.in b/xpropertyConfig.cmake.in +index 192c04f..38b305a 100644 +--- a/xpropertyConfig.cmake.in ++++ b/xpropertyConfig.cmake.in +@@ -15,7 +15,12 @@ + + @PACKAGE_INIT@ + +-set(PN xproperty) +-set_and_check(${PN}_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@") +-set(${PN}_LIBRARY "") +-check_required_components(${PN}) ++include(CMakeFindDependencyMacro) ++find_dependency(xtl @xtl_REQUIRED_VERSION@) ++ ++if(NOT TARGET @PROJECT_NAME@) ++ include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") ++ get_target_property(@PROJECT_NAME@_INCLUDE_DIR @PROJECT_NAME@ INTERFACE_INCLUDE_DIRECTORIES) ++endif() ++ ++set(@PROJECT_NAME@_LIBRARY "") diff --git a/externals/vcpkg/ports/xproperty/portfile.cmake b/externals/vcpkg/ports/xproperty/portfile.cmake new file mode 100755 index 000000000..364f95c50 --- /dev/null +++ b/externals/vcpkg/ports/xproperty/portfile.cmake @@ -0,0 +1,28 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO QuantStack/xproperty + REF 0.8.1 + SHA512 70fcce3a3cc84be98d844aa59c14686945907db3c8fa1c9a916f0bab811ef96512464031e53f00d29cba7db750a0032f4b59d6ca524f52bc7cfe8de5cebad5e5 + HEAD_REF master + PATCHES + fix-target.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTS=OFF + -DDOWNLOAD_GTEST=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/xproperty/vcpkg.json b/externals/vcpkg/ports/xproperty/vcpkg.json new file mode 100755 index 000000000..31b7c1094 --- /dev/null +++ b/externals/vcpkg/ports/xproperty/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "xproperty", + "version-string": "0.8.1", + "port-version": 1, + "description": "Traitlets-like C++ properties and implementation of the observer pattern", + "dependencies": [ + "xtl" + ] +} diff --git a/externals/vcpkg/ports/xqilla/CMakeLists.txt b/externals/vcpkg/ports/xqilla/CMakeLists.txt new file mode 100755 index 000000000..85ecad218 --- /dev/null +++ b/externals/vcpkg/ports/xqilla/CMakeLists.txt @@ -0,0 +1,457 @@ +cmake_minimum_required(VERSION 3.21) +cmake_policy(VERSION 3.21) + +if (BUILD_SHARED_LIBS) + add_definitions("-DXQILLA_APIS=") +else() + add_definitions("-DXQILLA_API=") +endif() + +project(xqilla C CXX) + +add_library(xqilla +./src/exceptions/XQException.cpp +./src/exceptions/XQillaException.cpp +./src/fastxdm/FastXDMSequenceBuilder.cpp +./src/fastxdm/FastXDMNodeImpl.cpp +./src/fastxdm/FastXDMDocument.cpp +./src/fastxdm/FastXDMUpdateFactory.cpp +./src/fastxdm/FastXDMConfiguration.cpp +./src/ast/XQAttributeConstructor.cpp +./src/ast/XQOrderingChange.cpp +./src/ast/XQReturn.cpp +./src/ast/XQPredicate.cpp +./src/ast/XQNamespaceBinding.cpp +./src/ast/XQCopy.cpp +./src/ast/XQQuantified.cpp +./src/ast/NumericFunction.cpp +./src/ast/XQOperator.cpp +./src/ast/XQVariable.cpp +./src/ast/StaticAnalysis.cpp +./src/ast/XQFunctionRef.cpp +./src/ast/XQCastAs.cpp +./src/ast/XQStep.cpp +./src/ast/XQLiteral.cpp +./src/ast/XQCopyOf.cpp +./src/ast/XQElementConstructor.cpp +./src/ast/XQDocumentConstructor.cpp +./src/ast/XQTreatAs.cpp +./src/ast/XQCallTemplate.cpp +./src/ast/XQTextConstructor.cpp +./src/ast/XQNamespaceConstructor.cpp +./src/ast/XQMap.cpp +./src/ast/XQFunctionCoercion.cpp +./src/ast/XQTypeswitch.cpp +./src/ast/XQAtomize.cpp +./src/ast/XQInlineFunction.cpp +./src/ast/XQSequence.cpp +./src/ast/LetTuple.cpp +./src/ast/WhereTuple.cpp +./src/ast/XQPIConstructor.cpp +./src/ast/XQFunctionDeref.cpp +./src/ast/StaticType.cpp +./src/ast/ContextTuple.cpp +./src/ast/XQGlobalVariable.cpp +./src/ast/OrderByTuple.cpp +./src/ast/ForTuple.cpp +./src/ast/XQFunction.cpp +./src/ast/CountTuple.cpp +./src/ast/XQFunctionConversion.cpp +./src/ast/XQApplyTemplates.cpp +./src/ast/XQCommentConstructor.cpp +./src/ast/XQCastableAs.cpp +./src/ast/XQIf.cpp +./src/ast/XQContextItem.cpp +./src/ast/XQDOMConstructor.cpp +./src/ast/ASTNodeImpl.cpp +./src/ast/TupleNode.cpp +./src/ast/XQNav.cpp +./src/ast/XQEffectiveBooleanValue.cpp +./src/ast/XQDocumentOrder.cpp +./src/ast/XQFunctionCall.cpp +./src/ast/XQValidate.cpp +./src/ast/ConvertFunctionArg.cpp +./src/ast/XQPartialApply.cpp +./src/ast/XQAnalyzeString.cpp +./src/axis/NodeTest.cpp +./src/fulltext/FTContent.cpp +./src/fulltext/FTOrder.cpp +./src/fulltext/DefaultTokenStore.cpp +./src/fulltext/DefaultTokenizer.cpp +./src/fulltext/FTWords.cpp +./src/fulltext/FTOr.cpp +./src/fulltext/FTContains.cpp +./src/fulltext/FTScope.cpp +./src/fulltext/FTWindow.cpp +./src/fulltext/FTMildnot.cpp +./src/fulltext/FTAnd.cpp +./src/fulltext/FTUnaryNot.cpp +./src/fulltext/FTDistance.cpp +./src/framework/ProxyMemoryManager.cpp +./src/framework/XPath2MemoryManagerImpl.cpp +./src/framework/StringPool.cpp +./src/framework/BaseMemoryManager.cpp +./src/framework/ReferenceCounted.cpp +./src/xqc/XQillaXQCExpression.cpp +./src/xqc/XQillaXQCStaticContext.cpp +./src/xqc/XQillaXQCDynamicContext.cpp +./src/xqc/XQillaXQCImplementation.cpp +./src/xqc/XQillaXQCSequence.cpp +./src/schema/SequenceType.cpp +./src/schema/FaxppDocumentCacheImpl.cpp +./src/schema/AnyAtomicTypeDatatypeValidator.cpp +./src/schema/DocumentCacheImpl.cpp +./src/schema/SchemaValidatorFilter.cpp +./src/optimizer/Optimizer.cpp +./src/optimizer/StaticTyper.cpp +./src/optimizer/ASTVisitor.cpp +./src/optimizer/ASTReleaser.cpp +./src/optimizer/ASTCopier.cpp +./src/optimizer/QueryPathNode.cpp +./src/optimizer/QueryPathTreeGenerator.cpp +./src/optimizer/ASTToXML.cpp +./src/optimizer/PartialEvaluator.cpp +./src/xqts/TestSuiteRunner.cpp +./src/xqts/TestSuiteParser.cpp +./src/xqts/TestSuiteResultListener.cpp +./src/items/Numeric.cpp +./src/items/DatatypeFactory.cpp +./src/items/AnyAtomicType.cpp +./src/items/DateOrTimeType.cpp +./src/items/DatatypeLookup.cpp +./src/items/Timezone.cpp +./src/items/ATUntypedAtomic.cpp +./src/items/impl/ATUntypedAtomicImpl.cpp +./src/items/impl/FunctionRefImpl.cpp +./src/items/impl/ATStringOrDerivedImpl.cpp +./src/items/impl/ATDateTimeOrDerivedImpl.cpp +./src/items/impl/ATDurationOrDerivedImpl.cpp +./src/items/impl/ATAnySimpleTypeImpl.cpp +./src/items/impl/ATTimeOrDerivedImpl.cpp +./src/items/impl/ATGYearOrDerivedImpl.cpp +./src/items/impl/ATFloatOrDerivedImpl.cpp +./src/items/impl/ATGMonthOrDerivedImpl.cpp +./src/items/impl/ATGDayOrDerivedImpl.cpp +./src/items/impl/ATBooleanOrDerivedImpl.cpp +./src/items/impl/ATQNameOrDerivedImpl.cpp +./src/items/impl/ATDoubleOrDerivedImpl.cpp +./src/items/impl/ATAnyURIOrDerivedImpl.cpp +./src/items/impl/ATGYearMonthOrDerivedImpl.cpp +./src/items/impl/ATNotationOrDerivedImpl.cpp +./src/items/impl/ATHexBinaryOrDerivedImpl.cpp +./src/items/impl/ATBase64BinaryOrDerivedImpl.cpp +./src/items/impl/ATDecimalOrDerivedImpl.cpp +./src/items/impl/ATGMonthDayOrDerivedImpl.cpp +./src/items/impl/ATDateOrDerivedImpl.cpp +./src/items/Item.cpp +./src/items/Node.cpp +./src/items/ATDurationOrDerived.cpp +./src/lexer/XSLT2Lexer.cpp +./src/lexer/XQLexer.cpp +./src/lexer/XQLexer2.cpp +./src/simple-api/XQilla.cpp +./src/simple-api/XQQuery.cpp +./src/utils/UTF8Str.cpp +./src/utils/XMLChCompare.cpp +./src/utils/XStr.cpp +./src/utils/DelayedModule.cpp +./src/utils/ContextUtils.cpp +./src/utils/UnicodeTransformer.cpp +./src/utils/NumUtils.cpp +./src/utils/XPath2Utils.cpp +./src/utils/XPath2NSUtils.cpp +./src/utils/DateUtils.cpp +./src/utils/XQillaPlatformUtils.cpp +./src/mapm/mapm_mt.cpp +./src/mapm/m_apm.cpp +./src/xerces/XercesNodeImpl.cpp +./src/xerces/AncestorAxis.cpp +./src/xerces/FollowingAxis.cpp +./src/xerces/XercesURIResolver.cpp +./src/xerces/AttributeAxis.cpp +./src/xerces/NamespaceAxis.cpp +./src/xerces/DescendantOrSelfAxis.cpp +./src/xerces/XercesConfiguration.cpp +./src/xerces/PrecedingAxis.cpp +./src/xerces/ParentAxis.cpp +./src/xerces/PrecedingSiblingAxis.cpp +./src/xerces/ChildAxis.cpp +./src/xerces/DescendantAxis.cpp +./src/xerces/Axis.cpp +./src/xerces/XercesUpdateFactory.cpp +./src/xerces/AncestorOrSelfAxis.cpp +./src/xerces/XercesSequenceBuilder.cpp +./src/xerces/FollowingSiblingAxis.cpp +./src/parser/XQParser.cpp +./src/parser/QName.cpp +./src/functions/FunctionMinutesFromTime.cpp +./src/functions/FunctionWords.cpp +./src/functions/FunctionMonthFromDateTime.cpp +./src/functions/FunctionLocalNameFromQName.cpp +./src/functions/FunctionDistinctValues.cpp +./src/functions/FunctionMonthsFromDuration.cpp +./src/functions/FunctionCos.cpp +./src/functions/FunctionTrace.cpp +./src/functions/FunctionTimezoneFromDate.cpp +./src/functions/FunctionCodepointsToString.cpp +./src/functions/FunctionMinutesFromDateTime.cpp +./src/functions/FunctionYearFromDate.cpp +./src/functions/FunctionStaticBaseURI.cpp +./src/functions/BuiltInModules.cpp +./src/functions/FunctionAtan.cpp +./src/functions/FunctionCurrentDateTime.cpp +./src/functions/FunctionAdjustTimeToTimezone.cpp +./src/functions/FunctionCeiling.cpp +./src/functions/FunctionExplain.cpp +./src/functions/FunctionImplicitTimezone.cpp +./src/functions/FunctionStartsWith.cpp +./src/functions/FunctionLowerCase.cpp +./src/functions/FunctionString.cpp +./src/functions/FunctionSentences.cpp +./src/functions/FunctionYearsFromDuration.cpp +./src/functions/FunctionNamespaceURIFromQName.cpp +./src/functions/XQillaFunction.cpp +./src/functions/FunctionParseHTML.cpp +./src/functions/FunctionDayFromDate.cpp +./src/functions/FunctionId.cpp +./src/functions/FunctionEmpty.cpp +./src/functions/FunctionUnparsedText.cpp +./src/functions/FunctionAdjustDateTimeToTimezone.cpp +./src/functions/FunctionTimezoneFromTime.cpp +./src/functions/FunctionRoot.cpp +./src/functions/FunctionCount.cpp +./src/functions/FunctionPosition.cpp +./src/functions/FunctionCurrentDate.cpp +./src/functions/FunctionFunctionArity.cpp +./src/functions/EXSLTMathFunction.cpp +./src/functions/FunctionRegexGroup.cpp +./src/functions/FunctionError.cpp +./src/functions/FunctionSerializeJSON.cpp +./src/functions/FunctionTimezoneFromDateTime.cpp +./src/functions/FunctionHead.cpp +./src/functions/FunctionStringLength.cpp +./src/functions/FunctionFloor.cpp +./src/functions/FunctionResolveURI.cpp +./src/functions/FunctionLog.cpp +./src/functions/FunctionContains.cpp +./src/functions/FunctionMatches.cpp +./src/functions/FunctionMonthFromDate.cpp +./src/functions/FunctionSecondsFromTime.cpp +./src/functions/FunctionSubstring.cpp +./src/functions/FunctionDateTime.cpp +./src/functions/FunctionCollection.cpp +./src/functions/FunctionConcat.cpp +./src/functions/FunctionParseXML.cpp +./src/functions/FunctionAnalyzeString.cpp +./src/functions/FunctionTime.cpp +./src/functions/FunctionDocument.cpp +./src/functions/FunctionCompare.cpp +./src/functions/FunctionTokenize.cpp +./src/functions/FunctionSecondsFromDuration.cpp +./src/functions/FunctionSignature.cpp +./src/functions/FunctionHoursFromDateTime.cpp +./src/functions/FunctionDayFromDateTime.cpp +./src/functions/FunctionAsin.cpp +./src/functions/FunctionUpperCase.cpp +./src/functions/FunctionMinutesFromDuration.cpp +./src/functions/RegExpFunction.cpp +./src/functions/FunctionCurrentTime.cpp +./src/functions/FunctionYearFromDateTime.cpp +./src/functions/FunctionLast.cpp +./src/functions/FunctionLookup.cpp +./src/functions/FunctionDaysFromDuration.cpp +./src/functions/XQUserFunction.cpp +./src/functions/FunctionHoursFromTime.cpp +./src/functions/FunctionNilled.cpp +./src/functions/FunctionLang.cpp +./src/functions/FunctionDoc.cpp +./src/functions/FunctionParseJSON.cpp +./src/functions/FunctionFunctionName.cpp +./src/functions/FunctionEndsWith.cpp +./src/functions/FunctionDocAvailable.cpp +./src/functions/FunctionDefaultCollation.cpp +./src/functions/FunctionNormalizeUnicode.cpp +./src/functions/FunctionAbs.cpp +./src/functions/FunctionStringToCodepoints.cpp +./src/functions/FunctionPower.cpp +#./src/functions/FunctionSubstringBeforeAfter.cpp +./src/functions/FunctionUnordered.cpp +./src/functions/FunctionNodeName.cpp +./src/functions/FunctionSin.cpp +./src/functions/FunctionPrefixFromQName.cpp +./src/functions/FunctionAdjustDateToTimezone.cpp +./src/functions/FunctionQName.cpp +./src/functions/FunctionRoundHalfToEven.cpp +./src/functions/FunctionNot.cpp +./src/functions/FunctionReplace.cpp +./src/functions/FunctionBaseURI.cpp +./src/functions/FunctionExp.cpp +./src/functions/ExternalFunction.cpp +./src/functions/FunctionLocalname.cpp +./src/functions/FuncFactory.cpp +./src/functions/FunctionNamespaceUri.cpp +./src/functions/FunctionSecondsFromDateTime.cpp +./src/functions/FunctionHoursFromDuration.cpp +./src/functions/FunctionDocumentURI.cpp +./src/functions/FunctionNumber.cpp +./src/functions/FunctionRound.cpp +./src/functions/FunctionAcos.cpp +./src/functions/FunctionIdref.cpp +./src/functions/FunctionName.cpp +./src/functions/FunctionCaseFold.cpp +./src/functions/FunctionSqrt.cpp +./src/functions/FunctionTail.cpp +./src/functions/FunctionTan.cpp +./src/functions/FunctionNormalizeSpace.cpp +./src/debug/DebugHookDecorator.cpp +./src/debug/InputParser.cpp +./src/debug/TupleDebugHook.cpp +./src/debug/InteractiveDebugger.cpp +./src/debug/StackFrame.cpp +./src/debug/ASTDebugHook.cpp +./src/dom-api/impl/XQillaXMLGrammarPoolImpl.cpp +./src/dom-api/impl/XQillaExpressionImpl.cpp +./src/dom-api/impl/XPath2ResultImpl.cpp +./src/dom-api/impl/XPathNamespaceImpl.cpp +./src/dom-api/impl/XQillaDocumentImpl.cpp +./src/dom-api/impl/XQillaBuilderImpl.cpp +./src/dom-api/impl/XPathDocumentImpl.cpp +./src/dom-api/impl/XQillaNSResolverImpl.cpp +./src/dom-api/XQillaImplementation.cpp +./src/dom-api/XPath2NodeSerializer.cpp +./src/runtime/EmptyResult.cpp +./src/runtime/ResultBufferImpl.cpp +./src/runtime/ClosureResult.cpp +./src/runtime/Result.cpp +./src/runtime/SequenceResult.cpp +./src/runtime/ResultImpl.cpp +./src/runtime/Sequence.cpp +./src/runtime/ResultBuffer.cpp +./src/events/NSFixupFilter.cpp +./src/events/EventGenerator.cpp +./src/events/NoInheritFilter.cpp +./src/events/EventSerializer.cpp +./src/events/QueryPathTreeFilter.cpp +./src/events/ContentSequenceFilter.cpp +./src/context/impl/CollationImpl.cpp +./src/context/impl/ItemFactoryImpl.cpp +./src/context/impl/XQContextImpl.cpp +./src/context/impl/XQDynamicContextImpl.cpp +./src/context/impl/VarTypeStoreImpl.cpp +./src/context/impl/VarStoreImpl.cpp +./src/context/impl/VarHashEntryImpl.cpp +./src/context/impl/CodepointCollation.cpp +./src/context/UpdateFactory.cpp +./src/tools/compile-delayed-module.cpp +./src/update/UInsertAfter.cpp +./src/update/UTransform.cpp +./src/update/UInsertAsFirst.cpp +./src/update/UInsertBefore.cpp +./src/update/UInsertInto.cpp +./src/update/UReplace.cpp +./src/update/UDelete.cpp +./src/update/UInsertAsLast.cpp +./src/update/UReplaceValueOf.cpp +./src/update/URename.cpp +./src/update/PendingUpdateList.cpp +./src/update/FunctionPut.cpp +./src/update/UApplyUpdates.cpp +./src/operators/UnaryMinus.cpp +./src/operators/GeneralComp.cpp +./src/operators/Plus.cpp +./src/operators/ComparisonOperator.cpp +./src/operators/And.cpp +./src/operators/OrderComparison.cpp +./src/operators/LessThanEqual.cpp +./src/operators/Minus.cpp +./src/operators/LessThan.cpp +./src/operators/GreaterThan.cpp +./src/operators/Equals.cpp +./src/operators/NodeComparison.cpp +./src/operators/Union.cpp +./src/operators/Or.cpp +./src/operators/NotEquals.cpp +./src/operators/IntegerDivide.cpp +./src/operators/Except.cpp +./src/operators/Divide.cpp +./src/operators/GreaterThanEqual.cpp +./src/operators/Multiply.cpp +./src/operators/ArithmeticOperator.cpp +./src/operators/Mod.cpp +./src/operators/Intersect.cpp +./src/yajl/yajl_encode.c +./src/yajl/yajl.c +./src/yajl/yajl_parser.c +./src/yajl/yajl_buf.c +./src/yajl/yajl_gen.c +./src/yajl/yajl_lex.c +./src/utils/utf8proc/utf8proc.c +./src/mapm/mapm_log.c +./src/mapm/mapm_div.c +./src/mapm/mapmfmul.c +./src/mapm/mapm_add.c +./src/mapm/mapmhsin.c +./src/mapm/mapm_fft.c +./src/mapm/mapmipwr.c +./src/mapm/mapmasin.c +./src/mapm/mapm_rnd.c +./src/mapm/mapmutl2.c +./src/mapm/mapm_fam.c +./src/mapm/mapm_fpf.c +./src/mapm/mapmutil.c +./src/mapm/mapm5sin.c +./src/mapm/mapmstck.c +./src/mapm/mapm_exp.c +./src/mapm/mapm_mul.c +./src/mapm/mapmfact.c +./src/mapm/mapmgues.c +./src/mapm/mapm_flr.c +./src/mapm/mapmcbrt.c +./src/mapm/mapm_lg3.c +./src/mapm/mapm_rcp.c +./src/mapm/mapm_sin.c +./src/mapm/mapmistr.c +./src/mapm/mapmhasn.c +./src/mapm/mapmasn0.c +./src/mapm/mapmrsin.c +./src/mapm/mapm_set.c +./src/mapm/mapmsqrt.c +./src/mapm/mapm_gcd.c +./src/mapm/mapm_lg2.c +./src/mapm/mapmcnst.c +./src/mapm/mapm_pow.c +./src/mapm/mapmpwr2.c +./src/mapm/mapm_cpi.c +) + +include_directories(include) +find_package(XercesC REQUIRED) + +target_include_directories(xqilla PRIVATE "${XercesC_INCLUDE_DIRS}") +target_include_directories(xqilla PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include") + +if (BUILD_SHARED_LIBS) + target_link_libraries(xqilla PUBLIC debug "${XercesC_LIBRARY_DEBUG}") + target_link_libraries(xqilla PUBLIC optimized "${XercesC_LIBRARY_RELEASE}") +endif() + +install( + TARGETS xqilla + EXPORT unofficial-xqilla + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install( + DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/xqilla" + CONFIGURATIONS Release + DESTINATION include +) + +install( + EXPORT unofficial-xqilla + DESTINATION share/unofficial-xqilla + FILE unofficial-xqillaConfig.cmake + NAMESPACE unofficial::xqilla:: +) diff --git a/externals/vcpkg/ports/xqilla/fix-compare.patch b/externals/vcpkg/ports/xqilla/fix-compare.patch new file mode 100755 index 000000000..7e2d0d39a --- /dev/null +++ b/externals/vcpkg/ports/xqilla/fix-compare.patch @@ -0,0 +1,26 @@ +diff --git a/include/xqilla/ast/XQDocumentOrder.hpp b/include/xqilla/ast/XQDocumentOrder.hpp +index 81189e6..c22280a 100644 +--- a/include/xqilla/ast/XQDocumentOrder.hpp ++++ b/include/xqilla/ast/XQDocumentOrder.hpp +@@ -68,7 +68,7 @@ private: + public: + uniqueLessThanCompareFn(const DynamicContext *context) + : context_(context) {} +- bool operator()(const Node::Ptr &first, const Node::Ptr &second) ++ bool operator()(const Node::Ptr &first, const Node::Ptr &second) const + { + return first->uniqueLessThan(second, context_); + } +diff --git a/src/lexer/XQLexer.cpp b/src/lexer/XQLexer.cpp +index 69c923f..aed0465 100644 +--- a/src/lexer/XQLexer.cpp ++++ b/src/lexer/XQLexer.cpp +@@ -235,7 +235,7 @@ static void yy_flex_free YY_PROTO(( void * )); + #define YY_SKIP_YYWRAP + #define yytext_ptr yytext + +-#include ++#include "FlexLexer.h" + int yyFlexLexer::yylex() + { + LexerError( "yyFlexLexer::yylex invoked but %option yyclass used" ); diff --git a/externals/vcpkg/ports/xqilla/portfile.cmake b/externals/vcpkg/ports/xqilla/portfile.cmake new file mode 100755 index 000000000..c02aa2753 --- /dev/null +++ b/externals/vcpkg/ports/xqilla/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://sourceforge.net/projects/xqilla/files/XQilla-2.3.4.tar.gz/download" + FILENAME "XQilla-2.3.4.tar.gz" + SHA512 f744ff883675887494780d24ecdc94afa394d3795d1544b1c598016b3f936c340ad7cd84529ac12962e3c5ce2f1be928a0cd4f9b9eb70e6645a38b0728cb1994 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES "fix-compare.patch" +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + NO_CHARSET_FLAG +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-xqilla) +vcpkg_copy_pdbs() + + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/xqilla" RENAME copyright) diff --git a/externals/vcpkg/ports/xqilla/vcpkg.json b/externals/vcpkg/ports/xqilla/vcpkg.json new file mode 100755 index 000000000..5206797d1 --- /dev/null +++ b/externals/vcpkg/ports/xqilla/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "xqilla", + "version": "2.3.4", + "port-version": 1, + "description": "XQuery and XPath 2 library", + "homepage": "http://xqilla.sourceforge.net/HomePage", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "xerces-c" + ] +} diff --git a/externals/vcpkg/ports/xsimd/portfile.cmake b/externals/vcpkg/ports/xsimd/portfile.cmake new file mode 100755 index 000000000..7d10527a9 --- /dev/null +++ b/externals/vcpkg/ports/xsimd/portfile.cmake @@ -0,0 +1,30 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xtensor-stack/xsimd + REF 8.1.0 + SHA512 539f7b565b45e8225c6476ca1becc8243a84ae7fb51b45a584231e7d36aee10a09d7d30fb87d89cb77813fb063a7b7617bcf01fdf996f59d99e8d474d2a044ee + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + xcomplex ENABLE_XTL_COMPLEX +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENABLE_FALLBACK=OFF + -DBUILD_TESTS=OFF + -DDOWNLOAD_GTEST=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/xsimd/vcpkg.json b/externals/vcpkg/ports/xsimd/vcpkg.json new file mode 100755 index 000000000..bfcc3f98b --- /dev/null +++ b/externals/vcpkg/ports/xsimd/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "xsimd", + "version": "8.1.0", + "description": "Modern, portable C++ wrappers for SIMD intrinsics", + "homepage": "https://github.com/xtensor-stack/xsimd", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "xcomplex": { + "description": "xtl complex support", + "dependencies": [ + "xtl" + ] + } + } +} diff --git a/externals/vcpkg/ports/xtensor-blas/portfile.cmake b/externals/vcpkg/ports/xtensor-blas/portfile.cmake new file mode 100755 index 000000000..4de89d275 --- /dev/null +++ b/externals/vcpkg/ports/xtensor-blas/portfile.cmake @@ -0,0 +1,33 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xtensor-stack/xtensor-blas + REF 2876b041a2759f10dfde13ab3a2fc09578ae4b40 # 0.17.2 + SHA512 64c78d093f24fc15715bc7dfa486cfb1342a6752ea497f43553d031fc8be30718d01157e5b6412c516e6ce2be9045a89963d912e60f4eb7431675331b8ed6f90 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE + OPTIONS_RELEASE -DCXXBLAS_DEBUG=OFF + OPTIONS_DEBUG -DCXXBLAS_DEBUG=ON + OPTIONS + -DXTENSOR_USE_FLENS_BLAS=OFF + -DBUILD_TESTS=OFF + -DBUILD_BENCHMARK=OFF + -DDOWNLOAD_GTEST=OFF + -DDOWNLOAD_GBENCHMARK=OFF +) + +vcpkg_cmake_install() + +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/xtensor-blas/xblas_config_cling.hpp") + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/xflens/cxxblas/netlib") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/xtensor-blas/vcpkg.json b/externals/vcpkg/ports/xtensor-blas/vcpkg.json new file mode 100755 index 000000000..70c314727 --- /dev/null +++ b/externals/vcpkg/ports/xtensor-blas/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "xtensor-blas", + "version-string": "0.17.2", + "port-version": 2, + "description": "BLAS extension to xtensor", + "homepage": "https://github.com/xtensor-stack/xtensor-blas", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "xtensor" + ] +} diff --git a/externals/vcpkg/ports/xtensor-fftw/portfile.cmake b/externals/vcpkg/ports/xtensor-fftw/portfile.cmake new file mode 100755 index 000000000..e7e70a729 --- /dev/null +++ b/externals/vcpkg/ports/xtensor-fftw/portfile.cmake @@ -0,0 +1,33 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xtensor-stack/xtensor-fftw + REF 29f0442c98f1a219e970c96e99d7be8a42954a0b + SHA512 09b02fe6b906cde2a7f9071673a140c994316d50aaf639eb402706aaa52b66e73bc77fa1beb683d3740914ff5157283891634a806809c03f12c1def85b49595a + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCOMPILE_WARNINGS=OFF + -DBUILD_TESTS=OFF + -DDOWNLOAD_GTEST=OFF + -DBUILD_BENCHMARK=OFF + -DDOWNLOAD_GBENCHMARK=OFF + -DBENCHMARK_ENABLE_TESTING=OFF + -DDEFAULT_COLUMN_MAJOR=OFF + -DCOVERAGE=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/xtensor-fftw/vcpkg.json b/externals/vcpkg/ports/xtensor-fftw/vcpkg.json new file mode 100755 index 000000000..8ba4afb3f --- /dev/null +++ b/externals/vcpkg/ports/xtensor-fftw/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "xtensor-fftw", + "version-string": "2019-11-30", + "port-version": 2, + "description": "FFTW bindings for the xtensor C++14 multi-dimensional array library", + "homepage": "https://github.com/xtensor-stack/xtensor-fftw", + "dependencies": [ + "fftw3", + "xtensor" + ] +} diff --git a/externals/vcpkg/ports/xtensor-io/portfile.cmake b/externals/vcpkg/ports/xtensor-io/portfile.cmake new file mode 100755 index 000000000..9deb72ec5 --- /dev/null +++ b/externals/vcpkg/ports/xtensor-io/portfile.cmake @@ -0,0 +1,30 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xtensor-stack/xtensor-io + REF ffada938383b0f24c9e0b07cea7d5780057e1d96 # 0.13.0 + SHA512 ce5d085e500ef7043eb51538cab9a53c857983ac43e392cd65958c76fcde3ddb00161097cb70d334fa7d12af12e8109bb958b51f39afd9eeb60bb3421424058e + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DBUILD_TESTS=OFF + -DDOWNLOAD_GTEST=OFF + -DDOWNLOAD_GBENCHMARK=OFF + -DHAVE_HighFive=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +foreach(bit "64" "32" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/xtensor-io/xtensor_io_config.hpp" "#pragma cling add_library_path(\"${CURRENT_PACKAGES_DIR}/lib${bit}\")" "") +endforeach() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/xtensor-io/vcpkg.json b/externals/vcpkg/ports/xtensor-io/vcpkg.json new file mode 100755 index 000000000..c09140b2b --- /dev/null +++ b/externals/vcpkg/ports/xtensor-io/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "xtensor-io", + "version": "0.13.0", + "port-version": 1, + "description": "xtensor plugin to read and write images, audio files, numpy (compressed) npz and HDF5", + "homepage": "https://github.com/xtensor-stack/xtensor-io", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "xtensor", + "xtl" + ] +} diff --git a/externals/vcpkg/ports/xtensor/portfile.cmake b/externals/vcpkg/ports/xtensor/portfile.cmake new file mode 100755 index 000000000..dfaf6fc58 --- /dev/null +++ b/externals/vcpkg/ports/xtensor/portfile.cmake @@ -0,0 +1,37 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xtensor-stack/xtensor + REF 825c0fd8a465049c06ad89fa3911b342dbffcabf # 0.24.0 + SHA512 18b030efb88255108f3e2a0f5da9f082c32f2b637cb83fcabd5b579b0cff67b503d378037088c535497da09c00a5430ca87e737235b3b0b449da183925d99e68 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + xsimd XTENSOR_USE_XSIMD + tbb XTENSOR_USE_TBB +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DXTENSOR_ENABLE_ASSERT=OFF + -DXTENSOR_CHECK_DIMENSION=OFF + -DBUILD_TESTS=OFF + -DBUILD_BENCHMARK=OFF + -DDOWNLOAD_GTEST=OFF + -DDOWNLOAD_GBENCHMARK=OFF + -DDEFAULT_COLUMN_MAJOR=OFF + -DDISABLE_VS2017=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/xtensor/vcpkg.json b/externals/vcpkg/ports/xtensor/vcpkg.json new file mode 100755 index 000000000..dbd5083e5 --- /dev/null +++ b/externals/vcpkg/ports/xtensor/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "xtensor", + "version": "0.24.0", + "description": "C++ tensors with broadcasting and lazy computing", + "homepage": "https://github.com/xtensor-stack/xtensor", + "license": "BSD-3-Clause", + "dependencies": [ + "nlohmann-json", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "xtl" + ], + "features": { + "tbb": { + "description": "xtensor with tbb support", + "dependencies": [ + "tbb" + ] + }, + "xsimd": { + "description": "xtensor with xsimd support", + "dependencies": [ + "xsimd" + ] + } + } +} diff --git a/externals/vcpkg/ports/xtl/fix-fixup-cmake.patch b/externals/vcpkg/ports/xtl/fix-fixup-cmake.patch new file mode 100755 index 000000000..9bc25bf0b --- /dev/null +++ b/externals/vcpkg/ports/xtl/fix-fixup-cmake.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cbc6651..4e31f71 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -122,7 +122,7 @@ install(FILES ${XTL_HEADERS} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xtl) + endif() + +-set(XTL_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}" CACHE ++set(XTL_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" CACHE + STRING "install path for xtlConfig.cmake") + + configure_package_config_file(${PROJECT_NAME}Config.cmake.in +@@ -157,4 +157,4 @@ configure_file(${PROJECT_NAME}.pc.in + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc" + @ONLY) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc" +- DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig/") ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") diff --git a/externals/vcpkg/ports/xtl/portfile.cmake b/externals/vcpkg/ports/xtl/portfile.cmake new file mode 100755 index 000000000..6dd16a174 --- /dev/null +++ b/externals/vcpkg/ports/xtl/portfile.cmake @@ -0,0 +1,29 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xtensor-stack/xtl + REF e0f00666d90086bb245ae73abb6123d0e2c1b30b # 0.7.2 + SHA512 d7a552dc4e43a3270a56c57fde8fdc48a108909d4fa1e3fdd7ab12b178b3e271ed4d89aac9fd184e2739ddacfb3b5cb248538ed50a0ba56e740875c0faf5aa62 + HEAD_REF master + PATCHES + fix-fixup-cmake.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTS=OFF + -DDOWNLOAD_GTEST=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/xtl/vcpkg.json b/externals/vcpkg/ports/xtl/vcpkg.json new file mode 100755 index 000000000..3570c661f --- /dev/null +++ b/externals/vcpkg/ports/xtl/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "xtl", + "version": "0.7.2", + "description": "The x template library", + "homepage": "https://github.com/xtensor-stack/xtl", + "dependencies": [ + "nlohmann-json" + ] +} diff --git a/externals/vcpkg/ports/xxhash/portfile.cmake b/externals/vcpkg/ports/xxhash/portfile.cmake new file mode 100755 index 000000000..03f988e82 --- /dev/null +++ b/externals/vcpkg/ports/xxhash/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Cyan4973/xxHash + REF v0.8.1 + SHA512 12feedd6a1859ef55e27218dbd6dcceccbb5a4da34cd80240d2f7d44cd246c7afdeb59830c2d5b90189bb5159293532208bf5bb622250102e12d6e1bad14a193 + HEAD_REF dev +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES xxhsum XXHASH_BUILD_XXHSUM +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH}/cmake_unofficial + OPTIONS ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/xxHash) + +if("xxhsum" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES xxhsum AUTO_CLEAN) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_fixup_pkgconfig() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/xxhash/vcpkg.json b/externals/vcpkg/ports/xxhash/vcpkg.json new file mode 100755 index 000000000..22b45b81b --- /dev/null +++ b/externals/vcpkg/ports/xxhash/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "xxhash", + "version": "0.8.1", + "port-version": 1, + "description": "Extremely fast hash algorithm", + "homepage": "https://github.com/Cyan4973/xxHash", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "xxhsum": { + "description": "Build the xxhsum binary" + } + } +} diff --git a/externals/vcpkg/ports/yajl/cmake.patch b/externals/vcpkg/ports/yajl/cmake.patch new file mode 100755 index 000000000..c631ead21 --- /dev/null +++ b/externals/vcpkg/ports/yajl/cmake.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4c0a9be..cbec22f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -28,7 +28,7 @@ ENDIF (NOT CMAKE_BUILD_TYPE) + + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") + +-IF (WIN32) ++IF (WIN32 AND FALSE) + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4") + ADD_DEFINITIONS(-DWIN32) + SET(linkFlags "/PDB:NONE /INCREMENTAL:NO /OPT:NOREF /OPT:NOICF") +@@ -46,7 +46,8 @@ IF (WIN32) + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996 /wd4255 /wd4130 /wd4100 /wd4711") + SET(CMAKE_C_FLAGS_DEBUG "/D DEBUG /Od /Z7") + SET(CMAKE_C_FLAGS_RELEASE "/D NDEBUG /O2") +-ELSE (WIN32) ++endif() ++if (NOT WIN32) + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") + IF(CMAKE_COMPILER_IS_GNUCC) + INCLUDE(CheckCCompilerFlag) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 99cf9e9..454482a 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -78,7 +78,7 @@ INCLUDE_DIRECTORIES(${incDir}/..) + # at build time you may specify the cmake variable LIB_SUFFIX to handle + # 64-bit systems which use 'lib64' + INSTALL(TARGETS yajl +- RUNTIME DESTINATION lib${LIB_SUFFIX} ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) + INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX}) diff --git a/externals/vcpkg/ports/yajl/portfile.cmake b/externals/vcpkg/ports/yajl/portfile.cmake new file mode 100755 index 000000000..43783a708 --- /dev/null +++ b/externals/vcpkg/ports/yajl/portfile.cmake @@ -0,0 +1,43 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lloyd/yajl + REF a0ecdde0c042b9256170f2f8890dd9451a4240aa #2.1.0 + SHA512 cf0279fdbdc21d07bc0f2d409f1dddb39fd2ad62ab9872e620f46de4753958f8c59e44ef2ee734547f0f25f9490bada8c9e97dcc1a4b14b25d3e7a7254f8e1f3 + HEAD_REF master + PATCHES cmake.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +if (EXISTS "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/yajl.pc") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/yajl.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/yajl.pc") +endif() +if (EXISTS "${CURRENT_PACKAGES_DIR}/share/pkgconfig/yajl.pc") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") + file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/yajl.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/yajl.pc") +endif() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/pkgconfig") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + file(GLOB SHAREDOBJECTS "${CURRENT_PACKAGES_DIR}/lib/libyajl.so*" "${CURRENT_PACKAGES_DIR}/debug/lib/libyajl.so*") + file(REMOVE_RECURSE "${SHAREDOBJECTS}" "${CURRENT_PACKAGES_DIR}/lib/yajl.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/yajl.lib") +else() + file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*.exe" "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") + file(REMOVE_RECURSE + ${EXES} + "${CURRENT_PACKAGES_DIR}/lib/yajl_s.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/yajl_s.lib" + "${CURRENT_PACKAGES_DIR}/lib/libyajl_s.a" "${CURRENT_PACKAGES_DIR}/debug/lib/libyajl_s.a" + ) +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/yajl" RENAME copyright) diff --git a/externals/vcpkg/ports/yajl/vcpkg.json b/externals/vcpkg/ports/yajl/vcpkg.json new file mode 100755 index 000000000..d031be7ce --- /dev/null +++ b/externals/vcpkg/ports/yajl/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "yajl", + "version-string": "2.1.0", + "port-version": 3, + "description": "Yet Another JSON Library", + "homepage": "https://github.com/lloyd/yajl", + "license": "ISC", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/yaml-cpp/portfile.cmake b/externals/vcpkg/ports/yaml-cpp/portfile.cmake new file mode 100755 index 000000000..de519bd60 --- /dev/null +++ b/externals/vcpkg/ports/yaml-cpp/portfile.cmake @@ -0,0 +1,42 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jbeder/yaml-cpp + REF 0579ae3d976091d7d664aa9d2527e0d0cff25763 # yaml-cpp-0.7.0 + SHA512 930f13737c23faf06be3fa9821492d6c677359e532212ced495173367a8aec45f87fbf3a5da47d4d1b61a95c25e0101bc7f8d175752434c63b25e097186e1745 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" YAML_BUILD_SHARED_LIBS) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DYAML_CPP_BUILD_TOOLS=OFF + -DYAML_CPP_BUILD_TESTS=OFF + -DYAML_BUILD_SHARED_LIBS=${YAML_BUILD_SHARED_LIBS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/${PORT}) +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/yaml-cpp.pc" "-lyaml-cpp" "-lyaml-cppd") +endif() +file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +vcpkg_fixup_pkgconfig() + +# Remove debug include and pkgconfig files +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/pkgconfig") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/yaml-cpp/dll.h" "#ifdef YAML_CPP_DLL" "#if 1") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/yaml-cpp/dll.h" "#ifdef YAML_CPP_DLL" "#if 0") +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/yaml-cpp/vcpkg.json b/externals/vcpkg/ports/yaml-cpp/vcpkg.json new file mode 100755 index 000000000..039bcd47e --- /dev/null +++ b/externals/vcpkg/ports/yaml-cpp/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "yaml-cpp", + "version-semver": "0.7.0", + "port-version": 1, + "description": "yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec.", + "homepage": "https://github.com/jbeder/yaml-cpp", + "documentation": "https://codedocs.xyz/jbeder/yaml-cpp/index.html", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/yara/CMakeLists.txt b/externals/vcpkg/ports/yara/CMakeLists.txt new file mode 100755 index 000000000..659fd48d2 --- /dev/null +++ b/externals/vcpkg/ports/yara/CMakeLists.txt @@ -0,0 +1,152 @@ +cmake_minimum_required(VERSION 3.8) +project(yara C) + +if(MSVC) + add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS) +endif() + + +find_package(OpenSSL REQUIRED) +find_path(JANSSON_INCLUDE_DIR NAMES jansson.h) +find_library(JANSSON_LIBRARY NAMES jansson) + + +include_directories( + . + libyara + libyara/include +) + +set(PROC_PLATFORM_SOURCE "libyara/proc/none.c") +set(PROC_PLATFORM_INTERFACE "USE_NO_PROC") + +if(APPLE AND CMAKE_SYSTEM_NAME MATCHES "Darwin") + set(PROC_PLATFORM_SOURCE "libyara/proc/mach.c") + set(PROC_PLATFORM_INTERFACE "USE_MACH_PROC") +elseif(WIN32 OR MINGW OR CYGWIN) + set(PROC_PLATFORM_SOURCE "libyara/proc/windows.c") + set(PROC_PLATFORM_INTERFACE "USE_WINDOWS_PROC") +elseif(UNIX AND CMAKE_SYSTEM_NAME MATCHES "Linux") + set(THREADS_PREFER_PTHREAD_FLAG TRUE) + set(PROC_PLATFORM_SOURCE "libyara/proc/linux.c") + set(PROC_PLATFORM_INTERFACE "USE_LINUX_PROC") +endif() + +set( + libyara_sources + libyara/ahocorasick.c + libyara/arena.c + libyara/atoms.c + libyara/base64.c + libyara/bitmask.c + libyara/compiler.c + libyara/endian.c + libyara/exec.c + libyara/exefiles.c + libyara/filemap.c + libyara/grammar.c + libyara/hash.c + libyara/hex_grammar.c + libyara/hex_lexer.c + libyara/lexer.c + libyara/libyara.c + libyara/mem.c + libyara/modules.c + libyara/modules/console/console.c + libyara/modules/cuckoo/cuckoo.c + libyara/modules/dotnet/dotnet.c + libyara/modules/elf/elf.c + libyara/modules/hash/hash.c + libyara/modules/math/math.c + libyara/modules/macho/macho.c + libyara/modules/pe/pe.c + libyara/modules/pe/pe_utils.c + libyara/modules/tests/tests.c + libyara/modules/time/time.c + libyara/notebook.c + libyara/object.c + libyara/parser.c + libyara/proc.c + ${PROC_PLATFORM_SOURCE} + libyara/re.c + libyara/re_grammar.c + libyara/re_lexer.c + libyara/rules.c + libyara/scan.c + libyara/scanner.c + libyara/sizedstr.c + libyara/stack.c + libyara/stopwatch.c + libyara/stream.c + libyara/strutils.c + libyara/threading.c +) + +set( + yara_sources + cli/args.c + cli/common.c + cli/threading.c + cli/yara.c +) +set( yarac_sources + cli/args.c + cli/common.c + cli/yarac.c +) + + +find_package(Threads REQUIRED) + +set( + libyara_dependencies + OpenSSL::SSL + OpenSSL::Crypto + Threads::Threads + ${JANSSON_LIBRARY} +) + +IF(CMAKE_SYSTEM_NAME MATCHES "Windows") +list(APPEND libyara_dependencies Crypt32.lib Ws2_32.lib) +endif() +if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") + list(APPEND libyara_dependencies m) +endif() + +set( + libyara_definitions + -DHAVE_LIBCRYPTO + -D${PROC_PLATFORM_INTERFACE} + -DCUCKOO_MODULE + -DHASH_MODULE + -DDOTNET_MODULE +) + +add_library(libyara ${libyara_sources}) +target_link_libraries(libyara PRIVATE ${libyara_dependencies}) +target_compile_definitions(libyara PRIVATE ${libyara_definitions}) + + +add_executable(yara ${yara_sources}) +add_executable(yarac ${yarac_sources}) + +target_link_libraries(yarac PRIVATE libyara ${libyara_dependencies}) +target_link_libraries(yara PRIVATE libyara ${libyara_dependencies}) + +install( + TARGETS libyara + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +if(NOT DISABLE_INSTALL_TOOLS) + install ( + TARGETS yarac yara + RUNTIME DESTINATION tools/yara + ) +endif() + +if(NOT DISABLE_INSTALL_HEADERS) + install(DIRECTORY libyara/include/ DESTINATION include) +endif() diff --git a/externals/vcpkg/ports/yara/portfile.cmake b/externals/vcpkg/ports/yara/portfile.cmake new file mode 100755 index 000000000..5d179593a --- /dev/null +++ b/externals/vcpkg/ports/yara/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO VirusTotal/yara + REF 136794355c51242b595af42309a234846d534e8b #v4.2.0 + SHA512 b0aabbf4d0ba585e3adab7dbdb708264c4d4140179e69c8bc57a2ea85cdd6d97f61e67e2ce06c8436450b4e0add7f475ff76d7ca549a9b1168ac057a6cbae776 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON + -DDISABLE_INSTALL_TOOLS=ON +) + +vcpkg_cmake_install() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/yara/vcpkg.json b/externals/vcpkg/ports/yara/vcpkg.json new file mode 100755 index 000000000..0dee97a5d --- /dev/null +++ b/externals/vcpkg/ports/yara/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "yara", + "version": "4.2.0", + "description": "The pattern matching swiss knife", + "homepage": "https://github.com/VirusTotal/yara", + "license": "BSD-3-Clause", + "dependencies": [ + "jansson", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/yas/portfile.cmake b/externals/vcpkg/ports/yas/portfile.cmake new file mode 100755 index 000000000..10b8026e1 --- /dev/null +++ b/externals/vcpkg/ports/yas/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO niXman/yas + REF 7.1.0 + SHA512 1101BBE0B11FF8FA3B40B1E3030E5E93125FEDC85A90532466C9E6E0708B1C4C38821C86FCAFE153717B66B7107FCB29D0E13E87E68BF2217948A7014FC3BAC0 + HEAD_REF master +) + +file(INSTALL "${SOURCE_PATH}/include/yas" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(INSTALL "${SOURCE_PATH}/include/yas/version.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/yas/vcpkg.json b/externals/vcpkg/ports/yas/vcpkg.json new file mode 100755 index 000000000..b067a7c88 --- /dev/null +++ b/externals/vcpkg/ports/yas/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "yas", + "version": "7.1.0", + "description": "Yet Another Serialization is a header only serialization library", + "homepage": "https://github.com/niXman/yas" +} diff --git a/externals/vcpkg/ports/yasm-tool-helper/portfile.cmake b/externals/vcpkg/ports/yasm-tool-helper/portfile.cmake new file mode 100755 index 000000000..91f4fc738 --- /dev/null +++ b/externals/vcpkg/ports/yasm-tool-helper/portfile.cmake @@ -0,0 +1,5 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +configure_file( + "${CMAKE_CURRENT_LIST_DIR}/yasm-tool-helper.cmake.in" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/yasm-tool-helper.cmake" + @ONLY) diff --git a/externals/vcpkg/ports/yasm-tool-helper/vcpkg.json b/externals/vcpkg/ports/yasm-tool-helper/vcpkg.json new file mode 100755 index 000000000..dcc112ce3 --- /dev/null +++ b/externals/vcpkg/ports/yasm-tool-helper/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "yasm-tool-helper", + "version-date": "2020-03-11", + "port-version": 1, + "description": "Backfill that depends on yasm:host", + "homepage": "https://github.com/Microsoft/vcpkg", + "dependencies": [ + { + "name": "yasm", + "host": true, + "features": [ + "tools" + ] + } + ] +} diff --git a/externals/vcpkg/ports/yasm-tool-helper/yasm-tool-helper.cmake.in b/externals/vcpkg/ports/yasm-tool-helper/yasm-tool-helper.cmake.in new file mode 100755 index 000000000..8e69ef519 --- /dev/null +++ b/externals/vcpkg/ports/yasm-tool-helper/yasm-tool-helper.cmake.in @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/../../../@HOST_TRIPLET@/share/yasm/vcpkg-port-config.cmake") diff --git a/externals/vcpkg/ports/yasm-tool/portfile.cmake b/externals/vcpkg/ports/yasm-tool/portfile.cmake new file mode 100755 index 000000000..dba1f83f4 --- /dev/null +++ b/externals/vcpkg/ports/yasm-tool/portfile.cmake @@ -0,0 +1 @@ +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/ports/yasm-tool/vcpkg.json b/externals/vcpkg/ports/yasm-tool/vcpkg.json new file mode 100755 index 000000000..e78d6b536 --- /dev/null +++ b/externals/vcpkg/ports/yasm-tool/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "yasm-tool", + "version-date": "2021-12-14", + "description": "Legacy port. Use port yasm instead.", + "dependencies": [ + { + "name": "yasm", + "features": [ + "tools" + ] + } + ] +} diff --git a/externals/vcpkg/ports/yasm/add-feature-tools.patch b/externals/vcpkg/ports/yasm/add-feature-tools.patch new file mode 100755 index 000000000..4f4944665 --- /dev/null +++ b/externals/vcpkg/ports/yasm/add-feature-tools.patch @@ -0,0 +1,10 @@ +diff --git a/frontends/CMakeLists.txt b/frontends/CMakeLists.txt +index 9858b61..b151cc3 100644 +--- a/frontends/CMakeLists.txt ++++ b/frontends/CMakeLists.txt +@@ -1,3 +1,5 @@ ++if (BUILD_TOOLS) + ADD_SUBDIRECTORY(yasm) + ADD_SUBDIRECTORY(tasm) + ADD_SUBDIRECTORY(vsyasm) ++endif() diff --git a/externals/vcpkg/ports/yasm/portfile.cmake b/externals/vcpkg/ports/yasm/portfile.cmake new file mode 100755 index 000000000..37a891dc0 --- /dev/null +++ b/externals/vcpkg/ports/yasm/portfile.cmake @@ -0,0 +1,48 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO yasm/yasm + REF 009450c7ad4d425fa5a10ac4bd6efbd25248d823 # 1.3.0 plus bugfixes for https://github.com/yasm/yasm/issues/153 + SHA512 a542577558676d11b52981925ea6219bffe699faa1682c033b33b7534f5a0dfe9f29c56b32076b68c48f65e0aef7c451be3a3af804c52caa4d4357de4caad83c + HEAD_REF master + PATCHES add-feature-tools.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS +) + +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DENABLE_NLS=OFF + -DYASM_BUILD_TESTS=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +if (BUILD_TOOLS) + vcpkg_copy_tools(TOOL_NAMES vsyasm yasm ytasm AUTO_CLEAN) + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(COPY "${CURRENT_PACKAGES_DIR}/bin/yasmstd${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + endif() +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +configure_file("${CURRENT_PORT_DIR}/vcpkg-port-config.cmake.in" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY) +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/yasm/vcpkg-port-config.cmake.in b/externals/vcpkg/ports/yasm/vcpkg-port-config.cmake.in new file mode 100755 index 000000000..af3742805 --- /dev/null +++ b/externals/vcpkg/ports/yasm/vcpkg-port-config.cmake.in @@ -0,0 +1,27 @@ +set(Z_YASM_TOOL_HELPER_LIST_DIR "${CMAKE_CURRENT_LIST_DIR}") + +function(yasm_tool_helper) + cmake_parse_arguments(PARSE_ARGV 0 arg + "APPEND_TO_PATH;PREPEND_TO_PATH" + "OUT_VAR" + "" + ) + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "Unexpected arguments to yasm_tool_helper: ${arg_UNPARSED_ARGUMENTS}") + endif() + + find_program(YASM yasm PATHS "${Z_YASM_TOOL_HELPER_LIST_DIR}/../../tools/yasm") + + if(arg_APPEND_TO_PATH) + get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) + vcpkg_add_to_path("${YASM_EXE_PATH}") + endif() + if(arg_PREPEND_TO_PATH) + get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) + vcpkg_add_to_path(PREPEND "${YASM_EXE_PATH}") + endif() + if(DEFINED arg_OUT_VAR) + set("${arg_OUT_VAR}" "${YASM}" PARENT_SCOPE) + endif() +endfunction() diff --git a/externals/vcpkg/ports/yasm/vcpkg.json b/externals/vcpkg/ports/yasm/vcpkg.json new file mode 100755 index 000000000..f78ff7745 --- /dev/null +++ b/externals/vcpkg/ports/yasm/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "yasm", + "version": "1.3.0", + "port-version": 3, + "description": "Yasm is a complete rewrite of the NASM assembler under the new BSD License.", + "homepage": "https://github.com/yasm/yasm", + "supports": "windows & !uwp & !arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + { + "name": "yasm", + "host": true + } + ], + "features": { + "tools": { + "description": "Build yasm tools" + } + } +} diff --git a/externals/vcpkg/ports/yato/portfile.cmake b/externals/vcpkg/ports/yato/portfile.cmake new file mode 100755 index 000000000..7626249b6 --- /dev/null +++ b/externals/vcpkg/ports/yato/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO agruzdev/Yato + REF 9b5a49f6ec4169b67b9e5ffd11fdae9c238b0a3d + SHA512 41962839cd13a314a17fef5f6065d7c3ed9967832039ca31993105685d584307d00f17c1514f4acf855a71fd884a1104c2d9c6a4461be5d2d7cfdc50b1ea7bdb + HEAD_REF master +) + +# Copy all header files +file(COPY "${SOURCE_PATH}/include/yato" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" +) +file(COPY "${SOURCE_PATH}/modules/actors/yato" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" +) +file(COPY "${SOURCE_PATH}/modules/config/yato" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DYATO_BUILD_TESTS:BOOL=OFF + -DYATO_BUILD_ACTORS:BOOL=ON + -DYATO_BUILD_CONFIG:BOOL=ON +) + +vcpkg_cmake_build() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/yato/vcpkg.json b/externals/vcpkg/ports/yato/vcpkg.json new file mode 100755 index 000000000..d854276ce --- /dev/null +++ b/externals/vcpkg/ports/yato/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "yato", + "version-date": "2022-03-06", + "description": "Modern C++14 containers and utilities, actors system, typesafe config", + "license": "Apache-2.0", + "supports": "!(windows & arm)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/yoga/add-project-declaration.patch b/externals/vcpkg/ports/yoga/add-project-declaration.patch new file mode 100755 index 000000000..b3052a14c --- /dev/null +++ b/externals/vcpkg/ports/yoga/add-project-declaration.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,6 +7,8 @@ + + set(CMAKE_VERBOSE_MAKEFILE on) + ++project(yogacore CXX) ++ + add_compile_options( + -fno-omit-frame-pointer + -fexceptions diff --git a/externals/vcpkg/ports/yoga/portfile.cmake b/externals/vcpkg/ports/yoga/portfile.cmake new file mode 100755 index 000000000..6c7a2cf94 --- /dev/null +++ b/externals/vcpkg/ports/yoga/portfile.cmake @@ -0,0 +1,43 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO facebook/yoga + REF v1.19.0 + SHA512 B1CB1F23CF9B5DD2491B6883CAF8FB47E264B736C94F6AA6655E9A6F641664B4BCEEB48F74C98B955F0EE02BA2E0AE8E01539A928ABB4B81FAE13ED3B57287CA + HEAD_REF master + PATCHES add-project-declaration.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_build_cmake() +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/yoga DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.h") + +set(YOGA_LIB_PREFFIX ) +if (NOT VCPKG_TARGET_IS_WINDOWS) + set(YOGA_LIB_PREFFIX lib) +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(YOGA_BINARY_PATH ) + if (VCPKG_TARGET_IS_WINDOWS) + set(YOGA_BINARY_PATH Release/) + endif() + file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${YOGA_BINARY_PATH}${YOGA_LIB_PREFFIX}yogacore${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(YOGA_BINARY_PATH ) + if (VCPKG_TARGET_IS_WINDOWS) + set(YOGA_BINARY_PATH Debug/) + endif() + file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${YOGA_BINARY_PATH}${YOGA_LIB_PREFFIX}yogacore${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +endif() + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + diff --git a/externals/vcpkg/ports/yoga/vcpkg.json b/externals/vcpkg/ports/yoga/vcpkg.json new file mode 100755 index 000000000..570be3436 --- /dev/null +++ b/externals/vcpkg/ports/yoga/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "yoga", + "version": "1.19.0", + "description": "Yoga is a cross-platform layout engine which implements Flexbox", + "homepage": "https://github.com/facebook/yoga", + "supports": "!uwp" +} diff --git a/externals/vcpkg/ports/yomm2/fix_find_boost.patch b/externals/vcpkg/ports/yomm2/fix_find_boost.patch new file mode 100755 index 000000000..f5b167083 --- /dev/null +++ b/externals/vcpkg/ports/yomm2/fix_find_boost.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b7b88b1..02297e7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,7 +11,7 @@ project(YOMM2 VERSION 1.0) + # Find Boost dependency + list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") + include(find_or_download_package) +-find_or_download_package(Boost INSTALL_WITH_YOMM) ++find_package(Boost REQUIRED) + message(STATUS "Using Boost libraries from ${Boost_INCLUDE_DIRS}") + + if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") +diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in +index 7272504..9f8b2ae 100644 +--- a/cmake/Config.cmake.in ++++ b/cmake/Config.cmake.in +@@ -1,7 +1,7 @@ + include(CMakeFindDependencyMacro) + + # Tell library users about the Boost dependency +-find_dependency(Boost 1.53 HINTS ${CMAKE_CURRENT_LIST_DIR}/..) ++find_dependency(Boost 1.53) + + # Add the targets file + include("${CMAKE_CURRENT_LIST_DIR}/YOMM2Targets.cmake") diff --git a/externals/vcpkg/ports/yomm2/fix_uwp_osx.patch b/externals/vcpkg/ports/yomm2/fix_uwp_osx.patch new file mode 100755 index 000000000..34ee35c8f --- /dev/null +++ b/externals/vcpkg/ports/yomm2/fix_uwp_osx.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2f16eb6..a46c8b7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,14 +15,15 @@ find_package(Boost) + message(STATUS "Using Boost libraries from ${Boost_INCLUDE_DIRS}") + + if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -save-temps") + endif() + endif() + + if(MSVC) +- set(CMAKE_CXX_FLAGS "/std:c++17 -D_SCL_SECURE_NO_WARNINGS /EHsc") ++ set(CMAKE_CXX_FLAGS "/std:c++17 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS /EHsc") ++else() ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") + endif() + + add_subdirectory(src) diff --git a/externals/vcpkg/ports/yomm2/portfile.cmake b/externals/vcpkg/ports/yomm2/portfile.cmake new file mode 100755 index 000000000..e127c94cb --- /dev/null +++ b/externals/vcpkg/ports/yomm2/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jll63/yomm2 + REF v1.1.2 + SHA512 f45c3f3d267dedaa3c76f9dab1a75be01941e3715e71b30b878be49157a5ba97f2188c9e635272be3ca396019b161bb21a30199ca504c94a18673685f5dbf06d + HEAD_REF master + PATCHES "fix_find_boost.patch" "fix_uwp_osx.patch" +) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DYOMM2_ENABLE_EXAMPLES=OFF +) +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/YOMM2) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/externals/vcpkg/ports/yomm2/vcpkg.json b/externals/vcpkg/ports/yomm2/vcpkg.json new file mode 100755 index 000000000..c1696f6f2 --- /dev/null +++ b/externals/vcpkg/ports/yomm2/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "yomm2", + "version-string": "1.1.2", + "description": "YOMM2 is an implementation of open multi-methods.", + "homepage": "https://github.com/jll63/yomm2", + "dependencies": [ + "boost-dynamic-bitset", + "boost-integer", + "boost-move", + "boost-preprocessor", + "boost-type-traits" + ] +} diff --git a/externals/vcpkg/ports/yyjson/portfile.cmake b/externals/vcpkg/ports/yyjson/portfile.cmake new file mode 100755 index 000000000..e1e4833bb --- /dev/null +++ b/externals/vcpkg/ports/yyjson/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ibireme/yyjson + REF 0.5.0 + SHA512 6b2e051f7d5829acb9ca25ce97e4872f5517b3f291a30c6a86ec40f71670b8114f43c2d272410834a5c92b5203726b65696f06423bc6e5001dff2aabf5eb20d9 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + reader YYJSON_DISABLE_READER + writer YYJSON_DISABLE_WRITER + fast-fp-conv YYJSON_DISABLE_FAST_FP_CONV + non-standard YYJSON_DISABLE_NON_STANDARD +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DYYJSON_BUILD_TESTS=OFF + -DYYJSON_BUILD_MISC=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/yyjson/vcpkg.json b/externals/vcpkg/ports/yyjson/vcpkg.json new file mode 100755 index 000000000..5492a2db7 --- /dev/null +++ b/externals/vcpkg/ports/yyjson/vcpkg.json @@ -0,0 +1,37 @@ +{ + "name": "yyjson", + "version": "0.5.0", + "description": "A high performance JSON library written in ANSI C", + "homepage": "https://github.com/ibireme/yyjson", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "fast-fp-conv", + "non-standard", + "reader", + "writer" + ], + "features": { + "fast-fp-conv": { + "description": "Build with custom floating-point number conversion" + }, + "non-standard": { + "description": "Build with support for non-standard JSON" + }, + "reader": { + "description": "Build with JSON reader" + }, + "writer": { + "description": "Build with JSON writer" + } + } +} diff --git a/externals/vcpkg/ports/z3/fix-install-path.patch b/externals/vcpkg/ports/z3/fix-install-path.patch new file mode 100755 index 000000000..cb21e1360 --- /dev/null +++ b/externals/vcpkg/ports/z3/fix-install-path.patch @@ -0,0 +1,23 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e8de0c7e4..064c18eab 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -173,6 +173,7 @@ install(TARGETS libz3 + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" # On Windows this installs ``libz3.lib`` which CMake calls the "corresponding import library". Do we want this installed? + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" # For Windows. DLLs are runtime targets for CMake ++ BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}" # For MACOSX. + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + ) + +diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt +index 278246341..b6cd2f1c1 100644 +--- a/src/shell/CMakeLists.txt ++++ b/src/shell/CMakeLists.txt +@@ -44,5 +44,5 @@ target_link_libraries(shell PRIVATE ${Z3_DEPENDENT_LIBS}) + z3_add_component_dependencies_to_target(shell ${shell_expanded_deps}) + z3_append_linker_flag_list_to_target(shell ${Z3_DEPENDENT_EXTRA_CXX_LINK_FLAGS}) + install(TARGETS shell +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ RUNTIME DESTINATION tools/z3 + ) diff --git a/externals/vcpkg/ports/z3/portfile.cmake b/externals/vcpkg/ports/z3/portfile.cmake new file mode 100755 index 000000000..0e8dc4b0b --- /dev/null +++ b/externals/vcpkg/ports/z3/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Z3Prover/z3 + REF z3-4.8.16 + SHA512 385f6e1ee075b9eadb5aad338657a81f518eef382b99ce623448a630b79f5d414ebccfd1bb5e959626f0b82ef54a5f20326814ae988b5688d51578de6fb69615 + HEAD_REF master + PATCHES + fix-install-path.patch + remove-flag-overrides.patch +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(BUILD_STATIC "-DZ3_BUILD_LIBZ3_SHARED=OFF") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${BUILD_STATIC} + -DZ3_BUILD_TEST_EXECUTABLES=OFF + -DZ3_ENABLE_EXAMPLE_TARGETS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/z3) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/z3/remove-flag-overrides.patch b/externals/vcpkg/ports/z3/remove-flag-overrides.patch new file mode 100755 index 000000000..ddba89dd6 --- /dev/null +++ b/externals/vcpkg/ports/z3/remove-flag-overrides.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 477410ba8..fcca03917 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,7 +1,6 @@ + # Enforce some CMake policies + cmake_minimum_required(VERSION 3.4) + +-set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_compiler_flags_overrides.cmake") + project(Z3 VERSION 4.8.16.0 LANGUAGES CXX) + + ################################################################################ diff --git a/externals/vcpkg/ports/z3/vcpkg.json b/externals/vcpkg/ports/z3/vcpkg.json new file mode 100755 index 000000000..f5f59bfbd --- /dev/null +++ b/externals/vcpkg/ports/z3/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "z3", + "version": "4.8.16", + "description": "Z3 is a theorem prover from Microsoft Research", + "homepage": "https://github.com/Z3Prover/z3", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/z85/portfile.cmake b/externals/vcpkg/ports/z85/portfile.cmake new file mode 100755 index 000000000..b3316ee9a --- /dev/null +++ b/externals/vcpkg/ports/z85/portfile.cmake @@ -0,0 +1,17 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO artemkin/z85 + REF v1.0 + SHA512 6b205524b8388c5709ca664a595a4db8fdd24148c5f87ef7ef16d6d6eb60d2c51db0b4ab768fe9ac3e5acf5e3fe1b46ef5b9f5e7f69a53fe40a7e8d25b098479 + HEAD_REF master +) + +# Install source files +file(INSTALL ${SOURCE_PATH}/src/z85.h + ${SOURCE_PATH}/src/z85.c + ${SOURCE_PATH}/src/z85.hpp + ${SOURCE_PATH}/src/z85_impl.cpp + DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) + +# Install license +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/externals/vcpkg/ports/z85/vcpkg.json b/externals/vcpkg/ports/z85/vcpkg.json new file mode 100755 index 000000000..66f96178a --- /dev/null +++ b/externals/vcpkg/ports/z85/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "z85", + "version-string": "1.0", + "port-version": 1, + "description": "Z85 is a binary-to-text encoding library. It implements ZeroMQ Base-85 Encoding Algorithm and provides custom padding." +} diff --git a/externals/vcpkg/ports/zeroc-ice/change_to_mt.ps1 b/externals/vcpkg/ports/zeroc-ice/change_to_mt.ps1 new file mode 100755 index 000000000..913060954 --- /dev/null +++ b/externals/vcpkg/ports/zeroc-ice/change_to_mt.ps1 @@ -0,0 +1,53 @@ + +$projFilePath = $args[0] +$crtLinkage = $args[1] + +if($projFilePath) +{ + $xpath = "/rs:Project/rs:ItemGroup/rs:ProjectConfiguration" + $xmldoc = New-Object System.Xml.XmlDocument + $xmldoc.load($projFilePath) + $nsmgr = New-Object System.Xml.XmlNamespaceManager($xmldoc.NameTable); + $nsmgr.AddNamespace("rs", "http://schemas.microsoft.com/developer/msbuild/2003"); + $root = $xmldoc.DocumentElement + + foreach($conf in $root.ItemDefinitionGroup) + { + if($conf.Condition) + { + if(-Not ($conf.ClCompile.RuntimeLibrary)) + { + $rtl = $xmldoc.CreateElement("RuntimeLibrary", $conf.ClCompile.NamespaceURI) + $conf.ClCompile.AppendChild($rtl) + } + + if($conf.Condition.Contains("Debug")) + { + if($crtLinkage -eq "static") + { + $conf.ClCompile.RuntimeLibrary = "MultithreadedDebug" + } + else + { + $conf.ClCompile.RuntimeLibrary = "MultithreadedDebugDLL" + } + } + else + { + if($crtLinkage -eq "static") + { + $conf.ClCompile.RuntimeLibrary = "Multithreaded" + } + else + { + $conf.ClCompile.RuntimeLibrary = "MultithreadedDLL" + } + } + } + } + $xmldoc.save($projFilePath) +} +else +{ + Write-Error "Error: No path defined!" +} diff --git a/externals/vcpkg/ports/zeroc-ice/mcppd_fix.patch b/externals/vcpkg/ports/zeroc-ice/mcppd_fix.patch new file mode 100755 index 000000000..3502af871 --- /dev/null +++ b/externals/vcpkg/ports/zeroc-ice/mcppd_fix.patch @@ -0,0 +1,24 @@ +--- a/config/Make.project.rules 2022-01-17 10:28:23.000000000 ++++ b/config/Make.project.rules 2022-04-18 12:15:19.000000000 +@@ -1050,17 +1050,17 @@ + # + # $(call make-lib,$1=libname) + # + define make-lib + ifneq ($($1_home),) + # Check for 3rd party libraries either in home/lib or home/lib +-$1_installdir = $$($1_home)/lib$$(call platform-var,installdir,$1,$$($$2_platform),$$($$2_config),$$2) +-$1_libdir ?= $$(strip $$(if $$(wildcard $$($1_installdir)),$$($1_installdir),$$($1_home)/lib)) +-$1_includedir ?= $$($1_home)/include ++$1_installdir = ++$1_libdir ?= ++$1_includedir ?= + endif +-$1_ldflags ?= -l$1 ++$1_ldflags ?= -l$$(if $$(and $$(filter mcpp,$1),$$(filter no,$$(OPTIMIZE))),$1d,$1) + endef + + # + # $(call repathfromdir,path) + # + # Returns reversed relative path for directory (e.g.: test/Ice/operations diff --git a/externals/vcpkg/ports/zeroc-ice/md5i_fix.patch b/externals/vcpkg/ports/zeroc-ice/md5i_fix.patch new file mode 100755 index 000000000..0e45588d0 --- /dev/null +++ b/externals/vcpkg/ports/zeroc-ice/md5i_fix.patch @@ -0,0 +1,21 @@ +diff --git a/cpp/src/Slice/MD5I.cpp b/cpp/src/Slice/MD5I.cpp +index 66f4de545b..271352d1ea 100644 +--- a/cpp/src/Slice/MD5I.cpp ++++ b/cpp/src/Slice/MD5I.cpp +@@ -52,6 +52,7 @@ + */ + + #include ++#include + #include + + #ifdef __GNUC__ +@@ -172,7 +173,7 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/) + * On little-endian machines, we can process properly aligned + * data without copying it. + */ +- if (!((data - (const md5_byte_t *)0) & 3)) { ++ if (!((reinterpret_cast(data)) & 3)) { + /* data are properly aligned */ + X = (const md5_word_t *)data; + } else { diff --git a/externals/vcpkg/ports/zeroc-ice/portfile.cmake b/externals/vcpkg/ports/zeroc-ice/portfile.cmake new file mode 100755 index 000000000..c1cf8c1d3 --- /dev/null +++ b/externals/vcpkg/ports/zeroc-ice/portfile.cmake @@ -0,0 +1,306 @@ + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO zeroc-ice/ice + REF v3.7.7 + SHA512 73c3a2bb14c9e145383e4026206edd3e03b29c60a33af628611bfdab71d69a3aed108ce4e6cbfd67eb852560110e3495b4bd238c8cdf0de9d1f8e2f1088513ee + PATCHES md5i_fix.patch slice2swift.patch mcppd_fix.patch +) + +set(RELEASE_TRIPLET ${TARGET_TRIPLET}-rel) +set(DEBUG_TRIPLET ${TARGET_TRIPLET}-dbg) + +get_filename_component(SOURCE_PATH_SUFFIX ${SOURCE_PATH} NAME) +set(UNIX_BUILD_DIR "${SOURCE_PATH}") +set(WIN_DEBUG_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}/${SOURCE_PATH_SUFFIX}) +set(WIN_RELEASE_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/${SOURCE_PATH_SUFFIX}) + +# install_includes +function(install_includes ORIGINAL_PATH RELATIVE_PATHS) + foreach(RELATIVE_PATH ${RELATIVE_PATHS}) + file(GLOB HEADER_FILES ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.h) + if(EXISTS ${ORIGINAL_PATH}/${RELATIVE_PATH}) + file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${RELATIVE_PATH}) + endif() + endforeach() +endfunction() + +# install_slices +function(install_slices ORIGINAL_PATH RELATIVE_PATHS) + foreach(RELATIVE_PATH ${RELATIVE_PATHS}) + file(GLOB HEADER_FILES ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.ice) + if(EXISTS ${ORIGINAL_PATH}/${RELATIVE_PATH}) + file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/ice/slice/${RELATIVE_PATH}) + endif() + endforeach() +endfunction() + +vcpkg_list(SET ICE_INCLUDE_SUB_DIRECTORIES + "Glacier2" + "Ice" + "IceBT" + "IceBox" + "IceBT" + "IceDiscovery" + "IceGrid" + "IceIAP" + "IceLocatorDiscovery" + "IcePatch2" + "IceSSL" + "IceStorm" +) + +set(ICE_OPTIONAL_COMPONENTS_MSBUILD "") +set(ICE_OPTIONAL_COMPONENTS_MAKE "Ice") # Intentional! + +# IceSSL +if("icessl" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icessl++11") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceSSL") +endif() + +# Glacier2 +if("glacier2lib" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\glacier2++11") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "Glacier2") +endif() + +# Glacier2Router +if("glacier2router" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\glacier2router") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\glacier2cryptpermissionsverifier") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "glacier2router") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "Glacier2CryptPermissionsVerifier") +endif() + +# IceBox +if("iceboxlib" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\iceboxlib++11") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceBox") +endif() + +# IceBox +if("iceboxtools" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icebox++11") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\iceboxadmin") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icebox") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "iceboxadmin") +endif() + +# IceGrid +if("icegridlib" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icegrid++11") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceGrid") +endif() + +# IceGrid tools +if("icegridtools" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icegridadmin") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icegridregistry") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icegridnode") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icegridnode") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icegridregistry") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icegridnode") +endif() + +# IceStorm +if("icestormlib" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icestorm++11") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceStorm") +endif() + +# IceStormAdmin +if("icestormtools" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icestormadmin") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icestormservice") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icestormdb") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icestormadmin") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceStormService") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icestormdb") +endif() + +# IceBridge executable +if("icebridge" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icebridge") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icebridge") +endif() + +# IceDiscovery +if("icediscovery" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icediscovery++11") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceDiscovery") +endif() + +if(NOT VCPKG_TARGET_IS_WINDOWS) + # Clean up for the first round (important for install --editable) + vcpkg_execute_build_process( + COMMAND make distclean + WORKING_DIRECTORY ${SOURCE_PATH}/cpp + LOGNAME make-clean-${TARGET_TRIPLET} + ) + + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib") + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib") + endif() + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64") + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib64") + endif() + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/bin") + + # Setting these as environment variables, as .d files aren't generated + # the first time passing them as arguments to make. + set(ENV{MCPP_HOME} ${CURRENT_INSTALLED_DIR}) + set(ENV{EXPAT_HOME} ${CURRENT_INSTALLED_DIR}) + set(ENV{BZ2_HOME} ${CURRENT_INSTALLED_DIR}) + set(ENV{LMDB_HOME} ${CURRENT_INSTALLED_DIR}) + set(ENV{CPPFLAGS} "-I${CURRENT_INSTALLED_DIR}/include") + set(ENV{LDFLAGS} "-L${CURRENT_INSTALLED_DIR}/debug/lib") + + set(ICE_BUILD_CONFIG "shared cpp11-shared") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(ICE_BUILD_CONFIG "static cpp11-static") + endif() + + message(STATUS "Building ${TARGET_TRIPLET}-dbg") + vcpkg_execute_build_process( + COMMAND make + V=1 + "prefix=${CURRENT_PACKAGES_DIR}/debug" + linux_id=vcpkg + "CONFIGS=${ICE_BUILD_CONFIG}" + USR_DIR_INSTALL=yes + OPTIMIZE=no + ${ICE_OPTIONAL_COMPONENTS_MAKE} + "-j${VCPKG_CONCURRENCY}" + WORKING_DIRECTORY ${SOURCE_PATH}/cpp + LOGNAME make-${TARGET_TRIPLET}-dbg + ) + + # Install debug libraries to packages directory + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64") + file(GLOB ICE_DEBUG_LIBRARIES "${UNIX_BUILD_DIR}/cpp/lib64/*") + else() + file(GLOB ICE_DEBUG_LIBRARIES "${UNIX_BUILD_DIR}/cpp/lib/*") + endif() + file(COPY ${ICE_DEBUG_LIBRARIES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + + # Clean up for the next round + vcpkg_execute_build_process( + COMMAND make distclean + WORKING_DIRECTORY ${SOURCE_PATH}/cpp + LOGNAME make-clean-${TARGET_TRIPLET} + ) + + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib") + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib") + endif() + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64") + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib64") + endif() + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/bin") + + # Release build + set(ENV{LDFLAGS} "-L${CURRENT_INSTALLED_DIR}/lib") + message(STATUS "Building ${TARGET_TRIPLET}-rel") + vcpkg_execute_build_process( + COMMAND make + V=1 + "prefix=${CURRENT_PACKAGES_DIR}" + linux_id=vcpkg + "CONFIGS=${ICE_BUILD_CONFIG}" + USR_DIR_INSTALL=yes + OPTIMIZE=yes + ${ICE_OPTIONAL_COMPONENTS_MAKE} + "-j${VCPKG_CONCURRENCY}" + WORKING_DIRECTORY ${SOURCE_PATH}/cpp + LOGNAME make-${TARGET_TRIPLET}-rel + ) + + # Install release libraries and other files to packages directory + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/ice/slice") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + + install_includes("${UNIX_BUILD_DIR}/cpp/include" "${ICE_INCLUDE_SUB_DIRECTORIES}") + install_includes("${UNIX_BUILD_DIR}/cpp/include/generated" "${ICE_INCLUDE_SUB_DIRECTORIES}") + install_slices("${SOURCE_PATH}/slice" "${ICE_INCLUDE_SUB_DIRECTORIES}") + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64") + file(GLOB ICE_RELEASE_LIBRARIES "${UNIX_BUILD_DIR}/cpp/lib64/*") + else() + file(GLOB ICE_RELEASE_LIBRARIES "${UNIX_BUILD_DIR}/cpp/lib/*") + endif() + file(COPY ${ICE_RELEASE_LIBRARIES} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(GLOB ICE_RELEASE_EXECUTABLES "${UNIX_BUILD_DIR}/cpp/bin/*") + file(COPY ${ICE_RELEASE_EXECUTABLES} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + + # Clean up + vcpkg_execute_build_process( + COMMAND make distclean + WORKING_DIRECTORY ${SOURCE_PATH}/cpp + LOGNAME make-clean-after-build-${TARGET_TRIPLET} + ) + + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib") + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib") + endif() + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64") + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib64") + endif() + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/bin") + +else() # VCPKG_TARGET_IS_WINDOWS + + # Fix project files to prevent nuget restore of dependencies and + # remove hard coded runtime linkage + include("${CURRENT_PORT_DIR}/prepare_for_build.cmake") + prepare_for_build("${SOURCE_PATH}") + + vcpkg_list(SET MSBUILD_OPTIONS + "/p:UseVcpkg=yes" + "/p:IceBuildingSrc=yes" + ${ICE_OPTIONAL_COMPONENTS_MSBUILD} + ) + + # Build Ice + vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH "cpp/msbuild/ice.${VCPKG_PLATFORM_TOOLSET}.sln" + SKIP_CLEAN + TARGET "C++11\\ice++11" + USE_VCPKG_INTEGRATION + OPTIONS + ${MSBUILD_OPTIONS} + ) + + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/zeroc.icebuilder.msbuild.dll") + file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/zeroc.icebuilder.msbuild.dll") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/zeroc.icebuilder.msbuild.dll") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/zeroc.icebuilder.msbuild.dll") + endif() + + install_includes("${WIN_RELEASE_BUILD_DIR}/cpp/include" "${ICE_INCLUDE_SUB_DIRECTORIES}") + install_includes("${WIN_RELEASE_BUILD_DIR}/cpp/include/generated/cpp11/${TRIPLET_SYSTEM_ARCH}/Release" "${ICE_INCLUDE_SUB_DIRECTORIES}") + + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/ice/slice") + install_slices("${SOURCE_PATH}/slice" "${ICE_INCLUDE_SUB_DIRECTORIES}") + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() + + vcpkg_clean_msbuild() + +endif() + +# Remove unnecessary static libraries. +file(GLOB PDLIBS "${CURRENT_PACKAGES_DIR}/debug/lib/*") +file(GLOB PRLIBS "${CURRENT_PACKAGES_DIR}/lib/*") +list(FILTER PDLIBS INCLUDE REGEX ".*(([Ii]ce[Uu]til|[Ss]lice)d?\.([a-z]+))$") +list(FILTER PRLIBS INCLUDE REGEX ".*(([Ii]ce[Uu]til|[Ss]lice)d?\.([a-z]+))$") +file(REMOVE ${PDLIBS} ${PRLIBS}) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/zeroc-ice RENAME copyright) diff --git a/externals/vcpkg/ports/zeroc-ice/prepare_for_build.cmake b/externals/vcpkg/ports/zeroc-ice/prepare_for_build.cmake new file mode 100755 index 000000000..df3e93003 --- /dev/null +++ b/externals/vcpkg/ports/zeroc-ice/prepare_for_build.cmake @@ -0,0 +1,76 @@ + +# This function modifies hardcoded RuntimeLibrary directives in Ice's .vcxproj files and downloads +# Ice Builder for MSBuild, which is required to generate C++ files based on the interface definition +# files (.ice). + +function(prepare_for_build ICE_SOURCE_DIR) + + message("-- Modifying hardcoded 'RuntimeLibrary' directives in .vcxproj files") + set(CPP_SOURCE_DIR "${ICE_SOURCE_DIR}/cpp/src") + file(GLOB_RECURSE PROJ_FILES "${CPP_SOURCE_DIR}/*.vcxproj") + foreach(PROJ_FILE ${PROJ_FILES}) + file(READ ${PROJ_FILE} PROJ_FILE_CONTENT) + STRING(REGEX + REPLACE + "" + "" + PROJ_FILE_CONTENT + "${PROJ_FILE_CONTENT}" + ) + + if((NOT ${PROJ_FILE} MATCHES ".*slice\.vcxproj") AND + (NOT ${PROJ_FILE} MATCHES ".*iceutil\.vcxproj") AND + (NOT ${PROJ_FILE} MATCHES ".*slice2cpp\.vcxproj")) + + if(${VCPKG_LIBRARY_LINKAGE} STREQUAL "static") + STRING(REGEX + REPLACE + "DynamicLibrary" + "StaticLibrary" + PROJ_FILE_CONTENT + "${PROJ_FILE_CONTENT}" + ) + else() + STRING(REGEX + REPLACE + "StaticLibrary" + "DynamicLibrary" + PROJ_FILE_CONTENT + "${PROJ_FILE_CONTENT}" + ) + endif() + endif() + + file(WRITE ${PROJ_FILE} "${PROJ_FILE_CONTENT}") + + vcpkg_execute_required_process( + COMMAND pwsh ${CURRENT_PORT_DIR}/change_to_mt.ps1 ${PROJ_FILE} ${VCPKG_CRT_LINKAGE} + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME change_to_mt-${TARGET_TRIPLET}-rel + ) + endforeach() + + set(ICE_CPP_MSBUILD_PACKAGES_DIR "${ICE_SOURCE_DIR}/cpp/msbuild/packages") + set(ICE_BUILDER_DEST_DIRECTORY "${ICE_CPP_MSBUILD_PACKAGES_DIR}/zeroc.icebuilder.msbuild.5.0.7") + if(NOT EXISTS "${ICE_BUILDER_DEST_DIRECTORY}") + message("-- Making Ice Builder for MSBuild available") + vcpkg_download_distfile( + ICE_BUILDER_MSBUILD_ARCHIVE + URLS https://globalcdn.nuget.org/packages/zeroc.icebuilder.msbuild.5.0.7.nupkg + FILENAME zeroc.icebuilder.msbuild.5.0.7.zip + SHA512 d4afed8a3c67daf2e1cde09e7747ec9f088fa1354069bb7c7782c1089ea0f4e50b669f45a88502ad341dbccafbc1394d74fe764479f25bf4be1d3f70e66cb174 + ) + + vcpkg_extract_source_archive( + ICE_BUILDER_MSBUILD_DIRECTORY + ARCHIVE + "${ICE_BUILDER_MSBUILD_ARCHIVE}" + NO_REMOVE_ONE_LEVEL + SOURCE_BASE icebuilder + ) + + file(MAKE_DIRECTORY "${ICE_SOURCE_DIR}/cpp/msbuild/packages") + file(RENAME "${ICE_BUILDER_MSBUILD_DIRECTORY}" "${ICE_BUILDER_DEST_DIRECTORY}") + endif() + +endfunction() diff --git a/externals/vcpkg/ports/zeroc-ice/slice2swift.patch b/externals/vcpkg/ports/zeroc-ice/slice2swift.patch new file mode 100755 index 000000000..6c45cb82d --- /dev/null +++ b/externals/vcpkg/ports/zeroc-ice/slice2swift.patch @@ -0,0 +1,25 @@ +diff --git a/cpp/src/slice2swift/SwiftUtil.cpp b/cpp/src/slice2swift/SwiftUtil.cpp +index 404dee7670..01e144de90 100644 +--- a/cpp/src/slice2swift/SwiftUtil.cpp ++++ b/cpp/src/slice2swift/SwiftUtil.cpp +@@ -1523,7 +1523,7 @@ SwiftGenerator::writeMemberwiseInitializer(IceUtilInternal::Output& out, + const DataMemberList& baseMembers, + const DataMemberList& allMembers, + const ContainedPtr& p, +- bool local, ++ bool /*local*/, + bool rootClass, + const StringPairList& extraParams) + { +@@ -1531,11 +1531,6 @@ SwiftGenerator::writeMemberwiseInitializer(IceUtilInternal::Output& out, + { + out << sp; + out << nl; +- int typeCtx = TypeContextInParam; +- if(local) +- { +- typeCtx |= TypeContextLocal; +- } + out << "public init" << spar; + for(DataMemberList::const_iterator i = allMembers.begin(); i != allMembers.end(); ++i) + { diff --git a/externals/vcpkg/ports/zeroc-ice/vcpkg.json b/externals/vcpkg/ports/zeroc-ice/vcpkg.json new file mode 100755 index 000000000..2335597fc --- /dev/null +++ b/externals/vcpkg/ports/zeroc-ice/vcpkg.json @@ -0,0 +1,122 @@ +{ + "name": "zeroc-ice", + "version": "3.7.7", + "port-version": 2, + "maintainers": "Benjamin Oldenburg ", + "description": "Comprehensive RPC framework with support for C++, CSharp, Java, JavaScript, Python and more.", + "homepage": "https://github.com/zeroc-ice/ice", + "license": null, + "supports": "!uwp & !(windows & arm) & !wasm32", + "dependencies": [ + "bzip2", + "expat", + "lmdb", + "mcpp", + { + "name": "openssl", + "platform": "!windows" + }, + "zlib" + ], + "features": { + "glacier2lib": { + "description": "Glacier2 libraries" + }, + "glacier2router": { + "description": "Glacier2Router", + "dependencies": [ + { + "name": "zeroc-ice", + "features": [ + "glacier2lib", + "icessl" + ] + } + ] + }, + "iceboxlib": { + "description": "IceBox libraries and runtime" + }, + "iceboxtools": { + "description": "IceBox tools" + }, + "icebridge": { + "description": "IceBridge", + "dependencies": [ + { + "name": "zeroc-ice", + "features": [ + "iceboxlib" + ] + } + ] + }, + "icediscovery": { + "description": "IceDiscovery", + "dependencies": [ + { + "name": "zeroc-ice", + "features": [ + "glacier2lib", + "iceboxlib", + "icessl", + "icestormlib" + ] + } + ] + }, + "icegridlib": { + "description": "IceGrid library", + "dependencies": [ + { + "name": "zeroc-ice", + "features": [ + "glacier2lib" + ] + } + ] + }, + "icegridtools": { + "description": "IceGrid tools", + "dependencies": [ + "expat", + { + "name": "zeroc-ice", + "features": [ + "glacier2lib", + "iceboxlib", + "icegridlib", + "icessl" + ] + } + ] + }, + "icessl": { + "description": "IceSSL", + "dependencies": [ + { + "name": "openssl", + "platform": "!windows" + } + ] + }, + "icestormlib": { + "description": "IceStorm library" + }, + "icestormtools": { + "description": "IceStorm tools", + "dependencies": [ + "lmdb", + { + "name": "zeroc-ice", + "features": [ + "glacier2lib", + "iceboxlib", + "icegridlib", + "icestormlib" + ] + } + ] + } + } +} diff --git a/externals/vcpkg/ports/zeromq/fix-arm.patch b/externals/vcpkg/ports/zeromq/fix-arm.patch new file mode 100755 index 000000000..3f6c6486b --- /dev/null +++ b/externals/vcpkg/ports/zeromq/fix-arm.patch @@ -0,0 +1,51 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dd3d8eb..c08cad9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -551,6 +551,8 @@ if(ZMQ_HAVE_WINDOWS) + set(CMAKE_REQUIRED_LIBRARIES "") + # TODO: This not the symbol we're looking for. What is the symbol? + check_library_exists(ws2 fopen "" HAVE_WS2) ++ ++ check_cxx_symbol_exists(CryptAcquireContext "windows.h;wincrypt.h" HAVE_ADVAPI32) + else() + check_cxx_symbol_exists(if_nametoindex net/if.h HAVE_IF_NAMETOINDEX) + check_cxx_symbol_exists(SO_PEERCRED sys/socket.h ZMQ_HAVE_SO_PEERCRED) +@@ -1452,6 +1454,10 @@ if(BUILD_SHARED) + elseif(HAVE_WS2) + target_link_libraries(libzmq ws2) + endif() ++ ++ if (HAVE_ADVAPI32) ++ target_link_libraries(libzmq advapi32) ++ endif() + + if(HAVE_RPCRT4) + target_link_libraries(libzmq rpcrt4) +@@ -1497,6 +1503,10 @@ if(BUILD_STATIC) + elseif(HAVE_WS2) + target_link_libraries(libzmq-static ws2) + endif() ++ ++ if (HAVE_ADVAPI32) ++ target_link_libraries(libzmq-static advapi32) ++ endif() + + if(HAVE_RPCRT4) + target_link_libraries(libzmq-static rpcrt4) +diff --git a/src/clock.cpp b/src/clock.cpp +index 79522ad..0667c59 100644 +--- a/src/clock.cpp ++++ b/src/clock.cpp +@@ -41,8 +41,10 @@ + #include + #else + #include +-#if defined(_M_ARM) || defined(_M_ARM64) ++#if defined(_M_ARM) + #include ++#elif defined(_M_ARM64) ++#include + #endif + #endif + #endif diff --git a/externals/vcpkg/ports/zeromq/portfile.cmake b/externals/vcpkg/ports/zeromq/portfile.cmake new file mode 100755 index 000000000..671fc2ed6 --- /dev/null +++ b/externals/vcpkg/ports/zeromq/portfile.cmake @@ -0,0 +1,68 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO zeromq/libzmq + REF v4.3.4 + SHA512 ad828b1ab5a87983285a6b44b08240816ed1c4e2c73306ab1a851bf80df1892b5e2f92064a49fbadc1f4c75043625ace77dd25b64d5d1c2a7d1d61cc916fba0b + PATCHES + fix-arm.patch + zeromq-libzmq-4310-64e6d37ab8.diff # https://patch-diff.githubusercontent.com/raw/zeromq/libzmq/pull/4310.diff + zeromq-libzmq-4311-2b04e0ce47.diff # https://patch-diff.githubusercontent.com/raw/zeromq/libzmq/pull/4311.diff +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + sodium WITH_LIBSODIUM + draft ENABLE_DRAFTS + websockets-sha1 ENABLE_WS +) + +set(PLATFORM_OPTIONS) +if(VCPKG_TARGET_IS_MINGW) + set(PLATFORM_OPTIONS "-DCMAKE_SYSTEM_VERSION=6.0") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DZMQ_BUILD_TESTS=OFF + -DBUILD_STATIC=${BUILD_STATIC} + -DBUILD_SHARED=${BUILD_SHARED} + -DWITH_PERF_TOOL=OFF + -DWITH_DOCS=OFF + -DWITH_NSS=OFF + -DWITH_LIBSODIUM_STATIC=${BUILD_STATIC} + ${FEATURE_OPTIONS} + ${PLATFORM_OPTIONS} + OPTIONS_DEBUG + "-DCMAKE_PDB_OUTPUT_DIRECTORY=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) +else() + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ZeroMQ) +endif() + +file(COPY + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# Handle copyright +file(RENAME "${CURRENT_PACKAGES_DIR}/share/zmq/COPYING.LESSER.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/zmq") + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/zeromq/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/zeromq/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..38b05d779 --- /dev/null +++ b/externals/vcpkg/ports/zeromq/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,9 @@ +_find_package(${ARGS}) + +if(TARGET libzmq AND NOT TARGET libzmq-static) + add_library(libzmq-static INTERFACE IMPORTED) + set_target_properties(libzmq-static PROPERTIES INTERFACE_LINK_LIBRARIES libzmq) +elseif(TARGET libzmq-static AND NOT TARGET libzmq) + add_library(libzmq INTERFACE IMPORTED) + set_target_properties(libzmq PROPERTIES INTERFACE_LINK_LIBRARIES libzmq-static) +endif() diff --git a/externals/vcpkg/ports/zeromq/vcpkg.json b/externals/vcpkg/ports/zeromq/vcpkg.json new file mode 100755 index 000000000..e3f4426db --- /dev/null +++ b/externals/vcpkg/ports/zeromq/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "zeromq", + "version": "4.3.4", + "port-version": 5, + "description": "The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products", + "homepage": "https://github.com/zeromq/libzmq", + "license": "LGPL-3.0-only", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "draft": { + "description": "Build and install draft APIs" + }, + "sodium": { + "description": "Using libsodium for CURVE security", + "dependencies": [ + "libsodium" + ] + }, + "websockets-sha1": { + "description": "Enable WebSocket transport through builtin sha1 (libzmq#3676)" + } + } +} diff --git a/externals/vcpkg/ports/zeromq/zeromq-libzmq-4310-64e6d37ab8.diff b/externals/vcpkg/ports/zeromq/zeromq-libzmq-4310-64e6d37ab8.diff new file mode 100755 index 000000000..0d839ea02 --- /dev/null +++ b/externals/vcpkg/ports/zeromq/zeromq-libzmq-4310-64e6d37ab8.diff @@ -0,0 +1,55 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6c983c6698..21bcd414a0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,6 +15,7 @@ include(CheckCSourceCompiles) + include(CheckCSourceRuns) + include(CMakeDependentOption) + include(CheckCXXSymbolExists) ++include(CheckStructHasMember) + include(CheckTypeSize) + include(FindThreads) + include(GNUInstallDirs) +@@ -495,8 +496,12 @@ endif() + + if(NOT WIN32) + set(ZMQ_HAVE_IPC 1) ++ set(ZMQ_HAVE_STRUCT_SOCKADDR_UN 1) + else() + check_include_files("winsock2.h;afunix.h" ZMQ_HAVE_IPC) ++ if(ZMQ_HAVE_IPC) ++ check_struct_has_member("struct sockaddr_un" sun_path "winsock2.h;afunix.h" ZMQ_HAVE_STRUCT_SOCKADDR_UN) ++ endif() + endif() + + # ##################### BEGIN condition_variable_t selection +diff --git a/builds/cmake/platform.hpp.in b/builds/cmake/platform.hpp.in +index 2d23e8b288..18064362fe 100644 +--- a/builds/cmake/platform.hpp.in ++++ b/builds/cmake/platform.hpp.in +@@ -59,6 +59,7 @@ + #cmakedefine ZMQ_HAVE_LIBBSD + + #cmakedefine ZMQ_HAVE_IPC ++#cmakedefine ZMQ_HAVE_STRUCT_SOCKADDR_UN + + #cmakedefine ZMQ_USE_BUILTIN_SHA1 + #cmakedefine ZMQ_USE_NSS +diff --git a/src/windows.hpp b/src/windows.hpp +index 11c7581dee..24cce83d11 100644 +--- a/src/windows.hpp ++++ b/src/windows.hpp +@@ -98,3 +98,13 @@ static inline int poll (struct pollfd *pfd, unsigned long nfds, int timeout) + #define snprintf(buffer_, count_, format_, ...) \ + _snprintf_s (buffer_, count_, _TRUNCATE, format_, __VA_ARGS__) + #endif ++ ++// Workaround missing struct sockaddr_un in afunix.h. ++// Fix #3949. ++#if defined(ZMQ_HAVE_IPC) && !defined(ZMQ_HAVE_STRUCT_SOCKADDR_UN) ++struct sockaddr_un ++{ ++ ADDRESS_FAMILY sun_family; /* AF_UNIX */ ++ char sun_path[108]; /* pathname */ ++}; ++#endif diff --git a/externals/vcpkg/ports/zeromq/zeromq-libzmq-4311-2b04e0ce47.diff b/externals/vcpkg/ports/zeromq/zeromq-libzmq-4311-2b04e0ce47.diff new file mode 100755 index 000000000..52d1f50d2 --- /dev/null +++ b/externals/vcpkg/ports/zeromq/zeromq-libzmq-4311-2b04e0ce47.diff @@ -0,0 +1,18 @@ +diff --git a/src/windows.hpp b/src/windows.hpp +index 24cce83d11..c6d625188d 100644 +--- a/src/windows.hpp ++++ b/src/windows.hpp +@@ -90,7 +90,6 @@ static inline int poll (struct pollfd *pfd, unsigned long nfds, int timeout) + #ifndef AI_NUMERICSERV + #define AI_NUMERICSERV 0x0400 + #endif +-#endif + + // In MSVC prior to v14, snprintf is not available + // The closest implementation is the _snprintf_s function +@@ -108,3 +107,5 @@ struct sockaddr_un + char sun_path[108]; /* pathname */ + }; + #endif ++ ++#endif diff --git a/externals/vcpkg/ports/zfp/fix-build-error.patch b/externals/vcpkg/ports/zfp/fix-build-error.patch new file mode 100755 index 000000000..0c1e15763 --- /dev/null +++ b/externals/vcpkg/ports/zfp/fix-build-error.patch @@ -0,0 +1,11 @@ +diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt +index a960d2c..e6a492d 100644 +--- a/utils/CMakeLists.txt ++++ b/utils/CMakeLists.txt +@@ -1,5 +1,5 @@ + add_executable(zfpcmd zfp.c) +-set_property(TARGET zfpcmd PROPERTY OUTPUT_NAME zfp) ++#set_property(TARGET zfpcmd PROPERTY OUTPUT_NAME zfp) + target_link_libraries(zfpcmd zfp) + if(HAVE_LIBM_MATH) + target_link_libraries(zfpcmd m) diff --git a/externals/vcpkg/ports/zfp/fix-install-tools.patch b/externals/vcpkg/ports/zfp/fix-install-tools.patch new file mode 100755 index 000000000..49a511d44 --- /dev/null +++ b/externals/vcpkg/ports/zfp/fix-install-tools.patch @@ -0,0 +1,72 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 47179fd..96add54 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -220,8 +220,8 @@ add_subdirectory(src) + option(BUILD_ALL "Build all subdirectories" OFF) + if(BUILD_ALL) + set(BUILD_CFP ON CACHE BOOL "Build CFP arrays library" FORCE) +- set(BUILD_ZFORP ON CACHE BOOL "Build Fortran library" FORCE) +- set(BUILD_ZFPY ON CACHE BOOL "Build python bindings for zfp" FORCE) ++ set(BUILD_ZFORP OFF CACHE BOOL "Build Fortran library" FORCE) ++ set(BUILD_ZFPY OFF CACHE BOOL "Build python bindings for zfp" FORCE) + set(BUILD_UTILITIES ON CACHE BOOL "Build command line utilities for zfp" FORCE) + set(BUILD_EXAMPLES ON CACHE BOOL "Build Examples" FORCE) + endif() +diff --git a/cfp/src/CMakeLists.txt b/cfp/src/CMakeLists.txt +index 386698c..ecba525 100644 +--- a/cfp/src/CMakeLists.txt ++++ b/cfp/src/CMakeLists.txt +@@ -36,3 +36,5 @@ install(TARGETS cfp EXPORT cfp-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ ++install(DIRECTORY ${ZFP_SOURCE_DIR}/cfp/include DESTINATION include) +diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt +index 7cc7606..6ca1034 100644 +--- a/examples/CMakeLists.txt ++++ b/examples/CMakeLists.txt +@@ -34,3 +34,20 @@ if(HAVE_LIBM_MATH) + target_link_libraries(pgm m) + target_link_libraries(simple m) + endif() ++ ++install(TARGETS diffusion ++ RUNTIME DESTINATION tools) ++ if(BUILD_CFP) ++ install(TARGETS diffusionC ++ RUNTIME DESTINATION tools) ++ endif() ++install(TARGETS inplace ++ RUNTIME DESTINATION tools) ++install(TARGETS iterator ++ RUNTIME DESTINATION tools) ++install(TARGETS pgm ++ RUNTIME DESTINATION tools) ++install(TARGETS simple ++ RUNTIME DESTINATION tools) ++install(TARGETS speed ++ RUNTIME DESTINATION tools) +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index d15246e..7a6c6cb 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -19,3 +19,6 @@ if(ZFP_BUILD_TESTING_LARGE) + endforeach() + endforeach() + endif() ++ ++install(TARGETS testzfp ++ RUNTIME DESTINATION tools) +diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt +index a960d2c..5fcbf87 100644 +--- a/utils/CMakeLists.txt ++++ b/utils/CMakeLists.txt +@@ -4,3 +4,6 @@ target_link_libraries(zfpcmd zfp) + if(HAVE_LIBM_MATH) + target_link_libraries(zfpcmd m) + endif() ++ ++install(TARGETS zfpcmd ++ RUNTIME DESTINATION tools) diff --git a/externals/vcpkg/ports/zfp/portfile.cmake b/externals/vcpkg/ports/zfp/portfile.cmake new file mode 100755 index 000000000..64d1f7e3c --- /dev/null +++ b/externals/vcpkg/ports/zfp/portfile.cmake @@ -0,0 +1,44 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LLNL/zfp + REF 0.5.5 + SHA512 c043cee73f6e972e047452552ab2ceb9247a6747fdb7e5f863aeab3a05208737c0bcabbe29f3c10e5c1aba961ec47aa6a0abdb395486fa0d5fb16a4ad45733c4 + HEAD_REF master + PATCHES + fix-build-error.patch + fix-install-tools.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + all BUILD_ALL + cfp BUILD_CFP + test BUILD_TESTING + example BUILD_EXAMPLES + utility BUILD_UTILITIES +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS ${FEATURE_OPTIONS} + -DBUILD_ZFPY=OFF + -DBUILD_ZFORP=OFF +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + +# Rename problematic root include "bitstream.h"; conflicts with x265's private headers +file(RENAME ${CURRENT_PACKAGES_DIR}/include/bitstream.h ${CURRENT_PACKAGES_DIR}/include/zfp/bitstream.h) +vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/zfp.h "\"bitstream.h\"" "\"zfp/bitstream.h\"") + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/externals/vcpkg/ports/zfp/vcpkg.json b/externals/vcpkg/ports/zfp/vcpkg.json new file mode 100755 index 000000000..e0313dbf8 --- /dev/null +++ b/externals/vcpkg/ports/zfp/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "zfp", + "version-string": "0.5.5", + "port-version": 3, + "description": "Zfp is an open source C/C++ library for compressed numerical arrays that support high throughput read and write random access. zfp also supports streaming compression of integer and floating-point data, e.g., for applications that read and write large data sets to and from disk. zfp is primarily written in C and C++ but also includes Python and Fortran bindings.", + "homepage": "https://github.com/LLNL/zfp", + "features": { + "all": { + "description": "Build all components" + }, + "cfp": { + "description": "cfp support for cfp" + }, + "example": { + "description": "Build example" + }, + "test": { + "description": "Build test" + }, + "utility": { + "description": "Build utility" + } + } +} diff --git a/externals/vcpkg/ports/zkpp/CMakeLists.txt b/externals/vcpkg/ports/zkpp/CMakeLists.txt new file mode 100755 index 000000000..9705c580d --- /dev/null +++ b/externals/vcpkg/ports/zkpp/CMakeLists.txt @@ -0,0 +1,111 @@ +# +# This file is based on https://github.com/tgockel/zookeeper-cpp/blob/a8d5f905e01893256299d5532b1836f64c89b5b9/CMakeLists.txt +# Which is licensed under Apache License 2.0 +# http://www.apache.org/licenses/LICENSE-2.0 +# + +cmake_minimum_required(VERSION 3.5) + +file(READ src/zk/config.hpp CONFIG_HPP_STR) +string(REGEX REPLACE ".*# *define +ZKPP_VERSION_MAJOR +([0-9]+).*" "\\1" ZKPP_VERSION_MAJOR "${CONFIG_HPP_STR}") +string(REGEX REPLACE ".*# *define +ZKPP_VERSION_MINOR +([0-9]+).*" "\\1" ZKPP_VERSION_MINOR "${CONFIG_HPP_STR}") +string(REGEX REPLACE ".*# *define +ZKPP_VERSION_PATCH +([0-9]+).*" "\\1" ZKPP_VERSION_PATCH "${CONFIG_HPP_STR}") + +set(ZKPP_VERSION "${ZKPP_VERSION_MAJOR}.${ZKPP_VERSION_MINOR}.${ZKPP_VERSION_PATCH}") +project(zookeeper-cpp + LANGUAGES CXX + VERSION "${ZKPP_VERSION}" + ) +set(PROJECT_SO_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") +message(STATUS "Software Version: ${ZKPP_VERSION}") + +################################################################################ +# CMake # +################################################################################ + +cmake_policy(VERSION 3.5) +cmake_policy(SET CMP0037 OLD) # allow generation of "test" target +set(CMAKE_REQUIRED_QUIET YES) # tell check_include_file_cxx to keep quiet + +list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/") + +include(BuildFunctions) +include(CheckIncludeFileCXX) +include(ConfigurationSetting) +include(ListSplit) +include(GNUInstallDirs) + +################################################################################ +# Build Configuration # +################################################################################ + +find_package(Threads REQUIRED) + +if (NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE "Debug") + message(STATUS "No build type selected, default to ${CMAKE_BUILD_TYPE}") +endif() + +set(VALID_BUILD_TYPES Debug Release) +if(NOT ${CMAKE_BUILD_TYPE} IN_LIST VALID_BUILD_TYPES) + message(FATAL_ERROR "Invalid CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}\nValid build types are: ${VALID_BUILD_TYPES}") +endif() +message(STATUS "Configuration: ${CMAKE_BUILD_TYPE}") + +message(STATUS "Features:") +build_option(NAME CODE_COVERAGE + DOC "Enable code coverage (turns on the test-coverage target)" + DEFAULT OFF + CONFIGS_ON Debug + ) + +configuration_setting(NAME BUFFER + DOC "Type to use for zk::buffer" + DEFAULT STD_VECTOR + OPTIONS + STD_VECTOR + CUSTOM + ) + +configuration_setting(NAME FUTURE + DOC "Type to use for zk::future and zk::promise" + DEFAULT STD + OPTIONS + STD + STD_EXPERIMENTAL + CUSTOM + ) + +set(CXX_STANDARD c++17 + CACHE STRING "The language standard to target for C++." + ) + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=${CXX_STANDARD}") +set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DZKPP_DEBUG=1") +set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3") + +################################################################################ +# External Libraries # +################################################################################ + +find_package(zookeeper REQUIRED) + + +build_module(NAME zkpp + PATH src/zk + NO_RECURSE + ) + +target_include_directories(zkpp PUBLIC $ $) +target_link_libraries(zkpp PRIVATE zookeeper::zookeeper) + +install(TARGETS zkpp + EXPORT zkpp + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) + +install(FILES ${zkpp_LIBRARY_HEADERS} DESTINATION include/zk/) + +install(EXPORT zkpp DESTINATION share/zkpp/ FILE zkppConfig.cmake) diff --git a/externals/vcpkg/ports/zkpp/portfile.cmake b/externals/vcpkg/ports/zkpp/portfile.cmake new file mode 100755 index 000000000..5347d7c8c --- /dev/null +++ b/externals/vcpkg/ports/zkpp/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tgockel/zookeeper-cpp + REF v0.2.3 + SHA512 086f31d4ca53f5a585fd8640caf9f2f21c90cf46d9cfe6c0e8e5b8c620e73265bb8aebec62ea4328f3f098a9b3000280582569966c0d3401627ab8c3edc31ca8 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(GLOB_RECURSE test_files LIST_DIRECTORIES false "${SOURCE_PATH}/src/zk/*_tests.cpp") +if (NOT "${test_files}" STREQUAL "") + file(REMOVE ${test_files}) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_cmake_targets() +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/zkpp/vcpkg.json b/externals/vcpkg/ports/zkpp/vcpkg.json new file mode 100755 index 000000000..90453ef93 --- /dev/null +++ b/externals/vcpkg/ports/zkpp/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "zkpp", + "version": "0.2.3", + "port-version": 2, + "description": "A ZooKeeper client for C++.", + "homepage": "https://github.com/tgockel/zookeeper-cpp", + "supports": "!windows", + "dependencies": [ + "zookeeper" + ] +} diff --git a/externals/vcpkg/ports/zlib-ng/portfile.cmake b/externals/vcpkg/ports/zlib-ng/portfile.cmake new file mode 100755 index 000000000..0d110d0f9 --- /dev/null +++ b/externals/vcpkg/ports/zlib-ng/portfile.cmake @@ -0,0 +1,29 @@ +set(ZLIB_FULL_VERSION 2.0.6) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO zlib-ng/zlib-ng + REF "${ZLIB_FULL_VERSION}" + SHA512 4888f17160d0a87a9b349704047ae0d0dc57237a10e11adae09ace957afa9743cce5191db67cb082991421fc961ce68011199621034d2369c0e7724fad58b4c5 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DZLIB_FULL_VERSION=${ZLIB_FULL_VERSION}" + -DZLIB_ENABLE_TESTS=OFF + -DWITH_NEW_STRATEGIES=ON + OPTIONS_RELEASE + -DWITH_OPTIM=ON +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include" +) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright +) diff --git a/externals/vcpkg/ports/zlib-ng/vcpkg.json b/externals/vcpkg/ports/zlib-ng/vcpkg.json new file mode 100755 index 000000000..a64c9bd6b --- /dev/null +++ b/externals/vcpkg/ports/zlib-ng/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "zlib-ng", + "version": "2.0.6", + "description": "zlib replacement with optimizations for 'next generation' systems", + "homepage": "https://github.com/zlib-ng/zlib-ng", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/zlib/0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch b/externals/vcpkg/ports/zlib/0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch new file mode 100755 index 000000000..8fe2b2f5a --- /dev/null +++ b/externals/vcpkg/ports/zlib/0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch @@ -0,0 +1,53 @@ +diff --git a/zconf.h.cmakein b/zconf.h.cmakein +index a7f24cc..a1b359b 100644 +--- a/zconf.h.cmakein ++++ b/zconf.h.cmakein +@@ -434,11 +434,19 @@ typedef uLong FAR uLongf; + #endif + + #ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */ +-# define Z_HAVE_UNISTD_H ++# if ~(~HAVE_UNISTD_H + 0) == 0 && ~(~HAVE_UNISTD_H + 1) == 1 ++# define Z_HAVE_UNISTD_H ++# elif HAVE_UNISTD_H != 0 ++# define Z_HAVE_UNISTD_H ++# endif + #endif + + #ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */ +-# define Z_HAVE_STDARG_H ++# if ~(~HAVE_STDARG_H + 0) == 0 && ~(~HAVE_STDARG_H + 1) == 1 ++# define Z_HAVE_STDARG_H ++# elif HAVE_STDARG_H != 0 ++# define Z_HAVE_STDARG_H ++# endif + #endif + + #ifdef STDC +diff --git a/zconf.h.in b/zconf.h.in +index 5e1d68a..32f53c8 100644 +--- a/zconf.h.in ++++ b/zconf.h.in +@@ -432,11 +432,19 @@ typedef uLong FAR uLongf; + #endif + + #ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */ +-# define Z_HAVE_UNISTD_H ++# if ~(~HAVE_UNISTD_H + 0) == 0 && ~(~HAVE_UNISTD_H + 1) == 1 ++# define Z_HAVE_UNISTD_H ++# elif HAVE_UNISTD_H != 0 ++# define Z_HAVE_UNISTD_H ++# endif + #endif + + #ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */ +-# define Z_HAVE_STDARG_H ++# if ~(~HAVE_STDARG_H + 0) == 0 && ~(~HAVE_STDARG_H + 1) == 1 ++# define Z_HAVE_STDARG_H ++# elif HAVE_STDARG_H != 0 ++# define Z_HAVE_STDARG_H ++# endif + #endif + + #ifdef STDC + diff --git a/externals/vcpkg/ports/zlib/0002-android-build-mingw.patch b/externals/vcpkg/ports/zlib/0002-android-build-mingw.patch new file mode 100755 index 000000000..188499df0 --- /dev/null +++ b/externals/vcpkg/ports/zlib/0002-android-build-mingw.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt (date 1618364429263) ++++ b/CMakeLists.txt (date 1618364429263) +@@ -170,7 +170,7 @@ + string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*" + "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents}) + +-if(MINGW) ++if(MINGW AND NOT ANDROID) + # This gets us DLL resource information when compiling on MinGW. + if(NOT CMAKE_RC_COMPILER) + set(CMAKE_RC_COMPILER windres.exe) +@@ -186,7 +186,7 @@ + if(BUILD_SHARED_LIBS) + set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) + endif() +-endif(MINGW) ++endif(MINGW AND NOT ANDROID) + + add_library(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) + set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) diff --git a/externals/vcpkg/ports/zlib/cmake_dont_build_more_than_needed.patch b/externals/vcpkg/ports/zlib/cmake_dont_build_more_than_needed.patch new file mode 100755 index 000000000..ed073e041 --- /dev/null +++ b/externals/vcpkg/ports/zlib/cmake_dont_build_more_than_needed.patch @@ -0,0 +1,74 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0fe939d..a1291d5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,6 +7,7 @@ set(VERSION "1.2.12") + + option(ASM686 "Enable building i686 assembly implementation") + option(AMD64 "Enable building amd64 assembly implementation") ++option(SKIP_BUILD_EXAMPLES "Skip build of the examples" OFF) + + set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables") + set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries") +@@ -124,9 +125,11 @@ set(ZLIB_SRCS + ) + + if(NOT MINGW) +- set(ZLIB_DLL_SRCS +- win32/zlib1.rc # If present will override custom build rule below. +- ) ++ if(BUILD_SHARED_LIBS) ++ set(ZLIB_DLL_SRCS ++ win32/zlib1.rc # If present will override custom build rule below. ++ ) ++ endif() + endif() + + if(CMAKE_COMPILER_IS_GNUCC) +@@ -180,11 +183,12 @@ if(MINGW) + -I ${CMAKE_CURRENT_BINARY_DIR} + -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj + -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc) +- set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) ++ if(BUILD_SHARED_LIBS) ++ set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) ++ endif() + endif(MINGW) + +-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) +-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) ++add_library(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) + set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) + set_target_properties(zlib PROPERTIES SOVERSION 1) + +@@ -201,7 +205,7 @@ endif() + + if(UNIX) + # On unix-like platforms the library is almost always called libz +- set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z) ++ set_target_properties(zlib PROPERTIES OUTPUT_NAME z) + if(NOT APPLE) + set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") + endif() +@@ -211,7 +215,7 @@ elseif(BUILD_SHARED_LIBS AND WIN32) + endif() + + if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) +- install(TARGETS zlib zlibstatic ++ install(TARGETS zlib + RUNTIME DESTINATION "${INSTALL_BIN_DIR}" + ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" + LIBRARY DESTINATION "${INSTALL_LIB_DIR}" ) +@@ -230,6 +234,7 @@ endif() + # Example binaries + #============================================================================ + ++if (NOT SKIP_BUILD_EXAMPLES) + add_executable(example test/example.c) + target_link_libraries(example zlib) + add_test(example example) +@@ -247,3 +252,4 @@ if(HAVE_OFF64_T) + target_link_libraries(minigzip64 zlib) + set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") + endif() ++endif() diff --git a/externals/vcpkg/ports/zlib/debug-postfix-mingw.patch b/externals/vcpkg/ports/zlib/debug-postfix-mingw.patch new file mode 100755 index 000000000..22172ccfc --- /dev/null +++ b/externals/vcpkg/ports/zlib/debug-postfix-mingw.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0fe939d..e4fc213 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,7 +59,7 @@ endif() + # + check_include_file(unistd.h Z_HAVE_UNISTD_H) + +-if(MSVC) ++if(WIN32) + set(CMAKE_DEBUG_POSTFIX "d") + add_definitions(-D_CRT_SECURE_NO_DEPRECATE) + add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) diff --git a/externals/vcpkg/ports/zlib/portfile.cmake b/externals/vcpkg/ports/zlib/portfile.cmake new file mode 100755 index 000000000..66398f322 --- /dev/null +++ b/externals/vcpkg/ports/zlib/portfile.cmake @@ -0,0 +1,47 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO madler/zlib + REF v1.2.12 + SHA512 5b029532a9f5f12ad425c12eccdf1b77c8d91801342c5b5e26ffb539f76a204e6c4882b40f0130f143f2cd38df90e90af2978cf4bb997e1fa3a0d1eff2ca979e + HEAD_REF master + PATCHES + cmake_dont_build_more_than_needed.patch + 0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch + debug-postfix-mingw.patch + 0002-android-build-mingw.patch +) + +# This is generated during the cmake build +file(REMOVE "${SOURCE_PATH}/zconf.h") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSKIP_INSTALL_FILES=ON + -DSKIP_BUILD_EXAMPLES=ON + OPTIONS_DEBUG + -DSKIP_INSTALL_HEADERS=ON +) + +vcpkg_cmake_install() +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +# Install the pkgconfig file +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/zlib.pc" "-lz" "-lzlib") + endif() + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/zlib.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/zlib.pc" "-lz" "-lzlibd") + endif() + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/zlib.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +endif() + +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/zlib/usage b/externals/vcpkg/ports/zlib/usage new file mode 100755 index 000000000..39d861822 --- /dev/null +++ b/externals/vcpkg/ports/zlib/usage @@ -0,0 +1,4 @@ +The package zlib is compatible with built-in CMake targets: + + find_package(ZLIB REQUIRED) + target_link_libraries(main PRIVATE ZLIB::ZLIB) diff --git a/externals/vcpkg/ports/zlib/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/zlib/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..8624b7086 --- /dev/null +++ b/externals/vcpkg/ports/zlib/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,12 @@ +find_path(ZLIB_INCLUDE_DIR NAMES zlib.h PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" NO_DEFAULT_PATH) +find_library(ZLIB_LIBRARY_RELEASE NAMES zlib z PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) +find_library(ZLIB_LIBRARY_DEBUG NAMES zlibd z PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) +if(NOT ZLIB_INCLUDE_DIR OR NOT (ZLIB_LIBRARY_RELEASE OR ZLIB_LIBRARY_DEBUG)) + message(FATAL_ERROR "Broken installation of vcpkg port zlib") +endif() +if(CMAKE_VERSION VERSION_LESS 3.4) + include(SelectLibraryConfigurations) + select_library_configurations(ZLIB) + unset(ZLIB_FOUND) +endif() +_find_package(${ARGS}) diff --git a/externals/vcpkg/ports/zlib/vcpkg.json b/externals/vcpkg/ports/zlib/vcpkg.json new file mode 100755 index 000000000..078669f29 --- /dev/null +++ b/externals/vcpkg/ports/zlib/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "zlib", + "version": "1.2.12", + "port-version": 1, + "description": "A compression library", + "homepage": "https://www.zlib.net/", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/zookeeper/cmake.patch b/externals/vcpkg/ports/zookeeper/cmake.patch new file mode 100755 index 000000000..f47d4697e --- /dev/null +++ b/externals/vcpkg/ports/zookeeper/cmake.patch @@ -0,0 +1,74 @@ +diff --git a/zookeeper-client/zookeeper-client-c/CMakeLists.txt b/zookeeper-client/zookeeper-client-c/CMakeLists.txt +index 24a5a1b..40fa67e 100644 +--- a/zookeeper-client/zookeeper-client-c/CMakeLists.txt ++++ b/zookeeper-client/zookeeper-client-c/CMakeLists.txt +@@ -147,13 +147,15 @@ endforeach() + include(CheckStructHasMember) + check_struct_has_member("struct sockaddr_in6" sin6_addr "netinet/in.h" ZOO_IPV6_ENABLED) + ++include(GNUInstallDirs) ++ + # configure + configure_file(cmake_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/config.h) + + # hashtable library + set(hashtable_sources src/hashtable/hashtable_itr.c src/hashtable/hashtable.c) + add_library(hashtable STATIC ${hashtable_sources}) +-target_include_directories(hashtable PUBLIC include) ++target_include_directories(hashtable PUBLIC $ $) + target_link_libraries(hashtable PUBLIC $<$,$>:m>) + + # zookeeper library +@@ -176,11 +178,16 @@ if(WIN32) + endif() + + add_library(zookeeper STATIC ${zookeeper_sources}) +-target_include_directories(zookeeper PUBLIC include ${CMAKE_CURRENT_BINARY_DIR}/include generated) ++target_include_directories(zookeeper PUBLIC ++ $ ++ $ ++ $ ++ $) ++ + target_link_libraries(zookeeper PUBLIC +- hashtable + $<$:rt> # clock_gettime +- $<$:ws2_32>) # Winsock 2.0 ++ $<$:ws2_32> # Winsock 2.0 ++ PRIVATE hashtable) + + if(WANT_SYNCAPI AND NOT WIN32) + find_package(Threads REQUIRED) +@@ -189,7 +196,7 @@ endif() + + # cli executable + add_executable(cli src/cli.c) +-target_link_libraries(cli zookeeper) ++target_link_libraries(cli PRIVATE zookeeper) + + # load_gen executable + if(WANT_SYNCAPI AND NOT WIN32) +@@ -247,3 +254,23 @@ if(WANT_CPPUNIT) + "ZKROOT=${CMAKE_CURRENT_SOURCE_DIR}/../.." + "CLASSPATH=$CLASSPATH:$CLOVER_HOME/lib/clover*.jar") + endif() ++ ++ ++target_compile_definitions(zookeeper PRIVATE _CRT_SECURE_NO_WARNINGS _WINSOCK_DEPRECATED_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE) ++target_compile_definitions(cli PRIVATE _CRT_SECURE_NO_WARNINGS) ++ ++file(GLOB ZOOKEEPER_HEADERS include/*.h) ++ ++install(FILES ${ZOOKEEPER_HEADERS} generated/zookeeper.jute.h DESTINATION include/zookeeper) ++ ++install(TARGETS zookeeper hashtable ++ EXPORT zookeeperConfig ++ RUNTIME DESTINATION bin ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++) ++install(EXPORT zookeeperConfig ++ FILE zookeeperConfig.cmake ++ NAMESPACE zookeeper:: ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/zookeeper" ++) diff --git a/externals/vcpkg/ports/zookeeper/portfile.cmake b/externals/vcpkg/ports/zookeeper/portfile.cmake new file mode 100755 index 000000000..ff67f0750 --- /dev/null +++ b/externals/vcpkg/ports/zookeeper/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_download_distfile(ARCHIVE + URLS "https://archive.apache.org/dist/zookeeper/zookeeper-3.5.6/apache-zookeeper-3.5.6.tar.gz" + FILENAME "zookeeper-3.5.6.tar.gz" + SHA512 7f45817cbbc42aec5a7817fa2ae99656128e666dc58ace23d86bcfc5ca0dc49e418d1a7d1f082ad80ccb916f9f1b490167d16f836886af1a56fbcf720ad3b9d0 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + cmake.patch + win32.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + sync WANT_SYNCAPI +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/zookeeper-client/zookeeper-client-c" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DWANT_CPPUNIT=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/zookeeper-client/zookeeper-client-c/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/externals/vcpkg/ports/zookeeper/vcpkg.json b/externals/vcpkg/ports/zookeeper/vcpkg.json new file mode 100755 index 000000000..eee539a28 --- /dev/null +++ b/externals/vcpkg/ports/zookeeper/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "zookeeper", + "version": "3.5.6", + "description": "ZooKeeper C bindings", + "homepage": "https://github.com/apache/zookeeper", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "sync" + ], + "features": { + "sync": { + "description": "ZooKeeper with the sync API" + } + } +} diff --git a/externals/vcpkg/ports/zookeeper/win32.patch b/externals/vcpkg/ports/zookeeper/win32.patch new file mode 100755 index 000000000..b55f06735 --- /dev/null +++ b/externals/vcpkg/ports/zookeeper/win32.patch @@ -0,0 +1,29 @@ +diff --git a/zookeeper-client/zookeeper-client-c/src/zk_log.c b/zookeeper-client/zookeeper-client-c/src/zk_log.c +index 436485e..1902b09 100644 +--- a/zookeeper-client/zookeeper-client-c/src/zk_log.c ++++ b/zookeeper-client/zookeeper-client-c/src/zk_log.c +@@ -108,8 +108,11 @@ static const char* time_now(char* now_str){ + gettimeofday(&tv,0); + + now = tv.tv_sec; ++#ifdef WIN32 ++ localtime_s(<, &now); ++#else + localtime_r(&now, <); +- ++#endif + // clone the format used by log4j ISO8601DateFormat + // specifically: "yyyy-MM-dd HH:mm:ss,SSS" + +diff --git a/zookeeper-client/zookeeper-client-c/src/zookeeper.c b/zookeeper-client/zookeeper-client-c/src/zookeeper.c +index 25baa9c..96ed379 100644 +--- a/zookeeper-client/zookeeper-client-c/src/zookeeper.c ++++ b/zookeeper-client/zookeeper-client-c/src/zookeeper.c +@@ -90,6 +90,7 @@ + #define EAI_ADDRFAMILY WSAEINVAL /* is this still needed? */ + #define EHOSTDOWN EPIPE + #define ESTALE ENODEV ++#define strtok_r strtok_s + #endif + + #define IF_DEBUG(x) if(logLevel==ZOO_LOG_LEVEL_DEBUG) {x;} diff --git a/externals/vcpkg/ports/zopfli/portfile.cmake b/externals/vcpkg/ports/zopfli/portfile.cmake new file mode 100755 index 000000000..7ce1dfeff --- /dev/null +++ b/externals/vcpkg/ports/zopfli/portfile.cmake @@ -0,0 +1,69 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/zopfli + REF bd64b2f0553d4f1ef4e6627647c5d9fc8c71ffc0 # zopfli-1.0.3 + SHA512 3c99a4cdf3b2f0b619944bf2173ded8e10a89271fc4b2c713378b85d976a8580d15a473d5b0e6229f2911908fb1cc7397e516d618e61831c3becd65623214d94 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DZOPFLI_BUILD_INSTALL=ON +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(EXECUTABLE_SUFFIX ".exe") +else() + set(EXECUTABLE_SUFFIX "") +endif() + +# Install tools +file(COPY ${CURRENT_PACKAGES_DIR}/bin/zopfli${EXECUTABLE_SUFFIX} + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) +file(COPY ${CURRENT_PACKAGES_DIR}/bin/zopflipng${EXECUTABLE_SUFFIX} + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +else() + file(REMOVE + ${CURRENT_PACKAGES_DIR}/bin/zopfli${EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/bin/zopflipng${EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/zopfli${EXECUTABLE_SUFFIX} + ${CURRENT_PACKAGES_DIR}/debug/bin/zopflipng${EXECUTABLE_SUFFIX} + ) +endif() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Zopfli) + +# vcpkg_fixup_cmake_targets can not handles this on UNIX currently. +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR + VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-debug.cmake + "\"\${_IMPORT_PREFIX}/debug/bin/zopfli\"" + "\"\${_IMPORT_PREFIX}/tools/zopfli/zopfli\"" + ) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-debug.cmake + "\"\${_IMPORT_PREFIX}/debug/bin/zopflipng\"" + "\"\${_IMPORT_PREFIX}/tools/zopfli/zopflipng\"" + ) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-release.cmake + "\"\${_IMPORT_PREFIX}/bin/zopfli\"" + "\"\${_IMPORT_PREFIX}/tools/zopfli/zopfli\"" + ) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-release.cmake + "\"\${_IMPORT_PREFIX}/bin/zopflipng\"" + "\"\${_IMPORT_PREFIX}/tools/zopfli/zopflipng\"" + ) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/zopfli/vcpkg.json b/externals/vcpkg/ports/zopfli/vcpkg.json new file mode 100755 index 000000000..668234f53 --- /dev/null +++ b/externals/vcpkg/ports/zopfli/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "zopfli", + "version-string": "1.0.3", + "port-version": 1, + "description": "Zopfli Compression Algorithm compression library programmed in C", + "homepage": "https://github.com/google/zopfli" +} diff --git a/externals/vcpkg/ports/zpp-bits/portfile.cmake b/externals/vcpkg/ports/zpp-bits/portfile.cmake new file mode 100755 index 000000000..97f383420 --- /dev/null +++ b/externals/vcpkg/ports/zpp-bits/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO eyalz800/zpp_bits + REF v.4.4.4 + SHA512 172300f1547b985702698d7f10ac5bd804421226a8c20b26b60608aaa10bf4f9682fd1a3e49e75c309c9cb30b888f623aa5eb7ace5705d85601a2c67c8829b3f + HEAD_REF master +) + +file(INSTALL "${SOURCE_PATH}/zpp_bits.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/zpp-bits/vcpkg.json b/externals/vcpkg/ports/zpp-bits/vcpkg.json new file mode 100755 index 000000000..c3b2175ca --- /dev/null +++ b/externals/vcpkg/ports/zpp-bits/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "zpp-bits", + "version": "4.4.4", + "description": "A lightweight C++20 serialization and RPC library", + "homepage": "https://github.com/eyalz800/zpp_bits", + "license": "MIT" +} diff --git a/externals/vcpkg/ports/zserge-webview/portfile.cmake b/externals/vcpkg/ports/zserge-webview/portfile.cmake new file mode 100755 index 000000000..47b3e0c58 --- /dev/null +++ b/externals/vcpkg/ports/zserge-webview/portfile.cmake @@ -0,0 +1,54 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO zserge/webview + REF 16c93bcaeaeb6aa7bb5a1432de3bef0b9ecc44f3 + SHA512 153824bd444eafe6cc5ae00800422b41d4047dc85a164c465990c3be06d82003b532e1e869bb40e3a77cbe4789ff970fcda50ef00ac7b3e2f22ef3f566340026 + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/webview.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +set(WEBVIEW_GTK "0") +set(WEBVIEW_WINAPI "0") +set(WEBVIEW_COCOA "0") + +if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(WEBVIEW_WINAPI "1") +elseif (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(WEBVIEW_COCOA "1") +elseif (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(WEBVIEW_GTK "1") +endif() + +file(READ ${CURRENT_PACKAGES_DIR}/include/webview.h _contents) +string(REPLACE + "#ifdef WEBVIEW_STATIC" + "#if 1 // #ifdef WEBVIEW_STATIC" + _contents "${_contents}" +) +string(REPLACE + "#ifdef WEBVIEW_IMPLEMENTATION" + "#if 1 // #ifdef WEBVIEW_IMPLEMENTATION" + _contents "${_contents}" +) +string(REPLACE + "defined(WEBVIEW_GTK)" + "${WEBVIEW_GTK} // defined(WEBVIEW_GTK)" + _contents "${_contents}" +) +string(REPLACE + "defined(WEBVIEW_WINAPI)" + "${WEBVIEW_WINAPI} // defined(WEBVIEW_WINAPI)" + _contents "${_contents}" +) +string(REPLACE + "defined(WEBVIEW_COCOA)" + "${WEBVIEW_COCOA} // defined(WEBVIEW_COCOA)" + _contents "${_contents}" +) +file(WRITE ${CURRENT_PACKAGES_DIR}/include/webview.h "${_contents}") + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/externals/vcpkg/ports/zserge-webview/vcpkg.json b/externals/vcpkg/ports/zserge-webview/vcpkg.json new file mode 100755 index 000000000..dbdfa5bf1 --- /dev/null +++ b/externals/vcpkg/ports/zserge-webview/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "zserge-webview", + "version-string": "2019-04-27", + "port-version": 3, + "description": "Tiny cross-platform webview library for C/C++/Golang." +} diff --git a/externals/vcpkg/ports/zstd/install_pkgpc.patch b/externals/vcpkg/ports/zstd/install_pkgpc.patch new file mode 100755 index 000000000..a0582d98b --- /dev/null +++ b/externals/vcpkg/ports/zstd/install_pkgpc.patch @@ -0,0 +1,13 @@ +diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt +index 5f75665..dabc9d5 100644 +--- a/build/cmake/lib/CMakeLists.txt ++++ b/build/cmake/lib/CMakeLists.txt +@@ -130,7 +130,7 @@ if (ZSTD_BUILD_STATIC) + OUTPUT_NAME ${STATIC_LIBRARY_BASE_NAME}) + endif () + +-if (UNIX OR MINGW) ++if (1) + # pkg-config + set(PREFIX "${CMAKE_INSTALL_PREFIX}") + set(EXEC_PREFIX "\${prefix}") diff --git a/externals/vcpkg/ports/zstd/no-static-suffix.patch b/externals/vcpkg/ports/zstd/no-static-suffix.patch new file mode 100755 index 000000000..4e61f96b8 --- /dev/null +++ b/externals/vcpkg/ports/zstd/no-static-suffix.patch @@ -0,0 +1,13 @@ +diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt +index 8234060..765f003 100644 +--- a/build/cmake/lib/CMakeLists.txt ++++ b/build/cmake/lib/CMakeLists.txt +@@ -112,7 +112,7 @@ endif () + + # With MSVC static library needs to be renamed to avoid conflict with import library + if (MSVC OR (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT MINGW)) +- set(STATIC_LIBRARY_BASE_NAME zstd_static) ++ set(STATIC_LIBRARY_BASE_NAME zstd) + else () + set(STATIC_LIBRARY_BASE_NAME zstd) + endif () diff --git a/externals/vcpkg/ports/zstd/portfile.cmake b/externals/vcpkg/ports/zstd/portfile.cmake new file mode 100755 index 000000000..cc3aa7016 --- /dev/null +++ b/externals/vcpkg/ports/zstd/portfile.cmake @@ -0,0 +1,63 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO facebook/zstd + REF f4a552a3fa24d9078f84157bd40e4f1bad49c488 #v1.5.2 + SHA512 5e0343cfc06d756c3f09647df39f1c15b39707c0b9b6d343b1be8f1e99d567b52f5b9228925c2190d1600a5b54822c2a4546b2443b13f43eb9a75f97e7fa41f5 + HEAD_REF dev + PATCHES + install_pkgpc.patch + no-static-suffix.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ZSTD_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ZSTD_BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/build/cmake" + OPTIONS + -DZSTD_BUILD_SHARED=${ZSTD_BUILD_SHARED} + -DZSTD_BUILD_STATIC=${ZSTD_BUILD_STATIC} + -DZSTD_LEGACY_SUPPORT=1 + -DZSTD_BUILD_PROGRAMS=0 + -DZSTD_BUILD_TESTS=0 + -DZSTD_BUILD_CONTRIB=0 + -DZSTD_MULTITHREAD_SUPPORT=1 +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/zstd) +vcpkg_fixup_pkgconfig() + +file(READ "${CURRENT_PACKAGES_DIR}/share/zstd/zstdTargets.cmake" targets) +if(targets MATCHES "-pthread") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libzstd.pc" " -lzstd" " -lzstd -pthread") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libzstd.pc" " -lzstd" " -lzstd -pthread") + endif() +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + foreach(HEADER IN ITEMS zdict.h zstd.h zstd_errors.h) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/${HEADER}" "defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1)" "1" ) + endforeach() +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(missing_target zstd::libzstd_static) + set(existing_target zstd::libzstd_shared) +else() + set(existing_target zstd::libzstd_static) + set(missing_target zstd::libzstd_shared) +endif() +file(WRITE "${CURRENT_PACKAGES_DIR}/share/zstd/zstdTargets-interface.cmake" " +add_library(${missing_target} IMPORTED INTERFACE) +set_target_properties(${missing_target} PROPERTIES INTERFACE_LINK_LIBRARIES ${existing_target}) +") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(READ "${SOURCE_PATH}/LICENSE" bsd) +file(READ "${SOURCE_PATH}/COPYING" gpl) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "ZSTD is dual licensed under BSD and GPLv2.\n\n${bsd}\n\n${gpl}") diff --git a/externals/vcpkg/ports/zstd/usage b/externals/vcpkg/ports/zstd/usage new file mode 100755 index 000000000..f01a2f5cf --- /dev/null +++ b/externals/vcpkg/ports/zstd/usage @@ -0,0 +1,4 @@ +The package zstd provides CMake targets: + + find_package(zstd CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,zstd::libzstd_shared,zstd::libzstd_static>) diff --git a/externals/vcpkg/ports/zstd/vcpkg.json b/externals/vcpkg/ports/zstd/vcpkg.json new file mode 100755 index 000000000..841e1c721 --- /dev/null +++ b/externals/vcpkg/ports/zstd/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "zstd", + "version": "1.5.2", + "port-version": 1, + "description": "Zstandard - Fast real-time compression algorithm", + "homepage": "https://facebook.github.io/zstd/", + "license": "BSD-3-Clause OR GPL-2.0-only", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/zstr/portfile.cmake b/externals/vcpkg/ports/zstr/portfile.cmake new file mode 100755 index 000000000..7db0333bd --- /dev/null +++ b/externals/vcpkg/ports/zstr/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mateidavid/zstr + REF v1.0.4 + SHA512 148dd7741747917d826f0caf291730e14317c700961bec6ae360c1f6a3988d5db555c36428c9641fba3cd76a63b5880dce6b2af47a4388c5451bddce45c39944 + HEAD_REF master +) + +# Install source files +file(INSTALL ${SOURCE_PATH}/src/strict_fstream.hpp + ${SOURCE_PATH}/src/zstr.hpp + ${SOURCE_PATH}/src/zstr_make_unique_polyfill.h + DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Install license +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +# Install usage +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/externals/vcpkg/ports/zstr/usage b/externals/vcpkg/ports/zstr/usage new file mode 100755 index 000000000..78f9b80a1 --- /dev/null +++ b/externals/vcpkg/ports/zstr/usage @@ -0,0 +1,4 @@ +The package zstr is header only and can be used from CMake via: + + find_path(ZSTR_INCLUDE_DIRS "zstr.hpp") + target_include_directories(main PRIVATE ${ZSTR_INCLUDE_DIRS}) diff --git a/externals/vcpkg/ports/zstr/vcpkg.json b/externals/vcpkg/ports/zstr/vcpkg.json new file mode 100755 index 000000000..11d0a4981 --- /dev/null +++ b/externals/vcpkg/ports/zstr/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "zstr", + "version-string": "1.0.4", + "port-version": 2, + "description": "This C++ header-only library enables the use of C++ standard iostreams to access ZLib-compressed streams.", + "homepage": "https://github.com/mateidavid/zstr", + "dependencies": [ + "zlib" + ] +} diff --git a/externals/vcpkg/ports/ztd-text/portfile.cmake b/externals/vcpkg/ports/ztd-text/portfile.cmake new file mode 100755 index 000000000..377a475b0 --- /dev/null +++ b/externals/vcpkg/ports/ztd-text/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_from_github( + OUT_SOURCE_PATH ZTD_CMAKE_PATH + REPO soasis/cmake + REF 4277edaf7bf237de07c4a9833f6546872ab9f151 + SHA512 f05143068a1f22bd46aa0d8c250afb04b29ffbc0f32d746093bfb61f274d0e212ff9786a5163608097ed989b5b212d73811179f311a37d2b2eedce89cc75ee94 + HEAD_REF main +) + +vcpkg_from_github( + OUT_SOURCE_PATH ZTD_IDK_PATH + REPO soasis/idk + REF 6173bb3d433a3dab65e8c356ef69441aa5a86275 + SHA512 083711e9fc9b03aac34c5a7e182691a9bc9ee2d7c2d9ed2f55093423e2655f7a3829bd3e3db82bc42a78721795ca2d21a7b64c71f05e3c03ea3198f6228eb6f2 + HEAD_REF main +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO soasis/text + REF d76205c12300234f815e099e5f8152f443515df5 + SHA512 836b6cb1a59cd1138bc4c00f9f511bced912d1d5dc36a4a7d757ef1cd7e31cf5046b5a32476ffa89ea9c0ca7834028774f9baa8c74bfc9287cc16ef3b4e987df + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DFETCHCONTENT_FULLY_DISCONNECTED=ON + -DFETCHCONTENT_SOURCE_DIR_ZTD.CMAKE=${ZTD_CMAKE_PATH} + -DFETCHCONTENT_SOURCE_DIR_ZTD.IDK=${ZTD_IDK_PATH} +) +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/ztd-text/usage b/externals/vcpkg/ports/ztd-text/usage new file mode 100755 index 000000000..86c8ef9fc --- /dev/null +++ b/externals/vcpkg/ports/ztd-text/usage @@ -0,0 +1,4 @@ +The package ztd-text is header only and can be used from CMake via: + + find_path(ZTD_INCLUDE_DIRS ztd) + target_include_directories(main PRIVATE ${ZTD_INCLUDE_DIRS}) diff --git a/externals/vcpkg/ports/ztd-text/vcpkg.json b/externals/vcpkg/ports/ztd-text/vcpkg.json new file mode 100755 index 000000000..1de4a1396 --- /dev/null +++ b/externals/vcpkg/ports/ztd-text/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "ztd-text", + "version-date": "2022-03-21", + "description": "A spicy text library.", + "homepage": "https://github.com/soasis/text", + "license": "Apache-2.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/zug/portfile.cmake b/externals/vcpkg/ports/zug/portfile.cmake new file mode 100755 index 000000000..d222436fe --- /dev/null +++ b/externals/vcpkg/ports/zug/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO arximboldi/zug + REF 033dadbed463ff3430b7ebc36df8a46f4f0f5078 + SHA512 a8067a90f7a427775872f8198419aa791b647e273ed148b93c189d3b81a4564a19b9321b4bb8cd5681627d8ab13e40be09ed1d75c7b65d74078f21daddaef929 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + docs zug_BUILD_DOCS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dzug_BUILD_EXAMPLES=OFF + -Dzug_BUILD_TESTS=OFF + ${FEATURE_OPTIONS} +) + + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Zug) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/zug/vcpkg.json b/externals/vcpkg/ports/zug/vcpkg.json new file mode 100755 index 000000000..87bee1b28 --- /dev/null +++ b/externals/vcpkg/ports/zug/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "zug", + "version-date": "2021-04-23", + "port-version": 1, + "description": "Transducers for C++", + "homepage": "https://sinusoid.es/zug/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "docs": { + "description": "Build documentation" + } + } +} diff --git a/externals/vcpkg/ports/zydis/portfile.cmake b/externals/vcpkg/ports/zydis/portfile.cmake new file mode 100755 index 000000000..cd9b5c43a --- /dev/null +++ b/externals/vcpkg/ports/zydis/portfile.cmake @@ -0,0 +1,46 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO zyantific/zydis + REF 4022f22f9280650082a9480519c86a6e2afde2f3 #v3.2.1 + SHA512 da3ff582d3c4cbb5e4053cd468f181550f02d0a1713a39944266e6d1b0e3249e24461f87171ef99e249e6d5b2fc39fcca402518c569399ae5d4a64e0d3dc4b3b + HEAD_REF master +) + +vcpkg_from_github( + OUT_SOURCE_PATH ZYCORE_SOURCE_PATH + REPO zyantific/zycore-c + REF 8983325bf0007f0d6d2ea28a49040a77f47bd611 #2021-11-17 + SHA512 e41dc70413d2a5bb5ac549ab602c54bfaba3ea61dcd0817bfdf20e4e12d6b3e1cc587fa58ba653bd7513aa735311d3b7b4bc408d8092a98ab6cf1b44012e4e22 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ZYDIS_BUILD_SHARED_LIB) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DZYDIS_BUILD_SHARED_LIB=${ZYDIS_BUILD_SHARED_LIB}" + "-DZYDIS_ZYCORE_PATH=${ZYCORE_SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_configure( + SOURCE_PATH "${ZYCORE_SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) + +vcpkg_copy_tools(TOOL_NAMES ZydisDisasm ZydisInfo AUTO_CLEAN) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/ports/zydis/vcpkg.json b/externals/vcpkg/ports/zydis/vcpkg.json new file mode 100755 index 000000000..46ce46fb2 --- /dev/null +++ b/externals/vcpkg/ports/zydis/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "zydis", + "version-semver": "3.2.1", + "description": "Fast and lightweight x86/x86-64 disassembler library.", + "homepage": "https://zydis.re", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/externals/vcpkg/ports/zyre/Config.cmake.in b/externals/vcpkg/ports/zyre/Config.cmake.in new file mode 100755 index 000000000..21708876b --- /dev/null +++ b/externals/vcpkg/ports/zyre/Config.cmake.in @@ -0,0 +1,9 @@ +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) + +find_dependency(ZeroMQ) +find_dependency(czmq) + +include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") +check_required_components("@PROJECT_NAME@") diff --git a/externals/vcpkg/ports/zyre/Findczmq.cmake b/externals/vcpkg/ports/zyre/Findczmq.cmake new file mode 100755 index 000000000..8f6d37b16 --- /dev/null +++ b/externals/vcpkg/ports/zyre/Findczmq.cmake @@ -0,0 +1,10 @@ +find_path(CZMQ_INCLUDE_DIRS NAMES czmq.h) + +find_package(czmq CONFIG REQUIRED) +set(CZMQ_LIBRARIES czmq czmq-static) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args( + CZMQ + REQUIRED_VARS CZMQ_INCLUDE_DIRS CZMQ_LIBRARIES +) diff --git a/externals/vcpkg/ports/zyre/Findlibzmq.cmake b/externals/vcpkg/ports/zyre/Findlibzmq.cmake new file mode 100755 index 000000000..706f063c3 --- /dev/null +++ b/externals/vcpkg/ports/zyre/Findlibzmq.cmake @@ -0,0 +1,10 @@ +find_package(ZeroMQ CONFIG REQUIRED) + +set(LIBZMQ_INCLUDE_DIRS ${ZeroMQ_INCLUDE_DIR}) +set(LIBZMQ_LIBRARIES libzmq libzmq-static) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args( + LIBZMQ + REQUIRED_VARS LIBZMQ_LIBRARIES LIBZMQ_INCLUDE_DIRS +) diff --git a/externals/vcpkg/ports/zyre/portfile.cmake b/externals/vcpkg/ports/zyre/portfile.cmake new file mode 100755 index 000000000..b73db8ecb --- /dev/null +++ b/externals/vcpkg/ports/zyre/portfile.cmake @@ -0,0 +1,66 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO zeromq/zyre + REF 2648b7eb806a2494d6eb4177f0941232d83c5294 + SHA512 8940e82ccdc427734711d63dc01c81fe86c4ca6b7e97a69df979f4d48a4711df1ccaee6a3b6aa394f9ef91d719cb95851c4eb87dfa9ed6426e2577b95e0fb464 + HEAD_REF master +) + +configure_file( + ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in + ${SOURCE_PATH}/builds/cmake/Config.cmake.in + COPYONLY +) + +foreach(_cmake_module Findczmq.cmake Findlibzmq.cmake) + configure_file( + ${CMAKE_CURRENT_LIST_DIR}/${_cmake_module} + ${SOURCE_PATH}/${_cmake_module} + COPYONLY + ) +endforeach() + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ZYRE_BUILD_SHARED) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ZYRE_BUILD_STATIC) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DZYRE_BUILD_SHARED=${ZYRE_BUILD_SHARED} + -DZYRE_BUILD_STATIC=${ZYRE_BUILD_STATIC} + -DENABLE_DRAFTS=OFF +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) + vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) +elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/cmake/${PORT}) + vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/${PORT}) +endif() + +file(COPY + ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} +) + +vcpkg_copy_tools(TOOL_NAMES zpinger AUTO_CLEAN) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +if(ZYRE_BUILD_STATIC) + vcpkg_replace_string( + ${CURRENT_PACKAGES_DIR}/include/zyre_library.h + "if defined ZYRE_STATIC" + "if 1 //if defined ZYRE_STATIC" + ) +endif() + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) + +vcpkg_fixup_pkgconfig() diff --git a/externals/vcpkg/ports/zyre/vcpkg-cmake-wrapper.cmake b/externals/vcpkg/ports/zyre/vcpkg-cmake-wrapper.cmake new file mode 100755 index 000000000..41003826f --- /dev/null +++ b/externals/vcpkg/ports/zyre/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,9 @@ +_find_package(${ARGS}) + +if(TARGET zyre AND NOT TARGET zyre-static) + add_library(zyre-static INTERFACE IMPORTED) + set_target_properties(zyre-static PROPERTIES INTERFACE_LINK_LIBRARIES zyre) +elseif(TARGET zyre-static AND NOT TARGET zyre) + add_library(zyre INTERFACE IMPORTED) + set_target_properties(zyre PROPERTIES INTERFACE_LINK_LIBRARIES zyre-static) +endif() diff --git a/externals/vcpkg/ports/zyre/vcpkg.json b/externals/vcpkg/ports/zyre/vcpkg.json new file mode 100755 index 000000000..2abbffdfd --- /dev/null +++ b/externals/vcpkg/ports/zyre/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "zyre", + "version-string": "2019-07-07", + "port-version": 3, + "description": "An open-source framework for proximity-based peer-to-peer applications", + "homepage": "https://github.com/zeromq/zyre", + "dependencies": [ + "czmq" + ] +} diff --git a/externals/vcpkg/ports/zziplib/cmake-project-include.cmake b/externals/vcpkg/ports/zziplib/cmake-project-include.cmake new file mode 100755 index 000000000..a8abb0e3b --- /dev/null +++ b/externals/vcpkg/ports/zziplib/cmake-project-include.cmake @@ -0,0 +1,3 @@ +if(WIN32) + add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS) +endif() diff --git a/externals/vcpkg/ports/zziplib/export-targets.patch b/externals/vcpkg/ports/zziplib/export-targets.patch new file mode 100755 index 000000000..7bcc0655b --- /dev/null +++ b/externals/vcpkg/ports/zziplib/export-targets.patch @@ -0,0 +1,73 @@ +diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt +index 1883272..16d4380 100644 +--- a/zzip/CMakeLists.txt ++++ b/zzip/CMakeLists.txt +@@ -175,7 +175,7 @@ set(libzzipmmapped_HDRS mmapped.h memdisk.h) + + add_library(libzzip ${libzzip_SRCS} ) + target_link_libraries(libzzip ZLIB::ZLIB ) +-target_include_directories (libzzip PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}) ++target_include_directories (libzzip PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} PUBLIC $) + + if(ZZIPFSEEKO) + add_library(libzzipfseeko ${libzzipfseeko_SRCS} ) +@@ -255,14 +255,14 @@ install(FILES ${outdir}/zziplib.pc ${outdir}/zzipmmapped.pc ${outdir}/zzipfseeko + endif() + + install(FILES ${libzzip_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) +-install(TARGETS libzzip ++install(TARGETS libzzip EXPORT unofficial-zziplibTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + if(ZZIPFSEEKO) + install(FILES ${libzzipfseeko_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) +-install(TARGETS libzzipfseeko ++install(TARGETS libzzipfseeko EXPORT unofficial-zziplibTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +@@ -270,12 +270,28 @@ endif() + + if(ZZIPMMAPPED) + install(FILES ${libzzipmmapped_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) +-install(TARGETS libzzipmmapped ++install(TARGETS libzzipmmapped EXPORT unofficial-zziplibTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() + ++install(EXPORT unofficial-zziplibTargets ++ NAMESPACE unofficial::zziplib:: ++ DESTINATION share/unofficial-zziplib ++) ++ ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-zziplib-config.cmake.in" ++[[include(CMakeFindDependencyMacro) ++find_dependency(ZLIB) ++file(GLOB TARGET_FILES "${CMAKE_CURRENT_LIST_DIR}/*Targets.cmake") ++foreach (TARGET_FILE ${TARGET_FILES}) ++ include("${TARGET_FILE}") ++endforeach() ++]]) ++configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-zziplib-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-zziplib-config.cmake" @ONLY) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-zziplib-config.cmake DESTINATION share/unofficial-zziplib) ++ + if(ZZIP_COMPAT) + install(FILES ${outdir}/compat/zzip.h ${outdir}/compat/zziplib.h ${outdir}/compat/zzip-io.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +diff --git a/zzipwrap/CMakeLists.txt b/zzipwrap/CMakeLists.txt +index ea7ea93..2d41f70 100644 +--- a/zzipwrap/CMakeLists.txt ++++ b/zzipwrap/CMakeLists.txt +@@ -83,7 +83,7 @@ install(FILES ${outdir}/zzipwrap.pc + endif() + + install(FILES ${libzzipwrap_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) +-install(TARGETS libzzipwrap ++install(TARGETS libzzipwrap EXPORT unofficial-zziplibTargets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + diff --git a/externals/vcpkg/ports/zziplib/no-release-postfix.patch b/externals/vcpkg/ports/zziplib/no-release-postfix.patch new file mode 100755 index 000000000..f81c74513 --- /dev/null +++ b/externals/vcpkg/ports/zziplib/no-release-postfix.patch @@ -0,0 +1,24 @@ +diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt +index a9f6e3a..407827b 100644 +--- a/zzip/CMakeLists.txt ++++ b/zzip/CMakeLists.txt +@@ -180,16 +180,16 @@ target_link_libraries(libzzipmmapped ZLIB::ZLIB ) + target_include_directories (libzzipmmapped PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}) + endif() + +-set_target_properties(libzzip PROPERTIES OUTPUT_NAME "zzip" RELEASE_POSTFIX "-${RELNUM}") ++set_target_properties(libzzip PROPERTIES OUTPUT_NAME "zzip") + SET_TARGET_PROPERTIES(libzzip PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM}) + + if(ZZIPFSEEKO) +-set_target_properties(libzzipfseeko PROPERTIES OUTPUT_NAME "zzipfseeko" RELEASE_POSTFIX "-${RELNUM}") ++set_target_properties(libzzipfseeko PROPERTIES OUTPUT_NAME "zzipfseeko") + SET_TARGET_PROPERTIES(libzzipfseeko PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM}) + endif() + + if(ZZIPMMAPPED) +-set_target_properties(libzzipmmapped PROPERTIES OUTPUT_NAME "zzipmmapped" RELEASE_POSTFIX "-${RELNUM}") ++set_target_properties(libzzipmmapped PROPERTIES OUTPUT_NAME "zzipmmapped") + SET_TARGET_PROPERTIES(libzzipmmapped PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM}) + endif() + diff --git a/externals/vcpkg/ports/zziplib/portfile.cmake b/externals/vcpkg/ports/zziplib/portfile.cmake new file mode 100755 index 000000000..00c9291e8 --- /dev/null +++ b/externals/vcpkg/ports/zziplib/portfile.cmake @@ -0,0 +1,55 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gdraheim/zziplib + REF v0.13.72 + SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8 + PATCHES + no-release-postfix.patch + export-targets.patch +) + +string(COMPARE EQUAL VCPKG_CRT_LINKAGE "static" MSVC_STATIC_RUNTIME) +string(COMPARE EQUAL VCPKG_LIBRARY_LINKAGE "static" BUILD_STATIC_LIBS) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DMSVC_STATIC_RUNTIME=${MSVC_STATIC_RUNTIME} + -DZZIPMMAPPED=OFF + -DZZIPFSEEKO=OFF + -DZZIPWRAP=OFF + -DZZIPSDL=OFF + -DZZIPBINS=OFF + -DZZIPTEST=OFF + -DZZIPDOCS=OFF +) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-zziplib) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/zzipfseeko.pc" + "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/zzipmmapped.pc" + "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/zzipfseeko.pc" + "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/zzipmmapped.pc" +) + +vcpkg_fixup_pkgconfig() + +file(READ "${SOURCE_PATH}/docs/COPYING.LIB" lgpl) +file(READ "${SOURCE_PATH}/docs/COPYING.MPL" mpl) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" +"${PORT} is shipping under a dual MPL / LGPL license where each of them +is separate and restrictions apply alternatively. + +--- + +${lgpl} + +--- + +${mpl} +") diff --git a/externals/vcpkg/ports/zziplib/vcpkg.json b/externals/vcpkg/ports/zziplib/vcpkg.json new file mode 100755 index 000000000..d833544ea --- /dev/null +++ b/externals/vcpkg/ports/zziplib/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "zziplib", + "version": "0.13.72", + "port-version": 1, + "description": "library providing read access on ZIP-archives", + "homepage": "https://github.com/gdraheim/zziplib", + "license": "LGPL-2.0-or-later OR MPL-1.1", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/externals/vcpkg/scripts/Get-Changelog.ps1 b/externals/vcpkg/scripts/Get-Changelog.ps1 new file mode 100755 index 000000000..5beebce6e --- /dev/null +++ b/externals/vcpkg/scripts/Get-Changelog.ps1 @@ -0,0 +1,498 @@ +#Requires -Version 5.0 +# We are not using Powershell >= 6.0, as the only supported debugger (vscode powershell extension) breaks on complex code. See: https://github.com/PowerShell/PowerShellEditorServices/issues/1295 +# This code can be run on PowerShell Core on any platform, but it is recommend to debug this code in Windows PowerShell ISE unless debugging happens to "just work" on your machine. +# Expect the fix to be out at around the end of 2020/beginning of 2021, at which point consider upgrading this script to PowerShell 7 the next time maintenance is necessary. +# -- Griffin Downs 2020-12-15 (@grdowns) + +using namespace System.Management.Automation +using namespace System.Collections.Generic + +<# +.SYNOPSIS + Changelog generator for vcpkg. +.DESCRIPTION + The changelog generator uses GitHub's Pull Request and Files API to get + pull requests and their associated file changes over the provided date range. + Then, the data is processed into buckets which are presented to the user + as a markdown file. +.EXAMPLE + Get-Changelog +.EXAMPLE + Get-Changelog -StartDate 11/1/20 -EndDate 12/1/20 +.EXAMPLE + $cred = Get-Credential + Get-Changelog -Credentials $cred +.OUTPUTS + A "CHANGELOG.md" file in the working directory. If the file already exists, + suffix is added to the filename and a new file is created to prevent overwriting. +#> +[CmdletBinding(PositionalBinding=$True)] +Param ( + # The begin date range (inclusive) + [Parameter(Mandatory=$True, Position=0)] + [ValidateScript({$_ -le (Get-Date)})] + [DateTime]$StartDate, + + # The end date range (exclusive) + [Parameter(Mandatory, Position=1)] + [ValidateScript({$_ -le (Get-Date)})] + [DateTime]$EndDate, + + [Parameter(Mandatory=$True)] + [String]$OutFile, + + # GitHub credentials (username and PAT) + [Parameter()] + [Credential()] + [PSCredential]$Credentials +) + +Set-StrictMode -Version 2 + +if (-not $Credentials) { + $Credentials = Get-Credential -Message 'Enter GitHub Credentials (username and PAT)' + if (-not $Credentials) { + throw [System.ArgumentException]::new( + 'Cannot process command because of the missing mandatory parameter: Credentials.' + ) + } +} + +function Get-AuthHeader() { + [CmdletBinding()] + Param( + [Parameter(Mandatory=$True)] + [Credential()] + [PSCredential]$Credentials + ) + @{ Authorization = 'Basic ' + [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes( + "$($Credentials.UserName):$($Credentials.GetNetworkCredential().Password)")) } +} + +$response = Invoke-WebRequest -uri 'https://api.github.com' -Headers (Get-AuthHeader $Credentials) +if ('X-OAuth-Scopes' -notin $response.Headers.Keys) { + throw [System.ArgumentException]::new( + "Cannot validate argument on parameter 'Credentials'. Incorrect GitHub credentials" + ) +} + + +function Get-MergedPullRequests { + [CmdletBinding()] + [OutputType([Object[]])] + Param( + [Parameter(Mandatory=$True, Position=0)] + [ValidateScript({$_ -le (Get-Date)})] + [DateTime]$StartDate, + + # The end date range (exclusive) + [Parameter(Mandatory, Position=1)] + [ValidateScript({$_ -le (Get-Date)})] + [DateTime]$EndDate, + + [Parameter(Mandatory=$True)] + [Credential()] + [PSCredential]$Credentials + ) + Begin { + $RequestSplat = @{ + Uri = 'https://api.github.com/repos/Microsoft/vcpkg/pulls' + Body = @{ + state = 'closed' + sort = 'updated' + base = 'master' + per_page = 100 + direction = 'desc' + page = 1 + } + } + $Epoch = Get-Date -AsUTC + $DeltaEpochStart = ($Epoch - $StartDate).Ticks + + $ProgressSplat = @{ + Activity = "Searching for merged Pull Requests in date range: $($StartDate.ToString('yyyy-MM-dd')) - $($EndDate.ToString('yyyy-MM-dd'))" + PercentComplete = 0 + } + + Write-Progress @ProgressSplat + + $writeProgress = { + $ProgressSplat.PercentComplete = 100 * ($Epoch - $_.updated_at).Ticks / $DeltaEpochStart + Write-Progress @ProgressSplat -Status "Current item date: $($_.updated_at.ToString('yyyy-MM-dd'))" + } + } + Process { + while ($True) { + $response = Invoke-WebRequest -Headers (Get-AuthHeader $Credentials) @RequestSplat | ConvertFrom-Json + + foreach ($_ in $response) { + foreach ($x in 'created_at', 'merged_at', 'updated_at', 'closed_at') { + if ($_.$x) { $_.$x = [DateTime]::Parse($_.$x, + [System.Globalization.CultureInfo]::InvariantCulture, + [System.Globalization.DateTimeStyles]::AdjustToUniversal -bor [System.Globalization.DateTimeStyles]::AssumeUniversal) } + } + + if (-not $_.merged_at) { continue } + if ($_.updated_at -lt $StartDate) { return } + + &$WriteProgress + + if ($_.merged_at -ge $EndDate -or $_.merged_at -lt $StartDate) { continue } + + $_ + } + + $RequestSplat.Body.page++ + } + } +} + + +class PRFileMap { + [Object]$Pull + [Object[]]$Files +} + + +function Get-PullRequestFileMap { + [CmdletBinding()] + [OutputType([PRFileMap[]])] + Param ( + [Parameter(Mandatory=$True,ValueFromPipeline=$True)] + [Object]$Pull, + [Parameter(Mandatory=$True)] + [Credential()] + [PSCredential]$Credentials + ) + Begin { + $Pulls = [List[Object]]::new() + + $ProgressSplat = @{ + Activity = 'Getting Pull Request files' + PercentComplete = 0 + } + + $Count = 0 + $WriteProgress = { + $ProgressSplat.Status = 'Getting files for: #{0} ({1}/{2})' -f $_.number, $Count, $Pulls.Length + $ProgressSplat.PercentComplete = 100 * $Count / $Pulls.Length + Write-Progress @ProgressSplat + } + } + Process { + $Pulls += $Pull + } + End { + Write-Progress @ProgressSplat + $ProgressSplat += @{ Status = '' } + + $Pulls | ForEach-Object { + $Count++ + + [PRFileMap]@{ + Pull = $_ + Files = $( + $requestSplat = @{ + Uri = 'https://api.github.com/repos/Microsoft/vcpkg/pulls/{0}/files' -f $_.number + Body = @{ page = 0; per_page = 100 } + } + do { + $requestSplat.Body.page++ + + $response = Invoke-WebRequest -Headers (Get-AuthHeader $Credentials) @requestSplat | ConvertFrom-Json + + $response + } until ($response.Length -lt $requestSplat.Body.per_page) + ) + } + + &$WriteProgress + } + } +} + + +class DocumentationUpdate { + [String]$Path + [Boolean]$New + [List[Object]]$Pulls +} + + +function Select-Documentation { + [CmdletBinding()] + [OutputType([DocumentationUpdate])] + Param ( + [Parameter(Mandatory=$True,ValueFromPipeline=$True)] + [PRFileMap]$PRFileMap + ) + Begin { + $UpdatedDocumentation = @{} + } + Process { + $PRFileMap.Files | ForEach-Object { + if ($_.filename -notlike 'docs/*') { return } + + $new = $_.status -eq 'added' + if ($entry = $UpdatedDocumentation[$_.filename]) { + $entry.Pulls += $PRFileMap.Pull + $entry.New = $entry.New -or $new + } else { + $UpdatedDocumentation[$_.filename] = @{ + Pulls = [List[Object]]::new(@($PRFileMap.Pull)) + New = $new + } + } + } + } + End { + $UpdatedDocumentation.GetEnumerator() | ForEach-Object { + [DocumentationUpdate]@{ + Path = $_.Key + Pulls = $_.Value.Pulls + New = $_.Value.New + } + } + } +} + + +function Select-InfrastructurePullRequests { + [CmdletBinding()] + [OutputType([Object])] + Param ( + [Parameter(Mandatory=$True,ValueFromPipeline=$True)] + [PRFileMap]$PRFileMap + ) + Process { + switch -Wildcard ($PRFileMap.Files | Foreach-Object {$_.filename}) { + "docs/*" { continue } + "ports/*" { continue } + "versions/*" { continue } + "scripts/ci.baseline.txt" { continue } + Default { return $PRFileMap.Pull } + } + } +} + + +class Version { + [String]$Begin + [String]$End + [String]$BeginPort + [String]$EndPort +} + + +function Select-Version { + [CmdletBinding()] + [OutputType([Version])] + Param ( + [Parameter(Mandatory=$True,ValueFromPipeline=$True)] + [Object]$VersionFile + ) + Begin { + $V = [Version]@{} + } + Process { + $regex = switch ($VersionFile.filename | Split-Path -Leaf) { + 'CONTROL' { + '(?^[\+|\-]|)(?Version|[\+|\-]Port-Version):\s(?\S+)' + } + 'vcpkg.json' { + '(?^[\+|\-]|)\s*(\"(?version|version-date|version-string|version-semver)\":\s\"(?.+)\"|\"(?port-version)\":\s(?.+))' + } + Default { return } + } + + $VersionFile.Patch -split '\n' | ForEach-Object { + if ($_ -notmatch $regex) { return } + + $m = $Matches + switch -Wildcard ($m.operation + $m.field) { + 'Version*' { $V.Begin = $V.End = $m.version } + '-Version*' { $V.Begin = ($V.Begin, $m.version | Measure-Object -Minimum).Minimum } + '+Version*' { $V.End = ($V.End, $m.version | Measure-Object -Minimum).Minimum } + 'Port-Version' { $V.BeginPort = $V.EndPort = $m.version } + '-Port-Version' { $V.BeginPort = ($V.BeginPort, $m.version | Measure-Object -Minimum).Minimum } + '+Port-Version' { $V.EndPort = ($V.EndPort, $m.version | Measure-Object -Maximum).Maximum } + } + } + } + End { + if (-not $V.Begin) { $V.Begin = $V.End } + elseif (-not $V.End) { $V.End = $V.Begin } + + if (-not $V.BeginPort) { $V.BeginPort = '0' } + if (-not $V.EndPort) { $V.EndPort = '0' } + + $V + } +} + + +class PortUpdate { + [String]$Port + [Object[]]$Pulls + [Version]$Version + [Boolean]$New +} + + +function Select-UpdatedPorts { + [CmdletBinding()] + [OutputType([PortUpdate])] + Param ( + [Parameter(Mandatory=$True,ValueFromPipeline=$True)] + [PRFileMap]$PRFileMap + ) + Begin { + $ModifiedPorts = @{} + } + Process { + $PRFileMap.Files | Where-Object { + $_.filename -like 'ports/*/CONTROL' -or + $_.filename -like 'ports/*/vcpkg.json' + } | ForEach-Object { + $port = $_.filename.split('/')[1] + if ($entry = $ModifiedPorts[$port]) { + $entry.VersionFiles += $_ + if (-not $entry.Pulls.Contains($PRFileMap.Pull)) { $entry.Pulls += $PRFileMap.Pull } + } else { + $ModifiedPorts[$port] = @{ + VersionFiles = [List[Object]]::new(@($_)) + Pulls = [List[Object]]::new(@($PRFileMap.Pull)) + } + } + } + } + End { + $ModifiedPorts.GetEnumerator() | ForEach-Object { + $versionFiles = $_.Value.VersionFiles + if (-not ($versionChange = $versionFiles | Select-Version)) { return } + + function Find-File($x) { [bool]($versionFiles | Where-Object { $_.filename -like "*$x" }) } + function Find-NewFile($x) + { [bool]($versionFiles | Where-Object { $_.filename -like "*$x" -and $_.status -eq 'added' }) } + + [PortUpdate]@{ + Port = $_.Key + Pulls = $_.Value.Pulls + Version = $versionChange + New = (Find-NewFile 'CONTROL') -or (-not (Find-File 'CONTROL') -and (Find-NewFile 'vcpkg.json')) + } + } + } +} + +$MergedPRs = Get-MergedPullRequests -StartDate $StartDate -EndDate $EndDate -Credentials $Credentials +$MergedPRsSorted = $MergedPRs | Sort-Object -Property 'number' +$PRFileMaps = $MergedPRsSorted | Get-PullRequestFileMap -Credentials $Credentials + +$sortSplat = @{ Property = + @{ Expression = 'New'; Descending = $True }, @{ Expression = 'Path'; Descending = $False } } +$UpdatedDocumentation = $PRFileMaps | Select-Documentation | Sort-Object @sortSplat +$UpdatedInfrastructure = $PRFileMaps | Select-InfrastructurePullRequests +$UpdatedPorts = $PRFileMaps | Select-UpdatedPorts +$NewPorts = $UpdatedPorts | Where-Object { $_.New } +$ChangedPorts = $UpdatedPorts | Where-Object { -not $_.New } + +Write-Progress -Activity 'Selecting updates from pull request files' -Completed + +Write-Progress -Activity 'Writing changelog file' -PercentComplete -1 + +$output = @" +vcpkg ($($StartDate.ToString('yyyy.MM.dd')) - $((($EndDate).AddSeconds(-1)).ToString('yyyy.MM.dd'))) +--- +#### Total port count: +#### Total port count per triplet (tested) (tentative): LINK TO BUILD +|triplet|ports available| +|---|---| +|x86-windows|NUM| +|**x64-windows**|NUM| +|x64-windows-static|NUM| +|x64-windows-static-md|NUM| +|x64-uwp|NUM| +|arm64-windows|NUM| +|arm-uwp|NUM| +|**x64-osx**|NUM| +|**x64-linux**|NUM| + +"@ + +if ($UpdatedDocumentation) { + $output += @" +#### The following documentation has been updated: + +$(-join ($UpdatedDocumentation | Sort-Object -Property 'Path' | ForEach-Object { + $PathWithoutDocs = ([string]$_.Path).Remove(0, 5) # 'docs/' + "- [{0}](https://github.com/microsoft/vcpkg/blob/master/docs/{0}){1}`n" -f $PathWithoutDocs, ($(if ($_.New) { ' ***[NEW]***' } else { '' })) + + $_.Pulls | ForEach-Object { + " - {0} (by @{1}, in #{2})`n" -f $_.title, $_.user.login, $_.number + } +})) + +"@ +} + +if ($NewPorts) { + $output += @" +
+The following $($NewPorts.Length) ports have been added: + +|port|version| +|---|---| +$(-join ($NewPorts | Sort-Object -Property 'Port' | ForEach-Object { + "|[{0}]({1})" -f $_.Port, $_.Pulls[0].html_url + + if ($_.Pulls.Length -gt 1 ) { + '' + $_.Pulls[1..($_.Pulls.Length - 1)] | ForEach-Object { + " #{0}" -f $_.number + } + '' + } + + "|{0}`n" -f $_.Version.End +})) +
+ +"@ +} + +if ($ChangedPorts) { + $output += @" +
+The following $($ChangedPorts.Length) ports have been updated: + +$(-join ($ChangedPorts | Sort-Object -Property 'Port' | ForEach-Object { + "- {0} ``{1}#{2}``" -f $_.Port, $_.Version.Begin, $_.Version.BeginPort + ' -> ' + "``{0}#{1}```n" -f $_.Version.End, $_.Version.EndPort + + $_.Pulls | ForEach-Object { + " - {0} (by @{1}, in #{2})`n" -f $_.title, $_.user.login, $_.number + } +})) +
+ +"@ +} + +if ($UpdatedInfrastructure) { + $output += @" +
+The following additional changes have been made to vcpkg's infrastructure: + +$(-join ($UpdatedInfrastructure | ForEach-Object { + "- {0} (by @{1}, in #{2})`n" -f $_.title, $_.user.login, $_.number +})) +
+ +"@ +} + +Set-Content -Value $Output -Path $OutFile + +Write-Progress -Activity 'Writing changelog file' -Completed diff --git a/externals/vcpkg/scripts/addPoshVcpkgToPowershellProfile.ps1 b/externals/vcpkg/scripts/addPoshVcpkgToPowershellProfile.ps1 new file mode 100755 index 000000000..8dedc3d2b --- /dev/null +++ b/externals/vcpkg/scripts/addPoshVcpkgToPowershellProfile.ps1 @@ -0,0 +1,271 @@ +[CmdletBinding()] +param() + +function findExistingImportModuleDirectives([Parameter(Mandatory=$true)][string]$path) +{ + if (!(Test-Path $path)) + { + return + } + + $fileContents = Get-Content $path + $fileContents -match 'Import-Module.+?(?=posh-vcpkg)' + return +} + +$scriptsDir = split-path -parent $script:MyInvocation.MyCommand.Definition + +$profileEntry = "Import-Module '$scriptsDir\posh-vcpkg'" +$profilePath = $PROFILE # Implicit PowerShell variable +$profileDir = Split-Path $profilePath -Parent +if (!(Test-Path $profileDir)) +{ + New-Item -ItemType Directory -Path $profileDir | Out-Null +} + +Write-Host "`nAdding the following line to ${profilePath}:" +Write-Host " $profileEntry" + +# @() Needed to force Array in PowerShell 2.0 +[Array]$existingImports = @(findExistingImportModuleDirectives $profilePath) +if ($existingImports.Count -gt 0) +{ + $existingImportsOut = $existingImports -join "`n " + Write-Host "`nposh-vcpkg is already imported to your PowerShell profile. The following entries were found:" + Write-Host " $existingImportsOut" + Write-Host "`nPlease make sure you have started a new PowerShell window for the changes to take effect." + return +} + +# Modifying the profile will invalidate any signatures. +# Posh-git does the following check, so we should too. +# https://github.com/dahlbyk/posh-git/blob/master/src/Utils.ps1 +# If the profile script exists and is signed, then we should not modify it +if (Test-Path $profilePath) +{ + $sig = Get-AuthenticodeSignature $profilePath + if ($null -ne $sig.SignerCertificate) + { + Write-Warning "Skipping add of posh-vcpkg import to profile; '$profilePath' appears to be signed." + Write-Warning "Please manually add the line '$profileEntry' to your profile and resign it." + return + } +} + +Add-Content $profilePath -Value "`n$profileEntry" -Encoding UTF8 +Write-Host "`nSuccessfully added posh-vcpkg to your PowerShell profile. Please start a new PowerShell window for the changes to take effect." + +# SIG # Begin signature block +# MIIntwYJKoZIhvcNAQcCoIInqDCCJ6QCAQExDzANBglghkgBZQMEAgEFADB5Bgor +# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG +# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCAQI5pjINs39W5V +# cJzzNG3YZ5LACp5BEUv+jJq20JhbqKCCDYEwggX/MIID56ADAgECAhMzAAACUosz +# qviV8znbAAAAAAJSMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAlVTMRMwEQYD +# VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMTH01pY3Jvc29mdCBDb2RlIFNpZ25p +# bmcgUENBIDIwMTEwHhcNMjEwOTAyMTgzMjU5WhcNMjIwOTAxMTgzMjU5WjB0MQsw +# CQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9u +# ZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMR4wHAYDVQQDExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +# AQDQ5M+Ps/X7BNuv5B/0I6uoDwj0NJOo1KrVQqO7ggRXccklyTrWL4xMShjIou2I +# sbYnF67wXzVAq5Om4oe+LfzSDOzjcb6ms00gBo0OQaqwQ1BijyJ7NvDf80I1fW9O +# L76Kt0Wpc2zrGhzcHdb7upPrvxvSNNUvxK3sgw7YTt31410vpEp8yfBEl/hd8ZzA +# v47DCgJ5j1zm295s1RVZHNp6MoiQFVOECm4AwK2l28i+YER1JO4IplTH44uvzX9o +# RnJHaMvWzZEpozPy4jNO2DDqbcNs4zh7AWMhE1PWFVA+CHI/En5nASvCvLmuR/t8 +# q4bc8XR8QIZJQSp+2U6m2ldNAgMBAAGjggF+MIIBejAfBgNVHSUEGDAWBgorBgEE +# AYI3TAgBBggrBgEFBQcDAzAdBgNVHQ4EFgQUNZJaEUGL2Guwt7ZOAu4efEYXedEw +# UAYDVR0RBEkwR6RFMEMxKTAnBgNVBAsTIE1pY3Jvc29mdCBPcGVyYXRpb25zIFB1 +# ZXJ0byBSaWNvMRYwFAYDVQQFEw0yMzAwMTIrNDY3NTk3MB8GA1UdIwQYMBaAFEhu +# ZOVQBdOCqhc3NyK1bajKdQKVMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly93d3cu +# bWljcm9zb2Z0LmNvbS9wa2lvcHMvY3JsL01pY0NvZFNpZ1BDQTIwMTFfMjAxMS0w +# Ny0wOC5jcmwwYQYIKwYBBQUHAQEEVTBTMFEGCCsGAQUFBzAChkVodHRwOi8vd3d3 +# Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY0NvZFNpZ1BDQTIwMTFfMjAx +# MS0wNy0wOC5jcnQwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0BAQsFAAOCAgEAFkk3 +# uSxkTEBh1NtAl7BivIEsAWdgX1qZ+EdZMYbQKasY6IhSLXRMxF1B3OKdR9K/kccp +# kvNcGl8D7YyYS4mhCUMBR+VLrg3f8PUj38A9V5aiY2/Jok7WZFOAmjPRNNGnyeg7 +# l0lTiThFqE+2aOs6+heegqAdelGgNJKRHLWRuhGKuLIw5lkgx9Ky+QvZrn/Ddi8u +# TIgWKp+MGG8xY6PBvvjgt9jQShlnPrZ3UY8Bvwy6rynhXBaV0V0TTL0gEx7eh/K1 +# o8Miaru6s/7FyqOLeUS4vTHh9TgBL5DtxCYurXbSBVtL1Fj44+Od/6cmC9mmvrti +# yG709Y3Rd3YdJj2f3GJq7Y7KdWq0QYhatKhBeg4fxjhg0yut2g6aM1mxjNPrE48z +# 6HWCNGu9gMK5ZudldRw4a45Z06Aoktof0CqOyTErvq0YjoE4Xpa0+87T/PVUXNqf +# 7Y+qSU7+9LtLQuMYR4w3cSPjuNusvLf9gBnch5RqM7kaDtYWDgLyB42EfsxeMqwK +# WwA+TVi0HrWRqfSx2olbE56hJcEkMjOSKz3sRuupFCX3UroyYf52L+2iVTrda8XW +# esPG62Mnn3T8AuLfzeJFuAbfOSERx7IFZO92UPoXE1uEjL5skl1yTZB3MubgOA4F +# 8KoRNhviFAEST+nG8c8uIsbZeb08SeYQMqjVEmkwggd6MIIFYqADAgECAgphDpDS +# AAAAAAADMA0GCSqGSIb3DQEBCwUAMIGIMQswCQYDVQQGEwJVUzETMBEGA1UECBMK +# V2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0 +# IENvcnBvcmF0aW9uMTIwMAYDVQQDEylNaWNyb3NvZnQgUm9vdCBDZXJ0aWZpY2F0 +# ZSBBdXRob3JpdHkgMjAxMTAeFw0xMTA3MDgyMDU5MDlaFw0yNjA3MDgyMTA5MDla +# MH4xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdS +# ZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMT +# H01pY3Jvc29mdCBDb2RlIFNpZ25pbmcgUENBIDIwMTEwggIiMA0GCSqGSIb3DQEB +# AQUAA4ICDwAwggIKAoICAQCr8PpyEBwurdhuqoIQTTS68rZYIZ9CGypr6VpQqrgG +# OBoESbp/wwwe3TdrxhLYC/A4wpkGsMg51QEUMULTiQ15ZId+lGAkbK+eSZzpaF7S +# 35tTsgosw6/ZqSuuegmv15ZZymAaBelmdugyUiYSL+erCFDPs0S3XdjELgN1q2jz +# y23zOlyhFvRGuuA4ZKxuZDV4pqBjDy3TQJP4494HDdVceaVJKecNvqATd76UPe/7 +# 4ytaEB9NViiienLgEjq3SV7Y7e1DkYPZe7J7hhvZPrGMXeiJT4Qa8qEvWeSQOy2u +# M1jFtz7+MtOzAz2xsq+SOH7SnYAs9U5WkSE1JcM5bmR/U7qcD60ZI4TL9LoDho33 +# X/DQUr+MlIe8wCF0JV8YKLbMJyg4JZg5SjbPfLGSrhwjp6lm7GEfauEoSZ1fiOIl +# XdMhSz5SxLVXPyQD8NF6Wy/VI+NwXQ9RRnez+ADhvKwCgl/bwBWzvRvUVUvnOaEP +# 6SNJvBi4RHxF5MHDcnrgcuck379GmcXvwhxX24ON7E1JMKerjt/sW5+v/N2wZuLB +# l4F77dbtS+dJKacTKKanfWeA5opieF+yL4TXV5xcv3coKPHtbcMojyyPQDdPweGF +# RInECUzF1KVDL3SV9274eCBYLBNdYJWaPk8zhNqwiBfenk70lrC8RqBsmNLg1oiM +# CwIDAQABo4IB7TCCAekwEAYJKwYBBAGCNxUBBAMCAQAwHQYDVR0OBBYEFEhuZOVQ +# BdOCqhc3NyK1bajKdQKVMBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIAQwBBMAsGA1Ud +# DwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFHItOgIxkEO5FAVO +# 4eqnxzHRI4k0MFoGA1UdHwRTMFEwT6BNoEuGSWh0dHA6Ly9jcmwubWljcm9zb2Z0 +# LmNvbS9wa2kvY3JsL3Byb2R1Y3RzL01pY1Jvb0NlckF1dDIwMTFfMjAxMV8wM18y +# Mi5jcmwwXgYIKwYBBQUHAQEEUjBQME4GCCsGAQUFBzAChkJodHRwOi8vd3d3Lm1p +# Y3Jvc29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dDIwMTFfMjAxMV8wM18y +# Mi5jcnQwgZ8GA1UdIASBlzCBlDCBkQYJKwYBBAGCNy4DMIGDMD8GCCsGAQUFBwIB +# FjNodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2RvY3MvcHJpbWFyeWNw +# cy5odG0wQAYIKwYBBQUHAgIwNB4yIB0ATABlAGcAYQBsAF8AcABvAGwAaQBjAHkA +# XwBzAHQAYQB0AGUAbQBlAG4AdAAuIB0wDQYJKoZIhvcNAQELBQADggIBAGfyhqWY +# 4FR5Gi7T2HRnIpsLlhHhY5KZQpZ90nkMkMFlXy4sPvjDctFtg/6+P+gKyju/R6mj +# 82nbY78iNaWXXWWEkH2LRlBV2AySfNIaSxzzPEKLUtCw/WvjPgcuKZvmPRul1LUd +# d5Q54ulkyUQ9eHoj8xN9ppB0g430yyYCRirCihC7pKkFDJvtaPpoLpWgKj8qa1hJ +# Yx8JaW5amJbkg/TAj/NGK978O9C9Ne9uJa7lryft0N3zDq+ZKJeYTQ49C/IIidYf +# wzIY4vDFLc5bnrRJOQrGCsLGra7lstnbFYhRRVg4MnEnGn+x9Cf43iw6IGmYslmJ +# aG5vp7d0w0AFBqYBKig+gj8TTWYLwLNN9eGPfxxvFX1Fp3blQCplo8NdUmKGwx1j +# NpeG39rz+PIWoZon4c2ll9DuXWNB41sHnIc+BncG0QaxdR8UvmFhtfDcxhsEvt9B +# xw4o7t5lL+yX9qFcltgA1qFGvVnzl6UJS0gQmYAf0AApxbGbpT9Fdx41xtKiop96 +# eiL6SJUfq/tHI4D1nvi/a7dLl+LrdXga7Oo3mXkYS//WsyNodeav+vyL6wuA6mk7 +# r/ww7QRMjt/fdW1jkT3RnVZOT7+AVyKheBEyIXrvQQqxP/uozKRdwaGIm1dxVk5I +# RcBCyZt2WwqASGv9eZ/BvW1taslScxMNelDNMYIZjDCCGYgCAQEwgZUwfjELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEoMCYGA1UEAxMfTWljcm9z +# b2Z0IENvZGUgU2lnbmluZyBQQ0EgMjAxMQITMwAAAlKLM6r4lfM52wAAAAACUjAN +# BglghkgBZQMEAgEFAKCBrjAZBgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIBBDAcBgor +# BgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG9w0BCQQxIgQgFlYOVUKP +# feFpp2ZyGIN6cbgH7sLzLcNZk6To9Qy5/jkwQgYKKwYBBAGCNwIBDDE0MDKgFIAS +# AE0AaQBjAHIAbwBzAG8AZgB0oRqAGGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbTAN +# BgkqhkiG9w0BAQEFAASCAQASfzadUptMi09w6TyqkqH2acAq4SQ7IRAUsfgo9VZU +# keZ0yk54zc2JhMq2EdD9BodoqWUHty/Kd/ii54KlaIilcg1eu7fxI23ApMDqRyd5 +# pej24Gi7fpx/kOPedQMRITZj+2DLBWWxlGnlSqLJ88HOhQ7IUPK6n0orv6o3aoW+ +# vmIz1KVf/WpQ0Bmnuf6KvidtlXwq9Z6F6t78v3ulfFhl/rQkar/kqwKh9h2rfTbO +# NL52WccwEzk1uk/7jRY3biG7vegymoFHVgGqHirscNa0XeGXt+GgqAXo/ppXDxFW +# U/9CUSV3oQt+H+4YHoKEuTpNpJ+nRDyz84l4emm5PwWXoYIXFjCCFxIGCisGAQQB +# gjcDAwExghcCMIIW/gYJKoZIhvcNAQcCoIIW7zCCFusCAQMxDzANBglghkgBZQME +# AgEFADCCAVkGCyqGSIb3DQEJEAEEoIIBSASCAUQwggFAAgEBBgorBgEEAYRZCgMB +# MDEwDQYJYIZIAWUDBAIBBQAEIAufT8fqkLAoNnmK8tlDtjF5YfpJIAKOXej3J0eq +# YJSlAgZiF5g+l2EYEzIwMjIwMzMwMjE1MjEwLjY3NVowBIACAfSggdikgdUwgdIx +# CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRt +# b25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1p +# Y3Jvc29mdCBJcmVsYW5kIE9wZXJhdGlvbnMgTGltaXRlZDEmMCQGA1UECxMdVGhh +# bGVzIFRTUyBFU046RDA4Mi00QkZELUVFQkExJTAjBgNVBAMTHE1pY3Jvc29mdCBU +# aW1lLVN0YW1wIFNlcnZpY2WgghFlMIIHFDCCBPygAwIBAgITMwAAAY/zUajrWnLd +# zAABAAABjzANBgkqhkiG9w0BAQsFADB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMK +# V2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0 +# IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0Eg +# MjAxMDAeFw0yMTEwMjgxOTI3NDZaFw0yMzAxMjYxOTI3NDZaMIHSMQswCQYDVQQG +# EwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwG +# A1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMS0wKwYDVQQLEyRNaWNyb3NvZnQg +# SXJlbGFuZCBPcGVyYXRpb25zIExpbWl0ZWQxJjAkBgNVBAsTHVRoYWxlcyBUU1Mg +# RVNOOkQwODItNEJGRC1FRUJBMSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFt +# cCBTZXJ2aWNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAmVc+/rXP +# Fx6Fk4+CpLrubDrLTa3QuAHRVXuy+zsxXwkogkT0a+XWuBabwHyqj8RRiZQQvdvb +# Oq5NRExOeHiaCtkUsQ02ESAe9Cz+loBNtsfCq846u3otWHCJlqkvDrSr7mMBqwcR +# Y7cfhAGfLvlpMSojoAnk7Rej+jcJnYxIeN34F3h9JwANY360oGYCIS7pLOosWV+b +# xug9uiTZYE/XclyYNF6XdzZ/zD/4U5pxT4MZQmzBGvDs+8cDdA/stZfj/ry+i0XU +# YNFPhuqc+UKkwm/XNHB+CDsGQl+ZS0GcbUUun4VPThHJm6mRAwL5y8zptWEIocbT +# eRSTmZnUa2iYH2EOBV7eCjx0Sdb6kLc1xdFRckDeQGR4J1yFyybuZsUP8x0dOsEE +# oLQuOhuKlDLQEg7D6ZxmZJnS8B03ewk/SpVLqsb66U2qyF4BwDt1uZkjEZ7finIo +# UgSz4B7fWLYIeO2OCYxIE0XvwsVop9PvTXTZtGPzzmHU753GarKyuM6oa/qaTzYv +# rAfUb7KYhvVQKxGUPkL9+eKiM7G0qenJCFrXzZPwRWoccAR33PhNEuuzzKZFJ4De +# aTCLg/8uK0Q4QjFRef5n4H+2KQIEibZ7zIeBX3jgsrICbzzSm0QX3SRVmZH//Aqp +# 8YxkwcoI1WCBizv84z9eqwRBdQ4HYcNbQMMCAwEAAaOCATYwggEyMB0GA1UdDgQW +# BBTzBuZ0a65JzuKhzoWb25f7NyNxvDAfBgNVHSMEGDAWgBSfpxVdAF5iXYP05dJl +# pxtTNRnpcjBfBgNVHR8EWDBWMFSgUqBQhk5odHRwOi8vd3d3Lm1pY3Jvc29mdC5j +# b20vcGtpb3BzL2NybC9NaWNyb3NvZnQlMjBUaW1lLVN0YW1wJTIwUENBJTIwMjAx +# MCgxKS5jcmwwbAYIKwYBBQUHAQEEYDBeMFwGCCsGAQUFBzAChlBodHRwOi8vd3d3 +# Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY3Jvc29mdCUyMFRpbWUtU3Rh +# bXAlMjBQQ0ElMjAyMDEwKDEpLmNydDAMBgNVHRMBAf8EAjAAMBMGA1UdJQQMMAoG +# CCsGAQUFBwMIMA0GCSqGSIb3DQEBCwUAA4ICAQDNf9Oo9zyhC5n1jC8iU7NJY39F +# izjhxZwJbJY/Ytwn63plMlTSaBperan566fuRojGJSv3EwZs+RruOU2T/ZRDx4VH +# esLHtclE8GmMM1qTMaZPL8I2FrRmf5Oop4GqcxNdNECBClVZmn0KzFdPMqRa5/0R +# 6CmgqJh0muvImikgHubvohsavPEyyHQa94HD4/LNKd/YIaCKKPz9SA5fAa4phQ4E +# vz2auY9SUluId5MK9H5cjWVwBxCvYAD+1CW9z7GshJlNjqBvWtKO6J0Aemfg6z28 +# g7qc7G/tCtrlH4/y27y+stuwWXNvwdsSd1lvB4M63AuMl9Yp6au/XFknGzJPF6n/ +# uWR6JhQvzh40ILgeThLmYhf8z+aDb4r2OBLG1P2B6aCTW2YQkt7TpUnzI0cKGr21 +# 3CbKtGk/OOIHSsDOxasmeGJ+FiUJCiV15wh3aZT/VT/PkL9E4hDBAwGt49G88gSC +# O0x9jfdDZWdWGbELXlSmA3EP4eTYq7RrolY04G8fGtF0pzuZu43A29zaI9lIr5ul +# KRz8EoQHU6cu0PxUw0B9H8cAkvQxaMumRZ/4fCbqNb4TcPkPcWOI24QYlvpbtT9p +# 31flYElmc5wjGplAky/nkJcT0HZENXenxWtPvt4gcoqppeJPA3S/1D57KL3667ep +# Ir0yV290E2otZbAW8DCCB3EwggVZoAMCAQICEzMAAAAVxedrngKbSZkAAAAAABUw +# DQYJKoZIhvcNAQELBQAwgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5n +# dG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9y +# YXRpb24xMjAwBgNVBAMTKU1pY3Jvc29mdCBSb290IENlcnRpZmljYXRlIEF1dGhv +# cml0eSAyMDEwMB4XDTIxMDkzMDE4MjIyNVoXDTMwMDkzMDE4MzIyNVowfDELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9z +# b2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw +# ggIKAoICAQDk4aZM57RyIQt5osvXJHm9DtWC0/3unAcH0qlsTnXIyjVX9gF/bErg +# 4r25PhdgM/9cT8dm95VTcVrifkpa/rg2Z4VGIwy1jRPPdzLAEBjoYH1qUoNEt6aO +# RmsHFPPFdvWGUNzBRMhxXFExN6AKOG6N7dcP2CZTfDlhAnrEqv1yaa8dq6z2Nr41 +# JmTamDu6GnszrYBbfowQHJ1S/rboYiXcag/PXfT+jlPP1uyFVk3v3byNpOORj7I5 +# LFGc6XBpDco2LXCOMcg1KL3jtIckw+DJj361VI/c+gVVmG1oO5pGve2krnopN6zL +# 64NF50ZuyjLVwIYwXE8s4mKyzbnijYjklqwBSru+cakXW2dg3viSkR4dPf0gz3N9 +# QZpGdc3EXzTdEonW/aUgfX782Z5F37ZyL9t9X4C626p+Nuw2TPYrbqgSUei/BQOj +# 0XOmTTd0lBw0gg/wEPK3Rxjtp+iZfD9M269ewvPV2HM9Q07BMzlMjgK8QmguEOqE +# UUbi0b1qGFphAXPKZ6Je1yh2AuIzGHLXpyDwwvoSCtdjbwzJNmSLW6CmgyFdXzB0 +# kZSU2LlQ+QuJYfM2BjUYhEfb3BvR/bLUHMVr9lxSUV0S2yW6r1AFemzFER1y7435 +# UsSFF5PAPBXbGjfHCBUYP3irRbb1Hode2o+eFnJpxq57t7c+auIurQIDAQABo4IB +# 3TCCAdkwEgYJKwYBBAGCNxUBBAUCAwEAATAjBgkrBgEEAYI3FQIEFgQUKqdS/mTE +# mr6CkTxGNSnPEP8vBO4wHQYDVR0OBBYEFJ+nFV0AXmJdg/Tl0mWnG1M1GelyMFwG +# A1UdIARVMFMwUQYMKwYBBAGCN0yDfQEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly93 +# d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvRG9jcy9SZXBvc2l0b3J5Lmh0bTATBgNV +# HSUEDDAKBggrBgEFBQcDCDAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNV +# HQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBTV9lbLj+iiXGJo +# 0T2UkFvXzpoYxDBWBgNVHR8ETzBNMEugSaBHhkVodHRwOi8vY3JsLm1pY3Jvc29m +# dC5jb20vcGtpL2NybC9wcm9kdWN0cy9NaWNSb29DZXJBdXRfMjAxMC0wNi0yMy5j +# cmwwWgYIKwYBBQUHAQEETjBMMEoGCCsGAQUFBzAChj5odHRwOi8vd3d3Lm1pY3Jv +# c29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dF8yMDEwLTA2LTIzLmNydDAN +# BgkqhkiG9w0BAQsFAAOCAgEAnVV9/Cqt4SwfZwExJFvhnnJL/Klv6lwUtj5OR2R4 +# sQaTlz0xM7U518JxNj/aZGx80HU5bbsPMeTCj/ts0aGUGCLu6WZnOlNN3Zi6th54 +# 2DYunKmCVgADsAW+iehp4LoJ7nvfam++Kctu2D9IdQHZGN5tggz1bSNU5HhTdSRX +# ud2f8449xvNo32X2pFaq95W2KFUn0CS9QKC/GbYSEhFdPSfgQJY4rPf5KYnDvBew +# VIVCs/wMnosZiefwC2qBwoEZQhlSdYo2wh3DYXMuLGt7bj8sCXgU6ZGyqVvfSaN0 +# DLzskYDSPeZKPmY7T7uG+jIa2Zb0j/aRAfbOxnT99kxybxCrdTDFNLB62FD+Cljd +# QDzHVG2dY3RILLFORy3BFARxv2T5JL5zbcqOCb2zAVdJVGTZc9d/HltEAY5aGZFr +# DZ+kKNxnGSgkujhLmm77IVRrakURR6nxt67I6IleT53S0Ex2tVdUCbFpAUR+fKFh +# bHP+CrvsQWY9af3LwUFJfn6Tvsv4O+S3Fb+0zj6lMVGEvL8CwYKiexcdFYmNcP7n +# tdAoGokLjzbaukz5m/8K6TT4JDVnK+ANuOaMmdbhIurwJ0I9JZTmdHRbatGePu1+ +# oDEzfbzL6Xu/OHBE0ZDxyKs6ijoIYn/ZcGNTTY3ugm2lBRDBcQZqELQdVTNYs6Fw +# ZvKhggLUMIICPQIBATCCAQChgdikgdUwgdIxCzAJBgNVBAYTAlVTMRMwEQYDVQQI +# EwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3Nv +# ZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVsYW5kIE9wZXJh +# dGlvbnMgTGltaXRlZDEmMCQGA1UECxMdVGhhbGVzIFRTUyBFU046RDA4Mi00QkZE +# LUVFQkExJTAjBgNVBAMTHE1pY3Jvc29mdCBUaW1lLVN0YW1wIFNlcnZpY2WiIwoB +# ATAHBgUrDgMCGgMVAD5NL4IEdudIBwdGoCaV0WBbQZpqoIGDMIGApH4wfDELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9z +# b2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwDQYJKoZIhvcNAQEFBQACBQDl7ubRMCIY +# DzIwMjIwMzMwMjIyNTIxWhgPMjAyMjAzMzEyMjI1MjFaMHQwOgYKKwYBBAGEWQoE +# ATEsMCowCgIFAOXu5tECAQAwBwIBAAICCl0wBwIBAAICET4wCgIFAOXwOFECAQAw +# NgYKKwYBBAGEWQoEAjEoMCYwDAYKKwYBBAGEWQoDAqAKMAgCAQACAwehIKEKMAgC +# AQACAwGGoDANBgkqhkiG9w0BAQUFAAOBgQBjidsY/frY7jVCC5L43gm9MoaMnxjT +# 8gVLXcdbhJzGYftD84JlTWvw/WyGSHpoeg+oCe01IIgdTicq0MKjxoca+LefqaS8 +# vlAf9s1JdIa2Je7u5CzOt2Gru9C00znmx6hI8XCkV+Gj+ZopC4kESoaSGiyaqt+S +# YZHTJ1hNVg79dTGCBA0wggQJAgEBMIGTMHwxCzAJBgNVBAYTAlVTMRMwEQYDVQQI +# EwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3Nv +# ZnQgQ29ycG9yYXRpb24xJjAkBgNVBAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1wIFBD +# QSAyMDEwAhMzAAABj/NRqOtact3MAAEAAAGPMA0GCWCGSAFlAwQCAQUAoIIBSjAa +# BgkqhkiG9w0BCQMxDQYLKoZIhvcNAQkQAQQwLwYJKoZIhvcNAQkEMSIEIH26YOfE +# UVgRTz6SOkQa9frVJcK+7EUHy9BNy3DCqIG2MIH6BgsqhkiG9w0BCRACLzGB6jCB +# 5zCB5DCBvQQgl3IFT+LGxguVjiKm22ItmO6dFDWW8nShu6O6g8yFxx8wgZgwgYCk +# fjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMH +# UmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQD +# Ex1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMAITMwAAAY/zUajrWnLdzAAB +# AAABjzAiBCB0UdAt+5LFhsYAoTd2lnVnE0JExPii63XeZzU2N7NElDANBgkqhkiG +# 9w0BAQsFAASCAgCSm1motOpztHnppo7OFCG/NumEpmOgH4Ma58pjV7mgxfoLQllg +# lLpGzBwlXfHSdOLg/q0ip6REZrSnvPw3rffeLl7oTgfAnUZTyGCQbXZgYKmHyqBN +# ys7PaaULzR4UrsyhJ+lEQwY3aombMshmo/rwolFsgUCauvCpVPiPhpHy8+2Wqm4r +# 9Xj1X7H9THSzFJmD3Qu6bT9yburwrSZNEtnYybO+SYYgzjy3CiTfAUag/iETGj4k +# C5K3dfxuz6qWfe0Qr3bT7sLlA0FjQn3ZSNyjPqHr3/1Uf2S6VYKipYvdvLezbJ8X +# 9SE5QUJPc+WWHDMd7LW+EEak/CF/N+I77bHuMN1iyiG7DRGIbOge3jKtD9XgBb25 +# N2+4ilsoN3GYe63bMGsL+525ApITbcnhxbpd35UiZP6Nw9ab9WKYIUILI4vdjSyx +# LX+HZZV1cpqU4d5HjPS9exHgDS6RwJvYtvx9N0moBJYz8X+C4HDJKO6EAFY1i8tT +# HKu3TGsqofehtTtlc9QCEimSTBSmeGxEiPmSDjwfaO2erTzwnJcZL5UqDNHoEouN +# Z5+u1f2LfIidCBznb4tRlG9GNe1JKF3bp16tsNwD6GFuKfcDaP8/+ee14qzHPUJm +# niaVz5RlKUh2M0Uphl+hmnHzIWHOjhUQsUSaoyXy0n+Wz01P1TJ+CBiA1w== +# SIG # End signature block diff --git a/externals/vcpkg/scripts/azure-pipelines/Create-PRDiff.ps1 b/externals/vcpkg/scripts/azure-pipelines/Create-PRDiff.ps1 new file mode 100755 index 000000000..599118089 --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/Create-PRDiff.ps1 @@ -0,0 +1,20 @@ +[CmdletBinding(PositionalBinding=$False)] +Param( + [Parameter(Mandatory=$True)] + [String]$DiffFile +) + +Start-Process -FilePath 'git' -ArgumentList 'diff' ` + -NoNewWindow -Wait ` + -RedirectStandardOutput $DiffFile +if (0 -ne (Get-Item -LiteralPath $DiffFile).Length) +{ + $msg = @( + 'The formatting of the files in the repo were not what we expected,', + 'or the documentation was not regenerated.', + 'Please access the diff from format.diff in the build artifacts,' + 'and apply the patch with `git apply`' + ) + Write-Error ($msg -join "`n") + throw +} \ No newline at end of file diff --git a/externals/vcpkg/scripts/azure-pipelines/azure-pipelines.yml b/externals/vcpkg/scripts/azure-pipelines/azure-pipelines.yml new file mode 100755 index 000000000..02dc9ede0 --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/azure-pipelines.yml @@ -0,0 +1,73 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT +# +variables: + windows-pool: 'PrWin-2022-05-19' + linux-pool: 'PrLin-2022-05-19' + osx-pool: 'PrOsx-2022-02-04' + +parameters: + - name: vcpkgToolSha + displayName: 'Custom SHA of vcpkg-tool to use rather than bootstrap' + type: string + default: 'use default' + +jobs: +- template: windows/azure-pipelines.yml + parameters: + triplet: x86-windows + jobName: x86_windows + poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} + +- template: windows/azure-pipelines.yml + parameters: + triplet: x64-windows + jobName: x64_windows + poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} + +- template: windows/azure-pipelines.yml + parameters: + triplet: x64-windows-static + jobName: x64_windows_static + poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} + +- template: windows/azure-pipelines.yml + parameters: + triplet: x64-windows-static-md + jobName: x64_windows_static_md + poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} + +- template: windows/azure-pipelines.yml + parameters: + triplet: x64-uwp + jobName: x64_uwp + poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} + +- template: windows/azure-pipelines.yml + parameters: + triplet: arm64-windows + jobName: arm64_windows + poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} + +- template: windows/azure-pipelines.yml + parameters: + triplet: arm-uwp + jobName: arm_uwp + poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} + +- template: osx/azure-pipelines.yml + parameters: + poolName: $(osx-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} + +- template: linux/azure-pipelines.yml + parameters: + poolName: $(linux-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} diff --git a/externals/vcpkg/scripts/azure-pipelines/bootstrap-from-source.sh b/externals/vcpkg/scripts/azure-pipelines/bootstrap-from-source.sh new file mode 100755 index 000000000..b998568eb --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/bootstrap-from-source.sh @@ -0,0 +1,9 @@ +#!/bin/sh +set -e + +git clone https://github.com/microsoft/vcpkg-tool vcpkg-tool +git -C vcpkg-tool switch -d $1 +rm -rf build.x64.release +cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DVCPKG_DEVELOPMENT_WARNINGS=OFF -DVCPKG_WARNINGS_AS_ERRORS=OFF -DVCPKG_BUILD_FUZZING=OFF -DVCPKG_BUILD_TLS12_DOWNLOADER=OFF -B build.x64.release -S vcpkg-tool +ninja -C build.x64.release +mv build.x64.release/vcpkg vcpkg diff --git a/externals/vcpkg/scripts/azure-pipelines/create-vmss-helpers.psm1 b/externals/vcpkg/scripts/azure-pipelines/create-vmss-helpers.psm1 new file mode 100755 index 000000000..8ebe8070e --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/create-vmss-helpers.psm1 @@ -0,0 +1,352 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT + +<# +.SYNOPSIS +Returns whether there's a name collision in the resource group. + +.DESCRIPTION +Find-ResourceGroupNameCollision takes a list of resources, and checks if $Test +collides names with any of the resources. + +.PARAMETER Test +The name to test. + +.PARAMETER Resources +The list of resources. +#> +function Find-ResourceGroupNameCollision { + [CmdletBinding()] + Param([string]$Test, $Resources) + + foreach ($resource in $Resources) { + if ($resource.ResourceGroupName -eq $Test) { + return $true + } + } + + return $false +} + +<# +.SYNOPSIS +Attempts to find a name that does not collide with any resources in the resource group. + +.DESCRIPTION +Find-ResourceGroupName takes a set of resources from Get-AzResourceGroup, and finds the +first name in {$Prefix, $Prefix-1, $Prefix-2, ...} such that the name doesn't collide with +any of the resources in the resource group. + +.PARAMETER Prefix +The prefix of the final name; the returned name will be of the form "$Prefix(-[1-9][0-9]*)?" +#> +function Find-ResourceGroupName { + [CmdletBinding()] + Param([string] $Prefix) + + $resources = Get-AzResourceGroup + $result = $Prefix + $suffix = 0 + while (Find-ResourceGroupNameCollision -Test $result -Resources $resources) { + $suffix++ + $result = "$Prefix-$suffix" + } + + return $result +} + +<# +.SYNOPSIS +Returns whether there's a name collision for an image in the resource group. + +.DESCRIPTION +Find-ImageNameCollision takes a list of images, and checks if $Test +collides names with any of the image names. + +.PARAMETER Test +The name to test. + +.PARAMETER Images +The list of images. +#> +function Find-ImageNameCollision { + [CmdletBinding()] + Param([string]$Test, $Images) + + foreach ($resource in $Images) { + if ($resource.Name -eq $Test) { + return $true + } + } + + return $false +} + +<# +.SYNOPSIS +Attempts to find a name that does not collide with any images in the resource group. + +.DESCRIPTION +Find-ResourceGroupName takes a set of resources from Get-AzResourceGroup, and finds the +first name in {$Prefix, $Prefix-1, $Prefix-2, ...} such that the name doesn't collide with +any of the resources in the resource group. + +.PARAMETER Prefix +The prefix of the final name; the returned name will be of the form "$Prefix(-[1-9][0-9]*)?" +#> +function Find-ImageName { + [CmdLetBinding()] + Param([string]$ResourceGroupName, [string]$Prefix) + + $images = Get-AzImage -ResourceGroupName $ResourceGroupName + $result = $Prefix + $suffix = 0 + while (Find-ImageNameCollision -Test $result -Images $images) { + $suffix++ + $result = "$Prefix-$suffix" + } + + return $result +} + +<# +.SYNOPSIS +Generates a random password. + +.DESCRIPTION +New-Password generates a password, randomly, of length $Length, containing +only alphanumeric characters, underscore, and dash. + +.PARAMETER Length +The length of the returned password. +#> +function New-Password { + Param ([int] $Length = 32) + + # This 64-character alphabet generates 6 bits of entropy per character. + # The power-of-2 alphabet size allows us to select a character by masking a random Byte with bitwise-AND. + $alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-" + $mask = 63 + if ($alphabet.Length -ne 64) { + throw 'Bad alphabet length' + } + + [Byte[]]$randomData = [Byte[]]::new($Length) + $rng = $null + try { + $rng = [System.Security.Cryptography.RandomNumberGenerator]::Create() + $rng.GetBytes($randomData) + } + finally { + if ($null -ne $rng) { + $rng.Dispose() + } + } + + $result = '' + for ($idx = 0; $idx -lt $Length; $idx++) { + $result += $alphabet[$randomData[$idx] -band $mask] + } + + return $result +} + +<# +.SYNOPSIS +Waits for the shutdown of the specified resource. + +.DESCRIPTION +Wait-Shutdown takes a VM, and checks if there's a 'PowerState/stopped' +code; if there is, it returns. If there isn't, it waits ten seconds and +tries again. + +.PARAMETER ResourceGroupName +The name of the resource group to look up the VM in. + +.PARAMETER Name +The name of the virtual machine to wait on. +#> +function Wait-Shutdown { + [CmdletBinding()] + Param([string]$ResourceGroupName, [string]$Name) + + Write-Host "Waiting for $Name to stop..." + while ($true) { + $Vm = Get-AzVM -ResourceGroupName $ResourceGroupName -Name $Name -Status + $highestStatus = $Vm.Statuses.Count + for ($idx = 0; $idx -lt $highestStatus; $idx++) { + if ($Vm.Statuses[$idx].Code -eq 'PowerState/stopped') { + return + } + } + + Write-Host "... not stopped yet, sleeping for 10 seconds" + Start-Sleep -Seconds 10 + } +} + +<# +.SYNOPSIS +Sanitizes a name to be used in a storage account. + +.DESCRIPTION +Sanitize-Name takes a string, and removes all of the '-'s and +lowercases the string, since storage account names must have no +'-'s and must be completely lowercase alphanumeric. It then makes +certain that the length of the string is not greater than 24, +since that is invalid. + +.PARAMETER RawName +The name to sanitize. +#> +function Sanitize-Name { + [CmdletBinding()] + Param( + [string]$RawName + ) + + $result = $RawName.Replace('-', '').ToLowerInvariant() + if ($result.Length -gt 24) { + Write-Error 'Sanitized name for storage account $result was too long.' + throw + } + + return $result +} + +<# +.SYNOPSIS +Creates a new Azure virtual network with locked down firewall rules. + +.PARAMETER ResourceGroupName +The name of the resource group in which the virtual network should be created. + +.PARAMETER Location +The location (region) where the network is to be created. +#> +function Create-LockedDownNetwork { + [CmdletBinding()] + Param( + [parameter(Mandatory=$true)] + [string]$ResourceGroupName, + [parameter(Mandatory=$true)] + [string]$Location + ) + + $allFirewallRules = @() + + $allFirewallRules += New-AzNetworkSecurityRuleConfig ` + -Name AllowHTTP ` + -Description 'Allow HTTP(S)' ` + -Access Allow ` + -Protocol Tcp ` + -Direction Outbound ` + -Priority 1008 ` + -SourceAddressPrefix * ` + -SourcePortRange * ` + -DestinationAddressPrefix * ` + -DestinationPortRange @(80, 443) + + $allFirewallRules += New-AzNetworkSecurityRuleConfig ` + -Name AllowSFTP ` + -Description 'Allow (S)FTP' ` + -Access Allow ` + -Protocol Tcp ` + -Direction Outbound ` + -Priority 1009 ` + -SourceAddressPrefix * ` + -SourcePortRange * ` + -DestinationAddressPrefix * ` + -DestinationPortRange @(21, 22) + + $allFirewallRules += New-AzNetworkSecurityRuleConfig ` + -Name AllowDNS ` + -Description 'Allow DNS' ` + -Access Allow ` + -Protocol * ` + -Direction Outbound ` + -Priority 1010 ` + -SourceAddressPrefix * ` + -SourcePortRange * ` + -DestinationAddressPrefix * ` + -DestinationPortRange 53 + + $allFirewallRules += New-AzNetworkSecurityRuleConfig ` + -Name AllowGit ` + -Description 'Allow git' ` + -Access Allow ` + -Protocol Tcp ` + -Direction Outbound ` + -Priority 1011 ` + -SourceAddressPrefix * ` + -SourcePortRange * ` + -DestinationAddressPrefix * ` + -DestinationPortRange 9418 + + $allFirewallRules += New-AzNetworkSecurityRuleConfig ` + -Name DenyElse ` + -Description 'Deny everything else' ` + -Access Deny ` + -Protocol * ` + -Direction Outbound ` + -Priority 1013 ` + -SourceAddressPrefix * ` + -SourcePortRange * ` + -DestinationAddressPrefix * ` + -DestinationPortRange * + + $NetworkSecurityGroupName = $ResourceGroupName + 'NetworkSecurity' + $NetworkSecurityGroup = New-AzNetworkSecurityGroup ` + -Name $NetworkSecurityGroupName ` + -ResourceGroupName $ResourceGroupName ` + -Location $Location ` + -SecurityRules $allFirewallRules + + $SubnetName = $ResourceGroupName + 'Subnet' + $Subnet = New-AzVirtualNetworkSubnetConfig ` + -Name $SubnetName ` + -AddressPrefix "10.0.0.0/16" ` + -NetworkSecurityGroup $NetworkSecurityGroup ` + -ServiceEndpoint "Microsoft.Storage" + + $VirtualNetworkName = $ResourceGroupName + 'Network' + $VirtualNetwork = New-AzVirtualNetwork ` + -Name $VirtualNetworkName ` + -ResourceGroupName $ResourceGroupName ` + -Location $Location ` + -AddressPrefix "10.0.0.0/16" ` + -Subnet $Subnet + + return $VirtualNetwork +} + +function Invoke-AzVMRunCommandWithRetries { + $result = $null + $success = $false + $attempt = 0 + while ($success -eq $false) { + try { + ++$attempt + Write-Host "Command attempt $attempt..." + $result = Invoke-AzVMRunCommand @args + $success = $true + } catch { + Write-Host "Running command failed. $_ Retrying after 10 seconds..." + Start-Sleep -Seconds 10 + if ($attempt -eq 5) { + Write-Error "Running command failed too many times. Giving up!" + throw $_ + } + } + } + + return $result +} + +Export-ModuleMember -Function Find-ResourceGroupName +Export-ModuleMember -Function Find-ImageName +Export-ModuleMember -Function New-Password +Export-ModuleMember -Function Wait-Shutdown +Export-ModuleMember -Function Sanitize-Name +Export-ModuleMember -Function Create-LockedDownNetwork +Export-ModuleMember -Function Invoke-AzVMRunCommandWithRetries diff --git a/externals/vcpkg/scripts/azure-pipelines/linux/azure-pipelines.yml b/externals/vcpkg/scripts/azure-pipelines/linux/azure-pipelines.yml new file mode 100755 index 000000000..3b0d41be4 --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -0,0 +1,78 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT +# + +parameters: + - name: vcpkgToolSha + displayName: 'Custom SHA of vcpkg-tool to use rather than bootstrap' + type: string + default: 'use default' + - name: poolName + type: string + +jobs: +- job: x64_linux + pool: + name: ${{ parameters.poolName }} + workspace: + clean: resources + timeoutInMinutes: 1440 # 1 day + variables: + - name: WORKING_ROOT + value: /mnt/vcpkg-ci + - name: VCPKG_DOWNLOADS + value: /mnt/vcpkg-ci/downloads + - group: vcpkg-asset-caching-credentials + - name: X_VCPKG_ASSET_SOURCES + value: "x-azurl,$(root-url-ea),$(sas-ea),readwrite" + - group: vcpkg-binary-caching-credentials + - name: X_VCPKG_BINARY_SOURCE_STUB + value: "x-azblob,$(root-bin-url-ea),$(sas-bin-ea)" + + steps: + # Note: /mnt is the Azure machines' temporary disk. + - bash: | + sudo mkdir /home/agent -m=777 + sudo chown `id -u` /home/agent + sudo mkdir ${{ variables.WORKING_ROOT }} -m=777 + sudo mkdir ${{ variables.VCPKG_DOWNLOADS }} -m=777 + exit 0 + displayName: 'Create working directories' + - bash: ./bootstrap-vcpkg.sh + displayName: 'Bootstrap vcpkg' + condition: eq('use default', '${{ parameters.vcpkgToolSha }}') + - bash: ./scripts/azure-pipelines/bootstrap-from-source.sh ${{ parameters.vcpkgToolSha }} + displayName: "Build vcpkg with CMake" + condition: ne('use default', '${{ parameters.vcpkgToolSha }}') + - task: PowerShell@2 + displayName: '*** Test Modified Ports' + inputs: + failOnStderr: true + filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' + arguments: '-Triplet x64-linux -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' + pwsh: true + - task: PublishBuildArtifacts@1 + displayName: 'Publish Artifact: failure logs for x64-linux' + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/failure-logs' + ArtifactName: 'failure logs for x64-linux' + condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True') + - bash: | + python3 scripts/file_script.py /mnt/vcpkg-ci/installed/vcpkg/info/ + displayName: 'Build a file list for all packages' + condition: always() + - task: PublishBuildArtifacts@1 + displayName: 'Publish Artifact: file lists for x64-linux' + condition: always() + inputs: + PathtoPublish: scripts/list_files + ArtifactName: 'file lists for x64-linux' + - task: PublishTestResults@2 + displayName: 'Publish Test Results' + condition: ne(variables['XML_RESULTS_FILE'], '') + inputs: + testRunTitle: x64-linux + testResultsFormat: xUnit + testResultsFiles: $(XML_RESULTS_FILE) + platform: x64-linux + configuration: static diff --git a/externals/vcpkg/scripts/azure-pipelines/linux/create-image.ps1 b/externals/vcpkg/scripts/azure-pipelines/linux/create-image.ps1 new file mode 100755 index 000000000..932d25aec --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/linux/create-image.ps1 @@ -0,0 +1,177 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT +# + +<# +.SYNOPSIS +Creates a Linux virtual machine image, set up for vcpkg's CI. + +.DESCRIPTION +create-image.ps1 creates an Azure Linux VM image, set up for vcpkg's CI system. +This script assumes you have installed Azure tools into PowerShell by following the instructions +at https://docs.microsoft.com/en-us/powershell/azure/install-az-ps?view=azps-3.6.1 +or are running from Azure Cloud Shell. + +This script assumes you have installed the OpenSSH Client optional Windows component. +#> + +$Location = 'eastasia' +$Prefix = 'Lin-' +$Prefix += (Get-Date -Format 'yyyy-MM-dd') +$VMSize = 'Standard_D8a_v4' +$ProtoVMName = 'PROTOTYPE' +$ErrorActionPreference = 'Stop' + +$ProgressActivity = 'Creating Linux Image' +$TotalProgress = 11 +$CurrentProgress = 1 + +Import-Module "$PSScriptRoot/../create-vmss-helpers.psm1" -DisableNameChecking + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Creating SSH key' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$sshDir = [System.IO.Path]::GetTempPath() + [System.IO.Path]::GetRandomFileName() +mkdir $sshDir +try { + ssh-keygen.exe -q -b 2048 -t rsa -f "$sshDir/key" -P [string]::Empty + $sshPublicKey = Get-Content "$sshDir/key.pub" +} finally { + Remove-Item $sshDir -Recurse -Force +} + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Creating resource group' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$ResourceGroupName = Find-ResourceGroupName $Prefix +$AdminPW = New-Password +New-AzResourceGroup -Name $ResourceGroupName -Location $Location +$AdminPWSecure = ConvertTo-SecureString $AdminPW -AsPlainText -Force +$Credential = New-Object System.Management.Automation.PSCredential ("AdminUser", $AdminPWSecure) + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Creating virtual network' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$VirtualNetwork = Create-LockedDownNetwork -ResourceGroupName $ResourceGroupName -Location $Location + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Creating prototype VM' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$NicName = $ResourceGroupName + 'NIC' +$Nic = New-AzNetworkInterface ` + -Name $NicName ` + -ResourceGroupName $ResourceGroupName ` + -Location $Location ` + -Subnet $VirtualNetwork.Subnets[0] + +$VM = New-AzVMConfig -Name $ProtoVMName -VMSize $VMSize -Priority 'Spot' -MaxPrice -1 +$VM = Set-AzVMOperatingSystem ` + -VM $VM ` + -Linux ` + -ComputerName $ProtoVMName ` + -Credential $Credential ` + -DisablePasswordAuthentication + +$VM = Add-AzVMNetworkInterface -VM $VM -Id $Nic.Id +$VM = Set-AzVMSourceImage ` + -VM $VM ` + -PublisherName 'Canonical' ` + -Offer '0001-com-ubuntu-server-focal' ` + -Skus '20_04-lts' ` + -Version latest + +$VM = Set-AzVMBootDiagnostic -VM $VM -Disable + +$VM = Add-AzVMSshPublicKey ` + -VM $VM ` + -KeyData $sshPublicKey ` + -Path "/home/AdminUser/.ssh/authorized_keys" + +New-AzVm ` + -ResourceGroupName $ResourceGroupName ` + -Location $Location ` + -VM $VM + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Waiting 1 minute to let Azure VM customizations be applied' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +Start-Sleep -Seconds 60 + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Restarting VM' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +Restart-AzVm -ResourceGroupName $ResourceGroupName -Name $ProtoVMName + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Running provisioning script provision-image.sh in VM' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$ProvisionImageResult = Invoke-AzVMRunCommandWithRetries ` + -ResourceGroupName $ResourceGroupName ` + -VMName $ProtoVMName ` + -CommandId 'RunShellScript' ` + -ScriptPath "$PSScriptRoot\provision-image.sh" + +Write-Host "provision-image.sh output: $($ProvisionImageResult.value.Message)" + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Restarting VM' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Converting VM to Image' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +Stop-AzVM ` + -ResourceGroupName $ResourceGroupName ` + -Name $ProtoVMName ` + -Force + +Set-AzVM ` + -ResourceGroupName $ResourceGroupName ` + -Name $ProtoVMName ` + -Generalized + +$VM = Get-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName +$ImageConfig = New-AzImageConfig -Location $Location -SourceVirtualMachineId $VM.ID +$ImageName = Find-ImageName -ResourceGroupName 'vcpkg-image-minting' -Prefix $Prefix +New-AzImage -Image $ImageConfig -ImageName $ImageName -ResourceGroupName 'vcpkg-image-minting' + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Deleting unused temporary resources' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +Remove-AzResourceGroup $ResourceGroupName -Force + +#################################################################################################### +Write-Progress -Activity $ProgressActivity -Completed +Write-Host "Generated Image: $ImageName" +Write-Host 'Finished!' diff --git a/externals/vcpkg/scripts/azure-pipelines/linux/create-vmss.ps1 b/externals/vcpkg/scripts/azure-pipelines/linux/create-vmss.ps1 new file mode 100755 index 000000000..cbbb9b5af --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/linux/create-vmss.ps1 @@ -0,0 +1,108 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT +# + +<# +.SYNOPSIS +Creates a Linux virtual machine scale set, set up for vcpkg's CI. + +.DESCRIPTION +create-vmss.ps1 creates an Azure Linux VM scale set, set up for vcpkg's CI +system. See https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/overview +for more information. + +This script assumes you have installed Azure tools into PowerShell by following the instructions +at https://docs.microsoft.com/en-us/powershell/azure/install-az-ps?view=azps-3.6.1 +or are running from Azure Cloud Shell. + +This script assumes you have installed the OpenSSH Client optional Windows component. + + +.PARAMETER ImageName +The name of the image to deploy into the scale set. +#> + +[CmdLetBinding()] +Param( + [parameter(Mandatory=$true)] + [string]$ImageName +) + +$Location = 'eastasia' +$Prefix = 'PrLin-' +$Prefix += (Get-Date -Format 'yyyy-MM-dd') +$VMSize = 'Standard_D32a_v4' +$LiveVMPrefix = 'BUILD' +$ErrorActionPreference = 'Stop' + +Import-Module "$PSScriptRoot/../create-vmss-helpers.psm1" -DisableNameChecking + +$sshDir = [System.IO.Path]::GetTempPath() + [System.IO.Path]::GetRandomFileName() +mkdir $sshDir +try { + ssh-keygen.exe -q -b 2048 -t rsa -f "$sshDir/key" -P [string]::Empty + $sshPublicKey = Get-Content "$sshDir/key.pub" +} finally { + Remove-Item $sshDir -Recurse -Force +} +$ResourceGroupName = Find-ResourceGroupName $Prefix +$AdminPW = New-Password +$Image = Get-AzImage -ResourceGroupName 'vcpkg-image-minting' -ImageName $ImageName + +New-AzResourceGroup -Name $ResourceGroupName -Location $Location + +$VirtualNetwork = Create-LockedDownNetwork -ResourceGroupName $ResourceGroupName -Location $Location +$VmssIpConfigName = $ResourceGroupName + 'VmssIpConfig' +$VmssIpConfig = New-AzVmssIpConfig -SubnetId $VirtualNetwork.Subnets[0].Id -Primary -Name $VmssIpConfigName +$VmssName = $ResourceGroupName + 'Vmss' +$Vmss = New-AzVmssConfig ` + -Location $Location ` + -SkuCapacity 0 ` + -SkuName $VMSize ` + -SkuTier 'Standard' ` + -Overprovision $false ` + -UpgradePolicyMode Manual ` + -EvictionPolicy Delete ` + -Priority Spot ` + -MaxPrice -1 + +$NicName = $ResourceGroupName + 'NIC' +New-AzNetworkInterface ` + -Name $NicName ` + -ResourceGroupName $ResourceGroupName ` + -Location $Location ` + -Subnet $VirtualNetwork.Subnets[0] + +$Vmss = Add-AzVmssNetworkInterfaceConfiguration ` + -VirtualMachineScaleSet $Vmss ` + -Primary $true ` + -IpConfiguration $VmssIpConfig ` + -NetworkSecurityGroupId $VirtualNetwork.Subnets[0].NetworkSecurityGroup.Id ` + -Name $NicName + +$VmssPublicKey = New-Object -TypeName 'Microsoft.Azure.Management.Compute.Models.SshPublicKey' ` + -ArgumentList @('/home/AdminUser/.ssh/authorized_keys', $sshPublicKey) + +$Vmss = Set-AzVmssOsProfile ` + -VirtualMachineScaleSet $Vmss ` + -ComputerNamePrefix $LiveVMPrefix ` + -AdminUsername AdminUser ` + -AdminPassword $AdminPW ` + -LinuxConfigurationDisablePasswordAuthentication $true ` + -PublicKey @($VmssPublicKey) + +$Vmss = Set-AzVmssStorageProfile ` + -VirtualMachineScaleSet $Vmss ` + -OsDiskCreateOption 'FromImage' ` + -OsDiskCaching ReadOnly ` + -DiffDiskSetting Local ` + -ImageReferenceId $Image.Id + +New-AzVmss ` + -ResourceGroupName $ResourceGroupName ` + -Name $VmssName ` + -VirtualMachineScaleSet $Vmss + +Write-Host "Location: $Location" +Write-Host "Resource group name: $ResourceGroupName" +Write-Host 'Finished!' diff --git a/externals/vcpkg/scripts/azure-pipelines/linux/provision-image.sh b/externals/vcpkg/scripts/azure-pipelines/linux/provision-image.sh new file mode 100755 index 000000000..4855bd913 --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/linux/provision-image.sh @@ -0,0 +1,78 @@ +#!/bin/bash +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT +# + +export DEBIAN_FRONTEND=noninteractive + +apt-get -y update +apt-get -y dist-upgrade +# Install common build dependencies +APT_PACKAGES="at curl unzip tar libxt-dev gperf libxaw7-dev cifs-utils \ + build-essential g++ gfortran zip libx11-dev libxkbcommon-x11-dev libxi-dev \ + libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev libxxf86vm-dev \ + libxcursor-dev yasm libnuma1 libnuma-dev python-six python3-six python-yaml \ + flex libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev \ + xutils-dev dh-autoreconf autoconf-archive libgles2-mesa-dev ruby-full \ + pkg-config meson nasm cmake ninja-build" + +# Additionally required by qt5-base +APT_PACKAGES="$APT_PACKAGES libxext-dev libxfixes-dev libxrender-dev \ + libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-util0-dev" + +# Additionally required by qt5-base for qt5-x11extras +APT_PACKAGES="$APT_PACKAGES libxkbcommon-dev libxcb-keysyms1-dev \ + libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync0-dev \ + libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev \ + libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev" + +# Additionally required by libhdfs3 +APT_PACKAGES="$APT_PACKAGES libkrb5-dev" + +# Additionally required by kf5windowsystem +APT_PACKAGES="$APT_PACKAGES libxcb-res0-dev" + +# Additionally required by mesa +APT_PACKAGES="$APT_PACKAGES python3-setuptools python3-mako" + +# Additionally required by some packages to install additional python packages +APT_PACKAGES="$APT_PACKAGES python3-pip python3-venv" + +# Additionally required by qtwebengine +APT_PACKAGES="$APT_PACKAGES nodejs" + +# Additionally required by qtwayland +APT_PACKAGES="$APT_PACKAGES libwayland-dev" + +# Additionally required by all GN projects +APT_PACKAGES="$APT_PACKAGES python2 python-is-python3" + +# Additionally required by libctl +APT_PACKAGES="$APT_PACKAGES guile-2.2-dev" + +# Additionally required by gtk +APT_PACKAGES="$APT_PACKAGES libxdamage-dev" + +# Additionally required/installed by Azure DevOps Scale Set Agents +APT_PACKAGES="$APT_PACKAGES liblttng-ust0 libkrb5-3 zlib1g libicu66" + +apt-get -y install $APT_PACKAGES + +# Install the latest Haskell stack for bond +curl -sSL https://get.haskellstack.org/ | sh + +# Install CUDA +wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin +mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600 +apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub +add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /" +apt-get -y update +apt-get install -y --no-install-recommends cuda-compiler-11-6 cuda-libraries-dev-11-6 cuda-driver-dev-11-6 \ + cuda-cudart-dev-11-6 libcublas-11-6 libcurand-dev-11-6 cuda-nvml-dev-11-6 libcudnn8-dev libnccl2 libnccl-dev + +# Install PowerShell +wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb +dpkg -i packages-microsoft-prod.deb +apt-get update +add-apt-repository universe +apt-get install -y powershell diff --git a/externals/vcpkg/scripts/azure-pipelines/osx/Install-Prerequisites.ps1 b/externals/vcpkg/scripts/azure-pipelines/osx/Install-Prerequisites.ps1 new file mode 100755 index 000000000..979c41a74 --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/osx/Install-Prerequisites.ps1 @@ -0,0 +1,128 @@ +#!pwsh +#Requires -Version 6.0 + +<# +.SYNOPSIS +Installs the set of prerequisites for the macOS CI hosts. + +.DESCRIPTION +Install-Prerequisites.ps1 installs all of the necessary prerequisites +to run the vcpkg macOS CI in a vagrant virtual machine, +skipping all prerequisites that are already installed and of the right version. + +.INPUTS +None + +.OUTPUTS +None +#> +[CmdletBinding()] +Param() + +Set-StrictMode -Version 2 + +if (-not $IsMacOS) { + Write-Error 'This script should only be run on a macOS host' + throw +} + +Import-Module "$PSScriptRoot/Utilities.psm1" + +$Installables = Get-Content "$PSScriptRoot/configuration/installables.json" | ConvertFrom-Json + +$Installables.Applications | ForEach-Object { + $VersionCommand = $_.VersionCommand + $InstalledVersion = (& $VersionCommand[0] $VersionCommand[1..$VersionCommand.Length]) + if (-not $?) { + Write-Host "$($_.Name) not installed; installing now" + } else { + $InstalledVersion = $InstalledVersion -join "`n" + if ($InstalledVersion -match $_.VersionRegex) { + if ($Matches.Count -ne 2) { + Write-Error "$($_.Name) has a malformed version regex ($($_.VersionRegex)); it should have a single capture group + (it has $($Matches.Count - 1))" + throw + } + if ($Matches[1] -eq $_.Version) { + Write-Host "$($_.Name) already installed and at the correct version ($($Matches[1]))" + return + } else { + Write-Host "$($_.Name) already installed but with the incorrect version + installed version: '$($Matches[1])' + required version : '$($_.Version)' +upgrading now." + } + } else { + Write-Warning "$($_.Name)'s version command ($($VersionCommand -join ' ')) returned a value we did not expect: + $InstalledVersion + expected a version matching the regex: $($_.VersionRegex) +Installing anyways." + } + } + + if ($null -ne (Get-Member -InputObject $_ -Name 'DmgUrl')) { + $pathToDmg = "~/Downloads/$($_.Name).dmg" + Get-RemoteFile -OutFile $pathToDmg -Uri $_.DmgUrl -Sha256 $_.Sha256 + + hdiutil attach $pathToDmg -mountpoint /Volumes/setup-installer + + if ($null -ne (Get-Member -InputObject $_ -Name 'InstallationCommands')) { + $_.InstallationCommands | % { + Write-Host "> $($_ -join ' ')" + & $_[0] $_[1..$_.Length] | Write-Host + } + } elseif ($null -ne (Get-Member -InputObject $_ -Name 'InstallerPath')) { + sudo installer -pkg "/Volumes/setup-installer/$($_.InstallerPath)" -target / + hdiutil detach /Volumes/setup-installer + } else { + Write-Error "$($_.Name) installer object has a DmgUrl, but neither an InstallerPath nor an InstallationCommands" + throw + } + } elseif ($null -ne (Get-Member -InputObject $_ -Name 'PkgUrl')) { + $pathToPkg = "~/Downloads/$($_.Name).pkg" + Get-RemoteFile -OutFile $pathToPkg -Uri $_.PkgUrl -Sha256 $_.Sha256 + + sudo installer -pkg $pathToPkg -target / + } else { + Write-Error "$($_.Name) does not have an installer in the configuration file." + throw + } +} + +$installedVagrantPlugins = @{} +vagrant plugin list --machine-readable | ForEach-Object { + $timestamp, $target, $type, $data = $_ -split ',' + switch ($type) { + # these are not important + 'ui' { } + 'plugin-version-constraint' { } + 'plugin-name' { + $installedVagrantPlugins[$data] = $Null + } + 'plugin-version' { + $version = $data -replace '%!\(VAGRANT_COMMA\)',',' + if ($version -notmatch '^(.*), global') { + Write-Error "Invalid version string for plugin ${target}: $version" + throw + } + $installedVagrantPlugins[$target] = $Matches[1] + } + default { + Write-Warning "Unknown plugin list member type $type for plugin $target" + } + } +} +$Installables.VagrantPlugins | ForEach-Object { + if (-not $installedVagrantPlugins.Contains($_.Name)) { + Write-Host "$($_.Name) not installed; installing now" + } elseif ($installedVagrantPlugins[$_.Name] -ne $_.Version) { + Write-Host "$($_.Name) already installed but with the incorrect version + installed version: '$($installedVagrantPlugins[$_.Name])' + required version: '$($_.Version)'" + } else { + Write-Host "$($_.Name) already installed and at the correct version ($($_.Version))" + return + } + + vagrant plugin install $_.Name --plugin-version $_.Version +} diff --git a/externals/vcpkg/scripts/azure-pipelines/osx/README.md b/externals/vcpkg/scripts/azure-pipelines/osx/README.md new file mode 100755 index 000000000..9dffe7249 --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/osx/README.md @@ -0,0 +1,258 @@ +# `vcpkg-eg-mac` VMs + +## Table of Contents + +- [`vcpkg-eg-mac` VMs](#vcpkg-eg-mac-vms) + - [Table of Contents](#table-of-contents) + - [Basic Usage](#basic-usage) + - [Creating a new Vagrant box](#creating-a-new-vagrant-box) + - [VM Software Versions](#vm-software-versions) + - [Creating a New Azure Agent Pool](#creating-a-new-azure-agent-pool) + - [Running the VM](#running-the-vm) + - [Getting an Azure Pipelines PAT](#getting-an-azure-pipelines-pat) + - [Setting up a new macOS machine](#setting-up-a-new-macos-machine) + - [Troubleshooting](#troubleshooting) + - [(Internal) Accessing the macOS fileshare](#internal-accessing-the-macos-fileshare) + +## Basic Usage + +The most common operation here is to set up a new VM for Azure +pipelines; we try to make that operation as easy as possible. +It should take all of three steps, assuming the machine is +already set up (or read [these instructions] for how to set up a machine): + +1. [Create a new vagrant box](#creating-a-new-vagrant-box) +2. [Create a new agent pool](#creating-a-new-azure-agent-pool) +3. [Setup and run the vagrant VM](#running-the-vm) +4. Update `azure-pipelines.yml` and `azure-pipelines-osx.yml` to point to the new macOS pool. + +[these instructions]: #setting-up-a-new-macos-machine + +### Creating a new Vagrant box + +Whenever we want to install updated versions of the command line tools, +or of macOS, we need to create a new vagrant box. +This is pretty easy, but the results of the creation are not public, +since we're concerned about licensing. +However, if you're sure you're following Apple's licensing, +you can set up your own vagrant boxes that are the same as ours by doing the following: + +You'll need some prerequisites: + +- An Xcode installer - you can get this from Apple's developer website, + although you'll need to sign in first: +- The software installed by `Install-Prerequisites.ps1` + +If you're updating the CI pool, make sure you update macOS. + +First, you'll need to create a base VM; +this is where you determine what version of macOS is installed. +Follow the Parallels process for creating a macOS VM; this involves +updating to whatever version, and then scrolling right until you find +"Install macOS from recovery partition". + +Once you've done this, you can run through the installation of macOS onto a new VM. +You should set the username to `vagrant`. + +Once it's finished installing, make sure to turn on the SSH server. +Open System Preferences, then go to Sharing > Remote Login, +and turn it on. +You'll then want to add the vagrant SSH keys to the VM's vagrant user. +Open the terminal application and run the following: + +```sh +$ # basic stuff +$ date | sudo tee '/etc/vagrant_box_build_time' +$ printf 'vagrant\tALL=(ALL)\tNOPASSWD:\tALL\n' | sudo tee -a '/etc/sudoers.d/vagrant' +$ sudo chmod 0440 '/etc/sudoers.d/vagrant' +$ # then install vagrant keys +$ mkdir -p ~/.ssh +$ curl -fsSL 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' >~/.ssh/authorized_keys +$ chmod 0600 ~/.ssh/authorized_keys +``` + +Finally, you'll need to install the Parallel Tools. +From your host, in the top bar, +go to Actions > Install Parallels Tools..., +and then follow the instructions. + +Now, let's package the VM into a base box. +(The following instructions are adapted from +[these official instructions][base-box-instructions]). + +Run the following commands: + +```sh +$ cd ~/Parallels +$ echo '{ "provider": "parallels" }' >metadata.json +$ tar zcvf .box ./metadata.json ./.pvm +``` + +This will create a box file which contains all the necessary data. +You can delete the `metadata.json` file after. + +Once you've done that, you can upload it to the fileshare, +under `share/boxes/macos-base`, add it to `share/boxes/macos-base.json`, +and finally add it to vagrant: + +```sh +$ vagrant box add ~/vagrant/share/boxes/macos-base.json +``` + +Then, we'll create the final box, +which contains all the necessary programs for doing CI work. +Copy `configuration/Vagrantfile-box.rb` as `Vagrantfile`, and +`configuration/vagrant-box-configuration.json` +into a new directory; into that same directory, +download the Xcode command line tools dmg, and name it `clt.dmg`. +Then, run the following in that directory: + +```sh +$ vagrant up +$ vagrant package +``` + +This will create a `package.box`, which is the box file for the base VM. +Once you've created this box, if you're making it the new box for the CI, +upload it to the fileshare, under `share/boxes/macos-ci`. +Then, add the metadata about the box (the name and version) to +`share/boxes/macos-ci.json`. +Once you've done that, add the software versions under [VM Software Versions](#vm-software-versions). + +[base-box-instructions]: https://parallels.github.io/vagrant-parallels/docs/boxes/base.html + +#### VM Software Versions + +* 2022-02-04 (minor update to 2022-01-03) + * macOS: 12.1 + * Xcode CLTs: 13.2 +* 2022-01-03: + * macOS: 12.1 + * Xcode CLTs: 13.2 +* 2021-07-27: + * macOS: 11.5.1 + * Xcode CLTs: 12.5.1 +* 2021-04-16: + * macOS: 11.2.3 + * Xcode CLTs: 12.4 +* 2020-09-28: + * macOS: 10.15.6 + * Xcode CLTs: 12 + +### Creating a New Azure Agent Pool + +When updating the macOS machines to a new version, you'll need to create +a new agent pool for the machines to join. The standard for this is to +name it `PrOsx-YYYY-MM-DD`, with `YYYY-MM-DD` the day that the process +is started. + +In order to create a new agent pool, go to the `vcpkg/public` project; +go to `Project settings`, then go to `Agent pools` under `Pipelines`. +Add a new self-hosted pool, name it as above, and make certain to check +the box for "Grant access permission to all pipelines". + +Once you've done this, you are done; you can start adding new machines +to the pool! + +### Running the VM + +First, make sure that your software is up to date: +```sh +$ cd ~/vcpkg +$ git fetch +$ git switch -d origin/master +$ ./scripts/azure-pipelines/osx/Install-Prerequisites.ps1 +``` + +as well as checking to make sure macOS is up to date. + +Then, follow the instructions for [accessing ~/vagrant/share][access-fileshare]. + +And finally, [grab a PAT], update the vagrant box, set up the VM, and run it: +```sh +$ vagrant box remove -f vcpkg/macos-ci # This won't do anything if the machine never had a box before +$ vagrant box add ~/vagrant/share/boxes/macos-ci.json +$ ~/vcpkg/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 -Date -DevopsPat +$ cd ~/vagrant/vcpkg-eg-mac +$ vagrant up # if this fails, reboot through the kvm and/or log in interactively, then come back here +``` + +[grab a PAT]: #getting-an-azure-pipelines-pat + +## Getting an Azure Pipelines PAT + +Personal Access Tokens are an important part of this process, +and they are fairly easy to generate. +On ADO, under the correct project (in vcpkg's case, "vcpkg"), +click on the "User Settings" icon, then go to "Personal access tokens". +It is the icon to the left of your user icon, in the top right corner. + +Then, create a new token, give it a name, make sure it expires quickly, +and give it a custom defined scope that includes the +"Agent pools: Read & manage" permission (you'll need to "Show all scopes" +to access this). +You can now copy this token and use it to allow machines to join. + +## Setting up a new macOS machine + +Before anything else, one must download `brew` and `powershell`. + +```sh +$ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" +$ brew cask install powershell +``` + +Then, we need to download the `vcpkg` repository: + +```sh +$ git clone https://github.com/microsoft/vcpkg +``` + +Then, we need to mint an SSH key: + +```sh +$ ssh-keygen +$ cat .ssh/id_rsa.pub +``` + +Add that SSH key to `authorized_keys` on the file share machine with the base box. + +Next, install prerequisites: +```sh +$ cd vcpkg/scripts/azure-pipelines/osx +$ ./Install-Prerequisites.ps1 -Force +``` + +And finally, make sure you can [access ~/vagrant/share][access-fileshare]. + +## Troubleshooting + +The following are issues that we've run into: + +- (with a Parallels box) `vagrant up` doesn't work, and vagrant gives the error that the VM is `'stopped'`. + - Try logging into the GUI with the KVM, and retrying `vagrant up`. +- (when running a powershell script) The error `Failed to initialize CoreCLR, HRESULT: 0x8007001F` is printed. + - Reboot the machine; run + ```sh + $ sudo shutdown -r now + ``` + and wait for the machine to start back up. Then, start again from where the error was emitted. + +## (Internal) Accessing the macOS fileshare + +The fileshare is located on `vcpkgmm-01`, under the `fileshare` user, in the `share` directory. +In order to get `sshfs` working on the physical machine, +You can run `Install-Prerequisites.ps1` to grab the right software, then either: + +```sh +$ mkdir -p ~/vagrant/share +$ sshfs fileshare@vcpkgmm-01:share ~/vagrant/share +``` + +If you get an error, that means that gatekeeper has prevented the kernel extension from loading, +so you'll need to access the GUI of the machine, go to System Preferences, +Security & Privacy, General, unlock the settings, +and allow system extensions from the osxfuse developer to run. +Then, you'll be able to add ~/vagrant/share as an sshfs. + +[access-fileshare]: #internal-accessing-the-macos-fileshare diff --git a/externals/vcpkg/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 b/externals/vcpkg/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 new file mode 100755 index 000000000..eb978d42c --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 @@ -0,0 +1,126 @@ +#!pwsh +#Requires -Version 6.0 + +<# +.SYNOPSIS +Sets up the configuration for the vagrant virtual machines. + +.DESCRIPTION +Setup-VagrantMachines.ps1 sets up the virtual machines for +vcpkg's macOS CI. It puts the VagrantFile and necessary +configuration JSON file into ~/vagrant/vcpkg-eg-mac. + +.PARAMETER MachineId +The number to give the machine; should match [0-9]{2}. +Defaults to the numbers at the end of the machine name, +assuming that that machine name matches `VCPKGMM-[0-9]{2}`. + +.PARAMETER DevopsPat +The personal access token which has Read & Manage permissions on the ADO pool. + +.PARAMETER Date +The date on which this pool is being created. Sets the default values for BoxVersion and AgentPool. + +.PARAMETER BoxVersion +The version of the box to use. If -Date is passed, uses that as the version. + +.PARAMETER AgentPool +The agent pool to add the machine to. If -Date is passed, uses "PrOsx-$Date" as the pool. + +.PARAMETER DevopsUrl +The URL of the ADO instance; defaults to vcpkg's, which is https://dev.azure.com/vcpkg. + +.PARAMETER BaseName +The base name for the vagrant VM; the machine name is $BaseName-$MachineId. +Defaults to 'vcpkg-eg-mac'. + +.PARAMETER BoxName +The name of the box to use. Defaults to 'vcpkg/macos-ci', +which is only available internally. + +.INPUTS +None + +.OUTPUTS +None +#> +[CmdletBinding(PositionalBinding=$False, DefaultParameterSetName='DefineDate')] +Param( + [Parameter(Mandatory=$False)] + [String]$MachineId, + + [Parameter(Mandatory=$True)] + [String]$DevopsPat, + + [Parameter(Mandatory=$True, ParameterSetName='DefineDate')] + [String]$Date, + + [Parameter(Mandatory=$True, ParameterSetName='DefineVersionAndAgentPool')] + [String]$BoxVersion, + + [Parameter(Mandatory=$True, ParameterSetName='DefineVersionAndAgentPool')] + [String]$AgentPool, + + [Parameter(Mandatory=$False)] + [String]$DevopsUrl = 'https://dev.azure.com/vcpkg', + + [Parameter()] + [String]$BaseName = 'vcpkg-eg-mac', + + [Parameter()] + [String]$BoxName = 'vcpkg/macos-ci' +) + +Set-StrictMode -Version 2 + +if (-not $IsMacOS) { + throw 'This script should only be run on a macOS host' +} + +if (-not [String]::IsNullOrEmpty($Date)) { + $BoxVersion = $Date + $AgentPool = "PrOsx-$Date" +} + +if ([String]::IsNullOrEmpty($MachineId)) { + $hostname = hostname -s + if ($hostname -match '^VCPKGMM-([0-9]{2})$') { + $MachineId = $matches[1] + } else { + Write-Error "Hostname ($hostname) does not match the expected format (VCPKGMM-NN). Please pass -MachineId in order to give the VM a number." + } +} + +if (Test-Path '~/vagrant/vcpkg-eg-mac') { + Write-Host 'Deleting existing directories' + + Push-Location '~/vagrant/vcpkg-eg-mac' + vagrant destroy -f + if (-not $?) { + throw "Failed to destroy vagrant VM." + } + Pop-Location + + Remove-Item -Recurse -Force -LiteralPath '~/vagrant/vcpkg-eg-mac' | Out-Null +} + +Write-Host 'Creating new directories' +if (-not (Test-Path -Path '~/vagrant')) { + New-Item -ItemType 'Directory' -Path '~/vagrant' | Out-Null +} +New-Item -ItemType 'Directory' -Path '~/vagrant/vcpkg-eg-mac' | Out-Null + +Copy-Item ` + -Path "$PSScriptRoot/configuration/Vagrantfile-vm.rb" ` + -Destination '~/vagrant/vcpkg-eg-mac/Vagrantfile' + +$configuration = @{ + pat = $DevopsPat + agent_pool = $AgentPool + devops_url = $DevopsUrl + machine_name = "${BaseName}-${MachineId}" + box_name = $BoxName + box_version = $BoxVersion +} +ConvertTo-Json -InputObject $configuration -Depth 5 ` + | Set-Content -Path '~/vagrant/vcpkg-eg-mac/vagrant-configuration.json' diff --git a/externals/vcpkg/scripts/azure-pipelines/osx/Utilities.psm1 b/externals/vcpkg/scripts/azure-pipelines/osx/Utilities.psm1 new file mode 100755 index 000000000..620ec7f4b --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/osx/Utilities.psm1 @@ -0,0 +1,90 @@ +#Requires -Version 6.0 +Set-StrictMode -Version 2 + +<# +.SYNOPSIS +Returns whether the specified command exists in the current environment. + +.DESCRIPTION +Get-CommandExists takes a string as a parameter, +and returns whether it exists in the current environment; +either a function, alias, or an executable in the path. +It's somewhat equivalent to `which`. + +.PARAMETER Name +Specifies the name of the command which may or may not exist. + +.INPUTS +System.String + The name of the command. + +.OUTPUTS +System.Boolean + Whether the command exists. +#> +function Get-CommandExists +{ + [CmdletBinding()] + [OutputType([Boolean])] + Param( + [Parameter(ValueFromPipeline)] + [String]$Name + ) + + $null -ne (Get-Command -Name $Name -ErrorAction SilentlyContinue) +} + +<# +.SYNOPSIS +Downloads a file and checks its hash. + +.DESCRIPTION +Get-RemoteFile takes a URI and a hash, +downloads the file at that URI to OutFile, +and checks that the hash of the downloaded file. +It then returns a FileInfo object corresponding to the downloaded file. + +.PARAMETER OutFile +Specifies the file path to download to. + +.PARAMETER Uri +The URI to download from. + +.PARAMETER Sha256 +The expected SHA256 of the downloaded file. + +.INPUTS +None + +.OUTPUTS +System.IO.FileInfo + The FileInfo for the downloaded file. +#> +function Get-RemoteFile +{ + [CmdletBinding(PositionalBinding=$False)] + [OutputType([System.IO.FileInfo])] + Param( + [Parameter(Mandatory=$True)] + [String]$OutFile, + [Parameter(Mandatory=$True)] + [String]$Uri, + [Parameter(Mandatory=$True)] + [String]$Sha256 + ) + + Invoke-WebRequest -OutFile $OutFile -Uri $Uri + $actualHash = Get-FileHash -Algorithm SHA256 -Path $OutFile + + if ($actualHash.Hash -ne $Sha256) { + throw @" +Invalid hash for file $OutFile; + expected: $Sha256 + found: $($actualHash.Hash) +Please make sure that the hash in the powershell file is correct. +"@ + } + + Get-Item $OutFile +} + diff --git a/externals/vcpkg/scripts/azure-pipelines/osx/azure-pipelines.yml b/externals/vcpkg/scripts/azure-pipelines/osx/azure-pipelines.yml new file mode 100755 index 000000000..4647b17c9 --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -0,0 +1,81 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT +# + +parameters: + - name: vcpkgToolSha + displayName: 'Custom SHA of vcpkg-tool to use rather than bootstrap' + type: string + default: 'use default' + - name: poolName + type: string + +jobs: +- job: x64_osx + pool: + name: ${{ parameters.poolName }} + workspace: + clean: resources + timeoutInMinutes: 2880 # 2 days + variables: + - name: WORKING_ROOT + value: /Users/vagrant/Data + - name: VCPKG_DOWNLOADS + value: /Users/vagrant/Data/downloads + - group: vcpkg-binary-caching-credentials + - name: X_VCPKG_BINARY_SOURCE_STUB + value: "x-azblob,$(root-bin-url),$(sas-bin)" # not in eastasia due to physical location + - group: vcpkg-asset-caching-credentials + - name: X_VCPKG_ASSET_SOURCES + value: "x-azurl,$(root-url-ea),$(sas-ea),readwrite" + + steps: + - bash: | + sudo mkdir ${{ variables.VCPKG_DOWNLOADS }} || 0 + sudo chmod 777 ${{ variables.VCPKG_DOWNLOADS }} || 0 + exit 0 + displayName: 'Create ${{ variables.VCPKG_DOWNLOADS }}' + - bash: ./bootstrap-vcpkg.sh + displayName: 'Bootstrap vcpkg' + condition: eq('use default', '${{ parameters.vcpkgToolSha }}') + - bash: | + brew install cmake + ./scripts/azure-pipelines/bootstrap-from-source.sh ${{ parameters.vcpkgToolSha }} + displayName: "Build vcpkg with CMake" + condition: ne('use default', '${{ parameters.vcpkgToolSha }}') + - task: PowerShell@2 + displayName: '*** Test Modified Ports' + inputs: + failOnStderr: true + filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' + arguments: > + -Triplet "x64-osx" + -BuildReason "$(Build.Reason)" + -BinarySourceStub "${{ variables.X_VCPKG_BINARY_SOURCE_STUB }}" + -WorkingRoot "${{ variables.WORKING_ROOT }}" + -ArtifactStagingDirectory "$(Build.ArtifactStagingDirectory)" + pwsh: true + - task: PublishBuildArtifacts@1 + displayName: 'Publish Artifact: failure logs for x64-osx' + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/failure-logs' + ArtifactName: 'failure logs for x64-osx${{ variables.Postfix }}' + condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True') + - bash: python3 scripts/file_script.py /Users/vagrant/Data/installed/vcpkg/info/ + displayName: 'Build a file list for all packages' + condition: always() + - task: PublishBuildArtifacts@1 + displayName: 'Publish Artifact: file lists for x64-osx${{ variables.Postfix }}' + condition: always() + inputs: + PathtoPublish: scripts/list_files + ArtifactName: 'file lists for x64-osx${{ variables.Postfix }}' + - task: PublishTestResults@2 + displayName: 'Publish Test Results' + condition: ne(variables['XML_RESULTS_FILE'], '') + inputs: + testRunTitle: x64-osx + testResultsFormat: xUnit + testResultsFiles: $(XML_RESULTS_FILE) + platform: x64-osx + configuration: static diff --git a/externals/vcpkg/scripts/azure-pipelines/osx/configuration/Vagrantfile-box.rb b/externals/vcpkg/scripts/azure-pipelines/osx/configuration/Vagrantfile-box.rb new file mode 100755 index 000000000..cbe76a720 --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/osx/configuration/Vagrantfile-box.rb @@ -0,0 +1,35 @@ +require 'json' + +configuration = JSON.parse(File.read("#{__dir__}/vagrant-box-configuration.json")) + +Vagrant.configure('2') do |config| + config.vm.box = 'vcpkg/macos-base' + config.vm.synced_folder '.', '/Users/vagrant/shared' + + config.vm.provision 'shell', + run: 'once', + name: 'Install Xcode Command Line Tools: attach dmg file', + inline: 'hdiutil attach shared/clt.dmg -mountpoint /Volumes/setup-installer', + privileged: false + config.vm.provision 'shell', + run: 'once', + name: 'Install Xcode Command Line Tools: run installer', + inline: 'installer -pkg "/Volumes/setup-installer/Command Line Tools.pkg" -target /', + privileged: true + config.vm.provision 'shell', + run: 'once', + name: 'Install XCode Command Line Tools: detach dmg file', + inline: 'hdiutil detach /Volumes/setup-installer', + privileged: false + + config.vm.provision 'shell', + run: 'once', + name: 'Install brew', + inline: '/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"', + privileged: false + config.vm.provision 'shell', + run: 'once', + name: 'Install brew applications', + inline: "brew install #{configuration['brew'].join(' ')} && brew install --cask #{configuration['brew-cask'].join(' ')}", + privileged: false +end diff --git a/externals/vcpkg/scripts/azure-pipelines/osx/configuration/Vagrantfile-vm.rb b/externals/vcpkg/scripts/azure-pipelines/osx/configuration/Vagrantfile-vm.rb new file mode 100755 index 000000000..0b2df0219 --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/osx/configuration/Vagrantfile-vm.rb @@ -0,0 +1,67 @@ +require 'json' + +configuration = JSON.parse(File.read("#{__dir__}/vagrant-configuration.json")) + +server = { + :machine_name => configuration['machine_name'], + :box => configuration['box_name'], + :box_version => configuration['box_version'], + :ram => 24000, + :cpu => 11 +} + +azure_agent_url = 'https://vstsagentpackage.azureedge.net/agent/2.198.3/vsts-agent-osx-x64-2.198.3.tar.gz' +devops_url = configuration['devops_url'] +agent_pool = configuration['agent_pool'] +pat = configuration['pat'] + +Vagrant.configure('2') do |config| + config.vm.box = server[:box] + config.vm.box_version = server[:box_version] + config.vm.synced_folder '.', '/vagrant', disabled: true + + config.vm.provider 'parallels' do |prl| + prl.memory = server[:ram] + prl.cpus = server[:cpu] + end + + config.vm.provision 'shell', + run: 'once', + name: 'Create the data directory', + inline: "mkdir ~/Data", + privileged: false + + config.vm.provision 'shell', + run: 'once', + name: 'Download azure agent', + inline: "curl -s -o ~/Downloads/azure-agent.tar.gz #{azure_agent_url}", + privileged: false + + config.vm.provision 'shell', + run: 'once', + name: 'Unpack azure agent', + inline: 'mkdir myagent; cd myagent; tar xf ~/Downloads/azure-agent.tar.gz', + privileged: false + + config.vm.provision 'shell', + run: 'once', + name: 'Add VM to azure agent pool', + inline: "cd ~/myagent;\ + ./config.sh --unattended \ + --url #{devops_url} \ + --work ~/Data/work \ + --auth pat --token #{pat} \ + --pool #{agent_pool} \ + --agent #{server[:machine_name]} \ + --replace \ + --acceptTeeEula", + privileged: false + + # Start listening for jobs + config.vm.provision 'shell', + run: 'always', + name: 'Start running azure pipelines', + inline: 'cd /Users/vagrant/myagent;\ + nohup ./run.sh&', + privileged: false +end diff --git a/externals/vcpkg/scripts/azure-pipelines/osx/configuration/installables.json b/externals/vcpkg/scripts/azure-pipelines/osx/configuration/installables.json new file mode 100755 index 000000000..3ae97f355 --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/osx/configuration/installables.json @@ -0,0 +1,53 @@ +{ + "$schema": "./installables.schema.json", + + "Applications": [ + { + "Name": "vagrant", + "VersionCommand": [ "vagrant", "-v" ], + "VersionRegex": "Vagrant (.*)", + "Version": "2.2.19", + "DmgUrl": "https://releases.hashicorp.com/vagrant/2.2.19/vagrant_2.2.19_x86_64.dmg", + "Sha256": "6307BE217813A11C9E106448BF232803031E434A08C8B2DF8C62FDC9E8543845", + "InstallerPath": "vagrant.pkg" + }, + { + "Name": "Parallels", + "VersionCommand": [ "cat", "/Applications/Parallels Desktop.app/Contents/Info.plist" ], + "VersionRegex": "CFBundleShortVersionString[\\n\\t ]*([0-9.]+)", + "Version": "17.1.1", + "DmgUrl": "https://download.parallels.com/desktop/v17/17.1.1-51537/ParallelsDesktop-17.1.1-51537.dmg", + "Sha256": "BD7BE2DF4D1B3508C127CF1D9C1EF93CDDA63384BCF3893A77FBC9F1169765A9", + "InstallationCommands": [ + [ "bash", "-c", "ps x | grep 'Parallels Desktop' | grep -v 'grep' | sed -E 's/^ *([0-9]+).*(\\/Applications.*)$/\\1: \\2/'" ], + [ "bash", "-c", "ps x | grep 'Parallels Desktop' | grep -v 'grep' | sed -E 's/^ *([0-9]+).*$/\\1/' | xargs -p kill" ], + [ "sudo", "rm", "-rf", "/Applications/Parallels Desktop.app" ], + [ "sudo", "cp", "-r", "/Volumes/setup-installer/Parallels Desktop.app", "/Applications" ], + [ "sudo", "/Applications/Parallels Desktop.app/Contents/MacOS/inittool2", "init", "-b", "/Applications/Parallels Desktop.app" ] + ] + }, + { + "Name": "osxfuse", + "VersionCommand": [ "cat", "/Library/Filesystems/macfuse.fs/Contents/version.plist" ], + "VersionRegex": "CFBundleVersion[\\n\\t ]*([0-9.]+)", + "Version": "4.2.4", + "DmgUrl": "https://github.com/osxfuse/osxfuse/releases/download/macfuse-4.2.4/macfuse-4.2.4.dmg", + "Sha256": "82A2C30B3A7BF56AA2755C0C192FB50D9EECC3FE42505AB4E8679B50306188BD", + "InstallerPath": "Install macFUSE.pkg" + }, + { + "Name": "sshfs", + "VersionCommand": [ "sshfs", "--version" ], + "VersionRegex": "SSHFS version [0-9.]* \\(OSXFUSE SSHFS (.*)\\)", + "Version": "2.5.0", + "PkgUrl": "https://github.com/osxfuse/sshfs/releases/download/osxfuse-sshfs-2.5.0/sshfs-2.5.0.pkg", + "Sha256": "F8F4F71814273EA42DBE6CD92199F7CFF418571FFD1B10C0608878D3472D2162" + } + ], + "VagrantPlugins": [ + { + "Name": "vagrant-parallels", + "Version": "2.2.4" + } + ] +} diff --git a/externals/vcpkg/scripts/azure-pipelines/osx/configuration/installables.schema.json b/externals/vcpkg/scripts/azure-pipelines/osx/configuration/installables.schema.json new file mode 100755 index 000000000..6237243c2 --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/osx/configuration/installables.schema.json @@ -0,0 +1,66 @@ +{ + "$schema": "https://json-schema.org/draft-07/schema", + "type": "object", + "definitions": { + "sha256": { + "type": "string", + "pattern": "[A-Z0-9]{64}" + } + }, + "required": [ + "Applications", + "VagrantPlugins" + ], + "properties": { + "Applications": { + "type": "array", + "items": { + "type": "object", + "properties": { + "Name": { + "type": "string" + }, + "VersionCommand": { + "type": "array", + "items": { + "type": "string" + }, + "minItems": 1 + }, + "VersionRegex": { + "type": "string", + "format": "regex" + }, + "Version": { + "type": "string" + }, + "DmgUrl": { + "type": "string", + "format": "uri" + }, + "Sha256": { + "$ref": "#/definitions/sha256" + }, + "InstallerPath": { + "type": "string" + } + } + } + }, + "VagrantPlugins": { + "type": "array", + "items": { + "type": "object", + "required": [ "Name", "Version" ], + "properties": { + "Name": { + "type": "string" + }, + "Version": { + "type": "string" + } + } + } + } + } +} diff --git a/externals/vcpkg/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json b/externals/vcpkg/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json new file mode 100755 index 000000000..75cb83719 --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json @@ -0,0 +1,25 @@ +{ + "$schema": "./vagrant-box-configuration.schema.json", + "brew": [ + "autoconf-archive", + "autoconf", + "automake", + "bison", + "cmake", + "gettext", + "gfortran", + "gperf", + "gtk-doc", + "libtool", + "meson", + "mono", + "nasm", + "ninja", + "pkg-config", + "texinfo", + "yasm" + ], + "brew-cask": [ + "powershell" + ] +} diff --git a/externals/vcpkg/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.schema.json b/externals/vcpkg/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.schema.json new file mode 100755 index 000000000..80845f70f --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.schema.json @@ -0,0 +1,18 @@ +{ + "$schema": "https://json-schema.org/draft-07/schema", + "type": "object", + "required": [ + "brew", + "brew-cask" + ], + "properties": { + "brew": { + "type": "array", + "items": { "type": "string" } + }, + "brew-cask": { + "type": "array", + "items": { "type": "string" } + } + } +} diff --git a/externals/vcpkg/scripts/azure-pipelines/osx/configuration/vagrant-configuration.schema.json b/externals/vcpkg/scripts/azure-pipelines/osx/configuration/vagrant-configuration.schema.json new file mode 100755 index 000000000..91540d77c --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/osx/configuration/vagrant-configuration.schema.json @@ -0,0 +1,35 @@ +{ + "$schema": "https://json-schema.org/draft/2019-09/schema", + + "type": "object", + + "required": [ + "pat", + "agent_pool", + "devops_url", + "machine_name", + "box_name", + "box_version" + ], + + "properties": { + "pat": { + "type": "string" + }, + "agent_pool": { + "type": "string" + }, + "devops_url": { + "type": "string" + }, + "machine_name": { + "type": "string" + }, + "box_name": { + "type": "string" + }, + "box_version": { + "type": "string" + } + } +} diff --git a/externals/vcpkg/scripts/azure-pipelines/test-modified-ports.ps1 b/externals/vcpkg/scripts/azure-pipelines/test-modified-ports.ps1 new file mode 100755 index 000000000..55a05aef3 --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/test-modified-ports.ps1 @@ -0,0 +1,176 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT +# + +<# +.SYNOPSIS +Runs the 'Test Modified Ports' part of the vcpkg CI system for all platforms. + +.PARAMETER Triplet +The triplet to test. + +.PARAMETER WorkingRoot +The location used as scratch space for 'installed', 'packages', and 'buildtrees' vcpkg directories. + +.PARAMETER ArtifactStagingDirectory +The Azure Pipelines artifacts directory. If not supplied, defaults to the current directory. + +.PARAMETER ArchivesRoot +Equivalent to '-BinarySourceStub "files,$ArchivesRoot"' + +.PARAMETER BinarySourceStub +The type and parameters of the binary source. Shared across runs of this script. If +this parameter is not set, binary caching will not be used. Example: "files,W:\" + +.PARAMETER BuildReason +The reason Azure Pipelines is running this script. For invocations caused by `PullRequest`, +modified ports are identified by changed hashes with regard to git HEAD~1 (subject to NoParentHashes), +and ports marked as failing in the CI baseline (or which depend on such ports) are skipped. +If BinarySourceStub is set and this parameter is set to a non-empty value other than `PullRequest`, +binary caching will be in write-only mode. + +.PARAMETER NoParentHashes +Indicates to not use parent hashes even for pull requests. + +.PARAMETER PassingIsPassing +Indicates that 'Passing, remove from fail list' results should not be emitted as failures. (For example, this is used +when using vcpkg to test a prerelease MSVC++ compiler) +#> + +[CmdletBinding(DefaultParameterSetName="ArchivesRoot")] +Param( + [Parameter(Mandatory = $true)] + [ValidateNotNullOrEmpty()] + [string]$Triplet, + [Parameter(Mandatory = $true)] + [ValidateNotNullOrEmpty()] + $WorkingRoot, + [ValidateNotNullOrEmpty()] + $ArtifactStagingDirectory = '.', + [Parameter(ParameterSetName='ArchivesRoot')] + $ArchivesRoot = $null, + [Parameter(ParameterSetName='BinarySourceStub')] + $BinarySourceStub = $null, + [String]$BuildReason = $null, + [switch]$NoParentHashes = $false, + [switch]$PassingIsPassing = $false +) + +if (-Not ((Test-Path "triplets/$Triplet.cmake") -or (Test-Path "triplets/community/$Triplet.cmake"))) { + Write-Error "Incorrect triplet '$Triplet', please supply a valid triplet." + throw +} + +if ((-Not [string]::IsNullOrWhiteSpace($ArchivesRoot))) { + if ((-Not [string]::IsNullOrWhiteSpace($BinarySourceStub))) { + Write-Error "Only one binary caching setting may be used." + throw + } + + $BinarySourceStub = "files,$ArchivesRoot" +} + +$env:VCPKG_DOWNLOADS = Join-Path $WorkingRoot 'downloads' +$buildtreesRoot = Join-Path $WorkingRoot 'buildtrees' +$installRoot = Join-Path $WorkingRoot 'installed' +$packagesRoot = Join-Path $WorkingRoot 'packages' + +$commonArgs = @( + "--x-buildtrees-root=$buildtreesRoot", + "--x-install-root=$installRoot", + "--x-packages-root=$packagesRoot", + "--overlay-ports=scripts/test_ports" +) +$cachingArgs = @() + +$skipFailuresArg = @() +if ([string]::IsNullOrWhiteSpace($BinarySourceStub)) { + $cachingArgs = @('--no-binarycaching') +} else { + $cachingArgs = @('--binarycaching') + $binaryCachingMode = 'readwrite' + if ([string]::IsNullOrWhiteSpace($BuildReason)) { + Write-Host 'Build reason not specified, defaulting to using binary caching in read write mode.' + } + elseif ($BuildReason -eq 'PullRequest') { + Write-Host 'Build reason was Pull Request, using binary caching in read write mode, skipping failures.' + $skipFailuresArg = @('--skip-failures') + } + else { + Write-Host "Build reason was $BuildReason, using binary caching in write only mode." + $binaryCachingMode = 'write' + } + + $cachingArgs += @("--binarysource=clear;$BinarySourceStub,$binaryCachingMode") +} + +if ($Triplet -eq 'x64-linux') { + $env:HOME = '/home/agent' + $executableExtension = [string]::Empty +} +elseif ($Triplet -eq 'x64-osx') { + $executableExtension = [string]::Empty +} +else { + $executableExtension = '.exe' +} + +$failureLogs = Join-Path $ArtifactStagingDirectory 'failure-logs' +$xunitFile = Join-Path $ArtifactStagingDirectory "$Triplet-results.xml" + +if ($IsWindows) +{ + mkdir empty + cmd /c "robocopy.exe empty `"$buildtreesRoot`" /MIR /NFL /NDL /NC /NP > nul" + cmd /c "robocopy.exe empty `"$packagesRoot`" /MIR /NFL /NDL /NC /NP > nul" + cmd /c "robocopy.exe empty `"$installRoot`" /MIR /NFL /NDL /NC /NP > nul" + rmdir empty +} + +& "./vcpkg$executableExtension" x-ci-clean @commonArgs +if ($LASTEXITCODE -ne 0) +{ + throw "vcpkg clean failed" +} + +$parentHashes = @() +if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) +{ + # Prefetch tools for better output + foreach ($tool in @('cmake', 'ninja', 'git')) { + & "./vcpkg$executableExtension" fetch $tool + if ($LASTEXITCODE -ne 0) + { + throw "Failed to fetch $tool" + } + } + + Write-Host "Determining parent hashes using HEAD~1" + $parentHashesFile = Join-Path $ArtifactStagingDirectory 'parent-hashes.json' + $parentHashes = @("--parent-hashes=$parentHashesFile") + & git revert -n -m 1 HEAD | Out-Null + # The vcpkg.cmake toolchain file is not part of ABI hashing, + # but changes must trigger at least some testing. + Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake" + Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake-user" + & "./vcpkg$executableExtension" ci "--triplet=$Triplet" --dry-run "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile" + + Write-Host "Running CI using parent hashes" + & git reset --hard HEAD +} + +# The vcpkg.cmake toolchain file is not part of ABI hashing, +# but changes must trigger at least some testing. +Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake" +Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake-user" +& "./vcpkg$executableExtension" ci "--triplet=$Triplet" --failure-logs=$failureLogs --x-xunit=$xunitFile "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs @cachingArgs @parentHashes @skipFailuresArg + +$failureLogsEmpty = (-Not (Test-Path $failureLogs) -Or ((Get-ChildItem $failureLogs).count -eq 0)) +Write-Host "##vso[task.setvariable variable=FAILURE_LOGS_EMPTY]$failureLogsEmpty" + +if ($LASTEXITCODE -ne 0) +{ + throw "vcpkg ci failed" +} + +Write-Host "##vso[task.setvariable variable=XML_RESULTS_FILE]$xunitFile" diff --git a/externals/vcpkg/scripts/azure-pipelines/windows-unstable/README.md b/externals/vcpkg/scripts/azure-pipelines/windows-unstable/README.md new file mode 100755 index 000000000..d60367247 --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/windows-unstable/README.md @@ -0,0 +1,4 @@ +The "unstable" build is used internally by Microsoft to test prerelease versions +of our C++ compiler; not seeing results from these build definitions in the +GitHub portal is normal as these builds depend on acquisition of private +compiler bits that aren't yet shipping. diff --git a/externals/vcpkg/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml b/externals/vcpkg/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml new file mode 100755 index 000000000..65ee8decf --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml @@ -0,0 +1,11 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT +# +variables: + unstable-pool: 'VcpkgUnstable1ES' + +jobs: +- template: job.yml + parameters: + triplet: x64-windows + jobName: x64_windows diff --git a/externals/vcpkg/scripts/azure-pipelines/windows-unstable/job.yml b/externals/vcpkg/scripts/azure-pipelines/windows-unstable/job.yml new file mode 100755 index 000000000..a4b09cd6e --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/windows-unstable/job.yml @@ -0,0 +1,76 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT +# + +jobs: +- job: ${{ parameters.jobName }} + pool: + name: $(unstable-pool) + workspace: + clean: resources + timeoutInMinutes: 2880 # 2 days + variables: + - name: WORKING_ROOT + value: D:\ + - name: VCPKG_DOWNLOADS + value: D:\downloads + - group: vcpkg-asset-caching-credentials + - name: X_VCPKG_ASSET_SOURCES + value: "x-azurl,$(root-url),$(sas),readwrite" + + steps: + - task: DownloadBuildArtifacts@0 + displayName: 'Download DropBuildNumber if not specified' + inputs: + buildType: specific + project: '0bdbc590-a062-4c3f-b0f6-9383f67865ee' + pipeline: 16549 + buildVersionToDownload: latestFromBranch + branchName: 'refs/heads/$(MSVCBranchName)' + artifactName: BuildNumber + downloadPath: 'D:\msvc-drops' + condition: eq(variables['DropBuildNumber'], '') + - task: PowerShell@2 + displayName: 'Set DropBuildNumber if not specified' + inputs: + targetType: inline + script: | + $DropBuildNumber = Get-Content -Path D:\msvc-drops\BuildNumber\Build.BuildNumber.txt + Write-Host "##vso[task.setvariable variable=DropBuildNumber]$DropBuildNumber" + Write-Host "Build Number set to: $DropBuildNumber" + pwsh: true + condition: eq(variables['DropBuildNumber'], '') + - task: ms-vscs-artifact.build-tasks.artifactDropDownloadTask-1.artifactDropDownloadTask@0 + displayName: 'Download msvc x86 ret' + inputs: + dropServiceURI: 'https://devdiv.artifacts.visualstudio.com/DefaultCollection' + buildNumber: 'msvc/builds/$(DropBuildNumber)/x86ret' + destinationPath: 'D:\msvc-drops\$(DropBuildNumber)\binaries.x86ret' + - task: ms-vscs-artifact.build-tasks.artifactDropDownloadTask-1.artifactDropDownloadTask@0 + displayName: 'Download msvc amd64 ret' + inputs: + dropServiceURI: 'https://devdiv.artifacts.visualstudio.com/DefaultCollection' + buildNumber: 'msvc/builds/$(DropBuildNumber)/amd64ret' + destinationPath: 'D:\msvc-drops\$(DropBuildNumber)\binaries.amd64ret' + - task: PowerShell@2 + displayName: 'Rearrange MSVC Drop Layout' + inputs: + targetType: filePath + filePath: 'scripts/azure-pipelines/windows-unstable/rearrange-msvc-drop-layout.ps1' + arguments: '-DropRoot "D:\msvc-drops\$(DropBuildNumber)" -BuildType ret' + pwsh: true + - script: .\bootstrap-vcpkg.bat + displayName: 'Bootstrap vcpkg' + - task: PowerShell@2 + displayName: '*** Test Modified Ports' + inputs: + failOnStderr: true + filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' + arguments: '-Triplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory) -PassingIsPassing' + pwsh: true + - task: PublishBuildArtifacts@1 + displayName: 'Publish Artifact: failure logs for ${{ parameters.triplet }}' + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)\failure-logs' + ArtifactName: 'failure logs for ${{ parameters.triplet }}' + condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True') diff --git a/externals/vcpkg/scripts/azure-pipelines/windows-unstable/rearrange-msvc-drop-layout.ps1 b/externals/vcpkg/scripts/azure-pipelines/windows-unstable/rearrange-msvc-drop-layout.ps1 new file mode 100755 index 000000000..53692532e --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/windows-unstable/rearrange-msvc-drop-layout.ps1 @@ -0,0 +1,75 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT +# +<# +.SYNOPSIS +Moves files from an MSVC compiler drop to the locations where they are installed in a Visual Studio installation. + +.PARAMETER DropRoot +The location where the MSVC compiler drop has been downloaded. + +.PARAMETER BuildType +The MSVC drop build type set with /p:_BuildType when MSVC was built. Defaults to 'ret'. + +#> +[CmdletBinding()] +param( + [Parameter(Mandatory = $true)][string]$DropRoot, + [Parameter(Mandatory = $false)][ValidateSet('ret', 'chk')][string]$BuildType = 'ret' +) + +Set-StrictMode -Version Latest + +$MSVCRoot = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC" + +$ErrorActionPreference = "Stop" + +$tempRoot = "$DropRoot\readytodeploy" + +New-Item -ItemType Directory -Path $tempRoot | Out-Null + +Write-Host "Rearranging x86$BuildType" +New-Item -ItemType Directory -Path "$tempRoot\bin\HostX86" | Out-Null +Move-Item "$DropRoot\binaries.x86$BuildType\bin\i386" "$tempRoot\bin\HostX86\x86" +Move-Item "$DropRoot\binaries.x86$BuildType\bin\x86_amd64" "$tempRoot\bin\HostX86\x64" +Move-Item "$DropRoot\binaries.x86$BuildType\bin\x86_arm" "$tempRoot\bin\HostX86\arm" + +Write-Host "Rearranging amd64$BuildType" +New-Item -ItemType Directory -Path "$tempRoot\bin\HostX64" | Out-Null +Move-Item "$DropRoot\binaries.amd64$BuildType\bin\amd64" "$tempRoot\bin\HostX64\x64" +Move-Item "$DropRoot\binaries.amd64$BuildType\bin\amd64_x86" "$tempRoot\bin\HostX64\x86" +Move-Item "$DropRoot\binaries.amd64$BuildType\bin\amd64_arm" "$tempRoot\bin\HostX64\arm" + +# Only copy files and directories that already exist in the VS installation. +Write-Host "Rearranging inc, lib" +New-Item -ItemType Directory -Path "$tempRoot\lib" | Out-Null +Move-Item "$DropRoot\binaries.x86$BuildType\inc" "$tempRoot\include" +Move-Item "$DropRoot\binaries.x86$BuildType\lib\i386" "$tempRoot\lib\x86" +Move-Item "$DropRoot\binaries.amd64$BuildType\lib\amd64" "$tempRoot\lib\x64" + +Write-Host "Rearranging atlmfc" +New-Item -ItemType Directory -Path "$tempRoot\atlmfc" | Out-Null +New-Item -ItemType Directory -Path "$tempRoot\atlmfc\lib" | Out-Null +Move-Item "$DropRoot\binaries.x86$BuildType\atlmfc\include" "$tempRoot\atlmfc\include" +Move-Item "$DropRoot\binaries.x86$BuildType\atlmfc\lib\i386" "$tempRoot\atlmfc\lib\x86" +Move-Item "$DropRoot\binaries.amd64$BuildType\atlmfc\lib\amd64" "$tempRoot\atlmfc\lib\x64" + +[string[]]$toolsets = Get-ChildItem -Path $MSVCRoot -Directory | Sort-Object -Descending +if ($toolsets.Length -eq 0) { + throw "Could not find Visual Studio toolset!" +} + +Write-Host "Found toolsets:`n$($toolsets -join `"`n`")`n" +$selectedToolset = $toolsets[0] +Write-Host "Using toolset: $selectedToolset" +for ($idx = 1; $idx -lt $toolsets.Length; $idx++) { + $badToolset = $toolsets[$idx] + Write-Host "Deleting toolset: $badToolset" + Remove-Item $badToolset -Recurse -Force +} + +Write-Host "Deploying $tempRoot => $selectedToolset" +Copy-Item "$tempRoot\*" $selectedToolset -Recurse -Force +Write-Host "Deleting $DropRoot..." +Remove-Item $DropRoot -Recurse -Force +Write-Host "Done!" diff --git a/externals/vcpkg/scripts/azure-pipelines/windows/azure-pipelines.yml b/externals/vcpkg/scripts/azure-pipelines/windows/azure-pipelines.yml new file mode 100755 index 000000000..a06da2a2c --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -0,0 +1,107 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT +# + +parameters: + - name: vcpkgToolSha + displayName: 'Custom SHA of vcpkg-tool to use rather than bootstrap' + type: string + default: 'use default' + - name: triplet + type: string + default: 'x86-windows' + - name: jobName + type: string + default: 'x86_windows' + - name: poolName + type: string + +jobs: +- job: ${{ parameters.jobName }} + pool: + name: ${{ parameters.poolName }} + workspace: + clean: resources + timeoutInMinutes: 2880 # 2 days + variables: + - name: WORKING_ROOT + value: D:\ + - name: VCPKG_DOWNLOADS + value: D:\downloads + - name: DiffFile + value: $(Build.ArtifactStagingDirectory)\format.diff + - name: ExtraChecksTriplet + value: x86-windows + - group: vcpkg-asset-caching-credentials + - name: X_VCPKG_ASSET_SOURCES + value: "x-azurl,$(root-url-ea),$(sas-ea),readwrite" + - group: vcpkg-binary-caching-credentials + - name: X_VCPKG_BINARY_SOURCE_STUB + value: "x-azblob,$(root-bin-url-ea),$(sas-bin-ea)" + + steps: + - script: .\bootstrap-vcpkg.bat + displayName: 'Bootstrap vcpkg' + condition: eq('use default', '${{ parameters.vcpkgToolSha }}') + - script: .\scripts\azure-pipelines\windows\bootstrap-from-source.cmd ${{ parameters.vcpkgToolSha }} + displayName: "Build vcpkg with CMake" + condition: ne('use default', '${{ parameters.vcpkgToolSha }}') + - script: '.\vcpkg.exe format-manifest --all' + displayName: 'Format Manifests' + condition: eq('${{ parameters.triplet }}', '${{ variables.ExtraChecksTriplet }}') + - task: Powershell@2 + displayName: 'Create Diff' + condition: eq('${{ parameters.triplet }}', '${{ variables.ExtraChecksTriplet }}') + inputs: + filePath: scripts/azure-pipelines/Create-PRDiff.ps1 + arguments: "-DiffFile '$(DiffFile)'" + pwsh: true + - task: PublishBuildArtifacts@1 + displayName: 'Publish Format and Documentation Diff' + condition: and(eq('${{ parameters.triplet }}', '${{ variables.ExtraChecksTriplet }}'), failed()) + inputs: + PathtoPublish: '$(DiffFile)' + ArtifactName: 'format.diff' + - task: PowerShell@2 + displayName: '*** Test Modified Ports' + inputs: + failOnStderr: true + filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' + arguments: '-Triplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' + pwsh: true + - task: PowerShell@2 + displayName: 'Validate version files' + condition: eq('${{ parameters.triplet }}', '${{ variables.ExtraChecksTriplet }}') + inputs: + filePath: 'scripts/azure-pipelines/windows/validate-version-files.ps1' + pwsh: true + - task: PublishBuildArtifacts@1 + displayName: 'Publish Artifact: failure logs for ${{ parameters.triplet }}' + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)\failure-logs' + ArtifactName: 'failure logs for ${{ parameters.triplet }}' + condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True') + - task: PowerShell@2 + displayName: 'Build a file list for all packages' + condition: always() + inputs: + targetType: inline + script: | + ./vcpkg.exe fetch python3 + & $(.\vcpkg fetch python3) .\scripts\file_script.py D:\installed\vcpkg\info\ + pwsh: true + - task: PublishBuildArtifacts@1 + displayName: 'Publish Artifact: file lists for ${{ parameters.triplet }}' + condition: always() + inputs: + PathtoPublish: scripts/list_files + ArtifactName: 'file lists for ${{ parameters.triplet }}' + - task: PublishTestResults@2 + displayName: 'Publish Test Results' + condition: ne(variables['XML_RESULTS_FILE'], '') + inputs: + testRunTitle: ${{ parameters.triplet }} + testResultsFormat: xUnit + testResultsFiles: $(XML_RESULTS_FILE) + platform: ${{ parameters.triplet }} + diff --git a/externals/vcpkg/scripts/azure-pipelines/windows/bootstrap-from-source.cmd b/externals/vcpkg/scripts/azure-pipelines/windows/bootstrap-from-source.cmd new file mode 100755 index 000000000..8f8aae337 --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/windows/bootstrap-from-source.cmd @@ -0,0 +1,7 @@ +call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=x86 -host_arch=x86 +git clone https://github.com/microsoft/vcpkg-tool vcpkg-tool +git -C vcpkg-tool switch -d %1 +rmdir /s /q build.x86.release > nul 2> nul +cmake.exe -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DVCPKG_DEVELOPMENT_WARNINGS=OFF -DVCPKG_WARNINGS_AS_ERRORS=OFF -DVCPKG_BUILD_FUZZING=OFF -DVCPKG_BUILD_TLS12_DOWNLOADER=OFF -B build.x86.release -S vcpkg-tool +ninja.exe -C build.x86.release +move build.x86.release\vcpkg.exe vcpkg.exe diff --git a/externals/vcpkg/scripts/azure-pipelines/windows/create-image.ps1 b/externals/vcpkg/scripts/azure-pipelines/windows/create-image.ps1 new file mode 100755 index 000000000..c358aa6bd --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/windows/create-image.ps1 @@ -0,0 +1,271 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT +# + +<# +.SYNOPSIS +Creates a Windows virtual machine image, set up for vcpkg's CI. + +.DESCRIPTION +create-image.ps1 creates an Azure Windows VM image, set up for vcpkg's CI system. + +This script assumes you have installed Azure tools into PowerShell by following the instructions +at https://docs.microsoft.com/en-us/powershell/azure/install-az-ps?view=azps-3.6.1 +or are running from Azure Cloud Shell. +#> + +$Location = 'eastasia' +$Prefix = 'Win-' +$Prefix += (Get-Date -Format 'yyyy-MM-dd') +$VMSize = 'Standard_D8a_v4' +$ProtoVMName = 'PROTOTYPE' +$WindowsServerSku = '2022-datacenter' +$ErrorActionPreference = 'Stop' +$CudnnBaseUrl = 'https://vcpkgimageminting.blob.core.windows.net/assets/cudnn-windows-x86_64-8.3.2.44_cuda11.5-archive.zip' + +$ProgressActivity = 'Creating Windows Image' +$TotalProgress = 18 +$CurrentProgress = 1 + +Import-Module "$PSScriptRoot/../create-vmss-helpers.psm1" -DisableNameChecking + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Creating resource group' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$ResourceGroupName = Find-ResourceGroupName $Prefix +$AdminPW = New-Password +New-AzResourceGroup -Name $ResourceGroupName -Location $Location +$AdminPWSecure = ConvertTo-SecureString $AdminPW -AsPlainText -Force +$Credential = New-Object System.Management.Automation.PSCredential ("AdminUser", $AdminPWSecure) + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Creating virtual network' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$VirtualNetwork = Create-LockedDownNetwork -ResourceGroupName $ResourceGroupName -Location $Location + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Creating prototype VM' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$NicName = $ResourceGroupName + 'NIC' +$Nic = New-AzNetworkInterface ` + -Name $NicName ` + -ResourceGroupName $ResourceGroupName ` + -Location $Location ` + -Subnet $VirtualNetwork.Subnets[0] + +$VM = New-AzVMConfig -Name $ProtoVMName -VMSize $VMSize -Priority 'Spot' -MaxPrice -1 +$VM = Set-AzVMOperatingSystem ` + -VM $VM ` + -Windows ` + -ComputerName $ProtoVMName ` + -Credential $Credential ` + -ProvisionVMAgent + +$VM = Add-AzVMNetworkInterface -VM $VM -Id $Nic.Id +$VM = Set-AzVMSourceImage ` + -VM $VM ` + -PublisherName 'MicrosoftWindowsServer' ` + -Offer 'WindowsServer' ` + -Skus $WindowsServerSku ` + -Version latest + +$VM = Set-AzVMBootDiagnostic -VM $VM -Disable +New-AzVm ` + -ResourceGroupName $ResourceGroupName ` + -Location $Location ` + -VM $VM + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Running provisioning script deploy-tlssettings.ps1 in VM' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$ProvisionImageResult = Invoke-AzVMRunCommandWithRetries ` + -ResourceGroupName $ResourceGroupName ` + -VMName $ProtoVMName ` + -CommandId 'RunPowerShellScript' ` + -ScriptPath "$PSScriptRoot\deploy-tlssettings.ps1" + +Write-Host "deploy-tlssettings.ps1 output: $($ProvisionImageResult.value.Message)" +Write-Host 'Waiting 1 minute for VM to reboot...' +Start-Sleep -Seconds 60 + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Running provisioning script deploy-psexec.ps1 in VM' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$DeployPsExecResult = Invoke-AzVMRunCommandWithRetries ` + -ResourceGroupName $ResourceGroupName ` + -VMName $ProtoVMName ` + -CommandId 'RunPowerShellScript' ` + -ScriptPath "$PSScriptRoot\deploy-psexec.ps1" + +Write-Host "deploy-psexec.ps1 output: $($DeployPsExecResult.value.Message)" + +#################################################################################################### +function Invoke-ScriptWithPrefix { + param( + [string]$ScriptName, + [switch]$AddAdminPw, + [string]$CudnnUrl + ) + + Write-Progress ` + -Activity $ProgressActivity ` + -Status "Running provisioning script $ScriptName in VM" ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + + $DropToAdminUserPrefix = Get-Content "$PSScriptRoot\drop-to-admin-user-prefix.ps1" -Encoding utf8NoBOM -Raw + $UtilityPrefixContent = Get-Content "$PSScriptRoot\utility-prefix.ps1" -Encoding utf8NoBOM -Raw + + $tempScriptFilename = [System.IO.Path]::GetTempPath() + [System.IO.Path]::GetRandomFileName() + ".txt" + try { + $script = Get-Content "$PSScriptRoot\$ScriptName" -Encoding utf8NoBOM -Raw + if ($AddAdminPw) { + $script = $script.Replace('# REPLACE WITH DROP-TO-ADMIN-USER-PREFIX.ps1', $DropToAdminUserPrefix) + } + + if (-Not ([string]::IsNullOrWhiteSpace($CudnnUrl))) { + $script = $script.Replace('# REPLACE WITH $CudnnUrl', "`$CudnnUrl = '$CudnnUrl'") + } + + $script = $script.Replace('# REPLACE WITH UTILITY-PREFIX.ps1', $UtilityPrefixContent); + Set-Content -Path $tempScriptFilename -Value $script -Encoding utf8NoBOM + + $parameter = $null + if ($AddAdminPw) { + $parameter = @{AdminUserPassword = $AdminPW;} + } + + $InvokeResult = Invoke-AzVMRunCommandWithRetries ` + -ResourceGroupName $ResourceGroupName ` + -VMName $ProtoVMName ` + -CommandId 'RunPowerShellScript' ` + -ScriptPath $tempScriptFilename ` + -Parameter $parameter + + Write-Host "$ScriptName output: $($InvokeResult.value.Message)" + } finally { + Remove-Item $tempScriptFilename -Force + } +} + +Invoke-ScriptWithPrefix -ScriptName 'deploy-windows-sdks.ps1' -AddAdminPw + +#################################################################################################### +Invoke-ScriptWithPrefix -ScriptName 'deploy-visual-studio.ps1' -AddAdminPw + +#################################################################################################### +Invoke-ScriptWithPrefix -ScriptName 'deploy-mpi.ps1' -AddAdminPw + +#################################################################################################### +$StorageAccountKeys = Get-AzStorageAccountKey ` + -ResourceGroupName 'vcpkg-image-minting' ` + -Name 'vcpkgimageminting' + +$StorageContext = New-AzStorageContext ` + -StorageAccountName 'vcpkgimageminting' ` + -StorageAccountKey $StorageAccountKeys[0].Value + +$StartTime = [DateTime]::Now +$ExpiryTime = $StartTime.AddDays(1) + +$SetupSasToken = New-AzStorageAccountSASToken ` + -Service Blob ` + -Permission "r" ` + -Context $StorageContext ` + -StartTime $StartTime ` + -ExpiryTime $ExpiryTime ` + -ResourceType Object ` + -Protocol HttpsOnly + +Invoke-ScriptWithPrefix -ScriptName 'deploy-cuda.ps1' -AddAdminPw -CudnnUrl ($CudnnBaseUrl + $SetupSasToken) + +#################################################################################################### +Invoke-ScriptWithPrefix -ScriptName 'deploy-inteloneapi.ps1' -AddAdminPw + +#################################################################################################### +Invoke-ScriptWithPrefix -ScriptName 'deploy-pwsh.ps1' -AddAdminPw + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Running provisioning script deploy-settings.txt (as a .ps1) in VM' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$ProvisionImageResult = Invoke-AzVMRunCommandWithRetries ` + -ResourceGroupName $ResourceGroupName ` + -VMName $ProtoVMName ` + -CommandId 'RunPowerShellScript' ` + -ScriptPath "$PSScriptRoot\deploy-settings.txt" + +Write-Host "deploy-settings.txt output: $($ProvisionImageResult.value.Message)" +Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Running provisioning script sysprep.ps1 in VM' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$SysprepResult = Invoke-AzVMRunCommandWithRetries ` + -ResourceGroupName $ResourceGroupName ` + -VMName $ProtoVMName ` + -CommandId 'RunPowerShellScript' ` + -ScriptPath "$PSScriptRoot\sysprep.ps1" + +Write-Host "sysprep.ps1 output: $($SysprepResult.value.Message)" + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Waiting for VM to shut down' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +Wait-Shutdown -ResourceGroupName $ResourceGroupName -Name $ProtoVMName + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Converting VM to Image' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +Stop-AzVM ` + -ResourceGroupName $ResourceGroupName ` + -Name $ProtoVMName ` + -Force + +Set-AzVM ` + -ResourceGroupName $ResourceGroupName ` + -Name $ProtoVMName ` + -Generalized + +$VM = Get-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName +$ImageConfig = New-AzImageConfig -Location $Location -SourceVirtualMachineId $VM.ID +$ImageName = Find-ImageName -ResourceGroupName 'vcpkg-image-minting' -Prefix $Prefix +New-AzImage -Image $ImageConfig -ImageName $ImageName -ResourceGroupName 'vcpkg-image-minting' + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Deleting unused temporary resources' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +Remove-AzResourceGroup $ResourceGroupName -Force + +#################################################################################################### +Write-Progress -Activity $ProgressActivity -Completed +Write-Host "Generated Image: $ImageName" +Write-Host 'Finished!' diff --git a/externals/vcpkg/scripts/azure-pipelines/windows/create-vmss.ps1 b/externals/vcpkg/scripts/azure-pipelines/windows/create-vmss.ps1 new file mode 100755 index 000000000..bf3586c84 --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/windows/create-vmss.ps1 @@ -0,0 +1,94 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT +# + +<# +.SYNOPSIS +Creates a Windows virtual machine scale set, set up for vcpkg's CI. + +.DESCRIPTION +create-vmss.ps1 creates an Azure Windows VM scale set, set up for vcpkg's CI +system. See https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/overview +for more information. + +This script assumes you have installed Azure tools into PowerShell by following the instructions +at https://docs.microsoft.com/en-us/powershell/azure/install-az-ps?view=azps-3.6.1 +or are running from Azure Cloud Shell. + +.PARAMETER ImageName +The name of the image to deploy into the scale set. +#> + +[CmdLetBinding()] +Param( + [parameter(Mandatory=$true)] + [string]$ImageName +) + +$Location = 'eastasia' +$Prefix = 'PrWin-' +$Prefix += (Get-Date -Format 'yyyy-MM-dd') +$VMSize = 'Standard_D32a_v4' +$LiveVMPrefix = 'BUILD' +$ErrorActionPreference = 'Stop' + +Import-Module "$PSScriptRoot/../create-vmss-helpers.psm1" -DisableNameChecking + +$ResourceGroupName = Find-ResourceGroupName $Prefix +$AdminPW = New-Password +$Image = Get-AzImage -ResourceGroupName 'vcpkg-image-minting' -ImageName $ImageName + +New-AzResourceGroup -Name $ResourceGroupName -Location $Location + +$VirtualNetwork = Create-LockedDownNetwork -ResourceGroupName $ResourceGroupName -Location $Location +$VmssIpConfigName = $ResourceGroupName + 'VmssIpConfig' +$VmssIpConfig = New-AzVmssIpConfig -SubnetId $VirtualNetwork.Subnets[0].Id -Primary -Name $VmssIpConfigName +$VmssName = $ResourceGroupName + 'Vmss' +$Vmss = New-AzVmssConfig ` + -Location $Location ` + -SkuCapacity 0 ` + -SkuName $VMSize ` + -SkuTier 'Standard' ` + -Overprovision $false ` + -UpgradePolicyMode Manual ` + -EvictionPolicy Delete ` + -Priority Spot ` + -MaxPrice -1 + +$NicName = $ResourceGroupName + 'NIC' +New-AzNetworkInterface ` + -Name $NicName ` + -ResourceGroupName $ResourceGroupName ` + -Location $Location ` + -Subnet $VirtualNetwork.Subnets[0] + +$Vmss = Add-AzVmssNetworkInterfaceConfiguration ` + -VirtualMachineScaleSet $Vmss ` + -Primary $true ` + -IpConfiguration $VmssIpConfig ` + -NetworkSecurityGroupId $VirtualNetwork.Subnets[0].NetworkSecurityGroup.Id ` + -Name $NicName + +$Vmss = Set-AzVmssOsProfile ` + -VirtualMachineScaleSet $Vmss ` + -ComputerNamePrefix $LiveVMPrefix ` + -AdminUsername 'AdminUser' ` + -AdminPassword $AdminPW ` + -WindowsConfigurationProvisionVMAgent $true ` + -WindowsConfigurationEnableAutomaticUpdate $false + +$Vmss = Set-AzVmssStorageProfile ` + -VirtualMachineScaleSet $Vmss ` + -OsDiskCreateOption 'FromImage' ` + -OsDiskCaching ReadOnly ` + -DiffDiskSetting Local ` + -ImageReferenceId $Image.Id + +New-AzVmss ` + -ResourceGroupName $ResourceGroupName ` + -Name $VmssName ` + -VirtualMachineScaleSet $Vmss + +Write-Host "Location: $Location" +Write-Host "Resource group name: $ResourceGroupName" +Write-Host 'Finished!' diff --git a/externals/vcpkg/scripts/azure-pipelines/windows/deploy-cuda.ps1 b/externals/vcpkg/scripts/azure-pipelines/windows/deploy-cuda.ps1 new file mode 100755 index 000000000..6a53c479c --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/windows/deploy-cuda.ps1 @@ -0,0 +1,62 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT + +# REPLACE WITH DROP-TO-ADMIN-USER-PREFIX.ps1 + +# REPLACE WITH UTILITY-PREFIX.ps1 + +# REPLACE WITH $CudnnUrl + +$CudnnLocalZipPath = "$PSScriptRoot\cudnn-windows-x86_64-8.3.2.44_cuda11.5-archive.zip" + +$CudaUrl = 'https://developer.download.nvidia.com/compute/cuda/11.6.0/network_installers/cuda_11.6.0_windows_network.exe' + +$CudaFeatures = 'nvcc_11.6 cuobjdump_11.6 nvprune_11.6 cupti_11.6 memcheck_11.6 nvdisasm_11.6 nvprof_11.6 ' + ` + 'visual_studio_integration_11.6 visual_profiler_11.6 visual_profiler_11.6 cublas_11.6 cublas_dev_11.6 ' + ` + 'cudart_11.6 cufft_11.6 cufft_dev_11.6 curand_11.6 curand_dev_11.6 cusolver_11.6 cusolver_dev_11.6 ' + ` + 'cusparse_11.6 cusparse_dev_11.6 npp_11.6 npp_dev_11.6 nvrtc_11.6 nvrtc_dev_11.6 nvml_dev_11.6 ' + ` + 'occupancy_calculator_11.6 thrust_11.6 ' + +$destination = "$env:ProgramFiles\NVIDIA GPU Computing Toolkit\CUDA\v11.6" + +try { + Write-Host 'Downloading CUDA...' + [string]$installerPath = Get-TempFilePath -Extension 'exe' + curl.exe -L -o $installerPath -s -S $CudaUrl + Write-Host 'Installing CUDA...' + $proc = Start-Process -FilePath $installerPath -ArgumentList @('-s ' + $CudaFeatures) -Wait -PassThru + $exitCode = $proc.ExitCode + if ($exitCode -eq 0) { + Write-Host 'Installation successful!' + } + else { + Write-Error "Installation failed! Exited with $exitCode." + throw + } +} +catch { + Write-Error "Failed to install CUDA! $($_.Exception.Message)" + throw +} + +try { + if ([string]::IsNullOrWhiteSpace($CudnnUrl)) { + if (-Not (Test-Path $CudnnLocalZipPath)) { + throw "CUDNN zip ($CudnnLocalZipPath) was missing, please download from NVidia and place next to this script." + } + + $cudnnZipPath = $CudnnLocalZipPath + } else { + Write-Host 'Downloading CUDNN...' + $cudnnZipPath = Get-TempFilePath -Extension 'zip' + curl.exe -L -o $cudnnZipPath -s -S $CudnnUrl + } + + Write-Host "Installing CUDNN to $destination..." + tar.exe -xvf "$cudnnZipPath" --strip 1 --directory "$destination" + Write-Host 'Installation successful!' +} +catch { + Write-Error "Failed to install CUDNN! $($_.Exception.Message)" + throw +} diff --git a/externals/vcpkg/scripts/azure-pipelines/windows/deploy-install-disk.ps1 b/externals/vcpkg/scripts/azure-pipelines/windows/deploy-install-disk.ps1 new file mode 100755 index 000000000..6bbc17587 --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/windows/deploy-install-disk.ps1 @@ -0,0 +1,60 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT + +# REPLACE WITH UTILITY-PREFIX.ps1 + +<# +.SYNOPSIS +Partitions a new physical disk. +.DESCRIPTION +Takes the disk $DiskNumber, turns it on, then partitions it for use with label +$Label and drive letter $Letter. +.PARAMETER DiskNumber +The number of the disk to set up. +.PARAMETER Letter +The drive letter at which to mount the disk. +.PARAMETER Label +The label to give the disk. +#> +Function New-PhysicalDisk { +Param( + [int]$DiskNumber, + [string]$Letter, + [string]$Label +) + if ($Letter.Length -ne 1) { + throw "Bad drive letter $Letter, expected only one letter. (Did you accidentially add a : ?)" + } + + try { + Write-Host "Attempting to online physical disk $DiskNumber" + [string]$diskpartScriptPath = Get-TempFilePath -Extension 'txt' + [string]$diskpartScriptContent = + "SELECT DISK $DiskNumber`r`n" + + "ONLINE DISK`r`n" + + Write-Host "Writing diskpart script to $diskpartScriptPath with content:" + Write-Host $diskpartScriptContent + Set-Content -Path $diskpartScriptPath -Value $diskpartScriptContent + Write-Host 'Invoking DISKPART...' + & diskpart.exe /s $diskpartScriptPath + + Write-Host "Provisioning physical disk $DiskNumber as drive $Letter" + [string]$diskpartScriptContent = + "SELECT DISK $DiskNumber`r`n" + + "ATTRIBUTES DISK CLEAR READONLY`r`n" + + "CREATE PARTITION PRIMARY`r`n" + + "FORMAT FS=NTFS LABEL=`"$Label`" QUICK`r`n" + + "ASSIGN LETTER=$Letter`r`n" + Write-Host "Writing diskpart script to $diskpartScriptPath with content:" + Write-Host $diskpartScriptContent + Set-Content -Path $diskpartScriptPath -Value $diskpartScriptContent + Write-Host 'Invoking DISKPART...' + & diskpart.exe /s $diskpartScriptPath + } + catch { + Write-Error "Failed to provision physical disk $DiskNumber as drive $Letter! $($_.Exception.Message)" + } +} + +New-PhysicalDisk -DiskNumber 1 -Letter 'E' -Label 'install disk' diff --git a/externals/vcpkg/scripts/azure-pipelines/windows/deploy-inteloneapi.ps1 b/externals/vcpkg/scripts/azure-pipelines/windows/deploy-inteloneapi.ps1 new file mode 100755 index 000000000..5b58b7eb4 --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/windows/deploy-inteloneapi.ps1 @@ -0,0 +1,74 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT + +# REPLACE WITH DROP-TO-ADMIN-USER-PREFIX.ps1 + +# REPLACE WITH UTILITY-PREFIX.ps1 + +# Seems like only the HPC kit is really needed? +#$oneAPIBaseUrl = 'https://registrationcenter-download.intel.com/akdlm/irc_nas/17768/w_BaseKit_p_2021.2.0.2871_offline.exe' +$oneAPIHPCUrl = 'https://registrationcenter-download.intel.com/akdlm/irc_nas/18578/w_HPCKit_p_2022.1.3.145_offline.exe' + +# Possible oneAPI Base components: +#intel.oneapi.win.vtune 2021.1.1-68 true Intel® VTune(TM) Profiler +#intel.oneapi.win.tbb.devel 2021.1.1-133 true Intel® oneAPI Threading Building Blocks +#intel.oneapi.win.dnnl 2021.1.1-44 true Intel® oneAPI Deep Neural Network Library +#intel.oneapi.win.mkl.devel 2021.1.1-52 true Intel® oneAPI Math Kernel Library +#intel.oneapi.win.vpl 2021.1.1-76 true Intel® oneAPI Video Processing Library +#intel.oneapi.win.dpcpp_debugger 10.0.0-2213 true Intel® Distribution for GDB* +#intel.oneapi.win.ipp.devel 2021.1.1-47 true Intel® Integrated Performance Primitives +#intel.oneapi.win.ippcp 2021.1.1-53 true Intel® Integrated Performance Primitives Cryptography +#intel.oneapi.win.dpcpp-compiler 2021.1.1-191 true Intel® oneAPI DPC++/C++ Compiler +#intel.oneapi.win.dpcpp-library 2021.1.1-191 true Intel® oneAPI DPC++ Library +#intel.oneapi.win.dpcpp_ct.common 2021.1.1-54 true Intel® DPC++ Compatibility Tool +#intel.oneapi.win.dal.devel 2021.1.1-71 true Intel® oneAPI Data Analytics Library +#intel.oneapi.win.python3 2021.1.1-46 true Intel® Distribution for Python* +#intel.oneapi.win.advisor 2021.1.1-53 true Intel® Advisor +#$oneAPIBaseComponents = 'intel.oneapi.win.dpcpp-compiler:intel.oneapi.win.dpcpp-library:intel.oneapi.win.mkl.devel:intel.oneapi.win.ipp.devel:intel.oneapi.win.ippcp:intel.oneapi.win.dal.devel:intel.oneapi.win.dnnl:intel.oneapi.win.vpl:intel.oneapi.win.tbb.devel' +$oneAPIHPCComponents = 'intel.oneapi.win.cpp-compiler:intel.oneapi.win.ifort-compiler' + +<# +.SYNOPSIS +Installs Intel oneAPI compilers and toolsets. Examples for CI can be found here: https://github.com/oneapi-src/oneapi-ci + +.DESCRIPTION +InstallInteloneAPI installs the Intel oneAPI Compiler & Toolkit with the components specified as a +:-separated list of strings in $Components. + +.PARAMETER Url +The URL of the Intel Toolkit installer. + +.PARAMETER Components +A :-separated list of components to install. +#> +Function InstallInteloneAPI { + Param( + [String]$Url, + [String]$Components + ) + + try { + [string]$installerPath = Get-TempFilePath -Extension 'exe' + [string]$extractionPath = [System.IO.Path]::GetTempPath() + [System.IO.Path]::GetRandomFileName() + Write-Host 'Downloading Intel oneAPI...to: ' $installerPath + curl.exe -L -o $installerPath -s -S $Url + Write-Host 'Extracting Intel oneAPI...to folder: ' $extractionPath + $proc = Start-Process -FilePath $installerPath -ArgumentList @('-s ', '-x ', '-f ' + $extractionPath , '--log extract.log') -Wait -PassThru + Write-Host 'Install Intel oneAPI...from folder: ' $extractionPath + $proc = Start-Process -FilePath $extractionPath/bootstrapper.exe -ArgumentList @('-s ', '--action install', "--components=$Components" , '--eula=accept', '-p=NEED_VS2017_INTEGRATION=0', '-p=NEED_VS2019_INTEGRATION=0', '-p=NEED_VS2022_INTEGRATION=0', '--log-dir=.') -Wait -PassThru + $exitCode = $proc.ExitCode + if ($exitCode -eq 0) { + Write-Host 'Installation successful!' + } + else { + Write-Error "Installation failed! Exited with $exitCode." + throw + } + } + catch { + Write-Error "Failed to install Intel oneAPI! $($_.Exception.Message)" + throw + } +} + +InstallInteloneAPI -Url $oneAPIHPCUrl -Components $oneAPIHPCComponents diff --git a/externals/vcpkg/scripts/azure-pipelines/windows/deploy-mpi.ps1 b/externals/vcpkg/scripts/azure-pipelines/windows/deploy-mpi.ps1 new file mode 100755 index 000000000..ba369f797 --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/windows/deploy-mpi.ps1 @@ -0,0 +1,47 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT + +# REPLACE WITH DROP-TO-ADMIN-USER-PREFIX.ps1 + +# REPLACE WITH UTILITY-PREFIX.ps1 + +$MpiUrl = 'https://download.microsoft.com/download/a/5/2/a5207ca5-1203-491a-8fb8-906fd68ae623/msmpisetup.exe' + +<# +.SYNOPSIS +Installs MPI + +.DESCRIPTION +Downloads the MPI installer located at $Url, and installs it with the +correct flags. + +.PARAMETER Url +The URL of the installer. +#> +Function InstallMpi { + Param( + [String]$Url + ) + + try { + Write-Host 'Downloading MPI...' + [string]$installerPath = Get-TempFilePath -Extension 'exe' + curl.exe -L -o $installerPath -s -S $Url + Write-Host 'Installing MPI...' + $proc = Start-Process -FilePath $installerPath -ArgumentList @('-force', '-unattend') -Wait -PassThru + $exitCode = $proc.ExitCode + if ($exitCode -eq 0) { + Write-Host 'Installation successful!' + } + else { + Write-Error "Installation failed! Exited with $exitCode." + throw + } + } + catch { + Write-Error "Failed to install MPI! $($_.Exception.Message)" + throw + } +} + +InstallMpi -Url $MpiUrl diff --git a/externals/vcpkg/scripts/azure-pipelines/windows/deploy-psexec.ps1 b/externals/vcpkg/scripts/azure-pipelines/windows/deploy-psexec.ps1 new file mode 100755 index 000000000..2a1f6fb14 --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/windows/deploy-psexec.ps1 @@ -0,0 +1,8 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT + +$ErrorActionPreference = 'Stop' +$ProgressPreference = 'SilentlyContinue' +$PsExecPath = 'C:\PsExec64.exe' +Write-Host "Downloading psexec to: $PsExecPath" +& curl.exe -L -o $PsExecPath -s -S https://live.sysinternals.com/PsExec64.exe diff --git a/externals/vcpkg/scripts/azure-pipelines/windows/deploy-pwsh.ps1 b/externals/vcpkg/scripts/azure-pipelines/windows/deploy-pwsh.ps1 new file mode 100755 index 000000000..ebb14c5ad --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/windows/deploy-pwsh.ps1 @@ -0,0 +1,9 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT + +# REPLACE WITH DROP-TO-ADMIN-USER-PREFIX.ps1 + +# REPLACE WITH UTILITY-PREFIX.ps1 + +$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/PowerShell-7.2.3-win-x64.msi' +InstallMSI -Url $PwshUrl -Name 'PowerShell Core' diff --git a/externals/vcpkg/scripts/azure-pipelines/windows/deploy-settings.txt b/externals/vcpkg/scripts/azure-pipelines/windows/deploy-settings.txt new file mode 100755 index 000000000..c340453c6 --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/windows/deploy-settings.txt @@ -0,0 +1,21 @@ +$ErrorActionPreference = 'Stop' +$ProgressPreference = 'SilentlyContinue' + +Write-Host 'Disabling pagefile...' +wmic computersystem set AutomaticManagedPagefile=False +wmic pagefileset delete + +$av = Get-Command Add-MPPreference -ErrorAction SilentlyContinue +if ($null -eq $av) { + Write-Host 'AntiVirus not installed, skipping exclusions.' +} else { + Write-Host 'Configuring AntiVirus exclusions...' + Add-MpPreference -ExclusionPath C:\agent + Add-MPPreference -ExclusionPath D:\ + Add-MPPreference -ExclusionPath E:\ + Add-MPPreference -ExclusionProcess ninja.exe + Add-MPPreference -ExclusionProcess clang-cl.exe + Add-MPPreference -ExclusionProcess cl.exe + Add-MPPreference -ExclusionProcess link.exe + Add-MPPreference -ExclusionProcess python.exe +} diff --git a/externals/vcpkg/scripts/azure-pipelines/windows/deploy-tlssettings.ps1 b/externals/vcpkg/scripts/azure-pipelines/windows/deploy-tlssettings.ps1 new file mode 100755 index 000000000..4b00a6dea --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/windows/deploy-tlssettings.ps1 @@ -0,0 +1,738 @@ +#*************************************************************************************************************** +# This script supports the TLS 1.2 everywhere project +# It does the following: +# * By default it disables TLS 1.O, TLS 1.1, SSLv2, SSLv3 and Enables TLS1.2 +# * The CipherSuite order is set to the SDL approved version. +# * The FIPS MinEncryptionLevel is set to 3. +# * RC4 is disabled +# * A log with a transcript of all actions taken is generated +#*************************************************************************************************************** + +#************************************************ SCRIPT USAGE ************************************************ +# .\TLSSettings.ps1 +# -SetCipherOrder : Excellence/Min-Bar, default(Excellence), use B to set Min-Bar. (Min-Bar ordering prefers ciphers with smaller key sizes to improve performance over security) +# -RebootIfRequired : $true/$false, default($true), use $false to disable auto-reboot (Settings won't take effect until a reboot is completed) +# -EnableOlderTlsVersions : $true/$false, default($false), use $true to explicitly Enable TLS1.0, TLS1.1 +#*************************************************************************************************************** + +#***************************TEAM CAN DETERMINE WHAT CIPHER SUITE ORDER IS CHOSEN ****************************** +# Option B provides the min-bar configuration (small trade-off: performance over security) +# Syntax: .\TLSSettings.ps1 -SetCipherOrder B +# if no option is supplied, you will get the opportunity for excellence cipher order (small trade-off: security over performance) +# Syntax: .\TLSSettings.ps1 +#*************************************************************************************************************** + +param ( + [string]$SetCipherOrder = " ", + [bool]$RebootIfRequired = $true, + [bool]$EnableOlderTlsVersions = $false +) + +#******************* FUNCTION THAT ACTUALLY UPDATES KEYS; WILL RETURN REBOOT FLAG IF CHANGES *********************** +Function Set-CryptoSetting { + param ( + $regKeyName, + $value, + $valuedata, + $valuetype + ) + + $restart = $false + + # Check for existence of registry key, and create if it does not exist + If (!(Test-Path -Path $regKeyName)) { + New-Item $regKeyName | Out-Null + } + + + # Get data of registry value, or null if it does not exist + $val = (Get-ItemProperty -Path $regKeyName -Name $value -ErrorAction SilentlyContinue).$value + + + If ($val -eq $null) { + # Value does not exist - create and set to desired value + New-ItemProperty -Path $regKeyName -Name $value -Value $valuedata -PropertyType $valuetype | Out-Null + $restart = $true + } + Else { + # Value does exist - if not equal to desired value, change it + If ($val -ne $valuedata) { + Set-ItemProperty -Path $regKeyName -Name $value -Value $valuedata + $restart = $true + } + } + + + $restart +} +#*************************************************************************************************************** + + +#******************* FUNCTION THAT DISABLES RC4 *********************** +Function DisableRC4 { + + $restart = $false + $subkeys = Get-Item -Path "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL" + $ciphers = $subkeys.OpenSubKey("Ciphers", $true) + + Write-Log -Message "----- Checking the status of RC4 -----" -Logfile $logLocation -Severity Information + + $RC4 = $false + if ($ciphers.SubKeyCount -eq 0) { + $k1 = $ciphers.CreateSubKey("RC4 128/128") + $k1.SetValue("Enabled", 0, [Microsoft.Win32.RegistryValueKind]::DWord) + $restart = $true + $k2 = $ciphers.CreateSubKey("RC4 64/128") + $k2.SetValue("Enabled", 0, [Microsoft.Win32.RegistryValueKind]::DWord) + $k3 = $ciphers.CreateSubKey("RC4 56/128") + $k3.SetValue("Enabled", 0, [Microsoft.Win32.RegistryValueKind]::DWord) + $k4 = $ciphers.CreateSubKey("RC4 40/128") + $k4.SetValue("Enabled", 0, [Microsoft.Win32.RegistryValueKind]::DWord) + + Write-Log -Message "RC4 was disabled " -Logfile $logLocation -Severity Information + $RC4 = $true + } + + If ($RC4 -ne $true) { + Write-Log -Message "There was no change for RC4 " -Logfile $logLocation -Severity Information + } + + $restart +} +#*************************************************************************************************************** + +#******************* FUNCTION CHECKS FOR PROBLEMATIC FIPS SETTING AND FIXES IT *********************** +Function Test-RegistryValueForFipsSettings { + + $restart = $false + + $fipsPath = @( + "HKLM:\System\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp", + "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services", + "HKLM:\System\CurrentControlSet\Control\Terminal Server\DefaultUserConfiguration" + ) + + $fipsValue = "MinEncryptionLevel" + + + foreach ($path in $fipsPath) { + + Write-Log -Message "Checking to see if $($path)\$fipsValue exists" -Logfile $logLocation -Severity Information + + $ErrorActionPreference = "stop" + Try { + + $result = Get-ItemProperty -Path $path | Select-Object -ExpandProperty $fipsValue + if ($result -eq 4) { + set-itemproperty -Path $path -Name $fipsValue -value 3 + Write-Log -Message "Regkey $($path)\$fipsValue was changed from value $result to a value of 3" -Logfile $logLocation -Severity Information + $restart = $true + } + else { + Write-Log -Message "Regkey $($path)\$fipsValue left at value $result" -Logfile $logLocation -Severity Information + } + + } + Catch [System.Management.Automation.ItemNotFoundException] { + + Write-Log -Message "Reg path $path was not found" -Logfile $logLocation -Severity Information + } + Catch [System.Management.Automation.PSArgumentException] { + + Write-Log -Message "Regkey $($path)\$fipsValue was not found" -Logfile $logLocation -Severity Information + } + Catch { + Write-Log -Message "Error of type $($Error[0].Exception.GetType().FullName) trying to get $($path)\$fipsValue" -Logfile $logLocation -Severity Information + } + Finally {$ErrorActionPreference = "Continue" + } + } + $restart +} +#*************************************************************************************************************** + +#********************************** FUNCTION THAT CREATE LOG DIRECTORY IF IT DOES NOT EXIST ******************************* +function CreateLogDirectory { + + $TARGETDIR = "$env:HOMEDRIVE\Logs" + if ( -Not (Test-Path -Path $TARGETDIR ) ) { + New-Item -ItemType directory -Path $TARGETDIR | Out-Null + } + + $TARGETDIR = $TARGETDIR + "\" + "TLSSettingsLogFile.csv" + + return $TARGETDIR +} +#*************************************************************************************************************** + + +#********************************** FUNCTION THAT LOGS WHAT THE SCRIPT IS DOING ******************************* +function Write-Log { + [CmdletBinding()] + param( + [Parameter()] + [ValidateNotNullOrEmpty()] + [string]$Message, + + [Parameter()] + [ValidateNotNullOrEmpty()] + [string]$LogFile, + + [Parameter()] + [ValidateNotNullOrEmpty()] + [ValidateSet('Information', 'Warning', 'Error')] + [string]$Severity = 'Information' + ) + + + [pscustomobject]@{ + Time = (Get-Date -f g) + Message = $Message + Severity = $Severity + } | ConvertTo-Csv -NoTypeInformation | Select-Object -Skip 1 | Out-File -Append -FilePath $LogFile +} + +#********************************TLS CipherSuite Settings ******************************************* + +# CipherSuites for windows OS < 10 +function Get-BaseCipherSuitesOlderWindows() +{ + param + ( + [Parameter(Mandatory=$true, Position=0)][bool] $isExcellenceOrder + ) + $cipherorder = @() + + if ($isExcellenceOrder -eq $true) + { + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384_P384" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256_P256" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384_P384" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256_P256" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256" + } + else + { + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256_P256" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384_P384" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256_P256" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384_P384" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384" + } + + # Add additional ciphers when EnableOlderTlsVersions flag is set to true + if ($EnableOlderTlsVersions) + { + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA_P256" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA_P256" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P256" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA_P256" + $cipherorder += "TLS_RSA_WITH_AES_256_GCM_SHA384" + $cipherorder += "TLS_RSA_WITH_AES_128_GCM_SHA256" + $cipherorder += "TLS_RSA_WITH_AES_256_CBC_SHA256" + $cipherorder += "TLS_RSA_WITH_AES_128_CBC_SHA256" + $cipherorder += "TLS_RSA_WITH_AES_256_CBC_SHA" + $cipherorder += "TLS_RSA_WITH_AES_128_CBC_SHA" + } + return $cipherorder +} + +# Ciphersuites needed for backwards compatibility with Firefox, Chrome +# Server 2012 R2 doesn't support TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 +# Both firefox and chrome negotiate ECDHE_RSA_AES_256_CBC_SHA1, Edge negotiates ECDHE_RSA_AES_256_CBC_SHA384 +function Get-BrowserCompatCipherSuitesOlderWindows() +{ + param + ( + [Parameter(Mandatory=$true, Position=0)][bool] $isExcellenceOrder + ) + $cipherorder = @() + + if ($isExcellenceOrder -eq $true) + { + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384" # (uses SHA-1) + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA_P256" # (uses SHA-1) + } + else + { + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA_P256" # (uses SHA-1) + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384" # (uses SHA-1) + } + return $cipherorder +} + +# Ciphersuites for OS versions windows 10 and above +function Get-BaseCipherSuitesWin10Above() +{ + param + ( + [Parameter(Mandatory=$true, Position=0)][bool] $isExcellenceOrder + ) + + $cipherorder = @() + + if ($isExcellenceOrder -eq $true) + { + + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" + } + else + { + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384" + } + # Add additional ciphers when EnableOlderTlsVersions flag is set to true + if ($EnableOlderTlsVersions) + { + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA_P256" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA_P256" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P256" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA_P256" + $cipherorder += "TLS_RSA_WITH_AES_256_GCM_SHA384" + $cipherorder += "TLS_RSA_WITH_AES_128_GCM_SHA256" + $cipherorder += "TLS_RSA_WITH_AES_256_CBC_SHA256" + $cipherorder += "TLS_RSA_WITH_AES_128_CBC_SHA256" + $cipherorder += "TLS_RSA_WITH_AES_256_CBC_SHA" + $cipherorder += "TLS_RSA_WITH_AES_128_CBC_SHA" + } + + return $cipherorder +} + + +#******************************* TLS Version Settings **************************************************** + +function Get-RegKeyPathForTls12() +{ + $regKeyPath = @( + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.2", + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.2\Client", + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.2\Server" + ) + return $regKeyPath +} + +function Get-RegKeyPathForTls11() +{ + $regKeyPath = @( + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.1", + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.1\Client", + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.1\Server" + ) + return $regKeyPath +} + +function Get-RegKeypathForTls10() +{ + $regKeyPath = @( + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.0", + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.0\Client", + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.0\Server" + ) + return $regKeyPath +} + +function Get-RegKeyPathForSsl30() +{ + $regKeyPath = @( + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\SSL 3.0", + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\SSL 3.0\Client", + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\SSL 3.0\Server" + ) + return $regKeyPath +} + +function Get-RegKeyPathForSsl20() +{ + $regKeyPath = @( + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\SSL 2.0", + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\SSL 2.0\Client", + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\SSL 2.0\Server" + ) + return $regKeyPath +} + +#Initialize reboot value to false +$reboot = $false + +#*****************************Create the logfile if not does not exist*************************************** +$logLocation = CreateLogDirectory + + +#Start writing to the logs +Write-Log -Message "========== Start of logging for a script execution ==========" -Logfile $logLocation -Severity Information + +$registryPathGoodGuys = @() +$registryPathBadGuys = @() + +# we enable TLS 1.2 and disable SSL 2.0, 3.0 in any case +$registryPathGoodGuys += Get-RegKeyPathForTls12 + +$registryPathBadGuys += Get-RegKeyPathForSsl20 +$registryPathBadGuys += Get-RegKeyPathForSsl30 + +# add TLS 1.0/1.1 to good/bad depending on user's preference +# default is adding TLS 1.0/1.1 to bad +if ($EnableOlderTlsVersions) +{ + $registryPathGoodGuys += Get-RegKeypathForTls10 + $registryPathGoodGuys += Get-RegKeyPathForTls11 + Write-Log -Message "Enabling TLS1.2, TLS1.1, TLS1.0. Disabling SSL3.0, SSL2.0" -Logfile $logLocation -Severity Information +} +else +{ + $registryPathBadGuys += Get-RegKeypathForTls10 + $registryPathBadGuys += Get-RegKeyPathForTls11 + Write-Log -Message "Enabling TLS1.2. Disabling TLS1.1, TLS1.0, SSL3.0, SSL2.0" -Logfile $logLocation -Severity Information +} + + +Write-Log -Message "Check which registry keys exist already and which registry keys need to be created." -Logfile $logLocation -Severity Information + +#******************* CREATE THE REGISTRY KEYS IF THEY DON'T EXIST******************************** +# Check for existence of GoodGuy registry keys, and create if they do not exist +For ($i = 0; $i -lt $registryPathGoodGuys.Length; $i = $i + 1) { + + Write-Log -Message "Checking for existing of key: $($registryPathGoodGuys[$i]) " -Logfile $logLocation -Severity Information + If (!(Test-Path -Path $registryPathGoodGuys[$i])) { + New-Item $registryPathGoodGuys[$i] | Out-Null + Write-Log -Message "Creating key: $($registryPathGoodGuys[$i]) " -Logfile $logLocation -Severity Information + } +} + +# Check for existence of BadGuy registry keys, and create if they do not exist +For ($i = 0; $i -lt $registryPathBadGuys.Length; $i = $i + 1) { + + Write-Log -Message "Checking for existing of key: $($registryPathBadGuys[$i]) " -Logfile $logLocation -Severity Information + If (!(Test-Path -Path $registryPathBadGuys[$i])) { + Write-Log -Message "Creating key: $($registryPathBadGuys[$i]) " -Logfile $logLocation -Severity Information + New-Item $registryPathBadGuys[$i] | Out-Null + } +} + +#******************* EXPLICITLY DISABLE SSLV2, SSLV3, TLS10 AND TLS11 ******************************** +For ($i = 0; $i -lt $registryPathBadGuys.Length; $i = $i + 1) { + + if ($registryPathBadGuys[$i].Contains("Client") -Or $registryPathBadGuys[$i].Contains("Server")) { + + Write-Log -Message "Disabling this key: $($registryPathBadGuys[$i]) " -Logfile $logLocation -Severity Information + $result = Set-CryptoSetting $registryPathBadGuys[$i].ToString() Enabled 0 DWord + $result = Set-CryptoSetting $registryPathBadGuys[$i].ToString() DisabledByDefault 1 DWord + $reboot = $reboot -or $result + } +} + +#********************************* EXPLICITLY Enable TLS12 **************************************** +For ($i = 0; $i -lt $registryPathGoodGuys.Length; $i = $i + 1) { + + if ($registryPathGoodGuys[$i].Contains("Client") -Or $registryPathGoodGuys[$i].Contains("Server")) { + + Write-Log -Message "Enabling this key: $($registryPathGoodGuys[$i]) " -Logfile $logLocation -Severity Information + $result = Set-CryptoSetting $registryPathGoodGuys[$i].ToString() Enabled 1 DWord + $result = Set-CryptoSetting $registryPathGoodGuys[$i].ToString() DisabledByDefault 0 DWord + $reboot = $reboot -or $result + } +} + +#************************************** Disable RC4 ************************************************ +$result = DisableRC4 +$reboot = $reboot -or $result + + +#************************************** Set Cipher Suite Order ************************************** +Write-Log -Message "----- starting ciphersuite order calculation -----" -Logfile $logLocation -Severity Information +$configureExcellenceOrder = $true +if ($SetCipherOrder.ToUpper() -eq "B") +{ + $configureExcellenceOrder = $false + Write-Host "The min bar cipher suite order was chosen." + Write-Log -Message "The min bar cipher suite order was chosen." -Logfile $logLocation -Severity Information +} +else +{ + Write-Host "The opportunity for excellence cipher suite order was chosen." + Write-Log -Message "The opportunity for excellence cipher suite order was chosen." -Logfile $logLocation -Severity Information +} +$cipherlist = @() + +if ([Environment]::OSVersion.Version.Major -lt 10) +{ + $cipherlist += Get-BaseCipherSuitesOlderWindows -isExcellenceOrder $configureExcellenceOrder + $cipherlist += Get-BrowserCompatCipherSuitesOlderWindows -isExcellenceOrder $configureExcellenceOrder +} +else +{ + $cipherlist += Get-BaseCipherSuitesWin10Above -isExcellenceOrder $configureExcellenceOrder +} +$cipherorder = [System.String]::Join(",", $cipherlist) + Write-Host "Appropriate ciphersuite order : $cipherorder" + Write-Log -Message "Appropriate ciphersuite order : $cipherorder" -Logfile $logLocation -Severity Information + +$CipherSuiteRegKey = "HKLM:\SOFTWARE\Policies\Microsoft\Cryptography\Configuration\SSL\00010002" + +if (!(Test-Path -Path $CipherSuiteRegKey)) +{ + New-Item $CipherSuiteRegKey | Out-Null + $reboot = $True + Write-Log -Message "Creating key: $($CipherSuiteRegKey) " -Logfile $logLocation -Severity Information +} + +$val = (Get-Item -Path $CipherSuiteRegKey -ErrorAction SilentlyContinue).GetValue("Functions", $null) +Write-Log -Message "Previous cipher suite value: $val " -Logfile $logLocation -Severity Information +Write-Log -Message "New cipher suite value : $cipherorder " -Logfile $logLocation -Severity Information + +if ($val -ne $cipherorder) +{ + Write-Log -Message "Cipher suite order needs to be updated. " -Logfile $logLocation -Severity Information + Write-Host "The original cipher suite order needs to be updated", `n, $val + Set-ItemProperty -Path $CipherSuiteRegKey -Name Functions -Value $cipherorder + Write-Log -Message "Cipher suite value was updated. " -Logfile $logLocation -Severity Information + $reboot = $True +} +else +{ + Write-Log -Message "Cipher suite order does not need to be updated. " -Logfile $logLocation -Severity Information + Write-Log -Message "Cipher suite value was not updated as there was no change. " -Logfile $logLocation -Severity Information +} + +#****************************** CHECK THE FIPS SETTING WHICH IMPACTS RDP'S ALLOWED CIPHERS ************************** +#Check for FipsSettings +Write-Log -Message "Checking to see if reg keys exist and if MinEncryptionLevel is set to 4" -Logfile $logLocation -Severity Information +$result = Test-RegistryValueForFipsSettings +$reboot = $reboot -or $result + + +#************************************** REBOOT ************************************** + +if ($RebootIfRequired) +{ + Write-Log -Message "You set the RebootIfRequired flag to true. If changes are made, the system will reboot " -Logfile $logLocation -Severity Information + # If any settings were changed, reboot + If ($reboot) + { + Write-Log -Message "Rebooting now... " -Logfile $logLocation -Severity Information + Write-Log -Message "Using this command: shutdown.exe /r /t 5 /c ""Crypto settings changed"" /f /d p:2:4 " -Logfile $logLocation -Severity Information + Write-Host "Rebooting now..." + shutdown.exe /r /t 5 /c "Crypto settings changed" /f /d p:2:4 + } + Else + { + Write-Host "Nothing get updated." + Write-Log -Message "Nothing get updated. " -Logfile $logLocation -Severity Information + } +} +else +{ + + Write-Log -Message "You set the RebootIfRequired flag to false. If changes are made, the system will NOT reboot " -Logfile $logLocation -Severity Information + Write-Log -Message "No changes will take effect until a reboot has been completed. " -Logfile $logLocation -Severity Information + Write-Log -Message "Script does not include a reboot by design" -Logfile $logLocation -Severity Information +} +Write-Log -Message "========== End of logging for a script execution ==========" -Logfile $logLocation -Severity Information +# SIG # Begin signature block +# MIIjhgYJKoZIhvcNAQcCoIIjdzCCI3MCAQExDzANBglghkgBZQMEAgEFADB5Bgor +# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG +# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCAHtlEJwNffjnOP +# Sr2t1yq5EfE0ll4GozyZt3UXO9BXKKCCDYEwggX/MIID56ADAgECAhMzAAABh3IX +# chVZQMcJAAAAAAGHMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAlVTMRMwEQYD +# VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMTH01pY3Jvc29mdCBDb2RlIFNpZ25p +# bmcgUENBIDIwMTEwHhcNMjAwMzA0MTgzOTQ3WhcNMjEwMzAzMTgzOTQ3WjB0MQsw +# CQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9u +# ZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMR4wHAYDVQQDExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +# AQDOt8kLc7P3T7MKIhouYHewMFmnq8Ayu7FOhZCQabVwBp2VS4WyB2Qe4TQBT8aB +# znANDEPjHKNdPT8Xz5cNali6XHefS8i/WXtF0vSsP8NEv6mBHuA2p1fw2wB/F0dH +# sJ3GfZ5c0sPJjklsiYqPw59xJ54kM91IOgiO2OUzjNAljPibjCWfH7UzQ1TPHc4d +# weils8GEIrbBRb7IWwiObL12jWT4Yh71NQgvJ9Fn6+UhD9x2uk3dLj84vwt1NuFQ +# itKJxIV0fVsRNR3abQVOLqpDugbr0SzNL6o8xzOHL5OXiGGwg6ekiXA1/2XXY7yV +# Fc39tledDtZjSjNbex1zzwSXAgMBAAGjggF+MIIBejAfBgNVHSUEGDAWBgorBgEE +# AYI3TAgBBggrBgEFBQcDAzAdBgNVHQ4EFgQUhov4ZyO96axkJdMjpzu2zVXOJcsw +# UAYDVR0RBEkwR6RFMEMxKTAnBgNVBAsTIE1pY3Jvc29mdCBPcGVyYXRpb25zIFB1 +# ZXJ0byBSaWNvMRYwFAYDVQQFEw0yMzAwMTIrNDU4Mzg1MB8GA1UdIwQYMBaAFEhu +# ZOVQBdOCqhc3NyK1bajKdQKVMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly93d3cu +# bWljcm9zb2Z0LmNvbS9wa2lvcHMvY3JsL01pY0NvZFNpZ1BDQTIwMTFfMjAxMS0w +# Ny0wOC5jcmwwYQYIKwYBBQUHAQEEVTBTMFEGCCsGAQUFBzAChkVodHRwOi8vd3d3 +# Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY0NvZFNpZ1BDQTIwMTFfMjAx +# MS0wNy0wOC5jcnQwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0BAQsFAAOCAgEAixmy +# S6E6vprWD9KFNIB9G5zyMuIjZAOuUJ1EK/Vlg6Fb3ZHXjjUwATKIcXbFuFC6Wr4K +# NrU4DY/sBVqmab5AC/je3bpUpjtxpEyqUqtPc30wEg/rO9vmKmqKoLPT37svc2NV +# BmGNl+85qO4fV/w7Cx7J0Bbqk19KcRNdjt6eKoTnTPHBHlVHQIHZpMxacbFOAkJr +# qAVkYZdz7ikNXTxV+GRb36tC4ByMNxE2DF7vFdvaiZP0CVZ5ByJ2gAhXMdK9+usx +# zVk913qKde1OAuWdv+rndqkAIm8fUlRnr4saSCg7cIbUwCCf116wUJ7EuJDg0vHe +# yhnCeHnBbyH3RZkHEi2ofmfgnFISJZDdMAeVZGVOh20Jp50XBzqokpPzeZ6zc1/g +# yILNyiVgE+RPkjnUQshd1f1PMgn3tns2Cz7bJiVUaqEO3n9qRFgy5JuLae6UweGf +# AeOo3dgLZxikKzYs3hDMaEtJq8IP71cX7QXe6lnMmXU/Hdfz2p897Zd+kU+vZvKI +# 3cwLfuVQgK2RZ2z+Kc3K3dRPz2rXycK5XCuRZmvGab/WbrZiC7wJQapgBodltMI5 +# GMdFrBg9IeF7/rP4EqVQXeKtevTlZXjpuNhhjuR+2DMt/dWufjXpiW91bo3aH6Ea +# jOALXmoxgltCp1K7hrS6gmsvj94cLRf50QQ4U8Qwggd6MIIFYqADAgECAgphDpDS +# AAAAAAADMA0GCSqGSIb3DQEBCwUAMIGIMQswCQYDVQQGEwJVUzETMBEGA1UECBMK +# V2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0 +# IENvcnBvcmF0aW9uMTIwMAYDVQQDEylNaWNyb3NvZnQgUm9vdCBDZXJ0aWZpY2F0 +# ZSBBdXRob3JpdHkgMjAxMTAeFw0xMTA3MDgyMDU5MDlaFw0yNjA3MDgyMTA5MDla +# MH4xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdS +# ZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMT +# H01pY3Jvc29mdCBDb2RlIFNpZ25pbmcgUENBIDIwMTEwggIiMA0GCSqGSIb3DQEB +# AQUAA4ICDwAwggIKAoICAQCr8PpyEBwurdhuqoIQTTS68rZYIZ9CGypr6VpQqrgG +# OBoESbp/wwwe3TdrxhLYC/A4wpkGsMg51QEUMULTiQ15ZId+lGAkbK+eSZzpaF7S +# 35tTsgosw6/ZqSuuegmv15ZZymAaBelmdugyUiYSL+erCFDPs0S3XdjELgN1q2jz +# y23zOlyhFvRGuuA4ZKxuZDV4pqBjDy3TQJP4494HDdVceaVJKecNvqATd76UPe/7 +# 4ytaEB9NViiienLgEjq3SV7Y7e1DkYPZe7J7hhvZPrGMXeiJT4Qa8qEvWeSQOy2u +# M1jFtz7+MtOzAz2xsq+SOH7SnYAs9U5WkSE1JcM5bmR/U7qcD60ZI4TL9LoDho33 +# X/DQUr+MlIe8wCF0JV8YKLbMJyg4JZg5SjbPfLGSrhwjp6lm7GEfauEoSZ1fiOIl +# XdMhSz5SxLVXPyQD8NF6Wy/VI+NwXQ9RRnez+ADhvKwCgl/bwBWzvRvUVUvnOaEP +# 6SNJvBi4RHxF5MHDcnrgcuck379GmcXvwhxX24ON7E1JMKerjt/sW5+v/N2wZuLB +# l4F77dbtS+dJKacTKKanfWeA5opieF+yL4TXV5xcv3coKPHtbcMojyyPQDdPweGF +# RInECUzF1KVDL3SV9274eCBYLBNdYJWaPk8zhNqwiBfenk70lrC8RqBsmNLg1oiM +# CwIDAQABo4IB7TCCAekwEAYJKwYBBAGCNxUBBAMCAQAwHQYDVR0OBBYEFEhuZOVQ +# BdOCqhc3NyK1bajKdQKVMBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIAQwBBMAsGA1Ud +# DwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFHItOgIxkEO5FAVO +# 4eqnxzHRI4k0MFoGA1UdHwRTMFEwT6BNoEuGSWh0dHA6Ly9jcmwubWljcm9zb2Z0 +# LmNvbS9wa2kvY3JsL3Byb2R1Y3RzL01pY1Jvb0NlckF1dDIwMTFfMjAxMV8wM18y +# Mi5jcmwwXgYIKwYBBQUHAQEEUjBQME4GCCsGAQUFBzAChkJodHRwOi8vd3d3Lm1p +# Y3Jvc29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dDIwMTFfMjAxMV8wM18y +# Mi5jcnQwgZ8GA1UdIASBlzCBlDCBkQYJKwYBBAGCNy4DMIGDMD8GCCsGAQUFBwIB +# FjNodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2RvY3MvcHJpbWFyeWNw +# cy5odG0wQAYIKwYBBQUHAgIwNB4yIB0ATABlAGcAYQBsAF8AcABvAGwAaQBjAHkA +# XwBzAHQAYQB0AGUAbQBlAG4AdAAuIB0wDQYJKoZIhvcNAQELBQADggIBAGfyhqWY +# 4FR5Gi7T2HRnIpsLlhHhY5KZQpZ90nkMkMFlXy4sPvjDctFtg/6+P+gKyju/R6mj +# 82nbY78iNaWXXWWEkH2LRlBV2AySfNIaSxzzPEKLUtCw/WvjPgcuKZvmPRul1LUd +# d5Q54ulkyUQ9eHoj8xN9ppB0g430yyYCRirCihC7pKkFDJvtaPpoLpWgKj8qa1hJ +# Yx8JaW5amJbkg/TAj/NGK978O9C9Ne9uJa7lryft0N3zDq+ZKJeYTQ49C/IIidYf +# wzIY4vDFLc5bnrRJOQrGCsLGra7lstnbFYhRRVg4MnEnGn+x9Cf43iw6IGmYslmJ +# aG5vp7d0w0AFBqYBKig+gj8TTWYLwLNN9eGPfxxvFX1Fp3blQCplo8NdUmKGwx1j +# NpeG39rz+PIWoZon4c2ll9DuXWNB41sHnIc+BncG0QaxdR8UvmFhtfDcxhsEvt9B +# xw4o7t5lL+yX9qFcltgA1qFGvVnzl6UJS0gQmYAf0AApxbGbpT9Fdx41xtKiop96 +# eiL6SJUfq/tHI4D1nvi/a7dLl+LrdXga7Oo3mXkYS//WsyNodeav+vyL6wuA6mk7 +# r/ww7QRMjt/fdW1jkT3RnVZOT7+AVyKheBEyIXrvQQqxP/uozKRdwaGIm1dxVk5I +# RcBCyZt2WwqASGv9eZ/BvW1taslScxMNelDNMYIVWzCCFVcCAQEwgZUwfjELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEoMCYGA1UEAxMfTWljcm9z +# b2Z0IENvZGUgU2lnbmluZyBQQ0EgMjAxMQITMwAAAYdyF3IVWUDHCQAAAAABhzAN +# BglghkgBZQMEAgEFAKCBrjAZBgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIBBDAcBgor +# BgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG9w0BCQQxIgQgOQvu7NUq +# wmve+qCoalj/s9HX5Hz9/zYISdJyOFTC4FIwQgYKKwYBBAGCNwIBDDE0MDKgFIAS +# AE0AaQBjAHIAbwBzAG8AZgB0oRqAGGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbTAN +# BgkqhkiG9w0BAQEFAASCAQAHbtGz0AChe0qMPM3c7iU8BQCfJklePUlAlhwFSuCx +# careoloxao+ZtS+dQRlrxLu/ZSqtmJHNsyRoWzsHdOs65pwUYhV3svzaXd7pJwkc +# nbDXedLBbNuQrQrrL2xbGtzT3U+EwgpJ1TTEYwHgqkTFogIelGa2sjD5N+4Vvalq +# t+vxaYrWwkTtsm0qczLKGRUjJqCjARjviE1xsOvs4zwbpXx/bEs/6M7U9tR+w/DS +# nDY/5KAKYET0DCVDhmsMmzJi3xXdBr4sAz0484AAB0CIRVgPCgdgr8E0NQUESJzm +# xm3K4bMAgTMWRiGTL4MRYSuMIn09sbfYXP9hjXLvTV4YoYIS5TCCEuEGCisGAQQB +# gjcDAwExghLRMIISzQYJKoZIhvcNAQcCoIISvjCCEroCAQMxDzANBglghkgBZQME +# AgEFADCCAVEGCyqGSIb3DQEJEAEEoIIBQASCATwwggE4AgEBBgorBgEEAYRZCgMB +# MDEwDQYJYIZIAWUDBAIBBQAEIJBynrmlQmGS0UNGTk53HVKEc4aHvNdYrs5eCcHM +# puc5AgZfEgElnvMYEzIwMjAwNzI0MTgwNDM3Ljg3NlowBIACAfSggdCkgc0wgcox +# CzAJBgNVBAYTAlVTMQswCQYDVQQIEwJXQTEQMA4GA1UEBxMHUmVkbW9uZDEeMBwG +# A1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMS0wKwYDVQQLEyRNaWNyb3NvZnQg +# SXJlbGFuZCBPcGVyYXRpb25zIExpbWl0ZWQxJjAkBgNVBAsTHVRoYWxlcyBUU1Mg +# RVNOOkUwNDEtNEJFRS1GQTdFMSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFt +# cCBzZXJ2aWNloIIOPDCCBPEwggPZoAMCAQICEzMAAAEHfjdomIdaN9YAAAAAAQcw +# DQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0 +# b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3Jh +# dGlvbjEmMCQGA1UEAxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwHhcN +# MTkxMDA4MTczODM1WhcNMjEwMTAzMTczODM1WjCByjELMAkGA1UEBhMCVVMxCzAJ +# BgNVBAgTAldBMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQg +# Q29ycG9yYXRpb24xLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVsYW5kIE9wZXJhdGlv +# bnMgTGltaXRlZDEmMCQGA1UECxMdVGhhbGVzIFRTUyBFU046RTA0MS00QkVFLUZB +# N0UxJTAjBgNVBAMTHE1pY3Jvc29mdCBUaW1lLVN0YW1wIHNlcnZpY2UwggEiMA0G +# CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUuqOUlbaeWirgwbCwhhNIOqTshpo+ +# QdSYxAt9JnkeulQFeKrQ6rOSECXxwgOjL/TNMIXtkig1MaifFON6si/Ri+AsV8Gu +# rQp4fylJzLDMFdJcGSpV3CGRdpDb0au8kNQLmnZuxLxAL91R7//3mH2QDQI20w3G +# 06s+Xv8+js9wQksXAfclXX1TJoBIx1Pi1FGqCnY3KlW81+Plhz0T4yStm1MgnqH4 +# RKYyPdcempCYC/BI04Ph2EJL+uQQfAfYdbf9vGqpKYjsuktnWr5uowD3H5At+x3l +# YH5rz4JCleKjeLpB/j74H7VZ0I5eTEbls9e2lEKaUzb9o0wjnjDc+t4BAgMBAAGj +# ggEbMIIBFzAdBgNVHQ4EFgQUNOHjlxlIJXMcP9n/0ogYdX8p6HcwHwYDVR0jBBgw +# FoAU1WM6XIoxkPNDe3xGG8UzaFqFbVUwVgYDVR0fBE8wTTBLoEmgR4ZFaHR0cDov +# L2NybC5taWNyb3NvZnQuY29tL3BraS9jcmwvcHJvZHVjdHMvTWljVGltU3RhUENB +# XzIwMTAtMDctMDEuY3JsMFoGCCsGAQUFBwEBBE4wTDBKBggrBgEFBQcwAoY+aHR0 +# cDovL3d3dy5taWNyb3NvZnQuY29tL3BraS9jZXJ0cy9NaWNUaW1TdGFQQ0FfMjAx +# MC0wNy0wMS5jcnQwDAYDVR0TAQH/BAIwADATBgNVHSUEDDAKBggrBgEFBQcDCDAN +# BgkqhkiG9w0BAQsFAAOCAQEAGN3/7XWSzHGKjk444w+2q1D3k7Bh/ZahUvWHFJ6E +# UKU5vLzEGsdsgJSvWXHZDRrpf5rcUGQyjnlo1hAY1mDteNKFushS6bedxcxPHJje +# lVZ9N2/e5+/7zLu18YjnKw5bFu7dWqYBMI3J0FOr56XJOJ1KTtMiJhpxuib+FWy+ +# pyhVVgHGTUHuUdbE09dY9WxuRsbpb4DdWAWNrPDB6VAOO50QfEj+0tW+zF6h3RhB +# TI0ilj0+AzgXE+6DyJ7/br6aVvCEvNRJzE6akJnMyn/kzmC32LxvRZWKEwWDR0Fn +# zeXj5ynSStZ6iifTBP7gqiDsidguxh+BFX7HxhN1eHf7jTCCBnEwggRZoAMCAQIC +# CmEJgSoAAAAAAAIwDQYJKoZIhvcNAQELBQAwgYgxCzAJBgNVBAYTAlVTMRMwEQYD +# VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24xMjAwBgNVBAMTKU1pY3Jvc29mdCBSb290IENlcnRp +# ZmljYXRlIEF1dGhvcml0eSAyMDEwMB4XDTEwMDcwMTIxMzY1NVoXDTI1MDcwMTIx +# NDY1NVowfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNV +# BAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQG +# A1UEAxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwggEiMA0GCSqGSIb3 +# DQEBAQUAA4IBDwAwggEKAoIBAQCpHQ28dxGKOiDs/BOX9fp/aZRrdFQQ1aUKAIKF +# ++18aEssX8XD5WHCdrc+Zitb8BVTJwQxH0EbGpUdzgkTjnxhMFmxMEQP8WCIhFRD +# DNdNuDgIs0Ldk6zWczBXJoKjRQ3Q6vVHgc2/JGAyWGBG8lhHhjKEHnRhZ5FfgVSx +# z5NMksHEpl3RYRNuKMYa+YaAu99h/EbBJx0kZxJyGiGKr0tkiVBisV39dx898Fd1 +# rL2KQk1AUdEPnAY+Z3/1ZsADlkR+79BL/W7lmsqxqPJ6Kgox8NpOBpG2iAg16Hgc +# sOmZzTznL0S6p/TcZL2kAcEgCZN4zfy8wMlEXV4WnAEFTyJNAgMBAAGjggHmMIIB +# 4jAQBgkrBgEEAYI3FQEEAwIBADAdBgNVHQ4EFgQU1WM6XIoxkPNDe3xGG8UzaFqF +# bVUwGQYJKwYBBAGCNxQCBAweCgBTAHUAYgBDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud +# EwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAU1fZWy4/oolxiaNE9lJBb186aGMQwVgYD +# VR0fBE8wTTBLoEmgR4ZFaHR0cDovL2NybC5taWNyb3NvZnQuY29tL3BraS9jcmwv +# cHJvZHVjdHMvTWljUm9vQ2VyQXV0XzIwMTAtMDYtMjMuY3JsMFoGCCsGAQUFBwEB +# BE4wTDBKBggrBgEFBQcwAoY+aHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraS9j +# ZXJ0cy9NaWNSb29DZXJBdXRfMjAxMC0wNi0yMy5jcnQwgaAGA1UdIAEB/wSBlTCB +# kjCBjwYJKwYBBAGCNy4DMIGBMD0GCCsGAQUFBwIBFjFodHRwOi8vd3d3Lm1pY3Jv +# c29mdC5jb20vUEtJL2RvY3MvQ1BTL2RlZmF1bHQuaHRtMEAGCCsGAQUFBwICMDQe +# MiAdAEwAZQBnAGEAbABfAFAAbwBsAGkAYwB5AF8AUwB0AGEAdABlAG0AZQBuAHQA +# LiAdMA0GCSqGSIb3DQEBCwUAA4ICAQAH5ohRDeLG4Jg/gXEDPZ2joSFvs+umzPUx +# vs8F4qn++ldtGTCzwsVmyWrf9efweL3HqJ4l4/m87WtUVwgrUYJEEvu5U4zM9GAS +# inbMQEBBm9xcF/9c+V4XNZgkVkt070IQyK+/f8Z/8jd9Wj8c8pl5SpFSAK84Dxf1 +# L3mBZdmptWvkx872ynoAb0swRCQiPM/tA6WWj1kpvLb9BOFwnzJKJ/1Vry/+tuWO +# M7tiX5rbV0Dp8c6ZZpCM/2pif93FSguRJuI57BlKcWOdeyFtw5yjojz6f32WapB4 +# pm3S4Zz5Hfw42JT0xqUKloakvZ4argRCg7i1gJsiOCC1JeVk7Pf0v35jWSUPei45 +# V3aicaoGig+JFrphpxHLmtgOR5qAxdDNp9DvfYPw4TtxCd9ddJgiCGHasFAeb73x +# 4QDf5zEHpJM692VHeOj4qEir995yfmFrb3epgcunCaw5u+zGy9iCtHLNHfS4hQEe +# gPsbiSpUObJb2sgNVZl6h3M7COaYLeqN4DMuEin1wC9UJyH3yKxO2ii4sanblrKn +# QqLJzxlBTeCG+SqaoxFmMNO7dDJL32N79ZmKLxvHIa9Zta7cRDyXUHHXodLFVeNp +# 3lfB0d4wwP3M5k37Db9dT+mdHhk4L7zPWAUu7w2gUDXa7wknHNWzfjUeCLraNtvT +# X4/edIhJEqGCAs4wggI3AgEBMIH4oYHQpIHNMIHKMQswCQYDVQQGEwJVUzELMAkG +# A1UECBMCV0ExEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBD +# b3Jwb3JhdGlvbjEtMCsGA1UECxMkTWljcm9zb2Z0IElyZWxhbmQgT3BlcmF0aW9u +# cyBMaW1pdGVkMSYwJAYDVQQLEx1UaGFsZXMgVFNTIEVTTjpFMDQxLTRCRUUtRkE3 +# RTElMCMGA1UEAxMcTWljcm9zb2Z0IFRpbWUtU3RhbXAgc2VydmljZaIjCgEBMAcG +# BSsOAwIaAxUAwwu+tfgG3rC7RZrxuFO2CmZSfPiggYMwgYCkfjB8MQswCQYDVQQG +# EwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwG +# A1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQg +# VGltZS1TdGFtcCBQQ0EgMjAxMDANBgkqhkiG9w0BAQUFAAIFAOLFEVUwIhgPMjAy +# MDA3MjQxNTUwNDVaGA8yMDIwMDcyNTE1NTA0NVowdzA9BgorBgEEAYRZCgQBMS8w +# LTAKAgUA4sURVQIBADAKAgEAAgIa9QIB/zAHAgEAAgIR9DAKAgUA4sZi1QIBADA2 +# BgorBgEEAYRZCgQCMSgwJjAMBgorBgEEAYRZCgMCoAowCAIBAAIDB6EgoQowCAIB +# AAIDAYagMA0GCSqGSIb3DQEBBQUAA4GBADwvhE9bln801RR+oEXjtPJXTqtYMakR +# ymItUlO2HRorDqEv2SJR/V/kQjcsqS6ig54bOiKs0Il2fW/s/pi+x1ydJMpOyhM7 +# zzqm3acQ9kbYHIDoPWVT/Rq2Oo33Dq380zXENcc0hpLAKF3Cu06SbbNbqu+A/wbI +# z5IClz6kU8kiMYIDDTCCAwkCAQEwgZMwfDELMAkGA1UEBhMCVVMxEzARBgNVBAgT +# Cldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29m +# dCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENB +# IDIwMTACEzMAAAEHfjdomIdaN9YAAAAAAQcwDQYJYIZIAWUDBAIBBQCgggFKMBoG +# CSqGSIb3DQEJAzENBgsqhkiG9w0BCRABBDAvBgkqhkiG9w0BCQQxIgQg6+NCew+c +# OhYIOzhUKofOF7MxtgOvSMWQCMCIWlTFNMgwgfoGCyqGSIb3DQEJEAIvMYHqMIHn +# MIHkMIG9BCBBYvCj4pFkwhumagATn0gLh9fdDNzImQkKNeOtRj/LHjCBmDCBgKR+ +# MHwxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdS +# ZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xJjAkBgNVBAMT +# HU1pY3Jvc29mdCBUaW1lLVN0YW1wIFBDQSAyMDEwAhMzAAABB343aJiHWjfWAAAA +# AAEHMCIEIGIH6vLdbEFNnxTxBhtIN7CtmhcKy/9m6/xoAA3LHzXUMA0GCSqGSIb3 +# DQEBCwUABIIBAKGg3zNulscnGBDlD6Q/U6yLQ5dN3gF9UrprgACiQ1gs/DexU7oC +# hjNZxBnH5RTA/7q9TFf2a1rBydHWVnqXuuQQJ0HuskdpXahxR4y1jboDdGwr7F08 +# v/gmPeeUik28Je72QZp5m/R0O61/kMQaDpLO9iPH0Z9iMGfqJonFPDeY4VX8Da2n +# cPY7mrv6YAI+ydZ+mUdBp2yjas7+/N8MntcNtAO0HpWFXQTAmb77RrSssfeZphRA +# mBD+gLx5C3q4uSmuOqaQxUaF0y8FeuetHp0bw2sfce6GlMXJwzTpC6HvXnaVtMy0 +# pgzd/KPHW7EgSvmRVKmvwiQGiZBoRG/Gcg8= +# SIG # End signature block diff --git a/externals/vcpkg/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 b/externals/vcpkg/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 new file mode 100755 index 000000000..96021bd1d --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 @@ -0,0 +1,89 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT + +# REPLACE WITH DROP-TO-ADMIN-USER-PREFIX.ps1 + +# REPLACE WITH UTILITY-PREFIX.ps1 + +$VisualStudioBootstrapperUrl = 'https://aka.ms/vs/17/release/vs_enterprise.exe' +$Workloads = @( + 'Microsoft.VisualStudio.Workload.NativeDesktop', + 'Microsoft.VisualStudio.Workload.Universal', + 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64', + 'Microsoft.VisualStudio.Component.VC.Tools.ARM', + 'Microsoft.VisualStudio.Component.VC.Tools.ARM64', + 'Microsoft.VisualStudio.Component.VC.ATL', + 'Microsoft.VisualStudio.Component.VC.ATLMFC', + 'Microsoft.VisualStudio.Component.VC.ATL.ARM', + 'Microsoft.VisualStudio.Component.VC.ATL.ARM64', + 'Microsoft.VisualStudio.Component.VC.MFC.ARM', + 'Microsoft.VisualStudio.Component.VC.MFC.ARM64', + 'Microsoft.VisualStudio.Component.Windows10SDK', + 'Microsoft.Net.Component.4.8.SDK', + 'Microsoft.Net.Component.4.7.2.TargetingPack', + 'Microsoft.Component.NetFX.Native', + 'Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset', + 'Microsoft.VisualStudio.Component.VC.Llvm.Clang', + 'Microsoft.VisualStudio.ComponentGroup.UWP.VC.BuildTools', + 'Microsoft.VisualStudio.Component.VC.CMake.Project' +) + +<# +.SYNOPSIS +Install Visual Studio. + +.DESCRIPTION +InstallVisualStudio takes the $Workloads array, and installs it with the +installer that's pointed at by $BootstrapperUrl. + +.PARAMETER Workloads +The set of VS workloads to install. + +.PARAMETER BootstrapperUrl +The URL of the Visual Studio installer, i.e. one of vs_*.exe. + +.PARAMETER InstallPath +The path to install Visual Studio at. + +.PARAMETER Nickname +The nickname to give the installation. +#> +Function InstallVisualStudio { + Param( + [String[]]$Workloads, + [String]$BootstrapperUrl, + [String]$InstallPath = $null, + [String]$Nickname = $null + ) + + try { + Write-Host 'Downloading Visual Studio...' + [string]$bootstrapperExe = Get-TempFilePath -Extension 'exe' + curl.exe -L -o $bootstrapperExe -s -S $BootstrapperUrl + Write-Host 'Installing Visual Studio...' + $vsArgs = @('/c', $bootstrapperExe, '--quiet', '--norestart', '--wait', '--nocache') + foreach ($workload in $Workloads) { + $vsArgs += '--add' + $vsArgs += $workload + } + + if (-not ([String]::IsNullOrWhiteSpace($InstallPath))) { + $vsArgs += '--installpath' + $vsArgs += $InstallPath + } + + if (-not ([String]::IsNullOrWhiteSpace($Nickname))) { + $vsArgs += '--nickname' + $vsArgs += $Nickname + } + + $proc = Start-Process -FilePath cmd.exe -ArgumentList $vsArgs -Wait -PassThru + PrintMsiExitCodeMessage $proc.ExitCode + } + catch { + Write-Error "Failed to install Visual Studio! $($_.Exception.Message)" + throw + } +} + +InstallVisualStudio -Workloads $Workloads -BootstrapperUrl $VisualStudioBootstrapperUrl -Nickname 'Stable' diff --git a/externals/vcpkg/scripts/azure-pipelines/windows/deploy-windows-sdks.ps1 b/externals/vcpkg/scripts/azure-pipelines/windows/deploy-windows-sdks.ps1 new file mode 100755 index 000000000..9c6ca0a5d --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/windows/deploy-windows-sdks.ps1 @@ -0,0 +1,49 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT + +# REPLACE WITH DROP-TO-ADMIN-USER-PREFIX.ps1 + +# REPLACE WITH UTILITY-PREFIX.ps1 + +<# +.SYNOPSIS +Installs Windows PSDK/WDK + +.DESCRIPTION +Downloads the Windows PSDK/DDK installer located at $Url, and installs it with the +correct flags. + +.PARAMETER Url +The URL of the installer. +#> +Function InstallWindowsDK { + Param( + [String]$Url + ) + + try { + Write-Host "Downloading Windows PSDK or DDK $Url..." + [string]$installerPath = Get-TempFilePath -Extension 'exe' + curl.exe -L -o $installerPath -s -S $Url + Write-Host 'Installing...' + $proc = Start-Process -FilePath $installerPath -ArgumentList @('/features', '+', '/q') -Wait -PassThru + $exitCode = $proc.ExitCode + if ($exitCode -eq 0) { + Write-Host 'Installation successful!' + } + else { + Write-Error "Installation failed! Exited with $exitCode." + throw + } + } + catch { + Write-Error "Failed to install Windows PSDK or DDK! $($_.Exception.Message)" + throw + } +} + +# Windows 10 SDK, version 2004 (10.0.19041.0) +InstallWindowsDK 'https://go.microsoft.com/fwlink/?linkid=2120843' + +# Windows 10 WDK, version 2004 +InstallWindowsDK 'https://go.microsoft.com/fwlink/?linkid=2128854' diff --git a/externals/vcpkg/scripts/azure-pipelines/windows/disk-space.ps1 b/externals/vcpkg/scripts/azure-pipelines/windows/disk-space.ps1 new file mode 100755 index 000000000..8680d7701 --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/windows/disk-space.ps1 @@ -0,0 +1,35 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT +# + +<# +.SYNOPSIS +Prints total and free disk space for each disk on the system +#> + +Function Format-Size { + [CmdletBinding()] + Param([long]$Size) + + if ($Size -lt 1024) { + $Size = [int]$Size + return "$Size B" + } + + $Size = $Size / 1024 + if ($Size -lt 1024) { + $Size = [int]$Size + return "$Size KiB" + } + + $Size = $Size / 1024 + if ($Size -lt 1024) { + $Size = [int]$Size + return "$Size MiB" + } + + $Size = [int]($Size / 1024) + return "$Size GiB" +} + +Get-CimInstance -ClassName Win32_LogicalDisk | Format-Table -Property @{Label="Disk"; Expression={ $_.DeviceID }},@{Label="Label"; Expression={ $_.VolumeName }},@{Label="Size"; Expression={ Format-Size($_.Size) }},@{Label="Free Space"; Expression={ Format-Size($_.FreeSpace) }} diff --git a/externals/vcpkg/scripts/azure-pipelines/windows/drop-to-admin-user-prefix.ps1 b/externals/vcpkg/scripts/azure-pipelines/windows/drop-to-admin-user-prefix.ps1 new file mode 100755 index 000000000..b4592eabd --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/windows/drop-to-admin-user-prefix.ps1 @@ -0,0 +1,27 @@ +param( + [string]$AdminUserPassword = $null +) + +$ErrorActionPreference = 'Stop' +$ProgressPreference = 'SilentlyContinue' +if (-Not [string]::IsNullOrEmpty($AdminUserPassword)) { + $PsExecPath = 'C:\PsExec64.exe' + $PsExecArgs = @( + '-u', + 'AdminUser', + '-p', + $AdminUserPassword, + '-accepteula', + '-i', + '-h', + 'C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe', + '-ExecutionPolicy', + 'Unrestricted', + '-File', + $PSCommandPath + ) + + Write-Host "Executing: $PsExecPath $PsExecArgs" + $proc = Start-Process -FilePath $PsExecPath -ArgumentList $PsExecArgs -Wait -PassThru + exit $proc.ExitCode +} diff --git a/externals/vcpkg/scripts/azure-pipelines/windows/provision-entire-image.ps1 b/externals/vcpkg/scripts/azure-pipelines/windows/provision-entire-image.ps1 new file mode 100755 index 000000000..00c2d28ca --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/windows/provision-entire-image.ps1 @@ -0,0 +1,18 @@ +# This script runs all the scripts we run on Azure machines to deploy prerequisites, +# and assumes it is being run as an admin user. + +. "$PSScriptRoot\utility-prefix.ps1" + +. "$PSScriptRoot\deploy-tlssettings.ps1" -RebootIfRequired 0 +. "$PSScriptRoot\deploy-windows-sdks.ps1" +. "$PSScriptRoot\deploy-visual-studio.ps1" +. "$PSScriptRoot\deploy-mpi.ps1" +. "$PSScriptRoot\deploy-cuda.ps1" +. "$PSScriptRoot\deploy-inteloneapi.ps1" +. "$PSScriptRoot\deploy-pwsh.ps1" +try { + Copy-Item "$PSScriptRoot\deploy-settings.txt" "$PSScriptRoot\deploy-settings.ps1" + . "$PSScriptRoot\deploy-settings.ps1" +} finally { + Remove-Item "$PSScriptRoot\deploy-settings.ps1" +} diff --git a/externals/vcpkg/scripts/azure-pipelines/windows/sysprep.ps1 b/externals/vcpkg/scripts/azure-pipelines/windows/sysprep.ps1 new file mode 100755 index 000000000..a29950044 --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/windows/sysprep.ps1 @@ -0,0 +1,17 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT +# + +<# +.SYNOPSIS +Prepares the virtual machine for imaging. + +.DESCRIPTION +Runs the `sysprep` utility to prepare the system for imaging. +See https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/sysprep--system-preparation--overview +for more information. +#> + +$ErrorActionPreference = 'Stop' +Write-Host 'Running sysprep' +& C:\Windows\system32\sysprep\sysprep.exe /oobe /generalize /mode:vm /shutdown diff --git a/externals/vcpkg/scripts/azure-pipelines/windows/utility-prefix.ps1 b/externals/vcpkg/scripts/azure-pipelines/windows/utility-prefix.ps1 new file mode 100755 index 000000000..8cd0066db --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/windows/utility-prefix.ps1 @@ -0,0 +1,125 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT + +<# +.SYNOPSIS +Gets a random file path in the temp directory. + +.DESCRIPTION +Get-TempFilePath takes an extension, and returns a path with a random +filename component in the temporary directory with that extension. + +.PARAMETER Extension +The extension to use for the path. +#> +Function Get-TempFilePath { + Param( + [String]$Extension + ) + + if ([String]::IsNullOrWhiteSpace($Extension)) { + throw 'Missing Extension' + } + + $tempPath = [System.IO.Path]::GetTempPath() + $tempName = [System.IO.Path]::GetRandomFileName() + '.' + $Extension + return Join-Path $tempPath $tempName +} + +<# +.SYNOPSIS +Writes a message to the screen depending on ExitCode. + +.DESCRIPTION +Since msiexec can return either 0 or 3010 successfully, in both cases +we write that installation succeeded, and which exit code it exited with. +If msiexec returns anything else, we write an error. + +.PARAMETER ExitCode +The exit code that msiexec returned. +#> +Function PrintMsiExitCodeMessage { + Param( + $ExitCode + ) + + # 3010 is probably ERROR_SUCCESS_REBOOT_REQUIRED + if ($ExitCode -eq 0 -or $ExitCode -eq 3010) { + Write-Host "Installation successful! Exited with $ExitCode." + } + else { + Write-Error "Installation failed! Exited with $ExitCode." + throw + } +} + +<# +.SYNOPSIS +Install a .msi file. + +.DESCRIPTION +InstallMSI takes a url where an .msi lives, and installs that .msi to the system. + +.PARAMETER Name +The name of the thing to install. + +.PARAMETER Url +The URL at which the .msi lives. +#> +Function InstallMSI { + Param( + [String]$Name, + [String]$Url + ) + + try { + Write-Host "Downloading $Name..." + [string]$msiPath = Get-TempFilePath -Extension 'msi' + curl.exe -L -o $msiPath -s -S $Url + Write-Host "Installing $Name..." + $args = @('/i', $msiPath, '/norestart', '/quiet', '/qn') + $proc = Start-Process -FilePath 'msiexec.exe' -ArgumentList $args -Wait -PassThru + PrintMsiExitCodeMessage $proc.ExitCode + } + catch { + Write-Error "Failed to install $Name! $($_.Exception.Message)" + throw + } +} + +<# +.SYNOPSIS +Unpacks a zip file to $Dir. + +.DESCRIPTION +InstallZip takes a URL of a zip file, and unpacks the zip file to the directory +$Dir. + +.PARAMETER Name +The name of the tool being installed. + +.PARAMETER Url +The URL of the zip file to unpack. + +.PARAMETER Dir +The directory to unpack the zip file to. +#> +Function InstallZip { + Param( + [String]$Name, + [String]$Url, + [String]$Dir + ) + + try { + Write-Host "Downloading $Name..." + [string]$zipPath = Get-TempFilePath -Extension 'zip' + curl.exe -L -o $zipPath -s -S $Url + Write-Host "Installing $Name..." + Expand-Archive -Path $zipPath -DestinationPath $Dir -Force + } + catch { + Write-Error "Failed to install $Name! $($_.Exception.Message)" + throw + } +} diff --git a/externals/vcpkg/scripts/azure-pipelines/windows/validate-version-files.ps1 b/externals/vcpkg/scripts/azure-pipelines/windows/validate-version-files.ps1 new file mode 100755 index 000000000..1bcb05a7b --- /dev/null +++ b/externals/vcpkg/scripts/azure-pipelines/windows/validate-version-files.ps1 @@ -0,0 +1,29 @@ +./vcpkg.exe --feature-flags=versions x-ci-verify-versions --verbose | +ForEach-Object -Begin { + $long_error = '' +} -Process { + if ($long_error -ne '' -and $_ -match '^$|^ ') { + # Extend multi-line message + $long_error = -join($long_error, "%0D%0A", $_ -replace '^ ','' ` + -replace '(git add) [^ ]*\\ports\\([^ ]*)', '$1 ports/$2' ) + } else { + if ($long_error -ne '') { + # Flush multi-line message + $long_error + $long_error = '' + } + if ($_ -match '^Error: ') { + # Start multi-line message + $long_error = $_ -replace '^Error: ', '##vso[task.logissue type=error]' ` + -replace '(^##vso[^\]]*)](.*) [^ ]*\\versions\\(.-)\\(.*.json)(.*)', '$1;sourcepath=versions/$3/$4;linenumber=2]$2 version/$3/$4$5' + } else { + # Normal line + $_ + } + } +} -End { + if ($long_error -ne '') { + # Flush multi-line message + $long_error + } +} diff --git a/externals/vcpkg/scripts/boost/.gitignore b/externals/vcpkg/scripts/boost/.gitignore new file mode 100755 index 000000000..f8e31288e --- /dev/null +++ b/externals/vcpkg/scripts/boost/.gitignore @@ -0,0 +1,3 @@ +/boost +/downloads +/libs \ No newline at end of file diff --git a/externals/vcpkg/scripts/boost/generate-ports.ps1 b/externals/vcpkg/scripts/boost/generate-ports.ps1 new file mode 100755 index 000000000..41ab9ab78 --- /dev/null +++ b/externals/vcpkg/scripts/boost/generate-ports.ps1 @@ -0,0 +1,623 @@ +[CmdletBinding()] +param ( + $libraries = @(), + $version = "1.79.0", + $portsDir = $null +) + +$ErrorActionPreference = 'Stop' + +$scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition +if ($null -eq $portsDir) { + $portsDir = "$scriptsDir/../../ports" +} + +if ($IsWindows) { + $vcpkg = "$scriptsDir/../../vcpkg.exe" + $curl = "curl.exe" +} +else { + $vcpkg = "$scriptsDir/../../vcpkg" + $curl = "curl" +} + +# Clear this array when moving to a new boost version +$portVersions = @{ + #e.g. "boost-asio" = 1; +} + +$portData = @{ + "boost" = @{ + "features" = @{ + "mpi" = @{ + "description" = "Build with MPI support"; + "dependencies" = @("boost-mpi", "boost-graph-parallel", "boost-property-map-parallel"); + } + } + }; + "boost-asio" = @{ + "features" = @{ + "ssl" = @{ + "description" = "Build with SSL support"; + "dependencies" = @(@{ "name" = "openssl"; "platform" = "!emscripten" }); + } + } + }; + "boost-beast" = @{ "supports" = "!emscripten" }; + "boost-fiber" = @{ + "supports" = "!osx & !uwp & !arm & !emscripten"; + "features" = @{ + "numa" = @{ + "description" = "Enable NUMA support"; + } + } + }; + "boost-filesystem" = @{ "supports" = "!uwp" }; + "boost-iostreams" = @{ + "default-features" = @("bzip2", "lzma", "zlib", "zstd"); + "supports" = "!uwp"; + "features" = @{ + "bzip2" = @{ + "description" = "Support bzip2 filters"; + "dependencies" = @("bzip2"); + }; + "lzma" = @{ + "description" = "Support LZMA/xz filters"; + "dependencies" = @("liblzma"); + }; + "zlib" = @{ + "description" = "Support zlib filters"; + "dependencies" = @("zlib"); + }; + "zstd" = @{ + "description" = "Support zstd filters"; + "dependencies" = @("zstd"); + }; + }; + }; + "boost-context" = @{ "supports" = "!uwp & !emscripten" }; + "boost-stacktrace" = @{ "supports" = "!uwp" }; + "boost-coroutine" = @{ "supports" = "!arm & !uwp & !emscripten" }; + "boost-coroutine2" = @{ "supports" = "!emscripten" }; + "boost-test" = @{ "supports" = "!uwp" }; + "boost-wave" = @{ "supports" = "!uwp" }; + "boost-log" = @{ "supports" = "!uwp & !emscripten" }; + "boost-locale" = @{ + "dependencies" = @(@{ "name" = "libiconv"; "platform" = "!uwp & !windows & !mingw" }); + "supports" = "!uwp"; + "features" = @{ + "icu" = @{ + "description" = "ICU backend for Boost.Locale"; + "dependencies" = @("icu"); + } + } + }; + "boost-mpi" = @{ + "dependencies" = @("mpi"); + "supports" = "!uwp"; + "features" = @{ + "python3" = @{ + "description" = "Build Python3 bindings"; + "supports" = "!static"; + "dependencies" = @(@{ "name" = "boost-python"; "features" = @( "python3" ); "platform" = "!uwp & !emscripten & !ios & !android" }, "python3"); + } + } + }; + "boost-graph-parallel" = @{ + "dependencies" = @("mpi"); + "supports" = "!uwp"; + }; + "boost-odeint" = @{ + "features" = @{ + "mpi" = @{ + "description" = "Support parallelization with MPI"; + "dependencies" = @("boost-mpi"); + } + } + }; + "boost-parameter-python" = @{ "supports" = "!emscripten" }; + "boost-process" = @{ "supports" = "!emscripten" }; + "boost-python" = @{ + "default-features" = @("python3"); + "supports" = "!uwp & !emscripten & !ios & !android"; + "features" = @{ + "python2" = @{ + "description" = "Build with Python2 support"; + "supports" = "!(arm & windows)"; + "dependencies" = @("python2"); + }; + "python3" = @{ + "description" = "Build with Python3 support"; + "dependencies" = @("python3"); + } + } + }; + "boost-regex" = @{ + "features" = @{ + "icu" = @{ + "description" = "ICU backend for Boost.Regex"; + "dependencies" = @("icu"); + } + } + } +} + +function GeneratePortName() { + param ( + [string]$Library + ) + "boost-" + ($Library -replace "_", "-") +} + +function GeneratePortDependency() { + param ( + [string]$Library + ) + $portName = GeneratePortName $Library + if ($portData.Contains($portName) -and $portData[$portName].Contains('supports')) { + @{name = $portName; platform = $portData[$portName]['supports'] } + } + else { + $portName + } +} + +function GeneratePortManifest() { + param ( + [string]$PortName, + [string]$Homepage, + [string]$Description, + [string]$License, + $Dependencies = @() + ) + $manifest = @{ + "name" = $PortName + "version" = $version + "homepage" = $Homepage + "description" = $Description + } + if ($License) { + $manifest["license"] += $License + } + if ($portData.Contains($PortName)) { + $manifest += $portData[$PortName] + } + if ($portVersions.Contains($PortName)) { + $manifest["port-version"] = $portVersions[$PortName] + } + if ($Dependencies.Count -gt 0) { + $manifest["dependencies"] += $Dependencies + } + # Remove from the dependencies the ports that are included in the feature dependencies + if ($manifest.Contains('features') -and $manifest.Contains('dependencies')) { + foreach ($feature in $manifest.features.Keys) { + $feature_dependencies = $manifest.features.$feature["dependencies"] + foreach ($dependency in $feature_dependencies) { + if ($dependency.Contains("name")) { + $dep_name = $dependency.name + } + else { + $dep_name = $dependency + } + $manifest["dependencies"] = $manifest["dependencies"] ` + | Where-Object { + if ($_.Contains("name")) { + $_.name -notmatch "$dep_name" + } else { + $_ -notmatch "$dep_name" + } + } + } + } + } + + $manifest | ConvertTo-Json -Depth 10 -Compress ` + | Out-File -Encoding UTF8 "$portsDir/$PortName/vcpkg.json" + & $vcpkg format-manifest "$portsDir/$PortName/vcpkg.json" +} + +function GeneratePort() { + param ( + [string]$Library, + [string]$Hash, + [bool]$NeedsBuild, + $Dependencies = @() + ) + + $portName = GeneratePortName $Library + + New-Item -ItemType "Directory" "$portsDir/$portName" -erroraction SilentlyContinue | out-null + + # Generate vcpkg.json + GeneratePortManifest ` + -PortName $portName ` + -Homepage "https://github.com/boostorg/$Library" ` + -Description "Boost $Library module" ` + -License "BSL-1.0" ` + -Dependencies $Dependencies + + $portfileLines = @( + "# Automatically generated by scripts/boost/generate-ports.ps1" + "" + ) + + if ($Library -eq "system") { + $portfileLines += @( + "vcpkg_buildpath_length_warning(37)" + "" + ) + } + + $portfileLines += @( + "vcpkg_from_github(" + " OUT_SOURCE_PATH SOURCE_PATH" + " REPO boostorg/$Library" + " REF boost-$version" + " SHA512 $Hash" + " HEAD_REF master" + ) + [Array]$patches = Get-Item -Path "$portsDir/$portName/*.patch" + if ($null -eq $patches -or $patches.Count -eq 0) { + } + elseif ($patches.Count -eq 1) { + $portfileLines += @(" PATCHES $($patches.name)") + } + else { + $portfileLines += @(" PATCHES") + foreach ($patch in $patches) { + $portfileLines += @(" $($patch.name)") + } + } + $portfileLines += @( + ")" + "" + ) + + if (Test-Path "$scriptsDir/post-source-stubs/$Library.cmake") { + $portfileLines += @(Get-Content "$scriptsDir/post-source-stubs/$Library.cmake") + } + + if ($NeedsBuild) { + $portfileLines += @( + "include(`${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)" + ) + # b2-options.cmake contains port-specific build options + if (Test-Path "$portsDir/$portName/b2-options.cmake") { + $portfileLines += @( + "boost_modular_build(" + " SOURCE_PATH `${SOURCE_PATH}" + " BOOST_CMAKE_FRAGMENT `"`${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake`"" + ")" + ) + } + elseif (Test-Path "$portsDir/$portName/b2-options.cmake.in") { + $portfileLines += @( + 'configure_file(' + ' "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake.in"' + ' "${CURRENT_BUILDTREES_DIR}/vcpkg-b2-options.cmake"' + ' @ONLY' + ')' + 'boost_modular_build(' + ' SOURCE_PATH ${SOURCE_PATH}' + ' BOOST_CMAKE_FRAGMENT "${CURRENT_BUILDTREES_DIR}/vcpkg-b2-options.cmake"' + ')' + ) + } + else { + $portfileLines += @( + "boost_modular_build(SOURCE_PATH `${SOURCE_PATH})" + ) + } + } + + $portfileLines += @( + "include(`${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)" + "boost_modular_headers(SOURCE_PATH `${SOURCE_PATH})" + ) + + if (Test-Path "$scriptsDir/post-build-stubs/$Library.cmake") { + $portfileLines += @(Get-Content "$scriptsDir/post-build-stubs/$Library.cmake") + } + + $portfileLines += @("") + Set-Content -LiteralPath "$portsDir/$portName/portfile.cmake" ` + -Value "$($portfileLines -join "`r`n")" ` + -Encoding UTF8 ` + -NoNewline +} + +if (!(Test-Path "$scriptsDir/boost")) { + "Cloning boost..." + Push-Location $scriptsDir + try { + git clone https://github.com/boostorg/boost --branch boost-$version + } + finally { + Pop-Location + } +} +else { + Push-Location $scriptsDir/boost + try { + git fetch + git checkout -f boost-$version + } + finally { + Pop-Location + } +} + +$foundLibraries = Get-ChildItem $scriptsDir/boost/libs -directory | ForEach-Object name | ForEach-Object { + if ($_ -eq "numeric") { + "numeric_conversion" + "interval" + "odeint" + "ublas" + } + elseif ($_ -eq "headers") { + } + else { + $_ + } +} + +New-Item -ItemType "Directory" $scriptsDir/downloads -erroraction SilentlyContinue | out-null + +$updateServicePorts = $false + +if ($libraries.Length -eq 0) { + $libraries = $foundLibraries + $updateServicePorts = $true +} + +$boostPortDependencies = @() + +foreach ($library in $libraries) { + "Handling boost/$library..." + $archive = "$scriptsDir/downloads/$library-boost-$version.tar.gz" + if (!(Test-Path $archive)) { + "Downloading boost/$library..." + & $curl -L "https://github.com/boostorg/$library/archive/boost-$version.tar.gz" --output "$scriptsDir/downloads/$library-boost-$version.tar.gz" + } + $hash = & $vcpkg --x-wait-for-lock hash $archive + # remove prefix "Waiting to take filesystem lock on /.vcpkg-root... " + if ($hash -is [Object[]]) { + $hash = $hash[1] + } + + $unpacked = "$scriptsDir/libs/$library-boost-$version" + if (!(Test-Path $unpacked)) { + "Unpacking boost/$library..." + New-Item -ItemType "Directory" $scriptsDir/libs -erroraction SilentlyContinue | out-null + Push-Location $scriptsDir/libs + try { + cmake -E tar xf $archive + } + finally { + Pop-Location + } + } + Push-Location $unpacked + try { + $usedLibraries = Get-ChildItem -Recurse -Path include, src -File ` + | Where-Object { $_ -is [System.IO.FileInfo] } ` + | ForEach-Object { + Write-Verbose "${library}: processing file: $_" + Get-Content -LiteralPath $_ + } ` + | Where-Object { + $_ -match ' *# *include *[<"]boost\/' + } ` + | ForEach-Object { + # extract path from the line + Write-Verbose "${library}: processing line: $_" + $_ -replace " *# *include *[<`"]boost\/([a-zA-Z0-9\.\-_\/]*)[>`"].*", "`$1" + }` + | ForEach-Object { + # map the path to the library name + Write-Verbose "${library}: processing path: $_" + if ($_ -match "^detail\/winapi\/") { "winapi" } + elseif ($_ -eq "detail/algorithm.hpp") { "graph" } + elseif ($_ -eq "detail/atomic_count.hpp") { "smart_ptr" } + elseif ($_ -eq "detail/basic_pointerbuf.hpp") { "lexical_cast" } + elseif ($_ -eq "detail/call_traits.hpp") { "utility" } + elseif ($_ -eq "detail/compressed_pair.hpp") { "utility" } + elseif ($_ -eq "detail/interlocked.hpp") { "winapi" } + elseif ($_ -eq "detail/iterator.hpp") { "core" } + elseif ($_ -eq "detail/lcast_precision.hpp") { "lexical_cast" } + elseif ($_ -eq "detail/lightweight_mutex.hpp") { "smart_ptr" } + elseif ($_ -eq "detail/lightweight_test.hpp") { "core" } + elseif ($_ -eq "detail/lightweight_thread.hpp") { "smart_ptr" } + elseif ($_ -eq "detail/no_exceptions_support.hpp") { "core" } + elseif ($_ -eq "detail/scoped_enum_emulation.hpp") { "core" } + elseif ($_ -eq "detail/sp_typeinfo.hpp") { "core" } + elseif ($_ -eq "detail/ob_compressed_pair.hpp") { "utility" } + elseif ($_ -eq "detail/quick_allocator.hpp") { "smart_ptr" } + elseif ($_ -eq "detail/workaround.hpp") { "config" } + elseif ($_ -match "^functional\/hash\/") { "container_hash" } + elseif ($_ -eq "functional/hash.hpp") { "container_hash" } + elseif ($_ -eq "functional/hash_fwd.hpp") { "container_hash" } + elseif ($_ -match "^graph\/distributed\/") { "graph_parallel" } + elseif ($_ -match "^graph\/parallel\/") { "graph_parallel" } + elseif ($_ -eq "graph/accounting.hpp") { "graph_parallel" } + elseif ($_ -eq "exception/exception.hpp") { "throw_exception" } + elseif ($_ -match "^numeric\/conversion\/") { "numeric_conversion" } + elseif ($_ -match "^numeric\/interval\/") { "interval" } + elseif ($_ -match "^numeric\/odeint\/") { "odeint" } + elseif ($_ -match "^numeric\/ublas\/") { "ublas" } + elseif ($_ -eq "numeric/interval.hpp") { "interval" } + elseif ($_ -eq "numeric/odeint.hpp") { "odeint" } + elseif ($_ -match "^parameter\/aux_\/python\/") { "parameter_python" } + elseif ($_ -eq "parameter/python.hpp") { "parameter_python" } + elseif ($_ -eq "pending/detail/disjoint_sets.hpp") { "graph" } + elseif ($_ -eq "pending/detail/int_iterator.hpp") { "iterator" } + elseif ($_ -eq "pending/detail/property.hpp") { "graph" } + elseif ($_ -eq "pending/bucket_sorter.hpp") { "graph" } + elseif ($_ -eq "pending/container_traits.hpp") { "graph" } + elseif ($_ -eq "pending/disjoint_sets.hpp") { "graph" } + elseif ($_ -eq "pending/fenced_priority_queue.hpp") { "graph" } + elseif ($_ -eq "pending/fibonacci_heap.hpp") { "graph" } + elseif ($_ -eq "pending/indirect_cmp.hpp") { "graph" } + elseif ($_ -eq "pending/integer_log2.hpp") { "integer" } + elseif ($_ -eq "pending/is_heap.hpp") { "graph" } + elseif ($_ -eq "pending/iterator_adaptors.hpp") { "iterator" } + elseif ($_ -eq "pending/iterator_tests.hpp") { "iterator" } + elseif ($_ -eq "pending/mutable_heap.hpp") { "graph" } + elseif ($_ -eq "pending/mutable_queue.hpp") { "graph" } + elseif ($_ -eq "pending/property.hpp") { "graph" } + elseif ($_ -eq "pending/property_serialize.hpp") { "graph" } + elseif ($_ -eq "pending/queue.hpp") { "graph" } + elseif ($_ -eq "pending/relaxed_heap.hpp") { "graph" } + elseif ($_ -eq "pending/stringtok.hpp") { "graph" } + elseif ($_ -match "^property_map\/parallel\/") { "property_map_parallel" } + elseif ($_ -eq "utility/addressof.hpp") { "core" } + elseif ($_ -eq "utility/declval.hpp") { "type_traits" } + elseif ($_ -eq "utility/enable_if.hpp") { "core" } + elseif ($_ -eq "utility/explicit_operator_bool.hpp") { "core" } + elseif ($_ -eq "utility/swap.hpp") { "core" } + # extract first directory name or file name from the path + else { $_ -replace "([a-zA-Z0-9\.\-_]*).*", "`$1" } + } ` + | ForEach-Object { + # map directory/file name to the library name + Write-Verbose "${library}: processing name: $_" + if ($_ -eq "current_function.hpp") { "assert" } + elseif ($_ -eq "memory_order.hpp") { "atomic" } + elseif ($_ -match "is_placeholder.hpp|mem_fn.hpp") { "bind" } + elseif ($_ -eq "circular_buffer_fwd.hpp") { "circular_buffer" } + elseif ($_ -match "^concept$|concept_archetype.hpp") { "concept_check" } + elseif ($_ -match "cstdint.hpp|cxx11_char_types.hpp|limits.hpp|version.hpp") { "config" } + elseif ($_ -eq "contract_macro.hpp") { "contract" } + elseif ($_ -match "implicit_cast.hpp|polymorphic_cast.hpp|polymorphic_pointer_cast.hpp") { "conversion" } + elseif ($_ -eq "make_default.hpp") { "convert" } + elseif ($_ -match "checked_delete.hpp|get_pointer.hpp|iterator.hpp|non_type.hpp|noncopyable.hpp|ref.hpp|swap.hpp|type.hpp|visit_each.hpp") { "core" } + elseif ($_ -match "blank.hpp|blank_fwd.hpp|cstdlib.hpp") { "detail" } + elseif ($_ -eq "dynamic_bitset_fwd.hpp") { "dynamic_bitset" } + elseif ($_ -eq "exception_ptr.hpp") { "exception" } + elseif ($_ -eq "foreach_fwd.hpp") { "foreach" } + elseif ($_ -eq "function_equal.hpp") { "function" } + elseif ($_ -match "integer_fwd.hpp|integer_traits.hpp") { "integer" } + elseif ($_ -eq "io_fwd.hpp") { "io" } + elseif ($_ -match "function_output_iterator.hpp|generator_iterator.hpp|indirect_reference.hpp|iterator_adaptors.hpp|next_prior.hpp|pointee.hpp|shared_container_iterator.hpp") { "iterator" } + elseif ($_ -match "cstdfloat.hpp|math_fwd.hpp") { "math" } + elseif ($_ -match "multi_index_container.hpp|multi_index_container_fwd.hpp") { "multi_index" } + elseif ($_ -eq "cast.hpp") { "numeric_conversion" } + elseif ($_ -match "none.hpp|none_t.hpp") { "optional" } + elseif ($_ -eq "qvm_lite.hpp") { "qvm" } + elseif ($_ -eq "nondet_random.hpp") { "random" } + elseif ($_ -match "cregex.hpp|regex_fwd.hpp") { "regex" } + elseif ($_ -eq "archive") { "serialization" } + elseif ($_ -match "last_value.hpp|signal.hpp") { "signals" } + elseif ($_ -match "enable_shared_from_this.hpp|intrusive_ptr.hpp|make_shared.hpp|make_unique.hpp|pointer_cast.hpp|pointer_to_other.hpp|scoped_array.hpp|scoped_ptr.hpp|shared_array.hpp|shared_ptr.hpp|weak_ptr.hpp") { "smart_ptr" } + elseif ($_ -eq "cerrno.hpp") { "system" } + elseif ($_ -eq "progress.hpp") { "timer" } + elseif ($_ -match "token_functions.hpp|token_iterator.hpp") { "tokenizer" } + elseif ($_ -match "aligned_storage.hpp") { "type_traits" } + elseif ($_ -match "unordered_map.hpp|unordered_set.hpp") { "unordered" } + elseif ($_ -match "call_traits.hpp|compressed_pair.hpp|operators.hpp|operators_v1.hpp") { "utility" } + # by dafault use the name as is, just remove the file extension if available + else { $_ -replace "\.hp?p?", "" } + } ` + | Where-Object { + $_ -ne $library + } ` + | Group-Object -NoElement | ForEach-Object Name + + " [known] " + $($usedLibraries | Where-Object { $foundLibraries -contains $_ }) + " [unknown] " + $($usedLibraries | Where-Object { $foundLibraries -notcontains $_ }) + + $deps = @($usedLibraries | Where-Object { $foundLibraries -contains $_ }) + # break unnecessary dependencies + $deps = @($deps | ? { + -not ( + ($library -eq 'gil' -and $_ -eq 'filesystem') # PR #20575 + ) + }) + $deps = @($deps | ForEach-Object { GeneratePortDependency $_ }) + $deps += @("boost-vcpkg-helpers") + + $needsBuild = $false + if (((Test-Path $unpacked/build/Jamfile.v2) -or (Test-Path $unpacked/build/Jamfile)) -and $library -notmatch "function_types") { + $deps += @( + @{ name = "boost-build"; host = $True }, + @{ name = "boost-modular-build-helper"; host = $True }, + @{ name = "vcpkg-cmake"; host = $True } + ) + $needsBuild = $true + } + + GeneratePort ` + -Library $library ` + -Hash $hash ` + -Dependencies $deps ` + -NeedsBuild $needsBuild + + $boostPortDependencies += @(GeneratePortDependency $library) + } + finally { + Pop-Location + } +} + +if ($updateServicePorts) { + # Generate manifest file for master boost port which depends on each individual library + GeneratePortManifest ` + -PortName "boost" ` + -Homepage "https://boost.org" ` + -Description "Peer-reviewed portable C++ source libraries" ` + -License "BSL-1.0" ` + -Dependencies $boostPortDependencies + + Set-Content -LiteralPath "$portsDir/boost/portfile.cmake" ` + -Value "set(VCPKG_POLICY_EMPTY_PACKAGE enabled)`n" ` + -Encoding UTF8 ` + -NoNewline + + # Generate manifest files for boost-uninstall + GeneratePortManifest ` + -PortName "boost-uninstall" ` + -Description "Internal vcpkg port used to uninstall Boost" ` + -License "MIT" + + # Generate manifest files for boost-vcpkg-helpers + GeneratePortManifest ` + -PortName "boost-vcpkg-helpers" ` + -Description "Internal vcpkg port used to modularize Boost" ` + -License "MIT" ` + -Dependencies @("boost-uninstall") + + # Generate manifest files for boost-modular-build-helper + GeneratePortManifest ` + -PortName "boost-modular-build-helper" ` + -Description "Internal vcpkg port used to build Boost libraries" ` + -License "MIT" ` + -Dependencies @("boost-uninstall", "vcpkg-cmake") + + # Generate manifest files for boost-build + GeneratePortManifest ` + -PortName "boost-build" ` + -Homepage "https://github.com/boostorg/build" ` + -Description "Boost.Build" ` + -License "BSL-1.0" ` + -Dependencies @("boost-uninstall") + + # Update Boost version in CMake files + $files_with_boost_version = @( + "$portsDir/boost-build/portfile.cmake", + "$portsDir/boost-modular-build-helper/boost-modular-build.cmake", + "$portsDir/boost-vcpkg-helpers/portfile.cmake" + ) + $files_with_boost_version | % { + $content = Get-Content -LiteralPath $_ ` + -Encoding UTF8 ` + -Raw + $content = $content -replace ` + "set\(BOOST_VERSION [0-9\.]+\)", ` + "set(BOOST_VERSION $version)" + + Set-Content -LiteralPath $_ ` + -Value $content ` + -Encoding UTF8 ` + -NoNewline + } +} diff --git a/externals/vcpkg/scripts/boost/post-build-stubs/config.cmake b/externals/vcpkg/scripts/boost/post-build-stubs/config.cmake new file mode 100755 index 000000000..b09ea209b --- /dev/null +++ b/externals/vcpkg/scripts/boost/post-build-stubs/config.cmake @@ -0,0 +1,7 @@ +file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp "\n#ifndef BOOST_ALL_NO_LIB\n#define BOOST_ALL_NO_LIB\n#endif\n") +file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp "\n#undef BOOST_ALL_DYN_LINK\n") + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp "\n#define BOOST_ALL_DYN_LINK\n") +endif() +file(COPY ${SOURCE_PATH}/checks DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-config) diff --git a/externals/vcpkg/scripts/boost/post-build-stubs/predef.cmake b/externals/vcpkg/scripts/boost/post-build-stubs/predef.cmake new file mode 100755 index 000000000..b960fcd6e --- /dev/null +++ b/externals/vcpkg/scripts/boost/post-build-stubs/predef.cmake @@ -0,0 +1,2 @@ + +file(COPY ${SOURCE_PATH}/tools/check DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-predef) diff --git a/externals/vcpkg/scripts/boost/post-build-stubs/test.cmake b/externals/vcpkg/scripts/boost/post-build-stubs/test.cmake new file mode 100755 index 000000000..c6d07dbc4 --- /dev/null +++ b/externals/vcpkg/scripts/boost/post-build-stubs/test.cmake @@ -0,0 +1,14 @@ +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) + file(GLOB MONITOR_LIBS ${CURRENT_PACKAGES_DIR}/lib/*_exec_monitor*) + file(COPY ${MONITOR_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link) + file(REMOVE ${MONITOR_LIBS}) +endif() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) + file(GLOB DEBUG_MONITOR_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/*_exec_monitor*) + file(COPY ${DEBUG_MONITOR_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) + file(REMOVE ${DEBUG_MONITOR_LIBS}) +endif() + diff --git a/externals/vcpkg/scripts/boost/post-source-stubs/atomic.cmake b/externals/vcpkg/scripts/boost/post-source-stubs/atomic.cmake new file mode 100755 index 000000000..5c524cd70 --- /dev/null +++ b/externals/vcpkg/scripts/boost/post-source-stubs/atomic.cmake @@ -0,0 +1,5 @@ +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]" + "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/externals/vcpkg/scripts/boost/post-source-stubs/context.cmake b/externals/vcpkg/scripts/boost/post-source-stubs/context.cmake new file mode 100755 index 000000000..90080695f --- /dev/null +++ b/externals/vcpkg/scripts/boost/post-source-stubs/context.cmake @@ -0,0 +1,5 @@ +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../config/checks/config" + "import ../config/checks/config" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/externals/vcpkg/scripts/boost/post-source-stubs/fiber.cmake b/externals/vcpkg/scripts/boost/post-source-stubs/fiber.cmake new file mode 100755 index 000000000..90080695f --- /dev/null +++ b/externals/vcpkg/scripts/boost/post-source-stubs/fiber.cmake @@ -0,0 +1,5 @@ +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../config/checks/config" + "import ../config/checks/config" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/externals/vcpkg/scripts/boost/post-source-stubs/json.cmake b/externals/vcpkg/scripts/boost/post-source-stubs/json.cmake new file mode 100755 index 000000000..fae13263b --- /dev/null +++ b/externals/vcpkg/scripts/boost/post-source-stubs/json.cmake @@ -0,0 +1,5 @@ +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" + "import ../../config/checks/config" + "import ../config/checks/config" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/externals/vcpkg/scripts/boost/post-source-stubs/log.cmake b/externals/vcpkg/scripts/boost/post-source-stubs/log.cmake new file mode 100755 index 000000000..9f4656d66 --- /dev/null +++ b/externals/vcpkg/scripts/boost/post-source-stubs/log.cmake @@ -0,0 +1,9 @@ +file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) +string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") +string(REPLACE " @select-arch-specific-sources" "#@select-arch-specific-sources" _contents "${_contents}") +file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") +vcpkg_replace_string("${SOURCE_PATH}/build/log-arch-config.jam" + "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]" + "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/externals/vcpkg/scripts/boost/post-source-stubs/nowide.cmake b/externals/vcpkg/scripts/boost/post-source-stubs/nowide.cmake new file mode 100755 index 000000000..90080695f --- /dev/null +++ b/externals/vcpkg/scripts/boost/post-source-stubs/nowide.cmake @@ -0,0 +1,5 @@ +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../config/checks/config" + "import ../config/checks/config" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/externals/vcpkg/scripts/boost/post-source-stubs/test.cmake b/externals/vcpkg/scripts/boost/post-source-stubs/test.cmake new file mode 100755 index 000000000..6e8ee9738 --- /dev/null +++ b/externals/vcpkg/scripts/boost/post-source-stubs/test.cmake @@ -0,0 +1,5 @@ +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../predef/check/predef" + "import ../predef/check/predef" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-predef/check" DESTINATION "${SOURCE_PATH}/predef") diff --git a/externals/vcpkg/scripts/boost/post-source-stubs/wave.cmake b/externals/vcpkg/scripts/boost/post-source-stubs/wave.cmake new file mode 100755 index 000000000..90080695f --- /dev/null +++ b/externals/vcpkg/scripts/boost/post-source-stubs/wave.cmake @@ -0,0 +1,5 @@ +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../config/checks/config" + "import ../config/checks/config" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/externals/vcpkg/scripts/bootstrap.ps1 b/externals/vcpkg/scripts/bootstrap.ps1 new file mode 100755 index 000000000..a302a4851 --- /dev/null +++ b/externals/vcpkg/scripts/bootstrap.ps1 @@ -0,0 +1,82 @@ +[CmdletBinding()] +param( + $badParam, + [Parameter(Mandatory=$False)][switch]$win64 = $false, + [Parameter(Mandatory=$False)][string]$withVSPath = "", + [Parameter(Mandatory=$False)][string]$withWinSDK = "", + [Parameter(Mandatory=$False)][switch]$disableMetrics = $false +) +Set-StrictMode -Version Latest +# Powershell2-compatible way of forcing named-parameters +if ($badParam) +{ + if ($disableMetrics -and $badParam -eq "1") + { + Write-Warning "'disableMetrics 1' is deprecated, please change to 'disableMetrics' (without '1')." + } + else + { + throw "Only named parameters are allowed." + } +} + +if ($win64) +{ + Write-Warning "-win64 no longer has any effect; ignored." +} + +if (-Not [string]::IsNullOrWhiteSpace($withVSPath)) +{ + Write-Warning "-withVSPath no longer has any effect; ignored." +} + +if (-Not [string]::IsNullOrWhiteSpace($withWinSDK)) +{ + Write-Warning "-withWinSDK no longer has any effect; ignored." +} + +$scriptsDir = split-path -parent $script:MyInvocation.MyCommand.Definition +$vcpkgRootDir = $scriptsDir +while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) +{ + Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root" + $vcpkgRootDir = Split-path $vcpkgRootDir -Parent +} + +Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" + +$versionDate = '2022-06-17' +if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") { + & "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" +} else { + & "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" +} + +Write-Host "" + +if ($LASTEXITCODE -ne 0) +{ + Write-Error "Downloading vcpkg.exe failed. Please check your internet connection, or consider downloading a recent vcpkg.exe from https://github.com/microsoft/vcpkg-tool with a browser." + throw +} + +if ($disableMetrics) +{ + Set-Content -Value "" -Path "$vcpkgRootDir\vcpkg.disable-metrics" -Force +} +elseif (-Not (Test-Path "$vcpkgRootDir\vcpkg.disable-metrics")) +{ + # Note that we intentionally leave any existing vcpkg.disable-metrics; once a user has + # opted out they should stay opted out. + Write-Host @" +Telemetry +--------- +vcpkg collects usage data in order to help us improve your experience. +The data collected by Microsoft is anonymous. +You can opt-out of telemetry by re-running the bootstrap-vcpkg script with -disableMetrics, +passing --disable-metrics to vcpkg on the command line, +or by setting the VCPKG_DISABLE_METRICS environment variable. + +Read more about vcpkg telemetry at docs/about/privacy.md +"@ +} diff --git a/externals/vcpkg/scripts/bootstrap.sh b/externals/vcpkg/scripts/bootstrap.sh new file mode 100755 index 000000000..1323e05bc --- /dev/null +++ b/externals/vcpkg/scripts/bootstrap.sh @@ -0,0 +1,267 @@ +#!/bin/sh + +# Find .vcpkg-root. +vcpkgRootDir=$(X= cd -- "$(dirname -- "$0")" && pwd -P) +while [ "$vcpkgRootDir" != "/" ] && ! [ -e "$vcpkgRootDir/.vcpkg-root" ]; do + vcpkgRootDir="$(dirname "$vcpkgRootDir")" +done + +# Parse arguments. +vcpkgDisableMetrics="OFF" +vcpkgUseSystem=false +vcpkgUseMuslC="OFF" +for var in "$@" +do + if [ "$var" = "-disableMetrics" -o "$var" = "--disableMetrics" ]; then + vcpkgDisableMetrics="ON" + elif [ "$var" = "-useSystemBinaries" -o "$var" = "--useSystemBinaries" ]; then + echo "Warning: -useSystemBinaries no longer has any effect; ignored. Note that the VCPKG_USE_SYSTEM_BINARIES environment variable behavior is not changed." + elif [ "$var" = "-allowAppleClang" -o "$var" = "--allowAppleClang" ]; then + echo "Warning: -allowAppleClang no longer has any effect; ignored." + elif [ "$var" = "-buildTests" ]; then + echo "Warning: -buildTests no longer has any effect; ignored." + elif [ "$var" = "-musl" ]; then + vcpkgUseMuslC="ON" + elif [ "$var" = "-help" -o "$var" = "--help" ]; then + echo "Usage: ./bootstrap-vcpkg.sh [options]" + echo + echo "Options:" + echo " -help Display usage help" + echo " -disableMetrics Mark this vcpkg root to disable metrics." + echo " -musl Use the musl binary rather than the glibc binary on Linux." + exit 1 + else + echo "Unknown argument $var. Use '-help' for help." + exit 1 + fi +done + +# Enable using this entry point on windows from git bash by redirecting to the .bat file. +unixName=$(uname -s | sed 's/MINGW.*_NT.*/MINGW_NT/') +if [ "$unixName" = "MINGW_NT" ]; then + if [ "$vcpkgDisableMetrics" = "ON" ]; then + args="-disableMetrics" + else + args="" + fi + + vcpkgRootDir=$(cygpath -aw "$vcpkgRootDir") + cmd "/C $vcpkgRootDir\\bootstrap-vcpkg.bat $args" || exit 1 + exit 0 +fi + +# Determine the downloads directory. +if [ -z ${VCPKG_DOWNLOADS+x} ]; then + downloadsDir="$vcpkgRootDir/downloads" +else + downloadsDir="$VCPKG_DOWNLOADS" + if [ ! -d "$VCPKG_DOWNLOADS" ]; then + echo "VCPKG_DOWNLOADS was set to '$VCPKG_DOWNLOADS', but that was not a directory." + exit 1 + fi + +fi + +# Check for minimal prerequisites. +vcpkgCheckRepoTool() +{ + __tool=$1 + if ! command -v "$__tool" >/dev/null 2>&1 ; then + echo "Could not find $__tool. Please install it (and other dependencies) with:" + echo "On Debian and Ubuntu derivatives:" + echo " sudo apt-get install curl zip unzip tar" + echo "On recent Red Hat and Fedora derivatives:" + echo " sudo dnf install curl zip unzip tar" + echo "On older Red Hat and Fedora derivatives:" + echo " sudo yum install curl zip unzip tar" + echo "On SUSE Linux and derivatives:" + echo " sudo zypper install curl zip unzip tar" + echo "On Arch Linux and derivatives:" + echo " sudo pacman -S curl zip unzip tar cmake ninja" + echo "On Alpine:" + echo " apk add build-base cmake ninja zip unzip curl git" + echo " (and export VCPKG_FORCE_SYSTEM_BINARIES=1)" + exit 1 + fi +} + +vcpkgCheckRepoTool curl +vcpkgCheckRepoTool zip +vcpkgCheckRepoTool unzip +vcpkgCheckRepoTool tar + +UNAME="$(uname)" +ARCH="$(uname -m)" + +if [ -e /etc/alpine-release ]; then + vcpkgUseSystem="ON" + vcpkgUseMuslC="ON" +fi + +if [ "$UNAME" = "OpenBSD" ]; then + vcpkgUseSystem="ON" + + if [ -z "$CXX" ]; then + CXX=/usr/bin/clang++ + fi + if [ -z "$CC" ]; then + CC=/usr/bin/clang + fi +fi + +if [ "$vcpkgUseSystem" = "ON" ]; then + vcpkgCheckRepoTool cmake + vcpkgCheckRepoTool ninja + vcpkgCheckRepoTool git + vcpkgCheckRepoTool gcc +fi + +# Determine what we are going to do to bootstrap: +# MacOS -> Download vcpkg-macos +# Linux +# useMuslC -> download vcpkg-muslc +# amd64 -> download vcpkg-glibc +# Otherwise +# Download and build from source + +# Choose the vcpkg binary to download +vcpkgDownloadTool="ON" +vcpkgToolReleaseTag="2022-06-17" +if [ "$UNAME" = "Darwin" ]; then + echo "Downloading vcpkg-macos..." + vcpkgToolReleaseSha="66ef24562d0a165d9462a3b3cc2e6ff728e26ab529aa4406dffb107492c1e91277fee4b187e776ae7a7730c5ff8cfb1063822852493b156e03151c730b509b2b" + vcpkgToolName="vcpkg-macos" +elif [ "$vcpkgUseMuslC" = "ON" ]; then + echo "Downloading vcpkg-muslc..." + vcpkgToolReleaseSha="28533a64c0d876fdf78f7ed301847063b3ff0c2593cac6df3b0d38a5e09174cd8770caf985476523dab6f740b54c7400c8542e8df63fd094b5956a35d8579989" + vcpkgToolName="vcpkg-muslc" +elif [ "$ARCH" = "x86_64" ]; then + echo "Downloading vcpkg-glibc..." + vcpkgToolReleaseSha="c85ec50df0de9648e1c5bdb690aa38d6c2ad2d9e5f92cd77648966f44f9b45418374925aacf5bbff0c608145f58dc9cd3391368e441e8254145c39ab1ae1fd33" + vcpkgToolName="vcpkg-glibc" +else + echo "Unable to determine a binary release of vcpkg; attempting to build from source." + vcpkgDownloadTool="OFF" + vcpkgToolReleaseSha="e52a359617c283932b4e4a33f4fa288fbe06edd676e4248b5543b83573a378dbf30c021395045e0726e69d4b5d41b012fd61af5eb4d586a1fb793c16bd64b77c" +fi + +# Do the download or build. +vcpkgCheckEqualFileHash() +{ + url=$1; filePath=$2; expectedHash=$3 + + if command -v "sha512sum" >/dev/null 2>&1 ; then + actualHash=$(sha512sum "$filePath") + else + # sha512sum is not available by default on osx + # shasum is not available by default on Fedora + actualHash=$(shasum -a 512 "$filePath") + fi + + actualHash="${actualHash%% *}" # shasum returns [hash filename], so get the first word + + if ! [ "$expectedHash" = "$actualHash" ]; then + echo "" + echo "File does not have expected hash:" + echo " url: [ $url ]" + echo " File path: [ $downloadPath ]" + echo " Expected hash: [ $sha512 ]" + echo " Actual hash: [ $actualHash ]" + exit 1 + fi +} + +vcpkgDownloadFile() +{ + url=$1; downloadPath=$2 sha512=$3 + rm -rf "$downloadPath.part" + curl -L $url --tlsv1.2 --create-dirs --retry 3 --output "$downloadPath.part" --silent --show-error --fail || exit 1 + + vcpkgCheckEqualFileHash $url "$downloadPath.part" $sha512 + chmod +x "$downloadPath.part" + mv "$downloadPath.part" "$downloadPath" +} + +vcpkgExtractTar() +{ + archive=$1; toPath=$2 + rm -rf "$toPath" "$toPath.partial" + mkdir -p "$toPath.partial" + $(cd "$toPath.partial" && tar xzf "$archive") + mv "$toPath.partial" "$toPath" +} + +if [ "$vcpkgDownloadTool" = "ON" ]; then + vcpkgDownloadFile "https://github.com/microsoft/vcpkg-tool/releases/download/$vcpkgToolReleaseTag/$vcpkgToolName" "$vcpkgRootDir/vcpkg" $vcpkgToolReleaseSha +else + if [ "x$CXX" = "x" ]; then + if which g++-12 >/dev/null 2>&1; then + CXX=g++-12 + elif which g++-11 >/dev/null 2>&1; then + CXX=g++-11 + elif which g++-10 >/dev/null 2>&1; then + CXX=g++-10 + elif which g++-9 >/dev/null 2>&1; then + CXX=g++-9 + elif which g++-8 >/dev/null 2>&1; then + CXX=g++-8 + elif which g++-7 >/dev/null 2>&1; then + CXX=g++-7 + elif which g++-6 >/dev/null 2>&1; then + CXX=g++-6 + elif which g++ >/dev/null 2>&1; then + CXX=g++ + fi + # If we can't find g++, allow CMake to do the look-up + fi + + vcpkgToolReleaseTarball="$vcpkgToolReleaseTag.tar.gz" + vcpkgToolUrl="https://github.com/microsoft/vcpkg-tool/archive/$vcpkgToolReleaseTarball" + baseBuildDir="$vcpkgRootDir/buildtrees/_vcpkg" + buildDir="$baseBuildDir/build" + tarballPath="$downloadsDir/$vcpkgToolReleaseTarball" + srcBaseDir="$baseBuildDir/src" + srcDir="$srcBaseDir/vcpkg-tool-$vcpkgToolReleaseTag" + + if [ -e "$tarballPath" ]; then + vcpkgCheckEqualFileHash "$vcpkgToolUrl" "$tarballPath" "$vcpkgToolReleaseSha" + else + echo "Downloading vcpkg tool sources" + vcpkgDownloadFile "$vcpkgToolUrl" "$tarballPath" "$vcpkgToolReleaseSha" + fi + + echo "Building vcpkg-tool..." + rm -rf "$baseBuildDir" + mkdir -p "$buildDir" + vcpkgExtractTar "$tarballPath" "$srcBaseDir" + cmakeConfigOptions="-DCMAKE_BUILD_TYPE=Release -G 'Ninja' -DVCPKG_DEVELOPMENT_WARNINGS=OFF" + + if [ "${VCPKG_MAX_CONCURRENCY}" != "" ] ; then + cmakeConfigOptions=" $cmakeConfigOptions '-DCMAKE_JOB_POOL_COMPILE:STRING=compile' '-DCMAKE_JOB_POOL_LINK:STRING=link' '-DCMAKE_JOB_POOLS:STRING=compile=$VCPKG_MAX_CONCURRENCY;link=$VCPKG_MAX_CONCURRENCY' " + fi + + (cd "$buildDir" && CXX="$CXX" eval cmake "$srcDir" $cmakeConfigOptions) || exit 1 + (cd "$buildDir" && cmake --build .) || exit 1 + + rm -rf "$vcpkgRootDir/vcpkg" + cp "$buildDir/vcpkg" "$vcpkgRootDir/" +fi + +# Apply the disable-metrics marker file. +if [ "$vcpkgDisableMetrics" = "ON" ]; then + touch "$vcpkgRootDir/vcpkg.disable-metrics" +elif ! [ -f "$vcpkgRootDir/vcpkg.disable-metrics" ]; then + # Note that we intentionally leave any existing vcpkg.disable-metrics; once a user has + # opted out they should stay opted out. + cat < cppstdtmp.h + #while IFS= read -r line; do + # printf '%s' "$line" + #done + #exec 3<&- + #echo "$( cppstdtmp.h + exec $prog ${cppopt[@]} $tmpout + rm -f $tmpout +else + #echo "FILE" + exec $prog ${cppopt[@]} $input_file +fi + diff --git a/externals/vcpkg/scripts/buildsystems/make_wrapper/windres-rc b/externals/vcpkg/scripts/buildsystems/make_wrapper/windres-rc new file mode 100755 index 000000000..bb2aac0d8 --- /dev/null +++ b/externals/vcpkg/scripts/buildsystems/make_wrapper/windres-rc @@ -0,0 +1,128 @@ +#! /bin/sh +# Wrapper for windres to rc which do not understand '-i -o --output-format'. +# cvtres is invoked by the linker +scriptversion=2021-04-02.18; # UTC + + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN* | MSYS*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/* | msys/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_windres_wrapper rc args... +# Adjust compile command to suit rc instead of windres +func_windres_wrapper () +{ + # Assume a capable shell + in= + out= + + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + eat=1 + func_file_conv "$2" + out="$file" + echo "OUTPUT:$file" + set x "$@" + shift + ;; + *.obj) + func_file_conv "$1" + out="$file" + echo "OUTPUT:$file" + set x "$@" + shift + ;; + --output-format=*) + set x "$@" + shift + ;; + -i) + eat=1 + func_file_conv "$2" mingw + in="$file" + echo "INPUT:$file" + set x "$@" + shift + ;; + -*) + set x "$@" "${1//\\\"/\"}" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + echo "$@" -fo "$out" "$in" + exec "$@" -fo "$out" "$in" + exit 1 +} + +eat= + +func_windres_wrapper "$@" + + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC0" +# time-stamp-end: "; # UTC" +# End: diff --git a/externals/vcpkg/scripts/buildsystems/meson/none.txt b/externals/vcpkg/scripts/buildsystems/meson/none.txt new file mode 100755 index 000000000..6dafc8090 --- /dev/null +++ b/externals/vcpkg/scripts/buildsystems/meson/none.txt @@ -0,0 +1,19 @@ +# native file used to make the build machine compiler unusable + +[host_machine] +system = 'none' +cpu_family = 'none' +cpu = 'none' +endian = 'little' + +[properties] + +[binaries] +c = ['false'] +cpp = ['false'] +objc = ['false'] +objcpp = ['false'] +ar = ['false'] +pkgconfig = ['false'] +cmake = ['false'] +ninja = ['false'] \ No newline at end of file diff --git a/externals/vcpkg/scripts/buildsystems/msbuild/applocal.ps1 b/externals/vcpkg/scripts/buildsystems/msbuild/applocal.ps1 new file mode 100755 index 000000000..64427819c --- /dev/null +++ b/externals/vcpkg/scripts/buildsystems/msbuild/applocal.ps1 @@ -0,0 +1,378 @@ +[cmdletbinding()] +param([string]$targetBinary, [string]$installedDir, [string]$tlogFile, [string]$copiedFilesLog) + +$g_searched = @{} +# Note: installedDir is actually the bin\ directory. +$g_install_root = Split-Path $installedDir -parent +$g_is_debug = (Split-Path $g_install_root -leaf) -eq 'debug' + +# Ensure we create the copied files log, even if we don't end up copying any files +if ($copiedFilesLog) +{ + Set-Content -Path $copiedFilesLog -Value "" -Encoding UTF8 +} + +function computeHash([System.Security.Cryptography.HashAlgorithm]$alg, [string]$str) { + $bytes = [System.Text.Encoding]::UTF8.GetBytes($str) + $hash = $alg.ComputeHash($bytes) + return [Convert]::ToBase64String($hash) +} + +function getMutex([string]$targetDir) { + try { + $sha512Hash = [System.Security.Cryptography.SHA512]::Create() + if ($sha512Hash) { + $hash = (computeHash $sha512Hash $targetDir) -replace ('/' ,'-') + $mtxName = "VcpkgAppLocalDeployBinary-" + $hash + return New-Object System.Threading.Mutex($false, $mtxName) + } + + return New-Object System.Threading.Mutex($false, "VcpkgAppLocalDeployBinary") + } + catch { + Write-Error -Message $_ -ErrorAction Stop + } +} + +# Note: this function signature is depended upon by the qtdeploy.ps1 script introduced in 5.7.1-7 +function deployBinary([string]$targetBinaryDir, [string]$SourceDir, [string]$targetBinaryName) { + try { + $mtx = getMutex($targetBinaryDir) + if ($mtx) { + $mtx.WaitOne() | Out-Null + } + + $sourceBinaryFilePath = Join-Path $SourceDir $targetBinaryName + $targetBinaryFilePath = Join-Path $targetBinaryDir $targetBinaryName + if (Test-Path $targetBinaryFilePath) { + $sourceModTime = (Get-Item $sourceBinaryFilePath).LastWriteTime + $destModTime = (Get-Item $targetBinaryFilePath).LastWriteTime + if ($destModTime -lt $sourceModTime) { + Write-Verbose " ${targetBinaryName}: Updating from $sourceBinaryFilePath" + Copy-Item $sourceBinaryFilePath $targetBinaryDir + } else { + Write-Verbose " ${targetBinaryName}: already present" + } + } + else { + Write-Verbose " ${targetBinaryName}: Copying $sourceBinaryFilePath" + Copy-Item $sourceBinaryFilePath $targetBinaryDir + } + if ($copiedFilesLog) { Add-Content $copiedFilesLog $targetBinaryFilePath -Encoding UTF8 } + if ($tlogFile) { Add-Content $tlogFile $targetBinaryFilePath -Encoding Unicode } + } finally { + if ($mtx) { + $mtx.ReleaseMutex() | Out-Null + $mtx.Dispose() | Out-Null + } + } +} + + +Write-Verbose "Resolving base path $targetBinary..." +try +{ + $baseBinaryPath = Resolve-Path $targetBinary -erroraction stop + $baseTargetBinaryDir = Split-Path $baseBinaryPath -parent +} +catch [System.Management.Automation.ItemNotFoundException] +{ + return +} + +# Note: this function signature is depended upon by the qtdeploy.ps1 script +function resolve([string]$targetBinary) { + Write-Verbose "Resolving $targetBinary..." + try + { + $targetBinaryPath = Resolve-Path $targetBinary -erroraction stop + } + catch [System.Management.Automation.ItemNotFoundException] + { + return + } + $targetBinaryDir = Split-Path $targetBinaryPath -parent + + if (Get-Command "dumpbin" -ErrorAction SilentlyContinue) { + $a = $(dumpbin /DEPENDENTS $targetBinary | ? { $_ -match "^ [^ ].*\.dll" } | % { $_ -replace "^ ","" }) + } elseif (Get-Command "llvm-objdump" -ErrorAction SilentlyContinue) { + $a = $(llvm-objdump -p $targetBinary| ? { $_ -match "^ {4}DLL Name: .*\.dll" } | % { $_ -replace "^ {4}DLL Name: ","" }) + } elseif (Get-Command "objdump" -ErrorAction SilentlyContinue) { + $a = $(objdump -p $targetBinary| ? { $_ -match "^\tDLL Name: .*\.dll" } | % { $_ -replace "^\tDLL Name: ","" }) + } else { + Write-Error "Neither dumpbin, llvm-objdump nor objdump could be found. Can not take care of dll dependencies." + } + $a | % { + if ([string]::IsNullOrEmpty($_)) { + return + } + if ($g_searched.ContainsKey($_)) { + Write-Verbose " ${_}: previously searched - Skip" + return + } + $g_searched.Set_Item($_, $true) + $installedItemFilePath = Join-Path $installedDir $_ + $targetItemFilePath = Join-Path $targetBinaryDir $_ + if (Test-Path $installedItemFilePath) { + deployBinary $baseTargetBinaryDir $installedDir "$_" + if (Test-Path function:\deployPluginsIfQt) { deployPluginsIfQt $baseTargetBinaryDir (Join-Path $g_install_root 'plugins') "$_" } + if (Test-Path function:\deployOpenNI2) { deployOpenNI2 $targetBinaryDir "$g_install_root" "$_" } + if (Test-Path function:\deployPluginsIfMagnum) { + if ($g_is_debug) { + deployPluginsIfMagnum $targetBinaryDir (Join-Path (Join-Path "$g_install_root" 'bin') 'magnum-d') "$_" + } else { + deployPluginsIfMagnum $targetBinaryDir (Join-Path (Join-Path "$g_install_root" 'bin') 'magnum') "$_" + } + } + if (Test-Path function:\deployAzureKinectSensorSDK) { deployAzureKinectSensorSDK $targetBinaryDir "$g_install_root" "$_" } + resolve (Join-Path $baseTargetBinaryDir "$_") + } elseif (Test-Path $targetItemFilePath) { + Write-Verbose " ${_}: $_ not found in $g_install_root; locally deployed" + resolve "$targetItemFilePath" + } else { + Write-Verbose " ${_}: $installedItemFilePath not found" + } + } + Write-Verbose "Done Resolving $targetBinary." +} + +# Note: This is a hack to make Qt5 work. +# Introduced with Qt package version 5.7.1-7 +if (Test-Path "$g_install_root\plugins\qtdeploy.ps1") { + . "$g_install_root\plugins\qtdeploy.ps1" +} + +# Note: This is a hack to make OpenNI2 work. +if (Test-Path "$g_install_root\bin\OpenNI2\openni2deploy.ps1") { + . "$g_install_root\bin\OpenNI2\openni2deploy.ps1" +} + +# Note: This is a hack to make Magnum work. +if (Test-Path "$g_install_root\bin\magnum\magnumdeploy.ps1") { + . "$g_install_root\bin\magnum\magnumdeploy.ps1" +} elseif (Test-Path "$g_install_root\bin\magnum-d\magnumdeploy.ps1") { + . "$g_install_root\bin\magnum-d\magnumdeploy.ps1" +} + +# Note: This is a hack to make Azure Kinect Sensor SDK work. +if (Test-Path "$g_install_root\tools\azure-kinect-sensor-sdk\k4adeploy.ps1") { + . "$g_install_root\tools\azure-kinect-sensor-sdk\k4adeploy.ps1" +} + +resolve($targetBinary) +Write-Verbose $($g_searched | out-string) + +# SIG # Begin signature block +# MIIntwYJKoZIhvcNAQcCoIInqDCCJ6QCAQExDzANBglghkgBZQMEAgEFADB5Bgor +# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG +# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCAw4oRiVyZP7w6g +# qWIJMRXurO+EoO/lf/MY7lRybXYZ/aCCDYEwggX/MIID56ADAgECAhMzAAACUosz +# qviV8znbAAAAAAJSMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAlVTMRMwEQYD +# VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMTH01pY3Jvc29mdCBDb2RlIFNpZ25p +# bmcgUENBIDIwMTEwHhcNMjEwOTAyMTgzMjU5WhcNMjIwOTAxMTgzMjU5WjB0MQsw +# CQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9u +# ZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMR4wHAYDVQQDExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +# AQDQ5M+Ps/X7BNuv5B/0I6uoDwj0NJOo1KrVQqO7ggRXccklyTrWL4xMShjIou2I +# sbYnF67wXzVAq5Om4oe+LfzSDOzjcb6ms00gBo0OQaqwQ1BijyJ7NvDf80I1fW9O +# L76Kt0Wpc2zrGhzcHdb7upPrvxvSNNUvxK3sgw7YTt31410vpEp8yfBEl/hd8ZzA +# v47DCgJ5j1zm295s1RVZHNp6MoiQFVOECm4AwK2l28i+YER1JO4IplTH44uvzX9o +# RnJHaMvWzZEpozPy4jNO2DDqbcNs4zh7AWMhE1PWFVA+CHI/En5nASvCvLmuR/t8 +# q4bc8XR8QIZJQSp+2U6m2ldNAgMBAAGjggF+MIIBejAfBgNVHSUEGDAWBgorBgEE +# AYI3TAgBBggrBgEFBQcDAzAdBgNVHQ4EFgQUNZJaEUGL2Guwt7ZOAu4efEYXedEw +# UAYDVR0RBEkwR6RFMEMxKTAnBgNVBAsTIE1pY3Jvc29mdCBPcGVyYXRpb25zIFB1 +# ZXJ0byBSaWNvMRYwFAYDVQQFEw0yMzAwMTIrNDY3NTk3MB8GA1UdIwQYMBaAFEhu +# ZOVQBdOCqhc3NyK1bajKdQKVMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly93d3cu +# bWljcm9zb2Z0LmNvbS9wa2lvcHMvY3JsL01pY0NvZFNpZ1BDQTIwMTFfMjAxMS0w +# Ny0wOC5jcmwwYQYIKwYBBQUHAQEEVTBTMFEGCCsGAQUFBzAChkVodHRwOi8vd3d3 +# Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY0NvZFNpZ1BDQTIwMTFfMjAx +# MS0wNy0wOC5jcnQwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0BAQsFAAOCAgEAFkk3 +# uSxkTEBh1NtAl7BivIEsAWdgX1qZ+EdZMYbQKasY6IhSLXRMxF1B3OKdR9K/kccp +# kvNcGl8D7YyYS4mhCUMBR+VLrg3f8PUj38A9V5aiY2/Jok7WZFOAmjPRNNGnyeg7 +# l0lTiThFqE+2aOs6+heegqAdelGgNJKRHLWRuhGKuLIw5lkgx9Ky+QvZrn/Ddi8u +# TIgWKp+MGG8xY6PBvvjgt9jQShlnPrZ3UY8Bvwy6rynhXBaV0V0TTL0gEx7eh/K1 +# o8Miaru6s/7FyqOLeUS4vTHh9TgBL5DtxCYurXbSBVtL1Fj44+Od/6cmC9mmvrti +# yG709Y3Rd3YdJj2f3GJq7Y7KdWq0QYhatKhBeg4fxjhg0yut2g6aM1mxjNPrE48z +# 6HWCNGu9gMK5ZudldRw4a45Z06Aoktof0CqOyTErvq0YjoE4Xpa0+87T/PVUXNqf +# 7Y+qSU7+9LtLQuMYR4w3cSPjuNusvLf9gBnch5RqM7kaDtYWDgLyB42EfsxeMqwK +# WwA+TVi0HrWRqfSx2olbE56hJcEkMjOSKz3sRuupFCX3UroyYf52L+2iVTrda8XW +# esPG62Mnn3T8AuLfzeJFuAbfOSERx7IFZO92UPoXE1uEjL5skl1yTZB3MubgOA4F +# 8KoRNhviFAEST+nG8c8uIsbZeb08SeYQMqjVEmkwggd6MIIFYqADAgECAgphDpDS +# AAAAAAADMA0GCSqGSIb3DQEBCwUAMIGIMQswCQYDVQQGEwJVUzETMBEGA1UECBMK +# V2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0 +# IENvcnBvcmF0aW9uMTIwMAYDVQQDEylNaWNyb3NvZnQgUm9vdCBDZXJ0aWZpY2F0 +# ZSBBdXRob3JpdHkgMjAxMTAeFw0xMTA3MDgyMDU5MDlaFw0yNjA3MDgyMTA5MDla +# MH4xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdS +# ZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMT +# H01pY3Jvc29mdCBDb2RlIFNpZ25pbmcgUENBIDIwMTEwggIiMA0GCSqGSIb3DQEB +# AQUAA4ICDwAwggIKAoICAQCr8PpyEBwurdhuqoIQTTS68rZYIZ9CGypr6VpQqrgG +# OBoESbp/wwwe3TdrxhLYC/A4wpkGsMg51QEUMULTiQ15ZId+lGAkbK+eSZzpaF7S +# 35tTsgosw6/ZqSuuegmv15ZZymAaBelmdugyUiYSL+erCFDPs0S3XdjELgN1q2jz +# y23zOlyhFvRGuuA4ZKxuZDV4pqBjDy3TQJP4494HDdVceaVJKecNvqATd76UPe/7 +# 4ytaEB9NViiienLgEjq3SV7Y7e1DkYPZe7J7hhvZPrGMXeiJT4Qa8qEvWeSQOy2u +# M1jFtz7+MtOzAz2xsq+SOH7SnYAs9U5WkSE1JcM5bmR/U7qcD60ZI4TL9LoDho33 +# X/DQUr+MlIe8wCF0JV8YKLbMJyg4JZg5SjbPfLGSrhwjp6lm7GEfauEoSZ1fiOIl +# XdMhSz5SxLVXPyQD8NF6Wy/VI+NwXQ9RRnez+ADhvKwCgl/bwBWzvRvUVUvnOaEP +# 6SNJvBi4RHxF5MHDcnrgcuck379GmcXvwhxX24ON7E1JMKerjt/sW5+v/N2wZuLB +# l4F77dbtS+dJKacTKKanfWeA5opieF+yL4TXV5xcv3coKPHtbcMojyyPQDdPweGF +# RInECUzF1KVDL3SV9274eCBYLBNdYJWaPk8zhNqwiBfenk70lrC8RqBsmNLg1oiM +# CwIDAQABo4IB7TCCAekwEAYJKwYBBAGCNxUBBAMCAQAwHQYDVR0OBBYEFEhuZOVQ +# BdOCqhc3NyK1bajKdQKVMBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIAQwBBMAsGA1Ud +# DwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFHItOgIxkEO5FAVO +# 4eqnxzHRI4k0MFoGA1UdHwRTMFEwT6BNoEuGSWh0dHA6Ly9jcmwubWljcm9zb2Z0 +# LmNvbS9wa2kvY3JsL3Byb2R1Y3RzL01pY1Jvb0NlckF1dDIwMTFfMjAxMV8wM18y +# Mi5jcmwwXgYIKwYBBQUHAQEEUjBQME4GCCsGAQUFBzAChkJodHRwOi8vd3d3Lm1p +# Y3Jvc29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dDIwMTFfMjAxMV8wM18y +# Mi5jcnQwgZ8GA1UdIASBlzCBlDCBkQYJKwYBBAGCNy4DMIGDMD8GCCsGAQUFBwIB +# FjNodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2RvY3MvcHJpbWFyeWNw +# cy5odG0wQAYIKwYBBQUHAgIwNB4yIB0ATABlAGcAYQBsAF8AcABvAGwAaQBjAHkA +# XwBzAHQAYQB0AGUAbQBlAG4AdAAuIB0wDQYJKoZIhvcNAQELBQADggIBAGfyhqWY +# 4FR5Gi7T2HRnIpsLlhHhY5KZQpZ90nkMkMFlXy4sPvjDctFtg/6+P+gKyju/R6mj +# 82nbY78iNaWXXWWEkH2LRlBV2AySfNIaSxzzPEKLUtCw/WvjPgcuKZvmPRul1LUd +# d5Q54ulkyUQ9eHoj8xN9ppB0g430yyYCRirCihC7pKkFDJvtaPpoLpWgKj8qa1hJ +# Yx8JaW5amJbkg/TAj/NGK978O9C9Ne9uJa7lryft0N3zDq+ZKJeYTQ49C/IIidYf +# wzIY4vDFLc5bnrRJOQrGCsLGra7lstnbFYhRRVg4MnEnGn+x9Cf43iw6IGmYslmJ +# aG5vp7d0w0AFBqYBKig+gj8TTWYLwLNN9eGPfxxvFX1Fp3blQCplo8NdUmKGwx1j +# NpeG39rz+PIWoZon4c2ll9DuXWNB41sHnIc+BncG0QaxdR8UvmFhtfDcxhsEvt9B +# xw4o7t5lL+yX9qFcltgA1qFGvVnzl6UJS0gQmYAf0AApxbGbpT9Fdx41xtKiop96 +# eiL6SJUfq/tHI4D1nvi/a7dLl+LrdXga7Oo3mXkYS//WsyNodeav+vyL6wuA6mk7 +# r/ww7QRMjt/fdW1jkT3RnVZOT7+AVyKheBEyIXrvQQqxP/uozKRdwaGIm1dxVk5I +# RcBCyZt2WwqASGv9eZ/BvW1taslScxMNelDNMYIZjDCCGYgCAQEwgZUwfjELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEoMCYGA1UEAxMfTWljcm9z +# b2Z0IENvZGUgU2lnbmluZyBQQ0EgMjAxMQITMwAAAlKLM6r4lfM52wAAAAACUjAN +# BglghkgBZQMEAgEFAKCBrjAZBgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIBBDAcBgor +# BgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG9w0BCQQxIgQg2MF7lLSS +# iHnyjtq+Z0sSiFhMa8sDtjZ1Nc7FC4mwGqMwQgYKKwYBBAGCNwIBDDE0MDKgFIAS +# AE0AaQBjAHIAbwBzAG8AZgB0oRqAGGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbTAN +# BgkqhkiG9w0BAQEFAASCAQAqEYCzEH7PFdQYSqxft5YV6SCCmSoewMjGLeF7EDCM +# pUGrB+R+wzzky7P3AaKej+ph7f0BW26gQrTOcQ7BpJ5Y7F9o6gdrxN9BHejxKVIi +# OcW24WL/Gf15UqL403/Zya9FhZFHdsvCtZ+V9wdcZfouZFfxxAqWbmkExzVHU271 +# GdTPCNaD5VGj1njzbpAZ+GPGSAMNTAwm8ipnTEwTsXlOc8QiPRFAmgfNPTuwpXL6 +# I3vMrRGDXk0U6w7uk/7IsVlLkDE2KPorbkOKS5JmeNgMigex1ezqYUJvEtst1JSn +# GmvSh1GboX9iU1CEUfbKqollz8dLQ+5Jt9M28hX2GwdGoYIXFjCCFxIGCisGAQQB +# gjcDAwExghcCMIIW/gYJKoZIhvcNAQcCoIIW7zCCFusCAQMxDzANBglghkgBZQME +# AgEFADCCAVkGCyqGSIb3DQEJEAEEoIIBSASCAUQwggFAAgEBBgorBgEEAYRZCgMB +# MDEwDQYJYIZIAWUDBAIBBQAEIE+CqTK27oCz06797kOsvD1C/uO67e4Zgv0+P8NY +# 0dYxAgZiF5g+l0YYEzIwMjIwMzMwMjE1MjEwLjMzOVowBIACAfSggdikgdUwgdIx +# CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRt +# b25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1p +# Y3Jvc29mdCBJcmVsYW5kIE9wZXJhdGlvbnMgTGltaXRlZDEmMCQGA1UECxMdVGhh +# bGVzIFRTUyBFU046RDA4Mi00QkZELUVFQkExJTAjBgNVBAMTHE1pY3Jvc29mdCBU +# aW1lLVN0YW1wIFNlcnZpY2WgghFlMIIHFDCCBPygAwIBAgITMwAAAY/zUajrWnLd +# zAABAAABjzANBgkqhkiG9w0BAQsFADB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMK +# V2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0 +# IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0Eg +# MjAxMDAeFw0yMTEwMjgxOTI3NDZaFw0yMzAxMjYxOTI3NDZaMIHSMQswCQYDVQQG +# EwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwG +# A1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMS0wKwYDVQQLEyRNaWNyb3NvZnQg +# SXJlbGFuZCBPcGVyYXRpb25zIExpbWl0ZWQxJjAkBgNVBAsTHVRoYWxlcyBUU1Mg +# RVNOOkQwODItNEJGRC1FRUJBMSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFt +# cCBTZXJ2aWNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAmVc+/rXP +# Fx6Fk4+CpLrubDrLTa3QuAHRVXuy+zsxXwkogkT0a+XWuBabwHyqj8RRiZQQvdvb +# Oq5NRExOeHiaCtkUsQ02ESAe9Cz+loBNtsfCq846u3otWHCJlqkvDrSr7mMBqwcR +# Y7cfhAGfLvlpMSojoAnk7Rej+jcJnYxIeN34F3h9JwANY360oGYCIS7pLOosWV+b +# xug9uiTZYE/XclyYNF6XdzZ/zD/4U5pxT4MZQmzBGvDs+8cDdA/stZfj/ry+i0XU +# YNFPhuqc+UKkwm/XNHB+CDsGQl+ZS0GcbUUun4VPThHJm6mRAwL5y8zptWEIocbT +# eRSTmZnUa2iYH2EOBV7eCjx0Sdb6kLc1xdFRckDeQGR4J1yFyybuZsUP8x0dOsEE +# oLQuOhuKlDLQEg7D6ZxmZJnS8B03ewk/SpVLqsb66U2qyF4BwDt1uZkjEZ7finIo +# UgSz4B7fWLYIeO2OCYxIE0XvwsVop9PvTXTZtGPzzmHU753GarKyuM6oa/qaTzYv +# rAfUb7KYhvVQKxGUPkL9+eKiM7G0qenJCFrXzZPwRWoccAR33PhNEuuzzKZFJ4De +# aTCLg/8uK0Q4QjFRef5n4H+2KQIEibZ7zIeBX3jgsrICbzzSm0QX3SRVmZH//Aqp +# 8YxkwcoI1WCBizv84z9eqwRBdQ4HYcNbQMMCAwEAAaOCATYwggEyMB0GA1UdDgQW +# BBTzBuZ0a65JzuKhzoWb25f7NyNxvDAfBgNVHSMEGDAWgBSfpxVdAF5iXYP05dJl +# pxtTNRnpcjBfBgNVHR8EWDBWMFSgUqBQhk5odHRwOi8vd3d3Lm1pY3Jvc29mdC5j +# b20vcGtpb3BzL2NybC9NaWNyb3NvZnQlMjBUaW1lLVN0YW1wJTIwUENBJTIwMjAx +# MCgxKS5jcmwwbAYIKwYBBQUHAQEEYDBeMFwGCCsGAQUFBzAChlBodHRwOi8vd3d3 +# Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY3Jvc29mdCUyMFRpbWUtU3Rh +# bXAlMjBQQ0ElMjAyMDEwKDEpLmNydDAMBgNVHRMBAf8EAjAAMBMGA1UdJQQMMAoG +# CCsGAQUFBwMIMA0GCSqGSIb3DQEBCwUAA4ICAQDNf9Oo9zyhC5n1jC8iU7NJY39F +# izjhxZwJbJY/Ytwn63plMlTSaBperan566fuRojGJSv3EwZs+RruOU2T/ZRDx4VH +# esLHtclE8GmMM1qTMaZPL8I2FrRmf5Oop4GqcxNdNECBClVZmn0KzFdPMqRa5/0R +# 6CmgqJh0muvImikgHubvohsavPEyyHQa94HD4/LNKd/YIaCKKPz9SA5fAa4phQ4E +# vz2auY9SUluId5MK9H5cjWVwBxCvYAD+1CW9z7GshJlNjqBvWtKO6J0Aemfg6z28 +# g7qc7G/tCtrlH4/y27y+stuwWXNvwdsSd1lvB4M63AuMl9Yp6au/XFknGzJPF6n/ +# uWR6JhQvzh40ILgeThLmYhf8z+aDb4r2OBLG1P2B6aCTW2YQkt7TpUnzI0cKGr21 +# 3CbKtGk/OOIHSsDOxasmeGJ+FiUJCiV15wh3aZT/VT/PkL9E4hDBAwGt49G88gSC +# O0x9jfdDZWdWGbELXlSmA3EP4eTYq7RrolY04G8fGtF0pzuZu43A29zaI9lIr5ul +# KRz8EoQHU6cu0PxUw0B9H8cAkvQxaMumRZ/4fCbqNb4TcPkPcWOI24QYlvpbtT9p +# 31flYElmc5wjGplAky/nkJcT0HZENXenxWtPvt4gcoqppeJPA3S/1D57KL3667ep +# Ir0yV290E2otZbAW8DCCB3EwggVZoAMCAQICEzMAAAAVxedrngKbSZkAAAAAABUw +# DQYJKoZIhvcNAQELBQAwgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5n +# dG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9y +# YXRpb24xMjAwBgNVBAMTKU1pY3Jvc29mdCBSb290IENlcnRpZmljYXRlIEF1dGhv +# cml0eSAyMDEwMB4XDTIxMDkzMDE4MjIyNVoXDTMwMDkzMDE4MzIyNVowfDELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9z +# b2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw +# ggIKAoICAQDk4aZM57RyIQt5osvXJHm9DtWC0/3unAcH0qlsTnXIyjVX9gF/bErg +# 4r25PhdgM/9cT8dm95VTcVrifkpa/rg2Z4VGIwy1jRPPdzLAEBjoYH1qUoNEt6aO +# RmsHFPPFdvWGUNzBRMhxXFExN6AKOG6N7dcP2CZTfDlhAnrEqv1yaa8dq6z2Nr41 +# JmTamDu6GnszrYBbfowQHJ1S/rboYiXcag/PXfT+jlPP1uyFVk3v3byNpOORj7I5 +# LFGc6XBpDco2LXCOMcg1KL3jtIckw+DJj361VI/c+gVVmG1oO5pGve2krnopN6zL +# 64NF50ZuyjLVwIYwXE8s4mKyzbnijYjklqwBSru+cakXW2dg3viSkR4dPf0gz3N9 +# QZpGdc3EXzTdEonW/aUgfX782Z5F37ZyL9t9X4C626p+Nuw2TPYrbqgSUei/BQOj +# 0XOmTTd0lBw0gg/wEPK3Rxjtp+iZfD9M269ewvPV2HM9Q07BMzlMjgK8QmguEOqE +# UUbi0b1qGFphAXPKZ6Je1yh2AuIzGHLXpyDwwvoSCtdjbwzJNmSLW6CmgyFdXzB0 +# kZSU2LlQ+QuJYfM2BjUYhEfb3BvR/bLUHMVr9lxSUV0S2yW6r1AFemzFER1y7435 +# UsSFF5PAPBXbGjfHCBUYP3irRbb1Hode2o+eFnJpxq57t7c+auIurQIDAQABo4IB +# 3TCCAdkwEgYJKwYBBAGCNxUBBAUCAwEAATAjBgkrBgEEAYI3FQIEFgQUKqdS/mTE +# mr6CkTxGNSnPEP8vBO4wHQYDVR0OBBYEFJ+nFV0AXmJdg/Tl0mWnG1M1GelyMFwG +# A1UdIARVMFMwUQYMKwYBBAGCN0yDfQEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly93 +# d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvRG9jcy9SZXBvc2l0b3J5Lmh0bTATBgNV +# HSUEDDAKBggrBgEFBQcDCDAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNV +# HQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBTV9lbLj+iiXGJo +# 0T2UkFvXzpoYxDBWBgNVHR8ETzBNMEugSaBHhkVodHRwOi8vY3JsLm1pY3Jvc29m +# dC5jb20vcGtpL2NybC9wcm9kdWN0cy9NaWNSb29DZXJBdXRfMjAxMC0wNi0yMy5j +# cmwwWgYIKwYBBQUHAQEETjBMMEoGCCsGAQUFBzAChj5odHRwOi8vd3d3Lm1pY3Jv +# c29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dF8yMDEwLTA2LTIzLmNydDAN +# BgkqhkiG9w0BAQsFAAOCAgEAnVV9/Cqt4SwfZwExJFvhnnJL/Klv6lwUtj5OR2R4 +# sQaTlz0xM7U518JxNj/aZGx80HU5bbsPMeTCj/ts0aGUGCLu6WZnOlNN3Zi6th54 +# 2DYunKmCVgADsAW+iehp4LoJ7nvfam++Kctu2D9IdQHZGN5tggz1bSNU5HhTdSRX +# ud2f8449xvNo32X2pFaq95W2KFUn0CS9QKC/GbYSEhFdPSfgQJY4rPf5KYnDvBew +# VIVCs/wMnosZiefwC2qBwoEZQhlSdYo2wh3DYXMuLGt7bj8sCXgU6ZGyqVvfSaN0 +# DLzskYDSPeZKPmY7T7uG+jIa2Zb0j/aRAfbOxnT99kxybxCrdTDFNLB62FD+Cljd +# QDzHVG2dY3RILLFORy3BFARxv2T5JL5zbcqOCb2zAVdJVGTZc9d/HltEAY5aGZFr +# DZ+kKNxnGSgkujhLmm77IVRrakURR6nxt67I6IleT53S0Ex2tVdUCbFpAUR+fKFh +# bHP+CrvsQWY9af3LwUFJfn6Tvsv4O+S3Fb+0zj6lMVGEvL8CwYKiexcdFYmNcP7n +# tdAoGokLjzbaukz5m/8K6TT4JDVnK+ANuOaMmdbhIurwJ0I9JZTmdHRbatGePu1+ +# oDEzfbzL6Xu/OHBE0ZDxyKs6ijoIYn/ZcGNTTY3ugm2lBRDBcQZqELQdVTNYs6Fw +# ZvKhggLUMIICPQIBATCCAQChgdikgdUwgdIxCzAJBgNVBAYTAlVTMRMwEQYDVQQI +# EwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3Nv +# ZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVsYW5kIE9wZXJh +# dGlvbnMgTGltaXRlZDEmMCQGA1UECxMdVGhhbGVzIFRTUyBFU046RDA4Mi00QkZE +# LUVFQkExJTAjBgNVBAMTHE1pY3Jvc29mdCBUaW1lLVN0YW1wIFNlcnZpY2WiIwoB +# ATAHBgUrDgMCGgMVAD5NL4IEdudIBwdGoCaV0WBbQZpqoIGDMIGApH4wfDELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9z +# b2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwDQYJKoZIhvcNAQEFBQACBQDl7ubRMCIY +# DzIwMjIwMzMwMjIyNTIxWhgPMjAyMjAzMzEyMjI1MjFaMHQwOgYKKwYBBAGEWQoE +# ATEsMCowCgIFAOXu5tECAQAwBwIBAAICCl0wBwIBAAICET4wCgIFAOXwOFECAQAw +# NgYKKwYBBAGEWQoEAjEoMCYwDAYKKwYBBAGEWQoDAqAKMAgCAQACAwehIKEKMAgC +# AQACAwGGoDANBgkqhkiG9w0BAQUFAAOBgQBjidsY/frY7jVCC5L43gm9MoaMnxjT +# 8gVLXcdbhJzGYftD84JlTWvw/WyGSHpoeg+oCe01IIgdTicq0MKjxoca+LefqaS8 +# vlAf9s1JdIa2Je7u5CzOt2Gru9C00znmx6hI8XCkV+Gj+ZopC4kESoaSGiyaqt+S +# YZHTJ1hNVg79dTGCBA0wggQJAgEBMIGTMHwxCzAJBgNVBAYTAlVTMRMwEQYDVQQI +# EwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3Nv +# ZnQgQ29ycG9yYXRpb24xJjAkBgNVBAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1wIFBD +# QSAyMDEwAhMzAAABj/NRqOtact3MAAEAAAGPMA0GCWCGSAFlAwQCAQUAoIIBSjAa +# BgkqhkiG9w0BCQMxDQYLKoZIhvcNAQkQAQQwLwYJKoZIhvcNAQkEMSIEINiK/M5f +# XbrPmiX51J8Q0509SaHo+kaJINrM63rv2CC0MIH6BgsqhkiG9w0BCRACLzGB6jCB +# 5zCB5DCBvQQgl3IFT+LGxguVjiKm22ItmO6dFDWW8nShu6O6g8yFxx8wgZgwgYCk +# fjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMH +# UmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQD +# Ex1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMAITMwAAAY/zUajrWnLdzAAB +# AAABjzAiBCB0UdAt+5LFhsYAoTd2lnVnE0JExPii63XeZzU2N7NElDANBgkqhkiG +# 9w0BAQsFAASCAgBVZGqKHCmTLQiez5m9TN0oZdkN914Fcgdy7d+ZecfYKIQEpM4b +# OkppRGaHzUinbjDnbY3qGc+fejleoGLr/KQoW/qpXG6vm4Fd78QJeyoYJ91zu97K +# dxHDqNPFBgUSI59dz/xZv6yE4dvaLrvT/5K84Wh0266JTbBovUSoeGdHvXML+Ou8 +# Emrocd+XorK0YmAUOP5yhytSIruzyDd4tLCfz8OUSug4dA8u7HWxPx31L10/Qpaq +# EE+TEUNWDaRunnV+ZY7YkyQkdsN+I1Mbe2/KC85Eiy2X04qwPd5ACF68aMrdSGvI +# e4eO5pJEHRGkimm9Mm44QCLrxx0zbQIU16GBOWbSyD/oy54MkOreoiIuWhCVS6lN +# oJrOEaFbCsrUVMcGAc13YgcLbCw0V/YZNRLMakT9sbjYqfn4xRE3DO8PmyHlzDw8 +# g6CzIZQExAVkyxY+ZHXf8HcR5n3DHfLGMxCu7o4O7+os0axGBrdSmHJBVuSF+0Q3 +# 0OaF2MDIrMNYfhlQt5DxB2sw8EnyLctrW2Ve7wuq02gBM+BT2Ln66a9wzNK7HPKs +# rSkQg2stGl0hoCRPZ9geSm++3pbtFhzUMosPpfA9mirBELDpWg5YRF9gftRdUfJZ +# bLYStWVOB5OFNv2LpxoOdvVzqiigK3+LRrnlcWxPt6/6QqlC5EIFYOkMUw== +# SIG # End signature block diff --git a/externals/vcpkg/scripts/buildsystems/msbuild/vcpkg-general.xml b/externals/vcpkg/scripts/buildsystems/msbuild/vcpkg-general.xml new file mode 100755 index 000000000..5c84aa0da --- /dev/null +++ b/externals/vcpkg/scripts/buildsystems/msbuild/vcpkg-general.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/externals/vcpkg/scripts/buildsystems/msbuild/vcpkg.props b/externals/vcpkg/scripts/buildsystems/msbuild/vcpkg.props new file mode 100755 index 000000000..9a01beb5a --- /dev/null +++ b/externals/vcpkg/scripts/buildsystems/msbuild/vcpkg.props @@ -0,0 +1,21 @@ + + + + true + true + $(Configuration) + false + $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\..')) + + true + + false + true + + + false + true + $([MSbuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), vcpkg.json)) + + diff --git a/externals/vcpkg/scripts/buildsystems/msbuild/vcpkg.targets b/externals/vcpkg/scripts/buildsystems/msbuild/vcpkg.targets new file mode 100755 index 000000000..3f2b63d85 --- /dev/null +++ b/externals/vcpkg/scripts/buildsystems/msbuild/vcpkg.targets @@ -0,0 +1,210 @@ + + + + + + + + + <_ZVcpkgRoot>$(VcpkgRoot) + <_ZVcpkgManifestRoot>$(VcpkgManifestRoot) + <_ZVcpkgInstalledDir>$(VcpkgInstalledDir) + + + + + <_ZVcpkgRoot Condition="!$(_ZVcpkgRoot.EndsWith('\'))">$(_ZVcpkgRoot)\ + <_ZVcpkgManifestRoot Condition="'$(_ZVcpkgManifestRoot)' != '' and !$(_ZVcpkgManifestRoot.EndsWith('\'))">$(_ZVcpkgManifestRoot)\ + <_ZVcpkgInstalledDir Condition="'$(_ZVcpkgInstalledDir)' != '' and !$(_ZVcpkgInstalledDir.EndsWith('\'))">$(_ZVcpkgInstalledDir)\ + + + + + windows + uwp + + + + $(Platform) + x86 + + + + <_ZVcpkgLinkage /> + <_ZVcpkgLinkage Condition="'$(VcpkgUseStatic)' == 'true'">-static + $(VcpkgPlatformTarget)-$(VcpkgOSTarget)$(_ZVcpkgLinkage) + + + + + VcpkgTriplet=$(VcpkgTriplet):$(ProjectStateLine) + + + + + + + <_ZVcpkgInstalledDir Condition="'$(_ZVcpkgInstalledDir)' == ''">$(_ZVcpkgManifestRoot)vcpkg_installed\$(VcpkgTriplet)\ + + + + + <_ZVcpkgInstalledDir Condition="'$(_ZVcpkgInstalledDir)' == ''">$(_ZVcpkgRoot)installed\ + + + + + + <_ZVcpkgCurrentInstalledDir>$(_ZVcpkgInstalledDir)$(VcpkgTriplet)\ + <_ZVcpkgNormalizedConfiguration Condition="$(VcpkgConfiguration.StartsWith('Debug'))">Debug + <_ZVcpkgNormalizedConfiguration Condition="$(VcpkgConfiguration.StartsWith('Release')) or '$(VcpkgConfiguration)' == 'RelWithDebInfo' or '$(VcpkgConfiguration)' == 'MinSizeRel'">Release + + <_ZVcpkgConfigSubdir Condition="'$(_ZVcpkgNormalizedConfiguration)' == 'Debug'">debug\ + <_ZVcpkgExecutable>$(_ZVcpkgRoot)vcpkg.exe + $(ExternalIncludePath);$(_ZVcpkgCurrentInstalledDir)include + + + + + $(_ZVcpkgRoot)scripts\buildsystems\msbuild\vcpkg-general.xml + + + + + Project + + + + + + + %(AdditionalLibraryDirectories);$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)lib;$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)lib\manual-link + + + %(AdditionalDependencies);$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)lib\*.lib + %(AdditionalLibraryDirectories);$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)lib;$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)lib\manual-link + + + %(AdditionalIncludeDirectories);$(_ZVcpkgCurrentInstalledDir)include + + + %(AdditionalIncludeDirectories);$(_ZVcpkgCurrentInstalledDir)include + + + + + + + + + + + + + + + + + + <_ZVcpkgHostTripletParameter>"--host-triplet=$(VcpkgHostTriplet)" + <_ZVcpkgHostTripletSuffix>$(VcpkgHostTriplet). + + + + + <_ZVcpkgHostTripletParameter /> + <_ZVcpkgHostTripletSuffix /> + + + + + + <_ZVcpkgManifestFileLocation>$(_ZVcpkgManifestRoot)vcpkg.json + <_ZVcpkgConfigurationFileLocation>$(_ZVcpkgManifestRoot)vcpkg-configuration.json + <_ZVcpkgMSBuildStampFile>$(_ZVcpkgInstalledDir).msbuildstamp-$(VcpkgTriplet).$(_ZVcpkgHostTripletSuffix)stamp + + + + <_ZVcpkgInstallManifestDependenciesInputs Include="$(_ZVcpkgManifestFileLocation)"/> + <_ZVcpkgInstallManifestDependenciesInputs Include="$(_ZVcpkgConfigurationFileLocation)" Condition="Exists('$(_ZVcpkgConfigurationFileLocation)')"/> + + + + + + <_ZVcpkgTLogFileLocation>$(TLogLocation)VcpkgInstallManifest$(VcpkgTriplet).$(_ZVcpkgHostTripletSuffix)read.1u.tlog + + + + + + + + + + + + + + + + + <_ZVcpkgAppLocalPowerShellCommonArguments>-ExecutionPolicy Bypass -noprofile -File "$(MSBuildThisFileDirectory)applocal.ps1" "$(TargetPath)" "$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)bin" "$(TLogLocation)$(ProjectName).write.1u.tlog" "$(IntDir)vcpkg.applocal.log" + + + + + + + + + + + + + + + + + + + + + diff --git a/externals/vcpkg/scripts/buildsystems/osx/applocal.py b/externals/vcpkg/scripts/buildsystems/osx/applocal.py new file mode 100755 index 000000000..5237f1fdd --- /dev/null +++ b/externals/vcpkg/scripts/buildsystems/osx/applocal.py @@ -0,0 +1,425 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- +""" +finish the job started by macdeployqtfix +from: https://github.com/arl/macdeployqtfix + +The MIT License (MIT) + +Copyright (c) 2015 Aurelien Rainone + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +""" + +from subprocess import Popen, PIPE +from string import Template +import os +import sys +import logging +import argparse +import re +from collections import namedtuple + + +QTLIB_NAME_REGEX = r'^(?:@executable_path)?/.*/(Qt[a-zA-Z]*).framework/(?:Versions/\d/)?\1$' +QTLIB_NORMALIZED = r'$prefix/Frameworks/$qtlib.framework/Versions/$qtversion/$qtlib' + +QTPLUGIN_NAME_REGEX = r'^(?:@executable_path)?/.*/[pP]lug[iI]ns/(.*)/(.*).dylib$' +QTPLUGIN_NORMALIZED = r'$prefix/PlugIns/$plugintype/$pluginname.dylib' + +LOADERPATH_REGEX = r'^@[a-z_]+path/(.*)' +LOADERPATH_NORMALIZED = r'$prefix/Frameworks/$loaderpathlib' + + +class GlobalConfig(object): + logger = None + qtpath = None + exepath = None + + +def run_and_get_output(popen_args): + """Run process and get all output""" + process_output = namedtuple('ProcessOutput', ['stdout', 'stderr', 'retcode']) + try: + GlobalConfig.logger.debug('run_and_get_output({0})'.format(repr(popen_args))) + + proc = Popen(popen_args, stdin=PIPE, stdout=PIPE, stderr=PIPE) + stdout, stderr = proc.communicate(b'') + proc_out = process_output(stdout, stderr, proc.returncode) + + GlobalConfig.logger.debug('\tprocess_output: {0}'.format(proc_out)) + return proc_out + except Exception as exc: + GlobalConfig.logger.error('\texception: {0}'.format(exc)) + return process_output('', exc.message, -1) + + +def get_dependencies(filename): + """ + input: filename must be an absolute path + Should call `otool` and returns the list of dependencies, unsorted, + unmodified, just the raw list so then we could eventually re-use in other + more specialized functions + """ + GlobalConfig.logger.debug('get_dependencies({0})'.format(filename)) + popen_args = ['otool', '-L', filename] + proc_out = run_and_get_output(popen_args) + deps = [] + if proc_out.retcode == 0: + # some string splitting + deps = [s.strip().split(b' ')[0].decode('utf-8') for s in proc_out.stdout.splitlines()[1:] if s] + # prevent infinite recursion when a binary depends on itself (seen with QtWidgets)... + deps = [s for s in deps if os.path.basename(filename) not in s] + return deps + + +def is_qt_plugin(filename): + """ + Checks if a given file is a qt plugin. + Accepts absolute path as well as path containing @executable_path + """ + qtlib_name_rgx = re.compile(QTPLUGIN_NAME_REGEX) + return qtlib_name_rgx.match(filename) is not None + + +def is_qt_lib(filename): + """ + Checks if a given file is a qt library. + Accepts absolute path as well as path containing @executable_path + """ + qtlib_name_rgx = re.compile(QTLIB_NAME_REGEX) + return qtlib_name_rgx.match(filename) is not None + + +def is_loader_path_lib(filename): + """ + Checks if a given file is loaded via @loader_path or @rpath + """ + qtlib_name_rgx = re.compile(LOADERPATH_REGEX) + return qtlib_name_rgx.match(filename) is not None + + +def normalize_qtplugin_name(filename): + """ + input: a path to a qt plugin, as returned by otool, that can have this form : + - an absolute path /../plugins/PLUGINTYPE/PLUGINNAME.dylib + - @executable_path/../plugins/PLUGINTYPE/PLUGINNAME.dylib + output: + a tuple (qtlib, abspath, rpath) where: + - qtname is the name of the plugin (libqcocoa.dylib, etc.) + - abspath is the absolute path of the qt lib inside the app bundle of exepath + - relpath is the correct rpath to a qt lib inside the app bundle + """ + + GlobalConfig.logger.debug('normalize_plugin_name({0})'.format(filename)) + + qtplugin_name_rgx = re.compile(QTPLUGIN_NAME_REGEX) + rgxret = qtplugin_name_rgx.match(filename) + if not rgxret: + msg = 'couldn\'t normalize a non-qt plugin filename: {0}'.format(filename) + GlobalConfig.logger.critical(msg) + raise Exception(msg) + + # qtplugin normalization settings + qtplugintype = rgxret.groups()[0] + qtpluginname = rgxret.groups()[1] + + templ = Template(QTPLUGIN_NORMALIZED) + + # from qtlib, forge 2 path : + # - absolute path of qt lib in bundle, + abspath = os.path.normpath(templ.safe_substitute( + prefix=os.path.dirname(GlobalConfig.exepath) + '/..', + plugintype=qtplugintype, + pluginname=qtpluginname)) + + # - and rpath containing @executable_path, relative to exepath + rpath = templ.safe_substitute( + prefix='@executable_path/..', + plugintype=qtplugintype, + pluginname=qtpluginname) + + GlobalConfig.logger.debug('\treturns({0})'.format((qtpluginname, abspath, rpath))) + return qtpluginname, abspath, rpath + + +def normalize_qtlib_name(filename): + """ + input: a path to a qt library, as returned by otool, that can have this form : + - an absolute path /lib/xxx/yyy + - @executable_path/../Frameworks/QtSerialPort.framework/Versions/5/QtSerialPort + output: + a tuple (qtlib, abspath, rpath) where: + - qtlib is the name of the qtlib (QtCore, QtWidgets, etc.) + - abspath is the absolute path of the qt lib inside the app bundle of exepath + - relpath is the correct rpath to a qt lib inside the app bundle + """ + GlobalConfig.logger.debug('normalize_qtlib_name({0})'.format(filename)) + + qtlib_name_rgx = re.compile(QTLIB_NAME_REGEX) + rgxret = qtlib_name_rgx.match(filename) + if not rgxret: + msg = 'couldn\'t normalize a non-qt lib filename: {0}'.format(filename) + GlobalConfig.logger.critical(msg) + raise Exception(msg) + + # qtlib normalization settings + qtlib = rgxret.groups()[0] + qtversion = 5 + + templ = Template(QTLIB_NORMALIZED) + + # from qtlib, forge 2 path : + # - absolute path of qt lib in bundle, + abspath = os.path.normpath(templ.safe_substitute( + prefix=os.path.dirname(GlobalConfig.exepath) + '/..', + qtlib=qtlib, + qtversion=qtversion)) + + # - and rpath containing @executable_path, relative to exepath + rpath = templ.safe_substitute( + prefix='@executable_path/..', + qtlib=qtlib, + qtversion=qtversion) + + GlobalConfig.logger.debug('\treturns({0})'.format((qtlib, abspath, rpath))) + return qtlib, abspath, rpath + + +def normalize_loaderpath_name(filename): + """ + input: a path to a loaderpath library, as returned by otool, that can have this form : + - an relative path @loaderpath/yyy + output: + a tuple (loaderpathlib, abspath, rpath) where: + - loaderpathlib is the name of the loaderpath lib + - abspath is the absolute path of the qt lib inside the app bundle of exepath + - relpath is the correct rpath to a qt lib inside the app bundle + """ + GlobalConfig.logger.debug('normalize_loaderpath_name({0})'.format(filename)) + + loaderpath_name_rgx = re.compile(LOADERPATH_REGEX) + rgxret = loaderpath_name_rgx.match(filename) + if not rgxret: + msg = 'couldn\'t normalize a loaderpath lib filename: {0}'.format(filename) + GlobalConfig.logger.critical(msg) + raise Exception(msg) + + # loaderpath normalization settings + loaderpathlib = rgxret.groups()[0] + templ = Template(LOADERPATH_NORMALIZED) + + # from loaderpath, forge 2 path : + # - absolute path of qt lib in bundle, + abspath = os.path.normpath(templ.safe_substitute( + prefix=os.path.dirname(GlobalConfig.exepath) + '/..', + loaderpathlib=loaderpathlib)) + + # - and rpath containing @executable_path, relative to exepath + rpath = templ.safe_substitute( + prefix='@executable_path/..', + loaderpathlib=loaderpathlib) + + GlobalConfig.logger.debug('\treturns({0})'.format((loaderpathlib, abspath, rpath))) + return loaderpathlib, abspath, rpath + + +def fix_dependency(binary, dep): + """ + fix 'dep' dependency of 'binary'. 'dep' is a qt library + """ + if is_qt_lib(dep): + qtname, dep_abspath, dep_rpath = normalize_qtlib_name(dep) + qtnamesrc = os.path.join(GlobalConfig.qtpath, 'lib', '{0}.framework'. + format(qtname), qtname) + elif is_qt_plugin(dep): + qtname, dep_abspath, dep_rpath = normalize_qtplugin_name(dep) + qtnamesrc = os.path.join(GlobalConfig.qtpath, 'lib', '{0}.framework'. + format(qtname), qtname) + elif is_loader_path_lib(dep): + qtname, dep_abspath, dep_rpath = normalize_loaderpath_name(dep) + qtnamesrc = os.path.join(GlobalConfig.qtpath + '/lib', qtname) + else: + return True + + # if the source path doesn't exist it's probably not a dependency + # originating with vcpkg and we should leave it alone + if not os.path.exists(qtnamesrc): + return True + + dep_ok = True + # check that rpath of 'dep' inside binary has been correctly set + # (ie: relative to exepath using '@executable_path' syntax) + if dep != dep_rpath: + # dep rpath is not ok + GlobalConfig.logger.info('changing rpath \'{0}\' in binary {1}'.format(dep, binary)) + + # call install_name_tool -change on binary + popen_args = ['install_name_tool', '-change', dep, dep_rpath, binary] + proc_out = run_and_get_output(popen_args) + if proc_out.retcode != 0: + GlobalConfig.logger.error(proc_out.stderr) + dep_ok = False + else: + # call install_name_tool -id on binary + popen_args = ['install_name_tool', '-id', dep_rpath, binary] + proc_out = run_and_get_output(popen_args) + if proc_out.retcode != 0: + GlobalConfig.logger.error(proc_out.stderr) + dep_ok = False + + # now ensure that 'dep' exists at the specified path, relative to bundle + if dep_ok and not os.path.exists(dep_abspath): + + # ensure destination directory exists + GlobalConfig.logger.info('ensuring directory \'{0}\' exists: {0}'. + format(os.path.dirname(dep_abspath))) + popen_args = ['mkdir', '-p', os.path.dirname(dep_abspath)] + proc_out = run_and_get_output(popen_args) + if proc_out.retcode != 0: + GlobalConfig.logger.info(proc_out.stderr) + dep_ok = False + else: + # copy missing dependency into bundle + GlobalConfig.logger.info('copying missing dependency in bundle: {0}'. + format(qtname)) + popen_args = ['cp', qtnamesrc, dep_abspath] + proc_out = run_and_get_output(popen_args) + if proc_out.retcode != 0: + GlobalConfig.logger.info(proc_out.stderr) + dep_ok = False + else: + # ensure permissions are correct if we ever have to change its rpath + GlobalConfig.logger.info('ensuring 755 perm to {0}'.format(dep_abspath)) + popen_args = ['chmod', '755', dep_abspath] + proc_out = run_and_get_output(popen_args) + if proc_out.retcode != 0: + GlobalConfig.logger.info(proc_out.stderr) + dep_ok = False + else: + GlobalConfig.logger.debug('{0} is at correct location in bundle'.format(qtname)) + + if dep_ok: + return fix_binary(dep_abspath) + return False + + +def fix_binary(binary): + """ + input: + binary: relative or absolute path (no @executable_path syntax) + process: + - first fix the rpath for the qt libs on which 'binary' depend + - copy into the bundle of exepath the eventual libraries that are missing + - (create the soft links) needed ? + - do the same for all qt dependencies of binary (recursive) + """ + GlobalConfig.logger.debug('fix_binary({0})'.format(binary)) + + # loop on 'binary' dependencies + for dep in get_dependencies(binary): + if not fix_dependency(binary, dep): + GlobalConfig.logger.error('quitting early: couldn\'t fix dependency {0} of {1}'.format(dep, binary)) + return False + return True + + +def fix_main_binaries(): + """ + list the main binaries of the app bundle and fix them + """ + # deduce bundle path + bundlepath = os.path.sep.join(GlobalConfig.exepath.split(os.path.sep)[0:-3]) + + # fix main binary + GlobalConfig.logger.info('fixing executable \'{0}\''.format(GlobalConfig.exepath)) + if fix_binary(GlobalConfig.exepath): + GlobalConfig.logger.info('fixing plugins') + for root, dummy, files in os.walk(bundlepath): + for name in [f for f in files if os.path.splitext(f)[1] == '.dylib']: + GlobalConfig.logger.info('fixing plugin {0}'.format(name)) + if not fix_binary(os.path.join(root, name)): + return False + return True + + +def main(): + descr = """finish the job started by macdeployqt! + - find dependencies/rpaths with otool + - copy missed dependencies with cp and mkdir + - fix missed rpaths with install_name_tool + + exit codes: + - 0 : success + - 1 : error + """ + + parser = argparse.ArgumentParser(description=descr, + formatter_class=argparse.RawTextHelpFormatter) + parser.add_argument('exepath', + help='path to the binary depending on Qt') + parser.add_argument('qtpath', + help='path of Qt libraries used to build the Qt application') + parser.add_argument('-q', '--quiet', action='store_true', default=False, + help='do not create log on standard output') + parser.add_argument('-nl', '--no-log-file', action='store_true', default=False, + help='do not create log file \'./macdeployqtfix.log\'') + parser.add_argument('-v', '--verbose', action='store_true', default=False, + help='produce more log messages(debug log)') + args = parser.parse_args() + + # globals + GlobalConfig.qtpath = os.path.normpath(args.qtpath) + GlobalConfig.exepath = args.exepath + GlobalConfig.logger = logging.getLogger() + + # configure logging + ################### + + # create formatter + formatter = logging.Formatter('%(levelname)s | %(message)s') + # create console GlobalConfig.logger + if not args.quiet: + chdlr = logging.StreamHandler(sys.stdout) + chdlr.setFormatter(formatter) + GlobalConfig.logger.addHandler(chdlr) + + # create file GlobalConfig.logger + if not args.no_log_file: + fhdlr = logging.FileHandler('./macdeployqtfix.log', mode='w') + fhdlr.setFormatter(formatter) + GlobalConfig.logger.addHandler(fhdlr) + + if args.no_log_file and args.quiet: + GlobalConfig.logger.addHandler(logging.NullHandler()) + else: + GlobalConfig.logger.setLevel(logging.DEBUG if args.verbose else logging.INFO) + + if fix_main_binaries(): + GlobalConfig.logger.info('macdeployqtfix terminated with success') + ret = 0 + else: + GlobalConfig.logger.error('macdeployqtfix terminated with error') + ret = 1 + sys.exit(ret) + + +if __name__ == "__main__": + main() diff --git a/externals/vcpkg/scripts/buildsystems/vcpkg.cmake b/externals/vcpkg/scripts/buildsystems/vcpkg.cmake new file mode 100755 index 000000000..31cee14eb --- /dev/null +++ b/externals/vcpkg/scripts/buildsystems/vcpkg.cmake @@ -0,0 +1,861 @@ +# Mark variables as used so cmake doesn't complain about them +mark_as_advanced(CMAKE_TOOLCHAIN_FILE) + +# NOTE: to figure out what cmake versions are required for different things, +# grep for `CMake 3`. All version requirement comments should follow that format. + +# Attention: Changes to this file do not affect ABI hashing. + +#[===[.md: +# z_vcpkg_add_fatal_error +Add a fatal error. + +```cmake +z_vcpkg_add_fatal_error(...) +``` + +We use this system, instead of `message(FATAL_ERROR)`, +since cmake prints a lot of nonsense if the toolchain errors out before it's found the build tools. + +This `Z_VCPKG_HAS_FATAL_ERROR` must be checked before any filesystem operations are done, +since otherwise you might be doing something with bad variables set up. +#]===] +# this is defined above everything else so that it can be used. +set(Z_VCPKG_FATAL_ERROR) +set(Z_VCPKG_HAS_FATAL_ERROR OFF) +function(z_vcpkg_add_fatal_error ERROR) + if(NOT Z_VCPKG_HAS_FATAL_ERROR) + set(Z_VCPKG_HAS_FATAL_ERROR ON PARENT_SCOPE) + set(Z_VCPKG_FATAL_ERROR "${ERROR}" PARENT_SCOPE) + else() + string(APPEND Z_VCPKG_FATAL_ERROR "\n${ERROR}") + endif() +endfunction() + +set(Z_VCPKG_CMAKE_REQUIRED_MINIMUM_VERSION "3.7.2") +if(CMAKE_VERSION VERSION_LESS Z_VCPKG_CMAKE_REQUIRED_MINIMUM_VERSION) + message(FATAL_ERROR "vcpkg.cmake requires at least CMake ${Z_VCPKG_CMAKE_REQUIRED_MINIMUM_VERSION}.") +endif() +cmake_policy(PUSH) +cmake_policy(VERSION 3.7.2) + +include(CMakeDependentOption) + +# VCPKG toolchain options. +option(VCPKG_VERBOSE "Enables messages from the VCPKG toolchain for debugging purposes." OFF) +mark_as_advanced(VCPKG_VERBOSE) + +option(VCPKG_APPLOCAL_DEPS "Automatically copy dependencies into the output directory for executables." ON) +option(X_VCPKG_APPLOCAL_DEPS_SERIALIZED "(experimental) Add USES_TERMINAL to VCPKG_APPLOCAL_DEPS to force serialization." OFF) + +# requires CMake 3.14 +option(X_VCPKG_APPLOCAL_DEPS_INSTALL "(experimental) Automatically copy dependencies into the install target directory for executables. Requires CMake 3.14." OFF) +option(VCPKG_PREFER_SYSTEM_LIBS "Appends the vcpkg paths to CMAKE_PREFIX_PATH, CMAKE_LIBRARY_PATH and CMAKE_FIND_ROOT_PATH so that vcpkg libraries/packages are found after toolchain/system libraries/packages." OFF) + +# Manifest options and settings +if(NOT DEFINED VCPKG_MANIFEST_DIR) + if(EXISTS "${CMAKE_SOURCE_DIR}/vcpkg.json") + set(VCPKG_MANIFEST_DIR "${CMAKE_SOURCE_DIR}") + endif() +endif() +set(VCPKG_MANIFEST_DIR "${VCPKG_MANIFEST_DIR}" + CACHE PATH "The path to the vcpkg manifest directory." FORCE) + +if(DEFINED VCPKG_MANIFEST_DIR AND NOT VCPKG_MANIFEST_DIR STREQUAL "") + set(Z_VCPKG_HAS_MANIFEST_DIR ON) +else() + set(Z_VCPKG_HAS_MANIFEST_DIR OFF) +endif() + +option(VCPKG_MANIFEST_MODE "Use manifest mode, as opposed to classic mode." "${Z_VCPKG_HAS_MANIFEST_DIR}") + +if(VCPKG_MANIFEST_MODE AND NOT Z_VCPKG_HAS_MANIFEST_DIR) + z_vcpkg_add_fatal_error( +"vcpkg manifest mode was enabled, but we couldn't find a manifest file (vcpkg.json) +in the current source directory (${CMAKE_CURRENT_SOURCE_DIR}). +Please add a manifest, or disable manifests by turning off VCPKG_MANIFEST_MODE." + ) +endif() + +if(NOT DEFINED CACHE{Z_VCPKG_CHECK_MANIFEST_MODE}) + set(Z_VCPKG_CHECK_MANIFEST_MODE "${VCPKG_MANIFEST_MODE}" + CACHE INTERNAL "Making sure VCPKG_MANIFEST_MODE doesn't change") +endif() + +if(NOT VCPKG_MANIFEST_MODE AND Z_VCPKG_CHECK_MANIFEST_MODE) + z_vcpkg_add_fatal_error([[ +vcpkg manifest mode was disabled for a build directory where it was initially enabled. +This is not supported. Please delete the build directory and reconfigure. +]]) +elseif(VCPKG_MANIFEST_MODE AND NOT Z_VCPKG_CHECK_MANIFEST_MODE) + z_vcpkg_add_fatal_error([[ +vcpkg manifest mode was enabled for a build directory where it was initially disabled. +This is not supported. Please delete the build directory and reconfigure. +]]) +endif() + +CMAKE_DEPENDENT_OPTION(VCPKG_MANIFEST_INSTALL [[ +Install the dependencies listed in your manifest: + If this is off, you will have to manually install your dependencies. + See https://github.com/microsoft/vcpkg/tree/master/docs/specifications/manifests.md for more info. +]] + ON + "VCPKG_MANIFEST_MODE" + OFF) + +if(VCPKG_MANIFEST_INSTALL) + set(VCPKG_BOOTSTRAP_OPTIONS "${VCPKG_BOOTSTRAP_OPTIONS}" CACHE STRING "Additional options to bootstrap vcpkg" FORCE) + set(VCPKG_OVERLAY_PORTS "${VCPKG_OVERLAY_PORTS}" CACHE STRING "Overlay ports to use for vcpkg install in manifest mode" FORCE) + set(VCPKG_OVERLAY_TRIPLETS "${VCPKG_OVERLAY_TRIPLETS}" CACHE STRING "Overlay triplets to use for vcpkg install in manifest mode" FORCE) + set(VCPKG_INSTALL_OPTIONS "${VCPKG_INSTALL_OPTIONS}" CACHE STRING "Additional install options to pass to vcpkg" FORCE) + set(Z_VCPKG_UNUSED VCPKG_BOOTSTRAP_OPTIONS) + set(Z_VCPKG_UNUSED VCPKG_OVERLAY_PORTS) + set(Z_VCPKG_UNUSED VCPKG_OVERLAY_TRIPLETS) + set(Z_VCPKG_UNUSED VCPKG_INSTALL_OPTIONS) +endif() + +# CMake helper utilities + +#[===[.md: +# z_vcpkg_function_arguments + +Get a list of the arguments which were passed in. +Unlike `ARGV`, which is simply the arguments joined with `;`, +so that `(A B)` is not distinguishable from `("A;B")`, +this macro gives `"A;B"` for the first argument list, +and `"A\;B"` for the second. + +```cmake +z_vcpkg_function_arguments( []) +``` + +`z_vcpkg_function_arguments` gets the arguments between `ARGV` and the last argument. +`` defaults to `0`, so that all arguments are taken. + +## Example: +```cmake +function(foo_replacement) + z_vcpkg_function_arguments(ARGS) + foo(${ARGS}) + ... +endfunction() +``` +#]===] + +# NOTE: this function definition is copied directly from scripts/cmake/z_vcpkg_function_arguments.cmake +# do not make changes here without making the same change there. +macro(z_vcpkg_function_arguments OUT_VAR) + if("${ARGC}" EQUAL 1) + set(z_vcpkg_function_arguments_FIRST_ARG 0) + elseif("${ARGC}" EQUAL 2) + set(z_vcpkg_function_arguments_FIRST_ARG "${ARGV1}") + else() + # vcpkg bug + message(FATAL_ERROR "z_vcpkg_function_arguments: invalid arguments (${ARGV})") + endif() + + set("${OUT_VAR}" "") + + # this allows us to get the value of the enclosing function's ARGC + set(z_vcpkg_function_arguments_ARGC_NAME "ARGC") + set(z_vcpkg_function_arguments_ARGC "${${z_vcpkg_function_arguments_ARGC_NAME}}") + + math(EXPR z_vcpkg_function_arguments_LAST_ARG "${z_vcpkg_function_arguments_ARGC} - 1") + # GREATER_EQUAL added in CMake 3.7 + if(NOT z_vcpkg_function_arguments_LAST_ARG LESS z_vcpkg_function_arguments_FIRST_ARG) + foreach(z_vcpkg_function_arguments_N RANGE "${z_vcpkg_function_arguments_FIRST_ARG}" "${z_vcpkg_function_arguments_LAST_ARG}") + string(REPLACE ";" "\\;" z_vcpkg_function_arguments_ESCAPED_ARG "${ARGV${z_vcpkg_function_arguments_N}}") + # adds an extra `;` on the first time through + set("${OUT_VAR}" "${${OUT_VAR}};${z_vcpkg_function_arguments_ESCAPED_ARG}") + endforeach() + # remove leading `;` + string(SUBSTRING "${${OUT_VAR}}" 1 -1 "${OUT_VAR}") + endif() +endmacro() + +#[===[.md: +# z_vcpkg_set_powershell_path + +Gets either the path to powershell or powershell core, +and places it in the variable Z_VCPKG_POWERSHELL_PATH. +#]===] +function(z_vcpkg_set_powershell_path) + # Attempt to use pwsh if it is present; otherwise use powershell + if(NOT DEFINED Z_VCPKG_POWERSHELL_PATH) + find_program(Z_VCPKG_PWSH_PATH pwsh) + if(Z_VCPKG_PWSH_PATH) + set(Z_VCPKG_POWERSHELL_PATH "${Z_VCPKG_PWSH_PATH}" CACHE INTERNAL "The path to the PowerShell implementation to use.") + else() + message(DEBUG "vcpkg: Could not find PowerShell Core; falling back to PowerShell") + find_program(Z_VCPKG_BUILTIN_POWERSHELL_PATH powershell REQUIRED) + if(Z_VCPKG_BUILTIN_POWERSHELL_PATH) + set(Z_VCPKG_POWERSHELL_PATH "${Z_VCPKG_BUILTIN_POWERSHELL_PATH}" CACHE INTERNAL "The path to the PowerShell implementation to use.") + else() + message(WARNING "vcpkg: Could not find PowerShell; using static string 'powershell.exe'") + set(Z_VCPKG_POWERSHELL_PATH "powershell.exe" CACHE INTERNAL "The path to the PowerShell implementation to use.") + endif() + endif() + endif() # Z_VCPKG_POWERSHELL_PATH +endfunction() + + +# Determine whether the toolchain is loaded during a try-compile configuration +get_property(Z_VCPKG_CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE) + +if(VCPKG_CHAINLOAD_TOOLCHAIN_FILE) + include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") +endif() + +if(VCPKG_TOOLCHAIN) + cmake_policy(POP) + return() +endif() + +#If CMake does not have a mapping for MinSizeRel and RelWithDebInfo in imported targets +#it will map those configuration to the first valid configuration in CMAKE_CONFIGURATION_TYPES or the targets IMPORTED_CONFIGURATIONS. +#In most cases this is the debug configuration which is wrong. +if(NOT DEFINED CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL) + set(CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL "MinSizeRel;Release;") + if(VCPKG_VERBOSE) + message(STATUS "VCPKG-Info: CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL set to MinSizeRel;Release;") + endif() +endif() +if(NOT DEFINED CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO) + set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO "RelWithDebInfo;Release;") + if(VCPKG_VERBOSE) + message(STATUS "VCPKG-Info: CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO set to RelWithDebInfo;Release;") + endif() +endif() + +if(VCPKG_TARGET_TRIPLET) + # This is required since a user might do: 'set(VCPKG_TARGET_TRIPLET somevalue)' [no CACHE] before the first project() call + # Latter within the toolchain file we do: 'set(VCPKG_TARGET_TRIPLET somevalue CACHE STRING "")' which + # will otherwise override the user setting of VCPKG_TARGET_TRIPLET in the current scope of the toolchain since the CACHE value + # did not exist previously. Since the value is newly created CMake will use the CACHE value within this scope since it is the more + # recently created value in directory scope. This 'strange' behaviour only happens on the very first configure call since subsequent + # configure call will see the user value as the more recent value. The same logic must be applied to all cache values within this file! + # The FORCE keyword is required to ALWAYS lift the user provided/previously set value into a CACHE value. + set(VCPKG_TARGET_TRIPLET "${VCPKG_TARGET_TRIPLET}" CACHE STRING "Vcpkg target triplet (ex. x86-windows)" FORCE) +elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Ww][Ii][Nn]32$") + set(Z_VCPKG_TARGET_TRIPLET_ARCH x86) +elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Xx]64$") + set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) +elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Aa][Rr][Mm]$") + set(Z_VCPKG_TARGET_TRIPLET_ARCH arm) +elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Aa][Rr][Mm]64$") + set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64) +else() + if(CMAKE_GENERATOR STREQUAL "Visual Studio 14 2015 Win64") + set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) + elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 14 2015 ARM") + set(Z_VCPKG_TARGET_TRIPLET_ARCH arm) + elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 14 2015") + set(Z_VCPKG_TARGET_TRIPLET_ARCH x86) + elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 15 2017 Win64") + set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) + elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 15 2017 ARM") + set(Z_VCPKG_TARGET_TRIPLET_ARCH arm) + elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 15 2017") + set(Z_VCPKG_TARGET_TRIPLET_ARCH x86) + elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 16 2019") + set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) + elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 17 2022") + set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) + else() + find_program(Z_VCPKG_CL cl) + if(Z_VCPKG_CL MATCHES "amd64/cl.exe$" OR Z_VCPKG_CL MATCHES "x64/cl.exe$") + set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) + elseif(Z_VCPKG_CL MATCHES "arm/cl.exe$") + set(Z_VCPKG_TARGET_TRIPLET_ARCH arm) + elseif(Z_VCPKG_CL MATCHES "arm64/cl.exe$") + set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64) + elseif(Z_VCPKG_CL MATCHES "bin/cl.exe$" OR Z_VCPKG_CL MATCHES "x86/cl.exe$") + set(Z_VCPKG_TARGET_TRIPLET_ARCH x86) + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND DEFINED CMAKE_SYSTEM_NAME AND NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin") + list(LENGTH CMAKE_OSX_ARCHITECTURES Z_VCPKG_OSX_ARCH_COUNT) + if(Z_VCPKG_OSX_ARCH_COUNT EQUAL 0) + message(WARNING "Unable to determine target architecture. " + "Consider providing a value for the CMAKE_OSX_ARCHITECTURES cache variable. " + "Continuing without vcpkg.") + set(VCPKG_TOOLCHAIN ON) + cmake_policy(POP) + return() + endif() + + if(Z_VCPKG_OSX_ARCH_COUNT GREATER 1) + message(WARNING "Detected more than one target architecture. Using the first one.") + endif() + list(GET CMAKE_OSX_ARCHITECTURES 0 Z_VCPKG_OSX_TARGET_ARCH) + if(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "arm64") + set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64) + elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "arm64s") + set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64s) + elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "armv7s") + set(Z_VCPKG_TARGET_TRIPLET_ARCH armv7s) + elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "armv7") + set(Z_VCPKG_TARGET_TRIPLET_ARCH arm) + elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "x86_64") + set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) + elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "i386") + set(Z_VCPKG_TARGET_TRIPLET_ARCH x86) + else() + message(WARNING "Unable to determine target architecture, continuing without vcpkg.") + set(VCPKG_TOOLCHAIN ON) + cmake_policy(POP) + return() + endif() + elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64" OR + CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "AMD64" OR + CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "amd64") + set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) + elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "s390x") + set(Z_VCPKG_TARGET_TRIPLET_ARCH s390x) + elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ppc64le") + set(Z_VCPKG_TARGET_TRIPLET_ARCH ppc64le) + elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "armv7l") + set(Z_VCPKG_TARGET_TRIPLET_ARCH arm) + elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64)$") + set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64) + else() + if(Z_VCPKG_CMAKE_IN_TRY_COMPILE) + message(STATUS "Unable to determine target architecture, continuing without vcpkg.") + else() + message(WARNING "Unable to determine target architecture, continuing without vcpkg.") + endif() + set(VCPKG_TOOLCHAIN ON) + cmake_policy(POP) + return() + endif() + endif() +endif() + +if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone") + set(Z_VCPKG_TARGET_TRIPLET_PLAT uwp) +elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")) + set(Z_VCPKG_TARGET_TRIPLET_PLAT linux) +elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")) + set(Z_VCPKG_TARGET_TRIPLET_PLAT osx) +elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS") + set(Z_VCPKG_TARGET_TRIPLET_PLAT ios) +elseif(MINGW) + set(Z_VCPKG_TARGET_TRIPLET_PLAT mingw-dynamic) +elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")) + set(Z_VCPKG_TARGET_TRIPLET_PLAT windows) +elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")) + set(Z_VCPKG_TARGET_TRIPLET_PLAT freebsd) +endif() + +if(EMSCRIPTEN) + set(Z_VCPKG_TARGET_TRIPLET_ARCH wasm32) + set(Z_VCPKG_TARGET_TRIPLET_PLAT emscripten) +endif() + +set(VCPKG_TARGET_TRIPLET "${Z_VCPKG_TARGET_TRIPLET_ARCH}-${Z_VCPKG_TARGET_TRIPLET_PLAT}" CACHE STRING "Vcpkg target triplet (ex. x86-windows)") +set(Z_VCPKG_TOOLCHAIN_DIR "${CMAKE_CURRENT_LIST_DIR}") + +# Detect .vcpkg-root to figure VCPKG_ROOT_DIR +set(Z_VCPKG_ROOT_DIR_CANDIDATE "${CMAKE_CURRENT_LIST_DIR}") +while(NOT DEFINED Z_VCPKG_ROOT_DIR) + if(EXISTS "${Z_VCPKG_ROOT_DIR_CANDIDATE}/.vcpkg-root") + set(Z_VCPKG_ROOT_DIR "${Z_VCPKG_ROOT_DIR_CANDIDATE}" CACHE INTERNAL "Vcpkg root directory") + elseif(IS_DIRECTORY "${Z_VCPKG_ROOT_DIR_CANDIDATE}") + get_filename_component(Z_VCPKG_ROOT_DIR_TEMP "${Z_VCPKG_ROOT_DIR_CANDIDATE}" DIRECTORY) + if(Z_VCPKG_ROOT_DIR_TEMP STREQUAL Z_VCPKG_ROOT_DIR_CANDIDATE) + break() # If unchanged, we have reached the root of the drive without finding vcpkg. + endif() + SET(Z_VCPKG_ROOT_DIR_CANDIDATE "${Z_VCPKG_ROOT_DIR_TEMP}") + unset(Z_VCPKG_ROOT_DIR_TEMP) + else() + break() + endif() +endwhile() +unset(Z_VCPKG_ROOT_DIR_CANDIDATE) + +if(NOT Z_VCPKG_ROOT_DIR) + z_vcpkg_add_fatal_error("Could not find .vcpkg-root") +endif() + +if(DEFINED VCPKG_INSTALLED_DIR) + # do nothing +elseif(DEFINED _VCPKG_INSTALLED_DIR) + set(VCPKG_INSTALLED_DIR "${_VCPKG_INSTALLED_DIR}") +elseif(VCPKG_MANIFEST_MODE) + set(VCPKG_INSTALLED_DIR "${CMAKE_BINARY_DIR}/vcpkg_installed") +else() + set(VCPKG_INSTALLED_DIR "${Z_VCPKG_ROOT_DIR}/installed") +endif() + +set(VCPKG_INSTALLED_DIR "${VCPKG_INSTALLED_DIR}" + CACHE PATH + "The directory which contains the installed libraries for each triplet" FORCE) +set(_VCPKG_INSTALLED_DIR "${VCPKG_INSTALLED_DIR}" + CACHE PATH + "The directory which contains the installed libraries for each triplet" FORCE) + +function(z_vcpkg_add_vcpkg_to_cmake_path list suffix) + set(vcpkg_paths + "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}${suffix}" + "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug${suffix}" + ) + if(NOT DEFINED CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE MATCHES "^[Dd][Ee][Bb][Uu][Gg]$") + list(REVERSE vcpkg_paths) # Debug build: Put Debug paths before Release paths. + endif() + if(VCPKG_PREFER_SYSTEM_LIBS) + list(APPEND "${list}" "${vcpkg_paths}") + else() + list(INSERT "${list}" 0 "${vcpkg_paths}") # CMake 3.15 is required for list(PREPEND ...). + endif() + set("${list}" "${${list}}" PARENT_SCOPE) +endfunction() +z_vcpkg_add_vcpkg_to_cmake_path(CMAKE_PREFIX_PATH "") +z_vcpkg_add_vcpkg_to_cmake_path(CMAKE_LIBRARY_PATH "/lib/manual-link") +z_vcpkg_add_vcpkg_to_cmake_path(CMAKE_FIND_ROOT_PATH "") + +if(NOT VCPKG_PREFER_SYSTEM_LIBS) + set(CMAKE_FIND_FRAMEWORK "LAST") # we assume that frameworks are usually system-wide libs, not vcpkg-built + set(CMAKE_FIND_APPBUNDLE "LAST") # we assume that appbundles are usually system-wide libs, not vcpkg-built +endif() + +# If one CMAKE_FIND_ROOT_PATH_MODE_* variables is set to ONLY, to make sure that ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET} +# and ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug are searched, it is not sufficient to just add them to CMAKE_FIND_ROOT_PATH, +# as CMAKE_FIND_ROOT_PATH specify "one or more directories to be prepended to all other search directories", so to make sure that +# the libraries are searched as they are, it is necessary to add "/" to the CMAKE_PREFIX_PATH +if(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE STREQUAL "ONLY" OR + CMAKE_FIND_ROOT_PATH_MODE_LIBRARY STREQUAL "ONLY" OR + CMAKE_FIND_ROOT_PATH_MODE_PACKAGE STREQUAL "ONLY") + list(APPEND CMAKE_PREFIX_PATH "/") +endif() + +set(VCPKG_CMAKE_FIND_ROOT_PATH "${CMAKE_FIND_ROOT_PATH}") + +# CMAKE_EXECUTABLE_SUFFIX is not yet defined +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") + set(Z_VCPKG_EXECUTABLE "${Z_VCPKG_ROOT_DIR}/vcpkg.exe") + set(Z_VCPKG_BOOTSTRAP_SCRIPT "${Z_VCPKG_ROOT_DIR}/bootstrap-vcpkg.bat") +else() + set(Z_VCPKG_EXECUTABLE "${Z_VCPKG_ROOT_DIR}/vcpkg") + set(Z_VCPKG_BOOTSTRAP_SCRIPT "${Z_VCPKG_ROOT_DIR}/bootstrap-vcpkg.sh") +endif() + +if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT Z_VCPKG_CMAKE_IN_TRY_COMPILE AND NOT Z_VCPKG_HAS_FATAL_ERROR) + if(NOT EXISTS "${Z_VCPKG_EXECUTABLE}" AND NOT Z_VCPKG_HAS_FATAL_ERROR) + message(STATUS "Bootstrapping vcpkg before install") + + file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/vcpkg-bootstrap.log" Z_VCPKG_BOOTSTRAP_LOG) + execute_process( + COMMAND "${Z_VCPKG_BOOTSTRAP_SCRIPT}" ${VCPKG_BOOTSTRAP_OPTIONS} + OUTPUT_FILE "${Z_VCPKG_BOOTSTRAP_LOG}" + ERROR_FILE "${Z_VCPKG_BOOTSTRAP_LOG}" + RESULT_VARIABLE Z_VCPKG_BOOTSTRAP_RESULT) + + if(Z_VCPKG_BOOTSTRAP_RESULT EQUAL 0) + message(STATUS "Bootstrapping vcpkg before install - done") + else() + message(STATUS "Bootstrapping vcpkg before install - failed") + z_vcpkg_add_fatal_error("vcpkg install failed. See logs for more information: ${Z_VCPKG_BOOTSTRAP_LOG}") + endif() + endif() + + if(NOT Z_VCPKG_HAS_FATAL_ERROR) + message(STATUS "Running vcpkg install") + + set(Z_VCPKG_ADDITIONAL_MANIFEST_PARAMS) + + if(DEFINED VCPKG_HOST_TRIPLET AND NOT VCPKG_HOST_TRIPLET STREQUAL "") + list(APPEND Z_VCPKG_ADDITIONAL_MANIFEST_PARAMS "--host-triplet=${VCPKG_HOST_TRIPLET}") + endif() + + if(VCPKG_OVERLAY_PORTS) + foreach(Z_VCPKG_OVERLAY_PORT IN LISTS VCPKG_OVERLAY_PORTS) + list(APPEND Z_VCPKG_ADDITIONAL_MANIFEST_PARAMS "--overlay-ports=${Z_VCPKG_OVERLAY_PORT}") + endforeach() + endif() + if(VCPKG_OVERLAY_TRIPLETS) + foreach(Z_VCPKG_OVERLAY_TRIPLET IN LISTS VCPKG_OVERLAY_TRIPLETS) + list(APPEND Z_VCPKG_ADDITIONAL_MANIFEST_PARAMS "--overlay-triplets=${Z_VCPKG_OVERLAY_TRIPLET}") + endforeach() + endif() + + if(DEFINED VCPKG_FEATURE_FLAGS OR DEFINED CACHE{VCPKG_FEATURE_FLAGS}) + list(JOIN VCPKG_FEATURE_FLAGS "," Z_VCPKG_FEATURE_FLAGS) + set(Z_VCPKG_FEATURE_FLAGS "--feature-flags=${Z_VCPKG_FEATURE_FLAGS}") + endif() + + foreach(Z_VCPKG_FEATURE IN LISTS VCPKG_MANIFEST_FEATURES) + list(APPEND Z_VCPKG_ADDITIONAL_MANIFEST_PARAMS "--x-feature=${Z_VCPKG_FEATURE}") + endforeach() + + if(VCPKG_MANIFEST_NO_DEFAULT_FEATURES) + list(APPEND Z_VCPKG_ADDITIONAL_MANIFEST_PARAMS "--x-no-default-features") + endif() + + if(NOT CMAKE_VERSION VERSION_LESS "3.18") # == GREATER_EQUAL, but that was added in CMake 3.7 + set(Z_VCPKG_MANIFEST_INSTALL_ECHO_PARAMS ECHO_OUTPUT_VARIABLE ECHO_ERROR_VARIABLE) + else() + set(Z_VCPKG_MANIFEST_INSTALL_ECHO_PARAMS) + endif() + + execute_process( + COMMAND "${Z_VCPKG_EXECUTABLE}" install + --triplet "${VCPKG_TARGET_TRIPLET}" + --vcpkg-root "${Z_VCPKG_ROOT_DIR}" + "--x-wait-for-lock" + "--x-manifest-root=${VCPKG_MANIFEST_DIR}" + "--x-install-root=${_VCPKG_INSTALLED_DIR}" + "${Z_VCPKG_FEATURE_FLAGS}" + ${Z_VCPKG_ADDITIONAL_MANIFEST_PARAMS} + ${VCPKG_INSTALL_OPTIONS} + OUTPUT_VARIABLE Z_VCPKG_MANIFEST_INSTALL_LOGTEXT + ERROR_VARIABLE Z_VCPKG_MANIFEST_INSTALL_LOGTEXT + RESULT_VARIABLE Z_VCPKG_MANIFEST_INSTALL_RESULT + ${Z_VCPKG_MANIFEST_INSTALL_ECHO_PARAMS} + ) + + file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/vcpkg-manifest-install.log" Z_VCPKG_MANIFEST_INSTALL_LOGFILE) + file(WRITE "${Z_VCPKG_MANIFEST_INSTALL_LOGFILE}" "${Z_VCPKG_MANIFEST_INSTALL_LOGTEXT}") + + if(Z_VCPKG_MANIFEST_INSTALL_RESULT EQUAL 0) + message(STATUS "Running vcpkg install - done") + set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS + "${VCPKG_MANIFEST_DIR}/vcpkg.json") + if(EXISTS "${VCPKG_MANIFEST_DIR}/vcpkg-configuration.json") + set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS + "${VCPKG_MANIFEST_DIR}/vcpkg-configuration.json") + endif() + else() + message(STATUS "Running vcpkg install - failed") + z_vcpkg_add_fatal_error("vcpkg install failed. See logs for more information: ${Z_VCPKG_MANIFEST_INSTALL_LOGFILE}") + endif() + endif() +endif() + +option(VCPKG_SETUP_CMAKE_PROGRAM_PATH "Enable the setup of CMAKE_PROGRAM_PATH to vcpkg paths" ON) +set(VCPKG_CAN_USE_HOST_TOOLS OFF) +if(DEFINED VCPKG_HOST_TRIPLET AND NOT VCPKG_HOST_TRIPLET STREQUAL "") + set(VCPKG_CAN_USE_HOST_TOOLS ON) +endif() +cmake_dependent_option(VCPKG_USE_HOST_TOOLS "Setup CMAKE_PROGRAM_PATH to use host tools" ON "VCPKG_CAN_USE_HOST_TOOLS" OFF) +unset(VCPKG_CAN_USE_HOST_TOOLS) + +if(VCPKG_SETUP_CMAKE_PROGRAM_PATH) + set(tools_base_path "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools") + if(VCPKG_USE_HOST_TOOLS) + set(tools_base_path "${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/tools") + endif() + list(APPEND CMAKE_PROGRAM_PATH "${tools_base_path}") + file(GLOB Z_VCPKG_TOOLS_DIRS LIST_DIRECTORIES true "${tools_base_path}/*") + file(GLOB Z_VCPKG_TOOLS_FILES LIST_DIRECTORIES false "${tools_base_path}/*") + file(GLOB Z_VCPKG_TOOLS_DIRS_BIN LIST_DIRECTORIES true "${tools_base_path}/*/bin") + file(GLOB Z_VCPKG_TOOLS_FILES_BIN LIST_DIRECTORIES false "${tools_base_path}/*/bin") + list(REMOVE_ITEM Z_VCPKG_TOOLS_DIRS ${Z_VCPKG_TOOLS_FILES} "") # need at least one item for REMOVE_ITEM if CMake <= 3.19 + list(REMOVE_ITEM Z_VCPKG_TOOLS_DIRS_BIN ${Z_VCPKG_TOOLS_FILES_BIN} "") + string(REPLACE "/bin" "" Z_VCPKG_TOOLS_DIRS_TO_REMOVE "${Z_VCPKG_TOOLS_DIRS_BIN}") + list(REMOVE_ITEM Z_VCPKG_TOOLS_DIRS ${Z_VCPKG_TOOLS_DIRS_TO_REMOVE} "") + list(APPEND Z_VCPKG_TOOLS_DIRS ${Z_VCPKG_TOOLS_DIRS_BIN}) + foreach(Z_VCPKG_TOOLS_DIR IN LISTS Z_VCPKG_TOOLS_DIRS) + list(APPEND CMAKE_PROGRAM_PATH "${Z_VCPKG_TOOLS_DIR}") + endforeach() + unset(Z_VCPKG_TOOLS_DIR) + unset(Z_VCPKG_TOOLS_DIRS) + unset(Z_VCPKG_TOOLS_FILES) + unset(Z_VCPKG_TOOLS_DIRS_BIN) + unset(Z_VCPKG_TOOLS_FILES_BIN) + unset(Z_VCPKG_TOOLS_DIRS_TO_REMOVE) + unset(tools_base_path) +endif() + +cmake_policy(POP) + +# Any policies applied to the below macros and functions appear to leak into consumers + +function(add_executable) + z_vcpkg_function_arguments(ARGS) + _add_executable(${ARGS}) + set(target_name "${ARGV0}") + + list(FIND ARGV "IMPORTED" IMPORTED_IDX) + list(FIND ARGV "ALIAS" ALIAS_IDX) + list(FIND ARGV "MACOSX_BUNDLE" MACOSX_BUNDLE_IDX) + if(IMPORTED_IDX EQUAL -1 AND ALIAS_IDX EQUAL -1) + if(VCPKG_APPLOCAL_DEPS) + if(Z_VCPKG_TARGET_TRIPLET_PLAT MATCHES "windows|uwp") + z_vcpkg_set_powershell_path() + set(EXTRA_OPTIONS "") + if(X_VCPKG_APPLOCAL_DEPS_SERIALIZED) + set(EXTRA_OPTIONS USES_TERMINAL) + endif() + add_custom_command(TARGET "${target_name}" POST_BUILD + COMMAND "${Z_VCPKG_POWERSHELL_PATH}" -noprofile -executionpolicy Bypass -file "${Z_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1" + -targetBinary "$" + -installedDir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>/bin" + -OutVariable out + VERBATIM + ${EXTRA_OPTIONS} + ) + elseif(Z_VCPKG_TARGET_TRIPLET_PLAT MATCHES "osx") + if(NOT MACOSX_BUNDLE_IDX EQUAL -1) + add_custom_command(TARGET "${target_name}" POST_BUILD + COMMAND python "${Z_VCPKG_TOOLCHAIN_DIR}/osx/applocal.py" + "$" + "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>" + VERBATIM + ) + endif() + endif() + endif() + set_target_properties("${target_name}" PROPERTIES VS_USER_PROPS do_not_import_user.props) + set_target_properties("${target_name}" PROPERTIES VS_GLOBAL_VcpkgEnabled false) + endif() +endfunction() + +function(add_library) + z_vcpkg_function_arguments(ARGS) + _add_library(${ARGS}) + set(target_name "${ARGV0}") + + list(FIND ARGS "IMPORTED" IMPORTED_IDX) + list(FIND ARGS "INTERFACE" INTERFACE_IDX) + list(FIND ARGS "ALIAS" ALIAS_IDX) + if(IMPORTED_IDX EQUAL -1 AND INTERFACE_IDX EQUAL -1 AND ALIAS_IDX EQUAL -1) + get_target_property(IS_LIBRARY_SHARED "${target_name}" TYPE) + if(VCPKG_APPLOCAL_DEPS AND Z_VCPKG_TARGET_TRIPLET_PLAT MATCHES "windows|uwp" AND (IS_LIBRARY_SHARED STREQUAL "SHARED_LIBRARY" OR IS_LIBRARY_SHARED STREQUAL "MODULE_LIBRARY")) + z_vcpkg_set_powershell_path() + add_custom_command(TARGET "${target_name}" POST_BUILD + COMMAND "${Z_VCPKG_POWERSHELL_PATH}" -noprofile -executionpolicy Bypass -file "${Z_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1" + -targetBinary "$" + -installedDir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>/bin" + -OutVariable out + VERBATIM + ) + endif() + set_target_properties("${target_name}" PROPERTIES VS_USER_PROPS do_not_import_user.props) + set_target_properties("${target_name}" PROPERTIES VS_GLOBAL_VcpkgEnabled false) + endif() +endfunction() + +# This is an experimental function to enable applocal install of dependencies as part of the `make install` process +# Arguments: +# TARGETS - a list of installed targets to have dependencies copied for +# DESTINATION - the runtime directory for those targets (usually `bin`) +# COMPONENT - the component this install command belongs to (optional) +# +# Note that this function requires CMake 3.14 for policy CMP0087 +function(x_vcpkg_install_local_dependencies) + if(CMAKE_VERSION VERSION_LESS "3.14") + message(FATAL_ERROR "x_vcpkg_install_local_dependencies and X_VCPKG_APPLOCAL_DEPS_INSTALL require at least CMake 3.14 +(current version: ${CMAKE_VERSION})" + ) + endif() + + cmake_parse_arguments(PARSE_ARGV 0 arg + "" + "DESTINATION;COMPONENT" + "TARGETS" + ) + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + if(NOT DEFINED arg_DESTINATION) + message(FATAL_ERROR "DESTINATION must be specified") + endif() + + if(Z_VCPKG_TARGET_TRIPLET_PLAT MATCHES "^(windows|uwp)$") + # Install CODE|SCRIPT allow the use of generator expressions + cmake_policy(SET CMP0087 NEW) # CMake 3.14 + + z_vcpkg_set_powershell_path() + if(NOT IS_ABSOLUTE "${arg_DESTINATION}") + set(arg_DESTINATION "\${CMAKE_INSTALL_PREFIX}/${arg_DESTINATION}") + endif() + + set(component_param "") + if(DEFINED arg_COMPONENT) + set(component_param COMPONENT "${arg_COMPONENT}") + endif() + + foreach(target IN LISTS arg_TARGETS) + get_target_property(target_type "${target}" TYPE) + if(NOT target_type STREQUAL "INTERFACE_LIBRARY") + install(CODE "message(\"-- Installing app dependencies for ${target}...\") + execute_process(COMMAND \"${Z_VCPKG_POWERSHELL_PATH}\" -noprofile -executionpolicy Bypass -file \"${Z_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1\" + -targetBinary \"${arg_DESTINATION}/$\" + -installedDir \"${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>/bin\" + -OutVariable out)" + ${component_param} + ) + endif() + endforeach() + endif() +endfunction() + +if(X_VCPKG_APPLOCAL_DEPS_INSTALL) + function(install) + z_vcpkg_function_arguments(ARGS) + _install(${ARGS}) + + if(ARGV0 STREQUAL "TARGETS") + # Will contain the list of targets + set(parsed_targets "") + + # Destination - [RUNTIME] DESTINATION argument overrides this + set(destination "bin") + + set(component_param "") + + # Parse arguments given to the install function to find targets and (runtime) destination + set(modifier "") # Modifier for the command in the argument + set(last_command "") # Last command we found to process + foreach(arg IN LISTS ARGS) + if(arg MATCHES "^(ARCHIVE|LIBRARY|RUNTIME|OBJECTS|FRAMEWORK|BUNDLE|PRIVATE_HEADER|PUBLIC_HEADER|RESOURCE|INCLUDES)$") + set(modifier "${arg}") + continue() + endif() + if(arg MATCHES "^(TARGETS|DESTINATION|PERMISSIONS|CONFIGURATIONS|COMPONENT|NAMELINK_COMPONENT|OPTIONAL|EXCLUDE_FROM_ALL|NAMELINK_ONLY|NAMELINK_SKIP|EXPORT)$") + set(last_command "${arg}") + continue() + endif() + + if(last_command STREQUAL "TARGETS") + list(APPEND parsed_targets "${arg}") + endif() + + if(last_command STREQUAL "DESTINATION" AND (modifier STREQUAL "" OR modifier STREQUAL "RUNTIME")) + set(destination "${arg}") + endif() + if(last_command STREQUAL "COMPONENT") + set(component_param "COMPONENT" "${arg}") + endif() + endforeach() + + x_vcpkg_install_local_dependencies( + TARGETS ${parsed_targets} + DESTINATION "${destination}" + ${component_param} + ) + endif() + endfunction() +endif() + +if(NOT DEFINED VCPKG_OVERRIDE_FIND_PACKAGE_NAME) + set(VCPKG_OVERRIDE_FIND_PACKAGE_NAME find_package) +endif() +# NOTE: this is not a function, which means that arguments _are not_ perfectly forwarded +# this is fine for `find_package`, since there are no usecases for `;` in arguments, +# so perfect forwarding is not important +macro("${VCPKG_OVERRIDE_FIND_PACKAGE_NAME}" z_vcpkg_find_package_package_name) + set(z_vcpkg_find_package_package_name "${z_vcpkg_find_package_package_name}") + set(z_vcpkg_find_package_ARGN "${ARGN}") + set(z_vcpkg_find_package_backup_vars) + + # Workaround to set the ROOT_PATH until upstream CMake stops overriding + # the ROOT_PATH at apple OS initialization phase. + # See https://gitlab.kitware.com/cmake/cmake/merge_requests/3273 + # Fixed in CMake 3.15 + if(CMAKE_SYSTEM_NAME STREQUAL iOS) + list(APPEND z_vcpkg_find_package_backup_vars "CMAKE_FIND_ROOT_PATH") + if(DEFINED CMAKE_FIND_ROOT_PATH) + set(z_vcpkg_find_package_backup_CMAKE_FIND_ROOT_PATH "${CMAKE_FIND_ROOT_PATH}") + else() + set(z_vcpkg_find_package_backup_CMAKE_FIND_ROOT_PATH) + endif() + + list(APPEND CMAKE_FIND_ROOT_PATH "${VCPKG_CMAKE_FIND_ROOT_PATH}") + endif() + string(TOLOWER "${z_vcpkg_find_package_package_name}" z_vcpkg_find_package_lowercase_package_name) + + set(z_vcpkg_find_package_vcpkg_cmake_wrapper_path + "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/${z_vcpkg_find_package_lowercase_package_name}/vcpkg-cmake-wrapper.cmake") + + if(EXISTS "${z_vcpkg_find_package_vcpkg_cmake_wrapper_path}") + list(APPEND z_vcpkg_find_package_backup_vars "ARGS") + if(DEFINED ARGS) + set(z_vcpkg_find_package_backup_ARGS "${ARGS}") + else() + set(z_vcpkg_find_package_backup_ARGS) + endif() + + set(ARGS "${z_vcpkg_find_package_package_name};${z_vcpkg_find_package_ARGN}") + include("${z_vcpkg_find_package_vcpkg_cmake_wrapper_path}") + elseif(z_vcpkg_find_package_package_name STREQUAL "Boost" AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/boost") + # Checking for the boost headers disables this wrapper unless the user has installed at least one boost library + # these intentionally are not backed up + set(Boost_USE_STATIC_LIBS OFF) + set(Boost_USE_MULTITHREADED ON) + set(Boost_NO_BOOST_CMAKE ON) + set(Boost_USE_STATIC_RUNTIME) + unset(Boost_USE_STATIC_RUNTIME CACHE) + if(CMAKE_VS_PLATFORM_TOOLSET STREQUAL "v120") + set(Boost_COMPILER "-vc120") + else() + set(Boost_COMPILER "-vc140") + endif() + _find_package("${z_vcpkg_find_package_package_name}" ${z_vcpkg_find_package_ARGN}) + elseif(z_vcpkg_find_package_package_name STREQUAL "ICU" AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/unicode/utf.h") + list(FIND z_vcpkg_find_package_ARGN "COMPONENTS" z_vcpkg_find_package_COMPONENTS_IDX) + if(NOT z_vcpkg_find_package_COMPONENTS_IDX EQUAL -1) + _find_package("${z_vcpkg_find_package_package_name}" ${z_vcpkg_find_package_ARGN} COMPONENTS data) + else() + _find_package("${z_vcpkg_find_package_package_name}" ${z_vcpkg_find_package_ARGN}) + endif() + elseif(z_vcpkg_find_package_package_name STREQUAL "GSL" AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/gsl") + _find_package("${z_vcpkg_find_package_package_name}" ${z_vcpkg_find_package_ARGN}) + if(GSL_FOUND AND TARGET GSL::gsl) + set_property( TARGET GSL::gslcblas APPEND PROPERTY IMPORTED_CONFIGURATIONS Release ) + set_property( TARGET GSL::gsl APPEND PROPERTY IMPORTED_CONFIGURATIONS Release ) + if( EXISTS "${GSL_LIBRARY_DEBUG}" AND EXISTS "${GSL_CBLAS_LIBRARY_DEBUG}") + set_property( TARGET GSL::gsl APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) + set_target_properties( GSL::gsl PROPERTIES IMPORTED_LOCATION_DEBUG "${GSL_LIBRARY_DEBUG}" ) + set_property( TARGET GSL::gslcblas APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) + set_target_properties( GSL::gslcblas PROPERTIES IMPORTED_LOCATION_DEBUG "${GSL_CBLAS_LIBRARY_DEBUG}" ) + endif() + endif() + elseif("${z_vcpkg_find_package_package_name}" STREQUAL "CURL" AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/curl") + _find_package("${z_vcpkg_find_package_package_name}" ${z_vcpkg_find_package_ARGN}) + if(CURL_FOUND) + if(EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/nghttp2.lib") + list(APPEND CURL_LIBRARIES + "debug" "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/nghttp2.lib" + "optimized" "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/nghttp2.lib") + endif() + endif() + elseif("${z_vcpkg_find_package_lowercase_package_name}" STREQUAL "grpc" AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/grpc") + _find_package(gRPC ${z_vcpkg_find_package_ARGN}) + else() + _find_package("${z_vcpkg_find_package_package_name}" ${z_vcpkg_find_package_ARGN}) + endif() + + foreach(z_vcpkg_find_package_backup_var IN LISTS z_vcpkg_find_package_backup_vars) + if(DEFINED z_vcpkg_find_package_backup_${z_vcpkg_find_package_backup_var}) + set("${z_vcpkg_find_package_backup_var}" "${z_vcpkg_find_package_backup_${z_vcpkg_find_package_backup_var}}") + else() + set("${z_vcpkg_find_package_backup_var}") + endif() + endforeach() +endmacro() + +cmake_policy(PUSH) +cmake_policy(VERSION 3.7.2) + +set(VCPKG_TOOLCHAIN ON) +set(Z_VCPKG_UNUSED "${CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION}") +set(Z_VCPKG_UNUSED "${CMAKE_EXPORT_NO_PACKAGE_REGISTRY}") +set(Z_VCPKG_UNUSED "${CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY}") +set(Z_VCPKG_UNUSED "${CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY}") +set(Z_VCPKG_UNUSED "${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP}") + +# Propogate these values to try-compile configurations so the triplet and toolchain load +if(NOT Z_VCPKG_CMAKE_IN_TRY_COMPILE) + list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES + VCPKG_TARGET_TRIPLET + VCPKG_TARGET_ARCHITECTURE + VCPKG_APPLOCAL_DEPS + VCPKG_CHAINLOAD_TOOLCHAIN_FILE + Z_VCPKG_ROOT_DIR + ) +endif() + +if(Z_VCPKG_HAS_FATAL_ERROR) + message(FATAL_ERROR "${Z_VCPKG_FATAL_ERROR}") +endif() + +cmake_policy(POP) diff --git a/externals/vcpkg/scripts/ci.baseline.txt b/externals/vcpkg/scripts/ci.baseline.txt new file mode 100755 index 000000000..2b5865219 --- /dev/null +++ b/externals/vcpkg/scripts/ci.baseline.txt @@ -0,0 +1,1320 @@ +########################################################################### +## This file defines the current expected build state of ports in CI. +## +## States +## pass - (default) the port builds in the CI system. If a port is +## missing from this file then it is assumed to build. +## fail - the port does not build in the CI system. +## This is not necessarily the same as if a port is expected to build +## on a developers machine because it may fail due to the machine +## configuration. When set to fail the CI system will still attempt +## to build the port and will report a CI failure until this file is updated. +## skip - Do not build this port in the CI system. +## This is added to ports that may be flaky or conflict with other +## ports. Please comment for why a port is skipped so it can be +## removed when the issue is resolved. +## +## +## CI tested triplets: +## arm64-windows +## arm-uwp +## x64-linux +## x64-osx +## x64-uwp +## x64-windows +## x64-windows-static +## x64-windows-static-md +## x86-windows +## + +# Add new items alphabetically + +# script ports +#vcpkg-cmake:arm64-windows=fail +#vcpkg-cmake:arm-uwp=fail +#vcpkg-cmake:x64-uwp=fail +#vcpkg-cmake:x64-windows-static=fail +#vcpkg-cmake:x64-windows-static-md=fail +#vcpkg-cmake:x86-windows=fail + +#vcpkg-cmake-config:arm64-windows=fail +#vcpkg-cmake-config:arm-uwp=fail +#vcpkg-cmake-config:x64-uwp=fail +#vcpkg-cmake-config:x64-windows-static=fail +#vcpkg-cmake-config:x64-windows-static-md=fail +#vcpkg-cmake-config:x86-windows=fail + +# other ports +# Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h +apr:arm64-windows=fail + +# broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937 +bde:x64-linux=fail +bitserializer:x64-osx=fail +blitz:x64-uwp=fail +blitz:arm64-windows=fail +blitz:arm-uwp=fail +bond:arm-uwp=fail +bond:x64-osx=fail +bond:x64-uwp=fail +botan:x64-uwp=fail +breakpad:arm64-windows=fail +caf:arm-uwp=fail +caf:x64-uwp=fail +caffe2:x86-windows=fail +caffe2:arm64-windows=fail + +# file conflict with dbg-macro +c-dbg-macro:x86-windows=skip +c-dbg-macro:x64-windows=skip +c-dbg-macro:x64-windows-static=skip +c-dbg-macro:x64-windows-static-md=skip +c-dbg-macro:x64-uwp=skip +c-dbg-macro:arm64-windows=skip +c-dbg-macro:arm-uwp=skip +c-dbg-macro:x64-osx=skip +c-dbg-macro:x64-linux=skip + +casclib:arm-uwp=fail +casclib:x64-uwp=fail +catch-classic:arm64-windows = skip +catch-classic:arm-uwp = skip +catch-classic:x64-linux = skip +catch-classic:x64-osx = skip +catch-classic:x64-uwp = skip +catch-classic:x64-windows = skip +catch-classic:x64-windows-static = skip +catch-classic:x64-windows-static-md=skip +catch-classic:x86-windows = skip +cctag:x64-windows-static-md=fail +cello:arm-uwp=fail +cello:x64-uwp=fail +cfitsio:arm-uwp=fail +cfitsio:x64-uwp=fail +cgicc:arm-uwp=fail +cgicc:x64-uwp=fail +chakracore:x64-linux=skip +# DCMTK currently has a vendored copy of libcharls.a, which causes conflicts with charls (TODO: use charls' copy) +charls:arm64-windows=skip +charls:arm-uwp=skip +charls:x64-linux=skip +charls:x64-osx=skip +charls:x64-uwp=skip +charls:x64-windows=skip +charls:x64-windows-static=skip +charls:x64-windows-static-md=skip +charls:x86-windows=skip +chmlib:arm-uwp=fail +chmlib:x64-uwp=fail +# chartdir does not offer stable download URLs +chartdir:arm64-windows=skip +chartdir:arm-uwp=skip +chartdir:x64-uwp=skip +chartdir:x64-windows-static=skip +chartdir:x86-windows=skip +chartdir:x64-windows=skip +chartdir:x64-windows-static-md=skip +chartdir:x64-osx=skip + +# chromium-base has several problems and is upgraded to "skip" because it hits a lot of servers that can slow CI +# broken on Windows because it does not yet support VS2022 +chromium-base:x64-windows=skip +chromium-base:x64-windows-static=skip +chromium-base:x64-windows-static-md=skip +# broken on Linux because +chromium-base:x64-linux=skip +# broken on OSX for unknown reasons; it appears to be messing with some form of system-wide cache +# because the first attempt to build it fails, but subsequent attempts succeed +chromium-base:x64-osx=skip + +civetweb:arm64-windows = skip +civetweb:arm-uwp = skip +civetweb:x64-uwp = skip +clamav:arm64-windows=fail +clblas:arm64-windows=fail +clockutils:x64-linux=fail +cmcstl2:arm64-windows = skip +cmcstl2:arm-uwp = skip +cmcstl2:x64-linux = skip +cmcstl2:x64-osx = skip +cmcstl2:x64-uwp = skip +cmcstl2:x64-windows = skip +cmcstl2:x64-windows-static = skip +cmcstl2:x64-windows-static-md=skip +cmcstl2:x86-windows = skip +coin:arm64-windows=fail +coin:arm-uwp=fail +coin:x64-uwp=fail + +# there is an ICE in VS2022 with colmap in release mode +colmap:x86-windows=fail +colmap:x64-windows=fail +colmap:x64-windows-static=fail +colmap:x64-windows-static-md=fail + +concurrencpp:x64-linux=fail +constexpr-contracts:x64-linux=fail +coolprop:arm-uwp=fail +coolprop:x64-uwp=fail +coroutine:arm-uwp=fail +coroutine:x64-linux=fail +coroutine:x64-uwp=fail +cppcms:x64-linux=fail +cppcms:x64-osx=fail +cppcms:x64-windows-static=fail +cppfs:arm-uwp=fail +cppfs:x64-uwp=fail +cppmicroservices:arm64-windows=fail +cppmicroservices:arm-uwp=fail +cppmicroservices:x64-uwp=fail +cpp-netlib:arm-uwp=fail +cpp-netlib:x64-uwp=fail +cppcoro:x64-linux=fail +cppcoro:arm-uwp=fail +cppcoro:x64-uwp=fail +# The x64-linux pipeline uses gcc 9.3.0, which lacks C++20 coroutine support. +# This is known to work on x64-linux as of gcc 10.3.0. +cppgraphqlgen:x64-linux=fail +crashpad:arm64-windows=fail +crashpad:arm-uwp=fail +crashpad:x86-windows=fail +ctemplate:x64-linux=fail +ctemplate:x64-osx=fail +cuda:x64-osx=fail +cudnn:arm64-windows=fail +cudnn:arm-uwp=fail +cudnn:x64-uwp=fail +cudnn:x64-windows-static=fail +cudnn:x86-windows=fail +# Since pipeline cannot automatically install dbghelp dependency, skip this detection +dbghelp:arm-uwp=skip +dbghelp:arm64-windows=skip +dbghelp:x64-linux=fail +dbghelp:x64-osx=fail +dbghelp:x64-uwp=skip +dbghelp:x64-windows-static=skip +dbghelp:x64-windows-static-md=skip +dbghelp:x64-windows=skip +dbghelp:x86-windows=skip +dcmtk:x64-uwp=fail +devicenameresolver:x64-windows-static=fail +# legacy directxsdk which conflicts with dxsdk-d3dx +directxsdk:x86-windows=skip +directxsdk:x64-windows=skip +directxsdk:x64-windows-static-md=skip +discord-game-sdk:x64-windows-static=fail +discord-game-sdk:x64-windows-static-md=fail +discord-rpc:arm-uwp=fail +discord-rpc:x64-uwp=fail +# requires g++11 +discordcoreapi:x64-linux=fail +dlib:arm-uwp=fail +dlib:x64-uwp=fail +dmlc:arm-uwp=fail +dmlc:x64-uwp=fail +dpdk:arm-uwp=fail +dpdk:arm64-windows=fail +dpdk:x64-linux=fail +dpdk:x64-osx=fail +dpdk:x64-uwp=fail +dpdk:x64-windows-static=fail +dpdk:x64-windows-static-md=fail +dpdk:x64-windows=fail +dpdk:x86-windows=fail + +# requires python@2 from brew, but that no longer exists +# python2 EOL yay! +duktape:x64-osx=skip + +eastl:arm-uwp=fail +easyloggingpp:arm-uwp=fail +easyloggingpp:x64-uwp=fail +ebml:arm-uwp=fail +ebml:x64-uwp=fail +ecsutil:arm64-windows=fail +ecsutil:arm-uwp=fail +ecsutil:x64-linux=fail +ecsutil:x64-osx=fail +ecsutil:x64-uwp=fail +# Checks for gnu extension so only works with gcc. +elfutils:x64-osx=fail +# embree creates common conflicting static library names when built in static mode, reported upstream: +# https://github.com/embree/embree/issues/331 +embree2:x64-windows-static=skip +embree2:x64-windows-static-md=skip +# embree2 conflicts with embree3 +embree2:x64-linux=skip +embree2:x64-osx=skip +epsilon:arm-uwp=fail +epsilon:x64-uwp=fail +epsilon:x64-windows-static=fail +fann:x64-windows-static=fail +fastrtps:arm-uwp=fail +fastrtps:x64-uwp=fail +fastrtps:x64-windows-static=fail +fastrtps:x64-windows-static-md=fail +# fluidlite conflicts with fluidsynth; we test fluidsynth rather than fluidlite because +# fluidlite has no dependencies and thus is less likely to be broken by another package. +fluidlite:arm-uwp=skip +fluidlite:arm64-windows=skip +fluidlite:x64-linux=skip +fluidlite:x64-osx=skip +fluidlite:x64-uwp=skip +fluidlite:x64-windows-static=skip +fluidlite:x64-windows-static-md=skip +fluidlite:x64-windows=skip +fluidlite:x86-windows=skip +fmi4cpp:arm-uwp=fail +fmi4cpp:x64-uwp=fail +fmilib:arm64-windows=fail +fmilib:arm-uwp=fail +fmilib:x64-linux=fail +fmilib:x64-uwp=fail +fontconfig:x64-uwp=fail +fontconfig:arm-uwp=fail +foonathan-memory:arm64-windows=fail +foonathan-memory:arm-uwp=fail +foonathan-memory:x64-uwp=fail +forge:x86-windows=fail +freeglut:arm64-windows=fail +freeglut:arm-uwp=fail +freeglut:x64-uwp=fail +freeglut:x64-osx=fail +# Needs /bigobj +freeopcua:arm64-windows=fail +ftgl:x64-uwp=fail +# https://github.com/GoogleCloudPlatform/functions-framework-cpp/issues/207 +functions-framework-cpp:x64-uwp=fail +fuzzylite:x64-osx=fail + +gazebo:x64-linux=fail +# gsoap does not offer stable public source downloads +gsoap:x64-windows = skip +gsoap:x86-windows = skip +gsoap:x64-windows-static = skip +gsoap:x64-windows-static-md = skip + +# Port geotrans source ftp://ftp.nga.mil server +# extremely slow may take several hours to download +geotrans:x64-linux = skip +geotrans:x64-windows = skip +geotrans:x86-windows = skip +getopt:arm-uwp=fail +getopt:x64-uwp=fail +getopt-win32:x64-linux=fail +getopt-win32:x64-osx=fail +gflags:arm-uwp=fail +gflags:x64-uwp=fail + +# Conflicts with libevent +gherkin-c:arm64-windows = skip +gherkin-c:arm-uwp = skip +gherkin-c:x64-linux = skip +gherkin-c:x64-osx = skip +gherkin-c:x64-uwp = skip +gherkin-c:x64-windows = skip +gherkin-c:x64-windows-static = skip +gherkin-c:x64-windows-static-md = skip +gherkin-c:x86-windows = skip +gl3w:arm64-windows=fail +gl3w:arm-uwp=fail +glew:arm64-windows=fail +glew:arm-uwp=fail +glfw3:arm-uwp=fail +glfw3:x64-uwp=fail +glib:x64-uwp=fail +glib:x64-windows-static=fail +gmmlib:arm64-windows=fail +gmmlib:arm-uwp=fail +gmmlib:x64-osx=fail +gmmlib:x64-uwp=fail +gmmlib:x64-windows=fail +gmmlib:x64-windows-static=fail +gmmlib:x64-windows-static-md=fail +gmmlib:x86-windows=fail + +google-cloud-cpp:arm-uwp=fail +google-cloud-cpp:x64-uwp=fail +gppanel:x64-osx=fail +gperftools:arm64-windows=fail +gperftools:x64-uwp=fail +gperftools:arm-uwp=fail +graphicsmagick:arm-uwp=fail +graphicsmagick:x64-uwp=fail +gstreamer:x64-osx=fail +gtk:x64-windows-static=fail +gtk:x64-windows-static-md=fail +gts:x64-osx=fail +halide:x64-windows-static=fail +hdf5:arm64-windows=fail +hdf5:arm-uwp=fail +hdf5:x64-uwp=fail +healpix:x86-windows=fail +healpix:x64-windows=fail +healpix:x64-windows-static=fail +healpix:x64-windows-static-md=fail +healpix:x64-uwp=fail +healpix:arm64-windows=fail +healpix:arm-uwp=fail +healpix:x64-osx=fail +hpx:x64-windows-static=fail +hpx:arm64-windows=fail +hunspell:x64-windows-static-md=fail +ideviceinstaller:x64-windows-static-md=fail +idevicerestore:x64-linux=fail +idevicerestore:x64-osx=fail +ignition-common1:x64-linux=fail +ignition-msgs1:arm64-windows=fail +ignition-msgs1:arm-uwp=fail +ignition-msgs1:x64-uwp=fail +ignition-msgs5:arm64-windows=fail +ignition-msgs5:arm-uwp=fail +ignition-msgs5:x64-uwp=fail +ignition-msgs5:x64-osx=skip +# Conflicts with libjpeg-turbo, mozjpeg +ijg-libjpeg:arm64-windows = skip +ijg-libjpeg:arm-uwp = skip +ijg-libjpeg:x64-linux = skip +ijg-libjpeg:x64-osx = skip +ijg-libjpeg:x64-uwp = skip +ijg-libjpeg:x64-windows = skip +ijg-libjpeg:x64-windows-static = skip +ijg-libjpeg:x86-windows = skip +intel-mkl:arm64-windows=fail +intel-mkl:arm-uwp=fail +intel-mkl:x64-linux=fail +intel-mkl:x64-osx=fail +intel-mkl:x64-uwp=fail +intel-mkl:x64-windows=fail +intel-mkl:x64-windows-static=fail +intel-mkl:x64-windows-static-md=fail +intel-mkl:x86-windows=fail +irrlicht:arm64-windows=fail +irrlicht:arm-uwp=fail +irrlicht:x64-uwp=fail +isal:arm64-windows=fail +isal:arm-uwp=fail +isal:x64-osx=fail +isal:x64-uwp=fail +isal:x64-windows=fail +isal:x64-windows-static=fail +isal:x64-windows-static-md=fail +isal:x86-windows=fail +jemalloc:arm64-windows=fail +jemalloc:arm-uwp=fail +jemalloc:x64-linux=fail +jemalloc:x64-osx=fail +jemalloc:x64-uwp=fail +jemalloc:x64-windows-static=fail +jinja2cpplight:arm-uwp=fail +jinja2cpplight:x64-uwp=fail +kfr:arm64-windows=fail +kfr:arm-uwp=fail +kfr:x64-linux=fail +lastools:arm-uwp=fail +lastools:x64-uwp=fail +laszip:arm-uwp=fail +laszip:x64-uwp=fail +lcm:x64-osx=fail +leptonica:x64-uwp=fail +leptonica:arm-uwp=fail +leveldb:arm-uwp=fail +leveldb:x64-uwp=fail +libaiff:x64-linux=fail +libarchive:arm-uwp=fail +libbf:arm64-windows=fail +libbf:arm-uwp=fail +libbf:x64-uwp=fail +libbf:x64-windows=fail +libbf:x64-windows-static=fail +libbf:x64-windows-static-md=fail +libbf:x86-windows=fail +libcopp:arm64-windows=fail +libcopp:arm-uwp=fail +# Missing system libraries on linux to run/prepare autoconf +libgpod:x64-linux=fail +libgpod:x64-osx=fail +libepoxy:arm-uwp=fail +libepoxy:x64-uwp=fail +libepoxy:x64-windows-static=fail +libevent:arm-uwp=fail +libevent:x64-uwp=fail +libevhtp:x86-windows=fail +libevhtp:x64-windows=fail +libevhtp:x64-windows-static=fail +libevhtp:x64-windows-static-md=fail +libevhtp:x64-uwp=fail +libevhtp:arm64-windows=fail +libevhtp:arm-uwp=fail +libexif:arm-uwp=fail +libexif:x64-uwp=fail +libfreenect2:arm64-windows=fail +libgit2:arm-uwp=fail +libgit2:x64-uwp=fail +libgo:arm-uwp=fail +libgo:x64-uwp=fail +libgo:arm64-windows=fail + +# the msbuild for libgpg:x64-uwp and libgpg-error:x64-uwp are broken on VS2022 due to TargetPlatformMinVersion not existing +libgpg:x64-uwp=fail +libgpg-error:x64-uwp=fail + +libhdfs3:x64-linux=fail +libhdfs3:x64-osx=fail +libigl:arm64-windows=fail +libigl:arm-uwp=fail +libigl:x64-uwp=fail +libirecovery:x64-windows-static-md=fail +# 120 min build time for libjxl arm-uwp-rel, reason unknown +libjxl:arm-uwp=skip +liblas:arm64-windows=fail +liblemon:arm-uwp=fail +liblemon:x64-uwp=fail +liblo:arm-uwp=fail +liblo:x64-uwp=fail +libmagic:x64-uwp=fail +libmagic:arm-uwp=fail +libmariadb:arm64-windows = skip +libmariadb:arm-uwp = skip +libmariadb:x64-linux = skip +libmariadb:x64-osx = skip +libmariadb:x64-uwp = skip +libmariadb:x64-windows = skip +libmariadb:x64-windows-static = skip +libmariadb:x64-windows-static-md=skip +# libmesh installs tons of problematic files that conflict with other ports (boost, eigen, etc) +libmesh:arm64-windows=skip +libmesh:arm-uwp=skip +libmesh:x64-uwp=skip +libmesh:x64-windows=skip +libmesh:x64-windows-static=skip +libmesh:x64-windows-static-md=skip +libmesh:x86-windows=skip +libmesh:x64-osx=skip +libmesh:x64-linux=skip +libmikmod:x64-osx=fail +libmodman:arm-uwp=fail +libmodman:x64-uwp=fail +libmodman:x64-windows-static=fail +libmodplug:arm-uwp=fail +libmodplug:x64-uwp=fail +libmpeg2:arm-uwp=fail +libmpeg2:x64-linux=fail +libmpeg2:x64-osx=fail +libmpeg2:x64-uwp=fail +libmupdf:x64-osx=fail +libmysql:x86-windows=fail +libmysql:arm64-windows=fail +libopusenc:arm-uwp=fail +libopusenc:x64-uwp=fail +libosip2:x64-windows-static-md=fail +libplist:x64-windows-static=fail +libpng-apng:arm64-windows = skip +libpng-apng:arm-uwp = skip +libpng-apng:x64-linux = skip +libpng-apng:x64-osx = skip +libpng-apng:x64-uwp = skip +libpng-apng:x64-windows = skip +libpng-apng:x64-windows-static = skip +libpng-apng:x64-windows-static-md=skip +libpng-apng:x86-windows = skip +# The developer of libqcow does not offer stable release archives +libqcow:arm-uwp=skip +libqcow:x64-uwp=skip +libqcow:x64-windows-static=skip +libqcow:x64-windows-static-md=skip +libqcow:x64-osx=skip +libqcow:x64-windows=skip +libqcow:x64-linux=skip +libqcow:x86-windows=skip +libqcow:arm64-windows=skip +# Conflicts with openssl +boringssl:arm64-windows = skip +boringssl:arm-uwp = skip +boringssl:x64-linux = skip +boringssl:x64-osx = skip +boringssl:x64-uwp = skip +boringssl:x64-windows = skip +boringssl:x64-windows-static = skip +boringssl:x64-windows-static-md=skip +boringssl:x86-windows = skip +libressl:arm64-windows = skip +libressl:arm-uwp = skip +libressl:x64-linux = skip +libressl:x64-osx = skip +libressl:x64-uwp = skip +libressl:x64-windows = skip +libressl:x64-windows-static = skip +libressl:x64-windows-static-md=skip +libressl:x86-windows = skip +libsoundio:arm64-windows=fail +libsoundio:arm-uwp=fail +libsoundio:x64-uwp=fail +libspatialite:arm-uwp=fail +libspatialite:x64-uwp=fail +libsrt:arm-uwp=fail +libsrt:x64-uwp=fail +libssh:arm64-windows=fail +libssh:arm-uwp=fail +libssh:x64-uwp=fail +libtins:arm-uwp=fail +libtins:x64-uwp=fail +libtomcrypt:arm64-windows=fail +libtomcrypt:arm-uwp=fail +libui:arm-uwp=fail +libui:x64-linux=fail +libui:x64-uwp=fail +libusb:arm-uwp=fail +libusb:x64-uwp=fail +libusb:arm64-windows=fail +libusbmuxd:arm-uwp=fail +libusbmuxd:x64-uwp=fail +libusbmuxd:x64-linux=fail +libusbmuxd:x64-osx=fail +libusb-win32:arm-uwp=fail +libusb-win32:x64-linux=fail +libusb-win32:x64-osx=fail +libusb-win32:x64-uwp=fail +libuv:arm-uwp=fail +libuv:x64-uwp=fail +libvmdk:arm-uwp=fail +libvmdk:x64-uwp=fail +#Skip detection to avoid upstream remove older releases +libvmdk:x86-windows=skip +libvmdk:x64-windows=skip +libvmdk:x64-windows-static=skip +libvmdk:x64-windows-static-md=skip +libvmdk:arm64=skip +libvmdk:x64-linux=skip +libvmdk:x64-osx=skip +libwandio:x86-windows=fail +libwandio:x64-windows=fail +libwandio:x64-windows-static=fail +libwandio:x64-windows-static-md=fail +libwandio:x64-uwp=fail +libwandio:arm64-windows=fail +libwandio:arm-uwp=fail +licensepp:arm-uwp=fail +licensepp:x64-uwp=fail +linenoise-ng:arm-uwp=fail +linenoise-ng:x64-uwp=fail +live555:arm-uwp=fail +live555:x64-osx=fail +live555:x64-uwp=fail +llgl:arm-uwp=fail +llgl:x64-uwp=fail +log4cplus:arm-uwp=fail +log4cplus:x64-uwp=fail +log4cxx:arm-uwp=fail +log4cxx:x64-uwp=fail +luajit:arm64-windows=fail +luafilesystem:arm-uwp=fail +luafilesystem:x64-uwp=fail +luasec:x64-windows-static=fail +lzfse:arm-uwp=fail +magnum:arm64-windows=skip +marble:x64-windows-static=fail +marble:x64-windows-static-md=fail +marble:arm64-windows=fail +marble:arm-uwp=fail +marble:x64-linux=fail +marble:x64-osx=fail +marble:x86-windows=fail +mathgl:x64-osx=fail +mathgl:x64-uwp=fail +mecab:arm64-windows = skip +mecab:arm-uwp = skip +mecab:x64-linux = skip +mecab:x64-uwp = skip +mecab:x64-windows = skip +mecab:x64-windows-static = skip +mecab:x64-windows-static-md=skip +mecab:x86-windows = skip +# Due to static crt. +mesa:x64-windows-static=fail +# Missing dependent libraries. +mesa:x64-linux=fail +mesa:x64-osx=fail +mfl:x64-linux=skip +mfl:x64-osx=skip +milerius-sfml-imgui:x64-windows-static=fail +minifb:arm-uwp=fail +minifb:x64-uwp=fail +miniupnpc:arm-uwp=fail +miniupnpc:x64-uwp=fail +minizip:arm-uwp=fail +minizip:x64-uwp=fail +# Conflicts with signalrclient +microsoft-signalr:arm64-windows=skip +microsoft-signalr:arm-uwp=skip +microsoft-signalr:x64-linux=skip +microsoft-signalr:x64-osx=skip +microsoft-signalr:x64-uwp=skip +microsoft-signalr:x64-windows=skip +microsoft-signalr:x64-windows-static=skip +microsoft-signalr:x64-windows-static-md=skip +microsoft-signalr:x86-windows=skip +# https://github.com/mlpack/mlpack/pull/2945 +mlpack:x64-uwp=fail +# mmx installs many problematic headers, such as `json.h` and `sched.h` +mmx:x64-windows=skip +mmx:x64-windows-static=skip +mmx:x64-windows-static-md=skip +mmx:x86-windows=skip +mmx:x64-linux=skip +mmx:x64-osx=skip +mmx:arm-uwp=skip +mmx:x64-uwp=skip +mmx:arm64-windows=skip +# Flaky strange linker error +mongo-c-driver:x64-osx=skip +mongo-c-driver:arm-uwp=fail +mongo-c-driver:x64-uwp=fail +mongoose:arm-uwp=fail +mongoose:x64-uwp=fail +monkeys-audio:arm64-windows=fail +monkeys-audio:arm-uwp=fail +monkeys-audio:x64-linux=fail +monkeys-audio:x64-osx=fail +monkeys-audio:x64-uwp=fail +monkeys-audio:x64-windows-static=fail +moos-core:arm-uwp=fail +moos-core:x64-uwp=fail +moos-core:x64-windows-static=fail +moos-essential:arm64-windows=fail +moos-essential:x64-windows-static-md=fail +moos-essential:x64-windows=fail +moos-essential:x86-windows=fail +# Conflicts with libjpeg-turbo +mozjpeg:arm64-windows = skip +mozjpeg:arm-uwp = skip +mozjpeg:x64-linux = skip +mozjpeg:x64-osx = skip +mozjpeg:x64-uwp = skip +mozjpeg:x64-windows = skip +mozjpeg:x64-windows-static = skip +mozjpeg:x64-windows-static-md=skip +mozjpeg:x86-windows = skip +# mpir conflicts with gmp +# see https://github.com/microsoft/vcpkg/issues/11756 +mpir:x86-windows=skip +mpir:x64-windows=skip +mpir:x64-windows-static=skip +mpir:x64-windows-static-md=skip +mpir:arm64-windows=skip +mpir:x64-osx=skip +mpir:x64-linux=skip +msmpi:arm64-windows=fail +msmpi:arm-uwp=fail +msmpi:x64-linux=fail +msmpi:x64-osx=fail +msmpi:x64-uwp=fail +munit:arm-uwp=fail +munit:arm64-windows=fail +munit:x64-uwp=fail +nana:arm-uwp=fail +nana:x64-linux=fail +nana:x64-osx=fail +nana:x64-uwp=fail +nanodbc:arm-uwp=fail +nanodbc:x64-uwp=fail +nanodbc:x64-linux=skip +nativefiledialog:arm-uwp=fail +nativefiledialog:x64-uwp=fail +ngspice:x64-windows-static=fail +nng:arm-uwp=fail +nng:x64-uwp=fail +nrf-ble-driver:arm-uwp=fail +nrf-ble-driver:x64-uwp=fail +numactl:arm64-windows=fail +numactl:arm-uwp=fail +numactl:x64-osx=fail +numactl:x64-uwp=fail +numactl:x64-windows=fail +numactl:x64-windows-static=fail +numactl:x64-windows-static-md=fail +numactl:x86-windows=fail +nvtt:arm64-windows=fail +nvtt:arm-uwp=fail +nvtt:x64-uwp=fail +ocilib:arm-uwp=fail +ocilib:arm64-windows=fail +ocilib:x64-uwp=fail +ocilib:x64-windows-static-md=fail +octomap:arm-uwp=fail +octomap:x64-uwp=fail +ode:arm64-windows=fail +ode:arm-uwp=fail +ode:x64-uwp=fail +offscale-libetcd-cpp:arm-uwp=fail +offscale-libetcd-cpp:x64-uwp=fail +ogdf:arm64-windows = skip +ogdf:arm-uwp = skip +ogdf:x64-osx=fail +ogdf:x64-uwp = skip +ogdf:x64-windows = skip +ogdf:x64-windows-static = skip +ogdf:x64-windows-static-md=skip +ogdf:x86-windows = skip +# broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18936 +ogdf:x64-linux=fail +ogre:x64-osx=fail +# Conflicts with ogre +ogre-next:arm64-windows = skip +ogre-next:arm-uwp = skip +ogre-next:x64-osx = skip +ogre-next:x64-linux = skip +ogre-next:x64-uwp = skip +ogre-next:x64-windows = skip +ogre-next:x64-windows-static = skip +ogre-next:x64-windows-static-md=skip +ogre-next:x86-windows = skip +# ompl is vulnerable to some form of race in its dependent ports, and adding 'ode' as a dependency +# does not resolve the issue +# src/ompl/CMakeFiles/ompl.dir/extensions/ode/src/OpenDEStateValidityChecker.cpp.o +# -L/mnt/vcpkg-ci/packages/flann_x64-linux/debug/lib -L/mnt/vcpkg-ci/packages/ode_x64-linux/debug/lib +# -Wl,-rpath,/mnt/vcpkg-ci/packages/flann_x64-linux/debug/lib:/mnt/vcpkg-ci/packages/ode_x64-linux/debug/lib:::::::::::::::::::::::::::::::::::::::::::::::: +# -lode /mnt/vcpkg-ci/installed/x64-linux/debug/lib/libboost_serialization.a +# /mnt/vcpkg-ci/installed/x64-linux/debug/lib/libboost_filesystem.a +# /mnt/vcpkg-ci/installed/x64-linux/debug/lib/libboost_system.a -lpthread && : +# /usr/bin/ld: cannot find -lode +ompl:x64-osx=fail +ompl:x64-linux=fail +openal-soft:arm-uwp=fail +openal-soft:x64-uwp=fail +# opencc/deps/rapidjson-1.1.0/rapidjson.h: Unknown machine endianess detected +opencc:arm64-windows=fail +# opencc/deps/marisa-0.2.5/lib/marisa/grimoire/io/mapper.cc currently doesn't support UWP. +opencc:arm-uwp=fail +opencc:x64-uwp=fail +opencensus-cpp:arm64-windows=fail +opencensus-cpp:x64-windows=fail +opencensus-cpp:x64-windows-static=fail +opencensus-cpp:x64-windows-static-md=fail +opencensus-cpp:x86-windows=fail +opencensus-cpp:x64-uwp=fail +opencl:arm-uwp=fail +opencl:x64-uwp=fail +opencsg:x64-uwp=fail +opencv2:arm64-windows = skip +opencv2:arm-uwp = skip +opencv2:x64-linux = skip +opencv2:x64-osx = skip +opencv2:x64-uwp = skip +opencv2:x64-windows = skip +opencv2:x64-windows-static = skip +opencv2:x64-windows-static-md=skip +opencv2:x86-windows = skip +opencv3:arm64-windows = skip +opencv3:arm-uwp = skip +opencv3:x64-linux = skip +opencv3:x64-osx = skip +opencv3:x64-uwp = skip +opencv3:x64-windows = skip +opencv3:x64-windows-static = skip +opencv3:x64-windows-static-md=skip +opencv3:x86-windows = skip +opendnp3:x64-uwp=fail +opendnp3:arm-uwp=fail +openexr:arm64-windows=fail +openexr:arm-uwp=fail +openexr:x64-uwp=fail +opengl:arm64-windows=fail +opengl:arm-uwp=fail +openmama:x64-windows-static-md=fail +openmesh:arm64-windows=fail +openmesh:arm-uwp=fail +openmesh:x64-uwp=fail +openmpi:arm64-windows=fail +openmpi:arm-uwp=fail +openmpi:x64-uwp=fail +openmpi:x64-windows=fail +openmpi:x64-windows-static=fail +openmpi:x64-windows-static-md=fail +openmpi:x86-windows=fail +openni2:x64-uwp=fail +openni2:x64-windows-static=fail +openscap:x64-linux=fail +openscap:x64-osx=fail +openvpn3:x64-osx=fail +openvr:arm64-windows=fail +openvr:arm-uwp=fail +openvr:x64-osx=fail +openvr:x64-uwp=fail +openvr:x64-windows-static=fail +optional-bare:arm64-windows = skip +optional-bare:arm-uwp = skip +optional-bare:x64-linux = skip +optional-bare:x64-osx = skip +optional-bare:x64-uwp = skip +optional-bare:x64-windows = skip +optional-bare:x64-windows-static = skip +optional-bare:x64-windows-static-md=skip +optional-bare:x86-windows = skip +opusfile:arm-uwp=fail +opusfile:x64-uwp=fail +paho-mqtt:arm-uwp=fail +paho-mqtt:x64-uwp=fail +pango:x64-windows-static=fail +pango:x64-windows-static-md=fail +pfring:x64-osx=fail +# pfring on Linux currently fails because its build scripts enable warnings as +# errors, and warnings trigger with the Linux kernel headers in the Azure images. +pfring:x64-linux=fail +pixman:arm-uwp=fail +platform-folders:arm-uwp=fail +platform-folders:x64-uwp=fail +plib:arm-uwp=fail +plib:x64-osx=fail +plib:x64-uwp=fail +plibsys:arm-uwp=fail +plibsys:x64-uwp=fail +plplot:arm64-windows=fail +plplot:arm-uwp=fail +plplot:x64-uwp=fail +pmdk:arm-uwp=fail +pmdk:arm64-windows=fail +pmdk:x64-linux=fail +pmdk:x64-osx=fail +pmdk:x64-uwp=fail +pmdk:x64-windows-static=fail +pmdk:x86-windows=fail +popsift:x64-windows-static-md=fail +portable-snippets:arm-uwp=fail +# Not yet ready for these platforms. +qbittorrent:x64-osx=fail +qbittorrent:x64-linux=fail +qpid-proton:arm-uwp=fail +qpid-proton:x64-uwp=fail +qpid-proton:x64-windows-static=fail +qt5-base:arm64-windows=fail + +# Skip deprecated Qt module +# (remove after 1 year or longer due to vcpkg upgrade not handling removed ports correctly) +qt5-canvas3d:x64-linux=skip +qt5-canvas3d:x64-osx=skip +qt5-canvas3d:x64-windows=skip +qt5-canvas3d:x64-windows-static=skip +qt5-canvas3d:x64-windows-static-md=skip +qt5-canvas3d:x86-windows=skip +# Missing system libraries +qt5-wayland:x64-osx=fail +qtwayland:x64-osx=fail +# Missing prerequisites for CI success +qt5-webengine:x64-linux=fail +qt5-webengine:x64-osx=fail +# Fail due to outdated protoc headers. +# D:\buildtrees\qt5-webengine\x64-windows-dbg\src\core\debug\gen\net/third_party/quiche/src/quic/core/proto/cached_network_parameters.pb.h(17): +# fatal error C1189: #error: This file was generated by an older version of protoc which is +# Succesful built requires protobuf to be installed after qt5-webengine not before. Otherwise the build picks up the wrong headers from inside vcpkg. +qt5-webengine:x64-windows=skip +qt5-webengine:x86-windows=skip +# VS2022 17.2 ICE https://developercommunity.visualstudio.com/t/Visual-Studio-2022-v1720-reports-fata/10039296 +qtwebengine:x64-windows=fail +# Missing system libraries +qt5-x11extras:x64-osx=fail +# Missing libraries +qt5-x11extras:x86-windows=fail +qt5-x11extras:x64-windows=fail +qt5-x11extras:x64-windows-static=fail +qt5-x11extras:x64-windows-static-md=fail +qwt:x64-osx=fail +qwt-qt6:x64-osx=fail +qwtw:x64-windows=fail +rabit:x64-osx=fail +range-v3-vs2015:arm64-windows = skip +range-v3-vs2015:arm-uwp = skip +range-v3-vs2015:x64-linux = skip +range-v3-vs2015:x64-osx = skip +range-v3-vs2015:x64-uwp = skip +range-v3-vs2015:x64-windows = skip +range-v3-vs2015:x64-windows-static = skip +range-v3-vs2015:x64-windows-static-md=skip +range-v3-vs2015:x86-windows = skip +rapidstring:arm64-windows=fail +rapidstring:arm-uwp=fail +rapidstring:x64-linux=fail +rapidstring:x64-uwp=fail +rapidstring:x64-windows=fail +rapidstring:x64-windows-static=fail +rapidstring:x64-windows-static-md=fail +rapidstring:x86-windows=fail +raylib:arm64-windows=fail +raylib:arm-uwp=fail +raylib:x64-uwp=fail +# file conflicts with rbdl +rbdl-orb:x86-windows=skip +rbdl-orb:x64-windows=skip +rbdl-orb:x64-windows-static=skip +rbdl-orb:x64-windows-static-md=skip +rbdl-orb:x64-uwp=skip +rbdl-orb:arm-uwp=skip +rbdl-orb:arm64-windows=skip +rbdl-orb:x64-linux=skip +rbdl-orb:x64-osx=skip +readline:arm-uwp=fail +readline:x64-uwp=fail +realsense2:arm64-windows=fail +realsense2:arm-uwp=fail +realsense2:x64-uwp=fail +replxx:arm-uwp=fail +replxx:x64-uwp=fail +restbed:arm-uwp=fail +restbed:x64-uwp=fail +# file conflicts with msgpack +rest-rpc:x86-windows=skip +rest-rpc:x64-windows=skip +rest-rpc:x64-windows-static=skip +rest-rpc:x64-windows-static-md=skip +rest-rpc:x64-uwp=skip +rest-rpc:arm-uwp=skip +rest-rpc:arm64-windows=skip +rest-rpc:x64-linux=skip +rest-rpc:x64-osx=skip +rhash:arm64-windows=fail +rocksdb:arm-uwp=fail +rocksdb:x64-uwp=fail +rpclib:arm64-windows=fail +rpclib:arm-uwp=fail +rpclib:x64-uwp=fail +#The website of rply http://w3.impa.br/~diego/software/rply cannot be accessed +rply:x86-windows=skip +rply:x64-windows=skip +rply:x64-windows-static=skip +rply:x64-uwp=skip +rply:arm64-windows=skip +rply:x64-linux=skip +rply:x64-osx=skip +rply:x64-windows-static-md=skip +rsasynccpp:arm64-windows=fail +rsasynccpp:arm-uwp=fail +rsasynccpp:x64-linux=fail +rsasynccpp:x64-osx=fail +# Requires g++10 but CI compiler only has g++9 +rsm-binary-io:x64-linux=fail +# Requires g++10 but CI compiler only has g++9 +rsm-bsa:x64-linux=fail +# VS2022 17.2 ICE https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1490389 +rsocket:x64-windows=fail +rsocket:x64-windows-static=fail +rsocket:x64-windows-static-md=fail +rtlsdr:x64-uwp=fail +rtlsdr:arm64-windows=fail +rtlsdr:arm-uwp=fail +rtlsdr:x64-linux=fail +rtlsdr:x64-osx=fail + +# rttr's build fails in CI with +# D:\buildtrees\rttr\src\v0.9.6-9229bdee1f.clean\src\rttr\detail\library\library_win.cpp(236): error C3861: 'LoadLibraryW': identifier not found +# .... but it succeeds when I try building it locally. +rttr:arm-uwp=fail +rttr:x64-uwp=fail + +# ryu does not support VS2022 yet +ryu:x64-windows=fail +ryu:x64-windows-static=fail +ryu:x64-windows-static-md=fail + +sciter:arm64-windows=fail +sciter:arm-uwp=fail +sciter:x64-linux=fail +sciter:x64-osx=fail +sciter:x64-uwp=fail +sciter:x64-windows=fail +sciter:x64-windows-static=fail +sciter:x64-windows-static-md=fail +sciter:x86-windows=fail +scnlib:arm-uwp=fail +scnlib:x64-uwp=fail +sdformat10:x64-windows-static-md=fail +sdformat6:arm-uwp=fail +sdformat6:arm64-windows=fail +sdformat6:x64-uwp=fail +sdformat6:x64-windows-static-md=fail +sdformat9:arm-uwp=fail +sdformat9:x64-uwp=fail +sdformat9:x64-windows-static-md=fail +sdl2-mixer:arm-uwp=fail +sdl2-mixer:x64-uwp=fail +sdl2-net:arm-uwp=fail +sdl2-net:x64-uwp=fail +# https://github.com/microsoft/vcpkg/issues/10918 +seal:arm-uwp=fail +seal:x64-uwp=fail +septag-sx:arm64-windows=fail +septag-sx:arm-uwp=fail +septag-sx:x64-uwp=fail +sfml:arm64-windows=fail +shiva:x64-windows-static=fail +shiva:x64-windows-static-md=fail +shiva-sfml:x64-linux=fail +shiva-sfml:x64-osx=fail +shiva-sfml:x86-windows=fail +shiva-sfml:x64-windows=fail +shogun:arm64-windows = skip +shogun:arm-uwp = skip +shogun:x64-osx = skip +shogun:x64-uwp = skip +shogun:x64-windows = skip +shogun:x64-windows-static = skip +shogun:x64-windows-static-md=skip +shogun:x86-windows = skip +signalrclient:x64-uwp=fail +signalrclient:arm-uwp=fail +skia:arm-uwp=fail +skia:x64-uwp=fail +sleef:x86-windows=fail +slikenet:arm-uwp=fail +slikenet:x64-uwp=fail +smpeg2:x64-linux=fail +soci:arm-uwp=fail +soci:x64-uwp=fail +sockpp:arm-uwp=fail +sockpp:x64-uwp=fail +soil2:arm-uwp=fail +soil2:x64-uwp=fail +soqt:arm64-windows=fail +soqt:arm-uwp=fail +soqt:x64-uwp=fail +soundtouch:arm-uwp=fail +soundtouch:x64-uwp=fail +spaceland:arm64-windows=fail +spaceland:arm-uwp=fail +spaceland:x64-uwp=fail +spdk:x64-linux=fail +spdk-dpdk:arm64-windows=fail +spdk-dpdk:arm-uwp=fail +spdk-dpdk:x64-osx=fail +spdk-dpdk:x64-uwp=fail +spdk-dpdk:x64-windows=fail +spdk-dpdk:x64-windows-static=fail +spdk-dpdk:x64-windows-static-md=fail +spdk-dpdk:x86-windows=fail +spdk-ipsec:arm64-windows=fail +spdk-ipsec:arm-uwp=fail +spdk-ipsec:x64-osx=fail +spdk-ipsec:x64-uwp=fail +spdk-ipsec:x64-windows=fail +spdk-ipsec:x64-windows-static=fail +spdk-ipsec:x64-windows-static-md=fail +spdk-ipsec:x86-windows=fail +spirv-tools:arm-uwp=fail +spirv-tools:x64-uwp=fail +stormlib:arm-uwp=fail +stormlib:x64-uwp=fail +stxxl:arm-uwp=fail +stxxl:x64-uwp=fail +# upstream issue https://github.com/stxxl/stxxl/issues/99 +stxxl:x86-windows=skip +stxxl:x64-windows=skip +stxxl:x64-windows-static=skip +stxxl:x64-windows-static-md=skip +symengine:arm-uwp=fail +systemc:arm64-windows=fail +systemc:arm-uwp=fail +systemc:x64-uwp=fail +tbb:arm64-windows=fail +tbb:arm-uwp=fail +tbb:x64-uwp=fail +tcl:arm-uwp=fail +tcl:arm64-windows=fail +tcl:x64-uwp=fail +telnetpp:arm-uwp=fail +telnetpp:x64-uwp=fail + +# tensorflow does not support VS2022 +tensorflow:x64-windows=fail +tensorflow:x64-windows-static=fail +tensorflow:x64-windows-static-md=fail +tensorflow-cc:x64-windows=fail +tensorflow-cc:x64-windows-static=fail +tensorflow-cc:x64-windows-static-md=fail + +tensorflow:x64-osx=fail +tensorflow-cc:x64-osx=fail + +theia:arm64-windows = skip +theia:arm-uwp = skip +theia:x64-uwp = skip +theia:x64-windows = skip +theia:x64-windows-static = skip +theia:x64-windows-static-md=skip +theia:x86-windows = skip +tidy-html5:arm-uwp=fail +tidy-html5:x64-uwp=fail +tinkerforge:arm-uwp=fail +tinkerforge:x64-uwp=fail +tiny-process-library:arm-uwp=fail +tiny-process-library:x64-uwp=fail +tmxparser:arm64-windows=fail +tmxparser:arm-uwp=fail +tmxparser:x64-uwp=fail +tmxparser:x64-windows=fail +tmxparser:x64-windows-static=fail +tmxparser:x64-windows-static-md=fail +tmxparser:x86-windows=fail +torch-th:arm64-windows=fail +torch-th:arm-uwp=fail +torch-th:x64-uwp=fail +torch-th:x64-windows-static=fail +tre:x64-osx=fail +treehopper:x64-windows-static=fail +treehopper:x64-linux=fail +unicorn-lib:arm-uwp=fail +unicorn-lib:x64-uwp=fail +unittest-cpp:arm64-windows=fail +unittest-cpp:arm-uwp=fail +unittest-cpp:x64-uwp=fail +urdfdom:x64-windows-static=fail +usd:x86-windows=fail +uthenticode:arm-uwp=fail +uthenticode:x64-uwp=fail +v8:arm64-windows=fail +v8:arm-uwp=fail +v8:x64-osx=fail +v8:x64-uwp=fail +vectorclass:arm64-windows=fail +vectorclass:arm-uwp=fail +vulkan:arm64-windows=fail +vulkan:arm-uwp=fail +vulkan:x64-linux=fail +vulkan:x64-osx=fail +vulkan:x64-uwp=fail +vulkan:x64-windows=fail +vulkan:x64-windows-static=fail +vulkan:x64-windows-static-md=fail +vulkan:x86-windows=fail +# Conflicts with latest openjpeg port (vxl ships with an old version of openjpeg) +# conflicts with qt5-location +vxl:arm64-windows = skip +vxl:arm-uwp = skip +vxl:x64-linux = skip +vxl:x64-osx = skip +vxl:x64-uwp = skip +vxl:x64-windows = skip +vxl:x64-windows-static = skip +vxl:x64-windows-static-md=skip +vxl:x86-windows = skip +winpcap:arm64-windows = skip +winpcap:arm-uwp = skip +winpcap:x64-uwp = skip +winpcap:x64-windows = skip +winpcap:x64-windows-static = skip +winpcap:x64-windows-static-md=skip +winpcap:x86-windows = skip +winreg:x64-linux=fail +winreg:x64-osx=fail +wpilib:arm64-windows=fail +wpilib:x64-osx=fail +wxchartdir:x64-osx=fail +wxwidgets:x64-linux=fail +x265:arm64-windows=fail +x265:arm-uwp=fail +x265:x64-uwp=fail +xalan-c:x64-windows-static=fail +xalan-c:arm64-windows=fail +xerces-c:arm-uwp=fail +xerces-c:x64-uwp=fail +xmlsec:arm-uwp=fail +xmlsec:x64-uwp=fail +yara:arm-uwp=fail +yara:x64-uwp=fail +z3:arm-uwp=fail +z3:x64-uwp=fail + +# clapack is replaced by lapack-reference on the platforms lapack-reference supports +clapack:x64-linux=skip +clapack:x64-osx=skip +clapack:x64-windows-static=skip +clapack:x64-windows-static-md=skip +clapack:x64-windows=skip +clapack:x86-windows=skip +lapack-reference:arm64-windows=skip +lapack-reference:arm-uwp=skip +lapack-reference:x64-uwp=skip + +# failures for x64-windows-static-md +ace:x64-windows-static-md=fail +ijg-libjpeg:x64-windows-static-md=fail +libcerf:x64-windows-static-md=fail +libmicrohttpd:x64-windows-static-md=fail +linenoise-ng:x64-windows-static-md=fail +netcdf-cxx4:x64-windows-static-md=fail +open62541:x64-windows-static-md=fail +openscap:x64-windows-static-md=fail +quantlib:x64-windows-static-md=fail +sentencepiece:x64-windows-static-md=fail +symengine:x64-windows-static-md=fail +unicorn:x64-windows-static-md=fail + +# the version of v8 we have in the repo doesn't support VS2022 +v8:x86-windows=fail +v8:x64-windows=fail +v8:x64-windows-static=fail +v8:x64-windows-static-md=fail + +zyre:x64-windows-static-md=fail +usbmuxd:x64-windows-static-md=fail +workflow:x64-uwp=fail +workflow:arm-uwp=fail + +# VS2019 version 16.9.4's project system changes where PDBs are placed in a way that breaks the +# upstream build script of this port. +# See https://developercommunity.visualstudio.com/t/Toolset-169-regression-vcxproj-producin/1356639 +dimcli:x64-windows-static-md=fail +dimcli:x64-windows-static=fail + +# ZeroC doesn't provide ARM tagets in project files. +zeroc-ice:arm64-windows=fail +zeroc-ice:arm-uwp=fail +zeroc-ice:x64-uwp=fail + +# ANGLE triggers an intermittent ice in C1XX +# https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1472813 +angle:x86-windows=fail +angle:x64-windows=fail +angle:x64-windows-static=fail +angle:x64-windows-static-md=fail +angle:x64-uwp=fail +angle:arm64-windows=fail +angle:arm-uwp=fail + +vcpkg-ci-boost:x64-linux=pass +vcpkg-ci-boost:x64-windows-static-md=pass +vcpkg-ci-boost:x64-windows-static=pass +vcpkg-ci-boost:x64-windows=pass +vcpkg-ci-boost:x86-windows=pass +vcpkg-ci-ffmpeg:arm-uwp=pass +vcpkg-ci-ffmpeg:arm64-windows=pass +vcpkg-ci-ffmpeg:x64-linux=pass +vcpkg-ci-ffmpeg:x64-uwp=pass +vcpkg-ci-ffmpeg:x64-windows-static-md=pass +vcpkg-ci-ffmpeg:x64-windows-static=pass +vcpkg-ci-ffmpeg:x64-windows=pass +vcpkg-ci-ffmpeg:x86-windows=pass +vcpkg-ci-llvm:x64-linux=pass +vcpkg-ci-llvm:x64-osx=pass +vcpkg-ci-llvm:x64-windows-static-md=pass +vcpkg-ci-llvm:x64-windows-static=pass +vcpkg-ci-llvm:x64-windows=pass +vcpkg-ci-llvm:x86-windows=pass +vcpkg-ci-opencv:arm-uwp=pass +vcpkg-ci-opencv:arm64-windows=pass +vcpkg-ci-opencv:x64-linux=pass +vcpkg-ci-opencv:x64-uwp=pass +vcpkg-ci-opencv:x64-windows-static-md=pass +vcpkg-ci-opencv:x64-windows-static=pass +vcpkg-ci-opencv:x64-windows=pass +vcpkg-ci-opencv:x86-windows=pass +vcpkg-ci-paraview:x64-linux=pass +vcpkg-ci-paraview:x64-osx=pass +vcpkg-ci-paraview:x64-windows-static-md=pass +vcpkg-ci-paraview:x64-windows-static=pass +vcpkg-ci-paraview:x64-windows=pass +vcpkg-ci-paraview:x86-windows=pass +vcpkg-ci-wxwidgets:arm64-windows=pass +vcpkg-ci-wxwidgets:x64-osx=pass +vcpkg-ci-wxwidgets:x64-windows-static-md=pass +vcpkg-ci-wxwidgets:x64-windows-static=pass +vcpkg-ci-wxwidgets:x64-windows=pass +vcpkg-ci-wxwidgets:x86-windows=pass diff --git a/externals/vcpkg/scripts/cmake/execute_process.cmake b/externals/vcpkg/scripts/cmake/execute_process.cmake new file mode 100755 index 000000000..a338dda36 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/execute_process.cmake @@ -0,0 +1,12 @@ +if (NOT DEFINED Z_VCPKG_OVERRIDEN_EXECUTE_PROCESS) + set(Z_VCPKG_OVERRIDEN_EXECUTE_PROCESS ON) + + if (DEFINED VCPKG_DOWNLOAD_MODE) + function(execute_process) + message(FATAL_ERROR "This command cannot be executed in Download Mode.\nHalting portfile execution.\n") + endfunction() + set(Z_VCPKG_EXECUTE_PROCESS_NAME "_execute_process") + else() + set(Z_VCPKG_EXECUTE_PROCESS_NAME "execute_process") + endif() +endif() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_acquire_msys.cmake b/externals/vcpkg/scripts/cmake/vcpkg_acquire_msys.cmake new file mode 100755 index 000000000..6fd681afa --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_acquire_msys.cmake @@ -0,0 +1,511 @@ +# Mirror list from https://github.com/msys2/MSYS2-packages/blob/master/pacman-mirrors/mirrorlist.msys +# Sourceforge is not used because it does not keep older package versions +set(Z_VCPKG_ACQUIRE_MSYS_MIRRORS + "https://www2.futureware.at/~nickoe/msys2-mirror/" + "https://mirror.yandex.ru/mirrors/msys2/" + "https://mirrors.tuna.tsinghua.edu.cn/msys2/" + "https://mirrors.ustc.edu.cn/msys2/" + "https://mirror.bit.edu.cn/msys2/" + "https://mirror.selfnet.de/msys2/" + "https://mirrors.sjtug.sjtu.edu.cn/msys2/" +) + +function(z_vcpkg_acquire_msys_download_package out_archive) + cmake_parse_arguments(PARSE_ARGV 1 "arg" "" "URL;SHA512;FILENAME" "") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "internal error: z_vcpkg_acquire_msys_download_package passed extra args: ${arg_UNPARSED_ARGUMENTS}") + endif() + + set(all_urls "${arg_URL}") + + foreach(mirror IN LISTS Z_VCPKG_ACQUIRE_MSYS_MIRRORS) + string(REPLACE "https://repo.msys2.org/" "${mirror}" mirror_url "${arg_URL}") + list(APPEND all_urls "${mirror_url}") + endforeach() + + vcpkg_download_distfile(msys_archive + URLS ${all_urls} + SHA512 "${arg_SHA512}" + FILENAME "msys-${arg_FILENAME}" + QUIET + ) + set("${out_archive}" "${msys_archive}" PARENT_SCOPE) +endfunction() + +# writes to the following variables in parent scope: +# - Z_VCPKG_MSYS_ARCHIVES +# - Z_VCPKG_MSYS_TOTAL_HASH +# - Z_VCPKG_MSYS_PACKAGES +function(z_vcpkg_acquire_msys_declare_package) + cmake_parse_arguments(PARSE_ARGV 0 arg "" "NAME;URL;SHA512" "DEPS") + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "internal error: z_vcpkg_acquire_msys_declare_package passed extra args: ${arg_UNPARSED_ARGUMENTS}") + endif() + foreach(required_arg IN ITEMS URL SHA512) + if(NOT DEFINED arg_${required_arg}) + message(FATAL_ERROR "internal error: z_vcpkg_acquire_msys_declare_package requires argument: ${required_arg}") + endif() + endforeach() + + if(NOT arg_URL MATCHES [[^https://repo\.msys2\.org/.*/(([^-]+(-[^0-9][^-]*)*)-.+\.pkg\.tar\.(xz|zst))$]]) + message(FATAL_ERROR "internal error: regex does not match supplied URL to vcpkg_acquire_msys: ${arg_URL}") + endif() + + set(filename "${CMAKE_MATCH_1}") + if(NOT DEFINED arg_NAME) + set(arg_NAME "${CMAKE_MATCH_2}") + endif() + + if("${arg_NAME}" IN_LIST Z_VCPKG_MSYS_PACKAGES OR arg_Z_ALL_PACKAGES) + list(REMOVE_ITEM Z_VCPKG_MSYS_PACKAGES "${arg_NAME}") + list(APPEND Z_VCPKG_MSYS_PACKAGES ${arg_DEPS}) + set(Z_VCPKG_MSYS_PACKAGES "${Z_VCPKG_MSYS_PACKAGES}" PARENT_SCOPE) + + z_vcpkg_acquire_msys_download_package(archive + URL "${arg_URL}" + SHA512 "${arg_SHA512}" + FILENAME "${filename}" + ) + + list(APPEND Z_VCPKG_MSYS_ARCHIVES "${archive}") + set(Z_VCPKG_MSYS_ARCHIVES "${Z_VCPKG_MSYS_ARCHIVES}" PARENT_SCOPE) + string(APPEND Z_VCPKG_MSYS_TOTAL_HASH "${arg_SHA512}") + set(Z_VCPKG_MSYS_TOTAL_HASH "${Z_VCPKG_MSYS_TOTAL_HASH}" PARENT_SCOPE) + endif() +endfunction() + +function(vcpkg_acquire_msys out_msys_root) + cmake_parse_arguments(PARSE_ARGV 1 "arg" + "NO_DEFAULT_PACKAGES;Z_ALL_PACKAGES" + "" + "PACKAGES;DIRECT_PACKAGES" + ) + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "vcpkg_acquire_msys was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + set(Z_VCPKG_MSYS_TOTAL_HASH) + set(Z_VCPKG_MSYS_ARCHIVES) + + set(Z_VCPKG_MSYS_PACKAGES "${arg_PACKAGES}") + + if(NOT arg_NO_DEFAULT_PACKAGES) + list(APPEND Z_VCPKG_MSYS_PACKAGES bash coreutils sed grep gawk gzip diffutils make pkg-config) + endif() + + if(DEFINED arg_DIRECT_PACKAGES AND NOT arg_DIRECT_PACKAGES STREQUAL "") + list(LENGTH arg_DIRECT_PACKAGES direct_packages_length) + math(EXPR direct_packages_parity "${direct_packages_length} % 2") + math(EXPR direct_packages_number "${direct_packages_length} / 2") + math(EXPR direct_packages_last "${direct_packages_number} - 1") + + if(direct_packages_parity EQUAL 1) + message(FATAL_ERROR "vcpkg_acquire_msys(... DIRECT_PACKAGES ...) requires exactly pairs of URL/SHA512") + endif() + + # direct_packages_last > direct_packages_number - 1 > 0 - 1 >= 0, so this is fine + foreach(index RANGE "${direct_packages_last}") + math(EXPR url_index "${index} * 2") + math(EXPR sha512_index "${url_index} + 1") + list(GET arg_DIRECT_PACKAGES "${url_index}" url) + list(GET arg_DIRECT_PACKAGES "${sha512_index}" sha512) + + get_filename_component(filename "${url}" NAME) + z_vcpkg_acquire_msys_download_package(archive + URL "${url}" + SHA512 "${sha512}" + FILENAME "${filename}" + ) + list(APPEND Z_VCPKG_MSYS_ARCHIVES "${archive}") + string(APPEND Z_VCPKG_MSYS_TOTAL_HASH "${sha512}") + endforeach() + endif() + + # To add new entries, use https://packages.msys2.org/package/$PACKAGE?repo=msys + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/unzip-6.0-2-x86_64.pkg.tar.xz" + SHA512 b8a1e0ce6deff26939cb46267f80ada0a623b7d782e80873cea3d388b4dc3a1053b14d7565b31f70bc904bf66f66ab58ccc1cd6bfa677065de1f279dd331afb9 + DEPS libbz2 + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/libbz2-1.0.8-3-x86_64.pkg.tar.zst" + SHA512 955420cabd45a02f431f5b685d8dc8acbd07a8dcdda5fdf8b9de37d3ab02d427bdb0a6d8b67c448e307f21094e405e916fd37a8e9805abd03610f45c02d64b9e + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/patch-2.7.6-1-x86_64.pkg.tar.xz" + SHA512 04d06b9d5479f129f56e8290e0afe25217ffa457ec7bed3e576df08d4a85effd80d6e0ad82bd7541043100799b608a64da3c8f535f8ea173d326da6194902e8c + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/gzip-1.11-1-x86_64.pkg.tar.zst" + SHA512 bcd9d7839aef5f2b73c4d39b51838e62626c201c808d512806ba0a1619aee83c7deddb0d499fd93f9815fe351d7ab656c31c9dc7ee1171d77ad6d598e04dfcbe + DEPS msys2-runtime + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/texinfo-6.8-3-x86_64.pkg.tar.zst" + SHA512 5cc16d3b3c3b9859fe61233fa27f2146526e2b4d6e626814d283b35bfd77bc15eb4ffaec00bde6c10df93466d9155a06854a7ecf2e0d9af746dd56c4d88d192e + DEPS bash perl + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/bash-5.1.008-1-x86_64.pkg.tar.zst" + SHA512 a2ab8c958615134dc666254baca8cb13ed773036954e458de74ffb3bfe661bb33149082d38b677024da451755098a9201ab7dd435ced6e7f6b4e94c3ae368daf + DEPS msys2-runtime + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/autoconf-2.71-3-any.pkg.tar.zst" + SHA512 f639deac9b2191c2096584cf374103bbb1e9d2476dd0ebec94b1e80da59be25b88e362ac5280487a89f0bb0ed57f99b66e314f36b7de9cda03c0974806a3a4e2 + DEPS m4 perl + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/autoconf-archive-2019.01.06-1-any.pkg.tar.xz" + SHA512 77540d3d3644d94a52ade1f5db27b7b4b5910bbcd6995195d511378ca6d394a1dd8d606d57161c744699e6c63c5e55dfe6e8664d032cc8c650af9fdbb2db08b0 + DEPS m4 perl + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/diffutils-3.8-2-x86_64.pkg.tar.zst" + SHA512 ee74e457c417d6978b3185f2fb8e15c9c30ecfc316c2474d69c978e7eb2282a3bd050d68dbf43d694cb5ab6f159b0e7ca319d01f8192071d82a224dde87d69b5 + DEPS msys2-runtime + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/binutils-2.37-5-x86_64.pkg.tar.zst" + SHA512 32129cf97b53d5f6d87b42f17643e9dfc2e41b9ab4e4dfdc10e69725a9349bb25e57e0937e7504798cae91f7a88e0f4f5814e9f6a021bb68779d023176d2f311 + DEPS libiconv libintl + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/libtool-2.4.6-9-x86_64.pkg.tar.xz" + SHA512 b309799e5a9d248ef66eaf11a0bd21bf4e8b9bd5c677c627ec83fa760ce9f0b54ddf1b62cbb436e641fbbde71e3b61cb71ff541d866f8ca7717a3a0dbeb00ebf + DEPS grep sed coreutils file findutils + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/file-5.41-2-x86_64.pkg.tar.zst" + SHA512 124c3983608879362acea7d487bf23690f371b3cfe0355385f0e643263b2a5568abe5cebda92ef9bc534e81f850138f589e75982f36a53f509676056d71de642 + DEPS gcc-libs zlib libbz2 + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/zlib-1.2.11-1-x86_64.pkg.tar.xz" + SHA512 b607da40d3388b440f2a09e154f21966cd55ad77e02d47805f78a9dee5de40226225bf0b8335fdfd4b83f25ead3098e9cb974d4f202f28827f8468e30e3b790d + DEPS gcc-libs + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/bzip2-1.0.8-3-x86_64.pkg.tar.zst" + SHA512 9d03e8fc5677dd1386454bd27a683667e829ad5b1b87fc0879027920b2e79b25a2d773ab2556cd29844b18dd25b26fef5a57bf89e35ca318e39443dcaf0ca3ba + DEPS gcc-libs + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/libbz2-1.0.8-3-x86_64.pkg.tar.zst" + SHA512 955420cabd45a02f431f5b685d8dc8acbd07a8dcdda5fdf8b9de37d3ab02d427bdb0a6d8b67c448e307f21094e405e916fd37a8e9805abd03610f45c02d64b9e + DEPS gcc-libs + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/coreutils-8.32-2-x86_64.pkg.tar.zst" + SHA512 0719e8d3683711453ff77496cad11583e877ea52806e5ea3f470444705705db20a8a9fe99987166b02c6bd240c06c7d86faa979a7bc5536c9c804d800b60b7be + DEPS libiconv libintl gmp + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/grep-3.0-2-x86_64.pkg.tar.xz" + SHA512 c784d5f8a929ae251f2ffaccf7ab0b3936ae9f012041e8f074826dd6077ad0a859abba19feade1e71b3289cc640626dfe827afe91c272b38a1808f228f2fdd00 + DEPS libiconv libintl libpcre + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/sed-4.8-2-x86_64.pkg.tar.zst" + SHA512 8391be777239e0bfc19dc477995ee581ea9dbb1ba34fc27f57ba9d858e7489ac9b7200479d405712b43fa88434dd597be71d161fa8c05606e7ef991711bfc4c1 + DEPS libintl + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/libpcre-8.45-1-x86_64.pkg.tar.zst" + SHA512 b10a69380c44ea35367f310a7400eae26beacf347ddbb5da650b54924b80ffd791f12a9d70923567e5081e3c7098f042e47bcff1328d95b0b27ce63bcd762e88 + DEPS gcc-libs + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/m4-1.4.19-2-x86_64.pkg.tar.zst" + SHA512 7471099ba7e3b47e5b019dc0e563165a8660722f2bbd337fb579e6d1832c0e7dcab0ca9297c4692b18add92c4ad49e94391c621cf38874e2ff63d4f926bac38c + DEPS msys2-runtime + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/automake-wrapper-11-4-any.pkg.tar.zst" + SHA512 175940ebccb490c25d2c431dd025f24a7d0c930a7ee8cb81a44a4989c1d07f4b5a8134e1d05a7a1b206f8e19a2308ee198b1295e31b2e139f5d9c1c077252c94 + DEPS gawk + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/gawk-5.1.0-2-x86_64.pkg.tar.zst" + SHA512 d4b00e2b53ce99ddd3ee8e41c41add5ab36d26a54107acf7f5a5bf4a0033d72465cdab86f5b2eb8b7aca2cb5027a3e35cb194794c3bf563c0075ca3dbcad6987 + DEPS libintl libreadline mpfr + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/mpfr-4.1.0-1-x86_64.pkg.tar.zst" + SHA512 d64fa60e188124591d41fc097d7eb51d7ea4940bac05cdcf5eafde951ed1eaa174468f5ede03e61106e1633e3428964b34c96de76321ed8853b398fbe8c4d072 + DEPS gmp gcc-libs + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/gmp-6.2.1-1-x86_64.pkg.tar.zst" + SHA512 c5c8009ef069d05c2209b69c8e87094b09aac4b5c3dfdbea474d8262e55d286b400f1360c6a9778fd5eb87fb76a6463c21188286a1a1919ad79153eae3c44b0f + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/xz-5.2.5-1-x86_64.pkg.tar.xz" # this seems to require immediate updating on version bumps. + SHA512 99d092c3398277e47586cead103b41e023e9432911fb7bdeafb967b826f6a57d32e58afc94c8230dad5b5ec2aef4f10d61362a6d9e410a6645cf23f076736bba + DEPS liblzma libiconv gettext + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/liblzma-5.2.5-1-x86_64.pkg.tar.xz" + SHA512 8d5c04354fdc7309e73abce679a4369c0be3dc342de51cef9d2a932b7df6a961c8cb1f7e373b1b8b2be40343a95fbd57ac29ebef63d4a2074be1d865e28ca6ad + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/libreadline-8.1.001-1-x86_64.pkg.tar.zst" + SHA512 4104eb0c18b8c06ab3bd4ba6420e3464df8293bec673c88da49e2f74cf1d583c922e9ead5691271fe593d424f92d1fd8668a3002174d756993d5b18337459bab + DEPS ncurses + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/ncurses-6.2-2-x86_64.pkg.tar.zst" + SHA512 4bf744a21ab2030ea9d65eb4d824ec5bed4532b7a489859e5e19bba11b5ba9be08613de48acb38baacfd2a7295722e4d858d7c577565f1999d2583defbbb58f2 + DEPS msys2-runtime + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/automake1.16-1.16.3-3-any.pkg.tar.zst" + SHA512 77a195a9fe8680bee55c04b8ecc0e9ee43e2d89607c745098dfac4687f4f853885cabbb005202d70e9a9cdf9facf6849cc47c6b2f25573b5af8201696d926c72 + DEPS perl + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/perl-5.32.1-2-x86_64.pkg.tar.zst" + SHA512 ad21734c05bc7faa809bc4ba761fb41a3b448d31794d1fd3d430cf4afe05ae991aabece4ec9a25718c01cc323d507bf97530533f0a20aabc18a7a2ccc0ae02b1 + DEPS libcrypt + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/libcrypt-2.1-3-x86_64.pkg.tar.zst" + SHA512 15cee333a82b55ff6072b7be30bf1c33c926d8ac21a0a91bc4cbf655b6f547bc29496df5fa288eb47ca2f88af2a4696f9b718394437b65dd06e3d6669ca0c2e5 + DEPS gcc-libs + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/pkg-config-0.29.2-4-x86_64.pkg.tar.zst" + SHA512 9f72c81d8095ca1c341998bc80788f7ce125770ec4252f1eb6445b9cba74db5614caf9a6cc7c0fcc2ac18d4a0f972c49b9f245c3c9c8e588126be6c72a8c1818 + DEPS libiconv + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/make-4.3-3-x86_64.pkg.tar.zst" + SHA512 1d991bfc2f076c8288023c7dd71c65470ad852e0744870368a4ab56644f88c7f6bbeca89dbeb7ac8b2719340cfec737a8bceae49569bbe4e75b6b8ffdcfe76f1 + DEPS libintl msys2-runtime + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/gettext-devel-0.21-1-x86_64.pkg.tar.zst" + SHA512 44444064b9860dbd3cb886812fb20ee97ab04a65616cca497be69c592d5507e7bc66bfe8dbd060a4df9c5d9bb44cb0f231584d65cb04351146d54d15852227af + DEPS gettext + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/gettext-0.21-1-x86_64.pkg.tar.zst" + SHA512 6ef5f4094c4a174550a898cac4f60215d22de09f7e5f72bdb297d18a6f027e6122b4a519aa8d5781f9b0201dcae14ad7910b181b1499d6d8bbeb5a35b3a08581 + DEPS libintl libgettextpo libasprintf tar + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/tar-1.34-2-x86_64.pkg.tar.zst" + SHA512 127a971f5c087500ec4858697205b36ae76dba82307f1bcaaa44e746337d85d97360e46e55ef7fecbfa2a4af428ee26d804fa7d7c2b8ce6de1b86328dd14ef2d + DEPS libiconv libintl + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/libgettextpo-0.21-1-x86_64.pkg.tar.zst" + SHA512 bb217639deadb36734bafb8db5217e654d00b93a3ef366116cc6c9b8b8951abef9a7e9b04be3fae09074cf68576f18575a0d09f3d2f344985606c1449a17222e + DEPS gcc-libs + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/libasprintf-0.21-1-x86_64.pkg.tar.zst" + SHA512 62dde7bfcfea75ea9adb463807d7c128019ffeec0fb23e73bc39f760e45483c61f4f29e89cdbfab1e317d520c83fe3b65306fbd7258fe11ea951612dbee479fe + DEPS gcc-libs + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/findutils-4.8.0-1-x86_64.pkg.tar.zst" + SHA512 74f8750636becefd3675c89957dfb8a244d2db6fec80bf352998edfef93f66d0e2a37d7f2869a79dd197acf2057ccd6aefd12c58e94154765896a432831ab49c + DEPS libintl libiconv + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/libintl-0.21-1-x86_64.pkg.tar.zst" + SHA512 be0242eed25793e86e0560868f76cf06a358ffc0b2beb357e776d6c7819e545ac90f9358b17a85aa598584babe3ab4bb4544e360a28f5cec965f314178b930d1 + DEPS libiconv + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/libiconv-1.16-2-x86_64.pkg.tar.zst" + SHA512 3ab569eca9887ef85e7dd5dbca3143d8a60f7103f370a7ecc979a58a56b0c8dcf1f54ac3df4495bc306bd44bf36ee285aaebbb221c4eebfc912cf47d347d45fc + DEPS gcc-libs + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/gcc-libs-11.2.0-3-x86_64.pkg.tar.zst" + SHA512 be7bb61d1b87eafbb91cf9d0fee3270b9d5e2420c403ea394967941195d52ae248ce4ffde20af41a05310527a920269018f49487be617211a5e340486babd0f8 + DEPS msys2-runtime + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/msys2-runtime-3.2.0-8-x86_64.pkg.tar.zst" + SHA512 fdd86f4ffa6e274d6fef1676a4987971b1f2e1ec556eee947adcb4240dc562180afc4914c2bdecba284012967d3d3cf4d1a392f798a3b32a3668d6678a86e8d3 + ) + + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-numpy-1.20.3-1-any.pkg.tar.zst" + SHA512 ce73d4270942f61963e8307f6bec945d14e3774455684842b8fde836b19a4e9cbf8efd0663ffb28ad872493db70fa3a4e14bd0b248c2067199f4fee94e80e77e + DEPS mingw-w64-x86_64-openblas mingw-w64-x86_64-python + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-openblas-0.3.19-1-any.pkg.tar.zst" + SHA512 0d18a93d7804d6469b8566cf4ad3a7efbdf8a4a4b05d191b23a30e107586423c6338b9f4a5ea2cc93052e6c0336dc82a43c26189c410263a6e705e6f3ebe261a + DEPS mingw-w64-x86_64-gcc-libgfortran mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libwinpthread + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libgfortran-11.2.0-8-any.pkg.tar.zst" + SHA512 8537b55633bc83d81d528378590e417ffe8c26b6c327d8b6d7ba50a8b5f4e090fbe2dc500deb834120edf25ac3c493055f4de2dc64bde061be23ce0f625a8893 + DEPS mingw-w64-x86_64-gcc-libs + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-3.8.9-2-any.pkg.tar.zst" + SHA512 8a45b28b2b0471718bd1ab096958872b18ae3b25f06c30718c54d1edaf04214397330a51776f3e4eee556ac47d9e3aa5e1b211c5df0cf6be3046a6f3a79cfa7d + DEPS mingw-w64-x86_64-bzip2 mingw-w64-x86_64-expat mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libffi mingw-w64-x86_64-mpdecimal mingw-w64-x86_64-ncurses mingw-w64-x86_64-openssl mingw-w64-x86_64-sqlite3 mingw-w64-x86_64-tcl mingw-w64-x86_64-tk mingw-w64-x86_64-xz mingw-w64-x86_64-zlib + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-bzip2-1.0.8-2-any.pkg.tar.zst" + SHA512 4f7ba44189d953d4d00e7bbf5a7697233f759c92847c074f0f2888d2a641c59ce4bd3c39617adac0ad7b53c5836e529f9ffd889f976444016976bb517e5c24a2 + DEPS mingw-w64-x86_64-gcc-libs + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpdecimal-2.5.1-1-any.pkg.tar.zst" + SHA512 1204c31367f9268ffd6658be04af7687c01f984c9d6be8c7a20ee0ebde1ca9a03b766ef1aeb1fa7aaa97b88a57f7a73afa7f7a7fed9c6b895a032db11e6133bf + DEPS mingw-w64-x86_64-gcc-libs + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-ncurses-6.3-3-any.pkg.tar.zst" + SHA512 888c155d878651dc31c9a01455ab689d7b644cec759521b69b8399c20b6ddc77c90f3ee4ddeed8857084335335b4b30e182d826fb5b78719b704f13a1dfdbd54 + DEPS mingw-w64-x86_64-libsystre + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libsystre-1.0.1-4-any.pkg.tar.xz" + SHA512 6540e896636d00d1ea4782965b3fe4d4ef1e32e689a98d25e2987191295b319eb1de2e56be3a4b524ff94f522a6c3e55f8159c1a6f58c8739e90f8e24e2d40d8 + DEPS mingw-w64-x86_64-libtre + ) + z_vcpkg_acquire_msys_declare_package( + NAME "mingw-w64-x86_64-libtre" + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libtre-git-r128.6fb7206-2-any.pkg.tar.xz" + SHA512 d595dbcf3a3b6ed098e46f370533ab86433efcd6b4d3dcf00bbe944ab8c17db7a20f6535b523da43b061f071a3b8aa651700b443ae14ec752ae87500ccc0332d + DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gettext + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-openssl-1.1.1.m-1-any.pkg.tar.zst" + SHA512 9471b0e5b01453f6ee5c92be6e259446c6b5be45d1da8985a4735b3e54c835d9b86286b2af126546419bf968df096442bd4f60f30efa1a901316e3c02b98525f + DEPS mingw-w64-x86_64-ca-certificates mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-zlib + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-ca-certificates-20210119-1-any.pkg.tar.zst" + SHA512 5590ca116d73572eb336ad73ea5df9da34286d8ff8f6b162b38564d0057aa23b74a30858153013324516af26671046addd6bcade221e94e7b8ed5e8f886e1c58 + DEPS mingw-w64-x86_64-p11-kit + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-p11-kit-0.24.1-1-any.pkg.tar.zst" + SHA512 6437919cd61c8b1a59b346bbd93d960adb7f11206e8c0010311d71d0fe9aa03f950ecf08f19a5555b27f481cc0d61b88650b165ae9336ac1a1a0a9be553239b9 + DEPS mingw-w64-x86_64-gettext mingw-w64-x86_64-libffi mingw-w64-x86_64-libtasn1 + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libtasn1-4.18.0-1-any.pkg.tar.zst" + SHA512 2584a6e0bc2b7d145f026487951b8690e3d8e79f475a7b77f95fc27ca9a9f1887fe9303e340ba2635353c4a6f6a2f10a907dd8778e54be7506a15459f616d4a4 + DEPS mingw-w64-x86_64-gcc-libs + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-sqlite3-3.37.2-1-any.pkg.tar.zst" + SHA512 0f83f10b0c8f4699a6b84deb6986fcd471cb80b995561ad793e827f9dd66110d555744918ed91982aec8d9743f6064726dd5eba3e695aa9ab5381ea4f8e76dbe + DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-readline mingw-w64-x86_64-tcl + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-readline-8.1.001-1-any.pkg.tar.zst" + SHA512 b38aef9216ea2ba7edd82ce57a48dbc913b9bdcb44b96b9800342fe097d706ba39c9d5ba08d793d2c3388722479258bb05388ae09d74a1edcaaf9002e9d71853 + DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-termcap + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-termcap-1.3.1-6-any.pkg.tar.zst" + SHA512 602d182ba0f1e20c4c51ae09b327c345bd736e6e4f22cd7d58374ac68c705dd0af97663b9b94d41870457f46bb9110abb29186d182196133618fc460f71d1300 + DEPS mingw-w64-x86_64-gcc-libs + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tk-8.6.11.1-2-any.pkg.tar.zst" + SHA512 15fd4e085fabe2281f33c8f36f4b1b0be132e5b100f6d4eaf54688842791aa2cf4e6d38a855f74f42be3f86c52e20044518f5843f8e9ca13c54a6ea4adb973a8 + DEPS mingw-w64-x86_64-tcl + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tcl-8.6.11-5-any.pkg.tar.zst" + SHA512 9db75ff47260ea3652d1abf60cd44649d0e8cbe5c4d26c316b99a6edb08252fb87ed017c856f151da99bcaa0bd90c0bebae28234035b008c5bd6508511639852 + DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-zlib + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-xz-5.2.5-2-any.pkg.tar.zst" + SHA512 94fcf8b9f9fbc2cfdb2ed53dbe72797806aa3399c4dcfea9c6204702c4504eb4d4204000accd965fcd0680d994bf947eae308bc576e629bbaa3a4cefda3aea52 + DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gettext + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gettext-0.21-3-any.pkg.tar.zst" + SHA512 38daa0edd1a2c1efdd56baeb6805d10501a57e0c8ab98942e4a16f8b021908dac315513ea85f5278adf300bce3052a44a3f8b473adb0d5d3656aa4a48fe61081 + DEPS mingw-w64-x86_64-expat mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libiconv + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-11.2.0-8-any.pkg.tar.zst" + SHA512 2481f7c8db7cca549911bc71715af86ca287ffed6d673c9a6c3a4c792b68899a129dd959214af7067f434e74fc518c43749e7d928cbd2232ab4fbc65880dad98 + DEPS mingw-w64-x86_64-gmp mingw-w64-x86_64-libwinpthread mingw-w64-x86_64-mpc mingw-w64-x86_64-mpfr + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpc-1.2.1-1-any.pkg.tar.zst" + SHA512 f2c137dbb0b6feea68dde9739c38b44dcb570324e3947adf991028e8f63c9ff50a11f47be15b90279ff40bcac7f320d952cfc14e69ba8d02cf8190c848d976a1 + DEPS mingw-w64-x86_64-mpfr + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpfr-4.1.0-3-any.pkg.tar.zst" + SHA512 be8ad04e53804f18cfeec5b9cba1877af1516762de60891e115826fcfe95166751a68e24cdf351a021294e3189c31ce3c2db0ebf9c1d4d4ab6fea1468f73ced5 + DEPS mingw-w64-x86_64-gmp + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gmp-6.2.1-3-any.pkg.tar.zst" + SHA512 d0d4ed1a046b64f437e72bbcf722b30311dde5f5e768a520141423fc0a3127b116bd62cfd4b5cf5c01a71ee0f9cf6479fcc31277904652d8f6ddbf16e33e0b72 + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-expat-2.4.4-1-any.pkg.tar.zst" + SHA512 479e6591d06eee2686591d7232a60d4092540deb40cf0c2c418de861b1da6b21fb4be82e603dd4a3b88f5a1b1d21cdb4f016780dda8131e32be5c3dec85dfc4d + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libffi-3.3-4-any.pkg.tar.zst" + SHA512 1d7be396ef132289be0c33792c4e81dea6cb7b1eafa249fb3e8abc0b393d14e5114905c0c0262b6a7aed8f196ae4d7a10fbafd342b08ec76c9196921332747b5 + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libiconv-1.16-2-any.pkg.tar.zst" + SHA512 542ed5d898a57a79d3523458f8f3409669b411f87d0852bb566d66f75c96422433f70628314338993461bcb19d4bfac4dadd9d21390cb4d95ef0445669288658 + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zlib-1.2.11-9-any.pkg.tar.zst" + SHA512 f386d3a8d8c169a62a4580af074b7fdc0760ef0fde22ef7020a349382dd374a9e946606c757d12da1c1fe68baf5e2eaf459446e653477035a63e0e20df8f4aa0 + ) + z_vcpkg_acquire_msys_declare_package( + NAME "mingw-w64-x86_64-libwinpthread" + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + SHA512 a2c9e60d23b1310a6cec1fadd2b15a8c07223f3fe90d41b1579e9fc27ee2b0b408456291a55fad54a156e6a247efc20f6fcc247cc567e64fe190938aa3b672e9 + ) + + if(NOT Z_VCPKG_MSYS_PACKAGES STREQUAL "") + message(FATAL_ERROR "Unknown packages were required for vcpkg_acquire_msys(${arg_PACKAGES}): ${packages} +This can be resolved by explicitly passing URL/SHA pairs to DIRECT_PACKAGES.") + endif() + + string(SHA512 total_hash "${Z_VCPKG_MSYS_TOTAL_HASH}") + string(SUBSTRING "${total_hash}" 0 16 total_hash) + set(path_to_root "${DOWNLOADS}/tools/msys2/${total_hash}") + if(NOT EXISTS "${path_to_root}") + file(REMOVE_RECURSE "${path_to_root}.tmp") + file(MAKE_DIRECTORY "${path_to_root}.tmp/tmp") + set(index 0) + foreach(archive IN LISTS Z_VCPKG_MSYS_ARCHIVES) + vcpkg_execute_required_process( + ALLOW_IN_DOWNLOAD_MODE + COMMAND "${CMAKE_COMMAND}" -E tar xzf "${archive}" + LOGNAME "msys-${TARGET_TRIPLET}-${index}" + WORKING_DIRECTORY "${path_to_root}.tmp" + ) + math(EXPR index "${index} + 1") + endforeach() + file(RENAME "${path_to_root}.tmp" "${path_to_root}") + endif() + # Due to skipping the regular MSYS2 installer, + # some config files need to be established explicitly. + if(NOT EXISTS "${path_to_root}/etc/fstab") + # This fstab entry removes the cygdrive prefix from paths. + file(WRITE "${path_to_root}/etc/fstab" "none / cygdrive binary,posix=0,noacl,user 0 0") + endif() + message(STATUS "Using msys root at ${path_to_root}") + set("${out_msys_root}" "${path_to_root}" PARENT_SCOPE) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_add_to_path.cmake b/externals/vcpkg/scripts/cmake/vcpkg_add_to_path.cmake new file mode 100755 index 000000000..1ea11a665 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_add_to_path.cmake @@ -0,0 +1,10 @@ +function(vcpkg_add_to_path) + cmake_parse_arguments(PARSE_ARGV 0 "arg" "PREPEND" "" "") + if(arg_PREPEND) + set(operation PREPEND) + else() + set(operation APPEND) + endif() + + vcpkg_host_path_list("${operation}" ENV{PATH} ${arg_UNPARSED_ARGUMENTS}) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_apply_patches.cmake b/externals/vcpkg/scripts/cmake/vcpkg_apply_patches.cmake new file mode 100755 index 000000000..1a3756ec5 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_apply_patches.cmake @@ -0,0 +1,17 @@ +function(vcpkg_apply_patches) + z_vcpkg_deprecation_message("vcpkg_apply_patches has been deprecated in favor of the `PATCHES` argument to `vcpkg_from_*`.") + + cmake_parse_arguments(PARSE_ARGV 0 "arg" "QUIET" "SOURCE_PATH" "PATCHES") + + if(arg_QUIET) + set(quiet "QUIET") + else() + set(quiet) + endif() + + z_vcpkg_apply_patches( + SOURCE_PATH "${arg_SOURCE_PATH}" + ${quiet} + PATCHES ${arg_PATCHES} + ) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_backup_restore_env_vars.cmake b/externals/vcpkg/scripts/cmake/vcpkg_backup_restore_env_vars.cmake new file mode 100755 index 000000000..63220f434 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_backup_restore_env_vars.cmake @@ -0,0 +1,35 @@ +function(vcpkg_backup_env_variables) + cmake_parse_arguments(PARSE_ARGV 0 arg "" "" "VARS") + if(NOT DEFINED arg_VARS) + message(FATAL_ERROR "VARS must be defined.") + endif() + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + foreach(envvar IN LISTS arg_VARS) + if(DEFINED ENV{${envvar}}) + set("z_vcpkg_env_backup_${envvar}" "$ENV{${envvar}}" PARENT_SCOPE) + else() + unset("z_vcpkg_env_backup_${envvar}" PARENT_SCOPE) + endif() + endforeach() +endfunction() + +function(vcpkg_restore_env_variables) + cmake_parse_arguments(PARSE_ARGV 0 arg "" "" "VARS") + if(NOT DEFINED arg_VARS) + message(FATAL_ERROR "VARS must be defined.") + endif() + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + foreach(envvar IN LISTS arg_VARS) + if(DEFINED z_vcpkg_env_backup_${envvar}) + set("ENV{${envvar}}" "${z_vcpkg_env_backup_${envvar}}") + else() + unset("ENV{${envvar}}") + endif() + endforeach() +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_build_cmake.cmake b/externals/vcpkg/scripts/cmake/vcpkg_build_cmake.cmake new file mode 100755 index 000000000..592f6508e --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_build_cmake.cmake @@ -0,0 +1,95 @@ +function(vcpkg_build_cmake) + cmake_parse_arguments(PARSE_ARGV 0 "arg" + "DISABLE_PARALLEL;ADD_BIN_TO_PATH" + "TARGET;LOGFILE_ROOT" + "" + ) + + if(Z_VCPKG_CMAKE_BUILD_GUARD) + message(FATAL_ERROR "The ${PORT} port already depends on vcpkg-cmake; using both vcpkg-cmake and vcpkg_build_cmake in the same port is unsupported.") + endif() + + if(NOT DEFINED arg_LOGFILE_ROOT) + set(arg_LOGFILE_ROOT "build") + endif() + + vcpkg_list(SET build_param) + vcpkg_list(SET parallel_param) + vcpkg_list(SET no_parallel_param) + + if("${Z_VCPKG_CMAKE_GENERATOR}" STREQUAL "Ninja") + vcpkg_list(SET build_param "-v") # verbose output + vcpkg_list(SET parallel_param "-j${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_param "-j1") + elseif("${Z_VCPKG_CMAKE_GENERATOR}" MATCHES "^Visual Studio") + vcpkg_list(SET build_param + "/p:VCPkgLocalAppDataDisabled=true" + "/p:UseIntelMKL=No" + ) + vcpkg_list(SET parallel_param "/m") + elseif("${Z_VCPKG_CMAKE_GENERATOR}" STREQUAL "NMake Makefiles") + # No options are currently added for nmake builds + elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Unix Makefiles") + vcpkg_list(SET build_args "VERBOSE=1") + vcpkg_list(SET parallel_args "-j${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_args "") + elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Xcode") + vcpkg_list(SET parallel_args -jobs "${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_args -jobs 1) + else() + message(FATAL_ERROR "Unrecognized GENERATOR setting from vcpkg_configure_cmake(). Valid generators are: Ninja, Visual Studio, and NMake Makefiles") + endif() + + vcpkg_list(SET target_param) + if(arg_TARGET) + vcpkg_list(SET target_param "--target" "${arg_TARGET}") + endif() + + foreach(build_type IN ITEMS debug release) + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "${build_type}") + if("${build_type}" STREQUAL "debug") + set(short_build_type "dbg") + set(config "Debug") + else() + set(short_build_type "rel") + set(config "Release") + endif() + + message(STATUS "Building ${TARGET_TRIPLET}-${short_build_type}") + + if(arg_ADD_BIN_TO_PATH) + vcpkg_backup_env_variables(VARS PATH) + if("${build_type}" STREQUAL "debug") + vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin") + else() + vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin") + endif() + endif() + + if(arg_DISABLE_PARALLEL) + vcpkg_execute_build_process( + COMMAND + "${CMAKE_COMMAND}" --build . --config "${config}" ${target_param} + -- ${build_param} ${no_parallel_param} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_build_type}" + LOGNAME "${arg_LOGFILE_ROOT}-${TARGET_TRIPLET}-${short_build_type}" + ) + else() + vcpkg_execute_build_process( + COMMAND + "${CMAKE_COMMAND}" --build . --config "${config}" ${target_param} + -- ${build_param} ${parallel_param} + NO_PARALLEL_COMMAND + "${CMAKE_COMMAND}" --build . --config "${config}" ${target_param} + -- ${build_param} ${no_parallel_param} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_build_type}" + LOGNAME "${arg_LOGFILE_ROOT}-${TARGET_TRIPLET}-${short_build_type}" + ) + endif() + + if(arg_ADD_BIN_TO_PATH) + vcpkg_restore_env_variables(VARS PATH) + endif() + endif() + endforeach() +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_build_make.cmake b/externals/vcpkg/scripts/cmake/vcpkg_build_make.cmake new file mode 100755 index 000000000..11e4072cc --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_build_make.cmake @@ -0,0 +1,203 @@ +function(vcpkg_build_make) + z_vcpkg_get_cmake_vars(cmake_vars_file) + include("${cmake_vars_file}") + + # parse parameters such that semicolons in options arguments to COMMAND don't get erased + cmake_parse_arguments(PARSE_ARGV 0 arg + "ADD_BIN_TO_PATH;ENABLE_INSTALL;DISABLE_PARALLEL" + "LOGFILE_ROOT;BUILD_TARGET;SUBPATH;MAKEFILE;INSTALL_TARGET" + "OPTIONS" + ) + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "vcpkg_make_build was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + if(NOT DEFINED arg_LOGFILE_ROOT) + set(arg_LOGFILE_ROOT "build") + endif() + + if(NOT DEFINED arg_BUILD_TARGET) + set(arg_BUILD_TARGET "all") + endif() + + if (NOT DEFINED arg_MAKEFILE) + set(arg_MAKEFILE Makefile) + endif() + + if(NOT DEFINED arg_INSTALL_TARGET) + set(arg_INSTALL_TARGET "install") + endif() + + if(WIN32) + set(Z_VCPKG_INSTALLED ${CURRENT_INSTALLED_DIR}) + else() + string(REPLACE " " "\ " Z_VCPKG_INSTALLED "${CURRENT_INSTALLED_DIR}") + endif() + + vcpkg_list(SET make_opts) + vcpkg_list(SET install_opts) + if (CMAKE_HOST_WIN32) + set(path_backup "$ENV{PATH}") + vcpkg_add_to_path(PREPEND "${SCRIPTS}/buildsystems/make_wrapper") + if(NOT DEFINED Z_VCPKG_MAKE) + vcpkg_acquire_msys(MSYS_ROOT) + find_program(Z_VCPKG_MAKE make PATHS "${MSYS_ROOT}/usr/bin" NO_DEFAULT_PATH REQUIRED) + endif() + set(make_command "${Z_VCPKG_MAKE}") + vcpkg_list(SET make_opts ${arg_OPTIONS} ${arg_MAKE_OPTIONS} -j ${VCPKG_CONCURRENCY} --trace -f ${arg_MAKEFILE} ${arg_BUILD_TARGET}) + vcpkg_list(SET no_parallel_make_opts ${arg_OPTIONS} ${arg_MAKE_OPTIONS} -j 1 --trace -f ${arg_MAKEFILE} ${arg_BUILD_TARGET}) + + string(REPLACE " " [[\ ]] vcpkg_package_prefix "${CURRENT_PACKAGES_DIR}") + string(REGEX REPLACE [[([a-zA-Z]):/]] [[/\1/]] vcpkg_package_prefix "${vcpkg_package_prefix}") + vcpkg_list(SET install_opts -j ${VCPKG_CONCURRENCY} --trace -f ${arg_MAKEFILE} ${arg_INSTALL_TARGET} DESTDIR=${vcpkg_package_prefix}) + #TODO: optimize for install-data (release) and install-exec (release/debug) + + else() + if(VCPKG_HOST_IS_OPENBSD) + find_program(Z_VCPKG_MAKE gmake REQUIRED) + else() + find_program(Z_VCPKG_MAKE make REQUIRED) + endif() + set(make_command "${Z_VCPKG_MAKE}") + vcpkg_list(SET make_opts ${arg_MAKE_OPTIONS} V=1 -j ${VCPKG_CONCURRENCY} -f ${arg_MAKEFILE} ${arg_BUILD_TARGET}) + vcpkg_list(SET no_parallel_make_opts ${arg_MAKE_OPTIONS} V=1 -j 1 -f ${arg_MAKEFILE} ${arg_BUILD_TARGET}) + vcpkg_list(SET install_opts -j ${VCPKG_CONCURRENCY} -f ${arg_MAKEFILE} ${arg_INSTALL_TARGET} DESTDIR=${CURRENT_PACKAGES_DIR}) + endif() + + # Since includes are buildtype independent those are setup by vcpkg_configure_make + vcpkg_backup_env_variables(VARS LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH CPPFLAGS CFLAGS CXXFLAGS RCFLAGS) + + foreach(buildtype IN ITEMS "debug" "release") + if (buildtype STREQUAL "debug" AND _VCPKG_MAKE_NO_DEBUG) + continue() + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "${buildtype}") + if("${buildtype}" STREQUAL "debug") + set(short_buildtype "-dbg") + set(cmake_buildtype "DEBUG") + set(path_suffix "/debug") + else() + # In NO_DEBUG mode, we only use ${TARGET_TRIPLET} directory. + set(short_buildtype "-rel") + set(cmake_buildtype "RELEASE") + set(path_suffix "") + endif() + + set(working_directory "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${short_buildtype}/${arg_SUBPATH}") + message(STATUS "Building ${TARGET_TRIPLET}${short_buildtype}") + + z_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags("${cmake_buildtype}") + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(LINKER_FLAGS_${cmake_buildtype} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${cmake_buildtype}}") + else() # dynamic + set(LINKER_FLAGS_${cmake_buildtype} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${cmake_buildtype}}") + endif() + set(LDFLAGS_${cmake_buildtype} "") + if(EXISTS "${Z_VCPKG_INSTALLED}${path_suffix}/lib") + string(APPEND LDFLAGS_${cmake_buildtype} " -L${Z_VCPKG_INSTALLED}${path_suffix}/lib") + endif() + if(EXISTS "${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link") + string(APPEND LDFLAGS_${cmake_buildtype} " -L${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link") + endif() + if (CMAKE_HOST_WIN32 AND VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "cl.exe") + set(LINK_ENV_${cmake_buildtype} "$ENV{_LINK_} ${LINKER_FLAGS_${cmake_buildtype}}") + else() + string(APPEND LDFLAGS_${cmake_buildtype} " ${LINKER_FLAGS_${cmake_buildtype}}") + endif() + + # Setup environment + set(ENV{CPPFLAGS} "${CPPFLAGS_${cmake_buildtype}}") + set(ENV{CFLAGS} "${CFLAGS_${cmake_buildtype}}") + set(ENV{CXXFLAGS} "${CXXFLAGS_${cmake_buildtype}}") + set(ENV{RCFLAGS} "${VCPKG_DETECTED_CMAKE_RC_FLAGS_${cmake_buildtype}}") + set(ENV{LDFLAGS} "${LDFLAGS_${cmake_buildtype}}") + vcpkg_list(APPEND lib_env_vars LIB LIBPATH LIBRARY_PATH) # LD_LIBRARY_PATH) + foreach(lib_env_var IN LISTS lib_env_vars) + if(EXISTS "${Z_VCPKG_INSTALLED}${path_suffix}/lib") + vcpkg_host_path_list(PREPEND ENV{${lib_env_var}} "${Z_VCPKG_INSTALLED}${path_suffix}/lib") + endif() + if(EXISTS "${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link") + vcpkg_host_path_list(PREPEND ENV{${lib_env_var}} "${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link") + endif() + endforeach() + unset(lib_env_vars) + + if(LINK_ENV_${cmake_buildtype}) + set(config_link_backup "$ENV{_LINK_}") + set(ENV{_LINK_} "${LINK_ENV_${cmake_buildtype}}") + endif() + + if(arg_ADD_BIN_TO_PATH) + set(env_backup_path "$ENV{PATH}") + vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}${path_suffix}/bin") + endif() + + vcpkg_list(SET make_cmd_line ${make_command} ${make_opts}) + vcpkg_list(SET no_parallel_make_cmd_line ${make_command} ${no_parallel_make_opts}) + + if (arg_DISABLE_PARALLEL) + vcpkg_execute_build_process( + COMMAND ${no_parallel_make_cmd_line} + WORKING_DIRECTORY "${working_directory}" + LOGNAME "${arg_LOGFILE_ROOT}-${TARGET_TRIPLET}${short_buildtype}" + ) + else() + vcpkg_execute_build_process( + COMMAND ${make_cmd_line} + NO_PARALLEL_COMMAND ${no_parallel_make_cmd_line} + WORKING_DIRECTORY "${working_directory}" + LOGNAME "${arg_LOGFILE_ROOT}-${TARGET_TRIPLET}${short_buildtype}" + ) + endif() + + file(READ "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_ROOT}-${TARGET_TRIPLET}${short_buildtype}-out.log" logdata) + if(logdata MATCHES "Warning: linker path does not have real file for library") + message(FATAL_ERROR "libtool could not find a file being linked against!") + endif() + + if (arg_ENABLE_INSTALL) + message(STATUS "Installing ${TARGET_TRIPLET}${short_buildtype}") + vcpkg_list(SET make_cmd_line ${make_command} ${install_opts}) + vcpkg_execute_build_process( + COMMAND ${make_cmd_line} + WORKING_DIRECTORY "${working_directory}" + LOGNAME "install-${TARGET_TRIPLET}${short_buildtype}" + ) + endif() + + if(config_link_backup) + set(ENV{_LINK_} "${config_link_backup}") + unset(config_link_backup) + endif() + + if(arg_ADD_BIN_TO_PATH) + set(ENV{PATH} "${env_backup_path}") + endif() + endif() + + vcpkg_restore_env_variables(VARS LIB LIBPATH LIBRARY_PATH) + endforeach() + + if (arg_ENABLE_INSTALL) + string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" Z_VCPKG_INSTALL_PREFIX "${CURRENT_INSTALLED_DIR}") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}_tmp") + file(RENAME "${CURRENT_PACKAGES_DIR}" "${CURRENT_PACKAGES_DIR}_tmp") + file(RENAME "${CURRENT_PACKAGES_DIR}_tmp${Z_VCPKG_INSTALL_PREFIX}" "${CURRENT_PACKAGES_DIR}") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}_tmp") + endif() + + # Remove libtool files since they contain absolute paths and are not necessary. + file(GLOB_RECURSE libtool_files "${CURRENT_PACKAGES_DIR}/**/*.la") + if(libtool_files) + file(REMOVE ${libtool_files}) + endif() + + if (CMAKE_HOST_WIN32) + set(ENV{PATH} "${path_backup}") + endif() + + vcpkg_restore_env_variables(VARS LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH CPPFLAGS CFLAGS CXXFLAGS RCFLAGS) + unset(_VCPKG_MAKE_NO_DEBUG PARENT_SCOPE) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_build_msbuild.cmake b/externals/vcpkg/scripts/cmake/vcpkg_build_msbuild.cmake new file mode 100755 index 000000000..90fb313c9 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_build_msbuild.cmake @@ -0,0 +1,87 @@ +function(vcpkg_build_msbuild) + cmake_parse_arguments( + PARSE_ARGV 0 + arg + "USE_VCPKG_INTEGRATION" + "PROJECT_PATH;RELEASE_CONFIGURATION;DEBUG_CONFIGURATION;PLATFORM;PLATFORM_TOOLSET;TARGET_PLATFORM_VERSION;TARGET" + "OPTIONS;OPTIONS_RELEASE;OPTIONS_DEBUG" + ) + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "vcpkg_build_msbuild was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + if(NOT DEFINED arg_RELEASE_CONFIGURATION) + set(arg_RELEASE_CONFIGURATION Release) + endif() + if(NOT DEFINED arg_DEBUG_CONFIGURATION) + set(arg_DEBUG_CONFIGURATION Debug) + endif() + if(NOT DEFINED arg_PLATFORM) + set(arg_PLATFORM "${TRIPLET_SYSTEM_ARCH}") + endif() + if(NOT DEFINED arg_PLATFORM_TOOLSET) + set(arg_PLATFORM_TOOLSET "${VCPKG_PLATFORM_TOOLSET}") + endif() + if(NOT DEFINED arg_TARGET_PLATFORM_VERSION) + vcpkg_get_windows_sdk(arg_TARGET_PLATFORM_VERSION) + endif() + if(NOT DEFINED arg_TARGET) + set(arg_TARGET Rebuild) + endif() + + list(APPEND arg_OPTIONS + "/t:${arg_TARGET}" + "/p:Platform=${arg_PLATFORM}" + "/p:PlatformToolset=${arg_PLATFORM_TOOLSET}" + "/p:VCPkgLocalAppDataDisabled=true" + "/p:UseIntelMKL=No" + "/p:WindowsTargetPlatformVersion=${arg_TARGET_PLATFORM_VERSION}" + "/p:VcpkgManifestInstall=false" + "/p:VcpkgManifestEnabled=false" + "/m" + ) + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # Disable LTCG for static libraries because this setting introduces ABI incompatibility between minor compiler versions + # TODO: Add a way for the user to override this if they want to opt-in to incompatibility + list(APPEND arg_OPTIONS "/p:WholeProgramOptimization=false") + endif() + + if(arg_USE_VCPKG_INTEGRATION) + list( + APPEND arg_OPTIONS + "/p:ForceImportBeforeCppTargets=${SCRIPTS}/buildsystems/msbuild/vcpkg.targets" + "/p:VcpkgTriplet=${TARGET_TRIPLET}" + "/p:VcpkgInstalledDir=${_VCPKG_INSTALLED_DIR}" + ) + else() + list(APPEND arg_OPTIONS "/p:VcpkgEnabled=false") + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + message(STATUS "Building ${arg_PROJECT_PATH} for Release") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + vcpkg_execute_required_process( + COMMAND msbuild "${arg_PROJECT_PATH}" + "/p:Configuration=${arg_RELEASE_CONFIGURATION}" + ${arg_OPTIONS} + ${arg_OPTIONS_RELEASE} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + LOGNAME "build-${TARGET_TRIPLET}-rel" + ) + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + message(STATUS "Building ${arg_PROJECT_PATH} for Debug") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + vcpkg_execute_required_process( + COMMAND msbuild "${arg_PROJECT_PATH}" + "/p:Configuration=${arg_DEBUG_CONFIGURATION}" + ${arg_OPTIONS} + ${arg_OPTIONS_DEBUG} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + LOGNAME "build-${TARGET_TRIPLET}-dbg" + ) + endif() +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_build_ninja.cmake b/externals/vcpkg/scripts/cmake/vcpkg_build_ninja.cmake new file mode 100755 index 000000000..a06f35024 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_build_ninja.cmake @@ -0,0 +1,30 @@ +function(z_vcpkg_build_ninja_build config targets) + message(STATUS "Building (${config})...") + vcpkg_execute_build_process( + COMMAND "${NINJA}" -C "${CURRENT_BUILDTREES_DIR}/${config}" ${targets} + WORKING_DIRECTORY "${SOURCE_PATH}" + LOGNAME "build-${config}" + ) +endfunction() + + +function(vcpkg_build_ninja) + cmake_parse_arguments(PARSE_ARGV 0 arg "" "" "TARGETS") + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + if(NOT DEFINED arg_TARGETS) + set(arg_TARGETS "") + endif() + + vcpkg_find_acquire_program(NINJA) + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + z_vcpkg_build_ninja_build("${TARGET_TRIPLET}-dbg" "${arg_TARGETS}") + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + z_vcpkg_build_ninja_build("${TARGET_TRIPLET}-rel" "${arg_TARGETS}") + endif() +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_build_nmake.cmake b/externals/vcpkg/scripts/cmake/vcpkg_build_nmake.cmake new file mode 100755 index 000000000..54b132b31 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_build_nmake.cmake @@ -0,0 +1,127 @@ +function(vcpkg_build_nmake) + cmake_parse_arguments(PARSE_ARGV 0 arg + "ADD_BIN_TO_PATH;ENABLE_INSTALL;NO_DEBUG" + "SOURCE_PATH;PROJECT_SUBPATH;PROJECT_NAME;LOGFILE_ROOT" + "OPTIONS;OPTIONS_RELEASE;OPTIONS_DEBUG;PRERUN_SHELL;PRERUN_SHELL_DEBUG;PRERUN_SHELL_RELEASE;TARGET" + ) + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + if(NOT DEFINED arg_SOURCE_PATH) + message(FATAL_ERROR "SOURCE_PATH must be specified") + endif() + + if(arg_NO_DEBUG) + message(WARNING "NO_DEBUG argument to ${CMAKE_CURRENT_FUNCTION} is deprecated") + endif() + if(arg_ADD_BIN_TO_PATH) + message(WARNING "ADD_BIN_TO_PATH argument to ${CMAKE_CURRENT_FUNCTION} is deprecated - it never did anything") + endif() + + if(NOT VCPKG_HOST_IS_WINDOWS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} only support windows.") + endif() + + if(NOT DEFINED arg_LOGFILE_ROOT) + set(arg_LOGFILE_ROOT "build") + endif() + if(NOT DEFINED arg_PROJECT_NAME) + set(arg_PROJECT_NAME makefile.vc) + endif() + if(NOT DEFINED arg_TARGET) + vcpkg_list(SET arg_TARGET all) + endif() + + find_program(NMAKE nmake REQUIRED) + get_filename_component(NMAKE_EXE_PATH ${NMAKE} DIRECTORY) + # Load toolchains + if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") + endif() + include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") + # Set needed env + set(ENV{PATH} "$ENV{PATH};${NMAKE_EXE_PATH}") + set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;$ENV{INCLUDE}") + # Set make command and install command + vcpkg_list(SET make_command ${NMAKE} /NOLOGO /G /U) + vcpkg_list(SET make_opts_base -f "${arg_PROJECT_NAME}" ${arg_TARGET}) + if(arg_ENABLE_INSTALL) + vcpkg_list(APPEND make_opts_base install) + endif() + + + # Add subpath to work directory + if(DEFINED arg_PROJECT_SUBPATH) + set(project_subpath "/${arg_PROJECT_SUBPATH}") + else() + set(project_subpath "") + endif() + + vcpkg_backup_env_variables(VARS CL) + cmake_path(NATIVE_PATH CURRENT_PACKAGES_DIR NORMALIZE install_dir_native) + foreach(build_type IN ITEMS debug release) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL build_type) + if(build_type STREQUAL "debug") + # Generate obj dir suffix + set(short_build_type "-dbg") + # Add install command and arguments + set(make_opts "${make_opts_base}") + if (arg_ENABLE_INSTALL) + vcpkg_list(APPEND make_opts "INSTALLDIR=${install_dir_native}\\debug") + endif() + vcpkg_list(APPEND make_opts ${arg_OPTIONS} ${arg_OPTIONS_DEBUG}) + set(ENV{CL} "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") + + set(prerun_variable_name arg_PRERUN_SHELL_DEBUG) + else() + set(short_build_type "-rel") + # Add install command and arguments + set(make_opts "${make_opts_base}") + if (arg_ENABLE_INSTALL) + vcpkg_list(APPEND make_opts "INSTALLDIR=${install_dir_native}") + endif() + vcpkg_list(APPEND make_opts ${arg_OPTIONS} ${arg_OPTIONS_RELEASE}) + + set(ENV{CL} "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") + set(prerun_variable_name arg_PRERUN_SHELL_RELEASE) + endif() + + set(triplet_and_build_type "${TARGET_TRIPLET}${short_build_type}") + set(object_dir "${CURRENT_BUILDTREES_DIR}/${triplet_and_build_type}") + + file(REMOVE_RECURSE "${object_dir}") + file(COPY "${arg_SOURCE_PATH}/" DESTINATION "${object_dir}") + + if(DEFINED arg_PRERUN_SHELL) + message(STATUS "Prerunning ${triplet_and_build_type}") + vcpkg_execute_required_process( + COMMAND ${arg_PRERUN_SHELL} + WORKING_DIRECTORY "${object_dir}${project_subpath}" + LOGNAME "prerun-${triplet_and_build_type}" + ) + endif() + if(DEFINED "${prerun_variable_name}") + message(STATUS "Prerunning ${triplet_and_build_type}") + vcpkg_execute_required_process( + COMMAND ${${prerun_variable_name}} + WORKING_DIRECTORY "${object_dir}${project_subpath}" + LOGNAME "prerun-specific-${triplet_and_build_type}" + ) + endif() + + if (NOT arg_ENABLE_INSTALL) + message(STATUS "Building ${triplet_and_build_type}") + else() + message(STATUS "Building and installing ${triplet_and_build_type}") + endif() + + vcpkg_execute_build_process( + COMMAND ${make_command} ${make_opts} + WORKING_DIRECTORY "${object_dir}${project_subpath}" + LOGNAME "${arg_LOGFILE_ROOT}-${triplet_and_build_type}" + ) + + vcpkg_restore_env_variables(VARS CL) + endif() + endforeach() +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_build_qmake.cmake b/externals/vcpkg/scripts/cmake/vcpkg_build_qmake.cmake new file mode 100755 index 000000000..c64a9f274 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_build_qmake.cmake @@ -0,0 +1,81 @@ +function(z_run_jom_build invoke_command targets log_prefix log_suffix) + message(STATUS "Package ${log_prefix}-${TARGET_TRIPLET}-${log_suffix}") + vcpkg_execute_build_process( + COMMAND "${invoke_command}" -j ${VCPKG_CONCURRENCY} ${targets} + NO_PARALLEL_COMMAND "${invoke_command}" -j 1 ${targets} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${log_suffix}" + LOGNAME "package-${log_prefix}-${TARGET_TRIPLET}-${log_suffix}" + ) +endfunction() + +function(vcpkg_build_qmake) + # parse parameters such that semicolons in options arguments to COMMAND don't get erased + cmake_parse_arguments(PARSE_ARGV 0 arg + "SKIP_MAKEFILES" + "BUILD_LOGNAME" + "TARGETS;RELEASE_TARGETS;DEBUG_TARGETS" + ) + + # Make sure that the linker finds the libraries used + vcpkg_backup_env_variables(VARS PATH LD_LIBRARY_PATH CL _CL_) + + # This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings + set(ENV{_CL_} "/utf-8") + + if(CMAKE_HOST_WIN32) + if (VCPKG_QMAKE_USE_NMAKE) + find_program(NMAKE nmake) + set(invoke_command "${NMAKE}") + get_filename_component(nmake_exe_path "${NMAKE}" DIRECTORY) + vcpkg_host_path_list(APPEND ENV{PATH} "${nmake_exe_path}") + set(ENV{CL} "$ENV{CL} /MP${VCPKG_CONCURRENCY}") + else() + vcpkg_find_acquire_program(JOM) + set(invoke_command "${JOM}") + endif() + else() + find_program(MAKE make) + set(invoke_command "${MAKE}") + endif() + + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" NATIVE_INSTALLED_DIR) + + if(NOT DEFINED arg_BUILD_LOGNAME) + set(arg_BUILD_LOGNAME build) + endif() + + set(short_name_debug "dbg") + set(path_suffix_debug "/debug") + set(targets_debug "${arg_DEBUG_TARGETS}") + + set(short_name_release "rel") + set(path_suffix_release "") + set(targets_release "${arg_RELEASE_TARGETS}") + + if(NOT DEFINED VCPKG_BUILD_TYPE) + set(items debug release) + else() + set(items release) + endif() + foreach(build_type IN ITEMS ${items}) + set(current_installed_prefix "${CURRENT_INSTALLED_DIR}${path_suffix_${build_type}}") + + vcpkg_add_to_path(PREPEND "${current_installed_prefix}/lib" "${current_installed_prefix}/bin") + + # We set LD_LIBRARY_PATH ENV variable to allow executing Qt tools (rcc,...) even with dynamic linking + if(CMAKE_HOST_UNIX) + set(ENV{LD_LIBRARY_PATH} "") + vcpkg_host_path_list(APPEND ENV{LD_LIBRARY_PATH} "${current_installed_prefix}/lib" "${current_installed_prefix}/lib/manual-link") + endif() + + vcpkg_list(SET targets ${targets_${build_type}} ${arg_TARGETS}) + if(NOT arg_SKIP_MAKEFILES) + z_run_jom_build("${invoke_command}" qmake_all makefiles "${short_name_${build_type}}") + endif() + z_run_jom_build("${invoke_command}" "${targets}" "${arg_BUILD_LOGNAME}" "${short_name_${build_type}}") + + vcpkg_restore_env_variables(VARS PATH LD_LIBRARY_PATH) + endforeach() + + vcpkg_restore_env_variables(VARS CL _CL_) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_buildpath_length_warning.cmake b/externals/vcpkg/scripts/cmake/vcpkg_buildpath_length_warning.cmake new file mode 100755 index 000000000..bb7d6844d --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_buildpath_length_warning.cmake @@ -0,0 +1,8 @@ +function(vcpkg_buildpath_length_warning warning_length) + string(LENGTH "${CURRENT_BUILDTREES_DIR}" buildtrees_path_length) + if(buildtrees_path_length GREATER warning_length AND CMAKE_HOST_WIN32) + message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n" + "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command." + ) + endif() +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_check_features.cmake b/externals/vcpkg/scripts/cmake/vcpkg_check_features.cmake new file mode 100755 index 000000000..d0573d77a --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_check_features.cmake @@ -0,0 +1,95 @@ +function(z_vcpkg_check_features_last_feature out_var features_name features_list) + list(LENGTH features_list features_length) + math(EXPR features_length_mod_2 "${features_length} % 2") + if(NOT features_length_mod_2 EQUAL 0) + message(FATAL_ERROR "vcpkg_check_features has an incorrect number of arguments to ${features_name}") + endif() + + math(EXPR last_feature "${features_length} / 2 - 1") + set("${out_var}" "${last_feature}" PARENT_SCOPE) +endfunction() + +function(z_vcpkg_check_features_get_feature idx features_list out_feature_name out_feature_var) + math(EXPR feature_name_idx "${idx} * 2") + math(EXPR feature_var_idx "${feature_name_idx} + 1") + + list(GET features_list "${feature_name_idx}" feature_name) + list(GET features_list "${feature_var_idx}" feature_var) + + set("${out_feature_name}" "${feature_name}" PARENT_SCOPE) + set("${out_feature_var}" "${feature_var}" PARENT_SCOPE) +endfunction() + +function(vcpkg_check_features) + cmake_parse_arguments( + PARSE_ARGV 0 "arg" + "" + "OUT_FEATURE_OPTIONS;PREFIX" + "FEATURES;INVERTED_FEATURES" + ) + + if(NOT DEFINED arg_OUT_FEATURE_OPTIONS) + message(FATAL_ERROR "OUT_FEATURE_OPTIONS must be defined.") + endif() + if(NOT DEFINED arg_PREFIX) + set(prefix "") + else() + set(prefix "${arg_PREFIX}_") + endif() + + set(feature_options) + set(feature_variables) + + if(NOT DEFINED arg_FEATURES AND NOT DEFINED arg_INVERTED_FEATURES) + message(DEPRECATION +"calling `vcpkg_check_features` without the `FEATURES` keyword has been deprecated. + Please add the `FEATURES` keyword to the call.") + set(arg_FEATURES "${arg_UNPARSED_ARGUMENTS}") + elseif(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "vcpkg_check_features called with unknown arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + + + z_vcpkg_check_features_last_feature(last_feature "FEATURES" "${arg_FEATURES}") + if(last_feature GREATER_EQUAL 0) + foreach(feature_pair_idx RANGE "${last_feature}") + z_vcpkg_check_features_get_feature("${feature_pair_idx}" "${arg_FEATURES}" feature_name feature_var) + + list(APPEND feature_variables "${feature_var}") + if(feature_name IN_LIST FEATURES) + list(APPEND feature_options "-D${feature_var}=ON") + set("${prefix}${feature_var}" ON PARENT_SCOPE) + else() + list(APPEND feature_options "-D${feature_var}=OFF") + set("${prefix}${feature_var}" OFF PARENT_SCOPE) + endif() + endforeach() + endif() + + z_vcpkg_check_features_last_feature(last_inverted_feature "INVERTED_FEATURES" "${arg_INVERTED_FEATURES}") + if(last_inverted_feature GREATER_EQUAL 0) + foreach(feature_pair_idx RANGE "${last_inverted_feature}") + z_vcpkg_check_features_get_feature("${feature_pair_idx}" "${arg_INVERTED_FEATURES}" feature_name feature_var) + + list(APPEND feature_variables "${feature_var}") + if(feature_name IN_LIST FEATURES) + list(APPEND feature_options "-D${feature_var}=OFF") + set("${prefix}${feature_var}" OFF PARENT_SCOPE) + else() + list(APPEND feature_options "-D${feature_var}=ON") + set("${prefix}${feature_var}" ON PARENT_SCOPE) + endif() + endforeach() + endif() + + list(SORT feature_variables) + set(last_variable) + foreach(variable IN LISTS feature_variables) + if(variable STREQUAL last_variable) + message(FATAL_ERROR "vcpkg_check_features passed the same feature variable multiple times: '${variable}'") + endif() + endforeach() + + set("${arg_OUT_FEATURE_OPTIONS}" "${feature_options}" PARENT_SCOPE) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_check_linkage.cmake b/externals/vcpkg/scripts/cmake/vcpkg_check_linkage.cmake new file mode 100755 index 000000000..63242932d --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_check_linkage.cmake @@ -0,0 +1,36 @@ +function(vcpkg_check_linkage) + cmake_parse_arguments(PARSE_ARGV 0 arg + "ONLY_STATIC_LIBRARY;ONLY_DYNAMIC_LIBRARY;ONLY_DYNAMIC_CRT;ONLY_STATIC_CRT" + "" + "" + ) + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + if(arg_ONLY_STATIC_LIBRARY AND arg_ONLY_DYNAMIC_LIBRARY) + message(FATAL_ERROR "Requesting both ONLY_STATIC_LIBRARY and ONLY_DYNAMIC_LIBRARY; this is an error.") + endif() + if(arg_ONLY_STATIC_CRT AND arg_ONLY_DYNAMIC_CRT) + message(FATAL_ERROR "Requesting both ONLY_STATIC_CRT and ONLY_DYNAMIC_CRT; this is an error.") + endif() + + if(arg_ONLY_STATIC_LIBRARY AND "${VCPKG_LIBRARY_LINKAGE}" STREQUAL "dynamic") + message(STATUS "Note: ${PORT} only supports static library linkage. Building static library.") + set(VCPKG_LIBRARY_LINKAGE static PARENT_SCOPE) + elseif(arg_ONLY_DYNAMIC_LIBRARY AND "${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + message(STATUS "Note: ${PORT} only supports dynamic library linkage. Building dynamic library.") + if("${VCPKG_CRT_LINKAGE}" STREQUAL "static") + message(FATAL_ERROR "Refusing to build unexpected dynamic library against the static CRT. + If this is desired, please configure your triplet to directly request this configuration.") + endif() + set(VCPKG_LIBRARY_LINKAGE dynamic PARENT_SCOPE) + endif() + + if(arg_ONLY_DYNAMIC_CRT AND "${VCPKG_CRT_LINKAGE}" STREQUAL "static") + message(FATAL_ERROR "${PORT} only supports dynamic crt linkage") + elseif(arg_ONLY_STATIC_CRT AND "${VCPKG_CRT_LINKAGE}" STREQUAL "dynamic") + message(FATAL_ERROR "${PORT} only supports static crt linkage") + endif() +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_clean_executables_in_bin.cmake b/externals/vcpkg/scripts/cmake/vcpkg_clean_executables_in_bin.cmake new file mode 100755 index 000000000..35cf8a6a3 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_clean_executables_in_bin.cmake @@ -0,0 +1,40 @@ +function(z_vcpkg_clean_executables_in_bin_remove_directory_if_empty directory) + if(NOT EXISTS "${directory}") + return() + endif() + + if(NOT IS_DIRECTORY "${directory}") + message(FATAL_ERROR "${directory} must be a directory") + endif() + + file(GLOB items "${directory}/*") + if("${items}" STREQUAL "") + file(REMOVE_RECURSE "${directory}") + endif() +endfunction() + + +function(vcpkg_clean_executables_in_bin) + cmake_parse_arguments(PARSE_ARGV 0 arg "" "" "FILE_NAMES") + + if(NOT DEFINED arg_FILE_NAMES) + message(FATAL_ERROR "FILE_NAMES must be specified.") + endif() + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + + foreach(file_name IN LISTS arg_FILE_NAMES) + file(REMOVE + "${CURRENT_PACKAGES_DIR}/bin/${file_name}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" + "${CURRENT_PACKAGES_DIR}/debug/bin/${file_name}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" + "${CURRENT_PACKAGES_DIR}/bin/${file_name}.pdb" + "${CURRENT_PACKAGES_DIR}/debug/bin/${file_name}.pdb" + ) + endforeach() + + z_vcpkg_clean_executables_in_bin_remove_directory_if_empty("${CURRENT_PACKAGES_DIR}/bin") + z_vcpkg_clean_executables_in_bin_remove_directory_if_empty("${CURRENT_PACKAGES_DIR}/debug/bin") +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_clean_msbuild.cmake b/externals/vcpkg/scripts/cmake/vcpkg_clean_msbuild.cmake new file mode 100755 index 000000000..904f40ae8 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_clean_msbuild.cmake @@ -0,0 +1,9 @@ +function(vcpkg_clean_msbuild) + if(NOT ARGC EQUAL 0) + message(WARNING "vcpkg_clean_msbuild was passed extra arguments: ${ARGV}") + endif() + file(REMOVE_RECURSE + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + ) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_common_definitions.cmake b/externals/vcpkg/scripts/cmake/vcpkg_common_definitions.cmake new file mode 100755 index 000000000..0a1ef1a96 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_common_definitions.cmake @@ -0,0 +1,189 @@ +string(COMPARE NOTEQUAL "${TARGET_TRIPLET}" "${HOST_TRIPLET}" VCPKG_CROSSCOMPILING) +#Helper variable to identify the Target system. VCPKG_TARGET_IS_ +if (NOT DEFINED VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "") + set(VCPKG_TARGET_IS_WINDOWS ON) +elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(VCPKG_TARGET_IS_WINDOWS ON) + set(VCPKG_TARGET_IS_UWP ON) +elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(VCPKG_TARGET_IS_OSX ON) +elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "iOS") + set(VCPKG_TARGET_IS_IOS ON) +elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(VCPKG_TARGET_IS_LINUX ON) +elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") + set(VCPKG_TARGET_IS_ANDROID ON) +elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + set(VCPKG_TARGET_IS_FREEBSD ON) +elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") + set(VCPKG_TARGET_IS_OPENBSD ON) +elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW") + set(VCPKG_TARGET_IS_WINDOWS ON) + set(VCPKG_TARGET_IS_MINGW ON) +endif() + +#Helper variables to identify the host system name +if (CMAKE_HOST_WIN32) + set(VCPKG_HOST_IS_WINDOWS ON) +elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + set(VCPKG_HOST_IS_OSX ON) +elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") + set(VCPKG_HOST_IS_LINUX ON) +elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") + set(VCPKG_HOST_IS_FREEBSD ON) +elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "OpenBSD") + set(VCPKG_HOST_IS_OPENBSD ON) +endif() + +#Helper variable to identify the host path separator. +if(CMAKE_HOST_WIN32) + set(VCPKG_HOST_PATH_SEPARATOR ";") +elseif(CMAKE_HOST_UNIX) + set(VCPKG_HOST_PATH_SEPARATOR ":") +endif() + +#Helper variables to identify executables on host/target +if(CMAKE_HOST_WIN32) + set(VCPKG_HOST_EXECUTABLE_SUFFIX ".exe") +else() + set(VCPKG_HOST_EXECUTABLE_SUFFIX "") +endif() +#set(CMAKE_EXECUTABLE_SUFFIX ${VCPKG_HOST_EXECUTABLE_SUFFIX}) not required by find_program + +if(VCPKG_TARGET_IS_WINDOWS) + set(VCPKG_TARGET_EXECUTABLE_SUFFIX ".exe") +else() + set(VCPKG_TARGET_EXECUTABLE_SUFFIX "") +endif() + +#Helper variables to identify bundles on host/target +if(VCPKG_HOST_IS_OSX) + set(VCPKG_HOST_BUNDLE_SUFFIX ".app") +else() + set(VCPKG_HOST_BUNDLE_SUFFIX "") +endif() + +if(VCPKG_TARGET_IS_OSX) + set(VCPKG_TARGET_BUNDLE_SUFFIX ".app") +else() + set(VCPKG_TARGET_BUNDLE_SUFFIX "") +endif() + +#Helper variables for libraries +if(VCPKG_TARGET_IS_MINGW) + set(VCPKG_TARGET_STATIC_LIBRARY_SUFFIX ".a") + set(VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX ".dll.a") + set(VCPKG_TARGET_SHARED_LIBRARY_SUFFIX ".dll") + set(VCPKG_TARGET_STATIC_LIBRARY_PREFIX "lib") + set(VCPKG_TARGET_SHARED_LIBRARY_PREFIX "lib") + set(VCPKG_TARGET_IMPORT_LIBRARY_PREFIX "lib") + set(VCPKG_FIND_LIBRARY_SUFFIXES ".dll" ".dll.a" ".a" ".lib") + set(VCPKG_FIND_LIBRARY_PREFIXES "lib" "") +elseif(VCPKG_TARGET_IS_WINDOWS) + set(VCPKG_TARGET_STATIC_LIBRARY_SUFFIX ".lib") + set(VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX ".lib") + set(VCPKG_TARGET_SHARED_LIBRARY_SUFFIX ".dll") + set(VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX ".lib") + set(VCPKG_TARGET_STATIC_LIBRARY_PREFIX "") + set(VCPKG_TARGET_SHARED_LIBRARY_PREFIX "") + set(VCPKG_TARGET_IMPORT_LIBRARY_PREFIX "") + set(VCPKG_FIND_LIBRARY_SUFFIXES ".lib" ".dll") #This is a slight modification to CMakes value which does not include ".dll". + set(VCPKG_FIND_LIBRARY_PREFIXES "" "lib") #This is a slight modification to CMakes value which does not include "lib". +elseif(VCPKG_TARGET_IS_OSX) + set(VCPKG_TARGET_STATIC_LIBRARY_SUFFIX ".a") + set(VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX "") + set(VCPKG_TARGET_SHARED_LIBRARY_SUFFIX ".dylib") + set(VCPKG_TARGET_STATIC_LIBRARY_PREFIX "lib") + set(VCPKG_TARGET_SHARED_LIBRARY_PREFIX "lib") + set(VCPKG_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".so" ".a") + set(VCPKG_FIND_LIBRARY_PREFIXES "lib" "") +else() + set(VCPKG_TARGET_STATIC_LIBRARY_SUFFIX ".a") + set(VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX "") + set(VCPKG_TARGET_SHARED_LIBRARY_SUFFIX ".so") + set(VCPKG_TARGET_STATIC_LIBRARY_PREFIX "lib") + set(VCPKG_TARGET_SHARED_LIBRARY_PREFIX "lib") + set(VCPKG_FIND_LIBRARY_SUFFIXES ".so" ".a") + set(VCPKG_FIND_LIBRARY_PREFIXES "lib" "") +endif() +#Setting these variables allows find_library to work in script mode and thus in portfiles! +#This allows us scale down on hardcoded target dependent paths in portfiles +set(CMAKE_STATIC_LIBRARY_SUFFIX "${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") +set(CMAKE_SHARED_LIBRARY_SUFFIX "${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") +set(CMAKE_IMPORT_LIBRARY_SUFFIX "${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}") +set(CMAKE_STATIC_LIBRARY_PREFIX "${VCPKG_TARGET_STATIC_LIBRARY_PREFIX}") +set(CMAKE_SHARED_LIBRARY_PREFIX "${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}") +set(CMAKE_IMPORT_LIBRARY_PREFIX "${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}") + +set(CMAKE_FIND_LIBRARY_SUFFIXES "${VCPKG_FIND_LIBRARY_SUFFIXES}" CACHE INTERNAL "") # Required by find_library +set(CMAKE_FIND_LIBRARY_PREFIXES "${VCPKG_FIND_LIBRARY_PREFIXES}" CACHE INTERNAL "") # Required by find_library + +# Append platform libraries to VCPKG_SYSTEM_LIBRARIES +# The variable are just appended to permit to custom triplets define the variable + +# Platforms with libdl +if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_OSX) + list(APPEND VCPKG_SYSTEM_LIBRARIES dl) +endif() + +# Platforms with libm +if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_FREEBSD OR VCPKG_TARGET_IS_OPENBSD OR VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_MINGW) + list(APPEND VCPKG_SYSTEM_LIBRARIES m) +endif() + +# Platforms with pthread +if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_FREEBSD OR VCPKG_TARGET_IS_OPENBSD OR VCPKG_TARGET_IS_MINGW) + list(APPEND VCPKG_SYSTEM_LIBRARIES pthread) +endif() + +# Platforms with libstdc++ +if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_FREEBSD OR VCPKG_TARGET_IS_OPENBSD OR VCPKG_TARGET_IS_MINGW) + list(APPEND VCPKG_SYSTEM_LIBRARIES [[stdc\+\+]]) +endif() + +# Platforms with libc++ +if(VCPKG_TARGET_IS_OSX) + list(APPEND VCPKG_SYSTEM_LIBRARIES [[c\+\+]]) +endif() + +# Platforms with librt +if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_FREEBSD OR VCPKG_TARGET_IS_MINGW) + list(APPEND VCPKG_SYSTEM_LIBRARIES rt) +endif() + +# Platforms with GCC libs +if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_FREEBSD OR VCPKG_TARGET_IS_OPENBSD OR VCPKG_TARGET_IS_MINGW) + list(APPEND VCPKG_SYSTEM_LIBRARIES gcc) + list(APPEND VCPKG_SYSTEM_LIBRARIES gcc_s) +endif() + +# Platforms with system iconv +if(VCPKG_TARGET_IS_OSX) + list(APPEND VCPKG_SYSTEM_LIBRARIES iconv) +endif() + +# Windows system libs +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND VCPKG_SYSTEM_LIBRARIES advapi32) + list(APPEND VCPKG_SYSTEM_LIBRARIES bcrypt) + list(APPEND VCPKG_SYSTEM_LIBRARIES dinput8) + list(APPEND VCPKG_SYSTEM_LIBRARIES gdi32) + list(APPEND VCPKG_SYSTEM_LIBRARIES imm32) + list(APPEND VCPKG_SYSTEM_LIBRARIES oleaut32) + list(APPEND VCPKG_SYSTEM_LIBRARIES ole32) + list(APPEND VCPKG_SYSTEM_LIBRARIES psapi) + list(APPEND VCPKG_SYSTEM_LIBRARIES secur32) + list(APPEND VCPKG_SYSTEM_LIBRARIES setupapi) + list(APPEND VCPKG_SYSTEM_LIBRARIES shell32) + list(APPEND VCPKG_SYSTEM_LIBRARIES shlwapi) + list(APPEND VCPKG_SYSTEM_LIBRARIES strmiids) + list(APPEND VCPKG_SYSTEM_LIBRARIES user32) + list(APPEND VCPKG_SYSTEM_LIBRARIES uuid) + list(APPEND VCPKG_SYSTEM_LIBRARIES version) + list(APPEND VCPKG_SYSTEM_LIBRARIES vfw32) + list(APPEND VCPKG_SYSTEM_LIBRARIES winmm) + list(APPEND VCPKG_SYSTEM_LIBRARIES wsock32) + list(APPEND VCPKG_SYSTEM_LIBRARIES Ws2_32) + list(APPEND VCPKG_SYSTEM_LIBRARIES wldap32) + list(APPEND VCPKG_SYSTEM_LIBRARIES crypt32) +endif() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_common_functions.cmake b/externals/vcpkg/scripts/cmake/vcpkg_common_functions.cmake new file mode 100755 index 000000000..515164789 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_common_functions.cmake @@ -0,0 +1,3 @@ +# DEPRECATED + +message("${Z_VCPKG_BACKCOMPAT_MESSAGE_LEVEL}" "vcpkg_common_functions has been removed and all values are automatically provided in all portfile.cmake invocations. Please remove `include(vcpkg_common_functions)`.") diff --git a/externals/vcpkg/scripts/cmake/vcpkg_configure_cmake.cmake b/externals/vcpkg/scripts/cmake/vcpkg_configure_cmake.cmake new file mode 100755 index 000000000..d22734af9 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_configure_cmake.cmake @@ -0,0 +1,373 @@ +function(z_vcpkg_configure_cmake_both_or_neither_set var1 var2) + if(DEFINED "${var1}" AND NOT DEFINED "${var2}") + message(FATAL_ERROR "If ${var1} is set, ${var2} must be set.") + endif() + if(NOT DEFINED "${var1}" AND DEFINED "${var2}") + message(FATAL_ERROR "If ${var2} is set, ${var1} must be set.") + endif() +endfunction() +function(z_vcpkg_configure_cmake_build_cmakecache out_var whereat build_type) + set(line "build ${whereat}/CMakeCache.txt: CreateProcess\n process = cmd /c \"cd ${whereat} &&") + foreach(arg IN LISTS "${build_type}_command") + string(APPEND line " \"${arg}\"") + endforeach() + set("${out_var}" "${${out_var}}${line}\"\n\n" PARENT_SCOPE) +endfunction() + +function(z_vcpkg_get_visual_studio_generator) + cmake_parse_arguments(PARSE_ARGV 0 arg "" "OUT_GENERATOR;OUT_ARCH" "") + + if (NOT DEFINED arg_OUT_GENERATOR) + message(FATAL_ERROR "OUT_GENERATOR must be defined.") + endif() + if(NOT DEFINED arg_OUT_ARCH) + message(FATAL_ERROR "OUT_ARCH must be defined.") + endif() + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + if("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v120" AND NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") + set(generator "Visual Studio 12 2013") + elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v140" AND NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") + set(generator "Visual Studio 14 2015") + elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v141") + set(generator "Visual Studio 15 2017") + elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v142") + set(generator "Visual Studio 16 2019") + elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v143") + set(generator "Visual Studio 17 2022") + endif() + + if("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x86") + set(generator_arch "Win32") + elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x64") + set(generator_arch "x64") + elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm") + set(generator_arch "ARM") + elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") + set(generator_arch "ARM64") + endif() + set(${arg_OUT_GENERATOR} "${generator}" PARENT_SCOPE) + set(${arg_OUT_ARCH} "${generator_arch}" PARENT_SCOPE) +endfunction() + +function(z_vcpkg_select_default_vcpkg_chainload_toolchain) + # Try avoiding adding more defaults here. + # Set VCPKG_CHAINLOAD_TOOLCHAIN_FILE explicitly in the triplet. + if(DEFINED Z_VCPKG_CHAINLOAD_TOOLCHAIN_FILE) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${Z_VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") + elseif(VCPKG_TARGET_IS_MINGW) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/mingw.cmake") + elseif(VCPKG_TARGET_IS_WINDOWS) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") + elseif(VCPKG_TARGET_IS_LINUX) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/linux.cmake") + elseif(VCPKG_TARGET_IS_ANDROID) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/android.cmake") + elseif(VCPKG_TARGET_IS_OSX) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/osx.cmake") + elseif(VCPKG_TARGET_IS_IOS) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/ios.cmake") + elseif(VCPKG_TARGET_IS_FREEBSD) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/freebsd.cmake") + elseif(VCPKG_TARGET_IS_OPENBSD) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/openbsd.cmake") + endif() + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE ${VCPKG_CHAINLOAD_TOOLCHAIN_FILE} PARENT_SCOPE) +endfunction() + + +function(vcpkg_configure_cmake) + cmake_parse_arguments(PARSE_ARGV 0 arg + "PREFER_NINJA;DISABLE_PARALLEL_CONFIGURE;NO_CHARSET_FLAG;Z_GET_CMAKE_VARS_USAGE" + "SOURCE_PATH;GENERATOR;LOGNAME" + "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;MAYBE_UNUSED_VARIABLES" + ) + + if(NOT arg_Z_GET_CMAKE_VARS_USAGE AND Z_VCPKG_CMAKE_CONFIGURE_GUARD) + message(FATAL_ERROR "The ${PORT} port already depends on vcpkg-cmake; using both vcpkg-cmake and vcpkg_configure_cmake in the same port is unsupported.") + endif() + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + if(NOT DEFINED arg_SOURCE_PATH) + message(FATAL_ERROR "SOURCE_PATH must be specified") + endif() + if(NOT DEFINED arg_LOGNAME) + set(arg_LOGNAME "config-${TARGET_TRIPLET}") + endif() + + vcpkg_list(SET manually_specified_variables) + + if(arg_Z_GET_CMAKE_VARS_USAGE) + set(configuring_message "Getting CMake variables for ${TARGET_TRIPLET}") + else() + set(configuring_message "Configuring ${TARGET_TRIPLET}") + + foreach(option IN LISTS arg_OPTIONS arg_OPTIONS_RELEASE arg_OPTIONS_DEBUG) + if("${option}" MATCHES "^-D([^:=]*)[:=]") + vcpkg_list(APPEND manually_specified_variables "${CMAKE_MATCH_1}") + endif() + endforeach() + vcpkg_list(REMOVE_DUPLICATES manually_specified_variables) + foreach(maybe_unused_var IN LISTS arg_MAYBE_UNUSED_VARIABLES) + vcpkg_list(REMOVE_ITEM manually_specified_variables "${maybe_unused_var}") + endforeach() + debug_message("manually specified variables: ${manually_specified_variables}") + endif() + + set(ninja_can_be_used ON) # Ninja as generator + set(ninja_host ON) # Ninja as parallel configurator + + if(NOT arg_PREFER_NINJA AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(ninja_can_be_used OFF) + endif() + + if(VCPKG_HOST_IS_WINDOWS) + if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) + set(host_arch "$ENV{PROCESSOR_ARCHITEW6432}") + else() + set(host_arch "$ENV{PROCESSOR_ARCHITECTURE}") + endif() + + if("${host_arch}" STREQUAL "x86") + # Prebuilt ninja binaries are only provided for x64 hosts + set(ninja_can_be_used OFF) + set(ninja_host OFF) + endif() + endif() + + set(generator "Ninja") # the default generator is always ninja! + set(generator_arch "") + if(DEFINED arg_GENERATOR) + set(generator "${arg_GENERATOR}") + elseif(NOT ninja_can_be_used) + set(generator "") + z_vcpkg_get_visual_studio_generator(OUT_GENERATOR generator OUT_ARCH generator_arch) + if("${generator}" STREQUAL "" OR "${generator_arch}" STREQUAL "") + message(FATAL_ERROR + "Unable to determine appropriate generator for triplet ${TARGET_TRIPLET}: + platform toolset: ${VCPKG_PLATFORM_TOOLSET} + architecture : ${VCPKG_TARGET_ARCHITECTURE}") + endif() + endif() + + # If we use Ninja, make sure it's on PATH + if("${generator}" STREQUAL "Ninja" AND NOT DEFINED ENV{VCPKG_FORCE_SYSTEM_BINARIES}) + vcpkg_find_acquire_program(NINJA) + get_filename_component(ninja_path "${NINJA}" DIRECTORY) + vcpkg_add_to_path("${ninja_path}") + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}") + endif() + + file(REMOVE_RECURSE + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + + if(DEFINED VCPKG_CMAKE_SYSTEM_NAME) + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}") + if(VCPKG_TARGET_IS_UWP AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) + elseif(VCPKG_TARGET_IS_ANDROID AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + set(VCPKG_CMAKE_SYSTEM_VERSION 21) + endif() + endif() + + if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}") + endif() + + if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "dynamic") + vcpkg_list(APPEND arg_OPTIONS -DBUILD_SHARED_LIBS=ON) + elseif("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + vcpkg_list(APPEND arg_OPTIONS -DBUILD_SHARED_LIBS=OFF) + else() + message(FATAL_ERROR + "Invalid setting for VCPKG_LIBRARY_LINKAGE: \"${VCPKG_LIBRARY_LINKAGE}\". + It must be \"static\" or \"dynamic\"") + endif() + + z_vcpkg_configure_cmake_both_or_neither_set(VCPKG_CXX_FLAGS_DEBUG VCPKG_C_FLAGS_DEBUG) + z_vcpkg_configure_cmake_both_or_neither_set(VCPKG_CXX_FLAGS_RELEASE VCPKG_C_FLAGS_RELEASE) + z_vcpkg_configure_cmake_both_or_neither_set(VCPKG_CXX_FLAGS VCPKG_C_FLAGS) + + set(vcpkg_set_charset_flag ON) + if(arg_NO_CHARSET_FLAG) + set(vcpkg_set_charset_flag OFF) + endif() + + if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) + z_vcpkg_select_default_vcpkg_chainload_toolchain() + endif() + + vcpkg_list(APPEND arg_OPTIONS + "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" + "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}" + "-DVCPKG_SET_CHARSET_FLAG=${vcpkg_set_charset_flag}" + "-DVCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET}" + "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON" + "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON" + "-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON" + "-DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=TRUE" + "-DCMAKE_VERBOSE_MAKEFILE=ON" + "-DVCPKG_APPLOCAL_DEPS=OFF" + "-DCMAKE_TOOLCHAIN_FILE=${SCRIPTS}/buildsystems/vcpkg.cmake" + "-DCMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION=ON" + "-DVCPKG_CXX_FLAGS=${VCPKG_CXX_FLAGS}" + "-DVCPKG_CXX_FLAGS_RELEASE=${VCPKG_CXX_FLAGS_RELEASE}" + "-DVCPKG_CXX_FLAGS_DEBUG=${VCPKG_CXX_FLAGS_DEBUG}" + "-DVCPKG_C_FLAGS=${VCPKG_C_FLAGS}" + "-DVCPKG_C_FLAGS_RELEASE=${VCPKG_C_FLAGS_RELEASE}" + "-DVCPKG_C_FLAGS_DEBUG=${VCPKG_C_FLAGS_DEBUG}" + "-DVCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE}" + "-DVCPKG_LINKER_FLAGS=${VCPKG_LINKER_FLAGS}" + "-DVCPKG_LINKER_FLAGS_RELEASE=${VCPKG_LINKER_FLAGS_RELEASE}" + "-DVCPKG_LINKER_FLAGS_DEBUG=${VCPKG_LINKER_FLAGS_DEBUG}" + "-DVCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}" + "-DCMAKE_INSTALL_LIBDIR:STRING=lib" + "-DCMAKE_INSTALL_BINDIR:STRING=bin" + "-D_VCPKG_ROOT_DIR=${VCPKG_ROOT_DIR}" + "-DZ_VCPKG_ROOT_DIR=${VCPKG_ROOT_DIR}" + "-D_VCPKG_INSTALLED_DIR=${_VCPKG_INSTALLED_DIR}" + "-DVCPKG_MANIFEST_INSTALL=OFF" + ) + + if(NOT "${generator_arch}" STREQUAL "") + vcpkg_list(APPEND arg_OPTIONS "-A${generator_arch}") + endif() + + # Sets configuration variables for macOS builds + foreach(config_var IN ITEMS INSTALL_NAME_DIR OSX_DEPLOYMENT_TARGET OSX_SYSROOT OSX_ARCHITECTURES) + if(DEFINED "VCPKG_${config_var}") + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${VCPKG_${config_var}}") + endif() + endforeach() + + # Allow overrides / additional configuration variables from triplets + if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS) + vcpkg_list(APPEND arg_OPTIONS "${VCPKG_CMAKE_CONFIGURE_OPTIONS}") + endif() + if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS_RELEASE) + vcpkg_list(APPEND arg_OPTIONS_RELEASE "${VCPKG_CMAKE_CONFIGURE_OPTIONS_RELEASE}") + endif() + if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS_DEBUG) + vcpkg_list(APPEND arg_OPTIONS_DEBUG "${VCPKG_CMAKE_CONFIGURE_OPTIONS_DEBUG}") + endif() + + vcpkg_list(SET rel_command + "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" + -G "${generator}" + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}" + ${arg_OPTIONS} ${arg_OPTIONS_RELEASE}) + vcpkg_list(SET dbg_command + "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" + -G "${generator}" + "-DCMAKE_BUILD_TYPE=Debug" + "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug" + ${arg_OPTIONS} ${arg_OPTIONS_DEBUG}) + + if(ninja_host AND CMAKE_HOST_WIN32 AND NOT arg_DISABLE_PARALLEL_CONFIGURE) + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_DISABLE_SOURCE_CHANGES=ON") + + vcpkg_find_acquire_program(NINJA) + if(NOT DEFINED ninja_path) + # if ninja_path was defined above, we've already done this + get_filename_component(ninja_path "${NINJA}" DIRECTORY) + vcpkg_add_to_path("${ninja_path}") + endif() + + #parallelize the configure step + set(ninja_configure_contents + "rule CreateProcess\n command = \$process\n\n" + ) + + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "release") + z_vcpkg_configure_cmake_build_cmakecache(ninja_configure_contents ".." "rel") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "debug") + z_vcpkg_configure_cmake_build_cmakecache(ninja_configure_contents "../../${TARGET_TRIPLET}-dbg" "dbg") + endif() + + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure") + file(WRITE + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure/build.ninja" + "${ninja_configure_contents}") + + message(STATUS "${configuring_message}") + vcpkg_execute_required_process( + COMMAND "${NINJA}" -v + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure" + LOGNAME "${arg_LOGNAME}" + ) + + vcpkg_list(APPEND config_logs + "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-out.log" + "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-err.log") + else() + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "debug") + message(STATUS "${configuring_message}-dbg") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + vcpkg_execute_required_process( + COMMAND ${dbg_command} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + LOGNAME "${arg_LOGNAME}-dbg" + ) + vcpkg_list(APPEND config_logs + "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-dbg-out.log" + "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-dbg-err.log") + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "release") + message(STATUS "${configuring_message}-rel") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + vcpkg_execute_required_process( + COMMAND ${rel_command} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + LOGNAME "${arg_LOGNAME}-rel" + ) + vcpkg_list(APPEND config_logs + "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-rel-out.log" + "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-rel-err.log") + endif() + endif() + + # Check unused variables + vcpkg_list(SET all_unused_variables) + foreach(config_log IN LISTS config_logs) + if(NOT EXISTS "${config_log}") + continue() + endif() + file(READ "${config_log}" log_contents) + debug_message("Reading configure log ${config_log}...") + if(NOT "${log_contents}" MATCHES "Manually-specified variables were not used by the project:\n\n(( [^\n]*\n)*)") + continue() + endif() + string(STRIP "${CMAKE_MATCH_1}" unused_variables) # remove leading ` ` and trailing `\n` + string(REPLACE "\n " ";" unused_variables "${unused_variables}") + debug_message("unused variables: ${unused_variables}") + + foreach(unused_variable IN LISTS unused_variables) + if("${unused_variable}" IN_LIST manually_specified_variables) + debug_message("manually specified unused variable: ${unused_variable}") + vcpkg_list(APPEND all_unused_variables "${unused_variable}") + else() + debug_message("unused variable (not manually specified): ${unused_variable}") + endif() + endforeach() + endforeach() + + if(NOT "${all_unused_variables}" STREQUAL "") + vcpkg_list(REMOVE_DUPLICATES all_unused_variables) + vcpkg_list(JOIN all_unused_variables "\n " all_unused_variables) + message(WARNING "The following variables are not used in CMakeLists.txt: + ${all_unused_variables} +Please recheck them and remove the unnecessary options from the `vcpkg_configure_cmake` call. +If these options should still be passed for whatever reason, please use the `MAYBE_UNUSED_VARIABLES` argument.") + endif() + + if(NOT arg_Z_GET_CMAKE_VARS_USAGE) + set(Z_VCPKG_CMAKE_GENERATOR "${generator}" PARENT_SCOPE) + endif() +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_configure_gn.cmake b/externals/vcpkg/scripts/cmake/vcpkg_configure_gn.cmake new file mode 100755 index 000000000..336354646 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_configure_gn.cmake @@ -0,0 +1,49 @@ +function(z_vcpkg_configure_gn_generate) + cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "SOURCE_PATH;CONFIG;ARGS" "") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "Internal error: generate was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + message(STATUS "Generating build (${arg_CONFIG})...") + vcpkg_execute_required_process( + COMMAND "${GN}" gen "${CURRENT_BUILDTREES_DIR}/${arg_CONFIG}" "${arg_ARGS}" + WORKING_DIRECTORY "${arg_SOURCE_PATH}" + LOGNAME "generate-${arg_CONFIG}" + ) +endfunction() + +function(vcpkg_configure_gn) + if(Z_VCPKG_GN_CONFIGURE_GUARD) + message(FATAL_ERROR "The ${PORT} port already depends on vcpkg-gn; using both vcpkg-gn and vcpkg_configure_gn in the same port is unsupported.") + endif() + + cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "SOURCE_PATH;OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE" "") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "vcpkg_configure_gn was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + if(NOT DEFINED arg_SOURCE_PATH) + message(FATAL_ERROR "SOURCE_PATH must be specified.") + endif() + + vcpkg_find_acquire_program(PYTHON3) + get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) + vcpkg_add_to_path(PREPEND "${PYTHON3_DIR}") + + vcpkg_find_acquire_program(GN) + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + z_vcpkg_configure_gn_generate( + SOURCE_PATH "${arg_SOURCE_PATH}" + CONFIG "${TARGET_TRIPLET}-dbg" + ARGS "--args=${arg_OPTIONS} ${arg_OPTIONS_DEBUG}" + ) + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + z_vcpkg_configure_gn_generate( + SOURCE_PATH "${arg_SOURCE_PATH}" + CONFIG "${TARGET_TRIPLET}-rel" + ARGS "--args=${arg_OPTIONS} ${arg_OPTIONS_RELEASE}" + ) + endif() +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_configure_make.cmake b/externals/vcpkg/scripts/cmake/vcpkg_configure_make.cmake new file mode 100755 index 000000000..3ead0e58e --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_configure_make.cmake @@ -0,0 +1,760 @@ +macro(z_vcpkg_determine_host_mingw out_var) + if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) + set(host_arch $ENV{PROCESSOR_ARCHITEW6432}) + else() + set(host_arch $ENV{PROCESSOR_ARCHITECTURE}) + endif() + if(host_arch MATCHES "(amd|AMD)64") + set(${out_var} mingw64) + elseif(host_arch MATCHES "(x|X)86") + set(${out_var} mingw32) + else() + message(FATAL_ERROR "Unsupported mingw architecture ${host_arch} in z_vcpkg_determine_autotools_host_cpu!" ) + endif() + unset(host_arch) +endmacro() + +macro(z_vcpkg_determine_autotools_host_cpu out_var) + # TODO: the host system processor architecture can differ from the host triplet target architecture + if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) + set(host_arch $ENV{PROCESSOR_ARCHITEW6432}) + elseif(DEFINED ENV{PROCESSOR_ARCHITECTURE}) + set(host_arch $ENV{PROCESSOR_ARCHITECTURE}) + else() + set(host_arch "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}") + endif() + if(host_arch MATCHES "(amd|AMD)64") + set(${out_var} x86_64) + elseif(host_arch MATCHES "(x|X)86") + set(${out_var} i686) + elseif(host_arch MATCHES "^(ARM|arm)64$") + set(${out_var} aarch64) + elseif(host_arch MATCHES "^(ARM|arm)$") + set(${out_var} arm) + else() + message(FATAL_ERROR "Unsupported host architecture ${host_arch} in z_vcpkg_determine_autotools_host_cpu!" ) + endif() + unset(host_arch) +endmacro() + +macro(z_vcpkg_determine_autotools_target_cpu out_var) + if(VCPKG_TARGET_ARCHITECTURE MATCHES "(x|X)64") + set(${out_var} x86_64) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "(x|X)86") + set(${out_var} i686) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "^(ARM|arm)64$") + set(${out_var} aarch64) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "^(ARM|arm)$") + set(${out_var} arm) + else() + message(FATAL_ERROR "Unsupported VCPKG_TARGET_ARCHITECTURE architecture ${VCPKG_TARGET_ARCHITECTURE} in z_vcpkg_determine_autotools_target_cpu!" ) + endif() +endmacro() + +macro(z_vcpkg_determine_autotools_host_arch_mac out_var) + set(${out_var} "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}") +endmacro() + +macro(z_vcpkg_determine_autotools_target_arch_mac out_var) + list(LENGTH VCPKG_OSX_ARCHITECTURES osx_archs_num) + if(osx_archs_num EQUAL 0) + set(${out_var} "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}") + elseif(osx_archs_num GREATER_EQUAL 2) + set(${out_var} "universal") + else() + # Better match the arch behavior of config.guess + # See: https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + if(VCPKG_OSX_ARCHITECTURES MATCHES "^(ARM|arm)64$") + set(${out_var} "aarch64") + else() + set(${out_var} "${VCPKG_OSX_ARCHITECTURES}") + endif() + endif() + unset(osx_archs_num) +endmacro() + +macro(z_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags flag_suffix) + string(REGEX MATCHALL "( |^)-D[^ ]+" CPPFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${flag_suffix}}") + string(REGEX MATCHALL "( |^)-D[^ ]+" CXXPPFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${flag_suffix}}") + list(JOIN CXXPPFLAGS_${flag_suffix} "|" CXXREGEX) + if(CXXREGEX) + list(FILTER CPPFLAGS_${flag_suffix} INCLUDE REGEX "(${CXXREGEX})") + else() + set(CPPFLAGS_${flag_suffix}) + endif() + list(JOIN CPPFLAGS_${flag_suffix} "|" CPPREGEX) + list(JOIN CPPFLAGS_${flag_suffix} " " CPPFLAGS_${flag_suffix}) + set(CPPFLAGS_${flag_suffix} "${CPPFLAGS_${flag_suffix}}") + if(CPPREGEX) + string(REGEX REPLACE "(${CPPREGEX})" "" CFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${flag_suffix}}") + string(REGEX REPLACE "(${CPPREGEX})" "" CXXFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${flag_suffix}}") + else() + set(CFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${flag_suffix}}") + set(CXXFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${flag_suffix}}") + endif() + string(REGEX REPLACE " +" " " CPPFLAGS_${flag_suffix} "${CPPFLAGS_${flag_suffix}}") + string(REGEX REPLACE " +" " " CFLAGS_${flag_suffix} "${CFLAGS_${flag_suffix}}") + string(REGEX REPLACE " +" " " CXXFLAGS_${flag_suffix} "${CXXFLAGS_${flag_suffix}}") + # libtool has and -R option so we need to guard against -RTC by using -Xcompiler + # while configuring there might be a lot of unknown compiler option warnings due to that + # just ignore them. + string(REGEX REPLACE "((-|/)RTC[^ ]+)" "-Xcompiler \\1" CFLAGS_${flag_suffix} "${CFLAGS_${flag_suffix}}") + string(REGEX REPLACE "((-|/)RTC[^ ]+)" "-Xcompiler \\1" CXXFLAGS_${flag_suffix} "${CXXFLAGS_${flag_suffix}}") + string(STRIP "${CPPFLAGS_${flag_suffix}}" CPPFLAGS_${flag_suffix}) + string(STRIP "${CFLAGS_${flag_suffix}}" CFLAGS_${flag_suffix}) + string(STRIP "${CXXFLAGS_${flag_suffix}}" CXXFLAGS_${flag_suffix}) + debug_message("CPPFLAGS_${flag_suffix}: ${CPPFLAGS_${flag_suffix}}") + debug_message("CFLAGS_${flag_suffix}: ${CFLAGS_${flag_suffix}}") + debug_message("CXXFLAGS_${flag_suffix}: ${CXXFLAGS_${flag_suffix}}") +endmacro() + +macro(z_vcpkg_append_to_configure_environment inoutstring var defaultval) + # Allows to overwrite settings in custom triplets via the environment on windows + if(CMAKE_HOST_WIN32 AND DEFINED ENV{${var}}) + string(APPEND ${inoutstring} " ${var}='$ENV{${var}}'") + else() + string(APPEND ${inoutstring} " ${var}='${defaultval}'") + endif() +endmacro() + +macro(z_convert_to_list input output) + string(REGEX MATCHALL "(( +|^ *)[^ ]+)" ${output} "${${input}}") +endmacro() + +function(vcpkg_configure_make) + # parse parameters such that semicolons in options arguments to COMMAND don't get erased + cmake_parse_arguments(PARSE_ARGV 0 arg + "AUTOCONFIG;SKIP_CONFIGURE;COPY_SOURCE;DISABLE_VERBOSE_FLAGS;NO_ADDITIONAL_PATHS;ADD_BIN_TO_PATH;NO_DEBUG;USE_WRAPPERS;DETERMINE_BUILD_TRIPLET" + "SOURCE_PATH;PROJECT_SUBPATH;PRERUN_SHELL;BUILD_TRIPLET" + "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;CONFIGURE_ENVIRONMENT_VARIABLES;CONFIG_DEPENDENT_ENVIRONMENT;ADDITIONAL_MSYS_PACKAGES" + ) + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + z_vcpkg_get_cmake_vars(cmake_vars_file) + debug_message("Including cmake vars from: ${cmake_vars_file}") + include("${cmake_vars_file}") + + if(DEFINED VCPKG_MAKE_BUILD_TRIPLET) + set(arg_BUILD_TRIPLET ${VCPKG_MAKE_BUILD_TRIPLET}) # Triplet overwrite for crosscompiling + endif() + + set(src_dir "${arg_SOURCE_PATH}/${arg_PROJECT_SUBPATH}") + + set(requires_autogen OFF) # use autogen.sh + set(requires_autoconfig OFF) # use autotools and configure.ac + if(EXISTS "${src_dir}/configure" AND "${src_dir}/configure.ac") # remove configure; rerun autoconf + if(NOT VCPKG_MAINTAINER_SKIP_AUTOCONFIG) # If fixing bugs skipping autoconfig saves a lot of time + set(requires_autoconfig ON) + file(REMOVE "${SRC_DIR}/configure") # remove possible autodated configure scripts + set(arg_AUTOCONFIG ON) + endif() + elseif(EXISTS "${src_dir}/configure" AND NOT arg_SKIP_CONFIGURE) # run normally; no autoconf or autogen required + elseif(EXISTS "${src_dir}/configure.ac") # Run autoconfig + set(requires_autoconfig ON) + set(arg_AUTOCONFIG ON) + elseif(EXISTS "${src_dir}/autogen.sh") # Run autogen + set(requires_autogen ON) + else() + message(FATAL_ERROR "Could not determine method to configure make") + endif() + + debug_message("requires_autogen:${requires_autogen}") + debug_message("requires_autoconfig:${requires_autoconfig}") + + if(CMAKE_HOST_WIN32 AND VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "cl.exe") #only applies to windows (clang-)cl and lib + if(arg_AUTOCONFIG) + set(arg_USE_WRAPPERS ON) + else() + # Keep the setting from portfiles. + # Without autotools we assume a custom configure script which correctly handles cl and lib. + # Otherwise the port needs to set CC|CXX|AR and probably CPP. + endif() + else() + set(arg_USE_WRAPPERS OFF) + endif() + + # Backup environment variables + # CCAS CC C CPP CXX FC FF GC LD LF LIBTOOL OBJC OBJCXX R UPC Y + set(cm_FLAGS AS CCAS CC C CPP CXX FC FF GC LD LF LIBTOOL OBJC OBJXX R UPC Y RC) + list(TRANSFORM cm_FLAGS APPEND "FLAGS") + vcpkg_backup_env_variables(VARS ${cm_FLAGS}) + + + # FC fotran compiler | FF Fortran 77 compiler + # LDFLAGS -> pass -L flags + # LIBS -> pass -l flags + + #Used by gcc/linux + vcpkg_backup_env_variables(VARS C_INCLUDE_PATH CPLUS_INCLUDE_PATH LIBRARY_PATH LD_LIBRARY_PATH) + + #Used by cl + vcpkg_backup_env_variables(VARS INCLUDE LIB LIBPATH) + + set(vcm_paths_with_spaces OFF) + if(CURRENT_PACKAGES_DIR MATCHES " " OR CURRENT_INSTALLED_DIR MATCHES " ") + # Don't bother with whitespace. The tools will probably fail and I tried very hard trying to make it work (no success so far)! + message(WARNING "Detected whitespace in root directory. Please move the path to one without whitespaces! The required tools do not handle whitespaces correctly and the build will most likely fail") + set(vcm_paths_with_spaces ON) + endif() + + set(configure_env "V=1") + # Pre-processing windows configure requirements + if (VCPKG_TARGET_IS_WINDOWS) + if(CMAKE_HOST_WIN32) + list(APPEND msys_require_packages binutils libtool autoconf automake-wrapper automake1.16 m4) + vcpkg_acquire_msys(MSYS_ROOT PACKAGES ${msys_require_packages} ${arg_ADDITIONAL_MSYS_PACKAGES}) + endif() + if (arg_DETERMINE_BUILD_TRIPLET OR NOT arg_BUILD_TRIPLET) + z_vcpkg_determine_autotools_host_cpu(BUILD_ARCH) # VCPKG_HOST => machine you are building on => --build= + z_vcpkg_determine_autotools_target_cpu(TARGET_ARCH) + # --build: the machine you are building on + # --host: the machine you are building for + # --target: the machine that CC will produce binaries for + # https://stackoverflow.com/questions/21990021/how-to-determine-host-value-for-configure-when-using-cross-compiler + # Only for ports using autotools so we can assume that they follow the common conventions for build/target/host + if(CMAKE_HOST_WIN32) + set(arg_BUILD_TRIPLET "--build=${BUILD_ARCH}-pc-mingw32") # This is required since we are running in a msys + # shell which will be otherwise identified as ${BUILD_ARCH}-pc-msys + endif() + if(NOT TARGET_ARCH MATCHES "${BUILD_ARCH}" OR NOT CMAKE_HOST_WIN32) # we don't need to specify the additional flags if we build nativly, this does not hold when we are not on windows + string(APPEND arg_BUILD_TRIPLET " --host=${TARGET_ARCH}-pc-mingw32") # (Host activates crosscompilation; The name given here is just the prefix of the host tools for the target) + endif() + if(VCPKG_TARGET_IS_UWP AND NOT arg_BUILD_TRIPLET MATCHES "--host") + # Needs to be different from --build to enable cross builds. + string(APPEND arg_BUILD_TRIPLET " --host=${TARGET_ARCH}-unknown-mingw32") + endif() + debug_message("Using make triplet: ${arg_BUILD_TRIPLET}") + endif() + if(CMAKE_HOST_WIN32) + set(append_env) + if(arg_USE_WRAPPERS) + set(append_env ";${MSYS_ROOT}/usr/share/automake-1.16") + string(APPEND append_env ";${SCRIPTS}/buildsystems/make_wrapper") # Other required wrappers are also located there + endif() + # This inserts msys before system32 (which masks sort.exe and find.exe) but after MSVC (which avoids masking link.exe) + string(REPLACE ";$ENV{SystemRoot}\\System32;" "${append_env};${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\System32;" NEWPATH "$ENV{PATH}") + string(REPLACE ";$ENV{SystemRoot}\\system32;" "${append_env};${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\system32;" NEWPATH "$ENV{PATH}") + set(ENV{PATH} "${NEWPATH}") + set(bash_executable "${MSYS_ROOT}/usr/bin/bash.exe") + endif() + + # Remove full filepaths due to spaces and prepend filepaths to PATH (cross-compiling tools are unlikely on path by default) + set(progs VCPKG_DETECTED_CMAKE_C_COMPILER VCPKG_DETECTED_CMAKE_CXX_COMPILER VCPKG_DETECTED_CMAKE_AR + VCPKG_DETECTED_CMAKE_LINKER VCPKG_DETECTED_CMAKE_RANLIB VCPKG_DETECTED_CMAKE_OBJDUMP + VCPKG_DETECTED_CMAKE_STRIP VCPKG_DETECTED_CMAKE_NM VCPKG_DETECTED_CMAKE_DLLTOOL VCPKG_DETECTED_CMAKE_RC_COMPILER) + foreach(prog IN LISTS progs) + if(${prog}) + set(path "${${prog}}") + unset(prog_found CACHE) + get_filename_component(${prog} "${${prog}}" NAME) + find_program(prog_found ${${prog}} PATHS ENV PATH NO_DEFAULT_PATH) + if(NOT path STREQUAL prog_found) + get_filename_component(path "${path}" DIRECTORY) + vcpkg_add_to_path(PREPEND ${path}) + endif() + endif() + endforeach() + if (arg_USE_WRAPPERS) + z_vcpkg_append_to_configure_environment(configure_env CPP "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER} -E") + + z_vcpkg_append_to_configure_environment(configure_env CC "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env CC_FOR_BUILD "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env CXX "compile ${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env RC "windres-rc ${VCPKG_DETECTED_CMAKE_RC_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env WINDRES "windres-rc ${VCPKG_DETECTED_CMAKE_RC_COMPILER}") + if(VCPKG_DETECTED_CMAKE_AR) + z_vcpkg_append_to_configure_environment(configure_env AR "ar-lib ${VCPKG_DETECTED_CMAKE_AR}") + else() + z_vcpkg_append_to_configure_environment(configure_env AR "ar-lib lib.exe -verbose") + endif() + else() + z_vcpkg_append_to_configure_environment(configure_env CPP "${VCPKG_DETECTED_CMAKE_C_COMPILER} -E") + z_vcpkg_append_to_configure_environment(configure_env CC "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env CC_FOR_BUILD "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env CXX "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env RC "${VCPKG_DETECTED_CMAKE_RC_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env WINDRES "${VCPKG_DETECTED_CMAKE_RC_COMPILER}") + if(VCPKG_DETECTED_CMAKE_AR) + z_vcpkg_append_to_configure_environment(configure_env AR "${VCPKG_DETECTED_CMAKE_AR}") + else() + z_vcpkg_append_to_configure_environment(configure_env AR "lib.exe -verbose") + endif() + endif() + z_vcpkg_append_to_configure_environment(configure_env LD "${VCPKG_DETECTED_CMAKE_LINKER} -verbose") + if(VCPKG_DETECTED_CMAKE_RANLIB) + z_vcpkg_append_to_configure_environment(configure_env RANLIB "${VCPKG_DETECTED_CMAKE_RANLIB}") # Trick to ignore the RANLIB call + else() + z_vcpkg_append_to_configure_environment(configure_env RANLIB ":") + endif() + if(VCPKG_DETECTED_CMAKE_OBJDUMP) #Objdump is required to make shared libraries. Otherwise define lt_cv_deplibs_check_method=pass_all + z_vcpkg_append_to_configure_environment(configure_env OBJDUMP "${VCPKG_DETECTED_CMAKE_OBJDUMP}") # Trick to ignore the RANLIB call + endif() + if(VCPKG_DETECTED_CMAKE_STRIP) # If required set the ENV variable STRIP in the portfile correctly + z_vcpkg_append_to_configure_environment(configure_env STRIP "${VCPKG_DETECTED_CMAKE_STRIP}") + else() + z_vcpkg_append_to_configure_environment(configure_env STRIP ":") + list(APPEND arg_OPTIONS ac_cv_prog_ac_ct_STRIP=:) + endif() + if(VCPKG_DETECTED_CMAKE_NM) # If required set the ENV variable NM in the portfile correctly + z_vcpkg_append_to_configure_environment(configure_env NM "${VCPKG_DETECTED_CMAKE_NM}") + else() + # Would be better to have a true nm here! Some symbols (mainly exported variables) get not properly imported with dumpbin as nm + # and require __declspec(dllimport) for some reason (same problem CMake has with WINDOWS_EXPORT_ALL_SYMBOLS) + z_vcpkg_append_to_configure_environment(configure_env NM "dumpbin.exe -symbols -headers") + endif() + if(VCPKG_DETECTED_CMAKE_DLLTOOL) # If required set the ENV variable DLLTOOL in the portfile correctly + z_vcpkg_append_to_configure_environment(configure_env DLLTOOL "${VCPKG_DETECTED_CMAKE_DLLTOOL}") + else() + z_vcpkg_append_to_configure_environment(configure_env DLLTOOL "link.exe -verbose -dll") + endif() + z_vcpkg_append_to_configure_environment(configure_env CCAS ":") # If required set the ENV variable CCAS in the portfile correctly + z_vcpkg_append_to_configure_environment(configure_env AS ":") # If required set the ENV variable AS in the portfile correctly + + foreach(_env IN LISTS arg_CONFIGURE_ENVIRONMENT_VARIABLES) + z_vcpkg_append_to_configure_environment(configure_env ${_env} "${${_env}}") + endforeach() + debug_message("configure_env: '${configure_env}'") + # Other maybe interesting variables to control + # COMPILE This is the command used to actually compile a C source file. The file name is appended to form the complete command line. + # LINK This is the command used to actually link a C program. + # CXXCOMPILE The command used to actually compile a C++ source file. The file name is appended to form the complete command line. + # CXXLINK The command used to actually link a C++ program. + + # Variables not correctly detected by configure. In release builds. + list(APPEND arg_OPTIONS gl_cv_double_slash_root=yes + ac_cv_func_memmove=yes) + #list(APPEND arg_OPTIONS lt_cv_deplibs_check_method=pass_all) # Just ignore libtool checks + if(VCPKG_TARGET_ARCHITECTURE MATCHES "^[Aa][Rr][Mm]64$") + list(APPEND arg_OPTIONS gl_cv_host_cpu_c_abi=no) + # Currently needed for arm64 because objdump yields: "unrecognised machine type (0xaa64) in Import Library Format archive" + list(APPEND arg_OPTIONS lt_cv_deplibs_check_method=pass_all) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "^[Aa][Rr][Mm]$") + # Currently needed for arm because objdump yields: "unrecognised machine type (0x1c4) in Import Library Format archive" + list(APPEND arg_OPTIONS lt_cv_deplibs_check_method=pass_all) + endif() + endif() + + # Some PATH handling for dealing with spaces....some tools will still fail with that! + # In particular, the libtool install command is unable to install correctly to paths with spaces. + # CURRENT_INSTALLED_DIR: Pristine native path (unprotected spaces, Windows drive letters) + # z_vcpkg_installed_path: Native path with escaped space characters + # z_vcpkg_prefix_path: Path with unprotected spaces, but drive letters transformed for mingw/msys + string(REPLACE " " "\\ " z_vcpkg_installed_path "${CURRENT_INSTALLED_DIR}") + if(CMAKE_HOST_WIN32) + string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" z_vcpkg_prefix_path "${CURRENT_INSTALLED_DIR}") + else() + set(z_vcpkg_prefix_path "${CURRENT_INSTALLED_DIR}") + endif() + + # macOS - cross-compiling support + if(VCPKG_TARGET_IS_OSX) + if (requires_autoconfig AND NOT arg_BUILD_TRIPLET OR arg_DETERMINE_BUILD_TRIPLET) + z_vcpkg_determine_autotools_host_arch_mac(BUILD_ARCH) # machine you are building on => --build= + z_vcpkg_determine_autotools_target_arch_mac(TARGET_ARCH) + # --build: the machine you are building on + # --host: the machine you are building for + # --target: the machine that CC will produce binaries for + # https://stackoverflow.com/questions/21990021/how-to-determine-host-value-for-configure-when-using-cross-compiler + # Only for ports using autotools so we can assume that they follow the common conventions for build/target/host + if(NOT "${TARGET_ARCH}" STREQUAL "${BUILD_ARCH}") # we don't need to specify the additional flags if we build natively. + set(arg_BUILD_TRIPLET "--host=${TARGET_ARCH}-apple-darwin") # (Host activates crosscompilation; The name given here is just the prefix of the host tools for the target) + endif() + debug_message("Using make triplet: ${arg_BUILD_TRIPLET}") + endif() + endif() + + # Linux - cross-compiling support + if(VCPKG_TARGET_IS_LINUX) + if (requires_autoconfig AND NOT arg_BUILD_TRIPLET OR arg_DETERMINE_BUILD_TRIPLET) + # The regex below takes the prefix from the resulting CMAKE_C_COMPILER variable eg. arm-linux-gnueabihf-gcc + # set in the common toolchains/linux.cmake + # This is used via --host as a prefix for all other bin tools as well. + # Setting the compiler directly via CC=arm-linux-gnueabihf-gcc does not work acording to: + # https://www.gnu.org/software/autoconf/manual/autoconf-2.65/html_node/Specifying-Target-Triplets.html + if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "([^\/]*)-gcc$" AND CMAKE_MATCH_1) + set(arg_BUILD_TRIPLET "--host=${CMAKE_MATCH_1}") # (Host activates crosscompilation; The name given here is just the prefix of the host tools for the target) + endif() + debug_message("Using make triplet: ${arg_BUILD_TRIPLET}") + endif() + endif() + + # Cleanup previous build dirs + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") + + # Set configure paths + set(arg_OPTIONS_RELEASE ${arg_OPTIONS_RELEASE} "--prefix=${z_vcpkg_prefix_path}") + set(arg_OPTIONS_DEBUG ${arg_OPTIONS_DEBUG} "--prefix=${z_vcpkg_prefix_path}/debug") + if(NOT arg_NO_ADDITIONAL_PATHS) + # ${prefix} has an extra backslash to prevent early expansion when calling `bash -c configure "..."`. + set(arg_OPTIONS_RELEASE ${arg_OPTIONS_RELEASE} + # Important: These should all be relative to prefix! + "--bindir=\\\${prefix}/tools/${PORT}/bin" + "--sbindir=\\\${prefix}/tools/${PORT}/sbin" + "--libdir=\\\${prefix}/lib" # On some Linux distributions lib64 is the default + #"--includedir='\${prefix}'/include" # already the default! + "--mandir=\\\${prefix}/share/${PORT}" + "--docdir=\\\${prefix}/share/${PORT}" + "--datarootdir=\\\${prefix}/share/${PORT}") + set(arg_OPTIONS_DEBUG ${arg_OPTIONS_DEBUG} + # Important: These should all be relative to prefix! + "--bindir=\\\${prefix}/../tools/${PORT}/debug/bin" + "--sbindir=\\\${prefix}/../tools/${PORT}/debug/sbin" + "--libdir=\\\${prefix}/lib" # On some Linux distributions lib64 is the default + "--includedir=\\\${prefix}/../include" + "--datarootdir=\\\${prefix}/share/${PORT}") + endif() + # Setup common options + if(NOT arg_DISABLE_VERBOSE_FLAGS) + list(APPEND arg_OPTIONS --disable-silent-rules --verbose) + endif() + + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + list(APPEND arg_OPTIONS --enable-shared --disable-static) + else() + list(APPEND arg_OPTIONS --disable-shared --enable-static) + endif() + + # Can be set in the triplet to append options for configure + if(DEFINED VCPKG_CONFIGURE_MAKE_OPTIONS) + list(APPEND arg_OPTIONS ${VCPKG_CONFIGURE_MAKE_OPTIONS}) + endif() + if(DEFINED VCPKG_CONFIGURE_MAKE_OPTIONS_RELEASE) + list(APPEND arg_OPTIONS_RELEASE ${VCPKG_CONFIGURE_MAKE_OPTIONS_RELEASE}) + endif() + if(DEFINED VCPKG_CONFIGURE_MAKE_OPTIONS_DEBUG) + list(APPEND arg_OPTIONS_DEBUG ${VCPKG_CONFIGURE_MAKE_OPTIONS_DEBUG}) + endif() + + file(RELATIVE_PATH relative_build_path "${CURRENT_BUILDTREES_DIR}" "${arg_SOURCE_PATH}/${arg_PROJECT_SUBPATH}") + + set(base_cmd) + if(CMAKE_HOST_WIN32) + set(base_cmd ${bash_executable} --noprofile --norc --debug) + else() + find_program(base_cmd bash REQUIRED) + endif() + + # Used by CL + vcpkg_host_path_list(PREPEND ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include") + # Used by GCC + vcpkg_host_path_list(PREPEND ENV{C_INCLUDE_PATH} "${CURRENT_INSTALLED_DIR}/include") + vcpkg_host_path_list(PREPEND ENV{CPLUS_INCLUDE_PATH} "${CURRENT_INSTALLED_DIR}/include") + + # Flags should be set in the toolchain instead (Setting this up correctly requires a function named vcpkg_determined_cmake_compiler_flags which can also be used to setup CC and CXX etc.) + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_backup_env_variables(VARS _CL_ _LINK_) + # TODO: Should be CPP flags instead -> rewrite when vcpkg_determined_cmake_compiler_flags defined + if(VCPKG_TARGET_IS_UWP) + # Be aware that configure thinks it is crosscompiling due to: + # error while loading shared libraries: VCRUNTIME140D_APP.dll: + # cannot open shared object file: No such file or directory + # IMPORTANT: The only way to pass linker flags through libtool AND the compile wrapper + # is to use the CL and LINK environment variables !!! + # (This is due to libtool and compiler wrapper using the same set of options to pass those variables around) + file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" VCToolsInstallDir) + set(_replacement -FU\"${VCToolsInstallDir}/lib/x86/store/references/platform.winmd\") + string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG}") + string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_C_FLAGS_DEBUG "${VCPKG_DETECTED_CMAKE_C_FLAGS_DEBUG}") + string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE}") + string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_C_FLAGS_RELEASE "${VCPKG_DETECTED_CMAKE_C_FLAGS_RELEASE}") + # Can somebody please check if CMake's compiler flags for UWP are correct? + set(ENV{_CL_} "$ENV{_CL_} -FU\"${VCToolsInstallDir}/lib/x86/store/references/platform.winmd\"") + set(ENV{_LINK_} "$ENV{_LINK_} ${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES} ${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") + endif() + endif() + + z_convert_to_list(VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES c_libs_list) + z_convert_to_list(VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES cxx_libs_list) + set(all_libs_list ${c_libs_list} ${cxx_libs_list}) + list(REMOVE_DUPLICATES all_libs_list) + list(TRANSFORM all_libs_list STRIP) + #Do lib list transformation from name.lib to -lname if necessary + set(x_vcpkg_transform_libs ON) + if(VCPKG_TARGET_IS_UWP) + set(x_vcpkg_transform_libs OFF) + # Avoid libtool choke: "Warning: linker path does not have real file for library -lWindowsApp." + # The problem with the choke is that libtool always falls back to built a static library even if a dynamic was requested. + # Note: Env LIBPATH;LIB are on the search path for libtool by default on windows. + # It even does unix/dos-short/unix transformation with the path to get rid of spaces. + endif() + set(l_prefix) + if(x_vcpkg_transform_libs) + set(l_prefix "-l") + list(TRANSFORM all_libs_list REPLACE "(.dll.lib|.lib|.a|.so)$" "") + if(VCPKG_TARGET_IS_WINDOWS) + list(REMOVE_ITEM all_libs_list "uuid") + endif() + list(TRANSFORM all_libs_list REPLACE "^(${l_prefix})" "") + endif() + list(JOIN all_libs_list " ${l_prefix}" all_libs_string) + if(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + # libtool must be told explicitly that there is no dynamic linkage for uuid. + # The "-Wl,..." syntax is understood by libtool and gcc, but no by ld. + string(REPLACE " -luuid" " -Wl,-Bstatic,-luuid,-Bdynamic" all_libs_string "${all_libs_string}") + endif() + + if(all_libs_string) + set(all_libs_string "${l_prefix}${all_libs_string}") + if(DEFINED ENV{LIBS}) + set(ENV{LIBS} "$ENV{LIBS} ${all_libs_string}") + else() + set(ENV{LIBS} "${all_libs_string}") + endif() + endif() + debug_message("ENV{LIBS}:$ENV{LIBS}") + + # Run autoconf if necessary + if (arg_AUTOCONFIG OR requires_autoconfig) + find_program(AUTORECONF autoreconf) + if(NOT AUTORECONF) + message(FATAL_ERROR "${PORT} requires autoconf from the system package manager (example: \"sudo apt-get install autoconf\")") + endif() + message(STATUS "Generating configure for ${TARGET_TRIPLET}") + if (CMAKE_HOST_WIN32) + vcpkg_execute_required_process( + COMMAND ${base_cmd} -c "autoreconf -vfi" + WORKING_DIRECTORY "${src_dir}" + LOGNAME "autoconf-${TARGET_TRIPLET}" + ) + else() + vcpkg_execute_required_process( + COMMAND "${AUTORECONF}" -vfi + WORKING_DIRECTORY "${src_dir}" + LOGNAME "autoconf-${TARGET_TRIPLET}" + ) + endif() + message(STATUS "Finished generating configure for ${TARGET_TRIPLET}") + endif() + if(requires_autogen) + message(STATUS "Generating configure for ${TARGET_TRIPLET} via autogen.sh") + if (CMAKE_HOST_WIN32) + vcpkg_execute_required_process( + COMMAND ${base_cmd} -c "./autogen.sh" + WORKING_DIRECTORY "${src_dir}" + LOGNAME "autoconf-${TARGET_TRIPLET}" + ) + else() + vcpkg_execute_required_process( + COMMAND "./autogen.sh" + WORKING_DIRECTORY "${src_dir}" + LOGNAME "autoconf-${TARGET_TRIPLET}" + ) + endif() + message(STATUS "Finished generating configure for ${TARGET_TRIPLET}") + endif() + + if (arg_PRERUN_SHELL) + message(STATUS "Prerun shell with ${TARGET_TRIPLET}") + if (CMAKE_HOST_WIN32) + vcpkg_execute_required_process( + COMMAND ${base_cmd} -c "${arg_PRERUN_SHELL}" + WORKING_DIRECTORY "${src_dir}" + LOGNAME "prerun-${TARGET_TRIPLET}" + ) + else() + vcpkg_execute_required_process( + COMMAND "${base_cmd}" -c "${arg_PRERUN_SHELL}" + WORKING_DIRECTORY "${src_dir}" + LOGNAME "prerun-${TARGET_TRIPLET}" + ) + endif() + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug" AND NOT arg_NO_DEBUG) + set(var_suffix DEBUG) + set(path_suffix_${var_suffix} "/debug") + set(short_name_${var_suffix} "dbg") + list(APPEND all_buildtypes ${var_suffix}) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(LINKER_FLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${var_suffix}}") + else() # dynamic + set(LINKER_FLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${var_suffix}}") + endif() + z_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags(${var_suffix}) + if (CMAKE_HOST_WIN32 AND VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "cl.exe") + if(NOT vcm_paths_with_spaces) + set(LDFLAGS_${var_suffix} "-L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib/manual-link") + endif() + if(DEFINED ENV{_LINK_}) + set(LINK_ENV_${var_suffix} "$ENV{_LINK_} ${LINKER_FLAGS_${var_suffix}}") + else() + set(LINK_ENV_${var_suffix} "${LINKER_FLAGS_${var_suffix}}") + endif() + else() + set(link_required_dirs) + if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib") + set(link_required_dirs "-L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib") + endif() + if(EXISTS "{CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib/manual-link") + set(link_required_dirs "${link_required_dirs} -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib/manual-link") + endif() + string(STRIP "${link_required_dirs}" link_required_dirs) + set(LDFLAGS_${var_suffix} "${link_required_dirs} ${LINKER_FLAGS_${var_suffix}}") + endif() + unset(var_suffix) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(var_suffix RELEASE) + set(path_suffix_${var_suffix} "") + set(short_name_${var_suffix} "rel") + list(APPEND all_buildtypes ${var_suffix}) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(LINKER_FLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${var_suffix}}") + else() # dynamic + set(LINKER_FLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${var_suffix}}") + endif() + z_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags(${var_suffix}) + if (CMAKE_HOST_WIN32 AND VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "cl.exe") + if(NOT vcm_paths_with_spaces) + set(LDFLAGS_${var_suffix} "-L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib/manual-link") + endif() + if(DEFINED ENV{_LINK_}) + set(LINK_ENV_${var_suffix} "$ENV{_LINK_} ${LINKER_FLAGS_${var_suffix}}") + else() + set(LINK_ENV_${var_suffix} "${LINKER_FLAGS_${var_suffix}}") + endif() + else() + set(link_required_dirs "") + if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib") + set(link_required_dirs "-L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib") + endif() + if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib/manual-link") + set(link_required_dirs "${link_required_dirs} -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib/manual-link") + endif() + string(STRIP "${link_required_dirs}" link_required_dirs) + set(LDFLAGS_${var_suffix} "${link_required_dirs} ${LINKER_FLAGS_${var_suffix}}") + endif() + unset(var_suffix) + endif() + + foreach(var IN ITEMS arg_OPTIONS arg_OPTIONS_RELEASE arg_OPTIONS_DEBUG) + vcpkg_list(SET tmp) + foreach(element IN LISTS "${var}") + string(REPLACE [["]] [[\"]] element "${element}") + vcpkg_list(APPEND tmp "\"${element}\"") + endforeach() + vcpkg_list(JOIN tmp " " "${var}") + endforeach() + + foreach(current_buildtype IN LISTS all_buildtypes) + foreach(ENV_VAR ${arg_CONFIG_DEPENDENT_ENVIRONMENT}) + if(DEFINED ENV{${ENV_VAR}}) + set(backup_config_${ENV_VAR} "$ENV{${ENV_VAR}}") + endif() + set(ENV{${ENV_VAR}} "${${ENV_VAR}_${current_buildtype}}") + endforeach() + + set(target_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_name_${current_buildtype}}") + file(MAKE_DIRECTORY "${target_dir}") + file(RELATIVE_PATH relative_build_path "${target_dir}" "${src_dir}") + + if(arg_COPY_SOURCE) + file(COPY "${src_dir}/" DESTINATION "${target_dir}") + set(relative_build_path .) + endif() + + # Setup PKG_CONFIG_PATH + if ("${current_buildtype}" STREQUAL "DEBUG") + z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}/debug") + else() + z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}") + endif() + + # Setup environment + set(ENV{CPPFLAGS} "${CPPFLAGS_${current_buildtype}}") + set(ENV{CFLAGS} "${CFLAGS_${current_buildtype}}") + set(ENV{CXXFLAGS} "${CXXFLAGS_${current_buildtype}}") + set(ENV{RCFLAGS} "${VCPKG_DETECTED_CMAKE_RC_FLAGS_${current_buildtype}}") + set(ENV{LDFLAGS} "${LDFLAGS_${current_buildtype}}") + + # https://www.gnu.org/software/libtool/manual/html_node/Link-mode.html + # -avoid-version is handled specially by libtool link mode, this flag is not forwarded to linker, + # and libtool tries to avoid versioning for shared libraries and no symbolic links are created. + if(VCPKG_TARGET_IS_ANDROID) + set(ENV{LDFLAGS} "-avoid-version $ENV{LDFLAGS}") + endif() + + if(LINK_ENV_${current_buildtype}) + set(link_config_backup "$ENV{_LINK_}") + set(ENV{_LINK_} "${LINK_ENV_${current_buildtype}}") + endif() + + vcpkg_list(APPEND lib_env_vars LIB LIBPATH LIBRARY_PATH) # LD_LIBRARY_PATH) + foreach(lib_env_var IN LISTS lib_env_vars) + if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/lib") + vcpkg_host_path_list(PREPEND ENV{${lib_env_var}} "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/lib") + endif() + if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/lib/manual-link") + vcpkg_host_path_list(PREPEND ENV{${lib_env_var}} "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/lib/manual-link") + endif() + endforeach() + unset(lib_env_vars) + + set(command "${base_cmd}" -c "${configure_env} ./${relative_build_path}/configure ${arg_BUILD_TRIPLET} ${arg_OPTIONS} ${arg_OPTIONS_${current_buildtype}}") + + if(arg_ADD_BIN_TO_PATH) + set(path_backup $ENV{PATH}) + vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/bin") + endif() + debug_message("Configure command:'${command}'") + if (NOT arg_SKIP_CONFIGURE) + message(STATUS "Configuring ${TARGET_TRIPLET}-${short_name_${current_buildtype}}") + vcpkg_execute_required_process( + COMMAND ${command} + WORKING_DIRECTORY "${target_dir}" + LOGNAME "config-${TARGET_TRIPLET}-${short_name_${current_buildtype}}" + ) + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(GLOB_RECURSE libtool_files "${target_dir}*/libtool") + foreach(lt_file IN LISTS libtool_files) + file(READ "${lt_file}" _contents) + string(REPLACE ".dll.lib" ".lib" _contents "${_contents}") + file(WRITE "${lt_file}" "${_contents}") + endforeach() + endif() + + if(EXISTS "${target_dir}/config.log") + file(RENAME "${target_dir}/config.log" "${CURRENT_BUILDTREES_DIR}/config.log-${TARGET_TRIPLET}-${short_name_${current_buildtype}}.log") + endif() + endif() + z_vcpkg_restore_pkgconfig_path() + + if(link_config_backup) + set(ENV{_LINK_} "${link_config_backup}") + unset(link_config_backup) + endif() + + if(arg_ADD_BIN_TO_PATH) + set(ENV{PATH} "${path_backup}") + endif() + # Restore environment (config dependent) + foreach(ENV_VAR IN LISTS ${arg_CONFIG_DEPENDENT_ENVIRONMENT}) + if(backup_config_${ENV_VAR}) + set(ENV{${ENV_VAR}} "${backup_config_${ENV_VAR}}") + else() + unset(ENV{${ENV_VAR}}) + endif() + endforeach() + endforeach() + + # Export matching make program for vcpkg_build_make (cache variable) + if(CMAKE_HOST_WIN32 AND MSYS_ROOT) + find_program(Z_VCPKG_MAKE make PATHS "${MSYS_ROOT}/usr/bin" NO_DEFAULT_PATH REQUIRED) + elseif(VCPKG_HOST_IS_OPENBSD) + find_program(Z_VCPKG_MAKE gmake REQUIRED) + else() + find_program(Z_VCPKG_MAKE make REQUIRED) + endif() + + # Restore environment + vcpkg_restore_env_variables(VARS ${cm_FLAGS} LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH) + + set(_VCPKG_PROJECT_SOURCE_PATH ${arg_SOURCE_PATH} PARENT_SCOPE) + set(_VCPKG_PROJECT_SUBPATH ${arg_PROJECT_SUBPATH} PARENT_SCOPE) + set(_VCPKG_MAKE_NO_DEBUG ${arg_NO_DEBUG} PARENT_SCOPE) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_configure_meson.cmake b/externals/vcpkg/scripts/cmake/vcpkg_configure_meson.cmake new file mode 100755 index 000000000..94c1a9f61 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_configure_meson.cmake @@ -0,0 +1,455 @@ +function(z_vcpkg_append_proglist var_to_append additional_binaries) + string(APPEND "${var_to_append}" "[binaries]\n") + if(VCPKG_TARGET_IS_WINDOWS) + set(proglist MT AR) + else() + set(proglist AR RANLIB STRIP NM OBJDUMP DLLTOOL MT) + endif() + foreach(prog IN LISTS proglist) + if(VCPKG_DETECTED_CMAKE_${prog}) + if(meson_${prog}) + string(APPEND "${var_to_append}" "${meson_${prog}} = '${VCPKG_DETECTED_CMAKE_${prog}}'\n") + else() + string(TOLOWER "${prog}" proglower) + string(APPEND "${var_to_append}" "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}}'\n") + endif() + endif() + endforeach() + set(programs C CXX RC) + set(meson_RC windres) + set(meson_CXX cpp) + foreach(prog IN LISTS programs) + if(VCPKG_DETECTED_CMAKE_${prog}_COMPILER) + if(meson_${prog}) + string(APPEND "${var_to_append}" "${meson_${prog}} = '${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}'\n") + else() + string(TOLOWER "${prog}" proglower) + string(APPEND "${var_to_append}" "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}'\n") + endif() + endif() + endforeach() + if(VCPKG_DETECTED_CMAKE_LINKER AND VCPKG_TARGET_IS_WINDOWS) + # for gcc and icc the linker flag -fuse-ld is used. See https://github.com/mesonbuild/meson/issues/8647#issuecomment-878673456 + if (NOT VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "^(GNU|Intel)$") + string(APPEND "${var_to_append}" "c_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") + endif() + endif() + if(VCPKG_DETECTED_CMAKE_LINKER AND VCPKG_TARGET_IS_WINDOWS) + # for gcc and icc the linker flag -fuse-ld is used. See https://github.com/mesonbuild/meson/issues/8647#issuecomment-878673456 + if (NOT VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Intel)$") + string(APPEND "${var_to_append}" "cpp_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") + endif() + endif() + + get_filename_component(CMAKE_PATH "${CMAKE_COMMAND}" DIRECTORY) + vcpkg_add_to_path("${CMAKE_PATH}" PREPEND) # Make CMake invokeable for Meson + string(APPEND "${var_to_append}" "cmake = '${CMAKE_COMMAND}'\n") + + vcpkg_find_acquire_program(PYTHON3) + get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) + vcpkg_add_to_path("${PYTHON3_DIR}") + string(APPEND "${var_to_append}" "python = '${PYTHON3}'\n") + + vcpkg_find_acquire_program(NINJA) + get_filename_component(NINJA_PATH ${NINJA} DIRECTORY) + vcpkg_add_to_path(PREPEND "${NINJA_PATH}") # Prepend to use the correct ninja. + # string(APPEND "${var_to_append}" "ninja = '${NINJA}'\n") # This does not work due to meson issues + + foreach(additional_binary IN LISTS additional_binaries) + string(APPEND "${var_to_append}" "${additional_binary}\n") + endforeach() + set("${var_to_append}" "${${var_to_append}}" PARENT_SCOPE) +endfunction() + +function(z_vcpkg_meson_generate_native_file additional_binaries) #https://mesonbuild.com/Native-environments.html + set(native_config "") + z_vcpkg_append_proglist(native_config "${additional_binaries}") + + string(APPEND native_config "[built-in options]\n") #https://mesonbuild.com/Builtin-options.html + if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "cl.exe") + # This is currently wrongly documented in the meson docs or buggy. The docs say: 'none' = no flags + # In reality however 'none' tries to deactivate eh and meson passes the flags for it resulting in a lot of warnings + # about overriden flags. Until this is fixed in meson vcpkg should not pass this here. + # string(APPEND native_config "cpp_eh='none'\n") # To make sure meson is not adding eh flags by itself using msvc + endif() + if(VCPKG_TARGET_IS_WINDOWS) + set(c_winlibs "${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES}") + set(cpp_winlibs "${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") + foreach(libvar IN ITEMS c_winlibs cpp_winlibs) + string(REGEX REPLACE "( |^)(-|/)" [[;\2]] "${libvar}" "${${libvar}}") + string(REPLACE ".lib " ".lib;" "${libvar}" "${${libvar}}") + vcpkg_list(REMOVE_ITEM "${libvar}" "") + vcpkg_list(JOIN "${libvar}" "', '" "${libvar}") + string(APPEND native_config "${libvar} = ['${${libvar}}']\n") + endforeach() + endif() + + set(native_config_name "${CURRENT_BUILDTREES_DIR}/meson-native-${TARGET_TRIPLET}.log") + set(vcpkg_meson_native_file "${native_config_name}" PARENT_SCOPE) + file(WRITE "${native_config_name}" "${native_config}") +endfunction() + +function(z_vcpkg_meson_convert_compiler_flags_to_list out_var compiler_flags) + string(REPLACE ";" [[\;]] tmp_var "${compiler_flags}") + string(REGEX REPLACE [=[( +|^)((\"(\\"|[^"])+"|\\"|\\ |[^ ])+)]=] ";\\2" tmp_var "${tmp_var}") + vcpkg_list(POP_FRONT tmp_var) # The first element is always empty due to the above replacement + list(TRANSFORM tmp_var STRIP) # Strip leading trailing whitespaces from each element in the list. + set("${out_var}" "${tmp_var}" PARENT_SCOPE) +endfunction() + +function(z_vcpkg_meson_convert_list_to_python_array out_var) + z_vcpkg_function_arguments(flag_list 1) + vcpkg_list(REMOVE_ITEM flag_list "") # remove empty elements if any + vcpkg_list(JOIN flag_list "', '" flag_list) + set("${out_var}" "['${flag_list}']" PARENT_SCOPE) +endfunction() + +# Generates the required compiler properties for meson +function(z_vcpkg_meson_generate_flags_properties_string out_var config_type) + set(result "") + + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(libpath_flag /LIBPATH:) + else() + set(libpath_flag -L) + endif() + if(config_type STREQUAL "DEBUG") + set(path_suffix "/debug") + else() + set(path_suffix "") + endif() + + set(libpath "${libpath_flag}${CURRENT_INSTALLED_DIR}${path_suffix}/lib") + + z_vcpkg_meson_convert_compiler_flags_to_list(cflags "${VCPKG_DETECTED_CMAKE_C_FLAGS_${config_type}}") + vcpkg_list(APPEND cflags "-I${CURRENT_INSTALLED_DIR}/include") + z_vcpkg_meson_convert_list_to_python_array(cflags ${cflags}) + string(APPEND result "c_args = ${cflags}\n") + + z_vcpkg_meson_convert_compiler_flags_to_list(cxxflags "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${config_type}}") + vcpkg_list(APPEND cxxflags "-I${CURRENT_INSTALLED_DIR}/include") + z_vcpkg_meson_convert_list_to_python_array(cxxflags ${cxxflags}) + string(APPEND result "cpp_args = ${cxxflags}\n") + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(linker_flags "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${config_type}}") + else() + set(linker_flags "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${config_type}}") + endif() + z_vcpkg_meson_convert_compiler_flags_to_list(linker_flags "${linker_flags}") + if(VCPKG_TARGET_IS_OSX) + # macOS - append arch and isysroot if cross-compiling + if(NOT "${VCPKG_OSX_ARCHITECTURES}" STREQUAL "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}") + foreach(arch IN LISTS VCPKG_OSX_ARCHITECTURES) + vcpkg_list(APPEND linker_flags -arch "${arch}") + endforeach() + endif() + if(VCPKG_DETECTED_CMAKE_OSX_SYSROOT) + vcpkg_list(APPEND linker_flags -isysroot "${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}") + endif() + endif() + vcpkg_list(APPEND linker_flags "${libpath}") + z_vcpkg_meson_convert_list_to_python_array(linker_flags ${linker_flags}) + string(APPEND result "c_link_args = ${linker_flags}\n") + string(APPEND result "cpp_link_args = ${linker_flags}\n") + set("${out_var}" "${result}" PARENT_SCOPE) +endfunction() + +function(z_vcpkg_meson_generate_native_file_config config_type) #https://mesonbuild.com/Native-environments.html + set(native_file "[properties]\n") #https://mesonbuild.com/Builtin-options.html + #Setup CMake properties + string(APPEND native_file "cmake_toolchain_file = '${SCRIPTS}/buildsystems/vcpkg.cmake'\n") + string(APPEND native_file "[cmake]\n") + + if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) + z_vcpkg_select_default_vcpkg_chainload_toolchain() + endif() + + string(APPEND native_file "VCPKG_TARGET_TRIPLET = '${TARGET_TRIPLET}'\n") + string(APPEND native_file "VCPKG_CHAINLOAD_TOOLCHAIN_FILE = '${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}'\n") + string(APPEND native_file "VCPKG_CRT_LINKAGE = '${VCPKG_CRT_LINKAGE}'\n") + + string(APPEND native_file "[built-in options]\n") + z_vcpkg_meson_generate_flags_properties_string(native_properties "${config_type}") + string(APPEND native_file "${native_properties}") + if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_CRT_LINKAGE STREQUAL "static") + set(crt_type mt) + else() + set(crt_type md) + endif() + if("${config_type}" STREQUAL "DEBUG") + string(APPEND crt_type "d") + endif() + string(APPEND native_file "b_vscrt = '${crt_type}'\n") + endif() + string(TOLOWER "${config_type}" lowerconfig) + set(native_config_name "${CURRENT_BUILDTREES_DIR}/meson-native-${TARGET_TRIPLET}-${lowerconfig}.log") + file(WRITE "${native_config_name}" "${native_file}") + set("vcpkg_meson_native_file_${config_type}" "${native_config_name}" PARENT_SCOPE) +endfunction() + +function(z_vcpkg_meson_generate_cross_file additional_binaries) #https://mesonbuild.com/Cross-compilation.html + if(CMAKE_HOST_WIN32) + if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) + set(build_arch $ENV{PROCESSOR_ARCHITEW6432}) + else() + set(build_arch $ENV{PROCESSOR_ARCHITECTURE}) + endif() + if(build_arch MATCHES "(amd|AMD)64") + set(build_cpu_fam x86_64) + set(build_cpu x86_64) + elseif(build_arch MATCHES "(x|X)86") + set(build_cpu_fam x86) + set(build_cpu i686) + elseif(build_arch MATCHES "^(ARM|arm)64$") + set(build_cpu_fam aarch64) + set(build_cpu armv8) + elseif(build_arch MATCHES "^(ARM|arm)$") + set(build_cpu_fam arm) + set(build_cpu armv7hl) + else() + message(FATAL_ERROR "Unsupported host architecture ${build_arch}!") + endif() + elseif(CMAKE_HOST_UNIX) + # at this stage, CMAKE_HOST_SYSTEM_PROCESSOR is not defined + execute_process( + COMMAND uname -m + OUTPUT_VARIABLE MACHINE + COMMAND_ERROR_IS_FATAL ANY) + + # Show real machine architecture to visually understand whether we are in a native Apple Silicon terminal or running under Rosetta emulation + debug_message("Machine: ${MACHINE}") + + if(MACHINE MATCHES "arm64|aarch64") + set(build_cpu_fam aarch64) + set(build_cpu armv8) + elseif(MACHINE MATCHES "x86_64|amd64") + set(build_cpu_fam x86_64) + set(build_cpu x86_64) + elseif(MACHINE MATCHES "x86|i686") + set(build_cpu_fam x86) + set(build_cpu i686) + elseif(MACHINE MATCHES "i386") + set(build_cpu_fam x86) + set(build_cpu i386) + else() + # https://github.com/mesonbuild/meson/blob/master/docs/markdown/Reference-tables.md#cpu-families + message(FATAL_ERROR "Unhandled machine: ${MACHINE}") + endif() + else() + message(FATAL_ERROR "Failed to detect the host architecture!") + endif() + + if(VCPKG_TARGET_ARCHITECTURE MATCHES "(amd|AMD|x|X)64") + set(host_cpu_fam x86_64) + set(host_cpu x86_64) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "(x|X)86") + set(host_cpu_fam x86) + set(host_cpu i686) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "^(ARM|arm)64$") + set(host_cpu_fam aarch64) + set(host_cpu armv8) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "^(ARM|arm)$") + set(host_cpu_fam arm) + set(host_cpu armv7hl) + else() + message(FATAL_ERROR "Unsupported target architecture ${VCPKG_TARGET_ARCHITECTURE}!" ) + endif() + + set(cross_file "") + z_vcpkg_append_proglist(cross_file "${additional_binaries}") + + string(APPEND cross_file "[properties]\n") + + string(APPEND cross_file "[host_machine]\n") + string(APPEND cross_file "endian = 'little'\n") + if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_TARGET_IS_MINGW) + set(meson_system_name "windows") + else() + string(TOLOWER "${VCPKG_CMAKE_SYSTEM_NAME}" meson_system_name) + endif() + string(APPEND cross_file "system = '${meson_system_name}'\n") + string(APPEND cross_file "cpu_family = '${host_cpu_fam}'\n") + string(APPEND cross_file "cpu = '${host_cpu}'\n") + + string(APPEND cross_file "[build_machine]\n") + string(APPEND cross_file "endian = 'little'\n") + if(WIN32) + string(APPEND cross_file "system = 'windows'\n") + elseif(DARWIN) + string(APPEND cross_file "system = 'darwin'\n") + else() + string(APPEND cross_file "system = 'linux'\n") + endif() + + if(DEFINED build_cpu_fam) + string(APPEND cross_file "cpu_family = '${build_cpu_fam}'\n") + endif() + if(DEFINED build_cpu) + string(APPEND cross_file "cpu = '${build_cpu}'\n") + endif() + + if(NOT build_cpu_fam MATCHES "${host_cpu_fam}" + OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_UWP + OR (VCPKG_TARGET_IS_MINGW AND NOT WIN32)) + set(native_config_name "${CURRENT_BUILDTREES_DIR}/meson-cross-${TARGET_TRIPLET}.log") + set(vcpkg_meson_cross_file "${native_config_name}" PARENT_SCOPE) + file(WRITE "${native_config_name}" "${cross_file}") + endif() +endfunction() + +function(z_vcpkg_meson_generate_cross_file_config config_type) #https://mesonbuild.com/Native-environments.html + set(cross_${config_type}_log "[properties]\n") #https://mesonbuild.com/Builtin-options.html + string(APPEND cross_${config_type}_log "[built-in options]\n") + z_vcpkg_meson_generate_flags_properties_string(cross_properties ${config_type}) + string(APPEND cross_${config_type}_log "${cross_properties}") + if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_CRT_LINKAGE STREQUAL "static") + set(crt_type mt) + else() + set(crt_type md) + endif() + if(${config_type} STREQUAL "DEBUG") + set(crt_type ${crt_type}d) + endif() + string(APPEND cross_${config_type}_log "b_vscrt = '${crt_type}'\n") + endif() + string(TOLOWER "${config_type}" lowerconfig) + set(native_config_name "${CURRENT_BUILDTREES_DIR}/meson-cross-${TARGET_TRIPLET}-${lowerconfig}.log") + set(VCPKG_MESON_CROSS_FILE_${config_type} "${native_config_name}" PARENT_SCOPE) + file(WRITE "${native_config_name}" "${cross_${config_type}_log}") +endfunction() + + +function(vcpkg_configure_meson) + # parse parameters such that semicolons in options arguments to COMMAND don't get erased + cmake_parse_arguments(PARSE_ARGV 0 arg + "NO_PKG_CONFIG" + "SOURCE_PATH" + "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;ADDITIONAL_NATIVE_BINARIES;ADDITIONAL_CROSS_BINARIES" + ) + + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + + z_vcpkg_get_cmake_vars(cmake_vars_file) + debug_message("Including cmake vars from: ${cmake_vars_file}") + include("${cmake_vars_file}") + + vcpkg_find_acquire_program(MESON) + + vcpkg_list(APPEND arg_OPTIONS --buildtype plain --backend ninja --wrap-mode nodownload) + + if(NOT vcpkg_meson_cross_file) + z_vcpkg_meson_generate_cross_file("${arg_ADDITIONAL_CROSS_BINARIES}") + endif() + # We must use uppercase `DEBUG` and `RELEASE` here because they matches the configuration data + if(NOT VCPKG_MESON_CROSS_FILE_DEBUG AND vcpkg_meson_cross_file) + z_vcpkg_meson_generate_cross_file_config(DEBUG) + endif() + if(NOT VCPKG_MESON_CROSS_FILE_RELEASE AND vcpkg_meson_cross_file) + z_vcpkg_meson_generate_cross_file_config(RELEASE) + endif() + if(vcpkg_meson_cross_file) + vcpkg_list(APPEND arg_OPTIONS --cross "${vcpkg_meson_cross_file}") + endif() + if(VCPKG_MESON_CROSS_FILE_DEBUG) + vcpkg_list(APPEND arg_OPTIONS_DEBUG --cross "${VCPKG_MESON_CROSS_FILE_DEBUG}") + endif() + if(VCPKG_MESON_CROSS_FILE_RELEASE) + vcpkg_list(APPEND arg_OPTIONS_RELEASE --cross "${VCPKG_MESON_CROSS_FILE_RELEASE}") + endif() + + if(NOT vcpkg_meson_native_file AND NOT vcpkg_meson_cross_file) + z_vcpkg_meson_generate_native_file("${arg_ADDITIONAL_NATIVE_BINARIES}") + endif() + if(NOT vcpkg_meson_native_file_DEBUG AND NOT vcpkg_meson_cross_file) + z_vcpkg_meson_generate_native_file_config(DEBUG) + endif() + if(NOT vcpkg_meson_native_file_RELEASE AND NOT vcpkg_meson_cross_file) + z_vcpkg_meson_generate_native_file_config(RELEASE) + endif() + if(vcpkg_meson_native_file AND NOT vcpkg_meson_cross_file) + vcpkg_list(APPEND arg_OPTIONS --native "${vcpkg_meson_native_file}") + vcpkg_list(APPEND arg_OPTIONS_DEBUG --native "${vcpkg_meson_native_file_DEBUG}") + vcpkg_list(APPEND arg_OPTIONS_RELEASE --native "${vcpkg_meson_native_file_RELEASE}") + else() + vcpkg_list(APPEND arg_OPTIONS --native "${SCRIPTS}/buildsystems/meson/none.txt") + endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_list(APPEND arg_OPTIONS --default-library shared) + else() + vcpkg_list(APPEND arg_OPTIONS --default-library static) + endif() + + vcpkg_list(APPEND arg_OPTIONS --libdir lib) # else meson install into an architecture describing folder + vcpkg_list(APPEND arg_OPTIONS_DEBUG -Ddebug=true --prefix "${CURRENT_PACKAGES_DIR}/debug" --includedir ../include) + vcpkg_list(APPEND arg_OPTIONS_RELEASE -Ddebug=false --prefix "${CURRENT_PACKAGES_DIR}") + + # select meson cmd-line options + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_list(APPEND arg_OPTIONS_DEBUG "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}/debug','${CURRENT_INSTALLED_DIR}','${CURRENT_INSTALLED_DIR}/share']") + vcpkg_list(APPEND arg_OPTIONS_RELEASE "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}','${CURRENT_INSTALLED_DIR}/debug','${CURRENT_INSTALLED_DIR}/share']") + else() + vcpkg_list(APPEND arg_OPTIONS_DEBUG "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}/debug','${CURRENT_INSTALLED_DIR}']") + vcpkg_list(APPEND arg_OPTIONS_RELEASE "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}','${CURRENT_INSTALLED_DIR}/debug']") + endif() + + set(buildtypes) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(buildname "DEBUG") + vcpkg_list(APPEND buildtypes ${buildname}) + set(path_suffix_${buildname} "debug/") + set(suffix_${buildname} "dbg") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(buildname "RELEASE") + vcpkg_list(APPEND buildtypes ${buildname}) + set(path_suffix_${buildname} "") + set(suffix_${buildname} "rel") + endif() + + vcpkg_backup_env_variables(VARS INCLUDE) + vcpkg_host_path_list(APPEND ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include") + # configure build + foreach(buildtype IN LISTS buildtypes) + message(STATUS "Configuring ${TARGET_TRIPLET}-${suffix_${buildtype}}") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}") + #setting up PKGCONFIG + if(NOT arg_NO_PKG_CONFIG) + if ("${buildtype}" STREQUAL "DEBUG") + z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}/debug") + else() + z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}") + endif() + endif() + + vcpkg_execute_required_process( + COMMAND ${MESON} ${arg_OPTIONS} ${arg_OPTIONS_${buildtype}} ${arg_SOURCE_PATH} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}" + LOGNAME config-${TARGET_TRIPLET}-${suffix_${buildtype}} + ) + + #Copy meson log files into buildtree for CI + if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-logs/meson-log.txt") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-logs/meson-log.txt" DESTINATION "${CURRENT_BUILDTREES_DIR}") + file(RENAME "${CURRENT_BUILDTREES_DIR}/meson-log.txt" "${CURRENT_BUILDTREES_DIR}/meson-log-${suffix_${buildtype}}.log") + endif() + if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-info/intro-dependencies.json") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-info/intro-dependencies.json" DESTINATION "${CURRENT_BUILDTREES_DIR}") + file(RENAME "${CURRENT_BUILDTREES_DIR}/intro-dependencies.json" "${CURRENT_BUILDTREES_DIR}/intro-dependencies-${suffix_${buildtype}}.log") + endif() + if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-logs/install-log.txt") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-logs/install-log.txt" DESTINATION "${CURRENT_BUILDTREES_DIR}") + file(RENAME "${CURRENT_BUILDTREES_DIR}/install-log.txt" "${CURRENT_BUILDTREES_DIR}/install-log-${suffix_${buildtype}}.log") + endif() + message(STATUS "Configuring ${TARGET_TRIPLET}-${suffix_${buildtype}} done") + + if(NOT arg_NO_PKG_CONFIG) + z_vcpkg_restore_pkgconfig_path() + endif() + endforeach() + + vcpkg_restore_env_variables(VARS INCLUDE) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_configure_qmake.cmake b/externals/vcpkg/scripts/cmake/vcpkg_configure_qmake.cmake new file mode 100755 index 000000000..9a5ed00ce --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_configure_qmake.cmake @@ -0,0 +1,100 @@ +function(vcpkg_configure_qmake) + # parse parameters such that semicolons in options arguments to COMMAND don't get erased + cmake_parse_arguments(PARSE_ARGV 0 arg + "" + "SOURCE_PATH" + "OPTIONS;OPTIONS_RELEASE;OPTIONS_DEBUG;BUILD_OPTIONS;BUILD_OPTIONS_RELEASE;BUILD_OPTIONS_DEBUG" + ) + + # Find qmake executable + find_program(qmake_executable NAMES qmake PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/bin" NO_DEFAULT_PATH) + + if(NOT qmake_executable) + message(FATAL_ERROR "vcpkg_configure_qmake: unable to find qmake.") + endif() + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_list(APPEND arg_OPTIONS "CONFIG-=shared" "CONFIG*=static") + else() + vcpkg_list(APPEND arg_OPTIONS "CONFIG-=static" "CONFIG*=shared") + vcpkg_list(APPEND arg_OPTIONS_DEBUG "CONFIG*=separate_debug_info") + endif() + + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_CRT_LINKAGE STREQUAL "static") + vcpkg_list(APPEND arg_OPTIONS "CONFIG*=static-runtime") + endif() + + if(DEFINED VCPKG_OSX_DEPLOYMENT_TARGET) + set(ENV{QMAKE_MACOSX_DEPLOYMENT_TARGET} ${VCPKG_OSX_DEPLOYMENT_TARGET}) + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}" "${CURRENT_PACKAGES_DIR}") + + set(current_binary_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + + # Cleanup build directories + file(REMOVE_RECURSE "${current_binary_dir}") + + configure_file("${CURRENT_INSTALLED_DIR}/tools/qt5/qt_release.conf" "${current_binary_dir}/qt.conf") + + message(STATUS "Configuring ${TARGET_TRIPLET}-rel") + file(MAKE_DIRECTORY "${current_binary_dir}") + + vcpkg_list(SET build_opt_param) + if(DEFINED arg_BUILD_OPTIONS OR DEFINED arg_BUILD_OPTIONS_RELEASE) + vcpkg_list(SET build_opt_param -- ${arg_BUILD_OPTIONS} ${arg_BUILD_OPTIONS_RELEASE}) + endif() + + vcpkg_execute_required_process( + COMMAND "${qmake_executable}" CONFIG-=debug CONFIG+=release + ${arg_OPTIONS} ${arg_OPTIONS_RELEASE} ${arg_SOURCE_PATH} + -qtconf "${current_binary_dir}/qt.conf" + ${build_opt_param} + WORKING_DIRECTORY "${current_binary_dir}" + LOGNAME "config-${TARGET_TRIPLET}-rel" + ) + message(STATUS "Configuring ${TARGET_TRIPLET}-rel done") + if(EXISTS "${current_binary_dir}/config.log") + file(REMOVE "${CURRENT_BUILDTREES_DIR}/internal-config-${TARGET_TRIPLET}-rel.log") + file(RENAME "${current_binary_dir}/config.log" "${CURRENT_BUILDTREES_DIR}/internal-config-${TARGET_TRIPLET}-rel.log") + endif() + + z_vcpkg_restore_pkgconfig_path() + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}/debug" "${CURRENT_PACKAGES_DIR}/debug") + + set(current_binary_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + + # Cleanup build directories + file(REMOVE_RECURSE "${current_binary_dir}") + + configure_file("${CURRENT_INSTALLED_DIR}/tools/qt5/qt_debug.conf" "${current_binary_dir}/qt.conf") + + message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") + file(MAKE_DIRECTORY "${current_binary_dir}") + + vcpkg_list(SET build_opt_param) + if(DEFINED arg_BUILD_OPTIONS OR DEFINED arg_BUILD_OPTIONS_DEBUG) + vcpkg_list(SET build_opt_param -- ${arg_BUILD_OPTIONS} ${arg_BUILD_OPTIONS_DEBUG}) + endif() + vcpkg_execute_required_process( + COMMAND "${qmake_executable}" CONFIG-=release CONFIG+=debug + ${arg_OPTIONS} ${arg_OPTIONS_DEBUG} ${arg_SOURCE_PATH} + -qtconf "${current_binary_dir}/qt.conf" + ${build_opt_param} + WORKING_DIRECTORY "${current_binary_dir}" + LOGNAME "config-${TARGET_TRIPLET}-dbg" + ) + message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done") + if(EXISTS "${current_binary_dir}/config.log") + file(REMOVE "${CURRENT_BUILDTREES_DIR}/internal-config-${TARGET_TRIPLET}-dbg.log") + file(RENAME "${current_binary_dir}/config.log" "${CURRENT_BUILDTREES_DIR}/internal-config-${TARGET_TRIPLET}-dbg.log") + endif() + + z_vcpkg_restore_pkgconfig_path() + endif() + +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_copy_pdbs.cmake b/externals/vcpkg/scripts/cmake/vcpkg_copy_pdbs.cmake new file mode 100755 index 000000000..ce26c8d1f --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_copy_pdbs.cmake @@ -0,0 +1,49 @@ +function(vcpkg_copy_pdbs) + cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "" "BUILD_PATHS") + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + if(NOT DEFINED arg_BUILD_PATHS) + set(arg_BUILD_PATHS + "${CURRENT_PACKAGES_DIR}/bin/*.dll" + "${CURRENT_PACKAGES_DIR}/debug/bin/*.dll" + ) + endif() + + set(dlls_without_matching_pdbs "") + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + file(GLOB_RECURSE dlls ${arg_BUILD_PATHS}) + + set(vslang_backup "$ENV{VSLANG}") + set(ENV{VSLANG} 1033) + + foreach(dll IN LISTS dlls) + execute_process(COMMAND dumpbin /PDBPATH "${dll}" + COMMAND findstr PDB + OUTPUT_VARIABLE pdb_line + ERROR_QUIET + RESULT_VARIABLE error_code + ) + + if(error_code EQUAL "0" AND pdb_line MATCHES "PDB file found at.*'(.*)'") + set(pdb_path "${CMAKE_MATCH_1}") + cmake_path(GET dll PARENT_PATH dll_dir) + file(COPY "${pdb_path}" DESTINATION "${dll_dir}") + else() + list(APPEND dlls_without_matching_pdbs "${dll}") + endif() + endforeach() + + set(ENV{VSLANG} "${vslang_backup}") + + if(NOT dlls_without_matching_pdbs STREQUAL "") + list(JOIN dlls_without_matching_pdbs "\n " message) + message(WARNING "Could not find a matching pdb file for: + ${message}\n") + endif() + endif() + +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_copy_tool_dependencies.cmake b/externals/vcpkg/scripts/cmake/vcpkg_copy_tool_dependencies.cmake new file mode 100755 index 000000000..cf3939bac --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_copy_tool_dependencies.cmake @@ -0,0 +1,45 @@ +function(z_vcpkg_copy_tool_dependencies_search tool_dir path_to_search) + if(DEFINED Z_VCPKG_COPY_TOOL_DEPENDENCIES_COUNT) + set(count ${Z_VCPKG_COPY_TOOL_DEPENDENCIES_COUNT}) + else() + set(count 0) + endif() + file(GLOB tools "${tool_dir}/*.exe" "${tool_dir}/*.dll" "${tool_dir}/*.pyd") + foreach(tool IN LISTS tools) + vcpkg_execute_required_process( + COMMAND "${Z_VCPKG_POWERSHELL_CORE}" -noprofile -executionpolicy Bypass -nologo + -file "${SCRIPTS}/buildsystems/msbuild/applocal.ps1" + -targetBinary "${tool}" + -installedDir "${path_to_search}" + -verbose + WORKING_DIRECTORY "${VCPKG_ROOT_DIR}" + LOGNAME copy-tool-dependencies-${count} + ) + math(EXPR count "${count} + 1") + endforeach() + set(Z_VCPKG_COPY_TOOL_DEPENDENCIES_COUNT ${count} CACHE INTERNAL "") +endfunction() + +function(vcpkg_copy_tool_dependencies tool_dir) + if(ARGC GREATER 1) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${ARGN}") + endif() + + if(VCPKG_TARGET_IS_WINDOWS) + find_program(Z_VCPKG_POWERSHELL_CORE pwsh) + if (NOT Z_VCPKG_POWERSHELL_CORE) + message(FATAL_ERROR "Could not find PowerShell Core; please open an issue to report this.") + endif() + cmake_path(RELATIVE_PATH tool_dir + BASE_DIRECTORY "${CURRENT_PACKAGES_DIR}" + OUTPUT_VARIABLE relative_tool_dir + ) + if(relative_tool_dir MATCHES "/debug/") + z_vcpkg_copy_tool_dependencies_search("${tool_dir}" "${CURRENT_PACKAGES_DIR}/debug/bin") + z_vcpkg_copy_tool_dependencies_search("${tool_dir}" "${CURRENT_INSTALLED_DIR}/debug/bin") + else() + z_vcpkg_copy_tool_dependencies_search("${tool_dir}" "${CURRENT_PACKAGES_DIR}/bin") + z_vcpkg_copy_tool_dependencies_search("${tool_dir}" "${CURRENT_INSTALLED_DIR}/bin") + endif() + endif() +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_copy_tools.cmake b/externals/vcpkg/scripts/cmake/vcpkg_copy_tools.cmake new file mode 100755 index 000000000..d9b3b9523 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_copy_tools.cmake @@ -0,0 +1,49 @@ +function(vcpkg_copy_tools) + cmake_parse_arguments(PARSE_ARGV 0 arg "AUTO_CLEAN" "SEARCH_DIR;DESTINATION" "TOOL_NAMES") + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + if(NOT DEFINED arg_TOOL_NAMES) + message(FATAL_ERROR "TOOL_NAMES must be specified.") + endif() + + if(NOT DEFINED arg_DESTINATION) + set(arg_DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + endif() + + if(NOT DEFINED arg_SEARCH_DIR) + set(arg_SEARCH_DIR "${CURRENT_PACKAGES_DIR}/bin") + elseif(NOT IS_DIRECTORY "${arg_SEARCH_DIR}") + message(FATAL_ERROR "SEARCH_DIR (${arg_SEARCH_DIR}) must be a directory") + endif() + + foreach(tool_name IN LISTS arg_TOOL_NAMES) + set(tool_path "${arg_SEARCH_DIR}/${tool_name}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + set(tool_pdb "${arg_SEARCH_DIR}/${tool_name}.pdb") + if(EXISTS "${tool_path}") + file(COPY "${tool_path}" DESTINATION "${arg_DESTINATION}") + elseif(NOT "${VCPKG_TARGET_BUNDLE_SUFFIX}" STREQUAL "" AND NOT "${VCPKG_TARGET_BUNDLE_SUFFIX}" STREQUAL "${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + set(bundle_path "${arg_SEARCH_DIR}/${tool_name}${VCPKG_TARGET_BUNDLE_SUFFIX}") + if(EXISTS "${bundle_path}") + file(COPY "${bundle_path}" DESTINATION "${arg_DESTINATION}") + else() + message(FATAL_ERROR "Couldn't find tool \"${tool_name}\": + neither \"${tool_path}\" nor \"${bundle_path}\" exists") + endif() + else() + message(FATAL_ERROR "Couldn't find tool \"${tool_name}\": + \"${tool_path}\" does not exist") + endif() + if(EXISTS "${tool_pdb}") + file(COPY "${tool_pdb}" DESTINATION "${arg_DESTINATION}") + endif() + endforeach() + + if(arg_AUTO_CLEAN) + vcpkg_clean_executables_in_bin(FILE_NAMES ${arg_TOOL_NAMES}) + endif() + + vcpkg_copy_tool_dependencies("${arg_DESTINATION}") +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_download_distfile.cmake b/externals/vcpkg/scripts/cmake/vcpkg_download_distfile.cmake new file mode 100755 index 000000000..5277129f8 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_download_distfile.cmake @@ -0,0 +1,254 @@ +function(z_vcpkg_download_distfile_test_hash file_path kind error_advice sha512 skip_sha512) + if(_VCPKG_INTERNAL_NO_HASH_CHECK) + # When using the internal hash skip, do not output an explicit message. + return() + endif() + if(skip_sha512) + message(STATUS "Skipping hash check for ${file_path}.") + return() + endif() + + file(SHA512 "${file_path}" file_hash) + string(TOLOWER "${sha512}" sha512_lower) + if(NOT "${file_hash}" STREQUAL "${sha512_lower}") + message(FATAL_ERROR + "\nFile does not have expected hash:\n" + " File path: [ ${file_path} ]\n" + " Expected hash: [ ${sha512} ]\n" + " Actual hash: [ ${file_hash} ]\n" + "${error_advice}\n") + endif() +endfunction() + +function(z_vcpkg_download_distfile_show_proxy_and_fail error_code) + message(FATAL_ERROR + " \n" + " Failed to download file with error: ${error_code}\n" + " If you use a proxy, please check your proxy setting. Possible causes are:\n" + " \n" + " 1. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable\n" + " to `https://address:port`. This is not correct, because `https://` prefix\n" + " claims the proxy is an HTTPS proxy, while your proxy (v2ray, shadowsocksr\n" + " , etc..) is an HTTP proxy. Try setting `http://address:port` to both\n" + " HTTP_PROXY and HTTPS_PROXY instead.\n" + " \n" + " 2. You are using Fiddler. Currently a bug (https://github.com/microsoft/vcpkg/issues/17752)\n" + " will set HTTPS_PROXY to `https://fiddler_address:port` which lead to problem 1 above.\n" + " Workaround is open Windows 10 Settings App, and search for Proxy Configuration page,\n" + " Change `http=address:port;https=address:port` to `address`, and fill the port number.\n" + " \n" + " 3. Your proxy's remote server is out of service.\n" + " \n" + " In future vcpkg releases, if you are using Windows, you no longer need to set\n" + " HTTP(S)_PROXY environment variables. Vcpkg will simply apply Windows IE Proxy\n" + " Settings set by your proxy software. See (https://github.com/microsoft/vcpkg-tool/pull/49)\n" + " and (https://github.com/microsoft/vcpkg-tool/pull/77)\n" + " \n" + " Otherwise, please submit an issue at https://github.com/Microsoft/vcpkg/issues\n") +endfunction() + +function(z_vcpkg_download_distfile_via_aria) + cmake_parse_arguments(PARSE_ARGV 1 arg + "SKIP_SHA512" + "FILENAME;SHA512" + "URLS;HEADERS" + ) + + message(STATUS "Downloading ${arg_FILENAME}...") + + vcpkg_list(SET headers_param) + foreach(header IN LISTS arg_HEADERS) + vcpkg_list(APPEND headers_param "--header=${header}") + endforeach() + + foreach(URL IN LISTS arg_URLS) + debug_message("Download Command: ${ARIA2} ${URL} -o temp/${filename} -l download-${filename}-detailed.log ${headers_param}") + vcpkg_execute_in_download_mode( + COMMAND ${ARIA2} ${URL} + -o temp/${arg_FILENAME} + -l download-${arg_FILENAME}-detailed.log + ${headers_param} + OUTPUT_FILE download-${arg_FILENAME}-out.log + ERROR_FILE download-${arg_FILENAME}-err.log + RESULT_VARIABLE error_code + WORKING_DIRECTORY "${DOWNLOADS}" + ) + + if ("${error_code}" STREQUAL "0") + break() + endif() + endforeach() + if (NOT "${error_code}" STREQUAL "0") + message(STATUS + "Downloading ${arg_FILENAME}... Failed.\n" + " Exit Code: ${error_code}\n" + " See logs for more information:\n" + " ${DOWNLOADS}/download-${arg_FILENAME}-out.log\n" + " ${DOWNLOADS}/download-${arg_FILENAME}-err.log\n" + " ${DOWNLOADS}/download-${arg_FILENAME}-detailed.log\n" + ) + z_vcpkg_download_distfile_show_proxy_and_fail("${error_code}") + else() + z_vcpkg_download_distfile_test_hash( + "${DOWNLOADS}/temp/${arg_FILENAME}" + "downloaded file" + "The file may have been corrupted in transit." + "${arg_SHA512}" + ${arg_SKIP_SHA512} + ) + file(REMOVE + ${DOWNLOADS}/download-${arg_FILENAME}-out.log + ${DOWNLOADS}/download-${arg_FILENAME}-err.log + ${DOWNLOADS}/download-${arg_FILENAME}-detailed.log + ) + get_filename_component(downloaded_file_dir "${downloaded_file_path}" DIRECTORY) + file(MAKE_DIRECTORY "${downloaded_file_dir}") + file(RENAME "${DOWNLOADS}/temp/${arg_FILENAME}" "${downloaded_file_path}") + endif() +endfunction() + +function(vcpkg_download_distfile out_var) + cmake_parse_arguments(PARSE_ARGV 1 arg + "SKIP_SHA512;SILENT_EXIT;QUIET;ALWAYS_REDOWNLOAD" + "FILENAME;SHA512" + "URLS;HEADERS" + ) + + if(NOT DEFINED arg_URLS) + message(FATAL_ERROR "vcpkg_download_distfile requires a URLS argument.") + endif() + if(NOT DEFINED arg_FILENAME) + message(FATAL_ERROR "vcpkg_download_distfile requires a FILENAME argument.") + endif() + if(arg_SILENT_EXIT) + message(WARNING "SILENT_EXIT has been deprecated as an argument to vcpkg_download_distfile -- remove the argument to resolve this warning") + endif() + if(arg_ALWAYS_REDOWNLOAD AND NOT arg_SKIP_SHA512) + message(FATAL_ERROR "ALWAYS_REDOWNLOAD option requires SKIP_SHA512 as well") + endif() + + if(NOT arg_SKIP_SHA512 AND NOT DEFINED arg_SHA512) + message(FATAL_ERROR "vcpkg_download_distfile requires a SHA512 argument. +If you do not know the SHA512, add it as 'SHA512 0' and re-run this command.") + elseif(arg_SKIP_SHA512 AND DEFINED arg_SHA512) + message(FATAL_ERROR "vcpkg_download_distfile must not be passed both SHA512 and SKIP_SHA512.") + endif() + + if(_VCPKG_INTERNAL_NO_HASH_CHECK) + set(arg_SKIP_SHA512 1) + endif() + + if(NOT arg_SKIP_SHA512) + if("${arg_SHA512}" STREQUAL "0") + string(REPEAT 0 128 arg_SHA512) + else() + string(LENGTH "${arg_SHA512}" arg_SHA512_length) + if(NOT "${arg_SHA512_length}" EQUAL "128" OR NOT "${arg_SHA512}" MATCHES "^[a-zA-Z0-9]*$") + message(FATAL_ERROR "Invalid SHA512: ${arg_SHA512}. + If you do not know the file's SHA512, set this to \"0\".") + endif() + endif() + endif() + + set(downloaded_file_path "${DOWNLOADS}/${arg_FILENAME}") + set(download_file_path_part "${DOWNLOADS}/temp/${arg_FILENAME}") + + # Works around issue #3399 + # Delete "temp0" directory created by the old version of vcpkg + file(REMOVE_RECURSE "${DOWNLOADS}/temp0") + file(REMOVE_RECURSE "${DOWNLOADS}/temp") + file(MAKE_DIRECTORY "${DOWNLOADS}/temp") + + # check if file with same name already exists in downloads + if(EXISTS "${downloaded_file_path}") + set(advice_message "The cached file SHA512 doesn't match. The file may have been corrupted.") + if(_VCPKG_NO_DOWNLOADS) + string(APPEND advice_message " Downloads are disabled please provide a valid file at path ${downloaded_file_path} and retry.") + else() + string(APPEND advice_message " To re-download this file please delete cached file at path ${downloaded_file_path} and retry.") + endif() + + z_vcpkg_download_distfile_test_hash( + "${downloaded_file_path}" + "cached file" + "${advice_message}" + "${arg_SHA512}" + "${arg_SKIP_SHA512}" + ) + + if(NOT vcpkg_download_distfile_QUIET) + message(STATUS "Using cached ${arg_FILENAME}.") + endif() + + # Suppress the "Downloading ${arg_URLS} -> ${arg_FILENAME}..." message + set(vcpkg_download_distfile_QUIET TRUE) + endif() + + # vcpkg_download_distfile_ALWAYS_REDOWNLOAD only triggers when NOT _VCPKG_NO_DOWNLOADS + # this could be de-morgan'd out but it's more clear this way + if(_VCPKG_NO_DOWNLOADS) + if(NOT EXISTS "${downloaded_file_path}") + message(FATAL_ERROR "Downloads are disabled, but '${downloaded_file_path}' does not exist.") + endif() + + set("${out_var}" "${downloaded_file_path}" PARENT_SCOPE) + return() + endif() + + if(NOT arg_DISABLE_ARIA2 AND _VCPKG_DOWNLOAD_TOOL STREQUAL "ARIA2" AND NOT EXISTS "${downloaded_file_path}") + if (arg_SKIP_SHA512) + set(OPTION_SKIP_SHA512 "SKIP_SHA512") + endif() + z_vcpkg_download_distfile_via_aria( + "${OPTION_SKIP_SHA512}" + FILENAME "${arg_FILENAME}" + SHA512 "${arg_SHA512}" + URLS "${arg_URLS}" + HEADERS "${arg_HEADERS}" + ) + set("${out_var}" "${downloaded_file_path}" PARENT_SCOPE) + return() + endif() + + vcpkg_list(SET urls_param) + foreach(url IN LISTS arg_URLS) + vcpkg_list(APPEND urls_param "--url=${url}") + endforeach() + if(NOT vcpkg_download_distfile_QUIET) + message(STATUS "Downloading ${arg_URLS} -> ${arg_FILENAME}...") + endif() + + vcpkg_list(SET headers_param) + foreach(header IN LISTS arg_HEADERS) + list(APPEND headers_param "--header=${header}") + endforeach() + + if(arg_SKIP_SHA512) + vcpkg_list(SET sha512_param "--skip-sha512") + else() + vcpkg_list(SET sha512_param "--sha512=${arg_SHA512}") + endif() + + if(NOT EXISTS "${downloaded_file_path}" OR arg_ALWAYS_REDOWNLOAD) + vcpkg_execute_in_download_mode( + COMMAND "$ENV{VCPKG_COMMAND}" x-download + "${downloaded_file_path}" + ${sha512_param} + ${urls_param} + ${headers_param} + --debug + --feature-flags=-manifests # there's a bug in vcpkg x-download when it finds a manifest-root + OUTPUT_VARIABLE output + ERROR_VARIABLE output + RESULT_VARIABLE error_code + WORKING_DIRECTORY "${DOWNLOADS}" + ) + + if(NOT "${error_code}" EQUAL "0") + message("${output}") + z_vcpkg_download_distfile_show_proxy_and_fail("${error_code}") + endif() + endif() + + set("${out_var}" "${downloaded_file_path}" PARENT_SCOPE) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_execute_build_process.cmake b/externals/vcpkg/scripts/cmake/vcpkg_execute_build_process.cmake new file mode 100755 index 000000000..8f3c9cdcc --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_execute_build_process.cmake @@ -0,0 +1,136 @@ +set(Z_VCPKG_EXECUTE_BUILD_PROCESS_RETRY_ERROR_MESSAGES + "LINK : fatal error LNK1102:" + " fatal error C1060: " + # The linker ran out of memory during execution. We will try continuing once more, with parallelism disabled. + "LINK : fatal error LNK1318:" + "LINK : fatal error LNK1104:" + "LINK : fatal error LNK1201:" + "ld terminated with signal 9" + "Killed signal terminated program" + # Multiple threads using the same directory at the same time cause conflicts, will try again. + "Cannot create parent directory" + "Cannot write file" + # Multiple threads caused the wrong order of creating folders and creating files in folders + "Can't open" +) +list(JOIN Z_VCPKG_EXECUTE_BUILD_PROCESS_RETRY_ERROR_MESSAGES "|" Z_VCPKG_EXECUTE_BUILD_PROCESS_RETRY_ERROR_MESSAGES) + +function(vcpkg_execute_build_process) + cmake_parse_arguments(PARSE_ARGV 0 arg "" "WORKING_DIRECTORY;LOGNAME" "COMMAND;NO_PARALLEL_COMMAND") + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + foreach(required_arg IN ITEMS WORKING_DIRECTORY COMMAND) + if(NOT DEFINED arg_${required_arg}) + message(FATAL_ERROR "${required_arg} must be specified.") + endif() + endforeach() + + if(NOT DEFINED arg_LOGNAME) + message(WARNING "LOGNAME should be specified.") + set(arg_LOGNAME "build") + endif() + + set(log_prefix "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}") + set(log_out "${log_prefix}-out.log") + set(log_err "${log_prefix}-err.log") + set(all_logs "${log_out}" "${log_err}") + + if(X_PORT_PROFILE) + vcpkg_list(PREPEND arg_COMMAND "${CMAKE_COMMAND}" "-E" "time") + if(DEFINED arg_NO_PARALLEL_COMMAND) + vcpkg_list(PREPEND arg_NO_PARALLEL_COMMAND "${CMAKE_COMMAND}" "-E" "time") + endif() + endif() + + execute_process( + COMMAND ${arg_COMMAND} + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" + OUTPUT_FILE "${log_out}" + ERROR_FILE "${log_err}" + RESULT_VARIABLE error_code + ) + + if(NOT error_code EQUAL "0") + file(READ "${log_out}" out_contents) + file(READ "${log_err}" err_contents) + set(all_contents "${out_contents}${err_contents}") + if(all_contents MATCHES "${Z_VCPKG_EXECUTE_BUILD_PROCESS_RETRY_ERROR_MESSAGES}") + message(WARNING "Please ensure your system has sufficient memory.") + set(log_out "${log_prefix}-out-1.log") + set(log_err "${log_prefix}-err-1.log") + list(APPEND all_logs "${log_out}" "${log_err}") + + if(DEFINED arg_NO_PARALLEL_COMMAND) + message(STATUS "Restarting build without parallelism") + execute_process( + COMMAND ${arg_NO_PARALLEL_COMMAND} + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" + OUTPUT_FILE "${log_out}" + ERROR_FILE "${log_err}" + RESULT_VARIABLE error_code + ) + else() + message(STATUS "Restarting build") + execute_process( + COMMAND ${arg_COMMAND} + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" + OUTPUT_FILE "${log_out}" + ERROR_FILE "${log_err}" + RESULT_VARIABLE error_code + ) + endif() + elseif(all_contents MATCHES "mt : general error c101008d: ") + # Antivirus workaround - occasionally files are locked and cause mt.exe to fail + message(STATUS "mt.exe has failed. This may be the result of anti-virus. Disabling anti-virus on the buildtree folder may improve build speed") + foreach(iteration RANGE 1 3) + message(STATUS "Restarting Build ${TARGET_TRIPLET}-${SHORT_BUILDTYPE} because of mt.exe file locking issue. Iteration: ${iteration}") + + set(log_out "${log_prefix}-out-${iteration}.log") + set(log_err "${log_prefix}-err-${iteration}.log") + list(APPEND all_logs "${log_out}" "${log_err}") + execute_process( + COMMAND ${arg_COMMAND} + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" + OUTPUT_FILE "${log_out}" + ERROR_FILE "${log_err}" + RESULT_VARIABLE error_code + ) + + if(error_code EQUAL "0") + break() + endif() + + file(READ "${log_out}" out_contents) + file(READ "${log_err}" err_contents) + set(all_contents "${out_contents}${err_contents}") + if(NOT all_contents MATCHES "mt : general error c101008d: ") + break() + endif() + endforeach() + endif() + endif() + + if(NOT error_code EQUAL "0") + set(stringified_logs "") + foreach(log IN LISTS all_logs) + if(NOT EXISTS "${log}") + continue() + endif() + file(SIZE "${log}" log_size) + if(NOT log_size EQUAL "0") + file(TO_NATIVE_PATH "${log}" native_log) + string(APPEND stringified_logs " ${native_log}\n") + file(APPEND "${Z_VCPKG_ERROR_LOG_COLLECTION_FILE}" "${native_log}\n") + endif() + endforeach() + z_vcpkg_prettify_command_line(pretty_command ${arg_COMMAND}) + message(FATAL_ERROR + " Command failed: ${pretty_command}\n" + " Working Directory: ${arg_WORKING_DIRECTORY}\n" + " See logs for more information:\n" + "${stringified_logs}" + ) + endif() +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_execute_in_download_mode.cmake b/externals/vcpkg/scripts/cmake/vcpkg_execute_in_download_mode.cmake new file mode 100755 index 000000000..2ad1481f8 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_execute_in_download_mode.cmake @@ -0,0 +1,46 @@ +function(vcpkg_execute_in_download_mode) + # this allows us to grab the value of the output variables, but pass through the rest of the arguments + cmake_parse_arguments(PARSE_ARGV 0 arg "" "RESULT_VARIABLE;RESULTS_VARIABLE;OUTPUT_VARIABLE;ERROR_VARIABLE" "") + + set(output_and_error_same OFF) + set(output_variable_param "") + set(error_variable_param "") + set(result_variable_param "") + set(results_variable_param "") + if(DEFINED arg_OUTPUT_VARIABLE AND DEFINED arg_ERROR_VARIABLE AND arg_OUTPUT_VARIABLE STREQUAL arg_ERROR_VARIABLE) + set(output_variable_param OUTPUT_VARIABLE out_err_var) + set(error_variable_param ERROR_VARIABLE out_err_var) + set(output_and_error_same ON) + else() + if(DEFINED arg_OUTPUT_VARIABLE) + set(output_variable_param OUTPUT_VARIABLE out_var) + endif() + if(DEFINED arg_ERROR_VARIABLE) + set(error_variable_param ERROR_VARIABLE err_var) + endif() + endif() + if(DEFINED arg_RESULT_VARIABLE) + set(result_variable_param RESULT_VARIABLE result_var) + endif() + if(DEFINED arg_RESULTS_VARIABLE) + set(results_variable_param RESULTS_VARIABLE results_var) + endif() + + cmake_language(CALL "${Z_VCPKG_EXECUTE_PROCESS_NAME}" + ${arg_UNPARSED_ARGUMENTS} + ${output_variable_param} + ${error_variable_param} + ${result_variable_param} + ${results_variable_param} + ) + + if(output_and_error_same) + z_vcpkg_forward_output_variable(arg_OUTPUT_VARIABLE out_err_var) + else() + z_vcpkg_forward_output_variable(arg_OUTPUT_VARIABLE out_var) + z_vcpkg_forward_output_variable(arg_ERROR_VARIABLE err_var) + endif() + + z_vcpkg_forward_output_variable(arg_RESULT_VARIABLE result_var) + z_vcpkg_forward_output_variable(arg_RESULTS_VARIABLE results_var) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_execute_required_process.cmake b/externals/vcpkg/scripts/cmake/vcpkg_execute_required_process.cmake new file mode 100755 index 000000000..ffdd2815d --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_execute_required_process.cmake @@ -0,0 +1,100 @@ +function(vcpkg_execute_required_process) + cmake_parse_arguments(PARSE_ARGV 0 arg + "ALLOW_IN_DOWNLOAD_MODE" + "WORKING_DIRECTORY;LOGNAME;TIMEOUT;OUTPUT_VARIABLE;ERROR_VARIABLE" + "COMMAND" + ) + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + foreach(required_arg IN ITEMS WORKING_DIRECTORY COMMAND) + if(NOT DEFINED arg_${required_arg}) + message(FATAL_ERROR "${required_arg} must be specified.") + endif() + endforeach() + + if(NOT DEFINED arg_LOGNAME) + message(WARNING "LOGNAME should be specified.") + set(arg_LOGNAME "required") + endif() + + if (VCPKG_DOWNLOAD_MODE AND NOT arg_ALLOW_IN_DOWNLOAD_MODE) + message(FATAL_ERROR +[[ +This command cannot be executed in Download Mode. +Halting portfile execution. +]]) + endif() + + set(log_out "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-out.log") + set(log_err "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-err.log") + + set(timeout_param "") + set(output_and_error_same OFF) + set(output_variable_param "") + set(error_variable_param "") + + if(DEFINED arg_TIMEOUT) + set(timeout_param TIMEOUT "${arg_TIMEOUT}") + endif() + if(DEFINED arg_OUTPUT_VARIABLE AND DEFINED arg_ERROR_VARIABLE AND arg_OUTPUT_VARIABLE STREQUAL arg_ERROR_VARIABLE) + set(output_variable_param OUTPUT_VARIABLE out_err_var) + set(error_variable_param ERROR_VARIABLE out_err_var) + set(output_and_error_same ON) + else() + if(DEFINED arg_OUTPUT_VARIABLE) + set(output_variable_param OUTPUT_VARIABLE out_var) + endif() + if(DEFINED arg_ERROR_VARIABLE) + set(error_variable_param ERROR_VARIABLE err_var) + endif() + endif() + + if(X_PORT_PROFILE AND NOT arg_ALLOW_IN_DOWNLOAD_MODE) + vcpkg_list(PREPEND arg_COMMAND "${CMAKE_COMMAND}" "-E" "time") + endif() + + vcpkg_execute_in_download_mode( + COMMAND ${arg_COMMAND} + OUTPUT_FILE "${log_out}" + ERROR_FILE "${log_err}" + RESULT_VARIABLE error_code + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" + ${timeout_param} + ${output_variable_param} + ${error_variable_param} + ) + if(NOT error_code EQUAL 0) + set(stringified_logs "") + foreach(log IN ITEMS "${log_out}" "${log_err}") + if(NOT EXISTS "${log}") + continue() + endif() + file(SIZE "${log}" log_size) + if(NOT log_size EQUAL "0") + file(TO_NATIVE_PATH "${log}" native_log) + string(APPEND stringified_logs " ${native_log}\n") + file(APPEND "${Z_VCPKG_ERROR_LOG_COLLECTION_FILE}" "${native_log}\n") + endif() + endforeach() + + z_vcpkg_prettify_command_line(pretty_command ${arg_COMMAND}) + message(FATAL_ERROR + " Command failed: ${pretty_command}\n" + " Working Directory: ${arg_WORKING_DIRECTORY}\n" + " Error code: ${error_code}\n" + " See logs for more information:\n" + "${stringified_logs}" + ) + endif() + + # pass output parameters back to caller's scope + if(output_and_error_same) + z_vcpkg_forward_output_variable(arg_OUTPUT_VARIABLE out_err_var) + # arg_ERROR_VARIABLE = arg_OUTPUT_VARIABLE, so no need to set it again + else() + z_vcpkg_forward_output_variable(arg_OUTPUT_VARIABLE out_var) + z_vcpkg_forward_output_variable(arg_ERROR_VARIABLE err_var) + endif() +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_execute_required_process_repeat.cmake b/externals/vcpkg/scripts/cmake/vcpkg_execute_required_process_repeat.cmake new file mode 100755 index 000000000..b7dc3ddda --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_execute_required_process_repeat.cmake @@ -0,0 +1,71 @@ +function(vcpkg_execute_required_process_repeat) + cmake_parse_arguments(PARSE_ARGV 0 arg + "ALLOW_IN_DOWNLOAD_MODE" + "COUNT;WORKING_DIRECTORY;LOGNAME" + "COMMAND" + ) + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + foreach(required_arg IN ITEMS COUNT WORKING_DIRECTORY LOGNAME COMMAND) + if(NOT DEFINED arg_${required_arg}) + message(FATAL_ERROR "${required_arg} must be specified.") + endif() + endforeach() + + # also checks for COUNT being an integer + if(NOT arg_COUNT GREATER_EQUAL "1") + message(FATAL_ERROR "COUNT (${arg_COUNT}) must be greater than or equal to 1.") + endif() + + if (DEFINED VCPKG_DOWNLOAD_MODE AND NOT arg_ALLOW_IN_DOWNLOAD_MODE) + message(FATAL_ERROR +[[ +This command cannot be executed in Download Mode. +Halting portfile execution. +]]) + endif() + + if(X_PORT_PROFILE AND NOT arg_ALLOW_IN_DOWNLOAD_MODE) + vcpkg_list(PREPEND arg_COMMAND "${CMAKE_COMMAND}" "-E" "time") + endif() + + set(all_logs "") + foreach(loop_count RANGE 1 ${arg_COUNT}) + set(out_log "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-out-${loop_count}.log") + set(err_log "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-out-${loop_count}.log") + list(APPEND all_logs "${out_log}" "${err_log}") + + vcpkg_execute_in_download_mode( + COMMAND ${arg_COMMAND} + OUTPUT_FILE "${out_log}" + ERROR_FILE "${err_log}" + RESULT_VARIABLE error_code + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" + ) + if(error_code EQUAL "0") + return() + endif() + endforeach() + + set(stringified_logs "") + foreach(log IN LISTS all_logs) + if(NOT EXISTS "${log}") + continue() + endif() + file(SIZE "${log}" log_size) + if(NOT log_size EQUAL "0") + file(TO_NATIVE_PATH "${log}" native_log) + string(APPEND stringified_logs " ${native_log}\n") + endif() + endforeach() + + z_vcpkg_prettify_command_line(pretty_command ${arg_COMMAND}) + message(FATAL_ERROR + " Command failed: ${pretty_command}\n" + " Working Directory: ${arg_WORKING_DIRECTORY}\n" + " See logs for more information:\n" + "${stringifed_logs}" + ) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_extract_source_archive.cmake b/externals/vcpkg/scripts/cmake/vcpkg_extract_source_archive.cmake new file mode 100755 index 000000000..f1ecb44e2 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_extract_source_archive.cmake @@ -0,0 +1,164 @@ +function(z_vcpkg_extract_source_archive_deprecated_mode archive working_directory) + cmake_path(GET archive FILENAME archive_filename) + if(NOT EXISTS "${working_directory}/${archive_filename}.extracted") + message(STATUS "Extracting source ${archive}") + file(MAKE_DIRECTORY "${working_directory}") + vcpkg_execute_required_process( + ALLOW_IN_DOWNLOAD_MODE + COMMAND "${CMAKE_COMMAND}" -E tar xjf "${archive}" + WORKING_DIRECTORY "${working_directory}" + LOGNAME extract + ) + file(TOUCH "${working_directory}/${archive_filename}.extracted") + endif() +endfunction() + +function(vcpkg_extract_source_archive) + if(ARGC LESS_EQUAL "2") + z_vcpkg_deprecation_message( "Deprecated form of vcpkg_extract_source_archive used: + Please use the `vcpkg_extract_source_archive( ARCHIVE )` form.") + if(ARGC EQUAL "0") + message(FATAL_ERROR "vcpkg_extract_source_archive requires at least one argument.") + endif() + + set(archive "${ARGV0}") + if(ARGC EQUAL "1") + set(working_directory "${CURRENT_BUILDTREES_DIR}/src") + else() + set(working_directory "${ARGV1}") + endif() + + z_vcpkg_extract_source_archive_deprecated_mode("${archive}" "${working_directory}") + return() + endif() + + set(out_source_path "${ARGV0}") + cmake_parse_arguments(PARSE_ARGV 1 "arg" + "NO_REMOVE_ONE_LEVEL;SKIP_PATCH_CHECK;Z_ALLOW_OLD_PARAMETER_NAMES" + "ARCHIVE;SOURCE_BASE;BASE_DIRECTORY;WORKING_DIRECTORY;REF" + "PATCHES" + ) + + if(DEFINED arg_REF) + if(NOT arg_Z_ALLOW_OLD_PARAMETER_NAMES) + message(FATAL_ERROR "Unexpected argument REF") + elseif(DEFINED arg_SOURCE_BASE) + message(FATAL_ERROR "Cannot specify both REF and SOURCE_BASE") + else() + string(REPLACE "/" "-" arg_SOURCE_BASE "${arg_REF}") + endif() + endif() + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + if(NOT DEFINED arg_ARCHIVE) + message(FATAL_ERROR "ARCHIVE must be specified") + endif() + + if(DEFINED arg_WORKING_DIRECTORY) + if(DEFINED arg_BASE_DIRECTORY) + message(FATAL_ERROR "Cannot specify both BASE_DIRECTORY and WORKING_DIRECTORY") + elseif(NOT IS_ABSOLUTE "${arg_WORKING_DIRECTORY}") + message(FATAL_ERROR "WORKING_DIRECTORY (${arg_WORKING_DIRECTORY}) must be an absolute path") + endif() + set(working_directory "${arg_WORKING_DIRECTORY}") + else() + if(NOT DEFINED arg_BASE_DIRECTORY) + set(arg_BASE_DIRECTORY "src") + elseif(IS_ABSOLUTE "${arg_BASE_DIRECTORY}") + message(FATAL_ERROR "BASE_DIRECTORY (${arg_BASE_DIRECTORY}) must be a relative path") + endif() + cmake_path(APPEND CURRENT_BUILDTREES_DIR "${arg_BASE_DIRECTORY}" + OUTPUT_VARIABLE working_directory) + endif() + + if(NOT DEFINED arg_SOURCE_BASE) + cmake_path(GET arg_ARCHIVE STEM arg_SOURCE_BASE) + elseif(arg_SOURCE_BASE MATCHES [[\\|/]]) + message(FATAL_ERROR "SOURCE_BASE (${arg_SOURCE_BASE}) must not contain slashes") + endif() + + # Take the last 10 chars of the base + set(base_max_length 10) + string(LENGTH "${arg_SOURCE_BASE}" source_base_length) + if(source_base_length GREATER base_max_length) + math(EXPR start "${source_base_length} - ${base_max_length}") + string(SUBSTRING "${arg_SOURCE_BASE}" "${start}" -1 arg_SOURCE_BASE) + endif() + + # Hash the archive hash along with the patches. Take the first 10 chars of the hash + file(SHA512 "${arg_ARCHIVE}" patchset_hash) + foreach(patch IN LISTS arg_PATCHES) + cmake_path(ABSOLUTE_PATH patch + BASE_DIRECTORY "${CURRENT_PORT_DIR}" + OUTPUT_VARIABLE absolute_patch + ) + if(NOT EXISTS "${absolute_patch}") + message(FATAL_ERROR "Could not find patch: '${patch}'") + endif() + file(SHA512 "${absolute_patch}" current_hash) + string(APPEND patchset_hash "${current_hash}") + endforeach() + + string(SHA512 patchset_hash "${patchset_hash}") + string(SUBSTRING "${patchset_hash}" 0 10 patchset_hash) + cmake_path(APPEND working_directory "${arg_SOURCE_BASE}-${patchset_hash}" + OUTPUT_VARIABLE source_path + ) + + if(_VCPKG_EDITABLE AND EXISTS "${source_path}") + set("${out_source_path}" "${source_path}" PARENT_SCOPE) + message(STATUS "Using source at ${source_path}") + return() + elseif(NOT _VCPKG_EDITABLE) + cmake_path(APPEND_STRING source_path ".clean") + if(EXISTS "${source_path}") + message(STATUS "Cleaning sources at ${source_path}. Use --editable to skip cleaning for the packages you specify.") + file(REMOVE_RECURSE "${source_path}") + endif() + endif() + + message(STATUS "Extracting source ${arg_ARCHIVE}") + cmake_path(APPEND_STRING source_path ".tmp" OUTPUT_VARIABLE temp_dir) + file(REMOVE_RECURSE "${temp_dir}") + file(MAKE_DIRECTORY "${temp_dir}") + vcpkg_execute_required_process( + ALLOW_IN_DOWNLOAD_MODE + COMMAND "${CMAKE_COMMAND}" -E tar xjf "${arg_ARCHIVE}" + WORKING_DIRECTORY "${temp_dir}" + LOGNAME extract + ) + + if(arg_NO_REMOVE_ONE_LEVEL) + cmake_path(SET temp_source_path "${temp_dir}") + else() + file(GLOB archive_directory "${temp_dir}/*") + # Exclude .DS_Store entries created by the finder on macOS + list(FILTER archive_directory EXCLUDE REGEX ".*/.DS_Store$") + # make sure `archive_directory` is only a single file + if(NOT archive_directory MATCHES ";" AND IS_DIRECTORY "${archive_directory}") + cmake_path(SET temp_source_path "${archive_directory}") + else() + message(FATAL_ERROR "Could not unwrap top level directory from archive. Pass NO_REMOVE_ONE_LEVEL to disable this.") + endif() + endif() + + if (arg_SKIP_PATCH_CHECK) + set(quiet_param QUIET) + else() + set(quiet_param "") + endif() + + z_vcpkg_apply_patches( + SOURCE_PATH "${temp_source_path}" + PATCHES ${arg_PATCHES} + ${quiet_param} + ) + + file(RENAME "${temp_source_path}" "${source_path}") + file(REMOVE_RECURSE "${temp_dir}") + + set("${out_source_path}" "${source_path}" PARENT_SCOPE) + message(STATUS "Using source at ${source_path}") +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_extract_source_archive_ex.cmake b/externals/vcpkg/scripts/cmake/vcpkg_extract_source_archive_ex.cmake new file mode 100755 index 000000000..b279708bd --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_extract_source_archive_ex.cmake @@ -0,0 +1,11 @@ +function(vcpkg_extract_source_archive_ex) + # OUT_SOURCE_PATH is an out-parameter so we need to parse it + cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "OUT_SOURCE_PATH" "") + if(NOT DEFINED arg_OUT_SOURCE_PATH) + message(FATAL_ERROR "OUT_SOURCE_PATH must be specified") + endif() + + vcpkg_extract_source_archive(source_path ${arg_UNPARSED_ARGUMENTS} Z_ALLOW_OLD_PARAMETER_NAMES) + + set("${arg_OUT_SOURCE_PATH}" "${source_path}" PARENT_SCOPE) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_fail_port_install.cmake b/externals/vcpkg/scripts/cmake/vcpkg_fail_port_install.cmake new file mode 100755 index 000000000..a5cb105f9 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_fail_port_install.cmake @@ -0,0 +1,78 @@ +function(vcpkg_fail_port_install) + message("${Z_VCPKG_BACKCOMPAT_MESSAGE_LEVEL}" "vcpkg_fail_port_install has been removed and all values should be moved by adding `supports` field to manifest file or directly adding `${PORT}:${FAILED_TRIPLET}=fail` to _scripts/ci.baseline.txt_.\nPlease remove `vcpkg_fail_port_install(...)`.\n") + + set(multi_args "ON_TARGET;ON_ARCH;ON_CRT_LINKAGE;ON_LIBRARY_LINKAGE") + cmake_parse_arguments(PARSE_ARGV 0 "arg" "ALWAYS" "MESSAGE" "${multi_args}") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "vcpkg_fail_port_install was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + if(arg_ALWAYS) + vcpkg_list(SET extra_args) + foreach(arg IN LISTS multi_args) + if(DEFINED "arg_${arg}") + vcpkg_list(APPEND extra_args "${arg}" "${arg_${arg}}") + endif() + endforeach() + if(NOT "${extra_args}" STREQUAL "") + message(WARNING "vcpkg_fail_port_install set to fail both unconditionally and conditionally on ${extra_args}. This is likely to be an error.") + endif() + if(NOT DEFINED arg_MESSAGE) + message(FATAL_ERROR "vcpkg_fail_port_install(ALWAYS) was called without a specific MESSAGE.") + endif() + + message(FATAL_ERROR "${arg_MESSAGE}") + endif() + + if(DEFINED arg_MESSAGE) + string(APPEND arg_MESSAGE "\n") + else() + set(arg_MESSAGE "") + endif() + + set(fail_port OFF) + # Target fail check + if(DEFINED arg_ON_TARGET) + foreach(target IN LISTS arg_ON_TARGET) + string(TOUPPER "${target}" target_upper) + if(VCPKG_TARGET_IS_${target_upper}) + set(fail_port ON) + string(APPEND arg_MESSAGE "Target '${target}' not supported by ${PORT}!\n") + endif() + endforeach() + endif() + + # Architecture fail check + if(DEFINED arg_ON_ARCH) + foreach(arch IN LISTS arg_ON_ARCH) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL arch) + set(fail_port ON) + string(APPEND arg_MESSAGE "Architecture '${arch}' not supported by ${PORT}!\n") + endif() + endforeach() + endif() + + # CRT linkage fail check + if(DEFINED arg_ON_CRT_LINKAGE) + foreach(crt_linkage IN LISTS arg_ON_CRT_LINKAGE) + if(VCPKG_CRT_LINKAGE STREQUAL crt_linkage) + set(fail_port ON) + string(APPEND arg_MESSAGE "CRT linkage '${VCPKG_CRT_LINKAGE}' not supported by ${PORT}!\n") + endif() + endforeach() + endif() + + # Library linkage fail check + if(DEFINED arg_ON_LIBRARY_LINKAGE) + foreach(library_linkage IN LISTS arg_ON_LIBRARY_LINKAGE) + if(VCPKG_LIBRARY_LINKAGE STREQUAL library_linkage) + set(fail_port ON) + string(APPEND arg_MESSAGE "Library linkage '${VCPKG_LIBRARY_LINKAGE}' not supported by ${PORT}!\n") + endif() + endforeach() + endif() + + if(fail_port) + message(FATAL_ERROR "${arg_MESSAGE}") + endif() +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_find_acquire_program.cmake b/externals/vcpkg/scripts/cmake/vcpkg_find_acquire_program.cmake new file mode 100755 index 000000000..cefcfb4be --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -0,0 +1,678 @@ +function(z_vcpkg_find_acquire_program_version_check out_var) + cmake_parse_arguments(PARSE_ARGV 1 arg + "EXACT_VERSION_MATCH" + "MIN_VERSION;PROGRAM_NAME" + "COMMAND" + ) + vcpkg_execute_in_download_mode( + COMMAND ${arg_COMMAND} + WORKING_DIRECTORY "${VCPKG_ROOT_DIR}" + OUTPUT_VARIABLE program_version_output + ) + string(STRIP "${program_version_output}" program_version_output) + #TODO: REGEX MATCH case for more complex cases! + set(version_compare VERSION_GREATER_EQUAL) + set(version_compare_msg "at least") + if(arg_EXACT_VERSION_MATCH) + set(version_compare VERSION_EQUAL) + set(version_compare_msg "exact") + endif() + if(NOT "${program_version_output}" ${version_compare} "${arg_MIN_VERSION}") + message(STATUS "Found ${arg_PROGRAM_NAME}('${program_version_output}') but ${version_compare_msg} version ${arg_MIN_VERSION} is required! Trying to use internal version if possible!") + set("${out_var}" OFF PARENT_SCOPE) + else() + message(STATUS "Found external ${arg_PROGRAM_NAME}('${program_version_output}').") + set("${out_var}" ON PARENT_SCOPE) + endif() +endfunction() + +function(z_vcpkg_find_acquire_program_find_external program) + cmake_parse_arguments(PARSE_ARGV 1 arg + "EXACT_VERSION_MATCH" + "INTERPRETER;MIN_VERSION;PROGRAM_NAME" + "NAMES;VERSION_COMMAND" + ) + if(arg_EXACT_VERSION_MATCH) + set(arg_EXACT_VERSION_MATCH EXACT_VERSION_MATCH) + endif() + + if("${arg_INTERPRETER}" STREQUAL "") + find_program("${program}" NAMES ${arg_NAMES}) + else() + find_file(SCRIPT_${arg_PROGRAM_NAME} NAMES ${arg_NAMES}) + if(SCRIPT_${arg_PROGRAM_NAME}) + vcpkg_list(SET program_tmp ${${interpreter}} ${SCRIPT_${arg_PROGRAM_NAME}}) + set("${program}" "${program_tmp}" CACHE INTERNAL "") + else() + set("${program}" "" CACHE INTERNAL "") + endif() + unset(SCRIPT_${arg_PROGRAM_NAME} CACHE) + endif() + + if("${version_command}" STREQUAL "") + set(version_is_good ON) # can't check for the version being good, so assume it is + elseif(${program}) # only do a version check if ${program} has a value + z_vcpkg_find_acquire_program_version_check(version_is_good + ${arg_EXACT_VERSION_MATCH} + COMMAND ${${program}} ${arg_VERSION_COMMAND} + MIN_VERSION "${arg_MIN_VERSION}" + PROGRAM_NAME "${arg_PROGRAM_NAME}" + ) + endif() + + if(NOT version_is_good) + unset("${program}" PARENT_SCOPE) + unset("${program}" CACHE) + endif() +endfunction() + +function(z_vcpkg_find_acquire_program_find_internal program) + cmake_parse_arguments(PARSE_ARGV 1 arg + "" + "INTERPRETER" + "NAMES;PATHS" + ) + if("${arg_INTERPRETER}" STREQUAL "") + find_program(${program} + NAMES ${arg_NAMES} + PATHS ${arg_PATHS} + NO_DEFAULT_PATH) + else() + vcpkg_find_acquire_program("${arg_INTERPRETER}") + find_file(SCRIPT_${program} + NAMES ${arg_NAMES} + PATHS ${arg_PATHS} + NO_DEFAULT_PATH) + if(SCRIPT_${program}) + set("${program}" ${${arg_INTERPRETER}} ${SCRIPT_${program}} CACHE INTERNAL "") + endif() + unset(SCRIPT_${program} CACHE) + endif() +endfunction() + +function(vcpkg_find_acquire_program program) + if(${program}) + return() + endif() + + set(raw_executable "OFF") + set(program_name "") + set(program_version "") + set(search_names "") + set(download_urls "") + set(download_filename "") + set(download_sha512 "") + set(rename_binary_to "") + set(tool_subdirectory "") + set(interpreter "") + set(supported_on_unix "") + set(post_install_command "") + set(paths_to_search "") + set(version_command "") + vcpkg_list(SET sourceforge_args) + set(brew_package_name "") + set(apt_package_name "") + + if(program STREQUAL "PERL") + set(program_name perl) + set(program_version 5.32.1.1) + set(tool_subdirectory ${program_version}) + set(paths_to_search ${DOWNLOADS}/tools/perl/${tool_subdirectory}/perl/bin) + set(brew_package_name "perl") + set(apt_package_name "perl") + set(download_urls + "https://strawberryperl.com/download/${program_version}/strawberry-perl-${program_version}-32bit.zip" + ) + set(download_filename "strawberry-perl-${program_version}-32bit.zip") + set(download_sha512 936381254fea2e596db6a16c23b08ced25c4081fda484e1b8c4356755016e4b956bd00f3d2ee651d5f41a7695e9998f6c1ac3f4a237212b9c55aca8c5fea14e9) + elseif(program STREQUAL "NASM") + set(program_name nasm) + set(program_version 2.15.05) + set(paths_to_search "${DOWNLOADS}/tools/nasm/nasm-${program_version}") + set(brew_package_name "nasm") + set(apt_package_name "nasm") + set(download_urls + "https://www.nasm.us/pub/nasm/releasebuilds/${program_version}/win32/nasm-${program_version}-win32.zip" + "https://fossies.org/windows/misc/nasm-${program_version}-win32.zip" + ) + set(download_filename "nasm-${program_version}-win32.zip") + set(download_sha512 9412b8caa07e15eac8f500f6f8fab9f038d95dc25e0124b08a80645607cf5761225f98546b52eac7b894420d64f26c3cbf22c19cd286bbe583f7c964256c97ed) + elseif(program STREQUAL "YASM") + set(program_name yasm) + set(program_version 1.3.0.6.g1962) + set(tool_subdirectory 1.3.0.6) + set(brew_package_name "yasm") + set(apt_package_name "yasm") + set(download_urls "https://www.tortall.net/projects/yasm/snapshots/v${program_version}/yasm-${program_version}.exe") + set(download_filename "yasm-${program_version}.exe") + set(rename_binary_to "yasm.exe") + set(raw_executable ON) + set(download_sha512 c1945669d983b632a10c5ff31e86d6ecbff143c3d8b2c433c0d3d18f84356d2b351f71ac05fd44e5403651b00c31db0d14615d7f9a6ecce5750438d37105c55b) + elseif(program STREQUAL "GIT") + set(program_name git) + if(CMAKE_HOST_WIN32) + set(base_version 2.32.0) + set(program_version 2.32.0.2) + set(tool_subdirectory "git-${program_version}-2-windows") + set(download_urls "https://github.com/git-for-windows/git/releases/download/v${base_version}.windows.2/PortableGit-${program_version}-32-bit.7z.exe") + set(download_filename "PortableGit-${program_version}-32-bit.7z.exe") + set(download_sha512 867d8534972cbaf7a4224e25a14d484f8d17ef186f8d79e9a758afb90cf69541375cb7615a39702311f4809cb8371ef85c2b1a15bfffe9e48f0e597ac011b348) + set(paths_to_search + "${DOWNLOADS}/tools/${tool_subdirectory}/mingw32/bin" + "${DOWNLOADS}/tools/git/${tool_subdirectory}/mingw32/bin") + else() + set(brew_package_name "git") + set(apt_package_name "git") + endif() + elseif(program STREQUAL "GN") + set(program_name gn) + set(rename_binary_to "gn") + if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/gn/version.txt") + file(READ "${CURRENT_HOST_INSTALLED_DIR}/share/gn/version.txt" program_version) + set(paths_to_search "${CURRENT_HOST_INSTALLED_DIR}/tools/gn") + else() # Old behavior + message("Consider adding vcpkg-tool-gn as a host dependency of this port or create an issue at https://github.com/microsoft/vcpkg/issues") + set(cipd_download_gn "https://chrome-infra-packages.appspot.com/dl/gn/gn") + if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") + set(supported_on_unix ON) + EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH) + if(HOST_ARCH STREQUAL "aarch64") + set(program_version "GkfFAfAUyE-qfeWkdUMaeM1Ov64Fk3SjSj9pwKqZX7gC") + set(gn_platform "linux-arm64") + set(download_sha512 "E88201309A12C00CE60137261B8E1A759780C81D1925B819583B16D2095A16A7D32EFB2AF36C1E1D6EAA142BF6A6A811847D3140E4E94967EE28F4ADF6373E4B") + else() + set(program_version "Fv1ENXodhXmEXy_xpZr2gQkVJh57w_IsbsrEJOU0_EoC") + set(gn_platform "linux-amd64") + set(download_sha512 "A7A5CD5633C5547EC1B1A95958486DDAAC91F1A65881EDC0AD8F74DF44E82F08BA74358E9A72DFCDDE6F534A6B9C9A430D3E16ACE2E4346C4D2E9113F7654B3F") + endif() + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + set(supported_on_unix ON) + EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH) + if(HOST_ARCH STREQUAL "arm64") + set(program_version "qMPtGq7xZlpb-lHjP-SK27ftT4X71WIvguuyx6X14DEC") + set(gn_platform "mac-arm64") + set(download_sha512 "D096FB958D017807427911089AB5A7655AED117F6851C0491AC8063CEDB544423122EF64DF4264ECA86C20A2BDE9E64D7B72DA7ED8C95C2BA79A68B8247D36B8") + else() + set(program_version "0x2juPLNfP9603GIyZrUfflxK6LiMcppLAoxEpYuIYoC") + set(gn_platform "mac-amd64") + set(download_sha512 "2696ECE7B2C8008CABDDF10024017E2ECF875F8679424E77052252BDDC83A2096DF3C61D89CD25120EF27E0458C8914BEEED9D418593BDBC4F6ED33A8D4C3DC5") + endif() + else() + if($ENV{PROCESSOR_ARCHITECTURE} STREQUAL "ARM64") + set(program_version "q5ExVHmXyD34Q_Tzb-aRxsPipO-e37-csVRhVM7IJh0C") + set(gn_platform "windows-amd64") + set(download_sha512 "FA764AA44EB6F48ED50E855B4DC1DD1ABE35E45FD4AAC7F059A35293A14894C1B591215E34FB0CE9362E646EA9463BA3B489EFB7EBBAA2693D14238B50E4E686") + else() # AMD64 + set(program_version "q5ExVHmXyD34Q_Tzb-aRxsPipO-e37-csVRhVM7IJh0C") + set(gn_platform "windows-amd64") + set(download_sha512 "FA764AA44EB6F48ED50E855B4DC1DD1ABE35E45FD4AAC7F059A35293A14894C1B591215E34FB0CE9362E646EA9463BA3B489EFB7EBBAA2693D14238B50E4E686") + endif() + endif() + endif() + set(tool_subdirectory "${program_version}") + set(download_urls "${cipd_download_gn}/${gn_platform}/+/${program_version}") + set(download_filename "gn-${gn_platform}.zip") + elseif(program STREQUAL "GO") + set(program_name go) + set(tool_subdirectory 1.16.6.windows-386) + set(paths_to_search ${DOWNLOADS}/tools/go/${tool_subdirectory}/go/bin) + set(brew_package_name "go") + set(apt_package_name "golang-go") + set(download_urls "https://dl.google.com/go/go${tool_subdirectory}.zip") + set(download_filename "go${tool_subdirectory}.zip") + set(download_sha512 2a1e539ed628c0cca5935d24d22cf3a7165f5c80e12a4003ac184deae6a6d0aa31f582f3e8257b0730adfc09aeec3a0e62f4732e658c312d5382170bcd8c94d8) + elseif(program STREQUAL "PYTHON3") + if(CMAKE_HOST_WIN32) + set(program_name python) + set(program_version 3.10.2) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(tool_subdirectory "python-${program_version}-x86") + set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-win32.zip") + set(download_filename "python-${program_version}-embed-win32.zip") + set(download_sha512 d647d7141d1b13c899671b882e686a1b1cc6f759e5b7428ec858cdffd9ef019c78fb0b989174b98f30cb696297bfeff3d171f7eaabb339f5154886c030b8e4d9) + else() + set(tool_subdirectory "python-${program_version}-x64") + set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-amd64.zip") + set(download_filename "python-${program_version}-embed-amd64.zip") + set(download_sha512 e04e14f3b5e96f120a3b0d5fac07b2982b9f3394aef4591b140e84ff97c8532e1f8bf3e613bdf5aec6afeac108b975e754bf9727354bcfaa6673fc89826eac37) + endif() + set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") + vcpkg_list(SET post_install_command "${CMAKE_COMMAND}" -E rm python310._pth) + else() + set(program_name python3) + set(brew_package_name "python") + set(apt_package_name "python3") + endif() + elseif(program STREQUAL "PYTHON2") + if(CMAKE_HOST_WIN32) + set(program_name python) + set(program_version 2.7.18) + if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-tool-python2/details.cmake") + include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-tool-python2/details.cmake") + else() # Old behavior + if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) + set(tool_subdirectory "python-${program_version}-x86") + set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.msi") + set(download_filename "python-${program_version}.msi") + set(download_sha512 2c112733c777ddbf189b0a54047a9d5851ebce0564cc38b9687d79ce6c7a09006109dbad8627fb1a60c3ad55e261db850d9dfa454af0533b460b2afc316fe115) + else() + set(tool_subdirectory "python-${program_version}-x64") + set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.amd64.msi") + set(download_filename "python-${program_version}.amd64.msi") + set(download_sha512 6a81a413b80fd39893e7444fd47efa455d240cbb77a456c9d12f7cf64962b38c08cfa244cd9c50a65947c40f936c6c8c5782f7236d7b92445ab3dd01e82af23e) + endif() + set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") + endif() + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + # macOS includes Python 2.7 built-in as `python` + set(program_name python) + set(brew_package_name "python2") + else() + set(program_name python2) + set(apt_package_name "python") + endif() + elseif(program STREQUAL "RUBY") + set(program_name "ruby") + set(program_version 2.7.4-1) + set(paths_to_search "${DOWNLOADS}/tools/ruby/rubyinstaller-${program_version}-x86/bin") + set(download_urls "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-${program_version}/rubyinstaller-${program_version}-x86.7z") + set(download_filename "rubyinstaller-${program_version}-x86.7z") + set(download_sha512 4bf459c987b407bdda328c52d95060bf6ad48fc3e5ed5f64d4b205c5b4153c7a00cb6f9da6c0bcd5f2e001e9dc3dda0b72269ec4afdeffd658b93c085cd1d859) + elseif(program STREQUAL "JOM") + set(program_name jom) + set(tool_subdirectory "jom-1.1.3") + set(paths_to_search "${DOWNLOADS}/tools/jom/${tool_subdirectory}") + set(download_urls + "https://download.qt.io/official_releases/jom/jom_1_1_3.zip" + "https://mirrors.ocf.berkeley.edu/qt/official_releases/jom/jom_1_1_3.zip" + ) + set(download_filename "jom_1_1_3.zip") + set(download_sha512 5b158ead86be4eb3a6780928d9163f8562372f30bde051d8c281d81027b766119a6e9241166b91de0aa6146836cea77e5121290e62e31b7a959407840fc57b33) + elseif(program STREQUAL "7Z") + set(program_name 7z) + set(paths_to_search "${DOWNLOADS}/tools/7z/Files/7-Zip") + set(download_urls "https://7-zip.org/a/7z1900.msi") + set(download_filename "7z1900.msi") + set(download_sha512 f73b04e2d9f29d4393fde572dcf3c3f0f6fa27e747e5df292294ab7536ae24c239bf917689d71eb10cc49f6b9a4ace26d7c122ee887d93cc935f268c404e9067) + elseif(program STREQUAL "NINJA") + set(program_name ninja) + set(program_version 1.10.2) + set(supported_on_unix ON) + if(CMAKE_HOST_WIN32) + set(download_filename "ninja-win-${program_version}.zip") + set(tool_subdirectory "${program_version}-windows") + set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-win.zip") + set(download_sha512 6004140d92e86afbb17b49c49037ccd0786ce238f340f7d0e62b4b0c29ed0d6ad0bab11feda2094ae849c387d70d63504393714ed0a1f4d3a1f155af7a4f1ba3) + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + set(download_filename "ninja-mac-${program_version}.zip") + set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-mac.zip") + set(tool_subdirectory "${program_version}-osx") + set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-osx") + set(download_sha512 bcd12f6a3337591306d1b99a7a25a6933779ba68db79f17c1d3087d7b6308d245daac08df99087ff6be8dc7dd0dcdbb3a50839a144745fa719502b3a7a07260b) + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") + set(paths_to_search "${DOWNLOADS}/tools/${tool_subdirectory}-freebsd") + set(supported_on_unix OFF) + else() + set(download_filename "ninja-linux-${program_version}.zip") + set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-linux.zip") + set(tool_subdirectory "${program_version}-linux") + set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-linux") + set(download_sha512 93e802e9c17fb59636cddde4bad1ddaadad624f4ecfee00d5c78790330a4e9d433180e795718cda27da57215ce643c3929cf72c85337ee019d868c56f2deeef3) + endif() + set(version_command --version) + elseif(program STREQUAL "NUGET") + set(program_name nuget) + set(tool_subdirectory "5.11.0") + set(paths_to_search "${DOWNLOADS}/tools/nuget-${tool_subdirectory}-windows") + set(brew_package_name "nuget") + set(download_urls "https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe") + set(rename_binary_to "nuget.exe") + set(download_filename "nuget.5.11.0.exe") + set(raw_executable ON) + set(download_sha512 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7) + elseif(program STREQUAL "MESON") # Should always be found! + set(program_name meson) + set(search_names meson meson.py) + set(interpreter PYTHON3) + set(apt_package_name "meson") + set(brew_package_name "meson") + set(version_command --version) + set(extra_search_args EXACT_VERSION_MATCH) + if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/meson/version.txt") + file(READ "${CURRENT_HOST_INSTALLED_DIR}/share/meson/version.txt" program_version) + set(paths_to_search "${CURRENT_HOST_INSTALLED_DIR}/tools/meson") + else() # Old behavior + set(program_version 0.58.1) + set(ref aeda7f249c4a5dbbecc52e44f382246a2377b5b0) + set(paths_to_search "${DOWNLOADS}/tools/meson/meson-${ref}") + set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz") + set(download_filename "meson-${ref}.tar.gz") + set(download_sha512 18a012a45274dbb4582e99fd69d920f38831e788d9860f9553c64847bedb1c2010ae0b5c0ef4a4350c03f5e0f95aaa0395378e1208109b59640c1a70b1e202d2) + set(supported_on_unix ON) + endif() + elseif(program STREQUAL "FLEX" OR program STREQUAL "BISON") + if(CMAKE_HOST_WIN32) + set(program_version 2.5.25) + set(download_urls "https://github.com/lexxmark/winflexbison/releases/download/v${program_version}/win_flex_bison-${program_version}.zip") + set(download_filename "win_flex_bison-${program_version}.zip") + set(download_sha512 2a829eb05003178c89f891dd0a67add360c112e74821ff28e38feb61dac5b66e9d3d5636ff9eef055616aaf282ee8d6be9f14c6ae4577f60bdcec96cec9f364e) + set(tool_subdirectory "${program_version}") + if(program STREQUAL "FLEX") + set(program_name win_flex) + else() + set(program_name win_bison) + endif() + set(paths_to_search ${DOWNLOADS}/tools/win_flex/${program_version}) + if(NOT EXISTS "${paths_to_search}/data/m4sugar/m4sugar.m4") + file(REMOVE_RECURSE "${paths_to_search}") + endif() + elseif(program STREQUAL "FLEX") + set(program_name flex) + set(apt_package_name flex) + set(brew_package_name flex) + else() + set(program_name bison) + set(apt_package_name bison) + set(brew_package_name bison) + if (APPLE) + set(paths_to_search /usr/local/opt/bison/bin) + endif() + endif() + elseif(program STREQUAL "CLANG") + set(program_name clang) + set(tool_subdirectory "clang-12.0.0") + set(program_version 12.0.0) + if(CMAKE_HOST_WIN32) + set(paths_to_search + # Support LLVM in Visual Studio 2019 + "$ENV{LLVMInstallDir}/x64/bin" + "$ENV{LLVMInstallDir}/bin" + "$ENV{VCINSTALLDIR}/Tools/Llvm/x64/bin" + "$ENV{VCINSTALLDIR}/Tools/Llvm/bin" + "${DOWNLOADS}/tools/${tool_subdirectory}-windows/bin" + "${DOWNLOADS}/tools/clang/${tool_subdirectory}/bin") + + if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) + set(host_arch "$ENV{PROCESSOR_ARCHITEW6432}") + else() + set(host_arch "$ENV{PROCESSOR_ARCHITECTURE}") + endif() + + if(host_arch MATCHES "64") + set(download_urls "https://github.com/llvm/llvm-project/releases/download/llvmorg-${program_version}/LLVM-${program_version}-win64.exe") + set(download_filename "LLVM-${program_version}-win64.7z.exe") + set(download_sha512 67a9b54abad5143fa5f79f0cfc184be1394c9fc894fa9cee709943cb6ccbde8f0ea6003d8fcc20eccf035631abe4009cc0f694ac84e7879331cebba8125e4c7f) + else() + set(download_urls "https://github.com/llvm/llvm-project/releases/download/llvmorg-${program_version}/LLVM-${program_version}-win32.exe") + set(download_filename "LLVM-${program_version}-win32.7z.exe") + set(download_sha512 92fa5252fd08c1414ee6d71e2544cd2c44872124c47225f8d98b3af711d20e699f2888bc30642dfd00e005013da1607a593674fb4878951cc434694f9a119199) + endif() + endif() + set(brew_package_name "llvm") + set(apt_package_name "clang") + elseif(program STREQUAL "GPERF") + set(program_name gperf) + set(program_version 3.0.1) + set(paths_to_search "${DOWNLOADS}/tools/gperf/bin") + set(download_urls "https://sourceforge.net/projects/gnuwin32/files/gperf/${program_version}/gperf-${program_version}-bin.zip/download") + set(download_filename "gperf-${program_version}-bin.zip") + set(download_sha512 3f2d3418304390ecd729b85f65240a9e4d204b218345f82ea466ca3d7467789f43d0d2129fcffc18eaad3513f49963e79775b10cc223979540fa2e502fe7d4d9) + elseif(program STREQUAL "GASPREPROCESSOR") + set(raw_executable true) + set(program_name gas-preprocessor) + set(tool_subdirectory "4daa6115") + set(interpreter PERL) + set(search_names "gas-preprocessor.pl") + set(paths_to_search "${DOWNLOADS}/tools/gas-preprocessor/${tool_subdirectory}") + set(rename_binary_to "gas-preprocessor.pl") + set(download_urls "https://raw.githubusercontent.com/FFmpeg/gas-preprocessor/4daa611556a0558dfe537b4f7ad80f7e50a079c1/gas-preprocessor.pl") + set(download_filename "gas-preprocessor-${tool_subdirectory}.pl") + set(download_sha512 2737ba3c1cf85faeb1fbfe015f7bad170f43a857a50a1b3d81fa93ba325d481f73f271c5a886ff8b7eef206662e19f0e9ef24861dfc608b67b8ea8a2062dc061) + elseif(program STREQUAL "DARK") + set(program_name dark) + set(tool_subdirectory "wix311-binaries") + set(paths_to_search "${DOWNLOADS}/tools/dark/${tool_subdirectory}") + set(download_urls "https://github.com/wixtoolset/wix3/releases/download/wix311rtm/wix311-binaries.zip") + set(download_filename "wix311-binaries.zip") + set(download_sha512 74f0fa29b5991ca655e34a9d1000d47d4272e071113fada86727ee943d913177ae96dc3d435eaf494d2158f37560cd4c2c5274176946ebdb17bf2354ced1c516) + elseif(program STREQUAL "SCONS") + set(program_name scons) + set(program_version 4.1.0) + set(tool_subdirectory "${program_version}") + set(interpreter PYTHON2) + set(search_names "scons.py") + set(download_urls "https://sourceforge.net/projects/scons/files/scons-local-${program_version}.zip/download") + set(download_filename "scons-local-${program_version}.zip") + set(download_sha512 b173176ce8aca25039c64fcc68ec1b9ad31e03a926fd545e7631b3f9b374d914adffc593f505e3e7e2867b0ffe85e8deb0b39afe314edf05d02974ce5db1badb) + elseif(program STREQUAL "SWIG") + set(program_version 4.0.2) + set(program_name swig) + if(CMAKE_HOST_WIN32) + vcpkg_list(SET sourceforge_args + REPO swig/swigwin + REF "swigwin-${program_version}" + FILENAME "swigwin-${program_version}.zip" + SHA512 b8f105f9b9db6acc1f6e3741990915b533cd1bc206eb9645fd6836457fd30789b7229d2e3219d8e35f2390605ade0fbca493ae162ec3b4bc4e428b57155db03d + NO_REMOVE_ONE_LEVEL + WORKING_DIRECTORY "${DOWNLOADS}/tools/swig" + ) + set(tool_subdirectory "b8f105f9b9-f0518bc3b7/swigwin-${program_version}") + else() + set(apt_package_name "swig") + set(brew_package_name "swig") + endif() + + elseif(program STREQUAL "DOXYGEN") + set(program_name doxygen) + set(program_version 1.9.1) + vcpkg_list(SET sourceforge_args + REPO doxygen + REF "rel-${program_version}" + FILENAME "doxygen-${program_version}.windows.bin.zip" + SHA512 c3eeb6b9fa4eab70fb6b0864fbbf94fb8050f3fee38d117cf470921a80e3569cc1c8b0272604d6731e05f01790cfaa70e159bec5d0882fc4f2d8ae4a5d52a21b + NO_REMOVE_ONE_LEVEL + WORKING_DIRECTORY "${DOWNLOADS}/tools/doxygen" + ) + set(tool_subdirectory c3eeb6b9fa-76d69c6db5) + elseif(program STREQUAL "BAZEL") + set(program_name bazel) + set(program_version 4.2.2) + set(rename_binary_to "bazel") + if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") + set(supported_on_unix ON) + set(tool_subdirectory "${program_version}-linux") + set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64") + set(download_filename "bazel-${tool_subdirectory}-x86_64") + set(raw_executable ON) + set(download_sha512 f38619e054df78cab38278a5901b2798f2e25b5cec53358d98278002e713d225fd3df96a209b7f22a2357835a279cee8ef1768e10561b3e9fe6361f324563bb9) + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + set(supported_on_unix ON) + set(tool_subdirectory "${program_version}-darwin") + set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64") + set(download_filename "bazel-${tool_subdirectory}-x86_64") + set(raw_executable ON) + set(download_sha512 a3fd8f9d71b0669d742439200f27ee0a3891c1f248df62c841ebb2b416a47534562f429f8a08793b074e9b74f2ede3d97a7e13ac9921c7ee2dc6a2dca8b7f275) + else() + set(tool_subdirectory "${program_version}-windows") + set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64.zip") + set(download_filename "bazel-${tool_subdirectory}-x86_64.zip") + set(download_sha512 8a8196e242964114316232818cb81bfa19ebfd3a029ebf550a241e33b22a6e9ed636dade06411a8706c05c4e73def0bc8d7f45ff0ec5478bcc5de21b5638204d) + endif() + elseif(program STREQUAL "ARIA2") + set(program_name aria2c) + set(program_version 1.35.0) + set(paths_to_search "${DOWNLOADS}/tools/aria2c/aria2-${program_version}-win-32bit-build1") + set(download_urls "https://github.com/aria2/aria2/releases/download/release-${program_version}/aria2-${program_version}-win-32bit-build1.zip") + set(download_filename "aria2-${program_version}-win-32bit-build1.zip") + set(download_sha512 933537cad820b1cecf43a9eeca7e1b241dd7b1c902ee942441a166f2c38845f16046321efbdfa2f83c7e9fc50c7ecc5da6fd00e0c6e2124c07d3b783aa5092a4) + elseif(program STREQUAL "PKGCONFIG") + set(program_name pkg-config) + if(DEFINED ENV{PKG_CONFIG}) + debug_message(STATUS "PKG_CONFIG found in ENV! Using $ENV{PKG_CONFIG}") + set(PKGCONFIG "$ENV{PKG_CONFIG}" CACHE INTERNAL "") + set(PKGCONFIG "${PKGCONFIG}" PARENT_SCOPE) + return() + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "OpenBSD") + # As of 6.8, the OpenBSD specific pkg-config doesn't support {pcfiledir} + set(supported_on_unix ON) + set(rename_binary_to "pkg-config") + set(program_version 0.29.2.1) + set(raw_executable ON) + set(download_filename "pkg-config.openbsd") + set(tool_subdirectory "openbsd") + set(download_urls "https://raw.githubusercontent.com/jgilje/pkg-config-openbsd/master/pkg-config") + set(download_sha512 b7ec9017b445e00ae1377e36e774cf3f5194ab262595840b449832707d11e443a102675f66d8b7e8b2e2f28cebd6e256835507b1e0c69644cc9febab8285080b) + set(version_command --version) + elseif(CMAKE_HOST_WIN32) + if(NOT EXISTS "${PKGCONFIG}") + set(VERSION 0.29.2-3) + set(program_version git-9.0.0.6373.5be8fcd83-1) + vcpkg_acquire_msys( + PKGCONFIG_ROOT + NO_DEFAULT_PACKAGES + DIRECT_PACKAGES + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-pkg-config-${VERSION}-any.pkg.tar.zst" + 0c086bf306b6a18988cc982b3c3828c4d922a1b60fd24e17c3bead4e296ee6de48ce148bc6f9214af98be6a86cb39c37003d2dcb6561800fdf7d0d1028cf73a4 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-${program_version}-any.pkg.tar.zst" + c89c27b5afe4cf5fdaaa354544f070c45ace5e9d2f2ebb4b956a148f61681f050e67976894e6f52e42e708dadbf730fee176ac9add3c9864c21249034c342810 + ) + endif() + set("${program}" "${PKGCONFIG_ROOT}/mingw32/bin/pkg-config.exe" CACHE INTERNAL "") + set("${program}" "${${program}}" PARENT_SCOPE) + return() + else() + set(brew_package_name pkg-config) + set(apt_package_name pkg-config) + set(paths_to_search "/bin" "/usr/bin" "/usr/local/bin") + endif() + else() + message(FATAL "unknown tool ${program} -- unable to acquire.") + endif() + + if("${program_name}" STREQUAL "") + message(FATAL_ERROR "Internal error: failed to initialize program_name for program ${program}") + endif() + + set(full_subdirectory "${DOWNLOADS}/tools/${program_name}/${tool_subdirectory}") + if(NOT "${tool_subdirectory}" STREQUAL "") + list(APPEND paths_to_search ${full_subdirectory}) + endif() + if("${full_subdirectory}" MATCHES [[^(.*)[/\\]+$]]) + # remove trailing slashes, which may turn into a trailing `\` which CMake _does not like_ + set(full_subdirectory "${CMAKE_MATCH_1}") + endif() + + if("${search_names}" STREQUAL "") + set(search_names "${program_name}") + endif() + + z_vcpkg_find_acquire_program_find_internal("${program}" + INTERPRETER "${interpreter}" + PATHS ${paths_to_search} + NAMES ${search_names} + ) + if(NOT ${program}) + z_vcpkg_find_acquire_program_find_external("${program}" + ${extra_search_args} + PROGRAM_NAME "${program_name}" + MIN_VERSION "${program_version}" + INTERPRETER "${interpreter}" + NAMES ${search_names} + VERSION_COMMAND ${version_command} + ) + endif() + if(NOT ${program}) + if(NOT VCPKG_HOST_IS_WINDOWS AND NOT supported_on_unix) + set(example ".") + if(NOT "${brew_package_name}" STREQUAL "" AND VCPKG_HOST_IS_OSX) + set(example ":\n brew install ${brew_package_name}") + elseif(NOT "${apt_package_name}" STREQUAL "" AND VCPKG_HOST_IS_LINUX) + set(example ":\n sudo apt-get install ${apt_package_name}") + endif() + message(FATAL_ERROR "Could not find ${program_name}. Please install it via your package manager${example}") + endif() + + if(NOT "${sourceforge_args}" STREQUAL "") + # Locally change editable to suppress re-extraction each time + set(_VCPKG_EDITABLE 1) + vcpkg_from_sourceforge(OUT_SOURCE_PATH SFPATH ${sourceforge_args}) + unset(_VCPKG_EDITABLE) + else() + vcpkg_download_distfile(archive_path + URLS ${download_urls} + SHA512 "${download_sha512}" + FILENAME "${download_filename}" + ) + + file(MAKE_DIRECTORY "${full_subdirectory}") + if(raw_executable) + if(NOT "${rename_binary_to}" STREQUAL "") + file(INSTALL "${archive_path}" + DESTINATION "${full_subdirectory}" + RENAME "${rename_binary_to}" + FILE_PERMISSIONS + OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + ) + else() + file(COPY "${archive_path}" + DESTINATION "${full_subdirectory}" + FILE_PERMISSIONS + OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + ) + endif() + else() + cmake_path(GET download_filename EXTENSION archive_extension) + string(TOLOWER "${archive_extension}" archive_extension) + if("${archive_extension}" MATCHES [[\.msi$]]) + cmake_path(NATIVE_PATH archive_path archive_native_path) + cmake_path(NATIVE_PATH full_subdirectory destination_native_path) + vcpkg_execute_in_download_mode( + COMMAND msiexec + /a "${archive_native_path}" + /qn "TARGETDIR=${destination_native_path}" + WORKING_DIRECTORY "${DOWNLOADS}" + ) + elseif("${archive_extension}" MATCHES [[\.7z\.exe$]]) + vcpkg_find_acquire_program(7Z) + vcpkg_execute_in_download_mode( + COMMAND ${7Z} x + "${archive_path}" + "-o${full_subdirectory}" + -y -bso0 -bsp0 + WORKING_DIRECTORY "${full_subdirectory}" + ) + else() + vcpkg_execute_in_download_mode( + COMMAND "${CMAKE_COMMAND}" -E tar xzf "${archive_path}" + WORKING_DIRECTORY "${full_subdirectory}" + ) + endif() + endif() + endif() + + if(NOT "${post_install_command}" STREQUAL "") + vcpkg_execute_required_process( + ALLOW_IN_DOWNLOAD_MODE + COMMAND ${post_install_command} + WORKING_DIRECTORY "${full_subdirectory}" + LOGNAME "${program}-tool-post-install" + ) + endif() + unset("${program}") + unset("${program}" CACHE) + z_vcpkg_find_acquire_program_find_internal("${program}" + INTERPRETER "${interpreter}" + PATHS ${paths_to_search} + NAMES ${search_names} + ) + if(NOT ${program}) + message(FATAL_ERROR "Unable to find ${program}") + endif() + endif() + + set("${program}" "${${program}}" PARENT_SCOPE) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_find_fortran.cmake b/externals/vcpkg/scripts/cmake/vcpkg_find_fortran.cmake new file mode 100755 index 000000000..2f1c49722 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_find_fortran.cmake @@ -0,0 +1,124 @@ +function(vcpkg_find_fortran out_var) + if("${ARGC}" GREATER "1") + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra args: ${ARGN}") + endif() + + vcpkg_list(SET additional_cmake_args) + + set(CMAKE_BINARY_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") + set(CMAKE_CURRENT_BINARY_DIR "${CMAKE_BINARY_DIR}") + set(CMAKE_PLATFORM_INFO_DIR "${CMAKE_BINARY_DIR}/Platform") + include(CMakeDetermineFortranCompiler) + + if(NOT CMAKE_Fortran_COMPILER AND "${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" STREQUAL "") + # If a user uses their own VCPKG_CHAINLOAD_TOOLCHAIN_FILE, they _must_ figure out fortran on their own. + if(WIN32) + message(STATUS "No Fortran compiler found on the PATH. Using MinGW gfortran!") + # If no Fortran compiler is on the path we switch to use gfortan from MinGW within vcpkg + if("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x86") + set(mingw_path mingw32) + set(machine_flag -m32) + vcpkg_acquire_msys(msys_root + DIRECT_PACKAGES + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-fortran-11.2.0-8-any.pkg.tar.zst" + 9337dafdeb4f5eaf41bf13441c345b999dd0561b4fc757a67b4e362c3e0afea5828cd68b35d2823c545d74ea81b2c34bd1624f97817690a2931f3a890b5273bd + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libgfortran-11.2.0-8-any.pkg.tar.zst" + 3e6396eb4dcbe730bb63f4534e25b654008be49f0e113cf34cfb640dba3f67b508a6f5c78f7ab1cc57686936e709bc37a1fdbc20df5ee17fd708a21c1b844af4 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libs-11.2.0-8-any.pkg.tar.zst" + bdf253bb627cfc108407ea0d1f5fc643da0b229a8f7fcc346fcdf7709e0ffbf8d1f75bdea755116c6b30834d1c764496a23c0546ef1048075d312136c6ebe9d9 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gmp-6.2.1-3-any.pkg.tar.zst" + 10787443380a89a3491596946354645899daad07bc159ffcee96243cb51637dfbc163d52751ffd14682b66be8fd65c0379c642df16132f16a80709c4af921bac + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + c89c27b5afe4cf5fdaaa354544f070c45ace5e9d2f2ebb4b956a148f61681f050e67976894e6f52e42e708dadbf730fee176ac9add3c9864c21249034c342810 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-winpthreads-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + 85980183879da0d0ea74b9ad1fdfb09e5ed9d2e2212877d47d0f621ce721566e205be0b1913a643d0a95b256441e0bafd803fa9c848a8203dffd7d72109e32c2 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-mpc-1.2.1-1-any.pkg.tar.zst" + f4cda83c26bf4225a8c387e0710ea086896e9c89e7863b9a2947982636664b64ffa880cbddfe6d85f8cf7cb3be18296b04874026cdf8b1b702a2820dad135ba4 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-mpfr-4.1.0.p13-1-any.pkg.tar.zst" + 038a1cc6bb080d415b9fc19965a1f1c9419f5c42023e29c87f97b4f630c152602abb706036aa3e0f02e337e9d7ab3a43bd7b1234b3775a43ffceb348e79bac1a + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-11.2.0-8-any.pkg.tar.zst" + a6183f0fc80c2e37316b6eb60fdbdccc30b865053dad270c9c96e93cd6fdb2af28a75f981ac1de2fdc22a47494cdb54b8d41d4ecffdf1b1d3a54e85437c20dcf + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-binutils-2.37-4-any.pkg.tar.zst" + 1c2fbb8b94778c562aed01010c06c804d1cc2c446837879e4f1187470259adaecd86699b084c69e254d98201333db69a55126ea2cd0c188e55c9af849c37315a + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-crt-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + 495834d72313021b7553d92a897932f5efc66a0f6f79ebeec574ecd7ddd23e0eed9aacb32601007606abb10b44ba7c7c1ccf6d3437a4338839b2d7b1792327f9 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-headers-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + 7959ae9267306c862b8b23be2ab21498f6e7890c936feae3ec9cf5607434e87e446f7c75ff7bd975f23aa24eb1c23d6068957f6af4e8c358f5f4861db64248b8 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libiconv-1.16-2-any.pkg.tar.zst" + fe48d0d3c582fee1edb178425c6daf619d86362442c729047b3c356be26491164f92be1d87950429d2faca4ed3cf76cb4aafef1af3c87b780eee85ee85a4b4c5 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-windows-default-manifest-6.4-3-any.pkg.tar.xz" + 5b99abc55eaa74cf85ca64a9c91542554cb5c1098bc71effba9bd36242694cfd348503fcd3507fb9ba97486108c092c925e2f38cd744493386b3dc9ab28bc526 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-zlib-1.2.11-9-any.pkg.tar.zst" + 3e461e835641a2a755a42221011871f8a1ed5fa4b6b23c74db286e29bbcfa2fcd30d4a7c41216728df62c9131dbc1e554720da633ed6b2ba3d6f2b6d5d50a300 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-zstd-1.5.2-1-any.pkg.tar.zst" + 8e27911a2a5884faa95e1c55058ca15f233d432ed8aa607b04a019758aa21f1357bd5de5ce8709fa47f4fbed6eb00fdfd94e7e2d82023bbc1f1653e95f439e0a + ) + elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x64") + set(mingw_path mingw64) + set(machine_flag -m64) + vcpkg_acquire_msys(msys_root + DIRECT_PACKAGES + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-fortran-11.2.0-8-any.pkg.tar.zst" + d56483e090f86410b87526dda7774e010d0bd6beda97edcaeb1dead1128fd5ad870bc761a8a190759c48d58c2526b6975fb849f9c03a6be193741a0fd0bf2812 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libgfortran-11.2.0-8-any.pkg.tar.zst" + 8537b55633bc83d81d528378590e417ffe8c26b6c327d8b6d7ba50a8b5f4e090fbe2dc500deb834120edf25ac3c493055f4de2dc64bde061be23ce0f625a8893 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-11.2.0-8-any.pkg.tar.zst" + 2481f7c8db7cca549911bc71715af86ca287ffed6d673c9a6c3a4c792b68899a129dd959214af7067f434e74fc518c43749e7d928cbd2232ab4fbc65880dad98 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gmp-6.2.1-3-any.pkg.tar.zst" + d0d4ed1a046b64f437e72bbcf722b30311dde5f5e768a520141423fc0a3127b116bd62cfd4b5cf5c01a71ee0f9cf6479fcc31277904652d8f6ddbf16e33e0b72 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + a2c9e60d23b1310a6cec1fadd2b15a8c07223f3fe90d41b1579e9fc27ee2b0b408456291a55fad54a156e6a247efc20f6fcc247cc567e64fe190938aa3b672e9 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-winpthreads-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + be03433e6006166e5b4794f2a01730cdb6c9f19fa96bd10a8bc50cf06ad389cbc66d44ea3eda46f53c3b2c89e2fc86aec21a372828e9527b24480c87ed88348c + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpc-1.2.1-1-any.pkg.tar.zst" + f2c137dbb0b6feea68dde9739c38b44dcb570324e3947adf991028e8f63c9ff50a11f47be15b90279ff40bcac7f320d952cfc14e69ba8d02cf8190c848d976a1 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpfr-4.1.0.p13-1-any.pkg.tar.zst" + a1425169c1570dbd736c31d50bedfab88636bf9565376e2da566be67fcc771e6c76f95895f382d81097e7c0580acb42aa49e34dec5d7a868d73a5dc6a7461c95 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-11.2.0-8-any.pkg.tar.zst" + 26ab2cab684206978a254f1e1595b1ce688e6db12e57ed1d243a5f1b3b21b314f640c7c6fe90eedccb6b9788e1886415ca3290d03b1e71f67f8a99108068336a + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-binutils-2.37-4-any.pkg.tar.zst" + f09ea70810fb337d7f3ec673342ab90df511e6af451e273fe88fe41a2f30bd972b79c830b61bb5388743d00a0ba7885503e143987413db5170c4befffef66303 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-crt-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + 63d081fedd1f70e8d58670d4d0698535a67f04c31caf02d0b23026ac23fc5064e9423d73c79854bbce41cc99dd0b70e4137af3a609e05cdd867fdcea120d356e + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-headers-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + 05860f2bcfacf54089b750099f9ddc52d9b4b8ae8f69028a198dfb51fab09c37a941ae551e5d361a2a11302d48bd4fa95c44131ddee4c1df5a14f28013398f63 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libiconv-1.16-2-any.pkg.tar.zst" + 542ed5d898a57a79d3523458f8f3409669b411f87d0852bb566d66f75c96422433f70628314338993461bcb19d4bfac4dadd9d21390cb4d95ef0445669288658 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-windows-default-manifest-6.4-3-any.pkg.tar.xz" + 77d02121416e42ff32a702e21266ce9031b4d8fc9ecdb5dc049d92570b658b3099b65d167ca156367d17a76e53e172ca52d468e440c2cdfd14701da210ffea37 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zlib-1.2.11-9-any.pkg.tar.zst" + f386d3a8d8c169a62a4580af074b7fdc0760ef0fde22ef7020a349382dd374a9e946606c757d12da1c1fe68baf5e2eaf459446e653477035a63e0e20df8f4aa0 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zstd-1.5.2-1-any.pkg.tar.zst" + 38ec5ca99c5b955bf8a892a3edaf4e18572977736809b7671c554526b13cb4e53d45c5b83e37e0fb7628483ba98831b3203e3e404dac720d5b2ed95cfe4505c4 + ) + else() + message(FATAL_ERROR "Unknown architecture '${VCPKG_TARGET_ARCHITECTURE}' for MinGW Fortran build!") + endif() + + set(mingw_bin "${msys_root}/${mingw_path}/bin") + vcpkg_add_to_path(PREPEND "${mingw_bin}") + vcpkg_list(APPEND additional_cmake_args + -DCMAKE_GNUtoMS=ON + "-DCMAKE_Fortran_COMPILER=${mingw_bin}/gfortran.exe" + "-DCMAKE_C_COMPILER=${mingw_bin}/gcc.exe" + "-DCMAKE_Fortran_FLAGS_INIT:STRING= -mabi=ms ${machine_flag} ${VCPKG_Fortran_FLAGS}") + + # This is for private use by vcpkg-gfortran + set(vcpkg_find_fortran_MSYS_ROOT "${msys_root}" PARENT_SCOPE) + set(VCPKG_USE_INTERNAL_Fortran TRUE PARENT_SCOPE) + set(VCPKG_POLICY_SKIP_DUMPBIN_CHECKS enabled PARENT_SCOPE) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/mingw.cmake" PARENT_SCOPE) # Switching to MinGW toolchain for Fortran + if(VCPKG_CRT_LINKAGE STREQUAL "static") + set(VCPKG_CRT_LINKAGE dynamic PARENT_SCOPE) + message(STATUS "VCPKG_CRT_LINKAGE linkage for ${PORT} using vcpkg's internal gfortran cannot be static due to linking against MinGW libraries. Forcing dynamic CRT linkage") + endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(VCPKG_LIBRARY_LINKAGE dynamic PARENT_SCOPE) + message(STATUS "VCPKG_LIBRARY_LINKAGE linkage for ${PORT} using vcpkg's internal gfortran cannot be static due to linking against MinGW libraries. Forcing dynamic library linkage") + endif() + else() + message(FATAL_ERROR "Unable to find a Fortran compiler using 'CMakeDetermineFortranCompiler'. Please install one (e.g. gfortran) and make it available on the PATH!") + endif() + endif() + set("${out_var}" "${additional_cmake_args}" PARENT_SCOPE) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/externals/vcpkg/scripts/cmake/vcpkg_fixup_cmake_targets.cmake new file mode 100755 index 000000000..3d8a8ba4f --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_fixup_cmake_targets.cmake @@ -0,0 +1,186 @@ +function(vcpkg_fixup_cmake_targets) + if(Z_VCPKG_CMAKE_CONFIG_FIXUP_GUARD) + message(FATAL_ERROR "The ${PORT} port already depends on vcpkg-cmake-config; using both vcpkg-cmake-config and vcpkg_fixup_cmake_targets in the same port is unsupported.") + endif() + + cmake_parse_arguments(PARSE_ARGV 0 arg "DO_NOT_DELETE_PARENT_CONFIG_PATH;NO_PREFIX_CORRECTION" "CONFIG_PATH;TARGET_PATH;TOOLS_PATH" "") + + if(arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "vcpkg_fixup_cmake_targets was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + if(NOT arg_TARGET_PATH) + set(arg_TARGET_PATH share/${PORT}) + endif() + + if(NOT arg_TOOLS_PATH) + set(arg_TOOLS_PATH tools/${PORT}) + endif() + + string(REPLACE "." "\\." EXECUTABLE_SUFFIX "${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + + set(DEBUG_SHARE ${CURRENT_PACKAGES_DIR}/debug/${arg_TARGET_PATH}) + set(RELEASE_SHARE ${CURRENT_PACKAGES_DIR}/${arg_TARGET_PATH}) + + if(arg_CONFIG_PATH AND NOT RELEASE_SHARE STREQUAL "${CURRENT_PACKAGES_DIR}/${arg_CONFIG_PATH}") + if(arg_CONFIG_PATH STREQUAL "share") + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/debug/share2) + file(RENAME ${CURRENT_PACKAGES_DIR}/share ${CURRENT_PACKAGES_DIR}/share2) + set(arg_CONFIG_PATH share2) + endif() + + set(DEBUG_CONFIG ${CURRENT_PACKAGES_DIR}/debug/${arg_CONFIG_PATH}) + set(RELEASE_CONFIG ${CURRENT_PACKAGES_DIR}/${arg_CONFIG_PATH}) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if(NOT EXISTS ${DEBUG_CONFIG}) + message(FATAL_ERROR "'${DEBUG_CONFIG}' does not exist.") + endif() + + # This roundabout handling enables CONFIG_PATH share + file(MAKE_DIRECTORY ${DEBUG_SHARE}) + file(GLOB FILES ${DEBUG_CONFIG}/*) + file(COPY ${FILES} DESTINATION ${DEBUG_SHARE}) + file(REMOVE_RECURSE ${DEBUG_CONFIG}) + endif() + + file(GLOB FILES ${RELEASE_CONFIG}/*) + file(COPY ${FILES} DESTINATION ${RELEASE_SHARE}) + file(REMOVE_RECURSE ${RELEASE_CONFIG}) + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + get_filename_component(DEBUG_CONFIG_DIR_NAME ${DEBUG_CONFIG} NAME) + string(TOLOWER "${DEBUG_CONFIG_DIR_NAME}" DEBUG_CONFIG_DIR_NAME) + if(DEBUG_CONFIG_DIR_NAME STREQUAL "cmake" AND NOT arg_DO_NOT_DELETE_PARENT_CONFIG_PATH) + file(REMOVE_RECURSE ${DEBUG_CONFIG}) + else() + get_filename_component(DEBUG_CONFIG_PARENT_DIR ${DEBUG_CONFIG} DIRECTORY) + get_filename_component(DEBUG_CONFIG_DIR_NAME ${DEBUG_CONFIG_PARENT_DIR} NAME) + string(TOLOWER "${DEBUG_CONFIG_DIR_NAME}" DEBUG_CONFIG_DIR_NAME) + if(DEBUG_CONFIG_DIR_NAME STREQUAL "cmake" AND NOT arg_DO_NOT_DELETE_PARENT_CONFIG_PATH) + file(REMOVE_RECURSE ${DEBUG_CONFIG_PARENT_DIR}) + endif() + endif() + endif() + + get_filename_component(RELEASE_CONFIG_DIR_NAME ${RELEASE_CONFIG} NAME) + string(TOLOWER "${RELEASE_CONFIG_DIR_NAME}" RELEASE_CONFIG_DIR_NAME) + if(RELEASE_CONFIG_DIR_NAME STREQUAL "cmake" AND NOT arg_DO_NOT_DELETE_PARENT_CONFIG_PATH) + file(REMOVE_RECURSE ${RELEASE_CONFIG}) + else() + get_filename_component(RELEASE_CONFIG_PARENT_DIR ${RELEASE_CONFIG} DIRECTORY) + get_filename_component(RELEASE_CONFIG_DIR_NAME ${RELEASE_CONFIG_PARENT_DIR} NAME) + string(TOLOWER "${RELEASE_CONFIG_DIR_NAME}" RELEASE_CONFIG_DIR_NAME) + if(RELEASE_CONFIG_DIR_NAME STREQUAL "cmake" AND NOT arg_DO_NOT_DELETE_PARENT_CONFIG_PATH) + file(REMOVE_RECURSE ${RELEASE_CONFIG_PARENT_DIR}) + endif() + endif() + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if(NOT EXISTS "${DEBUG_SHARE}") + message(FATAL_ERROR "'${DEBUG_SHARE}' does not exist.") + endif() + endif() + + file(GLOB_RECURSE UNUSED_FILES + "${DEBUG_SHARE}/*[Tt]argets.cmake" + "${DEBUG_SHARE}/*[Cc]onfig.cmake" + "${DEBUG_SHARE}/*[Cc]onfigVersion.cmake" + "${DEBUG_SHARE}/*[Cc]onfig-version.cmake" + ) + if(UNUSED_FILES) + file(REMOVE ${UNUSED_FILES}) + endif() + + file(GLOB_RECURSE RELEASE_TARGETS + "${RELEASE_SHARE}/*-release.cmake" + ) + foreach(RELEASE_TARGET IN LISTS RELEASE_TARGETS) + file(READ ${RELEASE_TARGET} _contents) + string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${_IMPORT_PREFIX}" _contents "${_contents}") + string(REGEX REPLACE "\\\${_IMPORT_PREFIX}/bin/([^ \"]+${EXECUTABLE_SUFFIX})" "\${_IMPORT_PREFIX}/${arg_TOOLS_PATH}/\\1" _contents "${_contents}") + file(WRITE ${RELEASE_TARGET} "${_contents}") + endforeach() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(GLOB_RECURSE DEBUG_TARGETS + "${DEBUG_SHARE}/*-debug.cmake" + ) + foreach(DEBUG_TARGET IN LISTS DEBUG_TARGETS) + file(RELATIVE_PATH DEBUG_TARGET_REL "${DEBUG_SHARE}" "${DEBUG_TARGET}") + + file(READ ${DEBUG_TARGET} _contents) + string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${_IMPORT_PREFIX}" _contents "${_contents}") + string(REGEX REPLACE "\\\${_IMPORT_PREFIX}/bin/([^ \";]+${EXECUTABLE_SUFFIX})" "\${_IMPORT_PREFIX}/${arg_TOOLS_PATH}/\\1" _contents "${_contents}") + string(REPLACE "\${_IMPORT_PREFIX}/lib" "\${_IMPORT_PREFIX}/debug/lib" _contents "${_contents}") + string(REPLACE "\${_IMPORT_PREFIX}/bin" "\${_IMPORT_PREFIX}/debug/bin" _contents "${_contents}") + file(WRITE ${RELEASE_SHARE}/${DEBUG_TARGET_REL} "${_contents}") + + file(REMOVE ${DEBUG_TARGET}) + endforeach() + endif() + + #Fix ${_IMPORT_PREFIX} in cmake generated targets and configs; + #Since those can be renamed we have to check in every *.cmake + file(GLOB_RECURSE MAIN_CMAKES "${RELEASE_SHARE}/*.cmake") + + foreach(MAIN_CMAKE IN LISTS MAIN_CMAKES) + file(READ ${MAIN_CMAKE} _contents) + #This correction is not correct for all cases. To make it correct for all cases it needs to consider + #original folder deepness to CURRENT_PACKAGES_DIR in comparison to the moved to folder deepness which + #is always at least (>=) 2, e.g. share/${PORT}. Currently the code assumes it is always 2 although + #this requirement is only true for the *Config.cmake. The targets are not required to be in the same + #folder as the *Config.cmake! + if(NOT arg_NO_PREFIX_CORRECTION) + string(REGEX REPLACE + "get_filename_component\\(_IMPORT_PREFIX \"\\\${CMAKE_CURRENT_LIST_FILE}\" PATH\\)(\nget_filename_component\\(_IMPORT_PREFIX \"\\\${_IMPORT_PREFIX}\" PATH\\))*" + "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)" + _contents "${_contents}") # see #1044 for details why this replacement is necessary. See #4782 why it must be a regex. + string(REGEX REPLACE + "get_filename_component\\(PACKAGE_PREFIX_DIR \"\\\${CMAKE_CURRENT_LIST_DIR}/\\.\\./(\\.\\./)*\" ABSOLUTE\\)" + "get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/../../\" ABSOLUTE)" + _contents "${_contents}") + string(REGEX REPLACE + "get_filename_component\\(PACKAGE_PREFIX_DIR \"\\\${CMAKE_CURRENT_LIST_DIR}/\\.\\.((\\\\|/)\\.\\.)*\" ABSOLUTE\\)" + "get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/../../\" ABSOLUTE)" + _contents "${_contents}") # This is a meson-related workaround, see https://github.com/mesonbuild/meson/issues/6955 + endif() + + #Fix wrongly absolute paths to install dir with the correct dir using ${_IMPORT_PREFIX} + #This happens if vcpkg built libraries are directly linked to a target instead of using + #an imported target for it. We could add more logic here to identify defect target files. + #Since the replacement here in a multi config build always requires a generator expression + #in front of the absoulte path to ${CURRENT_INSTALLED_DIR}. So the match should always be at + #least >:${CURRENT_INSTALLED_DIR}. + #In general the following generator expressions should be there: + #\$<\$:${CURRENT_INSTALLED_DIR}/debug/lib/somelib> + #and/or + #\$<\$>:${CURRENT_INSTALLED_DIR}/lib/somelib> + #with ${CURRENT_INSTALLED_DIR} being fully expanded + string(REPLACE "${CURRENT_INSTALLED_DIR}" [[${_IMPORT_PREFIX}]] _contents "${_contents}") + file(WRITE ${MAIN_CMAKE} "${_contents}") + endforeach() + + # Remove /debug// if it's empty. + file(GLOB_RECURSE REMAINING_FILES "${DEBUG_SHARE}/*") + if(NOT REMAINING_FILES) + file(REMOVE_RECURSE ${DEBUG_SHARE}) + endif() + + # Remove /debug/share/ if it's empty. + file(GLOB_RECURSE REMAINING_FILES "${CURRENT_PACKAGES_DIR}/debug/share/*") + if(NOT REMAINING_FILES) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + endif() + + # Patch out any remaining absolute references + file(TO_CMAKE_PATH "${CURRENT_PACKAGES_DIR}" CMAKE_CURRENT_PACKAGES_DIR) + file(GLOB CMAKE_FILES ${RELEASE_SHARE}/*.cmake) + foreach(CMAKE_FILE IN LISTS CMAKE_FILES) + file(READ ${CMAKE_FILE} _contents) + string(REPLACE "${CMAKE_CURRENT_PACKAGES_DIR}" "\${CMAKE_CURRENT_LIST_DIR}/../.." _contents "${_contents}") + file(WRITE ${CMAKE_FILE} "${_contents}") + endforeach() +endfunction() + + diff --git a/externals/vcpkg/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/externals/vcpkg/scripts/cmake/vcpkg_fixup_pkgconfig.cmake new file mode 100755 index 000000000..6040c2699 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -0,0 +1,165 @@ +function(z_vcpkg_fixup_pkgconfig_check_files file config) + set(path_suffix_DEBUG /debug) + set(path_suffix_RELEASE "") + + if(DEFINED ENV{PKG_CONFIG_PATH}) + set(backup_env_pkg_config_path "$ENV{PKG_CONFIG_PATH}") + else() + unset(backup_env_pkg_config_path) + endif() + + vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} + "${CURRENT_PACKAGES_DIR}${path_suffix_${config}}/lib/pkgconfig" + "${CURRENT_PACKAGES_DIR}/share/pkgconfig" + "${CURRENT_INSTALLED_DIR}${path_suffix_${config}}/lib/pkgconfig" + "${CURRENT_INSTALLED_DIR}/share/pkgconfig" + ) + + # First make sure everything is ok with the package and its deps + cmake_path(GET file STEM LAST_ONLY package_name) + debug_message("Checking package (${config}): ${package_name}") + execute_process( + COMMAND "${PKGCONFIG}" --print-errors --exists "${package_name}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + RESULT_VARIABLE error_var + OUTPUT_VARIABLE output + ERROR_VARIABLE output + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_STRIP_TRAILING_WHITESPACE + ) + if(NOT "${error_var}" EQUAL "0") + message(FATAL_ERROR "${PKGCONFIG} --exists ${package_name} failed with error code: ${error_var} + ENV{PKG_CONFIG_PATH}: \"$ENV{PKG_CONFIG_PATH}\" + output: ${output}" + ) + else() + debug_message("pkg-config --exists ${package_name} output: ${output}") + endif() + if(DEFINED backup_env_pkg_config_path) + set(ENV{PKG_CONFIG_PATH} "${backup_env_pkg_config_path}") + else() + unset(ENV{PKG_CONFIG_PATH}) + endif() +endfunction() + +function(vcpkg_fixup_pkgconfig) + cmake_parse_arguments(PARSE_ARGV 0 arg + "SKIP_CHECK" + "" + "RELEASE_FILES;DEBUG_FILES;SYSTEM_LIBRARIES;SYSTEM_PACKAGES;IGNORE_FLAGS" + ) + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + if(DEFINED arg_RELEASE_FILES AND NOT DEFINED arg_DEBUG_FILES) + message(FATAL_ERROR "DEBUG_FILES must be specified if RELEASE_FILES was specified.") + endif() + if(NOT DEFINED arg_RELEASE_FILES AND DEFINED arg_DEBUG_FILES) + message(FATAL_ERROR "RELEASE_FILES must be specified if DEBUG_FILES was specified.") + endif() + + if(NOT DEFINED arg_RELEASE_FILES) + file(GLOB_RECURSE arg_RELEASE_FILES "${CURRENT_PACKAGES_DIR}/**/*.pc") + file(GLOB_RECURSE arg_DEBUG_FILES "${CURRENT_PACKAGES_DIR}/debug/**/*.pc") + foreach(debug_file IN LISTS arg_DEBUG_FILES) + vcpkg_list(REMOVE_ITEM arg_RELEASE_FILES "${debug_file}") + endforeach() + endif() + + string(REGEX REPLACE "^([a-zA-Z]):/" [[/\1/]] unix_packages_dir "${CURRENT_PACKAGES_DIR}") + string(REGEX REPLACE "^([a-zA-Z]):/" [[/\1/]] unix_installed_dir "${CURRENT_INSTALLED_DIR}") + + foreach(config IN ITEMS RELEASE DEBUG) + debug_message("${config} Files: ${arg_${config}_FILES}") + if("${VCPKG_BUILD_TYPE}" STREQUAL "debug" AND "${config}" STREQUAL "RELEASE") + continue() + endif() + if("${VCPKG_BUILD_TYPE}" STREQUAL "release" AND "${config}" STREQUAL "DEBUG") + continue() + endif() + foreach(file IN LISTS "arg_${config}_FILES") + message(STATUS "Fixing pkgconfig file: ${file}") + cmake_path(GET file PARENT_PATH pkg_lib_search_path) + if("${config}" STREQUAL "DEBUG") + set(relative_pc_path "${CURRENT_PACKAGES_DIR}/debug") + cmake_path(RELATIVE_PATH relative_pc_path BASE_DIRECTORY "${pkg_lib_search_path}") + else() + set(relative_pc_path "${CURRENT_PACKAGES_DIR}") + cmake_path(RELATIVE_PATH relative_pc_path BASE_DIRECTORY "${pkg_lib_search_path}") + endif() + #Correct *.pc file + file(READ "${file}" contents) + + # this normalizes all files to end with a newline, and use LF instead of CRLF; + # this allows us to use regex matches easier to modify these files. + if(NOT "${contents}" MATCHES "\n$") + string(APPEND contents "\n") + endif() + string(REPLACE "\r\n" "\n" contents "${contents}") + + string(REPLACE "${CURRENT_PACKAGES_DIR}" [[${prefix}]] contents "${contents}") + string(REPLACE "${CURRENT_INSTALLED_DIR}" [[${prefix}]] contents "${contents}") + string(REPLACE "${unix_packages_dir}" [[${prefix}]] contents "${contents}") + string(REPLACE "${unix_installed_dir}" [[${prefix}]] contents "${contents}") + + string(REGEX REPLACE "(^|\n)prefix[\t ]*=[^\n]*" "" contents "${contents}") + if("${config}" STREQUAL "DEBUG") + # prefix points at the debug subfolder + string(REPLACE [[${prefix}/debug]] [[${prefix}]] contents "${contents}") + string(REPLACE [[${prefix}/include]] [[${prefix}/../include]] contents "${contents}") + string(REPLACE [[${prefix}/share]] [[${prefix}/../share]] contents "${contents}") + endif() + # quote -L, -I, and -l paths starting with `${blah}` + string(REGEX REPLACE " -([LIl])(\\\${[^}]*}[^ \n\t]*)" [[ -\1"\2"]] contents "${contents}") + # This section fuses XYZ.private and XYZ according to VCPKG_LIBRARY_LINKAGE + # + # Pkgconfig searches Requires.private transitively for Cflags in the dynamic case, + # which prevents us from removing it. + # + # Once this transformation is complete, users of vcpkg should never need to pass + # --static. + if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + # how this works: + # we want to transform: + # Libs: $1 + # Libs.private: $2 + # into + # Libs: $1 $2 + # and the same thing for Requires and Requires.private + + foreach(item IN ITEMS "Libs" "Requires" "Cflags") + set(line "") + if("${contents}" MATCHES "(^|\n)${item}: *([^\n]*)") + string(APPEND line " ${CMAKE_MATCH_2}") + endif() + if("${contents}" MATCHES "(^|\n)${item}\\.private: *([^\n]*)") + string(APPEND line " ${CMAKE_MATCH_2}") + endif() + + string(REGEX REPLACE "(^|\n)${item}(\\.private)?:[^\n]*\n" [[\1]] contents "${contents}") + if(NOT "${line}" STREQUAL "") + string(APPEND contents "${item}:${line}\n") + endif() + endforeach() + endif() + file(WRITE "${file}" "prefix=\${pcfiledir}/${relative_pc_path}\n${contents}") + endforeach() + + if(NOT arg_SKIP_CHECK) # The check can only run after all files have been corrected! + vcpkg_find_acquire_program(PKGCONFIG) + debug_message("Using pkg-config from: ${PKGCONFIG}") + foreach(file IN LISTS "arg_${config}_FILES") + z_vcpkg_fixup_pkgconfig_check_files("${file}" "${config}") + endforeach() + endif() + endforeach() + debug_message("Fixing pkgconfig --- finished") + + set(Z_VCPKG_FIXUP_PKGCONFIG_CALLED TRUE CACHE INTERNAL "See below" FORCE) + # Variable to check if this function has been called! + # Theoreotically vcpkg could look for *.pc files and automatically call this function + # or check if this function has been called if *.pc files are detected. + # The same is true for vcpkg_fixup_cmake_targets +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_from_bitbucket.cmake b/externals/vcpkg/scripts/cmake/vcpkg_from_bitbucket.cmake new file mode 100755 index 000000000..2cd9c998a --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_from_bitbucket.cmake @@ -0,0 +1,93 @@ +function(vcpkg_from_bitbucket) + cmake_parse_arguments(PARSE_ARGV 0 "arg" + "" + "OUT_SOURCE_PATH;REPO;REF;SHA512;HEAD_REF" + "PATCHES") + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "vcpkg_from_bitbucket was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + if(DEFINED arg_REF AND NOT DEFINED arg_SHA512) + message(FATAL_ERROR "SHA512 must be specified if REF is specified.") + endif() + if(NOT DEFINED arg_REF AND DEFINED arg_SHA512) + message(FATAL_ERROR "REF must be specified if SHA512 is specified.") + endif() + + if(NOT DEFINED arg_OUT_SOURCE_PATH) + message(FATAL_ERROR "OUT_SOURCE_PATH must be specified.") + endif() + if(NOT DEFINED arg_REPO) + message(FATAL_ERROR "The Bitbucket repository must be specified.") + endif() + + if(NOT DEFINED arg_REF AND NOT DEFINED arg_HEAD_REF) + message(FATAL_ERROR "At least one of REF or HEAD_REF must be specified.") + endif() + + if(NOT arg_REPO MATCHES "^([^/]*)/([^/]*)$") + message(FATAL_ERROR "REPO (${arg_REPO}) is not a valid repo name: + must be an organization name followed by a repository name separated by a single slash.") + endif() + set(org_name "${CMAKE_MATCH_1}") + set(repo_name "${CMAKE_MATCH_2}") + + set(redownload_param "") + set(working_directory_param "") + set(sha512_param "SHA512" "${arg_SHA512}") + set(ref_to_use "${arg_REF}") + if(VCPKG_USE_HEAD_VERSION) + if(DEFINED arg_HEAD_REF) + set(redownload_param "ALWAYS_REDOWNLOAD") + set(sha512_param "SKIP_SHA512") + set(working_directory_param "WORKING_DIRECTORY" "${CURRENT_BUILDTREES_DIR}/src/head") + set(ref_to_use "${arg_HEAD_REF}") + else() + message(STATUS "Package does not specify HEAD_REF. Falling back to non-HEAD version.") + endif() + elseif(NOT DEFINED arg_REF) + message(FATAL_ERROR "Package does not specify REF. It must be built using --head.") + endif() + + # avoid using either - or _, to allow both `foo/bar` and `foo-bar` to coexist + # we assume that no one will name a ref "foo_-bar" + string(REPLACE "/" "_-" sanitized_ref "${ref_to_use}") + set(downloaded_file_name "${org_name}-${repo_name}-${sanitized_ref}.tar.gz") + + # exports VCPKG_HEAD_VERSION to the caller. This will get picked up by ports.cmake after the build. + if(VCPKG_USE_HEAD_VERSION) + vcpkg_download_distfile(archive_version + URLS "https://api.bitbucket.com/2.0/repositories/${org_name}/${repo_name}/refs/branches/${arg_HEAD_REF}" + FILENAME "${downloaded_file_name}.version" + SKIP_SHA512 + ALWAYS_REDOWNLOAD + ) + # Parse the github refs response with regex. + # TODO: add json-pointer support to vcpkg + file(READ "${archive_version}" version_contents) + if(NOT version_contents MATCHES [["hash": "([a-f0-9]+)"]]) + message(FATAL_ERROR "Failed to parse API response from '${version_url}': + +${version_contents} +") + endif() + set(VCPKG_HEAD_VERSION "${CMAKE_MATCH_1}" PARENT_SCOPE) + endif() + + # download the file information from bitbucket. + vcpkg_download_distfile(archive + URLS "https://bitbucket.com/${org_name}/${repo_name}/get/${ref_to_use}.tar.gz" + FILENAME "${downloaded_file_name}" + ${sha512_param} + ${redownload_param} + ) + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${archive}" + REF "${sanitized_ref}" + PATCHES ${arg_PATCHES} + ${working_directory_param} + ) + set("${arg_OUT_SOURCE_PATH}" "${SOURCE_PATH}" PARENT_SCOPE) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_from_git.cmake b/externals/vcpkg/scripts/cmake/vcpkg_from_git.cmake new file mode 100755 index 000000000..0d9d40fe5 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_from_git.cmake @@ -0,0 +1,147 @@ +function(vcpkg_from_git) + cmake_parse_arguments(PARSE_ARGV 0 "arg" + "" + "OUT_SOURCE_PATH;URL;REF;FETCH_REF;HEAD_REF;TAG" + "PATCHES" + ) + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "vcpkg_from_git was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + if(DEFINED arg_TAG) + message(WARNING "The TAG argument to vcpkg_from_git has been deprecated and has no effect.") + endif() + + + if(NOT DEFINED arg_OUT_SOURCE_PATH) + message(FATAL_ERROR "OUT_SOURCE_PATH must be specified") + endif() + if(NOT DEFINED arg_URL) + message(FATAL_ERROR "URL must be specified") + endif() + if(NOT DEFINED arg_REF AND NOT DEFINED arg_HEAD_REF) + message(FATAL_ERROR "At least one of REF or HEAD_REF must be specified") + endif() + if(DEFINED arg_FETCH_REF AND NOT DEFINED arg_REF) + message(FATAL_ERROR "REF must be specified if FETCH_REF is specified") + endif() + + vcpkg_list(SET git_fetch_shallow_param --depth 1) + vcpkg_list(SET extract_working_directory_param) + vcpkg_list(SET skip_patch_check_param) + set(git_working_directory "${DOWNLOADS}/git-tmp") + set(do_download OFF) + + if(VCPKG_USE_HEAD_VERSION AND DEFINED arg_HEAD_REF) + vcpkg_list(SET working_directory_param "WORKING_DIRECTORY" "${CURRENT_BUILDTREES_DIR}/src/head") + vcpkg_list(SET git_fetch_shallow_param --depth 1) + vcpkg_list(SET skip_patch_check_param SKIP_PATCH_CHECK) + set(ref_to_fetch "${arg_HEAD_REF}") + set(git_working_directory "${CURRENT_BUILDTREES_DIR}/src/git-tmp") + string(REPLACE "/" "_-" sanitized_ref "${arg_HEAD_REF}") + + if(NOT _VCPKG_NO_DOWNLOADS) + set(do_download ON) + endif() + else() + if(NOT DEFINED arg_REF) + message(FATAL_ERROR "Package does not specify REF. It must be built using --head.") + endif() + if(VCPKG_USE_HEAD_VERSION) + message(STATUS "Package does not specify HEAD_REF. Falling back to non-HEAD version.") + endif() + + if(DEFINED arg_FETCH_REF) + set(ref_to_fetch "${arg_FETCH_REF}") + vcpkg_list(SET git_fetch_shallow_param) + else() + set(ref_to_fetch "${arg_REF}") + endif() + string(REPLACE "/" "_-" sanitized_ref "${arg_REF}") + endif() + + set(temp_archive "${DOWNLOADS}/temp/${PORT}-${sanitized_ref}.tar.gz") + set(archive "${DOWNLOADS}/${PORT}-${sanitized_ref}.tar.gz") + + if(NOT EXISTS "${archive}") + if(_VCPKG_NO_DOWNLOADS) + message(FATAL_ERROR "Downloads are disabled, but '${archive}' does not exist.") + endif() + set(do_download ON) + endif() + + if(do_download) + message(STATUS "Fetching ${arg_URL} ${ref_to_fetch}...") + find_program(GIT NAMES git git.cmd) + file(MAKE_DIRECTORY "${DOWNLOADS}") + # Note: git init is safe to run multiple times + vcpkg_execute_required_process( + ALLOW_IN_DOWNLOAD_MODE + COMMAND "${GIT}" init "${git_working_directory}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "git-init-${TARGET_TRIPLET}" + ) + vcpkg_execute_required_process( + ALLOW_IN_DOWNLOAD_MODE + COMMAND "${GIT}" fetch "${arg_URL}" "${ref_to_fetch}" ${git_fetch_shallow_param} -n + WORKING_DIRECTORY "${git_working_directory}" + LOGNAME "git-fetch-${TARGET_TRIPLET}" + ) + + if(VCPKG_USE_HEAD_VERSION) + vcpkg_execute_in_download_mode( + COMMAND "${GIT}" rev-parse FETCH_HEAD + OUTPUT_VARIABLE rev_parse_ref + ERROR_VARIABLE rev_parse_ref + RESULT_VARIABLE error_code + WORKING_DIRECTORY "${git_working_directory}" + ) + if(error_code) + message(FATAL_ERROR "unable to determine FETCH_HEAD after fetching git repository") + endif() + string(STRIP "${rev_parse_ref}" rev_parse_ref) + set(VCPKG_HEAD_VERSION "${rev_parse_ref}" PARENT_SCOPE) + else() + vcpkg_execute_in_download_mode( + COMMAND "${GIT}" rev-parse "${arg_REF}" + OUTPUT_VARIABLE rev_parse_ref + ERROR_VARIABLE rev_parse_ref + RESULT_VARIABLE error_code + WORKING_DIRECTORY "${git_working_directory}" + ) + if(error_code) + message(FATAL_ERROR "unable to rev-parse ${arg_REF} after fetching git repository") + endif() + string(STRIP "${rev_parse_ref}" rev_parse_ref) + if(NOT "${rev_parse_ref}" STREQUAL "${arg_REF}") + message(FATAL_ERROR "REF (${arg_REF}) does not match rev-parse'd reference (${rev_parse_ref}) + [Expected : ( ${arg_REF} )]) + [ Actual : ( ${rev_parse_ref} )]" + ) + endif() + endif() + + file(MAKE_DIRECTORY "${DOWNLOADS}/temp") + vcpkg_execute_required_process( + ALLOW_IN_DOWNLOAD_MODE + COMMAND "${GIT}" -c core.autocrlf=false archive "${rev_parse_ref}" -o "${temp_archive}" + WORKING_DIRECTORY "${git_working_directory}" + LOGNAME git-archive + ) + file(RENAME "${temp_archive}" "${archive}") + else() + message(STATUS "Using cached ${archive}") + endif() + + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${archive}" + REF "${sanitized_ref}" + PATCHES ${arg_PATCHES} + NO_REMOVE_ONE_LEVEL + ${extract_working_directory_param} + ${skip_patch_check_param} + ) + + set("${arg_OUT_SOURCE_PATH}" "${SOURCE_PATH}" PARENT_SCOPE) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_from_github.cmake b/externals/vcpkg/scripts/cmake/vcpkg_from_github.cmake new file mode 100755 index 000000000..3b1af1a62 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_from_github.cmake @@ -0,0 +1,122 @@ +function(vcpkg_from_github) + cmake_parse_arguments(PARSE_ARGV 0 "arg" + "" + "OUT_SOURCE_PATH;REPO;REF;SHA512;HEAD_REF;GITHUB_HOST;AUTHORIZATION_TOKEN;FILE_DISAMBIGUATOR" + "PATCHES") + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "vcpkg_from_github was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + if(DEFINED arg_REF AND NOT DEFINED arg_SHA512) + message(FATAL_ERROR "SHA512 must be specified if REF is specified.") + endif() + if(NOT DEFINED arg_REF AND DEFINED arg_SHA512) + message(FATAL_ERROR "REF must be specified if SHA512 is specified.") + endif() + + if(NOT DEFINED arg_OUT_SOURCE_PATH) + message(FATAL_ERROR "OUT_SOURCE_PATH must be specified.") + endif() + if(NOT DEFINED arg_REPO) + message(FATAL_ERROR "The GitHub repository must be specified.") + endif() + + if(NOT DEFINED arg_GITHUB_HOST) + set(github_host "https://github.com") + set(github_api_url "https://api.github.com") + else() + set(github_host "${arg_GITHUB_HOST}") + set(github_api_url "${arg_GITHUB_HOST}/api/v3") + endif() + + set(headers_param "") + if(DEFINED arg_AUTHORIZATION_TOKEN) + set(headers_param "HEADERS" "Authorization: token ${arg_AUTHORIZATION_TOKEN}") + endif() + + + if(NOT DEFINED arg_REF AND NOT DEFINED arg_HEAD_REF) + message(FATAL_ERROR "At least one of REF or HEAD_REF must be specified.") + endif() + + if(NOT arg_REPO MATCHES "^([^/]*)/([^/]*)$") + message(FATAL_ERROR "REPO (${arg_REPO}) is not a valid repo name: + must be an organization name followed by a repository name separated by a single slash.") + endif() + set(org_name "${CMAKE_MATCH_1}") + set(repo_name "${CMAKE_MATCH_2}") + + if(VCPKG_USE_HEAD_VERSION AND NOT DEFINED arg_HEAD_REF) + message(STATUS "Package does not specify HEAD_REF. Falling back to non-HEAD version.") + set(VCPKG_USE_HEAD_VERSION OFF) + elseif(NOT VCPKG_USE_HEAD_VERSION AND NOT DEFINED arg_REF) + message(FATAL_ERROR "Package does not specify REF. It must be built using --head.") + endif() + + # exports VCPKG_HEAD_VERSION to the caller. This will get picked up by ports.cmake after the build. + if(VCPKG_USE_HEAD_VERSION) + string(REPLACE "/" "_-" sanitized_head_ref "${arg_HEAD_REF}") + vcpkg_download_distfile(archive_version + URLS "${github_api_url}/repos/${org_name}/${repo_name}/git/refs/heads/${arg_HEAD_REF}" + FILENAME "${org_name}-${repo_name}-${sanitized_head_ref}.version" + ${headers_param} + SKIP_SHA512 + ALWAYS_REDOWNLOAD + ) + # Parse the github refs response with regex. + file(READ "${archive_version}" version_contents) + string(JSON head_version + ERROR_VARIABLE head_version_err + GET "${version_contents}" + "object" + "sha" + ) + if(NOT "${head_version_err}" STREQUAL "NOTFOUND") + message(FATAL_ERROR "Failed to parse API response from '${version_url}': +${version_contents} + +Error was: ${head_version_err} +") + endif() + + set(VCPKG_HEAD_VERSION "${head_version}" PARENT_SCOPE) + set(ref_to_use "${head_version}") + + vcpkg_list(SET redownload_param ALWAYS_REDOWNLOAD) + vcpkg_list(SET sha512_param SKIP_SHA512) + vcpkg_list(SET working_directory_param WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/head") + vcpkg_list(SET skip_patch_check_param SKIP_PATCH_CHECK) + else() + set(ref_to_use "${arg_REF}") + + vcpkg_list(SET redownload_param) + vcpkg_list(SET working_directory_param) + vcpkg_list(SET skip_patch_check_param) + vcpkg_list(SET sha512_param SHA512 "${arg_SHA512}") + endif() + + string(REPLACE "/" "_-" sanitized_ref "${ref_to_use}") + if(DEFINED arg_FILE_DISAMBIGUATOR AND NOT VCPKG_USE_HEAD_REF) + set(downloaded_file_name "${org_name}-${repo_name}-${sanitized_ref}-${arg_FILE_DISAMBIGUATOR}.tar.gz") + else() + set(downloaded_file_name "${org_name}-${repo_name}-${sanitized_ref}.tar.gz") + endif() + # Try to download the file information from github + vcpkg_download_distfile(archive + URLS "${github_host}/${org_name}/${repo_name}/archive/${ref_to_use}.tar.gz" + FILENAME "${downloaded_file_name}" + ${headers_param} + ${sha512_param} + ${redownload_param} + ) + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${archive}" + REF "${sanitized_ref}" + PATCHES ${arg_PATCHES} + ${working_directory_param} + ${skip_patch_check_param} + ) + set("${arg_OUT_SOURCE_PATH}" "${SOURCE_PATH}" PARENT_SCOPE) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_from_gitlab.cmake b/externals/vcpkg/scripts/cmake/vcpkg_from_gitlab.cmake new file mode 100755 index 000000000..23f36fab7 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_from_gitlab.cmake @@ -0,0 +1,120 @@ +include(vcpkg_execute_in_download_mode) + +function(vcpkg_from_gitlab) + cmake_parse_arguments(PARSE_ARGV 0 "arg" + "" + "OUT_SOURCE_PATH;GITLAB_URL;REPO;REF;SHA512;HEAD_REF;FILE_DISAMBIGUATOR" + "PATCHES") + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "vcpkg_from_gitlab was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + if(NOT DEFINED arg_GITLAB_URL) + message(FATAL_ERROR "GITLAB_URL must be specified.") + endif() + + if(DEFINED arg_REF AND NOT DEFINED arg_SHA512) + message(FATAL_ERROR "SHA512 must be specified if REF is specified.") + endif() + if(NOT DEFINED arg_REF AND DEFINED arg_SHA512) + message(FATAL_ERROR "REF must be specified if SHA512 is specified.") + endif() + + if(NOT DEFINED arg_OUT_SOURCE_PATH) + message(FATAL_ERROR "OUT_SOURCE_PATH must be specified.") + endif() + if(NOT DEFINED arg_REPO) + message(FATAL_ERROR "The GitHub repository must be specified.") + endif() + + set(headers_param "") + if(DEFINED arg_AUTHORIZATION_TOKEN) + set(headers_param "HEADERS" "Authorization: token ${arg_AUTHORIZATION_TOKEN}") + endif() + + if(NOT DEFINED arg_REF AND NOT DEFINED arg_HEAD_REF) + message(FATAL_ERROR "At least one of REF or HEAD_REF must be specified.") + endif() + + if(arg_REPO MATCHES [[^([^/]*)/([^/]*)$]]) # 2 elements + set(org_name "${CMAKE_MATCH_1}") + set(repo_name "${CMAKE_MATCH_2}") + set(gitlab_link "${arg_GITLAB_URL}/${org_name}/${repo_name}") + elseif(arg_REPO MATCHES [[^([^/]*)/([^/]*)/([^/]*)$]]) # 3 elements + set(org_name "${CMAKE_MATCH_1}") + set(group_name "${CMAKE_MATCH_2}") + set(repo_name "${CMAKE_MATCH_3}") + set(gitlab_link "${arg_GITLAB_URL}/${org_name}/${group_name}/${repo_name}") + else() + message(FATAL_ERROR "REPO (${arg_REPO}) is not a valid repo name. It must be: + - an organization name followed by a repository name separated by a single slash, or + - an organization name, group name, and repository name separated by slashes.") + endif() + + set(redownload_param "") + set(working_directory_param "") + set(sha512_param "SHA512" "${arg_SHA512}") + set(ref_to_use "${arg_REF}") + if(VCPKG_USE_HEAD_VERSION) + if(DEFINED arg_HEAD_REF) + set(redownload_param "ALWAYS_REDOWNLOAD") + set(sha512_param "SKIP_SHA512") + set(working_directory_param "WORKING_DIRECTORY" "${CURRENT_BUILDTREES_DIR}/src/head") + set(ref_to_use "${arg_HEAD_REF}") + else() + message(STATUS "Package does not specify HEAD_REF. Falling back to non-HEAD version.") + endif() + elseif(NOT DEFINED arg_REF) + message(FATAL_ERROR "Package does not specify REF. It must be built using --head.") + endif() + + # avoid using either - or _, to allow both `foo/bar` and `foo-bar` to coexist + # we assume that no one will name a ref "foo_-bar" + string(REPLACE "/" "_-" sanitized_ref "${ref_to_use}") + if(DEFINED arg_FILE_DISAMBIGUATOR AND NOT VCPKG_USE_HEAD_VERSION) + set(downloaded_file_name "${org_name}-${repo_name}-${sanitized_ref}-${arg_FILE_DISAMBIGUATOR}.tar.gz") + else() + set(downloaded_file_name "${org_name}-${repo_name}-${sanitized_ref}.tar.gz") + endif() + + + # exports VCPKG_HEAD_VERSION to the caller. This will get picked up by ports.cmake after the build. + if(VCPKG_USE_HEAD_VERSION) + # There are issues with the Gitlab API project paths being URL-escaped, so we use git here to get the head revision + vcpkg_execute_in_download_mode(COMMAND ${GIT} ls-remote + "${gitlab_link}.git" "${arg_HEAD_REF}" + RESULT_VARIABLE git_result + OUTPUT_VARIABLE git_output + ) + if(NOT git_result EQUAL 0) + message(FATAL_ERROR "git ls-remote failed to read ref data of repository: '${gitlab_link}'") + endif() + if(NOT git_output MATCHES "^([a-f0-9]*)\t") + message(FATAL_ERROR "git ls-remote returned unexpected result: +${git_output} +") + endif() + # When multiple vcpkg_from_gitlab's are used after each other, only use the version from the first (hopefully the primary one). + if(NOT DEFINED VCPKG_HEAD_VERSION) + set(VCPKG_HEAD_VERSION "${CMAKE_MATCH_1}" PARENT_SCOPE) + endif() + endif() + + # download the file information from gitlab + vcpkg_download_distfile(archive + URLS "${gitlab_link}/-/archive/${ref_to_use}/${repo_name}-${ref_to_use}.tar.gz" + FILENAME "${downloaded_file_name}" + ${headers_param} + ${sha512_param} + ${redownload_param} + ) + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${archive}" + REF "${sanitized_ref}" + PATCHES ${arg_PATCHES} + ${working_directory_param} + ) + set("${arg_OUT_SOURCE_PATH}" "${SOURCE_PATH}" PARENT_SCOPE) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_from_sourceforge.cmake b/externals/vcpkg/scripts/cmake/vcpkg_from_sourceforge.cmake new file mode 100755 index 000000000..b2209ab35 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_from_sourceforge.cmake @@ -0,0 +1,107 @@ +function(vcpkg_from_sourceforge) + cmake_parse_arguments(PARSE_ARGV 0 "arg" + "DISABLE_SSL;NO_REMOVE_ONE_LEVEL" + "OUT_SOURCE_PATH;REPO;REF;SHA512;FILENAME;WORKING_DIRECTORY" + "PATCHES") + + if(NOT DEFINED arg_OUT_SOURCE_PATH) + message(FATAL_ERROR "OUT_SOURCE_PATH must be specified.") + endif() + if(NOT DEFINED arg_SHA512) + message(FATAL_ERROR "SHA512 must be specified.") + endif() + if(NOT DEFINED arg_REPO) + message(FATAL_ERROR "The sourceforge repository must be specified.") + endif() + + + if(arg_DISABLE_SSL) + message(WARNING "DISABLE_SSL has been deprecated and has no effect") + endif() + + set(sourceforge_host "https://sourceforge.net/projects") + + if(arg_REPO MATCHES "^([^/]*)$") # just one element + set(org_name "${CMAKE_MATCH_1}") + set(repo_name "") + elseif(arg_REPO MATCHES "^([^/]*)/([^/]*)$") # two elements + set(org_name "${CMAKE_MATCH_1}") + set(repo_name "${CMAKE_MATCH_2}") + else() + message(FATAL_ERROR "REPO (${arg_REPO}) is not a valid repo name. It must be: + - an organization name without any slashes, or + - an organization name followed by a repository name separated by a single slash") + endif() + + if(DEFINED arg_REF) + set(url "${sourceforge_host}/${org_name}/files/${repo_name}/${arg_REF}/${arg_FILENAME}") + elseif(DEFINED repo_name) + set(url "${sourceforge_host}/${org_name}/${repo_name}/files/${arg_FILENAME}") + else() + set(url "${sourceforge_host}/${org_name}/files/${arg_FILENAME}") + endif() + + string(SUBSTRING "${arg_SHA512}" 0 10 sanitized_ref) + + set(sourceforge_mirrors + cfhcable # United States + pilotfiber # New York, NY + gigenet # Chicago, IL + versaweb # Las Vegas, NV + ayera # Modesto, CA + netactuate # Durham, NC + phoenixnap # Tempe, AZ + astuteinternet # Vancouver, BC + freefr # Paris, France + netcologne # Cologne, Germany + deac-riga # Latvia + excellmedia # Hyderabad, India + iweb # Montreal, QC + jaist # Nomi, Japan + jztkft # Mezotur, Hungary + managedway # Detroit, MI + nchc # Taipei, Taiwan + netix # Bulgaria + ufpr # Curitiba, Brazil + tenet # Wynberg, South Africa + ) + if(DEFINED SOURCEFORGE_MIRRORS AND NOT DEFINED VCPKG_SOURCEFORGE_EXTRA_MIRRORS) + message(WARNING "Extension point SOURCEFORGE_MIRRORS has been deprecated. + Please use the replacement VCPKG_SOURCEFORGE_EXTRA_MIRRORS variable instead.") + list(APPEND sourceforge_mirrors "${SOURCEFORGE_MIRRORS}") + list(REMOVE_DUPLICATES sourceforge_mirrors) + elseif(DEFINED VCPKG_SOURCEFORGE_EXTRA_MIRRORS) + list(APPEND sourceforge_mirrors "${VCPKG_SOURCEFORGE_EXTRA_MIRRORS}") + list(REMOVE_DUPLICATES sourceforge_mirrors) + endif() + + set(all_urls "${url}/download") + foreach(mirror IN LISTS sourceforge_mirrors) + list(APPEND all_urls "${url}/download?use_mirror=${mirror}") + endforeach() + + vcpkg_download_distfile(ARCHIVE + URLS ${all_urls} + SHA512 "${arg_SHA512}" + FILENAME "${arg_FILENAME}" + ) + + set(no_remove_one_level_param "") + set(working_directory_param "") + if(arg_NO_REMOVE_ONE_LEVEL) + set(no_remove_one_level_param "NO_REMOVE_ONE_LEVEL") + endif() + if(DEFINED arg_WORKING_DIRECTORY) + set(working_directory_param "WORKING_DIRECTORY" "${arg_WORKING_DIRECTORY}") + endif() + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF "${sanitized_ref}" + ${no_remove_one_level_param} + ${working_directory_param} + PATCHES ${arg_PATCHES} + ) + + set("${arg_OUT_SOURCE_PATH}" "${SOURCE_PATH}" PARENT_SCOPE) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_get_program_files_platform_bitness.cmake b/externals/vcpkg/scripts/cmake/vcpkg_get_program_files_platform_bitness.cmake new file mode 100755 index 000000000..b24b4d071 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_get_program_files_platform_bitness.cmake @@ -0,0 +1,7 @@ +function(vcpkg_get_program_files_platform_bitness out_var) + if(DEFINED ENV{ProgramW6432}) + set("${out_var}" "$ENV{ProgramW6432}" PARENT_SCOPE) + else() + set("${out_var}" "$ENV{PROGRAMFILES}" PARENT_SCOPE) + endif() +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_get_windows_sdk.cmake b/externals/vcpkg/scripts/cmake/vcpkg_get_windows_sdk.cmake new file mode 100755 index 000000000..bb26b44b7 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_get_windows_sdk.cmake @@ -0,0 +1,7 @@ +function(vcpkg_get_windows_sdk out_var) + if("$ENV{WindowsSDKVersion}" MATCHES [[^([0-9.]*)\\?$]]) + set("${out_var}" "${CMAKE_MATCH_1}" PARENT_SCOPE) + else() + message(FATAL_ERROR "Unexpected format for ENV{WindowsSDKVersion} ($ENV{WindowsSDKVersion})") + endif() +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_host_path_list.cmake b/externals/vcpkg/scripts/cmake/vcpkg_host_path_list.cmake new file mode 100755 index 000000000..81365f62c --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_host_path_list.cmake @@ -0,0 +1,68 @@ +function(z_vcpkg_translate_to_host_path_list out_var lst) + if(NOT DEFINED arg_UNPARSED_ARGUMENTS) + set("${out_var}" "" PARENT_SCOPE) + else() + if("${VCPKG_HOST_PATH_SEPARATOR}" STREQUAL ";") + set("${out_var}" "${lst}" PARENT_SCOPE) + + string(FIND "${lst}" [[\;]] index_of_host_path_separator) + else() + vcpkg_list(JOIN lst "${VCPKG_HOST_PATH_SEPARATOR}" arguments) + set("${out_var}" "${arguments}" PARENT_SCOPE) + + string(FIND "${lst}" "${VCPKG_HOST_PATH_SEPARATOR}" index_of_host_path_separator) + endif() + if(NOT "${index_of_host_path_separator}" EQUAL "-1") + message(FATAL_ERROR "Host path separator (${VCPKG_HOST_PATH_SEPARATOR}) in path; this is unsupported.") + endif() + endif() +endfunction() + +function(vcpkg_host_path_list) + if("${ARGC}" LESS "2") + message(FATAL_ERROR "vcpkg_host_path_list requires at least two arguments.") + endif() + + if("${ARGV1}" MATCHES "^ARGV([0-9]*)$|^ARG[CN]$|^CMAKE_CURRENT_FUNCTION|^CMAKE_MATCH_") + message(FATAL_ERROR "vcpkg_host_path_list does not support the list_var being ${ARGV1}. + Please use a different variable name.") + endif() + + if("${ARGV1}" MATCHES [[^ENV\{(.*)\}$]]) + set(list "$ENV{${CMAKE_MATCH_1}}") + set(env_var ON) + elseif("${ARGV1}" MATCHES [[^([A-Z]+)\{.*\}$]]) + message(FATAL_ERROR "vcpkg_host_path_list does not support ${CMAKE_MATCH_1} variables; + only ENV{} and regular variables are supported.") + else() + set(list "${${ARGV1}}") + set(env_var OFF) + endif() + set(operation "${ARGV0}") + set(list_var "${ARGV1}") + + cmake_parse_arguments(PARSE_ARGV 2 arg "" "" "") + z_vcpkg_translate_to_host_path_list(arguments "${arg_UNPARSED_ARGUMENTS}") + + if("${operation}" STREQUAL "SET") + set(list "${arguments}") + elseif("${operation}" MATCHES "^(APPEND|PREPEND)$") + if("${arguments}" STREQUAL "") + # do nothing + elseif("${list}" STREQUAL "") + set(list "${arguments}") + elseif("${operation}" STREQUAL "PREPEND") + set(list "${arguments}${VCPKG_HOST_PATH_SEPARATOR}${list}") + else() + set(list "${list}${VCPKG_HOST_PATH_SEPARATOR}${arguments}") + endif() + else() + message(FATAL_ERROR "Operation ${operation} not recognized.") + endif() + + if(env_var) + set("${list_var}" "${list}") + else() + set("${list_var}" "${list}" PARENT_SCOPE) + endif() +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_install_cmake.cmake b/externals/vcpkg/scripts/cmake/vcpkg_install_cmake.cmake new file mode 100755 index 000000000..df7d7bf61 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_install_cmake.cmake @@ -0,0 +1,23 @@ +function(vcpkg_install_cmake) + if(Z_VCPKG_CMAKE_INSTALL_GUARD) + message(FATAL_ERROR "The ${PORT} port already depends on vcpkg-cmake; using both vcpkg-cmake and vcpkg_install_cmake in the same port is unsupported.") + endif() + + cmake_parse_arguments(PARSE_ARGV 0 "arg" "DISABLE_PARALLEL;ADD_BIN_TO_PATH" "" "") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "vcpkg_cmake_install was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + vcpkg_list(SET params) + foreach(arg IN ITEMS DISABLE_PARALLEL ADD_BIN_TO_PATH) + if(arg_${arg}) + vcpkg_list(APPEND params "${arg}") + endif() + endforeach() + + vcpkg_build_cmake(Z_VCPKG_DISABLE_DEPRECATION MESSAGE + ${params} + LOGFILE_ROOT install + TARGET install + ) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_install_gn.cmake b/externals/vcpkg/scripts/cmake/vcpkg_install_gn.cmake new file mode 100755 index 000000000..6f250ec04 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_install_gn.cmake @@ -0,0 +1,116 @@ +function(z_vcpkg_install_gn_get_target_type out_var) + cmake_parse_arguments(PARSE_ARGV 1 "arg" "" "SOURCE_PATH;BUILD_DIR;TARGET" "") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "Internal error: get_target_type was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + execute_process( + COMMAND "${GN}" desc "${arg_BUILD_DIR}" "${arg_TARGET}" + WORKING_DIRECTORY "${arg_SOURCE_PATH}" + OUTPUT_VARIABLE output + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + if(output MATCHES [[type: ([A-Za-z0-9_]+)]]) + set("${out_var}" "${CMAKE_MATCH_1}" PARENT_SCOPE) + else() + message(FATAL_ERROR "invalid result from `gn desc`: ${output}") + endif() +endfunction() + +function(z_vcpkg_install_gn_get_desc out_var) + cmake_parse_arguments(PARSE_ARGV 1 "arg" "" "SOURCE_PATH;BUILD_DIR;TARGET;WHAT_TO_DISPLAY" "") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "Internal error: get_desc was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + execute_process( + COMMAND "${GN}" desc "${arg_BUILD_DIR}" "${arg_TARGET}" "${arg_WHAT_TO_DISPLAY}" + WORKING_DIRECTORY "${arg_SOURCE_PATH}" + OUTPUT_VARIABLE output + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + string(REPLACE ";" "\\;" output "${output}") + string(REGEX REPLACE "\n|(\r\n)" ";" output "${output}") + set("${out_var}" "${output}" PARENT_SCOPE) +endfunction() + +function(z_vcpkg_install_gn_install) + cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "SOURCE_PATH;BUILD_DIR;INSTALL_DIR" "TARGETS") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "Internal error: install was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + foreach(target IN LISTS arg_TARGETS) + # GN targets must start with a // + z_vcpkg_install_gn_get_desc(outputs + SOURCE_PATH "${arg_SOURCE_PATH}" + BUILD_DIR "${arg_BUILD_DIR}" + TARGET "//${target}" + WHAT_TO_DISPLAY outputs + ) + z_vcpkg_install_gn_get_target_type(target_type + SOURCE_PATH "${arg_SOURCE_PATH}" + BUILD_DIR "${arg_BUILD_DIR}" + TARGET "//${target}" + ) + + foreach(output IN LISTS outputs) + if(output MATCHES "^//") + # relative path (e.g. //out/Release/target.lib) + string(REGEX REPLACE "^//" "${arg_SOURCE_PATH}/" output "${output}") + elseif(output MATCHES "^/" AND CMAKE_HOST_WIN32) + # absolute path (e.g. /C:/path/to/target.lib) + string(REGEX REPLACE "^/" "" output "${output}") + endif() + + if(NOT EXISTS "${output}") + message(WARNING "Output for target `${target}` doesn't exist: ${output}.") + continue() + endif() + + if(target_type STREQUAL "executable") + file(INSTALL "${output}" DESTINATION "${arg_INSTALL_DIR}/tools") + elseif(output MATCHES "(\\.dll|\\.pdb)$") + file(INSTALL "${output}" DESTINATION "${arg_INSTALL_DIR}/bin") + else() + file(INSTALL "${output}" DESTINATION "${arg_INSTALL_DIR}/lib") + endif() + endforeach() + endforeach() +endfunction() + +function(vcpkg_install_gn) + if(Z_VCPKG_GN_INSTALL_GUARD) + message(FATAL_ERROR "The ${PORT} port already depends on vcpkg-gn; using both vcpkg-gn and vcpkg_install_gn in the same port is unsupported.") + endif() + + cmake_parse_arguments(PARSE_ARGV 0 arg "" "SOURCE_PATH" "TARGETS") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "vcpkg_install_gn was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + if(NOT DEFINED arg_SOURCE_PATH) + message(FATAL_ERROR "SOURCE_PATH must be specified.") + endif() + + vcpkg_build_ninja(TARGETS ${arg_TARGETS}) + + vcpkg_find_acquire_program(GN) + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + z_vcpkg_install_gn_install( + SOURCE_PATH "${arg_SOURCE_PATH}" + BUILD_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + INSTALL_DIR "${CURRENT_PACKAGES_DIR}/debug" + TARGETS ${arg_TARGETS} + ) + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + z_vcpkg_install_gn_install( + SOURCE_PATH "${arg_SOURCE_PATH}" + BUILD_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + INSTALL_DIR "${CURRENT_PACKAGES_DIR}" + TARGETS ${arg_TARGETS} + ) + endif() +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_install_make.cmake b/externals/vcpkg/scripts/cmake/vcpkg_install_make.cmake new file mode 100755 index 000000000..281b6237a --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_install_make.cmake @@ -0,0 +1,7 @@ +function(vcpkg_install_make) + vcpkg_build_make( + ${ARGN} + LOGFILE_ROOT + ENABLE_INSTALL + ) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_install_meson.cmake b/externals/vcpkg/scripts/cmake/vcpkg_install_meson.cmake new file mode 100755 index 000000000..5971aefd9 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_install_meson.cmake @@ -0,0 +1,71 @@ +function(vcpkg_install_meson) + cmake_parse_arguments(PARSE_ARGV 0 arg "ADD_BIN_TO_PATH" "" "") + + vcpkg_find_acquire_program(NINJA) + unset(ENV{DESTDIR}) # installation directory was already specified with '--prefix' option + + if(VCPKG_TARGET_IS_OSX) + vcpkg_backup_env_variables(VARS SDKROOT MACOSX_DEPLOYMENT_TARGET) + set(ENV{SDKROOT} "${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}") + set(ENV{MACOSX_DEPLOYMENT_TARGET} "${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET}") + endif() + + foreach(buildtype IN ITEMS "debug" "release") + if(DEFINED VCPKG_BUILD_TYPE AND NOT VCPKG_BUILD_TYPE STREQUAL buildtype) + continue() + endif() + + if(buildtype STREQUAL "debug") + set(short_buildtype "dbg") + else() + set(short_buildtype "rel") + endif() + + message(STATUS "Package ${TARGET_TRIPLET}-${short_buildtype}") + if(arg_ADD_BIN_TO_PATH) + vcpkg_backup_env_variables(VARS PATH) + if(buildtype STREQUAL "debug") + vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin") + else() + vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin") + endif() + endif() + vcpkg_execute_required_process( + COMMAND "${NINJA}" install -v + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_buildtype}" + LOGNAME package-${TARGET_TRIPLET}-${short_buildtype} + ) + if(arg_ADD_BIN_TO_PATH) + vcpkg_restore_env_variables(VARS PATH) + endif() + endforeach() + + vcpkg_list(SET renamed_libs) + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static AND NOT VCPKG_TARGET_IS_MINGW) + # Meson names all static libraries lib.a which basically breaks the world + file(GLOB_RECURSE gen_libraries "${CURRENT_PACKAGES_DIR}*/**/lib*.a") + foreach(gen_library IN LISTS gen_libraries) + get_filename_component(libdir "${gen_library}" DIRECTORY) + get_filename_component(libname "${gen_library}" NAME) + string(REGEX REPLACE ".a$" ".lib" fixed_librawname "${libname}") + string(REGEX REPLACE "^lib" "" fixed_librawname "${fixed_librawname}") + file(RENAME "${gen_library}" "${libdir}/${fixed_librawname}") + # For cmake fixes. + string(REGEX REPLACE ".a$" "" origin_librawname "${libname}") + string(REGEX REPLACE ".lib$" "" fixed_librawname "${fixed_librawname}") + vcpkg_list(APPEND renamed_libs ${fixed_librawname}) + set(${librawname}_old ${origin_librawname}) + set(${librawname}_new ${fixed_librawname}) + endforeach() + file(GLOB_RECURSE cmake_files "${CURRENT_PACKAGES_DIR}*/*.cmake") + foreach(cmake_file IN LISTS cmake_files) + foreach(current_lib IN LISTS renamed_libs) + vcpkg_replace_string("${cmake_file}" "${${current_lib}_old}" "${${current_lib}_new}") + endforeach() + endforeach() + endif() + + if(VCPKG_TARGET_IS_OSX) + vcpkg_restore_env_variables(VARS SDKROOT MACOSX_DEPLOYMENT_TARGET) + endif() +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_install_msbuild.cmake b/externals/vcpkg/scripts/cmake/vcpkg_install_msbuild.cmake new file mode 100755 index 000000000..eb93d2e25 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_install_msbuild.cmake @@ -0,0 +1,155 @@ +function(vcpkg_install_msbuild) + cmake_parse_arguments( + PARSE_ARGV 0 + "arg" + "USE_VCPKG_INTEGRATION;ALLOW_ROOT_INCLUDES;REMOVE_ROOT_INCLUDES;SKIP_CLEAN" + "SOURCE_PATH;PROJECT_SUBPATH;INCLUDES_SUBPATH;LICENSE_SUBPATH;RELEASE_CONFIGURATION;DEBUG_CONFIGURATION;PLATFORM;PLATFORM_TOOLSET;TARGET_PLATFORM_VERSION;TARGET" + "OPTIONS;OPTIONS_RELEASE;OPTIONS_DEBUG" + ) + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "vcpkg_install_msbuild was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + if(NOT DEFINED arg_RELEASE_CONFIGURATION) + set(arg_RELEASE_CONFIGURATION Release) + endif() + if(NOT DEFINED arg_DEBUG_CONFIGURATION) + set(arg_DEBUG_CONFIGURATION Debug) + endif() + if(NOT DEFINED arg_PLATFORM) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(arg_PLATFORM x64) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(arg_PLATFORM Win32) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(arg_PLATFORM ARM) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(arg_PLATFORM arm64) + else() + message(FATAL_ERROR "Unsupported target architecture") + endif() + endif() + if(NOT DEFINED arg_PLATFORM_TOOLSET) + set(arg_PLATFORM_TOOLSET "${VCPKG_PLATFORM_TOOLSET}") + endif() + if(NOT DEFINED arg_TARGET_PLATFORM_VERSION) + vcpkg_get_windows_sdk(arg_TARGET_PLATFORM_VERSION) + endif() + if(NOT DEFINED arg_TARGET) + set(arg_TARGET Rebuild) + endif() + + list(APPEND arg_OPTIONS + "/t:${arg_TARGET}" + "/p:Platform=${arg_PLATFORM}" + "/p:PlatformToolset=${arg_PLATFORM_TOOLSET}" + "/p:VCPkgLocalAppDataDisabled=true" + "/p:UseIntelMKL=No" + "/p:WindowsTargetPlatformVersion=${arg_TARGET_PLATFORM_VERSION}" + "/p:VcpkgTriplet=${TARGET_TRIPLET}" + "/p:VcpkgInstalledDir=${_VCPKG_INSTALLED_DIR}" + "/p:VcpkgManifestInstall=false" + "/p:UseMultiToolTask=true" + "/p:MultiProcMaxCount=${VCPKG_CONCURRENCY}" + "/p:EnforceProcessCountAcrossBuilds=true" + "/m:${VCPKG_CONCURRENCY}" + ) + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # Disable LTCG for static libraries because this setting introduces ABI incompatibility between minor compiler versions + # TODO: Add a way for the user to override this if they want to opt-in to incompatibility + list(APPEND arg_OPTIONS "/p:WholeProgramOptimization=false") + endif() + + if(arg_USE_VCPKG_INTEGRATION) + list(APPEND arg_OPTIONS + "/p:ForceImportBeforeCppTargets=${SCRIPTS}/buildsystems/msbuild/vcpkg.targets" + "/p:VcpkgApplocalDeps=false" + ) + endif() + + get_filename_component(source_path_suffix "${arg_SOURCE_PATH}" NAME) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + message(STATUS "Building ${arg_PROJECT_SUBPATH} for Release") + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + file(COPY "${arg_SOURCE_PATH}" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + set(source_copy_path "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${source_path_suffix}") + vcpkg_execute_required_process( + COMMAND msbuild "${source_copy_path}/${arg_PROJECT_SUBPATH}" + "/p:Configuration=${arg_RELEASE_CONFIGURATION}" + ${arg_OPTIONS} + ${arg_OPTIONS_RELEASE} + WORKING_DIRECTORY "${source_copy_path}" + LOGNAME "build-${TARGET_TRIPLET}-rel" + ) + file(GLOB_RECURSE libs "${source_copy_path}/*.lib") + file(GLOB_RECURSE dlls "${source_copy_path}/*.dll") + file(GLOB_RECURSE exes "${source_copy_path}/*.exe") + if(NOT libs STREQUAL "") + file(COPY ${libs} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + endif() + if(NOT dlls STREQUAL "") + file(COPY ${dlls} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + endif() + if(NOT exes STREQUAL "") + file(COPY ${exes} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") + endif() + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + message(STATUS "Building ${arg_PROJECT_SUBPATH} for Debug") + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + file(COPY "${arg_SOURCE_PATH}" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + set(source_copy_path "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${source_path_suffix}") + vcpkg_execute_required_process( + COMMAND msbuild "${source_copy_path}/${arg_PROJECT_SUBPATH}" + "/p:Configuration=${arg_DEBUG_CONFIGURATION}" + ${arg_OPTIONS} + ${arg_OPTIONS_DEBUG} + WORKING_DIRECTORY "${source_copy_path}" + LOGNAME "build-${TARGET_TRIPLET}-dbg" + ) + file(GLOB_RECURSE libs "${source_copy_path}/*.lib") + file(GLOB_RECURSE dlls "${source_copy_path}/*.dll") + if(NOT libs STREQUAL "") + file(COPY ${libs} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + endif() + if(NOT dlls STREQUAL "") + file(COPY ${dlls} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() + endif() + + vcpkg_copy_pdbs() + + if(NOT arg_SKIP_CLEAN) + vcpkg_clean_msbuild() + endif() + + if(DEFINED arg_INCLUDES_SUBPATH) + file(COPY "${arg_SOURCE_PATH}/${arg_INCLUDES_SUBPATH}/" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/" + ) + file(GLOB root_includes + LIST_DIRECTORIES false + "${CURRENT_PACKAGES_DIR}/include/*") + if(NOT root_includes STREQUAL "") + if(arg_REMOVE_ROOT_INCLUDES) + file(REMOVE ${root_includes}) + elseif(arg_ALLOW_ROOT_INCLUDES) + else() + message(FATAL_ERROR "Top-level files were found in ${CURRENT_PACKAGES_DIR}/include; this may indicate a problem with the call to `vcpkg_install_msbuild()`.\nTo avoid conflicts with other libraries, it is recommended to not put includes into the root `include/` directory.\nPass either ALLOW_ROOT_INCLUDES or REMOVE_ROOT_INCLUDES to handle these files.\n") + endif() + endif() + endif() + + if(DEFINED arg_LICENSE_SUBPATH) + file(INSTALL "${arg_SOURCE_PATH}/${arg_LICENSE_SUBPATH}" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright + ) + endif() +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_install_nmake.cmake b/externals/vcpkg/scripts/cmake/vcpkg_install_nmake.cmake new file mode 100755 index 000000000..fc8afa8d4 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_install_nmake.cmake @@ -0,0 +1,54 @@ +function(vcpkg_install_nmake) + vcpkg_list(SET multi_value_args + TARGET + OPTIONS OPTIONS_DEBUG OPTIONS_RELEASE + PRERUN_SHELL PRERUN_SHELL_DEBUG PRERUN_SHELL_RELEASE) + + cmake_parse_arguments(PARSE_ARGV 0 arg + "NO_DEBUG" + "SOURCE_PATH;PROJECT_SUBPATH;PROJECT_NAME" + "${multi_value_args}" + ) + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + if(NOT DEFINED arg_SOURCE_PATH) + message(FATAL_ERROR "SOURCE_PATH must be specified") + endif() + + if(NOT VCPKG_HOST_IS_WINDOWS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} only support windows.") + endif() + + # backwards-compatibility hack + # gdal passes `arg_OPTIONS_DEBUG` (and RELEASE) as a single argument, + # so we need to split them again + set(arg_OPTIONS_DEBUG ${arg_OPTIONS_DEBUG}) + set(arg_OPTIONS_RELEASE ${arg_OPTIONS_RELEASE}) + + vcpkg_list(SET extra_args) + # switch args + if(arg_NO_DEBUG) + vcpkg_list(APPEND extra_args NO_DEBUG) + endif() + + # single args + foreach(arg IN ITEMS PROJECT_SUBPATH PROJECT_NAME) + if(DEFINED "arg_${arg}") + vcpkg_list(APPEND extra_args ${arg} "${arg_${arg}}") + endif() + endforeach() + + # multi-value args + foreach(arg IN LISTS multi_value_args) + if(DEFINED "arg_${arg}") + vcpkg_list(APPEND extra_args ${arg} ${arg_${arg}}) + endif() + endforeach() + + vcpkg_build_nmake( + SOURCE_PATH "${arg_SOURCE_PATH}" + ENABLE_INSTALL + LOGFILE_ROOT install + ${extra_args}) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_install_qmake.cmake b/externals/vcpkg/scripts/cmake/vcpkg_install_qmake.cmake new file mode 100755 index 000000000..c66548627 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_install_qmake.cmake @@ -0,0 +1,45 @@ +function(vcpkg_install_qmake) + z_vcpkg_function_arguments(args) + + vcpkg_build_qmake(${args}) + + file(GLOB_RECURSE release_libs + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.lib" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.a" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.so" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.so.*" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.dylib" + ) + file(GLOB_RECURSE release_bins + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.dll" + ) + file(GLOB_RECURSE debug_libs + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.lib" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.a" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.so" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.so.*" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.dylib" + ) + file(GLOB_RECURSE debug_bins + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.dll" + ) + if("${release_libs}" STREQUAL "" AND "${debug_libs}" STREQUAL "") + message(FATAL_ERROR "Build did not appear to produce any libraries. If this is intended, use `vcpkg_build_qmake()` directly.") + endif() + if(NOT "${release_libs}" STREQUAL "") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib") + file(COPY ${release_libs} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + endif() + if(NOT "${debug_libs}" STREQUAL "") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") + file(COPY ${debug_libs} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + endif() + if(NOT "${release_bins}" STREQUAL "") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(COPY ${release_bins} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + endif() + if(NOT "${debug_bins}" STREQUAL "") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY ${debug_bins} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_list.cmake b/externals/vcpkg/scripts/cmake/vcpkg_list.cmake new file mode 100755 index 000000000..d7fa0fe5b --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_list.cmake @@ -0,0 +1,165 @@ +macro(z_vcpkg_list_escape_once_more lst) + string(REPLACE [[\;]] [[\\;]] "${lst}" "${${lst}}") +endmacro() + +function(vcpkg_list) + # NOTE: as this function replaces an existing CMake command, + # it does not use cmake_parse_arguments + + # vcpkg_list( ...) + # A0 A1 + + if(ARGC LESS "2") + message(FATAL_ERROR "vcpkg_list requires at least two arguments.") + endif() + + if(ARGV1 MATCHES "^ARGV([0-9]*)$|^ARG[CN]$|^CMAKE_CURRENT_FUNCTION") + message(FATAL_ERROR "vcpkg_list does not support the list_var being ${ARGV1}. + Please use a different variable name.") + endif() + + set(list "${${ARGV1}}") + set(operation "${ARGV0}") + set(list_var "${ARGV1}") + + if(operation STREQUAL "SET") + z_vcpkg_function_arguments(args 2) + set("${list_var}" "${args}" PARENT_SCOPE) + return() + endif() + + # Normal reading functions + if(operation STREQUAL "LENGTH") + # vcpkg_list(LENGTH ) + # A0 A1 A2 + if(NOT ARGC EQUAL "3") + message(FATAL_ERROR "vcpkg_list sub-command ${operation} requires two arguments.") + endif() + list(LENGTH list out) + set("${ARGV2}" "${out}" PARENT_SCOPE) + return() + endif() + if(operation MATCHES "^(GET|JOIN|FIND)$") + # vcpkg_list( ) + # A0 A1 A2 A3 + if(NOT ARGC EQUAL "4") + message(FATAL_ERROR "vcpkg_list sub-command ${operation} requires three arguments.") + endif() + if(operation STREQUAL "GET") + list(LENGTH list length) + if(length EQUAL "0") + message(FATAL_ERROR "vcpkg_list GET given empty list") + elseif(ARGV2 GREATER_EQUAL length OR ARGV2 LESS "-${length}") + message(FATAL_ERROR "vcpkg_list index: ${ARGV2} is not in range") + endif() + endif() + list("${operation}" list "${ARGV2}" out) + set("${ARGV3}" "${out}" PARENT_SCOPE) + return() + endif() + if(operation STREQUAL "SUBLIST") + # vcpkg_list(SUBLIST ) + # A0 A1 A2 A3 A4 + if(NOT ARGC EQUAL "5") + message(FATAL_ERROR "vcpkg_list sub-command SUBLIST requires four arguments.") + endif() + list(LENGTH list length) + if(ARGV2 LESS "0" OR (ARGV2 GREATER_EQUAL length AND NOT ARGV2 EQUAL "0")) + message(FATAL_ERROR "vcpkg_list begin index: ${ARGV2} is out of range") + endif() + z_vcpkg_list_escape_once_more(list) + list(SUBLIST list "${ARGV2}" "${ARGV3}" out) + set("${ARGV4}" "${out}" PARENT_SCOPE) + return() + endif() + + # modification functions + + if(operation MATCHES "^(APPEND|PREPEND)$") + # vcpkg_list( [...]) + # A0 A1 A2... + + # if ARGC <= 2, then we don't have to do anything + if(ARGC GREATER 2) + z_vcpkg_function_arguments(args 2) + if(list STREQUAL "") + set("${list_var}" "${args}" PARENT_SCOPE) + elseif(operation STREQUAL "APPEND") + set("${list_var}" "${list};${args}" PARENT_SCOPE) + else() + set("${list_var}" "${args};${list}" PARENT_SCOPE) + endif() + endif() + return() + endif() + if(operation STREQUAL "INSERT") + # vcpkg_list(INSERT [...]) + # A0 A1 A2 A3... + + list(LENGTH list length) + if(ARGV2 LESS "-{$length}" OR ARGV2 GREATER length) + message(FATAL_ERROR "vcpkg_list index: ${ARGV2} out of range") + endif() + if(ARGC GREATER 3) + # list(LENGTH) is one of the few subcommands that's fine + list(LENGTH list length) + if(ARGV2 LESS "0") + math(EXPR ARGV2 "${length} + ${ARGV2}") + endif() + if(ARGV2 LESS "0" OR ARGV2 GREATER length) + message(FATAL_ERROR "list index: ${ARGV2} out of range (-${length}, ${length})") + endif() + + z_vcpkg_function_arguments(args 3) + if(list STREQUAL "") + set("${list_var}" "${args}" PARENT_SCOPE) + elseif(ARGV2 EQUAL "0") + set("${list_var}" "${args};${list}" PARENT_SCOPE) + elseif(ARGV2 EQUAL length) + set("${list_var}" "${list};${args}" PARENT_SCOPE) + else() + vcpkg_list(SUBLIST list 0 "${ARGV2}" list_start) + vcpkg_list(SUBLIST list "${ARGV2}" -1 list_end) + set("${list_var}" "${list_start};${args};${list_end}" PARENT_SCOPE) + endif() + elseif(ARGC LESS 3) + message(FATAL_ERROR "vcpkg_list sub-command INSERT requires at least two arguments.") + endif() + return() + endif() + + if(operation MATCHES "^(POP_BACK|POP_FRONT|REVERSE|REMOVE_DUPLICATES)$") + # vcpkg_list( ) + # A0 A1 + if(NOT ARGC EQUAL 2) + message(FATAL_ERROR "vcpkg_list sub-command ${operation} requires one argument.") + endif() + z_vcpkg_list_escape_once_more(list) + list("${operation}" list) + set("${list_var}" "${list}" PARENT_SCOPE) + return() + endif() + + if(operation MATCHES "^(REMOVE_AT|REMOVE_ITEM)$") + # vcpkg_list( ) + # A0 A1 A2 + if(NOT ARGC EQUAL 3) + message(FATAL_ERROR "vcpkg_list sub-command ${operation} requires two arguments.") + endif() + if(operation STREQUAL "REMOVE_AT") + list(LENGTH list length) + if(ARGV2 GREATER_EQUAL length OR ARGV2 LESS "-${length}") + message(FATAL_ERROR "vcpkg_list index: ${ARGV2} out of range") + endif() + endif() + + z_vcpkg_list_escape_once_more(list) + string(REPLACE [[;]] [[\;]] ARGV2 "${ARGV2}") + + list("${operation}" list "${ARGV2}") + set("${list_var}" "${list}" PARENT_SCOPE) + return() + endif() + + message(FATAL_ERROR "vcpkg_list sub-command ${operation} is not yet implemented.") +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_minimum_required.cmake b/externals/vcpkg/scripts/cmake/vcpkg_minimum_required.cmake new file mode 100755 index 000000000..1ef14963b --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_minimum_required.cmake @@ -0,0 +1,35 @@ +function(vcpkg_minimum_required) + cmake_parse_arguments(PARSE_ARGV 0 arg "" "VERSION" "") + if(NOT DEFINED VCPKG_BASE_VERSION) + message(FATAL_ERROR "Your vcpkg executable is outdated and is not compatible with the current CMake scripts. + Please re-acquire vcpkg by running bootstrap-vcpkg." + ) + endif() + if(NOT DEFINED arg_VERSION) + message(FATAL_ERROR "VERSION must be specified") + endif() + + set(vcpkg_date_regex "^[12][0-9][0-9][0-9]-[01][0-9]-[0-3][0-9]$") + if(NOT "${VCPKG_BASE_VERSION}" MATCHES "${vcpkg_date_regex}") + message(FATAL_ERROR + "vcpkg internal failure; VCPKG_BASE_VERSION (${VCPKG_BASE_VERSION}) was not a valid date." + ) + endif() + + if(NOT "${arg_VERSION}" MATCHES "${vcpkg_date_regex}") + message(FATAL_ERROR + "VERSION (${arg_VERSION}) was not a valid date - expected something of the form 'YYYY-MM-DD'" + ) + endif() + + string(REPLACE "-" "." VCPKG_BASE_VERSION_as_dotted "${VCPKG_BASE_VERSION}") + string(REPLACE "-" "." arg_VERSION_as_dotted "${arg_VERSION}") + + if("${VCPKG_BASE_VERSION_as_dotted}" VERSION_LESS "${arg_VERSION_as_dotted}") + message(FATAL_ERROR + "Your vcpkg executable is from ${VCPKG_BASE_VERSION} which is older than required by the caller " + "of vcpkg_minimum_required(VERSION ${arg_VERSION}). " + "Please re-acquire vcpkg by running bootstrap-vcpkg." + ) + endif() +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_replace_string.cmake b/externals/vcpkg/scripts/cmake/vcpkg_replace_string.cmake new file mode 100755 index 000000000..7147acdf6 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_replace_string.cmake @@ -0,0 +1,5 @@ +function(vcpkg_replace_string filename match replace) + file(READ "${filename}" contents) + string(REPLACE "${match}" "${replace}" contents "${contents}") + file(WRITE "${filename}" "${contents}") +endfunction() diff --git a/externals/vcpkg/scripts/cmake/vcpkg_test_cmake.cmake b/externals/vcpkg/scripts/cmake/vcpkg_test_cmake.cmake new file mode 100755 index 000000000..b3eb9f407 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/vcpkg_test_cmake.cmake @@ -0,0 +1,4 @@ +# DEPRECATED +function(vcpkg_test_cmake) + message("${Z_VCPKG_BACKCOMPAT_MESSAGE_LEVEL}" "vcpkg_test_cmake was a no-op and has been removed. Please remove the call to `vcpkg_test_cmake()`.") +endfunction() diff --git a/externals/vcpkg/scripts/cmake/z_vcpkg_apply_patches.cmake b/externals/vcpkg/scripts/cmake/z_vcpkg_apply_patches.cmake new file mode 100755 index 000000000..77af63b3b --- /dev/null +++ b/externals/vcpkg/scripts/cmake/z_vcpkg_apply_patches.cmake @@ -0,0 +1,45 @@ +function(z_vcpkg_apply_patches) + cmake_parse_arguments(PARSE_ARGV 0 "arg" "QUIET" "SOURCE_PATH" "PATCHES") + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "internal error: z_vcpkg_apply_patches was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + find_program(GIT NAMES git git.cmd REQUIRED) + if(DEFINED ENV{GIT_CONFIG_NOSYSTEM}) + set(git_config_nosystem_backup "$ENV{GIT_CONFIG_NOSYSTEM}") + else() + unset(git_config_nosystem_backup) + endif() + + set(ENV{GIT_CONFIG_NOSYSTEM} 1) + set(patchnum 0) + foreach(patch IN LISTS arg_PATCHES) + get_filename_component(absolute_patch "${patch}" ABSOLUTE BASE_DIR "${CURRENT_PORT_DIR}") + message(STATUS "Applying patch ${patch}") + set(logname "patch-${TARGET_TRIPLET}-${patchnum}") + vcpkg_execute_in_download_mode( + COMMAND "${GIT}" -c core.longpaths=true -c core.autocrlf=false --work-tree=. --git-dir=.git apply "${absolute_patch}" --ignore-whitespace --whitespace=nowarn --verbose + OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/${logname}-out.log" + ERROR_VARIABLE error + WORKING_DIRECTORY "${arg_SOURCE_PATH}" + RESULT_VARIABLE error_code + ) + file(WRITE "${CURRENT_BUILDTREES_DIR}/${logname}-err.log" "${error}") + + if(error_code) + if(arg_QUIET) + message(STATUS "Applying patch ${patch} - failure silenced") + else() + message(FATAL_ERROR "Applying patch failed: ${error}") + endif() + endif() + + math(EXPR patchnum "${patchnum} + 1") + endforeach() + if(DEFINED git_config_nosystem_backup) + set(ENV{GIT_CONFIG_NOSYSTEM} "${git_config_nosystem_backup}") + else() + unset(ENV{GIT_CONFIG_NOSYSTEM}) + endif() +endfunction() diff --git a/externals/vcpkg/scripts/cmake/z_vcpkg_escape_regex_control_characters.cmake b/externals/vcpkg/scripts/cmake/z_vcpkg_escape_regex_control_characters.cmake new file mode 100755 index 000000000..b238f0088 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/z_vcpkg_escape_regex_control_characters.cmake @@ -0,0 +1,8 @@ +function(z_vcpkg_escape_regex_control_characters out_var string) + if(ARGC GREATER "2") + message(FATAL_ERROR "z_vcpkg_escape_regex_control_characters passed extra arguments: ${ARGN}") + endif() + # uses | instead of [] to avoid confusion; additionally, CMake doesn't support `]` in a `[]` + string(REGEX REPLACE [[\[|\]|\(|\)|\.|\+|\*|\^|\\|\$|\?|\|]] [[\\\0]] escaped_content "${string}") + set("${out_var}" "${escaped_content}" PARENT_SCOPE) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/z_vcpkg_forward_output_variable.cmake b/externals/vcpkg/scripts/cmake/z_vcpkg_forward_output_variable.cmake new file mode 100755 index 000000000..1177ef36c --- /dev/null +++ b/externals/vcpkg/scripts/cmake/z_vcpkg_forward_output_variable.cmake @@ -0,0 +1,12 @@ +macro(z_vcpkg_forward_output_variable ptr_to_parent_var var_to_forward) + if("${ARGC}" GREATER "2") + message(FATAL_ERROR "z_vcpkg_forward_output_variable was passed extra arguments: ${ARGN}") + endif() + if(DEFINED "${ptr_to_parent_var}") + if(DEFINED "${var_to_forward}") + set("${${ptr_to_parent_var}}" "${${var_to_forward}}" PARENT_SCOPE) + else() + unset("${${ptr_to_parent_var}}" PARENT_SCOPE) + endif() + endif() +endmacro() diff --git a/externals/vcpkg/scripts/cmake/z_vcpkg_function_arguments.cmake b/externals/vcpkg/scripts/cmake/z_vcpkg_function_arguments.cmake new file mode 100755 index 000000000..45e60a256 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/z_vcpkg_function_arguments.cmake @@ -0,0 +1,36 @@ +# NOTE: this function definition is copied directly to scripts/buildsystems/vcpkg.cmake +# do not make changes here without making the same change there. +macro(z_vcpkg_function_arguments OUT_VAR) + if("${ARGC}" EQUAL 1) + set(z_vcpkg_function_arguments_FIRST_ARG 0) + elseif("${ARGC}" EQUAL 2) + set(z_vcpkg_function_arguments_FIRST_ARG "${ARGV1}") + + if(NOT z_vcpkg_function_arguments_FIRST_ARG GREATER_EQUAL "0" AND NOT z_vcpkg_function_arguments_FIRST_ARG LESS "0") + message(FATAL_ERROR "z_vcpkg_function_arguments: index (${z_vcpkg_function_arguments_FIRST_ARG}) is not a number") + elseif(z_vcpkg_function_arguments_FIRST_ARG LESS "0" OR z_vcpkg_function_arguments_FIRST_ARG GREATER ARGC) + message(FATAL_ERROR "z_vcpkg_function_arguments: index (${z_vcpkg_function_arguments_FIRST_ARG}) out of range") + endif() + else() + # vcpkg bug + message(FATAL_ERROR "z_vcpkg_function_arguments: invalid arguments (${ARGV})") + endif() + + set("${OUT_VAR}" "") + + # this allows us to get the value of the enclosing function's ARGC + set(z_vcpkg_function_arguments_ARGC_NAME "ARGC") + set(z_vcpkg_function_arguments_ARGC "${${z_vcpkg_function_arguments_ARGC_NAME}}") + + math(EXPR z_vcpkg_function_arguments_LAST_ARG "${z_vcpkg_function_arguments_ARGC} - 1") + # GREATER_EQUAL added in CMake 3.7 + if(NOT z_vcpkg_function_arguments_LAST_ARG LESS z_vcpkg_function_arguments_FIRST_ARG) + foreach(z_vcpkg_function_arguments_N RANGE "${z_vcpkg_function_arguments_FIRST_ARG}" "${z_vcpkg_function_arguments_LAST_ARG}") + string(REPLACE ";" "\\;" z_vcpkg_function_arguments_ESCAPED_ARG "${ARGV${z_vcpkg_function_arguments_N}}") + # adds an extra ";" on the front + set("${OUT_VAR}" "${${OUT_VAR}};${z_vcpkg_function_arguments_ESCAPED_ARG}") + endforeach() + # and then removes that extra semicolon + string(SUBSTRING "${${OUT_VAR}}" 1 -1 "${OUT_VAR}") + endif() +endmacro() diff --git a/externals/vcpkg/scripts/cmake/z_vcpkg_get_cmake_vars.cmake b/externals/vcpkg/scripts/cmake/z_vcpkg_get_cmake_vars.cmake new file mode 100755 index 000000000..51e0f03a9 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/z_vcpkg_get_cmake_vars.cmake @@ -0,0 +1,38 @@ +function(z_vcpkg_get_cmake_vars out_file) + cmake_parse_arguments(PARSE_ARGV 1 arg "" "" "") + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + if(DEFINED VCPKG_BUILD_TYPE) + set(cmake_vars_file "${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}-${VCPKG_BUILD_TYPE}.cmake.log") + set(cache_var "Z_VCPKG_GET_CMAKE_VARS_FILE_${VCPKG_BUILD_TYPE}") + else() + set(cmake_vars_file "${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}.cmake.log") + set(cache_var Z_VCPKG_GET_CMAKE_VARS_FILE) + endif() + if(NOT DEFINED CACHE{${cache_var}}) + set(${cache_var} "${cmake_vars_file}" + CACHE PATH "The file to include to access the CMake variables from a generated project.") + vcpkg_configure_cmake( + SOURCE_PATH "${SCRIPTS}/get_cmake_vars" + OPTIONS_DEBUG "-DVCPKG_OUTPUT_FILE:PATH=${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}-dbg.cmake.log" + OPTIONS_RELEASE "-DVCPKG_OUTPUT_FILE:PATH=${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}-rel.cmake.log" + PREFER_NINJA + LOGNAME get-cmake-vars-${TARGET_TRIPLET} + Z_GET_CMAKE_VARS_USAGE # ignore vcpkg_cmake_configure, be quiet, don't set variables... + ) + + set(include_string "") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + string(APPEND include_string "include(\"\${CMAKE_CURRENT_LIST_DIR}/cmake-vars-${TARGET_TRIPLET}-rel.cmake.log\")\n") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + string(APPEND include_string "include(\"\${CMAKE_CURRENT_LIST_DIR}/cmake-vars-${TARGET_TRIPLET}-dbg.cmake.log\")\n") + endif() + file(WRITE "${cmake_vars_file}" "${include_string}") + endif() + + set("${out_file}" "${${cache_var}}" PARENT_SCOPE) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/z_vcpkg_prettify_command_line.cmake b/externals/vcpkg/scripts/cmake/z_vcpkg_prettify_command_line.cmake new file mode 100755 index 000000000..7752d7a0c --- /dev/null +++ b/externals/vcpkg/scripts/cmake/z_vcpkg_prettify_command_line.cmake @@ -0,0 +1,15 @@ +function(z_vcpkg_prettify_command_line out_var) + set(output_list "") + z_vcpkg_function_arguments(args 1) + foreach(v IN LISTS args) + string(REPLACE [[\]] [[\\]] v "${v}") + if(v MATCHES "( )") + string(REPLACE [["]] [[\"]] v "${v}") + list(APPEND output_list "\"${v}\"") + else() + list(APPEND output_list "${v}") + endif() + endforeach() + list(JOIN output_list " " output) + set("${out_var}" "${output}" PARENT_SCOPE) +endfunction() diff --git a/externals/vcpkg/scripts/cmake/z_vcpkg_setup_pkgconfig_path.cmake b/externals/vcpkg/scripts/cmake/z_vcpkg_setup_pkgconfig_path.cmake new file mode 100755 index 000000000..369fe77b2 --- /dev/null +++ b/externals/vcpkg/scripts/cmake/z_vcpkg_setup_pkgconfig_path.cmake @@ -0,0 +1,35 @@ +function(z_vcpkg_setup_pkgconfig_path) + cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "" "BASE_DIRS") + + if(NOT DEFINED arg_BASE_DIRS OR "${arg_BASE_DIRS}" STREQUAL "") + message(FATAL_ERROR "BASE_DIRS is required.") + endif() + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + vcpkg_backup_env_variables(VARS PKG_CONFIG PKG_CONFIG_PATH) + + vcpkg_find_acquire_program(PKGCONFIG) + get_filename_component(pkgconfig_path "${PKGCONFIG}" DIRECTORY) + vcpkg_add_to_path("${pkgconfig_path}") + + set(ENV{PKG_CONFIG} "${PKGCONFIG}") # Set via native file? + + foreach(base_dir IN LISTS arg_BASE_DIRS) + vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} "${base_dir}/share/pkgconfig/") + endforeach() + + foreach(base_dir IN LISTS arg_BASE_DIRS) + vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} "${base_dir}/lib/pkgconfig/") + endforeach() +endfunction() + +function(z_vcpkg_restore_pkgconfig_path) + cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "" "") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + vcpkg_restore_env_variables(VARS PKG_CONFIG PKG_CONFIG_PATH) +endfunction() diff --git a/externals/vcpkg/scripts/detect_compiler/CMakeLists.txt b/externals/vcpkg/scripts/detect_compiler/CMakeLists.txt new file mode 100755 index 000000000..c55da9ebb --- /dev/null +++ b/externals/vcpkg/scripts/detect_compiler/CMakeLists.txt @@ -0,0 +1,24 @@ +cmake_minimum_required(VERSION 3.20) +project(detect_compiler NONE) + +if(CMAKE_GENERATOR STREQUAL "Ninja" AND CMAKE_SYSTEM_NAME STREQUAL "Windows") + set(CMAKE_C_COMPILER_WORKS 1) + set(CMAKE_C_COMPILER_FORCED 1) + set(CMAKE_CXX_COMPILER_WORKS 1) + set(CMAKE_CXX_COMPILER_FORCED 1) +endif() + +enable_language(C) +enable_language(CXX) + +file(SHA1 "${CMAKE_CXX_COMPILER}" CXX_HASH) +file(SHA1 "${CMAKE_C_COMPILER}" C_HASH) +string(SHA1 COMPILER_HASH "${C_HASH}${CXX_HASH}") + +message("#COMPILER_HASH#${COMPILER_HASH}") +message("#COMPILER_C_HASH#${C_HASH}") +message("#COMPILER_C_VERSION#${CMAKE_C_COMPILER_VERSION}") +message("#COMPILER_C_ID#${CMAKE_C_COMPILER_ID}") +message("#COMPILER_CXX_HASH#${CXX_HASH}") +message("#COMPILER_CXX_VERSION#${CMAKE_CXX_COMPILER_VERSION}") +message("#COMPILER_CXX_ID#${CMAKE_CXX_COMPILER_ID}") diff --git a/externals/vcpkg/scripts/detect_compiler/portfile.cmake b/externals/vcpkg/scripts/detect_compiler/portfile.cmake new file mode 100755 index 000000000..4f68faea4 --- /dev/null +++ b/externals/vcpkg/scripts/detect_compiler/portfile.cmake @@ -0,0 +1,28 @@ +set(LOGS + ${CURRENT_BUILDTREES_DIR}/config-${TARGET_TRIPLET}-out.log + ${CURRENT_BUILDTREES_DIR}/config-${TARGET_TRIPLET}-rel-out.log + ${CURRENT_BUILDTREES_DIR}/config-${TARGET_TRIPLET}-dbg-out.log + ${CURRENT_BUILDTREES_DIR}/config-${TARGET_TRIPLET}-rel-err.log + ${CURRENT_BUILDTREES_DIR}/config-${TARGET_TRIPLET}-dbg-err.log +) + +foreach(LOG IN LISTS LOGS) + file(REMOVE ${LOG}) + if(EXISTS ${LOG}) + message(FATAL_ERROR "Could not remove ${LOG}") + endif() +endforeach() + +set(VCPKG_BUILD_TYPE release) + +vcpkg_configure_cmake( + SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}" + PREFER_NINJA +) + +foreach(LOG IN LISTS LOGS) + if(EXISTS ${LOG}) + file(READ "${LOG}" _contents) + message("${_contents}") + endif() +endforeach() diff --git a/externals/vcpkg/scripts/detect_compiler/vcpkg.json b/externals/vcpkg/scripts/detect_compiler/vcpkg.json new file mode 100755 index 000000000..64979dffe --- /dev/null +++ b/externals/vcpkg/scripts/detect_compiler/vcpkg.json @@ -0,0 +1,5 @@ +{ + "name": "detect-compiler", + "version": "0", + "description": "None" +} diff --git a/externals/vcpkg/scripts/file_script.py b/externals/vcpkg/scripts/file_script.py new file mode 100755 index 000000000..a3abdc6f2 --- /dev/null +++ b/externals/vcpkg/scripts/file_script.py @@ -0,0 +1,43 @@ +import os +import os.path +import sys + + +keyword = "/include/" + +def getFiles(path): + files = os.listdir(path) + return list(filter(lambda x: x[0] != '.', files)) + +def gen_all_file_strings(path, files, headers, output): + for file in files: + components = file.split("_") + package = components[0] + ":" + components[2].replace(".list", "") + f = open(path + file) + for line in f: + if line.strip()[-1] == "/": + continue + filepath = line[line.find("/"):] + output.write(package + ":" + filepath) + if filepath.startswith(keyword): + headers.write(package + ":" + filepath[len(keyword):]) + f.close() + +def main(path): + try: + os.mkdir("scripts/list_files") + except FileExistsError: + print("Path already exists, continuing...") + + try: + headers = open("scripts/list_files/VCPKGHeadersDatabase.txt", mode='w') + output = open("scripts/list_files/VCPKGDatabase.txt", mode='w') + gen_all_file_strings(path, getFiles(path), headers, output) + headers.close() + output.close() + except e: + print("Failed to generate file lists") + +if __name__ == "__main__": + main(sys.argv[1]) + diff --git a/externals/vcpkg/scripts/generateBaseline.py b/externals/vcpkg/scripts/generateBaseline.py new file mode 100755 index 000000000..6488b5425 --- /dev/null +++ b/externals/vcpkg/scripts/generateBaseline.py @@ -0,0 +1,82 @@ +import os +import sys +import json +import time + +from pathlib import Path + + +SCRIPT_DIRECTORY = os.path.dirname(os.path.abspath(__file__)) +PORTS_DIRECTORY = os.path.join(SCRIPT_DIRECTORY, '../ports') +VERSIONS_DB_DIRECTORY = os.path.join(SCRIPT_DIRECTORY, '../versions') + + +def get_version_tag(version): + if 'version' in version: + return version['version'] + elif 'version-date' in version: + return version['version-date'] + elif 'version-semver' in version: + return version['version-semver'] + elif 'version-string' in version: + return version['version-string'] + sys.exit(1) + + +def get_version_port_version(version): + if 'port-version' in version: + return version['port-version'] + return 0 + + +def generate_baseline(): + start_time = time.time() + + # Assume each directory in ${VCPKG_ROOT}/ports is a different port + port_names = [item for item in os.listdir( + PORTS_DIRECTORY) if os.path.isdir(os.path.join(PORTS_DIRECTORY, item))] + port_names.sort() + + baseline_entries = {} + total_count = len(port_names) + for i, port_name in enumerate(port_names, 1): + port_file_path = os.path.join( + VERSIONS_DB_DIRECTORY, f'{port_name[0]}-', f'{port_name}.json') + + if not os.path.exists(port_file_path): + print( + f'Error: No version file for {port_name}.\n', file=sys.stderr) + continue + sys.stderr.write( + f'\rProcessed {i}/{total_count} ({i/total_count:.2%})') + with open(port_file_path, 'r') as db_file: + try: + versions_object = json.load(db_file) + if versions_object['versions']: + last_version = versions_object['versions'][0] + baseline_entries[port_name] = { + 'baseline': get_version_tag(last_version), + 'port-version': get_version_port_version(last_version) + } + except json.JSONDecodeError as e: + print(f'Error: Decoding {port_file_path}\n{e}\n') + baseline_object = {} + baseline_object['default'] = baseline_entries + + os.makedirs(VERSIONS_DB_DIRECTORY, exist_ok=True) + baseline_path = os.path.join(VERSIONS_DB_DIRECTORY, 'baseline.json') + with open(baseline_path, 'w') as baseline_file: + json.dump(baseline_object, baseline_file) + + elapsed_time = time.time() - start_time + print(f'\nElapsed time: {elapsed_time:.2f} seconds') + + +def main(): + if not os.path.exists(VERSIONS_DB_DIRECTORY): + print(f'Version DB files must exist before generating a baseline.\nRun: `python generatePortVersionsDB`\n') + generate_baseline() + + +if __name__ == "__main__": + main() diff --git a/externals/vcpkg/scripts/generatePortVersionsDb.py b/externals/vcpkg/scripts/generatePortVersionsDb.py new file mode 100755 index 000000000..d35e51b52 --- /dev/null +++ b/externals/vcpkg/scripts/generatePortVersionsDb.py @@ -0,0 +1,87 @@ +import os +import sys +import subprocess +import json +import time +import shutil + +import multiprocessing + +from pathlib import Path + + +MAX_PROCESSES = multiprocessing.cpu_count() +SCRIPT_DIRECTORY = os.path.dirname(os.path.abspath(__file__)) +PORTS_DIRECTORY = os.path.join(SCRIPT_DIRECTORY, '../ports') +VERSIONS_DB_DIRECTORY = os.path.join(SCRIPT_DIRECTORY, '../versions') + + +def get_current_git_ref(): + output = subprocess.run(['git', '-C', SCRIPT_DIRECTORY, 'rev-parse', '--verify', 'HEAD'], + capture_output=True, + encoding='utf-8') + if output.returncode == 0: + return output.stdout.strip() + print(f"Failed to get git ref:", output.stderr.strip(), file=sys.stderr) + return None + + +def generate_versions_file(port_name): + containing_dir = os.path.join(VERSIONS_DB_DIRECTORY, f'{port_name[0]}-') + os.makedirs(containing_dir, exist_ok=True) + + output_file_path = os.path.join(containing_dir, f'{port_name}.json') + if not os.path.exists(output_file_path): + env = os.environ.copy() + env['GIT_OPTIONAL_LOCKS'] = '0' + output = subprocess.run( + [os.path.join(SCRIPT_DIRECTORY, '../vcpkg'), + 'x-history', port_name, '--x-json', f'--output={output_file_path}'], + capture_output=True, encoding='utf-8', env=env) + if output.returncode != 0: + print(f'x-history {port_name} failed: ', + output.stdout.strip(), file=sys.stderr) + + +def generate_versions_db(revision): + start_time = time.time() + + # Assume each directory in ${VCPKG_ROOT}/ports is a different port + port_names = [item for item in os.listdir( + PORTS_DIRECTORY) if os.path.isdir(os.path.join(PORTS_DIRECTORY, item))] + total_count = len(port_names) + + concurrency = MAX_PROCESSES / 2 + print(f'Running {concurrency:.0f} parallel processes') + process_pool = multiprocessing.Pool(MAX_PROCESSES) + for i, _ in enumerate(process_pool.imap_unordered(generate_versions_file, port_names), 1): + sys.stderr.write( + f'\rProcessed: {i}/{total_count} ({(i / total_count):.2%})') + process_pool.close() + process_pool.join() + + # Generate timestamp + rev_file = os.path.join(VERSIONS_DB_DIRECTORY, revision) + Path(rev_file).touch() + + elapsed_time = time.time() - start_time + print( + f'\nElapsed time: {elapsed_time:.2f} seconds') + + +def main(): + revision = get_current_git_ref() + if not revision: + print('Couldn\'t fetch current Git revision', file=sys.stderr) + sys.exit(1) + + rev_file = os.path.join(VERSIONS_DB_DIRECTORY, revision) + if os.path.exists(rev_file): + print(f'Database files already exist for commit {revision}') + sys.exit(0) + + generate_versions_db(revision) + + +if __name__ == "__main__": + main() diff --git a/externals/vcpkg/scripts/get_cmake_vars/CMakeLists.txt b/externals/vcpkg/scripts/get_cmake_vars/CMakeLists.txt new file mode 100755 index 000000000..ec6ea5539 --- /dev/null +++ b/externals/vcpkg/scripts/get_cmake_vars/CMakeLists.txt @@ -0,0 +1,158 @@ +cmake_minimum_required(VERSION 3.20) + +set(VCPKG_LANGUAGES "C;CXX" CACHE STRING "Languages to enables for this project") + +set(OUTPUT_STRING) +# Build default checklists +list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_CROSSCOMPILING + CMAKE_SYSTEM_NAME + CMAKE_HOST_SYSTEM_NAME + CMAKE_SYSTEM_PROCESSOR + CMAKE_HOST_SYSTEM_PROCESSOR) +if(CMAKE_SYSTEM_NAME MATCHES "Darwin") + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_OSX_DEPLOYMENT_TARGET + CMAKE_OSX_SYSROOT) +endif() +# Programs to check +set(PROGLIST AR RANLIB STRIP NM OBJDUMP DLLTOOL MT LINKER) +foreach(prog IN LISTS PROGLIST) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${prog}) +endforeach() +set(COMPILERS ${VCPKG_LANGUAGES} RC) +foreach(prog IN LISTS COMPILERS) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${prog}_COMPILER CMAKE_${prog}_COMPILER_ID) +endforeach() +# Variables to check +foreach(_lang IN LISTS VCPKG_LANGUAGES) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_STANDARD_INCLUDE_DIRECTORIES) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_STANDARD_LIBRARIES) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_STANDARD) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_COMPILE_FEATURES) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_EXTENSION) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES) + + # Probably never required since implicit. + #list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES) + #list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_IMPLICIT_INCLUDE_DIRECTORIES) + #list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_IMPLICIT_LINK_DIRECTORIES) + #list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_IMPLICIT_LINK_LIBRARIES) +endforeach() +list(REMOVE_DUPLICATES VCPKG_DEFAULT_VARS_TO_CHECK) + +# Environment variables to check. +list(APPEND VCPKG_DEFAULT_ENV_VARS_TO_CHECK PATH INCLUDE C_INCLUDE_PATH CPLUS_INCLUDE_PATH LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH) +list(REMOVE_DUPLICATES VCPKG_DEFAULT_ENV_VARS_TO_CHECK) + +#Flags to check. Flags are a bit special since they are configuration aware. +set(FLAGS ${VCPKG_LANGUAGES} RC SHARED_LINKER STATIC_LINKER EXE_LINKER) +foreach(flag IN LISTS FLAGS) + list(APPEND VCPKG_DEFAULT_FLAGS_TO_CHECK CMAKE_${flag}_FLAGS) +endforeach() +list(REMOVE_DUPLICATES VCPKG_DEFAULT_FLAGS_TO_CHECK) + +#Language-specific flags. +foreach(_lang IN LISTS VCPKG_LANGUAGES) + list(APPEND VCPKG_LANG_FLAGS CMAKE_${_lang}_FLAGS) +endforeach() +list(REMOVE_DUPLICATES VCPKG_LANG_FLAGS) + +# TODO if ever necessary: Properties to check + +set(VCPKG_VAR_PREFIX "VCPKG_DETECTED" CACHE STRING "Variable prefix to use for detected flags") +set(VCPKG_VARS_TO_CHECK "${VCPKG_DEFAULT_VARS_TO_CHECK}" CACHE STRING "Variables to check. If not given there is a list of defaults") +set(VCPKG_FLAGS_TO_CHECK "${VCPKG_DEFAULT_FLAGS_TO_CHECK}" CACHE STRING "Variables to check. If not given there is a list of defaults") +set(VCPKG_ENV_VARS_TO_CHECK "${VCPKG_DEFAULT_ENV_VARS_TO_CHECK}" CACHE STRING "Variables to check. If not given there is a list of defaults") + +if(NOT VCPKG_OUTPUT_FILE) + message(FATAL_ERROR "VCPKG_OUTPUT_FILE is required to be defined") +endif() + +if(NOT CMAKE_BUILD_TYPE) + message(FATAL_ERROR "CMAKE_BUILD_TYPE is required to be defined") +else() + string(TOUPPER "${CMAKE_BUILD_TYPE}" VCPKG_CONFIGS) +endif() + + +project(get_cmake_vars LANGUAGES ${VCPKG_LANGUAGES}) + +foreach(VAR IN LISTS VCPKG_VARS_TO_CHECK) + string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_${VAR} \"${${VAR}}\")\n") +endforeach() + +foreach(_env IN LISTS VCPKG_ENV_VARS_TO_CHECK) + if(CMAKE_HOST_WIN32) + string(REPLACE "\\" "/" ENV_${_env} "$ENV{${_env}}") + string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_ENV_${_env} \"${ENV_${_env}}\")\n") + else() + string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_ENV_${_env} \"$ENV{${_env}}\")\n") + endif() +endforeach() + +macro(_vcpkg_adjust_flags flag_var) + if(MSVC) # Transform MSVC /flags to -flags due to bash scripts intepreting /flag as a path. + string(REGEX REPLACE "(^| )/" "\\1-" ${flag_var} "${${flag_var}}") + if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + if("${flag_var}" STREQUAL "CMAKE_CXX_FLAGS") + string(APPEND ${flag_var} " -ZW:nostdlib") + endif() + endif() + endif() + if(CMAKE_SYSTEM_NAME MATCHES "Darwin") + if("${flag_var}" IN_LIST VCPKG_LANG_FLAGS) + # macOS - append arch and isysroot if cross-compiling + if(NOT "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "${CMAKE_HOST_SYSTEM_PROCESSOR}") + foreach(arch IN LISTS CMAKE_OSX_ARCHITECTURES) + string(APPEND ${flag_var} " -arch ${arch}") + endforeach() + endif() + string(APPEND ${flag_var} " -isysroot ${CMAKE_OSX_SYSROOT}") + if (CMAKE_OSX_DEPLOYMENT_TARGET) + string(APPEND ${flag_var} " -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}") + endif() + endif() + endif() +endmacro() + +foreach(flag IN LISTS VCPKG_FLAGS_TO_CHECK) + string(STRIP "${${flag}}" ${flag}) # Strip leading and trailing whitespaces + _vcpkg_adjust_flags(${flag}) + string(REPLACE [[\\]] [[\]] ${flag} "${${flag}}") + string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_RAW_${flag} \" ${${flag}}\")\n") + foreach(config IN LISTS VCPKG_CONFIGS) + string(STRIP "${${flag}_${config}}" ${flag}_${config}) + _vcpkg_adjust_flags(${flag}_${config}) + string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_RAW_${flag}_${config} \"${CMAKE_${flag}_FLAGS_${config}}\")\n") + set(COMBINED_${flag}_${config} "${${flag}} ${${flag}_${config}}") + string(STRIP "${COMBINED_${flag}_${config}}" COMBINED_${flag}_${config}) + string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_${flag}_${config} \"${COMBINED_${flag}_${config}}\")\n") + endforeach() +endforeach() + + +file(WRITE "${VCPKG_OUTPUT_FILE}" "${OUTPUT_STRING}") + +# Programs: +# CMAKE_AR +# CMAKE__COMPILER_AR (Wrapper) +# CMAKE_RANLIB +# CMAKE__COMPILER_RANLIB +# CMAKE_STRIP +# CMAKE_NM +# CMAKE_OBJDUMP +# CMAKE_DLLTOOL +# CMAKE_MT +# CMAKE_LINKER +# CMAKE_C_COMPILER +# CMAKE_CXX_COMPILER +# CMAKE_RC_COMPILER + +# Flags: +# CMAKE__FLAGS +# CMAKE__FLAGS_ +# CMAKE_RC_FLAGS +# CMAKE_SHARED_LINKER_FLAGS +# CMAKE_STATIC_LINKER_FLAGS +# CMAKE_STATIC_LINKER_FLAGS_ +# CMAKE_EXE_LINKER_FLAGS +# CMAKE_EXE_LINKER_FLAGS_ diff --git a/externals/vcpkg/scripts/ifw/maintenance.qs b/externals/vcpkg/scripts/ifw/maintenance.qs new file mode 100755 index 000000000..5cdad7225 --- /dev/null +++ b/externals/vcpkg/scripts/ifw/maintenance.qs @@ -0,0 +1,46 @@ +// constructor +function Component() +{ + installer.installationStarted.connect(this, Component.prototype.onInstallationStarted); +} + +Component.prototype.onInstallationStarted = function() +{ + if (component.updateRequested() || component.installationRequested()) { + if (installer.value("os") == "win") + component.installerbaseBinaryPath = "@TargetDir@/tempmaintenancetool.exe"; + installer.setInstallerBaseBinary(component.installerbaseBinaryPath); + } +} + +Component.prototype.createOperations = function() +{ + // call the base createOperations + component.createOperations(); + + // only for windows online installer + if ( installer.value("os") == "win" && !installer.isOfflineOnly() ) + { + // shortcut to add or remove packages + component.addOperation( "CreateShortcut", + "@TargetDir@/maintenancetool.exe", + "@StartMenuDir@/Manage vcpkg.lnk", + " --manage-packages"); + // shortcut to update packages + component.addOperation( "CreateShortcut", + "@TargetDir@/maintenancetool.exe", + "@StartMenuDir@/Update vcpkg.lnk", + " --updater"); + } + + // create uninstall link only for windows + if (installer.value("os") == "win") + { + // shortcut to uninstaller + component.addOperation( "CreateShortcut", + "@TargetDir@/maintenancetool.exe", + "@StartMenuDir@/Uninstall vcpkg.lnk", + " --uninstall"); + } +} + diff --git a/externals/vcpkg/scripts/ports.cmake b/externals/vcpkg/scripts/ports.cmake new file mode 100755 index 000000000..e8592824f --- /dev/null +++ b/externals/vcpkg/scripts/ports.cmake @@ -0,0 +1,194 @@ +cmake_minimum_required(VERSION 3.21) + +set(SCRIPTS "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "Location to stored scripts") +list(APPEND CMAKE_MODULE_PATH "${SCRIPTS}/cmake") +include("${SCRIPTS}/cmake/execute_process.cmake") +include("${SCRIPTS}/cmake/vcpkg_acquire_msys.cmake") +include("${SCRIPTS}/cmake/vcpkg_add_to_path.cmake") +include("${SCRIPTS}/cmake/vcpkg_apply_patches.cmake") +include("${SCRIPTS}/cmake/vcpkg_backup_restore_env_vars.cmake") +include("${SCRIPTS}/cmake/vcpkg_build_cmake.cmake") +include("${SCRIPTS}/cmake/vcpkg_build_make.cmake") +include("${SCRIPTS}/cmake/vcpkg_build_msbuild.cmake") +include("${SCRIPTS}/cmake/vcpkg_build_ninja.cmake") +include("${SCRIPTS}/cmake/vcpkg_build_nmake.cmake") +include("${SCRIPTS}/cmake/vcpkg_build_qmake.cmake") +include("${SCRIPTS}/cmake/vcpkg_buildpath_length_warning.cmake") +include("${SCRIPTS}/cmake/vcpkg_check_features.cmake") +include("${SCRIPTS}/cmake/vcpkg_check_linkage.cmake") +include("${SCRIPTS}/cmake/vcpkg_clean_executables_in_bin.cmake") +include("${SCRIPTS}/cmake/vcpkg_clean_msbuild.cmake") +include("${SCRIPTS}/cmake/vcpkg_configure_cmake.cmake") +include("${SCRIPTS}/cmake/vcpkg_configure_gn.cmake") +include("${SCRIPTS}/cmake/vcpkg_configure_make.cmake") +include("${SCRIPTS}/cmake/vcpkg_configure_meson.cmake") +include("${SCRIPTS}/cmake/vcpkg_configure_qmake.cmake") +include("${SCRIPTS}/cmake/vcpkg_copy_pdbs.cmake") +include("${SCRIPTS}/cmake/vcpkg_copy_tool_dependencies.cmake") +include("${SCRIPTS}/cmake/vcpkg_copy_tools.cmake") +include("${SCRIPTS}/cmake/vcpkg_download_distfile.cmake") +include("${SCRIPTS}/cmake/vcpkg_execute_build_process.cmake") +include("${SCRIPTS}/cmake/vcpkg_execute_required_process.cmake") +include("${SCRIPTS}/cmake/vcpkg_execute_required_process_repeat.cmake") +include("${SCRIPTS}/cmake/vcpkg_extract_source_archive.cmake") +include("${SCRIPTS}/cmake/vcpkg_extract_source_archive_ex.cmake") +include("${SCRIPTS}/cmake/vcpkg_fail_port_install.cmake") +include("${SCRIPTS}/cmake/vcpkg_find_acquire_program.cmake") +include("${SCRIPTS}/cmake/vcpkg_fixup_cmake_targets.cmake") +include("${SCRIPTS}/cmake/vcpkg_fixup_pkgconfig.cmake") +include("${SCRIPTS}/cmake/vcpkg_from_bitbucket.cmake") +include("${SCRIPTS}/cmake/vcpkg_from_git.cmake") +include("${SCRIPTS}/cmake/vcpkg_from_github.cmake") +include("${SCRIPTS}/cmake/vcpkg_from_gitlab.cmake") +include("${SCRIPTS}/cmake/vcpkg_from_sourceforge.cmake") +include("${SCRIPTS}/cmake/vcpkg_get_program_files_platform_bitness.cmake") +include("${SCRIPTS}/cmake/vcpkg_get_windows_sdk.cmake") +include("${SCRIPTS}/cmake/vcpkg_host_path_list.cmake") +include("${SCRIPTS}/cmake/vcpkg_install_cmake.cmake") +include("${SCRIPTS}/cmake/vcpkg_install_gn.cmake") +include("${SCRIPTS}/cmake/vcpkg_install_make.cmake") +include("${SCRIPTS}/cmake/vcpkg_install_meson.cmake") +include("${SCRIPTS}/cmake/vcpkg_install_msbuild.cmake") +include("${SCRIPTS}/cmake/vcpkg_install_nmake.cmake") +include("${SCRIPTS}/cmake/vcpkg_install_qmake.cmake") +include("${SCRIPTS}/cmake/vcpkg_list.cmake") +include("${SCRIPTS}/cmake/vcpkg_minimum_required.cmake") +include("${SCRIPTS}/cmake/vcpkg_replace_string.cmake") +include("${SCRIPTS}/cmake/vcpkg_test_cmake.cmake") + +include("${SCRIPTS}/cmake/z_vcpkg_apply_patches.cmake") +include("${SCRIPTS}/cmake/z_vcpkg_forward_output_variable.cmake") +include("${SCRIPTS}/cmake/z_vcpkg_function_arguments.cmake") +include("${SCRIPTS}/cmake/z_vcpkg_get_cmake_vars.cmake") +include("${SCRIPTS}/cmake/z_vcpkg_prettify_command_line.cmake") +include("${SCRIPTS}/cmake/z_vcpkg_setup_pkgconfig_path.cmake") + +function(debug_message) + if(PORT_DEBUG) + z_vcpkg_function_arguments(ARGS) + list(JOIN ARGS " " ARG_STRING) + message(STATUS "[DEBUG] " "${ARG_STRING}") + endif() +endfunction() +function(z_vcpkg_deprecation_message) + z_vcpkg_function_arguments(ARGS) + list(JOIN ARGS " " ARG_STRING) + message(DEPRECATION "${ARG_STRING}") +endfunction() + +option(_VCPKG_PROHIBIT_BACKCOMPAT_FEATURES "Controls whether use of a backcompat only support feature fails the build.") +if (_VCPKG_PROHIBIT_BACKCOMPAT_FEATURES) + set(Z_VCPKG_BACKCOMPAT_MESSAGE_LEVEL "FATAL_ERROR") +else() + set(Z_VCPKG_BACKCOMPAT_MESSAGE_LEVEL "WARNING") +endif() + +vcpkg_minimum_required(VERSION 2021-11-02) + +file(TO_CMAKE_PATH "${BUILDTREES_DIR}" BUILDTREES_DIR) +file(TO_CMAKE_PATH "${PACKAGES_DIR}" PACKAGES_DIR) + +set(CURRENT_INSTALLED_DIR "${_VCPKG_INSTALLED_DIR}/${TARGET_TRIPLET}" CACHE PATH "Location to install final packages") + +if(PORT) + set(CURRENT_BUILDTREES_DIR "${BUILDTREES_DIR}/${PORT}") + set(CURRENT_PACKAGES_DIR "${PACKAGES_DIR}/${PORT}_${TARGET_TRIPLET}") +endif() + +if(CMD STREQUAL "BUILD") + set(CMAKE_TRIPLET_FILE "${TARGET_TRIPLET_FILE}") + if(NOT EXISTS "${CMAKE_TRIPLET_FILE}") + message(FATAL_ERROR "Unsupported target triplet. Triplet file does not exist: ${CMAKE_TRIPLET_FILE}") + endif() + + if(NOT DEFINED CURRENT_PORT_DIR) + message(FATAL_ERROR "CURRENT_PORT_DIR was not defined") + endif() + file(TO_CMAKE_PATH "${CURRENT_PORT_DIR}" CURRENT_PORT_DIR) + if(NOT EXISTS "${CURRENT_PORT_DIR}") + message(FATAL_ERROR "Cannot find port: ${PORT}\n Directory does not exist: ${CURRENT_PORT_DIR}") + endif() + if(NOT EXISTS "${CURRENT_PORT_DIR}/portfile.cmake") + message(FATAL_ERROR "Port is missing portfile: ${CURRENT_PORT_DIR}/portfile.cmake") + endif() + if(NOT EXISTS "${CURRENT_PORT_DIR}/CONTROL" AND NOT EXISTS "${CURRENT_PORT_DIR}/vcpkg.json") + message(FATAL_ERROR "Port is missing control or manifest file: ${CURRENT_PORT_DIR}/{CONTROL,vcpkg.json}") + endif() + + unset(PACKAGES_DIR) + unset(BUILDTREES_DIR) + + if(EXISTS "${CURRENT_PACKAGES_DIR}") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}") + if(EXISTS "${CURRENT_PACKAGES_DIR}") + message(FATAL_ERROR "Unable to remove directory: ${CURRENT_PACKAGES_DIR}\n Files are likely in use.") + endif() + endif() + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}" "${CURRENT_PACKAGES_DIR}") + + include("${CMAKE_TRIPLET_FILE}") + + if (DEFINED VCPKG_PORT_CONFIGS) + foreach(VCPKG_PORT_CONFIG IN LISTS VCPKG_PORT_CONFIGS) + include("${VCPKG_PORT_CONFIG}") + endforeach() + endif() + + set(HOST_TRIPLET "${_HOST_TRIPLET}") + set(CURRENT_HOST_INSTALLED_DIR "${_VCPKG_INSTALLED_DIR}/${HOST_TRIPLET}" CACHE PATH "Location to install final packages for the host") + + set(TRIPLET_SYSTEM_ARCH "${VCPKG_TARGET_ARCHITECTURE}") + include("${SCRIPTS}/cmake/vcpkg_common_definitions.cmake") + + set(Z_VCPKG_ERROR_LOG_COLLECTION_FILE "${CURRENT_BUILDTREES_DIR}/error-logs-${TARGET_TRIPLET}.txt") + file(REMOVE "${Z_VCPKG_ERROR_LOG_COLLECTION_FILE}") + + include("${CURRENT_PORT_DIR}/portfile.cmake") + if(DEFINED PORT) + include("${SCRIPTS}/build_info.cmake") + endif() +elseif(CMD STREQUAL "CREATE") + file(TO_NATIVE_PATH "${VCPKG_ROOT_DIR}" NATIVE_VCPKG_ROOT_DIR) + file(TO_NATIVE_PATH "${DOWNLOADS}" NATIVE_DOWNLOADS) + if(NOT DEFINED PORT_PATH) + set(PORT_PATH "${VCPKG_ROOT_DIR}/ports/${PORT}") + endif() + file(TO_NATIVE_PATH "${PORT_PATH}" NATIVE_PORT_PATH) + set(PORTFILE_PATH "${PORT_PATH}/portfile.cmake") + file(TO_NATIVE_PATH "${PORTFILE_PATH}" NATIVE_PORTFILE_PATH) + set(MANIFEST_PATH "${PORT_PATH}/vcpkg.json") + file(TO_NATIVE_PATH "${MANIFEST_PATH}" NATIVE_MANIFEST_PATH) + + if(EXISTS "${PORTFILE_PATH}") + message(FATAL_ERROR "Portfile already exists: '${NATIVE_PORTFILE_PATH}'") + endif() + if(NOT FILENAME) + get_filename_component(FILENAME "${URL}" NAME) + endif() + string(REGEX REPLACE "(\\.(zip|gz|tar|tgz|bz2))+\$" "" ROOT_NAME "${FILENAME}") + + set(DOWNLOAD_PATH "${DOWNLOADS}/${FILENAME}") + file(TO_NATIVE_PATH "${DOWNLOAD_PATH}" NATIVE_DOWNLOAD_PATH) + + if(EXISTS "${DOWNLOAD_PATH}") + message(STATUS "Using pre-downloaded: ${NATIVE_DOWNLOAD_PATH}") + message(STATUS "If this is not desired, delete the file and ${NATIVE_PORT_PATH}") + else() + message(STATUS "Downloading ${URL} -> ${FILENAME}...") + file(DOWNLOAD "${URL}" "${DOWNLOAD_PATH}" STATUS download_status) + list(GET download_status 0 status_code) + if(NOT "${download_status}" EQUAL "0") + message(FATAL_ERROR "Downloading ${URL}... Failed. Status: ${download_status}") + endif() + endif() + file(SHA512 "${DOWNLOAD_PATH}" SHA512) + + file(MAKE_DIRECTORY "${PORT_PATH}") + configure_file("${SCRIPTS}/templates/portfile.in.cmake" "${PORTFILE_PATH}" @ONLY) + configure_file("${SCRIPTS}/templates/vcpkg.json.in" "${MANIFEST_PATH}" @ONLY) + + message(STATUS "Generated portfile: ${NATIVE_PORTFILE_PATH}") + message(STATUS "Generated manifest: ${NATIVE_MANIFEST_PATH}") + message(STATUS "To launch an editor for these new files, run") + message(STATUS " .\\vcpkg edit ${PORT}") +endif() diff --git a/externals/vcpkg/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psd1 b/externals/vcpkg/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psd1 new file mode 100755 index 000000000..3fb94fe7d --- /dev/null +++ b/externals/vcpkg/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psd1 @@ -0,0 +1,31 @@ +@{ + +# Script module or binary module file associated with this manifest. +ModuleToProcess = 'posh-vcpkg.psm1' + +# Version number of this module. +ModuleVersion = '0.0.1' + +# ID used to uniquely identify this module +GUID = '948f02ab-fc99-4a53-8335-b6556eef129b' + +# Minimum version of the Windows PowerShell engine required by this module +PowerShellVersion = '5.0' + +FunctionsToExport = @('TabExpansion') +CmdletsToExport = @() +VariablesToExport = @() +AliasesToExport = @() + +# Private data to pass to the module specified in RootModule/ModuleToProcess. +# This may also contain a PSData hashtable with additional module metadata used by PowerShell. +PrivateData = +@{ + PSData = + @{ + # Tags applied to this module. These help with module discovery in online galleries. + Tags = @('vcpkg', 'tab', 'tab-completion', 'tab-expansion', 'tabexpansion') + } +} + +} diff --git a/externals/vcpkg/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1 b/externals/vcpkg/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1 new file mode 100755 index 000000000..1c142c84f --- /dev/null +++ b/externals/vcpkg/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1 @@ -0,0 +1,254 @@ +param() + +if (Get-Module posh-vcpkg) { return } + +if ($PSVersionTable.PSVersion.Major -lt 5) { + Write-Warning ("posh-vcpkg does not support PowerShell versions before 5.0.") + return +} + +if (Test-Path Function:\TabExpansion) { + Rename-Item Function:\TabExpansion VcpkgTabExpansionBackup +} + +function TabExpansion($line, $lastWord) { + $lastBlock = [regex]::Split($line, '[|;]')[-1].TrimStart() + + switch -regex ($lastBlock) { + "^(?(\./|\.\\|)vcpkg(\.exe|)) (?.*)$" + { + & $matches['vcpkgexe'] autocomplete $matches['remaining'] + return + } + + # Fall back on existing tab expansion + default { + if (Test-Path Function:\VcpkgTabExpansionBackup) { + VcpkgTabExpansionBackup $line $lastWord + } + } + } +} + +$exportModuleMemberParams = @{ + Function = @( + 'TabExpansion' + ) +} + +Export-ModuleMember @exportModuleMemberParams + +# SIG # Begin signature block +# MIInugYJKoZIhvcNAQcCoIInqzCCJ6cCAQExDzANBglghkgBZQMEAgEFADB5Bgor +# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG +# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCDHZjpMevSjAPcs +# /aTP8aVTWBuPE0L4AxomP0cA936m/KCCDYEwggX/MIID56ADAgECAhMzAAACUosz +# qviV8znbAAAAAAJSMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAlVTMRMwEQYD +# VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMTH01pY3Jvc29mdCBDb2RlIFNpZ25p +# bmcgUENBIDIwMTEwHhcNMjEwOTAyMTgzMjU5WhcNMjIwOTAxMTgzMjU5WjB0MQsw +# CQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9u +# ZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMR4wHAYDVQQDExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +# AQDQ5M+Ps/X7BNuv5B/0I6uoDwj0NJOo1KrVQqO7ggRXccklyTrWL4xMShjIou2I +# sbYnF67wXzVAq5Om4oe+LfzSDOzjcb6ms00gBo0OQaqwQ1BijyJ7NvDf80I1fW9O +# L76Kt0Wpc2zrGhzcHdb7upPrvxvSNNUvxK3sgw7YTt31410vpEp8yfBEl/hd8ZzA +# v47DCgJ5j1zm295s1RVZHNp6MoiQFVOECm4AwK2l28i+YER1JO4IplTH44uvzX9o +# RnJHaMvWzZEpozPy4jNO2DDqbcNs4zh7AWMhE1PWFVA+CHI/En5nASvCvLmuR/t8 +# q4bc8XR8QIZJQSp+2U6m2ldNAgMBAAGjggF+MIIBejAfBgNVHSUEGDAWBgorBgEE +# AYI3TAgBBggrBgEFBQcDAzAdBgNVHQ4EFgQUNZJaEUGL2Guwt7ZOAu4efEYXedEw +# UAYDVR0RBEkwR6RFMEMxKTAnBgNVBAsTIE1pY3Jvc29mdCBPcGVyYXRpb25zIFB1 +# ZXJ0byBSaWNvMRYwFAYDVQQFEw0yMzAwMTIrNDY3NTk3MB8GA1UdIwQYMBaAFEhu +# ZOVQBdOCqhc3NyK1bajKdQKVMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly93d3cu +# bWljcm9zb2Z0LmNvbS9wa2lvcHMvY3JsL01pY0NvZFNpZ1BDQTIwMTFfMjAxMS0w +# Ny0wOC5jcmwwYQYIKwYBBQUHAQEEVTBTMFEGCCsGAQUFBzAChkVodHRwOi8vd3d3 +# Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY0NvZFNpZ1BDQTIwMTFfMjAx +# MS0wNy0wOC5jcnQwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0BAQsFAAOCAgEAFkk3 +# uSxkTEBh1NtAl7BivIEsAWdgX1qZ+EdZMYbQKasY6IhSLXRMxF1B3OKdR9K/kccp +# kvNcGl8D7YyYS4mhCUMBR+VLrg3f8PUj38A9V5aiY2/Jok7WZFOAmjPRNNGnyeg7 +# l0lTiThFqE+2aOs6+heegqAdelGgNJKRHLWRuhGKuLIw5lkgx9Ky+QvZrn/Ddi8u +# TIgWKp+MGG8xY6PBvvjgt9jQShlnPrZ3UY8Bvwy6rynhXBaV0V0TTL0gEx7eh/K1 +# o8Miaru6s/7FyqOLeUS4vTHh9TgBL5DtxCYurXbSBVtL1Fj44+Od/6cmC9mmvrti +# yG709Y3Rd3YdJj2f3GJq7Y7KdWq0QYhatKhBeg4fxjhg0yut2g6aM1mxjNPrE48z +# 6HWCNGu9gMK5ZudldRw4a45Z06Aoktof0CqOyTErvq0YjoE4Xpa0+87T/PVUXNqf +# 7Y+qSU7+9LtLQuMYR4w3cSPjuNusvLf9gBnch5RqM7kaDtYWDgLyB42EfsxeMqwK +# WwA+TVi0HrWRqfSx2olbE56hJcEkMjOSKz3sRuupFCX3UroyYf52L+2iVTrda8XW +# esPG62Mnn3T8AuLfzeJFuAbfOSERx7IFZO92UPoXE1uEjL5skl1yTZB3MubgOA4F +# 8KoRNhviFAEST+nG8c8uIsbZeb08SeYQMqjVEmkwggd6MIIFYqADAgECAgphDpDS +# AAAAAAADMA0GCSqGSIb3DQEBCwUAMIGIMQswCQYDVQQGEwJVUzETMBEGA1UECBMK +# V2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0 +# IENvcnBvcmF0aW9uMTIwMAYDVQQDEylNaWNyb3NvZnQgUm9vdCBDZXJ0aWZpY2F0 +# ZSBBdXRob3JpdHkgMjAxMTAeFw0xMTA3MDgyMDU5MDlaFw0yNjA3MDgyMTA5MDla +# MH4xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdS +# ZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMT +# H01pY3Jvc29mdCBDb2RlIFNpZ25pbmcgUENBIDIwMTEwggIiMA0GCSqGSIb3DQEB +# AQUAA4ICDwAwggIKAoICAQCr8PpyEBwurdhuqoIQTTS68rZYIZ9CGypr6VpQqrgG +# OBoESbp/wwwe3TdrxhLYC/A4wpkGsMg51QEUMULTiQ15ZId+lGAkbK+eSZzpaF7S +# 35tTsgosw6/ZqSuuegmv15ZZymAaBelmdugyUiYSL+erCFDPs0S3XdjELgN1q2jz +# y23zOlyhFvRGuuA4ZKxuZDV4pqBjDy3TQJP4494HDdVceaVJKecNvqATd76UPe/7 +# 4ytaEB9NViiienLgEjq3SV7Y7e1DkYPZe7J7hhvZPrGMXeiJT4Qa8qEvWeSQOy2u +# M1jFtz7+MtOzAz2xsq+SOH7SnYAs9U5WkSE1JcM5bmR/U7qcD60ZI4TL9LoDho33 +# X/DQUr+MlIe8wCF0JV8YKLbMJyg4JZg5SjbPfLGSrhwjp6lm7GEfauEoSZ1fiOIl +# XdMhSz5SxLVXPyQD8NF6Wy/VI+NwXQ9RRnez+ADhvKwCgl/bwBWzvRvUVUvnOaEP +# 6SNJvBi4RHxF5MHDcnrgcuck379GmcXvwhxX24ON7E1JMKerjt/sW5+v/N2wZuLB +# l4F77dbtS+dJKacTKKanfWeA5opieF+yL4TXV5xcv3coKPHtbcMojyyPQDdPweGF +# RInECUzF1KVDL3SV9274eCBYLBNdYJWaPk8zhNqwiBfenk70lrC8RqBsmNLg1oiM +# CwIDAQABo4IB7TCCAekwEAYJKwYBBAGCNxUBBAMCAQAwHQYDVR0OBBYEFEhuZOVQ +# BdOCqhc3NyK1bajKdQKVMBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIAQwBBMAsGA1Ud +# DwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFHItOgIxkEO5FAVO +# 4eqnxzHRI4k0MFoGA1UdHwRTMFEwT6BNoEuGSWh0dHA6Ly9jcmwubWljcm9zb2Z0 +# LmNvbS9wa2kvY3JsL3Byb2R1Y3RzL01pY1Jvb0NlckF1dDIwMTFfMjAxMV8wM18y +# Mi5jcmwwXgYIKwYBBQUHAQEEUjBQME4GCCsGAQUFBzAChkJodHRwOi8vd3d3Lm1p +# Y3Jvc29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dDIwMTFfMjAxMV8wM18y +# Mi5jcnQwgZ8GA1UdIASBlzCBlDCBkQYJKwYBBAGCNy4DMIGDMD8GCCsGAQUFBwIB +# FjNodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2RvY3MvcHJpbWFyeWNw +# cy5odG0wQAYIKwYBBQUHAgIwNB4yIB0ATABlAGcAYQBsAF8AcABvAGwAaQBjAHkA +# XwBzAHQAYQB0AGUAbQBlAG4AdAAuIB0wDQYJKoZIhvcNAQELBQADggIBAGfyhqWY +# 4FR5Gi7T2HRnIpsLlhHhY5KZQpZ90nkMkMFlXy4sPvjDctFtg/6+P+gKyju/R6mj +# 82nbY78iNaWXXWWEkH2LRlBV2AySfNIaSxzzPEKLUtCw/WvjPgcuKZvmPRul1LUd +# d5Q54ulkyUQ9eHoj8xN9ppB0g430yyYCRirCihC7pKkFDJvtaPpoLpWgKj8qa1hJ +# Yx8JaW5amJbkg/TAj/NGK978O9C9Ne9uJa7lryft0N3zDq+ZKJeYTQ49C/IIidYf +# wzIY4vDFLc5bnrRJOQrGCsLGra7lstnbFYhRRVg4MnEnGn+x9Cf43iw6IGmYslmJ +# aG5vp7d0w0AFBqYBKig+gj8TTWYLwLNN9eGPfxxvFX1Fp3blQCplo8NdUmKGwx1j +# NpeG39rz+PIWoZon4c2ll9DuXWNB41sHnIc+BncG0QaxdR8UvmFhtfDcxhsEvt9B +# xw4o7t5lL+yX9qFcltgA1qFGvVnzl6UJS0gQmYAf0AApxbGbpT9Fdx41xtKiop96 +# eiL6SJUfq/tHI4D1nvi/a7dLl+LrdXga7Oo3mXkYS//WsyNodeav+vyL6wuA6mk7 +# r/ww7QRMjt/fdW1jkT3RnVZOT7+AVyKheBEyIXrvQQqxP/uozKRdwaGIm1dxVk5I +# RcBCyZt2WwqASGv9eZ/BvW1taslScxMNelDNMYIZjzCCGYsCAQEwgZUwfjELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEoMCYGA1UEAxMfTWljcm9z +# b2Z0IENvZGUgU2lnbmluZyBQQ0EgMjAxMQITMwAAAlKLM6r4lfM52wAAAAACUjAN +# BglghkgBZQMEAgEFAKCBrjAZBgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIBBDAcBgor +# BgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG9w0BCQQxIgQgXfYXu2P9 +# Xl5soetYGYSmu5lwyqTv6FS3BnPtgTQd11AwQgYKKwYBBAGCNwIBDDE0MDKgFIAS +# AE0AaQBjAHIAbwBzAG8AZgB0oRqAGGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbTAN +# BgkqhkiG9w0BAQEFAASCAQB0AjnChoWv+UO2eEgknT4P1WMsswzSKL9O1ucsOUJ2 +# TIE8ioVKds7PwtQY5YfxAbjgWl2NF/B6dEZjIBvvJB3B6qGvXyU6APj+yE6LRFnm +# YX4Z/u8MXWuDnMX6HF/UMDFlzFpmK5hee585P5sJzVJpVkviMKDNK3mNNg6jMSI1 +# k0MB2tN7oJViiS/9S7l81p/9mulUKlTcyoy3lzZLSH1iXbF80oT2vv18AT6bCOAP +# TFVW0E6pjatJdjL40WHN+MZ076QhdzYMhiCD/rOPBAaO5ymcT7i94gp43GlkjcVb +# x2jNCCP4NGF4Zd3OujlwIyNc/I50upsaZMXmcuYbKm42oYIXGTCCFxUGCisGAQQB +# gjcDAwExghcFMIIXAQYJKoZIhvcNAQcCoIIW8jCCFu4CAQMxDzANBglghkgBZQME +# AgEFADCCAVkGCyqGSIb3DQEJEAEEoIIBSASCAUQwggFAAgEBBgorBgEEAYRZCgMB +# MDEwDQYJYIZIAWUDBAIBBQAEIINYetTs4pGQvctdg51u+7aIG0JApdU1hE1hgt0m +# co6dAgZiF5hMAQQYEzIwMjIwMzMwMjE1MjEwLjY2OVowBIACAfSggdikgdUwgdIx +# CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRt +# b25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1p +# Y3Jvc29mdCBJcmVsYW5kIE9wZXJhdGlvbnMgTGltaXRlZDEmMCQGA1UECxMdVGhh +# bGVzIFRTUyBFU046RkM0MS00QkQ0LUQyMjAxJTAjBgNVBAMTHE1pY3Jvc29mdCBU +# aW1lLVN0YW1wIFNlcnZpY2WgghFoMIIHFDCCBPygAwIBAgITMwAAAY5Z20YAqBCU +# zAABAAABjjANBgkqhkiG9w0BAQsFADB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMK +# V2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0 +# IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0Eg +# MjAxMDAeFw0yMTEwMjgxOTI3NDVaFw0yMzAxMjYxOTI3NDVaMIHSMQswCQYDVQQG +# EwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwG +# A1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMS0wKwYDVQQLEyRNaWNyb3NvZnQg +# SXJlbGFuZCBPcGVyYXRpb25zIExpbWl0ZWQxJjAkBgNVBAsTHVRoYWxlcyBUU1Mg +# RVNOOkZDNDEtNEJENC1EMjIwMSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFt +# cCBTZXJ2aWNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAqiMCq6OM +# zLa5wrtcf7Bf9f1WXW9kpqbOBzgPJvaGLrZG7twgwqTRWf1FkjpJKBOG5QPIRy7a +# 6IFVAy0W+tBaFX4In4DbBf2tGubyY9+hRU+hRewPJH5CYOvpPh77FfGM63+OlwRX +# p5YER6tC0WRKn3mryWpt4CwADuGv0LD2QjnhhgtRVidsiDnn9+aLjMuNapUhstGq +# Cr7JcQZt0ZrPUHW/TqTJymeU1eqgNorEbTed6UQyLaTVAmhXNQXDChfa526nW7RQ +# 7L4tXX9Lc0oguiCSkPlu5drNA6NM8z+UXQOAHxVfIQXmi+Y3SV2hr2dcxby9nlTz +# Yvf4ZDr5Wpcwt7tTdRIJibXHsXWMKrmOziliGDToLx34a/ctZE4NOLnlrKQWN9ZG +# +Ox5zRarK1EhShahM0uQNhb6BJjp3+c0eNzMFJ2qLZqDp2/3Yl5Q+4k+MDHLTipP +# 6VBdxcdVfd4mgrVTx3afO5KNfgMngGGfhSawGraRW28EhrLOspmIxii92E7vjncJ +# 2tcjhLCjBArVpPh3cZG5g3ZVy5iiAaoDaswpNgnMFAK5Un1reK+MFhPi9iMnvUPw +# tTDDJt5YED5DAT3mBUxp5QH3t7RhZwAJNLWLtpTeGF7ub81sSKYv2ardazAe9XLS +# 10tV2oOPrcniGJzlXW7VPvxqQNxe8lCDA20CAwEAAaOCATYwggEyMB0GA1UdDgQW +# BBTsQfkz9gT44N/5G8vNHayep+aV5DAfBgNVHSMEGDAWgBSfpxVdAF5iXYP05dJl +# pxtTNRnpcjBfBgNVHR8EWDBWMFSgUqBQhk5odHRwOi8vd3d3Lm1pY3Jvc29mdC5j +# b20vcGtpb3BzL2NybC9NaWNyb3NvZnQlMjBUaW1lLVN0YW1wJTIwUENBJTIwMjAx +# MCgxKS5jcmwwbAYIKwYBBQUHAQEEYDBeMFwGCCsGAQUFBzAChlBodHRwOi8vd3d3 +# Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY3Jvc29mdCUyMFRpbWUtU3Rh +# bXAlMjBQQ0ElMjAyMDEwKDEpLmNydDAMBgNVHRMBAf8EAjAAMBMGA1UdJQQMMAoG +# CCsGAQUFBwMIMA0GCSqGSIb3DQEBCwUAA4ICAQA1UK9xzIeTlKhSbLn0bekR5gYh +# 6bB1XQpluCqCA15skZ37UilaFJw8+GklDLzlNhSP2mOiOzVyCq8kkpqnfUc01ZaB +# ezQxg77qevj2iMyg39YJfeiCIhxYOFugwepYrPO8MlB/oue/VhIiDb1eNYTlPSmv +# 3palsgtkrb0oo0F0uWmX4EQVGKRo0UENtZetVIxa0J9DpUdjQWPeEh9cEM+RgE26 +# 5w5WAVb+WNx0iWiF4iTbCmrWaVEOX92dNqBm9bT1U7nGwN5CygpNAgEaYnrTMx1N +# 4AjxObACDN5DdvGlu/O0DfMWVc6qk6iKDFC6WpXQSkMlrlXII/Nhp+0+noU6tfEp +# HKLt7fYm9of5i/QomcCwo/ekiOCjYktp393ovoC1O2uLtbLnMVlE5raBLBNSbINZ +# 6QLxiA41lXnVVLIzDihUL8MU9CMvG4sdbhk2FX8zvrsP5PeBIw1faenMZuz0V3UX +# CtU5Okx5fmioWiiLZSCi1ljaxX+BEwQiinCi+vE59bTYI5FbuR8tDuGLiVu/JSpV +# FXrzWMP2Kn11sCLAGEjqJYUmO1tRY29Kd7HcIj2niSB0PQOCjYlnCnywnDinqS1C +# XvRsisjVlS1Rp4Tmuks+pGxiMGzF58zcb+hoFKyONuL3b+tgxTAz3sF3BVX9uk9M +# 5F+OEoeyLyGfLekNAjCCB3EwggVZoAMCAQICEzMAAAAVxedrngKbSZkAAAAAABUw +# DQYJKoZIhvcNAQELBQAwgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5n +# dG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9y +# YXRpb24xMjAwBgNVBAMTKU1pY3Jvc29mdCBSb290IENlcnRpZmljYXRlIEF1dGhv +# cml0eSAyMDEwMB4XDTIxMDkzMDE4MjIyNVoXDTMwMDkzMDE4MzIyNVowfDELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9z +# b2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw +# ggIKAoICAQDk4aZM57RyIQt5osvXJHm9DtWC0/3unAcH0qlsTnXIyjVX9gF/bErg +# 4r25PhdgM/9cT8dm95VTcVrifkpa/rg2Z4VGIwy1jRPPdzLAEBjoYH1qUoNEt6aO +# RmsHFPPFdvWGUNzBRMhxXFExN6AKOG6N7dcP2CZTfDlhAnrEqv1yaa8dq6z2Nr41 +# JmTamDu6GnszrYBbfowQHJ1S/rboYiXcag/PXfT+jlPP1uyFVk3v3byNpOORj7I5 +# LFGc6XBpDco2LXCOMcg1KL3jtIckw+DJj361VI/c+gVVmG1oO5pGve2krnopN6zL +# 64NF50ZuyjLVwIYwXE8s4mKyzbnijYjklqwBSru+cakXW2dg3viSkR4dPf0gz3N9 +# QZpGdc3EXzTdEonW/aUgfX782Z5F37ZyL9t9X4C626p+Nuw2TPYrbqgSUei/BQOj +# 0XOmTTd0lBw0gg/wEPK3Rxjtp+iZfD9M269ewvPV2HM9Q07BMzlMjgK8QmguEOqE +# UUbi0b1qGFphAXPKZ6Je1yh2AuIzGHLXpyDwwvoSCtdjbwzJNmSLW6CmgyFdXzB0 +# kZSU2LlQ+QuJYfM2BjUYhEfb3BvR/bLUHMVr9lxSUV0S2yW6r1AFemzFER1y7435 +# UsSFF5PAPBXbGjfHCBUYP3irRbb1Hode2o+eFnJpxq57t7c+auIurQIDAQABo4IB +# 3TCCAdkwEgYJKwYBBAGCNxUBBAUCAwEAATAjBgkrBgEEAYI3FQIEFgQUKqdS/mTE +# mr6CkTxGNSnPEP8vBO4wHQYDVR0OBBYEFJ+nFV0AXmJdg/Tl0mWnG1M1GelyMFwG +# A1UdIARVMFMwUQYMKwYBBAGCN0yDfQEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly93 +# d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvRG9jcy9SZXBvc2l0b3J5Lmh0bTATBgNV +# HSUEDDAKBggrBgEFBQcDCDAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNV +# HQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBTV9lbLj+iiXGJo +# 0T2UkFvXzpoYxDBWBgNVHR8ETzBNMEugSaBHhkVodHRwOi8vY3JsLm1pY3Jvc29m +# dC5jb20vcGtpL2NybC9wcm9kdWN0cy9NaWNSb29DZXJBdXRfMjAxMC0wNi0yMy5j +# cmwwWgYIKwYBBQUHAQEETjBMMEoGCCsGAQUFBzAChj5odHRwOi8vd3d3Lm1pY3Jv +# c29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dF8yMDEwLTA2LTIzLmNydDAN +# BgkqhkiG9w0BAQsFAAOCAgEAnVV9/Cqt4SwfZwExJFvhnnJL/Klv6lwUtj5OR2R4 +# sQaTlz0xM7U518JxNj/aZGx80HU5bbsPMeTCj/ts0aGUGCLu6WZnOlNN3Zi6th54 +# 2DYunKmCVgADsAW+iehp4LoJ7nvfam++Kctu2D9IdQHZGN5tggz1bSNU5HhTdSRX +# ud2f8449xvNo32X2pFaq95W2KFUn0CS9QKC/GbYSEhFdPSfgQJY4rPf5KYnDvBew +# VIVCs/wMnosZiefwC2qBwoEZQhlSdYo2wh3DYXMuLGt7bj8sCXgU6ZGyqVvfSaN0 +# DLzskYDSPeZKPmY7T7uG+jIa2Zb0j/aRAfbOxnT99kxybxCrdTDFNLB62FD+Cljd +# QDzHVG2dY3RILLFORy3BFARxv2T5JL5zbcqOCb2zAVdJVGTZc9d/HltEAY5aGZFr +# DZ+kKNxnGSgkujhLmm77IVRrakURR6nxt67I6IleT53S0Ex2tVdUCbFpAUR+fKFh +# bHP+CrvsQWY9af3LwUFJfn6Tvsv4O+S3Fb+0zj6lMVGEvL8CwYKiexcdFYmNcP7n +# tdAoGokLjzbaukz5m/8K6TT4JDVnK+ANuOaMmdbhIurwJ0I9JZTmdHRbatGePu1+ +# oDEzfbzL6Xu/OHBE0ZDxyKs6ijoIYn/ZcGNTTY3ugm2lBRDBcQZqELQdVTNYs6Fw +# ZvKhggLXMIICQAIBATCCAQChgdikgdUwgdIxCzAJBgNVBAYTAlVTMRMwEQYDVQQI +# EwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3Nv +# ZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVsYW5kIE9wZXJh +# dGlvbnMgTGltaXRlZDEmMCQGA1UECxMdVGhhbGVzIFRTUyBFU046RkM0MS00QkQ0 +# LUQyMjAxJTAjBgNVBAMTHE1pY3Jvc29mdCBUaW1lLVN0YW1wIFNlcnZpY2WiIwoB +# ATAHBgUrDgMCGgMVAD1iK+pPThHqgpa5xsPmiYruWVuMoIGDMIGApH4wfDELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9z +# b2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwDQYJKoZIhvcNAQEFBQACBQDl7udOMCIY +# DzIwMjIwMzMwMjIyNzI2WhgPMjAyMjAzMzEyMjI3MjZaMHcwPQYKKwYBBAGEWQoE +# ATEvMC0wCgIFAOXu504CAQAwCgIBAAICEPsCAf8wBwIBAAICH6MwCgIFAOXwOM4C +# AQAwNgYKKwYBBAGEWQoEAjEoMCYwDAYKKwYBBAGEWQoDAqAKMAgCAQACAwehIKEK +# MAgCAQACAwGGoDANBgkqhkiG9w0BAQUFAAOBgQDRvkQ+8tl/rST6Q19W3HCLiL76 +# 5jAlwfOPE9qK2auMHZnHWlcofAenCxyLoB0QAqj3UFflJ0bGic1xRb+OsKq+X/dz +# CPN2ik0cRkqUh8p3qjwRLquQ3HQp5BNxlyvdMNKSk+YdcK8SAGiO2HsnNE3LWwXP +# lko3/5Oq0+Oz7mdtpDGCBA0wggQJAgEBMIGTMHwxCzAJBgNVBAYTAlVTMRMwEQYD +# VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24xJjAkBgNVBAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1w +# IFBDQSAyMDEwAhMzAAABjlnbRgCoEJTMAAEAAAGOMA0GCWCGSAFlAwQCAQUAoIIB +# SjAaBgkqhkiG9w0BCQMxDQYLKoZIhvcNAQkQAQQwLwYJKoZIhvcNAQkEMSIEIL3n +# o4olI1N5U/f6eBrubu/yvZtoslP7/FdMYNVskLVDMIH6BgsqhkiG9w0BCRACLzGB +# 6jCB5zCB5DCBvQQgvQWPITvigaUuV5+f/lWs3BXZwJ/l1mf+yelu5nXmxCUwgZgw +# gYCkfjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UE +# BxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYD +# VQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMAITMwAAAY5Z20YAqBCU +# zAABAAABjjAiBCDoji5HoyFgeYnb2i9yFZjrBiELTJNC0CmqBLawXNEDPjANBgkq +# hkiG9w0BAQsFAASCAgCgDJqUfA65UksIsoC921eUPYQZsrbCZS1SpU7D6Pyn/xQ4 +# zbNu8vgxPpYqUz5/wdl0GnNMU6HkJWpYW0oT9PzsSIquvXlisaydTrEl6Q2t8z1c +# +kpJ0+Hm+ULHl1iRQc1sVfl7Zfzl2jy4OMZCO2lCLybDHMqeLSjx4bcRceTjPT0P +# TmFspYmlGxzh4V2snGcR4vkXYp3G7k7vcKgkI5rePj5re5Pp1AytGSK6AyNJ+Tm3 +# T6TWjaeiN+uzapzvbThNEwFMhad5yHe0xaTCYACT0XE9rULziUJk22kZrJ9UucNj +# s3GBxsLyv3T5RhNwpwGtMWhahc1lM01Xggw/bpodaRf2hWhl3ngJzEUysXPz4H+h +# HV713DUGIvfY5P6J1MA50Nufjv2MXeGKVbdD7jeEye0KFiz8uCin3uS5v4lny0t6 +# wddkWe4faFc0lPscDewubi2hQqUucGMVRt/lj120Bq0OUiLUNlQ0pucTC9NhQmCx +# eqlxR3tDVleAq5WI/VDUSVaNp9MBqT2RBpA3Ur1+kzE7lHL+WT/vmfcuoeXxsn9e +# 5tq9KwsTXctJWJrRrE9j9O94VR1G6isOYthtNOFXcN8kdT7vK/eyVJrQYKEj71xH +# efYWPLvRhkzisRAiYfC/cTlbkR2y8BvPhjtXTjcyFyyA57rsnpLb7IEvQbqn7g== +# SIG # End signature block diff --git a/externals/vcpkg/scripts/templates/portfile.in.cmake b/externals/vcpkg/scripts/templates/portfile.in.cmake new file mode 100755 index 000000000..a997cd22c --- /dev/null +++ b/externals/vcpkg/scripts/templates/portfile.in.cmake @@ -0,0 +1,84 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# CURRENT_INSTALLED_DIR = ${VCPKG_ROOT_DIR}\installed\${TRIPLET} +# DOWNLOADS = ${VCPKG_ROOT_DIR}\downloads +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# VCPKG_TOOLCHAIN = ON OFF +# TRIPLET_SYSTEM_ARCH = arm x86 x64 +# BUILD_ARCH = "Win32" "x64" "ARM" +# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} +# DEBUG_CONFIG = "Debug Static" "Debug Dll" +# RELEASE_CONFIG = "Release Static"" "Release DLL" +# VCPKG_TARGET_IS_WINDOWS +# VCPKG_TARGET_IS_UWP +# VCPKG_TARGET_IS_LINUX +# VCPKG_TARGET_IS_OSX +# VCPKG_TARGET_IS_FREEBSD +# VCPKG_TARGET_IS_ANDROID +# VCPKG_TARGET_IS_MINGW +# VCPKG_TARGET_EXECUTABLE_SUFFIX +# VCPKG_TARGET_STATIC_LIBRARY_SUFFIX +# VCPKG_TARGET_SHARED_LIBRARY_SUFFIX +# +# See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md + +# Also consider vcpkg_from_* functions if you can; the generated code here is for any web accessable +# source archive. +# vcpkg_from_github +# vcpkg_from_gitlab +# vcpkg_from_bitbucket +# vcpkg_from_sourceforge +vcpkg_download_distfile(ARCHIVE + URLS "@URL@" + FILENAME "@FILENAME@" + SHA512 @SHA512@ +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + # (Optional) A friendly name to use instead of the filename of the archive (e.g.: a version number or tag). + # REF 1.0.0 + # (Optional) Read the docs for how to generate patches at: + # https://github.com/Microsoft/vcpkg/blob/master/docs/examples/patching.md + # PATCHES + # 001_port_fixes.patch + # 002_more_port_fixes.patch +) + +# # Check if one or more features are a part of a package installation. +# # See /docs/maintainers/vcpkg_check_features.md for more details +# vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +# FEATURES # <- Keyword FEATURES is required because INVERTED_FEATURES are being used +# tbb WITH_TBB +# INVERTED_FEATURES +# tbb ROCKSDB_IGNORE_PACKAGE_TBB +# ) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 + # OPTIONS_RELEASE -DOPTIMIZE=1 + # OPTIONS_DEBUG -DDEBUGGABLE=1 +) + +vcpkg_cmake_install() + +# # Moves all .cmake files from /debug/share/@PORT@/ to /share/@PORT@/ +# # See /docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md for more details +# When you uncomment "vcpkg_cmake_config_fixup()", you need to add the following to "dependencies" vcpkg.json: +#{ +# "name": "vcpkg-cmake-config", +# "host": true +#} +# vcpkg_cmake_config_fixup(CONFIG_PATH cmake TARGET_PATH share/@PORT@) + +# Uncomment the line below if necessary to install the license file for the port to share/${PORT}/copyright +# file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/externals/vcpkg/scripts/templates/vcpkg.json.in b/externals/vcpkg/scripts/templates/vcpkg.json.in new file mode 100755 index 000000000..81004e8ee --- /dev/null +++ b/externals/vcpkg/scripts/templates/vcpkg.json.in @@ -0,0 +1,21 @@ +{ + "name": "@PORT@", + "version": "", + "homepage": "", + "description": "", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], + + "default-features": [], + "features": [ + { + "name": "", + "description": "", + "dependencies": [] + } + ] +} diff --git a/externals/vcpkg/scripts/test_ports/cmake-user/portfile.cmake b/externals/vcpkg/scripts/test_ports/cmake-user/portfile.cmake new file mode 100755 index 000000000..4bc3a485a --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/cmake-user/portfile.cmake @@ -0,0 +1,213 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(cmake_commands "") +if("cmake-current" IN_LIST FEATURES) + list(APPEND cmake_commands "${CMAKE_COMMAND}") +endif() +if("cmake-3-7" IN_LIST FEATURES) + set(cmake_version 3.7.2) + string(REGEX REPLACE "([^.]*[.][^.]*).*" "\\1" cmake_major_minor "${cmake_version}") + if(VCPKG_HOST_IS_WINDOWS) + set(name "cmake-${cmake_version}-win32-x86") + vcpkg_download_distfile(legacy_cmake_archive + FILENAME "${name}.zip" + URLS "https://github.com/Kitware/CMake/releases/download/v${cmake_version}/${name}.zip" + "https://cmake.org/files/v${cmake_major_minor}/${name}.zip" + SHA512 c359a22e2e688da1513db195280d6e8987bc8d570a0c543f1b1dfc8572fe4fd6c23d951ec5d5eae640fcca3bef3ae469083511474796ade8c6319d8bc4e4b38d + ) + set(cmake_bin_dir "/bin") + elseif(VCPKG_HOST_IS_OSX) + set(name "cmake-${cmake_version}-Darwin-x86_64") + vcpkg_download_distfile(legacy_cmake_archive + FILENAME "${name}.tar.gz" + URLS "https://github.com/Kitware/CMake/releases/download/v${cmake_version}/${name}.tar.gz" + "https://cmake.org/files/v${cmake_major_minor}/${name}.tar.gz" + SHA512 8e41608f4dd998020acf2bd1b0dab4aec37b3ea9e228f2c4a457cd1c0339d94db38a0548b4b07a9e3605f9beb11a3f6737a72813586c4ad5f730d74038a14c2b + ) + set(cmake_bin_dir "/CMake.app/Contents/bin") + elseif(VCPKG_HOST_IS_LINUX) + set(name "cmake-${cmake_version}-Linux-x86_64") + vcpkg_download_distfile(legacy_cmake_archive + FILENAME "${name}.tar.gz" + URLS "https://github.com/Kitware/CMake/releases/download/v${cmake_version}/${name}.tar.gz" + "https://cmake.org/files/v${cmake_major_minor}/${name}.tar.gz" + SHA512 459909fcfb9c74993c3d4ab9db4e31ea940515b670db44d039de611d813099895e695467cc8da24824315486e38e2f3e246aa92d6236c51103822ec8a39e3168 + ) + set(cmake_bin_dir "/bin") + else() + message(FATAL_ERROR "Unable to test feature 'cmake-3-7' for '${HOST_TRIPLET}' host.") + endif() + + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH legacy_cmake + ARCHIVE "${legacy_cmake_archive}" + REF "${cmake_version}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${name}" + ) + list(APPEND cmake_commands "${legacy_cmake}${cmake_bin_dir}/cmake") +endif() + +set(packages "") +if("find-package" IN_LIST FEATURES) + file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" vcpkg_json) + string(JSON packages_json GET "${vcpkg_json}" "features" "find-package" "dependencies") + string(JSON packages_count LENGTH "${packages_json}") + if(packages_count GREATER 0) + math(EXPR last "${packages_count} - 1") + foreach(i RANGE 0 ${last}) + string(JSON package GET "${packages_json}" ${i} "$package") + list(APPEND packages "${package}") + endforeach() + endif() + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + list(REMOVE_ITEM packages "Curses") + endif() + if(VCPKG_TARGET_IS_LINUX) + # Port wxwidgets requires linux system libraries which conflict with vcpkg ports. + # This line complements the "platform" restriction from vcpkg.json. + list(REMOVE_ITEM packages "wxWidgets") + endif() +endif() + +if(DEFINED ENV{VCPKG_FORCE_SYSTEM_BINARIES}) + set(NINJA "ninja") +else() + vcpkg_find_acquire_program(NINJA) +endif() + +function(test_cmake_project) + cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "CMAKE_COMMAND;NAME" "OPTIONS") + if(NOT arg_NAME) + message(FATAL_ERROR "The NAME argument is mandatory.") + endif() + if(NOT arg_CMAKE_COMMAND) + set(arg_CMAKE_COMMAND "${CMAKE_COMMAND}") + endif() + + execute_process( + COMMAND "${arg_CMAKE_COMMAND}" --version + OUTPUT_VARIABLE cmake_version_output + RESULT_VARIABLE cmake_version_result + ) + string(REGEX MATCH "[1-9][0-9]*\\.[0-9]*\\.[0-9]*" cmake_version "${cmake_version_output}") + if(cmake_version_result OR NOT cmake_version) + message(FATAL_ERROR "Unable to determine version for '${arg_CMAKE_COMMAND}'.") + endif() + + set(build_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${cmake_version}-${arg_NAME}") + set(base_options + -G "Ninja" + "-DCMAKE_MAKE_PROGRAM=${NINJA}" + "-DCMAKE_VERBOSE_MAKEFILE=ON" + "-DCMAKE_TOOLCHAIN_FILE=${SCRIPTS}/buildsystems/vcpkg.cmake" + "-DVCPKG_INSTALLED_DIR=${_VCPKG_INSTALLED_DIR}" + "-DCMAKE_INSTALL_PREFIX=${build_dir}/install" + "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}" + "-DVCPKG_MANIFEST_MODE=OFF" + "-DCHECK_CMAKE_VERSION=${cmake_version}" + ) + + if(DEFINED VCPKG_CMAKE_SYSTEM_NAME AND VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + list(APPEND base_options "-DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}") + if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + list(APPEND base_options "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}") + endif() + if(DEFINED VCPKG_PLATFORM_TOOLSET) + list(APPEND base_options "-DVCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET}") + endif() + endif() + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + list(APPEND base_options -DBUILD_SHARED_LIBS=ON) + else() + list(APPEND base_options -DBUILD_SHARED_LIBS=OFF) + endif() + + message(STATUS "Running tests with CMake ${cmake_version} for '${arg_NAME}'") + file(REMOVE_RECURSE "${build_dir}") + file(MAKE_DIRECTORY "${build_dir}") + vcpkg_execute_required_process( + COMMAND + "${arg_CMAKE_COMMAND}" "${CMAKE_CURRENT_LIST_DIR}/project" + ${base_options} + ${arg_OPTIONS} + WORKING_DIRECTORY "${build_dir}" + LOGNAME "${TARGET_TRIPLET}-${cmake_version}-${arg_NAME}-config" + ) + vcpkg_execute_required_process( + COMMAND + "${arg_CMAKE_COMMAND}" --build . --target install + WORKING_DIRECTORY "${build_dir}" + LOGNAME "${TARGET_TRIPLET}-${cmake_version}-${arg_NAME}-build" + ) + # To produce better error messages for failing wrappers, + # we run execute_process directly here, for each wrapper. + string(REPLACE " OFF:" ":" message + " CMake ${cmake_version}: @step@ with `find_package(@package@)` failed.\n" + " See logs for more information:\n" + " @log_out@\n" + " @log_err@\n" + ) + if(DEFINED ENV{BUILD_REASON}) # On Azure Pipelines, add extra markup. + string(REPLACE " CMake" "##vso[task.logissue type=error]CMake" message "${message}") + endif() + foreach(package IN LISTS packages) + string(MAKE_C_IDENTIFIER "${package}" package_string) + set(find_package_build_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${cmake_version}-find-package-${package_string}-${arg_NAME}") + set(log_out "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${cmake_version}-find-package-${package_string}-${arg_NAME}-out.log") + set(log_err "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${cmake_version}-find-package-${package_string}-${arg_NAME}-err.log") + + message(STATUS " find_package(${package})") + file(REMOVE_RECURSE "${find_package_build_dir}") + file(MAKE_DIRECTORY "${find_package_build_dir}") + execute_process( + COMMAND + "${arg_CMAKE_COMMAND}" "${CMAKE_CURRENT_LIST_DIR}/project" + ${base_options} + ${arg_OPTIONS} + "-DFIND_PACKAGES=${package}" + OUTPUT_FILE "${log_out}" + ERROR_FILE "${log_err}" + RESULT_VARIABLE package_result + WORKING_DIRECTORY "${find_package_build_dir}" + ) + if(package_result) + set(step "configuration") + string(CONFIGURE "${message}" package_message @ONLY) + message(SEND_ERROR "${package_message}") + else() + set(log_out "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${cmake_version}-find-package-${package_string}-${arg_NAME}-build-out.log") + set(log_err "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${cmake_version}-find-package-${package_string}-${arg_NAME}-build-err.log") + execute_process( + COMMAND + "${arg_CMAKE_COMMAND}" --build . + OUTPUT_FILE "${log_out}" + ERROR_FILE "${log_err}" + RESULT_VARIABLE package_result + WORKING_DIRECTORY "${find_package_build_dir}" + ) + if(package_result) + set(step "build") + string(CONFIGURE "${message}" package_message @ONLY) + message(SEND_ERROR "${package_message}") + endif() + endif() + endforeach() +endfunction() + +foreach(executable IN LISTS cmake_commands) + test_cmake_project(NAME "release" + CMAKE_COMMAND "${executable}" + OPTIONS + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_PREFIX_PATH=SYSTEM_LIBS" # for testing VCPKG_PREFER_SYSTEM_LIBS + "-DVCPKG_PREFER_SYSTEM_LIBS=OFF" + ) + test_cmake_project(NAME "debug" + CMAKE_COMMAND "${executable}" + OPTIONS + "-DCMAKE_BUILD_TYPE=Debug" + "-DCMAKE_PREFIX_PATH=SYSTEM_LIBS" # for testing VCPKG_PREFER_SYSTEM_LIBS + "-DVCPKG_PREFER_SYSTEM_LIBS=ON" + ) +endforeach() diff --git a/externals/vcpkg/scripts/test_ports/cmake-user/project/CMakeLists.txt b/externals/vcpkg/scripts/test_ports/cmake-user/project/CMakeLists.txt new file mode 100755 index 000000000..e2a9a86f3 --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/cmake-user/project/CMakeLists.txt @@ -0,0 +1,109 @@ +cmake_minimum_required(VERSION 3.4) +project(cmake-user LANGUAGES C) + +message(STATUS "CMAKE_COMMAND: ${CMAKE_COMMAND}") +set(CHECK_CMAKE_VERSION "NOTFOUND" CACHE STRING "Version of CMake expected to be found") +if(NOT CHECK_CMAKE_VERSION) + message(WARNING "CMake version check: skipped (actual: ${CMAKE_VERSION})") +elseif(NOT CHECK_CMAKE_VERSION VERSION_EQUAL CMAKE_VERSION) + message(SEND_ERROR "CMake version check: failed (actual: ${CMAKE_VERSION} expected: ${CHECK_CMAKE_VERSION})") +else() + message(STATUS "CMake version check: success (actual: ${CMAKE_VERSION})") +endif() + +message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}") +list(FIND CMAKE_PREFIX_PATH "SYSTEM_LIBS" system_libs) +list(FIND CMAKE_PREFIX_PATH "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" vcpkg) +if(system_libs LESS 0) + message(SEND_ERROR "VCPKG_PREFER_SYSTEM_LIBS check: failed (Cannot find SYSTEM_LIBS in CMAKE_PREFIX_PATH.)") +elseif(vcpkg LESS 0) + message(SEND_ERROR "VCPKG_PREFER_SYSTEM_LIBS check: failed (Cannot find vcpkg path in CMAKE_PREFIX_PATH.") +elseif(VCPKG_PREFER_SYSTEM_LIBS AND system_libs GREATER vcpkg) + message(SEND_ERROR "VCPKG_PREFER_SYSTEM_LIBS check: failed (actual: ${VCPKG_PREFER_SYSTEM_LIBS}, but vcpkg paths are before system paths in CMAKE_PREFIX_PATH.)") +elseif(NOT VCPKG_PREFER_SYSTEM_LIBS AND system_libs LESS vcpkg) + message(SEND_ERROR "VCPKG_PREFER_SYSTEM_LIBS check: failed (actual: ${VCPKG_PREFER_SYSTEM_LIBS}, but vcpkg paths are after system paths in CMAKE_PREFIX_PATH.)") +else() + message(STATUS "VCPKG_PREFER_SYSTEM_LIBS check: success (actual: ${VCPKG_PREFER_SYSTEM_LIBS})") +endif() + +# add_library overload +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/lib.c" "int lib_unused() { return 1; }") +add_library(lib "${CMAKE_CURRENT_BINARY_DIR}/lib.c") + +# add_executable overload +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/exe.c" "int main() { return 0; }") +add_executable(exe "${CMAKE_CURRENT_BINARY_DIR}/exe.c") + +# install overload +set(X_VCPKG_APPLOCAL_DEPS_INSTALL 1) +install(TARGETS exe lib + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) + +# find_package overload and wrapper +set(FIND_PACKAGES "" CACHE STRING "List of packages to be found and used") +foreach(package ${FIND_PACKAGES}) + string(TOUPPER "${package}" package_upper) + set(CMAKE_FIND_DEBUG_MODE ON) + find_package("${package}" QUIET) + set(CMAKE_FIND_DEBUG_MODE OFF) + if(NOT ${package}_FOUND AND NOT ${package_upper}_FOUND) + message(SEND_ERROR "find_package(${package}) check: failed") + continue() + endif() + # REQUIRED changes the behaviour find_package_handle_standard_args. + find_package("${package}" REQUIRED) + message(STATUS "find_package(${package}) check: success") + + set(libraries_var "") + if(DEFINED ${package}_LIBRARIES) + set(libraries_var "${package}_LIBRARIES") + elseif(DEFINED ${package_upper}_LIBRARIES) + set(libraries_var "${package_upper}_LIBRARIES") + elseif(DEFINED ${package}_LIBRARY) + set(libraries_var "${package}_LIBRARY") + elseif(DEFINED ${package_upper}_LIBRARY) + set(libraries_var "${package_upper}_LIBRARY") + else() + message(STATUS "${package}_LIBRARY/IES: undefined") + continue() + endif() + set(libraries "${${libraries_var}}") + message(STATUS "${libraries_var}: ${libraries}") + + if(package STREQUAL "Intl" AND NOT Intl_LIBRARY) + continue() # using libintl.h from C runtime library + endif() + target_link_libraries(exe PRIVATE ${libraries}) + + set(last_keyword "") + foreach(item IN LISTS libraries) + if(item STREQUAL "optimized" OR item STREQUAL "debug") + set(last_keyword "${item}") + continue() + endif() + string(FIND "${item}" "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/" starts_with_release) + string(FIND "${item}" "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/" starts_with_debug) + if(starts_with_release EQUAL "0") + if(last_keyword STREQUAL "optimized") + # okay + elseif(last_keyword STREQUAL "debug") + message(SEND_ERROR "Release lib for 'debug' keyword: ${item}") + elseif(CMAKE_BUILD_TYPE STREQUAL "Debug") + message(SEND_ERROR "Release lib for 'Debug' build: ${item}") + endif() + elseif(starts_with_debug EQUAL "0") + if(last_keyword STREQUAL "debug") + # okay + elseif(last_keyword STREQUAL "optimized") + message(SEND_ERROR "Debug lib for 'optimized' keyword: ${item}") + elseif(CMAKE_BUILD_TYPE STREQUAL "Release") + message(SEND_ERROR "Debug lib for 'Release' build: ${item}") + endif() + endif() + set(last_keyword "") + continue() + endforeach() +endforeach() diff --git a/externals/vcpkg/scripts/test_ports/cmake-user/vcpkg.json b/externals/vcpkg/scripts/test_ports/cmake-user/vcpkg.json new file mode 100755 index 000000000..34357b6e2 --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/cmake-user/vcpkg.json @@ -0,0 +1,96 @@ +{ + "name": "cmake-user", + "version-date": "2022-04-18", + "description": "Test port to verify the vcpkg toolchain in cmake user projects", + "license": "MIT", + "default-features": [ + "ci" + ], + "features": { + "ci": { + "description": "The CI set of features to test", + "dependencies": [ + { + "name": "cmake-user", + "default-features": false, + "features": [ + "cmake-current", + "find-package" + ] + }, + { + "name": "cmake-user", + "default-features": false, + "features": [ + "cmake-3-7" + ], + "platform": "x64 & (windows | linux | osx) & !uwp" + } + ] + }, + "cmake-3-7": { + "description": "Run the tests with CMake 3.7" + }, + "cmake-current": { + "description": "Run the tests with vcpkg's current version of CMake" + }, + "find-package": { + "description": "Ports to be tested via find_package($package)", + "dependencies": [ + { + "$package": "BZip2", + "name": "bzip2" + }, + { + "$package": "CURL", + "name": "curl" + }, + { + "$package": "EXPAT", + "name": "expat" + }, + { + "$package": "Freetype", + "name": "freetype" + }, + { + "$package": "Intl", + "name": "gettext" + }, + { + "$package": "GIF", + "name": "giflib" + }, + { + "$package": "ICU", + "name": "icu" + }, + { + "$package": "JPEG", + "name": "libjpeg-turbo" + }, + { + "$package": "LibLZMA", + "name": "liblzma" + }, + { + "$package": "PNG", + "name": "libpng" + }, + { + "$package": "TIFF", + "name": "tiff" + }, + { + "$package": "wxWidgets", + "name": "wxwidgets", + "platform": "!linux" + }, + { + "$package": "ZLIB", + "name": "zlib" + } + ] + } + } +} diff --git a/externals/vcpkg/scripts/test_ports/cmake/portfile.cmake b/externals/vcpkg/scripts/test_ports/cmake/portfile.cmake new file mode 100755 index 000000000..3e7276e45 --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/cmake/portfile.cmake @@ -0,0 +1,79 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.kitware.com/ + OUT_SOURCE_PATH SOURCE_PATH + REPO cmake/cmake + REF + 8428e39ed9cddb3b7f1a6f7a58cb8617503183d2 + SHA512 + 4a40656efe5854bd6b893d0b2b86eed5df42992d080edb9c0cb2da2c55ad8dd489a85072b138947933d94ef5ba90c7a59f0a4460e3722d0f898ceefbbf74d226 + HEAD_REF master +) +set(OPTIONS) +if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP) + list(APPEND OPTIONS "-DBUILD_CursesDialog=ON") +else() + list(APPEND OPTIONS "-DBUILD_CursesDialog=OFF") +endif() + +if(VCPKG_CROSSCOMPILING) + list(APPEND OPTIONS "-DQt6CoreTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6CoreTools") + list(APPEND OPTIONS "-DQt6WidgetsTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6WidgetsTools") + list(APPEND OPTIONS "-DQt6GuiTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6GuiTools") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 AND VCPKG_TARGET_IS_WINDOWS) # Remove if PR #16111 is merged + list(APPEND OPTIONS -DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_PROCESSOR:STRING=ARM64 -DCMAKE_SYSTEM_NAME:STRING=Windows) + endif() +endif() + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(VCPKG_CXX_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_CXX_FLAGS}") + set(VCPKG_C_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_C_FLAGS}") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${OPTIONS} + -DBUILD_TESTING=OFF + #-DCMAKE_USE_SYSTEM_LIBRARIES=ON + -DCMAKE_USE_SYSTEM_LIBARCHIVE=ON + -DCMAKE_USE_SYSTEM_CURL=ON + -DCMAKE_USE_SYSTEM_EXPAT=ON + -DCMAKE_USE_SYSTEM_ZLIB=ON + -DCMAKE_USE_SYSTEM_BZIP2=ON + -DCMAKE_USE_SYSTEM_ZSTD=ON + -DCMAKE_USE_SYSTEM_FORM=ON + -DCMAKE_USE_SYSTEM_JSONCPP=ON + -DCMAKE_USE_SYSTEM_LIBRHASH=OFF # not yet in VCPKG + -DCMAKE_USE_SYSTEM_LIBUV=ON + -DBUILD_QtDialog=ON # Just to test Qt with CMake + -DCMake_QT_MAJOR_VERSION:STRING=6 +) + +vcpkg_cmake_install(ADD_BIN_TO_PATH) +vcpkg_copy_pdbs() + +if(NOT VCPKG_TARGET_IS_OSX) + set(_tools cmake cmake-gui ctest cpack) + if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND _tools cmcldeps) + endif() + if(BUILD_CURSES_DIALOG) + list(APPEND _tools ccmake) + endif() + vcpkg_copy_tools(TOOL_NAMES ${_tools} AUTO_CLEAN) +else() + # On OSX everything is within a CMake.app folder + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") + file(RENAME "${CURRENT_PACKAGES_DIR}/CMake.app" "${CURRENT_PACKAGES_DIR}/tools/CMake.app") + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/CMake.app") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/CMake.app" "${CURRENT_PACKAGES_DIR}/tools/debug/CMake.app") + endif() +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +# Handle copyright +configure_file("${SOURCE_PATH}/Copyright.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/externals/vcpkg/scripts/test_ports/cmake/vcpkg.json b/externals/vcpkg/scripts/test_ports/cmake/vcpkg.json new file mode 100755 index 000000000..89668baef --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/cmake/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "cmake", + "version-string": "3.22.2", + "description": "CMake is an open-source, cross-platform family of tools designed to build, test and package software.", + "homepage": "https://cmake.org/", + "license": "BSD-3-Clause", + "dependencies": [ + "bzip2", + "curl", + "expat", + "jsoncpp", + "libarchive", + "liblzma", + "libuv", + { + "name": "ncurses", + "platform": "!(windows | uwp)" + }, + "nghttp2", + "qtbase", + { + "name": "vcpkg-cmake", + "host": true + }, + "zlib", + "zstd" + ] +} diff --git a/externals/vcpkg/scripts/test_ports/llfio-run-tests/portfile.cmake b/externals/vcpkg/scripts/test_ports/llfio-run-tests/portfile.cmake new file mode 100755 index 000000000..065116c27 --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/llfio-run-tests/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/scripts/test_ports/llfio-run-tests/vcpkg.json b/externals/vcpkg/scripts/test_ports/llfio-run-tests/vcpkg.json new file mode 100755 index 000000000..32c0cf4a2 --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/llfio-run-tests/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "llfio-run-tests", + "version-string": "0", + "port-version": 1, + "description": "Ensures that LLFIO built with vcpkg version of dependencies produces working executables.", + "supports": "x64", + "dependencies": [ + { + "name": "llfio", + "features": [ + "run-tests" + ] + }, + { + "name": "llfio", + "features": [ + "run-tests", + "status-code" + ] + } + ] +} diff --git a/externals/vcpkg/scripts/test_ports/outcome-run-tests/portfile.cmake b/externals/vcpkg/scripts/test_ports/outcome-run-tests/portfile.cmake new file mode 100755 index 000000000..065116c27 --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/outcome-run-tests/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/externals/vcpkg/scripts/test_ports/outcome-run-tests/vcpkg.json b/externals/vcpkg/scripts/test_ports/outcome-run-tests/vcpkg.json new file mode 100755 index 000000000..8a203953a --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/outcome-run-tests/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "outcome-run-tests", + "version-string": "0", + "port-version": 1, + "description": "Ensures that outcome built with vcpkg version of dependencies produces working executables.", + "supports": "x64", + "dependencies": [ + { + "name": "outcome", + "features": [ + "run-tests" + ] + } + ] +} diff --git a/externals/vcpkg/scripts/test_ports/unit-test-cmake/portfile.cmake b/externals/vcpkg/scripts/test_ports/unit-test-cmake/portfile.cmake new file mode 100755 index 000000000..96cc06f63 --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/unit-test-cmake/portfile.cmake @@ -0,0 +1,153 @@ +function(set_fatal_error err) + set(Z_VCPKG_UNIT_TEST_HAS_FATAL_ERROR "ON" CACHE BOOL "" FORCE) + set(Z_VCPKG_UNIT_TEST_FATAL_ERROR "${err}" CACHE STRING "" FORCE) +endfunction() +function(unset_fatal_error) + set(Z_VCPKG_UNIT_TEST_HAS_FATAL_ERROR "OFF" CACHE BOOL "" FORCE) +endfunction() +function(set_has_error) + set(Z_VCPKG_UNIT_TEST_HAS_ERROR ON CACHE BOOL "" FORCE) +endfunction() + +macro(message level msg) + if("${level}" STREQUAL "FATAL_ERROR") + set_fatal_error("${msg}") + return() + else() + _message("${level}" "${msg}") # note: this results in incorrect printing, but that's fine + # message(STATUS "\${asdf}") will result in + # message(STATUS "${asdf}"), since that's how macro arguments work. + endif() +endmacro() + +set(Z_VCPKG_UNIT_TEST_HAS_ERROR OFF CACHE BOOL "" FORCE) +unset_fatal_error() + +# in order to allow namespacing +function(unit_test_match namespace value regex) + if("${value}" MATCHES "${regex}") + set("${namespace}_MATCHED" ON PARENT_SCOPE) + if("${CMAKE_MATCH_COUNT}" EQUAL "0") + return() + endif() + + foreach(match RANGE 1 "${CMAKE_MATCH_COUNT}") + set("${namespace}_CMAKE_MATCH_${match}" "${CMAKE_MATCH_${match}}" PARENT_SCOPE) + endforeach() + else() + set("${namespace}_MATCHED" OFF PARENT_SCOPE) + endif() +endfunction() + +function(unit_test_check_variable_unset utcvu_test utcvu_variable) + cmake_language(EVAL CODE "${utcvu_test}") + if(Z_VCPKG_UNIT_TEST_HAS_FATAL_ERROR) + unset_fatal_error() + set_has_error() + message(STATUS "${utcvu_test} had an unexpected FATAL_ERROR; + expected: \"${utcvu_value}\"") + message(STATUS "FATAL_ERROR: ${Z_VCPKG_UNIT_TEST_FATAL_ERROR}") + return() + endif() + + unit_test_match(utcvu "${utcvu_variable}" [[^(ENV|CACHE)\{(.*)\}$]]) + if(utcvu_MATCHED) + message(STATUS "utcvu_variable: ${utcvu_CMAKE_MATCH_2}") + if("${utcvu_CMAKE_MATCH_1}" STREQUAL "ENV") + set(utcvu_actual_value "$ENV{${utcvu_CMAKE_MATCH_2}}") + elseif("${utcvu_CMAKE_MATCH_1}" STREQUAL "CACHE") + set(utcvu_actual_value "$CACHE{${utcvu_CMAKE_MATCH_2}}") + else() + _message(FATAL_ERROR "unexpected value for CMAKE_MATCH_1: ${utcvu_CMAKE_MATCH_1}") + endif() + else() + set(utcvu_actual_value "${${utcvu_variable}}") + endif() + + if(DEFINED "${utcvu_variable}") + message(STATUS "${utcvu_test} set ${utcvu_variable}; + expected: \"${utcvu_variable}\" unset + actual : \"${utcvu_actual_value}\"") + set_has_error() + return() + endif() +endfunction() + +function(unit_test_check_variable_equal utcve_test utcve_variable utcve_value) + cmake_language(EVAL CODE "${utcve_test}") + if(Z_VCPKG_UNIT_TEST_HAS_FATAL_ERROR) + unset_fatal_error() + set_has_error() + message(STATUS "${utcve_test} had an unexpected FATAL_ERROR; + expected: \"${utcve_value}\"") + message(STATUS "FATAL_ERROR: ${Z_VCPKG_UNIT_TEST_FATAL_ERROR}") + return() + endif() + + if(NOT DEFINED "${utcve_variable}" AND NOT "${utcve_variable}" MATCHES "^ENV\\{") + message(STATUS "${utcve_test} failed to set ${utcve_variable}; + expected: \"${utcve_value}\"") + set_has_error() + return() + endif() + + unit_test_match(utcve "${utcve_variable}" [[^(ENV|CACHE)\{(.*)\}$]]) + if(utcve_MATCHED) + if("${utcve_CMAKE_MATCH_1}" STREQUAL "ENV") + set(utcve_actual_value "$ENV{${utcve_CMAKE_MATCH_2}}") + elseif("${utcve_CMAKE_MATCH_1}" STREQUAL "CACHE") + set(utcve_actual_value "$CACHE{${utcve_CMAKE_MATCH_2}}") + else() + _message(FATAL_ERROR "unexpected value for CMAKE_MATCH_1: ${utcve_CMAKE_MATCH_1}") + endif() + else() + set(utcve_actual_value "${${utcve_variable}}") + endif() + + if(NOT "${utcve_actual_value}" STREQUAL "${utcve_value}") + message(STATUS "${utcve_test} resulted in the wrong value for ${utcve_variable}; + expected: \"${utcve_value}\" + actual : \"${utcve_actual_value}\"") + set_has_error() + return() + endif() +endfunction() + +function(unit_test_ensure_success utcve_test) + cmake_language(EVAL CODE "${utcve_test}") + if(Z_VCPKG_UNIT_TEST_HAS_FATAL_ERROR) + set_has_error() + message(STATUS "${utcve_test} was expected to be successful.") + endif() + unset_fatal_error() +endfunction() +function(unit_test_ensure_fatal_error utcve_test) + cmake_language(EVAL CODE "${utcve_test}") + if(NOT Z_VCPKG_UNIT_TEST_HAS_FATAL_ERROR) + set_has_error() + message(STATUS "${utcve_test} was expected to be a FATAL_ERROR.") + endif() + unset_fatal_error() +endfunction() + +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +if("minimum-required" IN_LIST FEATURES) + include("${CMAKE_CURRENT_LIST_DIR}/test-vcpkg_minimum_required.cmake") +endif() +if("list" IN_LIST FEATURES) + include("${CMAKE_CURRENT_LIST_DIR}/test-vcpkg_list.cmake") +endif() +if("host-path-list" IN_LIST FEATURES) + include("${CMAKE_CURRENT_LIST_DIR}/test-vcpkg_host_path_list.cmake") +endif() +if("function-arguments" IN_LIST FEATURES) + include("${CMAKE_CURRENT_LIST_DIR}/test-z_vcpkg_function_arguments.cmake") +endif() +if("merge-libs" IN_LIST FEATURES) + include("${CMAKE_CURRENT_LIST_DIR}/test-z_vcpkg_cmake_config_fixup_merge.cmake") +endif() + +if(Z_VCPKG_UNIT_TEST_HAS_ERROR) + _message(FATAL_ERROR "At least one test failed") +endif() diff --git a/externals/vcpkg/scripts/test_ports/unit-test-cmake/test-vcpkg_host_path_list.cmake b/externals/vcpkg/scripts/test_ports/unit-test-cmake/test-vcpkg_host_path_list.cmake new file mode 100755 index 000000000..01d34da82 --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/unit-test-cmake/test-vcpkg_host_path_list.cmake @@ -0,0 +1,281 @@ +# CACHE{var} is a fatal error +unit_test_ensure_fatal_error([[vcpkg_host_path_list(APPEND CACHE{var})]]) +unit_test_ensure_fatal_error([[vcpkg_host_path_list(PREPEND CACHE{var})]]) +unit_test_ensure_fatal_error([[vcpkg_host_path_list(APPEND CACHE{var} c d)]]) +unit_test_ensure_fatal_error([[vcpkg_host_path_list(PREPEND CACHE{var} c d)]]) + +# regular variable, HOST_PATH_SEPARATOR = ';' +set(VCPKG_HOST_PATH_SEPARATOR ";") + +unit_test_ensure_fatal_error([[vcpkg_host_path_list(APPEND var "a;b")]]) +unit_test_ensure_fatal_error([[vcpkg_host_path_list(PREPEND var "a;b")]]) + +set(var "a;b") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND var d e)]] + var "a;b;d;e" +) +set(var "a;b") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND var)]] + var "a;b" +) +set(var "a;b") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND var d e)]] + var "d;e;a;b" +) +set(var "a;b") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND var)]] + var "a;b" +) + +set(var "") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND var d e)]] + var "d;e" +) +set(var "") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND var)]] + var "" +) +set(var "") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND var d e)]] + var "d;e" +) +set(var "") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND var)]] + var "" +) + +unset(var) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND var d e)]] + var "d;e" +) +unset(var) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND var)]] + var "" +) +unset(var) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND var d e)]] + var "d;e" +) +unset(var) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND var)]] + var "" +) + +# regular variable, HOST_PATH_SEPARATOR = ':' +set(VCPKG_HOST_PATH_SEPARATOR ":") + +unit_test_ensure_fatal_error([[vcpkg_host_path_list(APPEND var "a:b")]]) +unit_test_ensure_fatal_error([[vcpkg_host_path_list(PREPEND var "a:b")]]) + +set(ENV{var} "a:b") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND ENV{var} d e)]] + ENV{var} "a:b:d:e" +) +set(ENV{var} "a:b") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND ENV{var})]] + ENV{var} "a:b" +) +set(ENV{var} "a:b") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var} d e)]] + ENV{var} "d:e:a:b" +) +set(ENV{var} "a:b") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var})]] + ENV{var} "a:b" +) + +set(ENV{var} "") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND ENV{var} d e)]] + ENV{var} "d:e" +) +set(ENV{var} "") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND ENV{var})]] + ENV{var} "" +) +set(ENV{var} "") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var} d e)]] + ENV{var} "d:e" +) +set(ENV{var} "") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var})]] + ENV{var} "" +) + +unset(ENV{var}) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND ENV{var} d e)]] + ENV{var} "d:e" +) +unset(ENV{var}) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND ENV{var})]] + ENV{var} "" +) +unset(ENV{var}) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var} d e)]] + ENV{var} "d:e" +) +unset(ENV{var}) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var})]] + ENV{var} "" +) + +# environment ENV{var}iable, HOST_PATH_SEPARATOR = ';' +set(VCPKG_HOST_PATH_SEPARATOR ";") + +unit_test_ensure_fatal_error([[vcpkg_host_path_list(APPEND ENV{ENV{var}} "a;b")]]) +unit_test_ensure_fatal_error([[vcpkg_host_path_list(PREPEND ENV{ENV{var}} "a;b")]]) + +set(ENV{ENV{var}} "a;b") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND ENV{ENV{var}} d e)]] + ENV{ENV{var}} "a;b;d;e" +) +set(ENV{ENV{var}} "a;b") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND ENV{ENV{var}})]] + ENV{ENV{var}} "a;b" +) +set(ENV{ENV{var}} "a;b") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND ENV{ENV{var}} d e)]] + ENV{ENV{var}} "d;e;a;b" +) +set(ENV{ENV{var}} "a;b") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND ENV{ENV{var}})]] + ENV{ENV{var}} "a;b" +) + +set(ENV{ENV{var}} "") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND ENV{ENV{var}} d e)]] + ENV{ENV{var}} "d;e" +) +set(ENV{ENV{var}} "") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND ENV{ENV{var}})]] + ENV{ENV{var}} "" +) +set(ENV{ENV{var}} "") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND ENV{ENV{var}} d e)]] + ENV{ENV{var}} "d;e" +) +set(ENV{ENV{var}} "") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var})]] + ENV{ENV{var}} "" +) + +unset(ENV{ENV{var}}) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND ENV{ENV{var}} d e)]] + ENV{ENV{var}} "d;e" +) +unset(ENV{ENV{var}}) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND ENV{ENV{var}})]] + ENV{ENV{var}} "" +) +unset(ENV{ENV{var}}) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND ENV{ENV{var}} d e)]] + ENV{ENV{var}} "d;e" +) +unset(ENV{ENV{var}}) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND ENV{ENV{var}})]] + ENV{ENV{var}} "" +) + +# regular ENV{var}iable, HOST_PATH_SEPARATOR = ':' +set(VCPKG_HOST_PATH_SEPARATOR ":") + +unit_test_ensure_fatal_error([[vcpkg_host_path_list(APPEND ENV{var} "a:b")]]) +unit_test_ensure_fatal_error([[vcpkg_host_path_list(PREPEND ENV{var} "a:b")]]) + +set(ENV{var} "a:b") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND ENV{var} d e)]] + ENV{var} "a:b:d:e" +) +set(ENV{var} "a:b") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND ENV{var})]] + ENV{var} "a:b" +) +set(ENV{var} "a:b") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var} d e)]] + ENV{var} "d:e:a:b" +) +set(ENV{var} "a:b") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var})]] + ENV{var} "a:b" +) + +set(ENV{var} "") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND ENV{var} d e)]] + ENV{var} "d:e" +) +set(ENV{var} "") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND ENV{var})]] + ENV{var} "" +) +set(ENV{var} "") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var} d e)]] + ENV{var} "d:e" +) +set(ENV{var} "") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var})]] + ENV{var} "" +) + +unset(ENV{var}) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND ENV{var} d e)]] + ENV{var} "d:e" +) +unset(ENV{var}) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND ENV{var})]] + ENV{var} "" +) +unset(ENV{var}) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var} d e)]] + ENV{var} "d:e" +) +unset(ENV{var}) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var})]] + ENV{var} "" +) diff --git a/externals/vcpkg/scripts/test_ports/unit-test-cmake/test-vcpkg_list.cmake b/externals/vcpkg/scripts/test_ports/unit-test-cmake/test-vcpkg_list.cmake new file mode 100755 index 000000000..c0f3ac8c0 --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/unit-test-cmake/test-vcpkg_list.cmake @@ -0,0 +1,813 @@ +# vcpkg_list(SET ...) +unit_test_check_variable_equal( + [[vcpkg_list(SET lst)]] + lst "" +) +unit_test_check_variable_equal( + [[vcpkg_list(SET lst "")]] + lst "" +) +unit_test_check_variable_equal( + [[vcpkg_list(SET lst "" "")]] + lst ";" +) +unit_test_check_variable_equal( + [[vcpkg_list(SET lst a)]] + lst "a" +) +unit_test_check_variable_equal( + [[vcpkg_list(SET lst a b)]] + lst "a;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(SET lst "a;b")]] + lst [[a\;b]] +) +unit_test_check_variable_equal( + [=[vcpkg_list(SET lst "a;b" "c" [[d\;e]])]=] + lst [[a\;b;c;d\\;e]] +) + +# vcpkg_list(LENGTH ) +set(lst [[]]) +unit_test_check_variable_equal( + [[vcpkg_list(LENGTH lst out)]] + out 0 +) +set(lst [[;]]) +unit_test_check_variable_equal( + [[vcpkg_list(LENGTH lst out)]] + out 2 +) +set(lst [[a]]) +unit_test_check_variable_equal( + [[vcpkg_list(LENGTH lst out)]] + out 1 +) +set(lst [[a;b]]) +unit_test_check_variable_equal( + [[vcpkg_list(LENGTH lst out)]] + out 2 +) +set(lst [[a\\;b]]) +unit_test_check_variable_equal( + [[vcpkg_list(LENGTH lst out)]] + out 1 +) +set(lst [[a\;b;c\\;d]]) +unit_test_check_variable_equal( + [[vcpkg_list(LENGTH lst out)]] + out 2 +) + +# vcpkg_list(GET ) +set(lst "") +unit_test_ensure_fatal_error([[vcpkg_list(GET lst 0 out)]]) + +set(lst "a") +unit_test_check_variable_equal( + [[vcpkg_list(GET lst 0 out)]] + out "a" +) +unit_test_check_variable_equal( + [[vcpkg_list(GET lst -1 out)]] + out "a" +) +unit_test_ensure_fatal_error([[vcpkg_list(GET lst 2 out)]]) +unit_test_ensure_fatal_error([[vcpkg_list(GET lst -2 out)]]) + +set(lst ";b") +unit_test_check_variable_equal( + [[vcpkg_list(GET lst 0 out)]] + out "" +) +unit_test_check_variable_equal( + [[vcpkg_list(GET lst -1 out)]] + out "b" +) + +set(lst "a;b") +unit_test_check_variable_equal( + [[vcpkg_list(GET lst 0 out)]] + out "a" +) +unit_test_check_variable_equal( + [[vcpkg_list(GET lst -1 out)]] + out "b" +) + +set(lst [[a\;b;c]]) +unit_test_check_variable_equal( + [[vcpkg_list(GET lst 0 out)]] + out "a;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(GET lst -1 out)]] + out "c" +) + +set(lst [[a;b\;c;d\\;e]]) +unit_test_check_variable_equal( + [[vcpkg_list(GET lst 1 out)]] + out "b;c" +) +unit_test_check_variable_equal( + [[vcpkg_list(GET lst -1 out)]] + out [[d\;e]] +) + +# vcpkg_list(JOIN ) +set(lst "") +unit_test_check_variable_equal( + [[vcpkg_list(JOIN lst "-" out)]] + out "" +) + +set(lst "a") +unit_test_check_variable_equal( + [[vcpkg_list(JOIN lst "-" out)]] + out "a" +) + +set(lst ";") +unit_test_check_variable_equal( + [[vcpkg_list(JOIN lst "-" out)]] + out "-" +) + +set(lst [[a;b]]) +unit_test_check_variable_equal( + [[vcpkg_list(JOIN lst "-" out)]] + out [[a-b]] +) +unit_test_check_variable_equal( + [[vcpkg_list(JOIN lst "+" out)]] + out [[a+b]] +) + +set(lst [[a;b\;c\\;d]]) +unit_test_check_variable_equal( + [[vcpkg_list(JOIN lst "-" out)]] + out [[a-b;c\;d]] +) + +# vcpkg_list(SUBLIST ) +set(lst "") +unit_test_check_variable_equal( + [[vcpkg_list(SUBLIST lst 0 0 out)]] + out "" +) +unit_test_check_variable_equal( + [[vcpkg_list(SUBLIST lst 0 1 out)]] + out "" +) +unit_test_ensure_fatal_error([[vcpkg_list(SUBLIST lst 1 0 out)]]) + +set(lst "a") +unit_test_check_variable_equal( + [[vcpkg_list(SUBLIST lst 0 0 out)]] + out "" +) +unit_test_check_variable_equal( + [[vcpkg_list(SUBLIST lst 0 1 out)]] + out "a" +) +unit_test_ensure_fatal_error([[vcpkg_list(SUBLIST lst 2 0 out)]]) +unit_test_ensure_fatal_error([[vcpkg_list(SUBLIST lst 2 1 out)]]) + +set(lst ";;") +unit_test_check_variable_equal( + [[vcpkg_list(SUBLIST lst 0 0 out)]] + out "" +) +unit_test_check_variable_equal( + [[vcpkg_list(SUBLIST lst 0 1 out)]] + out "" +) +unit_test_check_variable_equal( + [[vcpkg_list(SUBLIST lst 0 2 out)]] + out ";" +) +unit_test_check_variable_equal( + [[vcpkg_list(SUBLIST lst 0 3 out)]] + out ";;" +) + +set(lst "a;b;c;d") +unit_test_check_variable_equal( + [[vcpkg_list(SUBLIST lst 1 2 out)]] + out "b;c" +) + +set(lst [[a\;b;c\;d;e]]) +unit_test_check_variable_equal( + [[vcpkg_list(SUBLIST lst 1 2 out)]] + out [[c\;d;e]] +) + +set(lst [[a\;b;c\\;d;e;f;g;h]]) +unit_test_check_variable_equal( + [[vcpkg_list(SUBLIST lst 1 -1 out)]] + out [[c\\;d;e;f;g;h]] +) + +# vcpkg_list(FIND ) +set(lst "") +unit_test_check_variable_equal( + [[vcpkg_list(FIND lst "a" out)]] + out -1 +) + +set(lst "b") +unit_test_check_variable_equal( + [[vcpkg_list(FIND lst "a" out)]] + out -1 +) + +set(lst "a;b") +unit_test_check_variable_equal( + [[vcpkg_list(FIND lst "a" out)]] + out 0 +) +unit_test_check_variable_equal( + [[vcpkg_list(FIND lst b out)]] + out 1 +) + +set(lst ";b") +unit_test_check_variable_equal( + [[vcpkg_list(FIND lst "" out)]] + out 0 +) +unit_test_check_variable_equal( + [[vcpkg_list(FIND lst b out)]] + out 1 +) + +set(lst [[a\;b;c]]) +unit_test_check_variable_equal( + [[vcpkg_list(FIND lst "a;b" out)]] + out 0 +) +unit_test_check_variable_equal( + [[vcpkg_list(FIND lst c out)]] + out 1 +) +unit_test_check_variable_equal( + [[vcpkg_list(FIND lst a out)]] + out -1 +) + +set(lst [[a\\;b;c]]) +unit_test_check_variable_equal( + [=[vcpkg_list(FIND lst [[a\;b]] out)]=] + out 0 +) + +# vcpkg_list(APPEND [...]) +set(lst "") +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst)]] + lst [[]] +) +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst "")]] + lst "" +) +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst "" "")]] + lst ";" +) +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst a)]] + lst "a" +) + +set(lst ";") +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst)]] + lst ";" +) +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst "")]] + lst ";;" +) +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst b)]] + lst ";;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst "b;c" d)]] + lst [[;;b\;c;d]] +) + +set(lst "a") +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst)]] + lst "a" +) +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst "")]] + lst "a;" +) +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst b)]] + lst "a;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst "b;c" d)]] + lst [[a;b\;c;d]] +) + +set(lst "a;b") +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst)]] + lst "a;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst "")]] + lst "a;b;" +) +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst c)]] + lst "a;b;c" +) +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst "c;d" e)]] + lst [[a;b;c\;d;e]] +) +unit_test_check_variable_equal( + [=[vcpkg_list(APPEND lst [[c\;d]])]=] + lst [[a;b;c\\;d]] +) + +# vcpkg_list(PREPEND [...]) +set(lst "") +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst)]] + lst "" +) +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst "")]] + lst "" +) +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst "" "")]] + lst ";" +) +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst a)]] + lst "a" +) + +set(lst ";") +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst)]] + lst ";" +) +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst "")]] + lst ";;" +) +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst b)]] + lst "b;;" +) +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst "b;c" d)]] + lst [[b\;c;d;;]] +) + +set(lst "a") +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst)]] + lst "a" +) +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst "")]] + lst ";a" +) +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst b)]] + lst "b;a" +) +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst "b;c" d)]] + lst [[b\;c;d;a]] +) + +set(lst "a;b") +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst)]] + lst "a;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst "")]] + lst ";a;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst c)]] + lst "c;a;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst "c;d" e)]] + lst [[c\;d;e;a;b]] +) +unit_test_check_variable_equal( + [=[vcpkg_list(PREPEND lst [[c\;d]])]=] + lst [[c\\;d;a;b]] +) + +# list(INSERT [...]) +set(lst "") +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 0)]] + lst "" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 0 "")]] + lst "" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 0 "" "")]] + lst ";" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 0 "a")]] + lst "a" +) +unit_test_ensure_fatal_error([[vcpkg_list(INSERT lst 1 "")]]) +unit_test_ensure_fatal_error([[vcpkg_list(INSERT lst -1 "")]]) + +set(lst ";") +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 0)]] + lst ";" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 1)]] + lst ";" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 1 "")]] + lst ";;" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 0 b)]] + lst "b;;" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 1 b)]] + lst ";b;" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 2 b)]] + lst ";;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst -1 "b;c" d)]] + lst [[;b\;c;d;]] +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst -2 "b;c" d)]] + lst [[b\;c;d;;]] +) +unit_test_ensure_fatal_error([[vcpkg_list(INSERT lst 3 "")]]) +unit_test_ensure_fatal_error([[vcpkg_list(INSERT lst -3 "")]]) + +set(lst "a;b") +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst -1 c)]] + lst "a;c;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 1 c)]] + lst "a;c;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 2 c)]] + lst "a;b;c" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst -2 c)]] + lst "c;a;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 1 "c;d")]] + lst [[a;c\;d;b]] +) +unit_test_check_variable_equal( + [=[vcpkg_list(INSERT lst 1 [[c\;d]] e)]=] + lst [[a;c\\;d;e;b]] +) + +# vcpkg_list(POP_BACK ) +set(lst "") +unit_test_check_variable_equal( + [[vcpkg_list(POP_BACK lst)]] + lst "" +) + +set(lst ";") +unit_test_check_variable_equal( + [[vcpkg_list(POP_BACK lst)]] + lst "" +) + +set(lst "a;b") +unit_test_check_variable_equal( + [[vcpkg_list(POP_BACK lst)]] + lst "a" +) + +set(lst "a;;b") +unit_test_check_variable_equal( + [[vcpkg_list(POP_BACK lst)]] + lst "a;" +) + +set(lst [[a\;b]]) +unit_test_check_variable_equal( + [[vcpkg_list(POP_BACK lst)]] + lst "" +) + +set(lst [[c;a\;b;c]]) +unit_test_check_variable_equal( + [[vcpkg_list(POP_BACK lst)]] + lst [[c;a\;b]] +) + +# vcpkg_list(POP_FRONT ) +set(lst "") +unit_test_check_variable_equal( + [[vcpkg_list(POP_BACK lst)]] + lst "" +) + +set(lst ";") +unit_test_check_variable_equal( + [[vcpkg_list(POP_FRONT lst)]] + lst "" +) + +set(lst "a;b") +unit_test_check_variable_equal( + [[vcpkg_list(POP_FRONT lst)]] + lst "b" +) + +set(lst "a;;b") +unit_test_check_variable_equal( + [[vcpkg_list(POP_FRONT lst)]] + lst ";b" +) + +set(lst [[a\;b]]) +unit_test_check_variable_equal( + [[vcpkg_list(POP_FRONT lst)]] + lst "" +) + +set(lst [[c;a\;b;c]]) +unit_test_check_variable_equal( + [[vcpkg_list(POP_FRONT lst)]] + lst [[a\;b;c]] +) + +# vcpkg_list(REMOVE_DUPLICATES ) +set(lst ";") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_DUPLICATES lst)]] + lst "" +) + +set(lst "a;b") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_DUPLICATES lst)]] + lst "a;b" +) + +set(lst "a;a;b") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_DUPLICATES lst)]] + lst "a;b" +) + +set(lst "a;b;a") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_DUPLICATES lst)]] + lst "a;b" +) + +set(lst "c;a;b;a;c") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_DUPLICATES lst)]] + lst "c;a;b" +) + +set(lst "a;;b") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_DUPLICATES lst)]] + lst "a;;b" +) + +set(lst [[a\;b;a\;b]]) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_DUPLICATES lst)]] + lst [[a\;b]] +) + +set(lst [[c;a\;b;c]]) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_DUPLICATES lst)]] + lst [[c;a\;b]] +) + +# vcpkg_list(REVERSE ) +set(lst "") +unit_test_check_variable_equal( + [[vcpkg_list(REVERSE lst)]] + lst "" +) +set(lst ";") +unit_test_check_variable_equal( + [[vcpkg_list(REVERSE lst)]] + lst ";" +) +set(lst "a;b") +unit_test_check_variable_equal( + [[vcpkg_list(REVERSE lst)]] + lst "b;a" +) +set(lst "a;b;c;d;e;f;g") +unit_test_check_variable_equal( + [[vcpkg_list(REVERSE lst)]] + lst "g;f;e;d;c;b;a" +) + +set(lst [[a\;b;a\;b\\;c]]) +unit_test_check_variable_equal( + [[vcpkg_list(REVERSE lst)]] + lst [[a\;b\\;c;a\;b]] +) +set(lst [[c;a\;b]]) +unit_test_check_variable_equal( + [[vcpkg_list(REVERSE lst)]] + lst [[a\;b;c]] +) + +# vcpkg_list(REMOVE_ITEM ) +set(lst "") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst "a")]] + lst "" +) + +set(lst ";") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst "")]] + lst "" +) + +set(lst "a;b") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst a)]] + lst "b" +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst b)]] + lst "a" +) + +set(lst "a;a;b") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst a)]] + lst "b" +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst b)]] + lst "a;a" +) + +set(lst "a;b;c;a;d") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst b)]] + lst "a;c;a;d" +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst a)]] + lst "b;c;d" +) + +set(lst "a;;b") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst "")]] + lst "a;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst a)]] + lst ";b" +) + +set(lst [[e;a\;b;c\;d]]) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst "a;b")]] + lst [[e;c\;d]] +) + +set(lst [[c;a\;b;c]]) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst "c")]] + lst [[a\;b]] +) + +set(lst [[c;a\\;b;c]]) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst "a\\;b")]] + lst [[c;c]] +) + +# vcpkg_list(REMOVE_AT ) +set(lst "") +unit_test_ensure_fatal_error([[vcpkg_list(REMOVE_AT lst 0)]]) + +set(lst ";") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst 0)]] + lst "" +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst 1)]] + lst "" +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst -1)]] + lst "" +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst -2)]] + lst "" +) +unit_test_ensure_fatal_error([[vcpkg_list(REMOVE_AT lst 2)]]) +unit_test_ensure_fatal_error([[vcpkg_list(REMOVE_AT lst -3)]]) + +set(lst "a;b") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst 0)]] + lst "b" +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst 1)]] + lst "a" +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst -1)]] + lst "a" +) + +set(lst "a;;b") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst 0)]] + lst ";b" +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst 1)]] + lst "a;b" +) + +set(lst [[e;a\;b;c\;d]]) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst 0)]] + lst [[a\;b;c\;d]] +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst 1)]] + lst [[e;c\;d]] +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst -1)]] + lst [[e;a\;b]] +) + +set(lst [[c;a\\;b;c\;d;e]]) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst 0)]] + lst [[a\\;b;c\;d;e]] +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst 1)]] + lst [[c;c\;d;e]] +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst 2)]] + lst [[c;a\\;b;e]] +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst 3)]] + lst [[c;a\\;b;c\;d]] +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst -1)]] + lst [[c;a\\;b;c\;d]] +) diff --git a/externals/vcpkg/scripts/test_ports/unit-test-cmake/test-vcpkg_minimum_required.cmake b/externals/vcpkg/scripts/test_ports/unit-test-cmake/test-vcpkg_minimum_required.cmake new file mode 100755 index 000000000..93bfbcfaa --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/unit-test-cmake/test-vcpkg_minimum_required.cmake @@ -0,0 +1,49 @@ +# -- error cases -- +# VCPKG_BASE_VERSION not set - vcpkg version is too old +set(VCPKG_BASE_VERSION_backup "${VCPKG_BASE_VERSION}") +unset(VCPKG_BASE_VERSION) +unset(VCPKG_BASE_VERSION CACHE) +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION 2021-01-01)]]) +unit_test_ensure_fatal_error([[vcpkg_minimum_required()]]) +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION "")]]) +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION "2021.01.01")]]) + +set(VCPKG_BASE_VERSION 2021-02-02) + +# VERSION not passed +unit_test_ensure_fatal_error([[vcpkg_minimum_required()]]) +# VERSION weird - empty +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION "")]]) +# VERSION weird - dotted +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION 2021.01.01)]]) +# VERSION weird - not a valid year +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION 3000-01-01)]]) +# VERSION weird - list +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION "2021-01-01;2021-01-02")]]) +# VERSION weird - small year +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION 21-01-01)]]) +# VERSION weird - small month +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION 2021-1-01)]]) +# VERSION weird - small day +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION 2021-01-1)]]) +# VERSION too-new - later year, earlier month, earlier day +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION 2022-01-01)]]) +# VERSION too-new - same year, later month, earlier day +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION 2021-03-01)]]) +# VERSION too-new - same year, same month, later day +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION 2021-02-03)]]) + +# -- successes -- +# same date +unit_test_ensure_success([[vcpkg_minimum_required(VERSION 2021-02-02)]]) + +# VERSION old - earlier year, later month, later day +unit_test_ensure_success([[vcpkg_minimum_required(VERSION 2020-03-03)]]) +# VERSION old - same year, earlier month, later day +unit_test_ensure_success([[vcpkg_minimum_required(VERSION 2021-01-03)]]) +# VERSION old - same year, same month, earlier day +unit_test_ensure_success([[vcpkg_minimum_required(VERSION 2021-02-01)]]) + +# reset to backup +unset(VCPKG_BASE_VERSION) +set(VCPKG_BASE_VERSION "${VCPKG_BASE_VERSION_backup}" CACHE STRING "") diff --git a/externals/vcpkg/scripts/test_ports/unit-test-cmake/test-z_vcpkg_cmake_config_fixup_merge.cmake b/externals/vcpkg/scripts/test_ports/unit-test-cmake/test-z_vcpkg_cmake_config_fixup_merge.cmake new file mode 100755 index 000000000..8809af46f --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/unit-test-cmake/test-z_vcpkg_cmake_config_fixup_merge.cmake @@ -0,0 +1,56 @@ +# z_vcpkg_cmake_config_fixup_merge( ) +set(release_libs namespace::C++_shared) +set(debug_libs namespace::C++_shared) +unit_test_check_variable_equal( + [[z_vcpkg_cmake_config_fixup_merge(merged release_libs debug_libs)]] + merged "namespace::C++_shared" +) + +set(release_libs A) +set(debug_libs B) +unit_test_check_variable_equal( + [[z_vcpkg_cmake_config_fixup_merge(merged release_libs debug_libs)]] + merged [[\$<\$>:A>;\$<\$:B>]] +) + +set(release_libs A B) +set(debug_libs A ) +unit_test_check_variable_equal( + [[z_vcpkg_cmake_config_fixup_merge(merged release_libs debug_libs)]] + merged [[A;\$<\$>:B>]] +) + +set(release_libs A ) +set(debug_libs A B) +unit_test_check_variable_equal( + [[z_vcpkg_cmake_config_fixup_merge(merged release_libs debug_libs)]] + merged [[A;\$<\$:B>]] +) + +set(release_libs A C) +set(debug_libs C) +unit_test_check_variable_equal( + [[z_vcpkg_cmake_config_fixup_merge(merged release_libs debug_libs)]] + merged [[\$<\$>:A>;\$<\$:C>;\$<\$>:C>]] +) + +set(release_libs [[\$<\$>:A>;\$<\$:B>]]) +set(debug_libs [[\$<\$>:A>;\$<\$:B>]]) +unit_test_check_variable_equal( + [[z_vcpkg_cmake_config_fixup_merge(merged release_libs debug_libs)]] + merged [[\$<\$>:A>;\$<\$:B>]] +) + +set(release_libs optimized o1 debug d1) +set(debug_libs optimized o2 debug d2) +unit_test_check_variable_equal( + [[z_vcpkg_cmake_config_fixup_merge(merged release_libs debug_libs)]] + merged [[\$<\$>:o1>;\$<\$:d2>]] +) + +set(release_libs debug d1 optimized o1) +set(debug_libs debug d2 optimized o2) +unit_test_check_variable_equal( + [[z_vcpkg_cmake_config_fixup_merge(merged release_libs debug_libs)]] + merged [[\$<\$:d2>;\$<\$>:o1>]] +) diff --git a/externals/vcpkg/scripts/test_ports/unit-test-cmake/test-z_vcpkg_function_arguments.cmake b/externals/vcpkg/scripts/test_ports/unit-test-cmake/test-z_vcpkg_function_arguments.cmake new file mode 100755 index 000000000..e88eb683f --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/unit-test-cmake/test-z_vcpkg_function_arguments.cmake @@ -0,0 +1,63 @@ +# these both set `args` in the top level +function(check_function_args start) + z_vcpkg_function_arguments(out "${start}") + set(args "${out}" PARENT_SCOPE) +endfunction() +function(check_all_function_args) + z_vcpkg_function_arguments(out) + set(args "${out}" PARENT_SCOPE) +endfunction() + +unit_test_ensure_fatal_error([[check_function_args(-1)]]) +unit_test_ensure_fatal_error([[check_function_args(3)]]) +unit_test_ensure_fatal_error([[check_function_args(notanumber)]]) +unit_test_check_variable_equal( + [[check_all_function_args()]] + args "" +) +unit_test_check_variable_equal( + [[check_all_function_args("")]] + args "" +) +unit_test_check_variable_equal( + [[check_all_function_args("" "")]] + args ";" +) +unit_test_check_variable_equal( + [[check_all_function_args("" "" "" "")]] + args ";;;" +) + +unit_test_check_variable_equal( + [[check_all_function_args(a b c)]] + args "a;b;c" +) +unit_test_check_variable_equal( + [[check_function_args(2 a b c)]] + args "b;c" +) +unit_test_check_variable_equal( + [[check_function_args(3 a b c)]] + args "c" +) + +unit_test_check_variable_equal( + [=[check_all_function_args("a;b" [[c\;d]] e)]=] + args [[a\;b;c\\;d;e]] +) +unit_test_check_variable_equal( + [=[check_all_function_args("a;b" [[c\;d]] [[e\\;f]])]=] + args [[a\;b;c\\;d;e\\\;f]] +) +unit_test_check_variable_equal( + [=[check_function_args(2 "a;b" [[c\;d]] e)]=] + args [[c\\;d;e]] +) +unit_test_check_variable_equal( + [=[check_function_args(3 "a;b" [[c\;d]] e)]=] + args "e" +) +unit_test_check_variable_equal( + [=[check_function_args(4 "a;b" [[c\;d]] e)]=] + args "" +) diff --git a/externals/vcpkg/scripts/test_ports/unit-test-cmake/vcpkg.json b/externals/vcpkg/scripts/test_ports/unit-test-cmake/vcpkg.json new file mode 100755 index 000000000..32696b440 --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/unit-test-cmake/vcpkg.json @@ -0,0 +1,36 @@ +{ + "name": "unit-test-cmake", + "version-string": "0", + "description": "Ensures that the CMake scripts are unit tested.", + "supports": "x64", + "default-features": [ + "function-arguments", + "host-path-list", + "list", + "merge-libs", + "minimum-required" + ], + "features": { + "function-arguments": { + "description": "Test the z_vcpkg_function_arguments function" + }, + "host-path-list": { + "description": "Test the vcpkg_host_path_list function" + }, + "list": { + "description": "Test the vcpkg_list function" + }, + "merge-libs": { + "description": "Test the z_vcpkg_cmake_config_fixup_merge_lists function", + "dependencies": [ + { + "name": "vcpkg-cmake-config", + "host": true + } + ] + }, + "minimum-required": { + "description": "Test the vcpkg_minimum_required function" + } + } +} diff --git a/externals/vcpkg/scripts/test_ports/vcpkg-acquire-msys-test/portfile.cmake b/externals/vcpkg/scripts/test_ports/vcpkg-acquire-msys-test/portfile.cmake new file mode 100755 index 000000000..7095dc682 --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/vcpkg-acquire-msys-test/portfile.cmake @@ -0,0 +1,3 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_acquire_msys(MSYS_ROOT Z_ALL_PACKAGES) diff --git a/externals/vcpkg/scripts/test_ports/vcpkg-acquire-msys-test/vcpkg.json b/externals/vcpkg/scripts/test_ports/vcpkg-acquire-msys-test/vcpkg.json new file mode 100755 index 000000000..808294bbc --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/vcpkg-acquire-msys-test/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "vcpkg-acquire-msys-test", + "version-string": "0", + "port-version": 1, + "description": "Test port to exercise vcpkg_acquire_msys", + "supports": "x86 & windows" +} diff --git a/externals/vcpkg/scripts/test_ports/vcpkg-ci-boost/portfile.cmake b/externals/vcpkg/scripts/test_ports/vcpkg-ci-boost/portfile.cmake new file mode 100755 index 000000000..0015715fb --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/vcpkg-ci-boost/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/externals/vcpkg/scripts/test_ports/vcpkg-ci-boost/vcpkg.json b/externals/vcpkg/scripts/test_ports/vcpkg-ci-boost/vcpkg.json new file mode 100755 index 000000000..c8c19f49e --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/vcpkg-ci-boost/vcpkg.json @@ -0,0 +1,65 @@ +{ + "name": "vcpkg-ci-boost", + "version": "1", + "description": "Boost features testing within CI.", + "dependencies": [ + { + "name": "boost", + "default-features": false, + "features": [ + "mpi" + ] + }, + { + "name": "boost-asio", + "default-features": false, + "features": [ + "ssl" + ] + }, + { + "name": "boost-fiber", + "default-features": false, + "features": [ + "numa" + ] + }, + { + "name": "boost-locale", + "default-features": false, + "features": [ + "icu" + ] + }, + { + "name": "boost-mpi", + "default-features": false, + "features": [ + "python3" + ], + "platform": "!static" + }, + { + "name": "boost-odeint", + "default-features": false, + "features": [ + "mpi" + ] + }, + { + "name": "boost-python", + "default-features": false, + "features": [ + "python2", + "python3" + ] + }, + { + "name": "boost-regex", + "default-features": false, + "features": [ + "icu" + ] + } + ] +} diff --git a/externals/vcpkg/scripts/test_ports/vcpkg-ci-ffmpeg/portfile.cmake b/externals/vcpkg/scripts/test_ports/vcpkg-ci-ffmpeg/portfile.cmake new file mode 100755 index 000000000..0015715fb --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/vcpkg-ci-ffmpeg/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/externals/vcpkg/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json b/externals/vcpkg/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json new file mode 100755 index 000000000..48c23accf --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json @@ -0,0 +1,145 @@ +{ + "name": "vcpkg-ci-ffmpeg", + "version-string": "1", + "port-version": 1, + "description": "Port to force features of certain ports within CI", + "homepage": "https://github.com/microsoft/vcpkg", + "dependencies": [ + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "avcodec", + "avdevice", + "avfilter", + "avformat", + "avresample", + "bzip2", + "fdk-aac", + "freetype", + "gpl", + "iconv", + "lzma", + "mp3lame", + "nonfree", + "openjpeg", + "openssl", + "opus", + "postproc", + "snappy", + "soxr", + "speex", + "swresample", + "swscale", + "theora", + "vorbis", + "vpx", + "webp", + "xml2", + "zlib" + ] + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "alsa" + ], + "platform": "linux" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "sdl2" + ], + "platform": "!osx" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "ass", + "fontconfig", + "fribidi", + "modplug", + "opencl", + "openh264" + ], + "platform": "!uwp" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "ilbc" + ], + "platform": "!(arm & uwp)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "ssh", + "x265" + ], + "platform": "!(uwp | arm)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "x264" + ], + "platform": "!(arm & windows)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "aom" + ], + "platform": "!(windows & arm & !uwp)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "dav1d" + ], + "platform": "!(uwp | arm | x86 | osx)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "opengl" + ], + "platform": "!uwp & !(arm64 & windows)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "avisynthplus" + ], + "platform": "windows & !arm & !uwp & !static" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "tesseract" + ], + "platform": "!(windows & arm) & !static & !uwp" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "nvcodec" + ], + "platform": "linux | (!osx & !uwp & !(arm64 & windows))" + } + ] +} diff --git a/externals/vcpkg/scripts/test_ports/vcpkg-ci-llvm/portfile.cmake b/externals/vcpkg/scripts/test_ports/vcpkg-ci-llvm/portfile.cmake new file mode 100755 index 000000000..0015715fb --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/vcpkg-ci-llvm/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/externals/vcpkg/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json b/externals/vcpkg/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json new file mode 100755 index 000000000..eb563a511 --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json @@ -0,0 +1,47 @@ +{ + "name": "vcpkg-ci-llvm", + "version-string": "0", + "description": "LLVM features testing within CI.", + "license": null, + "supports": "!uwp & !(arm & windows)", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "bolt", + "clang", + "disable-assertions", + "disable-clang-static-analyzer", + "enable-abi-breaking-checks", + "enable-bindings", + "enable-eh", + "enable-rtti", + "enable-terminfo", + "enable-threads", + "enable-zlib", + "lld", + "lldb", + "openmp", + "polly", + "target-aarch64", + "target-amdgpu", + "target-arm", + "target-webassembly", + "target-x86", + "tools" + ] + }, + { + "$comment": "Only for osx artifact upload in CI succeeds when these features are enabled", + "name": "llvm", + "default-features": false, + "features": [ + "flang", + "target-all", + "utils" + ], + "platform": "osx" + } + ] +} diff --git a/externals/vcpkg/scripts/test_ports/vcpkg-ci-opencv/portfile.cmake b/externals/vcpkg/scripts/test_ports/vcpkg-ci-opencv/portfile.cmake new file mode 100755 index 000000000..0015715fb --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/vcpkg-ci-opencv/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/externals/vcpkg/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json b/externals/vcpkg/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json new file mode 100755 index 000000000..6250e5755 --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json @@ -0,0 +1,74 @@ +{ + "name": "vcpkg-ci-opencv", + "version-string": "1", + "port-version": 5, + "description": "Port to force features of certain ports within CI", + "homepage": "https://github.com/microsoft/vcpkg", + "dependencies": [ + { + "name": "opencv", + "default-features": false, + "features": [ + "ade", + "contrib", + "dnn", + "eigen", + "ffmpeg", + "jpeg", + "nonfree", + "png", + "quirc", + "tiff", + "webp" + ] + }, + { + "name": "opencv", + "default-features": false, + "features": [ + "gtk", + "dc1394" + ], + "platform": "linux" + }, + { + "name": "opencv", + "default-features": false, + "features": [ + "cuda", + "cudnn", + "gstreamer", + "halide", + "ovis", + "tbb" + ], + "platform": "windows & x64 & !static & !uwp" + }, + { + "name": "opencv", + "default-features": false, + "features": [ + "freetype", + "gdcm", + "ipp", + "jasper", + "lapack", + "openexr", + "opengl", + "openmp", + "qt", + "sfm", + "vtk" + ], + "platform": "!uwp & !(windows & (arm | arm64))" + }, + { + "name": "opencv", + "default-features": false, + "features": [ + "python" + ], + "platform": "!uwp" + } + ] +} diff --git a/externals/vcpkg/scripts/test_ports/vcpkg-ci-paraview/portfile.cmake b/externals/vcpkg/scripts/test_ports/vcpkg-ci-paraview/portfile.cmake new file mode 100755 index 000000000..0015715fb --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/vcpkg-ci-paraview/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/externals/vcpkg/scripts/test_ports/vcpkg-ci-paraview/vcpkg.json b/externals/vcpkg/scripts/test_ports/vcpkg-ci-paraview/vcpkg.json new file mode 100755 index 000000000..cc1e43306 --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/vcpkg-ci-paraview/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "vcpkg-ci-paraview", + "version-string": "1", + "port-version": 3, + "description": "Port to force features of certain ports within CI", + "homepage": "https://github.com/microsoft/vcpkg", + "dependencies": [ + { + "name": "paraview", + "default-features": false, + "features": [ + "tools" + ], + "platform": "x86 & windows" + }, + { + "name": "paraview", + "default-features": false, + "features": [ + "tools", + "vtkm" + ], + "platform": "!(x86 & windows)" + } + ] +} diff --git a/externals/vcpkg/scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake b/externals/vcpkg/scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake new file mode 100755 index 000000000..d301fa74a --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake @@ -0,0 +1,34 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_check_features(OUT_FEATURE_OPTIONS OPTIONS + FEATURES + wxrc USE_WXRC +) + +vcpkg_cmake_configure( + SOURCE_PATH "${CURRENT_INSTALLED_DIR}/share/wxwidgets/example" + DISABLE_PARALLEL_CONFIGURE # Need separate dbg log for following test + OPTIONS + ${OPTIONS} + -DCMAKE_CONFIG_RUN=1 + "-DPRINT_VARS=CMAKE_CONFIG_RUN;wxWidgets_LIBRARIES" +) +vcpkg_cmake_build() + +if(NOT VCPKG_BUILD_TYPE) + # Check that debug libs are still used after re-configuration, #24489 + set(config_log "config-${TARGET_TRIPLET}-dbg") + vcpkg_execute_required_process( + COMMAND "${CMAKE_COMMAND}" -DCMAKE_CONFIG_RUN=2 . + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + LOGNAME "${config_log}-2" + ) + file(STRINGS "${CURRENT_BUILDTREES_DIR}/${config_log}-out.log" expected REGEX "wxWidgets_LIBRARIES:=") + file(STRINGS "${CURRENT_BUILDTREES_DIR}/${config_log}-2-out.log" actual REGEX "wxWidgets_LIBRARIES:=") + if(NOT actual STREQUAL expected) + message(FATAL_ERROR "wxWidgets libraries changed after CMake re-run\n" + "actual:\n${actual}\n" + "expected:\n ${expected}\n" + ) + endif() +endif() diff --git a/externals/vcpkg/scripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json b/externals/vcpkg/scripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json new file mode 100755 index 000000000..188d1069d --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json @@ -0,0 +1,38 @@ +{ + "name": "vcpkg-ci-wxwidgets", + "version-date": "2022-04-05", + "description": "Builds a GUI app in order to validate the wxwidgets port.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "wxwidgets", + "features": [ + "example" + ] + } + ], + "default-features": [ + "default-features" + ], + "features": { + "default-features": { + "description": "Default features depending on system", + "dependencies": [ + { + "name": "vcpkg-ci-wxwidgets", + "default-features": false, + "features": [ + "wxrc" + ], + "platform": "native" + } + ] + }, + "wxrc": { + "description": "Test wxrc" + } + } +} diff --git a/externals/vcpkg/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake b/externals/vcpkg/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake new file mode 100755 index 000000000..88a4856c5 --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake @@ -0,0 +1,21 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +if(CMAKE_HOST_WIN32) + foreach(PROG GO JOM NASM PERL YASM GIT PYTHON3 PYTHON2 RUBY 7Z NUGET FLEX BISON GPERF GASPREPROCESSOR DARK SCONS SWIG DOXYGEN ARIA2 PKGCONFIG) + vcpkg_find_acquire_program(${PROG}) + foreach(SUBPROG IN LISTS ${PROG}) + if(NOT EXISTS "${SUBPROG}") + message(FATAL_ERROR "Program ${SUBPROG} did not exist.") + endif() + endforeach() + endforeach() +endif() + +foreach(PROG GN NINJA MESON BAZEL) + vcpkg_find_acquire_program(${PROG}) + foreach(SUBPROG IN LISTS ${PROG}) + if(NOT EXISTS "${SUBPROG}") + message(FATAL_ERROR "Program ${SUBPROG} did not exist.") + endif() + endforeach() +endforeach() diff --git a/externals/vcpkg/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json b/externals/vcpkg/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json new file mode 100755 index 000000000..987003b4c --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "vcpkg-find-acquire-program", + "version-string": "0", + "port-version": 1, + "description": "Test port to exercise vcpkg_find_acquire_program", + "supports": "windows" +} diff --git a/externals/vcpkg/scripts/test_ports/vcpkg-from-git-test/portfile.cmake b/externals/vcpkg/scripts/test_ports/vcpkg-from-git-test/portfile.cmake new file mode 100755 index 000000000..b4c2a2243 --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/vcpkg-from-git-test/portfile.cmake @@ -0,0 +1,193 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(git_remote "${CURRENT_BUILDTREES_DIR}/test-git-repo") +file(REMOVE_RECURSE "${git_remote}") + +vcpkg_find_acquire_program(GIT) +vcpkg_list(SET git_config + -c core.autocrlf=false + -c user.email=vcpkg@example.com + -c user.name=vcpkg +) + +vcpkg_list(SET git ${GIT} ${git_config}) + +vcpkg_execute_required_process( + COMMAND ${git} init "${git_remote}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "git-init" +) +vcpkg_execute_required_process( + COMMAND ${git} config uploadpack.allowReachableSHA1InWant true + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git-config" +) +vcpkg_execute_required_process( + COMMAND ${git} checkout -b main + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git-new-branch" +) + +file(WRITE "${git_remote}/README.txt" "first commit") +vcpkg_execute_required_process( + COMMAND ${git} add "${git_remote}/README.txt" + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git-add.1" +) +vcpkg_execute_required_process( + COMMAND ${git} commit -m "first commit" + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git-commit.1" +) +vcpkg_execute_in_download_mode( + COMMAND ${git} rev-parse HEAD + OUTPUT_VARIABLE ref + RESULT_VARIABLE error_code + WORKING_DIRECTORY "${git_remote}" +) +if(NOT "${error_code}" EQUAL "0") + message(FATAL_ERROR "Failed to rev-parse HEAD: ${error_code}") +endif() +string(STRIP "${ref}" ref) + +file(WRITE "${git_remote}/README.txt" "second commit") +vcpkg_execute_required_process( + COMMAND ${git} add "${git_remote}/README.txt" + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git-add.2" +) +vcpkg_execute_required_process( + COMMAND ${git} commit -m "second commit" + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git-commit.2" +) +vcpkg_execute_in_download_mode( + COMMAND ${git} rev-parse HEAD + OUTPUT_VARIABLE head_ref + RESULT_VARIABLE error_code + WORKING_DIRECTORY "${git_remote}" +) +if(NOT "${error_code}" EQUAL "0") + message(FATAL_ERROR "Failed to rev-parse HEAD: ${error_code}") +endif() +string(STRIP "${head_ref}" head_ref) + +# test regular mode +set(VCPKG_USE_HEAD_VERSION OFF) +vcpkg_from_git( + OUT_SOURCE_PATH source_path + URL "${git_remote}" + REF "${ref}" + HEAD_REF main +) +file(READ "${source_path}/README.txt" contents) +if(NOT "${contents}" STREQUAL "first commit") + message(FATAL_ERROR "Failed to checkout the first commit. Contents were: +${contents} +") +endif() + +# test regular mode with FETCH_REF +vcpkg_execute_required_process( + COMMAND ${git} config uploadpack.allowReachableSHA1InWant false + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git-config" +) +set(VCPKG_USE_HEAD_VERSION OFF) +vcpkg_from_git( + OUT_SOURCE_PATH source_path + URL "${git_remote}" + REF "${ref}" + FETCH_REF main + HEAD_REF main +) +file(READ "${source_path}/README.txt" contents) +if(NOT "${contents}" STREQUAL "first commit") + message(FATAL_ERROR "Failed to checkout the first commit. Contents were: +${contents} +") +endif() + +vcpkg_execute_required_process( + COMMAND ${git} config uploadpack.allowReachableSHA1InWant true + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git-config" +) + +# test head mode +set(VCPKG_USE_HEAD_VERSION ON) +vcpkg_from_git( + OUT_SOURCE_PATH source_path + URL "${git_remote}" + REF "${ref}" + HEAD_REF main +) +file(READ "${source_path}/README.txt" contents) +if(NOT "${contents}" STREQUAL "second commit") + message(FATAL_ERROR "Failed to checkout the HEAD commit. Contents were: +${contents} +") +endif() +if(NOT "${VCPKG_HEAD_VERSION}" STREQUAL "${head_ref}") + message(FATAL_ERROR "Failed to checkout the right HEAD commit. + Expected: ${head_ref} + Actual : ${VCPKG_HEAD_VERSION} +") +endif() + +# test head mode + no HEAD_REF -> just uses REF +set(VCPKG_USE_HEAD_VERSION ON) +vcpkg_from_git( + OUT_SOURCE_PATH source_path + URL "${git_remote}" + REF "${ref}" +) +file(READ "${source_path}/README.txt" contents) +if(NOT "${contents}" STREQUAL "first commit") + message(FATAL_ERROR "Failed to checkout the regular commit. Contents were: +${contents} +") +endif() + +# test new head ref +file(WRITE "${git_remote}/README.txt" "third commit") +vcpkg_execute_required_process( + COMMAND ${git} add "${git_remote}/README.txt" + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git.7" +) +vcpkg_execute_required_process( + COMMAND ${git} commit -m "second commit" + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git.8" +) +vcpkg_execute_in_download_mode( + COMMAND ${git} rev-parse HEAD + OUTPUT_VARIABLE new_head_ref + RESULT_VARIABLE error_code + WORKING_DIRECTORY "${git_remote}" +) +if(NOT "${error_code}" EQUAL "0") + message(FATAL_ERROR "Failed to rev-parse HEAD: ${error_code}") +endif() +string(STRIP "${new_head_ref}" new_head_ref) + +set(VCPKG_USE_HEAD_VERSION ON) +vcpkg_from_git( + OUT_SOURCE_PATH source_path + URL "${git_remote}" + REF "${ref}" + HEAD_REF main +) +file(READ "${source_path}/README.txt" contents) +if(NOT "${contents}" STREQUAL "third commit") + message(FATAL_ERROR "Failed to checkout the right HEAD commit. Contents were: +${contents} +") +endif() +if(NOT "${VCPKG_HEAD_VERSION}" STREQUAL "${new_head_ref}") + message(FATAL_ERROR "Failed to checkout the right HEAD commit. + Expected: ${new_head_ref} + Actual : ${VCPKG_HEAD_VERSION} +") +endif() diff --git a/externals/vcpkg/scripts/test_ports/vcpkg-from-git-test/vcpkg.json b/externals/vcpkg/scripts/test_ports/vcpkg-from-git-test/vcpkg.json new file mode 100755 index 000000000..609e7f3e4 --- /dev/null +++ b/externals/vcpkg/scripts/test_ports/vcpkg-from-git-test/vcpkg.json @@ -0,0 +1,4 @@ +{ + "name": "vcpkg-from-git-test", + "version": "0" +} diff --git a/externals/vcpkg/scripts/toolchains/android.cmake b/externals/vcpkg/scripts/toolchains/android.cmake new file mode 100755 index 000000000..fb4e66cd6 --- /dev/null +++ b/externals/vcpkg/scripts/toolchains/android.cmake @@ -0,0 +1,71 @@ +set(ANDROID_CPP_FEATURES "rtti exceptions" CACHE STRING "") +set(CMAKE_SYSTEM_NAME Android CACHE STRING "") +set(ANDROID_TOOLCHAIN clang CACHE STRING "") +set(ANDROID_NATIVE_API_LEVEL ${CMAKE_SYSTEM_VERSION} CACHE STRING "") +if(CMAKE_SYSTEM_VERSION MATCHES "^[0-9]+$") + set(ANDROID_PLATFORM android-${CMAKE_SYSTEM_VERSION} CACHE STRING "") +else() + set(ANDROID_PLATFORM ${CMAKE_SYSTEM_VERSION} CACHE STRING "") +endif() +set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION clang CACHE STRING "") + +if (VCPKG_TARGET_TRIPLET MATCHES "arm64-android") + set(ANDROID_ABI arm64-v8a CACHE STRING "") +elseif(VCPKG_TARGET_TRIPLET MATCHES "armv6-android") + set(ANDROID_ABI armeabi CACHE STRING "") + set(ANDROID_ARM_MODE arm CACHE STRING "") +elseif(VCPKG_TARGET_TRIPLET MATCHES "arm-neon-android") + set(ANDROID_ABI armeabi-v7a CACHE STRING "") + set(ANDROID_ARM_NEON ON CACHE BOOL "") +elseif(VCPKG_TARGET_TRIPLET MATCHES "arm-android") + set(ANDROID_ABI armeabi-v7a CACHE STRING "") + set(ANDROID_ARM_NEON OFF CACHE BOOL "") +elseif(VCPKG_TARGET_TRIPLET MATCHES "x64-android") + set(ANDROID_ABI x86_64 CACHE STRING "") +elseif(VCPKG_TARGET_TRIPLET MATCHES "x86-android") + set(ANDROID_ABI x86 CACHE STRING "") +else() + message(FATAL_ERROR "Unknown ABI for target triplet ${VCPKG_TARGET_TRIPLET}") +endif() + +if (VCPKG_CRT_LINKAGE STREQUAL "dynamic") + set(ANDROID_STL c++_shared CACHE STRING "") +else() + set(ANDROID_STL c++_static CACHE STRING "") +endif() + +if(DEFINED ENV{ANDROID_NDK_HOME}) + set(ANDROID_NDK_HOME $ENV{ANDROID_NDK_HOME}) +else() + set(ANDROID_NDK_HOME "$ENV{ProgramData}/Microsoft/AndroidNDK64/android-ndk-r13b/") + if(NOT EXISTS "${ANDROID_NDK_HOME}") + # Use Xamarin default installation folder + set(ANDROID_NDK_HOME "$ENV{ProgramFiles\(x86\)}/Android/android-sdk/ndk-bundle") + endif() +endif() + +if(NOT EXISTS "${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake") + message(FATAL_ERROR "Could not find android ndk. Searched at ${ANDROID_NDK_HOME}") +endif() + +include("${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake") + +if(NOT _VCPKG_ANDROID_TOOLCHAIN) + set(_VCPKG_ANDROID_TOOLCHAIN 1) + get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) + if(NOT _CMAKE_IN_TRY_COMPILE) + string(APPEND CMAKE_C_FLAGS " -fPIC ${VCPKG_C_FLAGS} ") + string(APPEND CMAKE_CXX_FLAGS " -fPIC ${VCPKG_CXX_FLAGS} ") + string(APPEND CMAKE_C_FLAGS_DEBUG " ${VCPKG_C_FLAGS_DEBUG} ") + string(APPEND CMAKE_CXX_FLAGS_DEBUG " ${VCPKG_CXX_FLAGS_DEBUG} ") + string(APPEND CMAKE_C_FLAGS_RELEASE " ${VCPKG_C_FLAGS_RELEASE} ") + string(APPEND CMAKE_CXX_FLAGS_RELEASE " ${VCPKG_CXX_FLAGS_RELEASE} ") + + string(APPEND CMAKE_SHARED_LINKER_FLAGS " ${VCPKG_LINKER_FLAGS} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS " ${VCPKG_LINKER_FLAGS} ") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG " ${VCPKG_LINKER_FLAGS_DEBUG} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " ${VCPKG_LINKER_FLAGS_DEBUG} ") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE " ${VCPKG_LINKER_FLAGS_RELEASE} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE " ${VCPKG_LINKER_FLAGS_RELEASE} ") + endif() +endif() diff --git a/externals/vcpkg/scripts/toolchains/freebsd.cmake b/externals/vcpkg/scripts/toolchains/freebsd.cmake new file mode 100755 index 000000000..4b1cc3e8c --- /dev/null +++ b/externals/vcpkg/scripts/toolchains/freebsd.cmake @@ -0,0 +1,24 @@ +if(NOT _VCPKG_FREEBSD_TOOLCHAIN) +set(_VCPKG_FREEBSD_TOOLCHAIN 1) +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") + set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "") +endif() +set(CMAKE_SYSTEM_NAME FreeBSD CACHE STRING "") + +get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) +if(NOT _CMAKE_IN_TRY_COMPILE) + string(APPEND CMAKE_C_FLAGS_INIT " -fPIC ${VCPKG_C_FLAGS} ") + string(APPEND CMAKE_CXX_FLAGS_INIT " -fPIC ${VCPKG_CXX_FLAGS} ") + string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " ${VCPKG_C_FLAGS_DEBUG} ") + string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " ${VCPKG_CXX_FLAGS_DEBUG} ") + string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " ${VCPKG_C_FLAGS_RELEASE} ") + string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " ${VCPKG_CXX_FLAGS_RELEASE} ") + + string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ") +endif() +endif() diff --git a/externals/vcpkg/scripts/toolchains/ios.cmake b/externals/vcpkg/scripts/toolchains/ios.cmake new file mode 100755 index 000000000..f173662c0 --- /dev/null +++ b/externals/vcpkg/scripts/toolchains/ios.cmake @@ -0,0 +1,60 @@ +if(NOT _VCPKG_IOS_TOOLCHAIN) + set(_VCPKG_IOS_TOOLCHAIN 1) + + # Set the CMAKE_SYSTEM_NAME for try_compile calls. + set(CMAKE_SYSTEM_NAME iOS CACHE STRING "") + + macro(_vcpkg_setup_ios_arch arch) + unset(_vcpkg_ios_system_processor) + unset(_vcpkg_ios_sysroot) + unset(_vcpkg_ios_target_architecture) + + if ("${arch}" STREQUAL "arm64") + set(_vcpkg_ios_system_processor "aarch64") + set(_vcpkg_ios_target_architecture "arm64") + elseif("${arch}" STREQUAL "arm") + set(_vcpkg_ios_system_processor "arm") + set(_vcpkg_ios_target_architecture "armv7") + elseif("${arch}" STREQUAL "x64") + set(_vcpkg_ios_system_processor "x86_64") + set(_vcpkg_ios_sysroot "iphonesimulator") + set(_vcpkg_ios_target_architecture "x86_64") + elseif("${arch}" STREQUAL "x86") + set(_vcpkg_ios_system_processor "i386") + set(_vcpkg_ios_sysroot "iphonesimulator") + set(_vcpkg_ios_target_architecture "i386") + else() + message(FATAL_ERROR + "Unknown VCPKG_TARGET_ARCHITECTURE value provided for triplet ${VCPKG_TARGET_TRIPLET}: ${arch}") + endif() + endmacro() + + _vcpkg_setup_ios_arch("${VCPKG_TARGET_ARCHITECTURE}") + if(_vcpkg_ios_system_processor AND NOT CMAKE_SYSTEM_PROCESSOR) + set(CMAKE_SYSTEM_PROCESSOR ${_vcpkg_ios_system_processor}) + endif() + + # If VCPKG_OSX_ARCHITECTURES or VCPKG_OSX_SYSROOT is set in the triplet, they will take priority, + # so the following will be no-ops. + set(CMAKE_OSX_ARCHITECTURES "${_vcpkg_ios_target_architecture}" CACHE STRING "Build architectures for iOS") + if(_vcpkg_ios_sysroot) + set(CMAKE_OSX_SYSROOT ${_vcpkg_ios_sysroot} CACHE STRING "iOS sysroot") + endif() + + get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) + if(NOT _CMAKE_IN_TRY_COMPILE) + string(APPEND CMAKE_C_FLAGS_INIT " -fPIC ${VCPKG_C_FLAGS} ") + string(APPEND CMAKE_CXX_FLAGS_INIT " -fPIC ${VCPKG_CXX_FLAGS} ") + string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " ${VCPKG_C_FLAGS_DEBUG} ") + string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " ${VCPKG_CXX_FLAGS_DEBUG} ") + string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " ${VCPKG_C_FLAGS_RELEASE} ") + string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " ${VCPKG_CXX_FLAGS_RELEASE} ") + + string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ") + endif() +endif() diff --git a/externals/vcpkg/scripts/toolchains/linux.cmake b/externals/vcpkg/scripts/toolchains/linux.cmake new file mode 100755 index 000000000..2fac4922d --- /dev/null +++ b/externals/vcpkg/scripts/toolchains/linux.cmake @@ -0,0 +1,69 @@ +if(NOT _VCPKG_LINUX_TOOLCHAIN) +set(_VCPKG_LINUX_TOOLCHAIN 1) +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") + set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "") +endif() +set(CMAKE_SYSTEM_NAME Linux CACHE STRING "") +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(CMAKE_SYSTEM_PROCESSOR x86_64 CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(CMAKE_SYSTEM_PROCESSOR x86 CACHE STRING "") + string(APPEND VCPKG_C_FLAGS " -m32") + string(APPEND VCPKG_CXX_FLAGS " -m32") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(CMAKE_SYSTEM_PROCESSOR armv7l CACHE STRING "") + if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64") + if(NOT DEFINED CMAKE_CXX_COMPILER) + set(CMAKE_CXX_COMPILER "arm-linux-gnueabihf-g++") + endif() + if(NOT DEFINED CMAKE_C_COMPILER) + set(CMAKE_C_COMPILER "arm-linux-gnueabihf-gcc") + endif() + if(NOT DEFINED CMAKE_ASM_COMPILER) + set(CMAKE_ASM_COMPILER "arm-linux-gnueabihf-gcc") + endif() + if(NOT DEFINED CMAKE_ASM-ATT_COMPILER) + set(CMAKE_ASM-ATT_COMPILER "arm-linux-gnueabihf-as") + endif() + message(STATUS "Cross compiling arm on host x86_64, use cross compiler: ${CMAKE_CXX_COMPILER}/${CMAKE_C_COMPILER}") + endif() +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(CMAKE_SYSTEM_PROCESSOR aarch64 CACHE STRING "") + if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64") + if(NOT DEFINED CMAKE_CXX_COMPILER) + set(CMAKE_CXX_COMPILER "aarch64-linux-gnu-g++") + endif() + if(NOT DEFINED CMAKE_C_COMPILER) + set(CMAKE_C_COMPILER "aarch64-linux-gnu-gcc") + endif() + if(NOT DEFINED CMAKE_ASM_COMPILER) + set(CMAKE_ASM_COMPILER "aarch64-linux-gnu-gcc") + endif() + if(NOT DEFINED CMAKE_ASM-ATT_COMPILER) + set(CMAKE_ASM-ATT_COMPILER "aarch64-linux-gnu-as") + endif() + message(STATUS "Cross compiling arm64 on host x86_64, use cross compiler: ${CMAKE_CXX_COMPILER}/${CMAKE_C_COMPILER}") + endif() +endif() + +get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) +if(NOT _CMAKE_IN_TRY_COMPILE) + string(APPEND CMAKE_C_FLAGS_INIT " -fPIC ${VCPKG_C_FLAGS} ") + string(APPEND CMAKE_CXX_FLAGS_INIT " -fPIC ${VCPKG_CXX_FLAGS} ") + string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " ${VCPKG_C_FLAGS_DEBUG} ") + string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " ${VCPKG_CXX_FLAGS_DEBUG} ") + string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " ${VCPKG_C_FLAGS_RELEASE} ") + string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " ${VCPKG_CXX_FLAGS_RELEASE} ") + + string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") + if(VCPKG_CRT_LINKAGE STREQUAL "static") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT "-static ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT "-static ") + endif() + string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ") +endif() +endif() diff --git a/externals/vcpkg/scripts/toolchains/mingw.cmake b/externals/vcpkg/scripts/toolchains/mingw.cmake new file mode 100755 index 000000000..195e337f7 --- /dev/null +++ b/externals/vcpkg/scripts/toolchains/mingw.cmake @@ -0,0 +1,51 @@ +if(NOT _VCPKG_MINGW_TOOLCHAIN) +set(_VCPKG_MINGW_TOOLCHAIN 1) +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") + set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "") +endif() + +# Need to override MinGW from VCPKG_CMAKE_SYSTEM_NAME +set(CMAKE_SYSTEM_NAME Windows CACHE STRING "" FORCE) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(CMAKE_SYSTEM_PROCESSOR i686 CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(CMAKE_SYSTEM_PROCESSOR x86_64 CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(CMAKE_SYSTEM_PROCESSOR armv7 CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(CMAKE_SYSTEM_PROCESSOR aarch64 CACHE STRING "") +endif() + +foreach(lang C CXX) + set(CMAKE_${lang}_COMPILER_TARGET "${CMAKE_SYSTEM_PROCESSOR}-windows-gnu" CACHE STRING "") +endforeach() + +find_program(CMAKE_C_COMPILER "${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-gcc") +find_program(CMAKE_CXX_COMPILER "${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-g++") +find_program(CMAKE_RC_COMPILER "${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-windres") +if(NOT CMAKE_RC_COMPILER) + find_program(CMAKE_RC_COMPILER "windres") +endif() + +get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) +if(NOT _CMAKE_IN_TRY_COMPILE) + string(APPEND CMAKE_C_FLAGS_INIT " ${VCPKG_C_FLAGS} ") + string(APPEND CMAKE_CXX_FLAGS_INIT " ${VCPKG_CXX_FLAGS} ") + string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " ${VCPKG_C_FLAGS_DEBUG} ") + string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " ${VCPKG_CXX_FLAGS_DEBUG} ") + string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " ${VCPKG_C_FLAGS_RELEASE} ") + string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " ${VCPKG_CXX_FLAGS_RELEASE} ") + + string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") + if(VCPKG_CRT_LINKAGE STREQUAL "static") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT "-static ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT "-static ") + endif() + string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ") +endif() +endif() diff --git a/externals/vcpkg/scripts/toolchains/openbsd.cmake b/externals/vcpkg/scripts/toolchains/openbsd.cmake new file mode 100755 index 000000000..9eb8f3a0b --- /dev/null +++ b/externals/vcpkg/scripts/toolchains/openbsd.cmake @@ -0,0 +1,32 @@ +if(NOT _VCPKG_OPENBSD_TOOLCHAIN) +set(_VCPKG_OPENBSD_TOOLCHAIN 1) + +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "OpenBSD") + set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "") +endif() +set(CMAKE_SYSTEM_NAME OpenBSD CACHE STRING "") + +if(NOT DEFINED CMAKE_CXX_COMPILER) + set(CMAKE_CXX_COMPILER "/usr/bin/clang++") +endif() +if(NOT DEFINED CMAKE_C_COMPILER) + set(CMAKE_C_COMPILER "/usr/bin/clang") +endif() + +get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) +if(NOT _CMAKE_IN_TRY_COMPILE) + string(APPEND CMAKE_C_FLAGS_INIT " -fPIC ${VCPKG_C_FLAGS} ") + string(APPEND CMAKE_CXX_FLAGS_INIT " -fPIC ${VCPKG_CXX_FLAGS} ") + string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " ${VCPKG_C_FLAGS_DEBUG} ") + string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " ${VCPKG_CXX_FLAGS_DEBUG} ") + string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " ${VCPKG_C_FLAGS_RELEASE} ") + string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " ${VCPKG_CXX_FLAGS_RELEASE} ") + + string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ") +endif(NOT _CMAKE_IN_TRY_COMPILE) +endif(NOT _VCPKG_OPENBSD_TOOLCHAIN) diff --git a/externals/vcpkg/scripts/toolchains/osx.cmake b/externals/vcpkg/scripts/toolchains/osx.cmake new file mode 100755 index 000000000..efad6c5fe --- /dev/null +++ b/externals/vcpkg/scripts/toolchains/osx.cmake @@ -0,0 +1,41 @@ +if(NOT _VCPKG_OSX_TOOLCHAIN) +set(_VCPKG_OSX_TOOLCHAIN 1) +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "") + set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}" CACHE STRING "") +else() + set(CMAKE_SYSTEM_VERSION "17.0.0" CACHE STRING "") +endif() +set(CMAKE_SYSTEM_NAME Darwin CACHE STRING "") + +set(CMAKE_MACOSX_RPATH ON CACHE BOOL "") + +if(NOT DEFINED CMAKE_SYSTEM_PROCESSOR) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(CMAKE_SYSTEM_PROCESSOR x86_64 CACHE STRING "") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(CMAKE_SYSTEM_PROCESSOR x86 CACHE STRING "") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(CMAKE_SYSTEM_PROCESSOR arm64 CACHE STRING "") + else() + set(CMAKE_SYSTEM_PROCESSOR "${CMAKE_HOST_SYSTEM_PROCESSOR}" CACHE STRING "") + endif() +endif() + +get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) +if(NOT _CMAKE_IN_TRY_COMPILE) + string(APPEND CMAKE_C_FLAGS_INIT " -fPIC ${VCPKG_C_FLAGS} ") + string(APPEND CMAKE_CXX_FLAGS_INIT " -fPIC ${VCPKG_CXX_FLAGS} ") + string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " ${VCPKG_C_FLAGS_DEBUG} ") + string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " ${VCPKG_CXX_FLAGS_DEBUG} ") + string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " ${VCPKG_C_FLAGS_RELEASE} ") + string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " ${VCPKG_CXX_FLAGS_RELEASE} ") + + string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " ${VCPKG_LINKER_FLAGS_DEBUG} ") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT " ${VCPKG_LINKER_FLAGS_RELEASE} ") +endif() +endif() diff --git a/externals/vcpkg/scripts/toolchains/uwp.cmake b/externals/vcpkg/scripts/toolchains/uwp.cmake new file mode 100755 index 000000000..9e76d4512 --- /dev/null +++ b/externals/vcpkg/scripts/toolchains/uwp.cmake @@ -0,0 +1,93 @@ +if(NOT _VCPKG_WINDOWS_TOOLCHAIN) +set(_VCPKG_WINDOWS_TOOLCHAIN 1) +set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>$<$:DLL>" CACHE STRING "") + +set(CMAKE_SYSTEM_NAME WindowsStore CACHE STRING "") + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(CMAKE_SYSTEM_PROCESSOR x86 CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(CMAKE_SYSTEM_PROCESSOR AMD64 CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(CMAKE_SYSTEM_PROCESSOR ARM CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(CMAKE_SYSTEM_PROCESSOR ARM64 CACHE STRING "") +endif() + +if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + set(CMAKE_SYSTEM_VERSION "${VCPKG_CMAKE_SYSTEM_VERSION}" CACHE STRING "" FORCE) +endif() + +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") + if(CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR) + set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86") + # any of the four platforms can run x86 binaries + set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") + elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ARM64") + # arm64 can run binaries of any of the four platforms after Windows 11 + set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") + endif() + + if(NOT DEFINED CMAKE_SYSTEM_VERSION) + set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}" CACHE STRING "") + endif() +endif() + +get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) +if(NOT _CMAKE_IN_TRY_COMPILE) + + if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + set(VCPKG_CRT_LINK_FLAG_PREFIX "/MD") + elseif(VCPKG_CRT_LINKAGE STREQUAL "static") + set(VCPKG_CRT_LINK_FLAG_PREFIX "/MT") + else() + message(FATAL_ERROR "Invalid setting for VCPKG_CRT_LINKAGE: \"${VCPKG_CRT_LINKAGE}\". It must be \"static\" or \"dynamic\"") + endif() + + set(_vcpkg_charset "/utf-8") + if (NOT VCPKG_SET_CHARSET_FLAG OR VCPKG_PLATFORM_TOOLSET MATCHES "v120") + # VS 2013 does not support /utf-8 + set(_vcpkg_charset "") + endif() + + set(_vcpkg_cpp_flags "/DWIN32 /D_WINDOWS /D_UNICODE /DUNICODE /DWINAPI_FAMILY=WINAPI_FAMILY_APP /D__WRL_NO_DEFAULT_LIB__" ) # VS adds /D "_WINDLL" for DLLs; + set(_vcpkg_common_flags "/nologo /Z7 /MP /GS /Gd /Gm- /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc") + #/ZW:nostdlib -> ZW is added by CMake # VS also normally adds /sdl but not cmake MSBUILD + set(_vcpkg_winmd_flag "") + file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" _vcpkg_vctools) + set(ENV{_CL_} "/FU\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\" $ENV{_CL_}") + # CMake has problems to correctly pass this in the compiler test so probably need special care in get_cmake_vars + #set(_vcpkg_winmd_flag "/FU\\\\\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\\\\\"") # VS normally passes /ZW for Apps + + set(CMAKE_CXX_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${_vcpkg_charset} ${VCPKG_CXX_FLAGS}" CACHE STRING "") + set(CMAKE_C_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${_vcpkg_charset} ${VCPKG_C_FLAGS}" CACHE STRING "") + set(CMAKE_RC_FLAGS "-c65001 ${_vcpkg_cpp_flags}" CACHE STRING "") + + unset(_vcpkg_charset) + unset(_vcpkg_cpp_flags) + unset(_vcpkg_common_flags) + unset(_vcpkg_winmd_flag) + + set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /Od /RTC1 ${VCPKG_CRT_LINK_FLAG_PREFIX}d ${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "") + set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /Od /RTC1 ${VCPKG_CRT_LINK_FLAG_PREFIX}d ${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "") + + set(CMAKE_CXX_FLAGS_RELEASE "/Gy /O2 /Oi /DNDEBUG ${VCPKG_CRT_LINK_FLAG_PREFIX} ${VCPKG_CXX_FLAGS_RELEASE}" CACHE STRING "") # VS adds /GL + set(CMAKE_C_FLAGS_RELEASE "/Gy /O2 /Oi /DNDEBUG ${VCPKG_CRT_LINK_FLAG_PREFIX} ${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "") + + string(APPEND CMAKE_STATIC_LINKER_FLAGS_RELEASE_INIT " /nologo ") # VS adds /LTCG + + if(CMAKE_GENERATOR MATCHES "Ninja") + set(additional_exe_flags "/WINMD") # VS Generator chokes on this in the compiler detection + endif() + string(APPEND CMAKE_SHARED_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG /WINMD:NO /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}") + # VS adds /DEBUG:FULL /TLBID:1. WindowsApp.lib is in CMAKE_C|CXX_STANDARD_LIBRARIES + string(APPEND CMAKE_EXE_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG ${additional_exe_flags} /APPCONTAINER /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}") + + set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF " CACHE STRING "") # VS uses /LTCG:incremental + set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF " CACHE STRING "") + string(APPEND CMAKE_STATIC_LINKER_FLAGS_DEBUG_INIT " /nologo ") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " /nologo ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " /nologo ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_DEBUG} ") +endif() +endif() diff --git a/externals/vcpkg/scripts/toolchains/windows.cmake b/externals/vcpkg/scripts/toolchains/windows.cmake new file mode 100755 index 000000000..7c8a54989 --- /dev/null +++ b/externals/vcpkg/scripts/toolchains/windows.cmake @@ -0,0 +1,73 @@ +if(NOT _VCPKG_WINDOWS_TOOLCHAIN) +set(_VCPKG_WINDOWS_TOOLCHAIN 1) +set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>$<$:DLL>" CACHE STRING "") + +set(CMAKE_SYSTEM_NAME Windows CACHE STRING "") + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(CMAKE_SYSTEM_PROCESSOR x86 CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(CMAKE_SYSTEM_PROCESSOR AMD64 CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(CMAKE_SYSTEM_PROCESSOR ARM CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(CMAKE_SYSTEM_PROCESSOR ARM64 CACHE STRING "") +endif() + +if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + set(CMAKE_SYSTEM_VERSION "${VCPKG_CMAKE_SYSTEM_VERSION}" CACHE STRING "" FORCE) +endif() + +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") + if(CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR) + set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86") + # any of the four platforms can run x86 binaries + set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") + elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ARM64") + # arm64 can run binaries of any of the four platforms after Windows 11 + set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") + endif() + + if(NOT DEFINED CMAKE_SYSTEM_VERSION) + set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}" CACHE STRING "") + endif() +endif() + +get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) +if(NOT _CMAKE_IN_TRY_COMPILE) + + if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + set(VCPKG_CRT_LINK_FLAG_PREFIX "/MD") + elseif(VCPKG_CRT_LINKAGE STREQUAL "static") + set(VCPKG_CRT_LINK_FLAG_PREFIX "/MT") + else() + message(FATAL_ERROR "Invalid setting for VCPKG_CRT_LINKAGE: \"${VCPKG_CRT_LINKAGE}\". It must be \"static\" or \"dynamic\"") + endif() + + set(CHARSET_FLAG "/utf-8") + if (NOT VCPKG_SET_CHARSET_FLAG OR VCPKG_PLATFORM_TOOLSET MATCHES "v120") + # VS 2013 does not support /utf-8 + set(CHARSET_FLAG) + endif() + + set(CMAKE_CXX_FLAGS " /nologo /DWIN32 /D_WINDOWS /W3 ${CHARSET_FLAG} /GR /EHsc /MP ${VCPKG_CXX_FLAGS}" CACHE STRING "") + set(CMAKE_C_FLAGS " /nologo /DWIN32 /D_WINDOWS /W3 ${CHARSET_FLAG} /MP ${VCPKG_C_FLAGS}" CACHE STRING "") + set(CMAKE_RC_FLAGS "-c65001 /DWIN32" CACHE STRING "") + + unset(CHARSET_FLAG) + + set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG ${VCPKG_CRT_LINK_FLAG_PREFIX}d /Z7 /Ob0 /Od /RTC1 ${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "") + set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG ${VCPKG_CRT_LINK_FLAG_PREFIX}d /Z7 /Ob0 /Od /RTC1 ${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "") + set(CMAKE_CXX_FLAGS_RELEASE "${VCPKG_CRT_LINK_FLAG_PREFIX} /O2 /Oi /Gy /DNDEBUG /Z7 ${VCPKG_CXX_FLAGS_RELEASE}" CACHE STRING "") + set(CMAKE_C_FLAGS_RELEASE "${VCPKG_CRT_LINK_FLAG_PREFIX} /O2 /Oi /Gy /DNDEBUG /Z7 ${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "") + + string(APPEND CMAKE_STATIC_LINKER_FLAGS_RELEASE_INIT " /nologo ") + set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/nologo /DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}" CACHE STRING "") + set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/nologo /DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}" CACHE STRING "") + + string(APPEND CMAKE_STATIC_LINKER_FLAGS_DEBUG_INIT " /nologo ") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " /nologo ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_DEBUG} ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " /nologo ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_DEBUG} ") +endif() +endif() diff --git a/externals/vcpkg/scripts/vcpkg.schema.json b/externals/vcpkg/scripts/vcpkg.schema.json new file mode 100755 index 000000000..7ee7a27aa --- /dev/null +++ b/externals/vcpkg/scripts/vcpkg.schema.json @@ -0,0 +1,313 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "id": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", + "title": "Vcpkg manifest", + "description": "Vcpkg manifest file. See https://github.com/microsoft/vcpkg/blob/master/docs/specifications/manifests.md.", + "definitions": { + "identifier": { + "description": "Identifiers used for feature names.", + "allOf": [ + { + "description": "Identifier are lowercase with digits and dashes.", + "type": "string", + "pattern": "[a-z0-9]+(-[a-z0-9]+)*" + }, + { + "not": { + "description": "Identifiers must not be a Windows filesystem or vcpkg reserved name.", + "type": "string", + "pattern": "^(prn|aux|nul|con|lpt[1-9]|com[1-9]|core|default)$" + } + } + ] + }, + "version-text": { + "type": "string", + "pattern": "[^#]+" + }, + "has-schemed-version": { + "type": "object", + "oneOf": [ + { + "properties": { + "version-string": { + "description": "Text used to identify an arbitrary version", + "type": "string", + "pattern": "^[^#]+$" + } + }, + "required": [ + "version-string" + ] + }, + { + "properties": { + "version": { + "description": "A relaxed version string (1.2.3.4...)", + "type": "string", + "pattern": "^\\d+(\\.\\d+)*$" + } + }, + "required": [ + "version" + ] + }, + { + "properties": { + "version-semver": { + "description": "A semantic version string. See https://semver.org/", + "type": "string", + "pattern": "^\\d+\\.\\d+\\.\\d+([+-].+)?$" + } + }, + "required": [ + "version-semver" + ] + }, + { + "properties": { + "version-date": { + "description": "A date version string (e.g. 2020-01-20)", + "type": "string", + "pattern": "^\\d{4}-\\d{2}-\\d{2}(\\.\\d+)*$" + } + }, + "required": [ + "version-date" + ] + } + ] + }, + "port-version": { + "description": "A non-negative integer indicating the port revision. If this field doesn't exist, it's assumed to be `0`.", + "type": "integer", + "minimum": 0, + "default": 0 + }, + "package-name": { + "description": "Name of a package.", + "allOf": [ + { + "description": "Package name must be a dot-separated list of valid identifiers", + "type": "string", + "pattern": "^[a-z0-9]+(-[a-z0-9]+)*(\\.[a-z0-9]+(-[a-z0-9]+)*)*$" + }, + { + "not": { + "description": "Identifiers must not be a Windows filesystem or vcpkg reserved name.", + "type": "string", + "pattern": "(^|\\.)(prn|aux|nul|con|lpt[1-9]|com[1-9]|core|default)(\\.|$)" + } + } + ] + }, + "description-field": { + "description": "A string or array of strings containing the description of a package or feature.", + "oneOf": [ + { + "type": "string" + }, + { + "type": "array", + "items": { + "type": "string" + } + } + ] + }, + "dependency-object": { + "description": "Expanded form of a dependency with explicit features and platform.", + "type": "object", + "properties": { + "name": { + "$ref": "#/definitions/package-name" + }, + "features": { + "type": "array", + "items": { + "$ref": "#/definitions/identifier" + } + }, + "host": { + "type": "boolean", + "default": false + }, + "default-features": { + "type": "boolean", + "default": true + }, + "platform": { + "$ref": "#/definitions/platform-expression" + }, + "version>=": { + "description": "Minimum required version", + "type": "string", + "pattern": "^[^#]+(#\\d+)?$" + } + }, + "patternProperties": { + "^\\$": {} + }, + "required": [ + "name" + ], + "additionalProperties": false + }, + "dependency": { + "description": "A dependency fetchable by Vcpkg.", + "oneOf": [ + { + "$ref": "#/definitions/package-name" + }, + { + "$ref": "#/definitions/dependency-object" + } + ] + }, + "override": { + "description": "A version override.", + "type": "object", + "properties": { + "name": { + "$ref": "#/definitions/identifier" + }, + "version": { + "$ref": "#/definitions/version-text" + }, + "port-version": { + "$ref": "#/definitions/port-version" + } + }, + "patternProperties": { + "^\\$": {} + }, + "required": [ + "name", + "version" + ] + }, + "platform-expression": { + "description": "A specification of a set of platforms. See https://github.com/microsoft/vcpkg/blob/master/docs/specifications/manifests.md#definitions.", + "type": "string" + }, + "feature": { + "description": "A package feature that can be activated by consumers.", + "type": "object", + "properties": { + "description": { + "$ref": "#/definitions/description-field" + }, + "dependencies": { + "description": "Dependencies used by this feature.", + "type": "array", + "items": { + "$ref": "#/definitions/dependency" + } + } + }, + "patternProperties": { + "^\\$": {} + }, + "required": [ + "description" + ], + "additionalProperties": false + } + }, + "type": "object", + "allOf": [ + { + "properties": { + "name": { + "description": "The name of the top-level package", + "$ref": "#/definitions/package-name" + }, + "version-string": {}, + "version": {}, + "version-date": {}, + "version-semver": {}, + "port-version": { + "$ref": "#/definitions/port-version" + }, + "maintainers": { + "description": "An array of strings which contain the authors of a package", + "type": "array", + "items": { + "type": "string" + } + }, + "description": { + "$ref": "#/definitions/description-field" + }, + "homepage": { + "description": "A url which points to the homepage of a package.", + "type": "string", + "format": "uri" + }, + "documentation": { + "description": "A url which points to the documentation of a package.", + "type": "string", + "format": "uri" + }, + "license": { + "description": "An SPDX license expression at version 3.9.", + "type": "string" + }, + "builtin-baseline": { + "description": "A vcpkg repository commit for version control.", + "type": "string" + }, + "dependencies": { + "description": "Dependencies that are always required.", + "type": "array", + "items": { + "$ref": "#/definitions/dependency" + } + }, + "overrides": { + "description": "Version overrides for dependencies.", + "type": "array", + "items": { + "$ref": "#/definitions/override" + } + }, + "dev-dependencies": { + "description": "Dependencies only required for developers (testing and the like).", + "type": "array", + "items": { + "$ref": "#/definitions/dependency" + } + }, + "features": { + "description": "A map of features supported by the package", + "type": "object", + "patternProperties": { + "": { + "$ref": "#/definitions/feature" + } + } + }, + "default-features": { + "description": "Features enabled by default with the package.", + "type": "array", + "items": { + "$ref": "#/definitions/identifier" + } + }, + "supports": { + "$ref": "#/definitions/platform-expression" + } + }, + "patternProperties": { + "^\\$": {} + }, + "required": [ + "name" + ], + "additionalProperties": false + }, + { + "$ref": "#/definitions/has-schemed-version" + } + ] +} diff --git a/externals/vcpkg/scripts/vcpkgTools.xml b/externals/vcpkg/scripts/vcpkgTools.xml new file mode 100755 index 000000000..e2f9d98dd --- /dev/null +++ b/externals/vcpkg/scripts/vcpkgTools.xml @@ -0,0 +1,224 @@ + + + + 3.10.2 + python.exe + https://www.python.org/ftp/python/3.10.2/python-3.10.2-embed-win32.zip + d647d7141d1b13c899671b882e686a1b1cc6f759e5b7428ec858cdffd9ef019c78fb0b989174b98f30cb696297bfeff3d171f7eaabb339f5154886c030b8e4d9 + python-3.10.2-embed-win32.zip + + + 3.10.2 + tools\python.exe + https://www.nuget.org/api/v2/package/python/3.10.2 + eb94c254e669eb22aad276c6cc6eec7ae6c19dacfa7d29b0b980953717f4c73a52e0f37807dfe925ecefd1b04b1f78bf0095b03e578a4b6405e52c640e4ab4c5 + python-3.10.2.nupkg.zip + + + 3.22.2 + cmake-3.22.2-windows-i386\bin\cmake.exe + https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-windows-i386.zip + 969d3d58d56d8fa3cc3acae2b949bf58abab945f70ae292ff20c9060d845dfc094c613c367a924abff47f307cc33af1467cdb9b75bb857868e38b2c7cdc72f79 + cmake-3.22.2-windows-i386.zip + + + 3.22.2 + cmake-3.22.2-macos-universal/CMake.app/Contents/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-macos-universal.tar.gz + 08104f608ecb9a5cfef38e79f0957d21e425616c0677781445492f82cbfec805113e3b5eb4bc737b707bb26a00678e7bd55e17555a5611c08b0b9b44ac5136ac + cmake-3.22.2-macos-universal.tar.gz + + + 3.22.2 + cmake-3.22.2-linux-x86_64/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-linux-x86_64.tar.gz + 579e08b086f6903ef063697fca1dc2692f68a7341dd35998990b772b4221cdb5b1deecfa73bad9d46817ef09e58882b2adff9d64f959c01002c11448a878746b + cmake-3.22.2linux-x86_64.tar.gz + + + 3.20.4 + usr/local/bin/cmake + https://pkg.freebsd.org/FreeBSD:13:amd64/quarterly/All/cmake-3.20.4.txz + 3e5b675d7ff924f92996d912e2365582e687375109ef99c9073fb8196bb329243a406b218cf1358d7cc518988b311ce9e5bf87de4d64f2e6377b7c2bc8894475 + cmake-3.20.4.txz + + + 2.7.4 + mingw32\bin\git.exe + https://github.com/git-for-windows/git/releases/download/v2.35.1.windows.2/PortableGit-2.35.1.2-32-bit.7z.exe + f98df16641a615bbc36c5c319c78abb780d824ff35ed5f2a095e2d5fce2acacfc7f6532c96f1c81d3d3cd8a642858cbd9de0e0e5fcde9ca11e6ad9f6598bb82f + PortableGit-2.35.1.2-32-bit.7z.exe + + + 2.7.4 + + + + + + 2.7.4 + + + + + + 2.7.4 + + + + + + 4.65 + google-cloud-sdk\bin\gsutil.cmd + https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-347.0.0-windows-x86_64-bundled-python.zip + e2792e17b132aad77f7c0b9fd26faf415e9437923d9227a9e6d253554e6843d29a6ddad0a7fb5e9aea4a130fd4c521e6ece8844fd4a4f9e8d580348775425389 + google-cloud-sdk-347.0.0-windows-x86_64-bundled-python.zip + + + 4.65 + gsutil/gsutil + https://storage.googleapis.com/pub/gsutil_4.65.tar.gz + 2c5c9dea48147f97180a491bbb9e24e8cbcd4f3452620e2f80338b781e4dfc90bb754e3bbfa05e1b990e44bff52d990d8c2dd51bc83d112339d8e6096a2f21c8 + gsutil_4.65.tar.gz + + + 4.65 + gsutil/gsutil + https://storage.googleapis.com/pub/gsutil_4.65.tar.gz + 2c5c9dea48147f97180a491bbb9e24e8cbcd4f3452620e2f80338b781e4dfc90bb754e3bbfa05e1b990e44bff52d990d8c2dd51bc83d112339d8e6096a2f21c8 + gsutil_4.65.tar.gz + + + 2.8.4 + vswhere.exe + https://github.com/Microsoft/vswhere/releases/download/2.8.4/vswhere.exe + 1a98beebd1bb6929cbe98b86a3b77fb1ae4508b86cdcb64696b20c3a3336a2b5c8518e19a21092f1c98a46202c048dba819dc52bef122485ac34b888b77e59b2 + + + 5.11.0 + nuget.exe + https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe + 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7 + + + 5.11.0 + nuget.exe + https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe + 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7 + + + 5.11.0 + nuget.exe + https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe + 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7 + + + 0.11.0 + coscli-windows.exe + https://github.com/tencentyun/coscli/releases/download/v0.11.0-beta/coscli-windows.exe + 38a521ec80cdb6944124f4233d7e71eed8cc9f9be2c0c736269915d21c3718ea8131e4516bb6eeada6df331f5fa8f47a299907e50ee9edbe0114444520974d06 + + + 0.11.0 + coscli-linux + https://github.com/tencentyun/coscli/releases/download/v0.11.0-beta/coscli-linux + 9c930a1d308e9581a0e2fdfe3751ea7fe13d6068df90ca6465740ec3eda034202ef71ec54c99e90015ff81aa68aa1489567db5e411e222eb7258704bdac7e924 + + + 0.11.0 + coscli-mac + https://github.com/tencentyun/coscli/releases/download/v0.11.0-beta/coscli-mac + 9556335bfc8bc14bace6dfced45fa77fb07c80f08aa975e047a54efda1d19852aae0ea68a5bc7f04fbd88e3edce5a73512a61216b1c5ff4cade224de4a9ab8db + + + 4.4.0 + QtInstallerFramework-win-x86\bin\installerbase.exe + https://download.qt.io/official_releases/qt-installer-framework/4.4.0/installer-framework-opensource-src-4.4.0.zip + fc713f54bfe2781cb232cd0ae8eddb96833ec178d53a55ec0b01886aa048b13441eb49a1f33282e8eab7259cfe512c890d50b8e632d3dbf501a0bf1fd83de947 + installer-framework-opensource-src-4.4.0.zip + + + 21.07 + Files\7-Zip\7z.exe + https://www.7-zip.org/a/7z2107-x64.msi + d55b44f1255d1b0e629719383a600a7e83dc6378d470096337b886ce24684d26bcc2b04f9cea39ad888179edce23ad2bd0e8e1863ddc40106c176adece8c012d + 7z2107-x64.msi + + + 21.07 + 7za.exe + https://www.7-zip.org/a/7z2107-extra.7z + 648d894940bcc29951752d7a8fd18c770ee8d4fd944e17f1a52588e51ca8f58375ba48514538f2e1387786fd812bb86f75fd6bdd0892685cdcafb2989942c848 + 7z2107-extra.7z + + + 1.35.0 + aria2-1.35.0-win-32bit-build1\aria2c.exe + https://github.com/aria2/aria2/releases/download/release-1.35.0/aria2-1.35.0-win-32bit-build1.zip + 933537cad820b1cecf43a9eeca7e1b241dd7b1c902ee942441a166f2c38845f16046321efbdfa2f83c7e9fc50c7ecc5da6fd00e0c6e2124c07d3b783aa5092a4 + aria2-1.35.0-win-32bit-build1.zip + + + 1.35.0 + aria2-1.35.0/bin/aria2c + https://github.com/aria2/aria2/releases/download/release-1.35.0/aria2-1.35.0-osx-darwin.tar.bz2 + 3bb32b7d55347d1af37c6f4ebf0e20b38ce51c37a1baf92f7ad1762000539a03413dd679a6d902fdb1805fa71917300c9692aceee012eb06ecdff10491137aec + aria2-1.35.0-osx-darwin.tar.bz2 + + + 1.10.2 + ninja.exe + https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip + 6004140d92e86afbb17b49c49037ccd0786ce238f340f7d0e62b4b0c29ed0d6ad0bab11feda2094ae849c387d70d63504393714ed0a1f4d3a1f155af7a4f1ba3 + ninja-win-1.10.2.zip + + + 1.10.2 + ninja + https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip + 93e802e9c17fb59636cddde4bad1ddaadad624f4ecfee00d5c78790330a4e9d433180e795718cda27da57215ce643c3929cf72c85337ee019d868c56f2deeef3 + ninja-linux-1.10.2.zip + + + 1.10.2 + ninja + https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-mac.zip + bcd12f6a3337591306d1b99a7a25a6933779ba68db79f17c1d3087d7b6308d245daac08df99087ff6be8dc7dd0dcdbb3a50839a144745fa719502b3a7a07260b + ninja-mac-1.10.2.zip + + + 1.8.2 + ninja + https://github.com/ivysnow/ninja/releases/download/v1.8.2/ninja-freebsd.zip + 56a55ae9a6b5dfad4f28f9fe9b8114f1475c999d2f07fff7efa7375f987e74b498e9b63c41fc6c577756f15f3a1459c6d5d367902de3bedebdf9a9fd49089a86 + ninja-freebsd-1.8.2.zip + + + 7.2.3 + pwsh.exe + https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/PowerShell-7.2.3-win-x86.zip + 4b275fd1dc6430e0d7b77d4c34ec54ad47502602592ebc1ec99c88610ec24d3adca27a41896dc4767ac820ad7e000f9c2b1d678b05e9dd76086ff52a11976f80 + PowerShell-7.2.3-win-x86.zip + + + 16.12.0 + node-v16.12.0-win-x64\node.exe + https://nodejs.org/dist/v16.12.0/node-v16.12.0-win-x64.7z + 0bb793fce8140bd59c17f3ac9661b062eac0f611d704117774f5cb2453d717da94b1e8b17d021d47baff598dc023fb7068ed1f8a7678e446260c3db3537fa888 + node-v16.12.0-win-x64.7z + + + 16.12.0 + node-v16.12.0-linux-x64/bin/node + https://nodejs.org/dist/v16.12.0/node-v16.12.0-linux-x64.tar.gz + 45658083c35c13f2bc4b88d68a12c76213bdaf2235776e041c9937ce912a83cb49d655965568c99a5e139ff5c03b1e460c13ad8ab7f0c5570b531907715f6e0f + node-v16.12.0-linux-x64.tar.gz + + + 16.12.0 + node-v16.12.0-darwin-x64/bin/node + https://nodejs.org/dist/v16.12.0/node-v16.12.0-darwin-x64.tar.gz + f758a90d3dcc3adf296abbed01b69a3a27e63c2085b7f604d83550714b1ac374f36e73fc02dd31bf60e532205d92e1605a05b35642142d20ac07c4bb98c69f70 + node-v16.12.0-darwin-x64.tar.gz + + diff --git a/externals/vcpkg/scripts/vcpkg_completion.bash b/externals/vcpkg/scripts/vcpkg_completion.bash new file mode 100755 index 000000000..804507d58 --- /dev/null +++ b/externals/vcpkg/scripts/vcpkg_completion.bash @@ -0,0 +1,17 @@ +#/usr/bin/env bash + +_vcpkg_completions() +{ + local vcpkg_executable=${COMP_WORDS[0]} + local remaining_command_line=${COMP_LINE:(${#vcpkg_executable}+1)} + COMPREPLY=($(${vcpkg_executable} autocomplete "${remaining_command_line}" -- 2>/dev/null)) + + # Colon is treated as a delimiter in bash. The following workaround + # allows triplet completion to work correctly in the syntax: + # zlib:x64-windows + local cur + _get_comp_words_by_ref -n : cur + __ltrim_colon_completions "$cur" +} + +complete -F _vcpkg_completions vcpkg diff --git a/externals/vcpkg/scripts/vcpkg_completion.fish b/externals/vcpkg/scripts/vcpkg_completion.fish new file mode 100755 index 000000000..a55d70010 --- /dev/null +++ b/externals/vcpkg/scripts/vcpkg_completion.fish @@ -0,0 +1,94 @@ +# vcpkg completions for fish +set vcpkg_executable (string split -m1 ' ' (commandline -cb))[1] + +function _vcpkg_completions + set arg (string split -m1 ' ' (commandline -cb))[2] + set curr_token (commandline -t) + if [ -n $arg ] + if [ -z $curr_token ] + set arg $arg " " + end + end + for key in ($vcpkg_executable autocomplete "$arg" -- 2>/dev/null) + echo $key + end +end + +complete -c vcpkg -f --arguments '(_vcpkg_completions)' + +set vcpkg_commands ($vcpkg_executable autocomplete) + +function _set_triplet_arguments + set triplets ($vcpkg_executable help triplet) + set -e triplets[(contains -i -- "Available architecture triplets" $triplets)] + set -e triplets[(contains -i -- "" $triplets)] + set triplet_from "" + for triplet in $triplets + echo (test -n "$triplet") >> temp.txt + if [ (string sub -l5 -- $triplet) = "VCPKG" ] + set -l temp (string length $triplet) + set triplet_from (string sub -s6 -l(math $temp - 15) -- $triplet) + else if [ -n "$triplet" ] + complete -c vcpkg -n "__fish_seen_subcommand_from $vcpkg_commands" -x -l triplet -d "$triplet_from" -a (string sub -s3 -- $triplet) + end + end +end +_set_triplet_arguments + +# options for all completions +complete -c vcpkg -n "__fish_seen_subcommand_from $vcpkg_commands" -x -l triplet -d "Specify the target architecture triplet. See 'vcpkg help triplet' (default: \$VCPKG_DEFAULT_TRIPLET)" +complete -c vcpkg -n "__fish_seen_subcommand_from $vcpkg_commands" -x -l overlay-ports -d "Specify directories to be used when searching for ports (also: \$VCPKG_OVERLAY_PORTS)" -a '(__fish_complete_directories)' +complete -c vcpkg -n "__fish_seen_subcommand_from $vcpkg_commands" -x -l overlay-triplets -d "Specify directories containing triplets files (also: \$VCPKG_OVERLAY_TRIPLETS)" -a '(__fish_complete_directories)' +complete -c vcpkg -n "__fish_seen_subcommand_from $vcpkg_commands" -x -l binarysource -d "Add sources for binary caching. See 'vcpkg help binarycaching'" -a '(__fish_complete_directories)' +complete -c vcpkg -n "__fish_seen_subcommand_from $vcpkg_commands" -x -l downloads-root -d "Specify the downloads root directory (default: \$VCPKG_DOWNLOADS)" -a '(__fish_complete_directories)' +complete -c vcpkg -n "__fish_seen_subcommand_from $vcpkg_commands" -x -l vcpkg-root -d "Specify the vcpkg root directory (default: \$VCPKG_ROOT)" -a '(__fish_complete_directories)' + +# options for install +complete -c vcpkg -n "__fish_seen_subcommand_from install" -f -l dry-run -d "Do not actually build or install" +complete -c vcpkg -n "__fish_seen_subcommand_from install" -f -l head -d "Install the libraries on the command line using the latest upstream sources" +complete -c vcpkg -n "__fish_seen_subcommand_from install" -f -l no-downloads -d "Do not download new sources" +complete -c vcpkg -n "__fish_seen_subcommand_from install" -f -l only-downloads -d "Download sources but don't build packages" +complete -c vcpkg -n "__fish_seen_subcommand_from install" -f -l recurse -d "Allow removal of packages as part of installation" +complete -c vcpkg -n "__fish_seen_subcommand_from install" -f -l keep-going -d "Continue installing packages on failure" +complete -c vcpkg -n "__fish_seen_subcommand_from install" -f -l editable -d "Disable source re-extraction and binary caching for libraries on the command line" +complete -c vcpkg -n "__fish_seen_subcommand_from install" -f -l clean-after-build -d "Clean buildtrees, packages and downloads after building each package" + +# options for edit +complete -c vcpkg -n "__fish_seen_subcommand_from edit" -f -l buildtrees -d "Open editor into the port-specific buildtree subfolder" +complete -c vcpkg -n "__fish_seen_subcommand_from edit" -f -l all -d "Open editor into the port as well as the port-specific buildtree subfolder" + +# options for export +complete -c vcpkg -n "__fish_seen_subcommand_from export" -f -l dry-run -d "Do not actually export" +complete -c vcpkg -n "__fish_seen_subcommand_from export" -f -l raw -d "Export to an uncompressed directory" +complete -c vcpkg -n "__fish_seen_subcommand_from export" -f -l nuget -d "Export a NuGet package" +complete -c vcpkg -n "__fish_seen_subcommand_from export" -f -l ifw -d "Export to an IFW-based installer" +complete -c vcpkg -n "__fish_seen_subcommand_from export" -f -l zip -d "Export to a zip file" +complete -c vcpkg -n "__fish_seen_subcommand_from export" -f -l 7zip -d "Export to a 7zip (.7z) file" +complete -c vcpkg -n "__fish_seen_subcommand_from export" -f -l prefab -d "Export to Prefab format" +complete -c vcpkg -n "__fish_seen_subcommand_from export" -f -l prefab-maven -d "Enable maven" +complete -c vcpkg -n "__fish_seen_subcommand_from export" -f -l prefab-debug -d "Enable prefab debug" +complete -c vcpkg -n "__fish_seen_subcommand_from export" -f -r -l output -d "Specify the output name (used to construct filename)" +complete -c vcpkg -n "__fish_seen_subcommand_from export" -f -r -l output-dir -d "Specify the output directory for produced artifacts" -a '(__fish_complete_directories)' +complete -c vcpkg -n "__fish_seen_subcommand_from export" -f -r -l nuget-id -d "Specify the id for the exported NuGet package (overrides --output)" +complete -c vcpkg -n "__fish_seen_subcommand_from export" -f -r -l nuget-version -d "Specify the version for the exported NuGet package" +complete -c vcpkg -n "__fish_seen_subcommand_from export" -f -r -l ifw-repository-url -d "Specify the remote repository URL for the online installer" +complete -c vcpkg -n "__fish_seen_subcommand_from export" -f -r -l ifw-packages-directory-path -d "Specify the temporary directory path for the repacked packages" +complete -c vcpkg -n "__fish_seen_subcommand_from export" -f -r -l ifw-repository-directory-path -d "Specify the directory path for the exported repository" +complete -c vcpkg -n "__fish_seen_subcommand_from export" -f -r -l ifw-configuration-file-path -d "Specify the temporary file path for the installer configuration" +complete -c vcpkg -n "__fish_seen_subcommand_from export" -f -r -l ifw-installer-file-path -d "Specify the file path for the exported installer" +complete -c vcpkg -n "__fish_seen_subcommand_from export" -f -r -l prefab-group-id -d "GroupId uniquely identifies your project according maven specifications" +complete -c vcpkg -n "__fish_seen_subcommand_from export" -f -r -l prefab-artifact-id -d "Artifact Id is the name of the project according maven specifications" +complete -c vcpkg -n "__fish_seen_subcommand_from export" -f -r -l prefab-version -d "Version is the name of the project according maven specifications" +complete -c vcpkg -n "__fish_seen_subcommand_from export" -f -r -l prefab-min-sdk -d "Android minimum supported sdk version" +complete -c vcpkg -n "__fish_seen_subcommand_from export" -f -r -l prefab-target-sdk -d "Android target sdk version" + +# options for remove +complete -c vcpkg -n "__fish_seen_subcommand_from remove" -f -l purge -d "Remove the cached copy of the package (default)" +complete -c vcpkg -n "__fish_seen_subcommand_from remove" -f -l no-purge -d "Do not remove the cached copy of the package (deprecated)" +complete -c vcpkg -n "__fish_seen_subcommand_from remove" -f -l recurse -d "Allow removal of packages not explicitly specified on the command line" +complete -c vcpkg -n "__fish_seen_subcommand_from remove" -f -l dry-run -d "Print the packages to be removed, but do not remove them" +complete -c vcpkg -n "__fish_seen_subcommand_from remove" -f -l outdated -d "Select all packages with versions that do not match the portfiles" + +# options for upgrade +complete -c vcpkg -n "__fish_seen_subcommand_from upgrade" -f -l no-dry-run -d "Actually upgrade" +complete -c vcpkg -n "__fish_seen_subcommand_from upgrade" -f -l keep-going -d "Continue installing packages on failure" diff --git a/externals/vcpkg/scripts/vcpkg_completion.zsh b/externals/vcpkg/scripts/vcpkg_completion.zsh new file mode 100755 index 000000000..ee499f671 --- /dev/null +++ b/externals/vcpkg/scripts/vcpkg_completion.zsh @@ -0,0 +1,9 @@ + +_vcpkg_completions() +{ + local vcpkg_executable=${COMP_WORDS[0]} + local remaining_command_line=${COMP_LINE:(${#vcpkg_executable}+1)} + COMPREPLY=($(${vcpkg_executable} autocomplete "${remaining_command_line}" -- 2>/dev/null)) +} + +complete -F _vcpkg_completions vcpkg diff --git a/externals/vcpkg/scripts/vcpkg_get_dep_info.cmake b/externals/vcpkg/scripts/vcpkg_get_dep_info.cmake new file mode 100755 index 000000000..92212b82d --- /dev/null +++ b/externals/vcpkg/scripts/vcpkg_get_dep_info.cmake @@ -0,0 +1,19 @@ +function(vcpkg_get_dep_info PORT VCPKG_TRIPLET_ID) + message("d8187afd-ea4a-4fc3-9aa4-a6782e1ed9af") + vcpkg_triplet_file(${VCPKG_TRIPLET_ID}) + + # GUID used as a flag - "cut here line" + message("c35112b6-d1ba-415b-aa5d-81de856ef8eb +VCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE} +VCPKG_CMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME} +VCPKG_CMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION} +VCPKG_LIBRARY_LINKAGE=${VCPKG_LIBRARY_LINKAGE} +VCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE} +VCPKG_DEP_INFO_OVERRIDE_VARS=${VCPKG_DEP_INFO_OVERRIDE_VARS} +CMAKE_HOST_SYSTEM_NAME=${CMAKE_HOST_SYSTEM_NAME} +CMAKE_HOST_SYSTEM_PROCESSOR=${CMAKE_HOST_SYSTEM_PROCESSOR} +CMAKE_HOST_SYSTEM_VERSION=${CMAKE_HOST_SYSTEM_VERSION} +CMAKE_HOST_SYSTEM=${CMAKE_HOST_SYSTEM} +e1e74b5c-18cb-4474-a6bd-5c1c8bc81f3f +8c504940-be29-4cba-9f8f-6cd83e9d87b7") +endfunction() diff --git a/externals/vcpkg/scripts/vcpkg_get_tags.cmake b/externals/vcpkg/scripts/vcpkg_get_tags.cmake new file mode 100755 index 000000000..6a948d129 --- /dev/null +++ b/externals/vcpkg/scripts/vcpkg_get_tags.cmake @@ -0,0 +1,33 @@ +function(vcpkg_get_tags PORT FEATURES VCPKG_TRIPLET_ID VCPKG_ABI_SETTINGS_FILE) + message("d8187afd-ea4a-4fc3-9aa4-a6782e1ed9af") + vcpkg_triplet_file(${VCPKG_TRIPLET_ID}) + + # GUID used as a flag - "cut here line" + message("c35112b6-d1ba-415b-aa5d-81de856ef8eb +VCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE} +VCPKG_CMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME} +VCPKG_CMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION} +VCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET} +VCPKG_VISUAL_STUDIO_PATH=${VCPKG_VISUAL_STUDIO_PATH} +VCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE} +VCPKG_BUILD_TYPE=${VCPKG_BUILD_TYPE} +VCPKG_LIBRARY_LINKAGE=${VCPKG_LIBRARY_LINKAGE} +VCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE} +VCPKG_DISABLE_COMPILER_TRACKING=${VCPKG_DISABLE_COMPILER_TRACKING} +e1e74b5c-18cb-4474-a6bd-5c1c8bc81f3f") + + # Just to enforce the user didn't set it in the triplet file + if (DEFINED VCPKG_PUBLIC_ABI_OVERRIDE) + set(VCPKG_PUBLIC_ABI_OVERRIDE) + message(WARNING "VCPKG_PUBLIC_ABI_OVERRIDE set in the triplet will be ignored.") + endif() + include("${VCPKG_ABI_SETTINGS_FILE}" OPTIONAL) + + message("c35112b6-d1ba-415b-aa5d-81de856ef8eb +VCPKG_PUBLIC_ABI_OVERRIDE=${VCPKG_PUBLIC_ABI_OVERRIDE} +VCPKG_ENV_PASSTHROUGH=${VCPKG_ENV_PASSTHROUGH} +VCPKG_ENV_PASSTHROUGH_UNTRACKED=${VCPKG_ENV_PASSTHROUGH_UNTRACKED} +VCPKG_LOAD_VCVARS_ENV=${VCPKG_LOAD_VCVARS_ENV} +e1e74b5c-18cb-4474-a6bd-5c1c8bc81f3f +8c504940-be29-4cba-9f8f-6cd83e9d87b7") +endfunction() diff --git a/externals/vcpkg/shell.nix b/externals/vcpkg/shell.nix new file mode 100755 index 000000000..accea1a0d --- /dev/null +++ b/externals/vcpkg/shell.nix @@ -0,0 +1,46 @@ +{ pkgs ? import {}, withX11 ? false }: + +(pkgs.buildFHSUserEnv { + name = "vcpkg"; + targetPkgs = pkgs: (with pkgs; [ + autoconf + automake + cmake + gcc + gettext + glibc.dev + gperf + libtool + libxkbcommon.dev + m4 + ninja + pkgconfig + zip + zstd.dev + ] ++ pkgs.lib.optionals withX11 [ + freetds + libdrm.dev + libglvnd.dev + mesa_drivers + mesa_glu.dev + mesa.dev + xlibs.libxcb.dev + xlibs.xcbutilimage.dev + xlibs.xcbutilwm.dev + xlibs.xorgserver.dev + xorg.libpthreadstubs + xorg.libX11.dev + xorg.libxcb.dev + xorg.libXext.dev + xorg.libXi.dev + xorg.xcbproto + xorg.xcbutil.dev + xorg.xcbutilcursor.dev + xorg.xcbutilerrors + xorg.xcbutilkeysyms.dev + xorg.xcbutilrenderutil.dev + xorg.xcbutilwm.dev + xorg.xorgproto + ]); + runScript = "bash"; +}).env \ No newline at end of file diff --git a/externals/vcpkg/toolsrc/VERSION.txt b/externals/vcpkg/toolsrc/VERSION.txt new file mode 100755 index 000000000..275e5a6e0 --- /dev/null +++ b/externals/vcpkg/toolsrc/VERSION.txt @@ -0,0 +1 @@ +"9999.99.99" diff --git a/externals/vcpkg/triplets/arm-uwp.cmake b/externals/vcpkg/triplets/arm-uwp.cmake new file mode 100755 index 000000000..d632c2211 --- /dev/null +++ b/externals/vcpkg/triplets/arm-uwp.cmake @@ -0,0 +1,7 @@ +set(VCPKG_TARGET_ARCHITECTURE arm) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) + +set(VCPKG_CMAKE_SYSTEM_NAME WindowsStore) +set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) + diff --git a/externals/vcpkg/triplets/arm64-windows.cmake b/externals/vcpkg/triplets/arm64-windows.cmake new file mode 100755 index 000000000..8769e975d --- /dev/null +++ b/externals/vcpkg/triplets/arm64-windows.cmake @@ -0,0 +1,3 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) diff --git a/externals/vcpkg/triplets/community/arm-android.cmake b/externals/vcpkg/triplets/community/arm-android.cmake new file mode 100755 index 000000000..29ba5655a --- /dev/null +++ b/externals/vcpkg/triplets/community/arm-android.cmake @@ -0,0 +1,4 @@ +set(VCPKG_TARGET_ARCHITECTURE arm) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_CMAKE_SYSTEM_NAME Android) diff --git a/externals/vcpkg/triplets/community/arm-ios.cmake b/externals/vcpkg/triplets/community/arm-ios.cmake new file mode 100755 index 000000000..7fee3751d --- /dev/null +++ b/externals/vcpkg/triplets/community/arm-ios.cmake @@ -0,0 +1,4 @@ +set(VCPKG_TARGET_ARCHITECTURE arm) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_CMAKE_SYSTEM_NAME iOS) diff --git a/externals/vcpkg/triplets/community/arm-linux.cmake b/externals/vcpkg/triplets/community/arm-linux.cmake new file mode 100755 index 000000000..6f69da83b --- /dev/null +++ b/externals/vcpkg/triplets/community/arm-linux.cmake @@ -0,0 +1,9 @@ +set(VCPKG_TARGET_ARCHITECTURE arm) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME Linux) + +if(NOT CMAKE_HOST_SYSTEM_PROCESSOR) + execute_process(COMMAND "uname" "-m" OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR OUTPUT_STRIP_TRAILING_WHITESPACE) +endif() diff --git a/externals/vcpkg/triplets/community/arm-mingw-dynamic.cmake b/externals/vcpkg/triplets/community/arm-mingw-dynamic.cmake new file mode 100755 index 000000000..b23870c11 --- /dev/null +++ b/externals/vcpkg/triplets/community/arm-mingw-dynamic.cmake @@ -0,0 +1,7 @@ +set(VCPKG_TARGET_ARCHITECTURE arm) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_ENV_PASSTHROUGH PATH) + +set(VCPKG_CMAKE_SYSTEM_NAME MinGW) +set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) diff --git a/externals/vcpkg/triplets/community/arm-mingw-static.cmake b/externals/vcpkg/triplets/community/arm-mingw-static.cmake new file mode 100755 index 000000000..ca99fac83 --- /dev/null +++ b/externals/vcpkg/triplets/community/arm-mingw-static.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE arm) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_ENV_PASSTHROUGH PATH) + +set(VCPKG_CMAKE_SYSTEM_NAME MinGW) diff --git a/externals/vcpkg/triplets/community/arm-neon-android.cmake b/externals/vcpkg/triplets/community/arm-neon-android.cmake new file mode 100755 index 000000000..29ba5655a --- /dev/null +++ b/externals/vcpkg/triplets/community/arm-neon-android.cmake @@ -0,0 +1,4 @@ +set(VCPKG_TARGET_ARCHITECTURE arm) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_CMAKE_SYSTEM_NAME Android) diff --git a/externals/vcpkg/triplets/community/arm-windows-static.cmake b/externals/vcpkg/triplets/community/arm-windows-static.cmake new file mode 100755 index 000000000..9ba5feed7 --- /dev/null +++ b/externals/vcpkg/triplets/community/arm-windows-static.cmake @@ -0,0 +1,3 @@ +set(VCPKG_TARGET_ARCHITECTURE arm) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) diff --git a/externals/vcpkg/triplets/community/arm-windows.cmake b/externals/vcpkg/triplets/community/arm-windows.cmake new file mode 100755 index 000000000..3aa75933f --- /dev/null +++ b/externals/vcpkg/triplets/community/arm-windows.cmake @@ -0,0 +1,5 @@ +set(VCPKG_TARGET_ARCHITECTURE arm) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) + + diff --git a/externals/vcpkg/triplets/community/arm64-android.cmake b/externals/vcpkg/triplets/community/arm64-android.cmake new file mode 100755 index 000000000..20b255d39 --- /dev/null +++ b/externals/vcpkg/triplets/community/arm64-android.cmake @@ -0,0 +1,4 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_CMAKE_SYSTEM_NAME Android) diff --git a/externals/vcpkg/triplets/community/arm64-ios.cmake b/externals/vcpkg/triplets/community/arm64-ios.cmake new file mode 100755 index 000000000..c632e9381 --- /dev/null +++ b/externals/vcpkg/triplets/community/arm64-ios.cmake @@ -0,0 +1,4 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_CMAKE_SYSTEM_NAME iOS) diff --git a/externals/vcpkg/triplets/community/arm64-linux.cmake b/externals/vcpkg/triplets/community/arm64-linux.cmake new file mode 100755 index 000000000..5faf2f0a0 --- /dev/null +++ b/externals/vcpkg/triplets/community/arm64-linux.cmake @@ -0,0 +1,9 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME Linux) + +if(NOT CMAKE_HOST_SYSTEM_PROCESSOR) + execute_process(COMMAND "uname" "-m" OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR OUTPUT_STRIP_TRAILING_WHITESPACE) +endif() diff --git a/externals/vcpkg/triplets/community/arm64-mingw-dynamic.cmake b/externals/vcpkg/triplets/community/arm64-mingw-dynamic.cmake new file mode 100755 index 000000000..30ed204ed --- /dev/null +++ b/externals/vcpkg/triplets/community/arm64-mingw-dynamic.cmake @@ -0,0 +1,7 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_ENV_PASSTHROUGH PATH) + +set(VCPKG_CMAKE_SYSTEM_NAME MinGW) +set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) diff --git a/externals/vcpkg/triplets/community/arm64-mingw-static.cmake b/externals/vcpkg/triplets/community/arm64-mingw-static.cmake new file mode 100755 index 000000000..c4d88830f --- /dev/null +++ b/externals/vcpkg/triplets/community/arm64-mingw-static.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_ENV_PASSTHROUGH PATH) + +set(VCPKG_CMAKE_SYSTEM_NAME MinGW) diff --git a/externals/vcpkg/triplets/community/arm64-osx-dynamic.cmake b/externals/vcpkg/triplets/community/arm64-osx-dynamic.cmake new file mode 100755 index 000000000..c9b1243c9 --- /dev/null +++ b/externals/vcpkg/triplets/community/arm64-osx-dynamic.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) + +set(VCPKG_CMAKE_SYSTEM_NAME Darwin) +set(VCPKG_OSX_ARCHITECTURES arm64) diff --git a/externals/vcpkg/triplets/community/arm64-osx.cmake b/externals/vcpkg/triplets/community/arm64-osx.cmake new file mode 100755 index 000000000..62325a696 --- /dev/null +++ b/externals/vcpkg/triplets/community/arm64-osx.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME Darwin) +set(VCPKG_OSX_ARCHITECTURES arm64) diff --git a/externals/vcpkg/triplets/community/arm64-uwp.cmake b/externals/vcpkg/triplets/community/arm64-uwp.cmake new file mode 100755 index 000000000..b37c34e87 --- /dev/null +++ b/externals/vcpkg/triplets/community/arm64-uwp.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) + +set(VCPKG_CMAKE_SYSTEM_NAME WindowsStore) +set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) diff --git a/externals/vcpkg/triplets/community/arm64-windows-static-md.cmake b/externals/vcpkg/triplets/community/arm64-windows-static-md.cmake new file mode 100755 index 000000000..f798113e1 --- /dev/null +++ b/externals/vcpkg/triplets/community/arm64-windows-static-md.cmake @@ -0,0 +1,3 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) diff --git a/externals/vcpkg/triplets/community/arm64-windows-static.cmake b/externals/vcpkg/triplets/community/arm64-windows-static.cmake new file mode 100755 index 000000000..34c53f0a2 --- /dev/null +++ b/externals/vcpkg/triplets/community/arm64-windows-static.cmake @@ -0,0 +1,4 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) + diff --git a/externals/vcpkg/triplets/community/armv6-android.cmake b/externals/vcpkg/triplets/community/armv6-android.cmake new file mode 100755 index 000000000..29ba5655a --- /dev/null +++ b/externals/vcpkg/triplets/community/armv6-android.cmake @@ -0,0 +1,4 @@ +set(VCPKG_TARGET_ARCHITECTURE arm) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_CMAKE_SYSTEM_NAME Android) diff --git a/externals/vcpkg/triplets/community/ppc64le-linux.cmake b/externals/vcpkg/triplets/community/ppc64le-linux.cmake new file mode 100755 index 000000000..70fa5b44c --- /dev/null +++ b/externals/vcpkg/triplets/community/ppc64le-linux.cmake @@ -0,0 +1,5 @@ +set(VCPKG_TARGET_ARCHITECTURE ppc64le) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME Linux) diff --git a/externals/vcpkg/triplets/community/s390x-linux.cmake b/externals/vcpkg/triplets/community/s390x-linux.cmake new file mode 100755 index 000000000..0aaefda4e --- /dev/null +++ b/externals/vcpkg/triplets/community/s390x-linux.cmake @@ -0,0 +1,5 @@ +set(VCPKG_TARGET_ARCHITECTURE s390x) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME Linux) diff --git a/externals/vcpkg/triplets/community/wasm32-emscripten.cmake b/externals/vcpkg/triplets/community/wasm32-emscripten.cmake new file mode 100755 index 000000000..ece5d8a22 --- /dev/null +++ b/externals/vcpkg/triplets/community/wasm32-emscripten.cmake @@ -0,0 +1,24 @@ +set(VCPKG_ENV_PASSTHROUGH_UNTRACKED EMSCRIPTEN_ROOT EMSDK PATH) + +if(NOT DEFINED ENV{EMSCRIPTEN_ROOT}) + find_path(EMSCRIPTEN_ROOT "emcc") +else() + set(EMSCRIPTEN_ROOT "$ENV{EMSCRIPTEN_ROOT}") +endif() + +if(NOT EMSCRIPTEN_ROOT) + if(NOT DEFINED ENV{EMSDK}) + message(FATAL_ERROR "The emcc compiler not found in PATH") + endif() + set(EMSCRIPTEN_ROOT "$ENV{EMSDK}/upstream/emscripten") +endif() + +if(NOT EXISTS "${EMSCRIPTEN_ROOT}/cmake/Modules/Platform/Emscripten.cmake") + message(FATAL_ERROR "Emscripten.cmake toolchain file not found") +endif() + +set(VCPKG_TARGET_ARCHITECTURE wasm32) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_CMAKE_SYSTEM_NAME Emscripten) +set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${EMSCRIPTEN_ROOT}/cmake/Modules/Platform/Emscripten.cmake") diff --git a/externals/vcpkg/triplets/community/x64-android.cmake b/externals/vcpkg/triplets/community/x64-android.cmake new file mode 100755 index 000000000..6342ce536 --- /dev/null +++ b/externals/vcpkg/triplets/community/x64-android.cmake @@ -0,0 +1,4 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_CMAKE_SYSTEM_NAME Android) diff --git a/externals/vcpkg/triplets/community/x64-freebsd.cmake b/externals/vcpkg/triplets/community/x64-freebsd.cmake new file mode 100755 index 000000000..035c5e86a --- /dev/null +++ b/externals/vcpkg/triplets/community/x64-freebsd.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME FreeBSD) + diff --git a/externals/vcpkg/triplets/community/x64-ios.cmake b/externals/vcpkg/triplets/community/x64-ios.cmake new file mode 100755 index 000000000..0c93d6c68 --- /dev/null +++ b/externals/vcpkg/triplets/community/x64-ios.cmake @@ -0,0 +1,4 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_CMAKE_SYSTEM_NAME iOS) diff --git a/externals/vcpkg/triplets/community/x64-linux-release.cmake b/externals/vcpkg/triplets/community/x64-linux-release.cmake new file mode 100755 index 000000000..d7f3e2b25 --- /dev/null +++ b/externals/vcpkg/triplets/community/x64-linux-release.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME Linux) +set(VCPKG_BUILD_TYPE release) diff --git a/externals/vcpkg/triplets/community/x64-mingw-dynamic.cmake b/externals/vcpkg/triplets/community/x64-mingw-dynamic.cmake new file mode 100755 index 000000000..1f132cfe1 --- /dev/null +++ b/externals/vcpkg/triplets/community/x64-mingw-dynamic.cmake @@ -0,0 +1,7 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_ENV_PASSTHROUGH PATH) + +set(VCPKG_CMAKE_SYSTEM_NAME MinGW) +set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) diff --git a/externals/vcpkg/triplets/community/x64-mingw-static.cmake b/externals/vcpkg/triplets/community/x64-mingw-static.cmake new file mode 100755 index 000000000..28600f0cc --- /dev/null +++ b/externals/vcpkg/triplets/community/x64-mingw-static.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_ENV_PASSTHROUGH PATH) + +set(VCPKG_CMAKE_SYSTEM_NAME MinGW) diff --git a/externals/vcpkg/triplets/community/x64-openbsd.cmake b/externals/vcpkg/triplets/community/x64-openbsd.cmake new file mode 100755 index 000000000..9aa220a74 --- /dev/null +++ b/externals/vcpkg/triplets/community/x64-openbsd.cmake @@ -0,0 +1,8 @@ +# Use with +# VCPKG_FORCE_SYSTEM_BINARIES=1 ./vcpkg install brotli + +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME OpenBSD) diff --git a/externals/vcpkg/triplets/community/x64-osx-dynamic.cmake b/externals/vcpkg/triplets/community/x64-osx-dynamic.cmake new file mode 100755 index 000000000..21fc20578 --- /dev/null +++ b/externals/vcpkg/triplets/community/x64-osx-dynamic.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) + +set(VCPKG_CMAKE_SYSTEM_NAME Darwin) +set(VCPKG_OSX_ARCHITECTURES x86_64) diff --git a/externals/vcpkg/triplets/community/x64-osx-release.cmake b/externals/vcpkg/triplets/community/x64-osx-release.cmake new file mode 100755 index 000000000..64a2d07f5 --- /dev/null +++ b/externals/vcpkg/triplets/community/x64-osx-release.cmake @@ -0,0 +1,7 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME Darwin) +set(VCPKG_OSX_ARCHITECTURES x86_64) +set(VCPKG_BUILD_TYPE release) diff --git a/externals/vcpkg/triplets/community/x64-windows-release.cmake b/externals/vcpkg/triplets/community/x64-windows-release.cmake new file mode 100755 index 000000000..f6c40253a --- /dev/null +++ b/externals/vcpkg/triplets/community/x64-windows-release.cmake @@ -0,0 +1,4 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_BUILD_TYPE release) diff --git a/externals/vcpkg/triplets/community/x64-windows-static-md.cmake b/externals/vcpkg/triplets/community/x64-windows-static-md.cmake new file mode 100755 index 000000000..d7acd46a4 --- /dev/null +++ b/externals/vcpkg/triplets/community/x64-windows-static-md.cmake @@ -0,0 +1,3 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) diff --git a/externals/vcpkg/triplets/community/x86-android.cmake b/externals/vcpkg/triplets/community/x86-android.cmake new file mode 100755 index 000000000..ca0fbaeff --- /dev/null +++ b/externals/vcpkg/triplets/community/x86-android.cmake @@ -0,0 +1,4 @@ +set(VCPKG_TARGET_ARCHITECTURE x86) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_CMAKE_SYSTEM_NAME Android) diff --git a/externals/vcpkg/triplets/community/x86-freebsd.cmake b/externals/vcpkg/triplets/community/x86-freebsd.cmake new file mode 100755 index 000000000..62042c766 --- /dev/null +++ b/externals/vcpkg/triplets/community/x86-freebsd.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE x86) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME FreeBSD) + diff --git a/externals/vcpkg/triplets/community/x86-ios.cmake b/externals/vcpkg/triplets/community/x86-ios.cmake new file mode 100755 index 000000000..143b373b9 --- /dev/null +++ b/externals/vcpkg/triplets/community/x86-ios.cmake @@ -0,0 +1,4 @@ +set(VCPKG_TARGET_ARCHITECTURE x86) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_CMAKE_SYSTEM_NAME iOS) diff --git a/externals/vcpkg/triplets/community/x86-mingw-dynamic.cmake b/externals/vcpkg/triplets/community/x86-mingw-dynamic.cmake new file mode 100755 index 000000000..000b36d96 --- /dev/null +++ b/externals/vcpkg/triplets/community/x86-mingw-dynamic.cmake @@ -0,0 +1,7 @@ +set(VCPKG_TARGET_ARCHITECTURE x86) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_ENV_PASSTHROUGH PATH) + +set(VCPKG_CMAKE_SYSTEM_NAME MinGW) +set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) diff --git a/externals/vcpkg/triplets/community/x86-mingw-static.cmake b/externals/vcpkg/triplets/community/x86-mingw-static.cmake new file mode 100755 index 000000000..3769b85f0 --- /dev/null +++ b/externals/vcpkg/triplets/community/x86-mingw-static.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE x86) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_ENV_PASSTHROUGH PATH) + +set(VCPKG_CMAKE_SYSTEM_NAME MinGW) diff --git a/externals/vcpkg/triplets/community/x86-uwp.cmake b/externals/vcpkg/triplets/community/x86-uwp.cmake new file mode 100755 index 000000000..13b9d77c2 --- /dev/null +++ b/externals/vcpkg/triplets/community/x86-uwp.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE x86) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) + +set(VCPKG_CMAKE_SYSTEM_NAME WindowsStore) +set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) diff --git a/externals/vcpkg/triplets/community/x86-windows-static-md.cmake b/externals/vcpkg/triplets/community/x86-windows-static-md.cmake new file mode 100755 index 000000000..22abeaf2d --- /dev/null +++ b/externals/vcpkg/triplets/community/x86-windows-static-md.cmake @@ -0,0 +1,3 @@ +set(VCPKG_TARGET_ARCHITECTURE x86) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) diff --git a/externals/vcpkg/triplets/community/x86-windows-static.cmake b/externals/vcpkg/triplets/community/x86-windows-static.cmake new file mode 100755 index 000000000..c855f0caa --- /dev/null +++ b/externals/vcpkg/triplets/community/x86-windows-static.cmake @@ -0,0 +1,3 @@ +set(VCPKG_TARGET_ARCHITECTURE x86) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) \ No newline at end of file diff --git a/externals/vcpkg/triplets/community/x86-windows-v120.cmake b/externals/vcpkg/triplets/community/x86-windows-v120.cmake new file mode 100755 index 000000000..9cc6c315e --- /dev/null +++ b/externals/vcpkg/triplets/community/x86-windows-v120.cmake @@ -0,0 +1,5 @@ +set(VCPKG_TARGET_ARCHITECTURE x86) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_PLATFORM_TOOLSET "v120") +set(VCPKG_DEP_INFO_OVERRIDE_VARS "v120") \ No newline at end of file diff --git a/externals/vcpkg/triplets/x64-linux.cmake b/externals/vcpkg/triplets/x64-linux.cmake new file mode 100755 index 000000000..882213456 --- /dev/null +++ b/externals/vcpkg/triplets/x64-linux.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME Linux) + diff --git a/externals/vcpkg/triplets/x64-osx.cmake b/externals/vcpkg/triplets/x64-osx.cmake new file mode 100755 index 000000000..3867590df --- /dev/null +++ b/externals/vcpkg/triplets/x64-osx.cmake @@ -0,0 +1,7 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME Darwin) +set(VCPKG_OSX_ARCHITECTURES x86_64) + diff --git a/externals/vcpkg/triplets/x64-uwp.cmake b/externals/vcpkg/triplets/x64-uwp.cmake new file mode 100755 index 000000000..902d8c238 --- /dev/null +++ b/externals/vcpkg/triplets/x64-uwp.cmake @@ -0,0 +1,7 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) + +set(VCPKG_CMAKE_SYSTEM_NAME WindowsStore) +set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) + diff --git a/externals/vcpkg/triplets/x64-windows-static.cmake b/externals/vcpkg/triplets/x64-windows-static.cmake new file mode 100755 index 000000000..1581d2b0f --- /dev/null +++ b/externals/vcpkg/triplets/x64-windows-static.cmake @@ -0,0 +1,4 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) + diff --git a/externals/vcpkg/triplets/x64-windows.cmake b/externals/vcpkg/triplets/x64-windows.cmake new file mode 100755 index 000000000..d0be7297f --- /dev/null +++ b/externals/vcpkg/triplets/x64-windows.cmake @@ -0,0 +1,4 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) + diff --git a/externals/vcpkg/triplets/x86-windows.cmake b/externals/vcpkg/triplets/x86-windows.cmake new file mode 100755 index 000000000..93c43c3ba --- /dev/null +++ b/externals/vcpkg/triplets/x86-windows.cmake @@ -0,0 +1,4 @@ +set(VCPKG_TARGET_ARCHITECTURE x86) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) + diff --git a/externals/vcpkg/versions/3-/3fd.json b/externals/vcpkg/versions/3-/3fd.json new file mode 100755 index 000000000..a4398c8df --- /dev/null +++ b/externals/vcpkg/versions/3-/3fd.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "3b52e6aff44ca4e11335754570701f692ea14184", + "version": "2.6.3", + "port-version": 2 + }, + { + "git-tree": "622078647d4fff0a51a26a4ecff2ba9109e5764d", + "version": "2.6.3", + "port-version": 1 + }, + { + "git-tree": "73ad3c823ef701c37421b450a34271d6beaf7b07", + "version-string": "2.6.3", + "port-version": 0 + }, + { + "git-tree": "70ed3ae824a2f31ed56b6c6105232bfe2aebe43e", + "version-string": "2.6.2", + "port-version": 3 + }, + { + "git-tree": "abd29087cbcde4a7416618fea70094c09fa16c37", + "version-string": "2.6.2-3", + "port-version": 0 + }, + { + "git-tree": "963060040c3ca463d17136e39c7317efb15eb6a5", + "version-string": "2.6.2-2", + "port-version": 0 + }, + { + "git-tree": "548c90710d59c174aa9ab10a24deb69f1d75ff8f", + "version-string": "2.6.2-1", + "port-version": 0 + }, + { + "git-tree": "67d60699c271b7716279fdea5a5c6543929eb90e", + "version-string": "2.6.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/7-/7zip.json b/externals/vcpkg/versions/7-/7zip.json new file mode 100755 index 000000000..49dd64b19 --- /dev/null +++ b/externals/vcpkg/versions/7-/7zip.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "d60561160384264eaf45a225dcb41beccb87ecbc", + "version-string": "21.07", + "port-version": 1 + }, + { + "git-tree": "7a951689070e40d8ff0ed20b4e18bc533ef5db1f", + "version-string": "21.07", + "port-version": 0 + }, + { + "git-tree": "54b143613df50187b48517d63796569641c4eee7", + "version-string": "19.00", + "port-version": 4 + }, + { + "git-tree": "c49050bcc9af0a2cbd9c572386e6a8b547ebd9f7", + "version-string": "19.00", + "port-version": 3 + }, + { + "git-tree": "64b14288536f6e4de77972a54ebf5277780ce222", + "version-string": "19.00", + "port-version": 2 + }, + { + "git-tree": "40d15a494f1cc001c6150ced483f21acc037ce9d", + "version-string": "19.00", + "port-version": 1 + }, + { + "git-tree": "85736d9cce870e956f244b78cf384be7afb18f0f", + "version-string": "19.00", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/abseil.json b/externals/vcpkg/versions/a-/abseil.json new file mode 100755 index 000000000..5b24f90a9 --- /dev/null +++ b/externals/vcpkg/versions/a-/abseil.json @@ -0,0 +1,329 @@ +{ + "versions": [ + { + "git-tree": "962a81319706d17c9e90bd0b873659ec7c75178a", + "version-string": "20211102.1", + "port-version": 0 + }, + { + "git-tree": "10d137aa21adc696f8469d49f67b90ce0d50e1a1", + "version-string": "20210324.2", + "port-version": 1 + }, + { + "git-tree": "231cc80bbfb1e54466799ddb6a94dc6d15e7d39b", + "version-string": "20210324.2", + "port-version": 0 + }, + { + "git-tree": "bae9c59114a4a2dc396452fb9e988a9da881b4f4", + "version-date": "2021-03-24", + "port-version": 1 + }, + { + "git-tree": "d58deb5198f8a1d72eafc3e1d6bdb36197fac470", + "version-date": "2021-03-24", + "port-version": 0 + }, + { + "git-tree": "184230b7622b1be5630f893dcecdaac7acde101f", + "version-string": "2020-09-23", + "port-version": 3 + }, + { + "git-tree": "1558fdc71dd0f0988cd2a53ba439bed3cc899247", + "version-string": "2020-09-23", + "port-version": 2 + }, + { + "git-tree": "3d9d65e41e314658c5e18839117ebf7f060b9cb7", + "version-string": "2020-09-23", + "port-version": 1 + }, + { + "git-tree": "4258e2e692cb3ee0ab68eb253ee8df5296fcc206", + "version-string": "2020-09-23", + "port-version": 0 + }, + { + "git-tree": "0d4dfbea87f5b8903a5db5ed3ed6851b6e6a3a79", + "version-string": "2020-03-03", + "port-version": 8 + }, + { + "git-tree": "28fa609b06eec70bb06e61891e94b94f35f7d06e", + "version-string": "2020-03-03", + "port-version": 7 + }, + { + "git-tree": "606b9214364983e5df021d0556dbec5e44f4b0a8", + "version-string": "2020-03-03-7", + "port-version": 0 + }, + { + "git-tree": "1f8a41353506f308128d9818ce82afefa8f5cbaa", + "version-string": "2020-03-03-6", + "port-version": 0 + }, + { + "git-tree": "f12f0fd203075e10e997740f9a859ff2afb8aef9", + "version-string": "2020-03-03-5", + "port-version": 0 + }, + { + "git-tree": "d87b9a5227dc88a046586fad46bdb087c8ee4a8a", + "version-string": "2020-03-03-4", + "port-version": 0 + }, + { + "git-tree": "574159a94de7e13a16df672d7694747d15b51b6e", + "version-string": "2020-03-03-3", + "port-version": 0 + }, + { + "git-tree": "83c70111363fd72030199cd4746febd5a3deb86b", + "version-string": "2020-03-03-2", + "port-version": 0 + }, + { + "git-tree": "3fe1459a1ed06573700901f46c55b8515125bcc8", + "version-string": "2020-03-03-1", + "port-version": 0 + }, + { + "git-tree": "cb05f05a1ee7fcc5b545e23387c0e97904181a45", + "version-string": "2020-03-03", + "port-version": 0 + }, + { + "git-tree": "42821eb6795ede2674126dd8a63a8270d625fb71", + "version-string": "2019-12-19", + "port-version": 0 + }, + { + "git-tree": "67ffa71966b97cce9af682a6ab313077e9e8fdec", + "version-string": "2019-05-08-1", + "port-version": 0 + }, + { + "git-tree": "b47a07ae7d4bf6245622289ad4f61d8378d4b4d4", + "version-string": "2019-05-08", + "port-version": 0 + }, + { + "git-tree": "219eed8e70aba774359db6a7305da67f5c37286c", + "version-string": "2019-05-07", + "port-version": 0 + }, + { + "git-tree": "1290314a9cc3848d55f78ba479a1e8010c3575c1", + "version-string": "2019-04-19-1", + "port-version": 0 + }, + { + "git-tree": "f4ab7cf4b0d4c7936dd92670bc80d1da7935754d", + "version-string": "2019-04-19", + "port-version": 0 + }, + { + "git-tree": "d1c95bdf0be59c5169d4585159c3ede6cdd0f648", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "0ec930976860b806e67ccd7e317f3409e7312d31", + "version-string": "2019_01_30-1", + "port-version": 0 + }, + { + "git-tree": "474e0d01ab4f28129b27d8bb206a12f0b6083cf6", + "version-string": "2019-01-30", + "port-version": 0 + }, + { + "git-tree": "b1dc60998cf959863511719bb8f652415b0c3616", + "version-string": "2019-01-09-1", + "port-version": 0 + }, + { + "git-tree": "c72de9332fdffd942d9f8faab0d467b4b7a4517d", + "version-string": "2018-12-14", + "port-version": 0 + }, + { + "git-tree": "a486c9d12f167abdf62e82705f8de0c1d6800b86", + "version-string": "2018-11-08-1", + "port-version": 0 + }, + { + "git-tree": "6e5c38debfc9ba9095f7b541c4004bc6d91dfb53", + "version-string": "2018-11-08", + "port-version": 0 + }, + { + "git-tree": "6a7a573563cfb875a1cb6d14ff7a256949206d26", + "version-string": "2018-11-01", + "port-version": 0 + }, + { + "git-tree": "340bbf898c959ea9873328e54dd4f6243b9f6101", + "version-string": "2018-10-25", + "port-version": 0 + }, + { + "git-tree": "e58db76030f30c070b6682ceaab92bce107b689c", + "version-string": "2018-10-11", + "port-version": 0 + }, + { + "git-tree": "389bc4ecb350878ce52467d94de8f15d3faa2465", + "version-string": "2018-09-18-3", + "port-version": 0 + }, + { + "git-tree": "9014f0fed8d78a07f17f0f31ff979cbc978b455b", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "b5fb3ddc7aedb015cce6001f91eada613d5c12f2", + "version-string": "2018-08-03", + "port-version": 0 + }, + { + "git-tree": "918f4b2105b2b2804e3037eb8cb9ec78442373bd", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "f1574d6d5ac00c0eb3c841705c8309e9299ea09a", + "version-string": "2018-07-08", + "port-version": 0 + }, + { + "git-tree": "ed2c2706442eae786013ac1e96aa1c305e472f0d", + "version-string": "2018-07-03", + "port-version": 0 + }, + { + "git-tree": "87deb0db1be83281dfa8bdda25d0682039797e3e", + "version-string": "2018-07-01", + "port-version": 0 + }, + { + "git-tree": "efdfc3d7e6bb0ea93b9ab714d428e328cd387e00", + "version-string": "2018-06-15", + "port-version": 0 + }, + { + "git-tree": "221188807a3daefbdd47860678e3d694a75881f6", + "version-string": "2018-06-12-1", + "port-version": 0 + }, + { + "git-tree": "efe7369a1c9660b854d72fbfc236a7c7853160f9", + "version-string": "2018-05-01-1", + "port-version": 0 + }, + { + "git-tree": "86be3d78ea2cda31298e855723eeabc1e01956d8", + "version-string": "2018-04-25-1", + "port-version": 0 + }, + { + "git-tree": "8542937b2ad319fac2b555dff1db37158efe0f9d", + "version-string": "2018-04-12", + "port-version": 0 + }, + { + "git-tree": "cfbabf336133d3277c875863885aeb21bbe94672", + "version-string": "2018-04-09", + "port-version": 0 + }, + { + "git-tree": "fe36a137929999662114548bb9cb805300f9f7f4", + "version-string": "2018-04-05", + "port-version": 0 + }, + { + "git-tree": "8271c3e6bb3cd27ffffff70d044dedeadcabce5e", + "version-string": "2018-04-02", + "port-version": 0 + }, + { + "git-tree": "9b7bd36ba59ae3d43ec88e8f31bccb3820147d90", + "version-string": "2018-03-29", + "port-version": 0 + }, + { + "git-tree": "fe36d92dbdc2c773ee0808305af8bb04c7f7e1ae", + "version-string": "2018-03-27", + "port-version": 0 + }, + { + "git-tree": "f9206e416a8f76f9cfdcb34e18ebdc6364a68e09", + "version-string": "2018-03-23", + "port-version": 0 + }, + { + "git-tree": "d974de4bf17feeff3b1dd02938ce71c4faa0dae5", + "version-string": "2018-03-20", + "port-version": 0 + }, + { + "git-tree": "9c62ecef7e2c6fd477828349bd479ff8ae7829ff", + "version-string": "2018-03-17", + "port-version": 0 + }, + { + "git-tree": "68068406842e8cadd24cec3d4fa92e4a4c5a1762", + "version-string": "2018-03-14", + "port-version": 0 + }, + { + "git-tree": "4c47db1ff8f8cc3667f50479330149ce74fd51ea", + "version-string": "2018-03-13", + "port-version": 0 + }, + { + "git-tree": "8171362241e62f412834c7bb2a8f32645479f3a2", + "version-string": "2018-03-07", + "port-version": 0 + }, + { + "git-tree": "ad7f8d103d0150e9f0d26a8b15d3d254366dcf99", + "version-string": "2018-03-02", + "port-version": 0 + }, + { + "git-tree": "f937714f50ad98cbfe320864d1f91aaba042ba43", + "version-string": "2018-2-23", + "port-version": 0 + }, + { + "git-tree": "21c19b70eb5a2e072cbbc143834a70210ed2f60f", + "version-string": "2018-2-5", + "port-version": 0 + }, + { + "git-tree": "6c87b15fce15d6781c993ce619fa1cd8ca34cb6e", + "version-string": "2017-11-10-1", + "port-version": 0 + }, + { + "git-tree": "76598c99218db15f5e300e26ec75e29e8c4b8e10", + "version-string": "2017-11-10", + "port-version": 0 + }, + { + "git-tree": "84bd3ac433569058fe7e58defc219e939917daab", + "version-string": "2017-10-14", + "port-version": 0 + }, + { + "git-tree": "01ef56b603dac7b3e3bbefac09df439e2d159219", + "version-string": "2017-09-28", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/absent.json b/externals/vcpkg/versions/a-/absent.json new file mode 100755 index 000000000..7d0a280ea --- /dev/null +++ b/externals/vcpkg/versions/a-/absent.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "d1f1f8e5f036e686e2a7881d4b8594f737196090", + "version-string": "0.3.1", + "port-version": 1 + }, + { + "git-tree": "872663f3498a2b8f0a6d0e0503c4c2838438b42d", + "version-string": "0.3.1", + "port-version": 0 + }, + { + "git-tree": "547cd60c3353637f8124cc2a2f4c8c1f82c3b216", + "version-string": "0.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/ace.json b/externals/vcpkg/versions/a-/ace.json new file mode 100755 index 000000000..b9dd64eba --- /dev/null +++ b/externals/vcpkg/versions/a-/ace.json @@ -0,0 +1,244 @@ +{ + "versions": [ + { + "git-tree": "d20fc0a9eac1744ff9fb5c5427eade58234e35c9", + "version": "7.0.6", + "port-version": 3 + }, + { + "git-tree": "0ad9c09c1663f5264f5bf5dcbe1d402618973144", + "version": "7.0.6", + "port-version": 2 + }, + { + "git-tree": "cac33553b152f59e730715fcc1bae263bb037862", + "version": "7.0.6", + "port-version": 1 + }, + { + "git-tree": "c851425112d4af710db29d482e43a15ade7ee463", + "version": "7.0.6", + "port-version": 0 + }, + { + "git-tree": "2fdbe23020728d91dbae5249ed04b42b4b882a87", + "version": "7.0.5", + "port-version": 3 + }, + { + "git-tree": "1801922b3e4808edcd0b55b6a800bbb1c01687a6", + "version": "7.0.5", + "port-version": 2 + }, + { + "git-tree": "036533c7b1153d148040334e7195557ce41265e9", + "version": "7.0.5", + "port-version": 1 + }, + { + "git-tree": "bcc74bda3a7d8c6a93ff6ff5866de20612661fc3", + "version": "7.0.5", + "port-version": 0 + }, + { + "git-tree": "c58c295074b4a00a80b4e684f9a876ed369cdd49", + "version": "7.0.3", + "port-version": 3 + }, + { + "git-tree": "67c57059b237310a1907da692fc75acb3d8d2726", + "version": "7.0.3", + "port-version": 2 + }, + { + "git-tree": "d4585581f988569d9428b693540dbd6f8305be8d", + "version": "7.0.3", + "port-version": 1 + }, + { + "git-tree": "321d63a1abf3c6c213c8870bb658ee842a70ede7", + "version-string": "7.0.3", + "port-version": 0 + }, + { + "git-tree": "f29d3acc8eb434569566d4300239ab584b32a3c5", + "version-string": "7.0.2", + "port-version": 0 + }, + { + "git-tree": "f78fceaf77115253b6aac710881d0d8f705fead6", + "version-string": "7.0.1", + "port-version": 0 + }, + { + "git-tree": "fefdf115c09a6996c55262dd9a635647dc7d8440", + "version-string": "7.0.0", + "port-version": 0 + }, + { + "git-tree": "8b23f37d4b1c965115ae6fbe79686605997fe659", + "version-string": "6.5.12", + "port-version": 1 + }, + { + "git-tree": "3ec027b385329149d469f4425ece1c448170927b", + "version-string": "6.5.12", + "port-version": 0 + }, + { + "git-tree": "9b700b928b55baac62dc2f808ba366fc065ea085", + "version-string": "6.5.11", + "port-version": 0 + }, + { + "git-tree": "b46a375bbc0f75a69943381ffdfcd715596a4fae", + "version-string": "6.5.10", + "port-version": 0 + }, + { + "git-tree": "012391958fe8d6dae00b0ea5a3bb8ea74f2fba85", + "version-string": "6.5.9-5", + "port-version": 0 + }, + { + "git-tree": "31f1639de02c65ddfe0dc41dee23dd2f7efd9c6f", + "version-string": "6.5.9-4", + "port-version": 0 + }, + { + "git-tree": "4c5ea2580f2bc59411d4b471f18a4670565e60ef", + "version-string": "6.5.9-3", + "port-version": 0 + }, + { + "git-tree": "fffc7828cdb75b3bdaac0c2565f8342f210a1f65", + "version-string": "6.5.9-2", + "port-version": 0 + }, + { + "git-tree": "6de81bc1ec54191accc6d2d88a804eeff228f085", + "version-string": "6.5.9-1", + "port-version": 0 + }, + { + "git-tree": "5a2c4cff39253124f54b94cae24b3a0b59e42092", + "version-string": "6.5.9", + "port-version": 0 + }, + { + "git-tree": "ec3d4336726ef2438b0c6f8995827d60380ce55c", + "version-string": "6.5.8-1", + "port-version": 0 + }, + { + "git-tree": "e32b36ec3da04f9a3e0bc4afc7aa888be3346787", + "version-string": "6.5.8", + "port-version": 0 + }, + { + "git-tree": "dc23482187fda6854e6893d9ebf6aa2bded873dc", + "version-string": "6.5.7-1", + "port-version": 0 + }, + { + "git-tree": "08d3e2a110c4bbec49243d1ec0e6a6101a823f84", + "version-string": "6.5.7", + "port-version": 0 + }, + { + "git-tree": "a4ea954de4af8ebe3adfadc9dcb5dfcfa82a0b51", + "version-string": "6.5.6", + "port-version": 0 + }, + { + "git-tree": "ef0d308766c81587020090166f0c76178ebda2da", + "version-string": "6.5.5-1", + "port-version": 0 + }, + { + "git-tree": "46b028f234eeddb808c0a870bc3002f03745d740", + "version-string": "6.5.5", + "port-version": 0 + }, + { + "git-tree": "57b537f14ea8f6257f7cb13633a57d1338c9e7c8", + "version-string": "6.5.4-3", + "port-version": 0 + }, + { + "git-tree": "8f66b7308ead7caee78459a54b2e856597e5f36c", + "version-string": "6.5.4-2", + "port-version": 0 + }, + { + "git-tree": "670773498c9568c9e3607eb9890b630524692136", + "version-string": "6.5.4-1", + "port-version": 0 + }, + { + "git-tree": "937c1bc48daca299b8569669ffe9b5e56bd01077", + "version-string": "6.5.4", + "port-version": 0 + }, + { + "git-tree": "33579fee5a02f1e46b1644a63594cfca3b6b205e", + "version-string": "6.5.3", + "port-version": 0 + }, + { + "git-tree": "313520797b6ca7af4651b4e10b28a6a3660e3b66", + "version-string": "6.5.2", + "port-version": 0 + }, + { + "git-tree": "f953ba30fe110708ac69e32a95b9a070cdb00a27", + "version-string": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "cbf8d6ec29760d00f3eb3fb018e2384cf53c5b27", + "version-string": "6.5.0", + "port-version": 0 + }, + { + "git-tree": "7267b96c7f7828997a37cda85a3e4356e0314b15", + "version-string": "6.4.8", + "port-version": 0 + }, + { + "git-tree": "4c1478889623de771a7382e6a497c2406f781161", + "version-string": "6.4.7", + "port-version": 0 + }, + { + "git-tree": "e390406693383b179cb83feb0e6c7ca430233286", + "version-string": "6.4.6", + "port-version": 0 + }, + { + "git-tree": "e97361d3b4fe96846a1f2e46b95e62d731192a36", + "version-string": "6.4.5", + "port-version": 0 + }, + { + "git-tree": "3eda18a0204a25e9269a69c60f7980e7710eef74", + "version-string": "6.4.4", + "port-version": 0 + }, + { + "git-tree": "d4286f1a52e8dfe240663e97d0c70f18597f2515", + "version-string": "6.4.3", + "port-version": 0 + }, + { + "git-tree": "ee618e8a429a56b4ae412bd43bab859a8592294f", + "version-string": "6.4.2", + "port-version": 0 + }, + { + "git-tree": "cbfc33d5980b991b984c2877a2c39fbcaca40c6f", + "version-string": "6.4.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/activemq-cpp.json b/externals/vcpkg/versions/a-/activemq-cpp.json new file mode 100755 index 000000000..6403895d7 --- /dev/null +++ b/externals/vcpkg/versions/a-/activemq-cpp.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "4f5d3901f612afe54e714fb14e47d343822e398e", + "version-semver": "3.9.5", + "port-version": 9 + }, + { + "git-tree": "ec8c68847a3d3950cec058e76a3963fac34fd682", + "version-semver": "3.9.5", + "port-version": 8 + }, + { + "git-tree": "531d21bab7c2d9e9e2ecb1c84e6cf9f1c6173a51", + "version-semver": "3.9.5", + "port-version": 7 + }, + { + "git-tree": "0d1c131172bea536490960f632ac287b3db73edb", + "version-semver": "3.9.5", + "port-version": 6 + }, + { + "git-tree": "bce9f87e7df6f4e8a9c3121018ffc032e3d2603e", + "version-semver": "3.9.5", + "port-version": 5 + }, + { + "git-tree": "13f5f938c4d12bf4a62061f9891f77e7fc03fc23", + "version-string": "3.9.5", + "port-version": 4 + }, + { + "git-tree": "edc82536f9d433e0f473a11a534b1e443e9ea3f4", + "version-string": "3.9.5-3", + "port-version": 0 + }, + { + "git-tree": "a00bfbcafac2b0c183530c0cd0ed9e399bf2889c", + "version-string": "3.9.5-2", + "port-version": 0 + }, + { + "git-tree": "06fc338f511f5f31eb5e823bb7de4db82a32ba5e", + "version-string": "3.9.5-1", + "port-version": 0 + }, + { + "git-tree": "492c064ceb9259a0299ab04df98e0ea8efe35725", + "version-string": "3.9.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/ade.json b/externals/vcpkg/versions/a-/ade.json new file mode 100755 index 000000000..063198687 --- /dev/null +++ b/externals/vcpkg/versions/a-/ade.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "ca6a81fb330a77f6aa4c58b63af7efcbe1643e62", + "version-string": "0.1.1f", + "port-version": 2 + }, + { + "git-tree": "91083eb87a39190e6c0296d72931a8d39edcc7cd", + "version-string": "0.1.1f", + "port-version": 1 + }, + { + "git-tree": "e767fb59fbab737caf770f1aec618a17b503c321", + "version-string": "0.1.1f", + "port-version": 0 + }, + { + "git-tree": "c03d856ae43b5442e4b5b5e90068832b29e46aa7", + "version-string": "0.1.1e", + "port-version": 0 + }, + { + "git-tree": "85edf1c81b1a1127728e98c1b408a36f021877a3", + "version-string": "0.1.1d", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/advobfuscator.json b/externals/vcpkg/versions/a-/advobfuscator.json new file mode 100755 index 000000000..09987baf5 --- /dev/null +++ b/externals/vcpkg/versions/a-/advobfuscator.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c2b62f4dec8c15ff80008d187ca640ec844679cf", + "version-date": "2020-06-26", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/air-ctl.json b/externals/vcpkg/versions/a-/air-ctl.json new file mode 100755 index 000000000..a96aef4ef --- /dev/null +++ b/externals/vcpkg/versions/a-/air-ctl.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "f903c4c9124f693bab3174cca9bba73ed068bbb4", + "version": "1.0.0", + "port-version": 1 + }, + { + "git-tree": "7f997c28da50f2d8c86639da2c7beab3a00189ce", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/aixlog.json b/externals/vcpkg/versions/a-/aixlog.json new file mode 100755 index 000000000..6fa24783c --- /dev/null +++ b/externals/vcpkg/versions/a-/aixlog.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "dd7db7eb82342728ee7a0e93ce1d446d834232c2", + "version": "1.5.0", + "port-version": 1 + }, + { + "git-tree": "ca812db174980bd0007da672c5ec4dd52134bf73", + "version-semver": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "b75ca5f2a37de51c0e0b369a124fb0ae5a05d323", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "f9146c4e4e54b27fc70131dc02b4ccc8f215c56e", + "version-string": "1.2.4", + "port-version": 0 + }, + { + "git-tree": "d5ee8c1580e08da8872ca3725845cb93b0bdd251", + "version-string": "1.2.2", + "port-version": 0 + }, + { + "git-tree": "cf91ab61a055e89e263e0de41e6da25a968e7904", + "version-string": "1.2.1-1", + "port-version": 0 + }, + { + "git-tree": "4169bbdf0aca9ef1f6f2f7552e45e308a25f29d7", + "version-string": "1.2.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/akali.json b/externals/vcpkg/versions/a-/akali.json new file mode 100755 index 000000000..4d9c7e16a --- /dev/null +++ b/externals/vcpkg/versions/a-/akali.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "a0090858a22905c2856b8796f852d1a403081be7", + "version": "1.43", + "port-version": 1 + }, + { + "git-tree": "5e97f0348cd1def4c594fda413436a01609923ec", + "version": "1.43", + "port-version": 0 + }, + { + "git-tree": "44ab167f077406e598eb19f7e48f10b638bc1547", + "version-string": "1.42", + "port-version": 3 + }, + { + "git-tree": "1b94b1623b0778525e405410cee7d6d069ac56ca", + "version-string": "1.42", + "port-version": 2 + }, + { + "git-tree": "29f022ed905404ee53af3197de0f01afb22c15dd", + "version-string": "1.42", + "port-version": 1 + }, + { + "git-tree": "853f2563be7dfce5e0d8cd341b6d7bb0bc168dc3", + "version-string": "1.42", + "port-version": 0 + }, + { + "git-tree": "1ad229b03a2a137effc57a038a0483d0bcf923b2", + "version-string": "1.41", + "port-version": 1 + }, + { + "git-tree": "0308674259f709ce412a0a960fd014cffecdfd08", + "version-string": "1.41", + "port-version": 0 + }, + { + "git-tree": "4234ffec7e9a98ba5950636e8930c29b52f4e03d", + "version-string": "1.39", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/alac-decoder.json b/externals/vcpkg/versions/a-/alac-decoder.json new file mode 100755 index 000000000..2a58e7478 --- /dev/null +++ b/externals/vcpkg/versions/a-/alac-decoder.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "e4bc6809ac5b52236ec0ea4d48cfa904f493ab21", + "version-string": "0.2", + "port-version": 5 + }, + { + "git-tree": "1ad081bc124fafdd099eca78f1a7f9a0ea99cc61", + "version-string": "0.2", + "port-version": 4 + }, + { + "git-tree": "b9b65f791964c956a1fa9b5a948c09efdfa6ceb5", + "version-string": "0.2-3", + "port-version": 0 + }, + { + "git-tree": "f4ec04b6d879e15cd93cc25270989e36e7e95d14", + "version-string": "0.2-1", + "port-version": 0 + }, + { + "git-tree": "86b3b9d0796b7ee5fabb737fd6802aa76b6c5adc", + "version-string": "0.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/alac.json b/externals/vcpkg/versions/a-/alac.json new file mode 100755 index 000000000..df4158718 --- /dev/null +++ b/externals/vcpkg/versions/a-/alac.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "4b325e9f42af74eca82fae2a845a5108b06b44ce", + "version-string": "2017-11-03-c38887c5", + "port-version": 2 + }, + { + "git-tree": "2a3cdc11a3c1cdcfc947dfd0f3fa18c40e4091b6", + "version-string": "2017-11-03-c38887c5-1", + "port-version": 0 + }, + { + "git-tree": "20da8404615cb13666efac35d2187d3c73ee3eb0", + "version-string": "2017-11-03-c38887c5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/alembic.json b/externals/vcpkg/versions/a-/alembic.json new file mode 100755 index 000000000..8bebb133f --- /dev/null +++ b/externals/vcpkg/versions/a-/alembic.json @@ -0,0 +1,154 @@ +{ + "versions": [ + { + "git-tree": "16bef528ef38e7426a333739878188d9ca909bc5", + "version": "1.8.3", + "port-version": 1 + }, + { + "git-tree": "8cb082c36da272a988b08fe0c4c638ff62cb1ad2", + "version": "1.8.3", + "port-version": 0 + }, + { + "git-tree": "058a9ce893dbaf6ad6d2743b47a9c633eff3798a", + "version": "1.7.16", + "port-version": 1 + }, + { + "git-tree": "41cf27d8f6792056c456e4640f20f13a016db205", + "version-string": "1.7.16", + "port-version": 0 + }, + { + "git-tree": "f08ae63294c12debee9b5b6f0e1dfc54fb56b023", + "version-string": "1.7.15", + "port-version": 0 + }, + { + "git-tree": "6f7aff420c086cead0dfc14409393d614fe3cfb2", + "version-string": "1.7.13", + "port-version": 1 + }, + { + "git-tree": "3d9b782158bdfe5148bbf86c53fecaff6bb8671f", + "version-string": "1.7.13", + "port-version": 0 + }, + { + "git-tree": "86a501ebd47e6eb4d809d9310bf6525f59e2d555", + "version-string": "1.7.12", + "port-version": 2 + }, + { + "git-tree": "c8ba9dbbcf4ebff8fc86253f361eb3f01d51613f", + "version-string": "1.7.12-1", + "port-version": 0 + }, + { + "git-tree": "bc2cd117c898e2385afdf00dd3cef8aaf25fcb46", + "version-string": "1.7.12", + "port-version": 0 + }, + { + "git-tree": "0a82b1d59bd85a0d2e46e5688ac5bddf7b5abcae", + "version-string": "1.7.11-6", + "port-version": 0 + }, + { + "git-tree": "16238952f8ea025df971839c2009cd49a0a3fac9", + "version-string": "1.7.11-5", + "port-version": 0 + }, + { + "git-tree": "4bb5f9ced085059ea62e03fa39efaca0fbea4247", + "version-string": "1.7.11-4", + "port-version": 0 + }, + { + "git-tree": "206e194854b1a72bccf94677aa673a0a4730f320", + "version-string": "1.7.11-3", + "port-version": 0 + }, + { + "git-tree": "85399a4537af6b4110360a7027afe6d1a86df9df", + "version-string": "1.7.11-2", + "port-version": 0 + }, + { + "git-tree": "8a431c2ee4fc4a8bd209f1c0f661fec6c5250676", + "version-string": "1.7.11", + "port-version": 0 + }, + { + "git-tree": "3a6833d65d3406fd17cf5126d3de8e7fab59e676", + "version-string": "1.7.10-1", + "port-version": 0 + }, + { + "git-tree": "0433eda538d2ab58aa0ad8eb8bfa3c72d0ff5682", + "version-string": "1.7.10", + "port-version": 0 + }, + { + "git-tree": "37ad7480d4e2dca5c8180021eeb3a9db5be5f2a6", + "version-string": "1.7.9", + "port-version": 0 + }, + { + "git-tree": "daea41d6d1e48d768611dbb833e8adb91cba30a2", + "version-string": "1.7.8", + "port-version": 0 + }, + { + "git-tree": "1d59b1308b33189843d14214666c1f9a3e998236", + "version-string": "1.7.7", + "port-version": 0 + }, + { + "git-tree": "697c6b8d21e916b2d539bc7e5d2139f92057b5c7", + "version-string": "1.7.6", + "port-version": 0 + }, + { + "git-tree": "bf8386a43c79b0beb98e843b4da166f5f4614758", + "version-string": "1.7.5", + "port-version": 0 + }, + { + "git-tree": "ba53b637017e402f8750554c50b77fec21b72533", + "version-string": "1.7.4-1", + "port-version": 0 + }, + { + "git-tree": "60d00b25f144d07e8a6eaf07008badb5a15d1477", + "version-string": "1.7.4", + "port-version": 0 + }, + { + "git-tree": "42aeaa7b70b25b9b110501a50358e2cc829c1993", + "version-string": "1.7.1-4", + "port-version": 0 + }, + { + "git-tree": "393b64e63168c81e50720f718fb1dcb2c1e5dabc", + "version-string": "1.7.1-3", + "port-version": 0 + }, + { + "git-tree": "0a6d62e1eb4b65721c34b0d836d3c99d42f8fb14", + "version-string": "1.7.1-2", + "port-version": 0 + }, + { + "git-tree": "7945c22ccf204610e393913e2b8d9c592d9defd1", + "version-string": "1.7.1-1", + "port-version": 0 + }, + { + "git-tree": "654e296aa8e829a2df738c57faee9bdd008756aa", + "version-string": "1.7.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/aliyun-oss-c-sdk.json b/externals/vcpkg/versions/a-/aliyun-oss-c-sdk.json new file mode 100755 index 000000000..724871e02 --- /dev/null +++ b/externals/vcpkg/versions/a-/aliyun-oss-c-sdk.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "52b0340f3b53966018738d256f74a64c0c90ee5e", + "version-string": "3.10.0", + "port-version": 1 + }, + { + "git-tree": "bae10b829d8e75fd53eb0027db88d2bab6caff5f", + "version-string": "3.10.0", + "port-version": 0 + }, + { + "git-tree": "e6eaae5aaee3342a31902a178801d6fa0b4ba3ea", + "version-string": "3.9.1", + "port-version": 0 + }, + { + "git-tree": "cd4515c0c4a3f0908014e280d2ce3672d9e1dda6", + "version-string": "3.7.1-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/allegro5.json b/externals/vcpkg/versions/a-/allegro5.json new file mode 100755 index 000000000..056f8d2f0 --- /dev/null +++ b/externals/vcpkg/versions/a-/allegro5.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "47c415593bf3de3c28afc1d476d5eab92aa8efb2", + "version": "5.2.6.0", + "port-version": 2 + }, + { + "git-tree": "b851d9d0babf00bdd273eec402aea26e826cb517", + "version": "5.2.6.0", + "port-version": 1 + }, + { + "git-tree": "ffd182fe5ba2979356a59dee5cb050e22ef500e9", + "version-string": "5.2.6.0", + "port-version": 0 + }, + { + "git-tree": "ef65b320c2e3883754864c5d48cbe13c87e6c7fc", + "version-string": "5.2.5.0", + "port-version": 0 + }, + { + "git-tree": "8500276a3ca03004cb29567610c290c9a0721dae", + "version-string": "5.2.4.0", + "port-version": 0 + }, + { + "git-tree": "2274709c94ff5ff042e9897edf2f733b27a0f6f4", + "version-string": "5.2.3.0", + "port-version": 0 + }, + { + "git-tree": "e0420072b463baa2a4ce2bb822cfe38abbb74b8e", + "version-string": "5.2.2.0-1", + "port-version": 0 + }, + { + "git-tree": "3bdf60902a17f71f5bf5b76d3ba9e30f0f77de26", + "version-string": "5.2.2.0", + "port-version": 0 + }, + { + "git-tree": "28877a283e94840b4c6af34edca91fd657e36f21", + "version-string": "5.2.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/alsa.json b/externals/vcpkg/versions/a-/alsa.json new file mode 100755 index 000000000..6b2fa7973 --- /dev/null +++ b/externals/vcpkg/versions/a-/alsa.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "1ce0c3410e25de5357b707dc0f800cf7c3a7f213", + "version": "1.2.6.1", + "port-version": 0 + }, + { + "git-tree": "03a04f17b2dfb480de15a07b58188b161dbe6dda", + "version": "1.2.5.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/ampl-asl.json b/externals/vcpkg/versions/a-/ampl-asl.json new file mode 100755 index 000000000..02f6ff768 --- /dev/null +++ b/externals/vcpkg/versions/a-/ampl-asl.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "2a88fb5c85a975bf5c5b49b6d87224b25504553d", + "version-date": "2020-11-11", + "port-version": 3 + }, + { + "git-tree": "024e7d3399beb537eb371c85181e48f4db51a4b0", + "version-string": "2020-11-11", + "port-version": 2 + }, + { + "git-tree": "823dcf0d7f897a92269faf1915322c012b281a2a", + "version-string": "2020-11-11", + "port-version": 1 + }, + { + "git-tree": "f8a838c084e07d088ca9dbe0b6c4d7da091482f1", + "version-string": "2020-11-11", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/ampl-mp.json b/externals/vcpkg/versions/a-/ampl-mp.json new file mode 100755 index 000000000..15bbff6a2 --- /dev/null +++ b/externals/vcpkg/versions/a-/ampl-mp.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "b3bdafa2896aad8990e3886bdd83b8cd5538e7ea", + "version-date": "2020-11-11", + "port-version": 3 + }, + { + "git-tree": "d52dd1ac4a69a74bb658b52be36c7457ca6049ef", + "version-string": "2020-11-11", + "port-version": 2 + }, + { + "git-tree": "0363f4dd57d8729a0a6bd3e1c2ca8d424fd59eda", + "version-string": "2020-11-11", + "port-version": 1 + }, + { + "git-tree": "0517040d73dca1a3da9cb9ed482ba6e6aa27a510", + "version-string": "2020-11-11", + "port-version": 0 + }, + { + "git-tree": "c4763f69a5b93e96073ec227d63f9b7a174268b4", + "version-string": "2019-03-21-1", + "port-version": 0 + }, + { + "git-tree": "0ec6a903c79001abe0cfe9edd626573083ff6908", + "version-string": "2019-03-21", + "port-version": 0 + }, + { + "git-tree": "8ccb4cd94a1f05ae2cef1e2e846b1ddd72a39c68", + "version-string": "2019-02-08", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/amqpcpp.json b/externals/vcpkg/versions/a-/amqpcpp.json new file mode 100755 index 000000000..ce5199977 --- /dev/null +++ b/externals/vcpkg/versions/a-/amqpcpp.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "b071aaf9f29af43e9463bcc9a118f4553351eb16", + "version": "4.3.15", + "port-version": 1 + }, + { + "git-tree": "3f2e1a0132721d9cdb8515d40010eaba97ecc8de", + "version": "4.3.15", + "port-version": 0 + }, + { + "git-tree": "bb3c11de2e142fc43d0c3bbcddc2a56b563de733", + "version": "4.3.14", + "port-version": 1 + }, + { + "git-tree": "e17952ad85007dbc08e20711b8f5bd462712e4e0", + "version": "4.3.14", + "port-version": 0 + }, + { + "git-tree": "7f99b7612476d68b1cd6a026696741da9b90c230", + "version-string": "4.3.11", + "port-version": 0 + }, + { + "git-tree": "21de530c9f72229e46bff4a9d39036a4e355941e", + "version-string": "4.1.7", + "port-version": 0 + }, + { + "git-tree": "2ec71510c25ab47c7611d23ffaea4bffa258df61", + "version-string": "4.1.5", + "port-version": 0 + }, + { + "git-tree": "d0c229f05c0853f33f7b22b64d76c14cc7660bc3", + "version-string": "4.1.4", + "port-version": 0 + }, + { + "git-tree": "3a3e3eea25a7263461a38c5f21e6d9a2883610e1", + "version-string": "4.1.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/anax.json b/externals/vcpkg/versions/a-/anax.json new file mode 100755 index 000000000..9566506ae --- /dev/null +++ b/externals/vcpkg/versions/a-/anax.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "db4b3bfeef52da822588d5bb85a4b3bf9affa80f", + "version": "2.1.0", + "port-version": 8 + }, + { + "git-tree": "347d15eb157a2bad09742ec97dfc417674936982", + "version-string": "2.1.0", + "port-version": 7 + }, + { + "git-tree": "561c057f2d0478df1e08b0e07247b8ddf5c8a04a", + "version-string": "2.1.0-6", + "port-version": 0 + }, + { + "git-tree": "a1cfbdd5189cb5cd4ee7a20087c6dc7014063eeb", + "version-string": "2.1.0-5", + "port-version": 0 + }, + { + "git-tree": "035862c3dbc640e495e3a37c80984aa45d1cb3cd", + "version-string": "2.1.0-4", + "port-version": 0 + }, + { + "git-tree": "2bc88f133ecc6dcc53158816cf64a8e15d38cc2e", + "version-string": "2.1.0-3", + "port-version": 0 + }, + { + "git-tree": "e95be4e570a7e59deb1e1c5d85e6b3a05a94c502", + "version-string": "2.1.0-2", + "port-version": 0 + }, + { + "git-tree": "6586db19661389cab598aa9c64ed0bbf684959cf", + "version-string": "2.1.0-1", + "port-version": 0 + }, + { + "git-tree": "e4bdb59bf7b80aa938e901ed3eea5e7b730f9930", + "version-string": "2.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/angelscript.json b/externals/vcpkg/versions/a-/angelscript.json new file mode 100755 index 000000000..fbd7d6637 --- /dev/null +++ b/externals/vcpkg/versions/a-/angelscript.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "4f2a9b2d8cad46707e241ac52565fa50656c0dad", + "version": "2.35.1", + "port-version": 1 + }, + { + "git-tree": "342bbf5e5b2f9492dc70589d4f73b9ee2990f6d4", + "version": "2.35.1", + "port-version": 0 + }, + { + "git-tree": "c88c2eec1943cd3f46d8fe2b77f4d75f3d35cba2", + "version-string": "2.35.0", + "port-version": 0 + }, + { + "git-tree": "bca26a9780ffe5a26b45abb86e05603a4eec0719", + "version-string": "2.34.0", + "port-version": 0 + }, + { + "git-tree": "f0d6ec2421c37a42be20e6e9c13d6a2f3ceec036", + "version-string": "2.33.1-2", + "port-version": 0 + }, + { + "git-tree": "d34e5e6016ea62f476fd7c3612dd9cb3eccbc83f", + "version-string": "2.33.1-1", + "port-version": 0 + }, + { + "git-tree": "9e00224b27ff07b1f5788cc62d60d29b24f8d7ef", + "version-string": "2.33.0-1", + "port-version": 0 + }, + { + "git-tree": "795c9f8063ea84fb70fa6d0be7564f5637c11696", + "version-string": "2.33.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/angle.json b/externals/vcpkg/versions/a-/angle.json new file mode 100755 index 000000000..942f5ceca --- /dev/null +++ b/externals/vcpkg/versions/a-/angle.json @@ -0,0 +1,129 @@ +{ + "versions": [ + { + "git-tree": "c3b63c0d8bf584235c057cb40486152ebe3fa0a6", + "version-string": "chromium_4472", + "port-version": 3 + }, + { + "git-tree": "3c4f08e40691d643044cf9319cef04b4289d4b6f", + "version-string": "chromium_4472", + "port-version": 2 + }, + { + "git-tree": "d59efcadc61eb7a7be987e4dcc03540490af89b8", + "version-string": "chromium_4472", + "port-version": 1 + }, + { + "git-tree": "5bd610babb6f0fb15119aa94644494c0dc2bcd2c", + "version-string": "chromium_4472", + "port-version": 0 + }, + { + "git-tree": "48342ccfb3565a61cc9ed878a2ff422e294b4e56", + "version-string": "2020-05-15", + "port-version": 2 + }, + { + "git-tree": "936af02bc2517e092035c23ca444a3d638b9a713", + "version-string": "2020-05-15-1", + "port-version": 0 + }, + { + "git-tree": "cc220213f73cd22cccac6818c2a04c435dd155b3", + "version-string": "2020-05-15", + "port-version": 0 + }, + { + "git-tree": "0bd711b33715ba2f3b8a90d80ea4f7901ac38910", + "version-string": "2019-12-31-2", + "port-version": 0 + }, + { + "git-tree": "3ea01e4bcb47f589bd9d828e913139f08f6e15e3", + "version-string": "2019-12-31-1", + "port-version": 0 + }, + { + "git-tree": "0387e91062e10aeb210189c67dd1cf2059e54c30", + "version-string": "2019-12-31", + "port-version": 0 + }, + { + "git-tree": "b84ea94a8d1854952309abd8076f399255414cd6", + "version-string": "2019-07-19-4", + "port-version": 0 + }, + { + "git-tree": "fef408b631525b0ff7ff82e03589c0ea1394c9c0", + "version-string": "2019-07-19-3", + "port-version": 0 + }, + { + "git-tree": "420036ef2449007a884c9116d16e910af220e000", + "version-string": "2019-07-19-2", + "port-version": 0 + }, + { + "git-tree": "94ede0abe4a61a85be4988293baf83440b05f57d", + "version-string": "2019-07-19-1", + "port-version": 0 + }, + { + "git-tree": "686901f127fd4567932e4b9e05e44b8a7b022794", + "version-string": "2019-06-13", + "port-version": 0 + }, + { + "git-tree": "8fa8c7c513ec3b443f5f9740e87b2c73fe72145b", + "version-string": "2019-03-13-c2ee2cc-3", + "port-version": 0 + }, + { + "git-tree": "a5f3c934fce4260519e11c95ab00e41d0c093e9f", + "version-string": "2019-03-13-c2ee2cc-2", + "port-version": 0 + }, + { + "git-tree": "5993d35b9153c81a186199616936ccdda6240cdb", + "version-string": "2019-03-13-c2ee2cc-1", + "port-version": 0 + }, + { + "git-tree": "1bde1864f6cba3d44ad8652c49c5ea92959ac6d5", + "version-string": "2019-03-13-c2ee2cc", + "port-version": 0 + }, + { + "git-tree": "7197ae943c2454ebcf38d74fca50596778d142ce", + "version-string": "2019-01-14-c2ee2cc", + "port-version": 0 + }, + { + "git-tree": "88427126ebabc91a7444ad14acd3e2d1e7338d70", + "version-string": "2017-06-14-8d471f-5", + "port-version": 0 + }, + { + "git-tree": "f2caf5579a346513dae79103c1ca3fe862fe0348", + "version-string": "2017-06-14-8d471f-4", + "port-version": 0 + }, + { + "git-tree": "d14e94eecc0b4bbdcbdb37ca09bbb0594b1aa00c", + "version-string": "2017-06-14-8d471f-2", + "port-version": 0 + }, + { + "git-tree": "9e65a5fce159caa6dfa36d4112d1f160f32abad9", + "version-string": "2017-06-14-8d471f-1", + "port-version": 0 + }, + { + "git-tree": "7dabf17bc4c33618ff098eb80b18e5837aecd5db", + "version-string": "2017-06-14-8d471f", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/antlr4.json b/externals/vcpkg/versions/a-/antlr4.json new file mode 100755 index 000000000..c076e1096 --- /dev/null +++ b/externals/vcpkg/versions/a-/antlr4.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "6a716f472a0639199a0a843a64795a88a39f5dee", + "version": "4.9.3", + "port-version": 2 + }, + { + "git-tree": "0a3fbd320c22b3c017fe13fb4cac5fe330c0df99", + "version": "4.9.3", + "port-version": 1 + }, + { + "git-tree": "55208ea9aa8be016d24423442ffbb2e31a7390a1", + "version": "4.9.3", + "port-version": 0 + }, + { + "git-tree": "31ac3fa20b3f7944e5ac32b7ac7883f3d976dae6", + "version": "4.9.1", + "port-version": 2 + }, + { + "git-tree": "0b8591ea0b8692c0c2963c468ee5b9c2e260ace4", + "version-string": "4.9.1", + "port-version": 1 + }, + { + "git-tree": "846cffb150c26539ce36129c5a45d7ce54e6a1c8", + "version-string": "4.9.1", + "port-version": 0 + }, + { + "git-tree": "ed270bdb7075f6ed46cbe345c367ecb00ef64eff", + "version-string": "4.8", + "port-version": 1 + }, + { + "git-tree": "1c0f17bc114b3f94e31bd6ecbef4ee2457768b5f", + "version-string": "4.8", + "port-version": 0 + }, + { + "git-tree": "8f10523941e1e8d75a88feb08b1e0b711ae98a03", + "version-string": "4.7.1-3", + "port-version": 0 + }, + { + "git-tree": "6eb22d8be66dcd33b068f3fb25ae06445fd7dd61", + "version-string": "4.7.1-2", + "port-version": 0 + }, + { + "git-tree": "7b3883e70e318f9a15f4b27a9d71c26e7eb9d957", + "version-string": "4.7.1-1", + "port-version": 0 + }, + { + "git-tree": "bdcdb19ea351359d51b11e772fa396c90b014856", + "version-string": "4.7.1", + "port-version": 0 + }, + { + "git-tree": "34a4ebe35067164ad729d4b66e502c57271ec8a0", + "version-string": "4.7", + "port-version": 0 + }, + { + "git-tree": "984fdaa45d466efa9b2dd00661731a115e4c6292", + "version-string": "4.6-1", + "port-version": 0 + }, + { + "git-tree": "49539bff6d8bf30a96b0228ac27439d946b81dfb", + "version-string": "4.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/any-lite.json b/externals/vcpkg/versions/a-/any-lite.json new file mode 100755 index 000000000..1ad1fa100 --- /dev/null +++ b/externals/vcpkg/versions/a-/any-lite.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "80479a956ce0c1547469f0b887278b07ac8de0c0", + "version-semver": "0.4.0", + "port-version": 0 + }, + { + "git-tree": "cf16580f5d27b67f0fca4ebf3eba27ad70925859", + "version-string": "0.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/anyrpc.json b/externals/vcpkg/versions/a-/anyrpc.json new file mode 100755 index 000000000..62639f3f0 --- /dev/null +++ b/externals/vcpkg/versions/a-/anyrpc.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "5f4ca4180fb5021b85ae6d4c5ad7b7e15f89b367", + "version-date": "2021-08-24", + "port-version": 0 + }, + { + "git-tree": "e82759546790c693469c78e166e6c83f745849b3", + "version-string": "2020-01-13", + "port-version": 2 + }, + { + "git-tree": "22ee16b848c25142909111d43775ee8a4bd1c081", + "version-string": "2020-01-13-1", + "port-version": 0 + }, + { + "git-tree": "f4f69ae4702ed2b075d1233666f835a6061818fc", + "version-string": "2017-12-01-1", + "port-version": 0 + }, + { + "git-tree": "47a6f247dea1214328dbd6408e1f000a7bbf5a0c", + "version-string": "2017-12-01", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/aom.json b/externals/vcpkg/versions/a-/aom.json new file mode 100755 index 000000000..39f282cdf --- /dev/null +++ b/externals/vcpkg/versions/a-/aom.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "f251779a2df24b29eac37690d2692fda395218dd", + "version-semver": "3.2.0", + "port-version": 3 + }, + { + "git-tree": "013d95ace27d59d663acada0264327bf5382308c", + "version-semver": "3.2.0", + "port-version": 2 + }, + { + "git-tree": "5d7bac96c35260b96135bf3ec1d456994d549eb3", + "version-semver": "3.2.0", + "port-version": 1 + }, + { + "git-tree": "04432e0fa953e42790ff74f6d927130d9a4e28a7", + "version-semver": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "d55b62e714b84f2c3f2df02299f4a708a705c21f", + "version-semver": "3.1.2", + "port-version": 0 + }, + { + "git-tree": "b465c1a32eeac8dfe55239134d800c309b16b33f", + "version-semver": "3.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/approval-tests-cpp.json b/externals/vcpkg/versions/a-/approval-tests-cpp.json new file mode 100755 index 000000000..b2fbf56a1 --- /dev/null +++ b/externals/vcpkg/versions/a-/approval-tests-cpp.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "84c554ce63a6fb5ba80ecf7b3b27bf7c577471a2", + "version": "10.12.2", + "port-version": 0 + }, + { + "git-tree": "af4597332ca8387f85fa3eef5c853d47d8745d23", + "version": "10.12.1", + "port-version": 0 + }, + { + "git-tree": "ab883d6b40593e4e14a28110865e55745d7d5768", + "version": "10.12.0", + "port-version": 0 + }, + { + "git-tree": "42def472fd3039fb2e54a41a6980822a20518eff", + "version": "10.11.0", + "port-version": 0 + }, + { + "git-tree": "a1134cf4c5199fef643ff13362b568948df8cc55", + "version": "10.10.0", + "port-version": 0 + }, + { + "git-tree": "757640a4ad0e49a5fd4d77e9ce8adb9b1464cf25", + "version": "10.9.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/apr-util.json b/externals/vcpkg/versions/a-/apr-util.json new file mode 100755 index 000000000..7eaa48d20 --- /dev/null +++ b/externals/vcpkg/versions/a-/apr-util.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "d758cde4c829f6c3a66a773d517f9e9425227629", + "version": "1.6.1", + "port-version": 7 + }, + { + "git-tree": "d27be40b8f670b002604154ef5657c011b8de733", + "version": "1.6.1", + "port-version": 6 + }, + { + "git-tree": "dfc76280690e9d419c43ee5242466de5b4e317c2", + "version-string": "1.6.1", + "port-version": 5 + }, + { + "git-tree": "cf1a0e97d00a5748dc58db7d0a5da0fd7d5efb66", + "version-string": "1.6.1", + "port-version": 4 + }, + { + "git-tree": "6f367c81a074fd156d7f054bcacbdae0b01a5f5c", + "version-string": "1.6.1", + "port-version": 3 + }, + { + "git-tree": "9178b7e078f0093aa2cc4b42cd22e9bbc5537f6c", + "version-string": "1.6.1", + "port-version": 2 + }, + { + "git-tree": "450b0cdebafbdebc56b926d372307d1b86f6b9f9", + "version-string": "1.6.1-1", + "port-version": 0 + }, + { + "git-tree": "a2f0bcf9b2f562d2cd6a033d4552a638e6b849bb", + "version-string": "1.6.1", + "port-version": 0 + }, + { + "git-tree": "22f26a9e37de504ad54cc30e407d3f2644600b73", + "version-string": "1.6.0-5", + "port-version": 0 + }, + { + "git-tree": "96cf1cbcb872aaada516d15a77b607f93c812fa0", + "version-string": "1.6.0-3", + "port-version": 0 + }, + { + "git-tree": "5aad761bd51d83bf2d2ab9d0d4fbab5b59d96b9d", + "version-string": "1.6.0-2", + "port-version": 0 + }, + { + "git-tree": "426ca0a02ae6c9299754074d38f26ce31238fc32", + "version-string": "1.6.0-1", + "port-version": 0 + }, + { + "git-tree": "a595d02e90cecaf2795f639814030395f0fb126c", + "version-string": "1.6.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/apr.json b/externals/vcpkg/versions/a-/apr.json new file mode 100755 index 000000000..63a44a486 --- /dev/null +++ b/externals/vcpkg/versions/a-/apr.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "419034d960a2d9d932f18154e386d1ce4947d514", + "version": "1.7.0", + "port-version": 9 + }, + { + "git-tree": "9fd8035a5cce96ad1b89000ac34431551ca39458", + "version": "1.7.0", + "port-version": 8 + }, + { + "git-tree": "e73f548920cc5add8a47af9b8775a26c89050101", + "version": "1.7.0", + "port-version": 7 + }, + { + "git-tree": "bc5604f4ffbdcdaee979fccdb1fd5a85dfc7a3db", + "version": "1.7.0", + "port-version": 6 + }, + { + "git-tree": "3de94d87f5afac3e6800a26771517217d5113349", + "version": "1.7.0", + "port-version": 5 + }, + { + "git-tree": "b9e93acdaa680398eaed361f1df530096ded84ff", + "version": "1.7.0", + "port-version": 4 + }, + { + "git-tree": "ca62f9b23d92ff6bb375277cb56e6ea1cde2c9f1", + "version-string": "1.7.0", + "port-version": 3 + }, + { + "git-tree": "797a6206562e8117ad675a90c9d46b48990b940a", + "version-string": "1.7.0", + "port-version": 2 + }, + { + "git-tree": "6aa7aa09fd5a2643cd81b057fecffec21e4f63b2", + "version-string": "1.7.0-1", + "port-version": 0 + }, + { + "git-tree": "b96ddcb0be5a1c8b9700a814d896a827a9ae8c62", + "version-string": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "90b953c11908d63d8e626ba0b9d50fffa00f3a3d", + "version-string": "1.6.5-3", + "port-version": 0 + }, + { + "git-tree": "ee9ffad2399eab5b9ef3e05fa6e7619c832cec3e", + "version-string": "1.6.5-2", + "port-version": 0 + }, + { + "git-tree": "c8e0e8a2991924d58cf52101abfce5794e251e7e", + "version-string": "1.6.5-1", + "port-version": 0 + }, + { + "git-tree": "948cdca3bdef7122b7d66ddd04444ac74b36fc88", + "version-string": "1.6.5", + "port-version": 0 + }, + { + "git-tree": "1f3668a8e6a98805034f45de3bb6f8a4d64bd4db", + "version-string": "1.6.3", + "port-version": 0 + }, + { + "git-tree": "560a1a5a93b64d0766f85439288cd598bddc62d3", + "version-string": "1.6.2-1", + "port-version": 0 + }, + { + "git-tree": "2f8522ca18fd918f2e8af4cfb0eb104df8295658", + "version-string": "1.6.2", + "port-version": 0 + }, + { + "git-tree": "16ad7018f8cda5739413851dc879ec4061da5812", + "version-string": "1.5.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/apsi.json b/externals/vcpkg/versions/a-/apsi.json new file mode 100755 index 000000000..991bf7ddc --- /dev/null +++ b/externals/vcpkg/versions/a-/apsi.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "08bc0f650b7fa0ef77541eb74b90d0b9fe7fec03", + "version-semver": "0.7.0", + "port-version": 2 + }, + { + "git-tree": "c2703eaa248b72c269dd22aac1e2aca49060dfba", + "version-semver": "0.7.0", + "port-version": 1 + }, + { + "git-tree": "652d69df44a689fa55f1b757db46c97bcb840c13", + "version-semver": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "ff4f1e6dfc87696ea2da4bd557e15b1f2034f340", + "version-semver": "0.5.0", + "port-version": 0 + }, + { + "git-tree": "3cfe8c41e42a7aa179511d6f6ead1c47bb8f3327", + "version-semver": "0.3.1", + "port-version": 0 + }, + { + "git-tree": "2de75d2b02f3a434d3b95f53ca60b71598d9f8b5", + "version-semver": "0.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/arb.json b/externals/vcpkg/versions/a-/arb.json new file mode 100755 index 000000000..f01bc86bd --- /dev/null +++ b/externals/vcpkg/versions/a-/arb.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "e1b560a5a2aa835d54da9fdabac5eea48255e93d", + "version": "2.21.1", + "port-version": 1 + }, + { + "git-tree": "06326497117fb757651649225284d2fe4100ef79", + "version": "2.21.1", + "port-version": 0 + }, + { + "git-tree": "8ad21afd78955622e44098428fa7b8b7790f82d8", + "version-string": "2.18.1", + "port-version": 1 + }, + { + "git-tree": "7a1fad4344b58a4c70a15c0a2a890c011a52c75f", + "version-string": "2.18.1", + "port-version": 0 + }, + { + "git-tree": "6add6cb53869d0c182da4dea8dd049a846cc8c41", + "version-string": "2.17.0", + "port-version": 0 + }, + { + "git-tree": "492a3e49ecd0cb6f806f03eccdc836a03fffcc38", + "version-string": "2.16.0", + "port-version": 0 + }, + { + "git-tree": "1380d6df87f04cdb99ebdd50af031b456033da3c", + "version-string": "2.11.1-2", + "port-version": 0 + }, + { + "git-tree": "d0101f7b492d597152d392af47c394b5d159a3a2", + "version-string": "2.11.1-1", + "port-version": 0 + }, + { + "git-tree": "fb3d463b6fae7f3bc030a93a22af93af05357e69", + "version-string": "2.11.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/arcus.json b/externals/vcpkg/versions/a-/arcus.json new file mode 100755 index 000000000..c7981fe70 --- /dev/null +++ b/externals/vcpkg/versions/a-/arcus.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "1edcde9d0c4a64d780c6692b017cd30137a9ab19", + "version-semver": "4.10.0", + "port-version": 2 + }, + { + "git-tree": "0aeec8ed7245362e90ef531d8ecaf4ca315e85e5", + "version-semver": "4.10.0", + "port-version": 1 + }, + { + "git-tree": "76f86c7d5993d59f58a0863b9e2ca439db88efba", + "version-semver": "4.10.0", + "port-version": 0 + }, + { + "git-tree": "60c6c8f7ebf7b481fba071481b60e89085093e87", + "version-string": "4.8.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/argagg.json b/externals/vcpkg/versions/a-/argagg.json new file mode 100755 index 000000000..94f1d5e24 --- /dev/null +++ b/externals/vcpkg/versions/a-/argagg.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "ece15f0bd5649973a8384d7762b0b1aed0cb2fdc", + "version-string": "0.4.6", + "port-version": 1 + }, + { + "git-tree": "031214af5025d198e84dd9d21fe071199ad1623c", + "version-string": "0.4.6", + "port-version": 0 + }, + { + "git-tree": "a23fc9ac0a6c78412d55ff890da0c65568fba54b", + "version-string": "2019-01-25", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/argh.json b/externals/vcpkg/versions/a-/argh.json new file mode 100755 index 000000000..0eea92559 --- /dev/null +++ b/externals/vcpkg/versions/a-/argh.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "2ee3072431f9d1aa18b5810e61398b9373fdc0d7", + "version": "1.3.2", + "port-version": 0 + }, + { + "git-tree": "09027cc8017226ec7710f564346b5c0bff9e69aa", + "version-string": "2018-12-18", + "port-version": 3 + }, + { + "git-tree": "079af0048f435a7d950a29772462a553a80078f1", + "version-string": "2018-12-18-2", + "port-version": 0 + }, + { + "git-tree": "2370ebefd700536d00c92d0e2ceeeffbe4212dbe", + "version-string": "2018-12-18-1", + "port-version": 0 + }, + { + "git-tree": "cfd4467e76cccb610fbc8b1c7590c44365245de3", + "version-string": "2018-12-18", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/argparse.json b/externals/vcpkg/versions/a-/argparse.json new file mode 100755 index 000000000..accdedbe5 --- /dev/null +++ b/externals/vcpkg/versions/a-/argparse.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "928e03159c73294a2e6623d330ea1567190d753f", + "version": "2.2", + "port-version": 0 + }, + { + "git-tree": "b16b0a340e04d56e4a736b57eafa5fc352abfc58", + "version-date": "2021-03-04", + "port-version": 0 + }, + { + "git-tree": "b97b900df917ed17a16e28f3ea86cc66a82ced4e", + "version-string": "2.1", + "port-version": 0 + }, + { + "git-tree": "82aa2d55fa1a64ccb97072a21e5a383b779a8acb", + "version-string": "2.0.1", + "port-version": 0 + }, + { + "git-tree": "4f76a49308623bcbd93f2b69d40d9ae2548828bf", + "version-string": "1.9", + "port-version": 0 + }, + { + "git-tree": "b6a2f5c6e86c542876392c744f7055bf68ffe917", + "version-string": "2019-06-10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/args.json b/externals/vcpkg/versions/a-/args.json new file mode 100755 index 000000000..f011bbad0 --- /dev/null +++ b/externals/vcpkg/versions/a-/args.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "6da2a8e30a8640e0cb9fe55decd3a634d8c42cb6", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "8f102bf551068e71d94c7d1f21295bb9bf29dcdc", + "version": "6.2.7", + "port-version": 0 + }, + { + "git-tree": "0b99979813c133a681aedcf4753689f023fbb98b", + "version-date": "2021-03-14", + "port-version": 0 + }, + { + "git-tree": "df53fcfe0380622c0ae4b19c66b3d78eddb32644", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "a04399a85d83caad71a9022b5a9c330414942b14", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "dcb221ca71d0ab533d632698825989986d288870", + "version-string": "2019-05-01", + "port-version": 0 + }, + { + "git-tree": "c894c00b57a945aa6fdfe80804950addeb7295f4", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "a48ceaddde2848dcdb3a15e250cb36468a518ac4", + "version-string": "2019-01-18", + "port-version": 0 + }, + { + "git-tree": "d1ecad6153a9ea9e493279b62bbd25f43992ca8a", + "version-string": "2018-10-25", + "port-version": 0 + }, + { + "git-tree": "6c280b96419508283dbfb744cb6174977fd79d21", + "version-string": "2018-10-11", + "port-version": 0 + }, + { + "git-tree": "46273254e3cfe34691a430e8a0eca99e2ee96708", + "version-string": "2018-06-28", + "port-version": 0 + }, + { + "git-tree": "e5a7d23d255a6eabd8ce9fb8ea8c62f04e7eec43", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "5a6052bd2acef6edca4eafbade1bc2fca972340e", + "version-string": "2018-02-23", + "port-version": 0 + }, + { + "git-tree": "967b94170418459a4acab553b955794d5952730b", + "version-string": "d8905de", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/argtable2.json b/externals/vcpkg/versions/a-/argtable2.json new file mode 100755 index 000000000..28c335846 --- /dev/null +++ b/externals/vcpkg/versions/a-/argtable2.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "406503ece7b3ab95af28c6871a6de7263731f829", + "version-string": "2.13", + "port-version": 9 + }, + { + "git-tree": "84477794d507fde26a891a7282b5322bb8d0e632", + "version-string": "2.13", + "port-version": 8 + }, + { + "git-tree": "5f692e274330bf55809bd591a4f94098a22d840b", + "version-string": "2.13-7", + "port-version": 0 + }, + { + "git-tree": "03c9c44716d9785aabaa94a2050c4c2e5753d48a", + "version-string": "2.13-5", + "port-version": 0 + }, + { + "git-tree": "76147077ed008a4c662e85f956d8ade35c50aa18", + "version-string": "2.13-4", + "port-version": 0 + }, + { + "git-tree": "a5aa85058c61fea7507d0f7963075f83d5cafe87", + "version-string": "2.13-2", + "port-version": 0 + }, + { + "git-tree": "a8d6bf4f29b8b423396128bb49ed51b2f23f7853", + "version-string": "2.13-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/argtable3.json b/externals/vcpkg/versions/a-/argtable3.json new file mode 100755 index 000000000..a859cfbab --- /dev/null +++ b/externals/vcpkg/versions/a-/argtable3.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "fe3b1c9a876237412e7ba925a3b41f62e7fc1d99", + "version": "3.2.1", + "port-version": 2 + }, + { + "git-tree": "acbbb26e54e658b8af673a112fb338274275ad6b", + "version": "3.2.1", + "port-version": 1 + }, + { + "git-tree": "0dc3ede1be6316bee6853f84c5f147340be70ee8", + "version-string": "3.2.1", + "port-version": 0 + }, + { + "git-tree": "7a1d8f216b96823aed9e08cd73efc09ca7baec14", + "version-string": "3.1.5", + "port-version": 0 + }, + { + "git-tree": "fc26a0ec4d041d390728046549a4502b922086b7", + "version-string": "2019-08-21", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/argumentum.json b/externals/vcpkg/versions/a-/argumentum.json new file mode 100755 index 000000000..bfd12408d --- /dev/null +++ b/externals/vcpkg/versions/a-/argumentum.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "0f89899e28a328451a1b31bbf2ba23df8ca87f69", + "version-string": "0.3.1", + "port-version": 1 + }, + { + "git-tree": "4ddbb18467acb4d4bcddb23e1ba6c956aeaee72f", + "version-string": "0.3.1", + "port-version": 0 + }, + { + "git-tree": "e6f62b26b2d823054e4b3da822f7223e98badbcf", + "version-string": "0.2.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/aricpp.json b/externals/vcpkg/versions/a-/aricpp.json new file mode 100755 index 000000000..745be2469 --- /dev/null +++ b/externals/vcpkg/versions/a-/aricpp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "f4c60d911e60c041e3e7791a84894a1c028a7e85", + "version-semver": "1.1.2", + "port-version": 0 + }, + { + "git-tree": "266bfd31b17badea05be9f9859b0ce84f4d9f60e", + "version-semver": "1.1.1", + "port-version": 1 + }, + { + "git-tree": "6bab43826055b88429107ef725b3c98fdded73ee", + "version-semver": "1.1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/armadillo.json b/externals/vcpkg/versions/a-/armadillo.json new file mode 100755 index 000000000..395d93271 --- /dev/null +++ b/externals/vcpkg/versions/a-/armadillo.json @@ -0,0 +1,109 @@ +{ + "versions": [ + { + "git-tree": "fb3b2fb5c5daeea857a0b9952dbef5c980fa14c9", + "version": "10.6.2", + "port-version": 5 + }, + { + "git-tree": "ddc4477e6ecc2d66e429e18e9ccd96367da2ce88", + "version": "10.6.2", + "port-version": 4 + }, + { + "git-tree": "88bb8282f33e16f2c59856f68ed9934ff26c7e02", + "version": "10.6.2", + "port-version": 3 + }, + { + "git-tree": "2a7774c182c273a8d6f350a383f4a3bcf01e308e", + "version": "10.6.2", + "port-version": 2 + }, + { + "git-tree": "34c37cb8151d003da697e9d725033567a4ccb2f7", + "version": "10.6.2", + "port-version": 1 + }, + { + "git-tree": "66b31fe832e9322876f427f1fec7836bb71c082c", + "version": "10.6.2", + "port-version": 0 + }, + { + "git-tree": "3925824cd7eed2d9fcaa092a9a543eb538d9a558", + "version": "10.4.0", + "port-version": 0 + }, + { + "git-tree": "8f9484de18ab042899bdf1fd033f6522ff091225", + "version-string": "10.2.0", + "port-version": 0 + }, + { + "git-tree": "3ec327570d6731dbd87ebdee5a0cebdd8bd62ed7", + "version-string": "10.1.0", + "port-version": 1 + }, + { + "git-tree": "fa82d7d3b12f794825dad7fddcda2b08f268c2b2", + "version-string": "10.1.0", + "port-version": 0 + }, + { + "git-tree": "26c12504729aa9721a0ddacc4379a4a186131cd8", + "version-string": "2019-04-16", + "port-version": 10 + }, + { + "git-tree": "a1b22abfe2cf95afdbfa2035d398f5e3631b10eb", + "version-string": "2019-04-16", + "port-version": 9 + }, + { + "git-tree": "cc023d9cc156eb5ca8679d2ec71ed76aa2370de6", + "version-string": "2019-04-16-8", + "port-version": 0 + }, + { + "git-tree": "49f2598bbf5973b40b790e8bde134debdcfd9b6a", + "version-string": "2019-04-16-6", + "port-version": 0 + }, + { + "git-tree": "b6884042c9d5cbd748768125337f7ba0f1e13746", + "version-string": "2019-04-16-5", + "port-version": 0 + }, + { + "git-tree": "c4804f0f1bf5ab832e6f41c880d03f0c7f216186", + "version-string": "2019-04-16-4", + "port-version": 0 + }, + { + "git-tree": "5253e776b3b0154830cbf7423f521e1044fd0421", + "version-string": "2019-04-16-3", + "port-version": 0 + }, + { + "git-tree": "e7bcd1561e9f742ef22389fabdd2adaa0a36f941", + "version-string": "2019-04-16-2", + "port-version": 0 + }, + { + "git-tree": "278d63ef5ee8e0e6af178f29ca51df22c5ae26d5", + "version-string": "2019-04-16-1", + "port-version": 0 + }, + { + "git-tree": "a976a647cd788e9ebfc2933e824168fbe902af82", + "version-string": "2019-04-16-f00d3225", + "port-version": 0 + }, + { + "git-tree": "3c6e533f56dea7b9985f2babfa4df812d8d90fe1", + "version-string": "8.400.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/arrayfire.json b/externals/vcpkg/versions/a-/arrayfire.json new file mode 100755 index 000000000..59f07bb59 --- /dev/null +++ b/externals/vcpkg/versions/a-/arrayfire.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "e6c5e8b4e1c52380ebd2050683a185c44a2dbae4", + "version-semver": "3.8.0", + "port-version": 0 + }, + { + "git-tree": "ec3188e3259a9b123ebbbb0e2ede933a59d42092", + "version-string": "3.7.3", + "port-version": 3 + }, + { + "git-tree": "c5d51d516a2f179871125b9adb59a0d545c55cdb", + "version-string": "3.7.3", + "port-version": 2 + }, + { + "git-tree": "68b7bed9be6cf106ea00ea8d073597f862904bef", + "version-string": "3.7.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/arrow.json b/externals/vcpkg/versions/a-/arrow.json new file mode 100755 index 000000000..febcc4fd3 --- /dev/null +++ b/externals/vcpkg/versions/a-/arrow.json @@ -0,0 +1,199 @@ +{ + "versions": [ + { + "git-tree": "4334074d163357f9002145ca722dc8dbcc546dbc", + "version": "8.0.0", + "port-version": 0 + }, + { + "git-tree": "9beefb8449a167f6dbcbe35a2bd2b7d3cb2889a2", + "version": "7.0.0", + "port-version": 3 + }, + { + "git-tree": "3d3371b4741fc81354b2033d584c48a1929373f4", + "version": "7.0.0", + "port-version": 2 + }, + { + "git-tree": "71eea8dac175d368506f19bb246b40bf4829846a", + "version": "7.0.0", + "port-version": 1 + }, + { + "git-tree": "3682e12e1b3f3aa79551877b157ff3d914cb5c90", + "version": "7.0.0", + "port-version": 0 + }, + { + "git-tree": "b12626f29cb0ba8a049241153af0dfeca9a810d7", + "version": "6.0.1", + "port-version": 1 + }, + { + "git-tree": "a192a94717139642a1e9304cdc1ae86850398fb9", + "version": "6.0.1", + "port-version": 0 + }, + { + "git-tree": "14ddd1079e0be1f6122e93f2103be465f893b37e", + "version": "6.0.0", + "port-version": 0 + }, + { + "git-tree": "8a30c7d6553216924aa3a3957ceb87d0fda39592", + "version": "5.0.0", + "port-version": 2 + }, + { + "git-tree": "79938475d53bb40ad7bf8d0fbda9e65f7630dde7", + "version": "5.0.0", + "port-version": 1 + }, + { + "git-tree": "bf5c2b42bb8c4efa09d69a4ce6e75ae3ace45f02", + "version": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "09e65930903c5dad92250b8f3f351f06f77f8e30", + "version": "4.0.0", + "port-version": 1 + }, + { + "git-tree": "2066704ab2b0b5977bcd5677ea1378fac0b0555c", + "version": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "bc9cb096ffa223f2af620db18ed244d17e47ffe7", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "604537d50ab45ff96911b5330c51137ac5fc4040", + "version-string": "1.0.1", + "port-version": 2 + }, + { + "git-tree": "be3074d5934a54a0595d65d172a2a2d906d5ec91", + "version-string": "1.0.1", + "port-version": 1 + }, + { + "git-tree": "eb5f80ce39b4ba0842b1cb1c5077d42f17785b25", + "version-string": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "5044fd2ee5182bbda8b1d1173d09829494e9b9c3", + "version-string": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "d809f7bd41d0b826cb5bb9aa1ec6fa1662270ba2", + "version-string": "0.17.1", + "port-version": 0 + }, + { + "git-tree": "7cd5a5f2d222b71099f529f6c7965f60002ce1a5", + "version-string": "0.17.0-2", + "port-version": 0 + }, + { + "git-tree": "c2e58d5b8f273280512f3fd368b5ebe1e15fa77f", + "version-string": "0.17.0-1", + "port-version": 0 + }, + { + "git-tree": "1a38e418d3c0ff8068a348fd9be7b56a91c07fed", + "version-string": "0.17.0", + "port-version": 0 + }, + { + "git-tree": "87f44dc6a17cd7d29daec3d81c9d9bb2360a7a98", + "version-string": "0.16.0", + "port-version": 0 + }, + { + "git-tree": "146a5af0ecbf438e35f9e0dcafc962c0d7a01333", + "version-string": "0.15.1", + "port-version": 0 + }, + { + "git-tree": "e5633dfddebee8fe155dbe844bbfa605021eb513", + "version-string": "0.16.0", + "port-version": 0 + }, + { + "git-tree": "9c1913e23a13f374fa40ca0a2f3faf3507295950", + "version-string": "0.15.1", + "port-version": 0 + }, + { + "git-tree": "2e43c6b165eb93e14f0cc5455e94ad4901f0dc93", + "version-string": "0.14.1-1", + "port-version": 0 + }, + { + "git-tree": "057b3df9f5accf607b256740d57ef52d4767bb6f", + "version-string": "0.14.1", + "port-version": 0 + }, + { + "git-tree": "8bbcceba647f76d767bc091df746b25cb5e2c93c", + "version-string": "0.13.0-4", + "port-version": 0 + }, + { + "git-tree": "84856823fe2bdf8f91b0b8578b05701e67b5c490", + "version-string": "0.13.0-3", + "port-version": 0 + }, + { + "git-tree": "fc32bf086a868c7e241de1cdbe38e6715f7e55cc", + "version-string": "0.13.0-2", + "port-version": 0 + }, + { + "git-tree": "45b01fb66fee5fcddee02c1739988408358474b3", + "version-string": "0.13.0-1", + "port-version": 0 + }, + { + "git-tree": "96330c763d3cd5d7c0f733c19b56e59bfdb5a1de", + "version-string": "0.13.0", + "port-version": 0 + }, + { + "git-tree": "488e7538261148c4b8f3dc0482c33871297e24c9", + "version-string": "0.11.1", + "port-version": 0 + }, + { + "git-tree": "19aa1a29600333325990c981fd3fb8fbe0c0330f", + "version-string": "0.9.0-1", + "port-version": 0 + }, + { + "git-tree": "48ccb35a5d68f54398fae0bc0d8f55508a405c18", + "version-string": "0.6.0-1", + "port-version": 0 + }, + { + "git-tree": "f20f5071e4d65267e34c2a6b7641ccb30ea881d7", + "version-string": "0.6.0", + "port-version": 0 + }, + { + "git-tree": "e98f2877f3936625ea17a1ef6da69b8c3e634933", + "version-string": "apache-arrow-0.4.0-1", + "port-version": 0 + }, + { + "git-tree": "dd778519bde3107f576c7960193c2dbc551ec884", + "version-string": "apache-arrow-0.4.0 ", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/ashes.json b/externals/vcpkg/versions/a-/ashes.json new file mode 100755 index 000000000..d8c48afc4 --- /dev/null +++ b/externals/vcpkg/versions/a-/ashes.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "f87e3684259242b878a7ab5617dd0350a6565a15", + "version-date": "2022-06-08", + "port-version": 0 + }, + { + "git-tree": "96b165dc0ea6c62aeabea274f6833c55feaccdd1", + "version-date": "2022-04-03", + "port-version": 1 + }, + { + "git-tree": "365d042da082df035fb7dba0a53e1a4ac306f469", + "version-date": "2022-04-03", + "port-version": 0 + }, + { + "git-tree": "68557018b215aba6325caf97248c62955fdef397", + "version-date": "2021-06-18", + "port-version": 1 + }, + { + "git-tree": "3d20e63c5d3a016d41571baefa723a23113c13c3", + "version-date": "2021-06-18", + "port-version": 0 + }, + { + "git-tree": "5e0e57612b419c8cdb33f26195213626c59e7efd", + "version-string": "2021-02-09", + "port-version": 0 + }, + { + "git-tree": "6b5482b87c4a123fe71d94ede2e04296a7281b9b", + "version-string": "2020-10-21", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/asio-grpc.json b/externals/vcpkg/versions/a-/asio-grpc.json new file mode 100755 index 000000000..7a213c144 --- /dev/null +++ b/externals/vcpkg/versions/a-/asio-grpc.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "3f73fa275b5f4d19d244b7212b8c7ae61135fc95", + "version": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "6decc4befbc311b08e2229bf58da567d8a86561c", + "version": "1.6.0", + "port-version": 0 + }, + { + "git-tree": "56b29ba569fb72539675ca51ecf3c83fcf8eb0ba", + "version": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "895af5509d20a5f310a5fa7285bd2e8e24e75548", + "version": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "b68efdc2a8b782df2489156675bb4a4e95c7a221", + "version": "1.3.1", + "port-version": 0 + }, + { + "git-tree": "39ad0d8203c21698ba153d6951de8295954028eb", + "version": "1.1.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/asio.json b/externals/vcpkg/versions/a-/asio.json new file mode 100755 index 000000000..8ff066eac --- /dev/null +++ b/externals/vcpkg/versions/a-/asio.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "fbf8b87b680829fee5a422169f3d73df4392d8cf", + "version": "1.22.1", + "port-version": 0 + }, + { + "git-tree": "b16ad8ba502540b3b34a29552f6937951e08e5e6", + "version": "1.20.0", + "port-version": 0 + }, + { + "git-tree": "c6bba20de9d8e7d6278ab8d7b333bb14bd35f21f", + "version": "1.19.2", + "port-version": 0 + }, + { + "git-tree": "ae594f45685a04883ec38208caf740ee9c9635e8", + "version": "1.18.2", + "port-version": 0 + }, + { + "git-tree": "09afe8ce875f1c4e5e46d54c7c8bd5d0b9b512fc", + "version": "1.18.1", + "port-version": 1 + }, + { + "git-tree": "f564160afbc91228b0fe5c48f8f4c0b7dcd99b31", + "version": "1.18.1", + "port-version": 0 + }, + { + "git-tree": "49f198a6e3cf688db2a0fe78de28214397fdd39d", + "version-string": "1.18.0", + "port-version": 0 + }, + { + "git-tree": "73931d34afbd50a664751df84991865ae89af7e4", + "version-string": "1.12.2-2", + "port-version": 0 + }, + { + "git-tree": "5f4d959b8b58a77d149f7aa083f6b525872bff99", + "version-string": "1.12.2-1", + "port-version": 0 + }, + { + "git-tree": "4d9f361442f1c97e98d449999c2bda4e181fc5df", + "version-string": "1.12.2", + "port-version": 0 + }, + { + "git-tree": "463163c76085b16d8c9d7996810930da06ae0380", + "version-string": "1.12.1-1", + "port-version": 0 + }, + { + "git-tree": "a428645a3450eb5822d31b1347bf1b69d899f4be", + "version-string": "1.12.1", + "port-version": 0 + }, + { + "git-tree": "fc627635b936a7422fd66c1f1f64034510ca08d1", + "version-string": "1.12.0-2", + "port-version": 0 + }, + { + "git-tree": "57277aed65e6c97f789356a796e29aee7c9133ef", + "version-string": "1.12.0-1", + "port-version": 0 + }, + { + "git-tree": "697366e6e4661a88923558ffcff92838aa344c25", + "version-string": "1.12.0", + "port-version": 0 + }, + { + "git-tree": "d99e0e51fee4f8a8df42844a48a8852fa2d7283f", + "version-string": "1.10.8-1", + "port-version": 0 + }, + { + "git-tree": "404c7cb32cc6450b82fb99c07e6ba05e4228539f", + "version-string": "1.10.8", + "port-version": 0 + }, + { + "git-tree": "ec4bac325cbc717f0bbb02c9492a4914728d3d84", + "version-string": "1.10.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/asiosdk.json b/externals/vcpkg/versions/a-/asiosdk.json new file mode 100755 index 000000000..087591c2f --- /dev/null +++ b/externals/vcpkg/versions/a-/asiosdk.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "101bbdad9205db5b4249eae8b47bf8c5f73493a8", + "version": "2.3.3", + "port-version": 4 + }, + { + "git-tree": "870921549ca1a681fe04ba3a0c17586995c1b567", + "version": "2.3.3", + "port-version": 3 + }, + { + "git-tree": "0684d33e2d5d248ba33f92751154cb58512e2511", + "version": "2.3.3", + "port-version": 2 + }, + { + "git-tree": "d2330df0e338b51a2e303ed1d0403545883b7428", + "version-string": "2.3.3-1", + "port-version": 0 + }, + { + "git-tree": "42ef941b2c44f84dff260c30f892cb626b6ee76c", + "version-string": "2.3.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/asmjit.json b/externals/vcpkg/versions/a-/asmjit.json new file mode 100755 index 000000000..b6222d240 --- /dev/null +++ b/externals/vcpkg/versions/a-/asmjit.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "f67010904c0f2d7a1d79a647ea928aece3e66750", + "version-date": "2021-10-26", + "port-version": 1 + }, + { + "git-tree": "3ce58638bee35ef08b3ee8286c1e519b171c39bf", + "version-date": "2021-10-26", + "port-version": 0 + }, + { + "git-tree": "beb9e328e4d8c0575319af439ec4f810cf0bfa40", + "version-string": "2020-09-14", + "port-version": 1 + }, + { + "git-tree": "ce18730abf423893475a9addc5c55cea38964e0b", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "fa0c36ba15b48959ab5a2df3463299e1d2473b6f", + "version-string": "2020-07-22", + "port-version": 0 + }, + { + "git-tree": "39200e33a095d15021817855a9fefa990ab7d2e4", + "version-string": "2020-05-08", + "port-version": 0 + }, + { + "git-tree": "5bca13a7f4b836d2374bda5fa0efffd111605173", + "version-string": "2020-02-08", + "port-version": 0 + }, + { + "git-tree": "6d945eeaa2d16fee0d06c8aa24fc68ea311ce972", + "version-string": "2020-01-20", + "port-version": 0 + }, + { + "git-tree": "36ac008bddeab18b7a6624d32650ebbebcd48542", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "c8f517fbc415e6e0025d4f75f3bc94bc08552f6b", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "d69f0c00009f2dfabf734adbc695f200feae82d9", + "version-string": "2019-01-30", + "port-version": 0 + }, + { + "git-tree": "d880c763130f58ffe017d06af086668cfd0c03f4", + "version-string": "2018-12-14", + "port-version": 0 + }, + { + "git-tree": "40297c743469da0422db8bebed32b15aa2e6de19", + "version-string": "2018-11-08", + "port-version": 0 + }, + { + "git-tree": "ab02180a87128ab2f2cee98de3c7ed8ed0ff4fbc", + "version-string": "673dcefaa048c5f5a2bf8b85daf8f7b9978d018a", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/assimp.json b/externals/vcpkg/versions/a-/assimp.json new file mode 100755 index 000000000..a8986e751 --- /dev/null +++ b/externals/vcpkg/versions/a-/assimp.json @@ -0,0 +1,129 @@ +{ + "versions": [ + { + "git-tree": "cab54d6dedc48fcb9642f5fbe079e61105405543", + "version-string": "5.0.1", + "port-version": 5 + }, + { + "git-tree": "b0bd03f6677d06cc56fbcecb15ff205a9a43b66c", + "version-string": "5.0.1", + "port-version": 4 + }, + { + "git-tree": "d4228d8fc413efb47e151af707b6f1036c58b524", + "version-string": "5.0.1", + "port-version": 3 + }, + { + "git-tree": "835678d00f79a0633e787f2a9bcdf8569b50ce1a", + "version-string": "5.0.1", + "port-version": 2 + }, + { + "git-tree": "ae7164957f4d0939cd442331dd2a9bfe56430051", + "version-string": "5.0.1", + "port-version": 1 + }, + { + "git-tree": "1302729a9916e49763f596f27b8f7a078a3e295a", + "version-string": "5.0.1", + "port-version": 0 + }, + { + "git-tree": "f64ea36b5d8c21c60c59958df022037fe7ed3932", + "version-string": "5.0.0-2", + "port-version": 0 + }, + { + "git-tree": "c5c58bf13f6c7849d5f7f9d805334fc589848df1", + "version-string": "5.0.0-1", + "port-version": 0 + }, + { + "git-tree": "d05b368668ecb85ca0e8c3d7727d3639cc11f381", + "version-string": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "bc39933b997e72876250e65cc0baf94a099394fc", + "version-string": "4.1.0-8", + "port-version": 0 + }, + { + "git-tree": "56f302b766f710e85906d5b008c2b4b784178038", + "version-string": "4.1.0-5", + "port-version": 0 + }, + { + "git-tree": "bcd43128f09a1206a231cd5279bb9ec74d75715e", + "version-string": "4.1.0-4", + "port-version": 0 + }, + { + "git-tree": "a6f54c4aee8b9d96f9944df107bef204e33eeb22", + "version-string": "4.1.0-3", + "port-version": 0 + }, + { + "git-tree": "ff167f3fc7d4c8177ab371520553be012c466276", + "version-string": "4.1.0-2", + "port-version": 0 + }, + { + "git-tree": "435f1e736588b3d29f64e8198d58506115db39ab", + "version-string": "4.1.0-1", + "port-version": 0 + }, + { + "git-tree": "14923a9e7e72c854f259313474be015fc3d67efb", + "version-string": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "6e0021228c36fd58b2b0648d82d8638404f38004", + "version-string": "4.0.1-3", + "port-version": 0 + }, + { + "git-tree": "880c6f28522040ec88f7bbff8b46996db50d12e1", + "version-string": "4.0.1-2", + "port-version": 0 + }, + { + "git-tree": "7feb4e6445d69845d3749b8c46a8aadc9a7b43c7", + "version-string": "4.0.1-1", + "port-version": 0 + }, + { + "git-tree": "2f1952a8ef4f38ae627e8c39c44eb41668f00d5a", + "version-string": "4.0.1", + "port-version": 0 + }, + { + "git-tree": "dc206c1ce726af6f25ff75bd1c4590c190601263", + "version-string": "4.0.0-2", + "port-version": 0 + }, + { + "git-tree": "d3973ad124bd172e9621c53896da2cfa69891101", + "version-string": "4.0.0-1", + "port-version": 0 + }, + { + "git-tree": "a97b97ef3c6754dbda9d02b7ff41c11a84b260f4", + "version-string": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "620a3ea9e55329625a48a01a58cd9217c11e5621", + "version-string": "3.3.1", + "port-version": 0 + }, + { + "git-tree": "4fc82cfbc7d8285e54202eddcffb67757a5d0f48", + "version-string": "3.2.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/asynch.json b/externals/vcpkg/versions/a-/asynch.json new file mode 100755 index 000000000..629b9978a --- /dev/null +++ b/externals/vcpkg/versions/a-/asynch.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "e656692601ab76c652a9b09c98bb36ee8723f9c0", + "version-string": "2019-09-21", + "port-version": 2 + }, + { + "git-tree": "4955ffe2f2e53d427532418c0a77e9b5ec94b0aa", + "version-string": "2019-09-21-1", + "port-version": 0 + }, + { + "git-tree": "29a5b1b0fabe2bf4f1477f263087ccf135e298d3", + "version-string": "2019-09-21", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/asyncplusplus.json b/externals/vcpkg/versions/a-/asyncplusplus.json new file mode 100755 index 000000000..4de790bf2 --- /dev/null +++ b/externals/vcpkg/versions/a-/asyncplusplus.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "15a66956fc29d87d60f48bfc7aa3ca823554734e", + "version-string": "1.1", + "port-version": 1 + }, + { + "git-tree": "87a28ca122377134fb51ad27cf2a4a800fbc6bd8", + "version-string": "1.1", + "port-version": 0 + }, + { + "git-tree": "06dc11e4e504f924ed6dfa5dca8ec9270667d87f", + "version-string": "1.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/atk.json b/externals/vcpkg/versions/a-/atk.json new file mode 100755 index 000000000..119e22c2d --- /dev/null +++ b/externals/vcpkg/versions/a-/atk.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "4034b57da4c9eeb30d6904339be721b7e45f8a89", + "version": "2.38.0", + "port-version": 1 + }, + { + "git-tree": "9e43338e95e4bfeb688d23ade7792fb45b185356", + "version": "2.38.0", + "port-version": 0 + }, + { + "git-tree": "15723fa24f08f04e859253b16f5cbc05529d10cf", + "version": "2.36.0", + "port-version": 2 + }, + { + "git-tree": "cf5656ae96a202ad1846f5cb233cc4daf4f3336d", + "version": "2.36.0", + "port-version": 1 + }, + { + "git-tree": "b8ace143cf9715262f419c85a5840fa15a4cf0ce", + "version": "2.36.0", + "port-version": 0 + }, + { + "git-tree": "28ffcc285239b3ca0d99752bc740f9349f996ad1", + "version-string": "2.24.0-5", + "port-version": 2 + }, + { + "git-tree": "8b340fffd56bb314c9013f55af518bf111af666b", + "version-string": "2.24.0-5", + "port-version": 1 + }, + { + "git-tree": "18245a7bfaf409eba114baf41896ca126163851e", + "version-string": "2.24.0-5", + "port-version": 0 + }, + { + "git-tree": "791aa9841eab23cc72d2f98381ed132a32567035", + "version-string": "2.24.0-4", + "port-version": 0 + }, + { + "git-tree": "4df135cf73816939af5416dca1e535553a4b035e", + "version-string": "2.24.0-3", + "port-version": 0 + }, + { + "git-tree": "bc8acf75ad0c136ff158548200c08dfa0f59cb42", + "version-string": "2.24.0-2", + "port-version": 0 + }, + { + "git-tree": "faf0b23eedbc6ea044f3730cc1b525f663b3d11b", + "version-string": "2.24.0-1", + "port-version": 0 + }, + { + "git-tree": "aad9b11c6426bc739a899deb478fd4f49f70c3f5", + "version-string": "2.24.0", + "port-version": 0 + }, + { + "git-tree": "d99d3626bf81d50c0c51d3c39592d00178c0db26", + "version-string": "2.22.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/atkmm.json b/externals/vcpkg/versions/a-/atkmm.json new file mode 100755 index 000000000..18d71ff6f --- /dev/null +++ b/externals/vcpkg/versions/a-/atkmm.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "f0bad5eb22d4affecd3eb08be801a8692b5704c6", + "version": "2.36.1", + "port-version": 0 + }, + { + "git-tree": "bd4ca61c3b3fcfbadf494e019aa13a659eeff930", + "version": "2.36.0", + "port-version": 2 + }, + { + "git-tree": "340ce8d9ccb6154374ecbe6bf6c9a70b83442578", + "version": "2.36.0", + "port-version": 1 + }, + { + "git-tree": "1feae8dc89c99e89b47bb8a028cca2e77d9d4352", + "version": "2.36.0", + "port-version": 0 + }, + { + "git-tree": "6147b7b2b6af5fac8a05e48cb4e624fb2fdde235", + "version-string": "2.24.2", + "port-version": 5 + }, + { + "git-tree": "e3fe7e543a9580c2ea9116d66376d2744cd627ed", + "version-string": "2.24.2", + "port-version": 4 + }, + { + "git-tree": "528633a4adac405a9fc4ee39ae45352ab47c6f98", + "version-string": "2.24.2", + "port-version": 3 + }, + { + "git-tree": "e1ec86f38809f14d500d14012da83824c1538071", + "version-string": "2.24.2-2", + "port-version": 0 + }, + { + "git-tree": "33fec2fc8ed32dd427c1e27252b3ec9af049f8df", + "version-string": "2.24.2-1", + "port-version": 0 + }, + { + "git-tree": "b3eca50169f8ca7c03816ac3486269e2512b59fa", + "version-string": "2.24.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/atlmfc.json b/externals/vcpkg/versions/a-/atlmfc.json new file mode 100755 index 000000000..7f6fcbf60 --- /dev/null +++ b/externals/vcpkg/versions/a-/atlmfc.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "509a448c797ddb6cf67ba179b6edff02fee17865", + "version-string": "0", + "port-version": 1 + }, + { + "git-tree": "bf15a689a8ab4c50dbf2e6eef2c3a7fff5e6dd8f", + "version-string": "0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/atomic-queue.json b/externals/vcpkg/versions/a-/atomic-queue.json new file mode 100755 index 000000000..56784d4b3 --- /dev/null +++ b/externals/vcpkg/versions/a-/atomic-queue.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a32a426d9c16a0067532134ecb6680ee7928f7f7", + "version-date": "2021-05-03", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/aubio.json b/externals/vcpkg/versions/a-/aubio.json new file mode 100755 index 000000000..11156e198 --- /dev/null +++ b/externals/vcpkg/versions/a-/aubio.json @@ -0,0 +1,114 @@ +{ + "versions": [ + { + "git-tree": "511a11ecdc92221bcde518ad98f22512788a07a4", + "version-semver": "0.4.9", + "port-version": 9 + }, + { + "git-tree": "4888190139ae3bd7f3fdb15f79453b25f59a45f5", + "version-semver": "0.4.9", + "port-version": 8 + }, + { + "git-tree": "b7115b787e5f71bf65454f4c3cff3ec85b4eb264", + "version-semver": "0.4.9", + "port-version": 7 + }, + { + "git-tree": "0abf18908332cd2ccfe8e298f8fd90c0db42dcd9", + "version-semver": "0.4.9", + "port-version": 6 + }, + { + "git-tree": "229c53eddabe48fa718f95c3dd3094a694770a19", + "version-semver": "0.4.9", + "port-version": 5 + }, + { + "git-tree": "a5fd622dc9d70a1f4cca1e6bc09829e1844b7e0f", + "version-string": "0.4.9", + "port-version": 4 + }, + { + "git-tree": "4623a0698d9f9775a12e41f282e2b131f32ea09f", + "version-string": "0.4.9", + "port-version": 3 + }, + { + "git-tree": "3a1b37a405232977d957c365019ed85a4c8ad009", + "version-string": "0.4.9", + "port-version": 2 + }, + { + "git-tree": "fc538d2460c0110f71b3255826c3b193175422c2", + "version-string": "0.4.9-1", + "port-version": 0 + }, + { + "git-tree": "a202c56d375aa33d948e71f1f776fc9cc4a09eab", + "version-string": "0.4.9", + "port-version": 0 + }, + { + "git-tree": "00cf95c6fcb5d83046fb353c910e70d8d1a980a1", + "version-string": "0.4.8-1", + "port-version": 0 + }, + { + "git-tree": "7f4ce7b7e1d4bd4c99c23fa8cac84163db0b4468", + "version-string": "0.4.8", + "port-version": 0 + }, + { + "git-tree": "2a8f1ef1cbfc2fe87239bbe379490e6452acc276", + "version-string": "0.4.6-967e4041f-2", + "port-version": 0 + }, + { + "git-tree": "acde13c98ba29a9936de1d4c98c2b4c973970b56", + "version-string": "0.4.6-2", + "port-version": 0 + }, + { + "git-tree": "005bb8735251e9c77d2c5ced392f01bb05e682bc", + "version-string": "0.4.6-1", + "port-version": 0 + }, + { + "git-tree": "542773bbef586a34953826aaff9f5a7378004798", + "version-string": "0.4.6", + "port-version": 0 + }, + { + "git-tree": "fc6b19d961492dc1f1ce5ca068e09b6a7b86314d", + "version-string": "0.46", + "port-version": 0 + }, + { + "git-tree": "49c57b3338cfcdf1e2613a00b794fe00d4a62b99", + "version-string": "0.46~alpha-4", + "port-version": 0 + }, + { + "git-tree": "53b5167f7b8d12cd07353feca07203319dfda73a", + "version-string": "0.46~alpha-3", + "port-version": 0 + }, + { + "git-tree": "be74b6c5a73af43313c11a4d3e64d1dd65f2569a", + "version-string": "0.46~alpha-2", + "port-version": 0 + }, + { + "git-tree": "fce6ff31ff9335fc9df0eacdedc522f921025a9a", + "version-string": "0.46~alpha-1", + "port-version": 0 + }, + { + "git-tree": "ff49e16d707219bff9c3e09a00dd119aabb25d1b", + "version-string": "0.46~alpha", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/audiofile.json b/externals/vcpkg/versions/a-/audiofile.json new file mode 100755 index 000000000..f928b164c --- /dev/null +++ b/externals/vcpkg/versions/a-/audiofile.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "fa276b1ad374c2ae6034445b6655518d8f9a23de", + "version": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "73a1d7555de8baaf7a1b34ca1410d7e9978bf75f", + "version": "1.0.9", + "port-version": 0 + }, + { + "git-tree": "3bf2b19891a915f88803b1fa079c525e4d253ba0", + "version-string": "1.0.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/aurora.json b/externals/vcpkg/versions/a-/aurora.json new file mode 100755 index 000000000..5fb067e57 --- /dev/null +++ b/externals/vcpkg/versions/a-/aurora.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "a41f2335fd703ebb6a3dbd4eb20260754cff110c", + "version-string": "2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933", + "port-version": 1 + }, + { + "git-tree": "027accab492d7272fdd2d70916fd97f2c36644a3", + "version-string": "2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/autobahn.json b/externals/vcpkg/versions/a-/autobahn.json new file mode 100755 index 000000000..5aaa23e76 --- /dev/null +++ b/externals/vcpkg/versions/a-/autobahn.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "2d7687436a474abcf18dd1b5689437218f8f6d36", + "version-string": "20.8.1", + "port-version": 1 + }, + { + "git-tree": "0389b345f8b7cc5f7c4cfb7a461cee02a76e0034", + "version-string": "20.8.1", + "port-version": 0 + }, + { + "git-tree": "07faa0f6be019d2d32b1652567bd0bf64c8e419b", + "version-string": "18.4.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/autodock-vina.json b/externals/vcpkg/versions/a-/autodock-vina.json new file mode 100755 index 000000000..c0e43d1be --- /dev/null +++ b/externals/vcpkg/versions/a-/autodock-vina.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "05bd7ebce99db7a1d6fb9fa3194e53583d2b3b25", + "version-semver": "1.2.3", + "port-version": 0 + }, + { + "git-tree": "393884054347c19ff78db882674ce17dd51476e0", + "version-semver": "1.2.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/avcpp.json b/externals/vcpkg/versions/a-/avcpp.json new file mode 100755 index 000000000..9394cae4e --- /dev/null +++ b/externals/vcpkg/versions/a-/avcpp.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "caf5460d5bfca1d608b7c7eab2bd2872080bf0d8", + "version-date": "2021-06-14", + "port-version": 1 + }, + { + "git-tree": "b4e6dcc1706046f3b2b6fca62df98bbc7696eb19", + "version-date": "2021-06-14", + "port-version": 0 + }, + { + "git-tree": "102cfc337c2a08e57246c399812a540315ae4531", + "version-date": "2021-05-06", + "port-version": 1 + }, + { + "git-tree": "aa82b322b6c59cf758147d78664f3d7ce66a77dc", + "version-date": "2021-05-06", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/avisynthplus.json b/externals/vcpkg/versions/a-/avisynthplus.json new file mode 100755 index 000000000..fa886037d --- /dev/null +++ b/externals/vcpkg/versions/a-/avisynthplus.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "e3749b45c163c78cdd03a7e47223634ba17ab58f", + "version-semver": "3.7.2", + "port-version": 0 + }, + { + "git-tree": "a585670d79213148e938d9f3ea7d2ccb1c784f2c", + "version-semver": "3.7.0", + "port-version": 3 + }, + { + "git-tree": "ed06319cd3b2bb9e0811743ca7f66dd9539eabef", + "version-semver": "3.7.0", + "port-version": 2 + }, + { + "git-tree": "747e0dd9f81ace8b2f473dc455871938d930df28", + "version-semver": "3.7.0", + "port-version": 1 + }, + { + "git-tree": "3d573152a7d82faefcb525b1d6cf688a1465a71b", + "version-semver": "3.7.0", + "port-version": 0 + }, + { + "git-tree": "de073b58132bfad56e8b89ece1e9e4c995df607b", + "version-string": "3.6.1", + "port-version": 0 + }, + { + "git-tree": "5f71f3a1d842ba88c356e32fe1d2fbc487b47855", + "version-string": "3.6.0", + "port-version": 1 + }, + { + "git-tree": "294672fd504c5667c368b0c3288b6be1e34810cb", + "version-string": "3.6.0", + "port-version": 0 + }, + { + "git-tree": "04d2366805052941a50dc8db53c45d1a9265bb72", + "version-string": "3.5.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/avro-c.json b/externals/vcpkg/versions/a-/avro-c.json new file mode 100755 index 000000000..35574415d --- /dev/null +++ b/externals/vcpkg/versions/a-/avro-c.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "7b07da3abd56565c8d2e75942aab468ece0f3115", + "version": "1.11.0", + "port-version": 3 + }, + { + "git-tree": "e36456a1ada18a8020e4bb1fffa24b0dc2edfa3e", + "version": "1.11.0", + "port-version": 2 + }, + { + "git-tree": "75d0ed12b643fe1ed6a175c12549e9bb0ca94a1d", + "version": "1.11.0", + "port-version": 1 + }, + { + "git-tree": "0b07ed910d3ad0ec9a5be71e1b37f0593ab540c9", + "version": "1.11.0", + "port-version": 0 + }, + { + "git-tree": "0828484bab48f23c09e440f9df3d9d99dd3caaa0", + "version-string": "1.9.2", + "port-version": 2 + }, + { + "git-tree": "09783bc724dc91b8c456cbb060043ccb206e8595", + "version-string": "1.9.2-1", + "port-version": 0 + }, + { + "git-tree": "99bbfcf0dc88ff4fb93fee1e252a1488d0be5bdb", + "version-string": "1.9.2", + "port-version": 0 + }, + { + "git-tree": "c6e0d310e5ed9c1cac48a2076ba67323acf25882", + "version-string": "1.8.2-4", + "port-version": 0 + }, + { + "git-tree": "7946d8a20fa3d901dfdcf9a76c361a1c0f9b095d", + "version-string": "1.8.2-3", + "port-version": 0 + }, + { + "git-tree": "617a18c6d4bf8718e7010da2797c60f63fba082b", + "version-string": "1.8.2-2", + "port-version": 0 + }, + { + "git-tree": "a3052db22f21a58023818a908d156fa4a9e4574c", + "version-string": "1.8.2-1", + "port-version": 0 + }, + { + "git-tree": "ab59da4973872f333444eb0847dcc80abc5dd3a2", + "version-string": "1.8.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/avro-cpp.json b/externals/vcpkg/versions/a-/avro-cpp.json new file mode 100755 index 000000000..1f27c1285 --- /dev/null +++ b/externals/vcpkg/versions/a-/avro-cpp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "7804bfb279bdea0b9e270f010e1683b9b8d7ee38", + "version-date": "2021-06-01", + "port-version": 1 + }, + { + "git-tree": "ecafbb456636115f10c5670a8bb484181c133d89", + "version-date": "2021-06-01", + "port-version": 0 + }, + { + "git-tree": "e6253ca701d576b97c1625beeb8a1767eb73bae4", + "version-string": "1.9.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/aws-c-auth.json b/externals/vcpkg/versions/a-/aws-c-auth.json new file mode 100755 index 000000000..4c5c0a437 --- /dev/null +++ b/externals/vcpkg/versions/a-/aws-c-auth.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "cdf9b6cb3b199b8ef1dec2e0d46bcfea7c8f536a", + "version": "0.6.3", + "port-version": 2 + }, + { + "git-tree": "be9ae25111a5c7104d7c3769fcd581ee9f5dac7a", + "version": "0.6.3", + "port-version": 1 + }, + { + "git-tree": "09b8dcb5acc3e1f83c8b5e3f8b242db3d85f468b", + "version": "0.6.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/aws-c-cal.json b/externals/vcpkg/versions/a-/aws-c-cal.json new file mode 100755 index 000000000..ee01b313b --- /dev/null +++ b/externals/vcpkg/versions/a-/aws-c-cal.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "a383adb52cab94b360e30cf82c1be79a45a75875", + "version": "0.5.12", + "port-version": 2 + }, + { + "git-tree": "33e7566ec2dc8cbc5ce91687b8627f946cdf231d", + "version": "0.5.12", + "port-version": 1 + }, + { + "git-tree": "6f3ed6a5199c30560f46d1be38cee72e3a77d62a", + "version": "0.5.12", + "port-version": 0 + }, + { + "git-tree": "7495a338fdd1313d3cdfb67e69406eb4ecea02e9", + "version": "0.5.11", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/aws-c-common.json b/externals/vcpkg/versions/a-/aws-c-common.json new file mode 100755 index 000000000..6add7a56c --- /dev/null +++ b/externals/vcpkg/versions/a-/aws-c-common.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "56b4972c2535a4e8991826b6c595e433b0e80bf9", + "version": "0.6.9", + "port-version": 2 + }, + { + "git-tree": "20a16524a9cc1079486d4efd5230562c8b9bed8a", + "version": "0.6.9", + "port-version": 1 + }, + { + "git-tree": "e0cf8500b71dc430f8d688db62f277b6c20a2a74", + "version": "0.6.9", + "port-version": 0 + }, + { + "git-tree": "da525f4c21c19e8eb2d81d6f352467395b55f354", + "version-string": "0.4.56", + "port-version": 2 + }, + { + "git-tree": "18178de87240278976fc659b52d8a86dbda31329", + "version-string": "0.4.56", + "port-version": 1 + }, + { + "git-tree": "3b58ff9b212a0910118c979470d7e53925d1b705", + "version-string": "0.4.56", + "port-version": 0 + }, + { + "git-tree": "de827b03e2db3b173e5d6d25266e6489608c119d", + "version-string": "0.4.15", + "port-version": 0 + }, + { + "git-tree": "0d766b6dc8e60e4d7a4c3a6eb7e15fba323fdff6", + "version-string": "0.4.1", + "port-version": 0 + }, + { + "git-tree": "f70c131558d24973206d24f40356a30346617c1e", + "version-string": "0.3.11-1", + "port-version": 0 + }, + { + "git-tree": "68789bb84f4ad94e006386403e46970c280d6d46", + "version-string": "0.3.11", + "port-version": 0 + }, + { + "git-tree": "f60a72a5b4fb56cc3f952fb8acf1800776b56eda", + "version-string": "0.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/aws-c-compression.json b/externals/vcpkg/versions/a-/aws-c-compression.json new file mode 100755 index 000000000..fc988fb96 --- /dev/null +++ b/externals/vcpkg/versions/a-/aws-c-compression.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "107778b6c4b3c09105fcc9a08b31b252278538a4", + "version": "0.2.14", + "port-version": 2 + }, + { + "git-tree": "5892ebc8e23b264d832f03d4f7dfb04856dd8367", + "version": "0.2.14", + "port-version": 1 + }, + { + "git-tree": "e9dd3757cfe02e9e9d6d4d0bf772507c1be3794e", + "version": "0.2.14", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/aws-c-event-stream.json b/externals/vcpkg/versions/a-/aws-c-event-stream.json new file mode 100755 index 000000000..d92b1f859 --- /dev/null +++ b/externals/vcpkg/versions/a-/aws-c-event-stream.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "6a9e93d6dd8799afe5f56eeeda92793ba888691e", + "version": "0.2.7", + "port-version": 2 + }, + { + "git-tree": "4d0b2b6a72ae5ea454dc5378f9b3bc78320174ae", + "version": "0.2.7", + "port-version": 1 + }, + { + "git-tree": "0556f6ff7d7a2e270825de650d84e97c1ed2cf9b", + "version": "0.2.7", + "port-version": 0 + }, + { + "git-tree": "d2daec107d6c9d3077a4623d3cf341304a309852", + "version-string": "0.1.6", + "port-version": 1 + }, + { + "git-tree": "50134e5fe6fa4dd534238fd2a799722b918704a9", + "version-string": "0.1.6", + "port-version": 0 + }, + { + "git-tree": "d8569065153318306e1b6cc224d2b28ddd170f0b", + "version-string": "0.1.4", + "port-version": 0 + }, + { + "git-tree": "c20f3cd8616b1b985414c66f40774c15a523a851", + "version-string": "0.1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/aws-c-http.json b/externals/vcpkg/versions/a-/aws-c-http.json new file mode 100755 index 000000000..44db43e72 --- /dev/null +++ b/externals/vcpkg/versions/a-/aws-c-http.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "845a574790e6fcd40bfc13cf0c65104d04e29350", + "version": "0.6.5", + "port-version": 2 + }, + { + "git-tree": "470e20b38e215a550b52c002a7cc8a7f18938bf9", + "version": "0.6.5", + "port-version": 1 + }, + { + "git-tree": "21701228d8dca8d718f990273734749288100cdd", + "version": "0.6.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/aws-c-io.json b/externals/vcpkg/versions/a-/aws-c-io.json new file mode 100755 index 000000000..1ea423119 --- /dev/null +++ b/externals/vcpkg/versions/a-/aws-c-io.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "7456b996bdeeeeb59fb39770d797fa2966d0a951", + "version": "0.10.7", + "port-version": 2 + }, + { + "git-tree": "45b959b56caa21052a67c2b3d0b493a3e401288c", + "version": "0.10.7", + "port-version": 1 + }, + { + "git-tree": "fd430ec2c2c43582b0765a48e0a724d17747ae36", + "version": "0.10.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/aws-c-mqtt.json b/externals/vcpkg/versions/a-/aws-c-mqtt.json new file mode 100755 index 000000000..8386463b3 --- /dev/null +++ b/externals/vcpkg/versions/a-/aws-c-mqtt.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "028932fcffa607cc234348c2e2df454da7c4ccad", + "version": "0.7.6", + "port-version": 3 + }, + { + "git-tree": "834a199cf4560cbdd8e6dac09074b9b5b1d57d53", + "version": "0.7.6", + "port-version": 2 + }, + { + "git-tree": "6dc42a5ba915723bed2997c39222b166a9f0a084", + "version": "0.7.6", + "port-version": 1 + }, + { + "git-tree": "a7ac0c5bddb07cc6ef49fe32f845efb230d28059", + "version": "0.7.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/aws-c-s3.json b/externals/vcpkg/versions/a-/aws-c-s3.json new file mode 100755 index 000000000..b556184ce --- /dev/null +++ b/externals/vcpkg/versions/a-/aws-c-s3.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "c571d95b22b5f84591bf4a115ca47c522371efce", + "version": "0.1.25", + "port-version": 2 + }, + { + "git-tree": "620ce24ba09dd971644750eedcbb42a8f1fc2457", + "version": "0.1.25", + "port-version": 1 + }, + { + "git-tree": "074cd08f0a073d8b1bfc551bd47435aa50ea96da", + "version": "0.1.25", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/aws-checksums.json b/externals/vcpkg/versions/a-/aws-checksums.json new file mode 100755 index 000000000..e1682a125 --- /dev/null +++ b/externals/vcpkg/versions/a-/aws-checksums.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "aeda736d7deef9292db2e43dc8702b2ddb5d59b0", + "version": "0.1.11", + "port-version": 3 + }, + { + "git-tree": "e70b465c6b8ce012ed176b822471dd440f853267", + "version": "0.1.11", + "port-version": 2 + }, + { + "git-tree": "120921754d48ecb075658abd01dc56b73e7f25f4", + "version": "0.1.11", + "port-version": 1 + }, + { + "git-tree": "60a67f9776bc5957aa27bf0cd2ad36fb10a7bc04", + "version": "0.1.11", + "port-version": 0 + }, + { + "git-tree": "faeacfa4356bdc71228a197676b7613cf369520c", + "version-string": "0.1.9", + "port-version": 1 + }, + { + "git-tree": "4be7a5832f122e6c98d235bd58c55ea2d83dcdea", + "version-string": "0.1.9", + "port-version": 0 + }, + { + "git-tree": "03a865bfedb1a3ae47b3e284bd15443612aa664e", + "version-string": "0.1.5", + "port-version": 0 + }, + { + "git-tree": "a93bdeae64de7039871839c398ba3f97c9d9a4cc", + "version-string": "0.1.3", + "port-version": 0 + }, + { + "git-tree": "46b79a9d66e687e13345c6f2b2f1eade29505c6b", + "version-string": "0.1.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/aws-crt-cpp.json b/externals/vcpkg/versions/a-/aws-crt-cpp.json new file mode 100755 index 000000000..fe805028e --- /dev/null +++ b/externals/vcpkg/versions/a-/aws-crt-cpp.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "e542ffdad6392c75909a3235d33c2a22c939c980", + "version": "0.15.1", + "port-version": 3 + }, + { + "git-tree": "d96290d0c6d34f9b4129e811e3b8fd2d62a699c7", + "version": "0.15.1", + "port-version": 2 + }, + { + "git-tree": "60880034065d31bf96ac71028dab62955a77ba55", + "version": "0.15.1", + "port-version": 1 + }, + { + "git-tree": "5bd5acd0aefeed0bbf56945c6b299644f3ad6af0", + "version": "0.15.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/aws-lambda-cpp.json b/externals/vcpkg/versions/a-/aws-lambda-cpp.json new file mode 100755 index 000000000..13fa94b2e --- /dev/null +++ b/externals/vcpkg/versions/a-/aws-lambda-cpp.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "48030b34e22463cab36178bb50d3ce62257d6d56", + "version": "0.2.7", + "port-version": 1 + }, + { + "git-tree": "e9c58661b9a838e782997f03ee3af449260ece4f", + "version-string": "0.2.7", + "port-version": 0 + }, + { + "git-tree": "3e586ea66476a0d9ce91ae630e1966724794ef2f", + "version-string": "0.2.6", + "port-version": 1 + }, + { + "git-tree": "bfe8b19021e8359832f5e32438cb988f4edf0fdf", + "version-string": "0.2.6", + "port-version": 0 + }, + { + "git-tree": "7790810f7e80d8c0387fcf87984848da82da0539", + "version-string": "0.2.4", + "port-version": 0 + }, + { + "git-tree": "7d46b881faa433de4780e0e49994ecc1a4208733", + "version-string": "0.1.0-2", + "port-version": 0 + }, + { + "git-tree": "ba62336bf04861892999b45d5595c7f75a9487b8", + "version-string": "0.1.0-1", + "port-version": 0 + }, + { + "git-tree": "e2e3a86bb6bd0ab4a024c199d9c2c67da50f288d", + "version-string": "0.1.0", + "port-version": 0 + }, + { + "git-tree": "903f5e36f05a7f9c1a21c870886f59212f5f939e", + "version-string": "2018-12-06", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/aws-sdk-cpp.json b/externals/vcpkg/versions/a-/aws-sdk-cpp.json new file mode 100755 index 000000000..e25338628 --- /dev/null +++ b/externals/vcpkg/versions/a-/aws-sdk-cpp.json @@ -0,0 +1,359 @@ +{ + "versions": [ + { + "git-tree": "c7d142ac1a2667f6ba9650cab2505a71ffaddbd3", + "version": "1.9.220", + "port-version": 1 + }, + { + "git-tree": "7fc21526c4465a7e399683055a6df0096cad218e", + "version": "1.9.220", + "port-version": 0 + }, + { + "git-tree": "e1d4dde6c824e40b0a0dce27f48539dfa4f64eed", + "version": "1.9.160", + "port-version": 1 + }, + { + "git-tree": "e02908481470143ae86077c24e80d493d609f379", + "version": "1.9.160", + "port-version": 0 + }, + { + "git-tree": "f3e8e88a0bf271817cd42083f58070df1a006603", + "version": "1.9.96", + "port-version": 6 + }, + { + "git-tree": "2da283f5bdb07366001a8b14674c0961ac173566", + "version": "1.9.96", + "port-version": 5 + }, + { + "git-tree": "fc86d9dc77f15fb8c7c18f767cc21e01e024a8cc", + "version": "1.9.96", + "port-version": 4 + }, + { + "git-tree": "74ac36ae24b2c852423a57305005fd86d23d51d9", + "version": "1.9.96", + "port-version": 3 + }, + { + "git-tree": "1c6b4335305034bea75f07f368e51142abddb789", + "version": "1.9.96", + "port-version": 2 + }, + { + "git-tree": "5989ba8996df75b9195ef2f429191b48602236c9", + "version": "1.9.96", + "port-version": 1 + }, + { + "git-tree": "e407a52a177c37acd340209b0c00d1dd1355d2aa", + "version": "1.9.96", + "port-version": 0 + }, + { + "git-tree": "13f162ba967b3eaa61320e2062eabd924e1f7a65", + "version": "1.8.126", + "port-version": 10 + }, + { + "git-tree": "c23d66191b235f6f388187395b62f38b8e6e35f5", + "version": "1.8.126", + "port-version": 9 + }, + { + "git-tree": "e1cf5cdb2c16125d532b8281d6901839f11a25f5", + "version": "1.8.126", + "port-version": 8 + }, + { + "git-tree": "f1baa5b35e752a0576d9d81d70d15b2c44a467db", + "version": "1.8.126", + "port-version": 7 + }, + { + "git-tree": "011de9c924af9f41faddda1a6bc2bf080eee6679", + "version": "1.8.126", + "port-version": 6 + }, + { + "git-tree": "1091bd9bd625aab8f19bc9d32499bd888788c613", + "version-string": "1.8.126", + "port-version": 5 + }, + { + "git-tree": "1474856fe6fdeb8feab5068959e189bc9f6c0327", + "version-string": "1.8.83", + "port-version": 4 + }, + { + "git-tree": "0e9236d4366958451f888a5f6616aa64a26afa61", + "version-string": "1.8.83", + "port-version": 3 + }, + { + "git-tree": "948e791fc4effed6d27b6ad4da335a51ba6111bd", + "version-string": "1.8.83", + "port-version": 2 + }, + { + "git-tree": "bc319d0eaa3164611ee527fbea2e2762a463f2fb", + "version-string": "1.8.83", + "port-version": 1 + }, + { + "git-tree": "1ab9d27ef480aa31ff61d26bc119065d033de186", + "version-string": "1.8.83", + "port-version": 0 + }, + { + "git-tree": "25296cbd7a7d602b8aa13ad09536845e2d39e4fd", + "version-string": "1.8.4", + "port-version": 1 + }, + { + "git-tree": "2a538315e8d87e1c1b309df02df48c8d1ac2c8fb", + "version-string": "1.8.4", + "port-version": 0 + }, + { + "git-tree": "08ea7a610c40148e3482a69e61b35243bd32d653", + "version-string": "1.7.333", + "port-version": 0 + }, + { + "git-tree": "796789e5892ff15bd488c929097f6bf49d4d5757", + "version-string": "1.7.270", + "port-version": 0 + }, + { + "git-tree": "d52df80388ebf58e81fbd305767274cc46a28098", + "version-string": "1.7.214-1", + "port-version": 0 + }, + { + "git-tree": "2ee25c13ac13de82586aa5f8739c79442d584e96", + "version-string": "1.7.214", + "port-version": 0 + }, + { + "git-tree": "003e047531084b5607bf0fa7650d9306368931c7", + "version-string": "1.7.142-1", + "port-version": 0 + }, + { + "git-tree": "37100a1d00ea1fa12500c305efdfc9c2d39db249", + "version-string": "1.7.142", + "port-version": 0 + }, + { + "git-tree": "c70be8918571b0047fe5c8dd99fb28361579c235", + "version-string": "1.7.116", + "port-version": 0 + }, + { + "git-tree": "24e8b096060af9ba178fdab1ae2cec5680848a93", + "version-string": "1.7.106", + "port-version": 0 + }, + { + "git-tree": "4d1a7231e28d990a993ddd7238dccc53cb4d3ff0", + "version-string": "1.7.100", + "port-version": 0 + }, + { + "git-tree": "f30834108da8e38617086267dfee6a4e4e2ccb02", + "version-string": "1.7.98", + "port-version": 0 + }, + { + "git-tree": "61bf71b5041f2c2a624aa0fdf21bb6ddbfd48924", + "version-string": "1.7.89", + "port-version": 0 + }, + { + "git-tree": "e797ed8e640e800bf556fe9981cf735927a6eb3c", + "version-string": "1.7.80", + "port-version": 0 + }, + { + "git-tree": "b83bc0e52d936be054b490ef50c79adf73f68fa5", + "version-string": "1.7.41", + "port-version": 0 + }, + { + "git-tree": "9cdf6e74b272bb883bb536c9960f67e0af3a7c69", + "version-string": "1.7.38", + "port-version": 0 + }, + { + "git-tree": "2f6bee8ce92ba561c5aabb43a16daacb22941c03", + "version-string": "1.6.47", + "port-version": 0 + }, + { + "git-tree": "3ec29fd4a699993cda047b1e00663b786c120efa", + "version-string": "1.6.43", + "port-version": 0 + }, + { + "git-tree": "b75b33c86cafda26afec82d8e9d52aaebb924d51", + "version-string": "1.6.38", + "port-version": 0 + }, + { + "git-tree": "ca0eede4bb07d50f091fdfe1e1f1615bdcd24f00", + "version-string": "1.6.29", + "port-version": 0 + }, + { + "git-tree": "f325650c4c786a5f7fdf6ed7a7190e5799287f9c", + "version-string": "1.6.12-1", + "port-version": 0 + }, + { + "git-tree": "70753f945bfcb0b66c577748dddbec17a0d9c0e7", + "version-string": "1.6.12", + "port-version": 0 + }, + { + "git-tree": "05d10ce3843b6d373a39f74abd2ec6774e38faff", + "version-string": "1.5.7", + "port-version": 0 + }, + { + "git-tree": "7569d8b07f3244919df76e4338793d5c15d69902", + "version-string": "1.5.2", + "port-version": 0 + }, + { + "git-tree": "c8d693c088850ae34c45b06dc8c93b5a186577c7", + "version-string": "1.4.82", + "port-version": 0 + }, + { + "git-tree": "270e45b8b39a33ccd0c17275a9eb8e14da2722dd", + "version-string": "1.4.78", + "port-version": 0 + }, + { + "git-tree": "8aaaec26546bc6e9d266651a18d834af099d30ff", + "version-string": "1.4.69", + "port-version": 0 + }, + { + "git-tree": "33cb870a4b73c0e490d2fae7b3a6a11abc017898", + "version-string": "1.4.65", + "port-version": 0 + }, + { + "git-tree": "5e76ee91aabaaa2421b689716a5555cd7cfc4319", + "version-string": "1.4.52", + "port-version": 0 + }, + { + "git-tree": "df7dbeb03eb5b09a4585caa02cf44813513bbced", + "version-string": "1.4.40", + "port-version": 0 + }, + { + "git-tree": "7616504952d47da4523f5479eecea772229a29fc", + "version-string": "1.4.38", + "port-version": 0 + }, + { + "git-tree": "88c68e5bb2a3413d19b049d9c408a4316ec0b000", + "version-string": "1.4.33", + "port-version": 0 + }, + { + "git-tree": "cccf3ff726ac8b25ad4babd21f7db9fddb7a8ee6", + "version-string": "1.4.32", + "port-version": 0 + }, + { + "git-tree": "1c6995e70f2974f07c40b57eab2766faef273cbb", + "version-string": "1.4.31-1", + "port-version": 0 + }, + { + "git-tree": "f4734cfc713d954afe15a3aafa86580cdf2f257d", + "version-string": "1.4.30-1", + "port-version": 0 + }, + { + "git-tree": "2a95b31e39214a2cbc3f6ef804b2ada00f16b8ea", + "version-string": "1.4.30", + "port-version": 0 + }, + { + "git-tree": "914fb03e175de5741eab4e4790d7c6f1c6096b67", + "version-string": "1.4.27", + "port-version": 0 + }, + { + "git-tree": "9ee7b941c0e7f8ab6166704830c2203845f2c755", + "version-string": "1.4.26", + "port-version": 0 + }, + { + "git-tree": "a480a4d56b1f297d5b843194a4fcfea8396a61b9", + "version-string": "1.4.24", + "port-version": 0 + }, + { + "git-tree": "bf2a19a867c4ff6ab44d87545ff33465827ad419", + "version-string": "1.4.23", + "port-version": 0 + }, + { + "git-tree": "6755840b50489b95087b94c21144300270813014", + "version-string": "1.4.21", + "port-version": 0 + }, + { + "git-tree": "ef5dff7ac71c02c2787310917d89778bce5b2406", + "version-string": "1.3.58", + "port-version": 0 + }, + { + "git-tree": "4ada15f7756b0d9c2b367f579136963ebab4b891", + "version-string": "1.3.15", + "port-version": 0 + }, + { + "git-tree": "52e1dfc53de2b0f66dc212e3acc1fbc7a6a1d248", + "version-string": "1.2.4", + "port-version": 0 + }, + { + "git-tree": "1c1682b10a345a4ec9b263c1f2421e5173be0260", + "version-string": "1.0.61-1", + "port-version": 0 + }, + { + "git-tree": "5269268896d55c8a0d8f04de0757e37133f20b19", + "version-string": "1.0.61", + "port-version": 0 + }, + { + "git-tree": "0a426cf5a8d5de394f31d2672f29fb78c2626a32", + "version-string": "1.0.47", + "port-version": 0 + }, + { + "git-tree": "4d41e1e89793bc5b18df6cf604cdbc81445078bb", + "version-string": "1.0.34-1", + "port-version": 0 + }, + { + "git-tree": "d39ebb54cfebceb23fce3f52ddfbafc34589e8af", + "version-string": "1.0.34", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/azmq.json b/externals/vcpkg/versions/a-/azmq.json new file mode 100755 index 000000000..350ac34d5 --- /dev/null +++ b/externals/vcpkg/versions/a-/azmq.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "a82754fa9f38845c88912eb424dbfc718a155fe7", + "version-string": "2020-03-03", + "port-version": 1 + }, + { + "git-tree": "528140b63c42e48f1bc4aaf93a40f2233d8a2547", + "version-string": "2020-03-03", + "port-version": 0 + }, + { + "git-tree": "4fc0cb9a9049ada78b75273121818b08914a7741", + "version-string": "1.0.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/azure-c-shared-utility.json b/externals/vcpkg/versions/a-/azure-c-shared-utility.json new file mode 100755 index 000000000..ea11d2ee5 --- /dev/null +++ b/externals/vcpkg/versions/a-/azure-c-shared-utility.json @@ -0,0 +1,174 @@ +{ + "versions": [ + { + "git-tree": "ec45ec6a9a5b28ecab27857508355956d151a814", + "version-date": "2022-01-21", + "port-version": 3 + }, + { + "git-tree": "42be8335b113cba6ca88b9f9789b29fc7be280b4", + "version-date": "2022-01-21", + "port-version": 2 + }, + { + "git-tree": "aceee8533b4eeea6eb87371c4d37ae82859cefc7", + "version-date": "2022-01-21", + "port-version": 1 + }, + { + "git-tree": "1d0590ad121eefc3af9ff13f67996ca8c3e39508", + "version-date": "2022-01-21", + "port-version": 0 + }, + { + "git-tree": "f2f3f9c6b03d02268920eee133f660bf2fe5d946", + "version-date": "2021-09-09", + "port-version": 1 + }, + { + "git-tree": "6898a05e54b88637fc5a42136facc194b84e71a1", + "version-date": "2021-09-09", + "port-version": 0 + }, + { + "git-tree": "004bb7eb46adf65294137426bfa60868a7a9be93", + "version-string": "2020-12-09", + "port-version": 2 + }, + { + "git-tree": "aeea4eb6de3e3db197e350ba3e8ebb6a9bfaa154", + "version-string": "2020-12-09", + "port-version": 1 + }, + { + "git-tree": "67f510493f8011d403918b4da617f970d9cff74c", + "version-string": "2020-12-09", + "port-version": 0 + }, + { + "git-tree": "4c625de7e91f3a5ee7436bab7f36808e3174a418", + "version-string": "2020-07-19", + "port-version": 0 + }, + { + "git-tree": "e0cadffece84a5453207e36695258e2035d7a975", + "version-string": "2020-06-17-1", + "port-version": 0 + }, + { + "git-tree": "4628674e9a38f1003f4366a8a6258514c2c53a01", + "version-string": "2020-02-04.1", + "port-version": 0 + }, + { + "git-tree": "9ad6e737af31d3f7d519c5672da9ff994a88ca92", + "version-string": "2020-01-22-1", + "port-version": 0 + }, + { + "git-tree": "e76ebdc7e003ea3ec5c1220fb5af21f4f4373bd1", + "version-string": "2020-01-22", + "port-version": 0 + }, + { + "git-tree": "679836f28df60473388c9b1da394fd3bde2283ad", + "version-string": "2019-10-07.2-1", + "port-version": 0 + }, + { + "git-tree": "e37ed048340182e819e3c379c8fbb4e43743bb2f", + "version-string": "2019-10-07.2", + "port-version": 0 + }, + { + "git-tree": "50520ec3d56f9edf54c164193613c41d0bea2827", + "version-string": "2019-07-01-LTS-1", + "port-version": 0 + }, + { + "git-tree": "857da91906824cab4591611fec1de7578cfea29c", + "version-string": "2019-10-07.1-1", + "port-version": 0 + }, + { + "git-tree": "00f6def9c33c61a51d860ac525994b9055c4ab57", + "version-string": "2019-08-20.1-1", + "port-version": 0 + }, + { + "git-tree": "cd7027588afbe8ec39fd9025833846517cb49265", + "version-string": "2019-08-20.1", + "port-version": 0 + }, + { + "git-tree": "0435e8b8e615631392475bc23a8d6ea32c17bfed", + "version-string": "2019-05-16.1", + "port-version": 0 + }, + { + "git-tree": "0d9589620702fea689795bb37ba86dc9c0cd5166", + "version-string": "2019-05-16", + "port-version": 0 + }, + { + "git-tree": "78dea6be920279e7f9738682b4fbf9bb275ae7b7", + "version-string": "2019-03-18-1", + "port-version": 0 + }, + { + "git-tree": "303085f40c9c765cdf66d83875f39ab01194cae9", + "version-string": "2019-03-18", + "port-version": 0 + }, + { + "git-tree": "9b62efe1b7bc66c9866315ad6112e1dafe78ccf5", + "version-string": "1.1.11-5", + "port-version": 0 + }, + { + "git-tree": "00cb4786f1169a7c22cadf20f98c792b4437903f", + "version-string": "1.1.11-4", + "port-version": 0 + }, + { + "git-tree": "40332ca7b7bcffc50305b79d983c68f021ab705d", + "version-string": "1.1.11-3", + "port-version": 0 + }, + { + "git-tree": "cb4ba8882b3b6ebadbe3956e58e774e3c440be84", + "version-string": "1.1.11-1", + "port-version": 0 + }, + { + "git-tree": "985ec32a265176922c5946d630e0be2445f9f0ad", + "version-string": "1.1.10-1", + "port-version": 0 + }, + { + "git-tree": "e00788fa9dd3fccfef5af9b0f1e47f29dcba03df", + "version-string": "1.1.5", + "port-version": 0 + }, + { + "git-tree": "f3d9eb6e853e637480f3055df8cb5187509bbb34", + "version-string": "1.1.3", + "port-version": 0 + }, + { + "git-tree": "f0f33cc67f8a097394805954c116428b06b86038", + "version-string": "1.1.2", + "port-version": 0 + }, + { + "git-tree": "a941f289fae7fcfd16b694d39d328ad6e3511cba", + "version-string": "1.0.0-pre-release-1.0.9", + "port-version": 0 + }, + { + "git-tree": "fdda2fa0e141399859515231fc360ca8ddf60ccc", + "version-string": "1.1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/azure-core-cpp.json b/externals/vcpkg/versions/a-/azure-core-cpp.json new file mode 100755 index 000000000..8dbdcb38e --- /dev/null +++ b/externals/vcpkg/versions/a-/azure-core-cpp.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "5b920c224b5fa4daa427701a123bdf213dac8c43", + "version-semver": "1.6.0", + "port-version": 0 + }, + { + "git-tree": "8940f6b17c33b8076e08c931fcf2ccdafa2fe2f2", + "version-semver": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "73975ac66807a0477bcaa3fa75fdfaf0f74bdb06", + "version-semver": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "b34bd865f3d3caf5b7021d5e9048d775b3e9cfb0", + "version-semver": "1.3.1", + "port-version": 0 + }, + { + "git-tree": "842ba2028c1b8b50de96e7c27e85959889778ab0", + "version-semver": "1.2.1", + "port-version": 0 + }, + { + "git-tree": "68831f9976e41448ebf74ead081d41ce09042c38", + "version-semver": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "b330962cc2223833ef92e2be4e8d7e825dd3e141", + "version-semver": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "15d579e95b536829e42fc2fda4c8b6365180eb3a", + "version-semver": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "5f331c1e92da2947207db42ba2bba398cf19470b", + "version-semver": "1.0.0-beta.9", + "port-version": 0 + }, + { + "git-tree": "48c994ba970ba698f09e0dcc425947f5b9b8b865", + "version-semver": "1.0.0-beta.8", + "port-version": 1 + }, + { + "git-tree": "2950f581cd5d38ae9b8fdc35b8c0c69c19ff209c", + "version-string": "1.0.0-beta.8", + "port-version": 0 + }, + { + "git-tree": "87b79aabd7415802c0c50d30b68e1911dfe295dd", + "version-string": "1.0.0-beta.7", + "port-version": 0 + }, + { + "git-tree": "e143c195fc65254d4ad494f01ac5d9832bcced83", + "version-string": "1.0.0-beta.6", + "port-version": 0 + }, + { + "git-tree": "d2c26dc5d0cba4af8359e6ed7d4820daf494ee2a", + "version-string": "1.0.0-beta.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/azure-identity-cpp.json b/externals/vcpkg/versions/a-/azure-identity-cpp.json new file mode 100755 index 000000000..0aaefe2b3 --- /dev/null +++ b/externals/vcpkg/versions/a-/azure-identity-cpp.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "f6de8ed7d7b299df5cee8483a4f84cb07dd57b1c", + "version-semver": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "df411f808c6dab5e59a7f378308856d803150c04", + "version-semver": "1.1.1", + "port-version": 0 + }, + { + "git-tree": "2742c6a31a2a3238ea97663c2b40be998c18006d", + "version-semver": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "adfe9dad7c61ced7b66ba0cb6220f8341c4be5e2", + "version-semver": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "5b1607f9afe53751e0468408b96d10be8712fd2a", + "version-semver": "1.0.0-beta.6", + "port-version": 0 + }, + { + "git-tree": "bf9a1c77957b02e2b1521fc5847d4c8ab617ebcd", + "version-semver": "1.0.0-beta.5", + "port-version": 1 + }, + { + "git-tree": "3353c1b44fa79a1935f488a6a66ecad2fa35d5ac", + "version-string": "1.0.0-beta.5", + "port-version": 0 + }, + { + "git-tree": "61833d54ef29f383d33a5a0b7eae7be690dfcfc8", + "version-string": "1.0.0-beta.4", + "port-version": 0 + }, + { + "git-tree": "c45f6c8ac731079eb1e5f40a0e5af2725b3ec97a", + "version-string": "1.0.0-beta.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/azure-iot-sdk-c.json b/externals/vcpkg/versions/a-/azure-iot-sdk-c.json new file mode 100755 index 000000000..3953986f7 --- /dev/null +++ b/externals/vcpkg/versions/a-/azure-iot-sdk-c.json @@ -0,0 +1,184 @@ +{ + "versions": [ + { + "git-tree": "80f1eb4e465fef817503af2c9599b2186d4922e6", + "version-date": "2022-01-21", + "port-version": 2 + }, + { + "git-tree": "0570fa462646f08bb3ed9a34ecb693082def3d3b", + "version-date": "2022-01-21", + "port-version": 1 + }, + { + "git-tree": "77b1d419b740dd9738f237a6d52b1c161e99ee9d", + "version-date": "2022-01-21", + "port-version": 0 + }, + { + "git-tree": "3d6dc98460c69e8690f9b20f62cf75e9e3ef7f2d", + "version-date": "2021-09-09", + "port-version": 0 + }, + { + "git-tree": "07dbca4b72d51fb97f55b032e1b412add4054973", + "version-date": "2020-12-09", + "port-version": 2 + }, + { + "git-tree": "5dadcecafd0c3ffdfcf438c1f5f8b106002e14d0", + "version-date": "2020-12-09", + "port-version": 1 + }, + { + "git-tree": "d74324af317840ffb5c5aa54f1579ef2faab4a0e", + "version-string": "2020-12-09", + "port-version": 0 + }, + { + "git-tree": "9f3df818a2c11f1ff3cd08ae120a51ea3cee6de0", + "version-string": "2020-07-19", + "port-version": 1 + }, + { + "git-tree": "0be2c84c3e66aa2edd82864aa792b1d41dbebdcd", + "version-string": "2020-07-19", + "port-version": 0 + }, + { + "git-tree": "7a25f1e3d02b4eb7ec7110fd0e90ebca37a8fd0c", + "version-string": "2020-06-17-2", + "port-version": 0 + }, + { + "git-tree": "7a289a2df8fcb5e844e339f6e7140331532188b3", + "version-string": "2020-06-17-1", + "port-version": 0 + }, + { + "git-tree": "bf6fc7dd2473f26b4289c3f0a73e92a1c495b750", + "version-string": "2020-02-04.1-1", + "port-version": 0 + }, + { + "git-tree": "4bc8edb99e357d3b403331dba9b26e158ea09ae5", + "version-string": "2020-02-04.1", + "port-version": 0 + }, + { + "git-tree": "311aea20dcb9d5c799300ad53491aae614d808ab", + "version-string": "2020-01-22", + "port-version": 0 + }, + { + "git-tree": "b170755eee93c5fe19f70d720c067059e025b5c3", + "version-string": "2019-11-27.1", + "port-version": 0 + }, + { + "git-tree": "953cc7e3e5cc4418ca7d05e42c33100f4c526fcc", + "version-string": "2019-11-21.1", + "port-version": 0 + }, + { + "git-tree": "0e71a03764a86d5f9562b23d7eb5910c538f5673", + "version-string": "2019-10-11.2", + "port-version": 0 + }, + { + "git-tree": "d689c0fe5967ec4c806c2afa657fe38de305879a", + "version-string": "2019-07-01-LTS-1", + "port-version": 0 + }, + { + "git-tree": "b3aabfdbf4fa08d131af2ba0e671777b903fda67", + "version-string": "2019-10-11.1", + "port-version": 0 + }, + { + "git-tree": "3aadeec4f601503581fd3d8c699bba7ba53e8a5a", + "version-string": "2019-10-07.1", + "port-version": 0 + }, + { + "git-tree": "5874d9743da2f26c679a19877dff7e083d06bb21", + "version-string": "2019-08-20.1", + "port-version": 0 + }, + { + "git-tree": "ba8e85e3be7c7106f8203a650917d6ffaa19046d", + "version-string": "2019-07-01.1", + "port-version": 0 + }, + { + "git-tree": "296fe87f58018fa040fda8561e355c9caed83b07", + "version-string": "2019-05-16.1", + "port-version": 0 + }, + { + "git-tree": "18a24f4ebe62009734771b6f294f1104ead6c304", + "version-string": "2019-05-16", + "port-version": 0 + }, + { + "git-tree": "ceca4996aa20303fcdc5514ffc541121bc9fb166", + "version-string": "2019-03-18-1", + "port-version": 0 + }, + { + "git-tree": "510ab167e1507d21e7262222b989df0b8a5d098a", + "version-string": "2019-03-18", + "port-version": 0 + }, + { + "git-tree": "1aff5c53dc1341378225fc60e88a7a449a30c887", + "version-string": "1.2.14-1", + "port-version": 0 + }, + { + "git-tree": "3d7d4e4db5bccac0c1f4cbfe7c22fac0bd80eb1e", + "version-string": "1.2.13-2", + "port-version": 0 + }, + { + "git-tree": "efbcb2ec25b4eb70275154ff461b88516444234a", + "version-string": "1.2.13-1", + "port-version": 0 + }, + { + "git-tree": "0dd6d00aad65af3f3f4cef6f6c31ef36a2014b20", + "version-string": "1.2.12-1", + "port-version": 0 + }, + { + "git-tree": "3d88f6ac92bf4d917808273d441da9eb10d8d862", + "version-string": "1.2.11-1", + "port-version": 0 + }, + { + "git-tree": "e44b08db6ae01fe2dc7dfbdd54a35a9ed6b53ee0", + "version-string": "1.2.10-1", + "port-version": 0 + }, + { + "git-tree": "9d849a4587dc0b8488ed1f837d52c2f8e02af77d", + "version-string": "1.2.3", + "port-version": 0 + }, + { + "git-tree": "714bc742002d224bc8356c64f756891b812b83ff", + "version-string": "1.2.2", + "port-version": 0 + }, + { + "git-tree": "9149197625c7fdf70de9bda91ec9c2e55dbe8ff4", + "version-string": "1.0.0-pre-release-1.0.9", + "port-version": 0 + }, + { + "git-tree": "a5985efd11e9b382eb98916a3193e0bbd320fb7b", + "version-string": "1.2.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/azure-kinect-sensor-sdk.json b/externals/vcpkg/versions/a-/azure-kinect-sensor-sdk.json new file mode 100755 index 000000000..98ae08516 --- /dev/null +++ b/externals/vcpkg/versions/a-/azure-kinect-sensor-sdk.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "379c37baf28190bb33ccf1d512c22a21c664e41e", + "version": "1.4.1", + "port-version": 4 + }, + { + "git-tree": "11fbd98a9560da0ad96abf61d8731778db6e5b8b", + "version": "1.4.1", + "port-version": 3 + }, + { + "git-tree": "012a033caf02486f3079b0c42036a807f3a7c4d7", + "version": "1.4.1", + "port-version": 2 + }, + { + "git-tree": "dc7fdf585419fadcd96b13a800c4323b098256cd", + "version": "1.4.1", + "port-version": 1 + }, + { + "git-tree": "28c9dbd6d17602e942cd81f9d70aeff80f3d83f0", + "version-string": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "dfd54f8c9eeba870d560c0a157996357aeda331c", + "version-string": "1.4.0-alpha.0", + "port-version": 6 + }, + { + "git-tree": "20326da559a175eeff6bcffd4e019f846df30f97", + "version-string": "1.4.0-alpha.0-5", + "port-version": 0 + }, + { + "git-tree": "b351a4567478ee583e9f4deb60acd361579ef4ba", + "version-string": "1.4.0-alpha.0-4", + "port-version": 0 + }, + { + "git-tree": "e164dc694eff10a4032203b5bcd73afec7adae8d", + "version-string": "1.4.0-alpha.0-3", + "port-version": 0 + }, + { + "git-tree": "fe03af276cc717392f9116cdeb42960c4029a76d", + "version-string": "1.4.0-alpha.0-2", + "port-version": 0 + }, + { + "git-tree": "431a999f4c33bf8e25e3eac03acf45c6abb81d52", + "version-string": "1.4.0-alpha.0-1", + "port-version": 0 + }, + { + "git-tree": "ce50b6b24387a85d6d83988007a18a290a4ce3a4", + "version-string": "1.4.0-alpha.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/azure-macro-utils-c.json b/externals/vcpkg/versions/a-/azure-macro-utils-c.json new file mode 100755 index 000000000..f0dd734cb --- /dev/null +++ b/externals/vcpkg/versions/a-/azure-macro-utils-c.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "0c90715278e5ab77af983254bdf17571bf69c55b", + "version-date": "2022-01-21", + "port-version": 0 + }, + { + "git-tree": "a951ed2a9b24f8778b7c2fb2ff4e6a6577ac6472", + "version-string": "2020-06-17", + "port-version": 3 + }, + { + "git-tree": "5929e9b68ee080e5535eb12e48e182b04310ff0d", + "version-string": "2020-06-17", + "port-version": 2 + }, + { + "git-tree": "5f0ef9c1c4c9cae50a61b5f88497c3ca42146dfa", + "version-string": "2020-06-17-1", + "port-version": 0 + }, + { + "git-tree": "d6ae8d30c57b65db496154c80f8ca80992d5d1bd", + "version-string": "2020-02-04.1", + "port-version": 0 + }, + { + "git-tree": "1651a335030d25654378f8a3ae715ee40c424d5d", + "version-string": "2020-01-22", + "port-version": 0 + }, + { + "git-tree": "19841d0ff449cf59f69579d428e0e13572f6fb51", + "version-string": "2019-11-27.1", + "port-version": 0 + }, + { + "git-tree": "82ea324cb22549134cac1eaf5bd81916be6e8556", + "version-string": "2019-10-07.2", + "port-version": 0 + }, + { + "git-tree": "299721b78ac595310c35de9f80233ba604f27181", + "version-string": "2019-07-01-LTS-1", + "port-version": 0 + }, + { + "git-tree": "1f4f3443b1ed9d8051b10077c10fe0f1f4eeff0c", + "version-string": "2019-10-07.1", + "port-version": 0 + }, + { + "git-tree": "9d08ab1555940f0856e9dc339d30152a5242ca1f", + "version-string": "2019-08-20.1", + "port-version": 0 + }, + { + "git-tree": "2246a1b87f1e4147401c156928fccc8aca2e4889", + "version-string": "2019-05-16.1", + "port-version": 0 + }, + { + "git-tree": "05d3942ba6c1dd2d26eb8be9612308a337415a06", + "version-string": "2019-05-16", + "port-version": 0 + }, + { + "git-tree": "fdcc445c49e3c6ec45eedf634714baf7dbe6b0ec", + "version-string": "2019-04-11-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/azure-security-attestation-cpp.json b/externals/vcpkg/versions/a-/azure-security-attestation-cpp.json new file mode 100755 index 000000000..c55d02e05 --- /dev/null +++ b/externals/vcpkg/versions/a-/azure-security-attestation-cpp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "e0a46382e8a741a311e07f21ffd28ebb654c32ea", + "version-semver": "1.0.0-beta.3", + "port-version": 0 + }, + { + "git-tree": "e69adb1c996c0ae3b5bde53d32f619c51d0b95a5", + "version-semver": "1.0.0-beta.2", + "port-version": 0 + }, + { + "git-tree": "9b6b2e71b9d94791a1481a40367fc5ec5607b8aa", + "version-semver": "1.0.0-beta.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/azure-security-keyvault-certificates-cpp.json b/externals/vcpkg/versions/a-/azure-security-keyvault-certificates-cpp.json new file mode 100755 index 000000000..6f5ae12e3 --- /dev/null +++ b/externals/vcpkg/versions/a-/azure-security-keyvault-certificates-cpp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "c24da36700f623cd4c2242dcd6a7dae58673a97c", + "version-semver": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "bbaebc2afcade7b67f33d7d62ec680aaa0b3700d", + "version-semver": "4.0.0-beta.2", + "port-version": 0 + }, + { + "git-tree": "5faeb850df56edd9f4689f69f4d64e6e51dde80b", + "version-semver": "4.0.0-beta.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/azure-security-keyvault-common-cpp.json b/externals/vcpkg/versions/a-/azure-security-keyvault-common-cpp.json new file mode 100755 index 000000000..b67c96ec7 --- /dev/null +++ b/externals/vcpkg/versions/a-/azure-security-keyvault-common-cpp.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "a4b3a34ea38546dd4eb3446ca9f745bba164af49", + "version-semver": "4.0.0-beta.3", + "port-version": 0 + }, + { + "git-tree": "427e0adc6e385b009d892345c04b9e180d68e3cd", + "version-semver": "4.0.0-beta.2", + "port-version": 0 + }, + { + "git-tree": "c3e9761add3c0ad93a038ab859d288e64fc7860e", + "version-semver": "4.0.0-beta.1", + "port-version": 1 + }, + { + "git-tree": "c084ea582625d5235560b84953af1240270c5a18", + "version-string": "4.0.0-beta.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/azure-security-keyvault-keys-cpp.json b/externals/vcpkg/versions/a-/azure-security-keyvault-keys-cpp.json new file mode 100755 index 000000000..2e20c672f --- /dev/null +++ b/externals/vcpkg/versions/a-/azure-security-keyvault-keys-cpp.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "c2a617f9326c712866be1e5218a1ae18262ee178", + "version-semver": "4.2.0", + "port-version": 0 + }, + { + "git-tree": "ee627e15fc96740b6d7d89fea0ef9bae6f24da5c", + "version-semver": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "b710e9d89ef00e649c793f46ce7c67af63fa3611", + "version-semver": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "6a62e90cc13ab362ba09462fa444512aee671482", + "version-semver": "4.0.0-beta.4", + "port-version": 1 + }, + { + "git-tree": "beff44522cd72f08bddabfc35a520533b97d1819", + "version-semver": "4.0.0-beta.4", + "port-version": 0 + }, + { + "git-tree": "cb31e4f4d75f3e38568a324dc412f308bd463bfa", + "version-semver": "4.0.0-beta.3", + "port-version": 0 + }, + { + "git-tree": "21cbc7aa281189b4bd3364f1dc044aad8218ebfb", + "version-semver": "4.0.0-beta.2", + "port-version": 0 + }, + { + "git-tree": "030fd5b9588b63350781bb875a3fc2d67d0d13f0", + "version-semver": "4.0.0-beta.1", + "port-version": 1 + }, + { + "git-tree": "816b5bddbbd2e2396336120039220dd7c83a898d", + "version-string": "4.0.0-beta.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/azure-security-keyvault-secrets-cpp.json b/externals/vcpkg/versions/a-/azure-security-keyvault-secrets-cpp.json new file mode 100755 index 000000000..801b25dc9 --- /dev/null +++ b/externals/vcpkg/versions/a-/azure-security-keyvault-secrets-cpp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "8129639c271f03d256499116ce6f6572ba11eb87", + "version-semver": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "c977a0be18a1e5f8591268d35b0a221ef9e8f7f9", + "version-semver": "4.0.0-beta.2", + "port-version": 0 + }, + { + "git-tree": "e0a2ec6fd19019aaf9f485eea66c5b660b1bc7a4", + "version-semver": "4.0.0-beta.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/azure-storage-blobs-cpp.json b/externals/vcpkg/versions/a-/azure-storage-blobs-cpp.json new file mode 100755 index 000000000..1fb64da97 --- /dev/null +++ b/externals/vcpkg/versions/a-/azure-storage-blobs-cpp.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "ff9783605f383c1f596ada3a10d2dde88a931f56", + "version-semver": "12.4.0", + "port-version": 0 + }, + { + "git-tree": "252f2edf841eb01f271d1694f3fea34e63906eba", + "version-semver": "12.3.0", + "port-version": 0 + }, + { + "git-tree": "6e52659aef1c9a99271c1d590eba0d37f5e472bb", + "version-semver": "12.2.1", + "port-version": 0 + }, + { + "git-tree": "a3775aa0aa8ad876fffa3d2f77b7c1e12b072a5b", + "version-semver": "12.2.0", + "port-version": 0 + }, + { + "git-tree": "eed3fb43fd0ab43bf99c91a084111c9d1e14f213", + "version-semver": "12.1.0", + "port-version": 0 + }, + { + "git-tree": "4927a9eacb27a8088d82005fbae2851755d09ce1", + "version-semver": "12.0.1", + "port-version": 1 + }, + { + "git-tree": "07131431279c91d81edd9ec56005ee8628c3efdb", + "version-semver": "12.0.1", + "port-version": 0 + }, + { + "git-tree": "71e03bcc9bb5f7443f1db8724b6cc4fd4e43647b", + "version-semver": "12.0.0", + "port-version": 0 + }, + { + "git-tree": "25b1c91e5691dd97ee644321ead2e5880bede739", + "version-semver": "12.0.0-beta.11", + "port-version": 0 + }, + { + "git-tree": "62d9013672397f9c80ae95611cb7318b649b92ec", + "version-semver": "12.0.0-beta.10", + "port-version": 1 + }, + { + "git-tree": "2601572d72191d63ad6c6f093f00857b71b9ef96", + "version-string": "12.0.0-beta.10", + "port-version": 0 + }, + { + "git-tree": "1028d726e4188768265becb6f3a95808283cb626", + "version-string": "12.0.0-beta.9", + "port-version": 0 + }, + { + "git-tree": "2c80923c456a448845be69746b7b814fb2f192ae", + "version-string": "12.0.0-beta.8", + "port-version": 0 + }, + { + "git-tree": "32a4dca2b5670fbce88652145fe3297bd221a672", + "version-string": "12.0.0-beta.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/azure-storage-common-cpp.json b/externals/vcpkg/versions/a-/azure-storage-common-cpp.json new file mode 100755 index 000000000..c34c1d880 --- /dev/null +++ b/externals/vcpkg/versions/a-/azure-storage-common-cpp.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "fdc5c496fd571985967a900838e181cdb04d318b", + "version-semver": "12.2.4", + "port-version": 0 + }, + { + "git-tree": "c972f7321758abde4e5d5862c4abd7398f1f26a6", + "version-semver": "12.2.3", + "port-version": 0 + }, + { + "git-tree": "de5c104dfa95871220c17e4f8f97a99b5da33920", + "version-semver": "12.2.2", + "port-version": 0 + }, + { + "git-tree": "55a55770fa93d6e541d1540df78aefae2cf905cb", + "version-semver": "12.2.1", + "port-version": 0 + }, + { + "git-tree": "2ef80d68150017530cb50581cd6f5f03bc607859", + "version-semver": "12.2.0", + "port-version": 0 + }, + { + "git-tree": "bb0e01a17ffaab119d6a67748a54d8b849fb569b", + "version-semver": "12.1.0", + "port-version": 0 + }, + { + "git-tree": "f18fbd3b20bfc22766b8767ab8b668be4ea18f58", + "version-semver": "12.0.1", + "port-version": 1 + }, + { + "git-tree": "d4ce9c53796add134d3ce8f29a9be4e33eba6c2a", + "version-semver": "12.0.1", + "port-version": 0 + }, + { + "git-tree": "2f672ff6a49e9d420141dc67013b50726f85684c", + "version-semver": "12.0.0", + "port-version": 0 + }, + { + "git-tree": "5751a578e18097edc570960298c5275e7166fc0f", + "version-semver": "12.0.0-beta.11", + "port-version": 0 + }, + { + "git-tree": "e088ce294ef101d5d4be7621973121ba1105c408", + "version-semver": "12.0.0-beta.10", + "port-version": 1 + }, + { + "git-tree": "9b0d48def9ae816374193c587750c40ba924cda7", + "version-string": "12.0.0-beta.10", + "port-version": 0 + }, + { + "git-tree": "413d1016e8672f538bce60361cff383dc55e33ad", + "version-string": "12.0.0-beta.9", + "port-version": 0 + }, + { + "git-tree": "d37975ea1f26d0d0ac7c0385d867462c076b0d53", + "version-string": "12.0.0-beta.8", + "port-version": 0 + }, + { + "git-tree": "1dee55e65cb1fb3f93d4cc8f820a09c4d17ee202", + "version-string": "12.0.0-beta.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/azure-storage-cpp.json b/externals/vcpkg/versions/a-/azure-storage-cpp.json new file mode 100755 index 000000000..7a9f84125 --- /dev/null +++ b/externals/vcpkg/versions/a-/azure-storage-cpp.json @@ -0,0 +1,154 @@ +{ + "versions": [ + { + "git-tree": "8216ff9a5060864170113353495400e342d862ad", + "version-string": "7.5.0", + "port-version": 3 + }, + { + "git-tree": "242bb84480e51b70b53dbd9b126f600e1ea39ef6", + "version-string": "7.5.0", + "port-version": 2 + }, + { + "git-tree": "2b3b868fab128f5e37adeffcde308124512d25e0", + "version-string": "7.5.0", + "port-version": 1 + }, + { + "git-tree": "2f95f8b92596e23af8db61cd1b4e11a06078015f", + "version-string": "7.5.0", + "port-version": 0 + }, + { + "git-tree": "a959aee61eeba3a31e035f78118a0894b67a2bfb", + "version-string": "7.4.0", + "port-version": 0 + }, + { + "git-tree": "bc34d8e584b67a85f79264d0e259163a51680dcb", + "version-string": "7.3.0", + "port-version": 0 + }, + { + "git-tree": "0d153822a012b3b858eea2ef866ae6c9f0d60ebf", + "version-string": "7.2.0", + "port-version": 0 + }, + { + "git-tree": "099e98f46bf9a1360d6e139a391766bb4436e676", + "version-string": "7.1.0-1", + "port-version": 0 + }, + { + "git-tree": "91c1b8fcf36f2ba7e97f6724b77da2ef76fbb516", + "version-string": "7.1.0", + "port-version": 0 + }, + { + "git-tree": "c449a7819d020f486f971bba480e55faf3d2bd41", + "version-string": "7.0.0", + "port-version": 0 + }, + { + "git-tree": "3932b14ec40b79f338f8d9bcfa39250465df4a51", + "version-string": "6.1.0-2", + "port-version": 0 + }, + { + "git-tree": "d15a10ff5b204a33653cea5b1ab14373a3a93afc", + "version-string": "6.1.0-1", + "port-version": 0 + }, + { + "git-tree": "464ab45096c32986d063da8157de284b548ab108", + "version-string": "6.1.0", + "port-version": 0 + }, + { + "git-tree": "5604ed9c7a670dfb03415213318cf8830037b2b7", + "version-string": "6.0.0-3", + "port-version": 0 + }, + { + "git-tree": "72310adf4a4239bdc29dabb9b9c78954100f9eca", + "version-string": "6.0.0", + "port-version": 0 + }, + { + "git-tree": "7e3b2c2691b4202f0f43ae2af11ff05691c865e2", + "version-string": "5.2.0", + "port-version": 0 + }, + { + "git-tree": "4cfca65bd62b171742e3c3ed55ca51e194f684a2", + "version-string": "5.1.1", + "port-version": 0 + }, + { + "git-tree": "a9cb3b3f2f17cc2608f31f6634b4772d8396787c", + "version-string": "5.1.0", + "port-version": 0 + }, + { + "git-tree": "ca6caf3d6959b308f6ca6b5c055d75d90aa64cdd", + "version-string": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "bf972195233f5b6c78874757b6b5590d8dafc9bc", + "version-string": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "8ad04fdbfe0e29af2ddc9ac13a443861ea05f6c5", + "version-string": "3.2.1", + "port-version": 0 + }, + { + "git-tree": "c5a231ec907f5b18009a22725de36d5ed420ff6d", + "version-string": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "2cc5b2823c57a603b7ebc4f9a1f3c556d3bfd836", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "d24d43fa7d807cc0000f833fbfc07397d9bb864c", + "version-string": "3.0.0-4", + "port-version": 0 + }, + { + "git-tree": "ff41aa4982c80be4a9fec1b87055a636bf50df0a", + "version-string": "3.0.0-3", + "port-version": 0 + }, + { + "git-tree": "d547c4343ed3d21b28f1afa55bfca3cd06395e9b", + "version-string": "3.0.0-2", + "port-version": 0 + }, + { + "git-tree": "10d9f0c7e3110bdf5d6b317921c051b0b5536a57", + "version-string": "3.0.0-1", + "port-version": 0 + }, + { + "git-tree": "770d68a119da409998480068b307d492eb98083a", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "c08dceda7dd8bcdec488a8e27f215d0785b46ad2", + "version-string": "2.6.0", + "port-version": 0 + }, + { + "git-tree": "241728cab83f4a4bc8269cc5855d9f0ce2508bfa", + "version-string": "2.5.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/azure-storage-files-datalake-cpp.json b/externals/vcpkg/versions/a-/azure-storage-files-datalake-cpp.json new file mode 100755 index 000000000..859384ca8 --- /dev/null +++ b/externals/vcpkg/versions/a-/azure-storage-files-datalake-cpp.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "9a254add1b8a2c6f8d6a59760d6016af1e5c19a6", + "version-semver": "12.3.1", + "port-version": 0 + }, + { + "git-tree": "b312efdf9afad6dc09ce91eb31e19e725a8c1a7a", + "version-semver": "12.3.0", + "port-version": 0 + }, + { + "git-tree": "36837d18b946ad07bcb95c44450509f1d04ba4ec", + "version-semver": "12.2.0", + "port-version": 0 + }, + { + "git-tree": "2c8e48a165197468833b76c0825621ea408efb0a", + "version-semver": "12.1.0", + "port-version": 0 + }, + { + "git-tree": "649b055538511bad19442d11dd356688cac46370", + "version-semver": "12.0.1", + "port-version": 1 + }, + { + "git-tree": "305658dfe1b6b28abc8be014794e6b21e8ba5722", + "version-semver": "12.0.1", + "port-version": 0 + }, + { + "git-tree": "392c7e0294f16ed82323ccc8b5b7961f20b0b2e3", + "version-semver": "12.0.0", + "port-version": 0 + }, + { + "git-tree": "700c9eee3d84a215c27fb452e814da58d079086c", + "version-semver": "12.0.0-beta.11", + "port-version": 0 + }, + { + "git-tree": "a067bf73d77aa871c394d7972db69939940c114f", + "version-semver": "12.0.0-beta.10", + "port-version": 1 + }, + { + "git-tree": "d76b0d95a42ff1a91e73cf46527284844c848f33", + "version-string": "12.0.0-beta.10", + "port-version": 0 + }, + { + "git-tree": "98adbbf45b85de0cbabbc2c6f30f5b5dfc42d584", + "version-string": "12.0.0-beta.9", + "port-version": 0 + }, + { + "git-tree": "dd0c07c0dd83321a26293415f7a392092196f591", + "version-string": "12.0.0-beta.8", + "port-version": 0 + }, + { + "git-tree": "96e221ac9eb6246fa0ec743cb3cbcc47b932f8f3", + "version-string": "12.0.0-beta.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/azure-storage-files-shares-cpp.json b/externals/vcpkg/versions/a-/azure-storage-files-shares-cpp.json new file mode 100755 index 000000000..19d79ba64 --- /dev/null +++ b/externals/vcpkg/versions/a-/azure-storage-files-shares-cpp.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "69a5e9af5d75d9e2f33dbd89576297373a332048", + "version-semver": "12.2.1", + "port-version": 0 + }, + { + "git-tree": "b7c34584a28f09d204e8ab6cbcf23ea93e330653", + "version-semver": "12.2.0", + "port-version": 0 + }, + { + "git-tree": "3a7e7cf14be62755ee6a51fc0f8e88edd3a13d18", + "version-semver": "12.1.0", + "port-version": 0 + }, + { + "git-tree": "eccf58c6719e0f859f90420dffb5deb2cccac731", + "version-semver": "12.0.1", + "port-version": 1 + }, + { + "git-tree": "70c68c7920b221b2b571ba85d48ba215c0e9cb58", + "version-semver": "12.0.1", + "port-version": 0 + }, + { + "git-tree": "354a077c26bd9cce9ade81180e2f9b1dfaf6f514", + "version-semver": "12.0.0", + "port-version": 0 + }, + { + "git-tree": "1d1a11e7f5f6603ae6f3c42d6d2821b16261726f", + "version-semver": "12.0.0-beta.11", + "port-version": 0 + }, + { + "git-tree": "aa4d77e84688efab3d4f4771a90a586fc8c0dc90", + "version-semver": "12.0.0-beta.10", + "port-version": 1 + }, + { + "git-tree": "d93d47f9c0ddf42c33aebe38c312083b043c3713", + "version-string": "12.0.0-beta.10", + "port-version": 0 + }, + { + "git-tree": "78ebb9db2ec3893149fa8a6a37850f5c62008afb", + "version-string": "12.0.0-beta.9", + "port-version": 0 + }, + { + "git-tree": "29cdba78a0712b0850d013033cadb70138b04287", + "version-string": "12.0.0-beta.8", + "port-version": 0 + }, + { + "git-tree": "20fce45a5929cb4bc4659bb61bf1b11d72a36c4f", + "version-string": "12.0.0-beta.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/azure-storage-queues-cpp.json b/externals/vcpkg/versions/a-/azure-storage-queues-cpp.json new file mode 100755 index 000000000..bafb23a67 --- /dev/null +++ b/externals/vcpkg/versions/a-/azure-storage-queues-cpp.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "a04f50e6f79e53d47d4721529709e8e1f02462e1", + "version-semver": "12.0.0", + "port-version": 0 + }, + { + "git-tree": "a4fe64dbaeaacf8bfff69155eea6f001ebee8e15", + "version-semver": "12.0.0-beta.4", + "port-version": 0 + }, + { + "git-tree": "863a1b7f8841d14dd89ca0f70b0f78408add806d", + "version-semver": "12.0.0-beta.3", + "port-version": 0 + }, + { + "git-tree": "f7e146970eabbdf793a50c5b511ea458b04f579a", + "version-semver": "12.0.0-beta.2", + "port-version": 0 + }, + { + "git-tree": "4826bb13d7feb69f3a64633d3a1ea4b4de173a71", + "version-semver": "12.0.0-beta.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/azure-uamqp-c.json b/externals/vcpkg/versions/a-/azure-uamqp-c.json new file mode 100755 index 000000000..3684f2796 --- /dev/null +++ b/externals/vcpkg/versions/a-/azure-uamqp-c.json @@ -0,0 +1,134 @@ +{ + "versions": [ + { + "git-tree": "d7d284a159afe6ab21ce65d5e5d96dbee83339f6", + "version-date": "2022-01-21", + "port-version": 1 + }, + { + "git-tree": "a2c6897e3392683dcce93a846b98b2c95dc41a55", + "version-date": "2022-01-21", + "port-version": 0 + }, + { + "git-tree": "4748ea8df9903436ad4b2b6462ca3ffdf74465d4", + "version-date": "2021-09-09", + "port-version": 0 + }, + { + "git-tree": "0ecbe4bc48e735cd1a3424ec77afac8aa807eaab", + "version-string": "2020-12-09", + "port-version": 1 + }, + { + "git-tree": "096e993556ef33559bb27d42edea1fa75175f784", + "version-string": "2020-12-09", + "port-version": 0 + }, + { + "git-tree": "fdd8cf49346e6cbcbca1cb1d6e3b9b313e5e471a", + "version-string": "2020-07-19", + "port-version": 0 + }, + { + "git-tree": "64e118e5e32a279f64668774b5490b2245bc0141", + "version-string": "2020-06-17-1", + "port-version": 0 + }, + { + "git-tree": "489fd45170014fa7060cb1cf41e3373b4aae8b62", + "version-string": "2020-02-04.1", + "port-version": 0 + }, + { + "git-tree": "66b73eb2c1437238df11f923120d9dc27a0c1a41", + "version-string": "2020-01-22", + "port-version": 0 + }, + { + "git-tree": "bdac83317fff376ec6d776cd1cd0918251ce2030", + "version-string": "2019-11-27.1", + "port-version": 0 + }, + { + "git-tree": "8f41108d4bc7244e858ad55e613890f0ef6f6a3c", + "version-string": "2019-10-07.2", + "port-version": 0 + }, + { + "git-tree": "ef5e92210d614a96c3f4c53a87f8b46e5cb6c9e6", + "version-string": "2019-07-01-LTS-1", + "port-version": 0 + }, + { + "git-tree": "9bb33a228ba0c130c98af9f668c4d5bb663e39c4", + "version-string": "2019-10-07.1", + "port-version": 0 + }, + { + "git-tree": "3242d9517ef2c11c8285f26aeab648fb78b1fa79", + "version-string": "2019-08-20.1", + "port-version": 0 + }, + { + "git-tree": "5ebd59864582ae4af73544cebd27f0fe98f9cedf", + "version-string": "2019-05-16.1", + "port-version": 0 + }, + { + "git-tree": "8c350b5cf183bdaa721fc266b52e85dfce860b42", + "version-string": "2019-05-16", + "port-version": 0 + }, + { + "git-tree": "90abd689148e310756d3236418c5e3c2bae0cd13", + "version-string": "2019-03-18-1", + "port-version": 0 + }, + { + "git-tree": "4e96328de5eedc1ed9d3e0e3c6f754d1e3899014", + "version-string": "2019-03-18", + "port-version": 0 + }, + { + "git-tree": "b16d3d599d8af974b73d4b967e3904469ee3d0ec", + "version-string": "1.2.11-4", + "port-version": 0 + }, + { + "git-tree": "3bbcdf4aaed25fbb69bd228e8698eb2c925a7f1f", + "version-string": "1.2.11-3", + "port-version": 0 + }, + { + "git-tree": "3849017b4e91011aad79f5830d7ad9dc8639b62f", + "version-string": "1.2.11-2", + "port-version": 0 + }, + { + "git-tree": "62d4246e4511cd7ff8495148fa6c8f207eb97c05", + "version-string": "1.2.11-1", + "port-version": 0 + }, + { + "git-tree": "500be5e7dafb1174abe65edddcfa50d5ddca2506", + "version-string": "1.2.10-1", + "port-version": 0 + }, + { + "git-tree": "1c67aed1d764a1298111031d26ef499d7ba8d3af", + "version-string": "1.2.3", + "port-version": 0 + }, + { + "git-tree": "a0cf5eeeaf0d1c9b9be1a80f04e4a999f00730b4", + "version-string": "1.2.2", + "port-version": 0 + }, + { + "git-tree": "6c0930123a5b9044c5f5502a4205de12efc9164e", + "version-string": "1.0.0-pre-release-1.0.9", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/azure-uhttp-c.json b/externals/vcpkg/versions/a-/azure-uhttp-c.json new file mode 100755 index 000000000..e7cf5ca1a --- /dev/null +++ b/externals/vcpkg/versions/a-/azure-uhttp-c.json @@ -0,0 +1,124 @@ +{ + "versions": [ + { + "git-tree": "28439985096cc9a714695d10830ceb2f54859c24", + "version-date": "2022-01-21", + "port-version": 1 + }, + { + "git-tree": "f614a1ac990dd4189b292fa0e6e31897ee4b7ae8", + "version-date": "2022-01-21", + "port-version": 0 + }, + { + "git-tree": "8dfc1d65397c35c27df08f42b2f77caf27661a9b", + "version-date": "2021-09-09", + "port-version": 0 + }, + { + "git-tree": "7410a090286f0c65398cb9ce97c6d86120c7222d", + "version-string": "2020-12-09", + "port-version": 1 + }, + { + "git-tree": "9a13676c37e46791196a860835b8695c80359a8c", + "version-string": "2020-12-09", + "port-version": 0 + }, + { + "git-tree": "513bbf277bea7cab05324f63fcf92c31278d0cd0", + "version-string": "2020-07-19", + "port-version": 0 + }, + { + "git-tree": "783ccc8f09a5b64a69746ea8347108fa4796acb1", + "version-string": "2020-06-17-1", + "port-version": 0 + }, + { + "git-tree": "cd299156829305f542f2a58f2c0ad1ae7fd6e422", + "version-string": "2020-02-04.1", + "port-version": 0 + }, + { + "git-tree": "cf8a101ec7b2eef153413450e20ee7302a9cb08c", + "version-string": "2020-01-22", + "port-version": 0 + }, + { + "git-tree": "272c0efc43af9ad96cbe02f6e8437dde2ad2e8ea", + "version-string": "2019-11-27.1", + "port-version": 0 + }, + { + "git-tree": "6f8347b504ec9b8a615adb6a8d101a64adccec2c", + "version-string": "2019-10-07.2", + "port-version": 0 + }, + { + "git-tree": "9e01150cda7d35c0c98a8735534eb3e3f5db8a7d", + "version-string": "2019-07-01-LTS-1", + "port-version": 0 + }, + { + "git-tree": "b5671c11fbf975ba1ac8c0b745a22b206a4d2620", + "version-string": "2019-10-07.1", + "port-version": 0 + }, + { + "git-tree": "ad7702d6c55d9555116160b4765559577d42e39b", + "version-string": "2019-08-20.1", + "port-version": 0 + }, + { + "git-tree": "baad42dbd22efc4700082fdc6f8ecded19e77443", + "version-string": "2019-05-16.1", + "port-version": 0 + }, + { + "git-tree": "79360ada83b099160f76196be323db8204c19272", + "version-string": "2019-05-16", + "port-version": 0 + }, + { + "git-tree": "021c7a7968aad7c8c6da668bf7f1de4108384743", + "version-string": "2019-03-18-1", + "port-version": 0 + }, + { + "git-tree": "de07eeb4d01a07d43d1a9a583f85165bc0c79d44", + "version-string": "2019-03-18", + "port-version": 0 + }, + { + "git-tree": "aed24bc3d18a7441a9cdac323dbaaff013b31b72", + "version-string": "1.1.11-4", + "port-version": 0 + }, + { + "git-tree": "a5c7c3c89f6d4f9a3e87e938693677393f60e339", + "version-string": "1.1.11-3", + "port-version": 0 + }, + { + "git-tree": "4a64e161a06d13036cc2f446e658a2cf9c47233c", + "version-string": "1.1.11-2", + "port-version": 0 + }, + { + "git-tree": "b113618fc27109974a70fce1cea2952bda002e54", + "version-string": "1.1.10-1", + "port-version": 0 + }, + { + "git-tree": "282b129f4560c46b74c9f2fb639e2d6d9614a804", + "version-string": "LTS_01_2018_Ref01", + "port-version": 0 + }, + { + "git-tree": "108d7ee321497da69e8f232e8234623ec31b860f", + "version-string": "2018-02-09", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/a-/azure-umqtt-c.json b/externals/vcpkg/versions/a-/azure-umqtt-c.json new file mode 100755 index 000000000..893326599 --- /dev/null +++ b/externals/vcpkg/versions/a-/azure-umqtt-c.json @@ -0,0 +1,139 @@ +{ + "versions": [ + { + "git-tree": "5953c7aee01e5c0972a8eb97fbb763c74b60c49c", + "version-date": "2022-01-21", + "port-version": 1 + }, + { + "git-tree": "f5b18f17519b9de8a2ab956eebc7dff6e7bf7a05", + "version-date": "2022-01-21", + "port-version": 0 + }, + { + "git-tree": "2a208bf94bfaf91cc20716d7ba0caac0023324b0", + "version-date": "2021-09-09", + "port-version": 0 + }, + { + "git-tree": "f8f3de5c5637d62c78e1a8934e9f8e7409dd36c4", + "version-string": "2020-12-09", + "port-version": 1 + }, + { + "git-tree": "c49491f7d067b2c52a2751941b3e335c0e04eebf", + "version-string": "2020-12-09", + "port-version": 0 + }, + { + "git-tree": "8d51af6bf69894b2cca6adcb4de0054fad38975d", + "version-string": "2020-07-19", + "port-version": 0 + }, + { + "git-tree": "cc4c0ca6bd502a53e16cd65146b73f32fe31d078", + "version-string": "2020-06-17-1", + "port-version": 0 + }, + { + "git-tree": "939b7ea915b34711ae4833df3806a0f17222c029", + "version-string": "2020-02-04.1", + "port-version": 0 + }, + { + "git-tree": "3264926a34488626a31d70d335a5d4bd5ccba056", + "version-string": "2020-01-22", + "port-version": 0 + }, + { + "git-tree": "846ac1694e7431ae912a33335e8f92760acd3c0c", + "version-string": "2019-11-27.1", + "port-version": 0 + }, + { + "git-tree": "adfd8d739fcb9ab85a890ed891c3185009518063", + "version-string": "2019-10-07.2", + "port-version": 0 + }, + { + "git-tree": "688882c617afe5e5eea928511608c2d94ae996d6", + "version-string": "2019-07-01-LTS-1", + "port-version": 0 + }, + { + "git-tree": "17e9465a21add076539299d860fafb6dd28a5efb", + "version-string": "2019-10-07.1", + "port-version": 0 + }, + { + "git-tree": "ffd6ee62ced00cbb2a42c5ad55e3f0b45f5f295d", + "version-string": "2019-08-20.1", + "port-version": 0 + }, + { + "git-tree": "7d45115e43f9bebef8351e3ac435db6d1067c55a", + "version-string": "2019-05-16.1", + "port-version": 0 + }, + { + "git-tree": "b9e5ff88cbd7942410ad2c09a648e4e27f5d02ac", + "version-string": "2019-05-16", + "port-version": 0 + }, + { + "git-tree": "8b849ec32e01c06a30a6869401c17223e28e0911", + "version-string": "2019-03-18-1", + "port-version": 0 + }, + { + "git-tree": "550b9e414a6c150d0d7277077dc1376259b14101", + "version-string": "2019-03-18", + "port-version": 0 + }, + { + "git-tree": "e9a2eaa20c1b898db070849c169289ca00c4686f", + "version-string": "1.1.11-4", + "port-version": 0 + }, + { + "git-tree": "2a4566761f3818e5d409a3c99d130bd538db7c7f", + "version-string": "1.1.11-3", + "port-version": 0 + }, + { + "git-tree": "e2a526771e5e74100256ec2b3ff82277d29f972e", + "version-string": "1.1.11-2", + "port-version": 0 + }, + { + "git-tree": "0dce7fed719e84b0baf807fe7d969eb9e41e209e", + "version-string": "1.1.11-1", + "port-version": 0 + }, + { + "git-tree": "bbe2746e302cf5aae7af538210a81a1de7096b1c", + "version-string": "1.1.10-1", + "port-version": 0 + }, + { + "git-tree": "e99f3408eae3d4315315343407f8b9534508fd1b", + "version-string": "1.1.5", + "port-version": 0 + }, + { + "git-tree": "0324121e1997f31963da5534d6b65acd37799f7c", + "version-string": "1.1.3", + "port-version": 0 + }, + { + "git-tree": "73f1093a2b8a52a0b02a0851fbc380307ecb34dc", + "version-string": "1.1.2", + "port-version": 0 + }, + { + "git-tree": "7671c8b335377c2087158ac9077cf1a62c23c64e", + "version-string": "1.0.0-pre-release-1.0.9", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/b64.json b/externals/vcpkg/versions/b-/b64.json new file mode 100755 index 000000000..590f69c2b --- /dev/null +++ b/externals/vcpkg/versions/b-/b64.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "aeaf7d2076e25b321032c4fc88c22cbb46002a90", + "version": "2.0.0.1", + "port-version": 1 + }, + { + "git-tree": "9f1b6b36747fb6349483bf78531123d4b1ec5d7d", + "version": "2.0.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/basisu.json b/externals/vcpkg/versions/b-/basisu.json new file mode 100755 index 000000000..c9940a435 --- /dev/null +++ b/externals/vcpkg/versions/b-/basisu.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "70d762c5a7350879f47429ea6275ba34f1c0f449", + "version-string": "1.11", + "port-version": 5 + }, + { + "git-tree": "0645a595b0b20a3db1cd8fe19abc9e81c0c16714", + "version-string": "1.11-4", + "port-version": 0 + }, + { + "git-tree": "04ef2fd4d845551f7fd2fd5e53e98bce8a5e87f2", + "version-string": "1.11-3", + "port-version": 0 + }, + { + "git-tree": "a494d655f8774ec5b13548ed1d495cc36d8f4343", + "version-string": "1.11-2", + "port-version": 0 + }, + { + "git-tree": "14a1a4b19de73b57ba66094a54733f8fb83bfed8", + "version-string": "1.11-1", + "port-version": 0 + }, + { + "git-tree": "e8f3474c1d3f5a3ad53aea729c64f7c91f8bc68e", + "version-string": "0.0.1-1", + "port-version": 0 + }, + { + "git-tree": "e0cad9e36e3b6d558bbf1cbe6db49a7d44a5e9c5", + "version-string": "0.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/bcg729.json b/externals/vcpkg/versions/b-/bcg729.json new file mode 100755 index 000000000..ce2969ea1 --- /dev/null +++ b/externals/vcpkg/versions/b-/bcg729.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "f3ab650b9aee68c1967ab35c8890ffcfd721b485", + "version": "1.1.1", + "port-version": 3 + }, + { + "git-tree": "d515bbfce335039dc7edaa083d7ab334888f8254", + "version": "1.1.1", + "port-version": 2 + }, + { + "git-tree": "16cf88e26d0bf3ebd469c722cd4df96c59556fb7", + "version-string": "1.1.1", + "port-version": 1 + }, + { + "git-tree": "666c71eec6573ef70d9f2630962511687723bb0e", + "version-string": "1.1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/bddisasm.json b/externals/vcpkg/versions/b-/bddisasm.json new file mode 100755 index 000000000..897c57511 --- /dev/null +++ b/externals/vcpkg/versions/b-/bddisasm.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "3cede34b39c8ab7d83ee9f43dcb112e4d1c96104", + "version": "1.34.7", + "port-version": 1 + }, + { + "git-tree": "296988f2d875c4fe41506e163c5c35141c6d35f8", + "version": "1.34.7", + "port-version": 0 + }, + { + "git-tree": "615b986c25f902c2053661948092cbfa757fa400", + "version": "1.34.2", + "port-version": 1 + }, + { + "git-tree": "d6ba1aba5922829f7eb5d8197dbffe5aa8f9722b", + "version": "1.34.2", + "port-version": 0 + }, + { + "git-tree": "bbd28192161e817afeb6526098f105788225816f", + "version": "1.33.0", + "port-version": 0 + }, + { + "git-tree": "252ddf848e0ed2e3c58537bf0cc09bc6ccd067f1", + "version": "1.32.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/bde.json b/externals/vcpkg/versions/b-/bde.json new file mode 100755 index 000000000..5d27e439a --- /dev/null +++ b/externals/vcpkg/versions/b-/bde.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "7ce72f2854f44eee806e6e5f3e97d29897549787", + "version": "3.2.0.0", + "port-version": 5 + }, + { + "git-tree": "60082ad73e5c9fb9828041183b026fc15e453218", + "version-string": "3.2.0.0", + "port-version": 4 + }, + { + "git-tree": "b940e98efec0d1f48f2edfe2027d2bce251ec7a8", + "version-string": "3.2.0.0", + "port-version": 3 + }, + { + "git-tree": "b1182a3ba7b24edd58e7471796c1f157c9ff402c", + "version-string": "3.2.0.0", + "port-version": 2 + }, + { + "git-tree": "d25bfe5e576d146569520871134a5c6fecb16a96", + "version-string": "3.2.0.0-1", + "port-version": 0 + }, + { + "git-tree": "0ee2aa4b9efbf8de1fc277f0064e6022fbfac778", + "version-string": "3.2.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/bdwgc.json b/externals/vcpkg/versions/b-/bdwgc.json new file mode 100755 index 000000000..92dbb78c1 --- /dev/null +++ b/externals/vcpkg/versions/b-/bdwgc.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "1cf3b7a458af2eba78e5af9674e8f6d28b53e254", + "version": "8.2.0", + "port-version": 3 + }, + { + "git-tree": "b7ec5e3585f7f7b71988cb7379c181a1fa9461cd", + "version": "8.2.0", + "port-version": 2 + }, + { + "git-tree": "84653790601fd0e28aaeb12a9a58292b7e3af1bc", + "version": "8.2.0", + "port-version": 1 + }, + { + "git-tree": "ea1da0228494df421f826c098fdf574a93afbb66", + "version": "8.2.0", + "port-version": 0 + }, + { + "git-tree": "5777be074f852a1c7c5920d1cb8639b6fc1659be", + "version-string": "8.0.4", + "port-version": 2 + }, + { + "git-tree": "d3fb7b17d683581e6f34599e0cc0295a7d315bb2", + "version-string": "8.0.4-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/beast.json b/externals/vcpkg/versions/b-/beast.json new file mode 100755 index 000000000..4b88457c2 --- /dev/null +++ b/externals/vcpkg/versions/b-/beast.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "eea4815ae315b38373961c8ff9a5be8556857b3f", + "version-string": "0", + "port-version": 1 + }, + { + "git-tree": "17c08b9a2f5c67b9ab0fb3d231bb6d67af26a208", + "version-string": "0", + "port-version": 0 + }, + { + "git-tree": "96c1896f31f03bb3cbcc6dc929b3339fe0cf637b", + "version-string": "v84-1", + "port-version": 0 + }, + { + "git-tree": "e1a868241c6382332cf8517844f6875102a3f934", + "version-string": "v84", + "port-version": 0 + }, + { + "git-tree": "1009f20a8e7bb16325e7d417f328050fc43f467c", + "version-string": "v76", + "port-version": 0 + }, + { + "git-tree": "c1788efff3acb96100ee071a1353265bc8a0d417", + "version-string": "v66", + "port-version": 0 + }, + { + "git-tree": "f9b9a887ec00934c88032d5bdc71ed765a205073", + "version-string": "v63", + "port-version": 0 + }, + { + "git-tree": "da69804ed4cf00f6d4bc41da99c58d41491c54b1", + "version-string": "v59", + "port-version": 0 + }, + { + "git-tree": "29778f7db1809ab37ceba1984949601a1f4b616b", + "version-string": "v58", + "port-version": 0 + }, + { + "git-tree": "7719ad1d340f47cb354ddf1a5b1cc8b5a68e2222", + "version-string": "v56", + "port-version": 0 + }, + { + "git-tree": "9047b144fc312b5a38a90c1d88ef431c08bf0303", + "version-string": "v55", + "port-version": 0 + }, + { + "git-tree": "c854069b8be8cd787a3c26d4a5a975df4556192f", + "version-string": "v54", + "port-version": 0 + }, + { + "git-tree": "ff3e24da713abac7593360e51f6d79e17bd30631", + "version-string": "v40", + "port-version": 0 + }, + { + "git-tree": "dc897bb38d39c0c5126faf56107d79733fcaed1e", + "version-string": "1.0.0-b30", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/behaviortree-cpp.json b/externals/vcpkg/versions/b-/behaviortree-cpp.json new file mode 100755 index 000000000..9268e1e6e --- /dev/null +++ b/externals/vcpkg/versions/b-/behaviortree-cpp.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "79f662c115d97eb11ef1a08753aed0eef061d7cc", + "version": "3.5.6", + "port-version": 2 + }, + { + "git-tree": "96c8331bb642e665bd66a9aa82797d4db84b86fa", + "version": "3.5.6", + "port-version": 1 + }, + { + "git-tree": "32f97d9bfd43e38949f858a9ce271117b0380c85", + "version": "3.5.6", + "port-version": 0 + }, + { + "git-tree": "450257131642541acbb14602fc6f2b2b83d1c2c1", + "version-string": "3.5.1", + "port-version": 2 + }, + { + "git-tree": "7f52ca5d5baec941483c0ea7d9729588ae4bfe11", + "version-string": "3.5.1", + "port-version": 1 + }, + { + "git-tree": "481770abcc1b466f5aad1f736cca3469e2928f22", + "version-string": "3.5.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/benchmark.json b/externals/vcpkg/versions/b-/benchmark.json new file mode 100755 index 000000000..195c2a981 --- /dev/null +++ b/externals/vcpkg/versions/b-/benchmark.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "0b248363b29630caf5f45a42d2d82c12b29979e1", + "version-semver": "1.6.1", + "port-version": 0 + }, + { + "git-tree": "7856168d2b0dcaf058c077798ca47f767c6444f5", + "version-semver": "1.6.0", + "port-version": 1 + }, + { + "git-tree": "4a77547715562fcaa95568226f79af88d859d2c1", + "version-semver": "1.6.0", + "port-version": 0 + }, + { + "git-tree": "e47bb1810fa9570b6b87eba79bb95c749763e1e0", + "version-semver": "1.5.5", + "port-version": 0 + }, + { + "git-tree": "9edadb1ffe2869bf6c1b2271e89576e05234e9a5", + "version-string": "1.5.2", + "port-version": 0 + }, + { + "git-tree": "c34c7f87fa809b48939739b8bc5f6c470183785c", + "version-string": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "40008da96f863b599bc4baf6a67b0098cd4f2f20", + "version-string": "1.5", + "port-version": 0 + }, + { + "git-tree": "cc0ead7fc8bd351e83e8b8bea18b873cef29a5d4", + "version-string": "1.4.1-1", + "port-version": 0 + }, + { + "git-tree": "6ced1b2d998cbdde77f5b714fb535e226ca54622", + "version-string": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "3d4ec76a11e75737766febf542994fd5378edbd4", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "18111d9e7da0117faf580770a6575d16df91df4b", + "version-string": "1.3.0-1", + "port-version": 0 + }, + { + "git-tree": "8ccaa53faad37d6c5e7f77e44735bef80fc54c76", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "9ff9432ca00fa3dd59a08df178fdd77f0c3bea42", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "d77a75cf312347169a81037292d30ca3083b6534", + "version-string": "1.2.0-1", + "port-version": 0 + }, + { + "git-tree": "393dcd92e077eb836e857158f8a75a54e78783ad", + "version-string": "1.1.0-1", + "port-version": 0 + }, + { + "git-tree": "bf11e604384baf1f1ee1d8dbc2e32b6fa4a3e252", + "version-string": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/bento4.json b/externals/vcpkg/versions/b-/bento4.json new file mode 100755 index 000000000..d56f92670 --- /dev/null +++ b/externals/vcpkg/versions/b-/bento4.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "4da8906f31697785969422135a52cb2d0861fe53", + "version": "1.6.0-639", + "port-version": 1 + }, + { + "git-tree": "834cb05380588e07628713420e709264f168a567", + "version": "1.6.0-639", + "port-version": 0 + }, + { + "git-tree": "bfedfc70c05cececac8e23b744b43619e2ae3125", + "version-string": "1.5.1", + "port-version": 629 + }, + { + "git-tree": "176077782d332c5366ab2ad4055bc76c62633d7e", + "version-string": "1.5.1-628", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/berkeleydb.json b/externals/vcpkg/versions/b-/berkeleydb.json new file mode 100755 index 000000000..49497baa4 --- /dev/null +++ b/externals/vcpkg/versions/b-/berkeleydb.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "27ed2f8c5c5b6c5ba677703f69d9e83062ff6c86", + "version": "4.8.30", + "port-version": 8 + }, + { + "git-tree": "753782cd715f3780a1d3d75ef7655e92a414a440", + "version": "4.8.30", + "port-version": 7 + }, + { + "git-tree": "fdef7fa8068cc8b7443905db215bed2dcf378abf", + "version-string": "4.8.30", + "port-version": 6 + }, + { + "git-tree": "e0ed5491b8a0001f97470f65cc9addf2c403f658", + "version-string": "4.8.30", + "port-version": 5 + }, + { + "git-tree": "d55b50f30f9ea89e25dbf8dc1befee3e7e375391", + "version-string": "4.8.30-4", + "port-version": 0 + }, + { + "git-tree": "1709618b935f9be25e82465f94db0fa6a0f90682", + "version-string": "4.8.30-3", + "port-version": 0 + }, + { + "git-tree": "41169c982c74f22b67fda5a3bd9410a0a0fc5539", + "version-string": "4.8.30-2", + "port-version": 0 + }, + { + "git-tree": "cfb04a51e793d0769c00dfc8674baa171af80f38", + "version-string": "4.8.30-1", + "port-version": 0 + }, + { + "git-tree": "cfa54d7bb62818caca88f109dc6b5381437545ab", + "version-string": "4.8.30", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/bext-di.json b/externals/vcpkg/versions/b-/bext-di.json new file mode 100755 index 000000000..c53b8f6e1 --- /dev/null +++ b/externals/vcpkg/versions/b-/bext-di.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "8b3c494eee383a036b07453ff9b34d1be65be06d", + "version": "1.2.0", + "port-version": 1 + }, + { + "git-tree": "a77676231f3c6c3fe9c145bfe670cfae495fb8ac", + "version-string": "1.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/bext-sml.json b/externals/vcpkg/versions/b-/bext-sml.json new file mode 100755 index 000000000..0f6fd7284 --- /dev/null +++ b/externals/vcpkg/versions/b-/bext-sml.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "607e0e94d37ca023fd393c42e8acb43881ea8025", + "version": "1.1.5", + "port-version": 0 + }, + { + "git-tree": "5e5941cb1ecd7988a9f52c1ace73823a4a20743c", + "version": "1.1.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/bext-ut.json b/externals/vcpkg/versions/b-/bext-ut.json new file mode 100755 index 000000000..bd99a7fbc --- /dev/null +++ b/externals/vcpkg/versions/b-/bext-ut.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ea37a3905161a060e837b30d42868792d50029f8", + "version": "1.1.9", + "port-version": 0 + }, + { + "git-tree": "b08fed0b83c26aabfdda7db38d43a01b288f6a66", + "version": "1.1.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/bext-wintls.json b/externals/vcpkg/versions/b-/bext-wintls.json new file mode 100755 index 000000000..b57b16672 --- /dev/null +++ b/externals/vcpkg/versions/b-/bext-wintls.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1bed92afff8085f2d8f888b35ce0049e5986aa8a", + "version": "0.9.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/bfgroup-lyra.json b/externals/vcpkg/versions/b-/bfgroup-lyra.json new file mode 100755 index 000000000..ef5ca5bf3 --- /dev/null +++ b/externals/vcpkg/versions/b-/bfgroup-lyra.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "bbd3e635da6198f0f2458ec62ff937287c5c5b45", + "version": "1.6", + "port-version": 0 + }, + { + "git-tree": "d06d9dff4b3cb6ea57292cb81460f113a905e3ea", + "version": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "0cfb523191016e3f686356b2d522034a2b7a47da", + "version-string": "1.5", + "port-version": 1 + }, + { + "git-tree": "c4a41ae13598868ce4257c7791ea89665d8104b8", + "version-string": "1.5", + "port-version": 0 + }, + { + "git-tree": "5eeee80b2083f3e63aacae1232856638640e3448", + "version-string": "1.3", + "port-version": 0 + }, + { + "git-tree": "ec5bc3e16425d6cf7466cc28f64cad560d5f1601", + "version-string": "1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/bigint.json b/externals/vcpkg/versions/b-/bigint.json new file mode 100755 index 000000000..48e25a21a --- /dev/null +++ b/externals/vcpkg/versions/b-/bigint.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "ae8921f17a82f01e5e68e494c8fe1823085eb496", + "version-string": "2010.04.30", + "port-version": 7 + }, + { + "git-tree": "00e038eff99864c2c73a807f0641c17e364547b0", + "version-string": "2010.04.30", + "port-version": 6 + }, + { + "git-tree": "3d92889fb018b73f520bde1a623db283838f5a7d", + "version-string": "2010.04.30", + "port-version": 5 + }, + { + "git-tree": "ece18a8ff1b53330cbde718bc977d16e83b3f752", + "version-string": "2010.04.30-4", + "port-version": 0 + }, + { + "git-tree": "b65e19d6308e31ce43180f125f08fb5d357c3de0", + "version-string": "2010.04.30-3", + "port-version": 0 + }, + { + "git-tree": "942ddfd589666b15e4113df6438078cd7a3931c2", + "version-string": "2010.04.30-2", + "port-version": 0 + }, + { + "git-tree": "687c95e2d8c5e4dd9df75df005c8920c788b4834", + "version-string": "2010.04.30-1", + "port-version": 0 + }, + { + "git-tree": "f051f0cf6a477a97b412bef03d3e80341149c7e0", + "version-string": "2010.04.30", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/binn.json b/externals/vcpkg/versions/b-/binn.json new file mode 100755 index 000000000..fb32ec7dc --- /dev/null +++ b/externals/vcpkg/versions/b-/binn.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "6b63ed963e5305d28e67ee04951cb907a483bca2", + "version-string": "3.0", + "port-version": 1 + }, + { + "git-tree": "f572fc1577b9e8176015a54393657dfdfb245b78", + "version-string": "3.0", + "port-version": 0 + }, + { + "git-tree": "91721ef9120b0d8a6719858756451d6326bbd647", + "version-string": "2.0", + "port-version": 1 + }, + { + "git-tree": "df9576da4d413599e502f5ce9410128896a12637", + "version-string": "2.0", + "port-version": 0 + }, + { + "git-tree": "76b91d53b30719970a5668d6297e72c8f579cba4", + "version-string": "1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/bitmagic.json b/externals/vcpkg/versions/b-/bitmagic.json new file mode 100755 index 000000000..7b1030f15 --- /dev/null +++ b/externals/vcpkg/versions/b-/bitmagic.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "0b5257f630778f4e1acbee7661041a1a67c7f21d", + "version": "7.11.2", + "port-version": 0 + }, + { + "git-tree": "9a8ea093834ac196fd75eb7d07348dd27ebcb715", + "version": "7.5.0", + "port-version": 0 + }, + { + "git-tree": "9854378bbae00f886710d80f38221368faf99547", + "version-string": "7.2.0", + "port-version": 1 + }, + { + "git-tree": "752ea75ea3ffa1341de3f427b9a9c51cdea3df17", + "version-string": "7.2.0", + "port-version": 0 + }, + { + "git-tree": "f6b7d113e8f4ef1dd43faf316ee848f35fdf0ace", + "version-string": "6.4.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/bitserializer-cpprestjson.json b/externals/vcpkg/versions/b-/bitserializer-cpprestjson.json new file mode 100755 index 000000000..20e6cf747 --- /dev/null +++ b/externals/vcpkg/versions/b-/bitserializer-cpprestjson.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "cb2e0fef9d95a7f2bcd99cb537caf0570ee50866", + "version-string": "alias", + "port-version": 1 + }, + { + "git-tree": "af219f0644caccabb3d8fc0908c70c6f216c6c7e", + "version-string": "alias", + "port-version": 0 + }, + { + "git-tree": "13b3133dcffccb176ecba66be6a09df4917ab6d1", + "version-string": "0.9", + "port-version": 0 + }, + { + "git-tree": "27d06b8e4fbcd8f39f90426559acebaf106925b5", + "version-string": "0.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/bitserializer-pugixml.json b/externals/vcpkg/versions/b-/bitserializer-pugixml.json new file mode 100755 index 000000000..1b1a08aeb --- /dev/null +++ b/externals/vcpkg/versions/b-/bitserializer-pugixml.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "a8379fe5b2d97c381221f455978920f44ab932ee", + "version-string": "alias", + "port-version": 1 + }, + { + "git-tree": "35575e8e78a65d2ebecd065cdae32ad51b03cee3", + "version-string": "alias", + "port-version": 0 + }, + { + "git-tree": "046159738ddc292978f666bd4836f5c4beed1fbf", + "version-string": "0.9", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/bitserializer-rapidjson.json b/externals/vcpkg/versions/b-/bitserializer-rapidjson.json new file mode 100755 index 000000000..f55c9cda8 --- /dev/null +++ b/externals/vcpkg/versions/b-/bitserializer-rapidjson.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "990030f46f43de41fdb5ccd57d29de178edcb8c5", + "version-string": "alias", + "port-version": 1 + }, + { + "git-tree": "6039c5207e9aef672cb2d9250761419d2e937e8d", + "version-string": "alias", + "port-version": 0 + }, + { + "git-tree": "c4e4b7defc05f1a2061a6882c2773f0670af7f82", + "version-string": "0.9", + "port-version": 0 + }, + { + "git-tree": "6366f9629d1a06de7b12a72b3bbaf9a4e60f1b4a", + "version-string": "0.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/bitserializer-rapidyaml.json b/externals/vcpkg/versions/b-/bitserializer-rapidyaml.json new file mode 100755 index 000000000..da58b49d7 --- /dev/null +++ b/externals/vcpkg/versions/b-/bitserializer-rapidyaml.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "08097fe26fb2b85b77ee6df81ba666201b1dd991", + "version-string": "alias", + "port-version": 2 + }, + { + "git-tree": "7680ebf3a5a68b67ce532cb52faae1c37535c69a", + "version-string": "alias", + "port-version": 1 + }, + { + "git-tree": "146cc1679c8fa5e740a3ef71cfbf2b3bf67e7647", + "version-string": "alias", + "port-version": 0 + }, + { + "git-tree": "6628759322670c36cee1164b50561e5b61d7c581", + "version-string": "0.9", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/bitserializer.json b/externals/vcpkg/versions/b-/bitserializer.json new file mode 100755 index 000000000..00d44d04e --- /dev/null +++ b/externals/vcpkg/versions/b-/bitserializer.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "e25c895f4054e151b1865640ae8500efcddda95b", + "version": "0.44", + "port-version": 1 + }, + { + "git-tree": "66c9246073510ab554418a0b63ef9ee471b05b76", + "version": "0.44", + "port-version": 0 + }, + { + "git-tree": "ea63e330fbf462f7d5ab3fa119d105501366ea9c", + "version": "0.10", + "port-version": 2 + }, + { + "git-tree": "a840c1d638565cbc8c4fd9a4200c0f54136275d7", + "version": "0.10", + "port-version": 1 + }, + { + "git-tree": "7ad926d8d5b488348fb195aa2180443a986e3464", + "version-string": "0.10", + "port-version": 0 + }, + { + "git-tree": "529a84c174c81cf0d5b398ef74b780d5c48b4bc1", + "version-string": "0.9", + "port-version": 0 + }, + { + "git-tree": "d0f968ac3cd0cc6c8d2883e9917a97730f56d43b", + "version-string": "0.8", + "port-version": 0 + }, + { + "git-tree": "d3f5b741089ec695e2d088cf1d130823f1cddab9", + "version-string": "0.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/bitsery.json b/externals/vcpkg/versions/b-/bitsery.json new file mode 100755 index 000000000..bff5f7ba5 --- /dev/null +++ b/externals/vcpkg/versions/b-/bitsery.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "6fdd20d510ccb63049b899419af07461f42097e5", + "version": "5.2.2", + "port-version": 0 + }, + { + "git-tree": "adbbef892ab01c8b0c57b7be2684ae6bb1a29a99", + "version-string": "5.2.1", + "port-version": 1 + }, + { + "git-tree": "b7b53af2d59fe702bcbefc77e31745f2a916afc8", + "version-string": "5.2.1", + "port-version": 0 + }, + { + "git-tree": "e3f91c87735a3cffdc76bc6da0b723cc5b4f2c3d", + "version-string": "5.1.0", + "port-version": 0 + }, + { + "git-tree": "d6e86f417c1729f51182a199b260c50398eb5a40", + "version-string": "5.0.3", + "port-version": 0 + }, + { + "git-tree": "4b3721d445e8dff8f26a93e6c5849bf94577e654", + "version-string": "5.0.1-1", + "port-version": 0 + }, + { + "git-tree": "899f3adebd9df6968c017ca9b87ff44a644f405a", + "version-string": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "e34ebee8cbfffd7a4b05a07df93f476e916ff146", + "version-string": "4.6.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/blas.json b/externals/vcpkg/versions/b-/blas.json new file mode 100755 index 000000000..c8b3ade64 --- /dev/null +++ b/externals/vcpkg/versions/b-/blas.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "0d105be9337f4a6f294a7eced2da18e8cdb99051", + "version-string": "1", + "port-version": 1 + }, + { + "git-tree": "2877c1693c63195d4edacfb42156c9d8874ad046", + "version-string": "1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/blaze.json b/externals/vcpkg/versions/b-/blaze.json new file mode 100755 index 000000000..2a94caab1 --- /dev/null +++ b/externals/vcpkg/versions/b-/blaze.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "6bea7e024ba776f0a7c5462056054529f79aa86d", + "version": "3.8.1", + "port-version": 0 + }, + { + "git-tree": "8795a94d25adbb75d3be0b191bc3c15321e9c686", + "version-string": "3.8", + "port-version": 2 + }, + { + "git-tree": "0929cccabaf3511161aa06789a414a2937629679", + "version-string": "3.8", + "port-version": 1 + }, + { + "git-tree": "0a3d771a22aa157efa6509d71ca490c0837245ba", + "version-string": "3.8", + "port-version": 0 + }, + { + "git-tree": "030ff934e5ec3edf938b5c7af9ee2d0aaf2312a3", + "version-string": "3.7", + "port-version": 1 + }, + { + "git-tree": "31cd07691fc311e7162d87a5fa3a9c57c1394a45", + "version-string": "3.7", + "port-version": 0 + }, + { + "git-tree": "c8c9bc05c29ce0eb5f92c342f55769350f3b05cf", + "version-string": "3.6-1", + "port-version": 0 + }, + { + "git-tree": "601997a4170c6ae1c3abc833b9903ed3d8e76074", + "version-string": "3.6", + "port-version": 0 + }, + { + "git-tree": "0c07a59546a7c2c5f1192e0bff318c9df2ce248c", + "version-string": "3.5", + "port-version": 0 + }, + { + "git-tree": "3f72a5942a99dd91142e5abdc1baa783330b127b", + "version-string": "3.4-1", + "port-version": 0 + }, + { + "git-tree": "f26995e1fb9fe7e85ce58eca839126c280b6e46e", + "version-string": "3.4", + "port-version": 0 + }, + { + "git-tree": "d00bace3480f1f01ac244f1d0a81588f1bbfa8ba", + "version-string": "3.3", + "port-version": 0 + }, + { + "git-tree": "637fc709acbb54db8d3cfbb6f3ac10ec93870ed2", + "version-string": "3.2-3", + "port-version": 0 + }, + { + "git-tree": "e472a441bdfffb537058d7aea7c67e3221053c38", + "version-string": "3.2-2", + "port-version": 0 + }, + { + "git-tree": "1e22d37bf1c1ef3d5f76d12d917f30d39da28897", + "version-string": "3.2-1", + "port-version": 0 + }, + { + "git-tree": "15ef5588a761e515cf91f2527cffe3f9f9387f03", + "version-string": "3.2", + "port-version": 0 + }, + { + "git-tree": "d2ec68e6acec03edbe7a55b3fa317f104e74c859", + "version-string": "3.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/blend2d.json b/externals/vcpkg/versions/b-/blend2d.json new file mode 100755 index 000000000..d729bd258 --- /dev/null +++ b/externals/vcpkg/versions/b-/blend2d.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "96db1e7844aafd005e469f47b8f89e139df8d8e1", + "version-date": "2022-05-02", + "port-version": 0 + }, + { + "git-tree": "ceedb664deed987cc4e4493554ae3aa58088f08c", + "version-date": "2022-02-19", + "port-version": 0 + }, + { + "git-tree": "401153e8f3407e68e96c4ea60f8c71c633b08e1d", + "version-date": "2021-03-17", + "port-version": 1 + }, + { + "git-tree": "e322c9917356f15d6370ff8f2f0bd380d1f08661", + "version-date": "2021-03-17", + "port-version": 0 + }, + { + "git-tree": "0258280297a10b5f45243914233bb9299274a224", + "version-string": "beta_2021-01-02", + "port-version": 0 + }, + { + "git-tree": "7772d070a8aa7b0b06508ae45bb3c22e9bbe774f", + "version-string": "beta_2020-08-24", + "port-version": 0 + }, + { + "git-tree": "ffce764b880d8cc24e3b00328aa3861f15bae91d", + "version-string": "beta_2020-07-31", + "port-version": 0 + }, + { + "git-tree": "03a43f03eb0cab95aac27a77b71273fc4aa2e94d", + "version-string": "beta_2020-07-09", + "port-version": 0 + }, + { + "git-tree": "4b67e6ac18485e7209ec86219d16ce3659446e8a", + "version-string": "beta_2020-06-01", + "port-version": 0 + }, + { + "git-tree": "085240b75db115d9a8506dfbece3654c747695ef", + "version-string": "beta_2020-05-04", + "port-version": 0 + }, + { + "git-tree": "e5803599f8a8cd230e2c47c0621730fe68621c2e", + "version-string": "beta_2020-04-19", + "port-version": 0 + }, + { + "git-tree": "98f049cf4d0022cefd9d47a7e8610bba0cab3c0e", + "version-string": "beta_2020-04-15", + "port-version": 0 + }, + { + "git-tree": "142a63cd15830f4bdd62eafbca53a526449cfeaf", + "version-string": "beta_2020-03-29", + "port-version": 0 + }, + { + "git-tree": "bacc881cce92ba0f700fa1979b338a523d31b2f5", + "version-string": "beta_2019-12-27", + "port-version": 0 + }, + { + "git-tree": "ce604b67ae70294390e5563df15fe6cb2cf53b11", + "version-string": "beta_2019-10-09", + "port-version": 0 + }, + { + "git-tree": "aa93039c5b51abe4372278bbdfef33ebb3726fc2", + "version-string": "beta_2019-07-16", + "port-version": 0 + }, + { + "git-tree": "52ab0ec1c89dd5b33dbd03678034e772c36474d1", + "version-string": "beta_2019-04-30", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/blitz.json b/externals/vcpkg/versions/b-/blitz.json new file mode 100755 index 000000000..bda1fc086 --- /dev/null +++ b/externals/vcpkg/versions/b-/blitz.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "58bca2588e7ff4935893cfebdf1d9665f95f846e", + "version-date": "2020-03-25", + "port-version": 5 + }, + { + "git-tree": "694507bc15d282e3de5160a0a221abfa381e6327", + "version-string": "2020-03-25", + "port-version": 4 + }, + { + "git-tree": "ddf54a36a0fa345a482b66d648778c13f0008eeb", + "version-string": "2020-03-25", + "port-version": 3 + }, + { + "git-tree": "6f6a860240cf01fea1a9f90f6970dec75980a1d1", + "version-string": "2020-03-25", + "port-version": 2 + }, + { + "git-tree": "50cc7fc499a0dd0ea2d61de84ee5875327ffd255", + "version-string": "2020-03-25", + "port-version": 1 + }, + { + "git-tree": "5cd50e6a9001065a85965fd67c63304912ca902b", + "version-string": "2020-03-25", + "port-version": 0 + }, + { + "git-tree": "2412730aa808b2aae82af8b0f79c79e24b7bacc6", + "version-string": "2019-09-26", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/blosc.json b/externals/vcpkg/versions/b-/blosc.json new file mode 100755 index 000000000..e0ce0f1cf --- /dev/null +++ b/externals/vcpkg/versions/b-/blosc.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "a95e4b34ff47ed69f3e644405efe80b8c46aee14", + "version-string": "1.18.1", + "port-version": 4 + }, + { + "git-tree": "a9ae0480271a2db8d001d389b4c62af49ea50770", + "version-string": "1.18.1", + "port-version": 3 + }, + { + "git-tree": "0d29f4f5d2e2d2fd70c4489149d81cc548d31cc1", + "version-string": "1.18.1", + "port-version": 2 + }, + { + "git-tree": "117ae787801719558e153574030647da9fc16cf7", + "version-string": "1.18.1-1", + "port-version": 0 + }, + { + "git-tree": "0cecc386e1baf145470db8b70665961eec9e9747", + "version-string": "1.17.1", + "port-version": 0 + }, + { + "git-tree": "da134ec965f1cdb754429bed31f5791e7664c285", + "version-string": "1.17.0-1", + "port-version": 0 + }, + { + "git-tree": "901567081986ac0c6c0439eb3051362d3eb76712", + "version-string": "1.17.0", + "port-version": 0 + }, + { + "git-tree": "d4d243af848ef5d98e8dcbbb4c321d93d24e5b7a", + "version-string": "1.16.3-2", + "port-version": 0 + }, + { + "git-tree": "31cddb54ae5c7610884c84368d7c4397c78fee76", + "version-string": "1.16.3-1", + "port-version": 0 + }, + { + "git-tree": "b23aeb29445076d710423ebbae55bc3450fdb69c", + "version-string": "1.16.3", + "port-version": 0 + }, + { + "git-tree": "97e82fc8da36b2ecd4660ed9cbda3a2c2d8225fe", + "version-string": "1.13.5-1", + "port-version": 0 + }, + { + "git-tree": "5a5ca69dc95323c180acf87676eb9f5107c74828", + "version-string": "1.13.5", + "port-version": 0 + }, + { + "git-tree": "c2403773d4b9e8c8146534ba2581806fab2da116", + "version-string": "1.12.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boinc.json b/externals/vcpkg/versions/b-/boinc.json new file mode 100755 index 000000000..769358709 --- /dev/null +++ b/externals/vcpkg/versions/b-/boinc.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "c81da3b63845b3d0e04dfac9b8ebe3096d13176d", + "version": "7.20.0", + "port-version": 0 + }, + { + "git-tree": "47df312abbe66c9c58fd67b1deb72ec906421a68", + "version": "7.18.1", + "port-version": 5 + }, + { + "git-tree": "33d681acad2362813b5aa9e547c73741d11432d4", + "version": "7.18.1", + "port-version": 4 + }, + { + "git-tree": "561d297147fabda6ccd25dc8ca3de0ce854562ca", + "version": "7.18.1", + "port-version": 3 + }, + { + "git-tree": "ee6667eb5cf5a3fee75fd35de998ad322c5999ff", + "version": "7.18.1", + "port-version": 2 + }, + { + "git-tree": "47766741495b79066e3e24b1547684024b9e16b8", + "version": "7.18.1", + "port-version": 1 + }, + { + "git-tree": "9fcf80005012082801212b0761a61a53f92b6104", + "version": "7.18.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/bond.json b/externals/vcpkg/versions/b-/bond.json new file mode 100755 index 000000000..be81891da --- /dev/null +++ b/externals/vcpkg/versions/b-/bond.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "96ecc1c6ea2a8fabfbdfd7d0a8535821446af89f", + "version": "9.0.3", + "port-version": 3 + }, + { + "git-tree": "a1dbc5726734016b562a6f957ae3072df17b4592", + "version": "9.0.3", + "port-version": 2 + }, + { + "git-tree": "29fa989c86f7846056f2afc162152f79169ec813", + "version-string": "9.0.3", + "port-version": 1 + }, + { + "git-tree": "bde4f6ac4c95a05f823e8de810f57df015738ac4", + "version-string": "9.0.3", + "port-version": 0 + }, + { + "git-tree": "296d1334803fea55c08752d656a60c70c53ae600", + "version-string": "9.0.2", + "port-version": 0 + }, + { + "git-tree": "80d1a672e033ad1bf2f1551f46e42f4daaebcb6e", + "version-string": "9.0.0", + "port-version": 0 + }, + { + "git-tree": "499ddc4155f82ac0b3e42f01cba694660778aa40", + "version-string": "8.1.0-4", + "port-version": 0 + }, + { + "git-tree": "9414919f360dd7837bb1c584ace15ad2212b664b", + "version-string": "8.1.0-3", + "port-version": 0 + }, + { + "git-tree": "7b3c4a2299a891b66e71e1d1db9434dbaecd792f", + "version-string": "8.1.0-2", + "port-version": 0 + }, + { + "git-tree": "b3d448758eb450af042c8bc054e65d9f9bd784c2", + "version-string": "8.1.0-1", + "port-version": 0 + }, + { + "git-tree": "af8ab5c553049c589bc6ad65a9de3640a04df6c8", + "version-string": "8.1.0", + "port-version": 0 + }, + { + "git-tree": "ab2bf47ea2bfd5e792aa269b982a9a43879d652d", + "version-string": "7.0.2-2", + "port-version": 0 + }, + { + "git-tree": "00722ab36c76488de79d06c23752157b0b462e38", + "version-string": "7.0.2-1", + "port-version": 0 + }, + { + "git-tree": "5f6299740eb7b94ec88c3e02990b4f2090c82714", + "version-string": "7.0.2", + "port-version": 0 + }, + { + "git-tree": "4eae9ef01bdc97bac6d4d950b32444bef5411beb", + "version-string": "6.0.0-1", + "port-version": 0 + }, + { + "git-tree": "b7540e50de294b554b594249161801d7821356d6", + "version-string": "6.0.0", + "port-version": 0 + }, + { + "git-tree": "4b01091acd27382258e2a3696bdde3a23ffa0158", + "version-string": "5.3.1", + "port-version": 0 + }, + { + "git-tree": "3b0d66a75c2119cbea37fd7553e796b7f84f69fa", + "version-string": "5.2.0", + "port-version": 0 + }, + { + "git-tree": "e31c6ab00354074e55dbb06bd9c8fd7878c38dc4", + "version-string": "5.0.0-4-g53ea136", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boolinq.json b/externals/vcpkg/versions/b-/boolinq.json new file mode 100755 index 000000000..d32f73386 --- /dev/null +++ b/externals/vcpkg/versions/b-/boolinq.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "540d3bb914d7910e720efb6f423d22e279b2c029", + "version": "3.0.4", + "port-version": 0 + }, + { + "git-tree": "40193511c7dc66ae28661196fa3769dfabf0ac8c", + "version": "3.0.3", + "port-version": 0 + }, + { + "git-tree": "86d17070137580ac517b418686329b8fbc28b147", + "version": "3.0.2", + "port-version": 0 + }, + { + "git-tree": "6c818ffded6676e523656e7ae145bfe6e6bf9220", + "version": "3.0.1", + "port-version": 0 + }, + { + "git-tree": "29ffea33c381e00d2728bc3cb97fbbc0b669547a", + "version-string": "2019-07-22", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-accumulators.json b/externals/vcpkg/versions/b-/boost-accumulators.json new file mode 100755 index 000000000..99ca3f1b9 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-accumulators.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "80a1e83cff3df70e006907ccc20851f7086f2dab", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "070cbab1861e2a57e6c39ac1a8dcf51ad9edafea", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "b24ef7a5bec0e29c8013593cd6bba58e52b19a7a", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "94824d664d1b512dd44c3c84652b59da7726273a", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "5b1b9c1e8dbb75740b1795ae712e8a4612e91c58", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "2f5cd36c753176957adcdc9415f7fc3f16b1fef8", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "2ebc0372de20817fb72dd042ee3e574241d399b6", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "0e60d48bae391a4498520834fa606c5f122a75ed", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "cb6ed4faa7aed8e72f40cbdbec477cc1333b86bd", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "c9906574c83dd3d152989c733819eb9f791df0de", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "dc755bca2ec376d006691ce2a72bb84d10c2e5ba", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "e1a48ebe8c8b4c1e3b2a95125340e30bc6ee51e6", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "77b9a480f702f25f27ef8a804b2c9e179679ad6d", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "53a2e90bd350f75ec72b9be3d1bb7d7579b0eaae", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-algorithm.json b/externals/vcpkg/versions/b-/boost-algorithm.json new file mode 100755 index 000000000..6878d7252 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-algorithm.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "20d7a665b493f8b9816d56125e83928e41dcaa98", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "eca5eb57117afd2c43e7f00ed6908dabb254b46e", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "338f795a1e6d73ab25444f64fe7ba1d617128813", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "b6ce23e02aaf8b595e852e9746677fa7f85819ca", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "c720beaff3f3325f63ed3c0d76bfce956e2d9442", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "d89bcd64693c86a2721ac96a7184d06c0ea2e720", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "176da63bb34d5d5d244103f938f4c5acee267671", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "9b5645315be80f6998ba7e76d0ac3dc3be5743e8", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "160e392c44f4ecae9d3fb796d1f55b7cd6f574f5", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "cbb4255f2568bd50392989d2da11c11b0ffde059", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "047689ce9696334a44323e3aa2b0ee5cadabb76e", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "b9d62e0bc21550e9d55fb216ebe6f010af92ba3b", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "e28334868b9c5aba6b126d51edba9decb758c37d", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "48b43af95bc43e02edb114f0b544e5584ed57638", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-align.json b/externals/vcpkg/versions/b-/boost-align.json new file mode 100755 index 000000000..48a67516a --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-align.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "5bc0b7d28ff47bf04454dde5d3ab3eeed5a113b2", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "1733cf10f4a598f29af7380a6b8226abdeeb3f75", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "5e733503d18c7e82478961e1155a40a95af0ab42", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "b28cfbc210773962783f57f6526678f1085be471", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "9f77d89d4c76cf998be2d4f15aa922e04f233f1c", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "b65eace9d2a5a9e298da6abd40633df2ba46b1a8", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "69bd6d3868596f19f979c61cc518f323a997b9c7", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "c07aae49296c7c1f08bd8b02e170fc33891d55c7", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "09b5fa93236762ff898b0b44445699887d78cc20", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "c7d72a5dcd40e19dd8f30b1ea3dab4eb5e21dd31", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "fc272586f6caf54a8752c73f92b09eb4b75ba59b", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "e6e410db21abed895f60babfd235ccd35d186ae1", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "8f3177dceea4f3ae2c29b83fc6bc9ff9f974b767", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "fc9baf9d5614a9f460b2abad0eab46f7db130829", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-any.json b/externals/vcpkg/versions/b-/boost-any.json new file mode 100755 index 000000000..a8d61d37e --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-any.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "6382a90fffe32ec65147d579e28f05604eaeef46", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "a28a3fd1ebf198563ae9e200dcf36f1fae3b1482", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "cf8bdfd2ce434a981620383dcc07d46c0a071ca1", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "20631fecfd4ef3388bcaca6a3491d27b23bde42d", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "c78437716768273f86dc2f9132d865a0f44a0971", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "8f13f67a837750f79e1b782e1ac3e35e26973f9e", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "4f6a1fc711bdd94605a8f9d1e4e877e33c3fac87", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "68134dd58df425dc6e74d94d1a691402370006bc", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "b080fd24eb6dd9182790060b2715de33f6a960ff", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "0fb6e10a37900d07bca38b3b7152f79c2bcf9859", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "3e8417759ed1d22a1954d055d49d86fec3ed5ccc", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "a833cfc69ef4338fb9924cf6c740a3573a508626", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "a845fa017dd11c5f284c52c51558d643dafdb3dc", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "33ffc0547d8b52cd92a0af12c481e5d8b6dbc59c", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-array.json b/externals/vcpkg/versions/b-/boost-array.json new file mode 100755 index 000000000..32a37364a --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-array.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "11a6869eb0c7b2efa3e92b2c36795ef9873c6537", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "8278959d326c44d846d660462556ab48361054f9", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "fb008cce0de1c6a34ac5222d03d7e1069d135dc4", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "bea67607788bd73e3c83b93848a507090f886b7c", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "5cc33df23211b2d4a2ed7b0b563140ddd74a7358", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "bd44c0793f910cfd8421c6689284084782426640", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "3d0f10310e0895562576b582eeafcd5265cf3caf", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "b97252c681d83ede6ae390c45e289c3f25265fc6", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "5ae8d7039eaff7005f55d50bd803cfba15bfe75a", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "d27628d9a0832fb99c3adb78cc1807b5e4ecd7ac", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "6e914ef7dbe4e53d9f0ce560b244b15527b5b3b3", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "6a079c0d561c1cc583e4e28d598d0342e8b65a18", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "b5def50edec8f2033f17ba1b1796cdca78346a1f", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "5a20baa7c5b08995b78ff4cb123206d08cb15e85", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-asio.json b/externals/vcpkg/versions/b-/boost-asio.json new file mode 100755 index 000000000..58ec3ba9b --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-asio.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "39b1b86ce2c331ab31d001308b6a71fc6fbebf5c", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "2fcf35cb168a6a2aa56208a83fb71bfdf88672b6", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "9c5c591c857588b69354bf075019bc78ce4237bd", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "c422367cb9f7a8de0fcbf1809e1a2cab1983bce9", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "43233c66944ac53a423bba45a46708a308d786e3", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "06479d413007b9c36b25b67276fea3b4d297a62d", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "afcf84f3c1da251f42c2efa2507b6f727315b03e", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "3e50713661351f5e710f78832367be066507ace8", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "9a6beeb70a04892bca2119db641701ef9cece96c", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "e47eb6b1747ba6675826dcd315c350c1cd8a68d2", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "e36d8d7f01e8b6a893f1ca5516df5f6b70908059", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "8c4d5979549147317924bf641fb2cb3a7a926469", + "version-string": "1.71.0-1", + "port-version": 0 + }, + { + "git-tree": "8f730c9bf4fcc233ec5a43c5584c9694cc2f3916", + "version-string": "1.70.0-2", + "port-version": 0 + }, + { + "git-tree": "976690d3279a285d3a688e55230b1713ff200d4f", + "version-string": "1.70.0-1", + "port-version": 0 + }, + { + "git-tree": "1540dccd31812ea9ef217276cb7e5700eed486d9", + "version-string": "1.69.0-1", + "port-version": 0 + }, + { + "git-tree": "72d6518ae8e319be7e4362b4e57bcc60b1f7d2f1", + "version-string": "1.68.0-1", + "port-version": 0 + }, + { + "git-tree": "d7dace27d51c1a44a2c8e4f1449e5809a6602351", + "version-string": "1.67.0-1", + "port-version": 0 + }, + { + "git-tree": "c2685d2878d579296d184012d65743fd8f776a2c", + "version-string": "1.66.0-1", + "port-version": 0 + }, + { + "git-tree": "e620c595110e6dfaa4a88240ce6b20355f0543c5", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-assert.json b/externals/vcpkg/versions/b-/boost-assert.json new file mode 100755 index 000000000..9dc4a2e8a --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-assert.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "2e4adae40df44f3927978bba397b60f18ad8e919", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "81b29f057d38140b3d812094999772d2d5263d4e", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "db6b88ce332c6752f87f8f0c098a832e23610303", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "d756c428b49e3aed8ce71c1d0b946426e929ef8a", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "3393715b4ebe30fe1c3b68acf7f84363e611f156", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "c52a60adb19dab70d7a42243d0039e675636b320", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "af7d1f9f7cc7833920bcd8bbac4374ea9783fa27", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "6754398591f48435b28014ca0d60e5375a4c04d1", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "19af4f81da14dcc3a10204bbad1137b72bbd583d", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "c15b043ae043bc75504501011ecbb7ad572993d5", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "8c4b239444789a6989049a561a3ea8db1f48f922", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "9d4646a6f8b42cd5654efb937647138d6a6d09b6", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "9d040cab6a01efc5c9dfbbf51247c7813eafc897", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "51b832c056165ab81038f049e5a3f763043b194b", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-assign.json b/externals/vcpkg/versions/b-/boost-assign.json new file mode 100755 index 000000000..761268229 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-assign.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "755ca06375958012e688e91d8ad79c40b20b91df", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "cb2a0606569a77b0de8264bd55d015698f413dd7", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "c7c391576a6f9714453c28f6b73ddcb3c7439827", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "b026e0722c90b595f8125caab74275b68dcd81f9", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "593134d9603cdcd0232608aea11c4969df7f5b1f", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "c5719c39013cff915d04188ed303d58a661b7d70", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "e660b231334f1e8c9bef6e76e469591766798034", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "5bc1de2c6a4546617aafea575e6f46f1f0d8dc33", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "9c04d48b4379b4a2ff84a41547ce0f487d6ca906", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "39cc9ab15940475ef8d3ca13e5809f502f956f2c", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "9036e3fdcf5ec728362794dabb744c831c53f57b", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "7b04ec83d57b909f329a8bdebe74fe2b68fa1af3", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "edffce8092141c444c5151c354fd21361157fa98", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "3f087c838fb1eec9cbc0c6dfaa289efafd0a1de4", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-atomic.json b/externals/vcpkg/versions/b-/boost-atomic.json new file mode 100755 index 000000000..f6fc8a960 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-atomic.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "ba96ddc357592c3644f666fbc68d052ad3f0f397", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "f516c90064f41a11fe7627ab6a8ac281455f55cc", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "c5f02ea8b6555b20b6cc8901bdae9e9628086640", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "cfe27152cb82633d279f5c55b3eb9ba3b454e23e", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "b0eb6bd0f609a494f58910e9f5c640144d5f8890", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "4a0c37b7c48d8ca93df2c83b8bda9f8256f63513", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "b5d964f865b163273f26f176b55b2fe9681f50b4", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "df43a48b5d3a1d0398623be79069d6d7a0033573", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "c11ae99a61b31eb7b4af415eee74fcd1af694db0", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "fdae922070632ca60b0e3b3e7b35c0ec302a0b14", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "7fbd1f36be3b3af96dfc4521fa0f0f4f3b518ed4", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "ce6a2fd5e15e6d0eee4645a20da85a6ab41b186d", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "f341ae516b70d185b82dd9f306ca130fbb490ad4", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "6ea50a53f5359ca089e75f77fc4b9d46de5191fb", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "db1fbe5d1f4641922f8e2a4225112116f11bc3af", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-beast.json b/externals/vcpkg/versions/b-/boost-beast.json new file mode 100755 index 000000000..408148f5e --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-beast.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "bb0a62ab1fd80ff0dd756ad89cbc367b2f7c6df0", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "5cb4b3da49532ceefefdb4465c74c3490f6c40f7", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "154d8664ca78bcee263cec7a297afe36a4877313", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "9d135f2fabb815ef2c643e71db48e227494aa3dd", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "cf5aa1fd8b53f127b259d919c0bbf4659d3196e0", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "ce54cf1adba89aa745d0eac8c494ea813a3d5a3b", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "5c381f5f35e94e3a53f5d59ff18b8f26aa50e349", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "4343a247cb428a1b78b68779b6adfa983be25b65", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "9c16d29f96479caa74ba595f380999fb699af91e", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "4a770bc4000f070d01821d8ec1838a5af00ae39e", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "6f1c53bceb4056846bfd31e5dd474d20a40b8237", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "e97b76d5d7f98483d8ae3e23be4feb6db16b7be8", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "eb6165654c32c389c0369f23ff6f52db585732cc", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "5dde2f28dcaa5246b97a895cb499e6000ed4625a", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "4bf27532cf1595733470b0e2f2e4b471275fed5f", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-bimap.json b/externals/vcpkg/versions/b-/boost-bimap.json new file mode 100755 index 000000000..b58cc6335 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-bimap.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "4bad70254f12ab9642e3ee96980d834a485af5e9", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "d376fb04582a3ca0b6d14f991ae05965c7d0961a", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "726aaa86124fd8d1658f0813902b8bf9b27bb707", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "2a01b028c11f40a89e1f0157f97e866ed4d53046", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "ca2e28851246c3fcbba2e8c5b36ba2b1e43587a7", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "070dcbecc7424d9777c9c94397e22975c7af9319", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "eaa15dae5f8c4ad5bea8312d9d2c3747427600c6", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "fd928fbeccf53880cba623ecfae968943aabfa88", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "c44b8b94b80f0162d84cb4fdb2fa15a15acf5c0d", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "dbdd1f50e9b40d31ef700d68e4d6756e068123e0", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "1d714be52c5d0b421fc19a58200c252c885e84de", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "44a0b3fbb3ca6549e00f733c9ca64600f26613f5", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "f375a908d3bb0633b7758ea359fc6b47ecd9d007", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "98e89f9b3156cd060f0c2be0764e17c39a9aa05b", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-bind.json b/externals/vcpkg/versions/b-/boost-bind.json new file mode 100755 index 000000000..2cfc8ee25 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-bind.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "c27b66c8e195ce97685c409c0821f907bae83d80", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "165c77e05b1d413a600f66135276ba7e727ebc35", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "a1764edb5aaa4cf532e6e2d60d56420240dec410", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "7e622ce41f16af974c759e51dd9a250b054b3a71", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "110fc6710128cce06256143e5c2df83bf3060a42", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "5a9391097dd5644a6b902c54d86a394719dbfb37", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "65a63dc4317fcd9402caf3311dcb45bf850cecc1", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "0e96cc4cb23ad980a1674dc1b4e029c24f7b4a47", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "c1da8316d401da955e5a128322ae35d941082dc2", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "6cab60787204287b8b9f3303c35e64ac33cd4496", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "c98fccdb43cbe8eb529413b5e16a7e2701224d13", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "63f7d8110fef3b12fc29428e12d23f4c1802f11d", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "1b75e5fd76c80a828177c37881a98afb53d6a6c8", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "93cc104912be8400a1128b24152c6e202929f11d", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-build.json b/externals/vcpkg/versions/b-/boost-build.json new file mode 100755 index 000000000..be9fe150c --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-build.json @@ -0,0 +1,134 @@ +{ + "versions": [ + { + "git-tree": "ba4fbdacb5988e8f753bf2098ec257453c50a27a", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "cf970c17a4bf6d59deff7ce7e7eb98cec74b544a", + "version": "1.78.0", + "port-version": 1 + }, + { + "git-tree": "2c0d3c35e95f99911a226c3e736c0988f1139e51", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "d12d4a6f44a7356c4262b27adcda834fe893b576", + "version-string": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "8e84097fbdf78eb6220bb0bb7c63addefb6301d9", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "f6c7fe38fdff5e1a5d4ffe9e9fbc7efe0f7e01d3", + "version-string": "1.75.0.beta1", + "port-version": 1 + }, + { + "git-tree": "bce0d26494d48d983b9b0e552e661f2d0dd36074", + "version-string": "1.75.0.beta1", + "port-version": 0 + }, + { + "git-tree": "727c3400fff7c138685446c6f376211b4f5eca27", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "60c33b1ff1ce49acd675eab581ea75b2c47b3e1d", + "version-string": "1.73.0", + "port-version": 4 + }, + { + "git-tree": "2d6e98097126d9260a67301b0f6d216aafc7373f", + "version-string": "1.73.0", + "port-version": 3 + }, + { + "git-tree": "76e980f33124dd0d7b59aa3b46715dd0451baff2", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "9e4a505b1b099566aba67e432117597106eb55bb", + "version-string": "1.73.0-1", + "port-version": 0 + }, + { + "git-tree": "7adce9cc7f1895945d50e62fbc4931d7c9eac653", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "fd5a7cbab5f0950a8837faf3274349438fdf16a0", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "71dd8bdd4d6cccbfb313df02c5b91f1708591f39", + "version-string": "1.70.0-1", + "port-version": 0 + }, + { + "git-tree": "c8d848cca27ce0684091f6172f239010d691ef03", + "version-string": "1.69.0-1", + "port-version": 0 + }, + { + "git-tree": "98d3243a531892e9b8364f7b5ebd22026a615bbf", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "a9f1262d1f02144c7e2679971079d2ca7996eaf6", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "c97cb58d831d637ef85e3dbd0f0c852fd573a5d1", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "8ab758023950242c3eba841c57bf898b9cfd03d3", + "version-string": "1.66.0-8", + "port-version": 0 + }, + { + "git-tree": "b89da20a42524a47cabacc4f3958cdba993177e5", + "version-string": "1.66.0-5", + "port-version": 0 + }, + { + "git-tree": "f95779327492afdf6e54a6100abef5f2a14f5914", + "version-string": "1.66.0-4", + "port-version": 0 + }, + { + "git-tree": "b2a0b243604ddd018ed13999a4f3f5a9b6b73be6", + "version-string": "1.66.0-3", + "port-version": 0 + }, + { + "git-tree": "d83e7a452b8eb80d9bc0c88db6ea6a508ea0fa2a", + "version-string": "1.66.0-2", + "port-version": 0 + }, + { + "git-tree": "1d84503651e93f119b56c6729f6d10d586d181ed", + "version-string": "1.66.0-1", + "port-version": 0 + }, + { + "git-tree": "b7f6d8a9687e18b558f9902a2f732f4f7ea19e9b", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-callable-traits.json b/externals/vcpkg/versions/b-/boost-callable-traits.json new file mode 100755 index 000000000..a13fd9648 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-callable-traits.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "b3fb5022c86bf300e6a55e8ecef2ba41e9f6a39a", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "c65c1b67763ed69490e43430bc860493ccc19274", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "6c22b4049665b95038b8f5d1e1952434f1387f7c", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "61e468bd018412606e863d2b43d9b01c54205ba8", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "7f76365f342942ba11c0c1352434d980dc905f13", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "a9680f87166c2c0f05400f323b51189240d4f21d", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "135048bd0ce2c6ec9341109ed4b56f38f61a9dea", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "0ee3af44715fc30b9072ff39a4bd73ac1b60ff21", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "16fcdb42ec27af3cae676c9572ab23c4f8edd06a", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "76f1d85cd9cdd09c5bab78bc72f708f3c5fa4eff", + "version-string": "2.3.2", + "port-version": 0 + }, + { + "git-tree": "c132abcab0025075459d8200e776223c627b43e8", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "f0c7df368f22ff112b99bbcfe1923cbbc9b82b36", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "d1a91d13ebc508fc0f5a17664431df4860340158", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "158b00daf144ae9888cce40de2d25b1a2712ae7c", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "6b95b527e8e5a1caccad0b52edc98bbd5ad4c5c6", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-chrono.json b/externals/vcpkg/versions/b-/boost-chrono.json new file mode 100755 index 000000000..3d99e0947 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-chrono.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "dd168284e43a057a5775444c07f11f99a96053c0", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "d08ea7bd6fb471393e10507f0b6d27d045868f3e", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "f0143b4dd81e3de932ea886e69efd196452d81b3", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "9852214af239e8f5f34ba4299ac07b5e207f01da", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "23fe79b0d84dee32f51951fa275a5949e1188930", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "ab63f094dd2f18ed66be7513a412896cddf83a2d", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "4db91fd0fd0ac86a6ad9bed143d319715b4625d8", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "e432ac49efc4b6f3bdc79e1074dae8ac1232ca32", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "e9780fbc28e70bb37521bdc544039e6d0ea21f0e", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "cdf23f284069eef2195519e94a15509ad3819c97", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "dd04b900019af0043d0e550f865856313dced71a", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "5f131c619605fc5d37267e2761fae0fc52cc6b77", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "ee07fabd3be87648f24b47047af1043f3bafbf4d", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "2f6f0e422e7dfc47e4202ca1ff6a83e6f4f35d76", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "209c9e52d5d04c140b63ff5dd36eaf5876592e44", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-circular-buffer.json b/externals/vcpkg/versions/b-/boost-circular-buffer.json new file mode 100755 index 000000000..d3e0c260f --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-circular-buffer.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "c8a97f3e2854ffb2064635bada5cfac2230a7590", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "239a4eff939919bbabf11914dbb656992e4e26ae", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "6352fb4c9b9e30001311015e28e712e9a2ef4a33", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "bcf85566e4489a3d73496650c2ae9481ff3640ef", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "b3714023e5d74d66c24ef7aad21acf08146cb200", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "a363ba35a54953007e71a9b5a8b9502937e3463c", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "9be9ea26e4b2143aab087a9bc6e8bf0b74dd387a", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "9118debfb3c75cec047c3d368ecb8f2aaae951b1", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "2da9399e3379be6168fec2f9a61b004fa27df964", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "01bdf72e07636610711a54286a413ee2432229fa", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "499ddf8c7e0952be418544105ce9da94b903b911", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "fd3e46ccab176fc064bd3fcd3f6c2d95534d2a14", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "13e1e09d210b64f4270ea6f7d688f3ac97174a3c", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "3ffb910efc83c838b16090423e689b40aa3886e7", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-compatibility.json b/externals/vcpkg/versions/b-/boost-compatibility.json new file mode 100755 index 000000000..3c8e01383 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-compatibility.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "bddfe133f937df01c2a18b9fcbd078538c195715", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "ee3bf146536f03c976c00fa704664f0576241f15", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "b2b4f365d9ee62baf2f0197bad774a679cb7449e", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "06fb2597b509bc3d29528cb737c46db0ee09ecdc", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "cda5675366367789659c59aca65fc57d03c51deb", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "a7812edda8e2159ecd422f18eaad6d2f0cb30346", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "59f8965026f47cd2849c90088405b3eee08d6c82", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "9893ff3c554575bc712df4108a949e07b269f401", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "85c3b6d7f9c6ca662146e9800193a6424d8db9da", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "3645b2c8207a79ab1af3336fadf9ce60f26fac82", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "f21f62a1fb65e9761135d8816c820b31df3440ac", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "141c26d5ffa0ed3890f6c042dc47c33a7c65e564", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "5b7956d33159d2758ac93a3a57f57369ce8c45ca", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "dceaba2b169f994a4e99111c9d116c94c6fcbdbc", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-compute.json b/externals/vcpkg/versions/b-/boost-compute.json new file mode 100755 index 000000000..7f0f081ea --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-compute.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "d4c84dc32e2d683a910deafe8df7631c36ee8195", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "02e813bc50d95bc901ba994faff7658f1ee5664b", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "3e134e562b5a454a46bf922f7633cdf581db7795", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "805aad1fd978317024fd94885e2cfde0b90af4ef", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "37841dcc219f46d503d6c8d6710e759583403020", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "0238cc1bd703254e03ae7cc4a608e230b140a21d", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "a7f516597efbc2b0c69635eb07408320c709af3b", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "227af17d6242c305d1294bb57bd9998ec95c337c", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "6ec5b08fcdf83cb6dfae75a0309016ede6ce59d9", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "1a6d79a0666aac975d793b3f582e785e6c06f644", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "088f8118eebaa586edbd1b4be581abc230c1e4cd", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "8ca65a85a685d12959ee8f5d79d08c4ab98df2b3", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "e8e6e437212bce0e2950e4281b5131386b410b51", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "9ebfe4d0db5bbc56a1668a4f43f70cedb1f2e0d5", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-concept-check.json b/externals/vcpkg/versions/b-/boost-concept-check.json new file mode 100755 index 000000000..7b5417e83 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-concept-check.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "493a1b5ae991a9c7b2643e649329de16bcd0fa48", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "d92ec4f75e3ca2046f7cc6bd42e394aa642dea7b", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "9bdfb3a9b14b35dc1833bc559226c7925096ff57", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "b6c3818b3fbea8e53859becf5f7a80ab8e583a85", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "5dc46166c76c1f47d2d6dd9ee3e2f5287b81fff0", + "version-string": "1.75.0", + "port-version": 2 + }, + { + "git-tree": "ee8e9890d2909b5afc0ade5315cb3d4f49164539", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "d3dcbf8caf23130b9b3bdbe0f896d4db4b87e362", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "1e2aa4a271954658330692be62864abcb2758583", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "ec5b225fdc18752612792c659575b7763ac5e716", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "f126ad738a7460d171920e15862378e158e678d8", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "a06d7260df33a445dc2aaed9416d40f9dc462edb", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "15721dd0909c768e8acaf2528a159c1722d003c9", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "a6d304fff5328aa1004287e42d9c43d49e8b3eb8", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "a2c0de8c906bc109a708cc104a62380a0c223e67", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "92a22ed3ecbd98835e2bcc347c4f667160a91f38", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "3757144b365ffba55472095f5003e6f2e454ba04", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-config.json b/externals/vcpkg/versions/b-/boost-config.json new file mode 100755 index 000000000..ad043d794 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-config.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "22c6532dcc9c24fd85febb93dc936e68c031043a", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "b4958f142255c3aa14f1f39d04edcc12b6262745", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "0f7b70c02bfb43bbdc8f62bd49c8a5339a65f48c", + "version": "1.77.0", + "port-version": 2 + }, + { + "git-tree": "6aa6932068c1fbc812d545502f60c3a7cef80dde", + "version": "1.77.0", + "port-version": 1 + }, + { + "git-tree": "2a93a4c962b961f617c133389c18a994e3c27af1", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "a840275c02416548a8fa29b9d6170cb0a6e14680", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "ca82ca1b9c1739c91f3cf42c68cee56c896ae6bd", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "99ed244677f790e4e37c64183e4eb9de6055bce2", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "ad92a28f8a25946b7d3e191c3511b4f62aed9757", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "de2784767046b06ec31eb718f10df512e51f2aad", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "ad065cce471a1f0d58615ab98efecb7e2f974a6e", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "a359a48043ba5944aed3790039e544ff3241b53a", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "816f2e56828ccef2f277d252f74ed8c143628fe2", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "b63b19278c67a2cc752ff990108a758ebc050c03", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "b0eb4dc6b84e5494cf53e9b27cdfe5e5eec83c9d", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "d186301b89d1c3f59fbdb76c3c994475763c9bbe", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-container-hash.json b/externals/vcpkg/versions/b-/boost-container-hash.json new file mode 100755 index 000000000..77aea1a85 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-container-hash.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "09168c62619e569c7b6b2799aa39c361a1afff22", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "5c9a0efa908886517e39510cffaebe78df8bac17", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "76c8d3c46db10b6774d6986822e53d1140934667", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "b8f8aa1976367c2a674b1a8a91ec5e2ceee25a4c", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "bf472c23d29c3d80b562c43471eb92cea998f372", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "4d149c5e8ef36c49a6d1c46484f18747e3481e5d", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "c512f39250ff698934ae86f9a90f0c9d359dcb0f", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "cc19fb0154bbef188f309f49b2664ec7623b96b6", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "80e815f112ae43a6ea30b46aead116deb7f883bc", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "62baa61f7cbd880c109e3e0358062640c9d924a7", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "eb44887e0770904ffb1d833ab5906cf35ff61e46", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "223b957e4989a0c5ae06c224c2451f01e8947995", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "423887180c685c5ef8c33e487b4b4bd29db2ba5a", + "version-string": "1.67.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-container.json b/externals/vcpkg/versions/b-/boost-container.json new file mode 100755 index 000000000..74fd3ce16 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-container.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "c29fd09bc12ad31bd796ba90682fcbd242090cc0", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "cba0ae7cefffcca3cc1a0aec45ec07a66f6cc413", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "9af11f40e9b9fc2ebdda7e8885f9f49dea1923d7", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "d24b325327cadb5031964d839a0c89ca482d87ad", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "5d351bf7c795d3dd8437d2beed167bd3cd66e10b", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "60816c8a5eebe510557d8f78f3a1686fadfdb783", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "afb906ffc02b952298fbcab8dbd1517d355360d8", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "f4fe476cf131a0f6a9bb54e037ad660b27727fdb", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "07e488dac7c585c61c0ce206b432e0d62774947f", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "8e06814d564f94fd27d36dd7a41e9da1f43f6fd1", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "63b0e947562a8bb6480e5a64ca046dc3d9c03c46", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "a8d170b330aab8af2d8e11d12eba27c2f9a48de9", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "722fcbbbb26c4879575ffa9574f1546d4e58d574", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "089a0a64d6cd34bbbff00a9cdb4b5a4b8e809b34", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "5693c508bbd09e12e34690c9c1b58c4b8a33a712", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-context.json b/externals/vcpkg/versions/b-/boost-context.json new file mode 100755 index 000000000..d809accb8 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-context.json @@ -0,0 +1,114 @@ +{ + "versions": [ + { + "git-tree": "7abfa63f40d05e79743c416050ed97f8351d3c37", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "c279fc4862dbbc9b4c685d16d1abee7200f9dff4", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "ec8ceb582e4ef9936ceb840c70b90dfb20703f1d", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "42c1043410aaf53351ccaf5c7ee6ae133f78a5db", + "version": "1.76.0", + "port-version": 1 + }, + { + "git-tree": "7543f135833a2b698617f25a5206dd4194fe01bb", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "73ede4d1c06f12b1162f39e0b03935cc429c763a", + "version-string": "1.75.0", + "port-version": 4 + }, + { + "git-tree": "7545171af99470b6486fdb0bc42a0d9fd93d0f6e", + "version-string": "1.75.0", + "port-version": 3 + }, + { + "git-tree": "fbf3476b81167645a5f053adfdb7f2bf9a4f4c44", + "version-string": "1.75.0", + "port-version": 2 + }, + { + "git-tree": "7f3c7f2174e6d43195a6468272d27bf68b12b56b", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "a122c48db7645becfa084e9af1e57035870cb806", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "af0196e51d5f5d1ef93d4e80d32281346ebd9486", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "0bb5b708ce7dfe28c141d051c2e95a0ee0908500", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "f64b1a3bd6d01b98c377c7aa33b749ca785750e3", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "65f0f8ca8b7bcce52255ad5b9c40629cd15c214c", + "version-string": "1.73.0-1", + "port-version": 0 + }, + { + "git-tree": "8828cd95f58f6cd77f1d389bb16422eaa0c06d00", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "47b45566fae242e6e6ae356fb85c2aea3b328b9d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "c10b94df8b7cb18b1692232ac669b6263b706d05", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "030837836d3170f22c85fa87a62ddbbcc8ecdfa6", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "27000a889b7661deb010f7851614fa65f2506a11", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "cd28cfcd0fa89b578f26a3ff7b6b10ba03890496", + "version-string": "1.68.0-1", + "port-version": 0 + }, + { + "git-tree": "0e06db2527185618d1afadedc5dfaa700398ce9a", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "908f28b05f28a43846f6cc85ec52a541aeb34c0e", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-contract.json b/externals/vcpkg/versions/b-/boost-contract.json new file mode 100755 index 000000000..e39983cd7 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-contract.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "a07f53ab73b8b844f20b487aa039e4e019538d47", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "9fb4b8408822e7921fe3d07ba66184df6b5f16a6", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "c8249694c8d2dfd942dbb733f138997d00ce89c7", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "6b8c36f8582d262cc3c02dc91e98309dd53b5a4b", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "caa424eb6255cef5c6b00c3d9f1b7b38c9b84b60", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "474446bf2ddf3627c5643aa36ed0c79c24f4e41c", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "7311f523ed4ddb327e88e2fd1dfc1f825bd690d3", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "3b1fa988e66a65e1c9d37026bdaa7bb1ab4d7c44", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "2782814a6ae7266bdc2f7aaff6ece447936c70b1", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "e97d18765b0debe3c54dd8a0c654f310e765fcdb", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "996827a7079785e48e640dccc8a69235fdf9c7eb", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "9831393df2e49ba23c48f4b0e2c364762a5830ca", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "a36b572dc05ab05cb2c87dbbc0a181a8aa965388", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "ee7da253a1c28773377f8d6f5dbcb62aeb6e6245", + "version-string": "1.67.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-conversion.json b/externals/vcpkg/versions/b-/boost-conversion.json new file mode 100755 index 000000000..0322dfdef --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-conversion.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "1e3552c53e2ef9bcfa7159f2f06079c30dfa53ac", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "ed01d578d9964b2be3619cd7e96c6f65dc206275", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "5b591e95244353857eaade53621ee895b1d9e0a6", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "a18dc435cbe0aa35d32830fbe85d7d5ab0b71bf0", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "9f366dd9e7f48c0cbf16725eff9b035ed7ff2d5a", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "66b5da5909c47b08b613f4127e57ae02b24fade3", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "b3e08f49a7e98928320d01c83aa0afe70c4ac097", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "04071d9a4d95bd41b129fc77a82db879c14a4565", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "c5d196892907020325d3fe182741f7142f55492a", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "33c1b5bc2477ecc988409886f4b4219c8140e8e7", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "3d5362892a857c662e0577a9a91306256f4c6a66", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "3ac54f232d78b29fce3136b3246f5fae91308c82", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "fb445fbd03211098a4cb83fc73314b48a36eea94", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "21c88774f349b8488300e4401b32af9b862b19b5", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-convert.json b/externals/vcpkg/versions/b-/boost-convert.json new file mode 100755 index 000000000..d86c9644b --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-convert.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "3a6958bd02a806df5b7840c7a62908ca3d5316fe", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "d1315f49ac5c357e8a427c97dee2faa3655c70f3", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "8f01a746807fe131cfd83962df7faebd340eaef4", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "d13b694428c83a3f00302d0a4af2d2c457f13f05", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "5c71e3bd86d4e105b3ec7722e5f1468a50ad6fb5", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "e9718131f316ac62c69625a622edb137e5cb08e1", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "2d34564e7ffc30c228ed76ec431c9ef5c57aa2c5", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "1258127122b16003d158013e449bae53d533125b", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "1a6118a3d7d617f4d57e4b0149941379d2945b25", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "45101530f7940894661beb6535fd71edd1ee0952", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "cc0c7f9939dd63ce4a3ff7e5bd3cb88a9c762fc6", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "487282494d4163c805396b4ee8a1325e43652683", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "86cdcb365cebffb4644146e80f1d5c4b5741773e", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "5185fb4fb22d45199972a3bb84a4783f3e36d4a9", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-core.json b/externals/vcpkg/versions/b-/boost-core.json new file mode 100755 index 000000000..8819732c0 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-core.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "a22eddd8a3121063f8ef94eb4e0ae64021d0369a", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "b6d811257b985253c87570f25a75957689b2b895", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "a56c8546828ee16a442a336c2385f9986f8c055f", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "f72d1f923bbbf99709e9cbaf54f36b7c2d22d169", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "20a19f6ece37686a02eed33e1f58add8b7a2582a", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "febbc9ecc144ae2979ca1f6f12e9a3dbc7d6bd71", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "6a34d4c2d4f52d0355e96f63788336b6e2985960", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "0eb5e20df9e267e9eca325be946f52ceb8a60229", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "df3a5235a6aa7bd9a9cf93d88fc57d21d76141f2", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "624bf52f04427877bc51d0b152b26b64785f194a", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "ad905b649a559d1e4ead3c5063486beb22714025", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "bda4dd64a723ddb2abb6bc88881c1912666ab199", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "2e00c990421c0ab8f0cf2f3777d1b44e12f8564a", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "8853b6979ac57905ae7a8b813e01af76389f4a9b", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-coroutine.json b/externals/vcpkg/versions/b-/boost-coroutine.json new file mode 100755 index 000000000..69ac9a292 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-coroutine.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "b953ff17be4b4da2bb6b898c80b12c4185b3a821", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "d462e16750c6769375391d1e1c084999000cb324", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "a5afb95d36e4f0baa263193b00e9a1abc1f01454", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "55c94396b67927007f75ce08b2acc2b9adc908e5", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "cb03de5030c0a5c3b49eff0acb5b363156c458ba", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "126ca8af94215f8d49d6b5a16515661e2999d9d1", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "9b1f17ff8a5e815baa0a2a658482b6ac896359d1", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "6e6253709103fdabf9f4acbed55a8f864b5b6b00", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "e5cd536d31b9ee1a14f045004f0f2cad79071466", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "9291b90b9ce474e770f17ab00924d220f264a22d", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "c95c3f32e1816dac4238d4c53e7d7af2c41ca2c1", + "version-string": "1.72.0-1", + "port-version": 0 + }, + { + "git-tree": "30401a95f0b6800826044293c1c8d38fbd582785", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "a9fe9978917d449996dc99579cb2f673af30ba1b", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "d5b684f5ac2b1ced1ee77bdc7cecc50991684944", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "804d6a6db063c5518a0c78a8143d88c5a255e6bd", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "4ea290b7fd5acbd612cdc5af2586b246e1f5a8cf", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "bec17bb5e38a7e4f2daa7a061ecea27e3230c979", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "ded2b7dc5b938872e89abc8fdf7912bf10f63371", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-coroutine2.json b/externals/vcpkg/versions/b-/boost-coroutine2.json new file mode 100755 index 000000000..712571fc9 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-coroutine2.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "8f8442e8490a2ad005762566a768ca944e754466", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "d035a00380a7bcddb6c22f69c4743af4f2122a38", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "a8142422dd258f6a24df4ef3caf54b1d48096d8e", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "4fe20c2b3573e82f0db30917b005310bc8697f88", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "2123dd1b276ae094358dc982c1f37661d0f38e04", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "b32ddd8c4ca99ef8f6ed36778ea751c2ec181afe", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "442c89b92083fb299e4d37381603bcb74f6d938b", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "c0f56893f5de8240d29e783b9c1fa3aab080d7c8", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "ef07a674c5cdf3cad2ce59029926647583880d36", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "63ed92a52a85b89ba5d330742082a9dba141d747", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "b3fa7b90febc911b1e21d40305e7320cceaeb8d0", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "3b91221c1df7cf522f69d0f30d2eba485ec6d6f7", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "e18d338410491b506f3dbdc85afd728814f3dce3", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "5dfef177c84e649b0c3f4116082c8439226990ef", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "c16fbfadc5c9d831fa9ab73d454ca3c676564719", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-crc.json b/externals/vcpkg/versions/b-/boost-crc.json new file mode 100755 index 000000000..b7f476b27 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-crc.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "5fd0f57c0b02c713c53ca56f341b904557fd257a", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "c1772d15f5d08e1f5e3a263c30869aef88a76085", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "bab49b15015caaf455e6b304a613fccacd501ada", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "a9fb53c9bd706bc62d747a6e19e7d0639da9805d", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "d85306a89ba8e94f3f9ce92dcff832b54b6fe36c", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "50b395ef5adb04b0397a627028d6cc2028d15bd6", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "61bb53d33cdc7c34aeed89ef14342ecca82e3d47", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "f89e4bc8b2678164d9b8c65e85b48207a1278950", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "8291d140c0c7246d2c87e50c399b4f199e168316", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "cc3c9d417bd42e313c3a1587473aab72fe850a4f", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "6c9e2e515b0b58e6bab880b79fda45685f8abdd1", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "ae021327b2c9570b0eeb2b6959fd8b7a8a1c25f1", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "50dad24d2cfab57b98d84423653eeeb815432a7d", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "c923a756b3fea47bf16feb78d6974b29686fe55b", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-date-time.json b/externals/vcpkg/versions/b-/boost-date-time.json new file mode 100755 index 000000000..96489a2e0 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-date-time.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "bc3460f55739fad6ef0e548bc084bade32985683", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "76bf565e940322a7d3110edf1b18fb4bfd8a1ab0", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "e2ca710f2484af3cbeee428e063a7e4269510110", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "47a2624a239c59fd89846f7b24fc3b108b31e82b", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "7aa83d25af20b0a43ab00bc3e00a16ab41bd45d4", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "29999306731019b2e72d13fc47bf6567e38333af", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "e4e3b8362f29d3b7d2894f6fd3258afddab13341", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "84a294c7e2a2a3e46743be55e4603f25f8956bc1", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "5a9df8f71083ba3a05f5b7442ea07f4c1d3a4124", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "c10342e378322762f8b73e4ed27f43e25f684e83", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "68b4aa76f870d0c3bfa8c7ebe16456cc06508046", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "5ad830d20f20cbd2faf32a7553895533d8a2752a", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "6fdedcf8d44b32794a89049690ac3ee955d3c630", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "f1057443f9c812bb611ae7edb406eb622a8d7330", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "b0cc6dae48fd9a6708bf1185afa10d0f195685e7", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-describe.json b/externals/vcpkg/versions/b-/boost-describe.json new file mode 100755 index 000000000..8d694a95c --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-describe.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "f79ac02e597506f15b55a0445e9a36ed6cb22632", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "e08134869cca3b2d75247c226637b24438c489c2", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "399140a565739230fd9b805f047013bf42a2a0b6", + "version": "1.77.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-detail.json b/externals/vcpkg/versions/b-/boost-detail.json new file mode 100755 index 000000000..e57e4836f --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-detail.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "65c1cfff48ea4ead86b7db6d20401fbfef4e1022", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "61c65e46d0bf619e44cf343d734dda6987f53005", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "57dabb22a4f9dfe872c6f007c9dbae7bf0847514", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "69e27a71e0cacff0f2a9b005f03bc6262fe97210", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "96744251f025f9b3c856a275dfc338031876777b", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "2bca20aa3e58b25201b4aaf6810561bd76365f1b", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "47a79afeb2fc8d5fb00d10073dce46c923823efe", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "759d7c6a3f9dbaed0b0c69fa0bb764f7606bb02d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "2790c82d26230c810da18669b6e929941e7ce5c6", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "b41ba2031492395461d03e97433cbf3b13bec953", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "06da489280ed6a323980b59c0c49f1c85a6a5bdf", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "07211d7e325131bc29336dac80f291458d0bc132", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "acd9c6be4af0cddba229aed6c8134978547dc59a", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "8a3e36c4a7097a45d67771c367b6f50549d64075", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-di.json b/externals/vcpkg/versions/b-/boost-di.json new file mode 100755 index 000000000..b79ed6078 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-di.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "b3427bb52844782f7d8b88b69669ba692313c077", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "7338a2a451a002e881b0cf63801f2b7ec844d54c", + "version-string": "1.1.0-1", + "port-version": 0 + }, + { + "git-tree": "b98731cbbfb5b39389c2b7be699a376c3251b3eb", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "f301f252cc349020a23efc0486474717e2786a5f", + "version-string": "1.0.2", + "port-version": 0 + }, + { + "git-tree": "d830a19a60a66b024e64ac9a6a2e77844f93cd63", + "version-string": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-dll.json b/externals/vcpkg/versions/b-/boost-dll.json new file mode 100755 index 000000000..d626078ac --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-dll.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "0243143e2c2bea8e3579aadfc735b56c40ad5491", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "1afc8f9b224cf9a2a1846073dffd93defdb46028", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "7ca0cf6c2a9f41257ad68442240ff7ad21b7e662", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "b04bd18cc23d270ccaf152f5d28d5948ca69a664", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "d3a8b7568bf78bb6d894cfbf857dee96be2298b9", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "a0d6a2f3d8ea63f49d7e7618c2ad18ef59b7b0ed", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "b706fb2b46338fac7c6a4255d214ca5f0d261ac0", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "efff54bc7f260460aa910019bb0ad49a2386f87d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "6e63a3fb079ead7b7c24860ad5e64e482d26143e", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "48189f9beb70791f4382909d1fa4cc191ccaadb1", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "814bd1b232bc05b52be7f62fea9e02203b18d43c", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "e63b540184662dceeac1081470a7e383123c627c", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "a53f6d4aef0385a0bc46f95eca19213198b15596", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "e2e034371dd0fdf7ea2e1cb528953a6729124c63", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-dynamic-bitset.json b/externals/vcpkg/versions/b-/boost-dynamic-bitset.json new file mode 100755 index 000000000..36aaeae20 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-dynamic-bitset.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "e2ea8d91791c627d016c69aa73d36d3622ba0df0", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "e137dc4091824493eec9e6f9734caa71eb069874", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "e5b7742c115d4e4a450062e30b1542c6fe4aac5d", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "f0d3d3b2abd89405fba3564e8db5e05a02fb2902", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "8616ee67880d16f75306371c1c1be70f8df9a189", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "5015e482cdc4c54bb956a55234f350ef6486ee1f", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "1e7759bdf94d7a8e84fa0134785b97aaa7049e47", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "cb1f097248b36c762bdedd41853b4326c22c6e63", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "388724ed7265f2ade6b67994170b8b5e5ca1d121", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "851d8117f7b6fc18ceca2e5db852ab7ee169ca9b", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "bf0d0962bf606aaa77d04dbe20cdc217139f57ce", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "ffdb9fa38a636ff48d966e49f89a06720fd48a53", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "1e2345f78a76afa6065d6e69800591bd77b9683d", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "287fd7e578962c23f7f985b5082c2f4e883d199e", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-endian.json b/externals/vcpkg/versions/b-/boost-endian.json new file mode 100755 index 000000000..967e0193c --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-endian.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "24a5162a544f251df6387a1d5bb70ba53497e4c3", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "87ed62b8b7fba9caadc1ffff99abede02e0598f2", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "6950c45ffb4e112920b6dd50c1cddde07b30d61d", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "c191f1b591ce4455f933fa254ca32dfa5796058d", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "4c89bc4f6b5208fc931ba4d79223ad085bb4490a", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "ea0817d7159425bfe788f061fff16f2d3578830d", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "102cb68b3f9744ff57490a392a36c672bd97adef", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "302003887252323941427dad2d6a52c92734127a", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "33317a6c2cefbc8521d907ed3fed5c61deb31bf4", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "d5c99ffa97be4dd9a39da0604c97b488b68e905c", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "67a20e4d444983e690848e0eba57109bed6980b3", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "afacab87270354cf200bd65782837dd50aae9df7", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "4646441284b7d5b06eefff8eb6662632aadd5dfc", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "2994f980aee9647b8a058547a77fccce42ecdf8e", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-exception.json b/externals/vcpkg/versions/b-/boost-exception.json new file mode 100755 index 000000000..b7ea3a572 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-exception.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "6d7250e9806392fc38643fb7c069ba18fcec2350", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "02b0e67c7d9b5e26b1bccef1fba3152fe7ead595", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "d60d712de012657effc2314a5d8781e453097129", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "aa0a09700d91a3cd3bf1fbf6b8463e20ede77053", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "913ecf461f245ac3467948fdddf49ce4b6f1b6ff", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "04e69dc9dad0ee8db88c11ba295e9a0773f69d02", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "139a608c9d4f1303c1ed2dac7aa80e1be3b38036", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "bfe897dca198b5ec6f1c2dba50c66d16d6fb99c0", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "d1918862a01b74450e541c2b1d861f90014fe5ac", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "00f07fe3e7870a993e5ff4a9dde11249ffea64d5", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "3b2956424061bfdd46071c919b275cb2ffa60235", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "7e3fc9cb5a946a66cd574ffa8c57aa0c3f1da7f9", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "4ec2493359849291141a5d0c0103da8d074dd439", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "675af2e15fdfc3e8c5598ce8dad0c3563ab8755b", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "6924b2fcde9add57c375625b67463b5ed18b2983", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-fiber.json b/externals/vcpkg/versions/b-/boost-fiber.json new file mode 100755 index 000000000..8d4b03342 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-fiber.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "14418cb69ecedbf80d7fe87779fc7028db31eefc", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "7a37b52940402701703a4b91f1360b414f6afe02", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "c6fb978600b4d0ec5e62111f587f537d475c95a2", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "e9b109cf5a3f708a5036ddeee8b58676357b3db9", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "5bc8081de24231b39f115cbc347055f2d71c151d", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "3d9ca70a2ae4a6f786c4d5445515223a7b80fa8f", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "5a2169080179250fc26699c07550823b2aee3e7e", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "237ddc05dbdfa5b720aa182db405a675f04885c3", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "ca54371f7f25200c0fa8599dd824d71b031d395e", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "8f84ffcf36fad1e1a20e0af5b120cfe33c29a024", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "7ef6a2a6c507ff4ec590e67387b87d291db3bd3a", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "cceec09d81ac13fa1f5c13b971e1414c2759f20e", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "eb3157d1bcc16e4c7b4a7f14af966e4ca5c9728d", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "ee0868e08823fe6f5f18cfab31679ab553eaac7a", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "897a915396cea87f5a1e8ac6ec27d08830ff114c", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "07d5f146d4fafb9a8aa058db08627591f22abe7c", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "55635f1187b4d697e843362d5fc663b41493c924", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-filesystem.json b/externals/vcpkg/versions/b-/boost-filesystem.json new file mode 100755 index 000000000..740eb6d02 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-filesystem.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "3ad60cdb4b5114cda754f4b15d96d72c9615b271", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "f7f7b3bf671f25f6234f81de59fb5dc169ea2480", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "7665f5ed27513a334df5b6051cb72d076ce626c2", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "9265c46ce355c8470fa5bf8941b59dd27428d92e", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "58be75cc63e0e3e34cf5e38841e7a9b397ff6c0f", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "66643e83f9815f81f671e25440c5383d29549d9b", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "106d3d34b44ee36cc05c1727672aa0a45725ef0c", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "ca3f2d17408aa615e034544f2a24785641cb663d", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "e87591dcc23aed3bc2caa4f1046c4d5fbb149fb9", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "e09ec730d3dba40cc5b630d167101957a8b67abb", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "38d6bacf07012380da449ffb63b593a368d2b729", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "08b8b5ce3fbb1b65efb653d99781b6da0e8f5f17", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "f1e6c65197a406f933de4782022da1c41c0bb34d", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "092c1cdd85ca06ab6f7186c17fa7b42df2ab9b4d", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "e1183fa10857302770a8c9f3fdc7c318e36c6f11", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "997a4ad70418a006592b6e5d58cab7dfeccaf59a", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-flyweight.json b/externals/vcpkg/versions/b-/boost-flyweight.json new file mode 100755 index 000000000..1779fc7fd --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-flyweight.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "f6e8af8c3f7450a4e32ca807cabfb4197ac7a0a7", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "899fef7cf017fd090f2e96146a425e7376320a4e", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "3c927df2056a6603e5bdc20673e22692183fd92e", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "476c374b6a92402048db19b98376eff8b3e05782", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "dee29c76a897b9430f109238464d04d1a892b2c5", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "6044a7be847a36194d81063786b4507a70cd1e4b", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "cd81f59b277a62d38eed5731c9da51beefeb130d", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "1a519d39adb4c4c63b5aa3879c36413e857184bc", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "c33aa459d8b97420dc9be69ccb8d11336bddc6e4", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "c4ff1c6f35c3042b4d50371d87a1db49f58d5653", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "79a184485a38c73314f74ea17c4bef96073d31f3", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "d2ed0186cefb9f4be75f2daf2de174acc35dacf5", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "67fb51dffb1810d70b63c8a9d2707725a9acc52e", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "9c1cd737e76c18a8c5520a2b8052e104d98c93d3", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-foreach.json b/externals/vcpkg/versions/b-/boost-foreach.json new file mode 100755 index 000000000..76f32980d --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-foreach.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "e8948df8fb3d54f6bcca0c5fee45f13406683a3e", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "468a08373a9339026a955a01faf3a4bc6fe0ab11", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "95983cd3eb11558e24d1f63a68a2ee944da927df", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "0e0fdd6589d7f0f04406efec82efcec315fa337e", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "0858efd566bcda59a52b99a57203ef4d6fbfe1cf", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "40f12c44a787b514d99916450bed7738e1e63123", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "0a5b1cff9bbd97ef5e92e3397920e7caa4a0d790", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "e8d052231eac42bd0153bc8059d76bd5874e7ea2", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "791411a9de3197391afc34f4b353a56528d10375", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "cd8015ee0f7717458b6f8121691b23686ba46c95", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "04912cd07fcedb968946ef4d962450e8f9beee10", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "5e5b9f79c5342c8797ee86ab76fc37ad371aaf8f", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "dec25f531846c69f3b7bc34d5e16b1132ce24258", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "0fef6dfbbbc26838cdf1aeabc610c61512f62e7a", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-format.json b/externals/vcpkg/versions/b-/boost-format.json new file mode 100755 index 000000000..a75b11699 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-format.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "365fbda5a5fe624367c049e4c118945c0142d0eb", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "691157617974f33e41ef5ea7954d590a8f12be5a", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "15c6449aa221b65139b38cc6c6ef91f32e2d2b1d", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "352c9212fd097f4c147caf0dab9cec05cd47aa1a", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "9ebb4d57edeea6e294e0974f2fa68c61267d7c1e", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "f93be0e11dda65c103fb5a4d99b3e65f0d6522ed", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "37bafd2bb1f1e060f0d421b648c429cf0b5275ae", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "5bc5e5887e15c4ced41fc6e8b09f0ba442329f19", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "4cd07c6e6703126828b64e56a438df4363a2ee5f", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "f1807fb9234c76e92581c398a7d121a6cb89a690", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "b68dae1fed40b36124e501db6099ea299fb503b4", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "ee7856020e6b25f23b01bcdc8e1c46bf69801022", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "6b94368f580fe9996c4d699407c3c2863bb1dc8f", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "82f8512970c22ae2885847bb20a05bd3746eee89", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-function-types.json b/externals/vcpkg/versions/b-/boost-function-types.json new file mode 100755 index 000000000..0723ae037 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-function-types.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "53ad331d5cdedab7b40eebaf15d9f8081a5d9eed", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "94d4dd365c29ad1be2d148f3c4cf7857e3ac1edd", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "7675770af935fb375c0350c7a5fc561f9bc31432", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "2f33a85bf7a578c9659b4bccd02296568bae3f3e", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "a6cb5686b38457ecccc96480f5268772bef6a6fb", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "a2369833ecdf43bd825f433945510a992bcee989", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "b8fd587279015c05c6990368748f9ceb304fb340", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "fd186cb2044ad241c97ebabc408ee175544eb77c", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "b44865bd6514b29584593eeaf3e6f3a80c6d3096", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "979a82f02c522a90a1f6c066f35bfb5ae8c11f9d", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "8c4bbd7925148804606aaf8de66798413cdd7158", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "152d2f99a1363de1047f68a6afea5b54ef301dba", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "57c3a113c76954f29e4fb417e2d3cd72b6fd06bc", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "9e63e3ed8a4668b89e9fe12fcb6a1aa5fa3c3f52", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-function.json b/externals/vcpkg/versions/b-/boost-function.json new file mode 100755 index 000000000..6dc73d295 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-function.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "7057b960d6b790eb30f51ef17d67aa958230e100", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "74d9b1e1e9951fe6f6f4eeccddf8c83ff1280462", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "092af2f7e20c516fc02e8a39d8887f2301bb1fd9", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "ad37e24486926b336f2ee015a3fa88cc8f8a2490", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "7698d7fd2822972ca04cfe1c9778c9f04fb56c3e", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "2587658b7f554ae2f511f5b6f60eacd7ef9445ae", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "7909b7580775de1415ab8dc39c5e2f0129a40492", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "71548401e59f7399ff8f2c44a17e41194643ceaa", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "705467644a18ee7984ad8c2fa23e255a7922c9c0", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "b31fc6976a0dc0fd88b0d655c22ce0ba4f57b6a7", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "96accd0c39bb10476592bf1dd2c2e803bde52bbc", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "559bac35d4a461dc12a9b6b4a4eb630817d00508", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "8bb9a1e360b9c8490e3160744f4332c7b63a309b", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "3a7b27de15f0cba563fa6eb9c100bb0e870b3525", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-functional.json b/externals/vcpkg/versions/b-/boost-functional.json new file mode 100755 index 000000000..8b38d5686 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-functional.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "d8fd2c72eb4f3c8d501a44f7a5f8ecfe608cc3b4", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "5c46623f2b1557b35079a69ea27aa495f8765f26", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "26960fd1a5c5ffbb7da0d747f43a61a27d8825eb", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "e84b797bddccd2a46e818d4364f71810f687b117", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "f74e3af1a511361a97810fef8ed7aedbfff6706e", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "48a83df9fabe3740fd776de03952b9e682e8804a", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "1f3450aec1f61b162578eb248dc32a638278884b", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "b944d1bcc38c95fe8dffcc0399846f8ded9397cf", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "99d35f74a877fad4439aa38e57b5e8a18265c095", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "a6e572d32456fd108d2e0211b48c5e76ac682cdc", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "77a4b666dde24b6f8f12ed5d755be57cf4dd9c3f", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "e9986fa958e109b271e09df87fc044940ec74d85", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "35815977396813873d3f6a7f2248207e462446b7", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "66b907d1960b8eaf1c0b69755a9562de5cd034fa", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-fusion.json b/externals/vcpkg/versions/b-/boost-fusion.json new file mode 100755 index 000000000..1b80aa780 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-fusion.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "10c27fdbefb33b57367582e1a8f262db9d94d807", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "a7c7b4de2e38c3436c0781ccf4b56567b8c2ae61", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "e33ce42cfab1b757d73fc0c4ac7edacaefd0be58", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "e6168fcf7f513e57e8f01f5c0ab19f446a66cd57", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "4a2c7b6ae8f3faad83ee354e4bf9023ab9e7d1c1", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "d299aa16799fc91a5d902e54dbe12eb234756293", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "d23a350e5837b5d12bfc0d5e3a8ee54e1ab93928", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "88a7edbe3b27916036cf55fada773b206478df28", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "11cff4b1f47639b22c5f10f1069d1f774160867b", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "e0367b03a2f0cab43b3413ef6a148339c6f0a132", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "2ca42617107d772c2028db500205b9eccfc6b3fd", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "55a49ead107cedf511b40faef530f4c123991bfd", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "dc578fadd38a0e438786a3821d778aed2db48e1e", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "8c08f9779d4bf23710998c6cdb5d9e1864b2b885", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-geometry.json b/externals/vcpkg/versions/b-/boost-geometry.json new file mode 100755 index 000000000..3128d3790 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-geometry.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "f05a5d0f5a5889edecadab0ee49a1c13dfde0898", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "a4c2fd98bc285d97c11c99f5f631481fb534efc4", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "96d1b04d567acad7c4caafc869fa7daa64968aac", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "7de8c6c9ed0908a5d85b3dd739d27922fa213931", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "1d40cdf7af5bd875fe73020d7efa5e7a61ea07a1", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "aca46b177a6183db2102b947df5778cec4f8d46d", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "f038a62e72808a64a2810c97865a309e8204054c", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "f297e97e820a52a7908e4ad532995f9f6b2acc47", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "38e8e685d9940578820398cc3ec2b029b89b4188", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "3d6605392ce3986290dbdc1eb3e371deb3670e39", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "4ffbded3c5bcd8159a6d9a3710be5297545095c0", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "20633f32f9d12fd2d444038435c8ee9873af4578", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "aa0af012ee6403a3d46a63784d8fefb13be12a8f", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "51b8fa3a16c3bdd26c1e643196539f9204abb5f4", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-gil.json b/externals/vcpkg/versions/b-/boost-gil.json new file mode 100755 index 000000000..14d903f5b --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-gil.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "fe36550466af98298217643a09ab451aa6a0b4c7", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "670859cf36c60562fb5036af7d087df936234c27", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "d6607eb56e9f61771dbd6915d2e5d4b3b2976a7e", + "version": "1.77.0", + "port-version": 1 + }, + { + "git-tree": "2f4d4429e10ce2721dc48a01588fbf200c683bc5", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "4d323694c269cffa88a705e2eec5339c1dd391d3", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "1e6fa6894d7d35173abae2aab50e772fe6219340", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "3118f2bd41ee5d4090f65fd744059eccd7354624", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "2140de981a3619717847deb365b7dc0ba4671f84", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "b665b6fd4b9bf2b5feecf4ba7d3bd3c7f5f1e89d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "585a36d3b204b5436e758773cbbbdf4d4dfe5957", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "ca65b78a4395a7f4a3a61d6d7de41172586109f9", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "90ef69828e1910031fe3169e41b5727013dd6fb7", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "2cea779a516581694aee780d55ccbc194dea6eeb", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "23cf8cf124803cb76a8f43a0b2a502472cd11339", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "e9aae1786c82d6d6d8df8be38d40e4012e42fe04", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-graph-parallel.json b/externals/vcpkg/versions/b-/boost-graph-parallel.json new file mode 100755 index 000000000..44af13bca --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-graph-parallel.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "3a95f6dea34a2262e22d4b94404afad68c603a8b", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "199f9b8209f287e7e9865e07b074d618c28db410", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "779ea0573b2c460496e5014b1776f8577d9a9dac", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "e71dd1ba560f6dfcfefa262a5c6762a15b94e3d4", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "2dac60f2be18293521f7b65f6b47cd1f94760491", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "1cebec2eccaf5ecb9e5ec1ef6459c80b2bb3d73f", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "f56ff1f6929ab78ab6afbf815c3cef78712fae91", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "ad8ed8eddc955335f036a01d1d8ccab264a10172", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "7597dc5fb1dbc43093d92721de4a09bc7dc14a5b", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "4d9af1f1223b650a270d6d61d8938c007d884dd0", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "839527dc6b38fb3570b0daab610371442e4b19c1", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "dfb2ea19a4a53ca95a5218bc4ac095de731d945b", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "ae5a36dc24a75a595e82194d757a16433423adc8", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "7fd2581affcad742948de2bb613fc7b923b8ca30", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "18b2df12e0f5905ec79152d0f83008bea6085480", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-graph.json b/externals/vcpkg/versions/b-/boost-graph.json new file mode 100755 index 000000000..5716ded7b --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-graph.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "a0281e8f5b61dbeb2daf3b3634744daf9c58cdd2", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "f7b342391819ed511280f8ef46b7d52a399f2648", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "8c7974cbf961af1d5eabeb1047f2dd16e087f180", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "c14b7885fb22225d265897b942a090ee43bcc1c3", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "699b83c06257c66df62492390eacfd6b1608b9c0", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "e59a90a49c6f92b540f8350f8bad63104438245b", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "e8845637669efa4cc70ecff5f03f33f5d16e5639", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "a5c17602ca9994b15dd6f34a35fce8915a65fea7", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "09bbd8019bf0acd2a98b0b6dfd9908a2fe664e10", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "67f0220d2f05d75dea5b456a13f3c0754348a2d8", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "ee090689af149f896264707fee2e7282d18ed61e", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "bf39e1ff8f477a00e5d5972c30856db387e96c22", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "1006a7d0e775d6e21eb94d8c16e7b06e39d9059f", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "f67119b7b095731112d35e28674a0d291e080d0b", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "fa1171101310305e714c4d4a5634870017f6e892", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-hana.json b/externals/vcpkg/versions/b-/boost-hana.json new file mode 100755 index 000000000..1474f0c2e --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-hana.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "2dda9ed4c338faef5a98ec4f713b71976c4de9aa", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "3ff9854bbad812cd23a4c79b500aa8349fbed192", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "e24bae813978df09c5b5718b6c4d2aa87734ab2a", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "55d762dd0711b68ad1e494dc5d7f3e88ba6b6889", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "1e41f17ca0e3d7b6918bb37a2918cee5399c0b39", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "5d22fc6d56f826ee443d2c049cd1b95d6a625217", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "cabaca11ff778ee09070254f943ee14f2f5836c5", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "e61b2cf8453794b627f5b81c4a3143c80830ff5d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "879c77cfbac432ccc48053adf009537242963853", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "21bef5638c6446396aa9ad059de2940789ec69bf", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "0c9495415a7e68805f583b56d0bfc6b196ac7da7", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "f80e68923f39a9da7fbed22f7bd20474d3ae36fb", + "version-string": "1.68.0-1", + "port-version": 0 + }, + { + "git-tree": "fe2864e7436df466d9d5f27f446168720fe1733c", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "d28e07a525b685b88130a792cb5322d409546f68", + "version-string": "1.67.0-1", + "port-version": 0 + }, + { + "git-tree": "ca224e3cc8c3b4af823dfd7537caa949855aa1b2", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "74b076598e1212e4b4c1382f2dd19ca3a78a500a", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-heap.json b/externals/vcpkg/versions/b-/boost-heap.json new file mode 100755 index 000000000..4e3f1cd81 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-heap.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "3be349686d19ee7b297058dfa2d8177bf22cbe9b", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "76c4ec7815b1660fca1c1efd9b9c0c2f034ba4bb", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "d9947d5f31b9c87f5ce1e759e02099b1949502e4", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "7901583dc54be5f2453147da8fc772c5295f3ccd", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "b9b42d92244a3cbc265a562cee71f792997fe5a9", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "3608fa1571c2213d0c7b9f32044aee7cffed3450", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "2904e44a1748a001cea78dd70146d2cb0043a5ad", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "0378653343a32297617fff5aada3302e7d4d3c64", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "209843f55bed4a1592e65d86a387dea4661fd6a0", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "40435b933423f5c066010e07d869edaa7c88645c", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "f4c0c69a49a79bec20a03ef00f452f247a3a0cd9", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "4a013536278c65f1bf337ec1820a420adde6fdab", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "3ce93239361454ca14026151d4db8bd5e4707960", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "be0a9c9fba0fdaea85ad9935d71ee1c85e391df0", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-histogram.json b/externals/vcpkg/versions/b-/boost-histogram.json new file mode 100755 index 000000000..7c7683eb2 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-histogram.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "ba0d99a55988d554d24baf0ae9b8dbd39950be11", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "223b95e57f20afec67e891aa7fc884e6ac492f6f", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "09522ba204485792839f58b858ac31550e14a023", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "dcdf8ce8a1b3b6563bc1aae0ef60afaaac061f89", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "ab55551ec17e50829409f586a5a34adf5a50ae5c", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "173e5d74d7bf701a3e6f0aec3e0395d0770b5cc0", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "413c415e731b5975cd216b18c5d59a85d0f95d4e", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "dede7e3bbac394763d5bb0b32b9e1c001a46c918", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "10f29ce482381d7d61183926878c4c5a2c4bf87e", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "28a97cb5e04c8264aeaa49d65f0c211af844c964", + "version-string": "1.70.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-hof.json b/externals/vcpkg/versions/b-/boost-hof.json new file mode 100755 index 000000000..7e4a09d8a --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-hof.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "b4c1a946a0dc6f554cc76efa7ff4636ff4aabb08", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "899745af9cdd07134ebe4b4223eb749b7efa5be4", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "2c22e81e06ddd812d0328854ce7302f662fca398", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "8bc8af27f9d16f09f9c17a179abdf230d39a24eb", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "6f5fab9a08a313e03867147bf73ba966873039b7", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "2287c8486a1a80546318ecfdbcd9ff03abaae6bd", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "c2a32c161bce303306e8dd9b60c933647a362c21", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "60b5ee174c9b4f37d1a72a7f379b9af39d4cbfcb", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "ec76a42f72f5128ae7043fb80a63769039fc83f2", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "b0bc0ab3791d10eb971f3a4dff63777d5fa23978", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "38a4e85d5b67407cac8b163ad5ce2ddf5524f186", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "9bff5f69fa7b4c9e4aa252170765f591ad808272", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "e3a810f552d89e930cd23b3b78da774f064f620f", + "version-string": "1.67.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-icl.json b/externals/vcpkg/versions/b-/boost-icl.json new file mode 100755 index 000000000..5ad8440d8 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-icl.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "9ce9f45501ca2ac3a6ff4f2c42c69f1b104df70c", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "074322ef21b89c54d87c0446716221c3c20544a8", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "753c4291a6d27d5c2fc377455c83df2ee9fd569a", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "70080f8e245f5ba2caa54b447f946bee8c998ec8", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "ed49dae8b85d0e4833c06dee49367ea99083cb8b", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "67b543024af53abb0da3fddfdd3cbb261d040612", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "c824b2a02652f39e46bf42e19b9bcdf25fe606b0", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "20fa126a6b1dd3068d54f65dbbb677be4e4b8dad", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "7d038d78b6a9a2947771c83614b18470378f01a8", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "791ba36f47c6565c51e33cfd925fa02bccd54370", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "7c606c24c50c7a1f42916bebc9990ad172bf759e", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "9bdd2bc348d296f3c891a606e85e9ece3809f061", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "65e31fa324ea2a1791f45c62de1167c3d0c91a9e", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "5248d68e10b387c031529124a7d7f6e45ec1651e", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-integer.json b/externals/vcpkg/versions/b-/boost-integer.json new file mode 100755 index 000000000..cd0ee4811 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-integer.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "7970a7ba822ac5e6a8a9f98ba5ee3631b3ccff3c", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "18f2f923e2a8d4f026787eb8626def460dd2ab6a", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "375a2af7e2d5d620aa9f42064255c269b0c73f5a", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "77a69013cb4d850223122dff3bff12318a140d82", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "de70ce0d1500df1eda3496c4f98f42f5db256b4a", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "96ca1fb123e6d59d2f26b4fa2201fb71ebf86e2d", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "49614065d63f536117dc73509735f121e9fc5d85", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "173956c61a26e83b0f8b58b0baf60f06aeee637c", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "00ba8db1b3c811f4643be561ac251545e845ad7f", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "766ad7ba2aa1627ab2d1dfdcefe04ce3bcb974f2", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "359bc0161ab1806de51b0e96bee83cb22c2729c5", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "00198657d22adbd3b3be3606aad8dc3cd77f99f3", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "8860236c4936a1bd2daba10adc592278668cd771", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "51bc582666ba37ef4c04355dadfa2bfb21d26593", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-interprocess.json b/externals/vcpkg/versions/b-/boost-interprocess.json new file mode 100755 index 000000000..8f15d55a1 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-interprocess.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "274a988e2a03f43beba2efb240692e0af456e8ee", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "220049a8136b65045c04fc13aea3a259e8f4f2b0", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "6461c4f63a5c0f31efb213c9d1e3b9328b2e3dcc", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "6e0c78814b07fcfe58e421f651bda285081dcd48", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "1ad6903e562cc3464bbb35bcef49019bdfc81c5c", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "aa4515196d5e946d62d40f6c1fa48959fdf18a03", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "6fc3deeff3f8b9dbdd381cf8ea3566dc9992a439", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "32b1336d2f512c1ef7406c2a6d1de878e08a590b", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "a4bba7c47e00fd2650be458f14784f3e4a7adb0b", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "4e58829ee4fd79c42f506bb4cdfdc61da6c00386", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "d66d64cf172899e74cf93ed0a9a9c4227938cce5", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "326f127429b4ac45e614b202afed77ab876b1f14", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "f24b6f297fadcf132ceadd6c93ffbec49f3e095c", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "176f18d74fdf4c8122a3e151556fe9bdfdc93351", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-interval.json b/externals/vcpkg/versions/b-/boost-interval.json new file mode 100755 index 000000000..3ab3b2a5b --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-interval.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "f196074b225959b27fb96794ffc54db0293efa24", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "5786ba8a3bb499958bbe8ebbc58c6bb4e4c3eb91", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "e57b55cec7198cb4f448933fa2763465db0c9672", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "6c7ee56a1456d43b67e772976c40eab0f96e10e8", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "f397df607d232f6a241571ee0b105bcdac4eb6d9", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "3781783a7cd287ebedfe5fc779f5b942796ffc3c", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "482101711382bcdc093a95cc29d102a3d7f9d3bd", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "442e0015e885d6fb746f79acceee978269404fc5", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "12ad9a0049e30a20815733b2ea16cf8a6ecb5c4d", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "7e0f662d9a68b5326b41ff5146e8d9d68f07dcd5", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "8af28aa1146b7f70325abeba60b3248a25cdd806", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "ce6890a813e1eb95d73143147cdb12049496c27e", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "e719d66e35c99c9dbee5be3d7e56b1dc0f5d7b34", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "f73fe84d5d82b52afa2c9081201abf7a4d977a5e", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-intrusive.json b/externals/vcpkg/versions/b-/boost-intrusive.json new file mode 100755 index 000000000..d6038d405 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-intrusive.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "5162285659ad371e022c242481e20414c8b23e2b", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "351ad9aa5db5bf50ab87a390a69d5df1d2b41ab7", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "9fb49266dc300d8914a0485972738b960ccf4339", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "c63e249209fcddec92063bb59266892ed6bfab38", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "138cc5e30e17278c8247882027053e5e55983edb", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "0ed5eabbc8b4060255baa26ca7749c47fce0b5ac", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "198d6267ede5c74f2f8a475cb0e45e3f9a983a86", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "60b6ce48f2d00c71f858704706d8e2c6a8e3d5df", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "0cad083c85f69a8f2bb9fd6d52ba051b9580c9c1", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "2bb8d9d14fd3701b7c02d5fe262b583b677dd42c", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "f52f29e102153ffa743c86802973aed3c4bf56b4", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "ef88f9601d7de908f6d1529a1dce4e55c0920154", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "7d6083a0db55c19849b2cf09199f00ce85e7a3db", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "c23bebc1e03ebc5872dc9627af9a89494f5f85d4", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-io.json b/externals/vcpkg/versions/b-/boost-io.json new file mode 100755 index 000000000..71654790a --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-io.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "a248d3f95d95973f63b5be92c81747165ca0319c", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "33cc953c79a65bcdfdd7b55a757bf3f4ac4be4bf", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "83ec8bab1f1bbd6eb1e2883a26747c7982d5c34f", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "33d8fc8dd5a42e12f4d1cd0989c147a674d5c6f1", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "7bf3407372f8fc2a99321d24a0e952d44fe25bf3", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "f732621c8b9c2bc455d848fa08345e987fb8178e", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "406f4ccf94edf942df4c257d900dbc8cf94760b7", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "d55d1d87b52e03c69824a0bd2b09ee80218017a2", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "24ae8d54155f8f2bcc6e641ab00bd95cdcfd78f4", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "0d0e25c5ecaa73859f9262ff50695cc4b4673635", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "2eb12d8533bdec0cc5186760b6a66c151ff0916b", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "599397428a5768949f00dc40f1edc16b5a652348", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "bf8c222bd844a970fa6d7d754b61deb7661e52f3", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "a28f4caa94b41b5c6f0e23680f5813ea7db74f31", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-iostreams.json b/externals/vcpkg/versions/b-/boost-iostreams.json new file mode 100755 index 000000000..cf565007f --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-iostreams.json @@ -0,0 +1,119 @@ +{ + "versions": [ + { + "git-tree": "75821705e2df069874466bb55c4b0c4561950831", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "73e04423bfb004c75708458688afeeb8a1806ba5", + "version": "1.78.0", + "port-version": 2 + }, + { + "git-tree": "1e23d8d78c5a33ee92fc1ec70db8125db72032a2", + "version": "1.78.0", + "port-version": 1 + }, + { + "git-tree": "7e240f9d647c1142b5b61c9a635e3aa186756802", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "286c74896c6f2a6057bfbce333304f279bb38aac", + "version": "1.77.0", + "port-version": 1 + }, + { + "git-tree": "9ff4027cebb3423a41814a8c2da942ea959b17ad", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "0909e271c34f98d1e5857091ce21b16e1d165e05", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "1f0088410d7f47204c0e74c97aff4bde77c75a9c", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "2b708757922b782c079c4a77e08f8531e17eb41d", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "375ce4c4f471699c1ac0a746bfd7d0dc11f1c9f5", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "6c2e14f3af068ae9da54517afdf7da56c2f39c2b", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "7cf49ab9bccb31dbc5a861d3b5a5333fa94a86b0", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "2e5bbc43df6ada5973c4265a2462384e30d336b5", + "version-string": "1.72.0-1", + "port-version": 0 + }, + { + "git-tree": "562431746a94b0247194b705fc68746de101b11e", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "09d5568e52ea48f9a89051156b9af7667be22f7a", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "dd5ba91e8770366ac4e5be28a978ae3930ff46c7", + "version-string": "1.70.0-1", + "port-version": 0 + }, + { + "git-tree": "56dabe65865150f9e79e1615b7c5e51eb5d89746", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "16026f8896bf4136ba3f73e8841692252dec3eea", + "version-string": "1.69.0-3", + "port-version": 0 + }, + { + "git-tree": "aac37ccf7cdd00686884b912e59aa707c761a902", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "de6d34777cffe0ae6141f1cfae3e372868467972", + "version-string": "1.67.0-1", + "port-version": 0 + }, + { + "git-tree": "7a91e4c2c2392c8ae1a339ccf1c54f2851392b62", + "version-string": "1.67.1", + "port-version": 0 + }, + { + "git-tree": "11eb33dffa1196fa9a1e766316f7d61f672cc3bf", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "fc8c3ed37cd0e35242400d151907cc891e2c9275", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-iterator.json b/externals/vcpkg/versions/b-/boost-iterator.json new file mode 100755 index 000000000..5c1581846 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-iterator.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "a9b329add024642bef5338c963bdfeee41bb60df", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "474aefb2b63e5ea3e6794631eab47aa3d6921573", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "7bec2abc5b714c2bd975178406937ef59a73f29b", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "504d724993ea74e0bc0b17b4101539cd603460d5", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "9796d7066c411c9e540919d37456d79e54cdc2cc", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "7e6906049be8b43bc404dec8bff8a4e315f41d3d", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "741d285427fa1c3a6a1b2ed27b44c5c794616ed0", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "5b9275973d112488b78e500867f99ae5dd31cf5f", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "354b7979c62c509a89620a0653250a8644c93ae6", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "d50f6ab4481fd899799ef8e798360c9d6f18102c", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "b8d080ec9e23272a7730d60b83b8a5985c30e1ab", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "d07c820b6443a7100848d20e8da0ffd726e2ee42", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "8cd12f01bf776a3c1cfbcc341133007250d2675e", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "a691363dc4c9d891c1519a2622caa77e549977cb", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-json.json b/externals/vcpkg/versions/b-/boost-json.json new file mode 100755 index 000000000..c4130a2f5 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-json.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "b19f47c6cbcc65ddb2a96bf60df6b358a6e64ad1", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "e8cdadcefe4c56aadc0120b9c1a86ea6504f3cea", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "80003ce3a7bb1c08b9ac354c58085758343ca42d", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "b7a48d6f43ab6578d7f25969c0aaf0c385036c8a", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "cece09f870caaed77b754156a1f568ee05c9e653", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "e32cc65f06f648018ea098e89fad7277ddacfb36", + "version-string": "1.75.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-lambda.json b/externals/vcpkg/versions/b-/boost-lambda.json new file mode 100755 index 000000000..d94013b9b --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-lambda.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "c2eedc92baf94690429ab150e062fe42296099d5", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "ad7994962fa2139e8b2e67adbf505c555a57f3c6", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "56ca5b54a9913e884d79bfd72e13ac6d72acd71d", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "63ee28b3c29f04ba5d62bb8d0c9ab8e4b051dd1c", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "c3c314ac0cc6971f58c7dd9fc1708caaa059b7ae", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "ecd59c68772feb74919ebdf44c167cc4861d96c5", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "b84d08f24d75980f71fd3eb32cabf04abad9f910", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "a69106d4b2c7538346b30a3835bd62a02380ef80", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "416917de2911aa77376bb216144c5689ede56a4f", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "b7bca98db8904b795465f145f8b2dd97fcd52771", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "d09d4f548eac0af72de975c7a2f927387bfa7626", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "7a405bc2379ebc1b22949de2b43bc0e7880992ba", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "d6229bccd7e425ca229739ad6ff4fa24b40acda6", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "66815689094ae90c8d8783cea5f78a455779fb24", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-lambda2.json b/externals/vcpkg/versions/b-/boost-lambda2.json new file mode 100755 index 000000000..d2e9eb45e --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-lambda2.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "2ef167f48c1b762124536fd34843f247e9af8b89", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "fe85b4be83b3a88ec04a16d0704acc722502a128", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "d97e933c5109b73c577e20f53bc095224e9ca198", + "version": "1.77.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-leaf.json b/externals/vcpkg/versions/b-/boost-leaf.json new file mode 100755 index 000000000..6563855c3 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-leaf.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "87a96bf13e0afb5212772d1240dfc6accaf71b84", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "c000f663b00cfc9a2566b67ea68d6fe5050a016a", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "e257e66da57763ab4e677806d04b6d67721c09df", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "e5d414a21f12b33a083b6595ef485d21e6e4df76", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "b6f4d7fa7cc1bdf8c780bf165d4c4d1fcbb337ff", + "version-string": "1.75.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-lexical-cast.json b/externals/vcpkg/versions/b-/boost-lexical-cast.json new file mode 100755 index 000000000..553be4ad3 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-lexical-cast.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "78f269516df3662fbb3417faba5a8983936de604", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "984ca6d42fd857c08fa915edc02bfcecb02cc343", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "3a265d9296755adc81f3c02b273d758798903b0c", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "966a986af9237664ffc3b35384ccbe006b83e196", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "8f6324928977e29a23540dcd6c8c3ec74984362d", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "dc020ba4e0f6338668c6db25c0dd323e96add037", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "4c1d82abcb3f206fde75176819c75390e0a74bea", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "1ddd2ded9c58e8d5ff9ee920ca4833e9dd29bfc7", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "bc327b1b9765b577f64e69065ab7cde202b873ca", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "0d81c9256f1dcf4190d10319281d66ebd712679b", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "4a2f89ab882a10cc8cff4943c7ad83bafc8c9e82", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "f113282f97588f8685799172585764fb8c0e558e", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "5b76eb68df10019ae2018fc02e078d6490146952", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "5810ba781fbc0429e72db4fc1f821f14fb0d42db", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-local-function.json b/externals/vcpkg/versions/b-/boost-local-function.json new file mode 100755 index 000000000..d06734bab --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-local-function.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "3de1ee1d8f4c2def524ee00056e545765dada7a7", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "f0eb3b232475da3263d0c5a9b65a6cca3d63af1f", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "61818440e17f46b0715e5b53b8c49a79dc274a27", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "3e9c798dfb0bba3dd3833464354ff492e735231e", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "d7fd32b69bcf0f1037f2fa6a136b8a48622f32f6", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "40f4ad6992b177c1158927f2e1b1fca6751821a5", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "a42b2727e8318f40a3d3d0802226277c3d210fac", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "952dbc9aac25f8004587707312c967f150059fc8", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "ea6cac0311c7b808ae1a6ee80ad75c0632c8c860", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "0eefc83c76aa85e7ce0dd343a1b04b85643ef377", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "9469616148d494ddef0e4e30d76165bd9db55973", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "b104d815817322dc79ea7bb3f28deff0191c6fec", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "eecb84b10db388d3d01a395d602d988eabd3d3b5", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "a0f36f3c66485f31adcc72defb3d476333ee357c", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-locale.json b/externals/vcpkg/versions/b-/boost-locale.json new file mode 100755 index 000000000..d3fc69fc5 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-locale.json @@ -0,0 +1,109 @@ +{ + "versions": [ + { + "git-tree": "1868faea7b5a4b74f6cb0dca84ef24a7f8d708d0", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "66e57914d683e3e7c9945eeefd2010b5a08b4972", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "c391246c7c5588d89f0d3fe5425a3fb3c97d7787", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "76b51eadd7efd7d81d23c39d126a50abd1cb82e5", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "57d2fc3f09cab641387b6e152fb5df483d8944a2", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "8a188d3cd40ba95cf241deda044c44d5426185bd", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "b460ca406b34de5462897cc8bb19bf8f222f901b", + "version-string": "1.74.0", + "port-version": 3 + }, + { + "git-tree": "fdb8a069843fff9b20c1e4bbc2b9765c18d08842", + "version-string": "1.74.0", + "port-version": 1 + }, + { + "git-tree": "dd377e66f921969039e53ae54ee4188650186900", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "300b8d29fd8d5e68e656b6631508d270f0d4ee41", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "985191f2d22a7506857ac716710e33db2b049235", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "ebd4554338817615b52492b6c7b7aa082432abb9", + "version-string": "1.73.0-1", + "port-version": 0 + }, + { + "git-tree": "bb5dc584efe979dcf062e004a286f38f31aa3553", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "0600db4eec7b9dd4e766c269604631cfb5dc7085", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "887545c032faf22782e6098c2673d20901bf5db8", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "e0517cb5df86eceaa7c867e816e865231800fee9", + "version-string": "1.70.0-2", + "port-version": 0 + }, + { + "git-tree": "f1a752c1c4b3acaba4b43e3114457db78e3137a1", + "version-string": "1.69.0-1", + "port-version": 0 + }, + { + "git-tree": "17fd8111b73cc0f1671e5b95d1d2f2e226f9e820", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "37270ff9f45a849316046294682911f70abb1d7e", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "954d1f8d2ad999a38dfcbd72514d33749131b3da", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "a4950a31da1d394911e3085abd2d125dbecac95b", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-lockfree.json b/externals/vcpkg/versions/b-/boost-lockfree.json new file mode 100755 index 000000000..b2b23d10a --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-lockfree.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "bb27f3391311f8d7078563e4ce98f7706500f33e", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "8a98fed342e79efc6194594c5bdd0a6398a7bf9c", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "6760017d0cf025254b1056309a2c32407081c4bb", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "22166eccd3d3b536062ee1648d147ee357a058ed", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "b844f385ea73f91499660ae8626dc9cb01548988", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "de86b64830362319c5a39aca2b7ae8f08d2533ba", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "c3d1f223a0ccaf290b9dce486b8359abc957e95e", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "f8a35299bb83ecbbc9d0df731eac88ffcf960ded", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "7fb2ef2fb3c2f7e2b33707d58f2c6e5098a0af54", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "0e095e924353c2b2fd8fa2046a463bfa03ffd2b4", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "c444655580be5ae947db51404b92ec7ac3a6fe54", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "8017348963b18b7906834a8002b75f2e74253e2f", + "version-string": "1.68.0-1", + "port-version": 0 + }, + { + "git-tree": "1bacb7537e106c5922ff0c9043cfcbd72156dd28", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "57d0a8c5cab71e0cb3dd1db4273185a768b102a2", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "f28400094bbd31b1b6b06993aad8f6b7b3e8af1e", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-log.json b/externals/vcpkg/versions/b-/boost-log.json new file mode 100755 index 000000000..495699d83 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-log.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "311052ccd7332a0eb6d4a80af653a65fe390f7f4", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "66bcef44cd4e7f68677db041e84df77e350624be", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "6ab1ab88f37500f86b5c9b9222e50dc2c17da5c1", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "1e1221d665804faaebfc9c5b91c89a6b3f66f91d", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "87961d58edfbf7464239d5ca351243d88ae9adf7", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "dc9c81741939604af989dcb44a3f3ff0848f6ee5", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "2c0ee65be4901aa606626951acbef6594b1a7bf1", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "54db4ed7b1440aa771134416b8ae6bee7445dd6e", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "9626fc024f9f790ec9906d50b7e2bb4450471823", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "53bf278b4081cb48707cee26fa3e820d01baf860", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "e5ee85c7e909b122b49f0c9792cc40e73fa2d152", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "6cb70042bd6ae96ee6967d56e723e6bdeff52795", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "3f2647473e4b79073601769def3c968af97dead2", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "9c5d70c92638bd13c0480b3f9185d4792c672ce4", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "f404f709cba67ddd2c0c72e460ec3c5258f0f743", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "d531ab2861fa7804584411d46d0682dce268a56b", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "31204c7228854a72cf8f48b1f79e55e95f6bb2bd", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-logic.json b/externals/vcpkg/versions/b-/boost-logic.json new file mode 100755 index 000000000..bbd4f9a58 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-logic.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "438d9d7c26d42ec2a76f0f60954b7cbcb950a79c", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "f5acfea5d30532cc6dccce78e0fd159a023ccb4a", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "afcc526b0a9287bc84744bf57a1a6d37a0b3b567", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "ee745d1ee8b0842a39a46d7830655c765b438bca", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "39dcf6bd80995585db199c583ab79be17711948c", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "4c5e115360dcbb3d1800ce16bd95c98618b77653", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "d97e24d7b90452ca07cc590f19a04a1b3776d8fe", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "aaafe2af06a5ba56e0eebc1500040926d3b00caa", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "e81d5fe53c76a474e8f9ac9543eaa37565d4bdc0", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "5d7857a973a124b7fd320ce6a6d38a61f5e0ea8e", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "233ed1195c27d4606dd05069aa0d652eedb71228", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "738ad9f3b151a583c4cc495ed62c255b6a74765a", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "7192a88b73713379ce041ff567fabee610f9e7c2", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "1496954650cdb0875230fe412a1ac186c8dbbbd8", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-math.json b/externals/vcpkg/versions/b-/boost-math.json new file mode 100755 index 000000000..ca06fe121 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-math.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "cb4ff8e95c283f70577c94f6d552bbd2fa469b3c", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "e2fcdb4cd154efd942606b09085ec0cb7747a764", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "c3caf2df93bffdc6d72b5c4df120200abe0f6562", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "448de1ada43d74ffd7b4511c34319a5cc25bbec0", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "c64c9882971998a3d0330928f7e8c48a3e584658", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "5bc31e3f9ebaffcc0281f7d13759019c1171caec", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "fbe16002a415cd53a730c4046df48381ac7a399c", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "db4adfb015bd64c01e4a2f8b4f392a5e6d7b66f9", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "563eb86d1e24a7413604096762f54be667855d7a", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "b63e3459068be35c36691e329b848e7686cbf7b8", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "70d3584029da499d7c56cabd18f88c8fb33046c4", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "ca1619db41df02ec348b7a2605919ea5f0cf944a", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "d9bbeb51ebae31f0b6b07aa8140769e240b456f4", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "29c8a06c624bcaa26458b4b07364e5012936c56e", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "cd141c9889b1ac5370c4b061f39625b1dfbe8a31", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-metaparse.json b/externals/vcpkg/versions/b-/boost-metaparse.json new file mode 100755 index 000000000..28bcfcad6 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-metaparse.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "ad7ebac0f5d44f811d7d8462959b080c0f298eaa", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "3b3d7330ddf3fd7d1f38256098f645cafd96d08a", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "4f5433852913f94917d5e6afde09d24d48421ed3", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "44ca94c8ff9e03288a08adedfbccd61541867d75", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "06142d599d8265c27584b59a352f07264b5137c7", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "052956ebccd6709f65a87b02f6fdf15900f2a662", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "d75127ba71d92e1f5f30299570e7a29a77d708cc", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "8760b1c0d5f1edfe4140d839741c19eafb5b2a39", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "8900c8cf99da8ee8d9ba0871c2f1ba8f8dfcccdf", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "3d1af58c3d0791006135f42601010003abe29725", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "e653d239e22422fdc1b45302e5a36240f2bee4b5", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "83be90c1cda8b1c32af10baf4c3103fef41a28e7", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "b0c7f41c10bf58e0b15dd689c2a766ce120b699f", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "313033111bac68f7df6f8cbd2f0f034267617108", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-modular-build-helper.json b/externals/vcpkg/versions/b-/boost-modular-build-helper.json new file mode 100755 index 000000000..f79f065a7 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-modular-build-helper.json @@ -0,0 +1,269 @@ +{ + "versions": [ + { + "git-tree": "e02a1f1b06a492d932f309feab8ac7751b0327ca", + "version": "1.79.0", + "port-version": 2 + }, + { + "git-tree": "dcb306fc661bfab322c75b55472e402387396099", + "version": "1.79.0", + "port-version": 1 + }, + { + "git-tree": "03b0eb80e437663830851f7891d02125694b4ee0", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "ee3c3c2a3ecfb2bcff50d0758da7d6c36479a3c4", + "version": "1.78.0", + "port-version": 3 + }, + { + "git-tree": "9400b3bfdc93a165b3b509a76c59107c020113a6", + "version": "1.78.0", + "port-version": 2 + }, + { + "git-tree": "11b3d243931b80a098de2d6ff74587485febf646", + "version": "1.78.0", + "port-version": 1 + }, + { + "git-tree": "cb8ca019590f2915f8a4a2eef170531474c35de0", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "e3edff222b218a808eca74d6891afc1693ec4774", + "version": "1.77.0", + "port-version": 6 + }, + { + "git-tree": "48cc9da813626ac4733698e65368e5581f4efb59", + "version": "1.77.0", + "port-version": 5 + }, + { + "git-tree": "aea8b4dbb8063db29d8ac843ef6aac35478bebaa", + "version": "1.77.0", + "port-version": 4 + }, + { + "git-tree": "7cc6728723151712d8007e882bc2ad9a4649b2cf", + "version": "1.77.0", + "port-version": 3 + }, + { + "git-tree": "9795fd3f465461fea28201a773909b6fd0e3400b", + "version": "1.77.0", + "port-version": 2 + }, + { + "git-tree": "c076291c3d44f7cea167e469748ead6270e1c424", + "version": "1.77.0", + "port-version": 1 + }, + { + "git-tree": "b14ac826c44c030a65af10732269f379b856f76f", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "fd1c08c606cabfe31c22e2677c383f8b5119fba6", + "version-string": "1.76.0", + "port-version": 2 + }, + { + "git-tree": "f9cf6243049bf0abf8526fba57702a2122665549", + "version-string": "1.76.0", + "port-version": 1 + }, + { + "git-tree": "e0f858222eaf2c58a7270d10d649bc88e2e149b6", + "version-string": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "c475b268ac42e886acfdc783944e1e3a988b0ac8", + "version-string": "1.75.0", + "port-version": 9 + }, + { + "git-tree": "dd4c0cc6612065f35f4feba1cd5616ed4e249f1e", + "version-string": "1.75.0", + "port-version": 8 + }, + { + "git-tree": "108d63ed0f26b1db432bb3ba7bcecf7ff18cafed", + "version-string": "1.75.0", + "port-version": 7 + }, + { + "git-tree": "71c0db71c5cdc6d6516ba3c15dfd4ad8d5e3834d", + "version-string": "1.75.0", + "port-version": 6 + }, + { + "git-tree": "b88a7b8df97734c03d2abaa3c562dfbfab07dbea", + "version-string": "1.75.0", + "port-version": 5 + }, + { + "git-tree": "b261a1bd3ff03916f10c4a157b670c3c4e7e7326", + "version-string": "1.75.0", + "port-version": 4 + }, + { + "git-tree": "39acb181b681e8ac20ff594d3ac1782bfbb37ba2", + "version-string": "1.75.0", + "port-version": 3 + }, + { + "git-tree": "1b4dda192c485153b97512519e48a06202fd6930", + "version-string": "1.75.0", + "port-version": 2 + }, + { + "git-tree": "b428c968cc712ea1ca411b21b5a865ea08d02d9f", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "2fe7c2b476f9fd5764944abf12a4b938883ad4ab", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "d404ce9e23e6c5aba490c76a96e9d97e44a89e5d", + "version-string": "1.74.0", + "port-version": 2 + }, + { + "git-tree": "fef0735e9d00a6b655339400b52795f05e76a84e", + "version-string": "1.74.0", + "port-version": 1 + }, + { + "git-tree": "2adeff495465934900529cc655da90613856e92f", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "07fbf366dc1af5b6c0df2ef31c99e09d14c4f6eb", + "version-string": "1.73.0", + "port-version": 6 + }, + { + "git-tree": "85b687465f887cf6908e895af9cbd998cea4b217", + "version-string": "1.73.0", + "port-version": 5 + }, + { + "git-tree": "e7a07964dade0335112b423f32538e75ddaa462b", + "version-string": "1.73.0", + "port-version": 4 + }, + { + "git-tree": "1163ca30716cf6a53e626cc88ebb547a413b16ee", + "version-string": "1.73.0", + "port-version": 3 + }, + { + "git-tree": "112db3279a3c9d1896b68066ffff10e70be699fe", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "187aeb16654eb4187644c087a57acaeff1998ad5", + "version-string": "1.73.0-1", + "port-version": 0 + }, + { + "git-tree": "56db6458d3a98f8c5725937630841bfb2340a8dc", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "5abf207242b1d686cba82abb8065b586fd38bba3", + "version-string": "1.72.0-2", + "port-version": 0 + }, + { + "git-tree": "b2b2dccc730717369f2437b1d08ce94b6c180f00", + "version-string": "1.72.0-1", + "port-version": 0 + }, + { + "git-tree": "e016658c94588bab8325dfb10adcffdb3475526a", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "96fa79eb2d77e1a729086f7c46f09ab0ddc021f9", + "version-string": "1.71.0-1", + "port-version": 0 + }, + { + "git-tree": "7a383777c9b1034a4205aed82733dea261ca7e64", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "5e0a8f45104ab676d2a64dbd6df23173fe4ff7e6", + "version-string": "1.70.0-2", + "port-version": 0 + }, + { + "git-tree": "274e704bcaa5b68eeee5211740a871af28e6d68a", + "version-string": "1.70.0-1", + "port-version": 0 + }, + { + "git-tree": "c5e51e29da4a0d4d00add2eb277603351b3bc7f3", + "version-string": "2019-04-25", + "port-version": 0 + }, + { + "git-tree": "5a8bc5b9c1369690407626cad3da3b9386171cb1", + "version-string": "2019-01-25", + "port-version": 0 + }, + { + "git-tree": "e7722e94f1a004096ce88cb2c9f121380931b07c", + "version-string": "2018-10-19", + "port-version": 0 + }, + { + "git-tree": "b19c20f312d5ebd5df85c93169c729471d1daacc", + "version-string": "2018-08-21", + "port-version": 0 + }, + { + "git-tree": "a672e1b6192248d46c4dabd14db7c8b02280c0c1", + "version-string": "2018-05-14", + "port-version": 0 + }, + { + "git-tree": "726297f8f0b1be5f21118d68a9387aed964ab44b", + "version-string": "2018-04-16-4", + "port-version": 0 + }, + { + "git-tree": "971b341a8567cc62eaa795b8261047b513dc916d", + "version-string": "2018-04-15", + "port-version": 0 + }, + { + "git-tree": "1b37a2650461129b1742326a4945b05ebebe2539", + "version-string": "2", + "port-version": 0 + }, + { + "git-tree": "f43cd59d9cdce8411743f198eafe6061323d9a78", + "version-string": "1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-move.json b/externals/vcpkg/versions/b-/boost-move.json new file mode 100755 index 000000000..c6e246b56 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-move.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "957381b3c5ac7d2b563b2563ca8a78d49f034e68", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "a2b516a6391277e0c72147caf8c6677c92bff2a8", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "d912a2a9e0b705919dae22cd8af6a4467e209e4e", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "b6563abd760c2241004acc0da699152ab8c4b294", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "ffdab61d5b17d4a25826bc539dba867ed992b276", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "701d9ebb086a0dae796087101c5a3afc75d8dc11", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "f42046e67f057300bb31a96aed527695967d07e0", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "26af1464e0d14d0c8846698001ed8ac9577ca043", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "82f2136d999a52a9d9c3e78f4703eba6a4d5a1c1", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "4d47160c2375a60229f9f651c1da5720b104e5b4", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "652a316b36b800350993be47a76ea4fb06826f95", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "d4c2a9674e20ea8c649e7d91d0ee32faceb9cc3a", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "4634cdbbfb44a85aa21161a59bc5f032b0ee4188", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "2f37f95cd1abaa8e43fcd1d63cc10d0990de6b09", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-mp11.json b/externals/vcpkg/versions/b-/boost-mp11.json new file mode 100755 index 000000000..badb1c8ed --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-mp11.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "b741f7087023927b8345779b9a30575e1dee383f", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "06e8d1438943e47b1b4282964a0d290461ba3387", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "f685c323f00cf309294ac9e26b554baacbe3aecf", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "8aa7b3c86aa66c1629ac5cf5ce4e4b6a4a95b61e", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "d70457824e1e3084281f6841211641a548a2ea56", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "4003de72c8eb8f7e4bb101b0d21a8e4a9432c312", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "d7b9226116f2204f71ad246ad9b3fa58383dbb89", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "cf0cb4f72a150d9b42e0b8f90931a5965ca7006d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "b909beef1cec65f538778b83d63b95f6c020773e", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "9a7c325b864b29ec8ac9642ef871a290535bea83", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "6ab800982a2a8c5cac6ed3ccc6bcd88943a22ba2", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "67ffaf39aa68fa6665aac6280cc2fc906e124169", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "456ebbb4880423898e7ecfc9372ee2cbdf3914a2", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "654783543beb195e24715a4c9c1fe288b4ae0956", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-mpi.json b/externals/vcpkg/versions/b-/boost-mpi.json new file mode 100755 index 000000000..9c2567504 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-mpi.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "17190e3d8acbcc5d48001bcf01250f91ff68dbc1", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "752ad29481d8c40a2a16cf1d18669a410e78d150", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "25bace7adcac31b1199ae4e8b522a3bf020362e2", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "21a8e85d8e04d477e9127f80d78b6abf1d130651", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "e3cf57eeb5bb24cb4e1d9743f0aae9f327a155d5", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "b73cbaa6892ded2b7a7f67df13bb9ef3bc1b9a3a", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "6c832d51e87e57d57382fea9ea768439bd3e2b4e", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "802dd2ddbc750b1510ccbfb5e48c283f1cf518d6", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "702933c4ea1e670bd6ea902d406b3cf77cde82b2", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "03ee796d10ac56c0ec1fbebe738dd653c4895a68", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "ff128639a8085aa032b7c9a8374c7cfedbe9f040", + "version-string": "1.71.0-1", + "port-version": 0 + }, + { + "git-tree": "efd23f789796665bc811713dfa1d43b5a4b8da23", + "version-string": "1.70.0-2", + "port-version": 0 + }, + { + "git-tree": "cb6fe91adc54717c8c7a2cb494bf72ec15883077", + "version-string": "1.70.0-1", + "port-version": 0 + }, + { + "git-tree": "36beb281c8b83c9ec6a33e9f635128dd0f342f41", + "version-string": "1.69.0-1", + "port-version": 0 + }, + { + "git-tree": "dac5c4486a87fc70358daaa6e92587c00bde4dda", + "version-string": "1.68.0-1", + "port-version": 0 + }, + { + "git-tree": "c80438a9fc2e9a604f4fd517ad957d4ff7f761c8", + "version-string": "1.67.0-1", + "port-version": 0 + }, + { + "git-tree": "328d2456081e6415410a60ef19bf5707d2da184a", + "version-string": "1.66.0-1", + "port-version": 0 + }, + { + "git-tree": "7c083cfd06f2898658233401980a855f5464b009", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-mpl.json b/externals/vcpkg/versions/b-/boost-mpl.json new file mode 100755 index 000000000..28783c9fd --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-mpl.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "1fa673fcec0135c3a144d90528f719b281d29043", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "a8b09063ef7fce74a9bfc52625ea7bf285cf4a82", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "1b0bd80c486b32952b76c2b9539555cff5d2f911", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "250327ba168c480f1f530792a14e87cd4d13b63d", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "3c6847d1a221443ccdfefc9a8618c928af1137da", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "5058b7a6caf7e35dc719433daed180a2c85b0bb9", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "d579d7cb90cfb3377f303e51e46b1bdfc2128043", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "db53ae1618f8c64c038ebd7a98c073b7e5fb9c3d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "ba4c64243ef0fdd469781c359acf0d632a932464", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "c2e35925c51500846264e061103894e50b9e6a2f", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "a44e1065bec0a44bc8f565961e514ec54ef94143", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "33966a121a81af8df7ec11446b9109d5d0aa131a", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "8c3dffc715814dc459f4239bccae3a3689abf719", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "58b4c8525b6d8e05a4aafb4e3439a43c1abeb0d4", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-msm.json b/externals/vcpkg/versions/b-/boost-msm.json new file mode 100755 index 000000000..8ff696e71 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-msm.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "cb6831b52a7befc70effc89fbb0313b371f28563", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "ce4a5ac8b3d7cabf044883d6ab34c4360b75792e", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "c2dc03df49f99f1fca480d0439fe973a1f02c96b", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "ba54ee9c431c0c499935a7d7bc8a255cd5e9cac7", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "cf4e64e71731c3fc1db88a352aa9727082f80626", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "543ebfdf21bab811c42f765551b609e78344f07d", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "38dae5cf4f5c478aed7dcdb25f7057f5ccc0900d", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "0a849a17b265353a5c6e4039196b12ba0ba265ce", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "1a9c7a83f8321709662bc86efe34f284cf4f6119", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "080132bde79192ae83d9378c72521f0f7afde1cf", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "92a0a0c736364e37904d52e64dddae6aa95e5212", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "b0e07ea98f91f607de95196cc8239f3788dda6e2", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "4d15c083bc7c51c407e00b11c12f8635751235d4", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "47f760095d0ef58fc74ad559ef63ce87a2127ba4", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-multi-array.json b/externals/vcpkg/versions/b-/boost-multi-array.json new file mode 100755 index 000000000..c2184f6b1 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-multi-array.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "2a9a9941b94769dd48089ce42e4bc3eeadd5421b", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "b83337494c61a0f45310b4c298399841ac301aed", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "afcf3afccfec7dacd50795dad8c588b3f2dabbb5", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "bc5acbb8051e16c1e48d8e82ea0fac48c6024287", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "44693eca97005d75a9871243de567016b1716a56", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "bb28ff427fe1f8f63b8027aee5eebc6a823f6c0c", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "5ba4659f4d21219ef466f4fe626179f8ce930f71", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "e11a2c27455bc9cd48dfcd25cea92c3f83bc9213", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "3cba477108c2268163182f9c9be437f18de07715", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "715fba4596b1596a09cd0843273178f350761fb7", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "7f6818543d02c48b54b235e300113edf1d2af9b0", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "1283be03b2d0702223aedff37cf8dc292e641918", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "3950dfb42a636152bfcbe127e746705991686597", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "59e2e24de69fe4b917a238646ce6f03a69efaba5", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "afe0599f506cca9d4b7fab2c30a77b48f692c6f5", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-multi-index.json b/externals/vcpkg/versions/b-/boost-multi-index.json new file mode 100755 index 000000000..a9d511ae0 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-multi-index.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "bccc5117c54e12afbd300458b25ec698ae860db4", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "7a7e300ddb860a345ca0b9889cbe5d5d11934090", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "e993a57f4569f76310bc8c203372ebe472395005", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "d1e0c81cdc2adb33d2963722016c0b13a15055f7", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "6de9dddaca9c32451cad1f9ab60a27ecdcb345e6", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "44b1753c8c1bf0e4daa3820acfe891fb93becfe9", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "3855df4da24a17001705a1f198597682422ab0e5", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "1b0fb25698290f2e71bd502b09b909978db5d75e", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "740d6ae8322e2ba093606a7459412671c7869073", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "44e14ed344d6e9f1b98b656383211db418c3d786", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "8541a7128902357fcfee35e5e0d90b4def824ef9", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "91d83cd96d115c4dea50884904772baeb44cb3ce", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "f11f869b3b77081f937346ce1faf996ce0143576", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "f28f49eddc9dff09b657594a4b165c5ce321f8ca", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-multiprecision.json b/externals/vcpkg/versions/b-/boost-multiprecision.json new file mode 100755 index 000000000..3c650b969 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-multiprecision.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "636ec387aa16d01e5eb3604bf4c70e90ef520cd5", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "2914c2dcd5cb9a604c14ca9a5e9600ac7c0ecfd9", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "58d7184ae4115f7f46671db9929708872e6aae6c", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "55ee6b85fe02f7875374cb3f78a427365ba7beb5", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "6d5a003c951b208d27de281020c305977859eedb", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "1469cb24a4869538139a0bd626700152ba4c81e9", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "ca5497b49bca01da2bca0b1541c2b9f112fa5782", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "da3f93b10a9839dbcaab403d463939062387d21a", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "b9146946c094ab979c9778110029690ad5b31ce1", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "5c514d4414375348e4916343ae4113c3e0b9aaf7", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "36f0f4cbf16f060437357ae32fcf5074393a3997", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "c5b4c1941ef87661538a6dced0ffd43ec3026df5", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "c1b19785f1d04ff838d1a8c98755b40999c10e68", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "c4184d5187d5e60edbb1a98be3e516c885c05467", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-nowide.json b/externals/vcpkg/versions/b-/boost-nowide.json new file mode 100755 index 000000000..10223a4fe --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-nowide.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "8013e5dd702b7f4c9973872435060812981af2f8", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "c38c862892bc328c743481ee48b3abf50e66a51f", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "2fc28ef9747a6ead394ae884518c8be324dd8e33", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "9b1a6083440b08b8b266524dac6a8aa200e417dc", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "641c12e14ae3d025d4c55e5de19b00a65f916dcf", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "3ebf4a6c8d6bdde7a66ffa7c08a35c477dfdcc10", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "21bcba28e4ef0abcdc645c34529979f0812ae123", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "5f98e5fcd3cd4bd476ba78be6e7d815c623526c9", + "version-string": "1.73.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-numeric-conversion.json b/externals/vcpkg/versions/b-/boost-numeric-conversion.json new file mode 100755 index 000000000..9f0af7307 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-numeric-conversion.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "33a349e75f738b735e678de319469c0f9009a413", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "11dcb5d23dd6b1db7138ffe608d76134ce1e4ec5", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "78140f78c6400520bd4ce340c68236e083a504e9", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "3ab3a3a915ad6bff1aa094641e7471e5ddc8a11d", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "9de299c79ee96b9090a3a27cbbaee41b62455003", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "4f206a22dbbf0283bb5c2a21840fa464da51878d", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "84e03c7a7731f3351abf0e47b4541a49f9c3d9be", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "4904b5b839c765dc1befc48fadf0c6aa7fb2d669", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "cff35b245bd34a2feffe8b7a96d0b73417e531f6", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "d28bc5bb6312ab583a3ed5c3999e662007090805", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "caf2dc34e95d974e833ab8953406cb09e7548a2c", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "cfbc5f6f663f2c268ee3e175e3c28da42467792b", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "97b385de93d6beb4873b6b20c20aae9d2168587b", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "68b1d75d2cede34245dff141bca02743c53dac95", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-odeint.json b/externals/vcpkg/versions/b-/boost-odeint.json new file mode 100755 index 000000000..18cc1d598 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-odeint.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "893dab725dc2e30afa421db9d4ad5f153da10ab3", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "069823a27c74a3a7872a0faed570b16130b4698d", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "effd1406c513ca8f20a1e2b6de0cd299be92d74e", + "version": "1.77.0", + "port-version": 1 + }, + { + "git-tree": "9ef1ae6d236984a5cdb1cb5dbc76067648461231", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "89c69f304356b50d3e4e58155bb08009629de385", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "92ab84d7e417a2d14c7358145cf83af87e7c85c0", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "0f938fcdb7c996dd3d24c01d4bff1e0cf808a55e", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "32bb87656fb8b1354d71920fcd04268fbff5f943", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "359febae8648a57639d494837d9136fb3943344d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "d6762c830572ebbd4323684a8f7e4e83b358156a", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "ec79ec83a8ac8d0c7197d88922af3c7c409fc1b0", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "7a36e9f91d3f8f11b7b38d541d5a922a06ff4934", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "b98f6084bf20dbc571744b0bb2b7b1dd1f2b86ab", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "e53c52d9f85430fe9ecd93aa08ecc2bc8ec94f5f", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "a52b62113e8c49a01c7d28c275849302bd173cea", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-optional.json b/externals/vcpkg/versions/b-/boost-optional.json new file mode 100755 index 000000000..21e51125e --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-optional.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "9480f61fee5df6864a425964bd13ee783a7572a9", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "4171d6f66bb828d51bee3de777da9384232b6068", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "4a1ddf516bc0edc855ab4d9b8d134f338ba51a94", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "5a824aac647806d7f8d03ea8ec715faea895d54a", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "bc9caf056bf385d810fd7cea00b6ef7a646edee6", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "be71f26ed429ad7401d2d49ae5bb8b5f021a6036", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "3c72f374212dc6a739958ba97b3eb5db2ebfe992", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "63ac403fbc9394f9bcb0d704a2a833703480aefc", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "b1af3c7275b7cc47f3f02e4c80ef2c626b30f33f", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "575b825d3738b5d32949e32d15075aa309c21520", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "50c656d90eccb3d880f7a8bc863769cea821bd70", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "2c457cdb8a547534fdc200f77b62b268fcef057e", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "cd2da61394cdeae60e771e31791cfd1321e54326", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "5f667b71b3b4294585fd5922f24fde5377c79a34", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-outcome.json b/externals/vcpkg/versions/b-/boost-outcome.json new file mode 100755 index 000000000..53161dad9 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-outcome.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "ab5e09720b095a4dedf3a6c9c01b5512c67917a2", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "ea24820de39876b61aa98e1d54ac9663c0355f93", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "6737734e6d10c475676e1ed16967ec7792acc7dc", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "1ea91b17815f03d2702bf3721f8002cb8d64cb85", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "078abc59d831a640ca9ab5391f63e8aa8a95bf99", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "bade5fbaf73d4a6e5856d1170801b4861ad54eee", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "837ca9a2dd5d41179c6fc3192f74083c3ea34951", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "7122cc6b69c8c46c6e3d7ba54359fbeb85cd7507", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "f95d70d844d51cf422d3874a73a06a4029707ca3", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "ed6420c7c96b34c23c66cffe00c88aaa083d910f", + "version-string": "1.70.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-parameter-python.json b/externals/vcpkg/versions/b-/boost-parameter-python.json new file mode 100755 index 000000000..6808d2a7b --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-parameter-python.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "d5d0f28a377b7508134bef9f354168e9aa49f1bb", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "5a1cbdfec8ad70998ccfb368a3e77d8658023fed", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "5295cb4faa096633a23163b2a6409a27464a157e", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "e57e6544326fe84416a0060a9d93723d05b9bb54", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "dec159c5ad8645f1527a9c00d9cd56840a7bea2a", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "fc3e94ffb7d3a6bd9346be50a55cd8d388ad3bdd", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "e464519c64bdc19c366c3fe4f81a567488aa4bf9", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "adc1306f39dc508ea895ee309f262879bc260f7e", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "4177f6ede7a5ad40f1defda81d881af503e8f80f", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "7e22f05569f68c13a71f33474b3a0e28b8f4323a", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "2e24d0a65859716b3054acf46cb3183eeb4d35d4", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "cee396ffefb0e63caf08216be30ce57ad27b56a9", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "21fc6116c1798fcecc5cec8fd5174c7c8c13052a", + "version-string": "1.69.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-parameter.json b/externals/vcpkg/versions/b-/boost-parameter.json new file mode 100755 index 000000000..641695b8f --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-parameter.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "94340499eaf0d204a8000b09a4b7f58eeb12c84d", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "e11ea75fd7178b78b5a3751aa7db269c8ef222cb", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "3f480980e4e1ce4713a28bd24d728efb0bb931fa", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "e064373327329af8a7624ad00073dbfdbc196a48", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "04759c54c296fc98c5fd452b7e1707b5d2e8908d", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "a8a05117ff17b78c9e25d5edc7b934ec2bd97de5", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "6b9936e2941180b9915722f9fa172b24e0e0816f", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "2236b9fcb36ac57a86672580631a5a38588435c2", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "c7ad0049a8a02f146d611893c1d25b004b679efc", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "56cf52161854c2019244accc1567869626810cc7", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "579c568bd7eca04004fa0f3a30e20c9c93ec48d2", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "e4d056f3c6c7d1dfd1dc4d43557f73aec54265ca", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "0f21615783b3b0b3bd710d3100ef3fffe60538d4", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "bae9960ebd64abb05f988d01f95e39a55deb085c", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-pfr.json b/externals/vcpkg/versions/b-/boost-pfr.json new file mode 100755 index 000000000..a5a1775bb --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-pfr.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "48758ff038842f02fbf6f47c5f90afe1ae682a51", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "1ca2c9de4c7a8553f401a9f7b9e954eb6305bc47", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "23bdfdb9c9cb19e28201088dc055b85dc44b62bf", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "f58af0deba41766f33ad383428463f59cf38d976", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "96688c29c3a5a60c3b347391664756f884eda90d", + "version-string": "1.75.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-phoenix.json b/externals/vcpkg/versions/b-/boost-phoenix.json new file mode 100755 index 000000000..2a04d8dc6 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-phoenix.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "571d5f1a068664b1f31dddd3541b6a19bfdbec2d", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "1812de4001c736517ca9bd780fa4b5258dfb134c", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "2926d1b537106cb231bb9f3a657f6fde6c8530f8", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "20af48e0084ec80f69c580872c2fc4e01fffd4fc", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "5f58bbd7060a9f72ea2a61edb03250ee079965a4", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "d19c6271f74420af372b2452ec699e4caab07ea1", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "80392f2d9ab9abf6ae587de851ec4b49c42fe9e2", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "9e7ee11598554bf50d36481b29b1ea964f4cb1d1", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "631ea14e6ac2fd604fb3c7c8797fd55cea03c030", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "067e1f80ed1afd316020d1d84692b3b674e44f56", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "15b6cece21643e0ab0ded10cd182004a513b9d80", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "c02691b2970cb0170308e2455dbf110c358921fa", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "6aab7720ed6a6fc75b24d2c9fec365cb60751543", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "8889e9d0ef6ac1a42e5f06ff8a0671bbcc309cb3", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-poly-collection.json b/externals/vcpkg/versions/b-/boost-poly-collection.json new file mode 100755 index 000000000..0c6eda266 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-poly-collection.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "866f9a4fce24354f73363d787352bcc2ff22d917", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "3a128149f5edfbf7e5c4fcbf497b29ce587a35ad", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "d57a3554e15ff1a0bf279688f487751bc5f74efb", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "603662ddf6590592848f2dd714fb08776d3a9616", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "6867f4f5795c457b9f726b907606da8570c9f66f", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "1809da29e58709fca479c620ae0c885f30fa3960", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "f8c72c96d595aeda145b193248e8ec219019b527", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "ed0fa4128c2da0b5670fe7c0f4fa257b68fd1246", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "deac35b40f793ed891ce85801391b50daa15d196", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "9b05e6d6f8ce8f7a20a9031aa6d2e6200ad0a359", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "d1f35527bb9a66cad7bd047b53cc754d6e47e387", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "2e17c7509e0a77e2db62a15c3055e66b6a7e63a9", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "9514f57ba3b3f520f580a5d1f6b0fc95aaba78b8", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "33ab2258117d2b42ad9d64509d5c8ca42f9d7157", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "2b55d26b9e35dc6e503ec439265a30f6942ce63c", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-polygon.json b/externals/vcpkg/versions/b-/boost-polygon.json new file mode 100755 index 000000000..9e2cc1176 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-polygon.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "bbb7a4fbca9a45b0166893128f343ed3f9bc099a", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "67a7f31ef72a1ceff351456cc7282b6f261db187", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "81ea3095d56a98f6d5b75db6568a19e48ac819bb", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "1a6ab42b35df132f8a1f7c52dc7d92eb8a7cb894", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "990f655bf0d76d2a916bd7c0631f01a7a6516c05", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "3027fec8cf1e3ee70b118ef8e8252a7248a96b1e", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "26532b34fdb394b72a8eb9de5fd86251a93278d3", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "07372871233a994115153c9903ade00b8422c9d0", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "2bf4ac6eaa8ede6f507a6ef22f91697ca86929d9", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "18a84857c891e7535699a75b62751951a973ce31", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "275611a9e6f6751e6f9d97faa8ff35a0585147c2", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "ca20a1061687f8269a014139ff51c9eb15e3b63e", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "b559e6fba3459eb443caccfb6abc1877b655b0d3", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "9f2b5cf8d10cf6ef07ec370f4a0fa42340427c03", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-pool.json b/externals/vcpkg/versions/b-/boost-pool.json new file mode 100755 index 000000000..c3b4d1a88 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-pool.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "a75a80498bfc1134bb8d5808b5f8b457e4032908", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "8c0061ca841cab5b588ebae9bd1387882eec3435", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "7794803f75109db0ca64a48d2f1cbd76100b153d", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "a9ae22b07f1f3b91d8b90f8532480abfbd0a24ac", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "90d72e8d8b2f27deb72fc883542f130142878a86", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "29785b25e33658943f0234f3e741472d66413a80", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "4b431893dd45ff5a697ddb75bdb547c5ae2ef2ba", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "9381b2c96b09c0517db355129c141c74fdcfc855", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "9571c024c000de5d15b9ddf619375526bdc0ba80", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "2eab2d4bc130fa83a3c089c023767b587dd60d42", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "8ac91086194bd77765f3e3027156af1593b70fa9", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "96a5ad7352606709f08c9134e884e4ba591c012f", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "1573a51340947950bb5cb90b619e697ec6f60896", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "8d97a0c77b606097ab9d9418a4cb602763391fc8", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-predef.json b/externals/vcpkg/versions/b-/boost-predef.json new file mode 100755 index 000000000..fccdf4779 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-predef.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "c17a7256c1f86eab749e10b451dbf53d317afaf9", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "1865984507efa465dea0f7d597528cfedcef0b7e", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "a291dbfb68391a25f04944f9caa924f570b26d41", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "240a1963be7f74c2de3f507bf034e765c632f033", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "d4eea152778c8edf5ac36cfc804b4a4c38e2586a", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "93c1d220a8aad92e3ea944241b6c012a100135e0", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "12e0ad4d58cf353a20f2bc4e06144d7d706dca6c", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "686bf9480ebc915a51c29add1a79ee1ac2faeb43", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "a06cb7fd99d03c259c143acf0f49e47aa5ec43da", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "0674481bed721602a63397c5f1ead31d25722dd9", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "2e3b623903c5015a0f5abd40a676d448ad9efee7", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "db5c78b777b8eb604b036ecd49bc2591f8e30b19", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "9c2da3374a19b46eaefdbd947806354255d2a3e4", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "d14c0c29c9a15ed60470e864b3456c17617230da", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-preprocessor.json b/externals/vcpkg/versions/b-/boost-preprocessor.json new file mode 100755 index 000000000..9b60a9848 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-preprocessor.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "1790581b89b5cf96bd870854b2bc4b256032a9c9", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "e69da51c3ec0a8086ab18dbf75da11649aed5157", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "6abad213e30df5ed168164b2612dba2041c7e8c1", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "c618127e3c475a0991c59922fa57c2fee6eabd40", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "8d78b8ba2e9f54cb00137115ddd2ffec1c63c149", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "df5e8b789fb8ba8db75ea28bab8572d51abd571b", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "5e362423a1e37acab0ed4384c4ff7d404fd14503", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "86eb3938b7875f124feb845331dbe84cbab5d1c6", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "a5ac87f78f12cdae644df906759a37fc73bf4651", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "0f6068598d7166ac3c86e6b2a2941ad87c664a57", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "d1d614dd9f5ed6360df11e450c877429a45157ca", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "7d3271021cd76a790b2d1295e07eb537c01d2d8f", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "40d7329109bab9f2da994006e49662cbd58a5b55", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "85ed15dc13f1d463b3ab8ff25f7e2c246286746a", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-process.json b/externals/vcpkg/versions/b-/boost-process.json new file mode 100755 index 000000000..be04912bb --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-process.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "2a6c17a26c19ac770d39c549749a86f62b93ca36", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "669ff76873e507b50238609e17bb0208559cd224", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "0e476269a7091861c1db7379d4e925df6d184044", + "version": "1.77.0", + "port-version": 2 + }, + { + "git-tree": "e70acbb855538f95200b341b1cf26d9c1dc6e6cd", + "version": "1.77.0", + "port-version": 1 + }, + { + "git-tree": "6589096a03d4f8ea1590b1b9e1bdc41a47c2f907", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "dd105bdb8e892a098738e054cfb90cb1786c856e", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "5d47762887873d2311645a3bd38757e2cb657f8e", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "6dfe0cdc876f8250e2531fc5f8e5435269285623", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "fb8f0358a83ee209192b713e6ff095b2a9bcd36f", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "e0d4d0470b2a3e4d650c3555e6092e5ff82e0f82", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "9e5f0fd21217726b4e5b16f58290fae47152d908", + "version-string": "1.72.0-1", + "port-version": 0 + }, + { + "git-tree": "1caa98406872113999b5222d9600415aae6b405b", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "32470356be5168af75860d960e3ce25ebe7b0a9e", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "d48806ad51c459e803b7411ece1d8fe5927ed982", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "f738b1fc105ea6ae5e699e7afcc5d4cc0cc871d6", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "6766bae1fcb24e1efa5eaa462172e758673cf163", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "e52b46514451baa1dd5c22f7ab6d522499736ff0", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "3e5c76798b923364a290c0617029edb85921ec31", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-program-options.json b/externals/vcpkg/versions/b-/boost-program-options.json new file mode 100755 index 000000000..d131db39e --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-program-options.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "ad5cb3defd7e6f0f2be69f7090d2f996e4d4d885", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "8a0432f928213aacc0f1a51eef24201e1f120690", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "8ba826d9a2078c4e933cb9bfd23cb9c1a0e252ac", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "6e841e59b06375faa95855cefe7cf14515ddcc42", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "ee283d4e95ac33a966a83743758d49db470bb4c9", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "b9d572b6e3313c7153c36bbb365e76d32ed3a7d9", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "dce02e15c577240c07fc1f8688a9d0c54e50ab8f", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "91fd98ee6b5ba3cb49d4d2375caefe9d44ea2b49", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "ba77e03e2b09d888225b31c3cac7e792cfec3710", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "573433b2628e8050b34e5c848429730e4db1832d", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "16447985ef585f3f44cda1531cff5bc03160fb9e", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "c562ecf725cd9bf0bd5588bd88224171635cbf0a", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "5a763d66ce013ce7602b802c19e840dd563a6bb7", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "cbf38850c9195656fc10a9e3708ce02b2001f0be", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "071cbe77828f797d6b1df7e3cc1c6f8473ed88d4", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-property-map-parallel.json b/externals/vcpkg/versions/b-/boost-property-map-parallel.json new file mode 100755 index 000000000..0048d1dde --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-property-map-parallel.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "9f8124a589753446efa038489607ddd868c7e2c4", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "2d9edadb62d7a55975cf22e01b7ee0ce74b4301a", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "32b8452f34ad6048981ab1f2a5d7c226753205b8", + "version": "1.77.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-property-map.json b/externals/vcpkg/versions/b-/boost-property-map.json new file mode 100755 index 000000000..db50c679f --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-property-map.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "80eb3c867ca2f805d2379963d69c12f7f877bad0", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "4c37ef13cdc33278fba6fa5c5bab30de91ce90e2", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "c866a47a5b9a770e415dc1078cc37870cd5851bf", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "68d4dfac2cedfe5786ecfb96bbe974c7257c73c7", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "5d13650ce8dc9bd2f1af435bc5a3ee2f96e699a3", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "b7956347c484064bffa998c333c98131578b64fe", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "3225be410e371a11a1467e7c9301a35886cb0a7d", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "5ac347143fffe173b866ad1c741d6ffb57ceefce", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "38d2b66b0221e17cebad6d1dc4216bfeda0e3a79", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "1d51c37f141352b566775a9f6781f40e0501a5e4", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "37155a43753832feb4b73f254bb9ec45f0c958fe", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "6c3b625c2605984644140cbdd80d832d1d4cd243", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "63848a008f106c02306ede099ea18df431c18f19", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "96ed4c2d491eadd7d2994954bdcc6a99fe858ac3", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-property-tree.json b/externals/vcpkg/versions/b-/boost-property-tree.json new file mode 100755 index 000000000..2ec9d39fd --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-property-tree.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "f05a46d069778748274ff28002994e04d3654286", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "281dadcd5a8a6843ae829c4b653f33e7d1dbe2dd", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "959191d822cc095e02a3f6d9af5b68aeb823a0d1", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "099a09d3ed31651c57f2f3c735da5948dce45b66", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "dbd7fa06c82727307d26033c3ce4679c05489726", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "c05b856dedef9d5309b6f9012d887c7dce28d243", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "85183ae9b96b68e82c3d5c67bbbe4c229d8cc2e3", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "d7cab40cbf6a78f391dd2e3529620883107e5bb5", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "ea4ffc0acb0dbf71f4242f004d5398cb7524ecee", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "0053dbedf61b06ba3202acc81c7bace3b51ef859", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "379c055c6fedd0955cd3f1476f02995922bdbcae", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "fbb67501862446edc1071b44b258e8532ed231db", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "c7843abc73a0bb131f48010a6978ce440d8ace8b", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "7120fb2cfb6d68cd809907f1782bad0cc73acaa8", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-proto.json b/externals/vcpkg/versions/b-/boost-proto.json new file mode 100755 index 000000000..9da129739 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-proto.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "26184f2fdf2a6c15a79964befeba82802d7d6afd", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "46fcd6f1550adf925df0d985dd5463991150a13f", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "5d33f62f1117da9bac418c4b85d1a1bd96c547a4", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "e7d8b52790eabfc30fa162d68055d3fe30c8b20c", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "212e0551c299f67ccaf077cf376ed9da38af6b5b", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "2aaaf7930b6b5b3a29d4008604768a0943ff929a", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "cb39aa32e10a83818fcbd7a82acd0291ad8f56af", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "f0b7aa34b48f91ad089f6cd0d9c0b7a6b4190e84", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "8bd94a4b20959832581149a776c2f4b4fec8237c", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "dc00c855c680d14be5cd82b216a8b10638d27fc8", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "16247abb0f9eab54b00aa071cc90e84561e93436", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "7c3306c33e84b1c09c4d5cc86800060b560d3a9d", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "c1fb2eebf8724e2cb1ba263a3b793d3ea3b09508", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "3889615be6c3ebe792eca8de0e3df1371306ad77", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-ptr-container.json b/externals/vcpkg/versions/b-/boost-ptr-container.json new file mode 100755 index 000000000..c19090704 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-ptr-container.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "879641e4ff9cfca37db16a03f72b04afeed909c6", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "81591a280761661476868c5f064461475bd10ba2", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "e954b84d951409f6445d7d49bafa66c977ed9834", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "1a46fb253999b4a420c6ae8c060351bb56dfb303", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "a864f78b06709be6f35ed5b8e64919f3794a5a74", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "4d9eac4fba8786b3e8b9c64faa74b73acb76aae9", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "431ee05083e5f6352bbcce649fa512e567394372", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "dcc85f5764e00d11327d25aab0ea30c9e4459e1f", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "0c30d9fa0c2507bb350756d95cf0ca5bd7be062a", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "ed1ca28ffba240cc7a603b58ddda034c05516833", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "9dc7c4b73d25b8b8aff652f9fec737687c80f16d", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "6b32d64ca812c11888370c2081b99148aad04762", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "7c60dbdc785106c8677e999b0e96e1e4cac673a8", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "375e47b2d4987029b6bc19969d74f284f0eca643", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-python.json b/externals/vcpkg/versions/b-/boost-python.json new file mode 100755 index 000000000..2bea402d0 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-python.json @@ -0,0 +1,124 @@ +{ + "versions": [ + { + "git-tree": "0d5885833470840d6af709f368a42df4c3b09df4", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "a4cbab3ca82048134b757a0689d4ab3a83a7b695", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "879991d36cfdcdb57b176b9dac08b55c3c69a9a1", + "version": "1.77.0", + "port-version": 1 + }, + { + "git-tree": "9f6fba6abc29e2084469c11ba2f2f1f745b08137", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "789047e74a9db18c96ada8dc7addda4fc867360e", + "version": "1.76.0", + "port-version": 1 + }, + { + "git-tree": "22a76d7b62c1e7eab693c827b1ca942acdb46a1b", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "f5565087e1c90779cbe05bd19ba172a699ccc743", + "version-string": "1.75.0", + "port-version": 3 + }, + { + "git-tree": "5e3040e7a2eba3e7511a5509022f5445145dd67e", + "version-string": "1.75.0", + "port-version": 2 + }, + { + "git-tree": "780820881ae469bb68c86d48a5693f616c2c3b6a", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "f38e7a5dfd9892965a37a4aedf055950e7769477", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "5561267a2aa6d56e0451294589ff1f2b8ed8987b", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "f113307649505569e6dd31317d9a64472eb78117", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "d63a0984ca7e73741159f820827ac18ab3f924e6", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "4d4f15ff9590cfa09fd3fdfb2c0c892b64a3b72d", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "e8defb6be7a16787c193ba536b3c8075abe48e2d", + "version-string": "1.72.0-1", + "port-version": 0 + }, + { + "git-tree": "0b1e4a833c1ca38910b639c853a87b637b340792", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "1f560c0eee02f5a55166e0cc2439cf384edbc76a", + "version-string": "1.71.0-1", + "port-version": 0 + }, + { + "git-tree": "4dd7edd79ef06d3c7bfb7e985847ec3a0c6345b9", + "version-string": "1.70.0-1", + "port-version": 0 + }, + { + "git-tree": "400dbaa4966a954770e9d8759778db83b3faecc1", + "version-string": "1.69.0-1", + "port-version": 0 + }, + { + "git-tree": "247a010215bde83a0f975080a6d7a6c830f0a6cb", + "version-string": "1.68.0-2", + "port-version": 0 + }, + { + "git-tree": "ce8819c258d304814d123715f4f1c395de9163bd", + "version-string": "1.67.0-2", + "port-version": 0 + }, + { + "git-tree": "923554ebe60611577550c6a39cac0f8b988c6b94", + "version-string": "1.67.0-1", + "port-version": 0 + }, + { + "git-tree": "4cb5033cf45e98be657f57114b7f0c7ef81bcd3e", + "version-string": "1.66.0-1", + "port-version": 0 + }, + { + "git-tree": "1fefff58b74c58d6af63fd36fb83198a1cc32de8", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-qvm.json b/externals/vcpkg/versions/b-/boost-qvm.json new file mode 100755 index 000000000..322c4d536 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-qvm.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "8f8a09f7b75cca0fe3cd7995f234ee35f985c3cf", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "e2c998753d319d94c00d3b3b3365e2a116bad23f", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "5d7b01d612075dfb3d89b799bec152785c838b84", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "70b5734ed30839efbf4048f5749af11e292df641", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "93abe1969976dcf265014b8e7f5463ee3b3b76d1", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "bf878abd4682e1ade2169d87639d5aabb66571bf", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "8935c84edc35077cf28149e42ffe6768a926a73b", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "59dbb65ff0a083dd51c070f2d485f0b85a2f6b40", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "82aafdeb7881bece44c278c6fae415b10fc8d709", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "eb34d5101d14f066aef9b00dc43570693ad837cc", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "d61f5ff2c62184804fe18d07f3c9ca5dfbd2a469", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "afcb1dc25280ca21ecf5f93adeecdd2fe5a806ea", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "1cc5002253146f8166c424a11ba4542090a69673", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "5db32bca005d838a106957200f46e93b85921fcf", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-random.json b/externals/vcpkg/versions/b-/boost-random.json new file mode 100755 index 000000000..398ef4c98 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-random.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "6c02cc8343df9ea692504b16db286eba1fc320a6", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "ca9654479a3b0b92cba2e2c05fb927715b87a10c", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "3f6c3399689c43f599f3852d98325cb272e8f775", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "174356d3aa0622ffc40c5a8a2c4c4d2813498a2e", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "69bb9f285b6db1c861d662eb9b449ef5e2b2b5e4", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "8a957fa31444da59d5f8ba9ee8254670e18b7bef", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "e68a19bdf537ff1a19b5bba7d1766636adced790", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "1de432aacf0b6e3b397a53ddd385d94c9b04b058", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "85c3c8a654edd92af468bf9c35be1a9de2cfdb2d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "c67cfc419002d8967f967edb0649d6ad6a6719fa", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "b3fe5a5db069ff41cb1266f8a26d37f9c6282358", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "fbf4c33b43d8739a5a4cc91ef074ea140cc52c00", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "9ec6ee12311fc2d31fb247f577d68c0273fa265e", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "715b2b14eb6205cd71755fa298a527aaa03dae8b", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "5eefeffdb653765eb57cb73148fe46627ee82bc9", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-range.json b/externals/vcpkg/versions/b-/boost-range.json new file mode 100755 index 000000000..09d2ac165 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-range.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "fff762e26af0f46863606c7fd088491dfcc84599", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "1ec82281ed52b6d4ae225abe93a18392c846cbc9", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "737f4f322e661e01459862fbe73f748390b59c3d", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "e595f4b0f7135b43d0bef283fec3c0d4d742dc51", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "57c3a7dae1c551c1839a35a2d518c2ea0dd43795", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "e72c575bac8ae7881b8cf97ef205568b73c25584", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "bd7374b3bb9739b5cdbcd3d475a020447efeb2dc", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "c4005c95b14524a19b489792bb091e24f9364b53", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "6b994f0a853e0625e60b1c1cde0169c5bee9414b", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "6d4e87ced25a91bbee77de9f02f5a11ef65ca09b", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "9c902b35dabb37844088b348cf7240050e930541", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "6999e22de76169dd3037f7d2a7c159be8223b549", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "99af4e93420453476a98f336df95ee4ace4e7403", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "a26179112d828a3262ff88a323a014366cecbc10", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-ratio.json b/externals/vcpkg/versions/b-/boost-ratio.json new file mode 100755 index 000000000..546167329 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-ratio.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "3c85cac76a643d538a52553a54353fbb818b3169", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "a5e0af272c7df2d7994c6d98ad1d76df6b5330f7", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "724fa7b1c0e1d78a9c29595b042443090e53a8ee", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "002edb9b01fe471f968eba09c80bed4ea60fa865", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "bfdcac03e6dd3a24818ca99a96f464a2404f2f0b", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "338c5b178e5e2723ac77d1fe0085dd3845980f79", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "eacddea39d880446b3e8e64a6527599f15c0d63c", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "c88f3286de646a9f20b9941699fe02df0f7ec69c", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "e81e746062e1570980d7204b186ca43da5ec7c03", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "31d533e60133675e7935e08a8c90ca3abc5974b1", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "6bcb8d63edaa6a5bf2ede29779b63076e3ca316c", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "c63b827e87addd3e5869c346ce9dad791df6e82e", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "744d6f12b83ddb7da0b154646d8652a8a6fc6f3e", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "b64059a18774ceac71aad3220138fefc06d96f84", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-rational.json b/externals/vcpkg/versions/b-/boost-rational.json new file mode 100755 index 000000000..dad8cbb9b --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-rational.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "bd0b9e457fc969fdac6b9ee36b77a26b3c680ad5", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "2a2877b20057e313af02d1307832d90f764b2dc1", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "d54d04de158ddaf33d7b8a6815532e8ee2771515", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "8f6911d5b98ba7669956568acb155112e623927b", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "27fc174ae8a94007819eecfa02e8830e85017ebd", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "8de4e22e52ba7019b8731d4a5cd3e9f86eca4461", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "042d0bdfcf016ebed794774036238d299cce574b", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "ccf4141c0e92f26d702767087499fb0f5653337c", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "5df9940dea5be4c08f4e47c3ee1eb8a483fcb4f3", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "aa923124baa6d31432e6f4c81295978b570ade8e", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "d840a346cf5f7701eda2eba4445ebdecfd545096", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "98ae814a844d35e5a9b0abdf3f5ae7b5eb199483", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "b8eda38a953ea0b50c13cab0e2591cfb8efaee41", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "1f8a8d0303f89b086c8b1419695c60b99e9d0c02", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-regex.json b/externals/vcpkg/versions/b-/boost-regex.json new file mode 100755 index 000000000..22ea1104e --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-regex.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "a10bdc49cf30856030ed08921a5a30f3c3f3bdb1", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "f04cda8dcb436a4cfaa008331d05ef2d0974b698", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "c7c4497156a2c9e4f3227ee3807512630242307d", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "7803a877c9e9acd2162106e3bc15eb363b6b069a", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "9b5c6faa967ec00a8f3ed0aa1bb1f82564e3e064", + "version-string": "1.75.0", + "port-version": 2 + }, + { + "git-tree": "bacde176dddb776105f9b7996de34a3a051ff324", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "d52e8d7a6b4b98dd2c489abac3e33d108e8afdce", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "f9b464cfd360625b5d29a7ae731c36354af05cd5", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "de4ccb00a13b4fe4b28d27be7da9a2959f8d43d5", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "b61c5d82e609c7e3826c7b19a45b9fc102ee9544", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "bdaadfa01307e637d7cc6e669da68feb4f19358a", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "3269dd4ed71148cfa61587436d96058e58b799b1", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "d4f7fc5b13dbed2badce5c38063a8ba06e2ee977", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "48c27f7d81f24494594de9eab666d70836bdce0e", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "014297cecaf0ddcf8801ee52864d66f9a7bcbfe9", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "24725c0e6f8784c90287ad966d89a0ce1446e3da", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-safe-numerics.json b/externals/vcpkg/versions/b-/boost-safe-numerics.json new file mode 100755 index 000000000..9899a3459 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-safe-numerics.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "ac39614e028fa51d8de1210c0a003ecde411e156", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "d425b6103c0c8a5824e74768d16fee276a33e99c", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "fc4fa0c3b394d848fbc83ca16bcaec15742ed3db", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "69c7ccf5d656e92b0a71e2456933481338ddb675", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "1a6a483b16ebab8a08db06a64157d9eb563ec0ea", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "7a64b01c4ca808e998f62d3889f7d21fdc9ac29b", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "db4ca1a37a1b6f58fd39b61a9a1ff9c8b3a5267b", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "c7691df2a74b37995e47c47c1bda8809f0b9d1d3", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "20cfe7cfaedbb7b7999a71171fb7027b12a21dfe", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "b77ea4e8c3c17627465da32b39aeee79dcf8ae36", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "21dcebb8e32cc01c1b9da77cdbafa0f2774f222a", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "2ed9daec6c942f444508c6b182dadf0eef889481", + "version-string": "1.69.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-scope-exit.json b/externals/vcpkg/versions/b-/boost-scope-exit.json new file mode 100755 index 000000000..3ef5b8434 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-scope-exit.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "a27fe8833a067b072476368cdcbc1ae686236578", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "e3d93cccff577045dce502c87ffcb02efb259ae8", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "33d55355e2f85c6188f1d131f386f86b8e29efc1", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "419330b673f261bc92184d6f65b442bda6fb0fbb", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "b9b04d9a4c678589f8944d4bdb2b33746cfe21d5", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "8fa4144cd296ee0a1dc3b94885e9ca0e929d0455", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "48e5d3b3c6e3dbaa76c9f15efafcf68bb2e5f5c9", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "1edee114d8de1c81ceaf77247e9528d4ef7a1501", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "25aefd5e795b2b5924845d26124c55fdf7805d39", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "07195716f55b643cc65cc377467840e151b3612d", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "fa86efc2dbbc71d3e774168dfc33132e4c0fedb6", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "351acfa4c6ebb40777051fc8ff690ac58c3aba09", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "dc3c46019810e572f84a4763dc7488a2e33f6ead", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "d5d33e7e395d24c640d0dcccb36f28ffc22f46e0", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-serialization.json b/externals/vcpkg/versions/b-/boost-serialization.json new file mode 100755 index 000000000..11b12507c --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-serialization.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "aef44ba080120ebe8f5af25a6d019781323a5206", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "c51578433055196c6e74bcdf792f4092479336de", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "bdb25d2d55569534825b139f62cf29a2f7aaba6e", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "7cd97a04356c141db68bfb6aec62c68e467f9ea6", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "69941aa4846ac99c267c3173ddd5d4fc0e64aa42", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "dc3da425b2263d9b4443a1344007bfb0f395cb38", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "df6523833c2d6808dbd43791234cf067a94fbb12", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "2a31e8cdbc82b37a61fdad948249f7e314ed3e58", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "d4b9786242cd0d205bb3a2d8cd21b020cb7d0a2d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "be3940250a015636c06a04f2ecbc2426b75e95a0", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "ea20f0300a1af6300c1132038dbe65c5deb0e428", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "8689534823be018efd6158623b2bbfa30d692b88", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "992416ac0dc16fb2b145cb8dce056951fe358bc2", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "d197dd0f237c04b277a4b1fbe2b12cd5a99a3b84", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "d11ba4cfd902b080ea15e1b3c6da7f5dd9718124", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-signals2.json b/externals/vcpkg/versions/b-/boost-signals2.json new file mode 100755 index 000000000..a17975d3e --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-signals2.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "f6ab0c163ef679f14f84b6510c8508a90facf986", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "b3a1129bee4ba8d867758248e1b66add1a2bedb8", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "ac3a1ba310974e1653a99cccc34339f29ad43786", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "c574224ceed1d97eb67edfdb398117fb908b91c9", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "767d42c39507b5461591bf3c212ac5c5f1f29b91", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "c230360cf949b220768e7c758ed7facfe446527e", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "2a915d1599c07072c0f1e14e1d83df17a935d17d", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "87d87de6922a4d8032796ffb9d37a9e78416d78d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "b4c9eaa3fab2ce9a835cd79ac95ea1a9357258ce", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "f6861bea368c6d68df969d8aef32c3e1d2addc4c", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "a6b330c3b6f26b4916c6b1145c39d8c63d2d1b2f", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "6fa54e2a7ed9bdfbcfc699b85420e8f0fb1a2ff1", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "c61348056eb07b84bf6883484f740c9565c5c899", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "ca46589531bb374aa5dc11d339800c14238b3668", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-smart-ptr.json b/externals/vcpkg/versions/b-/boost-smart-ptr.json new file mode 100755 index 000000000..ecf115a8c --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-smart-ptr.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "b94b3b41ab4bb281041f40d876baf221c05818ce", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "18806e0372da7b7f8b2d6a8ff4bd7bf074a690cd", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "700532550b70d03254c77f1467ab4c01a2c6e62a", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "f43e22c2f1e0d71baa91b8ac5d995ab0cc0a802e", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "d18232c6100b5b8836e3c14faca691fa9afb1e1a", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "64ae2e6142d5c91d57f9937bdfbfcec148ac6013", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "346986194740c9cad2a8a77d55813a5d337874a3", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "496120ad295ac7ac2d3d87e25ad344e70b6b2e46", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "1dbd9d51df0c2e8f7fb56f8f3a3e0a1e0713bdcc", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "3a67884a42fccc770c55769aa708dee5cfbf6bf2", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "77d4b19196b0c9d5e2e7ddf2616ccda30e930e4c", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "d38abd1148d0451d8dc021cfaf1e3d0fed1a7bcd", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "e23c07e3c33edcb285faf922bf15246ea561afa1", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "bca03314abd2fcf7d1c20e6b0625f71d5f8810c7", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-sort.json b/externals/vcpkg/versions/b-/boost-sort.json new file mode 100755 index 000000000..6a72e1ffa --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-sort.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "74c73a3ccafccfc9e85fe3879ea90ff7a13ebcfd", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "fc0176556b8aaecb87376a59e2f711a9068dab3a", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "af8327ce79cadcc43327a0f75d79b2e5feed38b8", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "078e3d6c36e55a55d2af19d02036437d6dabff5e", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "6838da5ade313772c95807dadf2c6f10978887b8", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "c1ca8ba2b6acb4a4bb92c3acde6f11ba41f781dc", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "956f9b4d12deddcdacd1fdbdde8af2556bc5ed37", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "5a15c890f01cf116fa2780f64ec023bebe9ad33e", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "44deef7477fda8e74ba1639c7c0c3f68f2f051ee", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "e31a83a7ea77b007e23d5571e13fd50fc812b4df", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "c38dbe69658bd2ba811e084a0506ef91089df94c", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "79259585455c9a147d23da62aaaad316e9e0a705", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "28f38389b2b943f74742b55e57f8b593e81197c5", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "e6c059e9ed2be834bcadcbb64b5e9cf5dce2daf5", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-spirit.json b/externals/vcpkg/versions/b-/boost-spirit.json new file mode 100755 index 000000000..fe5dc4639 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-spirit.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "6a4bdffc6ef22bfee8942319cb5a69b2e85fe231", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "05502d056fb4e5569f87cd2a591ce5802f4020eb", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "bc66c5a9ccd7f7bde95426392bc7ff62189f920d", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "0fd209b14daf0b5990c60a1e10a6d92dd03c009c", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "7e42477706e50953271cf2b9ce6d3f4ad9669124", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "c5f1b643139d3ced0325e49d58322066037b2114", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "c000ac17ef26528602d249511c28a8f82484c7b2", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "6fc1172e43201e03e87bba11ef2c233f7b795f44", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "0b0d43428e8c359ea681398b1a9db6b921e2ba2e", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "cc606d6cb20a92527a0f6fe77e7c1fed26f4141b", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "d88b6b6399f661e8499a47a46eacdc29bf12a8a3", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "7703105abc52e7994ae0c34dd92e869e3f8cc292", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "9fd98a94bb0f0bb90c48370b0c032ce4876aeac3", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "5e75a1bf820b22f5ae86555402c96d2921bf6427", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-stacktrace.json b/externals/vcpkg/versions/b-/boost-stacktrace.json new file mode 100755 index 000000000..4f1123331 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-stacktrace.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "0ddf64c066bcc3189d13bd7eedbaa646cdb073ff", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "e00114d87145dd426e0816ce0e5fd0ab4a587ad9", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "8d5ffa9ca1552ad32a5c6a78c28a3e275323dc2d", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "02837608d604cde8de8bcbd5dcc706e406a808dd", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "eabe320c7c22c3c4a389aa75ed6ea630fffc5020", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "a6e6a66f2bd2227224064f4e1aeba56cd27d9f3c", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "d1f97a37915b43eca3d51336393fbb58ad2a3839", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "3e89fe0f6ae03fa0051955dc2d97200ad073b8db", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "a5b1378bff1508e443e02a8dba876797c50f8c34", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "c1a348b46ca401b00d64048ff016a1c34e7648ad", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "d29fc35c3d581a3c662318b8cb90f6608da589e4", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "d28ad966e96fc64954bd0fb569c922499cbf84bd", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "7db733b796b8988061000988c406bafededccfed", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "a698a2f55ecb95b7b50de7c5bf363134aed945eb", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "b0b26afd13d3f3bf27206efdcbb68462f2a8da1f", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "692d7b64297b627d70c7a41188151dee9a588038", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-statechart.json b/externals/vcpkg/versions/b-/boost-statechart.json new file mode 100755 index 000000000..5f9279d71 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-statechart.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "b6d892f7ec7ba87a98fd9bd2fced0c0ca6161fcd", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "ef8ccac6b5ef76c3b862e46b9f6cb37169e8b20a", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "044b9fc61c729216838037b6b519393e32b2fa26", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "94c1acd6353e0db7370f742c082c160114f7af8a", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "0a5df3d26698c16a1152ab418b6f6258621eff40", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "3322770a8d0a4e29fe9b9bcf167f9f8c55aa9b2b", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "c1e377e054dff8c480169c8b6196adcdb9d5a22c", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "0c5b644cfa888c4b8b273c2f312959bd05fe9628", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "a992d34a93176220e154aae79675dd42868fce3a", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "f10853ba92bee21021f12e068b2d49d435c4d9ae", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "af46ade625eae800a0f78100c2d36035c4b13705", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "4426492741769f9365fa03b0f55ae72a75daed43", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "3d796b5c6b250166a26290350d0f068a8dbf959c", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "cc2ca4607e8a1b6846bd89b16ae52edb078a05a5", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-static-assert.json b/externals/vcpkg/versions/b-/boost-static-assert.json new file mode 100755 index 000000000..2d44c3b14 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-static-assert.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "673cf82169b2b1696d993477d47b2f94d4350a7f", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "0d1e3a21f0be997c400b7c60dc2ec1b1beccbe3c", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "57ca16ab3652380b32a137add7aed6a385754d75", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "dc334c3a07d041efa802d868ece12150bdef34b9", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "2a41c4703c7122de25b1c60510c43edc9371f63d", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "871d4013cd853e5e440fe61fbd468a8b96f41c14", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "f131491fc0280897f8786f170aaa04950a1326b2", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "e82d8f7f3ee07e927dc374f5a08ed6d6f4ef81f4", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "3de4428d58f0ac3ef3ab748a9b910c288ba31f50", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "9d33cc31778b5cb134f282cd7a11161b83ddc649", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "b84e0e934fa66da86f8aa032bc32ddb447c70b2b", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "effa8bf80331215aaff7d1c40ad873c4afa0807f", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "6beb3e46c04a4fac712635b8524ad876a7c20e8a", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "6d891e259b071689460551d67a60eddb2879d5d8", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-static-string.json b/externals/vcpkg/versions/b-/boost-static-string.json new file mode 100755 index 000000000..eb5736433 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-static-string.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "575a5fac2b96da2ff39038a733fea5455f91caf4", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "fe40bbd1d9be4c65daee4bf8f58a6b08baea4bdb", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "8296453890169b2bf99e2b7ecf4231c7ae572903", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "990abb2e15b868e2f80750422c3750e11700bc17", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "3bbe6c7f88321969abd4926c439851286fa4cfb0", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "ba59342bca213a38e77b5abf9764826927f31e06", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "313a87142b4f844e7a2d839309bef8a39c8f023a", + "version-string": "1.73.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-stl-interfaces.json b/externals/vcpkg/versions/b-/boost-stl-interfaces.json new file mode 100755 index 000000000..2afb9cbcf --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-stl-interfaces.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "1f59d2ba966f1e2c2ef5f23150c5a8dd348d98fa", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "536059a4a77be87c1825fd1523cc29e47c86541d", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "0e127914d34e8dbaebf9f36fe800b8bc85252233", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "4b74daa481d1f60e2d6f9c6b221a80dc8668cde7", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "39f712a73b762150961fda9a9f81edfe2ecaea32", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "be85d9bd6d129bf9af47e0b4cbbc966c08fe02f3", + "version-string": "1.74.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-system.json b/externals/vcpkg/versions/b-/boost-system.json new file mode 100755 index 000000000..4191ae074 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-system.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "e5bca2d39362ef3978473a1d184f017ed277d1e5", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "eaab2373181b829bf4cb4ee298dfc9c80e98f01f", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "86ac553606d3af5cf67b96bafd1ddaf9e6c57b60", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "c0286de08a3fa5ba043e432b986df78f4defcc96", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "0a1188e2c052f77ac0b2152eb3ad78e19ed29e0c", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "48db433d88b5e7a37e26f8fae95786790be9b158", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "ef09e0f830b84cce404229bacbbad7bfb58ee46f", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "3a5039dcf7b8857d1c8293a4cf40942023604a6f", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "b6722bb909e96ced9b3d043365beb524139694cf", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "4250413c5ce279a13b4c21ff6244a21fc8f13a50", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "7836cbdbab4e91472fbe3e828a89c42b63d3f220", + "version-string": "1.70.0-1", + "port-version": 0 + }, + { + "git-tree": "bdb51c22b1c2b5588a71378f0eacf34fb77535ce", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "f23babc95421144bab207f6b2dfcbd6f8cdea32b", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "734c3846580e4d62401506adf6ec95e0f9c67dc4", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "7922688edb05ed05f51e00f4793acb94f6284e06", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "a097e5c43513d91ac8ff646e3c5e5b3ba24fca17", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-test.json b/externals/vcpkg/versions/b-/boost-test.json new file mode 100755 index 000000000..4ab31b8de --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-test.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "127affd76f8dea78857d11e147a2cd03d8e827e3", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "5015382ed40be617a3ec97adb17c0c1ecf3ab2d9", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "6429276e9f4fa438346cb3d41e73b9c15bff1868", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "9bab6b8839833eda9df6a0016d8634d129fef485", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "5ae561192927eb3f6f55b6e4370e5f85d18f72f0", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "85ea380a4cde12732bc96bc9b4c092909421afca", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "04265aa4f689d56685b42bf28f2e26765bbdce64", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "df00b98a0286d12dd2f1d17c09824c23425001e3", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "de0ce09d5749cbf94461ad62c8a57bcb103777a7", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "5d9504bd94654eefa35421706e8d6dceae9560e6", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "d3f7b73a7fa28e58a177da854620a43cbc26c0f1", + "version-string": "1.71.0-2", + "port-version": 0 + }, + { + "git-tree": "fb08e6bc51befef2eb9553791764940a2758a1be", + "version-string": "1.70.0-2", + "port-version": 0 + }, + { + "git-tree": "39fc82e5c21755871e00352516937f805e8f0583", + "version-string": "1.69.0-2", + "port-version": 0 + }, + { + "git-tree": "c39461bce96acba27f69260f64db03963f126560", + "version-string": "1.68.0-2", + "port-version": 0 + }, + { + "git-tree": "d81331534236510acce87442ea5543c29db97077", + "version-string": "1.67.0-2", + "port-version": 0 + }, + { + "git-tree": "e4a53915142485fe9c88a9df76628f3ec98fbf83", + "version-string": "1.66.0-2", + "port-version": 0 + }, + { + "git-tree": "993245a1057b1a17b03ab592cc1303b4a40b7f5e", + "version-string": "1.66.0-1", + "port-version": 0 + }, + { + "git-tree": "7061c73053764f235ca6112af77e67ef84b55fbf", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-thread.json b/externals/vcpkg/versions/b-/boost-thread.json new file mode 100755 index 000000000..d08ee1097 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-thread.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "d40c962d08c08d397520ace757ef7aab055a59be", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "ef371df76c2b790aae7209d2866c467bd6d339be", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "1c097a032a997463e15245272e40ea9298554f8b", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "ef29c4cc84cd28ca6cc812794dfb264709dac11e", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "281c8b8c17e414c9b0fd0b0bc6a569fba02d4fff", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "e37b7227025ce689055e4fa560973d0d8778e6f4", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "12e8de872c0b45b884db604ece353585ac66bf45", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "bac44c27a61325152af7b5470f7b8f6b9920928c", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "9f8ea338d5b510309f8a64f04766f5cc3f4d32a2", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "a3cb8223a9186884ca8881c2eac17ac37415663c", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "40bbe28aaadbb700bce86e15962e088341c34da7", + "version-string": "1.70.0-1", + "port-version": 0 + }, + { + "git-tree": "87d272992bc51ff47ee345f377148c5dbef22707", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "4a05d4c14b5445d58a08e8bd81987673e7d8d294", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "fac02771c6ae3a7e91f63ed40375357ae25ed005", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "099d6b8e2429a8702d65d7edf56dc9c4f9e6d2a5", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "b35a337eed03a72499ed08770dc5bc79ca285c53", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-throw-exception.json b/externals/vcpkg/versions/b-/boost-throw-exception.json new file mode 100755 index 000000000..99e1b9354 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-throw-exception.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "1607edf60f1243503820e06b4d3e16c385aa691d", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "2ab1c68ab2a41696a5f36841a66178256b8d229e", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "f0887800c8710d96015c7c1541f78265e1227963", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "29a39e0d594d74febccddce3a077ff39c484fe21", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "b13bdf32a20786a0165cc20205ef63765cac0627", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "1f89573490e0b85c91e0b0e26da69287d02eff91", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "f7f521fd833b3a78f070d8ecc79747cde60d646a", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "64df295f7df41de4fcb219834889b126b5020def", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "b78dd0a3e6ede4a123197db887e928c36d6bfea1", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "eadefcf3d182c023ff231e86e6d3f3b2ee7b62af", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "2b136c90d4171b755b9626e11c69220b13e2dbd4", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "66f2fb485888ade0b17ed3e66a256b81214341cf", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "a168b3729dcd60ea97a765db00dff076d1906ca5", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "79f3aab1a3420de75d36beb99cb22fb2cca12e03", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-timer.json b/externals/vcpkg/versions/b-/boost-timer.json new file mode 100755 index 000000000..16c4d848e --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-timer.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "ebd77c0ba62a3665404c4143e4208b387b57a5ca", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "bf38eaeaceb0c989b414c6570b560e28822034fb", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "aa256b5fe2ecea8dc514e446f136bbe1100a9805", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "7e8fe8dd0d1524fc679c48bf4ca41f31a99ebc36", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "7375c2b2d13b38482bd523adda933c11bd113b51", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "05606fbfb07b35716e76153b1e0d5b481f6c8c4f", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "8c7b4e5dbe9c0635836d34927cc23899459dee64", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "ec9ee82d5ebbbe5bc4f9c19cb1b999fa584d5f15", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "a3a4d63652cdd22876f9409ec61a84d162e2fc60", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "1a6b9527ec613a614601a841ffca6bc7fbb32a5c", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "50cbf677f19310767ffa18ffd6c1ce44c50d2232", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "53091c6d7704f7ab1bbf369c37d492d46d8fef1c", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "c1ddab95bcdcf7a931bff607b9cc79bf54cd1a93", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "5b7731ad8b90f59fc6e8bb56088390274f479697", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "cfff6c7a460bb95152a3256f445876bf1ae0de4e", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-tokenizer.json b/externals/vcpkg/versions/b-/boost-tokenizer.json new file mode 100755 index 000000000..c9e2bd3d2 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-tokenizer.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "7e5682fee6727bada3b88221bd416edaa80f6a34", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "24c6aef67afefb01d20749d7b43790efcb1dfc66", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "56a1fb828a469ba50000983860226452c264050f", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "2b9b3cbc205006491c43f7244cd4a046961e610c", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "ce248c1ba37037937a656c72bfaafb0d523559e4", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "d890c67cc38ddce8342e4aa562a9616e0c6a0867", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "e5bfeda78c8d8c3d87c42eb1f56fa91a7757eedf", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "e89c1589ba3f4d1e5c7c33fca4ffe39e98f3f482", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "cdfa7b0092a0758580da3d935ff10fc5d787b80f", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "8a5552093fcfcec34893e5569e4fae0bd4b8345f", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "09f264b65c105bd680840a250db1bb3dd7fea89f", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "31ba0cf0bf5b52ca8461db12511ed732e9114cd3", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "7284a81ceab33f80f6df51903f489f696298a81e", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "5ec38f4d91af2e1f7f09f57886910f750244290d", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-tti.json b/externals/vcpkg/versions/b-/boost-tti.json new file mode 100755 index 000000000..32275c106 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-tti.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "027de695e13801dcc7a947fea766bd29b687e7ce", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "c47f152005c71db858b015f18edf72b02f7ebf27", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "102fbb95889400677115252d4a5954a2f7edd5e1", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "878a097bf8023343a8af384bb30e0eee437a6904", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "9881d849d33fedde2628cd86c41a58731c18f3e7", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "501d5e8c95bc65e2981961705ffb3a9439a82215", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "9de156b86d42da0e2a6270f055348fd8775bf074", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "d72b195b9ce5fac70f1ec5827cbebc7d7c7fde31", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "398c45dad3e814b515c06ce8c8583ea4d3e8d8bf", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "a45a22438cdfd5338779a05ffecb022d738e7f96", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "aebf50464d8d22aa5f7c780587f2678026545712", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "93f6a8ec049f6cbd3f58bb9d724b6b8911ef0b1a", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "b10f1ce4f70393804eb04ec64a8067f757d566c2", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "87ea566fd6f9fc801a7ae1dfb886d537ecffd00c", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-tuple.json b/externals/vcpkg/versions/b-/boost-tuple.json new file mode 100755 index 000000000..12c56edea --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-tuple.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "c3b718eea1f62e7b4918b3c4f6a4be731d4085ce", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "da0a88c5630fa116b473e02aae6651199529649e", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "35d10ab4f156848f6f08f8bc26e41b27638af55e", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "8b10179f5ffe71f697610799b865c72d7be1dfb2", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "22e3d000a178a88992c430d8ae8a0244c7dea674", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "562f2fee1c2129626c5b8421174ff84736151973", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "bb5cae261bac33ab0ebb8c0b04101c62caf190a8", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "b3e1b01ffce6e367e4fed0a5538a8546abacb6b2", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "64fc3b0ef2ba7aef6abb102614043d7a6cf19547", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "df5ed8963506ba03134775932cda4440cf77e2e2", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "9bfdc62df0b361a82b4c4a4de4b432f2cf294ef6", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "dda5e202cd4f2dc30b518b1ef81bb66a58940c7d", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "1caed0304a71e0e4e820c8922a7de56cdaba6b79", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "6d6bf89db13afc182b82cbbb666fa93fdaf574f5", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-type-erasure.json b/externals/vcpkg/versions/b-/boost-type-erasure.json new file mode 100755 index 000000000..e08969c22 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-type-erasure.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "f5797832d5179682e09ba62f0f7cf25a58cbfe61", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "787c75c5f25da496fb26723589ed3ea5c2c73a49", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "d98f14bce468d5ac0e5fca0f61bd6c5eef911224", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "b488a742d2f94e05da4f00a2fd3c9cb46fba13df", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "9daa807310b682ea2ed54c59d9428d3b2723c32f", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "49c43a8416a153e6c4e74961052a305d77b4ae1f", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "c89bed9c69a1e46e0ce5a6eead498a7079790321", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "1508f27714e220d2ffb2a4616b144aff6b64d1aa", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "1939a16f61b2975d16616b2639f3b7650f136235", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "1992a8c6b6aacba1501789d9e0a7ce7c03bce971", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "a652501ee6a0cf7af74edffab459507cde4e7b3a", + "version-string": "1.70.0-1", + "port-version": 0 + }, + { + "git-tree": "fe070b82349f4038aef2518d7a25f7c4f82ec4dc", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "56ff420088d27eddc62baf6216f44081cddba66a", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "00048b24d2a7a56b66e903dc55ad08552d410020", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "a83f188486e22d3339a1545a5ee8d683efce0db1", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "5b2b6fcc5a73c99cc1ea645aaa7c4423067db7fc", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-type-index.json b/externals/vcpkg/versions/b-/boost-type-index.json new file mode 100755 index 000000000..0fb9eb020 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-type-index.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "b4e2eff6204ba68938a99059b23d3abbd2e1dc55", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "fac6a10bb329da6cd19cfde9534ef11b3edb8623", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "b8c5d86d75e307f04c4e5548f2ff57dccdc29e40", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "2125b24468cfbf25aaf0c3f600cda9b6773ffb18", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "1ed3f10185cfa0140d6b5dd5e7be18b7b3b447c6", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "6b914d083750c72bb4c7d06fb7e7deef60143938", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "cb66a1ce3fa6b73c6cf579c4ef4ed522d044f614", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "3cc8b8f2c29b09a143a0a4457ea6506fab39d28f", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "cac4808e4b98fd347adb090e7ae708796bc45804", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "beef9158a1456247009dd8e0e652fd350dea8b13", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "0608ab262ba92443a7a2e28a3cf351e2a22206e2", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "37602b22e5d865cb5e06561fa7a4d1bb1f338de5", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "d0055c098723d5c4532037e495989f246be0e405", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "4cff8dc347bbd84314c1c583ff76f490b3e6c608", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-type-traits.json b/externals/vcpkg/versions/b-/boost-type-traits.json new file mode 100755 index 000000000..e3a6b2583 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-type-traits.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "7969a397a6c03205ec1c118834272183ff4201c7", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "8ce0cad0c57f4acd5da2369894a0db64b918ac41", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "7f108bb5313d004627d2b81b5e2a6d7298b091e9", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "2feae16df79f9f3d24b98d407e542458706426c5", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "8829793f6c6c913257314caa317599f8d253a5ca", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "e1d488b4b26c28e7ea1e260c96848efa91440c61", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "96512f55a3d7511a8e3a18c450b5d0b9f4656137", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "5e44ec657660eccf4d3b2710b092dd238e1e7a2d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "3c704482bd51dd8bc367004549c17e9d3055b61b", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "8c895c6cb9fe88504b8b83cf8c4a20e08d50f31b", + "version-string": "1.70.0-1", + "port-version": 0 + }, + { + "git-tree": "15ad64909825d185b509efb82e26f52506c948cc", + "version-string": "1.69.0-1", + "port-version": 0 + }, + { + "git-tree": "a6c6cf3c6a45343bef732b4edf0f0c6f5202de3b", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "bcad128d5506265d5d986a3683e178cb2ec8c360", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "6c118f2ec5cf2ed118564e187d386d36e8a92213", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-typeof.json b/externals/vcpkg/versions/b-/boost-typeof.json new file mode 100755 index 000000000..284581881 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-typeof.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "81216888498f3c8f6563b991a1d601af139da128", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "478fadf37863e72ec547e1a7620da6a28cc85c7d", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "7df16df37b9fe9d5e4184dfdf928030010522f51", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "6f493f75125a3d4c8b69fccc3c72ed6b868368c4", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "99523ccd2d55e2f3f04e1548a5e9ad899d482740", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "c977ae832df8c880d62cae1434b836f93d93360f", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "5b74820e028b2f24e7da23740f5ca00a34fa1e10", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "a559d9f2f7b084a00669a37082bee77cb8e26619", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "165e014fee340d51facd6fa1018e181389977bb1", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "6cd58db8edd3c36da6fdcfba9f8c46cc6fa424be", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "247e15545701ce59d9a1261843bfd0a9073c6ea6", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "eeb05d075b53a93ea9b5f473311cedb7a19b7072", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "3c1941add0bae53c3883ed66bd68bc06653a9ce7", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "8c250c90ffc91633c9d349f845a1c2f1e35d6468", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-ublas.json b/externals/vcpkg/versions/b-/boost-ublas.json new file mode 100755 index 000000000..aa3b3f22a --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-ublas.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "7657da84dd6a03bc4130b2c3ff215f45a5ddd8c0", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "4c6ffcc2498c1521634d070a99e02c695f069c2e", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "7261e769f15495294c4eed2d06a157979419b0a9", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "845a49ec34532fe2ba0d071e489eec10808499ab", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "c1e8379989f44bf779ee47f1b102bb450963799d", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "886844895cc3cc1bf3c0440d58c35ef833ec1fd6", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "a506df2b6ae04dd5d8d81c72c2aba96c432059c3", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "f52e1b70ccf697ec2f1bd1b65e36c717d62e2f8e", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "a77604aa79c236a0b647ff00bb7fe6de9c4dd9da", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "daf720632883046e99dffe0405912bd2bf8ddd1c", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "c97c7bcf450fbb18d8697777d21d250ab90af0ee", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "4217a7a788ebb948dc97f0c5a40f9f811da55b29", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "00dca0edbebdf2225be728a8a7f4055455e187aa", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "f9cbaf2dd9eea2815aa267762ba53ecdff47002a", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-uninstall.json b/externals/vcpkg/versions/b-/boost-uninstall.json new file mode 100755 index 000000000..91a61ecaa --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-uninstall.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "e2d05f10364104d9b7de2383bcb105a1fd3fe975", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "996078abceb6009fb2841dd97edc5246e8bd38aa", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "1d472d1b44489c230a741cb519e893732f5d00ac", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "092a563d81779e6bfb0ee656bc4c8f01f57c7666", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "08933bad27b6d41caef0940c31e2069ecb6a079c", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "bbd9f511923b04506c7bdedc3b1b89eff6939075", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "fe74b49c39386f4171827ee18acab23afe6570a6", + "version-string": "1.73.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-units.json b/externals/vcpkg/versions/b-/boost-units.json new file mode 100755 index 000000000..e3f1bc493 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-units.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "33f1a2b53e7c36f387866d1e84e0dd2aa1b21c4d", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "30bc337bdcbfbfb7339e8a4dd2169df60fbae249", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "696b0e8e934400879bf390ad024b231a3b32fa4c", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "fce0be543d0eabb6160e3294f89c10165623e53f", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "2ffcf405ef8f3b0cf735c47a21bd7082ccc17779", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "b6f52a2069891a08e69e565dd1b77ed50dc8c153", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "01ffa3e6852709e3a68d9d2a08e8619d4a3dd761", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "16363ec5d1af338befbe98cca09cc3b4d0b016bc", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "81a6f440f2793649c0b0efd93a6fe078e3b79c4f", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "442302b3c2255bc330fafe8c637664568714b79c", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "92c1cf9aa29e5b13904de1c303ce65e81944ed7b", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "c201d317f21285c8e7995056fff3276627209cb8", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "b10117f248194e7fa753b75ca1947eea900b0a82", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "f31078638fedbb265dfecc5ff2a57e22c654c3d5", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-unordered.json b/externals/vcpkg/versions/b-/boost-unordered.json new file mode 100755 index 000000000..55f0df6c3 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-unordered.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "b73d98ab77d4de1a3e4f12bdd84869dfc3adedc0", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "c55ee280fedefd69dba819a4d768d5a5e132f9b9", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "e0e056b82651533817c1ca6dce6fb6239ccdcdbb", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "f950f2d90f50ec8d7982801ae8df77ab848285a6", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "28c6f9fc668fed0a0f193cda0a99619e8beeb398", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "417509630e50c5acc581f6de0de0d9df2ddbd039", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "44f800096cd2cd980864cf0930ab3ac8fb802ae6", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "c4f9b65d3387c7cd9a3418b7c37a1951ea3414cd", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "ee153a1e836ce0d5d5fcc4e1c263ad821cb49f66", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "2dc37fc7dcc2d6abb9fb3c7cf0ff792df1aa6d75", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "26a98546a05a6d47badc4ee4353cd4e9a3b657c1", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "302904425988af035dae121a08e825fefd300ce8", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "c7d9480c3a3cc8c5ce261b7b000f5414598bb7be", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "3251fef6f3ed1e0e7d0ef3de8d2bfddcf8aacda0", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-utility.json b/externals/vcpkg/versions/b-/boost-utility.json new file mode 100755 index 000000000..c70a51a9f --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-utility.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "8eb91c7a3ad14393219ba020d3d26c39a325c626", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "4e39c1737260328064c10b743aba90788efc467a", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "e3589215d60cac29105fb361ef70e6d8befb8f94", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "aa3e587e5d4f80c8aa934cde043ac5940adaed55", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "47572946bf6a63c731b9c4142eecb8bef3d3b270", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "ccd0b9f9a2038cb05ab5d1f0191e8339835acdcb", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "3a6fd97dea7b338282794863c9f12a00a19bc998", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "7d721b2458d5d595ac341eb54883274f38a4b8c2", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "3c4b288886b3c768a877e7120d8be3de70f132a5", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "0fa784ada078c94136a617eee6658dff2d54783a", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "5cf5376f161c7c7cab3fd04c8f7788e18a15a29b", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "7dcf0bbcfe96352c9b71596652d84b89ce2dd003", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "8b440873324bfda9976d126c2e859e95517aa8b5", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "7ff3565c61004bd559870fe73529c640d2b37dd0", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-uuid.json b/externals/vcpkg/versions/b-/boost-uuid.json new file mode 100755 index 000000000..1d0deec26 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-uuid.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "dbf4e64381a3c6279ad5f91a7c64c8f5ca9ef145", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "19c834dc170873080e1c6308233fd9041ae42cce", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "ce741d3c6c5770db02da8abb268bdd0b2cd0519b", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "5da2f125967693081c7afcf81a327fb6b63343f0", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "6fdc41ce442e95260c89dbb925edf9de8fe69fa4", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "0189eaeb3291115448a4489a963573d1699ea3b3", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "ab93b56cbe60c45a9b104c2487ca21fa3c732fbe", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "a72c1523545fd9f52968a0640d6e70c3007a90d3", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "f9776dd0dfefa4566a2ac8943a25ecb0f62fed76", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "2180a32f9ec248bf35d5465ae58885da9ac73cc8", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "485ce09ae5b285a310bbfcd54e0e7012f73cdf1f", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "bcb1f96c361a0f0fae24187a5b7f6cd8cc305156", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "4bbcc8d7612deb3405ce918da6e1695cdf265ffa", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "a7f7f5f4406f0aa8ab4f3298688e35e7ace80a75", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-variant.json b/externals/vcpkg/versions/b-/boost-variant.json new file mode 100755 index 000000000..2ab0af977 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-variant.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "33b3da200705df22017f639acdc1e2eade79606e", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "a2196d2cb8c61db4cdd6285170589e079c1ff3bb", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "63d66b780f8fb2e1b7c1365fc54b23795b09279c", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "cc3ce58ddedfd3cf1d23a75154f3939a1f7604bb", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "3ecbd86059d27b3f63278089ffe13cf974f11926", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "20a957c6b26ab6e198703dbba3798e0284512c86", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "88c6eef9028f80ea6e91909d11e9165710d36783", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "87357492dfbd9319f5a3509a8a5e590738f166b6", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "c9924241bf6b0e8593c7e221d1feca0d8af71a88", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "5de8f950c1497eeb8c8357d385bad992b145c21e", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "b0afb2236747e7738303dc64697ddbbee116be62", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "3402583d5397ad2674fe6dfa58268ac904d8ded9", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "66a8424b73a3f8254eb75a4c89f4ee31f5af64de", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "fa1b9542247c1b7883eba711d08fef6f2eef7db4", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-variant2.json b/externals/vcpkg/versions/b-/boost-variant2.json new file mode 100755 index 000000000..45816131a --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-variant2.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "b9af9e4791e65b001bbfb107eeecf819369a06b3", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "30915b5f5005d9b166f4349f493b4f7314d84c17", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "7cc13c2fc5f9f303b76d9fc39da52e198bd6a998", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "e3a2b15165133dd1a0ab0c5477e521e25ad02a31", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "fe84b0a24b896d88677494ee69347a7501746002", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "6db0d72abbf8ed888d15c6f76204b4832c2243aa", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "9520cf21a0bc2b52b316acbf141f1c1a1bbca3c3", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "96dd9caa0e1c42029b18c7ea4b5122a96d167443", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "fca12216c8b22e1e91d9d527440a0ca2b630c7ee", + "version-string": "1.71.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-vcpkg-helpers.json b/externals/vcpkg/versions/b-/boost-vcpkg-helpers.json new file mode 100755 index 000000000..410926a28 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-vcpkg-helpers.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "0e96a2cb3400bcafd55070d18bdcab64808ada01", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "2b601d13ad505473bac3d555d9e543d981c46565", + "version": "1.78.0", + "port-version": 1 + }, + { + "git-tree": "b8003935ceb891a870f1bbef0ffd18ef4266c6f7", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "f0b625fd73edd33c92f70727a4cf068d0268379e", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "2a21e5ab45d1ce41c185faf85dff0670ea6def1d", + "version-string": "7", + "port-version": 2 + }, + { + "git-tree": "749173195871ff15190b29ea87cabef8ca064501", + "version-string": "7", + "port-version": 1 + }, + { + "git-tree": "a1648c6c2074328746d742e28e7bdd9788e35313", + "version-string": "7", + "port-version": 0 + }, + { + "git-tree": "471191263d5fbb921cda78c41293d5f64c9ff59d", + "version-string": "6", + "port-version": 0 + }, + { + "git-tree": "fc106316082f957faedf68cc5d5901fba93680da", + "version-string": "5", + "port-version": 0 + }, + { + "git-tree": "4b2061cc827814bccbb3c79f5f297d772ba2fafa", + "version-string": "4", + "port-version": 0 + }, + { + "git-tree": "f1707816ad9165ffff9f2e25f40e2357367638ac", + "version-string": "3", + "port-version": 0 + }, + { + "git-tree": "1f3772e4f83dd9854008667b64df572f04aa64af", + "version-string": "2", + "port-version": 0 + }, + { + "git-tree": "d27cc122c289092fb50d06554a494a3b2d9f8f7c", + "version-string": "1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-vmd.json b/externals/vcpkg/versions/b-/boost-vmd.json new file mode 100755 index 000000000..4e8f9bfa1 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-vmd.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "5d88c4a6cefe62b5d05e9fed932188a7049fe991", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "d89558e11194fd019488c8e4550bc8b7debb38d4", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "65746c8cdad55d1703218a4e1eeaedd8a8cf3641", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "b2e44500c55aa436e9d239130203e1953f4d713c", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "68de048561ba7a30f2cbba3c472c19cae63230e4", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "4f8dfa7b7636393a50ee0a988abbb24da3660876", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "726e48378ecafbf3937950332718e327b72755b5", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "994385bdae4fd4832a3f6911bad9dadb5bcafeb4", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "6c5629caf9f90150e48fd3793a0cf93689b3b317", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "8b8fc1dd2f03e6d8712434f4b936428b11679407", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "5db94c580dd2db739326288a9fa09ed25e24d660", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "e33b9227b844afe29223e27e783c303ce77ce49a", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "a4ed9599dd8c8c8a20010ee32912d50a701b9de1", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "0cb6162a8f1f001d804cd1d6d0cebec607a12a36", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-wave.json b/externals/vcpkg/versions/b-/boost-wave.json new file mode 100755 index 000000000..f7d56a49f --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-wave.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "d8db04f2186df7eacfe00e02666510ba3f750753", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "fbf126b4e9405233ffd54018c18cf84895f59f29", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "cd8b4e8a20d59332f25b012c8379b8847b98524f", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "0b25e696df99e6186c1018a04d8c66607d330b89", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "d32de46cd9dde4e3a3206a7fa1d48743ec92928b", + "version-string": "1.75.0", + "port-version": 1 + }, + { + "git-tree": "8a33ec8327cf9af65de2ec5315c97d2caa011316", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "3df5326cad890816870ae9a2e0ad304e284b1076", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "5a6beb99dfe38ed636de4c65f63a87edf23e1701", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "95b87d5425cc4cabb24134a371a92d8d89c9e6dc", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "2d219c6be511c134faf77a77f4a6311aaa8f650d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "4799f93f334fb485eeac86030faddc9aa6fccc46", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "94e7f3e08fe70dc07ed0fb27cc0f2e56dd6a0e31", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "05c99cf139e5b9255cd5cb3bd2742fbc1109b870", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "489ad79ac0dc0aae47e3aa7316e8139da171028b", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "8eac228577ce0cd9d08f2ca449535cf50d28d75f", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "e9a75c555c9e47be7e1cee00b656c6bc678b6f6f", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-winapi.json b/externals/vcpkg/versions/b-/boost-winapi.json new file mode 100755 index 000000000..0e34ff2c2 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-winapi.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "7f82a0041bb3b4ac1f3721afe5ba4e24e27c3a3c", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "8492201c09a250964609eea910b3d37c9895d411", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "2d4c0be143dbffd619ac154ef5d8f4fe24277bbe", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "48b21bc998317a6d60c63e07b38c83f4126b107b", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "e7ad07379e1cbc96c79a08a773441845e8f86691", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "62117b89dedc1807c7de0bfce139141aedeb8bd7", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "cd4c6389b967d0622ae9d548ca58b64fc80bf6e1", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "8a10e5aedcd8445a681166eb2477ccfd1efa9172", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "d1e678ea12bf54f2451155df2fcdacd41ce78b50", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "19ee38ad8e9cdb56fd6bdda57b333fbe6d06547a", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "4c3417de972b813cccaa7aa4e123d7ebea1c7981", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "470723c9a0fca75ce966bd1a77cbf0fd30f10199", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "a3af2bc99345063e259760672d0c2c751256b52e", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "1e152377edb1f8868197278f4d691bcd3680f668", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-xpressive.json b/externals/vcpkg/versions/b-/boost-xpressive.json new file mode 100755 index 000000000..5821ac6cb --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-xpressive.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "26cd8244e5c07efa76837461cd426c5f4ca25dab", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "b117a25b1705a9a21ddb41a01bc8c081121d6d95", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "bf04b7076a27d24203528b52aaf41efc83923c67", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "8fea61636685db99cf11030e507f028cfa212bee", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "4529a218720a8856e510778eaf5e2c8c1f1ca971", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "b41f4f06dc05791936ed8f82f934847224e28e60", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "6602308faa3a77cfed6a2640b386e12e8284c946", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "1c6c5ba53ea4b004cf629384bc643295ebeb9209", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "87c2bf709a347edebec7bd9b2a1ca10d1bb6435a", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "624d656b13094cc50fe4f1c9dbe10900076cd7fa", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "2879c781288c19ea72c7a8abdff1becbbf9ccd08", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "5815a43a48c0438ceefdc042d5aca810402ad482", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "c387943293d19f93812594b448b09d980ee09238", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "dd9f5871d80a21bd0a6ee96623e5e91682284262", + "version-string": "1.66.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost-yap.json b/externals/vcpkg/versions/b-/boost-yap.json new file mode 100755 index 000000000..04607903a --- /dev/null +++ b/externals/vcpkg/versions/b-/boost-yap.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "b65c58d6abe35bd1300b250d8d7519a7d56292b8", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "692c496d822a9132dcf05c76bfee43bf7ab56c5e", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "856780f406def0087cc90b0dd0b623a65d78103e", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "daf7f224a26824ae0f4deb4e605e952d97755eb6", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "ecf8a43a095687fe67389aa43323e30464646089", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "b7b7cceb0644a979c72977538180240927428de9", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "efeaf147485ccb7654b63ff9718e3b278e5729e3", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "8e391d021967d9a460f6e6d5b65800da63f69923", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "824a34eb588cff05b3c6af0a36e694b70e4ea781", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "02db42a61cbaaad9cc5a18fc74a4d51a6e7793b4", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "0908df30f087d9efd779ea34ba60cd8a66a2b8c9", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "0cf114b0b2caf786d56a7350e0c54d76c939fe41", + "version-string": "1.68.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boost.json b/externals/vcpkg/versions/b-/boost.json new file mode 100755 index 000000000..5d5f29777 --- /dev/null +++ b/externals/vcpkg/versions/b-/boost.json @@ -0,0 +1,264 @@ +{ + "versions": [ + { + "git-tree": "f742b459c69d004cd97fe8fd62e4b813224eba10", + "version": "1.79.0", + "port-version": 0 + }, + { + "git-tree": "c6924d40a63cbd74c48964edd069a5df1df8b615", + "version": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "19bdc0542dd287e39768144ba2719723a7818750", + "version": "1.77.0", + "port-version": 2 + }, + { + "git-tree": "5fe225d8d76e70968014f7ddab050d7e520709e6", + "version": "1.77.0", + "port-version": 1 + }, + { + "git-tree": "c2e18442532ea17f03c775323f53a3b03ade0b6d", + "version": "1.77.0", + "port-version": 0 + }, + { + "git-tree": "1e18b90b86df900244b7c8c7001ceeac37b083ae", + "version": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "d24cc9e13f1aef8ae26b68f3b3e34495431110e3", + "version-string": "1.75.0", + "port-version": 0 + }, + { + "git-tree": "d0f1655d8c46ee762961387d92587c26753a4fc9", + "version-string": "1.74.0", + "port-version": 0 + }, + { + "git-tree": "1f69d2e5ea88d9dc27a8c63c673154f141503cb1", + "version-string": "1.73.0", + "port-version": 4 + }, + { + "git-tree": "2122fc37c88dd1a918e86449dec8398a01fa9718", + "version-string": "1.73.0", + "port-version": 3 + }, + { + "git-tree": "96931595b124b1e6fcbdfe278d10433aa8db8130", + "version-string": "1.73.0", + "port-version": 2 + }, + { + "git-tree": "107538ffb7becac4d12224ff4626dd4de1b594c3", + "version-string": "1.73.0", + "port-version": 1 + }, + { + "git-tree": "63d6902965351f76a54349c16d7de318c14dbab7", + "version-string": "1.73.0", + "port-version": 0 + }, + { + "git-tree": "9b8b0ee499c305c57cc6876dd8605a85656bfe6d", + "version-string": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "bc08a119d170a0adfe8014b4dd91fad7f12264fd", + "version-string": "1.71.0", + "port-version": 0 + }, + { + "git-tree": "68850f56b534290c069f0fe4ef9d97f7025a81cc", + "version-string": "1.70.0", + "port-version": 0 + }, + { + "git-tree": "c373fa02d226f0262cc6ba52d34fe6111a12f948", + "version-string": "1.69.0", + "port-version": 0 + }, + { + "git-tree": "e6972c6176cb56a986e28431e20c2b33a060db45", + "version-string": "1.68.0", + "port-version": 0 + }, + { + "git-tree": "cf05c5aba1d1af12659a1fd2bdf75720df61888f", + "version-string": "1.67.0", + "port-version": 0 + }, + { + "git-tree": "f1e3f63c6e831af8f1787be0d64d023b43e94b66", + "version-string": "1.66.0", + "port-version": 0 + }, + { + "git-tree": "716fe8d433c8593020b68accdb9890f59e2f4ff7", + "version-string": "1.65.1-3", + "port-version": 0 + }, + { + "git-tree": "ddbec542d798e3b7eeba323111385966e6e87817", + "version-string": "1.65.1-2", + "port-version": 0 + }, + { + "git-tree": "8e8f60d45ad310e9ec3ba28af1040649181d091c", + "version-string": "1.65.1-1", + "port-version": 0 + }, + { + "git-tree": "0b253075f1611f0a86c77494ff3134fd53196080", + "version-string": "1.65.1", + "port-version": 0 + }, + { + "git-tree": "c786bf44c7aeaa4f196444cd79a5745a9bc663d0", + "version-string": "1.65-1", + "port-version": 0 + }, + { + "git-tree": "f666638c221fa08912348791f530970beba055b6", + "version-string": "1.65", + "port-version": 0 + }, + { + "git-tree": "25e362d1bad9d69541f0faa74677a3c2365e877c", + "version-string": "1.64-5", + "port-version": 0 + }, + { + "git-tree": "1dee285bbe05342984987da3460174f47b747b11", + "version-string": "1.64-4", + "port-version": 0 + }, + { + "git-tree": "ee758ff279590079553c743ea61939a32cdb61ea", + "version-string": "1.64-3", + "port-version": 0 + }, + { + "git-tree": "f0f99f25017ecfc45be8894944a924ba9dea5e0c", + "version-string": "1.64-2", + "port-version": 0 + }, + { + "git-tree": "2e58ede1ec4159790f31069e19b7dd3adcaab0ce", + "version-string": "1.64-1", + "port-version": 0 + }, + { + "git-tree": "22b76107a08a4953fec45e53b49a6d2742ba0c78", + "version-string": "1.64", + "port-version": 0 + }, + { + "git-tree": "6d4ec812d4cd1917f6c15c3bcc999745e480fe6d", + "version-string": "1.63-4", + "port-version": 0 + }, + { + "git-tree": "4da649fdf59dee5e7d5cda85827a4c2d72b4f23a", + "version-string": "1.63-3", + "port-version": 0 + }, + { + "git-tree": "db60c99e4dcbf9f83cdb05e0316978a9a3a4c9bd", + "version-string": "1.63-2", + "port-version": 0 + }, + { + "git-tree": "169ad1a96c3294c945f1873d04f274a6679d70ca", + "version-string": "1.63-1", + "port-version": 0 + }, + { + "git-tree": "e842601f9fca85798c0690af2ac695019bc6b59e", + "version-string": "1.63", + "port-version": 0 + }, + { + "git-tree": "54f63d0a146afb8529d9429f749a90ef42487c19", + "version-string": "1.62-12", + "port-version": 0 + }, + { + "git-tree": "021e05591fead1c9e6ed94ff942f36cf06149f5f", + "version-string": "1.62-11", + "port-version": 0 + }, + { + "git-tree": "882bbf98f710737f4056617144ee640f0e46fbe9", + "version-string": "1.62-10", + "port-version": 0 + }, + { + "git-tree": "471aa06c45d5ab56fff0a50a75d77eedb2d4982f", + "version-string": "1.62-9", + "port-version": 0 + }, + { + "git-tree": "7ab4e8b1f0b97df62121410fd2c59b89a03ed8b9", + "version-string": "1.62-8", + "port-version": 0 + }, + { + "git-tree": "970a7333583be9aa9bd03acf0ad2eb76d7ec15df", + "version-string": "1.62-7", + "port-version": 0 + }, + { + "git-tree": "361c8325dc436afdb3b28e22112c00493999a68a", + "version-string": "1.62-6", + "port-version": 0 + }, + { + "git-tree": "50947a16c73ed4c1ae01ae940a9b6ea77bd0623b", + "version-string": "1.62-5", + "port-version": 0 + }, + { + "git-tree": "63c83e9efac3fa2c69e55867cbdb71ff2fdf97c7", + "version-string": "1.62-4", + "port-version": 0 + }, + { + "git-tree": "a17cd67a8d429ea500752b58d23388538d1c500c", + "version-string": "1.62-3", + "port-version": 0 + }, + { + "git-tree": "e4f0d78865135992a6c688f0d090e37d1f65c378", + "version-string": "1.62-2", + "port-version": 0 + }, + { + "git-tree": "cb9dd398defae6e5e25b8df7f8889cb92fb0b504", + "version-string": "1.62-1", + "port-version": 0 + }, + { + "git-tree": "4657f0e4e9e1e7f7a025caf567c8e99710582271", + "version-string": "1.62", + "port-version": 0 + }, + { + "git-tree": "0f9b34f2c83ea913e08337a34fa5f2b42cdebdec", + "version-string": "1.61", + "port-version": 0 + }, + { + "git-tree": "392a06544f25bd41ca24b66f3157ebb392f702fe", + "version-string": "1.60", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/boringssl.json b/externals/vcpkg/versions/b-/boringssl.json new file mode 100755 index 000000000..4f560eae8 --- /dev/null +++ b/externals/vcpkg/versions/b-/boringssl.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "8d28c72d322cf2245e69075deef73c5edefee0b5", + "version-date": "2021-06-23", + "port-version": 2 + }, + { + "git-tree": "ca35c06a32c83f385f840831a435c69231a7852a", + "version-date": "2021-06-23", + "port-version": 1 + }, + { + "git-tree": "aa2649d9a0296ed873aa8fb17c28f38baac51a26", + "version-date": "2021-06-23", + "port-version": 0 + }, + { + "git-tree": "efaff27f5d50195917c54e210f4904b80d73399a", + "version-string": "2020-04-07", + "port-version": 2 + }, + { + "git-tree": "02d882a47dda51d6d001af8ab4b3571e67a20f47", + "version-string": "2020-04-07", + "port-version": 1 + }, + { + "git-tree": "a0fb9977bef29fa26e66155d89997236473f77e8", + "version-string": "2020-04-07", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/botan.json b/externals/vcpkg/versions/b-/botan.json new file mode 100755 index 000000000..7812086c6 --- /dev/null +++ b/externals/vcpkg/versions/b-/botan.json @@ -0,0 +1,154 @@ +{ + "versions": [ + { + "git-tree": "3fb61b05e32ed52193542dd9d5b86b7e2021dd99", + "version": "2.19.1", + "port-version": 0 + }, + { + "git-tree": "2d7fe86d0a8a13ebddda0ac759f824fb9066b644", + "version": "2.18.1", + "port-version": 10 + }, + { + "git-tree": "a091e7d5a75af9eadbaa696b79e44d726deb47fe", + "version": "2.18.1", + "port-version": 9 + }, + { + "git-tree": "267c31f3759881d233529d28ec78e2a0c8d1e9b4", + "version": "2.18.1", + "port-version": 8 + }, + { + "git-tree": "dfbd885e94b11d3b8074d96c92e810a0f1a7be7a", + "version": "2.18.1", + "port-version": 7 + }, + { + "git-tree": "928c19e302d27840225477d4e4b183ca9bd76ea8", + "version": "2.18.1", + "port-version": 6 + }, + { + "git-tree": "7a800cf24fcc51e57dedfb8782753c50305880e1", + "version": "2.18.1", + "port-version": 5 + }, + { + "git-tree": "477e259691b81a016da459532f616b5fca230a91", + "version": "2.18.1", + "port-version": 4 + }, + { + "git-tree": "045c95bf0e7f1352d91398bc0dc41ce5ec5a288a", + "version": "2.18.1", + "port-version": 3 + }, + { + "git-tree": "5f002dd083e6eedd3bdd1d2bc7882d34d70ed438", + "version": "2.18.1", + "port-version": 2 + }, + { + "git-tree": "9257baaf49b708cde128ff31e74fe848ef30a264", + "version": "2.18.1", + "port-version": 1 + }, + { + "git-tree": "5233d2cda62be282a698410ebf3f70f5f2cda8cf", + "version": "2.18.1", + "port-version": 0 + }, + { + "git-tree": "8a0618dd4e015d7a0ae5339e6758c5f1fd4754a6", + "version": "2.16.0", + "port-version": 2 + }, + { + "git-tree": "7776bdc54cb37a29c18701d4332e4537e6be357a", + "version": "2.16.0", + "port-version": 1 + }, + { + "git-tree": "cb5674c8a62b85d8862f3064b2797173df10950d", + "version-string": "2.16.0", + "port-version": 0 + }, + { + "git-tree": "cdad0593bd7a584ff8ecdeb2135b423d54eee1fd", + "version-string": "2.15.0", + "port-version": 1 + }, + { + "git-tree": "93772a2aa43c559c309885a56bc4ae0b92d2b8f7", + "version-string": "2.15.0", + "port-version": 0 + }, + { + "git-tree": "f52798a57954eaa194597a042b95e67abbe8c6e2", + "version-string": "2.12.1-1", + "port-version": 0 + }, + { + "git-tree": "3cabf26f7fc95e13362ea865e084988ee9152415", + "version-string": "2.12.1", + "port-version": 0 + }, + { + "git-tree": "2248a885c0827a1e4360484b549cc713db402a37", + "version-string": "2.11.0", + "port-version": 0 + }, + { + "git-tree": "4f208b0ec8db7c17dac32a16e064566dbe33f113", + "version-string": "2.9.0-2", + "port-version": 0 + }, + { + "git-tree": "53dc2e4b5d70a333570c7e65b4e6572039c26042", + "version-string": "2.9.0-1", + "port-version": 0 + }, + { + "git-tree": "ec10ddbbd53c60c3ffbb8fa7db80014f12bf2a44", + "version-string": "2.9.0", + "port-version": 0 + }, + { + "git-tree": "b2c1010d75db7f0bb02c3023ea2b988ddcaef000", + "version-string": "2.8.0", + "port-version": 0 + }, + { + "git-tree": "9ff0ab321b6504dfccd8dc7b8f9067f3d95a6048", + "version-string": "2.6.0-2", + "port-version": 0 + }, + { + "git-tree": "e0d6e9cdf7d4ad3a1024f1130f5494211057a056", + "version-string": "2.6.0-1", + "port-version": 0 + }, + { + "git-tree": "52d7655f4acf2ce9dd9e0a85dce5c9abc1a79315", + "version-string": "2.6.0", + "port-version": 0 + }, + { + "git-tree": "74299dade32477f47be842b9c39810b1614db455", + "version-string": "2.0.1", + "port-version": 0 + }, + { + "git-tree": "5360c9eb65d58acf2deff29dc503e7764aaf8b93", + "version-string": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "74299dade32477f47be842b9c39810b1614db455", + "version-string": "2.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/box2d.json b/externals/vcpkg/versions/b-/box2d.json new file mode 100755 index 000000000..408aa7cd3 --- /dev/null +++ b/externals/vcpkg/versions/b-/box2d.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "2c8a3a146971f33f497c21d6b52b756245f894e4", + "version-semver": "2.4.1", + "port-version": 2 + }, + { + "git-tree": "f40a0f5f20b3e546e55850df8babf2d9cd526ee8", + "version-semver": "2.4.1", + "port-version": 1 + }, + { + "git-tree": "fc279cfa6011af543c0b1ebb043767acd13a7930", + "version-semver": "2.4.1", + "port-version": 0 + }, + { + "git-tree": "61a9394741ba7f08404d1c7f2b77a9d8b9456bc2", + "version-string": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "62d471eaf5e87ef759a716a13db7decb1cc1fc8e", + "version-string": "2019-12-31", + "port-version": 0 + }, + { + "git-tree": "042a70aea5f44f5fe8cc7c5dfc36229badcf264b", + "version-string": "2.3.1-374664b-2", + "port-version": 0 + }, + { + "git-tree": "202b7d3f4a73dab47e0a05b0aacf48a48189d71f", + "version-string": "2.3.1-374664b-1", + "port-version": 0 + }, + { + "git-tree": "1e24dac01c8f4655c355a3c30ebf0a9adda85f20", + "version-string": "2.3.1-374664b", + "port-version": 0 + }, + { + "git-tree": "840fb28c94896399957f5b7acfa8ae0297a628d7", + "version-string": "374664b", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/braft.json b/externals/vcpkg/versions/b-/braft.json new file mode 100755 index 000000000..9744235f2 --- /dev/null +++ b/externals/vcpkg/versions/b-/braft.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d9afe1afea46ce35f64aaed5c2702c34113fe683", + "version-date": "2021-26-04", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/breakpad.json b/externals/vcpkg/versions/b-/breakpad.json new file mode 100755 index 000000000..8051dbd44 --- /dev/null +++ b/externals/vcpkg/versions/b-/breakpad.json @@ -0,0 +1,129 @@ +{ + "versions": [ + { + "git-tree": "1765629f89b1d8d3020f5e4baa35116b9da02c0a", + "version-date": "2020-09-14", + "port-version": 5 + }, + { + "git-tree": "553a7799e93f9f2b4441d077b379613a796acdea", + "version-string": "2020-09-14", + "port-version": 4 + }, + { + "git-tree": "be41998b0a407c10ae78d605264a2c0bb7d3f3ca", + "version-string": "2020-09-14", + "port-version": 3 + }, + { + "git-tree": "724ca1cc38bbb2414d1efe91f8a95353235ede58", + "version-string": "2020-09-14", + "port-version": 2 + }, + { + "git-tree": "e266c29cb65ac51e96422f0788dae07529f1f493", + "version-string": "2020-09-14", + "port-version": 1 + }, + { + "git-tree": "f088fa69e17bda03e45686245cb7dd47d0351064", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "7b2bb5f2a3d4995f52528e54cf3df165aace94d5", + "version-string": "2019-07-11-2", + "port-version": 0 + }, + { + "git-tree": "74c1e6008d13a09f9b8937445ff64d48234f3fdf", + "version-string": "2019-07-11-1", + "port-version": 0 + }, + { + "git-tree": "9f3e9c1eccd500bd649cad04fdcb202e49d09c53", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "10be3edd4e14259baa2f52e32cd4eae01b30940c", + "version-string": "2019-05-08", + "port-version": 0 + }, + { + "git-tree": "b07a4d267b3235725c4ee929190c6ce2c5cdb484", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "278889227ab763ac44bc3dbabd518cd0bfc71645", + "version-string": "2018-08-03-1", + "port-version": 0 + }, + { + "git-tree": "70da3dfcfebdff3f898651e9723f222d0b493259", + "version-string": "2018-07-30-2", + "port-version": 0 + }, + { + "git-tree": "9625e031da06b22fe747b1fd39815c3b051ead08", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "f85b4570ca43263fa600caeae3b5d601a0d64bfb", + "version-string": "2018-07-08", + "port-version": 0 + }, + { + "git-tree": "5a923eac9f23d816a62e08c9dbb227be2106ef3b", + "version-string": "2018-06-28", + "port-version": 0 + }, + { + "git-tree": "cc07770bafeafa162ef126bc5ad3abad0900567d", + "version-string": "2018-06-12", + "port-version": 0 + }, + { + "git-tree": "4c60174bc8dafd05e1fa12dbf3075bb937ec605d", + "version-string": "2018-04-17", + "port-version": 0 + }, + { + "git-tree": "349bcf71e14497bd57b12e69549004cbb41e0fcd", + "version-string": "2018-04-12", + "port-version": 0 + }, + { + "git-tree": "09fd05fac620d5c99716ec0023ea1af091870852", + "version-string": "2018-04-05", + "port-version": 0 + }, + { + "git-tree": "e2981e346f312045c0d47aa5eac9fff7ede2655d", + "version-string": "2018-03-27", + "port-version": 0 + }, + { + "git-tree": "fc5ce981eec58bcdd21d03618a583e9c85a5aa03", + "version-string": "2018-03-13", + "port-version": 0 + }, + { + "git-tree": "cb9c3c17a2ca2f8cc40ad1f76f16f4f10bc86ca8", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "ad0a5faf3f0c2cac452c9979101b6b1162e63591", + "version-string": "2018-2-19-1", + "port-version": 0 + }, + { + "git-tree": "a7347475d92becb8bd1e4a30c799918a41c1b919", + "version-string": "2018-2-19", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/brigand.json b/externals/vcpkg/versions/b-/brigand.json new file mode 100755 index 000000000..d5b9f4b2f --- /dev/null +++ b/externals/vcpkg/versions/b-/brigand.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "a27641e46efb007b46792b7bd803f32437fe4178", + "version-string": "1.3.0", + "port-version": 2 + }, + { + "git-tree": "99395d0e7569b8b32f76d99cf2183a2a92679a7d", + "version-string": "1.3.0", + "port-version": 1 + }, + { + "git-tree": "c43c5b02c14b89e55f9a85d9a7c835f3bf9ea582", + "version-string": "1.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/brotli.json b/externals/vcpkg/versions/b-/brotli.json new file mode 100755 index 000000000..e00f28e52 --- /dev/null +++ b/externals/vcpkg/versions/b-/brotli.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "73d0ed2fd7816c7a4958983b0b027c85b60eac15", + "version-string": "1.0.9", + "port-version": 2 + }, + { + "git-tree": "8f55fe158d8bd753a6e6908164e03ae4f0b73cea", + "version-string": "1.0.9", + "port-version": 1 + }, + { + "git-tree": "4aaf6f174ede5bc58872943a5e32d96c5e0d45da", + "version-string": "1.0.9", + "port-version": 0 + }, + { + "git-tree": "7e68bd8e6bf02393de13fc5e7d3a57cf3bfc505e", + "version-string": "1.0.7", + "port-version": 3 + }, + { + "git-tree": "0937ca99bab9fc5e64772b4237cc1a31c2f01b36", + "version-string": "1.0.7-1", + "port-version": 0 + }, + { + "git-tree": "836e8e42c4e3b77af26352e20c101f7c6c761301", + "version-string": "1.0.7", + "port-version": 0 + }, + { + "git-tree": "4d17fcb9230ee38d00dab99de2a383ad3c13bf8a", + "version-string": "1.0.2-4", + "port-version": 0 + }, + { + "git-tree": "2120a8509eb5bf1d425d39e80bb14b0974402263", + "version-string": "1.0.2-3", + "port-version": 0 + }, + { + "git-tree": "8f30ae817585218bad8de88a24a708f6fb474710", + "version-string": "1.0.2-2", + "port-version": 0 + }, + { + "git-tree": "ef43588bc6238859ec72888bbdadfcc08b6c1063", + "version-string": "1.0.2-1", + "port-version": 0 + }, + { + "git-tree": "846df5f69ab48681d2607463485cfaa90fa045c0", + "version-string": "1.0.2", + "port-version": 0 + }, + { + "git-tree": "eaea323f02f988a3331968d16effd4a7c0ce9183", + "version-string": "0.6.0-1", + "port-version": 0 + }, + { + "git-tree": "e4658337e5ae62e78adb7939bf3b6a566c7545de", + "version-string": "0.6.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/brpc.json b/externals/vcpkg/versions/b-/brpc.json new file mode 100755 index 000000000..f2a2c4176 --- /dev/null +++ b/externals/vcpkg/versions/b-/brpc.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "c88bb19658430803981fbfa4ec45432bed88310b", + "version": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "bcff3231352f577720f51a99dbf9ecf0132ebcba", + "version": "0.9.7", + "port-version": 7 + }, + { + "git-tree": "f658cec9384935d01319d2725a039da7cb5e6c77", + "version-string": "0.9.7", + "port-version": 6 + }, + { + "git-tree": "eb37098c32016db48b15a29bd31b08087c7b5d0e", + "version-string": "0.9.7", + "port-version": 5 + }, + { + "git-tree": "7c6f7c8a882730bd20874fb5832081105a169c7a", + "version-string": "0.9.7", + "port-version": 4 + }, + { + "git-tree": "42b5a413e49655d73b772efa7642eefff429b4c1", + "version-string": "0.9.7", + "port-version": 3 + }, + { + "git-tree": "0b89b1bee5f50f8bdb551ae2373feb51b144fbc2", + "version-string": "0.9.7", + "port-version": 2 + }, + { + "git-tree": "8d3ba620eff30244f2ca27af0814f78ce9049308", + "version-string": "0.9.7", + "port-version": 1 + }, + { + "git-tree": "d3461edb01babdda0886b7173a7fba194e30d149", + "version-string": "0.9.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/brunocodutra-metal.json b/externals/vcpkg/versions/b-/brunocodutra-metal.json new file mode 100755 index 000000000..dc8d49cf9 --- /dev/null +++ b/externals/vcpkg/versions/b-/brunocodutra-metal.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "8cf9fc40f35037ebc568d8da494ba1c84221327d", + "version": "2.1.4", + "port-version": 0 + }, + { + "git-tree": "54b5610e8e1541618650eec938a77148866716cc", + "version": "2.1.3", + "port-version": 0 + }, + { + "git-tree": "0fbaac9587c177beb827afa12d74cd40005cc20a", + "version-string": "2.1.1", + "port-version": 1 + }, + { + "git-tree": "b96a170666d35da8f66b89c12c62699db55b269c", + "version-string": "2.1.1", + "port-version": 0 + }, + { + "git-tree": "3f232829f6de377883a98c20564515631d8b2583", + "version-string": "v2.0.1-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/brynet.json b/externals/vcpkg/versions/b-/brynet.json new file mode 100755 index 000000000..1d9da2e43 --- /dev/null +++ b/externals/vcpkg/versions/b-/brynet.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "3a4cea82b4e937b478bd400d4a975dde33b3f741", + "version": "1.11.2", + "port-version": 0 + }, + { + "git-tree": "1700fdb373d8d3789f510b64aeee7d79859393f1", + "version-string": "1.11.1", + "port-version": 1 + }, + { + "git-tree": "f164bb20f8c10203d2ab57ecf5a28b5891c5259a", + "version-string": "1.11.0", + "port-version": 1 + }, + { + "git-tree": "228bf2b9f13cdeb9c86f1bf43d9d487e87f78c6e", + "version-string": "1.11.0", + "port-version": 0 + }, + { + "git-tree": "2024f1be91419c1ce3f2df23b3d4facaadcfc7fc", + "version-string": "1.10.0", + "port-version": 0 + }, + { + "git-tree": "bad044dbd66d5067fee727b602485d30c4ab2c09", + "version-string": "1.0.7", + "port-version": 0 + }, + { + "git-tree": "3b2ac80940cc348d324ea44a72cfa9045bf874be", + "version-string": "1.0.5", + "port-version": 0 + }, + { + "git-tree": "eb9f460da35590e7f15d1ad6ef430dac2029abad", + "version-string": "1.0.3", + "port-version": 0 + }, + { + "git-tree": "db463fa0a2d7511abcd288f20b5139b4057ceb9f", + "version-string": "1.0.2", + "port-version": 0 + }, + { + "git-tree": "27a2dfd1bf9f9189b1b096250a329116e6e56bfd", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "6aef5fe19ed0a5a8dbce4e4f41be3e6145b7f086", + "version-string": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "ca9a4a6c001c01483f54245afa62c747e8db8ef7", + "version-string": "0.9.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/bshoshany-thread-pool.json b/externals/vcpkg/versions/b-/bshoshany-thread-pool.json new file mode 100755 index 000000000..15c2ec3e2 --- /dev/null +++ b/externals/vcpkg/versions/b-/bshoshany-thread-pool.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "5ce890350a3e619b459eac4f676aa3e0858316b4", + "version": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "4ec35ab1086df444d30b05ff49cf2a66c21ebd52", + "version": "1.9", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/bsio.json b/externals/vcpkg/versions/b-/bsio.json new file mode 100755 index 000000000..b4a0c6959 --- /dev/null +++ b/externals/vcpkg/versions/b-/bsio.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f44938b5f2dcb43b73f40a5e9220db2a811bfb85", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/buck-yeh-bux-mariadb-client.json b/externals/vcpkg/versions/b-/buck-yeh-bux-mariadb-client.json new file mode 100755 index 000000000..c29277d61 --- /dev/null +++ b/externals/vcpkg/versions/b-/buck-yeh-bux-mariadb-client.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "f0ad91f620ffdc0ad8b2618c79f38aefa00accf4", + "version": "1.0.3", + "port-version": 1 + }, + { + "git-tree": "9c48d5f05cfc1910b874b0d5510ab332c108ab86", + "version": "1.0.3", + "port-version": 0 + }, + { + "git-tree": "67f2e3a599ef1a984f01e973c71ccd5e4c0ba956", + "version": "1.0.1", + "port-version": 1 + }, + { + "git-tree": "84453b40536c8c57162f627c28d4f3a148516ad8", + "version": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/buck-yeh-bux-sqlite.json b/externals/vcpkg/versions/b-/buck-yeh-bux-sqlite.json new file mode 100755 index 000000000..3b3be9e27 --- /dev/null +++ b/externals/vcpkg/versions/b-/buck-yeh-bux-sqlite.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "70a2bfdaeafb4f4193be712ad81e0f9d16ce6294", + "version": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/buck-yeh-bux.json b/externals/vcpkg/versions/b-/buck-yeh-bux.json new file mode 100755 index 000000000..1b235fcab --- /dev/null +++ b/externals/vcpkg/versions/b-/buck-yeh-bux.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "70c9bddf07b6b1bf2bed8f994f13d1d5703ed105", + "version": "1.6.5", + "port-version": 1 + }, + { + "git-tree": "1fd8af12a04b806faa041b8631ac34dc8c535b41", + "version": "1.6.5", + "port-version": 0 + }, + { + "git-tree": "54886a840d4c55d27047321af6de1a5a01ed888e", + "version": "1.6.3", + "port-version": 1 + }, + { + "git-tree": "19d56bb09ecc37268afec6a5384282e562491af4", + "version": "1.6.3", + "port-version": 0 + }, + { + "git-tree": "c952bbb93f152d6db8e4bc8d0fbed4fb6e7ead2a", + "version": "1.6.2", + "port-version": 0 + }, + { + "git-tree": "fa8f4e2afd3a69f94ed947a1dfc0dcb4006ae9c9", + "version": "1.6.0", + "port-version": 0 + }, + { + "git-tree": "b420b8fe7a8712cee4a2317433902c32d4b6634d", + "version": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "4cdd433b94429da69f293e95dd60390daf6966a0", + "version": "1.4.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/bullet3.json b/externals/vcpkg/versions/b-/bullet3.json new file mode 100755 index 000000000..073216c26 --- /dev/null +++ b/externals/vcpkg/versions/b-/bullet3.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "d196c1956b370bd43889ddf5279600092e1af718", + "version": "3.22", + "port-version": 0 + }, + { + "git-tree": "f526f9d9698251590883fcc52ac8bf0f7ef9c5a4", + "version": "3.17", + "port-version": 5 + }, + { + "git-tree": "d986cc96144fa3de5201d56a508f348db9b66e71", + "version": "3.17", + "port-version": 4 + }, + { + "git-tree": "88add55351bf89f89e584924663861c0a827bdf5", + "version": "3.17", + "port-version": 3 + }, + { + "git-tree": "bcc42d2c8eb5fc4134c31f6176bc0c0ae3bc46e1", + "version": "3.17", + "port-version": 2 + }, + { + "git-tree": "5d6e2d765a4cca130170b4a574e99a938ce54818", + "version": "3.17", + "port-version": 1 + }, + { + "git-tree": "4fc6b5f085568cedd1171dc99fd75c7e412dcc5a", + "version-string": "3.17", + "port-version": 0 + }, + { + "git-tree": "5917d99eda4055b22a1e49e6f2a37ebd9dd26e9e", + "version-string": "2.89-1", + "port-version": 0 + }, + { + "git-tree": "6b2fa43c85ca822f5e65a0a17744b61720705c57", + "version-string": "2.89", + "port-version": 0 + }, + { + "git-tree": "bfd0993507e461259cdd11bada1044a19de3a32f", + "version-string": "2.88-2", + "port-version": 0 + }, + { + "git-tree": "bf3ac776df8d254e8262872f163955a88f27a599", + "version-string": "2.88-1", + "port-version": 0 + }, + { + "git-tree": "4616688aadf1f29a31a5b54f0a69a85c702b288b", + "version-string": "2.88", + "port-version": 0 + }, + { + "git-tree": "8fe3e6a20c356c49c76a0057721612ebc14cd3f1", + "version-string": "2.87-1", + "port-version": 0 + }, + { + "git-tree": "9b4ec044e6bcc1a18069973b04c44362156e0a11", + "version-string": "2.87", + "port-version": 0 + }, + { + "git-tree": "64e6fdc497f9da91574cf4ec59eb12b35ec4a45a", + "version-string": "2.86.1-1", + "port-version": 0 + }, + { + "git-tree": "97f69ed15982ddce6cfd3ca1e1f828ac65e779b9", + "version-string": "2.86.1", + "port-version": 0 + }, + { + "git-tree": "0f5fed31c787480aa3d9e3fd95345995ab817481", + "version-string": "2.83.7.98d4780", + "port-version": 0 + }, + { + "git-tree": "c847799ff0a47c82cca3394130b56e2b84feb8eb", + "version-string": "2.83.7 @98d4780", + "port-version": 0 + }, + { + "git-tree": "5e172359752a380c4990f451b3a742bb1ec3cbff", + "version-string": "2.83.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/bustache.json b/externals/vcpkg/versions/b-/bustache.json new file mode 100755 index 000000000..5744b051a --- /dev/null +++ b/externals/vcpkg/versions/b-/bustache.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "888d4f529ac5ecc9a12049beb50337d237f97e28", + "version": "1.1.0", + "port-version": 2 + }, + { + "git-tree": "746808aa3bda8d2627ecc6da664cc58ebf57896e", + "version-string": "1.1.0", + "port-version": 1 + }, + { + "git-tree": "3844f9514372b696483caa83af21759c1ddf2c67", + "version-string": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/butteraugli.json b/externals/vcpkg/versions/b-/butteraugli.json new file mode 100755 index 000000000..1fee95296 --- /dev/null +++ b/externals/vcpkg/versions/b-/butteraugli.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "660959f50cba9f2fa2bc5d9cf775e268d746c7e9", + "version-string": "2019-05-08", + "port-version": 2 + }, + { + "git-tree": "b0a1f3b7adf27f8437a4d6af30ec5367a225341d", + "version-string": "2019-05-08-1", + "port-version": 0 + }, + { + "git-tree": "3c33456e75584e5c4a1e8cacaf0dd398e545ce13", + "version-string": "2019-05-08", + "port-version": 0 + }, + { + "git-tree": "38f189c21d0d0c0121254a51bc3453446c2e9215", + "version-string": "2018-02-25-1", + "port-version": 0 + }, + { + "git-tree": "a799a90e828b4a20c584dee68c20b9c0322ad467", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "4d12f7ea4aeb8d0042692c41698d68283d2cfc6d", + "version-string": "2017-09-02-8c60a2aefa19adb-1", + "port-version": 0 + }, + { + "git-tree": "d2c79b617b16c4c4bb8773dd73f2dd266004a28b", + "version-string": "2017-09-02-8c60a2aefa19adb", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/byte-lite.json b/externals/vcpkg/versions/b-/byte-lite.json new file mode 100755 index 000000000..94dbbafec --- /dev/null +++ b/externals/vcpkg/versions/b-/byte-lite.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "5bc136e43764a88f51b7750b1937cd548177c79c", + "version": "0.3.0", + "port-version": 0 + }, + { + "git-tree": "d83b7cf23d9a7b17c28fda5fcd36a25dd8a085ef", + "version-string": "0.2.0", + "port-version": 1 + }, + { + "git-tree": "b8ac7b847acca6724eb539674e7243b477163607", + "version-string": "0.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/b-/bzip2.json b/externals/vcpkg/versions/b-/bzip2.json new file mode 100755 index 000000000..7025c509f --- /dev/null +++ b/externals/vcpkg/versions/b-/bzip2.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "a1ea352502e69888a565563d9151d3f7ab609fb1", + "version-semver": "1.0.8", + "port-version": 2 + }, + { + "git-tree": "5a1b1b8d666b9ef64e8596e4716c2e2f654f4532", + "version-string": "1.0.8", + "port-version": 1 + }, + { + "git-tree": "3b585ec14d62fcd6573fb1a67989292a7455440d", + "version-string": "1.0.8", + "port-version": 0 + }, + { + "git-tree": "916c629389f6bcead7b4914304cc52a6ed4abad6", + "version-string": "1.0.6", + "port-version": 7 + }, + { + "git-tree": "90fdb940b53d87fa9c1984fbb0d9b38d5fbcfece", + "version-string": "1.0.6-6", + "port-version": 0 + }, + { + "git-tree": "a3c18b760c9c233f263c9cba08b1b27cb7bcddb6", + "version-string": "1.0.6-5", + "port-version": 0 + }, + { + "git-tree": "8e0b27dfdffb1bb806a248c12255dc07185c66c0", + "version-string": "1.0.6-4", + "port-version": 0 + }, + { + "git-tree": "6c9756bcffe55c228f0c2843687db6a9c8ea3560", + "version-string": "1.0.6-3", + "port-version": 0 + }, + { + "git-tree": "8322dd10d768f96c4e48a6241c1e5c37a5c11dc1", + "version-string": "1.0.6-2", + "port-version": 0 + }, + { + "git-tree": "37735da283a93cb3a4d7c828943819a8d07c226c", + "version-string": "1.0.6-1", + "port-version": 0 + }, + { + "git-tree": "4bb7bb31abfc9bc33ff0655a1552e6e88244dc97", + "version-string": "1.0.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/baseline.json b/externals/vcpkg/versions/baseline.json new file mode 100755 index 000000000..cfa3bcaa6 --- /dev/null +++ b/externals/vcpkg/versions/baseline.json @@ -0,0 +1,7844 @@ +{ + "default": { + "3fd": { + "baseline": "2.6.3", + "port-version": 2 + }, + "7zip": { + "baseline": "21.07", + "port-version": 1 + }, + "abseil": { + "baseline": "20211102.1", + "port-version": 0 + }, + "absent": { + "baseline": "0.3.1", + "port-version": 1 + }, + "ace": { + "baseline": "7.0.6", + "port-version": 3 + }, + "activemq-cpp": { + "baseline": "3.9.5", + "port-version": 9 + }, + "ade": { + "baseline": "0.1.1f", + "port-version": 2 + }, + "advobfuscator": { + "baseline": "2020-06-26", + "port-version": 0 + }, + "air-ctl": { + "baseline": "1.0.0", + "port-version": 1 + }, + "aixlog": { + "baseline": "1.5.0", + "port-version": 1 + }, + "akali": { + "baseline": "1.43", + "port-version": 1 + }, + "alac": { + "baseline": "2017-11-03-c38887c5", + "port-version": 2 + }, + "alac-decoder": { + "baseline": "0.2", + "port-version": 5 + }, + "alembic": { + "baseline": "1.8.3", + "port-version": 1 + }, + "aliyun-oss-c-sdk": { + "baseline": "3.10.0", + "port-version": 1 + }, + "allegro5": { + "baseline": "5.2.6.0", + "port-version": 2 + }, + "alsa": { + "baseline": "1.2.6.1", + "port-version": 0 + }, + "ampl-asl": { + "baseline": "2020-11-11", + "port-version": 3 + }, + "ampl-mp": { + "baseline": "2020-11-11", + "port-version": 3 + }, + "amqpcpp": { + "baseline": "4.3.15", + "port-version": 1 + }, + "anax": { + "baseline": "2.1.0", + "port-version": 8 + }, + "angelscript": { + "baseline": "2.35.1", + "port-version": 1 + }, + "angle": { + "baseline": "chromium_4472", + "port-version": 3 + }, + "antlr4": { + "baseline": "4.9.3", + "port-version": 2 + }, + "any-lite": { + "baseline": "0.4.0", + "port-version": 0 + }, + "anyrpc": { + "baseline": "2021-08-24", + "port-version": 0 + }, + "aom": { + "baseline": "3.2.0", + "port-version": 3 + }, + "approval-tests-cpp": { + "baseline": "10.12.2", + "port-version": 0 + }, + "apr": { + "baseline": "1.7.0", + "port-version": 9 + }, + "apr-util": { + "baseline": "1.6.1", + "port-version": 7 + }, + "apsi": { + "baseline": "0.7.0", + "port-version": 2 + }, + "arb": { + "baseline": "2.21.1", + "port-version": 1 + }, + "arcus": { + "baseline": "4.10.0", + "port-version": 2 + }, + "argagg": { + "baseline": "0.4.6", + "port-version": 1 + }, + "argh": { + "baseline": "1.3.2", + "port-version": 0 + }, + "argparse": { + "baseline": "2.2", + "port-version": 0 + }, + "args": { + "baseline": "6.3.0", + "port-version": 0 + }, + "argtable2": { + "baseline": "2.13", + "port-version": 9 + }, + "argtable3": { + "baseline": "3.2.1", + "port-version": 2 + }, + "argumentum": { + "baseline": "0.3.1", + "port-version": 1 + }, + "aricpp": { + "baseline": "1.1.2", + "port-version": 0 + }, + "armadillo": { + "baseline": "10.6.2", + "port-version": 5 + }, + "arrayfire": { + "baseline": "3.8.0", + "port-version": 0 + }, + "arrow": { + "baseline": "8.0.0", + "port-version": 0 + }, + "ashes": { + "baseline": "2022-06-08", + "port-version": 0 + }, + "asio": { + "baseline": "1.22.1", + "port-version": 0 + }, + "asio-grpc": { + "baseline": "1.7.0", + "port-version": 0 + }, + "asiosdk": { + "baseline": "2.3.3", + "port-version": 4 + }, + "asmjit": { + "baseline": "2021-10-26", + "port-version": 1 + }, + "assimp": { + "baseline": "5.0.1", + "port-version": 5 + }, + "asynch": { + "baseline": "2019-09-21", + "port-version": 2 + }, + "asyncplusplus": { + "baseline": "1.1", + "port-version": 1 + }, + "atk": { + "baseline": "2.38.0", + "port-version": 1 + }, + "atkmm": { + "baseline": "2.36.1", + "port-version": 0 + }, + "atlmfc": { + "baseline": "0", + "port-version": 1 + }, + "atomic-queue": { + "baseline": "2021-05-03", + "port-version": 0 + }, + "aubio": { + "baseline": "0.4.9", + "port-version": 9 + }, + "audiofile": { + "baseline": "1.1.0", + "port-version": 0 + }, + "aurora": { + "baseline": "2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933", + "port-version": 1 + }, + "autobahn": { + "baseline": "20.8.1", + "port-version": 1 + }, + "autodock-vina": { + "baseline": "1.2.3", + "port-version": 0 + }, + "avcpp": { + "baseline": "2021-06-14", + "port-version": 1 + }, + "avisynthplus": { + "baseline": "3.7.2", + "port-version": 0 + }, + "avro-c": { + "baseline": "1.11.0", + "port-version": 3 + }, + "avro-cpp": { + "baseline": "2021-06-01", + "port-version": 1 + }, + "aws-c-auth": { + "baseline": "0.6.3", + "port-version": 2 + }, + "aws-c-cal": { + "baseline": "0.5.12", + "port-version": 2 + }, + "aws-c-common": { + "baseline": "0.6.9", + "port-version": 2 + }, + "aws-c-compression": { + "baseline": "0.2.14", + "port-version": 2 + }, + "aws-c-event-stream": { + "baseline": "0.2.7", + "port-version": 2 + }, + "aws-c-http": { + "baseline": "0.6.5", + "port-version": 2 + }, + "aws-c-io": { + "baseline": "0.10.7", + "port-version": 2 + }, + "aws-c-mqtt": { + "baseline": "0.7.6", + "port-version": 3 + }, + "aws-c-s3": { + "baseline": "0.1.25", + "port-version": 2 + }, + "aws-checksums": { + "baseline": "0.1.11", + "port-version": 3 + }, + "aws-crt-cpp": { + "baseline": "0.15.1", + "port-version": 3 + }, + "aws-lambda-cpp": { + "baseline": "0.2.7", + "port-version": 1 + }, + "aws-sdk-cpp": { + "baseline": "1.9.220", + "port-version": 1 + }, + "azmq": { + "baseline": "2020-03-03", + "port-version": 1 + }, + "azure-c-shared-utility": { + "baseline": "2022-01-21", + "port-version": 3 + }, + "azure-core-cpp": { + "baseline": "1.6.0", + "port-version": 0 + }, + "azure-identity-cpp": { + "baseline": "1.2.0", + "port-version": 0 + }, + "azure-iot-sdk-c": { + "baseline": "2022-01-21", + "port-version": 2 + }, + "azure-kinect-sensor-sdk": { + "baseline": "1.4.1", + "port-version": 4 + }, + "azure-macro-utils-c": { + "baseline": "2022-01-21", + "port-version": 0 + }, + "azure-security-attestation-cpp": { + "baseline": "1.0.0-beta.3", + "port-version": 0 + }, + "azure-security-keyvault-certificates-cpp": { + "baseline": "4.0.0", + "port-version": 0 + }, + "azure-security-keyvault-keys-cpp": { + "baseline": "4.2.0", + "port-version": 0 + }, + "azure-security-keyvault-secrets-cpp": { + "baseline": "4.0.0", + "port-version": 0 + }, + "azure-storage-blobs-cpp": { + "baseline": "12.4.0", + "port-version": 0 + }, + "azure-storage-common-cpp": { + "baseline": "12.2.4", + "port-version": 0 + }, + "azure-storage-cpp": { + "baseline": "7.5.0", + "port-version": 3 + }, + "azure-storage-files-datalake-cpp": { + "baseline": "12.3.1", + "port-version": 0 + }, + "azure-storage-files-shares-cpp": { + "baseline": "12.2.1", + "port-version": 0 + }, + "azure-storage-queues-cpp": { + "baseline": "12.0.0", + "port-version": 0 + }, + "azure-uamqp-c": { + "baseline": "2022-01-21", + "port-version": 1 + }, + "azure-uhttp-c": { + "baseline": "2022-01-21", + "port-version": 1 + }, + "azure-umqtt-c": { + "baseline": "2022-01-21", + "port-version": 1 + }, + "b64": { + "baseline": "2.0.0.1", + "port-version": 1 + }, + "basisu": { + "baseline": "1.11", + "port-version": 5 + }, + "bcg729": { + "baseline": "1.1.1", + "port-version": 3 + }, + "bddisasm": { + "baseline": "1.34.7", + "port-version": 1 + }, + "bde": { + "baseline": "3.2.0.0", + "port-version": 5 + }, + "bdwgc": { + "baseline": "8.2.0", + "port-version": 3 + }, + "beast": { + "baseline": "0", + "port-version": 1 + }, + "behaviortree-cpp": { + "baseline": "3.5.6", + "port-version": 2 + }, + "benchmark": { + "baseline": "1.6.1", + "port-version": 0 + }, + "bento4": { + "baseline": "1.6.0-639", + "port-version": 1 + }, + "berkeleydb": { + "baseline": "4.8.30", + "port-version": 8 + }, + "bext-di": { + "baseline": "1.2.0", + "port-version": 1 + }, + "bext-sml": { + "baseline": "1.1.5", + "port-version": 0 + }, + "bext-ut": { + "baseline": "1.1.9", + "port-version": 0 + }, + "bext-wintls": { + "baseline": "0.9.5", + "port-version": 0 + }, + "bfgroup-lyra": { + "baseline": "1.6", + "port-version": 0 + }, + "bigint": { + "baseline": "2010.04.30", + "port-version": 7 + }, + "binn": { + "baseline": "3.0", + "port-version": 1 + }, + "bitmagic": { + "baseline": "7.11.2", + "port-version": 0 + }, + "bitserializer": { + "baseline": "0.44", + "port-version": 1 + }, + "bitserializer-cpprestjson": { + "baseline": "alias", + "port-version": 1 + }, + "bitserializer-pugixml": { + "baseline": "alias", + "port-version": 1 + }, + "bitserializer-rapidjson": { + "baseline": "alias", + "port-version": 1 + }, + "bitserializer-rapidyaml": { + "baseline": "alias", + "port-version": 2 + }, + "bitsery": { + "baseline": "5.2.2", + "port-version": 0 + }, + "blas": { + "baseline": "1", + "port-version": 1 + }, + "blaze": { + "baseline": "3.8.1", + "port-version": 0 + }, + "blend2d": { + "baseline": "2022-05-02", + "port-version": 0 + }, + "blitz": { + "baseline": "2020-03-25", + "port-version": 5 + }, + "blosc": { + "baseline": "1.18.1", + "port-version": 4 + }, + "boinc": { + "baseline": "7.20.0", + "port-version": 0 + }, + "bond": { + "baseline": "9.0.3", + "port-version": 3 + }, + "boolinq": { + "baseline": "3.0.4", + "port-version": 0 + }, + "boost": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-accumulators": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-algorithm": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-align": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-any": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-array": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-asio": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-assert": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-assign": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-atomic": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-beast": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-bimap": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-bind": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-build": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-callable-traits": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-chrono": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-circular-buffer": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-compatibility": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-compute": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-concept-check": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-config": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-container": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-container-hash": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-context": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-contract": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-conversion": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-convert": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-core": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-coroutine": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-coroutine2": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-crc": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-date-time": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-describe": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-detail": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-di": { + "baseline": "1.2.0", + "port-version": 0 + }, + "boost-dll": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-dynamic-bitset": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-endian": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-exception": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-fiber": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-filesystem": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-flyweight": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-foreach": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-format": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-function": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-function-types": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-functional": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-fusion": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-geometry": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-gil": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-graph": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-graph-parallel": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-hana": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-heap": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-histogram": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-hof": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-icl": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-integer": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-interprocess": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-interval": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-intrusive": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-io": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-iostreams": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-iterator": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-json": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-lambda": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-lambda2": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-leaf": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-lexical-cast": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-local-function": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-locale": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-lockfree": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-log": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-logic": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-math": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-metaparse": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-modular-build-helper": { + "baseline": "1.79.0", + "port-version": 2 + }, + "boost-move": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-mp11": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-mpi": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-mpl": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-msm": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-multi-array": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-multi-index": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-multiprecision": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-nowide": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-numeric-conversion": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-odeint": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-optional": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-outcome": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-parameter": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-parameter-python": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-pfr": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-phoenix": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-poly-collection": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-polygon": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-pool": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-predef": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-preprocessor": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-process": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-program-options": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-property-map": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-property-map-parallel": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-property-tree": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-proto": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-ptr-container": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-python": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-qvm": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-random": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-range": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-ratio": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-rational": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-regex": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-safe-numerics": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-scope-exit": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-serialization": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-signals2": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-smart-ptr": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-sort": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-spirit": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-stacktrace": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-statechart": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-static-assert": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-static-string": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-stl-interfaces": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-system": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-test": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-thread": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-throw-exception": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-timer": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-tokenizer": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-tti": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-tuple": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-type-erasure": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-type-index": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-type-traits": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-typeof": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-ublas": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-uninstall": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-units": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-unordered": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-utility": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-uuid": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-variant": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-variant2": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-vcpkg-helpers": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-vmd": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-wave": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-winapi": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-xpressive": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boost-yap": { + "baseline": "1.79.0", + "port-version": 0 + }, + "boringssl": { + "baseline": "2021-06-23", + "port-version": 2 + }, + "botan": { + "baseline": "2.19.1", + "port-version": 0 + }, + "box2d": { + "baseline": "2.4.1", + "port-version": 2 + }, + "braft": { + "baseline": "2021-26-04", + "port-version": 0 + }, + "breakpad": { + "baseline": "2020-09-14", + "port-version": 5 + }, + "brigand": { + "baseline": "1.3.0", + "port-version": 2 + }, + "brotli": { + "baseline": "1.0.9", + "port-version": 2 + }, + "brpc": { + "baseline": "1.1.0", + "port-version": 0 + }, + "brunocodutra-metal": { + "baseline": "2.1.4", + "port-version": 0 + }, + "brynet": { + "baseline": "1.11.2", + "port-version": 0 + }, + "bshoshany-thread-pool": { + "baseline": "2.0.0", + "port-version": 0 + }, + "bsio": { + "baseline": "1.0.0", + "port-version": 0 + }, + "buck-yeh-bux": { + "baseline": "1.6.5", + "port-version": 1 + }, + "buck-yeh-bux-mariadb-client": { + "baseline": "1.0.3", + "port-version": 1 + }, + "buck-yeh-bux-sqlite": { + "baseline": "1.0.1", + "port-version": 0 + }, + "bullet3": { + "baseline": "3.22", + "port-version": 0 + }, + "bustache": { + "baseline": "1.1.0", + "port-version": 2 + }, + "butteraugli": { + "baseline": "2019-05-08", + "port-version": 2 + }, + "byte-lite": { + "baseline": "0.3.0", + "port-version": 0 + }, + "bzip2": { + "baseline": "1.0.8", + "port-version": 2 + }, + "c-ares": { + "baseline": "1.18.1", + "port-version": 1 + }, + "c-dbg-macro": { + "baseline": "2020-02-29", + "port-version": 0 + }, + "c4core": { + "baseline": "0.1.9", + "port-version": 0 + }, + "c89stringutils": { + "baseline": "0.0.1", + "port-version": 0 + }, + "c9y": { + "baseline": "0.3.0", + "port-version": 0 + }, + "caf": { + "baseline": "0.18.6", + "port-version": 1 + }, + "caffe2": { + "baseline": "0.8.1", + "port-version": 6 + }, + "cairo": { + "baseline": "1.17.6", + "port-version": 2 + }, + "cairomm": { + "baseline": "1.16.1", + "port-version": 0 + }, + "calceph": { + "baseline": "3.5.1", + "port-version": 0 + }, + "camport3": { + "baseline": "1.6.2", + "port-version": 0 + }, + "capnproto": { + "baseline": "0.9.1", + "port-version": 2 + }, + "capstone": { + "baseline": "5.0.0-rc2", + "port-version": 1 + }, + "cargs": { + "baseline": "1.0.3", + "port-version": 0 + }, + "cartographer": { + "baseline": "1.0.0", + "port-version": 5 + }, + "casclib": { + "baseline": "2021-11-16", + "port-version": 1 + }, + "catch": { + "baseline": "alias", + "port-version": 1 + }, + "catch-classic": { + "baseline": "1.12.2", + "port-version": 1 + }, + "catch2": { + "baseline": "3.0.1", + "port-version": 1 + }, + "cccapstone": { + "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e", + "port-version": 2 + }, + "ccd": { + "baseline": "2.1-4", + "port-version": 3 + }, + "ccfits": { + "baseline": "2.5", + "port-version": 8 + }, + "cctag": { + "baseline": "1.0.1", + "port-version": 0 + }, + "cctz": { + "baseline": "2.3", + "port-version": 3 + }, + "celero": { + "baseline": "2.8.3", + "port-version": 0 + }, + "cello": { + "baseline": "2019-07-23", + "port-version": 2 + }, + "cereal": { + "baseline": "1.3.2", + "port-version": 1 + }, + "ceres": { + "baseline": "2.1.0", + "port-version": 1 + }, + "cfitsio": { + "baseline": "3.49", + "port-version": 2 + }, + "cgal": { + "baseline": "5.4.1", + "port-version": 1 + }, + "cgicc": { + "baseline": "3.2.19", + "port-version": 5 + }, + "cgl": { + "baseline": "0.60.3", + "port-version": 0 + }, + "cgltf": { + "baseline": "1.11", + "port-version": 0 + }, + "cgns": { + "baseline": "4.3.0", + "port-version": 0 + }, + "chaiscript": { + "baseline": "6.1.0", + "port-version": 2 + }, + "chakracore": { + "baseline": "2021-04-22", + "port-version": 2 + }, + "charls": { + "baseline": "2.3.4", + "port-version": 0 + }, + "chartdir": { + "baseline": "7.0.0", + "port-version": 4 + }, + "check": { + "baseline": "0.15.2", + "port-version": 4 + }, + "chipmunk": { + "baseline": "7.0.3", + "port-version": 2 + }, + "chmlib": { + "baseline": "0.40", + "port-version": 5 + }, + "chromaprint": { + "baseline": "1.5.0", + "port-version": 1 + }, + "chromium-base": { + "baseline": "86.0.4199.1", + "port-version": 4 + }, + "cimg": { + "baseline": "2.9.9", + "port-version": 0 + }, + "cityhash": { + "baseline": "2013-01-08", + "port-version": 2 + }, + "civetweb": { + "baseline": "1.15", + "port-version": 1 + }, + "cjson": { + "baseline": "1.7.15", + "port-version": 1 + }, + "clamav": { + "baseline": "0.103.0", + "port-version": 3 + }, + "clapack": { + "baseline": "3.2.1", + "port-version": 20 + }, + "clara": { + "baseline": "1.1.5", + "port-version": 1 + }, + "clblas": { + "baseline": "2.12", + "port-version": 6 + }, + "clblast": { + "baseline": "1.5.2", + "port-version": 2 + }, + "clfft": { + "baseline": "2.12.2", + "port-version": 5 + }, + "cli": { + "baseline": "2.0.1", + "port-version": 0 + }, + "cli11": { + "baseline": "2.2.0", + "port-version": 0 + }, + "clickhouse-cpp": { + "baseline": "1.5.0", + "port-version": 0 + }, + "clipboardxx": { + "baseline": "2022-02-04", + "port-version": 0 + }, + "clipp": { + "baseline": "2019-04-30", + "port-version": 1 + }, + "clockutils": { + "baseline": "1.1.1", + "port-version": 1 + }, + "clp": { + "baseline": "1.17.6", + "port-version": 1 + }, + "clrng": { + "baseline": "2020-12-01", + "port-version": 3 + }, + "clue": { + "baseline": "1.0.0", + "port-version": 0 + }, + "cmakerc": { + "baseline": "2021-08-27", + "port-version": 0 + }, + "cmark": { + "baseline": "0.30.1", + "port-version": 0 + }, + "cmcstl2": { + "baseline": "2019-07-20", + "port-version": 1 + }, + "cminpack": { + "baseline": "1.3.8", + "port-version": 1 + }, + "cmocka": { + "baseline": "2020-08-01", + "port-version": 1 + }, + "cnats": { + "baseline": "3.2.0", + "port-version": 0 + }, + "cnl": { + "baseline": "1.1.7", + "port-version": 1 + }, + "co": { + "baseline": "2.0.3", + "port-version": 1 + }, + "cocoyaxi": { + "baseline": "2.0.3", + "port-version": 2 + }, + "coin": { + "baseline": "4.0.0", + "port-version": 5 + }, + "coinutils": { + "baseline": "2.11.4", + "port-version": 1 + }, + "collada-dom": { + "baseline": "2.5.0", + "port-version": 6 + }, + "colmap": { + "baseline": "2022-03-14", + "port-version": 0 + }, + "color-console": { + "baseline": "2022-03-20", + "port-version": 0 + }, + "comms": { + "baseline": "3.4.0", + "port-version": 1 + }, + "comms-ublox": { + "baseline": "0.20.2", + "port-version": 0 + }, + "commsdsl": { + "baseline": "3.6.4", + "port-version": 1 + }, + "compoundfilereader": { + "baseline": "0.1.0", + "port-version": 0 + }, + "concurrencpp": { + "baseline": "0.1.4", + "port-version": 0 + }, + "concurrentqueue": { + "baseline": "1.0.3", + "port-version": 0 + }, + "console-bridge": { + "baseline": "1.0.2", + "port-version": 0 + }, + "constexpr": { + "baseline": "1.0", + "port-version": 3 + }, + "constexpr-contracts": { + "baseline": "2020-08-09", + "port-version": 1 + }, + "continuable": { + "baseline": "4.1.0", + "port-version": 0 + }, + "convectionkernels": { + "baseline": "2022-06-08", + "port-version": 0 + }, + "coolprop": { + "baseline": "6.4.1", + "port-version": 1 + }, + "coroutine": { + "baseline": "1.5.0", + "port-version": 4 + }, + "corrade": { + "baseline": "2020.06", + "port-version": 4 + }, + "cpp-base64": { + "baseline": "V2.rc.08", + "port-version": 0 + }, + "cpp-httplib": { + "baseline": "0.10.7", + "port-version": 0 + }, + "cpp-ipc": { + "baseline": "1.2.0", + "port-version": 0 + }, + "cpp-jwt": { + "baseline": "2021-10-18", + "port-version": 0 + }, + "cpp-netlib": { + "baseline": "0.13.0", + "port-version": 6 + }, + "cpp-peglib": { + "baseline": "1.3.10", + "port-version": 0 + }, + "cpp-redis": { + "baseline": "4.3.1", + "port-version": 5 + }, + "cpp-taskflow": { + "baseline": "2.6.0", + "port-version": 1 + }, + "cpp-timsort": { + "baseline": "2.1.0", + "port-version": 0 + }, + "cppad": { + "baseline": "20210000.7", + "port-version": 3 + }, + "cppcms": { + "baseline": "1.2.1", + "port-version": 4 + }, + "cppcodec": { + "baseline": "0.2", + "port-version": 2 + }, + "cppcoro": { + "baseline": "2020-02-28", + "port-version": 3 + }, + "cppfs": { + "baseline": "1.3.0", + "port-version": 1 + }, + "cppgraphqlgen": { + "baseline": "4.5.0", + "port-version": 0 + }, + "cppitertools": { + "baseline": "2.1", + "port-version": 2 + }, + "cppkafka": { + "baseline": "0.3.1", + "port-version": 3 + }, + "cppmicroservices": { + "baseline": "3.6.0", + "port-version": 0 + }, + "cpprestsdk": { + "baseline": "2.10.18", + "port-version": 1 + }, + "cpptoml": { + "baseline": "v0.1.1", + "port-version": 1 + }, + "cppunit": { + "baseline": "1.15.1", + "port-version": 3 + }, + "cpputest": { + "baseline": "2019-9-16", + "port-version": 2 + }, + "cppwinrt": { + "baseline": "2.0.220418.1", + "port-version": 0 + }, + "cppxaml": { + "baseline": "0.0.16", + "port-version": 0 + }, + "cppzmq": { + "baseline": "4.8.1", + "port-version": 0 + }, + "cpr": { + "baseline": "1.8.3", + "port-version": 0 + }, + "cpu-features": { + "baseline": "0.6.0", + "port-version": 2 + }, + "cpuid": { + "baseline": "0.5.1", + "port-version": 3 + }, + "cpuinfo": { + "baseline": "2022-04-02", + "port-version": 0 + }, + "cr": { + "baseline": "2020-04-26", + "port-version": 1 + }, + "crashpad": { + "baseline": "2022-04-16", + "port-version": 1 + }, + "crashrpt": { + "baseline": "1.4.3", + "port-version": 2 + }, + "crc32c": { + "baseline": "1.1.2", + "port-version": 0 + }, + "crfsuite": { + "baseline": "2020-08-27", + "port-version": 0 + }, + "croncpp": { + "baseline": "2020-09-04", + "port-version": 3 + }, + "crossguid": { + "baseline": "2021-10-22", + "port-version": 2 + }, + "crow": { + "baseline": "1.0-1", + "port-version": 0 + }, + "cryptopp": { + "baseline": "8.6.0", + "port-version": 0 + }, + "cspice": { + "baseline": "67", + "port-version": 2 + }, + "ctbignum": { + "baseline": "2019-08-02", + "port-version": 1 + }, + "ctemplate": { + "baseline": "2020-09-14", + "port-version": 3 + }, + "ctp": { + "baseline": "6.6.1_P1_20210406_se", + "port-version": 3 + }, + "ctre": { + "baseline": "3.6.0", + "port-version": 0 + }, + "cub": { + "baseline": "1.16.0", + "port-version": 0 + }, + "cuda": { + "baseline": "10.1", + "port-version": 10 + }, + "cudnn": { + "baseline": "7.6.5", + "port-version": 6 + }, + "cunit": { + "baseline": "2.1.3", + "port-version": 7 + }, + "curl": { + "baseline": "7.83.1", + "port-version": 2 + }, + "curlpp": { + "baseline": "2018-06-15", + "port-version": 7 + }, + "cute-headers": { + "baseline": "2019-09-20", + "port-version": 1 + }, + "cutelyst2": { + "baseline": "2.12.0", + "port-version": 2 + }, + "cwalk": { + "baseline": "1.2.6", + "port-version": 0 + }, + "cxxopts": { + "baseline": "3.0.0", + "port-version": 0 + }, + "czmq": { + "baseline": "4.2.1", + "port-version": 1 + }, + "d3d12-memory-allocator": { + "baseline": "2021-05-05", + "port-version": 0 + }, + "d3dx12": { + "baseline": "may2021", + "port-version": 0 + }, + "darknet": { + "baseline": "2022-03-06", + "port-version": 0 + }, + "darts-clone": { + "baseline": "1767ab87cffe", + "port-version": 2 + }, + "dartsim": { + "baseline": "6.11.0", + "port-version": 3 + }, + "dataframe": { + "baseline": "1.19.0", + "port-version": 0 + }, + "date": { + "baseline": "3.0.1", + "port-version": 2 + }, + "dav1d": { + "baseline": "0.9.2", + "port-version": 0 + }, + "daw-header-libraries": { + "baseline": "2.46.0", + "port-version": 0 + }, + "daw-json-link": { + "baseline": "2.14.0", + "port-version": 0 + }, + "daw-utf-range": { + "baseline": "2.2.2", + "port-version": 0 + }, + "dbg-macro": { + "baseline": "2021-11-02", + "port-version": 0 + }, + "dbghelp": { + "baseline": "0", + "port-version": 2 + }, + "dbow2": { + "baseline": "2019-08-05", + "port-version": 1 + }, + "dbow3": { + "baseline": "1.0.0", + "port-version": 1 + }, + "dcmtk": { + "baseline": "3.6.6", + "port-version": 3 + }, + "debug-assert": { + "baseline": "1.3.3", + "port-version": 0 + }, + "decimal-for-cpp": { + "baseline": "1.18", + "port-version": 0 + }, + "detours": { + "baseline": "4.0.1", + "port-version": 5 + }, + "devicenameresolver": { + "baseline": "2016-06-26-0850d88fa6", + "port-version": 3 + }, + "devil": { + "baseline": "1.8.0", + "port-version": 8 + }, + "dimcli": { + "baseline": "5.0.2", + "port-version": 3 + }, + "directx-dxc": { + "baseline": "2021-12-08", + "port-version": 0 + }, + "directx-headers": { + "baseline": "1.602.0", + "port-version": 0 + }, + "directxmath": { + "baseline": "2022-05-18", + "port-version": 0 + }, + "directxmesh": { + "baseline": "2022-05-09", + "port-version": 0 + }, + "directxsdk": { + "baseline": "jun10", + "port-version": 5 + }, + "directxtex": { + "baseline": "2022-05-09", + "port-version": 0 + }, + "directxtk": { + "baseline": "2022-05-09", + "port-version": 0 + }, + "directxtk12": { + "baseline": "2022-05-09", + "port-version": 0 + }, + "dirent": { + "baseline": "1.23.2", + "port-version": 1 + }, + "discord-game-sdk": { + "baseline": "2.5.6", + "port-version": 4 + }, + "discord-rpc": { + "baseline": "3.4.0", + "port-version": 1 + }, + "discordcoreapi": { + "baseline": "2022-05-05", + "port-version": 0 + }, + "discount": { + "baseline": "2.2.6", + "port-version": 1 + }, + "discreture": { + "baseline": "2020-01-29", + "port-version": 1 + }, + "distorm": { + "baseline": "3.5.2b", + "port-version": 0 + }, + "dlfcn-win32": { + "baseline": "1.1.1", + "port-version": 6 + }, + "dlib": { + "baseline": "19.23", + "port-version": 0 + }, + "dmlc": { + "baseline": "2019-08-12", + "port-version": 7 + }, + "docopt": { + "baseline": "2018-11-01", + "port-version": 1 + }, + "doctest": { + "baseline": "2.4.8", + "port-version": 0 + }, + "double-conversion": { + "baseline": "3.2.0", + "port-version": 0 + }, + "dpdk": { + "baseline": "19.02", + "port-version": 1 + }, + "draco": { + "baseline": "1.4.3", + "port-version": 0 + }, + "drlibs": { + "baseline": "2022-04-03", + "port-version": 0 + }, + "drogon": { + "baseline": "1.7.5", + "port-version": 0 + }, + "dstorage": { + "baseline": "1.0.2", + "port-version": 0 + }, + "dtl": { + "baseline": "1.19", + "port-version": 1 + }, + "duckx": { + "baseline": "1.2.2", + "port-version": 1 + }, + "duilib": { + "baseline": "2019-04-28", + "port-version": 5 + }, + "duktape": { + "baseline": "2.5.0", + "port-version": 2 + }, + "dx": { + "baseline": "1.0.1", + "port-version": 2 + }, + "dxsdk-d3dx": { + "baseline": "9.29.952.8", + "port-version": 4 + }, + "dxut": { + "baseline": "11.27", + "port-version": 0 + }, + "eabase": { + "baseline": "2.09.12", + "port-version": 2 + }, + "earcut-hpp": { + "baseline": "2.2.3", + "port-version": 0 + }, + "eastl": { + "baseline": "3.18.00", + "port-version": 2 + }, + "easycl": { + "baseline": "0.3", + "port-version": 1 + }, + "easyhook": { + "baseline": "2.7.7097.0", + "port-version": 5 + }, + "easyloggingpp": { + "baseline": "9.97.0", + "port-version": 2 + }, + "eathread": { + "baseline": "1.32.09", + "port-version": 3 + }, + "ebml": { + "baseline": "1.4.2", + "port-version": 1 + }, + "ecm": { + "baseline": "5.89.0", + "port-version": 0 + }, + "ecos": { + "baseline": "2.0.8", + "port-version": 1 + }, + "ecsutil": { + "baseline": "1.0.7.15", + "port-version": 2 + }, + "edlib": { + "baseline": "1.2.7", + "port-version": 1 + }, + "effects11": { + "baseline": "11.27", + "port-version": 0 + }, + "effolkronium-random": { + "baseline": "1.4.1", + "port-version": 0 + }, + "efsw": { + "baseline": "2020-06-08", + "port-version": 3 + }, + "egl-registry": { + "baseline": "2021-11-23", + "port-version": 0 + }, + "eigen3": { + "baseline": "3.4.0", + "port-version": 2 + }, + "elfio": { + "baseline": "3.10", + "port-version": 0 + }, + "elfutils": { + "baseline": "0.186", + "port-version": 4 + }, + "embree2": { + "baseline": "2.17.7", + "port-version": 4 + }, + "embree3": { + "baseline": "3.12.2", + "port-version": 2 + }, + "enet": { + "baseline": "1.3.17", + "port-version": 1 + }, + "ensmallen": { + "baseline": "2.18.1", + "port-version": 0 + }, + "entityx": { + "baseline": "1.3.0", + "port-version": 3 + }, + "entt": { + "baseline": "3.10.1", + "port-version": 1 + }, + "epsilon": { + "baseline": "0.9.2", + "port-version": 6 + }, + "esaxx": { + "baseline": "ca7cb332011ec37", + "port-version": 1 + }, + "eve": { + "baseline": "2021-10-16", + "port-version": 0 + }, + "eventpp": { + "baseline": "0.1.2", + "port-version": 0 + }, + "evpp": { + "baseline": "0.7.0", + "port-version": 5 + }, + "exiv2": { + "baseline": "0.27.5", + "port-version": 1 + }, + "expat": { + "baseline": "2.4.8", + "port-version": 1 + }, + "expected-lite": { + "baseline": "0.6.0", + "port-version": 0 + }, + "exprtk": { + "baseline": "2022-01-01", + "port-version": 2 + }, + "ezc3d": { + "baseline": "1.4.7", + "port-version": 0 + }, + "faad2": { + "baseline": "2.9.1", + "port-version": 5 + }, + "fadbad": { + "baseline": "2.1.0", + "port-version": 1 + }, + "faiss": { + "baseline": "1.7.2", + "port-version": 0 + }, + "fakeit": { + "baseline": "2.1.1", + "port-version": 0 + }, + "fann": { + "baseline": "2.2.0", + "port-version": 2 + }, + "farmhash": { + "baseline": "1.1", + "port-version": 4 + }, + "fast-cpp-csv-parser": { + "baseline": "2021-01-03", + "port-version": 1 + }, + "fast-float": { + "baseline": "3.2.0", + "port-version": 0 + }, + "fastcdr": { + "baseline": "1.0.15", + "port-version": 1 + }, + "fastcgi": { + "baseline": "2020-09-11", + "port-version": 5 + }, + "fastfeat": { + "baseline": "391d5e9", + "port-version": 2 + }, + "fastlz": { + "baseline": "2021-05-10", + "port-version": 0 + }, + "fastor": { + "baseline": "2021-11-22", + "port-version": 1 + }, + "fastrtps": { + "baseline": "2.4.0", + "port-version": 0 + }, + "fawdlstty-libfv": { + "baseline": "0.0.6", + "port-version": 0 + }, + "fbgemm": { + "baseline": "2021-03-18", + "port-version": 4 + }, + "fbthrift": { + "baseline": "2022.03.21.00", + "port-version": 1 + }, + "fcl": { + "baseline": "0.7.0", + "port-version": 3 + }, + "fdk-aac": { + "baseline": "2.0.2", + "port-version": 1 + }, + "fdlibm": { + "baseline": "5.3", + "port-version": 5 + }, + "ffmpeg": { + "baseline": "4.4.1", + "port-version": 13 + }, + "ffnvcodec": { + "baseline": "11.1.5.0", + "port-version": 1 + }, + "fftw3": { + "baseline": "3.3.10", + "port-version": 3 + }, + "fftwpp": { + "baseline": "2019-12-19", + "port-version": 2 + }, + "fixed-string": { + "baseline": "0.1.1", + "port-version": 0 + }, + "fizz": { + "baseline": "2022.03.21.00", + "port-version": 1 + }, + "flann": { + "baseline": "2019-04-07", + "port-version": 5 + }, + "flash-runtime-extensions": { + "baseline": "2.4", + "port-version": 1 + }, + "flashlight-cpu": { + "baseline": "0.3", + "port-version": 3 + }, + "flashlight-cuda": { + "baseline": "0.3", + "port-version": 4 + }, + "flatbuffers": { + "baseline": "2.0.6", + "port-version": 0 + }, + "flecs": { + "baseline": "2.4.8", + "port-version": 0 + }, + "flint": { + "baseline": "2.8.0", + "port-version": 1 + }, + "fltk": { + "baseline": "1.3.8", + "port-version": 2 + }, + "fluidlite": { + "baseline": "2020-08-27", + "port-version": 2 + }, + "fluidsynth": { + "baseline": "2.2.6", + "port-version": 2 + }, + "fmem": { + "baseline": "c-libs-2ccee3d2fb", + "port-version": 1 + }, + "fmi4cpp": { + "baseline": "0.8.0", + "port-version": 0 + }, + "fmilib": { + "baseline": "2.0.3", + "port-version": 4 + }, + "fmt": { + "baseline": "8.1.1", + "port-version": 1 + }, + "folly": { + "baseline": "2022.03.21.00", + "port-version": 0 + }, + "font-chef": { + "baseline": "1.1.0", + "port-version": 0 + }, + "fontconfig": { + "baseline": "2.14.0", + "port-version": 2 + }, + "foonathan-memory": { + "baseline": "2019-07-21", + "port-version": 2 + }, + "forest": { + "baseline": "12.1.0", + "port-version": 0 + }, + "forge": { + "baseline": "1.0.8", + "port-version": 0 + }, + "foxi": { + "baseline": "2021-12-01", + "port-version": 0 + }, + "fp16": { + "baseline": "2021-02-21", + "port-version": 0 + }, + "fplus": { + "baseline": "0.2.18-p0", + "port-version": 0 + }, + "freealut": { + "baseline": "1.1.0", + "port-version": 2 + }, + "freeglut": { + "baseline": "3.2.2", + "port-version": 0 + }, + "freeimage": { + "baseline": "3.18.0", + "port-version": 22 + }, + "freeopcua": { + "baseline": "20190125", + "port-version": 5 + }, + "freerdp": { + "baseline": "2.5.0", + "port-version": 0 + }, + "freetds": { + "baseline": "1.3.10", + "port-version": 1 + }, + "freetype": { + "baseline": "2.12.1", + "port-version": 0 + }, + "freetype-gl": { + "baseline": "2022-01-17", + "port-version": 1 + }, + "freexl": { + "baseline": "1.0.6", + "port-version": 0 + }, + "fribidi": { + "baseline": "1.0.12", + "port-version": 0 + }, + "frozen": { + "baseline": "1.1.1", + "port-version": 0 + }, + "frugally-deep": { + "baseline": "0.15.10-p0", + "port-version": 0 + }, + "fruit": { + "baseline": "3.6.0", + "port-version": 1 + }, + "ftgl": { + "baseline": "2022-05-18", + "port-version": 1 + }, + "ftxui": { + "baseline": "3.0.0", + "port-version": 0 + }, + "function2": { + "baseline": "4.2.0", + "port-version": 1 + }, + "functions-framework-cpp": { + "baseline": "1.1.0", + "port-version": 0 + }, + "fuzzylite": { + "baseline": "6.0", + "port-version": 5 + }, + "fxdiv": { + "baseline": "2021-02-21", + "port-version": 0 + }, + "g2o": { + "baseline": "2020-02-07", + "port-version": 2 + }, + "g3log": { + "baseline": "1.3.4", + "port-version": 2 + }, + "gainput": { + "baseline": "1.0.0", + "port-version": 6 + }, + "gamedev-framework": { + "baseline": "0.20.0", + "port-version": 2 + }, + "gamenetworkingsockets": { + "baseline": "1.4.0", + "port-version": 0 + }, + "gamma": { + "baseline": "gamma-2018-01-27", + "port-version": 4 + }, + "gasol": { + "baseline": "2018-01-04", + "port-version": 2 + }, + "gaussianlib": { + "baseline": "2019-08-04", + "port-version": 1 + }, + "gazebo": { + "baseline": "2022-01-20", + "port-version": 1 + }, + "gcem": { + "baseline": "1.14.1", + "port-version": 0 + }, + "gdal": { + "baseline": "3.4.3", + "port-version": 2 + }, + "gdcm": { + "baseline": "3.0.12", + "port-version": 0 + }, + "gdcm2": { + "baseline": "deprecated", + "port-version": 1 + }, + "gdk-pixbuf": { + "baseline": "2.42.8", + "port-version": 2 + }, + "gemmlowp": { + "baseline": "2021-09-28", + "port-version": 0 + }, + "genann": { + "baseline": "2019-07-10", + "port-version": 1 + }, + "geogram": { + "baseline": "1.7.6", + "port-version": 2 + }, + "geographiclib": { + "baseline": "2.1", + "port-version": 0 + }, + "geos": { + "baseline": "3.10.2", + "port-version": 0 + }, + "geotrans": { + "baseline": "3.8", + "port-version": 1 + }, + "getdns": { + "baseline": "1.7.0", + "port-version": 3 + }, + "getopt": { + "baseline": "0", + "port-version": 2 + }, + "getopt-win32": { + "baseline": "0.1", + "port-version": 4 + }, + "gettext": { + "baseline": "0.21", + "port-version": 9 + }, + "gettimeofday": { + "baseline": "2017-10-14", + "port-version": 4 + }, + "gflags": { + "baseline": "2.2.2", + "port-version": 5 + }, + "ghc-filesystem": { + "baseline": "1.5.10", + "port-version": 0 + }, + "gherkin-c": { + "baseline": "2019-10-07", + "port-version": 3 + }, + "giflib": { + "baseline": "5.2.1", + "port-version": 2 + }, + "ginkgo": { + "baseline": "1.4.0", + "port-version": 1 + }, + "gl2ps": { + "baseline": "1.4.2", + "port-version": 1 + }, + "gl3w": { + "baseline": "2018-05-31", + "port-version": 4 + }, + "glad": { + "baseline": "0.1.34", + "port-version": 3 + }, + "glbinding": { + "baseline": "3.1.0", + "port-version": 3 + }, + "glew": { + "baseline": "2.2.0", + "port-version": 0 + }, + "glfw3": { + "baseline": "3.3.7", + "port-version": 0 + }, + "gli": { + "baseline": "2021-07-06", + "port-version": 0 + }, + "glib": { + "baseline": "2.70.5", + "port-version": 2 + }, + "glibmm": { + "baseline": "2.70.0", + "port-version": 1 + }, + "glm": { + "baseline": "0.9.9.8", + "port-version": 1 + }, + "globjects": { + "baseline": "1.1.0", + "port-version": 4 + }, + "glog": { + "baseline": "0.5.0", + "port-version": 5 + }, + "gloo": { + "baseline": "20201203", + "port-version": 0 + }, + "glslang": { + "baseline": "11.8.0", + "port-version": 0 + }, + "glui": { + "baseline": "2019-11-30", + "port-version": 1 + }, + "gmime": { + "baseline": "3.2.6", + "port-version": 2 + }, + "gmmlib": { + "baseline": "21.3.2", + "port-version": 1 + }, + "gmp": { + "baseline": "6.2.1", + "port-version": 10 + }, + "gmsh": { + "baseline": "4.9.0", + "port-version": 0 + }, + "gobject-introspection": { + "baseline": "1.72.0", + "port-version": 0 + }, + "google-cloud-cpp": { + "baseline": "1.41.0", + "port-version": 0 + }, + "google-cloud-cpp-common": { + "baseline": "alias", + "port-version": 1 + }, + "google-cloud-cpp-spanner": { + "baseline": "alias", + "port-version": 1 + }, + "googleapis": { + "baseline": "alias", + "port-version": 1 + }, + "gperf": { + "baseline": "3.1", + "port-version": 4 + }, + "gperftools": { + "baseline": "2019-09-02", + "port-version": 3 + }, + "gpgme": { + "baseline": "1.14.0", + "port-version": 2 + }, + "gppanel": { + "baseline": "2020-05-20", + "port-version": 1 + }, + "graphene": { + "baseline": "1.10.2", + "port-version": 2 + }, + "graphicsmagick": { + "baseline": "1.3.37", + "port-version": 1 + }, + "graphite2": { + "baseline": "1.3.14", + "port-version": 3 + }, + "graphqlparser": { + "baseline": "0.7.0", + "port-version": 4 + }, + "graphviz": { + "baseline": "2.49.1", + "port-version": 4 + }, + "greatest": { + "baseline": "1.5.0", + "port-version": 0 + }, + "grpc": { + "baseline": "1.44.0", + "port-version": 1 + }, + "grppi": { + "baseline": "0.4.0", + "port-version": 1 + }, + "gsl": { + "baseline": "2.7.1", + "port-version": 1 + }, + "gsl-lite": { + "baseline": "0.40.0", + "port-version": 0 + }, + "gsoap": { + "baseline": "2.8.112", + "port-version": 1 + }, + "gst-rtsp-server": { + "baseline": "1.19.2", + "port-version": 1 + }, + "gstreamer": { + "baseline": "1.19.2", + "port-version": 5 + }, + "gtest": { + "baseline": "1.11.0", + "port-version": 5 + }, + "gtk": { + "baseline": "4.6.2", + "port-version": 0 + }, + "gtkmm": { + "baseline": "4.6.0", + "port-version": 0 + }, + "gtl": { + "baseline": "1.0.0", + "port-version": 0 + }, + "gts": { + "baseline": "0.7.6", + "port-version": 5 + }, + "guetzli": { + "baseline": "2020-09-14", + "port-version": 2 + }, + "guilite": { + "baseline": "2022-05-05", + "port-version": 0 + }, + "gumbo": { + "baseline": "0.10.1", + "port-version": 5 + }, + "gzip-hpp": { + "baseline": "0.1.0", + "port-version": 1 + }, + "h3": { + "baseline": "3.7.2", + "port-version": 1 + }, + "h5py-lzf": { + "baseline": "2019-12-04", + "port-version": 1 + }, + "halide": { + "baseline": "14.0.0", + "port-version": 0 + }, + "happly": { + "baseline": "2021-03-19", + "port-version": 0 + }, + "hareflow": { + "baseline": "0.1.0", + "port-version": 0 + }, + "harfbuzz": { + "baseline": "4.2.0", + "port-version": 1 + }, + "hash-library": { + "baseline": "8", + "port-version": 1 + }, + "hayai": { + "baseline": "2019-08-10", + "port-version": 1 + }, + "hazelcast-cpp-client": { + "baseline": "5.0.0", + "port-version": 0 + }, + "hdf5": { + "baseline": "1.12.2", + "port-version": 1 + }, + "healpix": { + "baseline": "1.12.10", + "port-version": 8 + }, + "hedley": { + "baseline": "15", + "port-version": 0 + }, + "hexl": { + "baseline": "1.2.4", + "port-version": 0 + }, + "hffix": { + "baseline": "1.0.0", + "port-version": 1 + }, + "hfsm2": { + "baseline": "1.10.1", + "port-version": 0 + }, + "hidapi": { + "baseline": "0.12.0", + "port-version": 0 + }, + "highfive": { + "baseline": "2.3", + "port-version": 2 + }, + "highway": { + "baseline": "0.14.2", + "port-version": 0 + }, + "hiredis": { + "baseline": "1.0.2", + "port-version": 3 + }, + "hps": { + "baseline": "2022-01-18", + "port-version": 0 + }, + "hpx": { + "baseline": "1.8.0", + "port-version": 0 + }, + "http-parser": { + "baseline": "2.9.4", + "port-version": 1 + }, + "hungarian": { + "baseline": "v0.1.3", + "port-version": 1 + }, + "hunspell": { + "baseline": "1.7.0", + "port-version": 8 + }, + "hwloc": { + "baseline": "2.7.1", + "port-version": 0 + }, + "hyperscan": { + "baseline": "5.4.0", + "port-version": 0 + }, + "hypodermic": { + "baseline": "2.5.3", + "port-version": 0 + }, + "hypre": { + "baseline": "2.23.0", + "port-version": 0 + }, + "icu": { + "baseline": "71.1", + "port-version": 0 + }, + "ideviceinstaller": { + "baseline": "1.1.2.23", + "port-version": 3 + }, + "idevicerestore": { + "baseline": "1.0.12", + "port-version": 7 + }, + "if97": { + "baseline": "2.1.2", + "port-version": 1 + }, + "igloo": { + "baseline": "1.1.1", + "port-version": 1 + }, + "ignition-cmake0": { + "baseline": "0.6.2", + "port-version": 4 + }, + "ignition-cmake2": { + "baseline": "2.5.0", + "port-version": 2 + }, + "ignition-common1": { + "baseline": "1.1.1", + "port-version": 3 + }, + "ignition-common3": { + "baseline": "3.9.0", + "port-version": 3 + }, + "ignition-fuel-tools1": { + "baseline": "1.2.0", + "port-version": 4 + }, + "ignition-fuel-tools4": { + "baseline": "4.3.0", + "port-version": 2 + }, + "ignition-math4": { + "baseline": "4.0.0", + "port-version": 3 + }, + "ignition-math6": { + "baseline": "6.6.0", + "port-version": 3 + }, + "ignition-modularscripts": { + "baseline": "2022-05-11", + "port-version": 0 + }, + "ignition-msgs1": { + "baseline": "1.0.0", + "port-version": 5 + }, + "ignition-msgs5": { + "baseline": "5.3.0", + "port-version": 5 + }, + "ignition-msgs6": { + "baseline": "6.0.0", + "port-version": 4 + }, + "ignition-plugin1": { + "baseline": "1.1.0", + "port-version": 2 + }, + "ignition-transport4": { + "baseline": "4.0.0", + "port-version": 6 + }, + "ignition-transport8": { + "baseline": "8.1.0", + "port-version": 4 + }, + "ignition-transport9": { + "baseline": "9.0.0", + "port-version": 4 + }, + "igraph": { + "baseline": "0.9.9", + "port-version": 0 + }, + "iir1": { + "baseline": "1.9.1", + "port-version": 0 + }, + "ijg-libjpeg": { + "baseline": "9e", + "port-version": 0 + }, + "ilmbase": { + "baseline": "2.3.0", + "port-version": 1 + }, + "imath": { + "baseline": "3.1.5", + "port-version": 0 + }, + "imgui": { + "baseline": "1.87", + "port-version": 1 + }, + "imgui-sfml": { + "baseline": "2.5", + "port-version": 0 + }, + "imguizmo": { + "baseline": "1.83", + "port-version": 0 + }, + "immer": { + "baseline": "2022-02-12", + "port-version": 0 + }, + "implot": { + "baseline": "0.13", + "port-version": 0 + }, + "indicators": { + "baseline": "2.2", + "port-version": 0 + }, + "influxdb-cxx": { + "baseline": "0.6.7", + "port-version": 1 + }, + "infoware": { + "baseline": "2021-06-16", + "port-version": 1 + }, + "inih": { + "baseline": "51", + "port-version": 1 + }, + "iniparser": { + "baseline": "2020-04-06", + "port-version": 2 + }, + "inja": { + "baseline": "3.3.0", + "port-version": 0 + }, + "intel-ipsec": { + "baseline": "1.1", + "port-version": 0 + }, + "intel-mkl": { + "baseline": "2020.0.0", + "port-version": 2 + }, + "intelrdfpmathlib": { + "baseline": "20U2", + "port-version": 4 + }, + "io2d": { + "baseline": "2020-09-14", + "port-version": 3 + }, + "irrlicht": { + "baseline": "1.8.4", + "port-version": 13 + }, + "irrxml": { + "baseline": "0", + "port-version": 0 + }, + "isal": { + "baseline": "2.25.0", + "port-version": 1 + }, + "ismrmrd": { + "baseline": "1.5.0", + "port-version": 2 + }, + "itk": { + "baseline": "5.2.1", + "port-version": 1 + }, + "itpp": { + "baseline": "4.3.1", + "port-version": 8 + }, + "ixwebsocket": { + "baseline": "11.4.2", + "port-version": 0 + }, + "jack2": { + "baseline": "1.9.21", + "port-version": 0 + }, + "jaeger-client-cpp": { + "baseline": "0.7.0", + "port-version": 1 + }, + "jansson": { + "baseline": "2.14", + "port-version": 1 + }, + "jasper": { + "baseline": "2.0.33", + "port-version": 3 + }, + "jbig2dec": { + "baseline": "0.19", + "port-version": 1 + }, + "jbigkit": { + "baseline": "2.1", + "port-version": 5 + }, + "jemalloc": { + "baseline": "4.3.1", + "port-version": 5 + }, + "jinja2cpplight": { + "baseline": "2018-05-08", + "port-version": 1 + }, + "josuttis-jthread": { + "baseline": "2020-07-21", + "port-version": 2 + }, + "jsmn": { + "baseline": "2019-04-27", + "port-version": 1 + }, + "json-c": { + "baseline": "2019-09-10", + "port-version": 2 + }, + "json-dto": { + "baseline": "0.3.1", + "port-version": 0 + }, + "json-schema-validator": { + "baseline": "2.1.0", + "port-version": 1 + }, + "json-spirit": { + "baseline": "4.1.0", + "port-version": 2 + }, + "json11": { + "baseline": "2017-06-20", + "port-version": 4 + }, + "json5-parser": { + "baseline": "1.0.0", + "port-version": 3 + }, + "jsoncons": { + "baseline": "0.168.7", + "port-version": 0 + }, + "jsoncpp": { + "baseline": "1.9.5", + "port-version": 0 + }, + "jsonnet": { + "baseline": "0.17.0", + "port-version": 0 + }, + "jwt-cpp": { + "baseline": "0.6.0", + "port-version": 0 + }, + "jxrlib": { + "baseline": "2019.10.9", + "port-version": 3 + }, + "kangaru": { + "baseline": "4.3.0", + "port-version": 0 + }, + "kcp": { + "baseline": "1.7", + "port-version": 0 + }, + "kd-soap": { + "baseline": "1.9.0", + "port-version": 1 + }, + "kdbindings": { + "baseline": "1.0.0", + "port-version": 0 + }, + "kddockwidgets": { + "baseline": "1.5.0", + "port-version": 0 + }, + "kealib": { + "baseline": "1.4.14", + "port-version": 0 + }, + "kenlm": { + "baseline": "20200924", + "port-version": 1 + }, + "keystone": { + "baseline": "0.9.2", + "port-version": 2 + }, + "kf5archive": { + "baseline": "5.89.0", + "port-version": 1 + }, + "kf5attica": { + "baseline": "5.89.0", + "port-version": 1 + }, + "kf5auth": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5bookmarks": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5codecs": { + "baseline": "5.89.0", + "port-version": 1 + }, + "kf5completion": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5config": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5configwidgets": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5coreaddons": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5crash": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5dbusaddons": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5declarative": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5diagram": { + "baseline": "2.8.0", + "port-version": 0 + }, + "kf5globalaccel": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5guiaddons": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5holidays": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5i18n": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5iconthemes": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5itemmodels": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5itemviews": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5jobwidgets": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5kcmutils": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5kio": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5newstuff": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5notifications": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5package": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5plotting": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5service": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5solid": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5sonnet": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5syntaxhighlighting": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5textwidgets": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5wallet": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5widgetsaddons": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kf5windowsystem": { + "baseline": "5.89.0", + "port-version": 1 + }, + "kf5xmlgui": { + "baseline": "5.89.0", + "port-version": 0 + }, + "kfr": { + "baseline": "4.2.1", + "port-version": 2 + }, + "kinectsdk1": { + "baseline": "1.8", + "port-version": 5 + }, + "kinectsdk2": { + "baseline": "2.0", + "port-version": 4 + }, + "kissfft": { + "baseline": "2021-11-14", + "port-version": 0 + }, + "klein": { + "baseline": "2021-05-09", + "port-version": 0 + }, + "knet": { + "baseline": "1.1.0", + "port-version": 1 + }, + "krabsetw": { + "baseline": "4.1.18", + "port-version": 1 + }, + "ktx": { + "baseline": "4.1.0-rc1", + "port-version": 0 + }, + "kubazip": { + "baseline": "0.1.19", + "port-version": 1 + }, + "kubernetes": { + "baseline": "2022-01-19", + "port-version": 1 + }, + "kuku": { + "baseline": "2.1", + "port-version": 1 + }, + "kvasir-mpl": { + "baseline": "2019-08-06", + "port-version": 1 + }, + "kwsys": { + "baseline": "2021-08-06", + "port-version": 1 + }, + "lager": { + "baseline": "2022-02-21", + "port-version": 0 + }, + "lapack": { + "baseline": "2022-02-22", + "port-version": 0 + }, + "lapack-reference": { + "baseline": "3.10.1", + "port-version": 0 + }, + "lastools": { + "baseline": "2020-05-09", + "port-version": 1 + }, + "laszip": { + "baseline": "3.4.3", + "port-version": 1 + }, + "launch-darkly-server": { + "baseline": "2.4.3", + "port-version": 0 + }, + "lazy-importer": { + "baseline": "2022-02-09", + "port-version": 0 + }, + "lcm": { + "baseline": "1.4.0", + "port-version": 2 + }, + "lcms": { + "baseline": "2.12", + "port-version": 3 + }, + "leaf": { + "baseline": "0.2.2", + "port-version": 1 + }, + "lemon": { + "baseline": "0", + "port-version": 1 + }, + "leptonica": { + "baseline": "1.82.0", + "port-version": 0 + }, + "lerc": { + "baseline": "3.0", + "port-version": 0 + }, + "lest": { + "baseline": "1.35.1", + "port-version": 2 + }, + "leveldb": { + "baseline": "1.22", + "port-version": 5 + }, + "levmar": { + "baseline": "2.6", + "port-version": 1 + }, + "libaaplus": { + "baseline": "2.36", + "port-version": 0 + }, + "libaiff": { + "baseline": "5.0", + "port-version": 7 + }, + "libalkimia": { + "baseline": "8.1.70", + "port-version": 1 + }, + "libao": { + "baseline": "1.2.2", + "port-version": 4 + }, + "libarchive": { + "baseline": "3.6.1", + "port-version": 0 + }, + "libass": { + "baseline": "0.16.0", + "port-version": 0 + }, + "libassuan": { + "baseline": "2.5.3", + "port-version": 4 + }, + "libatomic-ops": { + "baseline": "7.7.0", + "port-version": 1 + }, + "libavif": { + "baseline": "0.9.2", + "port-version": 1 + }, + "libb2": { + "baseline": "0.98.1", + "port-version": 6 + }, + "libbacktrace": { + "baseline": "2021-03-14", + "port-version": 1 + }, + "libbf": { + "baseline": "1.0.0", + "port-version": 2 + }, + "libbson": { + "baseline": "1.17.6", + "port-version": 1 + }, + "libcaer": { + "baseline": "3.3.14", + "port-version": 0 + }, + "libcanberra": { + "baseline": "0.30", + "port-version": 2 + }, + "libcbor": { + "baseline": "0.9.0", + "port-version": 0 + }, + "libcds": { + "baseline": "2.3.3", + "port-version": 2 + }, + "libcerf": { + "baseline": "1.13", + "port-version": 3 + }, + "libconfig": { + "baseline": "1.7.3", + "port-version": 1 + }, + "libconfuse": { + "baseline": "2019-07-14", + "port-version": 2 + }, + "libcopp": { + "baseline": "1.4.1", + "port-version": 2 + }, + "libcpplocate": { + "baseline": "2.3.0", + "port-version": 0 + }, + "libcrafter": { + "baseline": "1.0", + "port-version": 2 + }, + "libcroco": { + "baseline": "0.6.13", + "port-version": 3 + }, + "libcuckoo": { + "baseline": "0.3", + "port-version": 1 + }, + "libcurl-simple-https": { + "baseline": "2022-02-14", + "port-version": 0 + }, + "libdatachannel": { + "baseline": "0.17.1", + "port-version": 0 + }, + "libdatrie": { + "baseline": "0.2.13", + "port-version": 1 + }, + "libdc1394": { + "baseline": "2.2.6", + "port-version": 0 + }, + "libde265": { + "baseline": "1.0.8", + "port-version": 5 + }, + "libdisasm": { + "baseline": "0.23", + "port-version": 9 + }, + "libdivide": { + "baseline": "5.0", + "port-version": 0 + }, + "libdjinterop": { + "baseline": "0.16.0", + "port-version": 0 + }, + "libdshowcapture": { + "baseline": "0.6.0", + "port-version": 3 + }, + "libe57": { + "baseline": "1.1.332", + "port-version": 2 + }, + "libe57format": { + "baseline": "2.2.0", + "port-version": 0 + }, + "libebur128": { + "baseline": "1.2.6", + "port-version": 0 + }, + "libepoxy": { + "baseline": "1.5.9", + "port-version": 1 + }, + "libevent": { + "baseline": "2.1.12", + "port-version": 6 + }, + "libevhtp": { + "baseline": "1.2.18", + "port-version": 3 + }, + "libexif": { + "baseline": "0.6.22", + "port-version": 2 + }, + "libfabric": { + "baseline": "1.13.2", + "port-version": 1 + }, + "libffi": { + "baseline": "3.4.2", + "port-version": 5 + }, + "libfido2": { + "baseline": "1.10.0", + "port-version": 1 + }, + "libflac": { + "baseline": "1.3.4", + "port-version": 0 + }, + "libfort": { + "baseline": "0.4.2", + "port-version": 1 + }, + "libfreenect2": { + "baseline": "0.2.0", + "port-version": 8 + }, + "libftdi": { + "baseline": "0.20", + "port-version": 3 + }, + "libftdi1": { + "baseline": "1.5", + "port-version": 3 + }, + "libgcrypt": { + "baseline": "1.10.1", + "port-version": 0 + }, + "libgd": { + "baseline": "2.3.2", + "port-version": 1 + }, + "libgeotiff": { + "baseline": "1.7.1", + "port-version": 0 + }, + "libgit2": { + "baseline": "1.4.2", + "port-version": 0 + }, + "libgnutls": { + "baseline": "3.6.15", + "port-version": 3 + }, + "libgo": { + "baseline": "3.1", + "port-version": 5 + }, + "libgpg-error": { + "baseline": "1.42", + "port-version": 3 + }, + "libgpiod": { + "baseline": "1.6.3", + "port-version": 1 + }, + "libgpod": { + "baseline": "2019-08-29", + "port-version": 4 + }, + "libgta": { + "baseline": "1.0.8", + "port-version": 3 + }, + "libguarded": { + "baseline": "2019-08-27", + "port-version": 2 + }, + "libgwenhywfar": { + "baseline": "5.6.0", + "port-version": 2 + }, + "libgxps": { + "baseline": "0.3.2", + "port-version": 1 + }, + "libharu": { + "baseline": "2017-08-15", + "port-version": 10 + }, + "libhdfs3": { + "baseline": "2019-11-05", + "port-version": 3 + }, + "libheif": { + "baseline": "1.12.0", + "port-version": 3 + }, + "libhsplasma": { + "baseline": "2022-05-19", + "port-version": 0 + }, + "libhv": { + "baseline": "1.2.4", + "port-version": 2 + }, + "libhydrogen": { + "baseline": "2021-12-02", + "port-version": 1 + }, + "libical": { + "baseline": "3.0.11", + "port-version": 1 + }, + "libiconv": { + "baseline": "1.17", + "port-version": 0 + }, + "libics": { + "baseline": "1.6.5", + "port-version": 0 + }, + "libideviceactivation": { + "baseline": "1.3.17", + "port-version": 0 + }, + "libidn2": { + "baseline": "2.3.1", + "port-version": 0 + }, + "libigl": { + "baseline": "2.3.0", + "port-version": 2 + }, + "libilbc": { + "baseline": "3.0.4", + "port-version": 0 + }, + "libimobiledevice": { + "baseline": "1.3.17", + "port-version": 0 + }, + "libirecovery": { + "baseline": "1.0.25", + "port-version": 4 + }, + "libjpeg-turbo": { + "baseline": "2.1.3", + "port-version": 3 + }, + "libjuice": { + "baseline": "1.0.0", + "port-version": 0 + }, + "libjxl": { + "baseline": "0.6.1", + "port-version": 1 + }, + "libkeyfinder": { + "baseline": "2.2.6", + "port-version": 0 + }, + "libkml": { + "baseline": "1.3.0", + "port-version": 8 + }, + "liblas": { + "baseline": "1.8.1", + "port-version": 9 + }, + "liblbfgs": { + "baseline": "1.10", + "port-version": 2 + }, + "liblemon": { + "baseline": "2019-06-13", + "port-version": 3 + }, + "liblinear": { + "baseline": "243", + "port-version": 1 + }, + "liblo": { + "baseline": "0.31", + "port-version": 2 + }, + "liblsl": { + "baseline": "1.16.0", + "port-version": 0 + }, + "liblzma": { + "baseline": "5.2.5", + "port-version": 6 + }, + "libmad": { + "baseline": "0.15.1", + "port-version": 9 + }, + "libmagic": { + "baseline": "5.40", + "port-version": 1 + }, + "libmariadb": { + "baseline": "3.1.15", + "port-version": 0 + }, + "libmaxminddb": { + "baseline": "1.4.3", + "port-version": 1 + }, + "libmediainfo": { + "baseline": "21.03", + "port-version": 2 + }, + "libmesh": { + "baseline": "1.5.0", + "port-version": 4 + }, + "libmicrohttpd": { + "baseline": "0.9.75", + "port-version": 0 + }, + "libmikmod": { + "baseline": "3.3.11.1", + "port-version": 10 + }, + "libmodbus": { + "baseline": "3.1.6", + "port-version": 2 + }, + "libmodman": { + "baseline": "2.0.1", + "port-version": 4 + }, + "libmodplug": { + "baseline": "0.8.9.0", + "port-version": 10 + }, + "libmorton": { + "baseline": "0.2.8", + "port-version": 0 + }, + "libmount": { + "baseline": "2.37.2", + "port-version": 0 + }, + "libmpeg2": { + "baseline": "0.5.1", + "port-version": 2 + }, + "libmspack": { + "baseline": "0.10.1", + "port-version": 4 + }, + "libmt32emu": { + "baseline": "2.6.2", + "port-version": 0 + }, + "libmupdf": { + "baseline": "1.19.0-rc2", + "port-version": 1 + }, + "libmysql": { + "baseline": "8.0.20", + "port-version": 6 + }, + "libnice": { + "baseline": "0.1.18", + "port-version": 0 + }, + "libnoise": { + "baseline": "1.0.0", + "port-version": 3 + }, + "libnop": { + "baseline": "2021-03-01", + "port-version": 0 + }, + "libodb": { + "baseline": "2.4.0", + "port-version": 8 + }, + "libodb-boost": { + "baseline": "2.4.0", + "port-version": 5 + }, + "libodb-mysql": { + "baseline": "2.4.0", + "port-version": 9 + }, + "libodb-pgsql": { + "baseline": "2.4.0", + "port-version": 6 + }, + "libodb-sqlite": { + "baseline": "2.4.0", + "port-version": 9 + }, + "libogg": { + "baseline": "1.3.5", + "port-version": 0 + }, + "libopenmpt": { + "baseline": "0.5.12", + "port-version": 0 + }, + "libopensp": { + "baseline": "1.5.2", + "port-version": 0 + }, + "libopusenc": { + "baseline": "0.2.1", + "port-version": 1 + }, + "libosip2": { + "baseline": "5.2.0", + "port-version": 2 + }, + "libosmium": { + "baseline": "2.17.1", + "port-version": 1 + }, + "libosmscout": { + "baseline": "1.1.1", + "port-version": 0 + }, + "libp7-baical": { + "baseline": "replaced", + "port-version": 1 + }, + "libp7client": { + "baseline": "5.6", + "port-version": 2 + }, + "libpcap": { + "baseline": "1.10.1", + "port-version": 1 + }, + "libpff": { + "baseline": "2018-07-14", + "port-version": 3 + }, + "libplist": { + "baseline": "1.3.6", + "port-version": 1 + }, + "libpmemobj-cpp": { + "baseline": "1.13.0", + "port-version": 1 + }, + "libpng": { + "baseline": "1.6.37", + "port-version": 18 + }, + "libpopt": { + "baseline": "1.16", + "port-version": 14 + }, + "libpq": { + "baseline": "14.1", + "port-version": 2 + }, + "libpqxx": { + "baseline": "7.7.3", + "port-version": 0 + }, + "libprotobuf-mutator": { + "baseline": "1.0", + "port-version": 0 + }, + "libproxy": { + "baseline": "0.4.17", + "port-version": 3 + }, + "libqcow": { + "baseline": "20210419", + "port-version": 2 + }, + "libqglviewer": { + "baseline": "2.7.2", + "port-version": 4 + }, + "libqrencode": { + "baseline": "4.1.1", + "port-version": 1 + }, + "librabbitmq": { + "baseline": "0.11.0", + "port-version": 1 + }, + "libraqm": { + "baseline": "0.9.0", + "port-version": 0 + }, + "libraw": { + "baseline": "201903", + "port-version": 7 + }, + "librdkafka": { + "baseline": "1.8.2", + "port-version": 2 + }, + "libressl": { + "baseline": "3.4.2", + "port-version": 0 + }, + "librsvg": { + "baseline": "2.40.20", + "port-version": 5 + }, + "librsync": { + "baseline": "2.3.2", + "port-version": 1 + }, + "librtmp": { + "baseline": "2019-11-11", + "port-version": 3 + }, + "librttopo": { + "baseline": "1.1.0", + "port-version": 5 + }, + "libsamplerate": { + "baseline": "0.2.2", + "port-version": 0 + }, + "libsass": { + "baseline": "3.6.5", + "port-version": 1 + }, + "libsbml": { + "baseline": "5.19.0", + "port-version": 2 + }, + "libsbsms": { + "baseline": "2.3.0", + "port-version": 0 + }, + "libsecret": { + "baseline": "0.20.4", + "port-version": 1 + }, + "libsercomm": { + "baseline": "1.3.2", + "port-version": 0 + }, + "libsigcpp": { + "baseline": "3.2.0", + "port-version": 0 + }, + "libsigcpp-3": { + "baseline": "3.0.3", + "port-version": 1 + }, + "libslirp": { + "baseline": "4.7.0", + "port-version": 0 + }, + "libsmb2": { + "baseline": "2021-04-29", + "port-version": 1 + }, + "libsndfile": { + "baseline": "1.1.0", + "port-version": 0 + }, + "libsnoretoast": { + "baseline": "0.8.0", + "port-version": 2 + }, + "libsodium": { + "baseline": "1.0.18", + "port-version": 7 + }, + "libsoundio": { + "baseline": "2.0.0", + "port-version": 6 + }, + "libspatialindex": { + "baseline": "1.9.3", + "port-version": 0 + }, + "libspatialite": { + "baseline": "5.0.1", + "port-version": 5 + }, + "libspnav": { + "baseline": "0.2.3", + "port-version": 2 + }, + "libsquish": { + "baseline": "1.15", + "port-version": 10 + }, + "libsrt": { + "baseline": "1.4.4", + "port-version": 2 + }, + "libsrtp": { + "baseline": "2.4.2", + "port-version": 2 + }, + "libssh": { + "baseline": "0.9.6", + "port-version": 2 + }, + "libssh2": { + "baseline": "1.10.0", + "port-version": 4 + }, + "libstemmer": { + "baseline": "2017-9", + "port-version": 6 + }, + "libstk": { + "baseline": "4.6.1", + "port-version": 1 + }, + "libsvm": { + "baseline": "3.25", + "port-version": 0 + }, + "libtasn1": { + "baseline": "4.17.0", + "port-version": 3 + }, + "libtcod": { + "baseline": "1.20.1", + "port-version": 1 + }, + "libtess2": { + "baseline": "2021-12-27", + "port-version": 0 + }, + "libtheora": { + "baseline": "1.2.0alpha1-20170719", + "port-version": 3 + }, + "libtins": { + "baseline": "4.3", + "port-version": 6 + }, + "libtomcrypt": { + "baseline": "1.18.2", + "port-version": 2 + }, + "libtommath": { + "baseline": "1.2.0", + "port-version": 2 + }, + "libtorrent": { + "baseline": "2.0.6", + "port-version": 0 + }, + "libu2f-server": { + "baseline": "1.1.0", + "port-version": 4 + }, + "libudis86": { + "baseline": "2018-01-28-56ff6c87", + "port-version": 2 + }, + "libudns": { + "baseline": "0.4", + "port-version": 4 + }, + "libui": { + "baseline": "2018-11-03", + "port-version": 2 + }, + "libunibreak": { + "baseline": "5.0", + "port-version": 1 + }, + "libunifex": { + "baseline": "2021-12-07", + "port-version": 1 + }, + "libunistring": { + "baseline": "0.9.10", + "port-version": 3 + }, + "liburing": { + "baseline": "2.1", + "port-version": 0 + }, + "libusb": { + "baseline": "1.0.26", + "port-version": 0 + }, + "libusb-win32": { + "baseline": "1.2.6.0", + "port-version": 8 + }, + "libusbmuxd": { + "baseline": "1.2.219", + "port-version": 2 + }, + "libuuid": { + "baseline": "1.0.3", + "port-version": 11 + }, + "libuv": { + "baseline": "1.43.0", + "port-version": 0 + }, + "libuvc": { + "baseline": "2020-11-24", + "port-version": 3 + }, + "libvmdk": { + "baseline": "20200926", + "port-version": 2 + }, + "libvorbis": { + "baseline": "1.3.7", + "port-version": 2 + }, + "libvpx": { + "baseline": "1.11.0", + "port-version": 1 + }, + "libwandio": { + "baseline": "4.2.1", + "port-version": 6 + }, + "libwebm": { + "baseline": "1.0.0.28", + "port-version": 1 + }, + "libwebp": { + "baseline": "1.2.2", + "port-version": 0 + }, + "libwebsockets": { + "baseline": "4.3.0", + "port-version": 3 + }, + "libxdiff": { + "baseline": "0.23", + "port-version": 2 + }, + "libxlsxwriter": { + "baseline": "1.1.4", + "port-version": 0 + }, + "libxml2": { + "baseline": "2.9.14", + "port-version": 0 + }, + "libxmlmm": { + "baseline": "0.6.0", + "port-version": 2 + }, + "libxmlpp": { + "baseline": "5.0.0", + "port-version": 2 + }, + "libxmp-lite": { + "baseline": "4.4.1", + "port-version": 8 + }, + "libxslt": { + "baseline": "1.1.35", + "port-version": 0 + }, + "libyaml": { + "baseline": "0.2.5", + "port-version": 3 + }, + "libyuv": { + "baseline": "2021-04-15", + "port-version": 1 + }, + "libzen": { + "baseline": "0.4.39", + "port-version": 1 + }, + "libzip": { + "baseline": "1.8.0", + "port-version": 0 + }, + "libzippp": { + "baseline": "5.1-1.8.0", + "port-version": 0 + }, + "licensepp": { + "baseline": "2020-05-19", + "port-version": 3 + }, + "lilv": { + "baseline": "0.24.10", + "port-version": 1 + }, + "linalg": { + "baseline": "2.1", + "port-version": 1 + }, + "linenoise-ng": { + "baseline": "4754bee2d8eb3", + "port-version": 2 + }, + "lionkor-commandline": { + "baseline": "2.0.0", + "port-version": 0 + }, + "live555": { + "baseline": "2022-05-05", + "port-version": 0 + }, + "llfio": { + "baseline": "2.0-20220112", + "port-version": 1 + }, + "llgl": { + "baseline": "2019-08-15", + "port-version": 2 + }, + "llvm": { + "baseline": "14.0.4", + "port-version": 0 + }, + "lmdb": { + "baseline": "0.9.29", + "port-version": 2 + }, + "lodepng": { + "baseline": "2021-12-04", + "port-version": 1 + }, + "lodepng-c": { + "baseline": "deprecated", + "port-version": 0 + }, + "log4cplus": { + "baseline": "2.0.7", + "port-version": 1 + }, + "log4cpp": { + "baseline": "2.9.1", + "port-version": 7 + }, + "log4cxx": { + "baseline": "0.12.1", + "port-version": 0 + }, + "loguru": { + "baseline": "2.1.0", + "port-version": 3 + }, + "lpeg": { + "baseline": "1.0.2", + "port-version": 2 + }, + "lua": { + "baseline": "5.4.4", + "port-version": 2 + }, + "luabridge": { + "baseline": "2.6", + "port-version": 1 + }, + "luafilesystem": { + "baseline": "1.8.0", + "port-version": 2 + }, + "luajit": { + "baseline": "2.0.5", + "port-version": 8 + }, + "luasec": { + "baseline": "1.1.0", + "port-version": 0 + }, + "luasocket": { + "baseline": "3.0.0", + "port-version": 0 + }, + "lunasvg": { + "baseline": "2.3.1", + "port-version": 0 + }, + "lv2": { + "baseline": "1.18.2", + "port-version": 1 + }, + "lz4": { + "baseline": "1.9.3", + "port-version": 3 + }, + "lzfse": { + "baseline": "1.0", + "port-version": 3 + }, + "lzo": { + "baseline": "2.10", + "port-version": 7 + }, + "lzokay": { + "baseline": "2020-07-30", + "port-version": 0 + }, + "magic-enum": { + "baseline": "0.8.0", + "port-version": 0 + }, + "magic-get": { + "baseline": "2019-09-02", + "port-version": 2 + }, + "magnum": { + "baseline": "2020.06", + "port-version": 9 + }, + "magnum-extras": { + "baseline": "2020.06", + "port-version": 1 + }, + "magnum-integration": { + "baseline": "2020.06", + "port-version": 1 + }, + "magnum-plugins": { + "baseline": "2020.06", + "port-version": 8 + }, + "mailio": { + "baseline": "0.21.0", + "port-version": 2 + }, + "mapbox-geojson-cpp": { + "baseline": "0.5.1", + "port-version": 1 + }, + "mapbox-geojson-vt-cpp": { + "baseline": "6.6.5", + "port-version": 0 + }, + "mapbox-geometry": { + "baseline": "2.0.3", + "port-version": 0 + }, + "mapbox-polylabel": { + "baseline": "1.0.4", + "port-version": 0 + }, + "mapbox-variant": { + "baseline": "1.2.0", + "port-version": 1 + }, + "mapbox-wagyu": { + "baseline": "0.5.0", + "port-version": 0 + }, + "mapnik": { + "baseline": "2022-01-28", + "port-version": 2 + }, + "marble": { + "baseline": "22.04.0", + "port-version": 0 + }, + "marl": { + "baseline": "2022-03-02", + "port-version": 0 + }, + "materialx": { + "baseline": "1.38.4", + "port-version": 0 + }, + "mathc": { + "baseline": "2019-09-29", + "port-version": 1 + }, + "mathgl": { + "baseline": "2.5", + "port-version": 0 + }, + "matio": { + "baseline": "1.5.23", + "port-version": 0 + }, + "matplotlib-cpp": { + "baseline": "2020-08-27", + "port-version": 1 + }, + "matplotplusplus": { + "baseline": "2021-04-11", + "port-version": 6 + }, + "matroska": { + "baseline": "1.6.3", + "port-version": 0 + }, + "mbedtls": { + "baseline": "2.28.0", + "port-version": 0 + }, + "mcpp": { + "baseline": "2.7.2.14", + "port-version": 3 + }, + "mdns": { + "baseline": "1.4.2", + "port-version": 0 + }, + "mdnsresponder": { + "baseline": "878.270.2", + "port-version": 1 + }, + "mdspan": { + "baseline": "2021-11-03", + "port-version": 0 + }, + "mecab": { + "baseline": "2019-09-25", + "port-version": 2 + }, + "memorymodule": { + "baseline": "2019-12-31", + "port-version": 2 + }, + "mesa": { + "baseline": "22.0.2", + "port-version": 0 + }, + "meschach": { + "baseline": "1.2b", + "port-version": 5 + }, + "meshoptimizer": { + "baseline": "0.16", + "port-version": 0 + }, + "metis": { + "baseline": "5.1.0", + "port-version": 8 + }, + "metrohash": { + "baseline": "1.1.3", + "port-version": 4 + }, + "mfl": { + "baseline": "0.0.1", + "port-version": 0 + }, + "mgnlibs": { + "baseline": "2019-09-29", + "port-version": 1 + }, + "mhook": { + "baseline": "2.5.1", + "port-version": 3 + }, + "microsoft-signalr": { + "baseline": "0.1.0-alpha3", + "port-version": 1 + }, + "mikktspace": { + "baseline": "2020-10-06", + "port-version": 1 + }, + "milerius-sfml-imgui": { + "baseline": "1.1", + "port-version": 4 + }, + "mimalloc": { + "baseline": "2.0.6", + "port-version": 0 + }, + "minc": { + "baseline": "2.4.03", + "port-version": 2 + }, + "minhook": { + "baseline": "1.3.3", + "port-version": 3 + }, + "minifb": { + "baseline": "2019-08-20", + "port-version": 2 + }, + "minimp3": { + "baseline": "2021-11-30", + "port-version": 0 + }, + "minio-cpp": { + "baseline": "2022-01-03", + "port-version": 0 + }, + "minisat-master-keying": { + "baseline": "2.3.6", + "port-version": 0 + }, + "minitrace": { + "baseline": "2019.02.06", + "port-version": 2 + }, + "miniupnpc": { + "baseline": "2.1", + "port-version": 2 + }, + "miniz": { + "baseline": "2.2.0", + "port-version": 1 + }, + "minizip": { + "baseline": "1.2.11", + "port-version": 10 + }, + "minizip-ng": { + "baseline": "3.0.5", + "port-version": 0 + }, + "mio": { + "baseline": "2019-02-10", + "port-version": 1 + }, + "mlpack": { + "baseline": "3.4.1", + "port-version": 5 + }, + "mman": { + "baseline": "git-f5ff813", + "port-version": 5 + }, + "mmloader": { + "baseline": "1.0.1", + "port-version": 2 + }, + "mmx": { + "baseline": "2019-09-29", + "port-version": 1 + }, + "mnn": { + "baseline": "1.1.0", + "port-version": 3 + }, + "modp-base64": { + "baseline": "2020-09-26", + "port-version": 1 + }, + "mongo-c-driver": { + "baseline": "1.17.6", + "port-version": 2 + }, + "mongo-cxx-driver": { + "baseline": "3.6.5", + "port-version": 3 + }, + "mongoose": { + "baseline": "7.6", + "port-version": 0 + }, + "monkeys-audio": { + "baseline": "5.70", + "port-version": 2 + }, + "moos-core": { + "baseline": "10.4.0", + "port-version": 6 + }, + "moos-essential": { + "baseline": "10.0.1", + "port-version": 3 + }, + "moos-ui": { + "baseline": "10.0.1", + "port-version": 3 + }, + "morton-nd": { + "baseline": "4.0.0", + "port-version": 1 + }, + "mosquitto": { + "baseline": "2.0.14", + "port-version": 0 + }, + "mozjpeg": { + "baseline": "2021-09-27", + "port-version": 0 + }, + "mp-units": { + "baseline": "0.7.0", + "port-version": 0 + }, + "mp3lame": { + "baseline": "3.100", + "port-version": 7 + }, + "mpark-variant": { + "baseline": "1.4.0", + "port-version": 1 + }, + "mpc": { + "baseline": "1.2.0", + "port-version": 2 + }, + "mpfr": { + "baseline": "4.1.0", + "port-version": 4 + }, + "mpg123": { + "baseline": "1.29.3", + "port-version": 0 + }, + "mpi": { + "baseline": "1", + "port-version": 3 + }, + "mpir": { + "baseline": "2022-03-02", + "port-version": 1 + }, + "mpmcqueue": { + "baseline": "2021-12-01", + "port-version": 0 + }, + "mqtt-cpp": { + "baseline": "13.0.0", + "port-version": 0 + }, + "ms-angle": { + "baseline": "alias", + "port-version": 1 + }, + "ms-gltf": { + "baseline": "r1.9.5.4", + "port-version": 1 + }, + "ms-gsl": { + "baseline": "4.0.0", + "port-version": 0 + }, + "ms-quic": { + "baseline": "1.2.0", + "port-version": 0 + }, + "msdfgen": { + "baseline": "1.9.2", + "port-version": 0 + }, + "msgpack": { + "baseline": "3.3.0", + "port-version": 2 + }, + "msgpack11": { + "baseline": "0.0.10", + "port-version": 3 + }, + "msinttypes": { + "baseline": "2018-02-25", + "port-version": 1 + }, + "msix": { + "baseline": "1.7", + "port-version": 4 + }, + "msmpi": { + "baseline": "10.1.12498", + "port-version": 4 + }, + "mstch": { + "baseline": "1.0.2", + "port-version": 3 + }, + "mujs": { + "baseline": "2018-07-30", + "port-version": 2 + }, + "munit": { + "baseline": "2019-04-06", + "port-version": 5 + }, + "muparser": { + "baseline": "2.3.3", + "port-version": 2 + }, + "murmurhash": { + "baseline": "2016-01-09", + "port-version": 5 + }, + "mvfst": { + "baseline": "2022-03-27", + "port-version": 0 + }, + "mygui": { + "baseline": "3.4.1", + "port-version": 2 + }, + "nameof": { + "baseline": "0.10.1", + "port-version": 1 + }, + "nana": { + "baseline": "1.7.4", + "port-version": 2 + }, + "nano-signal-slot": { + "baseline": "2.0.1", + "port-version": 1 + }, + "nanobench": { + "baseline": "4.3.7", + "port-version": 0 + }, + "nanodbc": { + "baseline": "2.13.0", + "port-version": 6 + }, + "nanoflann": { + "baseline": "1.4.2", + "port-version": 0 + }, + "nanogui": { + "baseline": "2019-09-23", + "port-version": 3 + }, + "nanomsg": { + "baseline": "1.1.5", + "port-version": 4 + }, + "nanopb": { + "baseline": "0.4.5", + "port-version": 0 + }, + "nanoprintf": { + "baseline": "2020-05-27", + "port-version": 1 + }, + "nanorange": { + "baseline": "2020-07-06", + "port-version": 0 + }, + "nanort": { + "baseline": "2019-08-20", + "port-version": 2 + }, + "nanosvg": { + "baseline": "2022-04-29", + "port-version": 0 + }, + "nanovg": { + "baseline": "2019-08-30", + "port-version": 5 + }, + "nativefiledialog": { + "baseline": "2022-01-20", + "port-version": 0 + }, + "nayuki-qr-code-generator": { + "baseline": "1.7.0", + "port-version": 0 + }, + "nccl": { + "baseline": "2.4.6", + "port-version": 2 + }, + "ncurses": { + "baseline": "6.3", + "port-version": 1 + }, + "neargye-semver": { + "baseline": "0.3.0", + "port-version": 0 + }, + "ned14-internal-quickcpplib": { + "baseline": "0.0.0-cad832c8", + "port-version": 1 + }, + "neon2sse": { + "baseline": "2021-09-16", + "port-version": 0 + }, + "netcdf-c": { + "baseline": "4.8.1", + "port-version": 2 + }, + "netcdf-cxx4": { + "baseline": "4.3.1", + "port-version": 3 + }, + "nethost": { + "baseline": "6.0.5", + "port-version": 0 + }, + "nettle": { + "baseline": "3.7.3", + "port-version": 0 + }, + "networkdirect-sdk": { + "baseline": "2.0.1", + "port-version": 3 + }, + "nghttp2": { + "baseline": "1.46.0", + "port-version": 0 + }, + "ngspice": { + "baseline": "35", + "port-version": 2 + }, + "nifly": { + "baseline": "1.0.0", + "port-version": 0 + }, + "nifticlib": { + "baseline": "2020-04-30", + "port-version": 1 + }, + "nlohmann-fifo-map": { + "baseline": "2018.05.07", + "port-version": 2 + }, + "nlohmann-json": { + "baseline": "3.10.5", + "port-version": 3 + }, + "nlopt": { + "baseline": "2.7.1", + "port-version": 0 + }, + "nmap": { + "baseline": "7.70", + "port-version": 5 + }, + "nmslib": { + "baseline": "2.1.1", + "port-version": 1 + }, + "nng": { + "baseline": "1.5.2", + "port-version": 0 + }, + "nngpp": { + "baseline": "1.3.0", + "port-version": 1 + }, + "nnpack": { + "baseline": "2021-02-21", + "port-version": 3 + }, + "nonius": { + "baseline": "2019-04-20", + "port-version": 2 + }, + "nowide": { + "baseline": "11.1.3", + "port-version": 0 + }, + "nrf-ble-driver": { + "baseline": "4.1.2", + "port-version": 1 + }, + "nspr": { + "baseline": "4.33", + "port-version": 2 + }, + "nss": { + "baseline": "3.78", + "port-version": 0 + }, + "nsync": { + "baseline": "1.24.0", + "port-version": 1 + }, + "nt-wrapper": { + "baseline": "2019-08-10", + "port-version": 1 + }, + "nu-book-zxing-cpp": { + "baseline": "1.2.0", + "port-version": 0 + }, + "nuklear": { + "baseline": "2021-03-18", + "port-version": 1 + }, + "numactl": { + "baseline": "2.0.14", + "port-version": 1 + }, + "numcpp": { + "baseline": "2.6.0", + "port-version": 0 + }, + "nuspell": { + "baseline": "5.1.0", + "port-version": 2 + }, + "nvtt": { + "baseline": "2.1.2", + "port-version": 5 + }, + "oatpp": { + "baseline": "1.3.0", + "port-version": 0 + }, + "oatpp-consul": { + "baseline": "1.3.0", + "port-version": 0 + }, + "oatpp-curl": { + "baseline": "1.3.0", + "port-version": 0 + }, + "oatpp-libressl": { + "baseline": "1.3.0", + "port-version": 0 + }, + "oatpp-mbedtls": { + "baseline": "1.3.0", + "port-version": 0 + }, + "oatpp-mongo": { + "baseline": "1.3.0", + "port-version": 0 + }, + "oatpp-openssl": { + "baseline": "1.3.0", + "port-version": 0 + }, + "oatpp-postgresql": { + "baseline": "1.3.0", + "port-version": 0 + }, + "oatpp-sqlite": { + "baseline": "1.3.0", + "port-version": 0 + }, + "oatpp-ssdp": { + "baseline": "1.3.0", + "port-version": 0 + }, + "oatpp-swagger": { + "baseline": "1.3.0", + "port-version": 0 + }, + "oatpp-websocket": { + "baseline": "1.3.0", + "port-version": 0 + }, + "oatpp-zlib": { + "baseline": "1.3.0", + "port-version": 0 + }, + "observer-ptr-lite": { + "baseline": "0.4.0", + "port-version": 1 + }, + "ocilib": { + "baseline": "4.7.3", + "port-version": 2 + }, + "octomap": { + "baseline": "1.9.5", + "port-version": 2 + }, + "ode": { + "baseline": "0.16.1", + "port-version": 3 + }, + "offscale-libetcd-cpp": { + "baseline": "2019-07-10", + "port-version": 3 + }, + "ogdf": { + "baseline": "2019-08-23", + "port-version": 2 + }, + "ogre": { + "baseline": "1.12.9", + "port-version": 7 + }, + "ogre-next": { + "baseline": "2.3.0", + "port-version": 0 + }, + "ois": { + "baseline": "1.5.1", + "port-version": 1 + }, + "ompl": { + "baseline": "1.5.1", + "port-version": 5 + }, + "omplapp": { + "baseline": "1.5.1", + "port-version": 3 + }, + "onednn": { + "baseline": "2.4.3", + "port-version": 1 + }, + "oniguruma": { + "baseline": "6.9.7.1", + "port-version": 1 + }, + "onnx": { + "baseline": "1.10.2", + "port-version": 1 + }, + "onnx-optimizer": { + "baseline": "0.2.6", + "port-version": 0 + }, + "onnxruntime-gpu": { + "baseline": "1.5.1", + "port-version": 1 + }, + "oof": { + "baseline": "2021-11-23", + "port-version": 0 + }, + "open62541": { + "baseline": "1.2.3", + "port-version": 1 + }, + "openal-soft": { + "baseline": "1.21.1", + "port-version": 5 + }, + "openblas": { + "baseline": "0.3.20", + "port-version": 0 + }, + "opencascade": { + "baseline": "7.6.2", + "port-version": 0 + }, + "opencc": { + "baseline": "2020-04-26", + "port-version": 10 + }, + "opencensus-cpp": { + "baseline": "2021-08-26", + "port-version": 0 + }, + "opencl": { + "baseline": "2.2", + "port-version": 8 + }, + "opencolorio": { + "baseline": "2.1.1", + "port-version": 2 + }, + "opencolorio-tools": { + "baseline": "1.1.1", + "port-version": 0 + }, + "opencsg": { + "baseline": "1.4.2", + "port-version": 2 + }, + "openctm": { + "baseline": "1.0.3", + "port-version": 0 + }, + "opencv": { + "baseline": "4.5.5", + "port-version": 1 + }, + "opencv2": { + "baseline": "2.4.13.7", + "port-version": 13 + }, + "opencv3": { + "baseline": "3.4.16", + "port-version": 9 + }, + "opencv4": { + "baseline": "4.5.5", + "port-version": 5 + }, + "opendnp3": { + "baseline": "3.1.1", + "port-version": 1 + }, + "openexr": { + "baseline": "2.5.0", + "port-version": 3 + }, + "opengl": { + "baseline": "2022-03-14", + "port-version": 0 + }, + "opengl-registry": { + "baseline": "2021-11-17", + "port-version": 0 + }, + "openh264": { + "baseline": "2021-03-16", + "port-version": 3 + }, + "openigtlink": { + "baseline": "3.0", + "port-version": 2 + }, + "openimageio": { + "baseline": "2.3.10.1", + "port-version": 4 + }, + "openjpeg": { + "baseline": "2.5.0", + "port-version": 0 + }, + "openmama": { + "baseline": "6.3.1", + "port-version": 1 + }, + "openmesh": { + "baseline": "8.1", + "port-version": 3 + }, + "openmpi": { + "baseline": "4.1.0", + "port-version": 4 + }, + "openmvg": { + "baseline": "2.0", + "port-version": 4 + }, + "openmvs": { + "baseline": "2.0.1", + "port-version": 0 + }, + "openni2": { + "baseline": "2.2.0.33", + "port-version": 13 + }, + "openscap": { + "baseline": "1.3.1", + "port-version": 1 + }, + "openssl": { + "baseline": "3.0.3", + "port-version": 2 + }, + "openssl-unix": { + "baseline": "1.1.1h", + "port-version": 2 + }, + "openssl-uwp": { + "baseline": "1.1.1h", + "port-version": 2 + }, + "openssl-windows": { + "baseline": "1.1.1h", + "port-version": 2 + }, + "opensubdiv": { + "baseline": "3.4.3", + "port-version": 4 + }, + "opentelemetry-cpp": { + "baseline": "1.3.0", + "port-version": 0 + }, + "opentracing": { + "baseline": "1.6.0", + "port-version": 3 + }, + "openvdb": { + "baseline": "9.0.0", + "port-version": 0 + }, + "openvpn3": { + "baseline": "3.7.0", + "port-version": 1 + }, + "openvr": { + "baseline": "1.16.8", + "port-version": 2 + }, + "openxr-loader": { + "baseline": "1.0.22", + "port-version": 3 + }, + "optimus-cpp": { + "baseline": "0.3.0", + "port-version": 0 + }, + "optional-bare": { + "baseline": "1.1.0", + "port-version": 1 + }, + "optional-lite": { + "baseline": "3.5.0", + "port-version": 1 + }, + "opus": { + "baseline": "1.3.1", + "port-version": 6 + }, + "opusfile": { + "baseline": "0.12", + "port-version": 1 + }, + "orc": { + "baseline": "1.6.4", + "port-version": 4 + }, + "orocos-kdl": { + "baseline": "1.4", + "port-version": 5 + }, + "osg": { + "baseline": "3.6.5", + "port-version": 12 + }, + "osg-qt": { + "baseline": "Qt5", + "port-version": 3 + }, + "osgearth": { + "baseline": "3.2", + "port-version": 5 + }, + "osi": { + "baseline": "0.108.6", + "port-version": 1 + }, + "otl": { + "baseline": "4.0.463", + "port-version": 1 + }, + "outcome": { + "baseline": "2.2.2-20211208", + "port-version": 0 + }, + "p-ranav-csv": { + "baseline": "2019-07-11", + "port-version": 1 + }, + "p-ranav-csv2": { + "baseline": "2020-12-14", + "port-version": 2 + }, + "pagmo2": { + "baseline": "2.16.1", + "port-version": 0 + }, + "paho-mqtt": { + "baseline": "1.3.10", + "port-version": 0 + }, + "paho-mqttpp3": { + "baseline": "1.2.0", + "port-version": 1 + }, + "palsigslot": { + "baseline": "1.2.1", + "port-version": 0 + }, + "pango": { + "baseline": "1.50.7", + "port-version": 0 + }, + "pangolin": { + "baseline": "0.6", + "port-version": 2 + }, + "pangomm": { + "baseline": "2.50.0", + "port-version": 2 + }, + "parallel-hashmap": { + "baseline": "1.34", + "port-version": 0 + }, + "parallelstl": { + "baseline": "20200330", + "port-version": 1 + }, + "paraview": { + "baseline": "5.9.1", + "port-version": 2 + }, + "parmetis": { + "baseline": "4.0.3", + "port-version": 5 + }, + "parquet": { + "baseline": "0", + "port-version": 1 + }, + "parson": { + "baseline": "2020-09-14", + "port-version": 1 + }, + "pbc": { + "baseline": "0.5.14", + "port-version": 6 + }, + "pcapplusplus": { + "baseline": "22.05", + "port-version": 0 + }, + "pcg": { + "baseline": "2021-04-06", + "port-version": 1 + }, + "pcl": { + "baseline": "1.12.0", + "port-version": 6 + }, + "pcre": { + "baseline": "8.45", + "port-version": 3 + }, + "pcre2": { + "baseline": "10.40", + "port-version": 0 + }, + "pdal": { + "baseline": "2.4.0", + "port-version": 0 + }, + "pdal-c": { + "baseline": "2.1", + "port-version": 0 + }, + "pdcurses": { + "baseline": "3.9", + "port-version": 3 + }, + "pdqsort": { + "baseline": "2019-07-30", + "port-version": 1 + }, + "pe-parse": { + "baseline": "1.3.0", + "port-version": 0 + }, + "pegtl": { + "baseline": "3.2.6", + "port-version": 0 + }, + "pegtl-2": { + "baseline": "2.8.3", + "port-version": 1 + }, + "pffft": { + "baseline": "2021-10-09", + "port-version": 0 + }, + "pfring": { + "baseline": "2019-10-17", + "port-version": 4 + }, + "pfultz2-linq": { + "baseline": "2019-05-14", + "port-version": 1 + }, + "phnt": { + "baseline": "2020-12-21", + "port-version": 0 + }, + "physfs": { + "baseline": "3.0.2", + "port-version": 7 + }, + "physx": { + "baseline": "4.1.2", + "port-version": 4 + }, + "picojson": { + "baseline": "1.3.0", + "port-version": 2 + }, + "picosha2": { + "baseline": "2018-07-30", + "port-version": 1 + }, + "piex": { + "baseline": "2019-07-11", + "port-version": 2 + }, + "pipewire": { + "baseline": "0.3.52", + "port-version": 0 + }, + "pistache": { + "baseline": "2021-03-31", + "port-version": 3 + }, + "pixel": { + "baseline": "2022-03-15", + "port-version": 1 + }, + "pixman": { + "baseline": "0.40.0", + "port-version": 2 + }, + "pkgconf": { + "baseline": "1.8.0", + "port-version": 3 + }, + "platform-folders": { + "baseline": "4.1.0", + "port-version": 0 + }, + "plf-colony": { + "baseline": "6.33", + "port-version": 0 + }, + "plf-hive": { + "baseline": "2021-12-11", + "port-version": 0 + }, + "plf-list": { + "baseline": "2019-08-10", + "port-version": 1 + }, + "plf-nanotimer": { + "baseline": "2019-08-10", + "port-version": 1 + }, + "plf-stack": { + "baseline": "2019-08-10", + "port-version": 1 + }, + "plib": { + "baseline": "1.8.5", + "port-version": 5 + }, + "plibsys": { + "baseline": "0.0.4", + "port-version": 6 + }, + "plog": { + "baseline": "1.1.8", + "port-version": 0 + }, + "plplot": { + "baseline": "5.13.0", + "port-version": 15 + }, + "plustache": { + "baseline": "0.4.0", + "port-version": 2 + }, + "pmdk": { + "baseline": "1.11.0", + "port-version": 1 + }, + "pngpp": { + "baseline": "0.2.10", + "port-version": 0 + }, + "pngwriter": { + "baseline": "0.7.0", + "port-version": 3 + }, + "poco": { + "baseline": "1.11.2", + "port-version": 0 + }, + "podofo": { + "baseline": "0.9.7", + "port-version": 0 + }, + "poissonrecon": { + "baseline": "2021-09-26", + "port-version": 0 + }, + "poly2tri": { + "baseline": "2020-07-21", + "port-version": 2 + }, + "polyclipping": { + "baseline": "6.4.2", + "port-version": 10 + }, + "polyhook2": { + "baseline": "2022-03-01", + "port-version": 0 + }, + "polymorphic-value": { + "baseline": "1.3.0", + "port-version": 3 + }, + "ponder": { + "baseline": "3.0.0", + "port-version": 4 + }, + "poppler": { + "baseline": "22.3.0", + "port-version": 1 + }, + "popsift": { + "baseline": "0.9", + "port-version": 3 + }, + "portable-snippets": { + "baseline": "2019-09-20", + "port-version": 2 + }, + "portaudio": { + "baseline": "19.7", + "port-version": 3 + }, + "portmidi": { + "baseline": "2.0.2", + "port-version": 1 + }, + "portsmf": { + "baseline": "0.238", + "port-version": 1 + }, + "ppconsul": { + "baseline": "0.5", + "port-version": 3 + }, + "ppmagic": { + "baseline": "2020-07-03", + "port-version": 1 + }, + "pprint": { + "baseline": "2019-07-19", + "port-version": 1 + }, + "pqp": { + "baseline": "1.3", + "port-version": 5 + }, + "presentmon": { + "baseline": "1.7.0", + "port-version": 1 + }, + "proj": { + "baseline": "9.0.0", + "port-version": 0 + }, + "proj4": { + "baseline": "8.9.9", + "port-version": 1 + }, + "prometheus-cpp": { + "baseline": "1.0.1", + "port-version": 0 + }, + "promise-cpp": { + "baseline": "2.1.2", + "port-version": 0 + }, + "protobuf": { + "baseline": "3.19.4", + "port-version": 0 + }, + "protobuf-c": { + "baseline": "1.4.0", + "port-version": 0 + }, + "protopuf": { + "baseline": "2.2.0", + "port-version": 0 + }, + "protozero": { + "baseline": "1.7.1", + "port-version": 0 + }, + "proxygen": { + "baseline": "2022.03.21.00", + "port-version": 2 + }, + "psimd": { + "baseline": "2021-02-21", + "port-version": 0 + }, + "ptex": { + "baseline": "2.3.2", + "port-version": 4 + }, + "pthread": { + "baseline": "3.0.0", + "port-version": 1 + }, + "pthreadpool": { + "baseline": "2020-04-10", + "port-version": 2 + }, + "pthreads": { + "baseline": "3.0.0", + "port-version": 10 + }, + "ptyqt": { + "baseline": "0.6.5", + "port-version": 0 + }, + "pugixml": { + "baseline": "1.12.1", + "port-version": 0 + }, + "pybind11": { + "baseline": "2.9.2", + "port-version": 0 + }, + "pystring": { + "baseline": "1.1.3", + "port-version": 5 + }, + "python2": { + "baseline": "2.7.18", + "port-version": 5 + }, + "python3": { + "baseline": "3.10.2", + "port-version": 2 + }, + "qca": { + "baseline": "2.3.4", + "port-version": 2 + }, + "qcustomplot": { + "baseline": "2.0.1", + "port-version": 5 + }, + "qhttpengine": { + "baseline": "1.0.2", + "port-version": 1 + }, + "qhull": { + "baseline": "8.0.2", + "port-version": 3 + }, + "qnnpack": { + "baseline": "2021-02-26", + "port-version": 3 + }, + "qpid-proton": { + "baseline": "0.37.0", + "port-version": 2 + }, + "qscintilla": { + "baseline": "2.12.0", + "port-version": 1 + }, + "qt": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qt-advanced-docking-system": { + "baseline": "3.8.2", + "port-version": 0 + }, + "qt5": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-3d": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-activeqt": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-androidextras": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-base": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-canvas3d": { + "baseline": "0", + "port-version": 1 + }, + "qt5-charts": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-connectivity": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-datavis3d": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-declarative": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-doc": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-gamepad": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-graphicaleffects": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-imageformats": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-location": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-macextras": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-modularscripts": { + "baseline": "deprecated", + "port-version": 1 + }, + "qt5-mqtt": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-multimedia": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-networkauth": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-purchasing": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-quickcontrols": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-quickcontrols2": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-remoteobjects": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-script": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-scxml": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-sensors": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-serialbus": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-serialport": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-speech": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-svg": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-tools": { + "baseline": "5.15.4", + "port-version": 1 + }, + "qt5-translations": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-virtualkeyboard": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-wayland": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-webchannel": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-webengine": { + "baseline": "5.15.4", + "port-version": 2 + }, + "qt5-webglplugin": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-websockets": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-webview": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-winextras": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-x11extras": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5-xmlpatterns": { + "baseline": "5.15.4", + "port-version": 0 + }, + "qt5compat": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qt6betablock": { + "baseline": "6.2.0-beta", + "port-version": 0 + }, + "qtactiveqt": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtapplicationmanager": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtbase": { + "baseline": "6.3.0", + "port-version": 2 + }, + "qtcharts": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtcoap": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtconnectivity": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtdatavis3d": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtdeclarative": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtdeviceutilities": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtdoc": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtimageformats": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtinterfaceframework": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtkeychain": { + "baseline": "0.13.2", + "port-version": 3 + }, + "qtkeychain-qt6": { + "baseline": "0.13.2", + "port-version": 1 + }, + "qtlocation": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtlottie": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtmqtt": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtmultimedia": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtnetworkauth": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtopcua": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtpositioning": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtquick3d": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtquickcontrols2": { + "baseline": "6.2.0", + "port-version": 0 + }, + "qtquicktimeline": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtremoteobjects": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtscxml": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtsensors": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtserialbus": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtserialport": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtshadertools": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtsvg": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qttools": { + "baseline": "6.3.0", + "port-version": 1 + }, + "qttranslations": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtvirtualkeyboard": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtwayland": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtwebchannel": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtwebengine": { + "baseline": "6.3.0", + "port-version": 2 + }, + "qtwebsockets": { + "baseline": "6.3.0", + "port-version": 0 + }, + "qtwebview": { + "baseline": "6.3.0", + "port-version": 0 + }, + "quadtree": { + "baseline": "2020-04-13", + "port-version": 1 + }, + "quantlib": { + "baseline": "1.26", + "port-version": 1 + }, + "quaternions": { + "baseline": "1.0.0", + "port-version": 1 + }, + "quazip": { + "baseline": "1.3", + "port-version": 0 + }, + "quickfast": { + "baseline": "1.5", + "port-version": 1 + }, + "quickfix": { + "baseline": "1.15.1", + "port-version": 7 + }, + "quill": { + "baseline": "2.0.0", + "port-version": 0 + }, + "quirc": { + "baseline": "1.1", + "port-version": 2 + }, + "qwt": { + "baseline": "6.2.0", + "port-version": 2 + }, + "qwtw": { + "baseline": "3.1.0", + "port-version": 2 + }, + "rabit": { + "baseline": "0.1", + "port-version": 3 + }, + "ragel": { + "baseline": "6.10", + "port-version": 4 + }, + "random123": { + "baseline": "1.14.0", + "port-version": 0 + }, + "randomstr": { + "baseline": "2022-02-03", + "port-version": 0 + }, + "rang": { + "baseline": "3.2", + "port-version": 0 + }, + "range-v3": { + "baseline": "2021-11-02", + "port-version": 0 + }, + "range-v3-vs2015": { + "baseline": "20151130-vcpkg5", + "port-version": 1 + }, + "rapidcheck": { + "baseline": "2021-12-20", + "port-version": 0 + }, + "rapidcsv": { + "baseline": "8.53", + "port-version": 0 + }, + "rapidjson": { + "baseline": "2020-09-14", + "port-version": 2 + }, + "rapidxml": { + "baseline": "1.13", + "port-version": 5 + }, + "rapidxml-ns": { + "baseline": "1.13.2", + "port-version": 1 + }, + "rappture": { + "baseline": "1.9", + "port-version": 1 + }, + "raylib": { + "baseline": "4.0.0", + "port-version": 3 + }, + "rbdl": { + "baseline": "2.6.0", + "port-version": 3 + }, + "rbdl-orb": { + "baseline": "3.1.2", + "port-version": 1 + }, + "re2": { + "baseline": "2021-11-01", + "port-version": 0 + }, + "readerwriterqueue": { + "baseline": "1.0.6", + "port-version": 0 + }, + "readline": { + "baseline": "0", + "port-version": 3 + }, + "readline-osx": { + "baseline": "2020-01-04", + "port-version": 0 + }, + "readline-unix": { + "baseline": "8.1", + "port-version": 1 + }, + "readline-win32": { + "baseline": "5.0", + "port-version": 4 + }, + "readosm": { + "baseline": "1.1.0a", + "port-version": 2 + }, + "realsense2": { + "baseline": "2.50.0", + "port-version": 1 + }, + "recast": { + "baseline": "1.5.1", + "port-version": 5 + }, + "redis-plus-plus": { + "baseline": "1.3.2", + "port-version": 0 + }, + "refl-cpp": { + "baseline": "0.12.3", + "port-version": 1 + }, + "refprop-headers": { + "baseline": "2019-04-14", + "port-version": 1 + }, + "rendergraph": { + "baseline": "1.1.0", + "port-version": 0 + }, + "replxx": { + "baseline": "0.0.4", + "port-version": 1 + }, + "reproc": { + "baseline": "14.2.4", + "port-version": 1 + }, + "rest-rpc": { + "baseline": "0.07", + "port-version": 2 + }, + "restbed": { + "baseline": "4.8", + "port-version": 0 + }, + "restc-cpp": { + "baseline": "0.10.0", + "port-version": 1 + }, + "restclient-cpp": { + "baseline": "2022-02-09", + "port-version": 0 + }, + "restinio": { + "baseline": "0.6.15", + "port-version": 0 + }, + "rexo": { + "baseline": "0.2.2", + "port-version": 0 + }, + "rhash": { + "baseline": "1.4.2", + "port-version": 1 + }, + "rhasheq": { + "baseline": "0.0.1", + "port-version": 0 + }, + "riffcpp": { + "baseline": "2.2.4", + "port-version": 1 + }, + "ring-span-lite": { + "baseline": "0.6.0", + "port-version": 0 + }, + "rmlui": { + "baseline": "4.4", + "port-version": 0 + }, + "roaring": { + "baseline": "2019-03-05", + "port-version": 3 + }, + "robin-hood-hashing": { + "baseline": "3.11.5", + "port-version": 0 + }, + "robin-map": { + "baseline": "1.0.1", + "port-version": 0 + }, + "rocksdb": { + "baseline": "6.27.3", + "port-version": 0 + }, + "rpclib": { + "baseline": "2.3.0", + "port-version": 1 + }, + "rply": { + "baseline": "1.1.4", + "port-version": 1 + }, + "rsasynccpp": { + "baseline": "0.0.7", + "port-version": 1 + }, + "rsig": { + "baseline": "0.1.0", + "port-version": 0 + }, + "rsm-binary-io": { + "baseline": "2.0.5", + "port-version": 0 + }, + "rsm-bsa": { + "baseline": "4.0.3", + "port-version": 0 + }, + "rsm-mmio": { + "baseline": "1.1.0", + "port-version": 2 + }, + "rsocket": { + "baseline": "2021.08.30.00", + "port-version": 1 + }, + "rtabmap": { + "baseline": "0.20.13", + "port-version": 3 + }, + "rtaudio": { + "baseline": "2021-11-16", + "port-version": 0 + }, + "rtlsdr": { + "baseline": "2020-04-16", + "port-version": 3 + }, + "rtmidi": { + "baseline": "5.0.0", + "port-version": 2 + }, + "rttr": { + "baseline": "0.9.6", + "port-version": 4 + }, + "rxcpp": { + "baseline": "4.1.0", + "port-version": 2 + }, + "rxqt": { + "baseline": "bb2138c", + "port-version": 1 + }, + "rxspencer": { + "baseline": "3.9.0", + "port-version": 2 + }, + "ryml": { + "baseline": "0.4.1", + "port-version": 0 + }, + "ryu": { + "baseline": "2.0", + "port-version": 6 + }, + "s2geometry": { + "baseline": "0.9.0", + "port-version": 1 + }, + "s2n": { + "baseline": "1.3.5", + "port-version": 0 + }, + "safeint": { + "baseline": "3.0.26", + "port-version": 0 + }, + "sail": { + "baseline": "0.9.0-pre21", + "port-version": 0 + }, + "sais": { + "baseline": "2.4.1", + "port-version": 3 + }, + "sajson": { + "baseline": "2018-09-21", + "port-version": 1 + }, + "sassc": { + "baseline": "3.6.2", + "port-version": 0 + }, + "sbp": { + "baseline": "3.4.10", + "port-version": 1 + }, + "scintilla": { + "baseline": "4.4.6", + "port-version": 1 + }, + "sciplot": { + "baseline": "0.2.2", + "port-version": 0 + }, + "sciter": { + "baseline": "0", + "port-version": 1 + }, + "sciter-js": { + "baseline": "4.4.8.31", + "port-version": 0 + }, + "scnlib": { + "baseline": "1.0", + "port-version": 0 + }, + "scottt-debugbreak": { + "baseline": "1.0", + "port-version": 0 + }, + "scylla-wrapper": { + "baseline": "2018-08-26-16e6f435", + "port-version": 2 + }, + "sdformat10": { + "baseline": "10.0.0", + "port-version": 2 + }, + "sdformat6": { + "baseline": "6.2.0", + "port-version": 6 + }, + "sdformat9": { + "baseline": "9.4.0", + "port-version": 6 + }, + "sdl1": { + "baseline": "1.2.15", + "port-version": 17 + }, + "sdl1-net": { + "baseline": "1.2.8", + "port-version": 4 + }, + "sdl2": { + "baseline": "2.0.22", + "port-version": 1 + }, + "sdl2-gfx": { + "baseline": "1.0.4", + "port-version": 8 + }, + "sdl2-image": { + "baseline": "2.0.5", + "port-version": 6 + }, + "sdl2-mixer": { + "baseline": "2.0.4", + "port-version": 16 + }, + "sdl2-net": { + "baseline": "2.0.1", + "port-version": 9 + }, + "sdl2-ttf": { + "baseline": "2.0.15", + "port-version": 5 + }, + "sdl2pp": { + "baseline": "0.16.1", + "port-version": 2 + }, + "seal": { + "baseline": "3.7.2", + "port-version": 3 + }, + "secp256k1": { + "baseline": "2017-19-10", + "port-version": 4 + }, + "selene": { + "baseline": "0.3.1", + "port-version": 5 + }, + "sentencepiece": { + "baseline": "0.1.96", + "port-version": 1 + }, + "sentry-native": { + "baseline": "0.4.17", + "port-version": 0 + }, + "septag-dmon": { + "baseline": "2022-02-08", + "port-version": 0 + }, + "septag-sx": { + "baseline": "2019-05-07", + "port-version": 3 + }, + "seqan": { + "baseline": "2.4.0", + "port-version": 2 + }, + "serd": { + "baseline": "0.30.4", + "port-version": 0 + }, + "serdepp": { + "baseline": "0.1.4", + "port-version": 0 + }, + "sf2cute": { + "baseline": "0.2.0", + "port-version": 2 + }, + "sfgui": { + "baseline": "0.4.0", + "port-version": 5 + }, + "sfml": { + "baseline": "2.5.1", + "port-version": 13 + }, + "sfsexp": { + "baseline": "1.3.1", + "port-version": 0 + }, + "shaderc": { + "baseline": "2021.1", + "port-version": 2 + }, + "shaderwriter": { + "baseline": "2.3.0", + "port-version": 0 + }, + "shapelib": { + "baseline": "1.5.0", + "port-version": 3 + }, + "shiva": { + "baseline": "1.0", + "port-version": 5 + }, + "shiva-sfml": { + "baseline": "1.0", + "port-version": 2 + }, + "shogun": { + "baseline": "6.1.4", + "port-version": 7 + }, + "signalrclient": { + "baseline": "1.0.0-beta1-9", + "port-version": 2 + }, + "sigslot": { + "baseline": "1.0.0", + "port-version": 4 + }, + "simage": { + "baseline": "1.8.2", + "port-version": 1 + }, + "simbody": { + "baseline": "2022-01-04", + "port-version": 2 + }, + "simde": { + "baseline": "0.7.2", + "port-version": 0 + }, + "simdjson": { + "baseline": "1.1.0", + "port-version": 0 + }, + "simdutf": { + "baseline": "1.0.0", + "port-version": 1 + }, + "simple-fft": { + "baseline": "2020-06-14", + "port-version": 1 + }, + "simpleini": { + "baseline": "4.19", + "port-version": 0 + }, + "sjpeg": { + "baseline": "2021-10-31", + "port-version": 0 + }, + "skcrypter": { + "baseline": "2021-12-03", + "port-version": 0 + }, + "skia": { + "baseline": "2022-04-15", + "port-version": 0 + }, + "skyr-url": { + "baseline": "1.13.0", + "port-version": 2 + }, + "sleef": { + "baseline": "3.5.1", + "port-version": 2 + }, + "sleepy-discord": { + "baseline": "2022-02-05", + "port-version": 0 + }, + "slikenet": { + "baseline": "2021-06-07", + "port-version": 1 + }, + "sltbench": { + "baseline": "2.4.0", + "port-version": 0 + }, + "smpeg2": { + "baseline": "2.0.0", + "port-version": 7 + }, + "snappy": { + "baseline": "1.1.9", + "port-version": 1 + }, + "sndfile": { + "baseline": "0", + "port-version": 1 + }, + "snowhouse": { + "baseline": "5.0.0", + "port-version": 1 + }, + "so5extra": { + "baseline": "1.5.1", + "port-version": 0 + }, + "sobjectizer": { + "baseline": "5.7.4", + "port-version": 0 + }, + "soci": { + "baseline": "4.0.2", + "port-version": 0 + }, + "socket-io-client": { + "baseline": "3.1.0", + "port-version": 1 + }, + "sockpp": { + "baseline": "0.7.1", + "port-version": 1 + }, + "soem": { + "baseline": "1.4.0", + "port-version": 3 + }, + "soil": { + "baseline": "2021-04-22", + "port-version": 1 + }, + "soil2": { + "baseline": "1.3.0", + "port-version": 0 + }, + "sokol": { + "baseline": "2019-09-09", + "port-version": 1 + }, + "sol2": { + "baseline": "3.2.2", + "port-version": 2 + }, + "solid3": { + "baseline": "3.5.8", + "port-version": 1 + }, + "sophus": { + "baseline": "2021-09-14", + "port-version": 0 + }, + "soqt": { + "baseline": "1.6.0", + "port-version": 4 + }, + "sord": { + "baseline": "0.16.4", + "port-version": 0 + }, + "soundtouch": { + "baseline": "2.3.1", + "port-version": 2 + }, + "soxr": { + "baseline": "0.1.3", + "port-version": 6 + }, + "spaceland": { + "baseline": "7.8.2", + "port-version": 5 + }, + "span-lite": { + "baseline": "0.10.3", + "port-version": 0 + }, + "sparsehash": { + "baseline": "2.0.4", + "port-version": 2 + }, + "sparsepp": { + "baseline": "1.22", + "port-version": 2 + }, + "spatialite-tools": { + "baseline": "5.0.1", + "port-version": 1 + }, + "spdk": { + "baseline": "19.01.1", + "port-version": 2 + }, + "spdk-dpdk": { + "baseline": "20181124", + "port-version": 1 + }, + "spdk-ipsec": { + "baseline": "20180711", + "port-version": 1 + }, + "spdk-isal": { + "baseline": "20181006", + "port-version": 2 + }, + "spdlog": { + "baseline": "1.10.0", + "port-version": 1 + }, + "spectra": { + "baseline": "1.0.1", + "port-version": 0 + }, + "speex": { + "baseline": "1.2.0", + "port-version": 11 + }, + "speexdsp": { + "baseline": "1.2.0", + "port-version": 7 + }, + "spirit-po": { + "baseline": "1.1.2", + "port-version": 2 + }, + "spirv-cross": { + "baseline": "2021-01-15", + "port-version": 2 + }, + "spirv-headers": { + "baseline": "1.3.204.1", + "port-version": 0 + }, + "spirv-reflect": { + "baseline": "1.3.204.1", + "port-version": 0 + }, + "spirv-tools": { + "baseline": "2022.1", + "port-version": 0 + }, + "spix": { + "baseline": "0.3", + "port-version": 0 + }, + "sprout": { + "baseline": "2019-06-20", + "port-version": 1 + }, + "spscqueue": { + "baseline": "1.1", + "port-version": 1 + }, + "sqlcipher": { + "baseline": "4.5.1", + "port-version": 0 + }, + "sqlite-modern-cpp": { + "baseline": "3.2-936cd0c8", + "port-version": 1 + }, + "sqlite-orm": { + "baseline": "1.7.1", + "port-version": 0 + }, + "sqlite3": { + "baseline": "3.37.2", + "port-version": 1 + }, + "sqlitecpp": { + "baseline": "3.1.1", + "port-version": 1 + }, + "sqlpp11": { + "baseline": "0.60", + "port-version": 1 + }, + "sqlpp11-connector-mysql": { + "baseline": "0.29", + "port-version": 2 + }, + "sqlpp11-connector-sqlite3": { + "baseline": "0.30", + "port-version": 1 + }, + "squirrel": { + "baseline": "2021-09-17", + "port-version": 0 + }, + "sratom": { + "baseline": "0.6.4", + "port-version": 0 + }, + "srell": { + "baseline": "3.010", + "port-version": 0 + }, + "srpc": { + "baseline": "0.9.3", + "port-version": 0 + }, + "starlink-ast": { + "baseline": "9.2.7", + "port-version": 1 + }, + "status-code": { + "baseline": "1.0.0-20211208", + "port-version": 1 + }, + "status-value-lite": { + "baseline": "1.1.0", + "port-version": 1 + }, + "stb": { + "baseline": "2021-09-10", + "port-version": 0 + }, + "stduuid": { + "baseline": "1.2.2", + "port-version": 0 + }, + "stftpitchshift": { + "baseline": "1.4.1", + "port-version": 0 + }, + "stlab": { + "baseline": "1.6.2", + "port-version": 1 + }, + "stormlib": { + "baseline": "2019-05-10", + "port-version": 3 + }, + "strict-variant": { + "baseline": "0.5", + "port-version": 1 + }, + "string-theory": { + "baseline": "3.6", + "port-version": 0 + }, + "string-view-lite": { + "baseline": "1.6.0", + "port-version": 0 + }, + "strtk": { + "baseline": "2020-09-14", + "port-version": 1 + }, + "stx": { + "baseline": "1.0.1", + "port-version": 1 + }, + "stxxl": { + "baseline": "2018-11-15", + "port-version": 5 + }, + "suitesparse": { + "baseline": "5.8.0", + "port-version": 1 + }, + "sundials": { + "baseline": "6.2.0", + "port-version": 0 + }, + "superlu": { + "baseline": "2020-01-07", + "port-version": 5 + }, + "symengine": { + "baseline": "0.9.0", + "port-version": 0 + }, + "systemc": { + "baseline": "2.3.3", + "port-version": 6 + }, + "szip": { + "baseline": "2.1.1", + "port-version": 8 + }, + "tabulate": { + "baseline": "2019-01-06", + "port-version": 1 + }, + "tacopie": { + "baseline": "3.2.0", + "port-version": 3 + }, + "taglib": { + "baseline": "1.12.0", + "port-version": 3 + }, + "taocpp-json": { + "baseline": "2020-09-14", + "port-version": 1 + }, + "tap-windows6": { + "baseline": "9.21.2-0e30f5c", + "port-version": 1 + }, + "taskflow": { + "baseline": "3.3.0", + "port-version": 0 + }, + "tbb": { + "baseline": "2020_U3", + "port-version": 8 + }, + "tcb-span": { + "baseline": "2021-12-15", + "port-version": 0 + }, + "tcl": { + "baseline": "core-9-0-a1", + "port-version": 5 + }, + "tclap": { + "baseline": "1.2.5", + "port-version": 0 + }, + "teemo": { + "baseline": "2.7", + "port-version": 0 + }, + "telnetpp": { + "baseline": "2.1.2", + "port-version": 1 + }, + "tensorflow": { + "baseline": "2.7.0", + "port-version": 2 + }, + "tensorflow-cc": { + "baseline": "2.7.0", + "port-version": 2 + }, + "tensorflow-common": { + "baseline": "2.7.0", + "port-version": 2 + }, + "tensorpipe": { + "baseline": "2022-03-16", + "port-version": 0 + }, + "termcolor": { + "baseline": "2.1.0", + "port-version": 0 + }, + "tesseract": { + "baseline": "4.1.1", + "port-version": 10 + }, + "tfhe": { + "baseline": "1.0.1", + "port-version": 3 + }, + "tgbot-cpp": { + "baseline": "1.3", + "port-version": 0 + }, + "tgc": { + "baseline": "2019-08-11", + "port-version": 2 + }, + "tgui": { + "baseline": "2021-04-19", + "port-version": 3 + }, + "theia": { + "baseline": "0.8", + "port-version": 6 + }, + "think-cell-range": { + "baseline": "498839d", + "port-version": 2 + }, + "thor": { + "baseline": "2.0", + "port-version": 5 + }, + "threadpool": { + "baseline": "0.2.5", + "port-version": 2 + }, + "thrift": { + "baseline": "0.16.0", + "port-version": 0 + }, + "tidy-html5": { + "baseline": "5.7.28", + "port-version": 5 + }, + "tiff": { + "baseline": "4.4.0", + "port-version": 1 + }, + "tinkerforge": { + "baseline": "2.1.25", + "port-version": 2 + }, + "tiny-aes-c": { + "baseline": "2019-07-31", + "port-version": 1 + }, + "tiny-bignum-c": { + "baseline": "2019-07-31", + "port-version": 1 + }, + "tiny-dnn": { + "baseline": "2018-10-25", + "port-version": 1 + }, + "tiny-process-library": { + "baseline": "2.0.4", + "port-version": 1 + }, + "tiny-regex-c": { + "baseline": "2019-07-31", + "port-version": 1 + }, + "tinycbor": { + "baseline": "0.6.0", + "port-version": 1 + }, + "tinycthread": { + "baseline": "2019-08-06", + "port-version": 1 + }, + "tinydir": { + "baseline": "1.2.5", + "port-version": 0 + }, + "tinyexif": { + "baseline": "2022-02-15", + "port-version": 0 + }, + "tinyexpr": { + "baseline": "2020-09-25", + "port-version": 0 + }, + "tinyexr": { + "baseline": "1.0.0", + "port-version": 1 + }, + "tinyfiledialogs": { + "baseline": "3.8.8", + "port-version": 4 + }, + "tinygltf": { + "baseline": "2.5.0", + "port-version": 0 + }, + "tinynpy": { + "baseline": "1.0.0", + "port-version": 4 + }, + "tinyobjloader": { + "baseline": "2.0.0-rc9", + "port-version": 0 + }, + "tinyply": { + "baseline": "2020-05-22", + "port-version": 2 + }, + "tinyspline": { + "baseline": "0.4.0", + "port-version": 0 + }, + "tinythread": { + "baseline": "1.1", + "port-version": 4 + }, + "tinytoml": { + "baseline": "20180219", + "port-version": 2 + }, + "tinyutf8": { + "baseline": "4.0.2", + "port-version": 1 + }, + "tinyxml": { + "baseline": "2.6.2", + "port-version": 8 + }, + "tinyxml2": { + "baseline": "9.0.0", + "port-version": 1 + }, + "tl-expected": { + "baseline": "1.0.0", + "port-version": 2 + }, + "tl-function-ref": { + "baseline": "1.0.0", + "port-version": 2 + }, + "tl-generator": { + "baseline": "2021-09-28", + "port-version": 0 + }, + "tl-optional": { + "baseline": "1.0.0", + "port-version": 2 + }, + "tl-ranges": { + "baseline": "2021-12-02", + "port-version": 0 + }, + "tlx": { + "baseline": "0.5.20191212", + "port-version": 2 + }, + "tmx": { + "baseline": "1.2.0", + "port-version": 1 + }, + "tmxlite": { + "baseline": "1.3.0", + "port-version": 1 + }, + "tmxparser": { + "baseline": "2.1.0", + "port-version": 6 + }, + "toml11": { + "baseline": "3.7.1", + "port-version": 0 + }, + "tomlplusplus": { + "baseline": "3.1.0", + "port-version": 0 + }, + "tool-meson": { + "baseline": "2022-01-21", + "port-version": 0 + }, + "torch-th": { + "baseline": "2019-04-19", + "port-version": 3 + }, + "tracy": { + "baseline": "0.8.1", + "port-version": 0 + }, + "transwarp": { + "baseline": "2.2.2", + "port-version": 0 + }, + "trantor": { + "baseline": "1.5.5", + "port-version": 0 + }, + "tre": { + "baseline": "0.8.0", + "port-version": 3 + }, + "treehh": { + "baseline": "3.16", + "port-version": 0 + }, + "treehopper": { + "baseline": "1.11.3", + "port-version": 5 + }, + "triangle": { + "baseline": "1.6", + "port-version": 2 + }, + "triton": { + "baseline": "0.9", + "port-version": 3 + }, + "trompeloeil": { + "baseline": "41", + "port-version": 0 + }, + "tsl-hopscotch-map": { + "baseline": "2.3.0", + "port-version": 1 + }, + "tsl-ordered-map": { + "baseline": "1.0.0", + "port-version": 1 + }, + "tsl-sparse-map": { + "baseline": "0.6.2", + "port-version": 1 + }, + "ttauri": { + "baseline": "0.5.0", + "port-version": 1 + }, + "turbobase64": { + "baseline": "2020-01-12", + "port-version": 2 + }, + "tvision": { + "baseline": "2021-08-10", + "port-version": 1 + }, + "tweeny": { + "baseline": "3.2.0", + "port-version": 0 + }, + "type-lite": { + "baseline": "0.1.0", + "port-version": 1 + }, + "type-safe": { + "baseline": "0.2.2", + "port-version": 1 + }, + "uchardet": { + "baseline": "2021-09-03", + "port-version": 2 + }, + "umock-c": { + "baseline": "2022-01-21", + "port-version": 0 + }, + "unicorn": { + "baseline": "1.0.3", + "port-version": 0 + }, + "unicorn-lib": { + "baseline": "2022-01-24", + "port-version": 0 + }, + "units": { + "baseline": "2.3.1", + "port-version": 1 + }, + "unittest-cpp": { + "baseline": "2.0.0", + "port-version": 3 + }, + "unixodbc": { + "baseline": "2.3.11", + "port-version": 1 + }, + "unqlite": { + "baseline": "1.1.9", + "port-version": 0 + }, + "unrar": { + "baseline": "5.8.1", + "port-version": 3 + }, + "upb": { + "baseline": "2021-10-19", + "port-version": 0 + }, + "urdfdom": { + "baseline": "1.0.4", + "port-version": 5 + }, + "urdfdom-headers": { + "baseline": "1.0.5", + "port-version": 2 + }, + "urho3d": { + "baseline": "2021-03-01", + "port-version": 2 + }, + "uriparser": { + "baseline": "0.9.6", + "port-version": 0 + }, + "usbmuxd": { + "baseline": "1.2.235", + "port-version": 1 + }, + "usd": { + "baseline": "20.08", + "port-version": 2 + }, + "usockets": { + "baseline": "0.8.1", + "port-version": 0 + }, + "usrsctp": { + "baseline": "0.9.5.0", + "port-version": 1 + }, + "utf8h": { + "baseline": "2021-11-18", + "port-version": 0 + }, + "utf8proc": { + "baseline": "2.7.0", + "port-version": 0 + }, + "utfcpp": { + "baseline": "3.2.1", + "port-version": 0 + }, + "utfz": { + "baseline": "1.2", + "port-version": 2 + }, + "uthash": { + "baseline": "2.3.0", + "port-version": 0 + }, + "uthenticode": { + "baseline": "1.0.6", + "port-version": 2 + }, + "uvatlas": { + "baseline": "2022-05-09", + "port-version": 0 + }, + "uvw": { + "baseline": "2.12.1", + "port-version": 0 + }, + "uwebsockets": { + "baseline": "20.11.0", + "port-version": 0 + }, + "v-hacd": { + "baseline": "3.2.0", + "port-version": 3 + }, + "v8": { + "baseline": "9.1.269.39", + "port-version": 4 + }, + "valijson": { + "baseline": "0.6", + "port-version": 0 + }, + "value-ptr-lite": { + "baseline": "0.2.1", + "port-version": 1 + }, + "vamp-sdk": { + "baseline": "2.10", + "port-version": 3 + }, + "variant-lite": { + "baseline": "2.0.0", + "port-version": 0 + }, + "vc": { + "baseline": "1.4.3", + "port-version": 0 + }, + "vcglib": { + "baseline": "2022.02", + "port-version": 0 + }, + "vcpkg-cmake": { + "baseline": "2022-05-10", + "port-version": 1 + }, + "vcpkg-cmake-config": { + "baseline": "2022-02-06", + "port-version": 1 + }, + "vcpkg-cmake-get-vars": { + "baseline": "2022-05-10", + "port-version": 1 + }, + "vcpkg-get-python-packages": { + "baseline": "2022-04-11", + "port-version": 1 + }, + "vcpkg-gfortran": { + "baseline": "3", + "port-version": 2 + }, + "vcpkg-gn": { + "baseline": "2021-11-16", + "port-version": 2 + }, + "vcpkg-pkgconfig-get-modules": { + "baseline": "2022-02-10", + "port-version": 1 + }, + "vcpkg-qmake": { + "baseline": "2022-05-10", + "port-version": 1 + }, + "vcpkg-tool-gn": { + "baseline": "2022-04-16", + "port-version": 0 + }, + "vcpkg-tool-gyp-nss": { + "baseline": "2022-03-04", + "port-version": 0 + }, + "vcpkg-tool-lessmsi": { + "baseline": "1.10.0", + "port-version": 0 + }, + "vcpkg-tool-meson": { + "baseline": "0.62.1", + "port-version": 0 + }, + "vcpkg-tool-mozbuild": { + "baseline": "3.3", + "port-version": 0 + }, + "vcpkg-tool-ninja": { + "baseline": "2022-03-31", + "port-version": 0 + }, + "vcpkg-tool-nodejs": { + "baseline": "14.17.4", + "port-version": 0 + }, + "vcpkg-tool-python2": { + "baseline": "2.7.18", + "port-version": 0 + }, + "vectorclass": { + "baseline": "2.00.01", + "port-version": 2 + }, + "visit-struct": { + "baseline": "1.0", + "port-version": 2 + }, + "vk-bootstrap": { + "baseline": "0.5", + "port-version": 0 + }, + "vkfft": { + "baseline": "1.2.17", + "port-version": 0 + }, + "vlfeat": { + "baseline": "2020-07-10", + "port-version": 1 + }, + "vlpp": { + "baseline": "0.11.0.0", + "port-version": 3 + }, + "volk": { + "baseline": "1.3.204", + "port-version": 1 + }, + "vs-yasm": { + "baseline": "0.5.0", + "port-version": 1 + }, + "vtk": { + "baseline": "9.0.3-pv5.9.1", + "port-version": 10 + }, + "vtk-dicom": { + "baseline": "0.8.12", + "port-version": 2 + }, + "vtk-m": { + "baseline": "1.6.0", + "port-version": 2 + }, + "vulkan": { + "baseline": "1.1.82.1", + "port-version": 2 + }, + "vulkan-headers": { + "baseline": "1.2.203", + "port-version": 0 + }, + "vulkan-hpp": { + "baseline": "1.2.203", + "port-version": 0 + }, + "vulkan-memory-allocator": { + "baseline": "3.0.0", + "port-version": 0 + }, + "vxl": { + "baseline": "2.0.2", + "port-version": 4 + }, + "wampcc": { + "baseline": "2019-09-04", + "port-version": 3 + }, + "wangle": { + "baseline": "2022.03.21.00", + "port-version": 0 + }, + "wavelib": { + "baseline": "2021-11-26", + "port-version": 0 + }, + "wavpack": { + "baseline": "5.4.0", + "port-version": 2 + }, + "websocketpp": { + "baseline": "0.8.2", + "port-version": 2 + }, + "webview2": { + "baseline": "1.0.1210.39", + "port-version": 0 + }, + "wepoll": { + "baseline": "1.5.8", + "port-version": 1 + }, + "wg21-sg14": { + "baseline": "2019-08-13", + "port-version": 1 + }, + "wil": { + "baseline": "2021-12-25", + "port-version": 0 + }, + "wildmidi": { + "baseline": "0.4.4", + "port-version": 0 + }, + "wincrypt": { + "baseline": "0.0", + "port-version": 4 + }, + "winlamb": { + "baseline": "2020-10-15", + "port-version": 0 + }, + "winpcap": { + "baseline": "4.1.3", + "port-version": 8 + }, + "winpty": { + "baseline": "0.4.3", + "port-version": 0 + }, + "winreg": { + "baseline": "5.1.0", + "port-version": 0 + }, + "winsock2": { + "baseline": "0.0", + "port-version": 4 + }, + "winsparkle": { + "baseline": "0.7.0", + "port-version": 1 + }, + "wintoast": { + "baseline": "1.2.0", + "port-version": 2 + }, + "woff2": { + "baseline": "1.0.2", + "port-version": 3 + }, + "wolfmqtt": { + "baseline": "1.13.0", + "port-version": 0 + }, + "wolfssl": { + "baseline": "5.3.0", + "port-version": 0 + }, + "wolftpm": { + "baseline": "2.4.0", + "port-version": 0 + }, + "wordnet": { + "baseline": "3.0", + "port-version": 1 + }, + "workflow": { + "baseline": "0.9.7", + "port-version": 1 + }, + "wpilib": { + "baseline": "2020.3.2", + "port-version": 2 + }, + "wren": { + "baseline": "0.4.0", + "port-version": 0 + }, + "wt": { + "baseline": "4.7.1", + "port-version": 0 + }, + "wtl": { + "baseline": "10.0.10320", + "port-version": 3 + }, + "wxchartdir": { + "baseline": "2.0.0", + "port-version": 0 + }, + "wxcharts": { + "baseline": "2022-04-22", + "port-version": 0 + }, + "wxwidgets": { + "baseline": "3.1.6", + "port-version": 1 + }, + "x-plane": { + "baseline": "3.0.3", + "port-version": 1 + }, + "x264": { + "baseline": "164-5db6aa6cab1b146", + "port-version": 4 + }, + "x265": { + "baseline": "3.4", + "port-version": 5 + }, + "xalan-c": { + "baseline": "1.12", + "port-version": 1 + }, + "xaudio2redist": { + "baseline": "1.2.9", + "port-version": 0 + }, + "xbyak": { + "baseline": "6.60", + "port-version": 0 + }, + "xerces-c": { + "baseline": "3.2.3", + "port-version": 4 + }, + "xeus": { + "baseline": "0.24.3", + "port-version": 1 + }, + "xframe": { + "baseline": "0.3.0", + "port-version": 1 + }, + "xlnt": { + "baseline": "1.5.0", + "port-version": 3 + }, + "xlsxio": { + "baseline": "2021-03-24", + "port-version": 0 + }, + "xmlsec": { + "baseline": "1.2.34", + "port-version": 0 + }, + "xnnpack": { + "baseline": "2021-05-17", + "port-version": 2 + }, + "xorstr": { + "baseline": "2021-10-23", + "port-version": 0 + }, + "xproperty": { + "baseline": "0.8.1", + "port-version": 1 + }, + "xqilla": { + "baseline": "2.3.4", + "port-version": 1 + }, + "xsimd": { + "baseline": "8.1.0", + "port-version": 0 + }, + "xtensor": { + "baseline": "0.24.0", + "port-version": 0 + }, + "xtensor-blas": { + "baseline": "0.17.2", + "port-version": 2 + }, + "xtensor-fftw": { + "baseline": "2019-11-30", + "port-version": 2 + }, + "xtensor-io": { + "baseline": "0.13.0", + "port-version": 1 + }, + "xtl": { + "baseline": "0.7.2", + "port-version": 0 + }, + "xxhash": { + "baseline": "0.8.1", + "port-version": 1 + }, + "yajl": { + "baseline": "2.1.0", + "port-version": 3 + }, + "yaml-cpp": { + "baseline": "0.7.0", + "port-version": 1 + }, + "yara": { + "baseline": "4.2.0", + "port-version": 0 + }, + "yas": { + "baseline": "7.1.0", + "port-version": 0 + }, + "yasm": { + "baseline": "1.3.0", + "port-version": 3 + }, + "yasm-tool": { + "baseline": "2021-12-14", + "port-version": 0 + }, + "yasm-tool-helper": { + "baseline": "2020-03-11", + "port-version": 1 + }, + "yato": { + "baseline": "2022-03-06", + "port-version": 0 + }, + "yoga": { + "baseline": "1.19.0", + "port-version": 0 + }, + "yomm2": { + "baseline": "1.1.2", + "port-version": 0 + }, + "yyjson": { + "baseline": "0.5.0", + "port-version": 0 + }, + "z3": { + "baseline": "4.8.16", + "port-version": 0 + }, + "z85": { + "baseline": "1.0", + "port-version": 1 + }, + "zeroc-ice": { + "baseline": "3.7.7", + "port-version": 2 + }, + "zeromq": { + "baseline": "4.3.4", + "port-version": 5 + }, + "zfp": { + "baseline": "0.5.5", + "port-version": 3 + }, + "zkpp": { + "baseline": "0.2.3", + "port-version": 2 + }, + "zlib": { + "baseline": "1.2.12", + "port-version": 1 + }, + "zlib-ng": { + "baseline": "2.0.6", + "port-version": 0 + }, + "zookeeper": { + "baseline": "3.5.6", + "port-version": 0 + }, + "zopfli": { + "baseline": "1.0.3", + "port-version": 1 + }, + "zpp-bits": { + "baseline": "4.4.4", + "port-version": 0 + }, + "zserge-webview": { + "baseline": "2019-04-27", + "port-version": 3 + }, + "zstd": { + "baseline": "1.5.2", + "port-version": 1 + }, + "zstr": { + "baseline": "1.0.4", + "port-version": 2 + }, + "ztd-text": { + "baseline": "2022-03-21", + "port-version": 0 + }, + "zug": { + "baseline": "2021-04-23", + "port-version": 1 + }, + "zydis": { + "baseline": "3.2.1", + "port-version": 0 + }, + "zyre": { + "baseline": "2019-07-07", + "port-version": 3 + }, + "zziplib": { + "baseline": "0.13.72", + "port-version": 1 + } + } +} diff --git a/externals/vcpkg/versions/c-/c-ares.json b/externals/vcpkg/versions/c-/c-ares.json new file mode 100755 index 000000000..e6098a33b --- /dev/null +++ b/externals/vcpkg/versions/c-/c-ares.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "15542c1c419b7874a8d3229cdf6366361e376a57", + "version-semver": "1.18.1", + "port-version": 1 + }, + { + "git-tree": "60b32d4ff262f2603153b8496e39f7b0aba39f99", + "version-semver": "1.18.1", + "port-version": 0 + }, + { + "git-tree": "8c97dd38d470b96784d2aa4484d04afca77e2c60", + "version-semver": "1.17.2", + "port-version": 2 + }, + { + "git-tree": "d434c999ea00b87bfbee3d79ddc6fc1b6f12d7fe", + "version-semver": "1.17.2", + "port-version": 1 + }, + { + "git-tree": "4a8a471e681a33c8dde0a209900ac24a2e8e7f72", + "version": "1.17.2", + "port-version": 0 + }, + { + "git-tree": "5d48aae0b9e4a0e201eab417117bab9491665193", + "version": "1.17.1", + "port-version": 2 + }, + { + "git-tree": "1e8d84e28abdb8437a2665651b4359da40a3333f", + "version": "1.17.1", + "port-version": 1 + }, + { + "git-tree": "a35b0a23f91ec79cecdcb83c82840f7305dbd709", + "version-string": "1.17.1", + "port-version": 0 + }, + { + "git-tree": "ae086dbb7d9fb7e728b7444bdd2a709fd84c16e0", + "version-string": "2019-5-2-1", + "port-version": 0 + }, + { + "git-tree": "355c7fdfd00cc9c97853fdef147e23a811d92c6c", + "version-string": "2019-5-2", + "port-version": 0 + }, + { + "git-tree": "53380b1119aabe24897834f871d94f19c7ddc183", + "version-string": "cares-1_15_0", + "port-version": 0 + }, + { + "git-tree": "3e3bde543c25991f1e106ade2ce7bc07c33ca81a", + "version-string": "cares-1_14_0", + "port-version": 0 + }, + { + "git-tree": "2ae21dbbdedbdae911e2ebeab2968f2c314f7e82", + "version-string": "1.13.0-1", + "port-version": 0 + }, + { + "git-tree": "3ab176274fcae1450a660d4b4fc6c34300ba115e", + "version-string": "1.13.0", + "port-version": 0 + }, + { + "git-tree": "ee00b66606f9f4ddc2f6fcef64c180abcc14218d", + "version-string": "1.12.1-dev-40eb41f-1", + "port-version": 0 + }, + { + "git-tree": "43771efaa165dcb3da7acaaa0c44dff81bca629d", + "version-string": "1.12.1-dev-40eb41f", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/c-dbg-macro.json b/externals/vcpkg/versions/c-/c-dbg-macro.json new file mode 100755 index 000000000..3bacd629b --- /dev/null +++ b/externals/vcpkg/versions/c-/c-dbg-macro.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c6819bcf6380a622775dfa3cebbcaf44ef745710", + "version-date": "2020-02-29", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/c4core.json b/externals/vcpkg/versions/c-/c4core.json new file mode 100755 index 000000000..ee68963c6 --- /dev/null +++ b/externals/vcpkg/versions/c-/c4core.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "db4217bd25647d340de3233e8f2fd59d250e16d8", + "version": "0.1.9", + "port-version": 0 + }, + { + "git-tree": "c1ef064ec4033e2fca5504b4eb44338453050f7f", + "version-date": "2021-07-18", + "port-version": 1 + }, + { + "git-tree": "eae79eece3a7383d94cc686275624cb49ee6a68e", + "version-date": "2021-07-18", + "port-version": 0 + }, + { + "git-tree": "9b07f8a38bbc4d13f8411921e6734753e15f8d50", + "version-date": "2021-06-26", + "port-version": 0 + }, + { + "git-tree": "12b84a31469a78dd4b42dcf58a27d4600f6b2d48", + "version-date": "2021-01-14", + "port-version": 0 + }, + { + "git-tree": "bd4565e8ab55bc5e098a1750fa5ff0bc4406ca9b", + "version-string": "2020-04-12", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/c89stringutils.json b/externals/vcpkg/versions/c-/c89stringutils.json new file mode 100755 index 000000000..7d7aa3a41 --- /dev/null +++ b/externals/vcpkg/versions/c-/c89stringutils.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9c5dcb3c6cf4442e2fdcb4cdea39f512db0ead54", + "version": "0.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/c9y.json b/externals/vcpkg/versions/c-/c9y.json new file mode 100755 index 000000000..62647f306 --- /dev/null +++ b/externals/vcpkg/versions/c-/c9y.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5964f7fa10d83aa2d1a01ec7c64bd9b64f25f6a6", + "version-semver": "0.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/caf.json b/externals/vcpkg/versions/c-/caf.json new file mode 100755 index 000000000..b2ef7f0a4 --- /dev/null +++ b/externals/vcpkg/versions/c-/caf.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "9b7001bd4d131fa36b766ca44a6ddbb47d3304a1", + "version": "0.18.6", + "port-version": 1 + }, + { + "git-tree": "be83968f892180d5ee2f1943cf9cac3782e9111e", + "version": "0.18.6", + "port-version": 0 + }, + { + "git-tree": "6f4b297fc5ad4bd021fa9d72787b27e69a558237", + "version": "0.18.5", + "port-version": 0 + }, + { + "git-tree": "d520e997ef25f386431e32cb6bec32ba12a78339", + "version-string": "0.17.6", + "port-version": 2 + }, + { + "git-tree": "1928bc65900b86623983ce9af14ae7c166f2f277", + "version-string": "0.17.6", + "port-version": 1 + }, + { + "git-tree": "3a47471cd39542757f4365b3dc95fb3701ada880", + "version-string": "0.17.6", + "port-version": 0 + }, + { + "git-tree": "6310328f5a309491fbfb92a752b492a0e4db434d", + "version-string": "0.17.3", + "port-version": 0 + }, + { + "git-tree": "97ffb178c663a65fcfd7464bf569bf3dba6809d1", + "version-string": "0.17.2", + "port-version": 0 + }, + { + "git-tree": "5bbdf0cb436aa414d79dcf07e359f7158bffa303", + "version-string": "0.16.3", + "port-version": 0 + }, + { + "git-tree": "df584a465850084b5dbe6702cfdfdb2b92ac7753", + "version-string": "0.16.2-1", + "port-version": 0 + }, + { + "git-tree": "1ee31b1a613901392482be46a4cb33880af0941a", + "version-string": "0.16.2", + "port-version": 0 + }, + { + "git-tree": "a3e94ee25f14290e8b25b73571820f35290f15dc", + "version-string": "0.15.7", + "port-version": 0 + }, + { + "git-tree": "00709c0afd3c3fa6389a12cb9ee34cc86c664b32", + "version-string": "0.15.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/caffe2.json b/externals/vcpkg/versions/c-/caffe2.json new file mode 100755 index 000000000..67fc8fea4 --- /dev/null +++ b/externals/vcpkg/versions/c-/caffe2.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "ca32eb4601a1c35daa69e526f0af30efeb599c8c", + "version": "0.8.1", + "port-version": 6 + }, + { + "git-tree": "e4ebcedb57e572959c4f8e30c2885cda2367e0a7", + "version-string": "0.8.1", + "port-version": 5 + }, + { + "git-tree": "e50097be149d80e1397e95280aecd5160961d286", + "version-string": "0.8.1", + "port-version": 4 + }, + { + "git-tree": "ffdaf1c10102d0ed5eb1c558420ade4ec6adb309", + "version-string": "0.8.1-3", + "port-version": 0 + }, + { + "git-tree": "dcabbd8cab9c09c7ec5b79a05e1947bd88a69de0", + "version-string": "0.8.1-2", + "port-version": 0 + }, + { + "git-tree": "30fc09ba074c965bd000435be9664557c1d98514", + "version-string": "0.8.1-1", + "port-version": 0 + }, + { + "git-tree": "8aed8b8f420422cedbb5a1815b32def7b9770868", + "version-string": "0.8.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cairo.json b/externals/vcpkg/versions/c-/cairo.json new file mode 100755 index 000000000..b4a94e391 --- /dev/null +++ b/externals/vcpkg/versions/c-/cairo.json @@ -0,0 +1,169 @@ +{ + "versions": [ + { + "git-tree": "63bc79e8f9980f2b780bb296d96bfc3221dba137", + "version": "1.17.6", + "port-version": 2 + }, + { + "git-tree": "f43fb974219928aea5f95efc7c61f27b49051a28", + "version": "1.17.6", + "port-version": 1 + }, + { + "git-tree": "9f67515a6cf8aaeb6c9dcd2263ce913bd596249d", + "version": "1.17.6", + "port-version": 0 + }, + { + "git-tree": "c024050e140b5174c6ef3094bad3cb2d6a710f82", + "version": "1.17.4", + "port-version": 4 + }, + { + "git-tree": "d8bed1ec84c641aad98858b6fb1151b09273227e", + "version": "1.17.4", + "port-version": 3 + }, + { + "git-tree": "96aa6adbfefae2d4f2e3d79e012876b1d4a40b93", + "version": "1.17.4", + "port-version": 2 + }, + { + "git-tree": "a2fa5a9972a7b796f56fdda01f644b5c40d93580", + "version": "1.17.4", + "port-version": 1 + }, + { + "git-tree": "c80532bb0f4abd6b3bba09e48ddab1724bdc0ec1", + "version": "1.17.4", + "port-version": 0 + }, + { + "git-tree": "ea721528bdf86a3a1fd35b78550e3c9463a8e715", + "version": "1.16.0", + "port-version": 12 + }, + { + "git-tree": "f5e2e3535796b2fb785709ae2273c1243b4aa2fc", + "version": "1.16.0", + "port-version": 11 + }, + { + "git-tree": "aa8df97c4b06bf590dc04ad931a08f0bf1e47471", + "version-string": "1.16.0", + "port-version": 10 + }, + { + "git-tree": "eb09773c303a9608687dca6a0480ff551c0c2bf9", + "version-string": "1.16.0", + "port-version": 9 + }, + { + "git-tree": "b3a1d73d5c8c18a8c6512385b59d40719f963c8c", + "version-string": "1.16.0", + "port-version": 8 + }, + { + "git-tree": "a652fb78c5f52b49620a1419f4901a59a4bbc04a", + "version-string": "1.16.0", + "port-version": 7 + }, + { + "git-tree": "c5b328e93ced121254a822e15448ae839a60078f", + "version-string": "1.16.0-6", + "port-version": 0 + }, + { + "git-tree": "ca028fe074a13ed1d58594900d43bddfd9115422", + "version-string": "1.16.0-5", + "port-version": 0 + }, + { + "git-tree": "3eaf304157d3ab9b295039bbe0c358fc26bb4889", + "version-string": "1.16.0-4", + "port-version": 0 + }, + { + "git-tree": "5958c725d44a3e639e7ebde832a4acbcd4829af7", + "version-string": "1.16.0-3", + "port-version": 0 + }, + { + "git-tree": "52c8160d526b5e3d938396872f0b14ad4916581a", + "version-string": "1.16.0-2", + "port-version": 0 + }, + { + "git-tree": "6ff3d42bca307ba305e37ba08baccb43f599c8ec", + "version-string": "1.16.0-1", + "port-version": 0 + }, + { + "git-tree": "b8dcde063802ba0d8e22ef7bda62cdae97c00c9d", + "version-string": "1.16.0", + "port-version": 0 + }, + { + "git-tree": "6b85d387914d7755adc34dfbfe446d024c49a1b4", + "version-string": "1.15.8-5", + "port-version": 0 + }, + { + "git-tree": "56f5c938bec84bd5fe03f580a07354a0f64a15b5", + "version-string": "1.15.8-4", + "port-version": 0 + }, + { + "git-tree": "8708ab4c1978ac895cab43d2ca7ab942e29770fb", + "version-string": "1.15.8-3", + "port-version": 0 + }, + { + "git-tree": "e1d53a1d015778171e9b9adba938bb1a6343a39c", + "version-string": "1.15.8-2", + "port-version": 0 + }, + { + "git-tree": "1a100e45de4853019289d2be58c1c89beb8cae24", + "version-string": "1.15.8-1", + "port-version": 0 + }, + { + "git-tree": "7d02d3a980f099f536abd19ca2f82a048400e540", + "version-string": "1.15.8", + "port-version": 0 + }, + { + "git-tree": "75d0521512675f85e88ff13900e2f514850cff58", + "version-string": "1.15.6", + "port-version": 0 + }, + { + "git-tree": "a71fbe017034ff998867feaeb697082a04c3aab5", + "version-string": "1.15.4-3", + "port-version": 0 + }, + { + "git-tree": "75b97288df14ae263a1cfe05e6f05fc80cf67000", + "version-string": "1.15.4-2", + "port-version": 0 + }, + { + "git-tree": "0244d36ad3428139fbacbabc36629f960c5862b8", + "version-string": "1.15.4-1", + "port-version": 0 + }, + { + "git-tree": "e04a8fe2b70ca6e266c77631a2eee5c1300fddd7", + "version-string": "1.15.4", + "port-version": 0 + }, + { + "git-tree": "fd9154d1e67fa788702b3cc2e55515cb6210c11a", + "version-string": "1.14.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cairomm.json b/externals/vcpkg/versions/c-/cairomm.json new file mode 100755 index 000000000..7bfd0bf73 --- /dev/null +++ b/externals/vcpkg/versions/c-/cairomm.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "5ae92557bdcf5f6dc8364cb179fd8fe57b0698ce", + "version": "1.16.1", + "port-version": 0 + }, + { + "git-tree": "6cf38af57700ebdb1933bd3e4f4c0580de8aaab9", + "version": "1.16.0", + "port-version": 1 + }, + { + "git-tree": "0e16b66d1552c1cbda240f8a11d65895c607e6b5", + "version": "1.16.0", + "port-version": 0 + }, + { + "git-tree": "208a6f99a6fbc0239696b79653d769568ca603cc", + "version-string": "1.15.3", + "port-version": 6 + }, + { + "git-tree": "0dce5120b52866ee6e0b485081389f9ea9679fb4", + "version-string": "1.15.3", + "port-version": 5 + }, + { + "git-tree": "e7260551be637784abc3768868d6286f2052ae38", + "version-string": "1.15.3-4", + "port-version": 0 + }, + { + "git-tree": "59e5fb3c1f885b6b21d04ce41f157c02bbe8b9d1", + "version-string": "1.15.3-3", + "port-version": 0 + }, + { + "git-tree": "58b22b6d2c30d63d1ff744f5bb902435a4608a8f", + "version-string": "1.15.3-2", + "port-version": 0 + }, + { + "git-tree": "903a0d94dc27e12a6d066b3e3f121dbf6fb5affa", + "version-string": "1.15.3-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/calceph.json b/externals/vcpkg/versions/c-/calceph.json new file mode 100755 index 000000000..8e60196c2 --- /dev/null +++ b/externals/vcpkg/versions/c-/calceph.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "98f9a949826498f0929b5745fff07fb9747b82fa", + "version": "3.5.1", + "port-version": 0 + }, + { + "git-tree": "f9919835108077ed1a077ef023b60903f52df42c", + "version": "3.5.0", + "port-version": 2 + }, + { + "git-tree": "48bd1ecc8648d44291fbaf0a11f5f12aa017c077", + "version": "3.5.0", + "port-version": 1 + }, + { + "git-tree": "d2665db7558ef66aa086f95b155e61b15bd56848", + "version": "3.5.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/camport3.json b/externals/vcpkg/versions/c-/camport3.json new file mode 100755 index 000000000..09375b26a --- /dev/null +++ b/externals/vcpkg/versions/c-/camport3.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "f8fd1afea0703ffb17838422fd2aef895ab8c828", + "version": "1.6.2", + "port-version": 0 + }, + { + "git-tree": "ed31882bd5119a95ef69ba8323e0f4575ee5dc6d", + "version-string": "1.5.3", + "port-version": 2 + }, + { + "git-tree": "da6cb57213a9c5e3e4877a1c2278524f6228a80b", + "version-string": "1.5.3", + "port-version": 1 + }, + { + "git-tree": "05713425b9fc380bcb6f2f016032e6fb1c8fc0b2", + "version-string": "1.5.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/capnproto.json b/externals/vcpkg/versions/c-/capnproto.json new file mode 100755 index 000000000..7916de0c0 --- /dev/null +++ b/externals/vcpkg/versions/c-/capnproto.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "17b054432f141c746019130d2b689d4fd4919938", + "version": "0.9.1", + "port-version": 2 + }, + { + "git-tree": "129b6b745372d94f313df0989ad6a8980d7eaef7", + "version": "0.9.1", + "port-version": 1 + }, + { + "git-tree": "408771ff99776c9b25fd1121da589b720b7081c0", + "version": "0.9.1", + "port-version": 0 + }, + { + "git-tree": "3e33e9cf7ec5a8166ea3e33801645d731d119e25", + "version-string": "0.8.0", + "port-version": 2 + }, + { + "git-tree": "5fcc22513f8ac440cd0d056c76ae35bcef96c787", + "version-string": "0.8.0", + "port-version": 1 + }, + { + "git-tree": "2b4a5558ce6b709f99c149a7335c28eaa4823569", + "version-string": "0.8.0", + "port-version": 0 + }, + { + "git-tree": "397e759d6cf8199c95a649ea33a92d1b8193a576", + "version-string": "0.7.0-3", + "port-version": 0 + }, + { + "git-tree": "6078d2a885b5b7702da176e958e711bd009042ad", + "version-string": "0.7.0-2", + "port-version": 0 + }, + { + "git-tree": "7f7d19e6920cdbdb82a41285cfa9cf427eec1c3d", + "version-string": "0.7.0-1", + "port-version": 0 + }, + { + "git-tree": "955b67bb45349a0c2c2a34697d95e7585742514c", + "version-string": "0.7.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/capstone.json b/externals/vcpkg/versions/c-/capstone.json new file mode 100755 index 000000000..acdfcd871 --- /dev/null +++ b/externals/vcpkg/versions/c-/capstone.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "f31ba3baba34c74dea464d864cca666c8793b1e7", + "version": "5.0.0-rc2", + "port-version": 1 + }, + { + "git-tree": "f7b26d8f672f30156cad79a647525b8dd8c9781b", + "version": "5.0.0-rc2", + "port-version": 0 + }, + { + "git-tree": "5250715402bf0c970792dafe6947aa810adde0f1", + "version": "4.0.2", + "port-version": 3 + }, + { + "git-tree": "465e527988f09c855e156cff45b7ee6dfbe1d303", + "version": "4.0.2", + "port-version": 2 + }, + { + "git-tree": "7c919b056af0b624766a625f1de7847f97262d92", + "version-string": "4.0.2", + "port-version": 1 + }, + { + "git-tree": "51b67182eea9570f020b2bff552935491f88c5cc", + "version-string": "4.0.2", + "port-version": 0 + }, + { + "git-tree": "eb04e9d160890416135df17b8ac65b011ef38103", + "version-string": "4.0.1-120373dc", + "port-version": 0 + }, + { + "git-tree": "916b15afacc560a726f4dcfa5c8bcddb2b1116f2", + "version-string": "3.0.5-rc3", + "port-version": 0 + }, + { + "git-tree": "a14312793849bbe5d40a122fc52c44be0790e381", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cargs.json b/externals/vcpkg/versions/c-/cargs.json new file mode 100755 index 000000000..b25f1fc0f --- /dev/null +++ b/externals/vcpkg/versions/c-/cargs.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "afa520193b882259b02bd2f8646982d340374d2d", + "version": "1.0.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cartographer.json b/externals/vcpkg/versions/c-/cartographer.json new file mode 100755 index 000000000..6694174e7 --- /dev/null +++ b/externals/vcpkg/versions/c-/cartographer.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "b0e352bf9c678b6425f767a21470b2c8ef3f79b9", + "version": "1.0.0", + "port-version": 5 + }, + { + "git-tree": "ec66f22ef7f9e652008269b8419a34350d97accf", + "version": "1.0.0", + "port-version": 4 + }, + { + "git-tree": "1bd9454fd218a1755ab651e97769f69b2d2fc315", + "version-string": "1.0.0-3", + "port-version": 0 + }, + { + "git-tree": "045ef786b9d3a2d5d9f1096f118cf6e39ea08c79", + "version-string": "1.0.0-2", + "port-version": 0 + }, + { + "git-tree": "0af6f1b35db62fd52bd0695a03ec69679ce2fb80", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "473af71f3b2014e34d957eede82178f3ae6272a5", + "version-string": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "4706465acae9a157a820b098c357712a8d098545", + "version-string": "0.3.0-6", + "port-version": 0 + }, + { + "git-tree": "cb846a419ab42b35851532b4f2d2b637ea9f0d86", + "version-string": "0.3.0-5", + "port-version": 0 + }, + { + "git-tree": "c3e824a15cc586e34d76eca9f6f84f24c924a67c", + "version-string": "0.3.0-4", + "port-version": 0 + }, + { + "git-tree": "8ae50f8349189772fd4acf8c68125634aaffbe6e", + "version-string": "0.3.0-3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/casclib.json b/externals/vcpkg/versions/c-/casclib.json new file mode 100755 index 000000000..e42950abc --- /dev/null +++ b/externals/vcpkg/versions/c-/casclib.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "3bb7640c26eb7b742883277db2325a69c6c790aa", + "version-date": "2021-11-16", + "port-version": 1 + }, + { + "git-tree": "20768d4f95c896b3b416aab76cc04c8dfa6e1244", + "version-date": "2021-11-16", + "port-version": 0 + }, + { + "git-tree": "b0e61662e214e54008bdc8842b865a3f3fccb821", + "version-string": "1.50b", + "port-version": 2 + }, + { + "git-tree": "dcebf3fda8b82d3576cfd89cb27f55da9149d9e9", + "version-string": "1.50b-1", + "port-version": 0 + }, + { + "git-tree": "65be0df88dd2dbba0d98e6ceff98358914b1426a", + "version-string": "1.50-1", + "port-version": 0 + }, + { + "git-tree": "d3ac14e638afc3485a503eaa902c8cac14850c6a", + "version-string": "1.50", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/catch-classic.json b/externals/vcpkg/versions/c-/catch-classic.json new file mode 100755 index 000000000..18bb78d6f --- /dev/null +++ b/externals/vcpkg/versions/c-/catch-classic.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "a85b3103dd134a7fadafe0c7c5d67042ab4c2b18", + "version-string": "1.12.2", + "port-version": 1 + }, + { + "git-tree": "21f00f9e0bf6d9338ca58abc3e761db376883285", + "version-string": "1.12.2", + "port-version": 0 + }, + { + "git-tree": "fa68344904e679040abafe8bdee9f06f96ddf955", + "version-string": "1.12.1", + "port-version": 0 + }, + { + "git-tree": "dc2687c95785c76a55314e74d79886c22eba4067", + "version-string": "1.12.0", + "port-version": 0 + }, + { + "git-tree": "7c6cd494c2c7c00a1a7507502fcf8c2924bdb127", + "version-string": "1.11.0", + "port-version": 0 + }, + { + "git-tree": "92788e8410dde4706b4b725d47852a7e8f199eb1", + "version-string": "1.10.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/catch.json b/externals/vcpkg/versions/c-/catch.json new file mode 100755 index 000000000..d378268d7 --- /dev/null +++ b/externals/vcpkg/versions/c-/catch.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "1f30153a939599e85b3098abf501d739f8ef88c2", + "version-string": "alias", + "port-version": 1 + }, + { + "git-tree": "1847097b1369a19c41e695e809a91923d95efd4d", + "version-string": "alias", + "port-version": 0 + }, + { + "git-tree": "b08f20188fcfc3e5c5d30d72f4a75c03dfca110b", + "version-string": "2.0.1-1", + "port-version": 0 + }, + { + "git-tree": "3a8ff2af44bbc79323a5278cd2100b5933290f6b", + "version-string": "2.0.1", + "port-version": 0 + }, + { + "git-tree": "1bc0b237d321f03d1d059c1588f42860ebd409f2", + "version-string": "1.11.0", + "port-version": 0 + }, + { + "git-tree": "e3cfb2ebc46897c8cdf3b6f2abf2bc71cc07227d", + "version-string": "1.10.0", + "port-version": 0 + }, + { + "git-tree": "a6db724e345b4d19f6ab625c723c4f441d2b353c", + "version-string": "1.9.7", + "port-version": 0 + }, + { + "git-tree": "d1fc377c44fe261263361527cb80987a33c523f5", + "version-string": "1.9.6", + "port-version": 0 + }, + { + "git-tree": "b3cdc9bb97ead24ae0c75cc63d5819ff7895ee3e", + "version-string": "1.9.5-1", + "port-version": 0 + }, + { + "git-tree": "ee1709bb21ed940740a9b3ae837226fc71765103", + "version-string": "1.9.5", + "port-version": 0 + }, + { + "git-tree": "b8bde75a27102c182feb7d8e3443d2b2f4e747ff", + "version-string": "1.9.4", + "port-version": 0 + }, + { + "git-tree": "af5a5bf586f3b3a2173aac0660d8778f35242627", + "version-string": "1.9.1", + "port-version": 0 + }, + { + "git-tree": "a0d3d912a1dbe700e83951f87118186e5a0cd3fd", + "version-string": "1.8.2", + "port-version": 0 + }, + { + "git-tree": "4bd1360b247abd0d67dc3af50e73005dba9f351c", + "version-string": "1.8.1", + "port-version": 0 + }, + { + "git-tree": "81335c5a51db8928df33dc42ffc8c90e7fa3af63", + "version-string": "1.5.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/catch2.json b/externals/vcpkg/versions/c-/catch2.json new file mode 100755 index 000000000..be202f39e --- /dev/null +++ b/externals/vcpkg/versions/c-/catch2.json @@ -0,0 +1,199 @@ +{ + "versions": [ + { + "git-tree": "8de83e7d7f07a831293d15e747aa7a980a220ff7", + "version-semver": "3.0.1", + "port-version": 1 + }, + { + "git-tree": "c0c872e7175f3ca20a15f5c8cc0d0c23e59e1ad1", + "version-semver": "3.0.1", + "port-version": 0 + }, + { + "git-tree": "ed81e9ef2d6ef2020605ec6ba1092a2ab631305a", + "version-semver": "2.13.9", + "port-version": 1 + }, + { + "git-tree": "6cc0b5f2cef9c98ad5c3152ebfbe85f1b9baceed", + "version-semver": "2.13.9", + "port-version": 0 + }, + { + "git-tree": "c243585b5ba220e6aebcdb59dc59867afff7af6e", + "version-semver": "2.13.8", + "port-version": 1 + }, + { + "git-tree": "b58473cdc953ae1d09f30f0ba1e641c6cc34719f", + "version-semver": "2.13.8", + "port-version": 0 + }, + { + "git-tree": "0660c4bbbe5bb0f8a605f956ae7d16f055e0e8c3", + "version-semver": "2.13.7", + "port-version": 2 + }, + { + "git-tree": "4df380019e5c3a0e450798db43d9ce70906b7aad", + "version-semver": "2.13.7", + "port-version": 1 + }, + { + "git-tree": "900833643e0eb468d957b4c46f46ba6647e283ff", + "version-semver": "2.13.7", + "port-version": 0 + }, + { + "git-tree": "ef9387df5727b456d41890580ac51c03cae9bb25", + "version-semver": "2.13.6", + "port-version": 2 + }, + { + "git-tree": "bd73b1d5e8994fb0327c333cd77400577f05e31c", + "version-semver": "2.13.6", + "port-version": 1 + }, + { + "git-tree": "17d502dbaa50c2e6d255331addb14259372fb6c5", + "version-semver": "2.13.6", + "port-version": 0 + }, + { + "git-tree": "47ba2c2a9ed12b317550ed102374cd13554fe9ac", + "version-string": "2.13.1", + "port-version": 1 + }, + { + "git-tree": "519a6fcb84ac66fdffb75f3d5555496228e43e5f", + "version-string": "2.13.1", + "port-version": 0 + }, + { + "git-tree": "3b15bdf4ada3be3818bcac4c14ed9a437393495d", + "version-string": "2.12.1", + "port-version": 0 + }, + { + "git-tree": "c23bc9d8f947cc5d30521dea008e52994c07b569", + "version-string": "2.11.3", + "port-version": 0 + }, + { + "git-tree": "af82155f661ed603bc2222173920be964063266a", + "version-string": "2.11.1", + "port-version": 0 + }, + { + "git-tree": "926e53bcc845e228d8ac5e277bea9d68ae33faa8", + "version-string": "2.11.0", + "port-version": 0 + }, + { + "git-tree": "429625df870d438e2c767734a76f4875fb5836c5", + "version-string": "2.10.1-1", + "port-version": 0 + }, + { + "git-tree": "f9cd513b2dc93059c3ab06e8c1c476ce067e07eb", + "version-string": "2.9.2", + "port-version": 0 + }, + { + "git-tree": "8a7db60e1027dc2271aaf2bd2338b438a3228da3", + "version-string": "2.9.1-1", + "port-version": 0 + }, + { + "git-tree": "6d733ce4e562f2f9b9bb41a864496be37d842609", + "version-string": "2.7.2-2", + "port-version": 0 + }, + { + "git-tree": "9470a421046617fdf9ea5f9b9bb6ef25d3dfdfcf", + "version-string": "2.7.2", + "port-version": 0 + }, + { + "git-tree": "e1d981f5b5bb4879df9b2b9fd92c5170444a6616", + "version-string": "2.7.1", + "port-version": 0 + }, + { + "git-tree": "13131c8f454c2d9f21595e72a203b8352a6cd4cb", + "version-string": "2.7.0", + "port-version": 0 + }, + { + "git-tree": "d401ef70ec4acae9a030e0b0fee19d68ef0fe2c8", + "version-string": "2.6.0", + "port-version": 0 + }, + { + "git-tree": "06f1dab44255e1d16a1631da9ac8144158f8a5bd", + "version-string": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "a8a00251638f77f165384d7a365e153d8df82934", + "version-string": "2.4.2", + "port-version": 0 + }, + { + "git-tree": "7a63deae50cd91bffd011bef9b93099dceadc32f", + "version-string": "2.4.1", + "port-version": 0 + }, + { + "git-tree": "f71dd3372ed04416c19ae68cf1cb76c1a103edcb", + "version-string": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "e674f9a0c8b098b2152fed9f7647a58051ed7a84", + "version-string": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "bcdba32718c44cab06591beb131873375aef80e2", + "version-string": "2.2.3", + "port-version": 0 + }, + { + "git-tree": "e4060ca446e5115b4fcf829a0e7d17a5270bbe61", + "version-string": "2.2.2", + "port-version": 0 + }, + { + "git-tree": "be0f043cab6bdffccfa4ccffe9da70378fdce0e3", + "version-string": "2.2.1-1", + "port-version": 0 + }, + { + "git-tree": "b4ac8a6069b1e77f307afca3351fe2af0105b521", + "version-string": "2.2.1", + "port-version": 0 + }, + { + "git-tree": "54829ec460805d60e814db0640b195756bd41e5a", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "f34017e4212b92b3648d0708729be8e60a12d75d", + "version-string": "2.1.2", + "port-version": 0 + }, + { + "git-tree": "4a403184b56702ad589e5eb018735628265d5cc5", + "version-string": "2.1.1", + "port-version": 0 + }, + { + "git-tree": "b2a9bdc0cd72b9b42bbed2167ee30b236e7ed77a", + "version-string": "2.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cccapstone.json b/externals/vcpkg/versions/c-/cccapstone.json new file mode 100755 index 000000000..615e235d5 --- /dev/null +++ b/externals/vcpkg/versions/c-/cccapstone.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "d8515ae9e25008fe4d8c04287aba45679d31eac5", + "version-string": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e", + "port-version": 2 + }, + { + "git-tree": "20a6a52cad8fb2db9aa7b023c09ce53eb2ed5343", + "version-string": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e-1", + "port-version": 0 + }, + { + "git-tree": "50425b6f2870af272be9014fa545368b8040a155", + "version-string": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/ccd.json b/externals/vcpkg/versions/c-/ccd.json new file mode 100755 index 000000000..9e383a9c1 --- /dev/null +++ b/externals/vcpkg/versions/c-/ccd.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "8e6fc55567d05873ba6f78c3c33363a0fd9a1549", + "version-string": "2.1-4", + "port-version": 3 + }, + { + "git-tree": "9a10df3929e80702a9e8c110612b1ecd8c32bee9", + "version-string": "2.1-4", + "port-version": 2 + }, + { + "git-tree": "a720cc123c190c6b68e57e356c4937685eeb2faa", + "version-string": "2.1-4", + "port-version": 1 + }, + { + "git-tree": "c5315a631ffcea9c2a158578e73c53d8455808de", + "version-string": "2.1-4", + "port-version": 0 + }, + { + "git-tree": "f50fc4c977c7ee43dbddf3d5b8c08694843f41a7", + "version-string": "2.1-3", + "port-version": 0 + }, + { + "git-tree": "7ecb86d672441a33985f400435082f119b3b1428", + "version-string": "2.1-1", + "port-version": 0 + }, + { + "git-tree": "c6bc0a25e0b963d679e5739c5e83bf31c0a9ff9a", + "version-string": "2.1", + "port-version": 0 + }, + { + "git-tree": "6cd15fcab18c56ab38f84446ad5d60b32bd102a1", + "version-string": "2.0.0-2", + "port-version": 0 + }, + { + "git-tree": "56bd676f18957cef95e0ffc9b454f3082c50360b", + "version-string": "2.0.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/ccfits.json b/externals/vcpkg/versions/c-/ccfits.json new file mode 100755 index 000000000..7bf0a662a --- /dev/null +++ b/externals/vcpkg/versions/c-/ccfits.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "ebcb81196a7e63b3b7c4b78f67ebc4e5f20c97c3", + "version": "2.5", + "port-version": 8 + }, + { + "git-tree": "adb43da4a1d72e0924081e4699d81337d649400e", + "version": "2.5", + "port-version": 7 + }, + { + "git-tree": "c72b341528629e93108ce5317dd3802dc9b4ac11", + "version-string": "2.5", + "port-version": 6 + }, + { + "git-tree": "06f0bdeafc82f9dc2df1cf6e84cea717955bc173", + "version-string": "2.5-5", + "port-version": 0 + }, + { + "git-tree": "dc89a93f5fb8aff0da1d456d2e2afd56c079f9a5", + "version-string": "2.5-4", + "port-version": 0 + }, + { + "git-tree": "35befe94faaf195405bb683a87bec10ff844b187", + "version-string": "2.5-3", + "port-version": 0 + }, + { + "git-tree": "ec9558b182333a1b5b541dd6e627ca7e5e31ac4f", + "version-string": "2.5-2", + "port-version": 0 + }, + { + "git-tree": "47d10b581eb3f9b7673a54813bf5f6cd91e86611", + "version-string": "2.5-1", + "port-version": 0 + }, + { + "git-tree": "679c0db99a0448c35f7837909b0be283fe71915b", + "version-string": "2.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cctag.json b/externals/vcpkg/versions/c-/cctag.json new file mode 100755 index 000000000..fd2de346b --- /dev/null +++ b/externals/vcpkg/versions/c-/cctag.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ffcc7bde96142c2bc54827e3a2280accc592452e", + "version-semver": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "8abc2227c7e5fc5232f928d407d5dac772afb48b", + "version-semver": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cctz.json b/externals/vcpkg/versions/c-/cctz.json new file mode 100755 index 000000000..d93ed1792 --- /dev/null +++ b/externals/vcpkg/versions/c-/cctz.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "b61e635e32027714e10e682235c9f3c5b8b1b1e9", + "version-string": "2.3", + "port-version": 3 + }, + { + "git-tree": "8568acc72750187c3c08b29a6e273ce8508cd522", + "version-string": "2.3-2", + "port-version": 0 + }, + { + "git-tree": "e94cb87cf3b7a4aa29939cf07f6d97b7789c0edc", + "version-string": "2.3", + "port-version": 0 + }, + { + "git-tree": "660a0b23b0e9f8dbd9afddedd51a8dbbdddcc7bd", + "version-string": "2.2", + "port-version": 0 + }, + { + "git-tree": "57dbb3f749a8171a5e6c2e60da0223baa36d82d8", + "version-string": "2.1", + "port-version": 0 + }, + { + "git-tree": "2641c2672fc767a4a8ce26aaf35385483d921f84", + "version-string": "v2.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/celero.json b/externals/vcpkg/versions/c-/celero.json new file mode 100755 index 000000000..11097e0de --- /dev/null +++ b/externals/vcpkg/versions/c-/celero.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "a9beee7ba313a9770888b114a8146bc1a983577e", + "version": "2.8.3", + "port-version": 0 + }, + { + "git-tree": "58fca5af8a14714f953c3d8a4653e90ac8d11e2f", + "version-string": "2.8.2", + "port-version": 1 + }, + { + "git-tree": "a170553c57f438bdab8cde9f4c6494e774763681", + "version-string": "2.8.2", + "port-version": 0 + }, + { + "git-tree": "25d338809366c358afe158e52694be2a670ab054", + "version-string": "2.7.2", + "port-version": 0 + }, + { + "git-tree": "754905c9baebd27cf1312f7054403f3e901d5d53", + "version-string": "2.6.0-1", + "port-version": 0 + }, + { + "git-tree": "64e373a8e9115c984f399afda24a437ace26b4ba", + "version-string": "2.6.0", + "port-version": 0 + }, + { + "git-tree": "51246db8056526db6c835be4c7696ebeb3510595", + "version-string": "2.5.0-1", + "port-version": 0 + }, + { + "git-tree": "6b0d0ecb2631cfb977ee4455273cc61edd505295", + "version-string": "2.4.0-1", + "port-version": 0 + }, + { + "git-tree": "d24ee3a6772134b4075509cb0c968112d0d4cfa5", + "version-string": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "6b0d0ecb2631cfb977ee4455273cc61edd505295", + "version-string": "2.4.0-1", + "port-version": 0 + }, + { + "git-tree": "d24ee3a6772134b4075509cb0c968112d0d4cfa5", + "version-string": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "1828a39a6c5ac19533b15a24b0bd9de8328eff56", + "version-string": "2.3.0-1", + "port-version": 0 + }, + { + "git-tree": "257a3d0cfb2b03dcadc647145e776c1892966d79", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "890613b2325cf744c650259aabccafa0b0fdd3b6", + "version-string": "2.1.0-2", + "port-version": 0 + }, + { + "git-tree": "2848e553555ffa2cc32e17e8613511a042a212b6", + "version-string": "2.1.0-1", + "port-version": 0 + }, + { + "git-tree": "01616c4f432067367bd0c4786e44667da33bcd81", + "version-string": "2.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cello.json b/externals/vcpkg/versions/c-/cello.json new file mode 100755 index 000000000..de140e58f --- /dev/null +++ b/externals/vcpkg/versions/c-/cello.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "a281b67048d19f8136aaa8e0198b1db5dec5c4dd", + "version-date": "2019-07-23", + "port-version": 2 + }, + { + "git-tree": "45d476438561ae8c8e7a8eb7871faadb1379e874", + "version-string": "2019-07-23", + "port-version": 1 + }, + { + "git-tree": "ee7bb8fff5e2b12f7c6ae5a2d435c8ce1638e103", + "version-string": "2019-07-23", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cereal.json b/externals/vcpkg/versions/c-/cereal.json new file mode 100755 index 000000000..9ceeed2dd --- /dev/null +++ b/externals/vcpkg/versions/c-/cereal.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "075869fcf5302c6dd11d564286d0dfa1d2d4d7a1", + "version": "1.3.2", + "port-version": 1 + }, + { + "git-tree": "fdaabbb005403148dd7e53f5158199f6b1b297f2", + "version": "1.3.2", + "port-version": 0 + }, + { + "git-tree": "e292069bec2c118568ea23a3db965037a9e38790", + "version": "1.3.1", + "port-version": 0 + }, + { + "git-tree": "7229804bbf716bbefe8052d650fc94687b6dae42", + "version-string": "1.3.0", + "port-version": 1 + }, + { + "git-tree": "2df2d8bdb54e554795344bafe05bf0a1eaa28537", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "ecf0a70523709732832f115b4f90a1bffdc9c1f7", + "version-string": "1.2.2-2", + "port-version": 0 + }, + { + "git-tree": "1492f676a63290569dd7e834ef393d2611ca83c7", + "version-string": "1.2.2-1", + "port-version": 0 + }, + { + "git-tree": "f0f4ec8e160319af2e540f2f4b7637c636dcb9bd", + "version-string": "1.2.2", + "port-version": 0 + }, + { + "git-tree": "23d90191ceeeef4c2687be0829eb9f5c68158e02", + "version-string": "1.2.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/ceres.json b/externals/vcpkg/versions/c-/ceres.json new file mode 100755 index 000000000..9697d19be --- /dev/null +++ b/externals/vcpkg/versions/c-/ceres.json @@ -0,0 +1,149 @@ +{ + "versions": [ + { + "git-tree": "85a5ff9f8727124ce91655f2d37b9a6c77f367e1", + "version": "2.1.0", + "port-version": 1 + }, + { + "git-tree": "d3ebf81bee31323b13ad3353b6dbf9944b03abe3", + "version": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "af54888fc010404793ba51c862147575c09a988b", + "version-semver": "2.0.0", + "port-version": 6 + }, + { + "git-tree": "07f2aa6906e97637ae7a4ed6dcfce6867eb1a049", + "version-semver": "2.0.0", + "port-version": 5 + }, + { + "git-tree": "ba834e4ef32213f516d2b0539240ba4cc4a9c90a", + "version-semver": "2.0.0", + "port-version": 4 + }, + { + "git-tree": "bfe64de75017dfef5a1dbd6b034078a0316201c8", + "version-semver": "2.0.0", + "port-version": 3 + }, + { + "git-tree": "216c1a351f8af9be7952bd5dfcf262a66e24c11e", + "version-string": "2.0.0", + "port-version": 2 + }, + { + "git-tree": "f2df3997629106946a1a576a773cfd08f5978643", + "version-string": "2.0.0", + "port-version": 1 + }, + { + "git-tree": "03366aab447c889feefae20c3e652283f2ac2bf4", + "version-string": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "f888f21a1b1323a866deead771a7ca520d7bfb27", + "version-string": "1.14.0", + "port-version": 10 + }, + { + "git-tree": "4efd490b4b57f087fe1ab516919568c49028f6f6", + "version-string": "1.14.0", + "port-version": 9 + }, + { + "git-tree": "5e18168bf5e9452a060112f346b59d6b5e459efa", + "version-string": "1.14.0", + "port-version": 8 + }, + { + "git-tree": "413d81210f1cfe26ac97d2a4c9817ead50e23d48", + "version-string": "1.14.0-7", + "port-version": 0 + }, + { + "git-tree": "e0f395fb4c421ae34156f43cb48a144e79f5e830", + "version-string": "1.14.0-6", + "port-version": 0 + }, + { + "git-tree": "38018a4aa3c9f1fae2f5cf509dd58d47dad69c70", + "version-string": "1.14.0-4", + "port-version": 0 + }, + { + "git-tree": "6d8d790253ac5b723b055319b859351e9bb4886c", + "version-string": "1.14.0-3", + "port-version": 0 + }, + { + "git-tree": "fabee8219a8e5d115cb1e6443b2d746bb31eab3a", + "version-string": "1.14.0-1", + "port-version": 0 + }, + { + "git-tree": "057ce8f86607d0db4794596e12e894f61ba7e398", + "version-string": "1.14.0", + "port-version": 0 + }, + { + "git-tree": "6f19269a2cd33bd29b2c8102802973536db1561c", + "version-string": "1.13.0-4", + "port-version": 0 + }, + { + "git-tree": "74d107a642327542adcd78e2d2a922b7f4f49030", + "version-string": "1.13.0-2", + "port-version": 0 + }, + { + "git-tree": "e890d1caa869b6bcea6d1647e9d13b81bb6d7a9f", + "version-string": "1.13.0-1", + "port-version": 0 + }, + { + "git-tree": "a4661d6ba00c69776b7866d8cc867888854a68fc", + "version-string": "1.13.0", + "port-version": 0 + }, + { + "git-tree": "5ebae76c072aa16a9bd7fdfe1a782488c4ffa812", + "version-string": "1.12.0-4", + "port-version": 0 + }, + { + "git-tree": "04f6cf2e6acda493f6ab2d92bfee5678b14693d4", + "version-string": "1.12.0-3", + "port-version": 0 + }, + { + "git-tree": "8b33250d2b3d20ccc7b2a78307e0ce848ae680da", + "version-string": "1.12.0-2", + "port-version": 0 + }, + { + "git-tree": "235410ef15628f65efd324216f9adf80ac32f212", + "version-string": "1.12.0-1", + "port-version": 0 + }, + { + "git-tree": "2fee66a97b3b504a740e280356e200d3c1b05896", + "version-string": "1.12.0-2", + "port-version": 0 + }, + { + "git-tree": "6fdcd6eb670d631572d444a773cf434a89644d74", + "version-string": "1.12.0-1", + "port-version": 0 + }, + { + "git-tree": "ab6ea40874887e7e65cd76c492ec554c70d1d1fb", + "version-string": "1.12.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cfitsio.json b/externals/vcpkg/versions/c-/cfitsio.json new file mode 100755 index 000000000..42b71d6fa --- /dev/null +++ b/externals/vcpkg/versions/c-/cfitsio.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "bc1418de4f14dd9c1a7e9c9ebc8d8015e1769935", + "version": "3.49", + "port-version": 2 + }, + { + "git-tree": "0ed894cb8efbfd277570991a78f29b70e4e931cd", + "version": "3.49", + "port-version": 1 + }, + { + "git-tree": "cd71c6293e902542ed6cb0c146b5de5d6d7906a9", + "version-string": "3.49", + "port-version": 0 + }, + { + "git-tree": "db0ccc1ac8399ba98af2cf3e5084eaad4eb25776", + "version-string": "3.410", + "port-version": 4 + }, + { + "git-tree": "09ed62edbadc068497fcdac795e038b64fbe3dfc", + "version-string": "3.410-3", + "port-version": 0 + }, + { + "git-tree": "0adbd2e17eaa588f30df8cc135859636489ddf37", + "version-string": "3.410-2", + "port-version": 0 + }, + { + "git-tree": "fd4eded59633e176311d5f34f10f4807db2d2533", + "version-string": "3.410-1", + "port-version": 0 + }, + { + "git-tree": "a5f320eb3baee508c3a2ab3d6bc2b276a4dbe7ea", + "version-string": "3.410", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cgal.json b/externals/vcpkg/versions/c-/cgal.json new file mode 100755 index 000000000..7add1957d --- /dev/null +++ b/externals/vcpkg/versions/c-/cgal.json @@ -0,0 +1,184 @@ +{ + "versions": [ + { + "git-tree": "de8aef00f45ff890d5b4ce4aae56afbc559a5fea", + "version": "5.4.1", + "port-version": 1 + }, + { + "git-tree": "898c2a987fc0104e3c8ba17afde418672e3b0019", + "version": "5.4.1", + "port-version": 0 + }, + { + "git-tree": "9b768fd944908a816ec83a1ff7cb37249aea808e", + "version": "5.4", + "port-version": 1 + }, + { + "git-tree": "0acdd574cd028b7ca4acd762f01938492c6d4719", + "version": "5.4", + "port-version": 0 + }, + { + "git-tree": "da69aec4c03275e85108ebc2dc2d512057d6ac32", + "version": "5.3.1", + "port-version": 0 + }, + { + "git-tree": "9c46ed672d5f8a2791349c1af1b44ed7dfcb6dd6", + "version": "5.3", + "port-version": 0 + }, + { + "git-tree": "02c3a0b581425d69dc21787d87e14c53a07e33ee", + "version": "5.2.2", + "port-version": 1 + }, + { + "git-tree": "8ecf63852d98760d2b2bd0c75b70ab95a5e73aca", + "version-string": "5.2.2", + "port-version": 0 + }, + { + "git-tree": "14e2dc513d60c6c31b5fd94c6e891ac33fcb328f", + "version-string": "5.2", + "port-version": 3 + }, + { + "git-tree": "6d5aeedca6a3ace515272f0d3a1fc150efde9076", + "version-string": "5.2", + "port-version": 2 + }, + { + "git-tree": "5cbb2f2a60d864bd36098d71a050aeef43e52eff", + "version-string": "5.2", + "port-version": 1 + }, + { + "git-tree": "1673f680f59b2c8c848a28c8e664b68b2ec182d7", + "version-string": "5.2", + "port-version": 0 + }, + { + "git-tree": "1618e4fdb8df228e557d622d97e766059e02a97a", + "version-string": "5.1.1", + "port-version": 0 + }, + { + "git-tree": "1c33788089dc3c7bc78a983d5e7a8eb66e5de5ea", + "version-string": "5.1", + "port-version": 0 + }, + { + "git-tree": "50d3e54d6d6656a391f83b83e1d30da93f03d272", + "version-string": "5.1-beta2", + "port-version": 0 + }, + { + "git-tree": "c630161b04b2c960065ec75f0d21bd0ca199e303", + "version-string": "5.0.3", + "port-version": 0 + }, + { + "git-tree": "6d1a36217111e1c54e64ae8e251408c576653b84", + "version-string": "5.0.2-2", + "port-version": 0 + }, + { + "git-tree": "07ebf53c7a3b2296980fe5d067b6ae3b83b5fb76", + "version-string": "5.0.2-1", + "port-version": 0 + }, + { + "git-tree": "6b522572549f9d96ea7c08fbdd47e3d7c8fae8d0", + "version-string": "5.0.2", + "port-version": 0 + }, + { + "git-tree": "be960a2167c1745c2d551cc9ced3698c06ca5616", + "version-string": "5.0.1", + "port-version": 0 + }, + { + "git-tree": "67ffee79aa65d6a25f201e628b84ca31762dd413", + "version-string": "5.0", + "port-version": 0 + }, + { + "git-tree": "911b95d80f01cbf6ddf1166d6f1f12f4dad19d01", + "version-string": "5.0-beta2-0.1", + "port-version": 0 + }, + { + "git-tree": "6511fec22f6fac6b51246ba8d6b8915badd63cc5", + "version-string": "5.0-beta1-0.1", + "port-version": 0 + }, + { + "git-tree": "dc5a47cc775628b2f049a53b08170b22bb9232d6", + "version-string": "5.0", + "port-version": 0 + }, + { + "git-tree": "5e28ca831836bfaf91f9a1ef72bcab2d61a47a46", + "version-string": "4.14-3", + "port-version": 0 + }, + { + "git-tree": "ac76b96512255b61b411e0b31a6196d9e4f35110", + "version-string": "4.14-2", + "port-version": 0 + }, + { + "git-tree": "a898c4cdb7f5c9601b62a6d2752477e24b5a0be4", + "version-string": "4.14-1", + "port-version": 0 + }, + { + "git-tree": "8ea2ee636e49dae963ef36112424b1e3727f5579", + "version-string": "4.13-3", + "port-version": 0 + }, + { + "git-tree": "5e331bf03572ccd2270139b3bbec40bbe5892e26", + "version-string": "4.13-2", + "port-version": 0 + }, + { + "git-tree": "90764d0b3730082adbee8addffff072d88da69d3", + "version-string": "4.13-1", + "port-version": 0 + }, + { + "git-tree": "e87dc7986f2030cf3d39e0f1cfcebe155eadbd4b", + "version-string": "4.12", + "port-version": 0 + }, + { + "git-tree": "6809f8f5e3a61b233ee96c8a4e02df7c54b8860a", + "version-string": "4.11.1", + "port-version": 0 + }, + { + "git-tree": "f7ce924779fb487caea48f7a2db95b846c16608c", + "version-string": "4.11-3", + "port-version": 0 + }, + { + "git-tree": "dbeefd7cebe1496efb3f7da4cc785e3c55e37566", + "version-string": "4.11-2", + "port-version": 0 + }, + { + "git-tree": "75f11610a1f67a87d794c5986a5eb858e6dfd49d", + "version-string": "4.11-1", + "port-version": 0 + }, + { + "git-tree": "d29ac80aaecb18655a10edca0db08ebfee922a38", + "version-string": "4.11", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cgicc.json b/externals/vcpkg/versions/c-/cgicc.json new file mode 100755 index 000000000..dadc95735 --- /dev/null +++ b/externals/vcpkg/versions/c-/cgicc.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "a6113e1a5fcadb00943ea3775b6978950b387903", + "version-string": "3.2.19", + "port-version": 5 + }, + { + "git-tree": "80b636f7c2459aaebfdaeade4f9f0c3892e785dd", + "version-string": "3.2.19-4", + "port-version": 0 + }, + { + "git-tree": "742cbabc36815039e7824e4d4517ac9ad5bc3aa0", + "version-string": "3.2.19-3", + "port-version": 0 + }, + { + "git-tree": "379b56c46cd2139b66c84c8bc67edf5bc3362a34", + "version-string": "3.2.19-2", + "port-version": 0 + }, + { + "git-tree": "add04fedcda8d675524d3ecc4b1900ad19ad66d5", + "version-string": "3.2.19-1", + "port-version": 0 + }, + { + "git-tree": "c0bc902c6bf35178030984307f7b0cd7b45604ec", + "version-string": "3.2.19", + "port-version": 0 + }, + { + "git-tree": "3bbf8f6e51b061b7023c5dc9d88862b9f5c2928b", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cgl.json b/externals/vcpkg/versions/c-/cgl.json new file mode 100755 index 000000000..15745b705 --- /dev/null +++ b/externals/vcpkg/versions/c-/cgl.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "b3104cbc44a135a7d7b75e0929571dc0aa314033", + "version": "0.60.3", + "port-version": 0 + }, + { + "git-tree": "08a6d5bffda4d5fe0b5891a225e7f3fa86cca8a6", + "version-string": "0.60.2", + "port-version": 3 + }, + { + "git-tree": "1842a39e0a0fa8b8d62fb875e750a07b5fe78709", + "version-string": "0.60.2-2", + "port-version": 0 + }, + { + "git-tree": "f74bd4202498c6351c3927afc9d6dd10a8b60355", + "version-string": "0.60.2-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cgltf.json b/externals/vcpkg/versions/c-/cgltf.json new file mode 100755 index 000000000..2e9f77ff6 --- /dev/null +++ b/externals/vcpkg/versions/c-/cgltf.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "2b793ed9e4345b733ec3897b1fbed4e152b5fc4a", + "version": "1.11", + "port-version": 0 + }, + { + "git-tree": "3fc2cb13947f1e5bdabb4333fbc2a4f5ec3128f7", + "version": "1.10", + "port-version": 0 + }, + { + "git-tree": "835b27ec3e0694edf605a79e0e7322dccd69d82f", + "version-string": "1.8", + "port-version": 1 + }, + { + "git-tree": "27d089cd8ef3a46c94daa6e90c4c2689052fe3c0", + "version-string": "1.8", + "port-version": 0 + }, + { + "git-tree": "6816a8dcdaa549afb7c24cd9e815512500f683f3", + "version-string": "1.5", + "port-version": 0 + }, + { + "git-tree": "593e2a321bdd5461d5660a1ed9a405d487481bd1", + "version-string": "1.3", + "port-version": 0 + }, + { + "git-tree": "352d59c3e2861cbbaf37a008273c6f45a152573e", + "version-string": "1.2", + "port-version": 0 + }, + { + "git-tree": "802d7db81d92d4d79e78111b8254d328dd263988", + "version-string": "2019-04-30", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cgns.json b/externals/vcpkg/versions/c-/cgns.json new file mode 100755 index 000000000..3ba5b6275 --- /dev/null +++ b/externals/vcpkg/versions/c-/cgns.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "0d2c412303ae38864d8ff36777cc22bfc404b9b6", + "version-semver": "4.3.0", + "port-version": 0 + }, + { + "git-tree": "9d33908ce58fbfa6e823c937716e57d84d1cb2a5", + "version-semver": "4.2.0", + "port-version": 0 + }, + { + "git-tree": "cc70f3fcc3f4ff2dad2712400208181dc7bb280d", + "version-string": "3.4.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/chaiscript.json b/externals/vcpkg/versions/c-/chaiscript.json new file mode 100755 index 000000000..39bb67f16 --- /dev/null +++ b/externals/vcpkg/versions/c-/chaiscript.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "e661b450987c9f41f4cda3faed9067e54fe65f62", + "version-string": "6.1.0", + "port-version": 2 + }, + { + "git-tree": "42a36da45b402e64b30d4292bf2ed49e029a4177", + "version-string": "6.1.0-1", + "port-version": 0 + }, + { + "git-tree": "d85843cc7870ae045579d1d1b0e4722b4b626502", + "version-string": "6.1.0", + "port-version": 0 + }, + { + "git-tree": "b149c97ee946f1d621a8e10874ef8559a7275d57", + "version-string": "6.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/chakracore.json b/externals/vcpkg/versions/c-/chakracore.json new file mode 100755 index 000000000..58aa5f895 --- /dev/null +++ b/externals/vcpkg/versions/c-/chakracore.json @@ -0,0 +1,174 @@ +{ + "versions": [ + { + "git-tree": "614248322cae7f18cd412cc90848a9f140ec9f60", + "version-date": "2021-04-22", + "port-version": 2 + }, + { + "git-tree": "8ce7ea484830cdf24c8af45ebad35ba10e76f61c", + "version-date": "2021-04-22", + "port-version": 1 + }, + { + "git-tree": "0aa775c085b114b0ec67ea23ee99ece252d9e498", + "version-string": "2021-04-22", + "port-version": 0 + }, + { + "git-tree": "89c6f3a1c86e3849e7f58941ab165af8da0b2f25", + "version-string": "1.11.22", + "port-version": 1 + }, + { + "git-tree": "7a4613ffc09fc76e06277028b747f1b69f69b852", + "version-string": "1.11.22", + "port-version": 0 + }, + { + "git-tree": "2ca419681ed3a534f27ccf0127dbc3f56b49738c", + "version-string": "1.11.15", + "port-version": 0 + }, + { + "git-tree": "0b2e6d64d357718e2b0a3c72b80d0cd6032ff378", + "version-string": "1.11.14", + "port-version": 0 + }, + { + "git-tree": "71a1aa606b905a943c820d8eb9903b4d8e9f322a", + "version-string": "1.11.13", + "port-version": 0 + }, + { + "git-tree": "83a9fac77ff0db1cfa2fdd0a8f982dbc3c4ab6e2", + "version-string": "1.11.12", + "port-version": 0 + }, + { + "git-tree": "e664b82f33c3699d9fae48560225bf176845cd56", + "version-string": "1.11.11", + "port-version": 0 + }, + { + "git-tree": "6df9ccec9806ae3c646e2f8963340cc1c974d2c6", + "version-string": "1.11.9", + "port-version": 0 + }, + { + "git-tree": "a9d3ba9be4848102537b95b934e7198fd38d282e", + "version-string": "1.11.8", + "port-version": 0 + }, + { + "git-tree": "c96a1be59aca2aebe0c5a84cc63539b221b20dc8", + "version-string": "1.11.7", + "port-version": 0 + }, + { + "git-tree": "b3df766e21d574d79ea1d92e82d91b927267ad85", + "version-string": "1.11.5", + "port-version": 0 + }, + { + "git-tree": "35646ec58dff3de7b286a4225c2e498b0591e296", + "version-string": "1.11.4", + "port-version": 0 + }, + { + "git-tree": "849ea1fa5e4835d0a21c710203646c118aafcda4", + "version-string": "1.11.2", + "port-version": 0 + }, + { + "git-tree": "ad93a98d2d508ae6f3d6b5468dc45eed932132e9", + "version-string": "1.11.1-1", + "port-version": 0 + }, + { + "git-tree": "da157994a1ca198c2291dce508007e2c3fbf9275", + "version-string": "1.11.1", + "port-version": 0 + }, + { + "git-tree": "445d9cc153f175468ba6f7a9065f0a6d073330ea", + "version-string": "1.10.1-1", + "port-version": 0 + }, + { + "git-tree": "869014878c1d6c90f7ef8afdf762d596aa57de21", + "version-string": "1.10.1", + "port-version": 0 + }, + { + "git-tree": "0203a2c674c84e4f847a69092f8e05881aa1d780", + "version-string": "1.10.0", + "port-version": 0 + }, + { + "git-tree": "544f12820c7a87300f2132a500da5c720a9c2397", + "version-string": "1.8.5", + "port-version": 0 + }, + { + "git-tree": "ea25d1092f2f0a622ab1eb00fc63414e901f306c", + "version-string": "1.8.4", + "port-version": 0 + }, + { + "git-tree": "e010dcad67e297d01b9e81bd105b70222e673a99", + "version-string": "1.8.3", + "port-version": 0 + }, + { + "git-tree": "d9b292fc28aebb259c0f8be2cca52fd40ed9b34d", + "version-string": "1.8.2", + "port-version": 0 + }, + { + "git-tree": "aa6cca2de50287424211a5ecb74a7c054e47138c", + "version-string": "1.8.1", + "port-version": 0 + }, + { + "git-tree": "5619524dc45e2e4d7372f236eeb5d34a8a2787ca", + "version-string": "1.7.4-1", + "port-version": 0 + }, + { + "git-tree": "e88be82a454cf70d207ff9344c78e8cd2a75d015", + "version-string": "1.7.4", + "port-version": 0 + }, + { + "git-tree": "160eabab2bb1d5a409e24b1e0a037e24bd4284ef", + "version-string": "1.4.3", + "port-version": 0 + }, + { + "git-tree": "14eba2da734ab5bab48aeabd831ae5d03bef0067", + "version-string": "1.4.0-1", + "port-version": 0 + }, + { + "git-tree": "91e7d1ad207b7288e59c91a6147f02de4c95cd3d", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "e6cfebcad51cb25fa742f774af1be79909e01fc5", + "version-string": "1.3.1", + "port-version": 0 + }, + { + "git-tree": "55b6461f0e945885ffce0e490603ff170fec690d", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "61f66358358575de7d803afbffae1622685062d0", + "version-string": "1.2.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/charls.json b/externals/vcpkg/versions/c-/charls.json new file mode 100755 index 000000000..c2785ce7a --- /dev/null +++ b/externals/vcpkg/versions/c-/charls.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "bb6273d01bce3793f42709b833ac47ff0afe71a6", + "version": "2.3.4", + "port-version": 0 + }, + { + "git-tree": "215d96df3e02eb0bfaae991586f4b64fd03c6cf2", + "version-string": "2.2.0", + "port-version": 2 + }, + { + "git-tree": "9e9e71b04ec39396631b28e98175e4c862cb154d", + "version-string": "2.2.0", + "port-version": 1 + }, + { + "git-tree": "12553ab1c13943bb8295052c2965bdbcbfc7f57f", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "2fa61c15c3a5e28cb65a32bce7769942d8a8f061", + "version-string": "2.1.0-1", + "port-version": 0 + }, + { + "git-tree": "7c242f5202e4483fa223f0cf6243f7c62ce4fb1b", + "version-string": "2.0.0-3", + "port-version": 0 + }, + { + "git-tree": "d24536d72857fd7a9f78eed901f8e365c3f46ac1", + "version-string": "2.0.0-2", + "port-version": 0 + }, + { + "git-tree": "af633d8047f2486b1f3c525a5aa285afc26b4347", + "version-string": "2.0.0-1", + "port-version": 0 + }, + { + "git-tree": "f43231dbadb55d20a0df8623d03be555bf9cd12a", + "version-string": "2.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/chartdir.json b/externals/vcpkg/versions/c-/chartdir.json new file mode 100755 index 000000000..96f84184e --- /dev/null +++ b/externals/vcpkg/versions/c-/chartdir.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "7f64b5801adec2ea3f13517ffa35bd96b6a8bb9f", + "version": "7.0.0", + "port-version": 4 + }, + { + "git-tree": "2b4bad1eb46439cbd63295d8120f03966c52d162", + "version": "7.0.0", + "port-version": 3 + }, + { + "git-tree": "fe0cf0c045f1092f18faa48f70b6b23d66e6298e", + "version": "7.0.0", + "port-version": 2 + }, + { + "git-tree": "fc56555cd56d261127f985f6208cb23258dcb262", + "version": "7.0.0", + "port-version": 1 + }, + { + "git-tree": "433c4a83452c8867b63d012a46109a4e3992e13f", + "version": "7.0.0", + "port-version": 0 + }, + { + "git-tree": "9fde410f21fe4ab0dfdc3980210c97a17d752380", + "version-string": "6.3.1", + "port-version": 2 + }, + { + "git-tree": "6db8fed22b0db913c97ccf1c64e274528e6f8eee", + "version-string": "6.3.1-1", + "port-version": 0 + }, + { + "git-tree": "4d096dc755e553ce08011ccc7116566f8be9eb59", + "version-string": "6.3.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/check.json b/externals/vcpkg/versions/c-/check.json new file mode 100755 index 000000000..d66579d74 --- /dev/null +++ b/externals/vcpkg/versions/c-/check.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "d3b96c10d08746796f0e7540f9cb896b263cd4a9", + "version": "0.15.2", + "port-version": 4 + }, + { + "git-tree": "f9804577939493b7f7934d98adc953624e0020c4", + "version": "0.15.2", + "port-version": 3 + }, + { + "git-tree": "f88273666d201fd843e12ba5d98d4ed8a10bd576", + "version-string": "0.15.2", + "port-version": 2 + }, + { + "git-tree": "889eae1f6ba0c9809e6718e6b15143b65dc6394f", + "version-string": "0.15.2", + "port-version": 1 + }, + { + "git-tree": "5495ef66bb5b37ceabf5ddd8b7ee534f1475f3c9", + "version-string": "0.15.2", + "port-version": 0 + }, + { + "git-tree": "76067a985b85fd4a0223634beb2f3bbb347128c1", + "version-string": "0.14.0", + "port-version": 0 + }, + { + "git-tree": "ff6d53690d3f8cd7cd75844fdc95de8589947047", + "version-string": "0.13.0-2", + "port-version": 0 + }, + { + "git-tree": "a6737ac83c44221927230e0765a1c8f73ad65db5", + "version-string": "0.13.0-1", + "port-version": 0 + }, + { + "git-tree": "768d50c53e9d0546aa8fd12d18cd167f8704dd5b", + "version-string": "0.13.0", + "port-version": 0 + }, + { + "git-tree": "0a5b1f033d538cfee6676bcc97f0f803b1596cba", + "version-string": "0.12.0-2", + "port-version": 0 + }, + { + "git-tree": "cdbd554ab0647106628943194c888286191b4419", + "version-string": "0.12.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/chipmunk.json b/externals/vcpkg/versions/c-/chipmunk.json new file mode 100755 index 000000000..f785d5eb8 --- /dev/null +++ b/externals/vcpkg/versions/c-/chipmunk.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "d50838914429dd39c93a8d0974b4f786c53be83f", + "version-string": "7.0.3", + "port-version": 2 + }, + { + "git-tree": "4c12d64b4bc53958dce0a82a4ae41457ee6e2bc5", + "version-string": "7.0.3", + "port-version": 1 + }, + { + "git-tree": "1ad780da368cbf02bb78ae3d1c1b6432e0683e90", + "version-string": "7.0.3", + "port-version": 0 + }, + { + "git-tree": "7bd1bc11f039325e18e226b3f50f4e65869a073b", + "version-string": "7.0.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/chmlib.json b/externals/vcpkg/versions/c-/chmlib.json new file mode 100755 index 000000000..1986f3145 --- /dev/null +++ b/externals/vcpkg/versions/c-/chmlib.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "44371d51f30e27d0ccda47b2069b194c3c570ea4", + "version-string": "0.40", + "port-version": 5 + }, + { + "git-tree": "4801e25e62b144f41dfa8408351f1bab4d7c85b1", + "version-string": "0.40-4", + "port-version": 0 + }, + { + "git-tree": "2dd1f48712e00c423cf711c17cb046ea1e08c478", + "version-string": "0.40-3", + "port-version": 0 + }, + { + "git-tree": "89bb46618cba5beea2e91cfe872759e145a51b58", + "version-string": "0.40-2", + "port-version": 0 + }, + { + "git-tree": "c17af4f58e15ecffe085c937d1d6e448994148da", + "version-string": "0.40-1", + "port-version": 0 + }, + { + "git-tree": "44c860e56e349c399faaa275a008e1d934df4ac2", + "version-string": "0.40", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/chromaprint.json b/externals/vcpkg/versions/c-/chromaprint.json new file mode 100755 index 000000000..a97cedf9c --- /dev/null +++ b/externals/vcpkg/versions/c-/chromaprint.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "d841d451ed68f08043a27b2ec0beb24d3a276c81", + "version": "1.5.0", + "port-version": 1 + }, + { + "git-tree": "1f3fe321540c3d87ad63fe85efa5b48bd9c55ac8", + "version-string": "1.5.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/chromium-base.json b/externals/vcpkg/versions/c-/chromium-base.json new file mode 100755 index 000000000..c539ab612 --- /dev/null +++ b/externals/vcpkg/versions/c-/chromium-base.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "3dbf253ab140a0d754230e2cffa7b4f94686a9e9", + "version": "86.0.4199.1", + "port-version": 4 + }, + { + "git-tree": "36e6dbafdea0e90a8717907171efa375d2580d8b", + "version-string": "86.0.4199.1", + "port-version": 3 + }, + { + "git-tree": "e0ee4950d82a3613501a9647b688a451be6b187c", + "version-string": "86.0.4199.1", + "port-version": 2 + }, + { + "git-tree": "32032ff366c12fd25721222708291f36c9c7cc32", + "version-string": "86.0.4199.1", + "port-version": 1 + }, + { + "git-tree": "9594776ec730e788a81d35607b42765968a0c1d2", + "version-string": "86.0.4199.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cimg.json b/externals/vcpkg/versions/c-/cimg.json new file mode 100755 index 000000000..7f900ec61 --- /dev/null +++ b/externals/vcpkg/versions/c-/cimg.json @@ -0,0 +1,104 @@ +{ + "versions": [ + { + "git-tree": "2eac332b873f6a2b9108c3e71e59feec8efe5026", + "version": "2.9.9", + "port-version": 0 + }, + { + "git-tree": "4ec4b920b2c754563d9daf835412f1143c127e97", + "version-string": "2.9.4", + "port-version": 1 + }, + { + "git-tree": "eb83122db781cf448f7485bc5b55c7497c8941d9", + "version-string": "2.9.4", + "port-version": 0 + }, + { + "git-tree": "ad4965f4c862383047f8d61e997fa34072772ee8", + "version-string": "2.6.2", + "port-version": 0 + }, + { + "git-tree": "e63daa06cdd9de965d5b8027b77881c79d442314", + "version-string": "2.6.1", + "port-version": 0 + }, + { + "git-tree": "5259ce4ffce511c33ef32f3fffdc70c9be0edc3c", + "version-string": "2.5.7", + "port-version": 0 + }, + { + "git-tree": "b5f68739aa9e4c8565b2135b6d0016f86a74e3a4", + "version-string": "2.5.5", + "port-version": 0 + }, + { + "git-tree": "96e22b9eff01511e598e2506454e77d29225b326", + "version-string": "2.4.5", + "port-version": 0 + }, + { + "git-tree": "536e1ebc791fd572511b933f3702ef781ab36b7b", + "version-string": "2.4.4", + "port-version": 0 + }, + { + "git-tree": "0cc22064dbe06dcdb3727d0a636030a131cdf81b", + "version-string": "2.4.2", + "port-version": 0 + }, + { + "git-tree": "aacf6d53c723df2317091252da3814b3f968b726", + "version-string": "2.4.1", + "port-version": 0 + }, + { + "git-tree": "0280b9fc74014aaa976ab0a506b18f3234efdb07", + "version-string": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "7366a7f23b0903f69eefb09433e80af3cc182a8e", + "version-string": "2.3.6", + "port-version": 0 + }, + { + "git-tree": "7e7a286f55014c3ce2e20806fafac2a31dad60fb", + "version-string": "2.3.3", + "port-version": 0 + }, + { + "git-tree": "6263f2ecb3760fd524356be1d5690ad45e74f341", + "version-string": "2.3.2", + "port-version": 0 + }, + { + "git-tree": "5b3d8f9f77263a362aeedbfb2ab453d14bee0b07", + "version-string": "2.2.3", + "port-version": 0 + }, + { + "git-tree": "f30cf7cac1d29608aecd1bf75d99b5028ee9b487", + "version-string": "2.2.2", + "port-version": 0 + }, + { + "git-tree": "8183d26673abb8ba4922b0a7ad62be1fb4d6be06", + "version-string": "221", + "port-version": 0 + }, + { + "git-tree": "fa1beed18975776efdd88979fdd5caf2718dc645", + "version-string": "220", + "port-version": 0 + }, + { + "git-tree": "6e493c8269509fcbea2be99ecffe94d4bf6c9a04", + "version-string": "2.1.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cityhash.json b/externals/vcpkg/versions/c-/cityhash.json new file mode 100755 index 000000000..8b55fa672 --- /dev/null +++ b/externals/vcpkg/versions/c-/cityhash.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "9c1b6eaaf15c06d436ce42331b84566abd931f53", + "version-date": "2013-01-08", + "port-version": 2 + }, + { + "git-tree": "423306e7029cfac62069d751bb612e10b3777c13", + "version-string": "2013-01-08", + "port-version": 1 + }, + { + "git-tree": "3976c756d432396374de92f20289f5e966d4109a", + "version-string": "2013-01-08", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/civetweb.json b/externals/vcpkg/versions/c-/civetweb.json new file mode 100755 index 000000000..d3c124855 --- /dev/null +++ b/externals/vcpkg/versions/c-/civetweb.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "0e09fcaf964728e71394be1fc43d018fcde2e355", + "version": "1.15", + "port-version": 1 + }, + { + "git-tree": "536e2167b093981486715537c12a52d0696b3840", + "version": "1.15", + "port-version": 0 + }, + { + "git-tree": "ca6f80fd431dc0a13daa1509308d598700fbd763", + "version": "1.13", + "port-version": 2 + }, + { + "git-tree": "c66a22f30f2b72f81ae2bb23cce2bfc512b6e983", + "version-string": "1.13", + "port-version": 1 + }, + { + "git-tree": "1776aa61de3940a5f6edda1191097fc16eb53cf5", + "version-string": "1.13", + "port-version": 0 + }, + { + "git-tree": "3f053b157e06c3b8638c54708f248aba7c8215a5", + "version-string": "1.12", + "port-version": 0 + }, + { + "git-tree": "c6ff8d6e1603f36d329f5b7c53d8530df6d951e4", + "version-string": "2019-07-05-1", + "port-version": 0 + }, + { + "git-tree": "b4bccfc4ccd7097f18ee43a4ad5e736d27ea841b", + "version-string": "2019-07-05", + "port-version": 0 + }, + { + "git-tree": "fa1536cafad57ebd2dd512783aa333faa403df71", + "version-string": "1.11-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cjson.json b/externals/vcpkg/versions/c-/cjson.json new file mode 100755 index 000000000..d8f68b8d1 --- /dev/null +++ b/externals/vcpkg/versions/c-/cjson.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "cb79fc0bdbc6754cf6c267d97e2825655929351b", + "version": "1.7.15", + "port-version": 1 + }, + { + "git-tree": "4a0cbb7810d1e9fda06ff7da2f8deb5249401267", + "version": "1.7.15", + "port-version": 0 + }, + { + "git-tree": "c8997bd75a1e40cf8ac7f7d77a942afd84f01d2e", + "version-date": "2019-11-30", + "port-version": 2 + }, + { + "git-tree": "2a1edb97563c7a8e4007f479bfdcb33122911e16", + "version-string": "2019-11-30-1", + "port-version": 0 + }, + { + "git-tree": "6417e86b41b39045d328c14e75e763a20c1d75f0", + "version-string": "2019-11-30", + "port-version": 0 + }, + { + "git-tree": "820bf0e6f96df213008242f4c17ca4e270cf741a", + "version-string": "1.7.12", + "port-version": 0 + }, + { + "git-tree": "cf63a25f59243203efb7f01c06e20fd735ce7f9c", + "version-string": "1.7.10-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/clamav.json b/externals/vcpkg/versions/c-/clamav.json new file mode 100755 index 000000000..645312b20 --- /dev/null +++ b/externals/vcpkg/versions/c-/clamav.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "36dda0d43469bb23e4d56b170e40261b810509f1", + "version-semver": "0.103.0", + "port-version": 3 + }, + { + "git-tree": "5580f5bf0e6812edc0e114f55b3377117b5aa6ff", + "version-semver": "0.103.0", + "port-version": 2 + }, + { + "git-tree": "b6b4287e62ba66791d4f3b1af99f795f7cd8df15", + "version-semver": "0.103.0", + "port-version": 1 + }, + { + "git-tree": "30eb9215db50ee898f34f2405682017ac2424e58", + "version-string": "0.103.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/clapack.json b/externals/vcpkg/versions/c-/clapack.json new file mode 100755 index 000000000..421ccf45a --- /dev/null +++ b/externals/vcpkg/versions/c-/clapack.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "2fd47cedfcd13b7c3a339c7acf4b89c14caea8d5", + "version": "3.2.1", + "port-version": 20 + }, + { + "git-tree": "bedf61cf9cf765a2c823e1f2427a16af6d8a711e", + "version-string": "3.2.1", + "port-version": 19 + }, + { + "git-tree": "229447785643f09b1a4ef53bab355ff3757e178e", + "version-string": "3.2.1", + "port-version": 18 + }, + { + "git-tree": "a75c0e3b1dbe8fa6cd276b2a6fc5b61b19e9ea45", + "version-string": "3.2.1", + "port-version": 17 + }, + { + "git-tree": "8958d14a08da3ed544cd126331db33768af294cb", + "version-string": "3.2.1", + "port-version": 16 + }, + { + "git-tree": "93ee7dc5582d65acbd3c51ab0b1374b7b8d2e59c", + "version-string": "3.2.1", + "port-version": 15 + }, + { + "git-tree": "5054e025c2ab843a2a77bcd2fadaa10a5139bb01", + "version-string": "3.2.1", + "port-version": 14 + }, + { + "git-tree": "f1d46d74a6edf9270ba1dbeb87b47f56b2c618da", + "version-string": "3.2.1", + "port-version": 13 + }, + { + "git-tree": "4d6ace5497a1be65cab7b9afce93478614080103", + "version-string": "3.2.1-13", + "port-version": 0 + }, + { + "git-tree": "478b43e2fe6194105a4cc91200f027663e80ba0e", + "version-string": "3.2.1-12", + "port-version": 0 + }, + { + "git-tree": "04772a560855daa48239b2eea1179586f7df6fe4", + "version-string": "3.2.1-11", + "port-version": 0 + }, + { + "git-tree": "8ac89e53f42afc5c7d696c11aff57c98db6c80ed", + "version-string": "3.2.1-10", + "port-version": 0 + }, + { + "git-tree": "eed4720be7cc3b882d2c8278fe98d1992b03b4bc", + "version-string": "3.2.1-9", + "port-version": 0 + }, + { + "git-tree": "b4f2e61478621a87629438d55a0628ae02e43f26", + "version-string": "3.2.1-6", + "port-version": 0 + }, + { + "git-tree": "06355e6da5386dba274b27fdaf24bac94f5f2bfa", + "version-string": "3.2.1-4", + "port-version": 0 + }, + { + "git-tree": "cb6e0fe3229da9d239f557bb0aeae95952f72731", + "version-string": "3.2.1-3", + "port-version": 0 + }, + { + "git-tree": "d12dfdf726225876e4785bf1b7cfe91fa5216086", + "version-string": "3.2.1-2", + "port-version": 0 + }, + { + "git-tree": "e6bcb47d8349edc1400573f78f4a8c0985ed2407", + "version-string": "3.2.1-1", + "port-version": 0 + }, + { + "git-tree": "97aa58f96c370605c8d70f816fc78c43e1c0e94d", + "version-string": "3.2.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/clara.json b/externals/vcpkg/versions/c-/clara.json new file mode 100755 index 000000000..9b9ce7df3 --- /dev/null +++ b/externals/vcpkg/versions/c-/clara.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "dd2473115d2b12883de5a00cdbb2aaa309702042", + "version-string": "1.1.5", + "port-version": 1 + }, + { + "git-tree": "7c34c7f065f811d99fe3aa30bbe84f9ac580c0f8", + "version-string": "1.1.5", + "port-version": 0 + }, + { + "git-tree": "3bf349ff0faa032132a525d7a5d429abd21efb8e", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "d1cce1303a06e9ea2c9bcf3be072ac630ace5fa2", + "version-string": "2018-11-01", + "port-version": 0 + }, + { + "git-tree": "6b3700225424235ebd6eae6cca857ec4d92be7d0", + "version-string": "2018-10-25", + "port-version": 0 + }, + { + "git-tree": "56039d7150142cc0ddd2129d2dcaa5b8a409af71", + "version-string": "2018-04-02", + "port-version": 0 + }, + { + "git-tree": "d5de4c5a95aa6725296b0613502b0bf153f3bc69", + "version-string": "2018-03-23", + "port-version": 0 + }, + { + "git-tree": "95a83230895abb9f527a57f9cdecc0b8df3cac72", + "version-string": "2018-03-11", + "port-version": 0 + }, + { + "git-tree": "ee4d136f6a2815d7b3acc7faac7a89bba5a503e8", + "version-string": "2018-03-07", + "port-version": 0 + }, + { + "git-tree": "24d857fd302406c577b0ec7bbb84154f134dafd4", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "dafbbb9fd26a25e9d757f0d29ab471066aceab44", + "version-string": "2017-07-20-9661f2b4a50895d52ebb4c59382785a2b416c310", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/clblas.json b/externals/vcpkg/versions/c-/clblas.json new file mode 100755 index 000000000..7b8c3594f --- /dev/null +++ b/externals/vcpkg/versions/c-/clblas.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "a94b503ed4a4a74fa316ac65c363968092a0b026", + "version": "2.12", + "port-version": 6 + }, + { + "git-tree": "0972ab18d9864a174d8c9acb7cf1add27c6a4ce2", + "version-string": "2.12", + "port-version": 5 + }, + { + "git-tree": "e4744af3eaf0b0d24b2c60b7c3f85565e399961e", + "version-string": "2.12-4", + "port-version": 0 + }, + { + "git-tree": "ca8bf8d9213393fce5ae7757dc422f056a780ffa", + "version-string": "2.12-3", + "port-version": 0 + }, + { + "git-tree": "877ea154609214d86f41c69ff6239671338c533d", + "version-string": "2.12-2", + "port-version": 0 + }, + { + "git-tree": "121d625c8b7962c34f4cd5b8414f6518b39b5526", + "version-string": "2.12-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/clblast.json b/externals/vcpkg/versions/c-/clblast.json new file mode 100755 index 000000000..8ae9e3d63 --- /dev/null +++ b/externals/vcpkg/versions/c-/clblast.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "f3fc8c351cba8b45e06d835b27101617a5ba74b0", + "version": "1.5.2", + "port-version": 2 + }, + { + "git-tree": "e85773ea54da7675b468d6fd479871899667aa3a", + "version": "1.5.2", + "port-version": 1 + }, + { + "git-tree": "1908d2071402d3175fd77f272005be69ff02abbf", + "version": "1.5.2", + "port-version": 0 + }, + { + "git-tree": "3f2832bf6fb704f7e83a56c4a1b952287b2ceb49", + "version-string": "1.5.1", + "port-version": 2 + }, + { + "git-tree": "dcbde8693746ad43009a522210aed6794d6a0a58", + "version-string": "1.5.1", + "port-version": 1 + }, + { + "git-tree": "59011ea56f7531acf901ef6bc7f17ab6492f7b79", + "version-string": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "8963217e0a1f3564d95832c2178db30618312eab", + "version-string": "1.5.0-1", + "port-version": 0 + }, + { + "git-tree": "90acecd3a3606d0009162352d6204e57689ac32a", + "version-string": "1.5.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/clfft.json b/externals/vcpkg/versions/c-/clfft.json new file mode 100755 index 000000000..33be21690 --- /dev/null +++ b/externals/vcpkg/versions/c-/clfft.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "b935ce5f9e186f9be8fe85d6d228043bede4cd04", + "version": "2.12.2", + "port-version": 5 + }, + { + "git-tree": "fdb3022cd3081e404b7c49ceaa5bd03ad0dc64f4", + "version": "2.12.2", + "port-version": 4 + }, + { + "git-tree": "14ad34cc8ef68a5583c4f5f0b54f3c9a57ee2bc0", + "version-string": "2.12.2", + "port-version": 3 + }, + { + "git-tree": "e4985dd521a5d7e29a259339805619913c0e3876", + "version-string": "2.12.2-2", + "port-version": 0 + }, + { + "git-tree": "d0273b5847f17e5fb8b12f5cea4bbea7533c0012", + "version-string": "2.12.2-1", + "port-version": 0 + }, + { + "git-tree": "983bac4dd3ecaeef65610d4650d6b44ef4636c18", + "version-string": "2.12.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cli.json b/externals/vcpkg/versions/c-/cli.json new file mode 100755 index 000000000..1c705d9ba --- /dev/null +++ b/externals/vcpkg/versions/c-/cli.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "25a075116903bfd73e5a1e4f63638955c1a52732", + "version": "2.0.1", + "port-version": 0 + }, + { + "git-tree": "2c5da108b7e41bd3da82fe9b670a308d664b3a0e", + "version-semver": "2.0.0", + "port-version": 1 + }, + { + "git-tree": "52c57cc23f038ec2f73805b37f42639541036956", + "version-semver": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "ae335f0cbfecdfb4f7d5448bf3e1fec0ae9aecb9", + "version-string": "1.2.1", + "port-version": 0 + }, + { + "git-tree": "0686bd749bb0fe462cdd7455b4ff23408ddc6efe", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "89045e1c68f2e0190da173359ad79f3bf868d734", + "version-string": "1.1.1", + "port-version": 0 + }, + { + "git-tree": "5bc59c44c0a9a39684454157dda3a7c56a37b7e5", + "version-string": "1.1-1", + "port-version": 0 + }, + { + "git-tree": "5aa8fbe623b52b18518db5cfb6dfc8194024c4e3", + "version-string": "1.1", + "port-version": 0 + }, + { + "git-tree": "7f76a495c9e7f6f8cd709499d3d384ed8bedbad4", + "version-string": "2019-03-21", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cli11.json b/externals/vcpkg/versions/c-/cli11.json new file mode 100755 index 000000000..43e9aaac1 --- /dev/null +++ b/externals/vcpkg/versions/c-/cli11.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "25d9ba9e7e80ff980fef1b9bf369d51f5b1cfc59", + "version": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "a2fa0d3108042d872a50565d15c79d5611bdf0b6", + "version": "2.1.2", + "port-version": 1 + }, + { + "git-tree": "9e17d430383dcb0eb48b08e57cb33503fc181c3b", + "version": "2.1.2", + "port-version": 0 + }, + { + "git-tree": "7110589331620372b824efe58e1c3eb5c89c41e7", + "version": "2.1.1", + "port-version": 0 + }, + { + "git-tree": "07b6e6eba954d7f9300768c354e650ae32582c90", + "version": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "1430611e0538943498bb96f67ab5de443c76cad2", + "version-semver": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "47d52d6f0f742e0c0799cd5de355c81732d82d5b", + "version-string": "1.9.1", + "port-version": 0 + }, + { + "git-tree": "c1e68f22fc5b4cda723b490171a541aa1b9cd6d4", + "version-string": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "e5176f97d0d9bde0f70fc54f9f8feacaf7f79897", + "version-string": "1.8.0", + "port-version": 0 + }, + { + "git-tree": "4da425405d2829f4bf8a53c98ecd5e98ff9de0d8", + "version-string": "1.7.1", + "port-version": 0 + }, + { + "git-tree": "b99037553e78952ff6e0243626640e5d9130bed0", + "version-string": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "17868365a2236ed8a3559920918eaa0b6d32a521", + "version-string": "1.6.2", + "port-version": 0 + }, + { + "git-tree": "c823576ada3264d2a7b10dcfb549c4e60a679f03", + "version-string": "1.6.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/clickhouse-cpp.json b/externals/vcpkg/versions/c-/clickhouse-cpp.json new file mode 100755 index 000000000..12cd74ccb --- /dev/null +++ b/externals/vcpkg/versions/c-/clickhouse-cpp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "14c4074d1a59fbe8b01ebe934698519c63885b8b", + "version": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "a748366b06afe85b514215e2d27832304581b811", + "version-string": "2019-05-22", + "port-version": 1 + }, + { + "git-tree": "bd61eb545cd11c0329de99de697ef0dd124cce60", + "version-string": "2019-05-22", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/clipboardxx.json b/externals/vcpkg/versions/c-/clipboardxx.json new file mode 100755 index 000000000..56ebcd2ea --- /dev/null +++ b/externals/vcpkg/versions/c-/clipboardxx.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "081dccf5f7ac08990ef5814f6e2b99d1c2d9a385", + "version-date": "2022-02-04", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/clipp.json b/externals/vcpkg/versions/c-/clipp.json new file mode 100755 index 000000000..77eafa023 --- /dev/null +++ b/externals/vcpkg/versions/c-/clipp.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "d8bced062fa89719dbb806838b968639f1ffcaf6", + "version-string": "2019-04-30", + "port-version": 1 + }, + { + "git-tree": "2f0d21d6f8ca2d0768b52fd43ee9beb771c291fd", + "version-string": "2019-04-30", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/clockutils.json b/externals/vcpkg/versions/c-/clockutils.json new file mode 100755 index 000000000..98504ce75 --- /dev/null +++ b/externals/vcpkg/versions/c-/clockutils.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "08f337ddf39f1cda9dd6431374cdb0ee748745da", + "version": "1.1.1", + "port-version": 1 + }, + { + "git-tree": "1fb64c4ec3d5aced719df16f96e79be4bb64cee7", + "version-string": "1.1.1-3651f232c27074c4ceead169e223edf5f00247c5", + "port-version": 4 + }, + { + "git-tree": "cea253009dc17e485177d45dd2b67334db8fc7b4", + "version-string": "1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-3", + "port-version": 0 + }, + { + "git-tree": "1099670eb247ce26881c2d121ccdb13ede01a7ba", + "version-string": "1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-2", + "port-version": 0 + }, + { + "git-tree": "162495da5f294284be07957fde8eedf158c9ce5c", + "version-string": "1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-1", + "port-version": 0 + }, + { + "git-tree": "23ad4618ca9fc9a5617b236ccca524b53dff0c0e", + "version-string": "1.1.1-3651f232c27074c4ceead169e223edf5f00247c5", + "port-version": 0 + }, + { + "git-tree": "9ebf14ea7f9be8ff5c2d749a66b0b3bf7654d227", + "version-string": "1.1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/clp.json b/externals/vcpkg/versions/c-/clp.json new file mode 100755 index 000000000..6da684279 --- /dev/null +++ b/externals/vcpkg/versions/c-/clp.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "ba7ecebb114207f66009451eb56f4d778f46ef91", + "version-string": "1.17.6", + "port-version": 1 + }, + { + "git-tree": "a0176c86ad90803b7bbf0327edbbfc8c48d4407e", + "version-string": "1.17.6", + "port-version": 0 + }, + { + "git-tree": "46976cb32fcdc6d89e76591f1c82f7004baeac1b", + "version-string": "1.17.5", + "port-version": 0 + }, + { + "git-tree": "9ced0062a007a5831bd6374bdccc2bd51c33287e", + "version-string": "1.17.3", + "port-version": 0 + }, + { + "git-tree": "0f46d76811ffad1a4b2b3f835a058aebeccde0de", + "version-string": "1.17.2-2", + "port-version": 0 + }, + { + "git-tree": "0484f61cd4d1962b0c346ca6e3fc4f35cf32bff1", + "version-string": "1.17.2-1", + "port-version": 0 + }, + { + "git-tree": "000fc62fa341573f5cd780d3ce52a2f0d173a4eb", + "version-string": "1.17.2", + "port-version": 0 + }, + { + "git-tree": "f696708a0c8ec58bb76de608ccd9de42b87449e0", + "version-string": "1.16.11-1", + "port-version": 0 + }, + { + "git-tree": "f91480cbc57442e18fc1ce033283cc6d2be87bfd", + "version-string": "1.16.11-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/clrng.json b/externals/vcpkg/versions/c-/clrng.json new file mode 100755 index 000000000..8fc665536 --- /dev/null +++ b/externals/vcpkg/versions/c-/clrng.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "7cc0e3574395caa55371315638a94981a178f2bf", + "version-date": "2020-12-01", + "port-version": 3 + }, + { + "git-tree": "9e9072006facf085465f2bcc8291a3a90508c46a", + "version-date": "2020-12-01", + "port-version": 2 + }, + { + "git-tree": "1b8475c5bb62206bf9ebdd82ba3f04467aee6e95", + "version-string": "2020-12-01", + "port-version": 1 + }, + { + "git-tree": "700b4cbcd0d99feefabf96621a5b217e56dc5a38", + "version-string": "2020-12-01", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/clue.json b/externals/vcpkg/versions/c-/clue.json new file mode 100755 index 000000000..bb871c320 --- /dev/null +++ b/externals/vcpkg/versions/c-/clue.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "b486e21df033265619432ec3718ae4db462fb76b", + "version": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "b58662a5b92d34be097810c33d6ec24400ae0b26", + "version-string": "1.0.0-alpha.7", + "port-version": 1 + }, + { + "git-tree": "f4b5156fc9604848b9aa627ef0bf7ab21e9ad5ac", + "version-string": "1.0.0-alpha.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cmakerc.json b/externals/vcpkg/versions/c-/cmakerc.json new file mode 100755 index 000000000..fc2a9fb61 --- /dev/null +++ b/externals/vcpkg/versions/c-/cmakerc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "740fd9bb83e79eba29ccd69546d2b3105d719d5d", + "version-date": "2021-08-27", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cmark.json b/externals/vcpkg/versions/c-/cmark.json new file mode 100755 index 000000000..2ae2ccef7 --- /dev/null +++ b/externals/vcpkg/versions/c-/cmark.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "63d8e9056589a885ec4a36ba739903199206fff1", + "version-semver": "0.30.1", + "port-version": 0 + }, + { + "git-tree": "0cda97dbc7324b408739f53f493316af44dcaaf6", + "version-string": "0.29.0", + "port-version": 1 + }, + { + "git-tree": "64a4cd4c7db7d6aed511c8cdbac1b8339093ea4b", + "version-string": "0.29.0", + "port-version": 0 + }, + { + "git-tree": "e6049400752f6211b738f040231e96af36a6ab33", + "version-string": "0.28.3-3", + "port-version": 0 + }, + { + "git-tree": "c42765ed8387ebc52ce3541b517f2ad001e48279", + "version-string": "0.28.3-2", + "port-version": 0 + }, + { + "git-tree": "86267aab8dd3e577c54c787719e23835bb386e21", + "version-string": "0.28.3-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cmcstl2.json b/externals/vcpkg/versions/c-/cmcstl2.json new file mode 100755 index 000000000..21a166007 --- /dev/null +++ b/externals/vcpkg/versions/c-/cmcstl2.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "b42b47d62175c38caf3f6b8f31256bb316284734", + "version-string": "2019-07-20", + "port-version": 1 + }, + { + "git-tree": "bf1ca5917946395732a4553392212ddb0e4296c1", + "version-string": "2019-07-20", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cminpack.json b/externals/vcpkg/versions/c-/cminpack.json new file mode 100755 index 000000000..5ea16de6d --- /dev/null +++ b/externals/vcpkg/versions/c-/cminpack.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "6e903be11f8d868d5fb74f597bc0d2890854eb95", + "version": "1.3.8", + "port-version": 1 + }, + { + "git-tree": "aa9af4c20d069d7b14c99b5877fd782255cde21e", + "version": "1.3.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cmocka.json b/externals/vcpkg/versions/c-/cmocka.json new file mode 100755 index 000000000..c1b208e9c --- /dev/null +++ b/externals/vcpkg/versions/c-/cmocka.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "7b4b3515ae508de2f3eccb509948e8ed20eb877e", + "version-string": "2020-08-01", + "port-version": 1 + }, + { + "git-tree": "feb5623c3cdb647c97be873f2a625468305d8a5d", + "version-string": "2020-08-01", + "port-version": 0 + }, + { + "git-tree": "0dd7932405f9c83f0e219cd865c04784609f0339", + "version-string": "1.1.5", + "port-version": 3 + }, + { + "git-tree": "145824db7ad861a4451397515288da776d3dc464", + "version-string": "1.1.5", + "port-version": 2 + }, + { + "git-tree": "392e863a956094948feb621f3b0f8600ffeb4be4", + "version-string": "1.1.5-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cnats.json b/externals/vcpkg/versions/c-/cnats.json new file mode 100755 index 000000000..60faf07f0 --- /dev/null +++ b/externals/vcpkg/versions/c-/cnats.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ab962ebd7a13f87db7aea528cd4d5725b4fde292", + "version": "3.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cnl.json b/externals/vcpkg/versions/c-/cnl.json new file mode 100755 index 000000000..a7f667331 --- /dev/null +++ b/externals/vcpkg/versions/c-/cnl.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "3fe1aa7188d2e673265a0c1f20616bdf647c7390", + "version-string": "1.1.7", + "port-version": 1 + }, + { + "git-tree": "645e64c52fc7d6d9570376aba9c684ca45038f54", + "version-string": "1.1.7", + "port-version": 0 + }, + { + "git-tree": "4778a9818faef4bfac563accbca398763a725cfc", + "version-string": "2019-06-23", + "port-version": 0 + }, + { + "git-tree": "463ac0214681e010d4369a6b21f36d651fb7daf4", + "version-string": "2019-01-09", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/co.json b/externals/vcpkg/versions/c-/co.json new file mode 100755 index 000000000..f5291d2e2 --- /dev/null +++ b/externals/vcpkg/versions/c-/co.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "569af78fe06ff14cd71ec70f14915d06344ed62b", + "version-semver": "2.0.3", + "port-version": 1 + }, + { + "git-tree": "812bf72c24739504b6ddc3d3c4d941981ff3a032", + "version-semver": "2.0.3", + "port-version": 0 + }, + { + "git-tree": "b2b668ad241e0a4453f7a4f0a7c0b35e8c922e3b", + "version-semver": "2.0.2", + "port-version": 1 + }, + { + "git-tree": "2b21d0aa5397dedda9219671af687afacab91a6c", + "version-semver": "2.0.2", + "port-version": 0 + }, + { + "git-tree": "c9f30ca17733d2c0f4b071ca90d6500c456ac7d0", + "version-semver": "2.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cocoyaxi.json b/externals/vcpkg/versions/c-/cocoyaxi.json new file mode 100755 index 000000000..55eaafec0 --- /dev/null +++ b/externals/vcpkg/versions/c-/cocoyaxi.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "991d1f948e96ec46e60f5d6925a825d63599eb44", + "version-semver": "2.0.3", + "port-version": 2 + }, + { + "git-tree": "5d874995d9ab680be3c0bb8d18ceebfd9485f1bd", + "version-semver": "2.0.3", + "port-version": 1 + } + ] +} diff --git a/externals/vcpkg/versions/c-/coin.json b/externals/vcpkg/versions/c-/coin.json new file mode 100755 index 000000000..006d2f924 --- /dev/null +++ b/externals/vcpkg/versions/c-/coin.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "e974f1b74758c3af03beefadef6f060437a2af69", + "version-string": "4.0.0", + "port-version": 5 + }, + { + "git-tree": "e5bf7296f7f3b3655c946280754bbbfbbbf9db2a", + "version-string": "4.0.0", + "port-version": 4 + }, + { + "git-tree": "e30ae46d4c197521650caf4ca0b407d8f50655e9", + "version-string": "4.0.0", + "port-version": 3 + }, + { + "git-tree": "cb2008a3d6429f3ff34e3fd3b5e72153f29f36e6", + "version-string": "4.0.0", + "port-version": 2 + }, + { + "git-tree": "63dc609564e196e6e5bae206da6790da3ab72bcf", + "version-string": "4.0.0", + "port-version": 1 + }, + { + "git-tree": "f8177462d3f2f6892e475ba8f89390d2ab479bab", + "version-string": "4.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/coinutils.json b/externals/vcpkg/versions/c-/coinutils.json new file mode 100755 index 000000000..5bcc434ce --- /dev/null +++ b/externals/vcpkg/versions/c-/coinutils.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "eee28965c61a5dae6407b3f93bbd945b7992537d", + "version-string": "2.11.4", + "port-version": 1 + }, + { + "git-tree": "18e68cecf80c5ee106b7e3819ea2a17bfb0a1b5a", + "version-string": "2.11.4", + "port-version": 0 + }, + { + "git-tree": "5b96c74da5d25b5a90acadd0ec6dd0ae3963c4cf", + "version-string": "2.11.2-2", + "port-version": 0 + }, + { + "git-tree": "c7bc7d7b8b79bfd8a0cdd1528a3903e6067ba276", + "version-string": "2.11.2-1", + "port-version": 0 + }, + { + "git-tree": "947055f96054850e91f7219eb9faf417a17c9f74", + "version-string": "2.11.2", + "port-version": 0 + }, + { + "git-tree": "c73711fa0f35ff1a03915de759029a07f31dba3f", + "version-string": "2.10.14-1", + "port-version": 0 + }, + { + "git-tree": "d4037100e6763f2a3557ca583a3a298611ffaea9", + "version-string": "2.10.14-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/collada-dom.json b/externals/vcpkg/versions/c-/collada-dom.json new file mode 100755 index 000000000..05ec0b2a7 --- /dev/null +++ b/externals/vcpkg/versions/c-/collada-dom.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "c33581459a51d5ef7cc436a8aebb9d330224a6f3", + "version-string": "2.5.0", + "port-version": 6 + }, + { + "git-tree": "478639eba0f0d87ac17cf3b28a072edaeed35ca5", + "version-string": "2.5.0", + "port-version": 5 + }, + { + "git-tree": "f4daab646db5e1ac2332133fd45ef8dc98b0a017", + "version-string": "2.5.0", + "port-version": 4 + }, + { + "git-tree": "f53be121329578c16d057a2019a9ced1bbb24457", + "version-string": "2.5.0-3", + "port-version": 0 + }, + { + "git-tree": "f2a6731ce68c7c026f823f44a610574383f43eaa", + "version-string": "2.5.0-2", + "port-version": 0 + }, + { + "git-tree": "ba37824fd88d9f09a227ca81b84befd5ac9266f0", + "version-string": "2.5.0-1", + "port-version": 0 + }, + { + "git-tree": "f0552350082d5e21a81cb7603db97786ac26750b", + "version-string": "2.5.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/colmap.json b/externals/vcpkg/versions/c-/colmap.json new file mode 100755 index 000000000..3f00dddf1 --- /dev/null +++ b/externals/vcpkg/versions/c-/colmap.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "bf74fe8bdad103c3212e029ac7e736c759be2aa8", + "version-date": "2022-03-14", + "port-version": 0 + }, + { + "git-tree": "81329023ad5f9b2bd27554d2d8a97f8e63aef708", + "version-string": "3.7", + "port-version": 0 + }, + { + "git-tree": "7d3a2a8f71b464856f91f3b8b7e2362ec27d6487", + "version-string": "3.6", + "port-version": 2 + }, + { + "git-tree": "1f88c10f0bc3819bae7c197375bba335106726f1", + "version-string": "3.6", + "port-version": 1 + }, + { + "git-tree": "e2d108b4334d41c2cc500c5dfe4c389127a46220", + "version-string": "3.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/color-console.json b/externals/vcpkg/versions/c-/color-console.json new file mode 100755 index 000000000..cbeded048 --- /dev/null +++ b/externals/vcpkg/versions/c-/color-console.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bdd7720df549670e50ef636219b7d093f7cc8bc6", + "version-date": "2022-03-20", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/comms-ublox.json b/externals/vcpkg/versions/c-/comms-ublox.json new file mode 100755 index 000000000..bde81cf2d --- /dev/null +++ b/externals/vcpkg/versions/c-/comms-ublox.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "9d57cdb7ee417cb5e5ed0208d3d9470b79c80f2a", + "version-semver": "0.20.2", + "port-version": 0 + }, + { + "git-tree": "5d9d9c8e99627bcea62fc1ba2cd9fc496f64a3d2", + "version-semver": "0.20.1", + "port-version": 0 + }, + { + "git-tree": "c54bc435620cecd7569ad27d615728b82d7f1c39", + "version-string": "0.20.0", + "port-version": 1 + }, + { + "git-tree": "d7f6b9039e26695d21306b82b805ae057614b8b4", + "version-string": "0.20.0", + "port-version": 0 + }, + { + "git-tree": "96f06165036235d78178de38c1223b7f16d9cb9c", + "version-string": "0.19.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/comms.json b/externals/vcpkg/versions/c-/comms.json new file mode 100755 index 000000000..358460579 --- /dev/null +++ b/externals/vcpkg/versions/c-/comms.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "377ae2ef208c319a5b1360f6dbce38ddae897466", + "version-semver": "3.4.0", + "port-version": 1 + }, + { + "git-tree": "05c5eff9612ccbb544cdcbc8f453e12394956ed8", + "version-semver": "3.4.0", + "port-version": 0 + }, + { + "git-tree": "3ebf2c0d025a1facfe7ea9e9418e631d3015f532", + "version-semver": "3.3.0", + "port-version": 0 + }, + { + "git-tree": "57fe5d80da8143076de8b7bb17a0ad9b6fc0cf5b", + "version-semver": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "fb4f92eb981baa5bc5b85e2362c513848af83c52", + "version-semver": "3.1.4", + "port-version": 0 + }, + { + "git-tree": "f767daddd556d8848fe375b07293c5df62a3bd9b", + "version-string": "3.1.3", + "port-version": 1 + }, + { + "git-tree": "35063dc22c382a2460a0f5ee1131c5e5b55dbd4a", + "version-string": "3.1.3", + "port-version": 0 + }, + { + "git-tree": "7d5791ad7c86f0bb680c22887f909d1820ee2d23", + "version-string": "3.1.2", + "port-version": 0 + }, + { + "git-tree": "e61903231d55ee3580267fb805b93de0cb42e2e6", + "version-string": "3.1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/commsdsl.json b/externals/vcpkg/versions/c-/commsdsl.json new file mode 100755 index 000000000..44b2e2593 --- /dev/null +++ b/externals/vcpkg/versions/c-/commsdsl.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "6dc397dcd2267999f4c8d34fabd9a7e2dcf48ced", + "version-semver": "3.6.4", + "port-version": 1 + }, + { + "git-tree": "0e714012afcd0c56b2b55f6ab18b0092f6cd0066", + "version-semver": "3.6.4", + "port-version": 0 + }, + { + "git-tree": "76aec94b428a3078c9135d05a46747c86cc24c7c", + "version-semver": "3.6.3", + "port-version": 0 + }, + { + "git-tree": "bec82cc5342cd706af3d35c95a734c4fce0151ce", + "version-semver": "3.6.2", + "port-version": 0 + }, + { + "git-tree": "014e972b792fdc47a14d60c1f8a54949f75a9495", + "version-semver": "3.6.1", + "port-version": 0 + }, + { + "git-tree": "7e27fe7eb3c6be733037eeceefbb7c1805974e30", + "version-string": "3.6.0", + "port-version": 1 + }, + { + "git-tree": "2ee87822b95d40f9663a8be40ba32b600609c639", + "version-string": "3.6.0", + "port-version": 0 + }, + { + "git-tree": "41af4565962cba1d1115dbde4903f0843530430f", + "version-string": "3.5.4", + "port-version": 0 + }, + { + "git-tree": "59d95afa8f69a045fe5a353995cdbd72ec1d5a9b", + "version-string": "3.5.3", + "port-version": 0 + }, + { + "git-tree": "8ffb0156aa811d2537c57b901a9a44023051cf1e", + "version-string": "3.5.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/compoundfilereader.json b/externals/vcpkg/versions/c-/compoundfilereader.json new file mode 100755 index 000000000..ad7e95509 --- /dev/null +++ b/externals/vcpkg/versions/c-/compoundfilereader.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b91bf9e4b5d94c93ac2ffdfc8785c2ec4d99c9ec", + "version": "0.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/concurrencpp.json b/externals/vcpkg/versions/c-/concurrencpp.json new file mode 100755 index 000000000..9f314987f --- /dev/null +++ b/externals/vcpkg/versions/c-/concurrencpp.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "180b2c3ae47ddd4832fd3d6f8359728a6eda1094", + "version": "0.1.4", + "port-version": 0 + }, + { + "git-tree": "a6aa7450d44761622be41ef803ef3b92c6388f23", + "version-string": "0.1.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/concurrentqueue.json b/externals/vcpkg/versions/c-/concurrentqueue.json new file mode 100755 index 000000000..444fe721b --- /dev/null +++ b/externals/vcpkg/versions/c-/concurrentqueue.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "929e70702c63103c0ec48d7de8cfe3da02f699ba", + "version": "1.0.3", + "port-version": 0 + }, + { + "git-tree": "c3ff6de6bf5fe5a62c4fc71aa6b58aff79d246d2", + "version-string": "1.0.2", + "port-version": 0 + }, + { + "git-tree": "03df55152da84b4ecc523cde6dedd0c5adc3f037", + "version-string": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "52fff0951458b77ebab611dc674a0e374332c572", + "version-string": "1.0.0-beta-dea078c", + "port-version": 0 + }, + { + "git-tree": "52dbb3f673dc60771f666b98365db3ea70bdfb94", + "version-string": "1.0.0-beta", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/console-bridge.json b/externals/vcpkg/versions/c-/console-bridge.json new file mode 100755 index 000000000..92630d691 --- /dev/null +++ b/externals/vcpkg/versions/c-/console-bridge.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "e5f1141775543ea0491358a281840ce2bcc100be", + "version-semver": "1.0.2", + "port-version": 0 + }, + { + "git-tree": "d73bd3ef8f9afac3c1f5957eda4ff760cea5b17c", + "version-string": "1.0.1", + "port-version": 2 + }, + { + "git-tree": "d6e04ef880522a8fedfe59bee4081441332fb937", + "version-string": "1.0.1", + "port-version": 1 + }, + { + "git-tree": "ccd84d2fb891ccf98a90476689b6c858a0e24098", + "version-string": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "b4cb5b4c685cc493ac9cb1f61d631318367d0184", + "version-string": "0.4.4", + "port-version": 0 + }, + { + "git-tree": "7f91110bdaaae815030c2a730853ee2bc06e3711", + "version-string": "0.4.3-2", + "port-version": 0 + }, + { + "git-tree": "199568cd689ad1966f129685698b4a5fffc5229f", + "version-string": "0.4.3-1", + "port-version": 0 + }, + { + "git-tree": "d1f4084a37d97521a69a8ca531daefc95052e5f6", + "version-string": "0.3.2-4", + "port-version": 0 + }, + { + "git-tree": "ff3c0a6f49008ee59f7cd64b35fa830c4093c36c", + "version-string": "0.3.2-3", + "port-version": 0 + }, + { + "git-tree": "26f69f04a42829d689b1f51521fa199dc9f36327", + "version-string": "0.3.2-2", + "port-version": 0 + }, + { + "git-tree": "f48f54e29f481ce2850db52f346b6104e6042946", + "version-string": "0.3.2-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/constexpr-contracts.json b/externals/vcpkg/versions/c-/constexpr-contracts.json new file mode 100755 index 000000000..7a711ef7c --- /dev/null +++ b/externals/vcpkg/versions/c-/constexpr-contracts.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "0fcdc4b7a9e49416833b834a6be2c17254a7e9c7", + "version-string": "2020-08-09", + "port-version": 1 + }, + { + "git-tree": "fd80e997ec7b9870af5d3872d02be03b36e1c50f", + "version-string": "2020-08-09", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/constexpr.json b/externals/vcpkg/versions/c-/constexpr.json new file mode 100755 index 000000000..d5b38750f --- /dev/null +++ b/externals/vcpkg/versions/c-/constexpr.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "c3d2008ccf999119285610e0a76ed0c46c59632b", + "version": "1.0", + "port-version": 3 + }, + { + "git-tree": "26c459ddb2becb06ea5c1fcb7a55e282b2aae704", + "version-string": "1.0", + "port-version": 2 + }, + { + "git-tree": "e9a01ad3c59cf253ec364331beb22ff697739f8e", + "version-string": "1.0-1", + "port-version": 0 + }, + { + "git-tree": "9992deb4033ceedce33caad72d7a887817ff3df9", + "version-string": "1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/continuable.json b/externals/vcpkg/versions/c-/continuable.json new file mode 100755 index 000000000..5fe257e77 --- /dev/null +++ b/externals/vcpkg/versions/c-/continuable.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d014250505dde9759c6e46aa6825115bfdd5a15c", + "version-string": "4.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/convectionkernels.json b/externals/vcpkg/versions/c-/convectionkernels.json new file mode 100755 index 000000000..3595b1b80 --- /dev/null +++ b/externals/vcpkg/versions/c-/convectionkernels.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "cf21fe054d62c4602edd8566bb5d2f92b1bc1734", + "version-date": "2022-06-08", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/coolprop.json b/externals/vcpkg/versions/c-/coolprop.json new file mode 100755 index 000000000..7c9baee71 --- /dev/null +++ b/externals/vcpkg/versions/c-/coolprop.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "61676b5a1e9b82c4b88fd3bf37b684f592f9103e", + "version-semver": "6.4.1", + "port-version": 1 + }, + { + "git-tree": "5b29615cb7e9dffd253398cd0d7d06a9b9b9fcb2", + "version-string": "6.4.1", + "port-version": 0 + }, + { + "git-tree": "80fb6d7f66ff93d08f1db76ccaeed25132d5e4dc", + "version-string": "6.1.0-5", + "port-version": 0 + }, + { + "git-tree": "d224ff6f1aecff5b4de877827df14bf4e4e51725", + "version-string": "6.1.0-4", + "port-version": 0 + }, + { + "git-tree": "9957f6c15695a63c227d9007b4ce950ac4594498", + "version-string": "6.1.0-3", + "port-version": 0 + }, + { + "git-tree": "4869e3d639e900ab526b258fd5d684fb00a1f432", + "version-string": "6.1.0-2", + "port-version": 0 + }, + { + "git-tree": "0fd1734f0cb259d9911c97f1486522de51501a10", + "version-string": "6.1.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/coroutine.json b/externals/vcpkg/versions/c-/coroutine.json new file mode 100755 index 000000000..9f4f3905a --- /dev/null +++ b/externals/vcpkg/versions/c-/coroutine.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "c1ce0f42bbf3898d3421a3c7b6494f69853385f5", + "version": "1.5.0", + "port-version": 4 + }, + { + "git-tree": "d6cef429d17c011260cd718a2738ec7282098866", + "version": "1.5.0", + "port-version": 3 + }, + { + "git-tree": "14f8ad97489e980329f98d4c95146dafb32cedb9", + "version-string": "1.5.0", + "port-version": 2 + }, + { + "git-tree": "da458b763cbbbbba0acf20b1895ddd4ee4ff8d0b", + "version-string": "1.5.0", + "port-version": 1 + }, + { + "git-tree": "d9b9fe1d75f4154810f944accc760250ca6b5c8b", + "version-string": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "e314079f32680af6dbf65a83961333a105365620", + "version-string": "2020-01-13", + "port-version": 0 + }, + { + "git-tree": "56729270f8d2294018155cc9b50f19fcc86a8711", + "version-string": "1.4.3", + "port-version": 0 + }, + { + "git-tree": "1b4080bd0c5fbcc57c71c8398e8ef06866124c3e", + "version-string": "1.4.1-1", + "port-version": 0 + }, + { + "git-tree": "3b4aa6029e45c8149674e3a0e62058f57990ef4a", + "version-string": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "babe3bac4e7332b1e6a5fc1a9b97eedbfacd2b2b", + "version-string": "1.4.0-1", + "port-version": 0 + }, + { + "git-tree": "9846cd5a1690ac97f0940798a5c980080659ed4d", + "version-string": "1.4.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/corrade.json b/externals/vcpkg/versions/c-/corrade.json new file mode 100755 index 000000000..f32bd03b9 --- /dev/null +++ b/externals/vcpkg/versions/c-/corrade.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "91ad9b127c41c0538051a0c81e2cb9206a2587dd", + "version-string": "2020.06", + "port-version": 4 + }, + { + "git-tree": "087770e2a196c44cb1b56473bd57797ed9b9bc87", + "version-string": "2020.06", + "port-version": 3 + }, + { + "git-tree": "ec9f53411152ed98e9d591afed7e34e65fb7abeb", + "version-string": "2020.06", + "port-version": 2 + }, + { + "git-tree": "12cd1f62edbe4e05de794c862facfdfd0fe8171d", + "version-string": "2020.06", + "port-version": 1 + }, + { + "git-tree": "f96e0a1ac4f3b72bedf9f1bf099bb91cceba0456", + "version-string": "2020.06", + "port-version": 0 + }, + { + "git-tree": "e62f81f5559a5c1075ebf2b1917d52ebe437268d", + "version-string": "2019.10-1", + "port-version": 0 + }, + { + "git-tree": "a3d5befb3385358ea9aa93837971f7a752a04199", + "version-string": "2019.10", + "port-version": 0 + }, + { + "git-tree": "ce6e9d237104dd8fe2b1dd628d63e952a5725ca4", + "version-string": "2019.01-1", + "port-version": 0 + }, + { + "git-tree": "7050d3a4e544bd339b8af51c0413b6711faaa85a", + "version-string": "2018.10-2", + "port-version": 0 + }, + { + "git-tree": "29cbc467fe04662c2f9e67cf81266f10b0ef35a9", + "version-string": "2018.10-1", + "port-version": 0 + }, + { + "git-tree": "1567bb131df07f7783449b9c2bc18f13a4d6b699", + "version-string": "2018.04-1", + "port-version": 0 + }, + { + "git-tree": "6623e1833545fdcff44e74d4d605f9fa7e9fda5f", + "version-string": "2018.02-1", + "port-version": 0 + }, + { + "git-tree": "168c2aeb500f28c5bc65759ef1ad12bd0095ad2a", + "version-string": "jan2018-1", + "port-version": 0 + }, + { + "git-tree": "a9528d7b8c661cfe7b8ca3d77ce98ac54a3c2a83", + "version-string": "jun2017-3", + "port-version": 0 + }, + { + "git-tree": "ca4dcbe6376bb92154632e96d73ede86582cfca3", + "version-string": "jun2017-2", + "port-version": 0 + }, + { + "git-tree": "fcf193b7e759b5a06fbeb9b83a1831e2a5c1ed80", + "version-string": "jun2017-1", + "port-version": 0 + }, + { + "git-tree": "d3dbea489cf5899780b71097ef614cab4607d44e", + "version-string": "jun2017", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cpp-base64.json b/externals/vcpkg/versions/c-/cpp-base64.json new file mode 100755 index 000000000..40832aed7 --- /dev/null +++ b/externals/vcpkg/versions/c-/cpp-base64.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "7ca4d0099c51fb3855c1a4def762aeb55c9fee0c", + "version-string": "V2.rc.08", + "port-version": 0 + }, + { + "git-tree": "e25f62c15f68a721ee74c0739e3cbafbd76efa40", + "version-string": "2019-06-19", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cpp-httplib.json b/externals/vcpkg/versions/c-/cpp-httplib.json new file mode 100755 index 000000000..cd1162b97 --- /dev/null +++ b/externals/vcpkg/versions/c-/cpp-httplib.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "48c366ec15c570dbd1968b288649d2c33ce6ca08", + "version": "0.10.7", + "port-version": 0 + }, + { + "git-tree": "55de9c78120ee08fc96d9a6badab8e1d137ab36a", + "version": "0.10.3", + "port-version": 0 + }, + { + "git-tree": "bfee573e08d3e240e345491ca8e9df1d4f86b05c", + "version": "0.9.7", + "port-version": 0 + }, + { + "git-tree": "46525b4cf2481e5bd66df0899c0c1fd4f05a0c33", + "version": "0.9.4", + "port-version": 0 + }, + { + "git-tree": "9554bdd56e3c787d40e20b63582d3b5efbaf4f2f", + "version": "0.9.1", + "port-version": 0 + }, + { + "git-tree": "c89a8ff559756338dc330c1845a0b6b3ccd3a9e6", + "version": "0.8.9", + "port-version": 0 + }, + { + "git-tree": "fb5ea9d8cb5c86ca6924539fb32a8d9c43e0faa7", + "version-string": "0.8.6", + "port-version": 0 + }, + { + "git-tree": "809d4b6bc7857c3f787172729508b9af6d11ef78", + "version-string": "0.8.4", + "port-version": 0 + }, + { + "git-tree": "c91293d5ebdef52d74de927342c75230d17f741f", + "version-string": "0.7.18", + "port-version": 0 + }, + { + "git-tree": "f52415b469f9fd27f775790663ba6f266a0b661c", + "version-string": "0.7.15", + "port-version": 0 + }, + { + "git-tree": "dbf92e33069d9fc4c7dfea6912f7f7550f11bc7a", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "8d0e8947058383eb72fa7da6420bbfee6602fd15", + "version-string": "0.5.1", + "port-version": 0 + }, + { + "git-tree": "ab5517f200506396decd501341aa7c363d1369e4", + "version-string": "0.4.2", + "port-version": 0 + }, + { + "git-tree": "4f8b66a4aca6e3002ea45a980d0ec353e6796683", + "version-string": "0.2.5", + "port-version": 0 + }, + { + "git-tree": "bbb55a9d1fbf4018816b149dc58fc7a2a827f515", + "version-string": "0.2.4", + "port-version": 0 + }, + { + "git-tree": "df7b1057a9c38a9b1d87a4f9ed5a963699dfa10c", + "version-string": "0.2.2", + "port-version": 0 + }, + { + "git-tree": "0085261f79efd1bba7173fa94be5f80c411a54e8", + "version-string": "0.2.1", + "port-version": 0 + }, + { + "git-tree": "58a5df37f5e58df734fa316eb9b8506b5c048d97", + "version-string": "0.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cpp-ipc.json b/externals/vcpkg/versions/c-/cpp-ipc.json new file mode 100755 index 000000000..53f75c34f --- /dev/null +++ b/externals/vcpkg/versions/c-/cpp-ipc.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "e86c1547d0be3d2acbe7cebdb799f24359c29e85", + "version": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "86a57c4fce501c6a9bcde5728ea6787b7425176a", + "version": "1.0.1", + "port-version": 1 + }, + { + "git-tree": "28482723c3bf4c785828c44d7df79bb901404afd", + "version": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "a54fbdb4b0fa6b820b1f6a55004f5622f3c02941", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cpp-jwt.json b/externals/vcpkg/versions/c-/cpp-jwt.json new file mode 100755 index 000000000..fa8158e80 --- /dev/null +++ b/externals/vcpkg/versions/c-/cpp-jwt.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f72451ac7e5d62f249b02f79f6e3c9ef8720fc6b", + "version-date": "2021-10-18", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cpp-netlib.json b/externals/vcpkg/versions/c-/cpp-netlib.json new file mode 100755 index 000000000..448a85849 --- /dev/null +++ b/externals/vcpkg/versions/c-/cpp-netlib.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "49ff4ae830f2e1ae9141ea3155c6d962ca1c7946", + "version-string": "0.13.0", + "port-version": 6 + }, + { + "git-tree": "28abab182be22ac70207027a6a7e206416bd28b0", + "version-string": "0.13.0", + "port-version": 5 + }, + { + "git-tree": "52deb7c24c307a3089b818d3b35bd7b19b1e4dc2", + "version-string": "0.13.0", + "port-version": 4 + }, + { + "git-tree": "8a0b0215fd6f8ac92b1ef9a159531840551c8dbb", + "version-string": "0.13.0-3", + "port-version": 0 + }, + { + "git-tree": "1eec50f9389302cc76df41306d01d955f5a67d22", + "version-string": "0.13.0-2", + "port-version": 0 + }, + { + "git-tree": "b3f4a127b4bb5ce74bc1081465c12c7ab0da1f75", + "version-string": "0.13.0-final", + "port-version": 0 + }, + { + "git-tree": "c87e2c49f00112069635fddc0d0b4b24ce9e3036", + "version-string": "0.13.0-rc3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cpp-peglib.json b/externals/vcpkg/versions/c-/cpp-peglib.json new file mode 100755 index 000000000..9d631ff42 --- /dev/null +++ b/externals/vcpkg/versions/c-/cpp-peglib.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "883e76f3473565fdd800411dfa980eae2e19a131", + "version": "1.3.10", + "port-version": 0 + }, + { + "git-tree": "4c276ee41b27be78ffa392f24e371e9893b43c93", + "version-string": "0.1.0", + "port-version": 1 + }, + { + "git-tree": "bd023f488fbfc178695bdab57978bf6fd8db5750", + "version-string": "0.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cpp-redis.json b/externals/vcpkg/versions/c-/cpp-redis.json new file mode 100755 index 000000000..e280eaa7f --- /dev/null +++ b/externals/vcpkg/versions/c-/cpp-redis.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "9714d8cf0b5557d4362f54f0906295b10a154832", + "version": "4.3.1", + "port-version": 5 + }, + { + "git-tree": "5ba5958862c17ab2f3943b0134b2ad756ae73613", + "version-string": "4.3.1", + "port-version": 4 + }, + { + "git-tree": "f412f0e14f585bccfec1add71fd23ad9ea8f1f9f", + "version-string": "4.3.1", + "port-version": 3 + }, + { + "git-tree": "6e73617915b055400da154a55b8c3682a0ace51c", + "version-string": "4.3.1-2", + "port-version": 0 + }, + { + "git-tree": "69f9fe97f257cb03b1d3746e4ac9a5a020044b47", + "version-string": "4.3.1-1", + "port-version": 0 + }, + { + "git-tree": "1aecbff26478a3de6098ab3e954253cb905c442d", + "version-string": "4.3.1", + "port-version": 0 + }, + { + "git-tree": "4a6ab5d4e38191cfd6a56d1ec63a65996255d8e9", + "version-string": "4.3.0", + "port-version": 0 + }, + { + "git-tree": "55b68b47bc2b3844eeaa690339d1c497ec8662a4", + "version-string": "3.5.2-2", + "port-version": 0 + }, + { + "git-tree": "c72ae6224b21ed61122f73d8af15cb8f9346e32d", + "version-string": "3.5.2-1", + "port-version": 0 + }, + { + "git-tree": "692097332992307fa26f25c9d6ea9fdfbbcd120f", + "version-string": "3.5.2", + "port-version": 0 + }, + { + "git-tree": "d8c526ede1b8b2f7600e61c540f134b99ed41feb", + "version-string": "3.5.1-1", + "port-version": 0 + }, + { + "git-tree": "e299dadaf41b8f460109f2e8206b4c5cc4a1a2fa", + "version-string": "3.5.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cpp-taskflow.json b/externals/vcpkg/versions/c-/cpp-taskflow.json new file mode 100755 index 000000000..9e6d783e0 --- /dev/null +++ b/externals/vcpkg/versions/c-/cpp-taskflow.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "edbd9a48db629e8b2c264cdd60fba4ca4e218f03", + "version-string": "2.6.0", + "port-version": 1 + }, + { + "git-tree": "b07021eb35b87c012df20b3720bf0ee2743eb5c8", + "version-string": "2.6.0", + "port-version": 0 + }, + { + "git-tree": "4d892699b08144eb75d0a5555ac542b2d9cf2df1", + "version-string": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "8b8b9c6b78b27e5a058c1e46a560acc8bf26a59c", + "version-string": "2.2.0-1", + "port-version": 0 + }, + { + "git-tree": "34bd6dbd41ae1167b83f6576897a407515a18821", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "c94fc4051157f810125817baf9914fc95a137327", + "version-string": "2018-11-30", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cpp-timsort.json b/externals/vcpkg/versions/c-/cpp-timsort.json new file mode 100755 index 000000000..9dc9431e1 --- /dev/null +++ b/externals/vcpkg/versions/c-/cpp-timsort.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f04e9f0c24e916697a6451b43cf16a2423019635", + "version": "2.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cppad.json b/externals/vcpkg/versions/c-/cppad.json new file mode 100755 index 000000000..ace126b5f --- /dev/null +++ b/externals/vcpkg/versions/c-/cppad.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "e05a071cbc00d0343c57c70c2b0b043d570f8627", + "version-string": "20210000.7", + "port-version": 3 + }, + { + "git-tree": "5ec54e982dd160ae43272613536a53de6884d6d4", + "version-string": "20210000.7", + "port-version": 2 + }, + { + "git-tree": "fd043aed2197ac43f337a7806061460728cf56a8", + "version-string": "20210000.7", + "port-version": 1 + }, + { + "git-tree": "00e184c8de4368f8ee0b6b5dd0c16034d7a99a8f", + "version-string": "20210000.7", + "port-version": 0 + }, + { + "git-tree": "f03801828709574ede2215d05d984764cc271a18", + "version-string": "20200000.3", + "port-version": 1 + }, + { + "git-tree": "b18a6d765c26ff523ffec8761974e16343935e79", + "version-string": "20200000.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cppcms.json b/externals/vcpkg/versions/c-/cppcms.json new file mode 100755 index 000000000..b476ab542 --- /dev/null +++ b/externals/vcpkg/versions/c-/cppcms.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "05ef150cab0e8f56bd4f06b41baa9125d94e3451", + "version-string": "1.2.1", + "port-version": 4 + }, + { + "git-tree": "9582485ed72df7ad43d20b3680e13eaeb76f76e7", + "version-string": "1.2.1", + "port-version": 3 + }, + { + "git-tree": "d05a10e23b006a8c29e74810a7062f7f13bae6da", + "version-string": "1.2.1", + "port-version": 2 + }, + { + "git-tree": "5759a8eadf7334bdac9cfd467786a7f178ce2b65", + "version-string": "1.2.1-1", + "port-version": 0 + }, + { + "git-tree": "0fcc8a66b1985d0eb5438de868d2117465286d79", + "version-string": "1.2.1", + "port-version": 0 + }, + { + "git-tree": "108a211292ada68ac2b2fba6977d4c06a74461f8", + "version-string": "1.1.0-2", + "port-version": 0 + }, + { + "git-tree": "bbf85ac89ed48da6cb54c6245e68dfd806754c63", + "version-string": "1.1.0-1", + "port-version": 0 + }, + { + "git-tree": "38fe906677326d42240faa24a5aa987fb78f4df3", + "version-string": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cppcodec.json b/externals/vcpkg/versions/c-/cppcodec.json new file mode 100755 index 000000000..bfdbbaccc --- /dev/null +++ b/externals/vcpkg/versions/c-/cppcodec.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "cb6b230ec592ba7bc54d85013007f501971f03fa", + "version-string": "0.2", + "port-version": 2 + }, + { + "git-tree": "9546342ff5d08d76abe6774215ae78778494eb55", + "version-string": "0.2", + "port-version": 1 + }, + { + "git-tree": "a31ff53a915e7fd45a3d7ada497f363ead024e71", + "version-string": "0.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cppcoro.json b/externals/vcpkg/versions/c-/cppcoro.json new file mode 100755 index 000000000..5febcb385 --- /dev/null +++ b/externals/vcpkg/versions/c-/cppcoro.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "76350a224261bfe57c726e6f3a022d925cb26606", + "version-date": "2020-02-28", + "port-version": 3 + }, + { + "git-tree": "a9788359b921d309c2982f3f190ac9cb8583f28a", + "version-string": "2020-2-28", + "port-version": 2 + }, + { + "git-tree": "3ef6ef3cc3d6a50556d72ff1cd2c9f29e72d9769", + "version-string": "2020-2-28-1", + "port-version": 0 + }, + { + "git-tree": "28e22062a5885a689dbfddafae18907a7ed33c71", + "version-string": "2020-2-28", + "port-version": 0 + }, + { + "git-tree": "05da039516c924cb2ea4519cb311997d59f284e0", + "version-string": "2020.2", + "port-version": 0 + }, + { + "git-tree": "e974868f0f8b8eddc3f983f9546122159d498ed5", + "version-string": "2020.04", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cppfs.json b/externals/vcpkg/versions/c-/cppfs.json new file mode 100755 index 000000000..f3ef26ddd --- /dev/null +++ b/externals/vcpkg/versions/c-/cppfs.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "3b904f053fa80033ffa454148ff60a3504f8c57f", + "version-string": "1.3.0", + "port-version": 1 + }, + { + "git-tree": "9ba2e6a6be415048178367ecb17357c8c089fe76", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "bddd082629e8df8adcdc4fd95691fafca65be0a2", + "version-string": "1.2.0-1", + "port-version": 0 + }, + { + "git-tree": "4c351e3f8fa1c6e8bdbbd1568a5d334d1eb12986", + "version-string": "1.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cppgraphqlgen.json b/externals/vcpkg/versions/c-/cppgraphqlgen.json new file mode 100755 index 000000000..4d56a8c7e --- /dev/null +++ b/externals/vcpkg/versions/c-/cppgraphqlgen.json @@ -0,0 +1,134 @@ +{ + "versions": [ + { + "git-tree": "301c3f2b22160ddfc752b69253cc3745ef4320f8", + "version": "4.5.0", + "port-version": 0 + }, + { + "git-tree": "52eaf92f61791cfb08e2a8848ccbf1c02748f064", + "version": "4.4.1", + "port-version": 0 + }, + { + "git-tree": "7c3acfd5254a4ae0680cc3f96eef630bcaab7b36", + "version": "4.3.1", + "port-version": 0 + }, + { + "git-tree": "c8d2246a2df1d89e380901d0027220ca7a91531d", + "version-semver": "4.2.0", + "port-version": 0 + }, + { + "git-tree": "95b14163e5e6caf3ae1795167c8ea9503c7a8153", + "version-semver": "4.1.1", + "port-version": 0 + }, + { + "git-tree": "23ec5f0002e33dd6c76bab436dec806cfde33235", + "version-semver": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "6f5eb4a891a143e9d56a8e4791fb87da321a561c", + "version-semver": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "0c1dadfa4133064be08120a65fd9e2ed3a339bb8", + "version-semver": "3.6.0", + "port-version": 0 + }, + { + "git-tree": "96ba69c23cf51b45ff8fe1206a3c134b11eed8b7", + "version-semver": "3.5.0", + "port-version": 0 + }, + { + "git-tree": "2aab4f37ff7fc5961bfd7b91197c03d7ceb13a4a", + "version-string": "2020-12-07", + "port-version": 1 + }, + { + "git-tree": "c782c47d82aaf461f25be826dc6e5db982fbfcbe", + "version-string": "2020-12-07", + "port-version": 0 + }, + { + "git-tree": "cbdc16ea22f85a727ec48ce8d7e8d359ef2f5df3", + "version-string": "3.2.4", + "port-version": 0 + }, + { + "git-tree": "5b1b2287a1c76519202ff9c771fd5b742bdb22c0", + "version-string": "3.2.3", + "port-version": 0 + }, + { + "git-tree": "c4cd8f004c6aa884edb1d0399fa27331bd502dfb", + "version-string": "3.2.2", + "port-version": 0 + }, + { + "git-tree": "3026c5caefe5258ec4d56d27e7517c034797bb39", + "version-string": "3.2.1", + "port-version": 0 + }, + { + "git-tree": "499a160a471826a9149c075318fc4d1c66af110e", + "version-string": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "c743b5aa0d542506881287c615b333050504f956", + "version-string": "3.1.1", + "port-version": 0 + }, + { + "git-tree": "e43a98291331105e7f8afbf3f15da23b221eb597", + "version-string": "3.0.4", + "port-version": 0 + }, + { + "git-tree": "358aeec17f0b217b540595bdf41d80a1c1a6392b", + "version-string": "3.0.2", + "port-version": 0 + }, + { + "git-tree": "a73fd5e13009872a82ae7e98348440934d07c3ea", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "82fac752477dd25b7f69a6c18c2f1d8effda159d", + "version-string": "3.0.0-pre", + "port-version": 0 + }, + { + "git-tree": "accff1ec7158de0a00d3f0266b8c67b224c4c273", + "version-string": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "2b511ce7745ab708729cdc0f89e228f43226e0c8", + "version-string": "2.0.2", + "port-version": 0 + }, + { + "git-tree": "620f83ec562fd474124f723f6f175f8025a7f400", + "version-string": "1.0.3", + "port-version": 0 + }, + { + "git-tree": "871c5ac386fa72a877f212882416bd74eab75ae7", + "version-string": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "d6d46aa6911761d7d4d5b8af4043bcc90a83b2a1", + "version-string": "0.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cppitertools.json b/externals/vcpkg/versions/c-/cppitertools.json new file mode 100755 index 000000000..fe5a24f75 --- /dev/null +++ b/externals/vcpkg/versions/c-/cppitertools.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "8373c4fe2df5953309d3fc443ceed59553d35824", + "version": "2.1", + "port-version": 2 + }, + { + "git-tree": "ee578d4182af8702a89a87b361e192d634055352", + "version-string": "2.1", + "port-version": 1 + }, + { + "git-tree": "9b4908a6183e914b33014a6b2f640df56e99d9f0", + "version-string": "2.1", + "port-version": 0 + }, + { + "git-tree": "6f5ac65e92858f04e97468de01d59b60c0eac058", + "version-string": "2.0", + "port-version": 0 + }, + { + "git-tree": "b4f28eea9e6278533d369d168ebcff3306cd9c15", + "version-string": "2019-04-14-3", + "port-version": 0 + }, + { + "git-tree": "517143a7337d455f3a71ef24c530f8b0bc227eb3", + "version-string": "2019-04-14-2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cppkafka.json b/externals/vcpkg/versions/c-/cppkafka.json new file mode 100755 index 000000000..c54ec8a4f --- /dev/null +++ b/externals/vcpkg/versions/c-/cppkafka.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "749993fee4605134bbe7a5e9a451c959519f4dbf", + "version-string": "0.3.1", + "port-version": 3 + }, + { + "git-tree": "93a1c2dd03f298272dbb69df1920b9897adff338", + "version-string": "0.3.1-2", + "port-version": 0 + }, + { + "git-tree": "bf9c72dbf5bd39d235ca8a045d20ec6c8b70758f", + "version-string": "0.3.1-1", + "port-version": 0 + }, + { + "git-tree": "2bd9536d096114471009902f29fd9a47cff3b1b5", + "version-string": "0.3.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cppmicroservices.json b/externals/vcpkg/versions/c-/cppmicroservices.json new file mode 100755 index 000000000..0ab78b620 --- /dev/null +++ b/externals/vcpkg/versions/c-/cppmicroservices.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "df21454215c4d4d1106621ead01a95a199163b60", + "version": "3.6.0", + "port-version": 0 + }, + { + "git-tree": "0462f2f3f6c9bb3e3374b53eccc05adc00417bae", + "version-string": "3.4.0", + "port-version": 3 + }, + { + "git-tree": "70e0b19ff0c3df69f82cc8aed8eb6d4add67bec2", + "version-string": "3.4.0", + "port-version": 2 + }, + { + "git-tree": "601bcc5a44a0093cda891fc3b5b92a9f61e0ed03", + "version-string": "3.4.0-1", + "port-version": 0 + }, + { + "git-tree": "e96000d51bc3b8a826c13033c9da1c6abefb28a7", + "version-string": "v3.4.0", + "port-version": 0 + }, + { + "git-tree": "65158d87c0e23f3f588bd804481f945469c30a87", + "version-string": "4.0.0-pre1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cpprestsdk.json b/externals/vcpkg/versions/c-/cpprestsdk.json new file mode 100755 index 000000000..4855a3314 --- /dev/null +++ b/externals/vcpkg/versions/c-/cpprestsdk.json @@ -0,0 +1,179 @@ +{ + "versions": [ + { + "git-tree": "b37c56224faff461184f427b95f10dc320d74d50", + "version": "2.10.18", + "port-version": 1 + }, + { + "git-tree": "a4c5e50b9a83b6f9142256d1142b371da93db065", + "version-string": "2.10.18", + "port-version": 0 + }, + { + "git-tree": "ff5cd3ae0efdd9346d66c0a1d0623be23eee837c", + "version-string": "2.10.17", + "port-version": 0 + }, + { + "git-tree": "1fb06431492f382bb54834c567db83bcb6cabe0b", + "version-string": "2.10.16-3", + "port-version": 0 + }, + { + "git-tree": "17cb3f7a61a5091087d53dbce2a8c2d328342ee8", + "version-string": "2.10.16-2", + "port-version": 0 + }, + { + "git-tree": "9e6aa1f352765cab12b207b4c195221bdf43c28b", + "version-string": "2.10.16-1", + "port-version": 0 + }, + { + "git-tree": "140c63764a9d13e325b065e30fb119d3f3d010a3", + "version-string": "2.10.16", + "port-version": 0 + }, + { + "git-tree": "e47b918125027860a9fff53282af5b5429019c7b", + "version-string": "2.10.15-1", + "port-version": 0 + }, + { + "git-tree": "2de6826ede1e8e28e1fa1f92afa1aaf0982fcede", + "version-string": "2.10.15", + "port-version": 0 + }, + { + "git-tree": "62ba6e5405bdf0806d8e8408a547e5872b8cba5d", + "version-string": "2.10.14-1", + "port-version": 0 + }, + { + "git-tree": "9f2e01f4c876c5915b7a685fd431a9ad98fb780f", + "version-string": "2.10.14", + "port-version": 0 + }, + { + "git-tree": "338cfcef457aaff1a329f7feeab92e21b9c96e5a", + "version-string": "2.10.13-1", + "port-version": 0 + }, + { + "git-tree": "e35cbfd7d6956d26a77f5cd607b129065856bb82", + "version-string": "2.10.13", + "port-version": 0 + }, + { + "git-tree": "64aa62b7a6fbbcdbb81588d23665a8c9f1e933aa", + "version-string": "2.10.12", + "port-version": 0 + }, + { + "git-tree": "4f987cafc2d3ab844221d48a077a766d9a3ee29e", + "version-string": "2.10.11", + "port-version": 0 + }, + { + "git-tree": "191b71a47f0e6220785677363f5d5cea098b5955", + "version-string": "2.10.10", + "port-version": 0 + }, + { + "git-tree": "2b2d0ceec9678fc5e7db0e7556745d8972395b0e", + "version-string": "2.10.7", + "port-version": 0 + }, + { + "git-tree": "d069e89c749dedcbafcef8f7e81e8b45d0658df2", + "version-string": "2.10.6-3", + "port-version": 0 + }, + { + "git-tree": "172a3a97fcd45e292496211fe91e574176bc66cf", + "version-string": "2.10.6-2", + "port-version": 0 + }, + { + "git-tree": "124a27eb315f4dc7c6239ab7922472e44e9154ec", + "version-string": "2.10.6-1", + "port-version": 0 + }, + { + "git-tree": "4598e0984e115a80d224b3fdf1c93f6af248daff", + "version-string": "2.10.6", + "port-version": 0 + }, + { + "git-tree": "3657c1899d91376fab9f85237f0869eaf7956673", + "version-string": "2.10.5", + "port-version": 0 + }, + { + "git-tree": "564f603510f30b61eae4daa39988950ed7d28bbf", + "version-string": "2.10.4", + "port-version": 0 + }, + { + "git-tree": "01dc05ee45ec6244d05ff645f494d6e9c9a8d109", + "version-string": "2.10.3-1", + "port-version": 0 + }, + { + "git-tree": "46e51015a1c082a2d5c05832ad39924f0470f526", + "version-string": "2.10.2-1", + "port-version": 0 + }, + { + "git-tree": "8431a5fe877e18bb6429a94ae05bf472d116e032", + "version-string": "2.10.2", + "port-version": 0 + }, + { + "git-tree": "78735f0f239560b88ec3ff1edd961a07f8d50e4e", + "version-string": "2.10.1-1", + "port-version": 0 + }, + { + "git-tree": "28426fb1d9d848d07082a0d3e3c7e0496a4c065a", + "version-string": "2.10.1", + "port-version": 0 + }, + { + "git-tree": "589c3b533d10da50f6f69cae7dde72fa78827c4e", + "version-string": "2.10.0", + "port-version": 0 + }, + { + "git-tree": "fa4bd515204c443f85bae314d0913ddc02332756", + "version-string": "2.9.0-4", + "port-version": 0 + }, + { + "git-tree": "0d9a0686badbc54f5ab73213aec95db2dbae88c3", + "version-string": "2.9.0-3", + "port-version": 0 + }, + { + "git-tree": "6696c08718d02424257e824f37b07bff3f54eff4", + "version-string": "2.9.0-2", + "port-version": 0 + }, + { + "git-tree": "c3fe95100142c708c7ba0386d2bb6e4671c3f4ed", + "version-string": "2.9.0-1", + "port-version": 0 + }, + { + "git-tree": "662d0903cce0892f8322bf3a273f865572ed6f31", + "version-string": "2.9.0", + "port-version": 0 + }, + { + "git-tree": "284d94938a84aa0380cf2f2f97c81281a2f0598a", + "version-string": "2.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cpptoml.json b/externals/vcpkg/versions/c-/cpptoml.json new file mode 100755 index 000000000..9f1b40687 --- /dev/null +++ b/externals/vcpkg/versions/c-/cpptoml.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "f99a8c54489e45f171c05fa68d75f8cf5f6103cb", + "version-string": "v0.1.1", + "port-version": 1 + }, + { + "git-tree": "b0520fd38bc9993e9a30a85f703e1a8941375a6c", + "version-string": "v0.1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cppunit.json b/externals/vcpkg/versions/c-/cppunit.json new file mode 100755 index 000000000..46d182a4b --- /dev/null +++ b/externals/vcpkg/versions/c-/cppunit.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "671d125960c9cce11a92b65b8bdfba73f85b09b5", + "version": "1.15.1", + "port-version": 3 + }, + { + "git-tree": "5a65f009e556f249711d69ed679c2b570d9e79db", + "version": "1.15.1", + "port-version": 2 + }, + { + "git-tree": "1384ee0101801f599b23f167aee7cfc733536022", + "version": "1.15.1", + "port-version": 1 + }, + { + "git-tree": "51029930bf5c3a123e0243de6b00ae385b654d5d", + "version-string": "1.15.1", + "port-version": 0 + }, + { + "git-tree": "8a2f0c4d2de8eda873fa115b8947649c79f9bc69", + "version-string": "1.14.0-1", + "port-version": 0 + }, + { + "git-tree": "a5fe83f49ae012a95b89a648009d4a2907211cc7", + "version-string": "1.14.0", + "port-version": 0 + }, + { + "git-tree": "4e658bc0aa6bd89be6d699b632542e1b7e2f603e", + "version-string": "1.13.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cpputest.json b/externals/vcpkg/versions/c-/cpputest.json new file mode 100755 index 000000000..750270e37 --- /dev/null +++ b/externals/vcpkg/versions/c-/cpputest.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "e476f5c4b948489a33c704cbfc42d8ca60ac29e3", + "version-string": "2019-9-16", + "port-version": 2 + }, + { + "git-tree": "4c3ab93d9f7c45b366a5ec0cc1cc3e69d4ef1d5c", + "version-string": "2019-9-16-1", + "port-version": 0 + }, + { + "git-tree": "6bbde7b8c1dbd7e6e226f89c36495cfdb53989d5", + "version-string": "2019-9-16", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cppwinrt.json b/externals/vcpkg/versions/c-/cppwinrt.json new file mode 100755 index 000000000..bdff431eb --- /dev/null +++ b/externals/vcpkg/versions/c-/cppwinrt.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "18d6860cc0a36639fe348d27ab4cb763dfc0e879", + "version": "2.0.220418.1", + "port-version": 0 + }, + { + "git-tree": "191643fbd9c127658cf1724216a3b393951bd68e", + "version-string": "windows-sdk", + "port-version": 0 + }, + { + "git-tree": "a0c036af150f2403027d65dd1edf67912bb15038", + "version-string": "fall_2017_creators_update_for_vs_15.3-2", + "port-version": 0 + }, + { + "git-tree": "74b0e44f3bfbf43e2ce2b6a991ca2e4bb76c38bb", + "version-string": "fall_2017_creators_update_for_vs_15.3-1", + "port-version": 0 + }, + { + "git-tree": "871ffe70cfbe76920953fe524c54b3740ece517f", + "version-string": "fall_2017_creators_update_for_vs_15.3", + "port-version": 0 + }, + { + "git-tree": "3a1d02f146a6a6964bb2bfcce386b32653b4d522", + "version-string": "Fall_2017_Creators_Update_for_VS_15.3", + "port-version": 0 + }, + { + "git-tree": "2543006744c679e58a360a5215a95e8a2d651bfe", + "version-string": "spring_2017_creators_update_for_vs_15.3", + "port-version": 0 + }, + { + "git-tree": "1305a06f0e3f5e2bd2f2da5d15d74b85f1831e34", + "version-string": "feb2017_refresh-14393", + "port-version": 0 + }, + { + "git-tree": "8949a78637f33efc88f24c55d1ad0af28e312536", + "version-string": "1.010.0.14393.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cppxaml.json b/externals/vcpkg/versions/c-/cppxaml.json new file mode 100755 index 000000000..94f9a1ec7 --- /dev/null +++ b/externals/vcpkg/versions/c-/cppxaml.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "57d825ac962df4a92481b82161ea7b7088929a82", + "version": "0.0.16", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cppzmq.json b/externals/vcpkg/versions/c-/cppzmq.json new file mode 100755 index 000000000..36d750c93 --- /dev/null +++ b/externals/vcpkg/versions/c-/cppzmq.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "79921528ad838f11245ebfb6b3f2fe9dc4bdca26", + "version": "4.8.1", + "port-version": 0 + }, + { + "git-tree": "142701d624e76cc4288ddce74c796501ba8cfa57", + "version": "4.7.1", + "port-version": 2 + }, + { + "git-tree": "8f196edc3e7a6d6d26e14162ed542848d1eee4c1", + "version-string": "4.7.1", + "port-version": 1 + }, + { + "git-tree": "fba9b093eb785ca3319fd77193525533d6f3ea5d", + "version-string": "4.7.1", + "port-version": 0 + }, + { + "git-tree": "bf47fabe65f9440de51e6dc73ae76335d06173ea", + "version-string": "4.6.0", + "port-version": 0 + }, + { + "git-tree": "0424a180db1083469d5de966ebc4210df64a220c", + "version-string": "4.4.1", + "port-version": 0 + }, + { + "git-tree": "27ce123d5f695d0559583370f1678a1e21d6f765", + "version-string": "4.3.0-1", + "port-version": 0 + }, + { + "git-tree": "c95be3f1cd3205c897f4f9ed4af464624de3ce4d", + "version-string": "4.2.2-1", + "port-version": 0 + }, + { + "git-tree": "120c05998b1af4349cf112bf83792e38aa152081", + "version-string": "4.2.2", + "port-version": 0 + }, + { + "git-tree": "3c4fee746a83a2a1c2a82e219f315e2cc322f12b", + "version-string": "4.2.1", + "port-version": 0 + }, + { + "git-tree": "c405558ecd3631be2ae9c99647d9bcbe8e500416", + "version-string": "0.0.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cpr.json b/externals/vcpkg/versions/c-/cpr.json new file mode 100755 index 000000000..55445f287 --- /dev/null +++ b/externals/vcpkg/versions/c-/cpr.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "0699dd50434f04eeccbcd30ed9a3973c3143052b", + "version-semver": "1.8.3", + "port-version": 0 + }, + { + "git-tree": "6a73ff58e720c30c96a1f7d12f98c9553a62a0d7", + "version-semver": "1.8.1", + "port-version": 0 + }, + { + "git-tree": "ada43417fa0d4613e92e3daafc717b83079d7959", + "version-semver": "1.7.2", + "port-version": 0 + }, + { + "git-tree": "5adb33b62335c55231d3cd37e302c3487721a1d8", + "version-semver": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "bc224c4615958fa1105b29a9d973555fda345de8", + "version-semver": "1.6.2", + "port-version": 1 + }, + { + "git-tree": "96762dddaeb7d520833ddc1d47a30f26c35c9f67", + "version-semver": "1.6.2", + "port-version": 0 + }, + { + "git-tree": "0a3303682963a35032b7203c69051cf2edfaf41a", + "version-string": "1.5.2", + "port-version": 0 + }, + { + "git-tree": "1e06a5e6c538b8e4aadba26caf119d68181ea648", + "version-string": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "a85262e3d90694d3d5201a31d6f54f79f8df18aa", + "version-string": "1.3.0-8", + "port-version": 0 + }, + { + "git-tree": "94d8bc574374b6624c06d9ea48fe7f1cacaf52b5", + "version-string": "1.3.0-7", + "port-version": 0 + }, + { + "git-tree": "35223ace2a569565da9efdc1e47266677220711a", + "version-string": "1.3.0-6", + "port-version": 0 + }, + { + "git-tree": "07bb80f5c054678cfad6daf3322bb455fc0a1d33", + "version-string": "1.3.0-4", + "port-version": 0 + }, + { + "git-tree": "0d9cab7dc1a45730e981984cf2e86747103cf054", + "version-string": "1.3.0-3", + "port-version": 0 + }, + { + "git-tree": "d6dad15c85eb9d8fbdffebdd22de92e2ed948f89", + "version-string": "1.3.0-1", + "port-version": 0 + }, + { + "git-tree": "0023cfcf7b7b3f8da3cfe521fba5ba9d3cfdec88", + "version-string": "1.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cpu-features.json b/externals/vcpkg/versions/c-/cpu-features.json new file mode 100755 index 000000000..0268469c8 --- /dev/null +++ b/externals/vcpkg/versions/c-/cpu-features.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "608368f9c6d85d0278ae92687024e8bd31aecbe4", + "version": "0.6.0", + "port-version": 2 + }, + { + "git-tree": "7df362e53cec246374da4f3d192bb1d4bb71b2b9", + "version": "0.6.0", + "port-version": 1 + }, + { + "git-tree": "1e64c7ac2673d19f18e8bc447b14e3ae7f842c81", + "version": "0.6.0", + "port-version": 0 + }, + { + "git-tree": "e622c89147a667757495a82dfd7e4239b2782bd7", + "version-string": "0.4.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cpuid.json b/externals/vcpkg/versions/c-/cpuid.json new file mode 100755 index 000000000..097f9d93f --- /dev/null +++ b/externals/vcpkg/versions/c-/cpuid.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "aa97f1bac97c79fa1595ed1a4b141c209fc375e8", + "version": "0.5.1", + "port-version": 3 + }, + { + "git-tree": "ad9738f7afc11f1fa0cea524f4d79dd6cc644e7c", + "version": "0.5.1", + "port-version": 2 + }, + { + "git-tree": "7b5a58587efff685ef5c166bcfba98542606f8ca", + "version": "0.5.1", + "port-version": 1 + }, + { + "git-tree": "65cb7ff3fc46a78367e4c700b587e8093386e4b3", + "version": "0.5.1", + "port-version": 0 + }, + { + "git-tree": "c85228de687c3b4748a8867c1fbf82f0b64c8d9c", + "version-string": "0.4.1", + "port-version": 2 + }, + { + "git-tree": "f802d870a436a93b77d88e007088880a41432dad", + "version-string": "0.4.1-1", + "port-version": 0 + }, + { + "git-tree": "0c783b61ec291c85d2a70427ae956b9bd2fc198e", + "version-string": "0.4.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cpuinfo.json b/externals/vcpkg/versions/c-/cpuinfo.json new file mode 100755 index 000000000..fef8a68d0 --- /dev/null +++ b/externals/vcpkg/versions/c-/cpuinfo.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "69febccb10ae5b789dd6c5af2b85740617fc34f4", + "version-date": "2022-04-02", + "port-version": 0 + }, + { + "git-tree": "28dbefcc9131ff8ce6fa939f7fcdb5cf0d4ee7fd", + "version-date": "2021-04-04", + "port-version": 0 + }, + { + "git-tree": "4e4c0561ce8cb5f57c0a63ce070598dc1544acde", + "version-string": "2019-07-28-1", + "port-version": 0 + }, + { + "git-tree": "cf29596ba95d0239461c492583384218b5e8a431", + "version-string": "2019-07-28", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cr.json b/externals/vcpkg/versions/c-/cr.json new file mode 100755 index 000000000..eec55d22a --- /dev/null +++ b/externals/vcpkg/versions/c-/cr.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "67c46561394de15aee2a56d57590eeef1060019d", + "version-string": "2020-04-26", + "port-version": 1 + }, + { + "git-tree": "2c71bf1df729facbf1f2ffcf77341ff901b00eda", + "version-string": "2020-04-26", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/crashpad.json b/externals/vcpkg/versions/c-/crashpad.json new file mode 100755 index 000000000..b24546a8e --- /dev/null +++ b/externals/vcpkg/versions/c-/crashpad.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "aa3803e8f14e1a0467a2aa509403d9fc8c56e159", + "version-date": "2022-04-16", + "port-version": 1 + }, + { + "git-tree": "448abcac90e97d8b5ee03843775dd7fcba971979", + "version-date": "2022-04-16", + "port-version": 0 + }, + { + "git-tree": "88ee612aa949155b1e363bb710578811d3283033", + "version-date": "2020-03-18", + "port-version": 2 + }, + { + "git-tree": "1968933546b1d1a71dbe8869f68f13d014fcb943", + "version-string": "2020-03-18", + "port-version": 1 + }, + { + "git-tree": "0de198199fe4c71142640bb10fd9fffe28a79349", + "version-string": "2020-03-18", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/crashrpt.json b/externals/vcpkg/versions/c-/crashrpt.json new file mode 100755 index 000000000..55c72bc51 --- /dev/null +++ b/externals/vcpkg/versions/c-/crashrpt.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "896d96ee0613edabd92048142803845fa11baa68", + "version": "1.4.3", + "port-version": 2 + }, + { + "git-tree": "ad55102e0d167bb457349e5b2b4cec75efc45a91", + "version": "1.4.3", + "port-version": 1 + }, + { + "git-tree": "671b2d16a22bdaf8718e15fa13554c838b6e6ce7", + "version-string": "1.4.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/crc32c.json b/externals/vcpkg/versions/c-/crc32c.json new file mode 100755 index 000000000..3b1f56ad4 --- /dev/null +++ b/externals/vcpkg/versions/c-/crc32c.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "dcfaa85ef9b67b94cf51378922832fff7cf43333", + "version": "1.1.2", + "port-version": 0 + }, + { + "git-tree": "c170749f5731ca44674e241167fa0955a461256a", + "version-string": "1.1.1", + "port-version": 1 + }, + { + "git-tree": "0e0e15c0dc05913aa952e8d0ce68b145ce8cdfdf", + "version-string": "1.1.1", + "port-version": 0 + }, + { + "git-tree": "3283a8e4667c1f13418f951e474d576a4fc01f88", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "f389d4282afd60d710f395e3aa3bff2a98e388e3", + "version-string": "1.0.7-1", + "port-version": 0 + }, + { + "git-tree": "3f24ca27d2d2f730b51e320676248d41445342e0", + "version-string": "1.0.7", + "port-version": 0 + }, + { + "git-tree": "745d73eb1ee20976f49f7d256dab79b1b0c48afe", + "version-string": "1.0.6-1", + "port-version": 0 + }, + { + "git-tree": "1e2099cd49db892b57d25113c7dc846d1a2b0fea", + "version-string": "1.0.6", + "port-version": 0 + }, + { + "git-tree": "e827e0e16d52ac19ce656dd1456817eec645d0cb", + "version-string": "1.0.5-1", + "port-version": 0 + }, + { + "git-tree": "63c19d9c0702e151f94c895f074df8ae1d115c17", + "version-string": "1.0.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/crfsuite.json b/externals/vcpkg/versions/c-/crfsuite.json new file mode 100755 index 000000000..f81e1ca2c --- /dev/null +++ b/externals/vcpkg/versions/c-/crfsuite.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "8f290a396def84e4a24ca49e29d17d7218b8e410", + "version-date": "2020-08-27", + "port-version": 0 + }, + { + "git-tree": "b74e8dd91be02cf5bbbd6f6387d66468fe579e8e", + "version-date": "2019-07-21", + "port-version": 3 + }, + { + "git-tree": "973286d78761d5a06d7188a21df0e15124dbf610", + "version-date": "2019-07-21", + "port-version": 2 + }, + { + "git-tree": "65bc9733064d028bb4f2960d824862263f74bfde", + "version-date": "2019-07-21", + "port-version": 1 + }, + { + "git-tree": "779f57b3fd1e0e2a15df5baf4488ef149f7f0cfd", + "version-string": "2019-07-21", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/croncpp.json b/externals/vcpkg/versions/c-/croncpp.json new file mode 100755 index 000000000..99f598042 --- /dev/null +++ b/externals/vcpkg/versions/c-/croncpp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "0fb4aefe39d2d695cb5cc89a4f3c92e4229605f5", + "version-date": "2020-09-04", + "port-version": 3 + }, + { + "git-tree": "79f67dcb192287955f663db8cc36f73455f78990", + "version-string": "2020-09-04", + "port-version": 2 + }, + { + "git-tree": "efc67eae1ad2b9fa1c1655c977b0800ef2113313", + "version-string": "2020-09-04", + "port-version": 1 + } + ] +} diff --git a/externals/vcpkg/versions/c-/crossguid.json b/externals/vcpkg/versions/c-/crossguid.json new file mode 100755 index 000000000..ce2ce308a --- /dev/null +++ b/externals/vcpkg/versions/c-/crossguid.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "93714099ddf83b2f3437a080c8acc08ff74cbe37", + "version-date": "2021-10-22", + "port-version": 2 + }, + { + "git-tree": "4e53633ff35a2bcfb9076aee3e0d740406e788d3", + "version-date": "2021-10-22", + "port-version": 1 + }, + { + "git-tree": "5880c01322b2c2cd08e9b573b769260696b2365d", + "version-date": "2021-10-22", + "port-version": 0 + }, + { + "git-tree": "42cc44d6649705d3c104e9753f3ba1bb4217ebc8", + "version-string": "0.2.2-2018-06-16", + "port-version": 2 + }, + { + "git-tree": "4b44e01ccbe952e12c3be478e0d5bc4340f4c9df", + "version-string": "0.2.2-2018-06-16-1", + "port-version": 0 + }, + { + "git-tree": "879a9da5c388f9a0e44d915f1c1fd9134a51d273", + "version-string": "0.2.2-2018-06-16", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/crow.json b/externals/vcpkg/versions/c-/crow.json new file mode 100755 index 000000000..703a78aca --- /dev/null +++ b/externals/vcpkg/versions/c-/crow.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "e21a4fb8fd849bfe3ee8d77dbdb3a4953dd08d55", + "version": "1.0-1", + "port-version": 0 + }, + { + "git-tree": "7e3e9d55fe174a7a7fc05c8afdac245eea49a654", + "version": "0.3.4", + "port-version": 0 + }, + { + "git-tree": "a843201119b89aaf74f30b1b74e1309b71ce0310", + "version": "0.3.3", + "port-version": 0 + }, + { + "git-tree": "d2719e110ecca722270c61d66f274dee1a1eb1e4", + "version": "0.3.2", + "port-version": 1 + }, + { + "git-tree": "c0d5207375bcbf798d3478eef7e00ae5206e4b04", + "version": "0.3.2", + "port-version": 0 + }, + { + "git-tree": "4c50547dfc3c5f5bf5a08887d6515e51a7203130", + "version": "0.3.1", + "port-version": 0 + }, + { + "git-tree": "4a0d69a7e34aa3d77de7ba2c01ce45ae730478a1", + "version": "0.3", + "port-version": 0 + }, + { + "git-tree": "8af7b33a4f59eec6613b9d8e55f9aac403bb7490", + "version": "0.2", + "port-version": 0 + }, + { + "git-tree": "5759b9679960c34a0e663f83ad32ba2e1320e2d5", + "version-string": "0.1-1", + "port-version": 0 + }, + { + "git-tree": "2bda17839e15cd3eb12caaaf15257c289a234e4e", + "version-string": "0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cryptopp.json b/externals/vcpkg/versions/c-/cryptopp.json new file mode 100755 index 000000000..879c3d14c --- /dev/null +++ b/externals/vcpkg/versions/c-/cryptopp.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "0d47535ac1767600626347e025079450a909c6ba", + "version": "8.6.0", + "port-version": 0 + }, + { + "git-tree": "2092d648b56a683bcd8b3e72f4adc3a966956c17", + "version-string": "8.5.0", + "port-version": 1 + }, + { + "git-tree": "c8aee6279ffed7e7e1f9037c15937643c315a999", + "version-string": "8.5.0", + "port-version": 0 + }, + { + "git-tree": "ad41b9e4eb55001f640b5aab811f288862829d70", + "version-string": "8.2.0-2", + "port-version": 0 + }, + { + "git-tree": "1f72925199ecfcd7e2b929372af100e95c80bc2e", + "version-string": "8.2.0-1", + "port-version": 0 + }, + { + "git-tree": "c38385f64a782e04b07d8d52270238d7c67531c0", + "version-string": "8.2.0", + "port-version": 0 + }, + { + "git-tree": "9abae7256650f7984be9a8842e2065632fa04873", + "version-string": "8.1.0-2", + "port-version": 0 + }, + { + "git-tree": "301eaab34677f43ea45fc8a3595b95e1dba667b9", + "version-string": "8.1.0-1", + "port-version": 0 + }, + { + "git-tree": "6214913a24800179f96967ff011b4971f0ba37c4", + "version-string": "8.1.0", + "port-version": 0 + }, + { + "git-tree": "ed9ae9c16bf325ce8174bca07b5c631d67a476a4", + "version-string": "8.0.0", + "port-version": 0 + }, + { + "git-tree": "1ba7e947a88e4974ef1cfa79fd593ac76fdec852", + "version-string": "7.0.0", + "port-version": 0 + }, + { + "git-tree": "2092d28a83d075bd3e55502cd553bdc05bfbe5d9", + "version-string": "6.1.0-2", + "port-version": 0 + }, + { + "git-tree": "9120c6cf23a2f6d11b278b84dca0293f339a4335", + "version-string": "6.1.0-1", + "port-version": 0 + }, + { + "git-tree": "2ea8fd174557a9efb2964a7c725f04b599caac12", + "version-string": "5.6.5-1", + "port-version": 0 + }, + { + "git-tree": "48bdda8cdb96b1feeb88c61c839ea06db57c723d", + "version-string": "5.6.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cspice.json b/externals/vcpkg/versions/c-/cspice.json new file mode 100755 index 000000000..9cb27a05f --- /dev/null +++ b/externals/vcpkg/versions/c-/cspice.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "1da82692c98d788552288f73818983fc3b561b7b", + "version": "67", + "port-version": 2 + }, + { + "git-tree": "2ad682ffd7b5b7cb6316fd77dc99dda7e6100731", + "version": "67", + "port-version": 1 + }, + { + "git-tree": "1c8f251f7712ff12e7b94d059a56eff69915fb43", + "version-string": "67", + "port-version": 0 + }, + { + "git-tree": "2b03824386796440e0b529f4e29413686f0fc5d5", + "version-string": "66", + "port-version": 5 + }, + { + "git-tree": "de8a1c53f62f307ac805ace26e3b9c9ece91829a", + "version-string": "66", + "port-version": 4 + }, + { + "git-tree": "743b26ef365d681a5252d2d72a58aa8c2e76d80b", + "version-string": "66", + "port-version": 3 + }, + { + "git-tree": "3c62eb98ca2a5c0df94fbab74649c3af954232d5", + "version-string": "66", + "port-version": 2 + }, + { + "git-tree": "037c7e4203b58cc2febead341cc17e9abf37c117", + "version-string": "66-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/ctbignum.json b/externals/vcpkg/versions/c-/ctbignum.json new file mode 100755 index 000000000..676be5da8 --- /dev/null +++ b/externals/vcpkg/versions/c-/ctbignum.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "88ce498c3810046ebfe6500157691bf21a85eb07", + "version-string": "2019-08-02", + "port-version": 1 + }, + { + "git-tree": "ff7d4b1e86ce05b4b86cf72977181f1173b68ba1", + "version-string": "2019-08-02", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/ctemplate.json b/externals/vcpkg/versions/c-/ctemplate.json new file mode 100755 index 000000000..231ef80ca --- /dev/null +++ b/externals/vcpkg/versions/c-/ctemplate.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "d0cd0a34b622b661af41d0f829ad22e406cd6c7f", + "version-date": "2020-09-14", + "port-version": 3 + }, + { + "git-tree": "491ab782407b38835b9a555dc77e6d3af485fdae", + "version-date": "2020-09-14", + "port-version": 2 + }, + { + "git-tree": "49845dc04f38d16b9c148162fc1457ed78608ae7", + "version-string": "2020-09-14", + "port-version": 1 + }, + { + "git-tree": "96aee13ec21957f5d9253a4e382f1896c312d7e8", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "c3864e4d9a627e75fb34b84351242574dad9c6df", + "version-string": "2017-06-23-44b7c5-4", + "port-version": 0 + }, + { + "git-tree": "a43674ee869a388a4e1dcab7a5fb727ad18de7a0", + "version-string": "2017-06-23-44b7c5-3", + "port-version": 0 + }, + { + "git-tree": "4d9b580f94963badba330f29c958021148bd1f31", + "version-string": "2017-06-23-44b7c5-2", + "port-version": 0 + }, + { + "git-tree": "8bca75088fb256f77df0783c8c0687ae5a3a0fe0", + "version-string": "2017-06-23-44b7c5b918a08ad561c63e9d28beecb40c10ebca", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/ctp.json b/externals/vcpkg/versions/c-/ctp.json new file mode 100755 index 000000000..90896c07c --- /dev/null +++ b/externals/vcpkg/versions/c-/ctp.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "11ff3d437cca5956d99f8690143f12a0ebd5e839", + "version-string": "6.6.1_P1_20210406_se", + "port-version": 3 + }, + { + "git-tree": "7160f9a456cfd057dee1cb0a92f92a4f16876fe8", + "version-string": "6.6.1_P1_20210406_se", + "port-version": 2 + }, + { + "git-tree": "abd1e961a096126b01df7a0b3362d5e8223ea9d7", + "version-string": "6.6.1_P1_20210406_se", + "port-version": 1 + }, + { + "git-tree": "253cd7c440e8e50fc940c7d2812a6d39b371dbf2", + "version-string": "6.6.1_P1_20210406_se", + "port-version": 0 + }, + { + "git-tree": "8536b8c9fe4d95bb93ebd961e1e1dadc9dd6e4e9", + "version-string": "6.3.15_20190220_se", + "port-version": 1 + }, + { + "git-tree": "e785bad86454f3e0a8fef0705cfadb061003834c", + "version-string": "6.3.15_20190220_se", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/ctre.json b/externals/vcpkg/versions/c-/ctre.json new file mode 100755 index 000000000..185d72384 --- /dev/null +++ b/externals/vcpkg/versions/c-/ctre.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "7b8b42356b574541c92ad5509ced7b325361f8b8", + "version-semver": "3.6.0", + "port-version": 0 + }, + { + "git-tree": "fd57f6d1ec68aaa67e90f3382cce5668c5ecff5a", + "version-semver": "3.4.1", + "port-version": 0 + }, + { + "git-tree": "e50c31381fad0a8a4ac062531eaef4f728c2a469", + "version-string": "2.10", + "port-version": 0 + }, + { + "git-tree": "646f2e3d033ffb68de2b1ae551c1dbae3f0b1cda", + "version-string": "2.7", + "port-version": 0 + }, + { + "git-tree": "093722ff97cf6e82157693f8d93ad91ef414bbb9", + "version-string": "2.6.4", + "port-version": 0 + }, + { + "git-tree": "0fec09f20afaba210be40d91b71723541e2ab16e", + "version-string": "2.2-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cub.json b/externals/vcpkg/versions/c-/cub.json new file mode 100755 index 000000000..4dc47df08 --- /dev/null +++ b/externals/vcpkg/versions/c-/cub.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "d6fe5c753cf67eeb18b536ea933864d15a88331d", + "version": "1.16.0", + "port-version": 0 + }, + { + "git-tree": "ec58db0c42a8978215a38d7e9ac938dd1b936c1f", + "version": "1.12.0", + "port-version": 0 + }, + { + "git-tree": "3d12aea8561ac6b5566b5ade8379993b82d8d6b1", + "version-string": "1.8.0-1", + "port-version": 0 + }, + { + "git-tree": "62e5e295c5bd4102785083c15f4e88725cf3890e", + "version-string": "1.8.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cuda.json b/externals/vcpkg/versions/c-/cuda.json new file mode 100755 index 000000000..53553cb14 --- /dev/null +++ b/externals/vcpkg/versions/c-/cuda.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "4e8939c3547a570a73098c091da7b9e28f71015c", + "version": "10.1", + "port-version": 10 + }, + { + "git-tree": "7895738a8a164beddfb53c4c69352b202d8e13e9", + "version-string": "10.1", + "port-version": 9 + }, + { + "git-tree": "43b8008115ab934b4cf1b36c38bb02ed845712bd", + "version-string": "10.1", + "port-version": 8 + }, + { + "git-tree": "f81f6321111048d45f0c5e41644ee26a0ccb9c13", + "version-string": "10.1", + "port-version": 7 + }, + { + "git-tree": "0022275f9aa9e2d70f6a35d7e28fb27ab21fd13e", + "version-string": "10.1", + "port-version": 5 + }, + { + "git-tree": "b692639f7b4b82f90b80e33dc3d6da2983975ab5", + "version-string": "10.1", + "port-version": 4 + }, + { + "git-tree": "ca5aa9e76b7b91b7104ad108b448dbf1719b5530", + "version-string": "10.1", + "port-version": 3 + }, + { + "git-tree": "e21c4698f343b201e52e8fc6163a4573bf94b274", + "version-string": "10.1", + "port-version": 2 + }, + { + "git-tree": "896402a9ab10ead504697b7fd62992ce379f1f13", + "version-string": "10.1-1", + "port-version": 0 + }, + { + "git-tree": "4b8ccbadfeb5ec1148135d0620c203f6ceeaf813", + "version-string": "10.1", + "port-version": 0 + }, + { + "git-tree": "aac6a595a656340084cd13ee7aa8e39308e60cb9", + "version-string": "9.0", + "port-version": 0 + }, + { + "git-tree": "18842eaf8f339b66d8bf7bc1e1cb52f7d0674db0", + "version-string": "8.0-1", + "port-version": 0 + }, + { + "git-tree": "aa51016a592261707294e823934d0464b988d3ac", + "version-string": "8.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cudnn.json b/externals/vcpkg/versions/c-/cudnn.json new file mode 100755 index 000000000..7c7b0ef9a --- /dev/null +++ b/externals/vcpkg/versions/c-/cudnn.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "aa008ef1b1c958146532dbbdabd76b62f9558653", + "version": "7.6.5", + "port-version": 6 + }, + { + "git-tree": "62f2616b19fe2b3b7dbc8a81e190900819f2ba3e", + "version": "7.6.5", + "port-version": 5 + }, + { + "git-tree": "c23360a6cfba2b5c8962c0c106d165ca31224162", + "version": "7.6.5", + "port-version": 4 + }, + { + "git-tree": "00e54079329e9cc4f1f623dce3bc39b0f19e958d", + "version-string": "7.6.5", + "port-version": 3 + }, + { + "git-tree": "5581791a9ad35390ed30629985b3863cf8b85bba", + "version-string": "7.6.5", + "port-version": 2 + }, + { + "git-tree": "495cc586b4bfdb28c3c339d3f471b9fbfc8bc481", + "version-string": "7.6.5", + "port-version": 1 + }, + { + "git-tree": "681f177cf063d3c8e655a18011c158ffad49fdbd", + "version-string": "7.6.5", + "port-version": 0 + }, + { + "git-tree": "8f40428fb1779b79fbbb08e3e52e984fe656439d", + "version-string": "7.6", + "port-version": 4 + }, + { + "git-tree": "05c5ad2600e1b2c17c8ddd8cc4fd54f360c01f2e", + "version-string": "7.6", + "port-version": 3 + }, + { + "git-tree": "37da8c573edd47c0cbefddd148f3f9eeac40adb1", + "version-string": "7.6", + "port-version": 2 + }, + { + "git-tree": "80dc9ac0ec8a2ab687d9b3f23dedae79376b89e6", + "version-string": "7.6", + "port-version": 1 + }, + { + "git-tree": "29d3b0383cd8f92e8b8c88b1d8f4e88860d1e0e5", + "version-string": "7.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cunit.json b/externals/vcpkg/versions/c-/cunit.json new file mode 100755 index 000000000..7b15a6d37 --- /dev/null +++ b/externals/vcpkg/versions/c-/cunit.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "b108b8daeb1695db997a7ebc1b341e27d4d84ce7", + "version-string": "2.1.3", + "port-version": 7 + }, + { + "git-tree": "f534a55290d8bce0e7d8fd5f443550c4565a4b63", + "version-string": "2.1.3-6", + "port-version": 0 + }, + { + "git-tree": "8af22f1b574a271ad022d4d15ce261a913d6f6f5", + "version-string": "2.1.3-4", + "port-version": 0 + }, + { + "git-tree": "d3f77bce6db68e69e816ea95122a625c082b08c0", + "version-string": "2.1.3-3", + "port-version": 0 + }, + { + "git-tree": "e50560ddf376a65ed799c20b617eebd8fb519e67", + "version-string": "2.1.3-2", + "port-version": 0 + }, + { + "git-tree": "560210636b2139272be5a80f64b56651180e77f7", + "version-string": "2.1.3-1", + "port-version": 0 + }, + { + "git-tree": "ff164993a7b025594837f969f6efb0b17bde31ad", + "version-string": "2.1.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/curl.json b/externals/vcpkg/versions/c-/curl.json new file mode 100755 index 000000000..551cecf0e --- /dev/null +++ b/externals/vcpkg/versions/c-/curl.json @@ -0,0 +1,349 @@ +{ + "versions": [ + { + "git-tree": "09dee7c9ae276d954fc8017b6a81002e43f81bb0", + "version": "7.83.1", + "port-version": 2 + }, + { + "git-tree": "69e1aaae731455f5ed18b7eea4da75ee10bd073a", + "version": "7.83.1", + "port-version": 1 + }, + { + "git-tree": "6f536c70dc927199fe430fde4e93f8d66d53b6f6", + "version": "7.83.1", + "port-version": 0 + }, + { + "git-tree": "d72a11c8c3990818ba5987cc1ceee799046de9be", + "version": "7.83.0", + "port-version": 0 + }, + { + "git-tree": "203696f71dd43fa55a1b1104570135bebf869819", + "version": "7.82.0", + "port-version": 0 + }, + { + "git-tree": "30162d8bfeb7628fb397969fc95e379705a52509", + "version": "7.81.0", + "port-version": 0 + }, + { + "git-tree": "8e13da05c975cb6f5bed6cf3b8054a817a00b45d", + "version": "7.80.0", + "port-version": 0 + }, + { + "git-tree": "b2d22bb78a3e3d9d2775d98bf37580e8819ee8c3", + "version": "7.79.1", + "port-version": 0 + }, + { + "git-tree": "5b6c1c3766b64c163ddabf8312214a23e2a7b8f5", + "version": "7.79.0", + "port-version": 0 + }, + { + "git-tree": "0be4cff4d8e1d37a9ddf9ab264682771c69c0d72", + "version": "7.78.0", + "port-version": 0 + }, + { + "git-tree": "cd05855cc1cd2d0f221664f0bfbe639b685fa028", + "version": "7.74.0", + "port-version": 8 + }, + { + "git-tree": "2184d79bb98ed36af015203385175cade013d8af", + "version": "7.74.0", + "port-version": 7 + }, + { + "git-tree": "73eb56fb6fa870b5959ba36b931817fc85208efe", + "version": "7.74.0", + "port-version": 6 + }, + { + "git-tree": "8be2f3a1be62244a892aeba05026579fbf7200b4", + "version": "7.74.0", + "port-version": 5 + }, + { + "git-tree": "883db9cb07e4982bf1bf327d5b3fa5a88b6304d8", + "version-string": "7.74.0", + "port-version": 4 + }, + { + "git-tree": "1f69a2a2ce714cb05b0c419b07c4da22ca0f40a6", + "version-string": "7.74.0", + "port-version": 3 + }, + { + "git-tree": "60383eff8665ca21ab8e2596ecafd27c7e001f5c", + "version-string": "7.74.0", + "port-version": 2 + }, + { + "git-tree": "339c5526eafa56c12aa1ba2f00c1d86778f4eb2c", + "version-string": "7.74.0", + "port-version": 1 + }, + { + "git-tree": "d5d242c3311f6d6f3b779ea169911382e99d2c9a", + "version-string": "7.74.0", + "port-version": 0 + }, + { + "git-tree": "811ecaeda7d73ffee81358981432326aee4b3ed1", + "version-string": "7.73.0", + "port-version": 4 + }, + { + "git-tree": "7fd5c9f0c5b8e54e32c02f35955796362a8344ce", + "version-string": "7.73.0", + "port-version": 3 + }, + { + "git-tree": "946d1b2dfd87703f7a5e758aaeb6b880dccc580f", + "version-string": "7.73.0", + "port-version": 2 + }, + { + "git-tree": "91875b9759f0bc2be5259ff0f02f63447a8ed4f7", + "version-string": "7.73.0", + "port-version": 1 + }, + { + "git-tree": "827731725a04ef7b9a801c7ddd424f797b46ec29", + "version-string": "7.73.0", + "port-version": 0 + }, + { + "git-tree": "1ceea1068a6ad293e19d2e9d99f52d3a09784b44", + "version-string": "7.72.0", + "port-version": 0 + }, + { + "git-tree": "8dc1c6c898d97efedd41b2946e69aa4ff2602ed8", + "version-string": "7.71.1", + "port-version": 2 + }, + { + "git-tree": "cbf8512f3b54afedaad106819a786cfefd133586", + "version-string": "7.71.1", + "port-version": 1 + }, + { + "git-tree": "05ef3cff9d206a5cef9311dd4a46129eabeb24e3", + "version-string": "7.71.1", + "port-version": 0 + }, + { + "git-tree": "0784d746f99f03aae43d64d5440186b08b1021b4", + "version-string": "7.68.0-3", + "port-version": 0 + }, + { + "git-tree": "2dbb8c19b478cc2d21b5ec391726af3a082f3105", + "version-string": "7.68.0-2", + "port-version": 0 + }, + { + "git-tree": "a3de120d738af7e4497b94d450d6c81588b2941b", + "version-string": "7.68.0-1", + "port-version": 0 + }, + { + "git-tree": "411397475467e68ef64452323732507337b10a89", + "version-string": "7.68.0", + "port-version": 0 + }, + { + "git-tree": "e257a8eb6852e23bc4e537e981275128fc65a915", + "version-string": "7.66.0-2", + "port-version": 0 + }, + { + "git-tree": "3df3fb9850115ba5f5b1e95aa216cdf8ded5cef2", + "version-string": "7.66.0-1", + "port-version": 0 + }, + { + "git-tree": "6a4d320e2ea2240024b8bbd6a2140758c71e5bae", + "version-string": "7.66.0", + "port-version": 0 + }, + { + "git-tree": "a37d5a2c1c1f280771896bcce6625059f556fc1b", + "version-string": "7.65.2-1", + "port-version": 0 + }, + { + "git-tree": "95a7b48ce1b1bb954b66fe8f36bde5a1f19467b1", + "version-string": "7.65.0-3", + "port-version": 0 + }, + { + "git-tree": "b8bab287650fd1c911306dccfb5a0930339dfe95", + "version-string": "7.65.0-2", + "port-version": 0 + }, + { + "git-tree": "94c1017f39d4cbf03a432f0017bd4931827ae31c", + "version-string": "7.65.0-1", + "port-version": 0 + }, + { + "git-tree": "9a1ad4846968fbdc30eb12342718a808cf72e599", + "version-string": "7.65.0", + "port-version": 0 + }, + { + "git-tree": "c8cbb2083b611478ae87e48b0a084e11ba5b81db", + "version-string": "7.61.1-7", + "port-version": 0 + }, + { + "git-tree": "5bdb85e44410b31db141e7fc566a832d77a6fb72", + "version-string": "7.61.1-6", + "port-version": 0 + }, + { + "git-tree": "9df7b77979747327805a1d28d9b6c92ded93951b", + "version-string": "7.61.1-5", + "port-version": 0 + }, + { + "git-tree": "96044857ad378b99e6d2c166722d0ed55e3b34fd", + "version-string": "7.61.1-4", + "port-version": 0 + }, + { + "git-tree": "31583ef83f7a254a0fb85631fc1be6208bb6d81b", + "version-string": "7.61.1-3", + "port-version": 0 + }, + { + "git-tree": "870b88aaf136109a501bbf0d2ffed92adc77a0e8", + "version-string": "7.61.1-2", + "port-version": 0 + }, + { + "git-tree": "de08b253f7a08595237086df793568fa3046eeb8", + "version-string": "7.61.1-1", + "port-version": 0 + }, + { + "git-tree": "89ff21bc295a1960addad44620abdd648a986bd7", + "version-string": "7.61.1", + "port-version": 0 + }, + { + "git-tree": "634222adc293f6917c0ad29f28810fa562efaa62", + "version-string": "7.61.0", + "port-version": 0 + }, + { + "git-tree": "febe31ccc4ac1700375e616f22545b564256538f", + "version-string": "7.60.0-2", + "port-version": 0 + }, + { + "git-tree": "5c99a5b08e3cd576af10a7f8ec15bb148c1fb113", + "version-string": "7.60.0-1", + "port-version": 0 + }, + { + "git-tree": "0ab38392eaa1139eef0195034ad790533956ae47", + "version-string": "7.60.0", + "port-version": 0 + }, + { + "git-tree": "3bc5aead178374533462dbe60c71bebbcec5ee73", + "version-string": "7_59_0-2", + "port-version": 0 + }, + { + "git-tree": "e97e031a8c8f8a72f5af1d8dc8013ff1f32b4599", + "version-string": "7_59_0-1", + "port-version": 0 + }, + { + "git-tree": "319a46d30ebaf47de0535e346ea07cf4de80ed64", + "version-string": "7.59.0", + "port-version": 0 + }, + { + "git-tree": "838a2f6c4d823c6e0143edc4a3310b702a86e992", + "version-string": "7.58.0-5", + "port-version": 0 + }, + { + "git-tree": "e562a0f028793f7b53de8b8a637f098656f8aa2c", + "version-string": "7.58.0-4", + "port-version": 0 + }, + { + "git-tree": "9606747f24fd42c10e74fa19926564e786165d73", + "version-string": "7.58.0-1", + "port-version": 0 + }, + { + "git-tree": "10c9b5413c70832a2a9daf2687fbc498b685bd2e", + "version-string": "7.58.0", + "port-version": 0 + }, + { + "git-tree": "bb2822ab3af6dcb9224745033e04a7abac7a82ca", + "version-string": "7.57.0-2", + "port-version": 0 + }, + { + "git-tree": "488e8f8e4edbc0ae1f43218a2ec6327003e0b1d3", + "version-string": "7.57.0-1", + "port-version": 0 + }, + { + "git-tree": "e62c2e7f3bddd211a08a4e9d9bd75c79077446b6", + "version-string": "7.55.1-1", + "port-version": 0 + }, + { + "git-tree": "1a5a244a1d2a1c9a062cde3545e9f28e3d29b031", + "version-string": "7.55.1", + "port-version": 0 + }, + { + "git-tree": "a8328541662f68cf18c3f6b96ffe4e9a8eb4125e", + "version-string": "7.55.0", + "port-version": 0 + }, + { + "git-tree": "d81fb4fe0783b6a61aadf7eea5a4f08f5bea91dc", + "version-string": "7.51.0-3", + "port-version": 0 + }, + { + "git-tree": "1edce6a49fe36df502fff68465b07dcf7cbdbc1a", + "version-string": "7.51.0-2", + "port-version": 0 + }, + { + "git-tree": "240594d0f45e0f8f8a2eb978af3febee7d9ec6ea", + "version-string": "7.51.0-1", + "port-version": 0 + }, + { + "git-tree": "a0dde0f9340d6ae56ec6959f9c9a8316e6f6f945", + "version-string": "7.51.0", + "port-version": 0 + }, + { + "git-tree": "bd88d5710b7efffa20c9815d3cb9142e842bd58e", + "version-string": "7.48.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/curlpp.json b/externals/vcpkg/versions/c-/curlpp.json new file mode 100755 index 000000000..1398ea703 --- /dev/null +++ b/externals/vcpkg/versions/c-/curlpp.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "ebde1c1d303f750ce06e530295a820787878e6cd", + "version-date": "2018-06-15", + "port-version": 7 + }, + { + "git-tree": "a4cea77cfb3429b1ea778167d06c39a691b97e13", + "version-date": "2018-06-15", + "port-version": 6 + }, + { + "git-tree": "c4802498d8b285cc5a3d3bcb574db0fe22267381", + "version-string": "2018-06-15", + "port-version": 5 + }, + { + "git-tree": "a764bda6f69b8e79e3f3734ceb420d4c814e9605", + "version-string": "2018-06-15", + "port-version": 4 + }, + { + "git-tree": "121083d20c3bd1cdb738697da5ae8ae1917ccee8", + "version-string": "2018-06-15-3", + "port-version": 0 + }, + { + "git-tree": "ccdf1419c1aa3030cba618bf696e064e8a089772", + "version-string": "2018-06-15-2", + "port-version": 0 + }, + { + "git-tree": "55c1ee44b050a3a3d79a2e2d7bf3df7dfaca0fb1", + "version-string": "2018-06-15-1", + "port-version": 0 + }, + { + "git-tree": "8b7093e6772f8b0e137fa018122444e15f194bef", + "version-string": "2018-06-15", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cute-headers.json b/externals/vcpkg/versions/c-/cute-headers.json new file mode 100755 index 000000000..a0d7ca06e --- /dev/null +++ b/externals/vcpkg/versions/c-/cute-headers.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "d6eb7ff72e3cede19e1f8900fe715014b3fa6d81", + "version-string": "2019-09-20", + "port-version": 1 + }, + { + "git-tree": "c8b815cb53310c522b4789c34e1961c4a816beab", + "version-string": "2019-09-20", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cutelyst2.json b/externals/vcpkg/versions/c-/cutelyst2.json new file mode 100755 index 000000000..f8b3f1ef9 --- /dev/null +++ b/externals/vcpkg/versions/c-/cutelyst2.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "b172ddad5af65084452d225b55de761bcf4b8592", + "version": "2.12.0", + "port-version": 2 + }, + { + "git-tree": "1ad13c203a854aeb411f66b4f8e083882d7415cd", + "version-string": "2.12.0", + "port-version": 1 + }, + { + "git-tree": "d451e8108a8ac3305fda61e441505d6244260329", + "version-string": "2.12.0", + "port-version": 0 + }, + { + "git-tree": "4eb08152bc0a1ba92fdff5844c3181efd7374765", + "version-string": "2.9.0-1", + "port-version": 0 + }, + { + "git-tree": "3fa16ba6900d9ddce5f2b5c7c807e1501bebe84f", + "version-string": "2.9.0", + "port-version": 0 + }, + { + "git-tree": "775839495211e69907a217fe3443897e4ddf0e16", + "version-string": "2.8.0", + "port-version": 0 + }, + { + "git-tree": "04e5bee0904e5e1277ca5287ffc591b6e06f6711", + "version-string": "2.7.0", + "port-version": 0 + }, + { + "git-tree": "84836e89d33907828ea8481de27d0e42842c2873", + "version-string": "2.5.2-2", + "port-version": 0 + }, + { + "git-tree": "ba146ce08b03e85b46ba478826e2d10386778817", + "version-string": "2.5.2-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cwalk.json b/externals/vcpkg/versions/c-/cwalk.json new file mode 100755 index 000000000..d69923111 --- /dev/null +++ b/externals/vcpkg/versions/c-/cwalk.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "d538350d056fb42b77d28894f67a2bc9dbfe1403", + "version": "1.2.6", + "port-version": 0 + }, + { + "git-tree": "5cec9575426a50a36612850c9681b8216572a3db", + "version-string": "1.2.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/cxxopts.json b/externals/vcpkg/versions/c-/cxxopts.json new file mode 100755 index 000000000..f26aab12a --- /dev/null +++ b/externals/vcpkg/versions/c-/cxxopts.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "803dd21f8c06b5460353b53501f273b6c30aa9df", + "version-semver": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "68001132d5d7e495c5890f3cadfed62aba7185dd", + "version-string": "2.2.1", + "port-version": 1 + }, + { + "git-tree": "b366e598bbb99685f33563a0b224f710be2b5124", + "version-string": "2.2.1", + "port-version": 0 + }, + { + "git-tree": "e0ddc1ffcbf704aaca88504484c4dd5624e84782", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "a368104bdfd4a1284e8b3853e83a2fc0fa750663", + "version-string": "2.1.2-1", + "port-version": 0 + }, + { + "git-tree": "f825f847c7a1cadb04d7c5310aa56498cb679f26", + "version-string": "2.1.2", + "port-version": 0 + }, + { + "git-tree": "4804e5bda99dbbb19fa3216f7ccb623400f12379", + "version-string": "2.1.1", + "port-version": 0 + }, + { + "git-tree": "3895ddad1f82d26e71ca7b0cf463e6fce2fc0d6e", + "version-string": "2.1.0-1", + "port-version": 0 + }, + { + "git-tree": "dd7333b303b3b07d77481b1cd36f022845ab208d", + "version-string": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "b96dbdf46cca0f4b6cc4ed5f60a98de3e168bf5c", + "version-string": "1.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/c-/czmq.json b/externals/vcpkg/versions/c-/czmq.json new file mode 100755 index 000000000..982b8f19e --- /dev/null +++ b/externals/vcpkg/versions/c-/czmq.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "fd4ccb9b894541d10e393139468aaac97419b0f2", + "version-semver": "4.2.1", + "port-version": 1 + }, + { + "git-tree": "e05dc72cf3b616b1fd6629ea3dc20d08ed8d8055", + "version-semver": "4.2.1", + "port-version": 0 + }, + { + "git-tree": "31aceda22627ab6f97f03868d5f92a4cc78a275e", + "version-string": "2019-06-10-4", + "port-version": 0 + }, + { + "git-tree": "46b00b984d0ab212fd51b1205eb75ced5c7ca3be", + "version-string": "2019-06-10-3", + "port-version": 0 + }, + { + "git-tree": "4ef1ce1d90c4740423a6de5a1baa8ace8825723a", + "version-string": "2019-06-10-2", + "port-version": 0 + }, + { + "git-tree": "1a6acfd363bbeb4d170f8ce9b57ac5342f6c662e", + "version-string": "2019-06-10-1", + "port-version": 0 + }, + { + "git-tree": "4ba8a7fc3d6250d6335b76732863c7602a6d3837", + "version-string": "2019-06-10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/d3d12-memory-allocator.json b/externals/vcpkg/versions/d-/d3d12-memory-allocator.json new file mode 100755 index 000000000..0be166fc9 --- /dev/null +++ b/externals/vcpkg/versions/d-/d3d12-memory-allocator.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "988836f8b901c1a30f4b667ac37f81f1ef3bcdd8", + "version-date": "2021-05-05", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/d3dx12.json b/externals/vcpkg/versions/d-/d3dx12.json new file mode 100755 index 000000000..9f5f24596 --- /dev/null +++ b/externals/vcpkg/versions/d-/d3dx12.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "34415699a49eb16898e8190a101c6f6e026b1b3d", + "version-string": "may2021", + "port-version": 0 + }, + { + "git-tree": "8ee92f85b281f540bb897404333cd300bd02e015", + "version-string": "may2020", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/darknet.json b/externals/vcpkg/versions/d-/darknet.json new file mode 100755 index 000000000..644996618 --- /dev/null +++ b/externals/vcpkg/versions/d-/darknet.json @@ -0,0 +1,104 @@ +{ + "versions": [ + { + "git-tree": "b9b918e6e0af651d83b284cd0f423b6b49951aef", + "version-date": "2022-03-06", + "port-version": 0 + }, + { + "git-tree": "cb0cb4dcba244d4b82cdd65fa0c993cfd4691992", + "version-date": "2021-04-16", + "port-version": 1 + }, + { + "git-tree": "b8aea30f123c47f5be294829fbfac4d9e8c1295d", + "version-date": "2021-04-16", + "port-version": 0 + }, + { + "git-tree": "05bdc42da8656bf1acf80d6f3f821dff045c7b72", + "version-string": "2021-01-21", + "port-version": 0 + }, + { + "git-tree": "5013a879bca7ed0f5a443fa9e379abbedfd38eeb", + "version-string": "2020-08-30", + "port-version": 2 + }, + { + "git-tree": "112131c0ca5d5d396ec1c64f52f7609f12629df7", + "version-string": "2020-08-30", + "port-version": 1 + }, + { + "git-tree": "bd9030de7c341f1e5ea65a0ef7f3804d4cb8a15d", + "version-string": "2020-08-30", + "port-version": 0 + }, + { + "git-tree": "0ed3c7001cc0e5c9c8236a597eabe8c80b042771", + "version-string": "2020-06-29", + "port-version": 0 + }, + { + "git-tree": "6f518b887149ce83d9cc3459678acab773392a37", + "version-string": "2020-03-02", + "port-version": 0 + }, + { + "git-tree": "d182106de516d8071c4fa2a7a28e7ce8b1de3b87", + "version-string": "0.2.5.1-1", + "port-version": 0 + }, + { + "git-tree": "7ce2f496849dc8c4b05c6e6485ed403f4fa06275", + "version-string": "0.2.5.1", + "port-version": 0 + }, + { + "git-tree": "297845c7627bddbb821fc70529f1573db47f19fc", + "version-string": "0.2.5-6", + "port-version": 0 + }, + { + "git-tree": "f5e89045b030a26eae504a302a5f75bffe72e2be", + "version-string": "0.2.5-5", + "port-version": 0 + }, + { + "git-tree": "620693c86298122d0a9a2697a860b4f0606eeafb", + "version-string": "0.2.5-4", + "port-version": 0 + }, + { + "git-tree": "b34cc69fde346abedd8da82d5fd0b2f771e7b5fc", + "version-string": "0.2.5-3", + "port-version": 0 + }, + { + "git-tree": "82b472bbbbb8548462a3ee18c161a522d669bd74", + "version-string": "0.2.5-1", + "port-version": 0 + }, + { + "git-tree": "57a08801e58c9d5cb053d5607c542bd41eab20ae", + "version-string": "0.2.5", + "port-version": 0 + }, + { + "git-tree": "bd529056d9c1c1efd32d06de69277d45775dd5b8", + "version-string": "1.0.0-2", + "port-version": 0 + }, + { + "git-tree": "b17f58f85878ed7a5296376516d39f17d3766c7b", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "9b09d121b686c7a75520b7e8af399c266cc4309c", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/darts-clone.json b/externals/vcpkg/versions/d-/darts-clone.json new file mode 100755 index 000000000..40a98fec1 --- /dev/null +++ b/externals/vcpkg/versions/d-/darts-clone.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "1d75f114575faaf58492d7eca28e5caa3768811a", + "version-string": "1767ab87cffe", + "port-version": 2 + }, + { + "git-tree": "b54d1af1ee2c42b0b298fa3d40c7e283b3da015c", + "version-string": "1767ab87cffe-1", + "port-version": 0 + }, + { + "git-tree": "3e3ba2742cbbf9670330537de59a170c93dc43c0", + "version-string": "1767ab87cffe", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/dartsim.json b/externals/vcpkg/versions/d-/dartsim.json new file mode 100755 index 000000000..bea457455 --- /dev/null +++ b/externals/vcpkg/versions/d-/dartsim.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "8b816d852610f6ef105eedc49bcbe6ae4881f759", + "version": "6.11.0", + "port-version": 3 + }, + { + "git-tree": "f7fc216f598684b22949d55f2d573137965a4d2d", + "version": "6.11.0", + "port-version": 2 + }, + { + "git-tree": "000785fa5fa81a597b18c374b887ff476182aa50", + "version": "6.11.0", + "port-version": 1 + }, + { + "git-tree": "104efce0932ef1a1e1e01358a442cfff637b285e", + "version": "6.9.4", + "port-version": 1 + }, + { + "git-tree": "e9a9e2df385efc1d41aeea022f88f7e6a07f81ba", + "version-string": "6.9.4", + "port-version": 0 + }, + { + "git-tree": "69ef8d2e6929546c0e8e3103a5badafc31ac775a", + "version-string": "9.4.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/dataframe.json b/externals/vcpkg/versions/d-/dataframe.json new file mode 100755 index 000000000..8babf362d --- /dev/null +++ b/externals/vcpkg/versions/d-/dataframe.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "7f3b69090a3dce2e274e137efce5c2fb859d25ef", + "version": "1.19.0", + "port-version": 0 + }, + { + "git-tree": "5a7d6da55d37d2e7415aa8841b06660213e54743", + "version-string": "1.17.0", + "port-version": 1 + }, + { + "git-tree": "6ddb720c8221d354fd5ca2b18617758033459a69", + "version-string": "1.17.0", + "port-version": 0 + }, + { + "git-tree": "b640578906e46407df50c501573ceb04980d6dfc", + "version-string": "1.12.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/date.json b/externals/vcpkg/versions/d-/date.json new file mode 100755 index 000000000..e845993b0 --- /dev/null +++ b/externals/vcpkg/versions/d-/date.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "14d5c6822908ad2fd1d700cca2067ae4b8ef4404", + "version": "3.0.1", + "port-version": 2 + }, + { + "git-tree": "e281c60aee492a2be56e78ce6a53cb5db927b1dc", + "version": "3.0.1", + "port-version": 1 + }, + { + "git-tree": "8d9a771765181237930138b7c4809babbd814cfb", + "version": "3.0.1", + "port-version": 0 + }, + { + "git-tree": "6dc2054fe09235f06cd75f4acaf570145672a86a", + "version-string": "3.0.0", + "port-version": 3 + }, + { + "git-tree": "6223ca4908ce9896c0d17ac21dac600e7f4d54e1", + "version-string": "3.0.0", + "port-version": 2 + }, + { + "git-tree": "42976b85736114e38204b7d8cd5ea5e74a73c7cd", + "version-string": "3.0.0", + "port-version": 1 + }, + { + "git-tree": "0bbf15fc741ad797a3ec3cce9ab9680314193893", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "b63095cd5aa753503485086cc3d1de7dc90f582c", + "version-string": "2019-11-08", + "port-version": 0 + }, + { + "git-tree": "07207105c10a4c3af8c5d1e3aa4db0a40504a253", + "version-string": "2019-09-09", + "port-version": 0 + }, + { + "git-tree": "fd3b27793570e0e280484742d317ab1c9e8fa8b7", + "version-string": "2019-05-18-1", + "port-version": 0 + }, + { + "git-tree": "218b69419ce2cd95376d9997c607272c53af9329", + "version-string": "ed0368f", + "port-version": 0 + }, + { + "git-tree": "dbd5ad3d1ad0c3833c96c135916bde49de140cbc", + "version-string": "081e9af", + "port-version": 0 + }, + { + "git-tree": "1819dbe39242b7a3a7f4ef72b5e5bf144bc778ff", + "version-string": "9dc96fd", + "port-version": 0 + }, + { + "git-tree": "41512b5bc68599041b958ddbf26dacbf088706f2", + "version-string": "2.4.1", + "port-version": 0 + }, + { + "git-tree": "99b3cbf711c0ec049445cf5586a2ee6373280892", + "version-string": "2.4", + "port-version": 0 + }, + { + "git-tree": "f893b79100322bff63486b8f162d5ad94e3490b9", + "version-string": "2.3-c286981b3bf83c79554769df68b27415cee68d77", + "port-version": 0 + }, + { + "git-tree": "16b03b9409ef7736aa57323363c04b3a4cd14c3f", + "version-string": "2.3", + "port-version": 0 + }, + { + "git-tree": "0d7d4b3336f8d2e169fdc3305199a1b84abf40bb", + "version-string": "2.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/dav1d.json b/externals/vcpkg/versions/d-/dav1d.json new file mode 100755 index 000000000..d77ca746c --- /dev/null +++ b/externals/vcpkg/versions/d-/dav1d.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "0c06788e881e79f8c6a169f0f666baf2dc04faa6", + "version": "0.9.2", + "port-version": 0 + }, + { + "git-tree": "d92dfe48dbd557d90d9c216bc5a5a4b9435939c1", + "version-semver": "0.8.2", + "port-version": 3 + }, + { + "git-tree": "d0d3738c56710defd998cb619b649ddf6e43e017", + "version-semver": "0.8.2", + "port-version": 2 + }, + { + "git-tree": "d06178194bfa123b40c146ad161200d3e491f48b", + "version-semver": "0.8.2", + "port-version": 1 + }, + { + "git-tree": "5cf96f43b20ddf0af353ccebe6acbbe34ce97b42", + "version-semver": "0.8.2", + "port-version": 0 + }, + { + "git-tree": "1c30fb68cde7004f37eb289c95fb9823331fe571", + "version-string": "0.8.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/daw-header-libraries.json b/externals/vcpkg/versions/d-/daw-header-libraries.json new file mode 100755 index 000000000..3cac9f38e --- /dev/null +++ b/externals/vcpkg/versions/d-/daw-header-libraries.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "a57c2a8a8ba7fb8017df838e23547eb1933e26b9", + "version": "2.46.0", + "port-version": 0 + }, + { + "git-tree": "29ed87ad6aee595ac4a0972c09a1ddf34d13a857", + "version-semver": "1.29.7", + "port-version": 0 + }, + { + "git-tree": "6687948f2f2f4c3ba578a8ac41624c58a541f1a2", + "version-semver": "1.21.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/daw-json-link.json b/externals/vcpkg/versions/d-/daw-json-link.json new file mode 100755 index 000000000..5cfb66312 --- /dev/null +++ b/externals/vcpkg/versions/d-/daw-json-link.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "9020ee8ee80ac4543a61adb46a83b6b49f6562d4", + "version": "2.14.0", + "port-version": 0 + }, + { + "git-tree": "1c7cf1d126f7f7c1bb3759ff5bcf30c585b90d94", + "version-semver": "2.10.2", + "port-version": 0 + }, + { + "git-tree": "04d0df53fc3b69309aa10f53cc92f0933e8139b8", + "version-semver": "2.9.11", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/daw-utf-range.json b/externals/vcpkg/versions/d-/daw-utf-range.json new file mode 100755 index 000000000..d91448a9e --- /dev/null +++ b/externals/vcpkg/versions/d-/daw-utf-range.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "de67e1228f3effe508a68cf6080c6ba6e3343fb0", + "version": "2.2.2", + "port-version": 0 + }, + { + "git-tree": "aae578a84f804d65b63483335d1b74325906cb01", + "version-semver": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "e1c08fdf12013384e9a86e5233245321fea58793", + "version-semver": "2.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/dbg-macro.json b/externals/vcpkg/versions/d-/dbg-macro.json new file mode 100755 index 000000000..9fa5bd8d3 --- /dev/null +++ b/externals/vcpkg/versions/d-/dbg-macro.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "69061b0a26aff6be4f73d8f5fb8e028e5460d34b", + "version-date": "2021-11-02", + "port-version": 0 + }, + { + "git-tree": "662589707f9cc76d56e9298457a07a267f43f8c4", + "version-string": "2019-07-11", + "port-version": 1 + }, + { + "git-tree": "0a78c2a06c6717eb7b5049c72b6529b7ce88942b", + "version-string": "2019-07-11", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/dbghelp.json b/externals/vcpkg/versions/d-/dbghelp.json new file mode 100755 index 000000000..064c04c4a --- /dev/null +++ b/externals/vcpkg/versions/d-/dbghelp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "c90a3ad39f6dc1e0558acf89de26f220d0fd0c1f", + "version": "0", + "port-version": 2 + }, + { + "git-tree": "70109bd0d38dce02dc4ee2258fc40a2df72559f8", + "version-string": "0.0", + "port-version": 1 + }, + { + "git-tree": "9a5b9a5962883da2ac82a87f9b0bf78c0c8b0f62", + "version-string": "0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/dbow2.json b/externals/vcpkg/versions/d-/dbow2.json new file mode 100755 index 000000000..c37665c6b --- /dev/null +++ b/externals/vcpkg/versions/d-/dbow2.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ef7b9edee49702a3735f18624888b98d249a80ef", + "version-string": "2019-08-05", + "port-version": 1 + }, + { + "git-tree": "e26ed5627995f7e51f34cb8dfe2044397bb4e932", + "version-string": "2019-08-05", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/dbow3.json b/externals/vcpkg/versions/d-/dbow3.json new file mode 100755 index 000000000..12758d201 --- /dev/null +++ b/externals/vcpkg/versions/d-/dbow3.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "d0cbeaf64e4827fa69b0c07f21c6d0d689305559", + "version-string": "1.0.0", + "port-version": 1 + }, + { + "git-tree": "85a92409d590110eafbc10a26486a531749e9dd1", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/dcmtk.json b/externals/vcpkg/versions/d-/dcmtk.json new file mode 100755 index 000000000..a75be2932 --- /dev/null +++ b/externals/vcpkg/versions/d-/dcmtk.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "ce25087f7df7d83c796eee09b4457e7aa70848ad", + "version": "3.6.6", + "port-version": 3 + }, + { + "git-tree": "24716759e4aa3fb67b014163ae3be95ad88120b6", + "version-string": "3.6.6", + "port-version": 2 + }, + { + "git-tree": "6b830172b906fea2468685175d0ecca5f374217c", + "version-string": "3.6.6", + "port-version": 1 + }, + { + "git-tree": "0c53e59b36c487946025ebf3c2ea38ce5401d207", + "version-string": "3.6.6", + "port-version": 0 + }, + { + "git-tree": "c5cc40d9aabe103e79ca9315543646243b001814", + "version-string": "3.6.5+_20191213", + "port-version": 0 + }, + { + "git-tree": "d1268262fdac724d439ce2950d6b00058ede17fb", + "version-string": "3.6.4-2", + "port-version": 0 + }, + { + "git-tree": "3088b7b6f30c56be7c6b2bc5b9f67418b9c13304", + "version-string": "3.6.4-1", + "port-version": 0 + }, + { + "git-tree": "1360e42bd90285d9008a1cf1fc45180fe996f8ab", + "version-string": "3.6.4", + "port-version": 0 + }, + { + "git-tree": "4c631af1b36122e775699e41567c26de0c65959f", + "version-string": "3.6.3-1", + "port-version": 0 + }, + { + "git-tree": "e66fa18f406e495a6f130273c3a4be915fbdb625", + "version-string": "3.6.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/debug-assert.json b/externals/vcpkg/versions/d-/debug-assert.json new file mode 100755 index 000000000..99356b87c --- /dev/null +++ b/externals/vcpkg/versions/d-/debug-assert.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "06dae04f139744f1065ed1a6ed41631c6a431a5c", + "version-string": "1.3.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/decimal-for-cpp.json b/externals/vcpkg/versions/d-/decimal-for-cpp.json new file mode 100755 index 000000000..2923eaa7d --- /dev/null +++ b/externals/vcpkg/versions/d-/decimal-for-cpp.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "e6b418fe87e9affcbb4605d4aeb10e5e6883b239", + "version-string": "1.18", + "port-version": 0 + }, + { + "git-tree": "0279d4ae637ef0b7380ad1193282a5f76b4d27f3", + "version-string": "1.16", + "port-version": 2 + }, + { + "git-tree": "9a7b8c44bcd4ee8396edbb03495d998169d4f292", + "version-string": "1.16", + "port-version": 1 + }, + { + "git-tree": "c012da22fcf945d11b7257267dc4f3bac624559b", + "version-string": "1.16", + "port-version": 0 + }, + { + "git-tree": "28fac5873c038e12018866b22733778e55d8c9ad", + "version-string": "1.12", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/detours.json b/externals/vcpkg/versions/d-/detours.json new file mode 100755 index 000000000..b868ac038 --- /dev/null +++ b/externals/vcpkg/versions/d-/detours.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "9dc31719cf3c251f0530bf8ddb5c6131590386da", + "version": "4.0.1", + "port-version": 5 + }, + { + "git-tree": "5399f9185e9e7d815bf3c8380e745b5be77c2258", + "version-string": "4.0.1", + "port-version": 4 + }, + { + "git-tree": "c2b285f4028fc968bc2b4b04f7c3be5a9070d9df", + "version-string": "4.0.1", + "port-version": 3 + }, + { + "git-tree": "7400c2c8b63f9576a4b5e4464ad5d8e36d33e1d6", + "version-string": "4.0.1", + "port-version": 2 + }, + { + "git-tree": "ab6a570459cbae07325fbfdd4b51992c9dad3e41", + "version-string": "4.0.1-1", + "port-version": 0 + }, + { + "git-tree": "70b3a37716498dc7d45218e40a984b3a77c35b1b", + "version-string": "4.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/devicenameresolver.json b/externals/vcpkg/versions/d-/devicenameresolver.json new file mode 100755 index 000000000..fe2447d1b --- /dev/null +++ b/externals/vcpkg/versions/d-/devicenameresolver.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "a87ff3bcc7e455cf7b73ca36ff4e7ac0c54faba1", + "version-string": "2016-06-26-0850d88fa6", + "port-version": 3 + }, + { + "git-tree": "1c24f08a86eef969a65c6acdd123edfe704c4c0c", + "version-string": "2016-06-26-0850d88fa6", + "port-version": 2 + }, + { + "git-tree": "a0053afe91272f44589a53a866a3bc766d9e9d09", + "version-string": "2016-06-26-0850d88fa6-1", + "port-version": 0 + }, + { + "git-tree": "b786b6ee7391af2848f90d2e55b05df6c27f385b", + "version-string": "2016-06-26-0850d88fa6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/devil.json b/externals/vcpkg/versions/d-/devil.json new file mode 100755 index 000000000..49de7f317 --- /dev/null +++ b/externals/vcpkg/versions/d-/devil.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "28588e0e08e57404b35e35ce1d2a69322a2ee6b8", + "version": "1.8.0", + "port-version": 8 + }, + { + "git-tree": "d3e52a6334ec5ccb93fba69e531ab4979b827522", + "version-string": "1.8.0", + "port-version": 7 + }, + { + "git-tree": "6f70f69f1b91d2c33d481334d78243878b3da2fd", + "version-string": "1.8.0", + "port-version": 6 + }, + { + "git-tree": "2b7b10fb9655228c83df012ccb8caac214388ea6", + "version-string": "1.8.0-5", + "port-version": 0 + }, + { + "git-tree": "d864c1c66cd7609f7c4ee805f346347e363c186b", + "version-string": "1.8.0-4", + "port-version": 0 + }, + { + "git-tree": "6b64bfbb1af606b470c2e3e5f863ff3922a24bff", + "version-string": "1.8.0-3", + "port-version": 0 + }, + { + "git-tree": "64cae9e0a9595b8a48543cca4717d4883b0eedaf", + "version-string": "1.8.0-2", + "port-version": 0 + }, + { + "git-tree": "8d470e89ca3f784e2c7815a2c0394738e354a6df", + "version-string": "1.8.0-1", + "port-version": 0 + }, + { + "git-tree": "68da11879927880fc04d13c1a66eb1dc0b444cfc", + "version-string": "1.8.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/dimcli.json b/externals/vcpkg/versions/d-/dimcli.json new file mode 100755 index 000000000..f50b03953 --- /dev/null +++ b/externals/vcpkg/versions/d-/dimcli.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "5d3878991b69b5ed78b2d82c56c5d3a707e13eb0", + "version-semver": "5.0.2", + "port-version": 3 + }, + { + "git-tree": "9901ca1f1a121a702d4fb4c73ad6a482adff6c3f", + "version-semver": "5.0.2", + "port-version": 2 + }, + { + "git-tree": "025db5cad1969933359bac4047e0dea962fb692b", + "version-string": "5.0.2", + "port-version": 1 + }, + { + "git-tree": "da33c865acdf04845f77a46b89264544bfaf30cf", + "version-string": "5.0.2", + "port-version": 0 + }, + { + "git-tree": "508a42a39d654dd70909b5fea498b4b068ba6a09", + "version-string": "5.0.1", + "port-version": 0 + }, + { + "git-tree": "57a85674889c21c25770d674cee523e6040326e2", + "version-string": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "4780b3c02c9a92cc283f2da1c35214cb6e0f4cf5", + "version-string": "4.1.0-1", + "port-version": 0 + }, + { + "git-tree": "80dd089d889a2cdcdb95305892ae046892eb7167", + "version-string": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "c6b92cf16ca57984325782d235c5fa912d5d7d4e", + "version-string": "4.0.1-1", + "port-version": 0 + }, + { + "git-tree": "efa4837be64a9f13910f42f42acebeeceff9cd72", + "version-string": "3.1.1-2", + "port-version": 0 + }, + { + "git-tree": "bbd300e066b856253b1b8c0f0efb60a9541b24cc", + "version-string": "3.1.1-1", + "port-version": 0 + }, + { + "git-tree": "7c043529d43f507b1324fdc73894ec7fbdee7996", + "version-string": "2.0.0-1", + "port-version": 0 + }, + { + "git-tree": "f752db5c7989a9628b165cd449f2af19cf48d4d1", + "version-string": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "bb50d32b30352fa1ebd31e92e488a519b3da87c7", + "version-string": "1.0.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/directx-dxc.json b/externals/vcpkg/versions/d-/directx-dxc.json new file mode 100755 index 000000000..227c7bf95 --- /dev/null +++ b/externals/vcpkg/versions/d-/directx-dxc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6f2dfd1c848d67e0f36d83b8a6e7078b96d82df1", + "version-date": "2021-12-08", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/directx-headers.json b/externals/vcpkg/versions/d-/directx-headers.json new file mode 100755 index 000000000..bb915e825 --- /dev/null +++ b/externals/vcpkg/versions/d-/directx-headers.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "f6271f7dc1af5888b39b0443ff7ecc9d01f1db94", + "version": "1.602.0", + "port-version": 0 + }, + { + "git-tree": "e9da93d00966da04931e1eab14be7bb4fc8998d5", + "version": "1.4.9", + "port-version": 1 + }, + { + "git-tree": "bf1d2dfc334ecb42998d443147a2acd5eb88e312", + "version": "1.4.9", + "port-version": 0 + }, + { + "git-tree": "a45e68ef2cc77f2d8d39817ace66ef699deea3a5", + "version-string": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "2fb0e8c15d2643d303a989d9d553f93627e28869", + "version-string": "1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/directxmath.json b/externals/vcpkg/versions/d-/directxmath.json new file mode 100755 index 000000000..dff4c619a --- /dev/null +++ b/externals/vcpkg/versions/d-/directxmath.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "383135431007008f6d04e2cfbe55988b06054f15", + "version-date": "2022-05-18", + "port-version": 0 + }, + { + "git-tree": "ebf69755284c5ea16a26b4dbfa4534af962c96a0", + "version-date": "2022-01-18", + "port-version": 0 + }, + { + "git-tree": "d02145b6ed0cbe882bfb75291f832a11ab0582ce", + "version-string": "jan2021", + "port-version": 1 + }, + { + "git-tree": "381e0fc938992c45b9c2000e25bb4265f408ee27", + "version-string": "jan2021", + "port-version": 0 + }, + { + "git-tree": "764e3d177617a6dc0dec55415f7ae1828a40f5a7", + "version-string": "dec2020b", + "port-version": 0 + }, + { + "git-tree": "930a5068c034a9f40f92b7986696bebfed42ca75", + "version-string": "3.1.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/directxmesh.json b/externals/vcpkg/versions/d-/directxmesh.json new file mode 100755 index 000000000..f72dff607 --- /dev/null +++ b/externals/vcpkg/versions/d-/directxmesh.json @@ -0,0 +1,184 @@ +{ + "versions": [ + { + "git-tree": "bf2c810ddbc4a551cb5fb561092bb6fe67ed986f", + "version-date": "2022-05-09", + "port-version": 0 + }, + { + "git-tree": "799bc935afc5a0b5d8d50037f28807512fc7c38e", + "version-date": "2022-03-24", + "port-version": 0 + }, + { + "git-tree": "aef77bf208f6e95c682fd8d41590c5b0516f1f0f", + "version-date": "2022-02-28", + "port-version": 0 + }, + { + "git-tree": "a8cbbe307c2ac5a241a6ec4b1e76e121a1ffb2db", + "version-date": "2021-11-08", + "port-version": 1 + }, + { + "git-tree": "3680e7acf9764cc28152bc39b02497d4a7c13797", + "version-date": "2021-11-08", + "port-version": 0 + }, + { + "git-tree": "66d8a04c67c2ceabf4b3a6fbca5a088bf68b2663", + "version-string": "nov2021", + "port-version": 0 + }, + { + "git-tree": "c6e38f3e2c1f90556658d75ae6edd0e170ab0ac4", + "version-string": "sept2021", + "port-version": 0 + }, + { + "git-tree": "57ebdc7d52aef816917feb6d24ad2e6e67fa92ec", + "version-string": "jun2021", + "port-version": 0 + }, + { + "git-tree": "ec7046a3aaada7fed843b0769bcb50ec78a47555", + "version-string": "apr2021", + "port-version": 0 + }, + { + "git-tree": "5d476e8f15e28c928fc9de9898951a9eeeb5b2ae", + "version-string": "jan2021b", + "port-version": 0 + }, + { + "git-tree": "05b2c430ee01c88129da70cf887321d662be4e35", + "version-string": "jan2021", + "port-version": 0 + }, + { + "git-tree": "36706ee72a180f2e4d6aa3ed122a8eb5ceda2136", + "version-string": "nov2020b", + "port-version": 0 + }, + { + "git-tree": "176b6fd412dcff8ebb4d645021bc93991ee19b1f", + "version-string": "nov2020", + "port-version": 0 + }, + { + "git-tree": "4dde4fd5b61bf7a29841905d75b5d0e06203334c", + "version-string": "aug2020", + "port-version": 1 + }, + { + "git-tree": "11012f2e40a49c1d7f2d9d91eb418987dc5ee984", + "version-string": "aug2020", + "port-version": 0 + }, + { + "git-tree": "9f1bcaa4295b54482edf640a759d832080cc6f54", + "version-string": "jul2020", + "port-version": 0 + }, + { + "git-tree": "bb53ff8eca39b6c05c4ecac55ba9f2b554644f30", + "version-string": "jun2020", + "port-version": 0 + }, + { + "git-tree": "dc7a666e5a0571efc1d3aed1d27ddfa0510d7702", + "version-string": "dec2019-1", + "port-version": 0 + }, + { + "git-tree": "d6b3bc6f4b0c003679e035ae148bf86849a9d410", + "version-string": "dec2019", + "port-version": 0 + }, + { + "git-tree": "bafff2bf1c4f335459ad5e73a5be6942c3041469", + "version-string": "aug2019", + "port-version": 0 + }, + { + "git-tree": "14ea82b9bff0c5bca4cfe6de70537b4a33509d22", + "version-string": "jun2019-1", + "port-version": 0 + }, + { + "git-tree": "6f3c4677e6dcef4de0110c3e0a30b293ff5a0556", + "version-string": "apr2019", + "port-version": 0 + }, + { + "git-tree": "048e11d168c28f71b4d4fbab9af60311a937d23f", + "version-string": "feb2019-1", + "port-version": 0 + }, + { + "git-tree": "36b86baaef891917a11e4357e07de4e487769db3", + "version-string": "feb2019", + "port-version": 0 + }, + { + "git-tree": "b7981db46e9c6b5f51a849ba297514fbba341b68", + "version-string": "nov2018", + "port-version": 0 + }, + { + "git-tree": "052d255fcddc025ffb5cf0642f3545245a8871f9", + "version-string": "oct2018", + "port-version": 0 + }, + { + "git-tree": "554b0715d99ce7e1eed0dfc65c7b6f6c04b16cc3", + "version-string": "aug2018", + "port-version": 0 + }, + { + "git-tree": "abc75a8cb8638bdf36078814e2e3d05cb5ccad27", + "version-string": "jul2018", + "port-version": 0 + }, + { + "git-tree": "7d777b5aa3a872d525a45731fcf992e51fd7ba4f", + "version-string": "may2018b", + "port-version": 0 + }, + { + "git-tree": "5e652eaab953898bf11378f94e2690d51f2bf197", + "version-string": "may2018-9f0b4e3", + "port-version": 0 + }, + { + "git-tree": "1c5e1b457db4485ba8b29f34e07bac2f482c95ed", + "version-string": "may2018", + "port-version": 0 + }, + { + "git-tree": "2af43cbe62c1ffd869ed7593d634a3aa50bbedc1", + "version-string": "apr2018", + "port-version": 0 + }, + { + "git-tree": "f9ed42ee6df11d55634f0b0c312c0ed01788615d", + "version-string": "feb2018-eb751e0b631b05aa25c36c08e7d6bbf09f5e94a9", + "port-version": 0 + }, + { + "git-tree": "3f579dc4fd821dd00e1f124974e57caf9052c3b0", + "version-string": "feb2018", + "port-version": 0 + }, + { + "git-tree": "5392ae90a7b8357b90f2262a6a863c046e6b43d5", + "version-string": "dec2017", + "port-version": 0 + }, + { + "git-tree": "be1e2590b15f8727be109883389c2ab2cdfd374e", + "version-string": "oct2016", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/directxsdk.json b/externals/vcpkg/versions/d-/directxsdk.json new file mode 100755 index 000000000..b2361108a --- /dev/null +++ b/externals/vcpkg/versions/d-/directxsdk.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "8bed733174eb790455d8da61a3df3d89a631365d", + "version-string": "jun10", + "port-version": 5 + }, + { + "git-tree": "440a5b43febdcc709d9ae1d768371c0b184ca92e", + "version-string": "jun10", + "port-version": 4 + }, + { + "git-tree": "49dc911dc7c69f6e0eee0279afcf53187d547ae5", + "version-string": "jun10", + "port-version": 3 + }, + { + "git-tree": "1bc75766eb1ace518c8c85f8ffda0c627d714edd", + "version-string": "jun10", + "port-version": 2 + }, + { + "git-tree": "7656b85e1c390a41e14d9e5b96b1b0f093c1d1f1", + "version-string": "jun10", + "port-version": 1 + }, + { + "git-tree": "dc3241d51d057a92ef8db501c80a749a46ed4461", + "version-string": "jun10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/directxtex.json b/externals/vcpkg/versions/d-/directxtex.json new file mode 100755 index 000000000..9534b07d9 --- /dev/null +++ b/externals/vcpkg/versions/d-/directxtex.json @@ -0,0 +1,199 @@ +{ + "versions": [ + { + "git-tree": "269e245ad8428d3a09059bc195bae935613478af", + "version-date": "2022-05-09", + "port-version": 0 + }, + { + "git-tree": "15870041c7dc7d9db536c8770c6334f96af9f92c", + "version-date": "2022-03-24", + "port-version": 0 + }, + { + "git-tree": "424610ae5719fee5f738756146719d13d1483879", + "version-date": "2022-02-28", + "port-version": 0 + }, + { + "git-tree": "ec03f6fb3941d00726655dae315f09b6eb47d9ce", + "version-date": "2021-11-08", + "port-version": 1 + }, + { + "git-tree": "5c53206e385754a983e7f7c4ed208cc12f2cee44", + "version-date": "2021-11-08", + "port-version": 0 + }, + { + "git-tree": "0323aa2d24df2bb704905d709a72bd6f57571d19", + "version-string": "nov2021", + "port-version": 0 + }, + { + "git-tree": "02cba4df9bb3dab0d73b32a41dcfaa624ef53044", + "version-string": "oct2021", + "port-version": 0 + }, + { + "git-tree": "1dea5cbc125f2e87484afcd19c59b9c2955ce12d", + "version-string": "sept2021", + "port-version": 0 + }, + { + "git-tree": "fa15773926896a6f0b1f9eb47a5aed34f65175e4", + "version-string": "aug2021", + "port-version": 0 + }, + { + "git-tree": "a98fe1cd0beed414488e36e18d5e2f5a54f2d6b6", + "version-string": "jun2021", + "port-version": 0 + }, + { + "git-tree": "af7a4042d884e4cf4f85fbfc49fe928949f53aeb", + "version-string": "apr2021", + "port-version": 0 + }, + { + "git-tree": "ddb9174d08513e8ad6a9ffc4cedc024fc1b6f68d", + "version-string": "jan2021b", + "port-version": 0 + }, + { + "git-tree": "8bd2114b5c801b2dd0119df1cdf292c706e6c710", + "version-string": "jan2021", + "port-version": 0 + }, + { + "git-tree": "2f29b7ea4fb20230a14416b74217338f73321891", + "version-string": "nov2020b", + "port-version": 0 + }, + { + "git-tree": "3ed048d179ae760252ebfbae239032aaa4a55668", + "version-string": "nov2020", + "port-version": 0 + }, + { + "git-tree": "5f66ada1df71f6a66eab3e3a7f542062c05a2b65", + "version-string": "sept2020", + "port-version": 2 + }, + { + "git-tree": "9511ea0d21a048706ce9ab43f58e6e11c07c5a4f", + "version-string": "sept2020", + "port-version": 1 + }, + { + "git-tree": "da4ebd681e2f73abdd1e6ddb98227da9016039d4", + "version-string": "sept2020", + "port-version": 0 + }, + { + "git-tree": "86e422fd0e56896c67b2c9c6162131c153809a95", + "version-string": "aug2020", + "port-version": 0 + }, + { + "git-tree": "33274d5f0375ed3a24c86e5a44aa5b0ebb0eed29", + "version-string": "jul2020", + "port-version": 0 + }, + { + "git-tree": "379036fe39bd6ad5773beee39419948b2bb3667e", + "version-string": "jun2020b", + "port-version": 0 + }, + { + "git-tree": "41ce0a7f91a597423828735e95864983c542f146", + "version-string": "jun2020", + "port-version": 0 + }, + { + "git-tree": "66c6f4f723a23c0595fbd2f2499d5f956947386d", + "version-string": "dec2019", + "port-version": 0 + }, + { + "git-tree": "c26133b6a3a7283e33b723038043d65765222bba", + "version-string": "oct2019", + "port-version": 0 + }, + { + "git-tree": "82d51f420c61c107d8a0c29b250d4e91b2f94bd5", + "version-string": "aug2019", + "port-version": 0 + }, + { + "git-tree": "b7b13b8a15845208e7559384bdc81d3ed34309fe", + "version-string": "jun2019-1", + "port-version": 0 + }, + { + "git-tree": "e48a17dd7f8c6652f36e6913b51c2edd2f4ec41e", + "version-string": "apr2019", + "port-version": 0 + }, + { + "git-tree": "ce07779d60ac49db824ee83ee6d4fe1d085a5c25", + "version-string": "feb2019-1", + "port-version": 0 + }, + { + "git-tree": "301416c327fdfc9f271fe3df1984cf8af9510816", + "version-string": "feb2019", + "port-version": 0 + }, + { + "git-tree": "dcdc0b5c38f139c5fe7749d284807040c7c65696", + "version-string": "nov2018", + "port-version": 0 + }, + { + "git-tree": "2bc7a2b49986852099bb0e72f665fb4472ca8294", + "version-string": "oct2018", + "port-version": 0 + }, + { + "git-tree": "84dd8306057434231b28f19c4dbcc4286ebd6e6d", + "version-string": "aug2018b", + "port-version": 0 + }, + { + "git-tree": "e18d086dc950b71afe80543efeadbcd4f79e07ac", + "version-string": "jul2018", + "port-version": 0 + }, + { + "git-tree": "08f880f1e198a73b411667cb431b6309cb1f170e", + "version-string": "may2018b", + "port-version": 0 + }, + { + "git-tree": "ac8192166d62e84887c0539389f32375880b1342", + "version-string": "may2018", + "port-version": 0 + }, + { + "git-tree": "aa6e8e6e8483e0a5e9a3365abe73cb97a4f17e54", + "version-string": "apr2018", + "port-version": 0 + }, + { + "git-tree": "5511ded31e60723b5fe9f0a8861e4a412ee5d5cb", + "version-string": "feb2018b", + "port-version": 0 + }, + { + "git-tree": "3fc7690926dc0adce5b969e9ba29d3b41efb08f1", + "version-string": "dec2017", + "port-version": 0 + }, + { + "git-tree": "9bc9560883bbd8d08110b546f4436d6accb1ed66", + "version-string": "dec2016", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/directxtk.json b/externals/vcpkg/versions/d-/directxtk.json new file mode 100755 index 000000000..9e8af3d21 --- /dev/null +++ b/externals/vcpkg/versions/d-/directxtk.json @@ -0,0 +1,219 @@ +{ + "versions": [ + { + "git-tree": "e8707f957389d4329f61d4af69a47766fea2d6b9", + "version-date": "2022-05-09", + "port-version": 0 + }, + { + "git-tree": "d6e54dc5cc77469ecc88f949b6c149cb01f5a335", + "version-date": "2022-03-24", + "port-version": 0 + }, + { + "git-tree": "64937ca8d8ec8cc57bfdea9fea74bd39cd0ea507", + "version-date": "2022-02-28", + "port-version": 0 + }, + { + "git-tree": "34ecf07435420320f41c8aa7405926dc300359b2", + "version-date": "2021-11-08", + "port-version": 1 + }, + { + "git-tree": "57d691bc395a321a33bf9ed67cdafe438ab28a1f", + "version-date": "2021-11-08", + "port-version": 0 + }, + { + "git-tree": "b5087f78eea490106b9afd934e023a284a6b8b45", + "version-string": "nov2021", + "port-version": 0 + }, + { + "git-tree": "09200c3486444bbcce57ec680606781b5e16175c", + "version-string": "oct2021b", + "port-version": 0 + }, + { + "git-tree": "e6356a5599a11c8670068358b150033e9da82b55", + "version-string": "oct2021", + "port-version": 0 + }, + { + "git-tree": "8fa980b193db947e6a803ed413e87df23ee315c7", + "version-string": "sept2021", + "port-version": 0 + }, + { + "git-tree": "e7f8c6f80d18f82e3e5a6ab621f4e43d6a110b2b", + "version-string": "aug2021", + "port-version": 0 + }, + { + "git-tree": "d7cafe13a0edb883e2d15c917d5a042d4b599c1c", + "version-string": "jun2021", + "port-version": 0 + }, + { + "git-tree": "9502cb93d3227fa8a77cd99a9f321447eb420300", + "version-string": "apr2021", + "port-version": 0 + }, + { + "git-tree": "d27a700ccc7ce75a1f7d79665795a042d6bd5df5", + "version-string": "jan2021b", + "port-version": 0 + }, + { + "git-tree": "ec32976b82af8176471254162dd09194e254f7b2", + "version-string": "jan2021", + "port-version": 0 + }, + { + "git-tree": "43f077920adfae3d487889ebf68d92ae3ec9b2ed", + "version-string": "nov2020b", + "port-version": 0 + }, + { + "git-tree": "f0965d2f781f3ef9d573e68da46a369777f2f11e", + "version-string": "nov2020", + "port-version": 0 + }, + { + "git-tree": "df5e106f8e90ee40e4803d9b8e9586ece62d1bef", + "version-string": "sept2020", + "port-version": 1 + }, + { + "git-tree": "8f7bf3e38141622996c0ec8df5ff4bbc02ba3b30", + "version-string": "sept2020", + "port-version": 0 + }, + { + "git-tree": "2a1421fa43499dca6b752d61d9b901c910abec4f", + "version-string": "aug2020", + "port-version": 0 + }, + { + "git-tree": "0b5e1c0f132a31fc844ffee9628a025954746daa", + "version-string": "jul2020", + "port-version": 0 + }, + { + "git-tree": "d74ac33d2e6f633e9d78b0689c0b7a2a08a7071c", + "version-string": "jun2020", + "port-version": 0 + }, + { + "git-tree": "8b277e925bb60796962657881428fefb3f0748f9", + "version-string": "2019-12-31", + "port-version": 0 + }, + { + "git-tree": "d94f6451426231b43551862ddf7d72a494c42b46", + "version-string": "dec2019", + "port-version": 0 + }, + { + "git-tree": "8eed45640bd0e08e6944688810b49377a2cc847b", + "version-string": "oct2019", + "port-version": 0 + }, + { + "git-tree": "27a975b88cf7873f364ae0ae731efb5843c5d1ea", + "version-string": "aug2019", + "port-version": 0 + }, + { + "git-tree": "fe2f5f5412bd1c531f021015c018de32043bc470", + "version-string": "jun2019-1", + "port-version": 0 + }, + { + "git-tree": "b835f1587f6be6ae891fea5ad138ad8a2b64a61b", + "version-string": "apr2019-1", + "port-version": 0 + }, + { + "git-tree": "e7850594d678996a7485c8de494d7e2f6eae1620", + "version-string": "apr2019", + "port-version": 0 + }, + { + "git-tree": "5becf0551f97678676e78dd466dcd33b618fa7b8", + "version-string": "feb2019-1", + "port-version": 0 + }, + { + "git-tree": "5e0e15791435bfa9b05677077f0aa372658d20d9", + "version-string": "feb2019", + "port-version": 0 + }, + { + "git-tree": "ff8911bb856544c9932d02a5a3f4d2c957c55c50", + "version-string": "nov2018", + "port-version": 0 + }, + { + "git-tree": "3ae18c92bb0c51f89d7dc82fa8fb564dbe8d9d49", + "version-string": "oct2018b", + "port-version": 0 + }, + { + "git-tree": "548da8b2a50c39f1c67865bb7d9bf31e5d25c9f5", + "version-string": "aug2018", + "port-version": 0 + }, + { + "git-tree": "7b28a0b4dbb03f0e064a5cc50c9a2d8b27cd75ee", + "version-string": "jul2018", + "port-version": 0 + }, + { + "git-tree": "688d5c633ee85625a4254fb1f12f1c9a477e96fa", + "version-string": "may2018b", + "port-version": 0 + }, + { + "git-tree": "0977fc3a6e9f9ca7ff4813924b04b7b93fcd7378", + "version-string": "may2018", + "port-version": 0 + }, + { + "git-tree": "b5a0baf4b41b3af8a50cc2a504beab2de87fec5a", + "version-string": "apr2018", + "port-version": 0 + }, + { + "git-tree": "ec7e6aadae150836f154fb175c04dd4b3643d337", + "version-string": "feb2018", + "port-version": 0 + }, + { + "git-tree": "ec1819eb1afab7b4cb925b1f331f01efdf24b405", + "version-string": "dec2017", + "port-version": 0 + }, + { + "git-tree": "b5ee3b59c872066abb1e2cd402849d7e9b1a933b", + "version-string": "dec2016-1", + "port-version": 0 + }, + { + "git-tree": "e7f55a7894c50c4df6d3790c7072e4f0cbbca978", + "version-string": "dec2016", + "port-version": 0 + }, + { + "git-tree": "0351068f11e674838541e58f59aec84bb2b62b1a", + "version-string": "oct2016-1", + "port-version": 0 + }, + { + "git-tree": "f71eb813a31f5af63e693bee7390f9f49daaaf9a", + "version-string": "oct2016", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/directxtk12.json b/externals/vcpkg/versions/d-/directxtk12.json new file mode 100755 index 000000000..f8d53c8a9 --- /dev/null +++ b/externals/vcpkg/versions/d-/directxtk12.json @@ -0,0 +1,144 @@ +{ + "versions": [ + { + "git-tree": "e513b241157a3eada954cdb4c2d353ed4dac27e3", + "version-date": "2022-05-09", + "port-version": 0 + }, + { + "git-tree": "c89638b81272f98ae99cfb782c1269ad7b1836a5", + "version-date": "2022-03-24", + "port-version": 0 + }, + { + "git-tree": "e324f5499354e15e49fa1c591ab864b114518e74", + "version-date": "2022-02-28", + "port-version": 0 + }, + { + "git-tree": "2019efd91b858e5075651d1ebbfa45dc1961aa2d", + "version-date": "2021-11-08", + "port-version": 1 + }, + { + "git-tree": "538dfbadce1c413fae24e65d900ab30ca5ff6877", + "version-date": "2021-11-08", + "port-version": 0 + }, + { + "git-tree": "2edb55441546d26caa15d12504be4f1cbd87986d", + "version-string": "nov2021", + "port-version": 0 + }, + { + "git-tree": "c3c3a04e2a9b6d1b85341e3d2dcc09d5a04df160", + "version-string": "oct2021", + "port-version": 0 + }, + { + "git-tree": "22e26ef3a716ae717ef2e972ce47ea6436d7025b", + "version-string": "sept2021", + "port-version": 0 + }, + { + "git-tree": "49693bbdb6a484add7a33c52cb54059beca228b9", + "version-string": "aug2021", + "port-version": 0 + }, + { + "git-tree": "eba43932b7f93d4dedbd866542362f12933e3a74", + "version-string": "jun2021", + "port-version": 0 + }, + { + "git-tree": "49e5974a7aee2ea6a1d4639e7bf885947db11ea0", + "version-string": "apr2021", + "port-version": 0 + }, + { + "git-tree": "5f5b3546a9e14c89e73ebe317d01c00833f6345f", + "version-string": "jan2021b", + "port-version": 0 + }, + { + "git-tree": "33e0b497c7aed981580b9e651a57f202fa8cc2bc", + "version-string": "jan2021", + "port-version": 0 + }, + { + "git-tree": "091e8374dd6d3e6791c707e70d532534eed6446d", + "version-string": "nov2020b", + "port-version": 0 + }, + { + "git-tree": "eb5e1ee7e45db4d3eae9c88c04fb7fdf578637c0", + "version-string": "nov2020", + "port-version": 0 + }, + { + "git-tree": "e2ec3cbf346af2d03ac533d1afaf006e2c93b95f", + "version-string": "sept2020", + "port-version": 1 + }, + { + "git-tree": "6a10203845e82341e76bf024877f58fbce14c19d", + "version-string": "sept2020", + "port-version": 0 + }, + { + "git-tree": "0ab4298254947d4e2ba940d37e56e1f85ad2f609", + "version-string": "aug2020", + "port-version": 0 + }, + { + "git-tree": "46c64e6720edf886d41568d60d4808b739dee9c6", + "version-string": "jul2020", + "port-version": 0 + }, + { + "git-tree": "da75188b5c809b6c9eb9e4877677a5e307f5ca65", + "version-string": "jun2020b", + "port-version": 0 + }, + { + "git-tree": "93a0da0782de00d288548b425c5ab10eccb379b8", + "version-string": "jun2020", + "port-version": 0 + }, + { + "git-tree": "ad32aa7512aced016ce6c9e7f6e844a4864d29cd", + "version-string": "dec2019", + "port-version": 0 + }, + { + "git-tree": "1c6076fb89534f09a6c49f77acb71c39252de1bb", + "version-string": "oct2019", + "port-version": 0 + }, + { + "git-tree": "f27570b4715f87eaadb3b0b3e8f420a2e6fc57c1", + "version-string": "aug2019", + "port-version": 0 + }, + { + "git-tree": "cfc2ce5a2867056d9130e8c96b4d71333f2f033e", + "version-string": "jun2019-1", + "port-version": 0 + }, + { + "git-tree": "81b3d5878ce96169cdd5c6c6a86584d3cbd4431d", + "version-string": "dec2016-1", + "port-version": 0 + }, + { + "git-tree": "721c82212aa2db6deae89e92baebd7aacd87b71b", + "version-string": "dec2016", + "port-version": 0 + }, + { + "git-tree": "f494f61b7f9a8c200fc8be555254747305d24d20", + "version-string": "oct2016", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/dirent.json b/externals/vcpkg/versions/d-/dirent.json new file mode 100755 index 000000000..7bd05e891 --- /dev/null +++ b/externals/vcpkg/versions/d-/dirent.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "75a51df9f74a0b771b858caf42d3111a6386945c", + "version-string": "1.23.2", + "port-version": 1 + }, + { + "git-tree": "b1ac2911c352ec0e8485c4cb49f544d0f05d749b", + "version-string": "1.23.2", + "port-version": 0 + }, + { + "git-tree": "9ac9e39d19d468c4379bbc2dd007bd36c41e02c9", + "version-string": "1.23.1", + "port-version": 0 + }, + { + "git-tree": "b437dfebb93d0be9351f37361b7b7d3473f09893", + "version-string": "2017-06-23-5c7194c2fe2c68c1a8212712c0b4b6195382d27d", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/discord-game-sdk.json b/externals/vcpkg/versions/d-/discord-game-sdk.json new file mode 100755 index 000000000..636bbfe88 --- /dev/null +++ b/externals/vcpkg/versions/d-/discord-game-sdk.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "792eac2fec1f5fbeff9cd819c73a08b8eefabb14", + "version": "2.5.6", + "port-version": 4 + }, + { + "git-tree": "4ddd26248ed26eb2676c96330e8ae5a0c3f82a3d", + "version": "2.5.6", + "port-version": 3 + }, + { + "git-tree": "17cdcbe9e20da2ed085fc2de181ae426d62f2609", + "version-string": "2.5.6", + "port-version": 2 + }, + { + "git-tree": "b3144d3d155b301d8a23508ae75be2f630ede9f0", + "version-string": "2.5.6-1", + "port-version": 0 + }, + { + "git-tree": "edc6272d96fe6c701cc1d5565a654fa99298aed8", + "version-string": "2.5.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/discord-rpc.json b/externals/vcpkg/versions/d-/discord-rpc.json new file mode 100755 index 000000000..330ebf037 --- /dev/null +++ b/externals/vcpkg/versions/d-/discord-rpc.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "8b2b68ae08dffdf7b990d40a34b1ea53621aa856", + "version-string": "3.4.0", + "port-version": 1 + }, + { + "git-tree": "161afe071b88dc53bff7dd5b13909872ee370f92", + "version-string": "3.4.0", + "port-version": 0 + }, + { + "git-tree": "884bdeec3cee8a31ef3582bd02d7d5f74bb7350c", + "version-string": "3.3.0-2", + "port-version": 0 + }, + { + "git-tree": "c91435c083272a10a6dde2b60f459b3935a27352", + "version-string": "3.3.0-1", + "port-version": 0 + }, + { + "git-tree": "43ca432511afc78b75a2e2f1cd6af4cfb3c4e03e", + "version-string": "3.3.0", + "port-version": 0 + }, + { + "git-tree": "404cac887c7f316b8611fdb02a711f13ae72ebaa", + "version-string": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "064e1e21b008cd25b2109d2587c27aa2a975ea3b", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "cdda8cfdba2b8ed6626145c9427da3ab62fa4b9c", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "963a072ff188cc86de5b03e57dfe671ed20b6f37", + "version-string": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "dd9d629d2964c2339f8f8d06557b64a6d9077344", + "version-string": "2.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/discordcoreapi.json b/externals/vcpkg/versions/d-/discordcoreapi.json new file mode 100755 index 000000000..50434f139 --- /dev/null +++ b/externals/vcpkg/versions/d-/discordcoreapi.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "c672bbd1eb0e22b11d0f3c20202a603c3a4634ed", + "version-date": "2022-05-05", + "port-version": 0 + }, + { + "git-tree": "dd790721f9b6d332bbcdae69e83a716720eedc1a", + "version-date": "2022-04-17", + "port-version": 0 + }, + { + "git-tree": "70c609a4d2bc6319e046e08e25842c4559bfc556", + "version-date": "2022-03-30", + "port-version": 1 + }, + { + "git-tree": "d7e58144cce6a1eeda7ae8cac47726a9edddfbec", + "version-date": "2022-03-30", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/discount.json b/externals/vcpkg/versions/d-/discount.json new file mode 100755 index 000000000..f58d95ef1 --- /dev/null +++ b/externals/vcpkg/versions/d-/discount.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "28fe4ebbd4c5a94313b661b5ff5b0751ad186a69", + "version-string": "2.2.6", + "port-version": 1 + }, + { + "git-tree": "b5d813e867f3c5a663035c966b9259d20e21113d", + "version-string": "2.2.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/discreture.json b/externals/vcpkg/versions/d-/discreture.json new file mode 100755 index 000000000..42c62e203 --- /dev/null +++ b/externals/vcpkg/versions/d-/discreture.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ff9bb91c1f3a20a851b95e33cba5f682c2f95fd4", + "version-string": "2020-01-29", + "port-version": 1 + }, + { + "git-tree": "7977d6135bba5e0648102988dc1a1f9ed422da8e", + "version-string": "2020-01-29", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/distorm.json b/externals/vcpkg/versions/d-/distorm.json new file mode 100755 index 000000000..c8cacd594 --- /dev/null +++ b/externals/vcpkg/versions/d-/distorm.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "703f2fc39b6b60af3a301a3db7cbffcd95445e75", + "version-string": "3.5.2b", + "port-version": 0 + }, + { + "git-tree": "ac14ace119d357f555286753afa0bbced4b643e7", + "version-string": "3.4.1", + "port-version": 1 + }, + { + "git-tree": "15c619603ae1ba21211e5dd32887461375dde046", + "version-string": "3.4.1", + "port-version": 0 + }, + { + "git-tree": "9898eb0abde3836b84b1d2ad494171c24b40ebcf", + "version-string": "2018-08-26-16e6f435-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/dlfcn-win32.json b/externals/vcpkg/versions/d-/dlfcn-win32.json new file mode 100755 index 000000000..f3208fac6 --- /dev/null +++ b/externals/vcpkg/versions/d-/dlfcn-win32.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "6ae0dd5fc5f29e2299690404410ce7129ec5c035", + "version": "1.1.1", + "port-version": 6 + }, + { + "git-tree": "37cc87e9f214e146c81fff2a8aa5ae018622674d", + "version-string": "1.1.1", + "port-version": 5 + }, + { + "git-tree": "1d930427c522c5e3e56535ee4739b0157b3f6592", + "version-string": "1.1.1-4", + "port-version": 0 + }, + { + "git-tree": "300cb04ec355e27343fda27793230ecc70be22ff", + "version-string": "1.1.1-3", + "port-version": 0 + }, + { + "git-tree": "a3bc391b0c50eb710a532a376d4e2c417202fae5", + "version-string": "1.1.1-2", + "port-version": 0 + }, + { + "git-tree": "2355654c9ec494b10af17a1e4fbddb70044352da", + "version-string": "1.1.1-1", + "port-version": 0 + }, + { + "git-tree": "00028cfa9a7fc204b3e3c017c09891e8fc999c96", + "version-string": "1.1.1", + "port-version": 0 + }, + { + "git-tree": "3d9dfd1b7f891fc7f284a467697c45d3825c533d", + "version-string": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/dlib.json b/externals/vcpkg/versions/d-/dlib.json new file mode 100755 index 000000000..a1af91a22 --- /dev/null +++ b/externals/vcpkg/versions/d-/dlib.json @@ -0,0 +1,179 @@ +{ + "versions": [ + { + "git-tree": "825d6117ba43320dd5969535320b8be3144ea9de", + "version": "19.23", + "port-version": 0 + }, + { + "git-tree": "c92510c697bca717ad070d4462e44a4c26735b91", + "version": "19.22", + "port-version": 0 + }, + { + "git-tree": "971541b525e72e4ca19c0e20d7ddf7ce1cd2ee83", + "version": "19.21", + "port-version": 6 + }, + { + "git-tree": "58207e22ff2355358bee9fb607b03b6cab1030c6", + "version": "19.21", + "port-version": 5 + }, + { + "git-tree": "498121f386e722fbc511caac849425041206735b", + "version-string": "19.21", + "port-version": 4 + }, + { + "git-tree": "93c3650ee6698683d7a65f8a7cc03e5fee7fdda9", + "version-string": "19.21", + "port-version": 3 + }, + { + "git-tree": "36ff8f0b680d1068b6318e1dc149096a28fed41f", + "version-string": "19.21", + "port-version": 2 + }, + { + "git-tree": "48c6040ef938ee53379ed4bccd8cd2fe5a9551ee", + "version-string": "19.19", + "port-version": 2 + }, + { + "git-tree": "e41e2e3c3e8f11c6277e583b8a50a8a10604483b", + "version-string": "19.19-1", + "port-version": 0 + }, + { + "git-tree": "007b52ee0b6dc11eee049d5930a32d5864eef6d2", + "version-string": "19.19", + "port-version": 0 + }, + { + "git-tree": "a04fc6d703749c451fcf4c589929c73a5ab82e2a", + "version-string": "19.17-1", + "port-version": 0 + }, + { + "git-tree": "63e4ee29f9b50429441592177e358774d3f20a5a", + "version-string": "19.17", + "port-version": 0 + }, + { + "git-tree": "a57ef7b003f8051f391a0bc82866c126f8173b7e", + "version-string": "19.16-3", + "port-version": 0 + }, + { + "git-tree": "60da09f41659a5729ba95a6b50304a8d9c4eda65", + "version-string": "19.16-2", + "port-version": 0 + }, + { + "git-tree": "c57d410e5f4d38060115cb965a8105aedf4f8147", + "version-string": "19.16-1", + "port-version": 0 + }, + { + "git-tree": "0e2377249ea97283032ae089bcbae5309a74f402", + "version-string": "19.16", + "port-version": 0 + }, + { + "git-tree": "c4273f5170685fc99eb06e7a83c0dd4efcad0ba6", + "version-string": "19.15", + "port-version": 0 + }, + { + "git-tree": "e50d155c9403c58c5e23e3470acd567abc8d2e04", + "version-string": "19.14", + "port-version": 0 + }, + { + "git-tree": "cba74e361c6fe3a8ed61fb97915bdf4cf671f0f1", + "version-string": "19.13-1", + "port-version": 0 + }, + { + "git-tree": "97c184de034ad641b2b0d8d4a8a23c26ad339d7b", + "version-string": "19.13", + "port-version": 0 + }, + { + "git-tree": "f0cadc6c201deccbb53d1121d2e2ae61485f5969", + "version-string": "19.12", + "port-version": 0 + }, + { + "git-tree": "239bf64f33b79e3f0c07b67f0ae89b990a78e620", + "version-string": "19.11", + "port-version": 0 + }, + { + "git-tree": "b30cc97571f2d9c7de1fdffed7a85d372b441bc6", + "version-string": "19.10-1", + "port-version": 0 + }, + { + "git-tree": "030a4b514766957430e353ad1c961a0f874cae78", + "version-string": "19.10", + "port-version": 0 + }, + { + "git-tree": "1ed8369719493c97d5a61e4c69c14723de2171a3", + "version-string": "19.9-1", + "port-version": 0 + }, + { + "git-tree": "f812072b97e6d2fec21d2f814ee4e7177285d18e", + "version-string": "19.9", + "port-version": 0 + }, + { + "git-tree": "52e052f19698d56ad12c29ed2893f117dab6e103", + "version-string": "19.8", + "port-version": 0 + }, + { + "git-tree": "a4fd10e90817e483d22b36777b4c4e40fb924762", + "version-string": "19.7", + "port-version": 0 + }, + { + "git-tree": "96fa3b8551d9025e70daf4668a39f5ef8cc11c7e", + "version-string": "19.4-5", + "port-version": 0 + }, + { + "git-tree": "e2c08671198089e1afcf6bb5e02405b7eee6ef9b", + "version-string": "19.4-4", + "port-version": 0 + }, + { + "git-tree": "d7254e9ed6f9c2996a9339b8a0d11b464d8aedd6", + "version-string": "19.4-3", + "port-version": 0 + }, + { + "git-tree": "5fee6c59aa53e2151015d6274be960637ff6abdf", + "version-string": "19.4-2", + "port-version": 0 + }, + { + "git-tree": "871149e3fd2c483cd70a7da63cb2198ae42b9d57", + "version-string": "19.4-1", + "port-version": 0 + }, + { + "git-tree": "b8736ac9920fc03825f21f3d33da9177be9fbfbe", + "version-string": "19.4", + "port-version": 0 + }, + { + "git-tree": "04858033c7eec029d9373f5195af24077e12b14e", + "version-string": "19.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/dmlc.json b/externals/vcpkg/versions/d-/dmlc.json new file mode 100755 index 000000000..72b091b61 --- /dev/null +++ b/externals/vcpkg/versions/d-/dmlc.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "2d1ce501d0c9ed32e6de5f73290635b259f67364", + "version-date": "2019-08-12", + "port-version": 7 + }, + { + "git-tree": "47d5b971d74b762c6c52e676d5c1c082ee462c0e", + "version-date": "2019-08-12", + "port-version": 6 + }, + { + "git-tree": "162f71aa6f31426d3e8cbbb2614c8bba689e7bbc", + "version-string": "2019-08-12", + "port-version": 5 + }, + { + "git-tree": "679cba8e39c453c95a626180449c68a0aa41f724", + "version-string": "2019-08-12-4", + "port-version": 0 + }, + { + "git-tree": "8144bc4d160d6b8b5b587b09e928bcd63cd8f999", + "version-string": "2019-08-12-3", + "port-version": 0 + }, + { + "git-tree": "9ffee91ae2b218213b6b3ec3168dfbbaa6091035", + "version-string": "2019-08-12-2", + "port-version": 0 + }, + { + "git-tree": "e53b33f0463c5ca5b90ed092f964aca0fd5381b2", + "version-string": "2019-08-12-1", + "port-version": 0 + }, + { + "git-tree": "d458cedfdd6545d210d99785e53cc45b833ab994", + "version-string": "2019-08-12", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/docopt.json b/externals/vcpkg/versions/d-/docopt.json new file mode 100755 index 000000000..571cee5e2 --- /dev/null +++ b/externals/vcpkg/versions/d-/docopt.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "8af85233a92e8e8b249d61a56c50ef2c6704909b", + "version-string": "2018-11-01", + "port-version": 1 + }, + { + "git-tree": "e1556dd1eee1f9dcbef7040a36be5ea88cbfdc05", + "version-string": "2018-11-01", + "port-version": 0 + }, + { + "git-tree": "d9916398df4ec979a0d913fd3547bebc49195146", + "version-string": "2018-04-16-2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/doctest.json b/externals/vcpkg/versions/d-/doctest.json new file mode 100755 index 000000000..f2afaf04b --- /dev/null +++ b/externals/vcpkg/versions/d-/doctest.json @@ -0,0 +1,119 @@ +{ + "versions": [ + { + "git-tree": "74d6364092a4086dd36a0d54a3d16e3cc24fe478", + "version": "2.4.8", + "port-version": 0 + }, + { + "git-tree": "15aee759d06d6b4a61bc3fec3ecd1fbfac7c1d05", + "version": "2.4.6", + "port-version": 0 + }, + { + "git-tree": "7e39ece916763931668299b3856bbbb8e41308cf", + "version-string": "2.4.5", + "port-version": 1 + }, + { + "git-tree": "77531913ab5554ea00ea412788ca2b003d0f436b", + "version-string": "2.4.5", + "port-version": 0 + }, + { + "git-tree": "1d58c700fab37cda9857b949305ac9b270847099", + "version-string": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "8cf78ba91767e6f8d77a486483957042e1aab8d9", + "version-string": "2.3.7", + "port-version": 0 + }, + { + "git-tree": "25285c4f4856b1cdfc61f4122fa50d3608e364cc", + "version-string": "2.3.6", + "port-version": 0 + }, + { + "git-tree": "da99fb407acfff68d6c001d55764742f8444af65", + "version-string": "2.3.5", + "port-version": 0 + }, + { + "git-tree": "ad8731ea9a4f7fe3e5623d69d47b0e81128d7679", + "version-string": "2.3.4", + "port-version": 0 + }, + { + "git-tree": "639b20350fbc0b76534e7b4d226ee3851a2a80a1", + "version-string": "2.3.3", + "port-version": 0 + }, + { + "git-tree": "6f3c6cfa086c5a32390fba4527c2f15d8955940c", + "version-string": "2.3.2", + "port-version": 0 + }, + { + "git-tree": "54e9d742bfa919458a0c70d60f4854b04a5d0932", + "version-string": "2.3.1", + "port-version": 0 + }, + { + "git-tree": "89514eff610a5dfec90619c6816aa081e20ad758", + "version-string": "2.2.3", + "port-version": 0 + }, + { + "git-tree": "ce59f0d2b9707d682b1ab7ccf8b2cc8039e0e901", + "version-string": "2.2.2", + "port-version": 0 + }, + { + "git-tree": "c892b11d6c6b8e2390801d11756deae63a47f46f", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "26b186663d4f3bd3faa287dc120855fcd851d3b3", + "version-string": "2.0.1", + "port-version": 0 + }, + { + "git-tree": "264e1b8a34213bb76800163e96e0d1d4fab7b41d", + "version-string": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "797abd04148ac16ec746dc5870d5ad4ac2f5114d", + "version-string": "1.2.9", + "port-version": 0 + }, + { + "git-tree": "d986d30a2bcf793684ab50eb834a8944c3cbad48", + "version-string": "1.2.8", + "port-version": 0 + }, + { + "git-tree": "dd4c3ee882ff9d258691b5ff28ac99cd3b6c6a2b", + "version-string": "1.2.7", + "port-version": 0 + }, + { + "git-tree": "012933eb4feab18e017ef270b668c465cdb168b3", + "version-string": "1.2.6", + "port-version": 0 + }, + { + "git-tree": "8baa5aef61bf5aa97b8e24f0cb63b44b151b50af", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "9948fb5980e7bfa684554922681b34a34de6ac53", + "version-string": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/double-conversion.json b/externals/vcpkg/versions/d-/double-conversion.json new file mode 100755 index 000000000..133306d2c --- /dev/null +++ b/externals/vcpkg/versions/d-/double-conversion.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "b85d7877f614063165639f251200a65e8d5c9ba5", + "version": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "d28a31601897003105b70c847d82a82cd5b5355a", + "version-string": "3.1.5", + "port-version": 1 + }, + { + "git-tree": "ce6fc681ae5017ab5c3a7b166ab4de2f62f8a78d", + "version-string": "3.1.5", + "port-version": 0 + }, + { + "git-tree": "1939d35942dc9afe61c0ae1152d05162747ffcd3", + "version-string": "3.1.4", + "port-version": 0 + }, + { + "git-tree": "fcc1a2eb7cab96a1de2ec8d92742e586cfd85e26", + "version-string": "3.1.0-2", + "port-version": 0 + }, + { + "git-tree": "da4b2c13e88c06b80ec09cb0455dd72e47b22330", + "version-string": "3.1.0-1", + "port-version": 0 + }, + { + "git-tree": "27f908a453ae74155875f4d01018755ddbb1ec09", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "3c54f258cf2f6c0da55274b2d67eb1f8a27e60c5", + "version-string": "3.0.0-2", + "port-version": 0 + }, + { + "git-tree": "670c6500028c70c426c8778d70026481617ff3c0", + "version-string": "3.0.0-1", + "port-version": 0 + }, + { + "git-tree": "2c903d35e18cf71696663cb8da6875afce4a0523", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "1c74cd82ed07054ad12700bea60df097a4d1e43e", + "version-string": "2.0.1-1", + "port-version": 0 + }, + { + "git-tree": "3885e419b52751a3ca75aa407c029f4f65fbdb46", + "version-string": "2.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/dpdk.json b/externals/vcpkg/versions/d-/dpdk.json new file mode 100755 index 000000000..913bf2912 --- /dev/null +++ b/externals/vcpkg/versions/d-/dpdk.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "c259e16015f4cedca26e9fa3cb1aaafa3b3e4955", + "version-string": "19.02", + "port-version": 1 + }, + { + "git-tree": "7ceb4ec08ceffd575220fb624ef996d4fd83a938", + "version-string": "19.02", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/draco.json b/externals/vcpkg/versions/d-/draco.json new file mode 100755 index 000000000..e3b1eb6d0 --- /dev/null +++ b/externals/vcpkg/versions/d-/draco.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "e7d67016c671b628353196ef4138cfd91feb2d33", + "version": "1.4.3", + "port-version": 0 + }, + { + "git-tree": "3289b6aa2981d3fb169f35ca384608b514210401", + "version": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "d306b49fab537cd9980ce5de0c994372a1300777", + "version": "1.3.6", + "port-version": 2 + }, + { + "git-tree": "c3690271c81d83c2016d5710acaa76a94d6d78b8", + "version": "1.3.6", + "port-version": 1 + }, + { + "git-tree": "14563e699abc99cebdcd2b4e54b76e91c05d96be", + "version-string": "1.3.6", + "port-version": 0 + }, + { + "git-tree": "5761b113b143fc3aee0d887b4fbe08394940e5b9", + "version-string": "1.3.5", + "port-version": 0 + }, + { + "git-tree": "c65dcbf013091adae5df1bf6ab682bcd43bec7f5", + "version-string": "1.3.3-2", + "port-version": 0 + }, + { + "git-tree": "3276b205448d44b284db7cc7fc6c3115e63e38a6", + "version-string": "1.3.3-1", + "port-version": 0 + }, + { + "git-tree": "7895001547ede04d85923e3f5042894014f57a5e", + "version-string": "1.3.3", + "port-version": 0 + }, + { + "git-tree": "b95ae63ee54d658206b66932df715b581b23a076", + "version-string": "1.2.5", + "port-version": 0 + }, + { + "git-tree": "c4e4c95ec50227c780e5839d67e0fc2095059d78", + "version-string": "0.10.0-1", + "port-version": 0 + }, + { + "git-tree": "efcd666252609b815e92299676ffab9658874e85", + "version-string": "0.10.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/drlibs.json b/externals/vcpkg/versions/d-/drlibs.json new file mode 100755 index 000000000..79c361f3d --- /dev/null +++ b/externals/vcpkg/versions/d-/drlibs.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "4fbb06000e3d4c3699920debbc828cc279362d91", + "version-date": "2022-04-03", + "port-version": 0 + }, + { + "git-tree": "80b487d4ce97c60609cdba15430c0d8b34fb6235", + "version-date": "2021-11-02", + "port-version": 0 + }, + { + "git-tree": "f82c3255ba101684781f57429f162b8f8528a972", + "version-string": "2019-08-12", + "port-version": 1 + }, + { + "git-tree": "503bcfa3a091377c8a53f52b12c463a1570b6af6", + "version-string": "2019-08-12", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/drogon.json b/externals/vcpkg/versions/d-/drogon.json new file mode 100755 index 000000000..7e0e9d97f --- /dev/null +++ b/externals/vcpkg/versions/d-/drogon.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "a66c2bb4632ab86589f1cabed26607d510ae2eba", + "version-semver": "1.7.5", + "port-version": 0 + }, + { + "git-tree": "b7be1868461c479ff45609e892bc5de9adf42258", + "version-semver": "1.7.4", + "port-version": 2 + }, + { + "git-tree": "e5e1c950e966613f9b867570346f9458bff71826", + "version-semver": "1.7.4", + "port-version": 1 + }, + { + "git-tree": "275d55a78bb61a79f0d66cd4f71e6b5892566666", + "version-semver": "1.7.4", + "port-version": 0 + }, + { + "git-tree": "35877feed401993a073b537fbd89f8b55b5be6d1", + "version-semver": "1.7.3", + "port-version": 0 + }, + { + "git-tree": "34e8225c88ebbf0713112235dddbe6eae11121fb", + "version-semver": "1.7.1", + "port-version": 2 + }, + { + "git-tree": "6293f8fcc884c9ed56a4a3138722401451ff445d", + "version-semver": "1.7.1", + "port-version": 1 + }, + { + "git-tree": "a325c34025250341e3f721353d5d3dfa66017e2b", + "version-string": "1.7.1", + "port-version": 0 + }, + { + "git-tree": "29f71d851bbd006bfed9aaad62b34158b3f7cc0a", + "version-string": "1.6.0", + "port-version": 0 + }, + { + "git-tree": "b4640b2eac30f14ae5d41ddada94ca779aa1b597", + "version-string": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "689f5dd439df7059e4bec7a5f7e7824070b0a9b8", + "version-string": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "bbe57dbdbffedb8cd5218f8dc76c1bbe35b59b5d", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "f6370e6a96e12ad2fdd2cbefbe442e6b794091dc", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "680d234c5fb187d7a81e8852ba7657e3219f349c", + "version-string": "1.0.0", + "port-version": 1 + }, + { + "git-tree": "74b42c3e5deada7e972999fb18e5c6613e18cd3c", + "version-string": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "70642f5b56566490fe37e91535f9aa54730595e8", + "version-string": "v1.0.0-beta21", + "port-version": 0 + }, + { + "git-tree": "09b0f3721d903e2f4845892f56fbbee6a8ae785c", + "version-string": "v1.0.0-beta20", + "port-version": 0 + }, + { + "git-tree": "0709b03e378fff2af3f383f6ef3debf20c572b2a", + "version-string": "v1.0.0-beta18", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/dstorage.json b/externals/vcpkg/versions/d-/dstorage.json new file mode 100755 index 000000000..d2e8dfa9d --- /dev/null +++ b/externals/vcpkg/versions/d-/dstorage.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "6672c5472d42f2ba2e3fe0a0e8acf3d00879c129", + "version": "1.0.2", + "port-version": 0 + }, + { + "git-tree": "8b3e0c3eaf98dec92b8e97f19e10efac69c6a187", + "version": "1.0.0", + "port-version": 1 + }, + { + "git-tree": "b2494bc112c6d12ffbb8a8bc687a1ae2ad583221", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/dtl.json b/externals/vcpkg/versions/d-/dtl.json new file mode 100755 index 000000000..ebed0a267 --- /dev/null +++ b/externals/vcpkg/versions/d-/dtl.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "67d6f73d3a78adeb42c9eee4c75d55c17ce1ea18", + "version-string": "1.19", + "port-version": 1 + }, + { + "git-tree": "d6fe181396229123090f09dcb6a9d7cff25f8045", + "version-string": "1.19", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/duckx.json b/externals/vcpkg/versions/d-/duckx.json new file mode 100755 index 000000000..40f642721 --- /dev/null +++ b/externals/vcpkg/versions/d-/duckx.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "bed3914236def15bab45f3969a169005a25d3f1d", + "version": "1.2.2", + "port-version": 1 + }, + { + "git-tree": "6637b59789032a1ef84a1c6324bc7b672e346152", + "version": "1.2.2", + "port-version": 0 + }, + { + "git-tree": "2f862e06f527a656f8bbe1133a0ba212833f6951", + "version-string": "1.0.0", + "port-version": 1 + }, + { + "git-tree": "b0d07b78faf406cedb00c24f66a546abc6492f6f", + "version-string": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "0cfc85b61c6fe9dd13442c33b1ecaad1ef83ec30", + "version-string": "2019-08-06", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/duilib.json b/externals/vcpkg/versions/d-/duilib.json new file mode 100755 index 000000000..3b6ebdde1 --- /dev/null +++ b/externals/vcpkg/versions/d-/duilib.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "36c7ba26c4af9fabce94dfb4a2ffe87b7b7467c0", + "version-date": "2019-04-28", + "port-version": 5 + }, + { + "git-tree": "c23619497c06f6d2e22dae79e731c2a7da51208c", + "version-string": "2019-4-28", + "port-version": 4 + }, + { + "git-tree": "58b8c9eb93832387ea6efc1ae1071395cd4a22d2", + "version-string": "2019-4-28", + "port-version": 3 + }, + { + "git-tree": "d1a36d9e38313306f28b94d238e120deabfec9ea", + "version-string": "2019-4-28-2", + "port-version": 0 + }, + { + "git-tree": "7b2ac283b271794651cb3ec15aed29c39f63871e", + "version-string": "2019-4-28-1", + "port-version": 0 + }, + { + "git-tree": "2d4e7b730b791c10f6ee5768fe826e3883255720", + "version-string": "2019-4-28", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/duktape.json b/externals/vcpkg/versions/d-/duktape.json new file mode 100755 index 000000000..b1f2e3bb2 --- /dev/null +++ b/externals/vcpkg/versions/d-/duktape.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "1882f1d359d8c0463a3c7e9d41804a3a9df8f5f9", + "version-string": "2.5.0", + "port-version": 2 + }, + { + "git-tree": "bb94b30a10ff262e574d2824c503c0be67e09e80", + "version-string": "2.5.0", + "port-version": 1 + }, + { + "git-tree": "b193e6414ec9e5404927edbb2113b9c7ed3d7f73", + "version-string": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "a53aa75f27ae8b289fb9c292c74b7a730091aca2", + "version-string": "2.4.0-7", + "port-version": 0 + }, + { + "git-tree": "d85fa17f714209148e10d76bc52d78d5a5c21d50", + "version-string": "2.4.0-6", + "port-version": 0 + }, + { + "git-tree": "0b306f9abd0fcffd0c144dfc31d85b6f24d07185", + "version-string": "2.4.0-5", + "port-version": 0 + }, + { + "git-tree": "59b24806daec2039df467169cc74a475047e15e0", + "version-string": "2.4.0-4", + "port-version": 0 + }, + { + "git-tree": "a751082f25e5eddb0b03cce1e55a2a2a9f295413", + "version-string": "2.4.0-3", + "port-version": 0 + }, + { + "git-tree": "1cbd391df5f63deaf525a8ad3422c096d40b0cfd", + "version-string": "2.3.0-3", + "port-version": 0 + }, + { + "git-tree": "4e6474670cff47f42afed4cb97ba589bb8df89e4", + "version-string": "2.3.0-2", + "port-version": 0 + }, + { + "git-tree": "aeaccb9d00f157d5b1f9303f96e48b28014df1e9", + "version-string": "2.3.0-1", + "port-version": 0 + }, + { + "git-tree": "bb5cc7b63a51364aa9b952c7ede51d07c4480056", + "version-string": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "e5e4405efa24f0641d5be03a659c4424dfac89e2", + "version-string": "2.0.3-6", + "port-version": 0 + }, + { + "git-tree": "8e404cf257e1b452db3bcb4f00ee18aa051d489e", + "version-string": "2.0.3-5", + "port-version": 0 + }, + { + "git-tree": "70c4b7ab84e2c87f38498ab99e94a838fd7012e3", + "version-string": "2.0.3-4", + "port-version": 0 + }, + { + "git-tree": "dc290001e17d67ddb187b8ad48c204417a8166ca", + "version-string": "2.0.3-3", + "port-version": 0 + }, + { + "git-tree": "fa53abf608f8b76d5aca8a2ba471340eb6577136", + "version-string": "2.0.3-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/dx.json b/externals/vcpkg/versions/d-/dx.json new file mode 100755 index 000000000..96dffa0a8 --- /dev/null +++ b/externals/vcpkg/versions/d-/dx.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "684efcf0d9ea4c1a8b7ec6d9440e0097ab38d586", + "version-string": "1.0.1", + "port-version": 2 + }, + { + "git-tree": "e215daa609ec48fa696871c83ad6fac358898309", + "version-string": "1.0.1-1", + "port-version": 0 + }, + { + "git-tree": "5e68673a631068ce608cb1a291a4dcc4a6c71bf4", + "version-string": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "1c0dbde0cf00869ad7ddd9e6421cbbf00be66613", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/dxsdk-d3dx.json b/externals/vcpkg/versions/d-/dxsdk-d3dx.json new file mode 100755 index 000000000..8da67907f --- /dev/null +++ b/externals/vcpkg/versions/d-/dxsdk-d3dx.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "14db52bb5daba8ba8e0a93b0e41ffa676935923a", + "version": "9.29.952.8", + "port-version": 4 + }, + { + "git-tree": "4f9cac012452363e92e36d5978972cee3b9154e5", + "version": "9.29.952.8", + "port-version": 3 + }, + { + "git-tree": "3f16a0560a2beb7205ed033b5ac2e5d5d2223161", + "version": "9.29.952.8", + "port-version": 2 + }, + { + "git-tree": "81aeb21cd027336b00f758ece5371f0c4930be2e", + "version": "9.29.952.8", + "port-version": 1 + }, + { + "git-tree": "38ff04dcf269c835a7f5c03d50a1a457350bde49", + "version": "9.29.952.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/d-/dxut.json b/externals/vcpkg/versions/d-/dxut.json new file mode 100755 index 000000000..487d9ab96 --- /dev/null +++ b/externals/vcpkg/versions/d-/dxut.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "5b6c7ea3b64d6446296a16c7ad5f8ebdeb2e9915", + "version": "11.27", + "port-version": 0 + }, + { + "git-tree": "b8f2fd1c9674e75aee3d139934b3980a47b3d0eb", + "version": "11.26", + "port-version": 1 + }, + { + "git-tree": "098b30a228f1d71cfa5b0e21a4c9bf9ade3774e6", + "version": "11.26", + "port-version": 0 + }, + { + "git-tree": "b037faaa0c10a455e68dc219788dcbf2f83aace2", + "version-string": "11.25", + "port-version": 0 + }, + { + "git-tree": "6171a1c44bd4c11d7db922b56ef55c9366fe60af", + "version-string": "11.14", + "port-version": 4 + }, + { + "git-tree": "27f3d4fe979fbc45d132894a80c6712d27be4c49", + "version-string": "11.14-3", + "port-version": 0 + }, + { + "git-tree": "9dfe80f61e8e47b031291160f1e4af01829e3cc7", + "version-string": "11.14-2", + "port-version": 0 + }, + { + "git-tree": "7afae620bf87d9fe9c3f7714f21d9791bd2ed7d3", + "version-string": "11.14-1", + "port-version": 0 + }, + { + "git-tree": "6c83b8b3dcc9d161f468dd699ea5ec10a44f9b75", + "version-string": "11.14", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/eabase.json b/externals/vcpkg/versions/e-/eabase.json new file mode 100755 index 000000000..db6461091 --- /dev/null +++ b/externals/vcpkg/versions/e-/eabase.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "40dfd9d387e788a7987db75e0d9fc22786b8e43b", + "version-string": "2.09.12", + "port-version": 2 + }, + { + "git-tree": "171ca1fc19c06e74b273601aa815049126f84212", + "version-string": "2.09.12-1", + "port-version": 0 + }, + { + "git-tree": "7fc2d9235186046afab9b8cd9b93c7feddc3a3b6", + "version-string": "2.09.12", + "port-version": 0 + }, + { + "git-tree": "1cff06bd764ebcd3a967c683eb8d99f93b196892", + "version-string": "2.09.10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/earcut-hpp.json b/externals/vcpkg/versions/e-/earcut-hpp.json new file mode 100755 index 000000000..41b661439 --- /dev/null +++ b/externals/vcpkg/versions/e-/earcut-hpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "89c9c15fcd180f5e17b02290430dfe7019dc830c", + "version": "2.2.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/eastl.json b/externals/vcpkg/versions/e-/eastl.json new file mode 100755 index 000000000..a62180cf8 --- /dev/null +++ b/externals/vcpkg/versions/e-/eastl.json @@ -0,0 +1,134 @@ +{ + "versions": [ + { + "git-tree": "aa2de2990c3b1e6e008e1cafea8ad82c765278fb", + "version-string": "3.18.00", + "port-version": 2 + }, + { + "git-tree": "41bc58f85c73fb0dec5374fc0c9b84ffc401555c", + "version-string": "3.18.00", + "port-version": 1 + }, + { + "git-tree": "a9f54d0c4a7a571329fd2ee5e8788c2a5a5414ca", + "version-string": "3.18.00", + "port-version": 0 + }, + { + "git-tree": "63d695972dd9861a2726ca90361aaafac0f710f6", + "version-string": "3.17.03", + "port-version": 1 + }, + { + "git-tree": "69fe302d6e81880f94a6a9b3ddb88437e42a9731", + "version-string": "3.17.03", + "port-version": 0 + }, + { + "git-tree": "a67055b3693b8d8906f1f51a4d90f4974b72aa0c", + "version-string": "3.16.07", + "port-version": 0 + }, + { + "git-tree": "00a4d64edf27c3db438eb9b92b3082bdb033e5cf", + "version-string": "3.16.05", + "port-version": 0 + }, + { + "git-tree": "33791e4308b71f79906925c733b03b486f9e250f", + "version-string": "3.16.01", + "port-version": 0 + }, + { + "git-tree": "793f94d38a08673020ad2cf018a94ba0aefcdd02", + "version-string": "3.14.01", + "port-version": 0 + }, + { + "git-tree": "5058008abe4fbd0b7d6971c7b7e55a1a174541bd", + "version-string": "3.14.00", + "port-version": 0 + }, + { + "git-tree": "ebdfb2b8c7523b49f5808647c6031944567e55eb", + "version-string": "3.13.05-1", + "port-version": 0 + }, + { + "git-tree": "91b64e145767f33f3295c4115f72d5af4f52ae9c", + "version-string": "3.13.05", + "port-version": 0 + }, + { + "git-tree": "e1555a1eda7b2e71921dc5491c9e36b3f6e0b7e1", + "version-string": "3.13.04-1", + "port-version": 0 + }, + { + "git-tree": "43feed149cf3008cbda6dcdb4421be2a8be361f8", + "version-string": "3.13.04", + "port-version": 0 + }, + { + "git-tree": "b101dfea873b3131ceaa876d61c52d6f91e962dc", + "version-string": "3.13.00", + "port-version": 0 + }, + { + "git-tree": "72eea3a46d4a1fd156cd29b146928dfbcac78010", + "version-string": "3.12.08", + "port-version": 0 + }, + { + "git-tree": "0a79009d6dd78f67684eaec09b01796d83705c34", + "version-string": "3.12.07", + "port-version": 0 + }, + { + "git-tree": "1585ccb53c02fc65e27688fea618e4926479bf64", + "version-string": "3.12.04", + "port-version": 0 + }, + { + "git-tree": "bd6889ee3b295ecf49f5472d472dea1c160e034a", + "version-string": "3.12.01", + "port-version": 0 + }, + { + "git-tree": "379b6cd0a250116d04de1f8bf2f4642793b3d6a3", + "version-string": "3.10.00", + "port-version": 0 + }, + { + "git-tree": "d36f15691b08df89fcfa1caaf306fdfe98c85d0a", + "version-string": "3.09.00-1", + "port-version": 0 + }, + { + "git-tree": "7663b19e2a69cb52d771dad84f363f779026f9c9", + "version-string": "3.09.00", + "port-version": 0 + }, + { + "git-tree": "3c5fab2baa9660a0f357352ea87afce5f497fc0b", + "version-string": "3.08.00", + "port-version": 0 + }, + { + "git-tree": "7e7bea9f6ac0c4cd04ffe7166f56e0087a3b7472", + "version-string": "3.07.02", + "port-version": 0 + }, + { + "git-tree": "7758ba1c4094151415a30333065593d8213a0ab8", + "version-string": "3.07.00", + "port-version": 0 + }, + { + "git-tree": "d7a646d4487b9e1737f7a3527e6d191234b2584c", + "version-string": "3.05.08", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/easycl.json b/externals/vcpkg/versions/e-/easycl.json new file mode 100755 index 000000000..88f7e35dd --- /dev/null +++ b/externals/vcpkg/versions/e-/easycl.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "f25251c36cd3423ca13cdf773e124ce01e7b08fe", + "version-string": "0.3", + "port-version": 1 + }, + { + "git-tree": "172a7b81ef634d827a5a1fb3eaf3beb10a0e3923", + "version-string": "0.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/easyhook.json b/externals/vcpkg/versions/e-/easyhook.json new file mode 100755 index 000000000..4c770cc0e --- /dev/null +++ b/externals/vcpkg/versions/e-/easyhook.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "71b209c038081c700231ebc3be136c6976f22c4b", + "version": "2.7.7097.0", + "port-version": 5 + }, + { + "git-tree": "54eb13c17af41e5e869503410d13f67e6886c8ff", + "version": "2.7.7097.0", + "port-version": 4 + }, + { + "git-tree": "6fefce9309d25f4fdd8675a3168cbfd049f9b863", + "version": "2.7.7097.0", + "port-version": 3 + }, + { + "git-tree": "c217a47b595d2a002a72ff621846a7445329b42f", + "version": "2.7.7097.0", + "port-version": 2 + }, + { + "git-tree": "5dc14a4f006221297cad1ea84143aeae33f30284", + "version": "2.7.7097.0", + "port-version": 1 + }, + { + "git-tree": "efa456841ef4446343c908f3ed36217b7a1d75a3", + "version": "2.7.7097.0", + "port-version": 0 + }, + { + "git-tree": "e427f42cec56130de81333fda405afabc88c9e82", + "version": "2.7.6789.0", + "port-version": 1 + }, + { + "git-tree": "cf87554bbdd4736b3b64210e7662d6bbe3d72b2a", + "version-string": "2.7.6789.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/easyloggingpp.json b/externals/vcpkg/versions/e-/easyloggingpp.json new file mode 100755 index 000000000..a6e90e0aa --- /dev/null +++ b/externals/vcpkg/versions/e-/easyloggingpp.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "40ca985ab8030ca0daf7c902e413423801d3e3d4", + "version": "9.97.0", + "port-version": 2 + }, + { + "git-tree": "9cf908bc2aaf8f7ec50bf54b111aed600ca50282", + "version": "9.97.0", + "port-version": 1 + }, + { + "git-tree": "3978e3f41876c42b501eb4d246ee98dea886fa36", + "version": "9.97.0", + "port-version": 0 + }, + { + "git-tree": "4dccf41488f050a70d3232a86296883b54533d2f", + "version-string": "9.96.7", + "port-version": 2 + }, + { + "git-tree": "22fde45fd8d035536d9d3bbb8b174649c037e831", + "version-string": "9.96.7-1", + "port-version": 0 + }, + { + "git-tree": "87b2df47847f79e4249a92f02428548ec951763c", + "version-string": "9.96.7", + "port-version": 0 + }, + { + "git-tree": "33abdeaa7319ba4d62db32fa7d82abc472a577b1", + "version-string": "9.96.5-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/eathread.json b/externals/vcpkg/versions/e-/eathread.json new file mode 100755 index 000000000..4568b724d --- /dev/null +++ b/externals/vcpkg/versions/e-/eathread.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "341734fa50c34beff0593368922f71829fb0ff19", + "version-string": "1.32.09", + "port-version": 3 + }, + { + "git-tree": "273dda3270d68ca1c465bb093cba07e71bd6a62f", + "version-string": "1.32.09", + "port-version": 2 + }, + { + "git-tree": "d184652fe784ad6994bb56ca562539fc0f4bb49a", + "version-string": "1.32.09-1", + "port-version": 0 + }, + { + "git-tree": "c28844e46a71c719433f2f78d74779a1a5f4b195", + "version-string": "1.32.09", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/ebml.json b/externals/vcpkg/versions/e-/ebml.json new file mode 100755 index 000000000..d6ea50e46 --- /dev/null +++ b/externals/vcpkg/versions/e-/ebml.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "4fc7059101f067e639c84844996c77eaba7908e6", + "version": "1.4.2", + "port-version": 1 + }, + { + "git-tree": "ba8376ad269930aee17a0890ccbd267639122616", + "version": "1.4.2", + "port-version": 0 + }, + { + "git-tree": "92e5e7a92a8bd6a496911ea44a032088e776471f", + "version-string": "1.4.0", + "port-version": 1 + }, + { + "git-tree": "bcf2ed38acfba94d49dfe9f4c96559771d8032c8", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "73fbf83ff5922adc1d576b12287760ac62746470", + "version-string": "1.3.10", + "port-version": 0 + }, + { + "git-tree": "22aa8d7b36297a2dea4cea042eabb89b34213213", + "version-string": "1.3.9", + "port-version": 0 + }, + { + "git-tree": "2b9aad9296245c45e56d8970d7f21cf5a3766f5b", + "version-string": "1.3.8", + "port-version": 0 + }, + { + "git-tree": "599c3901990b47d7ef9fec6e744501ca88b71834", + "version-string": "1.3.7-1", + "port-version": 0 + }, + { + "git-tree": "c2c669762fcb37711b0d70252ba49d6fda41ff71", + "version-string": "1.3.7", + "port-version": 0 + }, + { + "git-tree": "3aeaa0b4b3d5066303e1b70b62853314e60c07a5", + "version-string": "1.3.6-1", + "port-version": 0 + }, + { + "git-tree": "9c56155357fe56cd5f933290136cdc0555edcd29", + "version-string": "1.3.5-1", + "port-version": 0 + }, + { + "git-tree": "1e2d9637ba70018f164465daccbd3ec9a7dd8f2c", + "version-string": "1.3.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/ecm.json b/externals/vcpkg/versions/e-/ecm.json new file mode 100755 index 000000000..dada9a3c9 --- /dev/null +++ b/externals/vcpkg/versions/e-/ecm.json @@ -0,0 +1,119 @@ +{ + "versions": [ + { + "git-tree": "563a564f43f7e1c096cd7819531a6eece87ddcde", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "4cd5223b0a590ec5f428aa83cd4e0d3f486ad273", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "326da23f3132279545c12d753b9f7f22712fe95f", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "edf27dcd688fc8cfd8a1c6dedddc3cfb0cb1556e", + "version": "5.84.0", + "port-version": 3 + }, + { + "git-tree": "e01bd7b91852c7fa2dffc588bad45167d8d45c6b", + "version": "5.84.0", + "port-version": 2 + }, + { + "git-tree": "5832b19b778f60eb0fb24654e0c8b665f0f8fb20", + "version": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "9cd1bc0ab97889acb8839e22ec43d13bc7c97ed0", + "version": "5.84.0", + "port-version": 0 + }, + { + "git-tree": "4c5bb18c760aa4a57b5ca0d6bfd948be3856534e", + "version": "5.81.0", + "port-version": 0 + }, + { + "git-tree": "ae79be3c1aec28736e6df3b1c9e6973ac6d3c33b", + "version": "5.75.0", + "port-version": 0 + }, + { + "git-tree": "ef6c69c364962a681a9f97d8babc7e10c8d84bfe", + "version-string": "5.74.0", + "port-version": 0 + }, + { + "git-tree": "c93a80089d3ce4686d2ff507c20664a6f24ebe48", + "version-string": "5.66.0", + "port-version": 0 + }, + { + "git-tree": "9e5675b6fd45efb6a84afe103e201195d9e7bc11", + "version-string": "5.64.0-1", + "port-version": 0 + }, + { + "git-tree": "b06385518a67215d6af00ffcd920e0104c44203e", + "version-string": "5.60.0-2", + "port-version": 0 + }, + { + "git-tree": "65c9d579ad7c48181a3a14fd8366aa91a150a887", + "version-string": "5.60.0-1", + "port-version": 0 + }, + { + "git-tree": "74432fc50a0d055605f7bbd973d8487504ef3576", + "version-string": "5.60.0", + "port-version": 0 + }, + { + "git-tree": "23e1a1d4d92a6362ec37a6de5125e49aaf968fb4", + "version-string": "5.58.0", + "port-version": 0 + }, + { + "git-tree": "a6e7b64384bc8b47f59e76b4ebdf733d00392dc1", + "version-string": "5.56.0", + "port-version": 0 + }, + { + "git-tree": "80a7b8aafd7f9a6e8560acdf8ea167ac712601a6", + "version-string": "5.53.0", + "port-version": 0 + }, + { + "git-tree": "cef66b5948a134c2e5635b37d681cf9beb0ccdb8", + "version-string": "5.50.0", + "port-version": 0 + }, + { + "git-tree": "1be6f7d66136cd8d8a939e553accfc1ff50cee55", + "version-string": "5.40.0", + "port-version": 0 + }, + { + "git-tree": "e1f1fdb8cebe4ebfdc57ecb0160615e93f9aa575", + "version-string": "5.37.0-1", + "port-version": 0 + }, + { + "git-tree": "f83d6360b0b950826ee599ebd7eb4620c93da003", + "version-string": "5.37.0", + "port-version": 0 + }, + { + "git-tree": "28cdc09a25c8a85ef6f353b47af02752e40ac4eb", + "version-string": "5.32.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/ecos.json b/externals/vcpkg/versions/e-/ecos.json new file mode 100755 index 000000000..6f456c3f7 --- /dev/null +++ b/externals/vcpkg/versions/e-/ecos.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "10196c7185540fa8faccc2f3afcce7be58ab5a1f", + "version-string": "2.0.8", + "port-version": 1 + }, + { + "git-tree": "320007532a19ebb663420e8a702813e31b71da06", + "version-string": "2.0.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/ecsutil.json b/externals/vcpkg/versions/e-/ecsutil.json new file mode 100755 index 000000000..61d35945c --- /dev/null +++ b/externals/vcpkg/versions/e-/ecsutil.json @@ -0,0 +1,154 @@ +{ + "versions": [ + { + "git-tree": "93fbfca024b36b2424e521b4426efa8d40028291", + "version-string": "1.0.7.15", + "port-version": 2 + }, + { + "git-tree": "7fb65a14c061886745af3a158b7f2bc8b71184fc", + "version-string": "1.0.7.15", + "port-version": 1 + }, + { + "git-tree": "e6816d896c639acee9ea9aed9c4f6bfb3f9dbb1a", + "version-string": "1.0.7.15", + "port-version": 0 + }, + { + "git-tree": "18b022def8950388622c6d92697c485d06c98e40", + "version-string": "1.0.7.10", + "port-version": 0 + }, + { + "git-tree": "8d6723a5971e6912bda02c8d67781ba86be30c17", + "version-string": "1.0.7.9", + "port-version": 0 + }, + { + "git-tree": "0c85ec883190ed02f60728203a3291e6e3aa327b", + "version-string": "1.0.7.8", + "port-version": 0 + }, + { + "git-tree": "4cfdafa7db2d496f5c782e8b9f8f1aca6a756aff", + "version-string": "1.0.7.3", + "port-version": 0 + }, + { + "git-tree": "3cf83b91c9ee41074c1254af24be06c69528f25b", + "version-string": "1.0.7.2", + "port-version": 0 + }, + { + "git-tree": "550a92d5b0515a1697235b27e569b9bfff18e43e", + "version-string": "1.0.6.1-1", + "port-version": 0 + }, + { + "git-tree": "aedc1767af5d8afbff0f88c8189f794ea928c1d3", + "version-string": "1.0.6.1", + "port-version": 0 + }, + { + "git-tree": "f6796447d3682caea2ade82a2c2b9ef577571eb5", + "version-string": "1.0.3.1", + "port-version": 0 + }, + { + "git-tree": "592b903ab6cab601038fe88dc50a27a4a200f8b4", + "version-string": "1.0.2.1", + "port-version": 0 + }, + { + "git-tree": "5691156c70d48681221b9d57266139dfc03c8e87", + "version-string": "1.0.1.4", + "port-version": 0 + }, + { + "git-tree": "225f1907c66059054e67d927f766c9ab68003dc1", + "version-string": "1.0.1.3", + "port-version": 0 + }, + { + "git-tree": "830b1e14a4ca0b7ea19ea2bab01dac45d915cde4", + "version-string": "1.0.1.2-1", + "port-version": 0 + }, + { + "git-tree": "a714f2a28f323bf09400dc7ddc9aeb8c07ce5332", + "version-string": "1.0.1.3", + "port-version": 0 + }, + { + "git-tree": "5a3a63d23beca3b1ff6c81d8cd562550d4d7c7ce", + "version-string": "1.0.1.2-1", + "port-version": 0 + }, + { + "git-tree": "dacf113ed3b18973ca93530ff7ad3f161d6c8ef1", + "version-string": "1.0.1.2", + "port-version": 0 + }, + { + "git-tree": "bb2ae3c9c61baf4d83f86caa045cdcfaa05feceb", + "version-string": "1.0.1.1", + "port-version": 0 + }, + { + "git-tree": "45e12088ee3615d15a93a0401ef5de973a90bc63", + "version-string": "1.0.0.2", + "port-version": 0 + }, + { + "git-tree": "925b21e50d070732ae2ecc00352b49dcab48388b", + "version-string": "1.0.0.1", + "port-version": 0 + }, + { + "git-tree": "3eb88292cec6a1f7234db47049fc655dc03cf454", + "version-string": "0.9.0.9", + "port-version": 0 + }, + { + "git-tree": "5d66991ce8e5d4e96e428df18844e8f6e255bc74", + "version-string": "0.9.0.8", + "port-version": 0 + }, + { + "git-tree": "10f19ccb150b70ec3eaf51fd646465719869b4b6", + "version-string": "0.9.0.7", + "port-version": 0 + }, + { + "git-tree": "2518b4d30f6a7e3868bf9939f81bb176e3af8176", + "version-string": "0.9.0.6", + "port-version": 0 + }, + { + "git-tree": "584ed258614a3bd50a3089e46e2d86accc9c2801", + "version-string": "0.9.0.5", + "port-version": 0 + }, + { + "git-tree": "81f5d54170008f59e31b4edd5e809521ce6511bf", + "version-string": "0.9.0.4", + "port-version": 0 + }, + { + "git-tree": "bc78b4ef66133c9e3d2759b318fb1162a1b4b279", + "version-string": "0.9.0.3", + "port-version": 0 + }, + { + "git-tree": "2811bf65848b1c276c629607a1e96875bb5568b1", + "version-string": "0.9.0.2", + "port-version": 0 + }, + { + "git-tree": "63b061658c8f04d1075c34f553a928287da822b0", + "version-string": "0.9.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/edlib.json b/externals/vcpkg/versions/e-/edlib.json new file mode 100755 index 000000000..b78f396ff --- /dev/null +++ b/externals/vcpkg/versions/e-/edlib.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "65bdc2cad90a351c2f7e0034f3f6acabe54f5e1c", + "version": "1.2.7", + "port-version": 1 + }, + { + "git-tree": "bbcb572fded319dcbb790d57132513c35be4a9fa", + "version": "1.2.7", + "port-version": 0 + }, + { + "git-tree": "f1c507cb59e800c53256b3722b862df4ff41dbd6", + "version-string": "1.2.6", + "port-version": 1 + }, + { + "git-tree": "a8e115424a7e2e54788cdda6bd0dad6a097f508d", + "version-string": "1.2.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/effects11.json b/externals/vcpkg/versions/e-/effects11.json new file mode 100755 index 000000000..7e1872b1f --- /dev/null +++ b/externals/vcpkg/versions/e-/effects11.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "8a08f12302be72c15cea701a71122e62f4b7df5a", + "version": "11.27", + "port-version": 0 + }, + { + "git-tree": "c2c6305e1ca4352d853c035f29d1d7daa3e47444", + "version": "11.26", + "port-version": 2 + }, + { + "git-tree": "ed264ec7ce47f6c0ad48933d3ced950b4841726f", + "version": "11.26", + "port-version": 1 + }, + { + "git-tree": "428f5c35c75c0886d83e163b5158c941cb15fb22", + "version-string": "11.26", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/effolkronium-random.json b/externals/vcpkg/versions/e-/effolkronium-random.json new file mode 100755 index 000000000..fd709ffc2 --- /dev/null +++ b/externals/vcpkg/versions/e-/effolkronium-random.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "2ffd6600668e6304e7e60f9ef447855efc89a0a0", + "version": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "0083b3439b06f6c6e2b5fbd48260cd5b54692bad", + "version": "1.4.0", + "port-version": 1 + }, + { + "git-tree": "6f870445e1974665f94fd66bc79c4bec3f33d090", + "version": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "c07bb6dd8e736bf6b970117efbdc2c329f7192f1", + "version-string": "1.3.1", + "port-version": 1 + }, + { + "git-tree": "8e1984293d7e95cdab2dff086ad58f639297a924", + "version-string": "1.3.1", + "port-version": 0 + }, + { + "git-tree": "87c432f402e97b4568f03bd61b544e1a335f71cd", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "b4dcdac8c50023d5a19c2a05780249fdf3ea8772", + "version-string": "1.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/efsw.json b/externals/vcpkg/versions/e-/efsw.json new file mode 100755 index 000000000..e33826cd9 --- /dev/null +++ b/externals/vcpkg/versions/e-/efsw.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "6ebed2c2027b2500f01aa9f755df88098810826e", + "version-date": "2020-06-08", + "port-version": 3 + }, + { + "git-tree": "67bb6e4495d7a98abb97ef8da9d7486508974042", + "version-string": "2020-06-08", + "port-version": 2 + }, + { + "git-tree": "6fec8b0d52b78fd74b35373e89ff32862ee4597c", + "version-string": "2020-06-08", + "port-version": 1 + }, + { + "git-tree": "497b4a848ae1ffaf34f91728a1b6c2194eed6bcc", + "version-string": "2020-06-08", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/egl-registry.json b/externals/vcpkg/versions/e-/egl-registry.json new file mode 100755 index 000000000..330405b75 --- /dev/null +++ b/externals/vcpkg/versions/e-/egl-registry.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "ec272777ea9d0ceccf5cc8b0336f038853e5c911", + "version-date": "2021-11-23", + "port-version": 0 + }, + { + "git-tree": "33252a782754c5b8595212530c1729d41bb78c19", + "version-string": "2020-02-20", + "port-version": 1 + }, + { + "git-tree": "3140fdc59c3d9481800dd9f9e3fbe75bd4595c6f", + "version-string": "2020-02-20", + "port-version": 0 + }, + { + "git-tree": "5fe5eb54c245bc87d9b4e9e2f483cccdd1b92891", + "version-string": "2020-02-03", + "port-version": 0 + }, + { + "git-tree": "dfee16f129bc15ef5bf5a5f62f704f9db10fed58", + "version-string": "2019-08-08", + "port-version": 0 + }, + { + "git-tree": "c009d4f3a058e48744e7e4177b23b8b08f124869", + "version-string": "2018-06-30-1", + "port-version": 0 + }, + { + "git-tree": "464033366eb8c25de822059ab15eb242150c54b7", + "version-string": "2018-06-30", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/eigen3.json b/externals/vcpkg/versions/e-/eigen3.json new file mode 100755 index 000000000..850e31dcc --- /dev/null +++ b/externals/vcpkg/versions/e-/eigen3.json @@ -0,0 +1,159 @@ +{ + "versions": [ + { + "git-tree": "250d10d414a5542aaf832350264498ba727c4c03", + "version": "3.4.0", + "port-version": 2 + }, + { + "git-tree": "4b40326590314e1f3a08c75e83a42d0738040b68", + "version": "3.4.0", + "port-version": 1 + }, + { + "git-tree": "0475ed327bda734cad0acd35978cde9379bc8619", + "version": "3.4.0", + "port-version": 0 + }, + { + "git-tree": "2b845a54aa220fa4099e97be4031cb63634665e3", + "version-string": "3.3.9", + "port-version": 1 + }, + { + "git-tree": "7a4f98a4624de567ff1bf9fa82668eae42e0f996", + "version-string": "3.3.9", + "port-version": 0 + }, + { + "git-tree": "b9090476c373e1c73df0317dae84015a8fac7432", + "version-string": "3.3.7", + "port-version": 8 + }, + { + "git-tree": "97b93ce8d10cc8f3bdf74f78491468fce1b6c86a", + "version-string": "3.3.7", + "port-version": 7 + }, + { + "git-tree": "9c582bb3f87a1a71b8fe7730581f864b8707d301", + "version-string": "3.3.7", + "port-version": 6 + }, + { + "git-tree": "49b1725f9d03cfbf6a6a853b026eea34a86ee5d6", + "version-string": "3.3.7-5", + "port-version": 0 + }, + { + "git-tree": "81980716d7c7849b0fab6092b17b0a943c15cdea", + "version-string": "3.3.7-4", + "port-version": 0 + }, + { + "git-tree": "1ffdcc022c0b77d3064152c96892a36d79391de2", + "version-string": "3.3.7-3", + "port-version": 0 + }, + { + "git-tree": "2cbe54ff3e01f1e4403d0dde5cb98e7fb6ec8ceb", + "version-string": "3.3.7-2", + "port-version": 0 + }, + { + "git-tree": "0f4d4403e7b923e0d60f97a7efd49fdd5890c864", + "version-string": "3.3.7-1", + "port-version": 0 + }, + { + "git-tree": "65f6abba610b69501020eb8c7e7c8d8c4f87d357", + "version-string": "3.3.7", + "port-version": 0 + }, + { + "git-tree": "406065e68c5511732b80145bed1c705159146738", + "version-string": "3.3.5", + "port-version": 0 + }, + { + "git-tree": "8e37c6450cc0522686593205f4c9af0d5748cdb6", + "version-string": "3.3.7", + "port-version": 0 + }, + { + "git-tree": "890d508bcf2929d80518ba37d7954f0d15c85e20", + "version-string": "3.3.5", + "port-version": 0 + }, + { + "git-tree": "8ae375528d7e019a8631cce1924f626b5589165f", + "version-string": "3.3.4-2", + "port-version": 0 + }, + { + "git-tree": "27640ace725d230c153be186d847a1dad97ff4ba", + "version-string": "3.3.4-1", + "port-version": 0 + }, + { + "git-tree": "9fc7f6a3467ba8db529ded6b6b5541022cf323eb", + "version-string": "3.3.4", + "port-version": 0 + }, + { + "git-tree": "ba6106ad2ba44fc13cf8db3a01d2690a219ddf11", + "version-string": "3.3.3-5", + "port-version": 0 + }, + { + "git-tree": "34706ca3d5496a286babfaf6d936fa6ddbb51243", + "version-string": "3.3.3-4", + "port-version": 0 + }, + { + "git-tree": "aecb6d1159e2f8b018670a688b91b93f034fa46c", + "version-string": "3.3.3-3", + "port-version": 0 + }, + { + "git-tree": "1b866fd4ca43b31b332edc72acd37f44bce28975", + "version-string": "3.3.3-2", + "port-version": 0 + }, + { + "git-tree": "83e7a4ad48a0f83722e5c3b57a314c3419307e12", + "version-string": "3.3.3-1", + "port-version": 0 + }, + { + "git-tree": "82fd5a5591c9ff4f052893f4621da24f652ebdc0", + "version-string": "3.3.3", + "port-version": 0 + }, + { + "git-tree": "3d38e168d81ed1c2fb5153ac6f6d52bf3e07eee4", + "version-string": "3.3.0", + "port-version": 0 + }, + { + "git-tree": "5200130549e5b6e42ecd3f7d4a517fe7c7ac0ced", + "version-string": "3.2.10-2", + "port-version": 0 + }, + { + "git-tree": "62a2861278fa08d17d28a507874d2b3beb12a599", + "version-string": "3.2.10-1", + "port-version": 0 + }, + { + "git-tree": "f6ff87ce8b7ddd61c0ca0bbc31104ec565d321cf", + "version-string": "3.2.10", + "port-version": 0 + }, + { + "git-tree": "2f8ec62522a95c5f8a34aa9cc2ddd00bb0e8974e", + "version-string": "3.2.9", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/elfio.json b/externals/vcpkg/versions/e-/elfio.json new file mode 100755 index 000000000..01d0d53b6 --- /dev/null +++ b/externals/vcpkg/versions/e-/elfio.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "76c8087deffd555757001f6c2dcf33f59901290f", + "version": "3.10", + "port-version": 0 + }, + { + "git-tree": "4c3c450c25f313eba1565d93542dbe2caa17aec4", + "version": "3.9", + "port-version": 0 + }, + { + "git-tree": "19659f0b36d05c1643f7ecb4b553341a942b1fd5", + "version": "3.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/elfutils.json b/externals/vcpkg/versions/e-/elfutils.json new file mode 100755 index 000000000..9a3a75518 --- /dev/null +++ b/externals/vcpkg/versions/e-/elfutils.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "6f16a19e22e33e89ff809c74983035b93a50038e", + "version": "0.186", + "port-version": 4 + }, + { + "git-tree": "8f78ad2c6d0fe406f09a163e5fb74a9b000c815c", + "version": "0.186", + "port-version": 3 + }, + { + "git-tree": "03e8299432623718bf6b58a61d19d408b6c8828c", + "version": "0.186", + "port-version": 2 + }, + { + "git-tree": "1e219cc99d3cfb41ba24f835240acf510a62bc3c", + "version-string": "0.186", + "port-version": 1 + }, + { + "git-tree": "18162722eb91e8a24f6ce1ba945a8a2e1af90896", + "version-string": "0.186", + "port-version": 0 + }, + { + "git-tree": "9aa4fefa61893cd4b37c0f1a2f16ab255ab0c4bf", + "version-string": "0.182", + "port-version": 2 + }, + { + "git-tree": "aa738c679581e92da4ec8a1662171ac5608e3744", + "version-string": "0.182", + "port-version": 1 + }, + { + "git-tree": "2695bb6d07358b642791808399b606fe52374572", + "version-string": "0.182", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/embree2.json b/externals/vcpkg/versions/e-/embree2.json new file mode 100755 index 000000000..6b45901ef --- /dev/null +++ b/externals/vcpkg/versions/e-/embree2.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "59aae2cf542f2420880b312e4e5071c6afcd5aaa", + "version-semver": "2.17.7", + "port-version": 4 + }, + { + "git-tree": "b4048eb6da97d8a23b849a1b5fba7ba93f9c33bf", + "version-semver": "2.17.7", + "port-version": 3 + }, + { + "git-tree": "cc259bcc8185631761c55b23d95afba48e8bae70", + "version-semver": "2.17.7", + "port-version": 2 + }, + { + "git-tree": "234d3da49438399d5df9e1a105401bc930ae22fe", + "version-semver": "2.17.7", + "port-version": 1 + }, + { + "git-tree": "3a87d7af065343c7a78620fa2f432272cb56c117", + "version-string": "2.17.7", + "port-version": 0 + }, + { + "git-tree": "7e1ebb90189c8cdfb129cc5bd342df64b69a3cca", + "version-string": "2.16.4-4", + "port-version": 0 + }, + { + "git-tree": "80379f4e8cd94e6ce9f1a2a5ea2a1c22e68c10cd", + "version-string": "2.16.4-3", + "port-version": 0 + }, + { + "git-tree": "c63b3da6b78721cb05cd0d5b11a88f7997af5304", + "version-string": "2.16.4-2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/embree3.json b/externals/vcpkg/versions/e-/embree3.json new file mode 100755 index 000000000..88d98d2ec --- /dev/null +++ b/externals/vcpkg/versions/e-/embree3.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "04c9ff8d31137bc08cd37662050a41dd5f1d8ecf", + "version-semver": "3.12.2", + "port-version": 2 + }, + { + "git-tree": "d0b90c66c1c8be2574ff610fe1fda718e8b87b78", + "version-semver": "3.12.2", + "port-version": 1 + }, + { + "git-tree": "8684283b1251cae5f299462307ff5cac0cf1f4fd", + "version": "3.12.2", + "port-version": 0 + }, + { + "git-tree": "955eb7f17ebf475e96ee8fe283b56cbc3944da44", + "version-string": "3.11.0", + "port-version": 2 + }, + { + "git-tree": "c8355374d128022898e8694462f47103bd730684", + "version-string": "3.11.0", + "port-version": 1 + }, + { + "git-tree": "1005c5b3886fa14360a5a06486c7d5797d8a1d0a", + "version-string": "3.11.0", + "port-version": 0 + }, + { + "git-tree": "fec1ee7f9132cf7c77a446441abaca728ccb6f59", + "version-string": "3.8.0", + "port-version": 0 + }, + { + "git-tree": "28ecc22532d99a411afd28b3a446398360c85b23", + "version-string": "3.6.1-1", + "port-version": 0 + }, + { + "git-tree": "fd760aad4fb8bfa342049d4e06bbb5610c506e87", + "version-string": "3.6.1", + "port-version": 0 + }, + { + "git-tree": "455d9ccc9a9c7dcedc6a7e8d37a90ca7d2e948e4", + "version-string": "3.5.2-3", + "port-version": 0 + }, + { + "git-tree": "41246d35ea9a9d8404e1f0751eda9eb110225acc", + "version-string": "3.5.2-2", + "port-version": 0 + }, + { + "git-tree": "46b116c0f60bfb0647ffd6cd47dfc9e7271960ef", + "version-string": "3.5.2-1", + "port-version": 0 + }, + { + "git-tree": "141aa4e3cd707097ba84565a71f5e97346bc5f2c", + "version-string": "3.5.2", + "port-version": 0 + }, + { + "git-tree": "3a3dc257f2c5a93fc2653f465d4572f33edad654", + "version-string": "3.2.0-3", + "port-version": 0 + }, + { + "git-tree": "97872753e9c6ce0d1de63fc9a5cf1aabccd04195", + "version-string": "3.2.0-2", + "port-version": 0 + }, + { + "git-tree": "cb908c622a393405b78a0a05eb049f6ece637798", + "version-string": "3.2.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/enet.json b/externals/vcpkg/versions/e-/enet.json new file mode 100755 index 000000000..b2f8a6fee --- /dev/null +++ b/externals/vcpkg/versions/e-/enet.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "a31699670612c88cdf69dd80af975d44c10ac1f6", + "version": "1.3.17", + "port-version": 1 + }, + { + "git-tree": "004a06d1e158f14059f597a1848b8f4a8d0a42f8", + "version": "1.3.17", + "port-version": 0 + }, + { + "git-tree": "c75008fab4c7484a37a6693dfd206067e54e439f", + "version-string": "1.3.16", + "port-version": 0 + }, + { + "git-tree": "9b5f005db8d7e0515d31dafa78a5148546b9d37a", + "version-string": "1.3.15", + "port-version": 0 + }, + { + "git-tree": "c4d7e28ed50333c1d425fdb3e5071c2251e7925a", + "version-string": "1.3.13-1", + "port-version": 0 + }, + { + "git-tree": "b7881bc5f3ac79d8c5028a1ee2756ef5e793a39d", + "version-string": "1.3.13", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/ensmallen.json b/externals/vcpkg/versions/e-/ensmallen.json new file mode 100755 index 000000000..b0948965a --- /dev/null +++ b/externals/vcpkg/versions/e-/ensmallen.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "ed0e9e790165bbba1a04b3a8fb6b89c67e1b64f8", + "version-semver": "2.18.1", + "port-version": 0 + }, + { + "git-tree": "98fdc863799d6cadd208a558f158894df03fdcaf", + "version-semver": "2.17.0", + "port-version": 0 + }, + { + "git-tree": "9d153b1e8d36e03fedd90ef42d8477380cf264a4", + "version-string": "2.14.2", + "port-version": 0 + }, + { + "git-tree": "20ca406ac47f9f279e917a219e7bf0c4edd514db", + "version-string": "2.11.2", + "port-version": 2 + }, + { + "git-tree": "790db95f443ab1324e98d457a35ea8606ea3c3e1", + "version-string": "2.11.2", + "port-version": 1 + }, + { + "git-tree": "f4d467ae6b1a13f339e1588df75e395084466665", + "version-string": "2.11.2", + "port-version": 0 + }, + { + "git-tree": "ae4f5355b2c656848599440e168470887504924d", + "version-string": "1.15.1", + "port-version": 0 + }, + { + "git-tree": "0e419f997095c435892965f2b2a5c2bad87fbec7", + "version-string": "1.15.0-1", + "port-version": 0 + }, + { + "git-tree": "01eb3d2f1ac3e9fc1223eb6a3a26dd75a6750f6c", + "version-string": "1.15.0", + "port-version": 0 + }, + { + "git-tree": "091ab741819396b75a5ded722d8d280cf8c87905", + "version-string": "1.14.3", + "port-version": 0 + }, + { + "git-tree": "1641086807b14ea7926cf70d79197ee9744527b2", + "version-string": "1.14.2", + "port-version": 0 + }, + { + "git-tree": "7334b23bad4be303b5115b64d4124aec1d830668", + "version-string": "1.14.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/entityx.json b/externals/vcpkg/versions/e-/entityx.json new file mode 100755 index 000000000..2d7bb14ca --- /dev/null +++ b/externals/vcpkg/versions/e-/entityx.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "191e57655630e9862440dd860de69d4baa62b089", + "version-string": "1.3.0", + "port-version": 3 + }, + { + "git-tree": "1c855d1902c11d9ef82d873ae86ad70052082728", + "version-string": "1.3.0-2", + "port-version": 0 + }, + { + "git-tree": "36e4d2470d2d7a52d73a1a632c89477d14749dd8", + "version-string": "1.3.0-1", + "port-version": 0 + }, + { + "git-tree": "912e4c60393fe3a1db6134574e4d1037d87f6c99", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "bc27172b71e04aed7ae800793f71ff69fa5d897a", + "version-string": "1.2.0-3", + "port-version": 0 + }, + { + "git-tree": "d72489397349d441c51068b326077f4acef22f81", + "version-string": "1.2.0-2", + "port-version": 0 + }, + { + "git-tree": "1b21dbbbcd0c99eca03a2dbba9ef73e8c2aec0ba", + "version-string": "1.2.0-1", + "port-version": 0 + }, + { + "git-tree": "c3eb8524d40e82deb1d7740ab27569daa12d688b", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "ad00f952a01ae90204c401d6cba33687372bf96a", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/entt.json b/externals/vcpkg/versions/e-/entt.json new file mode 100755 index 000000000..5fce9683b --- /dev/null +++ b/externals/vcpkg/versions/e-/entt.json @@ -0,0 +1,139 @@ +{ + "versions": [ + { + "git-tree": "ac258cd82d39f21b9a55ec179f02517f29802cdb", + "version": "3.10.1", + "port-version": 1 + }, + { + "git-tree": "f2c6e6ca727e3e843f0eb07544c81305175dc973", + "version": "3.10.1", + "port-version": 0 + }, + { + "git-tree": "965c440d8611528f1069a2a494f11da420110408", + "version": "3.10.0", + "port-version": 0 + }, + { + "git-tree": "a871a9d0c7187960052099119854369e854c3e50", + "version": "3.10.0", + "port-version": 0 + }, + { + "git-tree": "74ad1980650c2f8ecb6369b8b981711f96f7bd08", + "version": "3.9.0", + "port-version": 0 + }, + { + "git-tree": "c1b20a18637e66b31dcda3a46341bf10548b78e8", + "version": "3.8.0", + "port-version": 1 + }, + { + "git-tree": "a35e25160e39304b6ac16c679fa98f2c926c2877", + "version": "3.8.0", + "port-version": 0 + }, + { + "git-tree": "54f6d005789aee16b4faecbedde51573c3114dbd", + "version": "3.7.1", + "port-version": 0 + }, + { + "git-tree": "a0eb634638dbb4feb9532d9fd86028345657b9e3", + "version-string": "3.7.0", + "port-version": 0 + }, + { + "git-tree": "9ac028a6b2a32e309f446f9afa9242a0ce2fd891", + "version-string": "3.6.0", + "port-version": 0 + }, + { + "git-tree": "6813e4834592c0a9add40fe263763287ebfac97f", + "version-string": "3.5.1", + "port-version": 0 + }, + { + "git-tree": "8908629e8755efba3bb0ab9a9dd1cf20db393482", + "version-string": "3.4.0", + "port-version": 0 + }, + { + "git-tree": "0ff9daf827a7ef2f7aecce34b563b8b3389280b3", + "version-string": "3.3.2", + "port-version": 0 + }, + { + "git-tree": "cbdc74ee5555e01f4a0b6871d34a1b6ba5c55d8a", + "version-string": "3.3.0", + "port-version": 0 + }, + { + "git-tree": "abdb72d8cf0e6b2db3d0095962930f65fb4ba482", + "version-string": "3.2.2", + "port-version": 0 + }, + { + "git-tree": "44cb9dcf15af291eae200caae101ba79afa831b1", + "version-string": "3.1.1", + "port-version": 0 + }, + { + "git-tree": "8ccb2747f39d2ab4b95d6fd962452a9a42ad37e8", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "cee913133bd55b08ed3229bf9bac0b98fe807320", + "version-string": "3.0.0-1", + "port-version": 0 + }, + { + "git-tree": "a592610f52923bc2732df059a5108e16c117d82a", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "db2fe8b52c5e1d01102e57060ccb298b4620c867", + "version-string": "2.7.3-1", + "port-version": 0 + }, + { + "git-tree": "1ee672b3bc66d26043aa4dc1ddf50194a9a534ac", + "version-string": "cpp14", + "port-version": 0 + }, + { + "git-tree": "2d1b7037c76bf500b1dde9bf1857bf0f783786bc", + "version-string": "2.7.3", + "port-version": 0 + }, + { + "git-tree": "3390c42341b5dea4589374f92ba748268abee508", + "version-string": "2.7.2", + "port-version": 0 + }, + { + "git-tree": "2002d88f4dbd38d98fc98cbbd40a7d8ce681df03", + "version-string": "2.7.1", + "port-version": 0 + }, + { + "git-tree": "6631c591b7fdb134d186bfaf0cde10c5e6bd25b3", + "version-string": "2.6.1", + "port-version": 0 + }, + { + "git-tree": "647177d66f05756ebe5d7cc526200da9932970bc", + "version-string": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "f03391eccd0e454d9fa01e462d492751f5e8521a", + "version-string": "2.4.2-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/epsilon.json b/externals/vcpkg/versions/e-/epsilon.json new file mode 100755 index 000000000..ab89b1e6a --- /dev/null +++ b/externals/vcpkg/versions/e-/epsilon.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "ad0883f9e090b404fcef27b3e4304df44472bf90", + "version-string": "0.9.2", + "port-version": 6 + }, + { + "git-tree": "54824ec07afd73fa5bb369acc97e44f4754cc368", + "version-string": "0.9.2", + "port-version": 5 + }, + { + "git-tree": "9d0ee89af9a1cd0f574dac537598e33a1afddf74", + "version-string": "0.9.2-4", + "port-version": 0 + }, + { + "git-tree": "d6368309836d17be941cc74dc3bd4c000a158c7c", + "version-string": "0.9.2-2", + "port-version": 0 + }, + { + "git-tree": "e586e52627b09d76c253b01d669b893575105dbe", + "version-string": "0.9.2-1", + "port-version": 0 + }, + { + "git-tree": "860e044276fa0de579685ffb15af384ee769345d", + "version-string": "0.9.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/esaxx.json b/externals/vcpkg/versions/e-/esaxx.json new file mode 100755 index 000000000..5d9052515 --- /dev/null +++ b/externals/vcpkg/versions/e-/esaxx.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ab1275b163482bc7140f4ca266183d1309d3dc42", + "version-string": "ca7cb332011ec37", + "port-version": 1 + }, + { + "git-tree": "2a5e4429567a9e4f0a5a23df2e097d6cb01d8175", + "version-string": "ca7cb332011ec37", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/eve.json b/externals/vcpkg/versions/e-/eve.json new file mode 100755 index 000000000..8b4b6b2b3 --- /dev/null +++ b/externals/vcpkg/versions/e-/eve.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "95251169868c628e8099f89d14671ef946fd918d", + "version-date": "2021-10-16", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/eventpp.json b/externals/vcpkg/versions/e-/eventpp.json new file mode 100755 index 000000000..4b723916d --- /dev/null +++ b/externals/vcpkg/versions/e-/eventpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3f11cacc8b5a6f9f2951992d29cee39e52ef601f", + "version-semver": "0.1.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/evpp.json b/externals/vcpkg/versions/e-/evpp.json new file mode 100755 index 000000000..7291e6311 --- /dev/null +++ b/externals/vcpkg/versions/e-/evpp.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "b312644fb2498483feb3114cef2c8afaa44f45ed", + "version-string": "0.7.0", + "port-version": 5 + }, + { + "git-tree": "f460fd6d64355ccd3ed62d95e79485161aafba85", + "version-string": "0.7.0", + "port-version": 4 + }, + { + "git-tree": "7c904d1be94626ab05c89e7c5933a47201e43df1", + "version-string": "0.7.0-3", + "port-version": 0 + }, + { + "git-tree": "3bc50223ad9b30e894381b064c7ba993da989eca", + "version-string": "0.7.0-2", + "port-version": 0 + }, + { + "git-tree": "10cf6e09e690d2c55e36007fa37b330a2fdcf14f", + "version-string": "0.7.0-1", + "port-version": 0 + }, + { + "git-tree": "485bb830fca08799ba9b190aaaf4ca037a2d957a", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "68c5c0899b17a9e9250ed4123e098aef0b6adace", + "version-string": "0.6.1-2", + "port-version": 0 + }, + { + "git-tree": "d8ccbe116f8f3330e529c0956689db40495ef816", + "version-string": "0.6.1-1", + "port-version": 0 + }, + { + "git-tree": "5853a9c8c20656a6663c8b730756a13a58bac480", + "version-string": "0.6.1", + "port-version": 0 + }, + { + "git-tree": "dad9af676427555291736c096d859d075052128f", + "version-string": "0.5.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/exiv2.json b/externals/vcpkg/versions/e-/exiv2.json new file mode 100755 index 000000000..383a24350 --- /dev/null +++ b/externals/vcpkg/versions/e-/exiv2.json @@ -0,0 +1,214 @@ +{ + "versions": [ + { + "git-tree": "5e7341b739d7b05fbb40492158b01b8fa9fcdb74", + "version": "0.27.5", + "port-version": 1 + }, + { + "git-tree": "65e38e497c48c6e2fc463997ce9998e6af9f56b5", + "version": "0.27.5", + "port-version": 0 + }, + { + "git-tree": "4ce7841080b34ab8f91006430e9a40e0d9bfba96", + "version": "0.27.4", + "port-version": 2 + }, + { + "git-tree": "1e93f266421999dd82b931b2dbf672d255b14b43", + "version": "0.27.4", + "port-version": 1 + }, + { + "git-tree": "f716a33e59b24c79140216d836644fe0603e322b", + "version": "0.27.4", + "port-version": 0 + }, + { + "git-tree": "e38c35650c00596aafb8dda45b0d0e7f0a591563", + "version-string": "0.27.3", + "port-version": 4 + }, + { + "git-tree": "412904042cf27c7b49c02c36f4dc90ecaf0112ec", + "version-string": "0.27.3", + "port-version": 3 + }, + { + "git-tree": "8ae29b5306e974b23525e088ce8ceef718a1421e", + "version-string": "0.27.3", + "port-version": 2 + }, + { + "git-tree": "53685f0febdfa0bc634f9bfbb1380873d9fc2907", + "version-string": "0.27.3", + "port-version": 1 + }, + { + "git-tree": "3b8adff2f361ce718efc0135c904a958a280b4f8", + "version-string": "0.27.3", + "port-version": 0 + }, + { + "git-tree": "43a3fa06f5ae55a5eae0e2598955e16ed9aacdad", + "version-string": "0.27.2-1", + "port-version": 0 + }, + { + "git-tree": "17a92a002b3261ec1b79457d090b60a3fc8d8469", + "version-string": "0.27.1-1", + "port-version": 0 + }, + { + "git-tree": "722cc78a61b6c684d6d58a63a60f414e362d7c8f", + "version-string": "0.27.1", + "port-version": 0 + }, + { + "git-tree": "bfa291bdcee8c35275d518c656dc5d9f074dd265", + "version-string": "0.27", + "port-version": 0 + }, + { + "git-tree": "1ece8ea0e01d46e6efd35c7a318d1d89953aa88b", + "version-string": "2018-11-08", + "port-version": 0 + }, + { + "git-tree": "7e117afdb18673e47e9fd00d693a2c3bbb7f80f4", + "version-string": "2018-11-01", + "port-version": 0 + }, + { + "git-tree": "35fba01e0198ca5bdc7eb804e4688711edc04de3", + "version-string": "2018-10-25", + "port-version": 0 + }, + { + "git-tree": "37f3bdc2808081a280053f0bc1e962ad5b5b5e08", + "version-string": "2018-10-11", + "port-version": 0 + }, + { + "git-tree": "db5ac84ccc46bd3ac358e5511d5e7cb286a15ba4", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "5f17a88525c79254c7857598d8655290b3c2be31", + "version-string": "2018-08-03", + "port-version": 0 + }, + { + "git-tree": "e7cfe56c8281371b6bd73edfc355c453f4410a93", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "dc5b63224d6b65ba15cda5edbd9f4aa779135022", + "version-string": "2018-07-08", + "port-version": 0 + }, + { + "git-tree": "ad6be0dd6d7050f65ab2373df4cd5ddb92d5221a", + "version-string": "2018-06-12", + "port-version": 0 + }, + { + "git-tree": "3108e31a89840f4d82bdee2fb5bc0e1bff2ea85f", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "2e4159b17b72862b98949306b8f1211b693b49ea", + "version-string": "2018-04-25", + "port-version": 0 + }, + { + "git-tree": "aa1cd53a0a18c6353422425beebea40e7df0ac15", + "version-string": "2018-04-12", + "port-version": 0 + }, + { + "git-tree": "8822d320c13eb799412cb0846162bafa4d7c4c25", + "version-string": "2018-04-09", + "port-version": 0 + }, + { + "git-tree": "ab3b340877d8fc8bda09d71cfe2aac79597f5209", + "version-string": "2018-04-06", + "port-version": 0 + }, + { + "git-tree": "909c753014f7af686e26569037a4a1299b20fafe", + "version-string": "2018-04-05", + "port-version": 0 + }, + { + "git-tree": "cd71596c2e97816a0a3212b1cc6bf4590211d51e", + "version-string": "2018-04-02", + "port-version": 0 + }, + { + "git-tree": "c060318e9bfd845ea70c61aaac5f21eea037a52f", + "version-string": "2018-03-29", + "port-version": 0 + }, + { + "git-tree": "1fb9dae159e559028130a795af178e527f45823e", + "version-string": "2018-03-27", + "port-version": 0 + }, + { + "git-tree": "3166610abafe5777dbd13a0924d82d2aa2be3a8f", + "version-string": "2018-03-23", + "port-version": 0 + }, + { + "git-tree": "904b94051e07cbd0e1077fbfb2aba96f9936f6e1", + "version-string": "2018-03-20", + "port-version": 0 + }, + { + "git-tree": "a8242c226bb87a04a0c616d56faedff0452cb923", + "version-string": "2018-03-17", + "port-version": 0 + }, + { + "git-tree": "7f0eb48767ec847b268b7f319f00d513b6a486c6", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "1a0d2db81a2ddf36bbd289756b250e95304da7de", + "version-string": "8f5b795eaa4bc414d2d6041c1dbd1a7f7bf1fc99-3", + "port-version": 0 + }, + { + "git-tree": "c1e4ae854e0d49cabc272a2f533e3c2755a4db32", + "version-string": "8f5b795eaa4bc414d2d6041c1dbd1a7f7bf1fc99-2", + "port-version": 0 + }, + { + "git-tree": "7766aaf508dd77891ed4da8e93992ce2ac10c31c", + "version-string": "8f5b795eaa4bc414d2d6041c1dbd1a7f7bf1fc99-1", + "port-version": 0 + }, + { + "git-tree": "9854fbdbc4077ca9ab3a187f59d0b0183afe6e01", + "version-string": "8f5b795eaa4bc414d2d6041c1dbd1a7f7bf1fc99", + "port-version": 0 + }, + { + "git-tree": "cc201361949c95b03d6f6fdc3094b7a0aed27e15", + "version-string": "4f4add2cdcbe73af7098122a509dff0739d15908", + "port-version": 0 + }, + { + "git-tree": "2aa65aa2b68f8494978ef6192ef30f6d6885ae0b", + "version-string": "327b3f6c4de4ffda82818367fc870640d2ae8820", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/expat.json b/externals/vcpkg/versions/e-/expat.json new file mode 100755 index 000000000..812a56a83 --- /dev/null +++ b/externals/vcpkg/versions/e-/expat.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "18754c99766e364a887a08bbf85c7fae06185f36", + "version": "2.4.8", + "port-version": 1 + }, + { + "git-tree": "35013cd612175defc1832114f6a841888a6f6aad", + "version": "2.4.8", + "port-version": 0 + }, + { + "git-tree": "d63d8c6684bc73856e3f684601761939e32feeb3", + "version-semver": "2.4.1", + "port-version": 0 + }, + { + "git-tree": "f9cd8671e2436416fa63363267574f508aadee9b", + "version-string": "2020-08-18", + "port-version": 0 + }, + { + "git-tree": "945ad2f2899e6543ecc6754f3f90dda9ef888c6c", + "version-string": "2.2.9", + "port-version": 0 + }, + { + "git-tree": "e81844645ff55ac1a4dc8d9e25acbc027a691f8f", + "version-string": "2.2.7", + "port-version": 0 + }, + { + "git-tree": "34c2b1f9cbde41c90fcf58651b971f76a92a37da", + "version-string": "2.2.6", + "port-version": 0 + }, + { + "git-tree": "d7c8d73b3090cf9487ae7caa76201e5455628aec", + "version-string": "2.2.5", + "port-version": 0 + }, + { + "git-tree": "3ca9d898840f161d5ef19e46d5fea0d461661415", + "version-string": "2.2.4-2", + "port-version": 0 + }, + { + "git-tree": "d50bd476d9e34785abc837d1b7f4a3f958a01c18", + "version-string": "2.2.4-1", + "port-version": 0 + }, + { + "git-tree": "a103749efe13a8aa6497b7ec91f93a24d3fe1f77", + "version-string": "2.2.4", + "port-version": 0 + }, + { + "git-tree": "56a210e91dc39098760cbfb5beab008209f819d9", + "version-string": "2.1.1-1", + "port-version": 0 + }, + { + "git-tree": "2982d118ed6fd966d329162929f9318c3ab7d4f3", + "version-string": "2.1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/expected-lite.json b/externals/vcpkg/versions/e-/expected-lite.json new file mode 100755 index 000000000..2107de2fe --- /dev/null +++ b/externals/vcpkg/versions/e-/expected-lite.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "2b0c1f8e0fb5c88c9e3a98018d767c0e99997d94", + "version": "0.6.0", + "port-version": 0 + }, + { + "git-tree": "a1e36e579144b5ebf1231aac06fbfc89c300351f", + "version": "0.5.0", + "port-version": 0 + }, + { + "git-tree": "877f85638b2a3f618c48729a2e39149effbcb851", + "version-string": "0.3.0", + "port-version": 1 + }, + { + "git-tree": "a3d0c35d13d31b4ea4417e89cb3fd37bbc6fb9c4", + "version-string": "0.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/exprtk.json b/externals/vcpkg/versions/e-/exprtk.json new file mode 100755 index 000000000..473d7ccab --- /dev/null +++ b/externals/vcpkg/versions/e-/exprtk.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "f643b034afeb28a7e39b6556eb78594aa49181a4", + "version-date": "2022-01-01", + "port-version": 2 + }, + { + "git-tree": "2cf53dbae59a6b96821ac0407d0bb9a87dd2561c", + "version-date": "2021-01-01", + "port-version": 2 + }, + { + "git-tree": "f43789e8da0899715ef1d0544880baa13ce38d64", + "version-string": "2021-01-01", + "port-version": 1 + }, + { + "git-tree": "497f4b1dc2da32e75f934ba6d0e496a4dc0b01ae", + "version-string": "2021-01-01", + "port-version": 0 + }, + { + "git-tree": "8052628829fe4c863db89f423ea72afb169db258", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "70f8fa916a05424b2c9c847e3430fd6ccc442712", + "version-string": "2020-01-01", + "port-version": 0 + }, + { + "git-tree": "701185b6ca41473835a65e659acd8557877aa866", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "45114fc733c0760141abe9271eaa1e747890ee3b", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "e86a684d83a39e347e719ee1520ae8b621a60d3b", + "version-string": "2019-01-09", + "port-version": 0 + }, + { + "git-tree": "4b4e53d6dc9e1044d4c4a36cbfb80e6a773158db", + "version-string": "2018-12-14", + "port-version": 0 + }, + { + "git-tree": "5ac1d0e72bb1cd44883b18257bb2753c0b4246e9", + "version-string": "2018-10-11", + "port-version": 0 + }, + { + "git-tree": "abe7e1a710cfd4d93eec6602eeab53e76830f398", + "version-string": "2018.09.30-9836f21", + "port-version": 0 + }, + { + "git-tree": "6f843b1c41139e5ea0ecb94c4c23f528a92d4ea2", + "version-string": "2018.04.30-46877b6", + "port-version": 0 + }, + { + "git-tree": "afccdbf107de0a65a40b4573411739f2dd4d73ca", + "version-string": "2018.01.01-f32d2b4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/e-/ezc3d.json b/externals/vcpkg/versions/e-/ezc3d.json new file mode 100755 index 000000000..116bab01a --- /dev/null +++ b/externals/vcpkg/versions/e-/ezc3d.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "21ec5f8371f785c406c466171aadff744e2b34e2", + "version": "1.4.7", + "port-version": 0 + }, + { + "git-tree": "555219f96920ec01fc38ecd89e0a19188206be22", + "version": "1.4.6", + "port-version": 0 + }, + { + "git-tree": "ef3430033f1d62974ad03b445cee043327516a05", + "version-string": "1.3.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/faad2.json b/externals/vcpkg/versions/f-/faad2.json new file mode 100755 index 000000000..40a3d2c83 --- /dev/null +++ b/externals/vcpkg/versions/f-/faad2.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "67b420585d5f99b7dec259912abd2d7edcfb9492", + "version": "2.9.1", + "port-version": 5 + }, + { + "git-tree": "a1ec8e5247412b2ba6584c63307f88fe91d12251", + "version": "2.9.1", + "port-version": 4 + }, + { + "git-tree": "b931758d2574476cbd463ac773b192746e2dc80d", + "version-string": "2.9.1", + "port-version": 3 + }, + { + "git-tree": "52205fadafc9f2d30a0a6d2a3f10407cf1275a3d", + "version-string": "2.9.1", + "port-version": 2 + }, + { + "git-tree": "dde27c5531803105f25f9b7ec0dd1b7b08281129", + "version-string": "2.9.1-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fadbad.json b/externals/vcpkg/versions/f-/fadbad.json new file mode 100755 index 000000000..8c67fe49e --- /dev/null +++ b/externals/vcpkg/versions/f-/fadbad.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "508423e28f6d567501bcfe9e8733627dcb9df7ec", + "version-string": "2.1.0", + "port-version": 1 + }, + { + "git-tree": "468c63dfb708e90b78bc67241a9eafdd60a3b15d", + "version-string": "2.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/faiss.json b/externals/vcpkg/versions/f-/faiss.json new file mode 100755 index 000000000..58721b0df --- /dev/null +++ b/externals/vcpkg/versions/f-/faiss.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "1f9afe2148c0cfa76354882e136af60bab695061", + "version-semver": "1.7.2", + "port-version": 0 + }, + { + "git-tree": "efbc0f9d771826b57c327d3a008ee4bff6bdbda1", + "version-semver": "1.7.1", + "port-version": 1 + }, + { + "git-tree": "7c8e333f76263e7ca027e52fdf1d14b025be234c", + "version-semver": "1.7.1", + "port-version": 0 + }, + { + "git-tree": "eb401df0155a10cfc7cba057bbf63d10fdc37067", + "version-semver": "1.6.4", + "port-version": 1 + }, + { + "git-tree": "57552b56d2871ea87459fc655463067e1b02fcf3", + "version-string": "1.6.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fakeit.json b/externals/vcpkg/versions/f-/fakeit.json new file mode 100755 index 000000000..768775ed5 --- /dev/null +++ b/externals/vcpkg/versions/f-/fakeit.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "2af5c0e3dc6e0f5d2ae288b50f6f8167e830ff69", + "version": "2.1.1", + "port-version": 0 + }, + { + "git-tree": "e69fbaa4aed8ea6adf901929dd369ead884b9977", + "version": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "c7be74886e3d0e180a2abc712c1f95f26f6f3c67", + "version": "2.0.9", + "port-version": 0 + }, + { + "git-tree": "ccb43fb91f79fd2fbc7c95251b46f55b9ba9f364", + "version": "2.0.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fann.json b/externals/vcpkg/versions/f-/fann.json new file mode 100755 index 000000000..f49c67fc9 --- /dev/null +++ b/externals/vcpkg/versions/f-/fann.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "9bff6da1b7043e1ab6e344c549a285b7101763e2", + "version": "2.2.0", + "port-version": 2 + }, + { + "git-tree": "7efe8090234f2f2bd71fc7d90eee0248af8741b0", + "version-string": "2.2.0-1", + "port-version": 0 + }, + { + "git-tree": "8b1ffc0c7f16c4573a9c499afe7ab8f446bd36da", + "version-string": "2.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/farmhash.json b/externals/vcpkg/versions/f-/farmhash.json new file mode 100755 index 000000000..399d97dad --- /dev/null +++ b/externals/vcpkg/versions/f-/farmhash.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "46e338897fcb9436d4ac7f7cba2efd12df98567b", + "version-string": "1.1", + "port-version": 4 + }, + { + "git-tree": "9b4c6dc1b8fbb33fcca66dcb10c7186980e7058e", + "version-string": "1.1", + "port-version": 3 + }, + { + "git-tree": "905ec49a7fce57f5c28c60e858ccd443c343894a", + "version-string": "1.1", + "port-version": 2 + }, + { + "git-tree": "733d0cbc6db8340768fb94b657b91b644e9c929a", + "version-string": "1.1-1", + "port-version": 0 + }, + { + "git-tree": "29721e7f90bf6d3ffca45ef79bcaa5eec6358673", + "version-string": "1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fast-cpp-csv-parser.json b/externals/vcpkg/versions/f-/fast-cpp-csv-parser.json new file mode 100755 index 000000000..22b6d28df --- /dev/null +++ b/externals/vcpkg/versions/f-/fast-cpp-csv-parser.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "2518da1e8879b97a01d6053fb61a8800bdbe3996", + "version-string": "2021-01-03", + "port-version": 1 + }, + { + "git-tree": "f1f6fcd862c655b0884eb40931852c6db8a938e4", + "version-string": "2021-01-03", + "port-version": 0 + }, + { + "git-tree": "e2987a08764b26275d4ed8fc728b9460acc9db5e", + "version-string": "2019-08-14", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fast-float.json b/externals/vcpkg/versions/f-/fast-float.json new file mode 100755 index 000000000..4097e5be9 --- /dev/null +++ b/externals/vcpkg/versions/f-/fast-float.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ff47650c46181763025a2149a7753a56c5c1c83c", + "version": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "9f7f16bfca48a406b8682f54fe86a7ca9ad895b5", + "version-string": "0.8.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fastcdr.json b/externals/vcpkg/versions/f-/fastcdr.json new file mode 100755 index 000000000..6a8cb5af3 --- /dev/null +++ b/externals/vcpkg/versions/f-/fastcdr.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "d44198a7b4b57e8f66b4c3ce6b4877066a4a8bf2", + "version-semver": "1.0.15", + "port-version": 1 + }, + { + "git-tree": "2737f3f6c1cb3e6d652f474740726eb93f4e420a", + "version-string": "1.0.15", + "port-version": 0 + }, + { + "git-tree": "5a17c52543c57bc1c07028a390e1c3dc9531bc1b", + "version-string": "1.0.11", + "port-version": 0 + }, + { + "git-tree": "2ea8f798a0def7da620f7fa328bc98919d550e4c", + "version-string": "1.0.10", + "port-version": 0 + }, + { + "git-tree": "8cd9beeb6b498bceac458d788801515ff18a7b32", + "version-string": "1.0.9-1", + "port-version": 0 + }, + { + "git-tree": "f74618f657cb4d43266720210d2d53cd8a742c72", + "version-string": "1.0.6-2", + "port-version": 0 + }, + { + "git-tree": "e9dbb8bb5fdcce1dbc49d4636f894bd680042b81", + "version-string": "1.0.6-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fastcgi.json b/externals/vcpkg/versions/f-/fastcgi.json new file mode 100755 index 000000000..bd9559547 --- /dev/null +++ b/externals/vcpkg/versions/f-/fastcgi.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "7aebdd65d1551d946470d43413d5265d409df3e7", + "version-date": "2020-09-11", + "port-version": 5 + }, + { + "git-tree": "8a8f47edb8fc80608665c48ace9195e2334c3b6e", + "version-date": "2020-09-11", + "port-version": 4 + }, + { + "git-tree": "b3d35715764de0b692fb70742856d39b75bb625d", + "version-date": "2020-09-11", + "port-version": 3 + }, + { + "git-tree": "f99bded0b957390244bb1c1327dd84dbd5a43634", + "version-date": "2020-09-11", + "port-version": 2 + }, + { + "git-tree": "f6fb1b55b9ff65061f7be351c53397dcbdca9fa2", + "version-string": "2020-09-11", + "port-version": 1 + }, + { + "git-tree": "4626d60c5ae870e59c3a1c04b38379e1be739889", + "version-string": "2020-09-11", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fastfeat.json b/externals/vcpkg/versions/f-/fastfeat.json new file mode 100755 index 000000000..7a85559db --- /dev/null +++ b/externals/vcpkg/versions/f-/fastfeat.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "c6df4d7e64a7c9cb69a300aa50f62e2fbb261138", + "version-string": "391d5e9", + "port-version": 2 + }, + { + "git-tree": "0e8001ec0aef17a819af7f25f4e490a3368ed677", + "version-string": "391d5e9-1", + "port-version": 0 + }, + { + "git-tree": "3ec19766e20f341cef54c2661f0eb3e599c7035f", + "version-string": "391d5e9", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fastlz.json b/externals/vcpkg/versions/f-/fastlz.json new file mode 100755 index 000000000..d8485dc2c --- /dev/null +++ b/externals/vcpkg/versions/f-/fastlz.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "638b6220eb5ca72dae00fb3b8bdd19834cf6b938", + "version-date": "2021-05-10", + "port-version": 0 + }, + { + "git-tree": "04cbfde66bfdf61b82b0248f21a466d69dcb3e0f", + "version-string": "1.0-3", + "port-version": 0 + }, + { + "git-tree": "2d4c900444cb6a51a8da59946a8ef304d1106e88", + "version-string": "1.0-2", + "port-version": 0 + }, + { + "git-tree": "d5f0aeaa4973c61137b10ad65c09fae62a7c3a9c", + "version-string": "1.0-1", + "port-version": 0 + }, + { + "git-tree": "6f6c042ead09ad02f3ad8e503670223edaf6e8db", + "version-string": "1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fastor.json b/externals/vcpkg/versions/f-/fastor.json new file mode 100755 index 000000000..4f689eec6 --- /dev/null +++ b/externals/vcpkg/versions/f-/fastor.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "8e3101dc9482791ede896790efa2116909642320", + "version-date": "2021-11-22", + "port-version": 1 + }, + { + "git-tree": "9db673c173f5c27fc113f35837767d9d815e2976", + "version-date": "2021-11-22", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fastrtps.json b/externals/vcpkg/versions/f-/fastrtps.json new file mode 100755 index 000000000..c8285d3e1 --- /dev/null +++ b/externals/vcpkg/versions/f-/fastrtps.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "54873b953029cdd41ffee26b13af0c661de41462", + "version": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "d48d4af7b7082b1a162b136643f6d51dd5b8beba", + "version-string": "2.0.1", + "port-version": 1 + }, + { + "git-tree": "e51ca9a6f1e9a2e3d838927fbf255a827e7d2014", + "version-string": "2.0.1", + "port-version": 0 + }, + { + "git-tree": "aa40bbcf396f97933016f3c195bfc0d4e212c134", + "version-string": "1.5.0-3", + "port-version": 0 + }, + { + "git-tree": "17766b7858439aa162dfe0a585aee24d5faf311c", + "version-string": "1.5.0-2", + "port-version": 0 + }, + { + "git-tree": "53262c94641be5ba67758fffa2ae03bdcc9ee830", + "version-string": "1.5.0-1", + "port-version": 0 + }, + { + "git-tree": "f2a0d7295ff083e9ee163d7be29aa7c88b3f5fd7", + "version-string": "1.5.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fawdlstty-libfv.json b/externals/vcpkg/versions/f-/fawdlstty-libfv.json new file mode 100755 index 000000000..8abc3ba84 --- /dev/null +++ b/externals/vcpkg/versions/f-/fawdlstty-libfv.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f763fa0612d3a1416497c810a16cdcac36936822", + "version": "0.0.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fbgemm.json b/externals/vcpkg/versions/f-/fbgemm.json new file mode 100755 index 000000000..5f34b896f --- /dev/null +++ b/externals/vcpkg/versions/f-/fbgemm.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "e3afaf099d4759d2d2a57caccb7d54ca2d5b2359", + "version-date": "2021-03-18", + "port-version": 4 + }, + { + "git-tree": "89489c3afc56789dd2a8344dc89455723ec0eec3", + "version-date": "2021-03-18", + "port-version": 3 + }, + { + "git-tree": "8707b988ad38aae04720ce3494ef09603bd67954", + "version-date": "2021-03-18", + "port-version": 2 + }, + { + "git-tree": "6f3e815d3e806243cddff7b0e262d130ef702e98", + "version-date": "2021-03-18", + "port-version": 1 + }, + { + "git-tree": "7a439c159752233f767113ecf1a484065e223458", + "version-date": "2021-03-18", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fbthrift.json b/externals/vcpkg/versions/f-/fbthrift.json new file mode 100755 index 000000000..e5044676e --- /dev/null +++ b/externals/vcpkg/versions/f-/fbthrift.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "ed9295b0cad6c25b409e6e400148bb91017f3678", + "version-string": "2022.03.21.00", + "port-version": 1 + }, + { + "git-tree": "0cd01b0f0f6c77c87eea5331b75b01c9e9a20e2c", + "version-string": "2022.03.21.00", + "port-version": 0 + }, + { + "git-tree": "228608a7708d80532948eec3a0987f2e85e4a43c", + "version-string": "2022.01.31.00", + "port-version": 2 + }, + { + "git-tree": "bf1148604c897c7727621feb13713eac7e782497", + "version-string": "2022.01.31.00", + "port-version": 1 + }, + { + "git-tree": "f92f736e3c525d5ac52b546eae1e0b9cf880b382", + "version-string": "2022.01.31.00", + "port-version": 0 + }, + { + "git-tree": "3b06c9c143910647d74c5688610fc294bc493849", + "version-string": "2021.06.14.00", + "port-version": 1 + }, + { + "git-tree": "f57f144d8d7fe3db4534798d827e2e217f6e9b35", + "version-string": "2021.06.14.00", + "port-version": 0 + }, + { + "git-tree": "4f77ee90c3b33600d679483776c5b5f7cb59def7", + "version-string": "2020.10.19.00", + "port-version": 0 + }, + { + "git-tree": "241d78314ad7872caad18acfe5b1d742249ddc16", + "version-string": "2019.11.11.00", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fcl.json b/externals/vcpkg/versions/f-/fcl.json new file mode 100755 index 000000000..e8e1312f6 --- /dev/null +++ b/externals/vcpkg/versions/f-/fcl.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "1a023b16805abecae1b2770df56b4d1a7174493d", + "version": "0.7.0", + "port-version": 3 + }, + { + "git-tree": "11b59644379cbae75571423312e0c0971e6d3740", + "version": "0.7.0", + "port-version": 2 + }, + { + "git-tree": "63fe0d8f64a95e4eef52c44f1e2a6e6240ca53fe", + "version": "0.7.0", + "port-version": 1 + }, + { + "git-tree": "b42fbc15486c71cabb2db25ccea7032240b87201", + "version": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "882ea9cab4a482db6b23eae2592a5f93f4f27035", + "version-string": "0.6.1", + "port-version": 1 + }, + { + "git-tree": "52a59e9f37b1e0db67ab735c29199f7eaf6ff1b8", + "version-string": "0.6.1", + "port-version": 0 + }, + { + "git-tree": "2ea3393213f782ec570e7964de5cb48726d88400", + "version-string": "0.6.0-1", + "port-version": 0 + }, + { + "git-tree": "eb5b239c1912dfed5e9b87ac23a2085973b071d7", + "version-string": "0.6.0", + "port-version": 0 + }, + { + "git-tree": "2d9043ecd2095d989dd082a48beaddf64f984f21", + "version-string": "0.5.0-7", + "port-version": 0 + }, + { + "git-tree": "389f3adf2e0b7acb1c511dc53673923d140d4e7d", + "version-string": "0.5.0-6", + "port-version": 0 + }, + { + "git-tree": "65b329630785aafa07fc75bcb87341014b66d61e", + "version-string": "0.5.0-5", + "port-version": 0 + }, + { + "git-tree": "8e4f163e6f265302485cda587b99a90391abf64a", + "version-string": "0.5.0-4", + "port-version": 0 + }, + { + "git-tree": "b165475332793a49c0a2671bdec393ac979b8c35", + "version-string": "0.5.0-3", + "port-version": 0 + }, + { + "git-tree": "a431a8e141b13406c850a81731e86a0faf5617d8", + "version-string": "0.5.0-2", + "port-version": 0 + }, + { + "git-tree": "af91670ae8791c355625eebec28ee88634abf33f", + "version-string": "0.5.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fdk-aac.json b/externals/vcpkg/versions/f-/fdk-aac.json new file mode 100755 index 000000000..31c4b7a24 --- /dev/null +++ b/externals/vcpkg/versions/f-/fdk-aac.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "56f6b0699ef8d63059cd4ecb1bdc7613104d7cf8", + "version-semver": "2.0.2", + "port-version": 1 + }, + { + "git-tree": "01ec3a3ac30a2128fb45b82c526e9fcf4d87de9a", + "version-semver": "2.0.2", + "port-version": 0 + }, + { + "git-tree": "671b0954f5fe51fd11991f77f710901c26a8bd8b", + "version-string": "2018-07-08", + "port-version": 3 + }, + { + "git-tree": "4652092e7f7d8dc6578db286c7ce4ef7f5aebafd", + "version-string": "2018-07-08-2", + "port-version": 0 + }, + { + "git-tree": "e26243ad747010ca5b1d0f48fb0486a669b6c977", + "version-string": "2018-07-08-1", + "port-version": 0 + }, + { + "git-tree": "164060857673a39936e2334ecbea4bfa40ccd343", + "version-string": "2018-07-08", + "port-version": 0 + }, + { + "git-tree": "96ca4688688ebd4778245baaf83a1563e742fb53", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "b01e29c7e87048047d79eee60b98856c1624f079", + "version-string": "2018-03-07", + "port-version": 0 + }, + { + "git-tree": "f4b69a6409221fe9ef9e1edd1a673fe8f337fbfc", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "b0b2d9b833eb0d4078bf3dcbeb812ec96dcc9575", + "version-string": "2017-11-02-1e351", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fdlibm.json b/externals/vcpkg/versions/f-/fdlibm.json new file mode 100755 index 000000000..51bdc1f0d --- /dev/null +++ b/externals/vcpkg/versions/f-/fdlibm.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "7edc287bacd598a942ca6b29ed47329204b07faa", + "version-string": "5.3", + "port-version": 5 + }, + { + "git-tree": "46cc1958aab2e70eb861dc35c58b2e2942c50af7", + "version-string": "5.3-4", + "port-version": 0 + }, + { + "git-tree": "cf2f544939d1f1cb2bd7e8495d352299912b8e06", + "version-string": "5.3-3", + "port-version": 0 + }, + { + "git-tree": "d9f2b360d155a552dbcafcadc72edc60be698adf", + "version-string": "5.3-2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/ffmpeg.json b/externals/vcpkg/versions/f-/ffmpeg.json new file mode 100755 index 000000000..a78b82a21 --- /dev/null +++ b/externals/vcpkg/versions/f-/ffmpeg.json @@ -0,0 +1,489 @@ +{ + "versions": [ + { + "git-tree": "ad64f5ffe64b5fcd97e2e6d98273b70d498d6af0", + "version": "4.4.1", + "port-version": 13 + }, + { + "git-tree": "84064f1dfced06504fd3d76b60f8e21b37c22c2b", + "version": "4.4.1", + "port-version": 12 + }, + { + "git-tree": "4be11b342853200f575143c5bb5353b044621293", + "version": "4.4.1", + "port-version": 11 + }, + { + "git-tree": "d525f98e7146a1fd731febe7c472232142d62821", + "version": "4.4.1", + "port-version": 10 + }, + { + "git-tree": "558575c9b18b2ff734d48fe175e61f5a11c02ce4", + "version": "4.4.1", + "port-version": 9 + }, + { + "git-tree": "03b7a2329bc927de9637d45738c23e607e4f4387", + "version": "4.4.1", + "port-version": 8 + }, + { + "git-tree": "8b692478001452049ea19d32ec199f58c5de3a77", + "version": "4.4.1", + "port-version": 7 + }, + { + "git-tree": "f81278fe4661e442e3bd6ea274af6b397e4e3ff5", + "version": "4.4.1", + "port-version": 6 + }, + { + "git-tree": "9e9f11b54d40824604dc895ac7f9f0a39dc21486", + "version": "4.4.1", + "port-version": 5 + }, + { + "git-tree": "d7e12377ceb86caf3720807cb4be9f0f51c93798", + "version": "4.4.1", + "port-version": 4 + }, + { + "git-tree": "00480edd2a451f2a3a55452779f524709ee52585", + "version": "4.4.1", + "port-version": 3 + }, + { + "git-tree": "7576aa6e0cfa9b2e58abe51484cab6fd16337465", + "version": "4.4.1", + "port-version": 2 + }, + { + "git-tree": "c73820dc30c5ade90b5ae3da082420669b78d953", + "version": "4.4.1", + "port-version": 1 + }, + { + "git-tree": "e39b9e35530239498574713a75bd9160f23e1d20", + "version": "4.4.1", + "port-version": 0 + }, + { + "git-tree": "fa1d927c640e5fc9abb088c7409e90057cd0b371", + "version": "4.4", + "port-version": 18 + }, + { + "git-tree": "795e31317ef58fbe13247af9e8bade71f3edde5e", + "version": "4.4", + "port-version": 17 + }, + { + "git-tree": "5a144dc0552d005429d8d6641608744883dee2ff", + "version": "4.4", + "port-version": 16 + }, + { + "git-tree": "24cb6ddcd146248cb3758ec1aa4c038b28d4c0c5", + "version": "4.4", + "port-version": 15 + }, + { + "git-tree": "5d893a1c421f553fbdd9c1f79530a6a84bd0eb76", + "version": "4.4", + "port-version": 14 + }, + { + "git-tree": "26e3d87d6b3049b45355f36a34402b938d5b486d", + "version": "4.4", + "port-version": 13 + }, + { + "git-tree": "4d910207840ec65730eb972e472dab548fb8b5d2", + "version": "4.4", + "port-version": 12 + }, + { + "git-tree": "6e44538ad578a511886a010a5485fbe9ab514bf1", + "version": "4.4", + "port-version": 11 + }, + { + "git-tree": "d8eae79332e72736be5c6accacaf7bf9054df4b9", + "version": "4.4", + "port-version": 10 + }, + { + "git-tree": "b118bc2a5cf855546dc3016de53c4d7c75d267b4", + "version": "4.4", + "port-version": 9 + }, + { + "git-tree": "4eab7455a8436723d57e1749fb2a7d8316be893b", + "version": "4.4", + "port-version": 8 + }, + { + "git-tree": "efdbc20f5003313df2fde681a28ab8718455495f", + "version": "4.4", + "port-version": 7 + }, + { + "git-tree": "8405d9f6850d7ceb6cede89a791b42c41253ef29", + "version": "4.4", + "port-version": 6 + }, + { + "git-tree": "234eb0e352d2a7be0a3b34fb9eb8a9f0417ffe94", + "version": "4.4", + "port-version": 5 + }, + { + "git-tree": "dfea2c203835c55baec68138cc7e8c65ebcce33a", + "version": "4.4", + "port-version": 4 + }, + { + "git-tree": "90a0309bd2757ee32bb13e47e07fa7b8405e6594", + "version": "4.4", + "port-version": 3 + }, + { + "git-tree": "998009397c4df3ca2b7d2451c9ec43c817fdc6c7", + "version": "4.4", + "port-version": 2 + }, + { + "git-tree": "5ae25637fccfc24bbaf8ab7fbf735191952595fd", + "version-string": "4.4", + "port-version": 1 + }, + { + "git-tree": "648aee5015e8d511d44854e1056e4288683935cc", + "version-string": "4.4", + "port-version": 0 + }, + { + "git-tree": "fe496d461929767f020d5d9e577408ed298febcc", + "version-string": "4.3.2", + "port-version": 11 + }, + { + "git-tree": "2664b57a1b900287af6772394ec3c99a080f132b", + "version-string": "4.3.2", + "port-version": 10 + }, + { + "git-tree": "e497eda37bc7882949022c537489959d12c80f63", + "version-string": "4.3.2", + "port-version": 9 + }, + { + "git-tree": "297aff4ad5a5110a5cb3cf6a118152722f2239ec", + "version-string": "4.3.2", + "port-version": 8 + }, + { + "git-tree": "bb3d01a7b00d6fe90592750d48e18049eb93215d", + "version-string": "4.3.2", + "port-version": 7 + }, + { + "git-tree": "a6d19d895b8c522d7d1179d93ae1e9386ac38ac2", + "version-string": "4.3.2", + "port-version": 6 + }, + { + "git-tree": "68f6d071ba23bf8ad28a12a507c8089a47a76d73", + "version-string": "4.3.2", + "port-version": 5 + }, + { + "git-tree": "993a1a305ccef12934ba4b72648ba205498841f7", + "version-string": "4.3.2", + "port-version": 4 + }, + { + "git-tree": "d70a90e893854dbcb0efbe740f286baf47adafef", + "version-string": "4.3.2", + "port-version": 3 + }, + { + "git-tree": "95a584d785f17bb9158d505bedfda26aa1c52db1", + "version-string": "4.3.2", + "port-version": 2 + }, + { + "git-tree": "8d581e93ca7ee374d63bae07dff49356c79dee8c", + "version-string": "4.3.2", + "port-version": 1 + }, + { + "git-tree": "fd3c02af90662935ece6ca6ced78f23319b753c9", + "version-string": "4.3.2", + "port-version": 0 + }, + { + "git-tree": "15e92ca783e70105ccbf4fda0225a2587a760fe9", + "version-string": "4.3.1", + "port-version": 12 + }, + { + "git-tree": "985bdde5191e69e38ecda3472663614fcd491052", + "version-string": "4.3.1", + "port-version": 11 + }, + { + "git-tree": "93395ca1a700faa1c8c6ce04ef4a6dfa26e9fade", + "version-string": "4.3.1", + "port-version": 10 + }, + { + "git-tree": "f591a51746536b99b4621d39ea7e0dcd8a693016", + "version-string": "4.3.1", + "port-version": 9 + }, + { + "git-tree": "56dab7a1a3ff71df3326e9553990c46404982e37", + "version-string": "4.3.1", + "port-version": 8 + }, + { + "git-tree": "21563dd4914fb2d42c8cf7695df530f5f751520e", + "version-string": "4.3.1", + "port-version": 7 + }, + { + "git-tree": "5d3a6fc704dd62de45a7b95272d726f98e788dba", + "version-string": "4.3.1", + "port-version": 6 + }, + { + "git-tree": "3053f5dde46b866a4541107444c1a84172492d0b", + "version-string": "4.3.1", + "port-version": 5 + }, + { + "git-tree": "f96950f67dffcc135df77d16a0032a34fa9598ec", + "version-string": "4.3.1", + "port-version": 4 + }, + { + "git-tree": "63a43bd6b78c391a6d039fbd7b34e5a4a1fd6e09", + "version-string": "4.3.1", + "port-version": 3 + }, + { + "git-tree": "81f4d565456beadd30b85ef9e6395d24e4a3b0fd", + "version-string": "4.3.1", + "port-version": 2 + }, + { + "git-tree": "e703cb3d8c5fb22dfd8f3e8eb8bab4cad15afb84", + "version-string": "4.3.1", + "port-version": 1 + }, + { + "git-tree": "990cb0b368f3b880dfcfdf3259a0df7c11dd8719", + "version-string": "4.3.1", + "port-version": 0 + }, + { + "git-tree": "7f9c74614e3a1ee21e06958d79bd41bdfd37e3af", + "version-string": "4.2", + "port-version": 26 + }, + { + "git-tree": "eed5ad124dac13ee9c6f31069fc7555732f5d8f5", + "version-string": "4.2", + "port-version": 25 + }, + { + "git-tree": "b317ae50ae955d07f4c2a1fee4e7be7a37f8aa12", + "version-string": "4.2", + "port-version": 24 + }, + { + "git-tree": "fa7f3f153e52596eed0182ef2995c69d9384abae", + "version-string": "4.2", + "port-version": 23 + }, + { + "git-tree": "92523b7fc3aa45025bfd248659b50c627c2542d6", + "version-string": "4.2", + "port-version": 22 + }, + { + "git-tree": "bcb0ebc1e8e60726e495cb5de905fccb324e1172", + "version-string": "4.2", + "port-version": 21 + }, + { + "git-tree": "162cf208619223da97006e66f7444e95fb7f57d8", + "version-string": "4.2", + "port-version": 20 + }, + { + "git-tree": "39539ff22a99d1977d0b08c67b508df01a17bf92", + "version-string": "4.2", + "port-version": 18 + }, + { + "git-tree": "4d94134006280c76c2120c9323b1b9e08e66c762", + "version-string": "4.2", + "port-version": 17 + }, + { + "git-tree": "810d6ba48a4a33c28a3dc625a2416c7660e86813", + "version-string": "4.2", + "port-version": 16 + }, + { + "git-tree": "ea1522ec7f0ec26e24ba4bb70d793bba6461abf5", + "version-string": "4.2", + "port-version": 14 + }, + { + "git-tree": "f8f7689e18892cf97ec1d6aa6b1ab9e66cec39b5", + "version-string": "4.2-13", + "port-version": 0 + }, + { + "git-tree": "864ebd9faa5c0a55a53bb39a01fd4bb8ee557197", + "version-string": "4.2-12", + "port-version": 0 + }, + { + "git-tree": "c2fffbe216b11de1627f5f96a21e3e01bc8eb471", + "version-string": "4.2-11", + "port-version": 0 + }, + { + "git-tree": "eea24ede6c067ac06f34c8c2e2a3f785c01657d2", + "version-string": "4.2-10", + "port-version": 0 + }, + { + "git-tree": "7939a53aa9549939561174707977ab69ff32dbd5", + "version-string": "4.2-9", + "port-version": 0 + }, + { + "git-tree": "8be89f932db0f832ce2b36b63b4509d13685a3f1", + "version-string": "4.2-8", + "port-version": 0 + }, + { + "git-tree": "7ca822bc5250e5361f0801436ab6d868f185e55f", + "version-string": "4.2-7", + "port-version": 0 + }, + { + "git-tree": "d2a10049d6930d640c92a9bd8a03b455b6168ce0", + "version-string": "4.2-6", + "port-version": 0 + }, + { + "git-tree": "8efd7f0b5997b489035aa9c4befbca6e569d4e9c", + "version-string": "4.2-5", + "port-version": 0 + }, + { + "git-tree": "411f10c7243e8ad2a0f5d6852e0310c5e9152a12", + "version-string": "4.2-4", + "port-version": 0 + }, + { + "git-tree": "4371027b0f7a0116db07dfe92a7a00ac326e65b2", + "version-string": "4.2-3", + "port-version": 0 + }, + { + "git-tree": "06ec77181acb20fda2b026cad7d03d85d2f8e53b", + "version-string": "4.2-2", + "port-version": 0 + }, + { + "git-tree": "d372fb2a85b2fc2506fa3762e0d3c8efe5a4999c", + "version-string": "4.2-1", + "port-version": 0 + }, + { + "git-tree": "9b9865be60af0b5186043381768640732679cd3a", + "version-string": "4.2", + "port-version": 0 + }, + { + "git-tree": "1e72c606874a0e1c79002eb4d752c449ef8eec4a", + "version-string": "4.1-3", + "port-version": 0 + }, + { + "git-tree": "51d21e09f4f5152c0ada7f5d88f02cc465d713c7", + "version-string": "4.1-2", + "port-version": 0 + }, + { + "git-tree": "dc480a741f2ff0e63225e39b415d965a49a7515a", + "version-string": "4.1-1", + "port-version": 0 + }, + { + "git-tree": "1ae4caf941f3908b598360dca392e25d1bdcae29", + "version-string": "4.1", + "port-version": 0 + }, + { + "git-tree": "e1c4b3e44f893fbad624800d6aef0e9eddc41cea", + "version-string": "3.3.3-5", + "port-version": 0 + }, + { + "git-tree": "8500b5bcfc6a12ee01bfa3dff3163e7c44b4b7ac", + "version-string": "3.3.3-4", + "port-version": 0 + }, + { + "git-tree": "d6218854d621773b40f8cfeb9c0f185099648b4e", + "version-string": "3.3.3-3", + "port-version": 0 + }, + { + "git-tree": "18f28cfa969a99014fc04496375c11b5d36fee2d", + "version-string": "3.3.3-2", + "port-version": 0 + }, + { + "git-tree": "680aeb47309e74cccf4b0b179dd6ade64b9638c8", + "version-string": "3.3.3-1", + "port-version": 0 + }, + { + "git-tree": "3baec998af60cf506907d2c016359e724348f388", + "version-string": "3.3.3", + "port-version": 0 + }, + { + "git-tree": "5530cc21f9e1eb9edf69c7602f9645217f7f323a", + "version-string": "3.2.4-3", + "port-version": 0 + }, + { + "git-tree": "d80899800ac507ae63774b7d03db7f576bba5ff2", + "version-string": "3.2.4-2", + "port-version": 0 + }, + { + "git-tree": "c9be73c2c1dac33183fcdac503790fcc8fc63093", + "version-string": "3.2.4-1", + "port-version": 0 + }, + { + "git-tree": "34eff5419f7d31101020b47ef6bcd7d17f544ae0", + "version-string": "3.2.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/ffnvcodec.json b/externals/vcpkg/versions/f-/ffnvcodec.json new file mode 100755 index 000000000..dc6a492f9 --- /dev/null +++ b/externals/vcpkg/versions/f-/ffnvcodec.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "9f49e200522747c711e28db563004ce1f5a2f816", + "version": "11.1.5.0", + "port-version": 1 + }, + { + "git-tree": "b86f38b94c28605c5f3b2bc060b8e43e26e0ad42", + "version": "11.1.5.0", + "port-version": 0 + }, + { + "git-tree": "8f66cad42ef3e7749e345075f467f357ca061acd", + "version-string": "10.0.26.0", + "port-version": 2 + }, + { + "git-tree": "a8340b2c8379d1a6e0bbf5ae3ef2270074a2da2e", + "version-string": "10.0.26.0", + "port-version": 1 + }, + { + "git-tree": "85f47c87ba8461e3fddb5dfb28e4a89af683a989", + "version-string": "10.0.26.0", + "port-version": 0 + }, + { + "git-tree": "2b1e8c7a20685587250e73aa5893ec257a85f24e", + "version-string": "9.1.23.1", + "port-version": 4 + }, + { + "git-tree": "16317ac71b729d2c2a13e6cf65c8c8f2f48175e7", + "version-string": "9.1.23.1", + "port-version": 3 + }, + { + "git-tree": "65524efaf89bd4c6dab638dbae6c2b86f56e5761", + "version-string": "9.1.23.1-1", + "port-version": 0 + }, + { + "git-tree": "ee4d88eb9aa3687ca2e57d7f8e7db96876138668", + "version-string": "9.1.23.1", + "port-version": 0 + }, + { + "git-tree": "2ab33a804638583554feaa279c52d5a0cc04a7f7", + "version-string": "9.1.23.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fftw3.json b/externals/vcpkg/versions/f-/fftw3.json new file mode 100755 index 000000000..27f1fec62 --- /dev/null +++ b/externals/vcpkg/versions/f-/fftw3.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "2bd307eb2dafcd4938d16fc484fbbb731228f4c3", + "version": "3.3.10", + "port-version": 3 + }, + { + "git-tree": "3cd11b90c63cec797697dc3235ae1e22e4a509fc", + "version": "3.3.10", + "port-version": 2 + }, + { + "git-tree": "ecf3602083e88dce78331f58590466c22664c584", + "version": "3.3.10", + "port-version": 1 + }, + { + "git-tree": "174084fa9cf349e48d219eb948c585df3f093f6e", + "version": "3.3.10", + "port-version": 0 + }, + { + "git-tree": "28c3b35930f17c8ec3e05cd24d582e81df0c9dce", + "version-string": "3.3.9", + "port-version": 0 + }, + { + "git-tree": "6fd8682a3c82db155e040aa24a3a396b5c6c1332", + "version-string": "3.3.8-7", + "port-version": 0 + }, + { + "git-tree": "9e0d5349ca5f6276ce373b00c15b6104be804345", + "version-string": "3.3.8-6", + "port-version": 0 + }, + { + "git-tree": "f4ed64b300f17d9f5612ecd409b160c3d9d86f77", + "version-string": "3.3.8-4", + "port-version": 0 + }, + { + "git-tree": "b57d7e5b258c380aed3acc8e3e4a352497d18a2d", + "version-string": "3.3.8-3", + "port-version": 0 + }, + { + "git-tree": "7aa37378631cfcdbbd23d86142a8a8416ca4914a", + "version-string": "3.3.8-2", + "port-version": 0 + }, + { + "git-tree": "0b73d8f18166631bc59bfc00b3089dfe1c6a9254", + "version-string": "3.3.8", + "port-version": 0 + }, + { + "git-tree": "308bc57914e8c63f71fe1507682f91083d2ba584", + "version-string": "3.3.7-2", + "port-version": 0 + }, + { + "git-tree": "19fd0241d4a2c1d6b38e387efacaa8078f00cf45", + "version-string": "3.3.7-1", + "port-version": 0 + }, + { + "git-tree": "0e68b167bb5bdd5782569b73bd575af3abc2c71c", + "version-string": "3.3.7", + "port-version": 0 + }, + { + "git-tree": "20b4949f00e19110889ea457018e84ab1f2bf220", + "version-string": "3.3.6-p12-1", + "port-version": 0 + }, + { + "git-tree": "29901dfdf496984836ee93766830ddfbd7aa1496", + "version-string": "3.3.6-p12", + "port-version": 0 + }, + { + "git-tree": "bf731bb6cbf5d3f2054fc112a0ce1c35cff89727", + "version-string": "3.3.6-p11", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fftwpp.json b/externals/vcpkg/versions/f-/fftwpp.json new file mode 100755 index 000000000..696a59c99 --- /dev/null +++ b/externals/vcpkg/versions/f-/fftwpp.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "e7eb11bd6344e0d4db5a9e510a980ec2fedfdf90", + "version-date": "2019-12-19", + "port-version": 2 + }, + { + "git-tree": "d9b689681032352f667f7335feed82d0260fe5bf", + "version-string": "2019-12-19", + "port-version": 1 + }, + { + "git-tree": "71459a57c6722279dc89288662bf2dd1b6612a58", + "version-string": "2019-12-19", + "port-version": 0 + }, + { + "git-tree": "791ecd52f8bf308fb709eced88cff4ed4d798dc4", + "version-string": "2.05", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/field3d.json b/externals/vcpkg/versions/f-/field3d.json new file mode 100755 index 000000000..e26752a6b --- /dev/null +++ b/externals/vcpkg/versions/f-/field3d.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "272cb43e1adfe3c332af92658966a37ab59b8a53", + "version": "1.7.3", + "port-version": 3 + }, + { + "git-tree": "54a68f2c7d892d5876ff65ad373907bdcfc1b17e", + "version-string": "1.7.3", + "port-version": 2 + }, + { + "git-tree": "12a46a3791ba70f5da571e9de8fdd6ac4be921f6", + "version-string": "1.7.3", + "port-version": 1 + }, + { + "git-tree": "508621aeb164ada68155a52c44de9cf541868d31", + "version-string": "1.7.3", + "port-version": 0 + }, + { + "git-tree": "bd1daf533aee9576406b0e2db3f3e3153ad05a88", + "version-string": "1.7.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fixed-string.json b/externals/vcpkg/versions/f-/fixed-string.json new file mode 100755 index 000000000..2ba86ed06 --- /dev/null +++ b/externals/vcpkg/versions/f-/fixed-string.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "dd3abbab052dee3c26babb29ed11725fbc82bcde", + "version": "0.1.1", + "port-version": 0 + }, + { + "git-tree": "e24d1c3d1692a06fa69dc12b65e4240a92db31bf", + "version-string": "0.1.0", + "port-version": 1 + }, + { + "git-tree": "5fadefa9a548c0a653cadda794513f9bcde94ceb", + "version-string": "0.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fizz.json b/externals/vcpkg/versions/f-/fizz.json new file mode 100755 index 000000000..77febcf19 --- /dev/null +++ b/externals/vcpkg/versions/f-/fizz.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "3a4e5784b588827080b88e75299923149b842c4d", + "version-string": "2022.03.21.00", + "port-version": 1 + }, + { + "git-tree": "57fdd6342f89ccc3569b1a3416be67cd8dd7b59d", + "version-string": "2022.01.31.00", + "port-version": 1 + }, + { + "git-tree": "14651559e385107d92830b5464007f7b49a1ce4c", + "version-string": "2022.01.31.00", + "port-version": 0 + }, + { + "git-tree": "8472de52ae8a7914ab4c87e23be8250ae497a0aa", + "version-string": "2021.06.14.00", + "port-version": 1 + }, + { + "git-tree": "522047f79c1dde2cfbc509a21b4f1faf910efb12", + "version-string": "2021.06.14.00", + "port-version": 0 + }, + { + "git-tree": "2ff51a6f541e733b1c5ae13927be1fd83c7ea977", + "version-string": "2020.10.19.00", + "port-version": 0 + }, + { + "git-tree": "d01402deb79efbd950ee36abb2e8ddb6f5466359", + "version-string": "2020.02.03.00", + "port-version": 1 + }, + { + "git-tree": "ed2c02f8f547ae042e8923f1036d80d92c950a26", + "version-string": "2020.02.03.00", + "port-version": 0 + }, + { + "git-tree": "d979125e61dca6fc9107f122f59cd905f45e758f", + "version-string": "2020.01.20.00", + "port-version": 0 + }, + { + "git-tree": "93c14b33b9776d109ae7ecd927eb07b13091863c", + "version-string": "2019.10.28.00", + "port-version": 0 + }, + { + "git-tree": "0c00b17ead7393ec8f8ad5fbf18630c9a7c97b90", + "version-string": "2019.07.08.00", + "port-version": 0 + }, + { + "git-tree": "069e1d215c60eec3d0fe05e43e93d7dbee0c97b4", + "version-string": "2019.05.20.00-1", + "port-version": 0 + }, + { + "git-tree": "aaee95cb802f3156eff7bbc0fc9f87cb23314936", + "version-string": "2019.05.20.00", + "port-version": 0 + }, + { + "git-tree": "75fdaf681e1ffc8c1dd60c9fdd4357dae222e539", + "version-string": "2019.05.13.00", + "port-version": 0 + }, + { + "git-tree": "93dbfb4399aac9566c5bdab8314c284aa5b34d8f", + "version-string": "2019.04.15.00-1", + "port-version": 0 + }, + { + "git-tree": "b2d6d864379e31903cc41a4da000ab6bd5a29c15", + "version-string": "2019.01.14.00", + "port-version": 0 + }, + { + "git-tree": "a6e3f2d53ac56ce4e099875c94116eb909548428", + "version-string": "2018.10.15.00", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/flann.json b/externals/vcpkg/versions/f-/flann.json new file mode 100755 index 000000000..71d955c8c --- /dev/null +++ b/externals/vcpkg/versions/f-/flann.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "b31eace0fd51c64ee799affea9ef2127dab68a25", + "version-date": "2019-04-07", + "port-version": 5 + }, + { + "git-tree": "9ceb0dabb980c9cdfb5d9cf1a23e66ec90e75285", + "version-date": "2019-04-07", + "port-version": 4 + }, + { + "git-tree": "7677f18c73aa0d5216af138b2fba9bcea56e3f1b", + "version-date": "2019-04-07", + "port-version": 3 + }, + { + "git-tree": "960ba6bf0c3bb6c11b5a4a9bf413a21947927e08", + "version-date": "2019-04-07", + "port-version": 2 + }, + { + "git-tree": "a5855028e07259d339cb5a39c45fe92e679aa82b", + "version-string": "2019-04-07", + "port-version": 1 + }, + { + "git-tree": "12f0772fdde28d1ec740ed7cc817d2417026c9a5", + "version-string": "2019-04-07-1", + "port-version": 0 + }, + { + "git-tree": "ea923329f471f230a00ee98b4c9504866c17cc52", + "version-string": "1.9.1-1", + "port-version": 0 + }, + { + "git-tree": "6c9f07f5730026da84965254ffec60f07acc2539", + "version-string": "1.9.1", + "port-version": 0 + }, + { + "git-tree": "0fe1c2452556eb5da16e06dfa04a59c5b37d0f38", + "version-string": "jan2019", + "port-version": 0 + }, + { + "git-tree": "5476a7b1778e6a562f7754b2d4234fbd1f6ecadd", + "version-string": "1.9.1-9", + "port-version": 0 + }, + { + "git-tree": "f56250284c5eb640038ec9c3a3aad258cc10d03c", + "version-string": "1.9.1-8", + "port-version": 0 + }, + { + "git-tree": "6dd49b8f331e4c07e7ff3d8de30d1429f6a3181a", + "version-string": "1.9.1-7", + "port-version": 0 + }, + { + "git-tree": "5bf7cd595057768a52c80de5935d41d5a890766b", + "version-string": "1.9.1-6", + "port-version": 0 + }, + { + "git-tree": "f0bdaf685fcb24a2a2d41bc811f9e0e64dd4f6af", + "version-string": "1.9.1-5", + "port-version": 0 + }, + { + "git-tree": "2279a72c63ebcc85aee91f09aa7ad902355c683d", + "version-string": "1.9.1-4", + "port-version": 0 + }, + { + "git-tree": "9898ad6165be3aa44f3648c3115752f4040e7a92", + "version-string": "1.9.1-3", + "port-version": 0 + }, + { + "git-tree": "2344a0a796ee67718cafc18ffa62959e0d2f0974", + "version-string": "1.9.1-2", + "port-version": 0 + }, + { + "git-tree": "88a928edd33bb1471cca604d5378b451486c9b9f", + "version-string": "1.9.1-1", + "port-version": 0 + }, + { + "git-tree": "2e16cfed0b4c184f1c692f611f350292b27ad7e6", + "version-string": "1.9.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/flash-runtime-extensions.json b/externals/vcpkg/versions/f-/flash-runtime-extensions.json new file mode 100755 index 000000000..c2f0d09cc --- /dev/null +++ b/externals/vcpkg/versions/f-/flash-runtime-extensions.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ae5a85fa619355c266c5232762456120280d4046", + "version": "2.4", + "port-version": 1 + }, + { + "git-tree": "39452440462486913d797009f7e4676d95f1ad7b", + "version": "2.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/flashlight-cpu.json b/externals/vcpkg/versions/f-/flashlight-cpu.json new file mode 100755 index 000000000..9f6e60deb --- /dev/null +++ b/externals/vcpkg/versions/f-/flashlight-cpu.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "217b238dc2abf773a66a004f21d4c89dcc9324e3", + "version": "0.3", + "port-version": 3 + }, + { + "git-tree": "b37aa1e8b06ce24319b6969ed0fa87664e4ec308", + "version": "0.3", + "port-version": 2 + }, + { + "git-tree": "9de5ce0a5763ebc2b46378a46172b8cda7ac95c5", + "version": "0.3", + "port-version": 1 + }, + { + "git-tree": "63e05566899f6a034fb93cf6556cf3d5ca387f61", + "version": "0.3", + "port-version": 0 + }, + { + "git-tree": "d4a7e9f779d4cce7cc5fe65b83411fca53306f62", + "version-string": "20210111", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/flashlight-cuda.json b/externals/vcpkg/versions/f-/flashlight-cuda.json new file mode 100755 index 000000000..3c6f29741 --- /dev/null +++ b/externals/vcpkg/versions/f-/flashlight-cuda.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "0c59cec24c52379832bb5b227963c0b6681346a7", + "version": "0.3", + "port-version": 4 + }, + { + "git-tree": "afbc9bcce8e115033ecd9d1c64c2b4375c556e67", + "version": "0.3", + "port-version": 2 + }, + { + "git-tree": "9147d15ccbb61b2de168a8cc78527341edf1540d", + "version": "0.3", + "port-version": 1 + }, + { + "git-tree": "bd616669b5eb7413794d727b9909309ae686cd04", + "version": "0.3", + "port-version": 0 + }, + { + "git-tree": "b4308769591bc2d877cb5a2e829e7dfd64086c54", + "version-string": "20210111", + "port-version": 0 + }, + { + "git-tree": "2f4a40c0f613e3c43752f0a818667dcc4b932d28", + "version-string": "20201201", + "port-version": 0 + }, + { + "git-tree": "37c77db0b5f04ae99a144cdd6489b3c7d4f51be6", + "version-string": "20201120", + "port-version": 1 + } + ] +} diff --git a/externals/vcpkg/versions/f-/flatbuffers.json b/externals/vcpkg/versions/f-/flatbuffers.json new file mode 100755 index 000000000..0f2e1a5d7 --- /dev/null +++ b/externals/vcpkg/versions/f-/flatbuffers.json @@ -0,0 +1,109 @@ +{ + "versions": [ + { + "git-tree": "288dddf9e3a03a41f09b5f61547bf8d6b7b888c3", + "version": "2.0.6", + "port-version": 0 + }, + { + "git-tree": "8713fce3bc50837e44d958ddc745471619c511c4", + "version": "2.0.0", + "port-version": 3 + }, + { + "git-tree": "65234b189b0389dfa2f89f58f33e56037a03b519", + "version-string": "2.0.0", + "port-version": 2 + }, + { + "git-tree": "8bfd2df96c7250148b6dee28e4cd5be2fa785b60", + "version-string": "2.0.0", + "port-version": 1 + }, + { + "git-tree": "15a2fc0a15331e81cd04a3aae0a8b1d70c002ee5", + "version-string": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "195ffbf0b3c6abace9106115fd4ed081431a3997", + "version-string": "1.12.0", + "port-version": 2 + }, + { + "git-tree": "cb19f0b4ccf3b910c2dab457cfb05f190ae092b3", + "version-string": "1.12.0", + "port-version": 1 + }, + { + "git-tree": "7a379bb07674796e20d0a52c915d7c7d534674a7", + "version-string": "1.12.0", + "port-version": 0 + }, + { + "git-tree": "6019ea7cde6494f696f6f8fd2fb65389703461cc", + "version-string": "1.11.0-1", + "port-version": 0 + }, + { + "git-tree": "1c4f349a62d1f5890dc89efe3203590a600a6ca5", + "version-string": "1.11.0", + "port-version": 0 + }, + { + "git-tree": "fbaabdca9a3ef5a70f7a52d460313f71a841fce8", + "version-string": "1.10.0-1", + "port-version": 0 + }, + { + "git-tree": "8b895daa917130be93228d9d448bbb9c0ddbcbb2", + "version-string": "1.10.0", + "port-version": 0 + }, + { + "git-tree": "e60c85bb9d79dc14a510832504f9a428e11d5bb3", + "version-string": "1.9.0-3", + "port-version": 0 + }, + { + "git-tree": "8f06389a78a19d4b4e2b1114faea2154264d676e", + "version-string": "1.9.0-2", + "port-version": 0 + }, + { + "git-tree": "535cf8f59692a6ff92558630d2cf02bf5f0c0ce4", + "version-string": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "ab0690b27cb8b29b54ab30e62657bb7084fa7df3", + "version-string": "1.8.0-2", + "port-version": 0 + }, + { + "git-tree": "927a4cc9941d3dd8c35dc16cd57f6fc7757021e8", + "version-string": "1.8.0-1", + "port-version": 0 + }, + { + "git-tree": "e74a42d2729fbcff4d2c635f45b3a443bf779087", + "version-string": "1.8.0", + "port-version": 0 + }, + { + "git-tree": "c95138c1a6669da9d2c602856dad9597530cdd8c", + "version-string": "1.7.1-1", + "port-version": 0 + }, + { + "git-tree": "a2ab6f7dfb8b0f3fc1b1a3c2b0a39bda3ea3e246", + "version-string": "1.7.1", + "port-version": 0 + }, + { + "git-tree": "9987954a65e8356691a797eff1a083a0b57f4f99", + "version-string": "1.6.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/flecs.json b/externals/vcpkg/versions/f-/flecs.json new file mode 100755 index 000000000..11314d32a --- /dev/null +++ b/externals/vcpkg/versions/f-/flecs.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c39673b97267a414e46e47f526b48ca9c6b3b246", + "version": "2.4.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/flint.json b/externals/vcpkg/versions/f-/flint.json new file mode 100755 index 000000000..ea685f8d1 --- /dev/null +++ b/externals/vcpkg/versions/f-/flint.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "26e57956bebf9fb602b989791e663db8cd4f686b", + "version-semver": "2.8.0", + "port-version": 1 + }, + { + "git-tree": "270de68a6011ec21e64b76b4db6c99e9fd76930a", + "version-semver": "2.8.0", + "port-version": 0 + }, + { + "git-tree": "aaa3d79bfb36d6c6280ab6aa2226e4edb8913d11", + "version-string": "2.5.2", + "port-version": 5 + }, + { + "git-tree": "a8b922c64296e22e3dcbd3d88e689c1ff4e8c046", + "version-string": "2.5.2-4", + "port-version": 0 + }, + { + "git-tree": "bd6a9bf81ef5d141bf190c551704a86d0ad71625", + "version-string": "2.5.2-3", + "port-version": 0 + }, + { + "git-tree": "3f0947c56ac77fa6c0cc5087885216a9733a6a2f", + "version-string": "2.5.2-2", + "port-version": 0 + }, + { + "git-tree": "ec69ad86b37c116e4ef4ccfd2e3cf8c7504438d1", + "version-string": "2.5.2-1", + "port-version": 0 + }, + { + "git-tree": "8f1203f4af8339d41c7cddde541cbd2abb3c69c5", + "version-string": "2.5.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fltk.json b/externals/vcpkg/versions/f-/fltk.json new file mode 100755 index 000000000..96d9824a3 --- /dev/null +++ b/externals/vcpkg/versions/f-/fltk.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "67f9090df208862fcd949bfae2214dd5fb0a3157", + "version": "1.3.8", + "port-version": 2 + }, + { + "git-tree": "86da5d186aa27c3a6a9a9903eaa2806edde44bd8", + "version": "1.3.8", + "port-version": 1 + }, + { + "git-tree": "0a6f2dbd574e17da82e99414a644fca8f8efce52", + "version": "1.3.8", + "port-version": 0 + }, + { + "git-tree": "3acdb7ac34f79b7fdf7ac043ad12b5568de92309", + "version": "1.3.7", + "port-version": 1 + }, + { + "git-tree": "3fff1ed0fe94c6d45ad15d6cb6f575537880f1f6", + "version": "1.3.7", + "port-version": 0 + }, + { + "git-tree": "f242495c4ab5a13a640e506c0b02d052b0ea7b80", + "version": "1.3.6", + "port-version": 0 + }, + { + "git-tree": "09b2ceac638353fa15310751f007a9e868087460", + "version": "1.3.5", + "port-version": 4 + }, + { + "git-tree": "4f56d4551d634591725cc016e804323a7a793faa", + "version-string": "1.3.5", + "port-version": 3 + }, + { + "git-tree": "48eb2531a42e12fcaebf8207366aedefa60def6d", + "version-string": "1.3.5-2", + "port-version": 0 + }, + { + "git-tree": "8d539c078b1a4c3bf3010ab5972ac0d489dc7f40", + "version-string": "1.3.5-1", + "port-version": 0 + }, + { + "git-tree": "baf8caec3e403ff24810ce3da95491c3fe9c7264", + "version-string": "1.3.4-8", + "port-version": 0 + }, + { + "git-tree": "40a4ab0721568550c1f4cc70ff7ed14b2b1f23d1", + "version-string": "1.3.4-7", + "port-version": 0 + }, + { + "git-tree": "388cc2edba9c3fe9f4ecb0f5ea2219f6da2213a0", + "version-string": "1.3.4-6", + "port-version": 0 + }, + { + "git-tree": "28f0fdb5e4ccaf69a69090c38fba644164b08236", + "version-string": "1.3.4-5", + "port-version": 0 + }, + { + "git-tree": "bb0dbc0e835ec189df13055d54ab9a33081e4c3f", + "version-string": "1.3.4-4", + "port-version": 0 + }, + { + "git-tree": "4917e493970f9ee3910d1688a53fee3ceb8bff9a", + "version-string": "1.3.4-3", + "port-version": 0 + }, + { + "git-tree": "b3da8d6f9603a8a2ee6826631954666b0196bb5f", + "version-string": "1.3.4-2", + "port-version": 0 + }, + { + "git-tree": "04dc68cd375c9b468facba579ef78431a9737b11", + "version-string": "1.3.4-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fluidlite.json b/externals/vcpkg/versions/f-/fluidlite.json new file mode 100755 index 000000000..aa2fb6e81 --- /dev/null +++ b/externals/vcpkg/versions/f-/fluidlite.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "6b725769d2d4d23c2bdc4adcc9ca9d02a4421868", + "version-string": "2020-08-27", + "port-version": 2 + }, + { + "git-tree": "b603d9cfa1d22dac6387ecff4bd32bc0ba8e5331", + "version-string": "2020-08-27", + "port-version": 1 + }, + { + "git-tree": "af618c785b8b72c9c9b4be2bee261fac2b86a604", + "version-string": "2020-08-27", + "port-version": 0 + }, + { + "git-tree": "269562a89747aaff1ff9f35f87023a3fa8df0cc0", + "version-string": "2020-08-20", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fluidsynth.json b/externals/vcpkg/versions/f-/fluidsynth.json new file mode 100755 index 000000000..334e47e9e --- /dev/null +++ b/externals/vcpkg/versions/f-/fluidsynth.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "ad0fa73283950f13ecfff01deb0688c30a57c330", + "version": "2.2.6", + "port-version": 2 + }, + { + "git-tree": "e5c0f85546fe88c0e9aaf67734a929f2b717b1ef", + "version": "2.2.6", + "port-version": 1 + }, + { + "git-tree": "7740f8dfb97fa273a9f9ed740ade48f9953ff393", + "version": "2.2.6", + "port-version": 0 + }, + { + "git-tree": "5ffab5df62c9846a6daa5acbd13fd6966594ed77", + "version": "2.2.4", + "port-version": 1 + }, + { + "git-tree": "58a7811a7b66e82115753272bd70dda10075217b", + "version": "2.2.4", + "port-version": 0 + }, + { + "git-tree": "d9e09f93f0880db415faf7f65f4dd483a5b2882a", + "version": "2.2.1", + "port-version": 1 + }, + { + "git-tree": "226d8e9bba548bfb4592dfe5979797e3ffde0f69", + "version": "2.2.1", + "port-version": 0 + }, + { + "git-tree": "e0fa8719cb1348a12b177ffdba4943891bede664", + "version": "2.1.4", + "port-version": 1 + }, + { + "git-tree": "3c4776e7b26493ea0fa2f825a2e855231805e978", + "version-string": "2.1.4", + "port-version": 0 + }, + { + "git-tree": "fc73c9d5b255126928fc898cb44fd97fd07c1be6", + "version-string": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "11b0e06f40f22adcad7b66e23b14c287dff55ee3", + "version-string": "2.0.5-1", + "port-version": 0 + }, + { + "git-tree": "23f2e524a1ef423ffc02972deff4188768d116c7", + "version-string": "2.0.5", + "port-version": 0 + }, + { + "git-tree": "c763c3d84858e73f9844268c57175ff4d8111da5", + "version-string": "1.1.10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fmem.json b/externals/vcpkg/versions/f-/fmem.json new file mode 100755 index 000000000..7f4d3a6ae --- /dev/null +++ b/externals/vcpkg/versions/f-/fmem.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "eedcb4d269e8f834eaeaceb6fd3b3f477c46b8b4", + "version-string": "c-libs-2ccee3d2fb", + "port-version": 1 + }, + { + "git-tree": "bbb6f896858f86d8c7ec02b7e49236dba9ca6bc1", + "version-string": "c-libs-2ccee3d2fb", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fmi4cpp.json b/externals/vcpkg/versions/f-/fmi4cpp.json new file mode 100755 index 000000000..9a136d44a --- /dev/null +++ b/externals/vcpkg/versions/f-/fmi4cpp.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "e4686387d546df76f71bd0086c3570d8061157cd", + "version": "0.8.0", + "port-version": 0 + }, + { + "git-tree": "694ccc48c8fdade1beda9a7f87c923c8153a7735", + "version-string": "0.7.0", + "port-version": 3 + }, + { + "git-tree": "726b0dcda1a5a9040c6ee9088be9071a97380804", + "version-string": "0.7.0-2", + "port-version": 0 + }, + { + "git-tree": "02ff049a480b4c92073aae7d0d1329ce022a6205", + "version-string": "0.7.0-1", + "port-version": 0 + }, + { + "git-tree": "9735eac8fcfd069e6f665bfff7e549479f0b3b27", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "525fe6052925c414dbda95a8610cecb123ee7616", + "version-string": "0.5.3", + "port-version": 0 + }, + { + "git-tree": "7e7db93a9ae51760fdf9c26b33df4ff1e3726fca", + "version-string": "0.4.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fmilib.json b/externals/vcpkg/versions/f-/fmilib.json new file mode 100755 index 000000000..a2513cd66 --- /dev/null +++ b/externals/vcpkg/versions/f-/fmilib.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "9bf58761098e936528140d847911dab3613f5983", + "version-string": "2.0.3", + "port-version": 4 + }, + { + "git-tree": "13d2aaa0b4dedd6e8b1e7b47a91fd113f80dff87", + "version-string": "2.0.3", + "port-version": 3 + }, + { + "git-tree": "01fab530018dd2a3130c07f0805c82529d8591a3", + "version-string": "2.0.3-2", + "port-version": 0 + }, + { + "git-tree": "a59c81fe436aa6560c108e49641a2e34fab1fb01", + "version-string": "2.0.3-1", + "port-version": 0 + }, + { + "git-tree": "14c32629bcd9d7f92943f345db030adad64b24ff", + "version-string": "2.0.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fmt.json b/externals/vcpkg/versions/f-/fmt.json new file mode 100755 index 000000000..c016f90d1 --- /dev/null +++ b/externals/vcpkg/versions/f-/fmt.json @@ -0,0 +1,214 @@ +{ + "versions": [ + { + "git-tree": "602d9743b7957c9e82a06d0e81d58637c6df5222", + "version": "8.1.1", + "port-version": 1 + }, + { + "git-tree": "9748716da169977423d02b3c3f0de7b7f274e34e", + "version": "8.1.1", + "port-version": 0 + }, + { + "git-tree": "3aa440d7c335eb584170ae5fdf4eea6a17c900ee", + "version": "8.1.0", + "port-version": 0 + }, + { + "git-tree": "105214e3085a1404bca0fa89e7d80aa016e8cacb", + "version-semver": "8.0.1", + "port-version": 0 + }, + { + "git-tree": "52a5c56d85771a278330e955b703f4db86cfe86d", + "version": "7.1.3", + "port-version": 5 + }, + { + "git-tree": "230e140a15afbb9089537e153d8b83f5b994adbe", + "version": "7.1.3", + "port-version": 4 + }, + { + "git-tree": "943d63e7b912d94aab5db2c127ddc9a7ccf05c52", + "version": "7.1.3", + "port-version": 3 + }, + { + "git-tree": "71167ed3f3204ccfa0c7571ea5a89df1b113ed74", + "version": "7.1.3", + "port-version": 2 + }, + { + "git-tree": "4f8427eb0bd40da1856d4e67bde39a4fda689d72", + "version": "7.1.3", + "port-version": 1 + }, + { + "git-tree": "dd8cf5e1a2dce2680189a0744102d4b0f1cfb8b6", + "version-string": "7.1.3", + "port-version": 0 + }, + { + "git-tree": "e5f88eb21eeff1e08cb468a48ee808ca65fb01f4", + "version-string": "7.1.2", + "port-version": 0 + }, + { + "git-tree": "17b7a1396df4e214ac3ff5dbae3158e465db6d15", + "version-string": "7.1.1", + "port-version": 0 + }, + { + "git-tree": "dccca1b66d759f9496524c41aae593b0efd56650", + "version-string": "7.1.0", + "port-version": 0 + }, + { + "git-tree": "29b0a65ad50ef811a1eb3a2dff0e1a3bf773bd5c", + "version-string": "7.0.3", + "port-version": 3 + }, + { + "git-tree": "85f02ca7bf140590c53f727f6e67b55dbf0f9c94", + "version-string": "7.0.3", + "port-version": 2 + }, + { + "git-tree": "b8fa9a2b1a88f1efb3a9b450f9be86080af99cdd", + "version-string": "7.0.3", + "port-version": 0 + }, + { + "git-tree": "6a3064224a64e1eced055f2fc53bf9a2b1675ec9", + "version-string": "7.0.2", + "port-version": 0 + }, + { + "git-tree": "dc405c40eb48c9be904aa93bdab522d135a9fc2b", + "version-string": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "0f3778e53ef20a699f6659f744840996c3e76a5d", + "version-string": "6.2.0-1", + "port-version": 0 + }, + { + "git-tree": "49b618918e15459cf1ac6cb46fc24a73019aaeaa", + "version-string": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "f482cb01bd066ff6a26d87f64d05d8a7fc94ace2", + "version-string": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "5820ce164923af8447309d73d79f819aac215341", + "version-string": "6.0.0-1", + "port-version": 0 + }, + { + "git-tree": "d99b6a35e1406ba6b6e09d719bebd086f83ed5f3", + "version-string": "6.0.0", + "port-version": 0 + }, + { + "git-tree": "ce8065ba4b6c0684d54fe330a91e707fa56fbc61", + "version-string": "5.3.0-2", + "port-version": 0 + }, + { + "git-tree": "14ae41740d43442b12f3be229232698dd10b33d5", + "version-string": "5.3.0-1", + "port-version": 0 + }, + { + "git-tree": "c5b92fb6d399e8a8c0e0c4c1f34d110dd9c5b08f", + "version-string": "5.3.0", + "port-version": 0 + }, + { + "git-tree": "4bedcb554cab76e06e99f3fa92ca42aadb868789", + "version-string": "5.2.1", + "port-version": 0 + }, + { + "git-tree": "21f31d03f769bac6b5dea923b80bd9655032323b", + "version-string": "5.2.0", + "port-version": 0 + }, + { + "git-tree": "2f1e98c6ab80ede944577754231eb08349dad90b", + "version-string": "5.1.0", + "port-version": 0 + }, + { + "git-tree": "3b28e51314235400f20c454833cc78669072d783", + "version-string": "5.0.0-1", + "port-version": 0 + }, + { + "git-tree": "7729c49049007671ef242dd7ba88b6dd5a808815", + "version-string": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "eb4c1b0f13dc30c1df45096b8af6853bb84a26f1", + "version-string": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "a5a6be6938e0278a8a9670d15f2f54dbeb5e163a", + "version-string": "4.0.0-1", + "port-version": 0 + }, + { + "git-tree": "0aefce69119f589236ce566db138df2bbc246c65", + "version-string": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "20eac8a304df2054e596a3ead7bb6b987bb1aa23", + "version-string": "3.0.2", + "port-version": 0 + }, + { + "git-tree": "1032f0f8564db1167bd8435921e58ec0472f95f1", + "version-string": "3.0.1-4", + "port-version": 0 + }, + { + "git-tree": "3b13981d879679bfead73fcfdb85f35988797a7b", + "version-string": "3.0.1-3", + "port-version": 0 + }, + { + "git-tree": "a387db3f034d772673cfaf97058307f79a1dc6ff", + "version-string": "3.0.1-2", + "port-version": 0 + }, + { + "git-tree": "474fae3d40a56c2648ffe6a2052a856fac2cc613", + "version-string": "3.0.1-1", + "port-version": 0 + }, + { + "git-tree": "035bb83b2e692fa0650e7a452c7dd703ee523bfd", + "version-string": "3.0.1", + "port-version": 0 + }, + { + "git-tree": "d034424c150bc874bc7bbc9ad20fd69fc470294e", + "version-string": "3.0.0-1", + "port-version": 0 + }, + { + "git-tree": "d75df7f1760ecaf26d0bc7afbb8181e05713dedc", + "version-string": "3.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/folly.json b/externals/vcpkg/versions/f-/folly.json new file mode 100755 index 000000000..ab08aaad8 --- /dev/null +++ b/externals/vcpkg/versions/f-/folly.json @@ -0,0 +1,269 @@ +{ + "versions": [ + { + "git-tree": "bb704ec83012c1ef40ba934b0d5f3ae45471e4bd", + "version-string": "2022.03.21.00", + "port-version": 0 + }, + { + "git-tree": "10d3306d94114d0916a4691c131e233c08dc9090", + "version-string": "2022.01.31.00", + "port-version": 1 + }, + { + "git-tree": "b6f74d739ff2aef400ac83919bd9753eb1cc647f", + "version-string": "2022.01.31.00", + "port-version": 0 + }, + { + "git-tree": "c31f74183da180ea71937f3c5b6ac0c8a3619b1b", + "version-string": "2021.06.14.00", + "port-version": 4 + }, + { + "git-tree": "8bba15fddadde6b40f2984f6928aa24a50aa2b47", + "version-string": "2021.06.14.00", + "port-version": 3 + }, + { + "git-tree": "747fc5abd957e03e89acad08f28925927fb5f33b", + "version-string": "2021.06.14.00", + "port-version": 2 + }, + { + "git-tree": "92b7d618fda609b74ea8862c9950e40a9f03418d", + "version-string": "2021.06.14.00", + "port-version": 1 + }, + { + "git-tree": "4a11b9cd2ca209a5277f7b90bc8d1c6c6b501079", + "version-string": "2021.06.14.00", + "port-version": 0 + }, + { + "git-tree": "d7afcb1c0bffe2133bdb889652977a7c31937828", + "version-string": "2020.10.19.00", + "port-version": 0 + }, + { + "git-tree": "76898bf8da99c18fc5a86d58c09ccc7bd3cbb609", + "version-string": "2019.10.21.00", + "port-version": 5 + }, + { + "git-tree": "f1d03d6fd5c93718d8bccdf0165f3edee3b85ec6", + "version-string": "2019.10.21.00", + "port-version": 4 + }, + { + "git-tree": "4ee0f51b82a1b37d9241ef2b210362add64ed91d", + "version-string": "2019.10.21.00", + "port-version": 3 + }, + { + "git-tree": "c832396d957cb000f3381ba6812927fb0b5b3a83", + "version-string": "2019.10.21.00-2", + "port-version": 0 + }, + { + "git-tree": "83c9964f88bda7ef548f24f130964b1ce61efed8", + "version-string": "2019.10.21.00-1", + "port-version": 0 + }, + { + "git-tree": "dede57bccf509881e8267cd621a0b72ba70d639a", + "version-string": "2019.10.21.00", + "port-version": 0 + }, + { + "git-tree": "62c3629a991d3588f092e035a9e3e03ccce5bf8e", + "version-string": "2019.06.17.00", + "port-version": 0 + }, + { + "git-tree": "82352adbd550669ffb89bc750e70303b2c2f5a79", + "version-string": "2019.05.20.00-1", + "port-version": 0 + }, + { + "git-tree": "859e00c976d67aeb3d49eae11fc6bf021cbaf563", + "version-string": "2019.05.20.00", + "port-version": 0 + }, + { + "git-tree": "e9d792a127d06c5a950f4d0ba21c0e08cf7f9859", + "version-string": "2019.05.13.00", + "port-version": 0 + }, + { + "git-tree": "3a0f484cedde3dea088cb32a6d8151722b4967ee", + "version-string": "2019.04.15.00-2", + "port-version": 0 + }, + { + "git-tree": "42acf282f3c202c9fc2155d5604a5aee6fcf88f5", + "version-string": "2019.01.28.00-4", + "port-version": 0 + }, + { + "git-tree": "1ca47f4a451b7bfd84d1b98e350ea14a2a7935ca", + "version-string": "2019.01.28.00-1", + "port-version": 0 + }, + { + "git-tree": "df59c83ec385020cc2db539a576aae830122d017", + "version-string": "2019.01.28.00", + "port-version": 0 + }, + { + "git-tree": "672a9a3ea135bf87b475b6a341ee8ea342a24cff", + "version-string": "2019.01.07.00", + "port-version": 0 + }, + { + "git-tree": "e497410cc6710e00ee379e0cb5872846ac508948", + "version-string": "2018.12.10.00", + "port-version": 0 + }, + { + "git-tree": "685ec7915ad19dbe714bf6ddd1764f7acedd8bbd", + "version-string": "2018.11.26.00", + "port-version": 0 + }, + { + "git-tree": "bc5a01c90a1083864081d35f750af20a672251ba", + "version-string": "2018.11.05.00", + "port-version": 0 + }, + { + "git-tree": "2eccbcb08adb7328e625bb98afb5cc984e4ea2b3", + "version-string": "2018.10.29.00", + "port-version": 0 + }, + { + "git-tree": "518dbe2fcf83f087049b3d7aefe91486fb8953c6", + "version-string": "2018.10.22.00", + "port-version": 0 + }, + { + "git-tree": "c4e9325dc97a358fa1e150c62f6719bc2427f90a", + "version-string": "2018.10.08.00", + "port-version": 0 + }, + { + "git-tree": "e430d0f762660eab5e84098fa8c6d430e991100d", + "version-string": "2018.09.17.00", + "port-version": 0 + }, + { + "git-tree": "14b16eb86d5d682cac801e615532ef58a8e7c9d2", + "version-string": "2018.07.30.00", + "port-version": 0 + }, + { + "git-tree": "e3dde7dbb616614617a195eafa22bb8013d4caaf", + "version-string": "2018.07.02.00", + "port-version": 0 + }, + { + "git-tree": "f46a442c96971a3c4a9bce85b7616c39c1c800aa", + "version-string": "2018.06.25.00", + "port-version": 0 + }, + { + "git-tree": "f03de0ff72e9f2588c57b68cdb0c11c604500692", + "version-string": "2018.05.14.00-01", + "port-version": 0 + }, + { + "git-tree": "d1b9a3c588e76a8c3c250d75426746547c6392fc", + "version-string": "2018.05.14.00", + "port-version": 0 + }, + { + "git-tree": "fca97093afb81b821118b46f0ca4a2337a03273d", + "version-string": "2018.04.30.00", + "port-version": 0 + }, + { + "git-tree": "2ca6602be4799f1fb3e0dd77fe36f35a3518f307", + "version-string": "2018.04.23.00", + "port-version": 0 + }, + { + "git-tree": "8eeb79e2d7101a61461843ad3e959f3c5141cb72", + "version-string": "2018.04.16.00", + "port-version": 0 + }, + { + "git-tree": "39060ddbab252ff9886fb3f613c3dc534166c2e2", + "version-string": "2018.04.09.00", + "port-version": 0 + }, + { + "git-tree": "ad6e20f3b0e1e509e79a048bcbaff04f6574fa94", + "version-string": "2018.03.19.00-2", + "port-version": 0 + }, + { + "git-tree": "6af545445c05893f08683ae02122bb36b62542db", + "version-string": "2018.03.19.00-1", + "port-version": 0 + }, + { + "git-tree": "3dd204b0e700f18fa154dce95ab3b8d4eb46459a", + "version-string": "2017.11.27.00-3", + "port-version": 0 + }, + { + "git-tree": "a61cfd7f02cdfff97337123621596f5c0436b4e8", + "version-string": "2017.11.27.00-2", + "port-version": 0 + }, + { + "git-tree": "d79da0a5d5e7a1d4f95c8af752fe0c052ba944a8", + "version-string": "2017.11.27.00-1", + "port-version": 0 + }, + { + "git-tree": "bd4ba1a797fff1adcc9bbb71e13820f52ff6e1f4", + "version-string": "2017.11.27.00", + "port-version": 0 + }, + { + "git-tree": "a96f69d46196da0013891a1a2f1f8c0c25e8f174", + "version-string": "2017.10.02.00", + "port-version": 0 + }, + { + "git-tree": "92c2e783108aa66f31b8f25ab3bcb250804b94fd", + "version-string": "v2017.10.02.00", + "port-version": 0 + }, + { + "git-tree": "569335027818754d4161525bb5772009918aeb67", + "version-string": "v2017.07.17.01-1", + "port-version": 0 + }, + { + "git-tree": "7ef0ba670fb7e1dcac400074bb128cc848515b76", + "version-string": "v2017.07.17.01", + "port-version": 0 + }, + { + "git-tree": "c23d0840c79bcf0e4cb4945bb48aa8135fc86b2f", + "version-string": "v2017.05.08.00-2", + "port-version": 0 + }, + { + "git-tree": "ba3d7f11a4325aac523c72e30b2be5d9f236cbf3", + "version-string": "v2017.05.08.00-1", + "port-version": 0 + }, + { + "git-tree": "899dba6e2cb7da08ba8cab8c7b402660c97a3217", + "version-string": "v2017.05.08.00", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/font-chef.json b/externals/vcpkg/versions/f-/font-chef.json new file mode 100755 index 000000000..fc2079aa9 --- /dev/null +++ b/externals/vcpkg/versions/f-/font-chef.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "38744fa5fa1e86217669332c7860e193550b1a81", + "version": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "907533e8f03e495fcddd47a6c0cd59cc73dfcc0b", + "version-string": "1.0.1", + "port-version": 1 + }, + { + "git-tree": "ce88b662a652a10ab2daa61073656a7e0659b91f", + "version-string": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fontconfig.json b/externals/vcpkg/versions/f-/fontconfig.json new file mode 100755 index 000000000..7b747ad2e --- /dev/null +++ b/externals/vcpkg/versions/f-/fontconfig.json @@ -0,0 +1,159 @@ +{ + "versions": [ + { + "git-tree": "5c02d2ba027c9f390729a7e0899e63c853450dfb", + "version": "2.14.0", + "port-version": 2 + }, + { + "git-tree": "b1b1de99dba230f78c88bb9d73329bed77227ad4", + "version": "2.14.0", + "port-version": 1 + }, + { + "git-tree": "49816baac2cb555355f7e0176c5d36b2701cfceb", + "version": "2.14.0", + "port-version": 0 + }, + { + "git-tree": "8f782f79dc3a2c6834a7e5de4a941b11822067dd", + "version": "2.13.94", + "port-version": 6 + }, + { + "git-tree": "2f32046747209c234e60dc297b48d5bdc7ee4494", + "version": "2.13.94", + "port-version": 5 + }, + { + "git-tree": "41142efe19b6591f0de47857a32fecdb8bbfc717", + "version": "2.13.94", + "port-version": 4 + }, + { + "git-tree": "6b0bf8a5aa81b6f10909b6d303be77553ca26011", + "version": "2.13.94", + "port-version": 3 + }, + { + "git-tree": "bc9133bf9d7f323757e7de9992ae6dbac0a92f00", + "version": "2.13.94", + "port-version": 2 + }, + { + "git-tree": "606b2d7ca0ba11e29552311100b66d8c5052faeb", + "version": "2.13.94", + "port-version": 1 + }, + { + "git-tree": "73929965b1d7992064fec1f69c6225a3d73a262b", + "version": "2.13.94", + "port-version": 0 + }, + { + "git-tree": "51b95a8e2dda5a9ffe083a8fc910ad9528597580", + "version-string": "2.13.1", + "port-version": 8 + }, + { + "git-tree": "e28c20718e723ea702e408f52f76343950b1a3f2", + "version-string": "2.13.1", + "port-version": 7 + }, + { + "git-tree": "1b2332fd4b819725ae740da7023098294a7da7e8", + "version-string": "2.13.1", + "port-version": 6 + }, + { + "git-tree": "de83a21d912d9b87d8ad069d94dffcca201830a3", + "version-string": "2.13.1", + "port-version": 5 + }, + { + "git-tree": "2b49a3ee02b25efc3101d849a0df38280a1ca299", + "version-string": "2.13.1", + "port-version": 4 + }, + { + "git-tree": "e4e2d26ab9639fb737206592a04791d998461fa3", + "version-string": "2.13.1", + "port-version": 3 + }, + { + "git-tree": "5fb742a57db672816af7eebfc22a73bf6815428f", + "version-string": "2.13.1", + "port-version": 2 + }, + { + "git-tree": "1e05a2ce1df8f7db65d4d4d0434ead5c050c954e", + "version-string": "2.13.1", + "port-version": 1 + }, + { + "git-tree": "1817e2f41fca036c8b6b340a209b904dcd29a895", + "version-string": "2.13.1", + "port-version": 0 + }, + { + "git-tree": "ef58378bedab373531c754a81b8687c61579d05e", + "version-string": "2.12.4", + "port-version": 13 + }, + { + "git-tree": "8ddbd806b6c40ea75e5008e21120085b52ff3be2", + "version-string": "2.12.4", + "port-version": 12 + }, + { + "git-tree": "18f64ffe4ab99c2c888c78775c08e79932718823", + "version-string": "2.12.4", + "port-version": 11 + }, + { + "git-tree": "c65451f9851fd35f076b2963545bfa88ec503836", + "version-string": "2.12.4-10", + "port-version": 0 + }, + { + "git-tree": "c15189e3f664d9ffca32aefff5ad2ae546abf98b", + "version-string": "2.12.4-9", + "port-version": 0 + }, + { + "git-tree": "7fa8b59fa80c072900155658a325d02191800416", + "version-string": "2.12.4-8", + "port-version": 0 + }, + { + "git-tree": "c17032b6a6676742de24abf031d192ae91c6fda3", + "version-string": "2.12.4-7", + "port-version": 0 + }, + { + "git-tree": "d44d2b6b00d1e48719ce44275bf86aafad12ad1b", + "version-string": "2.12.4-3", + "port-version": 0 + }, + { + "git-tree": "5866944bc2f1980f56703db34b9e6f771683cf27", + "version-string": "2.12.4-1", + "port-version": 0 + }, + { + "git-tree": "8830aabee30aa2f5b471a2e2693c3742ecf522c2", + "version-string": "2.12.4", + "port-version": 0 + }, + { + "git-tree": "c06d475a3ccd902568eb8bb9b39a6bd68df203f2", + "version-string": "2.12.3", + "port-version": 0 + }, + { + "git-tree": "05a5789f8f51bdea6b40ae0c57fa7f4cdf3a73de", + "version-string": "2.12.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/foonathan-memory.json b/externals/vcpkg/versions/f-/foonathan-memory.json new file mode 100755 index 000000000..735e3eff8 --- /dev/null +++ b/externals/vcpkg/versions/f-/foonathan-memory.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "6e97aca605e065b0df1adaed316adc03d63b6334", + "version-string": "2019-07-21", + "port-version": 2 + }, + { + "git-tree": "fbb7ebb8d13d36b8ce0369dd801de6302f412512", + "version-string": "2019-07-21-1", + "port-version": 0 + }, + { + "git-tree": "42382ab1e2981171a512cc5fc349c173d3935b0f", + "version-string": "2019-07-21", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/forest.json b/externals/vcpkg/versions/f-/forest.json new file mode 100755 index 000000000..01ee43a84 --- /dev/null +++ b/externals/vcpkg/versions/f-/forest.json @@ -0,0 +1,104 @@ +{ + "versions": [ + { + "git-tree": "86bfd1af7a9a1606a526260d5e625cf6cd894b07", + "version-string": "12.1.0", + "port-version": 0 + }, + { + "git-tree": "78e99ef56d7301bde8950a08fea4255f7efcd2ba", + "version-string": "12.0.4", + "port-version": 0 + }, + { + "git-tree": "766e475b70e7b34d7e2a2d47803630df4b81cbe5", + "version-string": "12.0.3", + "port-version": 0 + }, + { + "git-tree": "f4f76354c59d58cf4db65db7e8f43a458565adf7", + "version-string": "12.0.0", + "port-version": 0 + }, + { + "git-tree": "19444e7f5c675905e088f59ced6795aaf9e6aa77", + "version-string": "11.0.1", + "port-version": 0 + }, + { + "git-tree": "2c82f330a9cf7aa66f1fd903d42e32e0bc198f0b", + "version-string": "11.0.0", + "port-version": 0 + }, + { + "git-tree": "367f16b0f8882d352730094100cd1a3be66ad9f4", + "version-string": "10.1.1-1", + "port-version": 0 + }, + { + "git-tree": "b9df0580da9a02307d1c660df367231fe6846332", + "version-string": "10.1.1", + "port-version": 0 + }, + { + "git-tree": "82c84ecb58938542fdd8ebd3de73708e27076750", + "version-string": "9.0.6", + "port-version": 0 + }, + { + "git-tree": "4464760043fb72edce823f31c65c42f0d1ae2e40", + "version-string": "9.0.5", + "port-version": 0 + }, + { + "git-tree": "d9735bcd63f23d818ce0c86f99dfb5aaa65ece05", + "version-string": "9.0.1", + "port-version": 0 + }, + { + "git-tree": "dc71d0f7cc0befc1c48e7bfa601cbca4ec48bd01", + "version-string": "9.0.0", + "port-version": 0 + }, + { + "git-tree": "5398bb6b3e41428f2b9e2307d5262e5c1b4745e1", + "version-string": "8.2.0", + "port-version": 0 + }, + { + "git-tree": "b346c4d691ea3272abc19155c836f0a55c012df6", + "version-string": "8.1.1", + "port-version": 0 + }, + { + "git-tree": "c9a4539a709e36ad9da48f44da17557bffedc2d3", + "version-string": "8.0.1", + "port-version": 0 + }, + { + "git-tree": "a8131c659e44b9c4d5ef387ad7acf5917fa46cc4", + "version-string": "7.0.7", + "port-version": 0 + }, + { + "git-tree": "e941b2f0d07c53d5b505613b4c6228f08e1aa1e9", + "version-string": "7.0.6", + "port-version": 0 + }, + { + "git-tree": "74df18ac34d0ffb75dda0c8e0234cec9bca33c74", + "version-string": "7.0.3", + "port-version": 0 + }, + { + "git-tree": "7c749e6d579c3bd8144606a7ee9f2d74cca68a49", + "version-string": "7.0.1", + "port-version": 0 + }, + { + "git-tree": "2350c8255f7fb88024c7fa749e91e8ea3122e5ab", + "version-string": "4.5.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/forge.json b/externals/vcpkg/versions/f-/forge.json new file mode 100755 index 000000000..dc16eafae --- /dev/null +++ b/externals/vcpkg/versions/f-/forge.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "d67247c4d974ea6d75d0918865db0c7842a5ec66", + "version-semver": "1.0.8", + "port-version": 0 + }, + { + "git-tree": "ca5513200ad2efb90936120fdfc7ea8bb6730f9d", + "version-semver": "1.0.7", + "port-version": 0 + }, + { + "git-tree": "b160185b8e2d1f0bd2268cb56d73e0e6a2940f69", + "version-semver": "1.0.5", + "port-version": 1 + }, + { + "git-tree": "29625ec4b111b2a3925f77222d9aa600229c8d96", + "version-string": "1.0.5", + "port-version": 0 + }, + { + "git-tree": "0bc3e2443ab15ace08aaee05044596cb78a8c535", + "version-string": "1.0.4-2", + "port-version": 0 + }, + { + "git-tree": "75ae5e24dfe897d8bb259b6389fa328c55bcc91c", + "version-string": "1.0.4-1", + "port-version": 0 + }, + { + "git-tree": "413d6728e689c16fba9ce02790de309b95a77e8e", + "version-string": "1.0.3-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/foxi.json b/externals/vcpkg/versions/f-/foxi.json new file mode 100755 index 000000000..f1c10f5bf --- /dev/null +++ b/externals/vcpkg/versions/f-/foxi.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b01a376dbabc364856cd79e1099cd703e9d46053", + "version-date": "2021-12-01", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fp16.json b/externals/vcpkg/versions/f-/fp16.json new file mode 100755 index 000000000..2785c93e5 --- /dev/null +++ b/externals/vcpkg/versions/f-/fp16.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "849acf1f87e0194fda4cd5459e51c564874c60ed", + "version-date": "2021-02-21", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fplus.json b/externals/vcpkg/versions/f-/fplus.json new file mode 100755 index 000000000..13b59b456 --- /dev/null +++ b/externals/vcpkg/versions/f-/fplus.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "e982e423baaf3d7728a2122368494d1c57c8e55e", + "version": "0.2.18-p0", + "port-version": 0 + }, + { + "git-tree": "d76810dad7926ef832d9f75966f99a763ed40cfb", + "version-semver": "0.2.14-p0", + "port-version": 0 + }, + { + "git-tree": "3c2d60588fe82f0001bd8bdf1a7b765c7e51eb6d", + "version-semver": "0.2.13-p0", + "port-version": 0 + }, + { + "git-tree": "20f3419dc98addfb673ee94bc256aed778dfc568", + "version-string": "0.2.3-p0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/freealut.json b/externals/vcpkg/versions/f-/freealut.json new file mode 100755 index 000000000..457bdf8eb --- /dev/null +++ b/externals/vcpkg/versions/f-/freealut.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "bb6f48903b677ac0c8560a068e53f7a028b2a5d4", + "version": "1.1.0", + "port-version": 2 + }, + { + "git-tree": "ba650aae9b1cf7a21c83ad0303f1bc520a82740b", + "version": "1.1.0", + "port-version": 1 + }, + { + "git-tree": "d4108f61eb91e67aacdfd186074e835f0541676b", + "version-string": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/freeglut.json b/externals/vcpkg/versions/f-/freeglut.json new file mode 100755 index 000000000..8a79d81a4 --- /dev/null +++ b/externals/vcpkg/versions/f-/freeglut.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "f4eceb7b1ee13b64d859833d2dce4152233c99bc", + "version": "3.2.2", + "port-version": 0 + }, + { + "git-tree": "bf1c06d0a07b6bc80a63c3825a4d136f5307a2f4", + "version-string": "3.2.1", + "port-version": 7 + }, + { + "git-tree": "a7907c76300594175b45a5fa05bacee2b91c9a65", + "version-string": "3.2.1", + "port-version": 6 + }, + { + "git-tree": "bfc1c37b44246e2a3c8bfead99af1d14a2103453", + "version-string": "3.2.1", + "port-version": 5 + }, + { + "git-tree": "e74a294251de6c8168d8c7015a497a9a0dd91185", + "version-string": "3.2.1-4", + "port-version": 0 + }, + { + "git-tree": "9a44b3ab8895a9a0c355280e89d8bcf1a1952f54", + "version-string": "3.2.1-2", + "port-version": 0 + }, + { + "git-tree": "5b1624ac930d31a4a6240da335be3be9bb94952d", + "version-string": "3.2.1-1", + "port-version": 0 + }, + { + "git-tree": "ffb0fc4d48a0660a27d21a7c3f360baa9be9e773", + "version-string": "3.2.1", + "port-version": 0 + }, + { + "git-tree": "732672fe4e52daec7d724306f61a294e572a998a", + "version-string": "3.0.0-9", + "port-version": 0 + }, + { + "git-tree": "9e70602bc65fada7f8c732063cd6f639e7097861", + "version-string": "3.0.0-8", + "port-version": 0 + }, + { + "git-tree": "1395636f1595dbdee7a8476e206285c6338fe06e", + "version-string": "3.0.0-7", + "port-version": 0 + }, + { + "git-tree": "9bdaf794a8402cf24f71299d8ab812cb4aa53de3", + "version-string": "3.0.0-6", + "port-version": 0 + }, + { + "git-tree": "d1ec2367e350126494330879c2bafecd64eb5f32", + "version-string": "3.0.0-5", + "port-version": 0 + }, + { + "git-tree": "5e18393e2adaf8022fd3fc6d5d9fb410e440aff3", + "version-string": "3.0.0-4", + "port-version": 0 + }, + { + "git-tree": "60e8b9879521d6bd5e4326e0f80af61d51900d4e", + "version-string": "3.0.0-3", + "port-version": 0 + }, + { + "git-tree": "f6492aad63022ab06c0a5c23af106b363c79084a", + "version-string": "3.0.0-2", + "port-version": 0 + }, + { + "git-tree": "890f5e592f28ef98b9e10d34f4d0d79670539987", + "version-string": "3.0.0-1", + "port-version": 0 + }, + { + "git-tree": "4bb24b2206a2441baa09ac2db53f87a43a6586d0", + "version-string": "3.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/freeimage.json b/externals/vcpkg/versions/f-/freeimage.json new file mode 100755 index 000000000..8c6c1586b --- /dev/null +++ b/externals/vcpkg/versions/f-/freeimage.json @@ -0,0 +1,129 @@ +{ + "versions": [ + { + "git-tree": "9bad6f331c05331144e8bad4a2ef63d4c594cd5a", + "version": "3.18.0", + "port-version": 22 + }, + { + "git-tree": "7d0f28dd10d54f1f11d09875fbfafd1579e948c4", + "version": "3.18.0", + "port-version": 21 + }, + { + "git-tree": "d223c6f4524784f9d87c7aa0815e5b99d2f66116", + "version-string": "3.18.0", + "port-version": 20 + }, + { + "git-tree": "100a12b0221593a3c5dae70231b7cd4145b73ca9", + "version-string": "3.18.0", + "port-version": 19 + }, + { + "git-tree": "76911a1130a9c099e49e9fc07a2f5f7cf4c86125", + "version-string": "3.18.0", + "port-version": 18 + }, + { + "git-tree": "f5e71864bf889aee3b6b2491c96f38f0a3801eb0", + "version-string": "3.18.0", + "port-version": 17 + }, + { + "git-tree": "b90040201b75af36504d2f32487a6ec83a666d5e", + "version-string": "3.18.0", + "port-version": 16 + }, + { + "git-tree": "eeccf360adb2438749349ce1a4c8d7c6f3c812a2", + "version-string": "3.18.0", + "port-version": 15 + }, + { + "git-tree": "f35c533652a98afb7b4510687aedc955d93907a6", + "version-string": "3.18.0", + "port-version": 13 + }, + { + "git-tree": "465abdea0090a91cb512e6dd3c860da6acc794c3", + "version-string": "3.18.0-12", + "port-version": 0 + }, + { + "git-tree": "e823f80604efe17747d35e69fdef8459375f67ea", + "version-string": "3.18.0-10", + "port-version": 0 + }, + { + "git-tree": "b852b66cc5f11a9456af47e473983afdcf043b29", + "version-string": "3.18.0-9", + "port-version": 0 + }, + { + "git-tree": "bb35665ba508c70cb816a7eded1c7e641637af9a", + "version-string": "3.18.0-8", + "port-version": 0 + }, + { + "git-tree": "f2c1ff7a5831bbc4f603efc956c411cb5116a3fc", + "version-string": "3.18.0-7", + "port-version": 0 + }, + { + "git-tree": "bc232e84ebe305816123682af33f4e6d247a245b", + "version-string": "3.18.0-6", + "port-version": 0 + }, + { + "git-tree": "c1742fc4977130dbdf70f6616a2ba7be288bb5b7", + "version-string": "3.18.0-5", + "port-version": 0 + }, + { + "git-tree": "5922381d2bbca21d42f08e55674a00b51b548850", + "version-string": "3.18.0-4", + "port-version": 0 + }, + { + "git-tree": "8d78bdc2db3ad483af50c8ab3a27d336114e45a9", + "version-string": "3.18.0-3", + "port-version": 0 + }, + { + "git-tree": "1b4990358cced937bf2625f3bb6061be2d0bc717", + "version-string": "3.18.0-2", + "port-version": 0 + }, + { + "git-tree": "5af0544aaa35eb89ed1f0682869d656c8c71daa6", + "version-string": "3.18.0-1", + "port-version": 0 + }, + { + "git-tree": "28e08beb392fe720d34ee7bfe59b9cc164553691", + "version-string": "3.17.0-4", + "port-version": 0 + }, + { + "git-tree": "5e3985b261929ca6696c71847ec4e4f48af1317e", + "version-string": "3.17.0-3", + "port-version": 0 + }, + { + "git-tree": "f6e5a2b99cf21bf265f6acee6ba0466fd07161fd", + "version-string": "3.17.0-2", + "port-version": 0 + }, + { + "git-tree": "6155a4de218f6bf2892fb4c342754d9161fc11df", + "version-string": "3.17.0-1", + "port-version": 0 + }, + { + "git-tree": "10f466265fffc19a76dde5ee7ea86b6c71c2fcbf", + "version-string": "3.17.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/freeopcua.json b/externals/vcpkg/versions/f-/freeopcua.json new file mode 100755 index 000000000..1ee029185 --- /dev/null +++ b/externals/vcpkg/versions/f-/freeopcua.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "15fe1dbb4b4b3283072825b22ef29acdf5835950", + "version-string": "20190125", + "port-version": 5 + }, + { + "git-tree": "ffcfcd9ddd2551f8ca82752def0ff7a30b6bb2dc", + "version-string": "20190125", + "port-version": 4 + }, + { + "git-tree": "c111b437e30a05cded36f1994f24606c70c0c326", + "version-string": "20190125-3", + "port-version": 0 + }, + { + "git-tree": "5570f6134f2de2693ef7301c1617368b5970d111", + "version-string": "20190125-2", + "port-version": 0 + }, + { + "git-tree": "6fe95c4e36b1b43c1163e4c9edc2e7a990853654", + "version-string": "20190125-1", + "port-version": 0 + }, + { + "git-tree": "4c00e8f38cee7e67a342038931e03e74ca61b878", + "version-string": "20190125", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/freerdp.json b/externals/vcpkg/versions/f-/freerdp.json new file mode 100755 index 000000000..9864e5a11 --- /dev/null +++ b/externals/vcpkg/versions/f-/freerdp.json @@ -0,0 +1,134 @@ +{ + "versions": [ + { + "git-tree": "8f786583b737855616d84a5177491deaf7d367a0", + "version": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "e2fdb84a883ddea3d2dd68e8cc1faea98e991e83", + "version": "2.4.0", + "port-version": 3 + }, + { + "git-tree": "ff0fd25e52b0e89c620968aa07fca66a086957c7", + "version": "2.4.0", + "port-version": 2 + }, + { + "git-tree": "501668a8e37d5fc800fbf2f82729507a0af386cd", + "version": "2.4.0", + "port-version": 1 + }, + { + "git-tree": "504bdd8f860f4e4b091de21a76999261bff207da", + "version-semver": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "50c37de4c7ad0b1cfec9f285c83b231f2225ff7c", + "version-semver": "2.3.2", + "port-version": 0 + }, + { + "git-tree": "9691eb7a176a1bbe9da26f853d59403f00aef9a0", + "version-semver": "2.2.0", + "port-version": 1 + }, + { + "git-tree": "1c37decc1c0ae21cb895e8c263e7ff06454425e8", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "c5570fd8d4d98729d085a36950faea8d8a53cf5a", + "version-string": "2.1.1-1", + "port-version": 0 + }, + { + "git-tree": "062d933e3d9d8f6f9cd5ea4c6a7c9914baf6fb6e", + "version-string": "2.1.1", + "port-version": 0 + }, + { + "git-tree": "4e192d61b67c92110fe373ee4efb590e59bd7321", + "version-string": "2.0.0-1", + "port-version": 0 + }, + { + "git-tree": "b6aa77a82ad6f20daec8ec4d86f9fe00f0870ef0", + "version-string": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "593c2401e654c386b78da29be7a34be37a813156", + "version-string": "2.0.0-rc4-7", + "port-version": 0 + }, + { + "git-tree": "ae206ebddcbb2a2af3b77024f0e77cfad475b96e", + "version-string": "2.0.0-rc4-6", + "port-version": 0 + }, + { + "git-tree": "80b5b7d76990b51a9550586f41703b078c91d06a", + "version-string": "2.0.0-rc4-5", + "port-version": 0 + }, + { + "git-tree": "af49ef7e7ded92744b51009625fb6bc5f2006c1c", + "version-string": "2.0.0-rc4-4", + "port-version": 0 + }, + { + "git-tree": "4de9a797f785cea795d9eeee4af5330244feebbc", + "version-string": "2.0.0-rc4-3", + "port-version": 0 + }, + { + "git-tree": "00df49231521b5e9485d76bad6e678fffa58fb1b", + "version-string": "2.0.0-rc4-2", + "port-version": 0 + }, + { + "git-tree": "70048fa5e3a76603c151b89bbdef9109c8c6cbac", + "version-string": "2.0.0-rc4-1", + "port-version": 0 + }, + { + "git-tree": "dd733e725b2d3bba7a7a106d6cf1e45774377628", + "version-string": "2.0.0-rc4", + "port-version": 0 + }, + { + "git-tree": "4e8d577b95fd9af066a3c09b2bb714d80e9f50f9", + "version-string": "2.0.0-rc1~vcpkg1-1", + "port-version": 0 + }, + { + "git-tree": "031ee4887e09f3623d3739c997625c0dc199eda4", + "version-string": "2.0.0-rc1~vcpkg1", + "port-version": 0 + }, + { + "git-tree": "2ecc613d11614a024950bef07314e7d50a5709d9", + "version-string": "2.0.0-rc0~vcpkg1-1", + "port-version": 0 + }, + { + "git-tree": "11a158a9cd1d634bc4d9d5a9ce33d99a76e57eb6", + "version-string": "2.0.0-rc0~vcpkg1", + "port-version": 0 + }, + { + "git-tree": "fd0237d8397bf2b49e3fc9d24e0ad6ea8f6638ac", + "version-string": "2.0.0-beta1+android11~vcpkg1", + "port-version": 0 + }, + { + "git-tree": "4a703a01ce702b0fbf3a79a4e1fe8c820a14e293", + "version-string": "2.0.0-beta1+android11", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/freetds.json b/externals/vcpkg/versions/f-/freetds.json new file mode 100755 index 000000000..0deb3189e --- /dev/null +++ b/externals/vcpkg/versions/f-/freetds.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "7d2a8c09978586d81a52529c94a96dd2f1208ebe", + "version": "1.3.10", + "port-version": 1 + }, + { + "git-tree": "c388be84a1c4bb7156aaf173f1ee348d500db8ad", + "version": "1.3.10", + "port-version": 0 + }, + { + "git-tree": "d3cbd323de7835a0dc5239e8b51b20f783121bdb", + "version": "1.2.11", + "port-version": 2 + }, + { + "git-tree": "78236f0bd404616850bc174e84bb6736cc197d73", + "version-string": "1.2.11", + "port-version": 1 + }, + { + "git-tree": "439c96e2d69abf4f1e4a462164bd3f43f764bd41", + "version-string": "1.2.11", + "port-version": 0 + }, + { + "git-tree": "2123a9defa2feacf14d70c50f936b6c912ad8543", + "version-string": "1.2.5", + "port-version": 0 + }, + { + "git-tree": "eeec4d1fbaa17b0929038cfd1bc28d28781bf879", + "version-string": "1.1.17", + "port-version": 0 + }, + { + "git-tree": "dbade27568ad8a35b927b2e740c9df191f51b793", + "version-string": "1.1.6-1", + "port-version": 0 + }, + { + "git-tree": "55d76ed2acda18d5262cdd239659c73435d7ba41", + "version-string": "1.1.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/freetype-gl.json b/externals/vcpkg/versions/f-/freetype-gl.json new file mode 100755 index 000000000..0e74040b0 --- /dev/null +++ b/externals/vcpkg/versions/f-/freetype-gl.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "c966935c663878c91381818cae1b87590be48191", + "version-date": "2022-01-17", + "port-version": 1 + }, + { + "git-tree": "4184aadfa1242cc37b6a3c77d9893bafd3d54d3f", + "version-date": "2022-01-17", + "port-version": 0 + }, + { + "git-tree": "e290ae7965dd6b7d333df5aa3a9a56df1bd8e24c", + "version-string": "2020-09-14", + "port-version": 1 + }, + { + "git-tree": "510adf88620e2f9d059d5fad33826148cd157957", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "70864cb04a4c9b3e006b61174572fd73d9636b2f", + "version-string": "2019-03-29", + "port-version": 4 + }, + { + "git-tree": "bc1822817ca08f645cff5f3fa7004b7f2c87c4d1", + "version-string": "2019-03-29-3", + "port-version": 0 + }, + { + "git-tree": "4221297464606010bc9f77daf5ae8be4b2f1c523", + "version-string": "2019-03-29-2", + "port-version": 0 + }, + { + "git-tree": "e52376d6a52e61c69680b317a5f3fd3f15f63829", + "version-string": "2019-03-29-1", + "port-version": 0 + }, + { + "git-tree": "aa481e047172bc4aaf23658fdc2aa26d108daf52", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "704b2c66ea56709f33dfb22703a4927e8af4a922", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "73845f2ec15e48b73d4fbf3c0d0f0934d4582c76", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "c8a43eaf03ce3a6bec67d700359b7d42e67ff4d6", + "version-string": "2017-10-9-82fb152a74f01b1483ac80d15935fbdfaf3ed836", + "port-version": 0 + }, + { + "git-tree": "a94520898aa0e54b08562e0ece07d312cc302b95", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/freetype.json b/externals/vcpkg/versions/f-/freetype.json new file mode 100755 index 000000000..3e06506e8 --- /dev/null +++ b/externals/vcpkg/versions/f-/freetype.json @@ -0,0 +1,184 @@ +{ + "versions": [ + { + "git-tree": "bf7afc9d9fa4aba9747dfc7902c60ea7cfa09e72", + "version": "2.12.1", + "port-version": 0 + }, + { + "git-tree": "ab8f5879ab23ffa292c80169f750b7edd6c2b4f1", + "version-semver": "2.11.1", + "port-version": 1 + }, + { + "git-tree": "dadbf4b6e5f5670bf49489e26de326be6a72f962", + "version-semver": "2.11.1", + "port-version": 0 + }, + { + "git-tree": "9d21ff9f7071d83c1e04eca8cae21b99438400d8", + "version-semver": "2.11.0", + "port-version": 2 + }, + { + "git-tree": "a314ebd21048f1cf17a6b4330d9970c661f8fea7", + "version-semver": "2.11.0", + "port-version": 1 + }, + { + "git-tree": "6814e10440bcdc58c4bd29a0373d2f902783ba54", + "version-semver": "2.11.0", + "port-version": 0 + }, + { + "git-tree": "dabcba1d5153c796480c50c459ef045b5db8d2a4", + "version-string": "2.10.4", + "port-version": 0 + }, + { + "git-tree": "1cb9be3e21abf88d9607f250dceaeca6ac0b1ed9", + "version-string": "2.10.2", + "port-version": 7 + }, + { + "git-tree": "99c654355743a6c93c80e4cab1eda3cfd3fc8160", + "version-string": "2.10.2", + "port-version": 6 + }, + { + "git-tree": "2ea07e49ef4c7e147a344a0652060544ba6203d0", + "version-string": "2.10.2", + "port-version": 5 + }, + { + "git-tree": "5617afec62e979a2f6c540fe71ee9edf0190d510", + "version-string": "2.10.2", + "port-version": 4 + }, + { + "git-tree": "feace7c60ed1b85ef794cf148f7248caea554ea0", + "version-string": "2.10.2", + "port-version": 3 + }, + { + "git-tree": "58c6c681699fd8788c8e6634007db06477b177f8", + "version-string": "2.10.2", + "port-version": 2 + }, + { + "git-tree": "64d028f31c310cbe8a67c0a794fc6749be2d39d1", + "version-string": "2.10.2", + "port-version": 1 + }, + { + "git-tree": "208324c4f1b5ddda676af728adf0f3576f782754", + "version-string": "2.10.1-6", + "port-version": 0 + }, + { + "git-tree": "2d07c58f326488b7f34947f53df711f98d7adc5b", + "version-string": "2.10.1-5", + "port-version": 0 + }, + { + "git-tree": "6770e1464a643bc7c1544c307a4081ddeda847e2", + "version-string": "2.10.1-4", + "port-version": 0 + }, + { + "git-tree": "2128fe69a7209b207c28a0e490cec703348d1c71", + "version-string": "2.10.1-3", + "port-version": 0 + }, + { + "git-tree": "b2ac8435a6be8bc5f142cc42058c2bb05a54f68d", + "version-string": "2.10.1-2", + "port-version": 0 + }, + { + "git-tree": "bed0c9ff4fd5b89c11aff6834affc9f616c178a9", + "version-string": "2.10.1-1", + "port-version": 0 + }, + { + "git-tree": "2f500736d0b0af3d480ae55f6e0f6650713ea092", + "version-string": "2.10.0-1", + "port-version": 0 + }, + { + "git-tree": "6a1585a8624af605e2b4ee1fcf73f193c8e92d97", + "version-string": "2.10.0", + "port-version": 0 + }, + { + "git-tree": "9bf7e372c7f9d153c4c9da108c4acb8878ca618a", + "version-string": "2.9.1-2", + "port-version": 0 + }, + { + "git-tree": "3a1f9ec900a84b9cf7ac9fee240cc724b6a4d914", + "version-string": "2.9.1-1", + "port-version": 0 + }, + { + "git-tree": "e4b2b5267a039246cff146d301a356cb41298c68", + "version-string": "2.9.1", + "port-version": 0 + }, + { + "git-tree": "350223fe34104da2c1af3a35a2a35a5ff5393569", + "version-string": "2.8.1-4", + "port-version": 0 + }, + { + "git-tree": "bb10d0eba6916c18ab5f96863ff785a355419a7c", + "version-string": "2.8.1-3", + "port-version": 0 + }, + { + "git-tree": "a379db61c0507527b1c6b91ef7a28c3b85a84e95", + "version-string": "2.8.1-1", + "port-version": 0 + }, + { + "git-tree": "dd7c9908be49bd1f7eeaed239abb61786f46dc5c", + "version-string": "2.8-1", + "port-version": 0 + }, + { + "git-tree": "be76f27592bba7ed8998bd91b0fbb47eef90c0fa", + "version-string": "2.8", + "port-version": 0 + }, + { + "git-tree": "ec1f534cbfa539d7fd2fdc158599fdae36ce406a", + "version-string": "2.6.3-5", + "port-version": 0 + }, + { + "git-tree": "d710681643612a39848e95741c9fe9b9692a76a4", + "version-string": "2.6.3-4", + "port-version": 0 + }, + { + "git-tree": "d27015841edd5cc6890e943f4f551038159715d7", + "version-string": "2.6.3-3", + "port-version": 0 + }, + { + "git-tree": "08f108a3a615a834244bf856c5f27c66250b049d", + "version-string": "2.6.3-2", + "port-version": 0 + }, + { + "git-tree": "8a146a9ae2b230c5732817b8077f8472feb7a9e9", + "version-string": "2.6.3-1", + "port-version": 0 + }, + { + "git-tree": "db411c17d642c61fcca8f29001fd08423187361c", + "version-string": "2.6.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/freexl.json b/externals/vcpkg/versions/f-/freexl.json new file mode 100755 index 000000000..05ef3a3a0 --- /dev/null +++ b/externals/vcpkg/versions/f-/freexl.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "d9635355d8831e1f9628ecbb8935a8e89813ff51", + "version-string": "1.0.6", + "port-version": 0 + }, + { + "git-tree": "26e9d42e555e69bf1ea1747739daf3d6551bb46b", + "version-string": "1.0.4", + "port-version": 12 + }, + { + "git-tree": "eb377ce039ce22eaec25f3bf81668c5d77bec086", + "version-string": "1.0.4", + "port-version": 11 + }, + { + "git-tree": "7621887e434dcd5436b2d4b814fc569e7470d2ae", + "version-string": "1.0.4", + "port-version": 10 + }, + { + "git-tree": "8bedb6059320daeaf3053397f006c33345c42b08", + "version-string": "1.0.4-9", + "port-version": 0 + }, + { + "git-tree": "e244c1326fd2e11371c0dfde72764a62645e8863", + "version-string": "1.0.4-8", + "port-version": 0 + }, + { + "git-tree": "93e13d9107e454293c42d1f5d0c8b10aef997c26", + "version-string": "1.0.4-7", + "port-version": 0 + }, + { + "git-tree": "0653fd4cccb65cd5afdc08be557eedcdd5bc9c32", + "version-string": "1.0.4-6", + "port-version": 0 + }, + { + "git-tree": "34267284d78ad994c64070ca1f83e6aa2e6fa9ae", + "version-string": "1.0.4-5", + "port-version": 0 + }, + { + "git-tree": "ba53878a24c9b345fee375d52946db8f1441c52d", + "version-string": "1.0.4-2", + "port-version": 0 + }, + { + "git-tree": "59d726a486ff7f4246088c9ddffd2311811c664d", + "version-string": "1.0.4-1", + "port-version": 0 + }, + { + "git-tree": "78018658069204bfb1444a91e5246542eed918a4", + "version-string": "1.0.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fribidi.json b/externals/vcpkg/versions/f-/fribidi.json new file mode 100755 index 000000000..c164cdf54 --- /dev/null +++ b/externals/vcpkg/versions/f-/fribidi.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "43f84b32dcc2e675fac20a42c0cf0c7f801c1fbc", + "version": "1.0.12", + "port-version": 0 + }, + { + "git-tree": "038a02d8e9a403f61bd3d45ce0f6f626a67d72f3", + "version": "1.0.11", + "port-version": 3 + }, + { + "git-tree": "134c67f3f8db520442ed5bea02262f14d647f7ce", + "version": "1.0.11", + "port-version": 2 + }, + { + "git-tree": "1555ac8e52ae978d26277e842322241a3da9c8ae", + "version": "1.0.11", + "port-version": 1 + }, + { + "git-tree": "0e040a494c14a4fade7878bf200a0463abc21e96", + "version": "1.0.11", + "port-version": 0 + }, + { + "git-tree": "88696509b4e846e3f04283bcf928db39800cc4eb", + "version-string": "1.0.10", + "port-version": 3 + }, + { + "git-tree": "197340b9f9db2c444b70c27b54cfbe0ce3601c0b", + "version-string": "1.0.10", + "port-version": 2 + }, + { + "git-tree": "cfd7b4f4b0342721b50ef5eab54510351797e343", + "version-string": "1.0.10", + "port-version": 1 + }, + { + "git-tree": "40cbd20c8b1111f20989db2341eadd77a2935ba2", + "version-string": "1.0.10", + "port-version": 0 + }, + { + "git-tree": "b450252220350ac81b7ffe9da01b5ab8a591f282", + "version-string": "1.0.9-1", + "port-version": 0 + }, + { + "git-tree": "c331cf608aabdbf5014c8ce53ce28535e7d0d056", + "version-string": "1.0.9", + "port-version": 0 + }, + { + "git-tree": "6f7db7694f8d226c6e7819ceabb6c9dfadf7a5e7", + "version-string": "2019-02-04-3", + "port-version": 0 + }, + { + "git-tree": "6b759ba74a5377a29b53383857f603e29d2272ce", + "version-string": "2019-02-04-2", + "port-version": 0 + }, + { + "git-tree": "17cdd47123a95be41d62c67043d6195e0bc352b9", + "version-string": "2019-02-04-1", + "port-version": 0 + }, + { + "git-tree": "de69bf0436d96861f2d9b48ce70537babfe717db", + "version-string": "58c6cb3", + "port-version": 0 + }, + { + "git-tree": "63d551d740ff3476f8047fbc11c06f4c420898b0", + "version-string": "1.0.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/frozen.json b/externals/vcpkg/versions/f-/frozen.json new file mode 100755 index 000000000..ee2651893 --- /dev/null +++ b/externals/vcpkg/versions/f-/frozen.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "0a8050c893da6b0549af088c1045ad459f330275", + "version": "1.1.1", + "port-version": 0 + }, + { + "git-tree": "938d0ffeb689db9642ac49d16d7e7a22d3be93ab", + "version-date": "2021-04-22", + "port-version": 0 + }, + { + "git-tree": "db2f839a9c1bfea5b1916b1dffab205ea64144b4", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/frugally-deep.json b/externals/vcpkg/versions/f-/frugally-deep.json new file mode 100755 index 000000000..7f4eff05f --- /dev/null +++ b/externals/vcpkg/versions/f-/frugally-deep.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "360c45aa18328060b37ba37ac541fef843d07e29", + "version-semver": "0.15.10-p0", + "port-version": 0 + }, + { + "git-tree": "b53df71f90baedbb8e1d9c05ad4d437756c289d3", + "version-semver": "0.15.2-p0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fruit.json b/externals/vcpkg/versions/f-/fruit.json new file mode 100755 index 000000000..5c7fb90e9 --- /dev/null +++ b/externals/vcpkg/versions/f-/fruit.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "630ff582ea6cdbf31ba5eef0656e84018f901f1e", + "version-string": "3.6.0", + "port-version": 1 + }, + { + "git-tree": "e6dae7cd2c3f307a0cbc6d2a676ae582afea6cd8", + "version-string": "3.6.0", + "port-version": 0 + }, + { + "git-tree": "ea035b31414afce156eba8a6e84d06e1b8f23884", + "version-string": "3.4.0-2", + "port-version": 0 + }, + { + "git-tree": "441e8134c24195a5ff65632eb9168b71c547f2f6", + "version-string": "3.4.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/ftgl.json b/externals/vcpkg/versions/f-/ftgl.json new file mode 100755 index 000000000..54fd244bb --- /dev/null +++ b/externals/vcpkg/versions/f-/ftgl.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "42f6d4d37641856fc516bd9df7775c448434e94a", + "version-date": "2022-05-18", + "port-version": 1 + }, + { + "git-tree": "5f8871169a409d3eff23c83391564108912a6a97", + "version-date": "2022-05-18", + "port-version": 0 + }, + { + "git-tree": "5642730406fc248cae1eaefc9e739b9bf1c13fbf", + "version-string": "2.4.0", + "port-version": 4 + }, + { + "git-tree": "01f15f385d7c8555935f011a8e32010212764279", + "version-string": "2.4.0", + "port-version": 3 + }, + { + "git-tree": "394f15ad9c241aec2909e3c28b2dc04a7b412e30", + "version-string": "2.4.0-2", + "port-version": 0 + }, + { + "git-tree": "320c9a877d560b757606384c9a72a45d89351e3a", + "version-string": "2.4.0-1", + "port-version": 0 + }, + { + "git-tree": "c797f24d2b95a56a8174299494530c7617ea57aa", + "version-string": "2.3.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/ftxui.json b/externals/vcpkg/versions/f-/ftxui.json new file mode 100755 index 000000000..68c44fc1d --- /dev/null +++ b/externals/vcpkg/versions/f-/ftxui.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "42d65bbb4e3ffbb459b80b05de4322fa10593e29", + "version-semver": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "f84934653f0ae5ca32279726f41dae1b2f6a4fb5", + "version-semver": "2.0.0", + "port-version": 1 + }, + { + "git-tree": "92b9696ab8e0f19cca9e5bf161719700aecdb425", + "version-date": "2021-10-17", + "port-version": 1 + }, + { + "git-tree": "e98623fd181fa1ad4b0ec07053dc140066dfb66f", + "version-date": "2021-10-17", + "port-version": 0 + }, + { + "git-tree": "d7dd27584c015a37dd3266255530e889b16aebcf", + "version-date": "2021-06-17", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/function2.json b/externals/vcpkg/versions/f-/function2.json new file mode 100755 index 000000000..26943805c --- /dev/null +++ b/externals/vcpkg/versions/f-/function2.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "98e16b513e6457caf3edc8ac5dc1db7e62255797", + "version-string": "4.2.0", + "port-version": 1 + }, + { + "git-tree": "844aa89a1d4dabf3d084f060c7b8036b1ba69f06", + "version-string": "4.2.0", + "port-version": 0 + }, + { + "git-tree": "1e02d8c31f298e37fe21781f8114c31ae29a1e73", + "version-string": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "2fceb990aff2d58fedcdd536e731876427df9edb", + "version-string": "4.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/functions-framework-cpp.json b/externals/vcpkg/versions/f-/functions-framework-cpp.json new file mode 100755 index 000000000..5de6dc260 --- /dev/null +++ b/externals/vcpkg/versions/f-/functions-framework-cpp.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "a9e0ac94b09059d2a341c6f1614f8d9146732ed2", + "version": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "45f93916767e8d79db63cc94b8274f98ee1bef1c", + "version": "1.0.0", + "port-version": 1 + }, + { + "git-tree": "ea5cc9295e63419251720c34b2bbd02d710333c0", + "version": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "137edc9b4dd9a58f50ae9db1671d4608748088e7", + "version": "0.6.0", + "port-version": 0 + }, + { + "git-tree": "48d17ad88b188aa35db1a9d18f78b4fa9b9a8e22", + "version": "0.5.0", + "port-version": 0 + }, + { + "git-tree": "7018d9db8c166cb81ffb1c291535491aad98b339", + "version": "0.4.0", + "port-version": 0 + }, + { + "git-tree": "c99280d0ee9b2e57960d13b54521a2305c1f85a8", + "version": "0.3.0", + "port-version": 2 + }, + { + "git-tree": "1506acc2df21c0b49e93d73da7229d524ace0fb3", + "version-string": "0.3.0", + "port-version": 1 + }, + { + "git-tree": "35de9501f7e2c91bb35da41cffac790008330a3c", + "version-string": "0.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fuzzylite.json b/externals/vcpkg/versions/f-/fuzzylite.json new file mode 100755 index 000000000..8741a481e --- /dev/null +++ b/externals/vcpkg/versions/f-/fuzzylite.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "27926f33e6bab79f1eefa5c7999645f855c5fda3", + "version": "6.0", + "port-version": 5 + }, + { + "git-tree": "df47396ca528792e73f67bb8f297a064b46ef21b", + "version-string": "6.0", + "port-version": 4 + }, + { + "git-tree": "374c4e29fa24184089d4622061f11481dae3ddf3", + "version-string": "6.0", + "port-version": 3 + }, + { + "git-tree": "0a835a50d74e23daaf0851d47fe12c528cc1394f", + "version-string": "6.0-2", + "port-version": 0 + }, + { + "git-tree": "6acf57d6d12d70de1cce275c14f6d28d8a01c95a", + "version-string": "6.0-1", + "port-version": 0 + }, + { + "git-tree": "7902b2f4f48814fbd79364e1ec9acc4ece59dfb3", + "version-string": "6.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/f-/fxdiv.json b/externals/vcpkg/versions/f-/fxdiv.json new file mode 100755 index 000000000..faae1bc5e --- /dev/null +++ b/externals/vcpkg/versions/f-/fxdiv.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "58ee7e759479e81a3218ff4d5efb8ada40c40d65", + "version-string": "2021-02-21", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/g2o.json b/externals/vcpkg/versions/g-/g2o.json new file mode 100755 index 000000000..34e9d0dfa --- /dev/null +++ b/externals/vcpkg/versions/g-/g2o.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "4fb8813de02bd243b25d9ed93065f9f9cba09e93", + "version-string": "2020-02-07", + "port-version": 2 + }, + { + "git-tree": "d0ac4605d18f07a2a3087a71be8c84f6ad0fbfa8", + "version-string": "2020-02-07", + "port-version": 1 + }, + { + "git-tree": "7d418d32b5bf4d25c51cc84fe67186a03c289c15", + "version-string": "2020-02-07", + "port-version": 0 + }, + { + "git-tree": "b8d549421281befb7d6d5c5056275d245c17c69c", + "version-string": "20170730_git-5", + "port-version": 0 + }, + { + "git-tree": "a52a19ce11fc752a0256720a3cac9514de58742e", + "version-string": "20170730_git-4", + "port-version": 0 + }, + { + "git-tree": "f4224207001b084a57bb179a658890e3029ed6c6", + "version-string": "20170730_git-3", + "port-version": 0 + }, + { + "git-tree": "9596412729bf6ca5cc6290b37a451be668c7d3c5", + "version-string": "20170730_git-2", + "port-version": 0 + }, + { + "git-tree": "4a825f4f5c10a40d9604ad9f3a2d20a14b1f26d4", + "version-string": "20170730_git-1", + "port-version": 0 + }, + { + "git-tree": "72ea0e28f85e20e62aa30a045d9672c6c50b595d", + "version-string": "20170730_git", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/g3log.json b/externals/vcpkg/versions/g-/g3log.json new file mode 100755 index 000000000..3451c7667 --- /dev/null +++ b/externals/vcpkg/versions/g-/g3log.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "b97c6fdba216caec4a83323a693a871cb57968fd", + "version": "1.3.4", + "port-version": 2 + }, + { + "git-tree": "37d239e8b61380aeb3bc6bbeaa2a91649787b34a", + "version": "1.3.4", + "port-version": 1 + }, + { + "git-tree": "2d5c7967292d8363c14af69e0b4d37fa9d48dd0e", + "version": "1.3.4", + "port-version": 0 + }, + { + "git-tree": "dea4491e152ae900d6677244552b14be3bf4c125", + "version-string": "2019-07-29", + "port-version": 0 + }, + { + "git-tree": "ee6c6eee295d8a73fecaa35742d50e8abc04be5e", + "version-string": "2019-05-14-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gainput.json b/externals/vcpkg/versions/g-/gainput.json new file mode 100755 index 000000000..d23cb9d36 --- /dev/null +++ b/externals/vcpkg/versions/g-/gainput.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "d7d03d82f8c42466bcd155b94e0dcefa79763931", + "version": "1.0.0", + "port-version": 6 + }, + { + "git-tree": "6edb146db254b1cec192c12f335bef0e54455770", + "version": "1.0.0", + "port-version": 5 + }, + { + "git-tree": "8751b5a093ee68d0273600efc1ecfcd23056aa47", + "version-string": "1.0.0", + "port-version": 4 + }, + { + "git-tree": "db05d34018ddbbfb24d06d2f5afcd51f1def0820", + "version-string": "1.0.0-3", + "port-version": 0 + }, + { + "git-tree": "99b7d6e2fa73fd4eb28d9001148a44a40183206a", + "version-string": "1.0.0-2", + "port-version": 0 + }, + { + "git-tree": "3490da61454df8c322103829ddf1d8ed824d6468", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "b3556cad0c2075723f26a31c4ba2d297626654dc", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gamedev-framework.json b/externals/vcpkg/versions/g-/gamedev-framework.json new file mode 100755 index 000000000..13f04015a --- /dev/null +++ b/externals/vcpkg/versions/g-/gamedev-framework.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "4dbeca9676a469cb84eb1cfc731ae9bbc9110447", + "version-semver": "0.20.0", + "port-version": 2 + }, + { + "git-tree": "a9771cd4f7093f5d34a78d3e2417707185444910", + "version-semver": "0.20.0", + "port-version": 1 + }, + { + "git-tree": "195d4f41db9d03aa44fa6cc0d984668115a17718", + "version-semver": "0.20.0", + "port-version": 0 + }, + { + "git-tree": "f2b6019722d4b0a58278a92dc29c4cb649256083", + "version-string": "0.18.1", + "port-version": 0 + }, + { + "git-tree": "577ec11df3de153105eafe87f6b9214827867ecf", + "version-string": "0.18.0", + "port-version": 0 + }, + { + "git-tree": "135e76b803173ac7d3c6f218839b9a13eb58a466", + "version-string": "0.17", + "port-version": 1 + }, + { + "git-tree": "fa493a07b83c63e5d7c6c09e8f8d8baeb62a2aab", + "version-string": "0.17", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gamenetworkingsockets.json b/externals/vcpkg/versions/g-/gamenetworkingsockets.json new file mode 100755 index 000000000..3f87f529e --- /dev/null +++ b/externals/vcpkg/versions/g-/gamenetworkingsockets.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "56c1a61c82400d285d3d37cf8e20a1f362a0d83f", + "version": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "02453dad9eb5272c445ba8e22c3d1aa3383a1a11", + "version": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "90689fcdbec5631f59725d83ee13c75f9686a2b4", + "version-date": "2021-04-26", + "port-version": 0 + }, + { + "git-tree": "42d95ab20685b00bc64cad1500f559d5b185a3a5", + "version-string": "2020-09-02", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gamma.json b/externals/vcpkg/versions/g-/gamma.json new file mode 100755 index 000000000..f507b7da0 --- /dev/null +++ b/externals/vcpkg/versions/g-/gamma.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "335e66b704d42844b1fef58f31a05545aec2e328", + "version-string": "gamma-2018-01-27", + "port-version": 4 + }, + { + "git-tree": "69d699310fe2e651e63668d194c19dfae5fd9376", + "version-string": "gamma-2018-01-27", + "port-version": 3 + }, + { + "git-tree": "5ce812228d6667a97bff96462c591eec32184cc9", + "version-string": "gamma-2018-01-27", + "port-version": 2 + }, + { + "git-tree": "fd6472b7d487872812477d84d19e0a4565ebc890", + "version-string": "gamma-2018-01-27-1", + "port-version": 0 + }, + { + "git-tree": "47a2badd9e413049c3b2e0c63e150768fb19665a", + "version-string": "gamma-2018-01-27", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gasol.json b/externals/vcpkg/versions/g-/gasol.json new file mode 100755 index 000000000..f9e5c97d4 --- /dev/null +++ b/externals/vcpkg/versions/g-/gasol.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "50bd4cd06666ebc284bb8d8157057c5a451bc11d", + "version-date": "2018-01-04", + "port-version": 2 + }, + { + "git-tree": "2425692b7bd94282d858e19c2a1360c274cb3e4c", + "version-string": "2018-01-04", + "port-version": 1 + }, + { + "git-tree": "e8163bf2d3dc55fc60058bccc216f37af6451796", + "version-string": "2018-01-04", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gaussianlib.json b/externals/vcpkg/versions/g-/gaussianlib.json new file mode 100755 index 000000000..231aa36b0 --- /dev/null +++ b/externals/vcpkg/versions/g-/gaussianlib.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "9cce82b2b2013b0ccc2b2f3e827cd5911f9a473d", + "version-string": "2019-08-04", + "port-version": 1 + }, + { + "git-tree": "521b395417590d5aa1cc0fa06cef081c5b14fc96", + "version-string": "2019-08-04", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gazebo.json b/externals/vcpkg/versions/g-/gazebo.json new file mode 100755 index 000000000..57626811b --- /dev/null +++ b/externals/vcpkg/versions/g-/gazebo.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "702a7de5c38ff156813a73a32eac6c7ca73248e4", + "version-date": "2022-01-20", + "port-version": 1 + }, + { + "git-tree": "983e90284c8c0073e0193750a412eb4df01accdc", + "version-date": "2022-01-20", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gcem.json b/externals/vcpkg/versions/g-/gcem.json new file mode 100755 index 000000000..29d714d2b --- /dev/null +++ b/externals/vcpkg/versions/g-/gcem.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "01116231bfab30197748230d4125d18fd2652150", + "version": "1.14.1", + "port-version": 0 + }, + { + "git-tree": "b5ffa19fc8b11179434020c69f6c998dd58268ee", + "version-string": "1.13.1", + "port-version": 1 + }, + { + "git-tree": "d65e2e2add7a84fdc29049058d9678c025783123", + "version-string": "1.13.1", + "port-version": 0 + }, + { + "git-tree": "407747ebdcebacdc169b487bc8445eb0ba344aa8", + "version-string": "1.12.0", + "port-version": 0 + }, + { + "git-tree": "187d71d44420931552570a8f4d3ea5114bbb5cdb", + "version-string": "1.8.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gdal.json b/externals/vcpkg/versions/g-/gdal.json new file mode 100755 index 000000000..b8b03cbd3 --- /dev/null +++ b/externals/vcpkg/versions/g-/gdal.json @@ -0,0 +1,314 @@ +{ + "versions": [ + { + "git-tree": "509d3e54670e6552cce8d811a329d6c28589392e", + "version-semver": "3.4.3", + "port-version": 2 + }, + { + "git-tree": "8bdf8b8ff951c1ce8719c789e66ac3a166eed063", + "version-semver": "3.4.3", + "port-version": 1 + }, + { + "git-tree": "8277225a2c5da40e154062f73526126fb00c9125", + "version-semver": "3.4.3", + "port-version": 0 + }, + { + "git-tree": "7c26036e04d87f1f5c27bf4bffa589b2481f47d3", + "version-semver": "3.4.2", + "port-version": 0 + }, + { + "git-tree": "daeafe53684ed8335d3bf77deeffa3424b26120d", + "version-semver": "3.4.1", + "port-version": 4 + }, + { + "git-tree": "a8c88697265b7f88d7576c24c57456da86500b19", + "version-semver": "3.4.1", + "port-version": 3 + }, + { + "git-tree": "e90ac12366dec86dcacf5a66562e48f80254b3c5", + "version-semver": "3.4.1", + "port-version": 2 + }, + { + "git-tree": "b3bff053bc6f972c2c19f88047f2a5ae53f21746", + "version-semver": "3.4.1", + "port-version": 1 + }, + { + "git-tree": "a905d07fce3cebd0d1b52809cbdf1e37cce60cf3", + "version-semver": "3.4.1", + "port-version": 0 + }, + { + "git-tree": "db90242c9a7b428c65415a64e83c149965dd7ceb", + "version-semver": "3.4.0", + "port-version": 6 + }, + { + "git-tree": "519ec20e4d9e0fc541320ca88b51521180c570da", + "version-semver": "3.4.0", + "port-version": 5 + }, + { + "git-tree": "78bf53bfc83afb261c9eaa60cf2ef9487031b4b1", + "version-semver": "3.4.0", + "port-version": 4 + }, + { + "git-tree": "164700a47428c2ded10ee9dc8e28fb189fca0f94", + "version-semver": "3.4.0", + "port-version": 3 + }, + { + "git-tree": "f0f7e3cd7a86246d31f892678b2e06d01c455c5b", + "version-semver": "3.4.0", + "port-version": 2 + }, + { + "git-tree": "d5580a73ced0a55c4659874d1755239c76e9168c", + "version-semver": "3.4.0", + "port-version": 1 + }, + { + "git-tree": "097ed3ccdf77735c5b36e354138da35cfd642bcc", + "version-semver": "3.4.0", + "port-version": 0 + }, + { + "git-tree": "a9ec2540fda2dfe657e004b70d5ca5a1cc7a2db8", + "version-semver": "3.3.2", + "port-version": 4 + }, + { + "git-tree": "5173c609fafae13d948b1417064517be5bd78c7f", + "version-semver": "3.3.2", + "port-version": 3 + }, + { + "git-tree": "354c2bfa5d4de64d6894cb74f47e6801fd02af8d", + "version-semver": "3.3.2", + "port-version": 2 + }, + { + "git-tree": "6e90412cd51170a5ea63a0067005bb3afc3c6c36", + "version-semver": "3.3.2", + "port-version": 1 + }, + { + "git-tree": "bcc73ebd09ec91402d610074046785d7432f99fa", + "version-semver": "3.3.2", + "port-version": 0 + }, + { + "git-tree": "15009f5f5d2867c594d8148d79cccbe964432465", + "version-semver": "3.2.2", + "port-version": 6 + }, + { + "git-tree": "3f821ae473a38c3ceac861552f560da4a9109ff8", + "version-semver": "3.2.2", + "port-version": 5 + }, + { + "git-tree": "b87df6a4a70bb9afb31992195a8ccc6e04d59663", + "version-semver": "3.2.2", + "port-version": 4 + }, + { + "git-tree": "5bb72450f69322e39e09bea191e5c947833e698d", + "version-semver": "3.2.2", + "port-version": 3 + }, + { + "git-tree": "cee8a26ec45230cb4b11e18582b41291b264d82e", + "version-semver": "3.2.2", + "port-version": 2 + }, + { + "git-tree": "f95d14f55c0bbc629a07da68147324ab4fd0bd58", + "version-semver": "3.2.2", + "port-version": 1 + }, + { + "git-tree": "bb182d21db781421272dccf7c43273c746480c05", + "version-semver": "3.2.2", + "port-version": 0 + }, + { + "git-tree": "b503a5dd67c0251115346ebfc05551bc8f36c06f", + "version-string": "3.1.3", + "port-version": 4 + }, + { + "git-tree": "548d5f5f1ad969bf88d86c17de3ee40ebb096a2f", + "version-string": "3.1.3", + "port-version": 3 + }, + { + "git-tree": "162ae61cb64d9bb9a485e611cca106ade9062c1a", + "version-string": "3.1.3", + "port-version": 2 + }, + { + "git-tree": "fc7d76bf3899b89791a7699037bed3532cdc0c60", + "version-string": "3.1.3", + "port-version": 1 + }, + { + "git-tree": "ce628f1ed087dc7d0be29ff484895fab1c992228", + "version-string": "3.1.3", + "port-version": 0 + }, + { + "git-tree": "fb802c0f6e1b27c52a536a54fe3e983db2ed8078", + "version-string": "2.4.1", + "port-version": 14 + }, + { + "git-tree": "09c17ced8d0c36fb39d82b961567635b428a306b", + "version-string": "2.4.1", + "port-version": 13 + }, + { + "git-tree": "794d34d7524369ff21e1cd9e08375fd19299c07e", + "version-string": "2.4.1", + "port-version": 12 + }, + { + "git-tree": "e8922800d4b5ae222c4dc31ddacf13ac0948ccb6", + "version-string": "2.4.1", + "port-version": 11 + }, + { + "git-tree": "3f1fef0f90db6f004c572014ba19a10997cb3868", + "version-string": "2.4.1", + "port-version": 10 + }, + { + "git-tree": "c8ecaef2226d498408ec8b7f8e9f6884c5470f47", + "version-string": "2.4.1-9", + "port-version": 0 + }, + { + "git-tree": "66f895894f4d9f4009d1039154e1c12cb64ae2a4", + "version-string": "2.4.1-8", + "port-version": 0 + }, + { + "git-tree": "cf5b9d5d3202b07908b2e9de372f927737ed9b10", + "version-string": "2.4.1-7", + "port-version": 0 + }, + { + "git-tree": "6979604bbc0cec851a1b2b4d293eb5438cd4389a", + "version-string": "2.4.1-5", + "port-version": 0 + }, + { + "git-tree": "9c8914ac204ea2232a0151c3fdf6d02e08e52dce", + "version-string": "2.4.1-4", + "port-version": 0 + }, + { + "git-tree": "cc8ea7762a1c4476214387dd030ae56432462e24", + "version-string": "2.4.1-3", + "port-version": 0 + }, + { + "git-tree": "f702bb7a936630aca29bb5da54210dee379355cf", + "version-string": "2.4.1-1", + "port-version": 0 + }, + { + "git-tree": "2c258cf1345997fd636d05c4c0c3f130fcc59346", + "version-string": "2.4.1", + "port-version": 0 + }, + { + "git-tree": "c6219ad16447f839ca5c91d47702de3dd1524dc8", + "version-string": "2.4.0-2", + "port-version": 0 + }, + { + "git-tree": "52c3b9a6d95a77bd1853dd3c510edf4c0d02a001", + "version-string": "2.4.0-1", + "port-version": 0 + }, + { + "git-tree": "ec633db2064617e9eabef4632bda485a411863af", + "version-string": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "c0d740e3203055bca7299dd7095b47defd1c418c", + "version-string": "2.3.2", + "port-version": 0 + }, + { + "git-tree": "2c728c1d650e11ef61d40f4376ff31069da5dd68", + "version-string": "2.3.0-2", + "port-version": 0 + }, + { + "git-tree": "1e0b79e6c3fdec9dfb63a82fdb0dc778ca7a06ed", + "version-string": "2.3.0-1", + "port-version": 0 + }, + { + "git-tree": "5b5448cf1a48e837b5fac39204a2e0295fdc48c3", + "version-string": "2.2.2-1", + "port-version": 0 + }, + { + "git-tree": "4bde362b5161d385d952aebf3201af6667d6952b", + "version-string": "2.2.2", + "port-version": 0 + }, + { + "git-tree": "9c4345e31c9104e65651939dd1c3c531c511c121", + "version-string": "1.11.3-5", + "port-version": 0 + }, + { + "git-tree": "880d759b43656c67e0d64937359fdf9c849f844f", + "version-string": "2.2.2", + "port-version": 0 + }, + { + "git-tree": "18130a2dcb16a83047e0432a30fc1521b86bd1ab", + "version-string": "1.11.3-5", + "port-version": 0 + }, + { + "git-tree": "7f9603300d3343e432d86479c3c1d68ed8b37913", + "version-string": "1.11.3-4", + "port-version": 0 + }, + { + "git-tree": "cafeff1ea00ba0a45ec4ed8dd9c457471e743ca8", + "version-string": "1.11.3-3", + "port-version": 0 + }, + { + "git-tree": "a0ee8782e3dc3f1d2e90736f10b45fa7b68d4388", + "version-string": "1.11.3-2", + "port-version": 0 + }, + { + "git-tree": "9398b88bc7326a8156f31857b8391bdbe06241aa", + "version-string": "1.11.3-1", + "port-version": 0 + }, + { + "git-tree": "76b4681a0f1be6d3dde9a06a5f0b58e642727b14", + "version-string": "1.11.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gdcm.json b/externals/vcpkg/versions/g-/gdcm.json new file mode 100755 index 000000000..f18a8a6e1 --- /dev/null +++ b/externals/vcpkg/versions/g-/gdcm.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "d88a2229a173f1d38ae7beeb24d8169957968e74", + "version": "3.0.12", + "port-version": 0 + }, + { + "git-tree": "64bda232157a1119e4a16b3379294d13354e8971", + "version": "3.0.7", + "port-version": 4 + }, + { + "git-tree": "de7a48decccdda2df7f6878f4002fa661f7a6090", + "version": "3.0.7", + "port-version": 3 + }, + { + "git-tree": "c072a49eaff02bc7bf83c73a68be9d0f63533352", + "version-string": "3.0.7", + "port-version": 2 + }, + { + "git-tree": "151374d525077e7d8229b4ad2bf8f1630f36fbb5", + "version-string": "3.0.7", + "port-version": 1 + }, + { + "git-tree": "cc2b78ff93cde95d5d9a4c9c9b4b2a393a7195a2", + "version-string": "3.0.7", + "port-version": 0 + }, + { + "git-tree": "a90576c98449304ca63c768b12a1bb6a835dd826", + "version-string": "3.0.5", + "port-version": 2 + }, + { + "git-tree": "9ed2e5b2f5a05dcddc1c7c1c03678c5cfc851978", + "version-string": "3.0.5", + "port-version": 1 + }, + { + "git-tree": "8a05d65aaea041c99672c3d3d69c6e894025f47f", + "version-string": "3.0.5", + "port-version": 0 + }, + { + "git-tree": "648168de0deb524f6bded1326db7a155236158c4", + "version-string": "3.0.4", + "port-version": 0 + }, + { + "git-tree": "32c6e94e0f14e1f26f115941cf63511cd6c53a81", + "version-string": "3.0.3", + "port-version": 0 + }, + { + "git-tree": "1ee5966160db987c0728f3b2811bb671c9a3d387", + "version-string": "3.0.0-5", + "port-version": 0 + }, + { + "git-tree": "fff56335563ec44d4b4be4827c7d8b4830f6f832", + "version-string": "3.0.0-4", + "port-version": 0 + }, + { + "git-tree": "9c6002d6e3211063797f9c2fc069dd221e201045", + "version-string": "3.0.0-3", + "port-version": 0 + }, + { + "git-tree": "845db920b3de438ec5ca11358e6108e129b5c481", + "version-string": "3.0.0-1", + "port-version": 0 + }, + { + "git-tree": "cb4895b9198833684ef8b8a02b204c51047740e9", + "version-string": "3.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gdcm2.json b/externals/vcpkg/versions/g-/gdcm2.json new file mode 100755 index 000000000..682ae8135 --- /dev/null +++ b/externals/vcpkg/versions/g-/gdcm2.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "47f14257c43fffb30109bab99c9ae594007f3617", + "version-string": "deprecated", + "port-version": 1 + }, + { + "git-tree": "dfe78f1df5d0fc56c69eeea5096e093cbd6499e5", + "version-string": "deprecated", + "port-version": 0 + }, + { + "git-tree": "af9178d0515bc8019a0863f171533989ad4a2596", + "version-string": "2.8.9", + "port-version": 0 + }, + { + "git-tree": "4e514d0621af19f1fbe1ccaf51d28722603a0fa7", + "version-string": "2.8.8-2", + "port-version": 0 + }, + { + "git-tree": "92ec32d0d5cf7d8fcf4d3aef5070b0b5af7c7505", + "version-string": "2.8.8", + "port-version": 0 + }, + { + "git-tree": "87cf0d35f157ef37ef7501df468c3f26447cf620", + "version-string": "2.8.7", + "port-version": 0 + }, + { + "git-tree": "1a82ec04d2689902bed84bfe47bd02e31deaa5b4", + "version-string": "2.8.6", + "port-version": 0 + }, + { + "git-tree": "11dc452146814541826f33caba0f130ee3d0cbab", + "version-string": "2.8.5", + "port-version": 0 + }, + { + "git-tree": "b38c43fcae1d8aacf12a892bb0258e11c933c979", + "version-string": "2.8.4", + "port-version": 0 + }, + { + "git-tree": "ded71c576a891ef907f2216750a1a479d6d39ba2", + "version-string": "2.8.3", + "port-version": 0 + }, + { + "git-tree": "83d3297813e834c6d175d94219a1fb35ae06c848", + "version-string": "2.6.8-1", + "port-version": 0 + }, + { + "git-tree": "f746dd83ce41698054fd9468c3c05a9644fac3ca", + "version-string": "2.6.8", + "port-version": 0 + }, + { + "git-tree": "4c5050c55886cffff0cf870fa165d166fc0439a5", + "version-string": "2.6.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gdk-pixbuf.json b/externals/vcpkg/versions/g-/gdk-pixbuf.json new file mode 100755 index 000000000..38fea4b46 --- /dev/null +++ b/externals/vcpkg/versions/g-/gdk-pixbuf.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "2e82cf35eb436a674fdbdfa12cce69e629c83bf4", + "version": "2.42.8", + "port-version": 2 + }, + { + "git-tree": "d1c32f1df7acf96c17689e559b2e1edeb947de38", + "version": "2.42.8", + "port-version": 1 + }, + { + "git-tree": "ad94c8b8ea1bd1f66085e17b9763b22080d6bf6b", + "version": "2.42.8", + "port-version": 0 + }, + { + "git-tree": "c6274b79c119e29062eaaa6ad99271fe868f0288", + "version": "2.42.2", + "port-version": 2 + }, + { + "git-tree": "f90cd0dd11fd312fe803519706f422a9207336d0", + "version": "2.42.2", + "port-version": 1 + }, + { + "git-tree": "609b77f244ec0d76aac5616cd8654dfcbc608297", + "version": "2.42.2", + "port-version": 0 + }, + { + "git-tree": "f6d6e3ba09cf7cf29266570a1b6315f406ca5b09", + "version-string": "2.36.9-5", + "port-version": 7 + }, + { + "git-tree": "19543fcddd66a688aa878482e39bec4be1eaf801", + "version-string": "2.36.9-5", + "port-version": 6 + }, + { + "git-tree": "2aeb5ad0a34338caf863437c7a53898dcd7a920d", + "version-string": "2.36.9-5", + "port-version": 0 + }, + { + "git-tree": "7b26d8f50a0f9d5a2df574cbc0ab594005162e85", + "version-string": "2.36.9-4", + "port-version": 0 + }, + { + "git-tree": "3a5fa8b4568f486c6fa295dbcf492b1e5c381615", + "version-string": "2.36.9-3", + "port-version": 0 + }, + { + "git-tree": "4603a70c7832eae4cfeb29082dabb08e0d2bfa71", + "version-string": "2.36.9-2", + "port-version": 0 + }, + { + "git-tree": "0919ae2c5d0fe985706690a45ed5dcd655e97fec", + "version-string": "2.36.9-1", + "port-version": 0 + }, + { + "git-tree": "501ca9ca73a66e1f01425b1fe99f378cb9efa348", + "version-string": "2.36.9", + "port-version": 0 + }, + { + "git-tree": "94d6c8461b4b90c1574cd75dcd878adcc1b1a860", + "version-string": "2.36.6", + "port-version": 0 + }, + { + "git-tree": "62ebf69cbff912496c5177dbc002f73536818ba0", + "version-string": "2.36.5", + "port-version": 0 + }, + { + "git-tree": "1012f17578ee7cc8f149d900f4d363357a300528", + "version-string": "2.36.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gemmlowp.json b/externals/vcpkg/versions/g-/gemmlowp.json new file mode 100755 index 000000000..dc471d152 --- /dev/null +++ b/externals/vcpkg/versions/g-/gemmlowp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "843bf152a690b01de4606a68a769e67e8d1ca6bf", + "version-date": "2021-09-28", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/genann.json b/externals/vcpkg/versions/g-/genann.json new file mode 100755 index 000000000..84c36d720 --- /dev/null +++ b/externals/vcpkg/versions/g-/genann.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "74f4d685e744a09163c7bfcf502e3facc2d9bf95", + "version-string": "2019-07-10", + "port-version": 1 + }, + { + "git-tree": "bf7df34f8a169dd885b019d42aa0dd2db3d97178", + "version-string": "2019-07-10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/geogram.json b/externals/vcpkg/versions/g-/geogram.json new file mode 100755 index 000000000..9ee01d4bc --- /dev/null +++ b/externals/vcpkg/versions/g-/geogram.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "d68db6c8078b7598e5bed6550a911f791ae63ab3", + "version": "1.7.6", + "port-version": 2 + }, + { + "git-tree": "d6d9b9c3652ebbfd846a225ba06a1867e0a6ba25", + "version": "1.7.6", + "port-version": 1 + }, + { + "git-tree": "3a40b9eb7d73644d89c9987fc0b8da98c7ae2a94", + "version": "1.7.6", + "port-version": 0 + }, + { + "git-tree": "49ffd07c56bc8a0017e243bd36dfcbbb63230409", + "version-string": "1.7.5", + "port-version": 4 + }, + { + "git-tree": "178ba7fc99040231738fd282389038df5b032173", + "version-string": "1.7.5", + "port-version": 3 + }, + { + "git-tree": "3661680b65627a46b6570d9017100f3e64d1f742", + "version-string": "1.7.5", + "port-version": 2 + }, + { + "git-tree": "d248018f0bdde0fdb6d27b8f2994eeac71cf88b7", + "version-string": "1.7.5", + "port-version": 1 + }, + { + "git-tree": "6fe5b800672699045732c9b80cc26473f18dbe21", + "version-string": "1.7.5", + "port-version": 0 + }, + { + "git-tree": "b00cc11186674c48e242ffd936b9ab406cad9d88", + "version-string": "1.6.9", + "port-version": 8 + }, + { + "git-tree": "fa45a82c396d39b2bfaf69ba856a8091a5d0e4ff", + "version-string": "1.6.9-7", + "port-version": 0 + }, + { + "git-tree": "27d5f56c9b3cf919ecf96797674525cbe336f843", + "version-string": "1.6.9-6", + "port-version": 0 + }, + { + "git-tree": "96032ec3b2b1320f1ff7aaa3c3e008e4dab7bb52", + "version-string": "1.6.9-3", + "port-version": 0 + }, + { + "git-tree": "52bb9e8f3dc50ff567d53096d94c37f5f428bc8d", + "version-string": "1.6.9-2", + "port-version": 0 + }, + { + "git-tree": "c9a2bb4c6418d001c16a4eeb0625747c74cf8d3d", + "version-string": "1.6.4", + "port-version": 0 + }, + { + "git-tree": "eb43d5f3fd1cfd25be60b75117735fb547d4f217", + "version-string": "1.6.0-1", + "port-version": 0 + }, + { + "git-tree": "0822334912bec36a41f2e28fa8c3dc14cf50e48c", + "version-string": "1.4.9-1", + "port-version": 0 + }, + { + "git-tree": "b079bd8c75a8d18f74404fab1081b7928b26a87a", + "version-string": "1.4.9", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/geographiclib.json b/externals/vcpkg/versions/g-/geographiclib.json new file mode 100755 index 000000000..d94a1683a --- /dev/null +++ b/externals/vcpkg/versions/g-/geographiclib.json @@ -0,0 +1,119 @@ +{ + "versions": [ + { + "git-tree": "447b01efd62b08035684790b159926403cc5f7a1", + "version": "2.1", + "port-version": 0 + }, + { + "git-tree": "440bbb70d0e2bd4df26e6c4c8e80a9f1942f743e", + "version": "2.0", + "port-version": 0 + }, + { + "git-tree": "907cce8f399c32730fa20954780e16187bb28bd0", + "version": "1.52", + "port-version": 2 + }, + { + "git-tree": "7ffcb729874bc667cba2368b92d64dc04effb73c", + "version": "1.52", + "port-version": 1 + }, + { + "git-tree": "b80d69df97ec60b98b202270c5357b72729fbc90", + "version": "1.52", + "port-version": 0 + }, + { + "git-tree": "eafff91d7abd708bd49584dc4070e091d427e333", + "version-string": "1.51", + "port-version": 0 + }, + { + "git-tree": "53938b70c3d6fdca51510ad2c1febac4ef0d4118", + "version-string": "1.50.1", + "port-version": 0 + }, + { + "git-tree": "2d5023520e77c7840e343c5be656622f63f36841", + "version-string": "1.47-patch1-16", + "port-version": 0 + }, + { + "git-tree": "6d3ebb559da52dabd5bfe3043d5d7a0bd07047d3", + "version-string": "1.47-patch1-14", + "port-version": 0 + }, + { + "git-tree": "aded7980da90d94c7ced5de7f5cc9f0be96c8e47", + "version-string": "1.47-patch1-13", + "port-version": 0 + }, + { + "git-tree": "2e8bf4b050e566eea3c781b68c073773a2e10963", + "version-string": "1.47-patch1-12", + "port-version": 0 + }, + { + "git-tree": "e49bce3f3ddbaa260f1b7958fcf7419a6cc02224", + "version-string": "1.47-patch1-11", + "port-version": 0 + }, + { + "git-tree": "de63b33b1ae18bdb603ca56908a340d4415f9427", + "version-string": "1.47-patch1-10", + "port-version": 0 + }, + { + "git-tree": "5f7671fa4358d6506014295a5d6bb81b3d7271fa", + "version-string": "1.47-patch1-9", + "port-version": 0 + }, + { + "git-tree": "0edb7df67184cee2ef220867612c97a629959ee0", + "version-string": "1.47-patch1-8", + "port-version": 0 + }, + { + "git-tree": "0242cc576a6189d61ae5e6231d40e47811860ccc", + "version-string": "1.47-patch1-7", + "port-version": 0 + }, + { + "git-tree": "449619defb3f4be3702bc4b6b3b60c7db8e49ecd", + "version-string": "1.47-patch1-6", + "port-version": 0 + }, + { + "git-tree": "6c3d9b00140cf0fe368af4e5609acfba24eca3c7", + "version-string": "1.47-patch1-5", + "port-version": 0 + }, + { + "git-tree": "417137f049e29b2480e35f14bc98f67fc4d62cb2", + "version-string": "1.47-patch1-4", + "port-version": 0 + }, + { + "git-tree": "f7e079feb902bbf7073ce23c087d9ebb0dcf6eb6", + "version-string": "1.47-patch1-3", + "port-version": 0 + }, + { + "git-tree": "3484bfab1a911e4c63d4480827211fb0f981cc1f", + "version-string": "1.47-patch1-2", + "port-version": 0 + }, + { + "git-tree": "8ceb4ff484132ddddf5b0a17a2be1cb90da47e0a", + "version-string": "1.47-patch1-1", + "port-version": 0 + }, + { + "git-tree": "38441530fc7e9b99829a0cb89a395fff9b231206", + "version-string": "1.47-patch1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/geos.json b/externals/vcpkg/versions/g-/geos.json new file mode 100755 index 000000000..0d975027a --- /dev/null +++ b/externals/vcpkg/versions/g-/geos.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "aa45b04832db59c6f6c4e92cf0f67b21afe41a48", + "version": "3.10.2", + "port-version": 0 + }, + { + "git-tree": "852bf7181cbec88161abfe3cf4db2887f80ab2d4", + "version": "3.10.0", + "port-version": 0 + }, + { + "git-tree": "9a0a3db2edc588598505038b452c9c7c91c1be6e", + "version": "3.9.1", + "port-version": 3 + }, + { + "git-tree": "149daa68785ac3796019e4489a6d966fb8cc4cc5", + "version": "3.9.1", + "port-version": 2 + }, + { + "git-tree": "19ac6640378da611cbee774dae84e8e2f18cfe82", + "version": "3.9.1", + "port-version": 1 + }, + { + "git-tree": "97c3e5f08174b7f7b4634064f4f2ae6da4351e97", + "version-string": "3.9.1", + "port-version": 0 + }, + { + "git-tree": "6f0db53a1f1de01b660fe82145abc3f1208f7fc4", + "version-string": "3.9.0", + "port-version": 0 + }, + { + "git-tree": "e71bfd0742035ab5630ea9849eeda3ecd1a71118", + "version-string": "3.8.1", + "port-version": 1 + }, + { + "git-tree": "c4b4bddcd19215a60dc9529ecec0e865c3ed1c77", + "version-string": "3.8.1", + "port-version": 0 + }, + { + "git-tree": "025f38165ee2f83a89869652029f6ed70d61f06d", + "version-string": "3.6.4", + "port-version": 0 + }, + { + "git-tree": "994935a727c40aa3bac643e4f33b0a9a03981599", + "version-string": "3.6.3-3", + "port-version": 0 + }, + { + "git-tree": "0745405a8af5e0808ac648f1622af89fd42ae99f", + "version-string": "3.6.3-2", + "port-version": 0 + }, + { + "git-tree": "e91a82715a9de3802b17b431051cd972fc126ee6", + "version-string": "3.6.2-3", + "port-version": 0 + }, + { + "git-tree": "2c23287ac171b6f8c2732efa17c02f8f889a8624", + "version-string": "3.6.2-2", + "port-version": 0 + }, + { + "git-tree": "c9c77484eb6214d1cfb1d56533d8a86a3371bf1e", + "version-string": "3.6.2-1", + "port-version": 0 + }, + { + "git-tree": "1f526b880fb825299b90aef0618933c888b0a598", + "version-string": "3.6.2", + "port-version": 0 + }, + { + "git-tree": "1b3af641ca82928f0897993d3f2c7efa7d8829b9", + "version-string": "3.5.0-1", + "port-version": 0 + }, + { + "git-tree": "eee9edf2a47b8dc59fbff38f805ebd32a97a4b0c", + "version-string": "3.5.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/geotrans.json b/externals/vcpkg/versions/g-/geotrans.json new file mode 100755 index 000000000..f4cf084b0 --- /dev/null +++ b/externals/vcpkg/versions/g-/geotrans.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "f9b1a18f0cadf69936ab62911f4d86fdb565c693", + "version": "3.8", + "port-version": 1 + }, + { + "git-tree": "c49a4b2acb6f902afde98571c97ef6c8358d2c89", + "version-string": "3.8", + "port-version": 0 + }, + { + "git-tree": "a162e312a990029cf2895fdee2028e5fe07353bc", + "version-string": "3.7", + "port-version": 0 + }, + { + "git-tree": "c2245141128ba0910d36e4ff7f92e7cd282409f7", + "version-string": "3.8", + "port-version": 0 + }, + { + "git-tree": "d4ba6c5f7307420e38b93e0fe132bd899b7304fa", + "version-string": "3.7-1", + "port-version": 0 + }, + { + "git-tree": "e0c6be6d920d8f2efbef8a58736cb6278692d6cd", + "version-string": "3.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/getdns.json b/externals/vcpkg/versions/g-/getdns.json new file mode 100755 index 000000000..33ed8e70d --- /dev/null +++ b/externals/vcpkg/versions/g-/getdns.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "b604fb24c9b81bf4bc5c30e7ca86e52750a86935", + "version": "1.7.0", + "port-version": 3 + }, + { + "git-tree": "877301bc39a398579f0f3f13725afcd4bcd797c4", + "version": "1.7.0", + "port-version": 2 + }, + { + "git-tree": "3fc05946f698399983a44d1c9a173df743c7bacf", + "version": "1.7.0", + "port-version": 1 + }, + { + "git-tree": "fd966770afa413f4502ba69f0c2e0a860b08f967", + "version": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "d6c0d2d8c997256eff5049eb3fa3447a5387d2f9", + "version-string": "1.6.0", + "port-version": 2 + }, + { + "git-tree": "b01f8f51c6a395b7a7d44f772bec78a0445e51d6", + "version-string": "1.6.0", + "port-version": 1 + }, + { + "git-tree": "2ad34d7694f942b2967d6c88acfde707c27f9bb5", + "version-string": "1.6.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/getopt-win32.json b/externals/vcpkg/versions/g-/getopt-win32.json new file mode 100755 index 000000000..1b8ce8edc --- /dev/null +++ b/externals/vcpkg/versions/g-/getopt-win32.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "a655b35c38424570406603859dcfbb70d25bc0b9", + "version": "0.1", + "port-version": 4 + }, + { + "git-tree": "97ccee735c01df1356a70d59bc114512f7ab77cc", + "version": "0.1", + "port-version": 3 + }, + { + "git-tree": "93d03f637c26f2efa154dfd7c3efb02074cf5eda", + "version-string": "0.1", + "port-version": 2 + }, + { + "git-tree": "d4b235f13a89dbec23f09caa05c7b71c176cfab8", + "version-string": "0.1", + "port-version": 1 + }, + { + "git-tree": "f54e92c884b42be2395cb2c5929785cb2db8ad9b", + "version-string": "0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/getopt.json b/externals/vcpkg/versions/g-/getopt.json new file mode 100755 index 000000000..a0183d27f --- /dev/null +++ b/externals/vcpkg/versions/g-/getopt.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "be2552adc01c2ba30044325925f7348121de5c3d", + "version-string": "0", + "port-version": 2 + }, + { + "git-tree": "81815a8f433219e332659e07204f90df381a28a7", + "version-string": "0", + "port-version": 1 + }, + { + "git-tree": "41acbc45d9d32b8e0dfdb758169e2184e18a8c04", + "version-string": "0", + "port-version": 0 + }, + { + "git-tree": "2a197d631bf961f9d1d87d5fcdbd6406814321c8", + "version-string": "0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gettext.json b/externals/vcpkg/versions/g-/gettext.json new file mode 100755 index 000000000..22712c19d --- /dev/null +++ b/externals/vcpkg/versions/g-/gettext.json @@ -0,0 +1,124 @@ +{ + "versions": [ + { + "git-tree": "5bf45743516e2ae999eb14017370828e237ad533", + "version": "0.21", + "port-version": 9 + }, + { + "git-tree": "d1dc6ee2684911bfcb6f63c498413a118c235ba5", + "version": "0.21", + "port-version": 8 + }, + { + "git-tree": "f843c5eedf82612df5fef2bfadfe4df8426301a6", + "version": "0.21", + "port-version": 7 + }, + { + "git-tree": "72394a1e7b0ea6333d78849f864c4b7bc8c7e8dc", + "version": "0.21", + "port-version": 6 + }, + { + "git-tree": "d1089dfcf335a94ca47c5b918c56a7ab6fc0ae92", + "version": "0.21", + "port-version": 5 + }, + { + "git-tree": "b6cde01ab4095a258993eaf85eb31c1e845c64a6", + "version": "0.21", + "port-version": 4 + }, + { + "git-tree": "33c7af8451faeef94c8a06cb41b71dce144d6fba", + "version": "0.21", + "port-version": 3 + }, + { + "git-tree": "7aba831bc44964ac3d3767392b037e30b06d897e", + "version": "0.21", + "port-version": 2 + }, + { + "git-tree": "9bb7007478939f7d50c5cd0ca6154c3593c18232", + "version": "0.21", + "port-version": 1 + }, + { + "git-tree": "1b286fee6011adfb00e7cf79ec7c8673262b7cfd", + "version-string": "0.21", + "port-version": 0 + }, + { + "git-tree": "6fa0e30f9b2e17be28f096eb81731e3d5de14ee5", + "version-string": "0.19-15", + "port-version": 0 + }, + { + "git-tree": "e4d6c73ed089a5992679c4f98e4d9715558ee5dd", + "version-string": "0.19-14", + "port-version": 0 + }, + { + "git-tree": "c8b2aa4bb65e9afb54c947efe0dd44f2940488dd", + "version-string": "0.19-13", + "port-version": 0 + }, + { + "git-tree": "cba315290e8c155d40b9e495a2552a40a98bae5e", + "version-string": "0.19-12", + "port-version": 0 + }, + { + "git-tree": "5e5a03e65241b659eb7152d4a4ce1b6e07029ebd", + "version-string": "0.19-11", + "port-version": 0 + }, + { + "git-tree": "ef7e323a01b973d94e4041c295e2a33493672eda", + "version-string": "0.19-10", + "port-version": 0 + }, + { + "git-tree": "bf6a9c5733d83fb4da7c9ab42f7dd07c772a8ef1", + "version-string": "0.19-9", + "port-version": 0 + }, + { + "git-tree": "e6a10f19444f23196fdfc73e6f7bb5c7f925f414", + "version-string": "0.19-8", + "port-version": 0 + }, + { + "git-tree": "9536497114f652ee8c3a5374673d653df60ee111", + "version-string": "0.19-7", + "port-version": 0 + }, + { + "git-tree": "68548b7fdad5920e1a9ce95b0f9013cb009ec76f", + "version-string": "0.19-5", + "port-version": 0 + }, + { + "git-tree": "8af20d63dd83e665a1da0e5d6fad711f6c040550", + "version-string": "0.19-4", + "port-version": 0 + }, + { + "git-tree": "65b80277ca10bb5953d1a36a2d86f0337f981f2a", + "version-string": "0.19-2", + "port-version": 0 + }, + { + "git-tree": "241120007045c1865a87dae7d484fc4705865224", + "version-string": "0.19-1", + "port-version": 0 + }, + { + "git-tree": "1412c12036606c06911ed48c2e2e1b2877c0b3c0", + "version-string": "0.19", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gettimeofday.json b/externals/vcpkg/versions/g-/gettimeofday.json new file mode 100755 index 000000000..3dc3c259e --- /dev/null +++ b/externals/vcpkg/versions/g-/gettimeofday.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "c39979379abaf1ecee42cbae6e83d68cfb201f13", + "version-string": "2017-10-14", + "port-version": 4 + }, + { + "git-tree": "893c7107fc161346544c8b75340cb64e6b850798", + "version-string": "2017-10-14-3", + "port-version": 0 + }, + { + "git-tree": "48e80b4d2fa9382e7c27de36261ab6010aced7bd", + "version-string": "2017-10-14-2", + "port-version": 0 + }, + { + "git-tree": "a6b05006fb0181526d907df595491f0eed5a745e", + "version-string": "2017-10-14-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gflags.json b/externals/vcpkg/versions/g-/gflags.json new file mode 100755 index 000000000..e20ff4129 --- /dev/null +++ b/externals/vcpkg/versions/g-/gflags.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "7c1fe35b0a7e9b5b9f58b16c6cc08caa108fb945", + "version-string": "2.2.2", + "port-version": 5 + }, + { + "git-tree": "16da9eec785be4c0d0ad3e32cc3b39698d0611b1", + "version-string": "2.2.2", + "port-version": 4 + }, + { + "git-tree": "e229646111622b3b08d98d42741e8c861487d18e", + "version-string": "2.2.2", + "port-version": 3 + }, + { + "git-tree": "1e2bb870b1e3592591d62f396378e25b2678d80c", + "version-string": "2.2.2", + "port-version": 2 + }, + { + "git-tree": "7dd635d5295af145f4601ba13219aa0d84630f27", + "version-string": "2.2.2-1", + "port-version": 0 + }, + { + "git-tree": "39ba6241412a077825245387c47a4c852ce17eee", + "version-string": "2.2.2", + "port-version": 0 + }, + { + "git-tree": "8a1a5ddb1bfdeef3bca28a5eeed54e1a994677b5", + "version-string": "2.2.1-3", + "port-version": 0 + }, + { + "git-tree": "baf634e885fd97d04ec201c69f8c3476a9a9eeb7", + "version-string": "2.2.1-2", + "port-version": 0 + }, + { + "git-tree": "39423af1f3eebe995ef703161c9ca8542554731c", + "version-string": "2.2.1-1", + "port-version": 0 + }, + { + "git-tree": "1b50210294077dcec83017e971b04df73b6ad951", + "version-string": "2.2.1", + "port-version": 0 + }, + { + "git-tree": "8767ae5dff28ff194c01839711be5963628804ac", + "version-string": "2.2.0-5", + "port-version": 0 + }, + { + "git-tree": "cb356e2b88dfa102e03737c8b6844d6e19cdc4e8", + "version-string": "2.2.0-4", + "port-version": 0 + }, + { + "git-tree": "593df2168f4f241374e47a88d00599caaa5e9912", + "version-string": "2.2.0-3", + "port-version": 0 + }, + { + "git-tree": "b995fb2a9bec152784685f4edd161e19ca986723", + "version-string": "2.2.0-2", + "port-version": 0 + }, + { + "git-tree": "47dec7ab4a4e5933b739ed97eee0ec20d338fd90", + "version-string": "2.2.0-1", + "port-version": 0 + }, + { + "git-tree": "91097a4b2d78bcb9367c3e758370c5baa713290a", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "5eb5acbb6f05a75d26ab47ad522be9c72a11f8ce", + "version-string": "2.1.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/ghc-filesystem.json b/externals/vcpkg/versions/g-/ghc-filesystem.json new file mode 100755 index 000000000..8c7d3dc33 --- /dev/null +++ b/externals/vcpkg/versions/g-/ghc-filesystem.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "9d4afd633149f9feea72ebfc90f1ab86135fb5f2", + "version": "1.5.10", + "port-version": 0 + }, + { + "git-tree": "7b793d2816cd9bd4d242e09b3d9638d760216797", + "version": "1.5.4", + "port-version": 1 + }, + { + "git-tree": "bacddfca1f950fd501d4774332039f9be3e4d620", + "version": "1.5.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gherkin-c.json b/externals/vcpkg/versions/g-/gherkin-c.json new file mode 100755 index 000000000..71207c432 --- /dev/null +++ b/externals/vcpkg/versions/g-/gherkin-c.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "cb7cfa3a82651ab27840177189e5dc7938bf1241", + "version-date": "2019-10-07", + "port-version": 3 + }, + { + "git-tree": "e59a73d00ecbf68ae14b61beec141128d8f94612", + "version-string": "2019-10-07", + "port-version": 2 + }, + { + "git-tree": "c411eed077ea98e771d2eda4f985dd4702b33ce2", + "version-string": "2019-10-07-1", + "port-version": 0 + }, + { + "git-tree": "cf6023b8e68b5c131631e70ee914c5049f8b9253", + "version-string": "2019-10-07", + "port-version": 0 + }, + { + "git-tree": "e83f94a2682dbcb029ba64097fd4f6af63c74402", + "version-string": "4.1.2", + "port-version": 0 + }, + { + "git-tree": "02167db8dbc6005bfa1779420c6fb9dd8a4dfb76", + "version-string": "c-libs-e63e83104b", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/giflib.json b/externals/vcpkg/versions/g-/giflib.json new file mode 100755 index 000000000..e9456f42e --- /dev/null +++ b/externals/vcpkg/versions/g-/giflib.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "5b5833304ba0e1be5ff125f265d1f2e1098a93cb", + "version": "5.2.1", + "port-version": 2 + }, + { + "git-tree": "14178ec83d76a40e314adcf9bba75b63e99bc56d", + "version": "5.2.1", + "port-version": 1 + }, + { + "git-tree": "7cfc37d67d8662dd5fa5bf698a61ebbd657060cc", + "version": "5.2.1", + "port-version": 0 + }, + { + "git-tree": "053e7dd7e20392f9168d982e026a7fd71afbefe3", + "version-string": "5.1.4-6", + "port-version": 0 + }, + { + "git-tree": "1d1a1ef619d9eaf08f8c1858b273b7d1ff0c2d47", + "version-string": "5.1.4-4", + "port-version": 0 + }, + { + "git-tree": "6920e201f559f5d2cf371cb75c32f8d4eab6340c", + "version-string": "5.1.4-3", + "port-version": 0 + }, + { + "git-tree": "f8b43586a1bbcee2d49964b548d98aab3229428d", + "version-string": "5.1.4-2", + "port-version": 0 + }, + { + "git-tree": "87afd30d52d56ad1aa234ff670b0d562c621e6e0", + "version-string": "5.1.4-1", + "port-version": 0 + }, + { + "git-tree": "aa3bd08125b93cdcc2576c8da4d6f851540272dc", + "version-string": "5.1.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/ginkgo.json b/externals/vcpkg/versions/g-/ginkgo.json new file mode 100755 index 000000000..1c79cf259 --- /dev/null +++ b/externals/vcpkg/versions/g-/ginkgo.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "8b8d35300c7b2bd3efcd7e645579df0a9e67d86d", + "version-semver": "1.4.0", + "port-version": 1 + }, + { + "git-tree": "da56f7ca349bebb4061a04d4d3b3d9b8fde9a1c8", + "version-semver": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "b204eef5f779c05c2160e28cc07f411258ddcbfc", + "version-semver": "1.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gl2ps.json b/externals/vcpkg/versions/g-/gl2ps.json new file mode 100755 index 000000000..87cc00eaf --- /dev/null +++ b/externals/vcpkg/versions/g-/gl2ps.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "25f89a8ea4ae01f360444c1583dc6549d3857966", + "version-string": "1.4.2", + "port-version": 1 + }, + { + "git-tree": "4a2e08a33d47d51f58b41cd5659e632604ad560a", + "version-string": "1.4.2", + "port-version": 0 + }, + { + "git-tree": "2242a8c42e3e756657f4e149702de688f6b07e14", + "version-string": "1.4.0-3", + "port-version": 0 + }, + { + "git-tree": "2e8bd0d62085233d63e2d477509e020bca427931", + "version-string": "1.4.0-2", + "port-version": 0 + }, + { + "git-tree": "bdc5e96af5d2a44857f5757db82ee21eb783ba7f", + "version-string": "1.4.0-1", + "port-version": 0 + }, + { + "git-tree": "fce8fefd1e355e73a583439a8c73b51dbd8056b6", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "a87f0e103cadf39979ebe4f87386949480886598", + "version-string": "OpenGL to PostScript Printing Library", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gl3w.json b/externals/vcpkg/versions/g-/gl3w.json new file mode 100755 index 000000000..a5cb2544d --- /dev/null +++ b/externals/vcpkg/versions/g-/gl3w.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "618626b6f1118dc2c80fa7bd2aae497c0d83b7c1", + "version-date": "2018-05-31", + "port-version": 4 + }, + { + "git-tree": "bbd82479631534cfe954646d63d29734c3b7728f", + "version-date": "2018-05-31", + "port-version": 3 + }, + { + "git-tree": "7786d613957355b4d238d8fd2278f78fbab5a886", + "version-string": "2018-05-31-2", + "port-version": 0 + }, + { + "git-tree": "f91a2109d77a805a788fb153f74cbf9261e8adb8", + "version-string": "2018-05-31-1", + "port-version": 0 + }, + { + "git-tree": "2859fa6238feaf7aeaf00fbc282dc352debdcb28", + "version-string": "99ed3211", + "port-version": 0 + }, + { + "git-tree": "878394b03bdee68ac1343c9385e497efdab0f166", + "version-string": "8f7f459d", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/glad.json b/externals/vcpkg/versions/g-/glad.json new file mode 100755 index 000000000..a0c3aed4d --- /dev/null +++ b/externals/vcpkg/versions/g-/glad.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "2ebf6ed85a860c74f8649571e168900426cbb944", + "version": "0.1.34", + "port-version": 3 + }, + { + "git-tree": "2bb03ac897eea39575c41edf7353df6a47af3f35", + "version": "0.1.34", + "port-version": 1 + }, + { + "git-tree": "bea697f07b65eddfb003dc98637caaaa66a773fa", + "version": "0.1.34", + "port-version": 0 + }, + { + "git-tree": "abaac8ade7697e7f6ae4a82c981aafa2cc6a5359", + "version-string": "0.1.33-1", + "port-version": 0 + }, + { + "git-tree": "487a060e29e971e32135bde5c6743aa3db5740fd", + "version-string": "0.1.33", + "port-version": 0 + }, + { + "git-tree": "9c601cb232d5f2b58c3244bcc6677fe47d97e772", + "version-string": "0.1.31", + "port-version": 0 + }, + { + "git-tree": "33726baf62afe206a41fee506b4ff8b1dd234b31", + "version-string": "0.1.30", + "port-version": 0 + }, + { + "git-tree": "ac38882a795fc7769d10d706361a3c57fb2e89b8", + "version-string": "0.1.29", + "port-version": 0 + }, + { + "git-tree": "020d76de451af7a2b4e688d60500fbef67f9b50f", + "version-string": "0.1.28-3", + "port-version": 0 + }, + { + "git-tree": "b12757dbab00493adaffc7c67250f02ea3801150", + "version-string": "0.1.28-2", + "port-version": 0 + }, + { + "git-tree": "5f632ca7c1d94db7f3bae6d5aab5ba6d4bf3fae6", + "version-string": "0.1.28", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/glbinding.json b/externals/vcpkg/versions/g-/glbinding.json new file mode 100755 index 000000000..657a17a96 --- /dev/null +++ b/externals/vcpkg/versions/g-/glbinding.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "6feb489ecd418b013262401ff4911eccf5c03deb", + "version-string": "3.1.0", + "port-version": 3 + }, + { + "git-tree": "3a9a97ff96199754a22850cb85df908391803afd", + "version-string": "3.1.0-2", + "port-version": 0 + }, + { + "git-tree": "c909e692c9bd0846d72007074755257e7d1edb73", + "version-string": "3.1.0-1", + "port-version": 0 + }, + { + "git-tree": "a358f6a64a516446977a28468abde74c423a1ef8", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "f18bae17dde78154f125b3e8f4b4b61da980c1e0", + "version-string": "3.0.2-5", + "port-version": 0 + }, + { + "git-tree": "86a1b652d06306f3f9a50b7bdbd1510d3a0a09ac", + "version-string": "3.0.2-4", + "port-version": 0 + }, + { + "git-tree": "d2a02bcf05cff60b61451822400a8fd67cd9c192", + "version-string": "3.0.2-3", + "port-version": 0 + }, + { + "git-tree": "dc2595b76958b8cf36e9505f719757c2ea474b82", + "version-string": "2.1.1-3", + "port-version": 0 + }, + { + "git-tree": "c8b6e350affe801cc9ad9bfd816f82774d411f3e", + "version-string": "2.1.1-2", + "port-version": 0 + }, + { + "git-tree": "eb683aae3cec5efd219cd56736dae6f2279d3b8e", + "version-string": "2.1.1-1", + "port-version": 0 + }, + { + "git-tree": "a55ddfbeaaa26f71064d74a767828356bfae841c", + "version-string": "2.1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/glew.json b/externals/vcpkg/versions/g-/glew.json new file mode 100755 index 000000000..48da58276 --- /dev/null +++ b/externals/vcpkg/versions/g-/glew.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "3211ed09c36542372ab3f1f690a42e2edbb072bc", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "622e27b2a746c088f0acd2f98445c0968f485a69", + "version-string": "2.1.0", + "port-version": 11 + }, + { + "git-tree": "c87d7f619c69630fa4d1bd0bf3767f0d31ef22d6", + "version-string": "2.1.0", + "port-version": 10 + }, + { + "git-tree": "f8fbe21d53746e72320d363c852bb10f734e5237", + "version-string": "2.1.0", + "port-version": 9 + }, + { + "git-tree": "4fe995caf0d5b268d48520a3ff55b1dbeb41483a", + "version-string": "2.1.0-8", + "port-version": 0 + }, + { + "git-tree": "505463b94ee704f46a2569565ba9be571b9aaaee", + "version-string": "2.1.0-7", + "port-version": 0 + }, + { + "git-tree": "e58a5b1ac835284ce8917483bc368eaf3ab9e40d", + "version-string": "2.1.0-6", + "port-version": 0 + }, + { + "git-tree": "edd7069951eafc616eb21cc10af2f1f80f52ff46", + "version-string": "2.1.0-5", + "port-version": 0 + }, + { + "git-tree": "af01532327b5411fceabf855cf5f43da8b5ff7e1", + "version-string": "2.1.0-4", + "port-version": 0 + }, + { + "git-tree": "968ff5441f3c55753fdb0237782cc66ae8684d1b", + "version-string": "2.1.0-3", + "port-version": 0 + }, + { + "git-tree": "0622d53fab3c2dde2e4cdc6155c21d915e6ca04d", + "version-string": "2.1.0-2", + "port-version": 0 + }, + { + "git-tree": "29e3dd700db2f87bd763d4bb8458fd69cc289409", + "version-string": "2.1.0-1", + "port-version": 0 + }, + { + "git-tree": "e0c22b8441ea59b7a48ef9335e9cfce146daff14", + "version-string": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "51fd753599eaf07b5bfcc5ec503ebaa1788952e1", + "version-string": "2.0.0-2", + "port-version": 0 + }, + { + "git-tree": "9b418220122d501b0f46e6661c8b5b452791b28b", + "version-string": "2.0.0-1", + "port-version": 0 + }, + { + "git-tree": "e3ea6bd1639b303d8159467442939b3c4f995522", + "version-string": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "6375eaf079dae0aec5f3f766b525c72b2cd1157e", + "version-string": "1.13.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/glfw3.json b/externals/vcpkg/versions/g-/glfw3.json new file mode 100755 index 000000000..bf6222fba --- /dev/null +++ b/externals/vcpkg/versions/g-/glfw3.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "1da77592851c5a530a1c96c6d7d554c625b7f509", + "version-semver": "3.3.7", + "port-version": 0 + }, + { + "git-tree": "8a41aae4fb04023a3a94bf3aa66196b0aee2cc8e", + "version-semver": "3.3.6", + "port-version": 0 + }, + { + "git-tree": "90c6416669c2154f54d3f65e3a2afb8f75ab2aaa", + "version-semver": "3.3.5", + "port-version": 0 + }, + { + "git-tree": "aa7325438c3156b62488a559218d12e7e860196c", + "version-semver": "3.3.4", + "port-version": 0 + }, + { + "git-tree": "9825cf1cc4a31889edbb31732a88ca394b7a6e58", + "version-semver": "3.3.3", + "port-version": 0 + }, + { + "git-tree": "c25e50efb2dc33ea70dae0e62936987d82bffcec", + "version-string": "3.3.2", + "port-version": 1 + }, + { + "git-tree": "948e1bd3085f0de7b3af12c5a71afe1c8969ea55", + "version-string": "3.3.2", + "port-version": 0 + }, + { + "git-tree": "f0d43637cb9cc08c45b05bca4aa0eb4fceadc23a", + "version-string": "3.3.1", + "port-version": 0 + }, + { + "git-tree": "d68c3ac87254e2aafa9b0b63e40d1325b132aa04", + "version-string": "3.3-3", + "port-version": 0 + }, + { + "git-tree": "677f8fbc04df2aa528a4b09163b5c5d6c5fae084", + "version-string": "3.3-2", + "port-version": 0 + }, + { + "git-tree": "e555c65a4547aaecec6e8a6260ec4da0a1fd385d", + "version-string": "3.3-1", + "port-version": 0 + }, + { + "git-tree": "d7c63d9600318824c4c1c69e0ca5e1f9f7db0c91", + "version-string": "3.3", + "port-version": 0 + }, + { + "git-tree": "be1864a02919617804b1cad8dde794ec13ea55f6", + "version-string": "3.2.1-3", + "port-version": 0 + }, + { + "git-tree": "42c1c6fa342e0075389240556b8ce824c41619ca", + "version-string": "3.2.1-2", + "port-version": 0 + }, + { + "git-tree": "4059e56d7cde2a11f85a8e5abb76e41ce9a843bb", + "version-string": "3.2.1-1", + "port-version": 0 + }, + { + "git-tree": "343c437b1c6bafb19541c72210547a4a9f00ae93", + "version-string": "3.2.1", + "port-version": 0 + }, + { + "git-tree": "47b9f73b81799bd141dc5d5865941a0841603559", + "version-string": "3.1.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gli.json b/externals/vcpkg/versions/g-/gli.json new file mode 100755 index 000000000..bf68470d3 --- /dev/null +++ b/externals/vcpkg/versions/g-/gli.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "c8960dd5e56bd32e4cd09edacd38a7a311e05fcd", + "version-date": "2021-07-06", + "port-version": 0 + }, + { + "git-tree": "d6453871d306fd1f5501954f4b3722f97cd525d4", + "version-string": "dd17acf-1", + "port-version": 0 + }, + { + "git-tree": "e8b62796037970ba9fcb475bdcbca194a8c1b7ab", + "version-string": "dd17acf", + "port-version": 0 + }, + { + "git-tree": "6235b7bcd9715a1b4fbfb497304b9f28017a381d", + "version-string": "0.8.2-1", + "port-version": 0 + }, + { + "git-tree": "4fea7386b951c9777cc5079bef716507490d1c7e", + "version-string": "0.8.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/glib.json b/externals/vcpkg/versions/g-/glib.json new file mode 100755 index 000000000..d1eb2e214 --- /dev/null +++ b/externals/vcpkg/versions/g-/glib.json @@ -0,0 +1,164 @@ +{ + "versions": [ + { + "git-tree": "3fc7533aba85394460293d7ba61abc3170323f1d", + "version": "2.70.5", + "port-version": 2 + }, + { + "git-tree": "23fe84cc74f69a066a1e2a2629a527b9c8d058ad", + "version": "2.70.5", + "port-version": 1 + }, + { + "git-tree": "c9d76755634e72f74de67a04e2713ba0278e772a", + "version": "2.70.5", + "port-version": 0 + }, + { + "git-tree": "83e2d36acbf39c01a33df90c4e65fee0221008aa", + "version": "2.70.1", + "port-version": 2 + }, + { + "git-tree": "52cb59030261a49d5afb22e2f95e5f9d24548532", + "version": "2.70.1", + "port-version": 1 + }, + { + "git-tree": "21a2facd76ae194ca1880c497122f7785750f912", + "version": "2.70.1", + "port-version": 0 + }, + { + "git-tree": "c8d7eeabc89610c8b583c319b572b16e07f3f035", + "version": "2.66.4", + "port-version": 2 + }, + { + "git-tree": "6207d9439567fbbc29f4468c831ef7c1fa2e6181", + "version": "2.66.4", + "port-version": 1 + }, + { + "git-tree": "341ab01f1a30e270603af6d2b934df9c68673a56", + "version": "2.66.4", + "port-version": 0 + }, + { + "git-tree": "715922ed1f6f71651f144fbe59d9aab441bd4b10", + "version-string": "2.52.3", + "port-version": 27 + }, + { + "git-tree": "4ae9d07c61fa6787bacd9402f61b416843e36867", + "version-string": "2.52.3", + "port-version": 26 + }, + { + "git-tree": "5cadd8fd83d64bc11b551994268c796eabf629b6", + "version-string": "2.52.3", + "port-version": 25 + }, + { + "git-tree": "9e13bcbbd42e56f605cd35fd91f5ec37a950125e", + "version-string": "2.52.3", + "port-version": 24 + }, + { + "git-tree": "15f26f46baf92b18d543bba85fd7edc264353cf3", + "version-string": "2.52.3", + "port-version": 23 + }, + { + "git-tree": "6510e733a11ce5d8a777345e4dbe054ded6aa689", + "version-string": "2.52.3-14-7", + "port-version": 0 + }, + { + "git-tree": "8106169c4653397b0ffe716f9561a62b0fa5ef5c", + "version-string": "2.52.3-14-6", + "port-version": 0 + }, + { + "git-tree": "a1901953a15a5fbb77778a07fa4edd240fba080a", + "version-string": "2.52.3-14-5", + "port-version": 0 + }, + { + "git-tree": "9dc6be30f40ff9bbb2f90dff5fa1771e8ae110a0", + "version-string": "2.52.3-14-4", + "port-version": 0 + }, + { + "git-tree": "3c0db4754e4d9817d9837296505afe70c9a1eb46", + "version-string": "2.52.3-14-3", + "port-version": 0 + }, + { + "git-tree": "e66bda92e63e91a70b7dea4341c141191a693778", + "version-string": "2.52.3-14-2", + "port-version": 0 + }, + { + "git-tree": "2dbebef8f014644db9487a78f45e8df6c5bcbe5c", + "version-string": "2.52.3-14-1", + "port-version": 0 + }, + { + "git-tree": "df5a8ddc127af105bab51869e40440b42e3e124f", + "version-string": "2.52.3-13-1", + "port-version": 0 + }, + { + "git-tree": "913187276bc3d6c9e4fb1be8df2848cd41af0102", + "version-string": "2.52.3-13", + "port-version": 0 + }, + { + "git-tree": "6498770a24e72c36e7cd74706a21c48b088d91b6", + "version-string": "2.52.3-11", + "port-version": 0 + }, + { + "git-tree": "617a73af1ec358daad034fe131d571b06de4f597", + "version-string": "2.52.3-9", + "port-version": 0 + }, + { + "git-tree": "61e39be5a86dc5a3a37520685caccbd9d8bbcbf2", + "version-string": "2.52.3-2", + "port-version": 0 + }, + { + "git-tree": "d8dd8a424815aff6dba64bd05e5d2b3ba046064e", + "version-string": "2.52.3-1", + "port-version": 0 + }, + { + "git-tree": "6c3b7897d27da263940f1d4781f506b67d6dd17d", + "version-string": "2.52.3", + "port-version": 0 + }, + { + "git-tree": "2f69ab92f8b3b2f1286d94921a76420864a09af8", + "version-string": "2.52.2", + "port-version": 0 + }, + { + "git-tree": "faa5193e0884ddd3aa5c58eb7feba9d2e133d2b4", + "version-string": "2.52.1", + "port-version": 0 + }, + { + "git-tree": "526ca7ffc215d06e1488d76b5cdddbc762f286eb", + "version-string": "2.50.3", + "port-version": 0 + }, + { + "git-tree": "95c3c71f0346540e51fe03249738dc5fb564c252", + "version-string": "2.50.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/glibmm.json b/externals/vcpkg/versions/g-/glibmm.json new file mode 100755 index 000000000..69d42a047 --- /dev/null +++ b/externals/vcpkg/versions/g-/glibmm.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "75f0e8e579c069e71bdb773c9e741fc7182e0379", + "version": "2.70.0", + "port-version": 1 + }, + { + "git-tree": "d485de58180f1755b67cb2b829c7c73e4dfae13a", + "version": "2.70.0", + "port-version": 0 + }, + { + "git-tree": "dd76481f04a2d3747dcd2c5eef0333ce5c6d61e5", + "version": "2.68.1", + "port-version": 2 + }, + { + "git-tree": "f0db0bb27bb35a57f5d72b56f5d080545dde76ba", + "version": "2.68.1", + "port-version": 1 + }, + { + "git-tree": "e43bb60b861fbd9469297581a968e3a647537b4d", + "version": "2.68.1", + "port-version": 0 + }, + { + "git-tree": "6074f2bdadef39758cbfc1238b03dc5051bf774d", + "version": "2.68.0", + "port-version": 0 + }, + { + "git-tree": "14ee726ce8905eca50e9cc6d5a478d9401c5954e", + "version-string": "2.52.1", + "port-version": 14 + }, + { + "git-tree": "abc38a94621d26d81c09daffddbb61458d60899d", + "version-string": "2.52.1", + "port-version": 13 + }, + { + "git-tree": "a689656051e237b360fd108fc13d91951ecbc8b4", + "version-string": "2.52.1", + "port-version": 12 + }, + { + "git-tree": "32ba5fe5eff5992b6565d5f48da73c815038a68b", + "version-string": "2.52.1-11", + "port-version": 0 + }, + { + "git-tree": "0f683e998ef55bf2406e0d81a212a4bb6684f17e", + "version-string": "2.52.1-10", + "port-version": 0 + }, + { + "git-tree": "76ba0437d836722da9ef44c99b616f7cfd743fc5", + "version-string": "2.52.1-9", + "port-version": 0 + }, + { + "git-tree": "3493ffee69d8c1013ad8907ecff4c53df8062cb9", + "version-string": "2.52.1-8", + "port-version": 0 + }, + { + "git-tree": "fc14768059bee43d287242a08cb09323dd5851c6", + "version-string": "2.52.1-7", + "port-version": 0 + }, + { + "git-tree": "d9cd46a14a3ca6557fba4f5be48ee8636b8c1167", + "version-string": "2.52.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/glm.json b/externals/vcpkg/versions/g-/glm.json new file mode 100755 index 000000000..e7873160a --- /dev/null +++ b/externals/vcpkg/versions/g-/glm.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "4aafac80f39a72fadaf6a31afb961790678062de", + "version-string": "0.9.9.8", + "port-version": 1 + }, + { + "git-tree": "14a7c57c30809e4f4c953dd60fa335bb194d0be5", + "version-string": "0.9.9.8", + "port-version": 0 + }, + { + "git-tree": "423235ffa15d9138dbcab1a86140f3afa86b5717", + "version-string": "0.9.9.7", + "port-version": 0 + }, + { + "git-tree": "609da764e8418d9ddc57263f86a8374d099c7b46", + "version-string": "0.9.9.5-3", + "port-version": 0 + }, + { + "git-tree": "545f424ba64c395284b64a238557857c1f6dfd89", + "version-string": "0.9.9.5-2", + "port-version": 0 + }, + { + "git-tree": "e0420d690f1619d78c50045f2718cec0790dc925", + "version-string": "0.9.9.5", + "port-version": 0 + }, + { + "git-tree": "e70ed78b570242280acf1a27c394c946ff98810b", + "version-string": "0.9.9.4", + "port-version": 0 + }, + { + "git-tree": "2aa1ea119444ba242a29733c2969c827b0885b52", + "version-string": "0.9.9.3", + "port-version": 0 + }, + { + "git-tree": "d8f913287219615123b8da343f7320ea318e4418", + "version-string": "0.9.9.2", + "port-version": 0 + }, + { + "git-tree": "ba55ec73ddba0272e990febc79ad854dd27129a2", + "version-string": "0.9.9.0", + "port-version": 0 + }, + { + "git-tree": "aae504ba9df7d41e235d4382a83e2b5ad2575277", + "version-string": "0.9.8.5-1", + "port-version": 0 + }, + { + "git-tree": "bc4221b98be2163c2096af6ea94056efc2d5a46d", + "version-string": "0.9.8.5", + "port-version": 0 + }, + { + "git-tree": "a0575135be360fd9e8f7b8768e52367b4c5bc579", + "version-string": "0.9.8.4-1", + "port-version": 0 + }, + { + "git-tree": "a7c02c49c06b555f346a8b30a8c72fe8ab8032a4", + "version-string": "0.9.8.4", + "port-version": 0 + }, + { + "git-tree": "0ee843746d211dd56c52a7bbb863ee3b79b9edb7", + "version-string": "0.9.8.1", + "port-version": 0 + }, + { + "git-tree": "ba9297410faea7d19c5a1b8f0a4a0ec45f447500", + "version-string": "0.9.8.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/globjects.json b/externals/vcpkg/versions/g-/globjects.json new file mode 100755 index 000000000..75340cf93 --- /dev/null +++ b/externals/vcpkg/versions/g-/globjects.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "0d9e98af47d7eb383a98e39c5661e573b1197e8c", + "version-string": "1.1.0", + "port-version": 4 + }, + { + "git-tree": "b2e73ec8949205afcdcf9c8b7f5e536275f0ed19", + "version-string": "1.1.0-3", + "port-version": 0 + }, + { + "git-tree": "94d28ae5e7be9ae1865705a124244274a29de29f", + "version-string": "1.1.0-2", + "port-version": 0 + }, + { + "git-tree": "97c49f2dc4fff4a21a2a462a00e648270fffaaf6", + "version-string": "1.1.0-2018-09-19-1", + "port-version": 0 + }, + { + "git-tree": "a32f6bbdb50e7d2f5f7e8120da7746749cbac43e", + "version-string": "1.1.0-2018-09-19", + "port-version": 0 + }, + { + "git-tree": "81a5bbc965826e4680d129e59d84d6b2c2e12ce0", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "50b7e6e2994558d1dc44157636b365e38b429668", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/glog.json b/externals/vcpkg/versions/g-/glog.json new file mode 100755 index 000000000..eb8144dd2 --- /dev/null +++ b/externals/vcpkg/versions/g-/glog.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "b1c79ab6934cb1a24d37e2e7c0a73f486f3400c4", + "version": "0.5.0", + "port-version": 5 + }, + { + "git-tree": "bb5f54eba990cc0f03c64e1d09f343dd6cd7b22b", + "version": "0.5.0", + "port-version": 4 + }, + { + "git-tree": "ecb04a5ba4d046af782f62ae7c167bd05b0101a8", + "version": "0.5.0", + "port-version": 3 + }, + { + "git-tree": "10e0077ffa3485fa75178aa8e2a3f8ec0314573b", + "version": "0.5.0", + "port-version": 2 + }, + { + "git-tree": "c0809e03781b0f3f322236ad964b6caa464dfe21", + "version": "0.5.0", + "port-version": 1 + }, + { + "git-tree": "55b03c1cae45ba6b081c9072e6431d720467c82b", + "version": "0.5.0", + "port-version": 0 + }, + { + "git-tree": "27503732c21f2d6652d12d62b1e9c180c1d33c47", + "version-string": "0.4.0", + "port-version": 4 + }, + { + "git-tree": "ec7f01875b20c7145088d5ec7a1927a5faea5ca6", + "version-string": "0.4.0-3", + "port-version": 0 + }, + { + "git-tree": "1259c0962eb1027fdb884f5ddca131f37d182ada", + "version-string": "0.4.0-2", + "port-version": 0 + }, + { + "git-tree": "3e42b59038804aeccbb8572a7f39f4b93f171b29", + "version-string": "0.4.0-1", + "port-version": 0 + }, + { + "git-tree": "ce92e93c37ae6faf8ff82f5ef14a66b8977ed5e7", + "version-string": "0.4.0", + "port-version": 0 + }, + { + "git-tree": "8baba65e1ef246885a8366c863e1c3a7185effd1", + "version-string": "0.3.5-1", + "port-version": 0 + }, + { + "git-tree": "4323414e8ab13cd3dab50c3c03a5fe3e9af38352", + "version-string": "0.3.5", + "port-version": 0 + }, + { + "git-tree": "bf209ae19c87850aaad51929fa9dbac4df10058a", + "version-string": "0.3.4-0472b91-1", + "port-version": 0 + }, + { + "git-tree": "3b64e82075666999b8d477c3b49ee955aa1b21c6", + "version-string": "0.3.4-0472b91", + "port-version": 0 + }, + { + "git-tree": "9ae61ae2b5e7a2829072ded07af8202568e2afd1", + "version-string": "0472b91", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gloo.json b/externals/vcpkg/versions/g-/gloo.json new file mode 100755 index 000000000..ca6fac1e0 --- /dev/null +++ b/externals/vcpkg/versions/g-/gloo.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "18761f45d66d3eae3a73891f39142bbae80460b8", + "version-string": "20201203", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/glslang.json b/externals/vcpkg/versions/g-/glslang.json new file mode 100755 index 000000000..2d97b899d --- /dev/null +++ b/externals/vcpkg/versions/g-/glslang.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "4d7780995e9523d16a56714fcef0159f18ecfa52", + "version": "11.8.0", + "port-version": 0 + }, + { + "git-tree": "0e89013d81f909760cdc3ce9015f84ce74621eec", + "version": "11.6.0", + "port-version": 0 + }, + { + "git-tree": "e1d95a78d1dee917b157cbdef0896ab7256ea637", + "version": "11.5.0", + "port-version": 0 + }, + { + "git-tree": "a7d9b6a3d936d273c6b1966eb3b8fe8cb1ba28d1", + "version-string": "2019-03-05", + "port-version": 3 + }, + { + "git-tree": "29f2d736c8273c412c4fcf0fd50da379d1ec9a0b", + "version-string": "2019-03-05", + "port-version": 2 + }, + { + "git-tree": "02b23c6369ff2b1aed2e57bceeb184b544d388e2", + "version-string": "2019-03-05-1", + "port-version": 0 + }, + { + "git-tree": "c53ece4686a07a0d5cd60353e4ad01cf04aae50d", + "version-string": "2019-03-05", + "port-version": 0 + }, + { + "git-tree": "1f7191e1b8bcc36e377539da957c0fe7ad66a29f", + "version-string": "2018-03-02-2", + "port-version": 0 + }, + { + "git-tree": "3a3d3578e965c1e9725c06a85d0ae2551bb70440", + "version-string": "2018-03-02-1", + "port-version": 0 + }, + { + "git-tree": "45dc1dab260e1a52180bd5c5295d54bf0b96f97d", + "version-string": "2018-03-02", + "port-version": 0 + }, + { + "git-tree": "3ff408c6d555321bfaf65bf65c1b71cc80af830f", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "35858c6199aff1462cc94c5b98c39c529065d55a", + "version-string": "3a21c880500eac21cdf79bef5b80f970a55ac6af-1", + "port-version": 0 + }, + { + "git-tree": "5fb45d844a17c8c8ed6b51defe80463c89edc1aa", + "version-string": "3a21c880500eac21cdf79bef5b80f970a55ac6af", + "port-version": 0 + }, + { + "git-tree": "c87804bbeb491fafde21000bd21822bff9953227", + "version-string": "1c573fbcfba6b3d631008b1babc838501ca925d3-2", + "port-version": 0 + }, + { + "git-tree": "908a1a421e087042a77780636180b5f5aaf25735", + "version-string": "1c573fbcfba6b3d631008b1babc838501ca925d3-1", + "port-version": 0 + }, + { + "git-tree": "3f4c9fdc048e425aa144ea58619b89b50e0ed473", + "version-string": "1c573fbcfba6b3d631008b1babc838501ca925d3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/glui.json b/externals/vcpkg/versions/g-/glui.json new file mode 100755 index 000000000..00a7d98d6 --- /dev/null +++ b/externals/vcpkg/versions/g-/glui.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "435b850a183a1fe599f56df300530e81c107cdfa", + "version-string": "2019-11-30", + "port-version": 1 + }, + { + "git-tree": "83686597c999bba02534d78083a8c3ca4af831e0", + "version-string": "2019-11-30", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gmime.json b/externals/vcpkg/versions/g-/gmime.json new file mode 100755 index 000000000..a2c2c75cc --- /dev/null +++ b/externals/vcpkg/versions/g-/gmime.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "149f972ffe6870c4480e0700e8446f1d1dd358eb", + "version": "3.2.6", + "port-version": 2 + }, + { + "git-tree": "b44824b9edf5ce5c9870802facff3f3097b7977c", + "version-string": "3.2.6", + "port-version": 1 + }, + { + "git-tree": "4288225d0685ccdbbf53bdbb366a619234d1033d", + "version-string": "3.2.6", + "port-version": 0 + }, + { + "git-tree": "3d0d4a625458c87cddf6eb0d2a770dfdb9aa9802", + "version-string": "3.2.3-1", + "port-version": 0 + }, + { + "git-tree": "49f07ecfad2b70207ff85f19122a0b58d44bee44", + "version-string": "3.2.3", + "port-version": 0 + }, + { + "git-tree": "269cc06ef1dc06b233e318f4bb49aaed5865a333", + "version-string": "3.0.5", + "port-version": 0 + }, + { + "git-tree": "2a674251352bbc2666d182503081d4da38f9d65e", + "version-string": "3.0.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gmmlib.json b/externals/vcpkg/versions/g-/gmmlib.json new file mode 100755 index 000000000..4f40f75e7 --- /dev/null +++ b/externals/vcpkg/versions/g-/gmmlib.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "d7dbf37aa324f038b12f99d697da82299d3ec9a0", + "version": "21.3.2", + "port-version": 1 + }, + { + "git-tree": "5b69783d8bdff160371ecc494af42d6ec8d8ffa0", + "version": "21.3.2", + "port-version": 0 + }, + { + "git-tree": "1d1a120fb9b513b005575b6324b9eaa13d900192", + "version-string": "20.3.1", + "port-version": 1 + }, + { + "git-tree": "7fc340ea71bdc0798d55f0e3df2069ae215a6acb", + "version-string": "20.3.1", + "port-version": 0 + }, + { + "git-tree": "8a28386de58cb8db047ede0708253c9a939686e6", + "version-string": "19.4.1", + "port-version": 0 + }, + { + "git-tree": "409c2b96c8cce05ed597b657a550a42952cf638c", + "version-string": "19.2.3", + "port-version": 0 + }, + { + "git-tree": "5972c055111a757915149270d9bb13ba94bb76f3", + "version-string": "19.1.2", + "port-version": 0 + }, + { + "git-tree": "5847a84461844b252f4eee7a15211614ec5fcc5e", + "version-string": "18.3.pre2-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gmp.json b/externals/vcpkg/versions/g-/gmp.json new file mode 100755 index 000000000..2a4b1a1f2 --- /dev/null +++ b/externals/vcpkg/versions/g-/gmp.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "f4748213535c3fd004de44f6b1f15d123927cce6", + "version": "6.2.1", + "port-version": 10 + }, + { + "git-tree": "7b9a71843073bf4a86bb64ddf219c9900ebb3dbd", + "version": "6.2.1", + "port-version": 9 + }, + { + "git-tree": "8d09c9addf60d381cabe4c565cb59b27f5b2bdc7", + "version-string": "6.2.1", + "port-version": 8 + }, + { + "git-tree": "5d207c0d8a6481f96f2277fd3245f2a80456a706", + "version-string": "6.2.1", + "port-version": 7 + }, + { + "git-tree": "645878e32f8ab4e926f605107c761433515a17dd", + "version-string": "6.2.1", + "port-version": 6 + }, + { + "git-tree": "90eb02f55e96530420b8e83209651a9b91b7b002", + "version-string": "6.2.1", + "port-version": 5 + }, + { + "git-tree": "f53fd9a3e8e462a592c3811cf6c9dd2aec0f31e1", + "version-string": "6.2.1", + "port-version": 4 + }, + { + "git-tree": "3b7459d7ea886b86c9c80890c0b697df9df3cce1", + "version-string": "6.2.1", + "port-version": 3 + }, + { + "git-tree": "7f067caae5b946b5906abdfee1fb72b53922fef5", + "version-string": "6.2.1-2", + "port-version": 0 + }, + { + "git-tree": "2bccd7ded07ce0829b8cf5cd00e5967908a4d68e", + "version-string": "6.2.0", + "port-version": 5 + }, + { + "git-tree": "00e37cc531fc6b32d6b6044d7e74828af3857bb2", + "version-string": "6.2.0", + "port-version": 3 + }, + { + "git-tree": "e46f0eb1b95b8f4a6172603a6c8ece7d3a34ce79", + "version-string": "6.2.0-2", + "port-version": 0 + }, + { + "git-tree": "10db7a9c49c7ad83e4ace8f5fc2c6ad6184a2430", + "version-string": "6.2.0-1", + "port-version": 0 + }, + { + "git-tree": "2912fa8a1078d2367e3d9b866e8b24f6ff32bdb5", + "version-string": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gmsh.json b/externals/vcpkg/versions/g-/gmsh.json new file mode 100755 index 000000000..1b357c663 --- /dev/null +++ b/externals/vcpkg/versions/g-/gmsh.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d01377e2003c3ea5ef7a6b9fb215a086e5f75eed", + "version": "4.9.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gobject-introspection.json b/externals/vcpkg/versions/g-/gobject-introspection.json new file mode 100755 index 000000000..559425778 --- /dev/null +++ b/externals/vcpkg/versions/g-/gobject-introspection.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "7af27cca9283357e5b7447e5a1c6583afc50c793", + "version": "1.72.0", + "port-version": 0 + }, + { + "git-tree": "a39c3bd1142fd69e6dba29cf3bd4c7e93b049406", + "version": "1.70.0", + "port-version": 1 + }, + { + "git-tree": "5f162cfae947901b4110ea23cb5163699a079cfe", + "version": "1.70.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/google-cloud-cpp-common.json b/externals/vcpkg/versions/g-/google-cloud-cpp-common.json new file mode 100755 index 000000000..82f077109 --- /dev/null +++ b/externals/vcpkg/versions/g-/google-cloud-cpp-common.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "3a208fcc136917aefe4e696aed7ce013d8ba9aa4", + "version-string": "alias", + "port-version": 1 + }, + { + "git-tree": "6e60e7b9b08e821b11e3e1512bbd1b3caffbc21b", + "version-string": "alias", + "port-version": 0 + }, + { + "git-tree": "a9681d3e137a323b07e3c7540a53eb120d1a4dd6", + "version-string": "0.25.0", + "port-version": 0 + }, + { + "git-tree": "e694b18a9c319a548e711726ecd23371d20674a4", + "version-string": "0.21.0", + "port-version": 0 + }, + { + "git-tree": "56624554a6224d8dde6b080055042c7db739884f", + "version-string": "0.20.0", + "port-version": 0 + }, + { + "git-tree": "4f3466fd53b4d726a5339784f2c7af973e2c4231", + "version-string": "0.19.0", + "port-version": 0 + }, + { + "git-tree": "b7140fb29c018fcb3970ae4bcae81e74c90182d8", + "version-string": "0.18.0", + "port-version": 0 + }, + { + "git-tree": "b75cd45782941bceed2f41b9eba995a39ed3a86a", + "version-string": "0.16.0-1", + "port-version": 0 + }, + { + "git-tree": "1499ccc25e9d9d8003863af89b484aee54839ff8", + "version-string": "0.16.0", + "port-version": 0 + }, + { + "git-tree": "0fb815d0f006996c31975f02a1244946d7ebd2c6", + "version-string": "0.15.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/google-cloud-cpp-spanner.json b/externals/vcpkg/versions/g-/google-cloud-cpp-spanner.json new file mode 100755 index 000000000..8b8c74fe4 --- /dev/null +++ b/externals/vcpkg/versions/g-/google-cloud-cpp-spanner.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "6a6752681c05802deba72f718805a5b7ca9c4d3e", + "version-string": "alias", + "port-version": 1 + }, + { + "git-tree": "1dd73203e70438024236fa43f7454d160a16a8ce", + "version-string": "alias", + "port-version": 0 + }, + { + "git-tree": "3c9504519183c5f848c946e65d8b6761cc5d8ad3", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "20ac26bad7571f81d5e20e880e9f1ce94251ea0e", + "version-string": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "814f5c7ede4b9d303d857d6ba96141f2543065e1", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "6577b1af95d86b562a53427d4a0f4a15adbf2023", + "version-string": "0.5.0", + "port-version": 0 + }, + { + "git-tree": "cb7a117efead8e2411205ef913dbb8e113e55829", + "version-string": "0.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/google-cloud-cpp.json b/externals/vcpkg/versions/g-/google-cloud-cpp.json new file mode 100755 index 000000000..e3e890aa9 --- /dev/null +++ b/externals/vcpkg/versions/g-/google-cloud-cpp.json @@ -0,0 +1,344 @@ +{ + "versions": [ + { + "git-tree": "a6fac62fee7c3ad470f81ac87fcdf19d5a85f8b8", + "version": "1.41.0", + "port-version": 0 + }, + { + "git-tree": "506bdfbf9040c856f8f3a4a2c183da38f9030817", + "version": "1.40.1", + "port-version": 1 + }, + { + "git-tree": "2a18f7bea0f4811da422b3099c4331305cb1f617", + "version": "1.40.1", + "port-version": 0 + }, + { + "git-tree": "7f6839d85455e137c21bf5bf894e00e0327c3423", + "version": "1.39.0", + "port-version": 1 + }, + { + "git-tree": "ca8e8015d59f4f5e03b0a257d46506c2b0219a71", + "version": "1.39.0", + "port-version": 0 + }, + { + "git-tree": "a22f467e483356f9ce6b6d8502385d447c28912a", + "version": "1.38.0", + "port-version": 2 + }, + { + "git-tree": "284b1c6a7a7ac2d2d878aa68766b7db3c6775314", + "version": "1.38.0", + "port-version": 1 + }, + { + "git-tree": "f67a7068dcb56bb2a97b03a6960d522b71eb28f5", + "version": "1.38.0", + "port-version": 0 + }, + { + "git-tree": "b986c9bce793574d2a4936c1b23e705aa8b29abc", + "version": "1.37.0", + "port-version": 0 + }, + { + "git-tree": "15cf3b112010a1f5c8ec0948f135a5e1863a2246", + "version": "1.36.0", + "port-version": 1 + }, + { + "git-tree": "7b5a4cd75e98700c970afb3b0f6de808bc954ef3", + "version": "1.36.0", + "port-version": 0 + }, + { + "git-tree": "cb69d19a2e45c9dae1a8caa1ee5898b4344cb7f1", + "version": "1.35.0", + "port-version": 2 + }, + { + "git-tree": "5df9e36ebb6dd75abc2a5ff3aebdd61719739e8e", + "version": "1.35.0", + "port-version": 1 + }, + { + "git-tree": "171fbf69839919f9cbd18e7d1d3c4375920c4ae5", + "version": "1.35.0", + "port-version": 0 + }, + { + "git-tree": "3a3519f9f0fc9833e8f4dd815aea69b385ea6885", + "version": "1.34.1", + "port-version": 0 + }, + { + "git-tree": "d0975c563a68cf3d45c97c420e3e83af83620127", + "version": "1.34.0", + "port-version": 0 + }, + { + "git-tree": "3c272f2136618359a7e387fdc45a434e25e4ce85", + "version": "1.33.0", + "port-version": 0 + }, + { + "git-tree": "793c4f8aafbed21274611812020a3a4c01517fc2", + "version": "1.32.1", + "port-version": 1 + }, + { + "git-tree": "42240e5f4653d8ce17158c706e232de8a57a4c6e", + "version": "1.32.1", + "port-version": 0 + }, + { + "git-tree": "2b53c52b812f1d7fe8ada0a6d938b047b5a3dbd2", + "version": "1.32.0", + "port-version": 1 + }, + { + "git-tree": "d138daefe227de160954ecdce23178fa659edb36", + "version": "1.32.0", + "port-version": 0 + }, + { + "git-tree": "64af5624931918b1df7ff30a2f44ef86104739cd", + "version": "1.31.1", + "port-version": 0 + }, + { + "git-tree": "81d0a42380da299b4942b6d7f8c00ecba4ca7745", + "version": "1.31.0", + "port-version": 0 + }, + { + "git-tree": "7e4c28a8a9e84631228981bd73a3932596fe8e1f", + "version": "1.30.1", + "port-version": 1 + }, + { + "git-tree": "254b48f7254b7ab5b4ac6676ccd3149274f154f0", + "version": "1.30.1", + "port-version": 0 + }, + { + "git-tree": "4cc90bac3e6db351ea0daa3de00a32947c3b2050", + "version": "1.30.0", + "port-version": 0 + }, + { + "git-tree": "47a4d6d3258efe94ffe95b10abd1f0a19c48aab2", + "version": "1.29.0", + "port-version": 0 + }, + { + "git-tree": "41623bc51fa4b9763aa83d192130ff37119afe33", + "version": "1.28.0", + "port-version": 0 + }, + { + "git-tree": "7e6a35577a3c0149939403d8aa0bb1ba3487398b", + "version": "1.27.0", + "port-version": 0 + }, + { + "git-tree": "249151585040064668071c55f2cd0e4ec1fae8c5", + "version": "1.26.0", + "port-version": 0 + }, + { + "git-tree": "83200cc9220f1d5da7d7367321597708cf4ee044", + "version": "1.25.0", + "port-version": 3 + }, + { + "git-tree": "f6cb8953a3026ff687125228a7149cd23f2ed231", + "version": "1.25.0", + "port-version": 2 + }, + { + "git-tree": "720f34d5340392fe35e2ed3553b378225c8bb211", + "version": "1.24.0", + "port-version": 2 + }, + { + "git-tree": "16ca3b8eae830e46a951f7e5dc10408ee0517f6d", + "version-string": "1.24.0", + "port-version": 1 + }, + { + "git-tree": "39f9bad63d71830d31bd827577e3c37621653d5e", + "version-string": "1.24.0", + "port-version": 0 + }, + { + "git-tree": "ab2377218e8992e8aedf8fed757edb90cc390817", + "version-string": "1.23.0", + "port-version": 0 + }, + { + "git-tree": "85ed59dd339159f0600765d49cb7e1e723e67fec", + "version-string": "1.22.0", + "port-version": 0 + }, + { + "git-tree": "8cd6472a3f9bbb44fb73d7ae053098f3e38e8ee2", + "version-string": "1.21.0", + "port-version": 0 + }, + { + "git-tree": "bf429f159295f55917a153351f4e3cacc6ff1ef6", + "version-string": "1.20.0", + "port-version": 0 + }, + { + "git-tree": "59bf156235030361bdb5acf54f544284a3aa9754", + "version-string": "1.19.0", + "port-version": 0 + }, + { + "git-tree": "69917d9f2e5096f98deac99e711ec752c689f7c3", + "version-string": "1.18.0", + "port-version": 0 + }, + { + "git-tree": "fb9b65a2cb366c1daf755059abfd2d95aaba9e7a", + "version-string": "1.17.1", + "port-version": 0 + }, + { + "git-tree": "2c97742fd3d6b7c93bfb8ff88d5619ed4412f473", + "version-string": "1.16.0", + "port-version": 0 + }, + { + "git-tree": "712f8a863b2dfe78c13148e81d3212efb5a8ed97", + "version-string": "1.15.0", + "port-version": 0 + }, + { + "git-tree": "c43175be8261276b1783667357c7945158fe958f", + "version-string": "1.14.0", + "port-version": 0 + }, + { + "git-tree": "52c57b66e005aa31e111a15bf77143c957d2e89c", + "version-string": "0.21.0", + "port-version": 0 + }, + { + "git-tree": "9bc8ac8316d13f9030a9d567232470914de91e0a", + "version-string": "0.20.0", + "port-version": 0 + }, + { + "git-tree": "8ef2b02db68faa89633ebba272f07239050cae29", + "version-string": "0.19.0", + "port-version": 0 + }, + { + "git-tree": "eb0cf475c99430d3bcaf4f52ab576d8eb653e16c", + "version-string": "0.18.0", + "port-version": 0 + }, + { + "git-tree": "00498368ad052708ff4ab0007e7c9e2ba254a14d", + "version-string": "0.17.0", + "port-version": 0 + }, + { + "git-tree": "73b08543dcf70c3788f24522a9a760146f5542a3", + "version-string": "0.15.0", + "port-version": 0 + }, + { + "git-tree": "424f6cb8f1523a67b8d17e38d054d724af9bf288", + "version-string": "0.14.0-1", + "port-version": 0 + }, + { + "git-tree": "55f7ea6570a8347107f0088b8d275af382b831f4", + "version-string": "0.14.0", + "port-version": 0 + }, + { + "git-tree": "8ba7ff1b5b1023e8ac0f2e474bd68ded5cecc077", + "version-string": "0.13.0", + "port-version": 0 + }, + { + "git-tree": "04080464b28da820cd25910378a2a82e777a25da", + "version-string": "0.12.0", + "port-version": 0 + }, + { + "git-tree": "b9db46a33268ec3b23e6499f244e6ab8c9a2680d", + "version-string": "0.11.0", + "port-version": 0 + }, + { + "git-tree": "21aeb9f2d880397831202f0b6ad184942b1a32d1", + "version-string": "0.10.0", + "port-version": 0 + }, + { + "git-tree": "737c20a6baffd851d34d121a942bee74c044f53c", + "version-string": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "7e68f5fd615216033490e1c35ed3b0ecaa2afa11", + "version-string": "0.8.1-1", + "port-version": 0 + }, + { + "git-tree": "e0d1065da2edb91743dd18b701a06a22adf860e0", + "version-string": "0.8.0-1", + "port-version": 0 + }, + { + "git-tree": "17db695ea8da500d3d8df815c718da04b1c77a98", + "version-string": "0.8.0", + "port-version": 0 + }, + { + "git-tree": "919ab4fadde542d660016dbc1a37b401cc0e84ec", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "f695b99935d98c05bc6d79dec8029ebda4ab3722", + "version-string": "0.6.0", + "port-version": 0 + }, + { + "git-tree": "3070578d2ff6641a4acfa7bd23c3f8f6970e5d26", + "version-string": "0.5.0", + "port-version": 0 + }, + { + "git-tree": "a74e28a214a8434f3a5313c450ec234fd2c07882", + "version-string": "0.4.0", + "port-version": 0 + }, + { + "git-tree": "436feabe3adf421c80a6bd7a6c5a19aa8abba011", + "version-string": "0.3.0-1", + "port-version": 0 + }, + { + "git-tree": "d31aae0639ac2e3bb90c20722c718367910a7d19", + "version-string": "0.1.0-1", + "port-version": 0 + }, + { + "git-tree": "90463477b1a37c4e5f47ee9f1c756c9e140914b4", + "version-string": "0.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/googleapis.json b/externals/vcpkg/versions/g-/googleapis.json new file mode 100755 index 000000000..31dd46db5 --- /dev/null +++ b/externals/vcpkg/versions/g-/googleapis.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "1d1994c5a5daa97ce12d638f9be750ce2b63b5ef", + "version-string": "alias", + "port-version": 1 + }, + { + "git-tree": "732e1808e521305fa8f5210395976b9ed06f6ee1", + "version-string": "alias", + "port-version": 0 + }, + { + "git-tree": "75c5474e5857491f13f6e57a53f997f5f49c1301", + "version-string": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "a16c63d07fdf56b97bf13f73455fbf4b6cb476bf", + "version-string": "0.8.0", + "port-version": 0 + }, + { + "git-tree": "b8be6ae916d08dcd2dd1cd91cd62789e6553dd76", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "376f06cdb6b6512e68c7c037a45e750a9f1743c4", + "version-string": "0.6.0", + "port-version": 0 + }, + { + "git-tree": "9ed86edf4a6cc11f4a4afee4c63cfae37092ec61", + "version-string": "0.5.0", + "port-version": 0 + }, + { + "git-tree": "7632c519ca5c65e85670e46410dff41e210383ea", + "version-string": "0.4.1", + "port-version": 0 + }, + { + "git-tree": "e355db0ea6570e3be0ef737f03c426e574ea50af", + "version-string": "0.1.5", + "port-version": 0 + }, + { + "git-tree": "df850cd74ada9b2aa8253ca49461fbc258ec44c5", + "version-string": "0.1.3", + "port-version": 0 + }, + { + "git-tree": "daeed28ede1c2fce9fd9ae5cecace5234c2abc90", + "version-string": "0.1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gperf.json b/externals/vcpkg/versions/g-/gperf.json new file mode 100755 index 000000000..9421e9188 --- /dev/null +++ b/externals/vcpkg/versions/g-/gperf.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "2fd0763af6d1af5d123d81c77fe9062d33b3e918", + "version": "3.1", + "port-version": 4 + }, + { + "git-tree": "15455ef99f1ce92d079d047e90fc486c098c6b18", + "version": "3.1", + "port-version": 3 + }, + { + "git-tree": "b8854df263b141671e3463bb19ca258cf0c641d2", + "version-string": "3.1", + "port-version": 2 + }, + { + "git-tree": "a88953c10ae0ac1312b9bf79bf0bc4feaaf124fc", + "version-string": "3.1-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gperftools.json b/externals/vcpkg/versions/g-/gperftools.json new file mode 100755 index 000000000..426994d61 --- /dev/null +++ b/externals/vcpkg/versions/g-/gperftools.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "cc4a899d2089a6a683a2cbc8fc5ab6dae3fc45de", + "version-date": "2019-09-02", + "port-version": 3 + }, + { + "git-tree": "7bf526ef5e6a6a1dfb5fa4cb6941e415b64b94b3", + "version-date": "2019-09-02", + "port-version": 2 + }, + { + "git-tree": "e9062481bd1f6c7f7cac6bfabe0252f862730efc", + "version-string": "2019-09-02", + "port-version": 1 + }, + { + "git-tree": "ca64f86fb8b7ffd55e935d885d08f50d6271a755", + "version-string": "2019-09-02", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gpgme.json b/externals/vcpkg/versions/g-/gpgme.json new file mode 100755 index 000000000..6f5ab8d42 --- /dev/null +++ b/externals/vcpkg/versions/g-/gpgme.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "f037926ddc1a092f0db7089609e65ff9f221fa77", + "version-string": "1.14.0", + "port-version": 2 + }, + { + "git-tree": "e31d219a153f314d3c6ceedb7765ae30a2113daa", + "version-string": "1.14.0", + "port-version": 1 + }, + { + "git-tree": "e8114364d2581d57cd19f81da7e7581b3f803a5f", + "version-string": "1.14.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gppanel.json b/externals/vcpkg/versions/g-/gppanel.json new file mode 100755 index 000000000..5b4ec4c3b --- /dev/null +++ b/externals/vcpkg/versions/g-/gppanel.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "4cc181130888f98e2495b4a1f342b28a532f28b4", + "version-date": "2020-05-20", + "port-version": 1 + }, + { + "git-tree": "9345e63310617dade1d1664276a36f5ca4578546", + "version-string": "2020-05-20", + "port-version": 0 + }, + { + "git-tree": "8afd0cd5a90f42ea074657edf5de40c2714db615", + "version-string": "2018-04-06", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/graphene.json b/externals/vcpkg/versions/g-/graphene.json new file mode 100755 index 000000000..9a023fe39 --- /dev/null +++ b/externals/vcpkg/versions/g-/graphene.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "35d8f02c154c44312abd824ba408d52855dbf138", + "version": "1.10.2", + "port-version": 2 + }, + { + "git-tree": "1cd3ae48053d2f9b26c2ee6e2e01a413ea6bd0d2", + "version": "1.10.2", + "port-version": 1 + }, + { + "git-tree": "002959491c215c722047465a93b05d078d743864", + "version-string": "1.10.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/graphicsmagick.json b/externals/vcpkg/versions/g-/graphicsmagick.json new file mode 100755 index 000000000..696ce14ce --- /dev/null +++ b/externals/vcpkg/versions/g-/graphicsmagick.json @@ -0,0 +1,119 @@ +{ + "versions": [ + { + "git-tree": "c6ed21bf630e77483e7df659e7fd65eeefc6b543", + "version": "1.3.37", + "port-version": 1 + }, + { + "git-tree": "4b45ceaa24dce170b8bf9ae142f628162a32e448", + "version": "1.3.37", + "port-version": 0 + }, + { + "git-tree": "a6c8562f7ec58b04278fb8985f9c7bbd5143158e", + "version-string": "1.3.36", + "port-version": 1 + }, + { + "git-tree": "583006cf5cb77ea009d82d0b3226c3d2c4011ae4", + "version-string": "1.3.36", + "port-version": 0 + }, + { + "git-tree": "d9178814498d48e9814853ec809ae9fdff3ec224", + "version-string": "1.3.35", + "port-version": 3 + }, + { + "git-tree": "17cc4b0e81f234abbfc38d4def9f5c3671354462", + "version-string": "1.3.35-2", + "port-version": 0 + }, + { + "git-tree": "3982c8bfa0248f3fe83605b944ef5b2a49f602df", + "version-string": "1.3.35-1", + "port-version": 0 + }, + { + "git-tree": "b509aad411b616688af929e9ed12fe9d5b099d63", + "version-string": "1.3.35", + "port-version": 0 + }, + { + "git-tree": "8e05a9f0d5df4ad092eab2d1c932014422f837bf", + "version-string": "1.3.34", + "port-version": 0 + }, + { + "git-tree": "97217cd2bea991ebae4c4f64e6baaff0c95b83bd", + "version-string": "1.3.33-1", + "port-version": 0 + }, + { + "git-tree": "eab30046a2c3c68d8eb9f7930ea3b6b602266641", + "version-string": "1.3.33", + "port-version": 0 + }, + { + "git-tree": "1f739b89dbf1389d435841f3bd9a2d083321828f", + "version-string": "1.3.32-1", + "port-version": 0 + }, + { + "git-tree": "7b89e875e52f834f2e6dc84b4b52458d27132b51", + "version-string": "1.3.32", + "port-version": 0 + }, + { + "git-tree": "782a17a069f0757b56872e9907bda5a0c1988350", + "version-string": "1.3.31-1", + "port-version": 0 + }, + { + "git-tree": "080a85fc351370ae83920cd23211f8ad1f802798", + "version-string": "1.3.31", + "port-version": 0 + }, + { + "git-tree": "659c2a03426b6b0630e526d63384a97672988d8a", + "version-string": "1.3.30-1", + "port-version": 0 + }, + { + "git-tree": "a59532845bdda37245a2bd4d93ac0847d96617cd", + "version-string": "1.3.30", + "port-version": 0 + }, + { + "git-tree": "d1c4d3a1d273bb319e3f7addec2d920675bd492e", + "version-string": "1.3.29", + "port-version": 0 + }, + { + "git-tree": "257e5f04c747b2c9c68c3e95e15ff89def37e61b", + "version-string": "1.3.28", + "port-version": 0 + }, + { + "git-tree": "819d4cb9a9ea3d07612479608faf6d757eab2ed5", + "version-string": "1.3.26-2", + "port-version": 0 + }, + { + "git-tree": "b1cb90ce62353c49edb5d463b588e0a78a2f7e19", + "version-string": "1.3.26-1", + "port-version": 0 + }, + { + "git-tree": "574ced3b87c620299ffedc0797c41609c6efb3ed", + "version-string": "1.3.26", + "port-version": 0 + }, + { + "git-tree": "c5868428eda89f9e1b34a0c9b7c2bebbabc4cebf", + "version-string": "1.3.25", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/graphite2.json b/externals/vcpkg/versions/g-/graphite2.json new file mode 100755 index 000000000..19e5978ba --- /dev/null +++ b/externals/vcpkg/versions/g-/graphite2.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "247c12c09e9766df6a90a8a45dad08320f4e0493", + "version": "1.3.14", + "port-version": 3 + }, + { + "git-tree": "a2078beaafe054dd4f6bd162af48de28f3f9194c", + "version-string": "1.3.14", + "port-version": 2 + }, + { + "git-tree": "544016171b9bf0c28449d96cfa9ccebdb3c1aecb", + "version-string": "1.3.14", + "port-version": 1 + }, + { + "git-tree": "e5e37f083538f0e7390369a399e8ce2a32810b00", + "version-string": "1.3.14", + "port-version": 0 + }, + { + "git-tree": "8e3cde3e79154188035d3161023d71341f4077c3", + "version-string": "1.3.13", + "port-version": 0 + }, + { + "git-tree": "3153fda2f03d6f82711164d38eafe5646d2e0fe7", + "version-string": "1.3.12-1", + "port-version": 0 + }, + { + "git-tree": "0c442b8a43aa78930ab5c98c0fcd7b1a810935bd", + "version-string": "1.3.12", + "port-version": 0 + }, + { + "git-tree": "5bd373f9ec9664b5da0ae5ba0cb4f2ab16f74866", + "version-string": "1.3.10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/graphqlparser.json b/externals/vcpkg/versions/g-/graphqlparser.json new file mode 100755 index 000000000..54a076a3f --- /dev/null +++ b/externals/vcpkg/versions/g-/graphqlparser.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "5c287b09bd2e45e2bb154962cc32510c95c06268", + "version": "0.7.0", + "port-version": 4 + }, + { + "git-tree": "654424cc8d0176569961a4c128fef87478375296", + "version-string": "0.7.0", + "port-version": 3 + }, + { + "git-tree": "1bddecee3cfbfe8826912f0b5de6bdf0b4f1a880", + "version-string": "0.7.0", + "port-version": 2 + }, + { + "git-tree": "24d87a9dc777a9ebd15ec9ff2ab7ade51134c86d", + "version-string": "0.7.0-1", + "port-version": 0 + }, + { + "git-tree": "9a55874be09e976852e74cbc00509fc946676f93", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "b3d5bd161357ca5746bde673117c523092de5aa3", + "version-string": "v0.7.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/graphviz.json b/externals/vcpkg/versions/g-/graphviz.json new file mode 100755 index 000000000..e9db85c9e --- /dev/null +++ b/externals/vcpkg/versions/g-/graphviz.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "14f5333a2eb91b052b2691132f48aefced3bf1df", + "version-semver": "2.49.1", + "port-version": 4 + }, + { + "git-tree": "c1f20d0e1aaccb1035e3fe3eb95d005b4161a56e", + "version-semver": "2.49.1", + "port-version": 3 + }, + { + "git-tree": "912ac6a1578bd9cf23c20ed7f3bc85c25058c872", + "version-semver": "2.49.1", + "port-version": 2 + }, + { + "git-tree": "61316edc3deb64749cf84f70f5b0dbd669c06a9e", + "version-semver": "2.49.1", + "port-version": 1 + }, + { + "git-tree": "3d90393fc2bdb3a481e1a371fbbb8e816d0317b6", + "version-semver": "2.49.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/greatest.json b/externals/vcpkg/versions/g-/greatest.json new file mode 100755 index 000000000..77ad8eae5 --- /dev/null +++ b/externals/vcpkg/versions/g-/greatest.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "e4105b786aa9c76ff08996de18cdcfccc2fa98e4", + "version": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "8a09c8e785b2d722b16c6e38ba4c8a3a4b46c20f", + "version-string": "1.4.2", + "port-version": 1 + }, + { + "git-tree": "046876099d8e773082ce18b0c85fab4174a4c89e", + "version-string": "1.4.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/grpc.json b/externals/vcpkg/versions/g-/grpc.json new file mode 100755 index 000000000..9d3262ff4 --- /dev/null +++ b/externals/vcpkg/versions/g-/grpc.json @@ -0,0 +1,334 @@ +{ + "versions": [ + { + "git-tree": "6b15dbb6b2a6f81d7ae885b5b8f273b729b8d0ba", + "version-semver": "1.44.0", + "port-version": 1 + }, + { + "git-tree": "489c160e47ae99de58a438f93714ecbb008df330", + "version-semver": "1.44.0", + "port-version": 0 + }, + { + "git-tree": "5e3795bf43afe5243e47e18ac66a28bc722207f5", + "version-semver": "1.41.0", + "port-version": 0 + }, + { + "git-tree": "ad418bfacbcb3e9e82440612ad66104f6692cae4", + "version-semver": "1.37.0", + "port-version": 4 + }, + { + "git-tree": "38a2b1bc9dd5fca170489b616d33efae6dd43158", + "version-semver": "1.37.0", + "port-version": 3 + }, + { + "git-tree": "9bcee29de46cc5f1edbe016d192f243f65e64a5f", + "version-semver": "1.37.0", + "port-version": 2 + }, + { + "git-tree": "8f98b29393d0964e617d4182cc4915925b737285", + "version-semver": "1.37.0", + "port-version": 1 + }, + { + "git-tree": "948866c5f70f79855a8cdb961af79701e46dc63e", + "version-semver": "1.37.0", + "port-version": 0 + }, + { + "git-tree": "437c7b28d6eb5054924c3c00e529a32aef74b437", + "version-semver": "1.36.4", + "port-version": 0 + }, + { + "git-tree": "1d0adf4a9c4f719dd9d0d22dd2bd58ba34ff921c", + "version-string": "1.33.1", + "port-version": 3 + }, + { + "git-tree": "ab4f43b11a69edb96385c532af17876bc2c8849c", + "version-string": "1.33.1", + "port-version": 2 + }, + { + "git-tree": "adc3ac1f7f87af8ab8a4e96ba85ef6be654950fc", + "version-string": "1.33.1", + "port-version": 1 + }, + { + "git-tree": "3e7e326813a67313789e980cb862c33aecc67690", + "version-string": "1.33.1", + "port-version": 0 + }, + { + "git-tree": "72f856f287158681ff576c2acc416e487230c221", + "version-string": "1.32.0", + "port-version": 1 + }, + { + "git-tree": "7f72c709b55b90a4e7b1645bba41d02a348d55b9", + "version-string": "1.32.0", + "port-version": 0 + }, + { + "git-tree": "0d93ed617c894d2183f46d9ccdaad61181b2a601", + "version-string": "1.31.2", + "port-version": 0 + }, + { + "git-tree": "9ab4829edb98ab9d1a847c863562328fea6d2602", + "version-string": "1.31.1", + "port-version": 0 + }, + { + "git-tree": "4a7dd1eae9b1f0e6bc7ee18939913b928cb15bb2", + "version-string": "1.30.2", + "port-version": 0 + }, + { + "git-tree": "bc1bc900c449ab2db70e65f4d523bc45bc285fad", + "version-string": "1.29.1", + "port-version": 1 + }, + { + "git-tree": "1f739772878f0e6d4a92c5d963fc929756cfe555", + "version-string": "1.29.1", + "port-version": 0 + }, + { + "git-tree": "7c63cb274d82d144d487d514ad51e39d9a496a6a", + "version-string": "1.28.1-1", + "port-version": 0 + }, + { + "git-tree": "5e345956a839aab60f922d116bbe1c5d8879977e", + "version-string": "1.28.1", + "port-version": 0 + }, + { + "git-tree": "c9187499a007bef4b055deb6d7e6a29a765324b5", + "version-string": "1.27.3", + "port-version": 0 + }, + { + "git-tree": "06670704e9677a0650e15df041740da5d0421a01", + "version-string": "1.27.1-1", + "port-version": 0 + }, + { + "git-tree": "c4691f7c07342a03286b269a12fb0c680128a577", + "version-string": "1.26.0-1", + "port-version": 0 + }, + { + "git-tree": "fc0a9d470f78e6ff0ea3ec4a193595903017de1f", + "version-string": "1.26.0", + "port-version": 0 + }, + { + "git-tree": "e8e33fd3ba0af63e36e129917d1f743e2cf7d7c3", + "version-string": "1.24.3", + "port-version": 0 + }, + { + "git-tree": "e54c2118a214cea44561189ad275a0c360c94118", + "version-string": "1.23.1-1", + "port-version": 0 + }, + { + "git-tree": "616a5a7c30020d61b8db97dab96a1c98eaf93c6e", + "version-string": "1.23.1", + "port-version": 0 + }, + { + "git-tree": "f4265c4065acf6a69aa9c97f417ab7049874a7e9", + "version-string": "1.23.0", + "port-version": 0 + }, + { + "git-tree": "f9ee8bb31f04f4e6a8c0d3e96fbb98deeb448d45", + "version-string": "1.22.0", + "port-version": 0 + }, + { + "git-tree": "67cefd8a55f6e957820968290447bb6bb29d22f3", + "version-string": "1.21.1-1", + "port-version": 0 + }, + { + "git-tree": "099e5944ed218291c12e722af1204275f6490f0a", + "version-string": "1.21.1", + "port-version": 0 + }, + { + "git-tree": "c1b8adacfc22626bb61995a3f58a36aa3ee28498", + "version-string": "1.20.1-1", + "port-version": 0 + }, + { + "git-tree": "72acfa0be290e226346be28b2297425bdd72965c", + "version-string": "1.20.1", + "port-version": 0 + }, + { + "git-tree": "398b999c0d1feceef1905e2336f62e9f95a7eb75", + "version-string": "1.19.1-1", + "port-version": 0 + }, + { + "git-tree": "8a8d7fd405a76e9b385bc1f123ac79c34e239de5", + "version-string": "1.19.1", + "port-version": 0 + }, + { + "git-tree": "3db6dedc6f03cc3690dfa803ea2a92916e59918d", + "version-string": "1.18.0", + "port-version": 0 + }, + { + "git-tree": "780431ef68413d44065b0ca93d14a48a8c7ae8ae", + "version-string": "1.17.1", + "port-version": 0 + }, + { + "git-tree": "4235415f88e59b170f8e96d0b53bbce33e2da982", + "version-string": "1.16.1", + "port-version": 0 + }, + { + "git-tree": "256d7c09c3321bbaaaab5271af4368b9fbc8b116", + "version-string": "1.14.1", + "port-version": 0 + }, + { + "git-tree": "76eb4d0670af7d34ecdd8751e1faaabf2de313eb", + "version-string": "1.13.1", + "port-version": 0 + }, + { + "git-tree": "a68c4d1d31ea3dee5bce2a0a0c39c9f7b90fe309", + "version-string": "1.12.0-2", + "port-version": 0 + }, + { + "git-tree": "afc236b4935c6e386c65117ba35ba49351b128f9", + "version-string": "1.10.1-3", + "port-version": 0 + }, + { + "git-tree": "54dbeb916f067f6948f8692a0a452234351606e7", + "version-string": "1.10.1-2", + "port-version": 0 + }, + { + "git-tree": "f4aa40cf03cbdcf4582716b45e93fce8bdc1699e", + "version-string": "1.10.1-1", + "port-version": 0 + }, + { + "git-tree": "ad1cbea3db45cf9956a05067ac2550ca5e24c259", + "version-string": "1.10.1", + "port-version": 0 + }, + { + "git-tree": "5840deaacb275de341d3a93ee1db4d86bc013fc3", + "version-string": "1.10.0", + "port-version": 0 + }, + { + "git-tree": "987e5e57fbb4a72440d02f23859b3c9ce7107bfd", + "version-string": "1.9.1", + "port-version": 0 + }, + { + "git-tree": "6d921f5c4898f1c25ba242502d669832003b1bb0", + "version-string": "1.8.3", + "port-version": 0 + }, + { + "git-tree": "0a7bd2f3d59f77f9a36cf1c57d00fb6d0e674de1", + "version-string": "1.7.2", + "port-version": 0 + }, + { + "git-tree": "1b7ae381841029198a6f6427612eac7d33f08659", + "version-string": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "430bb1ffd656184eaa5979c810c7aad553a7c193", + "version-string": "1.6.0-2", + "port-version": 0 + }, + { + "git-tree": "62d92cc4d2cf25a3d24d31b603176368b0be7600", + "version-string": "1.6.0-1", + "port-version": 0 + }, + { + "git-tree": "05e542602faae95ccea2a3635aba8adf0d90a2bb", + "version-string": "1.6.0", + "port-version": 0 + }, + { + "git-tree": "2e85a5de8c93caa84304b3d87bafca836fbedc6e", + "version-string": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "56991c65d5e75b6ecb3e15997e3363c4e5987519", + "version-string": "1.4.0-1", + "port-version": 0 + }, + { + "git-tree": "9d500f866c228bf1c2a5fb360b8737568497e5cd", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "7ab0dec5f0337d932d9611bee479d84d5cef811b", + "version-string": "1.3.1-1", + "port-version": 0 + }, + { + "git-tree": "008ba545474e0ce96864bfa769c40947e4cf31ea", + "version-string": "1.3.1", + "port-version": 0 + }, + { + "git-tree": "16549125396ff279ab4d5a8d4576fd132abb3dec", + "version-string": "1.2.3-1", + "port-version": 0 + }, + { + "git-tree": "7538aa479fc04545a7005ba2768b72a91301b23f", + "version-string": "1.2.3", + "port-version": 0 + }, + { + "git-tree": "fd2c3f393c8921f0aad691589a89719564cae97c", + "version-string": "1.1.2-1", + "port-version": 0 + }, + { + "git-tree": "f029c6269a459317a8287494b78ac4ffabfe32d8", + "version-string": "1.1.0-dev-1674f65-2", + "port-version": 0 + }, + { + "git-tree": "2745369ca9bb24eeb7c7a75f4c2888655587b95b", + "version-string": "1.1.0-dev-1674f65-1", + "port-version": 0 + }, + { + "git-tree": "46ec04756b42c82638777f019766df191c62d5ef", + "version-string": "1.1.0-dev-1674f65", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/grppi.json b/externals/vcpkg/versions/g-/grppi.json new file mode 100755 index 000000000..4b198a176 --- /dev/null +++ b/externals/vcpkg/versions/g-/grppi.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "4149700fba5f680c7efae07383dc7d6cf6cfcef9", + "version-string": "0.4.0", + "port-version": 1 + }, + { + "git-tree": "379e8c8ba1f8f97532ae5c1c68f542e32b7e0a15", + "version-string": "0.4.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gsl-lite.json b/externals/vcpkg/versions/g-/gsl-lite.json new file mode 100755 index 000000000..8a386430a --- /dev/null +++ b/externals/vcpkg/versions/g-/gsl-lite.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "8d3c1399fe44414aaf2c88d845b8c03bfdb66d46", + "version": "0.40.0", + "port-version": 0 + }, + { + "git-tree": "764fdd7f284e4cbc5f8f28473c3c241e9bfa8d9c", + "version": "0.39.0", + "port-version": 0 + }, + { + "git-tree": "2ce26ff116fc8b387a5b67f157a0363688b22e91", + "version": "0.38.1", + "port-version": 0 + }, + { + "git-tree": "e72d735460dca6a55ce1f4b76bbaf65ad34d5584", + "version": "0.38.0", + "port-version": 0 + }, + { + "git-tree": "d043228295d723584f0143ed1395945c677e05e9", + "version-string": "0.37.0", + "port-version": 0 + }, + { + "git-tree": "8cb44f17f356d6625e03c5ade10525514e0812d7", + "version-string": "0.36.0", + "port-version": 0 + }, + { + "git-tree": "60874d27a6ffacedc5e67fffde456607a6909e33", + "version-string": "0.34.0", + "port-version": 0 + }, + { + "git-tree": "88339bf11d562c56672400f724a3a41a344bcb9c", + "version-string": "0.28.0", + "port-version": 0 + }, + { + "git-tree": "deed9d0f082c7c60dfc8ef2bf4eae4aff85bd897", + "version-string": "0.26.0", + "port-version": 0 + }, + { + "git-tree": "1fd0b3c9a2f5288956c498cefc20f933c8f7276c", + "version-string": "0.24.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gsl.json b/externals/vcpkg/versions/g-/gsl.json new file mode 100755 index 000000000..c80bd8801 --- /dev/null +++ b/externals/vcpkg/versions/g-/gsl.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "0bf0e1015fe68141e3c5d0b6777c2d38c352b72d", + "version": "2.7.1", + "port-version": 1 + }, + { + "git-tree": "dc3b20f09d0d6131faaa2dc0448d60676af96672", + "version": "2.7.1", + "port-version": 0 + }, + { + "git-tree": "535ee015f7dee11404cf4a708a7f7f45e1b74383", + "version": "2.7", + "port-version": 0 + }, + { + "git-tree": "4754262f449ca9f2d46d597c6b1da89504b7ac08", + "version-string": "2.6", + "port-version": 2 + }, + { + "git-tree": "da6e274c9febfeb37b716f136cbf43225c55d997", + "version-string": "2.6", + "port-version": 1 + }, + { + "git-tree": "a102b1a49d711cdf9b8cfe4bc1e06836dc2c2423", + "version-string": "2.6", + "port-version": 0 + }, + { + "git-tree": "c6689303d23d4842b8e05790ebf2d1c0461437b1", + "version-string": "2.4-5", + "port-version": 0 + }, + { + "git-tree": "a9ffe7894b0178b9882932547b1762f8f254fe1a", + "version-string": "2.4-4", + "port-version": 0 + }, + { + "git-tree": "3c7e304f8df732b5e1c0917bc3d2c46671416382", + "version-string": "2.4-3", + "port-version": 0 + }, + { + "git-tree": "2b64b4b83e13130bce0662cf2db9a5e74029b537", + "version-string": "2.4-2", + "port-version": 0 + }, + { + "git-tree": "076b7fb7f496e8786cf0d86580f15ff0f83d85a1", + "version-string": "2.4-1", + "port-version": 0 + }, + { + "git-tree": "b96222d7cfea143d249b116d125f32827c39ffc6", + "version-string": "2.3-2", + "port-version": 0 + }, + { + "git-tree": "84f3ee603381282005bdd2858e21f57c2462dedd", + "version-string": "2.3-1", + "port-version": 0 + }, + { + "git-tree": "801c2bb3d96697ff371628d492715c0766faed24", + "version-string": "2.3", + "port-version": 0 + }, + { + "git-tree": "5fb729245794cb443bc51644ec131f1e5938c0e4", + "version-string": "20170425-8b320e3f5d016f953e55dfc7ec8694c1349d3fe4", + "port-version": 0 + }, + { + "git-tree": "b7972852cc97a2565472489d6ad30fd7d3f1c977", + "version-string": "0-fd5ad87bf", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gsoap.json b/externals/vcpkg/versions/g-/gsoap.json new file mode 100755 index 000000000..ec7cae019 --- /dev/null +++ b/externals/vcpkg/versions/g-/gsoap.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "1fa5f6d124e48e4c9c80949c5b8e9c6d40dc2e43", + "version": "2.8.112", + "port-version": 1 + }, + { + "git-tree": "3f3950a7c522535f3095358a298f7af276894a94", + "version": "2.8.112", + "port-version": 0 + }, + { + "git-tree": "010523cbf786f4563ccef87dc0d28b13083f06f0", + "version-string": "2.8.111", + "port-version": 0 + }, + { + "git-tree": "a376e6e1ce84fa44f521c1cd75ac61ad71d811d9", + "version-string": "2.8.105", + "port-version": 0 + }, + { + "git-tree": "a0738cd5e913ea4cf3ba3e309458ed2e03f82c17", + "version-string": "2.8.102-4", + "port-version": 0 + }, + { + "git-tree": "39309e4b3757b57205531b0d43372ea5d2a2bd21", + "version-string": "2.8.102-1", + "port-version": 0 + }, + { + "git-tree": "9692cf77ea87fedb7f443d41aa339078f5466928", + "version-string": "2.8.102", + "port-version": 0 + }, + { + "git-tree": "dfbb127058c877cd552da59464c5763d31803935", + "version-string": "2.8.93-3", + "port-version": 0 + }, + { + "git-tree": "e3b7d072ef45acb0f66e0de72efc2d987272349a", + "version-string": "2.8.93-2", + "port-version": 0 + }, + { + "git-tree": "be8f0ae616b40382e2ed79e6770bbd2c3474724b", + "version-string": "2.8.93-1", + "port-version": 0 + }, + { + "git-tree": "3dc4fc1dbb33b4ebbd394cb2e29048deb61eab90", + "version-string": "2.8.87-1", + "port-version": 0 + }, + { + "git-tree": "8cb97f22897e80fad6f53ca0b1e2095cc63a3fbf", + "version-string": "2.8.84-1", + "port-version": 0 + }, + { + "git-tree": "fff621f752f6c7814af5c570e4a4cad0f66f3921", + "version-string": "2.8.82-2", + "port-version": 0 + }, + { + "git-tree": "82e57a18575678e16bde1d37a09c5c53c9ae0fb7", + "version-string": "2.8.82-1", + "port-version": 0 + }, + { + "git-tree": "c4bd372b3a99227c0b5c226a86f22c00bdda9b22", + "version-string": "2.8.81-1", + "port-version": 0 + }, + { + "git-tree": "d4be417443dec19ed09ef16421e5e070a6b9b38e", + "version-string": "2.8.78-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gst-rtsp-server.json b/externals/vcpkg/versions/g-/gst-rtsp-server.json new file mode 100755 index 000000000..695937996 --- /dev/null +++ b/externals/vcpkg/versions/g-/gst-rtsp-server.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "d769d57cd8c5c732146992a174266c11e7ef52ec", + "version": "1.19.2", + "port-version": 1 + }, + { + "git-tree": "0c628b2e09422aa3c82fc3d06757cdef559e9ce4", + "version": "1.19.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gstreamer.json b/externals/vcpkg/versions/g-/gstreamer.json new file mode 100755 index 000000000..4accf168c --- /dev/null +++ b/externals/vcpkg/versions/g-/gstreamer.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "0524a22dbda0c09201b9c677b6f72dbce870d6df", + "version": "1.19.2", + "port-version": 5 + }, + { + "git-tree": "78cacf62a38c4cfc4e399720463bef9312f115dc", + "version": "1.19.2", + "port-version": 4 + }, + { + "git-tree": "25482001e85b34b144a67fc9cc86127f9e8c89ea", + "version": "1.19.2", + "port-version": 3 + }, + { + "git-tree": "ec9fdf057bbec637e21db3a56297439e420106d4", + "version": "1.19.2", + "port-version": 2 + }, + { + "git-tree": "9e1e058b933a63ff71eeaa2a7a59fa713d0ba51b", + "version": "1.19.2", + "port-version": 1 + }, + { + "git-tree": "25482bf1d9dd85257c13e394b45745f77a29bf51", + "version": "1.19.2", + "port-version": 0 + }, + { + "git-tree": "308df77361916f76938e3a022feab2520e2ce2a3", + "version": "1.18.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gtest.json b/externals/vcpkg/versions/g-/gtest.json new file mode 100755 index 000000000..58f9b691a --- /dev/null +++ b/externals/vcpkg/versions/g-/gtest.json @@ -0,0 +1,164 @@ +{ + "versions": [ + { + "git-tree": "9731f44f8b0ecbc67eafccd0440700357d2cdfc4", + "version-semver": "1.11.0", + "port-version": 5 + }, + { + "git-tree": "9b9432e429e940c2d86eeef6fcf03bc74418c4c5", + "version-semver": "1.11.0", + "port-version": 4 + }, + { + "git-tree": "bc195b45d4d766498fb51de96427835c7c4d5748", + "version-semver": "1.11.0", + "port-version": 3 + }, + { + "git-tree": "c87cf62264002bc0cf2cb772a5588b36576323a9", + "version-semver": "1.11.0", + "port-version": 2 + }, + { + "git-tree": "e95c8da96b4a206c21d0197e5547e921d748d166", + "version-semver": "1.11.0", + "port-version": 1 + }, + { + "git-tree": "8dd6b8fb34e78fd1646f5d98720dd563d4a38a33", + "version-semver": "1.11.0", + "port-version": 0 + }, + { + "git-tree": "c37414d7a3b02afc05799bf525acb49c5ee060d1", + "version-date": "2021-05-07", + "port-version": 0 + }, + { + "git-tree": "9f4e8f94a3fe61d4abcc1929129b2e21ad6cc066", + "version-string": "1.10.0", + "port-version": 4 + }, + { + "git-tree": "e94f8c09a8fa6ed7fc618734d412878d83069bfb", + "version-string": "1.10.0", + "port-version": 3 + }, + { + "git-tree": "88de073e86bcae80206fca0ff4f4f8e6c165f43a", + "version-string": "1.10.0", + "port-version": 2 + }, + { + "git-tree": "0c8b452fb8d54869457115b48aab06fb98b6534b", + "version-string": "1.10.0", + "port-version": 1 + }, + { + "git-tree": "31e482c8e02dd0e45cf439e8aec3d1320bdee511", + "version-string": "1.10.0", + "port-version": 0 + }, + { + "git-tree": "75dae957802959a17feb7abb0272e9cac461e15a", + "version-string": "2019-10-09-1", + "port-version": 0 + }, + { + "git-tree": "4d97b8deb4711d7c03e63bf65b76a99945a7c71c", + "version-string": "2019-10-09", + "port-version": 0 + }, + { + "git-tree": "a29f51c59277dbb8f862a5e11a07b4f83a3eaa36", + "version-string": "2019-08-14-2", + "port-version": 0 + }, + { + "git-tree": "e529eb7ad6690c4fc8af907a0f9cd8b560b544e9", + "version-string": "2019-08-14-1", + "port-version": 0 + }, + { + "git-tree": "9a7027ffa93624c8a278a3fd5b42c078fb133f00", + "version-string": "2019-08-14", + "port-version": 0 + }, + { + "git-tree": "227f76bb1f104bd9ddd1e616c95ce71c69f92c27", + "version-string": "2019-01-04-3", + "port-version": 0 + }, + { + "git-tree": "b1e09efb4d16b2e25e2a79df06c10a655f924628", + "version-string": "2019-01-04-2", + "port-version": 0 + }, + { + "git-tree": "dd99fb7f94ea139eee54de7f680834ddf7a0a14b", + "version-string": "2019-01-04-1", + "port-version": 0 + }, + { + "git-tree": "70710e8f4d6e7bb29acf650a488090c437575b42", + "version-string": "2019-01-04", + "port-version": 0 + }, + { + "git-tree": "d3ab4a5a85169afe461c1a31185b86568f80816a", + "version-string": "1.8.1-1", + "port-version": 0 + }, + { + "git-tree": "f0efedd5859bf4059abe60094c45a607fcb0156f", + "version-string": "1.8.0-9", + "port-version": 0 + }, + { + "git-tree": "e04d7151d7e83e946d4c984d6bdccc2be248f917", + "version-string": "1.8.0-8", + "port-version": 0 + }, + { + "git-tree": "845c1e67bb649afa531b7eebc5938b4886084902", + "version-string": "1.8.0-7", + "port-version": 0 + }, + { + "git-tree": "02934f188f4bbd3f63be75da2a4517dbb9c586d0", + "version-string": "1.8.0-6", + "port-version": 0 + }, + { + "git-tree": "9498b6fc87ab652fe2d4bf3a0f3b52eb92c701a8", + "version-string": "1.8.0-5", + "port-version": 0 + }, + { + "git-tree": "f0c348870f545170035e034a58684158014aee80", + "version-string": "1.8.0-4", + "port-version": 0 + }, + { + "git-tree": "226154c349bc9c02e7f9a491a99f28342e663888", + "version-string": "1.8.0-3", + "port-version": 0 + }, + { + "git-tree": "c9981c030cd1671d5326f1374d8ed02ed1809720", + "version-string": "1.8.0-2", + "port-version": 0 + }, + { + "git-tree": "07dc2cb3655bfce4f47ac8553eb374313f2f4b98", + "version-string": "1.8-1", + "port-version": 0 + }, + { + "git-tree": "b0e42ede345cbb1a8660033dcabccc9886882728", + "version-string": "1.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gtk.json b/externals/vcpkg/versions/g-/gtk.json new file mode 100755 index 000000000..a0f3c9c24 --- /dev/null +++ b/externals/vcpkg/versions/g-/gtk.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "00d7796e9bcff96a64e45b977a72129b1dc7be43", + "version": "4.6.2", + "port-version": 0 + }, + { + "git-tree": "ae837c3a08bb71e486641d8b4464c132dbf54464", + "version": "4.6.0", + "port-version": 0 + }, + { + "git-tree": "a7d9e7cccb1be0a50b7b9cfa961adc93bca948fa", + "version": "4.4.0", + "port-version": 1 + }, + { + "git-tree": "1248de2309515809a0a6d6f4a1cdb48f0aca304e", + "version": "4.4.0", + "port-version": 0 + }, + { + "git-tree": "2b9f746a54e5029cc327ecd7ffb1b6d042a478b6", + "version": "4.3.0", + "port-version": 0 + }, + { + "git-tree": "5df8abca385bd61477f2da4217d0a88c3659db82", + "version": "4.0.1", + "port-version": 0 + }, + { + "git-tree": "da7eb978b76a72cf192b98a2740cbfbd23b50bb5", + "version-string": "3.22.19-4", + "port-version": 0 + }, + { + "git-tree": "f31b6257fdf87f1f40905e5556c10037f0038298", + "version-string": "3.22.19-3", + "port-version": 0 + }, + { + "git-tree": "fb7d35a53d85cca046b000fce7e463f7a34d100b", + "version-string": "3.22.19-2", + "port-version": 0 + }, + { + "git-tree": "c53244e6b476fb0e5376c020e4a2830b0410f3c5", + "version-string": "3.22.19-1", + "port-version": 0 + }, + { + "git-tree": "f5f4bb4bb1ccb0785a7b2336684fec9d392f7536", + "version-string": "3.22.19", + "port-version": 0 + }, + { + "git-tree": "f23ca137de531a9653f6bb6d03fe160ec4a3d43d", + "version-string": "3.22.15", + "port-version": 0 + }, + { + "git-tree": "64cf61ca6bbd56f4a2170da7735b77a5aea7af03", + "version-string": "3.22.14", + "port-version": 0 + }, + { + "git-tree": "866096e3e4c4ccc3d3a789f2869b2123c0fc7162", + "version-string": "3.22.11", + "port-version": 0 + }, + { + "git-tree": "64ab7ce404fc0ae42ab2acaf4befdea573e7e1ff", + "version-string": "3.22.9", + "port-version": 0 + }, + { + "git-tree": "d7bbb49cbbefff127fcb42baaf57dad592817d8f", + "version-string": "3.22.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gtkmm.json b/externals/vcpkg/versions/g-/gtkmm.json new file mode 100755 index 000000000..ef30294f4 --- /dev/null +++ b/externals/vcpkg/versions/g-/gtkmm.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "f39d8f061ae7242baf2b1b78b76253b2ee21c936", + "version": "4.6.0", + "port-version": 0 + }, + { + "git-tree": "8e30c6169ae3b7778ba17649312e6fc064fe1b43", + "version": "4.4.0", + "port-version": 1 + }, + { + "git-tree": "9d316a91086b6f8ccd32e422abc4dd5083eb22c2", + "version": "4.4.0", + "port-version": 0 + }, + { + "git-tree": "1c78f4d8d6a4375808cd69668375088c5b578e65", + "version": "4.0.1", + "port-version": 1 + }, + { + "git-tree": "14e153bf596fcdfa4376218e20d2a140f33bae8e", + "version": "4.0.1", + "port-version": 0 + }, + { + "git-tree": "9ba1569a4f12bb1a9aab5fe14c6f6ae23cea20f8", + "version": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "3db7e5662e816c4a10a625f31a4aa77b2331b2fd", + "version-string": "3.22.2", + "port-version": 5 + }, + { + "git-tree": "6b0cb028ccbdeb67852ac3a92861df4fb9bcb3b7", + "version-string": "3.22.2", + "port-version": 4 + }, + { + "git-tree": "f6f5771fe15afab22c0fe2c9edf046b068d0f675", + "version-string": "3.22.2-2", + "port-version": 0 + }, + { + "git-tree": "4278800454ac2d95bb2eb13925c9e2586db61426", + "version-string": "3.22.2-1", + "port-version": 0 + }, + { + "git-tree": "4ceb1e90e6f6f9a6ea0fcc1491ff35e92f0ca6c9", + "version-string": "3.22.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gtl.json b/externals/vcpkg/versions/g-/gtl.json new file mode 100755 index 000000000..5776144ad --- /dev/null +++ b/externals/vcpkg/versions/g-/gtl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "52665bb6e7f0bbe30ffabc59521a937072ecc9e2", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gts.json b/externals/vcpkg/versions/g-/gts.json new file mode 100755 index 000000000..d75db7104 --- /dev/null +++ b/externals/vcpkg/versions/g-/gts.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "90471122b5c6aa2ce7566b25b06d9f0b858c482e", + "version": "0.7.6", + "port-version": 5 + }, + { + "git-tree": "e2e045b3685112306e5fcbd493ea6f97fb35a501", + "version": "0.7.6", + "port-version": 4 + }, + { + "git-tree": "d353bfe6f51567882c443a76763f94a7f7290563", + "version-string": "0.7.6-3", + "port-version": 0 + }, + { + "git-tree": "1cca7f74de18f264bfcad602ab8c78719db52182", + "version-string": "0.7.6-2", + "port-version": 0 + }, + { + "git-tree": "694f1b49ce6ebfd230cc54181352a7ebeba6e29a", + "version-string": "0.7.6-1", + "port-version": 0 + }, + { + "git-tree": "b5dc11b38be99bd70b3c0663dadce93f85e89bc2", + "version-string": "0.7.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/guetzli.json b/externals/vcpkg/versions/g-/guetzli.json new file mode 100755 index 000000000..49eb0255c --- /dev/null +++ b/externals/vcpkg/versions/g-/guetzli.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "a7da0a5fa0b5bdb568edcbde81b314c3f7089cb0", + "version-date": "2020-09-14", + "port-version": 2 + }, + { + "git-tree": "2adfb6dcd5eab92b258f45aaf4a494bed18eb687", + "version-string": "2020-09-14", + "port-version": 1 + }, + { + "git-tree": "6a8b09c3639cf50beb79315f87382cbbcf377e66", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "7c618d0a1c68a72706865de96833a01f00a6eb93", + "version-string": "2018-07-30-2", + "port-version": 0 + }, + { + "git-tree": "4c7d148764b13c7cc56815d773febe64c33b09f8", + "version-string": "2018-07-30-1", + "port-version": 0 + }, + { + "git-tree": "4efb1bf652deb1a8c66a01cf646b9e3e060021c6", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "31e7c14e150fbfc8e9a05d07dd96e14cf496eae1", + "version-string": "2017-09-02-cb5e4a86f69628-1", + "port-version": 0 + }, + { + "git-tree": "c072038c84e8177d36fde2a7ab3bef2bdc79ce1f", + "version-string": "2017-09-02-cb5e4a86f69628", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/guilite.json b/externals/vcpkg/versions/g-/guilite.json new file mode 100755 index 000000000..c0a80fd20 --- /dev/null +++ b/externals/vcpkg/versions/g-/guilite.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "43572106c3593ef39db61013f97d37d33c867542", + "version-date": "2022-05-05", + "port-version": 0 + }, + { + "git-tree": "c68992e6acdc51afc39edfdfe1342ecbd197bee6", + "version-date": "2021-07-31", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gumbo.json b/externals/vcpkg/versions/g-/gumbo.json new file mode 100755 index 000000000..93cc94f00 --- /dev/null +++ b/externals/vcpkg/versions/g-/gumbo.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "33203d45b5dcbc9d4bb0175691909a4e9c930d81", + "version": "0.10.1", + "port-version": 5 + }, + { + "git-tree": "6c80a646e227f1181f474077dbf80f356555f452", + "version-string": "0.10.1", + "port-version": 4 + }, + { + "git-tree": "997baf0b8c0cd0d7db6e3e991596c8f88d23d804", + "version-string": "0.10.1-3", + "port-version": 0 + }, + { + "git-tree": "a3699efd0b8dbb4230f212d7381ae55535a29e3f", + "version-string": "0.10.1-2", + "port-version": 0 + }, + { + "git-tree": "59d1ae36616f1ec3d66f74db7be9c6c678bc5e21", + "version-string": "0.10.1-1", + "port-version": 0 + }, + { + "git-tree": "3cab3be84cb1f43dea44f88b2c0ace56b08b999f", + "version-string": "0.10.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/g-/gzip-hpp.json b/externals/vcpkg/versions/g-/gzip-hpp.json new file mode 100755 index 000000000..c9f7c1d17 --- /dev/null +++ b/externals/vcpkg/versions/g-/gzip-hpp.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "fa20c97f9bdf61c0adf326307bfeda1b24babfb1", + "version-string": "0.1.0", + "port-version": 1 + }, + { + "git-tree": "4d9fe13f9fc7b82f2adf374e3d8ff70a2759cccb", + "version-string": "0.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/h3.json b/externals/vcpkg/versions/h-/h3.json new file mode 100755 index 000000000..7fe6fd9f1 --- /dev/null +++ b/externals/vcpkg/versions/h-/h3.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "582bd670eb802209ca1dddca0067252e0736ea03", + "version-semver": "3.7.2", + "port-version": 1 + }, + { + "git-tree": "6c441a2da3a894cd1f1ec177c4b73abf2686f5b2", + "version-semver": "3.7.2", + "port-version": 0 + }, + { + "git-tree": "fa85d7bae358fa15d03381d256c84bccb04ff1ea", + "version-string": "3.6.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/h5py-lzf.json b/externals/vcpkg/versions/h-/h5py-lzf.json new file mode 100755 index 000000000..1339053f3 --- /dev/null +++ b/externals/vcpkg/versions/h-/h5py-lzf.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "9852b593ea75baeff7131615d49a46d32af54dfb", + "version-string": "2019-12-04", + "port-version": 1 + }, + { + "git-tree": "478e2b35b0c4964627b73d28f54798cd48f15872", + "version-string": "2019-12-04", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/halide.json b/externals/vcpkg/versions/h-/halide.json new file mode 100755 index 000000000..c0d638418 --- /dev/null +++ b/externals/vcpkg/versions/h-/halide.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "8beaf9e4b505e3a59e286d220492de1af4381154", + "version": "14.0.0", + "port-version": 0 + }, + { + "git-tree": "92aa2ed7a51a38dfb53cdcb2f4b9c54f58030d52", + "version": "13.0.2", + "port-version": 0 + }, + { + "git-tree": "512cb4dd40ca40afbf0c6a35f7bdc595589a0b10", + "version": "12.0.1", + "port-version": 1 + }, + { + "git-tree": "50e2c4835a57bb4a172c4b82b2a0e0a3077088ab", + "version": "12.0.1", + "port-version": 0 + }, + { + "git-tree": "eea72c77e90fcc209eafe9906f8b035ec64af984", + "version-string": "11.0.1", + "port-version": 0 + }, + { + "git-tree": "c1c73129b398eeb00757d2e09fec220dafa7d0c9", + "version-string": "10.0.0", + "port-version": 0 + }, + { + "git-tree": "431a3f5e31c6ee9f3946ca65764bce830ab94ae7", + "version-string": "master_2020_03_07", + "port-version": 0 + }, + { + "git-tree": "b832d8bdb482dd5c17e96137f055fe4fdb7f398f", + "version-string": "release_2019_08_27-2", + "port-version": 0 + }, + { + "git-tree": "0a5e689d817d18da53c4df75ab631a31b0ac01db", + "version-string": "release_2019_08_27-1", + "port-version": 0 + }, + { + "git-tree": "c2630480b670409646c050acc4d166320d88a2d7", + "version-string": "release_2019_08_27", + "port-version": 0 + }, + { + "git-tree": "bdfa7176ff183c9b55ae348d1aa5fdc9ed6c3ff6", + "version-string": "release_2018_02_15-1", + "port-version": 0 + }, + { + "git-tree": "7bedef639822d13053f1a958fdd9aee7de1c4d88", + "version-string": "release_2018_02_15", + "port-version": 0 + }, + { + "git-tree": "a0c9d2fd0ab44537361f15a3d90ba9e06a3199a7", + "version-string": "release_2017_10_30", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/happly.json b/externals/vcpkg/versions/h-/happly.json new file mode 100755 index 000000000..9bc63d54a --- /dev/null +++ b/externals/vcpkg/versions/h-/happly.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "30ccc0778da8b49727c6cffa0c11c6ece4ac7073", + "version-date": "2021-03-19", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/hareflow.json b/externals/vcpkg/versions/h-/hareflow.json new file mode 100755 index 000000000..1eeae5b86 --- /dev/null +++ b/externals/vcpkg/versions/h-/hareflow.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "80c6cc2de2019b438b3eb7caecc26277e5cc836c", + "version-semver": "0.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/harfbuzz.json b/externals/vcpkg/versions/h-/harfbuzz.json new file mode 100755 index 000000000..7de0c7f95 --- /dev/null +++ b/externals/vcpkg/versions/h-/harfbuzz.json @@ -0,0 +1,264 @@ +{ + "versions": [ + { + "git-tree": "aa86b69179481aee3a47cb7452a7058a65e6da0c", + "version": "4.2.0", + "port-version": 1 + }, + { + "git-tree": "02ad2865be7815604bb2c0e6cbc368f3d23d93d6", + "version": "4.2.0", + "port-version": 0 + }, + { + "git-tree": "1c4a2589742ad6156667771b0cf38ecb46e8c797", + "version-semver": "3.2.0", + "port-version": 3 + }, + { + "git-tree": "fb0fcb23cc704f5a2bca6fc631622309876ab271", + "version-semver": "3.2.0", + "port-version": 2 + }, + { + "git-tree": "b2c918c04e1ecf5b6a591911cea03f7093ab6933", + "version-semver": "3.2.0", + "port-version": 1 + }, + { + "git-tree": "a504ad46b9acfebdf6cc5e32bd0057d045f39115", + "version-semver": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "151b8dba4351ec70354a0cc1485e5eb720df5f75", + "version-semver": "3.0.0", + "port-version": 1 + }, + { + "git-tree": "ec7e9e00eba714984a7c4b22b5c51ce0fe1c4e08", + "version-semver": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "7bc55c4f88d240855ec6c7da3907811600e61b28", + "version-semver": "2.9.0", + "port-version": 0 + }, + { + "git-tree": "823024398648ee98849f8a4f73f778a8f97ccd1f", + "version": "2.8.2", + "port-version": 0 + }, + { + "git-tree": "0af28da9fe1d9f70c2f0b572c8e9eee085eb7c3b", + "version": "2.8.1", + "port-version": 1 + }, + { + "git-tree": "32e5438e1f8c76646b657f14fbe0dac7646d80f6", + "version": "2.8.1", + "port-version": 0 + }, + { + "git-tree": "3f1e0749ade6fb27bbb6103e1faab23b2719dcda", + "version": "2.7.4", + "port-version": 2 + }, + { + "git-tree": "e985af9b39fb57ee491c1a773c43334665ddb3d3", + "version-string": "2.7.4", + "port-version": 1 + }, + { + "git-tree": "bb9ea75cd35a35e57fb0bf79ff78818c95148fcf", + "version-string": "2.7.4", + "port-version": 0 + }, + { + "git-tree": "2a196719fa9c0b074b71119ee781233eecf2a455", + "version-string": "2.7.2", + "port-version": 1 + }, + { + "git-tree": "91aa22841e264803434659d863f2e69957f232d0", + "version-string": "2.7.2", + "port-version": 0 + }, + { + "git-tree": "076576fc2c2a50851c12426641d4c508fd0a10e3", + "version-string": "2.6.6", + "port-version": 1 + }, + { + "git-tree": "a774cec85651ed6598ea3b7a4f297ec691ac85de", + "version-string": "2.6.6", + "port-version": 0 + }, + { + "git-tree": "4762646b1e24e4ffc76edb3b09159c365f6d9262", + "version-string": "2.5.3-1", + "port-version": 0 + }, + { + "git-tree": "2bed6d0f82b99b3695c4c5c7fef233a1bfce8626", + "version-string": "2.5.3", + "port-version": 0 + }, + { + "git-tree": "897c7d72801377b0fcdb002ede9a917977a9a18a", + "version-string": "2.5.1-1", + "port-version": 0 + }, + { + "git-tree": "94e2022645b927a97cad57d3366c626c4e6380b2", + "version-string": "2.5.1", + "port-version": 0 + }, + { + "git-tree": "737da7cc1fb34bb3c8a4fd5ad488e51eabdd5034", + "version-string": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "5217d3e40ab1c53bd0211fa7816cb81a4080e8e5", + "version-string": "2.3.1-3", + "port-version": 0 + }, + { + "git-tree": "1eb3aba33feb6fc72b6b75b7504498fa6debb304", + "version-string": "2.3.1-2", + "port-version": 0 + }, + { + "git-tree": "bd8d33f7871c04e5558ac9fe02950039249345da", + "version-string": "2.3.1", + "port-version": 0 + }, + { + "git-tree": "66e072b146f47d2a2c3af658c037707582af7aee", + "version-string": "1.8.4-4", + "port-version": 0 + }, + { + "git-tree": "b8d7ac94ecbb8c8964915e5bbd63d7e2cab92ab9", + "version-string": "1.8.4-3", + "port-version": 0 + }, + { + "git-tree": "84a50d962a59ffb7de3cb9ea713e7fbcc641795d", + "version-string": "1.8.4-2", + "port-version": 0 + }, + { + "git-tree": "f7c5fa205b5636726aa510a28334155d24f9caba", + "version-string": "1.8.4-1", + "port-version": 0 + }, + { + "git-tree": "ad2402f2608f73805cbc0d2b98ddb0168ad6c638", + "version-string": "1.8.4", + "port-version": 0 + }, + { + "git-tree": "2ce4bba3c5d2667ff02b370381fafe9693d96b99", + "version-string": "1.8.2-3", + "port-version": 0 + }, + { + "git-tree": "1f41a4acbe2af0370994cf55270a31856103017c", + "version-string": "1.8.2-2", + "port-version": 0 + }, + { + "git-tree": "7619da228dff1d0154144ec5ef7ab50d67c13be0", + "version-string": "1.8.2", + "port-version": 0 + }, + { + "git-tree": "67ecbaf4252e5a9c84c201ab905553d4bf87dece", + "version-string": "1.8.1", + "port-version": 0 + }, + { + "git-tree": "2a0514c06349077cc117da9dd030bed929fdbf34", + "version-string": "1.8.0", + "port-version": 0 + }, + { + "git-tree": "e44d153727ad5410440139a256dad848b7c38b93", + "version-string": "1.7.6-1", + "port-version": 0 + }, + { + "git-tree": "d37706b30d6e90179a66f0bee0d13e590bfb37c5", + "version-string": "1.7.6", + "port-version": 0 + }, + { + "git-tree": "349e6e35c17e087c36fbd1cfabdb50c7565ea996", + "version-string": "1.7.5", + "port-version": 0 + }, + { + "git-tree": "bb5481a02968cf70c8bea87a4f723f48db43ee09", + "version-string": "1.7.4", + "port-version": 0 + }, + { + "git-tree": "aca18734b04e8b12d2307e21e8e960aba203c6e4", + "version-string": "1.6.3-1", + "port-version": 0 + }, + { + "git-tree": "fc47fa0456f1ad448bda22f5bd4f4821fc44ec83", + "version-string": "1.7.1", + "port-version": 0 + }, + { + "git-tree": "aca18734b04e8b12d2307e21e8e960aba203c6e4", + "version-string": "1.6.3-1", + "port-version": 0 + }, + { + "git-tree": "3ace3f59214ad9873116c8c32d635381b8d5fd0d", + "version-string": "1.6.3", + "port-version": 0 + }, + { + "git-tree": "d08f55c635c41e68c01cff7cfdf7ed91b7618f25", + "version-string": "1.4.6-2", + "port-version": 0 + }, + { + "git-tree": "013e9b7a559316684b1154831e2e65ae0a531169", + "version-string": "1.4.6-1", + "port-version": 0 + }, + { + "git-tree": "1274359c098198bbe9cf04d8c65de9d578b2700b", + "version-string": "1.4.6", + "port-version": 0 + }, + { + "git-tree": "117c585bb053ac82f44d36cd822fb5cb89db815f", + "version-string": "1.3.4-2", + "port-version": 0 + }, + { + "git-tree": "4cc988ca05f8c5adb6bbd479d63d7982e3227a15", + "version-string": "1.3.4-1", + "port-version": 0 + }, + { + "git-tree": "cfa58727bd1c52da7a93f7e1986bc1abf83d6ddc", + "version-string": "1.3.4", + "port-version": 0 + }, + { + "git-tree": "2fa14b6f1737ecec66dfbd81598c83bb7e440543", + "version-string": "1.3.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/hash-library.json b/externals/vcpkg/versions/h-/hash-library.json new file mode 100755 index 000000000..49ef797b9 --- /dev/null +++ b/externals/vcpkg/versions/h-/hash-library.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "fad55dc152114a3f71c5eafd33a3facd7e3a2286", + "version": "8", + "port-version": 1 + }, + { + "git-tree": "c7e4fae9255d5bdacac11e7a7dc550df777b8b37", + "version": "8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/hayai.json b/externals/vcpkg/versions/h-/hayai.json new file mode 100755 index 000000000..a5fa0b26b --- /dev/null +++ b/externals/vcpkg/versions/h-/hayai.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "fd5029e80c71cecda898075929dd64666be78885", + "version-string": "2019-08-10", + "port-version": 1 + }, + { + "git-tree": "0998208b524c86d2820be639403afb5f5763d62c", + "version-string": "2019-08-10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/hazelcast-cpp-client.json b/externals/vcpkg/versions/h-/hazelcast-cpp-client.json new file mode 100755 index 000000000..f89a6c467 --- /dev/null +++ b/externals/vcpkg/versions/h-/hazelcast-cpp-client.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "64ad522f07220b1765e13f37a8ef1a562c039562", + "version-semver": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "f3b0181d25656c1a524f51a5aca0279faba58318", + "version-semver": "4.2.0", + "port-version": 0 + }, + { + "git-tree": "17cace53a35339535e20e587090ae1c6c16f5a3d", + "version-semver": "4.1.1", + "port-version": 0 + }, + { + "git-tree": "cdb9d51f25164c0c4e6555fcbe709a92c5b9adcf", + "version-semver": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "1d4ad2dfd6a51e8867868bfa7a2ce80226d767c8", + "version-semver": "4.0.1", + "port-version": 0 + }, + { + "git-tree": "d0f516ea034e3c58e0c1621f4230445eb303a1b0", + "version-semver": "4.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/hdf5.json b/externals/vcpkg/versions/h-/hdf5.json new file mode 100755 index 000000000..6360efbd8 --- /dev/null +++ b/externals/vcpkg/versions/h-/hdf5.json @@ -0,0 +1,144 @@ +{ + "versions": [ + { + "git-tree": "f6647d7591d9b5a588d92e0fb4266d2028132ff9", + "version": "1.12.2", + "port-version": 1 + }, + { + "git-tree": "4abe78968a986c1793207ae653eb686926f3c141", + "version": "1.12.2", + "port-version": 0 + }, + { + "git-tree": "c6491dde27884b1326e6f74f3862c1ae63a122ca", + "version": "1.12.1", + "port-version": 5 + }, + { + "git-tree": "1000a70aefebfdd856715d265c3421c80157b773", + "version": "1.12.1", + "port-version": 4 + }, + { + "git-tree": "c12760535a18d9f3ac5497103dc76a961bac991e", + "version": "1.12.1", + "port-version": 3 + }, + { + "git-tree": "b3c8c63454b3e098a9e03ea654eef206769e31c1", + "version": "1.12.1", + "port-version": 1 + }, + { + "git-tree": "bf638074020559930d6e73c72bc9937bfef5ba57", + "version": "1.12.1", + "port-version": 0 + }, + { + "git-tree": "77eb81be380363280c67a3b15043696f6cee2001", + "version": "1.12.0", + "port-version": 4 + }, + { + "git-tree": "0a7e8bbf885fa0b111c3041102cb2c9adb45f5c3", + "version": "1.12.0", + "port-version": 3 + }, + { + "git-tree": "6b0acb92d47724ab485e478e8f9e83067eea77be", + "version": "1.12.0", + "port-version": 2 + }, + { + "git-tree": "702697dde6af133b36ea056ffb5d99f83d09a86d", + "version-string": "1.12.0", + "port-version": 1 + }, + { + "git-tree": "44e842d3e953523fb313d56e4af9bb51af40e507", + "version-string": "1.12.0", + "port-version": 0 + }, + { + "git-tree": "7cf9655c711cf11dcea55e6962ecf78bee6b3252", + "version-string": "1.10.5-12", + "port-version": 0 + }, + { + "git-tree": "b128d0ea0bf375fc83a72955bf6730f84cb359a7", + "version-string": "1.10.5-10", + "port-version": 0 + }, + { + "git-tree": "95997de442bca4c93b80091d207d237174d73170", + "version-string": "1.10.5-9", + "port-version": 0 + }, + { + "git-tree": "fc1152f71ede376bfc00366986c9c7b4a057210d", + "version-string": "1.10.5-8", + "port-version": 0 + }, + { + "git-tree": "205d0d7a55abebc1885b702e035c2cfd07e84ce4", + "version-string": "1.10.5-7", + "port-version": 0 + }, + { + "git-tree": "c13e7b5e5b00abd339b045cb31cf7e372433642e", + "version-string": "1.10.5-6", + "port-version": 0 + }, + { + "git-tree": "d4b1a7f45b0f8615c10415e61f8c109ce74af4b5", + "version-string": "1.10.5-5", + "port-version": 0 + }, + { + "git-tree": "21eaa3d6f47b66258273c93ab4bbf8ca92bafaad", + "version-string": "1.10.5-4", + "port-version": 0 + }, + { + "git-tree": "e5357ff90c02732cd090f09ac5b1a99c8be33015", + "version-string": "1.10.5-3", + "port-version": 0 + }, + { + "git-tree": "15c03394c634563ec9097cfc08cad23dc8b98c23", + "version-string": "1.10.5-1", + "port-version": 0 + }, + { + "git-tree": "2c055b5a50d0fd66a6f54a74315f293e347e2cfe", + "version-string": "1.10.1-1", + "port-version": 0 + }, + { + "git-tree": "84c670e0b960515031718442c031f0ed5e17b1e3", + "version-string": "1.10.1", + "port-version": 0 + }, + { + "git-tree": "555159439fb6d107243d637a03db142d10199598", + "version-string": "1.10.0-patch1-2", + "port-version": 0 + }, + { + "git-tree": "c001924b0f9f135c0f279e1c03a2bd4c4726f5c8", + "version-string": "1.10.0-patch1-1", + "port-version": 0 + }, + { + "git-tree": "6b72c120880223c0bc2e2a894b80f9c566601c87", + "version-string": "1.10.0-patch1", + "port-version": 0 + }, + { + "git-tree": "f2d6516720dc272f823aa72f82bf8714772eb669", + "version-string": "1.8.18", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/healpix.json b/externals/vcpkg/versions/h-/healpix.json new file mode 100755 index 000000000..a85f5293c --- /dev/null +++ b/externals/vcpkg/versions/h-/healpix.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "38bd9d397f3ba4e227f09a36ecb0af034f5f0c98", + "version-string": "1.12.10", + "port-version": 8 + }, + { + "git-tree": "8b4976feec333064ba50d96cfa8458afeb01783c", + "version-string": "1.12.10", + "port-version": 7 + }, + { + "git-tree": "158a498ff4af7528dff7ee004306dce22185614d", + "version-string": "1.12.10", + "port-version": 6 + }, + { + "git-tree": "4c5e66ee76c9fb2085dbddf9a2385b36692922f7", + "version-string": "1.12.10-5", + "port-version": 0 + }, + { + "git-tree": "961bb91b13917046cc3bfb186b6bf337ce05e3aa", + "version-string": "1.12.10-2", + "port-version": 0 + }, + { + "git-tree": "d52359ab326c4e66c077370c0d3577be4d7600ac", + "version-string": "1.12.10-1", + "port-version": 0 + }, + { + "git-tree": "1e332ae8d98b3fab07d5d10323bf90d9760a1828", + "version-string": "1.12.10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/hedley.json b/externals/vcpkg/versions/h-/hedley.json new file mode 100755 index 000000000..b9e32a91a --- /dev/null +++ b/externals/vcpkg/versions/h-/hedley.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "f6ad2c912329ae4108883b8b8e20f2c50e968466", + "version": "15", + "port-version": 0 + }, + { + "git-tree": "408d71ebd4c7429c04cce019743e3cb59f327959", + "version-string": "14", + "port-version": 0 + }, + { + "git-tree": "6f2c286914bf5f5d66d1588d2faeb0898bc6a0d3", + "version-string": "2019-05-08-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/hexl.json b/externals/vcpkg/versions/h-/hexl.json new file mode 100755 index 000000000..916fde9c2 --- /dev/null +++ b/externals/vcpkg/versions/h-/hexl.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "4d048751f3f15d5536e3e26d096e5efe3d8713ac", + "version": "1.2.4", + "port-version": 0 + }, + { + "git-tree": "c345ad60bfec1af5f712c6076de5d58ec497d889", + "version": "1.2.3", + "port-version": 1 + }, + { + "git-tree": "b79e9b07e9389a78ab2d421cc45940e52948d956", + "version": "1.2.3", + "port-version": 0 + }, + { + "git-tree": "2780f209491bc30cb3db0bc52a48ed88bf10d9b6", + "version": "1.2.2", + "port-version": 0 + }, + { + "git-tree": "14a96b80d062ba4dea3d18839c4d737792584a3c", + "version": "1.2.1", + "port-version": 0 + }, + { + "git-tree": "abbac3846835a67c818b2fd51c32a1e859aca7b3", + "version": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/hffix.json b/externals/vcpkg/versions/h-/hffix.json new file mode 100755 index 000000000..0f10d1695 --- /dev/null +++ b/externals/vcpkg/versions/h-/hffix.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "75af034fee768fa49b06ad4b37a65374782e1033", + "version-string": "1.0.0", + "port-version": 1 + }, + { + "git-tree": "6e523c6f54e9afbd5a3626927a222ee4cfe7bdef", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/hfsm2.json b/externals/vcpkg/versions/h-/hfsm2.json new file mode 100755 index 000000000..84c8672c3 --- /dev/null +++ b/externals/vcpkg/versions/h-/hfsm2.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "d5f096dede4a8567200188df695cdbf2cb19c6d5", + "version": "1.10.1", + "port-version": 0 + }, + { + "git-tree": "278f7b5b00418376ce4e8777cd5fddb927ec3686", + "version-string": "beta7", + "port-version": 1 + }, + { + "git-tree": "911d9cf3b289887ec59c5ea175126c084c4c6254", + "version-string": "beta7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/hidapi.json b/externals/vcpkg/versions/h-/hidapi.json new file mode 100755 index 000000000..e1c4608a3 --- /dev/null +++ b/externals/vcpkg/versions/h-/hidapi.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "803a911247de97c28264c5dee2102b368137562d", + "version-semver": "0.12.0", + "port-version": 0 + }, + { + "git-tree": "145fcc6e2c3aa564666793d494a6b90c1323e0ac", + "version-semver": "0.11.2", + "port-version": 1 + }, + { + "git-tree": "afa485fda08f51ccd3fbf54327ba44aa11b8cb32", + "version-semver": "0.11.2", + "port-version": 0 + }, + { + "git-tree": "2540911a0c10b731ac15a04c6f9c5153003c19fd", + "version-semver": "0.11.0", + "port-version": 0 + }, + { + "git-tree": "8ddfc714e198b19f67260bfeb2e5ae58e37fd909", + "version-semver": "0.10.1", + "port-version": 2 + }, + { + "git-tree": "5322c7526edb02f08688e2831978b2be542755c9", + "version-semver": "0.10.1", + "port-version": 1 + }, + { + "git-tree": "e252d2cc9ecde0cdecdf424af08a4292440f9efd", + "version-string": "0.10.1", + "port-version": 0 + }, + { + "git-tree": "9cd282bf1d058764b6f660790ffc47ae0d8b2f0d", + "version-string": "2019-08-30", + "port-version": 1 + }, + { + "git-tree": "83f307ab7d353fd5a57254a4d94278c40a4b25c8", + "version-string": "2019-08-30", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/highfive.json b/externals/vcpkg/versions/h-/highfive.json new file mode 100755 index 000000000..eaf02f1ba --- /dev/null +++ b/externals/vcpkg/versions/h-/highfive.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "b1ecca066cce62dd0fbdf760151ee0c3ccc70b81", + "version": "2.3", + "port-version": 2 + }, + { + "git-tree": "e2f9f257e00960a16a162c1f279406f48528db5a", + "version": "2.3", + "port-version": 1 + }, + { + "git-tree": "76c01340920e595af976269dec82132f192a4705", + "version": "2.3", + "port-version": 0 + }, + { + "git-tree": "b26cc2dbfcf688652fc8b8c711806c3034296237", + "version-string": "2.2.2", + "port-version": 1 + }, + { + "git-tree": "33e914e4f1216ed621883ba8dce0a0cf3829bae1", + "version-string": "2.2.2", + "port-version": 0 + }, + { + "git-tree": "3825616d8983da6a1276b8896b8e0d727573f774", + "version-string": "2.1.1", + "port-version": 0 + }, + { + "git-tree": "9b4385988c212f2ee8bd5627f9596e23ff3606dc", + "version-string": "2.0", + "port-version": 0 + }, + { + "git-tree": "407d61e660def5da6a3627328f07a21c51ffb9a5", + "version-string": "1.5-1", + "port-version": 0 + }, + { + "git-tree": "df47d577422fde1244ce6f8f8c5dc51aa9e31cde", + "version-string": "1.5", + "port-version": 0 + }, + { + "git-tree": "5179e02cd8b0aee849d181641b5111c37319a00e", + "version-string": "1.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/highway.json b/externals/vcpkg/versions/h-/highway.json new file mode 100755 index 000000000..b3efe0ceb --- /dev/null +++ b/externals/vcpkg/versions/h-/highway.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5167bd4fba072a5f09398d913d5e575241c67c5e", + "version-semver": "0.14.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/hiredis.json b/externals/vcpkg/versions/h-/hiredis.json new file mode 100755 index 000000000..36c7df6be --- /dev/null +++ b/externals/vcpkg/versions/h-/hiredis.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "4eafe5d23a2d906153cc8821c14092f2a9d3ef8a", + "version": "1.0.2", + "port-version": 3 + }, + { + "git-tree": "b651b36e6488f1eaaafc33d15d73d94751919f03", + "version": "1.0.2", + "port-version": 2 + }, + { + "git-tree": "0c7e16c5c3a9f612e1b46f96be41389b8ba11e6a", + "version": "1.0.2", + "port-version": 1 + }, + { + "git-tree": "934af68bcc045c77d7b46cef46b6a8cdf97ce2b8", + "version": "1.0.2", + "port-version": 0 + }, + { + "git-tree": "3ce136eecabedaebd15eb4a454c2ecf89f90e9c3", + "version": "1.0.0", + "port-version": 1 + }, + { + "git-tree": "e9c2ffbff25b0e22f0b09ec594b3f4288f685762", + "version-string": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "4a9dc3f6a23b635c93d1abde65678f086ade77f8", + "version-string": "2019-11-2", + "port-version": 2 + }, + { + "git-tree": "61fb5afd449f8c6e2d05e1f07463fa3f66c609aa", + "version-string": "2019-11-2-1", + "port-version": 0 + }, + { + "git-tree": "c1975a687ede27d3ae6876fbf856d60f8ecb292f", + "version-string": "2019-11-2", + "port-version": 0 + }, + { + "git-tree": "aff2e9b3c8e71a55e82d315ee28a64025f188f0f", + "version-string": "2019-11-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/hps.json b/externals/vcpkg/versions/h-/hps.json new file mode 100755 index 000000000..c969995e1 --- /dev/null +++ b/externals/vcpkg/versions/h-/hps.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8a0ec99ea7523e63fdb09fcf0eeda02739160688", + "version-date": "2022-01-18", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/hpx.json b/externals/vcpkg/versions/h-/hpx.json new file mode 100755 index 000000000..3d312e3cf --- /dev/null +++ b/externals/vcpkg/versions/h-/hpx.json @@ -0,0 +1,149 @@ +{ + "versions": [ + { + "git-tree": "2bd151915f73223a06d9470f38f56d253392a484", + "version": "1.8.0", + "port-version": 0 + }, + { + "git-tree": "48d153f2932b01257af5a799676268abdfb35fac", + "version-semver": "1.7.1", + "port-version": 5 + }, + { + "git-tree": "815641d6119376c546119a841f6c035e8f27b8da", + "version-semver": "1.7.1", + "port-version": 4 + }, + { + "git-tree": "ca0e813d228cd5ea6e5c05ae81e7e89e825783d0", + "version-semver": "1.7.1", + "port-version": 3 + }, + { + "git-tree": "e3376f2a4ca78e32a29511450453e154cdb08a2a", + "version-semver": "1.7.1", + "port-version": 2 + }, + { + "git-tree": "739c83940b3bc753e7b1ada7192dd0c36970c9f5", + "version-semver": "1.7.1", + "port-version": 1 + }, + { + "git-tree": "d55f05944b91ea48152696beb48444cad53ba8e1", + "version-semver": "1.7.1", + "port-version": 0 + }, + { + "git-tree": "6abaf9002afc0d46fd8700438776403d63959ebf", + "version-string": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "3e07ee0cdfdf093d41ddb40267f5910f71bfd944", + "version-string": "1.6.0", + "port-version": 0 + }, + { + "git-tree": "0d953f6271ca1239062cf9d4d4854820c5f853a3", + "version-string": "1.5.1", + "port-version": 1 + }, + { + "git-tree": "e54e429dd54b4683d4402bcbff3aa5412e4cb1c5", + "version-string": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "09298c2ccdaddd5de485a0a1dddd5a988a093da0", + "version-string": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "c9102df79e91df26590a8ac90d0aee495f0e01be", + "version-string": "1.4.1-1", + "port-version": 0 + }, + { + "git-tree": "6f9c4aca81b46bdbd75fa35745a084416c193655", + "version-string": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "b4915d3955b7c4f22bf7f36a5e782b6614ee3238", + "version-string": "1.4.0-1", + "port-version": 0 + }, + { + "git-tree": "ec18df284aaae6f9a4279f6a4473a60935d3ca21", + "version-string": "1.3.0-2", + "port-version": 0 + }, + { + "git-tree": "638eb9bef11f1e5ce498a0df5151fe9b053e17e9", + "version-string": "1.3.0-1", + "port-version": 0 + }, + { + "git-tree": "8ae92e5f4518e2eeb8c42031b1bce0d75c0e48e9", + "version-string": "1.2.1-1", + "port-version": 0 + }, + { + "git-tree": "7fab6b09eb2d716be628379c03c4e9fdc19f5ff6", + "version-string": "1.2.1-0", + "port-version": 0 + }, + { + "git-tree": "ac33c17cf60f5d11ec9f95401095c3aae0b39add", + "version-string": "1.2.0-1", + "port-version": 0 + }, + { + "git-tree": "318331a93aa3b38469682e5009db36fb3909ecdb", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "52bcad625c0e17b817364f0385645e3c4a975cc0", + "version-string": "1.1.0-1", + "port-version": 0 + }, + { + "git-tree": "6aead4affc4449e35cb7ca485bda7cbd52d17ce3", + "version-string": "1.0.0-8", + "port-version": 0 + }, + { + "git-tree": "06318f8ddbe8c85c42a51fdd64f1cf3874efd3d8", + "version-string": "1.0.0-7", + "port-version": 0 + }, + { + "git-tree": "745cc197f381856e849dbbf9789c915279dfdc9c", + "version-string": "1.0.0-6", + "port-version": 0 + }, + { + "git-tree": "68e456e0f0b31bbef5aad689735d7daa2703b468", + "version-string": "1.0.0-5", + "port-version": 0 + }, + { + "git-tree": "c815328bd20f06fd3d72aac6902e0fbc2562e2bd", + "version-string": "1.0.0-4", + "port-version": 0 + }, + { + "git-tree": "37bb288337583e525185a166106217a508ec5d85", + "version-string": "1.0.0-3", + "port-version": 0 + }, + { + "git-tree": "167510a95f9e468406142c310d3d39c6f182a75d", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/http-parser.json b/externals/vcpkg/versions/h-/http-parser.json new file mode 100755 index 000000000..8ed211695 --- /dev/null +++ b/externals/vcpkg/versions/h-/http-parser.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "55d462cc4fb637891cc2d1dda24a9bd97c7d38f5", + "version-string": "2.9.4", + "port-version": 1 + }, + { + "git-tree": "ad1f223d4c2eaa1a904f08153ec3b09854c0e393", + "version-string": "2.9.4", + "port-version": 0 + }, + { + "git-tree": "8525a804bbb90dcf1ac4f28b176e205c0af26519", + "version-string": "2.9.3", + "port-version": 0 + }, + { + "git-tree": "e1af42a470fee65bfbab0dad2ef6011d885b7390", + "version-string": "2.9.2-1", + "port-version": 0 + }, + { + "git-tree": "ed7bcfe851f539b4949b9e4947f4191a50dbc2b9", + "version-string": "2.9.2", + "port-version": 0 + }, + { + "git-tree": "8330edae768537c8a68241a33a34a8da2d2c5f4c", + "version-string": "2.9.0-1", + "port-version": 0 + }, + { + "git-tree": "b69b623e0c2bb31af83b21778b7ab4e33abb46d3", + "version-string": "2.9.0", + "port-version": 0 + }, + { + "git-tree": "47283005d12933a6fed28bb6a9a1422f818df496", + "version-string": "2.8.1", + "port-version": 0 + }, + { + "git-tree": "30d289cfa6f6ac7e9a898dba5016d9c444abdf2c", + "version-string": "2.7.1-3", + "port-version": 0 + }, + { + "git-tree": "9d99708da66254c483bbc93b1ea01849dedf8090", + "version-string": "2.7.1-2", + "port-version": 0 + }, + { + "git-tree": "ded9b7f2ee8f087925d7a6ed61cbedddf1d055a9", + "version-string": "2.7.1-1", + "port-version": 0 + }, + { + "git-tree": "af958e429245254d86d3845fef33bfb07649ddbe", + "version-string": "2.7.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/hungarian.json b/externals/vcpkg/versions/h-/hungarian.json new file mode 100755 index 000000000..116c8e859 --- /dev/null +++ b/externals/vcpkg/versions/h-/hungarian.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "4440d428d76082b3b8af21c5eda247a33794b4ef", + "version-string": "v0.1.3", + "port-version": 1 + }, + { + "git-tree": "66d26b2162c1337d91ce5047c412788a220bacee", + "version-string": "v0.1.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/hunspell.json b/externals/vcpkg/versions/h-/hunspell.json new file mode 100755 index 000000000..7477d3161 --- /dev/null +++ b/externals/vcpkg/versions/h-/hunspell.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "9beac8cd192fb54839925b083fa72e611d7bcfee", + "version": "1.7.0", + "port-version": 8 + }, + { + "git-tree": "a7db92584496fe08ac10f8f32556ca89e14018aa", + "version": "1.7.0", + "port-version": 7 + }, + { + "git-tree": "459909cbf52806ce8df547bed3265d7d5c4abfc2", + "version": "1.7.0", + "port-version": 6 + }, + { + "git-tree": "2a0514dd8b3893b6d3a502fbf55156e9e971d6f7", + "version": "1.7.0", + "port-version": 5 + }, + { + "git-tree": "1441675cd83b048c9fe45d9230ab99c06421b121", + "version": "1.7.0", + "port-version": 4 + }, + { + "git-tree": "b943abf7281879a8f3ab2c2c14ea5da7cf735dae", + "version-string": "1.7.0", + "port-version": 3 + }, + { + "git-tree": "2d430ba4b4104cdf4f38babf9918c292d7d90b7e", + "version-string": "1.7.0", + "port-version": 2 + }, + { + "git-tree": "99e4148dd8bcbd76246c2f1fafa84e892eab8a46", + "version-string": "1.7.0-1", + "port-version": 0 + }, + { + "git-tree": "749ec4402a9b0a6e102d4716276c9714f6a6d158", + "version-string": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "73f04bb987e8720dea3c85898ad169d2981c0a8b", + "version-string": "1.6.1-3", + "port-version": 0 + }, + { + "git-tree": "240f54ec59fe1abeb93671a694a304eccf39829a", + "version-string": "1.6.1-2", + "port-version": 0 + }, + { + "git-tree": "5968fb791f81937f680562b2564ec5ac31feda7f", + "version-string": "1.6.1-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/hwloc.json b/externals/vcpkg/versions/h-/hwloc.json new file mode 100755 index 000000000..1e09f8aa0 --- /dev/null +++ b/externals/vcpkg/versions/h-/hwloc.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "3ce0161512ee6cc0ef1f2e68a6c73db63422f0ee", + "version": "2.7.1", + "port-version": 0 + }, + { + "git-tree": "22d2c0f63d27b10b032eb6cb3bd07055300fc961", + "version": "2.7.0", + "port-version": 0 + }, + { + "git-tree": "fda6ebfe17a601d067ee6809571bedbedb590eef", + "version": "2.5.0", + "port-version": 3 + }, + { + "git-tree": "4d5dc3e908e5a9e750ea228042e013e6b8a6fd77", + "version": "2.5.0", + "port-version": 2 + }, + { + "git-tree": "bb188ce07f5e0b88685f5c6740c52c8f45636878", + "version": "2.5.0", + "port-version": 1 + }, + { + "git-tree": "f06abb37eb6d851f82bca48c437744fd1c642dc3", + "version": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "564b5a894249dd831dbb8ad8792fe30d12ac353a", + "version-string": "2.2.0", + "port-version": 1 + }, + { + "git-tree": "fdafa8b57a94773fa46c24d7a3bcdb3d75867825", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "91f081628fbfd5099341bb48554a1bc1cab2e0ff", + "version-string": "1.11.7-4", + "port-version": 0 + }, + { + "git-tree": "5539c5ea3d8a0fdbba08c38b3a7408bd18420765", + "version-string": "1.11.7-3", + "port-version": 0 + }, + { + "git-tree": "7a60409a87b2a9fd50684db89f4c29708f361a31", + "version-string": "1.11.7-2", + "port-version": 0 + }, + { + "git-tree": "cfa2c7f7c209e74b231e9bc485e528ff3c161a06", + "version-string": "1.11.7-1", + "port-version": 0 + }, + { + "git-tree": "28ad2779072f2bad9c61e355f3dc729af77d7cab", + "version-string": "1.11.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/hyperscan.json b/externals/vcpkg/versions/h-/hyperscan.json new file mode 100755 index 000000000..432e36530 --- /dev/null +++ b/externals/vcpkg/versions/h-/hyperscan.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "72c36aba3fff7cd403bdf02ad8f691ced9da30a9", + "version": "5.4.0", + "port-version": 0 + }, + { + "git-tree": "14beb85ac3a741f5504afa923832eb651795f530", + "version-string": "5.3.0", + "port-version": 3 + }, + { + "git-tree": "442b4a5b4350665bc7d9fb3b0f734f1fa088973a", + "version-string": "5.3.0", + "port-version": 2 + }, + { + "git-tree": "1a0f3d2c664a03ed56917c7eb127fa907e4c3386", + "version-string": "5.3.0", + "port-version": 1 + }, + { + "git-tree": "3932d96d4ba2d75bfc41532938375e10e453817c", + "version-string": "5.3.0", + "port-version": 0 + }, + { + "git-tree": "333aac02c9fbf8c23e05328494c0079576be8e68", + "version-string": "5.2.1-1", + "port-version": 0 + }, + { + "git-tree": "51dd21b9ebd700d24a9ac034072ca09b5e40a406", + "version-string": "5.2.1", + "port-version": 0 + }, + { + "git-tree": "ef883e470f2ad9298986d82d6ed299a6a9a0ba55", + "version-string": "5.1.0-4", + "port-version": 0 + }, + { + "git-tree": "ccca38886f217e80c1d36f77c0d9057b18cf60b3", + "version-string": "5.1.0-3", + "port-version": 0 + }, + { + "git-tree": "f3775fe5c4acf7545b436081ba4af850f0edc143", + "version-string": "5.0.1-2", + "port-version": 0 + }, + { + "git-tree": "2f92dfa4257072709424f97ca61360b81be8efdb", + "version-string": "5.0.1-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/hypodermic.json b/externals/vcpkg/versions/h-/hypodermic.json new file mode 100755 index 000000000..ceb3ab656 --- /dev/null +++ b/externals/vcpkg/versions/h-/hypodermic.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "5b25c37438cbd5b8c8851c91413e1f671ebe1436", + "version": "2.5.3", + "port-version": 0 + }, + { + "git-tree": "94648decd2043ffd566f58a1d5c826835bb33aca", + "version-string": "2.5.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/h-/hypre.json b/externals/vcpkg/versions/h-/hypre.json new file mode 100755 index 000000000..758633abb --- /dev/null +++ b/externals/vcpkg/versions/h-/hypre.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "8e59caf45e83417ef29aec09ecb532d5e39ef6b5", + "version": "2.23.0", + "port-version": 0 + }, + { + "git-tree": "35d58add9c09f800e2895bacf563de15f031f7be", + "version-string": "2.19.0", + "port-version": 1 + }, + { + "git-tree": "1643e99e1d689845a05bd360bed378965ce9c0cc", + "version-string": "2.19.0", + "port-version": 0 + }, + { + "git-tree": "0ca106b1e3ee3b085e6853a5ce4f05c868ad32ea", + "version-string": "2.11.2-3", + "port-version": 0 + }, + { + "git-tree": "d53450e820eedadc2acf1e63dfd5cb387424f719", + "version-string": "2.11.2-2", + "port-version": 0 + }, + { + "git-tree": "e00e7348029f4bb45e36fdd4f1abe74a9f6344c6", + "version-string": "2.11.2-1", + "port-version": 0 + }, + { + "git-tree": "481e46f98a23c5b01d599ca3fb55757bd28880e5", + "version-string": "2.11.2", + "port-version": 0 + }, + { + "git-tree": "d8675c56f0f5fa18d2680496c2f6619b9e734023", + "version-string": "2.11.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/icu.json b/externals/vcpkg/versions/i-/icu.json new file mode 100755 index 000000000..0829a549a --- /dev/null +++ b/externals/vcpkg/versions/i-/icu.json @@ -0,0 +1,204 @@ +{ + "versions": [ + { + "git-tree": "13fe0c9056059654ea7e482cd06ff70c26f9e029", + "version": "71.1", + "port-version": 0 + }, + { + "git-tree": "2d082108b0899697c9b6253c260188728374e56b", + "version": "70.1", + "port-version": 0 + }, + { + "git-tree": "5d1bac4d5b2a05af577b0aa5bb8f600e5cf15427", + "version": "69.1", + "port-version": 19 + }, + { + "git-tree": "789755812260e6c4759e305d1591938513023c07", + "version": "69.1", + "port-version": 18 + }, + { + "git-tree": "0dc7426123d7307c353c40d63f74682f2faaabf1", + "version": "69.1", + "port-version": 17 + }, + { + "git-tree": "042eb68cba932ed45a95883c733406331cbaad6c", + "version": "69.1", + "port-version": 16 + }, + { + "git-tree": "2d08c0ceb1777074f3b31fe51e386c9ece0ca8cd", + "version": "69.1", + "port-version": 15 + }, + { + "git-tree": "2632dd55c20f6830027ae1e167524817b1a9d7ec", + "version": "69.1", + "port-version": 14 + }, + { + "git-tree": "d8c36cdfe8059aadefd80b2d5800a5d9f3494cd6", + "version": "69.1", + "port-version": 13 + }, + { + "git-tree": "02bcc079d00e16237aa0d1af449d7663581a1525", + "version": "69.1", + "port-version": 12 + }, + { + "git-tree": "46d639d2e138f9ee3362fd8023f64463ae4e6afa", + "version": "69.1", + "port-version": 11 + }, + { + "git-tree": "07e8fca3896a13ac7b4196e104015174429a6c74", + "version": "69.1", + "port-version": 10 + }, + { + "git-tree": "5c039f72ee659cc0522524889b9219615f28263a", + "version": "69.1", + "port-version": 9 + }, + { + "git-tree": "c918e5cfffd2c55c740dd69ef3f5eb36c1e17806", + "version-string": "69.1", + "port-version": 8 + }, + { + "git-tree": "db2977707d68a8c04e0960b0965722f8e5bfda20", + "version-string": "67.1", + "port-version": 8 + }, + { + "git-tree": "e224ca4ff2e2bcb1c4b72a1813ab886c1dfa2bfc", + "version-string": "67.1", + "port-version": 7 + }, + { + "git-tree": "4ea2d507d5bb2f0a1fc20ef26deca88eb4edf307", + "version-string": "67.1", + "port-version": 6 + }, + { + "git-tree": "1efce2f8881faeee06f4f6ef22d6f92ddacbda75", + "version-string": "67.1", + "port-version": 5 + }, + { + "git-tree": "43003ffdf4e30ab69904383c0aa0792faf78dad4", + "version-string": "67.1", + "port-version": 4 + }, + { + "git-tree": "aebdc1084eae7eab416a7c71bb80b44dee810d31", + "version-string": "67.1-3", + "port-version": 0 + }, + { + "git-tree": "f28d3cf55ee38272270be7664e27f9cb6ae53b3d", + "version-string": "67.1-2", + "port-version": 0 + }, + { + "git-tree": "546ed7ce43119a1a195db0d3f04c03ce603e8866", + "version-string": "67.1-1", + "port-version": 0 + }, + { + "git-tree": "ba1be2fe3dd80271753b7f694f995b2309e145b5", + "version-string": "67.1", + "port-version": 0 + }, + { + "git-tree": "46ad24657d02205eeaa7f4cce82812afee4df0cb", + "version-string": "65.1-4", + "port-version": 0 + }, + { + "git-tree": "c00fc558a4bfe370588a72a6e13a024ef099eea3", + "version-string": "65.1-3", + "port-version": 0 + }, + { + "git-tree": "ba7fae6e96f9531f47781764cc68a1d6efe7290e", + "version-string": "65.1-2", + "port-version": 0 + }, + { + "git-tree": "75a1e5adc53915064f526242983c7d12f22297d6", + "version-string": "65.1-1", + "port-version": 0 + }, + { + "git-tree": "ab3f6cc6808d79c9517be0f549241a5606a36607", + "version-string": "61.1-8", + "port-version": 0 + }, + { + "git-tree": "37ee3cec63a8a15c8b9348f847d25ed60dd95235", + "version-string": "61.1-7", + "port-version": 0 + }, + { + "git-tree": "2a7dd2543b22bc577581ea507f7dd4dcf7f15b58", + "version-string": "61.1-6", + "port-version": 0 + }, + { + "git-tree": "0b941a96d473945a564775372b1b03e478638952", + "version-string": "61.1-5", + "port-version": 0 + }, + { + "git-tree": "97283eb1d49b55916632759aca12ae562d48c500", + "version-string": "61.1-4", + "port-version": 0 + }, + { + "git-tree": "3cf7f454a9959e974f296e3809e0cbc7842d36a4", + "version-string": "61.1-3", + "port-version": 0 + }, + { + "git-tree": "de658cb3e2f4cf74f876057a58dd86fb47ef2383", + "version-string": "61.1-2", + "port-version": 0 + }, + { + "git-tree": "c28e2fce25b5590e2557c9a01cd9d9ca11eb9142", + "version-string": "61.1-1", + "port-version": 0 + }, + { + "git-tree": "c6e1d6ed22cdaddf8545d31992b94965e6122648", + "version-string": "59.1-1", + "port-version": 0 + }, + { + "git-tree": "b6d11f8dff64fcfe783f20172c01862da490b421", + "version-string": "59.1", + "port-version": 0 + }, + { + "git-tree": "d0658dc140b67cd34d39f6244dddc4b891027004", + "version-string": "58.2-1", + "port-version": 0 + }, + { + "git-tree": "b6e309e3c6e5a4ba675adc7a2d1b145219233925", + "version-string": "58.2", + "port-version": 0 + }, + { + "git-tree": "b10467e77c56b0d138d90256917ab9a6a2d96532", + "version-string": "58.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/ideviceinstaller.json b/externals/vcpkg/versions/i-/ideviceinstaller.json new file mode 100755 index 000000000..666d716a5 --- /dev/null +++ b/externals/vcpkg/versions/i-/ideviceinstaller.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "38626b7d6489e6842528257d8a38b2dd31627720", + "version-string": "1.1.2.23", + "port-version": 3 + }, + { + "git-tree": "3f0f8f093c1597406cdf0695b26403a2ec969baa", + "version-string": "1.1.2.23", + "port-version": 2 + }, + { + "git-tree": "22efe10c7de92708548907150b4dd448de67150a", + "version-string": "1.1.2.23-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/idevicerestore.json b/externals/vcpkg/versions/i-/idevicerestore.json new file mode 100755 index 000000000..1db7a148e --- /dev/null +++ b/externals/vcpkg/versions/i-/idevicerestore.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "0269d10da20f4f0b8d1317f21b71a7e8cac0ff16", + "version": "1.0.12", + "port-version": 7 + }, + { + "git-tree": "020019d72f9fa90089c2f406edb5938294f2dc3d", + "version-string": "1.0.12", + "port-version": 6 + }, + { + "git-tree": "4ba1b8951ed8c7f3ac7ba2b786c58e44ad322a86", + "version-string": "1.0.12", + "port-version": 5 + }, + { + "git-tree": "ca67e457702ccad00ebe9a49eb75221b86db6d96", + "version-string": "1.0.12-4", + "port-version": 0 + }, + { + "git-tree": "f51218d9ee053cae5ea46cb0270fdf3d204be120", + "version-string": "1.0.12-3", + "port-version": 0 + }, + { + "git-tree": "1cf6868c029bbda96040503bcd31ccba9f400078", + "version-string": "1.0.12-2", + "port-version": 0 + }, + { + "git-tree": "897894688ee68ad1699cab4c5c1256a3379ec903", + "version-string": "1.0.12-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/if97.json b/externals/vcpkg/versions/i-/if97.json new file mode 100755 index 000000000..77bf8ee1f --- /dev/null +++ b/externals/vcpkg/versions/i-/if97.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "417735fbf8343a340507ae62b2775cb95269769b", + "version-string": "2.1.2", + "port-version": 1 + }, + { + "git-tree": "eb85fac9729456ec259c779df99d16aa32dbe2ce", + "version-string": "2.1.2", + "port-version": 0 + }, + { + "git-tree": "cbdad3c183cfb5e59151a111cb33f58e978aa787", + "version-string": "2.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/igloo.json b/externals/vcpkg/versions/i-/igloo.json new file mode 100755 index 000000000..928dbfd5e --- /dev/null +++ b/externals/vcpkg/versions/i-/igloo.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "6ff1a6861322e6b0084c5f74a014a386a5e1040b", + "version-string": "1.1.1", + "port-version": 1 + }, + { + "git-tree": "5bbaba2a845fb358c0e65fb4f9bbb9d4b338f901", + "version-string": "1.1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/ignition-cmake0.json b/externals/vcpkg/versions/i-/ignition-cmake0.json new file mode 100755 index 000000000..b34232575 --- /dev/null +++ b/externals/vcpkg/versions/i-/ignition-cmake0.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "dd21340a3227e51353676cc9147ba3d759fcaf6d", + "version": "0.6.2", + "port-version": 4 + }, + { + "git-tree": "de484d582fc076a89f57fde7db6944eb57c006df", + "version-string": "0.6.2", + "port-version": 3 + }, + { + "git-tree": "2214c0356313bf4b9ac99a8554050e623ec9cb9a", + "version-string": "0.6.2-2", + "port-version": 0 + }, + { + "git-tree": "dfc6632fb7e7fd352f93ae8c0626bcb6c1087acd", + "version-string": "0.6.2-1", + "port-version": 0 + }, + { + "git-tree": "867ddd6a73be3e7ee4335f8ab0e4c5c166881278", + "version-string": "0.6.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/ignition-cmake2.json b/externals/vcpkg/versions/i-/ignition-cmake2.json new file mode 100755 index 000000000..67631a55d --- /dev/null +++ b/externals/vcpkg/versions/i-/ignition-cmake2.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "d146d55be3a48e481af0a87660c44ce2a7b5cb11", + "version": "2.5.0", + "port-version": 2 + }, + { + "git-tree": "6c12bb698575d2b7cff16d177c2601ab195041fa", + "version": "2.5.0", + "port-version": 1 + }, + { + "git-tree": "79ed070b59395cdd29bbc781269be3eb1d26bfda", + "version-string": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "c4d2b262a92f499d74d5dc468a7678364d3a65c9", + "version-string": "2.2.0-1", + "port-version": 0 + }, + { + "git-tree": "631723c5355bc47aeec0714339d2c6ac7e70c69d", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "954c92d4a288d502753e49f89651afb923709a29", + "version-string": "2.1.1-1", + "port-version": 0 + }, + { + "git-tree": "e10e4fc64d8ceb7f9583ae2b78cb9f54dcb74c22", + "version-string": "2.1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/ignition-common1.json b/externals/vcpkg/versions/i-/ignition-common1.json new file mode 100755 index 000000000..8ec4ff082 --- /dev/null +++ b/externals/vcpkg/versions/i-/ignition-common1.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "7759642adcf3e61cc1ce5b55699db02d31a94591", + "version": "1.1.1", + "port-version": 3 + }, + { + "git-tree": "6e4a5f2f998f4730002bd95e92251b77e757d6b2", + "version-string": "1.1.1", + "port-version": 2 + }, + { + "git-tree": "a79aa681c879a9e76a80df3ca14d228224bcd22c", + "version-string": "1.1.1-1", + "port-version": 0 + }, + { + "git-tree": "194c75d1a53a9c666205679bb3a6788e2528f9fc", + "version-string": "1.1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/ignition-common3.json b/externals/vcpkg/versions/i-/ignition-common3.json new file mode 100755 index 000000000..90153153e --- /dev/null +++ b/externals/vcpkg/versions/i-/ignition-common3.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "929c84951a63b65c9dd48f73a4a7147ae5a1779b", + "version": "3.9.0", + "port-version": 3 + }, + { + "git-tree": "ee01029f1822c107fb6654c440aad50f5e5b97d3", + "version-string": "3.9.0", + "port-version": 2 + }, + { + "git-tree": "f576cb30e5369daf724e9465dd29ef496f327283", + "version-string": "3.9.0", + "port-version": 1 + }, + { + "git-tree": "87a639da8095ce4a421733485fa1104959ccfe02", + "version-string": "3.9.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/ignition-fuel-tools1.json b/externals/vcpkg/versions/i-/ignition-fuel-tools1.json new file mode 100755 index 000000000..4aa3ad3e0 --- /dev/null +++ b/externals/vcpkg/versions/i-/ignition-fuel-tools1.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "2809092ee332d969d0c3d7953010b2a3aed0b801", + "version": "1.2.0", + "port-version": 4 + }, + { + "git-tree": "9c9a312b5c09cc860b8cbc810d68ba5a17bd7afb", + "version-string": "1.2.0", + "port-version": 3 + }, + { + "git-tree": "d32162d2fdffea4d19a358e13e270a709940aa58", + "version-string": "1.2.0-2", + "port-version": 0 + }, + { + "git-tree": "3b8c373cdca1eacce987c114572c180612c965bc", + "version-string": "1.2.0-1", + "port-version": 0 + }, + { + "git-tree": "1fa42f60434882f6cdd21d536bdac1a857c04dd4", + "version-string": "1.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/ignition-fuel-tools4.json b/externals/vcpkg/versions/i-/ignition-fuel-tools4.json new file mode 100755 index 000000000..4819f0c7e --- /dev/null +++ b/externals/vcpkg/versions/i-/ignition-fuel-tools4.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "168bd907379d81e0af580ea8f5cad0a9e448469e", + "version": "4.3.0", + "port-version": 2 + }, + { + "git-tree": "e6f7783701420adbe90b861a5a96130bd87f114e", + "version-string": "4.3.0", + "port-version": 1 + }, + { + "git-tree": "f151bec5a2340e8531307d7b205f8d78f56a7513", + "version-string": "4.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/ignition-math4.json b/externals/vcpkg/versions/i-/ignition-math4.json new file mode 100755 index 000000000..072a925ff --- /dev/null +++ b/externals/vcpkg/versions/i-/ignition-math4.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "fb3de1aed28c6b2599a41fa1fe4ef45fd447f988", + "version": "4.0.0", + "port-version": 3 + }, + { + "git-tree": "0312d0e2b91d2e465a1464c83a17dfb5fbe57e4a", + "version-string": "4.0.0", + "port-version": 2 + }, + { + "git-tree": "c2cf4af319039b3f94554d71eafe3ba4554de06b", + "version-string": "4.0.0-1", + "port-version": 0 + }, + { + "git-tree": "d8ce71406e7b23d8e5305a7c8dba1b4843ad4d4e", + "version-string": "4.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/ignition-math6.json b/externals/vcpkg/versions/i-/ignition-math6.json new file mode 100755 index 000000000..4fa097963 --- /dev/null +++ b/externals/vcpkg/versions/i-/ignition-math6.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "eb148027e8b1f6b1c6a47500140fa02467911e26", + "version": "6.6.0", + "port-version": 3 + }, + { + "git-tree": "7fda0a4d654c39cd30c400919981ea71675f696f", + "version-string": "6.6.0", + "port-version": 2 + }, + { + "git-tree": "20a34c6dd45c4cb0a5638ded5eb9b2dd8113a0ba", + "version-string": "6.6.0", + "port-version": 1 + }, + { + "git-tree": "d2f578e91ac205b450f5046e871c49fcdd5a4471", + "version-string": "6.6.0", + "port-version": 0 + }, + { + "git-tree": "2ee0f91d2ca15a904dd1838114ee660da12e0dd3", + "version-string": "6.4.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/ignition-modularscripts.json b/externals/vcpkg/versions/i-/ignition-modularscripts.json new file mode 100755 index 000000000..6a158e1fd --- /dev/null +++ b/externals/vcpkg/versions/i-/ignition-modularscripts.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "d834091edb40475a3e9f55455ff532f3ac629142", + "version-date": "2022-05-11", + "port-version": 0 + }, + { + "git-tree": "0b00233924c15f702784cb2342b469771125c3a5", + "version-string": "2020-11-23", + "port-version": 1 + }, + { + "git-tree": "29ded62ecf82daf0e42756ed617c38aa98fb215a", + "version-string": "2020-11-23", + "port-version": 0 + }, + { + "git-tree": "32d32f91b04ab247f2febd2097834b24f1384114", + "version-string": "2020-05-16", + "port-version": 2 + }, + { + "git-tree": "2d89e9326d7b330c1e11db6f01a78991bfe1b1d3", + "version-string": "2020-05-16", + "port-version": 1 + }, + { + "git-tree": "18f34d6551c407e49c8d81dc6ca22c7fd7a079eb", + "version-string": "2020-05-16", + "port-version": 0 + }, + { + "git-tree": "834d4b6ebc371c448f2e322cfa34d29f0cfc11c4", + "version-string": "2020-05-09", + "port-version": 0 + }, + { + "git-tree": "be14de1c2204f8d09cf076b622e14f81099bdbbd", + "version-string": "2020-04-16", + "port-version": 0 + }, + { + "git-tree": "8085dcf458f3d90246ee830f4dd5f9ba13b1d09b", + "version-string": "2020-02-10", + "port-version": 0 + }, + { + "git-tree": "cf763d56e064e5c230385fc41a42cf5fac6b4b41", + "version-string": "2019-09-11", + "port-version": 0 + }, + { + "git-tree": "f9cbdac4ce316ddb2877c5e8389a33eda4b1bac3", + "version-string": "2019-08-20", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/ignition-msgs1.json b/externals/vcpkg/versions/i-/ignition-msgs1.json new file mode 100755 index 000000000..2c09e9871 --- /dev/null +++ b/externals/vcpkg/versions/i-/ignition-msgs1.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "b906441e45012934421ddd0ad823bb7324939dd8", + "version": "1.0.0", + "port-version": 5 + }, + { + "git-tree": "7155088669524bfd132aaab6af9f7257e8bfde54", + "version-string": "1.0.0", + "port-version": 4 + }, + { + "git-tree": "6deeb37a3e78a86b0997ffe605e149b79c4ad224", + "version-string": "1.0.0", + "port-version": 3 + }, + { + "git-tree": "26d5a8cb5d65f3c92a09ddc1bee3409e526f1ec9", + "version-string": "1.0.0", + "port-version": 2 + }, + { + "git-tree": "7beda1d05c59bb872d69dc56d2f898bda4f3b9cd", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "46c685c58e9e2aba51d7efcb3cfab3f92347cb98", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/ignition-msgs5.json b/externals/vcpkg/versions/i-/ignition-msgs5.json new file mode 100755 index 000000000..f872442a4 --- /dev/null +++ b/externals/vcpkg/versions/i-/ignition-msgs5.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "ca89a878842c0d94483430295c59f9c24eb607bb", + "version": "5.3.0", + "port-version": 5 + }, + { + "git-tree": "a77594480a911b7648ca1ad24a575b826ddc2a9a", + "version": "5.3.0", + "port-version": 4 + }, + { + "git-tree": "4a9266bfbd56f0c547a7c02e8a416315ae226bf3", + "version-string": "5.3.0", + "port-version": 3 + }, + { + "git-tree": "e8619eab2a3fa0fa87af043ae46d7afb7629acc6", + "version-string": "5.3.0", + "port-version": 2 + }, + { + "git-tree": "d9a45aab4edbe498d71a48737199bf7612d09a8b", + "version-string": "5.3.0", + "port-version": 1 + }, + { + "git-tree": "96845db33a7c98aa65b4ac3e63b2da3d3248cf34", + "version-string": "5.1.0", + "port-version": 1 + }, + { + "git-tree": "c581f62b21ecbf784e169ad64074e51d254152f1", + "version-string": "5.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/ignition-msgs6.json b/externals/vcpkg/versions/i-/ignition-msgs6.json new file mode 100755 index 000000000..385aac055 --- /dev/null +++ b/externals/vcpkg/versions/i-/ignition-msgs6.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "a15e3cd08c8481cb639dc9b741ea55df597f6cf8", + "version": "6.0.0", + "port-version": 4 + }, + { + "git-tree": "99d4ba95339db124ba068ea2b7fe9cf53d648da3", + "version": "6.0.0", + "port-version": 3 + }, + { + "git-tree": "60d1f5a0cdcb7c9fcf7c5dc92f29d1d56a83fc67", + "version-string": "6.0.0", + "port-version": 2 + }, + { + "git-tree": "37ea9fd8ab03a9a1d836513a22fb81cb56b69c03", + "version-string": "6.0.0", + "port-version": 1 + }, + { + "git-tree": "0514d783ad3b65c3a5df006edc5fbf45d1d823d4", + "version-string": "6.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/ignition-plugin1.json b/externals/vcpkg/versions/i-/ignition-plugin1.json new file mode 100755 index 000000000..b9db2a478 --- /dev/null +++ b/externals/vcpkg/versions/i-/ignition-plugin1.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "1f04ba4b936f3f2885c7a463d2a86a1359990931", + "version": "1.1.0", + "port-version": 2 + }, + { + "git-tree": "71166ea18bf5f4d4de750b96836b780cd7395c0e", + "version-string": "1.1.0", + "port-version": 1 + }, + { + "git-tree": "2c0c2d15d4f71838cd518e9c9d09db5a34f93782", + "version-string": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/ignition-transport4.json b/externals/vcpkg/versions/i-/ignition-transport4.json new file mode 100755 index 000000000..2911cc079 --- /dev/null +++ b/externals/vcpkg/versions/i-/ignition-transport4.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "485717373dc99ab0f6f3a6b0ad8fec42bf8e9a9b", + "version": "4.0.0", + "port-version": 6 + }, + { + "git-tree": "17d4c446fb99c9510ee2324a03529b6fb1119a41", + "version": "4.0.0", + "port-version": 5 + }, + { + "git-tree": "24af2dccedbb77ff7f1d514871f291776fd7a86f", + "version-string": "4.0.0", + "port-version": 4 + }, + { + "git-tree": "1df4d0fec30b796611ef0840f4b74a7008d6c1fb", + "version-string": "4.0.0", + "port-version": 3 + }, + { + "git-tree": "69f5299f9f0cc2c7206d086ee3424df68a90aaf2", + "version-string": "4.0.0-2", + "port-version": 0 + }, + { + "git-tree": "ec513567382cdc1d11da6a70b5c236ea662a3278", + "version-string": "4.0.0-1", + "port-version": 0 + }, + { + "git-tree": "762aa22f9910c1bb0588d3a9f7e49776feb38b4b", + "version-string": "4.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/ignition-transport8.json b/externals/vcpkg/versions/i-/ignition-transport8.json new file mode 100755 index 000000000..06f92d704 --- /dev/null +++ b/externals/vcpkg/versions/i-/ignition-transport8.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "967c8839fce7bd85b58ed1d4a5506a2be278a8ef", + "version": "8.1.0", + "port-version": 4 + }, + { + "git-tree": "df4d904c15b18ca24200a42fdfc4e5930c91618a", + "version": "8.1.0", + "port-version": 3 + }, + { + "git-tree": "10fb9c7619753767ea31b84db43272712730f32c", + "version-string": "8.1.0", + "port-version": 2 + }, + { + "git-tree": "0841028ca6e8959f60f38c082d998b84dc273910", + "version-string": "8.1.0", + "port-version": 1 + }, + { + "git-tree": "049dc0f48ee619d631034d14674e94bac4317be1", + "version-string": "8.1.0", + "port-version": 0 + }, + { + "git-tree": "299f4539b1b7ce103e774e0578dbc99e9e275fdb", + "version-string": "8.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/ignition-transport9.json b/externals/vcpkg/versions/i-/ignition-transport9.json new file mode 100755 index 000000000..712a03c81 --- /dev/null +++ b/externals/vcpkg/versions/i-/ignition-transport9.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "918e7d23ff4ca98405b40bbdf55f9302b6cb0ed0", + "version": "9.0.0", + "port-version": 4 + }, + { + "git-tree": "abbc50866e79bb1566460eb88135358ed740268d", + "version": "9.0.0", + "port-version": 3 + }, + { + "git-tree": "0829d67a63010fca7f587ca7370db716570aa969", + "version-string": "9.0.0", + "port-version": 2 + }, + { + "git-tree": "263d88cb08544cb6fc3ff459c24a12832c0fdcb0", + "version-string": "9.0.0", + "port-version": 1 + }, + { + "git-tree": "282fbad5eec25e8d6f6a7224101ad61556d89039", + "version-string": "9.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/igraph.json b/externals/vcpkg/versions/i-/igraph.json new file mode 100755 index 000000000..e5ffcb6a6 --- /dev/null +++ b/externals/vcpkg/versions/i-/igraph.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "c374fc0b09a493a6afbd4c009dd43763b2a9132f", + "version": "0.9.9", + "port-version": 0 + }, + { + "git-tree": "562fb321b0c46134d9b876fe95a3796fd4404b24", + "version": "0.9.8", + "port-version": 2 + }, + { + "git-tree": "635707a7146747b8b5a35ba35d5e94669e499d3b", + "version": "0.9.8", + "port-version": 1 + }, + { + "git-tree": "5af04d279a55817e0ca26a113a67cf48884f9aaf", + "version": "0.9.8", + "port-version": 0 + }, + { + "git-tree": "3ebbe45814d64c35e654ecb39cf5acf9401c793a", + "version": "0.9.7", + "port-version": 0 + }, + { + "git-tree": "75f0a463ec9ebb92fdc9f67f3da0a849cae3f4e2", + "version": "0.9.6", + "port-version": 0 + }, + { + "git-tree": "e1ad33d42918b67a81d068be60950b488829811f", + "version": "0.9.5", + "port-version": 0 + }, + { + "git-tree": "9814112513cedc4fdc1d0eaf8f633278c792decb", + "version": "0.9.4", + "port-version": 1 + }, + { + "git-tree": "e03d26f1f8688463fda90a1ace2dc38a1045954d", + "version": "0.9.4", + "port-version": 0 + }, + { + "git-tree": "ddee866d3bd75d1537681669470c84a530fb432f", + "version": "0.9.3", + "port-version": 0 + }, + { + "git-tree": "c2c35718e43fc23a6187173b49c19b11b8a89fdd", + "version": "0.9.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/iir1.json b/externals/vcpkg/versions/i-/iir1.json new file mode 100755 index 000000000..3d176ff4d --- /dev/null +++ b/externals/vcpkg/versions/i-/iir1.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "b684559e0b19d393deae83fdf6e2182937942a76", + "version": "1.9.1", + "port-version": 0 + }, + { + "git-tree": "393a498a50400c062dafdefbbbdbd3d1c3daef4a", + "version": "1.9.0", + "port-version": 1 + }, + { + "git-tree": "45098a249e45e71b1efa228efae07950b4499be4", + "version": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "2cab65e09816beaca2cdc9688f4d61ae448f6877", + "version": "1.8.0", + "port-version": 1 + }, + { + "git-tree": "e41ac2805b2adb0c3e32eba808d75284e8f8c376", + "version": "1.8.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/ijg-libjpeg.json b/externals/vcpkg/versions/i-/ijg-libjpeg.json new file mode 100755 index 000000000..ab35bd732 --- /dev/null +++ b/externals/vcpkg/versions/i-/ijg-libjpeg.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "fb37d14790c59df2657d83e21009faa54643f19d", + "version-string": "9e", + "port-version": 0 + }, + { + "git-tree": "320dc4cbe69f8dea86bce50c1445f51f780de1a3", + "version-string": "9d", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/ilmbase.json b/externals/vcpkg/versions/i-/ilmbase.json new file mode 100755 index 000000000..8c7c55b56 --- /dev/null +++ b/externals/vcpkg/versions/i-/ilmbase.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "7d1a248f37b30f491ebf4430ee294e1e9018ec44", + "version-string": "2.3.0", + "port-version": 1 + }, + { + "git-tree": "993cdd111c509def2dad3cb7ce7462414b671cbb", + "version-string": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "4e392ec6f9324dbf0534e6e5d7e6f3675dd60f3b", + "version-string": "2.2.1-1", + "port-version": 0 + }, + { + "git-tree": "d3c29dcababc7ac6776a6d9b32cf561004a9bb59", + "version-string": "2.2.0-1", + "port-version": 0 + }, + { + "git-tree": "a8ceee817cce0ad2b7361818cfed6ff25dd2bbfa", + "version-string": "2.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/imath.json b/externals/vcpkg/versions/i-/imath.json new file mode 100755 index 000000000..f1385c4d1 --- /dev/null +++ b/externals/vcpkg/versions/i-/imath.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "e72149f2fce9434300bbdd84562ad7a58aa4ac90", + "version": "3.1.5", + "port-version": 0 + }, + { + "git-tree": "f8d9cbaa52114f1030e4bc9ee0e075da76d7be5c", + "version": "3.1.3", + "port-version": 1 + }, + { + "git-tree": "a244498f54d1b743d54d9d4a89d5ea556346a22e", + "version": "3.1.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/imgui-sfml.json b/externals/vcpkg/versions/i-/imgui-sfml.json new file mode 100755 index 000000000..21b4db84f --- /dev/null +++ b/externals/vcpkg/versions/i-/imgui-sfml.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "8ece0f7736052672d61d85745b1fb6a3b1362720", + "version": "2.5", + "port-version": 0 + }, + { + "git-tree": "5a40fbdee68d1f6157c8b5e0784fb701b290d0cc", + "version": "2.4", + "port-version": 1 + }, + { + "git-tree": "c81a9d0362c06279990e889cb56f9ebf71bde380", + "version": "2.4", + "port-version": 0 + }, + { + "git-tree": "2ece5bd925368d6ef9b7295b31f7f2de86179f4e", + "version": "2.3", + "port-version": 0 + }, + { + "git-tree": "57e3ab9f08cd10a7d66717044636c02349ee2ea3", + "version-string": "2.1", + "port-version": 3 + }, + { + "git-tree": "3975d5a33116814ea022e63fc270fa440af46c66", + "version-string": "2.1-2", + "port-version": 0 + }, + { + "git-tree": "6ce7827cf5c4af285d1dbb6bf92ac15bdef1bafd", + "version-string": "2.1-1", + "port-version": 0 + }, + { + "git-tree": "509640541b1c9caaaa3b990b258a129175fdb57e", + "version-string": "2.1", + "port-version": 0 + }, + { + "git-tree": "0c59cd60910fe695e3f050d4eacb6700abf5162a", + "version-string": "2.0.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/imgui.json b/externals/vcpkg/versions/i-/imgui.json new file mode 100755 index 000000000..e6a742cdd --- /dev/null +++ b/externals/vcpkg/versions/i-/imgui.json @@ -0,0 +1,234 @@ +{ + "versions": [ + { + "git-tree": "647accc743e0af0547fbf8671c170038e202fd1e", + "version": "1.87", + "port-version": 1 + }, + { + "git-tree": "b9a40068f3905099cc5cb247f1b488d0e27dfd7f", + "version": "1.87", + "port-version": 0 + }, + { + "git-tree": "afdf40a53f1f7d77248d9cdeb3f629698d0a72c5", + "version": "1.86", + "port-version": 0 + }, + { + "git-tree": "9ae62261d966705924645bc3a057fe748c24d290", + "version": "1.85", + "port-version": 0 + }, + { + "git-tree": "0d0f402c97029e9c2021ca776e2bebc645cc5ecc", + "version": "1.84.2", + "port-version": 1 + }, + { + "git-tree": "c07b221daf49a22fc9e8e7571bb329485f618a7f", + "version": "1.84.2", + "port-version": 0 + }, + { + "git-tree": "1be902aeef127530aa2817829ff44f29b1eb6e52", + "version": "1.84.1", + "port-version": 0 + }, + { + "git-tree": "07ff738266906a6d9faf3957e828acb87d48b782", + "version": "1.83", + "port-version": 0 + }, + { + "git-tree": "5b15b89409f5835f3ff13a7e725eb447dddeabab", + "version": "1.82", + "port-version": 0 + }, + { + "git-tree": "82e2ab3945def5ecc234f9586425f4dc8cb6d15e", + "version": "1.81", + "port-version": 2 + }, + { + "git-tree": "6f5ea94c84f8e4d7883a613421ef285960ce7482", + "version-string": "1.81", + "port-version": 1 + }, + { + "git-tree": "a4eda15784b1da0ef71c67177bae1126dcfba52e", + "version-string": "1.81", + "port-version": 0 + }, + { + "git-tree": "0fea0243629f67c771a4a6d9ce357ecc92021a7b", + "version-string": "1.79", + "port-version": 4 + }, + { + "git-tree": "d4c6640290ae387691c19c8dd1eb3614383caf2c", + "version-string": "1.79", + "port-version": 3 + }, + { + "git-tree": "41dae2be1e14e585515ab387a1092fb95ce7ce63", + "version-string": "1.79", + "port-version": 1 + }, + { + "git-tree": "efd7d264523a424147f80fb3e32866304b99afa0", + "version-string": "1.78", + "port-version": 3 + }, + { + "git-tree": "16b83faa248c2a361cd69bccb6c9191b9162432d", + "version-string": "1.78", + "port-version": 2 + }, + { + "git-tree": "705bdeba0a7e8970f6d26324b8d22139d2ce11de", + "version-string": "1.78", + "port-version": 1 + }, + { + "git-tree": "a3a036b98321cde29f02610fa777794b2d13410e", + "version-string": "1.77", + "port-version": 3 + }, + { + "git-tree": "ef65086ccbecee1e7eeb4364c3d22abc68f71174", + "version-string": "1.77", + "port-version": 2 + }, + { + "git-tree": "ef81242f039bf0ec5ec89803f073395fa033d631", + "version-string": "1.77", + "port-version": 1 + }, + { + "git-tree": "51c0afa3f72e6058b0b886d3e8474ac976ea0170", + "version-string": "1.77", + "port-version": 0 + }, + { + "git-tree": "1f855de57a014e9b204e62009fea7848444d717c", + "version-string": "1.76-2", + "port-version": 0 + }, + { + "git-tree": "ef8ed0214bf8f9d561bf0623ba2dffbe750e6d5f", + "version-string": "1.76-1", + "port-version": 0 + }, + { + "git-tree": "ccae8ffd4e9805736146282f0308062d7b590b88", + "version-string": "1.74-1", + "port-version": 0 + }, + { + "git-tree": "06692b1acd434245950474a2a82b8a82d5ee4197", + "version-string": "1.74", + "port-version": 0 + }, + { + "git-tree": "5bff82a6734735f84d228c8993d633905f7b3715", + "version-string": "1.73-1", + "port-version": 0 + }, + { + "git-tree": "48b3c37be1296377d95eee6e770c700de527af5c", + "version-string": "1.73", + "port-version": 0 + }, + { + "git-tree": "d3bdfac0aa03c3286e2980994470bf5b314f07c7", + "version-string": "1.72b", + "port-version": 0 + }, + { + "git-tree": "87a2b3ef91a95758d1a1115d0d332d28bf9f26cc", + "version-string": "1.70-1", + "port-version": 0 + }, + { + "git-tree": "909bffbc2f21eb85bc96c6249fac706ef9f74685", + "version-string": "1.70", + "port-version": 0 + }, + { + "git-tree": "c6620baccaa26c2158b37750b63990930151e520", + "version-string": "1.69-1", + "port-version": 0 + }, + { + "git-tree": "f4eea2402036c4933f7e4f91b2985bdf26fd74b0", + "version-string": "1.69", + "port-version": 0 + }, + { + "git-tree": "a1a1d39c5c8e2aa39cba640b1547b2abd88d9105", + "version-string": "1.68", + "port-version": 0 + }, + { + "git-tree": "6073a808ff4936b63c9fe7549e0fafbb5f62f1d5", + "version-string": "1.67-1", + "port-version": 0 + }, + { + "git-tree": "7184e2c2dc30b99e5277f125edf7144af704e5bc", + "version-string": "1.67", + "port-version": 0 + }, + { + "git-tree": "8f17ee8c230009750eabfae7c4b91a0dd07239b6", + "version-string": "1.66b", + "port-version": 0 + }, + { + "git-tree": "0238a176592faf88ec4adab09a9e2017f948f5fb", + "version-string": "1.66", + "port-version": 0 + }, + { + "git-tree": "42ba951bfb9aefe07acb86cf2aa0463a7fd4dc56", + "version-string": "1.65", + "port-version": 0 + }, + { + "git-tree": "e2c6f35b7ececd1821b862aafe895ba823b07914", + "version-string": "1.64", + "port-version": 0 + }, + { + "git-tree": "afe8e08338667fc57ddfd04f09bb062440ccb035", + "version-string": "1.62", + "port-version": 0 + }, + { + "git-tree": "8f476e68405fcf80ce09e1c8ffe5e916523f4098", + "version-string": "1.60", + "port-version": 0 + }, + { + "git-tree": "f88d0a04d71f7ea07a59ce2371c4dee8815864df", + "version-string": "1.53", + "port-version": 0 + }, + { + "git-tree": "0b6bbab540bd7cfa07cf345211ee4df9e368c5e8", + "version-string": "1.52", + "port-version": 0 + }, + { + "git-tree": "55f97d45ebddf3f17e53ebea7ed774325d402faa", + "version-string": "1.51-1", + "port-version": 0 + }, + { + "git-tree": "ee1971bd50d07c71a408836d9715028787b5bd6c", + "version-string": "1.51", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/imguizmo.json b/externals/vcpkg/versions/i-/imguizmo.json new file mode 100755 index 000000000..096f39641 --- /dev/null +++ b/externals/vcpkg/versions/i-/imguizmo.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9611b5ef89fd20182ee8d6c84c505e986f3ea880", + "version": "1.83", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/immer.json b/externals/vcpkg/versions/i-/immer.json new file mode 100755 index 000000000..0e018380b --- /dev/null +++ b/externals/vcpkg/versions/i-/immer.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "37adfac25bfa3c7df3718c1cb0c9be295eb34cb3", + "version-date": "2022-02-12", + "port-version": 0 + }, + { + "git-tree": "0ee78459721140ead0ace0a031bbb9d28039b19e", + "version-date": "2021-05-03", + "port-version": 0 + }, + { + "git-tree": "515103042c70e0f9cf8d1518816d09fc6110a669", + "version-string": "2019-06-07", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/implot.json b/externals/vcpkg/versions/i-/implot.json new file mode 100755 index 000000000..067455617 --- /dev/null +++ b/externals/vcpkg/versions/i-/implot.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "6166fdfe50da875e98426577b0fd64e8c26c924c", + "version": "0.13", + "port-version": 0 + }, + { + "git-tree": "ab3bc9b82bfc7fbd1808cc55559ed58b648ed964", + "version": "0.12", + "port-version": 0 + }, + { + "git-tree": "0cd65daef775cef7aa1fef67949dc644a4b42b73", + "version": "0.11", + "port-version": 0 + }, + { + "git-tree": "ae02479b485bcea0b2a659208319fa7c97ed917d", + "version": "0.9", + "port-version": 0 + }, + { + "git-tree": "d44f8a4dda02f0d31c5dce6d5adca8e4caa504e1", + "version-string": "0.8", + "port-version": 0 + }, + { + "git-tree": "72cab3504da84ff79724003c0fa7d003aa0f26f8", + "version-string": "0.7", + "port-version": 0 + }, + { + "git-tree": "49d3f3c8598f518bbdee68c48bfc0ac68622740e", + "version-string": "0.4", + "port-version": 0 + }, + { + "git-tree": "66e3dd41d431cafa1c9647fd06e1f5227b2b8e2c", + "version-string": "0.3-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/indicators.json b/externals/vcpkg/versions/i-/indicators.json new file mode 100755 index 000000000..014ea5458 --- /dev/null +++ b/externals/vcpkg/versions/i-/indicators.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "1f6f4a44b4af9900116de9bd567e78372d3f7278", + "version": "2.2", + "port-version": 0 + }, + { + "git-tree": "d3271abb0e661db9fa81a346851c0caaa540ade6", + "version": "2.0", + "port-version": 0 + }, + { + "git-tree": "85e30c7a947d0081282323d5d0b7daf9cfd561aa", + "version-string": "2020-10-30", + "port-version": 0 + }, + { + "git-tree": "5c7829f8387b34ab77996785c07c528e6de7e5c6", + "version-string": "1.7", + "port-version": 0 + }, + { + "git-tree": "75e34e449b187f73e9816e89e3c5bd8ebabefcd4", + "version-string": "1.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/influxdb-cxx.json b/externals/vcpkg/versions/i-/influxdb-cxx.json new file mode 100755 index 000000000..310b08ecb --- /dev/null +++ b/externals/vcpkg/versions/i-/influxdb-cxx.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "9403a6547a2dbd42b86d686c2ecd7a3e7344f13a", + "version": "0.6.7", + "port-version": 1 + }, + { + "git-tree": "ddcc844c034b136efc1bd9946e37fb98617acd88", + "version": "0.6.7", + "port-version": 0 + }, + { + "git-tree": "ed824d6b1c309c2e7e347960bfb44ab43885e7bc", + "version": "0.6.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/infoware.json b/externals/vcpkg/versions/i-/infoware.json new file mode 100755 index 000000000..7c148d6b7 --- /dev/null +++ b/externals/vcpkg/versions/i-/infoware.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "5501ab1b5d5391ca168856f073f6a46d5ea83268", + "version-date": "2021-06-16", + "port-version": 1 + }, + { + "git-tree": "9c278f55bb9b202c251c0414d877a4a238b57214", + "version-date": "2021-06-16", + "port-version": 0 + }, + { + "git-tree": "ea6cdef830ceb71bfa0d850127931972603d5695", + "version-string": "0.6.0", + "port-version": 0 + }, + { + "git-tree": "5b7cda9f7b8eb929162ab979be0d2a6a01d37292", + "version-string": "0.5.5", + "port-version": 1 + }, + { + "git-tree": "ed2c00122823b77b0ef74a94031a6cacbb015ffb", + "version-string": "0.5.5", + "port-version": 0 + }, + { + "git-tree": "8bfd4af8d1a7f17e086f2e1a8c205f38b4c4b255", + "version-string": "0.5.4", + "port-version": 0 + }, + { + "git-tree": "263f7da8f2331a6e6891af54268f2f7bf0df9ca6", + "version-string": "0.5.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/inih.json b/externals/vcpkg/versions/i-/inih.json new file mode 100755 index 000000000..ef0781ca2 --- /dev/null +++ b/externals/vcpkg/versions/i-/inih.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "de1d85a0ea62e95bd096ecff062115646742cf1e", + "version-string": "51", + "port-version": 1 + }, + { + "git-tree": "ca47d6341b0674f1473717bc8f6df7ce0922e8da", + "version-string": "51", + "port-version": 0 + }, + { + "git-tree": "4f1c00eb929f01703965877dc262cdaf967d2b35", + "version-string": "47", + "port-version": 0 + }, + { + "git-tree": "33d682392c4eb31eefa3d8788f1920509d0aa1aa", + "version-string": "45", + "port-version": 0 + }, + { + "git-tree": "90a92e5be19a788fcc7ce653e8caa0e22fdc7fb5", + "version-string": "44", + "port-version": 0 + }, + { + "git-tree": "e971c34f4334937d4382805ab24b6308c0b60495", + "version-string": "43", + "port-version": 0 + }, + { + "git-tree": "2225a5a48c72afbf0c5f8146691474aa121ff795", + "version-string": "42-1", + "port-version": 0 + }, + { + "git-tree": "7c1d8d5ec1ee664791e99ce714d946445e43aa38", + "version-string": "42", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/iniparser.json b/externals/vcpkg/versions/i-/iniparser.json new file mode 100755 index 000000000..4e334c1bf --- /dev/null +++ b/externals/vcpkg/versions/i-/iniparser.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "4c89c4448c92e7d793775802d4d6cba832af7457", + "version-string": "2020-04-06", + "port-version": 2 + }, + { + "git-tree": "203982e2f00de4e77024c34486cae13d34c15779", + "version-string": "2020-04-06", + "port-version": 1 + }, + { + "git-tree": "81d9ca94f32e83d70012e4627f27f54d123a0a0b", + "version-string": "2020-04-06", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/inja.json b/externals/vcpkg/versions/i-/inja.json new file mode 100755 index 000000000..451bc0405 --- /dev/null +++ b/externals/vcpkg/versions/i-/inja.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "9435743a06369f745532f07b596e04481a4758a7", + "version": "3.3.0", + "port-version": 0 + }, + { + "git-tree": "9cd8994caab379ca93bdd59e7fc652414900ee72", + "version-string": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "75912f4f1a231ef59ced49def181169f33b3b336", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "b80103ab74a87444ee0a060212d65df97155d8a5", + "version-string": "2.1.0-1", + "port-version": 0 + }, + { + "git-tree": "388b764d358618d1feeec3d828d03ab0f8766600", + "version-string": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "3862efbee55c27b8c037cd7d39992e414264b726", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/intel-ipsec.json b/externals/vcpkg/versions/i-/intel-ipsec.json new file mode 100755 index 000000000..877844428 --- /dev/null +++ b/externals/vcpkg/versions/i-/intel-ipsec.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "fd3b71153cb4510e0de7475975f85bbbe41e9747", + "version": "1.1", + "port-version": 0 + }, + { + "git-tree": "39c4caebc1d5e618dcc455c9b7accb7fb2693f39", + "version-string": "0.52", + "port-version": 2 + }, + { + "git-tree": "e6218e69e9ba8c71aecd1c41184edd4e0342120b", + "version-string": "0.52-1", + "port-version": 0 + }, + { + "git-tree": "aa4b531f331e2517c48232174a7264fba93aee40", + "version-string": "0.52", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/intel-mkl.json b/externals/vcpkg/versions/i-/intel-mkl.json new file mode 100755 index 000000000..1c5ffb0ef --- /dev/null +++ b/externals/vcpkg/versions/i-/intel-mkl.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "f2d5b828df130d8b1106aa0c076eb9cb79e50ea9", + "version": "2020.0.0", + "port-version": 2 + }, + { + "git-tree": "1f91c30839fe3222faa4c81d978ae4f52f61a1df", + "version-string": "2020.0.0", + "port-version": 1 + }, + { + "git-tree": "27543f95c3c01ee6993990c80b06217a1e2dd9fe", + "version-string": "2020.0.0", + "port-version": 0 + }, + { + "git-tree": "3ff310708feb35b18dba4afb080bceed4a8cacc6", + "version-string": "2018.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/intelrdfpmathlib.json b/externals/vcpkg/versions/i-/intelrdfpmathlib.json new file mode 100755 index 000000000..fdeefa02e --- /dev/null +++ b/externals/vcpkg/versions/i-/intelrdfpmathlib.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "47e6c0bf433235a53c450a3c1c61388a10a643e0", + "version-string": "20U2", + "port-version": 4 + }, + { + "git-tree": "b105f0256b4fccc53e7653a732dc65459e1d8562", + "version-string": "20U2", + "port-version": 3 + }, + { + "git-tree": "089f42e2cae01699241dca4ebe6bbae95300d0f7", + "version-string": "20U2", + "port-version": 2 + }, + { + "git-tree": "5e8cca9f7fc31ea5bce8603c546c4b5953e666e3", + "version-string": "20U2-1", + "port-version": 0 + }, + { + "git-tree": "3b433269a9ffcd198c649ea540ad09cd6d9143f1", + "version-string": "20U2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/io2d.json b/externals/vcpkg/versions/i-/io2d.json new file mode 100755 index 000000000..a6c53b3c8 --- /dev/null +++ b/externals/vcpkg/versions/i-/io2d.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "281370843416f78e7c715a85db1b5754253b38ed", + "version-date": "2020-09-14", + "port-version": 3 + }, + { + "git-tree": "b2307aa077fedc3960898d59e9512416be69d25f", + "version-date": "2020-09-14", + "port-version": 2 + }, + { + "git-tree": "4e68bb018148f239aaccd4bfbc24f6a60c344cd6", + "version-string": "2020-09-14", + "port-version": 1 + }, + { + "git-tree": "91cc7821caf7005c8278881d50e2ac0db64c3572", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "852b25826fd9ea9a34309b6d7c1d1c2b3fc98cf2", + "version-string": "2019-07-11", + "port-version": 3 + }, + { + "git-tree": "2b471bdf3f3281940a8528068e765d70d07bf873", + "version-string": "2019-07-11-2", + "port-version": 0 + }, + { + "git-tree": "77c473223ab74f5af1cea5dfb949c08783985dc6", + "version-string": "2019-07-11-1", + "port-version": 0 + }, + { + "git-tree": "8ce3a9ee4d67a2fd565364929d2c5082f4441e5e", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "cb46a7b697570a239cf0efdce0877217f2597bd2", + "version-string": "0.1-2", + "port-version": 0 + }, + { + "git-tree": "678f38738365fbd37333ddc595306531af64c40e", + "version-string": "0.1-1", + "port-version": 0 + }, + { + "git-tree": "fc40cf0987580dc4e8f889b026d8b8000b45eb94", + "version-string": "0.1", + "port-version": 0 + }, + { + "git-tree": "647662b29982a3ce83ae028fcaf0704f58273fa3", + "version-string": "0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/irrlicht.json b/externals/vcpkg/versions/i-/irrlicht.json new file mode 100755 index 000000000..39261a9df --- /dev/null +++ b/externals/vcpkg/versions/i-/irrlicht.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "a824dffa239fccbb9b780c9926c91f1a25d000df", + "version-string": "1.8.4", + "port-version": 13 + }, + { + "git-tree": "fd24be00084e5387a0ae764c42621977340ec74b", + "version-string": "1.8.4", + "port-version": 12 + }, + { + "git-tree": "18ae08d6099b5457ccedbdb7209c79321a9e9027", + "version-string": "1.8.4", + "port-version": 11 + }, + { + "git-tree": "e2b2dd836e693401dab067c5064665e926a46b07", + "version-string": "1.8.4-10", + "port-version": 0 + }, + { + "git-tree": "214feb3c3310a1698e7e82607a275ce3e172d5e5", + "version-string": "1.8.4-8", + "port-version": 0 + }, + { + "git-tree": "36f2a0f205529376895d5165c8a60f817c414f59", + "version-string": "1.8.4-5", + "port-version": 0 + }, + { + "git-tree": "0bd5929ddb43fa2a977224ce6f514ba78fb1a9dd", + "version-string": "1.8.4-4", + "port-version": 0 + }, + { + "git-tree": "05b8bacdac66bca9f29e765c58dd145fd332a1cf", + "version-string": "1.8.4-3", + "port-version": 0 + }, + { + "git-tree": "0775696b834a2840bc5ec929d39d65ae594b97e4", + "version-string": "1.8.4-2", + "port-version": 0 + }, + { + "git-tree": "ebcdea29e03e637fc9ec3fc8dac045d8add222ad", + "version-string": "1.8.4-1", + "port-version": 0 + }, + { + "git-tree": "f84c9a919ea47d49acf582939c0a9ba8ac2938f9", + "version-string": "1.8.4-2", + "port-version": 0 + }, + { + "git-tree": "ebcdea29e03e637fc9ec3fc8dac045d8add222ad", + "version-string": "1.8.4-1", + "port-version": 0 + }, + { + "git-tree": "02461562e2716e368fddd855b65e60667790d3bb", + "version-string": "1.8.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/irrxml.json b/externals/vcpkg/versions/i-/irrxml.json new file mode 100755 index 000000000..a5d182df8 --- /dev/null +++ b/externals/vcpkg/versions/i-/irrxml.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "3bce4522729dab80e9a91571a9b772ac05970974", + "version-string": "0", + "port-version": 0 + }, + { + "git-tree": "548c76d57b56bcacb45677c91ea7d7fae291a153", + "version-string": "1.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/isal.json b/externals/vcpkg/versions/i-/isal.json new file mode 100755 index 000000000..bb1ef772d --- /dev/null +++ b/externals/vcpkg/versions/i-/isal.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "35b65a5fbb2ff6cd6468e1c02565a4b999d2a442", + "version-string": "2.25.0", + "port-version": 1 + }, + { + "git-tree": "f9c47ffd781134319b28b1d671347fac65d5e1dc", + "version-string": "2.25.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/ismrmrd.json b/externals/vcpkg/versions/i-/ismrmrd.json new file mode 100755 index 000000000..d79debc56 --- /dev/null +++ b/externals/vcpkg/versions/i-/ismrmrd.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "1754617a629b83fa0cec28903f26187b62b0d4fd", + "version": "1.5.0", + "port-version": 2 + }, + { + "git-tree": "5ede8c3ffaae84ba2f4f68f495a23adedb60bd00", + "version-string": "1.5.0", + "port-version": 1 + }, + { + "git-tree": "b538acb7e61aa1697c9ccb7d415287807d5aa37c", + "version-string": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "7cfae251706c88b4b3877e6af56df68bb24224a7", + "version-string": "1.4.2", + "port-version": 0 + }, + { + "git-tree": "865bc5131b32b891d5935f3a89c555a741f55d1f", + "version-string": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "90c5328457a9cb1185c2d006e0d2b40346e60a31", + "version-string": "1.4.0-1", + "port-version": 0 + }, + { + "git-tree": "d9b55ce6641a2a67226e2883734a397528af6bc6", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "5d01aef6016d43978ae1efa9d1d8c2d3f9f60934", + "version-string": "1.4", + "port-version": 0 + }, + { + "git-tree": "9c90d3f09c4742853e2b2f955dc50bc5bde6e033", + "version-string": "1.3.2-4", + "port-version": 0 + }, + { + "git-tree": "e31343f4e14583e026ca45c0ac19027dc726ebdf", + "version-string": "1.3.2-3", + "port-version": 0 + }, + { + "git-tree": "dfe1b6af0cbfa6117a02cc1c02f45642c1bb0094", + "version-string": "1.3.2-2", + "port-version": 0 + }, + { + "git-tree": "fba58156c09047674fdb6ca717468e8d220604e9", + "version-string": "1.3.2-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/itk.json b/externals/vcpkg/versions/i-/itk.json new file mode 100755 index 000000000..7b63c922b --- /dev/null +++ b/externals/vcpkg/versions/i-/itk.json @@ -0,0 +1,124 @@ +{ + "versions": [ + { + "git-tree": "21beac1c375ce633f869566345d7418849633c3e", + "version": "5.2.1", + "port-version": 1 + }, + { + "git-tree": "8d67caa9e2fb41246a3baebbfaccc8f0aff51223", + "version": "5.2.1", + "port-version": 0 + }, + { + "git-tree": "ce0e8cb19f661a4bb4aabde6b87b7bca5025be9e", + "version-semver": "5.1.0", + "port-version": 7 + }, + { + "git-tree": "250af7e974af49d5e1c1f64c5ca1c1e3a1fbc5f6", + "version-semver": "5.1.0", + "port-version": 6 + }, + { + "git-tree": "58ababb668655a11289755a8069265656a2758f4", + "version-string": "5.1.0", + "port-version": 5 + }, + { + "git-tree": "4b551e8e3eb90bd91b1ef4c8a3d7752cd68c0668", + "version-string": "5.1.0", + "port-version": 4 + }, + { + "git-tree": "a4aea76049da93ddba68eda5ccd7c2094e4264af", + "version-string": "5.1.0", + "port-version": 3 + }, + { + "git-tree": "c268e0c8812635eeb8df59808b778638292f4539", + "version-string": "5.1.0", + "port-version": 2 + }, + { + "git-tree": "7d490c687984dde84fa205416aebfd0e31564a3b", + "version-string": "5.1.0", + "port-version": 1 + }, + { + "git-tree": "0dd87e9848ef56e8569d3ef7dd7a3f4a9de85073", + "version-string": "5.1.0", + "port-version": 0 + }, + { + "git-tree": "cc6dba1e1b011c907201d3c3b01d783c178e32a3", + "version-string": "5.0.1-2", + "port-version": 0 + }, + { + "git-tree": "ccabd07264313f234ce86a6f300a0e7ac1564fa3", + "version-string": "5.0.1-1", + "port-version": 0 + }, + { + "git-tree": "0fdc3e414c5cc8e0e79220feccb35fd14fdb75be", + "version-string": "5.0.1", + "port-version": 0 + }, + { + "git-tree": "2b6b243eed0257c1fb08e1318e427e888860e57e", + "version-string": "5.0.0-3", + "port-version": 0 + }, + { + "git-tree": "0d7fba0a8bb65a7d3f90004d26ac3220350fdaef", + "version-string": "5.0.0-2", + "port-version": 0 + }, + { + "git-tree": "7a5d963e4ead61b7a4b5d7e1d577a516748b98f8", + "version-string": "5.0.0-1", + "port-version": 0 + }, + { + "git-tree": "20be76f9d18a952ddfb4c7ceb8c1092803760335", + "version-string": "4.13.0-906736bd-3", + "port-version": 0 + }, + { + "git-tree": "2ee62fb16093a1481636bff86ee4ca1dfaab7a44", + "version-string": "4.13.0-906736bd-2", + "port-version": 0 + }, + { + "git-tree": "e0522272fa57beab857fd57b3731c97f9dc52b6d", + "version-string": "4.13.0-906736bd-1", + "port-version": 0 + }, + { + "git-tree": "1bbabee8abf1981726361ec948654719ce07c27f", + "version-string": "4.13.0-906736bd", + "port-version": 0 + }, + { + "git-tree": "217acc2e7cc7e2d7b363c033f260eefd958d00af", + "version-string": "4.13.0-2", + "port-version": 0 + }, + { + "git-tree": "46404bb7990cf052e93c320769340b4466eec9e9", + "version-string": "4.13.0-1", + "port-version": 0 + }, + { + "git-tree": "a04487ae400cb649609416dcef79ffd1c20aa36e", + "version-string": "4.13.0", + "port-version": 0 + }, + { + "git-tree": "ea15dcd3120e3b85f9677fd5ca9438ef8744b187", + "version-string": "4.11.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/itpp.json b/externals/vcpkg/versions/i-/itpp.json new file mode 100755 index 000000000..9c7418be6 --- /dev/null +++ b/externals/vcpkg/versions/i-/itpp.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "be87bf8b58b5f6b0fb3f19dfc14acf24114332d0", + "version-semver": "4.3.1", + "port-version": 8 + }, + { + "git-tree": "e10390b026b73c352e32bdf11ea58230a7e51d53", + "version-semver": "4.3.1", + "port-version": 7 + }, + { + "git-tree": "ef6b3ce5f6b2522df8dc27959244a73581a44b6d", + "version-semver": "4.3.1", + "port-version": 6 + }, + { + "git-tree": "9a79efa802d935151cca213146c0a7102ca76940", + "version-string": "4.3.1-5", + "port-version": 0 + }, + { + "git-tree": "11ec45e6f2f25e8723a0d788d0b06c27a5c16989", + "version-string": "4.3.1-3", + "port-version": 0 + }, + { + "git-tree": "3902e0b597340ec836cc90bbc08df1eac5b62a6a", + "version-string": "4.3.1-2", + "port-version": 0 + }, + { + "git-tree": "7ff2f80a167386456bc2a5bec3ecf2a344c0fb76", + "version-string": "4.3.1-1", + "port-version": 0 + }, + { + "git-tree": "2e3ee167bd02ce3fee3e909393c9c5eabe060f06", + "version-string": "4.3.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/i-/ixwebsocket.json b/externals/vcpkg/versions/i-/ixwebsocket.json new file mode 100755 index 000000000..622ecc161 --- /dev/null +++ b/externals/vcpkg/versions/i-/ixwebsocket.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "35c2086eecc92cd95482b875fd1ec843eb233f94", + "version-semver": "11.4.2", + "port-version": 0 + }, + { + "git-tree": "59a791c16bb7cf163c801d50013cafd8ae9b94a7", + "version-semver": "11.3.3", + "port-version": 0 + }, + { + "git-tree": "23fff75b15231882eb9461ff479a9f6edba3a450", + "version-semver": "11.2.6", + "port-version": 0 + }, + { + "git-tree": "0336e4a81f542016fe13d812309384502c91d939", + "version-semver": "11.2.3", + "port-version": 0 + }, + { + "git-tree": "33b7e643eb40d7924d1210e1ce7d1a597281deb8", + "version-semver": "11.0.4", + "port-version": 1 + }, + { + "git-tree": "582194408bcd77d15880e2f7e7c1658c0c91310d", + "version-string": "11.0.4", + "port-version": 0 + }, + { + "git-tree": "4b25c213cbcb5f8cb7ef17ba70ac49a1a6de9a72", + "version-string": "9.6.2", + "port-version": 0 + }, + { + "git-tree": "125417e190c512c7e02b4820f3d50480770ebd4c", + "version-string": "9.1.9", + "port-version": 0 + }, + { + "git-tree": "7009199428ab10c20efc7f8b832331b1a0c8e747", + "version-string": "8.0.5", + "port-version": 0 + }, + { + "git-tree": "cf046aab784dfa34ca32fc11ab83a22d864f19a9", + "version-string": "7.9.2", + "port-version": 0 + }, + { + "git-tree": "ab69a198c1dad40bd979fe5db963525e17c70669", + "version-string": "7.4.0", + "port-version": 0 + }, + { + "git-tree": "234ca13a12b0f657cc2c7e57a40ee360c499eb84", + "version-string": "6.1.0", + "port-version": 0 + }, + { + "git-tree": "e3cd56a6479567b8deb12dc447cb6bb56f655bba", + "version-string": "5.0.4", + "port-version": 0 + }, + { + "git-tree": "8c8f4e328828a8c78a19081dd40afa57c9b5c566", + "version-string": "4.0.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/j-/jack2.json b/externals/vcpkg/versions/j-/jack2.json new file mode 100755 index 000000000..a3105dccd --- /dev/null +++ b/externals/vcpkg/versions/j-/jack2.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "84f683fbf07cae4c021f1d0d5fd5cab7b58d991e", + "version-semver": "1.9.21", + "port-version": 0 + }, + { + "git-tree": "f5494181c269f8b65a26fd702664bfde1a3f2e3f", + "version-semver": "1.9.19", + "port-version": 1 + }, + { + "git-tree": "408805b50757c6f3e5585ca5fddf17df005dfb58", + "version-semver": "1.9.19", + "port-version": 0 + }, + { + "git-tree": "a97592cbcb8260d6cae738bf5542f5895195c91b", + "version-string": "1.9.14", + "port-version": 0 + }, + { + "git-tree": "58530de1da4318e0265e6cc6fc8a422b7d981fee", + "version-string": "1.9.12-2", + "port-version": 0 + }, + { + "git-tree": "8124759e6e0d48f443809538774bba0adfdbfa2d", + "version-string": "1.9.12-1", + "port-version": 0 + }, + { + "git-tree": "b41c90b65c7f99bcc2b2a7aea29f98f596d8eaac", + "version-string": "1.9.12", + "port-version": 0 + }, + { + "git-tree": "f3c04cf56cfbecd5862a14f3f0dfcda1db8628f7", + "version-string": "1.9.12.2", + "port-version": 0 + }, + { + "git-tree": "cfe84a700280cc1e35c16bcf3b1a847871fac25b", + "version-string": "1.9.12.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/j-/jaeger-client-cpp.json b/externals/vcpkg/versions/j-/jaeger-client-cpp.json new file mode 100755 index 000000000..aa48ff581 --- /dev/null +++ b/externals/vcpkg/versions/j-/jaeger-client-cpp.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "8a329e81cae8c0e9f5dc9c0f9921c3a1e2db706d", + "version-semver": "0.7.0", + "port-version": 1 + }, + { + "git-tree": "7b0bbe0b96ee8a4f4bffc825ada7b9c713468307", + "version-semver": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "66b3f5f6f74acba54c8ab222118d0ae91a726299", + "version-string": "0.5.1-1", + "port-version": 0 + }, + { + "git-tree": "0aaed008f2209dcf4dd6b3d1f44d30320e5f4e41", + "version-string": "0.5.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/j-/jansson.json b/externals/vcpkg/versions/j-/jansson.json new file mode 100755 index 000000000..50a364af9 --- /dev/null +++ b/externals/vcpkg/versions/j-/jansson.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "f284c9aba6b994cb6fe175b675976d34257b4c85", + "version": "2.14", + "port-version": 1 + }, + { + "git-tree": "1a5c55feab368e4bfb40be993b9ea5a39fc82f51", + "version": "2.14", + "port-version": 0 + }, + { + "git-tree": "f63fad0d7e1e2a98826543c3b1f671c34b104a72", + "version-string": "2.13.1", + "port-version": 2 + }, + { + "git-tree": "e03158776f244589d6af861b4ceefabd4cd9fd12", + "version-string": "2.13.1", + "port-version": 1 + }, + { + "git-tree": "73e4996b95f57b891a1c4a85cd579297a55ac148", + "version-string": "2.13.1", + "port-version": 0 + }, + { + "git-tree": "b9abe1e8d0e3ba2909d4f38ad609efc2788aa44b", + "version-string": "2.12-1", + "port-version": 0 + }, + { + "git-tree": "2e471e8a19dcebef0b4b509d0544b6adc1492cea", + "version-string": "2.12", + "port-version": 0 + }, + { + "git-tree": "716161fc094b6f664ac4e6bb32f6618c205268ec", + "version-string": "2.11-2", + "port-version": 0 + }, + { + "git-tree": "5fa6027a192e9e5d9b2caf2f1a120591d00e0b51", + "version-string": "2.11", + "port-version": 0 + }, + { + "git-tree": "0c2aef0c66564e632b25d756b066d07103bd5e32", + "version-string": "2.10-1", + "port-version": 0 + }, + { + "git-tree": "81a840970f4c7ee50becc01b7a2f582394e5123c", + "version-string": "v2.10-1", + "port-version": 0 + }, + { + "git-tree": "a8ce624d53c0457c809d5c9d77628daacf55ebc7", + "version-string": "v2.10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/j-/jasper.json b/externals/vcpkg/versions/j-/jasper.json new file mode 100755 index 000000000..00ce7cf1e --- /dev/null +++ b/externals/vcpkg/versions/j-/jasper.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "caf8b5e479138be21f8a7782806e9ef5c1dcdb37", + "version": "2.0.33", + "port-version": 3 + }, + { + "git-tree": "59d44227795e2e5e31a0f3e327832e4013b1e255", + "version": "2.0.33", + "port-version": 2 + }, + { + "git-tree": "6fc7475e9c22dafb473c98e00136e89c03ad8f5b", + "version": "2.0.33", + "port-version": 1 + }, + { + "git-tree": "c00bfcf7f17b8ba6db6ee5e62ac379902bbba96f", + "version": "2.0.33", + "port-version": 0 + }, + { + "git-tree": "042e508623cae7cb25924aff2544acf360aa9862", + "version-string": "2.0.20", + "port-version": 0 + }, + { + "git-tree": "53b10ecaa80fe182a41050e74c566a6c6b5aefba", + "version-string": "2.0.16-3", + "port-version": 0 + }, + { + "git-tree": "99e15f5937aaebd24a386d3aba62a7988d00d789", + "version-string": "2.0.16-2", + "port-version": 0 + }, + { + "git-tree": "5828058f77a0213d445c25c7f48ff0b75a612675", + "version-string": "2.0.16-1", + "port-version": 0 + }, + { + "git-tree": "7be0370602c65bf60119a0cfa2c50784679b3e07", + "version-string": "2.0.16", + "port-version": 0 + }, + { + "git-tree": "fe821bd8499cca24169a20ff586485bc1d487a5c", + "version-string": "2.0.14-1", + "port-version": 0 + }, + { + "git-tree": "4a18f214f5a8cbf718745a57a09da5b04a725918", + "version-string": "2.0.13-1", + "port-version": 0 + }, + { + "git-tree": "65939e1191cc0cbef59d94e15b7bdfaf9db20d10", + "version-string": "2.0.13", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/j-/jbig2dec.json b/externals/vcpkg/versions/j-/jbig2dec.json new file mode 100755 index 000000000..7fbff5da5 --- /dev/null +++ b/externals/vcpkg/versions/j-/jbig2dec.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "e60aa2c30fefe1269d1d8a6fede748cfa5736aed", + "version-string": "0.19", + "port-version": 1 + }, + { + "git-tree": "055013875225acf1e33c26a6c127f5d89ccb0583", + "version-string": "0.19", + "port-version": 0 + }, + { + "git-tree": "1fb2623dc417a1c907cb43de0f226f5c8314595a", + "version-string": "0.17", + "port-version": 0 + }, + { + "git-tree": "afbda476255a8de7705f284e1539fbee63c20d71", + "version-string": "0.16-1", + "port-version": 0 + }, + { + "git-tree": "3989bb1cf3350ec7f06fb55e056124809f48d17e", + "version-string": "0.16", + "port-version": 0 + }, + { + "git-tree": "5283bf24807d465b455cf2629e8fa5eac7e39c96", + "version-string": "0.13", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/j-/jbigkit.json b/externals/vcpkg/versions/j-/jbigkit.json new file mode 100755 index 000000000..242ea13a0 --- /dev/null +++ b/externals/vcpkg/versions/j-/jbigkit.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "fa2f967c15904877cd541d3c9d59f0c2f20f3fb4", + "version-string": "2.1", + "port-version": 5 + }, + { + "git-tree": "540956fe79520b0ffd46dea73e33d1dfe12da22a", + "version-string": "2.1-4", + "port-version": 0 + }, + { + "git-tree": "da3de318445901bae43c0997dbeb64657fbff3ed", + "version-string": "2.1-3", + "port-version": 0 + }, + { + "git-tree": "7adb6a445ffd72a81d43b0e8feb4cad44d25c964", + "version-string": "2.1-2", + "port-version": 0 + }, + { + "git-tree": "f42860e0b08002012bc6452f505457713062cef6", + "version-string": "2.1-1", + "port-version": 0 + }, + { + "git-tree": "828dbab825dafcb193e08b05cd1276e6a936b832", + "version-string": "2.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/j-/jemalloc.json b/externals/vcpkg/versions/j-/jemalloc.json new file mode 100755 index 000000000..a27e65c4c --- /dev/null +++ b/externals/vcpkg/versions/j-/jemalloc.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "0ced62e7a268f8442b2e808df7b094afe8998c38", + "version-string": "4.3.1", + "port-version": 5 + }, + { + "git-tree": "4c72c8aa2b715c813c70850c504385afa6566fb1", + "version-string": "4.3.1-4", + "port-version": 0 + }, + { + "git-tree": "6ca1bb571746cc86c33cb8c6e12d1ecb1cd61519", + "version-string": "4.3.1-3", + "port-version": 0 + }, + { + "git-tree": "29287e22870cc0a7d1de3f0e48a447142de2e69b", + "version-string": "4.3.1-2", + "port-version": 0 + }, + { + "git-tree": "c891201e16769ffb710da9a9451fe1a43932d361", + "version-string": "4.3.1-1", + "port-version": 0 + }, + { + "git-tree": "8a438060232d3745e251174691a68771ba52b7cb", + "version-string": "4.3.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/j-/jinja2cpplight.json b/externals/vcpkg/versions/j-/jinja2cpplight.json new file mode 100755 index 000000000..8adffeb62 --- /dev/null +++ b/externals/vcpkg/versions/j-/jinja2cpplight.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "14ce844353cb5d4b2dbca4d36daf84c248208de2", + "version-string": "2018-05-08", + "port-version": 1 + }, + { + "git-tree": "4db482fab578e61193f3a03e4acc4086b23ae550", + "version-string": "2018-05-08", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/j-/josuttis-jthread.json b/externals/vcpkg/versions/j-/josuttis-jthread.json new file mode 100755 index 000000000..34c83ced9 --- /dev/null +++ b/externals/vcpkg/versions/j-/josuttis-jthread.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "5f37dd21a591e8f7ae566f16a085a10dbfe1ccbc", + "version-string": "2020-07-21", + "port-version": 2 + }, + { + "git-tree": "f262637ae76fc0ab9c01f475af0b7a87e552a512", + "version-string": "2020-07-21", + "port-version": 1 + }, + { + "git-tree": "17d080ed1a3c86adb3a7d75d4a42543bbc170ce5", + "version-string": "2020-07-21", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/j-/jsmn.json b/externals/vcpkg/versions/j-/jsmn.json new file mode 100755 index 000000000..9f3ba75be --- /dev/null +++ b/externals/vcpkg/versions/j-/jsmn.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "b05c2b522963eeacbcfcad169cf5ffc802bc7a42", + "version-string": "2019-04-27", + "port-version": 1 + }, + { + "git-tree": "3de21d0cde92d319d3f0638abed14af414a57cfe", + "version-string": "2019-04-27", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/j-/json-c.json b/externals/vcpkg/versions/j-/json-c.json new file mode 100755 index 000000000..34a233e6d --- /dev/null +++ b/externals/vcpkg/versions/j-/json-c.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "5c8d00d59a40b54cc9400f045b62e439740c2909", + "version-string": "2019-09-10", + "port-version": 2 + }, + { + "git-tree": "46d6f0302fe2ee6649ade0a8ef9a17a88226bc73", + "version-string": "2019-09-10", + "port-version": 1 + }, + { + "git-tree": "e3fbc03becb35cdc7f395d7525774a86e513d2ba", + "version-string": "2019-09-10", + "port-version": 0 + }, + { + "git-tree": "49ce4ed91d7d04f68582447f35b016e107c2772b", + "version-string": "2019-05-31", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/j-/json-dto.json b/externals/vcpkg/versions/j-/json-dto.json new file mode 100755 index 000000000..80ba6b3a8 --- /dev/null +++ b/externals/vcpkg/versions/j-/json-dto.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "39f955915ba68ad247df8963e6427bd3c0f3479a", + "version": "0.3.1", + "port-version": 0 + }, + { + "git-tree": "87cb384a3c0b77cf96d77ea95e22f1e9051cb19d", + "version": "0.3.0", + "port-version": 0 + }, + { + "git-tree": "83c0ba869841555aeff8eb4954efcc64ae25a755", + "version": "0.2.15", + "port-version": 0 + }, + { + "git-tree": "171dd3158b291f899517b1bab85f4c76c95a4d56", + "version": "0.2.14", + "port-version": 0 + }, + { + "git-tree": "a4576b8566a843cf16e9a38143d1a99ae832d130", + "version": "0.2.13", + "port-version": 0 + }, + { + "git-tree": "9a981571e3da6bf7df6ad44cb3ee5f816134c5f9", + "version": "0.2.12", + "port-version": 0 + }, + { + "git-tree": "752a985f24b4f8cdf068838ae1b791ea46ab7add", + "version-string": "0.2.11", + "port-version": 0 + }, + { + "git-tree": "0c24513fd9141f8cdff91adeaf1227a5de222229", + "version-string": "0.2.10", + "port-version": 0 + }, + { + "git-tree": "c73ab40f6430852ab78a07c559fb63b76a26d631", + "version-string": "0.2.9.2", + "port-version": 0 + }, + { + "git-tree": "3e7a07ec38a1d71c429e8503ffbf8bac3cfc1691", + "version-string": "0.2.9.1", + "port-version": 0 + }, + { + "git-tree": "531c3a1ef0c63e2754b66547c238fa19f6d3c030", + "version-string": "0.2.9", + "port-version": 0 + }, + { + "git-tree": "7d1ae2cb6d4dbbbdbb6c79bd98967016bbafd7da", + "version-string": "0.2.8-2", + "port-version": 0 + }, + { + "git-tree": "921ec8586dde43aa999e6022eed308266be368ac", + "version-string": "0.2.8", + "port-version": 0 + }, + { + "git-tree": "a3abc3267fed9b3eafe470e146f9ef3cb9196d81", + "version-string": "0.2.6", + "port-version": 0 + }, + { + "git-tree": "7a71ce0f2a7333f2d10da7b00067f7fd208a8762", + "version-string": "0.2.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/j-/json-schema-validator.json b/externals/vcpkg/versions/j-/json-schema-validator.json new file mode 100755 index 000000000..fa7552a06 --- /dev/null +++ b/externals/vcpkg/versions/j-/json-schema-validator.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "361dde90ee9e81d84ad0e87d75f16e4f9f662b88", + "version-string": "2.1.0", + "port-version": 1 + }, + { + "git-tree": "c29f43fd54762287049c24e4e38cd89a26a1a26a", + "version-string": "2.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/j-/json-spirit.json b/externals/vcpkg/versions/j-/json-spirit.json new file mode 100755 index 000000000..8fb1586f2 --- /dev/null +++ b/externals/vcpkg/versions/j-/json-spirit.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "d219034cdee1f6237e4863a001aece539df2ce8c", + "version-string": "4.1.0", + "port-version": 2 + }, + { + "git-tree": "ab05cd4ea6726e65c8a2ab5a4c882d9e4f166418", + "version-string": "4.1.0-1", + "port-version": 0 + }, + { + "git-tree": "75c6a4525695966d71d372ed2dbd7cb1ae46b292", + "version-string": "4.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/j-/json11.json b/externals/vcpkg/versions/j-/json11.json new file mode 100755 index 000000000..688a24f27 --- /dev/null +++ b/externals/vcpkg/versions/j-/json11.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "b99e54cd236396200e19e414a7375d0463d5ba5a", + "version-string": "2017-06-20", + "port-version": 4 + }, + { + "git-tree": "d1c9cec8f84522bd1bb53aae81708000ef8952de", + "version-string": "2017-06-20", + "port-version": 3 + }, + { + "git-tree": "0acd544fac745b898132e7beda2ede37b0a7d9d4", + "version-string": "2017-06-20-2", + "port-version": 0 + }, + { + "git-tree": "ece654bec0773a219162156344ca958b06e07bfa", + "version-string": "2017-06-20-1", + "port-version": 0 + }, + { + "git-tree": "cdbd42bb5745e3255b5c365b244e8b4b837bf60c", + "version-string": "2017-06-20", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/j-/json5-parser.json b/externals/vcpkg/versions/j-/json5-parser.json new file mode 100755 index 000000000..4a6728194 --- /dev/null +++ b/externals/vcpkg/versions/j-/json5-parser.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "e874e19b4f9b56647b5be1537ed0792041e96c25", + "version-string": "1.0.0", + "port-version": 3 + }, + { + "git-tree": "a08cd167ddae3c10119b6b513accf0a2fa9d76fa", + "version-string": "1.0.0", + "port-version": 2 + }, + { + "git-tree": "264a4d2a02277ed9bc306bd01abdce3a66d46b63", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "d5f6bbbb7546fa2ca8e4d49ccaaaebd456bb0ecf", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/j-/jsoncons.json b/externals/vcpkg/versions/j-/jsoncons.json new file mode 100755 index 000000000..097a7f1d1 --- /dev/null +++ b/externals/vcpkg/versions/j-/jsoncons.json @@ -0,0 +1,184 @@ +{ + "versions": [ + { + "git-tree": "55d8c58c4275c63e12b3a23413421609cc35ba4e", + "version": "0.168.7", + "port-version": 0 + }, + { + "git-tree": "ee0a71fa7021ce4daf9c225529489e7e1da7f10a", + "version-string": "0.168.3", + "port-version": 1 + }, + { + "git-tree": "ace7d792691e3fadf81394f348f0dce587aa5293", + "version-string": "0.165.0", + "port-version": 1 + }, + { + "git-tree": "fd6b74f34a309e8750a04b5da6a3bf5800503434", + "version-string": "0.165.0", + "port-version": 0 + }, + { + "git-tree": "efd8810eeea9736e6a7b25bb914d959449e75b34", + "version-string": "0.163.3", + "port-version": 0 + }, + { + "git-tree": "452a39645a5177213b2e8e3d5d9c0b2fb2e50c17", + "version-string": "0.163.1", + "port-version": 0 + }, + { + "git-tree": "66597b112e6520b5c0b4fccccb7023a5580de747", + "version-string": "0.163.0", + "port-version": 0 + }, + { + "git-tree": "ad7aa2c6b95e393547c142c07a26e42e6bd9b4e3", + "version-string": "0.162.1", + "port-version": 0 + }, + { + "git-tree": "662642b7a6219f7f9f8ec3b4e094899a8e4f89f6", + "version-string": "0.162.0", + "port-version": 0 + }, + { + "git-tree": "7f782b51f060fe22475a5bb2ae25f91c3ef3f75a", + "version-string": "0.159.0", + "port-version": 0 + }, + { + "git-tree": "61349080fc3b6536083c4a55abcea25996157de3", + "version-string": "0.158.0", + "port-version": 0 + }, + { + "git-tree": "4084ba98deaa8a16272631915675fffbfaa209a8", + "version-string": "0.156.1", + "port-version": 0 + }, + { + "git-tree": "0b16876fd822304fa6aeaeb10b9002625ebf9b95", + "version-string": "0.155.1", + "port-version": 0 + }, + { + "git-tree": "902fbb6c0ceb1c31063507b87624e87167868cb6", + "version-string": "0.154.1", + "port-version": 0 + }, + { + "git-tree": "218c55d3f597cfc8faa60540270f3ea28b054472", + "version-string": "0.153.3", + "port-version": 0 + }, + { + "git-tree": "d7f0f80e6bf95df365deee0c5a7ea89abb61e9b2", + "version-string": "0.153.0", + "port-version": 0 + }, + { + "git-tree": "9f2f4e422039f7b3a3c8d5e56bf1cd1a9736a68a", + "version-string": "0.152.0", + "port-version": 0 + }, + { + "git-tree": "9f7ca282cd4cdf909c751dab5160b2dcd536299b", + "version-string": "0.151.0", + "port-version": 0 + }, + { + "git-tree": "e3e4d5a2e76f2acc6fdacf4b25568febdd747e0a", + "version-string": "0.150.0", + "port-version": 0 + }, + { + "git-tree": "a04adc9c55667427e32959be4a9d85f30a1d88c0", + "version-string": "0.149.0", + "port-version": 0 + }, + { + "git-tree": "b6cfa19a1ef608296cfdd98c98ff6afd2964deec", + "version-string": "0.148.0", + "port-version": 0 + }, + { + "git-tree": "e8f2f18e26a2133c627efd865b4e32ca9ef922da", + "version-string": "0.147.0", + "port-version": 0 + }, + { + "git-tree": "4997e73eafeb89ff4fafa29aae3b6a876e8393b4", + "version-string": "0.146.0", + "port-version": 0 + }, + { + "git-tree": "1c6a339ba502876ec4ee5e1f7403754d02b71f24", + "version-string": "0.144.0", + "port-version": 0 + }, + { + "git-tree": "638f198bed7182af4e744f2c4c090dd60f633853", + "version-string": "0.143.1", + "port-version": 0 + }, + { + "git-tree": "cc47387d635f6aaa174f4b7354a00642b39bd220", + "version-string": "0.140.0", + "port-version": 0 + }, + { + "git-tree": "d54ed303bc59f1032bf792e64cf0a7b641235e3d", + "version-string": "0.139.0", + "port-version": 0 + }, + { + "git-tree": "1e754a8122919350e0a9ca6f7106b047717e9b26", + "version-string": "0.136.1", + "port-version": 0 + }, + { + "git-tree": "ab4b42bf03d82d2fc730609e8160fa3cdd81fc74", + "version-string": "0.136.0", + "port-version": 0 + }, + { + "git-tree": "adeadb0581861985f15974378cf2120403fd8b47", + "version-string": "0.135.0", + "port-version": 0 + }, + { + "git-tree": "68ba70f62abec012d9133ff6b912dc4b2e76c53e", + "version-string": "0.134.0", + "port-version": 0 + }, + { + "git-tree": "cd20252f653bef48bb207431c70d9e6bca3cd9c0", + "version-string": "0.133.0", + "port-version": 0 + }, + { + "git-tree": "9f203ebb05b5fad08db586d93bf036777732063f", + "version-string": "0.132.1", + "port-version": 0 + }, + { + "git-tree": "312bda521fb06202e8c87bf1917f9b3f488e66cb", + "version-string": "0.131.2", + "port-version": 0 + }, + { + "git-tree": "79a92c2c2de09c30e3beb8b8295f1054849f3084", + "version-string": "0.125.0", + "port-version": 0 + }, + { + "git-tree": "f0ece43d031668e227755270f20ac64593e47af0", + "version-string": "v0.122.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/j-/jsoncpp.json b/externals/vcpkg/versions/j-/jsoncpp.json new file mode 100755 index 000000000..ca8db9323 --- /dev/null +++ b/externals/vcpkg/versions/j-/jsoncpp.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "ee92c743e235ebd2eda342c656704f20a329bda9", + "version": "1.9.5", + "port-version": 0 + }, + { + "git-tree": "444e56d175225f268ea77433982e81ef131a6d1d", + "version-string": "1.9.4", + "port-version": 1 + }, + { + "git-tree": "cb9fceddf47584c7fda24180c7fd87f5e83728a5", + "version-string": "1.9.4", + "port-version": 0 + }, + { + "git-tree": "0e04cc7a3ef97b0742831a1a07563f7662ffcf25", + "version-string": "1.9.2", + "port-version": 0 + }, + { + "git-tree": "25ee221b5b782b89f82cf6b086a8d97821b68e21", + "version-string": "1.9.1", + "port-version": 0 + }, + { + "git-tree": "6a441d5ff8a74682e52f59195c06b6f03a376fe8", + "version-string": "1.8.4-1", + "port-version": 0 + }, + { + "git-tree": "a3b0ef3cca8658c25638bb9eee41f59aace59c88", + "version-string": "1.8.4", + "port-version": 0 + }, + { + "git-tree": "71306c999a0b6fa75ecb0820f52ed6d50ec19cc6", + "version-string": "1.8.1-1", + "port-version": 0 + }, + { + "git-tree": "fb4b687be0b74b621e391f032e5d99fb04afa5dd", + "version-string": "1.8.1", + "port-version": 0 + }, + { + "git-tree": "bef856e09751276ae210d99c248f9921f05b9c1b", + "version-string": "1.7.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/j-/jsonnet.json b/externals/vcpkg/versions/j-/jsonnet.json new file mode 100755 index 000000000..f3dcfe0c2 --- /dev/null +++ b/externals/vcpkg/versions/j-/jsonnet.json @@ -0,0 +1,164 @@ +{ + "versions": [ + { + "git-tree": "24a514c5bcece6b71ac13744ec40f92f285fc689", + "version": "0.17.0", + "port-version": 0 + }, + { + "git-tree": "c6d19c002863644237c3ac276db26c576664f56d", + "version-string": "0.16.0", + "port-version": 3 + }, + { + "git-tree": "53efaebae6e8131ee43960d0d58a5f110298a9c1", + "version-string": "0.16.0", + "port-version": 2 + }, + { + "git-tree": "77e5fa13bd74db46bf2626d82e8b9f88805031b6", + "version-string": "0.16.0", + "port-version": 1 + }, + { + "git-tree": "4f3219678c412acbe3376a7b5c2f28b1dc258210", + "version-string": "0.16.0", + "port-version": 0 + }, + { + "git-tree": "9669063137a04a4d00597575306ccdcde3ef6266", + "version-string": "0.14.0-1", + "port-version": 0 + }, + { + "git-tree": "2992efa68b3f006c6ccd285568cdde6b3e35c491", + "version-string": "0.14.0", + "port-version": 0 + }, + { + "git-tree": "299db58d6da42d0da987860a3bb15bd58043539b", + "version-string": "0.13.0", + "port-version": 0 + }, + { + "git-tree": "19e7201afa3f874bcf1c630ec845ead556aa36a5", + "version-string": "2019-05-08-1", + "port-version": 0 + }, + { + "git-tree": "62bee9189be490390c427c986886ecfaa0386072", + "version-string": "2019-05-08", + "port-version": 0 + }, + { + "git-tree": "0791d0b850c7198468d78c71715e7726863c130c", + "version-string": "2018-11-01-3", + "port-version": 0 + }, + { + "git-tree": "4ca49920377bfcffccc5a8a428db2ba858a4d98a", + "version-string": "2018-11-01-2", + "port-version": 0 + }, + { + "git-tree": "975a0a4a693ebcd589541ecd0f3ffcd1a54085ca", + "version-string": "2018-11-01-1", + "port-version": 0 + }, + { + "git-tree": "61641c09ebb1623cf3736bbf76a32bca22c2b15f", + "version-string": "2018-11-01", + "port-version": 0 + }, + { + "git-tree": "6959ee2a0877f1e53465be144b744a6c5767dddd", + "version-string": "2018-10-25", + "port-version": 0 + }, + { + "git-tree": "56ca54558ad1826c098e261540d074bc5cfe73db", + "version-string": "2018-10-11", + "port-version": 0 + }, + { + "git-tree": "fe27de2e267cc01ed27d3afc8ee0232282f17924", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "0c274c8e83b59ec4018d95d8e3343f71e982e133", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "ff96b573ac990461876231131013e4d471f470c1", + "version-string": "2018-06-28", + "port-version": 0 + }, + { + "git-tree": "9f4924251ebbbc0c4c4aa72fb9f359273fc856c5", + "version-string": "2018-06-15", + "port-version": 0 + }, + { + "git-tree": "9b6a1381b2e987c67acf8f1c28aa8ca1bb4ebc34", + "version-string": "2018-06-12", + "port-version": 0 + }, + { + "git-tree": "991a041db383f56b97a4fd1e0e88a7d0254ada00", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "7321b56b12d95b3102e40b8bdb534f2fc1333db5", + "version-string": "2018-05-01", + "port-version": 0 + }, + { + "git-tree": "5f22d8e1d8d092de191fb376ef4910a944687990", + "version-string": "2018-04-25", + "port-version": 0 + }, + { + "git-tree": "da09f85ffbb9c50b2f91a79b6ba910f7e9056b4b", + "version-string": "2018-04-17", + "port-version": 0 + }, + { + "git-tree": "dcf6d631727ee785d8fa39f8237fc6b2b7d99a65", + "version-string": "2018-04-09", + "port-version": 0 + }, + { + "git-tree": "79a05b2b80c2185d90d869e3a16d3373cdcd7518", + "version-string": "2018-03-17", + "port-version": 0 + }, + { + "git-tree": "0e7f32e7cf3d72cd5a1d604f37c17c302335d54c", + "version-string": "2018-03-11", + "port-version": 0 + }, + { + "git-tree": "b629796a43cae85b0089324dd6954884304b4c21", + "version-string": "2018-03-07", + "port-version": 0 + }, + { + "git-tree": "a7a40fd67aaf72098725b8fdd4678146ac35c3ff", + "version-string": "2018-03-02", + "port-version": 0 + }, + { + "git-tree": "8337ff5d69a1c124d9d5156423e9fa2c91d19fcc", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "79a0019c87befe39c75f827c7c1152dee0de8d95", + "version-string": "2017-09-02-11cf9fa9f2fe8acbb14b096316006082564ca580", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/j-/jwt-cpp.json b/externals/vcpkg/versions/j-/jwt-cpp.json new file mode 100755 index 000000000..a12705fe0 --- /dev/null +++ b/externals/vcpkg/versions/j-/jwt-cpp.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "3d1a0be50079d7774b6807b914518a3028477096", + "version-semver": "0.6.0", + "port-version": 0 + }, + { + "git-tree": "fbec7fade6b949737e531b1e5f57133e592edf96", + "version-semver": "0.5.1", + "port-version": 1 + }, + { + "git-tree": "068be311e2c481a636406216d26d0283768de825", + "version-semver": "0.5.1", + "port-version": 0 + }, + { + "git-tree": "1205d0b1c1db271b04b84e075b21f7b6359effb5", + "version-semver": "0.5.0", + "port-version": 0 + }, + { + "git-tree": "1e179b3f53863faa8b91a74f95cdc1c7526de2c7", + "version-string": "0.4.0", + "port-version": 0 + }, + { + "git-tree": "75d16c5d691b192edc15c8782d3aa593a718d0c7", + "version-string": "2019-05-07-1", + "port-version": 0 + }, + { + "git-tree": "f7e3636cdd3bad87812e22b4535378c47d6dd698", + "version-string": "2019-05-07", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/j-/jxrlib.json b/externals/vcpkg/versions/j-/jxrlib.json new file mode 100755 index 000000000..4995aa67e --- /dev/null +++ b/externals/vcpkg/versions/j-/jxrlib.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "2070ec06331c3cf93574ec82fa22791e3ba6172f", + "version": "2019.10.9", + "port-version": 3 + }, + { + "git-tree": "c24ffcc58c1c28bef405da5b56adad3a25cd441b", + "version-string": "2019.10.9", + "port-version": 2 + }, + { + "git-tree": "50c0a8d9c0ca1df6f7b707f9768bb8d26f1f8486", + "version-string": "2019.10.9-1", + "port-version": 0 + }, + { + "git-tree": "5e43604d8d9fa767e6399c00a7e7ed6e44c02b08", + "version-string": "2019.10.9", + "port-version": 0 + }, + { + "git-tree": "f50863dde2b83c89c893d98e60c388686adac061", + "version-string": "1.1-9", + "port-version": 0 + }, + { + "git-tree": "999cfe6f1c48f0c91f3af714b2c8731e662082fc", + "version-string": "1.1-8", + "port-version": 0 + }, + { + "git-tree": "b6213106728930775efb4d95fe5257c7d5a8f610", + "version-string": "1.1-7", + "port-version": 0 + }, + { + "git-tree": "f52996801e316a3b10cda7831dc081875dfd8802", + "version-string": "1.1-6", + "port-version": 0 + }, + { + "git-tree": "1816f01e0d8c0158cc575e4669b0b66683b420d0", + "version-string": "1.1-5", + "port-version": 0 + }, + { + "git-tree": "d1989568047a5c83db8769bf3848573b4fe92110", + "version-string": "1.1-4", + "port-version": 0 + }, + { + "git-tree": "22d23c08d6f9bba42cc32ea4d89e75c92d90625f", + "version-string": "1.1-3", + "port-version": 0 + }, + { + "git-tree": "ef771a30053c391dc9f468c233a08a9033c1a602", + "version-string": "1.1-2", + "port-version": 0 + }, + { + "git-tree": "c9d1bb84be8e1f6e53512c5c7e890641d22c10ee", + "version-string": "1.1-1", + "port-version": 0 + }, + { + "git-tree": "7df328498c2cd3166876bd8a73c627dc661f5e61", + "version-string": "1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kangaru.json b/externals/vcpkg/versions/k-/kangaru.json new file mode 100755 index 000000000..81bf486ea --- /dev/null +++ b/externals/vcpkg/versions/k-/kangaru.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "b6015882a3de991781c67d93b4c470aafcdd3e2b", + "version": "4.3.0", + "port-version": 0 + }, + { + "git-tree": "e47bf7620670afbcbb349017d71275289fa9b6a9", + "version-string": "4.2.4", + "port-version": 1 + }, + { + "git-tree": "0e379bfb3b7cff7b0702b1118f491397482e2544", + "version-string": "4.2.4", + "port-version": 0 + }, + { + "git-tree": "b6ba61a14ae679db5a0893855b7e80943e9e830d", + "version-string": "4.2.2", + "port-version": 0 + }, + { + "git-tree": "de81d0dc9a47d91d4e05841bd546a06d842ae2d5", + "version-string": "4.2.1", + "port-version": 0 + }, + { + "git-tree": "b86565c1e29920c2dc052bb71e2741165a15ddf4", + "version-string": "4.2.0", + "port-version": 0 + }, + { + "git-tree": "6293545a37fc8620185501a916a1fe744ce7de98", + "version-string": "4.1.3-2", + "port-version": 0 + }, + { + "git-tree": "00872c56152ae294e01b90874f2dff2a07290ad5", + "version-string": "4.1.3-1", + "port-version": 0 + }, + { + "git-tree": "1564b514470d474c56e469924cfc57169a4ca410", + "version-string": "4.1.3", + "port-version": 0 + }, + { + "git-tree": "52ec5fd90ed7acde608ba47c1d1e05a5d19b5c91", + "version-string": "4.1.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kcp.json b/externals/vcpkg/versions/k-/kcp.json new file mode 100755 index 000000000..d72e8f6af --- /dev/null +++ b/externals/vcpkg/versions/k-/kcp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "207f189653fe92e80478cf69c7f115758b1eafe9", + "version": "1.7", + "port-version": 0 + }, + { + "git-tree": "9f3475cb5c05e93e3309e51cb104653bab486eb4", + "version-string": "2019-09-20", + "port-version": 1 + }, + { + "git-tree": "1755ecb14823ef655bd41fa576baebe8ba531d7f", + "version-string": "2019-09-20", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kd-soap.json b/externals/vcpkg/versions/k-/kd-soap.json new file mode 100755 index 000000000..f621fc50c --- /dev/null +++ b/externals/vcpkg/versions/k-/kd-soap.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "64e16ff8d17d3cadb5a951b5b20e15f99b6d82b1", + "version-string": "1.9.0", + "port-version": 1 + }, + { + "git-tree": "c5e3acfc0e624bb672da3ff5681dd2612f676d1e", + "version-string": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "1cff130029961c385d08ce6d783b2c2aa616d65f", + "version-string": "1.8.0-2", + "port-version": 0 + }, + { + "git-tree": "44c2b9403d6761d9d24f699288850f345f8c7d51", + "version-string": "1.8.0-1", + "port-version": 0 + }, + { + "git-tree": "066767d539d3db3147f02673a20733e3b3f42845", + "version-string": "1.8.0", + "port-version": 0 + }, + { + "git-tree": "2d5079e62a1fe1bd8d1ec1116aad6472ae0f1058", + "version-string": "1.7.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kdbindings.json b/externals/vcpkg/versions/k-/kdbindings.json new file mode 100755 index 000000000..fbcc9ef3c --- /dev/null +++ b/externals/vcpkg/versions/k-/kdbindings.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5dc85351398a57c7b222ac7a57952849c327c18b", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kddockwidgets.json b/externals/vcpkg/versions/k-/kddockwidgets.json new file mode 100755 index 000000000..7f3042426 --- /dev/null +++ b/externals/vcpkg/versions/k-/kddockwidgets.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5b5e511f49b28d447aafde193422e3b7961a4e62", + "version": "1.5.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kealib.json b/externals/vcpkg/versions/k-/kealib.json new file mode 100755 index 000000000..a4fe941e3 --- /dev/null +++ b/externals/vcpkg/versions/k-/kealib.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "11878c71d1418c0bdcc380e7ebf8e90f9e563260", + "version": "1.4.14", + "port-version": 0 + }, + { + "git-tree": "cc06088dbd4f6a3bce64af1b452b5ef2543f5b76", + "version-string": "1.4.11-3", + "port-version": 0 + }, + { + "git-tree": "aaacc98bbdefd2f709d65e4d87270cc2dacf283f", + "version-string": "1.4.11-2", + "port-version": 0 + }, + { + "git-tree": "c6d9f2cbbeb950bdac993fa9e949e236add6fb96", + "version-string": "1.4.11-1", + "port-version": 0 + }, + { + "git-tree": "11506cc9b56ac74746bb6fb945e029691be4c764", + "version-string": "1.4.11", + "port-version": 0 + }, + { + "git-tree": "2905dbf3c66f381953c34b33f92f6301154b0798", + "version-string": "1.4.7-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kenlm.json b/externals/vcpkg/versions/k-/kenlm.json new file mode 100755 index 000000000..0ad8159ae --- /dev/null +++ b/externals/vcpkg/versions/k-/kenlm.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "5fd24bb27699940f72b94a9c3cf3e77a7d645a76", + "version-string": "20200924", + "port-version": 1 + }, + { + "git-tree": "a32a36b9ae670a8b20449ec2ef9283a6fbcf1a5e", + "version-string": "20200924", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/keystone.json b/externals/vcpkg/versions/k-/keystone.json new file mode 100755 index 000000000..68b76c7ca --- /dev/null +++ b/externals/vcpkg/versions/k-/keystone.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "f0094b1730f5973d7c3661eec95eb009d1d272b9", + "version-semver": "0.9.2", + "port-version": 2 + }, + { + "git-tree": "34865a7cf3fbcf4f104e8b136862aa8acc1a7ca7", + "version-semver": "0.9.2", + "port-version": 1 + }, + { + "git-tree": "779d3f65bc01be0cfb50208ec50673612154023f", + "version-string": "0.9.2", + "port-version": 0 + }, + { + "git-tree": "bcc14eff2ff2ee0af4d67ed7622a3d3464512f02", + "version-string": "0.9.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5archive.json b/externals/vcpkg/versions/k-/kf5archive.json new file mode 100755 index 000000000..ab9038bb7 --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5archive.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "2eafcdc8cb04d2ec80f9beb89254ca4f74616a07", + "version": "5.89.0", + "port-version": 1 + }, + { + "git-tree": "55574a9d2677a48ae7f69740641f5fdbc5b0e068", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "ac6edcd19fdca524303279786a9b5672a3a05c36", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "c0df48850c0ede4ccb1d73dbe45f433b625120c8", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "1476ac82c0b38d83211053e22afbac2091dab2e3", + "version-semver": "5.84.0", + "port-version": 2 + }, + { + "git-tree": "03f6943556e1d7600443c1f30445560de3f9b2f7", + "version-semver": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "bc7b88da4daf014c751e4ab246a0104d850f5785", + "version": "5.84.0", + "port-version": 0 + }, + { + "git-tree": "9944c9fc2ab20f7c28998fdf7c980cd239ff9b70", + "version": "5.81.0", + "port-version": 0 + }, + { + "git-tree": "4c427a520895326ea450337eb531cb8ed5c7be30", + "version": "5.75.0", + "port-version": 0 + }, + { + "git-tree": "98bfda14e12e6f5468957c379b06fc2cb931ca64", + "version-string": "5.74.0", + "port-version": 1 + }, + { + "git-tree": "1a8119b36b8a6f931e840445dee55d158c28bf78", + "version-string": "5.74.0", + "port-version": 0 + }, + { + "git-tree": "ce1a9d2f4fd9dd301b6c32bb05762ece4c972621", + "version-string": "5.64.0-1", + "port-version": 0 + }, + { + "git-tree": "95fc17e33fea7bd1720697aef5a453b2caa752d1", + "version-string": "5.64.0", + "port-version": 0 + }, + { + "git-tree": "be8352a74c00581ba59413523bf8407cc85200b0", + "version-string": "5.58.0", + "port-version": 0 + }, + { + "git-tree": "436ba1ace19997c9167e67a95c88e7d28d5fdeb6", + "version-string": "5.50.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5attica.json b/externals/vcpkg/versions/k-/kf5attica.json new file mode 100755 index 000000000..65f356aee --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5attica.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "1ef9b989e525f13878a113dcd3ac801efe6d3b7b", + "version": "5.89.0", + "port-version": 1 + }, + { + "git-tree": "7d2b92c0e01ddccefac1907485d8d515a4e9a682", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "503565f7fa61ae49645a58970967409963928a70", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "dd65de5bb02fc6ad70fd3d2a9988d8b8aa2c69f3", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "f0d1c8f2256f2e831a4ba82551de6a55ee4565a6", + "version-semver": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "196f1ae93b85efd88bb9fa4a245ed9e8cf044a4a", + "version-semver": "5.84.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5auth.json b/externals/vcpkg/versions/k-/kf5auth.json new file mode 100755 index 000000000..e965941bd --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5auth.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "e2f603c61a444935527c7c0a3e6f3871dc8de3df", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "9703f64179e4ae9387400c5e5a003c796c4de920", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "d7e4ebe7498963bfde116470731abb72cf9032df", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "54c38c08e5c5af0745650a385a5cea5926748545", + "version": "5.84.0", + "port-version": 2 + }, + { + "git-tree": "5f1399e14100a7c100bc55f8d436224c680a7f52", + "version": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "09194a3548898b6548ab3e61e45a9f6a4388aa6e", + "version": "5.84.0", + "port-version": 0 + }, + { + "git-tree": "4eb7aaf2e4986913b630b57cf640bc62ae811316", + "version": "5.81.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5bookmarks.json b/externals/vcpkg/versions/k-/kf5bookmarks.json new file mode 100755 index 000000000..35c965c0a --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5bookmarks.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "4d1a01a9c81b7126f63ac11f2729498f93d56903", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "c37b551cf242aad93b0d8e335358df3caf51f2b3", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "d7a2e1993eaad2402f76f743f224231d8fff7e57", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "64191caa589d36090d34e4f699e7c90d836a6726", + "version": "5.84.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5codecs.json b/externals/vcpkg/versions/k-/kf5codecs.json new file mode 100755 index 000000000..b4d9a4b4d --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5codecs.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "3f089e2bf752a07b60871e0cbc1bcdf085b3e7fd", + "version": "5.89.0", + "port-version": 1 + }, + { + "git-tree": "689fa05db3db3ea404ccec181b0a8bba8e614562", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "707f03a5be73f39f93010cf6c7445722555d3d85", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "6b03af23a2842634523f2a2958d54b2a9aed8c7b", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "54b65a5af21a97ee1a73591b5e83d26cc6898d12", + "version": "5.84.0", + "port-version": 3 + }, + { + "git-tree": "0997fde9753e1e3c745eca599c116ef3a511bece", + "version": "5.84.0", + "port-version": 2 + }, + { + "git-tree": "cc839f57cba8b67ed071d5dc3a472b605033cd7a", + "version": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "b0b56e3e645427bfc9efe47c4050ba295e5e261e", + "version": "5.84.0", + "port-version": 0 + }, + { + "git-tree": "2014209bef9c534b16f81cefadc0745d25b9a761", + "version": "5.81.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5completion.json b/externals/vcpkg/versions/k-/kf5completion.json new file mode 100755 index 000000000..c76749705 --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5completion.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "883845542162455b20188292bdf1cbcad36615ef", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "36d73d2ef882b596ba4735efff2327e24c4192a0", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "6c8a057cc04ac61bafd18e9d3ef44d08eb10e656", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "a184552295179e5f414d3166d8f6f40ce9c66347", + "version": "5.84.0", + "port-version": 2 + }, + { + "git-tree": "b32643e981f1d9bab04fd3526e9c6c4499d35d1f", + "version": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "0ffa13221ac2980b44af52cae6392718f80f5d3f", + "version": "5.84.0", + "port-version": 0 + }, + { + "git-tree": "82b63d20234241b66dc8f7242619d713d43340de", + "version": "5.81.0", + "port-version": 1 + }, + { + "git-tree": "8e4e693e3597dcada6e28243e1d536a44063fc18", + "version": "5.81.0", + "port-version": 0 + }, + { + "git-tree": "2fcd1bf45f43cfac3f85834beea42a82d9f5d5a0", + "version": "5.75.0", + "port-version": 0 + }, + { + "git-tree": "696b8fc5814324c18e01201d06f72cacb983f858", + "version-string": "5.64.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5config.json b/externals/vcpkg/versions/k-/kf5config.json new file mode 100755 index 000000000..7f60f5810 --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5config.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "b8cf3131bfc3810be865d269b9873e08b36ed0ca", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "b61e44190301d0de14095a1c3022bd484680e315", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "c856c763f07600a010fc88a2ba55ea041ad885e9", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "f36f1f5a124bd2f3123e0dfd9f4d350f1f69e757", + "version": "5.84.0", + "port-version": 2 + }, + { + "git-tree": "67fa669df81328489ba66231cef84fc17ae4f434", + "version": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "57c0ad579f0582463fe73a7ca64f1af6eadcea16", + "version": "5.84.0", + "port-version": 0 + }, + { + "git-tree": "1bd7078c91196234f1c9686533b7d7a32236cbd7", + "version": "5.81.0", + "port-version": 1 + }, + { + "git-tree": "79afbe3512b5e5d144212f69294ed2859f2df3e9", + "version": "5.81.0", + "port-version": 0 + }, + { + "git-tree": "1b18ac2e564ec1c1f918ff77cad0b15bead4699f", + "version": "5.75.0", + "port-version": 0 + }, + { + "git-tree": "b6f37e63a4ee87b5b6de7224072e410f8c93258b", + "version-string": "5.64.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5configwidgets.json b/externals/vcpkg/versions/k-/kf5configwidgets.json new file mode 100755 index 000000000..9a78dc931 --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5configwidgets.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "321b0a6c4261d5a3bcf760d5010e388b6297e3d5", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "6d32f1ae808824f97ae385668b430dbec9bbafcc", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "3d64286e19596a3518c2afee2cc882e770dc3ffe", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "9eca836d8da743409afa20dfc372145a7a7e68d6", + "version-semver": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "99dcbe4e7cb84be45f9869e441c274e44309291d", + "version-semver": "5.84.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5coreaddons.json b/externals/vcpkg/versions/k-/kf5coreaddons.json new file mode 100755 index 000000000..f89e710d9 --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5coreaddons.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "6431d962993955c520f26f0c6d28f4cdaf5cfdea", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "d1d07dcbee5c9b56c7109f5a7bfb66eea766570f", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "6a08b92d70eb4ad61dc64f207618f1725f133d4b", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "ca84b488ea7914b621bf49006f03f4ce8221052c", + "version-semver": "5.84.0", + "port-version": 2 + }, + { + "git-tree": "001ac94bfbadcc7b05c30448bff3adc9e2dc08dd", + "version-semver": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "0afc60c5f0db7847953d1082a96b5a4844047f02", + "version": "5.84.0", + "port-version": 0 + }, + { + "git-tree": "8467a9d9763b072c6fd898b1d5be2227205216bd", + "version": "5.81.0", + "port-version": 1 + }, + { + "git-tree": "47f0a0b5ec4ebb494396fbc3118ef864e1c66689", + "version": "5.81.0", + "port-version": 0 + }, + { + "git-tree": "a36efec82fc03b9f181a9ebf3bf0724ad44b112f", + "version": "5.75.0", + "port-version": 0 + }, + { + "git-tree": "2f1927fb52301082ec65eb107a7605e8edec49d2", + "version-string": "5.64.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5crash.json b/externals/vcpkg/versions/k-/kf5crash.json new file mode 100755 index 000000000..6c4dc8cc9 --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5crash.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "09f21ea5657354bd2e6a725f7c6b9e8e6b47af68", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "1e7f3c7f919bd8f77fd51c51fef599019c784db3", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "cc52d0bb515ffa68e8bcc9a209bc91da339639ac", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "e30fa89728c784663526f9ff9332021507b9ee8e", + "version-semver": "5.84.0", + "port-version": 2 + }, + { + "git-tree": "9b4122c60d561d232fbd5294a304be12509b736d", + "version-semver": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "e316c8fc3bd2c92825a198615d99b61ede2986cb", + "version": "5.84.0", + "port-version": 0 + }, + { + "git-tree": "18cf44844a7becb7d932cd96709fb40f800236ad", + "version": "5.81.0", + "port-version": 1 + }, + { + "git-tree": "cc944375b9c277d67a8c7174c24e5ed4221e413a", + "version": "5.81.0", + "port-version": 0 + }, + { + "git-tree": "d8c9a56257206c1946c7ba30f87bbc450598a1ba", + "version": "5.75.0", + "port-version": 0 + }, + { + "git-tree": "b21008fd070821fe16a997fcc02aa09e85022324", + "version-string": "5.64.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5dbusaddons.json b/externals/vcpkg/versions/k-/kf5dbusaddons.json new file mode 100755 index 000000000..236a730e6 --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5dbusaddons.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "86fe61a2bf5e56705d1c90e61f355a08328d2886", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "59f07d9d616712ace1051e0b9bfb60429685932a", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "0f61c24cff36aac302c3a9e98b5e10e66d87b405", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "497be7e1959fac395884422632328485883fd433", + "version": "5.84.0", + "port-version": 2 + }, + { + "git-tree": "417fdf58b130c7e24794cf4d1d29336cb946f9fa", + "version": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "d7d33a4c88aa692230617ecc58693dbaa3290ba7", + "version": "5.84.0", + "port-version": 0 + }, + { + "git-tree": "0850ae5e1ff258527dc690df530c24099b5890ee", + "version": "5.81.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5declarative.json b/externals/vcpkg/versions/k-/kf5declarative.json new file mode 100755 index 000000000..6892e7ecf --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5declarative.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "0e7f25daab01ec329e68aafcb705359e9c341bee", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "ca1926847cdb48836c8ee9cbca02178d0df38384", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "bd3486c169cd99bdc70fb5ee7e65ba3f76591e1f", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "6532f8c66e8d9626315958f2f072c43bf6a117ac", + "version": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "165b2c1ebe6c3268e4bf32668da9c78c0b097f24", + "version": "5.84.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5diagram.json b/externals/vcpkg/versions/k-/kf5diagram.json new file mode 100755 index 000000000..1dbe75336 --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5diagram.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "934ea388abb43f4946b4473a2b74cba0bf6b1e5c", + "version": "2.8.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5globalaccel.json b/externals/vcpkg/versions/k-/kf5globalaccel.json new file mode 100755 index 000000000..964957155 --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5globalaccel.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "186e5eaf6182ee6c12a1543aad61a2d317dbe90b", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "65f39c2fb121a2604a848e219bc50d8a0a11e4ee", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "f6d75bafebb665646fc7b714e3f0bba8e968c90a", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "541f3c0b90027dcb3837dec812f896dbc4786f46", + "version-semver": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "de0672be2e76751be304b4856466b9df6deaa29f", + "version-semver": "5.84.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5guiaddons.json b/externals/vcpkg/versions/k-/kf5guiaddons.json new file mode 100755 index 000000000..5b8edfdee --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5guiaddons.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "1d532e40b86e82f54d1cec8ea0752168dac149b0", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "cac4485ad81812b3ecb5b73b2ded808e2b4d01f8", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "e5051bdd704585046c184dcc90fd096ef082b82a", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "1dfe4575612c8d7d2bff1d4b1ecf2d5601915060", + "version-semver": "5.84.0", + "port-version": 3 + }, + { + "git-tree": "3ecd4e54210c93a999c1cf4ddc24aded8c0d7437", + "version-semver": "5.84.0", + "port-version": 2 + }, + { + "git-tree": "7413c9e8bfa4e7db669271b3c13fe5cf7c52567a", + "version": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "13acc7a53a47646048061054946bcce0f8acbf7b", + "version": "5.84.0", + "port-version": 0 + }, + { + "git-tree": "886d683d3d25ff9de50bc646af37d2adcd254ac2", + "version": "5.81.0", + "port-version": 0 + }, + { + "git-tree": "7b32de9f028a53b45e25e0d6ac6517c6e93ec8ea", + "version": "5.75.0", + "port-version": 0 + }, + { + "git-tree": "8bca3434ab81ca66cb57d44ed891ff5a773c92ce", + "version-string": "5.64.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5holidays.json b/externals/vcpkg/versions/k-/kf5holidays.json new file mode 100755 index 000000000..82a72f220 --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5holidays.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "91ecdfa6bebbaf14e316af8763d3a355eb2d5108", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "1de63f997d7e1f2a5986d980bde5f79b5dc9dfcc", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "50c5f3ea401e44a4318747aefa0c299350be6508", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "d8b6fefbcb219e7f1de19ffc4b30bc8fd199abc0", + "version": "5.84.0", + "port-version": 2 + }, + { + "git-tree": "b969d43d406c095970b4e98cc3b19c27567b557c", + "version": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "a43e4fcc0dedd0d8f6722386a97a688c001fa508", + "version": "5.84.0", + "port-version": 0 + }, + { + "git-tree": "624f5c592ba2ea64dda5f8962d423165e470be7d", + "version": "5.81.0", + "port-version": 1 + }, + { + "git-tree": "748a3353b679c76468e85e01c3b5fa4e21351566", + "version": "5.81.0", + "port-version": 0 + }, + { + "git-tree": "18dd0b493b905446080c4060b086e2e8ad653613", + "version": "5.75.0", + "port-version": 0 + }, + { + "git-tree": "c668e8479d432fcb7f1d450ad1c51a6ad9dc67fb", + "version-string": "5.74.0", + "port-version": 0 + }, + { + "git-tree": "41cfbba4eec5f2bce693fa8a938019bc80b3b6e0", + "version-string": "5.64.0-1", + "port-version": 0 + }, + { + "git-tree": "9ee43cfd96333c9db6592218472ce04dfa1fa50e", + "version-string": "5.64.0", + "port-version": 0 + }, + { + "git-tree": "0e5244ad70c317ee4a0660026a5868c339d0552f", + "version-string": "5.58.0", + "port-version": 0 + }, + { + "git-tree": "e9a143880c36aa9acda4fd936f2d354a8a85a426", + "version-string": "5.50.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5i18n.json b/externals/vcpkg/versions/k-/kf5i18n.json new file mode 100755 index 000000000..81f997bcd --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5i18n.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "714138715b9030eceab63caba6085c4c9cd2e6d5", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "e215c70cf4c900ca8510ae07c4f3cd65587f35e8", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "7d6f42ae158c14ab6b17cd305ac42d6ea3e03af8", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "c866e11343fd709f33dba23075f00f64b62813b5", + "version": "5.84.0", + "port-version": 3 + }, + { + "git-tree": "3d34c7c3f38d55f93bc26d146fcf656f7eb4be3c", + "version": "5.84.0", + "port-version": 2 + }, + { + "git-tree": "f0d01fec0fb56e9c2d95b743b0b13e544d5428a7", + "version": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "08dd3d175400c8e6f91fc3d7f6cbc7eff8a3e976", + "version": "5.84.0", + "port-version": 0 + }, + { + "git-tree": "98407edcc42c1bb91f4a1fe218f30c3a2757a530", + "version": "5.81.0", + "port-version": 2 + }, + { + "git-tree": "a749b5eb069f5e7a8c84a65746ca7579d2e85af5", + "version": "5.81.0", + "port-version": 1 + }, + { + "git-tree": "85675e319c19cb4303a56719af9ad49feb733983", + "version": "5.81.0", + "port-version": 0 + }, + { + "git-tree": "de9aea1ae1eb983815781d4ab7a8684db7e04b6b", + "version": "5.75.0", + "port-version": 0 + }, + { + "git-tree": "729fd5fa589799c9c12afaa7fa6434c9304301f7", + "version-string": "5.64.0", + "port-version": 1 + }, + { + "git-tree": "ee5f0883d727275d01998ff635e98fd04ef6b234", + "version-string": "5.64.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5iconthemes.json b/externals/vcpkg/versions/k-/kf5iconthemes.json new file mode 100755 index 000000000..bc60ee134 --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5iconthemes.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "6ff2f989294b0c0487ff5049498efb10571334eb", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "815937b5586d05475d7291f270b14359197f3e04", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "de7e7e740b10c51da3916a4cbefde630941df428", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "dff2467b2980412adb042e6a9e2474eb5efba9f4", + "version": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "969df4c5b4230e480fcffa7d71a312e869a3660d", + "version": "5.84.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5itemmodels.json b/externals/vcpkg/versions/k-/kf5itemmodels.json new file mode 100755 index 000000000..e55f871fd --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5itemmodels.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "a97d6d3556bddd30d108f13e831789b8cc9c1de9", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "4cdd3b6ba6e4699193512aeebb851dddcf0da092", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "68d9be4e09a64f981bb76751ec94319548ad0dc4", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "ccd18253fc31dab2afa493a6150711036138da63", + "version": "5.84.0", + "port-version": 2 + }, + { + "git-tree": "b222a404755239053edfac06ee63bf3710719fe9", + "version": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "2efa93694b3389e09de76095a6fa35ce41b30f2d", + "version": "5.84.0", + "port-version": 0 + }, + { + "git-tree": "bc5ec5bc67cce9eed6f93724083656ffd691365b", + "version": "5.81.0", + "port-version": 1 + }, + { + "git-tree": "8253bf274c45235c1fa763255fbc9c765de8d245", + "version": "5.81.0", + "port-version": 0 + }, + { + "git-tree": "86e47be26b32b4e22157e2e12c78b490d13d9f86", + "version": "5.75.0", + "port-version": 0 + }, + { + "git-tree": "2ffea0df33ef54f6741e97f8353e5ee2c2484e6b", + "version-string": "5.64.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5itemviews.json b/externals/vcpkg/versions/k-/kf5itemviews.json new file mode 100755 index 000000000..22853ab6c --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5itemviews.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "8cdccbe27ce997559f69d74f6267c3cbfd294e1e", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "f9f8bdd3d499bbec3575a898e162127c9ab32fba", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "39e2e18585caf414701168720ab9dc72d58d6b73", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "a89dde646ac62a41ece78c8757964cdd4ceaed60", + "version": "5.84.0", + "port-version": 2 + }, + { + "git-tree": "164cc5f1d9ccfdf89ef60c4b718b8f6777162ea5", + "version": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "257c4740f00dab4e0c650543f7cec08b395bcceb", + "version": "5.84.0", + "port-version": 0 + }, + { + "git-tree": "b2b8ea2e118cf093ca85c444bd16dee60a1a1777", + "version": "5.81.0", + "port-version": 1 + }, + { + "git-tree": "c299c11853b1ca953bbc5801a596f4db51bc5782", + "version": "5.81.0", + "port-version": 0 + }, + { + "git-tree": "efce2fde551eaca8c41d6b55713a2c14e1d8ba1b", + "version": "5.75.0", + "port-version": 0 + }, + { + "git-tree": "165e6d588675a123a6757b98d821014b71f63613", + "version-string": "5.64.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5jobwidgets.json b/externals/vcpkg/versions/k-/kf5jobwidgets.json new file mode 100755 index 000000000..18cf0763e --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5jobwidgets.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "f608e47e7f8135de9e7c172bc168e8a444801e66", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "70eee0ea3cb787f5b956923a31002843c14b56aa", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "46a78abf10e4dce004e27810c02da64f3a261489", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "6772f49b473e205b1f3dadfe97705b178f8e0ef2", + "version-semver": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "7405290b40e00636f2db4aa51f0ebfa24bfe0589", + "version-semver": "5.84.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5kcmutils.json b/externals/vcpkg/versions/k-/kf5kcmutils.json new file mode 100755 index 000000000..9671fe955 --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5kcmutils.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "e57e3f3eda8ac0230b4f7e7bb31abd02c766398c", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "25d48af54dcfad173913cb5c3d2032105b3ef915", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "d29b1c0e6b679becc34e23677a223555053962de", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "7faf8114473ed03a92c1d5537e4c07cbf31b0ef2", + "version": "5.84.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5kio.json b/externals/vcpkg/versions/k-/kf5kio.json new file mode 100755 index 000000000..b868ba249 --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5kio.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "644d4ef87d5683404a3b034195c07a982fc45979", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "20edff8d66b9094cb80eb228a29cef566aad3538", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "6dc045a5011291de6e3aad07e60bca2a9699837c", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "624eb17608cec7afe4c30bef29e16e18fe8d973e", + "version": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "4a9411ad4abdf7acb9b7a7ef98dd9b966f8b58d5", + "version": "5.84.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5newstuff.json b/externals/vcpkg/versions/k-/kf5newstuff.json new file mode 100755 index 000000000..368f1e2bc --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5newstuff.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "7295ad1e62fd07e6aa74fb1d4fe0562e4f6b5ecb", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "a9b4c5ce1b701619de83591e564e2bbeec14e471", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "b817dc1cfc5ca745cb053b7d17ce8569f818b215", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "39c986b0766ffb962beb7022b74e1e1037bdc203", + "version": "5.84.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5notifications.json b/externals/vcpkg/versions/k-/kf5notifications.json new file mode 100755 index 000000000..4916ba0c5 --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5notifications.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "86baef519df4a14115be8d39ddac5b3c9df751cb", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "fd7593fd4f8ad80faf6d2111ffffe16bf0dd76d1", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "74334d5a13ce5263f6b60510a6193d0453136c93", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "a565cfd79777b605b4e3fc57be5bd2957c498c7f", + "version": "5.84.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5package.json b/externals/vcpkg/versions/k-/kf5package.json new file mode 100755 index 000000000..1dbec4e0b --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5package.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "0c7ba772f4a36a4bec3f1a573c124cc812cce788", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "32c1d3baa7c7050b78d08f06abbca8791b048622", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "06ff2bf277b3038d9b5cd77cefbba6dbb537424d", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "41b59faf036cdcc4d430a8bee7b4f87c4fa4e42f", + "version": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "aeff67d2d07a017d69a853037a12371683c5aa97", + "version": "5.84.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5plotting.json b/externals/vcpkg/versions/k-/kf5plotting.json new file mode 100755 index 000000000..a5fd11df7 --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5plotting.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "18344c8d460769664a1644a9c0bbca283766b2aa", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "9cafd336220df951a4e0054d8b7f469a6408b161", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "f16da3cc6b411acfff5935c7127ac2fe89cb4b0c", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "866d1f84848c54a924a542fc101895588ff895b0", + "version": "5.84.0", + "port-version": 2 + }, + { + "git-tree": "39f28709c5b4d6e1c706c7e15617b7c052830122", + "version": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "b105a7f2a86040a1a7b5622371d7c0d5cd65fd16", + "version": "5.84.0", + "port-version": 0 + }, + { + "git-tree": "e45f62745247b51d6583a1bc9a45e4a4bc26701b", + "version": "5.81.0", + "port-version": 1 + }, + { + "git-tree": "d0991bf27a381493f05e2c2c724a4e523cf893be", + "version": "5.81.0", + "port-version": 0 + }, + { + "git-tree": "d0c6197f035b8ce06cd634593430c342d2baa5a3", + "version": "5.75.0", + "port-version": 0 + }, + { + "git-tree": "25c33b06994d1c7906afd3ada835facb0a9fc2d7", + "version-string": "5.74.0", + "port-version": 0 + }, + { + "git-tree": "402cc759b0d1b9c19841bde604d792a4d0cd834c", + "version-string": "5.64.0-1", + "port-version": 0 + }, + { + "git-tree": "2adde1265a5d17da91ea5ea368fe5259ee7706c6", + "version-string": "5.64.0", + "port-version": 0 + }, + { + "git-tree": "d3f6adfb8791f605353b9cb4bffad54f266ec3c4", + "version-string": "5.58.0", + "port-version": 0 + }, + { + "git-tree": "6709af21e8a5bdeaf61cb20842ee18ef6db0a10b", + "version-string": "5.50.0", + "port-version": 0 + }, + { + "git-tree": "656c7c6e5ac92a389040967c26b0ec380b0d2965", + "version-string": "5.37.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5service.json b/externals/vcpkg/versions/k-/kf5service.json new file mode 100755 index 000000000..bf52e5fb2 --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5service.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "8c834b6365035b2fcdd1996f3105456474f1b8a7", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "ca748c2c5f5b929cd099c699342bfe887581386a", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "674b9360b44ffc393f9e757443a68ce96c2ed006", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "8f6fb4f263f0fff296515f569565550c9805e65d", + "version": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "13315cd7dbaa61af6c16276f83a15ceaab5a1235", + "version": "5.84.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5solid.json b/externals/vcpkg/versions/k-/kf5solid.json new file mode 100755 index 000000000..5fe748f91 --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5solid.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "769197391a9b8b1f614405d61e05361915dffdc2", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "7f02dd0891311813d9efad69bbdd2e9dc918a470", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "db2ba98a0de225239023a9673c7faa4346fbdfd7", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "8b7f9e0e31cd5fd3a2720a8e71b1aa52b123cf98", + "version": "5.84.0", + "port-version": 4 + }, + { + "git-tree": "77af969f1b19c937d7f41651b657a774cd3802c7", + "version": "5.84.0", + "port-version": 3 + }, + { + "git-tree": "f0a82387f00cd2a61e6f1751bb1c94c9d706fddb", + "version-semver": "5.84.0", + "port-version": 2 + }, + { + "git-tree": "1f726a86d2961fd90661f27469d1e77b2b75c612", + "version-semver": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "4ddc168b71ca68e8c765edca7a018753871b84e6", + "version-semver": "5.84.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5sonnet.json b/externals/vcpkg/versions/k-/kf5sonnet.json new file mode 100755 index 000000000..1e8eb71d0 --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5sonnet.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "4befb84624256110ee9b61eef7b2a38bed809274", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "460773f08b8524e7534b6f94a37a7488988e00a8", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "54ce5e9ca8c725a2d8a40779ec92a5c35dc2ecf6", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "dab7f45858de89e5cb13bd31875d2ba99bf94365", + "version-semver": "5.84.0", + "port-version": 2 + }, + { + "git-tree": "de4fdcac67da4df0962414b4b1f71d98753d4c4e", + "version-semver": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "7f6d9ebeec45c6354fd96f1ee04b9e34063e33b0", + "version-semver": "5.84.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5syntaxhighlighting.json b/externals/vcpkg/versions/k-/kf5syntaxhighlighting.json new file mode 100755 index 000000000..2354bb6ee --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5syntaxhighlighting.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "604681b0df59a2cc8cf1d69d8a355a9eecf59328", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "2ca26437f934ea26968d1dc10871a31be10a460e", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "2f3ed58701fe534cf44b9d777a64f7d146b882d6", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "f86af1e17c47fb99ff1f4a662d2cf5c022408025", + "version": "5.84.0", + "port-version": 2 + }, + { + "git-tree": "0bec703b0c5345b456bdbddf6e043d1c31dd2906", + "version": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "6033609633223323ffc8762d0e2a6ab24c323de7", + "version": "5.84.0", + "port-version": 0 + }, + { + "git-tree": "6033ee77e0fda605d514ec7c82830980b6a23a02", + "version": "5.81.0", + "port-version": 0 + }, + { + "git-tree": "b58bac6d264e3a74e6347874a5c550b4e3edbbce", + "version": "5.75.0", + "port-version": 0 + }, + { + "git-tree": "4fdddfb870b34a5a43de450af11a42822831cf87", + "version-string": "5.64.0-1", + "port-version": 0 + }, + { + "git-tree": "9e18bbbc90a4412ae9fb7e4c47c14486e2938fbc", + "version-string": "5.64.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5textwidgets.json b/externals/vcpkg/versions/k-/kf5textwidgets.json new file mode 100755 index 000000000..fb59ad5cd --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5textwidgets.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "5010e707b462a2d020694963f2e6d9affdea6db2", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "3307e348e202593b08cd227f68d7ca7fd57ffcfa", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "c37441cf5c99af758ae0d4b6a604bdc59ac5db5c", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "b6c8dad63ee1e48b572b94623152569b1443c20c", + "version": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "bdc98a609f6b939514630fb39de377fdb09560c0", + "version": "5.84.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5wallet.json b/externals/vcpkg/versions/k-/kf5wallet.json new file mode 100755 index 000000000..879900175 --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5wallet.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "7cdf30cbdbee449144de7e7f145e7e91ebd3aecb", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "949ceec510758be184c8ed99a4409920e6b0aaa7", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "30362e63081e49a908e3f9bd866e45813f8e86be", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "8e8401b12a23caa46bffec87b7f583771a55170d", + "version-semver": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "c954ed1f4277c1c7fef03a9736d83d1a2da5ee63", + "version-semver": "5.84.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5widgetsaddons.json b/externals/vcpkg/versions/k-/kf5widgetsaddons.json new file mode 100755 index 000000000..d274e7fe5 --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5widgetsaddons.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "82e07e830a46ae869835ac36c61a1c4ea05542d3", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "d7fb921418e65921e96e81147d9f7f830b471ab5", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "f1fc662a11109567098e9cd2f50331c9b9809786", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "b8ce78de33b2176f98f97f865494b520cdc37032", + "version": "5.84.0", + "port-version": 2 + }, + { + "git-tree": "de99d19b892fe1551e87c6dd3a1c2d353bfc3f76", + "version": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "f27e6f9ba66090bf93b9db1bbf3973d472bd9627", + "version": "5.84.0", + "port-version": 0 + }, + { + "git-tree": "eaf1fa333a58906c39eaafc1f5e9aa0ca52aca92", + "version": "5.81.0", + "port-version": 1 + }, + { + "git-tree": "3f982e6ab4ef615b0978a477c0943d3b490e6823", + "version": "5.81.0", + "port-version": 0 + }, + { + "git-tree": "00f70a9674ddeb01e86abf6a902b3d545e95f508", + "version": "5.75.0", + "port-version": 0 + }, + { + "git-tree": "40e1bd1fb0830d760f34b565cb277a9f9a5c31d7", + "version-string": "5.64.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5windowsystem.json b/externals/vcpkg/versions/k-/kf5windowsystem.json new file mode 100755 index 000000000..cb45d7f75 --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5windowsystem.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "a15cfdf8b903d0aca25ec242187172a32f15d210", + "version": "5.89.0", + "port-version": 1 + }, + { + "git-tree": "7d201f83e6272c570a9662ac56ca67bffe2fe0e8", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "9e617f8991e09cd526860b7a312330098cbcbb54", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "b6387279ae7d002232405241fd46c46f8cf74fb0", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "ce30fb964e57b95c0a6afe4cacff6a28447c7649", + "version-semver": "5.84.0", + "port-version": 3 + }, + { + "git-tree": "e8ec0d393c0ccf286aab3bbe310dd5c09eaecf88", + "version-semver": "5.84.0", + "port-version": 2 + }, + { + "git-tree": "719b81cebad63502bbb619781290844c586acef9", + "version": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "178fa49af1a113118be6d61a68c31930aa276e17", + "version": "5.84.0", + "port-version": 0 + }, + { + "git-tree": "026fe71b84fa293ef1d198ca77c2368ccac40760", + "version": "5.81.0", + "port-version": 0 + }, + { + "git-tree": "dcebc7ba5d9140cd073ba9fb4c448c404827b824", + "version": "5.75.0", + "port-version": 0 + }, + { + "git-tree": "35fa4e3ec318a0000fec7537cf7368edb5e5e5fb", + "version-string": "5.64.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kf5xmlgui.json b/externals/vcpkg/versions/k-/kf5xmlgui.json new file mode 100755 index 000000000..358cc452a --- /dev/null +++ b/externals/vcpkg/versions/k-/kf5xmlgui.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "ef8256a376b36bf9971b1788e88f4332146a1558", + "version": "5.89.0", + "port-version": 0 + }, + { + "git-tree": "b6f435038615c416b7893e2e0524c1c486daccf5", + "version": "5.88.0", + "port-version": 0 + }, + { + "git-tree": "4d9dc85c5875657bed4598a47ade638dff13a5e0", + "version": "5.87.0", + "port-version": 0 + }, + { + "git-tree": "4fa462d8e9f3592a9ded89bb25ea21de65932112", + "version": "5.84.0", + "port-version": 1 + }, + { + "git-tree": "5cecdc03d8c8a9d399ef6aae83e26a9cd32d2f28", + "version": "5.84.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kfr.json b/externals/vcpkg/versions/k-/kfr.json new file mode 100755 index 000000000..061ac339e --- /dev/null +++ b/externals/vcpkg/versions/k-/kfr.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "7465d297a8018bccb142249ed62bf26481608837", + "version-semver": "4.2.1", + "port-version": 2 + }, + { + "git-tree": "76c0a2397fec739067cac1a9970c113ed47341b1", + "version-semver": "4.2.1", + "port-version": 1 + }, + { + "git-tree": "3c67a5df3f480154a5f3472c58952566b55b688c", + "version-semver": "4.2.1", + "port-version": 0 + }, + { + "git-tree": "57db6ba7195ff44caabe75ab302cdc10629fb5f2", + "version-string": "2020-06-15", + "port-version": 1 + }, + { + "git-tree": "22401e7e0aafe0934b6eb6201b83283609fe5d81", + "version-string": "2020-06-15", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kinectsdk1.json b/externals/vcpkg/versions/k-/kinectsdk1.json new file mode 100755 index 000000000..5c8c5bfc2 --- /dev/null +++ b/externals/vcpkg/versions/k-/kinectsdk1.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "688e49039e9c86fcb57c431b527a7f125a996857", + "version": "1.8", + "port-version": 5 + }, + { + "git-tree": "d49f0532a6e9776666ef3960a9b267f32ff3cfc4", + "version": "1.8", + "port-version": 4 + }, + { + "git-tree": "b48f4bf28923981e5a8ad549daa4dc8ee64dac83", + "version-string": "1.8", + "port-version": 3 + }, + { + "git-tree": "6f1b6079d522449e9e015c19c96b021bef51d3f8", + "version-string": "1.8-2", + "port-version": 0 + }, + { + "git-tree": "2c8d9765b436e9982cf9b11977325cfc65ce6b1d", + "version-string": "1.8-1", + "port-version": 0 + }, + { + "git-tree": "fd2ef359a8f6063dc52c2298df16a4a5d26abf9b", + "version-string": "1.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kinectsdk2.json b/externals/vcpkg/versions/k-/kinectsdk2.json new file mode 100755 index 000000000..418b22af4 --- /dev/null +++ b/externals/vcpkg/versions/k-/kinectsdk2.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "2fc9568898ab7f14edea8ffb65da87161c9c0b6c", + "version": "2.0", + "port-version": 4 + }, + { + "git-tree": "a0a13df11c972355370eef866bd266e2ae7c90d5", + "version-string": "2.0", + "port-version": 3 + }, + { + "git-tree": "1a0bfd98150a26b9a24903f78f8c24843e3f079f", + "version-string": "2.0-2", + "port-version": 0 + }, + { + "git-tree": "6f7a644969c78b138f8d423677db9c948d7e2d40", + "version-string": "2.0-1", + "port-version": 0 + }, + { + "git-tree": "1bfaaf0ae762599023edaf309723e1d5dba996cc", + "version-string": "2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kissfft.json b/externals/vcpkg/versions/k-/kissfft.json new file mode 100755 index 000000000..836435055 --- /dev/null +++ b/externals/vcpkg/versions/k-/kissfft.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "f55a890b3e3bf5068dfdcf921ceb36080a146d9d", + "version-date": "2021-11-14", + "port-version": 0 + }, + { + "git-tree": "95aab04fc0758cad41ad4724c17490d54b5cb139", + "version-string": "2020-03-30", + "port-version": 1 + }, + { + "git-tree": "2779164487247422fc7e98e76eb55dff08f4a48d", + "version-string": "2020-03-30", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/klein.json b/externals/vcpkg/versions/k-/klein.json new file mode 100755 index 000000000..37c636709 --- /dev/null +++ b/externals/vcpkg/versions/k-/klein.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5a367eafd82860f61245c54f64306b35a9e0978c", + "version-date": "2021-05-09", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/knet.json b/externals/vcpkg/versions/k-/knet.json new file mode 100755 index 000000000..37388ca01 --- /dev/null +++ b/externals/vcpkg/versions/k-/knet.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "76216c380a8db7e28debacd7faafce6be6c2d705", + "version": "1.1.0", + "port-version": 1 + }, + { + "git-tree": "6d45707ca4c853c0c0bcd076b98fab73c605d906", + "version": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "7dd6abd945d808be664c1b105d16b4ece4e245cf", + "version": "1.0.3", + "port-version": 0 + }, + { + "git-tree": "d2df3aac3680057cf29e597905199b7a7d7a1c25", + "version": "1.0.2", + "port-version": 0 + }, + { + "git-tree": "bc64fbd63896ba675dff55878783d27cccf6a1a2", + "version-string": "1.0.1", + "port-version": 1 + }, + { + "git-tree": "125c19cb7dd60a11bb0f5d05eba693d05ed9c020", + "version-string": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/krabsetw.json b/externals/vcpkg/versions/k-/krabsetw.json new file mode 100755 index 000000000..101a63128 --- /dev/null +++ b/externals/vcpkg/versions/k-/krabsetw.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "b1f3fa7092c3cb91e5891fcf8f0923dd1f604887", + "version": "4.1.18", + "port-version": 1 + }, + { + "git-tree": "eafa1dce01b80f2483c3dd6b74b17b4d5b8bb215", + "version-string": "4.1.18", + "port-version": 0 + }, + { + "git-tree": "f52a420a5f5f9df0d47f89b047879aac82b03eed", + "version-string": "4.1.14", + "port-version": 0 + }, + { + "git-tree": "684633395866823d815890a73ce73b341e52319a", + "version-string": "4.1.13", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/ktx.json b/externals/vcpkg/versions/k-/ktx.json new file mode 100755 index 000000000..14ca1ca06 --- /dev/null +++ b/externals/vcpkg/versions/k-/ktx.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "70ff7e521be27f851d96a9d69016fe3c58abe74d", + "version-semver": "4.1.0-rc1", + "port-version": 0 + }, + { + "git-tree": "048534e1a90a5e15ebf065ccfc752c9c5fea77c5", + "version": "4.0.0", + "port-version": 2 + }, + { + "git-tree": "2d554178c6665e285b8a480dabe83fcf72aa5514", + "version": "4.0.0", + "port-version": 1 + }, + { + "git-tree": "bb7f4de2ff7141cda0da61c7a0419559fc30c53a", + "version": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "7a9d8e946937d795afa8a57d63357aa76be2d4ce", + "version-string": "4.0.0-beta5", + "port-version": 2 + }, + { + "git-tree": "dcdc8a93a053d7251e14f8b0760a810e5b555ebb", + "version-string": "4.0.0-beta5", + "port-version": 1 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kubazip.json b/externals/vcpkg/versions/k-/kubazip.json new file mode 100755 index 000000000..1286e2b6f --- /dev/null +++ b/externals/vcpkg/versions/k-/kubazip.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "131416be9d3de3fccb254751a17cd78e1252b464", + "version-string": "0.1.19", + "port-version": 1 + }, + { + "git-tree": "4b47acada9e962b232d5a5a1cf1c7f9adf98530a", + "version-string": "0.1.19", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kubernetes.json b/externals/vcpkg/versions/k-/kubernetes.json new file mode 100755 index 000000000..4aaef0239 --- /dev/null +++ b/externals/vcpkg/versions/k-/kubernetes.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "81d419c292d699e92444e7629e01b1d1cf0ba762", + "version-date": "2022-01-19", + "port-version": 1 + }, + { + "git-tree": "0f41209b8d9dd8477bf2bb9ea91234c3680f1ee5", + "version-date": "2022-01-19", + "port-version": 0 + }, + { + "git-tree": "df271a1aba7a2a955fc65e213e3a7c61a81e61b5", + "version-date": "2021-11-24", + "port-version": 0 + }, + { + "git-tree": "58621c0fcfc7ea0c0ecc7808991c1c90c3a0d808", + "version-date": "2021-11-18", + "port-version": 0 + }, + { + "git-tree": "d52624c3f3a26d3ad801cca6af68e7bd8273b29b", + "version": "0.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kuku.json b/externals/vcpkg/versions/k-/kuku.json new file mode 100755 index 000000000..f12b159a3 --- /dev/null +++ b/externals/vcpkg/versions/k-/kuku.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "fa4e0b6cf1ce1e5f0cd13fa2dba7953ddcfc3d6f", + "version-string": "2.1", + "port-version": 1 + }, + { + "git-tree": "e58629ddfc48942517bb6dfc2dc12151cfcd0b2a", + "version-string": "2.1", + "port-version": 0 + }, + { + "git-tree": "0fc041176d953501d771e467d5621e635cd3f2a6", + "version-string": "2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kvasir-mpl.json b/externals/vcpkg/versions/k-/kvasir-mpl.json new file mode 100755 index 000000000..042536ad3 --- /dev/null +++ b/externals/vcpkg/versions/k-/kvasir-mpl.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "0eed1d5cd20c82b4cd2031f0fb21c2a5655b13d1", + "version-string": "2019-08-06", + "port-version": 1 + }, + { + "git-tree": "d07bf9f9e3380b5b9774152634b93bb308af0bd3", + "version-string": "2019-08-06", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/k-/kwsys.json b/externals/vcpkg/versions/k-/kwsys.json new file mode 100755 index 000000000..a1db6c211 --- /dev/null +++ b/externals/vcpkg/versions/k-/kwsys.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "6e898afb7fa1cdf9f1d72b64467a04fded7b2082", + "version-date": "2021-08-06", + "port-version": 1 + }, + { + "git-tree": "376ae3a199ad4fdaad235b6e01b92ed217388550", + "version-date": "2021-08-06", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/lager.json b/externals/vcpkg/versions/l-/lager.json new file mode 100755 index 000000000..7da3ee095 --- /dev/null +++ b/externals/vcpkg/versions/l-/lager.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "8dd0744209e866c731522176fdcdf056fcbb853f", + "version-date": "2022-02-21", + "port-version": 0 + }, + { + "git-tree": "c65b1f179b9d6fe4048cf44f3186de7a0332742f", + "version-date": "2021-06-17", + "port-version": 1 + }, + { + "git-tree": "cc45cef2ecee354f255b9026c8397ca850259ab3", + "version-date": "2021-06-17", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/lapack-reference.json b/externals/vcpkg/versions/l-/lapack-reference.json new file mode 100755 index 000000000..c5f07c06b --- /dev/null +++ b/externals/vcpkg/versions/l-/lapack-reference.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "44ad48321efe7014cd1dc7ab7b46516309e6c395", + "version": "3.10.1", + "port-version": 0 + }, + { + "git-tree": "14b5e3ab7315ce36951f759c6254712ed41cc0af", + "version": "3.10.0", + "port-version": 0 + }, + { + "git-tree": "10799c7ec42f8369179ba7a8e927235596cb8bb7", + "version-semver": "3.8.0", + "port-version": 6 + }, + { + "git-tree": "1887fc1fcb0c96df1ea24fffc9b045330426e3b6", + "version-string": "3.8.0", + "port-version": 5 + }, + { + "git-tree": "34971ac86a76f6bffefe5962980c3991abf87a58", + "version-string": "3.8.0", + "port-version": 4 + }, + { + "git-tree": "d81eed4405e974ea6afc39b96c630af14b0ceb9d", + "version-string": "3.8.0", + "port-version": 3 + }, + { + "git-tree": "91a46c2865b7c683286e30bd0e010b0b3da4cabe", + "version-string": "3.8.0", + "port-version": 2 + }, + { + "git-tree": "36ff17d1c1ce5b189f3a6f41e2773e16941cc382", + "version-string": "3.8.0", + "port-version": 1 + }, + { + "git-tree": "9eb85dd5f5f4e42cf245c3228bf4f73967bbae90", + "version-string": "3.8.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/lapack.json b/externals/vcpkg/versions/l-/lapack.json new file mode 100755 index 000000000..5803b5922 --- /dev/null +++ b/externals/vcpkg/versions/l-/lapack.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "3a9c5b51e3480db058719db223df981e0e679819", + "version-date": "2022-02-22", + "port-version": 0 + }, + { + "git-tree": "e52f9dc39357e3e7224273a21c0efaf275f15ae6", + "version-string": "3", + "port-version": 2 + }, + { + "git-tree": "e3e10603a14f3b981ce689ba768d42a1a2ec07d4", + "version-string": "3", + "port-version": 1 + }, + { + "git-tree": "896c35b926db44f52f66d98b01f5334022920f42", + "version-string": "3", + "port-version": 0 + }, + { + "git-tree": "29cecd95e65e5355b3b29abba1bb9ad4bb9bcae2", + "version-string": "2", + "port-version": 0 + }, + { + "git-tree": "a46b6d68236ab2531fa28cb5f1c9a0905d51763e", + "version-string": "1", + "port-version": 0 + }, + { + "git-tree": "8f3d3da82ca7ed0cdaadf76cb5166210da69ef40", + "version-string": "0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/lastools.json b/externals/vcpkg/versions/l-/lastools.json new file mode 100755 index 000000000..e32dc9925 --- /dev/null +++ b/externals/vcpkg/versions/l-/lastools.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "6401b05621966caf0aaebc6a4dedb0c696c6c53f", + "version-string": "2020-05-09", + "port-version": 1 + }, + { + "git-tree": "8a301426473ec3a9afb9a013ff3d04fd1197fba4", + "version-string": "2020-05-09", + "port-version": 0 + }, + { + "git-tree": "389c49ae33a5f59de433424ee62c1de2e2beb0c3", + "version-string": "2019-07-10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/laszip.json b/externals/vcpkg/versions/l-/laszip.json new file mode 100755 index 000000000..17df9cf1f --- /dev/null +++ b/externals/vcpkg/versions/l-/laszip.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "81b6a105440d08f2c29b044da3f0661e46ddb0a8", + "version": "3.4.3", + "port-version": 1 + }, + { + "git-tree": "6b7b406aadbae2a288bde7f2b268a7c302bfdf67", + "version-string": "3.4.3", + "port-version": 0 + }, + { + "git-tree": "f4c242d0fcbc9db627a5b06a8b1f87903de4c6be", + "version-string": "3.4.1", + "port-version": 0 + }, + { + "git-tree": "79a738214818957e3faab06b05e31ed9f07a5bfd", + "version-string": "3.2.2-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/launch-darkly-server.json b/externals/vcpkg/versions/l-/launch-darkly-server.json new file mode 100755 index 000000000..df236e729 --- /dev/null +++ b/externals/vcpkg/versions/l-/launch-darkly-server.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "79ea5536dae8c4031640373d54bdef7d0e746483", + "version": "2.4.3", + "port-version": 0 + } + ] +} \ No newline at end of file diff --git a/externals/vcpkg/versions/l-/lazy-importer.json b/externals/vcpkg/versions/l-/lazy-importer.json new file mode 100755 index 000000000..85591f3cb --- /dev/null +++ b/externals/vcpkg/versions/l-/lazy-importer.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "ba952940f6531135428e3827d0610d3596b683cb", + "version-date": "2022-02-09", + "port-version": 0 + }, + { + "git-tree": "3dba7a5ee217d732847b9906ba01f8571733cc35", + "version-date": "2021-10-23", + "port-version": 0 + }, + { + "git-tree": "8a2748be94ccc349f17bf4c54af9f574a56e2613", + "version-string": "2019-08-10", + "port-version": 1 + }, + { + "git-tree": "eee592b2e30fb35bb1ca3f2aa8e0013037ef4ccc", + "version-string": "2019-08-10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/lcm.json b/externals/vcpkg/versions/l-/lcm.json new file mode 100755 index 000000000..a0cb98da0 --- /dev/null +++ b/externals/vcpkg/versions/l-/lcm.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "2094a87ea105e0b1d78db96519581cda97d527e2", + "version": "1.4.0", + "port-version": 2 + }, + { + "git-tree": "0b549ce3154b5c20db2e2ffaec65b3d1d80705ab", + "version-string": "1.4.0", + "port-version": 1 + }, + { + "git-tree": "2754e3e6feb115a7fbcf76f1297e5c893be7c632", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "6e396f949483e198fb3cd4f656aee186b9100cab", + "version-string": "1.3.95-1", + "port-version": 0 + }, + { + "git-tree": "93353d69838f03b235814990742c59b8c5506409", + "version-string": "1.3.95", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/lcms.json b/externals/vcpkg/versions/l-/lcms.json new file mode 100755 index 000000000..5253e4224 --- /dev/null +++ b/externals/vcpkg/versions/l-/lcms.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "5e1b890660ea5d2a869407a0714d4385e949b4d6", + "version": "2.12", + "port-version": 3 + }, + { + "git-tree": "27ea0f07f8132e37a1e265ee54216eb0abc185dd", + "version": "2.12", + "port-version": 2 + }, + { + "git-tree": "40c7773d4774034a567f4b9f5427e558afe66ebd", + "version-string": "2.12", + "port-version": 1 + }, + { + "git-tree": "0020f124dcd6fa36e8ab5edad1efc85c59c51a56", + "version-string": "2.12", + "port-version": 0 + }, + { + "git-tree": "87ed3cf04e19a238f357a256419016aa49f88eb4", + "version-string": "2.11", + "port-version": 0 + }, + { + "git-tree": "4e242d8bd5a56e9b1fd9e661e567637a3b873d3e", + "version-string": "2.9-1", + "port-version": 0 + }, + { + "git-tree": "c081826f7e7ab6f0f77815ef977490591d4cefae", + "version-string": "2.9", + "port-version": 0 + }, + { + "git-tree": "491f74ae0cec150e607d4db92988afb65aed3abd", + "version-string": "2.8-5", + "port-version": 0 + }, + { + "git-tree": "de7e09d6231f0050332d407b5f8a8aaade48c74d", + "version-string": "2.8-4", + "port-version": 0 + }, + { + "git-tree": "ba9083b1dea6641f5fb0aec0dea313df5b2e6562", + "version-string": "2.8-3", + "port-version": 0 + }, + { + "git-tree": "02fd4bbb01ea5b216ef0bacb1c14283e274d2d35", + "version-string": "2.8-2", + "port-version": 0 + }, + { + "git-tree": "02fea392ed5fca378b02fcc2b94892d20407b45f", + "version-string": "2.8-1", + "port-version": 0 + }, + { + "git-tree": "297b72454dc0105b9f5d435afa08df98d8f76e3a", + "version-string": "2.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/leaf.json b/externals/vcpkg/versions/l-/leaf.json new file mode 100755 index 000000000..13fd9940e --- /dev/null +++ b/externals/vcpkg/versions/l-/leaf.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "276f8e1eb0a3ea4e0b0bd72dee0822660e6704f7", + "version-string": "0.2.2", + "port-version": 1 + }, + { + "git-tree": "8c2ccd63b0cd06fe4b908a159c85c689ed6cbdd1", + "version-string": "0.2.2", + "port-version": 0 + }, + { + "git-tree": "6ae9bfe2072f354c5ee5c6d94ce8c566e621638a", + "version-string": "0.2.1-2", + "port-version": 0 + }, + { + "git-tree": "e46ede61e08589959f5fb0f6c00fa84e393ee3e7", + "version-string": "0.2.1-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/lemon.json b/externals/vcpkg/versions/l-/lemon.json new file mode 100755 index 000000000..04d37dbe2 --- /dev/null +++ b/externals/vcpkg/versions/l-/lemon.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "20bb9fd243449f9c1376ae916567331839375a90", + "version-string": "0", + "port-version": 1 + }, + { + "git-tree": "1b9931e57629d344a0ea2b656008550604900452", + "version-string": "0", + "port-version": 0 + }, + { + "git-tree": "90cfb8a98d43129560e5c44a55c0e82e4a9d099b", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/leptonica.json b/externals/vcpkg/versions/l-/leptonica.json new file mode 100755 index 000000000..c0de57365 --- /dev/null +++ b/externals/vcpkg/versions/l-/leptonica.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "d69fc1cdb4cfb42aa1b6e608418f313fbbb3f9ab", + "version": "1.82.0", + "port-version": 0 + }, + { + "git-tree": "677775654e1914afaf5791361e9de3fac4762edc", + "version": "1.81.1", + "port-version": 1 + }, + { + "git-tree": "215a8a32b41e1561998ac840c3c35404707186a2", + "version": "1.81.1", + "port-version": 0 + }, + { + "git-tree": "5068586428e64792c526ff7192b26ca96f27a673", + "version-string": "1.80.0", + "port-version": 3 + }, + { + "git-tree": "620a94070633a9f786e0052d848c16632bd307b5", + "version-string": "1.80.0", + "port-version": 2 + }, + { + "git-tree": "27c2329af94e2199b49c1d01da4136fe0891105f", + "version-string": "1.80.0", + "port-version": 1 + }, + { + "git-tree": "9ed8135c6708327c0e5515bf2b3c175f113d3802", + "version-string": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "0ddf0c5660376a7b0ae1c641e71ed8c348f4996f", + "version-string": "1.78.0-1", + "port-version": 0 + }, + { + "git-tree": "64bbacef132cc5a87b5a490cff4d27db3455311b", + "version-string": "1.78.0", + "port-version": 0 + }, + { + "git-tree": "78a927b8258976486692ac5badb19de106cab81c", + "version-string": "1.76.0-1", + "port-version": 0 + }, + { + "git-tree": "6030d672c4f2f06353227902a3fa0fc1129f0e6e", + "version-string": "1.76.0", + "port-version": 0 + }, + { + "git-tree": "8157e86a51d1b004e1db007e30ae865241c75ff5", + "version-string": "1.74.4-5", + "port-version": 0 + }, + { + "git-tree": "1ffd3aac6861f39d94248c3f40736d74820f8d28", + "version-string": "1.74.4-3", + "port-version": 0 + }, + { + "git-tree": "6be9502011cb80993014849fdb2ebf2b59d0d8b3", + "version-string": "1.74.4-2", + "port-version": 0 + }, + { + "git-tree": "166acbf4ed05ce08247d3194b30684a4c5d27937", + "version-string": "1.74.4-1", + "port-version": 0 + }, + { + "git-tree": "67be31d07999377c75fda2b1208c749261294667", + "version-string": "1.74.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/lerc.json b/externals/vcpkg/versions/l-/lerc.json new file mode 100755 index 000000000..a65b52371 --- /dev/null +++ b/externals/vcpkg/versions/l-/lerc.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "3037b9fd610059bc84e89607a3e58aa13641cdd8", + "version": "3.0", + "port-version": 0 + }, + { + "git-tree": "81c91f19fa142f53370b1a7ecac53fd2ba10aaf6", + "version-string": "2.2", + "port-version": 2 + }, + { + "git-tree": "a35292098f9e9e64fe0326963ce31ae008df173b", + "version-string": "2.2", + "port-version": 1 + }, + { + "git-tree": "cb2e6ac2ea543271ddecb5b0d78f26a736b4cc4f", + "version-string": "2.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/lest.json b/externals/vcpkg/versions/l-/lest.json new file mode 100755 index 000000000..1eddbca5a --- /dev/null +++ b/externals/vcpkg/versions/l-/lest.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "94a9fb0d9b6b57287a652feea7268760986bb448", + "version-string": "1.35.1", + "port-version": 2 + }, + { + "git-tree": "6a10bd7bfa440dac6566183f709cf0d0c9d582ca", + "version-string": "1.35.1", + "port-version": 1 + }, + { + "git-tree": "98c85d725e3d121a7686e3ed2e457aa92b27304a", + "version-string": "1.35.1", + "port-version": 0 + }, + { + "git-tree": "ce80c0bd1c7754b515f1d3a869dce08f9eb599c3", + "version-string": "1.34.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/leveldb.json b/externals/vcpkg/versions/l-/leveldb.json new file mode 100755 index 000000000..9abb3c341 --- /dev/null +++ b/externals/vcpkg/versions/l-/leveldb.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "2ca11f66c6efa417b28755759b6c67670524f532", + "version": "1.22", + "port-version": 5 + }, + { + "git-tree": "c41d96d2e0f6f6301e2370bc00fa7390cdd94330", + "version-string": "1.22", + "port-version": 4 + }, + { + "git-tree": "55e42f74e1f541143900887a64661c8c8e4ea713", + "version-string": "1.22", + "port-version": 3 + }, + { + "git-tree": "d94e4685c15581a8e5740ee6061d8b608645fd31", + "version-string": "1.22", + "port-version": 2 + }, + { + "git-tree": "38da693d53b70286fe05028daf4fa5f3418455fb", + "version-string": "1.22-1", + "port-version": 0 + }, + { + "git-tree": "adcfa1c019e553cc47661e3859255a86432fa21f", + "version-string": "1.22", + "port-version": 0 + }, + { + "git-tree": "f8a523b9f906e02780428f9ccd59454674c08009", + "version-string": "2017-10-25-8b1cd3753b184341e837b30383832645135d3d73-3", + "port-version": 0 + }, + { + "git-tree": "bebf555777010d231e125b65fa2eb8bd0abc5e86", + "version-string": "2017-10-25-8b1cd3753b184341e837b30383832645135d3d73-2", + "port-version": 0 + }, + { + "git-tree": "dcbccbe571362c8e2e05b4006ac37aeb71e774de", + "version-string": "2017-10-25-8b1cd3753b184341e837b30383832645135d3d73-1", + "port-version": 0 + }, + { + "git-tree": "53d4aa791e91e34c8e511293325bbf37a23fd354", + "version-string": "2017-10-25-8b1cd3753b184341e837b30383832645135d3d73", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/levmar.json b/externals/vcpkg/versions/l-/levmar.json new file mode 100755 index 000000000..d7490901a --- /dev/null +++ b/externals/vcpkg/versions/l-/levmar.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "a869430352021a5fcecdd780a25e5ee0a4d769f5", + "version": "2.6", + "port-version": 1 + }, + { + "git-tree": "cbd0d2a467f781175f1900ca6857ddff74ab1cc5", + "version-string": "2.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libaaplus.json b/externals/vcpkg/versions/l-/libaaplus.json new file mode 100755 index 000000000..4e7d376fb --- /dev/null +++ b/externals/vcpkg/versions/l-/libaaplus.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "196f02649779e1a3b06c9d0c32b41082205c69b5", + "version": "2.36", + "port-version": 0 + }, + { + "git-tree": "350415271eff06157085854060050dcbc80448a9", + "version-string": "2.12", + "port-version": 2 + }, + { + "git-tree": "0d8f92d1cc3501ab9ce9cb87ab302acc29101847", + "version-string": "2.12-1", + "port-version": 0 + }, + { + "git-tree": "fe460706b267bcc1eb71839fb877328b68139d8e", + "version-string": "2.12", + "port-version": 0 + }, + { + "git-tree": "b5d63f8e711941f4088be95360ccc497fb78c528", + "version-string": "2.1.0-1", + "port-version": 0 + }, + { + "git-tree": "4c52f9922fef1d7f2475ca5914cfcc8b3f45a2c5", + "version-string": "2.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libaiff.json b/externals/vcpkg/versions/l-/libaiff.json new file mode 100755 index 000000000..0204fed5b --- /dev/null +++ b/externals/vcpkg/versions/l-/libaiff.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "1bd67ed6002176c79933b7e4c237e06604e16b1d", + "version-string": "5.0", + "port-version": 7 + }, + { + "git-tree": "384dd657e0debf56e8be77ca82cdb724bb4d7ba3", + "version-string": "5.0-6", + "port-version": 0 + }, + { + "git-tree": "754c432803b2b163397e8c674b3fb19f894ae401", + "version-string": "5.0-4", + "port-version": 0 + }, + { + "git-tree": "abf3ffc6b20f2975f45f2bb96fbbc66fbe4ce12c", + "version-string": "5.0-3", + "port-version": 0 + }, + { + "git-tree": "b82c7b5b64da9d96009e43d6457a54f5a6af77ab", + "version-string": "5.0-2", + "port-version": 0 + }, + { + "git-tree": "e4873a5927a048efa6b83dba6e5e693ca4742edd", + "version-string": "5.0-1", + "port-version": 0 + }, + { + "git-tree": "8296a7ba1d3e6db9a354dcf98e581541aa4d0a28", + "version-string": "5.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libalkimia.json b/externals/vcpkg/versions/l-/libalkimia.json new file mode 100755 index 000000000..2bd6b715e --- /dev/null +++ b/externals/vcpkg/versions/l-/libalkimia.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "09e0633aca7ce1433e7cd6542404a12f90bf1de1", + "version": "8.1.70", + "port-version": 1 + }, + { + "git-tree": "6cf107a0e18ea3b0238500ece6257e212a6ddd2b", + "version": "8.1.70", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libao.json b/externals/vcpkg/versions/l-/libao.json new file mode 100755 index 000000000..c0d0833c8 --- /dev/null +++ b/externals/vcpkg/versions/l-/libao.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "11240d91b73e6a968da37b8053a8a64a6d9ea55f", + "version": "1.2.2", + "port-version": 4 + }, + { + "git-tree": "931d3ed363323bdc4de00c91165f3a09e23fb6b1", + "version": "1.2.2", + "port-version": 3 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libarchive.json b/externals/vcpkg/versions/l-/libarchive.json new file mode 100755 index 000000000..ad02625e7 --- /dev/null +++ b/externals/vcpkg/versions/l-/libarchive.json @@ -0,0 +1,179 @@ +{ + "versions": [ + { + "git-tree": "84b70980f3d82a88b9f8628261efeefd4869755e", + "version": "3.6.1", + "port-version": 0 + }, + { + "git-tree": "aeb6f06729d407abcf56fa92b2fcff01c031035b", + "version-semver": "3.5.2", + "port-version": 5 + }, + { + "git-tree": "96ba668589b8400bcc1164b98fc5dcecf3af923e", + "version-semver": "3.5.2", + "port-version": 4 + }, + { + "git-tree": "2408bfca781ee9e5add6e674043e5f8ccca73a1b", + "version-semver": "3.5.2", + "port-version": 3 + }, + { + "git-tree": "d79d7deb863644fb2bd6570d17cfa88386fc4156", + "version-semver": "3.5.2", + "port-version": 2 + }, + { + "git-tree": "1fb5fbe606242275316a4368c88327e123ab01ad", + "version-semver": "3.5.2", + "port-version": 1 + }, + { + "git-tree": "4ce798873a82e4562c34189ec77f1dec3dea047d", + "version-semver": "3.5.2", + "port-version": 0 + }, + { + "git-tree": "576d8d60f06c8b4c616fd55559f3da94b9a8ae27", + "version-semver": "3.4.3", + "port-version": 8 + }, + { + "git-tree": "3c9f2bae07e5615f25bfc8326b1b85686953e918", + "version-semver": "3.4.3", + "port-version": 7 + }, + { + "git-tree": "8990b8db984f4a3652bb644608efd7dcd1573bf3", + "version-semver": "3.4.3", + "port-version": 6 + }, + { + "git-tree": "a8318f61dfe300b1b980b2ecaf295bd626572ad4", + "version-semver": "3.4.3", + "port-version": 5 + }, + { + "git-tree": "1246e0e0cd6bc4f0987fa5f5a130dc3b2e071285", + "version-semver": "3.4.3", + "port-version": 4 + }, + { + "git-tree": "114dd98b5e7865923e2e06a1ffad5661b0aec246", + "version-string": "3.4.3", + "port-version": 3 + }, + { + "git-tree": "5f418195172c2db767e6f0bae8ff4d07101c70e5", + "version-string": "3.4.3", + "port-version": 2 + }, + { + "git-tree": "9d686dda073b4aed34bd017aca7b9b6bc6d88547", + "version-string": "3.4.3", + "port-version": 1 + }, + { + "git-tree": "4f6c6237c726b301e105151dad0c138d72bfd7d8", + "version-string": "3.4.3", + "port-version": 0 + }, + { + "git-tree": "6c282f13aa502b3dbe66d8ab55f5b45701fbbb29", + "version-string": "3.4.1", + "port-version": 5 + }, + { + "git-tree": "9058df3358b216ab98eb67ab173a96355ba11ebf", + "version-string": "3.4.1", + "port-version": 4 + }, + { + "git-tree": "f961fd899e2e85584bd38fe14614141e6ce0063e", + "version-string": "3.4.1-3", + "port-version": 0 + }, + { + "git-tree": "ec16774888649ce1cca99db4a01a1d449b40540f", + "version-string": "3.4.1-2", + "port-version": 0 + }, + { + "git-tree": "c6abcc364aebfdef97d59a31d983a09b8fb26bea", + "version-string": "3.4.1-1", + "port-version": 0 + }, + { + "git-tree": "d3b1377981f132c3a1f3da4abd498e910f1b4870", + "version-string": "3.4.1", + "port-version": 0 + }, + { + "git-tree": "e29238b817c0a13ef2a7d0ff15a077e2296d17cd", + "version-string": "3.4.0-2", + "port-version": 0 + }, + { + "git-tree": "7d2d26231a7380534ab2b18933c70581628a75e4", + "version-string": "3.4.0-1", + "port-version": 0 + }, + { + "git-tree": "77b4b2c67a024dee83c970a6a0b7516e9477202d", + "version-string": "3.4.0", + "port-version": 0 + }, + { + "git-tree": "0fc368935299fa8517f24ac0700ff05ead3f5c5f", + "version-string": "3.3.3-3", + "port-version": 0 + }, + { + "git-tree": "7acc5b3a3e51c12c1e8b2e0efa356da9a0bcda63", + "version-string": "3.3.3-2", + "port-version": 0 + }, + { + "git-tree": "d03a0111f9bc772153ab9f4d0dd40162a8561838", + "version-string": "3.3.2-2", + "port-version": 0 + }, + { + "git-tree": "52a9565fb5ae357a0148920103bf581b43c62ecd", + "version-string": "3.3.2-1", + "port-version": 0 + }, + { + "git-tree": "d1b52e4ba696bda8c72372d7d73680946886bfc1", + "version-string": "3.3.2", + "port-version": 0 + }, + { + "git-tree": "fedd3aeb0669e5e1d854136f2cd43bca12eb8996", + "version-string": "3.3.1-1", + "port-version": 0 + }, + { + "git-tree": "350cdc2e0a0190bb5d2e9384a94b227823aff582", + "version-string": "3.3.1", + "port-version": 0 + }, + { + "git-tree": "43b8b580eda3407c9f8e312f4b6eabedbece8ee0", + "version-string": "3.2.2-2", + "port-version": 0 + }, + { + "git-tree": "92cdccb612cce373fa91a0e1326ec6a594e8e2fe", + "version-string": "3.2.2-1", + "port-version": 0 + }, + { + "git-tree": "a6e18abe8c5ebef4bc2ef4cdf3e5281af1897ff9", + "version-string": "3.2.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libass.json b/externals/vcpkg/versions/l-/libass.json new file mode 100755 index 000000000..1ab96ad46 --- /dev/null +++ b/externals/vcpkg/versions/l-/libass.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "b5dfc84a884c525317deec9d8e62df51d64a8e3d", + "version": "0.16.0", + "port-version": 0 + }, + { + "git-tree": "358f5ebe2b07d2c3043f1397a7caa51fcf7ebdce", + "version": "0.15.2", + "port-version": 0 + }, + { + "git-tree": "7c9d2203cb8e0f912847cdd70a9ba1142b1ab32f", + "version": "0.15.1", + "port-version": 1 + }, + { + "git-tree": "2512ee72e51fb02185743218ae2cd52f56ca232f", + "version": "0.15.1", + "port-version": 0 + }, + { + "git-tree": "ba6a3b98d6557361a7c46c0d8543e8d928a3825f", + "version-string": "0.15.0", + "port-version": 1 + }, + { + "git-tree": "09bc1e4af0701ac49dfb52104d0e940a5810e03d", + "version-string": "0.15.0", + "port-version": 0 + }, + { + "git-tree": "6ad6cc00ef59edba81bb9f42a4fd9113d3eafa24", + "version-string": "0.14.0", + "port-version": 4 + }, + { + "git-tree": "18f9f85dab37b62c09449c423c3ba4fc47b53630", + "version-string": "0.14.0", + "port-version": 3 + }, + { + "git-tree": "3d55130aa81b4d28c02e5b2c74592705d74a867e", + "version-string": "0.14.0", + "port-version": 2 + }, + { + "git-tree": "8076a175222d3f868bee621055819ef002686fc9", + "version-string": "0.14.0", + "port-version": 1 + }, + { + "git-tree": "0e28653f9bb0bc5308d6267f4c3ec4d7c410c52e", + "version-string": "0.14.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libassuan.json b/externals/vcpkg/versions/l-/libassuan.json new file mode 100755 index 000000000..7d3acd0e4 --- /dev/null +++ b/externals/vcpkg/versions/l-/libassuan.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "cf0ffd2dfbb239d338524fc0ea59311a869144c0", + "version": "2.5.3", + "port-version": 4 + }, + { + "git-tree": "4ff2ab79b12dcb656fa6286fdbfdff01b11b5b15", + "version": "2.5.3", + "port-version": 3 + }, + { + "git-tree": "4e6442db3e13636cd43910e945c5ab03656422dd", + "version-string": "2.5.3", + "port-version": 2 + }, + { + "git-tree": "c81f7935c5aeb61c86b14c014b4642436f8bac29", + "version-string": "2.5.3", + "port-version": 1 + }, + { + "git-tree": "4f706c770799458ae92ef15394a9f0b1bd25fdf8", + "version-string": "2.5.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libatomic-ops.json b/externals/vcpkg/versions/l-/libatomic-ops.json new file mode 100755 index 000000000..df1982c85 --- /dev/null +++ b/externals/vcpkg/versions/l-/libatomic-ops.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "a0165283f0349283e2d14bd752fc428fb9fffd6b", + "version": "7.7.0", + "port-version": 1 + }, + { + "git-tree": "6d7b45bb0c10342d8e43900fab12f2baab4eb6a1", + "version": "7.7.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libavif.json b/externals/vcpkg/versions/l-/libavif.json new file mode 100755 index 000000000..4bcdf7f29 --- /dev/null +++ b/externals/vcpkg/versions/l-/libavif.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "a160f6cf67dc99a095c98a9a7260b7a5fd110b7b", + "version-semver": "0.9.2", + "port-version": 1 + }, + { + "git-tree": "7e78225af6d76356499d029ed6cb0d55fa20629a", + "version-semver": "0.9.2", + "port-version": 0 + }, + { + "git-tree": "b2592851defcaf39a20d88d4edb670188254bade", + "version-semver": "0.9.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libb2.json b/externals/vcpkg/versions/l-/libb2.json new file mode 100755 index 000000000..b26edd252 --- /dev/null +++ b/externals/vcpkg/versions/l-/libb2.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "7c113e12089453e4e2cf2bbf67ad1f0b80a133a8", + "version": "0.98.1", + "port-version": 6 + }, + { + "git-tree": "0419d2f293a094dc4cdca1111daea2a6425a137b", + "version": "0.98.1", + "port-version": 5 + }, + { + "git-tree": "98925560fbceb14da7820146f6df113f9dae7988", + "version-string": "0.98.1", + "port-version": 4 + }, + { + "git-tree": "5c54a762a232fdd14c8b3c945715aaee5efcfa33", + "version-string": "0.98.1", + "port-version": 3 + }, + { + "git-tree": "9a6fd5bed1b925ba8b4d12372a3f6d6b48535165", + "version-string": "0.98.1-2", + "port-version": 0 + }, + { + "git-tree": "1b7b591e35ba71d91bc6e91642f8e1831c1bba3c", + "version-string": "0.98.1-1", + "port-version": 0 + }, + { + "git-tree": "a302d636d8a6122c64d1193fa45fd62d22695e50", + "version-string": "0.98.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libbacktrace.json b/externals/vcpkg/versions/l-/libbacktrace.json new file mode 100755 index 000000000..7204869c5 --- /dev/null +++ b/externals/vcpkg/versions/l-/libbacktrace.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "a9544b83bfa32d57ce62d9193a427a246b71f685", + "version-date": "2021-03-14", + "port-version": 1 + }, + { + "git-tree": "8772967fbaa6b8840266c0d04a6daccc78b44c3d", + "version-date": "2021-03-14", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libbf.json b/externals/vcpkg/versions/l-/libbf.json new file mode 100755 index 000000000..d338b8248 --- /dev/null +++ b/externals/vcpkg/versions/l-/libbf.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "b44ae45673f953a9aa87a1df8bdc04c6a4201aef", + "version-string": "1.0.0", + "port-version": 2 + }, + { + "git-tree": "919ff0d06dfb5f74a4913cf7a8ad44c2e70035b4", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "80ea083e7792bf29d4311db15051c6efdc427b1b", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libbson.json b/externals/vcpkg/versions/l-/libbson.json new file mode 100755 index 000000000..34edeaa0f --- /dev/null +++ b/externals/vcpkg/versions/l-/libbson.json @@ -0,0 +1,114 @@ +{ + "versions": [ + { + "git-tree": "6ad46cf0f2a10843d03cfd2e0388527561f9e2f0", + "version": "1.17.6", + "port-version": 1 + }, + { + "git-tree": "e2f9da5cc55e652deed81d0feb7aa71be2a1fdef", + "version": "1.17.6", + "port-version": 0 + }, + { + "git-tree": "6e6782528f3e1d88372ebe20fa82128419ab0c1c", + "version": "1.16.1", + "port-version": 3 + }, + { + "git-tree": "9988ee3812d5134cb3ebe09af0178e77518a1368", + "version-string": "1.16.1", + "port-version": 2 + }, + { + "git-tree": "3b6c45f68fc262b06caa265ed7e778cee574c6ff", + "version-string": "1.16.1", + "port-version": 1 + }, + { + "git-tree": "20b4eaa8d6accae6f1f3235f64ae7d4e7ca86f78", + "version-string": "1.16.1", + "port-version": 0 + }, + { + "git-tree": "e9b7d4072a52a483b0037b725fe525d55bcebdaa", + "version-string": "1.15.1-1", + "port-version": 0 + }, + { + "git-tree": "4ac176889fc2494f0705607d564ec3c738a486cb", + "version-string": "1.14.0-3", + "port-version": 0 + }, + { + "git-tree": "3a0163c8af23e267c5fa4f67bca9bcaf48103def", + "version-string": "1.14.0-1", + "port-version": 0 + }, + { + "git-tree": "db1904501f2c6dc18f0ad7a4b771674d93b41367", + "version-string": "1.14.0", + "port-version": 0 + }, + { + "git-tree": "f0008980e3ba6c2bcf0683a2d2f61e830f926073", + "version-string": "1.13.0", + "port-version": 0 + }, + { + "git-tree": "e76d2e6882b8521cd5d978692e8660b1cf4a9482", + "version-string": "1.9.5-1", + "port-version": 0 + }, + { + "git-tree": "6b69285fa35a4ef27f6cfa8a3ebd0fe2e018b96d", + "version-string": "1.9.2", + "port-version": 0 + }, + { + "git-tree": "44fadb8c764ac9c964944301793e5156340fe438", + "version-string": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "5026e09706897d6d711f03ce0df91d0b3b164b58", + "version-string": "1.6.2-2", + "port-version": 0 + }, + { + "git-tree": "76fd7e7b37ceac98bc69b4789ce23ff21e7632b1", + "version-string": "1.6.2-1", + "port-version": 0 + }, + { + "git-tree": "1fddeaef30218075e00f612343c1122edbcbbcb7", + "version-string": "1.6.2", + "port-version": 0 + }, + { + "git-tree": "384099567905aa38334a4a424c80ea63c09447c5", + "version-string": "1.5.1-3", + "port-version": 0 + }, + { + "git-tree": "58cc6d0210efaf247431f8376b83395a2e0a6bc1", + "version-string": "1.5.1-1", + "port-version": 0 + }, + { + "git-tree": "84d43e64b4509a9239b4cf16a0df450a6ea4e61e", + "version-string": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "48905010063a3aa317c9dbbf198d66acf5ae54d4", + "version-string": "1.5.0-rc6", + "port-version": 0 + }, + { + "git-tree": "d7a9f9538965b0951fda03c428b529f019153684", + "version-string": "1.4.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libcaer.json b/externals/vcpkg/versions/l-/libcaer.json new file mode 100755 index 000000000..19cb640b8 --- /dev/null +++ b/externals/vcpkg/versions/l-/libcaer.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4dffda61ffebd9440265c6edde057d1af909cf5c", + "version": "3.3.14", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libcanberra.json b/externals/vcpkg/versions/l-/libcanberra.json new file mode 100755 index 000000000..70262ca3e --- /dev/null +++ b/externals/vcpkg/versions/l-/libcanberra.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "30f433bae08d825ed5c8050194b7dd6a3009bf9a", + "version": "0.30", + "port-version": 2 + }, + { + "git-tree": "18398f54e696bb43cf68dc7efc3e32304487057e", + "version": "0.30", + "port-version": 1 + }, + { + "git-tree": "9332e8b3945451a2776337d41c54c7200d187a28", + "version": "0.30", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libcbor.json b/externals/vcpkg/versions/l-/libcbor.json new file mode 100755 index 000000000..eb5113b76 --- /dev/null +++ b/externals/vcpkg/versions/l-/libcbor.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "5e881ce93b52a9b16f4c03e4bed79c661def7631", + "version": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "02d970a2dac8b0abb941a5b445f7e14afc9c1e49", + "version": "0.8.0", + "port-version": 1 + }, + { + "git-tree": "ef3f79d600e1f00656e522591c6ff7beed247e3a", + "version-string": "0.8.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libcds.json b/externals/vcpkg/versions/l-/libcds.json new file mode 100755 index 000000000..60bbde654 --- /dev/null +++ b/externals/vcpkg/versions/l-/libcds.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "2030ee3d0c39352e9617f28fb14ed17c20b96741", + "version": "2.3.3", + "port-version": 2 + }, + { + "git-tree": "9c4f193efcb3e703332e10483b443570e1af5ae7", + "version-string": "2.3.3", + "port-version": 1 + }, + { + "git-tree": "fbfc5cffca8fb134abcceb5763a92ea1c90ffd5f", + "version-string": "2.3.3", + "port-version": 0 + }, + { + "git-tree": "bd82edd5a919b2c2ed378d85710d97f1c992e990", + "version-string": "2.3.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libcerf.json b/externals/vcpkg/versions/l-/libcerf.json new file mode 100755 index 000000000..471bb29f3 --- /dev/null +++ b/externals/vcpkg/versions/l-/libcerf.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "1aed61567fd3da5dc36a9a5290262b389ab79fa5", + "version": "1.13", + "port-version": 3 + }, + { + "git-tree": "e4bb4a4b841e96215ccc856fa1b8acc56270a1e4", + "version-string": "1.13", + "port-version": 2 + }, + { + "git-tree": "c9e514fd4a455016bc077fb0af7703a947868273", + "version-string": "1.13", + "port-version": 1 + }, + { + "git-tree": "46f542929aebafbe41f76a66e1073c94acf9936d", + "version-string": "1.13", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libconfig.json b/externals/vcpkg/versions/l-/libconfig.json new file mode 100755 index 000000000..9ec9af593 --- /dev/null +++ b/externals/vcpkg/versions/l-/libconfig.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "c9149e9c9d7a08455647bcadb1f178b7ee6ff3d2", + "version-string": "1.7.3", + "port-version": 1 + }, + { + "git-tree": "0ef471f5497ea4d07f8282487141bcbe3ea9f319", + "version-string": "1.7.3", + "port-version": 0 + }, + { + "git-tree": "079c1b8cc62fe544a3277a949422bd68c57e0c45", + "version-string": "1.7.2", + "port-version": 4 + }, + { + "git-tree": "c82b5fbc0a37ebd11ecb4f87b9d63df2552805e7", + "version-string": "1.7.2", + "port-version": 3 + }, + { + "git-tree": "02e991af7253bd4ef78d90fc43680c98be8bc817", + "version-string": "1.7.2-2", + "port-version": 0 + }, + { + "git-tree": "64a4c898a9b495de1c17c09768191f8cd47d5fd2", + "version-string": "1.7.2-1", + "port-version": 0 + }, + { + "git-tree": "f5c982944db4d83e865aa8d4824e741b7391cf12", + "version-string": "1.7.2", + "port-version": 0 + }, + { + "git-tree": "cfd89787a4b1b023d7cc87868ef11c8f8392b502", + "version-string": "1.7.1", + "port-version": 0 + }, + { + "git-tree": "b4acdcd40d02cd596261e22dc851cb91e2667eac", + "version-string": "1.6.0-1", + "port-version": 0 + }, + { + "git-tree": "8740a09298c3e43a0bacc1037dfee67768915fe1", + "version-string": "1.6.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libconfuse.json b/externals/vcpkg/versions/l-/libconfuse.json new file mode 100755 index 000000000..5d810f7bd --- /dev/null +++ b/externals/vcpkg/versions/l-/libconfuse.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "0af146d2f574294e6d2da2492203ebd1ddf5e2eb", + "version-string": "2019-07-14", + "port-version": 2 + }, + { + "git-tree": "aacb676c2698728d17cb0540a3dd4f538bcc2d66", + "version-string": "2019-07-14", + "port-version": 1 + }, + { + "git-tree": "66e56f1e0968508363349e1905716df75faf4ea7", + "version-string": "2019-07-14", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libcopp.json b/externals/vcpkg/versions/l-/libcopp.json new file mode 100755 index 000000000..bceee8ee2 --- /dev/null +++ b/externals/vcpkg/versions/l-/libcopp.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "d2f995866846ccb6dd7ae147312e095c66f912db", + "version-semver": "1.4.1", + "port-version": 2 + }, + { + "git-tree": "214d2cff167ae0646312fd5d5f2eecca62a91e19", + "version-semver": "1.4.1", + "port-version": 1 + }, + { + "git-tree": "88846bda722ae7f10ec578f41c08a9cacf2ba7ba", + "version-semver": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "22af9650936b7555dd45a5e211277095a37637dd", + "version-string": "1.3.4", + "port-version": 0 + }, + { + "git-tree": "ab9f0f8c9493edc67758f3e9e771d2e2ec4d341e", + "version-string": "1.3.3", + "port-version": 0 + }, + { + "git-tree": "ce0ccb93c730645d80ef4e4ee662987fed144465", + "version-string": "1.3.2", + "port-version": 0 + }, + { + "git-tree": "4ef38726cd4a72a2e4c935a8a2aced4a84d71329", + "version-string": "1.3.1", + "port-version": 1 + }, + { + "git-tree": "3c0c3beecc75e931620f9c115c0eacf090142155", + "version-string": "1.2.1", + "port-version": 0 + }, + { + "git-tree": "9507ac1659c722b2d7c153d28f9dad84cb305678", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "d613b4838f43483102a585fde189a236747af760", + "version-string": "1.1.0-2", + "port-version": 0 + }, + { + "git-tree": "b53d096b0ac0afeeaea78ca56c8f350c1af06a69", + "version-string": "1.1.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libcpplocate.json b/externals/vcpkg/versions/l-/libcpplocate.json new file mode 100755 index 000000000..ae128c720 --- /dev/null +++ b/externals/vcpkg/versions/l-/libcpplocate.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5f15b69e558a8774ebbc5bde4f5ddf70da27611c", + "version-semver": "2.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libcrafter.json b/externals/vcpkg/versions/l-/libcrafter.json new file mode 100755 index 000000000..098d07d84 --- /dev/null +++ b/externals/vcpkg/versions/l-/libcrafter.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "0ecb9324842496e1b30a3aec8dbda993e7881612", + "version": "1.0", + "port-version": 2 + }, + { + "git-tree": "f8fd06400911305144ebbecfd5f4ab627cf40743", + "version": "1.0", + "port-version": 1 + }, + { + "git-tree": "2d64cfcfa4f2d76c110499477112db136cca34ca", + "version": "1.0", + "port-version": 0 + }, + { + "git-tree": "ab60b081bd44f7a40a649a66c793373931815487", + "version-string": "0.3", + "port-version": 2 + }, + { + "git-tree": "5073c8dbf2082dfd4f612e835cd1cd0433b70ed2", + "version-string": "0.3-1", + "port-version": 0 + }, + { + "git-tree": "3fd1da7be7a740610b6bea20d0264faa2a895532", + "version-string": "0.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libcroco.json b/externals/vcpkg/versions/l-/libcroco.json new file mode 100755 index 000000000..8a70fca46 --- /dev/null +++ b/externals/vcpkg/versions/l-/libcroco.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "6235588ad9552c72690a152a0e4e108f0f7d1d64", + "version": "0.6.13", + "port-version": 3 + }, + { + "git-tree": "b561e15c4bff9ec1fcebcf150f10aa343ce8659f", + "version-string": "0.6.13", + "port-version": 2 + }, + { + "git-tree": "c595e2d082a720cb407f972e75d1c0bc5e1de225", + "version-string": "0.6.13-1", + "port-version": 0 + }, + { + "git-tree": "d2f0dc4bbc30082cfef9426cb5e20fbc5030bbb2", + "version-string": "0.6.13", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libcuckoo.json b/externals/vcpkg/versions/l-/libcuckoo.json new file mode 100755 index 000000000..35c71d5b6 --- /dev/null +++ b/externals/vcpkg/versions/l-/libcuckoo.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "47bda50b4e599d0dc81a015e175d1510de0ca62d", + "version-string": "0.3", + "port-version": 1 + }, + { + "git-tree": "777ec458aadd3bff96b4e601b3830c5a3e3be61c", + "version-string": "0.3", + "port-version": 0 + }, + { + "git-tree": "01352f70609af93c8330a2bda3ede238ca18eca7", + "version-string": "2018-12-24-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libcurl-simple-https.json b/externals/vcpkg/versions/l-/libcurl-simple-https.json new file mode 100755 index 000000000..3c91befa8 --- /dev/null +++ b/externals/vcpkg/versions/l-/libcurl-simple-https.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6b22a1dafa22c05f8eed41236534a247a28c23d0", + "version-date": "2022-02-14", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libdatachannel.json b/externals/vcpkg/versions/l-/libdatachannel.json new file mode 100755 index 000000000..cf467c701 --- /dev/null +++ b/externals/vcpkg/versions/l-/libdatachannel.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "9692159a4275af713e1525a9c81447fdd614869a", + "version-semver": "0.17.1", + "port-version": 0 + }, + { + "git-tree": "61f3e1e569991d144cb32b0f21c2b1e3baab78a2", + "version-semver": "0.16.4", + "port-version": 1 + }, + { + "git-tree": "a9f98aa660deca99a714ae3fc0e7a356c5d74cc8", + "version-semver": "0.16.4", + "port-version": 0 + }, + { + "git-tree": "d688c15b940166a1d8ecf701cafb7a060a7abd48", + "version-semver": "0.16.0", + "port-version": 0 + }, + { + "git-tree": "4ef71c270b3ea4205b878248ade5e50c03fd54b4", + "version-semver": "0.15.1", + "port-version": 1 + }, + { + "git-tree": "eb99868eb60c37127a98ff943da771edb8002a29", + "version-semver": "0.15.1", + "port-version": 0 + }, + { + "git-tree": "4e6c861ece23dfcb6f777b4a63dd97592cd578db", + "version-semver": "0.14.3", + "port-version": 1 + }, + { + "git-tree": "9cb7fedbd9d94190697740000539fb124d2b57d4", + "version-semver": "0.14.3", + "port-version": 0 + }, + { + "git-tree": "a58c126e0f1be88bc997210e63fe2e07cf64d1e5", + "version-semver": "0.14.1", + "port-version": 0 + }, + { + "git-tree": "a13526e9cfc5bfca3aa00e95afa184b498890f69", + "version-semver": "0.12.2", + "port-version": 1 + }, + { + "git-tree": "dd3107dd99419236f97e299ce4b61c2379a08f55", + "version-semver": "0.12.2", + "port-version": 0 + }, + { + "git-tree": "1c0a9c87c0695f1ecc03f342ba87d21ae152f7dd", + "version-semver": "0.12.0", + "port-version": 0 + }, + { + "git-tree": "a50b7fbf1ea5f38b6303e3491fac4de1c342337c", + "version-string": "v0.10.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libdatrie.json b/externals/vcpkg/versions/l-/libdatrie.json new file mode 100755 index 000000000..14fe14750 --- /dev/null +++ b/externals/vcpkg/versions/l-/libdatrie.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "60d1568dadc94ddb1b894b33a8da7b20802a96e8", + "version": "0.2.13", + "port-version": 1 + }, + { + "git-tree": "f8e0374439550fd870ff280c0a3321c202b42929", + "version": "0.2.13", + "port-version": 0 + }, + { + "git-tree": "55aab3566cc2c82313f67f484a411b28f53da90b", + "version-string": "0.2.10", + "port-version": 4 + }, + { + "git-tree": "5ce5ae0ac1e89557a8c353298a538d03967938a2", + "version-string": "0.2.10-3", + "port-version": 0 + }, + { + "git-tree": "72844c0d824f9854e37ada098e25844200459b93", + "version-string": "0.2.10-2", + "port-version": 0 + }, + { + "git-tree": "41d36379c2cd0aee1a9c3a12b87815a555ebf032", + "version-string": "0.2.10-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libdc1394.json b/externals/vcpkg/versions/l-/libdc1394.json new file mode 100755 index 000000000..4e630d646 --- /dev/null +++ b/externals/vcpkg/versions/l-/libdc1394.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "709fb395bf34f777acced25c12d6fd76d90f0100", + "version": "2.2.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libde265.json b/externals/vcpkg/versions/l-/libde265.json new file mode 100755 index 000000000..3ebc23251 --- /dev/null +++ b/externals/vcpkg/versions/l-/libde265.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "404108a20a6a0699d08f867b7da085ef3d91360b", + "version": "1.0.8", + "port-version": 5 + }, + { + "git-tree": "f69d985ecdaa897d5efd10422f739d450373e26d", + "version": "1.0.8", + "port-version": 4 + }, + { + "git-tree": "83f4bc2d067f213063ca93d6f1514d3f7278452c", + "version-string": "1.0.8", + "port-version": 3 + }, + { + "git-tree": "81ba07f30c6c2a068f8b9f017e437d0062920e4a", + "version-string": "1.0.8", + "port-version": 2 + }, + { + "git-tree": "e62a21fa7d1d31b6115cb99842ee2e0f54f2ff33", + "version-string": "1.0.8", + "port-version": 1 + }, + { + "git-tree": "857cfbdb4607f7799bc7beae422b3c244e5b8b3a", + "version-string": "1.0.8", + "port-version": 0 + }, + { + "git-tree": "6feb4dc7d349b171eea10994356ec038e8d921c6", + "version-string": "1.0.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libdisasm.json b/externals/vcpkg/versions/l-/libdisasm.json new file mode 100755 index 000000000..62593ea30 --- /dev/null +++ b/externals/vcpkg/versions/l-/libdisasm.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "ab983230ac21cfc3d2849abfa70551755ffcb5f8", + "version-string": "0.23", + "port-version": 9 + }, + { + "git-tree": "a15a1eeb7daa3d47d553ba0b14a151462377c41f", + "version-string": "0.23", + "port-version": 8 + }, + { + "git-tree": "51daf85e8709cd28fab9f5ec16d87de3351e4a62", + "version-string": "0.23-7", + "port-version": 0 + }, + { + "git-tree": "6e805dc3d7bf6a4d81dc68aab02bc5e697127ee5", + "version-string": "0.23-5", + "port-version": 0 + }, + { + "git-tree": "13d15881ddf641c2458e5354ac71af2234cb3b13", + "version-string": "0.23-3", + "port-version": 0 + }, + { + "git-tree": "d0cee79f332a30a168b6cd147ba1b55d59c0d7ab", + "version-string": "0.23-2", + "port-version": 0 + }, + { + "git-tree": "ea23da682b72624869e7ff8bcac37dcd72848102", + "version-string": "0.23-1", + "port-version": 0 + }, + { + "git-tree": "e1840364282eb7b9ac20c45468d3b1a7189272e9", + "version-string": "0.23", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libdivide.json b/externals/vcpkg/versions/l-/libdivide.json new file mode 100755 index 000000000..ac46b6fe3 --- /dev/null +++ b/externals/vcpkg/versions/l-/libdivide.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "b13f3b926e61d104e85e04bf192fabe29cd5f05e", + "version": "5.0", + "port-version": 0 + }, + { + "git-tree": "a632ce1c591ebeff2d020222f9a7cac938d3a623", + "version-string": "4.0.0", + "port-version": 1 + }, + { + "git-tree": "df4f2fc30723e55ff1c7e1709b1c1e3d0156e310", + "version-string": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "53fa48bfa91645b304275940d4dee97249ecb715", + "version-string": "3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libdjinterop.json b/externals/vcpkg/versions/l-/libdjinterop.json new file mode 100755 index 000000000..324976efb --- /dev/null +++ b/externals/vcpkg/versions/l-/libdjinterop.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "c1c63ff4c5483425a19992ddefa98a3c1e2fabf3", + "version": "0.16.0", + "port-version": 0 + }, + { + "git-tree": "f880d97fbd6043537231fcd201e5df71dc8b51f6", + "version-string": "0.14.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libdshowcapture.json b/externals/vcpkg/versions/l-/libdshowcapture.json new file mode 100755 index 000000000..7cb7815ef --- /dev/null +++ b/externals/vcpkg/versions/l-/libdshowcapture.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "fc1b7753ef4b7e6fc6d6390bc86fe5186ca45a92", + "version": "0.6.0", + "port-version": 3 + }, + { + "git-tree": "3573e5e73ce2e61477815f452a5d2cd4a96ec0c7", + "version-string": "0.6.0", + "port-version": 2 + }, + { + "git-tree": "0b16d08906d5a9a7b8fe8efbf43de3aa5050c24d", + "version-string": "0.6.0-1", + "port-version": 0 + }, + { + "git-tree": "9b0bebd68d07b679063b77678ca9ecdcc6aa505a", + "version-string": "0.6.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libe57.json b/externals/vcpkg/versions/l-/libe57.json new file mode 100755 index 000000000..647a28351 --- /dev/null +++ b/externals/vcpkg/versions/l-/libe57.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "e53fb4c480d35feeeb67361182d4d630ac3834ca", + "version-semver": "1.1.332", + "port-version": 2 + }, + { + "git-tree": "e38a82bc97129e317606207d234101aefe7dcb17", + "version-semver": "1.1.332", + "port-version": 1 + }, + { + "git-tree": "ed9a20551a07f8dbcb637af8394653c326e95aac", + "version-semver": "1.1.312", + "port-version": 1 + }, + { + "git-tree": "50300e4d95248be2c168fee27a31c5506c7b840d", + "version-semver": "1.1.312", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libe57format.json b/externals/vcpkg/versions/l-/libe57format.json new file mode 100755 index 000000000..52e292de1 --- /dev/null +++ b/externals/vcpkg/versions/l-/libe57format.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "49edc5b7628b3ce80320347ed3284237b50ac162", + "version-string": "2.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libebur128.json b/externals/vcpkg/versions/l-/libebur128.json new file mode 100755 index 000000000..bc1c54e1e --- /dev/null +++ b/externals/vcpkg/versions/l-/libebur128.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "44bed370ef5fdac0e6ec38493f00bebcd7b4c63c", + "version-string": "1.2.6", + "port-version": 0 + }, + { + "git-tree": "9bfff5d49e34c3ff392662fca4b0ab398a4148b3", + "version-string": "1.2.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libepoxy.json b/externals/vcpkg/versions/l-/libepoxy.json new file mode 100755 index 000000000..e24c9a7c9 --- /dev/null +++ b/externals/vcpkg/versions/l-/libepoxy.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "76fed10554d79f7163b7a0e6928fd03b37284989", + "version-semver": "1.5.9", + "port-version": 1 + }, + { + "git-tree": "6441c5ae7e331cdd952258f9806972ca7d173c8b", + "version-semver": "1.5.9", + "port-version": 0 + }, + { + "git-tree": "66e28966117a23b6e9ac6cba7e71ecad8a2803ea", + "version-semver": "1.5.5", + "port-version": 1 + }, + { + "git-tree": "5a4765be1ed914881477e17b993d7e8df3ef67f0", + "version-string": "1.5.5", + "port-version": 0 + }, + { + "git-tree": "0027cb5d966a46b33ac6a9873b6def6bfc98c404", + "version-string": "1.5.4", + "port-version": 2 + }, + { + "git-tree": "3b3c5cc282fc3e3adf4e20359820476eae3fcc6f", + "version-string": "1.5.4", + "port-version": 1 + }, + { + "git-tree": "289146deaead40e4bebe53b5ed92628b8e26edde", + "version-string": "1.5.4", + "port-version": 0 + }, + { + "git-tree": "e4fa2bd85d2ba6818fd105a3a9eeae8202b5b2ab", + "version-string": "1.5.3-4", + "port-version": 0 + }, + { + "git-tree": "86e483f3515a346d44d1e92290e8dad4b8c01597", + "version-string": "1.5.3-3", + "port-version": 0 + }, + { + "git-tree": "ce36f6d6a1aa413ea6f75ff37633c54a34175f76", + "version-string": "1.5.3-2", + "port-version": 0 + }, + { + "git-tree": "a3512df76b2b5a55c8ca9aae6c29517532b10beb", + "version-string": "1.5.3-1", + "port-version": 0 + }, + { + "git-tree": "02e32b41da1cb4451c4be8dc8f8e6553c3e0b701", + "version-string": "1.5.3", + "port-version": 0 + }, + { + "git-tree": "3f381a8bc8911ba973dddaf2ee8692203551bf3a", + "version-string": "1.4.3-2", + "port-version": 0 + }, + { + "git-tree": "8a591796e377474d9f918aed31f693e792cb8d6f", + "version-string": "1.4.3-1", + "port-version": 0 + }, + { + "git-tree": "bb7432a4884c6aa5cd3fb29049f952d8a7c6b6bf", + "version-string": "1.4.3", + "port-version": 0 + }, + { + "git-tree": "cca0df016679be0f5ae5ef2b8cb8a290b5acb528", + "version-string": "1.4.2", + "port-version": 0 + }, + { + "git-tree": "a9a6f98f5a0becdbec83fdc14078b9e1c4f77953", + "version-string": "1.4.1-7d58fd3", + "port-version": 0 + }, + { + "git-tree": "49563ad7d1dbf40f29a1918afa1e57321a20c2bb", + "version-string": "1.4.0-2432daf-1", + "port-version": 0 + }, + { + "git-tree": "bb7e3067aa54c5168c47b47bc554a49373556d4b", + "version-string": "1.4.0-2432daf", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libevent.json b/externals/vcpkg/versions/l-/libevent.json new file mode 100755 index 000000000..91ff59886 --- /dev/null +++ b/externals/vcpkg/versions/l-/libevent.json @@ -0,0 +1,104 @@ +{ + "versions": [ + { + "git-tree": "c1fbaddea4a9b98b61cba0d785441115c161d24f", + "version": "2.1.12", + "port-version": 6 + }, + { + "git-tree": "4c3a73b8448f16fa69e497ef6f1df41a261a9b54", + "version": "2.1.12", + "port-version": 5 + }, + { + "git-tree": "0405b56180d4920314ae69183ed5184a6017f7a9", + "version": "2.1.12", + "port-version": 4 + }, + { + "git-tree": "f0ac053f302fc802ef35f3349ad4af562a5a806d", + "version-string": "2.1.12", + "port-version": 3 + }, + { + "git-tree": "16a3ac34416a0b208f97f9a0afdeecdcc60699e1", + "version-string": "2.1.12", + "port-version": 2 + }, + { + "git-tree": "27a15ae417cdf4fd4388ab02d2949632699ce004", + "version-string": "2.1.12", + "port-version": 1 + }, + { + "git-tree": "de4ba2c173271d60e7022b3bd69440255cd0addd", + "version-string": "2.1.12", + "port-version": 0 + }, + { + "git-tree": "464499eb500390a56ac7e7b3cb6d2098ab254571", + "version-string": "2.1.11-5", + "port-version": 0 + }, + { + "git-tree": "f6b41d55f20103863facc8c14fe10072dfc9cfe9", + "version-string": "2.1.11-4", + "port-version": 0 + }, + { + "git-tree": "de61461b3ddd148fcce0ad0077e3ab66c23329e8", + "version-string": "2.1.11-3", + "port-version": 0 + }, + { + "git-tree": "ce0eed106e51862b3e1810af402b9cf2ba0c2bab", + "version-string": "2.1.11-2", + "port-version": 0 + }, + { + "git-tree": "9051d76e889e64c0bacb872069d62d0ac5eb6908", + "version-string": "2.1.11-1", + "port-version": 0 + }, + { + "git-tree": "bbb054e4dc1bbbd18887fc6a6cdb35abb9c08a17", + "version-string": "2.1.11", + "port-version": 0 + }, + { + "git-tree": "995edadf6e15a320af5ae0fcc5055074a25d0781", + "version-string": "2.1.10", + "port-version": 0 + }, + { + "git-tree": "e9ff8d204f14781a34b5937907539c2dbdaeb5d8", + "version-string": "2.1.8-5", + "port-version": 0 + }, + { + "git-tree": "761a8ed40dfb0282720dc59eaa0deaf6808abfef", + "version-string": "2.1.8-4", + "port-version": 0 + }, + { + "git-tree": "a0af7d1750ef9cb40881c97231e83f52624b463e", + "version-string": "2.1.8-3", + "port-version": 0 + }, + { + "git-tree": "2723fe4e19d8a81062fd8085e5b8d1f5c3f6174c", + "version-string": "2.1.8-2", + "port-version": 0 + }, + { + "git-tree": "a7979261bd1e0cab53cabc0206ee4e78547624fd", + "version-string": "2.1.8-1", + "port-version": 0 + }, + { + "git-tree": "2f29119492b98627d121d2eae04f4073f54df321", + "version-string": "2.1.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libevhtp.json b/externals/vcpkg/versions/l-/libevhtp.json new file mode 100755 index 000000000..9df827724 --- /dev/null +++ b/externals/vcpkg/versions/l-/libevhtp.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "2180aafd93f4089a276e9a5de9fe2d28d8e0f88d", + "version": "1.2.18", + "port-version": 3 + }, + { + "git-tree": "c28b6abc864cbfff6270358471bf9e97fd063710", + "version-string": "1.2.18", + "port-version": 2 + }, + { + "git-tree": "98227c0bbd789df044f349480c00378c5c56984c", + "version-string": "1.2.18", + "port-version": 1 + }, + { + "git-tree": "f4b43bbb672cdd75c87f028d5ae9f587070eb55b", + "version-string": "1.2.18", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libexif.json b/externals/vcpkg/versions/l-/libexif.json new file mode 100755 index 000000000..838a142b5 --- /dev/null +++ b/externals/vcpkg/versions/l-/libexif.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "cbe71aeb850791354309f2c953bf117ddc64f97a", + "version": "0.6.22", + "port-version": 2 + }, + { + "git-tree": "b068504fa067776d51b304e0c28e23532957c4b6", + "version-string": "0.6.22", + "port-version": 1 + }, + { + "git-tree": "8db41ebcc42f9b3695ac489c3ea72abb738477f5", + "version-string": "0.6.22", + "port-version": 0 + }, + { + "git-tree": "0bb1af537f815434564fdf9d81e0f4c37c5528d1", + "version-string": "0.6.21-2", + "port-version": 0 + }, + { + "git-tree": "bd8c40620aa37d57b1053b61cb0e0791bb794815", + "version-string": "0.6.21-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libfabric.json b/externals/vcpkg/versions/l-/libfabric.json new file mode 100755 index 000000000..f12f77fad --- /dev/null +++ b/externals/vcpkg/versions/l-/libfabric.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "d0a766bd1f01a742dcc12e13bafd741b94d7a3c0", + "version-semver": "1.13.2", + "port-version": 1 + }, + { + "git-tree": "f2ab311b282b282a5b10a3b52938c08efcdd1fc2", + "version-semver": "1.13.2", + "port-version": 0 + }, + { + "git-tree": "98605d765b6373e091da7f21b3d43667a9fc9da3", + "version-semver": "1.13.1", + "port-version": 0 + }, + { + "git-tree": "8eef6aae49aa30fcba5286829a5abc03c53a7580", + "version-string": "1.8.1", + "port-version": 2 + }, + { + "git-tree": "e0d8ee377354809a8031228a4a491f86beb73b81", + "version-string": "1.8.1-1", + "port-version": 0 + }, + { + "git-tree": "16efcca19286ac7f238b9b937b6f298942be6f64", + "version-string": "1.8.1", + "port-version": 0 + }, + { + "git-tree": "e4688d95f61fc71681a66076e38301888333306e", + "version-string": "1.8.0", + "port-version": 0 + }, + { + "git-tree": "ce00644b7e38e53c21a80ed372c5bdb2ba7406a7", + "version-string": "1.7.1-1", + "port-version": 0 + }, + { + "git-tree": "517d32ab45f1e6e04dca65a13b5728d4152b31c8", + "version-string": "1.7.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libffi.json b/externals/vcpkg/versions/l-/libffi.json new file mode 100755 index 000000000..ba4f4807c --- /dev/null +++ b/externals/vcpkg/versions/l-/libffi.json @@ -0,0 +1,114 @@ +{ + "versions": [ + { + "git-tree": "14f8b4d7dc645ea8f2ddfe77eeaaeef55f123cb5", + "version": "3.4.2", + "port-version": 5 + }, + { + "git-tree": "05f73f7c0bbd49045d312d90683a01405f5ffd83", + "version": "3.4.2", + "port-version": 4 + }, + { + "git-tree": "8fbd8bfde2d551ad1be625223a92997704469a8e", + "version": "3.4.2", + "port-version": 2 + }, + { + "git-tree": "f9f43cad9f7bd65719c32b242d330492ad326456", + "version": "3.4.2", + "port-version": 1 + }, + { + "git-tree": "683012a89ed0185eecbc3035b2490af7d2cd2379", + "version": "3.4.2", + "port-version": 0 + }, + { + "git-tree": "c40f59f0527e2336818bd5d6b0d14ae2bdc5c286", + "version": "3.3", + "port-version": 9 + }, + { + "git-tree": "ea2ed30397fc14caf66d8f7290306cfc5c5aa424", + "version": "3.3", + "port-version": 8 + }, + { + "git-tree": "7582c1b20c576263d22b8429155ead9117cc7c95", + "version-string": "3.3", + "port-version": 7 + }, + { + "git-tree": "d656f226f68b97173701d07c53633a3d05702abb", + "version-string": "3.3", + "port-version": 6 + }, + { + "git-tree": "4f8c2585308caf416f03f65903a085457ca208d1", + "version-string": "3.3", + "port-version": 5 + }, + { + "git-tree": "28ef86ae6dd4ec5207d5dd4e6030860c4617bff5", + "version-string": "3.3", + "port-version": 4 + }, + { + "git-tree": "0536ee6601d1932f0095ae7e1186ad1eb6e4c26d", + "version-string": "3.3-3", + "port-version": 0 + }, + { + "git-tree": "cd9d5f067076e9a9eb5a75a1330799e4e0af39aa", + "version-string": "3.3-2", + "port-version": 0 + }, + { + "git-tree": "7a8703938620d67e36df1f9b0d62d9b9afc7316e", + "version-string": "3.3-1", + "port-version": 0 + }, + { + "git-tree": "db6bb6b657118e37bcafd82512428614b0951269", + "version-string": "3.3", + "port-version": 0 + }, + { + "git-tree": "23026e75a4069265c509b07c28e00dd7ed5aa65a", + "version-string": "3.1-7", + "port-version": 0 + }, + { + "git-tree": "6197be84fe52ef7ff6d62ac6704d16cef0cf6277", + "version-string": "3.1-6", + "port-version": 0 + }, + { + "git-tree": "091a4da2d8358d4affb92480ff13190d62a4bf34", + "version-string": "3.1-5", + "port-version": 0 + }, + { + "git-tree": "061939a0aa8a6729d7c9ada9171da358fd256241", + "version-string": "3.1-4", + "port-version": 0 + }, + { + "git-tree": "6a1dfe49f27c9e48152c49d53a505ec70c70c51d", + "version-string": "3.1-1", + "port-version": 0 + }, + { + "git-tree": "6279494b20916bd1046844275297da3775e441e5", + "version-string": "3.1", + "port-version": 0 + }, + { + "git-tree": "4cb4682d201481f924c38850a6c7f0fed59de91e", + "version-string": "3.2.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libfido2.json b/externals/vcpkg/versions/l-/libfido2.json new file mode 100755 index 000000000..95a5d06be --- /dev/null +++ b/externals/vcpkg/versions/l-/libfido2.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "ad26e81c6c119e160709c7e0ce7872d888ed5a57", + "version": "1.10.0", + "port-version": 1 + }, + { + "git-tree": "0d3dc297cbc4c116910b6cb793bc3b5a06834e00", + "version": "1.10.0", + "port-version": 0 + }, + { + "git-tree": "170a0bcbc2f58e140205858db504ecfe7ade1a9f", + "version": "1.7.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libflac.json b/externals/vcpkg/versions/l-/libflac.json new file mode 100755 index 000000000..46b06a0c6 --- /dev/null +++ b/externals/vcpkg/versions/l-/libflac.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "a3dff2074f8f7a8ac9d8e9c5e78d8cae8538f3ef", + "version": "1.3.4", + "port-version": 0 + }, + { + "git-tree": "040c261fb123656fc61f659e887a6db0fabc275e", + "version": "1.3.3", + "port-version": 7 + }, + { + "git-tree": "682527a63d829627895d16e12759a08c26687db7", + "version-string": "1.3.3", + "port-version": 6 + }, + { + "git-tree": "2e34a0ed7543005386679cd20d4a6d13988c2492", + "version-string": "1.3.3", + "port-version": 5 + }, + { + "git-tree": "18eff4682c2e1a2f5e7b3db6cde1280b48fcf7f9", + "version-string": "1.3.3", + "port-version": 4 + }, + { + "git-tree": "95e9abb7bff34d0d49d037dc0c14d262573160fc", + "version-string": "1.3.3", + "port-version": 3 + }, + { + "git-tree": "7dd246cc52ce5a5ebd36192f999d5ad7965001ac", + "version-string": "1.3.3", + "port-version": 2 + }, + { + "git-tree": "8a6195f7d6328d0e754b79056455da25f75d5aaa", + "version-string": "1.3.3-1", + "port-version": 0 + }, + { + "git-tree": "c437f05ca049637a996059f716205112af5b7915", + "version-string": "1.3.3", + "port-version": 0 + }, + { + "git-tree": "b53507f76acb93ef8b1a31ae53c15fd751472437", + "version-string": "1.3.2-6", + "port-version": 0 + }, + { + "git-tree": "18fe3baf869af9cbb7b71435d9e0893706918941", + "version-string": "1.3.2-5", + "port-version": 0 + }, + { + "git-tree": "1ec2eed2bee308586113f3bcbd41f375618b889e", + "version-string": "1.3.2-4", + "port-version": 0 + }, + { + "git-tree": "0d94ba36b1ab5ea59e21c5be30e538dc70a55a1c", + "version-string": "1.3.2-3", + "port-version": 0 + }, + { + "git-tree": "db63997400752e6af84869fd85982bd0941f7b4f", + "version-string": "1.3.2-2", + "port-version": 0 + }, + { + "git-tree": "e5f22a2a0fc5c894b8007c63adf26c8e918f1cf7", + "version-string": "1.3.2-1", + "port-version": 0 + }, + { + "git-tree": "600b8d5b38ac82b981c60ffec8ee51d5fd5967ea", + "version-string": "1.3.2", + "port-version": 0 + }, + { + "git-tree": "75f248a016f545385854e0a6f4d9e045bac9a7d7", + "version-string": "1.3.1-1", + "port-version": 0 + }, + { + "git-tree": "a09a2bdbc4de9431a0b673ec378458f45ad2fcb0", + "version-string": "1.3.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libfort.json b/externals/vcpkg/versions/l-/libfort.json new file mode 100755 index 000000000..a4111418e --- /dev/null +++ b/externals/vcpkg/versions/l-/libfort.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "6b7925f1a567ce07e29977e40eb17f2a520922c8", + "version-semver": "0.4.2", + "port-version": 1 + }, + { + "git-tree": "3323e3e7b75556050db8a8ff3adeb38c3b7bfb98", + "version-semver": "0.4.2", + "port-version": 0 + }, + { + "git-tree": "0c816bc07eb1bf136201ff9dfeddbb6bc921ff50", + "version-string": "0.4.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libfreenect2.json b/externals/vcpkg/versions/l-/libfreenect2.json new file mode 100755 index 000000000..9313d9c6c --- /dev/null +++ b/externals/vcpkg/versions/l-/libfreenect2.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "ce8aefbc76e982371258202989111294d9a5221d", + "version": "0.2.0", + "port-version": 8 + }, + { + "git-tree": "cdedefe776984f442e8af70b0e0738d12d56fafa", + "version-string": "0.2.0", + "port-version": 7 + }, + { + "git-tree": "00c2b86114dcda5bd91f93d83e696b85148037a0", + "version-string": "0.2.0", + "port-version": 6 + }, + { + "git-tree": "84c6e844fcefbbce598025953699c7c536e1e783", + "version-string": "0.2.0", + "port-version": 5 + }, + { + "git-tree": "d6b54e2d5f02964d0ed62c141a33379221fc0c9b", + "version-string": "0.2.0-4", + "port-version": 0 + }, + { + "git-tree": "e9cb945cc85f30f50b5bf1250f8b0b2c3cf7e1e2", + "version-string": "0.2.0-3", + "port-version": 0 + }, + { + "git-tree": "aa442fbe793ad85e7551820a8e8070f269be0b36", + "version-string": "0.2.0-2", + "port-version": 0 + }, + { + "git-tree": "ea1452158c8956337d0a1e7b137202f6b916eaeb", + "version-string": "0.2.0-1", + "port-version": 0 + }, + { + "git-tree": "1b52377d6b0d38796ee2b72ffa9778eed249d397", + "version-string": "0.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libftdi.json b/externals/vcpkg/versions/l-/libftdi.json new file mode 100755 index 000000000..e269393c7 --- /dev/null +++ b/externals/vcpkg/versions/l-/libftdi.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "d9ba20048c2bbea3f1155e42faad0ab3b8a7e3f2", + "version-string": "0.20", + "port-version": 3 + }, + { + "git-tree": "432b2ffb3de6957b3569862e61d431171c916624", + "version-string": "0.20", + "port-version": 2 + }, + { + "git-tree": "f1c47411a9b3c7872cbeaf6bdc15e010662142c4", + "version-string": "0.20-1", + "port-version": 0 + }, + { + "git-tree": "bd6f4c5fecb20eed91e7e64c213d71db1986279e", + "version-string": "0.20", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libftdi1.json b/externals/vcpkg/versions/l-/libftdi1.json new file mode 100755 index 000000000..a03ff9797 --- /dev/null +++ b/externals/vcpkg/versions/l-/libftdi1.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "bfed0e0f6e07e8ce7a94f47efbad9dde21f193c8", + "version": "1.5", + "port-version": 3 + }, + { + "git-tree": "412a93e6eef636e36b23774f3d132fe4df89d979", + "version": "1.5", + "port-version": 2 + }, + { + "git-tree": "5e6c7ec4555f72017a8e1982492aa8fc3cabcd83", + "version": "1.5", + "port-version": 1 + }, + { + "git-tree": "9d83012d7f5b6d0c838ce11124d77303933b4008", + "version-string": "1.4-1", + "port-version": 0 + }, + { + "git-tree": "c912cf2edca72b53fe74c00463bbcd67767733c6", + "version-string": "1.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libgcrypt.json b/externals/vcpkg/versions/l-/libgcrypt.json new file mode 100755 index 000000000..133aaffed --- /dev/null +++ b/externals/vcpkg/versions/l-/libgcrypt.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "ba183f10b284405f9b4b50720d7583131a87d393", + "version": "1.10.1", + "port-version": 0 + }, + { + "git-tree": "8c0737adf68a0ada3ed976e4acf201b4cbeb9dfe", + "version": "1.9.4", + "port-version": 2 + }, + { + "git-tree": "e850fdb19fd41c8270ea52dfa3dbe346b23e25f5", + "version": "1.9.4", + "port-version": 1 + }, + { + "git-tree": "7b99b42dfc0f469a13d4e39d9802012b9a7e78d1", + "version": "1.9.4", + "port-version": 0 + }, + { + "git-tree": "43a3a46962e0195eefd661d621f1a69c267d067e", + "version-string": "1.8.7", + "port-version": 2 + }, + { + "git-tree": "394e5b7b433e4b18e9276c48b7331fbea30034ba", + "version-string": "1.8.7", + "port-version": 1 + }, + { + "git-tree": "3a7be352162b1187194ba75ff3514361213f77a6", + "version-string": "1.8.7", + "port-version": 0 + }, + { + "git-tree": "4fd1f0fdf10d205488c813a331b0547e9ab9bbc0", + "version-string": "1.8.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libgd.json b/externals/vcpkg/versions/l-/libgd.json new file mode 100755 index 000000000..9b02569ba --- /dev/null +++ b/externals/vcpkg/versions/l-/libgd.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "998c59c287a0d8a172944f46fbfce71c8967394f", + "version-semver": "2.3.2", + "port-version": 1 + }, + { + "git-tree": "e1e99522d139bf2f72dc030d433117e8f430885f", + "version-semver": "2.3.2", + "port-version": 0 + }, + { + "git-tree": "40171bc92f5cead1423ede203de8ad2752cb16b8", + "version-string": "2.2.5", + "port-version": 5 + }, + { + "git-tree": "4b7ae023feb1082b88dfef98ddf7fe214e04f150", + "version-string": "2.2.5-4", + "port-version": 0 + }, + { + "git-tree": "81a734cda6ec896face24be96a430d97f1ab383f", + "version-string": "2.2.5-3", + "port-version": 0 + }, + { + "git-tree": "8b640bf33b8ba3766d7bc6db5a72a9f8a4ceea6b", + "version-string": "2.2.5-2", + "port-version": 0 + }, + { + "git-tree": "8bd87c35f834a67249de3660145b9de5777932e7", + "version-string": "2.2.5-1", + "port-version": 0 + }, + { + "git-tree": "e190b4414238d958e52f52f1a07ddbfd647c6a1d", + "version-string": "2.2.5", + "port-version": 0 + }, + { + "git-tree": "437ce4fdf79a521c14d9db4836dc172a3c223388", + "version-string": "2.2.4-5", + "port-version": 0 + }, + { + "git-tree": "c5107eab3c45f622c47dede23056274035d1192f", + "version-string": "2.2.4-4", + "port-version": 0 + }, + { + "git-tree": "b9f2b89639ad6eca239b1e545614a218cf691766", + "version-string": "2.2.4-3", + "port-version": 0 + }, + { + "git-tree": "e6469b934beac48e9dda641f09a865c8006f9562", + "version-string": "2.2.4-2", + "port-version": 0 + }, + { + "git-tree": "abad9ed708e0800249115e7a3cdfb3ca7bdaf487", + "version-string": "2.2.4-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libgeotiff.json b/externals/vcpkg/versions/l-/libgeotiff.json new file mode 100755 index 000000000..6c93ee7b6 --- /dev/null +++ b/externals/vcpkg/versions/l-/libgeotiff.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "5f9baab006dd2bd507b6b8f63d2226dc6ce97cd1", + "version": "1.7.1", + "port-version": 0 + }, + { + "git-tree": "91982f7018b13638993efc70c14bf0996105f0bc", + "version": "1.7.0", + "port-version": 1 + }, + { + "git-tree": "f68bbf7c0472548573a69d1e41801edb1179c028", + "version": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "2211c53755bff618e685ac712f96ee381d2ba6a6", + "version-string": "1.6.0", + "port-version": 4 + }, + { + "git-tree": "2776355ea4b59dd06ec5b231c5080cd9b2157a16", + "version-string": "1.6.0", + "port-version": 3 + }, + { + "git-tree": "7cd5cd08571c3a463ea30e6b47a6e407301199fe", + "version-string": "1.6.0", + "port-version": 2 + }, + { + "git-tree": "413293d224293f65999b988ba07734ad78793405", + "version-string": "1.6.0", + "port-version": 1 + }, + { + "git-tree": "66eb337495fb9ac5d8cfdb96195b5d1c063088b6", + "version-string": "1.6.0", + "port-version": 0 + }, + { + "git-tree": "5c9bc07e3f09de7db58e47ea3e3ff85c54dde593", + "version-string": "1.4.2-10", + "port-version": 0 + }, + { + "git-tree": "4a29215fab2e4cb7994a00425986755f813cb21b", + "version-string": "1.4.2-9", + "port-version": 0 + }, + { + "git-tree": "1d3d0ee4657ddbd958cd116171e2f6b10cd969fa", + "version-string": "1.4.2-8", + "port-version": 0 + }, + { + "git-tree": "8dd91ef0f769529195818c1bddbdab3202026d84", + "version-string": "1.4.2-7", + "port-version": 0 + }, + { + "git-tree": "b6dec27e428ea7be87335d63e9201eeb55b1c3bc", + "version-string": "1.4.2-6", + "port-version": 0 + }, + { + "git-tree": "6752971ef7e155b673d55747f372dfb94047da0d", + "version-string": "1.4.2-4", + "port-version": 0 + }, + { + "git-tree": "1a2bbf7095fa8e9c60acf1d79571397d6c122270", + "version-string": "1.4.2-3", + "port-version": 0 + }, + { + "git-tree": "407880bac7bf6a12cc71e3884ae407cd59322970", + "version-string": "1.4.2-2", + "port-version": 0 + }, + { + "git-tree": "5d1936cbae72857694e2dd2a6c1ffa66cc93a094", + "version-string": "1.4.2-1", + "port-version": 0 + }, + { + "git-tree": "0b4e7e1425df33cf2f214fbcfe6405714c85035d", + "version-string": "1.4.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libgit2.json b/externals/vcpkg/versions/l-/libgit2.json new file mode 100755 index 000000000..170466619 --- /dev/null +++ b/externals/vcpkg/versions/l-/libgit2.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "e036ca61d2e12b110c920cadf92f0aa4f39cac9b", + "version-semver": "1.4.2", + "port-version": 0 + }, + { + "git-tree": "37f2b6e92b60481a4db74de9da17385706d7d2e9", + "version-semver": "1.3.0", + "port-version": 2 + }, + { + "git-tree": "608c02285dbac754d7b2a34e67f081879cdee38f", + "version-semver": "1.3.0", + "port-version": 1 + }, + { + "git-tree": "20883074dd1404f4170f03b1c4d04d7a0e05b0fe", + "version-semver": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "daddb751c1ff040d820dd32d62f08c94482b49ae", + "version-semver": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "23d98ed81409eaac3ae1abc9ddbc175564533d65", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "bf4720827fa1b6b32ab6f0cce542d2fd2e05575b", + "version-string": "1.0.1", + "port-version": 1 + }, + { + "git-tree": "d5aec3ac843b213d643bb620c1474d162b53e570", + "version-string": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "a61d9f70f4d286c7d65dae7a9518a811af563ef6", + "version-string": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "68e86f8dbab0b20029f93dfb2172cb89b8276076", + "version-string": "0.99.0-1", + "port-version": 0 + }, + { + "git-tree": "575a3301cdfdefd5b797da8ade7b372670a1f892", + "version-string": "0.99.0", + "port-version": 0 + }, + { + "git-tree": "f5b45e02da0e0385ffdd79f60f2e120f58e385ba", + "version-string": "0.28.4", + "port-version": 0 + }, + { + "git-tree": "a5b0a934e56a05edb00dfe5e7283e35551fd9e2b", + "version-string": "0.28.3", + "port-version": 0 + }, + { + "git-tree": "4b227d5c4ff561b794ed0281dfd0d880b21840b3", + "version-string": "0.28.2", + "port-version": 0 + }, + { + "git-tree": "0e5dab96476580fe3aa48e1dc6c97414b8500213", + "version-string": "0.28.1", + "port-version": 0 + }, + { + "git-tree": "97c99da4462e9db2294fbc8f85d51e569f691723", + "version-string": "0.27.4-2", + "port-version": 0 + }, + { + "git-tree": "1181932c441f6853233a862b9b4a72da81c87a9f", + "version-string": "0.27.4-1", + "port-version": 0 + }, + { + "git-tree": "87c694b4537e2f4764aca9de0e52c3341157b91f", + "version-string": "0.26.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libgnutls.json b/externals/vcpkg/versions/l-/libgnutls.json new file mode 100755 index 000000000..7e4285583 --- /dev/null +++ b/externals/vcpkg/versions/l-/libgnutls.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "f041c07b59c7ac2389ac1fd6d8a175466bb648b7", + "version": "3.6.15", + "port-version": 3 + }, + { + "git-tree": "c03a1c452fa39d1b6d884aa3ef12c0c98a11f0a3", + "version": "3.6.15", + "port-version": 2 + }, + { + "git-tree": "09f2d8c5e4e07d2076324767d251fef3bc4acb8c", + "version": "3.6.15", + "port-version": 1 + }, + { + "git-tree": "089f1c103a3f2c52e6ae54e8956a98345502e286", + "version": "3.6.15", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libgo.json b/externals/vcpkg/versions/l-/libgo.json new file mode 100755 index 000000000..7fa55e263 --- /dev/null +++ b/externals/vcpkg/versions/l-/libgo.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "e7eea4022110bad013d460a23328cd2e82385bb1", + "version": "3.1", + "port-version": 5 + }, + { + "git-tree": "b50450a394cd5b4e882d353439c3dae6cc0564f2", + "version": "3.1", + "port-version": 4 + }, + { + "git-tree": "120510985335ea4bd1b8a91982d0f95842e43ba3", + "version": "3.1", + "port-version": 3 + }, + { + "git-tree": "1158e6c06fa6cb413bf12c04065ff58b8930c474", + "version": "3.1", + "port-version": 2 + }, + { + "git-tree": "0f54bcfa9c4d0b052bddeb9d450564ee109c0e01", + "version-string": "3.1-1", + "port-version": 0 + }, + { + "git-tree": "c09269da5eea2f0f0ee8256b6019d8fed4436b31", + "version-string": "2.8-2", + "port-version": 0 + }, + { + "git-tree": "ff2963bf164d6089016a8fc518e76bc4d68833a9", + "version-string": "2.8-1", + "port-version": 0 + }, + { + "git-tree": "b7edfdb13025ab0a269350ea8e847c0bfa615797", + "version-string": "2.8", + "port-version": 0 + }, + { + "git-tree": "42030917a263420d4e322d4e559cc5b920fc3ee6", + "version-string": "2.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libgpg-error.json b/externals/vcpkg/versions/l-/libgpg-error.json new file mode 100755 index 000000000..7b6379058 --- /dev/null +++ b/externals/vcpkg/versions/l-/libgpg-error.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "1ced42ca6160e2283326366e1c1132fe50acfb97", + "version": "1.42", + "port-version": 3 + }, + { + "git-tree": "f6c78e927a70ff136576abd61f1125861824bfd2", + "version": "1.42", + "port-version": 2 + }, + { + "git-tree": "b5abbf9cf832337e202ff5d8d4296025b47be1a0", + "version": "1.42", + "port-version": 1 + }, + { + "git-tree": "80b315c6991fd5092637d010433ebfcbcbfda92d", + "version": "1.42", + "port-version": 0 + }, + { + "git-tree": "36b77502b20b311f354f24c02f27fd5dd4896663", + "version-string": "1.39", + "port-version": 1 + }, + { + "git-tree": "e5779f2d8e3f5c155d4b2e0b05661a9e0032c00a", + "version-string": "1.39", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libgpiod.json b/externals/vcpkg/versions/l-/libgpiod.json new file mode 100755 index 000000000..f63117753 --- /dev/null +++ b/externals/vcpkg/versions/l-/libgpiod.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "014bb3350492c4259151f00b3419e2054f707401", + "version": "1.6.3", + "port-version": 1 + }, + { + "git-tree": "9a8b2a2d891f2435ff9ce3fbcea0bd870327bad0", + "version": "1.6.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libgpod.json b/externals/vcpkg/versions/l-/libgpod.json new file mode 100755 index 000000000..04c205a2b --- /dev/null +++ b/externals/vcpkg/versions/l-/libgpod.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "7006c4e3b96b2f99797857f8fee4496871940eff", + "version-date": "2019-08-29", + "port-version": 4 + }, + { + "git-tree": "5adfcf9af0bb6d32ba1d2f28df12216795406115", + "version-date": "2019-08-29", + "port-version": 3 + }, + { + "git-tree": "1cd0507330bb60a05e40c4761afd8e687a43b44e", + "version-string": "2019-08-29", + "port-version": 2 + }, + { + "git-tree": "8b64c54ab02529265f147d29a47970ea85077798", + "version-string": "2019-08-29", + "port-version": 1 + }, + { + "git-tree": "f676c12ba18497031a92cda2b11e88d5c84410b7", + "version-string": "2019-08-29", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libgta.json b/externals/vcpkg/versions/l-/libgta.json new file mode 100755 index 000000000..cf86d9ae5 --- /dev/null +++ b/externals/vcpkg/versions/l-/libgta.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "18ddcdbec1183e609dbb8a76bddbadd4b3ee6d72", + "version-string": "1.0.8", + "port-version": 3 + }, + { + "git-tree": "876f40188d1fb98aa9e19123118134f2a58925da", + "version-string": "1.0.8", + "port-version": 2 + }, + { + "git-tree": "181fc8b0e69799143f50b56df17a83f630025eb2", + "version-string": "1.0.8-1", + "port-version": 0 + }, + { + "git-tree": "61385eecc68e5cd84e58940bba1e69454e1d24ec", + "version-string": "1.0.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libguarded.json b/externals/vcpkg/versions/l-/libguarded.json new file mode 100755 index 000000000..2e1bb5fe2 --- /dev/null +++ b/externals/vcpkg/versions/l-/libguarded.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "f3bf2a0dfd157d2505e5e992ec7c1fdc6a301198", + "version-string": "2019-08-27", + "port-version": 2 + }, + { + "git-tree": "7ccf839a39803f3527707b0bf00818d8fe58b904", + "version-string": "2019-08-27-1", + "port-version": 0 + }, + { + "git-tree": "e7d1d03c9284203b7142d2d85aae0f959d757840", + "version-string": "2019-08-27", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libgwenhywfar.json b/externals/vcpkg/versions/l-/libgwenhywfar.json new file mode 100755 index 000000000..2fe591469 --- /dev/null +++ b/externals/vcpkg/versions/l-/libgwenhywfar.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "0aa4c84df4c2b05214574c2dbd524dfee2b694f8", + "version-semver": "5.6.0", + "port-version": 2 + }, + { + "git-tree": "279d1ba6d5ca2068bcd117050cb0f3c464b2cb8f", + "version-semver": "5.6.0", + "port-version": 1 + }, + { + "git-tree": "5be9e6060d67e8aad23d1de86effb0ce52605ec4", + "version-semver": "5.6.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libgxps.json b/externals/vcpkg/versions/l-/libgxps.json new file mode 100755 index 000000000..ef93cc3ff --- /dev/null +++ b/externals/vcpkg/versions/l-/libgxps.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "bc4e4576421dec679fb4a7c09497cbc13f99df00", + "version": "0.3.2", + "port-version": 1 + }, + { + "git-tree": "aa14ea859cee510d9c738fbdb5a1955531aabb87", + "version": "0.3.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libharu.json b/externals/vcpkg/versions/l-/libharu.json new file mode 100755 index 000000000..e08b48e1b --- /dev/null +++ b/externals/vcpkg/versions/l-/libharu.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "312f4b697d2f46818c218e270bd447cdeb76322c", + "version-string": "2017-08-15", + "port-version": 10 + }, + { + "git-tree": "61662ee1cfa10c3e5244a43e24eb1f47e524c293", + "version-string": "2017-08-15-9", + "port-version": 0 + }, + { + "git-tree": "b38d6f36cdf85bd9411396a0fddfc3c486b5c8f1", + "version-string": "2017-08-15-8", + "port-version": 0 + }, + { + "git-tree": "9a90855c9cd86ff0fb98524370f5c4b46bfa5381", + "version-string": "2017-08-15-d84867ebf9f-6", + "port-version": 0 + }, + { + "git-tree": "d823a13a19523ccd3dbe078b0a571dd8b55913a2", + "version-string": "2017-08-15-d84867ebf9f-5", + "port-version": 0 + }, + { + "git-tree": "d6020be6d61ba701f9759f11dd3dcfcb7ecd71cb", + "version-string": "2017-08-15-d84867ebf9f-4", + "port-version": 0 + }, + { + "git-tree": "5b0f249b1cf476632b6125e550faf540f76e5ed5", + "version-string": "2017-08-15-d84867ebf9f-3", + "port-version": 0 + }, + { + "git-tree": "237a24c4210853cc45aec929c10e243caa371cd8", + "version-string": "2017-08-15-d84867ebf9f-2", + "port-version": 0 + }, + { + "git-tree": "074de99d046605c7ed508f054c2a76aaf85711b5", + "version-string": "2017-08-15-d84867ebf9f-1", + "port-version": 0 + }, + { + "git-tree": "a4eb9f16a5fd13d0d3a328a279b7a36977ceb5f9", + "version-string": "2017-08-15-d84867ebf9f", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libhdfs3.json b/externals/vcpkg/versions/l-/libhdfs3.json new file mode 100755 index 000000000..3e3ad9c31 --- /dev/null +++ b/externals/vcpkg/versions/l-/libhdfs3.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "b672d2e93109f3909140f7315703ab2ea010d808", + "version-date": "2019-11-05", + "port-version": 3 + }, + { + "git-tree": "440244ba92f1f0b67d7246f707df2545f477f3f4", + "version-string": "2019-11-05", + "port-version": 2 + }, + { + "git-tree": "21db40c50744011ba13568f8e3a72dd97de84ea9", + "version-string": "2019-11-05", + "port-version": 1 + }, + { + "git-tree": "7073226fafe5505d37336317d3778e3b4fa5a4a5", + "version-string": "2019-11-05", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libheif.json b/externals/vcpkg/versions/l-/libheif.json new file mode 100755 index 000000000..437397e9a --- /dev/null +++ b/externals/vcpkg/versions/l-/libheif.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "9638a1f823a06ad68484b408f5640ac2204b5262", + "version": "1.12.0", + "port-version": 3 + }, + { + "git-tree": "73b2b4b29035aa22da5ccd0c4c46dbb6e5516424", + "version": "1.12.0", + "port-version": 2 + }, + { + "git-tree": "738b6fc8b77a7fa90cd5966358dc3be684a832c1", + "version": "1.12.0", + "port-version": 1 + }, + { + "git-tree": "7d62a94252d06f84e8011c02793458b43d9f5cd2", + "version": "1.12.0", + "port-version": 0 + }, + { + "git-tree": "a05aafcbf48befb78710d61cee5d64aa37788a83", + "version": "1.10.0", + "port-version": 3 + }, + { + "git-tree": "ba05813e40676056ca9a267270a62c4001635db0", + "version": "1.10.0", + "port-version": 2 + }, + { + "git-tree": "3d3c59db389efc750f06aa0347eb5ed851b2a37d", + "version": "1.10.0", + "port-version": 1 + }, + { + "git-tree": "c36a0bd1bad8a5b97df02274ec717586ec4729c9", + "version-string": "1.10.0", + "port-version": 0 + }, + { + "git-tree": "880c4de9d6c175dfb36fc07d02cc892346e68e83", + "version-string": "1.9.1", + "port-version": 0 + }, + { + "git-tree": "5f42cdf0827d6fbef347a6eb29ef5cf91f4e4fd2", + "version-string": "1.7.0", + "port-version": 1 + }, + { + "git-tree": "4f57f31ba938a5f2af9aa50ab4dbdc8f9e9875ad", + "version-string": "1.7.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libhsplasma.json b/externals/vcpkg/versions/l-/libhsplasma.json new file mode 100755 index 000000000..dcfd8672a --- /dev/null +++ b/externals/vcpkg/versions/l-/libhsplasma.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "8b2f7f61711ccfb81d5d9a8b34e057494bd5f902", + "version-date": "2022-05-19", + "port-version": 0 + }, + { + "git-tree": "1e9aee8fff86881286f825d1efa9afd1d4f013c6", + "version-string": "2021.06.08", + "port-version": 1 + }, + { + "git-tree": "9ffbd25ec776fbae40999d98a50d927180b560b5", + "version-string": "2021.06.08", + "port-version": 0 + }, + { + "git-tree": "3cc323670945b88a5da121aa2823e4ac154d964e", + "version-string": "2020.08.30", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libhv.json b/externals/vcpkg/versions/l-/libhv.json new file mode 100755 index 000000000..88a9f22e0 --- /dev/null +++ b/externals/vcpkg/versions/l-/libhv.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "3533f306ae38ad29c619656d006ae9536bfcdcb4", + "version": "1.2.4", + "port-version": 2 + }, + { + "git-tree": "b5953fb3634520fafd04507d0a7266e92c87a129", + "version": "1.2.4", + "port-version": 1 + }, + { + "git-tree": "9867c0ba3cb7de25db2dd22fdd5633de7faae440", + "version": "1.2.4", + "port-version": 0 + }, + { + "git-tree": "83c3744dfa329eb88671faee8c3839c1b5f3901e", + "version": "1.2.2", + "port-version": 1 + }, + { + "git-tree": "49dd8455e873417e8c6e336cdac63bc40cae8342", + "version": "1.2.2", + "port-version": 0 + }, + { + "git-tree": "70132ddc099b347cfea66a4ed2de435abafb9c6f", + "version": "1.2.1", + "port-version": 0 + }, + { + "git-tree": "3a460f29d525c6c1ce8154593238960415a24d80", + "version": "1.0.0", + "port-version": 2 + }, + { + "git-tree": "82104ab053e797fdcaa93d64b11fe05d37e5e14c", + "version": "1.0.0", + "port-version": 1 + }, + { + "git-tree": "53457f5b0cce060b81f86072bde37a9607fe38a8", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libhydrogen.json b/externals/vcpkg/versions/l-/libhydrogen.json new file mode 100755 index 000000000..ed35e83c2 --- /dev/null +++ b/externals/vcpkg/versions/l-/libhydrogen.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "609fe75a9dbacc5dc5d3765cdaa1dd045eb89a13", + "version-date": "2021-12-02", + "port-version": 1 + }, + { + "git-tree": "d5de7dac51afd6d1575a5a74f6a562b2affc1717", + "version-date": "2021-12-02", + "port-version": 0 + }, + { + "git-tree": "9e4266b1fa81e86fcbf1968800e7df473b472fc1", + "version-string": "2019-08-11", + "port-version": 1 + }, + { + "git-tree": "b1a85fe7d99683c20079b9e91fbcf4e847b83828", + "version-string": "2019-08-11", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libical.json b/externals/vcpkg/versions/l-/libical.json new file mode 100755 index 000000000..11b501ee5 --- /dev/null +++ b/externals/vcpkg/versions/l-/libical.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "409bb4044895d73c1af9720e1d77f8ef46eafb73", + "version": "3.0.11", + "port-version": 1 + }, + { + "git-tree": "f4ab3492c90b3d683702cacb90aaea839cfc3d8f", + "version": "3.0.11", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libiconv.json b/externals/vcpkg/versions/l-/libiconv.json new file mode 100755 index 000000000..ea95cbbec --- /dev/null +++ b/externals/vcpkg/versions/l-/libiconv.json @@ -0,0 +1,119 @@ +{ + "versions": [ + { + "git-tree": "1f92b7d29ce3243d3d51e07686869eca63ece88a", + "version": "1.17", + "port-version": 0 + }, + { + "git-tree": "cc4f1edf5a444934d4a757420a6cd3fed596e1d5", + "version": "1.16", + "port-version": 13 + }, + { + "git-tree": "3942643a4d682982e61b60611394e4315dfc42a1", + "version": "1.16", + "port-version": 12 + }, + { + "git-tree": "f82980bff6c23bcccd043300679ebf8afa3e0a22", + "version": "1.16", + "port-version": 11 + }, + { + "git-tree": "59948ca7f6b4427c2ea93be7a1558843cdd8cde3", + "version-string": "1.16", + "port-version": 10 + }, + { + "git-tree": "1350957315a151eb58fa91c61c3fa754126135a1", + "version-string": "1.16", + "port-version": 9 + }, + { + "git-tree": "1190548d712c0ed8699e3b82e16f6b070a5154c9", + "version-string": "1.16", + "port-version": 8 + }, + { + "git-tree": "2ca525bd3d388ec908ab2ec26bdccb12a990a26d", + "version-string": "1.16", + "port-version": 7 + }, + { + "git-tree": "b052109a8f7de3bcaf5d81b92952cbe9218dea6a", + "version-string": "1.16", + "port-version": 6 + }, + { + "git-tree": "afbce7db707bbe5249bcb28a1309dc0c379f3e57", + "version-string": "1.16", + "port-version": 5 + }, + { + "git-tree": "d7c3d81803bc865526fbddc51819358d2f50c70b", + "version-string": "1.16", + "port-version": 4 + }, + { + "git-tree": "5fe32d17e257fa09b878996c2361fc0cc9a8557d", + "version-string": "1.16-3", + "port-version": 0 + }, + { + "git-tree": "a9c0310704a8d9d4156907acb93cdc1e57b823ed", + "version-string": "1.16-2", + "port-version": 0 + }, + { + "git-tree": "c7804114258b2583fcdba36a5a7a0a04cb4fd6df", + "version-string": "1.16-1", + "port-version": 0 + }, + { + "git-tree": "ab0c3de2dced7cb6f5c2642dff1c9ebe768510aa", + "version-string": "1.15-6", + "port-version": 0 + }, + { + "git-tree": "6f627058300de9d0f1e91fed3e998d5ae8b1aded", + "version-string": "1.15-5", + "port-version": 0 + }, + { + "git-tree": "8649c1b4199d6c4dd17f0c145af87a4857b1ca91", + "version-string": "1.15-4", + "port-version": 0 + }, + { + "git-tree": "bdc103a737021c5d462fe00628d48f2687d6857e", + "version-string": "1.15-3", + "port-version": 0 + }, + { + "git-tree": "5fe809f5f4e837f70f2a652bb961df7e7b279c22", + "version-string": "1.15-2", + "port-version": 0 + }, + { + "git-tree": "33ed377936de571a0f9f65aad4527621c6516db5", + "version-string": "1.15-1", + "port-version": 0 + }, + { + "git-tree": "4384b716dda76065ce3db20b003316af75199b9a", + "version-string": "1.15", + "port-version": 0 + }, + { + "git-tree": "a9e49bc2ee2b7c6587c8a824b2effe9964f5cb52", + "version-string": "1.14-1", + "port-version": 0 + }, + { + "git-tree": "465bbc8b9109a82152fd8b2f3b1c3f398db3ef03", + "version-string": "1.14", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libics.json b/externals/vcpkg/versions/l-/libics.json new file mode 100755 index 000000000..dd0bcac49 --- /dev/null +++ b/externals/vcpkg/versions/l-/libics.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "aea77d2369ae831edee51b05bc8dcad585795990", + "version": "1.6.5", + "port-version": 0 + }, + { + "git-tree": "f652729b1d084f65627ccd3c5d302bf73187bb57", + "version-string": "1.6.4", + "port-version": 0 + }, + { + "git-tree": "5624c7145f9aa355fa458c5b15f9fcdf201faf21", + "version-string": "1.6.3-1", + "port-version": 0 + }, + { + "git-tree": "9e814e329f1059f8f4d7c15dec7028bbf9617109", + "version-string": "1.6.3", + "port-version": 0 + }, + { + "git-tree": "fb0e3b40eed2a58907b28223d57b7f94f27196ba", + "version-string": "1.6.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libideviceactivation.json b/externals/vcpkg/versions/l-/libideviceactivation.json new file mode 100755 index 000000000..8d33991d9 --- /dev/null +++ b/externals/vcpkg/versions/l-/libideviceactivation.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "5ff1d3dc1c70954efdb1b56ea38660c8e2817a68", + "version": "1.3.17", + "port-version": 0 + }, + { + "git-tree": "9c39284ebf51443f0dc6c3291bdb7cdca973a9d2", + "version-string": "1.2.235", + "port-version": 1 + }, + { + "git-tree": "43967cb5db0fb8ca318d04639a77ae89026605b6", + "version-string": "1.2.235", + "port-version": 0 + }, + { + "git-tree": "d3a95f16ff5d0f5e92e8be76e2b453027e575604", + "version-string": "1.2.137", + "port-version": 0 + }, + { + "git-tree": "072f67a6ea4457b5982120c0459b688ccb2776e2", + "version-string": "1.2.68-1", + "port-version": 0 + }, + { + "git-tree": "995a0daa36f0dbcf66e12903bee9c8b7fc00f32f", + "version-string": "1.2.68", + "port-version": 0 + }, + { + "git-tree": "e491adb9e3d6aaf77e73404669006604161f6c52", + "version-string": "1.0.38-2", + "port-version": 0 + }, + { + "git-tree": "6e307fdd591ebac7a67f8fd239b6c54835159fd1", + "version-string": "1.0.38-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libidn2.json b/externals/vcpkg/versions/l-/libidn2.json new file mode 100755 index 000000000..1917ca6b9 --- /dev/null +++ b/externals/vcpkg/versions/l-/libidn2.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "639f3ae3abc9b7265de12b29bfefb49a683e0b53", + "version": "2.3.1", + "port-version": 0 + }, + { + "git-tree": "b1eb568bf3bdf3fdb6e04b69f62f0347f2dff2ed", + "version": "2.3.0", + "port-version": 5 + }, + { + "git-tree": "a73dca27190e239f6ff09db7124b885a23d732e4", + "version": "2.3.0", + "port-version": 4 + }, + { + "git-tree": "cad738e7d2fff6e1ac7c8a2bec14160aa127336f", + "version": "2.3.0", + "port-version": 3 + }, + { + "git-tree": "6f5a62105488c9eb440e97c4d49a1ac6c8fa996c", + "version-string": "2.3.0", + "port-version": 2 + }, + { + "git-tree": "6d198421acf88e8196da7f2d1389100307f92133", + "version-string": "2.3.0", + "port-version": 1 + }, + { + "git-tree": "70fb6d70d7d6adf103e7270339c9ba0e0d694f79", + "version-string": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "1da1380be0b16e54e7ba1ac3e8730784a11c000a", + "version-string": "2.2.0", + "port-version": 2 + }, + { + "git-tree": "54d6f84814f915ac5c7def82468c484de592e98b", + "version-string": "2.2.0-1", + "port-version": 0 + }, + { + "git-tree": "c96569e3132e70e8514a55056bcd3855bfb33281", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "c0433fb316d494bd1c0c677e57dd90c2502ceab1", + "version-string": "2.1.1-1", + "port-version": 0 + }, + { + "git-tree": "c65459cf683915aaa9220e1f0db5535439ce9502", + "version-string": "2.1.1", + "port-version": 0 + }, + { + "git-tree": "9a8426d139ecc461160d348054344cd5f5363266", + "version-string": "2.0.5-1", + "port-version": 0 + }, + { + "git-tree": "9d7bbdb564c8353ca7780fc1edbec776d7f8a691", + "version-string": "2.0.5", + "port-version": 0 + }, + { + "git-tree": "e7d7728b059c0ccf7479c91f91d7a3c5ac702d1b", + "version-string": "2.0.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libigl.json b/externals/vcpkg/versions/l-/libigl.json new file mode 100755 index 000000000..da1c5373e --- /dev/null +++ b/externals/vcpkg/versions/l-/libigl.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "3fbdb4cb097785d6b9814e4a4ec89f8530a51c1a", + "version": "2.3.0", + "port-version": 2 + }, + { + "git-tree": "b4de37a62b3d7349f427f26ad38b8fe1f386d09d", + "version": "2.3.0", + "port-version": 1 + }, + { + "git-tree": "6ddb181a509d6897a3e29b7a1a696af1db2e044f", + "version": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "ced3bf6b1438690d7b1b3d1f0fa40eacbc78f1ca", + "version-string": "2.2.0", + "port-version": 6 + }, + { + "git-tree": "09f126e97a2f0d9e76a1109d6855bbdd4cab9c9d", + "version-string": "2.2.0", + "port-version": 5 + }, + { + "git-tree": "d150e0cc468dec8769382b413a5c477a0682f1fd", + "version-string": "2.2.0", + "port-version": 4 + }, + { + "git-tree": "b953afc0875516000dd3c3e694b0d1fc788b8e19", + "version-string": "2.2.0", + "port-version": 3 + }, + { + "git-tree": "d12ae1d471da6da7e58a58c05cd82cbd4374ca62", + "version-string": "2.2.0", + "port-version": 2 + }, + { + "git-tree": "c0371b4519f4787b8e60a0a01a4622cc4b4c4925", + "version-string": "2.2.0", + "port-version": 1 + }, + { + "git-tree": "3f26318d49690bb4825cf755f2938afd7c02677c", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "c2417ed73b6fcc0d72265da85ff542c2cfd2d036", + "version-string": "2.1.0-2", + "port-version": 0 + }, + { + "git-tree": "9f66721b3dbaf06d6b21878377418d6147bd4cbc", + "version-string": "2.1.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libilbc.json b/externals/vcpkg/versions/l-/libilbc.json new file mode 100755 index 000000000..986350f44 --- /dev/null +++ b/externals/vcpkg/versions/l-/libilbc.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "f12ae842a06b6f2d77a889d6279dc997bbd61d0b", + "version": "3.0.4", + "port-version": 0 + }, + { + "git-tree": "2c86ad893279ccf359e6ee1b22ff5e2e3a935a42", + "version-string": "3.0.3", + "port-version": 1 + }, + { + "git-tree": "71c62e89d45d6ab7cfecf0027e3ba9c9fd0f4e89", + "version-string": "3.0.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libimobiledevice.json b/externals/vcpkg/versions/l-/libimobiledevice.json new file mode 100755 index 000000000..c249e1962 --- /dev/null +++ b/externals/vcpkg/versions/l-/libimobiledevice.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "5bf3d6cdc93021dcc048d73d7153aebecd91c47e", + "version": "1.3.17", + "port-version": 0 + }, + { + "git-tree": "5b4e580b28caaf03bbe46030bf612af191eb800a", + "version-string": "1.3.6", + "port-version": 2 + }, + { + "git-tree": "7af0cdbc3aa310e494be7c17efc198be75593e92", + "version-string": "1.3.6", + "port-version": 1 + }, + { + "git-tree": "7ed237d91c939961732a5c8afcd0b7b77b48dd58", + "version-string": "1.3.6", + "port-version": 0 + }, + { + "git-tree": "a7f4551d6b342316738423b1ee2bba7e1899d006", + "version-string": "1.2.185", + "port-version": 0 + }, + { + "git-tree": "2268dec3bcccfa3de7b7695e9e20b386c3e2fcf8", + "version-string": "1.2.137", + "port-version": 0 + }, + { + "git-tree": "d494fc5bad37d22dce92b29682df2033ae6f9833", + "version-string": "1.2.76", + "port-version": 0 + }, + { + "git-tree": "dbfe6e9f95c61bf8cbccf8e9896715a61636f2e4", + "version-string": "1.2.1.215-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libirecovery.json b/externals/vcpkg/versions/l-/libirecovery.json new file mode 100755 index 000000000..d24780b0d --- /dev/null +++ b/externals/vcpkg/versions/l-/libirecovery.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "1396dbed8e08ee556ad00ce3a67ba0de7c7b6298", + "version-string": "1.0.25", + "port-version": 4 + }, + { + "git-tree": "8e5ca128c3c62e747f3cc4beaeb0f5d74b263403", + "version-string": "1.0.25", + "port-version": 3 + }, + { + "git-tree": "9ea37c179cee88aa14450622ac673bbb7ce8eb88", + "version-string": "1.0.25-2", + "port-version": 0 + }, + { + "git-tree": "9dc6f56a654ca4ec61a2bd4cd19ade27d9e10841", + "version-string": "1.0.25-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libjpeg-turbo.json b/externals/vcpkg/versions/l-/libjpeg-turbo.json new file mode 100755 index 000000000..6860f26b2 --- /dev/null +++ b/externals/vcpkg/versions/l-/libjpeg-turbo.json @@ -0,0 +1,144 @@ +{ + "versions": [ + { + "git-tree": "f3ab7c40b47aa03953467e7697d3eea7b60d624e", + "version": "2.1.3", + "port-version": 3 + }, + { + "git-tree": "dd9bb6eb0d4e28d2b3ef0d83b6b9ef736555621d", + "version": "2.1.3", + "port-version": 2 + }, + { + "git-tree": "7373af20f73237f0453fb02a1ba097e5f710d2f5", + "version": "2.1.3", + "port-version": 1 + }, + { + "git-tree": "987bbe2533672eff1aaf160f0f36c818a1f986ee", + "version": "2.1.3", + "port-version": 0 + }, + { + "git-tree": "b37f789a1bb562a1469e0c30cf195c641ab824a6", + "version": "2.1.2", + "port-version": 0 + }, + { + "git-tree": "1f10cf90b5807f4b4b98cc82786236002e85b9ac", + "version": "2.0.6", + "port-version": 3 + }, + { + "git-tree": "48423df98f8715a1f33c2abdfcfc0c0bf5cc5f92", + "version": "2.0.6", + "port-version": 2 + }, + { + "git-tree": "88d4315ae4daa0619554d0465564beee0a688d71", + "version": "2.0.6", + "port-version": 1 + }, + { + "git-tree": "42aed1a37d04ecdc437a4f52c6dd71740339f478", + "version-string": "2.0.6", + "port-version": 0 + }, + { + "git-tree": "0c5889f679a9404504230cb568df8f1f1263cbba", + "version-string": "2.0.5", + "port-version": 4 + }, + { + "git-tree": "cf4b226059c3e824fc31962ba1afde783f7f1833", + "version-string": "2.0.5", + "port-version": 3 + }, + { + "git-tree": "769ce1b935b91ea1ec2f3d76cd3708dec3e1b565", + "version-string": "2.0.5", + "port-version": 2 + }, + { + "git-tree": "0cc64a738991909ff19e91167458517fec81c63d", + "version-string": "2.0.5", + "port-version": 1 + }, + { + "git-tree": "49f7653ab5a15a52511b05a3fbadc4e6126b2031", + "version-string": "2.0.5", + "port-version": 0 + }, + { + "git-tree": "5a4d55bc4c964d84a8ed03f61a1ecd7937c4a066", + "version-string": "2.0.4", + "port-version": 0 + }, + { + "git-tree": "61a5d22ba7121fd7bbb445371b48abaf27bb650e", + "version-string": "2.0.3", + "port-version": 0 + }, + { + "git-tree": "58fb3b2fd2cca2185bfce8035019e2dc295740b5", + "version-string": "2.0.2", + "port-version": 0 + }, + { + "git-tree": "ceafc2a970c04c9c391fd3d020de793a7573e203", + "version-string": "2.0.1-1", + "port-version": 0 + }, + { + "git-tree": "f5006e3c642292f8e287c4f85d4697a170252115", + "version-string": "1.5.3-2", + "port-version": 0 + }, + { + "git-tree": "15b8e5e07bf506f4eab4fc29219c35acf110b1fa", + "version-string": "1.5.3-1", + "port-version": 0 + }, + { + "git-tree": "360a48e9c4d7cff45917c0019190043cf0e5a1a3", + "version-string": "1.5.3", + "port-version": 0 + }, + { + "git-tree": "26dcc564116a6350ce1be8e530b820434733b22e", + "version-string": "1.5.2-2", + "port-version": 0 + }, + { + "git-tree": "06b4287c029a8684485e937a28b1cd32dd2c4194", + "version-string": "1.5.2-1", + "port-version": 0 + }, + { + "git-tree": "b4016b566b7d8d51ebf7607be142fb51ea9432a0", + "version-string": "1.5.2", + "port-version": 0 + }, + { + "git-tree": "be8bea575e46448d133a68b628f8b637d417b3fe", + "version-string": "1.5.1-1", + "port-version": 0 + }, + { + "git-tree": "9247fbac463498da5095cef9d680f3c0b3544754", + "version-string": "1.4.90-1", + "port-version": 0 + }, + { + "git-tree": "080f92f39008e2f69b00ff1f474b1ac344fbafc5", + "version-string": "1.4.90-2", + "port-version": 0 + }, + { + "git-tree": "27233b528c1e7d9e9e468521d2b58473cc0a2b37", + "version-string": "1.4.90-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libjuice.json b/externals/vcpkg/versions/l-/libjuice.json new file mode 100755 index 000000000..8794a61c5 --- /dev/null +++ b/externals/vcpkg/versions/l-/libjuice.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "02ea9a1ae4e054d9474f801747e5edd17a3d8ad1", + "version": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "62c215b49c59158589a9bc98d02b20243ef1bf0b", + "version": "0.9.8", + "port-version": 0 + }, + { + "git-tree": "f544d762be0d7f9016b47f865843d0e575535166", + "version": "0.9.6", + "port-version": 0 + }, + { + "git-tree": "564ac624cbbabb45356d592264c090a0e6f64669", + "version": "0.9.1", + "port-version": 0 + }, + { + "git-tree": "077151e85bf11cabc11d0f1c46b778b5a21829dd", + "version": "0.8.4", + "port-version": 0 + }, + { + "git-tree": "42cecee2b8da92c2c8c120c09bd663b20f2c947a", + "version": "0.7.1", + "port-version": 0 + }, + { + "git-tree": "e7ef5f1f7d883e5f8a7dcb52ea5821730281e375", + "version-string": "0.6.0", + "port-version": 0 + }, + { + "git-tree": "44d596ff7bfe74a699564ed6dcca46001f4ff95b", + "version-string": "0.5.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libjxl.json b/externals/vcpkg/versions/l-/libjxl.json new file mode 100755 index 000000000..1612cee1c --- /dev/null +++ b/externals/vcpkg/versions/l-/libjxl.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ebfc043511f10c6dbe25a298b403b56ef9a57f87", + "version-semver": "0.6.1", + "port-version": 1 + }, + { + "git-tree": "4b89e4e9a92111a9733660afcecdfd59a6ee8d49", + "version-semver": "0.6.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libkeyfinder.json b/externals/vcpkg/versions/l-/libkeyfinder.json new file mode 100755 index 000000000..15caacdc3 --- /dev/null +++ b/externals/vcpkg/versions/l-/libkeyfinder.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "567c6574c6e38d9a10b7e08951c4c3a0fc72e3cb", + "version": "2.2.6", + "port-version": 0 + }, + { + "git-tree": "f4b04b3607199759e373764303378ab76ef9c158", + "version-string": "2.2.5", + "port-version": 1 + }, + { + "git-tree": "d2f8022bca9bc70894c26b7d73437eadfa9b9bca", + "version-string": "2.2.5", + "port-version": 0 + }, + { + "git-tree": "0ea7e74c79c626ed0185ee546a684293663cf651", + "version-string": "2.2.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libkml.json b/externals/vcpkg/versions/l-/libkml.json new file mode 100755 index 000000000..8b24a120d --- /dev/null +++ b/externals/vcpkg/versions/l-/libkml.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "1ce9dd050baf9ae42da2bb0c6d0feae1241b6e01", + "version-string": "1.3.0", + "port-version": 8 + }, + { + "git-tree": "c2647d8b06542a475e0de99aedc3ce939a10b35d", + "version-string": "1.3.0", + "port-version": 7 + }, + { + "git-tree": "6c50197fe3bf38682b4e551e501834817990ad3e", + "version-string": "1.3.0", + "port-version": 6 + }, + { + "git-tree": "1e5d050adfd9a0b7f79674fec5f355c059d9672c", + "version-string": "1.3.0", + "port-version": 5 + }, + { + "git-tree": "7c7a760c34c4657583058b26eaec51e577ab5fd5", + "version-string": "1.3.0-4", + "port-version": 0 + }, + { + "git-tree": "a181cbd8a609bbf04ee0d78eb1d7e35db07eba2a", + "version-string": "1.3.0-3", + "port-version": 0 + }, + { + "git-tree": "4fa998e43456236b384a2837c8d5172faef37e60", + "version-string": "1.3.0-2", + "port-version": 0 + }, + { + "git-tree": "0f858c8c5a7046e08761a824310fc453e724f108", + "version-string": "1.3.0-1", + "port-version": 0 + }, + { + "git-tree": "048c6dda3ebb7541f030b10d1b7167b758b68072", + "version-string": "1.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/liblas.json b/externals/vcpkg/versions/l-/liblas.json new file mode 100755 index 000000000..547d1f632 --- /dev/null +++ b/externals/vcpkg/versions/l-/liblas.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "9d89f6e4515fcd144d24a7e619ea2de26799a005", + "version": "1.8.1", + "port-version": 9 + }, + { + "git-tree": "cab66222be9c25d617f6da9160ca930e0cb069dd", + "version-string": "1.8.1", + "port-version": 8 + }, + { + "git-tree": "508c56fc68703c0cf2b2c7fe99895fa6cfee5c6a", + "version-string": "1.8.1", + "port-version": 7 + }, + { + "git-tree": "98b46cc84b9efb95b95bfa0111c22e59a4d9e477", + "version-string": "1.8.1", + "port-version": 6 + }, + { + "git-tree": "3574373c93114a9a7bac598140a5a7c875830b4c", + "version-string": "1.8.1", + "port-version": 5 + }, + { + "git-tree": "b179348675e217b5dcc7230e1570585052e0fa8b", + "version-string": "1.8.1-4", + "port-version": 0 + }, + { + "git-tree": "5cbb0bdb6c7ba1b6e6929b635e07835439cff84f", + "version-string": "1.8.1-3", + "port-version": 0 + }, + { + "git-tree": "22b7fe0952c471a8663aa391a507ea8c746622c1", + "version-string": "1.8.1-2", + "port-version": 0 + }, + { + "git-tree": "8e2902e592c4962637846be3b8e0a3f1b9a51125", + "version-string": "1.8.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/liblbfgs.json b/externals/vcpkg/versions/l-/liblbfgs.json new file mode 100755 index 000000000..d562fe8f0 --- /dev/null +++ b/externals/vcpkg/versions/l-/liblbfgs.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "cdf2ac29eb7e040dc4eefe6d623d5caa3b592de0", + "version": "1.10", + "port-version": 2 + }, + { + "git-tree": "f9251e490103e48e6ba9a01c6c61468381f0c8f1", + "version-string": "1.10", + "port-version": 1 + }, + { + "git-tree": "4529e3e615f7e8db5dc69cafeec67c56eccc81b3", + "version-string": "1.10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/liblemon.json b/externals/vcpkg/versions/l-/liblemon.json new file mode 100755 index 000000000..054fcfe0c --- /dev/null +++ b/externals/vcpkg/versions/l-/liblemon.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "b099f8cb08e44ae21fb5d019369cd4c598e305eb", + "version-string": "2019-06-13", + "port-version": 3 + }, + { + "git-tree": "fbcfa0caff95b07142e28cd453690c26d62bc025", + "version-string": "2019-06-13", + "port-version": 2 + }, + { + "git-tree": "7539b1a880c2328db9aacdc9c8f5475abfbd1af2", + "version-string": "2019-06-13-1", + "port-version": 0 + }, + { + "git-tree": "3f25cabf02c7a7257f79ec3578eb5a7f797419c8", + "version-string": "2019-06-13", + "port-version": 0 + }, + { + "git-tree": "b40bf74431a9cfa800bed32e3c749f909de79d56", + "version-string": "1.3.1-5", + "port-version": 0 + }, + { + "git-tree": "1af30639293df04ca201764c213c63e0249c722f", + "version-string": "1.3.1-4", + "port-version": 0 + }, + { + "git-tree": "5963376d21c03c526520f226327c151886f84725", + "version-string": "1.3.1-3", + "port-version": 0 + }, + { + "git-tree": "5dbb03bed23825b0426765fe6056f2ee5e1b88b9", + "version-string": "1.3.1-2", + "port-version": 0 + }, + { + "git-tree": "8fe17928a54d671313210fc5d87f10346f9722fe", + "version-string": "1.3.1-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/liblinear.json b/externals/vcpkg/versions/l-/liblinear.json new file mode 100755 index 000000000..3c17116bb --- /dev/null +++ b/externals/vcpkg/versions/l-/liblinear.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "5b88b9d95a1e851e77dd3018ce305abdc529a5da", + "version": "243", + "port-version": 1 + }, + { + "git-tree": "1a1acaef662beb37406c20bf6293109025f8df1b", + "version-string": "243", + "port-version": 0 + }, + { + "git-tree": "32c7a7c42530041f778e5a00b54c43ebcc0839d9", + "version-string": "241", + "port-version": 0 + }, + { + "git-tree": "04930634ee33ea24d8c6ba641efb68fa351e72a3", + "version-string": "230", + "port-version": 0 + }, + { + "git-tree": "9493c2df9784da5bc8240c40b9ffd48ce4963f2c", + "version-string": "221", + "port-version": 0 + }, + { + "git-tree": "d16d08633b19af9b8127ddfc9dfbd76762fc483c", + "version-string": "2.20-1", + "port-version": 0 + }, + { + "git-tree": "14b47b11489ed90e06d62957ea7f4b59bd7bd5d1", + "version-string": "2.20", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/liblo.json b/externals/vcpkg/versions/l-/liblo.json new file mode 100755 index 000000000..2088b8489 --- /dev/null +++ b/externals/vcpkg/versions/l-/liblo.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "00837a43b20b0ccf863f3574b34714f8f7d3bd37", + "version-string": "0.31", + "port-version": 2 + }, + { + "git-tree": "c4df5a746fe8bc045b2287c0b6122717757a30a3", + "version-string": "0.31", + "port-version": 1 + }, + { + "git-tree": "04145d21ab7fff62c0bbf2a8846bc9ddea192fe2", + "version-string": "0.31", + "port-version": 0 + }, + { + "git-tree": "955bb9b2c2c3733a393e8994f564db99fcf48eaa", + "version-string": "0.30", + "port-version": 0 + }, + { + "git-tree": "989742f420562c4ec77fcba6cb2ec8b55c5a182c", + "version-string": "0.29-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/liblsl.json b/externals/vcpkg/versions/l-/liblsl.json new file mode 100755 index 000000000..37c645f7a --- /dev/null +++ b/externals/vcpkg/versions/l-/liblsl.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "282fee909d2df5c818b0577a4c063c146376cef5", + "version": "1.16.0", + "port-version": 0 + }, + { + "git-tree": "451923eac66cd517eb01dbf297e207e0760c4414", + "version-string": "1.14.0", + "port-version": 2 + }, + { + "git-tree": "960eac893dd574369d79d40248bd91c38a8c3448", + "version-string": "1.14.0", + "port-version": 1 + }, + { + "git-tree": "5be8e82edc3261bef4114e428191a4ccc9271892", + "version-string": "1.14.0", + "port-version": 0 + }, + { + "git-tree": "1b86d81c846a0b8f0ad92ce19598e58b56096d08", + "version-string": "1.13.1", + "port-version": 0 + }, + { + "git-tree": "19cc4be860bac6d78fff411bb1dc4d95a4e13e3c", + "version-string": "1.13.0-b11-1", + "port-version": 0 + }, + { + "git-tree": "839131ef1046d5bf58423cc38c288b1a3593eaf3", + "version-string": "1.13.0-b6", + "port-version": 0 + }, + { + "git-tree": "d096418168b41c1397e02c19bde87e84f838d17c", + "version-string": "1.13.0-b4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/liblzma.json b/externals/vcpkg/versions/l-/liblzma.json new file mode 100755 index 000000000..77c763c10 --- /dev/null +++ b/externals/vcpkg/versions/l-/liblzma.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "96b6aac6211ad3fd3da29508a519c3cd5f09716d", + "version-semver": "5.2.5", + "port-version": 6 + }, + { + "git-tree": "18b7cbd0972b536a6bd4c0ef0f41dce9c3f047ac", + "version-semver": "5.2.5", + "port-version": 5 + }, + { + "git-tree": "273eaeff533f90bc42394cca9f1ea23ff6b49534", + "version-semver": "5.2.5", + "port-version": 4 + }, + { + "git-tree": "2c5f893c8d78d30c4641e9f4d0c7818386f8c8c9", + "version-semver": "5.2.5", + "port-version": 3 + }, + { + "git-tree": "5f491131f98307f42a98db7ad0b5455225481284", + "version-string": "5.2.5", + "port-version": 2 + }, + { + "git-tree": "8b088dc17c860297c2194e10fa84355e26fc293a", + "version-string": "5.2.5", + "port-version": 1 + }, + { + "git-tree": "e6324c3a75d4fd1aa7e4078f85592818c8934383", + "version-string": "5.2.5", + "port-version": 0 + }, + { + "git-tree": "8473055bf10e2d328c82b20b6d4077e8afd0f272", + "version-string": "5.2.4-5", + "port-version": 0 + }, + { + "git-tree": "76901b9e8ffbefe77bbea09cb4b15c762989c49e", + "version-string": "5.2.4-4", + "port-version": 0 + }, + { + "git-tree": "5f42fd04403c55903255ee26c6dcc339f96fdb00", + "version-string": "5.2.4-3", + "port-version": 0 + }, + { + "git-tree": "52e41a9999f93713955c41adefd1317d981b8f86", + "version-string": "5.2.4-2", + "port-version": 0 + }, + { + "git-tree": "ad603b071c4b2c21683b3c94363fb70386ccb89b", + "version-string": "5.2.4-1", + "port-version": 0 + }, + { + "git-tree": "2f263992faf646223d85972d976670263bb83e87", + "version-string": "5.2.4", + "port-version": 0 + }, + { + "git-tree": "31e8c795a672dd2732b5fd8d9354e95b9c03e953", + "version-string": "5.2.3-2", + "port-version": 0 + }, + { + "git-tree": "32c1e5f0a624ad03b3d84689363a2a96c2d3448b", + "version-string": "5.2.3-1", + "port-version": 0 + }, + { + "git-tree": "148f9b1c414a8cf689afbc7dbfa89f5d67195215", + "version-string": "5.2.3", + "port-version": 0 + }, + { + "git-tree": "ad0847810a01cf57bfc0e08182b15dacba3ebbba", + "version-string": "5.2.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libmad.json b/externals/vcpkg/versions/l-/libmad.json new file mode 100755 index 000000000..b05e2bd07 --- /dev/null +++ b/externals/vcpkg/versions/l-/libmad.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "820bd670c6652cdb1b381f9c55390a261f11e842", + "version-string": "0.15.1", + "port-version": 9 + }, + { + "git-tree": "c26ef39816280a812e249d0af4ba2ce58a0cf19d", + "version-string": "0.15.1-8", + "port-version": 0 + }, + { + "git-tree": "6b2336b239a812d626ac6c62ab857d5dd46b7381", + "version-string": "0.15.1-6", + "port-version": 0 + }, + { + "git-tree": "28aadf7073b547e09a2fc85945a5081a4f285c07", + "version-string": "0.15.1-5", + "port-version": 0 + }, + { + "git-tree": "ff4a50dd4fa6d6f7bd1dac496f3a2f5094878111", + "version-string": "0.15.1-4", + "port-version": 0 + }, + { + "git-tree": "b05e64321f97af083e700f35d3e3347ccb1d537b", + "version-string": "0.15.1-3", + "port-version": 0 + }, + { + "git-tree": "c35949aaadbab59dcb960d25e46028324bbaaa05", + "version-string": "0.15.1-2", + "port-version": 0 + }, + { + "git-tree": "a8c706e67ff6ac3ff9a27e76511f8b5bbc752c19", + "version-string": "0.15.1-1", + "port-version": 0 + }, + { + "git-tree": "58458427ddd0f76c199e688e2135ce93e27d2259", + "version-string": "0.15.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libmagic.json b/externals/vcpkg/versions/l-/libmagic.json new file mode 100755 index 000000000..9f7690d0d --- /dev/null +++ b/externals/vcpkg/versions/l-/libmagic.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "7bc1a88e28473967fafa7be73db0304f127ae202", + "version-string": "5.40", + "port-version": 1 + }, + { + "git-tree": "0645b6d33816b293de3dae3b84828b97d06bd0ea", + "version-string": "5.40", + "port-version": 0 + }, + { + "git-tree": "65fc18d3b2ed34a290f7774c58e480e7d06bebe3", + "version-string": "5.37", + "port-version": 2 + }, + { + "git-tree": "eb82053ea20e33eaab4ab90e63792d1368eb7f1e", + "version-string": "5.37-1", + "port-version": 0 + }, + { + "git-tree": "a74e0ff542f30cd83417dfc861fdcf1f2531b89a", + "version-string": "5.37", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libmariadb.json b/externals/vcpkg/versions/l-/libmariadb.json new file mode 100755 index 000000000..2a3c4716b --- /dev/null +++ b/externals/vcpkg/versions/l-/libmariadb.json @@ -0,0 +1,129 @@ +{ + "versions": [ + { + "git-tree": "c51d4e78081ee708c1cdebeaaa201aa0064079e3", + "version-semver": "3.1.15", + "port-version": 0 + }, + { + "git-tree": "64479ab60db54486912b858f760af83dd2474f1c", + "version-semver": "3.1.12", + "port-version": 2 + }, + { + "git-tree": "98ab3766e520cc0e6804bdba42090eae12f9f24f", + "version-semver": "3.1.12", + "port-version": 1 + }, + { + "git-tree": "9bac7cad6eff90bd3227093a10ff9b85175922da", + "version-string": "3.1.12", + "port-version": 0 + }, + { + "git-tree": "674b0c8bcc3ee3276a0bce8afd72b99c5013f4a0", + "version-string": "3.1.10", + "port-version": 5 + }, + { + "git-tree": "a5144f1b965487813bfd011e1d7ca18877d2ec69", + "version-string": "3.1.10", + "port-version": 4 + }, + { + "git-tree": "b51ccd894eede106825f440bd76234a65c34fe88", + "version-string": "3.1.10", + "port-version": 3 + }, + { + "git-tree": "d806f8975881bc26f412c5b283bd061d50bbb1df", + "version-string": "3.1.10", + "port-version": 2 + }, + { + "git-tree": "0d47b5782124a713a3e19dd0b8007f16d845ed09", + "version-string": "3.1.10", + "port-version": 1 + }, + { + "git-tree": "be4f726dedfa256e8423910f3f2c32ceee48238a", + "version-string": "3.1.10", + "port-version": 0 + }, + { + "git-tree": "c20fd7fc8a26381830b000f405730083ca87b8d4", + "version-string": "3.1.9", + "port-version": 1 + }, + { + "git-tree": "0c9958a4a233c42a2dca962ce8376ecb864bf36e", + "version-string": "3.1.9", + "port-version": 0 + }, + { + "git-tree": "bde124d88a95f5d33f721cea21c6d540f6579583", + "version-string": "3.1.7", + "port-version": 2 + }, + { + "git-tree": "a3608e33a968664ce8e8fd1256714263cc2a8266", + "version-string": "3.1.7-1", + "port-version": 0 + }, + { + "git-tree": "23c69eec140ae4e8134cd419f30e88d963ee0f9b", + "version-string": "3.1.7", + "port-version": 0 + }, + { + "git-tree": "91d5e5e9b2998307402852742ad6c0df87be76e4", + "version-string": "3.0.10-4", + "port-version": 0 + }, + { + "git-tree": "a69dbb90a538e91339f348574a98baf60abb1114", + "version-string": "3.0.10-3", + "port-version": 0 + }, + { + "git-tree": "1c8b8c7391d1c8ba12335309859dad2783cc6f4c", + "version-string": "3.0.10-2", + "port-version": 0 + }, + { + "git-tree": "cb7218e11b728314793c9cdabe33be5a4b321f31", + "version-string": "3.0.10-1", + "port-version": 0 + }, + { + "git-tree": "92be4bccd9ff67e9edd00507aae91ef8021a059a", + "version-string": "3.0.10", + "port-version": 0 + }, + { + "git-tree": "75b8ac87d9bbe26778858dfb8a3d015edda86146", + "version-string": "3.0.2-1", + "port-version": 0 + }, + { + "git-tree": "75fe8f58ba057e113dd232cf50c393c92f414541", + "version-string": "3.0.2", + "port-version": 0 + }, + { + "git-tree": "be8d653419ccd968eee9845950b82301bfc3fa9c", + "version-string": "2.3.2-1", + "port-version": 0 + }, + { + "git-tree": "25b8760f4ff73d8113d4f9c42f20cba6f03733da", + "version-string": "2.3.2", + "port-version": 0 + }, + { + "git-tree": "1528a74763684860a1766393fb6bd7dfa7a608ac", + "version-string": "2.3.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libmaxminddb.json b/externals/vcpkg/versions/l-/libmaxminddb.json new file mode 100755 index 000000000..b92f16aec --- /dev/null +++ b/externals/vcpkg/versions/l-/libmaxminddb.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "7da47031497942277e14b01feab9e6d7d1491443", + "version-string": "1.4.3", + "port-version": 1 + }, + { + "git-tree": "705c0ebe7b045c299e7222fd49afd7625e3e1aaf", + "version-string": "1.4.3", + "port-version": 0 + }, + { + "git-tree": "76800a1a88d9b1f3bb854357e6e2f5c217672cc9", + "version-string": "1.3.2-2", + "port-version": 0 + }, + { + "git-tree": "dfcdb10d9c258dcd361087cd5320465c1e101004", + "version-string": "1.3.2-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libmediainfo.json b/externals/vcpkg/versions/l-/libmediainfo.json new file mode 100755 index 000000000..d4f1014c7 --- /dev/null +++ b/externals/vcpkg/versions/l-/libmediainfo.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "a6b640103a75b965e6527d10819d276c2193775d", + "version-string": "21.03", + "port-version": 2 + }, + { + "git-tree": "2cdc779b496da59aabfb9e1cc459d68c54cdb4d8", + "version-string": "21.03", + "port-version": 1 + }, + { + "git-tree": "a24db679914e335ba6235de799467dfcb8842fc6", + "version-string": "21.03", + "port-version": 0 + }, + { + "git-tree": "e23c8e758ec10752765cf5fd0c4f86ff4fc0515c", + "version-string": "20.09", + "port-version": 0 + }, + { + "git-tree": "728e6655179fb03500a6107cebf44db5376896c7", + "version-string": "20.08", + "port-version": 0 + }, + { + "git-tree": "24d67c3e1f9ee9b8054ce5c88ead1b782b2b37cd", + "version-string": "20.03", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libmesh.json b/externals/vcpkg/versions/l-/libmesh.json new file mode 100755 index 000000000..555e78ddd --- /dev/null +++ b/externals/vcpkg/versions/l-/libmesh.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "347e56f7cd6e4bf1ca5621c564e4421a7f5a45cd", + "version": "1.5.0", + "port-version": 4 + }, + { + "git-tree": "8583d8a15a7b694bb7a8346580c5f8a3f7478f28", + "version-string": "1.5.0", + "port-version": 3 + }, + { + "git-tree": "99d2914d8591e790d8d9e16eeb572b2dfa6776d7", + "version-string": "1.5.0", + "port-version": 2 + }, + { + "git-tree": "eed08886ca377bad4a4ad13c6683ddf547d705f0", + "version-string": "1.5.0-1", + "port-version": 0 + }, + { + "git-tree": "34a49390d12bb52a775af55f2f3ef336b1ce75ea", + "version-string": "1.5.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libmicrohttpd.json b/externals/vcpkg/versions/l-/libmicrohttpd.json new file mode 100755 index 000000000..d90a9e06b --- /dev/null +++ b/externals/vcpkg/versions/l-/libmicrohttpd.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "059bfe5715b9179cbd4d365ca571e6fade762700", + "version": "0.9.75", + "port-version": 0 + }, + { + "git-tree": "f6c2bc7d6fd2ee5441a6235f3c99067aad069b14", + "version": "0.9.63", + "port-version": 7 + }, + { + "git-tree": "c221d15de1cc1eedc33f912269d69d5ade11e3c1", + "version": "0.9.63", + "port-version": 6 + }, + { + "git-tree": "da43ec88147e3aa99a5d4e7378f0011a92a25ad2", + "version-string": "0.9.63", + "port-version": 5 + }, + { + "git-tree": "cac6e4ea3735af7edab56f44c788bb01c987f2cf", + "version-string": "0.9.63", + "port-version": 4 + }, + { + "git-tree": "09915820de8e9a88fc6e7d2f6b8104f74eba4255", + "version-string": "0.9.63-3", + "port-version": 0 + }, + { + "git-tree": "c7d547c67ad61a4814276ef85639f6fed0245ff2", + "version-string": "0.9.63-2", + "port-version": 0 + }, + { + "git-tree": "2312e10c3b62d9d00497f01c2d72305b8e2b49df", + "version-string": "0.9.63-1", + "port-version": 0 + }, + { + "git-tree": "ecbaccb073380108a8b0ac04950b266da324884e", + "version-string": "0.9.63", + "port-version": 0 + }, + { + "git-tree": "e9a2ee94ab122b0ef43b63abffca45e7de0ef7af", + "version-string": "0.9.55-2", + "port-version": 0 + }, + { + "git-tree": "07c9736135f392f71c47086032139bd86f06318a", + "version-string": "0.9.55-1", + "port-version": 0 + }, + { + "git-tree": "078011b1c9de2e2197a9f88f16e4c0753f22e807", + "version-string": "0.9.55", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libmikmod.json b/externals/vcpkg/versions/l-/libmikmod.json new file mode 100755 index 000000000..a1735fbbe --- /dev/null +++ b/externals/vcpkg/versions/l-/libmikmod.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "ed94a83a674fb90d5884515fc763840df2ec0375", + "version-string": "3.3.11.1", + "port-version": 10 + }, + { + "git-tree": "e0dd535be8f9f4f477cc21a745724b2c42f93d01", + "version-string": "3.3.11.1", + "port-version": 9 + }, + { + "git-tree": "7eb5deb666796bf91d2429c28325aa738b9e8941", + "version-string": "3.3.11.1-8", + "port-version": 0 + }, + { + "git-tree": "caef9c52f9cfd46ced189519b893a8e1ddbbfa60", + "version-string": "3.3.11.1-6", + "port-version": 0 + }, + { + "git-tree": "dc172c9f36270cc3ac3044b13c5347ade4161a41", + "version-string": "3.3.11.1-5", + "port-version": 0 + }, + { + "git-tree": "4b1f8bafd9ba033af7ed8b21792e5896e23506d6", + "version-string": "3.3.11.1-4", + "port-version": 0 + }, + { + "git-tree": "65abc8f67c4b5e9332dfe42b4d06917a8ce454e0", + "version-string": "3.3.11.1-3", + "port-version": 0 + }, + { + "git-tree": "c1469a0214fe5fc350b64b8e76a58d901e42eef8", + "version-string": "3.3.11.1-2", + "port-version": 0 + }, + { + "git-tree": "afb47de2cf016bfd0ee2908f215a347c42700295", + "version-string": "3.3.11.1-1", + "port-version": 0 + }, + { + "git-tree": "899114150e1e27cac798735ded8b64fde8091f0b", + "version-string": "3.3.11.1", + "port-version": 0 + }, + { + "git-tree": "13faef585a51d40b3ee8c4b93b5184580acc42ce", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libmodbus.json b/externals/vcpkg/versions/l-/libmodbus.json new file mode 100755 index 000000000..f0a166f16 --- /dev/null +++ b/externals/vcpkg/versions/l-/libmodbus.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "654921557bd29a70ed05ce78374c52b43e6defad", + "version": "3.1.6", + "port-version": 2 + }, + { + "git-tree": "a4d3ea1104f095d0d92d4f81d595776ad6f6b21e", + "version-string": "3.1.6", + "port-version": 1 + }, + { + "git-tree": "14f8c63e6b84b9808a932fb9ebb5bfcc9fef9379", + "version-string": "3.1.6", + "port-version": 0 + }, + { + "git-tree": "8a6ed1f9d8fc54dfddc7b7ef13533986bfd69650", + "version-string": "3.1.4-3", + "port-version": 0 + }, + { + "git-tree": "4141969200fb31e385d6b3b71b5a15d9279254db", + "version-string": "3.1.4-2", + "port-version": 0 + }, + { + "git-tree": "7cb14af768b4f6dd12dd09cc5c810476df3d9634", + "version-string": "3.1.4-1", + "port-version": 0 + }, + { + "git-tree": "2bf86a64f96fc663a0fcd1b3ffbf6a38f3024a5a", + "version-string": "3.1.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libmodman.json b/externals/vcpkg/versions/l-/libmodman.json new file mode 100755 index 000000000..b7eb568c7 --- /dev/null +++ b/externals/vcpkg/versions/l-/libmodman.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "64d71ad6052dd0027325c7e9390ad4264dbef108", + "version-string": "2.0.1", + "port-version": 4 + }, + { + "git-tree": "202e2ccfbf309183f222f9c849f92452bd8f3b48", + "version-string": "2.0.1", + "port-version": 3 + }, + { + "git-tree": "5ac70c470d670ed354de7816cd2bb9905a416dd4", + "version-string": "2.0.1-2", + "port-version": 0 + }, + { + "git-tree": "f8766c1199b7c29224c1b5a94d5a4468cd868d8d", + "version-string": "2.0.1-1", + "port-version": 0 + }, + { + "git-tree": "a64cff60dc77d03ed13c4d5a952b65f89ff6b038", + "version-string": "2.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libmodplug.json b/externals/vcpkg/versions/l-/libmodplug.json new file mode 100755 index 000000000..0cc707721 --- /dev/null +++ b/externals/vcpkg/versions/l-/libmodplug.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "605d260810f9d1a489af7fb484d509581b39763d", + "version": "0.8.9.0", + "port-version": 10 + }, + { + "git-tree": "28b465d4794e5c5545cb486da31a9a7ce208654b", + "version-string": "0.8.9.0", + "port-version": 9 + }, + { + "git-tree": "b6798791f0c306dcc5a5b9a445b618046dc7e097", + "version-string": "0.8.9.0", + "port-version": 8 + }, + { + "git-tree": "974a84bd910a82a86d2e27d2bb9416d0672390c4", + "version-string": "0.8.9.0", + "port-version": 7 + }, + { + "git-tree": "0a5fabb8c35482c3d20e2f207305fd233614c59f", + "version-string": "0.8.9.0", + "port-version": 6 + }, + { + "git-tree": "3834aa81e2a7dc9b9ddcd268025f15d416d9cc90", + "version-string": "0.8.9.0-5", + "port-version": 0 + }, + { + "git-tree": "7d60a38137ff54c27753f2b9e8510c08d600db37", + "version-string": "0.8.9.0-4", + "port-version": 0 + }, + { + "git-tree": "1a7deb53e497a659aa598674fb8140fbaa056703", + "version-string": "0.8.9.0-1", + "port-version": 0 + }, + { + "git-tree": "336af40643d140ed0b62319f78a7336a68d89686", + "version-string": "0.8.9.0", + "port-version": 0 + }, + { + "git-tree": "c2eb36b37f21500fded6ac3aa2929125abdfa6f4", + "version-string": "0.8.8.5-bb25b05", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libmorton.json b/externals/vcpkg/versions/l-/libmorton.json new file mode 100755 index 000000000..c97e9f12f --- /dev/null +++ b/externals/vcpkg/versions/l-/libmorton.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "1b25f31e6c58dbf7106777360374ea7f84182ddc", + "version": "0.2.8", + "port-version": 0 + }, + { + "git-tree": "0c25c5cd76d1c395f24c0e22407673e2c88c6458", + "version-string": "0.2", + "port-version": 1 + }, + { + "git-tree": "fbd978aad91d4f85ec74e46325cf5773be1280a8", + "version-string": "0.2", + "port-version": 0 + }, + { + "git-tree": "e6824fc50e5fdec32f5e3f33bef1a46f7be0f209", + "version-string": "2018-19-07", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libmount.json b/externals/vcpkg/versions/l-/libmount.json new file mode 100755 index 000000000..72797a339 --- /dev/null +++ b/externals/vcpkg/versions/l-/libmount.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0f746b3d702445fd2de54c25c08491cdaae45810", + "version": "2.37.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libmpeg2.json b/externals/vcpkg/versions/l-/libmpeg2.json new file mode 100755 index 000000000..a291c352e --- /dev/null +++ b/externals/vcpkg/versions/l-/libmpeg2.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "71e878d5483d51cab0d347f8e4e162b305216255", + "version": "0.5.1", + "port-version": 2 + }, + { + "git-tree": "f7325b83ac5b58747d2dc18859f771b641a0d76f", + "version-string": "0.5.1", + "port-version": 1 + }, + { + "git-tree": "aaea63d5784de13698d5ceb11cf787036bb59412", + "version-string": "0.5.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libmspack.json b/externals/vcpkg/versions/l-/libmspack.json new file mode 100755 index 000000000..09d834c3d --- /dev/null +++ b/externals/vcpkg/versions/l-/libmspack.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "8faa2bfe071a7711a21a54139b84779c0d7f2cbe", + "version-string": "0.10.1", + "port-version": 4 + }, + { + "git-tree": "88f3db0838dd22e6cfaa675e76bd95d056cc25c8", + "version-string": "0.10.1-3", + "port-version": 0 + }, + { + "git-tree": "b04763f5313c5c7e7941856bc77f5ec34933ead9", + "version-string": "0.10.1-2", + "port-version": 0 + }, + { + "git-tree": "4371cff2fcd92f3b76a4e327c4eee9404a002b07", + "version-string": "0.10.1-1", + "port-version": 0 + }, + { + "git-tree": "28a14d21a10f8a2555b220f3d40d47cbdeaacaac", + "version-string": "0.10.1", + "port-version": 0 + }, + { + "git-tree": "2bd3912befc3c55eecdca04a2aa2db069aca99a9", + "version-string": "0.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libmt32emu.json b/externals/vcpkg/versions/l-/libmt32emu.json new file mode 100755 index 000000000..76e96543d --- /dev/null +++ b/externals/vcpkg/versions/l-/libmt32emu.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "de283dae22ced9be75cf6356a02732fec8b4eb11", + "version": "2.6.2", + "port-version": 0 + }, + { + "git-tree": "da8f12396b75ff5163acd190bf7f79a3d0b5098a", + "version": "2.5.3", + "port-version": 1 + }, + { + "git-tree": "a1893148ecacd02e10cb14c90539f23687b597b6", + "version": "2.5.3", + "port-version": 0 + }, + { + "git-tree": "a57fc5791efae931cf33dc307104c0463a2207be", + "version": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "b60fd8501e86b53f2d3125d0f0a1a793ff5f9a60", + "version": "2.4.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libmupdf.json b/externals/vcpkg/versions/l-/libmupdf.json new file mode 100755 index 000000000..67e2b7dc0 --- /dev/null +++ b/externals/vcpkg/versions/l-/libmupdf.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "9ca3ac09949f15d339ff747bb36f8593ff087959", + "version": "1.19.0-rc2", + "port-version": 1 + }, + { + "git-tree": "e91affc70edc5bab8dc75c274f14ba03b345c0bb", + "version-string": "1.19.0-rc2", + "port-version": 0 + }, + { + "git-tree": "20a08f46ae4e7bd7afa7eaad146a2709bd782ea3", + "version-string": "1.18.1-so-3.11.14", + "port-version": 0 + }, + { + "git-tree": "df4714ec8c7080d91b3fc0ed0db8c91557d1bfbf", + "version-string": "1.18.0", + "port-version": 0 + }, + { + "git-tree": "4fe8e682a3dc45c30c9681eb5936a59f1deb7b2d", + "version-string": "1.17.0", + "port-version": 0 + }, + { + "git-tree": "6d0f3ee6b915bdbcfa75947be9479eed0141f70f", + "version-string": "1.16.1-1", + "port-version": 0 + }, + { + "git-tree": "8c9e8113d3448ff213f4eb7944fd3b6e312d89cf", + "version-string": "1.16.1", + "port-version": 0 + }, + { + "git-tree": "73e9a6f5065af3ac509c6d9a228ee83118451db6", + "version-string": "1.15.0-2", + "port-version": 0 + }, + { + "git-tree": "de715c7b3f12678c527d4e9a63d8f874419fcaad", + "version-string": "1.15.0-1", + "port-version": 0 + }, + { + "git-tree": "2cbf0f1c8140edb488355c76e551d38665827f6c", + "version-string": "1.15.0", + "port-version": 0 + }, + { + "git-tree": "5d46163fa51afb7c9c5e9de15260748f968d5518", + "version-string": "1.12.0-2", + "port-version": 0 + }, + { + "git-tree": "bb8354451e9b0b707d7cbc2ee25bda8caf9390d4", + "version-string": "1.12.0-1", + "port-version": 0 + }, + { + "git-tree": "2ff9da6ae129a60ce6b3e2e7096b3e256931d14f", + "version-string": "1.12.0", + "port-version": 0 + }, + { + "git-tree": "bdca9e2b648d8b3eb0df7c0e748b5ec2a9294827", + "version-string": "1.11-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libmysql.json b/externals/vcpkg/versions/l-/libmysql.json new file mode 100755 index 000000000..c1a4d97c6 --- /dev/null +++ b/externals/vcpkg/versions/l-/libmysql.json @@ -0,0 +1,104 @@ +{ + "versions": [ + { + "git-tree": "2bc452d4f5cd5392799424e1bb920175f979dd84", + "version": "8.0.20", + "port-version": 6 + }, + { + "git-tree": "d19f8e799e7eb9dc6c24968d1fa8c31debc38b62", + "version": "8.0.20", + "port-version": 5 + }, + { + "git-tree": "5279f421e4d9409a5d78b0f767d41374f2f7e168", + "version": "8.0.20", + "port-version": 4 + }, + { + "git-tree": "9fccf9613dee83d48f9ba68a356a8db324224948", + "version": "8.0.20", + "port-version": 3 + }, + { + "git-tree": "55f99b850b59d83a2bc77a7a3980e96ccb67c875", + "version": "8.0.20", + "port-version": 2 + }, + { + "git-tree": "0ef74d8a7cfbd48a4f57f48775212ccd9cdb06fb", + "version-string": "8.0.20", + "port-version": 1 + }, + { + "git-tree": "cabaaa23c6230ffa18cbb8d6b04adbb25b2086f0", + "version-string": "8.0.20", + "port-version": 0 + }, + { + "git-tree": "278c8ed6ca036e0bcd5d7cc57141909f401fdae4", + "version-string": "8.0.4-7", + "port-version": 0 + }, + { + "git-tree": "ed400af1061cf2a7be402c2df3e070fc50e5ce0a", + "version-string": "8.0.4-6", + "port-version": 0 + }, + { + "git-tree": "95dfbbd8b2721c1975c237c16606763197f8ee1d", + "version-string": "8.0.4-5", + "port-version": 0 + }, + { + "git-tree": "7db4f9f93b2268ff2bc9e90b43142b870f82328a", + "version-string": "8.0.4-4", + "port-version": 0 + }, + { + "git-tree": "5c08788f2d1ffba12bf3afc55efecba5d3bdcff2", + "version-string": "8.0.4-3", + "port-version": 0 + }, + { + "git-tree": "fc557f43eee608a394b5c30077ebf89700cc00aa", + "version-string": "8.0.4-2", + "port-version": 0 + }, + { + "git-tree": "626218b993e9351fa745f5ec98e735ebd5dd4141", + "version-string": "8.0.4-1", + "port-version": 0 + }, + { + "git-tree": "82254867a4a6a92edc660b33950002ed6d036ef8", + "version-string": "8.0.4", + "port-version": 0 + }, + { + "git-tree": "30f1eee741d6732c1e6ccaa76f6a7376d5cb422c", + "version-string": "5.7.17-3", + "port-version": 0 + }, + { + "git-tree": "00ad577bc85a41fc265f9e3bff1082836e50b3fb", + "version-string": "5.7.17-2", + "port-version": 0 + }, + { + "git-tree": "13a36a27f9eed3bd32a71974de3ad0dbb4b83f43", + "version-string": "5.7.17-1", + "port-version": 0 + }, + { + "git-tree": "e77303faa29be5f9a63d630fa24c1d82f22cda6a", + "version-string": "5.7.17", + "port-version": 0 + }, + { + "git-tree": "bd8444042adf5f24eceafe33353340c2f0961a5b", + "version-string": "5.7.16", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libnice.json b/externals/vcpkg/versions/l-/libnice.json new file mode 100755 index 000000000..199e05f67 --- /dev/null +++ b/externals/vcpkg/versions/l-/libnice.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "0317c7f34e075c4ebad894b0a6fffed8657f93e5", + "version": "0.1.18", + "port-version": 0 + }, + { + "git-tree": "5149e313236cfc0ae0e7352e6d151559564bd657", + "version": "0.1.15", + "port-version": 7 + }, + { + "git-tree": "bc6867011695c2bf8e1d0f0d5b23f1f7f519c0a8", + "version-string": "0.1.15", + "port-version": 6 + }, + { + "git-tree": "cca19eca1211ef6e97c39e5d6e9b9c9a486faa77", + "version-string": "0.1.15", + "port-version": 5 + }, + { + "git-tree": "b85e2aba892bad70efb3cf52f3c62a4d495df1e1", + "version-string": "0.1.15-4", + "port-version": 0 + }, + { + "git-tree": "e59899e82498a678d30bb7dcbbdff1698309d688", + "version-string": "0.1.15-3", + "port-version": 0 + }, + { + "git-tree": "92c5a136812ea3e6db421c7818725839bd91f455", + "version-string": "0.1.15-2", + "port-version": 0 + }, + { + "git-tree": "6d605c50e320a19aa51007fc88b94694efd26db0", + "version-string": "0.1.15-1", + "port-version": 0 + }, + { + "git-tree": "825592ca9bfd990b0fabe8dfd3e3a2f9e9f55c73", + "version-string": "0.1.15", + "port-version": 0 + }, + { + "git-tree": "efa8cc0a896aad6d52a23aa144d4436f387b5d17", + "version-string": "0.1.13-2", + "port-version": 0 + }, + { + "git-tree": "f8fd6b57f8c458dcdb060c724d63a097940e32c1", + "version-string": "0.1.13-1", + "port-version": 0 + }, + { + "git-tree": "e4477edc70a662f2c2b2727011ab8605e9699402", + "version-string": "0.1.13", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libnoise.json b/externals/vcpkg/versions/l-/libnoise.json new file mode 100755 index 000000000..73a4991fa --- /dev/null +++ b/externals/vcpkg/versions/l-/libnoise.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "24b694017cb633bae1e071413648afdf3623fc38", + "version": "1.0.0", + "port-version": 3 + }, + { + "git-tree": "d9a3fa0e4772f2c11fe3d177dea6ec8a23b06b07", + "version-string": "1.0.0", + "port-version": 2 + }, + { + "git-tree": "9174e744d86273338a1e3c4a341329647730e19f", + "version-string": "1.0.0", + "port-version": 1 + }, + { + "git-tree": "e2baf140c6627726c78cdd4c993baf9c5e7714c0", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libnop.json b/externals/vcpkg/versions/l-/libnop.json new file mode 100755 index 000000000..2b8d1a131 --- /dev/null +++ b/externals/vcpkg/versions/l-/libnop.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "97da98d4a3cd4e60972f53211892baa5b2f066df", + "version-date": "2021-03-01", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libodb-boost.json b/externals/vcpkg/versions/l-/libodb-boost.json new file mode 100755 index 000000000..268cc128c --- /dev/null +++ b/externals/vcpkg/versions/l-/libodb-boost.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "0aad9c51faa7aef72cf64a8c09fbdb08cf677dbd", + "version-string": "2.4.0", + "port-version": 5 + }, + { + "git-tree": "facc25e5e4f72028b75da7be4b88208615b172cb", + "version-string": "2.4.0", + "port-version": 4 + }, + { + "git-tree": "70c909cead2fcecc32b1be6da761fd8aaf74a95a", + "version-string": "2.4.0-3", + "port-version": 0 + }, + { + "git-tree": "db2bd00d414b9c42084fee42399c5166e71eae82", + "version-string": "2.4.0-2", + "port-version": 0 + }, + { + "git-tree": "01fb906b12ef56e1e67d2165befb9590192bdbb1", + "version-string": "2.4.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libodb-mysql.json b/externals/vcpkg/versions/l-/libodb-mysql.json new file mode 100755 index 000000000..4333d9536 --- /dev/null +++ b/externals/vcpkg/versions/l-/libodb-mysql.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "bf081744ced44cfa3da6d34d959a63fdaacaf69f", + "version": "2.4.0", + "port-version": 9 + }, + { + "git-tree": "208d05d2a1a41329632318e2950c1300cf75eb51", + "version": "2.4.0", + "port-version": 8 + }, + { + "git-tree": "684fea6cb54563fb4d54b05b259ecb6b5cbd0266", + "version-string": "2.4.0-7", + "port-version": 0 + }, + { + "git-tree": "0059dc89a4e3f9fb43f4cd33bd23b9671cc46ee8", + "version-string": "2.4.0-6", + "port-version": 0 + }, + { + "git-tree": "1b63759917b575f89042574d2424019b0b57ba51", + "version-string": "2.4.0-5", + "port-version": 0 + }, + { + "git-tree": "9aba52786a2bb262ad0e319e302d123f164626cb", + "version-string": "2.4.0-4", + "port-version": 0 + }, + { + "git-tree": "98db2bcc47ffadc4f0e3d8b66f695947e6cf09e3", + "version-string": "2.4.0-3", + "port-version": 0 + }, + { + "git-tree": "e614e9df165ac4894ab89431673663edcf6a8288", + "version-string": "2.4.0-2", + "port-version": 0 + }, + { + "git-tree": "39dcee28a141543ae0f526ed377334b372765915", + "version-string": "2.4.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libodb-pgsql.json b/externals/vcpkg/versions/l-/libodb-pgsql.json new file mode 100755 index 000000000..b3ad365b1 --- /dev/null +++ b/externals/vcpkg/versions/l-/libodb-pgsql.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "2026f9dfa22bc2a9b7c5d865268cd53d1f6870ee", + "version": "2.4.0", + "port-version": 6 + }, + { + "git-tree": "47c85efbe11253531c364b63debb914b44de579f", + "version-string": "2.4.0", + "port-version": 5 + }, + { + "git-tree": "dfe9698df72847f118144c93dbcc25e2f0e0b16d", + "version-string": "2.4.0", + "port-version": 4 + }, + { + "git-tree": "a16d0a534195ac98f6f44b21a42f626cbb5c9a6e", + "version-string": "2.4.0-3", + "port-version": 0 + }, + { + "git-tree": "80b30af8b3e67a0c8f3c1fc4357db14171a1d9b9", + "version-string": "2.4.0-2", + "port-version": 0 + }, + { + "git-tree": "a7de9420c4c437d998eaf8e0c7fd42e790977320", + "version-string": "2.4.0-1", + "port-version": 0 + }, + { + "git-tree": "e9f72ad53526fe181e9b6dd4cf9818389cebf61e", + "version-string": "2.4.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libodb-sqlite.json b/externals/vcpkg/versions/l-/libodb-sqlite.json new file mode 100755 index 000000000..7c6162ad8 --- /dev/null +++ b/externals/vcpkg/versions/l-/libodb-sqlite.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "4923ceb767ecc4c6f5efb7bcc80fafef19718bd2", + "version-string": "2.4.0", + "port-version": 9 + }, + { + "git-tree": "d24a8283229f618903b2d446e7e22e4a0cf3f69f", + "version-string": "2.4.0", + "port-version": 8 + }, + { + "git-tree": "6c3f8c74462e65898e335eef5ab9fabc0a3b222f", + "version-string": "2.4.0", + "port-version": 7 + }, + { + "git-tree": "8d9cbc5ac098865e4e03b00f74c9c4de911a8534", + "version-string": "2.4.0-6", + "port-version": 0 + }, + { + "git-tree": "94aa42972fc7500b6b3b6cdbc557b80cd6c8e30f", + "version-string": "2.4.0-5", + "port-version": 0 + }, + { + "git-tree": "d29f7f97c703027e3011c5249be707e37f137802", + "version-string": "2.4.0-4", + "port-version": 0 + }, + { + "git-tree": "32b5eae3cbc5fd1087824bc9342ab124630659aa", + "version-string": "2.4.0-3", + "port-version": 0 + }, + { + "git-tree": "f89b8cad9c1926728e690586289ef780e62752ac", + "version-string": "2.4.0-2", + "port-version": 0 + }, + { + "git-tree": "93fe00956c94f5774ba1be9667eee210d6c8bb7e", + "version-string": "2.4.0-1", + "port-version": 0 + }, + { + "git-tree": "f285547c7717cc064b4f7cdecaccab4dc8b2ffe8", + "version-string": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "7e021e1f3759535edd11ceae108328ecf38c0e67", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libodb.json b/externals/vcpkg/versions/l-/libodb.json new file mode 100755 index 000000000..4bd5b2028 --- /dev/null +++ b/externals/vcpkg/versions/l-/libodb.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "8296035980f67a96a49e7277dc91149172555750", + "version": "2.4.0", + "port-version": 8 + }, + { + "git-tree": "6be9a8547e11c2b30077c90504c6dc714f854076", + "version": "2.4.0", + "port-version": 7 + }, + { + "git-tree": "cc5f10b9764952399ce497cf82615ea730dace28", + "version-string": "2.4.0-6", + "port-version": 0 + }, + { + "git-tree": "fca854899c041753a10ec46716523b40d3ebc81d", + "version-string": "2.4.0-5", + "port-version": 0 + }, + { + "git-tree": "dfd9db4202c92956c43c0d74c43050ebcb02447d", + "version-string": "2.4.0-4", + "port-version": 0 + }, + { + "git-tree": "2d0bd9f1fe278f7d6d9119d7ee5b024cfd49d461", + "version-string": "2.4.0-3", + "port-version": 0 + }, + { + "git-tree": "1818a4ba7ecca999eab267c7d66b72aa772bb2d3", + "version-string": "2.4.0-2", + "port-version": 0 + }, + { + "git-tree": "eb9fb0b2eac3992a3088c51c78b89edc6a13c313", + "version-string": "2.4.0-1", + "port-version": 0 + }, + { + "git-tree": "8c3e371ce112cc2d1af3d4ce2bb702f9d9ac07e4", + "version-string": "2.4.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libogg.json b/externals/vcpkg/versions/l-/libogg.json new file mode 100755 index 000000000..0eab3563d --- /dev/null +++ b/externals/vcpkg/versions/l-/libogg.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "70cb700f89c98b87d678a3aa7a14461eff4b99e4", + "version": "1.3.5", + "port-version": 0 + }, + { + "git-tree": "156d376fca62197dd916c454d1299dcee84c72dc", + "version-string": "1.3.4", + "port-version": 3 + }, + { + "git-tree": "5cd4c9f7994a1597175cf1dce9ea7865d005b9f6", + "version-string": "1.3.4", + "port-version": 2 + }, + { + "git-tree": "05a5d1e9d61ec497c7212961732df3e8075120f4", + "version-string": "1.3.4", + "port-version": 0 + }, + { + "git-tree": "934594e5ca967945c9f42956838bb5cb2c0b02c9", + "version-string": "1.3.3-4", + "port-version": 0 + }, + { + "git-tree": "b91e1eb28dd8ed7c3ba0d0eb72b3d2fc2a3718a3", + "version-string": "1.3.3-3", + "port-version": 0 + }, + { + "git-tree": "c19ad5b9b326d84e50ed12d9ed823cfa53759f07", + "version-string": "1.3.3-2", + "port-version": 0 + }, + { + "git-tree": "85f7b168b0f01fdba59859ee5d95b300f2a2d61c", + "version-string": "1.3.3-1", + "port-version": 0 + }, + { + "git-tree": "c92366a097bfce2e694fdf97ee3723faaf3405fb", + "version-string": "1.3.3", + "port-version": 0 + }, + { + "git-tree": "e9fd564351dbfbe9f9174c2b9b7017810511b5cc", + "version-string": "1.3.2-cab46b1-3", + "port-version": 0 + }, + { + "git-tree": "2d1c0316176436b6555341c4262238a0e2786cf9", + "version-string": "1.3.2-cab46b1-2", + "port-version": 0 + }, + { + "git-tree": "5fa0a031d679584a6064365674821b64b172b4ff", + "version-string": "2017-07-27-cab46b19847", + "port-version": 0 + }, + { + "git-tree": "c4efebe045b33f054f4a8e5a483b0ad222f0f181", + "version-string": "1.3.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libopenmpt.json b/externals/vcpkg/versions/l-/libopenmpt.json new file mode 100755 index 000000000..73690c864 --- /dev/null +++ b/externals/vcpkg/versions/l-/libopenmpt.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "8cb8a2342ad5552d311c9f38d399b2ca55726f8a", + "version": "0.5.12", + "port-version": 0 + }, + { + "git-tree": "465b2d6e597952e0ef962af05dce08769dba11e7", + "version-string": "2017-01-28-cf2390140", + "port-version": 2 + }, + { + "git-tree": "a6579258d2dab9e661a439e241ff20f2427b918e", + "version-string": "2017-01-28-cf2390140", + "port-version": 1 + }, + { + "git-tree": "644dd1f6f42a3f37a65c56811e80f986d0366eac", + "version-string": "2017-01-28-cf2390140", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libopensp.json b/externals/vcpkg/versions/l-/libopensp.json new file mode 100755 index 000000000..168ab8b25 --- /dev/null +++ b/externals/vcpkg/versions/l-/libopensp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c52391221569480b2e639b0e07a9e809e7711320", + "version": "1.5.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libopusenc.json b/externals/vcpkg/versions/l-/libopusenc.json new file mode 100755 index 000000000..e40c0de5b --- /dev/null +++ b/externals/vcpkg/versions/l-/libopusenc.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "132909a5cb3c33e038cf9728427910fce455591d", + "version-string": "0.2.1", + "port-version": 1 + }, + { + "git-tree": "7e66eafbd3552eda0c0243edb904fd8af36d370a", + "version-string": "0.2.1", + "port-version": 0 + }, + { + "git-tree": "eb9dbe4e3e59fed0a4092583d97295a34e1fea55", + "version-string": "0.1-1", + "port-version": 0 + }, + { + "git-tree": "4665d4d95e9dc2d1dee15ba3f11478f05f867cea", + "version-string": "0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libosip2.json b/externals/vcpkg/versions/l-/libosip2.json new file mode 100755 index 000000000..e94b9362b --- /dev/null +++ b/externals/vcpkg/versions/l-/libosip2.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "711e04603ccba9622918413848035af14335ef63", + "version": "5.2.0", + "port-version": 2 + }, + { + "git-tree": "918421395ccee5a5d894f2720b4a779369eb0f97", + "version": "5.2.0", + "port-version": 1 + }, + { + "git-tree": "468e53f1a4709f0b1b2b83efe23a2a4bc9dd63c2", + "version": "5.2.0", + "port-version": 0 + }, + { + "git-tree": "df0fccae350dd810e2ac0621cb9b71a820d742f0", + "version-string": "5.1.0-4", + "port-version": 0 + }, + { + "git-tree": "922079e7ac7e7ba572b31ac965b881bfb87a4299", + "version-string": "5.1.0-3", + "port-version": 0 + }, + { + "git-tree": "850eae5145dc5d783c3fdd996ab031e789ab5f10", + "version-string": "5.1.0-2", + "port-version": 0 + }, + { + "git-tree": "69555d48e12cfb89dcec6b787792a3b490a63cef", + "version-string": "5.1.0-1", + "port-version": 0 + }, + { + "git-tree": "e684a8dd9e49c43421debdc3d4ab58c21576d156", + "version-string": "5.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libosmium.json b/externals/vcpkg/versions/l-/libosmium.json new file mode 100755 index 000000000..ff0000a08 --- /dev/null +++ b/externals/vcpkg/versions/l-/libosmium.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "9e9ae3d97e11dfebbba6d839add7886b4bede3b1", + "version-semver": "2.17.1", + "port-version": 1 + }, + { + "git-tree": "862e140771bed4c7e9b7bc8ffc798edbbd3daa1c", + "version-semver": "2.17.1", + "port-version": 0 + }, + { + "git-tree": "3cfda0b067f25efdb3d3f35421c5eb898cba74c3", + "version-semver": "2.17.0", + "port-version": 0 + }, + { + "git-tree": "2ee36f73249f1102786deb5e2fea00ef8480de54", + "version-string": "2.15.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libosmscout.json b/externals/vcpkg/versions/l-/libosmscout.json new file mode 100755 index 000000000..bfa3103f4 --- /dev/null +++ b/externals/vcpkg/versions/l-/libosmscout.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "18f4ae0fd674282e4c45af88d054090e8ba9a80d", + "version-string": "1.1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libp7-baical.json b/externals/vcpkg/versions/l-/libp7-baical.json new file mode 100755 index 000000000..c89f57059 --- /dev/null +++ b/externals/vcpkg/versions/l-/libp7-baical.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "6cf85007fff76b915306c36ced6d3cf94c96e074", + "version-string": "replaced", + "port-version": 1 + }, + { + "git-tree": "38136f16ec4b0eacdb76d63a639fc20b8d6ef208", + "version-string": "replaced", + "port-version": 0 + }, + { + "git-tree": "198fcfc33e120b2311bff9c9a0292967839bca7d", + "version-string": "4.4", + "port-version": 5 + }, + { + "git-tree": "32dee82c177857fed77cea3a0508d2cdc9f4b4b7", + "version-string": "4.4-4", + "port-version": 0 + }, + { + "git-tree": "d64adcfbf28a702739f8c818f26d41aadff23474", + "version-string": "4.4-3", + "port-version": 0 + }, + { + "git-tree": "98a520bd1c220d3da7df03bb0c74ed3874cc422c", + "version-string": "4.4-2", + "port-version": 0 + }, + { + "git-tree": "b6f70fc496ca9b815c82d7d355016b4c9a046d2c", + "version-string": "4.4-1", + "port-version": 0 + }, + { + "git-tree": "274d1bf0c513d6b22fada7b662da512e7a05f580", + "version-string": "4.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libp7client.json b/externals/vcpkg/versions/l-/libp7client.json new file mode 100755 index 000000000..e1b4da476 --- /dev/null +++ b/externals/vcpkg/versions/l-/libp7client.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "dcf6b61cbaf4a0d50c256e830142176b49eabad6", + "version-string": "5.6", + "port-version": 2 + }, + { + "git-tree": "dcb9500d0ef29115ec13c39c943ce85d2030ac56", + "version-string": "5.6", + "port-version": 1 + }, + { + "git-tree": "0a367ba74a92626d57ddcd5be0157e5dadc6e8bc", + "version-string": "5.6", + "port-version": 0 + }, + { + "git-tree": "d310ad3168168c971109718bce823d9a9dee294c", + "version-string": "5.2-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libpcap.json b/externals/vcpkg/versions/l-/libpcap.json new file mode 100755 index 000000000..5322e122c --- /dev/null +++ b/externals/vcpkg/versions/l-/libpcap.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "4a0a395c4b517e9a54e1b96327b1ac90e317c225", + "version-semver": "1.10.1", + "port-version": 1 + }, + { + "git-tree": "5fb18d1935c9d7db3a7ff158e2aba95d5a9c6cd2", + "version-semver": "1.10.1", + "port-version": 0 + }, + { + "git-tree": "7dbf78276e1e48505930da6993e36bf381a51b3e", + "version-string": "1.9.1-2", + "port-version": 0 + }, + { + "git-tree": "cb48d35fc39b4c62b8afa571fc92be5171762fc5", + "version-string": "1.9.1-1", + "port-version": 0 + }, + { + "git-tree": "7bec975350f92d01a597ac8c0c8da759f0b35013", + "version-string": "1.9.1", + "port-version": 0 + }, + { + "git-tree": "d034e2422fbdf41581cc664a315f4514759eca65", + "version-string": "1.9.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libpff.json b/externals/vcpkg/versions/l-/libpff.json new file mode 100755 index 000000000..7d305a168 --- /dev/null +++ b/externals/vcpkg/versions/l-/libpff.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "24cc99a6c6ead368c4711dc67e8e7a7ae4444f09", + "version-date": "2018-07-14", + "port-version": 3 + }, + { + "git-tree": "fc83ea1c4fe9bd9731134772ff7df1c1f3ff6ab9", + "version-string": "2018-07-14", + "port-version": 2 + }, + { + "git-tree": "3acb1ab0afd3a20d25756330e91c502263de05d3", + "version-string": "2018-07-14-1", + "port-version": 0 + }, + { + "git-tree": "50cd160a5a506c8ad9b197ea75cc30a383aeef75", + "version-string": "2018-07-14", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libplist.json b/externals/vcpkg/versions/l-/libplist.json new file mode 100755 index 000000000..7cc069865 --- /dev/null +++ b/externals/vcpkg/versions/l-/libplist.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "75eb83284f3361bf04af84e67e0ed0439432c3f5", + "version": "1.3.6", + "port-version": 1 + }, + { + "git-tree": "cc421616ea793446b014a26c4132c4648372e398", + "version-string": "1.3.6", + "port-version": 0 + }, + { + "git-tree": "9952bb8c426d8ba8c52a3896c29579dc38b0a39b", + "version-string": "1.2.185", + "port-version": 0 + }, + { + "git-tree": "bd576af0c73e0f6b1fee16ef2512180feb90fee0", + "version-string": "1.2.137", + "port-version": 0 + }, + { + "git-tree": "46ed10496153147da84ac71b7e6e6c70babb9715", + "version-string": "1.2.77", + "port-version": 0 + }, + { + "git-tree": "aea913d93072a99046ad050187b3dfc3f36dc044", + "version-string": "2.0.1.197-2", + "port-version": 0 + }, + { + "git-tree": "7bce82b9f0200d4781eed1bd7f6d01b6e223f2c0", + "version-string": "2.0.1.197-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libpmemobj-cpp.json b/externals/vcpkg/versions/l-/libpmemobj-cpp.json new file mode 100755 index 000000000..64b54f9d7 --- /dev/null +++ b/externals/vcpkg/versions/l-/libpmemobj-cpp.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "5d19201729977e87b6a75a47ac5f1dac6186caae", + "version-semver": "1.13.0", + "port-version": 1 + }, + { + "git-tree": "75d4c464f3bc9823857cab2f378bf7dc53cd7e2b", + "version-semver": "1.13.0", + "port-version": 0 + }, + { + "git-tree": "debedff0ebcfc704948550b14af45cfa1b7cf3bb", + "version-string": "1.12", + "port-version": 0 + }, + { + "git-tree": "aa560d230ac6435fd6c8a25ac2b5930a7340e5b5", + "version-string": "1.11", + "port-version": 0 + }, + { + "git-tree": "b1fed20a8c0bee0659d5f9e9d98ffe2900f27f14", + "version-string": "1.10", + "port-version": 0 + }, + { + "git-tree": "49d0c530028f16077853a67f9233b141f44d9953", + "version-string": "1.8", + "port-version": 0 + }, + { + "git-tree": "bc8d6eeba0f57c9f2db91a8099b7e536b411ea68", + "version-string": "1.7", + "port-version": 0 + }, + { + "git-tree": "0ec4238ae86168b40f268837f828fba7b94d350e", + "version-string": "1.6-1", + "port-version": 0 + }, + { + "git-tree": "d402d43e3eab3d48476bb8a0cc2af30acbab52b3", + "version-string": "1.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libpng.json b/externals/vcpkg/versions/l-/libpng.json new file mode 100755 index 000000000..da868b875 --- /dev/null +++ b/externals/vcpkg/versions/l-/libpng.json @@ -0,0 +1,179 @@ +{ + "versions": [ + { + "git-tree": "5e3ec787e7c6f09dd162648b700aeb712af0ffd2", + "version": "1.6.37", + "port-version": 18 + }, + { + "git-tree": "ffe71783883ccf1c6e6a306daa686868bfb62191", + "version": "1.6.37", + "port-version": 17 + }, + { + "git-tree": "b082585ac20aefc27150af5386b6a8a15473e93a", + "version": "1.6.37", + "port-version": 16 + }, + { + "git-tree": "09cdb4f54e6cc8a6a1eebbbc4c9f786d0ee652b8", + "version": "1.6.37", + "port-version": 15 + }, + { + "git-tree": "67dd33a2c4a539e58ec4898b7b908baca3840063", + "version-string": "1.6.37", + "port-version": 14 + }, + { + "git-tree": "b3f92897a2fca74b262a4908b6c11a8313a52f17", + "version-string": "1.6.37", + "port-version": 13 + }, + { + "git-tree": "45c0b06d32572819c2b92878be840601ea3d4e3e", + "version-string": "1.6.37", + "port-version": 12 + }, + { + "git-tree": "af691798dd9e4c063e9bd325846106c9fcf79ade", + "version-string": "1.6.37", + "port-version": 11 + }, + { + "git-tree": "a1efdf9093453d8142196e35224f1ed1c6d331e2", + "version-string": "1.6.37-10", + "port-version": 0 + }, + { + "git-tree": "8b1f4e329a28c08f0df6694a75fd17f0fd792529", + "version-string": "1.6.37-9", + "port-version": 0 + }, + { + "git-tree": "dd2db0068ad3ba8733f7e4e21e8da7d175444602", + "version-string": "1.6.37-8", + "port-version": 0 + }, + { + "git-tree": "96265ee74bf31f65a0b97cf40e7d355ae26501f6", + "version-string": "1.6.37-7", + "port-version": 0 + }, + { + "git-tree": "6c57de15108634e846392c8eb076c61b945d4e23", + "version-string": "1.6.37-6", + "port-version": 0 + }, + { + "git-tree": "2ef09f6c3d4033dc26dacfdbfb5377ced5eb0fd5", + "version-string": "1.6.37-5", + "port-version": 0 + }, + { + "git-tree": "76029c555a9752bf045d34074688516d8a288551", + "version-string": "1.6.37-4", + "port-version": 0 + }, + { + "git-tree": "c644902637fdb43fe3eb2d1976dca8413eba88b5", + "version-string": "1.6.37-3", + "port-version": 0 + }, + { + "git-tree": "29de190000f41b44c3f620e939c0775795314aef", + "version-string": "1.6.37-2", + "port-version": 0 + }, + { + "git-tree": "6597f42059dc022e438acfbcd9b7b82adb8fcbf8", + "version-string": "1.6.37-1", + "port-version": 0 + }, + { + "git-tree": "e29ed23bcb9450e5ceb982106520e0872e79d7ee", + "version-string": "1.6.37", + "port-version": 0 + }, + { + "git-tree": "942c7b39d4cde837b208533e00ae7e71a02ed839", + "version-string": "1.6.36-1", + "port-version": 0 + }, + { + "git-tree": "039ca782da61e869bc0c4ad1282dfbfcefc84548", + "version-string": "1.6.36", + "port-version": 0 + }, + { + "git-tree": "9fff50de368277782f381cf80014d960af80cbf2", + "version-string": "1.6.35-1", + "port-version": 0 + }, + { + "git-tree": "d7bf906dccf6db5ab10e5394cd2c9b427e2418cf", + "version-string": "1.6.35", + "port-version": 0 + }, + { + "git-tree": "312adee32614c68e98367d636de20fe824441df4", + "version-string": "1.6.34-3", + "port-version": 0 + }, + { + "git-tree": "e510c3260075c8367bfeb84d08a99ba7c1989bbf", + "version-string": "1.6.34-2", + "port-version": 0 + }, + { + "git-tree": "0fba1fa2cb102ea8f6a88ffbcc912ebe1a3b7f76", + "version-string": "1.6.34-1", + "port-version": 0 + }, + { + "git-tree": "69fcd43377398888d30f7063e238875f29af9100", + "version-string": "1.6.32-1", + "port-version": 0 + }, + { + "git-tree": "5dbc262fe376ca1a84b73d39d53ba3ae9197c55c", + "version-string": "1.6.32", + "port-version": 0 + }, + { + "git-tree": "8d12c8bb6ace218f56b466cb094c83887311672e", + "version-string": "1.6.31", + "port-version": 0 + }, + { + "git-tree": "fe6954ae00ebd7401b42b742c2d8d055e59dc77a", + "version-string": "1.6.30", + "port-version": 0 + }, + { + "git-tree": "3ef245763d894ef461b67e1c5707dcda18b9a047", + "version-string": "1.6.29-2", + "port-version": 0 + }, + { + "git-tree": "889cf0968fa6b452a5e40d0d617fab2abfbd4138", + "version-string": "1.6.29-1", + "port-version": 0 + }, + { + "git-tree": "002b460daafcb7d1ba2211fa069e49228167f291", + "version-string": "1.6.28-1", + "port-version": 0 + }, + { + "git-tree": "9179d6c8853f5bec604256162e956c505c831c26", + "version-string": "1.6.28", + "port-version": 0 + }, + { + "git-tree": "e366579b9b07cd669be3bac35d41ce9f1afbec33", + "version-string": "1.6.24-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libpopt.json b/externals/vcpkg/versions/l-/libpopt.json new file mode 100755 index 000000000..0e8704d40 --- /dev/null +++ b/externals/vcpkg/versions/l-/libpopt.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "8f86d53b62561f37ac20b8c66232b9d87e4a6750", + "version-string": "1.16", + "port-version": 14 + }, + { + "git-tree": "098127274eb41cbd97cdcc38028a7c2e8aafb0ba", + "version-string": "1.16-13", + "port-version": 0 + }, + { + "git-tree": "9671e84760b75528e15eb6ebb6ce4e0867be4eaf", + "version-string": "1.16-12", + "port-version": 0 + }, + { + "git-tree": "6947b074aadb48ac39aa34489f4a23269b742752", + "version-string": "1.16-11", + "port-version": 0 + }, + { + "git-tree": "18fbdea6135acf56e6ddef6bb44f850b59620ec9", + "version-string": "1.16-10~vcpkg1-1", + "port-version": 0 + }, + { + "git-tree": "9dcde5f82f4f2334821e38511495537201c28f13", + "version-string": "1.16-10~vcpkg1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libpq.json b/externals/vcpkg/versions/l-/libpq.json new file mode 100755 index 000000000..139544991 --- /dev/null +++ b/externals/vcpkg/versions/l-/libpq.json @@ -0,0 +1,184 @@ +{ + "versions": [ + { + "git-tree": "2b437be1592b794cb09437beba153937991a189a", + "version": "14.1", + "port-version": 2 + }, + { + "git-tree": "0f614944d19861d7751cd9c880c6b61d87f36a3d", + "version": "14.1", + "port-version": 1 + }, + { + "git-tree": "f33ace97e90816fb5aa827168d87aec2f1f95705", + "version": "14.1", + "port-version": 0 + }, + { + "git-tree": "099cade84111279ffa4a909061cb8f4f36137842", + "version": "12.9", + "port-version": 1 + }, + { + "git-tree": "bd369bc003e7ebebb688ee536065a356f1658260", + "version": "12.2", + "port-version": 20 + }, + { + "git-tree": "7ac8973569e75060efdb8091b83f64f429371a38", + "version": "12.2", + "port-version": 19 + }, + { + "git-tree": "03c934a8004ec6c34842748d18c06a38e7a8aa3e", + "version": "12.2", + "port-version": 18 + }, + { + "git-tree": "01e2ad37b9df46e45826e52a6cddfb95ca137abd", + "version": "12.2", + "port-version": 17 + }, + { + "git-tree": "7c75f4ea669ee37e510cb5d7ea0e39b0a7d3f6cb", + "version": "12.2", + "port-version": 16 + }, + { + "git-tree": "0108a2846402c326800b0da2ffc9d67daad9fbdb", + "version": "12.2", + "port-version": 15 + }, + { + "git-tree": "212f71f4fc5edf570dece0822c7d9863dbe0c90c", + "version": "12.2", + "port-version": 14 + }, + { + "git-tree": "740637e4b7da153db5afc1a568f6411ff88167c9", + "version": "12.2", + "port-version": 13 + }, + { + "git-tree": "04f39fd5eb9744d0d5a649098fe92281028d30f1", + "version-string": "12.2", + "port-version": 12 + }, + { + "git-tree": "e09ebfc1a310be48ed9f5f3e6d2a648cfddff424", + "version-string": "12.2", + "port-version": 11 + }, + { + "git-tree": "7c4dbe4fcb780bed98e6b55ccf039b77c7a5be68", + "version-string": "12.2", + "port-version": 10 + }, + { + "git-tree": "47befe83d71de7593d85519026db28279e50eeec", + "version-string": "12.2", + "port-version": 9 + }, + { + "git-tree": "b76f1aeba6c3b1d7f85a504dab48b05bc1d8bdab", + "version-string": "12.2", + "port-version": 8 + }, + { + "git-tree": "1e1d5939056de89b7d169ff3c6fc0adf9d2c03e5", + "version-string": "12.2", + "port-version": 7 + }, + { + "git-tree": "afd0cbdeec41acebef382e50fbdd84cadab15020", + "version-string": "12.2", + "port-version": 6 + }, + { + "git-tree": "1daeec19a03882ce9104c856255e97332eb04f11", + "version-string": "12.2", + "port-version": 5 + }, + { + "git-tree": "f70a4f2726814bc49d594372f15dc283b6594752", + "version-string": "12.2", + "port-version": 4 + }, + { + "git-tree": "7162e19eb53500d28bc982037b0edf71516aee29", + "version-string": "12.2-3", + "port-version": 0 + }, + { + "git-tree": "1e16dc9605b600058afd709443a3d21490b3b1da", + "version-string": "12.2-2", + "port-version": 0 + }, + { + "git-tree": "6df96ca16ebb0194dbacc3c8843456cccf66e0d4", + "version-string": "12.2-1", + "port-version": 0 + }, + { + "git-tree": "45f8114e7a8fea7b212390b7711b32bfd2af7ba1", + "version-string": "12.2", + "port-version": 0 + }, + { + "git-tree": "da9819a2636a1a17704316d9970c43ca7458d669", + "version-string": "12.0-2", + "port-version": 0 + }, + { + "git-tree": "054ceccec54735de42889c1a3c0af3a6dc896f35", + "version-string": "12.0-1", + "port-version": 0 + }, + { + "git-tree": "72c6fe062432ebd18c8b7f6b5864ac875883be8d", + "version-string": "12.0", + "port-version": 0 + }, + { + "git-tree": "3a8aad57c213a313df0ecbf7e557b02cf33125b8", + "version-string": "9.6.3", + "port-version": 0 + }, + { + "git-tree": "2cf1e4ee41aaac60dca0c0c9fa9e6d87e6277e22", + "version-string": "9.6.1-8", + "port-version": 0 + }, + { + "git-tree": "5a23fffc8d44a9974c35c5ddf0cf43711bd62cc4", + "version-string": "9.6.1-7", + "port-version": 0 + }, + { + "git-tree": "45a481a8297b1a33bcf75ed3d5d7d47f7c2690e1", + "version-string": "9.6.1-6", + "port-version": 0 + }, + { + "git-tree": "76c1ba1e45eac604dfb67c4d51563d806e8475de", + "version-string": "9.6.1-5", + "port-version": 0 + }, + { + "git-tree": "6df4bdfc6142a40a6e4968b8f45e2408d3b6da1e", + "version-string": "9.6.1-4", + "port-version": 0 + }, + { + "git-tree": "df96330f01fbd70381667e6f8007613a23a992cf", + "version-string": "9.6.1-1", + "port-version": 0 + }, + { + "git-tree": "db584f4143e453ea6a60476a99f97bf92ad31fcb", + "version-string": "9.6.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libpqxx.json b/externals/vcpkg/versions/l-/libpqxx.json new file mode 100755 index 000000000..332f8470d --- /dev/null +++ b/externals/vcpkg/versions/l-/libpqxx.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "da2e393b9844105fa00c800afb44bc93541dcb00", + "version": "7.7.3", + "port-version": 0 + }, + { + "git-tree": "6dd0107ca668c589cf18a57a884dd3ef276730cf", + "version-semver": "7.6.0", + "port-version": 3 + }, + { + "git-tree": "5c4df2807e229629d04aecc0a66f11219d4dcbcd", + "version-semver": "7.6.0", + "port-version": 2 + }, + { + "git-tree": "37cce5f0124f6f870793a650937ca978c1fc4750", + "version-semver": "7.6.0", + "port-version": 1 + }, + { + "git-tree": "bbbc587d55d5d1ee059e417b045dfc82ca4897c2", + "version-semver": "7.6.0", + "port-version": 0 + }, + { + "git-tree": "ac2255ecfdb7a6d5b6307413f181117d005a4989", + "version-string": "7.3.1", + "port-version": 1 + }, + { + "git-tree": "66295fd2998b54f3f4fd43702c0f402fef16fccd", + "version-string": "7.3.1", + "port-version": 0 + }, + { + "git-tree": "8108ba3b6f2f2d5a6f27c1afb5981b778ef184d7", + "version-string": "7.3.0", + "port-version": 0 + }, + { + "git-tree": "fd09edeb322fabd08d03b8a96977513956c0cf12", + "version-string": "7.2.1", + "port-version": 0 + }, + { + "git-tree": "de40907ffeff0e6ac5a8d5595cf9847bc42909e5", + "version-string": "7.2.0", + "port-version": 0 + }, + { + "git-tree": "118a0b5c5d3e598c6d84c41e31e8fcf0f5dd1b6d", + "version-string": "6.4.7", + "port-version": 0 + }, + { + "git-tree": "81c19c9111432df27b288a8db1c8129e4d4bd4dc", + "version-string": "6.4.5-3", + "port-version": 0 + }, + { + "git-tree": "4eb9f1bc9b73899c210b95aeae0d7311bd2a1cfe", + "version-string": "6.4.5-2", + "port-version": 0 + }, + { + "git-tree": "808206ee43e5eb49584a47728b0f0f8415796a77", + "version-string": "6.4.5-1", + "port-version": 0 + }, + { + "git-tree": "4e6cd4eefe116c157f490f9fb3fbe01b623a6dc6", + "version-string": "6.4.5", + "port-version": 0 + }, + { + "git-tree": "4dd06265eec7f3f5de646e2cca37771bac754aac", + "version-string": "6.4.4", + "port-version": 0 + }, + { + "git-tree": "3b2ae07c4fe18cfb446233b8353c0e6c74f3ed4d", + "version-string": "6.4.3", + "port-version": 0 + }, + { + "git-tree": "a827676852f4b213a838a560417cab84da2d606b", + "version-string": "6.0.0-1", + "port-version": 0 + }, + { + "git-tree": "7bb15fd1bf27e843da543458585e3e9154ab65eb", + "version-string": "6.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libprotobuf-mutator.json b/externals/vcpkg/versions/l-/libprotobuf-mutator.json new file mode 100755 index 000000000..38317dc4a --- /dev/null +++ b/externals/vcpkg/versions/l-/libprotobuf-mutator.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "17b7f9e9cf92d23ffee15bd262f8dccb9dca3da0", + "version-string": "1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libproxy.json b/externals/vcpkg/versions/l-/libproxy.json new file mode 100755 index 000000000..c05418e94 --- /dev/null +++ b/externals/vcpkg/versions/l-/libproxy.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "ff241fdc3665ad4d1dce051fcdd8ee8dc8617c86", + "version": "0.4.17", + "port-version": 3 + }, + { + "git-tree": "a44c6a0f0d04d6ea82c7a29c879dfd13cadb38ca", + "version": "0.4.17", + "port-version": 2 + }, + { + "git-tree": "159dadd3ff9a4ba3ce1fec74a933980aa895ee02", + "version": "0.4.17", + "port-version": 1 + }, + { + "git-tree": "ab650ac3327ba4cd214ca5de79a626574594c63f", + "version": "0.4.17", + "port-version": 0 + }, + { + "git-tree": "49aac7c55ac89c54daa7d91d8eed713a79ab2713", + "version-string": "0.4.15", + "port-version": 3 + }, + { + "git-tree": "7f8aa36e95779e7845d82f4bad6f300dae04b58d", + "version-string": "0.4.15-2", + "port-version": 0 + }, + { + "git-tree": "4a2d0a57a331d65e2bbcd60bc44ba8ae5f899ea2", + "version-string": "0.4.15-1", + "port-version": 0 + }, + { + "git-tree": "111e746733d50753aa97e3c0029114e2969a1588", + "version-string": "0.4.15", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libqcow.json b/externals/vcpkg/versions/l-/libqcow.json new file mode 100755 index 000000000..7ea89f693 --- /dev/null +++ b/externals/vcpkg/versions/l-/libqcow.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "03d185bd85372ecd790739994ef2eb487a9595bc", + "version-string": "20210419", + "port-version": 2 + }, + { + "git-tree": "1d32eac160d01f07c4918816493353b53375f7de", + "version-string": "20210419", + "port-version": 1 + }, + { + "git-tree": "de588945b39a3e022991df3289a71fab3162474d", + "version-string": "20210419", + "port-version": 0 + }, + { + "git-tree": "236cb89ed2aaf88e94409fc2f91b82c6c2b4cd49", + "version-string": "20200928", + "port-version": 0 + }, + { + "git-tree": "5fb6b51258aa897f570fc5a744104b42d5a6928b", + "version-string": "20191221-1", + "port-version": 0 + }, + { + "git-tree": "1abb1a7acee09a4b535f7cacae05b09cc47d0b11", + "version-string": "20191221", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libqglviewer.json b/externals/vcpkg/versions/l-/libqglviewer.json new file mode 100755 index 000000000..3d2e59951 --- /dev/null +++ b/externals/vcpkg/versions/l-/libqglviewer.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "af8c797ea264a95603d8d825a75d73d5cc408d4d", + "version-string": "2.7.2", + "port-version": 4 + }, + { + "git-tree": "73dd8e7a3f427ca6033c3836fac52ca45c4218cb", + "version-string": "2.7.2-3", + "port-version": 0 + }, + { + "git-tree": "331d62689bc20089845b9eb16879da8b5476b85f", + "version-string": "2.7.2-2", + "port-version": 0 + }, + { + "git-tree": "cb9c2b1899de5a040c513c481eee7e9359a598ea", + "version-string": "2.7.2", + "port-version": 0 + }, + { + "git-tree": "b1e8df05c60f20beeb3c996adc159af5d533f74f", + "version-string": "2.7.0-2", + "port-version": 0 + }, + { + "git-tree": "1d70b2578e1cdc442d8a2b3fbf03702875c268f3", + "version-string": "2.7.0", + "port-version": 0 + }, + { + "git-tree": "8255c4861e262210c01f427f37475015a826c616", + "version-string": "2.7.1-1", + "port-version": 0 + }, + { + "git-tree": "0cb31bfdefbf6ae0823317d39dad0d9e6becdec9", + "version-string": "2.7.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libqrencode.json b/externals/vcpkg/versions/l-/libqrencode.json new file mode 100755 index 000000000..1bcd7daf6 --- /dev/null +++ b/externals/vcpkg/versions/l-/libqrencode.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "52b904615b0dcea800292c9eaf2f06da32f2160d", + "version-semver": "4.1.1", + "port-version": 1 + }, + { + "git-tree": "89b4597328eb8e7399b0cdaf1342c0abc74771c7", + "version-semver": "4.1.1", + "port-version": 0 + }, + { + "git-tree": "21e120487f7ddca306d7ddb04c75a86f360b7a4c", + "version-string": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "ad8bed7843132caa59f7a67644d2499c4c7dd337", + "version-string": "4.0.2-1", + "port-version": 0 + }, + { + "git-tree": "714cb36125cba2c5400e36ba5f1888599621cae6", + "version-string": "4.0.2", + "port-version": 0 + }, + { + "git-tree": "a8e8bd9ae8291ec9b67d3693090879b49de6d5cf", + "version-string": "4.0.0-2", + "port-version": 0 + }, + { + "git-tree": "1a47e59155a501242e0466f9457f3bf6ff318965", + "version-string": "4.0.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/librabbitmq.json b/externals/vcpkg/versions/l-/librabbitmq.json new file mode 100755 index 000000000..1184cdf79 --- /dev/null +++ b/externals/vcpkg/versions/l-/librabbitmq.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "3131805ba3b7940db19df08d930a13d2fc1c707c", + "version": "0.11.0", + "port-version": 1 + }, + { + "git-tree": "cfed3947ffb960b8b8bd399093aa21f5981464b7", + "version": "0.11.0", + "port-version": 0 + }, + { + "git-tree": "002128f2677cfaa53843e36849ebcfef1f2c540e", + "version-string": "2020-06-03", + "port-version": 1 + }, + { + "git-tree": "130a756c21f59d35c26dc147d8af8216d9bdcf7f", + "version-string": "2020-06-03", + "port-version": 0 + }, + { + "git-tree": "5ed4db4d83748fc42d9f450c06a7ec6db406cf47", + "version-string": "0.10.0", + "port-version": 0 + }, + { + "git-tree": "1764b881e5c1cc2450bb3d2d050a7f67136bac8a", + "version-string": "0.9.0-1", + "port-version": 0 + }, + { + "git-tree": "61de8718556284300f512b12fbbb12b3fd50fd24", + "version-string": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "a330deae7849c07c138883b55f955d5f68c9be38", + "version-string": "0.8.0-1", + "port-version": 0 + }, + { + "git-tree": "a0aafa30788495064695568747606b93cba08d13", + "version-string": "0.8.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libraqm.json b/externals/vcpkg/versions/l-/libraqm.json new file mode 100755 index 000000000..b024ba019 --- /dev/null +++ b/externals/vcpkg/versions/l-/libraqm.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "e5cdb799bec1a56eba248db499ac2e64d8a3b059", + "version-string": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "7c83ce59ebe48d25178c998704ba4559807288ba", + "version-string": "0.7.0", + "port-version": 3 + }, + { + "git-tree": "fa05347d4a56f608da568ea8041d259b959e8d9d", + "version-string": "0.7.0", + "port-version": 2 + }, + { + "git-tree": "0fa14afe4457ec8bfbd44c4bd757de9bf0cd57c2", + "version-string": "0.7.0-1", + "port-version": 0 + }, + { + "git-tree": "7d016d65b12eca8cfad594fe152e39a72892e525", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "8e41b7f66f6db067d52d1ff84d05e67bcb80ca2a", + "version-string": "0.6.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libraw.json b/externals/vcpkg/versions/l-/libraw.json new file mode 100755 index 000000000..698626379 --- /dev/null +++ b/externals/vcpkg/versions/l-/libraw.json @@ -0,0 +1,114 @@ +{ + "versions": [ + { + "git-tree": "aeb0a198c349fb336ad7cd710aeaf0b1017679a1", + "version-string": "201903", + "port-version": 7 + }, + { + "git-tree": "e05fbd81dbe6b44b09c9aae106f4dc7df708ce49", + "version-string": "201903", + "port-version": 6 + }, + { + "git-tree": "fa490349ec4e8e8d8854c18725068a8a8474b3ac", + "version-string": "201903", + "port-version": 5 + }, + { + "git-tree": "80a0638bcb03f5e4c53f4b35562da7b8485fda11", + "version-string": "201903", + "port-version": 4 + }, + { + "git-tree": "659d20658809488ab3cfccf30d85870ce06615e0", + "version-string": "201903-3", + "port-version": 0 + }, + { + "git-tree": "b37f82b870dd4639b11ceeb26ddb1ccde42a4679", + "version-string": "201903-2", + "port-version": 0 + }, + { + "git-tree": "ecfaf7df127015101d59d1c704269e5d2c3bb89d", + "version-string": "201903-1", + "port-version": 0 + }, + { + "git-tree": "70e6e850f36b47cd653eb645b25ad7ee6118c4d9", + "version-string": "201903", + "port-version": 0 + }, + { + "git-tree": "ad76a869353855fd6ebecdab04ee13ba350d3b72", + "version-string": "0.19.2", + "port-version": 0 + }, + { + "git-tree": "d2ad440c830dea08517f1f100ba6f46daf0a2da0", + "version-string": "0.19.0-3", + "port-version": 0 + }, + { + "git-tree": "949450a33a78d4f5d18fcbf40e90c4c580e02ae9", + "version-string": "0.19.0-2", + "port-version": 0 + }, + { + "git-tree": "2b8655c3961b0c0ce42168a378f96577982dc69e", + "version-string": "0.19.0-1", + "port-version": 0 + }, + { + "git-tree": "41bb3f06069827237eac0e74b58a43aca6dde758", + "version-string": "0.19.0", + "port-version": 0 + }, + { + "git-tree": "c9796557a10c3b61e0c5b1e67147352ef69cf1a9", + "version-string": "0.18.2-5", + "port-version": 0 + }, + { + "git-tree": "96453188623ddcef2ea3eac87f427a2620f66567", + "version-string": "0.18.2-4", + "port-version": 0 + }, + { + "git-tree": "459a792ccb5cab501921910bfee9931394ec0d03", + "version-string": "0.18.2-3", + "port-version": 0 + }, + { + "git-tree": "b61061859ee19f017adce149b6fe3d66e8ac6357", + "version-string": "0.18.2-2", + "port-version": 0 + }, + { + "git-tree": "d8f368bc4ad28b5f3fec96bad6901224b85010e0", + "version-string": "0.18.2-1", + "port-version": 0 + }, + { + "git-tree": "6a952ec463eb3a164b36b20340cd235ec623250b", + "version-string": "0.18.0-1", + "port-version": 0 + }, + { + "git-tree": "4e3204e55c782c955460af2614a5585a020712bf", + "version-string": "0.17.2-2", + "port-version": 0 + }, + { + "git-tree": "1b0bdf9fe94c7f3cd47ab77a4d57b8373fa9a71c", + "version-string": "0.17.2-1", + "port-version": 0 + }, + { + "git-tree": "42c390e463452ca9f54cef721652521f74b74c2d", + "version-string": "0.17.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/librdkafka.json b/externals/vcpkg/versions/l-/librdkafka.json new file mode 100755 index 000000000..ff08e20cb --- /dev/null +++ b/externals/vcpkg/versions/l-/librdkafka.json @@ -0,0 +1,104 @@ +{ + "versions": [ + { + "git-tree": "0583e5dcb6a79a29685250e2b43ca1cd2a798d96", + "version": "1.8.2", + "port-version": 2 + }, + { + "git-tree": "2f7a6da2edf664e544914466d1cc8994d1ea475a", + "version": "1.8.2", + "port-version": 1 + }, + { + "git-tree": "dc5076b17ce1f54f6e61560036325ca9f24cda64", + "version": "1.8.2", + "port-version": 0 + }, + { + "git-tree": "3d418b5510b8ed058f73035681f3e1de5aa94c28", + "version-string": "1.7.0", + "port-version": 2 + }, + { + "git-tree": "7a309365a3b06309b47543f15b421ecfe4421d6a", + "version-string": "1.7.0", + "port-version": 1 + }, + { + "git-tree": "d436f6df2863c1bf133c1f0efd53cb8281710b80", + "version-string": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "6cdfbfb527ed75e097d74d502fe2dcaea147d5f0", + "version-string": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "aab0369fb81b969656cdb4a925ce539d71ca46c6", + "version-string": "1.4.4-1", + "port-version": 0 + }, + { + "git-tree": "60cfc10dad4e9603fa9e75bb62eb9ab3ebaadc19", + "version-string": "1.2.0-2", + "port-version": 0 + }, + { + "git-tree": "f3491a7035a4fd02f48b0458a50bc784031527b6", + "version-string": "1.2.0-1", + "port-version": 0 + }, + { + "git-tree": "549a9c194034604a2585f9e7a9c8385739f09710", + "version-string": "1.1.0-1", + "port-version": 0 + }, + { + "git-tree": "4938dcc9d95d7c148d74b7c3a6f2d4cf6ace74d4", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "207c65df83c090a3c525a051a7aeecb91b3e2c0f", + "version-string": "2019-06-13", + "port-version": 0 + }, + { + "git-tree": "804b6ebdddce2556f5b384749f155dda0a2ef500", + "version-string": "2019-05-27", + "port-version": 0 + }, + { + "git-tree": "04ec354f88aa3e0a00b0a0ee4ce60f7dc63cc310", + "version-string": "2019-05-07-2", + "port-version": 0 + }, + { + "git-tree": "3c34c160ac6049cee2772086d24399122843d9fa", + "version-string": "2019-05-07-1", + "port-version": 0 + }, + { + "git-tree": "a4ac6d8f4fc9135eb4ad4ee0506d4db9b7c87c0a", + "version-string": "2019-05-07", + "port-version": 0 + }, + { + "git-tree": "497f5acdcd83a0c6d5cde89348fa8a3f8d2bea4b", + "version-string": "2019-04-30", + "port-version": 0 + }, + { + "git-tree": "3a7fd8de68722a1780db665ba2c7213b616d187b", + "version-string": "2019-04-16", + "port-version": 0 + }, + { + "git-tree": "e86c8415085f9cd61fde2f798716650b4e3da85e", + "version-string": "v1.0.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libressl.json b/externals/vcpkg/versions/l-/libressl.json new file mode 100755 index 000000000..7312a9eda --- /dev/null +++ b/externals/vcpkg/versions/l-/libressl.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "09613175bb9f051a273b68c0520ad4017d8fabd9", + "version": "3.4.2", + "port-version": 0 + }, + { + "git-tree": "1541c15439fdf9199c6796b51cd59fa644b7d9e4", + "version": "3.3.4", + "port-version": 1 + }, + { + "git-tree": "2dcc81c2e764c5f32d9c35280ab9ae06fda622c3", + "version": "3.3.4", + "port-version": 0 + }, + { + "git-tree": "24a18d6ed79f2b8c4c01c5201998981b2d831a1a", + "version": "3.3.3", + "port-version": 0 + }, + { + "git-tree": "3de8a5b9f15524db17ccff3c0a4c61266d8fb3b1", + "version-string": "2.9.1", + "port-version": 3 + }, + { + "git-tree": "ab54b54b22da6f0d5ac3baaa77bea574646e20b3", + "version-string": "2.9.1-2", + "port-version": 0 + }, + { + "git-tree": "924fdc5ac4fc4bcbb6ab8b8f6f0e6a4bc9883f9e", + "version-string": "2.9.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/librsvg.json b/externals/vcpkg/versions/l-/librsvg.json new file mode 100755 index 000000000..735241c8a --- /dev/null +++ b/externals/vcpkg/versions/l-/librsvg.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "f1c471322f23a090a973337e83f0d9743adc549d", + "version": "2.40.20", + "port-version": 5 + }, + { + "git-tree": "0a02c4941810ea725b6686e203ae81deb257e24c", + "version": "2.40.20", + "port-version": 4 + }, + { + "git-tree": "0de6b9c0d9dc0ada7b9223669bb08e9ef146aa7a", + "version": "2.40.20", + "port-version": 3 + }, + { + "git-tree": "a2517e6695683ed935c8b0e5f4690c51fc2390cb", + "version-string": "2.40.20-2", + "port-version": 0 + }, + { + "git-tree": "dd90fd2e622de4e8736279e76a375ece643757f2", + "version-string": "2.40.20-1", + "port-version": 0 + }, + { + "git-tree": "5928d42660d73483fe91dbe34aec42b821a8a7a0", + "version-string": "2.40.20", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/librsync.json b/externals/vcpkg/versions/l-/librsync.json new file mode 100755 index 000000000..6ea83e07f --- /dev/null +++ b/externals/vcpkg/versions/l-/librsync.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "1d252092a8f0d2ecbf57a4113324b363d4c43db1", + "version-semver": "2.3.2", + "port-version": 1 + }, + { + "git-tree": "e6fbc4e5fec56fbef5ac08d642e8b550a1c47490", + "version-semver": "2.3.2", + "port-version": 0 + }, + { + "git-tree": "ce3c47220d819e3348b72aad90254cabdf238000", + "version-string": "2020-09-16", + "port-version": 1 + }, + { + "git-tree": "cdc3163d9504b779e074d3c3e1b69f84b562dfd7", + "version-string": "2020-09-16", + "port-version": 0 + }, + { + "git-tree": "652ab88122d410248b88c2b946f7f758e10dac7c", + "version-string": "2.0.2-1", + "port-version": 0 + }, + { + "git-tree": "9a4939cc451c5db277316dbb565527100380107d", + "version-string": "2.0.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/librtmp.json b/externals/vcpkg/versions/l-/librtmp.json new file mode 100755 index 000000000..6f0544b25 --- /dev/null +++ b/externals/vcpkg/versions/l-/librtmp.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "337fb3f8ed2cb44c9ed06d7dc8b00356e077aa40", + "version-date": "2019-11-11", + "port-version": 3 + }, + { + "git-tree": "f3b156fff5f461b63a2665c4ec4a9a805e5a5447", + "version-date": "2019-11-11", + "port-version": 2 + }, + { + "git-tree": "b6470730f086d7c4e4ba3fd890ce17ec95084b41", + "version-string": "2019-11-11_1", + "port-version": 0 + }, + { + "git-tree": "ee04ac22b9026dc5cf6eb07232294b6fd97cc793", + "version-string": "2019-11-11", + "port-version": 0 + }, + { + "git-tree": "df456d424caca008855127c6e4e0a0a703981cf0", + "version-string": "2.4-2", + "port-version": 0 + }, + { + "git-tree": "98c9119c3cb3dd41a1ac4199edbb294ade7c389e", + "version-string": "2.4-1", + "port-version": 0 + }, + { + "git-tree": "5f80408a55096ad194f2017a02c4ed4defd1de84", + "version-string": "2.4", + "port-version": 0 + }, + { + "git-tree": "e6558ecdd4db2002a8893ffc802b20ac2536d135", + "version-string": "2.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/librttopo.json b/externals/vcpkg/versions/l-/librttopo.json new file mode 100755 index 000000000..5c3773f05 --- /dev/null +++ b/externals/vcpkg/versions/l-/librttopo.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "d747c88d429ff781b11627623d0958967f912a41", + "version": "1.1.0", + "port-version": 5 + }, + { + "git-tree": "fae3fefb29d1972caa2643351ebf83ca47f7d04a", + "version": "1.1.0", + "port-version": 4 + }, + { + "git-tree": "b248b7c998e21a3feaf8581d8418306d54d5edc9", + "version-string": "1.1.0-3", + "port-version": 0 + }, + { + "git-tree": "dfaa13a1e256dae5bf673ee6c803b30d73ce25d8", + "version-string": "1.1.0-2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libsamplerate.json b/externals/vcpkg/versions/l-/libsamplerate.json new file mode 100755 index 000000000..9917373de --- /dev/null +++ b/externals/vcpkg/versions/l-/libsamplerate.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "bb3644f62b521a50eebc5ede8718fc0669b1f6b5", + "version-string": "0.2.2", + "port-version": 0 + }, + { + "git-tree": "658d28f9892b0676577bb6b61b3eff7d2730e72e", + "version-string": "0.2.1", + "port-version": 0 + }, + { + "git-tree": "5247f6ff1ca88bae029dc84a18a5a6333e561a85", + "version-string": "0.2.0", + "port-version": 0 + }, + { + "git-tree": "ec1fec464998f298385bf9afe0ac63cdbc8adda2", + "version-string": "0.1.9.0", + "port-version": 3 + }, + { + "git-tree": "f35bb6cff0cbf5236af2eaa54864d534fff63aef", + "version-string": "0.1.9.0", + "port-version": 2 + }, + { + "git-tree": "259ab515efcc872d127c39b87437c6844c244fff", + "version-string": "0.1.9.0-1", + "port-version": 0 + }, + { + "git-tree": "caf1fab092e13c22501dc1954aa48fe760cbdaff", + "version-string": "0.1.9.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libsass.json b/externals/vcpkg/versions/l-/libsass.json new file mode 100755 index 000000000..55295b935 --- /dev/null +++ b/externals/vcpkg/versions/l-/libsass.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "9f688f8a8026f1078f224e7bcc4eef8fc21561a2", + "version": "3.6.5", + "port-version": 1 + }, + { + "git-tree": "f6568e763bc2718b27a5dc2d3d1db4d3cf651572", + "version": "3.6.5", + "port-version": 0 + }, + { + "git-tree": "124a73deb4e0b7677411ab0285b70013c26782c8", + "version-string": "3.6.4", + "port-version": 1 + }, + { + "git-tree": "87bcd6907b761946cefe3ff059952f6649ce335c", + "version-string": "3.6.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libsbml.json b/externals/vcpkg/versions/l-/libsbml.json new file mode 100755 index 000000000..2f488b144 --- /dev/null +++ b/externals/vcpkg/versions/l-/libsbml.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "9793402aaa4679187a9a703f189239544e3daf77", + "version": "5.19.0", + "port-version": 2 + }, + { + "git-tree": "12ec3d5ff69d3e8b960c03b9b0ae8127663227f5", + "version": "5.19.0", + "port-version": 1 + }, + { + "git-tree": "6b31fe78dcb93a9935119d5b9bcefbb1f3950d6a", + "version": "5.19.0", + "port-version": 0 + }, + { + "git-tree": "1a609c8dc53ab3d8895e749d2361c9085084dfec", + "version-string": "5.18.0", + "port-version": 1 + }, + { + "git-tree": "1f88782ee0e10d3ac4f2604ffd6b9b2f78e9d946", + "version-string": "5.18.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libsbsms.json b/externals/vcpkg/versions/l-/libsbsms.json new file mode 100755 index 000000000..a1840eab3 --- /dev/null +++ b/externals/vcpkg/versions/l-/libsbsms.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e6367a94b6e35f2acf16b6a931749fcfab8ffefe", + "version-semver": "2.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libsecret.json b/externals/vcpkg/versions/l-/libsecret.json new file mode 100755 index 000000000..4b17d8ff5 --- /dev/null +++ b/externals/vcpkg/versions/l-/libsecret.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "a5e91b4b0043a5deb14f9ab62710b3410e969d54", + "version": "0.20.4", + "port-version": 1 + }, + { + "git-tree": "28e3a8bccc8c6ba0b40bf89f178e293dd282959b", + "version": "0.20.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libsercomm.json b/externals/vcpkg/versions/l-/libsercomm.json new file mode 100755 index 000000000..75c02eec9 --- /dev/null +++ b/externals/vcpkg/versions/l-/libsercomm.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "85fa53c8aa1927afa7844c01b646a86de8803c30", + "version": "1.3.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libsigcpp-3.json b/externals/vcpkg/versions/l-/libsigcpp-3.json new file mode 100755 index 000000000..a81ecd827 --- /dev/null +++ b/externals/vcpkg/versions/l-/libsigcpp-3.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "62a25fda6418ec8fcf938d39662062aee707edb1", + "version": "3.0.3", + "port-version": 1 + }, + { + "git-tree": "6956e6da9d0cd0c772810b1ec9bc7815d44474f5", + "version-string": "3.0.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libsigcpp.json b/externals/vcpkg/versions/l-/libsigcpp.json new file mode 100755 index 000000000..a1a014cb9 --- /dev/null +++ b/externals/vcpkg/versions/l-/libsigcpp.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "7631555eb4ab142a7f643a266f79a87bc8aeca12", + "version": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "bdb51863c5589b8e47c717b7c96a1ead39d4dd27", + "version": "3.0.7", + "port-version": 0 + }, + { + "git-tree": "462e27cfc4abccd4d3157b2ae8b22c4bb6b82c67", + "version": "3.0.3", + "port-version": 1 + }, + { + "git-tree": "398cf35cc5235b326dda845e568295841aecc461", + "version": "3.0.3", + "port-version": 0 + }, + { + "git-tree": "01d944fb87f11bec271ba87fe808b5949603f32e", + "version-string": "2.10-3", + "port-version": 2 + }, + { + "git-tree": "8ddddfb7f0182c4d17b76b144324d7a0bbf481d3", + "version-string": "2.10-3", + "port-version": 1 + }, + { + "git-tree": "a1bedab09b90e7328502da90300edf3e00a4e183", + "version-string": "2.10-3", + "port-version": 0 + }, + { + "git-tree": "fd94e911289b218b668f86cbdf152be1af48363c", + "version-string": "2.10-1", + "port-version": 0 + }, + { + "git-tree": "4ca74186e4d95dc515dc47bbd4c50ae367ddb2c2", + "version-string": "2.10", + "port-version": 0 + }, + { + "git-tree": "09db64950ba3226ed91123c3d096baf28eb3b580", + "version-string": "2.99-1", + "port-version": 0 + }, + { + "git-tree": "55e6b75f3c7ff98dbf0adf649f6a9142d46638f4", + "version-string": "2.99", + "port-version": 0 + }, + { + "git-tree": "4ca74186e4d95dc515dc47bbd4c50ae367ddb2c2", + "version-string": "2.10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libslirp.json b/externals/vcpkg/versions/l-/libslirp.json new file mode 100755 index 000000000..0a600351e --- /dev/null +++ b/externals/vcpkg/versions/l-/libslirp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "6946f40e08a89013e998d3bf397613bdf08cb581", + "version-semver": "4.7.0", + "port-version": 0 + }, + { + "git-tree": "3230fcf2c1b8018c5eac033b618f2cb35217772f", + "version-semver": "4.6.1", + "port-version": 1 + }, + { + "git-tree": "5a7b734c0850f035d3eb2abc2d3dbf6389124be5", + "version-semver": "4.6.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libsmb2.json b/externals/vcpkg/versions/l-/libsmb2.json new file mode 100755 index 000000000..07034124a --- /dev/null +++ b/externals/vcpkg/versions/l-/libsmb2.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "2793ccd966a8c7b7cbe925000471c3ba3ef7d77b", + "version-date": "2021-04-29", + "port-version": 1 + }, + { + "git-tree": "033110ed64eb6d73a85ab8439c13b84b5ee02891", + "version-date": "2021-04-29", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libsndfile.json b/externals/vcpkg/versions/l-/libsndfile.json new file mode 100755 index 000000000..b1d58472d --- /dev/null +++ b/externals/vcpkg/versions/l-/libsndfile.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "1ec8249a4721dda26735a12603defe2aa680c264", + "version-semver": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "587283d6fa07092beece87351d1361506293ff59", + "version-string": "1.0.31", + "port-version": 0 + }, + { + "git-tree": "03a5a8afe22b95df759e1f581e3a35d27ee99540", + "version-string": "1.0.30", + "port-version": 1 + }, + { + "git-tree": "48e28a9d4f6901ba45d9e0a295728fc5e54a1602", + "version-string": "1.0.30", + "port-version": 0 + }, + { + "git-tree": "9b76392cd3ac354e204555956bb6de50a0a22962", + "version-string": "1.0.29", + "port-version": 11 + }, + { + "git-tree": "c52b8eeabd642e152b61ad429820499f356df8f0", + "version-string": "1.0.29", + "port-version": 10 + }, + { + "git-tree": "93115aed673846b5808bc19b732990e670e9b5e7", + "version-string": "1.0.29-9", + "port-version": 0 + }, + { + "git-tree": "616936e3b04a6784e03e484ad4767a2b52332e3c", + "version-string": "1.0.29-8", + "port-version": 0 + }, + { + "git-tree": "946b28852d5bde57a8ac2a198e14201f953da3cc", + "version-string": "1.0.29-6830c42-7", + "port-version": 0 + }, + { + "git-tree": "bb7ff9b145d78daf27148b251b20c4337fc67295", + "version-string": "1.0.29-6830c42-6", + "port-version": 0 + }, + { + "git-tree": "7cd55af4b383c17739c09fdc7e26780f7225683d", + "version-string": "1.0.29-6830c42-5", + "port-version": 0 + }, + { + "git-tree": "646f2bf151e08d1adb542a90cead11a0c06a39f1", + "version-string": "1.0.29-6830c42-3", + "port-version": 0 + }, + { + "git-tree": "c2ce1df1a7c1b9688760523db04dde726f8f5f9c", + "version-string": "1.0.29-6830c42-2", + "port-version": 0 + }, + { + "git-tree": "f09add28803f1a4bf103162ea85f1af1e585eca4", + "version-string": "1.0.29-6830c42-1", + "port-version": 0 + }, + { + "git-tree": "bb37fbddf9cbd3044ebbcaaf7088cdd71e7e4be3", + "version-string": "libsndfile-1.0.29-6830c42-1", + "port-version": 0 + }, + { + "git-tree": "6f934597fdee204cacd7f642e074550de88557ef", + "version-string": "libsndfile-1.0.29-6830c42", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libsnoretoast.json b/externals/vcpkg/versions/l-/libsnoretoast.json new file mode 100755 index 000000000..026d6eaac --- /dev/null +++ b/externals/vcpkg/versions/l-/libsnoretoast.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "9931c3af48647454daf01f77ea23c63fc9aeb732", + "version": "0.8.0", + "port-version": 2 + }, + { + "git-tree": "66d0c5615dc55a5a5201e6de21d5a7acbaa4bd9b", + "version": "0.8.0", + "port-version": 1 + }, + { + "git-tree": "7ddd1b84089de293b4a9d74af6b7593d089084a9", + "version-semver": "0.8.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libsodium.json b/externals/vcpkg/versions/l-/libsodium.json new file mode 100755 index 000000000..b193c35e2 --- /dev/null +++ b/externals/vcpkg/versions/l-/libsodium.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "9ffdf9b217021918c33311af9faa9b4a3086d004", + "version": "1.0.18", + "port-version": 7 + }, + { + "git-tree": "06e21819c9b176b52aa0b9226c3e2bc07ec20a23", + "version": "1.0.18", + "port-version": 6 + }, + { + "git-tree": "8b1c2632e8f7c23408a655d6c97b6d51ad354a19", + "version": "1.0.18", + "port-version": 5 + }, + { + "git-tree": "6ec1ee39e69052d50e773857064d2d06968ee8c3", + "version-string": "1.0.18", + "port-version": 4 + }, + { + "git-tree": "fc00e8b0dba7ee227aa5d53860c1b5cfe92b8819", + "version-string": "1.0.18", + "port-version": 3 + }, + { + "git-tree": "0636058ca92ce65f09c8c37e1b3b797b700efe03", + "version-string": "1.0.18-2", + "port-version": 0 + }, + { + "git-tree": "e2898ade85ee58da644d6a656e6817ddee60a880", + "version-string": "1.0.18-1", + "port-version": 0 + }, + { + "git-tree": "2b9184ce5da00f74e933bde06ce0a449a44262dc", + "version-string": "1.0.18", + "port-version": 0 + }, + { + "git-tree": "ada29163107200ff0cfe9da7f44ce33b4e4c4256", + "version-string": "1.0.17-3", + "port-version": 0 + }, + { + "git-tree": "98a6bdf9e37f04a2913fcb682636a8b2611ad7ea", + "version-string": "1.0.17-2", + "port-version": 0 + }, + { + "git-tree": "a8a582fbdcba75febe53011b5387021eff5a2a06", + "version-string": "1.0.17-1", + "port-version": 0 + }, + { + "git-tree": "64450def767dc3e95ccf188f17dfed0c9a8e038b", + "version-string": "1.0.17", + "port-version": 0 + }, + { + "git-tree": "95ce0c6f586a8d1c1c1994037439f4b1abbcc049", + "version-string": "1.0.16-1", + "port-version": 0 + }, + { + "git-tree": "020c91719bd519352a2a179040b33a42c69c7812", + "version-string": "1.0.16", + "port-version": 0 + }, + { + "git-tree": "1c6410b1314332f2ff0807ee2d40708d435de501", + "version-string": "1.0.15-1", + "port-version": 0 + }, + { + "git-tree": "1ef870ed6c827c7dcc08fff97b5760e86652290c", + "version-string": "1.0.15", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libsoundio.json b/externals/vcpkg/versions/l-/libsoundio.json new file mode 100755 index 000000000..b2a720c60 --- /dev/null +++ b/externals/vcpkg/versions/l-/libsoundio.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "ff8356daa64c082441be7beb2d51c5360a54a6cd", + "version": "2.0.0", + "port-version": 6 + }, + { + "git-tree": "ea8a154b722a142045906b20d2df00a38d330d6b", + "version": "2.0.0", + "port-version": 5 + }, + { + "git-tree": "96de946826ca6aafdc9409f9d75f02a6d082cffb", + "version": "2.0.0", + "port-version": 4 + }, + { + "git-tree": "b7c77d32f74a10cb1ff43cb80c15d6a6f65d5d53", + "version-string": "2.0.0-3", + "port-version": 0 + }, + { + "git-tree": "02f84d0e95a2dad65ecd57ec588599c4a03769b6", + "version-string": "2.0.0-1", + "port-version": 0 + }, + { + "git-tree": "0fb545db8054236021ee485fb7eae34d8c2004aa", + "version-string": "2.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libspatialindex.json b/externals/vcpkg/versions/l-/libspatialindex.json new file mode 100755 index 000000000..9f034e9d0 --- /dev/null +++ b/externals/vcpkg/versions/l-/libspatialindex.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "2e1fceafc0be5ea8fd1b2961104f46a5e29c9a6c", + "version": "1.9.3", + "port-version": 0 + }, + { + "git-tree": "4313465aee191d0e9e0154f01beaf2e4e47a3e4f", + "version-string": "1.9.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libspatialite.json b/externals/vcpkg/versions/l-/libspatialite.json new file mode 100755 index 000000000..1a7787f3d --- /dev/null +++ b/externals/vcpkg/versions/l-/libspatialite.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "27ff74dc3c1f0d6c5e11dbcc110f34e46dae862a", + "version": "5.0.1", + "port-version": 5 + }, + { + "git-tree": "4d7f5aa6151c1285c1b6cd5b6c03ee34db4c0c98", + "version": "5.0.1", + "port-version": 4 + }, + { + "git-tree": "ad90cccc74f447ccc40309956f67092c845fe40b", + "version": "5.0.1", + "port-version": 3 + }, + { + "git-tree": "35cc452ea0fc43d38cfca4d340e47f13c9fd740f", + "version": "5.0.1", + "port-version": 2 + }, + { + "git-tree": "9a0fe08cf3273de9def88a4fd388a1ade854cfac", + "version": "5.0.1", + "port-version": 1 + }, + { + "git-tree": "22ad27813f5f3bc3382718115ce3eb5a45174afd", + "version": "5.0.1", + "port-version": 0 + }, + { + "git-tree": "d7d124e4fcb212dba3d650817056ce23b6dc2a2f", + "version-string": "5.0.0", + "port-version": 3 + }, + { + "git-tree": "ac8547f60ac2cc08c65a907a84112e1256011a47", + "version-string": "5.0.0", + "port-version": 2 + }, + { + "git-tree": "b713a9368a0d53629cd8497cc82107ea6a33e980", + "version-string": "5.0.0", + "port-version": 1 + }, + { + "git-tree": "f63638cb7e228e76cebf7e4a6c28902b4738f907", + "version-string": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "76f275137d1de3b27c6a68aa86f474f602ead042", + "version-string": "4.3.0a", + "port-version": 7 + }, + { + "git-tree": "57cdb2ba4a272e4b9bdc0ad0d61f8d24094a20af", + "version-string": "4.3.0a", + "port-version": 6 + }, + { + "git-tree": "3bf795ec31aa4b435e158e5191363a49861a1b52", + "version-string": "4.3.0a", + "port-version": 5 + }, + { + "git-tree": "4d6e107b36d3d4a7e4bfb2e8e8a2b6f07e009467", + "version-string": "4.3.0a-4", + "port-version": 0 + }, + { + "git-tree": "81e74e299a075afeb8d6256aa44b767bcdd3c7ed", + "version-string": "4.3.0a-3", + "port-version": 0 + }, + { + "git-tree": "ce9b2d52acc10ced1c7c3c5bd2dc8dfb8bd87a35", + "version-string": "4.3.0a-2", + "port-version": 0 + }, + { + "git-tree": "e5883f4df23942e5796219a355c0c1341066403d", + "version-string": "4.3.0a-1", + "port-version": 0 + }, + { + "git-tree": "f20ffed3d004f2e7b06f33a8a4ad9cdad9111da9", + "version-string": "4.3.0a", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libspnav.json b/externals/vcpkg/versions/l-/libspnav.json new file mode 100755 index 000000000..353ca850d --- /dev/null +++ b/externals/vcpkg/versions/l-/libspnav.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "6c31fef991e0961c3194b1f9847469e98a1bdb03", + "version": "0.2.3", + "port-version": 2 + }, + { + "git-tree": "c34294f2e748d1600ca87ed7086a0ddcedb1a7b9", + "version-string": "0.2.3", + "port-version": 1 + }, + { + "git-tree": "2afc1eb32f415070a057e5072132c16021cc7088", + "version-string": "0.2.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libsquish.json b/externals/vcpkg/versions/l-/libsquish.json new file mode 100755 index 000000000..da008f533 --- /dev/null +++ b/externals/vcpkg/versions/l-/libsquish.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "9a7ae325bacc78d07dc92de654a877584cff0cca", + "version": "1.15", + "port-version": 10 + }, + { + "git-tree": "97da7fd0b127d2b07821950e5aee7acadbcd9d17", + "version-string": "1.15", + "port-version": 9 + }, + { + "git-tree": "9e7c8060fb2b0499a31df98ef1e8652081e18944", + "version-string": "1.15", + "port-version": 8 + }, + { + "git-tree": "89f022a7ab3d01ae25876f7dcaf84327f615ad87", + "version-string": "1.15-7", + "port-version": 0 + }, + { + "git-tree": "8cecde0bfe4e0877ed5c9accf43e0f3d58ad8946", + "version-string": "1.15-5", + "port-version": 0 + }, + { + "git-tree": "51fa391504a7f57fa03321ce40efb0bd83a5d5c5", + "version-string": "1.15-3", + "port-version": 0 + }, + { + "git-tree": "8d8ec8e9f11a659f457449792b8fa3907288e0ff", + "version-string": "1.15-2", + "port-version": 0 + }, + { + "git-tree": "9b3cfc2bf0f652299200b047834118b72f38fba0", + "version-string": "1.15-1", + "port-version": 0 + }, + { + "git-tree": "6b2bd544c408afd2e2deec54a6a28e306a41e7ba", + "version-string": "1.15", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libsrt.json b/externals/vcpkg/versions/l-/libsrt.json new file mode 100755 index 000000000..80e2ed58c --- /dev/null +++ b/externals/vcpkg/versions/l-/libsrt.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "bec354df76b0c680977252a11a9e88b1ae6818b9", + "version": "1.4.4", + "port-version": 2 + }, + { + "git-tree": "8181eb237eec2ba795164edfbd47f69d6b8466d8", + "version": "1.4.4", + "port-version": 1 + }, + { + "git-tree": "8187d1dc57e7d3632bdabee7516a94e0ab2a0afb", + "version": "1.4.4", + "port-version": 0 + }, + { + "git-tree": "9e446dfb7ecd2ec36c5b960c00bbc8ac9da43673", + "version-string": "1.3.4", + "port-version": 1 + }, + { + "git-tree": "cf78228426d0454712497d526abf031f6e6afd29", + "version-string": "1.3.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libsrtp.json b/externals/vcpkg/versions/l-/libsrtp.json new file mode 100755 index 000000000..07d81e330 --- /dev/null +++ b/externals/vcpkg/versions/l-/libsrtp.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "7c935c9b1559cab3460f928c2a6abb25271cfb65", + "version": "2.4.2", + "port-version": 2 + }, + { + "git-tree": "a7e8bce682acd4a29f666961a69127864cd93374", + "version": "2.4.2", + "port-version": 1 + }, + { + "git-tree": "20d89602c93b0aa1df176a8610b514b014375c8c", + "version": "2.4.2", + "port-version": 0 + }, + { + "git-tree": "fdf039be54c0a11434b8c923e808d6315b398082", + "version-string": "2.2.0", + "port-version": 1 + }, + { + "git-tree": "d19c02a581a94b808483ce127d731cee188e40b4", + "version-string": "2.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libssh.json b/externals/vcpkg/versions/l-/libssh.json new file mode 100755 index 000000000..3d650f766 --- /dev/null +++ b/externals/vcpkg/versions/l-/libssh.json @@ -0,0 +1,119 @@ +{ + "versions": [ + { + "git-tree": "7023d2f926234da8e19b11cb3a6d1d37dfbb008c", + "version": "0.9.6", + "port-version": 2 + }, + { + "git-tree": "9e1cde44baefed40b0e994bfe088a7788f1efacf", + "version": "0.9.6", + "port-version": 1 + }, + { + "git-tree": "02a95a0ab1a26e3395173bc59e9f041f23b7f5c9", + "version": "0.9.6", + "port-version": 0 + }, + { + "git-tree": "0eb17d68736a224ca8ce341b1b84bbae2f2f43a5", + "version-string": "0.9.5", + "port-version": 6 + }, + { + "git-tree": "d49a7a228c1f082d7e86bfb443af3a063a692ac7", + "version-string": "0.9.5", + "port-version": 5 + }, + { + "git-tree": "0c5ced4b1fab4db90e2b032a3339a404cdc2f3ab", + "version-string": "0.9.5", + "port-version": 4 + }, + { + "git-tree": "7436981a351a747649d03c4a27a06dc0bc3a0d16", + "version-string": "0.9.5", + "port-version": 3 + }, + { + "git-tree": "a9b49412296a9eec38c564afa33555a92898a11f", + "version-string": "0.9.5", + "port-version": 2 + }, + { + "git-tree": "bf1fb5ae9324823a60784a5ed0ecbca8a3325214", + "version-string": "0.9.5", + "port-version": 1 + }, + { + "git-tree": "a9db7620dc774257483a98c9c5309dbb7eff8263", + "version-string": "0.9.5", + "port-version": 0 + }, + { + "git-tree": "e6abfa633623458bf8c58025435c0a707bf0fb1c", + "version-string": "0.9.3-2", + "port-version": 0 + }, + { + "git-tree": "8f14c7ec09f7d0d29c691fc9b225d6a67761db7a", + "version-string": "0.9.3-1", + "port-version": 0 + }, + { + "git-tree": "0a6feb828d27c5ee860145508a17ede4e7a1e73a", + "version-string": "0.9.3", + "port-version": 0 + }, + { + "git-tree": "ee6061def32a105af072e75d61f0de95a6fdec14", + "version-string": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "b2fa5e9b88af986ee5c817a6b99c185132af3781", + "version-string": "0.9.3", + "port-version": 0 + }, + { + "git-tree": "10c4e4dd3e0b3d524dfb75f7295db75930fcb1e9", + "version-string": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "44d8f2b3b277e909d608c68049230b5f4ea5ccfa", + "version-string": "0.7.6-1", + "port-version": 0 + }, + { + "git-tree": "4145721a2592ce28523e1ece83cd3eb8fe0ed7c3", + "version-string": "0.7.6", + "port-version": 0 + }, + { + "git-tree": "cd2e1e955f2d79a9e36bb6930f01c98a18d9ca65", + "version-string": "0.7.5-4", + "port-version": 0 + }, + { + "git-tree": "f2ef7bc5dc9d0003d7647ee7b6b9a04b23596a98", + "version-string": "0.7.5-3", + "port-version": 0 + }, + { + "git-tree": "1dceea4b45e9099aebdef27ac5b6ae4a8219873d", + "version-string": "0.7.5-2", + "port-version": 0 + }, + { + "git-tree": "4efe97ee1e31efd2b6fbeb69ba6974ea40173591", + "version-string": "0.7.5-1", + "port-version": 0 + }, + { + "git-tree": "4ee8a7bd27fed40a2cce00ac57d7f98dcba69d04", + "version-string": "0.7.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libssh2.json b/externals/vcpkg/versions/l-/libssh2.json new file mode 100755 index 000000000..821615909 --- /dev/null +++ b/externals/vcpkg/versions/l-/libssh2.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "5d6f965bcf911a4750731aad9785a4b40686a2b3", + "version": "1.10.0", + "port-version": 4 + }, + { + "git-tree": "d1a340be6b7c2a25f42cf4de44c836a577477bfc", + "version": "1.10.0", + "port-version": 3 + }, + { + "git-tree": "944feb4094c60226c2526be764fed688bb8b334f", + "version": "1.10.0", + "port-version": 2 + }, + { + "git-tree": "3c6dd977de517dc2091377a58c55b7d23f2bc3a0", + "version": "1.10.0", + "port-version": 1 + }, + { + "git-tree": "996df01b95684f41e8870b9154aeea3bffc63840", + "version": "1.10.0", + "port-version": 0 + }, + { + "git-tree": "d448a6d5c97053355abbfa84171fcc7624dcd509", + "version-string": "1.9.0", + "port-version": 1 + }, + { + "git-tree": "7c2f49406ae7f86a941bd7a23e7a40aad93e4c93", + "version-string": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "7b01f535a81d955811c5a28f542b5653ca5f6f91", + "version-string": "1.8.2", + "port-version": 0 + }, + { + "git-tree": "f02300d8078f63e09a230bbcf52ddffbb6343fce", + "version-string": "1.8.0-4", + "port-version": 0 + }, + { + "git-tree": "249561bd3f86ac1501b87285bcaacc4eb32f228e", + "version-string": "1.8.0-3", + "port-version": 0 + }, + { + "git-tree": "d538d22f1ff306faf526f4278ad2b506c0e46b72", + "version-string": "1.8.0-2", + "port-version": 0 + }, + { + "git-tree": "148da70008292fda258fdd61abe7981fae6ff92e", + "version-string": "1.8.0-1", + "port-version": 0 + }, + { + "git-tree": "8264f0e776ef5bed4f79edd6c6678ca31e7ed627", + "version-string": "1.8.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libstemmer.json b/externals/vcpkg/versions/l-/libstemmer.json new file mode 100755 index 000000000..1c1e6f3d8 --- /dev/null +++ b/externals/vcpkg/versions/l-/libstemmer.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "cf316e67e451a6b08bb44ff11854f613f32c7484", + "version-string": "2017-9", + "port-version": 6 + }, + { + "git-tree": "77cdb68aa3749064891548794658a76eba09ded1", + "version-string": "2017-9-5", + "port-version": 0 + }, + { + "git-tree": "ae5e32271800728bc6b12cf1b7e0fa1791b6062b", + "version-string": "2017-9-4", + "port-version": 0 + }, + { + "git-tree": "5f60fba4e7fe72f82d33c1bc137ccfeb443ad3cf", + "version-string": "2017-9-3", + "port-version": 0 + }, + { + "git-tree": "1ee114f27983ab995d8b79e4591ab6cbd923338d", + "version-string": "2017-9-02", + "port-version": 0 + }, + { + "git-tree": "f6dc1bf3360d37b7582d005bc073543bf80bdafd", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libstk.json b/externals/vcpkg/versions/l-/libstk.json new file mode 100755 index 000000000..ab2aaf610 --- /dev/null +++ b/externals/vcpkg/versions/l-/libstk.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "baa7a90e090c3793097d8368715e1e8f3b30a8ee", + "version-string": "4.6.1", + "port-version": 1 + }, + { + "git-tree": "f7c24bf692c711b1f10e030b37770addb3038a0e", + "version-string": "4.6.1", + "port-version": 0 + }, + { + "git-tree": "f5d260408a60b6fe44fefb04cb689a75d44db841", + "version-string": "4.6.0-2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libsvm.json b/externals/vcpkg/versions/l-/libsvm.json new file mode 100755 index 000000000..aba9aa6c2 --- /dev/null +++ b/externals/vcpkg/versions/l-/libsvm.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "a5bcb4cdaf7906a6e12948dcb5b170f79fba900e", + "version": "3.25", + "port-version": 0 + }, + { + "git-tree": "14f75f50d38f27beddb27fb54bf0927942db9954", + "version-string": "323", + "port-version": 2 + }, + { + "git-tree": "81c8a12b8a8abcbfe0eefa7ea1643ea3118b49a2", + "version-string": "323-1", + "port-version": 0 + }, + { + "git-tree": "afb1c62cbd9fb3ac89ab71a3e32a29cf8356f410", + "version-string": "323", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libtasn1.json b/externals/vcpkg/versions/l-/libtasn1.json new file mode 100755 index 000000000..ad952fc1a --- /dev/null +++ b/externals/vcpkg/versions/l-/libtasn1.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "c387ff2824b319ecd287ea3e5a507a8263dce95e", + "version": "4.17.0", + "port-version": 3 + }, + { + "git-tree": "3554f6c03cdac32ddf68540d62c04f6f4644ec94", + "version": "4.17.0", + "port-version": 1 + }, + { + "git-tree": "63ad8395545c61a38b7564108d2c1c4b7a6bbf12", + "version": "4.17.0", + "port-version": 0 + }, + { + "git-tree": "11a07d986211ef12d636380ed414b1e2350b8041", + "version": "4.16.0", + "port-version": 1 + }, + { + "git-tree": "bf9ef7a92f92205f0c883a302b7dae4eea9effee", + "version": "4.16.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libtcod.json b/externals/vcpkg/versions/l-/libtcod.json new file mode 100755 index 000000000..83b242ce7 --- /dev/null +++ b/externals/vcpkg/versions/l-/libtcod.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "34c13b63430589533e25be1fdec7afc8fbe68f6c", + "version": "1.20.1", + "port-version": 1 + }, + { + "git-tree": "ec66d469b71cab685daede349e5193d15ab866c7", + "version": "1.20.1", + "port-version": 0 + }, + { + "git-tree": "6ab01712cf4356c3364d01b0e2c2c8cbbad760a3", + "version-semver": "1.19.0", + "port-version": 0 + }, + { + "git-tree": "e136d01e9084bb2c6bdc0494a6b6374adb29dbfa", + "version-semver": "1.18.0", + "port-version": 0 + }, + { + "git-tree": "1d7bdb2a149f1fa7d4daa37fd02e9655273f503f", + "version-semver": "1.16.7", + "port-version": 2 + }, + { + "git-tree": "e2de0a47f3776252b6e04681c92d67b0730587ef", + "version-string": "1.16.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libtess2.json b/externals/vcpkg/versions/l-/libtess2.json new file mode 100755 index 000000000..d66629b3a --- /dev/null +++ b/externals/vcpkg/versions/l-/libtess2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "11b6d724d5897d2e856817ae213fec649c74530e", + "version-date": "2021-12-27", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libtheora.json b/externals/vcpkg/versions/l-/libtheora.json new file mode 100755 index 000000000..3aa9a91bb --- /dev/null +++ b/externals/vcpkg/versions/l-/libtheora.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "f54e2dbc66d96847b2b075baa7ae3a4cc032328d", + "version-string": "1.2.0alpha1-20170719", + "port-version": 3 + }, + { + "git-tree": "8a881f4b426f98ea87c67e6b5afadd57ed634a95", + "version-string": "1.2.0alpha1-20170719", + "port-version": 2 + }, + { + "git-tree": "21aea39dae9f003157b38fadb9e6fc23ccb89233", + "version-string": "1.2.0alpha1-20170719-1", + "port-version": 0 + }, + { + "git-tree": "377a16ad9325873e7889c24417eef7c0ba52ec2b", + "version-string": "1.2.0alpha1-20170719~vcpkg1-3", + "port-version": 0 + }, + { + "git-tree": "d4ad6da485400da97f2347693b47afadbdea7027", + "version-string": "1.2.0alpha1-20170719~vcpkg1-2", + "port-version": 0 + }, + { + "git-tree": "e121d8289751b5ca72afad3f9e1bd98b7f66c973", + "version-string": "1.2.0alpha1-20170719~vcpkg1-1", + "port-version": 0 + }, + { + "git-tree": "30b8d4c154cdf6a5553d03dc76a9e83dd6e94fc4", + "version-string": "1.2.0alpha1-20170719~vcpkg1", + "port-version": 0 + }, + { + "git-tree": "099587b9692d8e05ceed9ba922140bbefa763753", + "version-string": "1.1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libtins.json b/externals/vcpkg/versions/l-/libtins.json new file mode 100755 index 000000000..d81d747b0 --- /dev/null +++ b/externals/vcpkg/versions/l-/libtins.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "4a1470befea5c6b5c7418f9b85f37d6f8733d7d5", + "version": "4.3", + "port-version": 6 + }, + { + "git-tree": "9abc8b1a535ffaf99a680412cfd8f0c743c3fc6d", + "version": "4.3", + "port-version": 5 + }, + { + "git-tree": "de1a1dc51c90ca57412fe5f8d57eeef42a41ec74", + "version": "4.3", + "port-version": 4 + }, + { + "git-tree": "909dcc117f47579bc754369cd0a7a9d5a66b23bc", + "version-string": "4.3", + "port-version": 3 + }, + { + "git-tree": "b853d9ee6a83bba8f0d0b6e568b664b9729aadea", + "version-string": "4.3", + "port-version": 2 + }, + { + "git-tree": "bd15852b2fb7471ef3eb99bb1fc827627f9643f8", + "version-string": "4.3", + "port-version": 1 + }, + { + "git-tree": "98c3e72c357331f07d1d0a15b22900018aa7087d", + "version-string": "4.3", + "port-version": 0 + }, + { + "git-tree": "0530780cada8626fb796739c9f65202bddedf802", + "version-string": "4.2", + "port-version": 0 + }, + { + "git-tree": "322cb23762872eddf30568997c7aee3315f70bbf", + "version-string": "4.0-3", + "port-version": 0 + }, + { + "git-tree": "35e3bc2179899cc51d030a96f43be0c1d84de3bc", + "version-string": "4.0-2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libtomcrypt.json b/externals/vcpkg/versions/l-/libtomcrypt.json new file mode 100755 index 000000000..11775d9b2 --- /dev/null +++ b/externals/vcpkg/versions/l-/libtomcrypt.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "b339006b76f8211aa40e6d88fc6adc843d1048fa", + "version-string": "1.18.2", + "port-version": 2 + }, + { + "git-tree": "bcd3ad201eea34c01ad9b03be1d3e33f4ec11c33", + "version-string": "1.18.2-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libtommath.json b/externals/vcpkg/versions/l-/libtommath.json new file mode 100755 index 000000000..f1a832ad5 --- /dev/null +++ b/externals/vcpkg/versions/l-/libtommath.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "745f0ffe9bd56bb065e987124a7d0afebc445dc2", + "version-string": "1.2.0", + "port-version": 2 + }, + { + "git-tree": "f6af9971413dc51fb1068d59b266fbfd7105ae7a", + "version-string": "1.2.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libtorrent.json b/externals/vcpkg/versions/l-/libtorrent.json new file mode 100755 index 000000000..015b3e7a2 --- /dev/null +++ b/externals/vcpkg/versions/l-/libtorrent.json @@ -0,0 +1,154 @@ +{ + "versions": [ + { + "git-tree": "1ca0a5e5498fe7a999d78650e6ae935cebf1d764", + "version": "2.0.6", + "port-version": 0 + }, + { + "git-tree": "e27617cd7ff2be85ee0c2d4a60be16cee95f1302", + "version": "2.0.5", + "port-version": 0 + }, + { + "git-tree": "eec22cb36f26cc1cd10714a8bdd974b451ba9832", + "version": "1.2.14", + "port-version": 2 + }, + { + "git-tree": "8ee811432c2056d11d9f2d346142c2c1be44a328", + "version": "1.2.14", + "port-version": 1 + }, + { + "git-tree": "39f5e5060bcc3eafc3c4be164289aaad15027b1d", + "version": "1.2.14", + "port-version": 0 + }, + { + "git-tree": "cefe40e87e8a190462a748b1a230cedac39e8395", + "version-string": "1.2.13-b799640", + "port-version": 0 + }, + { + "git-tree": "6bd8c71880f419aa740153f9cd01cdf26453794e", + "version-string": "1.2.12", + "port-version": 0 + }, + { + "git-tree": "ffa53a6b67da728e6ae5ec3dfc4aca172cb39ea6", + "version-string": "1.2.11", + "port-version": 0 + }, + { + "git-tree": "048ff4fa0159ffe22d102f390349665f29eda77c", + "version-string": "1.2.10", + "port-version": 2 + }, + { + "git-tree": "3fb70a259f7b677f608a7f35cabddfbe43b71334", + "version-string": "1.2.10", + "port-version": 1 + }, + { + "git-tree": "a50177eebe4a18bcd037e05793e8a1ea2257fa02", + "version-string": "1.2.10", + "port-version": 0 + }, + { + "git-tree": "c97e7e389fd4cac2c3e6d62eebef1eb941afb5cf", + "version-string": "1.2.9", + "port-version": 0 + }, + { + "git-tree": "08a529f9d83eee1d4171ee8d5b22190e7d89b50b", + "version-string": "1.2.8", + "port-version": 0 + }, + { + "git-tree": "832ba98d3d2583b7cb0faacae9bf6d470389413d", + "version-string": "1.2.7", + "port-version": 0 + }, + { + "git-tree": "599c7db35648d0ff264def4fa03cdfdfc3bc35c3", + "version-string": "1.2.6-3", + "port-version": 0 + }, + { + "git-tree": "f429887098b42d606e554578c049584dfd93afcc", + "version-string": "1.2.6-2", + "port-version": 0 + }, + { + "git-tree": "cb3e82183f720f752e18af7637cb5cb6b9376767", + "version-string": "1.2.6-1", + "port-version": 0 + }, + { + "git-tree": "2017233c53deb1d2c4f4b66c6cd76011e86c6949", + "version-string": "1.2.6", + "port-version": 0 + }, + { + "git-tree": "f426334f597b1f76d82dff416084b1bbfcf31612", + "version-string": "1.2.2-1", + "port-version": 0 + }, + { + "git-tree": "34e0f8fa3bd7c131b936fe08e436faeeeb652ac9", + "version-string": "1.2.2", + "port-version": 0 + }, + { + "git-tree": "c0416156e06573d96d360d1642e023e1f24ba63c", + "version-string": "1.2.1-bcb26fd6", + "port-version": 0 + }, + { + "git-tree": "628211b639333049e3b90816ba5b9cd0bf6f607e", + "version-string": "2019-04-19", + "port-version": 0 + }, + { + "git-tree": "507902ffd3351de15c0e51df98bf3e021c1adf54", + "version-string": "1.2.0-1", + "port-version": 0 + }, + { + "git-tree": "60a56fb69ad938f5a3d5aa1c15d97736b730c96c", + "version-string": "1.1.6-1", + "port-version": 0 + }, + { + "git-tree": "b35be1685278a99daa1bdbad121792249a4c8c49", + "version-string": "1.1.6", + "port-version": 0 + }, + { + "git-tree": "be2c22ad609c6413cd04902203a6b8801c3b112a", + "version-string": "94f4e88e05f92a1", + "port-version": 0 + }, + { + "git-tree": "cd33ab8a1e71a8de8ea0f3a67442bcd01554a536", + "version-string": "1.1.5-1", + "port-version": 0 + }, + { + "git-tree": "b0b7d1f608e3477ef6206fbcc0a6f505160fb7f6", + "version-string": "1.1.5", + "port-version": 0 + }, + { + "git-tree": "142e9e88ff53fb321688c4d2d2bd30a09aa4233a", + "version-string": "1.1.4-1", + "port-version": 0 + }, + { + "git-tree": "1a53ab73863f67de8e4fc61c63baac4cdd6fbef8", + "version-string": "1.1.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libu2f-server.json b/externals/vcpkg/versions/l-/libu2f-server.json new file mode 100755 index 000000000..19fb01c5f --- /dev/null +++ b/externals/vcpkg/versions/l-/libu2f-server.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "cb5d1d70d0e3baab221910b12b33e9e34fd383f2", + "version": "1.1.0", + "port-version": 4 + }, + { + "git-tree": "1939b985161f406db50f8e455a5b7c4ada800596", + "version-string": "1.1.0", + "port-version": 3 + }, + { + "git-tree": "8238718ea369e39970b6fd6aa1277b5441ba2c0b", + "version-string": "1.1.0", + "port-version": 2 + }, + { + "git-tree": "76c485b16465b2a721d7810d68533f1bd00a15dd", + "version-string": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libudis86.json b/externals/vcpkg/versions/l-/libudis86.json new file mode 100755 index 000000000..1cd4ee611 --- /dev/null +++ b/externals/vcpkg/versions/l-/libudis86.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "22693ee63d17429c0430a2888b515a047cbb4c7d", + "version-string": "2018-01-28-56ff6c87", + "port-version": 2 + }, + { + "git-tree": "e8ab6af2cfbbb52901433f92f0c028bc766ce3ae", + "version-string": "2018-01-28-56ff6c87", + "port-version": 1 + }, + { + "git-tree": "55fbd94b278b0b3d753a2db345afa5f20b95c350", + "version-string": "2018-01-28-56ff6c87", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libudns.json b/externals/vcpkg/versions/l-/libudns.json new file mode 100755 index 000000000..f1851a169 --- /dev/null +++ b/externals/vcpkg/versions/l-/libudns.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "277ba57e6f9840670698c62196ea9b30c74485e0", + "version-string": "0.4", + "port-version": 4 + }, + { + "git-tree": "a05d58223d5adb1f421bbde4a0ac44ce72a3a1c9", + "version-string": "0.4", + "port-version": 3 + }, + { + "git-tree": "5e21ce56ac3d56ad2db68602fbbb0278981823cd", + "version-string": "0.4-2", + "port-version": 0 + }, + { + "git-tree": "95609ff4740b2e3757f75f8def402ef2cdcb4f60", + "version-string": "0.4-1", + "port-version": 0 + }, + { + "git-tree": "5db768927485da93264a0909ecf33c9a5d65bf4d", + "version-string": "0.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libui.json b/externals/vcpkg/versions/l-/libui.json new file mode 100755 index 000000000..2c5c16298 --- /dev/null +++ b/externals/vcpkg/versions/l-/libui.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "941bfc035a8cfa6020be3475769732b027249a1d", + "version-date": "2018-11-03", + "port-version": 2 + }, + { + "git-tree": "c3d3ba8694ca2465c505735531cd10dfc8cf150d", + "version-string": "2018-11-03-1", + "port-version": 0 + }, + { + "git-tree": "d5a72a3408ec1931fba2e2bf7d372ae13453f781", + "version-string": "2018-11-03", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libunibreak.json b/externals/vcpkg/versions/l-/libunibreak.json new file mode 100755 index 000000000..364e54e6a --- /dev/null +++ b/externals/vcpkg/versions/l-/libunibreak.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "724f588851a5f81f6ddd8eb1fc01a45bedfa5517", + "version": "5.0", + "port-version": 1 + }, + { + "git-tree": "ab89a270477d6d97e3d70c4503ee573f1ca8e539", + "version": "5.0", + "port-version": 0 + }, + { + "git-tree": "f1fb2965625f4dc28c5ab3c4e0a8a128901a0f0e", + "version-string": "4.3", + "port-version": 1 + }, + { + "git-tree": "118bde1435b5cc73170ebaa8f17a93b6ea963bcd", + "version-string": "4.3-0", + "port-version": 0 + }, + { + "git-tree": "078519b458b2adb4c722a4be78e28f527d6f05c0", + "version-string": "4.2-1-0", + "port-version": 0 + }, + { + "git-tree": "10ea1353e81f7a30e996dd52df994c63ca41ad51", + "version-string": "4.2", + "port-version": 0 + }, + { + "git-tree": "1dd59ddb7e6b80f13d3b7b3f860ad87ff4fca7ac", + "version-string": "4.1", + "port-version": 0 + }, + { + "git-tree": "d1075504f6fe43fefaaf86dc7d75e65d061e968e", + "version-string": "4.0-2", + "port-version": 0 + }, + { + "git-tree": "aaecbeb42db4d856fe568749028684b61e6dcf9c", + "version-string": "4.0-1", + "port-version": 0 + }, + { + "git-tree": "d43e8b84a909816c32a1ce720c80a9d2e34e1e50", + "version-string": "4.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libunifex.json b/externals/vcpkg/versions/l-/libunifex.json new file mode 100755 index 000000000..1c23ed3fe --- /dev/null +++ b/externals/vcpkg/versions/l-/libunifex.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "3d86e12f11e6d8e0528f4dfc62ccd33df1185673", + "version-date": "2021-12-07", + "port-version": 1 + }, + { + "git-tree": "713acea62d9dab0d2dd99d0790b9f716f9b9e971", + "version-date": "2021-12-07", + "port-version": 0 + }, + { + "git-tree": "7c98590771b98cb8c31e49867e78983853307a1f", + "version-date": "2021-08-01", + "port-version": 1 + }, + { + "git-tree": "150573588108677bf5bbcb832d1249bd73f76e36", + "version-date": "2021-08-01", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libunistring.json b/externals/vcpkg/versions/l-/libunistring.json new file mode 100755 index 000000000..c534b9ba6 --- /dev/null +++ b/externals/vcpkg/versions/l-/libunistring.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "2ae1c5ae3927f718073792b5cb86fa434b5c8c49", + "version": "0.9.10", + "port-version": 3 + }, + { + "git-tree": "1d6ff819975c70dc53d9aefa5d9046a0a21617b4", + "version": "0.9.10", + "port-version": 2 + }, + { + "git-tree": "7e74b9d781041b3a5c09b72f77b8e79ea6add168", + "version": "0.9.10", + "port-version": 1 + }, + { + "git-tree": "586bf47f6b9ee55aa3eb9ec7c7ff36363e39980b", + "version": "0.9.10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/liburing.json b/externals/vcpkg/versions/l-/liburing.json new file mode 100755 index 000000000..50c210421 --- /dev/null +++ b/externals/vcpkg/versions/l-/liburing.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "2abcbd2b104e5dbd5406cac8f3f9a3ae7fc47647", + "version": "2.1", + "port-version": 0 + }, + { + "git-tree": "10bf5144950610a1f587342c5107bf4fdfb52658", + "version": "2.0", + "port-version": 3 + }, + { + "git-tree": "65bbf5b3f642b9e76a659d78a9077d207c827b76", + "version": "2.0", + "port-version": 2 + }, + { + "git-tree": "e193d537e05887e8efeae8ab1328dc7e33499e01", + "version": "2.0", + "port-version": 1 + }, + { + "git-tree": "b4d90242721d15d6dc5287690c3b8d42c2e8d0f0", + "version": "2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libusb-win32.json b/externals/vcpkg/versions/l-/libusb-win32.json new file mode 100755 index 000000000..e7f17dc82 --- /dev/null +++ b/externals/vcpkg/versions/l-/libusb-win32.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "fd3ac7f3d9331b546a957f651f9f911d69d7ef4f", + "version-string": "1.2.6.0", + "port-version": 8 + }, + { + "git-tree": "a75f1e3bedf1a31e8c812d07c24eb867fdd74a29", + "version-string": "1.2.6.0", + "port-version": 7 + }, + { + "git-tree": "2c3d66659ac4c41ca0d5436e3d74b99c3f141eac", + "version-string": "1.2.6.0-6", + "port-version": 0 + }, + { + "git-tree": "2bc0f61ff1998c47aed6a40c33b542d2758f4e95", + "version-string": "1.2.6.0-4", + "port-version": 0 + }, + { + "git-tree": "7d4c55be26458c62858f3d47a4e1c8e4bd69d1ba", + "version-string": "1.2.6.0-3", + "port-version": 0 + }, + { + "git-tree": "384ba0c65077a0e475ec061810a8735af4a65906", + "version-string": "1.2.6.0-2", + "port-version": 0 + }, + { + "git-tree": "7032d68b24f2a0b88138c5f4bbb45f1ce26c369b", + "version-string": "1.2.6.0-1", + "port-version": 0 + }, + { + "git-tree": "f9d3a68a4e5d504cc968365ca89963d961aeca7f", + "version-string": "1.2.6.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libusb.json b/externals/vcpkg/versions/l-/libusb.json new file mode 100755 index 000000000..5496021af --- /dev/null +++ b/externals/vcpkg/versions/l-/libusb.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "67fc457e16066e047803888e45b8ea3aaf713501", + "version": "1.0.26", + "port-version": 0 + }, + { + "git-tree": "337aac12b9bf6aab68dd1375c3592f1575efbda9", + "version": "1.0.24", + "port-version": 7 + }, + { + "git-tree": "489d07fb5a6ada487532ea3cc5390a50e7feef02", + "version": "1.0.24", + "port-version": 6 + }, + { + "git-tree": "76a5ebd046d669a93d2a467d87a80efbe85f8226", + "version": "1.0.24", + "port-version": 5 + }, + { + "git-tree": "0d77c2046af91be18e4af15b3a9b3e7f0024fa18", + "version": "1.0.24", + "port-version": 4 + }, + { + "git-tree": "419808531bfc5a58d7581dc700a2560a3ab7265e", + "version-string": "1.0.24", + "port-version": 3 + }, + { + "git-tree": "43ac3831fee48a40aacc5c14480ff724e4644c4f", + "version-string": "1.0.23", + "port-version": 3 + }, + { + "git-tree": "67614c05ea30254303a26760c868353d7b52dab1", + "version-string": "1.0.23", + "port-version": 2 + }, + { + "git-tree": "ac9e13e878fa86d43cec110ff749b4d255a0492e", + "version-string": "1.0.23-1", + "port-version": 0 + }, + { + "git-tree": "ae10deafbfce775aba6087243243b29cf5e72f72", + "version-string": "1.0.23", + "port-version": 0 + }, + { + "git-tree": "aea4a1540ed2e31412ef6234597e614504038512", + "version-string": "1.0.22-4", + "port-version": 0 + }, + { + "git-tree": "e846a61cb0a87eb9768721f803e2a2ecc3bd96f1", + "version-string": "1.0.22-3", + "port-version": 0 + }, + { + "git-tree": "e0f58f53d41ca3b51d45dd6a757f8e275f00e869", + "version-string": "1.0.22-2", + "port-version": 0 + }, + { + "git-tree": "a4eadaf1a616fddfbe07957e5277dcc19a7f6b01", + "version-string": "1.0.22-1", + "port-version": 0 + }, + { + "git-tree": "b553c890bc908d17779fecba51cb34ace61924af", + "version-string": "1.0.21-fc99620", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libusbmuxd.json b/externals/vcpkg/versions/l-/libusbmuxd.json new file mode 100755 index 000000000..06351ca95 --- /dev/null +++ b/externals/vcpkg/versions/l-/libusbmuxd.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "2d6ac12d94326fae11d86e39030433003251aa62", + "version": "1.2.219", + "port-version": 2 + }, + { + "git-tree": "a50e755ad62ff56d5012dd84e0ccd196175a807c", + "version-string": "1.2.219", + "port-version": 1 + }, + { + "git-tree": "51dcfc0be39078d8d8d64dd51188a0ccae761667", + "version-string": "1.2.219", + "port-version": 0 + }, + { + "git-tree": "08d463bfee14e9d6d1d804bf6e59c08b7c2eb478", + "version-string": "1.2.185-1", + "port-version": 0 + }, + { + "git-tree": "14feef0b5b263e332b431eca6abd0081d00fbb5f", + "version-string": "1.2.185", + "port-version": 0 + }, + { + "git-tree": "4e6aa8c67d854c6f880c5dbdad99704e5010826b", + "version-string": "1.2.137", + "port-version": 0 + }, + { + "git-tree": "3787b01e075ba64c494b6fdc3b4b901d3a575475", + "version-string": "1.2.77-1", + "port-version": 0 + }, + { + "git-tree": "741230c70d793b4970751e08f1f3c7bcf41de43c", + "version-string": "1.2.77", + "port-version": 0 + }, + { + "git-tree": "83666e8678900251e18a0655c785d218e7335a0c", + "version-string": "1.0.107-2", + "port-version": 0 + }, + { + "git-tree": "e550cb1345e74ed0e4b9123f31bd4cf0bcd7c507", + "version-string": "1.0.107-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libuuid.json b/externals/vcpkg/versions/l-/libuuid.json new file mode 100755 index 000000000..aeb730dcd --- /dev/null +++ b/externals/vcpkg/versions/l-/libuuid.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "4d0fcae0591fc7776a9cf39996796326222e72ad", + "version": "1.0.3", + "port-version": 11 + }, + { + "git-tree": "47283ef4bb45ef38cfd61160bc1cec2d69e572b4", + "version": "1.0.3", + "port-version": 10 + }, + { + "git-tree": "a545c6c9bf405bd60cb97d6e2086f1273f5a3321", + "version": "1.0.3", + "port-version": 9 + }, + { + "git-tree": "4058a76786f399c80e1973a4101e8291032b3e9b", + "version": "1.0.3", + "port-version": 8 + }, + { + "git-tree": "1462e6294a414e76e18cd6b2679b5906254751bd", + "version-string": "1.0.3-7", + "port-version": 0 + }, + { + "git-tree": "c82d6cfca8bc843374f032788b24ca9987917d59", + "version-string": "1.0.3-5", + "port-version": 0 + }, + { + "git-tree": "8489335b37237e7ac5e816057def204b7eab4f47", + "version-string": "1.0.3-4", + "port-version": 0 + }, + { + "git-tree": "1c3045ac54b103b9d409cbf481e21831c3b82d8e", + "version-string": "1.0.3-3", + "port-version": 0 + }, + { + "git-tree": "d93f7e6b1dc394513378d68b035e8c1a25108ec6", + "version-string": "1.0.3-2", + "port-version": 0 + }, + { + "git-tree": "676d12c2bcbfa28651dd3fab06736ce4b791eb98", + "version-string": "1.0.3-1", + "port-version": 0 + }, + { + "git-tree": "de9f86ae646b68ebdeb7f75e7ed04a7b61213a52", + "version-string": "1.0.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libuv.json b/externals/vcpkg/versions/l-/libuv.json new file mode 100755 index 000000000..fd88da0a5 --- /dev/null +++ b/externals/vcpkg/versions/l-/libuv.json @@ -0,0 +1,209 @@ +{ + "versions": [ + { + "git-tree": "fa2d73ef2b9197ea47572bc783826b650ed04f0f", + "version-semver": "1.43.0", + "port-version": 0 + }, + { + "git-tree": "2cb9ed135277e1b121fbf0a391be6a8d5cb2ddcf", + "version-semver": "1.42.0", + "port-version": 2 + }, + { + "git-tree": "41003bf038eb10b7fd29029954d42a05fb3c1a86", + "version-semver": "1.42.0", + "port-version": 1 + }, + { + "git-tree": "cf96a59d9d41035fe89515464b3f93bcb9b84f27", + "version-semver": "1.42.0", + "port-version": 0 + }, + { + "git-tree": "42fa2a97059c54e5c2374a9762a7060d85a1091b", + "version": "1.41.0", + "port-version": 1 + }, + { + "git-tree": "25ef9957bffba1e73f3dd857f8dc27148ec6f84f", + "version-string": "1.41.0", + "port-version": 0 + }, + { + "git-tree": "18afc7f0e81eb4d9c8a9d8d1f4c15a96cb4f2db1", + "version-string": "1.39.0", + "port-version": 0 + }, + { + "git-tree": "d6d62746530060b642c3beb95fc4c1e723ba106e", + "version-string": "1.34.2-1", + "port-version": 0 + }, + { + "git-tree": "a80a4518ce3cfaea4c3f948dcfdbed6d99bfcd9d", + "version-string": "1.34.2", + "port-version": 0 + }, + { + "git-tree": "c1d043984fc3caec45216f29e059e9b49864f0a0", + "version-string": "1.30.1", + "port-version": 0 + }, + { + "git-tree": "36c2715fd8a0e673fe1a982b515aecfbc0e8241c", + "version-string": "1.29.1", + "port-version": 0 + }, + { + "git-tree": "e56ec087705750b3d04e4fa3ea89d4770fb7ef01", + "version-string": "1.29.0", + "port-version": 0 + }, + { + "git-tree": "ecca1a82074e7969c561c0b53204eff4e4049f30", + "version-string": "1.28.0", + "port-version": 0 + }, + { + "git-tree": "0df2105e8c7f7f410d6b6d39ef168f9a44286de8", + "version-string": "1.27.0", + "port-version": 0 + }, + { + "git-tree": "1aea28aa46afa6fe7a78eeb5b4f1e153f7533a7e", + "version-string": "1.25.0", + "port-version": 0 + }, + { + "git-tree": "622b30d74099492dbc27e5685b2c5eaa8468ff47", + "version-string": "1.24.1", + "port-version": 0 + }, + { + "git-tree": "cfcc2b3f73c69a2bb76ba8560a4c82f165354a92", + "version-string": "1.24.0-1", + "port-version": 0 + }, + { + "git-tree": "8184f3df0e52f7da26124bc6652f7b4bfe529de5", + "version-string": "1.24.0", + "port-version": 0 + }, + { + "git-tree": "e709bfa2ac010a117aa088947520d9041cbde291", + "version-string": "1.23.2", + "port-version": 0 + }, + { + "git-tree": "35b1a6881f238ba2eada8450ffa94a0d07ed4811", + "version-string": "1.23.0", + "port-version": 0 + }, + { + "git-tree": "dd49fe4deb1475e27220ae78dd3b5199af4e7151", + "version-string": "1.22.0", + "port-version": 0 + }, + { + "git-tree": "c9f58c6e60e1a4a0dcc4c9581c0cf99f8fb18126", + "version-string": "1.21.0-1", + "port-version": 0 + }, + { + "git-tree": "fe3eff9b49e728ce7efea4dec5c0949376bbb090", + "version-string": "1.20.3-2", + "port-version": 0 + }, + { + "git-tree": "e8e454ac03ec3d48b43c1367a1cde8cee0b9e759", + "version-string": "1.20.3-1", + "port-version": 0 + }, + { + "git-tree": "438d26c6ab4c6317c98dfbfdb1361cdfbf4b17ed", + "version-string": "1.20.3", + "port-version": 0 + }, + { + "git-tree": "d2bace79e5a3a76f1cca91cb60eb7194ab0f4d3e", + "version-string": "1.20.2", + "port-version": 0 + }, + { + "git-tree": "9af0cff9d701f31dc6237a7232be6dfa0dfd1344", + "version-string": "1.20.0", + "port-version": 0 + }, + { + "git-tree": "aa4a60eec0e5f7385100e89ca1de17efc3dd3a43", + "version-string": "1.19.2", + "port-version": 0 + }, + { + "git-tree": "f592054b77e7c91a68f8f06f5f59bc6f825509a8", + "version-string": "1.18.0", + "port-version": 0 + }, + { + "git-tree": "5d672473ea176655bdb48f96f8fa5e501111d006", + "version-string": "1.17.0", + "port-version": 0 + }, + { + "git-tree": "b81cafdf6ccb8ed8c51945c18f5ff1abd913c624", + "version-string": "1.16.1", + "port-version": 0 + }, + { + "git-tree": "740f8b73b5b354d4c1efa74643a913ba3a8d5c26", + "version-string": "1.14.1-1", + "port-version": 0 + }, + { + "git-tree": "b3ad31f693bedbe8010317e781688f0cc8b6bd3e", + "version-string": "1.14.1", + "port-version": 0 + }, + { + "git-tree": "5ab851fec59887dd72aa25a2642f1aced468b45e", + "version-string": "1.14.0", + "port-version": 0 + }, + { + "git-tree": "c52d1d0e18811e4e4bf0e2eea97af02e23c25983", + "version-string": "1.13.1", + "port-version": 0 + }, + { + "git-tree": "471e684bf0d700fec05649959a96c71788022973", + "version-string": "1.12.0", + "port-version": 0 + }, + { + "git-tree": "113cac43fe19159936774b598043b03240183e19", + "version-string": "1.11.0", + "port-version": 0 + }, + { + "git-tree": "da9ac2e308a93149d6e5a56f55b53475f585da6e", + "version-string": "1.10.1-2", + "port-version": 0 + }, + { + "git-tree": "af47c4493ef3142ae8df5d32854ec3f16b0f29d8", + "version-string": "1.10.1-1", + "port-version": 0 + }, + { + "git-tree": "851edefa4c77bf80c3ba4f2c158ef6749c56b413", + "version-string": "1.10.1", + "port-version": 0 + }, + { + "git-tree": "1dd9e80fd7be35fd1efb2fafbd52614ee48f1c0c", + "version-string": "1.9.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libuvc.json b/externals/vcpkg/versions/l-/libuvc.json new file mode 100755 index 000000000..c29691ba5 --- /dev/null +++ b/externals/vcpkg/versions/l-/libuvc.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "b254a9fb5aa3fc5d709a3f708d9c3dbb5d0a26bd", + "version-date": "2020-11-24", + "port-version": 3 + }, + { + "git-tree": "79ca2fc9bcce260bf39d630dcac5a2cc2cb7f486", + "version-date": "2020-11-24", + "port-version": 2 + }, + { + "git-tree": "c6a9ae104918d980729af70da17fed9849500504", + "version-string": "2020-11-24", + "port-version": 1 + }, + { + "git-tree": "8550f55866b4387d32614f7353dbb59cdc2e7bd9", + "version-string": "2020-11-24", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libvmdk.json b/externals/vcpkg/versions/l-/libvmdk.json new file mode 100755 index 000000000..d62a1103c --- /dev/null +++ b/externals/vcpkg/versions/l-/libvmdk.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "f1d35304c7ab4940f834735c091eca7a2ee43305", + "version-string": "20200926", + "port-version": 2 + }, + { + "git-tree": "8efc63f616daad6af987a274eb292d2605bd8f4b", + "version-string": "20200926", + "port-version": 1 + }, + { + "git-tree": "6d461aee7ea9e99c29255ad611a2c03c00acd895", + "version-string": "20200926", + "port-version": 0 + }, + { + "git-tree": "81ea40207a10e3914ddb5b6320656d6e888afc90", + "version-string": "2019-12-21", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libvorbis.json b/externals/vcpkg/versions/l-/libvorbis.json new file mode 100755 index 000000000..0df7ea5b3 --- /dev/null +++ b/externals/vcpkg/versions/l-/libvorbis.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "c4c646a26ce3e6ad63992d3e4a55cb185159b23c", + "version": "1.3.7", + "port-version": 2 + }, + { + "git-tree": "54dcb5ab354422e9518a905d501ccc22dcb69098", + "version-string": "1.3.7", + "port-version": 1 + }, + { + "git-tree": "0b0587525c2053316552dce564fe504a2a40cc91", + "version-string": "1.3.7", + "port-version": 0 + }, + { + "git-tree": "01ccede900dde05e038364bc8b5576a5bfa4dcd4", + "version-string": "1.3.6-4d963fe", + "port-version": 2 + }, + { + "git-tree": "98e70b1efd9f89e964672f3796a2ab883c4dbd68", + "version-string": "1.3.6-4d963fe", + "port-version": 0 + }, + { + "git-tree": "114e152c9adfde6f7064b80f828381df5ccac1ab", + "version-string": "1.3.6-9eadecc-3", + "port-version": 0 + }, + { + "git-tree": "3413027bb7d4da56758b4eb789ae34dfe93b4cef", + "version-string": "1.3.6-9eadecc-1", + "port-version": 0 + }, + { + "git-tree": "a58d3c6bb8aec5d8f56114e33d238365e8b79762", + "version-string": "1.3.6-112d3bd-1", + "port-version": 0 + }, + { + "git-tree": "c38d184c633057325db94f5d59c237c31354d4fd", + "version-string": "1.3.6-112d3bd", + "port-version": 0 + }, + { + "git-tree": "330bd7ab75c092e6f20d67be59abac4efca0eb30", + "version-string": "1.3.5-143caf4-3", + "port-version": 0 + }, + { + "git-tree": "cb1900cbe3690d4e461905e5b3c1a018c2a5a8a2", + "version-string": "1.3.5-143caf4-2", + "port-version": 0 + }, + { + "git-tree": "d4563b5599024b017a53f39f201430a986a2419b", + "version-string": "1.3.5-1-143caf4023a90c09a5eb685fdd46fb9b9c36b1ee", + "port-version": 0 + }, + { + "git-tree": "a707a67cdaa73df3b6212ec4a2275c83f12b47e2", + "version-string": "1.3.5-143caf4023a90c09a5eb685fdd46fb9b9c36b1ee", + "port-version": 0 + }, + { + "git-tree": "5d39ab08f2c1b122c040b6a21e5bc5f736879d31", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libvpx.json b/externals/vcpkg/versions/l-/libvpx.json new file mode 100755 index 000000000..7758ffc7a --- /dev/null +++ b/externals/vcpkg/versions/l-/libvpx.json @@ -0,0 +1,159 @@ +{ + "versions": [ + { + "git-tree": "5d03c5487a2e01ccc310c1d3e5b0b2c78232cf2b", + "version": "1.11.0", + "port-version": 1 + }, + { + "git-tree": "3ec8aec9ecbcb2e3b5a0af7cea8045359d9aec94", + "version": "1.11.0", + "port-version": 0 + }, + { + "git-tree": "79a7e2cf4e6df063990dc59d1aa221150eb0ce0e", + "version-semver": "1.10.0", + "port-version": 2 + }, + { + "git-tree": "55be5e09000631b1dacd6f86d174eb2cade91bf5", + "version-semver": "1.10.0", + "port-version": 1 + }, + { + "git-tree": "ba9e1f9d346412c76f17d9fda5a3fbd5b5555afa", + "version-semver": "1.10.0", + "port-version": 0 + }, + { + "git-tree": "dd62b59825999b4a4136fb9e92b393b5600596d1", + "version-semver": "1.9.0", + "port-version": 9 + }, + { + "git-tree": "b3c25e1e8a48e31e14fb824fd7b8b618266093b9", + "version-semver": "1.9.0", + "port-version": 8 + }, + { + "git-tree": "09c64743d3dc62d2fa0ef55ef52b7bdad45cea0c", + "version-string": "1.9.0", + "port-version": 7 + }, + { + "git-tree": "017466933d1b0a427b79b86b61129fb5cf12f05f", + "version-string": "1.9.0", + "port-version": 6 + }, + { + "git-tree": "7f96abd4953072c5949e4eae823b7d5af27d8f13", + "version-string": "1.9.0", + "port-version": 5 + }, + { + "git-tree": "3c7e89668781033b4904d467101c5d0de5301248", + "version-string": "1.9.0", + "port-version": 4 + }, + { + "git-tree": "ad82cc4c7e4cc8b798683a210d735f3efd8bfc86", + "version-string": "1.9.0", + "port-version": 3 + }, + { + "git-tree": "125a355662d3540d12bf52456916e170706b8e6c", + "version-string": "1.9.0", + "port-version": 2 + }, + { + "git-tree": "39027aa1b724f32029fdba4498b6970cae52afd3", + "version-string": "1.9.0", + "port-version": 1 + }, + { + "git-tree": "898abd651127839ba327275b7002d297889c0eab", + "version-string": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "044754fac227f1431f9cf222208d868f48e9108f", + "version-string": "1.8.1", + "port-version": 9 + }, + { + "git-tree": "fd46e8658ba18f6aa2a7407fed4e7c3fa8fdb7e4", + "version-string": "1.8.1", + "port-version": 8 + }, + { + "git-tree": "25750e6b99f1266f44f2095563c9f1d2babda515", + "version-string": "1.8.1-7", + "port-version": 0 + }, + { + "git-tree": "9d1380d8bfa24d3e4ed4a28428a66b11f2fa3d32", + "version-string": "1.8.1-6", + "port-version": 0 + }, + { + "git-tree": "96f63915aea8c90e4b15fef1b452d658a4a22469", + "version-string": "1.8.1-5", + "port-version": 0 + }, + { + "git-tree": "38ec8d72a85a78f4c6d1fb4d1f65791cc34537c9", + "version-string": "1.8.1-4", + "port-version": 0 + }, + { + "git-tree": "9bbf4957ee7545eac30f2efdefa487a72e2379ac", + "version-string": "1.8.1-3", + "port-version": 0 + }, + { + "git-tree": "07f10cda4d0f0e6394f89df316673cabfc4e1ed3", + "version-string": "1.8.1-2", + "port-version": 0 + }, + { + "git-tree": "0d156046ccd7f57c852b7ff630dd638667a38ca0", + "version-string": "1.8.1-1", + "port-version": 0 + }, + { + "git-tree": "0e3632108fbbc997646cf282e98045ff157f1e2d", + "version-string": "1.8.1", + "port-version": 0 + }, + { + "git-tree": "65ced7c6fed54395cc0a28e5672e334f1b31effd", + "version-string": "1.7.0-3", + "port-version": 0 + }, + { + "git-tree": "ed554736bb2047234ff312de7a3cc069da3d0902", + "version-string": "1.7.0-2", + "port-version": 0 + }, + { + "git-tree": "8828b66284ea515eb31f33d782d5edd54332e58e", + "version-string": "1.7.0-1", + "port-version": 0 + }, + { + "git-tree": "c219b93c62ef3436e08fbfcd6f4ff136b295aebc", + "version-string": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "7d18d40f05225b763154aff31290ce4b071b5e69", + "version-string": "1.6.1-2", + "port-version": 0 + }, + { + "git-tree": "ae231007830162194ac4bbbee049272e4a98603c", + "version-string": "1.6.1-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libwandio.json b/externals/vcpkg/versions/l-/libwandio.json new file mode 100755 index 000000000..53798c59b --- /dev/null +++ b/externals/vcpkg/versions/l-/libwandio.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "eb4e485cc1313349e0fbb65d4997d5968245877a", + "version": "4.2.1", + "port-version": 6 + }, + { + "git-tree": "8340fce2f7c5dd26c578bb7c59f8d3f8d982c105", + "version-string": "4.2.1", + "port-version": 5 + }, + { + "git-tree": "ffa2cfbc601c2a9a2fdcbc20f44b312597952ec6", + "version-string": "4.2.1", + "port-version": 4 + }, + { + "git-tree": "72e5776baa22eb1281309f6296699bde4636138b", + "version-string": "4.2.1", + "port-version": 3 + }, + { + "git-tree": "d95101a889c2fe9da380a323fd4892a8be324684", + "version-string": "4.2.1-2", + "port-version": 0 + }, + { + "git-tree": "dcdc15621d3c3ca324ba7be2861e913e33367afd", + "version-string": "4.2.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libwebm.json b/externals/vcpkg/versions/l-/libwebm.json new file mode 100755 index 000000000..51c7a5f3b --- /dev/null +++ b/externals/vcpkg/versions/l-/libwebm.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "7f210a205882bf4151ab8bec8c9b3a3fc328a280", + "version": "1.0.0.28", + "port-version": 1 + }, + { + "git-tree": "06a8f301505eb69082e8654f0c01d724b2e403e0", + "version": "1.0.0.28", + "port-version": 0 + }, + { + "git-tree": "551e2b3f3b67283a71c20088413de576c9dc55c2", + "version-string": "1.0.0.27", + "port-version": 7 + }, + { + "git-tree": "09eeb5a939e4dcb87f405fea40875b2a803cd381", + "version-string": "1.0.0.27", + "port-version": 6 + }, + { + "git-tree": "f0a6e61554dbc2b0682711214e704f8fc04275ae", + "version-string": "1.0.0.27-5", + "port-version": 0 + }, + { + "git-tree": "ab492ea21f882355f542c09d471ef43261938b54", + "version-string": "1.0.0.27-4", + "port-version": 0 + }, + { + "git-tree": "b9392b046528c7396df4c34de4d7316bd27d6c82", + "version-string": "1.0.0.27-3", + "port-version": 0 + }, + { + "git-tree": "543e2a29c62175b1c5b4ea9f4d9aa7cda3fd497f", + "version-string": "1.0.0.27-2", + "port-version": 0 + }, + { + "git-tree": "70b9f93698dd7325b4d9bbd32cf4b2f06a53d9c7", + "version-string": "1.0.0.27-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libwebp.json b/externals/vcpkg/versions/l-/libwebp.json new file mode 100755 index 000000000..c41c58cbf --- /dev/null +++ b/externals/vcpkg/versions/l-/libwebp.json @@ -0,0 +1,119 @@ +{ + "versions": [ + { + "git-tree": "bf8ec989a234ddde96494e4e07d0ffd93df82151", + "version": "1.2.2", + "port-version": 0 + }, + { + "git-tree": "ca5a8b2ed264617e8a35d22e1e6ac18ebe99900f", + "version": "1.2.1", + "port-version": 0 + }, + { + "git-tree": "4fcb5d97e464c046b1f4c1a81b7d23a9cb63a615", + "version-string": "1.1.0", + "port-version": 4 + }, + { + "git-tree": "7a3bfc774b61126901f0f9524de41ef864918f35", + "version-string": "1.1.0", + "port-version": 3 + }, + { + "git-tree": "8e1a0ef8ea8d864f10f3ad1604f3d0e920534ecd", + "version-string": "1.1.0", + "port-version": 2 + }, + { + "git-tree": "de60c0060bd08d336b79bf5676c28394e81bf1b8", + "version-string": "1.1.0", + "port-version": 1 + }, + { + "git-tree": "a05e0de81085231df86f6902aba1e0a364e2ca7b", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "5066566c98bc1913b678347c4cbae0a6aff4cf2d", + "version-string": "1.0.3-1", + "port-version": 0 + }, + { + "git-tree": "6ff3a23b154fad821db2d8236bf9d0382f0229cf", + "version-string": "1.0.3", + "port-version": 0 + }, + { + "git-tree": "256b8e8b5d64cb6f66da47f1a361e5538d341023", + "version-string": "1.0.2-8", + "port-version": 0 + }, + { + "git-tree": "e346060df1b0a0a0678450a1e1bc54360a8d3c55", + "version-string": "1.0.2-7", + "port-version": 0 + }, + { + "git-tree": "0fd238a9eb84602ff73d675826c9160f2ac41719", + "version-string": "1.0.2-6", + "port-version": 0 + }, + { + "git-tree": "4e3bca81e2ee5d64a83916b1a5767eb92254dfb8", + "version-string": "1.0.2-4", + "port-version": 0 + }, + { + "git-tree": "3293ad38a00a161493070881adab3657ce52fa46", + "version-string": "1.0.2-3", + "port-version": 0 + }, + { + "git-tree": "e475e4b3c6b17dea10f1d5ebce8963e92aa8028b", + "version-string": "1.0.2-2", + "port-version": 0 + }, + { + "git-tree": "cd9eb2a1de5cbee5d08377eb3bd8bdcd1e449ffd", + "version-string": "1.0.2-1", + "port-version": 0 + }, + { + "git-tree": "0ea91cc24e12ecb8c3bdf133c11907e33b199d41", + "version-string": "0.6.1-2", + "port-version": 0 + }, + { + "git-tree": "17ed12a3c871c7132ac910da2c41e84ec85aeec6", + "version-string": "0.6.1-1", + "port-version": 0 + }, + { + "git-tree": "1a5ce7e9e8e49ee48ab6c1d502acb047908f8fe3", + "version-string": "0.6.1", + "port-version": 0 + }, + { + "git-tree": "43072c98ece4301042038510225369171c5c6b93", + "version-string": "0.6.0-2", + "port-version": 0 + }, + { + "git-tree": "e5168131d94eb8327e39a94405a92e446dcf2ab1", + "version-string": "0.6.0-1", + "port-version": 0 + }, + { + "git-tree": "b3198de0a1aceb9ddb6b6d74d1052f6f50121937", + "version-string": "0.5.1-1", + "port-version": 0 + }, + { + "git-tree": "0017292c90bd4a10f430bfd01a4e6c8d89b6cd50", + "version-string": "0.5.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libwebsockets.json b/externals/vcpkg/versions/l-/libwebsockets.json new file mode 100755 index 000000000..16e498395 --- /dev/null +++ b/externals/vcpkg/versions/l-/libwebsockets.json @@ -0,0 +1,179 @@ +{ + "versions": [ + { + "git-tree": "52c31e301f0eaa969b7850c20be357ec3f845994", + "version-semver": "4.3.0", + "port-version": 3 + }, + { + "git-tree": "d8b0df2d428b6902450b58a8dc5e0743549d16b0", + "version-semver": "4.3.0", + "port-version": 2 + }, + { + "git-tree": "b4ef6833cbf3bb5c97e3150bbdb61bccb8db21cd", + "version-semver": "4.3.0", + "port-version": 1 + }, + { + "git-tree": "c3a1ad34c2592c162c5a3b0935fe8adb2d15a08a", + "version-semver": "4.3.0", + "port-version": 0 + }, + { + "git-tree": "530aaf17892ddf6481557a04040a372281150ec6", + "version-semver": "4.2.2", + "port-version": 4 + }, + { + "git-tree": "579de2367eb835f65d3c480b02af4ee72b6b4f24", + "version-semver": "4.2.2", + "port-version": 3 + }, + { + "git-tree": "ea372a08d75d1a3a7c37a99b1daf9e85ba017ccf", + "version-semver": "4.2.2", + "port-version": 2 + }, + { + "git-tree": "30615e7ce9a1ce09d473a05260da695fb0ee56d3", + "version-semver": "4.2.2", + "port-version": 1 + }, + { + "git-tree": "d3336ccb948156f48c50ee15980a5bb56374d3b3", + "version-semver": "4.2.2", + "port-version": 0 + }, + { + "git-tree": "fa509ae21580082ef8aea72e394bb7005f689371", + "version-semver": "4.1.6", + "port-version": 2 + }, + { + "git-tree": "1846ac46a72330104a9a4c13042cdb19ae8a42c4", + "version-semver": "4.1.6", + "port-version": 1 + }, + { + "git-tree": "d980cd5098de3cfba2ecd8e63490cf1013545dfd", + "version-string": "4.1.6", + "port-version": 0 + }, + { + "git-tree": "ee45554228e403c2a79c3b106bf327c526effb92", + "version-string": "4.1.3", + "port-version": 1 + }, + { + "git-tree": "58f2f6ef2bd83b108484f93da75d7f3a7fbc8378", + "version-string": "4.1.3", + "port-version": 0 + }, + { + "git-tree": "e3316d8f92f09956f5907c21f84ce60a53d1f33f", + "version-string": "4.1.2", + "port-version": 0 + }, + { + "git-tree": "d105a0c2dfe071709fc192cf4dd705c36ae067a7", + "version-string": "4.0.1-1", + "port-version": 0 + }, + { + "git-tree": "5c01a101e76df3f5763d71f7a8e9cd8c8697a724", + "version-string": "4.0.1", + "port-version": 0 + }, + { + "git-tree": "a98fc993b8f11255d2b9291403a7c6b5bb7bcf57", + "version-string": "3.2.2-2", + "port-version": 0 + }, + { + "git-tree": "ce4220a9b6fc28b12539b5d423240d8d723c877d", + "version-string": "3.2.2-1", + "port-version": 0 + }, + { + "git-tree": "19e43f46d3051e515048d335177fbd3bf6601909", + "version-string": "3.2.2", + "port-version": 0 + }, + { + "git-tree": "2836ac8b9052e8f008a7c2c2c1157baf6ff41607", + "version-string": "3.2.0-2", + "port-version": 0 + }, + { + "git-tree": "92fbbc147f3ac1728b0e3256faab272205124490", + "version-string": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "b5dcb71a30bb038df3c963c826c32c3a73b592d6", + "version-string": "3.1.0-3", + "port-version": 0 + }, + { + "git-tree": "f30d790ceaff65b5c937822bcbfa3fa52926ceff", + "version-string": "3.1.0-2", + "port-version": 0 + }, + { + "git-tree": "277aad02b1549f660af206bd1229be0b2b3f3ffa", + "version-string": "3.1.0-1", + "port-version": 0 + }, + { + "git-tree": "eb346c5f0604817b3ab30b6321d5c9d6d518628b", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "80b4d2157064b6b4876520f120e8ea6d135a8b0d", + "version-string": "3.0.1", + "port-version": 0 + }, + { + "git-tree": "2aa780e9d417ff43cef981606bc6911c2f751665", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "58943ac17c0e2956632be59a260dbf4aa7ce8ac5", + "version-string": "2.4.2", + "port-version": 0 + }, + { + "git-tree": "aee8631390834d6716dd4b12d3a12a0801dd5792", + "version-string": "2.4.1", + "port-version": 0 + }, + { + "git-tree": "5ffd285b9e20d7540b52e3ed8cbc0bcb230edfa9", + "version-string": "2.0.0-4", + "port-version": 0 + }, + { + "git-tree": "48ae552f907cda9f410f1242dc22779b73aca59a", + "version-string": "2.0.0-3", + "port-version": 0 + }, + { + "git-tree": "bf1873d12212b14738279540418f67ebe15b94bc", + "version-string": "2.0.0-2", + "port-version": 0 + }, + { + "git-tree": "2b8b7f4c0718ef21f79ac7acc8b174a28366ad92", + "version-string": "2.0.0-1", + "port-version": 0 + }, + { + "git-tree": "91d709fc61a7fe6ce48194a5dd47455e97386dfa", + "version-string": "2.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libxdiff.json b/externals/vcpkg/versions/l-/libxdiff.json new file mode 100755 index 000000000..130c9f6fe --- /dev/null +++ b/externals/vcpkg/versions/l-/libxdiff.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "88e90a302307649ee4266069f5f85a06941530ff", + "version": "0.23", + "port-version": 2 + }, + { + "git-tree": "dfe80df2ce315833069e20c710acf1349b901e60", + "version-string": "0.23", + "port-version": 1 + }, + { + "git-tree": "1a71b6f2278ad8edbe64b1c03e338dd733ad8aa1", + "version-string": "0.23", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libxlsxwriter.json b/externals/vcpkg/versions/l-/libxlsxwriter.json new file mode 100755 index 000000000..53b304b03 --- /dev/null +++ b/externals/vcpkg/versions/l-/libxlsxwriter.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "9e7e4072f13a2839135caf76e0b0ef31ee13bc48", + "version-semver": "1.1.4", + "port-version": 0 + }, + { + "git-tree": "13265cc8f10d1cd14a723dfda351ac6ad6625e60", + "version-semver": "1.1.3", + "port-version": 1 + }, + { + "git-tree": "6355a7b3fb476841c51ccde98e671ca3b181b000", + "version-semver": "1.1.3", + "port-version": 0 + }, + { + "git-tree": "f4f03a0a0d45dc562ef63a482b4307a3f2c858b9", + "version-string": "0.9.4", + "port-version": 0 + }, + { + "git-tree": "f8bb4a75ffc6272141ef6f87ea478644bc50d5e0", + "version-string": "0.8.9-1", + "port-version": 0 + }, + { + "git-tree": "a7f7956f07b6e244f3a191aa6d696528b30bc5e9", + "version-string": "0.8.7-1", + "port-version": 0 + }, + { + "git-tree": "e16a1c13199ffe041f5a8c548d41daaf58888a43", + "version-string": "0.8.6-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libxml2.json b/externals/vcpkg/versions/l-/libxml2.json new file mode 100755 index 000000000..0f5e6419a --- /dev/null +++ b/externals/vcpkg/versions/l-/libxml2.json @@ -0,0 +1,139 @@ +{ + "versions": [ + { + "git-tree": "454c94726c33c2893c30afbe34243d69dc4d91e0", + "version": "2.9.14", + "port-version": 0 + }, + { + "git-tree": "0da62e928cc294ad51a384594db59d6ff2dc49d4", + "version-semver": "2.9.13", + "port-version": 0 + }, + { + "git-tree": "582189632eff9dc4ba2ef262a853c339d2838bd9", + "version-semver": "2.9.12", + "port-version": 5 + }, + { + "git-tree": "5cb8ed61786fdd081204880cd02d9376b17130eb", + "version-semver": "2.9.12", + "port-version": 4 + }, + { + "git-tree": "091644d055f6ab14ab96001c90418be9f5c4d6e3", + "version-semver": "2.9.12", + "port-version": 3 + }, + { + "git-tree": "f86cd2ab2c75dcd8e97ee18191b343f0b31bfb7c", + "version-semver": "2.9.12", + "port-version": 2 + }, + { + "git-tree": "a68bece41619060ca2e212b916dcc60c65ca3603", + "version-semver": "2.9.12", + "port-version": 1 + }, + { + "git-tree": "c6fe9f85f9c0a1f9349de95425b786cf6462314c", + "version-semver": "2.9.12", + "port-version": 0 + }, + { + "git-tree": "b0cf9aec6fb5cd87ae6358e9015e92e9d113c1f1", + "version-semver": "2.9.10", + "port-version": 8 + }, + { + "git-tree": "f86ba7081b940af77e935875fbdf9cbf69446b9f", + "version-semver": "2.9.10", + "port-version": 7 + }, + { + "git-tree": "306378bea94b3a4b3c5992510b992b3690b87f52", + "version-semver": "2.9.10", + "port-version": 6 + }, + { + "git-tree": "2908a3c4c0454f12d4e14aa954952cb2824bf508", + "version-semver": "2.9.10", + "port-version": 5 + }, + { + "git-tree": "98c48a2d0545e6d392084260abc6411eb44f0577", + "version-semver": "2.9.10", + "port-version": 4 + }, + { + "git-tree": "7aa5a9ea1742082d57eb67708f107ade65f94c12", + "version-semver": "2.9.10", + "port-version": 3 + }, + { + "git-tree": "873d78549fd9c4fa3cb7f0296a1f9a50dbf9f13e", + "version-string": "2.9.10", + "port-version": 2 + }, + { + "git-tree": "4bc5ef5b5d53f7fbf01d10fcb576bdc926479efa", + "version-string": "2.9.10", + "port-version": 1 + }, + { + "git-tree": "0ccb42a07ced8162ff4e99cdff298f1a1674c114", + "version-string": "2.9.10", + "port-version": 0 + }, + { + "git-tree": "f99dba51f54953d70e894a949be18d27ab1d1bfc", + "version-string": "2.9.9", + "port-version": 8 + }, + { + "git-tree": "0f9e8932a5dc93e33dd71d64c381cfa6001a8c24", + "version-string": "2.9.9", + "port-version": 7 + }, + { + "git-tree": "77cab566cc656094555162dbef8a86067115032f", + "version-string": "2.9.9-6", + "port-version": 0 + }, + { + "git-tree": "5dd231c02d28991857ed343229090cc8400afce9", + "version-string": "2.9.9-5", + "port-version": 0 + }, + { + "git-tree": "f03c2387786d1b7d517dab0b8dd61b69e0d5c9db", + "version-string": "2.9.9-4", + "port-version": 0 + }, + { + "git-tree": "b6604793e23e526d8dd7449fefbbd6941745cda9", + "version-string": "2.9.4-5", + "port-version": 0 + }, + { + "git-tree": "6a1cfd035209c1721f49536337df8e2ecbc2a71a", + "version-string": "2.9.4-4", + "port-version": 0 + }, + { + "git-tree": "24f4e9b8e13f5fc39d0c4a52d60347694bcc98fe", + "version-string": "2.9.4-2", + "port-version": 0 + }, + { + "git-tree": "c0a9f523c5d3175f94fe44e61c63830b85a69450", + "version-string": "2.9.4-1", + "port-version": 0 + }, + { + "git-tree": "35d1dcddd0d454a9d59ca3ff6c53e4af1316f5c0", + "version-string": "2.9.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libxmlmm.json b/externals/vcpkg/versions/l-/libxmlmm.json new file mode 100755 index 000000000..4a3298fbc --- /dev/null +++ b/externals/vcpkg/versions/l-/libxmlmm.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "869d2ab96342804f872b8d56ad8ccd5e80b274b6", + "version": "0.6.0", + "port-version": 2 + }, + { + "git-tree": "4f34eb9988a27e6184d3271ca0e346793b30d836", + "version-string": "0.6.0", + "port-version": 1 + }, + { + "git-tree": "7c106adf45ac07c773738acf6d6e2e359ea1b402", + "version-string": "0.6.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libxmlpp.json b/externals/vcpkg/versions/l-/libxmlpp.json new file mode 100755 index 000000000..526fed6df --- /dev/null +++ b/externals/vcpkg/versions/l-/libxmlpp.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "a603edc93c74d92bdbcef0bd8c38bbe331d1aa9d", + "version": "5.0.0", + "port-version": 2 + }, + { + "git-tree": "d3b0562bb045d23c33e6c01ed6d418c8f20f2358", + "version": "5.0.0", + "port-version": 1 + }, + { + "git-tree": "f70632020762c80c63290e7f627e00a0614c0d06", + "version": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "cf3bbc6a0547601cd247497eb4778f11b16c6839", + "version-string": "2.40.1", + "port-version": 8 + }, + { + "git-tree": "9e0157583d39910ca8237ef3553eca2d8abdb0c0", + "version-string": "2.40.1", + "port-version": 7 + }, + { + "git-tree": "93c1a786e84dc682b573fad9dba7a7e9bfd25737", + "version-string": "2.40.1", + "port-version": 6 + }, + { + "git-tree": "872c6503ee79f0fa6da98e67b58ebbcc47c28761", + "version-string": "2.40.1-5", + "port-version": 0 + }, + { + "git-tree": "fd223de5c00ea896d7d4f82230bd092517e534f8", + "version-string": "2.40.1-3", + "port-version": 0 + }, + { + "git-tree": "53faf09d90a0597d2f46efce21b3f96f6042c9bf", + "version-string": "2.40.1-2", + "port-version": 0 + }, + { + "git-tree": "1b14a2048d5d9a90f646d566f8186f575e23fcde", + "version-string": "2.40.1-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libxmp-lite.json b/externals/vcpkg/versions/l-/libxmp-lite.json new file mode 100755 index 000000000..7fde53fb3 --- /dev/null +++ b/externals/vcpkg/versions/l-/libxmp-lite.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "bb6da404365a98bffa1f8622b652c15929c81811", + "version": "4.4.1", + "port-version": 8 + }, + { + "git-tree": "dda1a742b2612d9d926fef9c804d5e5efd041777", + "version-string": "4.4.1", + "port-version": 7 + }, + { + "git-tree": "c69ae2b0e1c4730c75d66c8f842e0d8d3e4df116", + "version-string": "4.4.1-6", + "port-version": 0 + }, + { + "git-tree": "4af756d98344e052d3bee919aec77b3a0079ccd9", + "version-string": "4.4.1-4", + "port-version": 0 + }, + { + "git-tree": "098f7f0e262147eab4c6159733d89c06804e4500", + "version-string": "4.4.1-3", + "port-version": 0 + }, + { + "git-tree": "78bb669d778cb055ad66d176ef52ada71f9cbcc4", + "version-string": "4.4.1-2", + "port-version": 0 + }, + { + "git-tree": "f480b368906fbd946b97c743f8f206ced6ff55d5", + "version-string": "4.4.1-1", + "port-version": 0 + }, + { + "git-tree": "b28380c69722d9e9887891ae8f3596d93ba4f3d4", + "version-string": "4.4.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libxslt.json b/externals/vcpkg/versions/l-/libxslt.json new file mode 100755 index 000000000..76b411323 --- /dev/null +++ b/externals/vcpkg/versions/l-/libxslt.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "d6fe77f9ea62ee9e22769ffd1ae0f28229df2a50", + "version": "1.1.35", + "port-version": 0 + }, + { + "git-tree": "063e2e6a6b9ef700f0c2587d2def57eb0e2285e6", + "version": "1.1.34", + "port-version": 5 + }, + { + "git-tree": "034ea26a2cde47c4d19df6eb35bc124a79ad37a3", + "version": "1.1.34", + "port-version": 4 + }, + { + "git-tree": "f139a7054e2347bc0f48ba6cabe14a74e7d1db36", + "version": "1.1.34", + "port-version": 3 + }, + { + "git-tree": "0f0b69e249f116b5e20999f9c4c16004093b49ec", + "version": "1.1.34", + "port-version": 2 + }, + { + "git-tree": "d5021817ac7038fcfc53721d55a17fbab42ceb59", + "version": "1.1.34", + "port-version": 1 + }, + { + "git-tree": "1893a874d7cc6d1bfd903ae9a341f9d1e6419b78", + "version-string": "1.1.34", + "port-version": 0 + }, + { + "git-tree": "210c2ecb911a6c2445806f30a98a3f2c9a9177dc", + "version-string": "1.1.33", + "port-version": 9 + }, + { + "git-tree": "a737eb337f73e61e189204c657dc32332ba0adf8", + "version-string": "1.1.33", + "port-version": 8 + }, + { + "git-tree": "4101234641c52ed2895b5a14ac9d673ed6ec46e4", + "version-string": "1.1.33-7", + "port-version": 2 + }, + { + "git-tree": "8d3313527abaa2b3cd25b12abeace62abf9a2275", + "version-string": "1.1.33-7", + "port-version": 1 + }, + { + "git-tree": "8dd382a54f21621e6c6c42d8d414bdeb49bccf85", + "version-string": "1.1.33-7", + "port-version": 0 + }, + { + "git-tree": "a081ca29c4843ccbcf0721dad2547036b61bc473", + "version-string": "1.1.33-6", + "port-version": 0 + }, + { + "git-tree": "05a677b8af7ab8695c3f0828db7577cf5b143704", + "version-string": "1.1.33-5", + "port-version": 0 + }, + { + "git-tree": "bedd6b127ccd0caba7f707d9b77ab9e913155800", + "version-string": "1.1.33-4", + "port-version": 0 + }, + { + "git-tree": "92c44780d53c6bba5be535223c3a1ae3016909ad", + "version-string": "1.1.33-2", + "port-version": 0 + }, + { + "git-tree": "0d599445d03ebb53634ec4ef72ac58e2381ac4c3", + "version-string": "1.1.33-1", + "port-version": 0 + }, + { + "git-tree": "f60681527bc521ba84e58e714208a78f04549c31", + "version-string": "1.1.33", + "port-version": 0 + }, + { + "git-tree": "ea36843be676aee20d65e4051d772ad61de940af", + "version-string": "1.1.29", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libyaml.json b/externals/vcpkg/versions/l-/libyaml.json new file mode 100755 index 000000000..3c90caf31 --- /dev/null +++ b/externals/vcpkg/versions/l-/libyaml.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "0a7af4d5e003c4971aa031bf5533ac14f35e91d7", + "version-string": "0.2.5", + "port-version": 3 + }, + { + "git-tree": "888d62d1f7440f3c9c5ff403e85175372903c0ef", + "version-string": "0.2.5", + "port-version": 2 + }, + { + "git-tree": "05217bc30337071036997a4d6152165823db9531", + "version-string": "0.2.5", + "port-version": 1 + }, + { + "git-tree": "63a0e7b0e6194ee90c9d2e5bf3ac2c10ec04cca3", + "version-string": "0.2.5", + "port-version": 0 + }, + { + "git-tree": "b02016f410d7c0ebafcfd76aedc94d4c5254fd21", + "version-string": "0.2.2-3", + "port-version": 0 + }, + { + "git-tree": "105a145330252408eea604f2202b79b8d5bcbeaf", + "version-string": "0.2.2-2", + "port-version": 0 + }, + { + "git-tree": "ee054338d987d10829e3aad704ac976fead5ff71", + "version-string": "0.2.2-1", + "port-version": 0 + }, + { + "git-tree": "6a11377942d4a8751ca5575a05b7dd63c05f8b7e", + "version-string": "0.2.2", + "port-version": 0 + }, + { + "git-tree": "8021526fc56f0be280ecf210e4730dffef8bbbb5", + "version-string": "0.2.1-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libyuv.json b/externals/vcpkg/versions/l-/libyuv.json new file mode 100755 index 000000000..2a523500c --- /dev/null +++ b/externals/vcpkg/versions/l-/libyuv.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "ca463baa9f197bedced2b6ad24977d4ba928c0f2", + "version-date": "2021-04-15", + "port-version": 1 + }, + { + "git-tree": "d3e4d6adb28f13cb3aa4978cd0d6e319b87416cb", + "version-date": "2021-04-15", + "port-version": 0 + }, + { + "git-tree": "3e79a0e3d4e6d2d92532d3ad8d368e4fc46ca62f", + "version-string": "fec9121", + "port-version": 3 + }, + { + "git-tree": "ec1ac02dc0af035269269dd91dcfa794b781399e", + "version-string": "fec9121-2", + "port-version": 0 + }, + { + "git-tree": "1db720294d7d6735eb1277f189f0a3462da5152c", + "version-string": "fec9121-1", + "port-version": 0 + }, + { + "git-tree": "279d2c83a2c384169daae9317cefaabaa5434e34", + "version-string": "fec9121", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libzen.json b/externals/vcpkg/versions/l-/libzen.json new file mode 100755 index 000000000..80dbf2093 --- /dev/null +++ b/externals/vcpkg/versions/l-/libzen.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "37c7d9f6e950b43bc62ed633bc8fc1964bb2ada3", + "version": "0.4.39", + "port-version": 1 + }, + { + "git-tree": "613111ba5e30b7f36fab5f147a4ae10180d8bebf", + "version": "0.4.39", + "port-version": 0 + }, + { + "git-tree": "f1c1cb55badf91c09b70e7480ff5c763518f1f51", + "version-string": "0.4.38", + "port-version": 1 + }, + { + "git-tree": "53a1b657b1e2647f28f64618a7322b51ac85be93", + "version-string": "0.4.38", + "port-version": 0 + }, + { + "git-tree": "e8279550cd282d6f7e8780c9a4627f12a40184ea", + "version-string": "0.4.37", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libzip.json b/externals/vcpkg/versions/l-/libzip.json new file mode 100755 index 000000000..e14cc3658 --- /dev/null +++ b/externals/vcpkg/versions/l-/libzip.json @@ -0,0 +1,104 @@ +{ + "versions": [ + { + "git-tree": "aac0a6e50e8ada73d9bfeb5a5ce5e631fd37fce8", + "version-semver": "1.8.0", + "port-version": 0 + }, + { + "git-tree": "519b00c1db73782b3527816055dffbcbdde805a0", + "version-semver": "1.7.3", + "port-version": 2 + }, + { + "git-tree": "03badcbd43bb29fa3475d0aa990fc999dab91460", + "version-string": "1.7.3", + "port-version": 1 + }, + { + "git-tree": "1194df348661e10a8c54a416cab3435417a457eb", + "version-string": "1.7.3", + "port-version": 0 + }, + { + "git-tree": "b28e75bd37ecd22e624bdc6c2523ab23aaf26df2", + "version-string": "1.7.1", + "port-version": 1 + }, + { + "git-tree": "a74e0e4b0d8ac0b8e3769ef729aa5ec12140f3fd", + "version-string": "1.7.1", + "port-version": 0 + }, + { + "git-tree": "3bb4b40816e28aac5d95476893573a90b4b6edec", + "version-string": "rel-1-6-1", + "port-version": 0 + }, + { + "git-tree": "cf1459354c5fb664554abde4f03644450aafb557", + "version-string": "rel-1-5-2--1", + "port-version": 0 + }, + { + "git-tree": "020d4a28fef2334dca39fa49c3b0330ee6b79adf", + "version-string": "rel-1-5-3", + "port-version": 0 + }, + { + "git-tree": "22201e83f5e8af045e256c3c5c6e6a87804adf76", + "version-string": "rel-1-5-2", + "port-version": 0 + }, + { + "git-tree": "dd2e8d335da34e931ca7719ddf752af6ac816075", + "version-string": "rel-1-5-1-vcpkg2", + "port-version": 0 + }, + { + "git-tree": "9a5affd07119505518e99c49f084f770759e7e49", + "version-string": "rel-1-5-1-vcpkg1", + "port-version": 0 + }, + { + "git-tree": "7171f8dbe10ccf419d8ea7915a30ff595e161e79", + "version-string": "rel-1-5-1", + "port-version": 0 + }, + { + "git-tree": "328884c9c47cdbc0f5a1832c29b1b4ff57c24b5b", + "version-string": "rel-1-5-0", + "port-version": 0 + }, + { + "git-tree": "dfb5b8c39a7431c8a8204403c88a20db504a5a09", + "version-string": "1.4.0-1", + "port-version": 0 + }, + { + "git-tree": "34b232ae50d6e3e92c60773be4c482cc77e402eb", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "d543c4b3ab8b3b0863890d4dfcc62b1bd82255c9", + "version-string": "1.3.2", + "port-version": 0 + }, + { + "git-tree": "9be6646ea9b3e72b6ab907b66046386365acc3bb", + "version-string": "1.2.0-2", + "port-version": 0 + }, + { + "git-tree": "115a10d59b6d5875dfb0eeb18dea01f14cfc207e", + "version-string": "1.2.0-1", + "port-version": 0 + }, + { + "git-tree": "83785fac58a121127d41a7ac58da6905a3678657", + "version-string": "1.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/libzippp.json b/externals/vcpkg/versions/l-/libzippp.json new file mode 100755 index 000000000..5b48d498e --- /dev/null +++ b/externals/vcpkg/versions/l-/libzippp.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "0e5a10e0beabc7b9a1f9f313e62a1c73833e1c4f", + "version": "5.1-1.8.0", + "port-version": 0 + }, + { + "git-tree": "40f7e8d02ea29cb28b5c0c19257aebf97def3f8e", + "version-string": "5.0-1.8.0", + "port-version": 1 + }, + { + "git-tree": "841560e4b583cbf85a4aca0839aa881c4cda7258", + "version-string": "5.0-1.8.0", + "port-version": 0 + }, + { + "git-tree": "c6ab6d33444f3671ea875f4c98bc2937b2d32ee9", + "version-string": "4.1-1.8.0", + "port-version": 0 + }, + { + "git-tree": "b599e7e8cf8101b7ad23965c00bca32c24de4b88", + "version-string": "4.0-1.7.3", + "port-version": 3 + }, + { + "git-tree": "99c1b13ef0ac377589ae37cea3323a8a448d04e1", + "version-string": "4.0-1.7.3", + "port-version": 2 + }, + { + "git-tree": "c32ec51923205fa390a0d5f5902c34edfd8186cd", + "version-string": "4.0-1.7.3", + "port-version": 1 + }, + { + "git-tree": "5c32c9de4a0ac7c50effe8a581bc141200071ed9", + "version-string": "4.0-1.7.3", + "port-version": 0 + }, + { + "git-tree": "149333ab08cac3634140b5e99581bfdd76b13754", + "version-string": "3.1-1.6.1", + "port-version": 0 + }, + { + "git-tree": "279c7fbab088703019f9032850470f233dae4f9a", + "version-string": "2019-07-22", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/licensepp.json b/externals/vcpkg/versions/l-/licensepp.json new file mode 100755 index 000000000..6318660c9 --- /dev/null +++ b/externals/vcpkg/versions/l-/licensepp.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "5bbecce6621b387f3522f31745fa839c6401f09d", + "version-date": "2020-05-19", + "port-version": 3 + }, + { + "git-tree": "f7115621dbc8deb47ebd3a8ff8dc7eeaf26c80fd", + "version-string": "2020-05-19", + "port-version": 2 + }, + { + "git-tree": "277b066105603c5e9948957ac4abee99a7451051", + "version-string": "2020-05-19", + "port-version": 1 + }, + { + "git-tree": "0c9e02678de842c307947014ac4b472b26afe122", + "version-string": "2020-05-19", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/lilv.json b/externals/vcpkg/versions/l-/lilv.json new file mode 100755 index 000000000..0cc4bdc77 --- /dev/null +++ b/externals/vcpkg/versions/l-/lilv.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "a4dc357aa0d6533993a18ec3a9358a39d9ed3a54", + "version": "0.24.10", + "port-version": 1 + }, + { + "git-tree": "7cf6faadffa3ad04da656c4fbbdcee367b302fdb", + "version-string": "0.24.10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/linalg.json b/externals/vcpkg/versions/l-/linalg.json new file mode 100755 index 000000000..10c2b9324 --- /dev/null +++ b/externals/vcpkg/versions/l-/linalg.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "19b7c7f697dab441e8d16c883a66682f090fb0cf", + "version-string": "2.1", + "port-version": 1 + }, + { + "git-tree": "3691c3e21388afc6c584dfc8c212dbc2c5f7e286", + "version-string": "2.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/linenoise-ng.json b/externals/vcpkg/versions/l-/linenoise-ng.json new file mode 100755 index 000000000..e89496f6c --- /dev/null +++ b/externals/vcpkg/versions/l-/linenoise-ng.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "5e6ff5a6494c1913a8bd1ced80cf7037af500d26", + "version-string": "4754bee2d8eb3", + "port-version": 2 + }, + { + "git-tree": "5ae9279d3acecf2c559de7b455c79cfde6460336", + "version-string": "4754bee2d8eb3-1", + "port-version": 0 + }, + { + "git-tree": "f977dddcbb66b2c62388822f694ed1491f9e08db", + "version-string": "4754bee2d8eb3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/lionkor-commandline.json b/externals/vcpkg/versions/l-/lionkor-commandline.json new file mode 100755 index 000000000..0283efb57 --- /dev/null +++ b/externals/vcpkg/versions/l-/lionkor-commandline.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "bb56d3f901805ac69ea5d7bd27a07b789f3232e5", + "version-semver": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "857618e8e62e8395973a0c48c61c837877b65fac", + "version-semver": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/live555.json b/externals/vcpkg/versions/l-/live555.json new file mode 100755 index 000000000..df7399542 --- /dev/null +++ b/externals/vcpkg/versions/l-/live555.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "7dd605bbfb6b2532b7c127eac435600750b3c601", + "version-date": "2022-05-05", + "port-version": 0 + }, + { + "git-tree": "d2d9c96e8a0fa3a6af648952b384dc53504bf738", + "version-date": "2021-12-18", + "port-version": 0 + }, + { + "git-tree": "7d349d264f7be8a8802b521fddaa5ad047b48720", + "version-string": "latest", + "port-version": 2 + }, + { + "git-tree": "4bf91c8f1e61a268699d63b10f1951f1cd679a99", + "version-string": "latest-1", + "port-version": 0 + }, + { + "git-tree": "0c01290d6580e32b036086cbc41904f3779cfcee", + "version-string": "latest", + "port-version": 0 + }, + { + "git-tree": "61b213cf64ba77eb2786e705c6b17bc12faadeca", + "version-string": "2019.03.06", + "port-version": 0 + }, + { + "git-tree": "b01af9e8ef482c82cece0e702aab86dc9dfdf71b", + "version-string": "latest", + "port-version": 0 + }, + { + "git-tree": "7edd083ff7f35c87216958fe3f8616a2491f7aa3", + "version-string": "2018.08.05", + "port-version": 0 + }, + { + "git-tree": "31564cfcf28ec81553fa7f0628e52c519257c754", + "version-string": "2018.07.07-1", + "port-version": 0 + }, + { + "git-tree": "50ac47546ff0a0ad190f128237a857a1f5786e3f", + "version-string": "2018.07.07", + "port-version": 0 + }, + { + "git-tree": "ab2f4409a37935217e0a5db85ce679a8623bd7ef", + "version-string": "2018.07.01", + "port-version": 0 + }, + { + "git-tree": "53fde25d361fd0c97a6839471aef925b720c1891", + "version-string": "2018.02.28", + "port-version": 0 + }, + { + "git-tree": "eea0d7b760daa14510ad15948101905dbb24ea98", + "version-string": "2018.02.18", + "port-version": 0 + }, + { + "git-tree": "e3ecf8709660e06e789ff22d442eb159ab469eb9", + "version-string": "2018.01.29", + "port-version": 0 + }, + { + "git-tree": "450275fbeb22afe0ddf5f696d72a7a7b670ccb93", + "version-string": "2017.10.28", + "port-version": 0 + }, + { + "git-tree": "d324f940d8b95e858a0a8a59d00bd5d5f6c83cfd", + "version-string": "2017.09.12", + "port-version": 0 + }, + { + "git-tree": "232aa98521f1f1f7175a044560da742edfe4051d", + "version-string": "2017.06.04-1", + "port-version": 0 + }, + { + "git-tree": "4a61363ece685ec2c034a443119c8307fdd2092e", + "version-string": "2017.06.04", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/llfio.json b/externals/vcpkg/versions/l-/llfio.json new file mode 100755 index 000000000..f7910b2e6 --- /dev/null +++ b/externals/vcpkg/versions/l-/llfio.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "bc96b88ab308808ce26135e75038c4b316d5533c", + "version": "2.0-20220112", + "port-version": 1 + }, + { + "git-tree": "aaacb49264f3175de57367f28c90bd3904d7209f", + "version-string": "2.0-20220112", + "port-version": 0 + }, + { + "git-tree": "105f6228f09ad995de4826cf860811d3e7eab7f2", + "version-string": "2.0-20211208", + "port-version": 0 + }, + { + "git-tree": "208ec7684366cb893eeeeb9f86b4b6c92fab7e28", + "version-string": "2.0-20210922", + "port-version": 0 + }, + { + "git-tree": "3ff2b8c721c107574a4a81aa219fe4c119eaa9e3", + "version-string": "2.0", + "port-version": 20210421 + }, + { + "git-tree": "ffb9aa3f751b213fd6bde4d06f1c694c489e08f0", + "version-string": "2.0-20210420", + "port-version": 0 + }, + { + "git-tree": "debab55b24a36f3615bd29f0fe3088032bd61e53", + "version-string": "2.0-a74411ed", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/llgl.json b/externals/vcpkg/versions/l-/llgl.json new file mode 100755 index 000000000..ab5066e49 --- /dev/null +++ b/externals/vcpkg/versions/l-/llgl.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "24edfe12a80c340467e19d18b731ca53ce9f3ac7", + "version-string": "2019-08-15", + "port-version": 2 + }, + { + "git-tree": "097f9348e4c5bd300cd86ccc67831cd1de9f499c", + "version-string": "2019-08-15", + "port-version": 1 + }, + { + "git-tree": "6ccd0a3cd82670faa84cc7a44f937505193cd106", + "version-string": "2019-08-15", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/llvm.json b/externals/vcpkg/versions/l-/llvm.json new file mode 100755 index 000000000..f330f79e6 --- /dev/null +++ b/externals/vcpkg/versions/l-/llvm.json @@ -0,0 +1,219 @@ +{ + "versions": [ + { + "git-tree": "7f97dd1dc56be6b5637b8406bd01ac0c245eb0dc", + "version": "14.0.4", + "port-version": 0 + }, + { + "git-tree": "741b89d3872cb0152d5c295ce075b8d751381f51", + "version": "14.0.3", + "port-version": 1 + }, + { + "git-tree": "751084451d4807176af868b2edab17131c2e4a09", + "version": "14.0.3", + "port-version": 0 + }, + { + "git-tree": "1c835fcc79ad542a73ac25fd939556039ff75cd1", + "version": "13.0.0", + "port-version": 5 + }, + { + "git-tree": "15418b7e938058677963d920b616403240eca37f", + "version": "13.0.0", + "port-version": 3 + }, + { + "git-tree": "2c86dc65e952d8abe6140578df4db2c742180358", + "version": "13.0.0", + "port-version": 2 + }, + { + "git-tree": "b3ebd32f2ff4394d72edeb0f4b804d914a2e3f94", + "version": "13.0.0", + "port-version": 1 + }, + { + "git-tree": "fe86b4985609d9beb13e17327c52af54fb4869d4", + "version": "13.0.0", + "port-version": 0 + }, + { + "git-tree": "3726ade4edd3bd8e47f0cddbfac1e67803e7adea", + "version-string": "12.0.1", + "port-version": 0 + }, + { + "git-tree": "3d801bd12386ff6ab31ec0a27c3f45e23242a470", + "version-string": "12.0.0", + "port-version": 1 + }, + { + "git-tree": "6597ffba14111050d8e68af4852ea5766c81a78c", + "version-string": "12.0.0", + "port-version": 0 + }, + { + "git-tree": "7b30e5aa5227b4af185b967afbe34e84cf8c7638", + "version-string": "11.1.0", + "port-version": 0 + }, + { + "git-tree": "308632b643c39d4e6871c550156d218b4cf8d968", + "version-string": "11.0.0", + "port-version": 2 + }, + { + "git-tree": "9a8e86d3dc793c4404435e87c04470da6d9cccce", + "version-string": "11.0.0", + "port-version": 1 + }, + { + "git-tree": "0188d318ae61d867088f8717bc5ed178479f14a1", + "version-string": "11.0.0", + "port-version": 0 + }, + { + "git-tree": "ca26cd2a58caf6192c22a0d5b95ac35046a9ad9e", + "version-string": "10.0.0", + "port-version": 7 + }, + { + "git-tree": "9aafe5c2d96ae5b6a723e0a51dfcb0107b289ee4", + "version-string": "10.0.0", + "port-version": 6 + }, + { + "git-tree": "10b9b4731505e87a90a590729ea28e7f817cb8a9", + "version-string": "10.0.0", + "port-version": 5 + }, + { + "git-tree": "12832f403db82bb7945441e4976837b50b0e9fe3", + "version-string": "10.0.0-4", + "port-version": 0 + }, + { + "git-tree": "e9edfdf83fd6dbc9ab44f941f5a7bd22d2c47351", + "version-string": "10.0.0-3", + "port-version": 0 + }, + { + "git-tree": "1739a978167e567f158dcc02ed7780b88ecbdbb8", + "version-string": "10.0.0-2", + "port-version": 0 + }, + { + "git-tree": "2bd10bb953daf3a3e81ccbd2d331adbf8b56c8f2", + "version-string": "10.0.0-1", + "port-version": 0 + }, + { + "git-tree": "cacb3791efe9f762a427376c0363af20ca1e4eef", + "version-string": "10.0.0", + "port-version": 0 + }, + { + "git-tree": "479d7512d64a5aa10d5fdc8d2d87221036c7c2f5", + "version-string": "8.0.0-5", + "port-version": 0 + }, + { + "git-tree": "3d1d94c027ad10e84e0965d2027d16bc3ce652a1", + "version-string": "8.0.0-4", + "port-version": 0 + }, + { + "git-tree": "ccb5e6a94997e5c01482c057a5b44f06ce65e73e", + "version-string": "8.0.0-3", + "port-version": 0 + }, + { + "git-tree": "1b057bd5c752e6966ee1a7054bb717f139dffe07", + "version-string": "8.0.0-2", + "port-version": 0 + }, + { + "git-tree": "c187bc72549975eca1b6194dc15fc2abd2585d3f", + "version-string": "8.0.0-1", + "port-version": 0 + }, + { + "git-tree": "d3844a1749c5d42d52c4dc216a6e7c1cac80ef38", + "version-string": "8.0.0", + "port-version": 0 + }, + { + "git-tree": "4f02f98a7e0ae5b3fcc3234a5f20d23eb39123f0", + "version-string": "7.0.0-3", + "port-version": 0 + }, + { + "git-tree": "87bf5a951226e2192e73e6cfbe33063f083fae77", + "version-string": "7.0.0-2", + "port-version": 0 + }, + { + "git-tree": "e22d89a208df80f8943070e977630abf89cbd21c", + "version-string": "7.0.0", + "port-version": 0 + }, + { + "git-tree": "1fa33d91c904bc56d3ca6d70d70316fc834cec10", + "version-string": "6.0.0-1", + "port-version": 0 + }, + { + "git-tree": "22a3db4db8681560cfd336ccde399abba92a735e", + "version-string": "6.0.0", + "port-version": 0 + }, + { + "git-tree": "2222c1f8091fab481ffad5d070fd78f7826a9caf", + "version-string": "5.0.1", + "port-version": 0 + }, + { + "git-tree": "684e09492b51b8216e9f7ef7f109d0cf58257e7c", + "version-string": "5.0.0-4", + "port-version": 0 + }, + { + "git-tree": "4004640ec35216a39e623905f870ed1443fde51b", + "version-string": "5.0.0-3", + "port-version": 0 + }, + { + "git-tree": "d62124a1884d8b7455abe5c5262d4c839635f184", + "version-string": "5.0.0-2", + "port-version": 0 + }, + { + "git-tree": "918d279253b0fb8246b069cdc4ccade076f5eda0", + "version-string": "5.0.0-3", + "port-version": 0 + }, + { + "git-tree": "0f7c1f977dcf1c86220e84ed949de6d5a858078b", + "version-string": "5.0.0-2", + "port-version": 0 + }, + { + "git-tree": "ed6222b25225b811bf59725af7039682ea38abfd", + "version-string": "5.0.0-1", + "port-version": 0 + }, + { + "git-tree": "aefacad2be4f246a04ea6788e2659fd98a1eb736", + "version-string": "4.0.0-1", + "port-version": 0 + }, + { + "git-tree": "d7347eeaa8eb23459b87b850e8342c32a48ec119", + "version-string": "4.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/lmdb.json b/externals/vcpkg/versions/l-/lmdb.json new file mode 100755 index 000000000..d150fa7f1 --- /dev/null +++ b/externals/vcpkg/versions/l-/lmdb.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "1c94e6b90d91bc39a4307502116b20d7b38de413", + "version": "0.9.29", + "port-version": 2 + }, + { + "git-tree": "02d32452e2c5a3284fcdd1f448ab513dbb18a085", + "version": "0.9.29", + "port-version": 1 + }, + { + "git-tree": "980e2c4a26c75996e3940a9b46032356643e592b", + "version": "0.9.29", + "port-version": 0 + }, + { + "git-tree": "022fa44ff8c5ef9ea4b308468259c0775d4a72c1", + "version": "0.9.24", + "port-version": 2 + }, + { + "git-tree": "f3599ec6a6285945a3eeeac1f9b0db810855ec5a", + "version-string": "0.9.24", + "port-version": 1 + }, + { + "git-tree": "43467ce2a21ad30b6939a72fd6917e9a97209927", + "version-string": "0.9.24", + "port-version": 0 + }, + { + "git-tree": "3bc5ea2e7aacd9ebdb567cf9bca7756147bda1f7", + "version-string": "0.9.23-3", + "port-version": 0 + }, + { + "git-tree": "b2e32cf4c4db4be02625aab64908802fad87fed2", + "version-string": "0.9.23-2", + "port-version": 0 + }, + { + "git-tree": "9c44f0cc6905c71f238d62ecb4cfaa6e85e61a20", + "version-string": "0.9.23-1", + "port-version": 0 + }, + { + "git-tree": "59e5125cffea0fdb742c0b94c3987a76b9af803f", + "version-string": "0.9.23", + "port-version": 0 + }, + { + "git-tree": "30af10fbae3e9fe693487c6e60e1dca1f8134eb9", + "version-string": "0.9.18-4", + "port-version": 0 + }, + { + "git-tree": "44f1d76b227cb18ee1ed69b58640749fbe2d64fd", + "version-string": "0.9.18-3", + "port-version": 0 + }, + { + "git-tree": "ba36e3bbc32ee3e0ecfcd24541fc1c97dc366ffc", + "version-string": "0.9.18-2", + "port-version": 0 + }, + { + "git-tree": "6198a0508824db389b0f16af52a47ae0bdebab01", + "version-string": "0.9.18-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/lodepng-c.json b/externals/vcpkg/versions/l-/lodepng-c.json new file mode 100755 index 000000000..e1bd8ccec --- /dev/null +++ b/externals/vcpkg/versions/l-/lodepng-c.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "c25297e81ddc744ed59e77f15209cfbd726bdcdb", + "version-string": "deprecated", + "port-version": 0 + }, + { + "git-tree": "df7ad4d806d2308089bd2131fec061ac36ab72f9", + "version-date": "2021-03-01", + "port-version": 1 + }, + { + "git-tree": "588b315ea040b1a598929e86260dadaec3cb15d0", + "version-string": "2021-03-01", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/lodepng.json b/externals/vcpkg/versions/l-/lodepng.json new file mode 100755 index 000000000..897a5f3be --- /dev/null +++ b/externals/vcpkg/versions/l-/lodepng.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "744376b1eace2fdab47d24858d7d1e79f32eefa3", + "version-date": "2021-12-04", + "port-version": 1 + }, + { + "git-tree": "454b1276a4855fba7699cbb07ca783d32d1baf7c", + "version-date": "2021-12-04", + "port-version": 0 + }, + { + "git-tree": "c80237ed99bb9821134df9802930c54fd8c8ee90", + "version-string": "2020-03-15", + "port-version": 1 + }, + { + "git-tree": "b7471b62d6bfd4288987cca4eb3d37b8eb287ed1", + "version-string": "2020-03-15", + "port-version": 0 + }, + { + "git-tree": "dd2bd98b977a598c432781c7ed691a919ecc9f79", + "version-string": "2018-09-18-2", + "port-version": 0 + }, + { + "git-tree": "37ba669837d4b91c67454950280bc4b9c193f4ed", + "version-string": "2018-09-18-1", + "port-version": 0 + }, + { + "git-tree": "5d88c8a439c7e77b08eecabcbe63056c09db7f70", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "ff802d2cf29587db94c35ff5c15dc77aecdf20b2", + "version-string": "2018-06-28", + "port-version": 0 + }, + { + "git-tree": "381f29bdbe1f322988038d43b680c3022d08098a", + "version-string": "2018-06-12", + "port-version": 0 + }, + { + "git-tree": "d0bcfe60919ffce9f612a3d426cfef82e31c9dc3", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "692a0da2c27e69d32e0d5c18c3686138db7d837b", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "301079a8e9c4bb204ac29fe802d3b880e1cacc36", + "version-string": "2017-09-01-8a0f16afe74a6a-1", + "port-version": 0 + }, + { + "git-tree": "b8cc09ee8dce6b6faff86953091f11f3be3923b0", + "version-string": "2017-09-01-8a0f16afe74a6a", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/log4cplus.json b/externals/vcpkg/versions/l-/log4cplus.json new file mode 100755 index 000000000..ac896243b --- /dev/null +++ b/externals/vcpkg/versions/l-/log4cplus.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "7eb39878c5311e28d66f4a25e0c1583c1c99ff82", + "version": "2.0.7", + "port-version": 1 + }, + { + "git-tree": "765ee7e801e35c4c77e890bb4af363042e9384ae", + "version": "2.0.7", + "port-version": 0 + }, + { + "git-tree": "0fab754f152f45627bbebb4629e2f508eeccb690", + "version-string": "2.0.5", + "port-version": 2 + }, + { + "git-tree": "681e1dd7fc4ef251e55c2befa8e4872a97a81eba", + "version-string": "2.0.5", + "port-version": 1 + }, + { + "git-tree": "d70dd9f203f2050c2dc6e706b5c8c027918aa71b", + "version-string": "2.0.5", + "port-version": 0 + }, + { + "git-tree": "d98cf43f0150c6c3aa01e1a5dbf4440272ef95b7", + "version-string": "2.0.4-1", + "port-version": 0 + }, + { + "git-tree": "c7cbfec355276cf917d924389a1e3d07a3b10f13", + "version-string": "2.0.4", + "port-version": 0 + }, + { + "git-tree": "98213e135859b8bd4611b6a93c327f3103481fa8", + "version-string": "REL_2_0_3", + "port-version": 0 + }, + { + "git-tree": "e70a06e2f944efb03f6578d2d7c491cd30f71e22", + "version-string": "REL_2_0_1", + "port-version": 0 + }, + { + "git-tree": "2e20cb61c1a03f51815c689b33c85f286e8f1b0b", + "version-string": "REL_2_0_0-RC2", + "port-version": 0 + }, + { + "git-tree": "5ecfcec9c096c4c4c4085cbc396a4e3e589e6b5e", + "version-string": "REL_1_2_1-RC2-1", + "port-version": 0 + }, + { + "git-tree": "7506fa6baeac0038729fb3f0d585310e2f01ef05", + "version-string": "REL_1_2_1-RC2", + "port-version": 0 + }, + { + "git-tree": "927571090ea155e68b9dcca88c1d6a0f2f37c68e", + "version-string": "1.1.3-RC7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/log4cpp.json b/externals/vcpkg/versions/l-/log4cpp.json new file mode 100755 index 000000000..3f35bb86e --- /dev/null +++ b/externals/vcpkg/versions/l-/log4cpp.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "ed51c9c96387b0e97754a2ede544d589ae3b5af2", + "version": "2.9.1", + "port-version": 7 + }, + { + "git-tree": "c68e17d674484b6ec48269fb47eb711f0e2fcbab", + "version-string": "2.9.1", + "port-version": 6 + }, + { + "git-tree": "e0dcd61960233e62367f4944e294ae90300d82e4", + "version-string": "2.9.1", + "port-version": 5 + }, + { + "git-tree": "d9fe0e809653449b53363822d42a1db2c0ba6dd6", + "version-string": "2.9.1", + "port-version": 4 + }, + { + "git-tree": "191e66eab7b88de1d22bcc778717e957d6853475", + "version-string": "2.9.1", + "port-version": 3 + }, + { + "git-tree": "c4157444d4130b820f51b3040e1545a15dd3ab93", + "version-string": "2.9.1-2", + "port-version": 0 + }, + { + "git-tree": "6d29844d1ce73ee604aad20166a1ceb128148abc", + "version-string": "2.9.1-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/log4cxx.json b/externals/vcpkg/versions/l-/log4cxx.json new file mode 100755 index 000000000..c8f1a7ada --- /dev/null +++ b/externals/vcpkg/versions/l-/log4cxx.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "b85ee3fd18c7e2f12f928ef132e5707059ad32c0", + "version": "0.12.1", + "port-version": 0 + }, + { + "git-tree": "3a0d34c9d2f6f0d0811bdb43d1a233e025963185", + "version-string": "0.12.0", + "port-version": 0 + }, + { + "git-tree": "406017355e07d94a41999c3db5e015be8bf0fbbd", + "version-string": "0.11.0", + "port-version": 3 + }, + { + "git-tree": "e84807f759e37781d7ce7bfc3b7485609a0feb7c", + "version-string": "0.11.0", + "port-version": 2 + }, + { + "git-tree": "a584f921462afb2f1b269dc9a7b361b17445028b", + "version-string": "0.11.0", + "port-version": 1 + }, + { + "git-tree": "550cb06dab801272c72e2045fa9f3289b623e68b", + "version-string": "0.11.0", + "port-version": 0 + }, + { + "git-tree": "fedc13ef6cd03099e0faa16eb305257d52344bf9", + "version-string": "0.10.0-2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/loguru.json b/externals/vcpkg/versions/l-/loguru.json new file mode 100755 index 000000000..f6ecdd322 --- /dev/null +++ b/externals/vcpkg/versions/l-/loguru.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "827f85e170a1d4548088fa36cf46817e146184d0", + "version": "2.1.0", + "port-version": 3 + }, + { + "git-tree": "c429f674d828c20881f410892d633b483e9d30dd", + "version-string": "2.1.0", + "port-version": 2 + }, + { + "git-tree": "ef13e53a3840b20757d18f432ddc86568a5ea5ef", + "version-string": "2.1.0-1", + "port-version": 0 + }, + { + "git-tree": "1d791f39ec9872097696c6f1e1d70bb3a7b17b52", + "version-string": "v2.1.0", + "port-version": 0 + }, + { + "git-tree": "59151390e044e7bdf8a5cf0af48f077947ec0b81", + "version-string": "v2.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/lpeg.json b/externals/vcpkg/versions/l-/lpeg.json new file mode 100755 index 000000000..d12e83dcc --- /dev/null +++ b/externals/vcpkg/versions/l-/lpeg.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "582d8581a1bfef351571e1ba8ea8910bdc8291fc", + "version-string": "1.0.2", + "port-version": 2 + }, + { + "git-tree": "453a5d8a428bfaf904e55a2178895e6d8a104ef9", + "version-string": "1.0.2-1", + "port-version": 0 + }, + { + "git-tree": "f5346a0c9640ea8f11b6fb81228e80063b67c907", + "version-string": "1.0.1-4", + "port-version": 0 + }, + { + "git-tree": "a4a9fc75abd7600a986df6a73627548f71787409", + "version-string": "1.0.1-3", + "port-version": 0 + }, + { + "git-tree": "fd02c13a234ce16401cd30647783d7aa647a4321", + "version-string": "1.0.1-2", + "port-version": 0 + }, + { + "git-tree": "98f39a54d2336eae4272c2da3ec683c1630e224b", + "version-string": "1.0.1-1", + "port-version": 0 + }, + { + "git-tree": "ee5d942c756ef7f339573a55fc0f40ca1efc02fb", + "version-string": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/lua.json b/externals/vcpkg/versions/l-/lua.json new file mode 100755 index 000000000..5fb64a0a4 --- /dev/null +++ b/externals/vcpkg/versions/l-/lua.json @@ -0,0 +1,124 @@ +{ + "versions": [ + { + "git-tree": "1443185b76c2f6e0e74c425ed0b3176e98a5fb01", + "version": "5.4.4", + "port-version": 2 + }, + { + "git-tree": "26701e6e610ff6eaee198ca1aaa0b9125e4b2d6f", + "version": "5.4.4", + "port-version": 1 + }, + { + "git-tree": "811a56cbdf5cfd0f8e57c2b3cff2a03e5c709723", + "version": "5.4.4", + "port-version": 0 + }, + { + "git-tree": "6a9a787a9369019f1dd867cc1c1d6c10296441d9", + "version-semver": "5.4.3", + "port-version": 3 + }, + { + "git-tree": "3be47dc8a0f0e6497caac10e26e2eaf8866b2990", + "version-semver": "5.4.3", + "port-version": 2 + }, + { + "git-tree": "0e8966273a1a18cf591cf78046d345c74941a37d", + "version-string": "5.4.3", + "port-version": 1 + }, + { + "git-tree": "8a52fbd7ff551d4c1b7e6d308283cfe92ca81758", + "version-string": "5.4.3", + "port-version": 0 + }, + { + "git-tree": "5f3de4a36739615d9ffba11571f50226b385721b", + "version-string": "5.4.2", + "port-version": 0 + }, + { + "git-tree": "3bf3ea5ddf8760d12d37e7a2e95cb3db3cc51b7f", + "version-string": "5.4.1", + "port-version": 0 + }, + { + "git-tree": "80fa373569847b12eeae2f949d922a6d7330767f", + "version-string": "5.3.5", + "port-version": 6 + }, + { + "git-tree": "26e8240f6861eabe097afea4506df5a281544fdd", + "version-string": "5.3.5-5", + "port-version": 0 + }, + { + "git-tree": "1085760dfc45c234153f9f2ba3df9e40f76ab7b5", + "version-string": "5.3.5-4", + "port-version": 0 + }, + { + "git-tree": "801716c2f79e532b58925eeb2cf1da0195eec878", + "version-string": "5.3.5-3", + "port-version": 0 + }, + { + "git-tree": "3ac7f2c11630d3fc8005bc15cc3317f3b4acdf42", + "version-string": "5.3.5-2", + "port-version": 0 + }, + { + "git-tree": "c14d49e5fc41394aaa96f70f439ab730c53528a1", + "version-string": "5.3.5-1", + "port-version": 0 + }, + { + "git-tree": "0dec103d8afa749b545856c0843496aa36399d39", + "version-string": "5.3.4-4", + "port-version": 0 + }, + { + "git-tree": "a9f96eec348f36ff77f624f81e8291d043bf6778", + "version-string": "5.3.4-3", + "port-version": 0 + }, + { + "git-tree": "b804624c6450ddf678b78084f0ecc4257c69c06c", + "version-string": "5.3.4-2", + "port-version": 0 + }, + { + "git-tree": "6dcd8c719a66f5dec9a93eadfe09198e5708734f", + "version-string": "5.3.4-1", + "port-version": 0 + }, + { + "git-tree": "865ab4190ef114a8fa896ea689cba49a88c2c83f", + "version-string": "5.3.4", + "port-version": 0 + }, + { + "git-tree": "448a35ae5fc94cd8ff421d24eae91c0fb0de89a9", + "version-string": "5.3.3-2", + "port-version": 0 + }, + { + "git-tree": "a2df10483ed38d8c2e1d69a25cad6aba00e46e53", + "version-string": "5.3.3-1", + "port-version": 0 + }, + { + "git-tree": "cef63a5d681fd346fcf65ea2c14930f8e71c85b6", + "version-string": "5.3.3", + "port-version": 0 + }, + { + "git-tree": "745ac34855d3bf257e9e9e756d52b384d79174b0", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/luabridge.json b/externals/vcpkg/versions/l-/luabridge.json new file mode 100755 index 000000000..448484500 --- /dev/null +++ b/externals/vcpkg/versions/l-/luabridge.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "5f3cd5355fe6097867cfc2aa6037d6089f26b0b6", + "version-string": "2.6", + "port-version": 1 + }, + { + "git-tree": "509a24ba9fa003e8052f9e9ab672532307354b46", + "version-string": "2.6", + "port-version": 0 + }, + { + "git-tree": "b2d87d659dd83a80ea93cedec212882aa404ec4c", + "version-string": "2.4.1", + "port-version": 0 + }, + { + "git-tree": "39dd787f651311f7a68ad8f1563d357ae9504952", + "version-string": "2.3.2", + "port-version": 0 + }, + { + "git-tree": "64107e1668c1e5bf43ff57264fb88158641181bc", + "version-string": "2.3.1", + "port-version": 0 + }, + { + "git-tree": "fe5c621e11431bb1ef29e81fce697ce853c299fa", + "version-string": "2.1-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/luafilesystem.json b/externals/vcpkg/versions/l-/luafilesystem.json new file mode 100755 index 000000000..2625adb28 --- /dev/null +++ b/externals/vcpkg/versions/l-/luafilesystem.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "e23447662c7ca83b4d681a5a0d4a451a683ce923", + "version-string": "1.8.0", + "port-version": 2 + }, + { + "git-tree": "b20a650ae45dc96ce00231ffcc6762cdf9ad4d4a", + "version-string": "1.8.0-1", + "port-version": 0 + }, + { + "git-tree": "b2e581fc3cecbb696c89b71dee77c6b2792168ba", + "version-string": "1.7.0.2-1", + "port-version": 0 + }, + { + "git-tree": "8f0eace8ce87c40e4fbc3528520d90fdf3b1bb07", + "version-string": "1.7.0.2", + "port-version": 0 + }, + { + "git-tree": "cc6b42766491e946ec8c90fb9d42e31434a7691e", + "version-string": "1.6.3-1", + "port-version": 0 + }, + { + "git-tree": "0bfd25f614a606708754e2eac7a12a1ebadeedcd", + "version-string": "1.6.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/luajit.json b/externals/vcpkg/versions/l-/luajit.json new file mode 100755 index 000000000..ee166d696 --- /dev/null +++ b/externals/vcpkg/versions/l-/luajit.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "9b560fe2d3810733d0b0f69b2a91093b02ac49b6", + "version": "2.0.5", + "port-version": 8 + }, + { + "git-tree": "daf2e19a72e3bf1d8a6c47a38489c9d1bd016d33", + "version": "2.0.5", + "port-version": 7 + }, + { + "git-tree": "d8d4e2ca9656ec3a26a0ade9f0421e17b11206c7", + "version": "2.0.5", + "port-version": 6 + }, + { + "git-tree": "3748aef9d3bd9d941f6af4d9c049cc55194cb7f5", + "version": "2.0.5", + "port-version": 5 + }, + { + "git-tree": "10777e8d3827f33dd042ae2cee5d309f48a108c0", + "version-string": "2.0.5", + "port-version": 4 + }, + { + "git-tree": "e1f7e0b77492627b8233017be73bd7b4361b2510", + "version-string": "2.0.5-3", + "port-version": 0 + }, + { + "git-tree": "7b77f1011f636ec051800a1f04906dedfb0ba80c", + "version-string": "2.0.5-2", + "port-version": 0 + }, + { + "git-tree": "c74c03aaae5f866c71ee8834d5a80d46e9a85852", + "version-string": "2.0.5-1", + "port-version": 0 + }, + { + "git-tree": "0098ef8ec8e252740baf595562665c2ffceaf6df", + "version-string": "2.0.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/luasec.json b/externals/vcpkg/versions/l-/luasec.json new file mode 100755 index 000000000..4881a9987 --- /dev/null +++ b/externals/vcpkg/versions/l-/luasec.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "9c562198b62737a1b5c47ef51bb4a5a7b46fd3ce", + "version": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "ac5ef37f939164b6bc4a63bf7eeec24e8e8c5a79", + "version": "1.0.1", + "port-version": 1 + }, + { + "git-tree": "2529ee34af0b23fb576f0e8ed672ceba83c4c305", + "version": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/luasocket.json b/externals/vcpkg/versions/l-/luasocket.json new file mode 100755 index 000000000..d7a4594a1 --- /dev/null +++ b/externals/vcpkg/versions/l-/luasocket.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "2f809809d4b061b2579f41521b20a7c4a0992558", + "version": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "94ee0f78bf41cf8d10f7bc25b2305a9a0a33cb36", + "version-date": "2020-09-14", + "port-version": 2 + }, + { + "git-tree": "9eefd1250090f0a85e48d86a1d25f226e1a978d3", + "version-string": "2020-09-14", + "port-version": 1 + }, + { + "git-tree": "f5c6cb1d6373706ec11daef580be154ef47e1bca", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "cb4fa3fe24b06e50b605ddb9cf8cd5a8bc8dbfe1", + "version-string": "2019-05-07", + "port-version": 0 + }, + { + "git-tree": "64220c3a2b8ea025f824547042c207ec4476d624", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "5512c2711e107896ac325387471d8464b93b18dd", + "version-string": "2018-09-18-1", + "port-version": 0 + }, + { + "git-tree": "ad15f76b27536c67d625eb4f666be8c31b83c28b", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "e5872935eeaf007d23450259533f94645bb3d84a", + "version-string": "2018-06-12", + "port-version": 0 + }, + { + "git-tree": "6cb2f911f54970a1567a8a5346ef511825164aed", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "27ef55e98ba32a9410dd8f59d5b17576674b790d", + "version-string": "2017.05.25.5a17f79b0301f0a1b4c7f1c73388757a7e2ed309", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/lunasvg.json b/externals/vcpkg/versions/l-/lunasvg.json new file mode 100755 index 000000000..fb076139e --- /dev/null +++ b/externals/vcpkg/versions/l-/lunasvg.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bf20380ca537151f7d1e02a6ca5b19c302db18c7", + "version": "2.3.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/lv2.json b/externals/vcpkg/versions/l-/lv2.json new file mode 100755 index 000000000..d9206bb14 --- /dev/null +++ b/externals/vcpkg/versions/l-/lv2.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "f78e5138684d16deb9657062f3c28606853f9919", + "version-semver": "1.18.2", + "port-version": 1 + }, + { + "git-tree": "3a811ec51d55cce1d5eaf4a430a8e274f1916bb9", + "version-semver": "1.18.2", + "port-version": 0 + }, + { + "git-tree": "4fcc1df0a11567c74dccb3fafe922a1f2686eff3", + "version-string": "1.18.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/lz4.json b/externals/vcpkg/versions/l-/lz4.json new file mode 100755 index 000000000..bfb6a07c4 --- /dev/null +++ b/externals/vcpkg/versions/l-/lz4.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "43957fa49e865966b52c6729db11aa067f790d49", + "version": "1.9.3", + "port-version": 3 + }, + { + "git-tree": "c73172e611edeb3ef440fd1ea7ef4fe746237cfc", + "version": "1.9.3", + "port-version": 2 + }, + { + "git-tree": "05857030abda5345ee64ed534732f07147844de6", + "version-string": "1.9.3", + "port-version": 1 + }, + { + "git-tree": "d1303e53c110c86d844b41116cd872c8bc967300", + "version-string": "1.9.3", + "port-version": 0 + }, + { + "git-tree": "b6dfac9ea3f75a0a79736cf1ea2e0ba9bfa67086", + "version-string": "1.9.2-2", + "port-version": 0 + }, + { + "git-tree": "54c1eacd475f91e4b11447a2c1d45a18023c23a3", + "version-string": "1.9.2-1", + "port-version": 0 + }, + { + "git-tree": "757d50986c7cdc2aad60e83f62c90d9a8e89988b", + "version-string": "1.9.2", + "port-version": 0 + }, + { + "git-tree": "bd6ef5fe877aee1d1a4cf02583cd177d9bc83308", + "version-string": "1.9.1-2", + "port-version": 0 + }, + { + "git-tree": "75863599b807bc9502aabd8c60d916c58e018d49", + "version-string": "1.9.1-1", + "port-version": 0 + }, + { + "git-tree": "6af395159c52f740c87e44de0e6214e383735ff1", + "version-string": "1.9.1", + "port-version": 0 + }, + { + "git-tree": "f0ebbf5776dfabe6893f0595134706270dad5002", + "version-string": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "349110d4d66533a2a437e509ed323a863e8fea58", + "version-string": "1.8.3", + "port-version": 0 + }, + { + "git-tree": "069250ff6ad210fbf1eed6cf7cf4af54937a0ff6", + "version-string": "1.8.2", + "port-version": 0 + }, + { + "git-tree": "d86db7c9a2511a1e5074035a3b691976a8911c93", + "version-string": "1.8.1.2-1", + "port-version": 0 + }, + { + "git-tree": "fb15fbe7c6ed6384ebda2e9839f78d540b6145b5", + "version-string": "1.8.1.2", + "port-version": 0 + }, + { + "git-tree": "71909a479e4d54bbb65e12b93b21f268088ba81e", + "version-string": "1.8.0-1", + "port-version": 0 + }, + { + "git-tree": "a5aa2155adfe2571966af6db1ae73bc2c6db5291", + "version-string": "1.8.0", + "port-version": 0 + }, + { + "git-tree": "832dc4e66bbd303fbcee642af8ca1927ef3b0ee8", + "version-string": "1.7.5", + "port-version": 0 + }, + { + "git-tree": "263a6d8657f96a86e5da840035aa3527d70233a2", + "version-string": "1.7.4.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/lzfse.json b/externals/vcpkg/versions/l-/lzfse.json new file mode 100755 index 000000000..f49ffa2bf --- /dev/null +++ b/externals/vcpkg/versions/l-/lzfse.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "cfd69474709e71cfd7aef5b4c7ee6a635435c51c", + "version-string": "1.0", + "port-version": 3 + }, + { + "git-tree": "f0e728a2522f00a38e81a3762d4face63389b053", + "version-string": "1.0-2", + "port-version": 0 + }, + { + "git-tree": "7f960140f07bbb08100db69d2f6a1520a65575b6", + "version-string": "1.0-1", + "port-version": 0 + }, + { + "git-tree": "3a6d738fbf5009b740d1e575d5df11e907ae8bb3", + "version-string": "1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/lzo.json b/externals/vcpkg/versions/l-/lzo.json new file mode 100755 index 000000000..b93eed6c0 --- /dev/null +++ b/externals/vcpkg/versions/l-/lzo.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "53ad9cb3534a54fd11bd559932edb1b5c67cd8d0", + "version-string": "2.10", + "port-version": 7 + }, + { + "git-tree": "0386bfc83656abde700f2f99732a92e7fd6ac756", + "version-string": "2.10", + "port-version": 6 + }, + { + "git-tree": "7d19bc8d305faffeba8990d9e6c095ee95b3108d", + "version-string": "2.10-5", + "port-version": 0 + }, + { + "git-tree": "18dd4e5315c0e0c8006cd9872700bf00ae77fb89", + "version-string": "2.10-4", + "port-version": 0 + }, + { + "git-tree": "98e1b10cdd1c281cfa9ba0ed00e975bdbab14e03", + "version-string": "2.10-3", + "port-version": 0 + }, + { + "git-tree": "b9e9fe0c84428518c68d23fd52cd5cb03d66df81", + "version-string": "2.10-2", + "port-version": 0 + }, + { + "git-tree": "3661a06c129607a43cb080621bd9c3752d5cafa2", + "version-string": "2.10-1", + "port-version": 0 + }, + { + "git-tree": "b118721246bea85e78adfe2f9eea17c78d8aa23f", + "version-string": "2.10", + "port-version": 0 + }, + { + "git-tree": "25007a9018c1b82f8f6190513f2073cec1a4b545", + "version-string": "2.09", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/l-/lzokay.json b/externals/vcpkg/versions/l-/lzokay.json new file mode 100755 index 000000000..8e5bd897c --- /dev/null +++ b/externals/vcpkg/versions/l-/lzokay.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "81f62a460d83d622c05245700f599c3418eed715", + "version-string": "2020-07-30", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/magic-enum.json b/externals/vcpkg/versions/m-/magic-enum.json new file mode 100755 index 000000000..445bc5af8 --- /dev/null +++ b/externals/vcpkg/versions/m-/magic-enum.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "2b170feb45c6c04a727f51a40d65fd01b5f0afdc", + "version": "0.8.0", + "port-version": 0 + }, + { + "git-tree": "1962d2e544199e80b56432fb1bd1e28c12cca3ad", + "version-string": "0.7.3", + "port-version": 1 + }, + { + "git-tree": "5ddbd41c3a32fa08982b2cf8eb7f3c13c77354d4", + "version-string": "0.7.3", + "port-version": 0 + }, + { + "git-tree": "237d596c8e4341629912912346075a1d9f65096b", + "version-string": "0.7.2", + "port-version": 0 + }, + { + "git-tree": "b216fb15c94a2693a2fe1f7fa350a8f13d11f53f", + "version-string": "0.7.1", + "port-version": 0 + }, + { + "git-tree": "22e4f23572623410198917e263553086bcdf05af", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "5969ce706dd59741d9ae9eef263775b456cbf75b", + "version-string": "0.6.6", + "port-version": 0 + }, + { + "git-tree": "6a1a5fb4e28b1c21384e01e1ab465398714724fd", + "version-string": "0.6.5", + "port-version": 0 + }, + { + "git-tree": "5d3dc2a8e966b1673ce16dffcbdff234c240e15b", + "version-string": "0.6.4", + "port-version": 0 + }, + { + "git-tree": "3e75787af06b6b5e379fc8144da8ef26438a795e", + "version-string": "0.6.3-1", + "port-version": 0 + }, + { + "git-tree": "8e70ccbe2f7a69757557e0ec507bffea76c08aff", + "version-string": "0.6.3", + "port-version": 0 + }, + { + "git-tree": "7b9bf2459f62938a8c673abdfdd4d4ab40c01140", + "version-string": "0.6.2", + "port-version": 0 + }, + { + "git-tree": "e5b6e9d9490b85a012f6f5fb53c59861a682e3b4", + "version-string": "0.6.1", + "port-version": 0 + }, + { + "git-tree": "eb40f34e2c5067e78a1263fd17d37c9303ec5748", + "version-string": "0.6.0", + "port-version": 0 + }, + { + "git-tree": "5cc4286c69a528902c5bbab5398c7e5aec160c90", + "version-string": "2019-06-07", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/magic-get.json b/externals/vcpkg/versions/m-/magic-get.json new file mode 100755 index 000000000..6fcd5f61d --- /dev/null +++ b/externals/vcpkg/versions/m-/magic-get.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "c74c7f4f5516bdfeffc916c0e72a650d65fe61fb", + "version-string": "2019-09-02", + "port-version": 2 + }, + { + "git-tree": "d6ac6dbaa833e52f6d7d259b57d644e8467fa6e0", + "version-string": "2019-09-02-1", + "port-version": 0 + }, + { + "git-tree": "2216526ad18346c355569f8a9746db2c94aa0262", + "version-string": "2019-09-02", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/magnum-extras.json b/externals/vcpkg/versions/m-/magnum-extras.json new file mode 100755 index 000000000..5dd98a616 --- /dev/null +++ b/externals/vcpkg/versions/m-/magnum-extras.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "9c71b90dfcd2a568ce69a0692c2cbb2bc3a6de80", + "version-string": "2020.06", + "port-version": 1 + }, + { + "git-tree": "5cf4f8d9e709a2381f87d14819ddbef910c7f19c", + "version-string": "2020.06", + "port-version": 0 + }, + { + "git-tree": "d6ff26a6621623a45fa4351573aceb0b77615b4e", + "version-string": "2019.10", + "port-version": 0 + }, + { + "git-tree": "a0585ba2eca1a9037d76ca606e37778c585274f9", + "version-string": "2019.01-2", + "port-version": 0 + }, + { + "git-tree": "4fc3ac52aa2c91d1995a29b6e2f8303b7c159582", + "version-string": "2019.01-1", + "port-version": 0 + }, + { + "git-tree": "32832d4877a3d9028fe72d4271b0d917aec99583", + "version-string": "2018.10-1", + "port-version": 0 + }, + { + "git-tree": "0fcee1c4e6030656452a2080b437f7ced15b3ba7", + "version-string": "2018.04-1", + "port-version": 0 + }, + { + "git-tree": "5b731d507a800901940c758bc3f4a5539d87388a", + "version-string": "2018.02-2", + "port-version": 0 + }, + { + "git-tree": "fcaa1a3b3fe7f2986c4701ff2134e275f547f33a", + "version-string": "2018.02-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/magnum-integration.json b/externals/vcpkg/versions/m-/magnum-integration.json new file mode 100755 index 000000000..7ccab489a --- /dev/null +++ b/externals/vcpkg/versions/m-/magnum-integration.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "46daa4efd5932336efa902d59660690d139eaf86", + "version-string": "2020.06", + "port-version": 1 + }, + { + "git-tree": "c76db7d967d207135ca8652f7023a29a7dbd0acc", + "version-string": "2020.06", + "port-version": 0 + }, + { + "git-tree": "1fc719443d768ee926e8bbc66a659d006c6f799c", + "version-string": "2019.10", + "port-version": 0 + }, + { + "git-tree": "5474c10ff1bedc10fc10ac6f9c268860df025062", + "version-string": "2019.01-2", + "port-version": 0 + }, + { + "git-tree": "01caa903840be2f701780f6b64974d71d4cd6278", + "version-string": "2019.01-1", + "port-version": 0 + }, + { + "git-tree": "4743bc2c4d1e86c152b264c90a21e2f27ee79172", + "version-string": "2018.10-1", + "port-version": 0 + }, + { + "git-tree": "497a1523c9ed82b07d2c3d2eadd6c311de2b3945", + "version-string": "2018.04-1", + "port-version": 0 + }, + { + "git-tree": "f621480514eb2073de1430eef091ed2d9f8c15bb", + "version-string": "2018.02-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/magnum-plugins.json b/externals/vcpkg/versions/m-/magnum-plugins.json new file mode 100755 index 000000000..f646d3094 --- /dev/null +++ b/externals/vcpkg/versions/m-/magnum-plugins.json @@ -0,0 +1,129 @@ +{ + "versions": [ + { + "git-tree": "5a4d77bfcdfaad1b288a26ad6ac7fe086e356f71", + "version-string": "2020.06", + "port-version": 8 + }, + { + "git-tree": "241189f2a82d541c88b682f409518b5802dcb39e", + "version-string": "2020.06", + "port-version": 7 + }, + { + "git-tree": "3aedbba0e9e694651549ff34fba8d6eeeb3fdde6", + "version-string": "2020.06", + "port-version": 6 + }, + { + "git-tree": "457d2fb07dd06abe61d8bdee77bc5dc1ff9391a5", + "version-string": "2020.06", + "port-version": 5 + }, + { + "git-tree": "05b4c54140907b0b46926c50e0b56bc80051b218", + "version-string": "2020.06", + "port-version": 4 + }, + { + "git-tree": "79988d3cd16038434cacef0e4423f3b2e64f0a1b", + "version-string": "2020.06", + "port-version": 3 + }, + { + "git-tree": "b9b701869c5d4f5f4203702622d2bbfa58b6517f", + "version-string": "2020.06", + "port-version": 2 + }, + { + "git-tree": "bc7aca74b45fcc3c73d3b0d051e63602c270f0b4", + "version-string": "2020.06", + "port-version": 1 + }, + { + "git-tree": "e304b1601c5af2983d465dfebdb22627ff57415d", + "version-string": "2020.06", + "port-version": 0 + }, + { + "git-tree": "d9eb35936e65c09eeecbd25d95a47ecf02721fb5", + "version-string": "2019.10-2", + "port-version": 0 + }, + { + "git-tree": "8f0d46d8eb57ad3ceb3f064572eded5e08888332", + "version-string": "2019.10-1", + "port-version": 0 + }, + { + "git-tree": "e721cd18e640536d974e2442da00e677e78fb104", + "version-string": "2019.10", + "port-version": 0 + }, + { + "git-tree": "f5f2732d5185dda0c8813d4aa318dd543de4d06c", + "version-string": "2019.01-2", + "port-version": 0 + }, + { + "git-tree": "f0f226b75fae7fc5777b12c216c984a8a296ae48", + "version-string": "2019.01-1", + "port-version": 0 + }, + { + "git-tree": "b7d6885b19addc1a9f8800cce02972ed395fcd05", + "version-string": "2018.10-1", + "port-version": 0 + }, + { + "git-tree": "7c37dff60ec4814e56fc3ead712b6f1a157d1210", + "version-string": "2018.04-1", + "port-version": 0 + }, + { + "git-tree": "28aec10970796b877515c9d4a69625466cc5de31", + "version-string": "2018.02-2", + "port-version": 0 + }, + { + "git-tree": "364bb1be74111519012b68bb29813d65145bfe8a", + "version-string": "2018.02-1", + "port-version": 0 + }, + { + "git-tree": "39954a77d2b913d039d78d12780855e3b4ee9beb", + "version-string": "jan2018-1", + "port-version": 0 + }, + { + "git-tree": "4c17387a0d1ac983428c880a8becb03287a8fdcd", + "version-string": "jun2017-5", + "port-version": 0 + }, + { + "git-tree": "44787d3c100654d2bd1aac17cfb4322c879eca13", + "version-string": "jun2017-4", + "port-version": 0 + }, + { + "git-tree": "eda85e5b703cddecb4b48cb8ba498c4a6109e35f", + "version-string": "jun2017-3", + "port-version": 0 + }, + { + "git-tree": "dfae148d64586ffd4a75fbf6fc81c901452166ae", + "version-string": "jun2017-2", + "port-version": 0 + }, + { + "git-tree": "050a7a0e0c527549ef341f7e824baf51d522814c", + "version-string": "jun2017-1", + "port-version": 0 + }, + { + "git-tree": "3d29bec696bc176f6bde382887eedc025d095978", + "version-string": "jun2017", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/magnum.json b/externals/vcpkg/versions/m-/magnum.json new file mode 100755 index 000000000..f4ee5a923 --- /dev/null +++ b/externals/vcpkg/versions/m-/magnum.json @@ -0,0 +1,124 @@ +{ + "versions": [ + { + "git-tree": "bb2fc062b29313fd1d23a656464fb3dd2b983370", + "version-string": "2020.06", + "port-version": 9 + }, + { + "git-tree": "f68058291469a1b9d3c62e766279c8f00cd479ec", + "version-string": "2020.06", + "port-version": 8 + }, + { + "git-tree": "02916da34e2db9343355653309cbab7d8ff85f21", + "version-string": "2020.06", + "port-version": 7 + }, + { + "git-tree": "f420e42c1b841b4f3b2f2cda488a35f68b0677d7", + "version-string": "2020.06", + "port-version": 6 + }, + { + "git-tree": "cb97c301133d04f205cb1547e5559341474f842e", + "version-string": "2020.06", + "port-version": 5 + }, + { + "git-tree": "96fbedbdb7cac5cb1624af746d6e4b2cb4b57cc8", + "version-string": "2020.06", + "port-version": 4 + }, + { + "git-tree": "84fd6db3cf53cfcb736bfb14b08b86940f5588e1", + "version-string": "2020.06", + "port-version": 3 + }, + { + "git-tree": "e7a2404e1104325d881715e65459dd3c8a450489", + "version-string": "2020.06", + "port-version": 2 + }, + { + "git-tree": "d0765f78f04d3fcc97787f34258657aca1ddf467", + "version-string": "2020.06", + "port-version": 1 + }, + { + "git-tree": "3a2d890b046287f96090033de33c562993df237b", + "version-string": "2020.06", + "port-version": 0 + }, + { + "git-tree": "aff46081bab36af8e89908a8049ffd9a83e2526b", + "version-string": "2019.10-2", + "port-version": 0 + }, + { + "git-tree": "8222d973157c75223622776c6d5c1b3693383d5c", + "version-string": "2019.01-1", + "port-version": 0 + }, + { + "git-tree": "e49e8fb82d0524872bbe45cdb6e8ec825d7f1913", + "version-string": "2018.10-1", + "port-version": 0 + }, + { + "git-tree": "bb19aa7151d59c4951c39ee59b9e2966e8b639d1", + "version-string": "2018.04-1", + "port-version": 0 + }, + { + "git-tree": "5c56adde8c0812ab4bfda2a9aad7d23d6dc5e06b", + "version-string": "2018.02-2", + "port-version": 0 + }, + { + "git-tree": "7c3b0802c78047d6ccc09e73771a758b5f9dda0a", + "version-string": "2018.02-1", + "port-version": 0 + }, + { + "git-tree": "1764a1a71207f490c2ee4256f08152c4396cdda6", + "version-string": "jan2018-1", + "port-version": 0 + }, + { + "git-tree": "c268637925501b9349249c694bc2f5c72fb897b8", + "version-string": "jun2017-6", + "port-version": 0 + }, + { + "git-tree": "f11172d75c0f1895a0880cbecfccd040b2a9ce11", + "version-string": "jun2017-5", + "port-version": 0 + }, + { + "git-tree": "6fea6b6ab8ed9c74fe27b12a71bb3498bc31648a", + "version-string": "jun2017-4", + "port-version": 0 + }, + { + "git-tree": "7aaae166bd4e6066b9cfe1e01140d8fd74947dbd", + "version-string": "jun2017-3", + "port-version": 0 + }, + { + "git-tree": "0af5087dbaf3fa8165f8fa4ff616f9fb28e1aaa9", + "version-string": "jun2017-2", + "port-version": 0 + }, + { + "git-tree": "bfc5a7c177c22b8ade6120f99486365095fe221d", + "version-string": "jun2017-1", + "port-version": 0 + }, + { + "git-tree": "4471dfe83e80cace12baeb443518e203a296a426", + "version-string": "jun2017", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mailio.json b/externals/vcpkg/versions/m-/mailio.json new file mode 100755 index 000000000..505193296 --- /dev/null +++ b/externals/vcpkg/versions/m-/mailio.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "a9f20b309b2d9f68c5e10eb193ef19c3c51a3faa", + "version": "0.21.0", + "port-version": 2 + }, + { + "git-tree": "80186942edc09cad3c911ebbc6dd77d30af68502", + "version": "0.21.0", + "port-version": 1 + }, + { + "git-tree": "cd8eea3c3ba5b6d465f5c799861571294c795d50", + "version": "0.21.0", + "port-version": 0 + }, + { + "git-tree": "452f51edc1d79104f3cf968477176d155666cb46", + "version": "0.20.0", + "port-version": 2 + }, + { + "git-tree": "819040f9644957f597a2429bb3365cbf4f58e35d", + "version": "0.20.0", + "port-version": 1 + }, + { + "git-tree": "d0031c324fcbf44f0af73cb045551c01c5cc21e3", + "version": "0.20.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mapbox-geojson-cpp.json b/externals/vcpkg/versions/m-/mapbox-geojson-cpp.json new file mode 100755 index 000000000..954f76129 --- /dev/null +++ b/externals/vcpkg/versions/m-/mapbox-geojson-cpp.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "62c28d375da068349db5185f5353728cfb0603a0", + "version-semver": "0.5.1", + "port-version": 1 + }, + { + "git-tree": "b49d52ff8e08ce5985c91e3690bf7a9866823bc1", + "version-semver": "0.5.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mapbox-geojson-vt-cpp.json b/externals/vcpkg/versions/m-/mapbox-geojson-vt-cpp.json new file mode 100755 index 000000000..f270a2459 --- /dev/null +++ b/externals/vcpkg/versions/m-/mapbox-geojson-vt-cpp.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "93dae1428f22ec1cbd1ad8fa45427a78528a96be", + "version-semver": "6.6.5", + "port-version": 0 + }, + { + "git-tree": "61a9b2210212dbddceb433d2f61baa1da834ca8c", + "version-semver": "6.6.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mapbox-geometry.json b/externals/vcpkg/versions/m-/mapbox-geometry.json new file mode 100755 index 000000000..723cd74d0 --- /dev/null +++ b/externals/vcpkg/versions/m-/mapbox-geometry.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ad46e4919724e089e2644999d7a93cac6beff79e", + "version-semver": "2.0.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mapbox-polylabel.json b/externals/vcpkg/versions/m-/mapbox-polylabel.json new file mode 100755 index 000000000..73bded4c3 --- /dev/null +++ b/externals/vcpkg/versions/m-/mapbox-polylabel.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "964316686ad04d8fca92d15be807161886935979", + "version-semver": "1.0.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mapbox-variant.json b/externals/vcpkg/versions/m-/mapbox-variant.json new file mode 100755 index 000000000..99c66d762 --- /dev/null +++ b/externals/vcpkg/versions/m-/mapbox-variant.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "33967b083c32aab183281126cde3fdab878e71be", + "version-string": "1.2.0", + "port-version": 1 + }, + { + "git-tree": "c81bffd9497b08091cff4be8db0d2ec378a2adc2", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "71d32704478989baa182990af172f2564fe5d3d6", + "version-string": "1.1.6-0f734f0-1", + "port-version": 0 + }, + { + "git-tree": "2cfef5bd1a4212e5843ba6ed36a0cfbab0c34503", + "version-string": "1.1.6-0f734f0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mapbox-wagyu.json b/externals/vcpkg/versions/m-/mapbox-wagyu.json new file mode 100755 index 000000000..8efd1e5f0 --- /dev/null +++ b/externals/vcpkg/versions/m-/mapbox-wagyu.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "84cb6917fd5563c88998e47c219f429e05aea9d5", + "version-semver": "0.5.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mapnik.json b/externals/vcpkg/versions/m-/mapnik.json new file mode 100755 index 000000000..7f11caf03 --- /dev/null +++ b/externals/vcpkg/versions/m-/mapnik.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "dd7ab22238efd828be89e8e17677aa5b395ac07b", + "version-date": "2022-01-28", + "port-version": 2 + }, + { + "git-tree": "ab089220fb5ecc215804a68c2122d3e0d3ed58bc", + "version-date": "2022-01-28", + "port-version": 1 + }, + { + "git-tree": "f352e6316057a4b1751482bd75dd9793aa92771a", + "version-date": "2022-01-28", + "port-version": 0 + }, + { + "git-tree": "e067081de907e0344717281f8d689421621d1798", + "version-date": "2021-12-14", + "port-version": 0 + }, + { + "git-tree": "3f8eb08ffc7a02dd08de30c0851587d9537fc72e", + "version-date": "2021-11-15", + "port-version": 1 + }, + { + "git-tree": "d1ae6b45aea26d1bbed2716beaaaeaf3719fbefa", + "version-date": "2021-11-15", + "port-version": 0 + }, + { + "git-tree": "1702be859d2d61c42ba67c3d4e2c474db6a2d874", + "version-date": "2021-10-18", + "port-version": 0 + }, + { + "git-tree": "b7f061c560ab0a4c5c137f88ab43826c05ece6ad", + "version-date": "2021-10-13", + "port-version": 0 + }, + { + "git-tree": "d75a684e7f654d0fc2485c4fa501a8821056c92b", + "version-date": "2021-09-15", + "port-version": 1 + }, + { + "git-tree": "794329d32e3af221bb8751cf747f354d087fceab", + "version-date": "2021-09-15", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/marble.json b/externals/vcpkg/versions/m-/marble.json new file mode 100755 index 000000000..b7507773f --- /dev/null +++ b/externals/vcpkg/versions/m-/marble.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "7a6e4d655adaa7043e8b347841b11472c9b36a6a", + "version-string": "22.04.0", + "port-version": 0 + }, + { + "git-tree": "eb15f05858eaff46b5d7b142d3c874f889d26557", + "version-string": "19.08.2", + "port-version": 3 + }, + { + "git-tree": "882d37f618c122d3484dcb02cb4f35ead8580768", + "version-string": "19.08.2", + "port-version": 2 + }, + { + "git-tree": "753693b3e64d7baedd61a8f57b62e467267bc741", + "version-string": "19.08.2", + "port-version": 1 + }, + { + "git-tree": "6da05bd09e0eb41ee05e3269fab2283c5dab2d4c", + "version-string": "19.08.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/marl.json b/externals/vcpkg/versions/m-/marl.json new file mode 100755 index 000000000..fe8b7b988 --- /dev/null +++ b/externals/vcpkg/versions/m-/marl.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "b6430e8be3b742d1466c45570a5d4946c427dd25", + "version-date": "2022-03-02", + "port-version": 0 + }, + { + "git-tree": "fd57df5a81ab5870018fd3d288922a14a235fcc4", + "version-date": "2021-04-25", + "port-version": 1 + }, + { + "git-tree": "455a779684efcee90811a7a1d2a86ba1b29a8996", + "version-date": "2021-04-25", + "port-version": 0 + }, + { + "git-tree": "1bbc3159a32ef547939ca19e4369fb3b4d87b381", + "version-string": "2020-10-10", + "port-version": 0 + }, + { + "git-tree": "b52700536625ef3dcbcfc92ce11873c80717c1f9", + "version-string": "2020-06-30", + "port-version": 0 + }, + { + "git-tree": "a257ede7bf6c1d06c6483cbeb92e1d47e8245f6b", + "version-string": "2020-05-21", + "port-version": 0 + }, + { + "git-tree": "c1cf565178b637ba3841417b04f9acfc3e68e793", + "version-string": "2019-09-13", + "port-version": 0 + }, + { + "git-tree": "af49f48eab81d7441bb9ee81e8aee29681cdd7a9", + "version-string": "2019-09-11", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/materialx.json b/externals/vcpkg/versions/m-/materialx.json new file mode 100755 index 000000000..b2b5b2346 --- /dev/null +++ b/externals/vcpkg/versions/m-/materialx.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f0dc3a4ac664a5b4fe18a946a35965b519c148e7", + "version": "1.38.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mathc.json b/externals/vcpkg/versions/m-/mathc.json new file mode 100755 index 000000000..1637430f0 --- /dev/null +++ b/externals/vcpkg/versions/m-/mathc.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "48feea0350aedda2b2e7470bdb52e3c6b215688a", + "version-string": "2019-09-29", + "port-version": 1 + }, + { + "git-tree": "ce8f1f68bcb55109aabea4ccfb17c3a3cbde5ef2", + "version-string": "2019-09-29", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mathgl.json b/externals/vcpkg/versions/m-/mathgl.json new file mode 100755 index 000000000..f1cb188ae --- /dev/null +++ b/externals/vcpkg/versions/m-/mathgl.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "d75f46bbb8d518f326f688d355d5e9d241f44dc6", + "version": "2.5", + "port-version": 0 + }, + { + "git-tree": "27b4e9bc3b747e8c53489a5ef16b85a3f6035504", + "version": "2.4.3", + "port-version": 8 + }, + { + "git-tree": "4af49c54047fc9b315b888d5f51aef8748aba132", + "version-string": "2.4.3", + "port-version": 7 + }, + { + "git-tree": "73c110a8763070c78749ce041eea862716bba72a", + "version-string": "2.4.3-6", + "port-version": 0 + }, + { + "git-tree": "3e59024e040721ab61c27d837f78e9a5119a92d8", + "version-string": "2.4.3-4", + "port-version": 0 + }, + { + "git-tree": "fd2ee1a2603d27429390cc86df76336f911af7ab", + "version-string": "2.4.3-3", + "port-version": 0 + }, + { + "git-tree": "63db933f885df3e5c7fb98008f2820162ed85023", + "version-string": "2.4.3-2", + "port-version": 0 + }, + { + "git-tree": "36e575a97241ad0dc3cdf3c9d2f08d1a67826238", + "version-string": "2.4.3-1", + "port-version": 0 + }, + { + "git-tree": "cc5ee5da5e89b23de1d12406743b9cdef1820395", + "version-string": "2.4.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/matio.json b/externals/vcpkg/versions/m-/matio.json new file mode 100755 index 000000000..472498c79 --- /dev/null +++ b/externals/vcpkg/versions/m-/matio.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "e018403a4c2e749f8983b6a64f60dac577342853", + "version-semver": "1.5.23", + "port-version": 0 + }, + { + "git-tree": "c11c8ba1ca5c7f0286165d497088779ec0df756a", + "version-semver": "1.5.19", + "port-version": 1 + }, + { + "git-tree": "09b997c5cb31fdde33faf650612324a847967360", + "version-string": "1.5.19", + "port-version": 0 + }, + { + "git-tree": "90525e6933ec5814eced741e449185df46f158ea", + "version-string": "1.5.17", + "port-version": 0 + }, + { + "git-tree": "51008ed05402590cb34acdb1e14e1c5267cd7d7f", + "version-string": "1.5.16", + "port-version": 0 + }, + { + "git-tree": "772c683699f2fd843463088e14c5cca8d63e9dcd", + "version-string": "1.5.15", + "port-version": 0 + }, + { + "git-tree": "ea45bf0ddf8c87893b8b35ffe3a6699bdad7a063", + "version-string": "1.5.13-1", + "port-version": 0 + }, + { + "git-tree": "70aaab37332653f2ebb2f1afcabff825c7d43ab2", + "version-string": "1.5.13", + "port-version": 0 + }, + { + "git-tree": "773a0408bc425094dff587f0a938a177cc61a83d", + "version-string": "1.5.12", + "port-version": 0 + }, + { + "git-tree": "89e6a50f8dcccbb0c0104fec14abf6ff9ff58ed2", + "version-string": "1.5.11", + "port-version": 0 + }, + { + "git-tree": "f14dbb2ce5da2d12b12c3040f6e2250ad9eacd19", + "version-string": "1.5.10-2", + "port-version": 0 + }, + { + "git-tree": "c716967775f6374e867ac6ca2a06eddf6e739c2b", + "version-string": "1.5.10-1", + "port-version": 0 + }, + { + "git-tree": "d1b799f0093084fbc9e5c22e0cac7f8b27e36c98", + "version-string": "1.5.10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/matplotlib-cpp.json b/externals/vcpkg/versions/m-/matplotlib-cpp.json new file mode 100755 index 000000000..f237470b3 --- /dev/null +++ b/externals/vcpkg/versions/m-/matplotlib-cpp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "baade687391a8a12d426361c378e7c1ee31d1182", + "version-string": "2020-08-27", + "port-version": 1 + }, + { + "git-tree": "fc40bac37aa51944e6e4d1b63dbaaef56651adf7", + "version-string": "2020-08-27", + "port-version": 0 + }, + { + "git-tree": "0e4ff7aa1521101bf97ec1f0a81407f9d1a92509", + "version-string": "2019-09-24", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/matplotplusplus.json b/externals/vcpkg/versions/m-/matplotplusplus.json new file mode 100755 index 000000000..8dc2b38c2 --- /dev/null +++ b/externals/vcpkg/versions/m-/matplotplusplus.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "8554ae7ec807245bdcd27b44ddebd39608edfe53", + "version-date": "2021-04-11", + "port-version": 6 + }, + { + "git-tree": "e0496a49614d3fc1f77f20f230b3168720140c3b", + "version-date": "2021-04-11", + "port-version": 5 + }, + { + "git-tree": "ee89d0f23b11e362fb9e65670377c47b35ffea6c", + "version-date": "2021-04-11", + "port-version": 4 + }, + { + "git-tree": "e60b72bfb17b3263a7ee1e056af221991f5c7d69", + "version-date": "2021-04-11", + "port-version": 3 + }, + { + "git-tree": "6b6b0deac894d376c04b11f3f01a26952b97b0b1", + "version-date": "2021-04-11", + "port-version": 2 + }, + { + "git-tree": "1daed23f0dc56cccb47adb60cee246cac3d8cdbd", + "version-date": "2021-04-11", + "port-version": 1 + }, + { + "git-tree": "e4cf18b9e9c16d294f966bae3d1d89ecd698a47f", + "version-date": "2021-04-11", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/matroska.json b/externals/vcpkg/versions/m-/matroska.json new file mode 100755 index 000000000..8bf36eb8f --- /dev/null +++ b/externals/vcpkg/versions/m-/matroska.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "4f42c70e6e7b730f43e59e3dd7e0b4b8e7e7abd8", + "version": "1.6.3", + "port-version": 0 + }, + { + "git-tree": "6f1a45086676ff21d75b117b36ae0a3b75e88feb", + "version-string": "1.6.2", + "port-version": 1 + }, + { + "git-tree": "621952db117431abe06ab8ec62f509ab812d239d", + "version-string": "1.6.2", + "port-version": 0 + }, + { + "git-tree": "e61d04c623257948c14a329a193005d310f62cbe", + "version-string": "1.5.2", + "port-version": 0 + }, + { + "git-tree": "b4727e0e08634c4abb16766c4bf43e02aea53549", + "version-string": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "e9b74b1491fe3e58ff8a903f2c738852b77bd829", + "version-string": "1.5.0-51648bb", + "port-version": 0 + }, + { + "git-tree": "aadf97900b05b95f724ebe0c03d234cb2e66f201", + "version-string": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "81ead1689968284e1ed9f375b30f74d1481d96ae", + "version-string": "1.4.9-1", + "port-version": 0 + }, + { + "git-tree": "e0941a55d608f8f0a138224d1ae1ac1f090caa55", + "version-string": "1.4.9", + "port-version": 0 + }, + { + "git-tree": "ad3b1a16b5a01ff6a6ce88b78bae98a394d84ef6", + "version-string": "1.4.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mbedtls.json b/externals/vcpkg/versions/m-/mbedtls.json new file mode 100755 index 000000000..440fc362e --- /dev/null +++ b/externals/vcpkg/versions/m-/mbedtls.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "50e6870207f6a1f0b1e2197978b4403de775eac2", + "version": "2.28.0", + "port-version": 0 + }, + { + "git-tree": "676b36c2f6fc72a2fbbbe521ae46fdefe5db67ca", + "version": "2.24.0", + "port-version": 4 + }, + { + "git-tree": "a68475211755b3999de8cb2ec1d2fdfe9bb8ab10", + "version-string": "2.24.0", + "port-version": 3 + }, + { + "git-tree": "f1591b930b769b43c14a193282eb85e9a7c51a47", + "version-string": "2.24.0", + "port-version": 2 + }, + { + "git-tree": "8b510a700284731a6f552ff2cd874794af4032ff", + "version-string": "2.24.0", + "port-version": 1 + }, + { + "git-tree": "d5a4ee1c525b9ac5197b86bfe553a1909ce9afba", + "version-string": "2.24.0", + "port-version": 0 + }, + { + "git-tree": "a35e1a54c5d31e8ccab0117701402c9def267cdc", + "version-string": "2.16.3-1", + "port-version": 0 + }, + { + "git-tree": "7ad457ed5e067dc3b10a43c0820be065d081e242", + "version-string": "2.16.3", + "port-version": 0 + }, + { + "git-tree": "3c353cbdd327d54fe0b94e5ca8395b8c4a184f31", + "version-string": "2.16.2", + "port-version": 0 + }, + { + "git-tree": "0e219bef6b56d1650c6b21b604383861d397cad7", + "version-string": "2.15.1", + "port-version": 0 + }, + { + "git-tree": "eb1ec65bc6251b470991182e2184dc5c575169e3", + "version-string": "2.13.1", + "port-version": 0 + }, + { + "git-tree": "8576d9c7a8e92c598c0a47950f71bd4e50cbb2b3", + "version-string": "2.12.0", + "port-version": 0 + }, + { + "git-tree": "d151786b2020882f2711b617872b7f13234bd03a", + "version-string": "2.6.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mcpp.json b/externals/vcpkg/versions/m-/mcpp.json new file mode 100755 index 000000000..695c914c7 --- /dev/null +++ b/externals/vcpkg/versions/m-/mcpp.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "beca539b781c4a50d092a4b02e9b2af455f14b40", + "version-string": "2.7.2.14", + "port-version": 3 + }, + { + "git-tree": "b5a0f89ae5e856ba0a4f3289230f2df88c4a028c", + "version-string": "2.7.2.14", + "port-version": 2 + }, + { + "git-tree": "c7f1674a923779970b8e0ba8da0e73f776e0f8e7", + "version-string": "2.7.2.14-1", + "port-version": 0 + }, + { + "git-tree": "848a7a4fbf7283399af7eec484ec30ce41c0603c", + "version-string": "2.7.2.14", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mdns.json b/externals/vcpkg/versions/m-/mdns.json new file mode 100755 index 000000000..1f40a43a9 --- /dev/null +++ b/externals/vcpkg/versions/m-/mdns.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "56cbde1a40c13e9584e62d15f69c2579f6bcd476", + "version": "1.4.2", + "port-version": 0 + }, + { + "git-tree": "4983c367da3c0798e1e0a7b9d8844eeba57c5b97", + "version": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "9c60d4da58f24c63fd92500fcb516adb157cb180", + "version-string": "1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mdnsresponder.json b/externals/vcpkg/versions/m-/mdnsresponder.json new file mode 100755 index 000000000..f410f5208 --- /dev/null +++ b/externals/vcpkg/versions/m-/mdnsresponder.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "3a57c5a00a432c5f54ca26ddf0a1ea7298364e55", + "version": "878.270.2", + "port-version": 1 + }, + { + "git-tree": "0feece31cd1ade61b7f16a0a23880d3b29ad3eb4", + "version": "878.270.2", + "port-version": 0 + }, + { + "git-tree": "a9fb04c2649c37b42f0566c79c795d874d053df6", + "version-string": "765.30.11", + "port-version": 4 + }, + { + "git-tree": "6e48b77ecbfe0e11101526c0ed9b7e798bf66055", + "version-string": "765.30.11", + "port-version": 3 + }, + { + "git-tree": "7f6dd0b8040f0c096665760817567b4231321cb4", + "version-string": "765.30.11-2", + "port-version": 0 + }, + { + "git-tree": "fd16474a00b14d1a53eaf6f5cc47a9b6c4ed4f2d", + "version-string": "765.30.11-1", + "port-version": 0 + }, + { + "git-tree": "1d781c8504bbe47f5c94f0b9b15b6e6429c3d8bb", + "version-string": "765.30.11", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mdspan.json b/externals/vcpkg/versions/m-/mdspan.json new file mode 100755 index 000000000..3eb709742 --- /dev/null +++ b/externals/vcpkg/versions/m-/mdspan.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3e312b5c0220a832b0deebd7478f044481ebe79c", + "version-date": "2021-11-03", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mecab.json b/externals/vcpkg/versions/m-/mecab.json new file mode 100755 index 000000000..aabc6ec2c --- /dev/null +++ b/externals/vcpkg/versions/m-/mecab.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "b5a2f4cbcaaa4aac05dc3c6ab814cf8db0047aab", + "version-string": "2019-09-25", + "port-version": 2 + }, + { + "git-tree": "1b2b6811a11c4dfd156f3ebccb2c83660e93ce1a", + "version-string": "2019-09-25", + "port-version": 1 + }, + { + "git-tree": "27ea103fdd9a484dc2e9cb633440a6b4e89a4972", + "version-string": "1.0", + "port-version": 0 + }, + { + "git-tree": "43ff41bd626c7ac87a515a7de9fcfac94a2f6cd1", + "version-string": "0.996", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/memorymodule.json b/externals/vcpkg/versions/m-/memorymodule.json new file mode 100755 index 000000000..990365470 --- /dev/null +++ b/externals/vcpkg/versions/m-/memorymodule.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "f7818f51e182a651a0b090ea0d315c32b928d7c3", + "version-string": "2019-12-31", + "port-version": 2 + }, + { + "git-tree": "55a786b4bc6d55f353749c06afa40b809ff8c9c4", + "version-string": "2019-12-31", + "port-version": 1 + }, + { + "git-tree": "20dc022d60890deec31c30e530881cf972c15253", + "version-string": "2019-12-31", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mesa.json b/externals/vcpkg/versions/m-/mesa.json new file mode 100755 index 000000000..47f3b1968 --- /dev/null +++ b/externals/vcpkg/versions/m-/mesa.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "7df282d97d0ef5ec5a19b770dced8cd773e570c0", + "version": "22.0.2", + "port-version": 0 + }, + { + "git-tree": "32925250dd7d2e060ca2cfe9fbda1d3f4312f29a", + "version": "21.2.5", + "port-version": 4 + }, + { + "git-tree": "aa75375f1cc9c3c4697c8fa8df4e647fb60f0125", + "version": "21.2.5", + "port-version": 3 + }, + { + "git-tree": "60ae9e5d7081930a0e736be1742db18b01a0114b", + "version": "21.2.5", + "port-version": 2 + }, + { + "git-tree": "9318298d8532439ec65868f7b1997f2b8d49fec5", + "version": "21.2.5", + "port-version": 1 + }, + { + "git-tree": "55d54a8cf6adc14ea9d2ac84621f75295a367a07", + "version": "21.2.5", + "port-version": 0 + }, + { + "git-tree": "5308d779b4070c295771c630e4b2251582e16d0c", + "version": "21.2.0", + "port-version": 1 + }, + { + "git-tree": "931291396b7abd6c8fcdf7d6e995782dfa64bb80", + "version": "21.2.0", + "port-version": 0 + }, + { + "git-tree": "315d3fe5a64b2a34efeb9caee72c7922bc48c148", + "version": "21.1.6", + "port-version": 0 + }, + { + "git-tree": "58f52d4a0724c6d4d393b48e232ca323d8670df6", + "version": "21.1.2", + "port-version": 0 + }, + { + "git-tree": "2966b4bb6816c1fa46e65c61f4cb30efb5c8381a", + "version-string": "20.2.2", + "port-version": 1 + }, + { + "git-tree": "9b75570d3f7a9cb58ff7c7c8479bbfb7e745d0d2", + "version-string": "20.2.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/meschach.json b/externals/vcpkg/versions/m-/meschach.json new file mode 100755 index 000000000..abd1ed099 --- /dev/null +++ b/externals/vcpkg/versions/m-/meschach.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "e475a3306653b4ab8f50dc691dff3f7fda152b83", + "version-string": "1.2b", + "port-version": 5 + }, + { + "git-tree": "11c21ca45a95bf05d74344c2518e3a9d107da566", + "version-string": "1.2b", + "port-version": 4 + }, + { + "git-tree": "6eb1cef7299cd3f060fd21c526ab29a8553766c2", + "version-string": "1.2b-3", + "port-version": 0 + }, + { + "git-tree": "f2b877ed05d0f8dd99a4c38c871af615c5d43a6f", + "version-string": "1.2b-2", + "port-version": 0 + }, + { + "git-tree": "48330b77a37966bed0af28532a60ffd26ea9a07b", + "version-string": "1.2b-1", + "port-version": 0 + }, + { + "git-tree": "cf683451daf6f53d690f7a3c08f0dae046ea4607", + "version-string": "1.2b", + "port-version": 0 + }, + { + "git-tree": "0071e5670fb051a6527270adb65c32e5257c7880", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/meshoptimizer.json b/externals/vcpkg/versions/m-/meshoptimizer.json new file mode 100755 index 000000000..57964ad9d --- /dev/null +++ b/externals/vcpkg/versions/m-/meshoptimizer.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "a1693991d70ae383ea21f4f634f8d0f136e15bd7", + "version": "0.16", + "port-version": 0 + }, + { + "git-tree": "f565fc6b5cc9a3c133af9193a7d06915cf9b6845", + "version-string": "0.14", + "port-version": 2 + }, + { + "git-tree": "b1e3e0ab70cf603738e55b8725d7ec834e7abfa6", + "version-string": "0.14", + "port-version": 1 + } + ] +} diff --git a/externals/vcpkg/versions/m-/metis.json b/externals/vcpkg/versions/m-/metis.json new file mode 100755 index 000000000..82f7ccab1 --- /dev/null +++ b/externals/vcpkg/versions/m-/metis.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "f3670208e9dc0b726c3c009e37f2398b7f2acca3", + "version-string": "5.1.0", + "port-version": 8 + }, + { + "git-tree": "b3ad4e99935fca4e79b5df63fb7a055686b4cf42", + "version-string": "5.1.0", + "port-version": 7 + }, + { + "git-tree": "d4ddb63ce08cbf4b68b13c30dff8e15079891fc5", + "version-string": "5.1.0-6", + "port-version": 0 + }, + { + "git-tree": "3d0e6109b7ee6c387ed8aceabc60ba9ab50f553d", + "version-string": "5.1.0-5", + "port-version": 0 + }, + { + "git-tree": "2399084f267f45cfce5d4c074cce41cfb3a25e11", + "version-string": "5.1.0-4", + "port-version": 0 + }, + { + "git-tree": "f8b89081de4ab5fe76770c16da184363f5ee4635", + "version-string": "5.1.0-3", + "port-version": 0 + }, + { + "git-tree": "9953e84f10ee672b75a23782cda06c44ae7eb8e6", + "version-string": "5.1.0-2", + "port-version": 0 + }, + { + "git-tree": "b1c5112b22a2aa3be648be48a372c221630298c1", + "version-string": "5.1.0-1", + "port-version": 0 + }, + { + "git-tree": "b3a13b3bd1dc0f1c47ccabb973523784d9f4d763", + "version-string": "5.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/metrohash.json b/externals/vcpkg/versions/m-/metrohash.json new file mode 100755 index 000000000..56847f9fb --- /dev/null +++ b/externals/vcpkg/versions/m-/metrohash.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "777a0ee61fdc53dcad0971184232d29b58e52f63", + "version": "1.1.3", + "port-version": 4 + }, + { + "git-tree": "33078163f0311cfecce47b42c304650b602c9ddf", + "version-string": "1.1.3", + "port-version": 3 + }, + { + "git-tree": "0c764c9b22fa64b5194e65f69bfb28bc47dc20fc", + "version-string": "1.1.3", + "port-version": 2 + }, + { + "git-tree": "e322e34deeeb1ae533217d85ceea0b6ad36ec64e", + "version-string": "1.1.3-1", + "port-version": 0 + }, + { + "git-tree": "031ee83acafc765e853c3d1912456aca0213b08e", + "version-string": "1.1.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mfl.json b/externals/vcpkg/versions/m-/mfl.json new file mode 100755 index 000000000..37f979762 --- /dev/null +++ b/externals/vcpkg/versions/m-/mfl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a01a0e6d38ab404c3ae58d21d734969a089ef82c", + "version": "0.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mgnlibs.json b/externals/vcpkg/versions/m-/mgnlibs.json new file mode 100755 index 000000000..ae2cc30ba --- /dev/null +++ b/externals/vcpkg/versions/m-/mgnlibs.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "4a611255e7ec6133fd9167e7db71227a7da8dd22", + "version-string": "2019-09-29", + "port-version": 1 + }, + { + "git-tree": "8672ed7edb6bb28df31224f1ff62ea68bbb6abf2", + "version-string": "2019-09-29", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mhook.json b/externals/vcpkg/versions/m-/mhook.json new file mode 100755 index 000000000..40c74d9b3 --- /dev/null +++ b/externals/vcpkg/versions/m-/mhook.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "5f4f5f56588f1c2b391e6c8766a4fa4dd713514d", + "version": "2.5.1", + "port-version": 3 + }, + { + "git-tree": "63acd5f7a94d6b86d9fb2b3642e0fbd253f21e47", + "version-string": "2.5.1", + "port-version": 2 + }, + { + "git-tree": "8f4768d6f5dfac779008faae0a807dd6f9c23129", + "version-string": "2.5.1-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/microsoft-signalr.json b/externals/vcpkg/versions/m-/microsoft-signalr.json new file mode 100755 index 000000000..3a7cdf9a9 --- /dev/null +++ b/externals/vcpkg/versions/m-/microsoft-signalr.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "f95ed360cce7fb3a2acd3684ba74619ebc1d75a3", + "version-string": "0.1.0-alpha3", + "port-version": 1 + }, + { + "git-tree": "4d840951b02dde36c320872fb7e64c1e89e7aa7d", + "version-string": "0.1.0-alpha3", + "port-version": 0 + }, + { + "git-tree": "6035b3729564e1a85d60cc322d5dda0ea16d858d", + "version-string": "0.1.0-alpha2", + "port-version": 0 + }, + { + "git-tree": "f713853a4b9a4cab2c7c26abd868b1b04fc47bec", + "version-string": "0.1.0-alpha1", + "port-version": 2 + }, + { + "git-tree": "8e2e8e6ad6f5c7b8da3d6cbb06f54278dd34e47e", + "version-string": "0.1.0-alpha1-1", + "port-version": 0 + }, + { + "git-tree": "638cf1f219fe97126a05dfd3cfc5f50edc0b85e7", + "version-string": "0.1.0-alpha1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mikktspace.json b/externals/vcpkg/versions/m-/mikktspace.json new file mode 100755 index 000000000..7e7038554 --- /dev/null +++ b/externals/vcpkg/versions/m-/mikktspace.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "28fd852185e2def3476be4d85d4643e1a90204ee", + "version-string": "2020-10-06", + "port-version": 1 + }, + { + "git-tree": "859afcd720d96f2d3eae712a4df2e87c7a0a7723", + "version-string": "2020-10-06", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/milerius-sfml-imgui.json b/externals/vcpkg/versions/m-/milerius-sfml-imgui.json new file mode 100755 index 000000000..90859a944 --- /dev/null +++ b/externals/vcpkg/versions/m-/milerius-sfml-imgui.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "4bfc198df4803019e174c0489fcc91e178f66930", + "version": "1.1", + "port-version": 4 + }, + { + "git-tree": "ecf4d9fd039390613094ab42564601f32f9982c3", + "version-string": "1.1", + "port-version": 3 + }, + { + "git-tree": "a4143f10f8cf6b5d8d25626961e56fec4cb3c706", + "version-string": "1.1-2", + "port-version": 0 + }, + { + "git-tree": "af7d10ad6b2e69105dc6e7d3407b67bbad2bd8d0", + "version-string": "1.1-1", + "port-version": 0 + }, + { + "git-tree": "1a8cdb6bf3f610b40a412d89e6126af97111c581", + "version-string": "1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mimalloc.json b/externals/vcpkg/versions/m-/mimalloc.json new file mode 100755 index 000000000..cf9938722 --- /dev/null +++ b/externals/vcpkg/versions/m-/mimalloc.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "e5d0b88ffbb864754eb8b01ac111f84adb8a36a8", + "version": "2.0.6", + "port-version": 0 + }, + { + "git-tree": "e4dc5fc89e8c1f860b9f07b3d449a5d67f56cfd4", + "version": "2.0.5", + "port-version": 1 + }, + { + "git-tree": "370692d9dc2cb2bc9f013041003e069e47febb67", + "version": "2.0.5", + "port-version": 0 + }, + { + "git-tree": "e68a15fa535a3dcf4a1dba0f277eb239cc27b863", + "version": "2.0.3", + "port-version": 2 + }, + { + "git-tree": "0b8064b8481fdeb88e2b4933c485ea0f6b99d779", + "version": "2.0.3", + "port-version": 1 + }, + { + "git-tree": "6e1b6fbd3bff2cae13325183c95aa07ed470b6ad", + "version": "2.0.3", + "port-version": 0 + }, + { + "git-tree": "dab9a2e508bca4575fc8f26df59f3f01735a3dbb", + "version": "2.0.2", + "port-version": 0 + }, + { + "git-tree": "180bb46f618db60da2f6aa4accca24cdb90570e8", + "version": "1.7.2", + "port-version": 0 + }, + { + "git-tree": "5dfd6d52634b3dc1e63c380de459322b8c17f0a8", + "version-string": "1.6.4", + "port-version": 1 + }, + { + "git-tree": "e56e85546183d42a9831a167651bd40f9e59edb1", + "version-string": "1.6.4", + "port-version": 0 + }, + { + "git-tree": "0f579151c214f923f66b21b2b6256fda4074aad2", + "version-string": "1.6.1-1", + "port-version": 0 + }, + { + "git-tree": "551b04c2c4699cf3c1fe7709ce6d794ea38a246e", + "version-string": "1.6.1", + "port-version": 0 + }, + { + "git-tree": "3b1da2257446e7077ac7f29b249cacb74a042ad9", + "version-string": "2019-06-25-1", + "port-version": 0 + }, + { + "git-tree": "e36378e952f4cff69da7dd7f35c85e10804dd311", + "version-string": "2019-06-25", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/minc.json b/externals/vcpkg/versions/m-/minc.json new file mode 100755 index 000000000..875fca8fe --- /dev/null +++ b/externals/vcpkg/versions/m-/minc.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "c1f17dd915374b25e123d358f01990425f3e0e97", + "version-string": "2.4.03", + "port-version": 2 + }, + { + "git-tree": "acdeaea4e9ff6ac06a4349375f57cfe0e66aa241", + "version-string": "2.4.03", + "port-version": 1 + }, + { + "git-tree": "61ca37cefb07e151ea7eb1ce1c6e19b8c2b74312", + "version-string": "2.4.03", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/minhook.json b/externals/vcpkg/versions/m-/minhook.json new file mode 100755 index 000000000..6cab06468 --- /dev/null +++ b/externals/vcpkg/versions/m-/minhook.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "fea414bee13115e201fe93699ba5b55c7ae031b8", + "version": "1.3.3", + "port-version": 3 + }, + { + "git-tree": "8dbdd0ae999b8929af5e9df0cbae321bb0d71cea", + "version-string": "1.3.3", + "port-version": 2 + }, + { + "git-tree": "6d518eb93f8f8327d4470dcb1df1e45a4e94ba32", + "version-string": "1.3.3", + "port-version": 1 + }, + { + "git-tree": "40ec69ab3b1b668f3f2b577c20cc4f2228f4d122", + "version-string": "1.3.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/minifb.json b/externals/vcpkg/versions/m-/minifb.json new file mode 100755 index 000000000..c0f7d8551 --- /dev/null +++ b/externals/vcpkg/versions/m-/minifb.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "c290d7a60106f75b013b4efa6b4287aa91385aab", + "version-string": "2019-08-20", + "port-version": 2 + }, + { + "git-tree": "0d292f83153e9e6a842131c237852b1a580df705", + "version-string": "2019-08-20-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/minimp3.json b/externals/vcpkg/versions/m-/minimp3.json new file mode 100755 index 000000000..73663162f --- /dev/null +++ b/externals/vcpkg/versions/m-/minimp3.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "2997f9c06f0831c803fca134a599171dc2399bc4", + "version-date": "2021-11-30", + "port-version": 0 + }, + { + "git-tree": "4ed9d5474095c5aaecd2fc4ccab507523dd98241", + "version-string": "2020-12-25", + "port-version": 1 + }, + { + "git-tree": "40803dea0d5152a008dead0dc49d928a4ec78494", + "version-string": "2020-12-25", + "port-version": 0 + }, + { + "git-tree": "9cd84af5757e5bdb6919f0edee4552c220af7ec8", + "version-string": "2019-07-24-1", + "port-version": 0 + }, + { + "git-tree": "30f0e4929b0605805e017395c903d6c76ad7fdaf", + "version-string": "2019-07-24", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/minio-cpp.json b/externals/vcpkg/versions/m-/minio-cpp.json new file mode 100755 index 000000000..66dde1213 --- /dev/null +++ b/externals/vcpkg/versions/m-/minio-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0b0fe1b9353fd016b3f2e3212ae30a7a82b71ceb", + "version-date": "2022-01-03", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/minisat-master-keying.json b/externals/vcpkg/versions/m-/minisat-master-keying.json new file mode 100755 index 000000000..9012522e4 --- /dev/null +++ b/externals/vcpkg/versions/m-/minisat-master-keying.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "e7f174538407ae3f279ab4c7d2025a8545d220c9", + "version": "2.3.6", + "port-version": 0 + }, + { + "git-tree": "175ab6a87c6a80cbbd2ff26c976c17cab6e8fff6", + "version-string": "2.2-mod", + "port-version": 3 + }, + { + "git-tree": "e81450d91579aa1a04809cc891ed2c43cd26e86e", + "version-string": "2.2-mod-2", + "port-version": 0 + }, + { + "git-tree": "db459cec0c867d26462d4d6dea430a824826e65c", + "version-string": "2.2-mod-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/minitrace.json b/externals/vcpkg/versions/m-/minitrace.json new file mode 100755 index 000000000..42a7e6e1c --- /dev/null +++ b/externals/vcpkg/versions/m-/minitrace.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "a108afe478661d93adbf6ca758501a543d89f2b1", + "version-string": "2019.02.06", + "port-version": 2 + }, + { + "git-tree": "673b7749d7e3be0b8f86b2f8452c5f548068add8", + "version-string": "2019.02.06", + "port-version": 1 + }, + { + "git-tree": "b050ea8f545743febd0e79347ef3cf5d6fe92e12", + "version-string": "2019.02.06", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/miniupnpc.json b/externals/vcpkg/versions/m-/miniupnpc.json new file mode 100755 index 000000000..e32fe58e9 --- /dev/null +++ b/externals/vcpkg/versions/m-/miniupnpc.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "4f623d60c7ff375be1f55daa12fb1fcf119bb5a6", + "version-string": "2.1", + "port-version": 2 + }, + { + "git-tree": "b3f428b80985396d6731cfccffdfcb1f399ec53d", + "version-string": "2.1-1", + "port-version": 0 + }, + { + "git-tree": "df7a69761d58babf52972591c75548178a8cdc52", + "version-string": "2.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/miniz.json b/externals/vcpkg/versions/m-/miniz.json new file mode 100755 index 000000000..ef0f29f09 --- /dev/null +++ b/externals/vcpkg/versions/m-/miniz.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "49751d73421ae465b278aea471d6c8903837697c", + "version": "2.2.0", + "port-version": 1 + }, + { + "git-tree": "5a146337e0416425fb7a412027c755681cf88921", + "version": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "76f01b924fd6003cc4d2a12b8e849444a7bbdd6e", + "version-string": "2.1.0", + "port-version": 2 + }, + { + "git-tree": "849d35ab99423558e72a9bfa69ae95ae11635fda", + "version-string": "2.1.0-1", + "port-version": 0 + }, + { + "git-tree": "664a441e9faa4e4832221165387c5d0a041b43be", + "version-string": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "8aad9d585819424c5753e9eac81c2a8cfdcfbaab", + "version-string": "2.0.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/minizip-ng.json b/externals/vcpkg/versions/m-/minizip-ng.json new file mode 100755 index 000000000..e63af534d --- /dev/null +++ b/externals/vcpkg/versions/m-/minizip-ng.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "36ef459c57047fcfc0ddbfc97d7360d7307acb24", + "version": "3.0.5", + "port-version": 0 + }, + { + "git-tree": "4a8de7f8609b758c48eea13b67d47c22efc832a3", + "version": "3.0.2", + "port-version": 1 + }, + { + "git-tree": "9c49a3f4d6bb3e5173cf17e1539b439dcf4bf6ea", + "version": "3.0.2", + "port-version": 0 + }, + { + "git-tree": "c3f833fb14771ffd8f32496aa12035c86ab1cb9a", + "version": "3.0.1", + "port-version": 1 + }, + { + "git-tree": "0512bceae574c70ea907a8ebfc88709dc196164e", + "version": "3.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/minizip.json b/externals/vcpkg/versions/m-/minizip.json new file mode 100755 index 000000000..5931b7c32 --- /dev/null +++ b/externals/vcpkg/versions/m-/minizip.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "c3bec48dc73b936a25a26a9ec1941aac9e39fcf1", + "version-semver": "1.2.11", + "port-version": 10 + }, + { + "git-tree": "fc89de0b8a1105f6bee9625bba4031b138862a39", + "version-semver": "1.2.11", + "port-version": 9 + }, + { + "git-tree": "4bf6a0d8bac1c47fa80e0c51188aa3d2ecb86414", + "version-string": "1.2.11", + "port-version": 8 + }, + { + "git-tree": "4f7a0ceea0f626741858e2f2c0438aaba542fedc", + "version-string": "1.2.11", + "port-version": 7 + }, + { + "git-tree": "d0f4e3a527b27a06d529269f3237c2421c9df9fb", + "version-string": "1.2.11-6", + "port-version": 0 + }, + { + "git-tree": "cc4fbe9ba9b90847250540e9a4c59ddc72501f29", + "version-string": "1.2.11-5", + "port-version": 0 + }, + { + "git-tree": "44373e5262a3b408fadfeb14ff9ce2b4d018515a", + "version-string": "1.2.11-4", + "port-version": 0 + }, + { + "git-tree": "5e834476ebc65f92c88b6c5aecf23459f86a74b3", + "version-string": "1.2.11-3", + "port-version": 0 + }, + { + "git-tree": "41f96494e36dd25204ba21360b423ec94ff3bd1d", + "version-string": "1.2.11-2", + "port-version": 0 + }, + { + "git-tree": "008a166d676b553946e02f3f769fa48df2276aac", + "version-string": "1.2.11-1", + "port-version": 0 + }, + { + "git-tree": "ef35aa9f1b2e49df05aebea8b2f2caafe5179625", + "version-string": "1.2.11", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mio.json b/externals/vcpkg/versions/m-/mio.json new file mode 100755 index 000000000..805b6ca4b --- /dev/null +++ b/externals/vcpkg/versions/m-/mio.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "96f1f36bdbe5fe85f143d83f1018a21ddb420180", + "version-string": "2019-02-10", + "port-version": 1 + }, + { + "git-tree": "43906b044c359b7c123887287b1b40c0fc25b479", + "version-string": "2019-02-10", + "port-version": 0 + }, + { + "git-tree": "9931525c14c85f46eec0eb3d91bfede98935cc23", + "version-string": "2018-10-18-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mlpack.json b/externals/vcpkg/versions/m-/mlpack.json new file mode 100755 index 000000000..f723df305 --- /dev/null +++ b/externals/vcpkg/versions/m-/mlpack.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "1ba342c0a0a5e88c4424207c3296b8db8c7062fc", + "version": "3.4.1", + "port-version": 5 + }, + { + "git-tree": "eb3aaa9dbc3991962b70c2c819d66e5c018ad41a", + "version": "3.4.1", + "port-version": 4 + }, + { + "git-tree": "aa79e1e52ba4e3112b84d77bc321580988b945f0", + "version": "3.4.1", + "port-version": 3 + }, + { + "git-tree": "587ee2575ef7543ff9a0ed30e645154db26f0001", + "version": "3.4.1", + "port-version": 2 + }, + { + "git-tree": "4793fb5802e10e645d5d33e0ec2baf6f1a0a337b", + "version": "3.4.1", + "port-version": 1 + }, + { + "git-tree": "ca98fd8ae45d5ef5e77e4f2942b2dbe60a4356d4", + "version-string": "3.4.1", + "port-version": 0 + }, + { + "git-tree": "7a0ed8cc5c940c4f081bbe541c1dc482d6e0f8c9", + "version-string": "3.2.2", + "port-version": 6 + }, + { + "git-tree": "c3ce426036ea35721079b3c43ceb73c2a4b93b0a", + "version-string": "3.2.2", + "port-version": 5 + }, + { + "git-tree": "6e19f4adf4a8de35b7fbee6c6112e30ef5c1ed37", + "version-string": "3.2.2", + "port-version": 4 + }, + { + "git-tree": "d063c084d6abe9ef0bcd0ee8be1950f671d3bf3f", + "version-string": "3.2.2-3", + "port-version": 0 + }, + { + "git-tree": "c4a0c36be6c89f033c7f507b749d452e87f13551", + "version-string": "3.2.2-2", + "port-version": 0 + }, + { + "git-tree": "2c5e235fd8ab380a77f1ded84a519cd2af37c63f", + "version-string": "3.2.2-1", + "port-version": 0 + }, + { + "git-tree": "2016657e3eb8bbe3e14b002cbc050e047eecaa70", + "version-string": "3.2.2", + "port-version": 0 + }, + { + "git-tree": "24ab84f343d9ade94180279949664aa533033932", + "version-string": "3.1.1-1", + "port-version": 0 + }, + { + "git-tree": "b9fea0ea9ea521ce93e2f57842646e5c05cf4412", + "version-string": "3.1.1", + "port-version": 0 + }, + { + "git-tree": "ffe23546970ec0a34eb5631bf9e63c6aa31bc41f", + "version-string": "3.1.0-1", + "port-version": 0 + }, + { + "git-tree": "58bae883a03f4bd47032fa7ba0326069de2599eb", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "960e5d69e082757ccd17a5efd09bc6593d137e96", + "version-string": "3.0.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mman.json b/externals/vcpkg/versions/m-/mman.json new file mode 100755 index 000000000..226b2e7d9 --- /dev/null +++ b/externals/vcpkg/versions/m-/mman.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "fff4dfa412b18aa027005a5ea952932cbf10cd74", + "version-string": "git-f5ff813", + "port-version": 5 + }, + { + "git-tree": "30ad8930ff3b29bd994587b1ff58e5205deb32bc", + "version-string": "git-f5ff813", + "port-version": 4 + }, + { + "git-tree": "a732b3f36cfe52db33d67435daf53f1cc522db8b", + "version-string": "git-f5ff813-3", + "port-version": 0 + }, + { + "git-tree": "5e5046086737308d341c9b81c496ef536da48399", + "version-string": "git-f5ff813-2", + "port-version": 0 + }, + { + "git-tree": "70f6bf880ecf1a616b22b0f7741de62798481ba5", + "version-string": "git-f5ff813-1", + "port-version": 0 + }, + { + "git-tree": "1001ce3b03f61f9f46a552cb6c265845a9d7c600", + "version-string": "git-f5ff813", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mmloader.json b/externals/vcpkg/versions/m-/mmloader.json new file mode 100755 index 000000000..3257087c7 --- /dev/null +++ b/externals/vcpkg/versions/m-/mmloader.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "4b102ccdbd92919d2f3f62fff55b2a51839199ad", + "version": "1.0.1", + "port-version": 2 + }, + { + "git-tree": "104d16ae01f6ae753fde8406f75a01b9353aa1f2", + "version-date": "2021-12-13", + "port-version": 1 + }, + { + "git-tree": "030c251ff729f1063950f5473cf393125f888ca2", + "version-date": "2021-12-13", + "port-version": 0 + }, + { + "git-tree": "e1825273819a6439f75ba1439385944a1331101c", + "version-string": "2020-05-15", + "port-version": 1 + }, + { + "git-tree": "ca830c0ba1e475c6eb4a200f2b63847916b37206", + "version-string": "2020-05-15", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mmx.json b/externals/vcpkg/versions/m-/mmx.json new file mode 100755 index 000000000..b504b1fa9 --- /dev/null +++ b/externals/vcpkg/versions/m-/mmx.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "1a84c6441a555fa4b0afa0bbe61488b1bc692138", + "version-string": "2019-09-29", + "port-version": 1 + }, + { + "git-tree": "de7f696bc3b559e2376ef5cd52295776e539a4c0", + "version-string": "2019-09-29", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mnn.json b/externals/vcpkg/versions/m-/mnn.json new file mode 100755 index 000000000..6f5141ac9 --- /dev/null +++ b/externals/vcpkg/versions/m-/mnn.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "7f76a851632ab292ad4fbabcf5b6e94c0c6d957b", + "version": "1.1.0", + "port-version": 3 + }, + { + "git-tree": "e77125ae365a54bdcbbdb5bb2d77d32834a4487b", + "version": "1.1.0", + "port-version": 2 + }, + { + "git-tree": "10351b13b0daa0e66de483597da63e0d60e9777a", + "version": "1.1.0", + "port-version": 1 + }, + { + "git-tree": "491764622aa21728db88d7dd574f430cae600af5", + "version-string": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/modp-base64.json b/externals/vcpkg/versions/m-/modp-base64.json new file mode 100755 index 000000000..0ec134f01 --- /dev/null +++ b/externals/vcpkg/versions/m-/modp-base64.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "8e39629dc5108d0e7dac7c91bea6e7fbdeaeee14", + "version-string": "2020-09-26", + "port-version": 1 + }, + { + "git-tree": "e4f4036da7adface3f64eae79654f6adec72ef82", + "version-string": "2020-09-26", + "port-version": 0 + }, + { + "git-tree": "45e887b77a2b1d66d20497f0dce5b4a580f32c62", + "version-string": "v2.0.0", + "port-version": 0 + }, + { + "git-tree": "aa8d1be38f49d9c840359da740f9accf67494ea9", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mongo-c-driver.json b/externals/vcpkg/versions/m-/mongo-c-driver.json new file mode 100755 index 000000000..b7ced9eb8 --- /dev/null +++ b/externals/vcpkg/versions/m-/mongo-c-driver.json @@ -0,0 +1,144 @@ +{ + "versions": [ + { + "git-tree": "0579545ecddc3bef7941e3caa19bda27c80323bc", + "version": "1.17.6", + "port-version": 2 + }, + { + "git-tree": "1885ed4c6d71d255e97ef46bc1dd3b5353686845", + "version": "1.17.6", + "port-version": 1 + }, + { + "git-tree": "a9982d4176e1480433444ecace3b389bb8ca8570", + "version": "1.17.6", + "port-version": 0 + }, + { + "git-tree": "c13a612d9a93a8a338b5a32d14338683065813fd", + "version": "1.16.1", + "port-version": 6 + }, + { + "git-tree": "6a68782eaa1afe2fc3de47db769e230ebd542ca7", + "version-string": "1.16.1", + "port-version": 5 + }, + { + "git-tree": "6b948f7f7ff67f47481c2630ba40ab300bceee01", + "version-string": "1.16.1", + "port-version": 4 + }, + { + "git-tree": "7f42fe8e15fb11c2ef5c63723edcd29a2be93062", + "version-string": "1.16.1", + "port-version": 3 + }, + { + "git-tree": "469df31b13f8873df98fc40143a9f454212f38cb", + "version-string": "1.16.1-1", + "port-version": 1 + }, + { + "git-tree": "4f05b753676be00cbeea2f5e6d0d641c3c6fd3dc", + "version-string": "1.16.1-1", + "port-version": 0 + }, + { + "git-tree": "fc77ec84f6aabb2a2a1e79072ee12cc4819f23cc", + "version-string": "1.16.1", + "port-version": 0 + }, + { + "git-tree": "cc8ec6465eb0fd121e0fd0b2d1b1db6c14c7b942", + "version-string": "1.15.1-1", + "port-version": 0 + }, + { + "git-tree": "404871eba77904251e7ef29f62ccbc811a55aefb", + "version-string": "1.14.0-5", + "port-version": 0 + }, + { + "git-tree": "a32cd2217a274276cdbc36e243086bd2e11bc694", + "version-string": "1.14.0-4", + "port-version": 0 + }, + { + "git-tree": "342d384fb6d4b9816cfea93494fed57ab97ff6e2", + "version-string": "1.14.0-3-1", + "port-version": 0 + }, + { + "git-tree": "bfd7edf6fba4f2f443f3dd904ec9e9ee9db742dc", + "version-string": "1.14.0-3", + "port-version": 0 + }, + { + "git-tree": "79b1de4563e7eb8a3b69c57bef6f005605bd2039", + "version-string": "1.14.0-2", + "port-version": 0 + }, + { + "git-tree": "4e98969ccf74f4a16f62cbf6519070e65ac3ed21", + "version-string": "1.14.0-1", + "port-version": 0 + }, + { + "git-tree": "571e6c0e6fa80616c6670c63fd49c30096ec6e64", + "version-string": "1.13.0", + "port-version": 0 + }, + { + "git-tree": "50eaf4efda03435dd8f3b15995af9081c1b1c93c", + "version-string": "1.9.5-3", + "port-version": 0 + }, + { + "git-tree": "5773958803604c06725638469d557ffb2364a6de", + "version-string": "1.9.5-2", + "port-version": 0 + }, + { + "git-tree": "040b506a233a0b231d77b1062c85718f6a7a940b", + "version-string": "1.9.5-1", + "port-version": 0 + }, + { + "git-tree": "b5a8872d91e3bcb5580f66a7d8f692f7ac79db7c", + "version-string": "1.9.2", + "port-version": 0 + }, + { + "git-tree": "6f6a7b15ff64eef28e66b1a2b45545a1494f0a87", + "version-string": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "5cd8ae2b8806ca3cf808409dea186b888bbd7446", + "version-string": "1.6.2-1", + "port-version": 0 + }, + { + "git-tree": "d54ce446c688393284c8d738781954cb968b28d4", + "version-string": "1.6.2", + "port-version": 0 + }, + { + "git-tree": "04fdc9663238bb44ffed04cb88037ef528d4469a", + "version-string": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "99055be3efadb1a2f594d93fc22dc8c4b0287663", + "version-string": "1.5.0-rc6", + "port-version": 0 + }, + { + "git-tree": "551d43f83ce2712ac6196b7973c74889f2224632", + "version-string": "1.4.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mongo-cxx-driver.json b/externals/vcpkg/versions/m-/mongo-cxx-driver.json new file mode 100755 index 000000000..38482de4a --- /dev/null +++ b/externals/vcpkg/versions/m-/mongo-cxx-driver.json @@ -0,0 +1,114 @@ +{ + "versions": [ + { + "git-tree": "732830e44f7d4c9c31025d6c77e7d40220abef38", + "version": "3.6.5", + "port-version": 3 + }, + { + "git-tree": "2c9183634ff53b6e76b201ad39abf63b5d26bc8a", + "version": "3.6.5", + "port-version": 2 + }, + { + "git-tree": "2fd38965003b9bc7a653ab8aaabb8172a043d9d0", + "version": "3.6.5", + "port-version": 1 + }, + { + "git-tree": "13a9e7a7e597324f6cf72f7e9389604109888567", + "version": "3.6.5", + "port-version": 0 + }, + { + "git-tree": "afde1764bdbdc03cc32ffcb580bb587faa36b0c5", + "version-string": "3.4.0-5", + "port-version": 3 + }, + { + "git-tree": "d0b0f339d4533201003aefd28a57efc827414434", + "version-string": "3.4.0-5", + "port-version": 2 + }, + { + "git-tree": "604e80750b83ac609caa6acca73b09307900a9cd", + "version-string": "3.4.0-5", + "port-version": 1 + }, + { + "git-tree": "e97bc71bb124f63fc4542039df254f4811322001", + "version-string": "3.4.0-5", + "port-version": 0 + }, + { + "git-tree": "9af9e5be2065850e4010aba38438db43ecec8cbf", + "version-string": "3.4.0-4", + "port-version": 0 + }, + { + "git-tree": "d287ae96f1d2c41500bceceaded6927f708d54c2", + "version-string": "3.4.0-3", + "port-version": 0 + }, + { + "git-tree": "5a6bd362d6e20ba973b7f9d3e30e59907e3f7b2c", + "version-string": "3.4.0-2", + "port-version": 0 + }, + { + "git-tree": "5b1855cfe3d2cff3abf3b87bd3cfcde7fff7419e", + "version-string": "3.4.0-1", + "port-version": 0 + }, + { + "git-tree": "c06b5d3a86074a5316faab2a8de0f836d66ec5b9", + "version-string": "3.2.0-2", + "port-version": 0 + }, + { + "git-tree": "f47a79fea0c3762e56741101863982b763c9817f", + "version-string": "3.2.0-1", + "port-version": 0 + }, + { + "git-tree": "d706dc22b38b3c140dae5a61f95a5e5df298fd5d", + "version-string": "3.1.1-3", + "port-version": 0 + }, + { + "git-tree": "7add01cf7622cda4b63e6d83a1da4997282778a9", + "version-string": "3.1.1-2", + "port-version": 0 + }, + { + "git-tree": "fd7d11526f6473efc9c14e8714113539af54cd4b", + "version-string": "3.1.1-1", + "port-version": 0 + }, + { + "git-tree": "d2d3ebed65e3e7e244fbc295422284db10e1a0f0", + "version-string": "3.1.1", + "port-version": 0 + }, + { + "git-tree": "a516ad2ba1ff48252f2c319c7e65341107f51d2f", + "version-string": "3.0.3-2", + "port-version": 0 + }, + { + "git-tree": "9fbd68d8f2d7235cf74d7b44c1730239da6557fe", + "version-string": "3.0.3-1", + "port-version": 0 + }, + { + "git-tree": "510cbd1e1a837a6e42256039e42f21655110ef8c", + "version-string": "3.0.3", + "port-version": 0 + }, + { + "git-tree": "2e1310c3ecb2b8fc0b8c5e79aafb840876f8f45f", + "version-string": "3.0.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mongoose.json b/externals/vcpkg/versions/m-/mongoose.json new file mode 100755 index 000000000..35a0e8175 --- /dev/null +++ b/externals/vcpkg/versions/m-/mongoose.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "cbba0161f41a1ea996f1e64afecc998e01e59661", + "version": "7.6", + "port-version": 0 + }, + { + "git-tree": "504d873811dc91402f21952ea4c9fd08602cc822", + "version": "7.5", + "port-version": 1 + }, + { + "git-tree": "e48192c7d0e653962481e1c2be9e7663ead35e74", + "version": "7.5", + "port-version": 0 + }, + { + "git-tree": "a706659c49d7ac73bfa869a3497ffeec2c57af71", + "version": "7.1", + "port-version": 0 + }, + { + "git-tree": "065f3b19bed7c1cf3bb66d777eda7f4e74818f77", + "version-string": "6.15-2", + "port-version": 0 + }, + { + "git-tree": "3e5739c01b94cd23f2b20643d13738bcfe17b453", + "version-string": "6.15-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/monkeys-audio.json b/externals/vcpkg/versions/m-/monkeys-audio.json new file mode 100755 index 000000000..83f85a51b --- /dev/null +++ b/externals/vcpkg/versions/m-/monkeys-audio.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "6dbdeec6bf1752114f81a6ad09c85d046dc2ca3b", + "version": "5.70", + "port-version": 2 + }, + { + "git-tree": "e7058d11b081c99f9be409c3770e9d41b6487505", + "version-string": "5.70", + "port-version": 1 + }, + { + "git-tree": "1214c3471adf4b1257484fe2b5e93c68f2be0d2f", + "version-string": "5.70", + "port-version": 0 + }, + { + "git-tree": "d144aafa5bbed0987c741f1bde761eaf4b90af9e", + "version-string": "5.65", + "port-version": 0 + }, + { + "git-tree": "56550b410f187868315fdf13b9e389780197b511", + "version-string": "5.59", + "port-version": 0 + }, + { + "git-tree": "dcf7fc513c4fbbf553b6b5d8eaa457ed8ec8486e", + "version-string": "5.48", + "port-version": 0 + }, + { + "git-tree": "68712c31dad17b79f99908a8ed7885686281ee49", + "version-string": "5.46", + "port-version": 0 + }, + { + "git-tree": "3cce5af184c45d17c3d5292d9d925ccce59b469a", + "version-string": "5.38", + "port-version": 0 + }, + { + "git-tree": "97e3095b7ae797b1ee4253942743584221edb289", + "version-string": "5.24", + "port-version": 0 + }, + { + "git-tree": "9edf6a96cba59ac1c287e24911141e3f229f120c", + "version-string": "5.14-1", + "port-version": 0 + }, + { + "git-tree": "30872fc7b35dbb207f58bbe1604bd23bee0e8344", + "version-string": "5.14", + "port-version": 0 + }, + { + "git-tree": "4894a97d8ba72dfb2fa3f7a88f0caaa814a660e1", + "version-string": "4.8.3-1", + "port-version": 0 + }, + { + "git-tree": "d5c37550f5a0d18a7ec6ad70a3abc5f276bcd213", + "version-string": "4.8.3", + "port-version": 0 + }, + { + "git-tree": "2de4b1bef0fc62fd5a6b42652db31c9de74765a9", + "version-string": "4.3.3-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/moos-core.json b/externals/vcpkg/versions/m-/moos-core.json new file mode 100755 index 000000000..16f32ea86 --- /dev/null +++ b/externals/vcpkg/versions/m-/moos-core.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "bbdd0d3fb08ac68bdd5d73aedb783d5edf912845", + "version-string": "10.4.0", + "port-version": 6 + }, + { + "git-tree": "c3b7758f06ce33435ff4882aaf51095ef1e0628d", + "version-string": "10.4.0", + "port-version": 5 + }, + { + "git-tree": "da896b82d026b06f70f11fe88572fe0fc0d2f717", + "version-string": "10.4.0-4", + "port-version": 0 + }, + { + "git-tree": "dd4c155bd628c298e0b950961880d10aecf624db", + "version-string": "10.4.0-3", + "port-version": 0 + }, + { + "git-tree": "b5a2f113daa52cf346c378d5a2e68a76792c3eaf", + "version-string": "10.4.0-2", + "port-version": 0 + }, + { + "git-tree": "4c4956c790e5f87f91f98703f5d21ec0c9760a29", + "version-string": "10.4.0-1", + "port-version": 0 + }, + { + "git-tree": "d90fce4bbcdb2bb45498bc3ddf74c7bbc0daf94f", + "version-string": "10.4.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/moos-essential.json b/externals/vcpkg/versions/m-/moos-essential.json new file mode 100755 index 000000000..0cd932652 --- /dev/null +++ b/externals/vcpkg/versions/m-/moos-essential.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "11b1cc83a6dfc1cafed531cc20618bb6e8c13f97", + "version-string": "10.0.1", + "port-version": 3 + }, + { + "git-tree": "544617bd9ccb5e12e900533d38c8ce2bb930a3f1", + "version-string": "10.0.1-2", + "port-version": 0 + }, + { + "git-tree": "311f678c5f991107b58fa99f9ba6cdab1d80ae1d", + "version-string": "10.0.1-1", + "port-version": 0 + }, + { + "git-tree": "b96efa6e74251086a707e80106da4dc6525375ed", + "version-string": "10.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/moos-ui.json b/externals/vcpkg/versions/m-/moos-ui.json new file mode 100755 index 000000000..9dae922ad --- /dev/null +++ b/externals/vcpkg/versions/m-/moos-ui.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "c1f77392ef5dd2171f4125afd48a6bf9a69e4983", + "version-string": "10.0.1", + "port-version": 3 + }, + { + "git-tree": "14e23eda28b53d1891f92cc006744ca67ee0c4fe", + "version-string": "10.0.1-2", + "port-version": 0 + }, + { + "git-tree": "8b36589888a73ea7f3228002fe2c1e4a44533b07", + "version-string": "10.0.1-1", + "port-version": 0 + }, + { + "git-tree": "91d33876d1c8955b42c8bbe5ea5ce47624f761c9", + "version-string": "10.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/morton-nd.json b/externals/vcpkg/versions/m-/morton-nd.json new file mode 100755 index 000000000..2eb016e7b --- /dev/null +++ b/externals/vcpkg/versions/m-/morton-nd.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "753c7a016925df0630d4d9014ae98cfe34c87c35", + "version-string": "4.0.0", + "port-version": 1 + }, + { + "git-tree": "949f90299960d91f4cfd457a093dd70c5e285782", + "version-string": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "acdac4e47f9b91d7a7dd27aa9689f029fdd43895", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "1d6b2ea7c7c51d460d7b00f5db03ae3fb48af5fb", + "version-string": "2.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mosquitto.json b/externals/vcpkg/versions/m-/mosquitto.json new file mode 100755 index 000000000..b8884b9e3 --- /dev/null +++ b/externals/vcpkg/versions/m-/mosquitto.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "c8f2f0732c56a4cc622139bba1b7cb110dea985d", + "version": "2.0.14", + "port-version": 0 + }, + { + "git-tree": "f57ff6e27ac8e72ba497868198a9c9ae3d0bd281", + "version": "2.0.12", + "port-version": 3 + }, + { + "git-tree": "a94c1fb81601520c8a9766865574b5e132e1c848", + "version": "2.0.12", + "port-version": 2 + }, + { + "git-tree": "ef8ae230660456d039888e201ea521f58caf0951", + "version": "2.0.12", + "port-version": 1 + }, + { + "git-tree": "90a1a4314b15a787186d515df048f77961a4c7f3", + "version": "2.0.12", + "port-version": 0 + }, + { + "git-tree": "e50ddad9108597e09097e1853e116a62d650044d", + "version-string": "1.6.8", + "port-version": 3 + }, + { + "git-tree": "99c389f2871b91c86bc2ca3f2a127c95363bddf4", + "version-string": "1.6.8", + "port-version": 2 + }, + { + "git-tree": "1ea8b1f6fb8652cfebc04c0fa92effd2e1b47e31", + "version-string": "1.6.8-1", + "port-version": 0 + }, + { + "git-tree": "5f659f853beb8ec297ef9aba5847897c1389da94", + "version-string": "1.6.8", + "port-version": 0 + }, + { + "git-tree": "a5142660db930398bafb216ad44fdaa7545ece7c", + "version-string": "1.6.7-2", + "port-version": 0 + }, + { + "git-tree": "16080a7fb96159baad1b13d5c1386b8c45da44e5", + "version-string": "1.6.7-1", + "port-version": 0 + }, + { + "git-tree": "f57317cc3573eb099ff68680f9476e820dff9b49", + "version-string": "1.6.7", + "port-version": 0 + }, + { + "git-tree": "6dc527d35cebf688cab86dfcf2599198aa38e162", + "version-string": "1.6.3", + "port-version": 0 + }, + { + "git-tree": "2a77fbc864e1162ddd87de60515fcefb66e46c4a", + "version-string": "1.6.2-2", + "port-version": 0 + }, + { + "git-tree": "c2879b400e3cb39e185b0c810e2cb23b53b3888c", + "version-string": "1.5.0-3", + "port-version": 0 + }, + { + "git-tree": "507232d20b61bc97a70c7078b2508d8de8828ff4", + "version-string": "1.5.0-2", + "port-version": 0 + }, + { + "git-tree": "ee0a05d08b00b3412684185e02c73285307a7747", + "version-string": "1.5.0-1", + "port-version": 0 + }, + { + "git-tree": "333348ee5d94728bdefd630e468ca725896433fd", + "version-string": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "baca04d56666db4b5bc25262f6a9f4189e8f7920", + "version-string": "1.4.15", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mozjpeg.json b/externals/vcpkg/versions/m-/mozjpeg.json new file mode 100755 index 000000000..cd92e4264 --- /dev/null +++ b/externals/vcpkg/versions/m-/mozjpeg.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "7713d74fddfa5b02228fdc489661c9ba15686cb6", + "version-date": "2021-09-27", + "port-version": 0 + }, + { + "git-tree": "0d92e5b33e3b57bed654510b0562ac82c68019cf", + "version-string": "2020-06-02", + "port-version": 3 + }, + { + "git-tree": "edf9c537c7b19a49a2aac339e4cd4a96d6d0c774", + "version-string": "2020-06-02", + "port-version": 2 + }, + { + "git-tree": "a1b88394762d856840fe8a13fc8274e488303c25", + "version-string": "2020-06-02-1", + "port-version": 0 + }, + { + "git-tree": "4e6755ea137719b61bca9d806002dcafae5ae084", + "version-string": "2020-06-02", + "port-version": 0 + }, + { + "git-tree": "30a395bb2eccb693a50d31f5779cad9ce396c665", + "version-string": "3.2-3", + "port-version": 0 + }, + { + "git-tree": "9e67b0d7bcdfece838a0eac89848a7dfb2d66303", + "version-string": "3.2-2", + "port-version": 0 + }, + { + "git-tree": "27e1838ee3246851ec684abdbe60a582ed582c79", + "version-string": "3.2-1", + "port-version": 0 + }, + { + "git-tree": "c50ef83138dac8f509d44f80102ba57f784f4226", + "version-string": "3.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mp-units.json b/externals/vcpkg/versions/m-/mp-units.json new file mode 100755 index 000000000..a8e54c22c --- /dev/null +++ b/externals/vcpkg/versions/m-/mp-units.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "ed05b65c897d6508b0b5f88f8a97373cf8fd8715", + "version-semver": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "f39d5365e27cf32f149da1ef78f0ae6cd09e9039", + "version-string": "0.6.0", + "port-version": 1 + }, + { + "git-tree": "fd2c36c9ab20e2e27330592205b3e3851cab5ebc", + "version-string": "0.6.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mp3lame.json b/externals/vcpkg/versions/m-/mp3lame.json new file mode 100755 index 000000000..bcabc3520 --- /dev/null +++ b/externals/vcpkg/versions/m-/mp3lame.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "ead40ed860e86cd8c3c5492b9bb3fcc7c8a2770e", + "version-string": "3.100", + "port-version": 7 + }, + { + "git-tree": "ea9ad10f5f14516799474a20ee31662f7de8d52a", + "version-string": "3.100", + "port-version": 6 + }, + { + "git-tree": "6fddb425e79c5b504af2e3fef17c629bc1ef2305", + "version-string": "3.100", + "port-version": 5 + }, + { + "git-tree": "3903e277648fc5c88473f9759550e834c7a3d575", + "version-string": "3.100", + "port-version": 4 + }, + { + "git-tree": "d76fd2722d821ea56571b6a0752746d60831edf5", + "version-string": "3.100-3", + "port-version": 0 + }, + { + "git-tree": "3a83237960b5f3c8f927dcf060fa858289772545", + "version-string": "3.100-1", + "port-version": 0 + }, + { + "git-tree": "a6dd356e37318d4b893c22de3b4205cdea540e40", + "version-string": "3.100", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mpark-variant.json b/externals/vcpkg/versions/m-/mpark-variant.json new file mode 100755 index 000000000..16039c5cb --- /dev/null +++ b/externals/vcpkg/versions/m-/mpark-variant.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "baf25f3166e04b5ccadd946c9b8d5c93da74b8f0", + "version-string": "1.4.0", + "port-version": 1 + }, + { + "git-tree": "ce9cbdb149d5767262e26b62fbb9819a6459718f", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "17b8782949b828923f03a6e6c93f68b3cc6a7e21", + "version-string": "1.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mpc.json b/externals/vcpkg/versions/m-/mpc.json new file mode 100755 index 000000000..da45380dc --- /dev/null +++ b/externals/vcpkg/versions/m-/mpc.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "c38230459b115da37fe9fe0161c7462de85549d5", + "version": "1.2.0", + "port-version": 2 + }, + { + "git-tree": "8ef4f1423bd95ed6bbe514de46fc9f4c8884ae5e", + "version-string": "1.2.0", + "port-version": 1 + }, + { + "git-tree": "82cc965290366b6d4cbc8996a8b9e335769920c8", + "version-string": "1.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mpfr.json b/externals/vcpkg/versions/m-/mpfr.json new file mode 100755 index 000000000..e3316b5bb --- /dev/null +++ b/externals/vcpkg/versions/m-/mpfr.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "af50e086428e7b7b1e1e5969a296a770a32ff88d", + "version": "4.1.0", + "port-version": 4 + }, + { + "git-tree": "9f38beb4c3179d0b08008af901d05c2a70afaa1b", + "version-string": "4.1.0", + "port-version": 3 + }, + { + "git-tree": "655c136cd8328e30476ae39a3fd5ff99c915907c", + "version-string": "4.1.0", + "port-version": 2 + }, + { + "git-tree": "54544af431b7f178bc7bbe6604f103c40b7aa93b", + "version-string": "4.1.0", + "port-version": 1 + }, + { + "git-tree": "6cb77c01fbda04c72b1767e3fbd79078bd29895e", + "version-string": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "7eefb0bc78d4e4422f50379f1ccd05f13c3ed8c2", + "version-string": "4.0.2-2", + "port-version": 0 + }, + { + "git-tree": "fc2c7a4c7a71980713500a219c8501e7f9662695", + "version-string": "4.0.2-1", + "port-version": 0 + }, + { + "git-tree": "ba226cf87ef03e64d62b703f670a6a3dca586f98", + "version-string": "4.0.1", + "port-version": 0 + }, + { + "git-tree": "78fc43c69a8dee26f7271682eab37876b9fc0a8b", + "version-string": "3.1.6-3", + "port-version": 0 + }, + { + "git-tree": "9f0187f4046838905689258fe4660a84ce42324b", + "version-string": "3.1.6-2", + "port-version": 0 + }, + { + "git-tree": "f9edf8950aa0bcc80bb2bafbd0383a05ae4de373", + "version-string": "3.1.6-1", + "port-version": 0 + }, + { + "git-tree": "8be5785333992cc870c9b8d6f4ebafaba9c67d41", + "version-string": "3.1.6", + "port-version": 0 + }, + { + "git-tree": "1803812dc76fc401aba673fc04a2d6c2e70949b7", + "version-string": "3.1.5-1", + "port-version": 0 + }, + { + "git-tree": "258b3bc093a74319c644a8108e86f784f6b2a132", + "version-string": "3.1.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mpg123.json b/externals/vcpkg/versions/m-/mpg123.json new file mode 100755 index 000000000..82c90e4bc --- /dev/null +++ b/externals/vcpkg/versions/m-/mpg123.json @@ -0,0 +1,144 @@ +{ + "versions": [ + { + "git-tree": "2b99f7a71d1996dc6a61c81a11a9a98805eba1c4", + "version": "1.29.3", + "port-version": 0 + }, + { + "git-tree": "d3b079fc036d9384ae34ead0db7c689499937039", + "version": "1.29.2", + "port-version": 3 + }, + { + "git-tree": "f03fbe2d20adf858700d4c90204ff808d00c34b2", + "version": "1.29.2", + "port-version": 2 + }, + { + "git-tree": "d7d73f2de9ed526b2cc13e39a4bdc100fcd6ab4e", + "version": "1.29.2", + "port-version": 1 + }, + { + "git-tree": "a0b39904e9eec57506653dc7252ea7e808914b8c", + "version": "1.29.2", + "port-version": 0 + }, + { + "git-tree": "fe2d74c3ff7d3dc66eaaf61d64a950c566798dcd", + "version": "1.28.0", + "port-version": 1 + }, + { + "git-tree": "b34c661c7e28355ade113c330d1c3b93a77a4e13", + "version": "1.28.0", + "port-version": 0 + }, + { + "git-tree": "6e185d93bd44a85eda8d650c24df2f96da710d56", + "version": "1.26.5", + "port-version": 0 + }, + { + "git-tree": "72adf784def23c2eb0470ca915ce526a150fd51f", + "version": "1.26.4", + "port-version": 0 + }, + { + "git-tree": "b143abaf1493952c9a04569e7d8379dac8ff8c1c", + "version-string": "1.26.3", + "port-version": 1 + }, + { + "git-tree": "19e2118fcd63fde61be2fd29d54a7bc8699ffa75", + "version-string": "1.26.3", + "port-version": 0 + }, + { + "git-tree": "3297cd5836cd5de4143016d50277b9cbaf3ed389", + "version-string": "1.25.8", + "port-version": 14 + }, + { + "git-tree": "644c44c4b09eebff1d159e2ffb1c931baf8dd263", + "version-string": "1.25.8", + "port-version": 13 + }, + { + "git-tree": "1dd75107974e98b2b63c65efb4c34e43eaa85687", + "version-string": "1.25.8-12", + "port-version": 0 + }, + { + "git-tree": "95d9ae4a225e5db28b1b41f8214930753a60188f", + "version-string": "1.25.8-11", + "port-version": 0 + }, + { + "git-tree": "74393aadb3ce56199f6e15cc60333f7b458520fa", + "version-string": "1.25.8-10", + "port-version": 0 + }, + { + "git-tree": "9c377ff0ac2b51fc8288b218670fca992836cb06", + "version-string": "1.25.8-9", + "port-version": 0 + }, + { + "git-tree": "9cda6fa6e614889c460004cbc65e89c235c97dc2", + "version-string": "1.25.8-8", + "port-version": 0 + }, + { + "git-tree": "a3b223f112ffbcfa14cb9a800b97ee665229c0d9", + "version-string": "1.25.8-7", + "port-version": 0 + }, + { + "git-tree": "f0600d482839983a776a99ffb5a312ea1cbd9a85", + "version-string": "1.25.8-6", + "port-version": 0 + }, + { + "git-tree": "199955636cdcaf66259f2b31605fe832b3aeaa5f", + "version-string": "1.25.8-5", + "port-version": 0 + }, + { + "git-tree": "39b0708492c20ea638cb393e9645446e7a0e183c", + "version-string": "1.25.8-4", + "port-version": 0 + }, + { + "git-tree": "9f9adadc5199324cd640a1e7738dac004a5b4693", + "version-string": "1.25.8-3", + "port-version": 0 + }, + { + "git-tree": "b61754b3926664098a7998b03489b2fdd3f844df", + "version-string": "1.25.8-2", + "port-version": 0 + }, + { + "git-tree": "bae49880a90e3e612f8320eb9c43da67b7a07af5", + "version-string": "1.25.8-1", + "port-version": 0 + }, + { + "git-tree": "3a25baa6224f3c9382d9513a6212c45c4e1d9b7e", + "version-string": "1.25.8", + "port-version": 0 + }, + { + "git-tree": "5be7d55ecb13994b03c9e6ae9d02ac1c832f0be7", + "version-string": "1.24.0-1", + "port-version": 0 + }, + { + "git-tree": "d6975a387e8d79b81451caab4064a3d83cfde5d1", + "version-string": "1.23.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mpi.json b/externals/vcpkg/versions/m-/mpi.json new file mode 100755 index 000000000..d177803d6 --- /dev/null +++ b/externals/vcpkg/versions/m-/mpi.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "2eacb3d18a3407d1ceb6211ee7cad0b157249d22", + "version-string": "1", + "port-version": 3 + }, + { + "git-tree": "783aea281dc7cdf59ec0636bd60c2feaef6595b4", + "version-string": "1", + "port-version": 2 + }, + { + "git-tree": "37ad8f71ce08f401038c2468f5776b0bd4265e4f", + "version-string": "1", + "port-version": 1 + }, + { + "git-tree": "71c3ebcd0d6f9b7b65d907ae5652a7fac3253775", + "version-string": "1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mpir.json b/externals/vcpkg/versions/m-/mpir.json new file mode 100755 index 000000000..8f7790807 --- /dev/null +++ b/externals/vcpkg/versions/m-/mpir.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "9191f07cfaade82121abb4d37cb652182c0e55f6", + "version-date": "2022-03-02", + "port-version": 1 + }, + { + "git-tree": "5358d4a724061eab499969ae3b56f8abbdea3347", + "version-date": "2022-03-02", + "port-version": 0 + }, + { + "git-tree": "8aabcec72d2006d0a338159fac489aae1da57220", + "version": "3.0.0", + "port-version": 11 + }, + { + "git-tree": "6d62b01b328d3537a808a6b68cdecaa44ea0d0d7", + "version-string": "3.0.0", + "port-version": 10 + }, + { + "git-tree": "d2935119930a3551330e83b03006fb2e1bb9bf79", + "version-string": "3.0.0", + "port-version": 9 + }, + { + "git-tree": "0b5171be985ebf44fd60062f87c8bbcbefb87341", + "version-string": "3.0.0-8", + "port-version": 0 + }, + { + "git-tree": "67369fe2d8b80b1181fc85919b6ca701c0f95814", + "version-string": "3.0.0-7", + "port-version": 0 + }, + { + "git-tree": "e803d79296062df889f1347ad0f5cb8d8755dea2", + "version-string": "3.0.0-6", + "port-version": 0 + }, + { + "git-tree": "92dd4a70047aa0d4070b3e114f8357b961dc769f", + "version-string": "3.0.0-5", + "port-version": 0 + }, + { + "git-tree": "b73bc9ae2196c4288e63af086c6567f706539f04", + "version-string": "3.0.0-4", + "port-version": 0 + }, + { + "git-tree": "ed60e7bc49d79da7c279a9fc6a2699ee4aaada03", + "version-string": "3.0.0-3", + "port-version": 0 + }, + { + "git-tree": "e1602241a3dd8a53f561b850338744f2bc77f04d", + "version-string": "3.0.0-2", + "port-version": 0 + }, + { + "git-tree": "ac492c30197eee13be6412686e6e301b2a61e349", + "version-string": "3.0.0-1", + "port-version": 0 + }, + { + "git-tree": "b82fb3c0bb99b7eb487a7b6ec58f50d3dadde272", + "version-string": "2.7.2-1", + "port-version": 0 + }, + { + "git-tree": "f7f74dfba526b978eb012352d096a5531043414b", + "version-string": "2.7.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mpmcqueue.json b/externals/vcpkg/versions/m-/mpmcqueue.json new file mode 100755 index 000000000..2234a129f --- /dev/null +++ b/externals/vcpkg/versions/m-/mpmcqueue.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "7986416e7dd33174b060331018a3b8aeee3018f0", + "version-date": "2021-12-01", + "port-version": 0 + }, + { + "git-tree": "1953040343e61f40deb621b5ca28aed36ebc2008", + "version-string": "2019-07-26", + "port-version": 1 + }, + { + "git-tree": "5d51c7ac12930b7a4b26c5cde81d5a0c92d3c56d", + "version-string": "2019-07-26", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mqtt-cpp.json b/externals/vcpkg/versions/m-/mqtt-cpp.json new file mode 100755 index 000000000..d4a7ddf8a --- /dev/null +++ b/externals/vcpkg/versions/m-/mqtt-cpp.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "185adb92fcfed90301dfc5aec8390b687cd35403", + "version-semver": "13.0.0", + "port-version": 0 + }, + { + "git-tree": "869a51ca4a2e5b126e9de0af838a24fb9e7c3ab1", + "version-semver": "12.0.0", + "port-version": 0 + }, + { + "git-tree": "9f27414bfee2919393dcfd5da41342fab9ba13ae", + "version-string": "9.0.0", + "port-version": 1 + }, + { + "git-tree": "076f74542bc427bf248bed66553c4ed0a941be8c", + "version-string": "9.0.0", + "port-version": 0 + }, + { + "git-tree": "c5342ce2999f8b7f9d1e3ae9e5aada71e7e03266", + "version-string": "7.0.1-2", + "port-version": 0 + }, + { + "git-tree": "cf4fa43060a5ca52a6478f078f64bd783d0ba6fe", + "version-string": "7.0.1-1", + "port-version": 0 + }, + { + "git-tree": "2391a0fe7129140e08a4fdf6e9c4595a50f4ae32", + "version-string": "7.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/ms-angle.json b/externals/vcpkg/versions/m-/ms-angle.json new file mode 100755 index 000000000..492a7638c --- /dev/null +++ b/externals/vcpkg/versions/m-/ms-angle.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "7fd6a2ea2fbded3b2e1de5e98ee81b59beaa14d4", + "version-string": "alias", + "port-version": 1 + }, + { + "git-tree": "ca605f2187feef6d74eabacbdf7e83216b4241e5", + "version-string": "alias", + "port-version": 0 + }, + { + "git-tree": "8610eb82f35617b9df9fe3a520dba4b18bdf1c6d", + "version-string": "2018-04-18-2", + "port-version": 0 + }, + { + "git-tree": "ef73a5c4513b200bcd4c5d2f7564b15042c892f7", + "version-string": "2018-04-18-1", + "port-version": 0 + }, + { + "git-tree": "c66278e6e9f1e2e1900d6a784460203d5f9367dd", + "version-string": "2018-04-18", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/ms-gltf.json b/externals/vcpkg/versions/m-/ms-gltf.json new file mode 100755 index 000000000..d31cbad7f --- /dev/null +++ b/externals/vcpkg/versions/m-/ms-gltf.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "b287c12480725603087cb1ebd5044a6a4bd6b2cb", + "version-string": "r1.9.5.4", + "port-version": 1 + }, + { + "git-tree": "aeeeac2de78af647be1312f6e9ab687c18369e99", + "version-string": "r1.9.5.4", + "port-version": 0 + }, + { + "git-tree": "1c3bf009ece6942607e095c0088810b6dbf86d38", + "version-string": "r1.9.5.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/ms-gsl.json b/externals/vcpkg/versions/m-/ms-gsl.json new file mode 100755 index 000000000..3693c2721 --- /dev/null +++ b/externals/vcpkg/versions/m-/ms-gsl.json @@ -0,0 +1,139 @@ +{ + "versions": [ + { + "git-tree": "9d8d320f8c5db1a6b0c7517d110b854bc4b551e5", + "version": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "d51947d40835a72b1728c68ca8587e04e3f8e1e2", + "version-string": "3.1.0", + "port-version": 1 + }, + { + "git-tree": "75aed40fd77dd1c0f123fe92df90d3aef55e7466", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "654bd029ae281df6dc5594bb136ffdbe6361c588", + "version-string": "3.0.1", + "port-version": 0 + }, + { + "git-tree": "41b5c0431c3382db1de85e96ac6a8be2ceca1125", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "a6df92e1447a5b45c16d50744ce5dcec3c54baf9", + "version-string": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "8b49029d61352da39803ba6b2c815bee9dbe8ec8", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "4e3de250571b05ec1201a3913c76e33ae1f3c56c", + "version-string": "2019-04-19", + "port-version": 0 + }, + { + "git-tree": "e4567ef1517b2928d2128ff1f7d0387412a8a6bb", + "version-string": "2019-01-18", + "port-version": 0 + }, + { + "git-tree": "df14114c8016f39ff7797093615d196ceae2f9d3", + "version-string": "2019-01-15", + "port-version": 0 + }, + { + "git-tree": "ca140e80e01466b0b727e1b039ad9c610edf32a4", + "version-string": "2018-12-14", + "port-version": 0 + }, + { + "git-tree": "a36e0e8665f182ac8207aaadd5827ef27f0c5f7c", + "version-string": "2018-11-08", + "port-version": 0 + }, + { + "git-tree": "0fd1e71ebef788863641483e2d41abfc83590836", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "3913836087c786a705c7a83408e21c5f1b9e17ff", + "version-string": "2018-08-03", + "port-version": 0 + }, + { + "git-tree": "4839663c44968fcbc79c3f33f2783655744f4e8a", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "0d28abf5c16ff13ba787c1457cf9db67c95ee5c6", + "version-string": "2018-06-15", + "port-version": 0 + }, + { + "git-tree": "13a3460cb16a6f7de12dc3d1aa9c847b334e813a", + "version-string": "2018-06-12", + "port-version": 0 + }, + { + "git-tree": "4e1356da34a96964fc8b612bd99a24e8e5c49e16", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "b96fbc685a0a9b3219905e2470d992c4e29e430b", + "version-string": "2018-05-01", + "port-version": 0 + }, + { + "git-tree": "60264df907af96b1ab69bbf46ee2ee4d9befc2bf", + "version-string": "2018-04-25", + "port-version": 0 + }, + { + "git-tree": "1794c9a7b6a9fd0b275259e053a7697b16778ad0", + "version-string": "2018-03-17", + "port-version": 0 + }, + { + "git-tree": "2367d71b3ca048ce3c66b692102f5d04b5bd14a7", + "version-string": "2018-03-07", + "port-version": 0 + }, + { + "git-tree": "a59106e8559519103dbace593e6f29ee272c171a", + "version-string": "2018-03-03", + "port-version": 0 + }, + { + "git-tree": "4c935e8cb82d46941eec530cf1cd0429df00e7d6", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "0864fe6ea70e6ca2459f7b546ce477443b4b0eb9", + "version-string": "20171204-9d65e74400976b3509833f49b16d401600c7317d", + "port-version": 0 + }, + { + "git-tree": "16aa60b828fbea27c553101c636030afe5230634", + "version-string": "20171104-d10ebc6555b627c9d1196076a78467e7be505987", + "port-version": 0 + }, + { + "git-tree": "d6f9c5d16d0bb6077a01971d0762ae8b98de2c27", + "version-string": "20170425-8b320e3f5d016f953e55dfc7ec8694c1349d3fe4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/ms-quic.json b/externals/vcpkg/versions/m-/ms-quic.json new file mode 100755 index 000000000..cc440ecc4 --- /dev/null +++ b/externals/vcpkg/versions/m-/ms-quic.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3188e024233a7d1772922bc11d29d912c6427e25", + "version": "1.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/msdfgen.json b/externals/vcpkg/versions/m-/msdfgen.json new file mode 100755 index 000000000..c6ca1037f --- /dev/null +++ b/externals/vcpkg/versions/m-/msdfgen.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "d49eb065f4ec389be55189e28ab310178281bfe7", + "version": "1.9.2", + "port-version": 0 + }, + { + "git-tree": "eade2edd986173003ec960fa30d29226a35ddb68", + "version": "1.9.1", + "port-version": 0 + }, + { + "git-tree": "8b15da4b26ea13caeba60337d49e6d5ec17c3e11", + "version-string": "1.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/msgpack.json b/externals/vcpkg/versions/m-/msgpack.json new file mode 100755 index 000000000..4c220e85a --- /dev/null +++ b/externals/vcpkg/versions/m-/msgpack.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "33927863a8eae2ea7c816389e7ef3dbdcc00382a", + "version-string": "3.3.0", + "port-version": 2 + }, + { + "git-tree": "ed079e3006a28fcef3dc95c108e03d20027de40c", + "version-string": "3.3.0", + "port-version": 1 + }, + { + "git-tree": "61d9adf5fb7555558588762d38e34544c6a38e25", + "version-string": "3.3.0", + "port-version": 0 + }, + { + "git-tree": "6fcf40eb0910b55deab3d0d658a20ca14887f45c", + "version-string": "3.2.0", + "port-version": 2 + }, + { + "git-tree": "2f4408c870bd4282eccda8dad23e71e0fef4a157", + "version-string": "3.2.0-1", + "port-version": 0 + }, + { + "git-tree": "65ea7098427ad52422df996fca814abf693d7e7f", + "version-string": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "d4af0641ad69926a91d7a6814dd28a69edd8df26", + "version-string": "3.1.1", + "port-version": 0 + }, + { + "git-tree": "707941e4e28397a9436b66ca26762d445401898f", + "version-string": "2.1.5-1", + "port-version": 0 + }, + { + "git-tree": "3b3e664ae5942b8b824dab13ca32c0c16e83d3d8", + "version-string": "2.1.5", + "port-version": 0 + }, + { + "git-tree": "8cc54cfaa7f70798f0d63cda39d3a30ba31a57c1", + "version-string": "2.1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/msgpack11.json b/externals/vcpkg/versions/m-/msgpack11.json new file mode 100755 index 000000000..d7390a507 --- /dev/null +++ b/externals/vcpkg/versions/m-/msgpack11.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "628d7986a87b3b326796bcacd492aabe846c4ea9", + "version": "0.0.10", + "port-version": 3 + }, + { + "git-tree": "7d1352df08016b8ba7b2de4fa027e4b37825bb8e", + "version": "0.0.10", + "port-version": 2 + }, + { + "git-tree": "893e52e19e5a4b783a02f7be49825f9fa3903255", + "version-string": "0.0.10-1", + "port-version": 0 + }, + { + "git-tree": "769a1719f4cb14f87d8121d0dff78a9cd3e02c27", + "version-string": "0.0.10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/msinttypes.json b/externals/vcpkg/versions/m-/msinttypes.json new file mode 100755 index 000000000..f59de2c3b --- /dev/null +++ b/externals/vcpkg/versions/m-/msinttypes.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "e912f42451c0d3a2563a68db50d96318bd277e40", + "version-string": "2018-02-25", + "port-version": 1 + }, + { + "git-tree": "1d44711d68afe966e4864bddf426de6d589b4d85", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "e86d2b33445c7e5587a85dc36294db3ea7403a54", + "version-string": "2017-06-26-f9e7c5758ed9e3b9f4b2394de1881c704dd79de0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/msix.json b/externals/vcpkg/versions/m-/msix.json new file mode 100755 index 000000000..c915f2459 --- /dev/null +++ b/externals/vcpkg/versions/m-/msix.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "13d1f847b9d20c6ff27d6bed27728fb145aedd50", + "version": "1.7", + "port-version": 4 + }, + { + "git-tree": "e544825ca69bfca4e3f54141bf62cacb1cd878ea", + "version": "1.7", + "port-version": 3 + }, + { + "git-tree": "d99bfeedaecfb8155ed9a404e3aa683f1b1df72a", + "version-string": "1.7-2", + "port-version": 0 + }, + { + "git-tree": "15274b3d9b4eb39d86c50e085b0110a56c0a2e83", + "version-string": "1.7-1", + "port-version": 0 + }, + { + "git-tree": "22076969c0b319d74c0353f8471aa0c5791d82b2", + "version-string": "1.7", + "port-version": 0 + }, + { + "git-tree": "6c6664e346ede2ca06e6bb7629f06c58a723a813", + "version-string": "MsixCoreInstaller-preview-1", + "port-version": 0 + }, + { + "git-tree": "cf561286237c049f194fd880fdc894d490e05d7d", + "version-string": "MsixCoreInstaller-preview", + "port-version": 0 + }, + { + "git-tree": "2c5bf5801aa8d5e58017c57e7c18530984d92b75", + "version-string": "1.0-1", + "port-version": 0 + }, + { + "git-tree": "4b8358cee82445bdac186cf73a8624e1bd127f17", + "version-string": "1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/msmpi.json b/externals/vcpkg/versions/m-/msmpi.json new file mode 100755 index 000000000..1cca454f3 --- /dev/null +++ b/externals/vcpkg/versions/m-/msmpi.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "d3ccfae00ebdaac2c41fa2acfa59b862171be3ae", + "version": "10.1.12498", + "port-version": 4 + }, + { + "git-tree": "92f5e217faeaf4ec7e205a56bfff3a13b75e0393", + "version": "10.1.12498", + "port-version": 3 + }, + { + "git-tree": "a93f4540161febeb02c42e92a6bfff770c4729dc", + "version": "10.1.12498", + "port-version": 2 + }, + { + "git-tree": "d333159a4463603aade50bfa48dbb4bd5b33946e", + "version": "10.1.12498", + "port-version": 1 + }, + { + "git-tree": "ce9b3f866ae1c098455182c6e811dc63a7b3e161", + "version-string": "10.1", + "port-version": 0 + }, + { + "git-tree": "dbe3f57014dd0c3a44455e36c3bb04152e0fd049", + "version-string": "10.0-2", + "port-version": 0 + }, + { + "git-tree": "a6bf90317dc9bba22a7922c1e9c9b59739482260", + "version-string": "10.0", + "port-version": 0 + }, + { + "git-tree": "7a6ad829a0e260dc60550b37e137c502583a2ca6", + "version-string": "9.0", + "port-version": 0 + }, + { + "git-tree": "eb86867a615917b30fffe3ec96c92596ce3b478a", + "version-string": "8.1", + "port-version": 0 + }, + { + "git-tree": "f9a8531cd20b82fa1cd2cfc82b148ac89efe4d34", + "version-string": "8.0-1", + "port-version": 0 + }, + { + "git-tree": "0564ca902c6ddca7c5fe8e7967f1bdca5817b545", + "version-string": "8.0", + "port-version": 0 + }, + { + "git-tree": "27db4f2a8c22fd7b5d3d515a42b74a120d662c87", + "version-string": "7.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mstch.json b/externals/vcpkg/versions/m-/mstch.json new file mode 100755 index 000000000..52ebb1697 --- /dev/null +++ b/externals/vcpkg/versions/m-/mstch.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "cc5a6f09703a12b736263285c46ce9056b853dcb", + "version-string": "1.0.2", + "port-version": 3 + }, + { + "git-tree": "c30daa60881cea1db66414a17b0de32b3f76c5b1", + "version-string": "1.0.2-2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mujs.json b/externals/vcpkg/versions/m-/mujs.json new file mode 100755 index 000000000..a500b6acf --- /dev/null +++ b/externals/vcpkg/versions/m-/mujs.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "b08453227e8770baadeb826bb3cd711815e6a865", + "version-string": "2018-07-30", + "port-version": 2 + }, + { + "git-tree": "4e3dc249bb1190e025b5189e9e8a7624b435fce5", + "version-string": "2018-07-30-1", + "port-version": 0 + }, + { + "git-tree": "4b7ceb73ca69095bf933385ff94d3f91fc05cd16", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "f37339bd35877d22035a1b62ddc32543b5036d97", + "version-string": "2018-06-15", + "port-version": 0 + }, + { + "git-tree": "532f5e0b181cfaf37293fd97c6b6af9e59d525f0", + "version-string": "2018-06-12", + "port-version": 0 + }, + { + "git-tree": "aa2059f8754535c45f996934a08f4e1f08531165", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "4bfd28eadfd41bfa38ff958a67d039a25b10e875", + "version-string": "2018-05-01", + "port-version": 0 + }, + { + "git-tree": "6bc683daf245fe8fb6365e108a400260d99fbf89", + "version-string": "25821e6d74fab5fcc200fe5e818362e03e114428", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/munit.json b/externals/vcpkg/versions/m-/munit.json new file mode 100755 index 000000000..a0f4d1707 --- /dev/null +++ b/externals/vcpkg/versions/m-/munit.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "d905b3126db7f555eba6a3a02598e0b3b6a97492", + "version-date": "2019-04-06", + "port-version": 5 + }, + { + "git-tree": "37416e6f9f63789221184c07fd4e040d4d8646a2", + "version-string": "2019-04-06", + "port-version": 4 + }, + { + "git-tree": "f6489068c02b6a87d45ab01592ef733e22904bd7", + "version-string": "2019-04-06", + "port-version": 3 + }, + { + "git-tree": "e73f59b95da8f7045c775a0fc263c5d2da26b320", + "version-string": "2019-04-06", + "port-version": 2 + }, + { + "git-tree": "45b3a29080b2b88733c00de98297e431917568ab", + "version-string": "2019-04-06", + "port-version": 1 + }, + { + "git-tree": "a9d861f2feec6d07bb449863b6a73d483ad695ca", + "version-string": "2019-04-06", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/muparser.json b/externals/vcpkg/versions/m-/muparser.json new file mode 100755 index 000000000..c2fd36fd1 --- /dev/null +++ b/externals/vcpkg/versions/m-/muparser.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "6987fcdb2ed52f7891489a2c97bdc92b64c46a6f", + "version": "2.3.3", + "port-version": 2 + }, + { + "git-tree": "6b93a7e6250aaa93e20c752426eb4fb1bcb08411", + "version": "2.3.3", + "port-version": 1 + }, + { + "git-tree": "e2e6e7754f6e242c497aca1dd784be15acc5c11f", + "version": "2.3.3-1", + "port-version": 0 + }, + { + "git-tree": "ffef8786866359a02e3e50d62bcda523967fddce", + "version-string": "2.3.2", + "port-version": 2 + }, + { + "git-tree": "60a779cc21e94cf9ef8a7df52a0177d79f298e2d", + "version-string": "2.3.2", + "port-version": 1 + }, + { + "git-tree": "88f24afa700f3c4e50ba65ab7b8a0e5ac32d2512", + "version-string": "2.3.2", + "port-version": 0 + }, + { + "git-tree": "01428bed61e304d0801cfd883e62d30aff375a85", + "version-string": "2.2.6.1", + "port-version": 0 + }, + { + "git-tree": "f9eb9e8ce9f815b5fcc8387d0dae5a9a24e79257", + "version-string": "6cf2746", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/murmurhash.json b/externals/vcpkg/versions/m-/murmurhash.json new file mode 100755 index 000000000..090b6a732 --- /dev/null +++ b/externals/vcpkg/versions/m-/murmurhash.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "bbaeb761deb522f06cde0e3efb0610ac3e6afa4d", + "version-date": "2016-01-09", + "port-version": 5 + }, + { + "git-tree": "5c0ccc0561113eac6ab8881d62a94f31a4ab8d70", + "version-string": "2016-01-09", + "port-version": 4 + }, + { + "git-tree": "fb66af217c56447fa8a7d80988f461acafae4dfa", + "version-string": "2016-01-09-3", + "port-version": 0 + }, + { + "git-tree": "715aa14d1544da8ed79381b3139de787edcc4367", + "version-string": "2016-01-09-2", + "port-version": 0 + }, + { + "git-tree": "92cff1a57727a474efdf00a70ccf941a61cdad77", + "version-string": "2016-01-09", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mvfst.json b/externals/vcpkg/versions/m-/mvfst.json new file mode 100755 index 000000000..54b8bdcd4 --- /dev/null +++ b/externals/vcpkg/versions/m-/mvfst.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "b054de2d05773c286f25528132a496dd075d3914", + "version-date": "2022-03-27", + "port-version": 0 + }, + { + "git-tree": "042a5236f46c787daf8334a8ca9c0cd3f71ab1b4", + "version": "0.2", + "port-version": 1 + }, + { + "git-tree": "72ff9157858363c60db8f1e0bd8de03546f7d0e4", + "version": "0.2", + "port-version": 0 + }, + { + "git-tree": "c73381f28aba19d8c008096270feca19a798fa92", + "version": "0.1", + "port-version": 1 + }, + { + "git-tree": "9af76c6cd8bea86bff84e5ccddc9f9e39290391e", + "version": "0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/m-/mygui.json b/externals/vcpkg/versions/m-/mygui.json new file mode 100755 index 000000000..d7b1309f5 --- /dev/null +++ b/externals/vcpkg/versions/m-/mygui.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "425cd3df40c8941ec9b3755bc0b3effdd91dc162", + "version": "3.4.1", + "port-version": 2 + }, + { + "git-tree": "d06b2f348d834355086a927f9aabdd47d271819b", + "version": "3.4.1", + "port-version": 1 + }, + { + "git-tree": "6e9074e901ba523a48254a18b5d8e7f3807619be", + "version": "3.4.1", + "port-version": 0 + }, + { + "git-tree": "9d8226795430e83c733e936821400cf792265656", + "version-string": "2020-06-17", + "port-version": 1 + }, + { + "git-tree": "f66dcaf503832c67a615a560fe943cd5fba00c0d", + "version-string": "2020-06-17", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nameof.json b/externals/vcpkg/versions/n-/nameof.json new file mode 100755 index 000000000..2bce04d63 --- /dev/null +++ b/externals/vcpkg/versions/n-/nameof.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "73b076af7e5bb74d8531885c3172ccdea74bce80", + "version-string": "0.10.1", + "port-version": 1 + }, + { + "git-tree": "3a556c1feb836e7e35ec66c2c9879235827d45f7", + "version-string": "0.10.1", + "port-version": 0 + }, + { + "git-tree": "0862786acc338358d7e97a79e4a3c9e68cced4c7", + "version-string": "0.10.0", + "port-version": 0 + }, + { + "git-tree": "234e76946663fe1435fee7e8ad834e79e674954e", + "version-string": "0.9.4", + "port-version": 0 + }, + { + "git-tree": "18e61afbf20c1797608a21e10848bc2e23ca5086", + "version-string": "0.9.3", + "port-version": 0 + }, + { + "git-tree": "9369fbcbb3eba95b1e781c952c996e6b4e56c149", + "version-string": "0.9.2", + "port-version": 0 + }, + { + "git-tree": "574f0a08bd13d076a6d73de171189cf6e58b98d8", + "version-string": "0.9.1", + "port-version": 0 + }, + { + "git-tree": "cb3b0392b1fb1ea0fd25747a8baf493805b82e81", + "version-string": "2019-07-13", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nana.json b/externals/vcpkg/versions/n-/nana.json new file mode 100755 index 000000000..0d3a44b77 --- /dev/null +++ b/externals/vcpkg/versions/n-/nana.json @@ -0,0 +1,109 @@ +{ + "versions": [ + { + "git-tree": "51aa210032909eec832d81aaf347917e2fe1a70a", + "version-string": "1.7.4", + "port-version": 2 + }, + { + "git-tree": "b2e006f8f4b726f268b855f855ed896c2c99ba24", + "version-string": "1.7.4", + "port-version": 1 + }, + { + "git-tree": "c32b081f24687ac8a7b25e74f4df1a2a3664c802", + "version-string": "1.7.4", + "port-version": 0 + }, + { + "git-tree": "5c9d5283547fdcf63be03e0bdeac7d97a90264db", + "version-string": "1.7.2", + "port-version": 4 + }, + { + "git-tree": "c40ea66d412698348c18f84f00112f4c91673d93", + "version-string": "1.7.2-3", + "port-version": 0 + }, + { + "git-tree": "f97940e21a1f672e96332b2da9e8930998239ab8", + "version-string": "1.7.2-2", + "port-version": 0 + }, + { + "git-tree": "09fcfc20df67fb4cad7f3b40748809e0705f3ae2", + "version-string": "1.7.2-1", + "port-version": 0 + }, + { + "git-tree": "58d5e350f5ac048f30cd36efcab3250bdd6fb400", + "version-string": "1.7.2", + "port-version": 0 + }, + { + "git-tree": "4f1a115c56b7f09d0d01f81232949e7abd365ba0", + "version-string": "1.7.1-1", + "port-version": 0 + }, + { + "git-tree": "136b103efc7fdbe8aea12cdfd1799b9c588b947f", + "version-string": "1.7.1", + "port-version": 0 + }, + { + "git-tree": "aa5fc7818dc2c83e4d84d5df21cc6c48c898f8b8", + "version-string": "1.6.2-1", + "port-version": 0 + }, + { + "git-tree": "7a14d9a6abc655e76399de329c9a8d45551487fb", + "version-string": "1.6.2", + "port-version": 0 + }, + { + "git-tree": "096cd5a018a59a223f4104d517b3a3310e7840c0", + "version-string": "1.6.1", + "port-version": 0 + }, + { + "git-tree": "6bfe84f3fd811ce88a689ed04b603db607eae17c", + "version-string": "1.5.6", + "port-version": 0 + }, + { + "git-tree": "dbc71ebe00d4bc088037ee556c5359b6f9a3444c", + "version-string": "1.5.5", + "port-version": 0 + }, + { + "git-tree": "50a06c9d10ab6436e45b750f9a6f5951df50ce28", + "version-string": "1.5.4-1", + "port-version": 0 + }, + { + "git-tree": "fd6f1c61a227dbc8c1b1f0d70b8fbe1717c51c96", + "version-string": "1.5.4", + "port-version": 0 + }, + { + "git-tree": "d2e2a35ba9d363b6396efad7dc611db38e99adde", + "version-string": "1.5.3", + "port-version": 0 + }, + { + "git-tree": "e9e15dd27cc96bac986a079f61ae96b7b581c057", + "version-string": "1.5.1-hotfix-42f8985", + "port-version": 0 + }, + { + "git-tree": "5ea317633128d4c965e0e5e269b811b0b0776366", + "version-string": "1.4.1-66be23c9204c5567d1c51e6f57ba23bffa517a7c", + "port-version": 0 + }, + { + "git-tree": "bfece345f8e00ba03c9520b57c648b0a8dfa3e32", + "version-string": "1.4.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nano-signal-slot.json b/externals/vcpkg/versions/n-/nano-signal-slot.json new file mode 100755 index 000000000..c5ca118d7 --- /dev/null +++ b/externals/vcpkg/versions/n-/nano-signal-slot.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "b46cf4c106c7a062c72ff464ad172d52f9f2a642", + "version-string": "2.0.1", + "port-version": 1 + }, + { + "git-tree": "c6a06a1a383f174caa5a7559cee00b0a997ff482", + "version-string": "2.0.1", + "port-version": 0 + }, + { + "git-tree": "4bd843bc1f3401ea0a5482cd9f68be9213cdeeff", + "version-string": "2018-08-25-1", + "port-version": 0 + }, + { + "git-tree": "c5eb946c169cc6bee60f5d600b68b88551df8ace", + "version-string": "commit-25aa2aa90d450d3c7550c535c7993a9e2ed0764a", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nanobench.json b/externals/vcpkg/versions/n-/nanobench.json new file mode 100755 index 000000000..59ceaf25a --- /dev/null +++ b/externals/vcpkg/versions/n-/nanobench.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "6353026a82baa4c84cc43554b4f518b8dbf79794", + "version": "4.3.7", + "port-version": 0 + }, + { + "git-tree": "b2078ee30dd4414efb21ecb3fe7c54efa854bc95", + "version": "4.3.6", + "port-version": 0 + }, + { + "git-tree": "d7dea56e415792e4f5c3a2b80ba3731a2955fbf2", + "version-string": "4.3.0", + "port-version": 1 + }, + { + "git-tree": "92e0f95608004b243767ee74382095a2a087da58", + "version-string": "4.3.0", + "port-version": 0 + }, + { + "git-tree": "897cb151ed0a20d6d392d7109c9b37200a47adf7", + "version-string": "4.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nanodbc.json b/externals/vcpkg/versions/n-/nanodbc.json new file mode 100755 index 000000000..ef870e927 --- /dev/null +++ b/externals/vcpkg/versions/n-/nanodbc.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "7de6296fc337f181517f8ed4c2e6ed35d749e414", + "version": "2.13.0", + "port-version": 6 + }, + { + "git-tree": "82bfc56de1430aa6fec9c27925d46a72e1b800a0", + "version": "2.13.0", + "port-version": 5 + }, + { + "git-tree": "3549b9a15615f77ec718e9071309482707ad3779", + "version": "2.13.0", + "port-version": 4 + }, + { + "git-tree": "2c22ba3957ee9a1a2c6d893c746b6a51bf38435c", + "version-string": "2.13.0", + "port-version": 3 + }, + { + "git-tree": "4610c5bd3b7d399b683bea63cb00fe277bbcb3f8", + "version-string": "2.13.0", + "port-version": 2 + }, + { + "git-tree": "921e300d4f37f15072f30eaaf382d2d27f598ac6", + "version-string": "2.13.0", + "port-version": 0 + }, + { + "git-tree": "174e2417bc9f936e7b856fa71ed1782c8b2d479e", + "version-string": "2.13.0", + "port-version": 1 + }, + { + "git-tree": "8323483e55b9eb32dd5f7801468e3daed8dff134", + "version-string": "2.13.0", + "port-version": 0 + }, + { + "git-tree": "bf6a98594c343544352a582ea3137bd7176c5172", + "version-string": "2.12.4", + "port-version": 9 + }, + { + "git-tree": "fc64f1f3821e9e09e5fe7c2567ebce3e3cfcd788", + "version-string": "2.12.4-8", + "port-version": 0 + }, + { + "git-tree": "7a0eb636aeb71e6b1d6fb49c4d3c2069b096458c", + "version-string": "2.12.4-7", + "port-version": 0 + }, + { + "git-tree": "b10fd1beea51b05ca320573f646b22d4510e8ad9", + "version-string": "2.12.4-5", + "port-version": 0 + }, + { + "git-tree": "e7e994942f4a99c08d9f1ee37a3d6bf2213f9eaa", + "version-string": "2.12.4-4", + "port-version": 0 + }, + { + "git-tree": "ecdcb2e22a873e00e09ca5fba4df30c47e015872", + "version-string": "2.12.4-3", + "port-version": 0 + }, + { + "git-tree": "4b875f604ab78245d055490f7a26f3d005d955ce", + "version-string": "2.12.4-2", + "port-version": 0 + }, + { + "git-tree": "27ca1bf9cdb1602d324d41504a71fd9241a76022", + "version-string": "2.12.4-1", + "port-version": 0 + }, + { + "git-tree": "6a3eec1775d776d027cc4882f0868f75faa0b6e2", + "version-string": "2.12.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nanoflann.json b/externals/vcpkg/versions/n-/nanoflann.json new file mode 100755 index 000000000..6145f412d --- /dev/null +++ b/externals/vcpkg/versions/n-/nanoflann.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "59c3e1998e35dcf6648c1775b19e40c5017b2c84", + "version": "1.4.2", + "port-version": 0 + }, + { + "git-tree": "481ec544fb82ec73f6f0e01d1333f412d3e82d2d", + "version": "1.3.2", + "port-version": 1 + }, + { + "git-tree": "d9c4ef40eda67ef94cca10e5a50ac679ac0a34ad", + "version": "1.3.2", + "port-version": 0 + }, + { + "git-tree": "256c8df02e530498eeb951b7760d5988d22615eb", + "version-string": "1.3.1", + "port-version": 1 + }, + { + "git-tree": "d570a82d4db97264fa7c99bdbbea6f5d42d9e674", + "version-string": "1.3.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nanogui.json b/externals/vcpkg/versions/n-/nanogui.json new file mode 100755 index 000000000..25cc3e33a --- /dev/null +++ b/externals/vcpkg/versions/n-/nanogui.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "55a7f3e088fe04ac01f7693c0685770ba865e6ae", + "version-date": "2019-09-23", + "port-version": 3 + }, + { + "git-tree": "bb3bc286985c1be4bb92ab92e45617410726de3c", + "version-string": "2019-09-23", + "port-version": 2 + }, + { + "git-tree": "4d1fa22f0634b118230bfba869eff9c23ceecbc3", + "version-string": "2019-09-23", + "port-version": 1 + }, + { + "git-tree": "13a4e33a01629667f26be71ef251e5d2b9d3e56e", + "version-string": "2019-09-23", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nanomsg.json b/externals/vcpkg/versions/n-/nanomsg.json new file mode 100755 index 000000000..efb1e3ff8 --- /dev/null +++ b/externals/vcpkg/versions/n-/nanomsg.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "ffe814aa129dfc6a1cdfc5d38e7a441d2b2fc47b", + "version-string": "1.1.5", + "port-version": 4 + }, + { + "git-tree": "6c34a4dcd9b1c045f989cc67c0dad5ac594696d4", + "version-string": "1.1.5", + "port-version": 3 + }, + { + "git-tree": "8d195243efc98f0bfed5942ebf226879fcf5d545", + "version-string": "1.1.5-2", + "port-version": 0 + }, + { + "git-tree": "6c782bdd98f7b84b83168ae9b24faf10ee84d0ec", + "version-string": "1.1.5-1", + "port-version": 0 + }, + { + "git-tree": "48963c4297fcbcc18e05d62f9443eefc38746b0f", + "version-string": "1.1.5", + "port-version": 0 + }, + { + "git-tree": "1d1b0634175bdaf6555f822931280322729edc40", + "version-string": "1.1.4", + "port-version": 0 + }, + { + "git-tree": "49c3abd02b0b5a13e78b570ea05c59c774a951ec", + "version-string": "1.1.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nanopb.json b/externals/vcpkg/versions/n-/nanopb.json new file mode 100755 index 000000000..ecc09b1a3 --- /dev/null +++ b/externals/vcpkg/versions/n-/nanopb.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "855b599338a79c3a7d61c1171110e4dd49c3f164", + "version-semver": "0.4.5", + "port-version": 0 + }, + { + "git-tree": "47f954644a0f5f22381ae3655f84b3f790e4e1e8", + "version-string": "2019-02-12-2", + "port-version": 0 + }, + { + "git-tree": "594b2fd1655940da92878956a9b86d28532c244c", + "version-string": "2019-02-12-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nanoprintf.json b/externals/vcpkg/versions/n-/nanoprintf.json new file mode 100755 index 000000000..44d94b76f --- /dev/null +++ b/externals/vcpkg/versions/n-/nanoprintf.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "eb37eca3c4891582693eb5a769cf307c60b059ac", + "version-string": "2020-05-27", + "port-version": 1 + }, + { + "git-tree": "d46293c2d3548e9170ec8a0b30cef90cf9638a2c", + "version-string": "2020-05-27", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nanorange.json b/externals/vcpkg/versions/n-/nanorange.json new file mode 100755 index 000000000..8316508a1 --- /dev/null +++ b/externals/vcpkg/versions/n-/nanorange.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "66af15410d36dcfe707cfa3ed693e2ad4b8c0a6b", + "version-date": "2020-07-06", + "port-version": 0 + }, + { + "git-tree": "a9d8e3712ada3496381d4a9ec4d8b6eb638f65e8", + "version-string": "0.0.0", + "port-version": 1 + }, + { + "git-tree": "44197d1b2631aa3de246da4cf6e9546a225bf9c2", + "version-string": "0.0.0", + "port-version": 0 + }, + { + "git-tree": "318c934bc14c90e78fa90d29c77b75590a217eea", + "version-string": "60be62", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nanort.json b/externals/vcpkg/versions/n-/nanort.json new file mode 100755 index 000000000..54e855482 --- /dev/null +++ b/externals/vcpkg/versions/n-/nanort.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "9fab3a6181cbaace8875990f9aab595cdad59956", + "version-string": "2019-08-20", + "port-version": 2 + }, + { + "git-tree": "a2635321561486b77f14251f44d1b3ce29ec1b24", + "version-string": "2019-08-20-1", + "port-version": 0 + }, + { + "git-tree": "8d866ee14452c6b244f1c5369f5e760e07bee25b", + "version-string": "2019-08-20", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nanosvg.json b/externals/vcpkg/versions/n-/nanosvg.json new file mode 100755 index 000000000..9a3038374 --- /dev/null +++ b/externals/vcpkg/versions/n-/nanosvg.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "827223ed18553b608489e328101549261d0c9d5a", + "version-date": "2022-04-29", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nanovg.json b/externals/vcpkg/versions/n-/nanovg.json new file mode 100755 index 000000000..56718be73 --- /dev/null +++ b/externals/vcpkg/versions/n-/nanovg.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "6ea125c3f4f9b665a744cd0738c8a11837106f05", + "version-date": "2019-08-30", + "port-version": 5 + }, + { + "git-tree": "016ef1232ccb3f452530283711be418b33c28e17", + "version-string": "2019-8-30", + "port-version": 4 + }, + { + "git-tree": "9d02e60630da5a385a4f9fbdea0f0fcffae78ff9", + "version-string": "2019-8-30-3", + "port-version": 0 + }, + { + "git-tree": "71fc878e561b3b7473846d963d36d011f54aeaf2", + "version-string": "2019-8-30-1", + "port-version": 0 + }, + { + "git-tree": "1d032662dfcd6b8ea73f27ebd3e8204aa912b8ae", + "version-string": "2019-8-30", + "port-version": 0 + }, + { + "git-tree": "d3e0874057ad73536696bb985d6a799eb27bb4d2", + "version-string": "master", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nativefiledialog.json b/externals/vcpkg/versions/n-/nativefiledialog.json new file mode 100755 index 000000000..831ee32e4 --- /dev/null +++ b/externals/vcpkg/versions/n-/nativefiledialog.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "a74fcf99cb59fc1094b1b40622cead632c0df81a", + "version-date": "2022-01-20", + "port-version": 0 + }, + { + "git-tree": "d765a8f84ba49c18701f68b7471f1b93b7313ddc", + "version-date": "2019-08-28", + "port-version": 1 + }, + { + "git-tree": "b2e484cc447978109bcd69b2fa61920b2059d0f9", + "version-string": "2019-08-28", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nayuki-qr-code-generator.json b/externals/vcpkg/versions/n-/nayuki-qr-code-generator.json new file mode 100755 index 000000000..126ef8e55 --- /dev/null +++ b/externals/vcpkg/versions/n-/nayuki-qr-code-generator.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9131848b9c36878cb0944b3e8058fa0d25b0d335", + "version": "1.7.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nccl.json b/externals/vcpkg/versions/n-/nccl.json new file mode 100755 index 000000000..5739121ed --- /dev/null +++ b/externals/vcpkg/versions/n-/nccl.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "6f07fdf26f53fd4974ad4cb6d6df430dc28e52aa", + "version": "2.4.6", + "port-version": 2 + }, + { + "git-tree": "c9b172ef032bf322539dab71b19f5dc27b679fd0", + "version-string": "2.4.6", + "port-version": 1 + }, + { + "git-tree": "cb9af30276eda49db198401cdefa5a15fcc9e8ce", + "version-string": "2.4.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/ncurses.json b/externals/vcpkg/versions/n-/ncurses.json new file mode 100755 index 000000000..26698d561 --- /dev/null +++ b/externals/vcpkg/versions/n-/ncurses.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "ea7aecbf38cef7f64f929c679d55812e679ca496", + "version": "6.3", + "port-version": 1 + }, + { + "git-tree": "68d49e9492a5a00c0b04cfbe2985ed99fc33973a", + "version-string": "6.3", + "port-version": 0 + }, + { + "git-tree": "f196044f9f7779e0bdb54015dbd3be84aaa00820", + "version-string": "6.2", + "port-version": 1 + }, + { + "git-tree": "ab8de39c1659867da459ac0bec7e09bee5762819", + "version-string": "6.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/neargye-semver.json b/externals/vcpkg/versions/n-/neargye-semver.json new file mode 100755 index 000000000..bae0ce501 --- /dev/null +++ b/externals/vcpkg/versions/n-/neargye-semver.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "00131d8f7cbb5461d1cb707d853857082129777a", + "version": "0.3.0", + "port-version": 0 + }, + { + "git-tree": "8cc7cede702d8dfd563701819a5e8ed3d0778236", + "version-string": "0.2.2", + "port-version": 1 + }, + { + "git-tree": "eccabb2b0f4df666dbb95a7c14c3f8f1b8e57cd4", + "version-string": "0.2.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/ned14-internal-quickcpplib.json b/externals/vcpkg/versions/n-/ned14-internal-quickcpplib.json new file mode 100755 index 000000000..28e233935 --- /dev/null +++ b/externals/vcpkg/versions/n-/ned14-internal-quickcpplib.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "be7fa7b222ea2c080583b12ad2f203d63c7ed55c", + "version": "0.0.0-cad832c8", + "port-version": 1 + }, + { + "git-tree": "af77893b0d87106812194f8bc866ecfbc6ade24a", + "version-string": "0.0.0-cad832c8", + "port-version": 0 + }, + { + "git-tree": "e27f2efe92a17e1c67c5115c9ef15e7e63b1f3e8", + "version-string": "0.0.0-8089a948", + "port-version": 0 + }, + { + "git-tree": "801be68901e5e7e84e4069015346fc457e72953c", + "version-string": "0.0.0-e691a6dc", + "port-version": 0 + }, + { + "git-tree": "3cd8528057f78bdbc43616bbe7349acd5cc41c77", + "version-string": "0.0.0-7cb75d4e", + "port-version": 1 + }, + { + "git-tree": "22e381237aadb997367803430ddb3f4290acc88c", + "version-string": "0.0.0-7cb75d4e", + "port-version": 0 + }, + { + "git-tree": "d71cb92f85e0f089d1d2f4161be4f08be9de26d1", + "version-string": "0.0.0-24d92c71", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/neon2sse.json b/externals/vcpkg/versions/n-/neon2sse.json new file mode 100755 index 000000000..e3590ae1a --- /dev/null +++ b/externals/vcpkg/versions/n-/neon2sse.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "02bae7681d6c8c026a5f49dd3b4b37a430ea6878", + "version-date": "2021-09-16", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/netcdf-c.json b/externals/vcpkg/versions/n-/netcdf-c.json new file mode 100755 index 000000000..af3e5e2b4 --- /dev/null +++ b/externals/vcpkg/versions/n-/netcdf-c.json @@ -0,0 +1,124 @@ +{ + "versions": [ + { + "git-tree": "f4d487e2f7e093b2406887023bb3a0856735bad5", + "version": "4.8.1", + "port-version": 2 + }, + { + "git-tree": "9d8a0a97fd75563172e3f1947608db3802c3b84a", + "version": "4.8.1", + "port-version": 1 + }, + { + "git-tree": "7e6529a5673ac8494b62443a9fab590ce6810826", + "version": "4.8.1", + "port-version": 0 + }, + { + "git-tree": "6af71c6bbdb51d1cbbade70010ccf9c628938ac2", + "version": "4.7.4", + "port-version": 4 + }, + { + "git-tree": "069ccb40f8ce75d6ec88b8fe31966c11fcf6906b", + "version-string": "4.7.4", + "port-version": 3 + }, + { + "git-tree": "aa42781f00db0c2de52798f0345801b667977c79", + "version-string": "4.7.4", + "port-version": 2 + }, + { + "git-tree": "725a87fc08fed5789a9a4a3308b2a80f4906a400", + "version-string": "4.7.4", + "port-version": 1 + }, + { + "git-tree": "0355e5b36c74e347af5508261ab371ac2880fbd4", + "version-string": "4.7.4", + "port-version": 0 + }, + { + "git-tree": "fd30ba70e0dc6309ad9637689e07094f30d54a8c", + "version-string": "4.7.3", + "port-version": 4 + }, + { + "git-tree": "0b90bdfb0ba48ae59c3e945c5a717030505d8f27", + "version-string": "4.7.3", + "port-version": 3 + }, + { + "git-tree": "1472b0b2292dbaa471a1e82b015a839358602d33", + "version-string": "4.7.3", + "port-version": 2 + }, + { + "git-tree": "c5e831c751d8652f07275083874d181f0c057b10", + "version-string": "4.7.3-1", + "port-version": 0 + }, + { + "git-tree": "1c02bd4421a4ebfb7a1d0222144b3cca96d567e1", + "version-string": "4.7.3", + "port-version": 0 + }, + { + "git-tree": "8f26c247a16aa9457a4d83affc46d62619c184a8", + "version-string": "4.7.0-5", + "port-version": 0 + }, + { + "git-tree": "428a9d29f9d11a5ccf9582279993c9d2e41225c2", + "version-string": "4.7.0-4", + "port-version": 0 + }, + { + "git-tree": "c08bb06832202d095ed21a34ea0bce6277b766f1", + "version-string": "4.7.0-3", + "port-version": 0 + }, + { + "git-tree": "5730f0a7087dc8bd8d946ed91280390218876a9f", + "version-string": "4.7.0-2", + "port-version": 0 + }, + { + "git-tree": "6512e94aab0f062bb9db970d305d91530fff5fc2", + "version-string": "4.7.0-1", + "port-version": 0 + }, + { + "git-tree": "82051b8ae0377af6fa6e8f4529ade1db3afe8574", + "version-string": "4.7.0", + "port-version": 0 + }, + { + "git-tree": "445a1668da32bbc514aa12d2d6e6943e47832c11", + "version-string": "4.6.2-1", + "port-version": 0 + }, + { + "git-tree": "03ef1a7242e85015e484f7e8a975ae666f4de7e5", + "version-string": "4.6.2", + "port-version": 0 + }, + { + "git-tree": "71b146b9d4cea7ec41786ddbeb3a4164f349ec47", + "version-string": "4.4.1.1-2", + "port-version": 0 + }, + { + "git-tree": "92fdfc7949185eac43f5d95c0b4b914a95491667", + "version-string": "4.4.1.1-1", + "port-version": 0 + }, + { + "git-tree": "c3cb5b4354b9057f1e7378792c4f666830de3c12", + "version-string": "4.4.1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/netcdf-cxx4.json b/externals/vcpkg/versions/n-/netcdf-cxx4.json new file mode 100755 index 000000000..a98d4e510 --- /dev/null +++ b/externals/vcpkg/versions/n-/netcdf-cxx4.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "e973009e3eb7bc949e546204441002d914aa8886", + "version-string": "4.3.1", + "port-version": 3 + }, + { + "git-tree": "17850b6ba47c047dc7e2e55bdb6b2956521d424c", + "version-string": "4.3.1", + "port-version": 2 + }, + { + "git-tree": "be1a100ea4fa132b206c23d21515a721d933889c", + "version-string": "4.3.1", + "port-version": 1 + }, + { + "git-tree": "37f045219c6b94d0f3df5aee1fa2ff22068e6ad1", + "version-string": "4.3.1", + "port-version": 0 + }, + { + "git-tree": "64bcda2a7fb352a6d5a571097d868fabbdc80897", + "version-string": "4.3.0-5", + "port-version": 0 + }, + { + "git-tree": "6c8bc2cd8515277be4284793d118b14baa780d61", + "version-string": "4.3.0-4", + "port-version": 0 + }, + { + "git-tree": "b24f7fa7bd4bba4c2865d464d7ed9d499c1590d0", + "version-string": "4.3.0-2", + "port-version": 0 + }, + { + "git-tree": "2d5fd97c9e7ce59dc22fc0b0382629373ab659b7", + "version-string": "4.3.0-1", + "port-version": 0 + }, + { + "git-tree": "c50e548832c03140ac4af027e4b0fe8b53a0916a", + "version-string": "4.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nethost.json b/externals/vcpkg/versions/n-/nethost.json new file mode 100755 index 000000000..979f1d085 --- /dev/null +++ b/externals/vcpkg/versions/n-/nethost.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "267a7f140709e65c5d692a7f3add885021764c25", + "version": "6.0.5", + "port-version": 0 + }, + { + "git-tree": "5b1a7d98ce2c1520bbb370dfc2fcb8c3d704c300", + "version-date": "2019-12-21", + "port-version": 2 + }, + { + "git-tree": "15d7240f68194b95c97bdac0658a1ffce7015f34", + "version-string": "2019-12-21", + "port-version": 1 + }, + { + "git-tree": "ca0380ac4071317e01632a0af40ffacd2ab133fd", + "version-string": "2019-12-21", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nettle.json b/externals/vcpkg/versions/n-/nettle.json new file mode 100755 index 000000000..450619245 --- /dev/null +++ b/externals/vcpkg/versions/n-/nettle.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "17fa323aae2ecee658549bd9a8951a2ce6c9880a", + "version": "3.7.3", + "port-version": 0 + }, + { + "git-tree": "2d7735edc12e985fbe6bae0489a8c01ff18413cd", + "version": "3.6", + "port-version": 2 + }, + { + "git-tree": "87e3211d256198eb00d854b24b2043efb0fe892d", + "version-string": "3.6", + "port-version": 1 + }, + { + "git-tree": "c5667fa4f9c8aae21162042f6193069cdb994337", + "version-string": "3.6", + "port-version": 0 + }, + { + "git-tree": "b24ec7541d5c5a5f45da1897ec4474c552fd59ad", + "version-string": "3.5.1", + "port-version": 5 + }, + { + "git-tree": "bd9a99e9308321c37b84ccbf0093fdfd2c87c9d5", + "version-string": "3.5.1", + "port-version": 4 + }, + { + "git-tree": "8c84dbd102c06d3127eaea0652b375e60d7fcb5d", + "version-string": "3.5.1", + "port-version": 3 + }, + { + "git-tree": "f14b6678d91210fec7ab1d097386bca4abe6b36a", + "version-string": "3.5.1-2", + "port-version": 0 + }, + { + "git-tree": "cfd585b91a32289888892e76466185a72f516fbf", + "version-string": "3.5.1-1", + "port-version": 0 + }, + { + "git-tree": "c0343c7116ca511038e764ca37c8068fc2c4b0a5", + "version-string": "3.5.1 ", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/networkdirect-sdk.json b/externals/vcpkg/versions/n-/networkdirect-sdk.json new file mode 100755 index 000000000..36ef8dc50 --- /dev/null +++ b/externals/vcpkg/versions/n-/networkdirect-sdk.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "4ae7e238a2a00496c78d2d2bb2101f9e054975e9", + "version": "2.0.1", + "port-version": 3 + }, + { + "git-tree": "38faf77539eb45a0336501ea8af5d63b9ca11c83", + "version-string": "2.0.1", + "port-version": 2 + }, + { + "git-tree": "33dae8e97560e2d4c72ea3d0e49e59a70ee3d979", + "version-string": "2.0.1", + "port-version": 1 + }, + { + "git-tree": "27e231e5c0df7b8dd8788108c7d9cb266348c427", + "version-string": "2.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nghttp2.json b/externals/vcpkg/versions/n-/nghttp2.json new file mode 100755 index 000000000..fe89531ac --- /dev/null +++ b/externals/vcpkg/versions/n-/nghttp2.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "b7477580246c8547d75abc176295b832544cb132", + "version": "1.46.0", + "port-version": 0 + }, + { + "git-tree": "e765c53ede7876249ec80ae256b96c468d394734", + "version": "1.45.1", + "port-version": 0 + }, + { + "git-tree": "7d98b71b7948db8173a563483081700e706268b0", + "version": "1.44.0", + "port-version": 0 + }, + { + "git-tree": "c962462a3cfe855132c4b1d565bc4e3c4a67797d", + "version-string": "1.42.0", + "port-version": 0 + }, + { + "git-tree": "027507d008e249e40ba3fd600fa9323660fe87ee", + "version-string": "1.39.2-2", + "port-version": 0 + }, + { + "git-tree": "a527b3cb5a9017782ebf52f87aef5986965e1202", + "version-string": "1.39.2-1", + "port-version": 0 + }, + { + "git-tree": "5bbc6fa002786f76f0d66991b13893ff5613cdaf", + "version-string": "1.39.2", + "port-version": 0 + }, + { + "git-tree": "2ed6b0f77ad89f84a72dd18a5981d5dda4b64178", + "version-string": "1.35.0", + "port-version": 0 + }, + { + "git-tree": "34cbb731a1652ab7c86e8cc686e2a314a775161c", + "version-string": "1.34.0", + "port-version": 0 + }, + { + "git-tree": "e1f8bbfa9dd8f1a4bd88c8a8f27bf11dbae8c993", + "version-string": "1.33.0", + "port-version": 0 + }, + { + "git-tree": "ce46b9e34fffd5df74b97170a7959f38d0c5a91f", + "version-string": "1.32.1", + "port-version": 0 + }, + { + "git-tree": "b6176530018187f44542caf0d651219db32bdd49", + "version-string": "1.32.0", + "port-version": 0 + }, + { + "git-tree": "01ee825f2bce23882a2df637622ec2d41f821a78", + "version-string": "1.30.0-1", + "port-version": 0 + }, + { + "git-tree": "79969286c58d60375ea5e35327519ab3d98f5e12", + "version-string": "1.29.0-1", + "port-version": 0 + }, + { + "git-tree": "3d370d4c965034f8620c957e8a9bc18f9939b2d0", + "version-string": "1.29.0", + "port-version": 0 + }, + { + "git-tree": "b4a96ddcdea8083676c0e6c4bfa76cb6c540de6e", + "version-string": "1.28.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/ngspice.json b/externals/vcpkg/versions/n-/ngspice.json new file mode 100755 index 000000000..79a6d2a47 --- /dev/null +++ b/externals/vcpkg/versions/n-/ngspice.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "ec514c4b9a568123369d7d081d004a2d92f6d592", + "version": "35", + "port-version": 2 + }, + { + "git-tree": "f9060da8afaaccceef8b5265f7758f20bc23e289", + "version": "35", + "port-version": 1 + }, + { + "git-tree": "cce657d55082d7a23496c44cb311e208ea31cab4", + "version-string": "35", + "port-version": 0 + }, + { + "git-tree": "249a0e9bafd17932e3d46a0f979a2983b8a78b0d", + "version-string": "34", + "port-version": 1 + }, + { + "git-tree": "2a9bd9cf0045f6a35080bf13ea51abba65bd49a6", + "version-string": "34", + "port-version": 0 + }, + { + "git-tree": "ff27e9605199ca4134c1ab3fa6bcb311096a0e10", + "version-string": "33", + "port-version": 1 + }, + { + "git-tree": "90c388f47ca769fd11449fde9d70402e9865a986", + "version-string": "33", + "port-version": 0 + }, + { + "git-tree": "b15238b045e17d6543080e78e20071380df008f2", + "version-string": "32", + "port-version": 1 + }, + { + "git-tree": "5e33c5788e4617ced7e621a8c1a6ae99ef09e92f", + "version-string": "32", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nifly.json b/externals/vcpkg/versions/n-/nifly.json new file mode 100755 index 000000000..07e020487 --- /dev/null +++ b/externals/vcpkg/versions/n-/nifly.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "208094a8ee378aaa7a4de63e4d7e59401fecdb9b", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nifticlib.json b/externals/vcpkg/versions/n-/nifticlib.json new file mode 100755 index 000000000..b3f2e4843 --- /dev/null +++ b/externals/vcpkg/versions/n-/nifticlib.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "e27d9a2c6e8d4b8b00fc3d1adb0f54f06fa5adee", + "version-string": "2020-04-30", + "port-version": 1 + }, + { + "git-tree": "28adfbbaaf62ef125a255045592cd935532a6e2d", + "version-string": "2020-04-30", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nlohmann-fifo-map.json b/externals/vcpkg/versions/n-/nlohmann-fifo-map.json new file mode 100755 index 000000000..86d45ffcc --- /dev/null +++ b/externals/vcpkg/versions/n-/nlohmann-fifo-map.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "de935008898a0cfdb6326baedb7781bcbd5df4e7", + "version-string": "2018.05.07", + "port-version": 2 + }, + { + "git-tree": "f9a56c0cc09fe04a1c98d9d37403c82718ba7e69", + "version-string": "2018.05.07-1", + "port-version": 0 + }, + { + "git-tree": "458c5e159dd6732ba234ed343bbb4147c77d9b4a", + "version-string": "2018.05.07", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nlohmann-json.json b/externals/vcpkg/versions/n-/nlohmann-json.json new file mode 100755 index 000000000..b476b4188 --- /dev/null +++ b/externals/vcpkg/versions/n-/nlohmann-json.json @@ -0,0 +1,129 @@ +{ + "versions": [ + { + "git-tree": "91f188e19b106e7d316de593e98f3319f8f5ec25", + "version-semver": "3.10.5", + "port-version": 3 + }, + { + "git-tree": "becf6a86f7e28342840fc807840c68b133c6fad8", + "version-semver": "3.10.5", + "port-version": 2 + }, + { + "git-tree": "fa0a087d0444a7f2c79a44bce91c51550d5f2e47", + "version-semver": "3.10.5", + "port-version": 1 + }, + { + "git-tree": "d1fe747457714c4c43b12502de05b2d006b440d4", + "version-semver": "3.10.5", + "port-version": 0 + }, + { + "git-tree": "f948131b4bc6e2e9ae67cb7d40f5e930991fba21", + "version-semver": "3.10.4", + "port-version": 0 + }, + { + "git-tree": "8221e7cbc0745629018b122f192835bed642e844", + "version-semver": "3.10.2", + "port-version": 0 + }, + { + "git-tree": "3b9a6d5f3d94db5699d4448f717ff32e4ea5722b", + "version-string": "3.9.1", + "port-version": 0 + }, + { + "git-tree": "6da342bdc3635e9aa6e8f9b428718d61a7c6ab16", + "version-string": "3.9.0", + "port-version": 0 + }, + { + "git-tree": "b7d833a0ac9950ea38908c0c72a6866de1b15af5", + "version-string": "3.8.0", + "port-version": 2 + }, + { + "git-tree": "52072ed630dd66bf5eaacff20b6f24f52e8ff39c", + "version-string": "3.8.0", + "port-version": 0 + }, + { + "git-tree": "bcf781e8f7e8eb7baddab0853dc5ef7ed59d0812", + "version-string": "3.7.3", + "port-version": 0 + }, + { + "git-tree": "09087343e4426668b9293613aab3e807691b7cd7", + "version-string": "3.7.0", + "port-version": 0 + }, + { + "git-tree": "f126a28b3648dfda2a1fdc671e515475cc87f83a", + "version-string": "3.6.1", + "port-version": 0 + }, + { + "git-tree": "c0f554a5b581f1205ee4a025ec4e830f4bce8552", + "version-string": "3.6.0", + "port-version": 0 + }, + { + "git-tree": "ebafe7f35529cc53ac576eece15212b11df7b3b7", + "version-string": "3.5.0-5", + "port-version": 0 + }, + { + "git-tree": "4d5a5f644590ded6507ef0dc601f2a4032c5d856", + "version-string": "3.5.0", + "port-version": 0 + }, + { + "git-tree": "d9d8197f3629de42e8e7ddbfccd21d80863afadf", + "version-string": "3.4.0", + "port-version": 0 + }, + { + "git-tree": "abcaac745f22333ed5ebee9c292f9ede285c3e18", + "version-string": "3.3.0", + "port-version": 0 + }, + { + "git-tree": "93b56faf6101fb5ad93a03e097f7958dcb9569b0", + "version-string": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "94b0f101711ff48e5c4bb02c0afb246d37ea7f34", + "version-string": "3.1.2", + "port-version": 0 + }, + { + "git-tree": "93cc0cf00fa46aef2f342319d08af24ae1aeeba5", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "733e906ac0ae3fb70b2bf09ac254670487646cb0", + "version-string": "3.0.1", + "port-version": 0 + }, + { + "git-tree": "05bd7807870d0187a8ab16434340d2cae8eb14a5", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "a2451141654e076200240c080998c24e3ec5a41c", + "version-string": "2.1.1-1", + "port-version": 0 + }, + { + "git-tree": "99197062ac05c3a7c2f2809a09f8a5521e75da30", + "version-string": "2.1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nlopt.json b/externals/vcpkg/versions/n-/nlopt.json new file mode 100755 index 000000000..9450b649d --- /dev/null +++ b/externals/vcpkg/versions/n-/nlopt.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "b98ca95cd180e8c31c718f78ef39b5d733f0399f", + "version": "2.7.1", + "port-version": 0 + }, + { + "git-tree": "8307558e59725a365e7139c8e5fd371e5d3481e4", + "version-string": "2.7.0", + "port-version": 1 + }, + { + "git-tree": "7702c2f9e4c4ef687a026196c6a707c390e676a5", + "version-string": "2.7.0", + "port-version": 0 + }, + { + "git-tree": "0d774cc0c2321600ce14b75bfa2c8ef5c5b27580", + "version-string": "2.6.2-1", + "port-version": 0 + }, + { + "git-tree": "e78ae190e9e90d4a4a740a7f3460be6ff6f59414", + "version-string": "2.6.2", + "port-version": 0 + }, + { + "git-tree": "87fadb54afe197118b2be5eda72d8e4b56791adf", + "version-string": "2.6.1-1", + "port-version": 0 + }, + { + "git-tree": "35004ce09f66f99ffbbbcdc38bee9fc011e7bd82", + "version-string": "2.6.1", + "port-version": 0 + }, + { + "git-tree": "1d384bf97e7ec32e3481ce3802512febf3a3f9e3", + "version-string": "2.4.2-1226c127", + "port-version": 0 + }, + { + "git-tree": "5e30ef59691386e5e8643bff42edf7461babde5b", + "version-string": "2.4.2-c43afa08d~vcpkg1-1", + "port-version": 0 + }, + { + "git-tree": "08e7b904616f32e5afdec11835fca58c04d44e96", + "version-string": "2.4.2-c43afa08d~vcpkg1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nmap.json b/externals/vcpkg/versions/n-/nmap.json new file mode 100755 index 000000000..16b6862f6 --- /dev/null +++ b/externals/vcpkg/versions/n-/nmap.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "b435c01d439c57ba46d2de58b81fd1da81555776", + "version": "7.70", + "port-version": 5 + }, + { + "git-tree": "83ebdc9303a1f8917df4275921160636cdb05eef", + "version-string": "7.70-4", + "port-version": 0 + }, + { + "git-tree": "9425d0f2139b304472ddff641ff55f188fd78d9d", + "version-string": "7.70-3", + "port-version": 0 + }, + { + "git-tree": "eb2e1019f2303a847a647c4171f95c35dc68e5e6", + "version-string": "7.70-1", + "port-version": 0 + }, + { + "git-tree": "59121e9dcab8932b0b082a4ca2f733859f8b5aa1", + "version-string": "7.70", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nmslib.json b/externals/vcpkg/versions/n-/nmslib.json new file mode 100755 index 000000000..733d5e457 --- /dev/null +++ b/externals/vcpkg/versions/n-/nmslib.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "98fea3cd9111ced5710357dee8212e576efd514b", + "version": "2.1.1", + "port-version": 1 + }, + { + "git-tree": "b0256cb272ca0fe86ee427cdd64ad08f41c656b8", + "version": "2.1.1", + "port-version": 0 + }, + { + "git-tree": "cc690326d2976978fc71bb8c0e5a631e6cec0064", + "version-string": "2.0.6", + "port-version": 1 + }, + { + "git-tree": "8aa3ecb4ff8364680fe15c756eb2e8a0fecbc167", + "version-string": "2.0.6", + "port-version": 0 + }, + { + "git-tree": "d420566df44d8d163d5e132c1e0d02a3e80a4d39", + "version-string": "1.8.2", + "port-version": 0 + }, + { + "git-tree": "e049b7f165d81c0c19d3b619e5b72b5fc53c038b", + "version-string": "1.8.1", + "port-version": 0 + }, + { + "git-tree": "3edf7a906a30e46cf045241413ee3bd0b5c7c49a", + "version-string": "1.7.3.6-1", + "port-version": 0 + }, + { + "git-tree": "3a8ca5525f7123c0b7cda6735c84b2362f345944", + "version-string": "1.7.3.6", + "port-version": 0 + }, + { + "git-tree": "eaddae2d1fb5769ecb38e466f45af91af7bc70db", + "version-string": "1.7.2-1", + "port-version": 0 + }, + { + "git-tree": "3dd4919058fb48e17cdc4bfde133202fe892df70", + "version-string": "1.7.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nng.json b/externals/vcpkg/versions/n-/nng.json new file mode 100755 index 000000000..b13488a6a --- /dev/null +++ b/externals/vcpkg/versions/n-/nng.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "8e400d4ac38af1eafba51433102b0963d06053b2", + "version-semver": "1.5.2", + "port-version": 0 + }, + { + "git-tree": "ec4958fd8785c45084ce752f527ab7ef7acd69a7", + "version-semver": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "6fce71079b3518a4449743fb055a45a8a881d4a5", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "01241e04872e4d0b9e16170276c1c9ccf88e224b", + "version-string": "1.3.2", + "port-version": 0 + }, + { + "git-tree": "afbb99af85e87fb6e03f610dc80a6e80a19797d0", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "a544fe01aab97c01531504c95e3971e1c14628a5", + "version-string": "1.2.5", + "port-version": 0 + }, + { + "git-tree": "f76fdd861ecdb6a7ebf4de5096ebb306a7ba8a4c", + "version-string": "2019-02-27", + "port-version": 0 + }, + { + "git-tree": "2784ef733062ec85b15713930ad0d1cee2adf60d", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "607b214faa09d997339c32e793d28a76f94f5377", + "version-string": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nngpp.json b/externals/vcpkg/versions/n-/nngpp.json new file mode 100755 index 000000000..d25213f47 --- /dev/null +++ b/externals/vcpkg/versions/n-/nngpp.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "810ec96450510773b75e29d42eb11792651b3e44", + "version-string": "1.3.0", + "port-version": 1 + }, + { + "git-tree": "492c863329effc469c9ac7cf6d5c18b6e968df94", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "2da92692430648375467940568b83a2b6e5f80d8", + "version-string": "1.2.4", + "port-version": 0 + }, + { + "git-tree": "7a0d68d88f3e9b3a052c5dc9105179b46d453c65", + "version-string": "2019-07-25", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nnpack.json b/externals/vcpkg/versions/n-/nnpack.json new file mode 100755 index 000000000..853644ff3 --- /dev/null +++ b/externals/vcpkg/versions/n-/nnpack.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "7d9e236a8f7e71e46c901da4f8a250c47221bd91", + "version-date": "2021-02-21", + "port-version": 3 + }, + { + "git-tree": "2479c1088fd75df5e9f06e85086c748aefae9e11", + "version-date": "2021-02-21", + "port-version": 2 + }, + { + "git-tree": "42cc5d6dad2376e9322d715341bb0c8e2d1297b8", + "version-date": "2021-02-21", + "port-version": 1 + }, + { + "git-tree": "bea4835350da5cce1c030ee7d9590fdae88860ae", + "version-date": "2021-02-21", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nonius.json b/externals/vcpkg/versions/n-/nonius.json new file mode 100755 index 000000000..b9755e5eb --- /dev/null +++ b/externals/vcpkg/versions/n-/nonius.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "35083b1d3db802ef074b75da839d035ac965a420", + "version-string": "2019-04-20", + "port-version": 2 + }, + { + "git-tree": "57ab8e437a9552f2fc12a3854b4965912a8a1778", + "version-string": "2019-04-20-1", + "port-version": 0 + }, + { + "git-tree": "cd667cb87d2a7198714ff458271b09bf486f952e", + "version-string": "2019-04-20", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nowide.json b/externals/vcpkg/versions/n-/nowide.json new file mode 100755 index 000000000..ef5bd9f1a --- /dev/null +++ b/externals/vcpkg/versions/n-/nowide.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "2243fbc97eb5f4ef81fe44e85e449227464cc185", + "version": "11.1.3", + "port-version": 0 + }, + { + "git-tree": "21c416b6bc370248b98485d54aa32960158012ea", + "version": "11.1.2", + "port-version": 0 + }, + { + "git-tree": "d9c2ea298a9427906271b068e123ad8479b9eff4", + "version-string": "11.1.1", + "port-version": 0 + }, + { + "git-tree": "cc4a994ae4c3fc2e3d1e13eb864f5748790e142c", + "version-string": "11.0.0", + "port-version": 0 + }, + { + "git-tree": "46ef025a57c54bc4b21e57d604d0d071128d1b2c", + "version-string": "10.0.1", + "port-version": 0 + }, + { + "git-tree": "1ac5f575a496306df415caf8101269b3cdbbb93f", + "version-string": "alias", + "port-version": 0 + }, + { + "git-tree": "46ef025a57c54bc4b21e57d604d0d071128d1b2c", + "version-string": "10.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nrf-ble-driver.json b/externals/vcpkg/versions/n-/nrf-ble-driver.json new file mode 100755 index 000000000..e01064548 --- /dev/null +++ b/externals/vcpkg/versions/n-/nrf-ble-driver.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "f0f55511374a869316d374399923f94dc25c4150", + "version-string": "4.1.2", + "port-version": 1 + }, + { + "git-tree": "0fe2fd730090128aa5c3b528b5c4b6374be2019b", + "version-string": "4.1.2", + "port-version": 0 + }, + { + "git-tree": "a14671fc7a7ec32d573956588243e6743d7b9d7e", + "version-string": "4.1.1-2", + "port-version": 0 + }, + { + "git-tree": "39b59b473786aabf041b5e9840562ab8234537db", + "version-string": "4.1.1-1", + "port-version": 0 + }, + { + "git-tree": "f64dc3cd51ef638f531f2189338aa6a77ac5c719", + "version-string": "4.1.1", + "port-version": 0 + }, + { + "git-tree": "11b7d068360ac4aaa3e25b0cb56c290bf6d8030d", + "version-string": "4.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nspr.json b/externals/vcpkg/versions/n-/nspr.json new file mode 100755 index 000000000..342fccc54 --- /dev/null +++ b/externals/vcpkg/versions/n-/nspr.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "a07f5ffc6f4bd4a9154a599898fbac38115c8124", + "version": "4.33", + "port-version": 2 + }, + { + "git-tree": "efd7b94673495b09ee48d1c2a4453f70c5e0bb7c", + "version": "4.33", + "port-version": 1 + }, + { + "git-tree": "ec6fe24b3b4db98f624391627f113a7bd93397eb", + "version": "4.33", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nss.json b/externals/vcpkg/versions/n-/nss.json new file mode 100755 index 000000000..072371591 --- /dev/null +++ b/externals/vcpkg/versions/n-/nss.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "6256143502011312dc467a9c57f0955617fee6d3", + "version": "3.78", + "port-version": 0 + }, + { + "git-tree": "06e7680df336bb6be816c75e42c6304d11566a3d", + "version": "3.77", + "port-version": 0 + }, + { + "git-tree": "a5eabb67b345be280f94a3615aa3e08886ad4ec7", + "version": "3.76.1", + "port-version": 0 + }, + { + "git-tree": "ffcb42dbcb29e96a2e367dbbe473f447d67f54ce", + "version": "3.76", + "port-version": 0 + }, + { + "git-tree": "96cd78f1c74951c2e623deff9549d776bf4968b5", + "version": "3.75", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nsync.json b/externals/vcpkg/versions/n-/nsync.json new file mode 100755 index 000000000..e88b93ba9 --- /dev/null +++ b/externals/vcpkg/versions/n-/nsync.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "f2333cb932309608aa164aadaacb8d4592c71068", + "version": "1.24.0", + "port-version": 1 + }, + { + "git-tree": "65f07dbc95a609c95de7befffbf37da598652cee", + "version": "1.24.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nt-wrapper.json b/externals/vcpkg/versions/n-/nt-wrapper.json new file mode 100755 index 000000000..fcac3ced0 --- /dev/null +++ b/externals/vcpkg/versions/n-/nt-wrapper.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "60826cea5f3d16ff79fff864e3ad13239d78a193", + "version-string": "2019-08-10", + "port-version": 1 + }, + { + "git-tree": "25fbda0e2379901e9d90c04d4c11905d37b1fc77", + "version-string": "2019-08-10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nu-book-zxing-cpp.json b/externals/vcpkg/versions/n-/nu-book-zxing-cpp.json new file mode 100755 index 000000000..09a5878c1 --- /dev/null +++ b/externals/vcpkg/versions/n-/nu-book-zxing-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b807d508317d0b4bfc5a368fae07f81770851c0b", + "version": "1.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nuklear.json b/externals/vcpkg/versions/n-/nuklear.json new file mode 100755 index 000000000..195260366 --- /dev/null +++ b/externals/vcpkg/versions/n-/nuklear.json @@ -0,0 +1,124 @@ +{ + "versions": [ + { + "git-tree": "9c243e51fbb0d9fa4562a3e4a8eba9a7fb2e0cdd", + "version-date": "2021-03-18", + "port-version": 1 + }, + { + "git-tree": "2a8abfe81ed0757650f10d7fd0e2ef8ecd484ae6", + "version-string": "2021-03-18", + "port-version": 0 + }, + { + "git-tree": "00b0e82f4c9c3653b96e8eeaf54f9b74800249fc", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "c6658d0664b7d65d22f822d2fd079ed3e29f47cd", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "94679a41a85959bed87053b2226a4a780fb6e0ea", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "00df015afa2dd4268ecbcb346fdff10890683d28", + "version-string": "2018-11-01", + "port-version": 0 + }, + { + "git-tree": "071269996aebe9efb561db4ff16509d6a32bc06a", + "version-string": "2018-10-25", + "port-version": 0 + }, + { + "git-tree": "35d43bca38f50eeb03519d84ffdde4ce0c4501ae", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "050ea697fc5de95489ad12fd703a6c28fb7412f3", + "version-string": "2018-07-01", + "port-version": 0 + }, + { + "git-tree": "68ef85ea4cc1d6737022bc286524552e1db0772a", + "version-string": "2018-06-12", + "port-version": 0 + }, + { + "git-tree": "32adcc51a37d3a0a63ede16ed107c3894e7ba175", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "87c3d85accff1d42b3714bdb78e8deab6e033b2c", + "version-string": "2018-04-25", + "port-version": 0 + }, + { + "git-tree": "347d020637b18d273f2870e4582dec232e42b048", + "version-string": "2018-04-17", + "port-version": 0 + }, + { + "git-tree": "4575bdbc69b8caa84888a48cfcb0f7e321d84a60", + "version-string": "2018-04-06", + "port-version": 0 + }, + { + "git-tree": "d3b713446f072376a6aaac409c2f0b64b7a9638c", + "version-string": "2018-04-05", + "port-version": 0 + }, + { + "git-tree": "9218eae2f59e9624c9c1e5b5b046a8461f764c63", + "version-string": "2018-04-02", + "port-version": 0 + }, + { + "git-tree": "731e4a8f8581fbb55b833984269784c073cac71c", + "version-string": "2018-03-27", + "port-version": 0 + }, + { + "git-tree": "ce1626db395628008daac331e198bdaf2dc0ed5e", + "version-string": "2018-03-23", + "port-version": 0 + }, + { + "git-tree": "c038f63705872ad50e9c9070aa7e1f6122f615e2", + "version-string": "2018-03-20", + "port-version": 0 + }, + { + "git-tree": "336f896b0429d341df42a9015ba2517bda7015cd", + "version-string": "2018-03-17", + "port-version": 0 + }, + { + "git-tree": "cb962def0d2487a2c8f86aa00ce1fa899a7953f4", + "version-string": "2018-03-07", + "port-version": 0 + }, + { + "git-tree": "1280a93caabaaf04284077b42a6111364061c907", + "version-string": "2018-03-02", + "port-version": 0 + }, + { + "git-tree": "cc49363bd6cf8e0d90e8c36bfbf070ad5946ff09", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "9e52d7386333d5bfeb76074dcea5b4f2bb2caaab", + "version-string": "2017-06-15-5c7194c2fe2c68c1a8212712c0b4b6195382d27d", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/numactl.json b/externals/vcpkg/versions/n-/numactl.json new file mode 100755 index 000000000..ce482e60d --- /dev/null +++ b/externals/vcpkg/versions/n-/numactl.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "38b7d6feca43ff05b6a059aae8ce218fa382853e", + "version": "2.0.14", + "port-version": 1 + }, + { + "git-tree": "58815aa974d9ab14d768576ade86c2e3b43d20a3", + "version": "2.0.14", + "port-version": 0 + }, + { + "git-tree": "7b58d763ea0a2c64e755c647c115d6e63ea44617", + "version-string": "2.0.12", + "port-version": 1 + }, + { + "git-tree": "3539b8994b1dd0a661ed4a7fa69ef53feb4a1a58", + "version-string": "2.0.12", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/numcpp.json b/externals/vcpkg/versions/n-/numcpp.json new file mode 100755 index 000000000..6d168e28a --- /dev/null +++ b/externals/vcpkg/versions/n-/numcpp.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "648047125e8e78a10fec23ab02b10037197206a6", + "version": "2.6.0", + "port-version": 0 + }, + { + "git-tree": "9661c913b6651de51f8e3b42be395eaece9b0475", + "version-string": "2.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nuspell.json b/externals/vcpkg/versions/n-/nuspell.json new file mode 100755 index 000000000..bc160010f --- /dev/null +++ b/externals/vcpkg/versions/n-/nuspell.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "5719acdfd3465a7bb3dfac85ce2821c56d7c652a", + "version-semver": "5.1.0", + "port-version": 2 + }, + { + "git-tree": "02475776fc8cc0332efe7e0ea8851872c911de32", + "version-semver": "5.1.0", + "port-version": 1 + }, + { + "git-tree": "53fb93bbc0d441813026ef171e32d7479ab839f3", + "version-semver": "5.1.0", + "port-version": 0 + }, + { + "git-tree": "80e078d3797fd83a92fd3a6d0f59a373e43beadb", + "version-semver": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "97027ba299650a7ef96081bf3a466ac76108593f", + "version-string": "4.2.0", + "port-version": 0 + }, + { + "git-tree": "5d85d2a7be0bb5e452a8e83ea6e299c988bca454", + "version-string": "4.0.1", + "port-version": 0 + }, + { + "git-tree": "dfeff74bbf8adffad877a657158769b2d0ed7b32", + "version-string": "3.1.1", + "port-version": 0 + }, + { + "git-tree": "420826f3ca68d01faf4d63cf1e7d384f0181f98d", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "cf0e4e3af738fbb9a30469427346be38239338b4", + "version-string": "3.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/n-/nvtt.json b/externals/vcpkg/versions/n-/nvtt.json new file mode 100755 index 000000000..876fe47d0 --- /dev/null +++ b/externals/vcpkg/versions/n-/nvtt.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "b1a685fa7402dce13182820ddd1dce2c6126b69f", + "version": "2.1.2", + "port-version": 5 + }, + { + "git-tree": "5889b2b68d1c3b13bf681c75e0b8347fff3d72fc", + "version": "2.1.2", + "port-version": 4 + }, + { + "git-tree": "e2db690561d6b3d44308bd53e0da9d3dc5794ea1", + "version": "2.1.2", + "port-version": 3 + }, + { + "git-tree": "80005bae9d45f506abd7b21dd09b246703381174", + "version-string": "2.1.2", + "port-version": 2 + }, + { + "git-tree": "3fa6fad1d67126e06c84897f1130e6d778f9e67f", + "version-string": "2.1.2", + "port-version": 1 + }, + { + "git-tree": "bb8a9ef7ce5947aa21f6366676f43ba1b1161e31", + "version-string": "2.1.2", + "port-version": 0 + }, + { + "git-tree": "75f9af211ab995d8c70909b533d86eaf0f71a316", + "version-string": "2.1.1", + "port-version": 0 + }, + { + "git-tree": "cd381df5dc0e1e6dde164c649f954ac746be5001", + "version-string": "2.1.0-3", + "port-version": 0 + }, + { + "git-tree": "e7361642dc7e29cb4cd4cf1077d6454ac3dca040", + "version-string": "2.1.0-2", + "port-version": 0 + }, + { + "git-tree": "a2cea9a355b0bd3538c79753eb55d5e966556cb8", + "version-string": "2.1.0-1", + "port-version": 0 + }, + { + "git-tree": "d9ed2946e1f2985a9eee0e4f48ff5f7390ea725b", + "version-string": "2.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/oatpp-consul.json b/externals/vcpkg/versions/o-/oatpp-consul.json new file mode 100755 index 000000000..3dfcbc547 --- /dev/null +++ b/externals/vcpkg/versions/o-/oatpp-consul.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "a7dbba8dd8a15ee5a573d8893af3755c2c61e082", + "version": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "595495963d23d1c6b4c6c17d00ecd7c77482d3a2", + "version": "1.2.5", + "port-version": 0 + }, + { + "git-tree": "98d704ce61f927b05f93e4e4cfa45ec4265088a8", + "version-string": "1.2.0", + "port-version": 1 + }, + { + "git-tree": "64c561efb1de7dbf30102f27265ad740ec9e2a8f", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "ed35eb78ecc2281bb5ace3b376c2e17ee084c0b0", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "ad14d6500f0accac6138085ef2ad0d25ece19ec0", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/oatpp-curl.json b/externals/vcpkg/versions/o-/oatpp-curl.json new file mode 100755 index 000000000..2302f299d --- /dev/null +++ b/externals/vcpkg/versions/o-/oatpp-curl.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "ae678502914406793d56adb1bffbede8febdfb77", + "version": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "347efe19ad9ba33369ad147e83ac1c634cc63ca6", + "version": "1.2.5", + "port-version": 0 + }, + { + "git-tree": "547775e31752315b7f7e81c28ca31a160030b8a5", + "version-string": "1.2.0", + "port-version": 2 + }, + { + "git-tree": "1a1208107c47416e4bf3d6a028550ea6ff335ce0", + "version-string": "1.2.0", + "port-version": 1 + }, + { + "git-tree": "66a25f7f3c17fc2418350c55c5195bf505d53a1b", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "d57231e326a1002ecaea8484bac9d01c19f1f278", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "4e6c1c0a5bd3d38c8d0c779c1bf89867ece30b17", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/oatpp-libressl.json b/externals/vcpkg/versions/o-/oatpp-libressl.json new file mode 100755 index 000000000..0440e9e5f --- /dev/null +++ b/externals/vcpkg/versions/o-/oatpp-libressl.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "9a94780d515079c88f644ac92b35f935fff138b5", + "version": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "e8b1d151bbd0338da87480893b466829b55ecc7a", + "version": "1.2.5", + "port-version": 0 + }, + { + "git-tree": "7d4c47f40b9129f88085c5c1afe3d44c7ca22eca", + "version-string": "1.2.0", + "port-version": 1 + }, + { + "git-tree": "37b836ad7df8ba18b9241d22826abc6b812b0fbb", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "76e22341b223432508a2653aa50b4862680cf557", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "6193d3209dd3e3cb7e47df70033ef5ee83e4cb4e", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/oatpp-mbedtls.json b/externals/vcpkg/versions/o-/oatpp-mbedtls.json new file mode 100755 index 000000000..9a2bda18b --- /dev/null +++ b/externals/vcpkg/versions/o-/oatpp-mbedtls.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "f3ed8d7f9afd6d6e5010b136ac0a8b516532b41f", + "version": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "9d453e8fdce152be19d4f0bda197adfdaeebb118", + "version": "1.2.5", + "port-version": 0 + }, + { + "git-tree": "8fa1344d0bdd6282f1b93dbcbe6f32fadce4b302", + "version-string": "1.2.0", + "port-version": 1 + }, + { + "git-tree": "13fc7a86135470df2df2b49ec5295f679eddad1d", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "3ff382ea5e9518aad6734964847172c4e7588576", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "0e1aaed7b2980f0a7d1ea6ce902266fb16c4d811", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/oatpp-mongo.json b/externals/vcpkg/versions/o-/oatpp-mongo.json new file mode 100755 index 000000000..e89f32c69 --- /dev/null +++ b/externals/vcpkg/versions/o-/oatpp-mongo.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "bb2cca9b0d5255e9c250210b6da94b8383673530", + "version": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "e6adcb5eb014357414879a0677983d6a7b4bc9db", + "version": "1.2.5", + "port-version": 0 + }, + { + "git-tree": "7333d11c63a663a7a9244639300493a8f3fdbe1e", + "version-string": "1.2.0", + "port-version": 1 + } + ] +} diff --git a/externals/vcpkg/versions/o-/oatpp-openssl.json b/externals/vcpkg/versions/o-/oatpp-openssl.json new file mode 100755 index 000000000..b2c506111 --- /dev/null +++ b/externals/vcpkg/versions/o-/oatpp-openssl.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "30adf601290c4dc9d8fd834701df6c3d84db7764", + "version-semver": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "d127d675e359a2f4a430f49f9dab815dd7991bfb", + "version-semver": "1.2.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/oatpp-postgresql.json b/externals/vcpkg/versions/o-/oatpp-postgresql.json new file mode 100755 index 000000000..76f2a3112 --- /dev/null +++ b/externals/vcpkg/versions/o-/oatpp-postgresql.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "f5475ec4475805e185290f9b6676cb0b3471d469", + "version": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "f2cbdc4de3f10789d3b258636819bdec76f55850", + "version": "1.2.5", + "port-version": 0 + }, + { + "git-tree": "d79f2e5a875b29aabe79e495d7a5bd4f8b8284ff", + "version-string": "1.2.0", + "port-version": 1 + } + ] +} diff --git a/externals/vcpkg/versions/o-/oatpp-sqlite.json b/externals/vcpkg/versions/o-/oatpp-sqlite.json new file mode 100755 index 000000000..29af51afe --- /dev/null +++ b/externals/vcpkg/versions/o-/oatpp-sqlite.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "83864d8dac636388be925bc5228fb6067ff0c634", + "version": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "998bc24ce7db8343441a34779f38d500edd5a2c8", + "version": "1.2.5", + "port-version": 0 + }, + { + "git-tree": "41dc1128affe43785bb670c0c43d884d334056f3", + "version-string": "1.2.0", + "port-version": 1 + }, + { + "git-tree": "f805cdb2812c52c67848644ee233c2111ebcbda9", + "version-string": "1.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/oatpp-ssdp.json b/externals/vcpkg/versions/o-/oatpp-ssdp.json new file mode 100755 index 000000000..dbd84e5c2 --- /dev/null +++ b/externals/vcpkg/versions/o-/oatpp-ssdp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "37d034f06503445f5a4ac52a960f4360cb68ce58", + "version": "1.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/oatpp-swagger.json b/externals/vcpkg/versions/o-/oatpp-swagger.json new file mode 100755 index 000000000..e2107262e --- /dev/null +++ b/externals/vcpkg/versions/o-/oatpp-swagger.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "4f0bc8c1d3f156e6d2a7cee4691154c0973b12bd", + "version": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "b1859f1a4fa6e90da2ed150098a07aa86189d681", + "version": "1.2.5", + "port-version": 0 + }, + { + "git-tree": "8e041854d65d14857958f668ae92ac4e938972b7", + "version-string": "1.2.0", + "port-version": 1 + }, + { + "git-tree": "855dd834339f4aa1e50f9c8ca872caa075dad5b9", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "8bc46db671a5067fe1ab4c9778572de5becf57dd", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "eca5ef7fbebf86ef41c6b2d353552e309ec50f3b", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/oatpp-websocket.json b/externals/vcpkg/versions/o-/oatpp-websocket.json new file mode 100755 index 000000000..53c7f9194 --- /dev/null +++ b/externals/vcpkg/versions/o-/oatpp-websocket.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "2bfe9a22be4776d9da6022b006d0adca20da7222", + "version": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "e492744484bc660010ae5e038aaa5703abce53f5", + "version": "1.2.5", + "port-version": 0 + }, + { + "git-tree": "7412173d56da2869372aca7f30b9963b0ab9967f", + "version-string": "1.2.0", + "port-version": 1 + }, + { + "git-tree": "b33476cc362a63d66e5c0b0c9ddb1b6fd56dd543", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "19e74128e3dfb214501272e9de1e27c6808770bb", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "7ce8c07329a45f4e7b7a7a70e34518dab85392f7", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/oatpp-zlib.json b/externals/vcpkg/versions/o-/oatpp-zlib.json new file mode 100755 index 000000000..db9f47ae2 --- /dev/null +++ b/externals/vcpkg/versions/o-/oatpp-zlib.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "74e51d02fac6e71c8bad4856fc97767f8d3041ea", + "version": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "9cbd1b70447175716f4415c18d4e66696c78ad80", + "version": "1.2.5", + "port-version": 0 + }, + { + "git-tree": "4fbe8761bcf603ce1a4af48707aa6adfa86aed4f", + "version-string": "1.2.0", + "port-version": 1 + } + ] +} diff --git a/externals/vcpkg/versions/o-/oatpp.json b/externals/vcpkg/versions/o-/oatpp.json new file mode 100755 index 000000000..5ec6257b2 --- /dev/null +++ b/externals/vcpkg/versions/o-/oatpp.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "85f50043f867de15e428b3d0f8749a5aabc34e86", + "version": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "f6f5d0cb4da86c170670f9d3947b5704ed213a5c", + "version": "1.2.5", + "port-version": 0 + }, + { + "git-tree": "5c36b3d62c498e43f74d403b8f8020fbc2a06611", + "version-string": "1.2.0", + "port-version": 1 + }, + { + "git-tree": "6a39c4642a8f2285801c184aba4b053c59fc906b", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "9989483fc5ddf3362d2ecb9370a5ef8fa35aee92", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "e6870b958310d68bd4a426d93d0bfd81ed25ad7e", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/observer-ptr-lite.json b/externals/vcpkg/versions/o-/observer-ptr-lite.json new file mode 100755 index 000000000..49d16f73d --- /dev/null +++ b/externals/vcpkg/versions/o-/observer-ptr-lite.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "b83218c276fe75db652651f2216faecc7aeb062e", + "version-string": "0.4.0", + "port-version": 1 + }, + { + "git-tree": "173708d071e8fa3482f39a722939da9c49d06517", + "version-string": "0.4.0", + "port-version": 0 + }, + { + "git-tree": "ac66aeb37431f57708e35db3b3c8980f49e1722a", + "version-string": "0.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/ocilib.json b/externals/vcpkg/versions/o-/ocilib.json new file mode 100755 index 000000000..29c753471 --- /dev/null +++ b/externals/vcpkg/versions/o-/ocilib.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "04a952ec38bbc46e3cfa6d5ee6ced8a5e9989e31", + "version": "4.7.3", + "port-version": 2 + }, + { + "git-tree": "76e672a75b678329bb9646c61e9f4bdba02aeedd", + "version": "4.7.3", + "port-version": 1 + }, + { + "git-tree": "cc328210424ed585e62cd1ec47b1a48b3a2174c2", + "version": "4.7.3", + "port-version": 0 + }, + { + "git-tree": "dfeb78a0e1d2f65807a7ad4925e5b6cc973c52a0", + "version-string": "4.7.1", + "port-version": 2 + }, + { + "git-tree": "a3316dc22d7227e1886297c9471dcb737412bc84", + "version-string": "4.7.1", + "port-version": 1 + }, + { + "git-tree": "a956cde150fe4a95f62c4586788dafd6587e00e6", + "version-string": "4.7.1", + "port-version": 0 + }, + { + "git-tree": "808629922b6dd43eb5cc880f24ffe88f50317d60", + "version-string": "4.6.4", + "port-version": 2 + }, + { + "git-tree": "87d8da40ebd5d638fc6871bf294d8be472b343e6", + "version-string": "4.6.4-1", + "port-version": 0 + }, + { + "git-tree": "c220b0269a63ba6f47c109eee4071616d22c50b2", + "version-string": "4.6.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/octomap.json b/externals/vcpkg/versions/o-/octomap.json new file mode 100755 index 000000000..59c664cca --- /dev/null +++ b/externals/vcpkg/versions/o-/octomap.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "7b192c5e8bc138bffe383afcadf8bc91a0130d58", + "version-string": "1.9.5", + "port-version": 2 + }, + { + "git-tree": "603822afeb335c9005956f3791668fb4a449d7b4", + "version-string": "1.9.5", + "port-version": 1 + }, + { + "git-tree": "88a9ea43b36cb364195d0c67fdf38a7b1fa447f8", + "version-string": "1.9.5", + "port-version": 0 + }, + { + "git-tree": "8259971f146589d7ebb06c949ff74b45927d925a", + "version-string": "2017-03-11-8", + "port-version": 0 + }, + { + "git-tree": "206cd54e97e36be5c61c0542f4ca4f76398d3108", + "version-string": "2017-03-11-7", + "port-version": 0 + }, + { + "git-tree": "cafa997b5d9608d0a4617ce1facdee729a998ec1", + "version-string": "cefed0c1d79afafa5aeb05273cf1246b093b771c-6", + "port-version": 0 + }, + { + "git-tree": "30810136ce77a67685993f0f139002ed2eddf7b5", + "version-string": "cefed0c1d79afafa5aeb05273cf1246b093b771c-5", + "port-version": 0 + }, + { + "git-tree": "088c8028a2140dcff38f6cc7cbf2c428e0aa3e3f", + "version-string": "cefed0c1d79afafa5aeb05273cf1246b093b771c-4", + "port-version": 0 + }, + { + "git-tree": "1915d8c5572fd3f68d6d780faf5014185a43b9e9", + "version-string": "cefed0c1d79afafa5aeb05273cf1246b093b771c-3", + "port-version": 0 + }, + { + "git-tree": "864542e8a042a529d7b4df46dd77c63aaabcec57", + "version-string": "cefed0c1d79afafa5aeb05273cf1246b093b771c-2", + "port-version": 0 + }, + { + "git-tree": "10720a6a229a80379ef969a3875cc913f807a5bd", + "version-string": "cefed0c1d79afafa5aeb05273cf1246b093b771c-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/ode.json b/externals/vcpkg/versions/o-/ode.json new file mode 100755 index 000000000..e7cbcc62e --- /dev/null +++ b/externals/vcpkg/versions/o-/ode.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "8bc51447289df2b0693e433dace17ac0facbeba9", + "version": "0.16.1", + "port-version": 3 + }, + { + "git-tree": "6a0ed0d341666ec960fd7596bb2ac66737604cd3", + "version-string": "0.16.1", + "port-version": 2 + }, + { + "git-tree": "1b4c24af36c99cf547f0a2026062a91d1d78f90a", + "version-string": "0.16.1", + "port-version": 1 + }, + { + "git-tree": "b8276cb76d86e838d84606657d6f37d5cde4a814", + "version-string": "0.16.1", + "port-version": 0 + }, + { + "git-tree": "622b0c4b552b3d5a3fc6a923ca98a37cc63ef11c", + "version-string": "0.16", + "port-version": 0 + }, + { + "git-tree": "5e7e422b0fe6d25030996079c87674d79c9bfb48", + "version-string": "0.15.1-3", + "port-version": 0 + }, + { + "git-tree": "4b628152d3e7a0fffc8f1423dae943dfec093c80", + "version-string": "0.15.1-2", + "port-version": 0 + }, + { + "git-tree": "be21a2b289a50a1f25817444841b59c7a70df4e8", + "version-string": "0.15.1-1", + "port-version": 0 + }, + { + "git-tree": "72650f9d4fd9298f4e4c1025300fd176be2fcbb6", + "version-string": "0.15.1 ", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/offscale-libetcd-cpp.json b/externals/vcpkg/versions/o-/offscale-libetcd-cpp.json new file mode 100755 index 000000000..bf4ad5b12 --- /dev/null +++ b/externals/vcpkg/versions/o-/offscale-libetcd-cpp.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "70eb4516cd664f01e89d2701ae45ba05ea4c9d7a", + "version-date": "2019-07-10", + "port-version": 3 + }, + { + "git-tree": "58aea86d7da68c1cad8d684197c39e23945b8d91", + "version-string": "2019-07-10", + "port-version": 2 + }, + { + "git-tree": "4e25b14275c81e16195194a2dfd5058dd3522008", + "version-string": "2019-07-10-1", + "port-version": 0 + }, + { + "git-tree": "f6ce4c020e57d371518912ea2414baeb81527888", + "version-string": "2019-07-10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/ogdf.json b/externals/vcpkg/versions/o-/ogdf.json new file mode 100755 index 000000000..d7d605da0 --- /dev/null +++ b/externals/vcpkg/versions/o-/ogdf.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "1a3d7f1e718f35843520add2d7e102b12586e401", + "version-string": "2019-08-23", + "port-version": 2 + }, + { + "git-tree": "babb8cfc3b4ac7c02a6221a4a4640ff63c39fd6a", + "version-string": "2019-08-23", + "port-version": 1 + }, + { + "git-tree": "6f179065bf63db7033875a8bb522e6d037cdb751", + "version-string": "2019-08-23", + "port-version": 0 + }, + { + "git-tree": "b58900a9741d2363939ebb0f378e8e8e725610bc", + "version-string": "2018-03-28-2", + "port-version": 0 + }, + { + "git-tree": "4c08ba57d0c823e160bc3add9e9b96cd30825039", + "version-string": "2018-03-28-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/ogre-next.json b/externals/vcpkg/versions/o-/ogre-next.json new file mode 100755 index 000000000..40f6f7475 --- /dev/null +++ b/externals/vcpkg/versions/o-/ogre-next.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "0b1cca4f491d535e198fc79195bf357811b4122a", + "version": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "8d2e2e06d0b21779df8bd6579387805dc06ca6ff", + "version-string": "2019-10-20", + "port-version": 2 + }, + { + "git-tree": "d8a84a70373caadf837280fe2873d5d286d2c770", + "version-string": "2019-10-20-1", + "port-version": 0 + }, + { + "git-tree": "6f7835a22bfad4598f994f7016d1dcb9a3954a3f", + "version-string": "2019-10-20", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/ogre.json b/externals/vcpkg/versions/o-/ogre.json new file mode 100755 index 000000000..a717a3e98 --- /dev/null +++ b/externals/vcpkg/versions/o-/ogre.json @@ -0,0 +1,139 @@ +{ + "versions": [ + { + "git-tree": "fd55a098294ab4f2f8b46bc67172e6a8be3c1df0", + "version": "1.12.9", + "port-version": 7 + }, + { + "git-tree": "64cee22caf52cb15e120895e0689281e8664f42a", + "version": "1.12.9", + "port-version": 6 + }, + { + "git-tree": "322b9a5290ce1656aa66b684b07d1e327b18eeeb", + "version-string": "1.12.9", + "port-version": 5 + }, + { + "git-tree": "7bd4cd10abb70cc91306e834cb8f7831bc33c8a0", + "version-string": "1.12.9", + "port-version": 4 + }, + { + "git-tree": "f594f5caa619521664c2f11943b2ce1ee1645590", + "version-string": "1.12.9", + "port-version": 3 + }, + { + "git-tree": "4a31d2dca3d808ed64f48f9a157e7fb4a83cca98", + "version-string": "1.12.9", + "port-version": 2 + }, + { + "git-tree": "ca650c90416462819a064556574301a6d2c6aa21", + "version-string": "1.12.9", + "port-version": 1 + }, + { + "git-tree": "bd397b488f9166c200422fe3cafa3ba9daf56d4c", + "version-string": "1.12.9", + "port-version": 0 + }, + { + "git-tree": "466e96fd2e17dd2453aa31dc0bc61bdcf53e7f61", + "version-string": "1.12.7", + "port-version": 0 + }, + { + "git-tree": "0de81b4f7e0ec24966e929c2ea64e16c15e71d5e", + "version-string": "1.12.1-1", + "port-version": 0 + }, + { + "git-tree": "2f9e915cdf245817fcd9e4508fc934194818bd5f", + "version-string": "1.12.1", + "port-version": 0 + }, + { + "git-tree": "e0e4b65934450879409ea9bbbbcc4ffce49e7b57", + "version-string": "1.12.0-2", + "port-version": 0 + }, + { + "git-tree": "c6903b85111c6b46a413b55e5928a693ab212dea", + "version-string": "1.12.0-1", + "port-version": 0 + }, + { + "git-tree": "825fd8648aeb4b492767d3b6d8b25eb5c4c69d56", + "version-string": "1.12.0", + "port-version": 0 + }, + { + "git-tree": "20978be943f58b70bf75eb4c7565b56065c21c07", + "version-string": "1.11.3-4", + "port-version": 0 + }, + { + "git-tree": "708233bb8a1376058f8422a71d7d0b2b8d17128c", + "version-string": "1.11.3-3", + "port-version": 0 + }, + { + "git-tree": "031a010ea0f59a2f2a4b42523725f463dec346c6", + "version-string": "1.11.3-2", + "port-version": 0 + }, + { + "git-tree": "8f41d76bd65979229a9a59229ad51c0bdd788b14", + "version-string": "1.11.3-1", + "port-version": 0 + }, + { + "git-tree": "09426d53d0c3798c05cb5028347722a2708c9e09", + "version-string": "1.11.3", + "port-version": 0 + }, + { + "git-tree": "8246cbccfc61899b4e7f95820d1a4fde4e9b5e24", + "version-string": "1.10.11", + "port-version": 0 + }, + { + "git-tree": "b33f2526b13f601b31175ba4a5bace8a3ef6e918", + "version-string": "1.10.9-2", + "port-version": 0 + }, + { + "git-tree": "b117c6b397c5e19001e715224e777a5fe5315a95", + "version-string": "1.10.9-1", + "port-version": 0 + }, + { + "git-tree": "f1852c7d76bfaefe41e4cdbd771ae96a7bc7d333", + "version-string": "1.10.9", + "port-version": 0 + }, + { + "git-tree": "d2d96e305a4c73550f9a2861a64d8421b4a930c5", + "version-string": "1.10.8", + "port-version": 0 + }, + { + "git-tree": "9716e84432ab68e13d1cf2108e72f4c94d555f15", + "version-string": "1.9.0-1", + "port-version": 0 + }, + { + "git-tree": "8e4d0e0230b411bb879c1eaa2e5295e85674fa48", + "version-string": "1.9.0 -1", + "port-version": 0 + }, + { + "git-tree": "d5e1f52186366cac7552ff9f3c6e59456e907afd", + "version-string": "1.9.0 ", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/ois.json b/externals/vcpkg/versions/o-/ois.json new file mode 100755 index 000000000..39d8df3b2 --- /dev/null +++ b/externals/vcpkg/versions/o-/ois.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "79d79b0c5901492572044ad873cdf4df864accea", + "version": "1.5.1", + "port-version": 1 + }, + { + "git-tree": "05dc4bcc0372eaa7b8a86f89a268c5ef0c69c5bf", + "version": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "0d8ca34b4a48f37cf731b920ab96995bcc81a8f4", + "version-string": "1.5", + "port-version": 3 + }, + { + "git-tree": "def78425a0a4688d94604ff68965f64a024d1aeb", + "version-string": "1.5", + "port-version": 2 + }, + { + "git-tree": "5e43030ca42604ace55e20f855ccef73a1b45c2d", + "version-string": "1.5-1", + "port-version": 0 + }, + { + "git-tree": "803fd55fc8652405994a92c6a5b5b8237f3466a4", + "version-string": "1.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/ompl.json b/externals/vcpkg/versions/o-/ompl.json new file mode 100755 index 000000000..bf7d5c30f --- /dev/null +++ b/externals/vcpkg/versions/o-/ompl.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "262729470ab00b469cfb9d63e196ebf4006d35cd", + "version": "1.5.1", + "port-version": 5 + }, + { + "git-tree": "cde8f8a96e5fc3c5764ca85632efa1b828868e26", + "version": "1.5.1", + "port-version": 4 + }, + { + "git-tree": "4385de7645c202d99bb25420d049f15cb54d9ed7", + "version-string": "1.5.1", + "port-version": 3 + }, + { + "git-tree": "87e475355f626557d8762d014c7f0efa2d2d488e", + "version-string": "1.5.1", + "port-version": 2 + }, + { + "git-tree": "f3812117c1ed1d4080155284f12908236dd797f5", + "version-string": "1.5.1", + "port-version": 1 + }, + { + "git-tree": "2dc123683ef75002bd7252b252cc220a7a643066", + "version-string": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "fae4c4200fd28f346f582aa14b46dcbcf37be57a", + "version-string": "1.5.0", + "port-version": 1 + }, + { + "git-tree": "0b0ea555b98260ea8575e34564395d0e0e3898df", + "version-string": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "4ef9bb0f965a35c85a0f320377ffb502c01da270", + "version-string": "1.4.2", + "port-version": 5 + }, + { + "git-tree": "076b7508477ba02b300f760c4a32691aadb05010", + "version-string": "1.4.2-4", + "port-version": 0 + }, + { + "git-tree": "1b4cc9f865b1ab9086da77c02087a26c0f50d376", + "version-string": "1.4.2-3", + "port-version": 0 + }, + { + "git-tree": "82b1e756fc863d8a8df7188b398d5d37a058c74b", + "version-string": "1.4.2-2", + "port-version": 0 + }, + { + "git-tree": "adbd669504548944ef6aaf9c0f6b9924b807464f", + "version-string": "1.4.2-1", + "port-version": 0 + }, + { + "git-tree": "eacac1ac50e50deb4b0080ef23bfb2aa7aa0ca98", + "version-string": "1.4.2-0", + "port-version": 0 + }, + { + "git-tree": "6ba1342ee4a29dde8715c2cbf86371f9eed2aae2", + "version-string": "1.4.1-2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/omplapp.json b/externals/vcpkg/versions/o-/omplapp.json new file mode 100755 index 000000000..c4603fb1a --- /dev/null +++ b/externals/vcpkg/versions/o-/omplapp.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "3f243c859f1597f18da61a472684c113e2ed150d", + "version": "1.5.1", + "port-version": 3 + }, + { + "git-tree": "f048abe6cf0219fa09fd9024188c54a3b5c289c3", + "version": "1.5.1", + "port-version": 2 + }, + { + "git-tree": "8860b6976a0c226039034eb0b59146708d27a635", + "version": "1.5.1", + "port-version": 1 + }, + { + "git-tree": "590eb9956381e7ef47b780fbd9aee2c6e8da323c", + "version-string": "1.5.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/onednn.json b/externals/vcpkg/versions/o-/onednn.json new file mode 100755 index 000000000..f21847d63 --- /dev/null +++ b/externals/vcpkg/versions/o-/onednn.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "0ac578f6078a2120900435434f0df8c96d4a7a54", + "version-semver": "2.4.3", + "port-version": 1 + }, + { + "git-tree": "d2c75b6924fc7301f68d484674419fad3f076ca5", + "version-semver": "2.4.3", + "port-version": 0 + }, + { + "git-tree": "3d3bacca42ae3bc1a41217c50f23953f13220732", + "version-semver": "2.3.2", + "port-version": 0 + }, + { + "git-tree": "c48b3b7e1da48208cce9dbd5ee231d8c087b29ac", + "version-string": "2.0", + "port-version": 1 + }, + { + "git-tree": "91e30ed4a558274451d217d52ff240a7a355b3a4", + "version-string": "2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/oniguruma.json b/externals/vcpkg/versions/o-/oniguruma.json new file mode 100755 index 000000000..32d80a424 --- /dev/null +++ b/externals/vcpkg/versions/o-/oniguruma.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "107a3e6619a149a76b52ef9c9f4dbb1b7343a456", + "version": "6.9.7.1", + "port-version": 1 + }, + { + "git-tree": "9f6ae35330e50d5e767e67141441506c26a832fb", + "version": "6.9.7.1", + "port-version": 0 + }, + { + "git-tree": "5bdcd32cc762467cca4b13b2ed11e6dd5c515cf8", + "version-string": "6.9.4", + "port-version": 1 + }, + { + "git-tree": "b634145f43e8207123e82305f0b2d2be0b8ac65f", + "version-string": "6.9.4", + "port-version": 0 + }, + { + "git-tree": "ae3515135a589053b93cfb122111bdb67cb7113a", + "version-string": "6.9.3", + "port-version": 0 + }, + { + "git-tree": "e09bba919a77b565f8559d501ee9bdbd257c2f4e", + "version-string": "6.9.2-3", + "port-version": 0 + }, + { + "git-tree": "1bb0fe2c93a8c60501aa1b30237a134bbb150494", + "version-string": "6.9.2-2", + "port-version": 0 + }, + { + "git-tree": "135c092c731e8cdd646cc7f50f963a57363c9865", + "version-string": "6.9.2-1", + "port-version": 0 + }, + { + "git-tree": "e27e05d1a0927b141f48ecee8a052151783681a7", + "version-string": "6.9.2", + "port-version": 0 + }, + { + "git-tree": "beee71c287409ecc9ff6018bd6edfc79452912cc", + "version-string": "2019-02-26", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/onnx-optimizer.json b/externals/vcpkg/versions/o-/onnx-optimizer.json new file mode 100755 index 000000000..3a6bc01dc --- /dev/null +++ b/externals/vcpkg/versions/o-/onnx-optimizer.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e98d775d36ccb84c9ffa20e2cf6f8ef1b7ab0461", + "version-semver": "0.2.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/onnx.json b/externals/vcpkg/versions/o-/onnx.json new file mode 100755 index 000000000..a61d8ee3f --- /dev/null +++ b/externals/vcpkg/versions/o-/onnx.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "62ee0b78332273115540d669065a467314aace3a", + "version-semver": "1.10.2", + "port-version": 1 + }, + { + "git-tree": "a83605bd84787898f92ada1bf1874e162a441c10", + "version-semver": "1.10.2", + "port-version": 0 + }, + { + "git-tree": "a526e5d7f54e5fc32529bf72b29457f408af0e28", + "version-semver": "1.10.1", + "port-version": 0 + }, + { + "git-tree": "b53c9c9e969928def925c57ea5ddcdfb09293693", + "version-semver": "1.9.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/onnxruntime-gpu.json b/externals/vcpkg/versions/o-/onnxruntime-gpu.json new file mode 100755 index 000000000..1fe9bafd6 --- /dev/null +++ b/externals/vcpkg/versions/o-/onnxruntime-gpu.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "9741bef63d2b0c74277568da67ab7aa1ab50c51b", + "version": "1.5.1", + "port-version": 1 + }, + { + "git-tree": "36273dd148753f754c51a4835aeb29bf5aa1556e", + "version-string": "1.5.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/oof.json b/externals/vcpkg/versions/o-/oof.json new file mode 100755 index 000000000..26e8c09a0 --- /dev/null +++ b/externals/vcpkg/versions/o-/oof.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6d9ef9753008d97f5a6db6aec4ca935787baf344", + "version-date": "2021-11-23", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/open62541.json b/externals/vcpkg/versions/o-/open62541.json new file mode 100755 index 000000000..30f520ebd --- /dev/null +++ b/externals/vcpkg/versions/o-/open62541.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "78181e46126a93ba6bbea749a985ba675fb53c03", + "version": "1.2.3", + "port-version": 1 + }, + { + "git-tree": "7a42ce1cf8d2a5f4380a4dcc2807a0d86962d49d", + "version": "1.2.3", + "port-version": 0 + }, + { + "git-tree": "62aab840d7f987d8ca2ad5b9d81111a0b6f93dfd", + "version": "1.2.2", + "port-version": 1 + }, + { + "git-tree": "e9f30c2699c8919f074676b99f79358ef1f0a059", + "version": "1.2.2", + "port-version": 0 + }, + { + "git-tree": "98a37e8146a1e56f67a180b3c239f903ed59c401", + "version": "1.1.2", + "port-version": 2 + }, + { + "git-tree": "43c958ba9799820838fdf2332020ef83cacc4595", + "version": "1.1.2", + "port-version": 1 + }, + { + "git-tree": "3963c6ad1810891560f00a71c17f14ce53fe290e", + "version-string": "1.1.2", + "port-version": 0 + }, + { + "git-tree": "f858b0911bd2b81cddd47fa83b576b2555787ca6", + "version-string": "1.1", + "port-version": 0 + }, + { + "git-tree": "2eb2995138bed00730168b28ec94e90fe8c979bf", + "version-string": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "0383b80a34d3cbd2459e664be24283022eb738d5", + "version-string": "1.0", + "port-version": 0 + }, + { + "git-tree": "820b1e13b8449be8a34e1cf1234a7c144a58cae0", + "version-string": "0.3.0-4", + "port-version": 0 + }, + { + "git-tree": "5e7aa75d0e574f89f53b44433cacfc85e55e3d01", + "version-string": "0.3.0-3", + "port-version": 0 + }, + { + "git-tree": "38df95e5d48a06f31bcc088b97f2ca603d322989", + "version-string": "0.3.0-2", + "port-version": 0 + }, + { + "git-tree": "8bdf62471370d480516ac23e8d8175d6e447f571", + "version-string": "0.3.0-1", + "port-version": 0 + }, + { + "git-tree": "bdc48fbe9472027bba1680d8a5ef7cbab2db3e3b", + "version-string": "0.3.0", + "port-version": 0 + }, + { + "git-tree": "824c4cae0119d5355c3db071694b3c9ad1b0549f", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/openal-soft.json b/externals/vcpkg/versions/o-/openal-soft.json new file mode 100755 index 000000000..eb2a35e05 --- /dev/null +++ b/externals/vcpkg/versions/o-/openal-soft.json @@ -0,0 +1,119 @@ +{ + "versions": [ + { + "git-tree": "cff63a457841bcacd168775e25794f8245d06cf0", + "version-semver": "1.21.1", + "port-version": 5 + }, + { + "git-tree": "a1dee3171a9184c0a13631fda79f6aa58d2b80b6", + "version-semver": "1.21.1", + "port-version": 4 + }, + { + "git-tree": "b6672158f9eda4512b07d89ba193c51ef2802641", + "version-semver": "1.21.1", + "port-version": 3 + }, + { + "git-tree": "9b1e7ccf10631bcb24825e8742bf18de9c561e71", + "version-semver": "1.21.1", + "port-version": 2 + }, + { + "git-tree": "cb266fe5f02b9d2b5cb38343d25083359062bd07", + "version-semver": "1.21.1", + "port-version": 1 + }, + { + "git-tree": "735740a45f65f166bd693795a7bed3d2ef079baf", + "version-string": "1.21.1", + "port-version": 0 + }, + { + "git-tree": "d67d0e5d79043433b022177e902f397c4c285f4c", + "version-string": "1.20.1", + "port-version": 6 + }, + { + "git-tree": "ede5d5168eb854c8f50f617bdeb1c263be8937d2", + "version-string": "1.20.1", + "port-version": 5 + }, + { + "git-tree": "cd2af2f2222d1d418a30a8c8231b8e50625d4bdc", + "version-string": "1.20.1", + "port-version": 4 + }, + { + "git-tree": "04f5b87dceba12893cf9ab8a626b2a36e369510d", + "version-string": "1.20.1-2", + "port-version": 0 + }, + { + "git-tree": "f4c5448085005048843afd96d7109c13ba76136a", + "version-string": "1.20.1-1", + "port-version": 0 + }, + { + "git-tree": "169d996a067b2904d277a1264843930647d03405", + "version-string": "1.20.1", + "port-version": 0 + }, + { + "git-tree": "bad184e75c5a430716a50c6cc1c1fca10f7d1551", + "version-string": "1.20.0", + "port-version": 0 + }, + { + "git-tree": "90b3884f9a61578f049432737e0ed08d2f437bf5", + "version-string": "1.19.1-2", + "port-version": 0 + }, + { + "git-tree": "71557390481680cfc43efec2da2b3b60a1944437", + "version-string": "1.19.1-1", + "port-version": 0 + }, + { + "git-tree": "6878c7206b38adefd3adcfb5386869a34fb0de21", + "version-string": "1.19.1", + "port-version": 0 + }, + { + "git-tree": "67a646da6f1cba3ffdbdfd3b0357b4ac445042d0", + "version-string": "1.19.0", + "port-version": 0 + }, + { + "git-tree": "e099096dbbcc751226a678276edecaebcc090cbc", + "version-string": "1.18.2-2", + "port-version": 0 + }, + { + "git-tree": "870dbf8dae43eb8182a8865dd735caf59071707b", + "version-string": "1.18.2-1", + "port-version": 0 + }, + { + "git-tree": "02f2e57d4640f9ce12673e2269a30245fcff6e36", + "version-string": "1.18.1-1", + "port-version": 0 + }, + { + "git-tree": "26edf59535c43b2ff7cae4a2fba3ceff21363810", + "version-string": "1.18.1", + "port-version": 0 + }, + { + "git-tree": "cc3b6f3150c356d1e779dfb94dbdaf7bd8baca7e", + "version-string": "1.18.0", + "port-version": 0 + }, + { + "git-tree": "9afa808e6deed3f77b1c0ad0e1c8be673added57", + "version-string": "1.17.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/openblas.json b/externals/vcpkg/versions/o-/openblas.json new file mode 100755 index 000000000..558bb03bf --- /dev/null +++ b/externals/vcpkg/versions/o-/openblas.json @@ -0,0 +1,159 @@ +{ + "versions": [ + { + "git-tree": "abd8d8b0d0286d963399d79e3e8b6f7f8e12117b", + "version": "0.3.20", + "port-version": 0 + }, + { + "git-tree": "90e2cde7fda025b587d6c41e699c98c263cf41eb", + "version": "0.3.19", + "port-version": 1 + }, + { + "git-tree": "631541b0dcf2ea300f96829885d9bc0282d38a65", + "version": "0.3.19", + "port-version": 0 + }, + { + "git-tree": "048ae3833af8e5633ce86c3174e20c2794fe573d", + "version": "0.3.15", + "port-version": 1 + }, + { + "git-tree": "2a214e1bac47c70d932caef7d74771c8658b1f7a", + "version": "0.3.15", + "port-version": 0 + }, + { + "git-tree": "20d57360e6e7afa4e4f033a87e1ded91571ee462", + "version": "0.3.10", + "port-version": 3 + }, + { + "git-tree": "510adc011214327468768aa22c1f08a2d2d632ab", + "version": "0.3.10", + "port-version": 2 + }, + { + "git-tree": "b2beefd63c302b41dc5699ea88b825659c86ac2d", + "version": "0.3.10", + "port-version": 1 + }, + { + "git-tree": "1aedad4847c778ad029f805f7b371bcbbb060f09", + "version-string": "0.3.10", + "port-version": 0 + }, + { + "git-tree": "bcbba709f49cbda1a476df3a8fa7d60e69be1ae4", + "version-string": "0.3.9", + "port-version": 3 + }, + { + "git-tree": "4b08c1c07800ed652d10be301cdd1efbd8017a9d", + "version-string": "0.3.9", + "port-version": 2 + }, + { + "git-tree": "33ff321dd88e9e02917402f3ff2f6a7c325dc8f2", + "version-string": "0.3.9-1", + "port-version": 0 + }, + { + "git-tree": "b581c505da14cbdd8459a270399d8f6ca375327a", + "version-string": "0.3.7", + "port-version": 0 + }, + { + "git-tree": "893e58eb5cf3f16d44ae7272460abd543aba3eb6", + "version-string": "0.3.6-6", + "port-version": 0 + }, + { + "git-tree": "1997eb8c58ded1db584c214f736c4b27b91467ef", + "version-string": "0.3.6-5", + "port-version": 0 + }, + { + "git-tree": "b31fc385bf413eb1787a3550da4f0e037d93e768", + "version-string": "0.3.6-4", + "port-version": 0 + }, + { + "git-tree": "460d39b2636cabcb59bccb040e6169834536e80b", + "version-string": "0.3.6-2", + "port-version": 0 + }, + { + "git-tree": "e1f4d0c9f1b204c9b5c6b3c2ca8e3e10b8ace4f0", + "version-string": "0.3.6-1", + "port-version": 0 + }, + { + "git-tree": "f859a790c13a0df277b671de385a7dcbe950ba36", + "version-string": "0.3.6", + "port-version": 0 + }, + { + "git-tree": "c8a1d69932ff2870f1507d8a05375ef5215a0389", + "version-string": "0.3.5-4", + "port-version": 0 + }, + { + "git-tree": "fe4e0ea7e20a9549bcebb381f3994d0b964c9677", + "version-string": "0.3.5-3", + "port-version": 0 + }, + { + "git-tree": "7b9e69c862fa3faf117c15eabb9f992d809e3925", + "version-string": "0.3.5-2", + "port-version": 0 + }, + { + "git-tree": "e100eb2104c2f86d3e03fb9f64169bc662a8a987", + "version-string": "0.3.5-1", + "port-version": 0 + }, + { + "git-tree": "55a1bb7baa872ca0997d8a2e28b3b6555feba585", + "version-string": "0.3.5", + "port-version": 0 + }, + { + "git-tree": "d237a73b4df5d4fedb206f483b57baff9930702c", + "version-string": "0.2.20-2", + "port-version": 0 + }, + { + "git-tree": "32fb8372215ca471b787034e43e6f567bcc98e9d", + "version-string": "v0.2.20-2", + "port-version": 0 + }, + { + "git-tree": "e726d54319cbf2edef235c749ecb7faf95a1be28", + "version-string": "v0.2.20-1", + "port-version": 0 + }, + { + "git-tree": "30cb99fea4630b17721b78104d336566bb7071ef", + "version-string": "v0.2.20", + "port-version": 0 + }, + { + "git-tree": "baa8a19758f21b3c343d6ccc572677f0425320a8", + "version-string": "v0.2.19-2", + "port-version": 0 + }, + { + "git-tree": "fd9280d29695c3331686da27e31f10b7a444806d", + "version-string": "v0.2.19-1", + "port-version": 0 + }, + { + "git-tree": "21ca4d86087516df3a7796ed8ed746b5bde911c4", + "version-string": "v0.2.19", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/opencascade.json b/externals/vcpkg/versions/o-/opencascade.json new file mode 100755 index 000000000..7d0d833ba --- /dev/null +++ b/externals/vcpkg/versions/o-/opencascade.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "6dd7a80ecf7e8183ebfd1e25fc64351e47f9eed0", + "version": "7.6.2", + "port-version": 0 + }, + { + "git-tree": "0b043af5fd55a990d23a36523c82b005422ba75c", + "version": "7.6.0", + "port-version": 1 + }, + { + "git-tree": "a1f9f32c2e0778573a20d4b59fda9be37cf6134d", + "version": "7.6.0", + "port-version": 0 + }, + { + "git-tree": "fc0aab2d38343a9640300fb0f46c67f5313cf16c", + "version-string": "7.5.0", + "port-version": 3 + }, + { + "git-tree": "c7237c216387119d00fe5d113c6c666f1572b2f0", + "version-string": "7.5.0", + "port-version": 2 + }, + { + "git-tree": "1afbbcf0d6d85963a334b8ae8e95b4fe16a9ff5b", + "version-string": "7.5.0", + "port-version": 1 + }, + { + "git-tree": "0d003408ab69f77a4ca2c02de115087c87a46b27", + "version-string": "7.5.0", + "port-version": 0 + }, + { + "git-tree": "dc198546c1a39fc3a26f7fae34f1ca97afa94f32", + "version-string": "7.4.0", + "port-version": 3 + }, + { + "git-tree": "646db5b2c13e7a7a45048373edc27efcfd348dd9", + "version-string": "7.4.0", + "port-version": 2 + }, + { + "git-tree": "9735f1411a8eb5954d588eb13162b3b07f35726e", + "version-string": "7.4.0", + "port-version": 1 + }, + { + "git-tree": "4ffd2ac8cc350cd08652297a4959d172c1d45d6a", + "version-string": "7.4.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/opencc.json b/externals/vcpkg/versions/o-/opencc.json new file mode 100755 index 000000000..525db85fd --- /dev/null +++ b/externals/vcpkg/versions/o-/opencc.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "10bc4f21926d1c116227ba57e954c4f8a6c9e999", + "version-date": "2020-04-26", + "port-version": 10 + }, + { + "git-tree": "b7f1756b470f31ae2da4a2d65eb5c409d4798b8e", + "version-string": "2020-04-26", + "port-version": 9 + }, + { + "git-tree": "4236b23738ad59b661253bf3a449355d838cb7dc", + "version-string": "2020-04-26", + "port-version": 8 + }, + { + "git-tree": "cd8da026ffad42709da43cbbc8105ed1cdd01c70", + "version-string": "2020-04-26", + "port-version": 7 + }, + { + "git-tree": "7257ac86f4aa09110b2715e6084307721410d194", + "version-string": "2020-04-26-6", + "port-version": 0 + }, + { + "git-tree": "692fcf28cdfa738d78737f7a7662e45f2c351986", + "version-string": "2020-04-26-4", + "port-version": 0 + }, + { + "git-tree": "1afb1e53661aafaf3c29cc4e9e737fc1f21b3678", + "version-string": "2020-04-26-3", + "port-version": 0 + }, + { + "git-tree": "2429812f85e03684ce1d9bfc6c0c52507883018f", + "version-string": "2020-04-26-2", + "port-version": 0 + }, + { + "git-tree": "71b9bac92955af0614db11b45379500b17ece077", + "version-string": "2020-04-26-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/opencensus-cpp.json b/externals/vcpkg/versions/o-/opencensus-cpp.json new file mode 100755 index 000000000..4b2735ff7 --- /dev/null +++ b/externals/vcpkg/versions/o-/opencensus-cpp.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "1e0e908de8a31c22d295c1ad069e87ab2eb964b7", + "version-date": "2021-08-26", + "port-version": 0 + }, + { + "git-tree": "cd8e1133cda88028a939ad52bd047894959fc9fd", + "version-string": "0.4.0", + "port-version": 2 + }, + { + "git-tree": "761b1a467f5402007072e8f3282ec2e8801615d3", + "version-string": "0.4.0-1", + "port-version": 0 + }, + { + "git-tree": "bbdcc3676e810d04ceb42480ed9767dd375c467f", + "version-string": "0.4.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/opencl.json b/externals/vcpkg/versions/o-/opencl.json new file mode 100755 index 000000000..51e3609b1 --- /dev/null +++ b/externals/vcpkg/versions/o-/opencl.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "f0d58793b575b614e5832f803d5e679b64e991a9", + "version-string": "2.2", + "port-version": 8 + }, + { + "git-tree": "9f93abeb8cc37eb7d67dc0c5f526ec264735de56", + "version-string": "2.2", + "port-version": 7 + }, + { + "git-tree": "c886ba756e6871aa46eeca3d34cb9ca852fcb3e9", + "version-string": "2.2", + "port-version": 6 + }, + { + "git-tree": "0e60dc7d1ed49b1093ac144edc526a66b8f2e9f1", + "version-string": "2.2", + "port-version": 5 + }, + { + "git-tree": "b2b7c1026dd49d8540310e1e9a4c02f9c01319c2", + "version-string": "2.2", + "port-version": 4 + }, + { + "git-tree": "9860a576380ef6c492b0975715eed6e4eb619c37", + "version-string": "2.2", + "port-version": 3 + }, + { + "git-tree": "d27cc2902406fcce6098369f2ec132601f5050c7", + "version-string": "2.2-2-1", + "port-version": 0 + }, + { + "git-tree": "ada5d8051a1040716f60e762aa6bd53184d1d3b7", + "version-string": "2.2-2", + "port-version": 0 + }, + { + "git-tree": "29e052403252b1ac00345ecf3b935bca1cabd2a3", + "version-string": "2.2 (2018.08.31)", + "port-version": 0 + }, + { + "git-tree": "d53f122d6440dd37f1816452f725cfa2b27ab13a", + "version-string": "2.2 (2017.07.18)-1", + "port-version": 0 + }, + { + "git-tree": "6bdf7f756cb460776fb5277d139df4250e827373", + "version-string": "2.2 (2017.07.18)", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/opencolorio-tools.json b/externals/vcpkg/versions/o-/opencolorio-tools.json new file mode 100755 index 000000000..afa26a56f --- /dev/null +++ b/externals/vcpkg/versions/o-/opencolorio-tools.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "470dd29b1dcb2d67147fca8fae816c04151d43c9", + "version-string": "1.1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/opencolorio.json b/externals/vcpkg/versions/o-/opencolorio.json new file mode 100755 index 000000000..ac457821b --- /dev/null +++ b/externals/vcpkg/versions/o-/opencolorio.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "80e8a46f8c1c2cd748834cd225edbe127a489d5a", + "version-semver": "2.1.1", + "port-version": 2 + }, + { + "git-tree": "c68079d3d055b028af29997748784c7fa8457f7c", + "version-semver": "2.1.1", + "port-version": 1 + }, + { + "git-tree": "5027649e2b69070030097c754018913b6ae0d8b0", + "version-semver": "2.1.1", + "port-version": 0 + }, + { + "git-tree": "5b4c12d0a01185796534d2925a87fe3b874f1b91", + "version-semver": "2.1.0", + "port-version": 2 + }, + { + "git-tree": "512f32dd15d09dbb73d83b778898c99bf0697aa2", + "version-semver": "2.1.0", + "port-version": 1 + }, + { + "git-tree": "9781e9cd638610cdb11ed9968c7c1ccb1d198e79", + "version-semver": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "1cb605cb4249c89ebab09079982d8f2b4b249716", + "version-semver": "2.0.1", + "port-version": 1 + }, + { + "git-tree": "3f0f60f376d80012eb0c3bd17ce51e3788070fe4", + "version-semver": "2.0.1", + "port-version": 0 + }, + { + "git-tree": "c011ef89b247b0bc54a08016fe23793defd398a5", + "version-semver": "1.1.1", + "port-version": 5 + }, + { + "git-tree": "6f60ef16979a651554f0b59663f4180229b5c662", + "version-string": "1.1.1", + "port-version": 4 + }, + { + "git-tree": "8f51706b7a6fa82423a4c75a39be7fbb685235b5", + "version-string": "1.1.1", + "port-version": 3 + }, + { + "git-tree": "9543d1ce296e9992f57d7c5965cdb0b8f5aa13db", + "version-string": "1.1.1-2", + "port-version": 0 + }, + { + "git-tree": "437cdc74c658d98b5e9a3ac07f1466bee2ab5f65", + "version-string": "1.1.1-1", + "port-version": 0 + }, + { + "git-tree": "1640b0f385af824cc2c7cd82a4bacc874a545197", + "version-string": "1.1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/opencsg.json b/externals/vcpkg/versions/o-/opencsg.json new file mode 100755 index 000000000..def1e3736 --- /dev/null +++ b/externals/vcpkg/versions/o-/opencsg.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "fd3c126ac4b2377c60b3c005cd873825ca28f062", + "version-string": "1.4.2", + "port-version": 2 + }, + { + "git-tree": "cb2b61c16440cc89a39a8b4a6957a3489561cd37", + "version-string": "1.4.2-1", + "port-version": 0 + }, + { + "git-tree": "7464e63611b64970f8dc690a1636b63c85d803d9", + "version-string": "1.4.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/openctm.json b/externals/vcpkg/versions/o-/openctm.json new file mode 100755 index 000000000..22d7ae821 --- /dev/null +++ b/externals/vcpkg/versions/o-/openctm.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ea30144a8ad57cb95b0603de14e4dc8e9f7b2ea2", + "version": "1.0.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/opencv.json b/externals/vcpkg/versions/o-/opencv.json new file mode 100755 index 000000000..80915b47c --- /dev/null +++ b/externals/vcpkg/versions/o-/opencv.json @@ -0,0 +1,239 @@ +{ + "versions": [ + { + "git-tree": "1ed18903421ae513e731348b2e5afb13c8c38d24", + "version": "4.5.5", + "port-version": 1 + }, + { + "git-tree": "afe6b1b5c7be14be0656724754f95e537416c763", + "version": "4.5.5", + "port-version": 0 + }, + { + "git-tree": "c120b015f37bc79900712d64e8ca612d71be22cc", + "version": "4.5.4", + "port-version": 1 + }, + { + "git-tree": "7aaa340439ab4742d8e328a1069cd0923eba1072", + "version": "4.5.4", + "port-version": 0 + }, + { + "git-tree": "5b13218917e1efe74e37b28a13cfc8cc7572241e", + "version": "4.5.3", + "port-version": 0 + }, + { + "git-tree": "d3815d0156fdd054436e6abc00d13129cb1bc347", + "version": "4.5.2", + "port-version": 0 + }, + { + "git-tree": "5095d4c281b1fa2afc8398bfc61a88dc1e96e7e6", + "version": "4.5.1", + "port-version": 0 + }, + { + "git-tree": "457db123c6f787763d2bbe056e51caecd8c37464", + "version": "4.5.0", + "port-version": 0 + }, + { + "git-tree": "6732874b9a119e4de4e9afdc72469c967348b21b", + "version-string": "4.3.0", + "port-version": 1 + }, + { + "git-tree": "ad5aa4dfbaa294ebc717c4a057ee7a5ce1dc297c", + "version-string": "4.3.0", + "port-version": 0 + }, + { + "git-tree": "8fe0aa098a9de7c6c4105d7b38bfbb2731c52cb3", + "version-string": "4.1.1-1", + "port-version": 0 + }, + { + "git-tree": "597a629e0b192db88c0b4881f736472818147cc4", + "version-string": "4.1.1", + "port-version": 0 + }, + { + "git-tree": "9e00c878d4b3bd5bc2a91517120cf8e3a085ec98", + "version-string": "1", + "port-version": 0 + }, + { + "git-tree": "9f0b6666b344920bdcb1e0dfe7b45fc323a3b78b", + "version-string": "3.4.3-9", + "port-version": 0 + }, + { + "git-tree": "e7ee48bf98be9baa7e897b162e5a277a7b484886", + "version-string": "3.4.3-8", + "port-version": 0 + }, + { + "git-tree": "7f947c7c319c1fc0e51baa9f183b5e38aee66fb7", + "version-string": "3.4.3-7", + "port-version": 0 + }, + { + "git-tree": "d72717c0d0a5f10fff072ae3d506b47d8b91fbd5", + "version-string": "3.4.3-6", + "port-version": 0 + }, + { + "git-tree": "57b727a39f197dc5241a27454dd80fd28f1097d7", + "version-string": "3.4.3-5", + "port-version": 0 + }, + { + "git-tree": "51dfa45e0510693818c57a317c03330e6daab965", + "version-string": "3.4.3-4", + "port-version": 0 + }, + { + "git-tree": "3ebeeda6302e7b62366e0b012c784b5fd87b96bf", + "version-string": "3.4.3-3", + "port-version": 0 + }, + { + "git-tree": "ec1bb4516a69bc780256b521740808e70603339b", + "version-string": "3.4.3-2", + "port-version": 0 + }, + { + "git-tree": "6ed937b2d8d0160f22683416b994eafd0aad3d3d", + "version-string": "3.4.3-1", + "port-version": 0 + }, + { + "git-tree": "62060816447b70d6a4625374e9b24a43c07c5929", + "version-string": "3.4.1", + "port-version": 0 + }, + { + "git-tree": "5fca2f965e8f3485718360b794d62d6ca9865762", + "version-string": "3.4.0-3", + "port-version": 0 + }, + { + "git-tree": "00efab2544a2980f754b533bb0046356d47c912a", + "version-string": "3.4.0-2", + "port-version": 0 + }, + { + "git-tree": "d54e948650790ebfc00b6de46660fcf67a028f0a", + "version-string": "3.4.0-1", + "port-version": 0 + }, + { + "git-tree": "aced93453c6f4a6e02a188d14b3a10abd64b8c0c", + "version-string": "3.4.0", + "port-version": 0 + }, + { + "git-tree": "2da56b83268392d917bfe80bf4f92dbe4cc7ca4d", + "version-string": "3.3.1-9", + "port-version": 0 + }, + { + "git-tree": "b7378b5a511f79674d65a35d5690c53eaa9927b0", + "version-string": "3.3.1-7", + "port-version": 0 + }, + { + "git-tree": "abda556c8dece8468becafa9808db220cf9c1a7e", + "version-string": "3.3.1-6", + "port-version": 0 + }, + { + "git-tree": "4212ca0f65b852e12c91ed479570c3d7ff50a77e", + "version-string": "3.3.1-5", + "port-version": 0 + }, + { + "git-tree": "f45ed7ed71d4c5d73d951eb4023474b434b45c25", + "version-string": "3.3.1-4", + "port-version": 0 + }, + { + "git-tree": "8c862937c33055e80a6e636556957ebaa6c97d37", + "version-string": "3.3.1-3", + "port-version": 0 + }, + { + "git-tree": "9045cd52a4b6132936af20705a044afbcb2e492e", + "version-string": "3.3.1-2", + "port-version": 0 + }, + { + "git-tree": "72f403ecf0186d4c889edd7f99ef7be24f2d7fbc", + "version-string": "3.3.1-1", + "port-version": 0 + }, + { + "git-tree": "9244c1e87f7f5d99dc8a754a352a1e0a04e5108f", + "version-string": "3.3.1", + "port-version": 0 + }, + { + "git-tree": "01d7395a67c5096f4b1275ec808aacc9a8a9d049", + "version-string": "3.3.0-4", + "port-version": 0 + }, + { + "git-tree": "9a39fdafab167d2451b80d360b80cd94ce499d69", + "version-string": "3.3.0-3", + "port-version": 0 + }, + { + "git-tree": "402467d3bfeb4c7d878222607e614f4da7f53615", + "version-string": "3.3.0-2", + "port-version": 0 + }, + { + "git-tree": "39ae905c6dfbc15216cf28737103a5ea3d894637", + "version-string": "3.3.0-1", + "port-version": 0 + }, + { + "git-tree": "cc5315152c726d67f024bfb05401254d8b781b59", + "version-string": "3.3.0", + "port-version": 0 + }, + { + "git-tree": "0ad712dac9bd91d0038feebae6726d99755e92ab", + "version-string": "3.2.0-3", + "port-version": 0 + }, + { + "git-tree": "2281757ea67a9e8fc6240163d5af7f7c843bb962", + "version-string": "3.2.0-2", + "port-version": 0 + }, + { + "git-tree": "d1afac448ed5e1785ec6b332e40fb78802740f51", + "version-string": "3.2.0-1", + "port-version": 0 + }, + { + "git-tree": "455dcfe81452d1196d2551e0537f1f12d80e0321", + "version-string": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "e5aeee6d973e1092b78e483aaa7512312f6b30a8", + "version-string": "3.1.0-1", + "port-version": 0 + }, + { + "git-tree": "c4233185bd5b3e80f9cbf99d772ef95261d485eb", + "version-string": "3.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/opencv2.json b/externals/vcpkg/versions/o-/opencv2.json new file mode 100755 index 000000000..87764af3d --- /dev/null +++ b/externals/vcpkg/versions/o-/opencv2.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "5dad4c606f120b7d208ec193036596bd82074e81", + "version": "2.4.13.7", + "port-version": 13 + }, + { + "git-tree": "65f3aff976c42b2759e70867fa006287ff1be835", + "version": "2.4.13.7", + "port-version": 12 + }, + { + "git-tree": "d90ae2125e2fa18011bd9defe7a651d110113b76", + "version": "2.4.13.7", + "port-version": 11 + }, + { + "git-tree": "04d0949582f825d8a93c13fe0be0acbe8183073b", + "version": "2.4.13.7", + "port-version": 10 + }, + { + "git-tree": "e02e468ae088086be3b3579366e0bc4c3c8be6cc", + "version": "2.4.13.7", + "port-version": 9 + }, + { + "git-tree": "e2c00be603dbf06283820dc2b2f6c04a77728a5f", + "version": "2.4.13.7", + "port-version": 8 + }, + { + "git-tree": "d6ccb4fb79829bcf58dd79950529d7086d6b277c", + "version": "2.4.13.7", + "port-version": 7 + }, + { + "git-tree": "e85a45aa17a47da9f965b93cb0c6fc8273a7ca04", + "version": "2.4.13.7", + "port-version": 6 + }, + { + "git-tree": "50a5602ecab15fd1c36f0619a5fdbd4792eb1b23", + "version-string": "2.4.13.7", + "port-version": 5 + }, + { + "git-tree": "7a9db98ab98f632cba250ec9290924c4027a8f0d", + "version-string": "2.4.13.7", + "port-version": 4 + }, + { + "git-tree": "81d05f35376a5fa085bbf4442e66c60c45c905e5", + "version-string": "2.4.13.7", + "port-version": 3 + }, + { + "git-tree": "98661fc5cf307307ccf7240f18734e0880124f9b", + "version-string": "2.4.13.7", + "port-version": 2 + }, + { + "git-tree": "ce5120f5620f5a168ca7c7b64ecca47a170663fc", + "version-string": "2.4.13.7-2", + "port-version": 0 + }, + { + "git-tree": "534b08f98b05680c655eba5212376dba0c3350a4", + "version-string": "2.4.13.7-1", + "port-version": 0 + }, + { + "git-tree": "da51784b42ebbe9026147c0dd6a9f9cb54fd83ea", + "version-string": "2.4.13.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/opencv3.json b/externals/vcpkg/versions/o-/opencv3.json new file mode 100755 index 000000000..803ad1510 --- /dev/null +++ b/externals/vcpkg/versions/o-/opencv3.json @@ -0,0 +1,169 @@ +{ + "versions": [ + { + "git-tree": "8d02d89d9531e2243b81f37f97a9be943fd6b0a0", + "version": "3.4.16", + "port-version": 9 + }, + { + "git-tree": "d8a8b60a98ada175921aadcd09ed66509c9be2a4", + "version": "3.4.16", + "port-version": 8 + }, + { + "git-tree": "d3c28cb4da2e7da9d31cc72415aff26f0b4d8442", + "version": "3.4.16", + "port-version": 7 + }, + { + "git-tree": "65bade77414d264741d23ce93401c1bc08718e86", + "version": "3.4.16", + "port-version": 6 + }, + { + "git-tree": "55064c574fa80aef66dd85a330f669ba7ad402e9", + "version": "3.4.16", + "port-version": 5 + }, + { + "git-tree": "7060d481bf3045fdd24aa8ef0d83cf2db3b13a50", + "version": "3.4.16", + "port-version": 4 + }, + { + "git-tree": "76d605b750c5535590489574dc24fa30ffe249f8", + "version": "3.4.16", + "port-version": 3 + }, + { + "git-tree": "a11dd583ecb7212732fedb0ab3e3308ea84f10d9", + "version": "3.4.16", + "port-version": 2 + }, + { + "git-tree": "0bf28e1704eae1d6f24b98fe884b27c71db798a7", + "version": "3.4.16", + "port-version": 1 + }, + { + "git-tree": "e55e479a0240978c0d0dee3cb79619e93b3825a3", + "version": "3.4.16", + "port-version": 0 + }, + { + "git-tree": "dee8e4cb055e92ed1708903f73dcca96b0793fe5", + "version": "3.4.15", + "port-version": 3 + }, + { + "git-tree": "27a6a94907d72955e9d473dfbce89ae851ee1bda", + "version": "3.4.15", + "port-version": 2 + }, + { + "git-tree": "47b6ae97aeb00ba20b231fdbb2fa043cdc5de2c5", + "version": "3.4.15", + "port-version": 1 + }, + { + "git-tree": "cb4ed9774da974697dde70c75cbf9639e9209673", + "version": "3.4.15", + "port-version": 0 + }, + { + "git-tree": "c91b306c8fc5cbdffa178a247051d306240c55ad", + "version": "3.4.14", + "port-version": 2 + }, + { + "git-tree": "850be938a178de206c52be71229048d501bd61e8", + "version": "3.4.14", + "port-version": 1 + }, + { + "git-tree": "766b570f861ad21af950db7c02e5dc48d4fd1a1e", + "version": "3.4.14", + "port-version": 0 + }, + { + "git-tree": "4b65e217d97307583039d4324cd32488347cc344", + "version": "3.4.13", + "port-version": 0 + }, + { + "git-tree": "ffd8270ed4798f25f3bd882a6089c72e86803466", + "version": "3.4.12", + "port-version": 1 + }, + { + "git-tree": "a0dfe03c4db4fb9532b888399deee675750eef61", + "version-string": "3.4.12", + "port-version": 0 + }, + { + "git-tree": "a761625dd5d17548aaa9611295ace23ca8bc27fc", + "version-string": "3.4.10", + "port-version": 5 + }, + { + "git-tree": "d08b6595a75aefc70b70a366a07c2a3b1dd66e92", + "version-string": "3.4.10", + "port-version": 4 + }, + { + "git-tree": "3f9dcddaa40b8032f095dfef0850a999c50330cb", + "version-string": "3.4.10", + "port-version": 2 + }, + { + "git-tree": "200f3763e348b4035e5d0859b39277c3a2eb9efd", + "version-string": "3.4.10", + "port-version": 1 + }, + { + "git-tree": "83fb6240d968e2f8109e09726907ae9c6bdf3715", + "version-string": "3.4.10", + "port-version": 0 + }, + { + "git-tree": "25bb0e7ecdf6f547f6dd6f8fd50af34d4f27f9b3", + "version-string": "3.4.7-4", + "port-version": 0 + }, + { + "git-tree": "a805102e7801e68f879e1aed81e6a34dae97c46d", + "version-string": "3.4.7-3", + "port-version": 0 + }, + { + "git-tree": "df5779127fda5beca9a20a45bb4d5880259e0c18", + "version-string": "3.4.7-2", + "port-version": 0 + }, + { + "git-tree": "b9e85a73fcbb13e3554fcbe7cc735823fee89f40", + "version-string": "3.4.8", + "port-version": 0 + }, + { + "git-tree": "938cc15523e991a6dcfdfd7c1d70b2a0086253e2", + "version-string": "3.4.7-2", + "port-version": 0 + }, + { + "git-tree": "6e5abec3d0ec683d80f9a9f82b0d0da7234e8df9", + "version-string": "3.4.7-1", + "port-version": 0 + }, + { + "git-tree": "ea66b5ecd65cf2c3bd14687ebbeae105df7afd0e", + "version-string": "3.4.7", + "port-version": 0 + }, + { + "git-tree": "b2b21f6a9333d757a8fc04c094eaa2a332ce6593", + "version-string": "3.4.3-10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/opencv4.json b/externals/vcpkg/versions/o-/opencv4.json new file mode 100755 index 000000000..f2e3e6fb0 --- /dev/null +++ b/externals/vcpkg/versions/o-/opencv4.json @@ -0,0 +1,174 @@ +{ + "versions": [ + { + "git-tree": "26f2ba4a582c93442e82167dece932c3833a2124", + "version": "4.5.5", + "port-version": 5 + }, + { + "git-tree": "86073388865f7730e42d02768f8963156f2be82f", + "version": "4.5.5", + "port-version": 4 + }, + { + "git-tree": "0771f6243ddde63a9b212efeb5ad51a74b640a62", + "version": "4.5.5", + "port-version": 3 + }, + { + "git-tree": "90f4418431aa3ddcdbd34c33d5e654cda5cda26a", + "version": "4.5.5", + "port-version": 2 + }, + { + "git-tree": "dcdd746ffc69d5f3234b67ee17fdd54966c8f5cb", + "version": "4.5.5", + "port-version": 1 + }, + { + "git-tree": "afed148d21295bf99e8ac657fdb808ed82467871", + "version": "4.5.5", + "port-version": 0 + }, + { + "git-tree": "ce474a40e6572ced8dd1229f22f6cbed9cc74212", + "version": "4.5.4", + "port-version": 4 + }, + { + "git-tree": "b170a087d34521462cd247a24f230627a272975e", + "version": "4.5.4", + "port-version": 3 + }, + { + "git-tree": "537abba5a070d173cf42510f86ff4ffe057dd77f", + "version": "4.5.4", + "port-version": 2 + }, + { + "git-tree": "6a5d8c17cfd9a4e3caa7acf4625876fec8880fe2", + "version": "4.5.4", + "port-version": 1 + }, + { + "git-tree": "35b4405de16e9116ce1e698827c2254a0b02b963", + "version": "4.5.4", + "port-version": 0 + }, + { + "git-tree": "d48f3aabd1d417854360efb92874f3b533f83966", + "version": "4.5.3", + "port-version": 3 + }, + { + "git-tree": "6b5539ab3cd468944f8d46698c610285319bf0f7", + "version": "4.5.3", + "port-version": 2 + }, + { + "git-tree": "9d18da7f0c17619f7912a5d53b0316c7a18d625a", + "version": "4.5.3", + "port-version": 1 + }, + { + "git-tree": "f7110f51e74414c1111a6403d1979f7786c5f2ad", + "version": "4.5.3", + "port-version": 0 + }, + { + "git-tree": "e659d7d78204aee895e5f222f7cf9beb90df8a31", + "version": "4.5.2", + "port-version": 1 + }, + { + "git-tree": "ac5c96fd5709b302c81b76814a3ccfd99dcdecdc", + "version": "4.5.2", + "port-version": 0 + }, + { + "git-tree": "c719098632c388044e4cd242a1f5276e81727466", + "version": "4.5.1", + "port-version": 1 + }, + { + "git-tree": "ba505df8f61764e9b4667b04958c748237d12d23", + "version": "4.5.1", + "port-version": 0 + }, + { + "git-tree": "a0522dbbb44877b9d4618bfe31a376e07e49bc72", + "version": "4.5.0", + "port-version": 1 + }, + { + "git-tree": "cdf704950d37ce677508db67c081f9aeda18b9cd", + "version-string": "4.5.0", + "port-version": 0 + }, + { + "git-tree": "f6fbdfab1e9ac01652b51f2251715c2be05a6567", + "version-string": "4.3.0", + "port-version": 5 + }, + { + "git-tree": "bda3727a0c91b614fe1b275e27ad4b68f214eebe", + "version-string": "4.3.0", + "port-version": 4 + }, + { + "git-tree": "d5c64c4075f88067d3ae8119ea7140e133627d1f", + "version-string": "4.3.0", + "port-version": 3 + }, + { + "git-tree": "f571b98de52b78113223d9b79d70d97d672fa413", + "version-string": "4.3.0", + "port-version": 2 + }, + { + "git-tree": "6f11f3e345684317176988ff5896cd31404accc5", + "version-string": "4.3.0", + "port-version": 1 + }, + { + "git-tree": "69c5f56a426c94a5ec251a57622941d693702b95", + "version-string": "4.3.0", + "port-version": 0 + }, + { + "git-tree": "443dfcaf9082fbd24d9100180379e47bbaef4a4c", + "version-string": "4.1.1-6", + "port-version": 0 + }, + { + "git-tree": "846f7bc054851874d30c1574abf54937144e3c62", + "version-string": "4.1.1-5", + "port-version": 0 + }, + { + "git-tree": "07c23c624ffbcc95062f236a0e6c71a0cd726d13", + "version-string": "4.1.1-4", + "port-version": 0 + }, + { + "git-tree": "fdf271026e2d18800bda3fc9be0b6507229b06c3", + "version-string": "4.1.1-3", + "port-version": 0 + }, + { + "git-tree": "340b91bcad046b3bfda4e84bf948d0773d0ad87a", + "version-string": "4.1.1-2", + "port-version": 0 + }, + { + "git-tree": "89816cf327fc1d562eab553f5e9580322080af7c", + "version-string": "4.1.1-1", + "port-version": 0 + }, + { + "git-tree": "47cbcb87c38cb217c649a4891bb7d544464401dd", + "version-string": "4.1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/opendnp3.json b/externals/vcpkg/versions/o-/opendnp3.json new file mode 100755 index 000000000..4eac48822 --- /dev/null +++ b/externals/vcpkg/versions/o-/opendnp3.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "e9315f4a8ad7564c1fc8b81c4a9f4c7b0305c0b3", + "version": "3.1.1", + "port-version": 1 + }, + { + "git-tree": "bf6ee46efb76af8f7f317fabfb24358fd82312de", + "version": "3.1.1", + "port-version": 0 + }, + { + "git-tree": "3659f9f4ee54aa9d6d51ef3cd42f256c28c7c73e", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "2ea5a138218e4b0a3f9b08022d2c36bc1eb2aec3", + "version-string": "2.3.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/openexr.json b/externals/vcpkg/versions/o-/openexr.json new file mode 100755 index 000000000..06c0f7620 --- /dev/null +++ b/externals/vcpkg/versions/o-/openexr.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "7589d3f1641e6e63450303e424d966221375109f", + "version-string": "2.5.0", + "port-version": 3 + }, + { + "git-tree": "42bec4d0daed751ad449a504b7fa43d57eec9000", + "version-string": "2.5.0", + "port-version": 2 + }, + { + "git-tree": "57533ba228ee5000842fa8849f0e69ef4018a5c5", + "version-string": "2.5.0", + "port-version": 1 + }, + { + "git-tree": "60b80c63bd5237a5f86e789d0d396f27fe12a19c", + "version-string": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "95c08ccc067bd38f4c1ce7438fdbd864b313beef", + "version-string": "2.3.0-5", + "port-version": 0 + }, + { + "git-tree": "f7e2502e91aad7c1f2b39dba1e915ad13f58db1a", + "version-string": "2.3.0-4", + "port-version": 0 + }, + { + "git-tree": "5a6cd76dd7ee1ffb88a7a13b2d0dfd5a691196f4", + "version-string": "2.3.0-3", + "port-version": 0 + }, + { + "git-tree": "389ee1922f0565a4558c219545cdb96ab7945cfe", + "version-string": "2.3.0-2", + "port-version": 0 + }, + { + "git-tree": "c86b1ce581d107254d48142740f5474612af9100", + "version-string": "2.2.1-1", + "port-version": 0 + }, + { + "git-tree": "c3ed3d275793ddb0a82d68240034aa60ae9d3fb2", + "version-string": "2.2.0-4", + "port-version": 0 + }, + { + "git-tree": "7bc5c81f3dd6502d710116ebd295e5fe66c78892", + "version-string": "2.2.0-1", + "port-version": 0 + }, + { + "git-tree": "2833ba9083b676eb7cea4143837012a9de803622", + "version-string": "2.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/opengl-registry.json b/externals/vcpkg/versions/o-/opengl-registry.json new file mode 100755 index 000000000..4d482df6b --- /dev/null +++ b/externals/vcpkg/versions/o-/opengl-registry.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "7f4a1e05a6cfbd923a2eaf9d32da22bde0742a15", + "version-date": "2021-11-17", + "port-version": 0 + }, + { + "git-tree": "d14f0786a99a87d5d429ba257674fb55e93ccae6", + "version-string": "2020-03-25", + "port-version": 1 + }, + { + "git-tree": "d23f8ad18109c3545ec5fd5e1475a312d9e656b5", + "version-string": "2020-03-25", + "port-version": 0 + }, + { + "git-tree": "736f97347ede622d5041bb031837c49e43aeecdf", + "version-string": "2020-02-03", + "port-version": 0 + }, + { + "git-tree": "3df554a594aee43ecf44aa602d5c210ffd1ab759", + "version-string": "2019-08-22", + "port-version": 0 + }, + { + "git-tree": "dcc538d711de6a8c1f8fe078c4867d67b8d4b0e3", + "version-string": "2018-06-30-1", + "port-version": 0 + }, + { + "git-tree": "487dd39ff4041c1bcd9a7688d3c6ffa416ef90d7", + "version-string": "2018-06-30", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/opengl.json b/externals/vcpkg/versions/o-/opengl.json new file mode 100755 index 000000000..f2e28fba5 --- /dev/null +++ b/externals/vcpkg/versions/o-/opengl.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "6778094e7a9e5027545a46af473d27ce28890c53", + "version-date": "2022-03-14", + "port-version": 0 + }, + { + "git-tree": "9fa8ed2a1fb625613a32ee95d2413dbc921860f7", + "version-string": "0.0", + "port-version": 9 + }, + { + "git-tree": "5868fea6f867eb1c81cf269f9cd239aecf62fe70", + "version-string": "0.0", + "port-version": 8 + }, + { + "git-tree": "82ccb670042f398518ca2c029888fb06dd9e7015", + "version-string": "0.0-7", + "port-version": 0 + }, + { + "git-tree": "783497fd4d395d5544d668861e928497ae8fc42f", + "version-string": "0.0-6", + "port-version": 0 + }, + { + "git-tree": "98c08fbdc985f6720d5f54992c5006e6d690e894", + "version-string": "0.0-5", + "port-version": 0 + }, + { + "git-tree": "aa55744a5ac9c703aebb7525f87b5f9b24a772db", + "version-string": "0.0-4", + "port-version": 0 + }, + { + "git-tree": "00ea51890fb7c03a0926ecd9f853e750cf299a6d", + "version-string": "0.0-3", + "port-version": 0 + }, + { + "git-tree": "b7a0d7a82d120a6975a9f899fd8f5d37ec6323a2", + "version-string": "0.0-2", + "port-version": 0 + }, + { + "git-tree": "415751ef6bbe340c7c17899e764729a11b1f97f8", + "version-string": "0.0-1", + "port-version": 0 + }, + { + "git-tree": "fb5a4675d10bd8b19ff623bffaebacc14f3f0758", + "version-string": "10.0.10240.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/openh264.json b/externals/vcpkg/versions/o-/openh264.json new file mode 100755 index 000000000..895d98ae0 --- /dev/null +++ b/externals/vcpkg/versions/o-/openh264.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "de70ba65ce87de6c9e2c53797d560e42bf6771ea", + "version-date": "2021-03-16", + "port-version": 3 + }, + { + "git-tree": "dd110373e4afc53e6ea5b43b9f940fda9204c72c", + "version-date": "2021-03-16", + "port-version": 2 + }, + { + "git-tree": "07352ebe168754b537e6ed23cc64e17e7b22ac9e", + "version-date": "2021-03-16", + "port-version": 1 + }, + { + "git-tree": "e541fb33857fd6401459e1f0fdc617d47fa3094e", + "version-date": "2021-03-16", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/openigtlink.json b/externals/vcpkg/versions/o-/openigtlink.json new file mode 100755 index 000000000..cc11c7227 --- /dev/null +++ b/externals/vcpkg/versions/o-/openigtlink.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "9f384eebd3c8103ad8b23aed6cda655217f091fd", + "version-string": "3.0", + "port-version": 2 + }, + { + "git-tree": "6f814a06b22cc250df4eb31553c6df7a803567b7", + "version-string": "3.0", + "port-version": 1 + }, + { + "git-tree": "df766287f1c9c4d379143fab2456a64ae7ae8452", + "version-string": "3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/openimageio.json b/externals/vcpkg/versions/o-/openimageio.json new file mode 100755 index 000000000..0fac6cd2e --- /dev/null +++ b/externals/vcpkg/versions/o-/openimageio.json @@ -0,0 +1,204 @@ +{ + "versions": [ + { + "git-tree": "4c60e9a4adf07bdd6ff8bf766f295af17d8a0818", + "version": "2.3.10.1", + "port-version": 4 + }, + { + "git-tree": "2fa8debd832d46f5ad96798be8a335b8a251c2ca", + "version": "2.3.10.1", + "port-version": 3 + }, + { + "git-tree": "a52afa5ed0495b47dd1c123d975746fdfa0b3459", + "version": "2.3.10.1", + "port-version": 2 + }, + { + "git-tree": "00b94623cc9528075483e57034da95bb356c6848", + "version": "2.3.10.1", + "port-version": 1 + }, + { + "git-tree": "f5a6955a1595a5d3ea429059d9be4ddedc8e7cab", + "version": "2.3.10.1", + "port-version": 0 + }, + { + "git-tree": "f9b44bac4dcc0735f5efc3e8f0d439790b7efbd0", + "version": "2.3.7.2", + "port-version": 5 + }, + { + "git-tree": "8b1ce552e00d88857ad35695435b353caf9ad4c2", + "version": "2.3.7.2", + "port-version": 4 + }, + { + "git-tree": "a7643bd1ea5b962a2b98a9c6c991a15021fab17d", + "version": "2.3.7.2", + "port-version": 3 + }, + { + "git-tree": "6084a6398514fc24fd450a7b9290937b1274d7b6", + "version": "2.3.7.2", + "port-version": 2 + }, + { + "git-tree": "799ea36f0486224257ecfea149b429d81e74a879", + "version": "2.3.7.2", + "port-version": 1 + }, + { + "git-tree": "6da138c7530d19649391636a660a06aac51db135", + "version": "2.3.7.2", + "port-version": 0 + }, + { + "git-tree": "1567eaa1f67e0996635f0d4213b55e9b97882acf", + "version": "2.2.17.0", + "port-version": 1 + }, + { + "git-tree": "886169206344e33a401999f301de01fe1e4fed01", + "version": "2.2.17.0", + "port-version": 0 + }, + { + "git-tree": "2c57516ef37256b8b87a41801732e11b3ae1380c", + "version": "2.2.10.0", + "port-version": 1 + }, + { + "git-tree": "f3b1e2083feeb5968429f3349acaa46fa71f3054", + "version-string": "2.2.10.0", + "port-version": 0 + }, + { + "git-tree": "08ea57c10b4cf3c92b6c880b9ab9b8e9ae069088", + "version-string": "2.1.16.0", + "port-version": 4 + }, + { + "git-tree": "c4460db95e2f59658b13c4c26038b0e665039f1e", + "version-string": "2.1.16.0", + "port-version": 3 + }, + { + "git-tree": "4939ef90a627a3d4f4a600455ac593754fdc274f", + "version-string": "2.1.16.0", + "port-version": 2 + }, + { + "git-tree": "66fffd021262293272c336882ea24e7992122b0d", + "version-string": "2.1.16.0-1", + "port-version": 0 + }, + { + "git-tree": "da742ae190c2deecdef8daac5c312dab9a9ecf29", + "version-string": "2.1.16.0", + "port-version": 0 + }, + { + "git-tree": "a0834a3a784d5dcf93897e3c28af827cb966c822", + "version-string": "2.1.9.0", + "port-version": 0 + }, + { + "git-tree": "ac2fc1fb3286ab06ad17e0f24fa667e25c1d555f", + "version-string": "2019-10-10-1", + "port-version": 0 + }, + { + "git-tree": "4a2f086cef3bec3498a44bcae7482b32170e3cfa", + "version-string": "2019-08-08-4", + "port-version": 0 + }, + { + "git-tree": "a4500ee8d5d523635a07d1f173d3f90e21d98dcd", + "version-string": "2019-08-08-3", + "port-version": 0 + }, + { + "git-tree": "2efe4a70532ad411117e8d9309a75378187a231f", + "version-string": "2019-08-08-2", + "port-version": 0 + }, + { + "git-tree": "b626a36682552515ed19cbf7361d359deb40cf58", + "version-string": "2019-08-08-1", + "port-version": 0 + }, + { + "git-tree": "433ee11b48724f4feaa9b11b9ef55c1e763dfefb", + "version-string": "2019-08-08", + "port-version": 0 + }, + { + "git-tree": "7cbfbafcda5d9a9e3b91a17fbf3267888611a247", + "version-string": "2.0.8", + "port-version": 0 + }, + { + "git-tree": "6a035d1545e7924ae588b320188e30108172728b", + "version-string": "1.8.16", + "port-version": 0 + }, + { + "git-tree": "cf91955a653559620316e62c402bf60ea6f3c0af", + "version-string": "1.8.15-1", + "port-version": 0 + }, + { + "git-tree": "a0fe4580c5f514e2c59b1803b714cd24101c2a31", + "version-string": "1.8.15", + "port-version": 0 + }, + { + "git-tree": "40a2e5c8a01349da130320a3dcebe1c0a5ebd5d8", + "version-string": "Release-1.8.13", + "port-version": 0 + }, + { + "git-tree": "5b20b4e0c0ad93419649df8743e79778d367df38", + "version-string": "Release-1.8.12-1", + "port-version": 0 + }, + { + "git-tree": "9a00e0c0f4377a59f5d4d1f23511f62a04dae4b1", + "version-string": "Release-1.8.12", + "port-version": 0 + }, + { + "git-tree": "2c62bddf1625f43565a6de488587582dbc90d06e", + "version-string": "Release-1.9.2dev", + "port-version": 0 + }, + { + "git-tree": "2b40bcb273de6981c43c09b627aab0869ddd7372", + "version-string": "1.8.10", + "port-version": 0 + }, + { + "git-tree": "cadc393d5f52b8f92d75cea795d0b2e5b2447835", + "version-string": "1.8.9", + "port-version": 0 + }, + { + "git-tree": "48da89793efa5a47c40e6e4c538a03e4abc8a307", + "version-string": "1.7.15-2", + "port-version": 0 + }, + { + "git-tree": "5b603e44de191ba9e664156a5ae3f9acc6d59d2d", + "version-string": "1.7.15-1", + "port-version": 0 + }, + { + "git-tree": "579f5883492ff290e524c23c316126c7480656d2", + "version-string": "1.7.15", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/openjpeg.json b/externals/vcpkg/versions/o-/openjpeg.json new file mode 100755 index 000000000..e49ff61f4 --- /dev/null +++ b/externals/vcpkg/versions/o-/openjpeg.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "3451436f9bb5f5ad8946b45868929488fe2c39dd", + "version": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "ffb3c981c0026662feded28db73c177a739773d2", + "version-semver": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "a11a593758d57ee96493bd2cb667ac1aa88e972c", + "version-semver": "2.3.1", + "port-version": 4 + }, + { + "git-tree": "55220d839365c2134574acc4e9b43b8adc2e20ab", + "version-semver": "2.3.1", + "port-version": 3 + }, + { + "git-tree": "06e54db04d7adacfd612bbaf233f6f790599b9c1", + "version-string": "2.3.1", + "port-version": 2 + }, + { + "git-tree": "145fc569bd85cb283b0de019cebe3c3e78eb9304", + "version-string": "2.3.1-1", + "port-version": 0 + }, + { + "git-tree": "859fe9bd9f11495ac909a36cab220c392a02a261", + "version-string": "2.3.1", + "port-version": 0 + }, + { + "git-tree": "8d005519176a2167a722220f85d74095ac615a6d", + "version-string": "2.3.0-1", + "port-version": 0 + }, + { + "git-tree": "bb51ad91cb5f880b1f77f579ccc691382a2ab909", + "version-string": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "7a68499a2d877aa8d73eda72e21a02e7333a61a7", + "version-string": "2.2.0-1", + "port-version": 0 + }, + { + "git-tree": "bd8a02904405466e9634eec2ea096eb854911623", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "36644da812565b785649d05f7bb850cb218fe45e", + "version-string": "2.1.2-2", + "port-version": 0 + }, + { + "git-tree": "fe1817d7f5ce1a1c04a310d69867b162984a58e0", + "version-string": "2.1.2-1", + "port-version": 0 + }, + { + "git-tree": "d338ca62fe480cd8e9ade3eed8d3f1c5de2a151d", + "version-string": "2.1.2", + "port-version": 0 + }, + { + "git-tree": "3146f21e2c422d420a0d1613fd84654374c26a2f", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/openmama.json b/externals/vcpkg/versions/o-/openmama.json new file mode 100755 index 000000000..e34e2add3 --- /dev/null +++ b/externals/vcpkg/versions/o-/openmama.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "74e126369c9ba45cf7105e1b72871738acd24de5", + "version-semver": "6.3.1", + "port-version": 1 + }, + { + "git-tree": "6945e436fdfc5307d58f84ff5c76f6a34e2a8031", + "version-string": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "e1f61617655c3cfa020faa8be6e29f154ba69792", + "version-string": "6.3.0", + "port-version": 1 + }, + { + "git-tree": "0e5068485f734c3278bd8db190c04429a8bd3354", + "version-string": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "ac2a249fccf29737a0448691f383548b8a1d136c", + "version-string": "6.2.3-1", + "port-version": 0 + }, + { + "git-tree": "9baa6992043f5396b4a03cc3c374c759d5f7fe45", + "version-string": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "de4a1266d91ff612ce90a676c2937a6b8b55f604", + "version-string": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "e9dac930a74cf102bfd275bb21a69a21b9748221", + "version-string": "6.2.1-a5a93a24d2f89a0def0145552c8cd4a53c69e2de", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/openmesh.json b/externals/vcpkg/versions/o-/openmesh.json new file mode 100755 index 000000000..065503d58 --- /dev/null +++ b/externals/vcpkg/versions/o-/openmesh.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "27929cc382c7b9cba46891aeed71e44fc5e2c31a", + "version-string": "8.1", + "port-version": 3 + }, + { + "git-tree": "19e385c7e6a18248b06db012c7ba0a68e98921a7", + "version-string": "8.1", + "port-version": 2 + }, + { + "git-tree": "c243179bd63b698826adde0be25dae93a9afd26a", + "version-string": "8.1", + "port-version": 1 + }, + { + "git-tree": "efdc08a5f186ff804bdcca5df533835bbe27965e", + "version-string": "8.1", + "port-version": 0 + }, + { + "git-tree": "8f39b4d37ab3534d21ab651e7aa7a706c66c8a74", + "version-string": "8.0-1", + "port-version": 0 + }, + { + "git-tree": "0e9ba778560654e7b44f1039f4787d3b15be073e", + "version-string": "8.0", + "port-version": 0 + }, + { + "git-tree": "795ad45391ba09eee8931c7ce39ed0c17fdd6aad", + "version-string": "7.0", + "port-version": 0 + }, + { + "git-tree": "4afa90fd8a11c378f7b11ee6fa865639aeee9efa", + "version-string": "6.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/openmpi.json b/externals/vcpkg/versions/o-/openmpi.json new file mode 100755 index 000000000..dc5df6dfa --- /dev/null +++ b/externals/vcpkg/versions/o-/openmpi.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "96a3a8cd636443eaf50648e749ff144cb65ad851", + "version": "4.1.0", + "port-version": 4 + }, + { + "git-tree": "5d701c1350d6cb8e4380f829460e8287b0e2f6cc", + "version": "4.1.0", + "port-version": 3 + }, + { + "git-tree": "2c4b5b526fe4b6a8de9fa88eea30d3a1ddc7878e", + "version-string": "4.1.0", + "port-version": 2 + }, + { + "git-tree": "bcc3284d0c3730ee4237efff0cd32df0be272d8e", + "version-string": "4.1.0", + "port-version": 1 + }, + { + "git-tree": "ada9b58df7928b49218b4b932e37b343a2047273", + "version-string": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "54178d2df9f03298fa293753786c0ddbb1fbf2c4", + "version-string": "4.0.3", + "port-version": 3 + }, + { + "git-tree": "249a4fc77010f09a504f596c0e811bc3850de534", + "version-string": "4.0.3", + "port-version": 2 + }, + { + "git-tree": "06b1d72b704fb774c6a0b9a3143f8b82b426e3f0", + "version-string": "4.0.3", + "port-version": 0 + }, + { + "git-tree": "02332e549c9366cd4f861e3d7493bdc2903a47f1", + "version-string": "4.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/openmvg.json b/externals/vcpkg/versions/o-/openmvg.json new file mode 100755 index 000000000..5c59d2175 --- /dev/null +++ b/externals/vcpkg/versions/o-/openmvg.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "7a97e175386e994ff24a45911a373450d17fe516", + "version": "2.0", + "port-version": 4 + }, + { + "git-tree": "f32be4f15d0babca5ba5a6e02b78f4610ab6d2f4", + "version": "2.0", + "port-version": 3 + }, + { + "git-tree": "894793611702efbc0abc44768002cdd12f73557a", + "version": "2.0", + "port-version": 2 + }, + { + "git-tree": "eea9187e35c87676d442453e6942a47417d7c2dd", + "version": "2.0", + "port-version": 1 + }, + { + "git-tree": "08113de9c7bc1b9201be4c3a01c1c3e5a1cf5acd", + "version": "2.0", + "port-version": 0 + }, + { + "git-tree": "6f3087d8d002d7f226e77427ce363e2b20371485", + "version": "1.6", + "port-version": 3 + }, + { + "git-tree": "f62103b28735c9e72b9a866e6530c52629e77295", + "version-string": "1.6", + "port-version": 2 + }, + { + "git-tree": "77b221e020b37ab1119a01536d5b4fe6836af4fd", + "version-string": "1.6", + "port-version": 1 + }, + { + "git-tree": "0bc383c92d6341f46ad2250f956d0731e617d9ee", + "version-string": "1.6", + "port-version": 0 + }, + { + "git-tree": "7a202c5223ad9b49c13d1da480f4113984c78441", + "version-string": "1.5", + "port-version": 1 + }, + { + "git-tree": "e8c43d501012c1f021eed7d6e45d1aa1804046a2", + "version-string": "1.5", + "port-version": 0 + }, + { + "git-tree": "b86751c6104d3528d1b8522f3f19ab09cc875092", + "version-string": "1.4-7", + "port-version": 0 + }, + { + "git-tree": "cc17d1e033de4bbed66fe4ac093c4b190e54bb9c", + "version-string": "1.4-6", + "port-version": 0 + }, + { + "git-tree": "af39708fef0b8a19c8baf137c3b51bba4bf15c53", + "version-string": "1.4-5", + "port-version": 0 + }, + { + "git-tree": "9c97705409486136d8cf5c94309c31319ed5a97c", + "version-string": "1.4-4", + "port-version": 0 + }, + { + "git-tree": "115cc901a42e2880b356f90e4156396a791eec7e", + "version-string": "1.4-2", + "port-version": 0 + }, + { + "git-tree": "e0df1dd3785f6b246146e3e765f6e1bd3dbb7d70", + "version-string": "1.4-1", + "port-version": 0 + }, + { + "git-tree": "56c947ecbbdd9a00b3d0ea05ebb489e28dc8066d", + "version-string": "1.4-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/openmvs.json b/externals/vcpkg/versions/o-/openmvs.json new file mode 100755 index 000000000..e055a2f31 --- /dev/null +++ b/externals/vcpkg/versions/o-/openmvs.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "bf082c0deb661743df2e3c5f658224ccd6375919", + "version": "2.0.1", + "port-version": 0 + }, + { + "git-tree": "b6123f8755c140325b2800c51c6c68e3fb51c668", + "version": "1.1.1", + "port-version": 3 + }, + { + "git-tree": "a66ad18d59e5ffdd21f5bc1cae0b195ba35aba18", + "version": "1.1.1", + "port-version": 2 + }, + { + "git-tree": "168233263a9b959a9a19f1eb2d6f462d5257d18f", + "version": "1.1.1", + "port-version": 1 + }, + { + "git-tree": "cda3b971b05a5519ef36759d8f3f49045fa6445e", + "version": "1.1.1", + "port-version": 0 + }, + { + "git-tree": "b1c5c58b15affc0db0e179229c4640341d62a4d7", + "version-string": "1.1", + "port-version": 6 + }, + { + "git-tree": "35e7c38229f3ddc1e59be044e8daa29afc650f99", + "version-string": "1.1", + "port-version": 5 + }, + { + "git-tree": "a14a8fbedb0cb071c7f6b3d97d3c12d6c27f678e", + "version-string": "1.1", + "port-version": 4 + }, + { + "git-tree": "a3980b27c42afe4b46828474dbcb9f437a146277", + "version-string": "1.1", + "port-version": 3 + }, + { + "git-tree": "bdda2ff3955cbfb88b1c6e01c4a0e93bfc83ee99", + "version-string": "1.1", + "port-version": 2 + }, + { + "git-tree": "ed4b73a8b7ab475adbd6e9e5687a3a1b19e5ac11", + "version-string": "1.1-1", + "port-version": 0 + }, + { + "git-tree": "b8d1e61c4d3181ce856bd523cf945db5c8745e9e", + "version-string": "1.1", + "port-version": 0 + }, + { + "git-tree": "ab9674618d5be3bdee82a346d61405c197e54ea9", + "version-string": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "0b98e0933ecd22a0c68fdaef399787d309128b43", + "version-string": "1.0-3", + "port-version": 0 + }, + { + "git-tree": "4594f8d9f4b736d1da6f077ace0266cef786c4d0", + "version-string": "1.0-2", + "port-version": 0 + }, + { + "git-tree": "cce3cd32d0a5e1e3a593c3a81cf1fbc48338c2bc", + "version-string": "1.0-1", + "port-version": 0 + }, + { + "git-tree": "49e67439d3c81dc1470f43dd03e03d2594e05f75", + "version-string": "1.0", + "port-version": 0 + }, + { + "git-tree": "241fc2e2e0d9bc0fcdef733430b237498f0ffa82", + "version-string": "0.9", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/openni2.json b/externals/vcpkg/versions/o-/openni2.json new file mode 100755 index 000000000..45f539ce4 --- /dev/null +++ b/externals/vcpkg/versions/o-/openni2.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "b99fb68dafe4b930248e5ba4d39a7a2c4a4fc9ea", + "version-string": "2.2.0.33", + "port-version": 13 + }, + { + "git-tree": "7fd7382fff870dcc4920d0ff72e5ba00ad74fa6f", + "version-string": "2.2.0.33", + "port-version": 12 + }, + { + "git-tree": "b3f6a5b9e0580c4ca1437ca2251e8d370260b6c8", + "version-string": "2.2.0.33-11", + "port-version": 0 + }, + { + "git-tree": "5a25ca5c53fa7a6f4b08fb2a593e1c8046641358", + "version-string": "2.2.0.33-10", + "port-version": 0 + }, + { + "git-tree": "bf9b3f7c83802b7d9353790a23de38200563b8ba", + "version-string": "2.2.0.33-9", + "port-version": 0 + }, + { + "git-tree": "3586a89fe1302734a60ac9d1426fe007eddcc084", + "version-string": "2.2.0.33-8", + "port-version": 0 + }, + { + "git-tree": "894a4581c583b470093bf0b436713f32270ae1ff", + "version-string": "2.2.0.33-7", + "port-version": 0 + }, + { + "git-tree": "c7f88c942735e026e4ae810efbd8606781d0f2bd", + "version-string": "2.2.0.33-4", + "port-version": 0 + }, + { + "git-tree": "a1a4539ecae1510ff8a7420786ed4a6a40973514", + "version-string": "2.2.0.33-3", + "port-version": 0 + }, + { + "git-tree": "023eccddd1b264f8eaf9107b80c24a6b42c28fac", + "version-string": "2.2.0.33-2", + "port-version": 0 + }, + { + "git-tree": "bf9a23a05a07c5f9a87fc0dd7f0014b2e340aabd", + "version-string": "2.2.0.33-1", + "port-version": 0 + }, + { + "git-tree": "92052782870efe4c166ce648b751e010e60a7dea", + "version-string": "2.2.0.33", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/openscap.json b/externals/vcpkg/versions/o-/openscap.json new file mode 100755 index 000000000..7a5ee2f30 --- /dev/null +++ b/externals/vcpkg/versions/o-/openscap.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ecbc2e72085ae6324948b52314de3b7e701376a5", + "version-string": "1.3.1", + "port-version": 1 + }, + { + "git-tree": "9c249b02fd6825acc7534912b280f31b941260bd", + "version-string": "1.3.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/openssl-unix.json b/externals/vcpkg/versions/o-/openssl-unix.json new file mode 100755 index 000000000..069de9f8e --- /dev/null +++ b/externals/vcpkg/versions/o-/openssl-unix.json @@ -0,0 +1,114 @@ +{ + "versions": [ + { + "git-tree": "6084ac3842ee1641284254bffc3f01706a372eac", + "version-string": "1.1.1h", + "port-version": 2 + }, + { + "git-tree": "dda72388849087e4edb2be900f5448376a6f5215", + "version-string": "1.1.1h", + "port-version": 1 + }, + { + "git-tree": "a5b077133a17a5f5462f7207d4877ca6bf841958", + "version-string": "1.1.1h", + "port-version": 0 + }, + { + "git-tree": "1cc8e80ce46c8cede6d950dce347212c6312189c", + "version-string": "1.1.1g", + "port-version": 4 + }, + { + "git-tree": "e748f5c8aed72f12c497a9221da925a7d6a7cd57", + "version-string": "1.1.1g", + "port-version": 3 + }, + { + "git-tree": "6d04f385c7123a4b2984f7787a28a5b72295b811", + "version-string": "1.1.1g", + "port-version": 2 + }, + { + "git-tree": "c54172f82c408954edffbd786e96b0b36ff9ccad", + "version-string": "1.1.1g", + "port-version": 1 + }, + { + "git-tree": "79e66433bc9077347892e042225a9205d64d283e", + "version-string": "1.1.1g", + "port-version": 0 + }, + { + "git-tree": "cd64682e77b61d0ce90a3e7d56f8df8f787b9548", + "version-string": "1.1.1d-4", + "port-version": 0 + }, + { + "git-tree": "1487efaaf621741639191e356e947a4118739035", + "version-string": "1.1.1d-3", + "port-version": 0 + }, + { + "git-tree": "b287227ab19c508b3257da5e6b7072278121b335", + "version-string": "1.1.1d-2", + "port-version": 0 + }, + { + "git-tree": "9d3d306d309bc95abfb88bbfa5fd46e473f016d2", + "version-string": "1.1.1d-1", + "port-version": 0 + }, + { + "git-tree": "d76be8657a6e5128eb8769d468524aea99635832", + "version-string": "1.0.2s-1", + "port-version": 0 + }, + { + "git-tree": "34b9a3c2530b7a4e7cbdae74181098427c076a26", + "version-string": "1.0.2s", + "port-version": 0 + }, + { + "git-tree": "68f20b0128ed20998e8f641abca309eb27ab881c", + "version-string": "1.0.2q", + "port-version": 0 + }, + { + "git-tree": "532c0cc2adbcf0800c9dad5df9c900a28672cdf6", + "version-string": "1.0.2s", + "port-version": 0 + }, + { + "git-tree": "d4a71f9592772e1e82ea73a04a1b06790297fade", + "version-string": "1.0.2q-1", + "port-version": 0 + }, + { + "git-tree": "add5af6cc06c5bb82af3f88f7665e34622cf65a5", + "version-string": "1.0.2q", + "port-version": 0 + }, + { + "git-tree": "7ae3ef68f38c470d094bde9c5f934e99dd764ee4", + "version-string": "1.0.2p-1", + "port-version": 0 + }, + { + "git-tree": "3ac5f3a46d740a87e1fa9b3245b4e6ed14a9b096", + "version-string": "1.0.2p", + "port-version": 0 + }, + { + "git-tree": "8a6c268d6cf86abad746a527d1c982d77e6957a2", + "version-string": "1.0.2o-1", + "port-version": 0 + }, + { + "git-tree": "78634dddc1ad87f08f58fcf5b0b83ba575e924eb", + "version-string": "1.0.2o", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/openssl-uwp.json b/externals/vcpkg/versions/o-/openssl-uwp.json new file mode 100755 index 000000000..787aa974c --- /dev/null +++ b/externals/vcpkg/versions/o-/openssl-uwp.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "1a51fbd29a373e9c57ed233d581112359109a234", + "version-string": "1.1.1h", + "port-version": 2 + }, + { + "git-tree": "84398c4b851a28c5ca622c249d51c17d023518b7", + "version-string": "1.1.1h", + "port-version": 1 + }, + { + "git-tree": "f84d47f34d9789ef793f45431c06ed4085f43e34", + "version-string": "1.1.1h", + "port-version": 0 + }, + { + "git-tree": "e3a2926149036f4d8aa134ce92a8517702ee37c0", + "version-string": "1.1.1h", + "port-version": 1 + }, + { + "git-tree": "a69449619d734794b6385c36b3a5d00f108d9dd3", + "version-string": "1.1.1h", + "port-version": 0 + }, + { + "git-tree": "fba260d6fcf7baa0e925c0a7e551f9d6e1082dcc", + "version-string": "1.1.1g", + "port-version": 1 + }, + { + "git-tree": "87f250780a2f75d91e9ed8c0b4ba3a18669780a5", + "version-string": "1.1.1g", + "port-version": 0 + }, + { + "git-tree": "1bcb70f892ae3a4a8c221f39a5139b479a407e7f", + "version-string": "1.1.1d-1", + "port-version": 0 + }, + { + "git-tree": "fa8cdbc92010c7e9b6e30f41cb0f543e95023973", + "version-string": "1.1.1d", + "port-version": 0 + }, + { + "git-tree": "8d0505ed5d06120e35c08eb9296b19e8bb8506eb", + "version-string": "1.0.2r-1", + "port-version": 0 + }, + { + "git-tree": "677fd281086ecd5e0a6801306f2741e7718c8093", + "version-string": "1.0.2r", + "port-version": 0 + }, + { + "git-tree": "8b88b0ffaf55e0d3804807cf92c0e57f579b9c73", + "version-string": "1.0.2q-winrt-2", + "port-version": 0 + }, + { + "git-tree": "85472d04fa7e3002ccdfc7729557a9c1bd583c60", + "version-string": "1.0.2q-winrt-1", + "port-version": 0 + }, + { + "git-tree": "5596ed33ca4b2be4d1d190b963ed6f19cf45b510", + "version-string": "1.0.2q-winrt", + "port-version": 0 + }, + { + "git-tree": "8b22d47210619fd3b6a38bdc999a6f6cb7ee23b1", + "version-string": "1.0.2l-winrt", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/openssl-windows.json b/externals/vcpkg/versions/o-/openssl-windows.json new file mode 100755 index 000000000..f2f14a220 --- /dev/null +++ b/externals/vcpkg/versions/o-/openssl-windows.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "8a169239b58831cf291de837dc26a357585136d9", + "version-string": "1.1.1h", + "port-version": 2 + }, + { + "git-tree": "526d4688d5ca8cdcbac22b8ff18f9aac10a8c695", + "version-string": "1.1.1h", + "port-version": 1 + }, + { + "git-tree": "3243016be13f2cd1c0ab38519b59f4660770acf5", + "version-string": "1.1.1h", + "port-version": 0 + }, + { + "git-tree": "22c37a71ae89dd3856bb6c81f0e59f804873acba", + "version-string": "1.1.1g", + "port-version": 1 + }, + { + "git-tree": "054a2e92258c48208eecda2bdbc32c9dcdc52dfb", + "version-string": "1.1.1g", + "port-version": 0 + }, + { + "git-tree": "3918271375b0ff99b187ef3d357b3d391bc42050", + "version-string": "1.1.1d-2", + "port-version": 0 + }, + { + "git-tree": "dfe5545ce043f440d9d4ab06e7548c495b334e36", + "version-string": "1.1.1d-1", + "port-version": 0 + }, + { + "git-tree": "aa4cf0f1e723b452cdfce53989bbf73bb4acc847", + "version-string": "1.1.1d", + "port-version": 0 + }, + { + "git-tree": "911361ba8124500e840b359ab0972887b65c69ae", + "version-string": "1.0.2s-2", + "port-version": 0 + }, + { + "git-tree": "cab1a598632203ea232d8794fe1cb0d9489c62ee", + "version-string": "1.0.2s-1", + "port-version": 0 + }, + { + "git-tree": "3c70e410a627bb3b67a34c0d8e79f784641f7dea", + "version-string": "1.0.2q-2", + "port-version": 0 + }, + { + "git-tree": "4f32bcc4a79399ed840a045165a572d7c16446f9", + "version-string": "1.0.2s-1", + "port-version": 0 + }, + { + "git-tree": "d3793cca46af28305e662afcf896e55b73396638", + "version-string": "1.0.2q-2", + "port-version": 0 + }, + { + "git-tree": "ec5d01d75cd9ab48966220fdb644a63764c30cea", + "version-string": "1.0.2q-1", + "port-version": 0 + }, + { + "git-tree": "12c1959ae6532da0ad5d6531d59eb107c9f94df8", + "version-string": "1.0.2q", + "port-version": 0 + }, + { + "git-tree": "6f75c8b4121807afd813459d36d752c019cdae8b", + "version-string": "1.0.2p-1", + "port-version": 0 + }, + { + "git-tree": "35f88f577589285a0a1cf5346fc1a2e71260eacd", + "version-string": "1.0.2p", + "port-version": 0 + }, + { + "git-tree": "508bde2de594176023af6270986da999919ab8af", + "version-string": "1.0.2o", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/openssl.json b/externals/vcpkg/versions/o-/openssl.json new file mode 100755 index 000000000..c312ffc08 --- /dev/null +++ b/externals/vcpkg/versions/o-/openssl.json @@ -0,0 +1,329 @@ +{ + "versions": [ + { + "git-tree": "cdd8b7c5c9ebba05598bc90a58f224f13cf0b611", + "version": "3.0.3", + "port-version": 2 + }, + { + "git-tree": "1ac5c972c2c6c9af050334b2f7a41de1253c6a5e", + "version": "3.0.3", + "port-version": 1 + }, + { + "git-tree": "973408910bc03c5a350f502080548a0d1ac68352", + "version": "3.0.3", + "port-version": 0 + }, + { + "git-tree": "f521f59b704e7bebbddd28929f61f3911b8c7cb4", + "version": "3.0.2", + "port-version": 3 + }, + { + "git-tree": "66e7ff434d21a4fc00cab9bbe6167db295ffefd3", + "version": "3.0.2", + "port-version": 2 + }, + { + "git-tree": "3505d3717ae864160fdb273eb2ec9d614eb6711e", + "version": "3.0.2", + "port-version": 1 + }, + { + "git-tree": "2ba2e59ee4f32c11e30aeccc0ecabc09b69c5d22", + "version": "3.0.2", + "port-version": 0 + }, + { + "git-tree": "06b9e0464af9c7c73227ba9f0fa93c77ef62496e", + "version-string": "1.1.1n", + "port-version": 1 + }, + { + "git-tree": "7e4d802e3bde4154c227c0dd1da75c719be9f07a", + "version-string": "1.1.1n", + "port-version": 0 + }, + { + "git-tree": "29c9d32a703896143a51c55f0b7ae4298684afd6", + "version-string": "1.1.1m", + "port-version": 2 + }, + { + "git-tree": "9b8e2ac096b1cd8782137a853c5fc76e07c2af9a", + "version-string": "1.1.1m", + "port-version": 1 + }, + { + "git-tree": "1dbcaacad14ed0761323aa12c13e917270153594", + "version-string": "1.1.1m", + "port-version": 0 + }, + { + "git-tree": "d25384246619019a1e44f018546cdfcaf1800174", + "version-string": "1.1.1l", + "port-version": 4 + }, + { + "git-tree": "83369bdefab234d8570ac2c0f3b616b0c4ab6cdf", + "version-string": "1.1.1l", + "port-version": 3 + }, + { + "git-tree": "d5310e60291032390ab8c893794f6044a7b9ae04", + "version-string": "1.1.1l", + "port-version": 2 + }, + { + "git-tree": "6d19a647704efae9398b178a0012140c1f1ee8b8", + "version-string": "1.1.1l", + "port-version": 1 + }, + { + "git-tree": "1916410d0a836cb70be2341fa3ec3cce74d25267", + "version-string": "1.1.1l", + "port-version": 0 + }, + { + "git-tree": "80b86b6b857d1b7bbb2c24cfcded13c28a4c3e81", + "version-string": "1.1.1k", + "port-version": 8 + }, + { + "git-tree": "affa6f8de25994a485d4310cb56ddbc0df9ac705", + "version-string": "1.1.1k", + "port-version": 7 + }, + { + "git-tree": "b96689b1d7a8ec6f50f40f4e2a6e36d199dc69a3", + "version-string": "1.1.1k", + "port-version": 6 + }, + { + "git-tree": "9cbfcf1a35e62330f5ebddca9d0f1ea493172ef7", + "version-string": "1.1.1k", + "port-version": 5 + }, + { + "git-tree": "029caa3289fc2b99107efaf987c23fd65f5eac97", + "version-string": "1.1.1k", + "port-version": 4 + }, + { + "git-tree": "9f4e7983d2a78b8e865d0444d90ef19ce3a9636c", + "version-string": "1.1.1k", + "port-version": 3 + }, + { + "git-tree": "dcaa59e72471884bf333486e49be386dd4a3da4f", + "version-string": "1.1.1k", + "port-version": 2 + }, + { + "git-tree": "24a9f866c10144f3dcce1b8972d43170cfad3201", + "version-string": "1.1.1k", + "port-version": 1 + }, + { + "git-tree": "dc279487c79f2b009333d7888799f3f9f83d8765", + "version-string": "1.1.1k", + "port-version": 0 + }, + { + "git-tree": "47f6dd2398634984759b609529bf35482957da54", + "version-string": "1.1.1j", + "port-version": 2 + }, + { + "git-tree": "2695b5d292f012836d962b22293d4dc081f75bff", + "version-string": "1.1.1j", + "port-version": 1 + }, + { + "git-tree": "009a7ee95741b939859c77b8e1ddd6c146ffe54e", + "version-string": "1.1.1j", + "port-version": 0 + }, + { + "git-tree": "30228fb5d272c8554937ac94b77fb971249c7c8a", + "version-string": "1.1.1i", + "port-version": 0 + }, + { + "git-tree": "a40ca65d6233b78873ab046be9312cc119f2a3b5", + "version-string": "1.1.1h", + "port-version": 5 + }, + { + "git-tree": "bd308eddff03351b29f403399e053e130581076a", + "version-string": "1.1.1h", + "port-version": 4 + }, + { + "git-tree": "22aba6aaaafcea524467c9b42780cbc271c1946c", + "version-string": "1.1.1h", + "port-version": 3 + }, + { + "git-tree": "db43863b6d477af0975455eea302f2f3981b7579", + "version-string": "1.1.1h", + "port-version": 2 + }, + { + "git-tree": "3d5b8bfd0984b72b432b3d2fb4447dd306e41d0a", + "version-string": "1.1.1h", + "port-version": 1 + }, + { + "git-tree": "10b21b67d6f259baa92845ba0ba06ebb480fe0f7", + "version-string": "1.1.1g", + "port-version": 1 + }, + { + "git-tree": "e96ecf6eebbc0c8356771548127c077e3e7bc676", + "version-string": "1.1.1g", + "port-version": 0 + }, + { + "git-tree": "a54c371df1a58c492721227b808bef69d4c0b6bd", + "version-string": "1.1.1d", + "port-version": 0 + }, + { + "git-tree": "0848995115a67c1818f5f9f2b667083d74dda046", + "version-string": "1", + "port-version": 0 + }, + { + "git-tree": "0a8165857ba19bdc061ef32acd6b7bad442480ed", + "version-string": "0", + "port-version": 0 + }, + { + "git-tree": "39d1773390a9817dd776d1d90e809d873437daa7", + "version-string": "1.0.2o-3", + "port-version": 0 + }, + { + "git-tree": "86a392547f55fe99da0105cfdb2ce012e0fa5f94", + "version-string": "1.0.2o-2", + "port-version": 0 + }, + { + "git-tree": "0ae9343f2814cfcfdef9445990d7b0c90495db52", + "version-string": "1.0.2o-1", + "port-version": 0 + }, + { + "git-tree": "74c8e8bdb3ecafc4d95aabbd076dfbb41db0a366", + "version-string": "1.0.2o", + "port-version": 0 + }, + { + "git-tree": "b0c5618831af164aab62f9b446b225fbf2b33b5e", + "version-string": "1.0.2n-3", + "port-version": 0 + }, + { + "git-tree": "f1cb0e39d975d255b9dfa2e55802cab0b9fc8355", + "version-string": "1.0.2n-2", + "port-version": 0 + }, + { + "git-tree": "cd538938214a1f0865641dfbcc9700182e1e5bd9", + "version-string": "1.0.2n-1", + "port-version": 0 + }, + { + "git-tree": "096e9e1bda009fd51e1b62a6c4b0f0808f22ca02", + "version-string": "1.0.2n", + "port-version": 0 + }, + { + "git-tree": "ae1fc122ee308f89f77bf72f6156ea48ad903e79", + "version-string": "1.0.2m", + "port-version": 0 + }, + { + "git-tree": "799259eabc46bde9958f9d285e4e3695836dec4d", + "version-string": "1.0.2l-3", + "port-version": 0 + }, + { + "git-tree": "06e68e4988301123770548bbe51a3f2a61993d0f", + "version-string": "1.0.2l-2", + "port-version": 0 + }, + { + "git-tree": "71c0ea9b022834e916b553b9239cf9e8df4af53b", + "version-string": "1.0.2l-1", + "port-version": 0 + }, + { + "git-tree": "4bbe7d4ddd39dbaa01b0d1920fa1cbf40e6eea4f", + "version-string": "1.0.21-1", + "port-version": 0 + }, + { + "git-tree": "c09f7eeae92108f42f6a7b8f887ee48152478697", + "version-string": "1.0.2k-5", + "port-version": 0 + }, + { + "git-tree": "91a923bc001d2dd39c52ed8ad976da371d47856a", + "version-string": "1.0.2k-4", + "port-version": 0 + }, + { + "git-tree": "fad4170dd59ac0c0690fee44ccae3b8f6a8e67c5", + "version-string": "1.0.2k-3", + "port-version": 0 + }, + { + "git-tree": "d78f2dceb034c24a9f19f48dda80181fc6500a3a", + "version-string": "1.0.2k-2", + "port-version": 0 + }, + { + "git-tree": "f8f125d46bd3e1a3680f33d0d7c7fcf59870efaa", + "version-string": "1.0.2k-1", + "port-version": 0 + }, + { + "git-tree": "53caaba6ea0df814d3c90589ca9d93a327adaac5", + "version-string": "1.0.2j-2", + "port-version": 0 + }, + { + "git-tree": "799207c0101ea8fb8e97b59c1855b1cae3148bd4", + "version-string": "1.0.2j-1", + "port-version": 0 + }, + { + "git-tree": "f18f7a91cacba1703f571e5c0a06c0f6b0d2a13f", + "version-string": "1.0.2j", + "port-version": 0 + }, + { + "git-tree": "c6ad91dbdec35b4d6cb404f39a5a2af454d2ea4d", + "version-string": "1.0.2h-1", + "port-version": 0 + }, + { + "git-tree": "818861b2d2b76893b113cdfef7c2bd54fae75272", + "version-string": "1.0.2j", + "port-version": 0 + }, + { + "git-tree": "12fd1375cd5c644b9eccc11415eff7e056f58d58", + "version-string": "1.0.2h-1", + "port-version": 0 + }, + { + "git-tree": "3e5163bcf41573dd2bc14130db52e77599f4131b", + "version-string": "1.0.2h", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/opensubdiv.json b/externals/vcpkg/versions/o-/opensubdiv.json new file mode 100755 index 000000000..963073c9d --- /dev/null +++ b/externals/vcpkg/versions/o-/opensubdiv.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "91fabcb273d865674e59979585b5f9a6739ad6c5", + "version-semver": "3.4.3", + "port-version": 4 + }, + { + "git-tree": "786a994b5a4637b9cd43eaf2b790d913bce9cdce", + "version-semver": "3.4.3", + "port-version": 3 + }, + { + "git-tree": "a8158645b04f25a236cd3fdf2debc67b10cfd945", + "version-semver": "3.4.3", + "port-version": 2 + }, + { + "git-tree": "2ca1bb01f46ea1e8d94d453dfc9e535a8bb220b0", + "version-semver": "3.4.3", + "port-version": 1 + }, + { + "git-tree": "306ae6eba55d7f3300c17c8c7a88ea6d648e2b69", + "version-string": "3.4.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/opentelemetry-cpp.json b/externals/vcpkg/versions/o-/opentelemetry-cpp.json new file mode 100755 index 000000000..64778c371 --- /dev/null +++ b/externals/vcpkg/versions/o-/opentelemetry-cpp.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "0ab7ef25acedde2552479fda46f92716afa53c98", + "version-semver": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "c8c4bd4f115feaa3faed25dc74c695c1627d4f0d", + "version-semver": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "c6f08af646f830d343e50f00d01775f6ce8fc7d8", + "version-semver": "1.1.1", + "port-version": 0 + }, + { + "git-tree": "054971acff976718841101e8bad641169cf11a5d", + "version-semver": "1.0.1", + "port-version": 1 + }, + { + "git-tree": "ff4e84e96c81b66be8b52bb00f09f79e692db7c4", + "version-semver": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "929c881d18d9a55eba5985b788fbf8d409fb62c1", + "version-semver": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "987820e81233d904abda334100303e2d11469499", + "version-semver": "1.0.0-rc4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/opentracing.json b/externals/vcpkg/versions/o-/opentracing.json new file mode 100755 index 000000000..c8e944d7a --- /dev/null +++ b/externals/vcpkg/versions/o-/opentracing.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "eae79381338436b815e727eb25885e6c8631eb5f", + "version": "1.6.0", + "port-version": 3 + }, + { + "git-tree": "6bd6797b313b265c51c85ea2838efcdaa70f87f7", + "version": "1.6.0", + "port-version": 2 + }, + { + "git-tree": "001eac5d529c5b20dd9dbfc85879568e07d9b55d", + "version-string": "1.6.0", + "port-version": 1 + }, + { + "git-tree": "bc7c978dfc2e41bcaeaf28df8ae5087384101a9d", + "version-string": "1.6.0", + "port-version": 0 + }, + { + "git-tree": "fe455a87f3774321c7e22f1876f0e2e83550b959", + "version-string": "1.5.1-1", + "port-version": 0 + }, + { + "git-tree": "135fbf549018b8f91055e30186090d0612ff49c9", + "version-string": "1.5.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/openvdb.json b/externals/vcpkg/versions/o-/openvdb.json new file mode 100755 index 000000000..75ee6fac0 --- /dev/null +++ b/externals/vcpkg/versions/o-/openvdb.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "a026562abe75e40d4b60d97108ef057b2e28629a", + "version": "9.0.0", + "port-version": 0 + }, + { + "git-tree": "8546c4c4d392f4b0bb9a604e8bb6a831d39b99e8", + "version": "8.2.0", + "port-version": 0 + }, + { + "git-tree": "ecd4c1d0e5c1e497615d75cb0748c97fa1d70384", + "version": "8.1.0", + "port-version": 0 + }, + { + "git-tree": "5dd93bca4d648b1e0ab01d3cf4df79a183944688", + "version": "8.0.0", + "port-version": 0 + }, + { + "git-tree": "7851d7cc48fbd6ae64e2a625afc0a21024f0eb31", + "version-string": "7.1.0", + "port-version": 2 + }, + { + "git-tree": "7bd35d581cf4764e95b80e0e1a91554238a45f25", + "version-string": "7.1.0", + "port-version": 1 + }, + { + "git-tree": "0a274e31e32ac3993c6b2dba4e2d97007315a840", + "version-string": "7.1.0", + "port-version": 0 + }, + { + "git-tree": "df4b04c75b0229000dcbf86c5e69466a5886cfb5", + "version-string": "7.0.0", + "port-version": 0 + }, + { + "git-tree": "ac63c4c8ec8adadee85aa246496b12b24b8408ce", + "version-string": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "647661c86c13da536df5349a2a71c45854fde918", + "version-string": "6.1.0", + "port-version": 0 + }, + { + "git-tree": "84fd4a175b94bf4eb179a2e4f8fff9adde5a67ef", + "version-string": "6.0.0-2", + "port-version": 0 + }, + { + "git-tree": "a3a50f179c9a76bcc469a6a6ab389f8eccd0c596", + "version-string": "6.0.0-1", + "port-version": 0 + }, + { + "git-tree": "899d9cd6992a31de55e607361c9aca0b03fe7808", + "version-string": "6.0.0", + "port-version": 0 + }, + { + "git-tree": "42649407dc4a72445e560e1b99aa4a711c6e97b5", + "version-string": "5.0.0-2", + "port-version": 0 + }, + { + "git-tree": "a2ec65a7bee38dcacaccaa309c9e2654f4f82030", + "version-string": "5.0.0-1", + "port-version": 0 + }, + { + "git-tree": "e2adacf0514dc330fdb7e00ef55d904d03cb87a6", + "version-string": "5.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/openvpn3.json b/externals/vcpkg/versions/o-/openvpn3.json new file mode 100755 index 000000000..7f9fd3361 --- /dev/null +++ b/externals/vcpkg/versions/o-/openvpn3.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "352f972ff2ff0cfb7305f779253f322ba72e14f5", + "version": "3.7.0", + "port-version": 1 + }, + { + "git-tree": "901a710e937496a572cdb5b64d2401c18919ffde", + "version": "3.7.0", + "port-version": 0 + }, + { + "git-tree": "bf20f11ad1fb64e74ebcfda5a3b3c19b8e4770ae", + "version-string": "3.4.1", + "port-version": 2 + }, + { + "git-tree": "4b177cc0bde1f1f8c6ca22ab10d7ab92657c8d3f", + "version-string": "3.4.1-1", + "port-version": 0 + }, + { + "git-tree": "c677eebd904de277e0681d785e96994c63e5e287", + "version-string": "3.4.1", + "port-version": 0 + }, + { + "git-tree": "96f4bddb5d4bbeb620b476a947a429f71e80494b", + "version-string": "2018-03-21-1", + "port-version": 0 + }, + { + "git-tree": "047ed9c907cc3114ad31e5d17a2080a75eb190df", + "version-string": "2018-03-21", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/openvr.json b/externals/vcpkg/versions/o-/openvr.json new file mode 100755 index 000000000..f93111b2a --- /dev/null +++ b/externals/vcpkg/versions/o-/openvr.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "29e327e41442a81d5bc3040244132649f032edb6", + "version": "1.16.8", + "port-version": 2 + }, + { + "git-tree": "cd3839d56ad4263ecc52a94440b22333ab1d7bfe", + "version-string": "1.16.8", + "port-version": 1 + }, + { + "git-tree": "35ae9e20bdad47bb81e72b6ec792b6d15f6fba93", + "version-string": "1.16.8", + "port-version": 0 + }, + { + "git-tree": "8bb491d21d959c966d12a8a6068f8b8d21aa7bc6", + "version-string": "1.12.5", + "port-version": 0 + }, + { + "git-tree": "ce1dcf697426512f8e9c74eb574ae0505f5903f1", + "version-string": "1.10.30", + "port-version": 0 + }, + { + "git-tree": "b13b9ebd273df9d97f453faf554d745ed561511e", + "version-string": "1.9.16", + "port-version": 0 + }, + { + "git-tree": "3d099f986bb03d2a6fa635e8fc53389b8a2b90ed", + "version-string": "1.5.17", + "port-version": 0 + }, + { + "git-tree": "f382a7947b88d348c40ce977e09774caeb17910b", + "version-string": "1.4.18", + "port-version": 0 + }, + { + "git-tree": "3b738831157101e2165934dc028aa759f84c00a4", + "version-string": "1.1.3b", + "port-version": 0 + }, + { + "git-tree": "a9acf84e30648c01b28cc87b2ebccead439f9f28", + "version-string": "1.0.16", + "port-version": 0 + }, + { + "git-tree": "272b89aacbdae7ec5d92bfeb17a70d9825e9db34", + "version-string": "1.0.15", + "port-version": 0 + }, + { + "git-tree": "51b36f3797bf027e9d56ba9167e3ad28a4a77214", + "version-string": "1.0.14", + "port-version": 0 + }, + { + "git-tree": "a6f3214a4e92b284c359e5b428f016d90ecb30e2", + "version-string": "1.0.13", + "port-version": 0 + }, + { + "git-tree": "f3ae4945d1b8b8b3d135410a84d4faa120963172", + "version-string": "1.0.12", + "port-version": 0 + }, + { + "git-tree": "4aa4e746904db6077274cfc65a6f0c6fa65b0332", + "version-string": "1.0.9", + "port-version": 0 + }, + { + "git-tree": "2f066e65122d4d27fbdbb5016da5efa82d654706", + "version-string": "1.0.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/openxr-loader.json b/externals/vcpkg/versions/o-/openxr-loader.json new file mode 100755 index 000000000..6385ac6a9 --- /dev/null +++ b/externals/vcpkg/versions/o-/openxr-loader.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "e26b91f539cbbba23cc6ccd2eb9106322ba1c81c", + "version": "1.0.22", + "port-version": 3 + }, + { + "git-tree": "27baef30397d0db0e6cc01d6f60a86e2ff4df238", + "version": "1.0.22", + "port-version": 2 + }, + { + "git-tree": "9d673fe500c4b38f0806bd4b3c23a82bba897967", + "version": "1.0.22", + "port-version": 1 + }, + { + "git-tree": "445bbc9debe9866fad35544bd948d54fda4e72c4", + "version": "1.0.22", + "port-version": 0 + }, + { + "git-tree": "435893c175c6462b476e03f95d30717c9653eac3", + "version": "1.0.20", + "port-version": 1 + }, + { + "git-tree": "84f63fe87decf331d7cc6a4f07046d2528b3c313", + "version": "1.0.20", + "port-version": 0 + }, + { + "git-tree": "7d72d589a9281315c0e7ee4b9dd697b7147c0258", + "version-string": "1.0.18", + "port-version": 2 + }, + { + "git-tree": "6674369c2498960b44d097881c3573857a7da92e", + "version-string": "1.0.18", + "port-version": 1 + }, + { + "git-tree": "0ba3ab397dde99a678c135d6fd91e42966bf8d88", + "version-string": "1.0.11", + "port-version": 1 + }, + { + "git-tree": "7b2841ace9b21323ca8adf567c41f91cbba1424f", + "version-string": "1.0.11", + "port-version": 0 + }, + { + "git-tree": "ab1d69229690488dfcb745a7c2bcd817e85f3277", + "version-string": "1.0.3.0", + "port-version": 0 + }, + { + "git-tree": "7d247bd93984f440e73c207532a5f190e1d1c6a5", + "version-string": "2019-09-25", + "port-version": 0 + }, + { + "git-tree": "59a19a38c4f230b5b86d24034db3af01081cfae0", + "version-string": "1.0.2-0", + "port-version": 0 + }, + { + "git-tree": "a75220fa105691b3013ea8ab10a40e8955a59b65", + "version-string": "1.0.0-2", + "port-version": 0 + }, + { + "git-tree": "a788de39d570996259910f0f03bb887918296fb4", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "43f2f047ed9717d8d948ffe8cb73e9d322c79a0e", + "version-string": "0.90.1-1", + "port-version": 0 + }, + { + "git-tree": "bd0c957e3e6bd9e47141dc58147acfc25dc28ef8", + "version-string": "0.90.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/optimus-cpp.json b/externals/vcpkg/versions/o-/optimus-cpp.json new file mode 100755 index 000000000..d3458510a --- /dev/null +++ b/externals/vcpkg/versions/o-/optimus-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e180e598e04576e8a6f2e391c72031c360b5a3a2", + "version": "0.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/optional-bare.json b/externals/vcpkg/versions/o-/optional-bare.json new file mode 100755 index 000000000..2069cbf6d --- /dev/null +++ b/externals/vcpkg/versions/o-/optional-bare.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "cf4fb4b8c0afe5a0b8e475610a426221698f2513", + "version-string": "1.1.0", + "port-version": 1 + }, + { + "git-tree": "0b71c15d07ac746c0c5320aba788acca216c4f3c", + "version-string": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/optional-lite.json b/externals/vcpkg/versions/o-/optional-lite.json new file mode 100755 index 000000000..99c0906a4 --- /dev/null +++ b/externals/vcpkg/versions/o-/optional-lite.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "224a4268fcaf8ff0756fce0de1818939e95cbbc4", + "version": "3.5.0", + "port-version": 1 + }, + { + "git-tree": "121b3133b75062823ca1c6d41b22019c4bc78999", + "version": "3.5.0", + "port-version": 0 + }, + { + "git-tree": "d6434c7b71c70b8ce50c3a1cc38aa35afc9bdf73", + "version-string": "3.2.0", + "port-version": 1 + }, + { + "git-tree": "f95f2a06aec2297861f4a5e56dee34941a5898e9", + "version-string": "3.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/opus.json b/externals/vcpkg/versions/o-/opus.json new file mode 100755 index 000000000..bdd667ec3 --- /dev/null +++ b/externals/vcpkg/versions/o-/opus.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "e718de4be5f3dcb0e0c7922a9ef7ef13bf5148b3", + "version-string": "1.3.1", + "port-version": 6 + }, + { + "git-tree": "9aa015835678b6dec3bf2a5ee904d68a746fac0c", + "version-string": "1.3.1", + "port-version": 5 + }, + { + "git-tree": "56ed75584e87d59f3c419a9f2b8829474afee37d", + "version-string": "1.3.1", + "port-version": 4 + }, + { + "git-tree": "0701ad56534e3c18e686371a5bfc9fde2ef8f064", + "version-string": "1.3.1-3", + "port-version": 0 + }, + { + "git-tree": "2ac4d6df47768169434334ba7c9ef427e3f58a85", + "version-string": "1.3.1-2", + "port-version": 0 + }, + { + "git-tree": "bc57499bc60131c05e97c4084a2c65a39842a82a", + "version-string": "1.3.1", + "port-version": 0 + }, + { + "git-tree": "e5486e84c33d611a3dfa0329581545bf84a5be12", + "version-string": "1.3-2", + "port-version": 0 + }, + { + "git-tree": "0fcf47d7d3400428df93e819bfc31bcad9d57ccc", + "version-string": "1.3-1", + "port-version": 0 + }, + { + "git-tree": "f0292b5f5b268707adaa680c46f048c4eefaaec4", + "version-string": "1.3", + "port-version": 0 + }, + { + "git-tree": "546e745df416ae092f16d7d4edab457fde66602e", + "version-string": "1.2.1-1", + "port-version": 0 + }, + { + "git-tree": "6c7f2af37077b3ee742fd2a9fb09c92735e625da", + "version-string": "1.2.1", + "port-version": 0 + }, + { + "git-tree": "1350305e4c5b98b320515033fdae069bd246273f", + "version-string": "1.2", + "port-version": 0 + }, + { + "git-tree": "b34a853c028cce78b56af336ed90e1004409f1df", + "version-string": "1.1.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/opusfile.json b/externals/vcpkg/versions/o-/opusfile.json new file mode 100755 index 000000000..3555d2b86 --- /dev/null +++ b/externals/vcpkg/versions/o-/opusfile.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "9192001e60ba1f9d34e8f45ecde1139c5d40d474", + "version-string": "0.12", + "port-version": 1 + }, + { + "git-tree": "3c2a8c76974f548268451580c5e5599c7d435dc6", + "version-string": "0.12", + "port-version": 0 + }, + { + "git-tree": "6babcac9da97faeb2c14466f0cf1b8e61d2f90f1", + "version-string": "0.11-3", + "port-version": 0 + }, + { + "git-tree": "364f3b3b74ca6bf8084cd6735cbb0577dabfe622", + "version-string": "0.11-2", + "port-version": 0 + }, + { + "git-tree": "33ee3f01ce0517204edd08658bd7b0d4280c9212", + "version-string": "0.11-1", + "port-version": 0 + }, + { + "git-tree": "375d6c02bd5d27e50e3414a1a3babb7e28252c65", + "version-string": "0.9-3", + "port-version": 0 + }, + { + "git-tree": "fa3d58a5fb67ec576bf6539ad58c18f333ae4624", + "version-string": "0.9-1", + "port-version": 0 + }, + { + "git-tree": "d5cb4cf49e0e86575af4679f7573290496667f0c", + "version-string": "0.9", + "port-version": 0 + }, + { + "git-tree": "666fb9ac0e1713dc5852501af1096752bfcc60c6", + "version-string": "0.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/orc.json b/externals/vcpkg/versions/o-/orc.json new file mode 100755 index 000000000..3110baeba --- /dev/null +++ b/externals/vcpkg/versions/o-/orc.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "8c8bc9de897f95a0499e5dc4a49545cda6e496b2", + "version": "1.6.4", + "port-version": 4 + }, + { + "git-tree": "543e83b37120267db3f81b5fdb3d349717b20135", + "version": "1.6.4", + "port-version": 3 + }, + { + "git-tree": "8cd78baa4d8b7df9077f76b8f5d600aac6e09716", + "version-string": "1.6.4", + "port-version": 2 + }, + { + "git-tree": "80c6805ca7328eee7a8c27608e346274ff35baa1", + "version-string": "1.6.4", + "port-version": 1 + }, + { + "git-tree": "b44f348d787046b37705da0becdce9fb1d393778", + "version-string": "1.6.4", + "port-version": 0 + }, + { + "git-tree": "2b47da6da9cb6ecb63e13f9627cfb357dd37d64f", + "version-string": "1.5.9", + "port-version": 0 + }, + { + "git-tree": "7bbfb675224d29fdec16955f03a661f0b3e2e40c", + "version-string": "1.5.7", + "port-version": 0 + }, + { + "git-tree": "3b6d0e65e8d7e3adb2ff90a8c414b93e6589338d", + "version-string": "1.5.6-1", + "port-version": 0 + }, + { + "git-tree": "1e7103634a9e90132569389f622f5779f4ecb10e", + "version-string": "1.5.6", + "port-version": 0 + }, + { + "git-tree": "74e31baf6f2be9e22fbe0fdfa52e9da4896b7a7f", + "version-string": "1.5.5-1", + "port-version": 0 + }, + { + "git-tree": "77b88ea9af71142a497ca7f306265abb693c8ae3", + "version-string": "1.5.5", + "port-version": 0 + }, + { + "git-tree": "f94c29db60400ae93c843568ebc6b66103f46cc1", + "version-string": "1.5.2-f47e02c-2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/orocos-kdl.json b/externals/vcpkg/versions/o-/orocos-kdl.json new file mode 100755 index 000000000..751051717 --- /dev/null +++ b/externals/vcpkg/versions/o-/orocos-kdl.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "265346d96786cba36fc5ddc4e2a734dfa755746d", + "version": "1.4", + "port-version": 5 + }, + { + "git-tree": "c882240643c0748d609a52adec04abd93ffc120e", + "version": "1.4", + "port-version": 4 + }, + { + "git-tree": "dc60323664cfc26eb992383022f99d5ec1b6c25c", + "version-string": "1.4", + "port-version": 3 + }, + { + "git-tree": "794eddc7beefc13b86d3a95cd8f9330ba0f3d308", + "version-string": "1.4-2", + "port-version": 0 + }, + { + "git-tree": "74808287d4549ec42a170a00fdd07ccb8500fc01", + "version-string": "1.4-1", + "port-version": 0 + }, + { + "git-tree": "943f8a6e33620d37b4d5e07f9b11d762c4fa75e9", + "version-string": "1.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/osg-qt.json b/externals/vcpkg/versions/o-/osg-qt.json new file mode 100755 index 000000000..f922a1a49 --- /dev/null +++ b/externals/vcpkg/versions/o-/osg-qt.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "8e92c5f14fae6b6a69e0818bf1509e03a1389d3c", + "version-string": "Qt5", + "port-version": 3 + }, + { + "git-tree": "743cc988a45a861fc3de537f6e8720a38a4cf90f", + "version-string": "Qt5", + "port-version": 2 + }, + { + "git-tree": "a02ebd7a6494e03f4a70553af4a525e1b7e17643", + "version-string": "Qt5", + "port-version": 1 + }, + { + "git-tree": "912b87e36bf6db14319d83e11d91286b6921675f", + "version-string": "Qt5", + "port-version": 0 + }, + { + "git-tree": "0cb876c38973571d755b0c92b17c8d1359027d07", + "version-string": "Qt4", + "port-version": 3 + }, + { + "git-tree": "fc3d2878ac7ceed72a6633d32221fd073df8a8a6", + "version-string": "Qt4-2", + "port-version": 0 + }, + { + "git-tree": "da9c70e3ae172bd798892b3a9e516fb19d24c55f", + "version-string": "Qt4-1", + "port-version": 0 + }, + { + "git-tree": "c6dcd175c5c17bdd9949db02d061e890e2e6ff6c", + "version-string": "Qt4", + "port-version": 0 + }, + { + "git-tree": "66529f574a94b3b934c9a0f8bbacc5107c32a8b7", + "version-string": "3.5.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/osg.json b/externals/vcpkg/versions/o-/osg.json new file mode 100755 index 000000000..a90a66ae2 --- /dev/null +++ b/externals/vcpkg/versions/o-/osg.json @@ -0,0 +1,139 @@ +{ + "versions": [ + { + "git-tree": "f438ec006b58ffd222b0f3bdce8d05b21611204e", + "version": "3.6.5", + "port-version": 12 + }, + { + "git-tree": "456c4454eee9f4a24916992b0870067f703ef374", + "version-string": "3.6.5", + "port-version": 11 + }, + { + "git-tree": "233201eee3ebfaaac75ba9696d12209e9a1fbc32", + "version-string": "3.6.5", + "port-version": 10 + }, + { + "git-tree": "786c1469d92ebae55703e2be690bd72083a800a3", + "version-string": "3.6.5", + "port-version": 9 + }, + { + "git-tree": "2a5b4c77e1ac62bb98a0deb970fc39a4976cc528", + "version-string": "3.6.5", + "port-version": 8 + }, + { + "git-tree": "41c640888000654e84d2bf227b42973cc1ba15c9", + "version-string": "3.6.5", + "port-version": 7 + }, + { + "git-tree": "9b787269fae66af2447354c4e76ce0883c8d93b9", + "version-string": "3.6.5", + "port-version": 6 + }, + { + "git-tree": "de60b215a6e17bc6651d212874ffdaf513bdbf16", + "version-string": "3.6.5", + "port-version": 5 + }, + { + "git-tree": "37e7493684572218bcb9e16f145ff37c5053404c", + "version-string": "3.6.5", + "port-version": 4 + }, + { + "git-tree": "65573fc9008387a848f0bda4139f5ececfba5fe6", + "version-string": "3.6.5", + "port-version": 3 + }, + { + "git-tree": "1cc4e8d2ac3089b60f68b8542d2fa0dc9ddc9bcc", + "version-string": "3.6.5", + "port-version": 2 + }, + { + "git-tree": "39ce7a138f227e9db4b2a8876e4ab81957ebca53", + "version-string": "3.6.5", + "port-version": 1 + }, + { + "git-tree": "c6ae0ac1515b93473c0b6196eed8ae598a0b225e", + "version-string": "3.6.5", + "port-version": 0 + }, + { + "git-tree": "1b9fe9007158d033032b11fa6d88c852b767fe85", + "version-string": "3.6.4-3", + "port-version": 0 + }, + { + "git-tree": "b7b667020a973457d8752ab1937dcee1a41509f7", + "version-string": "3.6.4-2", + "port-version": 0 + }, + { + "git-tree": "e3740cd3d563e4af2dbdfa75667c939a89aff0ab", + "version-string": "3.6.4-1", + "port-version": 0 + }, + { + "git-tree": "a761765a2660a67a7687f1fbe43cd5e4a9269b07", + "version-string": "3.6.4", + "port-version": 0 + }, + { + "git-tree": "0b4815f75bc681d9488985c00bee827d474713f2", + "version-string": "3.6.3-1", + "port-version": 0 + }, + { + "git-tree": "f49257272340f53a438ba78ed07b44996307abcb", + "version-string": "3.6.3", + "port-version": 0 + }, + { + "git-tree": "5552f8d9c3fe58198b8d61d2c45c723d7203877a", + "version-string": "3.6.2-2", + "port-version": 0 + }, + { + "git-tree": "785ed3f9f95e5c45b18e1b1c8730605a606c91b8", + "version-string": "3.6.2-1", + "port-version": 0 + }, + { + "git-tree": "efdfeef2b51d0d712f544337d60619495d972ae6", + "version-string": "3.6.2", + "port-version": 0 + }, + { + "git-tree": "492cb5d78bb033bc7c9ec117aad54511cf524608", + "version-string": "3.6.2-rc3", + "port-version": 0 + }, + { + "git-tree": "08e66e73223cf713b9c17c89258dc069428666eb", + "version-string": "3.5.6-3", + "port-version": 0 + }, + { + "git-tree": "4116b1cb12fdcbcca6d8afafcf571d7ff004d88f", + "version-string": "3.5.6-2", + "port-version": 0 + }, + { + "git-tree": "ab81ffa0858eb7a8ffa9b1f0b557d0ac6d636a6f", + "version-string": "3.5.6-1", + "port-version": 0 + }, + { + "git-tree": "ec9c22d15e7177c10375ea924df464d7c6f30090", + "version-string": "3.5.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/osgearth.json b/externals/vcpkg/versions/o-/osgearth.json new file mode 100755 index 000000000..ef767931f --- /dev/null +++ b/externals/vcpkg/versions/o-/osgearth.json @@ -0,0 +1,114 @@ +{ + "versions": [ + { + "git-tree": "80311fbaa014b84f8cdb3faa8abbdc16e01837d5", + "version": "3.2", + "port-version": 5 + }, + { + "git-tree": "99b20c5ff2821870694fdc973b7f44d4b54db2ba", + "version": "3.2", + "port-version": 4 + }, + { + "git-tree": "2e3d8cf49728cdb23060f31152768a2292c24ab8", + "version": "3.2", + "port-version": 3 + }, + { + "git-tree": "106a6da206a787832252687e41ad5ba3b102d062", + "version": "3.2", + "port-version": 2 + }, + { + "git-tree": "f3ac1cffb36f0b0b2b531af29145de695cee2291", + "version": "3.2", + "port-version": 1 + }, + { + "git-tree": "a77075c3ff1a0372588cb78af6f4f08352b82896", + "version": "3.2", + "port-version": 0 + }, + { + "git-tree": "d12ff3ef1419ab8813b430101fb6dbcc96861671", + "version": "3.1", + "port-version": 4 + }, + { + "git-tree": "d2483eb1bb083bdcf0b4de24f0f8c0d77825dc56", + "version": "3.1", + "port-version": 3 + }, + { + "git-tree": "9355b8ad52fcf4998fe4c262f29a4e01fa83b9fa", + "version": "3.1", + "port-version": 2 + }, + { + "git-tree": "d194c647fcf69fe345c13ae7b6da3451e4bbddb6", + "version": "3.1", + "port-version": 1 + }, + { + "git-tree": "168a035bd41f62a0d394f4e18fb703692603e39d", + "version-string": "3.1", + "port-version": 0 + }, + { + "git-tree": "f1cf05182323701e0a3dbc16da6ecc9e888fbb71", + "version-string": "3.0", + "port-version": 2 + }, + { + "git-tree": "af00c514bfaa904be498e223a1cacf173162cc3e", + "version-string": "3.0", + "port-version": 1 + }, + { + "git-tree": "25e742943d7c8696ac88b5e7be4d8816353e6700", + "version-string": "3.0", + "port-version": 0 + }, + { + "git-tree": "32dbb3912317bbc3b849eec2b5a15e5c437e5fbc", + "version-string": "2.10.2-1", + "port-version": 0 + }, + { + "git-tree": "b7b84ad0e73ece27e694725e6439cf6d60792532", + "version-string": "2.10.2", + "port-version": 0 + }, + { + "git-tree": "af46db2287a1d38c21d232099b347c5995121091", + "version-string": "2.10.1", + "port-version": 0 + }, + { + "git-tree": "d0be4e21f86939c2864e0a879ad81be883a543c1", + "version-string": "2.10-1", + "port-version": 0 + }, + { + "git-tree": "32abeb2b7b74cb8debe76d24219c3554ac37f450", + "version-string": "2.10", + "port-version": 0 + }, + { + "git-tree": "343ebdcf807d88b7f80fa5afc7d81abdad3baff2", + "version-string": "2.9-2", + "port-version": 0 + }, + { + "git-tree": "d4057d17f470dbd19815ad61db8f150e39169093", + "version-string": "2.9-1", + "port-version": 0 + }, + { + "git-tree": "4b9de743796c6861205b8143cfa4177ca14ac0bd", + "version-string": "2.9", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/osi.json b/externals/vcpkg/versions/o-/osi.json new file mode 100755 index 000000000..7f1d04ea7 --- /dev/null +++ b/externals/vcpkg/versions/o-/osi.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "0bca240e0ada50982cf8d3f202dc20a732bcffc4", + "version-string": "0.108.6", + "port-version": 1 + }, + { + "git-tree": "0430fc0a3bf8fd6e38563fb6c6b0f82d2f8159b3", + "version-string": "0.108.6", + "port-version": 0 + }, + { + "git-tree": "82fa43bb4feef6c2c529885807dd067657856010", + "version-string": "0.108.4-2", + "port-version": 0 + }, + { + "git-tree": "cd3af932853d3d11b8d244748aed5ac7584ed259", + "version-string": "0.108.4-1", + "port-version": 0 + }, + { + "git-tree": "ca6946ed50bdfee8311ddfc1c470bd4b8e42a068", + "version-string": "0.108.4", + "port-version": 0 + }, + { + "git-tree": "80fa3abcb916cde4c30c19fb479e2d1f14ed9bae", + "version-string": "0.107.9-1", + "port-version": 0 + }, + { + "git-tree": "cf84797b62ef2979a17831a57301773def920f62", + "version-string": "0.107.9-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/otl.json b/externals/vcpkg/versions/o-/otl.json new file mode 100755 index 000000000..48fe11f98 --- /dev/null +++ b/externals/vcpkg/versions/o-/otl.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "02a8c353e8a348eb320fdfaf7dfd7d4a40d3d2e1", + "version": "4.0.463", + "port-version": 1 + }, + { + "git-tree": "bce79d0a6767b5593182564f94f3db98eea61be7", + "version": "4.0.463", + "port-version": 0 + }, + { + "git-tree": "68cd61e0f22d15d7e262bae15252b34ba59796b8", + "version-string": "4.0.455", + "port-version": 1 + }, + { + "git-tree": "a12a87bbab40a9d8c53fde4c2dc38f2f87c99c29", + "version-string": "4.0.455", + "port-version": 0 + }, + { + "git-tree": "2b864313bcf25a65f3bd526339004f99f606a5c9", + "version-string": "4.0.451-1", + "port-version": 0 + }, + { + "git-tree": "05182f799c4f8755f29a47dcd013b6c94c2f6eda", + "version-string": "4.0.451", + "port-version": 0 + }, + { + "git-tree": "5e5a6914d221bd0359c0da1a55838fd802804f49", + "version-string": "4.0.448-2", + "port-version": 0 + }, + { + "git-tree": "5d4ca7a46eef10424377102133446898cafcb047", + "version-string": "4.0.448-1", + "port-version": 0 + }, + { + "git-tree": "6f0c8b07b65f9706cb65d1265d27e167bd5f39ce", + "version-string": "4.0.448", + "port-version": 0 + }, + { + "git-tree": "cdc4e8959f9845e12ead96213c1a6ce0cf5543bd", + "version-string": "4.0.447", + "port-version": 0 + }, + { + "git-tree": "61868dd6e22818a6ea6684867b540c2f619531fe", + "version-string": "4.0.443-2", + "port-version": 0 + }, + { + "git-tree": "adfbde0aacf015a23186e73bb02f3165338804c2", + "version-string": "4.0.443", + "port-version": 0 + }, + { + "git-tree": "40ab3fcccb8ffdcfae221aadc61844c45026e248", + "version-string": "4.0.442", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/o-/outcome.json b/externals/vcpkg/versions/o-/outcome.json new file mode 100755 index 000000000..269477e3e --- /dev/null +++ b/externals/vcpkg/versions/o-/outcome.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "2abc0cf7913b6db02a17f3b01f6e5744bd43a9ae", + "version-string": "2.2.2-20211208", + "port-version": 0 + }, + { + "git-tree": "31aada521fafc8169a891338a3af04fa4f658327", + "version-string": "2.2.2-20210922", + "port-version": 0 + }, + { + "git-tree": "275bb74716bbeb4b09b1e97c442e0e085490c646", + "version-string": "2.2.0-release", + "port-version": 1 + }, + { + "git-tree": "e520721d50cf29957f37e793d28abff7544138d2", + "version-string": "2.2.0-release", + "port-version": 0 + }, + { + "git-tree": "77cd889f0b2157b6ae77982c30c8e17355d95245", + "version-string": "2.2.0-b9e664fb", + "port-version": 0 + }, + { + "git-tree": "33dc2e0d31074248a2313ff2eeecad075206d9bb", + "version-string": "2.1.3", + "port-version": 0 + }, + { + "git-tree": "b12b3ac86436c5ecbbfb207caa4c2ac54af02fe4", + "version-string": "2.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/p-ranav-csv.json b/externals/vcpkg/versions/p-/p-ranav-csv.json new file mode 100755 index 000000000..acfb50727 --- /dev/null +++ b/externals/vcpkg/versions/p-/p-ranav-csv.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "77830f6c8500a71c59804029586c3a60c3335788", + "version-string": "2019-07-11", + "port-version": 1 + }, + { + "git-tree": "ab0aa66ce2b59b427451f135de81e0adaf3dd140", + "version-string": "2019-07-11", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/p-ranav-csv2.json b/externals/vcpkg/versions/p-/p-ranav-csv2.json new file mode 100755 index 000000000..722000a37 --- /dev/null +++ b/externals/vcpkg/versions/p-/p-ranav-csv2.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "0f944640e81f4ed10db72f2708212b475c3e83b2", + "version-string": "2020-12-14", + "port-version": 2 + }, + { + "git-tree": "64496087c54cb9b4fec4b566cbfc7f6182a753a2", + "version-string": "2020-12-14", + "port-version": 1 + }, + { + "git-tree": "ff75758935b7af155e42fac45ca52c8861bac4b2", + "version-string": "2020-12-14", + "port-version": 0 + }, + { + "git-tree": "08ad345a64c73c64f37a2896bde759684fe4c789", + "version-string": "2020-06-02", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pagmo2.json b/externals/vcpkg/versions/p-/pagmo2.json new file mode 100755 index 000000000..c149fd0f0 --- /dev/null +++ b/externals/vcpkg/versions/p-/pagmo2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ea29ee58051fba73e950597ca2b0109dd6df0dec", + "version": "2.16.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/paho-mqtt.json b/externals/vcpkg/versions/p-/paho-mqtt.json new file mode 100755 index 000000000..8bb1182a4 --- /dev/null +++ b/externals/vcpkg/versions/p-/paho-mqtt.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "9edde45ee5a278ee52bbb1891e9a30cab33669f8", + "version-semver": "1.3.10", + "port-version": 0 + }, + { + "git-tree": "b35399fddec4f6e4eb68e16308d2b1d86b0e5427", + "version-semver": "1.3.9", + "port-version": 0 + }, + { + "git-tree": "a8ecb2168805d1f3745453512d5f82cccd7d391a", + "version-string": "1.3.8", + "port-version": 0 + }, + { + "git-tree": "800b1e512dbeee6a6cc18e33743fe85c63ecb013", + "version-string": "1.3.5", + "port-version": 0 + }, + { + "git-tree": "0eaf9c94651c4f48261f5e7c3cb5089516b9f3c4", + "version-string": "1.3.1", + "port-version": 0 + }, + { + "git-tree": "ce25ea675f86656e691af45ce6d4d5c012759a03", + "version-string": "1.3.0-2", + "port-version": 0 + }, + { + "git-tree": "96b6c60f4e183b0eb2190e5d7334ce88c73ac524", + "version-string": "1.3.0-1", + "port-version": 0 + }, + { + "git-tree": "3baa7a6e7c82084c3d60ae2bbbb1c720ddd82ea4", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "3feff9c023a2a88e7083305bd63d8e0b4d63c3bf", + "version-string": "1.2.1-1", + "port-version": 0 + }, + { + "git-tree": "d669dc057642ded3d765361cc05c18fb1736353a", + "version-string": "1.2.1", + "port-version": 0 + }, + { + "git-tree": "147fdbe8fa696be9d1d191475f559c70803b7690", + "version-string": "1.2.0-3", + "port-version": 0 + }, + { + "git-tree": "997710c0bdf51fe179eb169930a522d9a43ad72a", + "version-string": "1.2.0-2", + "port-version": 0 + }, + { + "git-tree": "2fd7b378d6a3427738c651308627d750f6da1988", + "version-string": "1.2.0-1", + "port-version": 0 + }, + { + "git-tree": "38f951ced3921a6f0376322cca3c620b6ac98f4a", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "c62a448f308d0b71a2303b825dcf4c9551d8c8ff", + "version-string": "Version 1.1.0 (Paho 1.2)", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/paho-mqttpp3.json b/externals/vcpkg/versions/p-/paho-mqttpp3.json new file mode 100755 index 000000000..20df1bcb3 --- /dev/null +++ b/externals/vcpkg/versions/p-/paho-mqttpp3.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "4e5982f9707bb0222b6694cee8d4a0d23698e20f", + "version": "1.2.0", + "port-version": 1 + }, + { + "git-tree": "850cb4a6ccac89062c16dd783ad0631215c1a94b", + "version": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "93fd209433fc93b89946d48f958947c7e7fbb219", + "version-string": "1.1", + "port-version": 1 + }, + { + "git-tree": "90b86211639ed4141e7bb9118a36a886df599dae", + "version-string": "1.1", + "port-version": 0 + }, + { + "git-tree": "ce7b0c3c97c2043260328cc5fb93cff8920e594f", + "version-string": "1.0.1-3", + "port-version": 0 + }, + { + "git-tree": "791046cd99e78bab4f16a54e15508b072cbee0ae", + "version-string": "1.0.1-2", + "port-version": 0 + }, + { + "git-tree": "343024d157b785df9ac2f995c2dc14f106a229c2", + "version-string": "1.0.1-1", + "port-version": 0 + }, + { + "git-tree": "332eddefa1b8636f03c7f2523ab4eff6dbefe9bd", + "version-string": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/palsigslot.json b/externals/vcpkg/versions/p-/palsigslot.json new file mode 100755 index 000000000..0339cee7a --- /dev/null +++ b/externals/vcpkg/versions/p-/palsigslot.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "dd7ff9df2ee3a39656ab22a6fc6f210afa843513", + "version": "1.2.1", + "port-version": 0 + }, + { + "git-tree": "e9a60795ed6d2384819646000af70ab33604184b", + "version-string": "1.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pango.json b/externals/vcpkg/versions/p-/pango.json new file mode 100755 index 000000000..2cbeede2c --- /dev/null +++ b/externals/vcpkg/versions/p-/pango.json @@ -0,0 +1,119 @@ +{ + "versions": [ + { + "git-tree": "5275b5581f4cfc5ccb547a556f3affc4c92e05cd", + "version": "1.50.7", + "port-version": 0 + }, + { + "git-tree": "db85fd904e40578950bcc478e2bfad06c70e787a", + "version": "1.50.6", + "port-version": 0 + }, + { + "git-tree": "024f716f80c8454769393287ef14a75de4785f32", + "version": "1.50.3", + "port-version": 0 + }, + { + "git-tree": "a9cc75941c3ff73920fb3900615d84bc6f1b423e", + "version": "1.48.10", + "port-version": 1 + }, + { + "git-tree": "a411f99ebac4507806d3824364cc766f578850e5", + "version": "1.48.10", + "port-version": 0 + }, + { + "git-tree": "a130f1c74d2e337d2f9405fbb57f3b1fe46f173a", + "version": "1.48.4", + "port-version": 1 + }, + { + "git-tree": "271c6de990817cce14e8299ac3add736bdce57f5", + "version": "1.48.4", + "port-version": 0 + }, + { + "git-tree": "9369409e9dfac69c6eaa6ed5862178dc0d71680f", + "version": "1.48.0", + "port-version": 0 + }, + { + "git-tree": "6b8dd172fe2f62afd4508431bd89c50d2510e997", + "version-string": "1.40.11", + "port-version": 9 + }, + { + "git-tree": "c0585c64466afdd652539982316d65c086b3d4f6", + "version-string": "1.40.11", + "port-version": 8 + }, + { + "git-tree": "f125f60b38a1c8f42dcfedde75475050f340e7c4", + "version-string": "1.40.11-7", + "port-version": 0 + }, + { + "git-tree": "960975827bc14844d5ef6fe0ac7ce3e41bd98a68", + "version-string": "1.40.11-6", + "port-version": 0 + }, + { + "git-tree": "3b3485d29590d52ef989a7f6e9ea5c9f0679fe3e", + "version-string": "1.40.11-5", + "port-version": 0 + }, + { + "git-tree": "de337ff2b1b2ddbb2b2850b918fd46be7f8c07c8", + "version-string": "1.40.11-4", + "port-version": 0 + }, + { + "git-tree": "c51a688a50a6652b226723339cd640a710adb066", + "version-string": "1.40.11-3", + "port-version": 0 + }, + { + "git-tree": "483edb564a2faa0d7f7d2f36ff71b5e4579ee188", + "version-string": "1.40.11-2", + "port-version": 0 + }, + { + "git-tree": "2cd7bd75114718538133072d6b5202f48d0bf94c", + "version-string": "1.40.11-1", + "port-version": 0 + }, + { + "git-tree": "2e2f3f78b1b96b36d28698ceaad720b3b4ea8de9", + "version-string": "1.40.11", + "port-version": 0 + }, + { + "git-tree": "e123361021854abdc081e224abded78977e9bc40", + "version-string": "1.40.6", + "port-version": 0 + }, + { + "git-tree": "892f6d834929bf669c58a0c0dabdc9e95b74c9d3", + "version-string": "1.40.5-2", + "port-version": 0 + }, + { + "git-tree": "7c304fc57a64276ab2718fb76e9417984d76fd10", + "version-string": "1.40.5-1", + "port-version": 0 + }, + { + "git-tree": "dde3471799a18ff292a5a8ae15f4961b222b1e35", + "version-string": "1.40.4", + "port-version": 0 + }, + { + "git-tree": "0672091d0ee6c966c3006fc1086f6201902174bd", + "version-string": "1.40.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pangolin.json b/externals/vcpkg/versions/p-/pangolin.json new file mode 100755 index 000000000..b8e8ef532 --- /dev/null +++ b/externals/vcpkg/versions/p-/pangolin.json @@ -0,0 +1,104 @@ +{ + "versions": [ + { + "git-tree": "1515f75cbc480addcd0ca12c49c0435a0c9e158c", + "version": "0.6", + "port-version": 2 + }, + { + "git-tree": "f6f7eff13d603463a77a637879929275ecff776e", + "version": "0.6", + "port-version": 1 + }, + { + "git-tree": "e28a4e1603d5ee1843787223a55dce439b579b94", + "version": "0.6", + "port-version": 0 + }, + { + "git-tree": "77d0735cc19bbb45a0212a8b15ea101ca3598219", + "version-string": "0.5", + "port-version": 15 + }, + { + "git-tree": "b93d201ff49c7b409349f6322d8f23cb630da0e5", + "version-string": "0.5", + "port-version": 14 + }, + { + "git-tree": "e746f01a619539fbbb0aae9b0edb9df733e555d7", + "version-string": "0.5", + "port-version": 13 + }, + { + "git-tree": "a27ee268db34edfd09ce5d0b51e574c7e6719931", + "version-string": "0.5", + "port-version": 12 + }, + { + "git-tree": "4632fbe85a4a6afb145b500f689fe47b99b45c71", + "version-string": "0.5", + "port-version": 11 + }, + { + "git-tree": "bfd7c7093d0563829edddc9dfa1f23b83b1fdf8a", + "version-string": "0.5", + "port-version": 10 + }, + { + "git-tree": "76ea97df4a825bdcc46b8cf1102f45c4489aea63", + "version-string": "0.5", + "port-version": 9 + }, + { + "git-tree": "036d318e411ec94818a05c272092d65e5fa17678", + "version-string": "0.5", + "port-version": 8 + }, + { + "git-tree": "63d2a2c3760c4d70254f79dca6758a9d0947dabf", + "version-string": "0.5-7", + "port-version": 0 + }, + { + "git-tree": "ffb029a5884b0fd113e70659bee58df8a62b0f94", + "version-string": "0.5-6", + "port-version": 0 + }, + { + "git-tree": "a71f3754cefb717f0c4886642b841e8b372c9d3a", + "version-string": "0.5-5", + "port-version": 0 + }, + { + "git-tree": "8c5844be14958c0e45e92e4492c6f9d242a62848", + "version-string": "0.5-4", + "port-version": 0 + }, + { + "git-tree": "10147be637612fb9c248b7cf1b31aece7bfb0370", + "version-string": "0.5-3", + "port-version": 0 + }, + { + "git-tree": "3e9bdca841923cf260b2359854aa391d8f5576d2", + "version-string": "0.5-2", + "port-version": 0 + }, + { + "git-tree": "efa74b8747dd87546d4adaea73de4b3731b33b8c", + "version-string": "0.5-1", + "port-version": 0 + }, + { + "git-tree": "d35c305c506289e68c5152ea7491ca05dd3407ca", + "version-string": "0.5", + "port-version": 0 + }, + { + "git-tree": "64d219de91106319d90396f872e00c41109894a0", + "version-string": "v0.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pangomm.json b/externals/vcpkg/versions/p-/pangomm.json new file mode 100755 index 000000000..218d43523 --- /dev/null +++ b/externals/vcpkg/versions/p-/pangomm.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "34d3ec912d605fecbc17c5eee6257db6574c5318", + "version": "2.50.0", + "port-version": 2 + }, + { + "git-tree": "5aebede0dd324cd7e5db1460e1d9be26d18685ba", + "version": "2.50.0", + "port-version": 1 + }, + { + "git-tree": "72d0e19b3eb2fdb5d8c60c1ae78bafc51866325d", + "version": "2.50.0", + "port-version": 0 + }, + { + "git-tree": "c01e75e9dc192ca4e6e7161f3362d6866a952e7c", + "version": "2.48.1", + "port-version": 1 + }, + { + "git-tree": "1ff0b71c742896ffb9da84638f7e20b2960aff80", + "version": "2.48.1", + "port-version": 0 + }, + { + "git-tree": "d751b0dbf773ade4811729e3a55a8828dac8a78a", + "version": "2.48.0", + "port-version": 0 + }, + { + "git-tree": "8b74ee567be2a328e81e5afa8a29563b052e846c", + "version-string": "2.40.1", + "port-version": 4 + }, + { + "git-tree": "0cb9efc04615de94124ab6163472973af23fc131", + "version-string": "2.40.1-3", + "port-version": 0 + }, + { + "git-tree": "9cfbef485a5db1c6c6448057c1efd0945b2dccaf", + "version-string": "2.40.1-2", + "port-version": 0 + }, + { + "git-tree": "0c114ef14a46d08beb29230c0b1c50eece4e3e10", + "version-string": "2.40.1-1", + "port-version": 0 + }, + { + "git-tree": "a22a011845fe1781961f52f5032a3c48568819c0", + "version-string": "2.40.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/parallel-hashmap.json b/externals/vcpkg/versions/p-/parallel-hashmap.json new file mode 100755 index 000000000..eadbb2813 --- /dev/null +++ b/externals/vcpkg/versions/p-/parallel-hashmap.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "f72efb2dae42b2f746be8e239b00b707b3a61449", + "version": "1.34", + "port-version": 0 + }, + { + "git-tree": "4c8c5305bf3135855a29acfde1effc1f9897ea4d", + "version-string": "1.33", + "port-version": 1 + }, + { + "git-tree": "f4cfdf7841512d19a12c31705c75cbea341e5705", + "version-string": "1.33", + "port-version": 0 + }, + { + "git-tree": "2366577284edc25897d22a701976455165f98265", + "version-string": "1.32", + "port-version": 0 + }, + { + "git-tree": "58bde5c4f3118de4aa1aa84b65a410b9d9f7e721", + "version-string": "1.30", + "port-version": 0 + }, + { + "git-tree": "e17040bc5d348d6fcef6331003fcecbd62d51e3b", + "version-string": "1.27", + "port-version": 0 + }, + { + "git-tree": "e10a56dd72865dda64f1f7f51496eb265355385f", + "version-string": "1.24", + "port-version": 0 + }, + { + "git-tree": "96dea928d3d99c17e0467cbe8e943f584c63b2cf", + "version-string": "1.23", + "port-version": 0 + }, + { + "git-tree": "00784adc08a483f035f6749e103a2e498ec57521", + "version-string": "1.22", + "port-version": 0 + }, + { + "git-tree": "6339e1a753d776b89113f736eb15863e5535b9ec", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "bf69e7f2e0369879c579aa635fbc220088f98a9c", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/parallelstl.json b/externals/vcpkg/versions/p-/parallelstl.json new file mode 100755 index 000000000..03fd3de02 --- /dev/null +++ b/externals/vcpkg/versions/p-/parallelstl.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "9cfc36b104fb78856a7a5f6ec585f263a8c07924", + "version-string": "20200330", + "port-version": 1 + }, + { + "git-tree": "3e50eb9397c9a91ac5423d151f77c5fb4ae1ffac", + "version-string": "20200330", + "port-version": 0 + }, + { + "git-tree": "ae022531d9957689ac989bec96d7a4ecf5eb8dff", + "version-string": "20191218", + "port-version": 0 + }, + { + "git-tree": "1928eed64c6707e81d16a91f64e82957e141bd48", + "version-string": "20190522-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/paraview.json b/externals/vcpkg/versions/p-/paraview.json new file mode 100755 index 000000000..91d43f8c5 --- /dev/null +++ b/externals/vcpkg/versions/p-/paraview.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "8f5d22c6754f293f54a360472f78e760f06aae80", + "version": "5.9.1", + "port-version": 2 + }, + { + "git-tree": "7011d869273b8aa610ef7b302587c614137c73e5", + "version-semver": "5.9.1", + "port-version": 1 + }, + { + "git-tree": "a43b7d1bc53e7bdafcb4b73c3e9d84b9f80ecc22", + "version-semver": "5.9.1", + "port-version": 0 + }, + { + "git-tree": "9fb60c7a190e19963cb1811d3987da1e057ba6ad", + "version-string": "5.8.0", + "port-version": 3 + }, + { + "git-tree": "7f47bdcf2ec98f5f835a914659de2c8f6ae91ce7", + "version-string": "5.8.0-2", + "port-version": 0 + }, + { + "git-tree": "8fc6cb61b9405cde851dcd1c393f845d66b6c8de", + "version-string": "5.8.0-1", + "port-version": 0 + }, + { + "git-tree": "3e6c676e29e5ce34c89894b30329f63e0dba59a2", + "version-string": "5.8.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/parmetis.json b/externals/vcpkg/versions/p-/parmetis.json new file mode 100755 index 000000000..f47f478b8 --- /dev/null +++ b/externals/vcpkg/versions/p-/parmetis.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "28d903df01ef4780a7b02c8a8437ec37be859aba", + "version-string": "4.0.3", + "port-version": 5 + }, + { + "git-tree": "b472eb73edfdb744f44ec306ebf05649c7f5fb70", + "version-string": "4.0.3", + "port-version": 4 + }, + { + "git-tree": "3e1e3d50f531e207194d13af392a811f2af09d8b", + "version-string": "4.0.3-3", + "port-version": 0 + }, + { + "git-tree": "ea51676a5f392375e65b3d2e159edfb70adfb87b", + "version-string": "4.0.3-2", + "port-version": 0 + }, + { + "git-tree": "592aa3de34be8679271e39c65dfa68a0d8d657ef", + "version-string": "4.0.3-1", + "port-version": 0 + }, + { + "git-tree": "ba1ab39509cbcbbfa71f4bb57f5f4d6728c37d14", + "version-string": "4.0.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/parquet.json b/externals/vcpkg/versions/p-/parquet.json new file mode 100755 index 000000000..91b6e1e7f --- /dev/null +++ b/externals/vcpkg/versions/p-/parquet.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "35d3995589a5c775f1f64cb1f3f331fd38362fb9", + "version-string": "0", + "port-version": 1 + }, + { + "git-tree": "f7ee13cfaf8047001763ce07b521e1a067242d31", + "version-string": "0", + "port-version": 0 + }, + { + "git-tree": "4b5eeac5023c94ef97f96ec3ac1d631b47906435", + "version-string": "1.4.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/parson.json b/externals/vcpkg/versions/p-/parson.json new file mode 100755 index 000000000..1ef123196 --- /dev/null +++ b/externals/vcpkg/versions/p-/parson.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "40671b05e30f32cdc83003036e882ed4b1f7b44d", + "version-string": "2020-09-14", + "port-version": 1 + }, + { + "git-tree": "33cc29e8ca91bd2f207c5c352345ce242251d9cb", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "60378e28a0e8e71f2036876340f6aeaa7a2bd755", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "d39981054811de128b20a9285f9ef5cbe72270eb", + "version-string": "2019-04-19", + "port-version": 0 + }, + { + "git-tree": "a1413d36f39161c94236ef8fbcf4758d567953d6", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "7dba904ce71df66c5f256a0756a8e5e912f94b0c", + "version-string": "2018-12-14", + "port-version": 0 + }, + { + "git-tree": "8750917b914a687ac5dc81472b2416c6147810c2", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "f894640f4e7e1fd57f95fb296e701cd63d28b530", + "version-string": "2018-08-03", + "port-version": 0 + }, + { + "git-tree": "2c8bdd8568b0f4f6371d537750b9399c1a5b2086", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "27152c8ea7d3eeb3227a6b863f33e543083e70a3", + "version-string": "2018-04-17", + "port-version": 0 + }, + { + "git-tree": "0d1d17c5dad5c93db253e31572f49a9ba90cc88f", + "version-string": "2018-03-23", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pbc.json b/externals/vcpkg/versions/p-/pbc.json new file mode 100755 index 000000000..1e3b17445 --- /dev/null +++ b/externals/vcpkg/versions/p-/pbc.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "23742abe8879e71a911c56845977ad2387e9bfa6", + "version": "0.5.14", + "port-version": 6 + }, + { + "git-tree": "de531bdf83ba5c3a005655bde246d58074a28937", + "version-string": "0.5.14", + "port-version": 5 + }, + { + "git-tree": "b34d75a16c61743f6457040420ea6af43f29c9fe", + "version-string": "0.5.14", + "port-version": 4 + }, + { + "git-tree": "a7efc53c21bc71f5281207f0cc8566a9d39e78b9", + "version-string": "0.5.14", + "port-version": 3 + }, + { + "git-tree": "efed6182b1507e10efc64eea1a574402049cd356", + "version-string": "0.5.14-2", + "port-version": 0 + }, + { + "git-tree": "424e8c9fc9c31071b0f23cd4a35f20e2c0d0cdd6", + "version-string": "0.5.14-1", + "port-version": 0 + }, + { + "git-tree": "a2299226536c5726d542821d588198f3452e61f1", + "version-string": "0.5.14", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pcapplusplus.json b/externals/vcpkg/versions/p-/pcapplusplus.json new file mode 100755 index 000000000..2f03288a1 --- /dev/null +++ b/externals/vcpkg/versions/p-/pcapplusplus.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "1bcf1e7a1ad1f7899adc1c423c248fea6b86553e", + "version-string": "22.05", + "port-version": 0 + }, + { + "git-tree": "f1f63c9365f0cb128761835ebceeafb6b162c815", + "version": "21.11", + "port-version": 1 + }, + { + "git-tree": "e0480fc24edf7b699eb027d24c3737026dd1128c", + "version-string": "21.11", + "port-version": 0 + }, + { + "git-tree": "946d7783c459b46253318626bee9040e4e07bc56", + "version-string": "21.05", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pcg.json b/externals/vcpkg/versions/p-/pcg.json new file mode 100755 index 000000000..52b5f3c7c --- /dev/null +++ b/externals/vcpkg/versions/p-/pcg.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "dfdbf3fad0c295b94b400509530d3642d5a6abcc", + "version-string": "2021-04-06", + "port-version": 1 + }, + { + "git-tree": "489a8b4653947b7688ed2bbfd3c9d9bf663ee3a9", + "version-string": "2021-04-06", + "port-version": 0 + }, + { + "git-tree": "62fbb9c1c9a45c8fae6db35ac29c66a58176d722", + "version-string": "0.98.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pcl.json b/externals/vcpkg/versions/p-/pcl.json new file mode 100755 index 000000000..de398084c --- /dev/null +++ b/externals/vcpkg/versions/p-/pcl.json @@ -0,0 +1,244 @@ +{ + "versions": [ + { + "git-tree": "af82798f0369372866e38d58f1e38a1165801c1d", + "version": "1.12.0", + "port-version": 6 + }, + { + "git-tree": "5e5ebb57bf0a08e7eab28fe3571ebaa55c3d4ba8", + "version": "1.12.0", + "port-version": 5 + }, + { + "git-tree": "7e54ab86574dfc901275996e282f8db5c6c9c3fb", + "version": "1.12.0", + "port-version": 4 + }, + { + "git-tree": "0f0c24ef83692fbcc9434ec9622592ba9b16e0d5", + "version": "1.12.0", + "port-version": 3 + }, + { + "git-tree": "5d02740fc9422f1b520ae322cda71e8e6e5323cf", + "version": "1.12.0", + "port-version": 2 + }, + { + "git-tree": "a2eb47fa4d7f959d9c8712f0d0925c2af94bcc80", + "version": "1.12.0", + "port-version": 1 + }, + { + "git-tree": "6a65773e049bbdfef835781a6a61ee6a3a94dd27", + "version": "1.12.0", + "port-version": 0 + }, + { + "git-tree": "32f16f4b317bc068cc45259ca36d23ebd16a3099", + "version": "1.11.1", + "port-version": 5 + }, + { + "git-tree": "7d8ce8bc561fa2b928b9a5075c4f8659c86b5906", + "version": "1.11.1", + "port-version": 4 + }, + { + "git-tree": "26e422f1ac4af5ffcce30091a069b74e204f244e", + "version": "1.11.1", + "port-version": 3 + }, + { + "git-tree": "7efe6bc9f411b5669ec8ae76407a1250318f3772", + "version-string": "1.11.1", + "port-version": 2 + }, + { + "git-tree": "ec0a23d0b9414a2df0dffcf2ae613bd4e99c35b1", + "version-string": "1.11.1", + "port-version": 1 + }, + { + "git-tree": "e781efb7616a58439447593e20c19a1edc92e52c", + "version-string": "1.11.1", + "port-version": 0 + }, + { + "git-tree": "a6f92a0208bb7a88a93abe587be48a7e4c7799f4", + "version-string": "1.11.0", + "port-version": 3 + }, + { + "git-tree": "3e0ef448dccdbee9887a9335ee50a0a06a9d4cfd", + "version-string": "1.11.0", + "port-version": 2 + }, + { + "git-tree": "a23465cba2e11ed2b6f8d5fb1898ab5c535293e6", + "version-string": "1.11.0", + "port-version": 1 + }, + { + "git-tree": "67b76312f4eafd6753a2d2a8b7e77da45362d975", + "version-string": "1.11.0", + "port-version": 0 + }, + { + "git-tree": "5650e74a979ec8e2bb33217cf77f6ca04109cac7", + "version-string": "1.9.1-13", + "port-version": 0 + }, + { + "git-tree": "9b36237034c639a4088d2d4955288d0ef0ab7c5e", + "version-string": "1.9.1-12", + "port-version": 0 + }, + { + "git-tree": "cab5e960682a92ea88a1af6cac8f18209dea3809", + "version-string": "1.9.1-11", + "port-version": 0 + }, + { + "git-tree": "fc62f99694f69e5da61b69108134a0eb97ead6f4", + "version-string": "1.9.1-10", + "port-version": 0 + }, + { + "git-tree": "0ccce6a5abaf992ab5fa1b48d7d7472ca4acac7a", + "version-string": "1.9.1-9", + "port-version": 0 + }, + { + "git-tree": "113d598e53fe6e3ea5941fd5d850787d28455b34", + "version-string": "1.9.1-8", + "port-version": 0 + }, + { + "git-tree": "7a50a3ed2863cccbfe6c7de551cbb424b9a1808b", + "version-string": "1.9.1-7", + "port-version": 0 + }, + { + "git-tree": "7e6a1b006f72805cd04ff80a336fe7fd8e10fab1", + "version-string": "1.9.1-6", + "port-version": 0 + }, + { + "git-tree": "0a0a181fe1e74ae342306e9b50ccb77e70dfb23b", + "version-string": "1.9.1-5", + "port-version": 0 + }, + { + "git-tree": "42ac2ab2ca4c251f4741f958a24daf431b3a97e9", + "version-string": "1.9.1-4", + "port-version": 0 + }, + { + "git-tree": "261f836d808ebc0e8c7d151b650bf689965f8cac", + "version-string": "1.9.1-3", + "port-version": 0 + }, + { + "git-tree": "cecc155b5f5c924134ff113486c4064b1591a4bf", + "version-string": "1.9.1-2", + "port-version": 0 + }, + { + "git-tree": "8cdc7c29e8499767f1c0ce52a2c137c3bb3ca50a", + "version-string": "1.9.1-1", + "port-version": 0 + }, + { + "git-tree": "55758642f09eae88ac8f0abf7402c88e76b5e86b", + "version-string": "1.9.0-1", + "port-version": 0 + }, + { + "git-tree": "3a973a70d8b8f4ac7f9a36d1b51711c1c1faa90f", + "version-string": "1.8.1-12", + "port-version": 0 + }, + { + "git-tree": "63163e650908acd32a47d869c732445dbf7fa08d", + "version-string": "1.8.1-11", + "port-version": 0 + }, + { + "git-tree": "d651d8884fa10e4b904bd3ab4af84e69fde6c3f7", + "version-string": "1.8.1-10", + "port-version": 0 + }, + { + "git-tree": "d9f4b5f0e46f3e105971efb3bae3f35775cebf77", + "version-string": "1.8.1-9", + "port-version": 0 + }, + { + "git-tree": "562579fad1ec4848eda4173d882af91307e532e7", + "version-string": "1.8.1-8", + "port-version": 0 + }, + { + "git-tree": "017646d12ec70c9c3492ceb7eed53301b4d0927b", + "version-string": "1.8.1-7", + "port-version": 0 + }, + { + "git-tree": "ee876e855a5bf85cfe5dc8e20b3927d76230848f", + "version-string": "1.8.1-6", + "port-version": 0 + }, + { + "git-tree": "570499d781490d60f410a2b053900aa8a3f1328c", + "version-string": "1.8.1-5", + "port-version": 0 + }, + { + "git-tree": "12347707c0057eb49b5ec6d75c42899e776ff70a", + "version-string": "1.8.1-4", + "port-version": 0 + }, + { + "git-tree": "2990aea7090448711bf7b5c139efa0e6c9434895", + "version-string": "1.8.1-3", + "port-version": 0 + }, + { + "git-tree": "89f5ca02ee4f26d1126d1da58cbbb963c77f29cc", + "version-string": "1.8.1-2", + "port-version": 0 + }, + { + "git-tree": "d345990fb5e631e70f108edb72527f288e030cc5", + "version-string": "1.8.1-1", + "port-version": 0 + }, + { + "git-tree": "218e16b624181aa49c658e5331b4db7c9c85e216", + "version-string": "1.8.1", + "port-version": 0 + }, + { + "git-tree": "0aebbb5cd9ad1fb4c6559ad32d86ade75a6d29d0", + "version-string": "1.8.1rc2", + "port-version": 0 + }, + { + "git-tree": "9d6765a52ac0859126813b93766eee7d6de05af0", + "version-string": "1.8.1rc1-1", + "port-version": 0 + }, + { + "git-tree": "94c863573d453941a25a57d92999af38fa8b77e9", + "version-string": "1.8.1rc1", + "port-version": 0 + }, + { + "git-tree": "0b53942b897c7a854af51e8c09253fdb50c426c8", + "version-string": "1.8.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pcre.json b/externals/vcpkg/versions/p-/pcre.json new file mode 100755 index 000000000..acbf3b732 --- /dev/null +++ b/externals/vcpkg/versions/p-/pcre.json @@ -0,0 +1,109 @@ +{ + "versions": [ + { + "git-tree": "e8f61fdc5d1286667a8e14eb9521500b882394ad", + "version": "8.45", + "port-version": 3 + }, + { + "git-tree": "693b4da6141be8041f8db0caa1b60ce246b47dcb", + "version": "8.45", + "port-version": 2 + }, + { + "git-tree": "b1eb815e0c923baec32da26918e951b288adbaa5", + "version": "8.45", + "port-version": 1 + }, + { + "git-tree": "665bab8c2bf878815782cff93dfff5720316ab88", + "version": "8.45", + "port-version": 0 + }, + { + "git-tree": "69e232f12c4e3eab4115f0672466a6661978bea2", + "version-string": "8.44", + "port-version": 8 + }, + { + "git-tree": "bb73c18e72c449b35a3cd011490d58fe39f9ecc5", + "version-string": "8.44", + "port-version": 7 + }, + { + "git-tree": "c1c1f71db3aea57c6b7539ce269b0ac906a6c1d2", + "version-string": "8.44", + "port-version": 6 + }, + { + "git-tree": "2da92fb03a2a83d100c91ddaac08f895ded249a5", + "version-string": "8.44", + "port-version": 5 + }, + { + "git-tree": "e8c72bb6d65fb217a0781dab9c96cbb0515bc4cd", + "version-string": "8.44-4", + "port-version": 0 + }, + { + "git-tree": "60412518c0f4de43177bcb4d0169a8dad76cdd14", + "version-string": "8.44-2", + "port-version": 0 + }, + { + "git-tree": "7b0d523a0054c145bc9f03dcf61f893ae66716c8", + "version-string": "8.44-1", + "port-version": 0 + }, + { + "git-tree": "b7515f8e23e83eede9d447b13143a36e832363b4", + "version-string": "8.44", + "port-version": 0 + }, + { + "git-tree": "1c12add88c46ee3f7633632d772d700e423d34c9", + "version-string": "8.41-4", + "port-version": 0 + }, + { + "git-tree": "a7b1012ceb39e76faed73cc79ef8b961bc8e15d8", + "version-string": "8.41-3", + "port-version": 0 + }, + { + "git-tree": "83914398aa1345710569da01946b782c2f379ed8", + "version-string": "8.41-2", + "port-version": 0 + }, + { + "git-tree": "161f6ef679e99ad07b2b54a72d0f96c70b414bf8", + "version-string": "8.41-1", + "port-version": 0 + }, + { + "git-tree": "8d77e4b2b7bb5614331c1bae6011dc0e2e1928a6", + "version-string": "8.41", + "port-version": 0 + }, + { + "git-tree": "5d6b2133b1e181001856de61e5bed3944428e9f7", + "version-string": "8.40-1", + "port-version": 0 + }, + { + "git-tree": "18b83c6ee88bc58e0230d6b1f3e81dd12d4e5823", + "version-string": "8.40", + "port-version": 0 + }, + { + "git-tree": "d83a174d15520f5fe099d4cbb7a3d837d9ab380a", + "version-string": "8.38-1", + "port-version": 0 + }, + { + "git-tree": "aa3902c58f39a879f3f59253cd490d28b23923fe", + "version-string": "8.38", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pcre2.json b/externals/vcpkg/versions/p-/pcre2.json new file mode 100755 index 000000000..55d7929cf --- /dev/null +++ b/externals/vcpkg/versions/p-/pcre2.json @@ -0,0 +1,114 @@ +{ + "versions": [ + { + "git-tree": "725d8f25eea7d10b24944f314db69aa8b29d4932", + "version": "10.40", + "port-version": 0 + }, + { + "git-tree": "9a15903858198c8a3b890972b5e8c0d2aa3f89f8", + "version": "10.39", + "port-version": 2 + }, + { + "git-tree": "b25437749e0bcdd96807c66a8fc8764382c55203", + "version": "10.39", + "port-version": 1 + }, + { + "git-tree": "a7adfd692604527d08dfc188301fb73bae107550", + "version": "10.39", + "port-version": 0 + }, + { + "git-tree": "f467ee4e8312b3536d9b7af3a181630c9956db5d", + "version-string": "10.37", + "port-version": 1 + }, + { + "git-tree": "9f61b1640aff6d4d306d30338bbd360c223301b0", + "version-string": "10.37", + "port-version": 0 + }, + { + "git-tree": "c0357d3b67540bd7e46f4301e5e1507ecddfaa1e", + "version-string": "10.35", + "port-version": 2 + }, + { + "git-tree": "01d66cf1c0c0d5bfc43c78aa8c6ddbc7b044a09a", + "version-string": "10.35", + "port-version": 1 + }, + { + "git-tree": "59fea9296090b695c766dbe6bc46f6e9f6a573d1", + "version-string": "10.35", + "port-version": 0 + }, + { + "git-tree": "db46c2a24cd38d705b5d4911ade5010fa71c6eec", + "version-string": "10.30-9", + "port-version": 0 + }, + { + "git-tree": "27ba1145956b6e8ed834e84fc76f3d0ed5a42f96", + "version-string": "10.30-8", + "port-version": 0 + }, + { + "git-tree": "4634f38f2dddc91a14bebec547ec4b8e7f24c587", + "version-string": "10.30-7", + "port-version": 0 + }, + { + "git-tree": "f93934968e7ad2eca3b9f881abd2f26c9137f55c", + "version-string": "10.30-6", + "port-version": 0 + }, + { + "git-tree": "f604be0d979cf6b43f2f67ba0b20692a1383fd79", + "version-string": "10.30-5", + "port-version": 0 + }, + { + "git-tree": "7b71c608a1c72c658dfdfb0739ad2d6e7f7d4f10", + "version-string": "10.30-4", + "port-version": 0 + }, + { + "git-tree": "7644adc498156f83c3421651a0a43908720bd911", + "version-string": "10.30-5", + "port-version": 0 + }, + { + "git-tree": "547d23a9c0ad367c277805f986e3d3c8195888ea", + "version-string": "10.30-4", + "port-version": 0 + }, + { + "git-tree": "746323452a40a8970c28437c52f93b8aee6d125a", + "version-string": "10.30-3", + "port-version": 0 + }, + { + "git-tree": "d5e2cf71845c8c3becc346e4081876b3815882ee", + "version-string": "10.30-2", + "port-version": 0 + }, + { + "git-tree": "58ae76c7d734a2966ba2d7be2f96c79de256aeb8", + "version-string": "10.30-1", + "port-version": 0 + }, + { + "git-tree": "b4f454c538299c5b3221442d3cb4092d12fe8466", + "version-string": "10.30", + "port-version": 0 + }, + { + "git-tree": "157535ab88b15f56f83724f3ebef48637bcc4f71", + "version-string": "10.23", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pdal-c.json b/externals/vcpkg/versions/p-/pdal-c.json new file mode 100755 index 000000000..0eb2c8be9 --- /dev/null +++ b/externals/vcpkg/versions/p-/pdal-c.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "c19bcf077b95f0d81ef14bfdf9774795521d6013", + "version-string": "2.1", + "port-version": 0 + }, + { + "git-tree": "9319bb871924d143523c4e79ecc45bc9260360b5", + "version-string": "1.8", + "port-version": 3 + }, + { + "git-tree": "12db5babd9f9ed569721106476c71ef2cd50cb13", + "version-string": "1.8-2", + "port-version": 0 + }, + { + "git-tree": "d91a09df4cf5a7fa0bfe40ed798de05330a76316", + "version-string": "1.8-1", + "port-version": 0 + }, + { + "git-tree": "0bbc662920efa9698a36ef10f2d5f7c0ffe345f0", + "version-string": "1.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pdal.json b/externals/vcpkg/versions/p-/pdal.json new file mode 100755 index 000000000..8e3fa6214 --- /dev/null +++ b/externals/vcpkg/versions/p-/pdal.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "674fea8cc4044272fef94a061252c4aeb4e6373c", + "version": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "408d14a540c0a1e217efec2deea453594d9d1bde", + "version": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "11280c0564220eb3e82eae1c596843daf5b79294", + "version": "1.7.1", + "port-version": 13 + }, + { + "git-tree": "836e512e2335367a76bc44197f3140c802897154", + "version-string": "1.7.1", + "port-version": 12 + }, + { + "git-tree": "b6a58e13d646cb435d82143c23a3e9e8f54f495e", + "version-string": "1.7.1", + "port-version": 11 + }, + { + "git-tree": "e8b9d999c233cc564ff9eac48cf8e1d9b3094f1b", + "version-string": "1.7.1", + "port-version": 10 + }, + { + "git-tree": "e6c3776cc6d1b8a04b66ddf495798a408b1822f2", + "version-string": "1.7.1", + "port-version": 9 + }, + { + "git-tree": "d479587ff8e52f6baee283f66bf1b74e50dafc79", + "version-string": "1.7.1-8", + "port-version": 0 + }, + { + "git-tree": "7fe32fbdc6544598c4ab1dd6a0613385f45b4320", + "version-string": "1.7.1-7", + "port-version": 0 + }, + { + "git-tree": "ea9bfd9927ea126b0cde975f91e770f405196cad", + "version-string": "1.7.1-6", + "port-version": 0 + }, + { + "git-tree": "435332f746ffdf0e142178ad7897727a801c4b36", + "version-string": "1.7.1-5", + "port-version": 0 + }, + { + "git-tree": "5a2a7e54be2333fa159df0d66969c68bc251b27a", + "version-string": "1.7.1-4", + "port-version": 0 + }, + { + "git-tree": "ff855f581bbd9c963a3f30365b51ddb038063830", + "version-string": "1.7.1-3", + "port-version": 0 + }, + { + "git-tree": "656d2a1b9c0f8b6ba9a9a2715719fc6d9733d3c2", + "version-string": "1.7.1-2", + "port-version": 0 + }, + { + "git-tree": "f090f257f102532be9c66af99aef5aa938c39923", + "version-string": "1.7.1-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pdcurses.json b/externals/vcpkg/versions/p-/pdcurses.json new file mode 100755 index 000000000..68869abfc --- /dev/null +++ b/externals/vcpkg/versions/p-/pdcurses.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "e09ec910aff6b25bd1e1554b15dce08656b3f3d5", + "version-string": "3.9", + "port-version": 3 + }, + { + "git-tree": "190eafb5554bf1f484edff1aa94598bac3ff9830", + "version-string": "3.9", + "port-version": 2 + }, + { + "git-tree": "ba3df274e70a15b1df907d3f594ddc71b99c2ec1", + "version-string": "3.9", + "port-version": 1 + }, + { + "git-tree": "ffec138e0a9a3b2894c8a0ecf58a14734c340025", + "version-string": "3.9", + "port-version": 0 + }, + { + "git-tree": "610c065a7fc1f98737cfb2571822c5604f544b02", + "version-string": "3.8-2", + "port-version": 0 + }, + { + "git-tree": "79ec77fc25179266ad285ef5670addcf4a793f16", + "version-string": "3.8-1", + "port-version": 0 + }, + { + "git-tree": "12343091e72a9303572e194f040e35b9a11d5223", + "version-string": "3.8", + "port-version": 0 + }, + { + "git-tree": "4bd66785a4990ff99b3396c769469605ea06ad4e", + "version-string": "3.6", + "port-version": 0 + }, + { + "git-tree": "4cce2371db93d6c7ee050226675fce0acbe874be", + "version-string": "3.4-1", + "port-version": 0 + }, + { + "git-tree": "b0e555f795330fef4b840bf0c1c3f2fe58338694", + "version-string": "3.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pdqsort.json b/externals/vcpkg/versions/p-/pdqsort.json new file mode 100755 index 000000000..cda3f3dc4 --- /dev/null +++ b/externals/vcpkg/versions/p-/pdqsort.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "70783c2d8d848d78dd2d725fd1cf16d669b7c356", + "version-string": "2019-07-30", + "port-version": 1 + }, + { + "git-tree": "2aee3f0b215c924e6ba8c818fb8fb5258db6db66", + "version-string": "2019-07-30", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pe-parse.json b/externals/vcpkg/versions/p-/pe-parse.json new file mode 100755 index 000000000..82b2b2339 --- /dev/null +++ b/externals/vcpkg/versions/p-/pe-parse.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "46ac74f817dcb2fed549ac83eca39761bae2c4ae", + "version": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "10de7a27c9512d2267067cc442507ee91839fb07", + "version-string": "1.2.0", + "port-version": 1 + }, + { + "git-tree": "b26d3371c165c5888f2aca0c7c63107fa2ea1fdc", + "version-string": "1.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pegtl-2.json b/externals/vcpkg/versions/p-/pegtl-2.json new file mode 100755 index 000000000..c9c69fc5c --- /dev/null +++ b/externals/vcpkg/versions/p-/pegtl-2.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "9c7c1cd5779e8bf0ae828b94485817dce0710dba", + "version-string": "2.8.3", + "port-version": 1 + }, + { + "git-tree": "4791faebde499af884cdd281572c83779ba98834", + "version-string": "2.8.3", + "port-version": 0 + }, + { + "git-tree": "e62318eb75f783792c4ee2d5da4ddab2cfaf6c75", + "version-string": "2.8.1-1", + "port-version": 0 + }, + { + "git-tree": "643b531ba9850e6f6720e43bc4b785b073617b7b", + "version-string": "2.8.1", + "port-version": 0 + }, + { + "git-tree": "687cc1e20ad8b33bb084cf3c80f3e625c1ec82e6", + "version-string": "2.8.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pegtl.json b/externals/vcpkg/versions/p-/pegtl.json new file mode 100755 index 000000000..45bf43ca6 --- /dev/null +++ b/externals/vcpkg/versions/p-/pegtl.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "ed96fd80f2820b9e5ad6f38a9ea24d7aebfb64be", + "version-semver": "3.2.6", + "port-version": 0 + }, + { + "git-tree": "43adc8ee136a8dd0ea88b54a6a7fdc7325cf7327", + "version-semver": "3.2.5", + "port-version": 0 + }, + { + "git-tree": "9e9bdd7c1860ebc540ca2df7ab8451e596dfff3a", + "version-semver": "3.2.2", + "port-version": 0 + }, + { + "git-tree": "4a95202decfce79a39190525dea1c3a135bf393f", + "version-semver": "3.2.1", + "port-version": 0 + }, + { + "git-tree": "2e4a20284dace72d0591ae48e03087333c857991", + "version-string": "3.2.0", + "port-version": 1 + }, + { + "git-tree": "e9d21ac506ea50664bb2c18b94f02faf3067fbc1", + "version-string": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "d90ba3461a4253fee67f84ef2ca0232b21a4f24b", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "23d4aa0b7c206ea3d4b6d32f74bb2a62e2855151", + "version-string": "2020-12-07", + "port-version": 0 + }, + { + "git-tree": "71d6cdd8c45bb7038a9701cd37358bfbc72c86b3", + "version-string": "3.0.0-pre-70971f4", + "port-version": 0 + }, + { + "git-tree": "76f73003993b31ddc2e13017c7255eb007626e41", + "version-string": "3.0.0-pre-83b6cdc", + "port-version": 0 + }, + { + "git-tree": "422e0eb2271db37b8bff94b1f4be79f4926b6b22", + "version-string": "3.0.0-pre-9d58962", + "port-version": 0 + }, + { + "git-tree": "9d2b98a3f97d8fae3538a7fd197cac3500b4c3e4", + "version-string": "3.0.0-pre-697aaa0", + "port-version": 0 + }, + { + "git-tree": "12b421a77d442668ddb00817a79d8e0c2605bed9", + "version-string": "3.0.0-pre", + "port-version": 0 + }, + { + "git-tree": "5995adbca591660d02a6a879f88347bed8076e04", + "version-string": "2.8.0", + "port-version": 0 + }, + { + "git-tree": "b4bacb9da64ab603810c366fc43ccdf474b9ef50", + "version-string": "2.7.1", + "port-version": 0 + }, + { + "git-tree": "33cefe6764e95e43f3176a0bd498c8ce69be4fe3", + "version-string": "2.6.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pffft.json b/externals/vcpkg/versions/p-/pffft.json new file mode 100755 index 000000000..9defc0134 --- /dev/null +++ b/externals/vcpkg/versions/p-/pffft.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c425b1091069b34450a9b7e524f1cad202e4e709", + "version-date": "2021-10-09", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pfring.json b/externals/vcpkg/versions/p-/pfring.json new file mode 100755 index 000000000..c16247064 --- /dev/null +++ b/externals/vcpkg/versions/p-/pfring.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "ed3dbffb4364b80331f2b986435bad956f39ad09", + "version-date": "2019-10-17", + "port-version": 4 + }, + { + "git-tree": "cc03f1b404adc6a550e8d7b9d5d36795fac6b4b7", + "version-string": "2019-10-17", + "port-version": 3 + }, + { + "git-tree": "d6f178fb757726e3c9140f39ec0d74c49dded7ce", + "version-string": "2019-10-17-2", + "port-version": 0 + }, + { + "git-tree": "796da380cc6317b6035d18ba0e32b1d82031c9a4", + "version-string": "2019-10-17-1", + "port-version": 0 + }, + { + "git-tree": "9c6c563492d696e91d24df47285e89f7a62364e5", + "version-string": "2019-10-17", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pfultz2-linq.json b/externals/vcpkg/versions/p-/pfultz2-linq.json new file mode 100755 index 000000000..8bbbcc15f --- /dev/null +++ b/externals/vcpkg/versions/p-/pfultz2-linq.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "8e242ac1b54aad9121c9f869c1c5db61910a7150", + "version-string": "2019-05-14", + "port-version": 1 + }, + { + "git-tree": "8d87cd259fa28073f259c3bf09f97870b2fa64a9", + "version-string": "2019-05-14", + "port-version": 0 + }, + { + "git-tree": "39a3f4594cebb1a3086e8c3434d0a8663693a06b", + "version-string": "2018-02-08", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/phnt.json b/externals/vcpkg/versions/p-/phnt.json new file mode 100755 index 000000000..b5239bae9 --- /dev/null +++ b/externals/vcpkg/versions/p-/phnt.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "93f6534bed52cf8dfda970f4ddc5b51352eac5bd", + "version-date": "2020-12-21", + "port-version": 0 + }, + { + "git-tree": "fa7a8a91ecb156614e8a72657f76fd6220624525", + "version-string": "2019-05-01", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/physfs.json b/externals/vcpkg/versions/p-/physfs.json new file mode 100755 index 000000000..7961b9151 --- /dev/null +++ b/externals/vcpkg/versions/p-/physfs.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "0acbb8771db07ce3e4641f015189fb48e732bdd5", + "version-semver": "3.0.2", + "port-version": 7 + }, + { + "git-tree": "17d9ad3560e379cc51921a51982f4d31d106f1ed", + "version-semver": "3.0.2", + "port-version": 6 + }, + { + "git-tree": "5976d673e48ec47164efd0ea8ec86728f0e259be", + "version-string": "3.0.2", + "port-version": 5 + }, + { + "git-tree": "bef97b95b7c30545c4ec9d0a55f672c3a6e3325f", + "version-string": "3.0.2", + "port-version": 4 + }, + { + "git-tree": "e46ccc22c717ad69bb6b6730669da403c86178d5", + "version-string": "3.0.2", + "port-version": 3 + }, + { + "git-tree": "aa1952ceb05b35ac1b2ce1a91aafcffbf7ef9c0b", + "version-string": "3.0.2-2", + "port-version": 0 + }, + { + "git-tree": "005b474f9738ed5a15bec6eccc4ebd1b3f7d0efc", + "version-string": "3.0.2-1", + "port-version": 0 + }, + { + "git-tree": "3e4a965f3a666b4a9e8413a8b4ee0965d42c7772", + "version-string": "3.0.2", + "port-version": 0 + }, + { + "git-tree": "76348c1c0ed43af112a0ca513f96baac12e82561", + "version-string": "3.0.1-1", + "port-version": 0 + }, + { + "git-tree": "71757d92b59e015c35c03d892a506e2a5621daa7", + "version-string": "3.0.1", + "port-version": 0 + }, + { + "git-tree": "8dd48070ac9d25ba329410da800c72aae27bbc31", + "version-string": "2.0.3-2", + "port-version": 0 + }, + { + "git-tree": "611ae2d8ada47f9f42bd4104abb07e3d4c432010", + "version-string": "2.0.3-1", + "port-version": 0 + }, + { + "git-tree": "84a928be31293306727e27d915366be664739b04", + "version-string": "2.0.3", + "port-version": 0 + }, + { + "git-tree": "2258b768d0ec597d09061904dcb5e2f416ed087c", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/physx.json b/externals/vcpkg/versions/p-/physx.json new file mode 100755 index 000000000..b780cd523 --- /dev/null +++ b/externals/vcpkg/versions/p-/physx.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "ebfd4955bdff06becb259bc91575143bc9866dcc", + "version": "4.1.2", + "port-version": 4 + }, + { + "git-tree": "304769b6a45107c9a8abf12fad9b9d82bac22c3b", + "version": "4.1.2", + "port-version": 3 + }, + { + "git-tree": "8e20a94664b966271a5e7684e73b2efab2461ba8", + "version-semver": "4.1.2", + "port-version": 2 + }, + { + "git-tree": "3efd7a1c7727eec4a15ba3ac6f8f013550750760", + "version-semver": "4.1.2", + "port-version": 1 + }, + { + "git-tree": "c2731461cec1f38b720c3db1038e3096957244a4", + "version-semver": "4.1.2", + "port-version": 0 + }, + { + "git-tree": "61c80fbae2a59a689ceb9774b288dc6ffbdceac4", + "version-string": "4.1.1", + "port-version": 7 + }, + { + "git-tree": "ff229b023b059806554bb8d9e6fbc2b4eb0fe139", + "version-string": "4.1.1", + "port-version": 6 + }, + { + "git-tree": "3eb98f73f888b069297777256c7b78adebf1fc5d", + "version-string": "4.1.1", + "port-version": 5 + }, + { + "git-tree": "d5a5b51f2a1220799f9bce24defb0816678660a9", + "version-string": "4.1.1", + "port-version": 4 + }, + { + "git-tree": "02023d7a7f94423771480bf417be12bd3d961a9f", + "version-string": "4.1.1-3", + "port-version": 0 + }, + { + "git-tree": "43be360a61b02e4277ecc85a7fea1a5498b97b59", + "version-string": "4.1.1-2", + "port-version": 0 + }, + { + "git-tree": "529f0e645ed48c2aacd219483bd305000d6c3796", + "version-string": "4.1.1-1", + "port-version": 0 + }, + { + "git-tree": "1eaea35e626746a82b4244166bb54d60b1902eba", + "version-string": "commit-624f2cb6c0392013d54b235d9072a49d01c3cb6c", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/picojson.json b/externals/vcpkg/versions/p-/picojson.json new file mode 100755 index 000000000..05665cd4d --- /dev/null +++ b/externals/vcpkg/versions/p-/picojson.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "2d186166bf75e9e77fce5e6a93440d5aa21fc830", + "version-string": "1.3.0", + "port-version": 2 + }, + { + "git-tree": "2b279f9df600324345fc6752960d63a176595168", + "version-string": "1.3.0-1", + "port-version": 0 + }, + { + "git-tree": "57494130807cb3281002e3f1f0a462294c69f618", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "e23c856810bfc133cc92d1f299728bfacef2cf41", + "version-string": "1.3.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/picosha2.json b/externals/vcpkg/versions/p-/picosha2.json new file mode 100755 index 000000000..57e22ab28 --- /dev/null +++ b/externals/vcpkg/versions/p-/picosha2.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "8192d1108b62d31bcb879332175c994fa62878dc", + "version-string": "2018-07-30", + "port-version": 1 + }, + { + "git-tree": "eb0b4d7431fa28a8d61a52f014070d664b170992", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "4d7ad8958d8a6a7ba3fd887f090705bc4880929a", + "version-string": "2018-06-15", + "port-version": 0 + }, + { + "git-tree": "b4a3933f7163139ca1f4fc2c7e60d78e678b7dee", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "418d30303aac2beedb77598f0fea978e8b72a002", + "version-string": "2017-09-01-c5ff159b6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/piex.json b/externals/vcpkg/versions/p-/piex.json new file mode 100755 index 000000000..dd5cd3745 --- /dev/null +++ b/externals/vcpkg/versions/p-/piex.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "f9f7ad5427c18be18708d00150fe9ca33dc30a8a", + "version-date": "2019-07-11", + "port-version": 2 + }, + { + "git-tree": "08ede8e9e8ed0d849edd62a316b407041cc8d4aa", + "version-string": "2019-07-11", + "port-version": 1 + }, + { + "git-tree": "df177c4ae73fb30b438f741d2a362199a3dbc735", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "cc5c3b9f8c60c95e3f4809340c7bf9d6d20cc1bd", + "version-string": "2018-03-13-1", + "port-version": 0 + }, + { + "git-tree": "74cb5d12c4ebb7d2cf0151fceab4ca45a9ba224b", + "version-string": "2018-03-13", + "port-version": 0 + }, + { + "git-tree": "6cb3bcbe0d69da96ac9674a52600e36b0814a1ec", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "99ca546a38452b45f937a970e7c39cdab0383f4d", + "version-string": "2017-09-01-473434f2dd974978b-1", + "port-version": 0 + }, + { + "git-tree": "f9945e5452a07831d28d8774f2a2e254475b030d", + "version-string": "2017-09-01-473434f2dd974978b", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pipewire.json b/externals/vcpkg/versions/p-/pipewire.json new file mode 100755 index 000000000..08c3f08d2 --- /dev/null +++ b/externals/vcpkg/versions/p-/pipewire.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4ec746fd8458f073339bf953335742b2abb0ac53", + "version": "0.3.52", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pistache.json b/externals/vcpkg/versions/p-/pistache.json new file mode 100755 index 000000000..9c84e2e39 --- /dev/null +++ b/externals/vcpkg/versions/p-/pistache.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "270e04cb56d330fc6cd8482697341ed0d3bf1320", + "version-date": "2021-03-31", + "port-version": 3 + }, + { + "git-tree": "e8c089b0eec0784be71fb4347dbd583c4aaeb0d8", + "version-date": "2021-03-31", + "port-version": 2 + }, + { + "git-tree": "c6b15d3a79abbfb78408d1f49e8b976bcb9003f2", + "version-date": "2021-03-31", + "port-version": 1 + }, + { + "git-tree": "f2c28dea6191ea1f399a862889d095f1d268a3f0", + "version-date": "2021-03-31", + "port-version": 0 + }, + { + "git-tree": "63fa37bfa9925b106a2e5a66db9133e381dc499e", + "version-string": "2019-08-05", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pixel.json b/externals/vcpkg/versions/p-/pixel.json new file mode 100755 index 000000000..3e2ca86e6 --- /dev/null +++ b/externals/vcpkg/versions/p-/pixel.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "54bad3e5b7d0455972d0cc84fa90e5d6549b6203", + "version-date": "2022-03-15", + "port-version": 1 + }, + { + "git-tree": "dbf76415a78802e7dc2717280e2a44123a04df69", + "version-date": "2022-03-15", + "port-version": 0 + }, + { + "git-tree": "346ea5fe92b2cfe055a1cd242868605e56d94318", + "version": "0.3", + "port-version": 4 + }, + { + "git-tree": "57198090e451e125ad231a0a1068643cbd06cb61", + "version-string": "0.3", + "port-version": 3 + }, + { + "git-tree": "bd45dec4585e8be40088a7017dcce546a009748f", + "version-string": "0.3", + "port-version": 2 + }, + { + "git-tree": "9c2f4ccc6c5ca30c268af6a115f7933ffb972deb", + "version-string": "0.3-1", + "port-version": 0 + }, + { + "git-tree": "653dc998813165593d92fa5797cec7371e60b141", + "version-string": "0.3", + "port-version": 0 + }, + { + "git-tree": "1c1a5a5526e461a80c146d751cfadd807add018d", + "version-string": "0.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pixman.json b/externals/vcpkg/versions/p-/pixman.json new file mode 100755 index 000000000..0faacd4b5 --- /dev/null +++ b/externals/vcpkg/versions/p-/pixman.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "85d5aa0bbd91cff8853d0767bc9dc73e97156291", + "version": "0.40.0", + "port-version": 2 + }, + { + "git-tree": "c2dd7fec404954b43ad0da4ee86c29a4cfdd8fc1", + "version": "0.40.0", + "port-version": 1 + }, + { + "git-tree": "9fa31a3aa7682c205028903d0b2d2df269a95db5", + "version": "0.40.0", + "port-version": 0 + }, + { + "git-tree": "3cb6610f632460553bb2ae5fe3838e15880dc7e2", + "version-string": "0.38.4", + "port-version": 2 + }, + { + "git-tree": "055b612e99d658047ab8dfde43c375ddc46a14cc", + "version-string": "0.38.4-1", + "port-version": 0 + }, + { + "git-tree": "94a39fe731a38eb8cec354603146a99f4ebbf801", + "version-string": "0.38.0-4", + "port-version": 0 + }, + { + "git-tree": "9a943134e4d25ed418074fe46bde99fda69dd0a3", + "version-string": "0.38.0-3", + "port-version": 0 + }, + { + "git-tree": "8e1d0df50ad1a7157038c30ac0df05c8c641af17", + "version-string": "0.38.0-2", + "port-version": 0 + }, + { + "git-tree": "941fe8704e7a700ea959fe3d712b4a25c5487273", + "version-string": "0.38.0-1", + "port-version": 0 + }, + { + "git-tree": "2fe5e56b972d30146a9a652699efc68fddd51f5c", + "version-string": "0.38.0", + "port-version": 0 + }, + { + "git-tree": "72621d1b5b83e9004c56e8308881113a9c1aeb30", + "version-string": "0.34.0-5", + "port-version": 0 + }, + { + "git-tree": "c43aa78219eacf1d9542206a3fe0df57ba5eb23a", + "version-string": "0.34.0-4", + "port-version": 0 + }, + { + "git-tree": "f323614f8dd54123fc4150de48d339dd8049d6c4", + "version-string": "0.34.0-3", + "port-version": 0 + }, + { + "git-tree": "b2adf28aa373451ba8fd3ab3c38963586df67a1b", + "version-string": "0.34.0-2", + "port-version": 0 + }, + { + "git-tree": "4cd65135e016a10836eaaf013fa49ca7c026076a", + "version-string": "0.34.0-1", + "port-version": 0 + }, + { + "git-tree": "e210c31fe945276abc702683a7878c804d46a497", + "version-string": "0.34.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pkgconf.json b/externals/vcpkg/versions/p-/pkgconf.json new file mode 100755 index 000000000..d602da96d --- /dev/null +++ b/externals/vcpkg/versions/p-/pkgconf.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "a0408f161d8a23907635840add678d5946024d09", + "version": "1.8.0", + "port-version": 3 + }, + { + "git-tree": "5b599bd7dbbbc7837f7dbcf1b111478da076e2a4", + "version": "1.8.0", + "port-version": 2 + }, + { + "git-tree": "cbcb5f984f7713a636caa075f06b755d37493dbd", + "version": "1.8.0", + "port-version": 1 + }, + { + "git-tree": "a56de4007c52482253b4e052bc5551655711034c", + "version": "1.8.0", + "port-version": 0 + }, + { + "git-tree": "75fe71378e6521fe0e14a82218a9430c831b9809", + "version": "1.7.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/platform-folders.json b/externals/vcpkg/versions/p-/platform-folders.json new file mode 100755 index 000000000..d2de2cafd --- /dev/null +++ b/externals/vcpkg/versions/p-/platform-folders.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "8bb2bb2c54727cd2fa9b97a09313b1589e8f4e03", + "version": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "86a7b50a14bdd41de268fedb24601eeb94661ebb", + "version-string": "4.0.0", + "port-version": 7 + }, + { + "git-tree": "525005e82b0437cb956fb714916898603f37e570", + "version-string": "4.0.0", + "port-version": 6 + }, + { + "git-tree": "719eb3aa8561ce7439ae8b911d848fca330803ce", + "version-string": "4.0.0-5", + "port-version": 0 + }, + { + "git-tree": "ccefcbe17546ed50455e6e715db0afbc184f70cc", + "version-string": "4.0.0-4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/plf-colony.json b/externals/vcpkg/versions/p-/plf-colony.json new file mode 100755 index 000000000..16d3e369d --- /dev/null +++ b/externals/vcpkg/versions/p-/plf-colony.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "7e90bb5fdf6e933b8d5c14e07d85c920e7a7afea", + "version": "6.33", + "port-version": 0 + }, + { + "git-tree": "39c9b9a09ea0d7f88ac7a9cd90addb057e259f20", + "version": "6.28", + "port-version": 0 + }, + { + "git-tree": "0d9c2c09b2926db03ddd83cf09973d885cfc292b", + "version-string": "5.33", + "port-version": 0 + }, + { + "git-tree": "957c9c3c1849268340896febc7620f01ceada30e", + "version-string": "2019-08-10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/plf-hive.json b/externals/vcpkg/versions/p-/plf-hive.json new file mode 100755 index 000000000..7b8317a65 --- /dev/null +++ b/externals/vcpkg/versions/p-/plf-hive.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8e5c8a3892eb3ca1cade64672eaa76d3a9c74990", + "version-date": "2021-12-11", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/plf-list.json b/externals/vcpkg/versions/p-/plf-list.json new file mode 100755 index 000000000..27493b787 --- /dev/null +++ b/externals/vcpkg/versions/p-/plf-list.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "91600934f8054e05c6716dbcb08f287c2ae22c44", + "version-string": "2019-08-10", + "port-version": 1 + }, + { + "git-tree": "6afb43e539d06a946299ba56ef6cbf5d72715acb", + "version-string": "2019-08-10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/plf-nanotimer.json b/externals/vcpkg/versions/p-/plf-nanotimer.json new file mode 100755 index 000000000..c114c1a8a --- /dev/null +++ b/externals/vcpkg/versions/p-/plf-nanotimer.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "f669e0df9a7af5bae94971f1b625143893f3ee72", + "version-string": "2019-08-10", + "port-version": 1 + }, + { + "git-tree": "49c347d28b6f25c49e1536f411339226b58c68c3", + "version-string": "2019-08-10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/plf-stack.json b/externals/vcpkg/versions/p-/plf-stack.json new file mode 100755 index 000000000..a047b9dfd --- /dev/null +++ b/externals/vcpkg/versions/p-/plf-stack.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "a4212c7276e8c1881b76e58ae6d20dafaec3628d", + "version-string": "2019-08-10", + "port-version": 1 + }, + { + "git-tree": "67b6827a13ddf2a0438a5dd372f02c5f6d9079cf", + "version-string": "2019-08-10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/plib.json b/externals/vcpkg/versions/p-/plib.json new file mode 100755 index 000000000..03df101ad --- /dev/null +++ b/externals/vcpkg/versions/p-/plib.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "7b00da126126e5e721ab3f6b1f931f7ec4df77f8", + "version-string": "1.8.5", + "port-version": 5 + }, + { + "git-tree": "94d884dc742498b586da39691d31cd6b22c7e236", + "version-string": "1.8.5-4", + "port-version": 0 + }, + { + "git-tree": "9f144af9dae3bd3f1e124340b2600136ba378b9f", + "version-string": "1.8.5-3", + "port-version": 0 + }, + { + "git-tree": "655b81cfce60c5d7f2a2fd9a22382890c98c2b6c", + "version-string": "1.8.5-2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/plibsys.json b/externals/vcpkg/versions/p-/plibsys.json new file mode 100755 index 000000000..4fa3dacd2 --- /dev/null +++ b/externals/vcpkg/versions/p-/plibsys.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "6691b7f463d3a1bf27ebafa6e317cdc41735665c", + "version": "0.0.4", + "port-version": 6 + }, + { + "git-tree": "1af02f154f0a23e71a9547cf67f4dc7b0cab732d", + "version-string": "0.0.4", + "port-version": 5 + }, + { + "git-tree": "5f4a0abe78a0c1bd3e077d96141a1f2d541e0595", + "version-string": "0.0.4", + "port-version": 4 + }, + { + "git-tree": "65a4101fc0491a0d5b4c548e97bdc9c0b194d03d", + "version-string": "0.0.4-3", + "port-version": 0 + }, + { + "git-tree": "4db830a17a2f08dc97fb3e10bbfabe78bc4868f6", + "version-string": "0.0.4-2", + "port-version": 0 + }, + { + "git-tree": "1d1e94cf4d241171a23bdb7d7c95413834d8aed1", + "version-string": "0.0.4-1", + "port-version": 0 + }, + { + "git-tree": "2ca0683379e95642b6ee9bf7ce39d59f6b8f559a", + "version-string": "0.0.3-1", + "port-version": 0 + }, + { + "git-tree": "c8f3dce970ba90e5f1105b824ffc5cdf6d291106", + "version-string": "0.0.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/plog.json b/externals/vcpkg/versions/p-/plog.json new file mode 100755 index 000000000..fae370de9 --- /dev/null +++ b/externals/vcpkg/versions/p-/plog.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "b16507d8b9cbf419b2923d55de7ddfdf013f0267", + "version": "1.1.8", + "port-version": 0 + }, + { + "git-tree": "aaca8cb03c90bca09c7bf83b393521dce2719686", + "version": "1.1.6", + "port-version": 0 + }, + { + "git-tree": "7cbf2ab91e484ee21e8c62316558e11b3a49f288", + "version-string": "1.1.5", + "port-version": 1 + }, + { + "git-tree": "4f4d184ac766682a2b337e2fb7cfaa0ebed61330", + "version-string": "1.1.5", + "port-version": 0 + }, + { + "git-tree": "593579cfa5dda0525a07480485c918e29d736dfd", + "version-string": "1.1.4", + "port-version": 0 + }, + { + "git-tree": "2959436e8c38d4c523943d7954921b23683cd5cd", + "version-string": "1.1.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/plplot.json b/externals/vcpkg/versions/p-/plplot.json new file mode 100755 index 000000000..d845aa870 --- /dev/null +++ b/externals/vcpkg/versions/p-/plplot.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "2bdc5ce1d9ab4085f8d1753de526830bee4bc92a", + "version-semver": "5.13.0", + "port-version": 15 + }, + { + "git-tree": "9e9bda9b45cefac69d08bbb2f3e947deab8cac14", + "version-semver": "5.13.0", + "port-version": 14 + }, + { + "git-tree": "d3cf98f0e002ea3b2f196af0c43a8a4cc885255c", + "version-semver": "5.13.0", + "port-version": 13 + }, + { + "git-tree": "81172e3761f2638245de863b13d8e13cbf08188d", + "version-semver": "5.13.0", + "port-version": 12 + }, + { + "git-tree": "ad6d85b2cc702beabe146047209cb580174ceea8", + "version-string": "5.13.0", + "port-version": 11 + }, + { + "git-tree": "d3b92bbff064890556b4d4f759d2cea20041e79d", + "version-string": "5.13.0", + "port-version": 10 + }, + { + "git-tree": "3a66c489f5aa8d94b9b171561bfe15b65fb71396", + "version-string": "5.13.0", + "port-version": 9 + }, + { + "git-tree": "475388874394af7ded3794fb81c2947e0633cec1", + "version-string": "5.13.0-8", + "port-version": 0 + }, + { + "git-tree": "d9f0471c3054b916312db6508c52804875a276fc", + "version-string": "5.13.0-6", + "port-version": 0 + }, + { + "git-tree": "fe938536c0fd0d4f2581f42158c0c8f6aa66e3f1", + "version-string": "5.13.0-5", + "port-version": 0 + }, + { + "git-tree": "cdbc4973a16b5c64b3174b4f1918bf21f79b95a0", + "version-string": "5.13.0-4", + "port-version": 0 + }, + { + "git-tree": "7951e7af5d06df39aed1c16a4db17081c4f5dcc1", + "version-string": "5.13.0-3", + "port-version": 0 + }, + { + "git-tree": "4e1f5467f8c7afc29ebaf410a9131aedf6c6459f", + "version-string": "5.13.0-2", + "port-version": 0 + }, + { + "git-tree": "b8b09a5d85a13e2883674b7cd8dce3ac4b360f94", + "version-string": "5.13.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/plustache.json b/externals/vcpkg/versions/p-/plustache.json new file mode 100755 index 000000000..3149909b7 --- /dev/null +++ b/externals/vcpkg/versions/p-/plustache.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ba5590c5878b8241436ef45af401b5c3c8db5f9a", + "version-string": "0.4.0", + "port-version": 2 + }, + { + "git-tree": "a2646069857f5a6e1b34f479b8fbcdac5fd5daf7", + "version-string": "0.4.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pmdk.json b/externals/vcpkg/versions/p-/pmdk.json new file mode 100755 index 000000000..762bd4b32 --- /dev/null +++ b/externals/vcpkg/versions/p-/pmdk.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "a6a893e78e485b907148252308a5ea11befde1d9", + "version": "1.11.0", + "port-version": 1 + }, + { + "git-tree": "a2083c3fd577af1074c046235d2d0c73ad77d011", + "version": "1.11.0", + "port-version": 0 + }, + { + "git-tree": "f71d109fdac523675cae5c60bb81194e654de8f6", + "version-string": "1.9", + "port-version": 0 + }, + { + "git-tree": "972149a47f1ea89a77bbe84f9d462ac9d913600f", + "version-string": "1.8", + "port-version": 0 + }, + { + "git-tree": "2e96a3bf1d5202322c0e0497461a8ad16eb3f5fd", + "version-string": "1.7-1", + "port-version": 0 + }, + { + "git-tree": "4d20dd4936ae9eef8ffb62d92fb97a5aced3242c", + "version-string": "1.7", + "port-version": 0 + }, + { + "git-tree": "a1d7f8e5a74bab4bf6307044f7aea0555b6ce011", + "version-string": "2019-10-10", + "port-version": 0 + }, + { + "git-tree": "78f0727afe58396715c803add0ab7f50cd6afbf3", + "version-string": "1.6-3", + "port-version": 0 + }, + { + "git-tree": "8e76826f0034e43f5b9babea661ac2163aec500f", + "version-string": "1.6-1", + "port-version": 0 + }, + { + "git-tree": "9237ae36269293953e2bf22e184ad7bbfd7b8fb2", + "version-string": "1.6", + "port-version": 0 + }, + { + "git-tree": "658882510c2a63cc1240bcccbd010433b5eb19e1", + "version-string": "1.4.2", + "port-version": 0 + }, + { + "git-tree": "85c180890dff1257769f242b19c60ce59dde98eb", + "version-string": "1.4.1-1", + "port-version": 0 + }, + { + "git-tree": "707df081bd35a1585d40e8e566c2a3494afa6b95", + "version-string": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "34cc0c8ca9158297a72c6f2a6ea9f6680e0d99a0", + "version-string": "1.4-2", + "port-version": 0 + }, + { + "git-tree": "6a13627bcd29813f895a985404c281f87217546d", + "version-string": "1.4-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pngpp.json b/externals/vcpkg/versions/p-/pngpp.json new file mode 100755 index 000000000..e10941e2f --- /dev/null +++ b/externals/vcpkg/versions/p-/pngpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4c162ef0d91f9415a77e44bd02f9bd3abf3684e1", + "version-string": "0.2.10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pngwriter.json b/externals/vcpkg/versions/p-/pngwriter.json new file mode 100755 index 000000000..d0aa8635b --- /dev/null +++ b/externals/vcpkg/versions/p-/pngwriter.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "674b0ba608ae93553e633c598a6b04da5d5b7367", + "version-string": "0.7.0", + "port-version": 3 + }, + { + "git-tree": "8f5f1c653f1c9935bcf922a814d553318151e06f", + "version-string": "0.7.0-2", + "port-version": 0 + }, + { + "git-tree": "1f307643b0c83ffab637227a4dd494e0864991fe", + "version-string": "0.7.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/poco.json b/externals/vcpkg/versions/p-/poco.json new file mode 100755 index 000000000..e6d2e5f90 --- /dev/null +++ b/externals/vcpkg/versions/p-/poco.json @@ -0,0 +1,174 @@ +{ + "versions": [ + { + "git-tree": "de13e6b66833cb816a0f85528697c7ee63be89ae", + "version": "1.11.2", + "port-version": 0 + }, + { + "git-tree": "ae7e310067c34beca24a055b9b25e24fe1b42190", + "version": "1.11.1", + "port-version": 0 + }, + { + "git-tree": "6dec8737e7e8e89f212ae2ab75c55c6e977d8ab8", + "version-semver": "1.11.0", + "port-version": 2 + }, + { + "git-tree": "83279266114bf6eab34a86e6009313e10f3aa11e", + "version-semver": "1.11.0", + "port-version": 1 + }, + { + "git-tree": "e8f4d5c1548d23526e05b069ee626d7d7f9a4399", + "version-semver": "1.11.0", + "port-version": 0 + }, + { + "git-tree": "e9c709300900158cdfcad75965e85b04413c8d5b", + "version-semver": "1.10.1", + "port-version": 5 + }, + { + "git-tree": "e5bc44534a1611fd4c61e92eb0e747d038225f02", + "version-semver": "1.10.1", + "port-version": 4 + }, + { + "git-tree": "cfe171c7ba27d9319ec61d5972aa249df4d025b8", + "version-string": "1.10.1", + "port-version": 3 + }, + { + "git-tree": "fa9929ec29186d2a5866bf03a2dfe667cc5fd898", + "version-string": "1.10.1", + "port-version": 2 + }, + { + "git-tree": "1b170d2e7ff8af64a359070c03a7e430ce9111c2", + "version-string": "1.10.1", + "port-version": 1 + }, + { + "git-tree": "efca0938f364300ca8fe34bf92a67f8a90720c93", + "version-string": "1.10.1", + "port-version": 0 + }, + { + "git-tree": "2463e8b06eb130563218f4b93110eeb1a8e05a71", + "version-string": "1.9.2", + "port-version": 4 + }, + { + "git-tree": "058cd4d646754bf68aea068744f5e21e5442cee6", + "version-string": "1.9.2", + "port-version": 3 + }, + { + "git-tree": "3a334472d14a19eaebc6e94d6b70c720b708d234", + "version-string": "1.9.2-2", + "port-version": 0 + }, + { + "git-tree": "a42c7b13669dfb22cb2acc7ed598a3b219e46e4b", + "version-string": "1.9.2-1", + "port-version": 0 + }, + { + "git-tree": "4d6f55f64b030aeeb5924ae6916b27cc10d32670", + "version-string": "1.9.2", + "port-version": 0 + }, + { + "git-tree": "bf5b277bc6aca291f543b0a488257e387bd97321", + "version-string": "2.0.0-pre-3", + "port-version": 0 + }, + { + "git-tree": "8a40a8529441a423559223af8c4c9bdf7e9abcc4", + "version-string": "2.0.0-pre-2", + "port-version": 0 + }, + { + "git-tree": "ac5c289cac64531de9e626955f8f0e64960175ee", + "version-string": "2.0.0-pre-1", + "port-version": 0 + }, + { + "git-tree": "f1301ee2e48db33ee285b9b1fa51e365e41b0af3", + "version-string": "2.0.0-pre", + "port-version": 0 + }, + { + "git-tree": "a4e2c0b1b847fd75419a7c6133631bf7b12c9a75", + "version-string": "1.9.0-1", + "port-version": 0 + }, + { + "git-tree": "c53eaa53cc6b0f7c1aef9470fe226313d1ca564f", + "version-string": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "6c05e0404dcc333e27140509ed9be3ec02d03421", + "version-string": "1.8.1-2", + "port-version": 0 + }, + { + "git-tree": "c1fcb49a097cff44a577c3910963c15399bb199c", + "version-string": "1.8.1-1", + "port-version": 0 + }, + { + "git-tree": "5125280ba28bac890cf500bb3df417f7238e7a02", + "version-string": "1.8.1", + "port-version": 0 + }, + { + "git-tree": "520046b9d229154ab3a6c9db156ce588ae0625d2", + "version-string": "1.8.0.1", + "port-version": 0 + }, + { + "git-tree": "13d05f50bbfd035f3c9ad91d05f7d2a6ff1cf5ed", + "version-string": "1.7.8-2", + "port-version": 0 + }, + { + "git-tree": "47cc7722a606ca76b3844e37d8cddf77d0ab09e7", + "version-string": "1.7.8-1", + "port-version": 0 + }, + { + "git-tree": "3cbce0faeb27f2b123437085d15f9ea87ef8cf7b", + "version-string": "1.7.8", + "port-version": 0 + }, + { + "git-tree": "ca706ad255bb3d88b7d419368cc578cbc5ea8c8e", + "version-string": "1.7.6-4", + "port-version": 0 + }, + { + "git-tree": "f4c302c1ac9f3cd2a0619ad5fdf31462ab591db4", + "version-string": "1.7.6-3", + "port-version": 0 + }, + { + "git-tree": "a8881e552c32c0a71a77d3ad75f0ea1d1bdf679c", + "version-string": "1.7.6-2", + "port-version": 0 + }, + { + "git-tree": "33b5b927b5ef57b6e5f20882d36f0a74f479154d", + "version-string": "1.7.6-1", + "port-version": 0 + }, + { + "git-tree": "7c8db8567b3cb678fab656f20d26466965449712", + "version-string": "1.7.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/podofo.json b/externals/vcpkg/versions/p-/podofo.json new file mode 100755 index 000000000..58c25a330 --- /dev/null +++ b/externals/vcpkg/versions/p-/podofo.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "5dd647995b24991182eb684029b8629eb6d66e43", + "version": "0.9.7", + "port-version": 0 + }, + { + "git-tree": "69967a79faa43c4d15f5fc533f44b3d095813d63", + "version-string": "0.9.6", + "port-version": 13 + }, + { + "git-tree": "8ab65ed2018a120250dafbdeadc9ef87957d2cb4", + "version-string": "0.9.6", + "port-version": 12 + }, + { + "git-tree": "d343d8239896a8620dcd804a062309b2e7b75205", + "version-string": "0.9.6-11", + "port-version": 0 + }, + { + "git-tree": "3251a5817d1c7bfd5b5f0c38f188c4401d5023ab", + "version-string": "0.9.6-9", + "port-version": 0 + }, + { + "git-tree": "1578a8300dddbd91ceaab3142f14b41491f4e099", + "version-string": "0.9.6-8", + "port-version": 0 + }, + { + "git-tree": "1ca1a8fbcfbdee75df7a36f8822f9c5b77c150b8", + "version-string": "0.9.6-7", + "port-version": 0 + }, + { + "git-tree": "8ce2354b64ebde4e7a5ed1f40541ade3faefd148", + "version-string": "0.9.6-6", + "port-version": 0 + }, + { + "git-tree": "ef7f769bde445c0ae62f7af85080f7eeeecc0d44", + "version-string": "0.9.6-5", + "port-version": 0 + }, + { + "git-tree": "1c9e392b1092734d6fa34deaccc4317a24d7867d", + "version-string": "0.9.6-3", + "port-version": 0 + }, + { + "git-tree": "7f0a9c0e63284969bee5d7fd0b79c5ce8f65f30f", + "version-string": "0.9.6-1", + "port-version": 0 + }, + { + "git-tree": "313a5f2a909755ef66774219d85a33a31dc13c8c", + "version-string": "0.9.6", + "port-version": 0 + }, + { + "git-tree": "77ef53eb66ccecbe1f24a2b6015fdf25c2ed12c6", + "version-string": "0.9.5-2", + "port-version": 0 + }, + { + "git-tree": "e86929ac51807752c0a8331a9b02bd8371835f44", + "version-string": "0.9.5-1", + "port-version": 0 + }, + { + "git-tree": "dd20fcb39c7a221402a34bd4f0aaf4ff779a6602", + "version-string": "0.9.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/poissonrecon.json b/externals/vcpkg/versions/p-/poissonrecon.json new file mode 100755 index 000000000..1a36392ed --- /dev/null +++ b/externals/vcpkg/versions/p-/poissonrecon.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "348d630875a1490f69ad33854ef06a52792a2f88", + "version-date": "2021-09-26", + "port-version": 0 + }, + { + "git-tree": "cd642f0dd6c4e1c92eebd490c70eb2e14a0e8e3d", + "version-string": "2019-09-15", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/poly2tri.json b/externals/vcpkg/versions/p-/poly2tri.json new file mode 100755 index 000000000..070277383 --- /dev/null +++ b/externals/vcpkg/versions/p-/poly2tri.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "03cdd793a8f279b18df99f74bf4eef1e24ad5809", + "version-string": "2020-07-21", + "port-version": 2 + }, + { + "git-tree": "5202b2e184ce5e7fff3bd268797addd62e9a23c6", + "version-string": "2020-07-21", + "port-version": 1 + }, + { + "git-tree": "94527e6f87fb6b8d1ebe5362689b03c12f32ab64", + "version-string": "2020-07-21", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/polyclipping.json b/externals/vcpkg/versions/p-/polyclipping.json new file mode 100755 index 000000000..df88ddb4c --- /dev/null +++ b/externals/vcpkg/versions/p-/polyclipping.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "9e4c4bb3964361c1db87e2bdc368e5e32d0bb213", + "version-string": "6.4.2", + "port-version": 10 + }, + { + "git-tree": "6701622648b7f5ab04e6552b312d1cd8543de99c", + "version-string": "6.4.2", + "port-version": 9 + }, + { + "git-tree": "715616bd21d5d75a9101ac86da0188263b9774c9", + "version-string": "6.4.2", + "port-version": 8 + }, + { + "git-tree": "25fcf0404b9a7c414b238c0973b4aa43d7bbd6e2", + "version-string": "6.4.2", + "port-version": 7 + }, + { + "git-tree": "78ba6625af13a277933f9fabf45a755b9be3a43d", + "version-string": "6.4.2", + "port-version": 6 + }, + { + "git-tree": "0c57e2586514c74ee70e876457660ddc16984b36", + "version-string": "6.4.2", + "port-version": 5 + }, + { + "git-tree": "6638257385c48301e0df40241b00e4060b9336fb", + "version-string": "6.4.2-4", + "port-version": 0 + }, + { + "git-tree": "ebeeb41cb633f0ca508d1374ec7434309bd17028", + "version-string": "6.4.2-2", + "port-version": 0 + }, + { + "git-tree": "bd1eb98d3ae50cf2f6417b55544383fcc18435e7", + "version-string": "6.4.2-1", + "port-version": 0 + }, + { + "git-tree": "d791145197734667dabb01541241f71dd8c29bad", + "version-string": "6.4.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/polyhook2.json b/externals/vcpkg/versions/p-/polyhook2.json new file mode 100755 index 000000000..33d7a2951 --- /dev/null +++ b/externals/vcpkg/versions/p-/polyhook2.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "bd2324e09d967fab5a098f0c2d42682abf5b4113", + "version-date": "2022-03-01", + "port-version": 0 + }, + { + "git-tree": "106988bbbfbb0402ee0263e7d71753b4df830a5d", + "version-date": "2022-02-21", + "port-version": 0 + }, + { + "git-tree": "8ad15683e3f77fd7301903e9dab7aa57302f4e80", + "version-date": "2022-02-06", + "port-version": 0 + }, + { + "git-tree": "519f086961afed4ccad13eb8d56ac009221f1714", + "version-date": "2022-02-02", + "port-version": 0 + }, + { + "git-tree": "bae35bd5e732a2468beb53b4407668d515204514", + "version-date": "2021-05-09", + "port-version": 2 + }, + { + "git-tree": "9b4af767d959bb37711e474327acba689127749c", + "version-string": "2021-05-09", + "port-version": 1 + }, + { + "git-tree": "a7b98cc69b89dfd9f776ef1b95f26d784fd3b82b", + "version-string": "2021-05-09", + "port-version": 0 + }, + { + "git-tree": "ed53517a6b3c746ae38fa66fc3f53e4a0995a3c7", + "version-string": "2021-01-08", + "port-version": 0 + }, + { + "git-tree": "b5584f0169f2455b61d60f8fd53c0d4e0fa2732f", + "version-string": "2020-09-22", + "port-version": 0 + }, + { + "git-tree": "5570afa11a3c704891576874a8f3c5b2f1420682", + "version-string": "2020-08-29", + "port-version": 0 + }, + { + "git-tree": "582062382c942f52c716b612b62d045300ed8d60", + "version-string": "2020-08-04", + "port-version": 0 + }, + { + "git-tree": "ea0293814778b470678a53fe04aa953bffa7e16e", + "version-string": "2020-07-01", + "port-version": 0 + }, + { + "git-tree": "cb20be3ef49ae4e063a9303cc14f500c165a1b08", + "version-string": "2020-06-02", + "port-version": 0 + }, + { + "git-tree": "fdc326330ba975c2114378381187bf180e359566", + "version-string": "2020-05-25", + "port-version": 0 + }, + { + "git-tree": "e747dc136e590035c296c2c9d20e28e6d34de4dd", + "version-string": "2020-02-17", + "port-version": 0 + }, + { + "git-tree": "02a89afa85894c3f8bcf50600367748fe277f859", + "version-string": "2020-02-03", + "port-version": 0 + }, + { + "git-tree": "a574ec9d108a30941e2f4c1cb90a3899c6a9d540", + "version-string": "2019-10-24", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/polymorphic-value.json b/externals/vcpkg/versions/p-/polymorphic-value.json new file mode 100755 index 000000000..0def53380 --- /dev/null +++ b/externals/vcpkg/versions/p-/polymorphic-value.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "439fca88a0bc0bf3bb8639dafe418eed9b21214b", + "version": "1.3.0", + "port-version": 3 + }, + { + "git-tree": "5eeefe34f5fbc12cbf9c7b1a6cd231bf0c455d6e", + "version-string": "1.3.0", + "port-version": 2 + }, + { + "git-tree": "e94e16bfe381140ba157f4e9224f12c273134f56", + "version-string": "1.3.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/ponder.json b/externals/vcpkg/versions/p-/ponder.json new file mode 100755 index 000000000..0ba234e3e --- /dev/null +++ b/externals/vcpkg/versions/p-/ponder.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "82147bc05cb5c080baabe1085f8ab690f71ba6e2", + "version-string": "3.0.0", + "port-version": 4 + }, + { + "git-tree": "84acf8367d19d188309207790cc07c149e0464f3", + "version-string": "3.0.0", + "port-version": 3 + }, + { + "git-tree": "07af14a9b06787eef8901b771c95aa0633f50c07", + "version-string": "3.0.0", + "port-version": 2 + }, + { + "git-tree": "2cb0155853b202ebf943fc6668096bd8aae75681", + "version-string": "3.0.0-1", + "port-version": 0 + }, + { + "git-tree": "69a8598d2fd87136792a4cf8ec6361027864a6ac", + "version-string": "3.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/poppler.json b/externals/vcpkg/versions/p-/poppler.json new file mode 100755 index 000000000..275069c77 --- /dev/null +++ b/externals/vcpkg/versions/p-/poppler.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "2d14bc508abd0861bda1a16290ad65b061a82b7c", + "version": "22.3.0", + "port-version": 1 + }, + { + "git-tree": "9928fbfbe44a32d0a4ff7efed4de2a7797958322", + "version": "22.3.0", + "port-version": 0 + }, + { + "git-tree": "139058e4ec62f875c5538cbd1577c95938183364", + "version": "22.2.0", + "port-version": 0 + }, + { + "git-tree": "3f15f5c09cc977692e0c081d39e7e85f2229efe1", + "version": "20.12.1", + "port-version": 6 + }, + { + "git-tree": "a864cfe9349a7922e6ce0d44a28f6845a40597e0", + "version": "20.12.1", + "port-version": 5 + }, + { + "git-tree": "39df7895fae1b7440dd7c453679f6e0d782a8a5a", + "version-string": "20.12.1", + "port-version": 4 + }, + { + "git-tree": "a6d078aca2d1c5803ddd287701692b891856c3fd", + "version-string": "20.12.1", + "port-version": 3 + }, + { + "git-tree": "acfc09df4e386e910884ee45b13e79c7ecb23d29", + "version-string": "20.12.1", + "port-version": 2 + }, + { + "git-tree": "0013a59da0ab4b64edda0dcd765fe0ed708f62fb", + "version-string": "20.12.1", + "port-version": 1 + }, + { + "git-tree": "d5e39a3713134a5c03c446550831a88757810558", + "version-string": "20.12.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/popsift.json b/externals/vcpkg/versions/p-/popsift.json new file mode 100755 index 000000000..f1bc9ec3c --- /dev/null +++ b/externals/vcpkg/versions/p-/popsift.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "b3c9c601da86fd7d73cf3cb8b00c08ddb390acdd", + "version": "0.9", + "port-version": 3 + }, + { + "git-tree": "c4901cdc3f98676dba684b75fd292b6570a46d35", + "version-string": "0.9", + "port-version": 2 + }, + { + "git-tree": "49604b01944c87f8f02ca1fec85a243398d66d5d", + "version-string": "0.9", + "port-version": 1 + }, + { + "git-tree": "807871ff30d3f2e5f40fbe3ff72dde0254b30c8d", + "version-string": "0.9", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/portable-snippets.json b/externals/vcpkg/versions/p-/portable-snippets.json new file mode 100755 index 000000000..80d2d3d39 --- /dev/null +++ b/externals/vcpkg/versions/p-/portable-snippets.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "c955bc2bba510d1fd09122a7b16f8eff1284d922", + "version-date": "2019-09-20", + "port-version": 2 + }, + { + "git-tree": "7a24a15b684910521e29c4b5e2c6660329f306c9", + "version-string": "2019-09-20", + "port-version": 1 + }, + { + "git-tree": "fa4d8c8fa1130e0dd575f168be6d47971a1b14be", + "version-string": "2019-09-20", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/portaudio.json b/externals/vcpkg/versions/p-/portaudio.json new file mode 100755 index 000000000..34cfaa0f4 --- /dev/null +++ b/externals/vcpkg/versions/p-/portaudio.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "ecfe7da0a3a51b33e76443799786bbcce7646f27", + "version": "19.7", + "port-version": 3 + }, + { + "git-tree": "b090c514cbfce25b342a884efc937ede432df55a", + "version": "19.7", + "port-version": 2 + }, + { + "git-tree": "d6254fa08fb9fd57617978cdc98a3890bc1205d1", + "version": "19.7", + "port-version": 1 + }, + { + "git-tree": "649b9ae44725c4e6fb4dd012f6202415424ffb1f", + "version": "19.7", + "port-version": 0 + }, + { + "git-tree": "5c048383171fcac71dd7b78d6d5e8821d0956c65", + "version-date": "2020-02-20", + "port-version": 0 + }, + { + "git-tree": "9e434db8e8407121b84aa66774792451540eec9d", + "version-string": "2020-02-02", + "port-version": 2 + }, + { + "git-tree": "35bf02f54208d73d88fff556a5d65f5c63af6a97", + "version-string": "2020-02-02", + "port-version": 1 + }, + { + "git-tree": "8209265130c2596af28b15b92642050ddae87da6", + "version-string": "2020-02-02", + "port-version": 0 + }, + { + "git-tree": "cb0380cfbf708cc7f0a8bdf1a0b00ac12926c909", + "version-string": "2019-11-5", + "port-version": 0 + }, + { + "git-tree": "19b309569091809457d1d8c4165b2fcf690ec298", + "version-string": "2019-09-30", + "port-version": 0 + }, + { + "git-tree": "4e98d98d274435fa25aae4c9a3d91d1d6025f499", + "version-string": "19.0.6.00-5", + "port-version": 0 + }, + { + "git-tree": "cdb33c18459ea0d4aa202be5ef3237ca35b71237", + "version-string": "19.0.6.00-4", + "port-version": 0 + }, + { + "git-tree": "7ca0d713d63eb2a144a457809f170f29c70bd6f1", + "version-string": "19.0.6.00-3", + "port-version": 0 + }, + { + "git-tree": "225f820f7dd94fe633ef57a5b727a8fc9bba6cd3", + "version-string": "19.0.6.00-2", + "port-version": 0 + }, + { + "git-tree": "e5c0610981f0ef463185623d48372e4b66eb74d6", + "version-string": "19.0.6.00-1", + "port-version": 0 + }, + { + "git-tree": "b42e5c2d3000679a6a35531a7ddba85162e96f7c", + "version-string": "19.0.6.00", + "port-version": 0 + }, + { + "git-tree": "dd52244f33f317b66a9f53776e1705916cb3ca63", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/portmidi.json b/externals/vcpkg/versions/p-/portmidi.json new file mode 100755 index 000000000..2cbea12a1 --- /dev/null +++ b/externals/vcpkg/versions/p-/portmidi.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "9aba0f6770f874c56c8e8bebf2a6a9b3edbe899a", + "version": "2.0.2", + "port-version": 1 + }, + { + "git-tree": "a32d3d5e0e58e38089378c3f723f2b4862714a4c", + "version": "2.0.2", + "port-version": 0 + }, + { + "git-tree": "4d58125fb4cf188de9f9485bc5064ae2eaf982c4", + "version": "2.0.1", + "port-version": 0 + }, + { + "git-tree": "e4d17cd16212900720faf6d5895734341e5b269d", + "version": "0.234", + "port-version": 3 + }, + { + "git-tree": "70a85d5a9ddc162df4c7296caf7ac8633089d50c", + "version-string": "0.234", + "port-version": 2 + }, + { + "git-tree": "74273108463488d1c268248429a06de79521506b", + "version-string": "0.234", + "port-version": 1 + }, + { + "git-tree": "16f079de23d02226d49bd22659392d85e568528e", + "version-string": "0.234", + "port-version": 0 + }, + { + "git-tree": "e84fe90512135eb1d429ebe5b3660b95ba150acf", + "version-string": "0.217.1-4", + "port-version": 0 + }, + { + "git-tree": "81ea54a270a2ed1f23f9b73cbe18607e69237bc6", + "version-string": "0.217.1-2", + "port-version": 0 + }, + { + "git-tree": "a9037e4857e3476c24225de3468e2a25d90bb7a4", + "version-string": "0.217.1-1", + "port-version": 0 + }, + { + "git-tree": "275c19d6b87e6ee4d188524ffc631d52509a8d43", + "version-string": "0.217.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/portsmf.json b/externals/vcpkg/versions/p-/portsmf.json new file mode 100755 index 000000000..807b4337a --- /dev/null +++ b/externals/vcpkg/versions/p-/portsmf.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "60b00990b46bbac28e91a94533d212be1af49ffb", + "version": "0.238", + "port-version": 1 + }, + { + "git-tree": "6edc5e2a3d90cd44a65b5d0f28207b5eb3c2dec5", + "version": "0.238", + "port-version": 0 + }, + { + "git-tree": "4d9de0a9782866958a9aafdfa6cde176c0867dfc", + "version": "0.236", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/ppconsul.json b/externals/vcpkg/versions/p-/ppconsul.json new file mode 100755 index 000000000..a9592c3a5 --- /dev/null +++ b/externals/vcpkg/versions/p-/ppconsul.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "5f08036342cef58a0f47fc01fe02bdf5c8e5d09c", + "version-string": "0.5", + "port-version": 3 + }, + { + "git-tree": "8c7383164dcbe93141eb683eeeb362381ebbd4cd", + "version-string": "0.5", + "port-version": 2 + }, + { + "git-tree": "8d87f4681edc04101293dceede444307d3b3e4da", + "version-string": "0.5-1", + "port-version": 0 + }, + { + "git-tree": "d73d0eccdded9b4d4e17a0e06e9fdaa48fe8bd88", + "version-string": "0.5", + "port-version": 0 + }, + { + "git-tree": "b102c1f7fb7563dab481fbb4e82a63170e784608", + "version-string": "0.4-1", + "port-version": 0 + }, + { + "git-tree": "2dfb691c0d203d99ae04525884e47f1bd150ba36", + "version-string": "0.4", + "port-version": 0 + }, + { + "git-tree": "655faaaa2419231047daafa3fd94e23ad1801820", + "version-string": "0.3-1", + "port-version": 0 + }, + { + "git-tree": "3414a1308998fdd15ff0251bef046bd8f560cd4e", + "version-string": "0.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/ppmagic.json b/externals/vcpkg/versions/p-/ppmagic.json new file mode 100755 index 000000000..e631a8826 --- /dev/null +++ b/externals/vcpkg/versions/p-/ppmagic.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "7b985dc0f03d5df0b9fb71e88c3a3a4ab0b05d56", + "version-string": "2020-07-03", + "port-version": 1 + }, + { + "git-tree": "0b75e26449d39ec184736dccbb705d6bf6339769", + "version-string": "2020-07-03", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pprint.json b/externals/vcpkg/versions/p-/pprint.json new file mode 100755 index 000000000..68a353f4d --- /dev/null +++ b/externals/vcpkg/versions/p-/pprint.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "6effdf4255c5de8d438a59353b24ec85eaa5999b", + "version-string": "2019-07-19", + "port-version": 1 + }, + { + "git-tree": "50e0ad722aa664d49e1591326bf0f1605c1e620c", + "version-string": "2019-07-19", + "port-version": 0 + }, + { + "git-tree": "4788b53779830e8794d2e7454ef2b1bb51f3d652", + "version-string": "2019-06-01", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pqp.json b/externals/vcpkg/versions/p-/pqp.json new file mode 100755 index 000000000..c3573cdb7 --- /dev/null +++ b/externals/vcpkg/versions/p-/pqp.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "a22b046882068cde7e310e6fcfdf73bbc1b154d5", + "version-string": "1.3", + "port-version": 5 + }, + { + "git-tree": "e44d9679087bf6c036f2d5c647369669f6d4d581", + "version-string": "1.3-4", + "port-version": 0 + }, + { + "git-tree": "44016a5bd4c52eb43998f5ac89ee6ec18106d48d", + "version-string": "1.3-3", + "port-version": 0 + }, + { + "git-tree": "454c261dca0f32373302769c7da05d5da2a9c29b", + "version-string": "1.3-2", + "port-version": 0 + }, + { + "git-tree": "4e0d656e7daf5517b5ef80b810232b7ce9aad9c3", + "version-string": "1.3-1", + "port-version": 0 + }, + { + "git-tree": "ad76367a1b28e284ffcf1eecd8a246e1b4246cf1", + "version-string": "1.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/presentmon.json b/externals/vcpkg/versions/p-/presentmon.json new file mode 100755 index 000000000..23521c07a --- /dev/null +++ b/externals/vcpkg/versions/p-/presentmon.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "daf02980cb0bef9bd56209e550d134f2bc06c699", + "version-semver": "1.7.0", + "port-version": 1 + }, + { + "git-tree": "0d57616105f23dbcceb4477bb30354e0d3e4a5b6", + "version-semver": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "581eeeb1e8761811f3393a6cd0e4041609b162d0", + "version-string": "1.6.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/proj.json b/externals/vcpkg/versions/p-/proj.json new file mode 100755 index 000000000..59f4dd4bc --- /dev/null +++ b/externals/vcpkg/versions/p-/proj.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "1566fbbbd7d8abba35cebac6c8821339d1da1d16", + "version": "9.0.0", + "port-version": 0 + }, + { + "git-tree": "a90853a886ef1a9425ad477bc996b99c0824ff33", + "version-string": "0", + "port-version": 1 + }, + { + "git-tree": "759fac2f92b6fe903300aa2a91f4fd39b6c16911", + "version-string": "0", + "port-version": 0 + }, + { + "git-tree": "a5961e4930dea226aa16beb019e6ea2a9dbd5ba7", + "version-string": "4.9.3-1", + "port-version": 0 + }, + { + "git-tree": "bcf202e0b0a9b78f183a3b8c3b1cd7494c1df516", + "version-string": "4.9.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/proj4.json b/externals/vcpkg/versions/p-/proj4.json new file mode 100755 index 000000000..664453931 --- /dev/null +++ b/externals/vcpkg/versions/p-/proj4.json @@ -0,0 +1,144 @@ +{ + "versions": [ + { + "git-tree": "284d584afb127d11beb4126bf1ee7eccef413229", + "version-semver": "8.9.9", + "port-version": 1 + }, + { + "git-tree": "4ccf46b756dabd4cd841b866dcd5491d84a946e1", + "version-semver": "8.9.9", + "port-version": 0 + }, + { + "git-tree": "de72240f9bceda0263f58b734ab6de4f97632dbe", + "version-semver": "8.2.1", + "port-version": 1 + }, + { + "git-tree": "97a7f5c2cabaf598c15dc357d0e53d5c44e10225", + "version-semver": "8.2.1", + "port-version": 0 + }, + { + "git-tree": "d40a44623b794f07f5362653b6efd7efc16cc832", + "version-semver": "8.1.1", + "port-version": 0 + }, + { + "git-tree": "f1939ed4483f6f1d75f6ddacb6a741090144bcfb", + "version-semver": "8.0.0", + "port-version": 0 + }, + { + "git-tree": "991dc069b2b9acb50da346e27f48100d5d8f8186", + "version-semver": "7.2.1", + "port-version": 7 + }, + { + "git-tree": "a7d82e5f8d67636114f179f44b7277f818e3754c", + "version-semver": "7.2.1", + "port-version": 6 + }, + { + "git-tree": "aa22133ae2355b540a2676402896abc323f26aa9", + "version-semver": "7.2.1", + "port-version": 5 + }, + { + "git-tree": "dee626b6811eafe58cf40fbceeb3cc28dfaf678c", + "version-semver": "7.2.1", + "port-version": 4 + }, + { + "git-tree": "8fc1b6bdde08a3b1f131df5a4f042885dcc7a58d", + "version-string": "7.2.1", + "port-version": 3 + }, + { + "git-tree": "e692e884172877640f3de4009d810061382714b7", + "version-string": "7.2.1", + "port-version": 2 + }, + { + "git-tree": "0c1b88cfe555f41f69ccd31d61cf695d07d5753f", + "version-string": "7.2.1", + "port-version": 1 + }, + { + "git-tree": "5106324dbb2ce3a08bb9603c5f458aabb67d2a27", + "version-string": "7.2.1", + "port-version": 0 + }, + { + "git-tree": "db5c7e1a6ca59c830b517afa4b1da4858cca572c", + "version-string": "7.2.0", + "port-version": 0 + }, + { + "git-tree": "ae4d3d842f78775ae6853f7287d352dcb2c399f0", + "version-string": "6.3.1", + "port-version": 3 + }, + { + "git-tree": "d61fd71fc884098c7b308c3e92e28aacbcf3147e", + "version-string": "6.3.1", + "port-version": 2 + }, + { + "git-tree": "1794a541f79432fd1e4ee7de8f762470d626daea", + "version-string": "6.3.1-1", + "port-version": 0 + }, + { + "git-tree": "e43c6950e99fb4c82f2075cb591b5551be990a1a", + "version-string": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "96f269885f42ae4c668c5137009caedb9babea88", + "version-string": "6.3.0-1", + "port-version": 0 + }, + { + "git-tree": "c58093d47083f58577234946c20c981a7a8acdcf", + "version-string": "6.2.1-2", + "port-version": 0 + }, + { + "git-tree": "00ae9580b4e332d34a5a927930836337f0124acb", + "version-string": "6.2.1-1", + "port-version": 0 + }, + { + "git-tree": "cf3cb44f2480efb1fba4adf514d8a161721c6abe", + "version-string": "6.2.0-1", + "port-version": 0 + }, + { + "git-tree": "c4a17eb19ce54398ddc778dec9872870108a647d", + "version-string": "6.1.1-1", + "port-version": 0 + }, + { + "git-tree": "6b4bc570952d631582e1cd0173c7ca74e4d7aa25", + "version-string": "4.9.3-5", + "port-version": 0 + }, + { + "git-tree": "2ec9b654fb4959db87d8b6a3b5f4904dabf7437d", + "version-string": "4.9.3-4", + "port-version": 0 + }, + { + "git-tree": "937e8a11cb7e6bef3438973c66c4baba626f1c90", + "version-string": "4.9.3-3", + "port-version": 0 + }, + { + "git-tree": "9525e39b44ba2dc76975e05be537797861a38df1", + "version-string": "4.9.3-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/prometheus-cpp.json b/externals/vcpkg/versions/p-/prometheus-cpp.json new file mode 100755 index 000000000..142866b1a --- /dev/null +++ b/externals/vcpkg/versions/p-/prometheus-cpp.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "99e611dca8f7a6f529e867a6c6f6f88bae8705a6", + "version-semver": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "8f679ed963f525e155342a6be082d02e03c96856", + "version-semver": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "ae46bbdb51c6ff3e330c607e46b911b79e0ce7e3", + "version-semver": "0.13.0", + "port-version": 0 + }, + { + "git-tree": "4656585ffca17e789395f30f4ee6a301cff7f34e", + "version-string": "0.12.3", + "port-version": 1 + }, + { + "git-tree": "78cf4d97293c0baf7ef735035944c6859d06c980", + "version-string": "0.12.3", + "port-version": 0 + }, + { + "git-tree": "bcbc7c9c58b3cfd8b1559bab7816b46edf8f2af6", + "version-string": "0.12.2", + "port-version": 0 + }, + { + "git-tree": "be1b7db5fe2c186c52cd074caa038874d27e245f", + "version-string": "0.12.1", + "port-version": 0 + }, + { + "git-tree": "c86b33f02ac3a4e3c0fa288cf033a15238f24a7a", + "version-string": "0.11.0", + "port-version": 0 + }, + { + "git-tree": "8e66ca919082f0ccf735b51100dc6c065fe96944", + "version-string": "0.10.0", + "port-version": 0 + }, + { + "git-tree": "9b66fec0d59fac266b23fcc991c85360fa35561d", + "version-string": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "09127f6d3d36f989e60d62c713725c0dbc9a7196", + "version-string": "0.8.0", + "port-version": 0 + }, + { + "git-tree": "c9d3bcd59e845a9f42589674ed2c84e3b4e389f8", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "068eb8e03eb06c747321598dd011eb164d5cd316", + "version-string": "0.6.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/promise-cpp.json b/externals/vcpkg/versions/p-/promise-cpp.json new file mode 100755 index 000000000..63ec6b263 --- /dev/null +++ b/externals/vcpkg/versions/p-/promise-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ebacf13f64f6bab1413ec0e45d16259c8cf78279", + "version": "2.1.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/protobuf-c.json b/externals/vcpkg/versions/p-/protobuf-c.json new file mode 100755 index 000000000..7d592e599 --- /dev/null +++ b/externals/vcpkg/versions/p-/protobuf-c.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "649c1df0b6207662ec75fed4bbd999a7a42afb4b", + "version-semver": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "7786538f69991494262bd14f710e2dd8c6062bea", + "version-string": "1.3.2", + "port-version": 3 + }, + { + "git-tree": "7e0935e2eef085a194274de34e3ee9c39f4ba8d4", + "version-string": "1.3.2-2", + "port-version": 0 + }, + { + "git-tree": "7807e915cd2775e8cb48bb6b8ae38e90962b0b4c", + "version-string": "1.3.2-1", + "port-version": 0 + }, + { + "git-tree": "86d374ae34e700b0e30967a7e0919f405243f1aa", + "version-string": "1.3.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/protobuf.json b/externals/vcpkg/versions/p-/protobuf.json new file mode 100755 index 000000000..fab9f2a67 --- /dev/null +++ b/externals/vcpkg/versions/p-/protobuf.json @@ -0,0 +1,294 @@ +{ + "versions": [ + { + "git-tree": "984039810172eb397ca0ec6d426d60764d6dfe46", + "version-semver": "3.19.4", + "port-version": 0 + }, + { + "git-tree": "5f6aa04d94e184b89c1887946fb4684bc51c4611", + "version-semver": "3.18.0", + "port-version": 1 + }, + { + "git-tree": "19c2bf45c235e6126161bae36aa7ff7e1fcda479", + "version-semver": "3.18.0", + "port-version": 0 + }, + { + "git-tree": "6204194eaf9d8ff0fe78d498f77fee57cd19ce59", + "version-semver": "3.15.8", + "port-version": 4 + }, + { + "git-tree": "88066eeef097b56edc3bff316ce292d57c132d12", + "version-semver": "3.15.8", + "port-version": 3 + }, + { + "git-tree": "1c52c3eb43c2dfd9603673eb5c173ec69c21ea73", + "version-semver": "3.15.8", + "port-version": 2 + }, + { + "git-tree": "04dc7ffb4ebb123e734652cdb359ff18dca83ffc", + "version-semver": "3.15.8", + "port-version": 1 + }, + { + "git-tree": "1ffb8fef5a5ded5a0350fee3550cad324017e89a", + "version-semver": "3.15.8", + "port-version": 0 + }, + { + "git-tree": "d60f4db7f63f55aa3b9be8c8848f2d492cab577f", + "version-string": "3.14.0", + "port-version": 4 + }, + { + "git-tree": "9f8c80db7cf8a925199facba3ba0c6c8436c41c8", + "version-string": "3.14.0", + "port-version": 3 + }, + { + "git-tree": "7dcdfe30568d5d0cde6564984e0488ec2c33d9dc", + "version-string": "3.14.0", + "port-version": 2 + }, + { + "git-tree": "2a90dca85ce43bc6cb008cce7d6706e319bc645b", + "version-string": "3.14.0", + "port-version": 1 + }, + { + "git-tree": "93338c61ee41788301d30fc47a06703dfe7d00cc", + "version-string": "3.14.0", + "port-version": 0 + }, + { + "git-tree": "37ec7680dc8556d8f3e885e883df0f45b65bdfd8", + "version-string": "3.13.0", + "port-version": 2 + }, + { + "git-tree": "1b77f50a4717f87f8f49d7e16bfffb967444295a", + "version-string": "3.13.0", + "port-version": 1 + }, + { + "git-tree": "616906043007ddc14c58665295ab09f90888c593", + "version-string": "3.13.0", + "port-version": 0 + }, + { + "git-tree": "70e3020fabfd633eae90121390bf12277bc72432", + "version-string": "3.12.3", + "port-version": 2 + }, + { + "git-tree": "81ca6fdb2d18485a0d88f8b5250e259633c594e6", + "version-string": "3.12.3", + "port-version": 1 + }, + { + "git-tree": "8854bf5f51e661be53a3bf060131c9055b5559a6", + "version-string": "3.12.3", + "port-version": 0 + }, + { + "git-tree": "2610c238aacb8d8008eacf4fb6eea4e757d90d8a", + "version-string": "3.12.0-2", + "port-version": 0 + }, + { + "git-tree": "7f343f48b916c64a057dd4bf5faf102825f2a01d", + "version-string": "3.12.0-1", + "port-version": 0 + }, + { + "git-tree": "8aa6377c35b7359d1ba03dd5bd756295e89d7e84", + "version-string": "3.12.0", + "port-version": 0 + }, + { + "git-tree": "501e137425a77b575aeac98f03346269eefa30f9", + "version-string": "3.11.4-1", + "port-version": 0 + }, + { + "git-tree": "518f9c3e4974e9679744b72d255e9931981235f1", + "version-string": "3.11.4", + "port-version": 0 + }, + { + "git-tree": "22119003eeae77dace6e4466a31a4cd9f7045032", + "version-string": "3.11.3", + "port-version": 0 + }, + { + "git-tree": "72d04ac11c52adfcc18143c98e8e138b1c4a1ade", + "version-string": "3.11.2", + "port-version": 0 + }, + { + "git-tree": "436e74e600349763906901e369ee4d5ea87bfed9", + "version-string": "3.11.0", + "port-version": 0 + }, + { + "git-tree": "cfd5b45bd6ad502a5deca16eff47a8dab5a9653b", + "version-string": "3.10.0", + "port-version": 0 + }, + { + "git-tree": "806a510e0911478aa8f7d325ba4667344e96603f", + "version-string": "3.9.1", + "port-version": 0 + }, + { + "git-tree": "6badf2593ecdc141d6524f5c2b74c25bc5b52238", + "version-string": "3.9.0", + "port-version": 0 + }, + { + "git-tree": "ccbde5e0c8ee8443811c46c036d2a18c4d21bf97", + "version-string": "3.8.0-1", + "port-version": 0 + }, + { + "git-tree": "04fef66a8170f29e3aab879f0ac29510e282491b", + "version-string": "3.8.0", + "port-version": 0 + }, + { + "git-tree": "d4ca0158f6e70a1e7da2026bef886c362feae3ea", + "version-string": "3.7.1", + "port-version": 0 + }, + { + "git-tree": "c653e4ba9f0095e1625e8290831b59372d61cef7", + "version-string": "3.6.1.3-1", + "port-version": 0 + }, + { + "git-tree": "6ea2a0a1e35d5ef5cfb6ce2b9dee2fb44218684d", + "version-string": "3.6.1.3", + "port-version": 0 + }, + { + "git-tree": "61c26d0adc13178cca863b9f989d1e47a59629f3", + "version-string": "3.6.1-4", + "port-version": 0 + }, + { + "git-tree": "51b9e62e8d0ac833c6dac800fb1781710d852c88", + "version-string": "3.6.1-2", + "port-version": 0 + }, + { + "git-tree": "0347f4280de1e795810f417ad5d317f3789f9f7c", + "version-string": "3.6.1-1", + "port-version": 0 + }, + { + "git-tree": "163f58d1f3cc49f32d41bdcd9e51a5a10d1aacc0", + "version-string": "3.6.0.1", + "port-version": 0 + }, + { + "git-tree": "eecff0830dd64da52db74f38dee9d8c504fec8c0", + "version-string": "3.5.1-5", + "port-version": 0 + }, + { + "git-tree": "6430dcd5b4f974c6f51112d371cf5d8281428652", + "version-string": "3.5.1-4", + "port-version": 0 + }, + { + "git-tree": "07e4aaf241ff4f9ad9c3905ff11aded7ca9a8ac8", + "version-string": "3.5.1-3", + "port-version": 0 + }, + { + "git-tree": "8e5fc1acd5bcac32236d1964ea8fa9d5627e39ba", + "version-string": "3.5.1-2", + "port-version": 0 + }, + { + "git-tree": "de08e119eaac29d792d5472cfe0e3af5b8e93fef", + "version-string": "3.5.1-1", + "port-version": 0 + }, + { + "git-tree": "74810a03dfba0b67655fca111e499ac015bb8abc", + "version-string": "3.5.1", + "port-version": 0 + }, + { + "git-tree": "57d52249caee43afee241059150b5247a14aeb4b", + "version-string": "3.5.0-1", + "port-version": 0 + }, + { + "git-tree": "b72952ad592000a034a334b685b67899634da2de", + "version-string": "3.5.0", + "port-version": 0 + }, + { + "git-tree": "4c27dbbc78fb069a2aa5d93f360ab5c4d82c17af", + "version-string": "3.4.1-2", + "port-version": 0 + }, + { + "git-tree": "8142c23c749bf4888e3fa489558738affbe9301a", + "version-string": "3.4.1-1", + "port-version": 0 + }, + { + "git-tree": "b6fd0beef65a76c6efc90b702e61d150f25b62d3", + "version-string": "3.4.0-2", + "port-version": 0 + }, + { + "git-tree": "b7f14b62708beaea299a474df7cc0f12da98f6e7", + "version-string": "3.4.0-1", + "port-version": 0 + }, + { + "git-tree": "f300a8ba1bc984904059d2c9f3f513183dcd03ee", + "version-string": "3.4.0", + "port-version": 0 + }, + { + "git-tree": "34ac38c802bff258a9166b6e125d86cdc1833ace", + "version-string": "3.3.0-3", + "port-version": 0 + }, + { + "git-tree": "2bb3394f614b762bce334b6e02c96745de1dceae", + "version-string": "3.3.0-2", + "port-version": 0 + }, + { + "git-tree": "a9eebf56c81bdf2c5709f6ca8d099fb21b6e8565", + "version-string": "3.3.0-1", + "port-version": 0 + }, + { + "git-tree": "42ec54b658a209d537ea6120c21fe081c1e0530a", + "version-string": "3.3.0", + "port-version": 0 + }, + { + "git-tree": "356bda3330a44573c612a81d53e53994db01fda1", + "version-string": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "06d9998b05218e134dd2d214b84ae72b51f63c52", + "version-string": "3.0.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/protopuf.json b/externals/vcpkg/versions/p-/protopuf.json new file mode 100755 index 000000000..27b29d0ea --- /dev/null +++ b/externals/vcpkg/versions/p-/protopuf.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "1e9aca8dbbf9df6ab5034e57ca3d8e983f55ba05", + "version": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "57399a25b20d4f3a437118a4bc2fe9a639972bb4", + "version-semver": "2.1.0", + "port-version": 1 + }, + { + "git-tree": "8ba0da5deda1a9f0acd728f149206d1c1c5644a1", + "version-semver": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "96530b73da47255f08d702838bc39791a8fcbb32", + "version-semver": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "253908cb8154ef1ef1a04266260c21a7d6f9bfdf", + "version-string": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "bd7a8f750bdae5bd3b872062a8319420d159bcd9", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/protozero.json b/externals/vcpkg/versions/p-/protozero.json new file mode 100755 index 000000000..867cda73c --- /dev/null +++ b/externals/vcpkg/versions/p-/protozero.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "f6fa6a99279f9efb98bafc45707a1bcf9ef690e4", + "version-semver": "1.7.1", + "port-version": 0 + }, + { + "git-tree": "e617bcd5ceeebd89da7229c7daeecacf7581d767", + "version-semver": "1.7.0", + "port-version": 1 + }, + { + "git-tree": "23f6ec11be6bbf623dc7590b128027ccb7f69727", + "version-semver": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "b064bd3211a8ba5ddfe33a49c84bcfa714d1bf8c", + "version-string": "1.6.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/proxygen.json b/externals/vcpkg/versions/p-/proxygen.json new file mode 100755 index 000000000..51842ba59 --- /dev/null +++ b/externals/vcpkg/versions/p-/proxygen.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "27f0950fcf11ac8f561591363715ddf581146325", + "version-string": "2022.03.21.00", + "port-version": 2 + }, + { + "git-tree": "fb9493259e80636642c06b40479c36b6b4c9cba2", + "version-string": "2022.03.21.00", + "port-version": 1 + }, + { + "git-tree": "3d4554283cc0401f123164636046763fa9808475", + "version-string": "2022.03.21.00", + "port-version": 0 + }, + { + "git-tree": "d17fc3eb415126e6e9d5d77eb2de69ffd3c30869", + "version-string": "2022.01.31.00", + "port-version": 0 + }, + { + "git-tree": "8dd3b93e98f28386e8c44f50df2efb4c2bb30ce1", + "version-string": "2021.06.14.00", + "port-version": 1 + }, + { + "git-tree": "a4a04ef230bcd866c6c1a078ac3e11d926333b21", + "version-string": "2021.06.14.00", + "port-version": 0 + }, + { + "git-tree": "bfaabcaacfc585c9597b455a0853c1f4497e6e69", + "version-string": "2020.10.19.00", + "port-version": 0 + }, + { + "git-tree": "939ddfafd81b79b07cec85e0e571a6ef772b47bc", + "version-string": "2019.10.21.00", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/proxywrapper.json b/externals/vcpkg/versions/p-/proxywrapper.json new file mode 100755 index 000000000..0e6297e11 --- /dev/null +++ b/externals/vcpkg/versions/p-/proxywrapper.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "87ca17828b4bfbe4dd133d64f080a6f3ca13989f", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/psimd.json b/externals/vcpkg/versions/p-/psimd.json new file mode 100755 index 000000000..61f3e7034 --- /dev/null +++ b/externals/vcpkg/versions/p-/psimd.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d96e70295af788d6abe87bdad2a48d80f24ecfb5", + "version-string": "2021-02-21", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/ptex.json b/externals/vcpkg/versions/p-/ptex.json new file mode 100755 index 000000000..4c8c95a67 --- /dev/null +++ b/externals/vcpkg/versions/p-/ptex.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "3f04f712745e5fb558f79324199b3fe8c1a00b84", + "version": "2.3.2", + "port-version": 4 + }, + { + "git-tree": "c524a2ab1940315d3481e9fbf745425caf5b7c15", + "version": "2.3.2", + "port-version": 3 + }, + { + "git-tree": "e4ee03f1ba1d9c807b8baee1bd3b1089e71476ca", + "version-string": "2.3.2", + "port-version": 2 + }, + { + "git-tree": "82bc72a7cf8eaaab16d6f5ebad326be237ca368b", + "version-string": "2.3.2-1", + "port-version": 0 + }, + { + "git-tree": "6b7e21ee7ede175aca74a16c54c3dc3e8eec4bfb", + "version-string": "2.3.2", + "port-version": 0 + }, + { + "git-tree": "744551b00fccf63f05cbcfc7005bdc16701bf648", + "version-string": "2.1.28-1", + "port-version": 0 + }, + { + "git-tree": "4ce33a83ea42e1a9559025625e919fbfb45416c3", + "version-string": "2.1.28", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pthread.json b/externals/vcpkg/versions/p-/pthread.json new file mode 100755 index 000000000..eacfe2e53 --- /dev/null +++ b/externals/vcpkg/versions/p-/pthread.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "22a35f55dc3993fb589e44781ae36dbdf1c625fa", + "version-string": "3.0.0", + "port-version": 1 + }, + { + "git-tree": "f26e38024e286875f1e954fb75bda82b3a3329f4", + "version-string": "3.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pthreadpool.json b/externals/vcpkg/versions/p-/pthreadpool.json new file mode 100755 index 000000000..2311710b6 --- /dev/null +++ b/externals/vcpkg/versions/p-/pthreadpool.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "cb803332761faba74d3a5d83ca25b73d3285d397", + "version-date": "2020-04-10", + "port-version": 2 + }, + { + "git-tree": "37e004fa65e21e9ffb647d6ff92cd834a46777cf", + "version-date": "2020-04-10", + "port-version": 1 + }, + { + "git-tree": "da641f8e198df6999638e7a2f0a95e3f143cb595", + "version-date": "2020-04-10", + "port-version": 0 + }, + { + "git-tree": "9c1519f2cc1eb186ccd706a4f634350877da6dba", + "version-date": "2020-02-21", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pthreads.json b/externals/vcpkg/versions/p-/pthreads.json new file mode 100755 index 000000000..78edfdfed --- /dev/null +++ b/externals/vcpkg/versions/p-/pthreads.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "ab9d25f08115355ea2d4e4c6eae94626fa86fded", + "version": "3.0.0", + "port-version": 10 + }, + { + "git-tree": "f5b91f46526fb5abd97b07febd2563f3a3688769", + "version": "3.0.0", + "port-version": 9 + }, + { + "git-tree": "e03999fb593f35daefdea06f7c99af233f3a7f3d", + "version": "3.0.0", + "port-version": 8 + }, + { + "git-tree": "f76c9c365aff8cf663941bbe6dac93379e856345", + "version": "3.0.0", + "port-version": 7 + }, + { + "git-tree": "6251ee2f710bfb8fb8c0177c07ef8fc5d7831aec", + "version-string": "3.0.0-6", + "port-version": 0 + }, + { + "git-tree": "f70c771f0a365c12ba1f6d6b40fc6f779dcdf4e1", + "version-string": "3.0.0-5", + "port-version": 0 + }, + { + "git-tree": "22d86e14b4ca38964fcb441cc47b5e199cb1949a", + "version-string": "3.0.0-4", + "port-version": 0 + }, + { + "git-tree": "fd49e1d7b088f6b250d5b522ef97c16e6bf05a98", + "version-string": "3.0.0-3", + "port-version": 0 + }, + { + "git-tree": "ea16ace179fc176ccc3016df9c48a88445bb540b", + "version-string": "3.0.0-2", + "port-version": 0 + }, + { + "git-tree": "725ed7882a7c39657485f13e42a77449c3bc4b6d", + "version-string": "3.0.0-1", + "port-version": 0 + }, + { + "git-tree": "34c180407a1aca47f3d612fc33f072d4ab08c67b", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "7daebe43cbe87458cd9178837c081148e2fd2012", + "version-string": "2.9.1-5", + "port-version": 0 + }, + { + "git-tree": "69e4173ea87e14526713112cb957c357ca4bdd8e", + "version-string": "2.9.1-4", + "port-version": 0 + }, + { + "git-tree": "154381dee536efbea62e2978a90945ceeff2dae5", + "version-string": "2.9.1-3", + "port-version": 0 + }, + { + "git-tree": "705c6b1e7a3d79d908716a1f9be0eb0da95f10af", + "version-string": "2.9.1-2", + "port-version": 0 + }, + { + "git-tree": "a721cdda5296f4811401d8c8ad4c9df1e841d63e", + "version-string": "2.9.1-1", + "port-version": 0 + }, + { + "git-tree": "32f89da60e527bf453f3870e2ae7df699a8a4609", + "version-string": "2.9.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/ptyqt.json b/externals/vcpkg/versions/p-/ptyqt.json new file mode 100755 index 000000000..c25d7a994 --- /dev/null +++ b/externals/vcpkg/versions/p-/ptyqt.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "8271563b59832be59aa5c34d89b38875c60bc1e5", + "version": "0.6.5", + "port-version": 0 + }, + { + "git-tree": "f1290a650fa42cb4cb9caf9fe04d47d2b3506248", + "version": "0.6.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pugixml.json b/externals/vcpkg/versions/p-/pugixml.json new file mode 100755 index 000000000..51ec0a49c --- /dev/null +++ b/externals/vcpkg/versions/p-/pugixml.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "ffaef9b7ddc94c06bf1293ff4f04906960f0de4c", + "version": "1.12.1", + "port-version": 0 + }, + { + "git-tree": "2af3faa6e86d241d2d6845f27c21afa51741f391", + "version-string": "1.11.4", + "port-version": 1 + }, + { + "git-tree": "64fda47a7f4dd9fc10c60169c4f5e0b069481199", + "version-string": "1.11.4", + "port-version": 0 + }, + { + "git-tree": "3c0bf3af0be3a7df2f1ee8f65223b6fc49947b35", + "version-string": "1.11.1", + "port-version": 0 + }, + { + "git-tree": "b2456795dd215d7a7775984b64996f0c63ea648e", + "version-string": "1.10", + "port-version": 2 + }, + { + "git-tree": "1c0655bd501db1da226ba12180dbeb6f4645a7c3", + "version-string": "1.10-1", + "port-version": 0 + }, + { + "git-tree": "54835b7790a7ee53620c213ace1723e4c5e3e2fb", + "version-string": "1.10", + "port-version": 0 + }, + { + "git-tree": "0236ebae3c255e33c652036790e73a756175cc0e", + "version-string": "1.9-3", + "port-version": 0 + }, + { + "git-tree": "6eedd01c350f4bef43b2cfe7dfc453d865f13046", + "version-string": "1.9-2", + "port-version": 0 + }, + { + "git-tree": "c941bbc462bcab3fa94dbe6a464f5041e16a7c9a", + "version-string": "1.9-1", + "port-version": 0 + }, + { + "git-tree": "a3f8bcd5da3737d17a806dd44bd504bffc3ac8d2", + "version-string": "1.8.1-3", + "port-version": 0 + }, + { + "git-tree": "aafeef62ceacb7e3114738e843ba3d2b906af16b", + "version-string": "1.8.1-2", + "port-version": 0 + }, + { + "git-tree": "172398557141361c21be1283417b6b2c47eb183e", + "version-string": "1.8.1-1", + "port-version": 0 + }, + { + "git-tree": "d01042f4857496f4e0905565298e5412000da32a", + "version-string": "1.8.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pybind11.json b/externals/vcpkg/versions/p-/pybind11.json new file mode 100755 index 000000000..9340b71f1 --- /dev/null +++ b/externals/vcpkg/versions/p-/pybind11.json @@ -0,0 +1,144 @@ +{ + "versions": [ + { + "git-tree": "0723f5ac350935e5d68d8087c82883dffa706812", + "version": "2.9.2", + "port-version": 0 + }, + { + "git-tree": "b1eb3bb762f1ba08ffd2ffb216df9504ed9fda3c", + "version": "2.9.1", + "port-version": 1 + }, + { + "git-tree": "24ea84c002f9cc529a54996dbbf2e9b2cce9cadf", + "version-semver": "2.9.1", + "port-version": 0 + }, + { + "git-tree": "66591866c63bfff5fea690e23a05aa14cad10967", + "version-semver": "2.9.0", + "port-version": 0 + }, + { + "git-tree": "16618fe9543461ee68ba815f511afacbbcfd8330", + "version-semver": "2.8.1", + "port-version": 1 + }, + { + "git-tree": "893da2421e31681611515d8416a8f1a3b4496b5e", + "version-semver": "2.8.1", + "port-version": 0 + }, + { + "git-tree": "b6b211738705fc8bb09ad24e39d6239f8b719aae", + "version-semver": "2.8.0", + "port-version": 0 + }, + { + "git-tree": "a8d7e31e74a9d73e4956e70efbcc0c3490968883", + "version-semver": "2.7.1", + "port-version": 0 + }, + { + "git-tree": "e24d24b2afa6506e1dbea1bb922be82d0f4ffafb", + "version": "2.6.2", + "port-version": 0 + }, + { + "git-tree": "e3d883eb6e3cf9a83a34c3640d049f627d9ab1ae", + "version-string": "2.6.0", + "port-version": 3 + }, + { + "git-tree": "0b20fc25515142265062ab506efe37e01ccfcf4b", + "version-string": "2.6.0", + "port-version": 2 + }, + { + "git-tree": "4e419fd7c279712f8ac1a9efd2b99657e6cefe72", + "version-string": "2.6.0", + "port-version": 1 + }, + { + "git-tree": "7b55ce91d4263c298682c29b1046f933145d6682", + "version-string": "2.6.0", + "port-version": 0 + }, + { + "git-tree": "355c309841bb390c372c761830fa354bee3effaf", + "version-string": "2.5.0", + "port-version": 1 + }, + { + "git-tree": "6a778e691fd5b92c830293679a0724fd812198ab", + "version-string": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "b3072c9585a20208b619b76fbb5dd4bcec680692", + "version-string": "2.4.3", + "port-version": 0 + }, + { + "git-tree": "e82b963fc9ba7d07c93845b6a6125a8a90840706", + "version-string": "2.3.0-1", + "port-version": 0 + }, + { + "git-tree": "a902f398114ef2400e5be0073a842a74c054cf54", + "version-string": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "049b57ca0877925b1f25fd75f0bb4a142d89e541", + "version-string": "2.2.4", + "port-version": 0 + }, + { + "git-tree": "457c121c6f45a093cf83055f0433bcbc32929107", + "version-string": "2.2.3-1", + "port-version": 0 + }, + { + "git-tree": "7cb65f056340c026cd2d7e3609c96d1c709a80d5", + "version-string": "2.2.3", + "port-version": 0 + }, + { + "git-tree": "1c8628b12ac199ac5fdb7d78b91ce28b38527265", + "version-string": "2.2.1", + "port-version": 0 + }, + { + "git-tree": "9fbc58acd0bbf5f674a62de5d6bdb78647c0b3f1", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "acc84454b222e0d40b2573f691a792e76a1b8d5e", + "version-string": "2.1.0-2", + "port-version": 0 + }, + { + "git-tree": "8685415a7bb5d3b25ec970bb5cefb9dd1a36e60c", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "db6dd9f17b3c660c64d71eef6afca9eb8549d9ff", + "version-string": "2.1.0-1", + "port-version": 0 + }, + { + "git-tree": "01b91f9136c68811bc820d0734dacf2016c18935", + "version-string": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "b6075b8a60804d3344c3bc49561c6ee9eea0d677", + "version-string": "2.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/pystring.json b/externals/vcpkg/versions/p-/pystring.json new file mode 100755 index 000000000..ab15494a5 --- /dev/null +++ b/externals/vcpkg/versions/p-/pystring.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "b0b08ff66f53aeb63ab3797212c667a822c88a3e", + "version-semver": "1.1.3", + "port-version": 5 + }, + { + "git-tree": "ed5bf60bd6e1720457de5eaa39f01f5b3a414f01", + "version-semver": "1.1.3", + "port-version": 4 + }, + { + "git-tree": "f79bc19acdfb0e0d9445191d54f89234c27db843", + "version-semver": "1.1.3", + "port-version": 3 + }, + { + "git-tree": "33c038a18b859b695f9e1f7d4618278c9ef14e4a", + "version-string": "1.1.3-2", + "port-version": 0 + }, + { + "git-tree": "15d8cf850d28be04cc1c00fbf158324c195459e7", + "version-string": "1.1.3-1", + "port-version": 0 + }, + { + "git-tree": "73d86c61554e5db2f527b49581025d753309e8b2", + "version-string": "1.1.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/python2.json b/externals/vcpkg/versions/p-/python2.json new file mode 100755 index 000000000..8460f2562 --- /dev/null +++ b/externals/vcpkg/versions/p-/python2.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "33912f36bba22e343da793d7de1a2dde41ab9da0", + "version": "2.7.18", + "port-version": 5 + }, + { + "git-tree": "355e949adaecb1603d0cdc3d690101e49ad9fb13", + "version": "2.7.18", + "port-version": 4 + }, + { + "git-tree": "2a9fb7f96d762e213e9901452492aee00f6fe049", + "version": "2.7.18", + "port-version": 3 + }, + { + "git-tree": "fc1f7aaa8a2312a56ce7dc1324c2eaf608a7a331", + "version": "2.7.18", + "port-version": 2 + }, + { + "git-tree": "052ef22af59535134ca2944cfd8e7e7d3ea24d67", + "version": "2.7.18", + "port-version": 1 + }, + { + "git-tree": "b187917ff4190f5989d395a9abe3bdae93e0ee95", + "version-string": "2.7.18", + "port-version": 0 + }, + { + "git-tree": "94dd5dc700302ff87a8724504676d674d3554b81", + "version-string": "2.7.15-2", + "port-version": 0 + }, + { + "git-tree": "8a92d8f29475fdbae0656cf45abf03e11589067e", + "version-string": "2.7.15-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/p-/python3.json b/externals/vcpkg/versions/p-/python3.json new file mode 100755 index 000000000..36df2f98a --- /dev/null +++ b/externals/vcpkg/versions/p-/python3.json @@ -0,0 +1,229 @@ +{ + "versions": [ + { + "git-tree": "30321893b72abb4b682e3b66f75c54c1df3051c9", + "version": "3.10.2", + "port-version": 2 + }, + { + "git-tree": "4e348bd50d8c4252bda83903ce22f1e60d34be88", + "version": "3.10.2", + "port-version": 1 + }, + { + "git-tree": "0cf2e0bbf8fd712f82ed1997be82b136f1c13108", + "version-semver": "3.10.2", + "port-version": 0 + }, + { + "git-tree": "ce4fddbb41412be06577c61632e8e9ef0a67901c", + "version-semver": "3.10.1", + "port-version": 8 + }, + { + "git-tree": "31155fa7fa6cfa0fd2554e89584c92a2135bce19", + "version-semver": "3.10.1", + "port-version": 7 + }, + { + "git-tree": "a7ef4a1d73a9e486cd23edd98f12a2f4d4216920", + "version-semver": "3.10.1", + "port-version": 6 + }, + { + "git-tree": "c9b705608afc0485c03effb5aaa439f027b20af4", + "version-semver": "3.10.1", + "port-version": 5 + }, + { + "git-tree": "75172bc36c45d15ee298de1803625af1770cb805", + "version-semver": "3.10.1", + "port-version": 4 + }, + { + "git-tree": "35f071d147af8c4d8dfac5eaa95ad41e395448a5", + "version-semver": "3.10.1", + "port-version": 3 + }, + { + "git-tree": "198663bdc6b156d4423eb6ebf085c803f83babf8", + "version-semver": "3.10.1", + "port-version": 2 + }, + { + "git-tree": "5fe3685d04e62103465074dbe416e3158a6017a8", + "version-semver": "3.10.1", + "port-version": 1 + }, + { + "git-tree": "a5808a65bfe083729207ce88e66204198e3d939c", + "version-semver": "3.10.1", + "port-version": 0 + }, + { + "git-tree": "4fc95c5f7429e4fa04ba978f79ae6530f5280749", + "version-semver": "3.10.0", + "port-version": 4 + }, + { + "git-tree": "f2b8029e8ffdc1cbbff8a40346ef5fa82c811616", + "version-semver": "3.10.0", + "port-version": 3 + }, + { + "git-tree": "c8c0f995b8f1831fc7f345329c2ce0a80d717551", + "version-semver": "3.10.0", + "port-version": 2 + }, + { + "git-tree": "b155976e5a0266f5f73e2ff642b5281303a6a73f", + "version-semver": "3.10.0", + "port-version": 1 + }, + { + "git-tree": "08e4258968ff551133ae315eb8ed207f87f085b6", + "version-semver": "3.10.0", + "port-version": 0 + }, + { + "git-tree": "3975ee0659914edc75d63f914ac91bb3b7453f0c", + "version-semver": "3.9.7", + "port-version": 2 + }, + { + "git-tree": "6a1011c32aa2eb7de0b9a6184b2805e34c41f0b5", + "version-semver": "3.9.7", + "port-version": 1 + }, + { + "git-tree": "b3a545b39c982b7f0a12891765dd9909e364ebc6", + "version-semver": "3.9.7", + "port-version": 0 + }, + { + "git-tree": "0628d684afd26b15be6a1a6bb162e56744a442a7", + "version-semver": "3.9.6", + "port-version": 0 + }, + { + "git-tree": "0c58aaaa7b980102912bbd8b13ba3ac227b37bd4", + "version-string": "3.9.5", + "port-version": 1 + }, + { + "git-tree": "16ae1dd8eb0498d1357af3155c565035ba9a3f39", + "version-string": "3.9.5", + "port-version": 0 + }, + { + "git-tree": "ebb4ed9ed737c672ca5462a4019a704b6461e91d", + "version-string": "3.9.2", + "port-version": 2 + }, + { + "git-tree": "025737aca98a8b23d4ea8de388dacfba6b844eca", + "version-string": "3.9.2", + "port-version": 1 + }, + { + "git-tree": "9af42bd2d8ec6a2e8b563c9cb7544ffa7e2f938e", + "version-string": "3.9.2", + "port-version": 0 + }, + { + "git-tree": "b2f9a57528c88d1deef5b695e56edd7a671c97c2", + "version-string": "3.9.0", + "port-version": 3 + }, + { + "git-tree": "e1133f546daac80993333e292fea51624118959e", + "version-string": "3.9.0", + "port-version": 2 + }, + { + "git-tree": "c01b95fbe2e92bdaf1948021c1e2e64eafd3414e", + "version-string": "3.9.0", + "port-version": 1 + }, + { + "git-tree": "72f075a1ba9389a9fa7ae95a14e7278595320418", + "version-string": "3.9.0", + "port-version": 0 + }, + { + "git-tree": "a27ac0326c21362d6a324236c772161ac6130ef5", + "version-string": "3.8.3", + "port-version": 2 + }, + { + "git-tree": "8b1b57fad049e601226b47d0c4ab5dcc87a89609", + "version-string": "3.8.3", + "port-version": 1 + }, + { + "git-tree": "09f94d8b34d07f3c5554079cb7dbe09f9f23e535", + "version-string": "3.8.3", + "port-version": 0 + }, + { + "git-tree": "4146575f2b9fe56a8d8a3045c6840aa65c50cff0", + "version-string": "3.7.3-3", + "port-version": 0 + }, + { + "git-tree": "b4a17d0a697e2ac67180151c420961298949f81f", + "version-string": "3.7.3-2", + "port-version": 0 + }, + { + "git-tree": "f727eb35683140c0797f501c2cb55583da8941bd", + "version-string": "3.7.3-1", + "port-version": 0 + }, + { + "git-tree": "cec4a96ca3c160ebb6f7fefa8ffcbda14e9c6d10", + "version-string": "3.7.3", + "port-version": 0 + }, + { + "git-tree": "6a772b3048f1772f64f0ab03e9d630b764fda9ac", + "version-string": "3.7.4", + "port-version": 0 + }, + { + "git-tree": "0dac13c052f353566c25e199cfd58dbece1e8621", + "version-string": "3.7.3", + "port-version": 0 + }, + { + "git-tree": "31048e50e35696fa4eaa3cecf873a2cc96cb58fb", + "version-string": "3.6.4-5", + "port-version": 0 + }, + { + "git-tree": "5c3e9101d6ceba580262b36e9bc447b9c8ec7147", + "version-string": "3.6.4-3", + "port-version": 0 + }, + { + "git-tree": "f4df1cd62f5c06326dbe13a9d74ba10568a2f802", + "version-string": "3.6.4-2", + "port-version": 0 + }, + { + "git-tree": "471de7add2ba17ab04d3ee2929a4a11a9184e285", + "version-string": "3.6.4-1", + "port-version": 0 + }, + { + "git-tree": "3cfe7c13dd795228008416d7c8f81b6d5f086e52", + "version-string": "3.6.4", + "port-version": 0 + }, + { + "git-tree": "c64e67fc66a2fa776651cc05dca980332bbaf170", + "version-string": "3.6.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qca.json b/externals/vcpkg/versions/q-/qca.json new file mode 100755 index 000000000..bbba4bbf3 --- /dev/null +++ b/externals/vcpkg/versions/q-/qca.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "41239863ffd0059d8688502f6d6284785c6c8633", + "version": "2.3.4", + "port-version": 2 + }, + { + "git-tree": "d61c0d118f3d64f69c85f2442b28d4c2eed0a070", + "version": "2.3.4", + "port-version": 1 + }, + { + "git-tree": "8fd8829b933de5ae6fffecd509403987ca084634", + "version": "2.3.4", + "port-version": 0 + }, + { + "git-tree": "842dcdd87f56ec4318a5049e95b1eb9807dd2193", + "version": "2.3.1", + "port-version": 5 + }, + { + "git-tree": "e8275668aade111ed059ddece14bff490ff47fbc", + "version": "2.3.1", + "port-version": 4 + }, + { + "git-tree": "8fae15039cc6567f087011f916a1dea07da520cf", + "version-string": "2.3.1", + "port-version": 3 + }, + { + "git-tree": "cda65d327fffdc14a09dee0bdcdf79d3bdad9edc", + "version-string": "2.3.1", + "port-version": 2 + }, + { + "git-tree": "1644070fc7960a66d96e9c3df603b81821a36f7b", + "version-string": "2.3.1", + "port-version": 1 + }, + { + "git-tree": "9caa318891b41f75fd4771938804d51b56afd346", + "version-string": "2.3.1", + "port-version": 0 + }, + { + "git-tree": "41172855edfa7a82acc81cd7b520003338ab9b0f", + "version-string": "2.2.1-1", + "port-version": 0 + }, + { + "git-tree": "113779bfd35081b1ff56ce32fc299116824b499c", + "version-string": "2.2.1", + "port-version": 0 + }, + { + "git-tree": "899a284737474a84ce97d5ea4ef22c7a21dcee42", + "version-string": "2.2.0-4", + "port-version": 0 + }, + { + "git-tree": "cce9089b982e496a790e423e3c17292ebf78cdca", + "version-string": "2.2.0-3", + "port-version": 0 + }, + { + "git-tree": "7b8010bcdba05f02aa1c8bf9e90454715289f53b", + "version-string": "2.2.0-2", + "port-version": 0 + }, + { + "git-tree": "948d9bf03fc33ea156def505696fd7767ef7b953", + "version-string": "2.2.0-1", + "port-version": 0 + }, + { + "git-tree": "2c8f184f9681218f6505ac00dff590e5cf51e6c0", + "version-string": "2.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qcustomplot.json b/externals/vcpkg/versions/q-/qcustomplot.json new file mode 100755 index 000000000..f22ce4aeb --- /dev/null +++ b/externals/vcpkg/versions/q-/qcustomplot.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "7fcc18d2987ed5b3af803d5e0ac5c9afd026fc37", + "version": "2.0.1", + "port-version": 5 + }, + { + "git-tree": "c995c8e160e05060606844f9a0ea84b1fd5d61d3", + "version-string": "2.0.1-4", + "port-version": 0 + }, + { + "git-tree": "ef8034915adea03265b17d3c2aaa64a055d47555", + "version-string": "2.0.1-3", + "port-version": 0 + }, + { + "git-tree": "96b3f436764f5c2edf89c38bb84ce9a0d7587402", + "version-string": "2.0.1-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qhttpengine.json b/externals/vcpkg/versions/q-/qhttpengine.json new file mode 100755 index 000000000..16d3df94e --- /dev/null +++ b/externals/vcpkg/versions/q-/qhttpengine.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "df41e64df52df962bbd8836762d3946358819690", + "version": "1.0.2", + "port-version": 1 + }, + { + "git-tree": "7981cbfcf13bef7cfede8cf40a9d69967cc63dfb", + "version": "1.0.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qhull.json b/externals/vcpkg/versions/q-/qhull.json new file mode 100755 index 000000000..69b98685f --- /dev/null +++ b/externals/vcpkg/versions/q-/qhull.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "afe7d7f235d72db1da52a99ebe085cafd21577b3", + "version": "8.0.2", + "port-version": 3 + }, + { + "git-tree": "574301a0f60d743f5ea7165dda5e45bd0f1082ba", + "version-string": "8.0.2", + "port-version": 2 + }, + { + "git-tree": "248e6da5d026e3d25975912d727d35612b32f5c1", + "version-string": "8.0.2", + "port-version": 1 + }, + { + "git-tree": "a126a4ddc8a30d5e50f27579acf06af3436ef6ed", + "version-string": "8.0.2", + "port-version": 0 + }, + { + "git-tree": "99b577e0925df3c88a9abcc5e2a2419ba44cb719", + "version-string": "8.0.0", + "port-version": 0 + }, + { + "git-tree": "e00559523bd9ee2c0ca68795b8b6113e0e495983", + "version-string": "7.3.2-2", + "port-version": 0 + }, + { + "git-tree": "536421b63cc012330f22b0fda37006f154a0539c", + "version-string": "7.3.2-1", + "port-version": 0 + }, + { + "git-tree": "ab01d658af2ccc2c47032fe3af45186d5c8b3795", + "version-string": "7.3.2", + "port-version": 0 + }, + { + "git-tree": "60b3b0b745477d4ab489edeaa96b353087da1c48", + "version-string": "7.2.1-3", + "port-version": 0 + }, + { + "git-tree": "9b921f8f0feebdc148c80f30d18f46aa5d18d19f", + "version-string": "7.2.1-2", + "port-version": 0 + }, + { + "git-tree": "36fe7997ac50f395f0cd4d18a3abdd5718d169a8", + "version-string": "2015.2-3", + "port-version": 0 + }, + { + "git-tree": "1e1b5fda40b57a87b1d3745c497892c900a5fb98", + "version-string": "2015.2-2", + "port-version": 0 + }, + { + "git-tree": "8478f3531d966b213c554e4c0f46d07e3bbb1c15", + "version-string": "2015.2-1", + "port-version": 0 + }, + { + "git-tree": "8998401aa6626bc4f6bdd831afaa3e9682bc3269", + "version-string": "2015.2", + "port-version": 0 + }, + { + "git-tree": "308526ae28d9f0eb0feb287ed138cf2516138b5c", + "version-string": "1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qnnpack.json b/externals/vcpkg/versions/q-/qnnpack.json new file mode 100755 index 000000000..e5789c3c2 --- /dev/null +++ b/externals/vcpkg/versions/q-/qnnpack.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "cee68bf91e46cc783fe3f03d4525e02c0793389c", + "version-date": "2021-02-26", + "port-version": 3 + }, + { + "git-tree": "907c113d0c35b674976b5c3b7dc96b2c71084061", + "version-date": "2021-02-26", + "port-version": 2 + }, + { + "git-tree": "8dbc0dd7bdcf36b48124351fbc2ecc44d0b2e961", + "version-date": "2021-02-26", + "port-version": 1 + }, + { + "git-tree": "b433ea1861106777f4f358ba433eeea488e91c3a", + "version-date": "2021-02-26", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qpid-proton.json b/externals/vcpkg/versions/q-/qpid-proton.json new file mode 100755 index 000000000..95a109f9d --- /dev/null +++ b/externals/vcpkg/versions/q-/qpid-proton.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "e019a7a0cb758104296c13689ca86f44db64cfb6", + "version": "0.37.0", + "port-version": 2 + }, + { + "git-tree": "543baa82530f5eb5ed9b3d6348a14b5e24ccda64", + "version": "0.37.0", + "port-version": 1 + }, + { + "git-tree": "720cc65a7b408878662ce7c749211fa7edaf25fd", + "version": "0.37.0", + "port-version": 0 + }, + { + "git-tree": "bc437ca04548b4ca544af845a2e2327010aa3281", + "version": "0.32.0", + "port-version": 5 + }, + { + "git-tree": "be327f08d64834a36d80a140832abbbc66e67207", + "version": "0.32.0", + "port-version": 4 + }, + { + "git-tree": "109a9bb4fac5d5c5a52cd620d7ddb22da6fe47f7", + "version": "0.32.0", + "port-version": 3 + }, + { + "git-tree": "c6ab0bd896fa44681e2c3d4b325915ddacb38a1a", + "version": "0.32.0", + "port-version": 2 + }, + { + "git-tree": "b8fcc3b90edf020392d7fb1375c252b932a5e2be", + "version-string": "0.32.0", + "port-version": 1 + }, + { + "git-tree": "287e0a8a6edf82e89f66b9163dc3c9ba8dc46b3f", + "version-string": "0.32.0", + "port-version": 0 + }, + { + "git-tree": "fe169b1ce39bcfeac6979f810d0531dfe2b637ec", + "version-string": "0.30.0", + "port-version": 0 + }, + { + "git-tree": "76dd693c85a37b8c1dfd2e34757ec1dd1072b706", + "version-string": "0.28.0", + "port-version": 0 + }, + { + "git-tree": "d45db1afae45cfe88d88c939aa7ee21db108c7e4", + "version-string": "0.24.0-2", + "port-version": 0 + }, + { + "git-tree": "9e2652873e6426cd6c95b1b64c0a89a5203a8616", + "version-string": "0.24.0-1", + "port-version": 0 + }, + { + "git-tree": "ee1a9aab6f770b0292acd2f445eb96ee686d4553", + "version-string": "0.24.0", + "port-version": 0 + }, + { + "git-tree": "0051718b92c53caca167cf177c58757168744fca", + "version-string": "0.18.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qscintilla.json b/externals/vcpkg/versions/q-/qscintilla.json new file mode 100755 index 000000000..936299c8b --- /dev/null +++ b/externals/vcpkg/versions/q-/qscintilla.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "63f2d1f0287a6d61b5c85b428920b0fbe102adec", + "version": "2.12.0", + "port-version": 1 + }, + { + "git-tree": "753c09c98e94157f9998e6528d5bb7dce4337ced", + "version-string": "2.12.0", + "port-version": 0 + }, + { + "git-tree": "3279799f70de1a88e50db50b7e99dcdf1b08ac31", + "version-string": "2.11.4-2", + "port-version": 0 + }, + { + "git-tree": "3dedfdc395d12e0db28d868b62848367280fd961", + "version-string": "2.11.4-1", + "port-version": 0 + }, + { + "git-tree": "cdf1becb3cf92a3d47fc8c594b77afd1f7cc271d", + "version-string": "2.10-11", + "port-version": 0 + }, + { + "git-tree": "f1f7a6bbd1660345615c38ed8cb4632bb6e7f3a4", + "version-string": "2.10-9", + "port-version": 0 + }, + { + "git-tree": "5192cd1a0d8d4f37031bb6bc1f9ffd8921fbdc4c", + "version-string": "2.10-8", + "port-version": 0 + }, + { + "git-tree": "b9197b8a32193d2c76326960db9cbabacab70666", + "version-string": "2.10-7", + "port-version": 0 + }, + { + "git-tree": "dbdffacfeb73ed73358bf439f9386718d5875b3f", + "version-string": "2.10-5", + "port-version": 0 + }, + { + "git-tree": "bfa711aa2fd361783082c070704a7f58d54342cc", + "version-string": "2.10-4", + "port-version": 0 + }, + { + "git-tree": "d852676b5f70249a8e4a1f6a05caaa9c55a27724", + "version-string": "2.10-3", + "port-version": 0 + }, + { + "git-tree": "bc2c2467cf48ff52b0a28bb5a037c21827fee713", + "version-string": "2.10-2", + "port-version": 0 + }, + { + "git-tree": "917a492a13edc0f6ccc0b8b37691f40d5aebae40", + "version-string": "2.10-1", + "port-version": 0 + }, + { + "git-tree": "ad378f5e6429bea9c969f916fab6ed5b4ff9dac1", + "version-string": "2.10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt-advanced-docking-system.json b/externals/vcpkg/versions/q-/qt-advanced-docking-system.json new file mode 100755 index 000000000..9924a6603 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt-advanced-docking-system.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "faedc79b62016f2cfc3c47ecc16db714448daa48", + "version": "3.8.2", + "port-version": 0 + }, + { + "git-tree": "427efb4851b6f81f6301f6418d0e8d04bebbf557", + "version": "3.8.0", + "port-version": 0 + }, + { + "git-tree": "0b7978e662c15be190cef924f1cdc93d3a8492f9", + "version": "3.7.2", + "port-version": 0 + }, + { + "git-tree": "1f19c23c1d05692cdf45c9876efc195412945dae", + "version-string": "3.6.3", + "port-version": 2 + }, + { + "git-tree": "fbda394a196627494c8b9f50362ebf0de3bf1be6", + "version-string": "3.6.3", + "port-version": 1 + }, + { + "git-tree": "7aa1c3456d0dac65c1144b54ae721a9bf451c004", + "version-string": "3.6.3", + "port-version": 0 + }, + { + "git-tree": "c6c5b5931a1d533ac9c5351802af2f423c6d30f5", + "version-string": "3.6.1", + "port-version": 0 + }, + { + "git-tree": "a119e464d2aac3be67ecd86d71dc3dd2ca2db09a", + "version-string": "3.2.5-2", + "port-version": 0 + }, + { + "git-tree": "90d0673a8336f98da502391565b0e049929da396", + "version-string": "3.2.5-1", + "port-version": 0 + }, + { + "git-tree": "2d1947bfcb7238b79f0f651da6dc6abce691581d", + "version-string": "3.2.5", + "port-version": 0 + }, + { + "git-tree": "96e7fef0023550b6a5f39b2c0239a90504f4d904", + "version-string": "2019-08-14-1", + "port-version": 0 + }, + { + "git-tree": "ccf34e51c29d798a6d7dd618271896b234844f04", + "version-string": "2019-08-14", + "port-version": 0 + }, + { + "git-tree": "d38fb388ca2588651e9eec198b59d733b87d3345", + "version-string": "2019-08-09", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt.json b/externals/vcpkg/versions/q-/qt.json new file mode 100755 index 000000000..a75d487a5 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "8b4a7a1d86d93bd16d897b76cdf85abeac8e67d3", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "38c269c72f98a9fd49b28d428ad29cc5f1079fac", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "174cc984a142087680da0f0f42e659b835bb17b8", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "0270bf15601be63bc4e72bee1edc44e1241cbbfc", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "21c442fd3e940a2ee9a83377da9a8e902539b51b", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "420d2198ead04223b9c2901f9c1078b6f956cf44", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "7af9212716c1c55de883178c890121a7d804cc48", + "version-semver": "6.1.3", + "port-version": 0 + }, + { + "git-tree": "6744ad0c2da924c58372492b96d9ea9b43747440", + "version-semver": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "21fd23ba62f5f9c76024d715eb025a6d7458266b", + "version-semver": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "3049962a022e42ab77ecda0b58e6480de6f6a38f", + "version-semver": "6.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-3d.json b/externals/vcpkg/versions/q-/qt5-3d.json new file mode 100755 index 000000000..4a1b650fa --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-3d.json @@ -0,0 +1,104 @@ +{ + "versions": [ + { + "git-tree": "ad54e2c1049e5ec47c24815f9b1a1039588c4017", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "5538f55e5cb938c965447c3a5ce67b243f5d97f1", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "4c43f4aec27c0ac682f88d1edfcce7c28e4a9458", + "version-string": "5.15.2", + "port-version": 3 + }, + { + "git-tree": "f46ab15ed74e4680e16b61851b9eb41523a626f6", + "version-string": "5.15.2", + "port-version": 2 + }, + { + "git-tree": "6c3c15324a4764d3501798299c8ad8087905b136", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "c9a8b7a2360c554409f283143edf9202bebe6a3b", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "bc61aee28025498bf411411452dfdc2fa6b95588", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "1a90b0fbe534e416fefa585f1d7d36bae2567d3e", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "3e3693dbe7a3427823329d3a1a56839b34890fde", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "89d4c47835a7ba2b71d3e5e502cec0024ab81fab", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "048f75f03d5809aa35ffa3fa25d9a9af8b5717cb", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "f71f1212fd77059738c5879652d6369d7758dab3", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "c5659df032b7ca13b0f75ffe86832e2502dd3dcd", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "4fb493582f320c3aef9caa3019060bbd5a213e23", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "69cf59e8f81850e06cf5f9f4b2d1e38811039c78", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "f75dfe8395ac6901c2c6515e1e2e8f8929cd106a", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "f45fa7b26733b1e34e011d5d58e243f80cbb4c73", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "d234c728bdba94699c0278628e83196101ff3fdf", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "6e1acdf0019de567e9feae0daaf1b32700759fcc", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "254dc4e9aa6b45432113fcba6a1128d02989c243", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-activeqt.json b/externals/vcpkg/versions/q-/qt5-activeqt.json new file mode 100755 index 000000000..7216c3776 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-activeqt.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "d849c962c3692fa2177966c6ac225eefe7306001", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "ebae9d515816c48a9bbb2550acd02d02bfcfddc7", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "8bf9b51fd87d81531f301ee9060b76c829221afb", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "4485e0c45b055c36a8c8f2977dfc34b627ef89f7", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "a5dcfeee5d586df99ace34ea105162399897ab57", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "848626d30bdabf80d6d10d870c2cd8ae796664de", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "9c278486c40441f8bbbed74a8963071502b44f60", + "version-string": "5.12.8-1", + "port-version": 0 + }, + { + "git-tree": "60c47f5c227d59eb1141b8dc19f937e5346da895", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "144bf9406cbc7514a0cf6b3371f3fc5e6ec4dbd7", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "f9659b21d54252eaa7c5e83b3e5ea0bf64731ab9", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "83bb9b45b2007fe6baafb5aff16b33c8d9e74fd2", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "5bfe587223fa998f700b85bd53b26adca3054604", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "01b450d3072744f60727da9bd5641b4133de210a", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "4be1efa7a3eae9e408ea2e6455fed495a9ff6293", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "1aef913f1e94a28d0c6250cc2798d1e063bf84db", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "bfe03760928c18378eef9e8e9eb3442cdc05397c", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "559d82462d0464a0b48e139efa872c2ac6b9b9c3", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "2e28e556e60d3f97e2b98f3dce271d37dc417503", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "665397e7945154354e8aa4e16035bc80914975b5", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-androidextras.json b/externals/vcpkg/versions/q-/qt5-androidextras.json new file mode 100755 index 000000000..2af8e96e5 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-androidextras.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "c014160f25591285ae1b0274e7d4453a152e9fed", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "b0e32e6213649f8645b05c868b81dc3c982bfb30", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "b8ff6ba90c3b7046e2728056998ff79665353503", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "f94e5bbf1abb42df664f41fbbf652d8527058b57", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "c3e13ce02aac04dcd71b42f383a69ae540995da0", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "2a9cc9f90c2bb104c9985985929bbc23a27abe11", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "7a292b76e9654d6af8b116f0846938a48f8fde28", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "dc6e21e2a4a3de4df8e5c49b8e44a03b29d05368", + "version-string": "5.12.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-base.json b/externals/vcpkg/versions/q-/qt5-base.json new file mode 100755 index 000000000..4ba876895 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-base.json @@ -0,0 +1,389 @@ +{ + "versions": [ + { + "git-tree": "64b643c8e9f807cdfdba86d59f39e1b19e747d62", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "7518c5eeb84d3bbfaaa88cb19795b693fd0923f7", + "version": "5.15.3", + "port-version": 3 + }, + { + "git-tree": "abaaa592badf33576f197d915ed1f4ddd91d0931", + "version": "5.15.3", + "port-version": 2 + }, + { + "git-tree": "0b581b90072df50364b8c863110b2034a6b9f28e", + "version": "5.15.3", + "port-version": 1 + }, + { + "git-tree": "8c2fa92b6281b496e3aead1b02238ab7668c204a", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "f21ebf7bf6644292d70d9c564c1408a224f26c77", + "version-semver": "5.15.2", + "port-version": 20 + }, + { + "git-tree": "5a9c2b85fd5f62bb1b52f18c4628b0e08d765dd4", + "version-semver": "5.15.2", + "port-version": 19 + }, + { + "git-tree": "5793fff5370499ba464430142f86b971a23dff25", + "version-semver": "5.15.2", + "port-version": 18 + }, + { + "git-tree": "f8fbecca6183036771dc794859432a2a84435abb", + "version-semver": "5.15.2", + "port-version": 17 + }, + { + "git-tree": "5f510633de982d6e75e3d1170af23feedf208166", + "version-semver": "5.15.2", + "port-version": 16 + }, + { + "git-tree": "3f339b7160586f33649b2bee10a48b4629d6d1f2", + "version-semver": "5.15.2", + "port-version": 15 + }, + { + "git-tree": "1e5756de068474651dc8ee50fb14be3d4c236b05", + "version-semver": "5.15.2", + "port-version": 14 + }, + { + "git-tree": "d0254baec079c6226b73cc7580e7724cad98648c", + "version-semver": "5.15.2", + "port-version": 13 + }, + { + "git-tree": "9a65e1b0d631a1c2879d566140c11d634601fca6", + "version-semver": "5.15.2", + "port-version": 12 + }, + { + "git-tree": "72ca286ac98e08f2fef35f85a6e393795428d033", + "version-semver": "5.15.2", + "port-version": 11 + }, + { + "git-tree": "13593d8640bdca2663ba5bd497243274e51c4dc3", + "version-semver": "5.15.2", + "port-version": 10 + }, + { + "git-tree": "2362119eaacd46f6d1b0d27bac82b8851d84448f", + "version-semver": "5.15.2", + "port-version": 9 + }, + { + "git-tree": "78428fb3d23edf667e96afe8ea0292efc12e44a0", + "version-semver": "5.15.2", + "port-version": 8 + }, + { + "git-tree": "0a2e6f5403e24e41109d28db0c2330f8254774f2", + "version-semver": "5.15.2", + "port-version": 7 + }, + { + "git-tree": "96a7bf2a451b16e43b7adda9d0be8f07d853a090", + "version-semver": "5.15.2", + "port-version": 6 + }, + { + "git-tree": "971d4936dfb79384d61cdafc9775b7caa2329135", + "version-string": "5.15.2", + "port-version": 5 + }, + { + "git-tree": "6bd06b14752f1123c7d43df59ae19c584c24ea54", + "version-string": "5.15.2", + "port-version": 4 + }, + { + "git-tree": "da84dcfb306668b2cdb510efb6a130882da2055a", + "version-string": "5.15.2", + "port-version": 3 + }, + { + "git-tree": "a21da1425e7bdf8b22cca4da750b57a6cfc2a3ee", + "version-string": "5.15.2", + "port-version": 2 + }, + { + "git-tree": "6ab7ac474099d1ae4d91748acc50330801ed6aed", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "cae711e3396c229a7a1db28900446481ba7955cc", + "version-string": "5.15.1", + "port-version": 4 + }, + { + "git-tree": "9a7aaf1fcafaaf0d87ef8e645d5ac6108f9715be", + "version-string": "5.15.1", + "port-version": 3 + }, + { + "git-tree": "9ba3c3df184cf5e8aac3104856b81f2200e8beaf", + "version-string": "5.15.1", + "port-version": 2 + }, + { + "git-tree": "b3e1e04134083f0acdd5116e3e1bc8f92f801ed9", + "version-string": "5.15.1", + "port-version": 1 + }, + { + "git-tree": "93a02be94945033f1c00bf8e50d246b5f6421fc0", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "6c18edbec454d224a81bf0f97d7d2376b434714c", + "version-string": "5.15.0", + "port-version": 3 + }, + { + "git-tree": "ca022f4ead1fa1652544e608c191811b28a300c2", + "version-string": "5.15.0", + "port-version": 2 + }, + { + "git-tree": "6970207b13f556bf094bb210c884f3c5d81a1ab2", + "version-string": "5.15.0", + "port-version": 1 + }, + { + "git-tree": "6d908309ffeb9017308f4f86a115d2e37b4f029d", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "df8a22a4bc9702b791a6dac2dc8565ff5ac5f54e", + "version-string": "5.12.8-6", + "port-version": 0 + }, + { + "git-tree": "93780946a57afae4a6c623d04b25b38fc36c57dc", + "version-string": "5.12.8-5", + "port-version": 0 + }, + { + "git-tree": "bb4b314c8b0351bbd7e84cd8c921fd4253197f9b", + "version-string": "5.12.8-4", + "port-version": 0 + }, + { + "git-tree": "54e2dc2e110a25c022f6a84cf789d248eed76767", + "version-string": "5.12.8-3", + "port-version": 0 + }, + { + "git-tree": "9e9c0d58217b847c230b659b73754b545eeb2ac3", + "version-string": "5.12.8-2", + "port-version": 0 + }, + { + "git-tree": "d5eb924065c565f6e15ea0bd9694fa819356d685", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "4fb90f5ada47c6e82460b8818b56321f17bbdb12", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "73124851f4f5b8fbac7efd07f0f39e3060bc8ff5", + "version-string": "5.12.5-13", + "port-version": 0 + }, + { + "git-tree": "7ad957b725fbeb7bb4df04e2b506dcdf01ee9666", + "version-string": "5.12.5-12", + "port-version": 0 + }, + { + "git-tree": "6265272092ad14a2402fd7400d42b972c651c576", + "version-string": "5.12.5-11", + "port-version": 0 + }, + { + "git-tree": "9de154c109c638b48efef36cf3f5e1b85943bbde", + "version-string": "5.12.5-10", + "port-version": 0 + }, + { + "git-tree": "4934375ef4553d1b3e3938f2f0da82ebb836b69d", + "version-string": "5.12.5-9", + "port-version": 0 + }, + { + "git-tree": "ad7515e8eca37d71da0e394c0ed2a9cd7ea6b645", + "version-string": "5.12.5-8", + "port-version": 0 + }, + { + "git-tree": "101be351caf9f72a00b8e23c8345a1f4a90cf3ed", + "version-string": "5.12.5-7", + "port-version": 0 + }, + { + "git-tree": "1f032754d9b82773d1fb7116cde263024eb5f6c2", + "version-string": "5.12.5-3", + "port-version": 0 + }, + { + "git-tree": "2eb09c662551a52bee2ccec2e9e8198b29286a8b", + "version-string": "5.12.5-2", + "port-version": 0 + }, + { + "git-tree": "d71d273d2d802a7c087b9633a89ef666ed015d6f", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "834347aee8c649ad501de8cf4147efa56a6c89f8", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "127e5320237ac8b4778b7543729797b0411e5a85", + "version-string": "5.12.4-6", + "port-version": 0 + }, + { + "git-tree": "1808c321a94e578194900ce0639ef648be94f8cc", + "version-string": "5.12.3-4", + "port-version": 0 + }, + { + "git-tree": "14fc9cb180c4b790bff6bf7c50e9f26b1eec30ed", + "version-string": "5.12.3-3", + "port-version": 0 + }, + { + "git-tree": "102bb89858e0ff285aebf45bee9c6f6d48043e29", + "version-string": "5.12.3-2", + "port-version": 0 + }, + { + "git-tree": "9119a85839bd1b7e47185153f9784d3561532b4f", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "961e6c7833546e6247464116980529469d7358c1", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "2d84b3819295ce27a53d2b080cf162e71b071332", + "version-string": "5.12.1-6", + "port-version": 0 + }, + { + "git-tree": "bfaa2279690732ea6eb5e2c256e906dd5c038629", + "version-string": "5.12.1-5", + "port-version": 0 + }, + { + "git-tree": "ea273b9f2d674469bee96a522858a6a46a75bc59", + "version-string": "5.12.1-4", + "port-version": 0 + }, + { + "git-tree": "3a4eabdefeed0e5531b807bd7d087e450c296a25", + "version-string": "5.12.1-3", + "port-version": 0 + }, + { + "git-tree": "e200c7182ddea2d7ea8a11efb598dd9d532cb244", + "version-string": "5.12.1-2", + "port-version": 0 + }, + { + "git-tree": "c9d72bc6f85633b1a02db8d748231c49f1c7a17d", + "version-string": "5.12.1-1", + "port-version": 0 + }, + { + "git-tree": "e328d64b318b011658827929a4f000206dfdf3e8", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "67481ad940ddd53de5f96cee7fcf7bcdf170435a", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "35b45f984cf3fb5e8bc682796773b3bbd76e0088", + "version-string": "5.11.2-1", + "port-version": 0 + }, + { + "git-tree": "7596f22751d8d746a317878aee1092c9693141c3", + "version-string": "5.11.1-5", + "port-version": 0 + }, + { + "git-tree": "e9ea6cbf821b4faca63fd00577197f417b9b2106", + "version-string": "5.11.1-2", + "port-version": 0 + }, + { + "git-tree": "dcb2e4fd2ef9598f6d5953606b39f14c81a871d7", + "version-string": "5.9.2-7", + "port-version": 0 + }, + { + "git-tree": "de8de639444f14373a2ef28699fab29f4d31cd6f", + "version-string": "5.9.2-6", + "port-version": 0 + }, + { + "git-tree": "beafd866e9788d7f57e5369ac421b9d311e20013", + "version-string": "5.9.2-5", + "port-version": 0 + }, + { + "git-tree": "fa53cf38114c7992693ee0d4b822068726f9a4c8", + "version-string": "5.9.2-4", + "port-version": 0 + }, + { + "git-tree": "ea907b7134e3d5e3880782fd3e4300ae0483f4d1", + "version-string": "5.9.2-3", + "port-version": 0 + }, + { + "git-tree": "8dbaba247102af242f393865fca86a1551c920aa", + "version-string": "5.9.2-2", + "port-version": 0 + }, + { + "git-tree": "dd826ca443556ec0a3af0d13cecc9ec4ffdd8fe3", + "version-string": "5.9.2-1", + "port-version": 0 + }, + { + "git-tree": "d27ba0f757dc9e67b96ced1a51003807d0a28fd8", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-canvas3d.json b/externals/vcpkg/versions/q-/qt5-canvas3d.json new file mode 100755 index 000000000..c7ed4c737 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-canvas3d.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "7c880f36024ca1fe697ebfa6bfe4b9ae47c9b33a", + "version-string": "0", + "port-version": 1 + }, + { + "git-tree": "ab9dcd8f77c010f67ccd0177742f8f2b966814e6", + "version-string": "0", + "port-version": 0 + }, + { + "git-tree": "8cdc528b607fec51d336e8055242419c4bbb18f6", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "f96fde5a5ff0fb6bb3728a01faf5f49e2173877d", + "version-string": "5.12.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-charts.json b/externals/vcpkg/versions/q-/qt5-charts.json new file mode 100755 index 000000000..6ccc4b9a3 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-charts.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "7ab20682c7d2ce50527abe1e4a41830a57635f65", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "a4fa404a600c749529faae7807d2f24f5a6f8673", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "d51381395f58fbcf7b9488c2e49708522d968ffb", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "a9ad7200153301c998c296ce7f33968057c0ed55", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "7fdaac31ee19bf6044c57b38a7a2eac4e59f5612", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "4e9add84cc70580303d7bef69060b9cff187f482", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "becb0a109c41644be24804fa8bef1ebde4ac4572", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "feac1e76b4c7479e07ec7fa41e2ae288d9ecf378", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "0d2dbfc467ddf22f55adba6b25c38a33019e1882", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "20cbc59d7e2b8f7d3b5f4c921534fd31963fd699", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "858671d10d7c54d501f5b57d66f4316dae3cf4c2", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "7f24d3633b59fe70dac2e487089666bea6b81af2", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "519ac005433509c920d8f33dc17295a0a43f0278", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "7fbe5e5b5bd4351f2fa237673920dbb19ae40c33", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "fdb8256923810375165103f746d0dc103488d33f", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "b0e6783a8fcc2655bc2135870721adf766355da8", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "10a0e97ae7bf9d5da8651f4fcde3d23177338b02", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "15b9c3b580cd89f312ae95431b632340d26761fa", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-connectivity.json b/externals/vcpkg/versions/q-/qt5-connectivity.json new file mode 100755 index 000000000..5fe8e3d0d --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-connectivity.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "1388a9a144fb9766f4f8a6a0e6bc5a0224b1487e", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "8929178e2d3f0d544b21ed4bd1ad635e81fdefc5", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "4f34765d100d517dc137a96aabc37ab5cb95ea13", + "version-string": "5.15.2", + "port-version": 2 + }, + { + "git-tree": "f8ee9769027623f431202ff66a23a044dd3e75ba", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "e2bf8d45dc95302a10a9a1b07e58907ba86a2e7e", + "version-string": "5.15.1", + "port-version": 1 + }, + { + "git-tree": "2cdd2ce85e66b1d3cf7f7798001fb76d6913e9c9", + "version-string": "5.15.0", + "port-version": 1 + }, + { + "git-tree": "66458d3b3efc1f979dfd3ffc7a6113ba9ec042fe", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "6353e7435dea1b3d6183d84e596792064687833c", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "3f9d27076e32191250206f7324c53437387771f6", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "9a69b63d04a0ebf7c04187add5838fb923bd0cb7", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "a46a48768b5ad9ea7a83115e3fa17cd30ca3e36b", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "2a15360f495fa8ea1a1486b33c362ba8bd869b8b", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "0367510dd4c8b49cbd3bf91a2ff5abbb90ac5b93", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "dbbd7ec94d06153dd9076d2e6f45cfb991ef6069", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "a715cf6d2eb92ed537ef65ed2e97867a587d7600", + "version-string": "5.12.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-datavis3d.json b/externals/vcpkg/versions/q-/qt5-datavis3d.json new file mode 100755 index 000000000..69e522992 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-datavis3d.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "e87b00cc75098f24a1b23bbb567996d0bc2ac4ae", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "8300805371f9fb2d98a2a2ace37e9e93149483e7", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "8a675679d46b85666ef053efb36a2bb70b40b8ee", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "a85ea3d22e31e21a063a9a9f1c88c53e8fe85a13", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "9675a4b9bf484787826270cc1a6505d78efb4ba8", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "10dc0760f788939675716ef5ed7c0951cfdcaa55", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "c0271ed9ee32873c7380da8595dabac07f4aa10f", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "5ca105e3da8925266809ae7eadd44d2d05d78109", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "a9c235a67c50da1088c0e6bb31c588bd19dadd5b", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "f7c9d40286086feb6518e976009f60524cc1804c", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "2153cca32a6cfe70fddbd129d02d0825447a2a59", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "5af21e1ed292108c7ccdc9c1b68e6d1fa37ef690", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "ba43527171aaaa0df845f383b3605fcb5f5ce5aa", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "b1d3ab97c9a44294da3495b3905addde388ab1fa", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "b7fc0bff6e213faea478e6e3841990f01361153a", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "fc361535d247a2580800441e0e77eb36ff824979", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "efc93672b05e4c9805d85b837a445ed4bea609a7", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "a1a26c1e7f98214e79dca86de692e48d71555c90", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-declarative.json b/externals/vcpkg/versions/q-/qt5-declarative.json new file mode 100755 index 000000000..9810bf5a4 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-declarative.json @@ -0,0 +1,109 @@ +{ + "versions": [ + { + "git-tree": "0afa58af62ea8090c207a56f417280b856aced78", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "51388bc681cd6616f0d2ecb29b1f3901b2e66613", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "670f3d6bfa437ca047f1d1644743e2f2012524c8", + "version": "5.15.2", + "port-version": 3 + }, + { + "git-tree": "0cef09afb36f9debf22319dc4adccf478c611885", + "version-string": "5.15.2", + "port-version": 2 + }, + { + "git-tree": "bf4313e778b98d69d3e0e3b881069357c3ef8b76", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "b07a27c5aa8905b158c0f72f2b9e7977391191c1", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "6c526d6cad6e0813d9dfa6c21387b4b3f4d5b1bc", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "a2dbccda12ffc2314361dc80b63a5d81f8688275", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "d24aaceedb9a286f7c0a3cf0dcec2802f9c43695", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "cf4c1663652c07645e3f154c0cdaee9edc9515bc", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "5b93449fbc09f0917ec43e25b780d35462f9529d", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "69a9b785bc1c9c6020a7343c735935c7bb5a08db", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "e04d3d62b37dd397df3c41a868b9bda724262f08", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "bf496ad2be313266ce6e724190a256bf1a8e9b4f", + "version-string": "5.12.3-2", + "port-version": 0 + }, + { + "git-tree": "925dbb06740b78eed5d66c0653c2f7992e87a374", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "d5672d027f7f55de3ba7d289dfe98dd6f97dce70", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "c5234e870df1e7ff7da932098f5a6691e2d7cdf6", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "146b7f2ec8993c6848fdf84ede22c12f41f9d795", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "b3f885e341951c5964ce678dc5c0aea87365f739", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "7aa5a3f133f7c0861995e92c2d4a184d6350798a", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "b6abfd73fb05688db03a0e705c75a326e2abb82e", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-doc.json b/externals/vcpkg/versions/q-/qt5-doc.json new file mode 100755 index 000000000..75d4b1c23 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-doc.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "9b3cf5737faae5d92d5fd379da81a63257ca13ab", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "5cecc56a1a87cf86f87dcde5bc650f8de1e53b60", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "4cb09a0ee4bcb79b460c69a4e924cbe19538a2d1", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "223f161f59f60470ce059257c42646d4664b1bda", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "520ac7a71cbdbe15067e1e718e51a2100623b6d3", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "7e94ee4ef218320f62f69faa8af193d08211edd9", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "c5968ffa0746c11c1a7d3589361d30f9cea5629f", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "06c46ab15be980390deb6b5a32cfed58a0e74d37", + "version-string": "5.12.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-gamepad.json b/externals/vcpkg/versions/q-/qt5-gamepad.json new file mode 100755 index 000000000..13a6803c7 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-gamepad.json @@ -0,0 +1,104 @@ +{ + "versions": [ + { + "git-tree": "95df0183bac4852f40548ff3b973ad15535f184f", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "53e4e7090cc36a827b518f376c485aacade15d37", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "d74a2774e03103111a4e73c990eb65e78416e784", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "c59f1d686877d4dc3944d5b1f6c9544b9e3fc3a5", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "95329903ce4d3b26934d0503c9707d5fe3958b7e", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "7748c2540ff01eb175e413dae494875e195dbb60", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "24c8431871aa674ce21b347657934ce02d6580ac", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "c34c74f8774a3855dcd89302de33476b0c1d3bd8", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "fef77ad74f66c9702918f6a3c055e76cca731996", + "version-string": "5.12.5-2", + "port-version": 0 + }, + { + "git-tree": "defb8f7b65a21eee3d880ebd278501bc58c4bf45", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "a6fa45451a9182978fbd96871ec87aeb7ad2074d", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "678bddee43408b62b991b77fe69b04fbaea15a43", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "5c342669d91c2e20107a1173b7fffe3346bc53b5", + "version-string": "5.12.3-2", + "port-version": 0 + }, + { + "git-tree": "d6d2287754674d446b7256f6f9336448a1e4df5d", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "2e2c603c1d2b51dbefac179e9ddb94a641fb91b4", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "3c4b085ce989278731249adf39e1ea4cab3d9e3a", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "0663b9960c527d360ff02356a48f7143384a6272", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "2695bb7fee2f5bd797282db9699288ea0fdc36a6", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "6fe38d30464018021eaa6dfe484593b42082bc49", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "4e418379bad1cbdd9802dd3e697d4f9ac69f6218", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-graphicaleffects.json b/externals/vcpkg/versions/q-/qt5-graphicaleffects.json new file mode 100755 index 000000000..b0a2a8a70 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-graphicaleffects.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "ac4547abb371e952a7f87e72a4c8db590ec08345", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "9bb49ed2d96c2ad0d18a0508f2c170a0ef0a51cf", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "7548a80471fd031625a4395776ea298e2737c280", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "f0d59c9b5c88380e1eb89cd7f47b31299ca2367b", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "e905f4cbd556e9c21792772111a6d9fe55a4da16", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "367ba76601cb738680f517a876a5951b35bbd1b8", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "1acade397cfff61f42847509cf819ec614555b7e", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "bc3ca858a7f392917a9417df03d0e29514fb572f", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "a07cd94104aedf96abe6605fb10de351a1b1cd7d", + "version-string": "5.12.5-2", + "port-version": 0 + }, + { + "git-tree": "e4b43d0873d58c1c4e10301e167dbca83979b126", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "8279e9f7555856af1cd28563d08c1467079d2546", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "8143a32817ceaf8e66f7a375b9d83732270ab342", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "20f9551fc319d90b673f7c0b252040a7c7e5d676", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "2f68a0214dfd82d79d7ba429b7497d83e99a0bca", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "2b0da997cd76c8d9a3e06bd8a445c0be088f72a1", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "4b4164eaacd512d5dd0c604f78153ab8af420fcd", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "0bd318e81579d4d747821f115231116717a66df0", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "ac55307fa4b4a9af9d59bd3e6436f547a6a1e679", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "5eee2528f6d54c4713b32cb7b0118a556a22ac3b", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-imageformats.json b/externals/vcpkg/versions/q-/qt5-imageformats.json new file mode 100755 index 000000000..9f460f7eb --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-imageformats.json @@ -0,0 +1,124 @@ +{ + "versions": [ + { + "git-tree": "4e0f8ff607322745113d3b7de494b81a54173320", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "6035880bd5e6bd0954d738de1bb2e2b79f66953c", + "version": "5.15.3", + "port-version": 1 + }, + { + "git-tree": "bdb4dae2e952e636c45967063bcb7c5dbb9cea65", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "5bf32f350b7d08389629bc565c66aeb5f84e93b0", + "version": "5.15.2", + "port-version": 2 + }, + { + "git-tree": "6f6ca0b9e789dbfafa84ca02eec3da94f2728494", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "75366d3ba0a38fc7be899ea1a67c74e6adb379e1", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "6144ff48982bb3c848ed9c5ba3a517188963411b", + "version-string": "5.15.1", + "port-version": 1 + }, + { + "git-tree": "cb235d0329a2ac6be7841bb996e258615181cdc7", + "version-string": "5.15.0", + "port-version": 2 + }, + { + "git-tree": "eac65b172ddde4ae08ce25376d47db96a04ecc9a", + "version-string": "5.15.0", + "port-version": 1 + }, + { + "git-tree": "3a28ac2c3d51f8f094fe32df3d9507d7691b6310", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "fc40636bbb3f94383065e71a5b06f283a5522594", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "1f33b86cd72616afbb1acc9b9955d59bdca9ac05", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "0daeb06e83804c9882040184a33b5a2e2c3ef7b8", + "version-string": "5.12.5-3", + "port-version": 0 + }, + { + "git-tree": "e092b3bcecf37eb12e50eab216f5129957e30b03", + "version-string": "5.12.5-2", + "port-version": 0 + }, + { + "git-tree": "0055558f1aacde047f802d080184ba11fc4bbc36", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "a2582f793b58a2373bf1bf801fcb36f9749731b5", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "0532c51ad2b9debe84afe7374f30d00d2a573b42", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "3f08c3a43e43029308814d1e9c531915b1a368c0", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "fde1acedd22e43a51ae632d8947a799b455f42e5", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "8b58ae0155829d3935637cf1df713c7e6e98f168", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "9799c0a71ad00b709473371e6d057eaf1f330177", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "e2984be2c2e0ad47c17960f324e2abe96c96395e", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "40b02e188e97c283191549d2bdc81994027eabb8", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "e800376f4a6700949da02f9159a5a6da22a64091", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-location.json b/externals/vcpkg/versions/q-/qt5-location.json new file mode 100755 index 000000000..f79891013 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-location.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "50e02b320624cc5b4be62d2b209d4d0abe1e05fb", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "374ad16cce9ae4eee7c91f701a72c21ede178794", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "7fb1b17892d53638ec4ada0a73b19ecef4062ec8", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "94f99955ff8d1ce62723d2af72d47a138aabb5d0", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "bbb37ca5fe38a40c2d36790d54469ce0572428f7", + "version-string": "5.15.1", + "port-version": 2 + }, + { + "git-tree": "0d55afe17af07acb0efc6fadd414cdcb24b39ff5", + "version-string": "5.15.1", + "port-version": 1 + }, + { + "git-tree": "137077a310c09ae74997b02638521b44b903bd5a", + "version-string": "5.15.0", + "port-version": 2 + }, + { + "git-tree": "653e5b985c529465b92e802d1e0cd3fd850e2dbb", + "version-string": "5.15.0", + "port-version": 1 + }, + { + "git-tree": "e8adac38b16922490313ee9b8b339c9d37d044a0", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "b8536d7c95724375fde00fc67d8ff801f423e198", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "3a20ac86c3d2c811dcb72af128326416d5da7d59", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "a2cd6e5e63d8ca04117d103da9d8d33d8ef53352", + "version-string": "5.12.5-2", + "port-version": 0 + }, + { + "git-tree": "57e1682ef36b05dc45b480751f09b35b3c9664ef", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "addb2df8d2eefeadcbe9f8be76f7c367484118a1", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "4524d45ce884fc4cd5c98527e350c062ea4645aa", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "3fde0090fa6aa49edfc42e14f226cf656d8454e8", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "0285d5bfafea94ee25776f00aaa65a610b26d1d2", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "4b82275e555fbcebbb96a5ce93654aa31d8919e6", + "version-string": "5.12.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-macextras.json b/externals/vcpkg/versions/q-/qt5-macextras.json new file mode 100755 index 000000000..be06273fc --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-macextras.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "7e6ba9a1b53eb509b3ffc5ae091b51464e94aa94", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "35696a5675057de9b50f3bbb2215b3f0879d3261", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "fb1f68ce5b03012e9fa7ed0924bc2036c4d97edd", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "3fe45da1cf6d2e8b42bed80c7a362d7d9869f12b", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "c7455204e0d6c6750be23240b00e58f66210c8cd", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "9305fc1c1205f523229e7ddb9087f347c6bf98a1", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "ff4c5959474470112b47abb6fd5db45060709144", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "c7e8a086635619bdab5d32b9f670569be282edff", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "46f5a714c0eaaf900b1b3df1a29ccb5f5b5ca71b", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "613ebc9af0ba4836f0ef0b452e4dc3f4569a92c5", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "0bbc86ed67ed65c6cedaa541a2be1992d51714e2", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "b04426ee1de8cb9bb8a4fcbf5d50ad293831c9c8", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "0a587d54d1335103ba8395e543e306c7803325a3", + "version-string": "5.12.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-modularscripts.json b/externals/vcpkg/versions/q-/qt5-modularscripts.json new file mode 100755 index 000000000..ccb2ce1b3 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-modularscripts.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "5f2041fcbdcdce6efa2cf8033557fd9c2d68696f", + "version-string": "deprecated", + "port-version": 1 + }, + { + "git-tree": "966b7ad2de03f602396f7e9569a8881eace3d585", + "version-string": "deprecated", + "port-version": 0 + }, + { + "git-tree": "c098243ef576959fd9f40d91b3e85ce1802bca42", + "version-string": "2019-04-30-1", + "port-version": 0 + }, + { + "git-tree": "e9b18f30cd85432fba7517480654a6f15cba42be", + "version-string": "2019-04-30", + "port-version": 0 + }, + { + "git-tree": "92ef35974443ff3427b0deb0198b0d1957798600", + "version-string": "2019-03-21", + "port-version": 0 + }, + { + "git-tree": "839ce6b4a433d890f341b6cf12285fda9eb08cdb", + "version-string": "2019-02-02", + "port-version": 0 + }, + { + "git-tree": "b0930e7d41ab1d5d562e03b40d17447a50f293a2", + "version-string": "2018-12-17", + "port-version": 0 + }, + { + "git-tree": "8d3a46c8482a42bdcc1cceeffcccf90a7b211d7d", + "version-string": "2018-11-01-1", + "port-version": 0 + }, + { + "git-tree": "e447e84bc2e1edd02db01fedf94163e41165a68b", + "version-string": "2018-09-10-2", + "port-version": 0 + }, + { + "git-tree": "a861097312585f9ee2d76ff24216bdc50c101e7a", + "version-string": "4", + "port-version": 0 + }, + { + "git-tree": "ef206b74d01c38f7759ca1cb04edd0d2d9e189ac", + "version-string": "3", + "port-version": 0 + }, + { + "git-tree": "722582314e23aa1cd8541d2af4ea68fe0951db2e", + "version-string": "2", + "port-version": 0 + }, + { + "git-tree": "0e836c8cbd6f4d9e80273caa0d3a9087fffa5ca5", + "version-string": "1", + "port-version": 0 + }, + { + "git-tree": "e567b8c9570a64bb748d9021e706c57a6bf96ef2", + "version-string": "0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-mqtt.json b/externals/vcpkg/versions/q-/qt5-mqtt.json new file mode 100755 index 000000000..58155c7e4 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-mqtt.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "f29a8cf672c3aad83d34ee1dd6c9e659cfd4f588", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "c8622cf28b900e34394e7c67ee272a0f0ae1a945", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "9a02099176012e710ae215855f4e72fe6f5b704a", + "version": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "af160578b6f6fe501b01817d6d171d123a4841d1", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "eff74674156d29130f6bac8abc658b34d60a532f", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "8d51130b916fc02fc91437bbd511c70e775c6c25", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "00351ddaea5c1cc9f3a4aba48d58b8d41d9f24de", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "0a5a0d826d8b0f0db8f94120199899e26484900b", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "01980ce3aae3fc378dd5557e44485b2f2f7da301", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "ff87c402d8474b9981ae24815272e798f0e7e2ee", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "8ebfec6284da32590787045b9fbd140b5c8fb62e", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "c54fc115eca2df6915a75c702aa46939a8716e7a", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "8d61b7fa7fae2c4bbe0cf17f2510e5ae720b5158", + "version-string": "5.12.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-multimedia.json b/externals/vcpkg/versions/q-/qt5-multimedia.json new file mode 100755 index 000000000..3eb5a89ce --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-multimedia.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "fa127acc620f472f3ba8726783ccfb44d93d95af", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "8336d9a40e956b24f846b25c7b017cfac417f1d8", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "b909b49f99e6080fdd74b20419ac9f1059d993f6", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "0aa2bee3cad289370d921410781cb478405528f7", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "5da3b21921824650376cee2f50760fe1f4866554", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "fc3270d6b441d75ef5034f0e3fa573e1a4c11ccf", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "1d8e3bddb812c956f642c05f65b53027197fb69f", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "86e38ea5fd5345990c43fcaf31a7e25a15ae8857", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "3c0034844a595933fc9513d19607ae8b4d51f934", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "4b84ecd9bedc273ecba44a09c4a35f5a7c63e45a", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "8311e87ab1c4447257564ec3fc4e247af9c43964", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "1067f1a17ea4b7d5576b6a3b2df4f666efc0f82f", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "630d04959e634f6292b44a981226ba821c3d95d4", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "ea2a149a8665f3aff48da556f924c0e9ac493241", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "c59ac61dc6d0909284b1d1b41f371ab6854fb041", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "ea042877dca8b0c496ae9215bf0062efaeef4b37", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "5e9a66c962791ff434013105ce2d54873c2bdba4", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "63abd87d8903b68faa5cb8a9cea04437c8bf76da", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-networkauth.json b/externals/vcpkg/versions/q-/qt5-networkauth.json new file mode 100755 index 000000000..79bf848fc --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-networkauth.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "b50130d7dcfb78270c759b6ad397ccdb4eb42f4c", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "fed32ceb703389b16ddbf6843597358c92ff27e2", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "f6fcb48f7415ecf2a5f2f3966c48a08abd9b0355", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "f462d1340451f187f9f581eb33d48bb02325199e", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "0983186f99f302d7338144fb91e05a1d53c42a11", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "fc7881d390debf11b364cd9ac76afe4cb0a18edd", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "8994ba7d62fd1a8d04ddb077d06a290772d4e2dd", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "34d1a852f3c1ba1a4527728682c0469746a6e3bf", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "30e346e02ff55ccc3852ccb969410ee87824b76c", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "4553837ff3b8e2f1dfde07cce15c16cae43c56e2", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "22e1ab1286939fa49dea852a01259bdba14600bf", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "ea56d80b820dffdcb6aa5c12c6947d7b41abcfe4", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "d0804004128c691a13a91fca190555a6d6cdb392", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "a9edbbda73aeb1c93999eae03ca77b474e933424", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "f030415c10f9a327a1f0d0026de1c83e55862766", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "6af1cbd481cfaead0711430ba2c7cefd8a27b71a", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "ce5a5aa746880e641ce9d2f680b5b93525ba695a", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "2f0ce721a3b3a0145e0b442fba34004fd4f0ee30", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-purchasing.json b/externals/vcpkg/versions/q-/qt5-purchasing.json new file mode 100755 index 000000000..aaef8d542 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-purchasing.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "86878fc58b27e1f6f2e8cad31f27aadf3bf77fb2", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "c1507aeba5c46c35cccbf662602be9bcfe6d4bc1", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "0e0745a65f393550ec04750071456604a5db72ba", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "a8cd09b86f4f66c28354c005ddc5c7050b3ab51e", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "9789fe42c9921171381c50b4586b81fb7f1ee405", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "a88066a45c91eaf3f4b4e82f7952ad1475a37ef5", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "2c8b82b1cbb08dbaf2cb4540ea28d6575b9b92cc", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "bfd9a22dee4ae335e1eb426bf4096ebe2df929fb", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "3a29416aaccc6b188da273c2ac07d09ad462659d", + "version-string": "5.12.5-2", + "port-version": 0 + }, + { + "git-tree": "ee1c603ade4a5dcbc09fcfb2ce0e6fa9c9aff7fb", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "1bcb4c6701dfc41b294c42d40fc872c9d2fafd25", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "0e1799020f30f41f39c36ef9767c44cc83918bcc", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "83712f2ea06411edc490cf298ee8da637fdfb7cd", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "5aa571489c43635a43b3ef4a3a86a914b006e68c", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "03bc6eed238cc6aa977cba5af90b127e8203433a", + "version-string": "5.12.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-quickcontrols.json b/externals/vcpkg/versions/q-/qt5-quickcontrols.json new file mode 100755 index 000000000..0e138158f --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-quickcontrols.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "5c24b1552fada859bf5061ab7c004ea12edca056", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "0023d4eae57568295996c372c262c746fce54cd1", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "49313a150ff19dacc9614849648f29c90e424cd3", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "b7a753736c9da0675d2c65b5f2fd0ba55243ed98", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "ba0a7677baa9c89cb30bb792bbe990d84a46133b", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "62742d1350ad7d44e3ee6be29c5fa030883cef64", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "9988b19aeba65bbbc34bbf55fb064ef56aad9357", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "7c0adf2f65202ac6a4b1d8b3a92a524e782f9514", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "d2e2d349ba82b281d1aaa79d3b76aa5962b19ec6", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "0a1168794a5335392729e39882f8b28a73292f3f", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "23c6f45f0767716d58c6009ed97eed62f70880d3", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "c5ea26e184537f6eba0a39a1eb708c50988d3314", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "f0b318eadd961e6c1b09f92b34f3ceffe05258a7", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "2f8da6cbd12fbdb3dd4096123c5876c6c1f82698", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "8daeb80a4a00d61ecd69dcf1e08bc246a257b5d3", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "e63607858735fa3fbca80ca06cfb1d1c11650e68", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "158fc7583861ff08f860b4c36684a96dc479b313", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "88f5dda4d9123a8b58f18ccc9ebacc48ee69e602", + "version-string": "5.9.2-1", + "port-version": 0 + }, + { + "git-tree": "7cd48c2b5abb5936b040fe3a9220dadde6dd59bd", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-quickcontrols2.json b/externals/vcpkg/versions/q-/qt5-quickcontrols2.json new file mode 100755 index 000000000..700a1d7f3 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-quickcontrols2.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "0e491e24d5c90d6de8efed680903b4f37445ddc0", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "da9577fcd83a97070fbb31e9723645e1a353e780", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "c0f3cb1b07b4ac8c05297fd8c438ba7e1ba97ed8", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "55332e79db24457e25edd53505c1ada54b6c8ff6", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "e89068f3afab69f11461a0bcc2153368af489051", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "f9d08f684f3a48174fb02f4ce6ae55aae906b095", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "6a4deeee9d9a81e41dee958b9ad3562e6a099c23", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "d95e7bee74808d300eaf2a6b882ae55506204622", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "afb1b1e0b10ae2029a093afecd1b3ba851162aad", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "c1b20474e08df4155b3745d69a5381b2f296c256", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "b1aa7372bc1643fdff3167b433db9d7b86fb2c05", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "d005163818908c9059fa8bd775625620ee599bcd", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "6e58b344f8789ebbe11d739e129a0fd08ab79bba", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "da8dce867a92e76be0a8d1ddd007fbf201540e6a", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "30a3f39b7a851e0549d8a348e8b754a5a9350037", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "5cbb594cae7cedd42d0669495a2312f630bd244f", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "530798ac6ddcea00ac9df84208941db63f1fe333", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "84049a65cfa313905849dcdd8f63a47fec579102", + "version-string": "5.9.2-1", + "port-version": 0 + }, + { + "git-tree": "c193b5a40619c8e8bbce4d371199367d89c774d8", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-remoteobjects.json b/externals/vcpkg/versions/q-/qt5-remoteobjects.json new file mode 100755 index 000000000..2545c3001 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-remoteobjects.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "1d41a95abf4f754152c887c40057c54c4ffcacc1", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "cc4b1cc8e132e4c53c32401e8eaea14140f39906", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "73a19321158fe546f1469f290a83050fa6af14f1", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "56d2cccdc3153966bbdd95194d45ee1c3a6afaae", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "a8e21e36a43e286bbbd37238536e8fcf66c07ffa", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "7d29e74a85bd0f7529d7d91ccde8e76f110f5818", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "34ad67101305b735fd1bae1ea9f51834209e9a2a", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "4bcf56e3b758c8262175ca277f6fd4b618421beb", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "10829f8502c12f39b0719970e62fb3e2f7571de8", + "version-string": "5.12.5-2", + "port-version": 0 + }, + { + "git-tree": "5b5fb528b8ae358863a51553be5af453d9fbf312", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "25f4b090864a4f9c19c2b5be0490541bb1c013e6", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "8f6c5104ac50840812708b3c37073f7c9252d9cc", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "73c22ac30c7de74d621b40169dba13bbaf67dfb0", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "29532d7b36c0970267fba7c4818922af59a5fe8f", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "102e281ccafd8b1c614b09f0b36aaeeda65e9d29", + "version-string": "5.12.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-script.json b/externals/vcpkg/versions/q-/qt5-script.json new file mode 100755 index 000000000..e2cf61cf4 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-script.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "9bccc52e9aa61f98d1d15e818dd67652012275a9", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "450d4c10bbd324c74ddca59e7d16c6cb215aa077", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "d412fb9a21bbf733e6e2e00c2015787a7c262c6a", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "e91ef09f428cef704bf255193747433972c73087", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "eabe840ad61233b6f28db78f16bffdcb7fbdeddd", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "cb665849f7edbbec817631349e05c3a0b0dc89a2", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "0631f99e2331137a3067e2700f0710f33ade1c11", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "8d073b398ce015766b6df28a27cf4ea6fb22f940", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "d1547cd549f29fdf736e4f80d3af4507df836467", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "8db04321a4bbb2008214d1518944df168af15270", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "14ade779799db4d05500081ba67d971c6f5c6e46", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "a5c7384f06726bbaa76b002b0f8ffca05f0ebc44", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "4259d5f23594b05e43bee478c7061d4e44c000cd", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "3c0ce5504709c5c6e2d4b466a34b0d0ba3bef029", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "8a68433514fea9fbbca60d39a482a04223962487", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "2ed40ae8f32b048c9f9363594061e1c6a2fde6ad", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "09841c9fc65eadc8006af11b42201a68523cc3a5", + "version-string": "5.9.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-scxml.json b/externals/vcpkg/versions/q-/qt5-scxml.json new file mode 100755 index 000000000..d35308ac1 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-scxml.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "079580ac857fbceeecbcdab6677ff32cb7f78858", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "894ab2a120cd88e276b795234c66715ac787e4ab", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "657fa8e20641b75338667e14b696127b252fcfd5", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "78995a7e46afeac5fb6e5e5dfdc40a327f7dd9fe", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "88b3fdf6dae974fd1257b9ab6dbdb657080c2233", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "4abaa321aeffb998e695e0480c3a2284dbac77ab", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "204e4b6d12184d439962aa8c7f318a26393d1adc", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "18d79e799f3c80391c34ce458e05879ff18370c7", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "f6184783322633f3d75b146186b956e3fcbe0c15", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "647520900a1bcd8ced59dde81573157a5a28c9e5", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "6efbedba5a9b080861eea789dd4cb70358da3538", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "353480b2680af0a7bb884cce7299667d030b97e5", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "791270de8f04665a985473b036f7e4be4730dfae", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "658ca9b272f0079e9ca0656a8cd789e7f9a5872a", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "3d9036b01f4a7138d985edb69564391e4758998d", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "626f46a39f8d6be547a73fea915f73ab1fb00d11", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "844ab80b553f709005070168dd55f0e92b5a7445", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-sensors.json b/externals/vcpkg/versions/q-/qt5-sensors.json new file mode 100755 index 000000000..ab64c62c3 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-sensors.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "7b395d40c215c61a382c9dd411675bb6b1eb5bc1", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "d7faff943ee0ed0c4be86730ded240b322d2b829", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "5ab7355283e60f00090972eafddf269519155344", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "21bce9a3ac2033ea3baf1c238c1f185be101a845", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "670b8b13f2fb7509ceeaa96c62fe1eec4fc12450", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "daaed9ceb00ff294c10ca84e384c2d98133377e2", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "e9a694010507f83ea470d99c2b37386d76822091", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "1deacc537cf34a05cc8b74eab406f8fc6812167f", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "88d90c7ebc6840210978a7b1435f1ae43642367e", + "version-string": "5.12.5-2", + "port-version": 0 + }, + { + "git-tree": "8c437fab96e39ab0c03a7e141580395b7eccd2db", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "5bb4708d3d2d40729408bcc5019a412d96758219", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "c07c9fcc5bca78137f28dc91cdc488c2e17baf02", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "7a35294ed1beea5a6008cda718fb62a55a3954b6", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "9ed88bbea76223088548740dc4f70e74f90fe57f", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "d3c15efaa9e1d908839fe01fc5685d220740d96f", + "version-string": "5.12.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-serialbus.json b/externals/vcpkg/versions/q-/qt5-serialbus.json new file mode 100755 index 000000000..60a62eb63 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-serialbus.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "8a6f465b80e92aa05547bf139fa964e8488ab154", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "e16c9b0f5f3bb86c3fe988f049069901ae578d0e", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "23c4f38498a3eeaef1a0428cc0f9facb77c50bb5", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "9e47e507727344b2a2bf750e759b05c3cafeb086", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "17ee8d39cdc45e3945bc01eee50cf0d18e27f47c", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "d118103ab7de3a470fbf87a214c8645587a2f39d", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "a5a206d5dc30987299dd872a7ddcd9927c3a021d", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "01725a7cb801dab6764679e925fa62b427abb12d", + "version-string": "5.12.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-serialport.json b/externals/vcpkg/versions/q-/qt5-serialport.json new file mode 100755 index 000000000..ecd571b11 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-serialport.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "8b93f29b611b30ac02780e3136af4f4699074446", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "cc7ba67e09a801eca90691b7c7db4baf43369a09", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "b6e0403e0e46d6b3aa07ea90da894a33589c3dde", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "316f45b69eb023ba69d08d8de7a6debbf84bb603", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "e7f00b17dc3a26603d86b756ed7edc5cea77d0c1", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "ec237949790f5a82daa49f545cd283627ebd1cbe", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "b6650cb3b8e6b4220e156da1b48ab1ab4b0ab44a", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "17aa2b761c09d08f3c6fcc1cbc630ab425b826f8", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "770014b18fc21d17ae1af2ec9ca48c4d6aec4bd3", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "7324bf20f32b8bd9c18a54e5198ad9a2f59a5052", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "1dc27964a26d58f16e191d8dd3ac3d6d70ed9078", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "909427c2a51269c3cef3801df260f65236a98411", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "904aa9f0396de49689545f5fe34e5dbe03cde9d6", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "5062e3e1e11d2a8a03783e328802fb518cfa7cd9", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "84d6d638b706c52c97abfd5f10b418dc57065684", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "95b0de657adc23a76abf3f5a185a0e48c2b1adcd", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "41f7f2ce0039a1078e91bab0bb32a0541406c613", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "9bb23039283d9129a43f3ba45c2f5e63387e4374", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-speech.json b/externals/vcpkg/versions/q-/qt5-speech.json new file mode 100755 index 000000000..edbc72937 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-speech.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "c9b3f529af35b50682be46af4b5937b1425f60da", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "bf21b1bb4dc124cba22d170e77ceb78315ab7de2", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "12c00b4bbf2206f8bb68ad44e8b44dbfd65fa6e4", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "21ea7868e82bc4457836c8a0b7ca918c47b8e804", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "802a16804890503cb951986fed4a7f7ea0de857d", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "6838350eb5b01c352a537d88f2cb1a593ea52f37", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "09ee28566432c49b1288aa7fa0a0865d347c20b8", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "119a0e1f76b3e98511926cc7204fe6521760d287", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "a70b9fd47035792a844e6045d5b4e97dafc74873", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "dbdc77fc978c28595863d7d90867064f436421b1", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "b76ec161abb87913ebc545fcdfd064b60b128207", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "68ba614e4372ae5d7bfdfd19e0b6c58534ef0dab", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "fa6452d57132730ccef1e9920536ee3890c4dc68", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "dc3171d75e6f3eddeddeb3e3e0ea0cd3c1b997b3", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "f604567ef44bb92c159455ae34e4d0f0a5506671", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "e3395d46d89643da5110bbc4ae971ae42adcda40", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "6dcb9686e566f8ee7272a8e14c12739706f06e77", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "29f70766d5aef50f838908104fee7b24470e95ce", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-svg.json b/externals/vcpkg/versions/q-/qt5-svg.json new file mode 100755 index 000000000..8711f2aa1 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-svg.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "3052785787495ab14b0fc4b25aa480d18a906bb4", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "6a43bcf48e884abdd82502f747342962e2a2c4b8", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "75e1a170720117fcc34369aae8ab7ee4816974a3", + "version-string": "5.15.2", + "port-version": 2 + }, + { + "git-tree": "84778600522df34a9db6d62f0c217c5d29346492", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "4cdec015d18a0bf66a77ea27006346f0fe382c64", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "e8e8fc61228f3069fcef1a81eb448c955bce11ee", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "e67485b147021f0ceda43cad61dc1e6e92ccf3cc", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "f83a2d62509852229f61a6a480ac2a026e80ca04", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "6c9aaaa31eb626633476beb087863cbc1fe04157", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "bfc97b284f2c20489027d289ee249de8e900a7fc", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "4edc438357050e3e5e84eeeb7bd64339ad23554d", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "951e7da001ff8d894bc6d6755d6dd9f7c0738166", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "ff1a00f52b9aca17b9e060f4e3e680fbfce6f740", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "1be67d82d26748d434d76388eff9502cb0e982d0", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "1f0e7210df520062f75c7091422a01b7d203b4ff", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "5dc0d79f817b9e12df792c45345538b6a880c6d7", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "e09a9499f71933eed22c84bdc630bed3e353883a", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "9e8431ea75da30642de515fa85a2f3471833cd36", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-tools.json b/externals/vcpkg/versions/q-/qt5-tools.json new file mode 100755 index 000000000..2247bba66 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-tools.json @@ -0,0 +1,124 @@ +{ + "versions": [ + { + "git-tree": "6025c1997ce5b8bf0ebb131b0628641e8e550d6d", + "version": "5.15.4", + "port-version": 1 + }, + { + "git-tree": "b8a761a89f1f3aabb2c3e990b40cc69d0b7ea543", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "0f3066692eacc724dde9d8f17d4cb67f019ecc75", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "b28b98fb7bd66abe2c108d66c3a89c0e388d638f", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "de5a3def8c0cc8ae0055876f169e73562de14e4b", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "42416e080314c2a741b2b674fc22fd12932799d4", + "version-string": "5.15.1", + "port-version": 1 + }, + { + "git-tree": "40fdbf4941d716fb8294c7b6f30003e474f153a5", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "85717a003a0f218fb461ea7fb1ddf5923e1ab702", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "935399ee977b57c61b918bfdae02b154cc0ba306", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "beaac627ba3817593396391e275b523e69e1d4e4", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "9c0b9add33cb4afa6687dbacdab46a024a6c2d82", + "version-string": "5.12.5-5", + "port-version": 0 + }, + { + "git-tree": "871fd690a186b6ed44e3df2f32d4ea4ec2ea3c27", + "version-string": "5.12.5-4", + "port-version": 0 + }, + { + "git-tree": "8a673898d61a559b94f06a1623ccc75db0b7807e", + "version-string": "5.12.5-3", + "port-version": 0 + }, + { + "git-tree": "e7cfe0f3a66029443347788b1bf52eb05f62adf1", + "version-string": "5.12.5-2", + "port-version": 0 + }, + { + "git-tree": "15dd2e6efec67638a1e3e889728d340a7fa10cf0", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "7a1b4e32377254aa33799a34454dc59c71048eed", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "2cc1cee9808bc2eb6ce640c46e4ef155256d88cb", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "8e6facc981cba1637f0d0ab35a62fbd2cd868be5", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "b3aa2dfe5f5af37842213aeef15ab16837fcd184", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "71781cfabeea164d17dafa3bebc03d6dfb6e8a59", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "d8a0cf14005e4a583e525bc422a4b5b9115295d7", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "893a9b29611e272a23ccdc583d9e537c7a9079b7", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "0d03e3ab700d1b9dce8ab5e7816be833bf4c8ac6", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "116f4016dc02c5bdfd2aab048c073e46ed602e11", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-translations.json b/externals/vcpkg/versions/q-/qt5-translations.json new file mode 100755 index 000000000..5d1a95590 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-translations.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "19e19e3a353b093bfbc1ffb94beeea19f94c6a00", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "4a0df59e14f9c24d2584e7f0424424f50eb4c9f7", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "195b59491201660e5c6299f6f3f78c446827e8d7", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "008afea16ec68c49b890f4ed8316ad3abfbcb71a", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "8b2da9c53ca7e6025cd00d40d718ccadfaea75b9", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "6a738d8fc7c71ddb513c3c6b9b46a7ad12733863", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "abdc12734788699ea91f6324214394ee0309f5c0", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "d4723b0b934a64ce25ec5714e12a6130e6b855d6", + "version-string": "5.12.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-virtualkeyboard.json b/externals/vcpkg/versions/q-/qt5-virtualkeyboard.json new file mode 100755 index 000000000..8d572c1a3 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-virtualkeyboard.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "96468c13c2c783e1a63d16877de3c88228ca3f36", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "8c8514424cbc1c746ec7149ec383fbdd5174a0e4", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "45281062a0b509d6c5f2cfce1f26e77e90fa6192", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "2693e87e70cccf2d3e7eab86266fb4d6531cc32d", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "1d58303fd8236c7f075e5618074a6361738a6b58", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "128f4bbef7cf5dc99a077f0afe5d7db0d35324e2", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "a5bd2cbf0c1470dce53cd1e632e42bb3835b0e5e", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "66e17f4fb97c423f37f7aa2dae78cfec3e8fe4a3", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "978bab3c1fd725e3692fccd47b1c73548117f059", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "39bf2d3afa816c266140d66a213883fb4e697fd8", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "3707c5d363cb7cb72595cb5a4e382635fe64ae93", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "1234d87de0e93dc366bc76d6efc75d6ab37f4e9e", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "9a706b29a63439b76ff1d1b6daadc4f310962723", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "df9d910acd91e5b365de51dac93d478ba04136f9", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "d4d6c9a8641615173452fd81e0d11af92fe93364", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "017d694c676ae8abcbeb415f5b6154263e7d4e4b", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "73b6647b2dd8d08b93fac633486a7577370c2764", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "9a38e0631249720c3adb563caeabce150fab4486", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-wayland.json b/externals/vcpkg/versions/q-/qt5-wayland.json new file mode 100755 index 000000000..65800d67c --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-wayland.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "6b9afbc817fbb9ea46c53398b1db93331792913f", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "4e8f0ffa97c7f3d1dfe627808bcafc4d4a77d3e2", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "10dc10d68dd34e3db201364ec60567459c6857dc", + "version-string": "5.15.2", + "port-version": 2 + }, + { + "git-tree": "d35832bb03e8a61250192130ec88cd32ad432c48", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "244d21edcbcb57f8809feaadf0149d408c4d5e84", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "d63a245eaad5cf5422f82ab0da47e679424f8b9b", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "d819804cf44187370e081411a5f99600af849485", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "52aab7785e5377171522d9117618517143b74b1c", + "version-string": "5.12.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-webchannel.json b/externals/vcpkg/versions/q-/qt5-webchannel.json new file mode 100755 index 000000000..f49964a88 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-webchannel.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "214b6e50c9919b3aca6b9d7b18a49707a6f78cc8", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "cd0f8bbb8bb85bc208907a24c82fe9db0b902922", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "39e51839b2f67b03e0f72bf862dc44ad72bcc804", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "e8fed15c2b941a90c62729ed0ec87d09a65088f6", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "9c133f361a037ee2d29a0f13528cc56e19b52b8a", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "dcf3a917962939ff0df7d11ee9d3960985b8263a", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "2fd38b01119591ad52bd2c7636aed32880780542", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "ed5df36e7f544021b554a83f1a9c4b81fdab81b0", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "48b279541b2635c95924258ce7766ba6cc33ed53", + "version-string": "5.12.5-2", + "port-version": 0 + }, + { + "git-tree": "198c44972338fdfbe014616d54de315f80caca92", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "d1db68848d77b317227ca942715454bc038be879", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "b61dbf9266dbdc98d779935d86aeaca9c09fe845", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "b6c956030a671892b755446ec2762323159a2fa9", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "39d252c95a5b0dc81ff704932ea246a85ea27b3e", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "e94ed60db636303c6f0ace5860267c7abf1a0ef2", + "version-string": "5.12.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-webengine.json b/externals/vcpkg/versions/q-/qt5-webengine.json new file mode 100755 index 000000000..07b31f5c5 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-webengine.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "71d241727d07ed646d0f34c1d29d4173c1087233", + "version": "5.15.4", + "port-version": 2 + }, + { + "git-tree": "ac21a058fe59c5b0272cdfc2cc1791b9b9901a79", + "version": "5.15.4", + "port-version": 1 + }, + { + "git-tree": "f210713d4af04f690a79188949467c8ba9b2597e", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "533cd8995acbdf2a8cc24a96da7515777dfe7c38", + "version": "5.15.3", + "port-version": 1 + }, + { + "git-tree": "4b097155aca1faecdaa639daec2395e9a8c0cdad", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "365537bee64190f604e1be03f0473ffe41067a82", + "version-string": "5.15.2", + "port-version": 3 + }, + { + "git-tree": "3a220ca2fe835251196c717e4f1df91516430d8b", + "version-string": "5.15.2", + "port-version": 2 + }, + { + "git-tree": "8f8f6defb09c499cfe581195f03e88951431d73c", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "9e021df8973b08f0d03caeff578567543bc2f1ad", + "version-string": "5.15.1", + "port-version": 1 + }, + { + "git-tree": "85e41560eaefb2cdb8102bf1726d67a6c6e76b1a", + "version-string": "5.15.0", + "port-version": 1 + }, + { + "git-tree": "6c8077670749344fc2e31e791d81149685b7a7d1", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "5e74a28edf936627f948ce656683c4e1f25217ca", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "792fbceaff12af645539d04b3420a384fa2a83b0", + "version-string": "5.12.7-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-webglplugin.json b/externals/vcpkg/versions/q-/qt5-webglplugin.json new file mode 100755 index 000000000..599d10880 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-webglplugin.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "618744f2944d1d1d8acfc4bf018a11306f515316", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "3d081435832cdf86757d280e7fbf1bf2b5780199", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "44c3faa9de1a6f18a9f496e828c4ee64f0fcc315", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "f0b9c3cfc7387db1f1ca1e1a31a92a445e0bfa0d", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "dbc7e66e5d089e94e2278d8cf437e46aa1c18ad8", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "654ffaa3a07c623a58311c222d0cd3e172b0b61b", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "86159be37c81cfe1a55c28219dcb5dd5b3d6ed24", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "ae82f97a47eaf99a029c4002ff3595065c792f51", + "version-string": "5.12.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-websockets.json b/externals/vcpkg/versions/q-/qt5-websockets.json new file mode 100755 index 000000000..bb6fde7a6 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-websockets.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "6c2886a76834ca95953a47fcf460fd14970c10a4", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "c0380195d2431d25311a4fa542d3437d05f339da", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "0ca77dc0c75bd411f1d1e51257c761e775ca341d", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "dda1270f825f0a962a46a2320eb0c07ab3792fe3", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "b9e183d1921cbdd06d712feb0dc810901fec6352", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "f5a19676b1b6db3239b048d5b1cad7a5a9fb8791", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "3bc78c8102e24d18b9f5a0aaeeac481696202a9a", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "aa33d4a6ac44a4ef3501fe31c05d1007cd1c2387", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "9b7a16d04060df3fc6d1e14d1c25f19c862a7969", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "328d696192f6e6e52514d13534f253170529e11c", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "26d587abf239a6d37914ad0f70457b0b1e0f8c5d", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "9ee4b15384ceaa5acc59296c308ae48698c437b3", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "95a2734f619d0d54670cff1a71189f5b9c738bfe", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "6d558d0c7a0a90ee59997236a92ade88905a5099", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "93cdbcc5012048444f5cd8fcc89f62aa29172c7b", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "70de9e4b12e7feeee33c3134e351f95656f8659e", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "7762e8790ba6077c45fa1f4964880a3eac90e4c6", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-webview.json b/externals/vcpkg/versions/q-/qt5-webview.json new file mode 100755 index 000000000..4db885833 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-webview.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "e6f90b47550c95897af8ca9a2508d54d918bad6e", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "bb6129ae1fa4b8945885ca352eca1bde34e1a345", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "8c8a8916c8fda707b4c8096388ea7156bada9a4c", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "5299a2103e3367847b319980eea5db59b4ad0a58", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "f3781e5871021354cd74e4a7baedc112c78833b9", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "3eaddb3bc343625c84cda44a466ee11e5ea8b322", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "857f9aabf7c727e56eb710f24c824af5bd92b817", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "7647cc30e5fd1d259f160a1950a1fb7f2f82a0cc", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "834ea50732eeac2f613d8581efaaf4703ff1dc1b", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "18c46e487b6d2f05a1f91d619bb9757e1c1a80d0", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "10be2612641028b88b0483ac46713fba92f5b625", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "3ede9db26a87a3caf807dc19501b4427b25ab31e", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "4f7b1b9d80d79941bc0e31a5930b7885014bd80b", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "017eec1fae618bf250db76a189134a14d58adaaf", + "version-string": "5.12.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-winextras.json b/externals/vcpkg/versions/q-/qt5-winextras.json new file mode 100755 index 000000000..da98f2ca1 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-winextras.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "030018d2b9c2466e483af9dd86fea69ae46f72ee", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "5a7881475902048fa453bff04c347caa7e9a615b", + "version": "5.15.3", + "port-version": 1 + }, + { + "git-tree": "89250816793ceacdf74730157af6f287070b8bf1", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "85a345a5fdc5a15584e6b2add00f1669e4099dbc", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "74a7ae6df8a4a7074f5defa9b74ec25140f91c6b", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "382a4b48cd76feb4c9fc84cfee66f2aa5589ecc7", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "9eee10e08d30f083b58f086e045e68a5f6f56716", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "6ead1ad0349a17b19af0cb89ce1f6c2225706870", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "eea49a6918113a3b68b14042ddffe9a9fd876616", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "1cf1011d345da4b62a3940c448dc5b5d7d4a8d05", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "598332a52e89eea8f21f872dff068fb85823fa21", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "b532def8243f6784f888dfa2fc40342355699cfb", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "e1d99ed0e8610f124869eb99ccb8b4ea43f5f652", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "57864bbe071e50ffd9d0d0c2524a444f2c38b2ca", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "3d1caef57ca3a62830cd66faed4d99291e015223", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "768451de1d8a9d6fe6040ff66ca7d8a77cdcba9f", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "4168465ea0f28742c2b6eddef361b0730efe6e43", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "1681fdc4e2fb7d7d009079b82f4989e26cf4aa1b", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "f5a940630183d0f5b478cf829a12f403e0de4506", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-x11extras.json b/externals/vcpkg/versions/q-/qt5-x11extras.json new file mode 100755 index 000000000..d9b65543b --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-x11extras.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "446335809ddbe1ca22e25789061b4fbe7c931583", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "5321c86715348b879cee60dc4323c2e1d8fc9fe9", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "ce0ca52833bf80d8bc958cd4428acd10ab397911", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "912abfb778fa66e9010962b68182e0366e54edb9", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "989effc95d136ca39434f1c9738d2856d9924643", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "71e81965723ba4104142e8d7bf5e53b4d5dabab1", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "0f0cbbc0cf4cd928a388ec7422237ee3ad0f877c", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "4c7d906ab7d33af16846e826b55494410c358c13", + "version-string": "5.12.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5-xmlpatterns.json b/externals/vcpkg/versions/q-/qt5-xmlpatterns.json new file mode 100755 index 000000000..d89596f4e --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5-xmlpatterns.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "1452531e0230ac6fc5e7a16f4f7c43fc167c747b", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "b87833daca4ff1492a4890d0f73bcbb416dfc615", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "d4531f24cddd2692989fac9e84a9eb09301ee180", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "afd90dc7576c45b74602e2d632e15bea59bfe38b", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "c5d3ebe14a81907e6948d45eb78c07929f55084a", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "280b27c050903a666a0dd518d31673ca015cd512", + "version-string": "5.15.0", + "port-version": 0 + }, + { + "git-tree": "a47e6078f537a261de3eedeb7d5df9d61680f939", + "version-string": "5.12.8", + "port-version": 0 + }, + { + "git-tree": "39c8ed889a64d5204bdbef53c3b7c9ed15822298", + "version-string": "5.12.7", + "port-version": 0 + }, + { + "git-tree": "c95b73443a1c10a3f21b94192a3d1a9e0e6a9fc3", + "version-string": "5.12.5-1", + "port-version": 0 + }, + { + "git-tree": "2b6ef18aca8398475750a771a9c863214728244d", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "4f7d61c3a2359871411f186c70dbba319d3b8ddd", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "7c7b3ee1ac74a84f15e72cf2cb9fd40d9d628163", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "fa1b098185ead8fd17a2a60ff6eb17bbc258753f", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "ef5d448131c0f97d55f6e98708447b169608010f", + "version-string": "5.12.1", + "port-version": 0 + }, + { + "git-tree": "04974fa68edbf8e12a6e8205f84ffc64c221c557", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "b6b12639db0a0c2fde28e0192c5f63645f13f7d9", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "8ccb46e3216afe740b5be3709ae333ede8a05ef6", + "version-string": "5.11.1", + "port-version": 0 + }, + { + "git-tree": "6212f4fb0039e9d944072685a972e480c94d3950", + "version-string": "5.9.2-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5.json b/externals/vcpkg/versions/q-/qt5.json new file mode 100755 index 000000000..23a3f53ad --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5.json @@ -0,0 +1,199 @@ +{ + "versions": [ + { + "git-tree": "15bce9bdfce0d88dafafa166be4f56c2c4883877", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "979ef9acc281793cef4f43f1e1eaed177ed9b408", + "version": "5.15.3", + "port-version": 1 + }, + { + "git-tree": "428cdd43abdc1200e889c66b9c388b421d16bf58", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "9810d811337a74ca11e032b94b52f4e4bed5d1b1", + "version-string": "5.15.2", + "port-version": 1 + }, + { + "git-tree": "3ab863fc125546487759d6672f0e459da27f5f41", + "version-string": "5.15.2", + "port-version": 0 + }, + { + "git-tree": "6c44bc778ae3e400ff6f777d6f6bb68c24a81fed", + "version-string": "5.15.1", + "port-version": 2 + }, + { + "git-tree": "800137391209a8e9acbff74fb129f05192e159a8", + "version-string": "5.15.1", + "port-version": 1 + }, + { + "git-tree": "1cf3366aa520643907eaf281edd1209d46762838", + "version-string": "5.15.1", + "port-version": 0 + }, + { + "git-tree": "da980816d56966ba3a62f940d8319ef211363f1e", + "version-string": "5.15.0", + "port-version": 2 + }, + { + "git-tree": "77f274080c535a523e638722085715dafbb00fc1", + "version-string": "5.15.0", + "port-version": 1 + }, + { + "git-tree": "27e55da03da89dcd727dabc0b906320ec31f9c14", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "044db93ec24dc19cf505969bb4bc37791bff7ae1", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "3896d169d13e7e6b0eb6969942a91e106568d1e1", + "version-string": "5.12.3-1", + "port-version": 0 + }, + { + "git-tree": "9aafb7c18221fa0c5b44cf02a5ff1e6fa19dc5c8", + "version-string": "5.12.3", + "port-version": 0 + }, + { + "git-tree": "e4055eb5c566c3b043d4740b604828054503bd8a", + "version-string": "5.12.1-2", + "port-version": 0 + }, + { + "git-tree": "2d4c09271773156bf248f17b384756de8c26906f", + "version-string": "5.12.1-1", + "port-version": 0 + }, + { + "git-tree": "7896f5609bb83bf3b925fb627eaa7159b42b8950", + "version-string": "5.12.0", + "port-version": 0 + }, + { + "git-tree": "750da4a3e633dafcd60b75c720144660cfc07e27", + "version-string": "5.11.2", + "port-version": 0 + }, + { + "git-tree": "4fb62f3b74a5cf05bd07e2526b0d38dd5aa8f6fe", + "version-string": "5.9.2-1", + "port-version": 0 + }, + { + "git-tree": "c54440a2fc7b7f56c1339015dbd88f195ef1c4f1", + "version-string": "5.8-6", + "port-version": 0 + }, + { + "git-tree": "7d62c038e2916d12bbb04cb3565fcf2377a717c5", + "version-string": "5.9.2-1", + "port-version": 0 + }, + { + "git-tree": "98e553c4e98e304bdea7fc602e4dd521f78de39b", + "version-string": "5.8-6", + "port-version": 0 + }, + { + "git-tree": "8ef67f83440846b3df327ad5632ab40b56a5afad", + "version-string": "5.8-5", + "port-version": 0 + }, + { + "git-tree": "fd49510b125c64b63e1177fe2c9c7ee71eab1f42", + "version-string": "5.8-4", + "port-version": 0 + }, + { + "git-tree": "ba9eae53136170ce59fb80fba94bc0017d997f76", + "version-string": "5.8-3", + "port-version": 0 + }, + { + "git-tree": "8450857e614a27d7885f65ed31a63d46e537474b", + "version-string": "5.8-2", + "port-version": 0 + }, + { + "git-tree": "d8806f8aa4a51c2afb96e5e982b61ead5d1b57b9", + "version-string": "5.8-3", + "port-version": 0 + }, + { + "git-tree": "bb2f14e92545e3bfd4b00b2a57ce632b25756aba", + "version-string": "5.8-2", + "port-version": 0 + }, + { + "git-tree": "057443d5b5d8c682cf1bd78edd3c20478479f533", + "version-string": "5.8-1", + "port-version": 0 + }, + { + "git-tree": "3d9f4415d7d6c419ea18165b1daea4a602b1ca04", + "version-string": "5.7.1-7", + "port-version": 0 + }, + { + "git-tree": "a213c34055d0653c960318382feff42c86f4f1b0", + "version-string": "5.7.1-6", + "port-version": 0 + }, + { + "git-tree": "ff901a5e6ef1fa151fad2da33289f0407c630d92", + "version-string": "5.7.1-5", + "port-version": 0 + }, + { + "git-tree": "e8694966c75688a3dea133e887487da8405182d1", + "version-string": "5.7.1-4", + "port-version": 0 + }, + { + "git-tree": "3bdfae1f98355075b40a26d0f6219561edd4edae", + "version-string": "5.7.1-3", + "port-version": 0 + }, + { + "git-tree": "8cc9d59d5a9de8271ea11b188af58ce1515f3f89", + "version-string": "5.7.1-2", + "port-version": 0 + }, + { + "git-tree": "05d0534884fc11a45bd16e405fd7ffd17dd5fb51", + "version-string": "5.7.1-1", + "port-version": 0 + }, + { + "git-tree": "5983a3a786fed2c993e63b2441f62bff58416fb9", + "version-string": "5.7.1", + "port-version": 0 + }, + { + "git-tree": "290292f1733374206d67588a3ccce9ed9c808e60", + "version-string": "5.7-1", + "port-version": 0 + }, + { + "git-tree": "42df162ea3ee0f8ec8ae23f9ef01664cd19008b4", + "version-string": "5.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt5compat.json b/externals/vcpkg/versions/q-/qt5compat.json new file mode 100755 index 000000000..c33c3f1d0 --- /dev/null +++ b/externals/vcpkg/versions/q-/qt5compat.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "0de65b9a2c56a557ec23d71c0f9eb83d1814d01f", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "e9ffdd0f5186b67741f04c15121449eb62f21f45", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "d650b3405a677deca9110c6ea6861bfaa24645f2", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "766a30524747e5382462c57836e5a8a6a67a1b86", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "aab367de0f2bfab12d47c09e3a5baf3a04be6d1b", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "374ed713fb29fa32bc126a93372be23a0fc85ff3", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "215bfc596de54c9c4b5c83e1d8d4ab53ddfaba72", + "version-semver": "6.1.3", + "port-version": 0 + }, + { + "git-tree": "d3d8792b65b0a5f83423ed425d01bf77759c33d0", + "version-semver": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "b47025d88998f99cdfe58e3df9498c3a08d72883", + "version-semver": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "33d9b2ff872cbc458a0ce0145a30f6f702d1fb58", + "version-semver": "6.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qt6betablock.json b/externals/vcpkg/versions/q-/qt6betablock.json new file mode 100755 index 000000000..90eeda6fa --- /dev/null +++ b/externals/vcpkg/versions/q-/qt6betablock.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d81c3fdd73670a353ebe8be0f2f6bc0397b6d647", + "version-semver": "6.2.0-beta", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtactiveqt.json b/externals/vcpkg/versions/q-/qtactiveqt.json new file mode 100755 index 000000000..ca9603d80 --- /dev/null +++ b/externals/vcpkg/versions/q-/qtactiveqt.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "774c1e6820a5c0271d4f228f7f680664e3407641", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "f58617e4fa4a6e358daffccd8d286cd9dab162ee", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "bc03ec029e90f445ee878ad27b476b60da06ee3e", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "adbc35d451c9ac13adbd23980b1609bce61e3dd9", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "9b4f9c648d93abf2dc5547a0c966f268809eeb58", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "c7d57c70efabceaca7d833b441ad986c4eebb09b", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "925f4777d7eb69e9fa1d6de9af0fdf3e4511799f", + "version-semver": "6.1.3", + "port-version": 0 + }, + { + "git-tree": "746af755dc6d69853c6a369b2fa61aad7ec33c45", + "version-semver": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "3e20968097c4a9d81833f16c2f6637b67e72258f", + "version-semver": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "0341fe2cf4a7eafcb0b73f0adbdb37a151bc3000", + "version-semver": "6.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtapplicationmanager.json b/externals/vcpkg/versions/q-/qtapplicationmanager.json new file mode 100755 index 000000000..6a8915e67 --- /dev/null +++ b/externals/vcpkg/versions/q-/qtapplicationmanager.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "31b3d7a098e8f98ad1ee4d897c164236bfef040c", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "d51f980344bfb14ace79b30fbf510e92b4924da8", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "3c971f01c7b3ee85236a451ad93fd00fe4cc17e6", + "version": "6.2.3", + "port-version": 1 + }, + { + "git-tree": "9597e662be8fbe3317e0fd88058071db708da977", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "79db0a47002752179eb5aacedca44c0bc670030c", + "version-semver": "6.2.2", + "port-version": 1 + }, + { + "git-tree": "ca033ed7578b002c1ce195d879c622333231d159", + "version-semver": "6.2.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtbase.json b/externals/vcpkg/versions/q-/qtbase.json new file mode 100755 index 000000000..11e682dc5 --- /dev/null +++ b/externals/vcpkg/versions/q-/qtbase.json @@ -0,0 +1,104 @@ +{ + "versions": [ + { + "git-tree": "bad99835f1e2cf63bc1ddcd9d5871e3081964bbc", + "version": "6.3.0", + "port-version": 2 + }, + { + "git-tree": "32ffa659c93542477ed0f0ee90f3a7f99c0035f0", + "version": "6.3.0", + "port-version": 1 + }, + { + "git-tree": "8a107123c1e35b7e5fc0df157026d7fde8a42632", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "35e9386f344f01e0e37df7b2d2ae991db6bbb1cc", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "bfac5075bd2dcb338153b016e27ff8789b05688b", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "2362188815f81dd666df3eaee1d96a208c1a0838", + "version-semver": "6.2.2", + "port-version": 4 + }, + { + "git-tree": "e9fa18e04e930f9ada49aac4dca2e9fe4958b89a", + "version-semver": "6.2.2", + "port-version": 3 + }, + { + "git-tree": "bb6485a4e65e52d1a157f6e0c478a47bdc884726", + "version-semver": "6.2.2", + "port-version": 2 + }, + { + "git-tree": "8c343c019fd735cbe38bd56b00460539e94eaa9a", + "version-semver": "6.2.2", + "port-version": 1 + }, + { + "git-tree": "c314a6af00c3a57bbd887c834cc0b5f80bfd65fc", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "700e8c2e47b2d044d1623ea5062e15ac6cc9a970", + "version-semver": "6.2.1", + "port-version": 1 + }, + { + "git-tree": "85405a7d213571f8da152112d436292099c5a4ab", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "e7c78fd7fe6600eb96712f151670efc765bf5c31", + "version-semver": "6.2.0", + "port-version": 2 + }, + { + "git-tree": "01075dfd8097c54bd832400553958c2ff9bebf31", + "version-semver": "6.2.0", + "port-version": 1 + }, + { + "git-tree": "9850138b57bf2122ee9e5063c76944754f4dbf63", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "23812ecb279c5ae29a26e99f2ccc605bbe17f45a", + "version-semver": "6.1.3", + "port-version": 0 + }, + { + "git-tree": "ed0018dce35e4246be83589358400a7617a8933f", + "version-semver": "6.1.2", + "port-version": 1 + }, + { + "git-tree": "953b2fbc4ecc9e3ec83df47f2470d078f21758bd", + "version-semver": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "8f4c208e4c4606ae0f7663901399720437358e76", + "version-semver": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "c13214dac08887f541c416d36de97a86560d13f5", + "version-semver": "6.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtcharts.json b/externals/vcpkg/versions/q-/qtcharts.json new file mode 100755 index 000000000..afca070b9 --- /dev/null +++ b/externals/vcpkg/versions/q-/qtcharts.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "5a6b0d90d87f22b85e513ae3aec86a31da8ba345", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "d5e059fea3a95f9b719d3b3069f09be05413ef99", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "f4676a2659098089318793815dcbff8cdb55ea9f", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "5fd0c04f1b0758cb38a161d2ec6a9b8757bb243c", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "68535daef3629a70ff0e5a347580f747aa075070", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "e9849e3eaccce1a69b18aab5c6bd84e952960b3a", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "f40ae8925f5dc6cf6947fd0a14f607eff3c0438a", + "version-semver": "6.1.3", + "port-version": 0 + }, + { + "git-tree": "74995a3fee551bc872bd44d0a0592a67cc20f3bb", + "version-semver": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "5c3e47558bcd193afac22d72771d726b4e4721a1", + "version-semver": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "1890f3d4b87f50fd6d16ffbc03d5d023762fc58b", + "version-semver": "6.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtcoap.json b/externals/vcpkg/versions/q-/qtcoap.json new file mode 100755 index 000000000..828fd8e0a --- /dev/null +++ b/externals/vcpkg/versions/q-/qtcoap.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "9d43d6c903f6d72b54187e9f6657a346929ab515", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "7f05c6aaeb825647d3c802feeb1b06a0d14a83c0", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "948308d4ae9a45ee3c438fb512b2fe25c3661773", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "0fdd3a57eee65ddaa5bd2c83ece98efcc0a6e7e5", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "1397bf94a76801daaec069dbbc790dc45957ccaa", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "684cdbc0cd6c1df0f94c3057722649ea22c23d5b", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "e51f03a5c9c142390aea35d1a6389383c245414f", + "version-semver": "6.1.3", + "port-version": 0 + }, + { + "git-tree": "10c8de5683f1878cdee669c101dcbf50fefaf10e", + "version-semver": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "2dec36ef658a413500ce4486e1d82fe377b3a99c", + "version-semver": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "435511150f075d71b1f947e89b1f0d306ffe251e", + "version-semver": "6.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtconnectivity.json b/externals/vcpkg/versions/q-/qtconnectivity.json new file mode 100755 index 000000000..addefe235 --- /dev/null +++ b/externals/vcpkg/versions/q-/qtconnectivity.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "6c7069034cb39a6450178d52a58a0ddffda07b5d", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "db0fc2cda2cc383043f8e1fc4b48849183f038b8", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "fbe8db54ab4377615f8328227d21c8bf470551d6", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "9f62102338302645f71d4b060100dee977a5c744", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "0ed1e678661df3b938f67e6d9f8d68e62f8f75b6", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "c646047361feb006e3d5ab1d29412de763c4c505", + "version-semver": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtdatavis3d.json b/externals/vcpkg/versions/q-/qtdatavis3d.json new file mode 100755 index 000000000..da7d86be7 --- /dev/null +++ b/externals/vcpkg/versions/q-/qtdatavis3d.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "a1fd864c050d29e79b16f84029402fcb3840d1a9", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "c35b1ffb8bc3d76b8537e2d5d59176545f4a02bc", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "014813f75ac07a1207692d81609b4cc6e28e5737", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "be38aa1f2d19491f9195779ab9bc5cf9469e2d46", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "64b4f2709811c4ab542a8534645e0ffdb1ffffe7", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "80e7cb3d96c9ecf079d94b39d06d1eb19fbe6bdc", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "30c282e8438df69e77b4e2a6935addb778bc761c", + "version-semver": "6.1.3", + "port-version": 0 + }, + { + "git-tree": "b25e2c719ecc3c1476ceb68579e97f3562eb9899", + "version-semver": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "0940f08a99ce3d6f46e2ad01242645ee4b4d61d5", + "version-semver": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "1d69299b89bc39acbf73afb5353a40f6540a04d2", + "version-semver": "6.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtdeclarative.json b/externals/vcpkg/versions/q-/qtdeclarative.json new file mode 100755 index 000000000..ffffb58e8 --- /dev/null +++ b/externals/vcpkg/versions/q-/qtdeclarative.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "551991d8ec2c004a196cc0c3e6acc8babe34546f", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "ea64315431fd028d453a27e999d7e696f48923d4", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "ede6e28a20ddf3b6d4cc7b1e7ac7dc41f80e64a8", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "986c605c0c11adc3c756743307730e41d1c16b5f", + "version-semver": "6.2.2", + "port-version": 1 + }, + { + "git-tree": "d4f31e8cfbb1e6c504ad8089e92e234b03a96679", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "3abe1c5e7e0fee7e89e99635bb1c7b4136854c2e", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "cc859e66bbcb0a45c5476ea8d882ce9c05af1e66", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "a4c4e942686e20cc25f4f608c7f423b295a11830", + "version-semver": "6.1.3", + "port-version": 0 + }, + { + "git-tree": "b283ef4063b4040b652dcfe42bf37006cded85a5", + "version-semver": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "54b33929f07b96d7284b3b79923cafd06bdcb207", + "version-semver": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "30dd12410732756cf29ae1317de8f029010c9f22", + "version-semver": "6.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtdeviceutilities.json b/externals/vcpkg/versions/q-/qtdeviceutilities.json new file mode 100755 index 000000000..795acfe14 --- /dev/null +++ b/externals/vcpkg/versions/q-/qtdeviceutilities.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "4945df086d916c7aa24e9ed44ac983b1ef65c84b", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "a688914d635b3b8f3295bfa76e3581b2db6d3d44", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "91bd6966a66abed85eab29725a1fa838b7416c9f", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "f6122e9d022e0d407e75f0af4b1faafa926f40cf", + "version-semver": "6.2.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtdoc.json b/externals/vcpkg/versions/q-/qtdoc.json new file mode 100755 index 000000000..2eee1ca53 --- /dev/null +++ b/externals/vcpkg/versions/q-/qtdoc.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "cb9dbafdcf670a693bbdfb8c9d9f3a6282e8a455", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "5e04878cf2a70ff87ae027aaefc5d40c328cffba", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "86089f5d381b17bdd89c9fd7953db2ff38dcec38", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "585382ff1e60120a0cf35e8b22e1b8152b83fa1d", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "d2640b87a1d668eeb0021bb55e7957f3d0d507e0", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "1c752aec2e3f90c70b41895bba5165bc86f14f06", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "c393da11dd6c6cbdbc01b32e123327a9971fa353", + "version-semver": "6.1.3", + "port-version": 0 + }, + { + "git-tree": "8a74cb89e81a66827639d45083efcc0e19260f70", + "version-semver": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "5bf8d66cd624cdbc6158070163895171a76feb3e", + "version-semver": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "e77ae101a8432595ff4f428ebbae194f720c2792", + "version-semver": "6.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtimageformats.json b/externals/vcpkg/versions/q-/qtimageformats.json new file mode 100755 index 000000000..c73d12763 --- /dev/null +++ b/externals/vcpkg/versions/q-/qtimageformats.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "8be93de3e45f5a409cb6606b1f9e240468513506", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "721c778bc9a6bd4e04a2e1cfb5437ffb7e59abc0", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "fff7150f31fcb2531adcb2f8fa42b6106c2893d1", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "038c5575e3e47c1512381b63138896df5fd713b6", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "e500b15fc978066e6c781d3d7f54867b31c8a77c", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "524dcbf6d624cf260f30c9c38a9823a089e5795f", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "37b1ff899c20c104a1987dff249c7b51755e4fc4", + "version-semver": "6.1.3", + "port-version": 0 + }, + { + "git-tree": "4e3d92605b4a236be559ec0bfb55a5a282de0fe7", + "version-semver": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "e5b06628ae9af1093a1b5a858cec9ca49d0488a6", + "version-semver": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "a663532b7f1e64a346f94c27270c2ae7142780ad", + "version-semver": "6.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtinterfaceframework.json b/externals/vcpkg/versions/q-/qtinterfaceframework.json new file mode 100755 index 000000000..a9fd1a0b4 --- /dev/null +++ b/externals/vcpkg/versions/q-/qtinterfaceframework.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "fdc3b41d77a6ee6160cfc442ddacf03aa91d0481", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "b54a54283fd7e3a5929b1d67721675ee1c8d5234", + "version": "6.2.4", + "port-version": 2 + }, + { + "git-tree": "e4969db9a78db8b04d4d803e4494a9f98007396a", + "version": "6.2.4", + "port-version": 1 + }, + { + "git-tree": "e36f5d74c2e94aa38c74b0fdfec8778fb7851523", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "42968cd54d91bbbf94a3c5aaaf6f1de876b0efac", + "version": "6.2.3", + "port-version": 2 + }, + { + "git-tree": "26fa7610125a5a6b54ced0cda87ab6621a42a1d9", + "version": "6.2.3", + "port-version": 1 + }, + { + "git-tree": "bdbc69bff861cdbd2dad8178d022b10d4f6abfe2", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "cf3fdd99f01775fe030233d5526e5e3069e3e813", + "version-semver": "6.2.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtkeychain-qt6.json b/externals/vcpkg/versions/q-/qtkeychain-qt6.json new file mode 100755 index 000000000..aa49b7faf --- /dev/null +++ b/externals/vcpkg/versions/q-/qtkeychain-qt6.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "3733fba48696a40e64b18c2d52d4adc04e6eb22d", + "version": "0.13.2", + "port-version": 1 + }, + { + "git-tree": "b3df36df3c274f528e53cd1f8366811231b15151", + "version": "0.13.2", + "port-version": 0 + }, + { + "git-tree": "29acc8309b4310f9b05f7c11cd81b0fd06dcbfff", + "version": "0.13.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtkeychain.json b/externals/vcpkg/versions/q-/qtkeychain.json new file mode 100755 index 000000000..f949e3cad --- /dev/null +++ b/externals/vcpkg/versions/q-/qtkeychain.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "eda48d2b83676b8209a40d68b286c570aeed785e", + "version": "0.13.2", + "port-version": 3 + }, + { + "git-tree": "6311d9dd13b97c8a01a980d7b42ea6cfecc4f765", + "version": "0.13.2", + "port-version": 2 + }, + { + "git-tree": "ef01f1d6401814e50c0438d3a8a7770568ac93ca", + "version": "0.13.2", + "port-version": 1 + }, + { + "git-tree": "2dda8930cc8e73b1741effda2750a980c0209e24", + "version": "0.13.2", + "port-version": 0 + }, + { + "git-tree": "ff34038b321dbfe954208b0ec4844c1066dde839", + "version": "0.13.1", + "port-version": 0 + }, + { + "git-tree": "477977da90b66a24d95b42e3776d17fd8e2735e0", + "version-string": "0.11.1", + "port-version": 1 + }, + { + "git-tree": "576c3e09b3b4e3dfe7ad0d8e69fe6d003da2de89", + "version-string": "0.11.1", + "port-version": 0 + }, + { + "git-tree": "9afe1a5db0e2d91f74b839a7e2c28996275ce3ad", + "version-string": "v0.9.1-1", + "port-version": 0 + }, + { + "git-tree": "891122d489d2a434d81298d41c8a881095fa57bd", + "version-string": "v0.9.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtlocation.json b/externals/vcpkg/versions/q-/qtlocation.json new file mode 100755 index 000000000..5e90ec0ef --- /dev/null +++ b/externals/vcpkg/versions/q-/qtlocation.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "a05ac67b49b7e904ecfbe1f717de1d958f534732", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "ef7c3db0a80c38d01ff341d090a291f4f1a098aa", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "589d851aebfb0c2dd786a5b0a8d7c33e56083223", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "d931a7ce122989a7d7740e0c196e736fa8caa3c3", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "7aeba7169d9ebb502e2fb276d36eaf0b562cefd7", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "ce4d2a217a74a82545c0ec6f5dcb343bedad3f6a", + "version-semver": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtlottie.json b/externals/vcpkg/versions/q-/qtlottie.json new file mode 100755 index 000000000..73f5ebe53 --- /dev/null +++ b/externals/vcpkg/versions/q-/qtlottie.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "ea1df3762dec91c8fb7709297007be459484e89c", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "57035eea5acd484e3a6a51f5da16046283c58f50", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "ab8ffeb4492e7cabd51fa8c5ead514e4764f67e5", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "1f23eead56f7491312b8b16fe1729aa1e808598d", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "73dbf3d8520fa5aba164701b37217ec55dbfc16d", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "a1ac4e53ead69723b671e153edd918c818380668", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "4c9e0cf0663bfb60c9f99f44302e0934c2e325bb", + "version-semver": "6.1.3", + "port-version": 0 + }, + { + "git-tree": "7d8b35dbd8e41a85097752ce057623380ae023f2", + "version-semver": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "58c76699b4615a2d73f708a7216bee9f1e04e265", + "version-semver": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "9a823fe108a9efbcd6cc83f5b7ff283a7500a9fb", + "version-semver": "6.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtmqtt.json b/externals/vcpkg/versions/q-/qtmqtt.json new file mode 100755 index 000000000..3a4f689df --- /dev/null +++ b/externals/vcpkg/versions/q-/qtmqtt.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "0f29ef7a81aacf9d33e6741138f80be59f69a8a2", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "0b09100a4e32240e79258ab69386b77370d916a0", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "adfab6c76e26f420db304e6d131cab246da43200", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "ab25c644271573b1106cea249b17740ff645a0dd", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "07e0bf2df2183ec6fb51a6f8d11a1ec3fb27a499", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "eca54f4259f492a6898e3108dbb0917eb52ff91f", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "fffa3edc4b989f223176e6c5fd37692361b3b713", + "version-semver": "6.1.3", + "port-version": 0 + }, + { + "git-tree": "7c21f77ae949388eb4787d5abc8e3a94667ee584", + "version-semver": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "a1503fed7d188e3ec61c12c590c34dd5bd80c88c", + "version-semver": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "a13ec187af88d84a53445c1bcb99aa9c60a9966d", + "version-semver": "6.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtmultimedia.json b/externals/vcpkg/versions/q-/qtmultimedia.json new file mode 100755 index 000000000..69df37193 --- /dev/null +++ b/externals/vcpkg/versions/q-/qtmultimedia.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "21bab604cd34ebe659fdc7b12249d1e69359d939", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "d0e46329a8e66cf3f95eca5d4018c955a8b54a15", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "3a6cdbf95fd19f196f2e0d7c9ed149e621690a7a", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "ddf67ffb4169c0c1d2a8e3b0cc317101fd2dfd95", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "e5a5554e1e9e997f82d4a90933b6a2edd2d0a2b0", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "e632d54bc7aea99a619c091cd43ea42e16ccefc2", + "version-semver": "6.2.0", + "port-version": 1 + }, + { + "git-tree": "3ddc9abc52e8df720dd1799b3ecaabe36bb5b7f3", + "version-semver": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtnetworkauth.json b/externals/vcpkg/versions/q-/qtnetworkauth.json new file mode 100755 index 000000000..4e5dabc7b --- /dev/null +++ b/externals/vcpkg/versions/q-/qtnetworkauth.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "2449ff55a2b817d0f651aa00b2cadc914c0b68ae", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "edc058f97084276593fa00ebc1ad1dbf865abb57", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "205649afe146022c19e1246083c83c4ca1573959", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "e6a02544f81615f1628e9f75af57af10697d51b0", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "5aa75624c0e5b7b13380a7c7b6f0a8cc4deec8d8", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "278a506f659c274c02bd9d811510b37f4574fd9c", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "9793619e1a8167daa86e50d533b0ec3d1a843568", + "version-semver": "6.1.3", + "port-version": 0 + }, + { + "git-tree": "d3dbdc5974015e8c9e41087a13cd2d83b5f33394", + "version-semver": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "1176858af90b88c983584218ed702abdb184b942", + "version-semver": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "e72fbfa1b11b2eb4673afbad3198462602ff7123", + "version-semver": "6.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtopcua.json b/externals/vcpkg/versions/q-/qtopcua.json new file mode 100755 index 000000000..c3f649c31 --- /dev/null +++ b/externals/vcpkg/versions/q-/qtopcua.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "8083780556aa4e951599cc798aa4a64a3ccf7341", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "7a9e72b88e14594db1752854941cb95174565be6", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "3fef74b1cf459126f776aa964fa6900e7be903fb", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "45d2bb4f558ea5cd5d321d92bd9d361cb53acb49", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "e9e3856e0b345b9b27921eadc6d45115fe70fa26", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "d61483af1def3a289ff148e0389d6d1d11011b13", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "3112bdb7d0ff9c2e023dd15446975806ffc9a87a", + "version-semver": "6.1.3", + "port-version": 0 + }, + { + "git-tree": "477ed1c8be16624d2d7ca9b548aea3d733c30c5e", + "version-semver": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "12ea0d30494f580a959c288490e0443e06ecc5b8", + "version-semver": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "22f34050bedeeaf97c6bb7cc6a556f6190ebf7c3", + "version-semver": "6.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtpositioning.json b/externals/vcpkg/versions/q-/qtpositioning.json new file mode 100755 index 000000000..cb3cf2885 --- /dev/null +++ b/externals/vcpkg/versions/q-/qtpositioning.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "47fd199ee3c949ade116a3c070f2aaaedd2aa91f", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "26bbae5f5512a6ca58eada26e54c94666174ec71", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "1c16604affb63067fcad166931565e516250434f", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "9e9bfb4dd17aa86cfcd5c80f0725c585ec140670", + "version-semver": "6.2.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtquick3d.json b/externals/vcpkg/versions/q-/qtquick3d.json new file mode 100755 index 000000000..9a84e09da --- /dev/null +++ b/externals/vcpkg/versions/q-/qtquick3d.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "d5c67539ad28c84e99778aa173cda5950873a6ee", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "0782a581d66c7895e5fe12eb225bbd63ff6d0799", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "822ca9b71fbf3eb7ae119c25e87dc8e00f70b0a5", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "81a5365f84b789b91715504392ce6e8b09b8702b", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "4431f13552a344e856d7c1486d1cd0b51649b372", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "a916150c6157e85d5d303817cd21e61d59061d73", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "c9871c8665ce287463902e6aa56b6f8b5836cd46", + "version-semver": "6.1.3", + "port-version": 0 + }, + { + "git-tree": "5f9db44634b543a34b525ffc1444f764afe0241e", + "version-semver": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "a9df9d17c45c39e2a6bf24cff0458bc690f16f1c", + "version-semver": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "8bbeae91ec304b0695da0e53b436e05a3ac03050", + "version-semver": "6.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtquickcontrols2.json b/externals/vcpkg/versions/q-/qtquickcontrols2.json new file mode 100755 index 000000000..babcf6e31 --- /dev/null +++ b/externals/vcpkg/versions/q-/qtquickcontrols2.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "cc6552504db6a9b651a65d98fbeb232152b7a8fe", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "cdf33560d3def651acf48341ea6dc0447c270c5b", + "version-semver": "6.1.3", + "port-version": 0 + }, + { + "git-tree": "f7a3f18e05756732c1344a336558851d7f1adafc", + "version-semver": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "ab667ec0d159c9e2b729dd42c7a0225c9cca6000", + "version-semver": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "601cfca0a0ae61f4737064a5003f5c83736eda30", + "version-semver": "6.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtquicktimeline.json b/externals/vcpkg/versions/q-/qtquicktimeline.json new file mode 100755 index 000000000..1cd036b97 --- /dev/null +++ b/externals/vcpkg/versions/q-/qtquicktimeline.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "28a8faa45cb13b376cd881be9494826bb9556009", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "7797c7b3d33d915ba656bfc26717623fcd187109", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "d213e9348a705383181332c7448c14b94235f89e", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "43a873627defa053a83b64a73f4deb978a55cdcb", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "8721d7b3901d80a38f30a05a27a9f111356611b5", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "34391c636963d95d64bb987d2edc1f75cbefa322", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "664a251eb795ac206c32b87e39060db32922fe4d", + "version-semver": "6.1.3", + "port-version": 0 + }, + { + "git-tree": "cd4994e897733cbbdab700567854117998f2986a", + "version-semver": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "8ae8944b42dacf2e13322dd2946e008056b27dea", + "version-semver": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "5fc074f13b064d388ee11fa172ea1bccfa3a448c", + "version-semver": "6.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtremoteobjects.json b/externals/vcpkg/versions/q-/qtremoteobjects.json new file mode 100755 index 000000000..69dc10ffc --- /dev/null +++ b/externals/vcpkg/versions/q-/qtremoteobjects.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "ce8e5b5c4570cf489ea6dd4e19c454e2e3ab54bb", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "c9f576479ffa0be9262702030362c0b030b1497b", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "a7a71c783e081189c9edb6a9e59707472863738f", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "caa274f1cb2a4e59d44aa9a22f039c040cf8823d", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "68c5454488b9c71989413817c7be02e3f758b11d", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "ef23f0d4f92edb51f9343655d0e9323395603dd7", + "version-semver": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtscxml.json b/externals/vcpkg/versions/q-/qtscxml.json new file mode 100755 index 000000000..28d95bcf1 --- /dev/null +++ b/externals/vcpkg/versions/q-/qtscxml.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "3b64cdc43d7e83cb693720f28c13408a39ad0afa", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "82cfc4f68723b511524573f7492e44c0326378f7", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "e7c00e022f07f448e2c6d2509bc6986f5b75d3b8", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "011114ad3a3f710f7229eef99eb75cb0a061fbe1", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "f614e8155cd17d2720c1d8ad027b6655fbd5a744", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "d174181a7c25a7f71ae1bb4ee31baa3e1c2aae77", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "c8e642305ce89691d07946081ac77aa3216dc418", + "version-semver": "6.1.3", + "port-version": 0 + }, + { + "git-tree": "12a020d23caf6939a8b10c126bd6dd5230f3c5bf", + "version-semver": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "fab8ae306010c0bc21189d746169b8f52d728c40", + "version-semver": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "015b07e4fe4a948c5c4d00d18c34eeb64c6752f4", + "version-semver": "6.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtsensors.json b/externals/vcpkg/versions/q-/qtsensors.json new file mode 100755 index 000000000..39a7e985e --- /dev/null +++ b/externals/vcpkg/versions/q-/qtsensors.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "8eefc49c6f1c874ba871cbb811e13b54a0fdf7ff", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "b52c1c71cc2c185f936b5e1e278ed4758bae6d6e", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "5515c06070b3f4b8ae13497824653e91d09476d7", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "d712603b6a1fd9781f0ecd55bed2a905256a1c14", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "1aa5854f556f4f448a406daf6fe368a91a5a0b15", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "972ae47281fcab019fe1c4802f207505538177a2", + "version-semver": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtserialbus.json b/externals/vcpkg/versions/q-/qtserialbus.json new file mode 100755 index 000000000..8cd62cd8a --- /dev/null +++ b/externals/vcpkg/versions/q-/qtserialbus.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "8df6a16221d7abc2af7d76a7c809901e5ae45484", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "97a896e4a1812c908a3db8b73676fbda9280569b", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "413e942ee8da80bd4f4f64b4eb4de978740a9d65", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "8f038e84c8f9b127bc7998328e546ca7fb4e7553", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "ce2504f7bda386450268832846376a48529bce73", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "fd16c70a834bf87bd68c99c997beb1765c556e80", + "version-semver": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtserialport.json b/externals/vcpkg/versions/q-/qtserialport.json new file mode 100755 index 000000000..e0803db96 --- /dev/null +++ b/externals/vcpkg/versions/q-/qtserialport.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "c74684c9a5e6b20ae4066a5f1b7af2decec2ced7", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "3a4f36aca9457e6a78f5b6c1f65b1d36f7666fd7", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "e500faa24ed6ecba0cfe64ce061763c47612c767", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "791608d6a9d95afa77b8db4a13a8f75928626926", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "ce4ab156356f3dcfe3fabbaf3f447ebbcd83972a", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "a14aaf079ec45dcd20bafaa8634a9474a70902f5", + "version-semver": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtshadertools.json b/externals/vcpkg/versions/q-/qtshadertools.json new file mode 100755 index 000000000..1cad19d17 --- /dev/null +++ b/externals/vcpkg/versions/q-/qtshadertools.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "75ac0d075ab14c918db6e38e398fca4bc877c146", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "7d8e8be656c7dc865d98021272c0f716c14866ed", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "cd4279442737df6c5e8ba533f8ce52b0a03cdc08", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "70e894d24707b42dd208c14f491cf3164caf22f9", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "e5831c09c8eaf4936eaef1c9a52079fc4e9ffa0f", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "c6e147b845c4bb60aede54ad9fcd6f6c8daad81b", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "4796eb58b411235a7f1b5e45728a9d1ca2c4f944", + "version-semver": "6.1.3", + "port-version": 0 + }, + { + "git-tree": "ef324b3fad33f5340cc707700c6666663ca94de2", + "version-semver": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "68ddad00b0176a27f54fa87b04c55e612f9ee87f", + "version-semver": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "40bcf168e248310e309ff201f6e96fa44b13c4e9", + "version-semver": "6.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtsvg.json b/externals/vcpkg/versions/q-/qtsvg.json new file mode 100755 index 000000000..e04f0ab9b --- /dev/null +++ b/externals/vcpkg/versions/q-/qtsvg.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "3bc8989c9c61cc741186f5dc7fc4eda94f20f6a4", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "df716d6718c7fad4a45e9eecc493c6c4cc752744", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "37349a1661b8bfda73318abcb5db080fb6fc71d6", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "d6c1c34779691c0150e573246351f00b6fe1126f", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "aa7f5015760b1bc7f653f30b170c1201a437cd86", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "7513170430df20e23c5013792b6c2fed5b82f7ba", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "ffffd840205636ee1ce99e623679ae7c0159872c", + "version-semver": "6.1.3", + "port-version": 0 + }, + { + "git-tree": "7fafae2d0f01bb61cff47d039ea5fa28f1f17967", + "version-semver": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "12588c47b6c0faa970cdfc550f5f1526e8811c79", + "version-semver": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "c30f32af2bdc755e3c2fcf0a0cc64f23632983bd", + "version-semver": "6.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qttools.json b/externals/vcpkg/versions/q-/qttools.json new file mode 100755 index 000000000..a04b333da --- /dev/null +++ b/externals/vcpkg/versions/q-/qttools.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "4bef4075be6e9e33ada53f0e2b3a37329187fa5a", + "version": "6.3.0", + "port-version": 1 + }, + { + "git-tree": "002b7b9432d4c1f49de7a486f70a673285cd98a8", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "a00f4470b9264ccffc7dfb230684126e61fb0f2c", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "79247ffe31fa15579c9069634c3d8778672928ca", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "655cd4b3e9d57ebee9768c2ab0d1d4936b409c02", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "eb472063be2d7b507cb027c217564f9288b24482", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "7473cbd91e3a1f662866cd695e94ff6a96a9cfb4", + "version-semver": "6.2.0", + "port-version": 1 + }, + { + "git-tree": "829976cbf157c36668dd1535bbeeadd2c1d39416", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "aeacc8ed34e798f5d73df932e09b1b619d89910b", + "version-semver": "6.1.3", + "port-version": 0 + }, + { + "git-tree": "f09d833f7ce9934bcc02650cd9c580b84932f6bc", + "version-semver": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "93ebe354c38cc124370c24d066d2a631444347e8", + "version-semver": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "ce742ed3dcd05d27552874077744ce955375390c", + "version-semver": "6.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qttranslations.json b/externals/vcpkg/versions/q-/qttranslations.json new file mode 100755 index 000000000..282764644 --- /dev/null +++ b/externals/vcpkg/versions/q-/qttranslations.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "09befbf6b2bd7001465003cbdd49ae138b754316", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "d16f4613ad42d01be87aa75bf23013dc7da1845a", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "3df8c89676608f1a4a58aeef4cb6e9edfe5666fb", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "51a188d5a80a0a9a3b5ec6319bfd0710e82d1769", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "9bf7f8aa0d90f72017d2e47f1a5628a93265b824", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "b6d759670e59feae1c8f81cc8e176cdd6f4f0b38", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "754d6279d7b7c6f7a3b976d90cba153fb12d036e", + "version-semver": "6.1.3", + "port-version": 0 + }, + { + "git-tree": "899f3c456dd7aad0a3680083ef8d0f118b6c6761", + "version-semver": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "8a70306f29690e0d5bb1a8fa99ed1c4108b5a247", + "version-semver": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "c452d28bfe0ffaf87dc622761dbd5aa217e938ca", + "version-semver": "6.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtvirtualkeyboard.json b/externals/vcpkg/versions/q-/qtvirtualkeyboard.json new file mode 100755 index 000000000..07b215716 --- /dev/null +++ b/externals/vcpkg/versions/q-/qtvirtualkeyboard.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "5804d29790d75c7a40c1fe9c4f54c3cfd03a5eaa", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "fcfb5975545e28e64e2f5c71c5f5a2cbc0b22c70", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "7ec572e9663958105a8c2b89c24a93d4280f002c", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "9bc69668572f2a83bf742b8b10ec3085f159d513", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "8b26db2df575c2b7a0341c7aaea9b88ee4e017b2", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "19665ad160707c2d22a6a1bc26ff9dc4a31a3304", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "09bccb97807efe784799cac5346a90fcc16d5517", + "version-semver": "6.1.3", + "port-version": 0 + }, + { + "git-tree": "f1ed3185f1204d32b530464acdd1f843e5edbf95", + "version-semver": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "6d8d0ee73c77d2b796669b3e874f91d0c7270aa7", + "version-semver": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "e267466518c4622bcd79052d2fcd8066da4202e8", + "version-semver": "6.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtwayland.json b/externals/vcpkg/versions/q-/qtwayland.json new file mode 100755 index 000000000..7f37d926e --- /dev/null +++ b/externals/vcpkg/versions/q-/qtwayland.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "9e7c6ecb71e8b4c3b8277f97f461d6f8b017ef1c", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "9930653065c44653bdf5f7285799d1a9ebb44d83", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "6eaf26953606c37b93a2e03d2162f80e4d2d4d6a", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "7df54bd36afd381966e0b082e49154b1eb818bf0", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "5801a51524f383c98f98da3d085cad1ecc338ca6", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "c2cf1a6edea89674bb5bdd2e3d1e9322055da7fd", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "a2e96d86ddc71f8fe862d70d4c685416cfb3479d", + "version-semver": "6.1.3", + "port-version": 2 + }, + { + "git-tree": "c520a4f068d807c3ec5bc04accf5af463007a1b8", + "version-semver": "6.1.2", + "port-version": 2 + }, + { + "git-tree": "39df5f0a73c89113b633ae47582d88e6b63b09c3", + "version-semver": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "3b9d48c269a94eb37c62a7e81358855065cdd6cf", + "version-semver": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "712d72065cb213eaaf1ce574c6d3fde99a8ff02e", + "version-semver": "6.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtwebchannel.json b/externals/vcpkg/versions/q-/qtwebchannel.json new file mode 100755 index 000000000..03c186376 --- /dev/null +++ b/externals/vcpkg/versions/q-/qtwebchannel.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "b8c14bb3f3297e816d3f0df2bc0377fce7963c55", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "7bc22dab6b47734c9163edde8bef8e9088a04301", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "0f4fee2471dba6631d06fcac6a9f99c38fe14649", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "d3f7068b76b91006bd426b173fe5e723ca6364c4", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "963ccd119990c7c3ae09e323da25a38b4893df78", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "f1a82a47775e3c354e5b2b6cb5d39aa2317a1e9b", + "version-semver": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtwebengine.json b/externals/vcpkg/versions/q-/qtwebengine.json new file mode 100755 index 000000000..842e438b9 --- /dev/null +++ b/externals/vcpkg/versions/q-/qtwebengine.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "fb2bc02591f25285ed7e085bce22001d42ec5d87", + "version": "6.3.0", + "port-version": 2 + }, + { + "git-tree": "6562d0a0294290afd20da039ff60602c1f3f4701", + "version": "6.3.0", + "port-version": 1 + }, + { + "git-tree": "47cd0b321b5eda832afbb46e58159ca3adb65ce9", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "7972a7fa77f29d83f91787c942f4f85d50651c05", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "c09764532fe7b4367f6438db92b59f41cb3d4e52", + "version": "6.2.3", + "port-version": 1 + }, + { + "git-tree": "97ae42eec1de17a95e9d48132ee94dd80ab4a239", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "9a3f041f2f3f5fdb5e1304efbae7ae0e9abbef79", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "4c69c49d9fe8599dd22538d9cef12e09cb29778e", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "47de546e07339c97ba827fa8b5ceba4d7198d561", + "version-semver": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtwebsockets.json b/externals/vcpkg/versions/q-/qtwebsockets.json new file mode 100755 index 000000000..e2499a6ce --- /dev/null +++ b/externals/vcpkg/versions/q-/qtwebsockets.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "615c601a62d67874adfb14ae7f1d9859f87a6719", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "78911113c7407ff6403479ace90d0f4b2656e517", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "cc3e9ce12b12aecdb4372cee226fcb0ddc4b0f34", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "e051a024f04ac4bbb3700a022df3dfb85c35267d", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "1c23c3b938eaf83f287a460d95695732a4b784d3", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "929a30289035e2424ecac2ae6c4059ec47820134", + "version-semver": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qtwebview.json b/externals/vcpkg/versions/q-/qtwebview.json new file mode 100755 index 000000000..699bcdf62 --- /dev/null +++ b/externals/vcpkg/versions/q-/qtwebview.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "248b7ff0cd48d36410f9fde1119d2624260a4c6a", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "8a8cb6fb5af80519ad2f3d0e9f80a027f1d16165", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "36832dd9f2bf65b94b7b51bf37db50eaf266baf8", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "ef310559b2cef5f8dd1e2eee6c2f52c3942d0f26", + "version-semver": "6.2.2", + "port-version": 0 + }, + { + "git-tree": "04d26846445cac21376cf3b80264394fb6a83778", + "version-semver": "6.2.1", + "port-version": 0 + }, + { + "git-tree": "f2d149cd37a47e54925f0e57aec8cb9816e10473", + "version-semver": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/quadtree.json b/externals/vcpkg/versions/q-/quadtree.json new file mode 100755 index 000000000..683efa19d --- /dev/null +++ b/externals/vcpkg/versions/q-/quadtree.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "9c4c1d118e5fc939670bd38e92453cfd3f92e3c5", + "version-string": "2020-04-13", + "port-version": 1 + }, + { + "git-tree": "c7e53493b566954c3cb3148dfbd4b43f28b9be8c", + "version-string": "2020-04-13", + "port-version": 0 + }, + { + "git-tree": "40f422891178a73ab9d7567a3dfa07ad86b4b350", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/quantlib.json b/externals/vcpkg/versions/q-/quantlib.json new file mode 100755 index 000000000..a3498ea87 --- /dev/null +++ b/externals/vcpkg/versions/q-/quantlib.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "f5eb0f25fa5fdff2d0fd4b5cc1f1bb2e98033b59", + "version": "1.26", + "port-version": 1 + }, + { + "git-tree": "3af9ced73240dfb4e1ec776c5f9a16ac277d1c27", + "version": "1.26", + "port-version": 0 + }, + { + "git-tree": "4d702f6d14c1a91b83a4950dd05e3b200700cfd8", + "version": "1.25", + "port-version": 0 + }, + { + "git-tree": "d8519a43e706ff22152e65942f48e5abd75bb76f", + "version": "1.24", + "port-version": 0 + }, + { + "git-tree": "b2d3e38a4ca6467154bf1a46fd2663d937c3858b", + "version": "1.22", + "port-version": 0 + }, + { + "git-tree": "bc5ea971009318ab7528c34d8ef715c3e59ed96e", + "version-string": "2019-09-02", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/quaternions.json b/externals/vcpkg/versions/q-/quaternions.json new file mode 100755 index 000000000..045481f05 --- /dev/null +++ b/externals/vcpkg/versions/q-/quaternions.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "99b78fe0eae2a9ccdad34ba39bc165eccc547c3b", + "version-string": "1.0.0", + "port-version": 1 + }, + { + "git-tree": "a8226de2b0c3e81fa54c32961d117b9a3b7b0f3b", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/quazip.json b/externals/vcpkg/versions/q-/quazip.json new file mode 100755 index 000000000..7433ea291 --- /dev/null +++ b/externals/vcpkg/versions/q-/quazip.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "92000bba1473465da5e5de8864acc0e49250b2f2", + "version": "1.3", + "port-version": 0 + }, + { + "git-tree": "7e1b1da3a71a9e98c52bad16aef6c0666d993b56", + "version": "1.1", + "port-version": 1 + }, + { + "git-tree": "2fcb780cdf45dcb2a99c42837d9be27f5d07615e", + "version": "1.1", + "port-version": 0 + }, + { + "git-tree": "eb05336d7d482b98ab3e83dbbc58116707f547d6", + "version-string": "0.9.1", + "port-version": 1 + }, + { + "git-tree": "27e10e01f2905c5274447470031f595c28e0eb39", + "version-string": "0.9.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/quickfast.json b/externals/vcpkg/versions/q-/quickfast.json new file mode 100755 index 000000000..a446f3445 --- /dev/null +++ b/externals/vcpkg/versions/q-/quickfast.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "69093dff874378ce87be6b821000e058e5ab3452", + "version-string": "1.5", + "port-version": 1 + }, + { + "git-tree": "3a43c333af274beae43a15f7d734a4146426273c", + "version-string": "1.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/quickfix.json b/externals/vcpkg/versions/q-/quickfix.json new file mode 100755 index 000000000..87b646b89 --- /dev/null +++ b/externals/vcpkg/versions/q-/quickfix.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "73e9e7e7bcc08f6f0f491d68cd2ff93f5571353f", + "version": "1.15.1", + "port-version": 7 + }, + { + "git-tree": "a9ec8c3d5dfd310a3f5d5c54bebc6030b4cad0c6", + "version": "1.15.1", + "port-version": 6 + }, + { + "git-tree": "d374a1da06a6765ceeb510d6b65afd8ee97194ad", + "version-string": "1.15.1", + "port-version": 5 + }, + { + "git-tree": "bff808505ccbbce1357d1998e69fe4813e21177d", + "version-string": "1.15.1-4", + "port-version": 0 + }, + { + "git-tree": "ad83e53295095f49ece0f08d5d519068567ccfff", + "version-string": "1.15.1-3", + "port-version": 0 + }, + { + "git-tree": "5c6b4024c833ce5fe546811f4cb2e0729df397aa", + "version-string": "1.15.1-1", + "port-version": 0 + }, + { + "git-tree": "925d15651a46667fadbc93686ddc7ceb415be83d", + "version-string": "1.15.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/quill.json b/externals/vcpkg/versions/q-/quill.json new file mode 100755 index 000000000..923936392 --- /dev/null +++ b/externals/vcpkg/versions/q-/quill.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "fb911c05f1ad501f9b87ea3918d4badef41d16e4", + "version": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "d663be1266a5e973411f7bf422d3b901609098e8", + "version": "1.7.2", + "port-version": 0 + }, + { + "git-tree": "bfe7d0bbdf62856534c0d3783135b2bca1fea312", + "version": "1.7.1", + "port-version": 0 + }, + { + "git-tree": "a267f26f50e991400ca01b2dd40dec6a71cefee3", + "version": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "19f0208595bbec6d64a4e34e351b530d091212bd", + "version-semver": "1.6.3", + "port-version": 4 + }, + { + "git-tree": "037a819f5cf482d84083318e120e076c711a2760", + "version-semver": "1.6.3", + "port-version": 3 + }, + { + "git-tree": "1d6790b5d6faf5173c73ea42e07acea665aebffc", + "version-semver": "1.6.3", + "port-version": 2 + }, + { + "git-tree": "53bbd43b741956bcb2d1e74cb34bca27b51b7d11", + "version-semver": "1.6.3", + "port-version": 1 + }, + { + "git-tree": "e6ee8372d06d69dda719c955d24baa1f61924f86", + "version-semver": "1.6.3", + "port-version": 0 + }, + { + "git-tree": "0e3b811db3b65c4239a657bfd1a2fae470a8096a", + "version-string": "1.6.2", + "port-version": 0 + }, + { + "git-tree": "aa542e38f0f2480e495b785840e919d46a1d58d5", + "version-string": "1.6.1", + "port-version": 1 + }, + { + "git-tree": "51f728199fde5bc02ecc29588236bb509cc4bb10", + "version-string": "1.6.1", + "port-version": 0 + }, + { + "git-tree": "2f457a33724dfdd8a3ad48e6d457559bd6040488", + "version-string": "1.6.0", + "port-version": 0 + }, + { + "git-tree": "5c355200eda32947dbe63e233b69406eba3fcfa0", + "version-string": "1.5.2", + "port-version": 0 + }, + { + "git-tree": "6c63c3f8614d12e5da6a8ae3cbc9d8e59a52aa75", + "version-string": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "7d1f9b6daa3945cd3c389a4840d8e65f9b98788e", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "40607c1b4f3b15f4346acbe53e4c97efc391da76", + "version-string": "1.3.3", + "port-version": 0 + }, + { + "git-tree": "6a2872ec44a6ecdeffc0458c846d90e3c440199e", + "version-string": "1.3.1", + "port-version": 0 + }, + { + "git-tree": "64771aa16a9f82ac8b0bf15c5c647edf6997b0e4", + "version-string": "1.2.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/quirc.json b/externals/vcpkg/versions/q-/quirc.json new file mode 100755 index 000000000..dc70374be --- /dev/null +++ b/externals/vcpkg/versions/q-/quirc.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "15bad29ef4d2466b236311ce7af075dbb9507ed9", + "version": "1.1", + "port-version": 2 + }, + { + "git-tree": "c4c19ac884d1a66e0ac073ff5bd99c2db1460015", + "version-string": "1.1", + "port-version": 1 + }, + { + "git-tree": "35b57df71d33fbebe4949081547473dd75d47178", + "version-string": "1.1", + "port-version": 0 + }, + { + "git-tree": "faa4541e95a245dc7c8787abd11a51a2b78b9460", + "version-string": "1.0-4", + "port-version": 0 + }, + { + "git-tree": "58671f87f70c18d16f75c60201ae2b58df9130cb", + "version-string": "1.0-3", + "port-version": 0 + }, + { + "git-tree": "21344fcb0602bf7573425fdd302a7786a8231b2b", + "version-string": "1.0-2", + "port-version": 0 + }, + { + "git-tree": "38ed7223f4563d345edbc928eb75a3283ad73c45", + "version-string": "1.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qwt-qt6.json b/externals/vcpkg/versions/q-/qwt-qt6.json new file mode 100755 index 000000000..6d1454bf8 --- /dev/null +++ b/externals/vcpkg/versions/q-/qwt-qt6.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "96c2132cd5810b4a9950650768fb759738d3b929", + "version-semver": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qwt.json b/externals/vcpkg/versions/q-/qwt.json new file mode 100755 index 000000000..d9652ae7f --- /dev/null +++ b/externals/vcpkg/versions/q-/qwt.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "c1e9f6474ec00dce373a287dcb04cca0a7398fa2", + "version-semver": "6.2.0", + "port-version": 2 + }, + { + "git-tree": "10d24bfb82979ffa078d34a17f976d2646e1cf5f", + "version-semver": "6.2.0", + "port-version": 1 + }, + { + "git-tree": "e7204097fda082c43e704e356702fd77aa3c9a52", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "6d80586d91e987e488367b16a11aa8d8d07205d3", + "version-string": "6.1.5", + "port-version": 0 + }, + { + "git-tree": "91c181ccce8241f1a71c6793ddc1435ac3142fb4", + "version-string": "6.1.4", + "port-version": 1 + }, + { + "git-tree": "cda71f93cd57ca9d3edc1da754773a789955a1b9", + "version-string": "6.1.4", + "port-version": 0 + }, + { + "git-tree": "6ecd69df07ed81f27c1f48d3da2ebe3e96d9f259", + "version-string": "6.1.3-12", + "port-version": 0 + }, + { + "git-tree": "6d49dc220505cfcaffa15076041a04c472e8115c", + "version-string": "6.1.3-11", + "port-version": 0 + }, + { + "git-tree": "ddd6e0960a91693203fc6207e49f01afb0ada692", + "version-string": "6.1.3-10", + "port-version": 0 + }, + { + "git-tree": "6f05fe69f2fc636982176d93b3cac3b81fa5c33f", + "version-string": "6.1.3-8", + "port-version": 0 + }, + { + "git-tree": "ac74d2ab39bcf9757ee26cb45073557526664522", + "version-string": "6.1.3-7", + "port-version": 0 + }, + { + "git-tree": "2aff021b72aa5882df97653ad71022ed466e98e9", + "version-string": "6.1.3-6", + "port-version": 0 + }, + { + "git-tree": "17798c48a5317ce0ae72e4c0eb7efe32fb7c338d", + "version-string": "6.1.3-5", + "port-version": 0 + }, + { + "git-tree": "c195033ff0c6a8aa95a35d052ce779e53c8a3d9c", + "version-string": "6.1.3-4", + "port-version": 0 + }, + { + "git-tree": "070fd87f3bc8cbaf77629d017e514919171a8025", + "version-string": "6.1.3-3", + "port-version": 0 + }, + { + "git-tree": "f77d5315def0e08ba1228bdf3c5a5ed0bfe3c22c", + "version-string": "6.1.3-2", + "port-version": 0 + }, + { + "git-tree": "9e8ba5d14e18279b0f221b3ae949545b48accfbe", + "version-string": "6.1.3-1", + "port-version": 0 + }, + { + "git-tree": "22ee99e9935e79a1cef0779435ac3d3b727e649a", + "version-string": "6.1.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/q-/qwtw.json b/externals/vcpkg/versions/q-/qwtw.json new file mode 100755 index 000000000..c1b92e2b2 --- /dev/null +++ b/externals/vcpkg/versions/q-/qwtw.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "b5e27a5ec415b3edbce8dd6ea8d09bf2022b75f1", + "version": "3.1.0", + "port-version": 2 + }, + { + "git-tree": "debc8598b11213981d8489a27ca97894a72621c6", + "version-string": "3.1.0", + "port-version": 1 + }, + { + "git-tree": "167a4247049896bc2c098541c74322adb3b98852", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "0039de1e3ace73cba523eec21547cc14647c7179", + "version-string": "3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rabit.json b/externals/vcpkg/versions/r-/rabit.json new file mode 100755 index 000000000..8a176c7db --- /dev/null +++ b/externals/vcpkg/versions/r-/rabit.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "9f9eebc8facd648396bcb224fbcad95893cdf5ce", + "version-string": "0.1", + "port-version": 3 + }, + { + "git-tree": "928c08f9223593bea452e7894a8aaa4f3a5bd13b", + "version-string": "0.1-2", + "port-version": 0 + }, + { + "git-tree": "eafd7521e2bd252af293a01f56022bca6f9a6b79", + "version-string": "0.1-1", + "port-version": 0 + }, + { + "git-tree": "0586fb6dd8dc27bf2217d52502755a6f28728f79", + "version-string": "0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/ragel.json b/externals/vcpkg/versions/r-/ragel.json new file mode 100755 index 000000000..92947bb2b --- /dev/null +++ b/externals/vcpkg/versions/r-/ragel.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "364b93a4fe696a4002011aec3acf202aafb74a30", + "version-string": "6.10", + "port-version": 4 + }, + { + "git-tree": "a20473ef22c6b5a89d5771504287875cd2a36c96", + "version-string": "6.10-3", + "port-version": 0 + }, + { + "git-tree": "d543dfa5aef6909e7e134dba28b33c4acc156091", + "version-string": "6.10-2", + "port-version": 0 + }, + { + "git-tree": "3bbfd5feed38f05bf3b9b092e45545e7027284f6", + "version-string": "6.10-1", + "port-version": 0 + }, + { + "git-tree": "5a98dffacb33d52e9480f37b9bb078a9c84af833", + "version-string": "6.10", + "port-version": 0 + }, + { + "git-tree": "d9ca7201afcc092b6fadcea2a4b34a650f689fb3", + "version-string": "6.9", + "port-version": 0 + }, + { + "git-tree": "c32fad8d4d537c8637c3490f0f453e81c0857c27", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/random123.json b/externals/vcpkg/versions/r-/random123.json new file mode 100755 index 000000000..37fb262d5 --- /dev/null +++ b/externals/vcpkg/versions/r-/random123.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c4e7e093d8eabdc89b0634e4a361e4a982c7cbe5", + "version": "1.14.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/randomstr.json b/externals/vcpkg/versions/r-/randomstr.json new file mode 100755 index 000000000..d0edba7c4 --- /dev/null +++ b/externals/vcpkg/versions/r-/randomstr.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "231d69b973b9219271281ebe6d125c4c31380b87", + "version-date": "2022-02-03", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rang.json b/externals/vcpkg/versions/r-/rang.json new file mode 100755 index 000000000..d950bce50 --- /dev/null +++ b/externals/vcpkg/versions/r-/rang.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "b053769b91b66e49a42e7d6ea245f1ea9e018c26", + "version": "3.2", + "port-version": 0 + }, + { + "git-tree": "fa33c08f090f08c0b6d4d1596384b92ccbaceeb6", + "version-string": "3.1.0", + "port-version": 1 + }, + { + "git-tree": "36461b54ab5f10f52e90b8b6781b705e79985321", + "version-string": "3.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/range-v3-vs2015.json b/externals/vcpkg/versions/r-/range-v3-vs2015.json new file mode 100755 index 000000000..49e74ab86 --- /dev/null +++ b/externals/vcpkg/versions/r-/range-v3-vs2015.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "7323da8a61ce8b5fc2e0cb3a59cff779c484e4e0", + "version-string": "20151130-vcpkg5", + "port-version": 1 + }, + { + "git-tree": "b135e301521d603130d2c80a01b39fbbce826518", + "version-string": "20151130-vcpkg5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/range-v3.json b/externals/vcpkg/versions/r-/range-v3.json new file mode 100755 index 000000000..07a0fffa3 --- /dev/null +++ b/externals/vcpkg/versions/r-/range-v3.json @@ -0,0 +1,114 @@ +{ + "versions": [ + { + "git-tree": "78edaab693f001b38b155c3ef35a85036fd938ae", + "version-date": "2021-11-02", + "port-version": 0 + }, + { + "git-tree": "fa8057ea7b4f44f684ce2e6178914dac0cafbe53", + "version-string": "0.11.0", + "port-version": 1 + }, + { + "git-tree": "21c30a70f1f205bec39020c41ace2a5e10a215fb", + "version-string": "0.11.0", + "port-version": 0 + }, + { + "git-tree": "5a01ea8bd3b90872dfc6d235e8de0064f6f714e0", + "version-string": "0.10.0-20200708", + "port-version": 0 + }, + { + "git-tree": "a313807875154f6bf3d35bb9b8f727bfdc20d78c", + "version-string": "0.10.0-20200425", + "port-version": 0 + }, + { + "git-tree": "70092d5f7193c97ea18ed0d665a327ad838a455a", + "version-string": "0.10.0", + "port-version": 0 + }, + { + "git-tree": "1a4aa57b09d499c32d3c45032d2bad9022458214", + "version-string": "0.9.1", + "port-version": 0 + }, + { + "git-tree": "2f6eea23c83e3d6ca411767b7a6e8fea64318c39", + "version-string": "0.9.0-20190822", + "port-version": 0 + }, + { + "git-tree": "e279a826d11e361c0f311cc33452cec5c30fc296", + "version-string": "0.5.0", + "port-version": 0 + }, + { + "git-tree": "067a01e7b00d50140b27debbb55fc653ab429dec", + "version-string": "0.4.0-20190212", + "port-version": 0 + }, + { + "git-tree": "f74fb1a256b214725b20dd6583448271a9d702e9", + "version-string": "0.4.0-20181129", + "port-version": 0 + }, + { + "git-tree": "b66f7e0af8c832bc7f358f33ac3bdafd385e73cd", + "version-string": "0.4.0-20181122", + "port-version": 0 + }, + { + "git-tree": "e64bbe004d1138d99133a6728dea08ca22ba77ba", + "version-string": "0.4.0-87a6c31", + "port-version": 0 + }, + { + "git-tree": "5f8c18fe9643edd3b732ef59331243713732bb8f", + "version-string": "0.4.0-01ccd0e", + "port-version": 0 + }, + { + "git-tree": "ba9caab1b1d04d4c08ba02e6765ad8784fddebc4", + "version-string": "0.4.0- 7f2eb04", + "port-version": 0 + }, + { + "git-tree": "ac29b501d8407345b9891a220fcdc454d6747cb0", + "version-string": "0.3.5", + "port-version": 0 + }, + { + "git-tree": "b1d636197e90f4008c7d1e452d76c4778a4476e2", + "version-string": "20151130-vcpkg5", + "port-version": 0 + }, + { + "git-tree": "0c28dbd9d9ca4de79c72d026ad1b4fc8f990cc86", + "version-string": "20151130-vcpkg4", + "port-version": 0 + }, + { + "git-tree": "43cd4438a584ba6d6e913f6caa7593193b1a8248", + "version-string": "20150729-vcpkg3", + "port-version": 0 + }, + { + "git-tree": "632521e9953eaf5d67a2d218c9559fe9b55eafae", + "version-string": "20150729-vcpkg2", + "port-version": 0 + }, + { + "git-tree": "3d2f85c0a5ebe150418478f512e093cef73287d8", + "version-string": "0.0.0-2", + "port-version": 0 + }, + { + "git-tree": "9d39a35ff17e942f23bde0c5e984678e4c708048", + "version-string": "0.0.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rapidcheck.json b/externals/vcpkg/versions/r-/rapidcheck.json new file mode 100755 index 000000000..874b552d1 --- /dev/null +++ b/externals/vcpkg/versions/r-/rapidcheck.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "137241bc40d8475b70a28ce182e41cb6036f49d9", + "version-date": "2021-12-20", + "port-version": 0 + }, + { + "git-tree": "3cdc87364b35dbbcb96376a19da063b6d6d008ec", + "version-date": "2021-10-10", + "port-version": 0 + }, + { + "git-tree": "f583dcd38987b483ebe1f1b954cc7fb21cd08144", + "version-string": "2020-08-25", + "port-version": 1 + }, + { + "git-tree": "b6d707d1c504b3dc0b529ba674a748f700b29f61", + "version-string": "2020-08-25", + "port-version": 0 + }, + { + "git-tree": "8b1dce27654237153afd12ef75302f789eaf3e53", + "version-string": "2018-11-05-2", + "port-version": 0 + }, + { + "git-tree": "13b582c4088b5849668608f582a03c113f4927fa", + "version-string": "2018-11-05-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rapidcsv.json b/externals/vcpkg/versions/r-/rapidcsv.json new file mode 100755 index 000000000..4785f328c --- /dev/null +++ b/externals/vcpkg/versions/r-/rapidcsv.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "712023c784b983f8f85088dedc94c0d6fa53907e", + "version": "8.53", + "port-version": 0 + }, + { + "git-tree": "48075cdee869e9fb897cf5a45aa0159cc742b213", + "version": "8.50", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rapidjson.json b/externals/vcpkg/versions/r-/rapidjson.json new file mode 100755 index 000000000..0199e789a --- /dev/null +++ b/externals/vcpkg/versions/r-/rapidjson.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "14f78d728ea7cd8b0872521a88e71162325a103f", + "version-date": "2020-09-14", + "port-version": 2 + }, + { + "git-tree": "6d70aec68e6db30b2fb6b659bc6f1453fe8c80a3", + "version-date": "2020-09-14", + "port-version": 1 + }, + { + "git-tree": "85e20cbcb5a3a60d6f64064055d149e2c2f01534", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "774a98d1e6f1f3ef3c209842e90c2887178ad8c8", + "version-string": "2020-02-08", + "port-version": 0 + }, + { + "git-tree": "88bad907ef9b4c572dbeca11c491ddb205ae01ef", + "version-string": "2019-06-28", + "port-version": 0 + }, + { + "git-tree": "ed6ea2be90d867ac327d6b89f8813c73e37d40b8", + "version-string": "d87b698-1", + "port-version": 0 + }, + { + "git-tree": "fa4095045d898afd3a3d64e6b1b3453a7ca99070", + "version-string": "d87b698 ", + "port-version": 0 + }, + { + "git-tree": "19a7ffcae9b4d393546e516274ad8ace062242f6", + "version-string": "1.1.0-3", + "port-version": 0 + }, + { + "git-tree": "f7425f3a260c69a9bfa207b2cae3ef6a1f57f635", + "version-string": "1.1.0-2", + "port-version": 0 + }, + { + "git-tree": "70185e740a69c90ef95e1c3cd2081d037dbc54c2", + "version-string": "1.1.0-1", + "port-version": 0 + }, + { + "git-tree": "d59e788caf8f5d28507589447072d827f0d68fbb", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "c0d8c86470921ef424f9f779ace8d4fda9987c64", + "version-string": "1.0.2-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rapidxml-ns.json b/externals/vcpkg/versions/r-/rapidxml-ns.json new file mode 100755 index 000000000..ea933065d --- /dev/null +++ b/externals/vcpkg/versions/r-/rapidxml-ns.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "073f99111cb3bba2632117601ccc024e3f98b508", + "version-string": "1.13.2", + "port-version": 1 + }, + { + "git-tree": "9a3b56d3389af2902391bae4f837006546e7bc4a", + "version-string": "1.13.2", + "port-version": 0 + }, + { + "git-tree": "1a19b835afd20847e6bcf678cf643c1a03b0273c", + "version-string": "1.13-04674e3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rapidxml.json b/externals/vcpkg/versions/r-/rapidxml.json new file mode 100755 index 000000000..af020f2d7 --- /dev/null +++ b/externals/vcpkg/versions/r-/rapidxml.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "160f717432a1eed69af62a9eb7c724031609994a", + "version-string": "1.13", + "port-version": 5 + }, + { + "git-tree": "d229da572bb02e1aeb304654a6e25ad55038ad02", + "version-string": "1.13-4", + "port-version": 0 + }, + { + "git-tree": "550b293b0b2eb29e8a23332fc4ff2500848580ca", + "version-string": "1.13-2", + "port-version": 0 + }, + { + "git-tree": "aa1373651012197cea3582b23cfb8643fb725c66", + "version-string": "1.13-1", + "port-version": 0 + }, + { + "git-tree": "d8cdb5e3c27ee26f69405eb3b39d18cc2e22b431", + "version-string": "1.13", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rappture.json b/externals/vcpkg/versions/r-/rappture.json new file mode 100755 index 000000000..ae1cfa5a6 --- /dev/null +++ b/externals/vcpkg/versions/r-/rappture.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "46511874b74e433c10e518d592ae43a475bb7aaf", + "version": "1.9", + "port-version": 1 + }, + { + "git-tree": "1bff8b135623078465252ff2d940407537851f2a", + "version-string": "1.9", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/raylib.json b/externals/vcpkg/versions/r-/raylib.json new file mode 100755 index 000000000..91b54dde0 --- /dev/null +++ b/externals/vcpkg/versions/r-/raylib.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "0b15021a8c0247cf83d5e4ca352b7e53b510b743", + "version-semver": "4.0.0", + "port-version": 3 + }, + { + "git-tree": "94a36f9f2d45dcba0e7ee689b5d58ad11bc4a4b9", + "version-semver": "4.0.0", + "port-version": 2 + }, + { + "git-tree": "4ab1c8406a740fce2da5e0844b10aea89850d044", + "version-semver": "4.0.0", + "port-version": 1 + }, + { + "git-tree": "394d0afab6e94ac36b289e350cdf2b8886560bb4", + "version-semver": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "9820d99ae1c7e23e42ee1bb3372ecee0de42c2bc", + "version-semver": "3.7.0", + "port-version": 2 + }, + { + "git-tree": "e27352fbab2a4e815a478265032a4faa60d34060", + "version-semver": "3.7.0", + "port-version": 1 + }, + { + "git-tree": "197576ef49480a84f0d5a4d153a1d9416b8230fc", + "version-semver": "3.7.0", + "port-version": 0 + }, + { + "git-tree": "b517bb75982839f879e33ed72c13ba824f7f7547", + "version-string": "3.5.0", + "port-version": 1 + }, + { + "git-tree": "5f584abef9d068dcada1382034eac435d75fd21d", + "version-string": "3.5.0", + "port-version": 0 + }, + { + "git-tree": "6954818970e2f326a5e33549cbe19109de98c1d1", + "version-string": "3.0.0", + "port-version": 3 + }, + { + "git-tree": "e8c9cd7323bb5e8e4629e532ede10247196af12d", + "version-string": "3.0.0", + "port-version": 2 + }, + { + "git-tree": "c7a8854788c91ea219d204d55317d8d4b75db7c8", + "version-string": "3.0.0", + "port-version": 1 + }, + { + "git-tree": "447d15c991d059e33830c3decddb2f332d60aace", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "cd9aae17d2439c30649e5429a9c079a68c72a0bf", + "version-string": "2.6.0", + "port-version": 0 + }, + { + "git-tree": "cbbc4ed87eef0f425da746c878d45eb2e858cb54", + "version-string": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "2d4b3cd681d973b4abcaee1b4c1568ee9c4917d5", + "version-string": "2019-04-27-2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rbdl-orb.json b/externals/vcpkg/versions/r-/rbdl-orb.json new file mode 100755 index 000000000..ad446aa6e --- /dev/null +++ b/externals/vcpkg/versions/r-/rbdl-orb.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "8471512e28002dc4d68bac4b43769172c22db5dd", + "version": "3.1.2", + "port-version": 1 + }, + { + "git-tree": "c6cec01f39c02f0ac2164e31e4615e21a80f4515", + "version": "3.1.2", + "port-version": 0 + }, + { + "git-tree": "5850c6901f4123803184bfe9b6e587af9350331a", + "version": "3.0.0", + "port-version": 1 + }, + { + "git-tree": "d475aade9be86281a6db741ee68e30a23d0f16d3", + "version": "3.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rbdl.json b/externals/vcpkg/versions/r-/rbdl.json new file mode 100755 index 000000000..b229336aa --- /dev/null +++ b/externals/vcpkg/versions/r-/rbdl.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "9d0f94e12844bb594f54986246e876569cfca0c1", + "version": "2.6.0", + "port-version": 3 + }, + { + "git-tree": "48b44c8cf3286f0ce9c87b95e126634997d03137", + "version": "2.6.0", + "port-version": 2 + }, + { + "git-tree": "44606d1a4e33112ca45274e823041ad877e62623", + "version": "2.6.0", + "port-version": 1 + }, + { + "git-tree": "c2823f8341acd1e564485661989fb3780a6b4a2a", + "version-string": "2.6.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/re2.json b/externals/vcpkg/versions/r-/re2.json new file mode 100755 index 000000000..5b1f86ba8 --- /dev/null +++ b/externals/vcpkg/versions/r-/re2.json @@ -0,0 +1,159 @@ +{ + "versions": [ + { + "git-tree": "484badfb46eb8db12106ed1017ddf4029e37d575", + "version-date": "2021-11-01", + "port-version": 0 + }, + { + "git-tree": "f3b26aeb23d7c925e205b158b0a05b7d446f154d", + "version-date": "2021-09-01", + "port-version": 1 + }, + { + "git-tree": "c2062d8577ace1dbccbb4b2a317f0e68571f0e2e", + "version-date": "2021-09-01", + "port-version": 0 + }, + { + "git-tree": "6cd6db642e5e56f83c6098da5d954a511b5b8f17", + "version-string": "2020-10-01", + "port-version": 1 + }, + { + "git-tree": "f64f9d63a95c27658c5c67753cf2ab9a9272858e", + "version-string": "2020-10-01", + "port-version": 0 + }, + { + "git-tree": "549b49be9b43c962910bb6673d1ee08f24657d35", + "version-string": "2020-06-01", + "port-version": 0 + }, + { + "git-tree": "d3b3cbd54faaf701f3843470ff1c8eba7ed71907", + "version-string": "2020-01-01", + "port-version": 0 + }, + { + "git-tree": "48c086d348333226b00d8cdf3aae00bec81c65e7", + "version-string": "2019-09-01", + "port-version": 0 + }, + { + "git-tree": "c0b3d46b2095c2593b793856dc5650742edea27a", + "version-string": "2019-08-01", + "port-version": 0 + }, + { + "git-tree": "d987b1a405803405767d5734544f0d4f19fc633b", + "version-string": "2019-05-07-2", + "port-version": 0 + }, + { + "git-tree": "2f27d70bd6316f84629ffa4b9f220f057df1a615", + "version-string": "2019-05-07-1", + "port-version": 0 + }, + { + "git-tree": "c35e47a87966d2f009fb8955147ed4030b5e690a", + "version-string": "2019-05-07", + "port-version": 0 + }, + { + "git-tree": "55ccf37b57d89d4403107faf75a448aea656aa11", + "version-string": "2019-04-19", + "port-version": 0 + }, + { + "git-tree": "3e880137385d8eadc2f5791288fcbadcc9875945", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "7046f92206ec1d0a90015907af7bb8b6f09bf234", + "version-string": "2019-01-30", + "port-version": 0 + }, + { + "git-tree": "8429571ddac445e6f97c72294cf864a65cb62c53", + "version-string": "2019-01-09", + "port-version": 0 + }, + { + "git-tree": "453a2c85bdd2af9b8ca61338ebff124efa4f40d5", + "version-string": "2018-12-14", + "port-version": 0 + }, + { + "git-tree": "340f35f1c87f1aac28ade26b855ba74cf60671b5", + "version-string": "2018-11-01-1", + "port-version": 0 + }, + { + "git-tree": "93733a17f5d3bc54da80a315504bc0808851f7c9", + "version-string": "2018-11-01", + "port-version": 0 + }, + { + "git-tree": "734134aa01681808e8d3c289d9628bb2ba9f7197", + "version-string": "2018-10-25", + "port-version": 0 + }, + { + "git-tree": "6bcbdf92c3aafb81457f5ae36cd3be6670a35585", + "version-string": "2018-10-11", + "port-version": 0 + }, + { + "git-tree": "22411be62c13838e81bf82d22dd3347f6467508f", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "595b58f86c23fe588ac5225f906b09d8261457f1", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "60a7708b885ab425a7fcbcb4206ba7164dc45bf0", + "version-string": "2018-06-28", + "port-version": 0 + }, + { + "git-tree": "6b85be0e8624d10d3875e5196de874f67d6f71c2", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "1e8f3497a6a4e685f25d5c59e71de609c345bba3", + "version-string": "2018-05-01", + "port-version": 0 + }, + { + "git-tree": "fe302b509d7af9b4250d046d862107e6c18bf384", + "version-string": "2018-03-17", + "port-version": 0 + }, + { + "git-tree": "ff0c92d032264889e208ea0eddcce8018740e061", + "version-string": "2018-03-07", + "port-version": 0 + }, + { + "git-tree": "fe26fedd4616c78dd914a6191be0b58ea0955188", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "b8fcfd1d060e93877ed0f8e874fcf4bda89ac2cf", + "version-string": "2017-12-01-1", + "port-version": 0 + }, + { + "git-tree": "930d6e87215aa6312db31ad18bf6623371cc0f99", + "version-string": "2017-12-01", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/readerwriterqueue.json b/externals/vcpkg/versions/r-/readerwriterqueue.json new file mode 100755 index 000000000..81d967a64 --- /dev/null +++ b/externals/vcpkg/versions/r-/readerwriterqueue.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "ae76a96e8113f07bd43b2d2239d06d542bb8b681", + "version-semver": "1.0.6", + "port-version": 0 + }, + { + "git-tree": "fbbab7a7ad42a964d56b72742980ce41d111e2e4", + "version-semver": "1.0.5", + "port-version": 0 + }, + { + "git-tree": "067260ce5553b99cc95abbd297271e51b4db138d", + "version-string": "1.0.3", + "port-version": 0 + }, + { + "git-tree": "0e75dd10dd7b379bb641faf82b804b92e036b6be", + "version-string": "1.0.2", + "port-version": 0 + }, + { + "git-tree": "8b345740f77df51b00a522a1d797ebd1531a19b9", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "96873034cfc92d7e9c9e7d7233d8b1a33fef6e1e", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/readline-osx.json b/externals/vcpkg/versions/r-/readline-osx.json new file mode 100755 index 000000000..ebc101673 --- /dev/null +++ b/externals/vcpkg/versions/r-/readline-osx.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "30d9d12e0486393aaf6929c5786829e5ca2cff5f", + "version-date": "2020-01-04", + "port-version": 0 + }, + { + "git-tree": "5b4b6fabb77d9f67ee0a4dcc7981040d9177caed", + "version": "8.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/readline-unix.json b/externals/vcpkg/versions/r-/readline-unix.json new file mode 100755 index 000000000..a0284c726 --- /dev/null +++ b/externals/vcpkg/versions/r-/readline-unix.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "cc7ba8176a2492af17dc561bcb82c36f7c89e540", + "version": "8.1", + "port-version": 1 + }, + { + "git-tree": "e2ef4d4f472d6fe4f36009032dfdd3279a50c754", + "version": "8.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/readline-win32.json b/externals/vcpkg/versions/r-/readline-win32.json new file mode 100755 index 000000000..cfba59150 --- /dev/null +++ b/externals/vcpkg/versions/r-/readline-win32.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "b1ed33b8ec37a1cf44926c9954b6943bce302b70", + "version": "5.0", + "port-version": 4 + }, + { + "git-tree": "5d2ea2655a570f6c0fd17689715d542336d531ea", + "version-string": "5.0", + "port-version": 3 + }, + { + "git-tree": "c548f83dcccce8ddf353d0e3710afd401a4e2304", + "version-string": "5.0-2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/readline.json b/externals/vcpkg/versions/r-/readline.json new file mode 100755 index 000000000..1581311c2 --- /dev/null +++ b/externals/vcpkg/versions/r-/readline.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "87822d2ce5b0936d374d94185da700e8a1cf4619", + "version-string": "0", + "port-version": 3 + }, + { + "git-tree": "b5c6800bc0cf924ec6bdbe627c9460839774f998", + "version-string": "0", + "port-version": 2 + }, + { + "git-tree": "1e0a62b3927f5b41e7861093dba7d2e2aa4de0b2", + "version-string": "0", + "port-version": 1 + }, + { + "git-tree": "6c4ab7a05504e5d9de58c16a5d6e4014ad3c70cb", + "version-string": "0", + "port-version": 0 + }, + { + "git-tree": "ed578a152a63b847267aa8c49898ef66090232c2", + "version-string": "5.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/readosm.json b/externals/vcpkg/versions/r-/readosm.json new file mode 100755 index 000000000..79eeaa116 --- /dev/null +++ b/externals/vcpkg/versions/r-/readosm.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "4a5f7efaec651bab56e95ba4db4e8d9316050b9c", + "version-string": "1.1.0a", + "port-version": 2 + }, + { + "git-tree": "32ab4a5c33cd4854b932547e791af28e39e4586e", + "version-string": "1.1.0a", + "port-version": 1 + }, + { + "git-tree": "8053400c918e6eb0fbde413936493a2824ae4a65", + "version-string": "1.1.0a", + "port-version": 0 + }, + { + "git-tree": "0346e89606c0f69f67ff5a427fbc9b9c73de9ccb", + "version-string": "1.1.0", + "port-version": 3 + }, + { + "git-tree": "a89219ee6bb9a801a434608924ca4bb796c74a24", + "version-string": "1.1.0-2", + "port-version": 0 + }, + { + "git-tree": "78e08bd3f63c926782689f5d115a6f4d7a08697d", + "version-string": "1.1.0-1", + "port-version": 0 + }, + { + "git-tree": "ec43020086ee43baa31012327acda22484cea22d", + "version-string": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/realsense2.json b/externals/vcpkg/versions/r-/realsense2.json new file mode 100755 index 000000000..8a9edfebc --- /dev/null +++ b/externals/vcpkg/versions/r-/realsense2.json @@ -0,0 +1,179 @@ +{ + "versions": [ + { + "git-tree": "1b967b8979ae93b95b16a7021348e04f534f28c0", + "version": "2.50.0", + "port-version": 1 + }, + { + "git-tree": "310025edf50886cce00c7864f6f21d1eda53b51b", + "version": "2.50.0", + "port-version": 0 + }, + { + "git-tree": "23387c9d073a3e686615bd5c9da9dbf81ae6406d", + "version": "2.49.0", + "port-version": 3 + }, + { + "git-tree": "25c2059547ebbf80994d111edbfc05686696f108", + "version": "2.49.0", + "port-version": 2 + }, + { + "git-tree": "b7c65d664a018a4d4922c844e8cbcbb05ba597eb", + "version": "2.49.0", + "port-version": 1 + }, + { + "git-tree": "196cd1829bb74acd275abdcbc5344238b5414661", + "version": "2.49.0", + "port-version": 0 + }, + { + "git-tree": "7126a8b0d6dffc469da9a7aeccca58d48f05b1d2", + "version": "2.42.0", + "port-version": 1 + }, + { + "git-tree": "4d8620f1907de79152086b5f98a2fce0cb24c438", + "version-string": "2.42.0", + "port-version": 0 + }, + { + "git-tree": "7a17b91ddec89be9345ca08ba098ffec3ee4618d", + "version-string": "2.40.0", + "port-version": 1 + }, + { + "git-tree": "c3d32b35fd3a11aec9bd32f3f458ea4b099816f7", + "version-string": "2.40.0", + "port-version": 0 + }, + { + "git-tree": "f48b9ba3766c9d4a9caaba9b197b6803fa5c3c8d", + "version-string": "2.39.0", + "port-version": 0 + }, + { + "git-tree": "f777a7b11740e82f55d8d9b3d7fc03f0deee742f", + "version-string": "2.38.1", + "port-version": 0 + }, + { + "git-tree": "898201ae7129a18fe36529403244d24b3a5e6814", + "version-string": "2.34.0", + "port-version": 0 + }, + { + "git-tree": "a8afd6ff21f56f7b79b08bebfe7a3f375b7e6f6b", + "version-string": "2.33.1-1", + "port-version": 0 + }, + { + "git-tree": "4da62021269d4ea6f654f33a19e85d0687b035a0", + "version-string": "2.33.1", + "port-version": 0 + }, + { + "git-tree": "83f70e361f16754d26315d9449ebd14892ac6e69", + "version-string": "2.30.0-1", + "port-version": 0 + }, + { + "git-tree": "79951c9c40032c0f478456d12792258034bff3bd", + "version-string": "2.30.0", + "port-version": 0 + }, + { + "git-tree": "b5ba3a07ac8607709e06253da477bbfa3c6a3905", + "version-string": "2.22.0-2", + "port-version": 0 + }, + { + "git-tree": "bef6fdb2889b66f6f5ae926bb1610d92b85a8e97", + "version-string": "2.22.0-1", + "port-version": 0 + }, + { + "git-tree": "f44bcdc98eda2ed8db7a722b0b020fb13de8b0f8", + "version-string": "2.22.0", + "port-version": 0 + }, + { + "git-tree": "a89c27e566b5992c19cb06182344cf4a5aadd486", + "version-string": "2.16.1-2", + "port-version": 0 + }, + { + "git-tree": "2602b74160ff2085f1b606567a21af6eb3f2da68", + "version-string": "2.16.1-1", + "port-version": 0 + }, + { + "git-tree": "0fb06200a3ca1e25ee97bee4a8e1c2cc3bd9ab2c", + "version-string": "2.16.1", + "port-version": 0 + }, + { + "git-tree": "9d940f86f0aa30932200e7c6bbf9fe2feaf024c2", + "version-string": "2.13.0", + "port-version": 0 + }, + { + "git-tree": "2e209a157f5d988af46641b5ca8a2edfbd335da4", + "version-string": "2.12.0", + "port-version": 0 + }, + { + "git-tree": "60f20778f8ee31064985f8ca427a6468ba1a4ed1", + "version-string": "2.11.1", + "port-version": 0 + }, + { + "git-tree": "bd29c956268cc5d304e2a31b3ef81547d997d631", + "version-string": "2.10.4", + "port-version": 0 + }, + { + "git-tree": "e320bdf5de8be64539e34195052048798813fffb", + "version-string": "2.10.1-1", + "port-version": 0 + }, + { + "git-tree": "eea3c22ca297a8a2add45d0bf597037a3a26af23", + "version-string": "2.10.1", + "port-version": 0 + }, + { + "git-tree": "89078d0af09a9e9a52d54a2c8832fba98a4157e5", + "version-string": "2.10.0", + "port-version": 0 + }, + { + "git-tree": "ae104e82457cdc59e68060cc501c1403638f680f", + "version-string": "2.9.1", + "port-version": 0 + }, + { + "git-tree": "4a3a709ea4c6a0fb1973018f42737c4a73c51711", + "version-string": "2.9.0", + "port-version": 0 + }, + { + "git-tree": "add5578c6b364d0c5c3f89a8c16a85dccb7756ab", + "version-string": "2.8.3", + "port-version": 0 + }, + { + "git-tree": "c0620272a0c0b41db2276833540ff26280b91aa2", + "version-string": "2.8.2", + "port-version": 0 + }, + { + "git-tree": "7e4ec18c378a996f84c806043c228cf6343fba97", + "version-string": "2.8.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/recast.json b/externals/vcpkg/versions/r-/recast.json new file mode 100755 index 000000000..76bccf1b4 --- /dev/null +++ b/externals/vcpkg/versions/r-/recast.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "fe2b42ef737e0b51a58bb9f56340e324ab8f82c3", + "version": "1.5.1", + "port-version": 5 + }, + { + "git-tree": "2f34af0b398b4c37f0cdf3fcd8dc9db965e4dd5e", + "version": "1.5.1", + "port-version": 4 + }, + { + "git-tree": "41f8cc06fc981d330671b88e08d02de55934155c", + "version-string": "1.5.1-3", + "port-version": 0 + }, + { + "git-tree": "fad17ed7cd463c5ea88994622c032f63777e5780", + "version-string": "1.5.1-2", + "port-version": 0 + }, + { + "git-tree": "2b0758eb4e063f94e56901802b0b16142d685878", + "version-string": "1.5.1-1", + "port-version": 0 + }, + { + "git-tree": "b06a15ec9377a51c3bcbd4919c9d7256e495334a", + "version-string": "1.5.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/redis-plus-plus.json b/externals/vcpkg/versions/r-/redis-plus-plus.json new file mode 100755 index 000000000..de899f3b7 --- /dev/null +++ b/externals/vcpkg/versions/r-/redis-plus-plus.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "a58c88604be6da2e638127442cc413c0504e2f51", + "version-semver": "1.3.2", + "port-version": 0 + }, + { + "git-tree": "4da3b8dd26c05426ae7d2a844f854423e9d0624d", + "version-semver": "1.3.1", + "port-version": 1 + }, + { + "git-tree": "a8bbde067a459c4fff18d7c63eb682487f1955e5", + "version-semver": "1.3.1", + "port-version": 0 + }, + { + "git-tree": "6a76da721b6b5c1820ccf60184f1c0aa44af788d", + "version-semver": "1.2.3", + "port-version": 0 + }, + { + "git-tree": "f4a1bafd6e609b8e012268c755d69566b8c29154", + "version-string": "1.2.1", + "port-version": 1 + }, + { + "git-tree": "a43514be68d7e26475daeaed2d3235c961e2759e", + "version-string": "1.2.1", + "port-version": 0 + }, + { + "git-tree": "a258d5e06eb7c9cc8728692e07808a508e9e0fd0", + "version-string": "1.1.2", + "port-version": 0 + }, + { + "git-tree": "76f65d11cd45dc6e727276346eeeb5cac320d7f0", + "version-string": "1.1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/refl-cpp.json b/externals/vcpkg/versions/r-/refl-cpp.json new file mode 100755 index 000000000..349e371cd --- /dev/null +++ b/externals/vcpkg/versions/r-/refl-cpp.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "cb8d6fa4720dd349ab60b95ad01380b55d0d4e1c", + "version": "0.12.3", + "port-version": 1 + }, + { + "git-tree": "7018b2c10e3c2e2be8dd774fb43d2f04fa520a02", + "version": "0.12.3", + "port-version": 0 + }, + { + "git-tree": "f5aea911f8cfd7c6eecadb50142f00205a2e7f57", + "version": "0.12.2", + "port-version": 0 + }, + { + "git-tree": "109d4729d1755ca3cc45a9b9e54b8e62e2ad20cd", + "version": "0.12.1", + "port-version": 0 + }, + { + "git-tree": "393ab14793adcef501554fcd747eb3d68bf21500", + "version-string": "0.12.0", + "port-version": 1 + }, + { + "git-tree": "eb6b33b43e2f278a4ad750c19fe60bd38caee781", + "version-string": "0.12.0", + "port-version": 0 + }, + { + "git-tree": "57827669f3ad3b3158c08d21e790bf48dab39c78", + "version-string": "0.9.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/refprop-headers.json b/externals/vcpkg/versions/r-/refprop-headers.json new file mode 100755 index 000000000..a1f653985 --- /dev/null +++ b/externals/vcpkg/versions/r-/refprop-headers.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "d8224d6d1e5b4d151c557a1055307624848ce8db", + "version-string": "2019-04-14", + "port-version": 1 + }, + { + "git-tree": "ad35ee67511cff7864369bdf20b166eaa2436468", + "version-string": "2019-04-14", + "port-version": 0 + }, + { + "git-tree": "d716c6c525f7334e51719ca947619cacf06c90e7", + "version-string": "2017-11-7-882aec454b2bc3d5323b8691736ff09c288f4ed6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rendergraph.json b/externals/vcpkg/versions/r-/rendergraph.json new file mode 100755 index 000000000..44a8b8681 --- /dev/null +++ b/externals/vcpkg/versions/r-/rendergraph.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "d76c6d57a40e1c6e5035e7bef12f6777523de738", + "version": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "d9a3f94947632fcba47a0110eecbbc8a72f5f908", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/replxx.json b/externals/vcpkg/versions/r-/replxx.json new file mode 100755 index 000000000..9e09a73bc --- /dev/null +++ b/externals/vcpkg/versions/r-/replxx.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "5f699bd3a8850016bfd6ff8a8eb03d82fe83bdb9", + "version": "0.0.4", + "port-version": 1 + }, + { + "git-tree": "d4ea343882654077d63b8e2781b380a545331935", + "version": "0.0.4", + "port-version": 0 + }, + { + "git-tree": "e6d52564217b918d799280703fdfde6e600272d4", + "version": "0.0.3", + "port-version": 0 + }, + { + "git-tree": "5e56bb5dd211e60671da16308a06e0738b7854c2", + "version-string": "0.0.2", + "port-version": 3 + }, + { + "git-tree": "f2a461d74082c267d369a79ba0c263285e31d746", + "version-string": "0.0.2-2", + "port-version": 0 + }, + { + "git-tree": "7191468a5bc03f1440dc5dec592b1f1e7c66f3c9", + "version-string": "0.0.2-1", + "port-version": 0 + }, + { + "git-tree": "adab8c9edc40ea88cadb12c4f48d4daf35328526", + "version-string": "0.0.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/reproc.json b/externals/vcpkg/versions/r-/reproc.json new file mode 100755 index 000000000..b90be3789 --- /dev/null +++ b/externals/vcpkg/versions/r-/reproc.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "eeac14685480439ee52ac05ec68faebb2cbaffad", + "version": "14.2.4", + "port-version": 1 + }, + { + "git-tree": "7fd87804e3a4b51c657b56c1be69d11e29168b89", + "version": "14.2.4", + "port-version": 0 + }, + { + "git-tree": "9f27a66507c39df365532d526313c247211aaa1d", + "version": "14.2.3", + "port-version": 0 + }, + { + "git-tree": "3173c9bf7aca150b6b7859a4c055ac778c157f58", + "version-string": "14.2.1", + "port-version": 1 + }, + { + "git-tree": "8f42086781fc869cc35be1abd9b64641c27028f7", + "version-string": "14.2.1", + "port-version": 0 + }, + { + "git-tree": "0af11f9791915f437e8d25a8c7df32684656a34d", + "version-string": "14.1.0", + "port-version": 0 + }, + { + "git-tree": "48b46ba0a0f1ad902474126ef8f04a28e3aeae2a", + "version-string": "12.0.0", + "port-version": 0 + }, + { + "git-tree": "51b6aa4072bbbcacaf8de6c25112a74193d16fc0", + "version-string": "11.0.1", + "port-version": 0 + }, + { + "git-tree": "aa6510c4c8c74137d514e1db6b8da02c101f2ab1", + "version-string": "10.0.3", + "port-version": 0 + }, + { + "git-tree": "03570aaa0c722c48d5f02ba504f7ac7b4b9651b8", + "version-string": "9.0.0", + "port-version": 0 + }, + { + "git-tree": "37e74f8a83cbcbdb5016fb7df6d8e1fc91b08cff", + "version-string": "8.0.1", + "port-version": 0 + }, + { + "git-tree": "28d841c1d8d986bffbf1cbd696ab1f3e584fef1d", + "version-string": "6.0.0-2", + "port-version": 0 + }, + { + "git-tree": "e772dc0359ef25c84c3fed842f3f18cd1ee45f6a", + "version-string": "6.0.0-1", + "port-version": 0 + }, + { + "git-tree": "f70b8a3a6f2481ccc507349949b2cf526b9da4f4", + "version-string": "6.0.0", + "port-version": 0 + }, + { + "git-tree": "dedda182a552e6517f6ec5fd8ce63b624117aecc", + "version-string": "v1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rest-rpc.json b/externals/vcpkg/versions/r-/rest-rpc.json new file mode 100755 index 000000000..8c2be0be3 --- /dev/null +++ b/externals/vcpkg/versions/r-/rest-rpc.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "05fad9e9e4a1d76707fbcb7da2d06338eb9ff8ce", + "version-string": "0.07", + "port-version": 2 + }, + { + "git-tree": "4e7a4470abca942f238467ad7c610255ce03330d", + "version-string": "0.07", + "port-version": 1 + }, + { + "git-tree": "225daecdc5e8a142e955bff1a665cf342bec979c", + "version-string": "0.07", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/restbed.json b/externals/vcpkg/versions/r-/restbed.json new file mode 100755 index 000000000..64738c153 --- /dev/null +++ b/externals/vcpkg/versions/r-/restbed.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "3b134a281ce09ee7258a281808cca0e40ff2f7d1", + "version": "4.8", + "port-version": 0 + }, + { + "git-tree": "deab0777d5581a96752beb7528254f02380daf46", + "version-string": "4.7", + "port-version": 0 + }, + { + "git-tree": "898a46b0dbfebab0a5acd3eb121f3c4f209afe3b", + "version-string": "4.16-07-28-2018-2", + "port-version": 0 + }, + { + "git-tree": "0534e7b967fcd3c70bf174f9261fa695852f650f", + "version-string": "4.16-07-28-2018-1", + "port-version": 0 + }, + { + "git-tree": "b599b1c2cc2917826eea086459f67fd9d8eeb138", + "version-string": "4.16-07-28-2018", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/restc-cpp.json b/externals/vcpkg/versions/r-/restc-cpp.json new file mode 100755 index 000000000..bf4a8ac5a --- /dev/null +++ b/externals/vcpkg/versions/r-/restc-cpp.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "98f2e4aed1e4c9a84df72116c4036a59a3d59436", + "version-semver": "0.10.0", + "port-version": 1 + }, + { + "git-tree": "5b6f1ef4d2f26a9053f956fe044300e3d0bed2cd", + "version-semver": "0.10.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/restclient-cpp.json b/externals/vcpkg/versions/r-/restclient-cpp.json new file mode 100755 index 000000000..06de99400 --- /dev/null +++ b/externals/vcpkg/versions/r-/restclient-cpp.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "7eeae27247c8a1e6f5dab2356cb94370aaabb7fc", + "version-date": "2022-02-09", + "port-version": 0 + }, + { + "git-tree": "ab5e52242e8403aa8b9b26a60baead129e2a1798", + "version-string": "0.5.2", + "port-version": 1 + }, + { + "git-tree": "997a41f7096c82db4bb868ade39fc8d51aee3569", + "version-string": "0.5.2", + "port-version": 0 + }, + { + "git-tree": "d2a204620305b4d18cfc6d564690648dc18ff299", + "version-string": "0.5.1-3", + "port-version": 0 + }, + { + "git-tree": "37c75c1136f56e613bd4c90cbeacc9836657a730", + "version-string": "0.5.1-2", + "port-version": 0 + }, + { + "git-tree": "1dc847e3cd1c293d01de31160de3ddacb197bcaf", + "version-string": "0.5.1-1", + "port-version": 0 + }, + { + "git-tree": "800b496ce65afb3c82c9708013aa07cef1f511e5", + "version-string": "0.5.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/restinio.json b/externals/vcpkg/versions/r-/restinio.json new file mode 100755 index 000000000..cc92309e5 --- /dev/null +++ b/externals/vcpkg/versions/r-/restinio.json @@ -0,0 +1,179 @@ +{ + "versions": [ + { + "git-tree": "07fadf731052fa7900593db32c0515cba8c45138", + "version": "0.6.15", + "port-version": 0 + }, + { + "git-tree": "ea4d99d764e913dd233ac8d1df27c6720f5ccbd9", + "version": "0.6.14", + "port-version": 1 + }, + { + "git-tree": "65493f16b394fd5a61f908afc058dae965a60989", + "version": "0.6.14", + "port-version": 0 + }, + { + "git-tree": "2e3eb39da32552d1e5682e5d450e29046c1990ad", + "version-string": "0.6.13", + "port-version": 0 + }, + { + "git-tree": "6bdc698a7199acce5694de2915955489c909e3bb", + "version-string": "0.6.12", + "port-version": 0 + }, + { + "git-tree": "b44734d557888f63a4f4a8b3d9c70f20888a9828", + "version-string": "0.6.11", + "port-version": 0 + }, + { + "git-tree": "cc02a804151994cd22477569f7ea05ef80f90c34", + "version-string": "0.6.10", + "port-version": 0 + }, + { + "git-tree": "e15dd852d4198fdfba9793974988a1605754193a", + "version-string": "0.6.9", + "port-version": 0 + }, + { + "git-tree": "b0dad4e1e7ab8724b9e0a82d3af5ec9cc2f9644f", + "version-string": "0.6.8.1", + "port-version": 0 + }, + { + "git-tree": "36a2eea646cca11a3f17e788a246deb2741ccebb", + "version-string": "0.6.8", + "port-version": 0 + }, + { + "git-tree": "ceccc54ac89a3af9dd4d4f1e4090341558dfb79a", + "version-string": "0.6.6", + "port-version": 0 + }, + { + "git-tree": "6d9bfa58ed7236e4e6e37776862220455ca3ef10", + "version-string": "0.6.5", + "port-version": 0 + }, + { + "git-tree": "b2ec054e44db5f2076cc17f4974ced14ce862097", + "version-string": "0.6.4", + "port-version": 0 + }, + { + "git-tree": "aced26a978d69b69a3177e9b5316defe19855ed3", + "version-string": "0.6.3.1", + "port-version": 0 + }, + { + "git-tree": "dfc8757e1df97757d32716888a5921b6a50dff04", + "version-string": "0.6.3", + "port-version": 0 + }, + { + "git-tree": "9f23badb37a277db0bb87ce2d52fb37fe6e55a72", + "version-string": "0.6.2", + "port-version": 0 + }, + { + "git-tree": "c3c4d2a326faed6f2532aee9d5f978f39cb0edff", + "version-string": "0.6.1.1", + "port-version": 0 + }, + { + "git-tree": "38959983d2b44f20b10d3eef65925b0d53fcc8b5", + "version-string": "0.6.1", + "port-version": 0 + }, + { + "git-tree": "d40852dac57523e02714339403d0c09f6063ba02", + "version-string": "0.6.0.1", + "port-version": 0 + }, + { + "git-tree": "0e221821b89a9fc19d3e8bce4304073fca398c06", + "version-string": "0.6.0", + "port-version": 0 + }, + { + "git-tree": "56a40e054c05b4b2a7ad4bf416ee08ba6076c4a3", + "version-string": "0.5.1.1", + "port-version": 0 + }, + { + "git-tree": "8bc1795265e01e95696339bbe5e81b8a50653992", + "version-string": "0.5.1-1", + "port-version": 0 + }, + { + "git-tree": "2597289d68ba1f51991470f109aedf807c5a83fe", + "version-string": "0.5.1", + "port-version": 0 + }, + { + "git-tree": "50b811003c7fd87e828ba433e8a56e408b628617", + "version-string": "0.5.0", + "port-version": 0 + }, + { + "git-tree": "0ce192e527402dd3047be1f47935c210f734c5cc", + "version-string": "0.4.9.1", + "port-version": 0 + }, + { + "git-tree": "7c517440efa52c744fe8eb7eebb0698b896decdf", + "version-string": "0.4.9", + "port-version": 0 + }, + { + "git-tree": "ea3acce82e9f14a264bd77a90b8f017f0b16e571", + "version-string": "0.4.8.7", + "port-version": 0 + }, + { + "git-tree": "4bd479902e98f12ae2e5958262577d91fffe7542", + "version-string": "0.4.8.6", + "port-version": 0 + }, + { + "git-tree": "1b5f7622afebaf6b7f6c85cdccfeda5f309212a3", + "version-string": "0.4.8.5", + "port-version": 0 + }, + { + "git-tree": "717ba57e09e122ae62c4afcdf4f40ef824a1bc66", + "version-string": "0.4.8.4", + "port-version": 0 + }, + { + "git-tree": "6fb14d3f6a1c023e5280ff86ce853f442a2cc0b2", + "version-string": "0.4.8", + "port-version": 0 + }, + { + "git-tree": "82cb0211d15bedd72925e143822eef110b687f13", + "version-string": "0.4.7", + "port-version": 0 + }, + { + "git-tree": "d1b2fa50f86289342cd3918d167c97e730d1b5aa", + "version-string": "0.4.6", + "port-version": 0 + }, + { + "git-tree": "cc492d3fb488efbc0789104585f3be7e718616a3", + "version-string": "0.4.5.1", + "port-version": 0 + }, + { + "git-tree": "0637d482f38fcafd74fa7cb5eb2d74dc0de89aa6", + "version-string": "0.4.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rexo.json b/externals/vcpkg/versions/r-/rexo.json new file mode 100755 index 000000000..74465b5fa --- /dev/null +++ b/externals/vcpkg/versions/r-/rexo.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "baf2bfcbd402fbf0f66d810edfff4d7fbd7d1583", + "version-semver": "0.2.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rhash.json b/externals/vcpkg/versions/r-/rhash.json new file mode 100755 index 000000000..194462b1b --- /dev/null +++ b/externals/vcpkg/versions/r-/rhash.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "85de223344c08a1efc2f9f6ec6bcb69529851199", + "version": "1.4.2", + "port-version": 1 + }, + { + "git-tree": "385025c1a8f84dfaf6035c2d730fb4ae0d8b16fd", + "version": "1.4.2", + "port-version": 0 + }, + { + "git-tree": "db6e2fc777b1ffb5257989484d303fc52e9b39f5", + "version": "1.4.0", + "port-version": 2 + }, + { + "git-tree": "ade1e1726434d28ad58715f9b6a3c005a1f243bb", + "version-string": "1.4.0", + "port-version": 1 + }, + { + "git-tree": "46e3af79b0c1d8514a24cbb981fec5b68875b3e5", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "924ca26c21be0fea1995aa9ffc233c26208f6be6", + "version-string": "1.3.9", + "port-version": 0 + }, + { + "git-tree": "e44c0e8c3571d8651ab11aa4300583f57d5e2603", + "version-string": "1.3.8", + "port-version": 0 + }, + { + "git-tree": "6d57cf3b12ca8539d2667518cbe7f71c287f96bb", + "version-string": "1.3.6", + "port-version": 0 + }, + { + "git-tree": "aad477371ff57c14958f068d33efd53ff208b876", + "version-string": "1.3.5-1", + "port-version": 0 + }, + { + "git-tree": "c528c41ebe44b1c6b71ae3aecf0f525b954791bd", + "version-string": "1.3.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rhasheq.json b/externals/vcpkg/versions/r-/rhasheq.json new file mode 100755 index 000000000..74506bc1e --- /dev/null +++ b/externals/vcpkg/versions/r-/rhasheq.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1f26547ad3e879dcf8083e3db488bdb1cda587f4", + "version": "0.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/riffcpp.json b/externals/vcpkg/versions/r-/riffcpp.json new file mode 100755 index 000000000..c80ef8a96 --- /dev/null +++ b/externals/vcpkg/versions/r-/riffcpp.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "cdebe05ce8fe9f40915d3a17abfcd79cac90c21f", + "version-string": "2.2.4", + "port-version": 1 + }, + { + "git-tree": "ed25689be7a34edbfbf89b39d877b87d0d4c8b2d", + "version-string": "2.2.4", + "port-version": 0 + }, + { + "git-tree": "9cbdad837d1ca4e47a9102b456e60e0432acb9ed", + "version-string": "2.2.2", + "port-version": 0 + }, + { + "git-tree": "5bf6d7c1f64c1ac55b37b440ea2306dc91485b50", + "version-string": "2.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/ring-span-lite.json b/externals/vcpkg/versions/r-/ring-span-lite.json new file mode 100755 index 000000000..8da793052 --- /dev/null +++ b/externals/vcpkg/versions/r-/ring-span-lite.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "1357f573addef91177f5912c9855cf3cfbc2b265", + "version": "0.6.0", + "port-version": 0 + }, + { + "git-tree": "aac3ae1d9cfcd716c2faf213aa7ed81b6271ab82", + "version-string": "0.3.0", + "port-version": 1 + }, + { + "git-tree": "b38a843aef63a57f2a0054dbab27166f95124090", + "version-string": "0.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rmlui.json b/externals/vcpkg/versions/r-/rmlui.json new file mode 100755 index 000000000..07524e0ac --- /dev/null +++ b/externals/vcpkg/versions/r-/rmlui.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "d98cdd5cd06d9640e908e0b08f81c35a07e36b18", + "version": "4.4", + "port-version": 0 + }, + { + "git-tree": "aaaaf8e01725428c22bcd3f6dcfef56568433dec", + "version": "4.3", + "port-version": 0 + }, + { + "git-tree": "67865d8852b0c90297adca30ee2640e469eb91d7", + "version": "4.2", + "port-version": 0 + }, + { + "git-tree": "83f463f3ebcc4e415d6903bea260fb1601a14dd2", + "version": "4.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/roaring.json b/externals/vcpkg/versions/r-/roaring.json new file mode 100755 index 000000000..4ec4c7616 --- /dev/null +++ b/externals/vcpkg/versions/r-/roaring.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "bd4d38440852b0d89e5bb4f1248f4090dcca5b8e", + "version-string": "2019-03-05", + "port-version": 3 + }, + { + "git-tree": "042f9916865df1c84ef9b48ccc9fe8802e945e94", + "version-string": "2019-03-05-2", + "port-version": 0 + }, + { + "git-tree": "40262571e8e96082262cf1b9024b8f0061fbbbfb", + "version-string": "2019-03-05-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/robin-hood-hashing.json b/externals/vcpkg/versions/r-/robin-hood-hashing.json new file mode 100755 index 000000000..071d88471 --- /dev/null +++ b/externals/vcpkg/versions/r-/robin-hood-hashing.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "79b90adbe2f012facdd920fdb6454bc21c84399e", + "version": "3.11.5", + "port-version": 0 + }, + { + "git-tree": "6f9ac2b49724c52f213148e36f09e886e346f1f8", + "version": "3.11.4", + "port-version": 0 + }, + { + "git-tree": "312efe5364281f04a0401cf9e7752041972f6e10", + "version": "3.11.3", + "port-version": 0 + }, + { + "git-tree": "16f3329478557c2ae15d37388108000c2d4c002b", + "version": "3.11.2", + "port-version": 0 + }, + { + "git-tree": "d6b144376a42518566210224cefbf1e29c24d205", + "version": "3.11.1", + "port-version": 0 + }, + { + "git-tree": "0f8facd0d45a81d17c839ec9b8cce03d718b9bd7", + "version": "3.10.0", + "port-version": 0 + }, + { + "git-tree": "e2025e5ad11f6546769a99e68bfcec0b3f18086c", + "version-string": "3.9.1", + "port-version": 0 + }, + { + "git-tree": "c52e097f28dbb67eeab2c757c7a6829fc84f802a", + "version-string": "3.9.0", + "port-version": 0 + }, + { + "git-tree": "3a4e4b53beba4d1fbc143e5e3de205e14e87b9d1", + "version-string": "3.8.0", + "port-version": 0 + }, + { + "git-tree": "a4744c65de47959b254e09d499921e47943c1266", + "version-string": "3.7.0", + "port-version": 0 + }, + { + "git-tree": "73d8ed567c1fd22997dc35f1f7ad55d8eecfc644", + "version-string": "3.4.0", + "port-version": 0 + }, + { + "git-tree": "a74578752d03fa762bd632714eb6ec907d5c75b3", + "version-string": "3.2.13", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/robin-map.json b/externals/vcpkg/versions/r-/robin-map.json new file mode 100755 index 000000000..fbbb42be0 --- /dev/null +++ b/externals/vcpkg/versions/r-/robin-map.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "3d169ebe25cc931f31bc343d6b21e734070902ed", + "version-semver": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "95d49e16c7a8ef523608ef8e7d8fb019085789b8", + "version-semver": "0.6.3", + "port-version": 1 + }, + { + "git-tree": "84f1433234bb4813feee71e4042174ec9e8d5a7a", + "version-semver": "0.6.3", + "port-version": 0 + }, + { + "git-tree": "a094be09be1634a9cefe7d3cfc2152005df6ed2a", + "version-string": "0.6.2", + "port-version": 0 + }, + { + "git-tree": "309f8bcfe8d6e02aa7bcf00eb167e8bbea77cbc1", + "version-string": "0.6.1", + "port-version": 0 + }, + { + "git-tree": "b6a643be513aff55126282a06b8780ad8a480790", + "version-string": "0.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rocksdb.json b/externals/vcpkg/versions/r-/rocksdb.json new file mode 100755 index 000000000..ecd1ee147 --- /dev/null +++ b/externals/vcpkg/versions/r-/rocksdb.json @@ -0,0 +1,164 @@ +{ + "versions": [ + { + "git-tree": "609a9d8753d7bb5e410ac6adbe53f097abdd0a76", + "version": "6.27.3", + "port-version": 0 + }, + { + "git-tree": "c65e598bc60aa73009c1c09f9644622dcfcbca50", + "version": "6.26.1", + "port-version": 0 + }, + { + "git-tree": "0d44549994de82c2029c4972e60c90e145bb9d40", + "version-string": "6.14.6", + "port-version": 1 + }, + { + "git-tree": "cf1be0926f4fd3d44f4c4031d1350bef2613c127", + "version-string": "6.14.6", + "port-version": 0 + }, + { + "git-tree": "51363e1c7426e485213c77f91c5e95995b7c7154", + "version-string": "6.13.3", + "port-version": 0 + }, + { + "git-tree": "37b422a46c0e5bbe64679b84020d01c829fa9df7", + "version-string": "6.11.4", + "port-version": 0 + }, + { + "git-tree": "ed0544af36bd1260b389eb7073cd7568265f4d44", + "version-string": "6.6.4-1", + "port-version": 0 + }, + { + "git-tree": "f1684686efa8c3646de01965f0d888a3e3b59f7d", + "version-string": "6.1.2-1", + "port-version": 0 + }, + { + "git-tree": "bea9d4b1232840edb1a00c3474a2567b4efcfd89", + "version-string": "6.1.2", + "port-version": 0 + }, + { + "git-tree": "a6b711baf9294aa2ff0ace7ddafd1913a3c74136", + "version-string": "6.0.2", + "port-version": 0 + }, + { + "git-tree": "dac11baa0de21a5b1a09bbc7f30896b84bd808d4", + "version-string": "6.0.1", + "port-version": 0 + }, + { + "git-tree": "8305c38530f49755b5354f86c595778519693ba6", + "version-string": "5.18.3-1", + "port-version": 0 + }, + { + "git-tree": "45721cb4d92e5506aa87438c39be38173e99d2af", + "version-string": "5.18.3", + "port-version": 0 + }, + { + "git-tree": "6ef03abab47fc44951a5889cb31cdd72f016806b", + "version-string": "5.17.2", + "port-version": 0 + }, + { + "git-tree": "bfd9bec80f98c9bd4e026145b93f20969c4bed6a", + "version-string": "5.15.10", + "port-version": 0 + }, + { + "git-tree": "1ccb8dd59640e66faac1d61cbe3e0e9e5ee0483a", + "version-string": "5.14.2", + "port-version": 0 + }, + { + "git-tree": "f3eb8d5aa1e2757ee3740ab86e749149e6535589", + "version-string": "5.12.5", + "port-version": 0 + }, + { + "git-tree": "aec7d0060e76c56cfa9cd54c2c58786293a15b31", + "version-string": "5.13.3", + "port-version": 0 + }, + { + "git-tree": "59479233a3aa1df895eaaf613e3361b1ba60aa3d", + "version-string": "5.13.1", + "port-version": 0 + }, + { + "git-tree": "d22e50f85c3d58ba00e1e35a7a10d20c8f499d3e", + "version-string": "5.12.4", + "port-version": 0 + }, + { + "git-tree": "51a861b9ce2c29f88da115f00cfa2630608e167f", + "version-string": "5.12.2", + "port-version": 0 + }, + { + "git-tree": "a7f780859d3e2b6b917c93243bd554931a190fca", + "version-string": "5.11.3-3", + "port-version": 0 + }, + { + "git-tree": "911394353a7e98f25f7dba2836046477bf2d62dd", + "version-string": "5.11.3-1", + "port-version": 0 + }, + { + "git-tree": "ba578c55a11eb7b7549de04abe00679ff62eecd2", + "version-string": "5.11.3", + "port-version": 0 + }, + { + "git-tree": "710ee5ed0ccc1e3ab8f8332d8fe942dc4f259637", + "version-string": "5.10.4-3", + "port-version": 0 + }, + { + "git-tree": "71b53c3b1f53e03f4bc2c40c98a00d49283c95b1", + "version-string": "5.10.4-2", + "port-version": 0 + }, + { + "git-tree": "74e920ffb03ba032c79638b0e437d5d39c20625d", + "version-string": "5.10.4-1", + "port-version": 0 + }, + { + "git-tree": "afa1430250c6825e6e364ed2a8f930fcef2e2388", + "version-string": "5.10.4", + "port-version": 0 + }, + { + "git-tree": "302d7aee2a23541e3e2fa885a7c76d9399284f69", + "version-string": "5.10.3", + "port-version": 0 + }, + { + "git-tree": "823f7dd5479723ee2e49e2b16e56cfcd6ae33ccd", + "version-string": "2017-06-28-18c63af6ef2b9f014c404b88488ae52e6fead03c-1", + "port-version": 0 + }, + { + "git-tree": "c2c7a6786e5495a74c25f7d596f76521507d8ed8", + "version-string": "2017-06-28-18c63af6ef2b9f014c404b88488ae52e6fead03c", + "port-version": 0 + }, + { + "git-tree": "80bc2ef427c23a8a7d32cef1324c2b5bca200479", + "version-string": "5.4.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rpclib.json b/externals/vcpkg/versions/r-/rpclib.json new file mode 100755 index 000000000..6bf33a47b --- /dev/null +++ b/externals/vcpkg/versions/r-/rpclib.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "b19a21c8e68b3e689495b961664f63450ffdd35d", + "version-semver": "2.3.0", + "port-version": 1 + }, + { + "git-tree": "8479e995436633dafc97a4dd951beff832bc3367", + "version-semver": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "b93584cf646f04baeffb45e6a185f6711192c164", + "version-string": "2.2.1", + "port-version": 3 + }, + { + "git-tree": "17aa69195415335b2b7ef28ebf3dda04d9fa99a0", + "version-string": "2.2.1", + "port-version": 2 + }, + { + "git-tree": "c8862c936b4626046e8ad176e6c4ccb98a7fe9d2", + "version-string": "2.2.1-1", + "port-version": 0 + }, + { + "git-tree": "22df5f4512083bb8362c953414a9eeddffdd2b0d", + "version-string": "2.2.1", + "port-version": 0 + }, + { + "git-tree": "eb5a52b4968cd12985dbf878cb1c54ad43bc41d5", + "version-string": "2.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rply.json b/externals/vcpkg/versions/r-/rply.json new file mode 100755 index 000000000..95424c741 --- /dev/null +++ b/externals/vcpkg/versions/r-/rply.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "c983b6df94d2d53f422e44c1b00ad033b5367781", + "version-string": "1.1.4", + "port-version": 1 + }, + { + "git-tree": "ba19464f45d20d65858ee505f02437f7a86d81e4", + "version-string": "1.1.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rs-core-lib.json b/externals/vcpkg/versions/r-/rs-core-lib.json new file mode 100755 index 000000000..0b635def3 --- /dev/null +++ b/externals/vcpkg/versions/r-/rs-core-lib.json @@ -0,0 +1,159 @@ +{ + "versions": [ + { + "git-tree": "32e499733540c4e81d0059159497ebd645ffd11f", + "version-string": "2020-09-14", + "port-version": 1 + }, + { + "git-tree": "a7ce454c4b0c719031a5251cd4cc74d0e0376ec5", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "58c798c1aa4450c0325bf0c2e29238aa1c35dc45", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "5eb400bafec5174122e7bcba550b73285f6a104a", + "version-string": "2019-05-07", + "port-version": 0 + }, + { + "git-tree": "4151c82d1e0cf58dcff920022bdebe0e31925cd5", + "version-string": "2019-04-19", + "port-version": 0 + }, + { + "git-tree": "e7d59e0048da1ca2bc0e5a89abbdc7f7f5efe630", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "3d3a94fc60b18fa21aeca06cf4c2082850f3ee53", + "version-string": "2019-01-30", + "port-version": 0 + }, + { + "git-tree": "09b8c34dd94d0d0eff0c2ccb28a0fe7908d067ae", + "version-string": "2019-01-09", + "port-version": 0 + }, + { + "git-tree": "f16f77c30216730bf0db13ea404d9e6d7819aad4", + "version-string": "2018-12-14", + "port-version": 0 + }, + { + "git-tree": "37b523b444450f2e70fdc433d07fdac87b11fbb2", + "version-string": "2018-10-25", + "port-version": 0 + }, + { + "git-tree": "23fa4496b1d39cbfcd4f8d42ab259679135dc2dd", + "version-string": "2018-10-11", + "port-version": 0 + }, + { + "git-tree": "72dd052029913817bfd6b722b9d31fa500893fc1", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "2cae29e873fa35b8d00785643b94ab7ef6caaed0", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "64230b8ec3e92ed3cdab25b214e0474f970440e7", + "version-string": "2018-07-08", + "port-version": 0 + }, + { + "git-tree": "fa58926cf85d29e10f0dd070277bc9bcb6529a08", + "version-string": "2018-07-03", + "port-version": 0 + }, + { + "git-tree": "4562ad16a3851b904efd340c7e0f4320165968fc", + "version-string": "2018-07-01", + "port-version": 0 + }, + { + "git-tree": "47d51cb93fb199d8250ef3f7b7c8de69e6da0525", + "version-string": "2018-06-15", + "port-version": 0 + }, + { + "git-tree": "6ce7f6fa8c5357a42c5a3ab57f0177368eaac381", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "4f5248863e9ae46ef4f01ca226d37d725fe8638f", + "version-string": "2018-05-01", + "port-version": 0 + }, + { + "git-tree": "f1d5d6a55d4ace7ef6041cedd8a90ddc7e811c32", + "version-string": "2018-04-25", + "port-version": 0 + }, + { + "git-tree": "6ea5b287f2a33069f461b60c16d7f2158f8de84e", + "version-string": "2018-04-12", + "port-version": 0 + }, + { + "git-tree": "39ba641821381be7d8ed7b986e98b2f10a9104d5", + "version-string": "2018-04-09", + "port-version": 0 + }, + { + "git-tree": "ce03bc199940abddafb0d5a09e8c6c803b9dff4d", + "version-string": "2018-04-06", + "port-version": 0 + }, + { + "git-tree": "255500f1b230ba6ce8d100ee0edcb5af3d4a6338", + "version-string": "2018-04-05", + "port-version": 0 + }, + { + "git-tree": "2b9d817348c033840d9c3fa66dbf3a47acd7ec9b", + "version-string": "2018-03-29", + "port-version": 0 + }, + { + "git-tree": "9e7be4a63c2e499f9155accd62943c6af8f1913c", + "version-string": "2018-03-17", + "port-version": 0 + }, + { + "git-tree": "69c257f9c3ce8d27ebe51979704ca1a37997bedc", + "version-string": "2018-03-11", + "port-version": 0 + }, + { + "git-tree": "71695c67eaebc2f963af47f03caecd22ee0424c8", + "version-string": "2018-03-07", + "port-version": 0 + }, + { + "git-tree": "603ff607c03a4d9b038ef88c90cffa98bd00ba3b", + "version-string": "2018-03-02", + "port-version": 0 + }, + { + "git-tree": "d29b421eb1cd4e85a29227700df9cbf7b440c8c9", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "ff8435c7ba0300d1a5205464aa0ee3c8faba06b7", + "version-string": "commit-1ed2dadbda3977b13e5e83cc1f3eeca76b36ebe5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rsasynccpp.json b/externals/vcpkg/versions/r-/rsasynccpp.json new file mode 100755 index 000000000..fbd102a5d --- /dev/null +++ b/externals/vcpkg/versions/r-/rsasynccpp.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "7fc33d5002210774c5e4d7450a0cd88c3be82ca8", + "version": "0.0.7", + "port-version": 1 + }, + { + "git-tree": "80995d80f9e7e551f8305ce2cecb0a91bc9c457a", + "version": "0.0.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rsig.json b/externals/vcpkg/versions/r-/rsig.json new file mode 100755 index 000000000..3af215f27 --- /dev/null +++ b/externals/vcpkg/versions/r-/rsig.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ead8c39f676072093b0b65df27d2f34414ef056a", + "version-semver": "0.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rsm-binary-io.json b/externals/vcpkg/versions/r-/rsm-binary-io.json new file mode 100755 index 000000000..213de95d5 --- /dev/null +++ b/externals/vcpkg/versions/r-/rsm-binary-io.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "a170dd2013d45c86b272169552cf4ac52a5d1c79", + "version-semver": "2.0.5", + "port-version": 0 + }, + { + "git-tree": "954debdfb4b8f785728e7c263ea3ea3ee7093253", + "version-semver": "2.0.4", + "port-version": 1 + }, + { + "git-tree": "36b0aaf84f89c1ba6e63fe0da7ab72b6c1ccf535", + "version-semver": "2.0.4", + "port-version": 0 + }, + { + "git-tree": "33782ecb57f5016dbaa8b2a2cd3f66cf80437027", + "version-semver": "2.0.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rsm-bsa.json b/externals/vcpkg/versions/r-/rsm-bsa.json new file mode 100755 index 000000000..4211b79cd --- /dev/null +++ b/externals/vcpkg/versions/r-/rsm-bsa.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "f91c3a5ffa0abe0eb4b3dc47421fb302dd258b05", + "version-semver": "4.0.3", + "port-version": 0 + }, + { + "git-tree": "c1791d77c435bd1a78a330e3c0bab2da49b8f183", + "version-semver": "4.0.2", + "port-version": 0 + }, + { + "git-tree": "ab00b90abe4a8c06ede41183ef67b2208ae42297", + "version-semver": "4.0.0", + "port-version": 1 + }, + { + "git-tree": "a41057388bf027523e46eed7031efc1fb3920c17", + "version-semver": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "465b19a5d463c1a9b54041b30600599ad0d5ac96", + "version-semver": "2.0.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rsm-mmio.json b/externals/vcpkg/versions/r-/rsm-mmio.json new file mode 100755 index 000000000..31ae61086 --- /dev/null +++ b/externals/vcpkg/versions/r-/rsm-mmio.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "b64c5538a5de9cc3e4e516ba97f437480b94c6f0", + "version-semver": "1.1.0", + "port-version": 2 + }, + { + "git-tree": "634597e88010f239748fafb52c6e8f431242b53a", + "version-semver": "1.1.0", + "port-version": 1 + }, + { + "git-tree": "8a7d738a20500733ea97af87e6f83df5558856c9", + "version-semver": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rsocket.json b/externals/vcpkg/versions/r-/rsocket.json new file mode 100755 index 000000000..9b4d581a3 --- /dev/null +++ b/externals/vcpkg/versions/r-/rsocket.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "073c3faa3992179768ce7e76cc7d39b654db9e8c", + "version-string": "2021.08.30.00", + "port-version": 1 + }, + { + "git-tree": "9dbf0f51130cc7c6e2c23a2ca3a104e22384f4e7", + "version-string": "2021.08.30.00", + "port-version": 0 + }, + { + "git-tree": "79beeb5c846c3ecdb386e7b3445adf1ac42314df", + "version-string": "2020.05.04.00", + "port-version": 3 + }, + { + "git-tree": "c7ad735194f400692ba373c493c23778cbfe2c79", + "version-string": "2020.05.04.00", + "port-version": 2 + }, + { + "git-tree": "adbdcdcb2c77bb53a1c00f41307308cfc8e7549f", + "version-string": "2020.05.04.00-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rtabmap.json b/externals/vcpkg/versions/r-/rtabmap.json new file mode 100755 index 000000000..1ef4831fd --- /dev/null +++ b/externals/vcpkg/versions/r-/rtabmap.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "cf41f524585ec0c2dd5b8c7d8b455a79265b62ea", + "version": "0.20.13", + "port-version": 3 + }, + { + "git-tree": "3dc228c0e837f979396a930bc24e8cf92f6190e3", + "version": "0.20.13", + "port-version": 2 + }, + { + "git-tree": "93a792dbedcec5e900509396ebbe4461cde51320", + "version-string": "0.20.13", + "port-version": 1 + }, + { + "git-tree": "07422ec8ed79148e476dbb807db950ed78852ca0", + "version-string": "0.20.3", + "port-version": 1 + }, + { + "git-tree": "9cfc9dfab43f0ea8551045a9131e777f6e9a6f52", + "version-string": "0.20.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rtaudio.json b/externals/vcpkg/versions/r-/rtaudio.json new file mode 100755 index 000000000..b8c79b739 --- /dev/null +++ b/externals/vcpkg/versions/r-/rtaudio.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "21e8b0bced3d3323d342ac96a2b779415fdd11ac", + "version-date": "2021-11-16", + "port-version": 0 + }, + { + "git-tree": "603a92374a5c37c3efb3bc48aaee17b64046f7be", + "version-date": "2021-08-15", + "port-version": 2 + }, + { + "git-tree": "89b766b5d1b97a4e306dd358db18a2a5d0505824", + "version-date": "2021-08-15", + "port-version": 1 + }, + { + "git-tree": "551c1a7847652aa574e0af5af18d00b6e55fd034", + "version-date": "2021-08-15", + "port-version": 0 + }, + { + "git-tree": "73b803ac8a870dd48165b34aecc29f2155b5b172", + "version-date": "2021-05-18", + "port-version": 1 + }, + { + "git-tree": "0c7518511b154ea4ca636e2f6c43248b59cb47ed", + "version-date": "2021-05-18", + "port-version": 0 + }, + { + "git-tree": "59166c851bb292b52492034aa3167e1be5142663", + "version-date": "2021-04-30", + "port-version": 0 + }, + { + "git-tree": "088d877f612f5f77cb47a93b0854491baebb5178", + "version-date": "2021-01-25", + "port-version": 0 + }, + { + "git-tree": "264f4c8d4aadd733d12dbf0d47b882c94f2e3f1f", + "version-string": "5.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rtlsdr.json b/externals/vcpkg/versions/r-/rtlsdr.json new file mode 100755 index 000000000..38c873144 --- /dev/null +++ b/externals/vcpkg/versions/r-/rtlsdr.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "62e4eb78a7e4f9cbbd24db08dd3f59ed284222e1", + "version-date": "2020-04-16", + "port-version": 3 + }, + { + "git-tree": "5ba19a6253c583cb9d97ea7ad3570c49284fadb1", + "version-string": "2020-04-16", + "port-version": 2 + }, + { + "git-tree": "bffd64982c9671e345a72feac3889c56504117a2", + "version-string": "2020-04-16-1", + "port-version": 0 + }, + { + "git-tree": "2c9e6c9e1810e31d004c9e1658266480f285282c", + "version-string": "2020-04-16", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rtmidi.json b/externals/vcpkg/versions/r-/rtmidi.json new file mode 100755 index 000000000..ec95ea91a --- /dev/null +++ b/externals/vcpkg/versions/r-/rtmidi.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "70873823ce910dcf80078a94f12191371523d84c", + "version": "5.0.0", + "port-version": 2 + }, + { + "git-tree": "30614a92baff91c2d2790029179dbb37122ca331", + "version": "5.0.0", + "port-version": 1 + }, + { + "git-tree": "4eb19141251ff7759838e0ab10f35876583d367b", + "version-semver": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "1d922425c684e2dd87ea1691b2ac8f1c0fd808e4", + "version-semver": "4.0.0", + "port-version": 5 + }, + { + "git-tree": "9d72ff2345f2c1b08f4808cedaa0caf87156d295", + "version-semver": "4.0.0", + "port-version": 4 + }, + { + "git-tree": "4c13583da321fa3efa7a075032d0ed880dd15e48", + "version-semver": "4.0.0", + "port-version": 3 + }, + { + "git-tree": "65614f322a89cff92478b3f6736d287653085a34", + "version-string": "4.0.0", + "port-version": 2 + }, + { + "git-tree": "754177ab1ad5e34ea921d96ef93bcb73515ab5a6", + "version-string": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "63f1f98aa3035ed36745bde36f67b5ce6f69a03f", + "version-string": "2.1.1-2", + "port-version": 0 + }, + { + "git-tree": "526fe6f5bf1e9503d15124eb29847b80567e79d4", + "version-string": "2.1.1-1", + "port-version": 0 + }, + { + "git-tree": "7a925416479adf4622041efea76de80e0c7aa3d1", + "version-string": "2.1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rttr.json b/externals/vcpkg/versions/r-/rttr.json new file mode 100755 index 000000000..a3dccce79 --- /dev/null +++ b/externals/vcpkg/versions/r-/rttr.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "14ae0cb613a9536333e7463b862276ad0e2e89ee", + "version": "0.9.6", + "port-version": 4 + }, + { + "git-tree": "ce9e17ebafad158458c38697b246601e00b61ae8", + "version-string": "0.9.6", + "port-version": 3 + }, + { + "git-tree": "7e0d800947d2f880f3dc3c286f8ce7d3c8b4abf1", + "version-string": "0.9.6-2", + "port-version": 0 + }, + { + "git-tree": "8cdbf35d96880024cc072dbcdae83191b46b1232", + "version-string": "0.9.6-1", + "port-version": 0 + }, + { + "git-tree": "41fb753caeafab4b2b9e2ffd0b165c71da905a8a", + "version-string": "0.9.6-0", + "port-version": 0 + }, + { + "git-tree": "20b9c0553deec3117a3693c61a1b66a0136cdcb6", + "version-string": "0.9.5-3", + "port-version": 0 + }, + { + "git-tree": "144f119ad470cc8881e3f144f59e2b15f63ff898", + "version-string": "0.9.5-2", + "port-version": 0 + }, + { + "git-tree": "6d1f8eacc4a751037ff054f94c7151fd1e47b8cb", + "version-string": "0.9.5-1", + "port-version": 0 + }, + { + "git-tree": "6050483a4ffb7b8d7ff1750a353db4db8b6b6b3e", + "version-string": "0.9.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rxcpp.json b/externals/vcpkg/versions/r-/rxcpp.json new file mode 100755 index 000000000..d545b8340 --- /dev/null +++ b/externals/vcpkg/versions/r-/rxcpp.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "69044b3fc33b35dab3f62471daf96a2a2b27dc0a", + "version-string": "4.1.0", + "port-version": 2 + }, + { + "git-tree": "87ea1e19430775f0ec9de9e6fb0375a53dc87d9a", + "version-string": "4.1.0-1", + "port-version": 0 + }, + { + "git-tree": "34c68751d5792b90cd79a6362eb035ca905bbbd5", + "version-string": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "ffd9e4d27973b553b24c101c2bfcc4ece8789d0c", + "version-string": "4.0.0-1", + "port-version": 0 + }, + { + "git-tree": "67465573d80c508387242537928fb1a0d60aa468", + "version-string": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "ee4d8c82ef53d6277f208dedcc58b1e5ec33d545", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "35f5cbf753cff48d9f2fb897c1ba0eed0a0646b5", + "version-string": "2.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rxqt.json b/externals/vcpkg/versions/r-/rxqt.json new file mode 100755 index 000000000..5b12e8173 --- /dev/null +++ b/externals/vcpkg/versions/r-/rxqt.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "dbea95b878f09cb9bca928af2be2d812b6dffc84", + "version-string": "bb2138c", + "port-version": 1 + }, + { + "git-tree": "ddf4c86333be5f5fa8c8aefab73d0fe77d89650b", + "version-string": "bb2138c", + "port-version": 0 + }, + { + "git-tree": "bca809bb768825c585bf7998949f264389482bbe", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/rxspencer.json b/externals/vcpkg/versions/r-/rxspencer.json new file mode 100755 index 000000000..66d8180da --- /dev/null +++ b/externals/vcpkg/versions/r-/rxspencer.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "423d711ba8013c78f3ca4931bf2d6c8a5ecc8ba0", + "version": "3.9.0", + "port-version": 2 + }, + { + "git-tree": "d0db813c47fd33b7e6f5ffb95790b66aafcaa53e", + "version": "3.9.0", + "port-version": 1 + }, + { + "git-tree": "c3b5bac6d89f6ae425bfe95a4309e72146f944dd", + "version": "3.9.0", + "port-version": 0 + }, + { + "git-tree": "a58f09c2e2ebb27d9b40527922b98612dd7e2de1", + "version-string": "2020-01-12", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/ryml.json b/externals/vcpkg/versions/r-/ryml.json new file mode 100755 index 000000000..8c7cd857f --- /dev/null +++ b/externals/vcpkg/versions/r-/ryml.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "0d8fb44c056a4bea4e4ba19d34cf26a320eb2599", + "version": "0.4.1", + "port-version": 0 + }, + { + "git-tree": "599ab36a18b1a0c439fdc6dc740bf0575a06641e", + "version-date": "2021-07-24", + "port-version": 1 + }, + { + "git-tree": "d97344132c58ae2aafb8c0ed1f23acde843404b5", + "version-date": "2021-07-24", + "port-version": 0 + }, + { + "git-tree": "f0ae9d06c774834182bdb333b0a5c96aa8c36b52", + "version-date": "2021-06-29", + "port-version": 0 + }, + { + "git-tree": "783be628f42faca427a8bc1394ccd20580ef56c8", + "version-date": "2021-05-27", + "port-version": 0 + }, + { + "git-tree": "ff07e4add8c6becd2fc4d57c2707cc141af1e341", + "version-string": "2020-04-12", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/r-/ryu.json b/externals/vcpkg/versions/r-/ryu.json new file mode 100755 index 000000000..5b448e6a1 --- /dev/null +++ b/externals/vcpkg/versions/r-/ryu.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "b500b4b86daab326db966564fcd439215eae86ee", + "version": "2.0", + "port-version": 6 + }, + { + "git-tree": "e620954b8262664cd847436d34b412bc89292854", + "version-string": "2.0", + "port-version": 5 + }, + { + "git-tree": "0f8ca7269cbb4141e7576295e2427a4208341aba", + "version-string": "2.0", + "port-version": 4 + }, + { + "git-tree": "faaef55aea17b88d0328989a64d948d8a09d7559", + "version-string": "2.0", + "port-version": 3 + }, + { + "git-tree": "ab26061ca3f9435c12bc97f8f20308042eebdb20", + "version-string": "2.0-2", + "port-version": 0 + }, + { + "git-tree": "fdfcf5ba231c6c18a036fa1168184fe24ce78585", + "version-string": "2.0-1", + "port-version": 0 + }, + { + "git-tree": "b40611dd930a092e1fe3b66b9844b09c6858a23d", + "version-string": "2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/s2geometry.json b/externals/vcpkg/versions/s-/s2geometry.json new file mode 100755 index 000000000..d7824d975 --- /dev/null +++ b/externals/vcpkg/versions/s-/s2geometry.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "e72b94e77bff8c357c4cd2430094c4dadf21c174", + "version": "0.9.0", + "port-version": 1 + }, + { + "git-tree": "3cfb53e7df6cf6c9602e63606daa377568c52cd8", + "version": "0.9.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/s2n.json b/externals/vcpkg/versions/s-/s2n.json new file mode 100755 index 000000000..73f3e5e03 --- /dev/null +++ b/externals/vcpkg/versions/s-/s2n.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "6eed0d44ebcda6eea8c4a79b37ee119b9125060a", + "version": "1.3.5", + "port-version": 0 + }, + { + "git-tree": "7cb2325defd326de178cf524bd5db039ff1dc112", + "version": "1.3.0", + "port-version": 1 + }, + { + "git-tree": "a8252a918117164e1f6472663244fda74690f849", + "version": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "b1f3fbca47339363713845a0e8e06c52c1198a2a", + "version": "1.1.1", + "port-version": 0 + }, + { + "git-tree": "13b9d04cbee992cf866560de89551ceaf7dfc277", + "version": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "8df5dce6a28decc5f853d2efd6d657374709d1b2", + "version": "1.0.17", + "port-version": 1 + }, + { + "git-tree": "10a083844c389053abc2f6ca624f9080712b6b34", + "version": "1.0.17", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/safeint.json b/externals/vcpkg/versions/s-/safeint.json new file mode 100755 index 000000000..49f9530c9 --- /dev/null +++ b/externals/vcpkg/versions/s-/safeint.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "58748cf68cd1ee3e6ca45e53bb9059f9ae787349", + "version": "3.0.26", + "port-version": 0 + }, + { + "git-tree": "b57c51a101e68d8804f4ee8da95cc4b7bd1f4bf9", + "version-string": "3.24", + "port-version": 0 + }, + { + "git-tree": "399096d8b0fdf5da13c987feae1834e2c963385c", + "version-string": "3.23", + "port-version": 0 + }, + { + "git-tree": "5881a2ef63205a4156f419c89f82a4acd26f40c9", + "version-string": "3.21", + "port-version": 0 + }, + { + "git-tree": "f26773c60671a17516d45ae571890fa246347064", + "version-string": "3.20.0", + "port-version": 0 + }, + { + "git-tree": "4b7a78641cdaf9651c81717107a6489bda1154b6", + "version-string": "3.19.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sail.json b/externals/vcpkg/versions/s-/sail.json new file mode 100755 index 000000000..7ee6592ba --- /dev/null +++ b/externals/vcpkg/versions/s-/sail.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "5604acc45bd6e7fc2123a52f3742ffa674a0c2f7", + "version-semver": "0.9.0-pre21", + "port-version": 0 + }, + { + "git-tree": "a5a0265e855d48cc304d1e811a62e8b6f9603134", + "version-semver": "0.9.0-pre20", + "port-version": 0 + }, + { + "git-tree": "096fcf183ab11a1dd35b0fc3039e7cbee1826a82", + "version-semver": "0.9.0-pre19", + "port-version": 1 + }, + { + "git-tree": "197eaa8737cd3303cddf490693bef67a2e9eba41", + "version-semver": "0.9.0-pre19", + "port-version": 0 + }, + { + "git-tree": "33ba821b47bf709df78c48f302640cbdfac9860b", + "version-semver": "0.9.0-pre18", + "port-version": 0 + }, + { + "git-tree": "38fab5a13ed3f5e76ec41af54676cd6c5aa4047d", + "version-semver": "0.9.0-pre17", + "port-version": 0 + }, + { + "git-tree": "a75976401bd0120fec82782d41c53d60fe525ca9", + "version-semver": "0.9.0-pre16", + "port-version": 0 + }, + { + "git-tree": "14ddeb70c44c70b4ca633ba9627b99ffd78686c7", + "version-semver": "0.9.0-pre15", + "port-version": 0 + }, + { + "git-tree": "0878a59a5c61e19c3c83c3ad8cfb4b611bfe3c54", + "version-semver": "0.9.0-pre14", + "port-version": 0 + }, + { + "git-tree": "27feb53acf390b5f3a6a5cd4cc194c29591d4a6a", + "version-semver": "0.9.0-pre13", + "port-version": 0 + }, + { + "git-tree": "5494cae319135c06b4ce8d6150c90e148fb6c924", + "version-semver": "0.9.0-pre12", + "port-version": 1 + }, + { + "git-tree": "d3e3d2b48fde38bfc70d3b7cec2c667866a41d48", + "version-string": "0.9.0-pre11", + "port-version": 0 + }, + { + "git-tree": "3f2c7654ea0a3c9d7a1ce81743ded2b1ef410bd9", + "version-string": "0.9.0-pre10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sais.json b/externals/vcpkg/versions/s-/sais.json new file mode 100755 index 000000000..36b41e722 --- /dev/null +++ b/externals/vcpkg/versions/s-/sais.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "b4fb1d4e7743c5f80f03e1b8fe4f1863b9a12e7d", + "version-string": "2.4.1", + "port-version": 3 + }, + { + "git-tree": "44efe5647de5509bb4073f3c03305a8bbf4c27f2", + "version-string": "2.4.1", + "port-version": 2 + }, + { + "git-tree": "f47db4f08a4e813d6df367d296914ea4d4af1b30", + "version-string": "2.4.1-1", + "port-version": 0 + }, + { + "git-tree": "ff9a4a0b9505b956dc6d7fe1c2b698faf14e5dd9", + "version-string": "2.4.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sajson.json b/externals/vcpkg/versions/s-/sajson.json new file mode 100755 index 000000000..e454c8364 --- /dev/null +++ b/externals/vcpkg/versions/s-/sajson.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "38334cbff736462ac7a903cf68c94002d26c2ab4", + "version-string": "2018-09-21", + "port-version": 1 + }, + { + "git-tree": "07ec451487f76976bb15a8e6dfefd0d373df6cee", + "version-string": "2018-09-21", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sassc.json b/externals/vcpkg/versions/s-/sassc.json new file mode 100755 index 000000000..b72f7981a --- /dev/null +++ b/externals/vcpkg/versions/s-/sassc.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "ac068d38115fa4710289d76d3a02a1b6c2650785", + "version": "3.6.2", + "port-version": 0 + }, + { + "git-tree": "f0ba14a2c2014c843031b0c442627fce5710003b", + "version-string": "3.6.1", + "port-version": 1 + }, + { + "git-tree": "3c48d56954b3fc0cdefc34c3a2797840a95a976b", + "version-string": "3.6.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sbp.json b/externals/vcpkg/versions/s-/sbp.json new file mode 100755 index 000000000..1a8b87aca --- /dev/null +++ b/externals/vcpkg/versions/s-/sbp.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ef46c718c23128379c5050d907d0a90d335206b3", + "version-semver": "3.4.10", + "port-version": 1 + }, + { + "git-tree": "d3d3511804be8ef1277c4bce734379748ee615f4", + "version-semver": "3.4.10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/scintilla.json b/externals/vcpkg/versions/s-/scintilla.json new file mode 100755 index 000000000..649075160 --- /dev/null +++ b/externals/vcpkg/versions/s-/scintilla.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "65fa530f4695dbecf4c90bc60d89d59abc6eab2f", + "version": "4.4.6", + "port-version": 1 + }, + { + "git-tree": "725d3e47a1e30713a272b1ef12251b65696f8a3e", + "version": "4.4.6", + "port-version": 0 + }, + { + "git-tree": "1bb13f73af518651e5dafcd0767ca409d3219ac3", + "version-string": "4.4.5", + "port-version": 0 + }, + { + "git-tree": "571b2659939b588499f8d0f9845299d2ab24d86e", + "version-string": "4.2.3", + "port-version": 1 + }, + { + "git-tree": "c9779a0862cb4cb7bcc785d06dd1004360fb64f5", + "version-string": "4.2.3", + "port-version": 0 + }, + { + "git-tree": "c179bc017f6f90049bc125e9014d7ee697a15a92", + "version-string": "4.1.2", + "port-version": 0 + }, + { + "git-tree": "e6c336abc48acc5340bdbafec452c3648279d470", + "version-string": "4.0.3", + "port-version": 0 + }, + { + "git-tree": "47e1318a4424bbda8dd157b99a0386dc4849cedd", + "version-string": "3.7.6-1", + "port-version": 0 + }, + { + "git-tree": "cc80c828f85d34701656bdfe9aa40f73b0045978", + "version-string": "3.7.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sciplot.json b/externals/vcpkg/versions/s-/sciplot.json new file mode 100755 index 000000000..ff250aea1 --- /dev/null +++ b/externals/vcpkg/versions/s-/sciplot.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6d01187d3c940b9bf5b3f35902469959fe640a6c", + "version": "0.2.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sciter-js.json b/externals/vcpkg/versions/s-/sciter-js.json new file mode 100755 index 000000000..c8c3f6352 --- /dev/null +++ b/externals/vcpkg/versions/s-/sciter-js.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "01c76a267b6924a5f1f03349738e479e8bbe2c0b", + "version": "4.4.8.31", + "port-version": 0 + }, + { + "git-tree": "d8b949852b38b18eac5c4fa0c25282d531c596fd", + "version-string": "4.4.8.16", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sciter.json b/externals/vcpkg/versions/s-/sciter.json new file mode 100755 index 000000000..4ace0cff5 --- /dev/null +++ b/externals/vcpkg/versions/s-/sciter.json @@ -0,0 +1,194 @@ +{ + "versions": [ + { + "git-tree": "4fac1265134a68da104d27106ec6b409b23ba377", + "version": "0", + "port-version": 1 + }, + { + "git-tree": "1ff6683a2d398db76e1791b994dc157ffb21e88c", + "version-string": "deprecated", + "port-version": 0 + }, + { + "git-tree": "7508c766a2564096e3ca656f6b4a26d582dcf855", + "version-string": "4.4.8.3", + "port-version": 1 + }, + { + "git-tree": "07df67d641b4bdc057ee8a42a69552c24b381866", + "version-string": "4.4.8.3", + "port-version": 0 + }, + { + "git-tree": "f705d7e1c384257717b5f2e87808a370ac8cc861", + "version-string": "4.4.3.20", + "port-version": 0 + }, + { + "git-tree": "9005f4db9f275092640bc51ecc263214be8071bc", + "version-string": "4.4.3.18", + "port-version": 0 + }, + { + "git-tree": "fef6e1b3ef0ac84368d64e52f1b86b3e11af8831", + "version-string": "4.4.3.15", + "port-version": 0 + }, + { + "git-tree": "eb8e4a15beda8ddf4f7bfd33f0924f61a89acf6c", + "version-string": "4.4.1.5", + "port-version": 0 + }, + { + "git-tree": "924e25b3c63f1a092048c215cdc4cdf131e6dce9", + "version-string": "4.4.0.7", + "port-version": 0 + }, + { + "git-tree": "b786e7e1ecefe1f7588946dc435d8bb673bafce3", + "version-string": "4.2.6.9-2", + "port-version": 0 + }, + { + "git-tree": "dabe2f0a124e78f00e82c1fc691d82d74fa392f0", + "version-string": "4.2.6.9-1", + "port-version": 0 + }, + { + "git-tree": "063d3b28e01b61d41d38e111494a7c32a54fc5c8", + "version-string": "4.2.6.9", + "port-version": 0 + }, + { + "git-tree": "e58b2ff21b865a609362e2948ae39c2d452360c9", + "version-string": "4.2.2", + "port-version": 0 + }, + { + "git-tree": "21dbffb6adfb505f59687cf8ce9e1701528c7bba", + "version-string": "4.1.11", + "port-version": 0 + }, + { + "git-tree": "898a18f94b986c9428643a478d16b3c8c97e2635", + "version-string": "4.1.10", + "port-version": 0 + }, + { + "git-tree": "c662bf4919c9848adb5e7d009ba91393e85ea146", + "version-string": "4.1.9", + "port-version": 0 + }, + { + "git-tree": "dff88a11da2e18b0ca45b3bed88d2162911a43b7", + "version-string": "4.1.8", + "port-version": 0 + }, + { + "git-tree": "bce230f6f6bf02d0a0f86ae4835d776dee0856c0", + "version-string": "4.1.7", + "port-version": 0 + }, + { + "git-tree": "a00c24fd02b1540eedff62217fd585d19a55fe1b", + "version-string": "4.1.6", + "port-version": 0 + }, + { + "git-tree": "085196fd26798b1f4f0b533761c802c73dc969c3", + "version-string": "4.1.5", + "port-version": 0 + }, + { + "git-tree": "4a35e73ab84f342af5571c60d6ba2bab91e55887", + "version-string": "4.1.4", + "port-version": 0 + }, + { + "git-tree": "d28a3143f1709b155feb09b9bec6220a8ff32f9a", + "version-string": "4.1.3", + "port-version": 0 + }, + { + "git-tree": "541318e794ee39213c16b001c3f0afa09b811e6f", + "version-string": "4.1.2", + "port-version": 0 + }, + { + "git-tree": "dde9eae36ad41c0733aa4557e20eec79deceb062", + "version-string": "4.1.1", + "port-version": 0 + }, + { + "git-tree": "05d8b0122e069781a60571be342f46eb7bf2cd12", + "version-string": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "2104fcdcb0f39b5b4fb22465278741a73d33013b", + "version-string": "4.0.8", + "port-version": 0 + }, + { + "git-tree": "5b49a283cbf48a3643ca2f876088db2c67bed370", + "version-string": "4.0.7", + "port-version": 0 + }, + { + "git-tree": "7c632bbe49307f2e25ecacc8bebeecaa298b8d60", + "version-string": "4.0.6", + "port-version": 0 + }, + { + "git-tree": "9d8a3a0169b3bb982f46310617f6c42129f53cf9", + "version-string": "4.0.5", + "port-version": 0 + }, + { + "git-tree": "459bf7a67f80eb95e0b2708c65e576d5088d07f3", + "version-string": "4.0.4", + "port-version": 0 + }, + { + "git-tree": "6cccad74ff54bc3b42fb099e44370a067d8958b5", + "version-string": "4.0.3", + "port-version": 0 + }, + { + "git-tree": "37c9c9af67630a8ec551465424c291419f3fb056", + "version-string": "4.0.2-1", + "port-version": 0 + }, + { + "git-tree": "15afbb45a061d9f0399ab4d00fdfae86c6634045", + "version-string": "4.0.1.1", + "port-version": 0 + }, + { + "git-tree": "dceda802e57c2822c82d1d9904b2c935525715bc", + "version-string": "4.0.1.0", + "port-version": 0 + }, + { + "git-tree": "eab7c45d027481a09bcaa4ef6d178a8b58efa554", + "version-string": "4.0.0.9-2", + "port-version": 0 + }, + { + "git-tree": "3ea57562513042ae18b6b6fce80c0e00d3bf2163", + "version-string": "4.0.0.9-1", + "port-version": 0 + }, + { + "git-tree": "8df4fc5e20f26463e09b9db7e658c0d854486254", + "version-string": "4.0.0.9", + "port-version": 0 + }, + { + "git-tree": "c78c560b32e5a774a6bcf0a477c41eded8a7755c", + "version-string": "4.0.0.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/scnlib.json b/externals/vcpkg/versions/s-/scnlib.json new file mode 100755 index 000000000..8581c2417 --- /dev/null +++ b/externals/vcpkg/versions/s-/scnlib.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "81ca9aa67e4f00245a233d075c9ae95726a2d4e3", + "version": "1.0", + "port-version": 0 + }, + { + "git-tree": "d3ec8f415e27c9ca79bcaf3580692d28c6cf3a14", + "version-string": "0.4", + "port-version": 1 + }, + { + "git-tree": "c46984f04e05003d72808d3c35f955e0d538a2e7", + "version-string": "0.4", + "port-version": 0 + }, + { + "git-tree": "c137695fe721a7e10d2c8c3cf37a49d2fa538575", + "version-string": "0.3", + "port-version": 0 + }, + { + "git-tree": "37ea5b35f293482dd02be6c6ab46ed18f1778a27", + "version-string": "0.1.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/scottt-debugbreak.json b/externals/vcpkg/versions/s-/scottt-debugbreak.json new file mode 100755 index 000000000..2d481e07b --- /dev/null +++ b/externals/vcpkg/versions/s-/scottt-debugbreak.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1b34b54dc87166ea5894f05536a17ea403a64e79", + "version": "1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/scylla-wrapper.json b/externals/vcpkg/versions/s-/scylla-wrapper.json new file mode 100755 index 000000000..2b12423a4 --- /dev/null +++ b/externals/vcpkg/versions/s-/scylla-wrapper.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "c1633de82a41a7dac94c972377145d3bf67b80a4", + "version-string": "2018-08-26-16e6f435", + "port-version": 2 + }, + { + "git-tree": "358f082e98f164d3b0fdd5ef1a88dc2ec627610e", + "version-string": "2018-08-26-16e6f435", + "port-version": 1 + }, + { + "git-tree": "bad125e6ef50011bc279b6b56921c2e0def820c1", + "version-string": "2018-08-26-16e6f435", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sdformat10.json b/externals/vcpkg/versions/s-/sdformat10.json new file mode 100755 index 000000000..00cd92457 --- /dev/null +++ b/externals/vcpkg/versions/s-/sdformat10.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "abf1fc376b102a9ef833522a615261e5d3e155b8", + "version": "10.0.0", + "port-version": 2 + }, + { + "git-tree": "13fbbc3bb6bf9c38cb97d4e14af7c3a46ecba6e6", + "version-string": "10.0.0", + "port-version": 1 + }, + { + "git-tree": "84626baa34ef0c748149347fdc5f356d66debafd", + "version-string": "10.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sdformat6.json b/externals/vcpkg/versions/s-/sdformat6.json new file mode 100755 index 000000000..b30a5ca67 --- /dev/null +++ b/externals/vcpkg/versions/s-/sdformat6.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "bdc0f927266aa4195c3795075c9e07c426c4556c", + "version": "6.2.0", + "port-version": 6 + }, + { + "git-tree": "f3ec7ce50f9e64316ed940878271ade6cea1c0e3", + "version": "6.2.0", + "port-version": 5 + }, + { + "git-tree": "dc94f6d1e0351bb777ccd1823470fe22ad896c34", + "version": "6.2.0", + "port-version": 4 + }, + { + "git-tree": "1273532dcedd66beb82c6ce89024abac0e385761", + "version": "6.2.0", + "port-version": 3 + }, + { + "git-tree": "9104c5c84ce079686624adeaa3032543415acda2", + "version": "6.2.0", + "port-version": 2 + }, + { + "git-tree": "5a9a49ae80212912ecf538b7646f233cdba24211", + "version-string": "6.2.0-1", + "port-version": 0 + }, + { + "git-tree": "0f0c5143a6b69d3c32052b6ecdc8a283cf3abe6c", + "version-string": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sdformat9.json b/externals/vcpkg/versions/s-/sdformat9.json new file mode 100755 index 000000000..379c64eb7 --- /dev/null +++ b/externals/vcpkg/versions/s-/sdformat9.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "0a599309f16afe5d3163ec1eb131eed575880ae4", + "version": "9.4.0", + "port-version": 6 + }, + { + "git-tree": "d050d624faf72f8dcb62fdb7a5378ae5d8e8b5d8", + "version": "9.4.0", + "port-version": 5 + }, + { + "git-tree": "2b064abf9a6849ed5234b03bf5604ccd0169db4a", + "version": "9.4.0", + "port-version": 4 + }, + { + "git-tree": "5f47672c7e4349da14189c38db3a15dcdad5a196", + "version": "9.4.0", + "port-version": 3 + }, + { + "git-tree": "0ae3b0b53c638614e4a03164b1a5d1b70796e55e", + "version-string": "9.4.0", + "port-version": 2 + }, + { + "git-tree": "d8e35870677a08dcb88753aa2ef446b75a9646f2", + "version-string": "9.4.0", + "port-version": 1 + }, + { + "git-tree": "750aebae0f740736affd93087026e0e344d81af2", + "version-string": "9.4.0", + "port-version": 0 + }, + { + "git-tree": "54ae4ec88f43847be416ec4fbf9348a90e2c5b63", + "version-string": "9.2.0-1", + "port-version": 0 + }, + { + "git-tree": "a53671a5fb6b98d0fb9a3dcbfa67fe1bb321ac53", + "version-string": "9.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sdl1-net.json b/externals/vcpkg/versions/s-/sdl1-net.json new file mode 100755 index 000000000..efa05962d --- /dev/null +++ b/externals/vcpkg/versions/s-/sdl1-net.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "a90f68f29394a4b396760e605d8eb6128af811dc", + "version-string": "1.2.8", + "port-version": 4 + }, + { + "git-tree": "c0e1c52d034c8805d08bc443cabbe8cd13f850c9", + "version-string": "1.2.8-3", + "port-version": 0 + }, + { + "git-tree": "15a8ce2e3b178518c46480cb3f6082b1083e3e18", + "version-string": "1.2.8-2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sdl1.json b/externals/vcpkg/versions/s-/sdl1.json new file mode 100755 index 000000000..65c464975 --- /dev/null +++ b/externals/vcpkg/versions/s-/sdl1.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "45b686784ad1b01e7cfa7988bc3f95bf9aff6b6a", + "version": "1.2.15", + "port-version": 17 + }, + { + "git-tree": "5ffe0bac6645cd0fe0c98a0c33cf86a6bc2ddcfc", + "version": "1.2.15", + "port-version": 16 + }, + { + "git-tree": "4a3aba1bba75ee6d613144dbd6b2c64cbe6a090c", + "version": "1.2.15", + "port-version": 15 + }, + { + "git-tree": "dd8e1026af78ffd7bb4e9d6fa1455579367206e1", + "version-string": "1.2.15", + "port-version": 14 + }, + { + "git-tree": "3577dacfb219c514fb37b44ac83b8d9d379ec828", + "version-string": "1.2.15", + "port-version": 13 + }, + { + "git-tree": "03794252b766a260a14f3584af5004bd0c12090c", + "version-string": "1.2.15", + "port-version": 12 + }, + { + "git-tree": "71cce08b24aa037121be28974a319709e9c0e176", + "version-string": "1.2.15-11", + "port-version": 0 + }, + { + "git-tree": "1f13d2e6f240e80f47de718b6859c9abb12c89e5", + "version-string": "1.2.15-10", + "port-version": 0 + }, + { + "git-tree": "fdc874ddaf771ab4a6723cdac2353409ca2b5eb9", + "version-string": "1.2.15-9", + "port-version": 0 + }, + { + "git-tree": "f3f8bf61ba5f6afcc389c121fc1d2918ff41ad82", + "version-string": "1.2.15-8", + "port-version": 0 + }, + { + "git-tree": "609d10b833914dfa8777d25d11839518f299f89d", + "version-string": "1.2.15-7", + "port-version": 0 + }, + { + "git-tree": "340f747ec27b9f185ff2a18feb81662312ad6163", + "version-string": "1.2.15-6", + "port-version": 0 + }, + { + "git-tree": "65749f840b425f62ed85c486a2726a9d708aefe0", + "version-string": "1.2.15-5", + "port-version": 0 + }, + { + "git-tree": "ae6882c57d24d69af18a48490531ecb49c86a4c7", + "version-string": "1.2.15-4", + "port-version": 0 + }, + { + "git-tree": "fddf602560bf3f7d23e5c4c83813611d4bfea2c6", + "version-string": "1.2.15-3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sdl2-gfx.json b/externals/vcpkg/versions/s-/sdl2-gfx.json new file mode 100755 index 000000000..e07af1bbd --- /dev/null +++ b/externals/vcpkg/versions/s-/sdl2-gfx.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "7654d7969a75b5402533dfbf7bec763dadbe949e", + "version-string": "1.0.4", + "port-version": 8 + }, + { + "git-tree": "5a375d8ccd902fab43eae263c2f9405f7224eeda", + "version-string": "1.0.4", + "port-version": 7 + }, + { + "git-tree": "065f51ff2f0128bfddb6bca6250e159b35c9baab", + "version-string": "1.0.4-6", + "port-version": 0 + }, + { + "git-tree": "5c7b5a010cd6972363f2da19a13e607039cec88a", + "version-string": "1.0.4-5", + "port-version": 0 + }, + { + "git-tree": "9c06128ae3371bca67a52f128fa823f16a26a3ea", + "version-string": "1.0.4-4", + "port-version": 0 + }, + { + "git-tree": "0a5057ea1852480b5ed83d43a11138e6957a74a3", + "version-string": "1.0.4-2", + "port-version": 0 + }, + { + "git-tree": "b0977ac82e32bd8db7d6929855b4e8bb68b365b1", + "version-string": "1.0.4-1", + "port-version": 0 + }, + { + "git-tree": "4199cf094cb0f56cb5a6600b41c754b8356cf322", + "version-string": "1.0.4", + "port-version": 0 + }, + { + "git-tree": "b63402a07ce133a0591b417d20f482105bf08066", + "version-string": "1.0.3-3", + "port-version": 0 + }, + { + "git-tree": "602c9c6e34522d578b76fcb3dbdf6464a9821bca", + "version-string": "1.0.3-2", + "port-version": 0 + }, + { + "git-tree": "68a22e8856a24891d7b00581b9a42b5c6f9e27e5", + "version-string": "1.0.3-1", + "port-version": 0 + }, + { + "git-tree": "55c92741d93532154189eddc7eae81025dee264c", + "version-string": "1.0.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sdl2-image.json b/externals/vcpkg/versions/s-/sdl2-image.json new file mode 100755 index 000000000..cc213ea45 --- /dev/null +++ b/externals/vcpkg/versions/s-/sdl2-image.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "e1ed993b97bc76d5a8abdf4e9e8e148903078a70", + "version": "2.0.5", + "port-version": 6 + }, + { + "git-tree": "623548e8c929f2160320bf9644e2cd5a75d4a608", + "version": "2.0.5", + "port-version": 5 + }, + { + "git-tree": "9042c449fc4c728c5b428332e09bc6d21a2acf34", + "version-string": "2.0.5", + "port-version": 4 + }, + { + "git-tree": "7cd6ce4e9108671f3f4bad86c37ee2586acbf440", + "version-string": "2.0.5", + "port-version": 3 + }, + { + "git-tree": "8b1c139f382edc4b0e9e1e3ba7ecd25667583f36", + "version-string": "2.0.5", + "port-version": 2 + }, + { + "git-tree": "d0a9eecd26e5ba37e9827e8cfdbb85700c313f80", + "version-string": "2.0.5", + "port-version": 1 + }, + { + "git-tree": "09228a708e3a67fd6dc9050b9fc9ac54408b2e3e", + "version-string": "2.0.5", + "port-version": 0 + }, + { + "git-tree": "691b1216805e5c5d3fd16e1069da9956db376666", + "version-string": "2.0.4-3", + "port-version": 0 + }, + { + "git-tree": "7c762662e9982da95ab41ee1e0f0b793f125e0ef", + "version-string": "2.0.4-2", + "port-version": 0 + }, + { + "git-tree": "b6ff67887d105f44936a1629387eca169cb6d45d", + "version-string": "2.0.4-1", + "port-version": 0 + }, + { + "git-tree": "80c484e65a78d17e7704c0adf5e760e23fa8d69c", + "version-string": "2.0.4", + "port-version": 0 + }, + { + "git-tree": "d41dc5de578f53e7a35a06b2964dfc50514db03e", + "version-string": "2.0.2-3", + "port-version": 0 + }, + { + "git-tree": "a15f1003998c90155f1723f878897237a1d308ad", + "version-string": "2.0.2-1", + "port-version": 0 + }, + { + "git-tree": "aeb79a4eb6268ad638f8a8a46632d7cc6b7b4709", + "version-string": "2.0.2", + "port-version": 0 + }, + { + "git-tree": "afb28a3a8882a012dd647e7cbe86f940c31489b3", + "version-string": "2.0.1-3", + "port-version": 0 + }, + { + "git-tree": "82335433d4231ef7bf6ba7bb3823c652fa27baff", + "version-string": "2.0.1-2", + "port-version": 0 + }, + { + "git-tree": "2b9399753701f7c8d648de00fb73dc8cce2f6ee5", + "version-string": "2.0.1-1", + "port-version": 0 + }, + { + "git-tree": "edb5da7ef12fc6c18bde71930a61f61a0dc7d7cd", + "version-string": "2.0.1", + "port-version": 0 + }, + { + "git-tree": "173e4fa5a794171877b6a2609e28d9e6bee8f11d", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sdl2-mixer.json b/externals/vcpkg/versions/s-/sdl2-mixer.json new file mode 100755 index 000000000..dc799edf6 --- /dev/null +++ b/externals/vcpkg/versions/s-/sdl2-mixer.json @@ -0,0 +1,134 @@ +{ + "versions": [ + { + "git-tree": "23eb6562f5153eb39a84eb2673d5dc9bd2ce78aa", + "version": "2.0.4", + "port-version": 16 + }, + { + "git-tree": "981b981d938287223eb7ebbe365cfbb371ba71ef", + "version": "2.0.4", + "port-version": 15 + }, + { + "git-tree": "960ae8e64dfba885f0fa2274277e2b929aaf0ded", + "version": "2.0.4", + "port-version": 14 + }, + { + "git-tree": "6338ed4f079dda0759ac18a4dcc5f04448e56cc3", + "version": "2.0.4", + "port-version": 13 + }, + { + "git-tree": "fe2777f2acc7962d9d08092e4778221468e212cd", + "version": "2.0.4", + "port-version": 12 + }, + { + "git-tree": "1ccb56f06529841debee949a42b71f5ce4ad1f16", + "version": "2.0.4", + "port-version": 11 + }, + { + "git-tree": "86c94f099112b8e743eaf9b34d7ae88d884335d7", + "version-string": "2.0.4", + "port-version": 10 + }, + { + "git-tree": "9cef2be29fbf5ca4f9711d216eee216c2cb30b98", + "version-string": "2.0.4-9", + "port-version": 0 + }, + { + "git-tree": "c7943bc165adf8371b6804f9c0473ad49862dc84", + "version-string": "2.0.4-8", + "port-version": 0 + }, + { + "git-tree": "45a9a811bab8d05ceb471494a1d7c1e9ed8bdc08", + "version-string": "2.0.4-7", + "port-version": 0 + }, + { + "git-tree": "a036c5d27840ed31cdbba4daeae3ac54d1895898", + "version-string": "2.0.4-6", + "port-version": 0 + }, + { + "git-tree": "3bc8c3ce5e3593035900c0db3cc3dcffa8d399d9", + "version-string": "2.0.4-5", + "port-version": 0 + }, + { + "git-tree": "ade49ef26eb57d42a9d20ed7ab85eff6d7690b71", + "version-string": "2.0.4-4", + "port-version": 0 + }, + { + "git-tree": "f146238e3b8b2d3f8e4b9f6ca059a373b2ced559", + "version-string": "2.0.4-3", + "port-version": 0 + }, + { + "git-tree": "7f86961bac34938feaac4b90520e524818a0bd9b", + "version-string": "2.0.4-2", + "port-version": 0 + }, + { + "git-tree": "eec87abcedd81366edd70b7f5543507ab0acb6bb", + "version-string": "2.0.4-1", + "port-version": 0 + }, + { + "git-tree": "f0373a0ee15eb8f45a69850da0db60584ea9615b", + "version-string": "2.0.4", + "port-version": 0 + }, + { + "git-tree": "5ab5c240994f14651964f13fe13b1afac9e4bbbd", + "version-string": "2.0.2-6", + "port-version": 0 + }, + { + "git-tree": "9cdc989d2fccef05516af82671e7514f6dad0c1b", + "version-string": "2.0.2-5", + "port-version": 0 + }, + { + "git-tree": "863d40f8a9eeffe6e26e30a883175e58a5eed257", + "version-string": "2.0.2-4", + "port-version": 0 + }, + { + "git-tree": "aa134e21420bffed177e11b9d4601a90ccc0cd48", + "version-string": "2.0.2-2", + "port-version": 0 + }, + { + "git-tree": "c8ff90df1980c887c0bc89b41220ca7657b42f39", + "version-string": "2.0.2-1", + "port-version": 0 + }, + { + "git-tree": "1a8ff212de868fde8a42507c03d2e9cd7c2bea41", + "version-string": "2.0.1-3", + "port-version": 0 + }, + { + "git-tree": "c82f400ed54564b7112ea8ae5ffd6175330ed6db", + "version-string": "2.0.1-2", + "port-version": 0 + }, + { + "git-tree": "e867e0d68a70f4e176323083da4416fbc6355799", + "version-string": "2.0.1-1", + "port-version": 0 + }, + { + "git-tree": "c0d20677631a7db9e0f65de173f622666e976518", + "version-string": "2.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sdl2-net.json b/externals/vcpkg/versions/s-/sdl2-net.json new file mode 100755 index 000000000..822436b19 --- /dev/null +++ b/externals/vcpkg/versions/s-/sdl2-net.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "fcebb3e918a41e08cc320cede3d15872c53ad204", + "version-string": "2.0.1", + "port-version": 9 + }, + { + "git-tree": "c315356fbaaafea6bbcc98aa1faa32355c5b4d9b", + "version-string": "2.0.1-8", + "port-version": 0 + }, + { + "git-tree": "ab289966dcf6d837c5b8274e8d49095c5cc9186a", + "version-string": "2.0.1-7", + "port-version": 0 + }, + { + "git-tree": "be10b502afcaa42b2e82ea7c5c1a21a3e889bf9b", + "version-string": "2.0.1-6", + "port-version": 0 + }, + { + "git-tree": "16ad4ad807ad672818ceda635b8ced44cdf59e30", + "version-string": "2.0.1-5", + "port-version": 0 + }, + { + "git-tree": "b9ca8129b5a86757c8a813f652a01e61a79f2ded", + "version-string": "2.0.1-4", + "port-version": 0 + }, + { + "git-tree": "207d5cbf9edb9c31dd4aff8539e8aece515db4f3", + "version-string": "2.0.1-3", + "port-version": 0 + }, + { + "git-tree": "4a7e5537e8b19fef689e488ab5ca861260a2ff8a", + "version-string": "2.0.1-2", + "port-version": 0 + }, + { + "git-tree": "2605c7ba1ef533eb740ec996522daf9a3791bcdc", + "version-string": "2.0.1-1", + "port-version": 0 + }, + { + "git-tree": "c8cfd2be3ec7f13f029ac8bfa29c87c2aa45ef71", + "version-string": "2.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sdl2-ttf.json b/externals/vcpkg/versions/s-/sdl2-ttf.json new file mode 100755 index 000000000..65d49c1b0 --- /dev/null +++ b/externals/vcpkg/versions/s-/sdl2-ttf.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "cefc95479a9fa2c8a8c4f5539952978f77e3de99", + "version-string": "2.0.15", + "port-version": 5 + }, + { + "git-tree": "888938a2d639aaa04b3e79d2ea451a87b616541c", + "version-string": "2.0.15", + "port-version": 4 + }, + { + "git-tree": "669c213867cc020c758a2154f8d9fdb468f4c824", + "version-string": "2.0.15-3", + "port-version": 0 + }, + { + "git-tree": "74a840d700fd6e64c180446bf4d117c06f09681d", + "version-string": "2.0.15-2", + "port-version": 0 + }, + { + "git-tree": "4ffd44bf567f529552c2368bec0a93e67f050688", + "version-string": "2.0.15-1", + "port-version": 0 + }, + { + "git-tree": "d58f7a0a2d4e03effcd1072cd93bc1e7f52aa59f", + "version-string": "2.0.15", + "port-version": 0 + }, + { + "git-tree": "cd147ea3a6b7e21ebf0d33e304625de0216ec31e", + "version-string": "2.0.14-4", + "port-version": 0 + }, + { + "git-tree": "d43da97f40ddabd4477b7b8abfb499815a1e3cdf", + "version-string": "2.0.14-3", + "port-version": 0 + }, + { + "git-tree": "1559671d1e1503582f4ff5056c6c61a5553dc854", + "version-string": "2.0.14-2", + "port-version": 0 + }, + { + "git-tree": "1f77b18bd32dc1b3821d605b783acd0279bcaeab", + "version-string": "2.0.14-1", + "port-version": 0 + }, + { + "git-tree": "11bc4b4b4652236f59aad3b9c093423f6c1c3c51", + "version-string": "2.0.14", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sdl2.json b/externals/vcpkg/versions/s-/sdl2.json new file mode 100755 index 000000000..2d5eb6aa4 --- /dev/null +++ b/externals/vcpkg/versions/s-/sdl2.json @@ -0,0 +1,224 @@ +{ + "versions": [ + { + "git-tree": "879012d1bbd3ae67fc697109eedbe6ff713c2c34", + "version": "2.0.22", + "port-version": 1 + }, + { + "git-tree": "6d875fe2feac0480f61fcf890136e045c12429f1", + "version": "2.0.22", + "port-version": 0 + }, + { + "git-tree": "24fc8b7ae34a3a363c76820d4ca50f715648a0b2", + "version": "2.0.20", + "port-version": 3 + }, + { + "git-tree": "abf71c19917402dddef261e80d55c8ec04e9bf54", + "version": "2.0.20", + "port-version": 2 + }, + { + "git-tree": "9900463f2847ed86e25bac1688c527ae3486a024", + "version": "2.0.20", + "port-version": 1 + }, + { + "git-tree": "d5865b5fb9c52f255629f4c015f37df9ca788a33", + "version": "2.0.20", + "port-version": 0 + }, + { + "git-tree": "4d0926c154515596d8f178d7350c37433b05957b", + "version": "2.0.16", + "port-version": 3 + }, + { + "git-tree": "120b4a3f60f1b2bfc0f20a7c20b5494fff8ea519", + "version": "2.0.16", + "port-version": 2 + }, + { + "git-tree": "f39203f93b1c068fca2dd7b7501891d8aca3b65d", + "version": "2.0.16", + "port-version": 1 + }, + { + "git-tree": "66a51e068567b3b76ebb844ba7b4336abc7c35ce", + "version": "2.0.16", + "port-version": 0 + }, + { + "git-tree": "44061d4f51d8cba5625da7b41ef712976d9416e8", + "version-string": "2.0.14", + "port-version": 4 + }, + { + "git-tree": "07b3a3a427d35ed4ba0a154d7ff3e34be2f0ddfb", + "version-string": "2.0.14", + "port-version": 3 + }, + { + "git-tree": "df27b00967d099fabd3b9315a02105bd3e1be3d1", + "version-string": "2.0.14", + "port-version": 2 + }, + { + "git-tree": "8d5fa523a69780e41605b585788d212d688f3c71", + "version-string": "2.0.14", + "port-version": 1 + }, + { + "git-tree": "10ed256500fea4cd6cc5d3e6c6b5f2e9e364d78b", + "version-string": "2.0.14", + "port-version": 0 + }, + { + "git-tree": "03be064c4db47e35d6d3b14db1522fca24a95702", + "version-string": "2.0.12", + "port-version": 8 + }, + { + "git-tree": "c41be8645323fbd4e5f2c0b6a12f728c50d86505", + "version-string": "2.0.12", + "port-version": 7 + }, + { + "git-tree": "4e1b3d02d4b5530f4472f72bcfd67946a0f44b7b", + "version-string": "2.0.12", + "port-version": 6 + }, + { + "git-tree": "a42de3e4c0965b404bdd893a1ddec7db71b1a67e", + "version-string": "2.0.12", + "port-version": 5 + }, + { + "git-tree": "3d19d21d34537e6b242543a20a88a818d2a1fcff", + "version-string": "2.0.12", + "port-version": 4 + }, + { + "git-tree": "7efdf99f704e39b70d5e2bd8e210e9d359408ea2", + "version-string": "2.0.12", + "port-version": 3 + }, + { + "git-tree": "63f66f6a8bc20c52bb3f62831c4c96941fc5c775", + "version-string": "2.0.12-1", + "port-version": 0 + }, + { + "git-tree": "7ee9cda8491293e3c8d29fe9f11f9ea80b73db48", + "version-string": "2.0.12", + "port-version": 0 + }, + { + "git-tree": "be4965d2eb29d7425ec71f9729fe1215817977f2", + "version-string": "2.0.10-3", + "port-version": 0 + }, + { + "git-tree": "803ae2aa1eee508d8462e24d51ed319c593dc092", + "version-string": "2.0.10-2", + "port-version": 0 + }, + { + "git-tree": "640cc9c4d32c5abebe31811569db362dcc6c7ee2", + "version-string": "2.0.10-1", + "port-version": 0 + }, + { + "git-tree": "3436b282c25708bb31fd71a6f8fec365f8e75589", + "version-string": "2.0.9-4", + "port-version": 0 + }, + { + "git-tree": "dd31251d55b88f407efe4f67a85dd21bc026bc33", + "version-string": "2.0.9-3", + "port-version": 0 + }, + { + "git-tree": "c79ee660829e4e86ff633c9f5a9f08f0449db9bd", + "version-string": "2.0.9-2", + "port-version": 0 + }, + { + "git-tree": "da9765973085dbe1d56676d7b9956e06dbe71923", + "version-string": "2.0.9-1", + "port-version": 0 + }, + { + "git-tree": "07c207585512ac07014d6ddf4f3111a911046857", + "version-string": "2.0.8-3", + "port-version": 0 + }, + { + "git-tree": "dbaeb2f90779ac060a4b09a31f5be3be6b627723", + "version-string": "2.0.8-1", + "port-version": 0 + }, + { + "git-tree": "d057dbc3ec0b3e0c1791e0f0a6d7b86b4abb424e", + "version-string": "2.0.8", + "port-version": 0 + }, + { + "git-tree": "2b3048ecd70acc5049510fb63cd4d2492bd2108b", + "version-string": "2.0.7-4", + "port-version": 0 + }, + { + "git-tree": "571895fe23d6b47aea73c8b198256470186b4f5f", + "version-string": "2.0.7-3", + "port-version": 0 + }, + { + "git-tree": "0ceaa04a7a0813ad03dbd15f0422baa2d500abef", + "version-string": "2.0.7-2", + "port-version": 0 + }, + { + "git-tree": "605f6a7fc0fdead58934eb313fbda7b5fe78edd6", + "version-string": "2.0.7-1", + "port-version": 0 + }, + { + "git-tree": "2783dc0b9e81b011404f7a5f3c983b477afa22d7", + "version-string": "2.0.6-1", + "port-version": 0 + }, + { + "git-tree": "7b5a268171f98980db5d6bb430a1d8339d059272", + "version-string": "2.0.5-4", + "port-version": 0 + }, + { + "git-tree": "86e0cfab20b3825d0f0646564ee4a03c8ec77e00", + "version-string": "2.0.5-3", + "port-version": 0 + }, + { + "git-tree": "f86d02ec2ec0258c1fd29b298fc7dd8e3cb454ff", + "version-string": "2.0.5-2", + "port-version": 0 + }, + { + "git-tree": "ecac677f814682be15113d5ecaaf124fd03be096", + "version-string": "2.0.5-1", + "port-version": 0 + }, + { + "git-tree": "aa48f94a9fd1b99f3d012a0fc7148852851b1ff8", + "version-string": "2.0.5", + "port-version": 0 + }, + { + "git-tree": "dceaf9c444f142790c0989fb2ab06af0bba387cf", + "version-string": "2.0.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sdl2pp.json b/externals/vcpkg/versions/s-/sdl2pp.json new file mode 100755 index 000000000..f009fb9ac --- /dev/null +++ b/externals/vcpkg/versions/s-/sdl2pp.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "99074ba7a6f080e0b9c74dde8254875c95c7d9ea", + "version": "0.16.1", + "port-version": 2 + }, + { + "git-tree": "f63085c248f23dcc4acdf7d77c8ecab83387f45d", + "version-string": "0.16.1", + "port-version": 1 + }, + { + "git-tree": "d05210be37ddf262ae6599c41c16bb6204a232df", + "version-string": "0.16.1", + "port-version": 0 + }, + { + "git-tree": "0ed8fecb9caeb8edf3ff07e3b9da96118c7de41a", + "version-string": "0.16.0-2", + "port-version": 0 + }, + { + "git-tree": "109cd46df152c0ddf593cad5e967c7dda1e34291", + "version-string": "0.16.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/seal.json b/externals/vcpkg/versions/s-/seal.json new file mode 100755 index 000000000..c7ea11730 --- /dev/null +++ b/externals/vcpkg/versions/s-/seal.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "323502a09f055a964f6b501aed82701570b96cba", + "version-semver": "3.7.2", + "port-version": 3 + }, + { + "git-tree": "c3499eaa1c19049bc521c3d2799d8d7d6d032a8a", + "version-semver": "3.7.2", + "port-version": 2 + }, + { + "git-tree": "11dc6c4e8b720416ff6ce195e48287982a6131ec", + "version-semver": "3.7.2", + "port-version": 1 + }, + { + "git-tree": "f60c9b8a5bafea149666d032b375f1b3980dd3ca", + "version-semver": "3.7.2", + "port-version": 0 + }, + { + "git-tree": "dc1789c424c644a859870fb66288c5bfacb62d35", + "version-semver": "3.7.1", + "port-version": 0 + }, + { + "git-tree": "1e0c0c7900d62643f5e83af3a18401d9116d2696", + "version-semver": "3.7.0", + "port-version": 0 + }, + { + "git-tree": "89d120a6c3ac5306d90e29913048b518dc5a2c9b", + "version-semver": "3.6.6", + "port-version": 1 + }, + { + "git-tree": "e487b9120a78480800a1fd914477acf03f677919", + "version-semver": "3.6.6", + "port-version": 0 + }, + { + "git-tree": "aa3ad12b6022d47b57c3482ed9f413bc374b9396", + "version-string": "3.6.4", + "port-version": 0 + }, + { + "git-tree": "e04ddee56f805cd71ea28de648a86a3a978ac29e", + "version-string": "3.6.2", + "port-version": 0 + }, + { + "git-tree": "7f0e988ad7a2c1b8c2c0d39f9954d1782886dd93", + "version-string": "3.6.1", + "port-version": 0 + }, + { + "git-tree": "df71d4b4ab6cc7c95c3c5eaec90cc413d508b1ea", + "version-string": "3.6.0", + "port-version": 0 + }, + { + "git-tree": "c5900a15e801b55ed11f7946dfd0d47bee8d7759", + "version-string": "3.5.9", + "port-version": 0 + }, + { + "git-tree": "d307566b16720508f20801167b8f33b903184c8f", + "version-string": "3.4.5-1", + "port-version": 0 + }, + { + "git-tree": "003b9fd92728880b46305221ed65badb249e830b", + "version-string": "3.4.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/secp256k1.json b/externals/vcpkg/versions/s-/secp256k1.json new file mode 100755 index 000000000..f6b28c37d --- /dev/null +++ b/externals/vcpkg/versions/s-/secp256k1.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "a0ba39af9284d60d41166c4f546975e9f2b2d9df", + "version-string": "2017-19-10", + "port-version": 4 + }, + { + "git-tree": "2ed3df183a68fa41ed68c2c4442804627946eb39", + "version-string": "2017-19-10", + "port-version": 3 + }, + { + "git-tree": "dce0d7645d36fe02662ee1074266120e79db8930", + "version-string": "2017-19-10-0b7024185045a49a1a6a4c5615bf31c94f63d9c4-2", + "port-version": 0 + }, + { + "git-tree": "e4bede6515b28cbd5b7245e381ee0412bbb09e5e", + "version-string": "2017-19-10-0b7024185045a49a1a6a4c5615bf31c94f63d9c4-1", + "port-version": 0 + }, + { + "git-tree": "d27ced801856bdd1c72b467fdbdb7c0ddda9a166", + "version-string": "2017-19-10-0b7024185045a49a1a6a4c5615bf31c94f63d9c4", + "port-version": 0 + }, + { + "git-tree": "db0eada2cf78deecfcfab3a2e4c536fe45f1d3cb", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/selene.json b/externals/vcpkg/versions/s-/selene.json new file mode 100755 index 000000000..c1635f9df --- /dev/null +++ b/externals/vcpkg/versions/s-/selene.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "a7e77d03f1d4e5a4d24e10c3ffc1ac326df1791e", + "version": "0.3.1", + "port-version": 5 + }, + { + "git-tree": "414a898c6d7a263608c56e4bdddfc69936a6b9d7", + "version": "0.3.1", + "port-version": 4 + }, + { + "git-tree": "3e7996d3fb4faf8d14f4ea4ab7f963e66fac121e", + "version-string": "0.3.1", + "port-version": 3 + }, + { + "git-tree": "9fa6ff057040fa251942f23651868168d43446a4", + "version-string": "0.3.1-2", + "port-version": 0 + }, + { + "git-tree": "ff97ba2cff1ec7fc779959d7330fd0cfa99e6e52", + "version-string": "0.3.1-1", + "port-version": 0 + }, + { + "git-tree": "30684724a88015393d11483be380743aa2cde1c0", + "version-string": "0.3.1", + "port-version": 0 + }, + { + "git-tree": "b0fafe6b02b6f6ffde4b8cc554edba29e1615967", + "version-string": "0.2-1", + "port-version": 0 + }, + { + "git-tree": "b7062a564e08c020cbc2d47d2f0cba9e1ed41794", + "version-string": "0.1.1", + "port-version": 0 + }, + { + "git-tree": "f8c99c926a99ce5775a9a5b6009ea64ef21e555f", + "version-string": "0.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sentencepiece.json b/externals/vcpkg/versions/s-/sentencepiece.json new file mode 100755 index 000000000..5d3c9d9ac --- /dev/null +++ b/externals/vcpkg/versions/s-/sentencepiece.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "b243e85760f8f59100632997fdc34cdae47bcfd4", + "version": "0.1.96", + "port-version": 1 + }, + { + "git-tree": "b83e7b28dc28e405cfee3c94385e2039c8564040", + "version": "0.1.96", + "port-version": 0 + }, + { + "git-tree": "f7469c8030fdd88ef6beb9aef9458c91269a5bb8", + "version": "0.1.95", + "port-version": 1 + }, + { + "git-tree": "107679132fbb9a52ab4c995583db14a748554565", + "version": "0.1.95", + "port-version": 0 + }, + { + "git-tree": "80fecc6a62e7e634b59ec58f737202c0773fa73e", + "version": "0.1.82", + "port-version": 1 + }, + { + "git-tree": "90b2ef495290ecbf5894d437a1d03d3735d9bf4d", + "version-string": "v0.1.82", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sentry-native.json b/externals/vcpkg/versions/s-/sentry-native.json new file mode 100755 index 000000000..147696607 --- /dev/null +++ b/externals/vcpkg/versions/s-/sentry-native.json @@ -0,0 +1,139 @@ +{ + "versions": [ + { + "git-tree": "2d6b1817e6134faaf9a3f85d1719c925dd15a3a9", + "version": "0.4.17", + "port-version": 0 + }, + { + "git-tree": "3dff7be1b47155d1580f43be48d8b95761251883", + "version-semver": "0.4.15", + "port-version": 0 + }, + { + "git-tree": "789ced09501be535989b9eadfc5b04317b4be8d6", + "version-semver": "0.4.14", + "port-version": 0 + }, + { + "git-tree": "02e695aa00b661662dfae906a4cd55c0d8371f73", + "version-semver": "0.4.13", + "port-version": 2 + }, + { + "git-tree": "9fb136cdde824d2f306a1afbd99830af76446158", + "version-semver": "0.4.13", + "port-version": 1 + }, + { + "git-tree": "d0ab3adf0fe8f521553af8345c6c11e6e883f065", + "version-semver": "0.4.13", + "port-version": 0 + }, + { + "git-tree": "02751ec1af944b27f69c9b50a8df4017cc24add3", + "version-semver": "0.4.12", + "port-version": 2 + }, + { + "git-tree": "6281c2a09a664a34db72684ff944c5920925e33e", + "version-semver": "0.4.12", + "port-version": 1 + }, + { + "git-tree": "85e3e8c19428a75c746ff7389f86746f1a7ef93f", + "version-semver": "0.4.12", + "port-version": 0 + }, + { + "git-tree": "a2864f84fc6ef423bcc641b64b75cc574df99b85", + "version-semver": "0.4.11", + "port-version": 1 + }, + { + "git-tree": "8343307e093e40faaf7e894be6aed4f60cb327d0", + "version-semver": "0.4.11", + "port-version": 0 + }, + { + "git-tree": "487eaee55f15e263063288c15aab12d296ac598f", + "version-semver": "0.4.10", + "port-version": 0 + }, + { + "git-tree": "8200b5e337c4e6074c67a6a2398fa7bbbb3c2e4b", + "version-semver": "0.4.9", + "port-version": 1 + }, + { + "git-tree": "17febc7e743aa5a91308dd2afd46cec3ef4a6c36", + "version-semver": "0.4.9", + "port-version": 0 + }, + { + "git-tree": "32821f7371500deb01b4c67b47e74918b44635dd", + "version-semver": "0.4.8", + "port-version": 0 + }, + { + "git-tree": "718ff7a01b0f2cca16bb8f89e6a47450efe84e4c", + "version-string": "0.4.7", + "port-version": 0 + }, + { + "git-tree": "d3d779405f43319446ea028cb8ba8c7b55c32d49", + "version-string": "0.4.6", + "port-version": 0 + }, + { + "git-tree": "12609c0d641d756b3c3f3170c1a019c662f903fb", + "version-string": "0.4.5", + "port-version": 0 + }, + { + "git-tree": "9d2965fd3424545a9f822802de092c6e514080b9", + "version-string": "0.4.4", + "port-version": 1 + }, + { + "git-tree": "3e2b606857ae33216ec3e14e7b80c2b1fa5ef511", + "version-string": "0.4.4", + "port-version": 0 + }, + { + "git-tree": "1eb6b849deb546b084b493c1806f0ea9880eb3ac", + "version-string": "0.4.3", + "port-version": 1 + }, + { + "git-tree": "10b40eac7593c3edf66c08291e1bb1f3c92a62b9", + "version-string": "0.4.3", + "port-version": 0 + }, + { + "git-tree": "17fd741fb07bae8b24aa587d2ce17392cdd45489", + "version-string": "0.4.2", + "port-version": 2 + }, + { + "git-tree": "be1fb8778b50c546c918cc1d96ac5eae5b15e667", + "version-string": "0.4.1", + "port-version": 2 + }, + { + "git-tree": "9f7b29180b158e7c587d91ffcc6794998eb60ac6", + "version-string": "0.4.0", + "port-version": 2 + }, + { + "git-tree": "cbe2dcfc1a0934425fe5304b34788e2e8a852802", + "version-string": "0.4.0", + "port-version": 1 + }, + { + "git-tree": "a61672e8d77d8ca155044e13c82468b7df1dba31", + "version-string": "0.4.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/septag-dmon.json b/externals/vcpkg/versions/s-/septag-dmon.json new file mode 100755 index 000000000..ed29d1fd1 --- /dev/null +++ b/externals/vcpkg/versions/s-/septag-dmon.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "377b8711ab595b704c7beb3dd9972b7bb6d75c62", + "version-date": "2022-02-08", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/septag-sx.json b/externals/vcpkg/versions/s-/septag-sx.json new file mode 100755 index 000000000..bb225d168 --- /dev/null +++ b/externals/vcpkg/versions/s-/septag-sx.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "5132e30b4b29133a845eb8a90ad5e1a43bc9c0cd", + "version-string": "2019-05-07", + "port-version": 3 + }, + { + "git-tree": "cad2dce33d7fcb4c68d19e7500c528fbf9a0dee3", + "version-string": "2019-05-07-2", + "port-version": 0 + }, + { + "git-tree": "7581a8464abb2e98f0d2936156f47eb45a1799c7", + "version-string": "2019-05-07-1", + "port-version": 0 + }, + { + "git-tree": "b3ce911c8e33a6b93f67b77676b8b52ebafc9d8d", + "version-string": "2019-05-07", + "port-version": 0 + }, + { + "git-tree": "b9e21c1d4135ab98fcecc9970d8520afb9b39743", + "version-string": "2019-04-27", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/seqan.json b/externals/vcpkg/versions/s-/seqan.json new file mode 100755 index 000000000..7fda5058f --- /dev/null +++ b/externals/vcpkg/versions/s-/seqan.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "308d1d7ca45d981ec55da094763b72c2ffc062ca", + "version-string": "2.4.0", + "port-version": 2 + }, + { + "git-tree": "e4536d4ddc67fb220b162eae9ab38e284ae05243", + "version-string": "2.4.0-1", + "port-version": 0 + }, + { + "git-tree": "0e40efd3ef1b468430de54bb23b1d496c44c87d9", + "version-string": "2.4.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/serd.json b/externals/vcpkg/versions/s-/serd.json new file mode 100755 index 000000000..5db30a5c6 --- /dev/null +++ b/externals/vcpkg/versions/s-/serd.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0061d58cfde2c694571f97e44a35075f92975a7d", + "version-string": "0.30.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/serdepp.json b/externals/vcpkg/versions/s-/serdepp.json new file mode 100755 index 000000000..a6effc714 --- /dev/null +++ b/externals/vcpkg/versions/s-/serdepp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "37783a8fa004467ce9ee44c8f1e79fd994abd8e7", + "version": "0.1.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sf2cute.json b/externals/vcpkg/versions/s-/sf2cute.json new file mode 100755 index 000000000..7515996d0 --- /dev/null +++ b/externals/vcpkg/versions/s-/sf2cute.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "abd8af86e6de2707f8334d767ff543b6dfb3a703", + "version-string": "0.2.0", + "port-version": 2 + }, + { + "git-tree": "3e4e8518680f2bc5d3a5442eea14eefb7f73444e", + "version-string": "0.2.0-1", + "port-version": 0 + }, + { + "git-tree": "a8fa1664670d78a9668bd04309bfdded1aca3ea8", + "version-string": "0.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sfgui.json b/externals/vcpkg/versions/s-/sfgui.json new file mode 100755 index 000000000..639b8bc94 --- /dev/null +++ b/externals/vcpkg/versions/s-/sfgui.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "50f11f13413cb93d73d44bd0c00787363a00c98c", + "version": "0.4.0", + "port-version": 5 + }, + { + "git-tree": "64f6f7ee9963a096a2b4260c55be6228a22846e5", + "version-string": "0.4.0", + "port-version": 4 + }, + { + "git-tree": "3ea13b41076aa915571ec9e65719a5088b70fd44", + "version-string": "0.4.0-3", + "port-version": 0 + }, + { + "git-tree": "3edb59e7642886f579328f0809e846fffe8c411e", + "version-string": "0.4.0-2", + "port-version": 0 + }, + { + "git-tree": "525e3b1cdfc5d3c713dc3020e0be24369fe781fb", + "version-string": "0.4.0", + "port-version": 0 + }, + { + "git-tree": "9ec5d853db22c662ade21094f88fc2ae7da99fd2", + "version-string": "0.3.2-2", + "port-version": 0 + }, + { + "git-tree": "404fc9f3c4602cc2d93290d45a7c4ae4620f114a", + "version-string": "0.3.2-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sfml.json b/externals/vcpkg/versions/s-/sfml.json new file mode 100755 index 000000000..3519276cf --- /dev/null +++ b/externals/vcpkg/versions/s-/sfml.json @@ -0,0 +1,114 @@ +{ + "versions": [ + { + "git-tree": "ca14334e4fdf097424958412912356dc2c186b9d", + "version": "2.5.1", + "port-version": 13 + }, + { + "git-tree": "bc9b03c639a91f2deff1fb78ab943cce64876ffe", + "version": "2.5.1", + "port-version": 12 + }, + { + "git-tree": "c9d7e4e8a4aeec1731d48bac0c2b59b53ee30ba8", + "version": "2.5.1", + "port-version": 11 + }, + { + "git-tree": "02d4e2c1c253e1ef48dd9c37d24bec0a47a716ff", + "version": "2.5.1", + "port-version": 10 + }, + { + "git-tree": "abdf117d96cbb4dd259ec37277311109151bfcdb", + "version-string": "2.5.1", + "port-version": 9 + }, + { + "git-tree": "853d1a145c4aff18f9ebfacdc5ab25356725edcb", + "version-string": "2.5.1", + "port-version": 8 + }, + { + "git-tree": "e348793b1c312fea0819defd83c978ca0c541b92", + "version-string": "2.5.1-7", + "port-version": 0 + }, + { + "git-tree": "58f7fb0a2e9a92113146e519b7309671de694a82", + "version-string": "2.5.1-6", + "port-version": 0 + }, + { + "git-tree": "dfe454cc2eb309097440bc25b4d85a0003f3eded", + "version-string": "2.5.1-5", + "port-version": 0 + }, + { + "git-tree": "c43dd54a7dbd59dd3531d9817c7dd53009603448", + "version-string": "2.5.1-4", + "port-version": 0 + }, + { + "git-tree": "94d045ddc214ad5bd30f95b2692d9a6dcc8a55f1", + "version-string": "2.5.1-3", + "port-version": 0 + }, + { + "git-tree": "1ac74dbff3556179f9c51fbd68295abf4725cd26", + "version-string": "2.5.1-2", + "port-version": 0 + }, + { + "git-tree": "6a0417010a1aede4ffded5d16d47d74dea924272", + "version-string": "2.5.1-1", + "port-version": 0 + }, + { + "git-tree": "cbd65a448eee418c75a45b437122ffc020ad9c73", + "version-string": "2.5.1", + "port-version": 0 + }, + { + "git-tree": "9d01a101ce4f0af9c76fc932859b90dd181a0fb7", + "version-string": "2.5.0-2", + "port-version": 0 + }, + { + "git-tree": "434d3fece6c4b020afcf3d41c7ad3914385c8392", + "version-string": "2.5.0-1", + "port-version": 0 + }, + { + "git-tree": "4aee81707005bf0c8a349f3381cf4f97c1c96377", + "version-string": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "fb48b12d62222c96fafa28a64b807cf435135dd6", + "version-string": "2.4.2-3", + "port-version": 0 + }, + { + "git-tree": "32495d8ac072763c37cb0c49629689dff7bcc771", + "version-string": "2.4.2-2", + "port-version": 0 + }, + { + "git-tree": "18676b3a3b757ee391848131342d592f7578a243", + "version-string": "2.4.2-1", + "port-version": 0 + }, + { + "git-tree": "3418a74aa71ed06a5ceb48e5ebc7e7ff4ef3bfce", + "version-string": "2.4.2", + "port-version": 0 + }, + { + "git-tree": "4ccb85b8ee769b87dea9ff49ba7552aa15931474", + "version-string": "2.4.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sfsexp.json b/externals/vcpkg/versions/s-/sfsexp.json new file mode 100755 index 000000000..8cec38862 --- /dev/null +++ b/externals/vcpkg/versions/s-/sfsexp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "ca4335a5797bd0b2510b0fa53b9c3445d6a02a30", + "version": "1.3.1", + "port-version": 0 + }, + { + "git-tree": "e5ca6aca4e64e303a37342534f85a1790ec3991e", + "version-string": "1.3", + "port-version": 1 + }, + { + "git-tree": "1e71d8f85094713149a3f09368f02c69e3f5f952", + "version-string": "1.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/shaderc.json b/externals/vcpkg/versions/s-/shaderc.json new file mode 100755 index 000000000..840e9fe99 --- /dev/null +++ b/externals/vcpkg/versions/s-/shaderc.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "376570ffd232d9c4e0dad095ae3dea964dec52ed", + "version": "2021.1", + "port-version": 2 + }, + { + "git-tree": "e8590ab232dd5ccd2331bb321127f00788b573a3", + "version": "2021.1", + "port-version": 1 + }, + { + "git-tree": "2bf34bbfc26bddfe440bb115157a3b5cd07e7e79", + "version": "2021.1", + "port-version": 0 + }, + { + "git-tree": "684cc1ffce4fe1fe48788484436e1e6d5886859e", + "version-string": "2019-06-26", + "port-version": 2 + }, + { + "git-tree": "0622fa62b4192278be6dc612e9328e3c3a96ff50", + "version-string": "2019-06-26-1", + "port-version": 0 + }, + { + "git-tree": "7a32ce3f1d1705c1082c0f8a069333fc63ea969d", + "version-string": "2019-06-26", + "port-version": 0 + }, + { + "git-tree": "492c026b1d4eae22d2d27534821be83eeaf91452", + "version-string": "12fb656ab20ea9aa06e7084a74e5ff832b7ce2da-2", + "port-version": 0 + }, + { + "git-tree": "26dae9c17ea4392110945830fa0eff2340bd2c96", + "version-string": "12fb656ab20ea9aa06e7084a74e5ff832b7ce2da-1", + "port-version": 0 + }, + { + "git-tree": "c9c37a5711b5fc1c744b29df9cc22a38d7ba2957", + "version-string": "12fb656ab20ea9aa06e7084a74e5ff832b7ce2da", + "port-version": 0 + }, + { + "git-tree": "036b647c98ff6f8676756f49098fc027b5fbfe60", + "version-string": "2df47b51d83ad83cbc2e7f8ff2b56776293e8958-1", + "port-version": 0 + }, + { + "git-tree": "d0d9b33f7be3844aaf19665f1a4d16c8db3f65f1", + "version-string": "2df47b51d83ad83cbc2e7f8ff2b56776293e8958", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/shaderwriter.json b/externals/vcpkg/versions/s-/shaderwriter.json new file mode 100755 index 000000000..c0899c281 --- /dev/null +++ b/externals/vcpkg/versions/s-/shaderwriter.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "a5b9552631eef5dc2f4fc3bb2056730dc164981c", + "version": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "09802faaae65b3f6ac6adfe5687bf581f0189dba", + "version": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "e9ad5b26c40e2048a99c618972827c8f8e802eaa", + "version": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "74d64baacf8733ed2cb0a0ded83ac86b8213a609", + "version": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "3ed37649aa1fcdb0323fdf75fdfe3ffa038d0dfe", + "version": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "ec535c5e829a1afeab64cd517f9f8c6cf453d7bb", + "version-string": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "f65600030bc48b3b5c3317f4af7affbfa3e2d818", + "version-string": "2020-10-15", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/shapelib.json b/externals/vcpkg/versions/s-/shapelib.json new file mode 100755 index 000000000..e558b2abd --- /dev/null +++ b/externals/vcpkg/versions/s-/shapelib.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "befbba83687abe4b10f1fb55ac5ccc344bd11084", + "version": "1.5.0", + "port-version": 3 + }, + { + "git-tree": "d70a93c1899b5607ca1894c66beacec5c1afec9c", + "version-string": "1.5.0", + "port-version": 2 + }, + { + "git-tree": "e32017b2f39e66b09726e3207e85486a820b9930", + "version-string": "1.5.0", + "port-version": 1 + }, + { + "git-tree": "8f8ae7fafd81e822e81a86f16ae6b5cdf7109d0e", + "version-string": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "e653c09eb6dfc19a9b54b77cdeb89e4ccb4dfccc", + "version-string": "1.4.1-2", + "port-version": 0 + }, + { + "git-tree": "4a6d9c64f555e0f032b5b4b50e12f4193b661fd6", + "version-string": "1.4.1-1", + "port-version": 0 + }, + { + "git-tree": "c1a5fc63f7b1bc5014826b00600cebceb0a2f7dc", + "version-string": "1.4.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/shiva-sfml.json b/externals/vcpkg/versions/s-/shiva-sfml.json new file mode 100755 index 000000000..e47011f28 --- /dev/null +++ b/externals/vcpkg/versions/s-/shiva-sfml.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "a7520a9c88dcd7ab8ba0234191221ae24e06d801", + "version-string": "1.0", + "port-version": 2 + }, + { + "git-tree": "ae1f4def605cd3f0212bf4ca1902450f45ecfa97", + "version-string": "1.0-1", + "port-version": 0 + }, + { + "git-tree": "19d1dd168c798fb97fcd5cdb48630a1f4304bc61", + "version-string": "1.0", + "port-version": 0 + }, + { + "git-tree": "65c6a55f8edb28019e6b09cc50940ce63d9b8bd0", + "version-string": "0.9", + "port-version": 0 + }, + { + "git-tree": "04e24201129ef3c860a41b28e5b9bd1336e73a76", + "version-string": "0.7.2", + "port-version": 0 + }, + { + "git-tree": "12af86c8e186c3d7572603dfd39f18b9fb141c27", + "version-string": "0.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/shiva.json b/externals/vcpkg/versions/s-/shiva.json new file mode 100755 index 000000000..81d1b1b42 --- /dev/null +++ b/externals/vcpkg/versions/s-/shiva.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "821cf61c76079cfd5c7a635dc36e01c0f33c38f5", + "version": "1.0", + "port-version": 5 + }, + { + "git-tree": "5ff8f81870f8963dc86da05ce330bbde585e940d", + "version-string": "1.0", + "port-version": 4 + }, + { + "git-tree": "012f601b9fa99d1f7ea32a3df809599863bbfa5b", + "version-string": "1.0-3", + "port-version": 0 + }, + { + "git-tree": "bf030396c323fa52c93b2c8d45a5e699de83cd24", + "version-string": "1.0-2", + "port-version": 0 + }, + { + "git-tree": "54d402ddc00e5af4a6087bd5464fad1b75e10558", + "version-string": "1.0-1", + "port-version": 0 + }, + { + "git-tree": "903943c93948e7b38d2a29d1507f88820d19ab47", + "version-string": "1.0", + "port-version": 0 + }, + { + "git-tree": "6f473076f1186ad7ab2c93031a4447f4f6ea85fd", + "version-string": "0.9", + "port-version": 0 + }, + { + "git-tree": "8df530f314232043532935cee19687cd4c4985aa", + "version-string": "0.7.2", + "port-version": 0 + }, + { + "git-tree": "b9ae660e925434f359284fcdf7f5c0c32904471c", + "version-string": "0.7", + "port-version": 0 + }, + { + "git-tree": "fcd76753d8382f91db81e9b768408931640045b1", + "version-string": "0.6", + "port-version": 0 + }, + { + "git-tree": "9d2b4125a3bd79fbab80fefa12ab3628875c20da", + "version-string": "0.3", + "port-version": 0 + }, + { + "git-tree": "40bac513282c377219e3192b78a25b931b92c085", + "version-string": "0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/shogun.json b/externals/vcpkg/versions/s-/shogun.json new file mode 100755 index 000000000..5cbf107c7 --- /dev/null +++ b/externals/vcpkg/versions/s-/shogun.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "13454c6a31030e65fdac9764f8b38c90bf40c9a9", + "version-string": "6.1.4", + "port-version": 7 + }, + { + "git-tree": "0ae86e647188a99b1602164f4614ba54d55cf22a", + "version-string": "6.1.4", + "port-version": 6 + }, + { + "git-tree": "bc5a003bcb8a42fc935726d0d8de55156318a3db", + "version-string": "6.1.4", + "port-version": 5 + }, + { + "git-tree": "c92d5a2ff87b2ffe3a78987e5c483abb537a0a21", + "version-string": "6.1.4", + "port-version": 4 + }, + { + "git-tree": "ab9a1a3260f20287848c12e673c0add58872b135", + "version-string": "6.1.4", + "port-version": 3 + }, + { + "git-tree": "4194ff455159af7503fc6c4d1d3c23fdee9cb1d8", + "version-string": "6.1.4", + "port-version": 2 + }, + { + "git-tree": "59b91118466283503dc6fc3e5706f51e641792be", + "version-string": "6.1.4-1", + "port-version": 0 + }, + { + "git-tree": "a38429e6e13b9509825dd0d9a90505e2b702c6f8", + "version-string": "6.1.4", + "port-version": 0 + }, + { + "git-tree": "7680bcc8036f8a9d9f2b415005990273c4368dcc", + "version-string": "6.1.3-3", + "port-version": 0 + }, + { + "git-tree": "f719e0810eec4ead80974ecc24cbc16e3052e182", + "version-string": "6.1.3-4", + "port-version": 0 + }, + { + "git-tree": "bdd8983cc6713fd980f1238bcd355c48f73c448c", + "version-string": "6.1.3-3", + "port-version": 0 + }, + { + "git-tree": "bc0ab59cdb60cee111585d32ebd68b7a54f20cac", + "version-string": "6.1.3-2", + "port-version": 0 + }, + { + "git-tree": "2128617e72276fe5b5b29eaef1586bffe0c879f6", + "version-string": "6.1.3-1", + "port-version": 0 + }, + { + "git-tree": "bb940abd3c3b26b525bb6ba2626332c83b132ed6", + "version-string": "6.1.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/signalrclient.json b/externals/vcpkg/versions/s-/signalrclient.json new file mode 100755 index 000000000..b77a0218b --- /dev/null +++ b/externals/vcpkg/versions/s-/signalrclient.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "466bc1dd28c6b14346669c6fae30752db269d08a", + "version-string": "1.0.0-beta1-9", + "port-version": 2 + }, + { + "git-tree": "a1cf11834f81f78f10ff18bcec0d7f1c42309f62", + "version-string": "1.0.0-beta1-9", + "port-version": 1 + }, + { + "git-tree": "134ed01f4047d9dcb077f5f0bf06d07b374fe7b1", + "version-string": "1.0.0-beta1-8", + "port-version": 0 + }, + { + "git-tree": "5523151914bd255b4f7be195cbf2c9c29ef9a202", + "version-string": "1.0.0-beta1-7", + "port-version": 0 + }, + { + "git-tree": "d52c9b80ed5f478a1e9a1937ec5f80f2d9185da0", + "version-string": "1.0.0-beta1-6", + "port-version": 0 + }, + { + "git-tree": "8b2ff00922990bda0b92c1f75b47647070d7244e", + "version-string": "1.0.0-beta1-5", + "port-version": 0 + }, + { + "git-tree": "55b8af0164609db8a0d3bed45af8673d0395b800", + "version-string": "1.0.0-beta1-4", + "port-version": 0 + }, + { + "git-tree": "85cf956236c59b0edb2116a898f8ba719404be17", + "version-string": "1.0.0-beta1-3", + "port-version": 0 + }, + { + "git-tree": "0df276aa0e11332e37369b97f897c3802ca82037", + "version-string": "1.0.0-beta1-2", + "port-version": 0 + }, + { + "git-tree": "1b1e1f65de977aa3f5c06d8244c3686a73c26602", + "version-string": "1.0.0-beta1-1", + "port-version": 0 + }, + { + "git-tree": "021d82e87e6a17746f4be98a2088543c7bb20df8", + "version-string": "1.0.0-beta1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sigslot.json b/externals/vcpkg/versions/s-/sigslot.json new file mode 100755 index 000000000..2ef6ef5f0 --- /dev/null +++ b/externals/vcpkg/versions/s-/sigslot.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "78e94753c09651ef7e2c09cbb134ae2cb786ade4", + "version-string": "1.0.0", + "port-version": 4 + }, + { + "git-tree": "df12d3b00d8fc713d4d3f064d30df850fa0ddbb0", + "version-string": "1.0.0-3", + "port-version": 0 + }, + { + "git-tree": "90b917faf426db7b759c3e80786b4fdfd881d3bf", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "28463f405d745e5bac80fc9dea9805d227e7c4d4", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/simage.json b/externals/vcpkg/versions/s-/simage.json new file mode 100755 index 000000000..1bbd0a518 --- /dev/null +++ b/externals/vcpkg/versions/s-/simage.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "d877e927cdad3e67542b5c66c26bdc0bda9f5ade", + "version-semver": "1.8.2", + "port-version": 1 + }, + { + "git-tree": "9a3815e60349ce152d08a7f02abab301e3b6bceb", + "version-semver": "1.8.2", + "port-version": 0 + }, + { + "git-tree": "6c2ccc36f5c1ebb27f820fe4f6e89df014e4bafa", + "version-semver": "1.8.1", + "port-version": 4 + }, + { + "git-tree": "97e1edfae380f76bdb4d6e9a94a91bbccd82c3a2", + "version-semver": "1.8.1", + "port-version": 3 + }, + { + "git-tree": "0020fb767148212015f8839835689e193060c88e", + "version-semver": "1.8.1", + "port-version": 2 + }, + { + "git-tree": "f9b941ad6737569ae7c400625b6fc8aac8140683", + "version-semver": "1.8.1", + "port-version": 1 + }, + { + "git-tree": "429f5758def1d9514aa6f3f2bbcb98d8a3f19cd1", + "version-semver": "1.8.1", + "port-version": 0 + }, + { + "git-tree": "7efea762708b2fa21ac7919656bfcdfccbd84339", + "version-string": "1.8.0", + "port-version": 1 + }, + { + "git-tree": "d73e98a3ac5a4ed61f96dce0e08628170ea803ad", + "version-string": "1.8.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/simbody.json b/externals/vcpkg/versions/s-/simbody.json new file mode 100755 index 000000000..df589c447 --- /dev/null +++ b/externals/vcpkg/versions/s-/simbody.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "077f05087ad6704e1febb44e27273550028c5729", + "version-date": "2022-01-04", + "port-version": 2 + }, + { + "git-tree": "09ced08b16274ddf38f64031b659a76b8aea2e85", + "version-date": "2022-01-04", + "port-version": 1 + }, + { + "git-tree": "9474ba4a8027fb4f8e3e160decc4fa9f443a16e9", + "version-date": "2022-01-04", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/simde.json b/externals/vcpkg/versions/s-/simde.json new file mode 100755 index 000000000..e55f5f331 --- /dev/null +++ b/externals/vcpkg/versions/s-/simde.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "7cf62acaf3648a8f0c2d866263788dc413f2beba", + "version": "0.7.2", + "port-version": 0 + }, + { + "git-tree": "0caa37f83bd1276d984e5ae1f67ce0cb47e1f62e", + "version-string": "0.7.0", + "port-version": 1 + }, + { + "git-tree": "49aade0bf4faf46635d58a453e71399f2d6c7412", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "3da136304f40e2ac9bee37de8554353b3651ccfd", + "version-string": "2019-06-05", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/simdjson.json b/externals/vcpkg/versions/s-/simdjson.json new file mode 100755 index 000000000..85ee12e87 --- /dev/null +++ b/externals/vcpkg/versions/s-/simdjson.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "18a23d4f86c9f4d0db8feb5bb7eeb32ebcc3a3f2", + "version-semver": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "0e7df8e0a4eb94c9825ee054fa91c7222568749f", + "version-semver": "1.0.2", + "port-version": 0 + }, + { + "git-tree": "6b733cbc907ee3f0af57e0a84247cade1b55f861", + "version-semver": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "80800c0596226b9d3a818cf8ddf903b2e66e279c", + "version-semver": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "9f3cbe33b4ec739d22f7549f1b73846067f78d84", + "version": "0.9.7", + "port-version": 0 + }, + { + "git-tree": "b913c5ecbf889a46c809032952c348605a78a391", + "version": "0.9.6", + "port-version": 0 + }, + { + "git-tree": "c9528b67438ec071c4108f925f3976b937f91469", + "version": "0.9.2", + "port-version": 1 + }, + { + "git-tree": "821a523f19a2de0c686d119e17599f95fcd44ad1", + "version": "0.9.2", + "port-version": 0 + }, + { + "git-tree": "3b3e5c3120162cd5d7536bcb24d9b85e3a67cf99", + "version-string": "0.8.2", + "port-version": 0 + }, + { + "git-tree": "cdf5909a4b7e7cddaa771495214d9b55c70fde08", + "version-string": "0.7.1", + "port-version": 0 + }, + { + "git-tree": "0b4a10f989059441e8f92a3c553bd0a8ba86a7ff", + "version-string": "0.5.0", + "port-version": 0 + }, + { + "git-tree": "1b45c660ecb7574d541a2ac0e78360d1b2ca595b", + "version-string": "0.4.6", + "port-version": 0 + }, + { + "git-tree": "ecc37ff07b739241fbd962877fb0379b184f440c", + "version-string": "2020-05-26", + "port-version": 0 + }, + { + "git-tree": "bb9f45685c89d1db322dfff6a16c446f3ab9819e", + "version-string": "2019-12-27-1", + "port-version": 0 + }, + { + "git-tree": "653474d2fe6a3f3ad09e0f135551f2405448d201", + "version-string": "2019-12-27", + "port-version": 0 + }, + { + "git-tree": "4ad6668cb38e1d27f7b6427258ab4a9302ce970f", + "version-string": "2019-08-05", + "port-version": 0 + }, + { + "git-tree": "a7b21eb23fec6f5c0791ae8de24b7b6fcb48f36b", + "version-string": "2019-03-09", + "port-version": 0 + }, + { + "git-tree": "2b1d97af21d173a979dab9a5042a4524f23d214b", + "version-string": "2019-03-05", + "port-version": 0 + }, + { + "git-tree": "eb81ea8251ab69cc375b8fe1c1c3313c7a114108", + "version-string": "2019-03-03", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/simdutf.json b/externals/vcpkg/versions/s-/simdutf.json new file mode 100755 index 000000000..f102a45a3 --- /dev/null +++ b/externals/vcpkg/versions/s-/simdutf.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "9d32f4a5bb9643b561a26f555064b2341a93df4b", + "version-semver": "1.0.0", + "port-version": 1 + }, + { + "git-tree": "86279d4e90015257171464027e3658544c748342", + "version-semver": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/simple-fft.json b/externals/vcpkg/versions/s-/simple-fft.json new file mode 100755 index 000000000..8ea28d2b1 --- /dev/null +++ b/externals/vcpkg/versions/s-/simple-fft.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "c8c90beba45454e3e497fb7ef62b20a188bee1c2", + "version-string": "2020-06-14", + "port-version": 1 + }, + { + "git-tree": "b15ee04ff2954c699af23a3a292a1d016f285ce7", + "version-string": "2020-06-14", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/simpleini.json b/externals/vcpkg/versions/s-/simpleini.json new file mode 100755 index 000000000..e4583be99 --- /dev/null +++ b/externals/vcpkg/versions/s-/simpleini.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "edfed522ec88f3bd721e2ee1b09c177b0d93d378", + "version": "4.19", + "port-version": 0 + }, + { + "git-tree": "da811f3fb2f252e4f1eff0f42047c539315b60dd", + "version-string": "2018-08-31", + "port-version": 5 + }, + { + "git-tree": "7c5b51650f86a58145cdcfd417d11cb6194f86c5", + "version-string": "2018-08-31-4", + "port-version": 0 + }, + { + "git-tree": "a763ce6729f427163521a78e860742a62f82e75d", + "version-string": "2018-08-31-3", + "port-version": 0 + }, + { + "git-tree": "b0d7d38cc1713a26f6e420cf7717e1c704064f5d", + "version-string": "2018-08-31-2", + "port-version": 0 + }, + { + "git-tree": "f65355da9ff4035912588c352359e367f0f5a03e", + "version-string": "2018-08-31-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sjpeg.json b/externals/vcpkg/versions/s-/sjpeg.json new file mode 100755 index 000000000..22934e528 --- /dev/null +++ b/externals/vcpkg/versions/s-/sjpeg.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "fe20a97b3cdd0a6ad84ca9543670ea61673d1026", + "version-date": "2021-10-31", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/skcrypter.json b/externals/vcpkg/versions/s-/skcrypter.json new file mode 100755 index 000000000..26fb5ac72 --- /dev/null +++ b/externals/vcpkg/versions/s-/skcrypter.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "95af2c7ed5227763696b4101e416e227446b7299", + "version-date": "2021-12-03", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/skia.json b/externals/vcpkg/versions/s-/skia.json new file mode 100755 index 000000000..00a465e3e --- /dev/null +++ b/externals/vcpkg/versions/s-/skia.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "d167d79c12796fb226b9a869705fde2f4594e789", + "version-date": "2022-04-15", + "port-version": 0 + }, + { + "git-tree": "cdf8cda1612a4770f3a01e35ae5da93654abc17d", + "version-date": "2020-05-18", + "port-version": 9 + }, + { + "git-tree": "104ba7c5e5e46398000e92e0f9cc3c9f0999e142", + "version-date": "2020-05-18", + "port-version": 8 + }, + { + "git-tree": "f7b3961a52ea4c43d781a5c8ace67d0ef100cce7", + "version-date": "2020-05-18", + "port-version": 7 + }, + { + "git-tree": "100eb7e29ed2959e793dfce6500b408e84d56562", + "version-date": "2020-05-18", + "port-version": 6 + }, + { + "git-tree": "19fcd9cfd0b0a27e87e04bf2d1f8f03c7b1e8ab0", + "version-string": "2020-05-18", + "port-version": 5 + }, + { + "git-tree": "eea166718304da2660d795937fe2528dbd2909cc", + "version-string": "2020-05-18", + "port-version": 4 + }, + { + "git-tree": "d04414d54594483de831191613388c6b5aa978e9", + "version-string": "2020-05-18", + "port-version": 3 + }, + { + "git-tree": "177d57db9d882f100d003747bc7bb8a7b15fb93f", + "version-string": "2020-05-18", + "port-version": 2 + }, + { + "git-tree": "df6c0878878778539f84b01d1c80279e9c37fea7", + "version-string": "2020-05-18-1", + "port-version": 0 + }, + { + "git-tree": "ab86d01c431953c24ed509e461d68737de25d240", + "version-string": "2020-02-15-1", + "port-version": 0 + }, + { + "git-tree": "d2f0ed461eec9c568c14edb26029b9212610c28c", + "version-string": "2020-02-15", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/skyr-url.json b/externals/vcpkg/versions/s-/skyr-url.json new file mode 100755 index 000000000..98ad90124 --- /dev/null +++ b/externals/vcpkg/versions/s-/skyr-url.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "429bf1616eeeb9c2315b09d9a6c741245e3eae6a", + "version": "1.13.0", + "port-version": 2 + }, + { + "git-tree": "174f5bc4cc8080f2cb34c7a1aad9b14bedaa2c9a", + "version-string": "1.13.0", + "port-version": 1 + }, + { + "git-tree": "f5e980fa829d4bd732381378c07ab88cb7b2c969", + "version-string": "1.13.0", + "port-version": 0 + }, + { + "git-tree": "05cd6beca4ffc47cdd618838be06f0ae979a56b9", + "version-string": "1.12.0", + "port-version": 0 + }, + { + "git-tree": "c05be5836d2f25969eaaf145126836c6e18011b4", + "version-string": "1.11.0", + "port-version": 0 + }, + { + "git-tree": "e5f5bd252f928a1a81b2befe404617906c9b487a", + "version-string": "1.10.0", + "port-version": 0 + }, + { + "git-tree": "8676d5dfc85f85f5fde6e3f223818d1a89d44fc1", + "version-string": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "c780902451f439d276d13dc4360e5eedac8b0acc", + "version-string": "1.7.5", + "port-version": 0 + }, + { + "git-tree": "ade89e045541cc0b8c35393f14a6344dea2c0f6b", + "version-string": "1.7.3", + "port-version": 0 + }, + { + "git-tree": "66ddce862691ffe1f339a607eaaeb9dac247e5de", + "version-string": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "77fa2480eb705b8818e404d7bc87c94c4e51a858", + "version-string": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "e336acb4ff76d32d20792c7250dd5c3f0116bccd", + "version-string": "1.4.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sleef.json b/externals/vcpkg/versions/s-/sleef.json new file mode 100755 index 000000000..445a52d6c --- /dev/null +++ b/externals/vcpkg/versions/s-/sleef.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "24d704091e9827b6e0192fb51f0798422da9707e", + "version": "3.5.1", + "port-version": 2 + }, + { + "git-tree": "ea33cc5343944b32ab14b772d5242a07fb84865b", + "version": "3.5.1", + "port-version": 1 + }, + { + "git-tree": "0c195bd94ab64769463a4891db9d140fa37508a4", + "version": "3.5.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sleepy-discord.json b/externals/vcpkg/versions/s-/sleepy-discord.json new file mode 100755 index 000000000..78559640b --- /dev/null +++ b/externals/vcpkg/versions/s-/sleepy-discord.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "5e868f4817878ec1c9686ab467b60f8086c50a00", + "version-date": "2022-02-05", + "port-version": 0 + }, + { + "git-tree": "0aba637e01389ec4ed5923eaf898ca78dac96cbb", + "version-date": "2021-07-07", + "port-version": 1 + }, + { + "git-tree": "9ef84b8cb8cdd5d278b005a551044a6635490bda", + "version-date": "2021-07-07", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/slikenet.json b/externals/vcpkg/versions/s-/slikenet.json new file mode 100755 index 000000000..72f5c2937 --- /dev/null +++ b/externals/vcpkg/versions/s-/slikenet.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "470cffd8e68b737e7131beccd5fc7a87be9c3151", + "version-date": "2021-06-07", + "port-version": 1 + }, + { + "git-tree": "ac7b0f3e2e112489c1d66b390c22e050bd410783", + "version-date": "2021-06-07", + "port-version": 0 + }, + { + "git-tree": "fd99081ecbebc7fe7639cc9a61899ff6fb977d04", + "version-string": "2019-10-22-2", + "port-version": 0 + }, + { + "git-tree": "12e751ed18fc9b232f37ba1bfeba3ed07b6c35f2", + "version-string": "2019-10-22_1", + "port-version": 0 + }, + { + "git-tree": "2da918efefed1fe179a81a840e74f5a3167201a9", + "version-string": "2019-10-22", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sltbench.json b/externals/vcpkg/versions/s-/sltbench.json new file mode 100755 index 000000000..134e696fe --- /dev/null +++ b/externals/vcpkg/versions/s-/sltbench.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7d051973310c2bd8ed3e9d90f53a9179fd651359", + "version-string": "2.4.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/smpeg2.json b/externals/vcpkg/versions/s-/smpeg2.json new file mode 100755 index 000000000..8b264b4ad --- /dev/null +++ b/externals/vcpkg/versions/s-/smpeg2.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "a42a5beba1ed982d3e6abb94ad6871f06f663d93", + "version-string": "2.0.0", + "port-version": 7 + }, + { + "git-tree": "11b7150cc88a598a42ce1467849d1138fb0540aa", + "version-string": "2.0.0-6", + "port-version": 0 + }, + { + "git-tree": "bd65cb2504c2c8212d11ccb603ce21d6aee9279b", + "version-string": "2.0.0-5", + "port-version": 0 + }, + { + "git-tree": "9b7899c89d213403142449e133911b5d03687d12", + "version-string": "2.0.0-3", + "port-version": 0 + }, + { + "git-tree": "b4a1d9ecf0315d3c311279b789aa9c9dbec1d483", + "version-string": "2.0.0-2", + "port-version": 0 + }, + { + "git-tree": "f2c913e246b0fc3ae49132f8a58b82e9443f25d2", + "version-string": "2.0.0-1", + "port-version": 0 + }, + { + "git-tree": "b458b862ee758d38e46e5537eb557a1602f88cd6", + "version-string": "2.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/snappy.json b/externals/vcpkg/versions/s-/snappy.json new file mode 100755 index 000000000..5e6b9bad1 --- /dev/null +++ b/externals/vcpkg/versions/s-/snappy.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "c92c17d378451a07e9cc974fa31893d1cae61b66", + "version": "1.1.9", + "port-version": 1 + }, + { + "git-tree": "ca2180e16528c28e8afe86ce0d7cf0e8a053f273", + "version": "1.1.9", + "port-version": 0 + }, + { + "git-tree": "c1afd7c780a1ca8befbc3fbde0262d073afeee35", + "version-string": "1.1.8", + "port-version": 1 + }, + { + "git-tree": "2d47bf3d6ebccc84da5b32fadd900cf9b4b21fb7", + "version-string": "1.1.8", + "port-version": 0 + }, + { + "git-tree": "ea3027d934db1c7fee2243ea840152e503191f00", + "version-string": "1.1.7-2", + "port-version": 0 + }, + { + "git-tree": "646c81e0905949d49e7a1798d769a64345075060", + "version-string": "1.1.7-1", + "port-version": 0 + }, + { + "git-tree": "4650713df2896afa9f710048bcc3a9f95a1fc081", + "version-string": "1.1.7", + "port-version": 0 + }, + { + "git-tree": "fdab2eba86df0a616391163b40b420ffbd5c09ef", + "version-string": "1.1.6-be6dc3d", + "port-version": 0 + }, + { + "git-tree": "92e5482a901b1c3ba9c2a557029c475d263c817f", + "version-string": "1.1.4-1", + "port-version": 0 + }, + { + "git-tree": "c221837526a4596ce67d3023a28db60f80d4f0e7", + "version-string": "1.1.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sndfile.json b/externals/vcpkg/versions/s-/sndfile.json new file mode 100755 index 000000000..0700452b2 --- /dev/null +++ b/externals/vcpkg/versions/s-/sndfile.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "b0706d70c299fbe9e9e32d80e5ba2cb910dfd294", + "version-string": "0", + "port-version": 1 + }, + { + "git-tree": "b4f6b73847fa1f16e3d628d0663354df7d579ffd", + "version-string": "0", + "port-version": 0 + }, + { + "git-tree": "85b7063e42522e840546050452584d7383c2e08e", + "version-string": "deprecated", + "port-version": 0 + }, + { + "git-tree": "2de89cec678149407bcf4a661cd5eb882c9823aa", + "version-string": "1.0.29-cebfdf2-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/snowhouse.json b/externals/vcpkg/versions/s-/snowhouse.json new file mode 100755 index 000000000..0031ac584 --- /dev/null +++ b/externals/vcpkg/versions/s-/snowhouse.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "d49ba83122c461ba6d57aa2768241cc07ff3e32e", + "version-string": "5.0.0", + "port-version": 1 + }, + { + "git-tree": "c259e9c0f2dbd8f9b73871032ee553973636403e", + "version-string": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "74b2306427376ac85f557edc031006de7b053b76", + "version-string": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "e3ecad8455cc7469e4e2b6ee8a7a4ae6330a0241", + "version-string": "3.1.1", + "port-version": 0 + }, + { + "git-tree": "8bd3fe38212e48daaf2e5f04018df991dfe57bac", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "9a94f0e34a171c57fb889fb3497f4f9bf90fd4b8", + "version-string": "3.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/so5extra.json b/externals/vcpkg/versions/s-/so5extra.json new file mode 100755 index 000000000..ff3914f4a --- /dev/null +++ b/externals/vcpkg/versions/s-/so5extra.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "66d53f9403902601af81144cfe017b3576617643", + "version": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "a25bef02c9cea8f01ec3066d423b4f4ca6615959", + "version": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "19014d4bd5c636ba619162dfad251af8142e4843", + "version": "1.4.1.1", + "port-version": 0 + }, + { + "git-tree": "393e65540e9e66bdb66333aed31160795f91e220", + "version-string": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "4d16fab10ac993df2762eecbc259d2d271452f8f", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "c7fbd7717e208729612acdeb8b5a6adff0059d7d", + "version-string": "1.3.1.1", + "port-version": 0 + }, + { + "git-tree": "065c9b9262c5b976ecf6bce41d79cf95ac3e86d8", + "version-string": "1.3.1-2", + "port-version": 0 + }, + { + "git-tree": "c793dac8c213991621f6c89998c46dda73793308", + "version-string": "1.3.1-1", + "port-version": 0 + }, + { + "git-tree": "c0a80d0bb4b4afbb6b3f483b59679f92d86044e8", + "version-string": "1.3.1", + "port-version": 0 + }, + { + "git-tree": "48bfd4cd03f3e57f9a10fc287c17107693c78476", + "version-string": "1.2.3-1", + "port-version": 0 + }, + { + "git-tree": "6070cc886493132054392b5f6713028cc616987c", + "version-string": "1.2.3", + "port-version": 0 + }, + { + "git-tree": "d16c42dbab9ebafa1771d7d8f2d9bd62d6f35879", + "version-string": "1.2.2", + "port-version": 0 + }, + { + "git-tree": "f7f7091c288b26e9543a8f20a0a11428bb0e153c", + "version-string": "1.2.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sobjectizer.json b/externals/vcpkg/versions/s-/sobjectizer.json new file mode 100755 index 000000000..971916b7d --- /dev/null +++ b/externals/vcpkg/versions/s-/sobjectizer.json @@ -0,0 +1,159 @@ +{ + "versions": [ + { + "git-tree": "0434420bf7122407a1efe2ae663f5d09d70ce775", + "version": "5.7.4", + "port-version": 0 + }, + { + "git-tree": "6d0c49d93ac92669376ad08293de921d9e36352e", + "version": "5.7.3", + "port-version": 0 + }, + { + "git-tree": "a9d077353078063b67cad355ccb7546a0b4bfcac", + "version": "5.7.2.6", + "port-version": 0 + }, + { + "git-tree": "21a89cfcbe5096e303ef5b0c2d5ab7194687891f", + "version": "5.7.2.5", + "port-version": 0 + }, + { + "git-tree": "46fcfdf013beb303bdf96ba55dbdb7c9bb175c12", + "version": "5.7.2.4", + "port-version": 0 + }, + { + "git-tree": "3c620a2c9fef044243960bce44d471b818ddda98", + "version": "5.7.2.3", + "port-version": 0 + }, + { + "git-tree": "eae0bbd622d8f9b414bcbb45ceb0ff69ff075fc7", + "version-string": "5.7.2.2", + "port-version": 0 + }, + { + "git-tree": "3a4674e0a7170bdc14b397ea830b758aed3fc9e6", + "version-string": "5.7.2.1", + "port-version": 0 + }, + { + "git-tree": "71f7e3c7e25f43845a696ef45946c9c665100a92", + "version-string": "5.7.2", + "port-version": 0 + }, + { + "git-tree": "b4c2521b9be395373819121da5812356ff90729e", + "version-string": "5.7.1", + "port-version": 0 + }, + { + "git-tree": "36e4e63072b63db642d7db3994d1262d8b3c94a7", + "version-string": "5.7.0.1", + "port-version": 0 + }, + { + "git-tree": "3bd7e59bc656b165ce07d6c0a34bb4fe82518ca6", + "version-string": "5.7.0", + "port-version": 0 + }, + { + "git-tree": "adcbf58ac4118f7a45f6efb6967ab4e42507c185", + "version-string": "5.6.1-1", + "port-version": 0 + }, + { + "git-tree": "b27a9d9b57a89ee06f3f69ae2afc629a18bc51ef", + "version-string": "5.6.1", + "port-version": 0 + }, + { + "git-tree": "cd26e5bfb0e9dc9a1066d61e502c6538a4df4edf", + "version-string": "5.6.0.2", + "port-version": 0 + }, + { + "git-tree": "24699630443716cf72575b26199884c2cfe557e8", + "version-string": "5.5.24.4-1", + "port-version": 0 + }, + { + "git-tree": "f008bc897573418cf02ff3b43e3c43c7eb184307", + "version-string": "5.5.24.4", + "port-version": 0 + }, + { + "git-tree": "324c76f38492f7c1276d417c52392323c9e30f80", + "version-string": "5.5.24.3", + "port-version": 0 + }, + { + "git-tree": "a58eb37943832980d4c17d8e8d63fdca20cfc56f", + "version-string": "5.5.24.2", + "port-version": 0 + }, + { + "git-tree": "f97f5d2f13c962ec970fa7e2e799770ab240909e", + "version-string": "5.5.24.1", + "port-version": 0 + }, + { + "git-tree": "667e56993a88d1fc828313bf277b1ae04d14b7df", + "version-string": "5.5.24", + "port-version": 0 + }, + { + "git-tree": "524df252c3c564c7b2c055e6cd916c19d3d194dc", + "version-string": "5.5.23", + "port-version": 0 + }, + { + "git-tree": "76a8176577a73c64cbef6d392b77aa43fbc5ba17", + "version-string": "5.5.22.1", + "port-version": 0 + }, + { + "git-tree": "6dd61010769190456350589ef8883ec20956aa1f", + "version-string": "5.5.22", + "port-version": 0 + }, + { + "git-tree": "f957b85c55881582b257dc431d26ed73db258e42", + "version-string": "5.5.21", + "port-version": 0 + }, + { + "git-tree": "9ea4b550f525a64d5a29f237fa7b99b2e4502ad2", + "version-string": "5.5.20", + "port-version": 0 + }, + { + "git-tree": "0dfb8d49a267df83b74017919f5b5a058b432658", + "version-string": "5.5.20-beta1-201712061845", + "port-version": 0 + }, + { + "git-tree": "cfd7432f2cf52e4552142d841b55bf1351ac08c4", + "version-string": "5.5.19.2-1", + "port-version": 0 + }, + { + "git-tree": "5aef09e1967491303966590c31b05ef26db4979e", + "version-string": "5.5.19.2", + "port-version": 0 + }, + { + "git-tree": "93dab1c80b148b0b8cd68509f042304f864b0e30", + "version-string": "5.5.19-2", + "port-version": 0 + }, + { + "git-tree": "480fbf10a62b8e92ed7c0c8b5936552aed89bdec", + "version-string": "5.5.19", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/soci.json b/externals/vcpkg/versions/s-/soci.json new file mode 100755 index 000000000..1d6dbc1ca --- /dev/null +++ b/externals/vcpkg/versions/s-/soci.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "885023b9eb3db14a25a785e0f67e3a1585f07a02", + "version": "4.0.2", + "port-version": 0 + }, + { + "git-tree": "05767aa636348d9fb5a2507a2c348091cc9d7782", + "version": "4.0.1", + "port-version": 3 + }, + { + "git-tree": "8127c6d88c6b673066ea41b061dd79d600c442d4", + "version-string": "4.0.1", + "port-version": 2 + }, + { + "git-tree": "b3715b7475ac7a9dd45c1d46c0f72b7c84f67c09", + "version-string": "4.0.1", + "port-version": 1 + }, + { + "git-tree": "f5e3d0da7cc2c6387fdd6b5e6ab13e1315e181c7", + "version-string": "4.0.1", + "port-version": 0 + }, + { + "git-tree": "e686550286c39a5e874ffffc22325d8148898e0e", + "version-string": "4.0.0-1", + "port-version": 0 + }, + { + "git-tree": "d7296ebafd0d9d2c57ebc2b8d020aeb0d9dd63ac", + "version-string": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "4188993df67564e79b0a05d18355dc001dbde40d", + "version-string": "3.2.3-4", + "port-version": 0 + }, + { + "git-tree": "fb8d74db8028ce82aefbc434b66170bb4e192150", + "version-string": "3.2.3-3", + "port-version": 0 + }, + { + "git-tree": "053e8f1e7febcfccde48da1f25b07d7eb3dcc1e2", + "version-string": "3.2.3-2", + "port-version": 0 + }, + { + "git-tree": "45798e07dcfb277f62d0cef758e598505741b6d0", + "version-string": "3.2.3-1", + "port-version": 0 + }, + { + "git-tree": "03d76021f0d9daf65db82c9f2d4a924499956cb6", + "version-string": "2016.10.22-1", + "port-version": 0 + }, + { + "git-tree": "cb8646fb74db3c51b1f357de930c34fbe0dcf521", + "version-string": "2016.10.22", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/socket-io-client.json b/externals/vcpkg/versions/s-/socket-io-client.json new file mode 100755 index 000000000..97a122629 --- /dev/null +++ b/externals/vcpkg/versions/s-/socket-io-client.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "f31e0afc883eef287abf9b7914563cd10b331b86", + "version": "3.1.0", + "port-version": 1 + }, + { + "git-tree": "3844cb4dc084c2fe9ddd4a15a77d0c06e391c744", + "version": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "fb9a92d56d3208354e66f4a449698af2e2d2fd2f", + "version": "3.0.0", + "port-version": 1 + }, + { + "git-tree": "a84a0e4ab231050bf881b44603070de5da27ae05", + "version": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "72d40d2e1c52ff3be1a8ac23f9f45baeed8cbe58", + "version-string": "1.6.1-1", + "port-version": 0 + }, + { + "git-tree": "d5c8e34cc7b106133ce63b2f5fdcb9c9b3a38a8a", + "version-string": "1.6.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sockpp.json b/externals/vcpkg/versions/s-/sockpp.json new file mode 100755 index 000000000..792eb3f5d --- /dev/null +++ b/externals/vcpkg/versions/s-/sockpp.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "608151660b414b2bbcdec35bdd622fdce5620abb", + "version": "0.7.1", + "port-version": 1 + }, + { + "git-tree": "d54d2c1ee9ebaae60a83c72c50207b83d56f3917", + "version": "0.7.1", + "port-version": 0 + }, + { + "git-tree": "18dad1cf56b14fdf423311b6f277014e0c3f6762", + "version-date": "2022-01-24", + "port-version": 0 + }, + { + "git-tree": "3afb916458a5548b20996882ed7f7054d041f0ff", + "version": "0.7", + "port-version": 2 + }, + { + "git-tree": "69d23d693d1ab8cfeeab35c6b2794d6f2a9ca748", + "version-string": "0.7", + "port-version": 1 + }, + { + "git-tree": "259ad7f13a8184478a6a94922385f06ff5a7a00b", + "version-string": "0.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/soem.json b/externals/vcpkg/versions/s-/soem.json new file mode 100755 index 000000000..a758daeb6 --- /dev/null +++ b/externals/vcpkg/versions/s-/soem.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "cc08020790a9060eb6adaa1e989af4463197854b", + "version": "1.4.0", + "port-version": 3 + }, + { + "git-tree": "df36d49ff0f6b1755c5a1a046c98c4d0df0e7d77", + "version-string": "1.4.0", + "port-version": 2 + }, + { + "git-tree": "629ce214f8cc2718e87c5130d2bdce15490bf20e", + "version-string": "1.4.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/soil.json b/externals/vcpkg/versions/s-/soil.json new file mode 100755 index 000000000..76994b7e0 --- /dev/null +++ b/externals/vcpkg/versions/s-/soil.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "7b4abbbc20cd42bad536a6aee64949a40ec3d850", + "version-date": "2021-04-22", + "port-version": 1 + }, + { + "git-tree": "9798401f421c850fbce93d990b143283ae5af293", + "version-date": "2021-04-22", + "port-version": 0 + }, + { + "git-tree": "4d137f0a640e2e1628d22a6a57018582f4e472a4", + "version-string": "2008.07.07-2", + "port-version": 0 + }, + { + "git-tree": "7dd6497a9ff2cdff03dbc340721248520feb838e", + "version-string": "2008.07.07-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/soil2.json b/externals/vcpkg/versions/s-/soil2.json new file mode 100755 index 000000000..187420ec9 --- /dev/null +++ b/externals/vcpkg/versions/s-/soil2.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "9d6004f9bd4f228751d31a1921bb8ece30d3c6eb", + "version": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "20e7e06d73b0119e99f870bcffc70be22a7c8287", + "version-date": "2021-05-01", + "port-version": 1 + }, + { + "git-tree": "e72741e77acc80b5d72a64ce396f6a713548e3a1", + "version-date": "2021-05-01", + "port-version": 0 + }, + { + "git-tree": "79c6e11f43a4805471a2644ae07ad6e593e68646", + "version-string": "release-1.11-1", + "port-version": 0 + }, + { + "git-tree": "35a68dbcac1981363bcd8063f95824d69040a9c5", + "version-string": "release-1.11", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sokol.json b/externals/vcpkg/versions/s-/sokol.json new file mode 100755 index 000000000..d1445dace --- /dev/null +++ b/externals/vcpkg/versions/s-/sokol.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "18b4da89731b9e7cf61e56fc72594049c420d2e1", + "version-string": "2019-09-09", + "port-version": 1 + }, + { + "git-tree": "5f96d00b385a476fa3a663833eca5055a07e3ec8", + "version-string": "2019-09-09", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sol2.json b/externals/vcpkg/versions/s-/sol2.json new file mode 100755 index 000000000..1aa7ab94a --- /dev/null +++ b/externals/vcpkg/versions/s-/sol2.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "fca1a728c9f2ff6db12a00fafeae82f69a903b48", + "version-string": "3.2.2", + "port-version": 2 + }, + { + "git-tree": "1dd17eacaccf75a326029df0e26ad1b20c940ad5", + "version-string": "3.2.2", + "port-version": 1 + }, + { + "git-tree": "6effd490f0dc787aec07e064241407658ace41ce", + "version-string": "3.2.2", + "port-version": 0 + }, + { + "git-tree": "9502998e1c595718d83adf07ea860908e5e2e15c", + "version-string": "3.2.1", + "port-version": 0 + }, + { + "git-tree": "029ac93b1620f70349a0e3f57a1191f5ddbd8ec3", + "version-string": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "8240f267b16f344994b1ce3da03a14fda6908e9e", + "version-string": "3.0.3-2", + "port-version": 0 + }, + { + "git-tree": "9e0e54152f08f6b7a637f9c15a689701f903c2d5", + "version-string": "3.0.3-1", + "port-version": 0 + }, + { + "git-tree": "524786c812705e461c55028c488f5a6330f33f7c", + "version-string": "3.0.3", + "port-version": 0 + }, + { + "git-tree": "0cc6d31b03d6dc191ebba1daabaad50d41365081", + "version-string": "3.0.2", + "port-version": 0 + }, + { + "git-tree": "84a35f873e2ffc4a0644c3441c506830060693fd", + "version-string": "2.20.6", + "port-version": 0 + }, + { + "git-tree": "3e2492a7eaa269579e03581e382b832cf1de0e82", + "version-string": "2.20.4", + "port-version": 0 + }, + { + "git-tree": "a675b97fa55ff48245ac9363b32d098e5db181d5", + "version-string": "2.20.3-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/solid3.json b/externals/vcpkg/versions/s-/solid3.json new file mode 100755 index 000000000..5f64fce64 --- /dev/null +++ b/externals/vcpkg/versions/s-/solid3.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "1f494d1d6f610d9c26444a12f2b9952f7485601d", + "version-string": "3.5.8", + "port-version": 1 + }, + { + "git-tree": "6b6536f4343a96d0fc5ccebfa8c2c4c680841848", + "version-string": "3.5.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sophus.json b/externals/vcpkg/versions/s-/sophus.json new file mode 100755 index 000000000..64f100f3c --- /dev/null +++ b/externals/vcpkg/versions/s-/sophus.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "90c7c425fb7d1af0e2201091c0ec00e97309e12e", + "version-date": "2021-09-14", + "port-version": 0 + }, + { + "git-tree": "4826fe050e6cfd22a46d50ab3d6258a39d2bb69f", + "version": "1.0.0", + "port-version": 7 + }, + { + "git-tree": "079947ab617bc50fc9c45b4a88a152c94c31ec58", + "version-string": "1.0.0-6", + "port-version": 0 + }, + { + "git-tree": "16e0370b4c7e0852f9e761a0c2afaa4f417483ef", + "version-string": "1.0.0-3", + "port-version": 0 + }, + { + "git-tree": "5ff47b0fd3b1a3587cb75fa053898691059bda85", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "643b186b3cf0f2e3285871b82574c4772feeb2b5", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/soqt.json b/externals/vcpkg/versions/s-/soqt.json new file mode 100755 index 000000000..d967a931a --- /dev/null +++ b/externals/vcpkg/versions/s-/soqt.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "25bc0ce4eb1212df1f9110770fbf02157a21bccd", + "version": "1.6.0", + "port-version": 4 + }, + { + "git-tree": "3bbb3ea4c3dff6485e3d04f6af1fbbe6e5a75be9", + "version-string": "1.6.0", + "port-version": 3 + }, + { + "git-tree": "db68c2677166ab693a6cef1084993f5da6af87e6", + "version-string": "1.6.0", + "port-version": 2 + }, + { + "git-tree": "0ecc0996dd0501ee5d44a9c8aaf1dddd9b4feb96", + "version-string": "1.6.0-1", + "port-version": 0 + }, + { + "git-tree": "52b1a5fb3755bba1ea0d77f3fa4d8e683f91180a", + "version-string": "1.6.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sord.json b/externals/vcpkg/versions/s-/sord.json new file mode 100755 index 000000000..9f06f1b3b --- /dev/null +++ b/externals/vcpkg/versions/s-/sord.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f32a79763d994652ab17ffbe7de03b08bd1b4e14", + "version-string": "0.16.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/soundtouch.json b/externals/vcpkg/versions/s-/soundtouch.json new file mode 100755 index 000000000..5c37a47d7 --- /dev/null +++ b/externals/vcpkg/versions/s-/soundtouch.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "f4f307065b40b131fd80ce953afcc121aba46f9f", + "version": "2.3.1", + "port-version": 2 + }, + { + "git-tree": "a91341e5eb80526c64b263e5b10e0a6c800daa7e", + "version": "2.3.1", + "port-version": 1 + }, + { + "git-tree": "8b6b644eb3ae55d7e56413e9cd88ca5ccc814c33", + "version": "2.3.1", + "port-version": 0 + }, + { + "git-tree": "47269f38d27248c1e52fd21c3a296d032e02ac01", + "version-string": "2.0.0", + "port-version": 7 + }, + { + "git-tree": "c70fc01038afbb6850538b0a4789b91c83113a8d", + "version-string": "2.0.0-6", + "port-version": 0 + }, + { + "git-tree": "b21b499471e77eb459e8f30d66851c708f80d299", + "version-string": "2.0.0-4", + "port-version": 0 + }, + { + "git-tree": "1058dc04da4ed63879c85e43ee4c5ed91126c520", + "version-string": "2.0.0-3", + "port-version": 0 + }, + { + "git-tree": "2f9fb4b6aec6439f9fa8059732a034ed3b518a1c", + "version-string": "2.0.0-2", + "port-version": 0 + }, + { + "git-tree": "33cf4799b0670ee9e26144ee253c1eaa7bffa095", + "version-string": "2.0.0-1", + "port-version": 0 + }, + { + "git-tree": "7678f3ece15a57a5a267ffd122199f9e6c0f0b87", + "version-string": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "5160323b001496be8efa3b6ccc326f9e41de4101", + "version-string": "2.0.0.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/soxr.json b/externals/vcpkg/versions/s-/soxr.json new file mode 100755 index 000000000..5f0f63d39 --- /dev/null +++ b/externals/vcpkg/versions/s-/soxr.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "fca92eeca8f38c1662193dd443e401c5fe7fbfc7", + "version": "0.1.3", + "port-version": 6 + }, + { + "git-tree": "0ea0e47df2ab6381e68ffae49c05c4de0a37f665", + "version": "0.1.3", + "port-version": 5 + }, + { + "git-tree": "5719977bf7a0fcc0ac88151327dcddda23648594", + "version-string": "0.1.3", + "port-version": 4 + }, + { + "git-tree": "ab77ab3c75baa2a8d004321ce5ce237319c90f9e", + "version-string": "0.1.3", + "port-version": 3 + }, + { + "git-tree": "db67ea0f8064cd50b4c033a1cd4b3944e3143fe5", + "version-string": "0.1.3-2", + "port-version": 0 + }, + { + "git-tree": "3e4aad7a9166adff172617dba401ab2f35f6515d", + "version-string": "0.1.3.", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/spaceland.json b/externals/vcpkg/versions/s-/spaceland.json new file mode 100755 index 000000000..7d254b1f6 --- /dev/null +++ b/externals/vcpkg/versions/s-/spaceland.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "56c00b345d98c60814bf7b00b7a0aea2d3f19852", + "version-string": "7.8.2", + "port-version": 5 + }, + { + "git-tree": "9640c7fea7a143c3c5616886eefa2144efe9e6ed", + "version-string": "7.8.2-4", + "port-version": 0 + }, + { + "git-tree": "9227f189889812ef42ab56c378d8e6349f02631a", + "version-string": "7.8.2-3", + "port-version": 0 + }, + { + "git-tree": "7b1ac25ddd07ec7ed19f23e0327173950d043316", + "version-string": "7.8.2-2", + "port-version": 0 + }, + { + "git-tree": "feafc4d590858ac618c171c539f3e02757fb4ac9", + "version-string": "7.8.2-1", + "port-version": 0 + }, + { + "git-tree": "a8c50a7cece782a01b3465f49fb372c68bd540ac", + "version-string": "7.8.2-0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/span-lite.json b/externals/vcpkg/versions/s-/span-lite.json new file mode 100755 index 000000000..0a15f28bd --- /dev/null +++ b/externals/vcpkg/versions/s-/span-lite.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "9fdf6960d9eab8dfdd0a03ef8e7d3db09a50defb", + "version": "0.10.3", + "port-version": 0 + }, + { + "git-tree": "3a97b03dacd5b7fdcec06275cf87a4df933d58a0", + "version-string": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "78d9193abb1aae1c64acb8573b14c30cbefbc96f", + "version-string": "0.8.1", + "port-version": 0 + }, + { + "git-tree": "d6e3e5ba4f7a59956496cd2c9d58f94982ce417f", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "5c10c90494e5784113231e80cf3dce72c2da19ca", + "version-string": "0.5.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sparsehash.json b/externals/vcpkg/versions/s-/sparsehash.json new file mode 100755 index 000000000..b88c835fd --- /dev/null +++ b/externals/vcpkg/versions/s-/sparsehash.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "c835b4a393784616327a8e5532769096fc443375", + "version": "2.0.4", + "port-version": 2 + }, + { + "git-tree": "0bb73fddc7adde82c92bad4cd03ad629d978db6b", + "version": "2.0.4", + "port-version": 1 + }, + { + "git-tree": "833f95be52924049168376714c59fd022ef9568c", + "version": "2.0.4", + "port-version": 0 + }, + { + "git-tree": "e862d4c31bee927f18b012bb062e9d5282f77733", + "version-string": "2.0.3", + "port-version": 1 + }, + { + "git-tree": "09caa54b75727ae88898c390e6146433af01a47e", + "version-string": "2.0.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sparsepp.json b/externals/vcpkg/versions/s-/sparsepp.json new file mode 100755 index 000000000..7cf5810b8 --- /dev/null +++ b/externals/vcpkg/versions/s-/sparsepp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "c262fbb63f9655ba3d1759153e3dce5f502babe6", + "version-string": "1.22", + "port-version": 2 + }, + { + "git-tree": "4eb97e554a87e43fca8664e8a50de2e96b5d89a3", + "version-string": "1.22-1", + "port-version": 0 + }, + { + "git-tree": "7a2aba5eb3e3313d1ca77213ffca62bba0d2f9ef", + "version-string": "1.22", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/spatialite-tools.json b/externals/vcpkg/versions/s-/spatialite-tools.json new file mode 100755 index 000000000..fa598148e --- /dev/null +++ b/externals/vcpkg/versions/s-/spatialite-tools.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "1e91990a5c6a01d86cc1b4cb84bbea812e62b450", + "version": "5.0.1", + "port-version": 1 + }, + { + "git-tree": "bd6f0ddd2db2c709ce3bd94df91dced9e3d23c7e", + "version-string": "5.0.1", + "port-version": 0 + }, + { + "git-tree": "e31f1f43c34f7ab68bfbfcfe1a9edcd8040c3373", + "version-string": "5.0.0", + "port-version": 4 + }, + { + "git-tree": "f9263bb3c351d6d5333538e6d22e29da6253a702", + "version-string": "5.0.0", + "port-version": 3 + }, + { + "git-tree": "a54d2d339b5eaf4d37fc125c49b939822fdaf3ba", + "version-string": "5.0.0", + "port-version": 2 + }, + { + "git-tree": "e3d595427bd0b0cf8ddaadc45e400b5c1f9c1ccc", + "version-string": "5.0.0", + "port-version": 1 + }, + { + "git-tree": "2a9685999c784265e25e4f2bde708a724721e906", + "version-string": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "de163c8fccab535db7c559fad289f492050c5292", + "version-string": "4.3.0", + "port-version": 7 + }, + { + "git-tree": "d43abce1d0acddfaa4309f22f635708c02b71a4c", + "version-string": "4.3.0", + "port-version": 6 + }, + { + "git-tree": "23cd3b937f595278fa3d7df6f780ce9756db1768", + "version-string": "4.3.0", + "port-version": 5 + }, + { + "git-tree": "34f7d0f85acb618f11b7735be391e605b0cdefbf", + "version-string": "4.3.0", + "port-version": 4 + }, + { + "git-tree": "a3a3434bfff7b3fb4dac3cf6ef8e82b8b3388f8e", + "version-string": "4.3.0", + "port-version": 3 + }, + { + "git-tree": "690d48e030e0507dc2d9e1a1fd7c56260c7fa869", + "version-string": "4.3.0-2", + "port-version": 0 + }, + { + "git-tree": "a63f075c0face000744d43dd52dc9bea06056baf", + "version-string": "4.3.0-1", + "port-version": 0 + }, + { + "git-tree": "31139dd5d9fb6c1f4708329188faf693f776ef59", + "version-string": "4.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/spdk-dpdk.json b/externals/vcpkg/versions/s-/spdk-dpdk.json new file mode 100755 index 000000000..1920b0d8f --- /dev/null +++ b/externals/vcpkg/versions/s-/spdk-dpdk.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "a67cfb564274aa985ef274b6f8a1fac8591b5445", + "version-string": "20181124", + "port-version": 1 + }, + { + "git-tree": "42582bec709b8c669cb6d6fb685be93eab83ac16", + "version-string": "20181124", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/spdk-ipsec.json b/externals/vcpkg/versions/s-/spdk-ipsec.json new file mode 100755 index 000000000..f143fa07a --- /dev/null +++ b/externals/vcpkg/versions/s-/spdk-ipsec.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "bf8024ae19962088f98418e2487147aa14d4df95", + "version-string": "20180711", + "port-version": 1 + }, + { + "git-tree": "7588e57c159ab0bdf5dec13b27382fd43973e995", + "version-string": "20180711", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/spdk-isal.json b/externals/vcpkg/versions/s-/spdk-isal.json new file mode 100755 index 000000000..7439aac29 --- /dev/null +++ b/externals/vcpkg/versions/s-/spdk-isal.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "de270891534b1e4332e4cfbd67437653a9217823", + "version-string": "20181006", + "port-version": 2 + }, + { + "git-tree": "a3b83f2844457a26c4f286c651a85ec6b5cc43e2", + "version-string": "20181006", + "port-version": 1 + }, + { + "git-tree": "965daf98d6079c34b5b0ca3386e4ad6df1b0006d", + "version-string": "20181006", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/spdk.json b/externals/vcpkg/versions/s-/spdk.json new file mode 100755 index 000000000..fe52ef1f2 --- /dev/null +++ b/externals/vcpkg/versions/s-/spdk.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "f5ea399f1e0b77d53593ee78e4f6574c2c53a68c", + "version-string": "19.01.1", + "port-version": 2 + }, + { + "git-tree": "5c375362bcf50097d43af5e5e3480c8b0eb2ce7c", + "version-string": "19.01.1", + "port-version": 1 + }, + { + "git-tree": "02374f7f479809e431a26004d04b4a49f8396b69", + "version-string": "19.01.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/spdlog.json b/externals/vcpkg/versions/s-/spdlog.json new file mode 100755 index 000000000..4c363c1fb --- /dev/null +++ b/externals/vcpkg/versions/s-/spdlog.json @@ -0,0 +1,164 @@ +{ + "versions": [ + { + "git-tree": "3256ea88cc375fda2f977a2eb18435e23d498572", + "version-semver": "1.10.0", + "port-version": 1 + }, + { + "git-tree": "1ac795913d88241171b45d796d3fe5dd38519d5a", + "version-semver": "1.10.0", + "port-version": 0 + }, + { + "git-tree": "1f4916f57dae6db50491857c063970d811beb33a", + "version-semver": "1.9.2", + "port-version": 0 + }, + { + "git-tree": "580c9da088d8545f17b4b5753b4216ddb2ea977f", + "version-semver": "1.9.0", + "port-version": 1 + }, + { + "git-tree": "ac601a8d86ea3edc831933ad7e12eee11ac6e6db", + "version-semver": "1.8.5", + "port-version": 4 + }, + { + "git-tree": "f74643a7b8056237da08c41a653f5b0592870906", + "version-semver": "1.8.5", + "port-version": 3 + }, + { + "git-tree": "9aa80a12ad92e29cfc19df70b9fd615b4aa5997b", + "version-semver": "1.8.5", + "port-version": 2 + }, + { + "git-tree": "2e12349e1676bc1b9dce1f297789684a5ebd46c7", + "version-semver": "1.8.5", + "port-version": 1 + }, + { + "git-tree": "a2f8d7856c8821fb685f99873f5e058dc6136c2b", + "version-semver": "1.8.5", + "port-version": 0 + }, + { + "git-tree": "aa6f400b5acd74dd5071a1419d4fce8ccaa3981c", + "version-string": "1.8.0", + "port-version": 3 + }, + { + "git-tree": "83277d69ee0f37839d9f06c9fb658a3dd457e3eb", + "version-string": "1.8.0", + "port-version": 2 + }, + { + "git-tree": "51a19e55194fc03004bf1584612eb50cce1b4ec2", + "version-string": "1.8.0", + "port-version": 1 + }, + { + "git-tree": "5d706dc22de47010d9e137d34e92d63d76ba3eba", + "version-string": "1.8.0", + "port-version": 0 + }, + { + "git-tree": "8681d8488a1699de3682f36106f0f229b452081b", + "version-string": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "b8711f4a9f15b256185cced73d6b656f4500c746", + "version-string": "1.6.1", + "port-version": 0 + }, + { + "git-tree": "1fccb6fdc2d17730b65feef637fa7bf4822008d2", + "version-string": "1.4.2-1", + "port-version": 0 + }, + { + "git-tree": "eef82a539bfbe485e8eb1a99969ef3817d4c7553", + "version-string": "1.4.2", + "port-version": 0 + }, + { + "git-tree": "260f52a9cdc938a521b912742b3991743e3534a4", + "version-string": "1.3.1-2", + "port-version": 0 + }, + { + "git-tree": "db9983811c0001b8da998de6f6d79e999de368fe", + "version-string": "1.3.1-1", + "port-version": 0 + }, + { + "git-tree": "897ba633d34cfbd22dd140cc4d776d8ffc93a199", + "version-string": "1.3.1", + "port-version": 0 + }, + { + "git-tree": "7206c06e9a437bbf24fc9fc001d1527218d06112", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "99937dc3778fc4979835e0471400999e8f3dc337", + "version-string": "1.2.1", + "port-version": 0 + }, + { + "git-tree": "377345f97d2dadeb0cbeb0749068fb42f1b1430e", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "146dbdbead8391d5f1cccb971ab031d8e19ef904", + "version-string": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "d4ce520f28fd048a673935904346d4c6d45b9e42", + "version-string": "1.x-2018-07.04", + "port-version": 0 + }, + { + "git-tree": "003c2badc6005f42787ad92ff5542b14eb9d4531", + "version-string": "0.17.0", + "port-version": 0 + }, + { + "git-tree": "c78dae39d5eae622c5dfcb2df5af50de269e2f02", + "version-string": "0.16.3", + "port-version": 0 + }, + { + "git-tree": "907e9a1c35ba7cd380e2525bfd6b1b7ed86f98b5", + "version-string": "0.14.0-1", + "port-version": 0 + }, + { + "git-tree": "9ad4d0e629d61ea19329477d15eb2399e302f5ac", + "version-string": "0.14.0", + "port-version": 0 + }, + { + "git-tree": "ab60a7dc0cb3c775eb5d3bc918fee73c9dce11e4", + "version-string": "0.13.0", + "port-version": 0 + }, + { + "git-tree": "b4983276d089ae80e8a39e7b2afb7bbc656c0a23", + "version-string": "0.12.0", + "port-version": 0 + }, + { + "git-tree": "911f75365832b0049c89e199159a4f5470f70e91", + "version-string": "0.11.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/spectra.json b/externals/vcpkg/versions/s-/spectra.json new file mode 100755 index 000000000..191ee1f5e --- /dev/null +++ b/externals/vcpkg/versions/s-/spectra.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "8f0c59842a36bd2be452ce3b9f1f7de0a17f01aa", + "version": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "1ba33cde480488a9a7d4f98f6f2f26e591feb019", + "version": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "79e61cb55ecfe0e16944d963259bf758b5405a74", + "version": "0.9.0", + "port-version": 1 + }, + { + "git-tree": "b33cdb035b8b412b662a052b66437743330fccde", + "version-string": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "f48c7452a08ecf1bea2f38c71e9a483bf9a0dd2a", + "version-string": "0.8.1", + "port-version": 0 + }, + { + "git-tree": "6b079989ac49d63d8a3743945e11946f91a82986", + "version-string": "0.8.0", + "port-version": 0 + }, + { + "git-tree": "8a8ee4c7cf71687209c57fbd44a4086cccfdadb8", + "version-string": "0.7.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/speex.json b/externals/vcpkg/versions/s-/speex.json new file mode 100755 index 000000000..87a027137 --- /dev/null +++ b/externals/vcpkg/versions/s-/speex.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "7cbe163c0a5fabd08cb6665c092d6b13dfa51d69", + "version": "1.2.0", + "port-version": 11 + }, + { + "git-tree": "0f443cef71fd44439aa559063a219da440f6665d", + "version": "1.2.0", + "port-version": 10 + }, + { + "git-tree": "8713e87cf40c60307dfdef2102392b97cb3b4c3d", + "version-string": "1.2.0", + "port-version": 9 + }, + { + "git-tree": "eaa4e7b1a075051d8ba02bc67a89ae035be1b28c", + "version-string": "1.2.0", + "port-version": 8 + }, + { + "git-tree": "ee8363b22602ef2b0f74d4d43de88ed32457c4ba", + "version-string": "1.2.0", + "port-version": 7 + }, + { + "git-tree": "3cee82112765f15b171e6cd1c82d8b6dfdae8d0e", + "version-string": "1.2.0", + "port-version": 6 + }, + { + "git-tree": "374b39093074f2df35ddc5d149b6be0f341dd512", + "version-string": "1.2.0-4", + "port-version": 0 + }, + { + "git-tree": "cf094b8180941583f404a7d7a448a8e19680d3e3", + "version-string": "1.2.0-3", + "port-version": 0 + }, + { + "git-tree": "69ef4e65fe6345c928392beab80b47a93654bbb4", + "version-string": "1.2.0-2", + "port-version": 0 + }, + { + "git-tree": "2ee5d2b6a00e5189df97b91e2add1e06a730193c", + "version-string": "1.2.0-1", + "port-version": 0 + }, + { + "git-tree": "1e2b2cbc8fb9e7557b5e5e54e8421fded8616ae7", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "95a26111514fae470f4b23b0c0e63441ee0a8b1b", + "version-string": "Speex-1.2.0", + "port-version": 0 + }, + { + "git-tree": "425d2c37fa67478fda173254b059df04db437d83", + "version-string": "2017-06-28-cae5026cfd88782c7051af6e685059223578b7e9", + "port-version": 0 + }, + { + "git-tree": "194d58d3ef9d94580d5bf822978a41c6cab80722", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/speexdsp.json b/externals/vcpkg/versions/s-/speexdsp.json new file mode 100755 index 000000000..c97f95cd7 --- /dev/null +++ b/externals/vcpkg/versions/s-/speexdsp.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "6606b66ecc502c89de6a1e570c1407bf1f8b2d03", + "version": "1.2.0", + "port-version": 7 + }, + { + "git-tree": "911ea65a3db9f26e595990e94ab4ec911cd8ef82", + "version-string": "1.2.0", + "port-version": 6 + }, + { + "git-tree": "dfc87aa20568189fc2493e46eeb6067c97fdc9b0", + "version-string": "1.2.0", + "port-version": 5 + }, + { + "git-tree": "ca958f5770fabc81d240e68617f3558999f31ad7", + "version-string": "1.2.0", + "port-version": 4 + }, + { + "git-tree": "a06bfcea7728a1af4eeafd5c5f4034bbb26381e1", + "version-string": "1.2.0", + "port-version": 3 + }, + { + "git-tree": "5f7f0b5ce2fcb3d90a3b85bf95210b85c9603ffc", + "version-string": "1.2.0-2", + "port-version": 0 + }, + { + "git-tree": "40c62be17e1bba790096f1db8a924d8daba84a7a", + "version-string": "1.2.0-1", + "port-version": 0 + }, + { + "git-tree": "aa0b0a538cebf52e67bfcfbadec37fbaaf223984", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "06d78c315a496a62173afd0e5fe305535a63a7e8", + "version-string": "1.2rc3-3", + "port-version": 0 + }, + { + "git-tree": "5afdec828830e90351f63384e7fcdd910af19022", + "version-string": "1.2rc3-2", + "port-version": 0 + }, + { + "git-tree": "d296cb76a6c32d89bba68417d85374740a2ae9f9", + "version-string": "1.2rc3-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/spirit-po.json b/externals/vcpkg/versions/s-/spirit-po.json new file mode 100755 index 000000000..f1551b040 --- /dev/null +++ b/externals/vcpkg/versions/s-/spirit-po.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "9cebcf471848bf1b121a7335d3af54c64a038a9e", + "version-string": "1.1.2", + "port-version": 2 + }, + { + "git-tree": "f209e0daa09e721fae054ff377284190bab3b28e", + "version-string": "1.1.2-1", + "port-version": 0 + }, + { + "git-tree": "5e5ee266c348865906d2fe0b1553f21337900e53", + "version-string": "1.1.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/spirv-cross.json b/externals/vcpkg/versions/s-/spirv-cross.json new file mode 100755 index 000000000..89d92c950 --- /dev/null +++ b/externals/vcpkg/versions/s-/spirv-cross.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "9adc9e1ab78dd956558b40aa39767262a251eca6", + "version-date": "2021-01-15", + "port-version": 2 + }, + { + "git-tree": "ea4c1654c9909ec0b4cba6abdf37dbd1ac6bba53", + "version-date": "2021-01-15", + "port-version": 1 + }, + { + "git-tree": "c9d976a350220005632d3c23ff714e0cf267b836", + "version-date": "2021-01-15", + "port-version": 0 + }, + { + "git-tree": "7ad1238ca2e8ac10608f992a317ee3108ddb3272", + "version-string": "2020-02-26", + "port-version": 1 + }, + { + "git-tree": "b1d5c5737acb40490b9cf38a538ecc91d588be03", + "version-string": "2020-02-26", + "port-version": 0 + }, + { + "git-tree": "6b4c03fbcb1adde9c953afa8f70035cae8915b96", + "version-string": "2019-07-26", + "port-version": 0 + }, + { + "git-tree": "9749070aff35d31ba7de68fbc8c49187b44f10de", + "version-string": "2019-05-09", + "port-version": 0 + }, + { + "git-tree": "75662d186acd7ab7861aeb256b12395f5df17333", + "version-string": "2018-08-07-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/spirv-headers.json b/externals/vcpkg/versions/s-/spirv-headers.json new file mode 100755 index 000000000..99267955d --- /dev/null +++ b/externals/vcpkg/versions/s-/spirv-headers.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "2b51afa759a0312e325533a909418ed5b7803cda", + "version": "1.3.204.1", + "port-version": 0 + }, + { + "git-tree": "28d7c25f7908e3ac693c769c3ce6474855a05bcb", + "version-date": "2021-03-25", + "port-version": 0 + }, + { + "git-tree": "24a883021f92092b645b516dde1489ea0f8e2665", + "version-string": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "025e9b9b71501caa96c75b7c919b6c6daab73cb1", + "version-string": "2019-05-05", + "port-version": 0 + }, + { + "git-tree": "58c395fae8b89546e625d981f4c8f8087a5abdee", + "version-string": "2019-03-05", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/spirv-reflect.json b/externals/vcpkg/versions/s-/spirv-reflect.json new file mode 100755 index 000000000..ced99692d --- /dev/null +++ b/externals/vcpkg/versions/s-/spirv-reflect.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ca2155d2cbf6c3493ac3129f333308976975cb50", + "version": "1.3.204.1", + "port-version": 0 + }, + { + "git-tree": "bcebcfdd9e9332b68c4185b3127fc898fc91402a", + "version-date": "2021-12-31", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/spirv-tools.json b/externals/vcpkg/versions/s-/spirv-tools.json new file mode 100755 index 000000000..7d6a5510b --- /dev/null +++ b/externals/vcpkg/versions/s-/spirv-tools.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "459985359177e0c0774ac341db9721650499844b", + "version": "2022.1", + "port-version": 0 + }, + { + "git-tree": "c18f04e12fa671a9067896ccdf8c932601f81115", + "version-string": "2021.1", + "port-version": 0 + }, + { + "git-tree": "03084f48c2608e410a438662bab2a68ab92a5c95", + "version-string": "2020.7", + "port-version": 0 + }, + { + "git-tree": "cebc581ce190b91f63b06fd7a4807ef1cc2b9c52", + "version-string": "2020.1", + "port-version": 2 + }, + { + "git-tree": "f6e770ef4164d3a7a518eca97aa2e3fdbe2f79cb", + "version-string": "2020.1-1", + "port-version": 0 + }, + { + "git-tree": "8a6c4c9a48f26d68e40e6b105df010d97bcca409", + "version-string": "2020.1", + "port-version": 0 + }, + { + "git-tree": "e3af2cb591f10b81a71167e06ff1664e7293de4c", + "version-string": "2019.3-dev-1", + "port-version": 0 + }, + { + "git-tree": "ee08bc090eb757988a120c276958405654f62c47", + "version-string": "2019.3-dev", + "port-version": 0 + }, + { + "git-tree": "87dc00322d704d6b1d5aa96675a2961f30eaf272", + "version-string": "2018.1-2", + "port-version": 0 + }, + { + "git-tree": "449d428a1e5f72bfe0f6dd6301acb4eff42c4914", + "version-string": "2018.1-1", + "port-version": 0 + }, + { + "git-tree": "5e7104cf0de22ea79eea13fcdfd382ec4b410cc5", + "version-string": "2018.1-2", + "port-version": 0 + }, + { + "git-tree": "7da2389f31edd51df50898bfafcd3c06cafdc753", + "version-string": "2018.1-1", + "port-version": 0 + }, + { + "git-tree": "bfd7e1260250c2962d2cbb83b046c215b3f1819e", + "version-string": "2017.1-dev-7e2d26c77b606b21af839b37fd21381c4a669f23-1", + "port-version": 0 + }, + { + "git-tree": "95ca59204c696bc720395fff8cd9ba437830f245", + "version-string": "v2017.1-dev-7e2d26c77b606b21af839b37fd21381c4a669f23-1", + "port-version": 0 + }, + { + "git-tree": "c3bf7f00fc51622609dfe50b2c1e935fd445ee5b", + "version-string": "v2017.1-dev-7e2d26c77b606b21af839b37fd21381c4a669f23", + "port-version": 0 + }, + { + "git-tree": "948fc208102d720d6c30e4d33f4198f7ed69930b", + "version-string": "1.1-f72189c249ba143c6a89a4cf1e7d53337b2ddd40", + "port-version": 0 + }, + { + "git-tree": "e1f3ce2c02993b52b4ff21144099c2e96fa3f8cc", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/spix.json b/externals/vcpkg/versions/s-/spix.json new file mode 100755 index 000000000..a3ab08a13 --- /dev/null +++ b/externals/vcpkg/versions/s-/spix.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "703bc0f66a7cb23368f4230a35451356b92e5c75", + "version": "0.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sprout.json b/externals/vcpkg/versions/s-/sprout.json new file mode 100755 index 000000000..a8aff6295 --- /dev/null +++ b/externals/vcpkg/versions/s-/sprout.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "614a0748fa2deac704af2170ab88ed64c7475e11", + "version-string": "2019-06-20", + "port-version": 1 + }, + { + "git-tree": "0b87b120bf0e49a1b22400f1fc4a0f5922b5c472", + "version-string": "2019-06-20", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/spscqueue.json b/externals/vcpkg/versions/s-/spscqueue.json new file mode 100755 index 000000000..67404178c --- /dev/null +++ b/externals/vcpkg/versions/s-/spscqueue.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "9a8b323fdedb205fefac81e53240408ac7ece3ee", + "version-string": "1.1", + "port-version": 1 + }, + { + "git-tree": "13f8976debabfeccc71905c77cc24e746dd9c5d5", + "version-string": "1.1", + "port-version": 0 + }, + { + "git-tree": "6b3bbf0099c235e22836e7df07d5bb10b6fac73c", + "version-string": "1.0", + "port-version": 0 + }, + { + "git-tree": "f15b77710f3bc8d905af2dd7270431bf7b5be662", + "version-string": "2019-07-26", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sqlcipher.json b/externals/vcpkg/versions/s-/sqlcipher.json new file mode 100755 index 000000000..391a0ed1d --- /dev/null +++ b/externals/vcpkg/versions/s-/sqlcipher.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "3803a9648861130c25517c8b330c17d054fe6cd7", + "version": "4.5.1", + "port-version": 0 + }, + { + "git-tree": "e38664c89497e1686362947290d62bcf0eb6abaa", + "version": "4.5.0", + "port-version": 1 + }, + { + "git-tree": "dd42a5be2c9409d8e5c35b9821765f504ef960ff", + "version": "4.5.0", + "port-version": 0 + }, + { + "git-tree": "3811f54932ce20be68bed2fed0cafcfb1d03be56", + "version": "4.4.3", + "port-version": 0 + }, + { + "git-tree": "f62dcc2e9971dc127655e7c400d28b0df2b299f4", + "version-string": "4.4.1", + "port-version": 0 + }, + { + "git-tree": "9b02456fa2a4adc830b0c19a6ed96a658e8209ea", + "version-string": "4.4.0", + "port-version": 1 + }, + { + "git-tree": "f51dce0a57ce49a36ff5ac1604d03f9d90485b3b", + "version-string": "4.4.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sqlite-modern-cpp.json b/externals/vcpkg/versions/s-/sqlite-modern-cpp.json new file mode 100755 index 000000000..302e1a3ed --- /dev/null +++ b/externals/vcpkg/versions/s-/sqlite-modern-cpp.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "ac74c74504305a6929128356e348907745b01c11", + "version-string": "3.2-936cd0c8", + "port-version": 1 + }, + { + "git-tree": "76f96eb36e0647e5dabef65acc033bf563621704", + "version-string": "3.2-936cd0c8", + "port-version": 0 + }, + { + "git-tree": "d9fd80b107981361275ac559c4ac594bc4e89ed6", + "version-string": "3.2-e2248fa", + "port-version": 0 + }, + { + "git-tree": "9ae5896ff029a777756032e946747a56829f5c9e", + "version-string": "3.2", + "port-version": 0 + }, + { + "git-tree": "dbe4e8503d0ff5ded9adaee95d4d9c62baf55396", + "version-string": "2.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sqlite-orm.json b/externals/vcpkg/versions/s-/sqlite-orm.json new file mode 100755 index 000000000..24620aeda --- /dev/null +++ b/externals/vcpkg/versions/s-/sqlite-orm.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "a065a6f10e3d75198b433530fd91853eb691c325", + "version": "1.7.1", + "port-version": 0 + }, + { + "git-tree": "57c4daa9dadbff1a2f6c088f6716bd14b638984b", + "version": "1.7", + "port-version": 0 + }, + { + "git-tree": "be577f000372e4ae6d9675bdb10ff25dce38d90d", + "version-string": "1.6", + "port-version": 1 + }, + { + "git-tree": "62e09e58648e190b5e5a6c2bd15da05dffad439b", + "version-string": "1.6", + "port-version": 0 + }, + { + "git-tree": "bd64b4ad149ed87a0605e2a5cacd490bc57ee959", + "version-string": "1.5", + "port-version": 2 + }, + { + "git-tree": "19a9253782d0a5d339d8b4f6ad3521ce0ba98efe", + "version-string": "1.5", + "port-version": 1 + }, + { + "git-tree": "3b2e209ef23a7f97469d9892228e7303ad6526f8", + "version-string": "1.5", + "port-version": 0 + }, + { + "git-tree": "c7f3bc361519b9ef0d9bd9d6b4c26856efec1e2a", + "version-string": "1.4", + "port-version": 0 + }, + { + "git-tree": "4d69881dfedcee477473fa98099247595d2123df", + "version-string": "1.3-1", + "port-version": 0 + }, + { + "git-tree": "defb5cf6e40fcbbae6781fce08834eaf1e31f38b", + "version-string": "1.3", + "port-version": 0 + }, + { + "git-tree": "c0372ae1219186bcc7b8d2f018f35d1a07932173", + "version-string": "1.2", + "port-version": 0 + }, + { + "git-tree": "add3e0d6142238e191ecd5f9f1c0b514f68576ba", + "version-string": "1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sqlite3.json b/externals/vcpkg/versions/s-/sqlite3.json new file mode 100755 index 000000000..419fec4f3 --- /dev/null +++ b/externals/vcpkg/versions/s-/sqlite3.json @@ -0,0 +1,229 @@ +{ + "versions": [ + { + "git-tree": "f49ad405225c6326558adb79f2082814002a8cda", + "version": "3.37.2", + "port-version": 1 + }, + { + "git-tree": "ac17b6f385706852a3895200764c358697c5c584", + "version": "3.37.1", + "port-version": 0 + }, + { + "git-tree": "abbe21d1a38c7eb9e8c87965235d92721001e997", + "version": "3.37.0", + "port-version": 1 + }, + { + "git-tree": "51ffa2ba781101e70546d4e6956d31f69a59cee6", + "version": "3.37.0", + "port-version": 0 + }, + { + "git-tree": "e0395ce17570ddb92d952ca5f8be1953ec4c8325", + "version": "3.36.0", + "port-version": 1 + }, + { + "git-tree": "c23525b0204e11a56d40cbb0b7fa68861450df04", + "version": "3.36.0", + "port-version": 0 + }, + { + "git-tree": "2b5a7327445e4b113d53a988cc7b0619e5abc77f", + "version": "3.35.5", + "port-version": 0 + }, + { + "git-tree": "b2c75af9dcf9f76ea714cb93a8fe113f9bb69f48", + "version": "3.35.4", + "port-version": 1 + }, + { + "git-tree": "dbe1b93bfd28e58498a79992312b06422b049afb", + "version": "3.35.4", + "port-version": 0 + }, + { + "git-tree": "c07c11e24a6dae74b7e8b5816c5cc0313e85c438", + "version": "3.35.2", + "port-version": 0 + }, + { + "git-tree": "2d4ee6a29279120894cb283d17be06d4ceb370b5", + "version": "3.35.0", + "port-version": 0 + }, + { + "git-tree": "a4f8c5e08012ca84ac1b505c65ad1c3d174255ec", + "version": "3.34.1", + "port-version": 0 + }, + { + "git-tree": "34f1a969f91790b20ff5bd583f25adac17c4d9c2", + "version-string": "3.33.0", + "port-version": 0 + }, + { + "git-tree": "b746e84b3267fb52e18a050d4258fd5f2f37f51a", + "version-string": "3.32.3", + "port-version": 1 + }, + { + "git-tree": "6d2665d7dd329e28ca92368a94eb124e7e522298", + "version-string": "3.32.3", + "port-version": 0 + }, + { + "git-tree": "166dd530c2d4ed7545969644d2eb8b7d963af970", + "version-string": "3.32.1", + "port-version": 0 + }, + { + "git-tree": "76f84ca7f9fec081e9f8e660cdc865cdaabf595b", + "version-string": "3.32.0-0", + "port-version": 0 + }, + { + "git-tree": "8dc6e278240fe3dff5a6ce8a6b78353b42248f25", + "version-string": "3.31.1-1", + "port-version": 0 + }, + { + "git-tree": "1f7763d978c7912f26e382e595c97e096564da46", + "version-string": "3.31.1", + "port-version": 0 + }, + { + "git-tree": "91b98085d16476b4a61b334c055ff12442a81db1", + "version-string": "3.30.1-2", + "port-version": 0 + }, + { + "git-tree": "2dc9c3314f3a5117e1bd5e6ac7bdd7f178b0bddd", + "version-string": "3.30.1-1", + "port-version": 0 + }, + { + "git-tree": "0ad6efba3a0336f7458922b3055bc3b9cfbc495e", + "version-string": "3.30.1", + "port-version": 0 + }, + { + "git-tree": "4d1da4a892ebbdb58c133232505a70b99b172b99", + "version-string": "3.29.0-1", + "port-version": 0 + }, + { + "git-tree": "41d88769efb523e0e479257d20e3378a2b4997d9", + "version-string": "3.28.0-2", + "port-version": 0 + }, + { + "git-tree": "03ea8afe8cbfe7a0c69226f8098e849347bc2a99", + "version-string": "3.28.0-1", + "port-version": 0 + }, + { + "git-tree": "d89981ed362b8145ba1681c0f6d3ccd95881c018", + "version-string": "3.28.0", + "port-version": 0 + }, + { + "git-tree": "f33a8198a23d9f6d25b2face36241acc186ba99f", + "version-string": "3.27.2", + "port-version": 0 + }, + { + "git-tree": "d4e3d7513ca40b8b3e6ac6840480d5ac28b7ec3c", + "version-string": "3.26.0", + "port-version": 0 + }, + { + "git-tree": "196b59d9b150eaba5ae4ec9de1faae78e7df4777", + "version-string": "3.25.2", + "port-version": 0 + }, + { + "git-tree": "67fa5412207dc3da0c25c90af48fc8083d9e4a5f", + "version-string": "3.24.0-2", + "port-version": 0 + }, + { + "git-tree": "f1c756ce35266ebf09d79f22a1170ed84b321b4f", + "version-string": "3.24.0-1", + "port-version": 0 + }, + { + "git-tree": "361f5ea299697f67aeabf2efe5590c2e39c07dba", + "version-string": "3.24.0", + "port-version": 0 + }, + { + "git-tree": "fbea37e4b80fc2c0aa0088ac6ab2783fa48094a2", + "version-string": "3.23.1-1", + "port-version": 0 + }, + { + "git-tree": "e55c89a98b137558a135a3f32c3c9cdc2d44bf45", + "version-string": "3.23.1", + "port-version": 0 + }, + { + "git-tree": "c8d3f33a2cbcf093965e4ef1ce356cb5c3afa2b3", + "version-string": "3.23.0", + "port-version": 0 + }, + { + "git-tree": "0a1d5de977ac865f14855ab0857b1dcc16ce2f9b", + "version-string": "3.21.0-1", + "port-version": 0 + }, + { + "git-tree": "c6cb29ddf98979af881d8e97c567ba8a2c9757eb", + "version-string": "3.21.0", + "port-version": 0 + }, + { + "git-tree": "54eab08218d5e036289c98dc986a998916929189", + "version-string": "3.20.1", + "port-version": 0 + }, + { + "git-tree": "d62849d8b740964f99497711f88e019d3c8d31fb", + "version-string": "3.19.1-2", + "port-version": 0 + }, + { + "git-tree": "d529c4933bf08cab95b867087cbfad0d463cdc79", + "version-string": "3.19.1-1", + "port-version": 0 + }, + { + "git-tree": "cbaade15e1aaf69d98cca346ec05b9a1c60ca489", + "version-string": "3.18.0-1", + "port-version": 0 + }, + { + "git-tree": "1636685797b2b321510c6d199914e7e07c4af4a1", + "version-string": "3.17.0", + "port-version": 0 + }, + { + "git-tree": "395237456b611ecb1103bb64b06b5f3afbea580a", + "version-string": "3.15.0", + "port-version": 0 + }, + { + "git-tree": "b90b01f6b71910d19c34f77a4441236257548303", + "version-string": "3.15.0 (3150000)", + "port-version": 0 + }, + { + "git-tree": "9ed0e5e9d67f3c14a426e055f5441a03afa89f02", + "version-string": "3120200", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sqlitecpp.json b/externals/vcpkg/versions/s-/sqlitecpp.json new file mode 100755 index 000000000..8ad9ced31 --- /dev/null +++ b/externals/vcpkg/versions/s-/sqlitecpp.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "95b41ad9727bd341deba2739968a3d7173c0fb9b", + "version-string": "3.1.1", + "port-version": 1 + }, + { + "git-tree": "6b714b3d6494c54a9994c49ac0696bc3e74ab68e", + "version-string": "3.1.1", + "port-version": 0 + }, + { + "git-tree": "bbe7298559e28fea4ba44639d10eb975ae25a439", + "version-string": "3.0.0", + "port-version": 2 + }, + { + "git-tree": "90d0c9d7b4c791961e4f96a9ef11133d245f601f", + "version-string": "3.0.0", + "port-version": 1 + }, + { + "git-tree": "4cf1a9a90e4e1587cdecc689bcee7c537ca68854", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "efcb81c9002c119d01ba12b49289fa24c1dbfa9f", + "version-string": "2.3.0-1", + "port-version": 0 + }, + { + "git-tree": "619f4b5a616fb70f4b8a17b599286841efdd6ebc", + "version-string": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "95c6e95b54a5dd42497884c8d06e48289b9860d5", + "version-string": "2.2-2", + "port-version": 0 + }, + { + "git-tree": "10de4316894879046e8356bfc02a1707268fdb13", + "version-string": "2.2-1", + "port-version": 0 + }, + { + "git-tree": "0ad16d6133fae87e84442122f7380897793bf6e8", + "version-string": "2.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sqlpp11-connector-mysql.json b/externals/vcpkg/versions/s-/sqlpp11-connector-mysql.json new file mode 100755 index 000000000..5ecd3b6d4 --- /dev/null +++ b/externals/vcpkg/versions/s-/sqlpp11-connector-mysql.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "be46edaef7e1c02783398222e4e73f288848e537", + "version-string": "0.29", + "port-version": 2 + }, + { + "git-tree": "7a94d2413e27ed320a9ad41acf4e447b060cb5d4", + "version-string": "0.29-1", + "port-version": 0 + }, + { + "git-tree": "33e5b3964f305b06759a8b8decada4a8aa82bd33", + "version-string": "0.29", + "port-version": 0 + }, + { + "git-tree": "3c7b1571fda0274cb08ffd5647e2ec0a738c95c2", + "version-string": "0.26", + "port-version": 0 + }, + { + "git-tree": "22930952e58cd22b323f248fa301cc8f2966b770", + "version-string": "0.25-2", + "port-version": 0 + }, + { + "git-tree": "4da57b5610d50d9888cc212b6f9e7a47056f764a", + "version-string": "0.25-1", + "port-version": 0 + }, + { + "git-tree": "722767948f7a745fe2e09a835075fc63c776df1f", + "version-string": "0.25", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sqlpp11-connector-sqlite3.json b/externals/vcpkg/versions/s-/sqlpp11-connector-sqlite3.json new file mode 100755 index 000000000..ca49980d3 --- /dev/null +++ b/externals/vcpkg/versions/s-/sqlpp11-connector-sqlite3.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "476b94c2a6be8d48ef3360793ed0b4569b4614d4", + "version-string": "0.30", + "port-version": 1 + }, + { + "git-tree": "5adcee3bd02dde26fc1ca6272162cc5005b0cadd", + "version-string": "0.30", + "port-version": 0 + }, + { + "git-tree": "9be15890e4d2a274c563bea77964459802159bf3", + "version-string": "0.29-2", + "port-version": 0 + }, + { + "git-tree": "44103550881a1581212124d45782480a9ed5cd44", + "version-string": "0.29-1", + "port-version": 0 + }, + { + "git-tree": "4e7baff1998bf263042f99cdb2abae94fc9c91c3", + "version-string": "0.29", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sqlpp11.json b/externals/vcpkg/versions/s-/sqlpp11.json new file mode 100755 index 000000000..ee0e440c8 --- /dev/null +++ b/externals/vcpkg/versions/s-/sqlpp11.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "572562b44cd15b26fd8cdf68dff2c53d6ec0619d", + "version-string": "0.60", + "port-version": 1 + }, + { + "git-tree": "96028362edb1da213edd2423d2c128e08ac6988d", + "version-string": "0.60", + "port-version": 0 + }, + { + "git-tree": "44ea18d7420266e2ad58a70271e5b245b1df39ff", + "version-string": "0.59", + "port-version": 0 + }, + { + "git-tree": "4498eb2c19d26e1f55e12caf432aee24549e6551", + "version-string": "0.58-3", + "port-version": 0 + }, + { + "git-tree": "70b65aef4e7e6bfe62fb8666665f5f73c9aead11", + "version-string": "0.58-2", + "port-version": 0 + }, + { + "git-tree": "0522191e6b44a1d85dc38e604d0ff354b314f393", + "version-string": "0.58-1", + "port-version": 0 + }, + { + "git-tree": "2ce6e5634663f291d8debf2493e983797bca5abd", + "version-string": "0.58", + "port-version": 0 + }, + { + "git-tree": "3481de23b7ccd787ea7cc1d890b2c234fab74dec", + "version-string": "0.57-1", + "port-version": 0 + }, + { + "git-tree": "ec276851839e0916bf7459ed47ba53229e400d2c", + "version-string": "0.57", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/squirrel.json b/externals/vcpkg/versions/s-/squirrel.json new file mode 100755 index 000000000..6e1a227c2 --- /dev/null +++ b/externals/vcpkg/versions/s-/squirrel.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a78b663e75b8e4c6e81a9110e3ddacd55a43f0ad", + "version-date": "2021-09-17", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sratom.json b/externals/vcpkg/versions/s-/sratom.json new file mode 100755 index 000000000..cd4f8572c --- /dev/null +++ b/externals/vcpkg/versions/s-/sratom.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "182f7bca04bba50becb7f719b0403033ffd1a9da", + "version-string": "0.6.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/srell.json b/externals/vcpkg/versions/s-/srell.json new file mode 100755 index 000000000..3ae37e418 --- /dev/null +++ b/externals/vcpkg/versions/s-/srell.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "f09d9751be1fbf4ca223d8755ef6fb7acedde1fa", + "version-string": "3.010", + "port-version": 0 + }, + { + "git-tree": "b687fe2dff873db6884f3eacb1b756579bee8e0e", + "version-string": "3.001", + "port-version": 0 + }, + { + "git-tree": "3497458c9ed34a6d973e693711dffcc387e81ad0", + "version-string": "2.920", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/srpc.json b/externals/vcpkg/versions/s-/srpc.json new file mode 100755 index 000000000..01f29288d --- /dev/null +++ b/externals/vcpkg/versions/s-/srpc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7f8e905bb42ba10b9076c4fca512933f4e3171e5", + "version-semver": "0.9.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/starlink-ast.json b/externals/vcpkg/versions/s-/starlink-ast.json new file mode 100755 index 000000000..1ebc5ce94 --- /dev/null +++ b/externals/vcpkg/versions/s-/starlink-ast.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "f749208cd4ad912baf5f9b84482f32a176ef910a", + "version": "9.2.7", + "port-version": 1 + }, + { + "git-tree": "9f0217b4694092c4b440de6e864986ee8c567f5e", + "version": "9.2.7", + "port-version": 0 + }, + { + "git-tree": "b5cfb9d9ff68b40b5a910240d3b0d09190b17b36", + "version-semver": "9.2.5", + "port-version": 0 + }, + { + "git-tree": "487c5e318ce957c09647d0d74a2b5b4a4e99ffef", + "version-semver": "9.2.4", + "port-version": 2 + }, + { + "git-tree": "2fecd468269d73b6e8f29a297c4f7db771ea37c4", + "version-semver": "9.2.4", + "port-version": 1 + }, + { + "git-tree": "50f0b71ca66bd9e4ce6cb5a153e25878dd7a0600", + "version-semver": "9.2.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/status-code.json b/externals/vcpkg/versions/s-/status-code.json new file mode 100755 index 000000000..ab25f04dc --- /dev/null +++ b/externals/vcpkg/versions/s-/status-code.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "c71af3efa61ec9c5bbb91287b610bcc561e95a47", + "version-string": "1.0.0-20211208", + "port-version": 1 + }, + { + "git-tree": "3acdd69c0d01a5041a2549a21a1d0d367efa7d53", + "version-string": "1.0.0-ab3cd821", + "port-version": 1 + }, + { + "git-tree": "a140621d67b58b39b6f3ab49cc0c4f1456e5a29f", + "version-string": "1.0.0-ab3cd821", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/status-value-lite.json b/externals/vcpkg/versions/s-/status-value-lite.json new file mode 100755 index 000000000..19cdeaced --- /dev/null +++ b/externals/vcpkg/versions/s-/status-value-lite.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "81415ecf90da612b36d970777850cfa47ba2e1e8", + "version-string": "1.1.0", + "port-version": 1 + }, + { + "git-tree": "0c2c7909015007afa15da14789dec8c16b5284ba", + "version-string": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/stb.json b/externals/vcpkg/versions/s-/stb.json new file mode 100755 index 000000000..1068c6d4a --- /dev/null +++ b/externals/vcpkg/versions/s-/stb.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "2da639ecba7048e0f722dc01fae6cef32d671991", + "version-date": "2021-09-10", + "port-version": 0 + }, + { + "git-tree": "41ce7d73e93526a943f08e5e4601c6b2325ba527", + "version": "2020-09-14", + "port-version": 2 + }, + { + "git-tree": "fa6d7e998f98f122efa37f456ffa498d546185b9", + "version-string": "2020-09-14", + "port-version": 1 + }, + { + "git-tree": "079dbaa8fb1658d6508be38e224c79aeb99a0c46", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "023e715efdbf18f7028830bd9868fa05bc87f3e9", + "version-string": "2020-02-08-1", + "port-version": 0 + }, + { + "git-tree": "ba3772d1e9ebeda7ec28ac410bc40e5153f809d8", + "version-string": "2020-02-08", + "port-version": 0 + }, + { + "git-tree": "e8a0602db6140131007458fba1ecddedc3a6a792", + "version-string": "2019-08-17", + "port-version": 0 + }, + { + "git-tree": "aa84a1e6ad3df3a959f0480671fc37cfe205af5d", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "05d070e21ee5b47278c1b753bc3cbe469bc00a58", + "version-string": "2019-05-07", + "port-version": 0 + }, + { + "git-tree": "f7784037a32059d057135a8a2a25816ed596fe5e", + "version-string": "2019-04-19", + "port-version": 0 + }, + { + "git-tree": "633a4baa57514c29074a3144ccdf205225f9df21", + "version-string": "2018-03-02", + "port-version": 0 + }, + { + "git-tree": "8a2260d6e01360de6477d3359144fa63d02a45bf", + "version-string": "20170724-9d9f75e", + "port-version": 0 + }, + { + "git-tree": "58fe3328d2d641baad386d937ba8923b4b313f8a", + "version-string": "1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/stduuid.json b/externals/vcpkg/versions/s-/stduuid.json new file mode 100755 index 000000000..c89c5a626 --- /dev/null +++ b/externals/vcpkg/versions/s-/stduuid.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bd235773c953e5636a7b9f6356437daef6e5010c", + "version": "1.2.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/stftpitchshift.json b/externals/vcpkg/versions/s-/stftpitchshift.json new file mode 100755 index 000000000..1ebb0bc55 --- /dev/null +++ b/externals/vcpkg/versions/s-/stftpitchshift.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "36932b4bd7c57fdc63ae75ec5117f6321e3c2ca6", + "version": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "1f4a495416b6e2e3a830c8ba72eb5cf9034c68cc", + "version": "1.3.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/stlab.json b/externals/vcpkg/versions/s-/stlab.json new file mode 100755 index 000000000..a93c471e3 --- /dev/null +++ b/externals/vcpkg/versions/s-/stlab.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "de92e484fbf56eff04270090cb06452cbe22431b", + "version-string": "1.6.2", + "port-version": 1 + }, + { + "git-tree": "69d76ab4d0a43c472e67688022dc3831399ee571", + "version-string": "1.6.2", + "port-version": 0 + }, + { + "git-tree": "8c11accbf5dec18cf90ddcc4d437c87a770a7c99", + "version-string": "1.5.2-1", + "port-version": 0 + }, + { + "git-tree": "fde6f6435cd41a3b62a25fd53b319173d4c5ef85", + "version-string": "1.5.2", + "port-version": 0 + }, + { + "git-tree": "15813431ef523a9c76a089cc47c08b170efc2e34", + "version-string": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "4a9ef07d6a9f5fa994dcde91d96ac7f173c5c6d7", + "version-string": "1.4.1-1", + "port-version": 0 + }, + { + "git-tree": "af6282ed0f85fcc00ad592e1aa52393342d24ccd", + "version-string": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "b5080fae004c245ad6037a3cb7581bf2a948719b", + "version-string": "1.3.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/stormlib.json b/externals/vcpkg/versions/s-/stormlib.json new file mode 100755 index 000000000..24b12b98f --- /dev/null +++ b/externals/vcpkg/versions/s-/stormlib.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "685e22a5716a953dece56ffccfd4b3102936d175", + "version-string": "2019-05-10", + "port-version": 3 + }, + { + "git-tree": "8c3dfecaec0cd4f296d1153e9b97a11be97e7677", + "version-string": "2019-05-10", + "port-version": 2 + }, + { + "git-tree": "2fb4b4db8b34d553cddbb58ca5123f991c222f4a", + "version-string": "2019-05-10-1", + "port-version": 0 + }, + { + "git-tree": "01817e565311edb8c029a349b5d19e1c906af9ca", + "version-string": "2019-05-10", + "port-version": 0 + }, + { + "git-tree": "fd9a3c1da904a4ada61b3ce116db2a32fa34ff85", + "version-string": "9.22", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/strict-variant.json b/externals/vcpkg/versions/s-/strict-variant.json new file mode 100755 index 000000000..df6be4fb3 --- /dev/null +++ b/externals/vcpkg/versions/s-/strict-variant.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "f4589b1df5892a4966987c9a6d856b76c7c2481d", + "version-string": "0.5", + "port-version": 1 + }, + { + "git-tree": "b289adfc580c77e7b542c709060fa80c26c78849", + "version-string": "0.5", + "port-version": 0 + }, + { + "git-tree": "c25b09dcc4e7638984fadbe2bb6b96c0b9a2bb0f", + "version-string": "v0.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/string-theory.json b/externals/vcpkg/versions/s-/string-theory.json new file mode 100755 index 000000000..6408f4135 --- /dev/null +++ b/externals/vcpkg/versions/s-/string-theory.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "e3c6df91d194be6ca56d8f4044cf0137041d4f04", + "version": "3.6", + "port-version": 0 + }, + { + "git-tree": "6c02a14bfc014ccb0e31c944aac072ed64eb1136", + "version": "3.5", + "port-version": 0 + }, + { + "git-tree": "8af1cbe5e5d6b5d098b15f4e5548d4e315afb4b0", + "version-string": "3.4", + "port-version": 1 + }, + { + "git-tree": "021ea7daa5d0f6d63bfa2617811a68639e7f5964", + "version-string": "3.4", + "port-version": 0 + }, + { + "git-tree": "37e244cbce12ef477bf3320125a2d5063b81612b", + "version-string": "3.3", + "port-version": 0 + }, + { + "git-tree": "b921f9c73727bcde64c8de913b2138e07f907c6e", + "version-string": "3.2", + "port-version": 0 + }, + { + "git-tree": "88c18697cc50e200307fb05c21bae6bcda33c029", + "version-string": "3.1", + "port-version": 0 + }, + { + "git-tree": "04b3368d3a326ef3cd41217a01dbaaaefa1ee5cb", + "version-string": "3.0", + "port-version": 0 + }, + { + "git-tree": "33a0913f00547a5b5ca23b5293b676e5ba878bc7", + "version-string": "2.3", + "port-version": 0 + }, + { + "git-tree": "a561b3d689bcf262d6f61dd72577811023c17bea", + "version-string": "2.2", + "port-version": 0 + }, + { + "git-tree": "7bc1b3624966ed9338fe2431857ff617fa3a853b", + "version-string": "2.1-1", + "port-version": 0 + }, + { + "git-tree": "e3916b3b152b1f35681b12dc220bf905e470747d", + "version-string": "2.1", + "port-version": 0 + }, + { + "git-tree": "d256807923c140edf9726259de352ec874125970", + "version-string": "1.7", + "port-version": 0 + }, + { + "git-tree": "e8536fad5cda700a238dfc496a2cae46405ec1d2", + "version-string": "1.6-1", + "port-version": 0 + }, + { + "git-tree": "51b5047362c5d2777271a9fe43ad0d5fc5f5137a", + "version-string": "1.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/string-view-lite.json b/externals/vcpkg/versions/s-/string-view-lite.json new file mode 100755 index 000000000..8b2a24390 --- /dev/null +++ b/externals/vcpkg/versions/s-/string-view-lite.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "48fa93dc01e7035c62d200c96fbe6d6d28a3c6fb", + "version": "1.6.0", + "port-version": 0 + }, + { + "git-tree": "ca0acc44ac920ca460f95c75da6b05c2fa92447c", + "version-string": "1.3.0", + "port-version": 1 + }, + { + "git-tree": "d669e1a64927f0a008ed1e4e6179760f8696ca77", + "version-string": "1.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/strtk.json b/externals/vcpkg/versions/s-/strtk.json new file mode 100755 index 000000000..111ce2ba6 --- /dev/null +++ b/externals/vcpkg/versions/s-/strtk.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "ac754f80d0eec3321c07b9389b10ba93490ee148", + "version-string": "2020-09-14", + "port-version": 1 + }, + { + "git-tree": "15e912afd73f5656dfaae90459274f72ff3b7fee", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "24e3bf58a4726a390ec8c6aef7f1dd45b0d7274e", + "version-string": "2019-01-09", + "port-version": 0 + }, + { + "git-tree": "b568d33cd1eef6b6a4d92453b5696bc3695b9ccc", + "version-string": "2018.09.30-b887974", + "port-version": 0 + }, + { + "git-tree": "d90d3c81ce26b81b32d7a715029af1f1ecf728e2", + "version-string": "2018.05.07-48c9554", + "port-version": 0 + }, + { + "git-tree": "b3d734474a1bb342f3aae211c823b0d16057014e", + "version-string": "2018.01.01-5579ed1", + "port-version": 0 + }, + { + "git-tree": "8671cd8c7b9dafa896470a769ca95f220b2d9ea0", + "version-string": "2017.01.02-1e2960f", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/stx.json b/externals/vcpkg/versions/s-/stx.json new file mode 100755 index 000000000..27c9f1ab7 --- /dev/null +++ b/externals/vcpkg/versions/s-/stx.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "700e84d6f57c5a4631d378525207a0265715e9c3", + "version-string": "1.0.1", + "port-version": 1 + }, + { + "git-tree": "3f6ca6895772efc8d75945a015596c0be4e4cc9b", + "version-string": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/stxxl.json b/externals/vcpkg/versions/s-/stxxl.json new file mode 100755 index 000000000..2ad709587 --- /dev/null +++ b/externals/vcpkg/versions/s-/stxxl.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "769f42922523b172d890b697a65096ca47e06ff8", + "version-date": "2018-11-15", + "port-version": 5 + }, + { + "git-tree": "081a4c6de6290ce05297cc873fa0fde245133a8a", + "version-string": "2018-11-15", + "port-version": 4 + }, + { + "git-tree": "dc3442a34aeab30bf9b04d7d49775527303c8811", + "version-string": "2018-11-15", + "port-version": 3 + }, + { + "git-tree": "22aadda93429299d04a2c8424c20a70f577da220", + "version-string": "2018-11-15-2", + "port-version": 0 + }, + { + "git-tree": "7e39c1496c7f611b72d4a4095145f5b6fc255290", + "version-string": "2018-11-15-1", + "port-version": 0 + }, + { + "git-tree": "7b1241069c28618798afeb293ae3460b1dcc2e8c", + "version-string": "2018-11-15", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/suitesparse.json b/externals/vcpkg/versions/s-/suitesparse.json new file mode 100755 index 000000000..8e99fa850 --- /dev/null +++ b/externals/vcpkg/versions/s-/suitesparse.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "4c709290c9cc6e7635c120dbd5cd9d227408a0ab", + "version-semver": "5.8.0", + "port-version": 1 + }, + { + "git-tree": "cafd2cb5688d179f1ca502ae8e1ce421db1c7ef5", + "version-string": "5.8.0", + "port-version": 0 + }, + { + "git-tree": "4b26da95eb39ba08f61e95b79eb063ffeb2b29d0", + "version-string": "5.4.0", + "port-version": 7 + }, + { + "git-tree": "21200a3ce988e5552e3ccd320c8cdce53ad005d0", + "version-string": "5.4.0-6", + "port-version": 0 + }, + { + "git-tree": "da536485afcf8957ab864ab6f2710f3116fc6555", + "version-string": "5.4.0-5", + "port-version": 0 + }, + { + "git-tree": "cce5dd4a0b13689da30d52f8f83c4899a492904b", + "version-string": "5.4.0-4", + "port-version": 0 + }, + { + "git-tree": "d7a63cefefa5ba8d6224d08a94ce04e64f8e693c", + "version-string": "5.4.0-3", + "port-version": 0 + }, + { + "git-tree": "9063ac73727625e21e107e2040643473ea5c87a3", + "version-string": "5.4.0-1", + "port-version": 0 + }, + { + "git-tree": "ac00b6bef93043be11c8c32f3a27d566b27d47d2", + "version-string": "5.1.2-2", + "port-version": 0 + }, + { + "git-tree": "1526c78f79decd88ef7716b4487a6021985cc701", + "version-string": "5.1.2-1", + "port-version": 0 + }, + { + "git-tree": "c904ad6e925a0d784163184871b1dafd9cf4a3ca", + "version-string": "5.1.2", + "port-version": 0 + }, + { + "git-tree": "545f4e56cba8ff110f072f2a3f60ac6b0ee00fa3", + "version-string": "4.5.5-4", + "port-version": 0 + }, + { + "git-tree": "533e98f1d340df9f38cc4c896366858e2493f537", + "version-string": "4.5.5-3", + "port-version": 0 + }, + { + "git-tree": "9be9e04e6f6f8acc276e8148f7a66d752b246c90", + "version-string": "4.5.5-2", + "port-version": 0 + }, + { + "git-tree": "0aba17066c23d8eb10159dce54841831e3f827de", + "version-string": "4.5.5-1", + "port-version": 0 + }, + { + "git-tree": "f64098e673c45f5ab77f620a2ab9568ffc567e08", + "version-string": "4.5.5", + "port-version": 0 + }, + { + "git-tree": "062fc552839e4573a7cca2729fd6ef475f9117a8", + "version-string": "4.5.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/sundials.json b/externals/vcpkg/versions/s-/sundials.json new file mode 100755 index 000000000..48ada8c7e --- /dev/null +++ b/externals/vcpkg/versions/s-/sundials.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "c95957f06e56f03fb6336a30a984ff7273a36c5a", + "version-semver": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "206df7509167e6e89bdac2e9252e9e57615e18a4", + "version-semver": "5.8.0", + "port-version": 0 + }, + { + "git-tree": "5acf78bcee903986a02aef256e969f1f7f7a87fa", + "version-semver": "5.7.0", + "port-version": 1 + }, + { + "git-tree": "f6b0c03d6b78a5632db68b010ab4d9526c73450c", + "version-semver": "5.7.0", + "port-version": 0 + }, + { + "git-tree": "8d36ea64574b793b164d015845c69e6278168ba5", + "version-string": "5.5.0", + "port-version": 0 + }, + { + "git-tree": "7df9768e7cec20e90a9ac0805fa170f766482423", + "version-string": "3.1.1-2", + "port-version": 0 + }, + { + "git-tree": "a60da1bb580c64d896a0b4d7a2c0270db6e472f6", + "version-string": "3.1.1-1", + "port-version": 0 + }, + { + "git-tree": "e4f5f1be94f60a1380586c6624615799575819b0", + "version-string": "3.1.1", + "port-version": 0 + }, + { + "git-tree": "e17e4df2810e374d8c49f0f6b47592aefe4f4883", + "version-string": "2.7.0-1", + "port-version": 0 + }, + { + "git-tree": "80a580d6f4b408fa2615e502a7f3175cbe35da85", + "version-string": "2.7.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/superlu.json b/externals/vcpkg/versions/s-/superlu.json new file mode 100755 index 000000000..c048cc9ae --- /dev/null +++ b/externals/vcpkg/versions/s-/superlu.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "5bee1e0197c0e768c6ee8b9acdf815b4d46b5978", + "version-date": "2020-01-07", + "port-version": 5 + }, + { + "git-tree": "88c6ebaf1337aa31cf3afec8250fd7ee1b990b6e", + "version-string": "2020-01-07", + "port-version": 4 + }, + { + "git-tree": "610cdc3479021b9cf5608147a656469c0a8e7bf7", + "version-string": "2020-01-07", + "port-version": 3 + }, + { + "git-tree": "1899f59286e7b43ea4501c3bb20754ae728d1040", + "version-string": "2020-01-07", + "port-version": 2 + }, + { + "git-tree": "544d6373d779c00f07cbcb040b20d582af3451bf", + "version-string": "2020-01-07", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/symengine.json b/externals/vcpkg/versions/s-/symengine.json new file mode 100755 index 000000000..3ac8fdb54 --- /dev/null +++ b/externals/vcpkg/versions/s-/symengine.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "dd28d6549b4c7db81ef2ee9e91a4e41b0c739191", + "version": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "b0ac6670bebc9a0903adaae9b35f9f444c4e8806", + "version": "0.7.0", + "port-version": 2 + }, + { + "git-tree": "203123b8fd0517f20bada24c6e4430a6425475bd", + "version": "0.7.0", + "port-version": 1 + }, + { + "git-tree": "33504d33db8201730839751693d6c4f643f7e0c9", + "version": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "3d7345924811530e7b9a5e0b3ae588bbb32be2b1", + "version-string": "2020-05-25", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/systemc.json b/externals/vcpkg/versions/s-/systemc.json new file mode 100755 index 000000000..4102645c3 --- /dev/null +++ b/externals/vcpkg/versions/s-/systemc.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "c07c9aedd9229f1583602afe462aa9894562462c", + "version-string": "2.3.3", + "port-version": 6 + }, + { + "git-tree": "f10aa24af3ad40a22d15a729df5d64695c141226", + "version-string": "2.3.3", + "port-version": 5 + }, + { + "git-tree": "9f6eda0d5b4ce0d9f620cae19df91a526ae18803", + "version-string": "2.3.3-4", + "port-version": 0 + }, + { + "git-tree": "3e415ae679fc332603789c486008ab1beb1b5013", + "version-string": "2.3.3-3", + "port-version": 0 + }, + { + "git-tree": "5ee424aafb5f3972e3f05ffaa4edc707a0e77972", + "version-string": "2.3.3-2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/s-/szip.json b/externals/vcpkg/versions/s-/szip.json new file mode 100755 index 000000000..de4087f88 --- /dev/null +++ b/externals/vcpkg/versions/s-/szip.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "0c8569ffc46401d06cff22755c0b95953ce5e828", + "version": "2.1.1", + "port-version": 8 + }, + { + "git-tree": "6f810fcedf9469940a80e5c343d983a55134332b", + "version": "2.1.1", + "port-version": 7 + }, + { + "git-tree": "bcd8fca84e0acd4d6be162e857379ef3b74fe213", + "version-string": "2.1.1-6", + "port-version": 0 + }, + { + "git-tree": "0fdd9b2647a90ef7c51b40e3e011a7bb471e9704", + "version-string": "2.1.1-5", + "port-version": 0 + }, + { + "git-tree": "df1816819840845cd1622e64efadccf6f046c07b", + "version-string": "2.1.1-4", + "port-version": 0 + }, + { + "git-tree": "6ba9c13d6b35ae61f8b21c3f3851d362ea4265ad", + "version-string": "2.1.1-3", + "port-version": 0 + }, + { + "git-tree": "69ce1d38b34a26484b01cf099684fc99e9230411", + "version-string": "2.1.1-1", + "port-version": 0 + }, + { + "git-tree": "42c92537d0bd3c826fe9fb3110b59eef48ac8765", + "version-string": "2.1.1", + "port-version": 0 + }, + { + "git-tree": "e45d8445d7ef74a676d505f9840007d4f43e45aa", + "version-string": "2.1-2", + "port-version": 0 + }, + { + "git-tree": "b5bfe4ce51d2ccee6cbdd204ded01f895383cf5a", + "version-string": "2.1-1", + "port-version": 0 + }, + { + "git-tree": "0ab09228ece8ae41edb37b838309b04de5d5558a", + "version-string": "2.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tabulate.json b/externals/vcpkg/versions/t-/tabulate.json new file mode 100755 index 000000000..dcdfc027b --- /dev/null +++ b/externals/vcpkg/versions/t-/tabulate.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "482538c4e4f465f113e0318f20cd18b6f2b17f17", + "version-string": "2019-01-06", + "port-version": 1 + }, + { + "git-tree": "f59225353a31f7ebaa180e0d35a59122b31ce1b9", + "version-string": "2019-01-06", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tacopie.json b/externals/vcpkg/versions/t-/tacopie.json new file mode 100755 index 000000000..49d37a8fc --- /dev/null +++ b/externals/vcpkg/versions/t-/tacopie.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "d65f4f38c50754c208cb959e3d1b0c6956d2bf94", + "version-string": "3.2.0", + "port-version": 3 + }, + { + "git-tree": "4338494afcc9385f4e4fb804faaef19e96c11843", + "version-string": "3.2.0-2", + "port-version": 0 + }, + { + "git-tree": "041ec46b9970f1dc145922fb8464e42745d8c1f4", + "version-string": "3.2.0-1", + "port-version": 0 + }, + { + "git-tree": "c0d6f171dd1efc86648f3ad550cd6e3c296bdd66", + "version-string": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "2efc5937a28a36241c6dbbd12c158c798350ca87", + "version-string": "2.4.1-2", + "port-version": 0 + }, + { + "git-tree": "d46e43e6499a88f4e97a216fcabc5c241698abce", + "version-string": "2.4.1-1", + "port-version": 0 + }, + { + "git-tree": "cd6622abf966b470548a6c040727ac9bdfb56776", + "version-string": "2.4.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/taglib.json b/externals/vcpkg/versions/t-/taglib.json new file mode 100755 index 000000000..74616d0a2 --- /dev/null +++ b/externals/vcpkg/versions/t-/taglib.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "68a57ea8641a01a2a1c353f91acb5a3020c0769b", + "version-semver": "1.12.0", + "port-version": 3 + }, + { + "git-tree": "246255cab48b434b3c78aaa315f5f62b4692f255", + "version-semver": "1.12.0", + "port-version": 2 + }, + { + "git-tree": "d14774690f0692baa62237a6ee67f8aa7e7974f9", + "version-semver": "1.12.0", + "port-version": 1 + }, + { + "git-tree": "c4559ad74a4b1757cc6f7b11abce3b6c4cab66c7", + "version-semver": "1.12.0", + "port-version": 0 + }, + { + "git-tree": "e9d856fb23e6cf5ad4b86f2098549ba88098a0cb", + "version-string": "1.12.0-20210123", + "port-version": 0 + }, + { + "git-tree": "8aee2b399d4cd5af999057cbbe5e9476272b5a24", + "version-string": "1.11.1-20190531", + "port-version": 0 + }, + { + "git-tree": "1536cc4e68e0475f6bb39840b00e2ad1bf706a4b", + "version-string": "1.11.1-4", + "port-version": 0 + }, + { + "git-tree": "1d504937079a18b634d51c9163638585b5e01673", + "version-string": "1.11.1-3", + "port-version": 0 + }, + { + "git-tree": "c639d618a869c31af336dec64e15caa558c35f3a", + "version-string": "1.11.1-2", + "port-version": 0 + }, + { + "git-tree": "7de52deaa0423999b20037cd86b1d2371a5ba695", + "version-string": "1.11.1-1", + "port-version": 0 + }, + { + "git-tree": "3b06be936f4fbafe554cbd0679a1772ab7a3c500", + "version-string": "1.11.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/taocpp-json.json b/externals/vcpkg/versions/t-/taocpp-json.json new file mode 100755 index 000000000..e4e789af9 --- /dev/null +++ b/externals/vcpkg/versions/t-/taocpp-json.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "afe8907661864659e89e9fc421415b2687390c03", + "version-string": "2020-09-14", + "port-version": 1 + }, + { + "git-tree": "1f514b2100e6f510ec9fe39625c67e050f0910e0", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "e90cd293087f49812acd65105f83db565d0b71a2", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "dccd7a3e684a35f08501928c40b1409b8a6fb2d8", + "version-string": "2019-05-08", + "port-version": 0 + }, + { + "git-tree": "e41d989a56709ec651f6cfd5e9f411e1fad1837e", + "version-string": "2019-04-29-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tap-windows6.json b/externals/vcpkg/versions/t-/tap-windows6.json new file mode 100755 index 000000000..f22fe46dd --- /dev/null +++ b/externals/vcpkg/versions/t-/tap-windows6.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "2b35b39ca3996a529812b69654a194568127e4e1", + "version-string": "9.21.2-0e30f5c", + "port-version": 1 + }, + { + "git-tree": "56eae8063d4c595d6002e0a499258d853a55ff22", + "version-string": "9.21.2-0e30f5c", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/taskflow.json b/externals/vcpkg/versions/t-/taskflow.json new file mode 100755 index 000000000..7bfe3dd2b --- /dev/null +++ b/externals/vcpkg/versions/t-/taskflow.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "68130a893501e5e9bbe48c41ad00ef5de0a0a060", + "version": "3.3.0", + "port-version": 0 + }, + { + "git-tree": "49d827de9e8309cb0f16fbb84ec611a1a44d18ec", + "version": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "0cdd85bb7b520cb75c0bf6f89cf01bb65cb53fd2", + "version": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "cfa2c53934444b309b97a672883d35da17246d86", + "version-string": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "efe56bba7e13bcf283b57fed39637a7e4789c1da", + "version-string": "2.7.0", + "port-version": 0 + }, + { + "git-tree": "a757e3e8ff0b8654adb5e83b5046e6c48db0a11a", + "version-string": "2.6.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tbb.json b/externals/vcpkg/versions/t-/tbb.json new file mode 100755 index 000000000..bc96b9383 --- /dev/null +++ b/externals/vcpkg/versions/t-/tbb.json @@ -0,0 +1,164 @@ +{ + "versions": [ + { + "git-tree": "016aeb70aa2dfba55a141a928863a0191314d4a9", + "version-string": "2020_U3", + "port-version": 8 + }, + { + "git-tree": "275198e39d268c87b807d7f552b51396d5cf6242", + "version-string": "2020_U3", + "port-version": 7 + }, + { + "git-tree": "e168e03c2e5776bdee59accf5f643ae26b0ddd84", + "version-string": "2020_U3", + "port-version": 6 + }, + { + "git-tree": "475f44cf5033c6f3bfb5c69c5a301cddf18e7aa0", + "version-string": "2020_U3", + "port-version": 5 + }, + { + "git-tree": "4e6228578b0ca40358f584aa1ea8b4a9ac2d4ed9", + "version-string": "2020_U3", + "port-version": 4 + }, + { + "git-tree": "eb2f60732524f07ea5effc9aeda3472fd0bbe243", + "version-string": "2020_U3", + "port-version": 3 + }, + { + "git-tree": "b6023798ef507fce8294092ad4553bb5348f068c", + "version-string": "2020_U3", + "port-version": 2 + }, + { + "git-tree": "d795bc6f63678ed12f824a83c3a0ba983245f2a5", + "version-string": "2020_U3", + "port-version": 1 + }, + { + "git-tree": "ed3d3cb6f7f9c57e588c951cfc372d109fe94c72", + "version-string": "2020_U3", + "port-version": 0 + }, + { + "git-tree": "fee70f775ec6d3d85ad7d063e440c44131a5aff0", + "version-string": "2020_U1-1", + "port-version": 0 + }, + { + "git-tree": "254c2b642dbaffe8159e6b171870a152136fd895", + "version-string": "2020_U1", + "port-version": 0 + }, + { + "git-tree": "2a3a3ec00a38b5210b84706bdf6e9f9198932df8", + "version-string": "2019_U8-3", + "port-version": 0 + }, + { + "git-tree": "3df7c14ae10efa35004598fd1ab26759dfa2495a", + "version-string": "2019_U8-2", + "port-version": 0 + }, + { + "git-tree": "7d9bbd62941ff78ce498dbe1514c012294551b0f", + "version-string": "2019_U8-1", + "port-version": 0 + }, + { + "git-tree": "3be5c111cb01595f1b786724e6d53fd0d8df7e92", + "version-string": "2019_U8", + "port-version": 0 + }, + { + "git-tree": "84476373f30fe5c294d86d0e4904168d6e10a8c6", + "version-string": "2019_U7-1", + "port-version": 0 + }, + { + "git-tree": "09d7aa7cbe0bc605aed30d4e11efff20af43f44c", + "version-string": "2019_U7", + "port-version": 0 + }, + { + "git-tree": "f1ee9ee541cf6c5cf4117dc1a78d0f4053f14381", + "version-string": "2019_U6", + "port-version": 0 + }, + { + "git-tree": "081c7eeeac7269465725d973e5ea5a934f9fe52a", + "version-string": "2019_U5-1", + "port-version": 0 + }, + { + "git-tree": "9c71768e787576e1d103c52fe1f31f8d30177a30", + "version-string": "2019_U5", + "port-version": 0 + }, + { + "git-tree": "86cdf7b32996ab69085cd6b1fb607b5db18c92e4", + "version-string": "2019_U4", + "port-version": 0 + }, + { + "git-tree": "ebc7fd9372ca32501cd8d4d54d3b673b867ee998", + "version-string": "2019_U3-1", + "port-version": 0 + }, + { + "git-tree": "c1f5eeb5837d6de7d55854b2e67a5b20c69efaa5", + "version-string": "2019_U3", + "port-version": 0 + }, + { + "git-tree": "b625ba0fd4c2a286182200a610caaaae771fe21c", + "version-string": "2018_U6", + "port-version": 0 + }, + { + "git-tree": "6c64f0b42d21206d32dec975c851f6693c01e990", + "version-string": "2018_U5-4", + "port-version": 0 + }, + { + "git-tree": "23d6ae1013a0c5f71c3b75ea9ad8b7baf9b12621", + "version-string": "2018_U5", + "port-version": 0 + }, + { + "git-tree": "f07d8515b953defb8e6bc1ab47e4ca7ef305fe7e", + "version-string": "2018_U4", + "port-version": 0 + }, + { + "git-tree": "161e4caf0d0df0acd7e2af898ccc08f928b8ed75", + "version-string": "2018_U3", + "port-version": 0 + }, + { + "git-tree": "6c874b672fe0b06acdf355ce21fc2af828ec0968", + "version-string": "2018_U2", + "port-version": 0 + }, + { + "git-tree": "e467e977fa3b05a3d3acc2b0c425602bf85bc5c2", + "version-string": "2017_U7", + "port-version": 0 + }, + { + "git-tree": "7f43f366643b48868e18ae1f996f000781077bb8", + "version-string": "2017_U6", + "port-version": 0 + }, + { + "git-tree": "651994f9b2b55094af6de6f888e4e1824937b064", + "version-string": "20160916", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tcb-span.json b/externals/vcpkg/versions/t-/tcb-span.json new file mode 100755 index 000000000..64e48cc52 --- /dev/null +++ b/externals/vcpkg/versions/t-/tcb-span.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "191bf0b7971f5aac50a5d81224d04e8f9aef7e38", + "version-date": "2021-12-15", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tcl.json b/externals/vcpkg/versions/t-/tcl.json new file mode 100755 index 000000000..908597dda --- /dev/null +++ b/externals/vcpkg/versions/t-/tcl.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "cb31c47230370021b4bee86bf0d711e70ff546f4", + "version-string": "core-9-0-a1", + "port-version": 5 + }, + { + "git-tree": "ce21246b8ebf7e3ec20c2c8ea3abc5bbacea363e", + "version-string": "core-9-0-a1", + "port-version": 4 + }, + { + "git-tree": "178e263715acedbd584a7390566df8f6e75e5a9c", + "version-string": "core-9-0-a1", + "port-version": 3 + }, + { + "git-tree": "b1307e2d115e01cedde54662115ff363e46b6fe5", + "version-string": "core-9-0-a1", + "port-version": 2 + }, + { + "git-tree": "91acff42f01d650b56bc6a8377bca8c93f9e7408", + "version-string": "core-9-0-a1", + "port-version": 1 + }, + { + "git-tree": "914cf3e943b2379dad1a63f05c3f0e9f107b7b1d", + "version-string": "core-9-0-a1", + "port-version": 0 + }, + { + "git-tree": "65c61411b419e4a62f80d85b0f9c16db30188c71", + "version-string": "8.6.10-3", + "port-version": 0 + }, + { + "git-tree": "7a6e3e3fb3cd7abff045319ea6693fb35bf00d7c", + "version-string": "8.6.10-2", + "port-version": 0 + }, + { + "git-tree": "7d0a483ed75781d1e21412e915556bdfabc54c94", + "version-string": "8.6.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tclap.json b/externals/vcpkg/versions/t-/tclap.json new file mode 100755 index 000000000..c440ca2bc --- /dev/null +++ b/externals/vcpkg/versions/t-/tclap.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "f02ffdbe328a2df58a554ba83269ec09bd47a6ad", + "version": "1.2.5", + "port-version": 0 + }, + { + "git-tree": "787d1698947778edfecc2aa104ca7d09fb7d7415", + "version-string": "1.2.2", + "port-version": 4 + }, + { + "git-tree": "c0fc7c229a3d40cbeb66f7f67856aa3115a70d3f", + "version-string": "1.2.2-3", + "port-version": 0 + }, + { + "git-tree": "06ddf23b9a537e96cddb73f94d11aeba12ef672b", + "version-string": "1.2.2-2", + "port-version": 0 + }, + { + "git-tree": "10dcbe9e96648b48d0d113b7a2bb31c5ba8f60fc", + "version-string": "1.2.2-1", + "port-version": 0 + }, + { + "git-tree": "b805b384cfdfb9445d4d3ce0b0f9a5e178c37a82", + "version-string": "1.2.2", + "port-version": 0 + }, + { + "git-tree": "d06901860103a9fbd9f6a45fad64c147a1d2e77d", + "version-string": "1.2.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/teemo.json b/externals/vcpkg/versions/t-/teemo.json new file mode 100755 index 000000000..d45946f79 --- /dev/null +++ b/externals/vcpkg/versions/t-/teemo.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "58d7f598471297c1dad7372349f2c5a66c118659", + "version": "2.7", + "port-version": 0 + }, + { + "git-tree": "6eff96ba13b50bd8a7b7b3d1197fdbda11c09712", + "version": "2.6", + "port-version": 1 + }, + { + "git-tree": "668ad24ea1e187f27877ffe3570555df857460d8", + "version": "2.6", + "port-version": 0 + }, + { + "git-tree": "d92f8edfaa4c8a208cfa6253c6d2ebd8beeaf303", + "version": "2.5", + "port-version": 1 + }, + { + "git-tree": "272a7ccdbd7429e98513b1d4c9c394406fa70d42", + "version": "2.5", + "port-version": 0 + }, + { + "git-tree": "f4a45a333657786fd8ee51f2d5df590909578bff", + "version": "2.4", + "port-version": 0 + }, + { + "git-tree": "d33e668cc0750872a5853c680fa707e12f032e9e", + "version": "2.3", + "port-version": 0 + }, + { + "git-tree": "8939caebc11b8bbb1efe958bb349511a50e00289", + "version-string": "2.2", + "port-version": 2 + }, + { + "git-tree": "0ba6666678630113a8080448b6751fa3a2eacbef", + "version-string": "2.2", + "port-version": 1 + }, + { + "git-tree": "0ca1723ca09260ded55e97381d5ad169e775baa5", + "version-string": "2.2", + "port-version": 0 + }, + { + "git-tree": "d51932720b4cbcb753d076b0045d96153522e441", + "version-string": "2.1", + "port-version": 0 + }, + { + "git-tree": "3d64b8c8b74b31a51e95ca6b63f3ad0483ec503c", + "version-string": "1.3", + "port-version": 0 + }, + { + "git-tree": "f70967e8b6fea7249c22f345105dfc609e5424c5", + "version-string": "1.2-1", + "port-version": 0 + }, + { + "git-tree": "07ddcf388fb99941d7e334818cf360cd20e019b6", + "version-string": "1.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/telnetpp.json b/externals/vcpkg/versions/t-/telnetpp.json new file mode 100755 index 000000000..0ac6ff7a5 --- /dev/null +++ b/externals/vcpkg/versions/t-/telnetpp.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "e90806a190428cbf53773ea93d5bdacb7f92f7c0", + "version-string": "2.1.2", + "port-version": 1 + }, + { + "git-tree": "904e2801ba11dae44b62c252e4b6193b50e63fd2", + "version-string": "2.1.2", + "port-version": 0 + }, + { + "git-tree": "d7db43baec43a10c0b48d9d86e1331d4da573f2d", + "version-string": "2.0-4", + "port-version": 0 + }, + { + "git-tree": "a326437fbff54619f8e88842303a9fe65f3d0a7a", + "version-string": "2.0-3", + "port-version": 0 + }, + { + "git-tree": "20acece0d3d048018b9e5b4e01c98b6a0026fd36", + "version-string": "2.0-2", + "port-version": 0 + }, + { + "git-tree": "c66573d58de425381ca8545a8cff430038685ae0", + "version-string": "2.0", + "port-version": 0 + }, + { + "git-tree": "70fa20ea4cf3ea35101b93f70b9722a207bda47f", + "version-string": "1.2.4-1", + "port-version": 0 + }, + { + "git-tree": "362984ae95ea46793ce363484c0a1368512661e4", + "version-string": "1.2.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tensorflow-cc.json b/externals/vcpkg/versions/t-/tensorflow-cc.json new file mode 100755 index 000000000..475c71d10 --- /dev/null +++ b/externals/vcpkg/versions/t-/tensorflow-cc.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "c0b8bf99d3056c5b117dd2eabba3125f1d867442", + "version-semver": "2.7.0", + "port-version": 2 + }, + { + "git-tree": "48be8a2aea85f73821084ea35d307e4033726565", + "version-semver": "2.7.0", + "port-version": 1 + }, + { + "git-tree": "f0bd2999562da259b6e2c39131a6a02f632b21a8", + "version-semver": "2.7.0", + "port-version": 0 + }, + { + "git-tree": "b9e9f840127f8da0c67cadf0369023753c90686b", + "version-semver": "2.6.0", + "port-version": 0 + }, + { + "git-tree": "77875da04a151fb36abe52cce80491a9a7f16c55", + "version-semver": "2.4.1", + "port-version": 1 + }, + { + "git-tree": "868e7ae57409669692df84ddb446f4a235e0b220", + "version-semver": "2.4.1", + "port-version": 0 + }, + { + "git-tree": "08a9ef525187b9b3656a686f2e83100643b7389e", + "version-string": "2.3.1", + "port-version": 2 + }, + { + "git-tree": "e8e712585868d830d75a2dc44667f54b1e8b8f69", + "version-string": "2.3.1", + "port-version": 1 + }, + { + "git-tree": "36fd69f219de177654a21efcc341d286d94ec4a1", + "version-string": "2.3.1", + "port-version": 0 + }, + { + "git-tree": "3927154bb7bb6c3ac2e0d83d6bcac3e497a95d89", + "version-string": "1.14", + "port-version": 5 + }, + { + "git-tree": "7df6c1b207429c2a84c9d2c0486df7cd38bfc577", + "version-string": "1.14", + "port-version": 4 + }, + { + "git-tree": "65c22db79a292ba22ff3c4061cddd1af041482ab", + "version-string": "1.14-3", + "port-version": 0 + }, + { + "git-tree": "f6b80dc3e816c9fba20dea66bbe13731695dc165", + "version-string": "1.14-2", + "port-version": 0 + }, + { + "git-tree": "ce0cd570ec1d1011da0d0ffea3935bf4798e4ab6", + "version-string": "1.14-1", + "port-version": 0 + }, + { + "git-tree": "c2f2869ce42ce47880f959ab91ae8bde30fc15db", + "version-string": "1.14", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tensorflow-common.json b/externals/vcpkg/versions/t-/tensorflow-common.json new file mode 100755 index 000000000..d276daf00 --- /dev/null +++ b/externals/vcpkg/versions/t-/tensorflow-common.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "1f37cd68d08ecbb0ca6c2d630598d3f568f1fcc4", + "version-semver": "2.7.0", + "port-version": 2 + }, + { + "git-tree": "4c81239401e4304b124ed215960cdcdf19611e47", + "version-semver": "2.7.0", + "port-version": 1 + }, + { + "git-tree": "eb9e0e1345847b72eccecd5a6b85a441f034e1a7", + "version-semver": "2.7.0", + "port-version": 0 + }, + { + "git-tree": "e766afec982de89398663f587da490fc8996474f", + "version-semver": "2.6.0", + "port-version": 1 + }, + { + "git-tree": "84662f791eb9d38350a4ffe99cd80d49f562b10f", + "version-semver": "2.6.0", + "port-version": 0 + }, + { + "git-tree": "2160d070413af839dbe9da331350e34c91352e11", + "version-semver": "2.4.1", + "port-version": 5 + }, + { + "git-tree": "3d84b641f07ef269a213e0382e719a0c338f4ed7", + "version-semver": "2.4.1", + "port-version": 4 + }, + { + "git-tree": "dd652b405ef53658c13af438e8414110f2977520", + "version-semver": "2.4.1", + "port-version": 3 + }, + { + "git-tree": "84ba326c66ab77faaf3e59d8eb3f04ffa155a4bb", + "version-semver": "2.4.1", + "port-version": 2 + }, + { + "git-tree": "c2a11af14488e643cf0a07f676d08319a0f70f08", + "version-semver": "2.4.1", + "port-version": 1 + }, + { + "git-tree": "566f036d2265f6c960014ceb526ed0d143f65c60", + "version-semver": "2.4.1", + "port-version": 0 + }, + { + "git-tree": "68686e3bd8a7304f0a9dbc090e2757ed2186a2a6", + "version-string": "2.3.1", + "port-version": 1 + }, + { + "git-tree": "433699fdeee59265f52aea4a4574ea7dbe06f210", + "version-string": "2.3.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tensorflow.json b/externals/vcpkg/versions/t-/tensorflow.json new file mode 100755 index 000000000..e47e81c73 --- /dev/null +++ b/externals/vcpkg/versions/t-/tensorflow.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "07b6bd8bae65b448a163db4e720c46afd605a1cc", + "version-semver": "2.7.0", + "port-version": 2 + }, + { + "git-tree": "4f02ceeb872646409f83a5b164c9892322d75e6b", + "version-semver": "2.7.0", + "port-version": 1 + }, + { + "git-tree": "b12af58d1b9069b6ab8b2de9e1c6c7f2b07aadfe", + "version-semver": "2.7.0", + "port-version": 0 + }, + { + "git-tree": "8692b5026a3b7666e73dcaf7432e525dc103f8c5", + "version-semver": "2.6.0", + "port-version": 0 + }, + { + "git-tree": "bd9bf99a10fe9a9769f26dedb282f3c1954fc9bb", + "version-semver": "2.4.1", + "port-version": 0 + }, + { + "git-tree": "b6ac5c291afa1274c50ac9e1ff3010da0fbb6e36", + "version-string": "2.3.1", + "port-version": 1 + }, + { + "git-tree": "6792c934dd6fb9c4623682646f4ed522fb51b376", + "version-string": "2.3.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tensorpipe.json b/externals/vcpkg/versions/t-/tensorpipe.json new file mode 100755 index 000000000..0dd256c6d --- /dev/null +++ b/externals/vcpkg/versions/t-/tensorpipe.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "f78594bb71084f0ea1b9e0bba9b9804696e4c011", + "version-date": "2022-03-16", + "port-version": 0 + }, + { + "git-tree": "fc442cfbc144a4fc95ca41d9349ef04564d7ce5a", + "version-date": "2021-04-26", + "port-version": 1 + }, + { + "git-tree": "ab0e7e22e13c4ebe8c308008aaabb803dca57cdc", + "version-date": "2021-04-26", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/termcolor.json b/externals/vcpkg/versions/t-/termcolor.json new file mode 100755 index 000000000..b561e18ea --- /dev/null +++ b/externals/vcpkg/versions/t-/termcolor.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "15926920dc728ce16644bdb00bcca056efb293e8", + "version": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "a357134080b4f2553d91d289f167cc23ddc8c102", + "version-semver": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "0f9f8a1daeb0ba36dc2333e9d7a99a8da3cf0a78", + "version-string": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tesseract.json b/externals/vcpkg/versions/t-/tesseract.json new file mode 100755 index 000000000..e13ddd025 --- /dev/null +++ b/externals/vcpkg/versions/t-/tesseract.json @@ -0,0 +1,124 @@ +{ + "versions": [ + { + "git-tree": "ac84bef93d2709f28bf4ab8341a80dab949a8cf1", + "version": "4.1.1", + "port-version": 10 + }, + { + "git-tree": "10ffafb1de68c463fbac91a484d2c27cc618c0c9", + "version": "4.1.1", + "port-version": 9 + }, + { + "git-tree": "f0ab88788617df5c670d6c372f431a0356713d3d", + "version": "4.1.1", + "port-version": 8 + }, + { + "git-tree": "486def9d5e02e287825fb8a27227f2b965a3e109", + "version-string": "4.1.1", + "port-version": 7 + }, + { + "git-tree": "46aa8d12c08674f4518e9b74b32826bbb380cac9", + "version-string": "4.1.1", + "port-version": 6 + }, + { + "git-tree": "118674017f17f5289563c3b07f4fe5403d508151", + "version-string": "4.1.1", + "port-version": 5 + }, + { + "git-tree": "15c020ecaf34ec7674885763ce7d0f16542307ec", + "version-string": "4.1.1", + "port-version": 3 + }, + { + "git-tree": "4b03ddec4f4b912ccdcf1d1b727c4bbc8cfee314", + "version-string": "4.1.1", + "port-version": 2 + }, + { + "git-tree": "8e17c6bb13f4a44a318d6a4196fa183a8229afe6", + "version-string": "4.1.1", + "port-version": 1 + }, + { + "git-tree": "d0ecae1f157ef7b6dc63e6e00166eca1bd04f8b6", + "version-string": "4.1.1", + "port-version": 0 + }, + { + "git-tree": "04a14f45042b5898562ce306cd4c7c411e06bf0a", + "version-string": "4.1.0-4", + "port-version": 0 + }, + { + "git-tree": "a408194911c08fb09c534d735487b86a25995afa", + "version-string": "4.1.0-3", + "port-version": 0 + }, + { + "git-tree": "b0e61221d6c2f9c10d25bcb8b3850c1d948dc987", + "version-string": "4.1.0-2", + "port-version": 0 + }, + { + "git-tree": "406806e8c72da240d1db401528fe1dff2712ceba", + "version-string": "4.1.0-1", + "port-version": 0 + }, + { + "git-tree": "7cca35bf76ccf8943e2750b6a349a08e89fbab4b", + "version-string": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "9f45589be21f2e066766f153985998450ec45fd2", + "version-string": "4.0.0-3", + "port-version": 0 + }, + { + "git-tree": "650995bca73866bc9c95b49c76e14c503093d153", + "version-string": "4.0.0-2", + "port-version": 0 + }, + { + "git-tree": "13f77fbe57914579e8012e009b05c32d7bfd5151", + "version-string": "4.0.0-1", + "port-version": 0 + }, + { + "git-tree": "f4598ea017b630bc00b528c68225b23de2497bb2", + "version-string": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "eaca2565907fbff8eb754dd414d66f95512cafd4", + "version-string": "3.05.02", + "port-version": 0 + }, + { + "git-tree": "8494e5ba71cdc94ea643b87248f3a57df484a580", + "version-string": "3.05.01-3", + "port-version": 0 + }, + { + "git-tree": "7035a128db5e3b1a04ce062e617d89cebdcf375c", + "version-string": "3.05.01-2", + "port-version": 0 + }, + { + "git-tree": "b637acdf1c59c43d8ce52af5be2db477f5f71bce", + "version-string": "3.05.01-1", + "port-version": 0 + }, + { + "git-tree": "cbcc234e5adb2932d4c09235d4c2daccc19bf8e7", + "version-string": "3.05.01", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tfhe.json b/externals/vcpkg/versions/t-/tfhe.json new file mode 100755 index 000000000..dd960cfc1 --- /dev/null +++ b/externals/vcpkg/versions/t-/tfhe.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "657bf75ef9440b68186eeeccc1c7e3f2c55d3ec4", + "version-semver": "1.0.1", + "port-version": 3 + }, + { + "git-tree": "e87faaf58cb9feb686fe28d31f24cedf27e2aec1", + "version-semver": "1.0.1", + "port-version": 2 + }, + { + "git-tree": "ee11a6e5e9e756c531b78822f6465a4b43dc048e", + "version-string": "1.0.1-1", + "port-version": 0 + }, + { + "git-tree": "71d55349c7e885618b88ee5177148a1b2987efea", + "version-string": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tgbot-cpp.json b/externals/vcpkg/versions/t-/tgbot-cpp.json new file mode 100755 index 000000000..e21e04e02 --- /dev/null +++ b/externals/vcpkg/versions/t-/tgbot-cpp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "e6256e56c77c074f61eaf4dda7bb2962e13e8e4b", + "version": "1.3", + "port-version": 0 + }, + { + "git-tree": "a48e654a56a7017acf3d0f0b119a96e9235119f9", + "version-string": "1.2.1", + "port-version": 1 + }, + { + "git-tree": "ba88bbcbff36bc2411806249543cd4046d938ebd", + "version-string": "1.2.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tgc.json b/externals/vcpkg/versions/t-/tgc.json new file mode 100755 index 000000000..2ce1e70a8 --- /dev/null +++ b/externals/vcpkg/versions/t-/tgc.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "753c07ac331209bf362c3818e462493ed6ac5ecb", + "version-string": "2019-08-11", + "port-version": 2 + }, + { + "git-tree": "b69aab3ec83aa87c6b297a75b4f02ee68d512921", + "version-string": "2019-08-11-1", + "port-version": 0 + }, + { + "git-tree": "939c552ff1e070a1cf4266549feff1b53092406b", + "version-string": "2019-08-11", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tgui.json b/externals/vcpkg/versions/t-/tgui.json new file mode 100755 index 000000000..c808cac11 --- /dev/null +++ b/externals/vcpkg/versions/t-/tgui.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "0fe7d561ea6d038584711e8581f6a5a72062c543", + "version-date": "2021-04-19", + "port-version": 3 + }, + { + "git-tree": "0fd517c4e738da62e959b791a6cdd952e7bd8345", + "version-date": "2021-04-19", + "port-version": 2 + }, + { + "git-tree": "354b5135bda4bcef9c5e7cbfeaff3d457b336e8c", + "version-date": "2021-04-19", + "port-version": 1 + }, + { + "git-tree": "bf02ffb145ee6449fd7479d72920c1e1ca9843c8", + "version-date": "2021-04-19", + "port-version": 0 + }, + { + "git-tree": "5ea44912cb8584751e303f69d686e3126c028300", + "version-string": "0.8.8", + "port-version": 0 + }, + { + "git-tree": "94508215d2c969394075af7ddc3f83dd27b1f3e0", + "version-string": "0.8.7", + "port-version": 0 + }, + { + "git-tree": "00af98576fb601d023460940b43977c0ab2318ae", + "version-string": "0.8.6", + "port-version": 0 + }, + { + "git-tree": "25fa98f6a66831f6d8f0f1f9edfbfe2ad46784c5", + "version-string": "0.8.5", + "port-version": 0 + }, + { + "git-tree": "0e099724bbc7dbbdfb027f2856bd966ab00a5b2f", + "version-string": "0.8.4-2", + "port-version": 0 + }, + { + "git-tree": "096f622bb82a2eda41de17d1fdaf31ab8a4a8d80", + "version-string": "0.8.4-1", + "port-version": 0 + }, + { + "git-tree": "32c249b470589dbebad9c60c1429252fd4218c7a", + "version-string": "0.8.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/theia.json b/externals/vcpkg/versions/t-/theia.json new file mode 100755 index 000000000..4ce29911e --- /dev/null +++ b/externals/vcpkg/versions/t-/theia.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "f19561fe41ab71864fbf9640e491cc6a567c06b8", + "version-string": "0.8", + "port-version": 6 + }, + { + "git-tree": "eff19230130911fb05e12a22ba59fc35f0d4b341", + "version-string": "0.8", + "port-version": 5 + }, + { + "git-tree": "9e4f395b731d46fde09836e4ff9a23ace6c74a6a", + "version-string": "0.8", + "port-version": 4 + }, + { + "git-tree": "6d74e7de2d80d5f3675b381e39c5fedd34493531", + "version-string": "0.8", + "port-version": 3 + }, + { + "git-tree": "881d1dad1876ac1ac89588a95070e7dcc21cff9c", + "version-string": "0.8-2", + "port-version": 0 + }, + { + "git-tree": "d6f6a07f80be40dcc23b7f887728bf89acbfa293", + "version-string": "0.8", + "port-version": 0 + }, + { + "git-tree": "98ef85c66ffddd9807fd365c050a3fd998732ff1", + "version-string": "0.7-d15154a-4", + "port-version": 0 + }, + { + "git-tree": "20c5d5f1ca4c02020d4143c58baf183fd524d22e", + "version-string": "0.7-d15154a-3", + "port-version": 0 + }, + { + "git-tree": "8922734aad943c5ca6551fba2ba55eb08dd530c4", + "version-string": "0.7-d15154a-2", + "port-version": 0 + }, + { + "git-tree": "c24f13e44f8ab6f0188fe80d263bfd2b5fa3c83f", + "version-string": "0.7-d15154a-1", + "port-version": 0 + }, + { + "git-tree": "ab972b58b4222c8efedd2caa93b84c15e445de6b", + "version-string": "0.7-d15154a", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/think-cell-range.json b/externals/vcpkg/versions/t-/think-cell-range.json new file mode 100755 index 000000000..f3a34c739 --- /dev/null +++ b/externals/vcpkg/versions/t-/think-cell-range.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "e39d38661e62f2c36eaa0026eabfb21e827e8456", + "version-string": "498839d", + "port-version": 2 + }, + { + "git-tree": "b1c80aab0470d03d5f336f15283beec17f3a3bfc", + "version-string": "498839d-1", + "port-version": 0 + }, + { + "git-tree": "f92db27a90b9e9cccab9e26070636e2cd2e7a288", + "version-string": "498839d", + "port-version": 0 + }, + { + "git-tree": "93a8c61b8b35fc8509a7332f010ba0aa0fbc1849", + "version-string": "e2d3018", + "port-version": 0 + }, + { + "git-tree": "4d19aa5a142294b7d0758dded27e46a7337a3c2c", + "version-string": "1d785d9", + "port-version": 0 + }, + { + "git-tree": "db13bfd7913485c6c164215bbb3da8f9c474abc4", + "version-string": "61e184a", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/thor.json b/externals/vcpkg/versions/t-/thor.json new file mode 100755 index 000000000..be1564b23 --- /dev/null +++ b/externals/vcpkg/versions/t-/thor.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "45ba80aa43a83b1c810d757922428538f82d8123", + "version": "2.0", + "port-version": 5 + }, + { + "git-tree": "cada171d405874f848790c8e10a7f332bbed1e6c", + "version": "2.0", + "port-version": 4 + }, + { + "git-tree": "99d8374185d4ab57f61811b3d65a2c542a8ad42e", + "version-string": "2.0-3", + "port-version": 0 + }, + { + "git-tree": "8940c531632de6e5b799a9f591547f9ad574e66d", + "version-string": "2.0-2", + "port-version": 0 + }, + { + "git-tree": "c9295a4a677858845acd87b0507d50e8a3916759", + "version-string": "2.0-1", + "port-version": 0 + }, + { + "git-tree": "7737d43763434bb569e377979d5b2deaf5d3886c", + "version-string": "v2.0-1", + "port-version": 0 + }, + { + "git-tree": "4ab767e31876f9932a3407d489eb88ca6ef74fac", + "version-string": "v2.0", + "port-version": 0 + }, + { + "git-tree": "e8016d5b3303689bd19a8642b240462f44a7f0d6", + "version-string": "", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/threadpool.json b/externals/vcpkg/versions/t-/threadpool.json new file mode 100755 index 000000000..6af078b54 --- /dev/null +++ b/externals/vcpkg/versions/t-/threadpool.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "498f064539d36777494d54a9edcce63a012ac503", + "version-string": "0.2.5", + "port-version": 2 + }, + { + "git-tree": "4a34cd691a72f01753a152d484648d8bd885dfb8", + "version-string": "0.2.5", + "port-version": 1 + } + ] +} diff --git a/externals/vcpkg/versions/t-/thrift.json b/externals/vcpkg/versions/t-/thrift.json new file mode 100755 index 000000000..1f9daf0e2 --- /dev/null +++ b/externals/vcpkg/versions/t-/thrift.json @@ -0,0 +1,254 @@ +{ + "versions": [ + { + "git-tree": "075afb4c9f18e75caa0eb4b07609324fa35b5ca5", + "version": "0.16.0", + "port-version": 0 + }, + { + "git-tree": "5db8f1e2a1a482177c2ff99e74d34e25b60fb7f4", + "version-string": "0.13.0", + "port-version": 2 + }, + { + "git-tree": "c7225d5805f82b8027c801f08d162bbd41b2b99f", + "version-string": "0.13.0", + "port-version": 1 + }, + { + "git-tree": "752af13152a5b5c98e64bc1beeec974befbbb5b9", + "version-string": "0.13.0", + "port-version": 0 + }, + { + "git-tree": "6b57f152f3f668077869adf0aebca5195d506cf8", + "version-string": "2020-02-08", + "port-version": 0 + }, + { + "git-tree": "104d954ed2ece17264b398271baab11e10e712b7", + "version-string": "2019-05-07-4", + "port-version": 0 + }, + { + "git-tree": "b6806b8af63b0feea5eb9b4936b5f5ba2c526746", + "version-string": "2019-05-07-3", + "port-version": 0 + }, + { + "git-tree": "04220d3e24deb51f65908368a389c4ffdbe0bc13", + "version-string": "2019-05-07-2", + "port-version": 0 + }, + { + "git-tree": "9c2222ba168c79df5c5552c15b2c152259fba6dd", + "version-string": "2019-05-07-1", + "port-version": 0 + }, + { + "git-tree": "653ca1ea020cec47dd1062f5a5b7dc3f192e93f4", + "version-string": "2019-05-07", + "port-version": 0 + }, + { + "git-tree": "e13ba4ac62022169ba8f18a2437cbf55757aa89f", + "version-string": "2019-04-19-1", + "port-version": 0 + }, + { + "git-tree": "095c603f9384cf77cee98bdb7ff76be40e2a44f7", + "version-string": "2019-04-19", + "port-version": 0 + }, + { + "git-tree": "57b5fb7a3bd45ca90653df53d20a6ea50e377827", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "2a40141c6142826e37657ba2c326e2fc1d32b1ea", + "version-string": "2019-01-30", + "port-version": 0 + }, + { + "git-tree": "2c8021c0da070f1ce3d3d0296a0057cb97ba4d91", + "version-string": "2019-01-09", + "port-version": 0 + }, + { + "git-tree": "d9022a3f71fec558bfe4883a7ce457c44d09891f", + "version-string": "2018-12-14", + "port-version": 0 + }, + { + "git-tree": "afbf7d7c2168568a30598e1686bff3a69eed040f", + "version-string": "2018-11-01", + "port-version": 0 + }, + { + "git-tree": "713f22569cdc21b1ae7fef92a3ff61b2dc4c1300", + "version-string": "2018-10-25", + "port-version": 0 + }, + { + "git-tree": "91c35b354b054278f58d4a143131134484540c88", + "version-string": "2018-10-11", + "port-version": 0 + }, + { + "git-tree": "6f37256dacb292b01431b7f49bb73ce71b3d12c2", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "916494f6bf8cf490a990c06f80f48847c81697ef", + "version-string": "2018-08-03", + "port-version": 0 + }, + { + "git-tree": "f1f854af9606471689c4c7758d50b2ef5fda0ed4", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "28adb1df1f26bde81084751c9de0af6a49e99d5d", + "version-string": "2018-07-08", + "port-version": 0 + }, + { + "git-tree": "36e96a8ccbc95a6a4f5be1c0e5bb448fe88f77ff", + "version-string": "2018-07-03", + "port-version": 0 + }, + { + "git-tree": "c13cef67c0079fb2c97c07c1a12edb662090780c", + "version-string": "2018-06-28", + "port-version": 0 + }, + { + "git-tree": "3498e893f813218ea509e2c24b5c36f25f42edca", + "version-string": "2018-06-15", + "port-version": 0 + }, + { + "git-tree": "c25252ab47bf10bb34d7e4c0be3e5e6bef146ca7", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "c02c4b6e41c648f7f4f38a07ab08962b972ddb8a", + "version-string": "2018-05-01", + "port-version": 0 + }, + { + "git-tree": "c28c3d884a80d5d85fd5e6ff0b5c52e65b1f9553", + "version-string": "2018-04-25", + "port-version": 0 + }, + { + "git-tree": "75c1cde8ecf44ebed82ce7596e555ed2d551ef1d", + "version-string": "2018-04-17", + "port-version": 0 + }, + { + "git-tree": "3f577c81f89c2055d7c161929dbcccf80876c9c8", + "version-string": "2018-04-09", + "port-version": 0 + }, + { + "git-tree": "979e0bd6c6cf52c8217c2fdefd46592efebd0d5f", + "version-string": "2018-04-06", + "port-version": 0 + }, + { + "git-tree": "508a2cbc4f09ccb816d70d0227cb94401ac91142", + "version-string": "2018-04-05", + "port-version": 0 + }, + { + "git-tree": "a49647e7e6e4996bc8a32d1fc8c75fa6fe760ba3", + "version-string": "2018-04-02", + "port-version": 0 + }, + { + "git-tree": "a380bdd29434cae93500476a399123f1405ec193", + "version-string": "2018-03-30", + "port-version": 0 + }, + { + "git-tree": "f53bf793f59991866e37b1b895ce222dcec94643", + "version-string": "2018-03-29", + "port-version": 0 + }, + { + "git-tree": "3d8ae89e575cc0e45eaa5c72c9401ed9bd447a16", + "version-string": "2018-03-23", + "port-version": 0 + }, + { + "git-tree": "6cb148aa10cd786cf68c569313a5aea4bafea1b9", + "version-string": "2018-03-20", + "port-version": 0 + }, + { + "git-tree": "f45ffb6b0a6d36eea43aa6a4f0a38fb066571a6c", + "version-string": "2018-03-17", + "port-version": 0 + }, + { + "git-tree": "dad9a3624875382b976d58e6592921425d35bfe2", + "version-string": "2018-03-14", + "port-version": 0 + }, + { + "git-tree": "1c47e9c390f9bfdc3ba36b6ea74fbcba8634e510", + "version-string": "2018-03-13", + "port-version": 0 + }, + { + "git-tree": "7f411195ca4ceb0cb5f9c3f507729db736cae59a", + "version-string": "2018-03-11", + "port-version": 0 + }, + { + "git-tree": "73f191264b1e3ac829f59d51f2fded4e071aebcd", + "version-string": "2018-03-07", + "port-version": 0 + }, + { + "git-tree": "4f89b3aad1ffeb25e5705475cdc69651b924ba4f", + "version-string": "2018-03-02", + "port-version": 0 + }, + { + "git-tree": "e409def7a1a6599f0f39c272c940ffe53d3ca6b1", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "98f395cf2fd0fa49669e923fa2daab919b2807a6", + "version-string": "20172805-72ca60debae1d9fb35d9f0085118873669006d7f-2", + "port-version": 0 + }, + { + "git-tree": "e77c1a6c2c292c1faf5fbe4ad1875d6478d1a981", + "version-string": "20172805-72ca60debae1d9fb35d9f0085118873669006d7f-1", + "port-version": 0 + }, + { + "git-tree": "b861282e3a4d6083badda4963b1adba1ad71485c", + "version-string": "20172805-72ca60debae1d9fb35d9f0085118873669006d7f", + "port-version": 0 + }, + { + "git-tree": "365cca923c49c2d81c09ce5f419bcf8a8b8201ab", + "version-string": "latest", + "port-version": 0 + }, + { + "git-tree": "4b88a19730cf146bb096cf4d4ffd18e621cabb5f", + "version-string": "0.10.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tidy-html5.json b/externals/vcpkg/versions/t-/tidy-html5.json new file mode 100755 index 000000000..8a48d8d42 --- /dev/null +++ b/externals/vcpkg/versions/t-/tidy-html5.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "bf333a8afdee1d7e0129928022e228cc092ed5de", + "version": "5.7.28", + "port-version": 5 + }, + { + "git-tree": "ba5557c5b17df0184bd2ee1eeee06ec1131576f8", + "version-string": "5.7.28", + "port-version": 4 + }, + { + "git-tree": "6b446932540002cb1b664d7f5286fdb6c0f7af28", + "version-string": "5.7.28", + "port-version": 3 + }, + { + "git-tree": "b050c4d466a093f1322998c0c2c356698954bc40", + "version-string": "5.7.28-2", + "port-version": 0 + }, + { + "git-tree": "3bf8e46176d46eb4f2257eae9125e0f3b7d4e14d", + "version-string": "5.7.28-1", + "port-version": 0 + }, + { + "git-tree": "2fd4ec0db75ada0702deee02df23d08760decd1e", + "version-string": "5.7.28", + "port-version": 0 + }, + { + "git-tree": "d044424f994b97e93466cc4d0f8e5de145452cd9", + "version-string": "5.6.0-1", + "port-version": 0 + }, + { + "git-tree": "81b0263817c84a34e56920ba932f10ad23c07427", + "version-string": "5.6.0", + "port-version": 0 + }, + { + "git-tree": "954df61d2f7aac784611519277c395fc9e26007f", + "version-string": "5.4.0-2", + "port-version": 0 + }, + { + "git-tree": "9536522198412a2c1a5dae3522e4ec50add7b9c4", + "version-string": "5.4.0-1", + "port-version": 0 + }, + { + "git-tree": "f67593b0a7ff5dba6d5aa76743d9ac64f6a02d09", + "version-string": "5.4.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tiff.json b/externals/vcpkg/versions/t-/tiff.json new file mode 100755 index 000000000..8176f1db7 --- /dev/null +++ b/externals/vcpkg/versions/t-/tiff.json @@ -0,0 +1,174 @@ +{ + "versions": [ + { + "git-tree": "7d5e9083d0072a4370b44f434cd4dac7b3bee7bc", + "version": "4.4.0", + "port-version": 1 + }, + { + "git-tree": "18c67848b7384af1ff6ad1c4e92b013376b136b6", + "version": "4.4.0", + "port-version": 0 + }, + { + "git-tree": "e2cafe3465d7c00233114c75abd86ed11538c186", + "version": "4.3.0", + "port-version": 8 + }, + { + "git-tree": "4f05b5c8b426ce84fbc8930c8f935b792feeb1f4", + "version": "4.3.0", + "port-version": 7 + }, + { + "git-tree": "7d1677b9568234f05c4be9f04f321b9506884376", + "version": "4.3.0", + "port-version": 6 + }, + { + "git-tree": "29af46222dc88425d734288253d807f1a9b96419", + "version": "4.3.0", + "port-version": 5 + }, + { + "git-tree": "b416d3e62450590e19a43f04b573c65555f3bc62", + "version": "4.3.0", + "port-version": 4 + }, + { + "git-tree": "d96194297723032655164b0fcb88027e38e06003", + "version": "4.3.0", + "port-version": 3 + }, + { + "git-tree": "f147253c84ad1d911393d8b5496f30574a07c780", + "version": "4.3.0", + "port-version": 2 + }, + { + "git-tree": "c8d1b0803b30c4fd2ea762d62b8d43cd09ff40f0", + "version": "4.3.0", + "port-version": 1 + }, + { + "git-tree": "e6f91f4785acec97b685989a9c61fa96927cf707", + "version": "4.3.0", + "port-version": 0 + }, + { + "git-tree": "fe41977af36a6513424daacb4d4686093a67e670", + "version-string": "4.1.0", + "port-version": 2 + }, + { + "git-tree": "8bb1dc9606c9b3573f08bcf6befad16ac730f287", + "version-string": "4.1.0", + "port-version": 1 + }, + { + "git-tree": "c2beac2991ae6df4dfeaf0a3b158092a78128214", + "version-string": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "e5df73e6c5b448c0ea2ee340b7c661a082258d30", + "version-string": "4.0.10-9", + "port-version": 0 + }, + { + "git-tree": "153be71da50b833194c064817f9306ebd7c5805b", + "version-string": "4.0.10-8", + "port-version": 0 + }, + { + "git-tree": "f09f45c8eea424b9fa710d138eb4a64bc832f5db", + "version-string": "4.0.10-7", + "port-version": 0 + }, + { + "git-tree": "5ec448310ac13771453e8857a86056e777a4883a", + "version-string": "4.0.10-6", + "port-version": 0 + }, + { + "git-tree": "d9db8910654080beb48043345bb1c2f4719da3ab", + "version-string": "4.0.10-4", + "port-version": 0 + }, + { + "git-tree": "33c4988d8babe92fd70a6b7e678ce1e3e0854b67", + "version-string": "4.0.10-3", + "port-version": 0 + }, + { + "git-tree": "30257e641841d0d8565e578f2f3a9266c8b8ad29", + "version-string": "4.0.10-2", + "port-version": 0 + }, + { + "git-tree": "11475b04dbdc067e7f9cf4f61fcc1000ed1b4faf", + "version-string": "4.0.10-1", + "port-version": 0 + }, + { + "git-tree": "481049cb905d331999b8bfb8cec7ebade22fe929", + "version-string": "4.0.10", + "port-version": 0 + }, + { + "git-tree": "65d279c98eb2b0dd92a8b2797b2aa992b38b27bc", + "version-string": "4.0.9-6", + "port-version": 0 + }, + { + "git-tree": "b5b1f2a0232d639564d4be206b31e73ce0b3dbd6", + "version-string": "4.0.9-5", + "port-version": 0 + }, + { + "git-tree": "3cbbcd0a6249276fdc5e6f554ef0f6e9b7145993", + "version-string": "4.0.9-4", + "port-version": 0 + }, + { + "git-tree": "71d484d55a6de4253fc5e4636dd8c9306ea135a2", + "version-string": "4.0.9", + "port-version": 0 + }, + { + "git-tree": "7f19440a20d0e54d202fbbaea95daae7a7e74b26", + "version-string": "4.0.8-1", + "port-version": 0 + }, + { + "git-tree": "88291d9174e7b5039f8f62ac364ec349ecdda5ba", + "version-string": "4.0.8", + "port-version": 0 + }, + { + "git-tree": "eaede4321e13e90676fe642e677e130abed069cd", + "version-string": "4.0.7", + "port-version": 0 + }, + { + "git-tree": "a3db04f188ed15291a02d0a622d4a9024be46dea", + "version-string": "4.0.6-3", + "port-version": 0 + }, + { + "git-tree": "b128eaa0d0139a80ab0d231c2e7467f2e6a14ed5", + "version-string": "4.0.6-2", + "port-version": 0 + }, + { + "git-tree": "b23a4634f78d758ca29842dcaff150a0a54b7569", + "version-string": "4.0.6-1", + "port-version": 0 + }, + { + "git-tree": "c858ee0ac04243cac961f01d43203811473af097", + "version-string": "4.0.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tinkerforge.json b/externals/vcpkg/versions/t-/tinkerforge.json new file mode 100755 index 000000000..433a2ef3a --- /dev/null +++ b/externals/vcpkg/versions/t-/tinkerforge.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "d9c644023147820bc9c89e9fe9f896e1a5fa0913", + "version": "2.1.25", + "port-version": 2 + }, + { + "git-tree": "684528ec07914569ba89b0d42230290cc55fdd4a", + "version-string": "2.1.25", + "port-version": 1 + }, + { + "git-tree": "89d1c3d2cdeef8dfd9d9a36a12461d1994094de0", + "version-string": "2.1.25", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tiny-aes-c.json b/externals/vcpkg/versions/t-/tiny-aes-c.json new file mode 100755 index 000000000..1a915e783 --- /dev/null +++ b/externals/vcpkg/versions/t-/tiny-aes-c.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "0971fda4965a33a674a28b84035e71e42e57f135", + "version-string": "2019-07-31", + "port-version": 1 + }, + { + "git-tree": "b5a8d85f99c004b3a88f910e02cf53411fed45d8", + "version-string": "2019-07-31", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tiny-bignum-c.json b/externals/vcpkg/versions/t-/tiny-bignum-c.json new file mode 100755 index 000000000..010c784a0 --- /dev/null +++ b/externals/vcpkg/versions/t-/tiny-bignum-c.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "645fb34f304ead370e2f4275b4e6c7120dcaed9e", + "version-string": "2019-07-31", + "port-version": 1 + }, + { + "git-tree": "46dd3471154a21dd430e36e7d0ab56c33f76211e", + "version-string": "2019-07-31", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tiny-dnn.json b/externals/vcpkg/versions/t-/tiny-dnn.json new file mode 100755 index 000000000..ba0744415 --- /dev/null +++ b/externals/vcpkg/versions/t-/tiny-dnn.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "6de81be7e06cac0652c8ffcc136ffdb889cb41f8", + "version-string": "2018-10-25", + "port-version": 1 + }, + { + "git-tree": "7640751d4d50df9abb088cd6de1b397694fd6478", + "version-string": "2018-10-25", + "port-version": 0 + }, + { + "git-tree": "7ce0972fcf1195fcc78e85347f0a8a305288fe5d", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "54c13f7ee646474c05e3411978ba113fc322bdc8", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "0abe0d97368c4d70cb357be5d9132f6406b99ec2", + "version-string": "2018-03-13", + "port-version": 0 + }, + { + "git-tree": "d84835f4a8edd50245c4ecaf06ff4d94dba4e756", + "version-string": "2018-03-07", + "port-version": 0 + }, + { + "git-tree": "17e1512471c9602c2fda04a13a2dec518badea9b", + "version-string": "2018-02-25-1", + "port-version": 0 + }, + { + "git-tree": "b18098bb81ed7fa78d1e4666a9ee20f94ee0e414", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "1ae1c19dfdceaf3c61345faa9e7310474e6a5d4f", + "version-string": "2017-10-09-dd906fed8c8aff8dc837657c42f9d55f8b793b0e", + "port-version": 0 + }, + { + "git-tree": "caa13d590bc77e01e7c9f3d04cc88f13e622dc92", + "version-string": "1.10.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tiny-process-library.json b/externals/vcpkg/versions/t-/tiny-process-library.json new file mode 100755 index 000000000..76a746054 --- /dev/null +++ b/externals/vcpkg/versions/t-/tiny-process-library.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "bdb3c92735776a800243c7cc38884357f3c743a5", + "version-string": "2.0.4", + "port-version": 1 + }, + { + "git-tree": "79863f6d064fb7200c1202261335bd5a131133c0", + "version-string": "2.0.4", + "port-version": 0 + }, + { + "git-tree": "aa30c69208d36bbc0afe7b89d1c4c64734abc5f1", + "version-string": "2018-12-06", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tiny-regex-c.json b/externals/vcpkg/versions/t-/tiny-regex-c.json new file mode 100755 index 000000000..ddef0c8c0 --- /dev/null +++ b/externals/vcpkg/versions/t-/tiny-regex-c.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "daa1326555febe3cba226d415bdad4a700f5c9f9", + "version-string": "2019-07-31", + "port-version": 1 + }, + { + "git-tree": "1086a34a4532ba8a47cd1d5514f9fddd83e52961", + "version-string": "2019-07-31", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tinycbor.json b/externals/vcpkg/versions/t-/tinycbor.json new file mode 100755 index 000000000..999afd64c --- /dev/null +++ b/externals/vcpkg/versions/t-/tinycbor.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "0579e95478ca32302fe6680fb0f953441d043a27", + "version-semver": "0.6.0", + "port-version": 1 + }, + { + "git-tree": "ecf65457801ba4aa8d8ae75886f87e740fb04783", + "version-semver": "0.6.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tinycthread.json b/externals/vcpkg/versions/t-/tinycthread.json new file mode 100755 index 000000000..435653d63 --- /dev/null +++ b/externals/vcpkg/versions/t-/tinycthread.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "dc723cd8de47e64e29d617806772f2fac2967e28", + "version-string": "2019-08-06", + "port-version": 1 + }, + { + "git-tree": "3957c392b150baa9436be2c25fa65af28dab3ee2", + "version-string": "2019-08-06", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tinydir.json b/externals/vcpkg/versions/t-/tinydir.json new file mode 100755 index 000000000..e128c0a5a --- /dev/null +++ b/externals/vcpkg/versions/t-/tinydir.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "15a20b060889d83539141c2b42ee7d856e9ab76f", + "version": "1.2.5", + "port-version": 0 + }, + { + "git-tree": "ce7697b2c8be56998fc7b97681fcd6e1d66cf49f", + "version-string": "1.2.4", + "port-version": 1 + }, + { + "git-tree": "713b509a8613d83a0b9a472896995f5b17e6c530", + "version-string": "1.2.4", + "port-version": 0 + }, + { + "git-tree": "b483622e9f12fa9cb9004c22345936c10b69e4ed", + "version-string": "1.2.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tinyexif.json b/externals/vcpkg/versions/t-/tinyexif.json new file mode 100755 index 000000000..32a1382c1 --- /dev/null +++ b/externals/vcpkg/versions/t-/tinyexif.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "50ad94147ea76f0e34a0e2afdcd92d83ad0102b1", + "version-date": "2022-02-15", + "port-version": 0 + }, + { + "git-tree": "350cf76237d8fc38f67cba9766e25b2f68d50d64", + "version-string": "1.0.2", + "port-version": 7 + }, + { + "git-tree": "c74a09bb37bbdd9e5228c6b694ec84bbd59d6d62", + "version-string": "1.0.2-6", + "port-version": 0 + }, + { + "git-tree": "13552361e2583e58e1ece1fb6c135210b55a05de", + "version-string": "1.0.2-5", + "port-version": 0 + }, + { + "git-tree": "379f4d84c35c48ae6082c253fbf7e55f20eb6a7b", + "version-string": "1.0.2-4", + "port-version": 0 + }, + { + "git-tree": "887df694ce2c251fa2512446462bc1172d729d57", + "version-string": "1.0.2-2", + "port-version": 0 + }, + { + "git-tree": "ea5f90f1bf0f572376a97cf9a2ae73b8bf430d16", + "version-string": "1.0.2-1", + "port-version": 0 + }, + { + "git-tree": "667ae1a1faae3c288e60a747d646b16b5dbef0c6", + "version-string": "1.0.2", + "port-version": 0 + }, + { + "git-tree": "88573f93e85a2b6da6951c35dfec04ef776bf1a7", + "version-string": "1.0.1-2", + "port-version": 0 + }, + { + "git-tree": "e73c4a7d1bd5db6ab9f72116cd76fa651d9e49b2", + "version-string": "1.0.1-1", + "port-version": 0 + }, + { + "git-tree": "dc639206f6251a246e0612f94e752df4b0799365", + "version-string": "1.0.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tinyexpr.json b/externals/vcpkg/versions/t-/tinyexpr.json new file mode 100755 index 000000000..90007821b --- /dev/null +++ b/externals/vcpkg/versions/t-/tinyexpr.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4f78e1f22bf3575efef5cab61cd1c7d70049c12c", + "version-string": "2020-09-25", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tinyexr.json b/externals/vcpkg/versions/t-/tinyexr.json new file mode 100755 index 000000000..318b63209 --- /dev/null +++ b/externals/vcpkg/versions/t-/tinyexr.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "81548356751317d12ff579d7c7749d073e5d0fb6", + "version-string": "1.0.0", + "port-version": 1 + }, + { + "git-tree": "b64261d4bf58c8ec08386f29bf15aaebd52ddc8d", + "version-string": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "b230e702351b9e07a6128a062e21ef06957a58ef", + "version-string": "2020-03-15", + "port-version": 0 + }, + { + "git-tree": "37e94fe2a31418c5ac6423809560c0403db5bdf6", + "version-string": "0.9.5-d16ea6-1", + "port-version": 0 + }, + { + "git-tree": "1e0e5f215e5c6d44b105fd40ea3f97e756117f36", + "version-string": "0.9.5-d16ea6", + "port-version": 0 + }, + { + "git-tree": "d56a748b8e2c277780b361b5929851e6121e08bb", + "version-string": "v0.9.5-d16ea6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tinyfiledialogs.json b/externals/vcpkg/versions/t-/tinyfiledialogs.json new file mode 100755 index 000000000..2b062876f --- /dev/null +++ b/externals/vcpkg/versions/t-/tinyfiledialogs.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "be887c4bad998770f49efced776f0ef5df71d342", + "version": "3.8.8", + "port-version": 4 + }, + { + "git-tree": "57a86420c47979e0b30dfb1e77482aad2836b07b", + "version": "3.8.8", + "port-version": 3 + }, + { + "git-tree": "abb5795ae7f012d210a4d98e4f072dea1b94c97a", + "version": "3.8.8", + "port-version": 2 + }, + { + "git-tree": "3959a47c7d93ca7db6e2022553b1d3427970cecf", + "version-semver": "3.8.8", + "port-version": 1 + }, + { + "git-tree": "1a5b599e8303e1b62bca446461bd7114ec97caba", + "version-string": "3.8.8", + "port-version": 0 + }, + { + "git-tree": "8cafa08c2b7e1d04e3a4e8bbc15271c33d9699e3", + "version-string": "3.6.3", + "port-version": 0 + }, + { + "git-tree": "6c827ed90c6566a072a8b47ec203967c6e41373f", + "version-string": "3.4.3-3", + "port-version": 0 + }, + { + "git-tree": "c358c59409ce238e78e198a7dbcbc5e57990b34e", + "version-string": "3.4.3-2", + "port-version": 0 + }, + { + "git-tree": "ac6afa97ea32c47a54bb835c75a591b4bdbfde83", + "version-string": "3.4.3-1", + "port-version": 0 + }, + { + "git-tree": "ba928d50fd41270c1e08fdb5e704cce8526322c5", + "version-string": "3.4.3", + "port-version": 0 + }, + { + "git-tree": "2d1d4d29940d1e2811b954a4f760ab1a45ab192e", + "version-string": "3.3.8-1", + "port-version": 0 + }, + { + "git-tree": "666560338697f023ad854de15934b06fc2a267a4", + "version-string": "3.3.8", + "port-version": 0 + }, + { + "git-tree": "05d3a918d0228e759114d76965b30331dec18d5b", + "version-string": "3.3.7-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tinygltf.json b/externals/vcpkg/versions/t-/tinygltf.json new file mode 100755 index 000000000..669cd6925 --- /dev/null +++ b/externals/vcpkg/versions/t-/tinygltf.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "68e4d0aabd2073861e4add08af282c0eff858a1e", + "version": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "7c5eabb454edeec3963a53675cc460732fe96a9c", + "version-string": "2020-07-28", + "port-version": 2 + }, + { + "git-tree": "a0991e25859335be940b034a0d5ec369cdb1f14c", + "version-string": "2020-07-28", + "port-version": 1 + }, + { + "git-tree": "a81aa48035ba08138ce76fff8d000052332604ae", + "version-string": "2020-07-28", + "port-version": 0 + }, + { + "git-tree": "ae04ec7cf00c7368ba9dbaf354d144701f2557b9", + "version-string": "2.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tinynpy.json b/externals/vcpkg/versions/t-/tinynpy.json new file mode 100755 index 000000000..2f243c632 --- /dev/null +++ b/externals/vcpkg/versions/t-/tinynpy.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "747ac11f43b296e46b01d17b69f04d0f782e33eb", + "version-string": "1.0.0", + "port-version": 4 + }, + { + "git-tree": "1aaad761b70ba86a1c925f1180afa3d10ca9e8b4", + "version-string": "1.0.0-3", + "port-version": 0 + }, + { + "git-tree": "7f268addfa76deee0c15483680cb528fc773c0d5", + "version-string": "1.0.0-2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tinyobjloader.json b/externals/vcpkg/versions/t-/tinyobjloader.json new file mode 100755 index 000000000..a7f2611ab --- /dev/null +++ b/externals/vcpkg/versions/t-/tinyobjloader.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "c1e6a1c3ddc75a72ea801b5d0980a73e14358e5e", + "version": "2.0.0-rc9", + "port-version": 0 + }, + { + "git-tree": "1e64b6f58d80d1ff9b43cd9700c8996d0b5b764d", + "version-string": "2.0.0-rc2", + "port-version": 2 + }, + { + "git-tree": "42c09a92244dd67f0c8a1a92e688173413517dee", + "version-string": "2.0.0-rc2", + "port-version": 1 + }, + { + "git-tree": "2114ea39f1654e929f31def392889f0aee7fb3de", + "version-string": "2.0.0-rc2", + "port-version": 0 + }, + { + "git-tree": "7ecc2fc7f1aa6fd35690a36992fcbcfb8c3cf128", + "version-string": "1.0.7-1", + "port-version": 0 + }, + { + "git-tree": "6176a3339d4b5fef85e48dc96582a78234c0250f", + "version-string": "1.0.7", + "port-version": 0 + }, + { + "git-tree": "169e183ff3aa1d70236dd5c5418f6a3c4f8e4904", + "version-string": "1.4.1-1", + "port-version": 0 + }, + { + "git-tree": "3a346255f98d5b6b2de7871c6ce6ad488bee3214", + "version-string": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "16a81e4715b9c75b776fa66a9a5243b1c4af978f", + "version-string": "1.2.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tinyply.json b/externals/vcpkg/versions/t-/tinyply.json new file mode 100755 index 000000000..107004406 --- /dev/null +++ b/externals/vcpkg/versions/t-/tinyply.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "d4b7f95bfaf84b3013c43310740340d8951068f5", + "version-string": "2020-05-22", + "port-version": 2 + }, + { + "git-tree": "24e53b2ef803576808b7e5176301b979e01fcd1c", + "version-string": "2020-05-22", + "port-version": 1 + }, + { + "git-tree": "461112c3d4ddfe5ddb6cb05765454f3c457873f4", + "version-string": "2020-05-22", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tinyspline.json b/externals/vcpkg/versions/t-/tinyspline.json new file mode 100755 index 000000000..45d5fdc3b --- /dev/null +++ b/externals/vcpkg/versions/t-/tinyspline.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "231dcdd1e689138e14cb5c1d4250a224f580cdd7", + "version": "0.4.0", + "port-version": 0 + }, + { + "git-tree": "6ad4ac2f1aa4dc253ada4023358286ab6bdc24a6", + "version": "0.3.0", + "port-version": 1 + }, + { + "git-tree": "4e3b92c86bcbdd44171e07b3421d56f07e302fe4", + "version": "0.3.0", + "port-version": 0 + }, + { + "git-tree": "393f891a892f72ee95dde573dbc6ec87992e564a", + "version-string": "0.2.0", + "port-version": 4 + }, + { + "git-tree": "b75d189b7025f885588d489e83cd5b97eee35a5b", + "version-string": "0.2.0-3", + "port-version": 0 + }, + { + "git-tree": "2e56a97916e5a864927ebe5e35494f74606f3e5f", + "version-string": "0.2.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tinythread.json b/externals/vcpkg/versions/t-/tinythread.json new file mode 100755 index 000000000..b446c0868 --- /dev/null +++ b/externals/vcpkg/versions/t-/tinythread.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "8e6a5537675d6cdabb102cdba98a638e75bc3a03", + "version-string": "1.1", + "port-version": 4 + }, + { + "git-tree": "fcf55a788b7bc0d3067c726c3224bc5a3fc3c304", + "version-string": "1.1-3", + "port-version": 0 + }, + { + "git-tree": "eac4d7ebe29132433acacd434cf3fdc10fb45b57", + "version-string": "1.1-2", + "port-version": 0 + }, + { + "git-tree": "7931f656d35d75f38241ce9450bd443c80a24a24", + "version-string": "1.1-1", + "port-version": 0 + }, + { + "git-tree": "5220b67433a6b813c60f9ff38d214e5202220d2a", + "version-string": "1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tinytoml.json b/externals/vcpkg/versions/t-/tinytoml.json new file mode 100755 index 000000000..b7eb2bbda --- /dev/null +++ b/externals/vcpkg/versions/t-/tinytoml.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "1bc5fcab066d64cc4693428f2375e9232f17b7d0", + "version-string": "20180219", + "port-version": 2 + }, + { + "git-tree": "787ecedb400a621f68e63a6000aee5d0a4890a55", + "version-string": "20180219-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tinyutf8.json b/externals/vcpkg/versions/t-/tinyutf8.json new file mode 100755 index 000000000..d0437bdce --- /dev/null +++ b/externals/vcpkg/versions/t-/tinyutf8.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "2217decdd5160c93c9b4f92269b32a9d414670ee", + "version-string": "4.0.2", + "port-version": 1 + }, + { + "git-tree": "da8a71ca817c591c31df0c318f199c0056cbcc2c", + "version-string": "4.0.2", + "port-version": 0 + }, + { + "git-tree": "20298c1e28b52e0a273de4ff4f7466f9479bf7e3", + "version-string": "3.0.1", + "port-version": 0 + }, + { + "git-tree": "c41cbfc3a39f1530b2c81a0190c332f17de561f7", + "version-string": "3", + "port-version": 0 + }, + { + "git-tree": "5dae61ac4b4d8c72a263c2e506dc72baaa8f07ad", + "version-string": "2.2", + "port-version": 0 + }, + { + "git-tree": "02205d527ea12507d26d3b831f0071e77a990f60", + "version-string": "2.1.1-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tinyxml.json b/externals/vcpkg/versions/t-/tinyxml.json new file mode 100755 index 000000000..d4060a0ee --- /dev/null +++ b/externals/vcpkg/versions/t-/tinyxml.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "27f0b200c75054768b3c6ed538c8bb938083ab67", + "version-string": "2.6.2", + "port-version": 8 + }, + { + "git-tree": "3c0dd9fb8a99d226d863eba951e54d40449c3c84", + "version-string": "2.6.2-7", + "port-version": 0 + }, + { + "git-tree": "cec0727a2f6469b38be27c65a099b5a2a1f15479", + "version-string": "2.6.2-5", + "port-version": 0 + }, + { + "git-tree": "ecd45d0f90319e1038b023c72139eb5fa88fca5f", + "version-string": "2.6.2-4", + "port-version": 0 + }, + { + "git-tree": "63fff417215bce1c362be10d9a0c82649b83cbb8", + "version-string": "2.6.2-3", + "port-version": 0 + }, + { + "git-tree": "55fa76efb6610496376ca33fd3842ddb9f464a40", + "version-string": "2.6.2-2", + "port-version": 0 + }, + { + "git-tree": "2eee11cd59e0749a9e209ea087bfd28d3eb44bc9", + "version-string": "2.6.2-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tinyxml2.json b/externals/vcpkg/versions/t-/tinyxml2.json new file mode 100755 index 000000000..9b78a67da --- /dev/null +++ b/externals/vcpkg/versions/t-/tinyxml2.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "5ef0e856167ad66665f51776d78fcffb1fcc1cb1", + "version-semver": "9.0.0", + "port-version": 1 + }, + { + "git-tree": "a8b086bdb3eaa94fea466bf8565d7c98b00c9f94", + "version-semver": "9.0.0", + "port-version": 0 + }, + { + "git-tree": "6c434072d7cd45db70c50b5553673f174b981eee", + "version-string": "8.0.0", + "port-version": 2 + }, + { + "git-tree": "5bc723c583463d1e50ff6dcf0131328759371eeb", + "version-string": "8.0.0-1", + "port-version": 0 + }, + { + "git-tree": "fee03c61d547a2afac222f6e9ccd9e266a068531", + "version-string": "8.0.0", + "port-version": 0 + }, + { + "git-tree": "7294b585da5d53fb20b5f00767c86af62821a91e", + "version-string": "7.1.0", + "port-version": 0 + }, + { + "git-tree": "3b793c2a1b8911f98c358d4f86b86f3394b9d10a", + "version-string": "7.0.1-2", + "port-version": 0 + }, + { + "git-tree": "ca5b2e3f1a1e071088a8cf6b2fb58476a1171ca1", + "version-string": "7.0.1-1", + "port-version": 0 + }, + { + "git-tree": "e3134ebc61721ea449ac15ab47b2b33363722b9d", + "version-string": "7.0.1", + "port-version": 0 + }, + { + "git-tree": "5e7b3d1960e7e830397f6960d8952cfd536f1341", + "version-string": "6.2.0", + "port-version": 0 + }, + { + "git-tree": "34a39f88bdbfe177229b575c910e3f193098f870", + "version-string": "6.0.0-2", + "port-version": 0 + }, + { + "git-tree": "583670cefca3baa80fffa6ecf06e8abc891161c8", + "version-string": "6.0.0", + "port-version": 0 + }, + { + "git-tree": "bf9714823b0580f1f637928445d8f8553a79467f", + "version-string": "5.0.1-1", + "port-version": 0 + }, + { + "git-tree": "62be736bc18bb970c8fd34ea78766fc507f78fff", + "version-string": "5.0.1", + "port-version": 0 + }, + { + "git-tree": "d422b09579699139da110a843e70650587a425b9", + "version-string": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "02bbf6dbd7a928d06d631b75fa7b6b6c7c6d10e6", + "version-string": "3.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tl-expected.json b/externals/vcpkg/versions/t-/tl-expected.json new file mode 100755 index 000000000..7cf4cd50c --- /dev/null +++ b/externals/vcpkg/versions/t-/tl-expected.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "952f8ebe25660f2bf6a7091c338e4113691279dd", + "version-string": "1.0.0", + "port-version": 2 + }, + { + "git-tree": "3b51d7b17e6db2b606e1d070d6e8f32c07c1a903", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "f157847fd14ac0cb91c069cb604d55bb8489a7b2", + "version-string": "0.3-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tl-function-ref.json b/externals/vcpkg/versions/t-/tl-function-ref.json new file mode 100755 index 000000000..3996e5af2 --- /dev/null +++ b/externals/vcpkg/versions/t-/tl-function-ref.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "40cb62e51ee41b386626b2f4bbcc8f86b6ad2a03", + "version-string": "1.0.0", + "port-version": 2 + }, + { + "git-tree": "848facd0f73b670581bf3e66e96dfeeb3248428c", + "version-string": "1.0.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tl-generator.json b/externals/vcpkg/versions/t-/tl-generator.json new file mode 100755 index 000000000..23debbd16 --- /dev/null +++ b/externals/vcpkg/versions/t-/tl-generator.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "aac3612e6eaa3c6a6618226a96888c5b21a76a06", + "version-date": "2021-09-28", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tl-optional.json b/externals/vcpkg/versions/t-/tl-optional.json new file mode 100755 index 000000000..73eba3885 --- /dev/null +++ b/externals/vcpkg/versions/t-/tl-optional.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "a88a1a6074c36dd4c7872c7a439c839da2a1e99d", + "version-string": "1.0.0", + "port-version": 2 + }, + { + "git-tree": "543d9b23441ec80d00a537705e03e4fb45af0334", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "2eda278bab2086fae9d050179170e456c285cc7a", + "version-string": "0.5-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tl-ranges.json b/externals/vcpkg/versions/t-/tl-ranges.json new file mode 100755 index 000000000..31aabb66e --- /dev/null +++ b/externals/vcpkg/versions/t-/tl-ranges.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7b8e77a41595c1f5d6fc5efdba421c7240fc26d9", + "version-date": "2021-12-02", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tlx.json b/externals/vcpkg/versions/t-/tlx.json new file mode 100755 index 000000000..28d3f7c8d --- /dev/null +++ b/externals/vcpkg/versions/t-/tlx.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "268aa098ddcd207b076e10ebf1ef398aae834243", + "version-string": "0.5.20191212", + "port-version": 2 + }, + { + "git-tree": "5b51b49c324771227a0c96e16b595496f1094cd9", + "version-string": "0.5.20191212", + "port-version": 1 + }, + { + "git-tree": "ccbe4ed982fe5878feba3a77569688cf7af552a2", + "version-string": "0.5.20191212", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tmx.json b/externals/vcpkg/versions/t-/tmx.json new file mode 100755 index 000000000..862004cd4 --- /dev/null +++ b/externals/vcpkg/versions/t-/tmx.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "1b0ec7979f9a75aab71e9488940a4beff74bd745", + "version": "1.2.0", + "port-version": 1 + }, + { + "git-tree": "207601a8ff1891880a88013e3b36ea0f81979010", + "version": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "bfe6a8ece200881d1c7e3a33b0fd14f4279c3d1b", + "version-string": "1.1.0", + "port-version": 1 + }, + { + "git-tree": "400a9748b46a05c705aa53ea5cd7147f0f95e6c7", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "01cf76bb0b88eca86f82b728b15f4ffd0212a2f9", + "version-string": "1.0.0", + "port-version": 2 + }, + { + "git-tree": "8190e20f8693bc362fe2cc6f30045a2e4c09b68d", + "version-string": "1.0.0-1", + "port-version": 0 + }, + { + "git-tree": "08641f22fac86c1ed2e6ab437cd02c55f17c7ba8", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tmxlite.json b/externals/vcpkg/versions/t-/tmxlite.json new file mode 100755 index 000000000..2469531f2 --- /dev/null +++ b/externals/vcpkg/versions/t-/tmxlite.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "b176cf2abbb6262dc616d68625f90f35e65fe4c1", + "version": "1.3.0", + "port-version": 1 + }, + { + "git-tree": "a60946b8d791faf0936b14f7ad9868d74b0dd872", + "version": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "177873f8c1357bfcc2a15954de053e949737dd30", + "version-string": "2019-03-05", + "port-version": 1 + }, + { + "git-tree": "ebc24944bd55409160b5fa863f69d59877e2d1a8", + "version-string": "2019-03-05", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tmxparser.json b/externals/vcpkg/versions/t-/tmxparser.json new file mode 100755 index 000000000..c22057839 --- /dev/null +++ b/externals/vcpkg/versions/t-/tmxparser.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "a0f3908517c6bf7656418385bb0fff72314a2a4e", + "version-string": "2.1.0", + "port-version": 6 + }, + { + "git-tree": "a1d1d7f89ce4ee1ebb8eaea792da1ab3f21367e9", + "version-string": "2.1.0", + "port-version": 5 + }, + { + "git-tree": "481cfb5fee00fa7787dabbec0e77cbf884645816", + "version-string": "2.1.0-4", + "port-version": 0 + }, + { + "git-tree": "59309efb7ad883a7fd1ddce95369c38c29c60c5e", + "version-string": "2.1.0-3", + "port-version": 0 + }, + { + "git-tree": "ca0cbad617693d3827c4fa352ec258bdb7813a84", + "version-string": "2.1.0-2", + "port-version": 0 + }, + { + "git-tree": "b6d412fc324a32ff333da49af59ed329a3afe891", + "version-string": "2.1.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/toml11.json b/externals/vcpkg/versions/t-/toml11.json new file mode 100755 index 000000000..5a4ae69e5 --- /dev/null +++ b/externals/vcpkg/versions/t-/toml11.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "978b00b8d4801b25272df9c650958ce7112e3f45", + "version": "3.7.1", + "port-version": 0 + }, + { + "git-tree": "ab8e69aef0551e2e862e74ec70b5c2dd58aac36b", + "version": "3.7.0", + "port-version": 0 + }, + { + "git-tree": "dabcb8338003184011c1b13e49561f9c112a9735", + "version-string": "3.5.0", + "port-version": 2 + }, + { + "git-tree": "5e58833d3ad983b69e8e0510e1bd3f27df685fbf", + "version-string": "3.5.0", + "port-version": 1 + }, + { + "git-tree": "399772251a31bf6487c66d9847e21f7d9c53a363", + "version-string": "3.5.0", + "port-version": 0 + }, + { + "git-tree": "252b0cd5152f074ab0f768f10e7fe06d894dcbc3", + "version-string": "3.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tomlplusplus.json b/externals/vcpkg/versions/t-/tomlplusplus.json new file mode 100755 index 000000000..a5947f3b1 --- /dev/null +++ b/externals/vcpkg/versions/t-/tomlplusplus.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "bf80fe2b73187c7a5ae1ea2d32cba894c13f7224", + "version": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "815508399a10ce972d933aa3f5b4f751c37c64d2", + "version": "3.0.1", + "port-version": 0 + }, + { + "git-tree": "06ce1fc365e8e7aa80b1a234a97665ca5e593d0d", + "version": "2.5.0", + "port-version": 3 + }, + { + "git-tree": "8a772c48d2f8b5d525a1bcad95296bb483194e7a", + "version": "2.5.0", + "port-version": 2 + }, + { + "git-tree": "be5f558a002098691a82ebb0c86fd19420f4ceaa", + "version": "2.5.0", + "port-version": 1 + }, + { + "git-tree": "f28a45d07d6ff9059a273ab730c9bc36a57ef7aa", + "version": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "adfbc0f365c9a2f1ea4f90cf4a199be6e3b10586", + "version-string": "2.4.0", + "port-version": 1 + }, + { + "git-tree": "95397531895566a6af15644be1ea9e228795c02d", + "version-string": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "8ea8a3d5b0f08bd4933f8caba3acc4992bfeab7a", + "version-string": "2.3.0", + "port-version": 1 + }, + { + "git-tree": "68e42fded6663929a501cfa1a276df3a0e369ebd", + "version-string": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "8c6d8b1ddce9806229e0779d55bce0cb40b4ea61", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "0930fd6f40db58c9f92441ba8d7b807e510e99f5", + "version-string": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "d69ba5f3477ce1a9f88812dfaeb3ba03d85d5cc8", + "version-string": "1.3.0-3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tool-meson.json b/externals/vcpkg/versions/t-/tool-meson.json new file mode 100755 index 000000000..046537d03 --- /dev/null +++ b/externals/vcpkg/versions/t-/tool-meson.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "cb1118e5da831de1c511424b6aaa7949777733a3", + "version-date": "2022-01-21", + "port-version": 0 + }, + { + "git-tree": "924a9b5b5dc11ea420a1be748873f8b252fd1417", + "version-date": "2021-11-19", + "port-version": 0 + }, + { + "git-tree": "7faddc68a615d0902938f8dd18182586f9e2363a", + "version": "0.58.1", + "port-version": 0 + }, + { + "git-tree": "3abddc8b29ae6e5c0265237a8c3f3e8ec8348710", + "version": "0.58.0", + "port-version": 0 + }, + { + "git-tree": "3e9b57e374c062aa7a2b863b4c6a5d4e971da7c1", + "version-string": "0.56.02", + "port-version": 0 + }, + { + "git-tree": "4612ac2ee155a026179060815646ab2fdaf67b3d", + "version-string": "0.56.01", + "port-version": 0 + }, + { + "git-tree": "57142be41cf432aa01a5ce5a9cff2c76706e82fa", + "version-string": "0.56.0", + "port-version": 0 + }, + { + "git-tree": "cefcbe950142097d62086832eed79b13afd2c834", + "version-string": "0.55.3", + "port-version": 0 + }, + { + "git-tree": "3bb6fd2111e6ca07c66160e3e76f094f759495b4", + "version-string": "0.55.1", + "port-version": 0 + }, + { + "git-tree": "8fabbf44b36be3b82e8f44f2821b9a6e65a0bd5f", + "version-string": "0.54.2", + "port-version": 0 + }, + { + "git-tree": "f375fa55ef0db19c1672c9262c967bde3c2e0b8b", + "version-string": "0.53.2", + "port-version": 0 + }, + { + "git-tree": "1b2d58beb93c17eff9b667f688603bc74d93955f", + "version-string": "0.52.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/torch-th.json b/externals/vcpkg/versions/t-/torch-th.json new file mode 100755 index 000000000..686004047 --- /dev/null +++ b/externals/vcpkg/versions/t-/torch-th.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "dd64f0dab429a6baf6dbb12119909ebd9caaa43a", + "version-string": "2019-04-19", + "port-version": 3 + }, + { + "git-tree": "803c42d38d110be4bdde22843088fca604e1879e", + "version-string": "2019-04-19-2", + "port-version": 0 + }, + { + "git-tree": "f7e9fc59ddbad9443851f833a4adc15e35759514", + "version-string": "2019-04-19-1", + "port-version": 0 + }, + { + "git-tree": "11619659a6fa2607cdf4740ce9244400887ec731", + "version-string": "2019-04-19", + "port-version": 0 + }, + { + "git-tree": "3514e7f730af6b116fd9c36e5574f5c40a3975e6", + "version-string": "2018-07-03", + "port-version": 0 + }, + { + "git-tree": "8805d0261fb08fd4a8c1bc6c54ba968dbf73bc56", + "version-string": "20180131-89ede3ba90c906a8ec6b9a0f4bef188ba5bb2fd8-2", + "port-version": 0 + }, + { + "git-tree": "3b82020d1919842abf4d057c09f49e0d20650b7f", + "version-string": "20180131-89ede3ba90c906a8ec6b9a0f4bef188ba5bb2fd8-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tracy.json b/externals/vcpkg/versions/t-/tracy.json new file mode 100755 index 000000000..171814573 --- /dev/null +++ b/externals/vcpkg/versions/t-/tracy.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "a703a83cacfbb242afd294baeb87ca1a497c5bf1", + "version-semver": "0.8.1", + "port-version": 0 + }, + { + "git-tree": "65aeedc7adaa4e1b13998f781e702d7672b2aca5", + "version-semver": "0.8.0", + "port-version": 1 + }, + { + "git-tree": "b34c2e1fb20aa7f46e350fbf5b90e8dda71aaf3a", + "version": "0.8.0", + "port-version": 0 + }, + { + "git-tree": "4495b1e35b5ce98b10a2a6f28eebdda0088903e2", + "version": "0.7.8", + "port-version": 2 + }, + { + "git-tree": "3995e035cf62c81d54be47133d37eb3073a44343", + "version": "0.7.8", + "port-version": 1 + }, + { + "git-tree": "9649d5716ad8d1ff208bc0b1e97e9700e915ef55", + "version": "0.7.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/transwarp.json b/externals/vcpkg/versions/t-/transwarp.json new file mode 100755 index 000000000..bd303d584 --- /dev/null +++ b/externals/vcpkg/versions/t-/transwarp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2e60fb56dd71cbc0d75dfb0bc253ec4ab5b12e8e", + "version": "2.2.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/trantor.json b/externals/vcpkg/versions/t-/trantor.json new file mode 100755 index 000000000..7f1733fc8 --- /dev/null +++ b/externals/vcpkg/versions/t-/trantor.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "9d602ca62a711669efb9d496f9644334fecd8c9d", + "version-semver": "1.5.5", + "port-version": 0 + }, + { + "git-tree": "aa2acfecd4618d2da7aaae3e93e5f2bb4ec7172e", + "version-semver": "1.5.4", + "port-version": 0 + }, + { + "git-tree": "a5395bb6aeca297cdc2a8b052599df7a7b568c07", + "version-semver": "1.5.3", + "port-version": 0 + }, + { + "git-tree": "06881e6b0abf51c4df93d7bdcb5c715adf57809d", + "version-semver": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "82647f91d6290a85e1b03801e75e17698b3da691", + "version-string": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "f53004074d57fe4748b87a81dcc59f35a20715ce", + "version-string": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "2c0b4590aa43f963fea34277e0aa981c8326652d", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "469e31dd5aceacb2bb3485e4f1b2091e70a2d5e2", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "af52c9e7b3dd398e61ef6ea0a34a48cdcfce7f42", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "0df63258899007bb9f8fa2027ab3f0b3a3807251", + "version-string": "1.1.1", + "port-version": 0 + }, + { + "git-tree": "e39967f29deb43f37701d77882c1d658fe2e391f", + "version-string": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "6c6225b9201bb9784d6fb68e3fe846045b905516", + "version-string": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "738983e46a09641de4d697a809337e7bfdd68028", + "version-string": "v1.0.0-rc16", + "port-version": 0 + }, + { + "git-tree": "cfaba5da60a7c96d1bfa830ccd29312798536a75", + "version-string": "v1.0.0-rc14", + "port-version": 0 + }, + { + "git-tree": "dae412af1c79df67956645f1bd2cd006a818d5a9", + "version-string": "v1.0.0-rc13", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tre.json b/externals/vcpkg/versions/t-/tre.json new file mode 100755 index 000000000..fcf4bef79 --- /dev/null +++ b/externals/vcpkg/versions/t-/tre.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "9a43049be2abc5f27fa5b1f77eaeda7a3a63d4a0", + "version-string": "0.8.0", + "port-version": 3 + }, + { + "git-tree": "c6f1211065eff34d7d62934884cfbfe20af3c446", + "version-string": "0.8.0", + "port-version": 2 + }, + { + "git-tree": "7a1459b0be7679facdc6a9afc15b1531c5f61440", + "version-string": "0.8.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/treehh.json b/externals/vcpkg/versions/t-/treehh.json new file mode 100755 index 000000000..536eaa542 --- /dev/null +++ b/externals/vcpkg/versions/t-/treehh.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "935cf42d03c842e7408961440ece8a94303d45a6", + "version": "3.16", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/treehopper.json b/externals/vcpkg/versions/t-/treehopper.json new file mode 100755 index 000000000..80c09bf69 --- /dev/null +++ b/externals/vcpkg/versions/t-/treehopper.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "4efe0662e17f2f340bd234604952d75a4d914aec", + "version-string": "1.11.3", + "port-version": 5 + }, + { + "git-tree": "a9746b7358065513f7f3ab827ab3c1c3723f194b", + "version-string": "1.11.3-4", + "port-version": 0 + }, + { + "git-tree": "996413bba31b377767d5555458473dd2585310ca", + "version-string": "1.11.3-3", + "port-version": 0 + }, + { + "git-tree": "b8241d626198df0f3bc23bc62fd3d5df630b21dc", + "version-string": "1.11.3-2", + "port-version": 0 + }, + { + "git-tree": "69830c42e71a773f3dab648803e29197b4575581", + "version-string": "1.11.3-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/triangle.json b/externals/vcpkg/versions/t-/triangle.json new file mode 100755 index 000000000..f3fae4ed4 --- /dev/null +++ b/externals/vcpkg/versions/t-/triangle.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "645a20994580aa49313c0d9ef735ea60caf57976", + "version": "1.6", + "port-version": 2 + }, + { + "git-tree": "9b80b2815877547418bac0ed7ddba3fec7d0a2df", + "version-string": "1.6", + "port-version": 1 + }, + { + "git-tree": "818fe01f95013b057c24f63f037a102f58bcab4e", + "version-string": "1.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/triton.json b/externals/vcpkg/versions/t-/triton.json new file mode 100755 index 000000000..4390795e4 --- /dev/null +++ b/externals/vcpkg/versions/t-/triton.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "dd0d283c09ee98abf32a81d0833e81a9e5222028", + "version": "0.9", + "port-version": 3 + }, + { + "git-tree": "220ce7aa574609f64206fc02906b1bd2eafbc8aa", + "version": "0.9", + "port-version": 2 + }, + { + "git-tree": "1463df6dd74dfea7d12a8610b23009259b5c1e57", + "version": "0.9", + "port-version": 1 + }, + { + "git-tree": "168cc90ef1373fadb8b05ad53430eb37a022dd50", + "version": "0.9", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/trompeloeil.json b/externals/vcpkg/versions/t-/trompeloeil.json new file mode 100755 index 000000000..376597768 --- /dev/null +++ b/externals/vcpkg/versions/t-/trompeloeil.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "7345802a43866751e65d0ce0caaa24566a1b7a3a", + "version": "41", + "port-version": 0 + }, + { + "git-tree": "5691d561cb4ae588d604882cd58539b406222cac", + "version-string": "38", + "port-version": 1 + }, + { + "git-tree": "494fa9278d6ca20444defeab2b2557998ec2d1d3", + "version-string": "38", + "port-version": 0 + }, + { + "git-tree": "79c2939e301583f87a67e5247bbec3b46db0fc23", + "version-string": "36", + "port-version": 0 + }, + { + "git-tree": "c6c74144cc6cbfee2bb85191513da247b004d580", + "version-string": "34-1", + "port-version": 0 + }, + { + "git-tree": "de744a8552bc4f544d7e9c3b2801b427e40728a5", + "version-string": "34", + "port-version": 0 + }, + { + "git-tree": "e4e95d160cde07e97131b787b8dbb9196d4d0d7f", + "version-string": "33", + "port-version": 0 + }, + { + "git-tree": "c7bbc1f9e769e3cd71dbc4598187fad06bd034d1", + "version-string": "32-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tsl-hopscotch-map.json b/externals/vcpkg/versions/t-/tsl-hopscotch-map.json new file mode 100755 index 000000000..eb07bc22c --- /dev/null +++ b/externals/vcpkg/versions/t-/tsl-hopscotch-map.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "a9aea6d276838589846f7f2741359c2ca29c49e4", + "version-string": "2.3.0", + "port-version": 1 + }, + { + "git-tree": "1f942fa0f46b5b793d8314e690a3b3c95152b2d8", + "version-string": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "66ae67fdaeb784ab28ca692d98b2cafd92b36bcc", + "version-string": "2.2.1-1", + "port-version": 0 + }, + { + "git-tree": "3fdf6ba5a965eb688274310167ad001c26baef43", + "version-string": "2.2.1", + "port-version": 0 + }, + { + "git-tree": "be1cdaa5fb6494977cae2bbf9f781cb1a15fb30c", + "version-string": "2.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tsl-ordered-map.json b/externals/vcpkg/versions/t-/tsl-ordered-map.json new file mode 100755 index 000000000..899b0a7e2 --- /dev/null +++ b/externals/vcpkg/versions/t-/tsl-ordered-map.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "5daf2289228a2a7e03ce57d352e07cb8431184a1", + "version-string": "1.0.0", + "port-version": 1 + }, + { + "git-tree": "cdcfcb2f8f7444f23580a8784abfb42164fa9da0", + "version-string": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "63e5a2ada4c48a92fac0a0e896303c68a386a503", + "version-string": "0.8.1-1", + "port-version": 0 + }, + { + "git-tree": "fa66dade6f2c6ed4984b9db0d0fce3f91300f698", + "version-string": "0.8.1", + "port-version": 0 + }, + { + "git-tree": "edc83c82e8689adb067229a5a68f2976241e228e", + "version-string": "0.8.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tsl-sparse-map.json b/externals/vcpkg/versions/t-/tsl-sparse-map.json new file mode 100755 index 000000000..5c6130a68 --- /dev/null +++ b/externals/vcpkg/versions/t-/tsl-sparse-map.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "7fb06e7731b0c8231bc6e4807c71c38bee6b18ac", + "version-string": "0.6.2", + "port-version": 1 + }, + { + "git-tree": "00b67cecc2ffedf1fcbbc3fdbb388e4a26a6ee72", + "version-string": "0.6.2", + "port-version": 0 + }, + { + "git-tree": "3ad636e35c26fec19c0630edbf7356dacbc2ab69", + "version-string": "0.6.1-1", + "port-version": 0 + }, + { + "git-tree": "b98d474cbe239ee5bd656d9dc36556c32dced2e1", + "version-string": "0.6.1", + "port-version": 0 + }, + { + "git-tree": "d3befa681ab03334678476b107f4567b43e8b58e", + "version-string": "0.6.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/ttauri.json b/externals/vcpkg/versions/t-/ttauri.json new file mode 100755 index 000000000..f1deb87b0 --- /dev/null +++ b/externals/vcpkg/versions/t-/ttauri.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "5990b7368bf89a8b6cd1fa2a7b33406c9ef3a24e", + "version": "0.5.0", + "port-version": 1 + }, + { + "git-tree": "8214a006b0e577a7c4076ed5bfd7f155abc99ace", + "version": "0.5.0", + "port-version": 0 + }, + { + "git-tree": "640bce2fd18c48a41a148e9c0c9ee19f6537b171", + "version": "0.4.0", + "port-version": 0 + }, + { + "git-tree": "053cdf5774b35c81572b9a2f398d8074e91d764f", + "version": "0.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/turbobase64.json b/externals/vcpkg/versions/t-/turbobase64.json new file mode 100755 index 000000000..761a503da --- /dev/null +++ b/externals/vcpkg/versions/t-/turbobase64.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "1077b7996d7d22e798b337bc29177a566ec64e4b", + "version-date": "2020-01-12", + "port-version": 2 + }, + { + "git-tree": "42e8e3b3a43b2170811c936708766470ad137cab", + "version-string": "2020-01-12", + "port-version": 1 + }, + { + "git-tree": "9520744942677bb6c18947e3a62d0750eae4f2dd", + "version-string": "2020-01-12", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tvision.json b/externals/vcpkg/versions/t-/tvision.json new file mode 100755 index 000000000..8dea359d6 --- /dev/null +++ b/externals/vcpkg/versions/t-/tvision.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "43ab1f9cb4407aab0a936520a82ddee84a48bd92", + "version-date": "2021-08-10", + "port-version": 1 + }, + { + "git-tree": "9d7a52a21054aae326fe5793acc7d54b04ec40f6", + "version-date": "2021-08-10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/tweeny.json b/externals/vcpkg/versions/t-/tweeny.json new file mode 100755 index 000000000..ad25b87d7 --- /dev/null +++ b/externals/vcpkg/versions/t-/tweeny.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "07d8448c4d732f5596e87fc25392fc58ac7c1961", + "version": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "4156972279f81599c3698722eac76c32d6f69d16", + "version-string": "3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/type-lite.json b/externals/vcpkg/versions/t-/type-lite.json new file mode 100755 index 000000000..8e317b7db --- /dev/null +++ b/externals/vcpkg/versions/t-/type-lite.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "1393063d013016208c0f3e269034c2f664ea408f", + "version-string": "0.1.0", + "port-version": 1 + }, + { + "git-tree": "944df768435d61dedc05e968fce4ed1acaf295d4", + "version-string": "0.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/t-/type-safe.json b/externals/vcpkg/versions/t-/type-safe.json new file mode 100755 index 000000000..835008819 --- /dev/null +++ b/externals/vcpkg/versions/t-/type-safe.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "63cdf2cb69a2a7f3de1a5bf82d63e556b742e909", + "version": "0.2.2", + "port-version": 1 + }, + { + "git-tree": "c46af3efa54c55f23076777fb7c276886f1dd1ce", + "version": "0.2.2", + "port-version": 0 + }, + { + "git-tree": "b8a081a46706947bbef195669f57707aa2a9d393", + "version-string": "0.2.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/uchardet.json b/externals/vcpkg/versions/u-/uchardet.json new file mode 100755 index 000000000..cc62db1c5 --- /dev/null +++ b/externals/vcpkg/versions/u-/uchardet.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "8333800cb0daceea8448ca6d20a91a1944b31559", + "version-date": "2021-09-03", + "port-version": 2 + }, + { + "git-tree": "bef8f2cbbb385ec635dbca67e3783496a15cb4a0", + "version-date": "2021-09-03", + "port-version": 1 + }, + { + "git-tree": "46d56e5d20654b04eb3b97cc2ae46b1ae7c07eb9", + "version-date": "2021-09-03", + "port-version": 0 + }, + { + "git-tree": "074fd1696e7c47ef9dce162bfad50572a8d766f1", + "version-string": "2020-04-26", + "port-version": 1 + }, + { + "git-tree": "1e9bdf5a783f1453fd1a4330f42e7e0ca1f07eb7", + "version-string": "2020-04-26", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/umock-c.json b/externals/vcpkg/versions/u-/umock-c.json new file mode 100755 index 000000000..366826108 --- /dev/null +++ b/externals/vcpkg/versions/u-/umock-c.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "67f2fda1636719281706ebef0314a388ba5c8d15", + "version-date": "2022-01-21", + "port-version": 0 + }, + { + "git-tree": "b34153650a29eb81f88e48f53bd06ca05d4383c4", + "version-string": "2020-06-17", + "port-version": 2 + }, + { + "git-tree": "10a9af0e9e3e4d0a7ab3a5819943e4d609677c1a", + "version-string": "2020-06-17-1", + "port-version": 0 + }, + { + "git-tree": "97a7fdde215f5c129ca102a68bd6c31fb05dc625", + "version-string": "2020-02-04.1", + "port-version": 0 + }, + { + "git-tree": "b3247368a3dd68037fa1f77de94e14e234cf16aa", + "version-string": "2020-01-22", + "port-version": 0 + }, + { + "git-tree": "27141636977218c8c9e394370759e07e001c9503", + "version-string": "2019-11-27.1", + "port-version": 0 + }, + { + "git-tree": "413299817381e00342581ecd2ad6badb98b4546c", + "version-string": "2019-10-07.2", + "port-version": 0 + }, + { + "git-tree": "043b06d9b9c58987c224353e26f03b208f5a7eed", + "version-string": "2019-07-01-LTS-1", + "port-version": 0 + }, + { + "git-tree": "76d07d1bbf56cb4c3c9ccc57cc95cc0f4a82cd2f", + "version-string": "2019-10-07.1", + "port-version": 0 + }, + { + "git-tree": "4dab55f47de9332734363419362ba25949921308", + "version-string": "2019-08-20.1", + "port-version": 0 + }, + { + "git-tree": "dea5476a79d9d42c9ea126d914d3c7f73aa1c173", + "version-string": "2019-05-16.1", + "port-version": 0 + }, + { + "git-tree": "8c524063e559683d4e74003302b2548dfbc3a157", + "version-string": "2019-05-16", + "port-version": 0 + }, + { + "git-tree": "99d6f1960217643a28d932f7c4c3e32e60b9f4cb", + "version-string": "2019-04-11-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/unicorn-lib.json b/externals/vcpkg/versions/u-/unicorn-lib.json new file mode 100755 index 000000000..db2bc9f78 --- /dev/null +++ b/externals/vcpkg/versions/u-/unicorn-lib.json @@ -0,0 +1,144 @@ +{ + "versions": [ + { + "git-tree": "278115c391839dcfc66ac80339c8dcd9a660c9e0", + "version-date": "2022-01-24", + "port-version": 0 + }, + { + "git-tree": "e88ab2927a310295171887057ac0f6cc6502a8d5", + "version-date": "2020-03-02", + "port-version": 2 + }, + { + "git-tree": "a79eb0ae5746d8c2c2ebbd68557baf5975193ac8", + "version-string": "2020-03-02", + "port-version": 1 + }, + { + "git-tree": "f011cbffdfdd9b295141b51bb3da0a40af0d3848", + "version-string": "2020-03-02", + "port-version": 0 + }, + { + "git-tree": "99b5a76cb6656c322be61438bd3fb568b93c0662", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "4313216ef3c4e82e1b2583643107c78cec2697f9", + "version-string": "2019-05-07-1", + "port-version": 0 + }, + { + "git-tree": "b36a4797d7f9c7e11b2636c76ad4b9d50abff0cb", + "version-string": "2019-05-07", + "port-version": 0 + }, + { + "git-tree": "63c249cf6334b886da805ac9966cc23279df6372", + "version-string": "2019-04-19", + "port-version": 0 + }, + { + "git-tree": "c536466afc253d5ea2f70d364d81fa6368c8ec2c", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "8107f600cafb184e039c89bd7dd123d4f3c2a7eb", + "version-string": "2019-01-30", + "port-version": 0 + }, + { + "git-tree": "902cd4216e687393979d541731e7ad8ea85b3453", + "version-string": "2019-01-09", + "port-version": 0 + }, + { + "git-tree": "acbdb8ce191b20574f01f380130a9c348cbdab61", + "version-string": "2018-12-14", + "port-version": 0 + }, + { + "git-tree": "71f1531ca89563a3ce39b78dbba5c3b156ea5d3c", + "version-string": "2018-10-25", + "port-version": 0 + }, + { + "git-tree": "fa02ffbeae1a2f9746b5096a3c796a9a9c2022e4", + "version-string": "2018-10-11", + "port-version": 0 + }, + { + "git-tree": "badf12d70902be7bb79d1501b1e32ccb15d6e75c", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "a86865469457e64c2278b043b5d0f890738470ee", + "version-string": "2018-08-03", + "port-version": 0 + }, + { + "git-tree": "f8417eb840797542d3a8652cb6bac33b1d80874e", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "2e7f0f543fe8bae291a3d6c7a4a3cc06dcb7f5db", + "version-string": "2018-07-08", + "port-version": 0 + }, + { + "git-tree": "d4d1c350a20ca7486330194e6c657c7846f115cc", + "version-string": "2018-07-03", + "port-version": 0 + }, + { + "git-tree": "9e775a827003998ee6c9286a071ad1315c288208", + "version-string": "2018-07-01", + "port-version": 0 + }, + { + "git-tree": "590d714833176916ec22a27db7c17c6a17d55d7c", + "version-string": "2018-06-15-1", + "port-version": 0 + }, + { + "git-tree": "55199f2938f2a6c3743c51c02533b4d7cecb3c8f", + "version-string": "2018-06-15", + "port-version": 0 + }, + { + "git-tree": "9c00100d7434bed2cb71d2ada632e0bb75c4c2ef", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "ec220eed95b8834c476f35a600c44b6f121e96cb", + "version-string": "2018-05-01", + "port-version": 0 + }, + { + "git-tree": "e0bfe76472c0fe9bce01b6e0742ca5dcaf5e753a", + "version-string": "2018-04-09", + "port-version": 0 + }, + { + "git-tree": "30afb55857df84fd893baa83129fccbaa0ae4744", + "version-string": "2018-03-13", + "port-version": 0 + }, + { + "git-tree": "4bca78ae2cceb310fa3154f57b3979b99c5415c9", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "a5a1e277eed7550c648b086df2dbc9b0648793bb", + "version-string": "commit-3ffa7fe69a1d0c37fb52a4af61380c5fd84fa5aa", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/unicorn.json b/externals/vcpkg/versions/u-/unicorn.json new file mode 100755 index 000000000..3ff8b2895 --- /dev/null +++ b/externals/vcpkg/versions/u-/unicorn.json @@ -0,0 +1,119 @@ +{ + "versions": [ + { + "git-tree": "ec4ae5e99d2204a11e112c2f1a596ac2d4f5f2f9", + "version": "1.0.3", + "port-version": 0 + }, + { + "git-tree": "78e0a5d0840a6e2ae29d4922f34c858b821ab377", + "version-date": "2020-09-14", + "port-version": 2 + }, + { + "git-tree": "5126bae583b1f4d7d512b4bc06d799da0cd664be", + "version-string": "2020-09-14", + "port-version": 1 + }, + { + "git-tree": "c7f12f98aceb87089db977ee201850fef601bc64", + "version-string": "2020-09-14", + "port-version": 0 + }, + { + "git-tree": "31a907864df76e8932f426716a80ff724b54105a", + "version-string": "2019-07-11", + "port-version": 0 + }, + { + "git-tree": "4720065ce96f98f710dcbacab77132b91fca2e4f", + "version-string": "2019-04-19", + "port-version": 0 + }, + { + "git-tree": "04f55544280b5c863e4d7be28cc897513d881040", + "version-string": "2019-03-29", + "port-version": 0 + }, + { + "git-tree": "35c254963e255eadbdb7fb7f56e4d5800ed8a42f", + "version-string": "2019-01-30", + "port-version": 0 + }, + { + "git-tree": "5911bd529b3fcf0b111c0f0295f858ea158cd06b", + "version-string": "2019-01-09", + "port-version": 0 + }, + { + "git-tree": "2722a4a810ff8a728e33a012d75f89dd0e1e4fa0", + "version-string": "2018-12-14", + "port-version": 0 + }, + { + "git-tree": "cc4ae6b44e08595fd9f6435de8b7477042da87b6", + "version-string": "2018-10-25", + "port-version": 0 + }, + { + "git-tree": "8edb59c4ad41d0589025ad5361eceb0b0ccd489b", + "version-string": "2018-10-11", + "port-version": 0 + }, + { + "git-tree": "a4bf9d56075e78b77a63e240bdde4532a3c11384", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "cba285e2d625219dfb27417fd6bae6f800cf9361", + "version-string": "2018-08-03", + "port-version": 0 + }, + { + "git-tree": "99d2393d278d2d7dbf30afc201d7402c77e9b41a", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "197deb6b4b77ca75ff0a5559706521e70c6e1070", + "version-string": "2018-07-08", + "port-version": 0 + }, + { + "git-tree": "a8e3ebf866df1a75abe50e258c718db619c13fdb", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "2cc04604e40dbf7ba45931b94270a4f691e4067b", + "version-string": "2018-04-25", + "port-version": 0 + }, + { + "git-tree": "c0b2c5feb3edaecca5d4e40483cdd0382b2c127c", + "version-string": "2018-03-20", + "port-version": 0 + }, + { + "git-tree": "978314718a46c525617e4eeb603ebc96980dc9ce", + "version-string": "2018-03-13", + "port-version": 0 + }, + { + "git-tree": "613750b60244da7e9d82ca52c5be5f3913f1fb4f", + "version-string": "2018-02-25", + "port-version": 0 + }, + { + "git-tree": "cd4f8b1da7af37253ccb7b0e734daeac6a2671cf", + "version-string": "2017-12-06-bc34c36eaeca0f4fc672015d24ce3efbcc81d6e4-1", + "port-version": 0 + }, + { + "git-tree": "00b865d068d2c07d961d79091f616c21def5c7a6", + "version-string": "2017-12-06-bc34c36eaeca0f4fc672015d24ce3efbcc81d6e4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/units.json b/externals/vcpkg/versions/u-/units.json new file mode 100755 index 000000000..9b8d38b2d --- /dev/null +++ b/externals/vcpkg/versions/u-/units.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "4b254a4139e2d70522a90a640601abdd97cdbce3", + "version-string": "2.3.1", + "port-version": 1 + }, + { + "git-tree": "2db2d9f6afa63b919c6112b56d39b4609370fa4e", + "version-string": "2.3.1", + "port-version": 0 + }, + { + "git-tree": "68e4b015ee77987c65b8910ba99a7e0f7743834f", + "version-string": "2.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/unittest-cpp.json b/externals/vcpkg/versions/u-/unittest-cpp.json new file mode 100755 index 000000000..7bbc55419 --- /dev/null +++ b/externals/vcpkg/versions/u-/unittest-cpp.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "454c93c4ef93d7661b8bf6743996167f921b687f", + "version-semver": "2.0.0", + "port-version": 3 + }, + { + "git-tree": "22f6d4e1405162f02c4d25e742fcf0dcc0503146", + "version-semver": "2.0.0", + "port-version": 2 + }, + { + "git-tree": "3ba07fcecec6bf9298a04b064411601043d98bd7", + "version-string": "2.0.0-1", + "port-version": 0 + }, + { + "git-tree": "62ec45caeac82376e4c17f5dc26203ee200dcf5b", + "version-string": "2.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/unixodbc.json b/externals/vcpkg/versions/u-/unixodbc.json new file mode 100755 index 000000000..394daa07c --- /dev/null +++ b/externals/vcpkg/versions/u-/unixodbc.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "d5bf2c65c912060aaebaba66eb6ce1544d6dd7e6", + "version": "2.3.11", + "port-version": 1 + }, + { + "git-tree": "3042b55f1c0ecd0d27336b24754a6f5f3a746c03", + "version": "2.3.11", + "port-version": 0 + }, + { + "git-tree": "68ea55f1c4679d7585ab6482d1641bfb6b106b23", + "version": "2.3.9", + "port-version": 1 + }, + { + "git-tree": "7576aa3f19845c2388e7786118082d4cfa9efb49", + "version": "2.3.9", + "port-version": 0 + }, + { + "git-tree": "d18b08c03d4a7b07f4bbbed662baac83955af86c", + "version-string": "2.3.7", + "port-version": 4 + }, + { + "git-tree": "c08774000aaa495036e36835e7a473251718d82d", + "version-string": "2.3.7", + "port-version": 3 + }, + { + "git-tree": "10efe80ac302d39b15d3e8bd3755ff0386e413f6", + "version-string": "2.3.7", + "port-version": 2 + }, + { + "git-tree": "b1b94bd8dac657022fb207c178bf2dfe9f4ed142", + "version-string": "2.3.7-1", + "port-version": 0 + }, + { + "git-tree": "b1a93ce9bd8db0445efd70df850284fdffc8eab1", + "version-string": "2.3.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/unqlite.json b/externals/vcpkg/versions/u-/unqlite.json new file mode 100755 index 000000000..fd9a76687 --- /dev/null +++ b/externals/vcpkg/versions/u-/unqlite.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b038e5ea1a126a574fa130e8b533ca3d91fe9be8", + "version-string": "1.1.9", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/unrar.json b/externals/vcpkg/versions/u-/unrar.json new file mode 100755 index 000000000..0aa96d38a --- /dev/null +++ b/externals/vcpkg/versions/u-/unrar.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "d2ade299ed837817b3d02522f990af3a64cb938b", + "version": "5.8.1", + "port-version": 3 + }, + { + "git-tree": "4d39c9643a67338a3252672f3c5910891c6a87cd", + "version": "5.8.1", + "port-version": 2 + }, + { + "git-tree": "31f7c1900da6148793b6b10c1b7be7b5e80d4172", + "version-string": "5.8.1", + "port-version": 1 + }, + { + "git-tree": "30b1a0167a19316d64249e79132098e02a8a4d3f", + "version-string": "5.8.1", + "port-version": 0 + }, + { + "git-tree": "09938307e07a99e000a97043d642ac0e5b474379", + "version-string": "5.5.8-3", + "port-version": 0 + }, + { + "git-tree": "cd368ad57e441a0f52e37141f9264c276ea10da2", + "version-string": "5.5.8-2", + "port-version": 0 + }, + { + "git-tree": "144bf8e9b8aa66775cbd660489dc3fa7b677536c", + "version-string": "5.5.8-1", + "port-version": 0 + }, + { + "git-tree": "7220d8fd974a4da131d8b028a1bf6fc94b206c7c", + "version-string": "5.5.8", + "port-version": 0 + }, + { + "git-tree": "e6ea834b2c450f0df212a6b3ff7b830958a0dc05", + "version-string": "5.5.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/upb.json b/externals/vcpkg/versions/u-/upb.json new file mode 100755 index 000000000..50641b629 --- /dev/null +++ b/externals/vcpkg/versions/u-/upb.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "7c61b435b6136ae6539c3991b9f6b81bfd6811dc", + "version-date": "2021-10-19", + "port-version": 0 + }, + { + "git-tree": "df35bcef11c276d5cc7280edeca76eeff3dad223", + "version-date": "2020-12-19", + "port-version": 1 + }, + { + "git-tree": "8c7a75bb8754caa918eddfd0e6f9457834e81f64", + "version-date": "2020-12-19", + "port-version": 0 + }, + { + "git-tree": "f62deabc33313987277b9c9b6fec1498d87f9164", + "version-string": "2020-08-19", + "port-version": 0 + }, + { + "git-tree": "fd13a503a4514b6e1d7b8d130346a4d85c3a2bbe", + "version-string": "2019-10-21-2", + "port-version": 0 + }, + { + "git-tree": "099be2dabf498c93d8b84781d2edc7a681134460", + "version-string": "2019-10-21-1", + "port-version": 0 + }, + { + "git-tree": "7b5e3926c6987d30a92a8feea782a03e2ca69540", + "version-string": "2019-10-21", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/urdfdom-headers.json b/externals/vcpkg/versions/u-/urdfdom-headers.json new file mode 100755 index 000000000..149af41f3 --- /dev/null +++ b/externals/vcpkg/versions/u-/urdfdom-headers.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "557188bd804b7c57c882f39710ca21deb1b91db5", + "version-string": "1.0.5", + "port-version": 2 + }, + { + "git-tree": "5dd339affc1eeaab090a5052621566424cee912e", + "version-string": "1.0.5", + "port-version": 1 + }, + { + "git-tree": "1e778111ef229d80dbff478b4807b5cfdf273a19", + "version-string": "1.0.5", + "port-version": 0 + }, + { + "git-tree": "c32a3e45b98f2a90770bd907152b061f50c76cda", + "version-string": "1.0.4-1", + "port-version": 0 + }, + { + "git-tree": "4830c030ecb6400e15e07d3c78b6b84143a201cb", + "version-string": "1.0.4", + "port-version": 0 + }, + { + "git-tree": "1a3d49fb253e7fe125764d8f668c2ead9632f15a", + "version-string": "1.0.3", + "port-version": 0 + }, + { + "git-tree": "409aae792651465f223a827e5afc443227f90708", + "version-string": "1.0.2", + "port-version": 0 + }, + { + "git-tree": "1ec61fa534279a9903753795626c76422ab5b685", + "version-string": "1.0.0-2", + "port-version": 0 + }, + { + "git-tree": "f4ac1d1d403f9e9a16ed7721bfa583edde47eb89", + "version-string": "1.0.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/urdfdom.json b/externals/vcpkg/versions/u-/urdfdom.json new file mode 100755 index 000000000..8c71cc56c --- /dev/null +++ b/externals/vcpkg/versions/u-/urdfdom.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "a74450532028f2079b8ea0b20bb82ded93e951d6", + "version": "1.0.4", + "port-version": 5 + }, + { + "git-tree": "1022fc5895356fb9cd1c37767cf2397e4edfd415", + "version-string": "1.0.4", + "port-version": 4 + }, + { + "git-tree": "c8509aadcb49f4193730203193f79f32d4176400", + "version-string": "1.0.4", + "port-version": 3 + }, + { + "git-tree": "31ee31e52dcb55cdb49ed1d1c19f9f7f270a7254", + "version-string": "1.0.4", + "port-version": 2 + }, + { + "git-tree": "d42a81b1878307be5db68396998302640cdc83a4", + "version-string": "1.0.4-1", + "port-version": 0 + }, + { + "git-tree": "5fe19f849e38fa140a56ea0f8df1cd9929be7701", + "version-string": "1.0.4", + "port-version": 0 + }, + { + "git-tree": "49530dffb2f4a5fdc0dd18d68e4f794d933200dc", + "version-string": "1.0.3-2", + "port-version": 0 + }, + { + "git-tree": "d597bd0264bf4fda4412787ad874b3fbf2d18b71", + "version-string": "1.0.3-1", + "port-version": 0 + }, + { + "git-tree": "8c5c5f6c4c4dea770456c640416a21772700736b", + "version-string": "1.0.3", + "port-version": 0 + }, + { + "git-tree": "b9a7c0503e330b910154b25f3b292f12f2cf9e1c", + "version-string": "1.0.0-3", + "port-version": 0 + }, + { + "git-tree": "234a1dc439db09b6c7aa432826b856cc4a80bbea", + "version-string": "1.0.0-2", + "port-version": 0 + }, + { + "git-tree": "3b307ece0038babee7ae7f57863ece85e0a2efc4", + "version-string": "1.0.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/urho3d.json b/externals/vcpkg/versions/u-/urho3d.json new file mode 100755 index 000000000..894984ca8 --- /dev/null +++ b/externals/vcpkg/versions/u-/urho3d.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "0d6c7a328006bca59755eec70c09a83fe9b1a087", + "version-date": "2021-03-01", + "port-version": 2 + }, + { + "git-tree": "a31df110bd09d7f49eec0cc5e7f19799ab83564a", + "version-date": "2021-03-01", + "port-version": 1 + }, + { + "git-tree": "1f456f57b63fe4e73605d2b2b5827aa4db385438", + "version-date": "2021-03-01", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/uriparser.json b/externals/vcpkg/versions/u-/uriparser.json new file mode 100755 index 000000000..a943063fd --- /dev/null +++ b/externals/vcpkg/versions/u-/uriparser.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "9f9aef4f8260430170711fecac6c383bb259f034", + "version": "0.9.6", + "port-version": 0 + }, + { + "git-tree": "6e6605cac24d7d9cc91af51a7ea3b1da2adde159", + "version-semver": "0.9.5", + "port-version": 1 + }, + { + "git-tree": "cdf383916004ac2ef910b4ea82632d8474763956", + "version-semver": "0.9.5", + "port-version": 0 + }, + { + "git-tree": "85975d0874cda87d367d337f4c7dddf8e7f37bce", + "version-string": "0.9.4", + "port-version": 0 + }, + { + "git-tree": "32d9c6931155cfe07e608e1a4efaa0608cf553ca", + "version-string": "0.9.3-5", + "port-version": 0 + }, + { + "git-tree": "994b2799ead42490e0863a2d69274e96c6970d2b", + "version-string": "0.9.3-4", + "port-version": 0 + }, + { + "git-tree": "10533ff2c23565ca43f3c92d91ffcebdbb30743f", + "version-string": "0.9.2-1", + "port-version": 0 + }, + { + "git-tree": "4c7f7e0dd4e0c31d2127605824bc901591d9c755", + "version-string": "0.9.2", + "port-version": 0 + }, + { + "git-tree": "a1dbc774ea20d9de8d0eebd05d046e243e2a6599", + "version-string": "0.9.1", + "port-version": 0 + }, + { + "git-tree": "18e86afd3b031421df6ff85789182484a24d4dcd", + "version-string": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "675c6f8de89f716b45d1b9717ca2f113dfbea11b", + "version-string": "0.8.6", + "port-version": 0 + }, + { + "git-tree": "ccc14a03828e2a44e051ce755636ec38dffe36a1", + "version-string": "0.8.5", + "port-version": 0 + }, + { + "git-tree": "f57d2556ce70b0c42fb19f029c18074bb477e364", + "version-string": "0.8.4-1", + "port-version": 0 + }, + { + "git-tree": "b43a8e9dc8bf76654f9674feb75ab0b4d80bb1fc", + "version-string": "0.8.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/usbmuxd.json b/externals/vcpkg/versions/u-/usbmuxd.json new file mode 100755 index 000000000..04dc3433b --- /dev/null +++ b/externals/vcpkg/versions/u-/usbmuxd.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "072dd356dfeda50c73780a204db5f5f6224cd35c", + "version-string": "1.2.235", + "port-version": 1 + }, + { + "git-tree": "d48f5f4611e4a59ccafc8c4dbb9ec1db1344994c", + "version-string": "1.2.235", + "port-version": 0 + }, + { + "git-tree": "b2b448b3015c6f16e719e82b58b9688b9bdc1529", + "version-string": "1.2.76-1", + "port-version": 0 + }, + { + "git-tree": "161f454b21df94db56abf4e7c768e190ebc25c69", + "version-string": "1.2.76", + "port-version": 0 + }, + { + "git-tree": "9c64faa8028f7a93c5b2afb4f163172a1c6a84d0", + "version-string": "1.1.1.133-3", + "port-version": 0 + }, + { + "git-tree": "3944c4682d2ef1fa94208423b5ea1930104c62c7", + "version-string": "1.1.1.133-2", + "port-version": 0 + }, + { + "git-tree": "270968b945e6c6e7b7fefe1aab69de72c382314a", + "version-string": "1.1.1.133-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/usd.json b/externals/vcpkg/versions/u-/usd.json new file mode 100755 index 000000000..f32c455a8 --- /dev/null +++ b/externals/vcpkg/versions/u-/usd.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "177f2af7397316cc1fa92a72ea8992f6acca8dfb", + "version-string": "20.08", + "port-version": 2 + }, + { + "git-tree": "44bef511fe3c249b1579ab696b8bd7e82147b788", + "version-string": "20.08", + "port-version": 1 + }, + { + "git-tree": "31c9d55a54024d0bc130a9f8547d1c64d4a3aed4", + "version-string": "20.08", + "port-version": 0 + }, + { + "git-tree": "d0333a8dfc5842771b29038bd329b7d739b78cf0", + "version-string": "20.02-1", + "port-version": 0 + }, + { + "git-tree": "b06a9070475f30356cf7c8a428d3a7e94f2f64b7", + "version-string": "20.02", + "port-version": 0 + }, + { + "git-tree": "066df97d046736bf9a67838771d29f9e4941a3e2", + "version-string": "0.8.4-2", + "port-version": 0 + }, + { + "git-tree": "1561cdb122277a64391d434a0e4ba2d4a8fbfb0c", + "version-string": "0.8.4-1", + "port-version": 0 + }, + { + "git-tree": "e70b57bd851013def127438095532163283dd9bf", + "version-string": "0.8.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/usockets.json b/externals/vcpkg/versions/u-/usockets.json new file mode 100755 index 000000000..efac4caed --- /dev/null +++ b/externals/vcpkg/versions/u-/usockets.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "de62ce303388342f83a490f69bdb92ec41ecc0f2", + "version": "0.8.1", + "port-version": 0 + }, + { + "git-tree": "ec6a7f57141a0df8d899f38374682a87f381d1ed", + "version": "0.7.1", + "port-version": 0 + }, + { + "git-tree": "5975b2b9c3d03c5a2d02cf19eaa35e5370e7ebad", + "version-string": "2021-1-19", + "port-version": 0 + }, + { + "git-tree": "2234660f66ba0960924aebfc3be037cf22e9e222", + "version-string": "0.6.0", + "port-version": 1 + }, + { + "git-tree": "fc6c3af3946135134def8a0214cb6c11f4971c14", + "version-string": "0.6.0", + "port-version": 0 + }, + { + "git-tree": "bd03cde2afb4229fd57e9fc6177faced3a33c0d7", + "version-string": "0.3.5-1", + "port-version": 0 + }, + { + "git-tree": "63f88c5f7f8dd4cb31a49886ea8090697fb96fa7", + "version-string": "0.3.5", + "port-version": 0 + }, + { + "git-tree": "15645d45b602253ba4c5c4a30a906618762c9fb5", + "version-string": "0.3.4", + "port-version": 0 + }, + { + "git-tree": "a5184d00dc9f80b6756927ec40d36f7788b184e5", + "version-string": "0.3.1", + "port-version": 0 + }, + { + "git-tree": "9b1a68de4cc3d303cb5014640ebce11de82c2656", + "version-string": "0.1.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/usrsctp.json b/externals/vcpkg/versions/u-/usrsctp.json new file mode 100755 index 000000000..44c86c944 --- /dev/null +++ b/externals/vcpkg/versions/u-/usrsctp.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "fcf79007e70c0b2872453841199dae68e7ac01fa", + "version": "0.9.5.0", + "port-version": 1 + }, + { + "git-tree": "f2af7adab77a27695756a783a27f5c602ded9082", + "version": "0.9.5.0", + "port-version": 0 + }, + { + "git-tree": "fd25f487883b7ccbba50c32203eb96c18cd9338f", + "version-string": "0db9691", + "port-version": 1 + }, + { + "git-tree": "a2a0f34f91d797a31af55376db7524f3aed863dc", + "version-string": "0db9691", + "port-version": 0 + }, + { + "git-tree": "6538abf90af559609a691084fa9511d8a5ffd7c8", + "version-string": "35c1d97020a-2", + "port-version": 0 + }, + { + "git-tree": "87b02ee3b63e6dcdf1f54488b3fc71b4783de64b", + "version-string": "35c1d97020a", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/utf8h.json b/externals/vcpkg/versions/u-/utf8h.json new file mode 100755 index 000000000..9963adfbe --- /dev/null +++ b/externals/vcpkg/versions/u-/utf8h.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "f26a3cff10653923f791bc424e4ed1839c33a9ad", + "version-date": "2021-11-18", + "port-version": 0 + }, + { + "git-tree": "e54d88f6fff213e5e7ab15eefffc3e2674f1da63", + "version-date": "2021-10-21", + "port-version": 0 + }, + { + "git-tree": "9cb92a16c8bbfc76bc505b90f55d116ea789c49e", + "version-string": "2020-06-14", + "port-version": 1 + }, + { + "git-tree": "721728b5f4b4695d5cec09fc53b59d4f879142a9", + "version-string": "2020-06-14", + "port-version": 0 + }, + { + "git-tree": "b55bd1bf86330d4edad00a9e0d7948d76001662a", + "version-string": "841cb2deb8eb806e73fff0e1f43a11fca4f5da45", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/utf8proc.json b/externals/vcpkg/versions/u-/utf8proc.json new file mode 100755 index 000000000..9ed149810 --- /dev/null +++ b/externals/vcpkg/versions/u-/utf8proc.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "e50e6a4b5de0d3eab7fe13920d1358b83230fd36", + "version": "2.7.0", + "port-version": 0 + }, + { + "git-tree": "659423c8c76de9194980ba25a2755bde258ed173", + "version": "2.6.1", + "port-version": 0 + }, + { + "git-tree": "2b0e7ac6367f7dbe8fc0e6fea7d0ad81cbbedba6", + "version-string": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "e8c336658d5284ea88431618fae16a657a648ca5", + "version-string": "2.4.0-1", + "port-version": 0 + }, + { + "git-tree": "108dfa954a0c81224fcab22b3d59c37ff366b746", + "version-string": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "60222749d54910e32e55111480e0b1555b812704", + "version-string": "2.1.0-1", + "port-version": 0 + }, + { + "git-tree": "8c22e89cbf969cc313fc307c26bd771ba63fb3e5", + "version-string": "2.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/utfcpp.json b/externals/vcpkg/versions/u-/utfcpp.json new file mode 100755 index 000000000..dc7b6b2ef --- /dev/null +++ b/externals/vcpkg/versions/u-/utfcpp.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "27a1e587de353ed0d9559d5e4627ed2811960c07", + "version": "3.2.1", + "port-version": 0 + }, + { + "git-tree": "1af9d7ac0523916f6119657b78719d84939215d5", + "version-string": "3.1.2", + "port-version": 1 + }, + { + "git-tree": "97ac42955403db1c459a0eba774f42a21ae36500", + "version-string": "3.1.2", + "port-version": 0 + }, + { + "git-tree": "fc1f86ceffb5c9a19505f94bc569aa36c175c34e", + "version-string": "3.1.1", + "port-version": 0 + }, + { + "git-tree": "caf151f807fb0cb80fb32019a2f1eaad1aa14aa2", + "version-string": "3.1", + "port-version": 0 + }, + { + "git-tree": "1ff975d308df8582ad3762e4f9fe29a34c4a36da", + "version-string": "2.3.5-1", + "port-version": 0 + }, + { + "git-tree": "bc1bee3ff65568ba53b00710610c8b919d0b709f", + "version-string": "2.3.5", + "port-version": 0 + }, + { + "git-tree": "82f0769018f869b64f477ba570da87f82f07567a", + "version-string": "2.3.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/utfz.json b/externals/vcpkg/versions/u-/utfz.json new file mode 100755 index 000000000..db788b6ca --- /dev/null +++ b/externals/vcpkg/versions/u-/utfz.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "2897d5bfecd8b5fad871a476cfba4c24f45144cd", + "version-string": "1.2", + "port-version": 2 + }, + { + "git-tree": "b1c36a09a7ddb7b39b5136e2c2be1dc7974bea1a", + "version-string": "1.2-1", + "port-version": 0 + }, + { + "git-tree": "ea0fd5fe0538d3752557ed44ad7c5c1f42dd0bed", + "version-string": "1.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/uthash.json b/externals/vcpkg/versions/u-/uthash.json new file mode 100755 index 000000000..c3e86b129 --- /dev/null +++ b/externals/vcpkg/versions/u-/uthash.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "031c9a8367a7683fb4cd9b022ebcf504a53a0bfd", + "version-semver": "2.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/uthenticode.json b/externals/vcpkg/versions/u-/uthenticode.json new file mode 100755 index 000000000..f33c0b6cf --- /dev/null +++ b/externals/vcpkg/versions/u-/uthenticode.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "673c5ea6d0982481405bbe54c1e993f696d29d23", + "version": "1.0.6", + "port-version": 2 + }, + { + "git-tree": "bc0bd0b234a79de442f7001bd1a216716333e067", + "version": "1.0.6", + "port-version": 1 + }, + { + "git-tree": "bd27c0f342a4c62251b30f323be232c86bc999af", + "version-string": "1.0.6", + "port-version": 0 + }, + { + "git-tree": "8c815664232505dde8a5dd299d4ad562f47b7d43", + "version-string": "1.0.4", + "port-version": 1 + }, + { + "git-tree": "be0c3da6f7d93aa3a5252b03adc09ffa8105eaf8", + "version-string": "1.0.4", + "port-version": 0 + }, + { + "git-tree": "bd7038ef6ae3b827eb29153032a1cd5f421ef946", + "version-string": "1.0.3", + "port-version": 0 + }, + { + "git-tree": "3f802914f39e2a9bf0fa62dfb2c40016ae7b24da", + "version-string": "1.0.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/uvatlas.json b/externals/vcpkg/versions/u-/uvatlas.json new file mode 100755 index 000000000..cfeb42373 --- /dev/null +++ b/externals/vcpkg/versions/u-/uvatlas.json @@ -0,0 +1,94 @@ +{ + "versions": [ + { + "git-tree": "2ac8444f59bd76ba38a620d4e0fe1a6a64969873", + "version-date": "2022-05-09", + "port-version": 0 + }, + { + "git-tree": "100ee1b04f5da317153da9c52eb0c0def30e9b49", + "version-date": "2022-03-24", + "port-version": 0 + }, + { + "git-tree": "fe5522a95b1f9ef72d43c019948fd94055b42410", + "version-date": "2022-02-28", + "port-version": 0 + }, + { + "git-tree": "4f353fc6ad423c0a9d95c7b2d2f6c7a150e43b25", + "version-date": "2021-11-08", + "port-version": 1 + }, + { + "git-tree": "c9e1961e16fefb328333a2f99555a33cdc496356", + "version-date": "2021-11-08", + "port-version": 0 + }, + { + "git-tree": "4ac15c488e3c856748164899355d3d619f4dc810", + "version-string": "nov2021", + "port-version": 0 + }, + { + "git-tree": "aa1c69c4376ea2d6332065397292b386d60984a4", + "version-string": "sept2021", + "port-version": 0 + }, + { + "git-tree": "60f3026412b95786a91eadb5e97483cb9539b8c1", + "version-string": "jun2021b", + "port-version": 0 + }, + { + "git-tree": "24f38b36247b90b011cb96c5b06728fa6b2f1011", + "version-string": "jun2021", + "port-version": 0 + }, + { + "git-tree": "39b1594645ffd005dc96b8201297e02cae54ed93", + "version-string": "apr2021", + "port-version": 0 + }, + { + "git-tree": "7ec0056d64ec3888a78610302a348cb5bf65cd78", + "version-string": "jan2021b", + "port-version": 0 + }, + { + "git-tree": "59eed2711b70ec9a4dfd37c851d7a7810ea83b3e", + "version-string": "jan2021", + "port-version": 0 + }, + { + "git-tree": "dd1382270a525ef33048d64a106c49546562a53d", + "version-string": "dec2020b", + "port-version": 0 + }, + { + "git-tree": "1175583439365ae25392a3e9e4c6da1d3978f2c9", + "version-string": "aug2020", + "port-version": 0 + }, + { + "git-tree": "a1a1a75c096b4910525550c6696b4f738f28bcab", + "version-string": "dec2019", + "port-version": 0 + }, + { + "git-tree": "06224f3faf46d9b003dcfbeb13b7af2e2899454e", + "version-string": "apr2019", + "port-version": 0 + }, + { + "git-tree": "c60a8bc0a57c9a43f5c39724b46fcae285b83200", + "version-string": "sept2016-1", + "port-version": 0 + }, + { + "git-tree": "5fb184c6516b1101c2dd4f782092efb52e438fd4", + "version-string": "sept2016", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/uvw.json b/externals/vcpkg/versions/u-/uvw.json new file mode 100755 index 000000000..4d3cc82eb --- /dev/null +++ b/externals/vcpkg/versions/u-/uvw.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "eac81a2d74241ded58a1c503d91f226f86ca09c6", + "version": "2.12.1", + "port-version": 0 + }, + { + "git-tree": "fc9230cd12ff7d556e700053798f20e07283954d", + "version-string": "2.7.0", + "port-version": 1 + }, + { + "git-tree": "b41eff8a3d196467693d35957280cad3be6a7f4b", + "version-string": "2.7.0", + "port-version": 0 + }, + { + "git-tree": "83f140fc0183ab8a09b588d9ac3772e65abdb5ca", + "version-string": "2.3.1", + "port-version": 0 + }, + { + "git-tree": "e425bc596d3b5863436c698b2d40fa293e1d2e68", + "version-string": "1.18.0", + "port-version": 0 + }, + { + "git-tree": "3f47107a2a703b67df631f50ed54fa12ffc755cc", + "version-string": "1.17.0_libuv-v1.29-1", + "port-version": 0 + }, + { + "git-tree": "e8da0f3cd9024396f4b5ce44a67e2f09ebc16b2e", + "version-string": "1.17.0_libuv-v1.29", + "port-version": 0 + }, + { + "git-tree": "66a436732bb4280ad5933b6343ef43f7203dd946", + "version-string": "1.15.0", + "port-version": 0 + }, + { + "git-tree": "ef9a1c6f4bac4f2743e75e632f3f8cc5b47f5bd2", + "version-string": "1.11.3", + "port-version": 0 + }, + { + "git-tree": "29ac18a5b517fcf9646244a995acae6cf3d3ba04", + "version-string": "1.11.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/u-/uwebsockets.json b/externals/vcpkg/versions/u-/uwebsockets.json new file mode 100755 index 000000000..ce1397846 --- /dev/null +++ b/externals/vcpkg/versions/u-/uwebsockets.json @@ -0,0 +1,164 @@ +{ + "versions": [ + { + "git-tree": "5b1e062e56cf8ea0bdfe07414a11791e62c964fe", + "version-semver": "20.11.0", + "port-version": 0 + }, + { + "git-tree": "bbc3058932f01e905d7cf4129e55da10496f8374", + "version-semver": "20.9.0", + "port-version": 0 + }, + { + "git-tree": "8a874bc8213f0b0a2e96710cce72f6e7d344ffac", + "version-semver": "20.8.0", + "port-version": 0 + }, + { + "git-tree": "3b0511c1faa806578f8dc21cc3ac881db3f30aae", + "version-semver": "20.6.0", + "port-version": 0 + }, + { + "git-tree": "e66651f28bc4bcd5edb5360e96f42ad666076d6b", + "version-semver": "20.5.0", + "port-version": 0 + }, + { + "git-tree": "3a4914dce094328bc8cf2040025268c96f10fc30", + "version": "19.9.0", + "port-version": 0 + }, + { + "git-tree": "2f80ce22f9718454ab35607c0a65138b65c06fe7", + "version": "19.5.0", + "port-version": 0 + }, + { + "git-tree": "b01131e5a07feb1613415677213d377995bfdc40", + "version": "19.2.0", + "port-version": 0 + }, + { + "git-tree": "14d375b4fa04de7a59640094779695634e19569a", + "version": "19.0.0.5", + "port-version": 0 + }, + { + "git-tree": "6d67d8f414f4789cfa069992488834f5c79fd9e6", + "version": "19.0.0", + "port-version": 0 + }, + { + "git-tree": "ac495f3a5f075ad4d93f1b627095e4dae7a4c517", + "version-string": "18.13.0", + "port-version": 0 + }, + { + "git-tree": "a310a5de44a417623e7afed31bab6e01887cee04", + "version-string": "18.1.0", + "port-version": 0 + }, + { + "git-tree": "dfbf505aa6e0ab7a1b6fcd8d1f906fa3ce5de168", + "version-string": "0.17.2", + "port-version": 0 + }, + { + "git-tree": "31690049a4f739ed00b31b1966af67011bc3577f", + "version-string": "0.17.1", + "port-version": 0 + }, + { + "git-tree": "931935c748775314fdb4f10c2e7f04cfaa387dcf", + "version-string": "0.17.0a4", + "port-version": 0 + }, + { + "git-tree": "0b3cdb75c1acbb69c5aba75f1c21da582895aa01", + "version-string": "0.16.5", + "port-version": 0 + }, + { + "git-tree": "e16889160563f63d0df0be76618401e5f7d95eff", + "version-string": "0.15.7", + "port-version": 0 + }, + { + "git-tree": "e0da883b380e732013d371d31a05e69a9e8050b3", + "version-string": "0.15.6", + "port-version": 0 + }, + { + "git-tree": "06d6722fe506c02c6a5f40bc297a5fcc03af70ac", + "version-string": "0.14.8-2", + "port-version": 0 + }, + { + "git-tree": "c902e3467333ed832fc8a0af842d8b9959a7dca0", + "version-string": "0.14.8-1", + "port-version": 0 + }, + { + "git-tree": "5043ece96c0b36dd5c00c16a5162d557982c4769", + "version-string": "0.14.7-1", + "port-version": 0 + }, + { + "git-tree": "14c0cb3950291eb2f6508ef510bcac8d1933069e", + "version-string": "0.14.6-1", + "port-version": 0 + }, + { + "git-tree": "ab7a6cb5fdbc9cc31fb68004991c760f130189e9", + "version-string": "0.14.5-1", + "port-version": 0 + }, + { + "git-tree": "08ed77b02323f5487eedb3bc602b3ca9b58ff3bd", + "version-string": "0.14.4-1", + "port-version": 0 + }, + { + "git-tree": "8034fc9856c548dccf9720eadf74f57b8ac6f584", + "version-string": "0.14.4", + "port-version": 0 + }, + { + "git-tree": "7d94d32ce3fdb453f81f121d7d6373e4c541d65b", + "version-string": "0.14.3", + "port-version": 0 + }, + { + "git-tree": "cef7419a11e080f05329355c10df27ffb0411eb0", + "version-string": "0.14.2", + "port-version": 0 + }, + { + "git-tree": "2d405891816e761238c01484f80f78df3cfcc34b", + "version-string": "0.14.1", + "port-version": 0 + }, + { + "git-tree": "b795f24351bd58f1a1ab09f5ad7a9659f5d9ca61", + "version-string": "0.14.0alpha5", + "port-version": 0 + }, + { + "git-tree": "b646316f1dd25d839c7bd04899dae5eda60e4eac", + "version-string": "0.13.0-2", + "port-version": 0 + }, + { + "git-tree": "86113ed7669c9b2442ed1edee66c97833c4b185b", + "version-string": "0.13.0-1", + "port-version": 0 + }, + { + "git-tree": "0de1e1df58df0d58ae061f3dc1b50b092d1345bc", + "version-string": "0.12.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/v-hacd.json b/externals/vcpkg/versions/v-/v-hacd.json new file mode 100755 index 000000000..cfe1c12b8 --- /dev/null +++ b/externals/vcpkg/versions/v-/v-hacd.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "c65970db1719a0f4ac77a70859ce0a46a430c54a", + "version": "3.2.0", + "port-version": 3 + }, + { + "git-tree": "fb52b4b2323057dd987225a70627ed40016756ee", + "version-string": "3.2.0", + "port-version": 2 + }, + { + "git-tree": "5a11f826da2ca5189f1b29e90299569e2ca94712", + "version-string": "3.2.0", + "port-version": 1 + }, + { + "git-tree": "2d22776410edea5f74d200a49acaead40c597a2b", + "version-string": "3.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/v8.json b/externals/vcpkg/versions/v-/v8.json new file mode 100755 index 000000000..3be97ab88 --- /dev/null +++ b/externals/vcpkg/versions/v-/v8.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "f57ec75cb9169900555359752c65e8e4c79c34ec", + "version": "9.1.269.39", + "port-version": 4 + }, + { + "git-tree": "3abf0953ae7dcf4bb4b4ede21adb27ad850b1e1c", + "version": "9.1.269.39", + "port-version": 3 + }, + { + "git-tree": "b245f57cb85bfd7a699e2ceb9628682b39bcc150", + "version": "9.1.269.39", + "port-version": 2 + }, + { + "git-tree": "d179f8f99ecce385eab497b2850e605976f4d9d5", + "version": "9.1.269.39", + "port-version": 1 + }, + { + "git-tree": "1cd6a72ff77695151205fb2d2e55ed93d2f4193d", + "version-string": "9.1.269.39", + "port-version": 0 + }, + { + "git-tree": "4c95acd67f1f8b99aada4af754b4608c9ee80661", + "version-string": "9.0.257.17", + "port-version": 1 + }, + { + "git-tree": "6c755ec3da82205827403e58b0dbaa1549334a3a", + "version-string": "9.0.257.17", + "port-version": 0 + }, + { + "git-tree": "06594ed228d75261805f473207a1db1757f974fe", + "version-string": "8.6.395.17", + "port-version": 0 + }, + { + "git-tree": "e95b4a567b4ae19b4d206499a0ea57673b789dfa", + "version-string": "8.3.110.13", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/valijson.json b/externals/vcpkg/versions/v-/valijson.json new file mode 100755 index 000000000..e63eb9a9d --- /dev/null +++ b/externals/vcpkg/versions/v-/valijson.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "7edd27211e0ef58ea307fe1fc4f34aea18cb8529", + "version": "0.6", + "port-version": 0 + }, + { + "git-tree": "c40f3039f56bbe5301d45b0bf0430b4852907608", + "version-string": "2018-11-17", + "port-version": 2 + }, + { + "git-tree": "56fb4ee7adbd616e60bc4a24eedd2755f25de001", + "version-string": "2018-11-17-1", + "port-version": 0 + }, + { + "git-tree": "1d49596abb0ed41095b901d5e01b45631190babf", + "version-string": "2018-11-17", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/value-ptr-lite.json b/externals/vcpkg/versions/v-/value-ptr-lite.json new file mode 100755 index 000000000..c4efc83e5 --- /dev/null +++ b/externals/vcpkg/versions/v-/value-ptr-lite.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "69db499989a256cd9ce0397cb16814c6444b4877", + "version-semver": "0.2.1", + "port-version": 1 + }, + { + "git-tree": "c678a31c0e75e1cf5b53dc2f6ed0eecc156d9133", + "version-string": "0.2.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vamp-sdk.json b/externals/vcpkg/versions/v-/vamp-sdk.json new file mode 100755 index 000000000..ab9cdc423 --- /dev/null +++ b/externals/vcpkg/versions/v-/vamp-sdk.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "ac0236fcb60d389d21fe96a9c96c5f21f9e905b0", + "version": "2.10", + "port-version": 3 + }, + { + "git-tree": "9d2b2ab057b4e31d833668e82f95283c7afbc551", + "version": "2.10", + "port-version": 2 + }, + { + "git-tree": "1c71927e1997998f40a9d051d65ba4e5760f4257", + "version": "2.10", + "port-version": 1 + }, + { + "git-tree": "da7ad3424d8266657eec1b28b16a8d389e50b67c", + "version": "2.10", + "port-version": 0 + }, + { + "git-tree": "f98530b4731d88b3ddda90a25ad998076da19425", + "version": "2.9", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/variant-lite.json b/externals/vcpkg/versions/v-/variant-lite.json new file mode 100755 index 000000000..759a3b0f3 --- /dev/null +++ b/externals/vcpkg/versions/v-/variant-lite.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "827279cee8fcc1e2cfc6fd195ebf523cba2917c5", + "version": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "a932d3f3a9d2390536663cefe804b881408cef11", + "version-string": "1.2.2", + "port-version": 1 + }, + { + "git-tree": "6d5d7208789ae75c456134c11e719adf8c2eb5bf", + "version-string": "1.2.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vc.json b/externals/vcpkg/versions/v-/vc.json new file mode 100755 index 000000000..f1232fc14 --- /dev/null +++ b/externals/vcpkg/versions/v-/vc.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "933ac99201b15104edd8037e8bcc7959d36a6d67", + "version": "1.4.3", + "port-version": 0 + }, + { + "git-tree": "98b96fa582424d700421161838544f1daf738467", + "version": "1.4.2", + "port-version": 3 + }, + { + "git-tree": "57204c2b095452a828860a6476b8b997463ee36d", + "version": "1.4.2", + "port-version": 2 + }, + { + "git-tree": "670b9bb5b2fe8a35ac2115b355d87995b1ee85b6", + "version-string": "1.4.2", + "port-version": 1 + }, + { + "git-tree": "510cde85ec14ef88187857247829183c1c275f63", + "version-string": "1.4.2", + "port-version": 0 + }, + { + "git-tree": "1ab229fb781ff549e05917c4ec46a1fcd6bd1a3a", + "version-string": "1.4.1", + "port-version": 1 + }, + { + "git-tree": "62edb04d91a2e37739c935e832dfa75f311089f8", + "version-string": "1.4.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vcglib.json b/externals/vcpkg/versions/v-/vcglib.json new file mode 100755 index 000000000..bab35eab3 --- /dev/null +++ b/externals/vcpkg/versions/v-/vcglib.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "1170b49b3d2980357ba10d68769b0bcfaeda42f7", + "version-string": "2022.02", + "port-version": 0 + }, + { + "git-tree": "4ed58c0ed176662ca418315c77fb0137c2cf7769", + "version-string": "1.0.1", + "port-version": 1 + }, + { + "git-tree": "18b77419728670df6316365979f59919168b9ee2", + "version-string": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vcpkg-cmake-config.json b/externals/vcpkg/versions/v-/vcpkg-cmake-config.json new file mode 100755 index 000000000..a354d8732 --- /dev/null +++ b/externals/vcpkg/versions/v-/vcpkg-cmake-config.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "8d54cc4f487d51b655abec5f9c9c3f86ca83311f", + "version-date": "2022-02-06", + "port-version": 1 + }, + { + "git-tree": "24dc7dfc704406e9f745f033643dc25f56e4ca18", + "version-date": "2022-02-06", + "port-version": 0 + }, + { + "git-tree": "fea8f92ffa5e14c7111fe526f8cc93ecd8f9dbf0", + "version-date": "2022-01-30", + "port-version": 0 + }, + { + "git-tree": "e33152002c946b93a0262931ba8bf54a2e6ab9ad", + "version-date": "2021-12-28", + "port-version": 0 + }, + { + "git-tree": "51df1bbddb22782b9e7f23f9b3588674184e991a", + "version-date": "2021-12-01", + "port-version": 0 + }, + { + "git-tree": "38a87ee8edd9ea8e8fff604fbcb785661a8d0e28", + "version-date": "2021-11-01", + "port-version": 0 + }, + { + "git-tree": "9ae99981abcd01b092344f85ef6e1de3c1f9856a", + "version-date": "2021-09-27", + "port-version": 0 + }, + { + "git-tree": "330cc51bc99c6b71ed5fb51901f6f838684015a5", + "version-date": "2021-05-22", + "port-version": 1 + }, + { + "git-tree": "b3abb12ba8ab43770aea4e5a8d4915319bd295ee", + "version-date": "2021-08-11", + "port-version": 0 + }, + { + "git-tree": "2d4f997a32b8e8bfe98d12beb2bfe6be713c7086", + "version-date": "2021-05-22", + "port-version": 0 + }, + { + "git-tree": "46d60d4dd4297bedecdcd308167ad2492b269183", + "version-date": "2021-02-26", + "port-version": 1 + }, + { + "git-tree": "d255b3d566a8861dcc99a958240463e678528066", + "version-date": "2021-02-26", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vcpkg-cmake-get-vars.json b/externals/vcpkg/versions/v-/vcpkg-cmake-get-vars.json new file mode 100755 index 000000000..362bbdce7 --- /dev/null +++ b/externals/vcpkg/versions/v-/vcpkg-cmake-get-vars.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "b50ca3d20736304215fbd82c102d4552457255bb", + "version-date": "2022-05-10", + "port-version": 1 + }, + { + "git-tree": "181f509cdab757511233106aa44c529e04c0c29f", + "version-date": "2022-05-10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vcpkg-cmake.json b/externals/vcpkg/versions/v-/vcpkg-cmake.json new file mode 100755 index 000000000..4477bc5e8 --- /dev/null +++ b/externals/vcpkg/versions/v-/vcpkg-cmake.json @@ -0,0 +1,114 @@ +{ + "versions": [ + { + "git-tree": "8b07d914c90cf8f611973318c85d3af13201e3f9", + "version-date": "2022-05-10", + "port-version": 1 + }, + { + "git-tree": "e8db2f70aa8b584aac932fcff65d91bf52d57731", + "version-date": "2022-05-10", + "port-version": 0 + }, + { + "git-tree": "46a5686341cf9136053ff01b9f213dbd2dbea8a6", + "version-date": "2022-05-06", + "port-version": 0 + }, + { + "git-tree": "ecfb2282f599a9c1f3a9ad98eac9d2b35690850f", + "version-date": "2022-05-05", + "port-version": 0 + }, + { + "git-tree": "8273918a04a5822ad7cc21ea5249402f2e999a7a", + "version-date": "2022-04-21", + "port-version": 0 + }, + { + "git-tree": "ef4a9463f802c1cd6f8b31e560529aeaee0faff4", + "version-date": "2022-04-12", + "port-version": 0 + }, + { + "git-tree": "3dcb01563c0de941013579456d19ce5b0bd08a6e", + "version-date": "2022-04-07", + "port-version": 0 + }, + { + "git-tree": "34d8604d164edd2903bdb833adf30fe1516c9982", + "version-date": "2022-04-05", + "port-version": 0 + }, + { + "git-tree": "bdfdf28cf28bc07d02af864315ca291dcfae180b", + "version-date": "2022-02-14", + "port-version": 0 + }, + { + "git-tree": "b7c050fe60f91dcedef6d87a3f87584151bf8aee", + "version-date": "2022-01-19", + "port-version": 0 + }, + { + "git-tree": "a35eb7c761372dc64526d59fa918a13c0dfbba1b", + "version-date": "2021-12-20", + "port-version": 0 + }, + { + "git-tree": "462dd9ada82163b8c104cef8c2ad5b5c0bfa5eb8", + "version-date": "2021-12-05", + "port-version": 0 + }, + { + "git-tree": "fc4d9fcc5b8d2b97c083c6b70dd06df5174bd97b", + "version-date": "2021-09-13", + "port-version": 0 + }, + { + "git-tree": "c6df7e0faeda9e783175746c7c440c9bc2bdb111", + "version-date": "2021-07-30", + "port-version": 0 + }, + { + "git-tree": "ae2178d81ee39baf4c7e9fd6ed3f011b01a93635", + "version-date": "2021-07-26", + "port-version": 0 + }, + { + "git-tree": "07c3e68ce9ae8f30bcc0b21def7a528dbb8ecb07", + "version-date": "2021-06-25", + "port-version": 5 + }, + { + "git-tree": "acc25ec22f8fd8887a865705580b1d6de041616d", + "version-date": "2021-06-25", + "port-version": 4 + }, + { + "git-tree": "0e8bb94599a00fd9c61fd0ae524c22a067c21420", + "version-date": "2021-02-28", + "port-version": 3 + }, + { + "git-tree": "02fbd92ab46d1512b22280f1264e4e8f8d076ef4", + "version-date": "2021-02-28", + "port-version": 2 + }, + { + "git-tree": "4abdcc88bd5ec2c76e320eb2ff4db665ee9913ac", + "version-date": "2021-02-28", + "port-version": 1 + }, + { + "git-tree": "b627b47898864ee5a880cea03b4dea64b9d81953", + "version-date": "2021-02-28", + "port-version": 0 + }, + { + "git-tree": "51896aa8073adb5c8450daa423d03eedf0dfc61f", + "version-date": "2021-02-26", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vcpkg-get-python-packages.json b/externals/vcpkg/versions/v-/vcpkg-get-python-packages.json new file mode 100755 index 000000000..31285bc57 --- /dev/null +++ b/externals/vcpkg/versions/v-/vcpkg-get-python-packages.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "ffe13ab59e3e2f4f003498035bc1fbc06b64e164", + "version-date": "2022-04-11", + "port-version": 1 + }, + { + "git-tree": "f03d459d365b604decb720f7da79b3f7d7127670", + "version-date": "2022-04-11", + "port-version": 0 + }, + { + "git-tree": "e429a4c957711115ea1b795327843acb05fc8b29", + "version-date": "2022-02-12", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vcpkg-gfortran.json b/externals/vcpkg/versions/v-/vcpkg-gfortran.json new file mode 100755 index 000000000..73e829664 --- /dev/null +++ b/externals/vcpkg/versions/v-/vcpkg-gfortran.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "5fa617d0b37f47f7f19210be936e25914d6f64c6", + "version": "3", + "port-version": 2 + }, + { + "git-tree": "46d6be1a505fd008358fc3b426a74a0063661f68", + "version-string": "3", + "port-version": 1 + }, + { + "git-tree": "b8fe480cd1e0e1ac8779b8552a1c6a999ec67e39", + "version-string": "3", + "port-version": 0 + }, + { + "git-tree": "038b37d853a6d2e337b46a2f78f2e4efff28a3ec", + "version-string": "1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vcpkg-gn.json b/externals/vcpkg/versions/v-/vcpkg-gn.json new file mode 100755 index 000000000..c4a418c49 --- /dev/null +++ b/externals/vcpkg/versions/v-/vcpkg-gn.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "119e620029e0579165590b4656882bd6c3ce297c", + "version-date": "2021-11-16", + "port-version": 2 + }, + { + "git-tree": "ba02b5d9d66b0e227762e6aeac0851fd8fb4314e", + "version-date": "2021-11-16", + "port-version": 1 + }, + { + "git-tree": "f0ec062fd9ed47e9a00f343e15f185e4201e661b", + "version-date": "2021-11-16", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vcpkg-pkgconfig-get-modules.json b/externals/vcpkg/versions/v-/vcpkg-pkgconfig-get-modules.json new file mode 100755 index 000000000..3bb85c48b --- /dev/null +++ b/externals/vcpkg/versions/v-/vcpkg-pkgconfig-get-modules.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "48bfa748f78837921860329547ed6e5799665698", + "version-date": "2022-02-10", + "port-version": 1 + }, + { + "git-tree": "d4f1fd82fd733b622ed83f5f502b8483e5b2ca3b", + "version-date": "2022-02-10", + "port-version": 0 + }, + { + "git-tree": "1fae7b16a1eb390ca9239c3e82aa0fdb41f9565b", + "version-date": "2022-01-10", + "port-version": 0 + }, + { + "git-tree": "558512de1cc52fd9e246d6e7b99575418dd8500f", + "version-date": "2021-04-02", + "port-version": 1 + }, + { + "git-tree": "827541895526ebcd68711de9d05e98acd09bd323", + "version-date": "2021-04-02", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vcpkg-qmake.json b/externals/vcpkg/versions/v-/vcpkg-qmake.json new file mode 100755 index 000000000..92995e206 --- /dev/null +++ b/externals/vcpkg/versions/v-/vcpkg-qmake.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "546491787b275bfae887457a5eb17a7b502ae891", + "version-date": "2022-05-10", + "port-version": 1 + }, + { + "git-tree": "7f5f5955d901ed2c7caac9e3681d23338d8fe845", + "version-date": "2022-05-10", + "port-version": 0 + }, + { + "git-tree": "5096e32d02b21d8f2546edf3829cbb8ee2d50425", + "version-date": "2022-02-14", + "port-version": 0 + }, + { + "git-tree": "1b1cd1cfcca489897822287c15af473fa4380cb1", + "version-date": "2021-10-23", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vcpkg-tool-gn.json b/externals/vcpkg/versions/v-/vcpkg-tool-gn.json new file mode 100755 index 000000000..cd79c22ef --- /dev/null +++ b/externals/vcpkg/versions/v-/vcpkg-tool-gn.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "811d8c3a4d4489a291c69cde7788c620f950eb9e", + "version-date": "2022-04-16", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vcpkg-tool-gyp-nss.json b/externals/vcpkg/versions/v-/vcpkg-tool-gyp-nss.json new file mode 100755 index 000000000..2c153252c --- /dev/null +++ b/externals/vcpkg/versions/v-/vcpkg-tool-gyp-nss.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "724d29c42ace865fdba94d8c32bdbe987072eaaa", + "version-date": "2022-03-04", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vcpkg-tool-lessmsi.json b/externals/vcpkg/versions/v-/vcpkg-tool-lessmsi.json new file mode 100755 index 000000000..f515fe254 --- /dev/null +++ b/externals/vcpkg/versions/v-/vcpkg-tool-lessmsi.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "82ed573f8102d4ac7c15f40c64bba00968085d51", + "version": "1.10.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vcpkg-tool-meson.json b/externals/vcpkg/versions/v-/vcpkg-tool-meson.json new file mode 100755 index 000000000..54a6ffdee --- /dev/null +++ b/externals/vcpkg/versions/v-/vcpkg-tool-meson.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "e35f24d912749fa1de06cb3cf533028e6f363398", + "version": "0.62.1", + "port-version": 0 + }, + { + "git-tree": "6fe7cf1649af5d90c1e88765411a463cac55e99c", + "version": "0.60.2", + "port-version": 2 + }, + { + "git-tree": "932036adfc24dd5fa63787b825974b6938402700", + "version": "0.60.2", + "port-version": 1 + }, + { + "git-tree": "e6ef15a9dc810b4bde53d9b1e3da3a20107e3983", + "version": "0.60.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vcpkg-tool-mozbuild.json b/externals/vcpkg/versions/v-/vcpkg-tool-mozbuild.json new file mode 100755 index 000000000..16089f35d --- /dev/null +++ b/externals/vcpkg/versions/v-/vcpkg-tool-mozbuild.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9ec0167eafba536f0f5d8a83807f6b3b0dbb50be", + "version": "3.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vcpkg-tool-ninja.json b/externals/vcpkg/versions/v-/vcpkg-tool-ninja.json new file mode 100755 index 000000000..643a736c0 --- /dev/null +++ b/externals/vcpkg/versions/v-/vcpkg-tool-ninja.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0d55ba6e9ede00479127566b8f39fce7034e1b05", + "version-date": "2022-03-31", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vcpkg-tool-nodejs.json b/externals/vcpkg/versions/v-/vcpkg-tool-nodejs.json new file mode 100755 index 000000000..fc5994031 --- /dev/null +++ b/externals/vcpkg/versions/v-/vcpkg-tool-nodejs.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "91407db5ac964382618c11765caafc444e684a19", + "version-semver": "14.17.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vcpkg-tool-python2.json b/externals/vcpkg/versions/v-/vcpkg-tool-python2.json new file mode 100755 index 000000000..466cf26f9 --- /dev/null +++ b/externals/vcpkg/versions/v-/vcpkg-tool-python2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "207c41205cd98688dda41cee13ecec02aae1f5fd", + "version": "2.7.18", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vectorclass.json b/externals/vcpkg/versions/v-/vectorclass.json new file mode 100755 index 000000000..dc472b4a1 --- /dev/null +++ b/externals/vcpkg/versions/v-/vectorclass.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "a1c1b1ca0e0ddb9d5c27129234b2c22c9b73bd16", + "version-string": "2.00.01", + "port-version": 2 + }, + { + "git-tree": "0e6cebabfff6ad5300bf2fd306e48a7a7392abcb", + "version-string": "2.00.01", + "port-version": 1 + }, + { + "git-tree": "7b73ec26a0a35beecf8061f14a53ee961347dd67", + "version-string": "2.00.01", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/visit-struct.json b/externals/vcpkg/versions/v-/visit-struct.json new file mode 100755 index 000000000..2dc72172e --- /dev/null +++ b/externals/vcpkg/versions/v-/visit-struct.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "43d203cd2d29553c9f00cea2d08fe8dba4e6c7e1", + "version-string": "1.0", + "port-version": 2 + }, + { + "git-tree": "3e024a1126ec62c4f17e2a2d2a6a6367e24d45de", + "version-string": "1.0-1", + "port-version": 0 + }, + { + "git-tree": "da5810a31388ed03f9edd48ac57e1a2f3bda0b3a", + "version-string": "1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vk-bootstrap.json b/externals/vcpkg/versions/v-/vk-bootstrap.json new file mode 100755 index 000000000..25a7da98c --- /dev/null +++ b/externals/vcpkg/versions/v-/vk-bootstrap.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c882b9c4c2adf3ea8e63dae9d4ab03b4d34a4dc1", + "version": "0.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vkfft.json b/externals/vcpkg/versions/v-/vkfft.json new file mode 100755 index 000000000..bc864103c --- /dev/null +++ b/externals/vcpkg/versions/v-/vkfft.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "cefb73461bdbaf1e71eefa7bb7a9dce7352fd3b3", + "version": "1.2.17", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vlfeat.json b/externals/vcpkg/versions/v-/vlfeat.json new file mode 100755 index 000000000..1ebdeb861 --- /dev/null +++ b/externals/vcpkg/versions/v-/vlfeat.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "2ae1b6f9b25f1b72e71b824f995c521f71a6081b", + "version-string": "2020-07-10", + "port-version": 1 + }, + { + "git-tree": "be0ba46516781391acfb5a54ab75e085fa53e3a7", + "version-string": "2020-07-10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vlpp.json b/externals/vcpkg/versions/v-/vlpp.json new file mode 100755 index 000000000..31ead26bd --- /dev/null +++ b/externals/vcpkg/versions/v-/vlpp.json @@ -0,0 +1,44 @@ +{ + "versions": [ + { + "git-tree": "b4f56db04c13b5bf335e4e5939617596e15e89ac", + "version": "0.11.0.0", + "port-version": 3 + }, + { + "git-tree": "cfa763a8d53142b93748fde4a578ddbd95431ac2", + "version-string": "0.11.0.0", + "port-version": 2 + }, + { + "git-tree": "0497f92c39e00928468399f96b7da4ef729b4c4f", + "version-string": "0.11.0.0", + "port-version": 1 + }, + { + "git-tree": "4463f001a84efe965dfea0530a6f71f753923103", + "version-string": "0.11.0.0", + "port-version": 0 + }, + { + "git-tree": "343c41f71bfca5afff34af1c97b44eeea168dcde", + "version-string": "0.10.0.0", + "port-version": 0 + }, + { + "git-tree": "80f1a08b5e3ca2193dd41cdab728e71873e2416f", + "version-string": "0.9.3.1-2", + "port-version": 0 + }, + { + "git-tree": "d28c80be18f5f6880453ff17576b44404480f4ab", + "version-string": "0.9.3.1-1", + "port-version": 0 + }, + { + "git-tree": "7420d44961c40c2bc8b55437b519adc0c9c619be", + "version-string": "0.9.3.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/volk.json b/externals/vcpkg/versions/v-/volk.json new file mode 100755 index 000000000..56d3b2b12 --- /dev/null +++ b/externals/vcpkg/versions/v-/volk.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "c3c879b8f9516e71bcad0365c64b9c993ec6b254", + "version": "1.3.204", + "port-version": 1 + }, + { + "git-tree": "83175cabc17042125828c2e0230f75b60d140cc0", + "version": "1.3.204", + "port-version": 0 + }, + { + "git-tree": "0018a72c45ad8b5f9776d41ff067292b73cb7a31", + "version-string": "2019-09-26", + "port-version": 1 + }, + { + "git-tree": "9e40bb5aadc282b6738223dbddbe61fc2db964f9", + "version-string": "2019-09-26", + "port-version": 0 + }, + { + "git-tree": "abfe3c79ce18403d5fe7df4229a47b003daeb402", + "version-string": "2019-09-03", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vs-yasm.json b/externals/vcpkg/versions/v-/vs-yasm.json new file mode 100755 index 000000000..71ca133dd --- /dev/null +++ b/externals/vcpkg/versions/v-/vs-yasm.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "578afbadfc6dd06f3e83fc3d40dbbcfe98a392ae", + "version-string": "0.5.0", + "port-version": 1 + }, + { + "git-tree": "43b6bd5dbc482d483cad9c7d9533363331260fa0", + "version-string": "0.5.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vtk-dicom.json b/externals/vcpkg/versions/v-/vtk-dicom.json new file mode 100755 index 000000000..972f01f0c --- /dev/null +++ b/externals/vcpkg/versions/v-/vtk-dicom.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "1bb97d36a9f0ed9f7305bd51f904ba5c3f740565", + "version-string": "0.8.12", + "port-version": 2 + }, + { + "git-tree": "1364bedaaf40e2604fd87cfde2791a944343c5e6", + "version-string": "0.8.12-1", + "port-version": 0 + }, + { + "git-tree": "9c7bb5875a0b19aea0e90807a7bd73f0abcb2df8", + "version-string": "0.8.12", + "port-version": 0 + }, + { + "git-tree": "19cc97581b85e51c2cf8a49027f6339cfe327d63", + "version-string": "0.8.10", + "port-version": 0 + }, + { + "git-tree": "bfb499db66349de87a1e1c8d95e5faa4600831ce", + "version-string": "0.8.9", + "port-version": 0 + }, + { + "git-tree": "a23d580465da08cd79a90171c065b66bcae3b63a", + "version-string": "0.8.8-alpha-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vtk-m.json b/externals/vcpkg/versions/v-/vtk-m.json new file mode 100755 index 000000000..d96689fa0 --- /dev/null +++ b/externals/vcpkg/versions/v-/vtk-m.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "bfd540dbdb5d0684ea4e5363e3b32cfceadcb542", + "version-semver": "1.6.0", + "port-version": 2 + }, + { + "git-tree": "4732af1d6b93dd170e8340039ed4c111e32ff224", + "version-semver": "1.6.0", + "port-version": 1 + }, + { + "git-tree": "bb3404a3ff10cfdc6bfabc198b44d711b752fd6e", + "version-semver": "1.6.0", + "port-version": 0 + }, + { + "git-tree": "38b6b6e37b4b027d7fb92207edbe8e8b97631faf", + "version-string": "1.5.0", + "port-version": 1 + }, + { + "git-tree": "c590ac5dbaf44350c96c1a40639976783110f105", + "version-string": "1.5.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vtk.json b/externals/vcpkg/versions/v-/vtk.json new file mode 100755 index 000000000..d73625635 --- /dev/null +++ b/externals/vcpkg/versions/v-/vtk.json @@ -0,0 +1,289 @@ +{ + "versions": [ + { + "git-tree": "6a7eea485be980aa5c9fae1e0a75084f98e5dc27", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 10 + }, + { + "git-tree": "3fa106f1a3c80a3ad15d8db406067c5253decc8e", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 9 + }, + { + "git-tree": "585d1bca8e71d950c6d12ceb6ad720825ecbd704", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 8 + }, + { + "git-tree": "4ba3d3d0db6e98e9a47d8c5c86790da3ef9af25b", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 7 + }, + { + "git-tree": "4a9a03829df133347e358e94e79953ac9d91ae82", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 6 + }, + { + "git-tree": "bd6ac57e684fd8a2234509813248f64a6cb522d5", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 5 + }, + { + "git-tree": "223022edbe63b3ecdb3e9204a4ad63ab61b36ece", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 4 + }, + { + "git-tree": "1b201a8e060b6c2688ccc2e96cae175f2d8af205", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 3 + }, + { + "git-tree": "5e50a05b2ff0cc2f4df601ddb146c75a2f266a6a", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 2 + }, + { + "git-tree": "413d7fcbff9b50e57e486d1249c841a5e25c0def", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 1 + }, + { + "git-tree": "87526609113852b1b1c4a1fdc40c96a61b7c0b47", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 0 + }, + { + "git-tree": "4a64bbb016d5ecf20be3df3bf850748f9f885502", + "version-string": "9.0.1", + "port-version": 7 + }, + { + "git-tree": "78be7ee36f34395e4d5511fd61457c4f7178a438", + "version-string": "9.0.1", + "port-version": 6 + }, + { + "git-tree": "88d95daae73bf5c3413bb18188c81f9ea752e418", + "version-string": "9.0.1", + "port-version": 5 + }, + { + "git-tree": "94667926df104c70c0229cc96b36ec41f3911853", + "version-string": "9.0.1", + "port-version": 4 + }, + { + "git-tree": "6f325c609afb0c171d6d70c965e041f8c7288bd3", + "version-string": "9.0.1", + "port-version": 3 + }, + { + "git-tree": "ec9e66154404b5fdfcacbcc288e7fcd2e37cf900", + "version-string": "9.0.1", + "port-version": 2 + }, + { + "git-tree": "214c9c52a24d9906a7877b6bafdeda7fa0bd2d95", + "version-string": "9.0.1", + "port-version": 1 + }, + { + "git-tree": "589b0babbd041378286258810e20ee9bb4fb7ee8", + "version-string": "9.0.1", + "port-version": 0 + }, + { + "git-tree": "a4e9b96bb147319bd38a8c3e73476191694fda73", + "version-string": "9.0-4", + "port-version": 0 + }, + { + "git-tree": "73fef0a6ed35993d939ee36eed91e10f5c9d2db5", + "version-string": "9.0-3", + "port-version": 0 + }, + { + "git-tree": "33a60763631e4cf1dc162c27b1e27fd027469817", + "version-string": "9.0-2", + "port-version": 0 + }, + { + "git-tree": "a0f552402c5b729ad123ad1038edcedf4932d527", + "version-string": "9.0-1", + "port-version": 0 + }, + { + "git-tree": "6f8f44f36d2fae151a5833573d38e4c5fef0e23f", + "version-string": "9.0", + "port-version": 0 + }, + { + "git-tree": "0a98bca46edc170ca302cc7545d0daf191d4a8e3", + "version-string": "8.2.0-13", + "port-version": 0 + }, + { + "git-tree": "7244954c35575e99b2a08cb7bd97c8b216d5d714", + "version-string": "8.2.0-12", + "port-version": 0 + }, + { + "git-tree": "82d66db2e30c07a8d86fa06ce15fbecc7fcbaa46", + "version-string": "8.2.0-11", + "port-version": 0 + }, + { + "git-tree": "c86b6b71ac054b399a9fcee6f8c54c9aa1c2eade", + "version-string": "8.2.0-10", + "port-version": 0 + }, + { + "git-tree": "5625094c802d33b17cb259f07708bd4cbdbf9385", + "version-string": "8.2.0-9", + "port-version": 0 + }, + { + "git-tree": "6dbb7fe4994b8116313792b3744ee7363e019ade", + "version-string": "8.2.0-8", + "port-version": 0 + }, + { + "git-tree": "a4b9d6db0526781199bb665777b16f41c93966fb", + "version-string": "8.2.0-7", + "port-version": 0 + }, + { + "git-tree": "3d5806c30c47012a6d760bec34740a331fb7b681", + "version-string": "8.2.0-6", + "port-version": 0 + }, + { + "git-tree": "3fc0c0f115d80e4082074accc6e5f4582e39cb94", + "version-string": "8.2.0-5", + "port-version": 0 + }, + { + "git-tree": "90b95379d8ee03b935fb4d78e89725a5304424b7", + "version-string": "8.2.0-4", + "port-version": 0 + }, + { + "git-tree": "ff19ef450a40b99b13fa968e1fc235c04eca5f2b", + "version-string": "8.2.0-2", + "port-version": 0 + }, + { + "git-tree": "8e9924e45a2f03d9ed81e265ef14a35df43c4a66", + "version-string": "8.2.0-1", + "port-version": 0 + }, + { + "git-tree": "ed8be48dd2e94e1e4fa8a9c2b6ec4f1768fd9003", + "version-string": "8.1.0-7", + "port-version": 0 + }, + { + "git-tree": "d5e2b52df97ad323d0c49ebf778623a893594a6c", + "version-string": "8.1.0-6", + "port-version": 0 + }, + { + "git-tree": "b5aa3f784cdcae68b8fe9eb6f66fed80e5c469f7", + "version-string": "8.1.0-5", + "port-version": 0 + }, + { + "git-tree": "dcb50c51f3dd0dd305f94e15f7f9aed2b0d5f5fd", + "version-string": "8.1.0-3", + "port-version": 0 + }, + { + "git-tree": "bbb19208f0fa9504a9361a6dbc6e30675ddf019a", + "version-string": "8.1.0-2", + "port-version": 0 + }, + { + "git-tree": "fa8155fdeb16f9863103989641a525460a5ff186", + "version-string": "8.1.0-1", + "port-version": 0 + }, + { + "git-tree": "82401171f8160381845c756f008513c1bc70a669", + "version-string": "8.1.0", + "port-version": 0 + }, + { + "git-tree": "26515433bee5ab9596dd581c44229c6ad3256392", + "version-string": "8.0.1-6", + "port-version": 0 + }, + { + "git-tree": "8132de1fe3a3fa065b050d8a52dbb0b8e5cafdba", + "version-string": "8.0.1-5", + "port-version": 0 + }, + { + "git-tree": "1a7fda25b9fc315bf4e5bd164739169c7146e0fc", + "version-string": "8.0.1-4", + "port-version": 0 + }, + { + "git-tree": "f203efaf7a5061f69b1aa0f229f24e1067fac0c0", + "version-string": "8.0.1-3", + "port-version": 0 + }, + { + "git-tree": "2d948665c853eb6b451431510da3c2f4f094ad23", + "version-string": "8.0.1-2", + "port-version": 0 + }, + { + "git-tree": "0ce2644dc2345ea552966caef2ff80a81fcae2b3", + "version-string": "8.0.1-1", + "port-version": 0 + }, + { + "git-tree": "8f5a6713961b0a5a247637d28d8483ef1962b8f6", + "version-string": "8.0.1", + "port-version": 0 + }, + { + "git-tree": "a621ebe05e8a27394435b08e0e8bc908894e51db", + "version-string": "8.0.0-3", + "port-version": 0 + }, + { + "git-tree": "a7c2f75d10fd65f60e4fbad7f9bd75e7e5b89c71", + "version-string": "8.0.0-2", + "port-version": 0 + }, + { + "git-tree": "0e149d3927589a95767139ba103187615a75db44", + "version-string": "8.0.0-1", + "port-version": 0 + }, + { + "git-tree": "3c40d8a6fc276c32efb353508035d01cdb55af76", + "version-string": "8.0.0", + "port-version": 0 + }, + { + "git-tree": "fdb07b54be26757cfec7483f09924ffa14bff591", + "version-string": "7.1.1-1", + "port-version": 0 + }, + { + "git-tree": "6eb26cb520be79ac7f7277679dc04780f30a74f8", + "version-string": "7.1.1", + "port-version": 0 + }, + { + "git-tree": "b93adc665c1a6245a14ee6cbb2ba8d266149da52", + "version-string": "7.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vulkan-headers.json b/externals/vcpkg/versions/v-/vulkan-headers.json new file mode 100755 index 000000000..e1f105254 --- /dev/null +++ b/externals/vcpkg/versions/v-/vulkan-headers.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "b5192b1575959f03e204edc4712351461b6a2c23", + "version": "1.2.203", + "port-version": 0 + }, + { + "git-tree": "67ab6950d3e363975e70de04b73c39a35db721b3", + "version-semver": "1.2.184", + "port-version": 0 + }, + { + "git-tree": "2bfc0cee813eec4db22084402370b7e40556027e", + "version-string": "1.2.157", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vulkan-hpp.json b/externals/vcpkg/versions/v-/vulkan-hpp.json new file mode 100755 index 000000000..d38719985 --- /dev/null +++ b/externals/vcpkg/versions/v-/vulkan-hpp.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "0f1e3c5ad864b671b57492c92079e7270bde0558", + "version": "1.2.203", + "port-version": 0 + }, + { + "git-tree": "a3f04aeb70ff80b168cf4e86134c7c61f7d23d62", + "version-string": "1.2.184", + "port-version": 1 + }, + { + "git-tree": "f4ca1555372a398629a4bd1728b6870efb93d674", + "version-string": "1.2.184", + "port-version": 0 + }, + { + "git-tree": "2480b7c83826a22adba9e5fbad769ab547285818", + "version-string": "2019-05-11-1", + "port-version": 0 + }, + { + "git-tree": "f03225bb8e8b8ec20a1b79d113abc3195ed7edd1", + "version-string": "2019-05-11", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vulkan-memory-allocator.json b/externals/vcpkg/versions/v-/vulkan-memory-allocator.json new file mode 100755 index 000000000..c54e345f9 --- /dev/null +++ b/externals/vcpkg/versions/v-/vulkan-memory-allocator.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "1803d4239d0058bbdb03b3711dc69383895f4ea1", + "version": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "9d6994b1a6f6cbaba84a63a78b3d97784a0722f5", + "version-string": "2021-07-07", + "port-version": 1 + }, + { + "git-tree": "0b1560d8d5ccc9a903ed8159fccecd2bd29e2125", + "version-string": "2021-07-07", + "port-version": 0 + }, + { + "git-tree": "dd2f676035a767641141490caae2ac057ed59e83", + "version-string": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "950361a10091dcbcb4f27d1ce5494a9b43b10974", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "403ce21ef2b7da4544a4a37a6079aa1efa0880eb", + "version-string": "2.1.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vulkan.json b/externals/vcpkg/versions/v-/vulkan.json new file mode 100755 index 000000000..dcd62d95b --- /dev/null +++ b/externals/vcpkg/versions/v-/vulkan.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "693b2d999097790fec95ae3dae5d3b9054052d57", + "version-string": "1.1.82.1", + "port-version": 2 + }, + { + "git-tree": "50baea2e993e948b8477929a7f600da93991224b", + "version-string": "1.1.82.1-1", + "port-version": 0 + }, + { + "git-tree": "7c914e2fbbea69fe95f83236d1b1ccfd9739e735", + "version-string": "1.1.82.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/v-/vxl.json b/externals/vcpkg/versions/v-/vxl.json new file mode 100755 index 000000000..80885d5e9 --- /dev/null +++ b/externals/vcpkg/versions/v-/vxl.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "7a84f7e74335e755ba16066fa148e3d30a9d5af5", + "version": "2.0.2", + "port-version": 4 + }, + { + "git-tree": "dd1be33b316bf4d081b89e1dd4a729ddfc09a8a6", + "version-string": "2.0.2", + "port-version": 3 + }, + { + "git-tree": "fefdd1e45140fa292b0f597ae2ef658731f95b18", + "version-string": "2.0.2", + "port-version": 2 + }, + { + "git-tree": "ee7fcf9f131d14db523eabd68494601deba24361", + "version-string": "2.0.2", + "port-version": 1 + }, + { + "git-tree": "a3673fb476501793910afb7f06dc644f93679228", + "version-string": "2.0.2", + "port-version": 0 + }, + { + "git-tree": "f0836e2cd5a5cf43dd5ea707237c74ac9b4ae557", + "version-string": "v1.18.0-4", + "port-version": 0 + }, + { + "git-tree": "b9c00596aced831c75a0c4f9589f305645f15182", + "version-string": "v1.18.0-3", + "port-version": 0 + }, + { + "git-tree": "9c69d40cd32f205a40bf91855ca095c86a545d63", + "version-string": "v1.18.0-2", + "port-version": 0 + }, + { + "git-tree": "1e5ac28eb237d1700182e37c98db7e8cb553b01a", + "version-string": "v1.18.0-1", + "port-version": 0 + }, + { + "git-tree": "c9490f087a76c77dd9e4ba23d3c8bb6ba5d1a250", + "version-string": "20180414-7a130cf-1", + "port-version": 0 + }, + { + "git-tree": "495a0bcaa231545503d242682e0e712dba8901d2", + "version-string": "20180414-7a130cf", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/wampcc.json b/externals/vcpkg/versions/w-/wampcc.json new file mode 100755 index 000000000..1c4f726c9 --- /dev/null +++ b/externals/vcpkg/versions/w-/wampcc.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "1f712e2c2cd060bb7ee6888b8c00cd3f0cd4a937", + "version-date": "2019-09-04", + "port-version": 3 + }, + { + "git-tree": "00037d098a709bf36797f4cc768b5e62ad4db387", + "version-string": "2019-09-04", + "port-version": 2 + }, + { + "git-tree": "720c45bd8d01b9d57a41cc41debd9858a7461654", + "version-string": "2019-09-04", + "port-version": 1 + }, + { + "git-tree": "dcbe9ebb2b68fdff8c45c54666ae1259452f19ac", + "version-string": "2019-09-04", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/wangle.json b/externals/vcpkg/versions/w-/wangle.json new file mode 100755 index 000000000..d764dcfea --- /dev/null +++ b/externals/vcpkg/versions/w-/wangle.json @@ -0,0 +1,104 @@ +{ + "versions": [ + { + "git-tree": "6f0fec69eddf934964ee77b9923f68da2c3c7724", + "version-string": "2022.03.21.00", + "port-version": 0 + }, + { + "git-tree": "387fe8f00443c17cf01fe0ebc235dd8cc5dd3f03", + "version-string": "2022.01.31.00", + "port-version": 0 + }, + { + "git-tree": "070f35ba95d1f0b817f225896daa7bd48ce3e47d", + "version-string": "2021.06.14.00", + "port-version": 0 + }, + { + "git-tree": "ec02b3b7d30905067fdd9af8ae6e11652ea78a00", + "version-string": "2020.10.19.00", + "port-version": 1 + }, + { + "git-tree": "fafb0d5c1d9c5d4a5f0846714db0c3bbbbffd267", + "version-string": "2020.10.19.00", + "port-version": 0 + }, + { + "git-tree": "2277163e50d2d5cfc8b74ce9032965d70bd1f134", + "version-string": "2020.02.03.00", + "port-version": 0 + }, + { + "git-tree": "2954be0887c3aa2e750d3afa0cefe8162af66de3", + "version-string": "2019.07.08.00-1", + "port-version": 0 + }, + { + "git-tree": "fd79e9cdaf16199e85ffbc98250c5b25b71c218a", + "version-string": "2019.07.08.00", + "port-version": 0 + }, + { + "git-tree": "68050b130029711b455993b38b0d626aa186beb0", + "version-string": "2019.05.20.00-1", + "port-version": 0 + }, + { + "git-tree": "972517c03b24adb04e30e9388e01ce263217b658", + "version-string": "2019.05.20.00", + "port-version": 0 + }, + { + "git-tree": "da452ce0924f2333b3c17f0409e2241a8da7233f", + "version-string": "2019.05.13.00", + "port-version": 0 + }, + { + "git-tree": "f5c4821138b5af49291e95f0da1e29bba9546bb2", + "version-string": "2019.04.22.00-1", + "port-version": 0 + }, + { + "git-tree": "eb477dc273b8907036117b6757839d665fa7cb9f", + "version-string": "2019.01.07.00-2", + "port-version": 0 + }, + { + "git-tree": "00bf6dff4056455e8e76727991b8a463713caa43", + "version-string": "2019.01.07.00-1", + "port-version": 0 + }, + { + "git-tree": "86b32175a89a917fc83425235d0255dcae0e8a7a", + "version-string": "2019.01.07.00", + "port-version": 0 + }, + { + "git-tree": "746b445212be5203b3afc0758a0545b3ae02ba15", + "version-string": "2018.11.05.00", + "port-version": 0 + }, + { + "git-tree": "54cf65ed5bb94085c606565bfcb499e535ec21d8", + "version-string": "2018.10.29.00", + "port-version": 0 + }, + { + "git-tree": "082f089f7d764a48dd18b1016cdc9acba45520d8", + "version-string": "2018.10.22.00", + "port-version": 0 + }, + { + "git-tree": "6ecccce862a45c0408dde14ea7fcf47258aa275f", + "version-string": "2018.07.30.00-2", + "port-version": 0 + }, + { + "git-tree": "6815607656294646b71b3a0163db3a48248176b0", + "version-string": "v2018.07.30.00-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/wavelib.json b/externals/vcpkg/versions/w-/wavelib.json new file mode 100755 index 000000000..856f54318 --- /dev/null +++ b/externals/vcpkg/versions/w-/wavelib.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "d8428a438c8eaf72dae62ada2a5dd3ddc58ca1ed", + "version-date": "2021-11-26", + "port-version": 0 + }, + { + "git-tree": "606ab10437c3dbfcd902fdedd5599dca471a6dde", + "version-date": "2021-08-10", + "port-version": 0 + }, + { + "git-tree": "66193d7de35196ebf71e6f34ba2f3bad0ee6288c", + "version-string": "2020-05-29", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/wavpack.json b/externals/vcpkg/versions/w-/wavpack.json new file mode 100755 index 000000000..9a826a330 --- /dev/null +++ b/externals/vcpkg/versions/w-/wavpack.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "39c514f313b4bc2fc7af0f3a889425bb78aca9e3", + "version": "5.4.0", + "port-version": 2 + }, + { + "git-tree": "77b8c9ab85776abb2d049d562db7350525ddf7e2", + "version": "5.4.0", + "port-version": 1 + }, + { + "git-tree": "ba245d1ac0cf8e5024feca18df32365ceed6a402", + "version": "5.4.0", + "port-version": 0 + }, + { + "git-tree": "e5a933ff5c3c9d43e3bf43beb816b458be6025d3", + "version-string": "5.3.0", + "port-version": 2 + }, + { + "git-tree": "73e8b55fed24b05b9c0b9f84d1bc85196c241ca3", + "version-string": "5.3.0", + "port-version": 1 + }, + { + "git-tree": "ab00fac3cf38ba1104e6365183fe6f7bef09f46d", + "version-string": "5.3.0", + "port-version": 0 + }, + { + "git-tree": "bd620d16a01ecde17323db2154a80ebb853e8846", + "version-string": "5.2.0", + "port-version": 3 + }, + { + "git-tree": "826907414aaece4ac4d8805257854606c8b06a5f", + "version-string": "5.2.0", + "port-version": 1 + }, + { + "git-tree": "3dbc3902cdc5287d7e82e6ec3edcc9debe0674e9", + "version-string": "5.2.0", + "port-version": 0 + }, + { + "git-tree": "620b352213995ac2178ccf37a719d8bb967af15c", + "version-string": "5.1.0-3", + "port-version": 0 + }, + { + "git-tree": "8e4f15ac424d642972445dd66d0eeb7133d24423", + "version-string": "5.1.0-2", + "port-version": 0 + }, + { + "git-tree": "bdbedb1d1b7a724f3d70ccb1b953fefc5ce91ab3", + "version-string": "5.1.0-00d9a4a-1", + "port-version": 0 + }, + { + "git-tree": "fc15c5e9549323ad4b173b21fa1e0dd119dce421", + "version-string": "5.1.0-00d9a4a", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/websocketpp.json b/externals/vcpkg/versions/w-/websocketpp.json new file mode 100755 index 000000000..d040079dc --- /dev/null +++ b/externals/vcpkg/versions/w-/websocketpp.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "70d3b037559f580fa52bc50bb2dc26e58f5107d9", + "version": "0.8.2", + "port-version": 2 + }, + { + "git-tree": "495a31980417d3ca202b50c1951012d699af21f6", + "version": "0.8.2", + "port-version": 1 + }, + { + "git-tree": "c717c6c7fe929ef1c9cc7b2250e78700326940c4", + "version-string": "0.8.2", + "port-version": 0 + }, + { + "git-tree": "205093262ed381aa06023fad1d850ed8f88e92ae", + "version-string": "0.8.1-1", + "port-version": 0 + }, + { + "git-tree": "47ae4fd5f1cecfcc42b06b65ace2b997da878dd2", + "version-string": "0.8.1", + "port-version": 0 + }, + { + "git-tree": "3f19ec351c4e5aaa325bca3f13c219c560f91059", + "version-string": "0.7.0-1", + "port-version": 0 + }, + { + "git-tree": "a37e0218e6ac2bc59e3f96182ccfb2498993b547", + "version-string": "0.7.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/webview2.json b/externals/vcpkg/versions/w-/webview2.json new file mode 100755 index 000000000..5a68306fe --- /dev/null +++ b/externals/vcpkg/versions/w-/webview2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "67a13efe8865489439c423563ee9fdaecf8baab1", + "version": "1.0.1210.39", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/wepoll.json b/externals/vcpkg/versions/w-/wepoll.json new file mode 100755 index 000000000..1dc840347 --- /dev/null +++ b/externals/vcpkg/versions/w-/wepoll.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "35d772a24598836d3b2dffa94f152d2f143117b8", + "version-string": "1.5.8", + "port-version": 1 + }, + { + "git-tree": "7565b0e7471e1c2e21def0f3896c631ea67f32f9", + "version-string": "1.5.8", + "port-version": 0 + }, + { + "git-tree": "79bb992640d13521d2ce704029d725a1f248e19d", + "version-string": "1.5.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/wg21-sg14.json b/externals/vcpkg/versions/w-/wg21-sg14.json new file mode 100755 index 000000000..8b620cc22 --- /dev/null +++ b/externals/vcpkg/versions/w-/wg21-sg14.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "2f11507c370b719e1a17ced7ab2dd0af19fe47d4", + "version-string": "2019-08-13", + "port-version": 1 + }, + { + "git-tree": "c8bc3803aac36c5ce3937ecb2a79bd10e697710e", + "version-string": "2019-08-13", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/wil.json b/externals/vcpkg/versions/w-/wil.json new file mode 100755 index 000000000..713da0106 --- /dev/null +++ b/externals/vcpkg/versions/w-/wil.json @@ -0,0 +1,64 @@ +{ + "versions": [ + { + "git-tree": "c918f3ae742f41c096f5758afd5af98fe7a194b5", + "version-date": "2021-12-25", + "port-version": 0 + }, + { + "git-tree": "287e04f5640f1793bdb27bc477dea1ca0e727961", + "version-date": "2021-08-03", + "port-version": 2 + }, + { + "git-tree": "fe6538eb3c7260ca155c82808519426a280e42e5", + "version-string": "2021-08-03", + "port-version": 1 + }, + { + "git-tree": "cb04005b6c8503a0da843fc8f356748e0a0d3994", + "version-string": "2021-08-03", + "port-version": 0 + }, + { + "git-tree": "1085a9ee690f6718715b28396f5250ad67d6f828", + "version-string": "2021-02-04", + "port-version": 0 + }, + { + "git-tree": "48d7b90ae1c7d5f223caad5330a293463f470860", + "version-string": "2020-05-19", + "port-version": 1 + }, + { + "git-tree": "c592af57ce68d842a099b9533eb6a0b8f4aeddbe", + "version-string": "2020-05-19", + "port-version": 0 + }, + { + "git-tree": "6fc902885dd7217f576fd9d15a4e719e2a362416", + "version-string": "2019-11-07", + "port-version": 0 + }, + { + "git-tree": "e327535dff44b80591354a3ca152b451f2fc1391", + "version-string": "2019-07-16", + "port-version": 0 + }, + { + "git-tree": "2d4beb5a5c638983e5ea15da718adab37c1e11f4", + "version-string": "2019-07-09", + "port-version": 0 + }, + { + "git-tree": "5b69bc45e3d32c13cbafdf88fc70e455fa847473", + "version-string": "2019-06-10", + "port-version": 0 + }, + { + "git-tree": "f11a4f76cd1ad0ace37036a8e9468a3ce061ce22", + "version-string": "2019-05-08", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/wildmidi.json b/externals/vcpkg/versions/w-/wildmidi.json new file mode 100755 index 000000000..24cb0fe0a --- /dev/null +++ b/externals/vcpkg/versions/w-/wildmidi.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "28dabf2a1d7a07e567c4d6a0b482d44a4994d17b", + "version": "0.4.4", + "port-version": 0 + }, + { + "git-tree": "4270f5e1f8fdb45bf562991ab9cf42e52fbc7437", + "version-string": "0.4.3", + "port-version": 2 + }, + { + "git-tree": "9bd12fa743e95153d652d59113ac56c28b2ccabe", + "version-string": "0.4.3-1", + "port-version": 0 + }, + { + "git-tree": "7b3ee64538e5a84355d5b896fb7924791e1cdd8e", + "version-string": "0.4.3", + "port-version": 0 + }, + { + "git-tree": "0b6d7fe5db1e6e9345946624afcf636bec59059e", + "version-string": "0.4.1-1", + "port-version": 0 + }, + { + "git-tree": "613584f9eed46bb8c2f57f5d9df8082ff80481d1", + "version-string": "0.4.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/wincrypt.json b/externals/vcpkg/versions/w-/wincrypt.json new file mode 100755 index 000000000..8448b32dc --- /dev/null +++ b/externals/vcpkg/versions/w-/wincrypt.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "67bd745832f348a85a09259db83dd4d6db5c8843", + "version": "0.0", + "port-version": 4 + }, + { + "git-tree": "0ab415a2d32d39cf7dd59d5fd3ca4bf544c42f51", + "version-string": "0.0", + "port-version": 3 + }, + { + "git-tree": "536c7b54d3100704557b0d8ff0fcc9218de5ff4f", + "version-string": "0.0-2", + "port-version": 0 + }, + { + "git-tree": "493f9c0902cac9246275123e4ff7cd403dbc96bf", + "version-string": "0.0-1", + "port-version": 0 + }, + { + "git-tree": "16fa21f99639e638bc5c8a57e992b33c5c1ad910", + "version-string": "0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/winlamb.json b/externals/vcpkg/versions/w-/winlamb.json new file mode 100755 index 000000000..e04c4b49a --- /dev/null +++ b/externals/vcpkg/versions/w-/winlamb.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4ab2db703006df4f9ada6beb31f0cf4556ea62eb", + "version-date": "2020-10-15", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/winpcap.json b/externals/vcpkg/versions/w-/winpcap.json new file mode 100755 index 000000000..b29cb56e0 --- /dev/null +++ b/externals/vcpkg/versions/w-/winpcap.json @@ -0,0 +1,54 @@ +{ + "versions": [ + { + "git-tree": "85d70a721afa26cf8ff26aec62fd04a16f8e6f7b", + "version": "4.1.3", + "port-version": 8 + }, + { + "git-tree": "8b3f6f5a5e85be5df29d86d4e8e1621a9f3369f4", + "version": "4.1.3", + "port-version": 7 + }, + { + "git-tree": "12c456f2d3fc78f821ff85ac7bb55d89ce140ed6", + "version": "4.1.3", + "port-version": 6 + }, + { + "git-tree": "cf7d08eca18c0a361f4852847260da415a29fa29", + "version-string": "4.1.3", + "port-version": 5 + }, + { + "git-tree": "c30934172813869e2864463acb7b83cd8f4b2ee6", + "version-string": "4.1.3", + "port-version": 4 + }, + { + "git-tree": "b3e75100dc98cd912247d1a5eff621c8d5555550", + "version-string": "4.1.3-3", + "port-version": 0 + }, + { + "git-tree": "2bd18cf8b182b233103acf0243c47406aa40d935", + "version-string": "4.1.3-2", + "port-version": 0 + }, + { + "git-tree": "dd8af2fa94978477cea3e0f64fe41e01c487c6da", + "version-string": "4.1.3-1", + "port-version": 0 + }, + { + "git-tree": "1c722067bbff3822db6d4df7c2b7cd16a9717406", + "version-string": "4.1.3", + "port-version": 0 + }, + { + "git-tree": "05bd2e490fc9ccb90b4655c773ce545a284c88a8", + "version-string": "4.1.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/winpty.json b/externals/vcpkg/versions/w-/winpty.json new file mode 100755 index 000000000..3ee29ec3b --- /dev/null +++ b/externals/vcpkg/versions/w-/winpty.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5e8c617e9c5e12b7e760808bdea82f3c3ccc6153", + "version": "0.4.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/winreg.json b/externals/vcpkg/versions/w-/winreg.json new file mode 100755 index 000000000..2b55d506c --- /dev/null +++ b/externals/vcpkg/versions/w-/winreg.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "cdcb9cb9581869670509de4d2928b8821038d962", + "version": "5.1.0", + "port-version": 0 + }, + { + "git-tree": "a355bab9791bca02dc9ad9bc2b61f6ba72486a23", + "version": "5.0.1", + "port-version": 0 + }, + { + "git-tree": "a788126cfabb1299a7f43933fec7ced6074a7939", + "version": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "303a59adfcedbd8c8acdc053ec6b1139d056ecae", + "version": "4.1.2", + "port-version": 1 + }, + { + "git-tree": "000a828ce0f4abd8b4732c7ca7e819e25e82144b", + "version": "4.1.2", + "port-version": 0 + }, + { + "git-tree": "9aaa215768207c8c514a9a5f8be8e0ec6f5e8f02", + "version-string": "4.1.0", + "port-version": 1 + }, + { + "git-tree": "018dd4bf16d8a68e161eef8459458d2de47a125c", + "version-string": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "6243560127ca086b89812f77a6635c8cd38fcdc4", + "version-string": "4.0.0", + "port-version": 0 + }, + { + "git-tree": "e8afef56a008634916bc97eb11ae79ba02c695c8", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "aa109abb93ccccb6e16c83b7e7e323377094b49b", + "version-string": "3.0.1", + "port-version": 0 + }, + { + "git-tree": "2929abc521658db78cfb040189b3f9cab861e5b6", + "version-string": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "a2a38e076c6733520ed2bc4486bb7c5ffa2b7cab", + "version-string": "2.2.3", + "port-version": 0 + }, + { + "git-tree": "4b4b7fde7bb3dc5fcd3087cbaa8cb9e9864254e7", + "version-string": "2.2.2", + "port-version": 0 + }, + { + "git-tree": "49452133f986be20d1d7719e33863c2369e1c899", + "version-string": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "6319c821321e937278e2ffe232f1e401ca6f2674", + "version-string": "1.2.1-1", + "port-version": 0 + }, + { + "git-tree": "8a41891db9540f656840ad027a57d5131f96facb", + "version-string": "1.2.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/winsock2.json b/externals/vcpkg/versions/w-/winsock2.json new file mode 100755 index 000000000..8c41d101f --- /dev/null +++ b/externals/vcpkg/versions/w-/winsock2.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "f6fb217f4eea375e9691dbde28c72c01dddd0c9f", + "version": "0.0", + "port-version": 4 + }, + { + "git-tree": "64b2e9218e0f0a50655510451914a5e532613795", + "version-string": "0.0", + "port-version": 3 + }, + { + "git-tree": "31860d5a7d293703921a71466ed1f2bd656e1488", + "version-string": "0.0-2", + "port-version": 0 + }, + { + "git-tree": "c6ee8d7649cfffa7dc31659b73afd9295bd7aebb", + "version-string": "0.0-1", + "port-version": 0 + }, + { + "git-tree": "b00cb3d81560e2d75b50990c0cbc8dc0124b1887", + "version-string": "0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/winsparkle.json b/externals/vcpkg/versions/w-/winsparkle.json new file mode 100755 index 000000000..b642ca7d9 --- /dev/null +++ b/externals/vcpkg/versions/w-/winsparkle.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "8f1aed9d3a5aac4c967bc6e8be9b8bbe0ce09a76", + "version": "0.7.0", + "port-version": 1 + }, + { + "git-tree": "0d756f506e6a79a2a79706f9080c05b45e7df882", + "version": "0.7.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/wintoast.json b/externals/vcpkg/versions/w-/wintoast.json new file mode 100755 index 000000000..b61765e3e --- /dev/null +++ b/externals/vcpkg/versions/w-/wintoast.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "7e0b224e777c1a12676204204a97636e3639c4c1", + "version": "1.2.0", + "port-version": 2 + }, + { + "git-tree": "186a3b60dc0a76ecb0b1a5a2147306dbfe734797", + "version-string": "1.2.0", + "port-version": 1 + }, + { + "git-tree": "44d6b242712ba6b9750b69ad5eac5c934c647d32", + "version-string": "1.2.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/woff2.json b/externals/vcpkg/versions/w-/woff2.json new file mode 100755 index 000000000..64a7f4a77 --- /dev/null +++ b/externals/vcpkg/versions/w-/woff2.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "b60f5207764279d61a2bb9f35e4881c4af2a6b2c", + "version": "1.0.2", + "port-version": 3 + }, + { + "git-tree": "5055934b6226755b84d652776a1f0fa1d116b559", + "version-string": "1.0.2", + "port-version": 2 + }, + { + "git-tree": "1a8e802f8168798c4171f8384cd2e50b97af3a9b", + "version-string": "1.0.2", + "port-version": 1 + }, + { + "git-tree": "c39668ee425b3e9bb5ead506876f144656acf359", + "version-string": "1.0.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/wolfmqtt.json b/externals/vcpkg/versions/w-/wolfmqtt.json new file mode 100755 index 000000000..33d661bbe --- /dev/null +++ b/externals/vcpkg/versions/w-/wolfmqtt.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bc6b26e4254f8938dc9db7f7b5dc84958a45c877", + "version": "1.13.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/wolfssl.json b/externals/vcpkg/versions/w-/wolfssl.json new file mode 100755 index 000000000..e5cba80c2 --- /dev/null +++ b/externals/vcpkg/versions/w-/wolfssl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4dee782f3dda81bc4a72959bcda6d1377a24cbaa", + "version": "5.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/wolftpm.json b/externals/vcpkg/versions/w-/wolftpm.json new file mode 100755 index 000000000..31f2abb4a --- /dev/null +++ b/externals/vcpkg/versions/w-/wolftpm.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "647740c5ad277ccf2d910605595118087f3bc342", + "version": "2.4.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/wordnet.json b/externals/vcpkg/versions/w-/wordnet.json new file mode 100755 index 000000000..63963804e --- /dev/null +++ b/externals/vcpkg/versions/w-/wordnet.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "1302f457b9e1e102c1c3cf190c9fc92da9da1272", + "version-string": "3.0", + "port-version": 1 + }, + { + "git-tree": "bcfbc2d3ca45c84d875af3b123aa83c3b85b554c", + "version-string": "3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/workflow.json b/externals/vcpkg/versions/w-/workflow.json new file mode 100755 index 000000000..fd24509a3 --- /dev/null +++ b/externals/vcpkg/versions/w-/workflow.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "2e673ba0fd8857c0d13f6137e32b3ce5cfda65d9", + "version": "0.9.7", + "port-version": 1 + }, + { + "git-tree": "864387c239d4b0fadabfc4b314564d75c9bc07bc", + "version": "0.9.7", + "port-version": 0 + }, + { + "git-tree": "ab1da719c3684f213ddd140aa6e09994c73580ee", + "version": "0.9.6", + "port-version": 0 + }, + { + "git-tree": "3771249036075b8138d0e34de9799ca4571b1867", + "version": "0.9.5", + "port-version": 1 + }, + { + "git-tree": "b3177df2ccf507d13fce2d76fdd23c74c11031ee", + "version": "0.9.4", + "port-version": 1 + }, + { + "git-tree": "4a2e1876631a6a2b43a3e76cd3018d7f6a575d86", + "version-string": "0.9.3", + "port-version": 1 + }, + { + "git-tree": "c6877f2c3abee4e46c75e409359a3e4e06d5de84", + "version-string": "0.9.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/wpilib.json b/externals/vcpkg/versions/w-/wpilib.json new file mode 100755 index 000000000..2b2c63cfe --- /dev/null +++ b/externals/vcpkg/versions/w-/wpilib.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "cf10ef63982d54978a85c868d37462ce21643188", + "version-string": "2020.3.2", + "port-version": 2 + }, + { + "git-tree": "f656633935224ac3005954533294babd766921b1", + "version-string": "2020.3.2", + "port-version": 1 + }, + { + "git-tree": "bbc7d5d8824b67d66409ff21f43ee414aa41261b", + "version-string": "2020.3.2", + "port-version": 0 + }, + { + "git-tree": "aed7298e10c4894c12237b259ba2aceb0a30b235", + "version-string": "2020.1.1", + "port-version": 0 + }, + { + "git-tree": "9ab923d9d075c23d6a329951c73a3f335c237b50", + "version-string": "2019.6.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/wren.json b/externals/vcpkg/versions/w-/wren.json new file mode 100755 index 000000000..565c88763 --- /dev/null +++ b/externals/vcpkg/versions/w-/wren.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "d845edef970204677adb20d8f51acf22b1c9fb00", + "version": "0.4.0", + "port-version": 0 + }, + { + "git-tree": "558979dc3ff66a524b930d85fbf856679ebd0208", + "version-string": "2019-07-01", + "port-version": 1 + }, + { + "git-tree": "7cfd07176f4a552daec20b501b155da34acb7e63", + "version-string": "2019-07-01", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/wt.json b/externals/vcpkg/versions/w-/wt.json new file mode 100755 index 000000000..88eaa5f94 --- /dev/null +++ b/externals/vcpkg/versions/w-/wt.json @@ -0,0 +1,134 @@ +{ + "versions": [ + { + "git-tree": "24546bcb3aa44c987d85536d39420e4159d4ad99", + "version": "4.7.1", + "port-version": 0 + }, + { + "git-tree": "0d5d5d96583b44370437e567f086173a2c0ad51e", + "version": "4.6.1", + "port-version": 0 + }, + { + "git-tree": "62d1e8353f693697e3c7346c09afd96e1e6a1031", + "version": "4.5.0", + "port-version": 3 + }, + { + "git-tree": "1535b49590f6871ba9195f3a712e99ba1da27107", + "version-string": "4.5.0", + "port-version": 2 + }, + { + "git-tree": "1d3b1c0ba6b473d5b5e77ca515e74e90567e2965", + "version-string": "4.5.0", + "port-version": 1 + }, + { + "git-tree": "4e770dbe450a78c88a5d607926eaf854e15cd546", + "version-string": "4.5.0", + "port-version": 0 + }, + { + "git-tree": "4d0eb851ee2773cd7f529f5c2d91d5ca81929982", + "version-string": "4.4.0", + "port-version": 0 + }, + { + "git-tree": "6dd6103fe267d4e998e3d1ad46a647b25842eef0", + "version-string": "4.2.2", + "port-version": 0 + }, + { + "git-tree": "db8b3a3d40de1196e90c0bd8b73d26e4b441035c", + "version-string": "4.2.1", + "port-version": 0 + }, + { + "git-tree": "31991957952fe3e68aa37474500be965ddf270d8", + "version-string": "4.1.1", + "port-version": 0 + }, + { + "git-tree": "7053d949f20f0b28c8086ec6398b5bce082ee943", + "version-string": "4.0.5-1", + "port-version": 0 + }, + { + "git-tree": "16e676ad9f4ecda601ed0d9165329b4f2a1bdca3", + "version-string": "4.0.5", + "port-version": 0 + }, + { + "git-tree": "a009101b74c6894462278f0d7b08575cd93e4a9a", + "version-string": "4.0.5-1", + "port-version": 0 + }, + { + "git-tree": "8171b0d999ac2b8c6bc9168e6bd7539f7187faed", + "version-string": "4.0.5", + "port-version": 0 + }, + { + "git-tree": "6f635befc383f6070f5b8c6e0acbcc9bffd6073d", + "version-string": "4.0.4-2", + "port-version": 0 + }, + { + "git-tree": "3efde70d1bf7a0c29533e963d10348cdba7d377d", + "version-string": "4.0.4", + "port-version": 0 + }, + { + "git-tree": "7856d96209a218eef8cd14bc6638aacea98ac38f", + "version-string": "4.0.3-1", + "port-version": 0 + }, + { + "git-tree": "7b1413ad25b7f205829a643e853bf8e85695e724", + "version-string": "4.0.3", + "port-version": 0 + }, + { + "git-tree": "db37461817f2d452fa3d11a9e5d463f9bec73b94", + "version-string": "4.0.2", + "port-version": 0 + }, + { + "git-tree": "47e23dd5394f3bf7ef2c370ebb631efea170c4d3", + "version-string": "3.3.7-4", + "port-version": 0 + }, + { + "git-tree": "8f878a7ff834d47df1f29ab593e727b2300fd5dd", + "version-string": "3.3.7-2", + "port-version": 0 + }, + { + "git-tree": "67b260cc1dd9a3264f22e139881f87b4f09bb04d", + "version-string": "3.3.7-1", + "port-version": 0 + }, + { + "git-tree": "296f517371615021ecb35c5ea2f7dda9378ec619", + "version-string": "3.3.7", + "port-version": 0 + }, + { + "git-tree": "a3fdf30ecd67280bee07f78377b3c6f8a7a872d6", + "version-string": "3.3.6-3", + "port-version": 0 + }, + { + "git-tree": "87c3e4d46de0c6a6151c30bcb4fd6d38733adfa6", + "version-string": "3.3.6-2", + "port-version": 0 + }, + { + "git-tree": "931ee43ee612664d319c58baed5f6156187e215d", + "version-string": "3.3.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/wtl.json b/externals/vcpkg/versions/w-/wtl.json new file mode 100755 index 000000000..e6c04547b --- /dev/null +++ b/externals/vcpkg/versions/w-/wtl.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "77302be4bab5f3221389c7948462e15ac941002b", + "version": "10.0.10320", + "port-version": 3 + }, + { + "git-tree": "3345336300f47e924a80d3be0f3fb76c558a54fe", + "version-string": "10.0.10320", + "port-version": 2 + }, + { + "git-tree": "6d429012165553d38ea4ae45057ce85bb34deb96", + "version-string": "10.0.10320", + "port-version": 1 + }, + { + "git-tree": "f8a86cb0f5713c783df17553cf443c164d81c10d", + "version-string": "10.0.10320", + "port-version": 0 + }, + { + "git-tree": "5187fbf86b894cd0a33a5822cf8ccf1a887c43ad", + "version-string": "10.0.10077", + "port-version": 0 + }, + { + "git-tree": "3bfe893603b89b7987c50f6a356e73e0f2a8fc4e", + "version-string": "10.0-10", + "port-version": 0 + }, + { + "git-tree": "9c4cfe6f5523f328f7f05f22b93c9862bd8dd508", + "version-string": "10.0-8", + "port-version": 0 + }, + { + "git-tree": "d3cdc3475f2424a751293b2465662f69ff0bcc8c", + "version-string": "10.0-6", + "port-version": 0 + }, + { + "git-tree": "3fc488b73c9de9e7030d0e4b4e60b687c3f2e9c7", + "version-string": "10.0-5", + "port-version": 0 + }, + { + "git-tree": "24d83a98898eca91b9041870ff9a8359565937cc", + "version-string": "10.0-4", + "port-version": 0 + }, + { + "git-tree": "53d2cbf49fdeb5761cfca5dfbec9d36ef1c13589", + "version-string": "10.0-3", + "port-version": 0 + }, + { + "git-tree": "be779f61afe7eb786039a90db7dbc2f2aab9a42f", + "version-string": "10.0-2", + "port-version": 0 + }, + { + "git-tree": "32663304c4b16c1ae66040cc77960aec22972cc4", + "version-string": "10.0-1", + "port-version": 0 + }, + { + "git-tree": "9fc5058744d0ca053bd2931f9ddd8add2d0eef85", + "version-string": "10.0", + "port-version": 0 + }, + { + "git-tree": "3503c1a3a4ffd26af61fba2e5f435fc8e4347f71", + "version-string": "9.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/wxchartdir.json b/externals/vcpkg/versions/w-/wxchartdir.json new file mode 100755 index 000000000..ec31d371c --- /dev/null +++ b/externals/vcpkg/versions/w-/wxchartdir.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "84db89440d1592907ba9d7513fb1b99695736caa", + "version": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "a08e6fa005143547643f47527bb263aca530b715", + "version": "1.0.0", + "port-version": 1 + }, + { + "git-tree": "c9d334a5412996c85e1d57bf6067ba1934e7f038", + "version-string": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/wxcharts.json b/externals/vcpkg/versions/w-/wxcharts.json new file mode 100755 index 000000000..4001a09f0 --- /dev/null +++ b/externals/vcpkg/versions/w-/wxcharts.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b1e9c16349a281b499d1ff50cdee4dd21c4aafec", + "version-date": "2022-04-22", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/w-/wxwidgets.json b/externals/vcpkg/versions/w-/wxwidgets.json new file mode 100755 index 000000000..e71cd8312 --- /dev/null +++ b/externals/vcpkg/versions/w-/wxwidgets.json @@ -0,0 +1,164 @@ +{ + "versions": [ + { + "git-tree": "793b49ce7710b440be0a451354614e282e6fc9fa", + "version": "3.1.6", + "port-version": 1 + }, + { + "git-tree": "16d9f0aabf4f0df68bebd7b42ff6005d952f9392", + "version": "3.1.6", + "port-version": 0 + }, + { + "git-tree": "3f891e383d71c7665ba49dcc254d8b2094c00c2b", + "version-semver": "3.1.5", + "port-version": 11 + }, + { + "git-tree": "99203047a716a1b39d06fb93c48daebb4b184141", + "version-semver": "3.1.5", + "port-version": 10 + }, + { + "git-tree": "26ad66271632adb4d00a270a90ad18514025859e", + "version-semver": "3.1.5", + "port-version": 9 + }, + { + "git-tree": "dba058c37782edf771e7a62ae1bef98274c86b9f", + "version-semver": "3.1.5", + "port-version": 8 + }, + { + "git-tree": "9184caa631070403a5fd8c177b56907a313ad197", + "version-semver": "3.1.5", + "port-version": 7 + }, + { + "git-tree": "79ef97e2255a360a5515d0fbdbb839c15bb12548", + "version-semver": "3.1.5", + "port-version": 6 + }, + { + "git-tree": "f12ef0e93d9ca2f6d1c8cb4ad3703d98359abacd", + "version-semver": "3.1.5", + "port-version": 5 + }, + { + "git-tree": "c485515f9004da8092ce9ed1ea3e319fa66a7f77", + "version-semver": "3.1.5", + "port-version": 4 + }, + { + "git-tree": "dcd0a52fd041f8c7b658a01ec1141f36d77220c6", + "version-semver": "3.1.5", + "port-version": 3 + }, + { + "git-tree": "6fa230bffdee1e7d700570c31e6f08367460c0c9", + "version-semver": "3.1.5", + "port-version": 2 + }, + { + "git-tree": "9140ae8c095ca8906ebf8150016f520fbdcb27d7", + "version-semver": "3.1.5", + "port-version": 1 + }, + { + "git-tree": "09e00eb06f1870d88caadf9e5e23719b197deda4", + "version-semver": "3.1.5", + "port-version": 0 + }, + { + "git-tree": "8fc2d91de4a0a86698c67e6bb662c14cbfd29732", + "version-semver": "3.1.4", + "port-version": 8 + }, + { + "git-tree": "12acbc593b35e2d327b6fc665c8eed6e25745431", + "version-semver": "3.1.4", + "port-version": 7 + }, + { + "git-tree": "eed8ba1dc939b1c1a17a05bf409142664015ad4d", + "version-semver": "3.1.4", + "port-version": 6 + }, + { + "git-tree": "c608ed7a8383b93a30bd7894b8bee51b0c53066d", + "version-semver": "3.1.4", + "port-version": 5 + }, + { + "git-tree": "ae942a1e9b501be783a788278accf92d99d34434", + "version-string": "3.1.4", + "port-version": 3 + }, + { + "git-tree": "c5c7866cbe8c7efd8c04a7ba451363f1cca9e97e", + "version-string": "3.1.4", + "port-version": 2 + }, + { + "git-tree": "ead99ab45dcf532da7a67839b57bc9aef9eb9aae", + "version-string": "3.1.4", + "port-version": 1 + }, + { + "git-tree": "1582e6521c2b4420dc6754f7277e78ccc229b0a0", + "version-string": "3.1.4", + "port-version": 0 + }, + { + "git-tree": "f358bcf7702e827672db1e5fb6eebcceafe5b68c", + "version-string": "3.1.3", + "port-version": 2 + }, + { + "git-tree": "c9402d5284eb6d2f03acebbfe12bc518fc4dbc4a", + "version-string": "3.1.3-1", + "port-version": 0 + }, + { + "git-tree": "d701c487884d8f797a7ac6e440c6f3840163c061", + "version-string": "3.1.3", + "port-version": 0 + }, + { + "git-tree": "35379747bbddeccbdb430abc7593bb240be9df7a", + "version-string": "3.1.2-2", + "port-version": 0 + }, + { + "git-tree": "73c33ddd4d6ef1920501ef76d285068bad20b13d", + "version-string": "3.1.2-1", + "port-version": 0 + }, + { + "git-tree": "3e144b7505c1bcb519381ddaa6dfa8511edea25f", + "version-string": "3.1.2", + "port-version": 0 + }, + { + "git-tree": "40b9a7dab12b726d0144681e628693e68c96d948", + "version-string": "3.1.1-2", + "port-version": 0 + }, + { + "git-tree": "cbfc4140ce1853c106a9a0b9befc18dee5774a8b", + "version-string": "3.1.1", + "port-version": 0 + }, + { + "git-tree": "daa9d32fea34f06daa98e25e0894a05a918b8253", + "version-string": "3.1.0-1", + "port-version": 0 + }, + { + "git-tree": "61a43b951fcc5e5d8649720fa802b375c6a5d7b1", + "version-string": "3.1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/x-/x-plane.json b/externals/vcpkg/versions/x-/x-plane.json new file mode 100755 index 000000000..34333db07 --- /dev/null +++ b/externals/vcpkg/versions/x-/x-plane.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "5b49030933a1014e1e897438a29a52fbb163b5f3", + "version": "3.0.3", + "port-version": 1 + }, + { + "git-tree": "abc8034ffafdac8f5840bc31600af7854c24f6b9", + "version-string": "3.0.3", + "port-version": 0 + }, + { + "git-tree": "c28b0d771ae48824125648c09f232412f244aa51", + "version-string": "3.0.1-1", + "port-version": 0 + }, + { + "git-tree": "573c83f59cd44d68507b338478ec21ef78a9aac5", + "version-string": "3.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/x-/x264.json b/externals/vcpkg/versions/x-/x264.json new file mode 100755 index 000000000..bd8a969ea --- /dev/null +++ b/externals/vcpkg/versions/x-/x264.json @@ -0,0 +1,119 @@ +{ + "versions": [ + { + "git-tree": "7eea109502309e62a578bcc69811ad0659e00f9d", + "version-string": "164-5db6aa6cab1b146", + "port-version": 4 + }, + { + "git-tree": "6021c139214cb74f8fcc2e89344f05210ea4826d", + "version-string": "164-5db6aa6cab1b146", + "port-version": 3 + }, + { + "git-tree": "c449395a31c61601c5313e4f3e6040bee9c67fde", + "version-string": "164-5db6aa6cab1b146", + "port-version": 2 + }, + { + "git-tree": "8d6c7ba5815a0683a2915df5f95de5d06e938781", + "version-string": "164-5db6aa6cab1b146", + "port-version": 1 + }, + { + "git-tree": "2280334f1235046e20f80586b7d83893f52b23b7", + "version-string": "164-5db6aa6cab1b146", + "port-version": 0 + }, + { + "git-tree": "e8f14328cb425b2a7450bf36f731f97d41564fed", + "version-string": "157-303c484ec828ed0", + "port-version": 16 + }, + { + "git-tree": "e766671c5f64574235784ce45b1668daf4cb9b44", + "version-string": "157-303c484ec828ed0", + "port-version": 15 + }, + { + "git-tree": "5e7b1b08a47363a45799c196a1a8442e9b02f882", + "version-string": "157-303c484ec828ed0", + "port-version": 14 + }, + { + "git-tree": "82f8b056e53aadf48703644888b9ee22b2a82135", + "version-string": "157-303c484ec828ed0", + "port-version": 13 + }, + { + "git-tree": "8a82e9fbc0a80ecf18dbfb3e67d8156f06e139cb", + "version-string": "157-303c484ec828ed0", + "port-version": 12 + }, + { + "git-tree": "47ad6a70d927bc3dc18fd5bed7d1150ecba72da6", + "version-string": "157-303c484ec828ed0", + "port-version": 11 + }, + { + "git-tree": "0758a26633c68c643f0be2e87ca6bd782c9a2ab9", + "version-string": "157-303c484ec828ed0", + "port-version": 10 + }, + { + "git-tree": "a666cc1c4eaaf6537a54f61cfa1be5c5b1924d8a", + "version-string": "157-303c484ec828ed0", + "port-version": 9 + }, + { + "git-tree": "d7f65d40c7db59664cea553434c6f4e592f13b94", + "version-string": "157-303c484ec828ed0-8", + "port-version": 0 + }, + { + "git-tree": "f4c96056083e748fb3f6b2e8a9c99b2cf68a310e", + "version-string": "157-303c484ec828ed0-7", + "port-version": 0 + }, + { + "git-tree": "f3a55052177912fa46d995287c48ba7cb35b5686", + "version-string": "157-303c484ec828ed0-6", + "port-version": 0 + }, + { + "git-tree": "f121a02d368b2f424537799641911729b42b708c", + "version-string": "157-303c484ec828ed0-4", + "port-version": 0 + }, + { + "git-tree": "94abc602fea54151621f5254f51ab38a7da1af43", + "version-string": "157-303c484ec828ed0-3", + "port-version": 0 + }, + { + "git-tree": "0bbaa0904af0642daf938bd19a80eb962fd78d5c", + "version-string": "157-303c484ec828ed0-2", + "port-version": 0 + }, + { + "git-tree": "0e3c7fbd7d63411bf37cfa707ea629d6930709ed", + "version-string": "157-303c484ec828ed0-1", + "port-version": 0 + }, + { + "git-tree": "4a8db18f5c6608b95b66d2bef765e6252d497c34", + "version-string": "157-303c484ec828ed0", + "port-version": 0 + }, + { + "git-tree": "6c5270d915c2d4c669749614d062a5b5ce2595e4", + "version-string": "152-e9a5903edf8ca59-1", + "port-version": 0 + }, + { + "git-tree": "0cf1dc24412ac6816f8d45b2eb96debd3dc9f116", + "version-string": "152-e9a5903edf8ca59", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/x-/x265.json b/externals/vcpkg/versions/x-/x265.json new file mode 100755 index 000000000..bd0e54ac1 --- /dev/null +++ b/externals/vcpkg/versions/x-/x265.json @@ -0,0 +1,84 @@ +{ + "versions": [ + { + "git-tree": "3904d5293aad0e38ee7ca93b82182441bb1575ca", + "version-string": "3.4", + "port-version": 5 + }, + { + "git-tree": "39318069e894d5dd6ff63112fd707c31b13be88b", + "version-string": "3.4", + "port-version": 4 + }, + { + "git-tree": "aa119fefeb5d57dd2b34ec63ea94942f868f1d94", + "version-string": "3.4", + "port-version": 3 + }, + { + "git-tree": "6323296cab664ff847a474065dd4ba983c742781", + "version-string": "3.4", + "port-version": 2 + }, + { + "git-tree": "9dcbd561136f877ea90a21d6416b9a83ffadf331", + "version-string": "3.4", + "port-version": 1 + }, + { + "git-tree": "0aa27c05994fc03948def72785fbf82202abe568", + "version-string": "3.4", + "port-version": 0 + }, + { + "git-tree": "874d7a8fa2d4fa5bbb7e5e4dda1b5d2cd3466e9b", + "version-string": "3.2", + "port-version": 5 + }, + { + "git-tree": "6451554d5de4d6a5b74488b48e49aaebfae180b5", + "version-string": "3.2-4", + "port-version": 0 + }, + { + "git-tree": "89d345fedc36e30eca8cc975d0a75dd5eaf31149", + "version-string": "3.2-3", + "port-version": 0 + }, + { + "git-tree": "a498e3895c78dd93c1ca869e6121868e0b710925", + "version-string": "3.2-1", + "port-version": 0 + }, + { + "git-tree": "595f8b44993620cc1859e056472bfe0e4f502ab3", + "version-string": "3.0-2", + "port-version": 0 + }, + { + "git-tree": "cca6bdc27cbab86bd831df220828798a3a4e5593", + "version-string": "3.0-1", + "port-version": 0 + }, + { + "git-tree": "1140f2914a8bee5950f877b54126aa5ee228cbdf", + "version-string": "2.9-2", + "port-version": 0 + }, + { + "git-tree": "2c978e438b969ba9a47bde43e1e5e0ade18ae416", + "version-string": "2.9-1", + "port-version": 0 + }, + { + "git-tree": "4e7554949366cd448f10222b0ab3f16815836b2d", + "version-string": "2.7-1", + "port-version": 0 + }, + { + "git-tree": "b08cebd92d975257d78f5fd8d1e5d19fd15989c8", + "version-string": "2.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/x-/xalan-c.json b/externals/vcpkg/versions/x-/xalan-c.json new file mode 100755 index 000000000..b9b318b55 --- /dev/null +++ b/externals/vcpkg/versions/x-/xalan-c.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "2a2f5f469a510da8d58186fc7f58f8fc9b1e83d6", + "version": "1.12", + "port-version": 1 + }, + { + "git-tree": "f09497ebb2b151b2ea0576a42ca284bcad3bf70d", + "version": "1.12", + "port-version": 0 + }, + { + "git-tree": "d5b33ff9e962fb546720b74e8535bda0567d7df1", + "version-string": "1.11-12", + "port-version": 0 + }, + { + "git-tree": "97fb3746c8ebf9f9bd87782ab3cf84eba90aeb83", + "version-string": "1.11-11", + "port-version": 0 + }, + { + "git-tree": "74729610eea7106a46b3620b5ebc6c4520fab075", + "version-string": "1.11-10", + "port-version": 0 + }, + { + "git-tree": "a1752665d23be5d78b08f8405334a306f40684c3", + "version-string": "1.11-9", + "port-version": 0 + }, + { + "git-tree": "5f6d1828f570deb8d760ca13b233bb2b2e839eac", + "version-string": "1.11-8", + "port-version": 0 + }, + { + "git-tree": "bbf5c7bcfb65ae96bdb8968c5326bd5df861ad59", + "version-string": "1.11-7", + "port-version": 0 + }, + { + "git-tree": "0e3a3f9eae5312f4ff68f4ef4d5e98bfd93fdb3b", + "version-string": "1.11-6", + "port-version": 0 + }, + { + "git-tree": "9b8d53b6e5a25b4af86b98a3d2f4aa2f4a3f2c24", + "version-string": "1.11-5", + "port-version": 0 + }, + { + "git-tree": "32d12ebd36c253f8de4a2167163f1c51e197b9cc", + "version-string": "1.11-4", + "port-version": 0 + }, + { + "git-tree": "ddab669382fa6e94c7fc5d49fa76cf7253a6fe87", + "version-string": "1.11-3", + "port-version": 0 + }, + { + "git-tree": "5f53f51056f1fb299353fd2a09f653898a2e0f05", + "version-string": "1.11-1", + "port-version": 0 + }, + { + "git-tree": "a1077e77eebd5e59bd3f81ea56671630e690a735", + "version-string": "1.11", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/x-/xaudio2redist.json b/externals/vcpkg/versions/x-/xaudio2redist.json new file mode 100755 index 000000000..7cf5b9801 --- /dev/null +++ b/externals/vcpkg/versions/x-/xaudio2redist.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "49a7df46ef685eea76f3775dfebc458117e6c33c", + "version": "1.2.9", + "port-version": 0 + }, + { + "git-tree": "fe3229572bacd0c7076a7a4d710f96e6b3a66a3f", + "version": "1.2.8", + "port-version": 3 + }, + { + "git-tree": "8ae7aaec9ebb9859356736f91710e8d9727d7a81", + "version": "1.2.8", + "port-version": 2 + }, + { + "git-tree": "4fe6eda4ff7a68db79013f5c5632e6e1a87b98e9", + "version": "1.2.8", + "port-version": 1 + }, + { + "git-tree": "71315ed933daddc996ecb863c39fc178b3f80771", + "version-string": "1.2.8", + "port-version": 0 + }, + { + "git-tree": "e33a929ddbf8ebc95959d6650a38d351aafea07c", + "version-string": "1.2.6", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/x-/xbyak.json b/externals/vcpkg/versions/x-/xbyak.json new file mode 100755 index 000000000..26a62ce56 --- /dev/null +++ b/externals/vcpkg/versions/x-/xbyak.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "d4441480fab1434594b5441612ae5158c81a6642", + "version": "6.60", + "port-version": 0 + }, + { + "git-tree": "ef05725cf97fc484f475a6db447bc6d503c8d42b", + "version-string": "6.00", + "port-version": 1 + }, + { + "git-tree": "ca393737aa37584343dc10008000c850f26b0881", + "version-string": "6.00", + "port-version": 0 + }, + { + "git-tree": "71447e4379e27bf5e16479edd03019e71ae36bb8", + "version-string": "5.991", + "port-version": 0 + }, + { + "git-tree": "9aa7b5691fe742129eac6572fd46cc1a4a6bd140", + "version-string": "5.97", + "port-version": 0 + }, + { + "git-tree": "dda17683a29ac77b3d831821323b153559be9b02", + "version-string": "5.93", + "port-version": 0 + }, + { + "git-tree": "c2f9338feb87c082f8611b2cacfc7b971b7b032a", + "version-string": "5.911", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/x-/xerces-c.json b/externals/vcpkg/versions/x-/xerces-c.json new file mode 100755 index 000000000..bb735c605 --- /dev/null +++ b/externals/vcpkg/versions/x-/xerces-c.json @@ -0,0 +1,99 @@ +{ + "versions": [ + { + "git-tree": "6e0b3743b100fd4c22291b3c55ff73aac8ae188c", + "version": "3.2.3", + "port-version": 4 + }, + { + "git-tree": "b920ebcb559e728e512c42e7e27ce5db58aba440", + "version-string": "3.2.3", + "port-version": 3 + }, + { + "git-tree": "f14ab8d047187d9621974f90d1981534ae7eb58a", + "version-string": "3.2.3", + "port-version": 2 + }, + { + "git-tree": "37d7c50f22be9c769e1c37f9bf12238ceb16b095", + "version-string": "3.2.3-1", + "port-version": 0 + }, + { + "git-tree": "86986ffb0f543c258e674c119a4a1171f2402c97", + "version-string": "3.2.3", + "port-version": 0 + }, + { + "git-tree": "5c599e54644454c85d931660c03a261e6f0c3524", + "version-string": "3.2.2-13", + "port-version": 0 + }, + { + "git-tree": "26c51d5500d35c20f769dea9e2406a79584f9494", + "version-string": "3.2.2-12", + "port-version": 0 + }, + { + "git-tree": "75afb4372109c7f71aa83cc121abc13cf2ce9f06", + "version-string": "3.2.2-11", + "port-version": 0 + }, + { + "git-tree": "5edee8dff70dec5ed5f084f1fd840828bb8728a8", + "version-string": "3.2.2-10", + "port-version": 0 + }, + { + "git-tree": "132a2839c7465e4b32a9cd085778301da5300d6c", + "version-string": "3.2.2-9", + "port-version": 0 + }, + { + "git-tree": "f8c771fa722a18c879a05d180fc684076a86c40f", + "version-string": "3.2.2-8", + "port-version": 0 + }, + { + "git-tree": "49115ebe6647037a00a5386bbdfb95dd01d3db02", + "version-string": "3.2.2-7", + "port-version": 0 + }, + { + "git-tree": "6971a3c6a659208aa6fa8bd6c5a22fbf7d3fcb42", + "version-string": "3.2.2-6", + "port-version": 0 + }, + { + "git-tree": "d0a6105bff0b5c98b7159043e8ab4788bfd2a850", + "version-string": "3.2.2-5", + "port-version": 0 + }, + { + "git-tree": "1497c28acbecdd80b2dd58bd477686af4757e2d6", + "version-string": "3.2.2-4", + "port-version": 0 + }, + { + "git-tree": "b65b09e4a8d8231e03be84856d37a872165c0737", + "version-string": "3.1.4-3", + "port-version": 0 + }, + { + "git-tree": "cf3af53bfe2b423716f22b01c8343cbad80ebeb9", + "version-string": "3.1.4-2", + "port-version": 0 + }, + { + "git-tree": "59585ff08d3d615e32914a03fcd6aa41d864ca9f", + "version-string": "3.1.4-1", + "port-version": 0 + }, + { + "git-tree": "d770dd0d8f954710fb98f304978b399069d848d0", + "version-string": "3.1.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/x-/xeus.json b/externals/vcpkg/versions/x-/xeus.json new file mode 100755 index 000000000..ddd6614a9 --- /dev/null +++ b/externals/vcpkg/versions/x-/xeus.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "2bb5d11153c9982aad5337c44d2f781918e8d991", + "version-string": "0.24.3", + "port-version": 1 + }, + { + "git-tree": "f35bb72c2cb6dfb85ca82106b31428762f82fc1c", + "version-string": "0.24.3", + "port-version": 0 + }, + { + "git-tree": "c8677407719fbe8f6af6098c9d8e852f6744055d", + "version-string": "0.24.1", + "port-version": 1 + }, + { + "git-tree": "92bafcc9dcf4397b9b27fd8952dfaff5b7fae983", + "version-string": "0.24.1", + "port-version": 0 + }, + { + "git-tree": "7c91b19434d04cc9e1b4422227f8e79eb799640c", + "version-string": "0.20.0-1", + "port-version": 0 + }, + { + "git-tree": "02d88d7707c16eef35b80bde734111e47d375358", + "version-string": "0.20.0", + "port-version": 0 + }, + { + "git-tree": "895d4235a808ff3f2de3bf46eb73e8bf8225b5fd", + "version-string": "0.19.2", + "port-version": 0 + }, + { + "git-tree": "9b5ed8e4edc9cb4c16ae15ff9572298f1d1275af", + "version-string": "0.19.1-1", + "port-version": 0 + }, + { + "git-tree": "4244370d9a5573057c4107566c03eb76649c4618", + "version-string": "2019-02-13-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/x-/xframe.json b/externals/vcpkg/versions/x-/xframe.json new file mode 100755 index 000000000..05a9a31ea --- /dev/null +++ b/externals/vcpkg/versions/x-/xframe.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "7dc9d49f9de1237cea644f835be6631ba0c76c4a", + "version-string": "0.3.0", + "port-version": 1 + }, + { + "git-tree": "e46a9d8a02694ec336be6e73997faf69b5422525", + "version-string": "0.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/x-/xlnt.json b/externals/vcpkg/versions/x-/xlnt.json new file mode 100755 index 000000000..cda2e706d --- /dev/null +++ b/externals/vcpkg/versions/x-/xlnt.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "225346f8b24e3d09ad6b63b928ed2e6f1cfed4d4", + "version": "1.5.0", + "port-version": 3 + }, + { + "git-tree": "e6bb2b46d0e6bf4e603c93c974bd2eb704e3a520", + "version": "1.5.0", + "port-version": 2 + }, + { + "git-tree": "1e9127d56c2d772d64454b5aef80f93689f70242", + "version-string": "1.5.0", + "port-version": 1 + }, + { + "git-tree": "1f17fd4b98bd2f8a5f0d02aa8db2cd7b1ed1552f", + "version-string": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "3e755c8cd46b12f97c62350e2fbc75fb2eab51b9", + "version-string": "1.4.0-1", + "port-version": 0 + }, + { + "git-tree": "b47b4241845ee18c0f3049f2442291b564ced080", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "58ae07ca16d0bece2bf1f88a57dc6064ad3ac4a9", + "version-string": "1.3.0-2", + "port-version": 0 + }, + { + "git-tree": "94040da1f8bc4a343855b6b59b73b5c5967afb96", + "version-string": "1.3.0-1", + "port-version": 0 + }, + { + "git-tree": "798acc113ec6cb163b134bf93b3d4b90ddc512c0", + "version-string": "1.2.0-2", + "port-version": 0 + }, + { + "git-tree": "2b67fab90447364aeb9ca2e0777546f30d651e20", + "version-string": "1.2.0-1", + "port-version": 0 + }, + { + "git-tree": "feb9a83dc9d07501aff7adf420ab34e65b6f8789", + "version-string": "1.1.0-1", + "port-version": 0 + }, + { + "git-tree": "8c4beafb55c6c40edcc86a9564a736f21814e122", + "version-string": "0.9.4-1", + "port-version": 0 + }, + { + "git-tree": "ef8eabcd06ad1da0172e1659a6776e6659b753d1", + "version-string": "0.9.4", + "port-version": 0 + }, + { + "git-tree": "b37ab66705e287ab8e288842e2e5015d37dceaf5", + "version-string": "0.9.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/x-/xlsxio.json b/externals/vcpkg/versions/x-/xlsxio.json new file mode 100755 index 000000000..167faf72b --- /dev/null +++ b/externals/vcpkg/versions/x-/xlsxio.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "363ef11ba53c472f8ec8186c455f964b49088d7f", + "version-date": "2021-03-24", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/x-/xmlsec.json b/externals/vcpkg/versions/x-/xmlsec.json new file mode 100755 index 000000000..f9b1032eb --- /dev/null +++ b/externals/vcpkg/versions/x-/xmlsec.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "a41c14aae637b02b4e018902e0f9b67bcdef12f2", + "version": "1.2.34", + "port-version": 0 + }, + { + "git-tree": "635a9b0883829c524cc712d552d9a265ef984bf7", + "version": "1.2.33", + "port-version": 0 + }, + { + "git-tree": "f15cb0d0c8dd69a916421866901a7bce6d81666c", + "version": "1.2.32", + "port-version": 0 + }, + { + "git-tree": "9bce4d43cc99b63c9be1b547fcede14a75a61447", + "version-string": "1.2.31", + "port-version": 1 + }, + { + "git-tree": "9f0df3480ea9d16e5857f7d6815ff6fb3107b05f", + "version-string": "1.2.31", + "port-version": 0 + }, + { + "git-tree": "a80d7faba040539c72252349094de99721f95f8c", + "version-string": "1.2.30", + "port-version": 1 + }, + { + "git-tree": "3666525c286be5b8527050e479ae70c167a673fa", + "version-string": "1.2.30", + "port-version": 0 + }, + { + "git-tree": "ca8056619a12dee092a64b76f4f84975f74836aa", + "version-string": "1.2.29-2", + "port-version": 0 + }, + { + "git-tree": "46bd9d1a728ff3828e5cee3b74eec25104db1750", + "version-string": "1.2.29-1", + "port-version": 0 + }, + { + "git-tree": "e11af619a6f2b5ce3b2e645d3e03a0b83e97055b", + "version-string": "1.2.29", + "port-version": 0 + }, + { + "git-tree": "fec89fad8c0730ede93564437939aff871edc532", + "version-string": "1.2.28", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/x-/xmsh.json b/externals/vcpkg/versions/x-/xmsh.json new file mode 100755 index 000000000..0c12cb213 --- /dev/null +++ b/externals/vcpkg/versions/x-/xmsh.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "f08388b4f7fc367a02fd99bb1cefe9d04fb04f04", + "version-string": "0.5.2", + "port-version": 2 + }, + { + "git-tree": "c31519998bc1ccf0233cd893b16363e354721db4", + "version-string": "0.5.2-1", + "port-version": 0 + }, + { + "git-tree": "9b63868a331d72d2b31003cee7d19519c951c56e", + "version-string": "0.5.2", + "port-version": 0 + }, + { + "git-tree": "3ff1ec8086702823e870bfe3a2a5996db64178c6", + "version-string": "0.4.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/x-/xnnpack.json b/externals/vcpkg/versions/x-/xnnpack.json new file mode 100755 index 000000000..aab502fa7 --- /dev/null +++ b/externals/vcpkg/versions/x-/xnnpack.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "dba10dfefac481caee9f94c49fc60878c5bb57a1", + "version-date": "2021-05-17", + "port-version": 2 + }, + { + "git-tree": "d998602ed266e9cf140fb6740fea8625276a48f5", + "version-date": "2021-05-17", + "port-version": 1 + }, + { + "git-tree": "a35b56ac05249424cfcc4ad4727e34d7e1216f25", + "version-date": "2021-05-17", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/x-/xorstr.json b/externals/vcpkg/versions/x-/xorstr.json new file mode 100755 index 000000000..c101bca64 --- /dev/null +++ b/externals/vcpkg/versions/x-/xorstr.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "37ea1ae54d689346b2edbf358f950e1939a9c66d", + "version-date": "2021-10-23", + "port-version": 0 + }, + { + "git-tree": "6a02da6c23263a76324be04c21a28f11cc4cfca1", + "version-date": "2020-11-29", + "port-version": 0 + }, + { + "git-tree": "7a37997c7a1c699a78241cd445521f7704be6b76", + "version-string": "2020-02-11", + "port-version": 0 + }, + { + "git-tree": "d9501e51b6623da0d917986c4ec2eb8f782dec08", + "version-string": "2019-08-10", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/x-/xproperty.json b/externals/vcpkg/versions/x-/xproperty.json new file mode 100755 index 000000000..0d6ce4d94 --- /dev/null +++ b/externals/vcpkg/versions/x-/xproperty.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "1acf4b775a462fc93484010247364837b2ea8133", + "version-string": "0.8.1", + "port-version": 1 + }, + { + "git-tree": "da04206a148f3886f504922d68ee7bb6931bfb35", + "version-string": "0.8.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/x-/xqilla.json b/externals/vcpkg/versions/x-/xqilla.json new file mode 100755 index 000000000..edca35147 --- /dev/null +++ b/externals/vcpkg/versions/x-/xqilla.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "110b08065d892a635f1a8f2dd76f42727788020f", + "version": "2.3.4", + "port-version": 1 + }, + { + "git-tree": "5e0e7d4ac944e58a70a8a71a8a715598b22c7e73", + "version": "2.3.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/x-/xsimd.json b/externals/vcpkg/versions/x-/xsimd.json new file mode 100755 index 000000000..82d262ad1 --- /dev/null +++ b/externals/vcpkg/versions/x-/xsimd.json @@ -0,0 +1,79 @@ +{ + "versions": [ + { + "git-tree": "3d7f059f0f9d91da33b87a09615ef7f7f84cc76a", + "version": "8.1.0", + "port-version": 0 + }, + { + "git-tree": "e7b050635a31da5fce9834a6e8e859eb160b3916", + "version": "8.0.3", + "port-version": 0 + }, + { + "git-tree": "9809d05e16b0047099b1c43c4d81f5f34efe6a8c", + "version-string": "7.4.9", + "port-version": 1 + }, + { + "git-tree": "6a90c6aea234c06968da8f6c48ea73ae7d95d28e", + "version-string": "7.4.9", + "port-version": 0 + }, + { + "git-tree": "0fd573b8bacc1ecb86f0217b5e56b3014728f580", + "version-string": "7.4.8", + "port-version": 0 + }, + { + "git-tree": "3e6166e2e3002cd05d19f31b75d6f30b8fc522ec", + "version-string": "7.4.6", + "port-version": 0 + }, + { + "git-tree": "1081676020f0420bbd55208e78e3a76e6c2636bf", + "version-string": "7.4.5", + "port-version": 0 + }, + { + "git-tree": "4ade533d73c09e276c9852aa6cbfc6a402a93a23", + "version-string": "7.2.5", + "port-version": 0 + }, + { + "git-tree": "97f76318034ad8cb1e78df717819307c1c0090de", + "version-string": "7.2.3-2", + "port-version": 0 + }, + { + "git-tree": "883ca27572ae59ed8e9b7c9c5873d05496c323cd", + "version-string": "7.2.3-1", + "port-version": 0 + }, + { + "git-tree": "e5c8d8cce44724c0925f0bda642c0ede4553753c", + "version-string": "7.2.3", + "port-version": 0 + }, + { + "git-tree": "d63d66240daca30beda311fb07787ee74e687007", + "version-string": "7.2.2", + "port-version": 0 + }, + { + "git-tree": "f76bd91bf4c4dbe6d201c1c0107dc7e3f100465f", + "version-string": "7.2.1", + "port-version": 0 + }, + { + "git-tree": "265a525d8ac1a3b179deab85f56fb7444331781b", + "version-string": "7.1.3", + "port-version": 0 + }, + { + "git-tree": "f7d40283b43d177d46727d1408706600ad8a60ef", + "version-string": "7.1.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/x-/xtensor-blas.json b/externals/vcpkg/versions/x-/xtensor-blas.json new file mode 100755 index 000000000..f377a2b39 --- /dev/null +++ b/externals/vcpkg/versions/x-/xtensor-blas.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "6524a2462dd339878f2e32de8962576a15097a5e", + "version-string": "0.17.2", + "port-version": 2 + }, + { + "git-tree": "d046baeae79d8ce5a5c535ad3c60fe4e65db7366", + "version-string": "0.17.2", + "port-version": 1 + }, + { + "git-tree": "be4b0910ad2f14c7560353e570cd97f2c2919247", + "version-string": "0.17.2", + "port-version": 0 + }, + { + "git-tree": "ff6131a47ff421212e20baab9aafdd77e2501bf7", + "version-string": "0.17.1", + "port-version": 0 + }, + { + "git-tree": "012849d033ed76bfbb71a6ec743da3cce732cf02", + "version-string": "0.16.1", + "port-version": 0 + }, + { + "git-tree": "1d02d6755400f753c5aedb5f598c47a6f993ab29", + "version-string": "0.15.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/x-/xtensor-fftw.json b/externals/vcpkg/versions/x-/xtensor-fftw.json new file mode 100755 index 000000000..b54968211 --- /dev/null +++ b/externals/vcpkg/versions/x-/xtensor-fftw.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "ca6e7889f9ae5d1d9a627d7591e22962cde621c4", + "version-string": "2019-11-30", + "port-version": 2 + }, + { + "git-tree": "a83a72b6737956e551fe4ddbaa12564048141cec", + "version-string": "2019-11-30", + "port-version": 1 + }, + { + "git-tree": "507af996ff26bc000fd73761de24f58be61507bd", + "version-string": "2019-11-30", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/x-/xtensor-io.json b/externals/vcpkg/versions/x-/xtensor-io.json new file mode 100755 index 000000000..9c5f26f19 --- /dev/null +++ b/externals/vcpkg/versions/x-/xtensor-io.json @@ -0,0 +1,39 @@ +{ + "versions": [ + { + "git-tree": "5673651fb8b30a016de2c3a3d7fbe96838690cb1", + "version": "0.13.0", + "port-version": 1 + }, + { + "git-tree": "71f1c4cb5fb871e6dd863766646a38b232a20b2f", + "version": "0.13.0", + "port-version": 0 + }, + { + "git-tree": "ba855025d72826b6462959f0e8f895e62102e626", + "version": "0.12.8", + "port-version": 1 + }, + { + "git-tree": "0f70c1f44abb24d6d3883b9cd5efd4acc0473787", + "version": "0.12.8", + "port-version": 0 + }, + { + "git-tree": "3320a5f7436e8ecde84b90eb918806fbf034cafa", + "version-string": "0.9.0", + "port-version": 1 + }, + { + "git-tree": "3bda5e38afd906085b050f73b25428a3a0b95214", + "version-string": "0.9.0", + "port-version": 0 + }, + { + "git-tree": "8379808fda37d8184db586840bba04f85b265037", + "version-string": "0.7.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/x-/xtensor.json b/externals/vcpkg/versions/x-/xtensor.json new file mode 100755 index 000000000..3d91ce24b --- /dev/null +++ b/externals/vcpkg/versions/x-/xtensor.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "b7e23c44907ce8f4ca8cec01cb5534f092e74dda", + "version": "0.24.0", + "port-version": 0 + }, + { + "git-tree": "ca365f721479380995943c5ab4e8cdd6866ec785", + "version": "0.23.10", + "port-version": 0 + }, + { + "git-tree": "5566727b83f68936619a2bf8872c1148a30c5c61", + "version-string": "0.21.9", + "port-version": 0 + }, + { + "git-tree": "3285cac5db5564b88bc032dc1afb06289d2953a8", + "version-string": "0.21.6", + "port-version": 0 + }, + { + "git-tree": "b6ce0d2b0f98d7536e49b6b72c2023526793f6d9", + "version-string": "0.21.3", + "port-version": 0 + }, + { + "git-tree": "30539e9c1585d5c2b0abbb61660feba31c7d5a43", + "version-string": "0.21.2", + "port-version": 0 + }, + { + "git-tree": "650d534643542577628e56467f28f426756a0ea3", + "version-string": "0.20.8", + "port-version": 0 + }, + { + "git-tree": "18f7fb322b2fc323bcab74894a44e80416fbec67", + "version-string": "0.20.7-2", + "port-version": 0 + }, + { + "git-tree": "8cea19d9df7a2ee5484c00708b6b64c33f5ab1a9", + "version-string": "0.20.7-1", + "port-version": 0 + }, + { + "git-tree": "fcc53ee2ed4665630b68f28b82a6f1c30e1febea", + "version-string": "0.20.7", + "port-version": 0 + }, + { + "git-tree": "1be4c2f3cf4ac4773a5f995b474ff263053eebe0", + "version-string": "0.20.5", + "port-version": 0 + }, + { + "git-tree": "6df88ca11371ca5624fd23851e75be148618d7ef", + "version-string": "0.19.3", + "port-version": 0 + }, + { + "git-tree": "be639cb43ae34308a3970da60d73c856d8e3708e", + "version-string": "2019-01-20", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/x-/xtl.json b/externals/vcpkg/versions/x-/xtl.json new file mode 100755 index 000000000..f3baee90b --- /dev/null +++ b/externals/vcpkg/versions/x-/xtl.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "2665b2dcd2f142f932337987817369ae8a377bbe", + "version": "0.7.2", + "port-version": 0 + }, + { + "git-tree": "f0cc60a9db2ec13e64cda97ae85bb344a8cd3e10", + "version-string": "0.6.21", + "port-version": 0 + }, + { + "git-tree": "c6682c073b48d7675bb3d236c1ddf339090f6154", + "version-string": "0.6.18", + "port-version": 0 + }, + { + "git-tree": "f69d466cce3089a9d295643d474b379e589c601a", + "version-string": "0.6.11", + "port-version": 0 + }, + { + "git-tree": "5d3095cf508a30f18a0c24256a103f5b0fec3922", + "version-string": "0.6.10", + "port-version": 0 + }, + { + "git-tree": "bc1cbe58845705fc01b35bac4a7bab3a2ee7b85b", + "version-string": "0.6.5", + "port-version": 0 + }, + { + "git-tree": "bead179c1b17b511804cafcf9cffb575393f7b6b", + "version-string": "0.6.4", + "port-version": 0 + }, + { + "git-tree": "a9b12447e8db53c110404d730a692201e53ee5c7", + "version-string": "0.5.4", + "port-version": 0 + }, + { + "git-tree": "238cce967e8f6dd4b92e507f3f1b4b7bd7c45947", + "version-string": "0.5.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/x-/xxhash.json b/externals/vcpkg/versions/x-/xxhash.json new file mode 100755 index 000000000..bd93be72c --- /dev/null +++ b/externals/vcpkg/versions/x-/xxhash.json @@ -0,0 +1,59 @@ +{ + "versions": [ + { + "git-tree": "895a0039b3cd40c7f66725608d07dc851e0d54b6", + "version": "0.8.1", + "port-version": 1 + }, + { + "git-tree": "69e750b7b17d837d2d7e41385c7f339e7e23f65c", + "version": "0.8.1", + "port-version": 0 + }, + { + "git-tree": "427341c7e75df558fc7fe5ff69340387877bddf8", + "version-string": "0.8.0", + "port-version": 2 + }, + { + "git-tree": "b0513b38c64783f4c9fe001b995f62a10f2e6d8c", + "version-string": "0.8.0", + "port-version": 1 + }, + { + "git-tree": "bf43ef4c3cf428cfc5c89e07008321caec66e923", + "version-string": "0.8.0", + "port-version": 0 + }, + { + "git-tree": "318c3d88579895b6b288694282494bb6ab366de2", + "version-string": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "bab43952d557d7d33f36c79cb2644035eb7a939d", + "version-string": "0.6.4-1", + "port-version": 0 + }, + { + "git-tree": "313f9b028310d91dea6bbed71ef881640dc59891", + "version-string": "0.6.4", + "port-version": 0 + }, + { + "git-tree": "bf8862a937ee1da793008dd671553e183e3a4e0f", + "version-string": "0.6.3-1", + "port-version": 0 + }, + { + "git-tree": "882693b8deea7d882395c29b0649008940ad7999", + "version-string": "0.6.3", + "port-version": 0 + }, + { + "git-tree": "21ced86901edd80f5dd31cdadda0017c86785095", + "version-string": "0.6.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/y-/yajl.json b/externals/vcpkg/versions/y-/yajl.json new file mode 100755 index 000000000..a6494c169 --- /dev/null +++ b/externals/vcpkg/versions/y-/yajl.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "348d0cb4e70b0db911dbd9e014d69164eb53cec4", + "version-string": "2.1.0", + "port-version": 3 + }, + { + "git-tree": "a1f09d6c9effe9aa148fb4c659498c3dc82c61d8", + "version-string": "2.1.0", + "port-version": 2 + }, + { + "git-tree": "b91fee2584125e4f7eb17d16127db70c035164b1", + "version-string": "2.1.0-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/y-/yaml-cpp.json b/externals/vcpkg/versions/y-/yaml-cpp.json new file mode 100755 index 000000000..8d7170546 --- /dev/null +++ b/externals/vcpkg/versions/y-/yaml-cpp.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "a79d9c026aefee69214dbd39294da49398b07c7b", + "version-semver": "0.7.0", + "port-version": 1 + }, + { + "git-tree": "a71932a4f18c3cc6e0bd2bdce57fbf744e0efe2b", + "version-semver": "0.7.0", + "port-version": 0 + }, + { + "git-tree": "045045b2d5b8cb6166b6d0d548effc0764623341", + "version-string": "0.6.3", + "port-version": 1 + }, + { + "git-tree": "fabfdd85c28d751aa769d2e743bf0e9ccd8dd178", + "version-string": "0.6.3", + "port-version": 0 + }, + { + "git-tree": "613f6450df1c2032c3fa499dad4575658f37ca39", + "version-string": "0.6.2-3", + "port-version": 0 + }, + { + "git-tree": "61de23b286e94be1f49a2a20940268a17f666086", + "version-string": "0.6.2-2", + "port-version": 0 + }, + { + "git-tree": "325fd2b8906df2b997bdcc3abc5380330b0a5046", + "version-string": "0.6.2-1", + "port-version": 0 + }, + { + "git-tree": "9f2b057c9ed2c4a241ece16c273610acb4eeb8d2", + "version-string": "0.6.2", + "port-version": 0 + }, + { + "git-tree": "893c537e8a1fbd42b543c5e8c644339e197d097e", + "version-string": "0.6.2-1", + "port-version": 0 + }, + { + "git-tree": "9f2b057c9ed2c4a241ece16c273610acb4eeb8d2", + "version-string": "0.6.2", + "port-version": 0 + }, + { + "git-tree": "d9a93b9108e8f74bf8232dbe2511e87ebf75ac46", + "version-string": "0.6.1", + "port-version": 0 + }, + { + "git-tree": "1581988165a4a8f71eeea887ffe7505e6165cfc9", + "version-string": "0.5.4-rc-2", + "port-version": 0 + }, + { + "git-tree": "097af6135482212eedae5d402a7e0b49f9338d24", + "version-string": "0.5.4-rc-1", + "port-version": 0 + }, + { + "git-tree": "ee3bb4553a4e53a1ac419d77b1739910d68126fd", + "version-string": "0.5.4 candidate", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/y-/yara.json b/externals/vcpkg/versions/y-/yara.json new file mode 100755 index 000000000..5931955d9 --- /dev/null +++ b/externals/vcpkg/versions/y-/yara.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "f071df4391cee4f96e8f7bb5820d7d3f70db50e1", + "version": "4.2.0", + "port-version": 0 + }, + { + "git-tree": "081abbbfc62033c4254ae833f61d48c5cea4151c", + "version": "4.1.1", + "port-version": 0 + }, + { + "git-tree": "9dfbd10f01283a8a8cf15ddb60db75e5635d3a69", + "version": "4.1.0", + "port-version": 0 + }, + { + "git-tree": "05877091cce367e06a5d4e06ed69484d92e420d0", + "version-string": "4.0.2", + "port-version": 0 + }, + { + "git-tree": "fe271e17f4744b14d0ac8ae068a37886c76938fc", + "version-string": "3.10.0-1", + "port-version": 0 + }, + { + "git-tree": "a5d7d9a3390fb13e5e0bfae561d7f5b60166933c", + "version-string": "3.10.0", + "port-version": 0 + }, + { + "git-tree": "04ff93911dfd06d230c3655f3f543edb7791124f", + "version-string": "e3439e4ead4ed5d3b75a0b46eaf15ddda2110bb9-2", + "port-version": 0 + }, + { + "git-tree": "da59de45fdc6d82326d9bb2a63a7d7f6cfa24ffe", + "version-string": "e3439e4ead4ed5d3b75a0b46eaf15ddda2110bb9-1", + "port-version": 0 + }, + { + "git-tree": "8bbd51b411776d044599cee9fb3962b0745d8b1f", + "version-string": "e3439e4ead4ed5d3b75a0b46eaf15ddda2110bb9", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/y-/yas.json b/externals/vcpkg/versions/y-/yas.json new file mode 100755 index 000000000..38d3f741f --- /dev/null +++ b/externals/vcpkg/versions/y-/yas.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "52a671ae15bd1c29c00baa756d8b1f83e7cc3db2", + "version": "7.1.0", + "port-version": 0 + }, + { + "git-tree": "65fcc49d8cf563755c7fab9116c57b4de9780d73", + "version-string": "7.0.5", + "port-version": 1 + }, + { + "git-tree": "1976b779d7006fcca2cbe8315c3cd88fd18badd0", + "version-string": "7.0.5", + "port-version": 0 + }, + { + "git-tree": "d347f65f39f0dc3042d2c4bf7c86d323aa6626b2", + "version-string": "7.0.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/y-/yasm-tool-helper.json b/externals/vcpkg/versions/y-/yasm-tool-helper.json new file mode 100755 index 000000000..c8ab8dabf --- /dev/null +++ b/externals/vcpkg/versions/y-/yasm-tool-helper.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "0a2dfb294bebae79c48cc710756756164175be1d", + "version-date": "2020-03-11", + "port-version": 1 + }, + { + "git-tree": "7d0e3b2224338888cd1e2f7a00c182961a7ea760", + "version-string": "2020-03-11", + "port-version": 0 + }, + { + "git-tree": "cd72a3cb256fdf68ad6b78a64613744ca2bc1d1f", + "version-string": "2020-10-12", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/y-/yasm-tool.json b/externals/vcpkg/versions/y-/yasm-tool.json new file mode 100755 index 000000000..41a4f9b70 --- /dev/null +++ b/externals/vcpkg/versions/y-/yasm-tool.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "5dc61ac1b2f25ef005c279fd65cd98cbdedc161a", + "version-date": "2021-12-14", + "port-version": 0 + }, + { + "git-tree": "456004e2ac7a578572cb14ebf581c246b869516a", + "version": "1.3.0", + "port-version": 1 + }, + { + "git-tree": "cb913a26c18cde98be038655f65d2363ecee2cc1", + "version": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "40cca1c50553ac0d87c91af9c0125d8f3e6e8a09", + "version-string": "2020-10-12", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/y-/yasm.json b/externals/vcpkg/versions/y-/yasm.json new file mode 100755 index 000000000..8ce7047cc --- /dev/null +++ b/externals/vcpkg/versions/y-/yasm.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "4368509dc3dfe6cab848b8713b22c9c0ef408527", + "version": "1.3.0", + "port-version": 3 + }, + { + "git-tree": "eaab6c3ae3bfc1ffcfaee3b1695d7ee21dacc7b1", + "version-string": "1.3.0", + "port-version": 2 + }, + { + "git-tree": "10778f3b98b275cbbc840e6a3c6d96465b2a20a9", + "version-string": "1.3.0", + "port-version": 1 + }, + { + "git-tree": "252cc74ece532436f42df78cfb8aaa3c2735673c", + "version-string": "1.3.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/y-/yato.json b/externals/vcpkg/versions/y-/yato.json new file mode 100755 index 000000000..856103ad3 --- /dev/null +++ b/externals/vcpkg/versions/y-/yato.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "302773e4845f27896621a44a76a964baec26f3e8", + "version-date": "2022-03-06", + "port-version": 0 + }, + { + "git-tree": "8605c052211c8394b3f3a524ffe071307582a941", + "version-string": "1.0", + "port-version": 3 + }, + { + "git-tree": "4ff4647e49ec1e98b49e1bc9d6b8cf236bce7831", + "version-string": "1.0-2", + "port-version": 0 + }, + { + "git-tree": "f370a9928149b5b81594432b71f2d543e1a39b47", + "version-string": "1.0-1", + "port-version": 0 + }, + { + "git-tree": "b5b20aecce47d074e3b998157b84007474a83241", + "version-string": "1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/y-/yoga.json b/externals/vcpkg/versions/y-/yoga.json new file mode 100755 index 000000000..891c54e4c --- /dev/null +++ b/externals/vcpkg/versions/y-/yoga.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "12751eb94758566f26b621b28dc86fe8b1977a7f", + "version": "1.19.0", + "port-version": 0 + }, + { + "git-tree": "00f17f608ffc20c70786f750aa66035b0f1f0ca4", + "version-string": "1.18.0", + "port-version": 2 + }, + { + "git-tree": "3052ea42237961392cbc1fab6d07160337919cdd", + "version-string": "1.18.0-1", + "port-version": 0 + }, + { + "git-tree": "5746ab64a20bcac47d870203c8be47945839b47e", + "version-string": "1.16.0-1", + "port-version": 0 + }, + { + "git-tree": "fb9b2a38a9239128eda8bdb4212a5c5f1089923d", + "version-string": "1.14.0-1", + "port-version": 0 + }, + { + "git-tree": "2ea74a02f9d32dadbc8f4ec525e954c6ec885df9", + "version-string": "1.14.0", + "port-version": 0 + }, + { + "git-tree": "6c231ebc718ef28685f4ce22ecbe371605e21d69", + "version-string": "1.12.0-pre.3", + "port-version": 0 + }, + { + "git-tree": "5c1e13a787f95f5d478e2ad7e0d1669bf5b65be1", + "version-string": "1.13.0", + "port-version": 0 + }, + { + "git-tree": "a0b6613df15131ac3bf78b6a3882aa928f929a43", + "version-string": "1.10.0", + "port-version": 0 + }, + { + "git-tree": "a677828a2b738dd166f65bbbde053c460292e3e7", + "version-string": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "b5842dca227152db9acbd686bb7e59db89fa0a14", + "version-string": "1.8.0-1", + "port-version": 0 + }, + { + "git-tree": "712f3e192b3988c31125ab03e52c5d2598e930da", + "version-string": "1.7.0-1", + "port-version": 0 + }, + { + "git-tree": "2617d24dc94ded5216ab1c61277284732f1c8177", + "version-string": "1.7.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/y-/yomm2.json b/externals/vcpkg/versions/y-/yomm2.json new file mode 100755 index 000000000..27dd3f312 --- /dev/null +++ b/externals/vcpkg/versions/y-/yomm2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5d025f5bb550c4a43b070841b8a48936d0644017", + "version-string": "1.1.2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/y-/yyjson.json b/externals/vcpkg/versions/y-/yyjson.json new file mode 100755 index 000000000..73ac88b71 --- /dev/null +++ b/externals/vcpkg/versions/y-/yyjson.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "228eaef5ad7cddcc8e76dc73b2741f75cc18912a", + "version": "0.5.0", + "port-version": 0 + }, + { + "git-tree": "2d4f6a2936ab89c986bb1c3cafd5e3ca796ce7fa", + "version": "0.4.0", + "port-version": 0 + }, + { + "git-tree": "ced4d99c46f8c50e8c8df046af0fe54cce4a0dbb", + "version": "0.3.0", + "port-version": 0 + }, + { + "git-tree": "17bac25e372c49899aae3a59d5725cc614f65165", + "version-date": "2021-04-12", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/z-/z3.json b/externals/vcpkg/versions/z-/z3.json new file mode 100755 index 000000000..ae108bc45 --- /dev/null +++ b/externals/vcpkg/versions/z-/z3.json @@ -0,0 +1,74 @@ +{ + "versions": [ + { + "git-tree": "a1217f07ef4a8f918f5b61a01057a4ee70f92422", + "version": "4.8.16", + "port-version": 0 + }, + { + "git-tree": "ca14e43533889ce4abf89af387b73d015e133c4a", + "version": "4.8.15", + "port-version": 0 + }, + { + "git-tree": "78366a5b407998768b97ddee528306cf9cbe9847", + "version": "4.8.14", + "port-version": 0 + }, + { + "git-tree": "eb7c4238f0496b64a6527fd4b07dd753f31a1975", + "version": "4.8.12", + "port-version": 2 + }, + { + "git-tree": "679ab881c1277be69ffc601a568e3b47d4d55432", + "version": "4.8.12", + "port-version": 1 + }, + { + "git-tree": "898df3d611ad4a833593adbfd7f2a3b0e686fc2b", + "version": "4.8.12", + "port-version": 0 + }, + { + "git-tree": "9c0fdcbcb443a4d0e2b58a1b3b56424e8c2d384c", + "version-semver": "4.8.10", + "port-version": 0 + }, + { + "git-tree": "7081291c8d70cea0a783c78fa8f27219cad7b77c", + "version-string": "4.8.9", + "port-version": 0 + }, + { + "git-tree": "6555488e80a528c2470ceaf03c4c89c7afe02e2e", + "version-string": "4.8.8", + "port-version": 0 + }, + { + "git-tree": "400c779fbbcb32b7a2438b0bf59edfebc21a10bb", + "version-string": "4.8.6", + "port-version": 0 + }, + { + "git-tree": "f9c69bb54bb81b18f317dd2967b52634a7944a04", + "version-string": "4.8.5-1", + "port-version": 0 + }, + { + "git-tree": "5ed567eda111af09f639a9a81f5577c4739a2010", + "version-string": "4.8.5", + "port-version": 0 + }, + { + "git-tree": "9151b0fe33bb47860dff2049e0e86233cee2e57a", + "version-string": "4.8.4-1", + "port-version": 0 + }, + { + "git-tree": "fe89bbe59ac13cb35531d231cacb629f5d140241", + "version-string": "4.8.4", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/z-/z85.json b/externals/vcpkg/versions/z-/z85.json new file mode 100755 index 000000000..1301a3972 --- /dev/null +++ b/externals/vcpkg/versions/z-/z85.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "eb7115fc8b2a5c84c958196521ec5f6c5f502ca6", + "version-string": "1.0", + "port-version": 1 + }, + { + "git-tree": "b56d7eb36e5f53164b2f3dba37327a68fc98d378", + "version-string": "1.0", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/z-/zeroc-ice.json b/externals/vcpkg/versions/z-/zeroc-ice.json new file mode 100755 index 000000000..905dc77c3 --- /dev/null +++ b/externals/vcpkg/versions/z-/zeroc-ice.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "1ddc4746c1f19fca41706071fac4575ea99fe6b9", + "version": "3.7.7", + "port-version": 2 + }, + { + "git-tree": "f32e4c338e25d36018095348e632c794b13fc513", + "version": "3.7.7", + "port-version": 1 + }, + { + "git-tree": "bdb180069d461c04c1eee1a7937afa63d0ea752b", + "version": "3.7.7", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/z-/zeromq.json b/externals/vcpkg/versions/z-/zeromq.json new file mode 100755 index 000000000..03d110f38 --- /dev/null +++ b/externals/vcpkg/versions/z-/zeromq.json @@ -0,0 +1,204 @@ +{ + "versions": [ + { + "git-tree": "246f585e58f536087c5f70f918459d5500a4dc43", + "version": "4.3.4", + "port-version": 5 + }, + { + "git-tree": "efc9d6229adaef7b036d222004dd786353f8cd4e", + "version": "4.3.4", + "port-version": 4 + }, + { + "git-tree": "46cd1dcc3bc077341533cc01c32f467d1a7e181f", + "version": "4.3.4", + "port-version": 3 + }, + { + "git-tree": "423c351e8759303bc9ba74a065ce9b983a5f85f5", + "version": "4.3.4", + "port-version": 2 + }, + { + "git-tree": "43f1c320c2710a2f0efa61b54608a33da707bd43", + "version": "4.3.4", + "port-version": 1 + }, + { + "git-tree": "baf0f8a38476e24bbe2b3f4cac31ed02fff29bc4", + "version-string": "4.3.4", + "port-version": 0 + }, + { + "git-tree": "8b2b16bcbcdd4854b2bebbafb27fc9c511ad4c07", + "version-string": "2019-09-20", + "port-version": 2 + }, + { + "git-tree": "aa4a6c2a6f555fe546e2f8f1bdc5f608abb23826", + "version-string": "2019-09-20", + "port-version": 1 + }, + { + "git-tree": "711b57c71c897ffe55b412b9e06d9f7aa906cb30", + "version-string": "2019-09-20", + "port-version": 0 + }, + { + "git-tree": "ef8e2ddef1e9d99cefa55a6ed7b31bcfd4e45459", + "version-string": "2019-07-09-1", + "port-version": 0 + }, + { + "git-tree": "56d2fd5a500eb7c5bb356c2f57d116721233ee37", + "version-string": "2019-07-09", + "port-version": 0 + }, + { + "git-tree": "75faa79980735e0923648ef7d4c8313922744108", + "version-string": "2019-05-07", + "port-version": 0 + }, + { + "git-tree": "d941ab6cd82d6afc9c4bb063f0c91d0d804c5ec9", + "version-string": "2019-04-19", + "port-version": 0 + }, + { + "git-tree": "c2c1c74284b70fafa1f506224bd68fec842cc58a", + "version-string": "2019-01-30", + "port-version": 0 + }, + { + "git-tree": "6ee8da90743523d60d6e0d1db349bbbfca395133", + "version-string": "2019-01-09", + "port-version": 0 + }, + { + "git-tree": "024abc1aebe0758601e8034fb6ea7f149734089d", + "version-string": "2018-12-14", + "port-version": 0 + }, + { + "git-tree": "27e7b1ee5e44ff3bcac05a4f31849ebdcc890040", + "version-string": "2018-11-01", + "port-version": 0 + }, + { + "git-tree": "cac85f13f476d04a63d433eefa86cb942bb94cbd", + "version-string": "2018-10-11", + "port-version": 0 + }, + { + "git-tree": "0f8b5598e91519d9ea3c63f9ee227a53aefa4166", + "version-string": "2018-09-18", + "port-version": 0 + }, + { + "git-tree": "c983f0ccc772fb2e1c6e5b6a9cf374d3b25d0c75", + "version-string": "2018-07-30", + "port-version": 0 + }, + { + "git-tree": "5e95c42e21675fad6e1c17468a8aab7a83e9e9ed", + "version-string": "2018-07-01", + "port-version": 0 + }, + { + "git-tree": "d07ee4d15a4a952b8263531318fe01aa7b3f373e", + "version-string": "2018-06-15", + "port-version": 0 + }, + { + "git-tree": "b63c5a345cee07afc4de7664973ab3ae913a68c3", + "version-string": "2018-05-17", + "port-version": 0 + }, + { + "git-tree": "d3adab928e512bf541e570e61c92ae4b87a22246", + "version-string": "2018-05-01", + "port-version": 0 + }, + { + "git-tree": "1278b7e3c3b7be5a9f0857ee67ecdc66572b4d1c", + "version-string": "2018-04-25", + "port-version": 0 + }, + { + "git-tree": "aae2a5f333ebb9b3be312c209c31c109fd8f3ac5", + "version-string": "2018-04-17", + "port-version": 0 + }, + { + "git-tree": "a2b20a4888a762b3f88e9ecc4f5c8dfc6a331ae2", + "version-string": "2018-04-05-1", + "port-version": 0 + }, + { + "git-tree": "ea6c8a7a5a5d3e947111cb65ed1c2b212ac16841", + "version-string": "2018-04-05", + "port-version": 0 + }, + { + "git-tree": "605ba6226dee060b0d7997d03dfc45ea15888899", + "version-string": "2018-03-29", + "port-version": 0 + }, + { + "git-tree": "b16ca9f02276e6943cd3febd5ce0d0c7350192db", + "version-string": "2018-03-27", + "port-version": 0 + }, + { + "git-tree": "15c0de06b7bf53a3bd9d2437c5419212da768233", + "version-string": "2018-03-23", + "port-version": 0 + }, + { + "git-tree": "3bb3f4c4f2699ee016384a53c2ad98c0bc4a135f", + "version-string": "2018-03-20", + "port-version": 0 + }, + { + "git-tree": "b2e2d84972349c244af76eb036c7a51c5641f542", + "version-string": "2018-03-17", + "port-version": 0 + }, + { + "git-tree": "adc5178758d6f76415ed144843bc41f854e97c5c", + "version-string": "2018-03-14", + "port-version": 0 + }, + { + "git-tree": "7785608ea2fcbaccb02686c429a9486c5bbd6740", + "version-string": "20170908-18498f620f0f6d4076981ea16eb5760fe4d28dc2-2", + "port-version": 0 + }, + { + "git-tree": "68b255bcf82e79f475e858b14b516d19a1578f07", + "version-string": "20170908-18498f620f0f6d4076981ea16eb5760fe4d28dc2-1", + "port-version": 0 + }, + { + "git-tree": "6c3b61de8093c3f32eaeaaae6af922b62caae353", + "version-string": "20170908-18498f620f0f6d4076981ea16eb5760fe4d28dc2", + "port-version": 0 + }, + { + "git-tree": "c3ddc1b59840067e81cceccbee42b04b0078ac5f", + "version-string": "4.2.2", + "port-version": 0 + }, + { + "git-tree": "ee57eeb0e7c57bbd14a7ee07fb0270eedb18d14e", + "version-string": "4.2.0", + "port-version": 0 + }, + { + "git-tree": "835d0f3ec8c1ea55b992fb57a7ecc25ffd7c22be", + "version-string": "4.2.x.1a02b1b3f2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/z-/zfp.json b/externals/vcpkg/versions/z-/zfp.json new file mode 100755 index 000000000..30b657231 --- /dev/null +++ b/externals/vcpkg/versions/z-/zfp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "b9fdf34882de98a9ffaf9225f665b49176d7e97f", + "version-string": "0.5.5", + "port-version": 3 + }, + { + "git-tree": "bb74f3eda84b0d0a5426601889ae3bacb68e6b6f", + "version-string": "0.5.5-2", + "port-version": 0 + }, + { + "git-tree": "8826139df2d4dd3ed9d61aca249865ee3f209753", + "version-string": "0.5.5-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/z-/zkpp.json b/externals/vcpkg/versions/z-/zkpp.json new file mode 100755 index 000000000..5cac9127c --- /dev/null +++ b/externals/vcpkg/versions/z-/zkpp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "bcef2196b5ca1a1cc813c22eb903e5a9677f9eab", + "version": "0.2.3", + "port-version": 2 + }, + { + "git-tree": "5d45cca2392d1a09d62bc9e2d53e1296f0bd49fc", + "version-string": "0.2.3", + "port-version": 1 + }, + { + "git-tree": "36ee3997fc686a009718566997f969892ae134bd", + "version-string": "0.2.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/z-/zlib-ng.json b/externals/vcpkg/versions/z-/zlib-ng.json new file mode 100755 index 000000000..3cb2637e6 --- /dev/null +++ b/externals/vcpkg/versions/z-/zlib-ng.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "3324dce4e575e9ba671576b06108c612d0b500bf", + "version": "2.0.6", + "port-version": 0 + }, + { + "git-tree": "1edea9190001c716b745514982d2ee684f1183e8", + "version": "2.0.5", + "port-version": 0 + }, + { + "git-tree": "7020274700cc1aaa817aa752f36a423fed7c095c", + "version": "2.0.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/z-/zlib.json b/externals/vcpkg/versions/z-/zlib.json new file mode 100755 index 000000000..523f7374a --- /dev/null +++ b/externals/vcpkg/versions/z-/zlib.json @@ -0,0 +1,89 @@ +{ + "versions": [ + { + "git-tree": "ecc4c064d4911faf12d8bf5fd6bcd5c556d89774", + "version": "1.2.12", + "port-version": 1 + }, + { + "git-tree": "9c4edb1fabbd87dd236a200ba55eaf241cd8c8d0", + "version": "1.2.12", + "port-version": 0 + }, + { + "git-tree": "92cfe30c807d343c6359d272242f0765ad906740", + "version": "1.2.11", + "port-version": 13 + }, + { + "git-tree": "89dce3592d1a0a275009278b14bd85fd817b4ad9", + "version-string": "1.2.11", + "port-version": 12 + }, + { + "git-tree": "ad5b59cd3722af26f09921297562dfc76c83dbf8", + "version-string": "1.2.11", + "port-version": 11 + }, + { + "git-tree": "53a4615c8bb9b98a3864b834a6bbe51cc6c849ef", + "version-string": "1.2.11", + "port-version": 10 + }, + { + "git-tree": "827111046e37c98153d9d82bb6fa4183b6d728e4", + "version-string": "1.2.11", + "port-version": 9 + }, + { + "git-tree": "068430e3e24fa228c302c808ba99f8a48d126557", + "version-string": "1.2.11", + "port-version": 8 + }, + { + "git-tree": "6a24abc8d789ceacc8aaf7c81e2a3faf1f037d14", + "version-string": "1.2.11", + "port-version": 7 + }, + { + "git-tree": "0efe4e4647fa585e6ac34a250df2d9989825bb90", + "version-string": "1.2.11-6", + "port-version": 0 + }, + { + "git-tree": "548fc3e95e4755b329cdd40cde7d83a409182469", + "version-string": "1.2.11-5", + "port-version": 0 + }, + { + "git-tree": "568cdfb5144c8de58daac62bace38cf7d5040e4a", + "version-string": "1.2.11-3", + "port-version": 0 + }, + { + "git-tree": "6ada5449a413aa717545457cb6e674d1590f1573", + "version-string": "1.2.11-2", + "port-version": 0 + }, + { + "git-tree": "51525f628e33dc6aa8fd00db8a7b53bc2f392da4", + "version-string": "1.2.11-1", + "port-version": 0 + }, + { + "git-tree": "356c8b9d736b19e30f83d7ef735d21e0c063c6ca", + "version-string": "1.2.11", + "port-version": 0 + }, + { + "git-tree": "a516e5ee220c8250f21821077d0e3dd517f02631", + "version-string": "1.2.10", + "port-version": 0 + }, + { + "git-tree": "3309ec82cd96d752ff890c441cb20ef49b52bf94", + "version-string": "1.2.8", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/z-/zookeeper.json b/externals/vcpkg/versions/z-/zookeeper.json new file mode 100755 index 000000000..61432ca7d --- /dev/null +++ b/externals/vcpkg/versions/z-/zookeeper.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "2ad08d6a8c4d4f812c50c02872d046c84dd4ccbc", + "version": "3.5.6", + "port-version": 0 + }, + { + "git-tree": "44fbecb403595fea598756cf946b00e0a2f21dad", + "version-string": "3.5.5", + "port-version": 2 + }, + { + "git-tree": "e9a48341219262a6519a4d1403db84e328426a08", + "version-string": "3.5.5-1", + "port-version": 0 + }, + { + "git-tree": "5cb5036ecf90b95cacb6ff1c071e180faf1337b0", + "version-string": "3.5.5", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/z-/zopfli.json b/externals/vcpkg/versions/z-/zopfli.json new file mode 100755 index 000000000..437702602 --- /dev/null +++ b/externals/vcpkg/versions/z-/zopfli.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "e80818813d5dfa5b563c84485d4a0030ce90906a", + "version-string": "1.0.3", + "port-version": 1 + }, + { + "git-tree": "27c5f23197d8f38f23f64810b6a0ced0158b66cb", + "version-string": "1.0.3", + "port-version": 0 + }, + { + "git-tree": "190a3b27e6c9bde1731b207a98852782f8c139b2", + "version-string": "2019-01-19-1", + "port-version": 0 + }, + { + "git-tree": "a734b694b16814ddd397ef451b3da942e5952ae2", + "version-string": "2019-01-19", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/z-/zpp-bits.json b/externals/vcpkg/versions/z-/zpp-bits.json new file mode 100755 index 000000000..a375c2314 --- /dev/null +++ b/externals/vcpkg/versions/z-/zpp-bits.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "c360348897285a2a3bfa0b5db6f8cc09da9893be", + "version": "4.4.4", + "port-version": 0 + }, + { + "git-tree": "cfb5cd37a6ed4a1ccab70eeb3112db9ad3d2f026", + "version": "4.3.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/z-/zserge-webview.json b/externals/vcpkg/versions/z-/zserge-webview.json new file mode 100755 index 000000000..a25f30fe0 --- /dev/null +++ b/externals/vcpkg/versions/z-/zserge-webview.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "e10cdad91c0d47a7dc03717d941254291abfd0eb", + "version-string": "2019-04-27", + "port-version": 3 + }, + { + "git-tree": "91f16a7320fcf8432fca4c071e0a9c1817f56cbd", + "version-string": "2019-04-27-2", + "port-version": 0 + }, + { + "git-tree": "106ea28ccc426c18a277e84f725c91d469985d32", + "version-string": "2019-04-27-1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/z-/zstd.json b/externals/vcpkg/versions/z-/zstd.json new file mode 100755 index 000000000..7fe2aa211 --- /dev/null +++ b/externals/vcpkg/versions/z-/zstd.json @@ -0,0 +1,109 @@ +{ + "versions": [ + { + "git-tree": "2f8a5da3f925dc994500dabb2d3b5c7e11df0afd", + "version": "1.5.2", + "port-version": 1 + }, + { + "git-tree": "4e0feee1fa5d2c318aa16702dc6c89d9301a8ddb", + "version": "1.5.2", + "port-version": 0 + }, + { + "git-tree": "1260425f27dec6dd2e795369d4c28de5a676daef", + "version-semver": "1.5.0", + "port-version": 1 + }, + { + "git-tree": "b605e1bf30a124c99845c16733aac48289ae6a87", + "version-semver": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "3a0ffa2a8fe8246a3937d9f6a77d577e351dd445", + "version": "1.4.9", + "port-version": 0 + }, + { + "git-tree": "b592e9dd5ab7aa6c1b46e0d23e0d31093edd73ca", + "version-string": "1.4.5", + "port-version": 1 + }, + { + "git-tree": "f54acbd978ca51777ce06122fdc5d69c25265b5c", + "version-string": "1.4.4", + "port-version": 3 + }, + { + "git-tree": "6ab50055bdc3d4ead6bbd553651f9f0c7cbd6f94", + "version-string": "1.4.4", + "port-version": 2 + }, + { + "git-tree": "3ba4b114d0f04692783b2590e604283e7e7f042b", + "version-string": "1.4.4-1", + "port-version": 0 + }, + { + "git-tree": "33e39327c2c70618754051fd73f72a0267298ab9", + "version-string": "1.4.4", + "port-version": 0 + }, + { + "git-tree": "f02ec97c7e6df39cc9a46b702dcfd422707fe870", + "version-string": "1.4.0-1", + "port-version": 0 + }, + { + "git-tree": "23e41fd77fbadcb4052c4eecb114352fa18a23c0", + "version-string": "1.4.0", + "port-version": 0 + }, + { + "git-tree": "96feb17d2d1ef2509eebb9b1284d160118463bf6", + "version-string": "1.3.7-2", + "port-version": 0 + }, + { + "git-tree": "6f6e87428ee4fa34b6eb5c8c063fe62f3047c813", + "version-string": "1.3.7-1", + "port-version": 0 + }, + { + "git-tree": "735aba46d7ed2c20f8d30f841a0ab68ab9bf28e7", + "version-string": "1.3.4", + "port-version": 0 + }, + { + "git-tree": "89c93fcd82e1fb5764d313e7c498e05bac20fcd7", + "version-string": "1.3.3", + "port-version": 0 + }, + { + "git-tree": "46a00bf089292b0381b9e67e9e9f56daa1704d10", + "version-string": "1.3.1-1", + "port-version": 0 + }, + { + "git-tree": "6c78658a31bfe05da6e32da1f2786d7355bcc15e", + "version-string": "1.3.1", + "port-version": 0 + }, + { + "git-tree": "c4e2736515da855d2b6976192c53f4d9d21fd2b5", + "version-string": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "84ea38bb014aee1a9cecd0a251208ea5233c0311", + "version-string": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "6e4431618021d7578990d7cecd406ba49ffa0a18", + "version-string": "1.1.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/z-/zstr.json b/externals/vcpkg/versions/z-/zstr.json new file mode 100755 index 000000000..906cad877 --- /dev/null +++ b/externals/vcpkg/versions/z-/zstr.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "7a13e5cb665ce878aa5b6c9723a0e375e1be5c15", + "version-string": "1.0.4", + "port-version": 2 + }, + { + "git-tree": "339a979f431eb74d38dbb731f60b89fd6cc2a43a", + "version-string": "1.0.4", + "port-version": 1 + }, + { + "git-tree": "9e180d152b886a9b45cc03c36fadaee8968d79d1", + "version-string": "1.0.4", + "port-version": 0 + }, + { + "git-tree": "ecfa65565472759dcfe5da572db74531cef69da4", + "version-string": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/z-/ztd-text.json b/externals/vcpkg/versions/z-/ztd-text.json new file mode 100755 index 000000000..11d2b3dc2 --- /dev/null +++ b/externals/vcpkg/versions/z-/ztd-text.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "594b7d2a437b6576bfd4993e9763cac18621e903", + "version-date": "2022-03-21", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/z-/zug.json b/externals/vcpkg/versions/z-/zug.json new file mode 100755 index 000000000..6518dff54 --- /dev/null +++ b/externals/vcpkg/versions/z-/zug.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ebb162e61d6a161de1d01184b20389079eb3fdc6", + "version-date": "2021-04-23", + "port-version": 1 + }, + { + "git-tree": "2213b3d809f8a99994484b626896f6cf6e3858c3", + "version-date": "2021-04-23", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/z-/zxing-cpp.json b/externals/vcpkg/versions/z-/zxing-cpp.json new file mode 100755 index 000000000..7b9975f26 --- /dev/null +++ b/externals/vcpkg/versions/z-/zxing-cpp.json @@ -0,0 +1,49 @@ +{ + "versions": [ + { + "git-tree": "242f57c2d8cbb10698ed8353b2efe1a716a5d177", + "version-string": "2020-12", + "port-version": 3 + }, + { + "git-tree": "4891ff3ded94308cdc3f4c3b73956b80317a4767", + "version-string": "2020-12-2", + "port-version": 0 + }, + { + "git-tree": "d7761651d4c426d0322f52d5508b5beb66af6c9d", + "version-string": "3.3.3", + "port-version": 8 + }, + { + "git-tree": "a4b0e8ce0773a272e37b3b0ef4dcf4771d620f24", + "version-string": "3.3.3-7", + "port-version": 0 + }, + { + "git-tree": "460ac7317e61f434d938631a2de82c55b2c2324e", + "version-string": "3.3.3-6", + "port-version": 0 + }, + { + "git-tree": "544d28892fc3c90fad8ae125c172e58923e1ca0a", + "version-string": "3.3.3-5", + "port-version": 0 + }, + { + "git-tree": "78241ab4164a882ef3b2d26e0a97ffa2f04f96f6", + "version-string": "3.3.3-4", + "port-version": 0 + }, + { + "git-tree": "155c05375b047a53d88b7f91da9e592548468bb3", + "version-string": "3.3.3-3", + "port-version": 0 + }, + { + "git-tree": "2649920bf4a7c4fcccf19d84130e36856023cc89", + "version-string": "3.3.3-2", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/z-/zydis.json b/externals/vcpkg/versions/z-/zydis.json new file mode 100755 index 000000000..c3338b555 --- /dev/null +++ b/externals/vcpkg/versions/z-/zydis.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "ea22eba12ef8bd109c21b3684abe6513070e122f", + "version-semver": "3.2.1", + "port-version": 0 + }, + { + "git-tree": "1377782663be41b89898db78843a8e35417f90e9", + "version-string": "3.1.0", + "port-version": 2 + }, + { + "git-tree": "a27e395ffb6b0c8329228b3df9c3af8fd19c1b44", + "version-string": "3.1.0-1", + "port-version": 0 + }, + { + "git-tree": "1b0270a633fe432a70244f2f810bdb59c90d2bc8", + "version-string": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "e089469cf7e5a019171b1cc8507ab402b1e713e8", + "version-string": "2.0.3", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/z-/zyre.json b/externals/vcpkg/versions/z-/zyre.json new file mode 100755 index 000000000..d32f3b0fd --- /dev/null +++ b/externals/vcpkg/versions/z-/zyre.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "2efde0db3fd2fb13029cd66d585311ac1d6d146b", + "version-string": "2019-07-07", + "port-version": 3 + }, + { + "git-tree": "118b2285a26addbacaefb2f573f27e1a13bd4af3", + "version-string": "2019-07-07", + "port-version": 2 + }, + { + "git-tree": "b3300f003099d2e0597453a90fa1df903b6b5c56", + "version-string": "2019-07-07-1", + "port-version": 0 + }, + { + "git-tree": "40277e20c025cb75ce978df03921b79354d54b6f", + "version-string": "2019-07-07", + "port-version": 0 + } + ] +} diff --git a/externals/vcpkg/versions/z-/zziplib.json b/externals/vcpkg/versions/z-/zziplib.json new file mode 100755 index 000000000..63363563f --- /dev/null +++ b/externals/vcpkg/versions/z-/zziplib.json @@ -0,0 +1,69 @@ +{ + "versions": [ + { + "git-tree": "571af9ee98bd4bf80bf21fc10a5ec5971678b954", + "version": "0.13.72", + "port-version": 1 + }, + { + "git-tree": "e09e8bf85eff5c115f9dcf5372f8bdbab590ab6b", + "version": "0.13.72", + "port-version": 0 + }, + { + "git-tree": "af9957469a45f5b512845c4f180af1a7e4e2e886", + "version-string": "0.13.71", + "port-version": 3 + }, + { + "git-tree": "a83631e1e1b136f52e8367253ef162fb369f36a3", + "version-string": "0.13.71", + "port-version": 2 + }, + { + "git-tree": "7cdcdf231074be830e74ba4c498b9b34ba50b94a", + "version-string": "0.13.71", + "port-version": 1 + }, + { + "git-tree": "46d8c438267ece7a8e8ca0079896b25e579a845d", + "version-string": "0.13.71", + "port-version": 0 + }, + { + "git-tree": "333d5e69b5cbabfaa3546c82fe02625e2697a492", + "version-string": "0.13.69-4", + "port-version": 0 + }, + { + "git-tree": "42ebb18a0e56352eb30235bca393c9e4b1a57b6a", + "version-string": "0.13.69-3", + "port-version": 0 + }, + { + "git-tree": "695c2d19cae510498c778f638937d493f804af27", + "version-string": "0.13.69-2", + "port-version": 0 + }, + { + "git-tree": "96e1bf5cd31519fda79a3a1158ac8fab9d380138", + "version-string": "0.13.69-1", + "port-version": 0 + }, + { + "git-tree": "40d5420caade60bef0ac6c8fcccf631d25c98204", + "version-string": "0.13.69", + "port-version": 0 + }, + { + "git-tree": "08fd5cd576cb00754f7836c1253c50106f5c922b", + "version-string": "0.13.62-1", + "port-version": 0 + }, + { + "git-tree": "bdb83205c616c6605de6a805a465663a88e91323", + "version-string": "0.13.62", + "port-version": 0 + } + ] +} diff --git a/src/audio_core/renderer/command/data_source/decode.cpp b/src/audio_core/renderer/command/data_source/decode.cpp index 0759a67ef..ff5d31bd6 100755 --- a/src/audio_core/renderer/command/data_source/decode.cpp +++ b/src/audio_core/renderer/command/data_source/decode.cpp @@ -105,12 +105,10 @@ static u32 DecodeAdpcm(Core::Memory::Memory& memory, std::span out_buffer, constexpr u32 NibblesPerFrame{16}; if (req.buffer == 0 || req.buffer_size == 0) { - LOG_ERROR(Service_Audio, "Buffer is 0!"); return 0; } - if (req.start_offset >= req.end_offset) { - LOG_ERROR(Service_Audio, "Start offset greater than end offset!"); + if (req.end_offset < req.start_offset) { return 0; } @@ -122,8 +120,7 @@ static u32 DecodeAdpcm(Core::Memory::Memory& memory, std::span out_buffer, end += 1; } - if (end / 2 > req.buffer_size) { - LOG_ERROR(Service_Audio, "End greater than buffer size!"); + if (req.buffer_size < end / 2) { return 0; } @@ -141,7 +138,7 @@ static u32 DecodeAdpcm(Core::Memory::Memory& memory, std::span out_buffer, } const auto size{std::max((samples_to_process / 8U) * SamplesPerFrame, 8U)}; - std::vector wavebuffer(size, 0); + std::vector wavebuffer(size); memory.ReadBlockUnsafe(req.buffer + position_in_frame / 2, wavebuffer.data(), wavebuffer.size()); @@ -239,7 +236,7 @@ void DecodeFromWaveBuffers(Core::Memory::Memory& memory, const DecodeFromWaveBuf args.pitch}; const auto size_required{fraction + remaining_sample_count * sample_rate_ratio}; - if (size_required.to_int_floor() < 0) { + if (size_required < 0) { return; } @@ -325,19 +322,22 @@ void DecodeFromWaveBuffers(Core::Memory::Memory& memory, const DecodeFromWaveBuf switch (args.sample_format) { case SampleFormat::PcmInt16: samples_decoded = DecodePcm( - memory, {&temp_buffer[temp_buffer_pos], args.sample_count}, decode_arg); + memory, {&temp_buffer[temp_buffer_pos], TempBufferSize - temp_buffer_pos}, + decode_arg); break; case SampleFormat::PcmFloat: samples_decoded = DecodePcm( - memory, {&temp_buffer[temp_buffer_pos], args.sample_count}, decode_arg); + memory, {&temp_buffer[temp_buffer_pos], TempBufferSize - temp_buffer_pos}, + decode_arg); break; case SampleFormat::Adpcm: { decode_arg.adpcm_context = &voice_state.adpcm_context; memory.ReadBlockUnsafe(args.data_address, &decode_arg.coefficients, args.data_size); samples_decoded = DecodeAdpcm( - memory, {&temp_buffer[temp_buffer_pos], args.sample_count}, decode_arg); + memory, {&temp_buffer[temp_buffer_pos], TempBufferSize - temp_buffer_pos}, + decode_arg); } break; default: diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index dbfc371df..174e776c5 100755 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -189,8 +189,9 @@ create_target_directory_groups(common) target_link_libraries(common PUBLIC ${Boost_LIBRARIES} fmt::fmt microprofile Threads::Threads) target_link_libraries(common PRIVATE lz4::lz4 xbyak) -if (MSVC) +if (TARGET zstd::zstd) target_link_libraries(common PRIVATE zstd::zstd) else() - target_link_libraries(common PRIVATE zstd) + target_link_libraries(common PRIVATE + $,zstd::libzstd_shared,zstd::libzstd_static>) endif() diff --git a/src/common/input.h b/src/common/input.h index 995c35d9d..bb42aaacc 100755 --- a/src/common/input.h +++ b/src/common/input.h @@ -28,7 +28,7 @@ enum class InputType { Color, Vibration, Nfc, - IrSensor, + Ir, }; // Internal battery charge level @@ -53,15 +53,6 @@ enum class PollingMode { IR, }; -enum class CameraFormat { - Size320x240, - Size160x120, - Size80x60, - Size40x30, - Size20x15, - None, -}; - // Vibration reply from the controller enum class VibrationError { None, @@ -77,13 +68,6 @@ enum class PollingError { Unknown, }; -// Ir camera reply from the controller -enum class CameraError { - None, - NotSupported, - Unknown, -}; - // Hint for amplification curve to be used enum class VibrationAmplificationType { Linear, @@ -192,12 +176,6 @@ struct LedStatus { bool led_4{}; }; -// Raw data fom camera -struct CameraStatus { - CameraFormat format{CameraFormat::None}; - std::vector data{}; -}; - // List of buttons to be passed to Qt that can be translated enum class ButtonNames { Undefined, @@ -255,7 +233,6 @@ struct CallbackStatus { BodyColorStatus color_status{}; BatteryStatus battery_status{}; VibrationStatus vibration_status{}; - CameraStatus camera_status{}; }; // Triggered once every input change @@ -304,10 +281,6 @@ public: virtual PollingError SetPollingMode([[maybe_unused]] PollingMode polling_mode) { return PollingError::NotSupported; } - - virtual CameraError SetCameraFormat([[maybe_unused]] CameraFormat camera_format) { - return CameraError::NotSupported; - } }; /// An abstract class template for a factory that can create input devices. diff --git a/src/common/settings.h b/src/common/settings.h index 1079cf8cb..06d72c8bf 100755 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -503,9 +503,6 @@ struct Values { Setting enable_ring_controller{true, "enable_ring_controller"}; RingconRaw ringcon_analogs; - Setting enable_ir_sensor{false, "enable_ir_sensor"}; - Setting ir_sensor_device{"auto", "ir_sensor_device"}; - // Data Storage Setting use_virtual_sd{true, "use_virtual_sd"}; Setting gamecard_inserted{false, "gamecard_inserted"}; diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 66c65a885..cf329c850 100755 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -156,7 +156,6 @@ add_library(core STATIC hid/input_converter.h hid/input_interpreter.cpp hid/input_interpreter.h - hid/irs_types.h hid/motion_input.cpp hid/motion_input.h hle/api_version.h @@ -476,20 +475,6 @@ add_library(core STATIC hle/service/hid/hidbus/starlink.h hle/service/hid/hidbus/stubbed.cpp hle/service/hid/hidbus/stubbed.h - hle/service/hid/irsensor/clustering_processor.cpp - hle/service/hid/irsensor/clustering_processor.h - hle/service/hid/irsensor/image_transfer_processor.cpp - hle/service/hid/irsensor/image_transfer_processor.h - hle/service/hid/irsensor/ir_led_processor.cpp - hle/service/hid/irsensor/ir_led_processor.h - hle/service/hid/irsensor/moment_processor.cpp - hle/service/hid/irsensor/moment_processor.h - hle/service/hid/irsensor/pointing_processor.cpp - hle/service/hid/irsensor/pointing_processor.h - hle/service/hid/irsensor/processor_base.cpp - hle/service/hid/irsensor/processor_base.h - hle/service/hid/irsensor/tera_plugin_processor.cpp - hle/service/hid/irsensor/tera_plugin_processor.h hle/service/jit/jit_context.cpp hle/service/jit/jit_context.h hle/service/jit/jit.cpp diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp index 8c3895937..bd2384515 100755 --- a/src/core/hid/emulated_controller.cpp +++ b/src/core/hid/emulated_controller.cpp @@ -126,14 +126,10 @@ void EmulatedController::LoadDevices() { battery_params[LeftIndex].Set("battery", true); battery_params[RightIndex].Set("battery", true); - camera_params = Common::ParamPackage{"engine:camera,camera:1"}; - output_params[LeftIndex] = left_joycon; output_params[RightIndex] = right_joycon; - output_params[2] = camera_params; output_params[LeftIndex].Set("output", true); output_params[RightIndex].Set("output", true); - output_params[2].Set("output", true); LoadTASParams(); @@ -150,7 +146,6 @@ void EmulatedController::LoadDevices() { Common::Input::CreateDevice); std::transform(battery_params.begin(), battery_params.end(), battery_devices.begin(), Common::Input::CreateDevice); - camera_devices = Common::Input::CreateDevice(camera_params); std::transform(output_params.begin(), output_params.end(), output_devices.begin(), Common::Input::CreateDevice); @@ -272,14 +267,6 @@ void EmulatedController::ReloadInput() { motion_devices[index]->ForceUpdate(); } - if (camera_devices) { - camera_devices->SetCallback({ - .on_change = - [this](const Common::Input::CallbackStatus& callback) { SetCamera(callback); }, - }); - camera_devices->ForceUpdate(); - } - // Use a common UUID for TAS static constexpr Common::UUID TAS_UUID = Common::UUID{ {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xA5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}}; @@ -864,25 +851,6 @@ void EmulatedController::SetBattery(const Common::Input::CallbackStatus& callbac TriggerOnChange(ControllerTriggerType::Battery, true); } -void EmulatedController::SetCamera(const Common::Input::CallbackStatus& callback) { - std::unique_lock lock{mutex}; - controller.camera_values = TransformToCamera(callback); - - if (is_configuring) { - lock.unlock(); - TriggerOnChange(ControllerTriggerType::IrSensor, false); - return; - } - - controller.camera_state.sample++; - controller.camera_state.format = - static_cast(controller.camera_values.format); - controller.camera_state.data = controller.camera_values.data; - - lock.unlock(); - TriggerOnChange(ControllerTriggerType::IrSensor, true); -} - bool EmulatedController::SetVibration(std::size_t device_index, VibrationValue vibration) { if (device_index >= output_devices.size()) { return false; @@ -960,23 +928,6 @@ bool EmulatedController::SetPollingMode(Common::Input::PollingMode polling_mode) return output_device->SetPollingMode(polling_mode) == Common::Input::PollingError::None; } -bool EmulatedController::SetCameraFormat( - Core::IrSensor::ImageTransferProcessorFormat camera_format) { - LOG_INFO(Service_HID, "Set camera format {}", camera_format); - - auto& right_output_device = output_devices[static_cast(DeviceIndex::Right)]; - auto& camera_output_device = output_devices[2]; - - if (right_output_device->SetCameraFormat(static_cast( - camera_format)) == Common::Input::CameraError::None) { - return true; - } - - // Fallback to Qt camera if native device doesn't have support - return camera_output_device->SetCameraFormat(static_cast( - camera_format)) == Common::Input::CameraError::None; -} - void EmulatedController::SetLedPattern() { for (auto& device : output_devices) { if (!device) { @@ -1212,11 +1163,6 @@ BatteryValues EmulatedController::GetBatteryValues() const { return controller.battery_values; } -CameraValues EmulatedController::GetCameraValues() const { - std::scoped_lock lock{mutex}; - return controller.camera_values; -} - HomeButtonState EmulatedController::GetHomeButtons() const { std::scoped_lock lock{mutex}; if (is_configuring) { @@ -1305,11 +1251,6 @@ BatteryLevelState EmulatedController::GetBattery() const { return controller.battery_state; } -const CameraState& EmulatedController::GetCamera() const { - std::scoped_lock lock{mutex}; - return controller.camera_state; -} - void EmulatedController::TriggerOnChange(ControllerTriggerType type, bool is_npad_service_update) { std::scoped_lock lock{callback_mutex}; for (const auto& poller_pair : callback_list) { diff --git a/src/core/hid/emulated_controller.h b/src/core/hid/emulated_controller.h index 823c1700c..3f02ed3c0 100755 --- a/src/core/hid/emulated_controller.h +++ b/src/core/hid/emulated_controller.h @@ -15,12 +15,10 @@ #include "common/settings.h" #include "common/vector_math.h" #include "core/hid/hid_types.h" -#include "core/hid/irs_types.h" #include "core/hid/motion_input.h" namespace Core::HID { const std::size_t max_emulated_controllers = 2; -const std::size_t output_devices = 3; struct ControllerMotionInfo { Common::Input::MotionStatus raw_status{}; MotionInput emulated{}; @@ -36,16 +34,15 @@ using TriggerDevices = std::array, Settings::NativeTrigger::NumTriggers>; using BatteryDevices = std::array, max_emulated_controllers>; -using CameraDevices = std::unique_ptr; -using OutputDevices = std::array, output_devices>; +using OutputDevices = + std::array, max_emulated_controllers>; using ButtonParams = std::array; using StickParams = std::array; using ControllerMotionParams = std::array; using TriggerParams = std::array; using BatteryParams = std::array; -using CameraParams = Common::ParamPackage; -using OutputParams = std::array; +using OutputParams = std::array; using ButtonValues = std::array; using SticksValues = std::array; @@ -54,7 +51,6 @@ using TriggerValues = using ControllerMotionValues = std::array; using ColorValues = std::array; using BatteryValues = std::array; -using CameraValues = Common::Input::CameraStatus; using VibrationValues = std::array; struct AnalogSticks { @@ -74,12 +70,6 @@ struct BatteryLevelState { NpadPowerInfo right{}; }; -struct CameraState { - Core::IrSensor::ImageTransferProcessorFormat format{}; - std::vector data{}; - std::size_t sample{}; -}; - struct ControllerMotion { Common::Vec3f accel{}; Common::Vec3f gyro{}; @@ -106,7 +96,6 @@ struct ControllerStatus { ColorValues color_values{}; BatteryValues battery_values{}; VibrationValues vibration_values{}; - CameraValues camera_values{}; // Data for HID serices HomeButtonState home_button_state{}; @@ -118,7 +107,6 @@ struct ControllerStatus { NpadGcTriggerState gc_trigger_state{}; ControllerColors colors_state{}; BatteryLevelState battery_state{}; - CameraState camera_state{}; }; enum class ControllerTriggerType { @@ -129,7 +117,6 @@ enum class ControllerTriggerType { Color, Battery, Vibration, - IrSensor, Connected, Disconnected, Type, @@ -282,9 +269,6 @@ public: /// Returns the latest battery status from the controller with parameters BatteryValues GetBatteryValues() const; - /// Returns the latest camera status from the controller with parameters - CameraValues GetCameraValues() const; - /// Returns the latest status of button input for the hid::HomeButton service HomeButtonState GetHomeButtons() const; @@ -312,9 +296,6 @@ public: /// Returns the latest battery status from the controller BatteryLevelState GetBattery() const; - /// Returns the latest camera status from the controller - const CameraState& GetCamera() const; - /** * Sends a specific vibration to the output device * @return true if vibration had no errors @@ -334,13 +315,6 @@ public: */ bool SetPollingMode(Common::Input::PollingMode polling_mode); - /** - * Sets the desired camera format to be polled from a controller - * @param camera_format size of each frame - * @return true if SetCameraFormat was successfull - */ - bool SetCameraFormat(Core::IrSensor::ImageTransferProcessorFormat camera_format); - /// Returns the led pattern corresponding to this emulated controller LedPattern GetLedPattern() const; @@ -418,12 +392,6 @@ private: */ void SetBattery(const Common::Input::CallbackStatus& callback, std::size_t index); - /** - * Updates the camera status of the controller - * @param callback A CallbackStatus containing the camera status - */ - void SetCamera(const Common::Input::CallbackStatus& callback); - /** * Triggers a callback that something has changed on the controller status * @param type Input type of the event to trigger @@ -449,7 +417,6 @@ private: ControllerMotionParams motion_params; TriggerParams trigger_params; BatteryParams battery_params; - CameraParams camera_params; OutputParams output_params; ButtonDevices button_devices; @@ -457,7 +424,6 @@ private: ControllerMotionDevices motion_devices; TriggerDevices trigger_devices; BatteryDevices battery_devices; - CameraDevices camera_devices; OutputDevices output_devices; // TAS related variables diff --git a/src/core/hid/input_converter.cpp b/src/core/hid/input_converter.cpp index 68d143a01..18d9f042d 100755 --- a/src/core/hid/input_converter.cpp +++ b/src/core/hid/input_converter.cpp @@ -270,20 +270,6 @@ Common::Input::AnalogStatus TransformToAnalog(const Common::Input::CallbackStatu return status; } -Common::Input::CameraStatus TransformToCamera(const Common::Input::CallbackStatus& callback) { - Common::Input::CameraStatus camera{}; - switch (callback.type) { - case Common::Input::InputType::IrSensor: - camera = callback.camera_status; - break; - default: - LOG_ERROR(Input, "Conversion from type {} to camera not implemented", callback.type); - break; - } - - return camera; -} - void SanitizeAnalog(Common::Input::AnalogStatus& analog, bool clamp_value) { const auto& properties = analog.properties; float& raw_value = analog.raw_value; diff --git a/src/core/hid/input_converter.h b/src/core/hid/input_converter.h index 143c50cc0..2be36889f 100755 --- a/src/core/hid/input_converter.h +++ b/src/core/hid/input_converter.h @@ -76,14 +76,6 @@ Common::Input::TriggerStatus TransformToTrigger(const Common::Input::CallbackSta */ Common::Input::AnalogStatus TransformToAnalog(const Common::Input::CallbackStatus& callback); -/** - * Converts raw input data into a valid camera status. - * - * @param callback Supported callbacks: Camera. - * @return A valid CameraObject object. - */ -Common::Input::CameraStatus TransformToCamera(const Common::Input::CallbackStatus& callback); - /** * Converts raw analog data into a valid analog value * @param analog An analog object containing raw data and properties diff --git a/src/core/hle/service/hid/errors.h b/src/core/hle/service/hid/errors.h index 4613a4e60..46282f42e 100755 --- a/src/core/hle/service/hid/errors.h +++ b/src/core/hle/service/hid/errors.h @@ -19,10 +19,3 @@ constexpr Result InvalidNpadId{ErrorModule::HID, 709}; constexpr Result NpadNotConnected{ErrorModule::HID, 710}; } // namespace Service::HID - -namespace Service::IRS { - -constexpr Result InvalidProcessorState{ErrorModule::Irsensor, 78}; -constexpr Result InvalidIrCameraHandle{ErrorModule::Irsensor, 204}; - -} // namespace Service::IRS diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 5ecbddf94..89bb12442 100755 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -2345,8 +2345,8 @@ void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system std::make_shared(system)->InstallAsService(service_manager); std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); - std::make_shared(system)->InstallAsService(service_manager); + std::make_shared(system)->InstallAsService(service_manager); + std::make_shared(system)->InstallAsService(service_manager); std::make_shared(system)->InstallAsService(service_manager); } diff --git a/src/core/hle/service/hid/irs.cpp b/src/core/hle/service/hid/irs.cpp index d5107e41f..d2a91d913 100755 --- a/src/core/hle/service/hid/irs.cpp +++ b/src/core/hle/service/hid/irs.cpp @@ -1,28 +1,16 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include -#include - #include "core/core.h" #include "core/core_timing.h" -#include "core/hid/emulated_controller.h" -#include "core/hid/hid_core.h" #include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_shared_memory.h" #include "core/hle/kernel/k_transfer_memory.h" #include "core/hle/kernel/kernel.h" #include "core/hle/service/hid/errors.h" #include "core/hle/service/hid/irs.h" -#include "core/hle/service/hid/irsensor/clustering_processor.h" -#include "core/hle/service/hid/irsensor/image_transfer_processor.h" -#include "core/hle/service/hid/irsensor/ir_led_processor.h" -#include "core/hle/service/hid/irsensor/moment_processor.h" -#include "core/hle/service/hid/irsensor/pointing_processor.h" -#include "core/hle/service/hid/irsensor/tera_plugin_processor.h" -#include "core/memory.h" -namespace Service::IRS { +namespace Service::HID { IRS::IRS(Core::System& system_) : ServiceFramework{system_, "irs"} { // clang-format off @@ -48,19 +36,14 @@ IRS::IRS(Core::System& system_) : ServiceFramework{system_, "irs"} { }; // clang-format on - u8* raw_shared_memory = system.Kernel().GetIrsSharedMem().GetPointer(); RegisterHandlers(functions); - shared_memory = std::construct_at(reinterpret_cast(raw_shared_memory)); - - npad_device = system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Player1); } -IRS::~IRS() = default; void IRS::ActivateIrsensor(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; - LOG_WARNING(Service_IRS, "(STUBBED) called, applet_resource_user_id={}", + LOG_WARNING(Service_HID, "(STUBBED) called, applet_resource_user_id={}", applet_resource_user_id); IPC::ResponseBuilder rb{ctx, 2}; @@ -71,7 +54,7 @@ void IRS::DeactivateIrsensor(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto applet_resource_user_id{rp.Pop()}; - LOG_WARNING(Service_IRS, "(STUBBED) called, applet_resource_user_id={}", + LOG_WARNING(Service_HID, "(STUBBED) called, applet_resource_user_id={}", applet_resource_user_id); IPC::ResponseBuilder rb{ctx, 2}; @@ -92,7 +75,7 @@ void IRS::GetIrsensorSharedMemoryHandle(Kernel::HLERequestContext& ctx) { void IRS::StopImageProcessor(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { - Core::IrSensor::IrCameraHandle camera_handle; + IrCameraHandle camera_handle; INSERT_PADDING_WORDS_NOINIT(1); u64 applet_resource_user_id; }; @@ -105,23 +88,17 @@ void IRS::StopImageProcessor(Kernel::HLERequestContext& ctx) { parameters.camera_handle.npad_type, parameters.camera_handle.npad_id, parameters.applet_resource_user_id); - auto result = IsIrCameraHandleValid(parameters.camera_handle); - if (result.IsSuccess()) { - // TODO: Stop Image processor - result = ResultSuccess; - } - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(result); + rb.Push(ResultSuccess); } void IRS::RunMomentProcessor(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { - Core::IrSensor::IrCameraHandle camera_handle; + IrCameraHandle camera_handle; INSERT_PADDING_WORDS_NOINIT(1); u64 applet_resource_user_id; - Core::IrSensor::PackedMomentProcessorConfig processor_config; + PackedMomentProcessorConfig processor_config; }; static_assert(sizeof(Parameters) == 0x30, "Parameters has incorrect size."); @@ -132,28 +109,19 @@ void IRS::RunMomentProcessor(Kernel::HLERequestContext& ctx) { parameters.camera_handle.npad_type, parameters.camera_handle.npad_id, parameters.applet_resource_user_id); - const auto result = IsIrCameraHandleValid(parameters.camera_handle); - - if (result.IsSuccess()) { - auto& device = GetIrCameraSharedMemoryDeviceEntry(parameters.camera_handle); - MakeProcessor(parameters.camera_handle, device); - auto& image_transfer_processor = GetProcessor(parameters.camera_handle); - image_transfer_processor.SetConfig(parameters.processor_config); - } - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(result); + rb.Push(ResultSuccess); } void IRS::RunClusteringProcessor(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { - Core::IrSensor::IrCameraHandle camera_handle; + IrCameraHandle camera_handle; INSERT_PADDING_WORDS_NOINIT(1); u64 applet_resource_user_id; - Core::IrSensor::PackedClusteringProcessorConfig processor_config; + PackedClusteringProcessorConfig processor_config; }; - static_assert(sizeof(Parameters) == 0x38, "Parameters has incorrect size."); + static_assert(sizeof(Parameters) == 0x40, "Parameters has incorrect size."); const auto parameters{rp.PopRaw()}; @@ -162,27 +130,17 @@ void IRS::RunClusteringProcessor(Kernel::HLERequestContext& ctx) { parameters.camera_handle.npad_type, parameters.camera_handle.npad_id, parameters.applet_resource_user_id); - auto result = IsIrCameraHandleValid(parameters.camera_handle); - - if (result.IsSuccess()) { - auto& device = GetIrCameraSharedMemoryDeviceEntry(parameters.camera_handle); - MakeProcessor(parameters.camera_handle, device); - auto& image_transfer_processor = - GetProcessor(parameters.camera_handle); - image_transfer_processor.SetConfig(parameters.processor_config); - } - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(result); + rb.Push(ResultSuccess); } void IRS::RunImageTransferProcessor(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { - Core::IrSensor::IrCameraHandle camera_handle; + IrCameraHandle camera_handle; INSERT_PADDING_WORDS_NOINIT(1); u64 applet_resource_user_id; - Core::IrSensor::PackedImageTransferProcessorConfig processor_config; + PackedImageTransferProcessorConfig processor_config; u32 transfer_memory_size; }; static_assert(sizeof(Parameters) == 0x30, "Parameters has incorrect size."); @@ -193,166 +151,20 @@ void IRS::RunImageTransferProcessor(Kernel::HLERequestContext& ctx) { auto t_mem = system.CurrentProcess()->GetHandleTable().GetObject(t_mem_handle); - if (t_mem.IsNull()) { - LOG_ERROR(Service_IRS, "t_mem is a nullptr for handle=0x{:08X}", t_mem_handle); - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(ResultUnknown); - return; - } - - ASSERT_MSG(t_mem->GetSize() == parameters.transfer_memory_size, "t_mem has incorrect size"); - - u8* transfer_memory = system.Memory().GetPointer(t_mem->GetSourceAddress()); - - LOG_INFO(Service_IRS, - "called, npad_type={}, npad_id={}, transfer_memory_size={}, transfer_memory_size={}, " - "applet_resource_user_id={}", - parameters.camera_handle.npad_type, parameters.camera_handle.npad_id, - parameters.transfer_memory_size, t_mem->GetSize(), parameters.applet_resource_user_id); - - const auto result = IsIrCameraHandleValid(parameters.camera_handle); - - if (result.IsSuccess()) { - auto& device = GetIrCameraSharedMemoryDeviceEntry(parameters.camera_handle); - MakeProcessorWithCoreContext(parameters.camera_handle, device); - auto& image_transfer_processor = - GetProcessor(parameters.camera_handle); - image_transfer_processor.SetConfig(parameters.processor_config); - image_transfer_processor.SetTransferMemoryPointer(transfer_memory); - } + LOG_WARNING(Service_IRS, + "(STUBBED) called, npad_type={}, npad_id={}, transfer_memory_size={}, " + "applet_resource_user_id={}", + parameters.camera_handle.npad_type, parameters.camera_handle.npad_id, + parameters.transfer_memory_size, parameters.applet_resource_user_id); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(result); + rb.Push(ResultSuccess); } void IRS::GetImageTransferProcessorState(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { - Core::IrSensor::IrCameraHandle camera_handle; - INSERT_PADDING_WORDS_NOINIT(1); - u64 applet_resource_user_id; - }; - static_assert(sizeof(Parameters) == 0x10, "Parameters has incorrect size."); - - const auto parameters{rp.PopRaw()}; - - LOG_DEBUG(Service_IRS, "(STUBBED) called, npad_type={}, npad_id={}, applet_resource_user_id={}", - parameters.camera_handle.npad_type, parameters.camera_handle.npad_id, - parameters.applet_resource_user_id); - - const auto result = IsIrCameraHandleValid(parameters.camera_handle); - if (result.IsError()) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(result); - return; - } - - const auto& device = GetIrCameraSharedMemoryDeviceEntry(parameters.camera_handle); - - if (device.mode != Core::IrSensor::IrSensorMode::ImageTransferProcessor) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(InvalidProcessorState); - return; - } - - std::vector data{}; - const auto& image_transfer_processor = - GetProcessor(parameters.camera_handle); - const auto& state = image_transfer_processor.GetState(data); - - ctx.WriteBuffer(data); - IPC::ResponseBuilder rb{ctx, 6}; - rb.Push(ResultSuccess); - rb.PushRaw(state); -} - -void IRS::RunTeraPluginProcessor(Kernel::HLERequestContext& ctx) { - IPC::RequestParser rp{ctx}; - struct Parameters { - Core::IrSensor::IrCameraHandle camera_handle; - Core::IrSensor::PackedTeraPluginProcessorConfig processor_config; - INSERT_PADDING_WORDS_NOINIT(1); - u64 applet_resource_user_id; - }; - static_assert(sizeof(Parameters) == 0x18, "Parameters has incorrect size."); - - const auto parameters{rp.PopRaw()}; - - LOG_WARNING( - Service_IRS, - "(STUBBED) called, npad_type={}, npad_id={}, mode={}, mcu_version={}.{}, " - "applet_resource_user_id={}", - parameters.camera_handle.npad_type, parameters.camera_handle.npad_id, - parameters.processor_config.mode, parameters.processor_config.required_mcu_version.major, - parameters.processor_config.required_mcu_version.minor, parameters.applet_resource_user_id); - - const auto result = IsIrCameraHandleValid(parameters.camera_handle); - - if (result.IsSuccess()) { - auto& device = GetIrCameraSharedMemoryDeviceEntry(parameters.camera_handle); - MakeProcessor(parameters.camera_handle, device); - auto& image_transfer_processor = - GetProcessor(parameters.camera_handle); - image_transfer_processor.SetConfig(parameters.processor_config); - } - - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(result); -} - -void IRS::GetNpadIrCameraHandle(Kernel::HLERequestContext& ctx) { - IPC::RequestParser rp{ctx}; - const auto npad_id{rp.PopEnum()}; - - if (npad_id > Core::HID::NpadIdType::Player8 && npad_id != Core::HID::NpadIdType::Invalid && - npad_id != Core::HID::NpadIdType::Handheld) { - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(Service::HID::InvalidNpadId); - return; - } - - Core::IrSensor::IrCameraHandle camera_handle{ - .npad_id = static_cast(NpadIdTypeToIndex(npad_id)), - .npad_type = Core::HID::NpadStyleIndex::None, - }; - - LOG_INFO(Service_IRS, "called, npad_id={}, camera_npad_id={}, camera_npad_type={}", npad_id, - camera_handle.npad_id, camera_handle.npad_type); - - IPC::ResponseBuilder rb{ctx, 3}; - rb.Push(ResultSuccess); - rb.PushRaw(camera_handle); -} - -void IRS::RunPointingProcessor(Kernel::HLERequestContext& ctx) { - IPC::RequestParser rp{ctx}; - const auto camera_handle{rp.PopRaw()}; - const auto processor_config{rp.PopRaw()}; - const auto applet_resource_user_id{rp.Pop()}; - - LOG_WARNING( - Service_IRS, - "(STUBBED) called, npad_type={}, npad_id={}, mcu_version={}.{}, applet_resource_user_id={}", - camera_handle.npad_type, camera_handle.npad_id, processor_config.required_mcu_version.major, - processor_config.required_mcu_version.minor, applet_resource_user_id); - - auto result = IsIrCameraHandleValid(camera_handle); - - if (result.IsSuccess()) { - auto& device = GetIrCameraSharedMemoryDeviceEntry(camera_handle); - MakeProcessor(camera_handle, device); - auto& image_transfer_processor = GetProcessor(camera_handle); - image_transfer_processor.SetConfig(processor_config); - } - - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(result); -} - -void IRS::SuspendImageProcessor(Kernel::HLERequestContext& ctx) { - IPC::RequestParser rp{ctx}; - struct Parameters { - Core::IrSensor::IrCameraHandle camera_handle; + IrCameraHandle camera_handle; INSERT_PADDING_WORDS_NOINIT(1); u64 applet_resource_user_id; }; @@ -365,20 +177,93 @@ void IRS::SuspendImageProcessor(Kernel::HLERequestContext& ctx) { parameters.camera_handle.npad_type, parameters.camera_handle.npad_id, parameters.applet_resource_user_id); - auto result = IsIrCameraHandleValid(parameters.camera_handle); - if (result.IsSuccess()) { - // TODO: Suspend image processor - result = ResultSuccess; - } + IPC::ResponseBuilder rb{ctx, 5}; + rb.Push(ResultSuccess); + rb.PushRaw(system.CoreTiming().GetCPUTicks()); + rb.PushRaw(0); +} + +void IRS::RunTeraPluginProcessor(Kernel::HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto camera_handle{rp.PopRaw()}; + const auto processor_config{rp.PopRaw()}; + const auto applet_resource_user_id{rp.Pop()}; + + LOG_WARNING(Service_IRS, + "(STUBBED) called, npad_type={}, npad_id={}, mode={}, mcu_version={}.{}, " + "applet_resource_user_id={}", + camera_handle.npad_type, camera_handle.npad_id, processor_config.mode, + processor_config.required_mcu_version.major, + processor_config.required_mcu_version.minor, applet_resource_user_id); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(result); + rb.Push(ResultSuccess); +} + +void IRS::GetNpadIrCameraHandle(Kernel::HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto npad_id{rp.PopEnum()}; + + if (npad_id > Core::HID::NpadIdType::Player8 && npad_id != Core::HID::NpadIdType::Invalid && + npad_id != Core::HID::NpadIdType::Handheld) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(InvalidNpadId); + return; + } + + IrCameraHandle camera_handle{ + .npad_id = static_cast(NpadIdTypeToIndex(npad_id)), + .npad_type = Core::HID::NpadStyleIndex::None, + }; + + LOG_WARNING(Service_IRS, "(STUBBED) called, npad_id={}, camera_npad_id={}, camera_npad_type={}", + npad_id, camera_handle.npad_id, camera_handle.npad_type); + + IPC::ResponseBuilder rb{ctx, 3}; + rb.Push(ResultSuccess); + rb.PushRaw(camera_handle); +} + +void IRS::RunPointingProcessor(Kernel::HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto camera_handle{rp.PopRaw()}; + const auto processor_config{rp.PopRaw()}; + const auto applet_resource_user_id{rp.Pop()}; + + LOG_WARNING( + Service_IRS, + "(STUBBED) called, npad_type={}, npad_id={}, mcu_version={}.{}, applet_resource_user_id={}", + camera_handle.npad_type, camera_handle.npad_id, processor_config.required_mcu_version.major, + processor_config.required_mcu_version.minor, applet_resource_user_id); + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(ResultSuccess); +} + +void IRS::SuspendImageProcessor(Kernel::HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + struct Parameters { + IrCameraHandle camera_handle; + INSERT_PADDING_WORDS_NOINIT(1); + u64 applet_resource_user_id; + }; + static_assert(sizeof(Parameters) == 0x10, "Parameters has incorrect size."); + + const auto parameters{rp.PopRaw()}; + + LOG_WARNING(Service_IRS, + "(STUBBED) called, npad_type={}, npad_id={}, applet_resource_user_id={}", + parameters.camera_handle.npad_type, parameters.camera_handle.npad_id, + parameters.applet_resource_user_id); + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(ResultSuccess); } void IRS::CheckFirmwareVersion(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; - const auto camera_handle{rp.PopRaw()}; - const auto mcu_version{rp.PopRaw()}; + const auto camera_handle{rp.PopRaw()}; + const auto mcu_version{rp.PopRaw()}; const auto applet_resource_user_id{rp.Pop()}; LOG_WARNING( @@ -387,45 +272,37 @@ void IRS::CheckFirmwareVersion(Kernel::HLERequestContext& ctx) { camera_handle.npad_type, camera_handle.npad_id, applet_resource_user_id, mcu_version.major, mcu_version.minor); - auto result = IsIrCameraHandleValid(camera_handle); - if (result.IsSuccess()) { - // TODO: Check firmware version - result = ResultSuccess; - } - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(result); + rb.Push(ResultSuccess); } void IRS::SetFunctionLevel(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; - const auto camera_handle{rp.PopRaw()}; - const auto function_level{rp.PopRaw()}; - const auto applet_resource_user_id{rp.Pop()}; + struct Parameters { + IrCameraHandle camera_handle; + PackedFunctionLevel function_level; + u64 applet_resource_user_id; + }; + static_assert(sizeof(Parameters) == 0x10, "Parameters has incorrect size."); - LOG_WARNING( - Service_IRS, - "(STUBBED) called, npad_type={}, npad_id={}, function_level={}, applet_resource_user_id={}", - camera_handle.npad_type, camera_handle.npad_id, function_level.function_level, - applet_resource_user_id); + const auto parameters{rp.PopRaw()}; - auto result = IsIrCameraHandleValid(camera_handle); - if (result.IsSuccess()) { - // TODO: Set Function level - result = ResultSuccess; - } + LOG_WARNING(Service_IRS, + "(STUBBED) called, npad_type={}, npad_id={}, applet_resource_user_id={}", + parameters.camera_handle.npad_type, parameters.camera_handle.npad_id, + parameters.applet_resource_user_id); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(result); + rb.Push(ResultSuccess); } void IRS::RunImageTransferExProcessor(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { - Core::IrSensor::IrCameraHandle camera_handle; + IrCameraHandle camera_handle; INSERT_PADDING_WORDS_NOINIT(1); u64 applet_resource_user_id; - Core::IrSensor::PackedImageTransferProcessorExConfig processor_config; + PackedImageTransferProcessorExConfig processor_config; u64 transfer_memory_size; }; static_assert(sizeof(Parameters) == 0x38, "Parameters has incorrect size."); @@ -436,33 +313,20 @@ void IRS::RunImageTransferExProcessor(Kernel::HLERequestContext& ctx) { auto t_mem = system.CurrentProcess()->GetHandleTable().GetObject(t_mem_handle); - u8* transfer_memory = system.Memory().GetPointer(t_mem->GetSourceAddress()); - - LOG_INFO(Service_IRS, - "called, npad_type={}, npad_id={}, transfer_memory_size={}, " - "applet_resource_user_id={}", - parameters.camera_handle.npad_type, parameters.camera_handle.npad_id, - parameters.transfer_memory_size, parameters.applet_resource_user_id); - - auto result = IsIrCameraHandleValid(parameters.camera_handle); - - if (result.IsSuccess()) { - auto& device = GetIrCameraSharedMemoryDeviceEntry(parameters.camera_handle); - MakeProcessorWithCoreContext(parameters.camera_handle, device); - auto& image_transfer_processor = - GetProcessor(parameters.camera_handle); - image_transfer_processor.SetConfig(parameters.processor_config); - image_transfer_processor.SetTransferMemoryPointer(transfer_memory); - } + LOG_WARNING(Service_IRS, + "(STUBBED) called, npad_type={}, npad_id={}, transfer_memory_size={}, " + "applet_resource_user_id={}", + parameters.camera_handle.npad_type, parameters.camera_handle.npad_id, + parameters.transfer_memory_size, parameters.applet_resource_user_id); IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(result); + rb.Push(ResultSuccess); } void IRS::RunIrLedProcessor(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; - const auto camera_handle{rp.PopRaw()}; - const auto processor_config{rp.PopRaw()}; + const auto camera_handle{rp.PopRaw()}; + const auto processor_config{rp.PopRaw()}; const auto applet_resource_user_id{rp.Pop()}; LOG_WARNING(Service_IRS, @@ -472,23 +336,14 @@ void IRS::RunIrLedProcessor(Kernel::HLERequestContext& ctx) { processor_config.required_mcu_version.major, processor_config.required_mcu_version.minor, applet_resource_user_id); - auto result = IsIrCameraHandleValid(camera_handle); - - if (result.IsSuccess()) { - auto& device = GetIrCameraSharedMemoryDeviceEntry(camera_handle); - MakeProcessor(camera_handle, device); - auto& image_transfer_processor = GetProcessor(camera_handle); - image_transfer_processor.SetConfig(processor_config); - } - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(result); + rb.Push(ResultSuccess); } void IRS::StopImageProcessorAsync(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { - Core::IrSensor::IrCameraHandle camera_handle; + IrCameraHandle camera_handle; INSERT_PADDING_WORDS_NOINIT(1); u64 applet_resource_user_id; }; @@ -501,20 +356,14 @@ void IRS::StopImageProcessorAsync(Kernel::HLERequestContext& ctx) { parameters.camera_handle.npad_type, parameters.camera_handle.npad_id, parameters.applet_resource_user_id); - auto result = IsIrCameraHandleValid(parameters.camera_handle); - if (result.IsSuccess()) { - // TODO: Stop image processor async - result = ResultSuccess; - } - IPC::ResponseBuilder rb{ctx, 2}; - rb.Push(result); + rb.Push(ResultSuccess); } void IRS::ActivateIrsensorWithFunctionLevel(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; struct Parameters { - Core::IrSensor::PackedFunctionLevel function_level; + PackedFunctionLevel function_level; INSERT_PADDING_WORDS_NOINIT(1); u64 applet_resource_user_id; }; @@ -529,22 +378,7 @@ void IRS::ActivateIrsensorWithFunctionLevel(Kernel::HLERequestContext& ctx) { rb.Push(ResultSuccess); } -Result IRS::IsIrCameraHandleValid(const Core::IrSensor::IrCameraHandle& camera_handle) const { - if (camera_handle.npad_id > - static_cast(NpadIdTypeToIndex(Core::HID::NpadIdType::Handheld))) { - return InvalidIrCameraHandle; - } - if (camera_handle.npad_type != Core::HID::NpadStyleIndex::None) { - return InvalidIrCameraHandle; - } - return ResultSuccess; -} - -Core::IrSensor::DeviceFormat& IRS::GetIrCameraSharedMemoryDeviceEntry( - const Core::IrSensor::IrCameraHandle& camera_handle) { - ASSERT_MSG(sizeof(StatusManager::device) > camera_handle.npad_id, "invalid npad_id"); - return shared_memory->device[camera_handle.npad_id]; -} +IRS::~IRS() = default; IRS_SYS::IRS_SYS(Core::System& system_) : ServiceFramework{system_, "irs:sys"} { // clang-format off @@ -561,4 +395,4 @@ IRS_SYS::IRS_SYS(Core::System& system_) : ServiceFramework{system_, "irs:sys"} { IRS_SYS::~IRS_SYS() = default; -} // namespace Service::IRS +} // namespace Service::HID diff --git a/src/core/hle/service/hid/irs.h b/src/core/hle/service/hid/irs.h index 2e6115c73..361dc2213 100755 --- a/src/core/hle/service/hid/irs.h +++ b/src/core/hle/service/hid/irs.h @@ -4,19 +4,13 @@ #pragma once #include "core/hid/hid_types.h" -#include "core/hid/irs_types.h" -#include "core/hle/service/hid/irsensor/processor_base.h" #include "core/hle/service/service.h" namespace Core { class System; } -namespace Core::HID { -class EmulatedController; -} // namespace Core::HID - -namespace Service::IRS { +namespace Service::HID { class IRS final : public ServiceFramework { public: @@ -24,19 +18,234 @@ public: ~IRS() override; private: - // This is nn::irsensor::detail::AruidFormat - struct AruidFormat { - u64 sensor_aruid; - u64 sensor_aruid_status; + // This is nn::irsensor::IrCameraStatus + enum IrCameraStatus : u32 { + Available, + Unsupported, + Unconnected, }; - static_assert(sizeof(AruidFormat) == 0x10, "AruidFormat is an invalid size"); - // This is nn::irsensor::detail::StatusManager - struct StatusManager { - std::array device; - std::array aruid; + // This is nn::irsensor::IrCameraInternalStatus + enum IrCameraInternalStatus : u32 { + Stopped, + FirmwareUpdateNeeded, + Unkown2, + Unkown3, + Unkown4, + FirmwareVersionRequested, + FirmwareVersionIsInvalid, + Ready, + Setting, }; - static_assert(sizeof(StatusManager) == 0x8000, "StatusManager is an invalid size"); + + // This is nn::irsensor::detail::StatusManager::IrSensorMode + enum IrSensorMode : u64 { + None, + MomentProcessor, + ClusteringProcessor, + ImageTransferProcessor, + PointingProcessorMarker, + TeraPluginProcessor, + IrLedProcessor, + }; + + // This is nn::irsensor::ImageProcessorStatus + enum ImageProcessorStatus : u8 { + stopped, + running, + }; + + // This is nn::irsensor::ImageTransferProcessorFormat + enum ImageTransferProcessorFormat : u8 { + Size320x240, + Size160x120, + Size80x60, + Size40x30, + Size20x15, + }; + + // This is nn::irsensor::AdaptiveClusteringMode + enum AdaptiveClusteringMode : u8 { + StaticFov, + DynamicFov, + }; + + // This is nn::irsensor::AdaptiveClusteringTargetDistance + enum AdaptiveClusteringTargetDistance : u8 { + Near, + Middle, + Far, + }; + + // This is nn::irsensor::IrsHandAnalysisMode + enum IrsHandAnalysisMode : u8 { + Silhouette, + Image, + SilhoueteAndImage, + SilhuetteOnly, + }; + + // This is nn::irsensor::IrSensorFunctionLevel + enum IrSensorFunctionLevel : u8 { + unknown0, + unknown1, + unknown2, + unknown3, + unknown4, + }; + + // This is nn::irsensor::IrCameraHandle + struct IrCameraHandle { + u8 npad_id{}; + Core::HID::NpadStyleIndex npad_type{Core::HID::NpadStyleIndex::None}; + INSERT_PADDING_BYTES(2); + }; + static_assert(sizeof(IrCameraHandle) == 4, "IrCameraHandle is an invalid size"); + + struct IrsRect { + s16 x; + s16 y; + s16 width; + s16 height; + }; + + // This is nn::irsensor::PackedMcuVersion + struct PackedMcuVersion { + u16 major; + u16 minor; + }; + static_assert(sizeof(PackedMcuVersion) == 4, "PackedMcuVersion is an invalid size"); + + // This is nn::irsensor::MomentProcessorConfig + struct MomentProcessorConfig { + u64 exposire_time; + u8 light_target; + u8 gain; + u8 is_negative_used; + INSERT_PADDING_BYTES(7); + IrsRect window_of_interest; + u8 preprocess; + u8 preprocess_intensity_threshold; + INSERT_PADDING_BYTES(5); + }; + static_assert(sizeof(MomentProcessorConfig) == 0x28, + "MomentProcessorConfig is an invalid size"); + + // This is nn::irsensor::PackedMomentProcessorConfig + struct PackedMomentProcessorConfig { + u64 exposire_time; + u8 light_target; + u8 gain; + u8 is_negative_used; + INSERT_PADDING_BYTES(5); + IrsRect window_of_interest; + PackedMcuVersion required_mcu_version; + u8 preprocess; + u8 preprocess_intensity_threshold; + INSERT_PADDING_BYTES(2); + }; + static_assert(sizeof(PackedMomentProcessorConfig) == 0x20, + "PackedMomentProcessorConfig is an invalid size"); + + // This is nn::irsensor::ClusteringProcessorConfig + struct ClusteringProcessorConfig { + u64 exposire_time; + u32 light_target; + u32 gain; + u8 is_negative_used; + INSERT_PADDING_BYTES(7); + IrsRect window_of_interest; + u32 pixel_count_min; + u32 pixel_count_max; + u32 object_intensity_min; + u8 is_external_light_filter_enabled; + INSERT_PADDING_BYTES(3); + }; + static_assert(sizeof(ClusteringProcessorConfig) == 0x30, + "ClusteringProcessorConfig is an invalid size"); + + // This is nn::irsensor::PackedClusteringProcessorConfig + struct PackedClusteringProcessorConfig { + u64 exposire_time; + u8 light_target; + u8 gain; + u8 is_negative_used; + INSERT_PADDING_BYTES(5); + IrsRect window_of_interest; + PackedMcuVersion required_mcu_version; + u32 pixel_count_min; + u32 pixel_count_max; + u32 object_intensity_min; + u8 is_external_light_filter_enabled; + INSERT_PADDING_BYTES(2); + }; + static_assert(sizeof(PackedClusteringProcessorConfig) == 0x30, + "PackedClusteringProcessorConfig is an invalid size"); + + // This is nn::irsensor::PackedImageTransferProcessorConfig + struct PackedImageTransferProcessorConfig { + u64 exposire_time; + u8 light_target; + u8 gain; + u8 is_negative_used; + INSERT_PADDING_BYTES(5); + PackedMcuVersion required_mcu_version; + u8 format; + INSERT_PADDING_BYTES(3); + }; + static_assert(sizeof(PackedImageTransferProcessorConfig) == 0x18, + "PackedImageTransferProcessorConfig is an invalid size"); + + // This is nn::irsensor::PackedTeraPluginProcessorConfig + struct PackedTeraPluginProcessorConfig { + PackedMcuVersion required_mcu_version; + u8 mode; + INSERT_PADDING_BYTES(3); + }; + static_assert(sizeof(PackedTeraPluginProcessorConfig) == 0x8, + "PackedTeraPluginProcessorConfig is an invalid size"); + + // This is nn::irsensor::PackedPointingProcessorConfig + struct PackedPointingProcessorConfig { + IrsRect window_of_interest; + PackedMcuVersion required_mcu_version; + }; + static_assert(sizeof(PackedPointingProcessorConfig) == 0xC, + "PackedPointingProcessorConfig is an invalid size"); + + // This is nn::irsensor::PackedFunctionLevel + struct PackedFunctionLevel { + IrSensorFunctionLevel function_level; + INSERT_PADDING_BYTES(3); + }; + static_assert(sizeof(PackedFunctionLevel) == 0x4, "PackedFunctionLevel is an invalid size"); + + // This is nn::irsensor::PackedImageTransferProcessorExConfig + struct PackedImageTransferProcessorExConfig { + u64 exposire_time; + u8 light_target; + u8 gain; + u8 is_negative_used; + INSERT_PADDING_BYTES(5); + PackedMcuVersion required_mcu_version; + ImageTransferProcessorFormat origin_format; + ImageTransferProcessorFormat trimming_format; + u16 trimming_start_x; + u16 trimming_start_y; + u8 is_external_light_filter_enabled; + INSERT_PADDING_BYTES(3); + }; + static_assert(sizeof(PackedImageTransferProcessorExConfig) == 0x20, + "PackedImageTransferProcessorExConfig is an invalid size"); + + // This is nn::irsensor::PackedIrLedProcessorConfig + struct PackedIrLedProcessorConfig { + PackedMcuVersion required_mcu_version; + u8 light_target; + INSERT_PADDING_BYTES(3); + }; + static_assert(sizeof(PackedIrLedProcessorConfig) == 0x8, + "PackedIrLedProcessorConfig is an invalid size"); void ActivateIrsensor(Kernel::HLERequestContext& ctx); void DeactivateIrsensor(Kernel::HLERequestContext& ctx); @@ -56,56 +265,6 @@ private: void RunIrLedProcessor(Kernel::HLERequestContext& ctx); void StopImageProcessorAsync(Kernel::HLERequestContext& ctx); void ActivateIrsensorWithFunctionLevel(Kernel::HLERequestContext& ctx); - - Result IsIrCameraHandleValid(const Core::IrSensor::IrCameraHandle& camera_handle) const; - Core::IrSensor::DeviceFormat& GetIrCameraSharedMemoryDeviceEntry( - const Core::IrSensor::IrCameraHandle& camera_handle); - - template - void MakeProcessor(const Core::IrSensor::IrCameraHandle& handle, - Core::IrSensor::DeviceFormat& device_state) { - const auto index = static_cast(handle.npad_id); - if (index > sizeof(processors)) { - LOG_CRITICAL(Service_IRS, "Invalid index {}", index); - return; - } - processors[index] = std::make_unique(device_state); - } - - template - void MakeProcessorWithCoreContext(const Core::IrSensor::IrCameraHandle& handle, - Core::IrSensor::DeviceFormat& device_state) { - const auto index = static_cast(handle.npad_id); - if (index > sizeof(processors)) { - LOG_CRITICAL(Service_IRS, "Invalid index {}", index); - return; - } - processors[index] = std::make_unique(system.HIDCore(), device_state, index); - } - - template - T& GetProcessor(const Core::IrSensor::IrCameraHandle& handle) { - const auto index = static_cast(handle.npad_id); - if (index > sizeof(processors)) { - LOG_CRITICAL(Service_IRS, "Invalid index {}", index); - return static_cast(*processors[0]); - } - return static_cast(*processors[index]); - } - - template - const T& GetProcessor(const Core::IrSensor::IrCameraHandle& handle) const { - const auto index = static_cast(handle.npad_id); - if (index > sizeof(processors)) { - LOG_CRITICAL(Service_IRS, "Invalid index {}", index); - return static_cast(*processors[0]); - } - return static_cast(*processors[index]); - } - - Core::HID::EmulatedController* npad_device = nullptr; - StatusManager* shared_memory = nullptr; - std::array, 9> processors{}; }; class IRS_SYS final : public ServiceFramework { @@ -114,4 +273,4 @@ public: ~IRS_SYS() override; }; -} // namespace Service::IRS +} // namespace Service::HID diff --git a/src/input_common/CMakeLists.txt b/src/input_common/CMakeLists.txt index 90dd629c6..48e799cf5 100755 --- a/src/input_common/CMakeLists.txt +++ b/src/input_common/CMakeLists.txt @@ -1,6 +1,4 @@ add_library(input_common STATIC - drivers/camera.cpp - drivers/camera.h drivers/gc_adapter.cpp drivers/gc_adapter.h drivers/keyboard.cpp diff --git a/src/input_common/input_engine.cpp b/src/input_common/input_engine.cpp index 6ede0e4b0..12214d146 100755 --- a/src/input_common/input_engine.cpp +++ b/src/input_common/input_engine.cpp @@ -90,18 +90,6 @@ void InputEngine::SetMotion(const PadIdentifier& identifier, int motion, const B TriggerOnMotionChange(identifier, motion, value); } -void InputEngine::SetCamera(const PadIdentifier& identifier, - const Common::Input::CameraStatus& value) { - { - std::scoped_lock lock{mutex}; - ControllerData& controller = controller_list.at(identifier); - if (!configuring) { - controller.camera = value; - } - } - TriggerOnCameraChange(identifier, value); -} - bool InputEngine::GetButton(const PadIdentifier& identifier, int button) const { std::scoped_lock lock{mutex}; const auto controller_iter = controller_list.find(identifier); @@ -177,18 +165,6 @@ BasicMotion InputEngine::GetMotion(const PadIdentifier& identifier, int motion) return controller.motions.at(motion); } -Common::Input::CameraStatus InputEngine::GetCamera(const PadIdentifier& identifier) const { - std::scoped_lock lock{mutex}; - const auto controller_iter = controller_list.find(identifier); - if (controller_iter == controller_list.cend()) { - LOG_ERROR(Input, "Invalid identifier guid={}, pad={}, port={}", identifier.guid.RawString(), - identifier.pad, identifier.port); - return {}; - } - const ControllerData& controller = controller_iter->second; - return controller.camera; -} - void InputEngine::ResetButtonState() { for (const auto& controller : controller_list) { for (const auto& button : controller.second.buttons) { @@ -341,20 +317,6 @@ void InputEngine::TriggerOnMotionChange(const PadIdentifier& identifier, int mot }); } -void InputEngine::TriggerOnCameraChange(const PadIdentifier& identifier, - [[maybe_unused]] const Common::Input::CameraStatus& value) { - std::scoped_lock lock{mutex_callback}; - for (const auto& poller_pair : callback_list) { - const InputIdentifier& poller = poller_pair.second; - if (!IsInputIdentifierEqual(poller, identifier, EngineInputType::Camera, 0)) { - continue; - } - if (poller.callback.on_change) { - poller.callback.on_change(); - } - } -} - bool InputEngine::IsInputIdentifierEqual(const InputIdentifier& input_identifier, const PadIdentifier& identifier, EngineInputType type, int index) const { diff --git a/src/input_common/input_engine.h b/src/input_common/input_engine.h index f6b3c4610..13295bd49 100755 --- a/src/input_common/input_engine.h +++ b/src/input_common/input_engine.h @@ -36,12 +36,11 @@ struct BasicMotion { // Types of input that are stored in the engine enum class EngineInputType { None, - Analog, - Battery, Button, - Camera, HatButton, + Analog, Motion, + Battery, }; namespace std { @@ -116,17 +115,10 @@ public: // Sets polling mode to a controller virtual Common::Input::PollingError SetPollingMode( [[maybe_unused]] const PadIdentifier& identifier, - [[maybe_unused]] const Common::Input::PollingMode polling_mode) { + [[maybe_unused]] const Common::Input::PollingMode vibration) { return Common::Input::PollingError::NotSupported; } - // Sets camera format to a controller - virtual Common::Input::CameraError SetCameraFormat( - [[maybe_unused]] const PadIdentifier& identifier, - [[maybe_unused]] Common::Input::CameraFormat camera_format) { - return Common::Input::CameraError::NotSupported; - } - // Returns the engine name [[nodiscard]] const std::string& GetEngineName() const; @@ -182,7 +174,6 @@ public: f32 GetAxis(const PadIdentifier& identifier, int axis) const; Common::Input::BatteryLevel GetBattery(const PadIdentifier& identifier) const; BasicMotion GetMotion(const PadIdentifier& identifier, int motion) const; - Common::Input::CameraStatus GetCamera(const PadIdentifier& identifier) const; int SetCallback(InputIdentifier input_identifier); void SetMappingCallback(MappingCallback callback); @@ -194,7 +185,6 @@ protected: void SetAxis(const PadIdentifier& identifier, int axis, f32 value); void SetBattery(const PadIdentifier& identifier, Common::Input::BatteryLevel value); void SetMotion(const PadIdentifier& identifier, int motion, const BasicMotion& value); - void SetCamera(const PadIdentifier& identifier, const Common::Input::CameraStatus& value); virtual std::string GetHatButtonName([[maybe_unused]] u8 direction_value) const { return "Unknown"; @@ -207,7 +197,6 @@ private: std::unordered_map axes; std::unordered_map motions; Common::Input::BatteryLevel battery{}; - Common::Input::CameraStatus camera{}; }; void TriggerOnButtonChange(const PadIdentifier& identifier, int button, bool value); @@ -216,8 +205,6 @@ private: void TriggerOnBatteryChange(const PadIdentifier& identifier, Common::Input::BatteryLevel value); void TriggerOnMotionChange(const PadIdentifier& identifier, int motion, const BasicMotion& value); - void TriggerOnCameraChange(const PadIdentifier& identifier, - const Common::Input::CameraStatus& value); bool IsInputIdentifierEqual(const InputIdentifier& input_identifier, const PadIdentifier& identifier, EngineInputType type, diff --git a/src/input_common/input_poller.cpp b/src/input_common/input_poller.cpp index 133422d5c..49ccb4422 100755 --- a/src/input_common/input_poller.cpp +++ b/src/input_common/input_poller.cpp @@ -664,47 +664,6 @@ private: InputEngine* input_engine; }; -class InputFromCamera final : public Common::Input::InputDevice { -public: - explicit InputFromCamera(PadIdentifier identifier_, InputEngine* input_engine_) - : identifier(identifier_), input_engine(input_engine_) { - UpdateCallback engine_callback{[this]() { OnChange(); }}; - const InputIdentifier input_identifier{ - .identifier = identifier, - .type = EngineInputType::Camera, - .index = 0, - .callback = engine_callback, - }; - callback_key = input_engine->SetCallback(input_identifier); - } - - ~InputFromCamera() override { - input_engine->DeleteCallback(callback_key); - } - - Common::Input::CameraStatus GetStatus() const { - return input_engine->GetCamera(identifier); - } - - void ForceUpdate() override { - OnChange(); - } - - void OnChange() { - const Common::Input::CallbackStatus status{ - .type = Common::Input::InputType::IrSensor, - .camera_status = GetStatus(), - }; - - TriggerOnChange(status); - } - -private: - const PadIdentifier identifier; - int callback_key; - InputEngine* input_engine; -}; - class OutputFromIdentifier final : public Common::Input::OutputDevice { public: explicit OutputFromIdentifier(PadIdentifier identifier_, InputEngine* input_engine_) @@ -723,10 +682,6 @@ public: return input_engine->SetPollingMode(identifier, polling_mode); } - Common::Input::CameraError SetCameraFormat(Common::Input::CameraFormat camera_format) override { - return input_engine->SetCameraFormat(identifier, camera_format); - } - private: const PadIdentifier identifier; InputEngine* input_engine; @@ -965,18 +920,6 @@ std::unique_ptr InputFactory::CreateMotionDevice( properties_y, properties_z, input_engine.get()); } -std::unique_ptr InputFactory::CreateCameraDevice( - const Common::ParamPackage& params) { - const PadIdentifier identifier = { - .guid = Common::UUID{params.Get("guid", "")}, - .port = static_cast(params.Get("port", 0)), - .pad = static_cast(params.Get("pad", 0)), - }; - - input_engine->PreSetController(identifier); - return std::make_unique(identifier, input_engine.get()); -} - InputFactory::InputFactory(std::shared_ptr input_engine_) : input_engine(std::move(input_engine_)) {} @@ -985,9 +928,6 @@ std::unique_ptr InputFactory::Create( if (params.Has("battery")) { return CreateBatteryDevice(params); } - if (params.Has("camera")) { - return CreateCameraDevice(params); - } if (params.Has("button") && params.Has("axis")) { return CreateTriggerDevice(params); } diff --git a/src/input_common/input_poller.h b/src/input_common/input_poller.h index 4410a8415..6ebe0dbf5 100755 --- a/src/input_common/input_poller.h +++ b/src/input_common/input_poller.h @@ -211,17 +211,6 @@ private: */ std::unique_ptr CreateMotionDevice(Common::ParamPackage params); - /** - * Creates a camera device from the parameters given. - * @param params contains parameters for creating the device: - * - "guid": text string for identifying controllers - * - "port": port of the connected device - * - "pad": slot of the connected controller - * @returns a unique input device with the parameters specified - */ - std::unique_ptr CreateCameraDevice( - const Common::ParamPackage& params); - std::shared_ptr input_engine; }; } // namespace InputCommon diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp index ca1cb9542..21834fb6b 100755 --- a/src/input_common/main.cpp +++ b/src/input_common/main.cpp @@ -5,7 +5,6 @@ #include #include "common/input.h" #include "common/param_package.h" -#include "input_common/drivers/camera.h" #include "input_common/drivers/gc_adapter.h" #include "input_common/drivers/keyboard.h" #include "input_common/drivers/mouse.h" @@ -79,15 +78,6 @@ struct InputSubsystem::Impl { Common::Input::RegisterFactory(tas_input->GetEngineName(), tas_output_factory); - camera = std::make_shared("camera"); - camera->SetMappingCallback(mapping_callback); - camera_input_factory = std::make_shared(camera); - camera_output_factory = std::make_shared(camera); - Common::Input::RegisterFactory(camera->GetEngineName(), - camera_input_factory); - Common::Input::RegisterFactory(camera->GetEngineName(), - camera_output_factory); - #ifdef HAVE_SDL2 sdl = std::make_shared("sdl"); sdl->SetMappingCallback(mapping_callback); @@ -327,7 +317,6 @@ struct InputSubsystem::Impl { std::shared_ptr touch_screen; std::shared_ptr tas_input; std::shared_ptr udp_client; - std::shared_ptr camera; std::shared_ptr keyboard_factory; std::shared_ptr mouse_factory; @@ -335,14 +324,12 @@ struct InputSubsystem::Impl { std::shared_ptr touch_screen_factory; std::shared_ptr udp_client_input_factory; std::shared_ptr tas_input_factory; - std::shared_ptr camera_input_factory; std::shared_ptr keyboard_output_factory; std::shared_ptr mouse_output_factory; std::shared_ptr gcadapter_output_factory; std::shared_ptr udp_client_output_factory; std::shared_ptr tas_output_factory; - std::shared_ptr camera_output_factory; #ifdef HAVE_SDL2 std::shared_ptr sdl; @@ -395,14 +382,6 @@ const TasInput::Tas* InputSubsystem::GetTas() const { return impl->tas_input.get(); } -Camera* InputSubsystem::GetCamera() { - return impl->camera.get(); -} - -const Camera* InputSubsystem::GetCamera() const { - return impl->camera.get(); -} - std::vector InputSubsystem::GetInputDevices() const { return impl->GetInputDevices(); } diff --git a/src/input_common/main.h b/src/input_common/main.h index b756bb5c6..147c310c4 100755 --- a/src/input_common/main.h +++ b/src/input_common/main.h @@ -30,7 +30,6 @@ enum Values : int; } namespace InputCommon { -class Camera; class Keyboard; class Mouse; class TouchScreen; @@ -93,15 +92,9 @@ public: /// Retrieves the underlying tas input device. [[nodiscard]] TasInput::Tas* GetTas(); - /// Retrieves the underlying tas input device. + /// Retrieves the underlying tas input device. [[nodiscard]] const TasInput::Tas* GetTas() const; - /// Retrieves the underlying camera input device. - [[nodiscard]] Camera* GetCamera(); - - /// Retrieves the underlying camera input device. - [[nodiscard]] const Camera* GetCamera() const; - /** * Returns all available input devices that this Factory can create a new device with. * Each returned ParamPackage should have a `display` field used for display, a `engine` field diff --git a/src/video_core/renderer_vulkan/vk_blit_screen.cpp b/src/video_core/renderer_vulkan/vk_blit_screen.cpp index 1ec8392e1..4a1d96322 100755 --- a/src/video_core/renderer_vulkan/vk_blit_screen.cpp +++ b/src/video_core/renderer_vulkan/vk_blit_screen.cpp @@ -87,8 +87,12 @@ u32 GetBytesPerPixel(const Tegra::FramebufferConfig& framebuffer) { } std::size_t GetSizeInBytes(const Tegra::FramebufferConfig& framebuffer) { - return static_cast(framebuffer.stride) * - static_cast(framebuffer.height) * GetBytesPerPixel(framebuffer); + // TODO(Rodrigo): Read this from HLE + constexpr u32 block_height_log2 = 4; + const u32 bytes_per_pixel = GetBytesPerPixel(framebuffer); + const u64 size_bytes{Tegra::Texture::CalculateSize( + true, bytes_per_pixel, framebuffer.stride, framebuffer.height, 1, block_height_log2, 0)}; + return size_bytes; } VkFormat GetFormat(const Tegra::FramebufferConfig& framebuffer) { @@ -169,9 +173,8 @@ VkSemaphore BlitScreen::Draw(const Tegra::FramebufferConfig& framebuffer, // TODO(Rodrigo): Read this from HLE constexpr u32 block_height_log2 = 4; const u32 bytes_per_pixel = GetBytesPerPixel(framebuffer); - const u64 size_bytes{Tegra::Texture::CalculateSize(true, bytes_per_pixel, - framebuffer.stride, framebuffer.height, - 1, block_height_log2, 0)}; + const u64 size_bytes{GetSizeInBytes(framebuffer)}; + Tegra::Texture::UnswizzleTexture( mapped_span.subspan(image_offset, size_bytes), std::span(host_ptr, size_bytes), bytes_per_pixel, framebuffer.width, framebuffer.height, 1, block_height_log2, 0); diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index 57e0e7025..534e55355 100755 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -41,9 +41,6 @@ add_executable(yuzu configuration/configure_audio.cpp configuration/configure_audio.h configuration/configure_audio.ui - configuration/configure_camera.cpp - configuration/configure_camera.h - configuration/configure_camera.ui configuration/configure_cpu.cpp configuration/configure_cpu.h configuration/configure_cpu.ui @@ -257,7 +254,7 @@ endif() create_target_directory_groups(yuzu) target_link_libraries(yuzu PRIVATE common core input_common video_core) -target_link_libraries(yuzu PRIVATE Boost::boost glad Qt::Widgets Qt::Multimedia) +target_link_libraries(yuzu PRIVATE Boost::boost glad Qt::Widgets) target_link_libraries(yuzu PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) target_include_directories(yuzu PRIVATE ../../externals/Vulkan-Headers/include) diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index 774085809..01acda22b 100755 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp @@ -5,8 +5,6 @@ #include #include -#include -#include #include #include #include @@ -33,7 +31,6 @@ #include "core/core.h" #include "core/cpu_manager.h" #include "core/frontend/framebuffer_layout.h" -#include "input_common/drivers/camera.h" #include "input_common/drivers/keyboard.h" #include "input_common/drivers/mouse.h" #include "input_common/drivers/tas_input.h" @@ -804,74 +801,6 @@ void GRenderWindow::TouchEndEvent() { input_subsystem->GetTouchScreen()->ReleaseAllTouch(); } -void GRenderWindow::InitializeCamera() { - if (!Settings::values.enable_ir_sensor) { - return; - } - - bool camera_found = false; - const QList cameras = QCameraInfo::availableCameras(); - for (const QCameraInfo& cameraInfo : cameras) { - if (Settings::values.ir_sensor_device.GetValue() == cameraInfo.deviceName().toStdString() || - Settings::values.ir_sensor_device.GetValue() == "Auto") { - camera = std::make_unique(cameraInfo); - camera_found = true; - break; - } - } - - if (!camera_found) { - return; - } - - camera_capture = std::make_unique(camera.get()); - connect(camera_capture.get(), &QCameraImageCapture::imageCaptured, this, - &GRenderWindow::OnCameraCapture); - camera->unload(); - camera->setCaptureMode(QCamera::CaptureViewfinder); - camera->load(); - - camera_timer = std::make_unique(); - connect(camera_timer.get(), &QTimer::timeout, [this] { RequestCameraCapture(); }); - // This timer should be dependent of camera resolution 5ms for every 100 pixels - camera_timer->start(100); -} - -void GRenderWindow::FinalizeCamera() { - if (camera_timer) { - camera_timer->stop(); - } - if (camera) { - camera->unload(); - } -} - -void GRenderWindow::RequestCameraCapture() { - if (!Settings::values.enable_ir_sensor) { - return; - } - - // Idealy one should only call capture but Qt refuses to take a second capture without - // stopping the camera - camera->stop(); - camera->start(); - - camera_capture->capture(); -} - -void GRenderWindow::OnCameraCapture(int requestId, const QImage& img) { - constexpr std::size_t camera_width = 320; - constexpr std::size_t camera_height = 240; - const auto converted = - img.scaled(camera_width, camera_height, Qt::AspectRatioMode::IgnoreAspectRatio, - Qt::TransformationMode::SmoothTransformation) - .mirrored(false, true); - std::vector camera_data{}; - camera_data.resize(camera_width * camera_height); - std::memcpy(camera_data.data(), converted.bits(), camera_width * camera_height * sizeof(u32)); - input_subsystem->GetCamera()->SetCameraData(camera_width, camera_height, camera_data); -} - bool GRenderWindow::event(QEvent* event) { if (event->type() == QEvent::TouchBegin) { TouchBeginEvent(static_cast(event)); diff --git a/src/yuzu/bootmanager.h b/src/yuzu/bootmanager.h index 346201768..81fe52c0e 100755 --- a/src/yuzu/bootmanager.h +++ b/src/yuzu/bootmanager.h @@ -20,8 +20,6 @@ class GRenderWindow; class GMainWindow; -class QCamera; -class QCameraImageCapture; class QKeyEvent; namespace Core { @@ -166,9 +164,6 @@ public: void mouseReleaseEvent(QMouseEvent* event) override; void wheelEvent(QWheelEvent* event) override; - void InitializeCamera(); - void FinalizeCamera(); - bool event(QEvent* event) override; void focusOutEvent(QFocusEvent* event) override; @@ -212,9 +207,6 @@ private: void TouchUpdateEvent(const QTouchEvent* event); void TouchEndEvent(); - void RequestCameraCapture(); - void OnCameraCapture(int requestId, const QImage& img); - void OnMinimalClientAreaChangeRequest(std::pair minimal_size) override; bool InitializeOpenGL(); @@ -240,10 +232,6 @@ private: bool first_frame = false; InputCommon::TasInput::TasState last_tas_state; - std::unique_ptr camera; - std::unique_ptr camera_capture; - std::unique_ptr camera_timer; - Core::System& system; protected: diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index c841843f0..b3d0b4c05 100755 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -368,11 +368,6 @@ void Config::ReadHidbusValues() { } } -void Config::ReadIrCameraValues() { - ReadBasicSetting(Settings::values.enable_ir_sensor); - ReadBasicSetting(Settings::values.ir_sensor_device); -} - void Config::ReadAudioValues() { qt_config->beginGroup(QStringLiteral("Audio")); @@ -398,7 +393,6 @@ void Config::ReadControlValues() { ReadTouchscreenValues(); ReadMotionTouchValues(); ReadHidbusValues(); - ReadIrCameraValues(); #ifdef _WIN32 ReadBasicSetting(Settings::values.enable_raw_input); @@ -1004,11 +998,6 @@ void Config::SaveHidbusValues() { QString::fromStdString(default_param)); } -void Config::SaveIrCameraValues() { - WriteBasicSetting(Settings::values.enable_ir_sensor); - WriteBasicSetting(Settings::values.ir_sensor_device); -} - void Config::SaveValues() { if (global) { SaveControlValues(); @@ -1051,7 +1040,6 @@ void Config::SaveControlValues() { SaveTouchscreenValues(); SaveMotionTouchValues(); SaveHidbusValues(); - SaveIrCameraValues(); WriteGlobalSetting(Settings::values.use_docked_mode); WriteGlobalSetting(Settings::values.vibration_enabled); diff --git a/src/yuzu/configuration/config.h b/src/yuzu/configuration/config.h index a71eabe8e..d511b3dbd 100755 --- a/src/yuzu/configuration/config.h +++ b/src/yuzu/configuration/config.h @@ -68,7 +68,6 @@ private: void ReadTouchscreenValues(); void ReadMotionTouchValues(); void ReadHidbusValues(); - void ReadIrCameraValues(); // Read functions bases off the respective config section names. void ReadAudioValues(); @@ -97,7 +96,6 @@ private: void SaveTouchscreenValues(); void SaveMotionTouchValues(); void SaveHidbusValues(); - void SaveIrCameraValues(); // Save functions based off the respective config section names. void SaveAudioValues(); diff --git a/src/yuzu/configuration/configure_input.cpp b/src/yuzu/configuration/configure_input.cpp index f1b061b13..73d7ba24b 100755 --- a/src/yuzu/configuration/configure_input.cpp +++ b/src/yuzu/configuration/configure_input.cpp @@ -15,7 +15,6 @@ #include "ui_configure_input.h" #include "ui_configure_input_advanced.h" #include "ui_configure_input_player.h" -#include "yuzu/configuration/configure_camera.h" #include "yuzu/configuration/configure_debug_controller.h" #include "yuzu/configuration/configure_input.h" #include "yuzu/configuration/configure_input_advanced.h" @@ -164,10 +163,6 @@ void ConfigureInput::Initialize(InputCommon::InputSubsystem* input_subsystem, [this, input_subsystem, &hid_core] { CallConfigureDialog(*this, input_subsystem, hid_core); }); - connect(advanced, &ConfigureInputAdvanced::CallCameraDialog, - [this, input_subsystem, &hid_core] { - CallConfigureDialog(*this, input_subsystem); - }); connect(ui->vibrationButton, &QPushButton::clicked, [this, &hid_core] { CallConfigureDialog(*this, hid_core); }); diff --git a/src/yuzu/configuration/configure_input_advanced.cpp b/src/yuzu/configuration/configure_input_advanced.cpp index 10f841b98..f14bdc831 100755 --- a/src/yuzu/configuration/configure_input_advanced.cpp +++ b/src/yuzu/configuration/configure_input_advanced.cpp @@ -89,7 +89,6 @@ ConfigureInputAdvanced::ConfigureInputAdvanced(QWidget* parent) [this] { CallMotionTouchConfigDialog(); }); connect(ui->ring_controller_configure, &QPushButton::clicked, this, [this] { CallRingControllerDialog(); }); - connect(ui->camera_configure, &QPushButton::clicked, this, [this] { CallCameraDialog(); }); #ifndef _WIN32 ui->enable_raw_input->setVisible(false); @@ -137,7 +136,6 @@ void ConfigureInputAdvanced::ApplyConfiguration() { Settings::values.enable_udp_controller = ui->enable_udp_controller->isChecked(); Settings::values.controller_navigation = ui->controller_navigation->isChecked(); Settings::values.enable_ring_controller = ui->enable_ring_controller->isChecked(); - Settings::values.enable_ir_sensor = ui->enable_ir_sensor->isChecked(); } void ConfigureInputAdvanced::LoadConfiguration() { @@ -171,7 +169,6 @@ void ConfigureInputAdvanced::LoadConfiguration() { ui->enable_udp_controller->setChecked(Settings::values.enable_udp_controller.GetValue()); ui->controller_navigation->setChecked(Settings::values.controller_navigation.GetValue()); ui->enable_ring_controller->setChecked(Settings::values.enable_ring_controller.GetValue()); - ui->enable_ir_sensor->setChecked(Settings::values.enable_ir_sensor.GetValue()); UpdateUIEnabled(); } diff --git a/src/yuzu/configuration/configure_input_advanced.h b/src/yuzu/configuration/configure_input_advanced.h index fc1230284..644e56dd8 100755 --- a/src/yuzu/configuration/configure_input_advanced.h +++ b/src/yuzu/configuration/configure_input_advanced.h @@ -29,7 +29,6 @@ signals: void CallTouchscreenConfigDialog(); void CallMotionTouchConfigDialog(); void CallRingControllerDialog(); - void CallCameraDialog(); private: void changeEvent(QEvent* event) override; diff --git a/src/yuzu/configuration/configure_input_advanced.ui b/src/yuzu/configuration/configure_input_advanced.ui index fac8cf827..14403cb10 100755 --- a/src/yuzu/configuration/configure_input_advanced.ui +++ b/src/yuzu/configuration/configure_input_advanced.ui @@ -2617,20 +2617,6 @@ - - - - Infrared Camera - - - - - - - Configure - - - diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 663306ebe..f866ded04 100755 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1541,8 +1541,6 @@ void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t mouse_hide_timer.start(); } - render_window->InitializeCamera(); - std::string title_name; std::string title_version; const auto res = system->GetGameName(title_name); @@ -1624,7 +1622,6 @@ void GMainWindow::ShutdownGame() { tas_label->clear(); input_subsystem->GetTas()->Stop(); OnTasStateChanged(); - render_window->FinalizeCamera(); // Enable all controllers system->HIDCore().SetSupportedStyleTag({Core::HID::NpadStyleSet::All}); @@ -2864,12 +2861,6 @@ void GMainWindow::OnConfigure() { mouse_hide_timer.start(); } - // Restart camera config - if (emulation_running) { - render_window->FinalizeCamera(); - render_window->InitializeCamera(); - } - if (!UISettings::values.has_broken_vulkan) { renderer_status_button->setEnabled(!emulation_running); }